From fedora-cvs-commits at redhat.com  Tue Aug  1 00:56:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 20:56:03 -0400
Subject: rpms/kernel/devel/configs config-xen-generic,1.23,1.24
Message-ID: <200608010056.k710u3hj021782@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-xen-generic 
Log Message:
disable CONFIG_DEBUG_SLAB for xen (should fix #200127)


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-xen-generic	19 Jul 2006 17:20:13 -0000	1.23
+++ config-xen-generic	1 Aug 2006 00:56:01 -0000	1.24
@@ -44,6 +44,9 @@
 CONFIG_XEN_SMPBOOT=y
 
 
+# this breaks jbd & ext3
+# CONFIG_DEBUG_SLAB is not set
+
 #
 # Firmware Drivers
 #



From fedora-cvs-commits at redhat.com  Tue Aug  1 00:56:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 20:56:03 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2487,1.2488
Message-ID: <200608010056.k710u3es021774@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
disable CONFIG_DEBUG_SLAB for xen (should fix #200127)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2487
retrieving revision 1.2488
diff -u -r1.2487 -r1.2488
--- kernel-2.6.spec	31 Jul 2006 23:39:57 -0000	1.2487
+++ kernel-2.6.spec	1 Aug 2006 00:56:01 -0000	1.2488
@@ -1659,6 +1659,9 @@
 %endif
 
 %changelog
+* Tue Aug  1 2006 Juan Quintela <quintela at redhat.com>
+- disable CONFIG_DEBUG_SLAB for xen (should fix #200127).
+
 * Mon Jul 31 2006 Roland McGrath <roland at redhat.com>
 - New utrace patch:
   - fix ptrace_do_wait deadlock (#200822, #200605)



From fedora-cvs-commits at redhat.com  Tue Aug  1 01:21:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 21:21:32 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.312, 1.313 anaconda.spec, 1.438,
	1.439 sources, 1.435, 1.436
Message-ID: <200608010121.k711LWHE018365@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- .cvsignore	28 Jul 2006 22:07:16 -0000	1.312
+++ .cvsignore	1 Aug 2006 01:21:30 -0000	1.313
@@ -1 +1 @@
-anaconda-11.1.0.73.tar.bz2
+anaconda-11.1.0.74.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- anaconda.spec	28 Jul 2006 22:07:16 -0000	1.438
+++ anaconda.spec	1 Aug 2006 01:21:30 -0000	1.439
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.73
+Version: 11.1.0.74
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -28,7 +28,7 @@
 Requires: libbdevid >= 5.1.2-1, libbdevid-python
 %endif
 %ifnarch s390 s390x ppc64
-Requires: rhpxl
+Requires: rhpxl >= 0.25
 %endif
 Obsoletes: anaconda-images <= 10
 Url: http://fedora.redhat.com/projects/anaconda-installer/
@@ -103,6 +103,12 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Jul 31 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.74-1
+- Fix method=http vs method=ftp (pjones)
+- Various xconfig fixes (clumens, #200755 #200758)
+- Fix FTP/HTTP installs by hostname (dcantrel, #200771)
+- Fix command-stubs/mknod (#200820)
+
 * Fri Jul 28 2006 Peter Jones <pjones at redhat.com> - 11.1.0.73-1
 - Revert DNS changes from yesterday (dcantrel)
 - Do the backtrace initialization after analyzing args (katzj)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- sources	28 Jul 2006 22:07:16 -0000	1.435
+++ sources	1 Aug 2006 01:21:30 -0000	1.436
@@ -1 +1 @@
-0c79a1e63733e5adb81a7fd9c482a2fc  anaconda-11.1.0.73.tar.bz2
+7701f634dd3815c240a944a1447f54bd  anaconda-11.1.0.74.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug  1 01:35:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 21:35:58 -0400
Subject: rpms/evolution-data-server/FC-5 .cvsignore, 1.42,
	1.43 evolution-data-server.spec, 1.91, 1.92 sources, 1.43, 1.44
Message-ID: <200608010135.k711Zwl9022898@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:
- Update to 1.6.3
- Dynamically link to BDB.
- Add Requires for db4 and BuildRequires for db4-devel.
- Add missing Requires and BuildRequires from Rawhide.
- Clean up spec file, renumber patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	30 May 2006 14:57:24 -0000	1.42
+++ .cvsignore	1 Aug 2006 01:35:53 -0000	1.43
@@ -1 +1 @@
-evolution-data-server-1.6.2.tar.bz2
+evolution-data-server-1.6.3.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- evolution-data-server.spec	30 May 2006 14:57:24 -0000	1.91
+++ evolution-data-server.spec	1 Aug 2006 01:35:53 -0000	1.92
@@ -18,59 +18,73 @@
 %define camel_provider_dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers
 %define eds_extensions_dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions
 
-Summary: Backend data server for evolution
+### Abstract ###
+
 Name: evolution-data-server
-Version: 1.6.2
+Version: 1.6.3
 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
-#Patch1: evolution-data-server-1.0.2-fix-64-bit-build.patch
-#Patch2: fix_contact_leaks.patch
-Patch3: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch
-#Patch4: evolution-data-server-1.0.2-fix-calendar-factory-GType.patch
-
-# Patch for part of bug #141283 not in upstream tarball (in Ximian bugzilla as 70267)
-#Patch6: evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch
-
-Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
-Patch101: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch
-Patch102: evolution-data-server-1.3.8-fix-implicit-function-declarations
-Patch103: evolution-data-server-1.6.2-validatehelo.patch
+Summary: Backend data server for evolution
+URL: http://www.gnome.org/projects/evolution/
+BuildRoot: %{_tmppath}/%{name}-root
+Source: %{name}-%{version}.tar.bz2
+
+### Patches ###
+
+Patch10: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch
+Patch11: evolution-1.4.4-ldap-x86_64-hack.patch
+Patch12: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch
+Patch13: evolution-data-server-1.3.8-fix-implicit-function-declarations
+Patch14: evolution-data-server-1.6.2-validatehelo.patch
 
 # Leak fixes by Mark G. Adams
-Patch200: gb-309079-attach-48376.patch
-Patch201: gb-309079-attach-48377.patch
+Patch15: gb-309079-attach-48376.patch
+Patch16: gb-309079-attach-48377.patch
 
-Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
+Patch17: evolution-data-server-1.5.4-make_imap4_optional.patch
 
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: libsoup >= %{soup_version}
+### Dependencies ###
+
+Requires: GConf2
 Requires: ORBit2 >= %{orbit2_version}
-Requires: libbonobo >= %{libbonobo_version}
-Requires: libgnomeui
+Requires: db4
 Requires: gnome-vfs2
-Requires: GConf2
+Requires: libbonobo >= %{libbonobo_version}
 Requires: libglade2
-BuildRequires: glib2-devel, gnome-vfs2-devel, GConf2-devel
-BuildRequires: intltool
-BuildRequires: libsoup-devel >= %{soup_version}
+Requires: libgnomeui
+Requires: libsoup >= %{soup_version}
+
+### Build Dependencies ###
+
+BuildRequires: GConf2-devel
 BuildRequires: ORBit2-devel >= %{orbit2_version}
+BuildRequires: bison
+BuildRequires: db4-devel
+BuildRequires: flex
+BuildRequires: gettext
+BuildRequires: glib2-devel
+BuildRequires: gnome-vfs2-devel
+BuildRequires: gnutls-devel
+BuildRequires: intltool
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
-BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
-BuildRequires: bison, libgnome-devel, libtool, gnutls-devel
+BuildRequires: libgnome-devel
+BuildRequires: libgnomeui-devel
+BuildRequires: libsoup-devel >= %{soup_version}
+BuildRequires: libtool
+
 %if %{use_nss}
 BuildRequires: nspr-devel
 BuildRequires: nss-devel
 %else
 BuildRequires: openssl-devel
 %endif
+
 %if %{use_gtk_doc}
 BuildRequires: gtk-doc
 %endif
 
-
 %if %{ldap_support}
 %if %{static_ldap}
 BuildRequires: openldap-evolution-devel
@@ -104,20 +118,14 @@
 
 %prep
 %setup -q
-#%patch1 -p1 -b .fix-64-bit-build
-#%patch2 -p1 -b .fix_contact_leaks
-%patch3 -p1 -b .workaround-cal-backend-leak
-#%patch4 -p1 -b .fix-calendar-factory-GType
-
-#%patch6 -p0 -b .calendar-optimisation-XB70267
-
-%patch98 -p1 -b .ldaphack
-%patch101 -p1 -b .fix_open_calendar_declaration
-%patch102 -p1 -b .fix-implicit-function-declarations
-%patch103 -p1 -b .validatehelo
-%patch200 -p0 -b .fix-uid-leak
-%patch201 -p0 -b .fix-comp-ref-leak
-%patch300 -p1 -b .make_imap4_optional
+%patch10 -p1 -b .workaround-cal-backend-leak
+%patch11 -p1 -b .ldaphack
+%patch12 -p1 -b .fix_open_calendar_declaration
+%patch13 -p1 -b .fix-implicit-function-declarations
+%patch14 -p1 -b .validatehelo
+%patch15 -p0 -b .fix-uid-leak
+%patch16 -p0 -b .fix-comp-ref-leak
+%patch17 -p1 -b .make_imap4_optional
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -192,11 +200,14 @@
 # Rerun autoconf since we patched configure.in:
 autoconf
 
+# See Ross Burton's blog entry for why we want --with-libdb.
+# http://www.burtonini.com/blog//computers/eds-libdb-2006-07-18-10-40
 
 %configure \
-  %gtkdoc_flags \
-  --enable-file-locking=fcntl --enable-dot-locking=no \
-  %ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags
+        %gtkdoc_flags \
+        --with-libdb=/usr \
+        --enable-file-locking=fcntl --enable-dot-locking=no \
+        %ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
 
@@ -315,6 +326,13 @@
 
 
 %changelog
+* Mon Jul 31 2006 Matthew Barnes <mbarnes at redhat.com> - 1.6.3-1.fc5.1
+- Update to 1.6.3
+- Dynamically link to BDB.
+- Add Requires for db4 and BuildRequires for db4-devel.
+- Add missing Requires and BuildRequires from Rawhide.
+- Clean up spec file, renumber patches.
+
 * Tue May 30 2006 Matthew Barnes <mbarnes at redhat.com> - 1.6.2-1.fc5.1
 - Update to 1.6.2
 - Remove evolution-data-server-1.3.5-nspr_fix.patch (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	30 May 2006 14:57:24 -0000	1.43
+++ sources	1 Aug 2006 01:35:53 -0000	1.44
@@ -1 +1 @@
-165f493eec8a2c8fc6eca3fdeb8c4885  evolution-data-server-1.6.2.tar.bz2
+e40343fa6a80916da3f4d1ba5d118c89  evolution-data-server-1.6.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug  1 02:11:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 22:11:30 -0400
Subject: rpms/gnome-python2-extras/devel
	gnome-python-extras-2.14.1-defsdir.patch, NONE,
	1.1 gnome-python-extras.spec, 1.52, 1.53
Message-ID: <200608010211.k712BUeC015490@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-python-extras.spec 
Added Files:
	gnome-python-extras-2.14.1-defsdir.patch 
Log Message:
fix a typo


gnome-python-extras-2.14.1-defsdir.patch:
 configure |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-python-extras-2.14.1-defsdir.patch ---
--- gnome-python-extras-2.14.1/configure.defsdir	2006-07-31 22:12:16.000000000 -0400
+++ gnome-python-extras-2.14.1/configure	2006-07-31 22:12:37.000000000 -0400
@@ -19275,7 +19275,7 @@
 
 echo "$as_me:$LINENO: checking for gnome-python defs" >&5
 echo $ECHO_N "checking for gnome-python defs... $ECHO_C" >&6
-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir gnome-python-2.0`
+GNOME_PYTHON_DEFSDIR=`$PKG_CONFIG --variable=defsdir gnome-python-2.0`
 
 echo "$as_me:$LINENO: result: $GNOME_PYTHON_DEFSDIR" >&5
 echo "${ECHO_T}$GNOME_PYTHON_DEFSDIR" >&6


Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-python-extras.spec	31 Jul 2006 21:49:10 -0000	1.52
+++ gnome-python-extras.spec	1 Aug 2006 02:11:27 -0000	1.53
@@ -11,12 +11,14 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.14.1
-Release: 5
+Release: 6
 License: GPL/LGPL
 Group: Development/Languages
 Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-extras/2.13/gnome-python-extras-%{version}.tar.bz2
 
 Patch0: gnome-python-extras-2.10.0-gtkspell-static.patch
+Patch1: gnome-python-extras-2.14.1-defsdir.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires: gnome-python2 >= %{gnome_python_version}
@@ -80,6 +82,7 @@
 %prep
 %setup -q -n gnome-python-extras-%{version}
 %patch0 -p1 -b .gtkspell-static
+%patch1 -p1 -b .defsdir
 
 %build
 %configure
@@ -128,6 +131,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-6
+- fix a typo in configure
+
 * Mon Jul 31 2006 Jesse Keating <jkeating at redhat.com> - 2.14.1-5
 - again
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 04:01:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 00:01:09 -0400
Subject: rpms/esc/devel esc.spec,1.7,1.8
Message-ID: <200608010401.k71419lG028330@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28270

Modified Files:
	esc.spec 
Log Message:
don't auto-generate requires either



Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- esc.spec	31 Jul 2006 18:27:20 -0000	1.7
+++ esc.spec	1 Aug 2006 04:01:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -21,13 +21,14 @@
 BuildRequires: desktop-file-utils zip binutils
 Requires: pcsc-lite ifd-egate coolkey
 Requires: zip
+Requires: gtk2 libstdc++
 
 # 390 does not have coolkey or smartCards
 # Xulrunner won't compile on ppc64 right now.
 ExcludeArch: s390 s390x ppc64
 
 # We can't allow the internal xulrunner to leak out
-AutoProv: 0
+AutoReqProv: 0
 
 #%define __prelink_undo_cmd %{nil}
 %define escname %{name}-%{version}
@@ -159,6 +160,9 @@
 fi
 
 %changelog
+* Tue Aug  1 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-4
+- Don't auto-generate requires either
+
 * Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-3
 - Don't provide mozilla libraries
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 05:44:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 01:44:09 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.31,
	1.32 weak-modules, 1.5, 1.6
Message-ID: <200608010544.k715i9pa032403@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32297

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
don't use RPM for deps. I was wrong.



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- module-init-tools.spec	31 Jul 2006 01:53:30 -0000	1.31
+++ module-init-tools.spec	1 Aug 2006 05:44:05 -0000	1.32
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.6
+Release: 0.pre1.4.7
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.7
+- Change dependency calculation in weak-modules so it doesn't use RPM.
+
 * Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.6
 - Don't call depmod on removing a kernel.
 - Warn rather than exit if we can't process weak-updates on new kernel


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- weak-modules	31 Jul 2006 01:53:30 -0000	1.5
+++ weak-modules	1 Aug 2006 05:44:05 -0000	1.6
@@ -5,15 +5,15 @@
 # Author: Jon Masters <jcm at redhat.com>
 #
 # When we add and remove kernels from the system, we need to ensure that we
-# keep the symbolic links in /lib/modules up to date. This script drives RPM
-# to find out which driver updates are compatible with installed kernels.
+# keep the symbolic links in /lib/modules up to date. This script magically
+# checks the ABI compatibility of weak-updates and symlinks as appropriate.
 #
 # This software may be freely redistributed under the terms of the GNU
 # General Public License (GPL).
 
 __author__ = "Jon Masters <jcm at redhat.com>"
-__version__ = "1.0"
-__date__ = "2006/07/30 08:00:00"
+__version__ = "2.0"
+__date__ = "2006/08/01 06:30:00"
 __copyright__ = "Copyright (C) 2006 Red Hat, Inc"
 __license__ = "GPL"
 
@@ -91,64 +91,52 @@
 
 		# Store the module version in a dictionary.
 		modules[module] = {	"kver": kver,
-					"package": "",
 					"kabireq": []
 					}
 
-def module_kabideps(modules):
+def module_kabi(modules):
 	"""Calculate the kabideps for a set of modules"""
 
 	for module in modules:
-		pinfo = os.popen("rpm -q --whatprovides " + module)
-		in_line = pinfo.readline()
-		pinfo.close()
-		if in_line == "":
-			print "Cannot find installed package for module: " \
-				+ module
-			sys.exit(1)
-		package = (string.split(in_line))[0]
-
-		# Store the module package in a dictionary.
-		modules[module]["package"] = package
-
-		pinfo = os.popen("rpm -q --requires " + package)
-		p = re.compile('^kernel\(([^\)]*)\) = (.*)$')
+		minfo = os.popen("/sbin/modprobe --dump-modversions "+module)
 		while true:
-			in_line = (string.strip(pinfo.readline()))
+			in_line = minfo.readline()
 			if in_line == "":
 				break
-			m = p.match(in_line)
-			if m:
-				modules[module]["kabireq"].append(in_line)
-		pinfo.close()
+			symver,symbol = string.split(in_line)
+			kabireq=symbol+"="+symver
+			modules[module]["kabireq"].append(kabireq)
+		minfo.close()
 
-def kernel_kabideps(kernels):
+def kernel_kabi(kernels):
 	"""For each installed kernel, determine the full set of kABI deps for
 	   that kernel and store in a giant dictionary hash."""
 
-	kinfo = os.popen("rpm -q kernel")
+	kinfo = os.popen("ls /lib/modules")
 	while true:
-		in_line = (string.strip(kinfo.readline()))
-		if in_line == "":
+		kernel = (string.strip(kinfo.readline()))
+		if kernel == "":
 			break
-		
-		kernel=in_line
-		kernelver=re.sub("kernel-","",in_line)
 
-		kdeps = os.popen("rpm -q --provides " + kernel)
+		symvers="/boot/symvers-"+kernel+".gz"
+		if not os.path.isfile(symvers):
+			# That kernel is not actually installed
+			continue
 
-		p = re.compile('^kernel\(([^\)]*)\) = (.*)$')
+		kdeps = os.popen("zcat "+symvers)
+		p = re.compile('^(0x[0-9a-f]+)\t([0-9a-zA-Z_]+)\t.*$')
 		while true:
-			in_line = (string.strip(kdeps.readline()))
+			in_line = kdeps.readline()
 			if in_line == "":
 				break
 			m = p.match(in_line)
+
 			if m:
-				kabi=in_line
-				if kernels.has_key(kernelver):
-					kernels[kernelver].append([kabi])
+				kabi=m.group(2)+"="+m.group(1)
+				if kernels.has_key(kernel):
+					kernels[kernel].append([kabi])
 				else:
-					kernels[kernelver] = [[kabi]]
+					kernels[kernel] = [[kabi]]
 
 		kdeps.close()
 	kinfo.close()
@@ -181,7 +169,6 @@
 
 			if all_matched:
 				# All kABI deps are good
-
 				if compatibles.has_key(kernel):
 					compatibles[kernel].append(module)
 				else:
@@ -216,8 +203,8 @@
 	compatibles={}
 
 	read_modules(modules)
-	module_kabideps(modules)
-	kernel_kabideps(kernels)
+	module_kabi(modules)
+	kernel_kabi(kernels)
 	check_compatibility(modules,kernels,compatibles)
 
 	#debug
@@ -236,7 +223,7 @@
 			if not m:
 				print "Non-standard module location"
 				sys.exit(1)
-			mod_kern=m.group(1)
+			mod_kern=modules[modfile]["kver"]
 			weak_dir="/lib/modules/" + kernel \
 				+ "/weak-updates/" + m.group(2)
 			weak_link=weak_dir+"/"+m.group(3)
@@ -261,7 +248,7 @@
 	kernels = {}
 
 	read_modules(modules)
-	kernel_kabideps(kernels)
+	kernel_kabi(kernels)
 
 	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
 	for module in modules:
@@ -326,23 +313,18 @@
 
 		# Store the module version in a dictionary.
 		modules[module] = {	"kver": kver,
-					"package": "",
 					"kabireq": []
 					}
 
 	modfiles.close()
 
-	module_kabideps(modules)
-	kernel_kabideps(kernels)
+	module_kabi(modules)
+	kernel_kabi(kernels)
 	check_compatibility(modules,kernels,compatibles)
 
 	if not compatibles.has_key(kernel):
 		print "**** weak-modules did not process this kernel ****"
-		print "weak-updates links not updated for " + kernel
-		print "Please run /sbin/weak-modules --add-kernel `uname -r`"
-		print "in order to update kernel module compatibility links."
-		# Don't error this result because the above warning is enough.
-		sys.exit(0)
+		sys.exit(1)
 
 	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
 	for module in range(0,len(compatibles[kernel])):
@@ -351,7 +333,7 @@
 		if not m:
 			print "Non-standard module location"
 			sys.exit(1)
-		mod_kern=m.group(1)
+		mod_kern=modules[modfile]["kver"]
 		weak_dir="/lib/modules/" + kernel \
 			+ "/weak-updates/" + m.group(2)
 		weak_link=weak_dir+"/"+m.group(3)



From fedora-cvs-commits at redhat.com  Tue Aug  1 05:47:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 01:47:39 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec,1.32,1.33
Message-ID: <200608010547.k715ldjO016032@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15952

Modified Files:
	module-init-tools.spec 
Log Message:
accidentally make weak-modules non-executable.



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- module-init-tools.spec	1 Aug 2006 05:44:05 -0000	1.32
+++ module-init-tools.spec	1 Aug 2006 05:47:37 -0000	1.33
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.7
+Release: 0.pre1.4.8
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.8
+- Make the script executable again.
+
 * Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.7
 - Change dependency calculation in weak-modules so it doesn't use RPM.
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 06:35:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 02:35:34 -0400
Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.3,
	1.4 perl-IO-Socket-SSL.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200608010635.k716ZY5C020075@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/perl-IO-Socket-SSL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20061

Modified Files:
	.cvsignore perl-IO-Socket-SSL.spec sources 
Log Message:
0.994 important bugfixes (#200860)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Jul 2006 01:24:30 -0000	1.3
+++ .cvsignore	1 Aug 2006 06:35:32 -0000	1.4
@@ -1 +1 @@
-IO-Socket-SSL-0.991.tar.gz
+IO-Socket-SSL-0.994.tar.gz


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-IO-Socket-SSL.spec	19 Jul 2006 01:24:30 -0000	1.2
+++ perl-IO-Socket-SSL.spec	1 Aug 2006 06:35:32 -0000	1.3
@@ -4,7 +4,7 @@
 #
 
 Name:           perl-IO-Socket-SSL
-Version:        0.991
+Version:        0.994
 Release:        1%{?dist}
 Summary:        Perl library for transparent SSL
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Aug 01 2006 Warren Togami <wtogami at redhat.com> - 0.994-1
+- 0.994 important bugfixes (#200860)
+
 * Tue Jul 18 2006 Warren Togami <wtogami at redhat.com> - 0.991-1
 - 0.991
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-Socket-SSL/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jul 2006 01:24:30 -0000	1.3
+++ sources	1 Aug 2006 06:35:32 -0000	1.4
@@ -1 +1 @@
-050767e4ef39f53b22aa8ffa6a32f6a3  IO-Socket-SSL-0.991.tar.gz
+e26fe37f2a305a5d408beb94e0be9c64  IO-Socket-SSL-0.994.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  1 07:48:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 03:48:25 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.33,
	1.34 weak-modules, 1.6, 1.7
Message-ID: <200608010748.k717mPH0022470@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22149

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
check explicitly if we're trying to install broken SMP combinations. They won't
load, but it's hardly nice for the user to get into that situation.




Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- module-init-tools.spec	1 Aug 2006 05:47:37 -0000	1.33
+++ module-init-tools.spec	1 Aug 2006 07:48:22 -0000	1.34
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.8
+Release: 0.pre1.4.9
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.9
+- Check explicitly if we're trying to install a non-SMP module on an SMP kernel.
+
 * Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.8
 - Make the script executable again.
 


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- weak-modules	1 Aug 2006 05:44:05 -0000	1.6
+++ weak-modules	1 Aug 2006 07:48:22 -0000	1.7
@@ -12,7 +12,7 @@
 # General Public License (GPL).
 
 __author__ = "Jon Masters <jcm at redhat.com>"
-__version__ = "2.0"
+__version__ = "2.1"
 __date__ = "2006/08/01 06:30:00"
 __copyright__ = "Copyright (C) 2006 Red Hat, Inc"
 __license__ = "GPL"
@@ -60,6 +60,25 @@
         Do not create/remove any files.
 """
 
+def is_smp(module):
+	"""Determine if a given module is built for an SMP kernel"""
+
+	if os.path.isfile(module):
+		minfo = os.popen("/sbin/modinfo -F vermagic " + module)
+		smp = (string.split(minfo.readline()))[1]
+		if smp == "SMP" or smp == "smp":
+			return 1
+		else:
+			return 0
+	else:
+		p = re.compile('^.*/lib/modules/([^/]*)smp.*$')
+		m = p.match(module)
+		if m:
+			return 1
+		else:
+			return 0
+	return 0
+
 def read_modules(modules):
 	"""Read a list of modules from standard input, convert the filenames
 	   into absolute names and compute the kernel release of each module."""
@@ -91,7 +110,7 @@
 
 		# Store the module version in a dictionary.
 		modules[module] = {	"kver": kver,
-					"kabireq": []
+					"kabireq": [],
 					}
 
 def module_kabi(modules):
@@ -154,6 +173,14 @@
 	for module in modules:
 		for kernel in kernels:
 
+			# Add an SMP check so we don't install non-SMP modules
+			# in an SMP kernel - technically a possibile situation
+			p = re.compile('.*smp$')
+			m = p.match(kernel)
+			if m and not is_smp(module):
+					# skip over this situation
+					continue
+
 			all_matched=1
 			for i in range(0,len(modules[module]["kabireq"])):
 				module_abi=modules[module]["kabireq"][i]
@@ -323,8 +350,7 @@
 	check_compatibility(modules,kernels,compatibles)
 
 	if not compatibles.has_key(kernel):
-		print "**** weak-modules did not process this kernel ****"
-		sys.exit(1)
+		sys.exit(0)
 
 	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
 	for module in range(0,len(compatibles[kernel])):



From fedora-cvs-commits at redhat.com  Tue Aug  1 08:09:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 04:09:48 -0400
Subject: rpms/module-init-tools/devel weak-modules,1.7,1.8
Message-ID: <200608010809.k7189mUs028998@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28916

Modified Files:
	weak-modules 
Log Message:
cleanup module removal process.



Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- weak-modules	1 Aug 2006 07:48:22 -0000	1.7
+++ weak-modules	1 Aug 2006 08:09:45 -0000	1.8
@@ -12,7 +12,7 @@
 # General Public License (GPL).
 
 __author__ = "Jon Masters <jcm at redhat.com>"
-__version__ = "2.1"
+__version__ = "2.2"
 __date__ = "2006/08/01 06:30:00"
 __copyright__ = "Copyright (C) 2006 Red Hat, Inc"
 __license__ = "GPL"
@@ -282,7 +282,7 @@
 
 		m = p.match(module)
 		if not m:
-			print "Non-standard module locations"
+			print "Non-standard weak module location"
 			sys.exit(1)
 		weak_link=m.group(2)+"/"+m.group(3)
 
@@ -299,9 +299,7 @@
 						print "remove: " \
 							+ weak_path
 					if dry_run == "no":
-						os.system("rm -f " +weak_path)
-
-						os.system("rmdir " +weak_dir)
+						os.system("rm -rf "+weak_dir)
 						run_depmod(kernel)
 						run_mkinitrd(kernel)	
 
@@ -380,32 +378,16 @@
 def remove_kernel(kernel):
 	"""Remove the given kernel from the system."""
 	
-	weakup_dir = "/lib/modules/" + kernel + "/weak-updates"
+	weakup_dir = "/lib/modules/"+kernel+"/weak-updates"
 	if not os.path.isdir(weakup_dir):
 		print "No weak updates directory found."
 		sys.exit(0)
-	weak_updates = os.popen("find " + weakup_dir + " -iname \"*.ko\"")
 
-	while true:
-		in_line = (weak_updates.readline())[:-1]
-		if in_line == "":
-			break
-		module=in_line
-		p = re.compile('^.*/lib/modules/(.*)/weak-updates/(.*)/(.*)$')
-		m = p.match(module)
-		if not m:
-			print "Non standard module location!"
-			sys.exit(1)
-		weak_dir = weakup_dir+"/"+m.group(2)
-
-		if verbose == "yes":
-			print "remove: " + module
+	if verbose == "yes":
+		print "remove: "+weakup_dir
 
-		if dry_run == "no":
-			os.system("rm -f " + module)
-			os.system("rmdir " + weak_dir)
-			#kernel removed so no need to rerun mkinitrd or depmod
-	
+	if dry_run == "no":
+		os.system("rm -rf "+weakup_dir)
 
 if __name__ == "__main__":
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 08:11:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 04:11:36 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec,1.34,1.35
Message-ID: <200608010811.k718BaVS029382@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29319

Modified Files:
	module-init-tools.spec 
Log Message:
update specfile for build



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- module-init-tools.spec	1 Aug 2006 07:48:22 -0000	1.34
+++ module-init-tools.spec	1 Aug 2006 08:11:34 -0000	1.35
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.9
+Release: 0.pre1.4.10
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.10
+- Cleanup module removal process.
+
 * Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.9
 - Check explicitly if we're trying to install a non-SMP module on an SMP kernel.
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 08:30:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 04:30:13 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.35,
	1.36 weak-modules, 1.8, 1.9
Message-ID: <200608010830.k718UD1D018313@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18154

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
fix depmod handling in weak-modules for many kmods on a single kernel.



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- module-init-tools.spec	1 Aug 2006 08:11:34 -0000	1.35
+++ module-init-tools.spec	1 Aug 2006 08:30:05 -0000	1.36
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.10
+Release: 0.pre1.4.11
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.11
+- Fix depmod handling so we only call once per kernel.
+
 * Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.10
 - Cleanup module removal process.
 


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- weak-modules	1 Aug 2006 08:09:45 -0000	1.8
+++ weak-modules	1 Aug 2006 08:30:05 -0000	1.9
@@ -12,8 +12,8 @@
 # General Public License (GPL).
 
 __author__ = "Jon Masters <jcm at redhat.com>"
-__version__ = "2.2"
-__date__ = "2006/08/01 06:30:00"
+__version__ = "2.3"
+__date__ = "2006/08/01 09:30:00"
 __copyright__ = "Copyright (C) 2006 Red Hat, Inc"
 __license__ = "GPL"
 
@@ -244,6 +244,9 @@
 
 	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
 	for kernel in compatibles:
+
+		do_run_depmod="no"
+
 		for module in range(0,len(compatibles[kernel])):
 			modfile=compatibles[kernel][module]
 			m = p.match(modfile)
@@ -255,17 +258,20 @@
 				+ "/weak-updates/" + m.group(2)
 			weak_link=weak_dir+"/"+m.group(3)
 
-		if mod_kern != kernel:
-			# ignore the kernel that matches the module
+			if mod_kern != kernel:
+				# ignore the kernel that matches the module
 
-			if verbose == "yes":
-				print "create: " + weak_link
+				if verbose == "yes":
+					print "create: " + weak_link
 
-			if dry_run == "no":
-				os.system("mkdir -p " + weak_dir)
-				os.system("ln -sf " + modfile + " " + weak_link)
-				run_depmod(kernel)
-				run_mkinitrd(kernel)
+				if dry_run == "no":
+					os.system("mkdir -p " + weak_dir)
+					os.system("ln -sf "+modfile+" "+ weak_link)
+					do_run_depmod="yes"
+
+		if dry_run=="no" and do_run_depmod=="yes":
+			run_depmod(kernel)
+			run_mkinitrd(kernel)
 
 def remove_modules():
 	"""Read in a list of modules to remove from std input. Remove these
@@ -288,6 +294,8 @@
 
 		for kernel in kernels:
 
+			do_run_depmod="no"
+
 			weak_dir = "/lib/modules/" + kernel \
 				+ "/weak-updates/" + m.group(2)
 			weak_path = weak_dir +"/"+m.group(3)
@@ -300,8 +308,11 @@
 							+ weak_path
 					if dry_run == "no":
 						os.system("rm -rf "+weak_dir)
-						run_depmod(kernel)
-						run_mkinitrd(kernel)	
+						do_run_depmod="yes"
+
+			if dry_run=="no" and do_run_depmod=="yes":
+				run_depmod(kernel)
+				run_mkinitrd(kernel)	
 
 def add_kernel(kernel):
 	"""Add the (specified) system kernel and create update links."""
@@ -372,8 +383,10 @@
 			if dry_run == "no":
 				os.system("mkdir -p " + weak_dir)
 				os.system("ln -sf " + modfile + " " + weak_link)
-				run_depmod(kernel)
-				run_mkinitrd(kernel)
+
+	if dry_run == "no":
+		run_depmod(kernel)
+		run_mkinitrd(kernel)
 
 def remove_kernel(kernel):
 	"""Remove the given kernel from the system."""



From fedora-cvs-commits at redhat.com  Tue Aug  1 08:40:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 04:40:35 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch, NONE,
	1.1 openoffice.org.spec, 1.807, 1.808
Message-ID: <200608010840.k718eZLd020552@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch 
Log Message:
rh#200874#

openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch:
 source/dialog/optjava.cxx     |    0 
 source/dialog/optjava.hxx     |    0 
 svx/source/dialog/optjava.cxx |   10 +++++++++-
 svx/source/dialog/optjava.hxx |    5 +++++
 4 files changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch ---
Index: source/dialog/optjava.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/optjava.hxx,v
retrieving revision 1.5
diff -u -r1.5 optjava.hxx
--- openoffice.org.orig/svx/source/dialog/optjava.hxx	8 Sep 2005 21:46:14 -0000	1.5
+++ openoffice.org/svx/source/dialog/optjava.hxx	1 Aug 2006 08:30:39 -0000
@@ -205,6 +205,11 @@
 
 	bool					IsPathDuplicate( const String& _rPath );
 
+	inline void				EnableRemoveButton()
+								{ m_aRemoveBtn.Enable(
+									m_aPathList.GetSelectEntryPos()
+									!= LISTBOX_ENTRY_NOTFOUND ); }
+
 public:
 	SvxJavaClassPathDlg( Window* pParent );
 	~SvxJavaClassPathDlg();
Index: source/dialog/optjava.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/optjava.cxx,v
retrieving revision 1.11
diff -u -r1.11 optjava.cxx
--- openoffice.org.orig/svx/source/dialog/optjava.cxx	8 May 2006 14:56:15 -0000	1.11
+++ openoffice.org/svx/source/dialog/optjava.cxx	1 Aug 2006 08:30:46 -0000
@@ -943,6 +943,7 @@
 
 	// set initial focus to path list
 	m_aPathList.GrabFocus();
+	EnableRemoveButton();
 }
 
 // -----------------------------------------------------------------------
@@ -984,6 +985,7 @@
 			ErrorBox( this, WB_OK, sMsg ).Execute();
 		}
 	}
+	EnableRemoveButton();
 	return 0;
 }
 
@@ -1010,7 +1012,10 @@
 		INetURLObject aURL( sFolderURL );
 		String sFolder = aURL.getFSysPath( INetURLObject::FSYS_DETECT );
 		if ( !IsPathDuplicate( sFolderURL ) )
-			m_aPathList.InsertEntry( sFolder, SvFileInformationManager::GetImage( aURL ) );
+		{
+			USHORT nPos = m_aPathList.InsertEntry( sFolder, SvFileInformationManager::GetImage(aURL) );
+        	m_aPathList.SelectEntryPos( nPos );
+		}
 		else
 		{
 			String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
@@ -1018,6 +1023,7 @@
 			ErrorBox( this, WB_OK, sMsg ).Execute();
 		}
 	}
+	EnableRemoveButton();
 	return 0;
 }
 
@@ -1038,6 +1044,7 @@
 		}
 	}
 
+	EnableRemoveButton();
 	return 0;
 }
 
@@ -1098,5 +1105,6 @@
 	}
 	// select first entry
 	m_aPathList.SelectEntryPos(0);
+	EnableRemoveButton();
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -r1.807 -r1.808
--- openoffice.org.spec	31 Jul 2006 10:08:23 -0000	1.807
+++ openoffice.org.spec	1 Aug 2006 08:40:31 -0000	1.808
@@ -129,6 +129,7 @@
 Patch63: workspace.configure18.patch
 Patch64: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
 Patch65: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch66: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -925,6 +926,7 @@
 %patch63 -p1 -b .workspace.configure18.patch
 %patch64 -p1 -b .ooo54603.fontconfig.part2.patch
 %patch65 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch66 -p1 -b .ooo68018.svx.classpathdialog.patch
 
 tar xzf %{SOURCE1}
 
@@ -3503,6 +3505,7 @@
 * Mon Jul 31 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.8
 - add openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
 - rh#200703# -> openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+- rh#200874# -> openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch



From fedora-cvs-commits at redhat.com  Tue Aug  1 09:19:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 05:19:43 -0400
Subject: rpms/m17n-db/devel .cvsignore, 1.21, 1.22 m17n-db.spec, 1.29,
	1.30 sources, 1.23, 1.24
Message-ID: <200608010919.k719JhJI027604@cvs.devel.redhat.com>

Author: majain

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

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
Fixed bug 200876 for failing malayalam keymap



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	17 Jul 2006 12:41:19 -0000	1.21
+++ .cvsignore	1 Aug 2006 09:19:40 -0000	1.22
@@ -10,3 +10,4 @@
 m17n-db-indic-0.4.8.tar.gz
 m17n-db-indic-0.4.9.tar.gz
 m17n-db-indic-0.4.10.tar.gz
+m17n-db-indic-0.4.11.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- m17n-db.spec	25 Jul 2006 03:52:30 -0000	1.29
+++ m17n-db.spec	1 Aug 2006 09:19:40 -0000	1.30
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.10
+%define indic_ver 0.4.11
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	14%{?dist}
+Release:	15%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -682,6 +682,9 @@
 
 
 %changelog
+* Tue Aug 1 2006 Mayank Jain <majain at redhat.com>
+- Corrected ml-inscript.mim file, RH bz #200876
+
 * Tue Jul 25 2006 Jens Petersen <petersen at redhat.com> - 1.3.3-14
 - move bopomofo to chinese subpackage
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 Jul 2006 12:41:19 -0000	1.23
+++ sources	1 Aug 2006 09:19:40 -0000	1.24
@@ -1,2 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-b3f2da54dfdf04342578bbf0765d0c34  m17n-db-indic-0.4.10.tar.gz
+cf315686111755874fcfbd8330c1d008  m17n-db-indic-0.4.11.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  1 09:31:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 05:31:07 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.36,
	1.37 weak-modules, 1.9, 1.10
Message-ID: <200608010931.k719V7Vw008707@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8694

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
fixed symlink handling in weak-modules.



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- module-init-tools.spec	1 Aug 2006 08:30:05 -0000	1.36
+++ module-init-tools.spec	1 Aug 2006 09:31:04 -0000	1.37
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.11
+Release: 0.pre1.4.12
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.12
+- Fix remove of modules in weak-modules (broken symlinks).
+
 * Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.11
 - Fix depmod handling so we only call once per kernel.
 


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- weak-modules	1 Aug 2006 08:30:05 -0000	1.9
+++ weak-modules	1 Aug 2006 09:31:04 -0000	1.10
@@ -12,8 +12,8 @@
 # General Public License (GPL).
 
 __author__ = "Jon Masters <jcm at redhat.com>"
-__version__ = "2.3"
-__date__ = "2006/08/01 09:30:00"
+__version__ = "2.4"
+__date__ = "2006/08/01 10:30:00"
 __copyright__ = "Copyright (C) 2006 Red Hat, Inc"
 __license__ = "GPL"
 
@@ -300,7 +300,8 @@
 				+ "/weak-updates/" + m.group(2)
 			weak_path = weak_dir +"/"+m.group(3)
 
-			if os.path.isfile(weak_path):
+			print "weak_path: "+weak_path
+			if os.path.lexists(weak_path):
 				weak_modfile=os.readlink(weak_path)
 				if weak_modfile == module:
 					if verbose == "yes":



From fedora-cvs-commits at redhat.com  Tue Aug  1 09:45:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 05:45:05 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.37,
	1.38 weak-modules, 1.10, 1.11
Message-ID: <200608010945.k719j4os008824@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8809

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
Handle really stupid modules.



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- module-init-tools.spec	1 Aug 2006 09:31:04 -0000	1.37
+++ module-init-tools.spec	1 Aug 2006 09:44:43 -0000	1.38
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.12
+Release: 0.pre1.4.13
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.13
+- Fix remove of modules in weak-modules (for broken module locations).
+
 * Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.12
 - Fix remove of modules in weak-modules (broken symlinks).
 


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- weak-modules	1 Aug 2006 09:31:04 -0000	1.10
+++ weak-modules	1 Aug 2006 09:44:43 -0000	1.11
@@ -12,8 +12,8 @@
 # General Public License (GPL).
 
 __author__ = "Jon Masters <jcm at redhat.com>"
-__version__ = "2.4"
-__date__ = "2006/08/01 10:30:00"
+__version__ = "2.5"
+__date__ = "2006/08/01 10:43:00"
 __copyright__ = "Copyright (C) 2006 Red Hat, Inc"
 __license__ = "GPL"
 
@@ -283,7 +283,7 @@
 	read_modules(modules)
 	kernel_kabi(kernels)
 
-	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
+	p = re.compile('^.*/lib/modules/([^/]*)/extra/([^/]*)/(.*)$')
 	for module in modules:
 
 		m = p.match(module)
@@ -300,13 +300,12 @@
 				+ "/weak-updates/" + m.group(2)
 			weak_path = weak_dir +"/"+m.group(3)
 
-			print "weak_path: "+weak_path
 			if os.path.lexists(weak_path):
 				weak_modfile=os.readlink(weak_path)
 				if weak_modfile == module:
 					if verbose == "yes":
 						print "remove: " \
-							+ weak_path
+							+ weak_dir
 					if dry_run == "no":
 						os.system("rm -rf "+weak_dir)
 						do_run_depmod="yes"



From fedora-cvs-commits at redhat.com  Tue Aug  1 09:45:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 05:45:55 -0400
Subject: rpms/hal-cups-utils/devel hal-cups-utils-uri.patch, NONE,
	1.1 hal-cups-utils.spec, 1.39, 1.40
Message-ID: <200608010945.k719jta9008893@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hal-cups-utils.spec 
Added Files:
	hal-cups-utils-uri.patch 
Log Message:
* Tue Aug  1 2006 Tim Waugh <twaugh at redhat.com> - 0.6.2-3
- Fixed hal_lpadmin's CUPS URI (bug #200682).


hal-cups-utils-uri.patch:
 hal_lpadmin |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hal-cups-utils-uri.patch ---
--- hal-cups-utils-0.6.2/systemv/hal_lpadmin.uri	2006-08-01 10:39:39.000000000 +0100
+++ hal-cups-utils-0.6.2/systemv/hal_lpadmin	2006-08-01 10:44:03.000000000 +0100
@@ -41,11 +41,11 @@
         return name.replace("#", "_")
 
     def get_cups_uris(self):
-        return ["hal:%s" % self.uid,
+        return ["hal://%s" % self.uid,
                 ]
 
     def get_cups_uri(self):
-        return "hal:%s" % self.uid
+        return "hal://%s" % self.uid
 
     def match(self, printer):
         if printer.is_class: return False


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- hal-cups-utils.spec	19 Jul 2006 00:34:29 -0000	1.39
+++ hal-cups-utils.spec	1 Aug 2006 09:45:52 -0000	1.40
@@ -1,12 +1,13 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
 Version: 0.6.2
-Release: 2 
+Release: 3 
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
 Source1: cups-config-daemon
 Patch0: hal-cups-utils-0.6.0-remove-cups-backenddir-check.patch
+Patch1: hal-cups-utils-uri.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
@@ -30,6 +31,7 @@
 
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .uri
 
 %build
 
@@ -65,6 +67,9 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Tue Aug  1 2006 Tim Waugh <twaugh at redhat.com> - 0.6.2-3
+- Fixed hal_lpadmin's CUPS URI (bug #200682).
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.6.2-2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 09:55:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 05:55:34 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.38,
	1.39 weak-modules, 1.11, 1.12
Message-ID: <200608010955.k719tYNe023829@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23815

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
Remove a silly warning



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- module-init-tools.spec	1 Aug 2006 09:44:43 -0000	1.38
+++ module-init-tools.spec	1 Aug 2006 09:55:32 -0000	1.39
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.13
+Release: 0.pre1.4.14
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,25 +98,10 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
-* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.13
-- Fix remove of modules in weak-modules (for broken module locations).
-
-* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.12
+* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.14
 - Fix remove of modules in weak-modules (broken symlinks).
-
-* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.11
 - Fix depmod handling so we only call once per kernel.
-
-* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.10
-- Cleanup module removal process.
-
-* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.9
 - Check explicitly if we're trying to install a non-SMP module on an SMP kernel.
-
-* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.8
-- Make the script executable again.
-
-* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.7
 - Change dependency calculation in weak-modules so it doesn't use RPM.
 
 * Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.6


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- weak-modules	1 Aug 2006 09:44:43 -0000	1.11
+++ weak-modules	1 Aug 2006 09:55:32 -0000	1.12
@@ -12,8 +12,8 @@
 # General Public License (GPL).
 
 __author__ = "Jon Masters <jcm at redhat.com>"
-__version__ = "2.5"
-__date__ = "2006/08/01 10:43:00"
+__version__ = "2.6"
+__date__ = "2006/08/01 10:54:00"
 __copyright__ = "Copyright (C) 2006 Red Hat, Inc"
 __license__ = "GPL"
 
@@ -393,7 +393,6 @@
 	
 	weakup_dir = "/lib/modules/"+kernel+"/weak-updates"
 	if not os.path.isdir(weakup_dir):
-		print "No weak updates directory found."
 		sys.exit(0)
 
 	if verbose == "yes":



From fedora-cvs-commits at redhat.com  Tue Aug  1 10:39:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 06:39:09 -0400
Subject: rpms/pam/FC-5 Linux-PAM-0.99.5.0.tar.bz2.sign, NONE,
	1.1 pam-0.99.5.0-access-gai.patch, NONE,
	1.1 pam-0.99.5.0-keyinit-no-debug.patch, NONE,
	1.1 pam-0.99.5.0-namespace-init.patch, NONE,
	1.1 pam-0.99.5.0-redhat-modules.patch, NONE,
	1.1 pam-0.99.5.0-selinux-drop-multiple.patch, NONE,
	1.1 pam-0.99.5.0-selinux-enoent.patch, NONE, 1.1 .cvsignore,
	1.34, 1.35 pam.spec, 1.107, 1.108 sources, 1.36,
	1.37 system-auth.pamd, 1.4,
	1.5 Linux-PAM-0.99.4.0.tar.bz2.sign, 1.1,
	NONE pam-0.99.2.1-selinux-drop-multiple.patch, 1.1,
	NONE pam-0.99.4.0-console-no-var-access.patch, 1.1,
	NONE pam-0.99.4.0-redhat-modules.patch, 1.1,
	NONE pam-0.99.4.0-tally-large-uid.patch, 1.1,
	NONE pam-0.99.4.0-timestamp-no-hmactest.patch, 1.1, NONE
Message-ID: <200608011039.k71Ad9Qb025134@cvs.devel.redhat.com>

Author: tmraz

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

Modified Files:
	.cvsignore pam.spec sources system-auth.pamd 
Added Files:
	Linux-PAM-0.99.5.0.tar.bz2.sign pam-0.99.5.0-access-gai.patch 
	pam-0.99.5.0-keyinit-no-debug.patch 
	pam-0.99.5.0-namespace-init.patch 
	pam-0.99.5.0-redhat-modules.patch 
	pam-0.99.5.0-selinux-drop-multiple.patch 
	pam-0.99.5.0-selinux-enoent.patch 
Removed Files:
	Linux-PAM-0.99.4.0.tar.bz2.sign 
	pam-0.99.2.1-selinux-drop-multiple.patch 
	pam-0.99.4.0-console-no-var-access.patch 
	pam-0.99.4.0-redhat-modules.patch 
	pam-0.99.4.0-tally-large-uid.patch 
	pam-0.99.4.0-timestamp-no-hmactest.patch 
Log Message:
* Tue Aug  1 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-5.fc5
- rebuild for FC5 - ainit back, dropped pam_namespace



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

iD8DBQBEomKgyGugalF9Dw4RAqVrAJ4wLBL+wR1/jfQXxpN2M5Lg0ynjeQCfTCrF
x0gKMyZk1ABjWdmVsDZtZZk=
=1gjN
-----END PGP SIGNATURE-----

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

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

pam-0.99.5.0-keyinit-no-debug.patch:
 pam_keyinit.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pam-0.99.5.0-keyinit-no-debug.patch ---
--- Linux-PAM-0.99.5.0/modules/pam_keyinit/pam_keyinit.c.no-debug	2006-06-28 09:22:43.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/pam_keyinit/pam_keyinit.c	2006-07-22 00:35:04.000000000 +0200
@@ -32,7 +32,7 @@
 
 static int my_session_keyring;
 static int do_revoke;
-static int xdebug = 1;
+static int xdebug = 0;
 
 static void debug(pam_handle_t *pamh, const char *fmt, ...)
 	__attribute__((format(printf, 2, 3)));

pam-0.99.5.0-namespace-init.patch:
 namespace.init |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+)

--- NEW FILE pam-0.99.5.0-namespace-init.patch ---
--- /dev/null      2006-06-20 14:49:34.000000000 +0000
+++ pam_namespace0620+patch/modules/pam_namespace/namespace.init        2006-06-20 16:09:48.000000000 +0000
@@ -0,0 +1,24 @@
+#!/bin/sh
+# This is only a boilerplate for the instance initialization script.
+# It receives polydir path as $1 and the instance path as $2.
+#
+# If you intend to polyinstantiate /tmp and you also want to use the X windows
+# environment, you will have to use this script to bind mount the socket that
+# is used by the X server to communicate with its clients. X server places
+# this socket in /tmp/.X11-unix directory, which will get obscured by
+# polyinstantiation. Uncommenting the following lines will bind mount
+# the relevant directory at an alternative location (/.tmp/.X11-unix) such
+# that the X server, window manager and X clients, can still find the
+# socket X0 at the polyinstanted /tmp/.X11-unix.
+#
+#if [ $1 = /tmp ]; then
+#      if [ ! -f /.tmp/.X11-unix ]; then
+#              mkdir -p /.tmp/.X11-unix
+#      fi
+#      mount --bind /tmp/.X11-unix /.tmp/.X11-unix
+#      cp -fp -- /tmp/.X0-lock "$2/.X0-lock"
+#      mkdir -- "$2/.X11-unix"
+#      ln -fs -- /.tmp/.X11-unix/X0 "$2/.X11-unix/X0"
+#fi
+
+exit 0

pam-0.99.5.0-redhat-modules.patch:
 configure.in        |    4 ++++
 libpam/libpam.map   |   11 +++++++++++
 modules/Makefile.am |    2 ++
 3 files changed, 17 insertions(+)

--- NEW FILE pam-0.99.5.0-redhat-modules.patch ---
--- Linux-PAM-0.99.5.0/configure.in.redhat-modules	2006-06-28 09:25:02.000000000 +0200
+++ Linux-PAM-0.99.5.0/configure.in	2006-06-30 10:24:35.000000000 +0200
@@ -492,6 +492,10 @@
 	libpam_misc/Makefile conf/Makefile conf/pam_conv1/Makefile \
 	po/Makefile.in \
 	modules/Makefile \
+	modules/pam_chroot/Makefile modules/pam_console/Makefile \
+	modules/pam_loginuid/Makefile modules/pam_postgresok/Makefile \
+	modules/pam_rps/Makefile modules/pam_stack/Makefile \
+	modules/pam_timestamp/Makefile modules/pam_tally2/Makefile \
 	modules/pam_access/Makefile modules/pam_cracklib/Makefile \
         modules/pam_debug/Makefile modules/pam_deny/Makefile \
 	modules/pam_echo/Makefile modules/pam_env/Makefile \
--- Linux-PAM-0.99.5.0/libpam/libpam.map.redhat-modules	2006-06-14 13:49:10.000000000 +0200
+++ Linux-PAM-0.99.5.0/libpam/libpam.map	2006-06-30 10:24:35.000000000 +0200
@@ -45,3 +45,14 @@
     pam_modutil_read;
     pam_modutil_write;
 };
+
+LIBPAM_INTERNAL_DONTUSE_1.0 {
+  global:
+    _pam_dispatch;
+    _pam_drop_env;
+    _pam_free_handlers;
+    _pam_init_handlers;
+    _pam_make_env;
+    _pam_start_handlers;
+    _pam_strdup;
+};
--- Linux-PAM-0.99.5.0/modules/Makefile.am.redhat-modules	2006-06-27 16:21:08.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/Makefile.am	2006-06-30 10:27:02.000000000 +0200
@@ -3,6 +3,8 @@
 #
 
 SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \
+	pam_chroot pam_console pam_loginuid pam_postgresok pam_rps \
+	pam_stack pam_timestamp pam_tally2 \
 	pam_env pam_filter pam_ftp pam_group pam_issue pam_keyinit \
 	pam_lastlog pam_limits pam_listfile pam_localuser pam_mail \
 	pam_mkhomedir pam_motd pam_nologin pam_permit pam_rhosts pam_rootok \

pam-0.99.5.0-selinux-drop-multiple.patch:
 pam_selinux.8.xml |   12 ----------
 pam_selinux.c     |   64 ++----------------------------------------------------
 2 files changed, 3 insertions(+), 73 deletions(-)

--- NEW FILE pam-0.99.5.0-selinux-drop-multiple.patch ---
--- Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.8.xml.drop-multiple	2006-06-18 10:26:59.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.8.xml	2006-06-30 10:29:59.000000000 +0200
@@ -93,18 +93,6 @@
       </varlistentry>
       <varlistentry>
         <term>
-          <option>multiple</option>
-        </term>
-        <listitem>
-          <para>
-            Tells pam_selinux.so to allow the user to  select  the
-            security context  they  will  login  with, if the user has
-            more than one role.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
           <option>open</option>
         </term>
         <listitem>
--- Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.c.drop-multiple	2006-06-30 10:28:37.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.c	2006-06-30 10:28:37.000000000 +0200
@@ -89,56 +89,6 @@
 }
 
 static security_context_t
-select_context (pam_handle_t *pamh, security_context_t* contextlist,
-		int debug)
-{
-  char *responses;
-  char *text=calloc(PATH_MAX,1);
-
-  if (text == NULL)
-    return (security_context_t) strdup(contextlist[0]);
-
-  snprintf(text, PATH_MAX,
-	   _("Your default context is %s. \n"), contextlist[0]);
-  send_text(pamh,text,debug);
-  free(text);
-  query_response(pamh,_("Do you want to choose a different one? [n]"),
-		 &responses,debug);
-  if (responses && ((responses[0] == 'y') ||
-		    (responses[0] == 'Y')))
-    {
-      int choice=0;
-      int i;
-      const char *prompt=_("Enter number of choice: ");
-      int len=strlen(prompt);
-      char buf[PATH_MAX];
-
-      _pam_drop(responses);
-      for (i = 0; contextlist[i]; i++) {
-	len+=strlen(contextlist[i]) + 10;
-      }
-      text=calloc(len,1);
-      for (i = 0; contextlist[i]; i++) {
-	snprintf(buf, PATH_MAX,
-		 "[%d] %s\n", i+1, contextlist[i]);
-	strncat(text,buf,len);
-      }
-      strcat(text,prompt);
-      while ((choice < 1) || (choice > i)) {
-	query_response(pamh,text,&responses,debug);
-	choice = strtol (responses, NULL, 10);
-	_pam_drop(responses);
-      }
-      free(text);
-      return (security_context_t) strdup(contextlist[choice-1]);
-    }
-  else if (responses)
-    _pam_drop(responses);
-
-  return (security_context_t) strdup(contextlist[0]);
-}
-
-static security_context_t
 manual_context (pam_handle_t *pamh, const char *user, int debug)
 {
   security_context_t newcon;
@@ -321,7 +271,7 @@
 		    int argc, const char **argv)
 {
   int i, debug = 0, ttys=1, has_tty=isatty(0);
-  int verbose=0, multiple=0, close_session=0;
+  int verbose=0, close_session=0;
   int ret = 0;
   security_context_t* contextlist = NULL;
   int num_contexts = 0;
@@ -341,9 +291,6 @@
     if (strcmp(argv[i], "verbose") == 0) {
       verbose = 1;
     }
-    if (strcmp(argv[i], "multiple") == 0) {
-      multiple = 1;
-    }
     if (strcmp(argv[i], "close") == 0) {
       close_session = 1;
     }
@@ -376,13 +323,8 @@
 	  free(level);
   }
   if (num_contexts > 0) {
-    if (multiple && (num_contexts > 1) && has_tty) {
-      user_context = select_context(pamh,contextlist, debug);
-      freeconary(contextlist);
-    } else {
-      user_context = (security_context_t) strdup(contextlist[0]);
-      freeconary(contextlist);
-    }
+    user_context = (security_context_t) strdup(contextlist[0]);
+    freeconary(contextlist);
   } else {
     if (has_tty) {
       user_context = manual_context(pamh,username,debug);

pam-0.99.5.0-selinux-enoent.patch:
 pam_selinux.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE pam-0.99.5.0-selinux-enoent.patch ---
--- Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.c.enoent	2006-06-30 12:05:15.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.c	2006-07-17 11:06:18.000000000 +0200
@@ -206,10 +206,11 @@
 
   if (getfilecon(ptr, &prev_context) < 0)
   {
-    pam_syslog(pamh, LOG_NOTICE,
+    if(errno != ENOENT)
+      pam_syslog(pamh, LOG_NOTICE,
 	     "Warning!  Could not get current context for %s, not relabeling: %m",
 	     ptr);
-      return NULL;
+    return NULL;
   }
   if( security_compute_relabel(usercon,prev_context,SECCLASS_CHR_FILE,
                                &newdev_context)!=0)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pam/FC-5/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	15 May 2006 16:43:41 -0000	1.34
+++ .cvsignore	1 Aug 2006 10:39:02 -0000	1.35
@@ -1,3 +1,3 @@
 db-4.3.29.tar.gz
-pam-redhat-0.99.5-1.tar.bz2
-Linux-PAM-0.99.4.0.tar.bz2
+Linux-PAM-0.99.5.0.tar.bz2
+pam-redhat-0.99.6-1.tar.bz2


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/FC-5/pam.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- pam.spec	24 May 2006 12:51:46 -0000	1.107
+++ pam.spec	1 Aug 2006 10:39:02 -0000	1.108
@@ -6,12 +6,12 @@
 %define pwdb_version 0.62
 %define db_version 4.3.29
 %define db_conflicting_version 4.4.0
-%define pam_redhat_version 0.99.5-1
+%define pam_redhat_version 0.99.6-1
 
-Summary: A security tool which provides authentication for applications.
+Summary: A security tool which provides authentication for applications
 Name: pam
-Version: 0.99.4.0
-Release: fc5.4
+Version: 0.99.5.0
+Release: 5%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -24,33 +24,37 @@
 Source8: dlopen.sh
 Source9: system-auth.5
 Source10: config-util.5
-Patch1: pam-0.99.4.0-redhat-modules.patch
+Patch1: pam-0.99.5.0-redhat-modules.patch
 Patch21: pam-0.78-unix-hpux-aging.patch
 Patch28: pam-0.75-sgml2latex.patch
 Patch34: pam-0.99.4.0-dbpam.patch
 Patch70: pam-0.99.2.1-selinux-nofail.patch
-Patch80: pam-0.99.2.1-selinux-drop-multiple.patch
+Patch80: pam-0.99.5.0-selinux-drop-multiple.patch
 Patch81: pam-0.99.3.0-cracklib-try-first-pass.patch
 Patch82: pam-0.99.3.0-tally-fail-close.patch
-Patch83: pam-0.99.4.0-tally-large-uid.patch
-Patch84: pam-0.99.4.0-console-no-var-access.patch
-Patch85: pam-0.99.4.0-timestamp-no-hmactest.patch
+Patch83: pam-0.99.4.0-succif-service.patch
+Patch84: pam-0.99.5.0-access-gai.patch
+Patch85: pam-0.99.5.0-selinux-enoent.patch
+Patch87: pam-0.99.5.0-keyinit-no-debug.patch
+Patch90: pam-0.99.5.0-namespace-init.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8
 Obsoletes: pamconfig
 Prereq: grep, mktemp, sed, coreutils, /sbin/ldconfig
-BuildPrereq: autoconf, automake, bison, flex, sed
-BuildPrereq: cracklib, cracklib-dicts >= 2.8
-BuildPrereq: perl, pkgconfig
+BuildRequires: autoconf, automake, libtool
+BuildRequires: bison, flex, sed
+BuildRequires: cracklib, cracklib-dicts >= 2.8
+BuildRequires: perl, pkgconfig
 %if %{WITH_AUDIT}
-BuildPrereq: audit-libs-devel >= 1.0.8
+BuildRequires: audit-libs-devel >= 1.0.8
 Requires: audit-libs >= 1.0.8
 %endif
-BuildPrereq: libselinux-devel >= 1.27.7
+BuildRequires: libselinux-devel >= 1.27.7
 Requires: libselinux >= 1.27.7
 # Following deps are necessary only to build the pam library documentation.
-BuildPrereq: linuxdoc-tools, w3m, libxslt, docbook-style-xsl, docbook-dtds
+BuildRequires: linuxdoc-tools, w3m, libxslt
+BuildRequires: docbook-style-xsl, docbook-dtds
 
 URL: http://www.us.kernel.org/pub/linux/libs/pam/index.html
 
@@ -66,7 +70,7 @@
 
 %package devel
 Group: Development/Libraries
-Summary: Files needed for developing PAM-aware applications and modules for PAM.
+Summary: Files needed for developing PAM-aware applications and modules for PAM
 Requires: pam = %{version}-%{release}
 
 %description devel
@@ -78,9 +82,9 @@
 
 %prep
 %setup -q -n Linux-PAM-%{version} -a 2 -a 4
-cp $RPM_SOURCE_DIR/other.pamd .
-cp $RPM_SOURCE_DIR/system-auth.pamd .
-cp $RPM_SOURCE_DIR/config-util.pamd .
+cp %{SOURCE5} .
+cp %{SOURCE6} .
+cp %{SOURCE7} .
 
 %patch1 -p1 -b .redhat-modules
 %patch21 -p1 -b .unix-hpux-aging
@@ -90,9 +94,11 @@
 %patch80 -p1 -b .drop-multiple
 %patch81 -p1 -b .try-first-pass
 %patch82 -p1 -b .fail-close
-%patch83 -p1 -b .large-uid
-%patch84 -p1 -b .no-var-access
-%patch85 -p1 -b .no-hmactest
+%patch83 -p1 -b .service
+%patch84 -p0 -b .gai
+%patch85 -p1 -b .enoent
+%patch87 -p1 -b .no-debug
+%patch90 -p1 -b .namespace-init
 
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -155,6 +161,9 @@
 # Install man pages.
 install -m 644 %{SOURCE9} %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man5/
 
+# Drop pam_namespace subdir which doesn't build on FC5
+rm -rf modules/pam_namespace
+
 # Make sure every module subdirectory gave us a module.  Yes, this is hackish.
 for dir in modules/pam_* ; do
 if [ -d ${dir} ] ; then
@@ -293,6 +302,7 @@
 /%{_lib}/security/pam_ftp.so
 /%{_lib}/security/pam_group.so
 /%{_lib}/security/pam_issue.so
+/%{_lib}/security/pam_keyinit.so
 /%{_lib}/security/pam_lastlog.so
 /%{_lib}/security/pam_limits.so
 /%{_lib}/security/pam_listfile.so
@@ -304,6 +314,7 @@
 /%{_lib}/security/pam_nologin.so
 /%{_lib}/security/pam_permit.so
 /%{_lib}/security/pam_postgresok.so
+/%{_lib}/security/pam_rhosts.so
 /%{_lib}/security/pam_rhosts_auth.so
 /%{_lib}/security/pam_rootok.so
 /%{_lib}/security/pam_rps.so
@@ -354,8 +365,36 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
-* Wed May 24 2006 Tomas Mraz <tmraz at redhat.com> 0.99.4.0-fc5.4
-- dropped pam_namespace for FC5 build
+* Tue Aug  1 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-5.fc5
+- rebuild for FC5 - ainit back, dropped pam_namespace
+
+* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-5
+- don't log pam_keyinit debug messages by default (#199783)
+
+* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-4
+- drop ainit from console.handlers (#199561)
+
+* Mon Jul 17 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-3
+- don't report error in pam_selinux for nonexistent tty (#188722)
+- add pam_keyinit to the default system-auth file (#198623)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.99.5.0-2.1
+- rebuild
+
+* Mon Jul  3 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-2
+- fixed network match in pam_access (patch by Dan Yefimov)
+
+* Fri Jun 30 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-1
+- updated to a new upstream release
+- added service as value to be matched and list matching to
+  pam_succeed_if
+- namespace.init was missing from EXTRA_DIST
+
+* Thu Jun  8 2006 Tomas Mraz <tmraz at redhat.com> 0.99.4.0-5
+- updated pam_namespace with latest patch by Janak Desai
+- merged pam_namespace patches
+- added buildrequires libtool
+- fixed a few rpmlint warnings
 
 * Wed May 24 2006 Tomas Mraz <tmraz at redhat.com> 0.99.4.0-4
 - actually don't link to libssl as it is not used (#191915)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pam/FC-5/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	15 May 2006 16:43:41 -0000	1.36
+++ sources	1 Aug 2006 10:39:02 -0000	1.37
@@ -1,3 +1,3 @@
 13585a20ce32f113b8e8cdb57f52e3bb  db-4.3.29.tar.gz
-e2edde7861c48195728bc531e5a277e0  pam-redhat-0.99.5-1.tar.bz2
-267ea71253615342261f9fc486d06647  Linux-PAM-0.99.4.0.tar.bz2
+dbc8608b2a9bc6b8cf50dd1fbc68cf3b  Linux-PAM-0.99.5.0.tar.bz2
+2dc76a335ddf9e4259aa4e00e5ebaf61  pam-redhat-0.99.6-1.tar.bz2


Index: system-auth.pamd
===================================================================
RCS file: /cvs/dist/rpms/pam/FC-5/system-auth.pamd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- system-auth.pamd	24 Feb 2006 10:46:47 -0000	1.4
+++ system-auth.pamd	1 Aug 2006 10:39:02 -0000	1.5
@@ -11,5 +11,6 @@
 password    sufficient    pam_unix.so try_first_pass use_authtok nullok md5 shadow
 password    required      pam_deny.so
 
+session     optional      pam_keyinit.so revoke
 session     required      pam_limits.so
 session     required      pam_unix.so


--- Linux-PAM-0.99.4.0.tar.bz2.sign DELETED ---


--- pam-0.99.2.1-selinux-drop-multiple.patch DELETED ---


--- pam-0.99.4.0-console-no-var-access.patch DELETED ---


--- pam-0.99.4.0-redhat-modules.patch DELETED ---


--- pam-0.99.4.0-tally-large-uid.patch DELETED ---


--- pam-0.99.4.0-timestamp-no-hmactest.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 10:47:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 06:47:07 -0400
Subject: rpms/pam/FC-5 pam-0.99.4.0-succif-service.patch,NONE,1.1
Message-ID: <200608011047.k71Al7Ix010153@cvs.devel.redhat.com>

Author: tmraz

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

Added Files:
	pam-0.99.4.0-succif-service.patch 
Log Message:
* Tue Aug  1 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-5.fc5
- rebuild for FC5 - ainit back, dropped pam_namespace


pam-0.99.4.0-succif-service.patch:
 pam_succeed_if.8.xml |   27 ++++++++++++++++++++++++++-
 pam_succeed_if.c     |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)

--- NEW FILE pam-0.99.4.0-succif-service.patch ---
--- pam/modules/pam_succeed_if/pam_succeed_if.c.service	2006-02-24 20:17:59.000000000 +0100
+++ pam/modules/pam_succeed_if/pam_succeed_if.c	2006-06-29 17:25:25.000000000 +0200
@@ -184,6 +184,27 @@
 {
 	return (fnmatch(right, left, 0) != 0) ? PAM_SUCCESS : PAM_AUTH_ERR;
 }
+/* Check for list match. */
+static int
+evaluate_inlist(const char *left, const char *right)
+{
+	char *p;
+	if ((p=strstr(right, left)) == NULL)
+		return PAM_AUTH_ERR;
+	if (p == right || *(p-1) == ':') { /* ':' is a list separator */
+		p += strlen(left);
+		if (*p == '\0' || *p == ':') {
+		    return PAM_SUCCESS;
+		}
+	}
+	return PAM_AUTH_ERR;
+}
+/* Check for list mismatch. */
+static int
+evaluate_notinlist(const char *left, const char *right)
+{
+	return evaluate_inlist(left, right) != PAM_SUCCESS ? PAM_SUCCESS : PAM_AUTH_ERR;
+}
 /* Return PAM_SUCCESS if the user is in the group. */
 static int
 evaluate_ingroup(pam_handle_t *pamh, const char *user, const char *group)
@@ -250,6 +271,13 @@
 		snprintf(buf, sizeof(buf), "%s", pwd->pw_dir);
 		left = buf;
 	}
+	if (strcasecmp(left, "service") == 0) {
+		const void *svc;
+		if (pam_get_item(pamh, PAM_SERVICE, &svc) != PAM_SUCCESS)
+			svc = "";
+		snprintf(buf, sizeof(buf), "%s", svc);
+		left = buf;
+	}
 	/* If we have no idea what's going on, return an error. */
 	if (left != buf) {
 		pam_syslog(pamh, LOG_CRIT, "unknown attribute \"%s\"", left);
@@ -305,6 +333,13 @@
 	    (strcasecmp(qual, "noglob") == 0)) {
 		return evaluate_noglob(left, right);
 	}
+	/* Attribute value matches item in list. */
+	if (strcasecmp(qual, "in") == 0) {
+		return evaluate_inlist(left, right);
+	}
+	if (strcasecmp(qual, "notin") == 0) {
+		return evaluate_notinlist(left, right);
+	}
 	/* User is in this group. */
 	if (strcasecmp(qual, "ingroup") == 0) {
 		return evaluate_ingroup(pamh, pwd->pw_name, right);
--- pam/modules/pam_succeed_if/pam_succeed_if.8.xml.service	2006-06-27 10:09:27.000000000 +0200
+++ pam/modules/pam_succeed_if/pam_succeed_if.8.xml	2006-06-29 17:11:50.000000000 +0200
@@ -97,7 +97,8 @@
     <para>
       Available fields are <emphasis>user</emphasis>,
       <emphasis>uid</emphasis>, <emphasis>gid</emphasis>,
-      <emphasis>shell</emphasis> and <emphasis>home</emphasis>:
+      <emphasis>shell</emphasis>, <emphasis>home</emphasis>
+      and <emphasis>service</emphasis>:
     </para>
 
     <variablelist>
@@ -176,6 +177,18 @@
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term><option>field in item:item:...</option></term>
+        <listitem>
+          <para>Field is contained in the list of items separated by colons.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>field notin item:item:...</option></term>
+        <listitem>
+          <para>Field is not contained in the list of items separated by colons.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>user ingroup group</option></term>
         <listitem>
           <para>User is in given group.</para>
@@ -187,6 +200,18 @@
           <para>User is not in given group.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>user innetgr netgroup</option></term>
+        <listitem>
+          <para>(user,host) is in given netgroup.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>user notinnetgr group</option></term>
+        <listitem>
+          <para>(user,host) is not in given netgroup.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 11:09:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 07:09:42 -0400
Subject: rpms/pam/FC-5 pam.spec,1.108,1.109
Message-ID: <200608011109.k71B9gjv016656@cvs.devel.redhat.com>

Author: tmraz

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

Modified Files:
	pam.spec 
Log Message:
- glibc is updated in FC-5, pam_namespace now builds



Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/FC-5/pam.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- pam.spec	1 Aug 2006 10:39:02 -0000	1.108
+++ pam.spec	1 Aug 2006 11:09:39 -0000	1.109
@@ -52,6 +52,8 @@
 %endif
 BuildRequires: libselinux-devel >= 1.27.7
 Requires: libselinux >= 1.27.7
+BuildRequires: glibc >= 2.3.90-37
+Requires: glibc >= 2.3.90-37
 # Following deps are necessary only to build the pam library documentation.
 BuildRequires: linuxdoc-tools, w3m, libxslt
 BuildRequires: docbook-style-xsl, docbook-dtds
@@ -161,9 +163,6 @@
 # Install man pages.
 install -m 644 %{SOURCE9} %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man5/
 
-# Drop pam_namespace subdir which doesn't build on FC5
-rm -rf modules/pam_namespace
-
 # Make sure every module subdirectory gave us a module.  Yes, this is hackish.
 for dir in modules/pam_* ; do
 if [ -d ${dir} ] ; then
@@ -311,6 +310,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
@@ -346,6 +346,8 @@
 %config(noreplace) %{_sysconfdir}/security/console.handlers
 %config(noreplace) %{_sysconfdir}/security/group.conf
 %config(noreplace) %{_sysconfdir}/security/limits.conf
+%config(noreplace) %{_sysconfdir}/security/namespace.conf
+%attr(755,root,root) %config(noreplace) %{_sysconfdir}/security/namespace.init
 %config(noreplace) %{_sysconfdir}/security/pam_env.conf
 %config(noreplace) %{_sysconfdir}/security/time.conf
 %config(noreplace) %{_sysconfdir}/security/opasswd
@@ -366,7 +368,7 @@
 
 %changelog
 * Tue Aug  1 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-5.fc5
-- rebuild for FC5 - ainit back, dropped pam_namespace
+- rebuild for FC5 - ainit back
 
 * Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-5
 - don't log pam_keyinit debug messages by default (#199783)



From fedora-cvs-commits at redhat.com  Tue Aug  1 11:20:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 07:20:46 -0400
Subject: rpms/lksctp-tools/FC-5 .cvsignore, 1.3, 1.4 lksctp-tools.spec, 1.11,
	1.12 sources, 1.3, 1.4
Message-ID: <200608011120.k71BKkFD002843@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/lksctp-tools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2811

Modified Files:
	.cvsignore lksctp-tools.spec sources 
Log Message:
- rebuild for FC-5 (#189950)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lksctp-tools/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Jan 2006 06:39:58 -0000	1.3
+++ .cvsignore	1 Aug 2006 11:20:44 -0000	1.4
@@ -1 +1 @@
-lksctp-tools-1.0.5.tar.gz
+lksctp-tools-1.0.6.tar.gz


Index: lksctp-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/lksctp-tools/FC-5/lksctp-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lksctp-tools.spec	11 Feb 2006 04:24:47 -0000	1.11
+++ lksctp-tools.spec	1 Aug 2006 11:20:44 -0000	1.12
@@ -1,16 +1,16 @@
 Summary: User-space access to Linux Kernel SCTP
 Name: lksctp-tools
-Version: 1.0.5
-Release: 1.fc5.2
+Version: 1.0.6
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
-URL: http://lksctp.sourceforge.net/
-Source: http://dl.sf.net/lksctp/lksctp-tools-%{version}.tar.gz
-Patch0: lksctp-tools-1.0.5-syntax.patch
+URL: http://lksctp.sourceforge.net
+Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 #BuildRequires: tetex, tetex-latex, tetex-xdvi, tetex-dvips
 #BuildRequires: ghostscript, enscript
 BuildRequires: libtool, automake, autoconf
+Conflicts: kernel < 2.6.10
 
 %description
 This is the lksctp-tools package for Linux Kernel SCTP (Stream Control
@@ -44,7 +44,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 [ ! -x ./configure ] && sh bootstrap
@@ -53,6 +52,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+rm -f doc/rfc2960.txt doc/states.txt
 make install DESTDIR="$RPM_BUILD_ROOT"
 
 %clean
@@ -85,10 +85,19 @@
 %{_mandir}/man3/*
 
 %files doc
-%defattr(-,root,root,0755)
+%defattr(0644,root,root,0755)
 %doc doc/*.txt
 
 %changelog
+* Tue Aug 01 2006 Karsten Hopp <karsten at redhat.de> 1.0.6-1.fc5
+- rebuild for FC-5 (#189950)
+
+* Tue Jul 25 2006 Karsten Hopp <karsten at redhat.de> 1.0.6-1
+- update to 1.0.6
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-1.fc5.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-1.fc5.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lksctp-tools/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Jan 2006 06:39:58 -0000	1.3
+++ sources	1 Aug 2006 11:20:44 -0000	1.4
@@ -1 +1 @@
-aa6d09d392849f5456c6fbd1ebbb525e  lksctp-tools-1.0.5.tar.gz
+6dcacb7cf4ce8c21b343e5578ccdaa2f  lksctp-tools-1.0.6.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  1 11:34:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 07:34:47 -0400
Subject: rpms/OpenIPMI/devel OpenIPMI.spec, 1.38, 1.39 openipmi.initscript,
	1.9, 1.10
Message-ID: <200608011134.k71BYlB2006741@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/OpenIPMI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6674

Modified Files:
	OpenIPMI.spec openipmi.initscript 
Log Message:
- Fixed check for udev in initscript (#197956)



Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- OpenIPMI.spec	12 Jul 2006 07:33:49 -0000	1.38
+++ OpenIPMI.spec	1 Aug 2006 11:34:45 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.6
-Release: 4.1
+Release: 5
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -166,6 +166,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Jul 18 2006 Phil Knirsch <pknirsch at redhat.com> - 2.0.6-5
+- Fixed check for udev in initscript (#197956)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.6-4.1
 - rebuild
 


Index: openipmi.initscript
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/openipmi.initscript,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openipmi.initscript	24 Jan 2006 13:56:18 -0000	1.9
+++ openipmi.initscript	1 Aug 2006 11:34:45 -0000	1.10
@@ -113,6 +113,11 @@
 LOCKFILE=/var/lock/subsys/ipmi
 DEV_IPMI_TIMEOUT=15
 
+UDEV_EXISTS=0
+if [ -e /sbin/udev -o -e /sbin/udevd ]; then
+    UDEV_EXISTS=1
+fi
+
 #############################################################################
 # NOTES:
 # * /dev/ipmi0 is unconditionally deleted here on ipmi_devintf unload,
@@ -207,7 +212,7 @@
 		RETVAL=$((RETVAL | 2)) &&
 		log_failure_msg &&
 		return
-	if [ ! -x /sbin/udev -a ! -e /dev/watchdog ]; then
+	if [ ${UDEV_EXISTS} -eq 0 -a ! -e /dev/watchdog ]; then
 		mknod -m 0600 /dev/watchdog c 10 130
 		[ $? -ne 0 ] &&
 			RETVAL=$((RETVAL | 8)) &&
@@ -245,7 +250,7 @@
 	    log_failure_msg
 	else
 	    if [ "${IPMI_WATCHDOG}" = "yes" ]; then
-		[ ! -x /sbin/udev ] && rm -f /dev/watchdog
+		[ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog
 	    fi
 	    log_success_msg
 	fi
@@ -259,7 +264,7 @@
 	    RETVAL=$((RETVAL | 32))
 	else
 	    if [ "${IPMI_WATCHDOG}" = "yes" ]; then
-		[ ! -x /sbin/udev ] && rm -f /dev/watchdog
+		[ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog
 	    fi
 	fi
 }
@@ -368,7 +373,7 @@
 		RETVAL=$((RETVAL & ~2))
 		[ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
 		if [ ${OnePlusLoaded} -eq 1 ]; then
-			if [ ! -x /sbin/udev ]; then
+			if [ ${UDEV_EXISTS} -eq 0 ]; then
 				DEVMAJOR=`cat /proc/devices | awk '/ipmidev/{print $1}'`
 				rm -f /dev/ipmi${INTF_NUM}
 				mknod -m 0600 /dev/ipmi${INTF_NUM} c ${DEVMAJOR} 0 || RETVAL=$((RETVAL | 4))



From fedora-cvs-commits at redhat.com  Tue Aug  1 12:04:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 08:04:33 -0400
Subject: rpms/vsftpd/devel vsftpd.spec,1.46,1.47
Message-ID: <200608011204.k71C4XQs031849@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31817

Modified Files:
	vsftpd.spec 
Log Message:
Change configuration file to default listen to IPv4


Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- vsftpd.spec	17 Jul 2006 09:19:44 -0000	1.46
+++ vsftpd.spec	1 Aug 2006 12:04:31 -0000	1.47
@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.5
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -136,6 +136,10 @@
 /var/ftp
 
 %changelog
+* Thu Aug 01 2006 Maros Barabas <mbarabas at redhat.com> - 2.0.5-4
+- listen to IPv4 connections in default conf file
+- option to change listening to IPv6 protocol
+
 * Mon Jul 17 2006 Radek Vokal <rvokal at redhat.com> - 2.0.5-3
 - listen to IPv6 connections in default conf file
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 12:44:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 08:44:03 -0400
Subject: rpms/irda-utils/devel irda-utils.spec,1.25,1.26
Message-ID: <200608011244.k71Ci3AZ008428@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	irda-utils.spec 
Log Message:
- initscript fix from Paul Bolle (#168325)


Index: irda-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- irda-utils.spec	12 Jul 2006 06:26:32 -0000	1.25
+++ irda-utils.spec	1 Aug 2006 12:44:01 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Utilities for infrared communication between devices.
 Name: irda-utils
 Version: 0.9.17
-Release: 1.1
+Release: 2
 # Download-URL: 
 #  http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download
 Source: irda-utils-%{version}.tar.gz
@@ -17,6 +17,7 @@
 Patch7: irda-utils-0.9.16-io.patch
 Patch8: irda-utils-0.9.17-makefile.patch
 Patch9: irda-utils-0.9.17-smcdisable.patch
+Patch10: irda-utils-0.9.17-initscript.patch
 Url: http://irda.sourceforge.net/
 License: GPL
 Group: Applications/System
@@ -53,6 +54,7 @@
 %patch7 -p1
 %patch8 -p1 -b .rh3
 %patch9 -p1
+%patch10 -p1
 echo $PWD
 tar xvf %{SOURCE1}
 
@@ -98,6 +100,9 @@
 %doc tekram/README.tekram
 
 %changelog
+* Tue Aug 01 2006 Karsten Hopp <karsten at redhat.de> 0.9.17-2
+- initscript fix from Paul Bolle (#168325)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.17-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 12:44:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 08:44:24 -0400
Subject: rpms/irda-utils/devel irda-utils-0.9.17-initscript.patch,NONE,1.1
Message-ID: <200608011244.k71CiOvF008587@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	irda-utils-0.9.17-initscript.patch 
Log Message:
- initscript fix from Paul Bolle (#168325)

irda-utils-0.9.17-initscript.patch:
 irda.rc |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE irda-utils-0.9.17-initscript.patch ---
--- irda-utils-0.9.17/etc/irda.rc.rh1	2006-08-01 14:39:44.000000000 +0200
+++ irda-utils-0.9.17/etc/irda.rc	2006-08-01 14:40:02.000000000 +0200
@@ -24,16 +24,15 @@
 	/sbin/modprobe ircomm-tty 2>/dev/null
 	/sbin/modprobe irtty-sir 2>/dev/null
 	/sbin/modprobe irnet 2>/dev/null
-        daemon /usr/sbin/irattach ${DEVICE} ${ARGS}
-	touch /var/lock/subsys/irda
+	daemon /usr/sbin/irattach ${DEVICE} ${ARGS}
+	[ -f /var/run/irattach.pid ] && success $"irattach startup" || failure $"irattach startup"
         echo
 }
 
 stop() {
         # Stop service.
         echo -n $"Shutting down $prog: "
-	killproc irattach
-	rm -f /var/lock/subsys/irda
+        [ -f /var/run/irattach.pid ] && killproc irattach || success $"irattach shutdown"
         echo
 }
 
@@ -66,7 +65,7 @@
 	start
 	;;
   condrestart)
-	[ -e /var/lock/subsys/irda ] && (stop; start)
+	[ -e /var/run/irdattach.pid ] && (stop; start)
 	;;
   *)
         echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"



From fedora-cvs-commits at redhat.com  Tue Aug  1 12:45:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 08:45:23 -0400
Subject: rpms/irda-utils/devel irda-utils.spec,1.26,1.27
Message-ID: <200608011245.k71CjNd8009005@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	irda-utils.spec 
Log Message:
- use disttag


Index: irda-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- irda-utils.spec	1 Aug 2006 12:44:01 -0000	1.26
+++ irda-utils.spec	1 Aug 2006 12:45:21 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Utilities for infrared communication between devices.
 Name: irda-utils
 Version: 0.9.17
-Release: 2
+Release: 2%{?dist}
 # Download-URL: 
 #  http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download
 Source: irda-utils-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  1 12:46:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 08:46:27 -0400
Subject: rpms/cups/FC-5 cups-try_connect.patch, NONE, 1.1 cups.spec, 1.200,
	1.201
Message-ID: <200608011246.k71CkRPF016717@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-try_connect.patch 
Log Message:
* Tue Aug  1 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.3
- Use try_connect() before httpConnect() in snmp backend (bug #200205).


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

--- NEW FILE cups-try_connect.patch ---
--- cups-1.2.2/backend/snmp.c.try_connect	2006-08-01 13:20:56.000000000 +0100
+++ cups-1.2.2/backend/snmp.c	2006-08-01 13:22:30.000000000 +0100
@@ -1692,7 +1692,8 @@
 
   debug_printf("DEBUG: %.3f Probing %s...\n", run_time(), device->addrname);
 
-  if ((http = httpConnect(device->addrname, 631)) != NULL)
+  if (!try_connect(&(device->address), device->addrname, 631) &&
+      (http = httpConnect(device->addrname, 631)) != NULL)
   {
    /*
     * IPP is supported...


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- cups.spec	28 Jul 2006 12:43:00 -0000	1.200
+++ cups.spec	1 Aug 2006 12:46:24 -0000	1.201
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 1.2
+Release: 1.3
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -40,6 +40,7 @@
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
 Patch41: cups-relro.patch
+Patch100: cups-try_connect.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -135,6 +136,7 @@
 %patch32 -p1 -b .pid
 %patch41 -p1 -b .relro
 cp %{SOURCE3} backend/snmp.c
+%patch100 -p1 -b .try_connect
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
 autoconf
@@ -400,6 +402,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Aug  1 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.3
+- Use try_connect() before httpConnect() in snmp backend (bug #200205).
+
 * Fri Jul 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.2
 - Use replacement snmp.c from STR #1737 (bug #193093).
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 13:24:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 09:24:46 -0400
Subject: rpms/m17n-db/devel .cvsignore, 1.22, 1.23 m17n-db.spec, 1.30,
	1.31 sources, 1.24, 1.25
Message-ID: <200608011324.k71DOklQ017703@cvs.devel.redhat.com>

Author: majain

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

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
Corrected bn-probhat.mim file for bz 200890, added U+09CE


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	1 Aug 2006 09:19:40 -0000	1.22
+++ .cvsignore	1 Aug 2006 13:24:44 -0000	1.23
@@ -1,13 +1,2 @@
 m17n-db-1.3.3.tar.gz
-m17n-db-indic-0.4.0.tar.gz
-m17n-db-indic-0.4.1.tar.gz
-m17n-db-indic-0.4.2.tar.gz
-m17n-db-indic-0.4.3.tar.gz
-m17n-db-indic-0.4.4.tar.gz
-m17n-db-indic-0.4.5.tar.gz
-m17n-db-indic-0.4.6.tar.gz
-m17n-db-indic-0.4.7.tar.gz
-m17n-db-indic-0.4.8.tar.gz
-m17n-db-indic-0.4.9.tar.gz
-m17n-db-indic-0.4.10.tar.gz
-m17n-db-indic-0.4.11.tar.gz
+m17n-db-indic-0.4.12.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- m17n-db.spec	1 Aug 2006 09:19:40 -0000	1.30
+++ m17n-db.spec	1 Aug 2006 13:24:44 -0000	1.31
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.11
+%define indic_ver 0.4.12
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	15%{?dist}
+Release:	16%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -683,6 +683,9 @@
 
 %changelog
 * Tue Aug 1 2006 Mayank Jain <majain at redhat.com>
+- Corrected bn-probhat.mim file, RH bz #200890, added U+09CE
+
+* Tue Aug 1 2006 Mayank Jain <majain at redhat.com>
 - Corrected ml-inscript.mim file, RH bz #200876
 
 * Tue Jul 25 2006 Jens Petersen <petersen at redhat.com> - 1.3.3-14


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	1 Aug 2006 09:19:40 -0000	1.24
+++ sources	1 Aug 2006 13:24:44 -0000	1.25
@@ -1,2 +1,3 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
 cf315686111755874fcfbd8330c1d008  m17n-db-indic-0.4.11.tar.gz
+e04fad37fd346c9650373af4dcc6f034  m17n-db-indic-0.4.12.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  1 13:54:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 09:54:04 -0400
Subject: rpms/gnucash/devel .cvsignore, 1.22, 1.23 gnucash.spec, 1.50,
	1.51 sources, 1.23, 1.24
Message-ID: <200608011354.k71Ds4ep009538@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore gnucash.spec sources 
Log Message:
update to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	13 Jul 2006 03:18:31 -0000	1.22
+++ .cvsignore	1 Aug 2006 13:54:01 -0000	1.23
@@ -1,2 +1 @@
-gnucash-2.0.0.tar.gz
-gnucash-docs-2.0.0.tar.gz
+gnucash-2.0.1.tar.gz


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnucash.spec	12 Jul 2006 06:11:27 -0000	1.50
+++ gnucash.spec	1 Aug 2006 13:54:01 -0000	1.51
@@ -5,11 +5,11 @@
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 2.0.0
+Version: 2.0.1
 %if %{buildsvn}
-Release: 2.%{svnrev}svn.1
+Release: 1.%{svnrev}svn.1
 %else
-Release: 2.1
+Release: 1
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -151,6 +151,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Aug  1 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-1
+- update to 2.0.1
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.0-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	10 Jul 2006 18:57:16 -0000	1.23
+++ sources	1 Aug 2006 13:54:01 -0000	1.24
@@ -1,2 +1,2 @@
-d5802c398825500ec322bb2b3229aadd  gnucash-2.0.0.tar.gz
+627bdf6fab9152a1857e5bb8d4887f2a  gnucash-2.0.1.tar.gz
 9a84f681330aa61ea1aa7448b87e86a4  gnucash-docs-2.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  1 13:56:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 09:56:41 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.115,
	1.116 policycoreutils-rhat.patch, 1.213,
	1.214 policycoreutils.spec, 1.295, 1.296 sources, 1.119, 1.120
Message-ID: <200608011356.k71DufrJ010559@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10528

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-1
- Update to upstream
	* Merged restorecond size_t fix from Joshua Brindle.
	* Merged secon keycreate patch from Michael LeMay.
	* Merged restorecond fixes from Dan Walsh.
	  Merged updated po files from Dan Walsh.
	* Merged python gettext patch from Stephen Bennett.
	* Merged semodule_deps from Karl MacMillan.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- .cvsignore	7 Jul 2006 11:34:10 -0000	1.115
+++ .cvsignore	1 Aug 2006 13:56:38 -0000	1.116
@@ -107,3 +107,4 @@
 policycoreutils-1.30.12.tgz
 policycoreutils-1.30.14.tgz
 policycoreutils-1.30.17.tgz
+policycoreutils-1.30.22.tgz

policycoreutils-rhat.patch:
 newrole/newrole.c         |    8 +
 po/fr.po                  |   54 ++++++---
 po/sv.po                  |  252 +++++++++++++++++++++++++++++-----------------
 restorecond/restorecond.c |    7 +
 scripts/fixfiles          |    2 
 5 files changed, 211 insertions(+), 112 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.213 -r 1.214 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- policycoreutils-rhat.patch	27 Jul 2006 18:51:20 -0000	1.213
+++ policycoreutils-rhat.patch	1 Aug 2006 13:56:38 -0000	1.214
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.17/newrole/newrole.c
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.22/newrole/newrole.c
 --- nsapolicycoreutils/newrole/newrole.c	2006-07-03 07:52:43.000000000 -0400
-+++ policycoreutils-1.30.17/newrole/newrole.c	2006-07-27 14:47:40.000000000 -0400
++++ policycoreutils-1.30.22/newrole/newrole.c	2006-08-01 09:53:54.000000000 -0400
 @@ -47,6 +47,7 @@
   *
   *************************************************************************/
@@ -30,28285 +30,880 @@
  
  	/* If we reach here, then we failed to exec the new shell. */
  	perror(_("failed to exec shell\n"));
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.17/po/af.po
---- nsapolicycoreutils/po/af.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/af.po	2006-07-27 14:45:27.000000000 -0400
-@@ -8,7 +8,7 @@
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-06-29 15:53-0400\n"
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fr.po policycoreutils-1.30.22/po/fr.po
+--- nsapolicycoreutils/po/fr.po	2006-08-01 09:47:27.000000000 -0400
++++ policycoreutils-1.30.22/po/fr.po	2006-08-01 09:56:24.000000000 -0400
+@@ -8,14 +8,14 @@
+ msgstr ""
+ "Project-Id-Version: Policy Core Utils 1.0\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2006-07-07 23:15+0200\n"
++"POT-Creation-Date: 2006-05-26 13:48-0400\n"
+ "PO-Revision-Date: 2006-07-08 13:34+0200\n"
+ "Last-Translator: Guillaume CHARDIN <guillaume.chardin at gmail.com>\n"
+ "Language-Team: French\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=iso-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: "
++"Plural-Forms: \n"
+ 
+ #: ../load_policy/load_policy.c:22
+ #, c-format
+@@ -189,12 +189,16 @@
+ #: ../newrole/newrole.c:717
+ #, c-format
+ msgid "%s!  Could not get current context for %s, not relabeling tty.\n"
+-msgstr "%s! Ne peut r?cup?rer le contexte actuel pour %s, le tty ne sera pas renom?.\n"
++msgstr ""
++"%s! Ne peut r?cup?rer le contexte actuel pour %s, le tty ne sera pas "
++"renom?.\n"
+ 
+ #: ../newrole/newrole.c:728
+ #, c-format
+ msgid "%s!  Could not get new context for %s, not relabeling tty.\n"
+-msgstr "%s! Ne peut r?cup?rer le nouveau contexte pour %s, le tty ne sera pas renom?.\n"
++msgstr ""
++"%s! Ne peut r?cup?rer le nouveau contexte pour %s, le tty ne sera pas "
++"renom?.\n"
+ 
+ #: ../newrole/newrole.c:740
+ #, c-format
+@@ -250,7 +254,8 @@
+ "USAGE: run_init <script> <args ...>\n"
+ "  where: <script> is the name of the init script to run,\n"
+ "         <args ...> are the arguments to that script."
+-msgstr "SYNTAXE: run_init <script> <arg ...>\n"
++msgstr ""
++"SYNTAXE: run_init <script> <arg ...>\n"
+ "  o?: <script> est le nom du script d'initialisation ? ex?cuter,\n"
+ "         <args ...> sont les arguments ? passer au script."
+ 
+@@ -286,7 +291,8 @@
+ #: ../scripts/chcat:84 ../scripts/chcat:154
+ #, c-format
+ msgid "Can not modify sensitivity levels using '+' on %s"
+-msgstr "Impossible de modifier le niveau de sensibilit? en utilisant '+' sur %s"
++msgstr ""
++"Impossible de modifier le niveau de sensibilit? en utilisant '+' sur %s"
+ 
+ #: ../scripts/chcat:88
+ #, c-format
+@@ -401,7 +407,8 @@
+ #: ../semanage/seobject.py:131
+ #, python-format
+ msgid "Unable to open %s: translations not supported on non-MLS machines"
+-msgstr "Impossible d'ouvrir %s: traduction non support?e sur une machine non MLS"
++msgstr ""
++"Impossible d'ouvrir %s: traduction non support?e sur une machine non MLS"
+ 
+ #: ../semanage/seobject.py:171 ../semanage/seobject.py:185
+ #, python-format
+@@ -519,7 +526,8 @@
+ #: ../semanage/seobject.py:355
+ #, python-format
+ msgid "Login mapping for %s is defined in policy, cannot be deleted"
+-msgstr "Le mappage pour %s est d?fini dans une strat?gie, il ne peut ?tre supprim?"
++msgstr ""
++"Le mappage pour %s est d?fini dans une strat?gie, il ne peut ?tre supprim?"
+ 
+ #: ../semanage/seobject.py:364 ../semanage/seobject.py:368
+ #, python-format
+@@ -597,7 +605,9 @@
+ #: ../semanage/seobject.py:561
+ #, python-format
+ msgid "SELinux user %s is defined in policy, cannot be deleted"
+-msgstr "L'utilisateur SELinux %s est d?fini dans une strat?gie, il ne peut ?tre supprim?"
++msgstr ""
++"L'utilisateur SELinux %s est d?fini dans une strat?gie, il ne peut ?tre "
++"supprim?"
+ 
+ #: ../semanage/seobject.py:569 ../semanage/seobject.py:573
+ #, python-format
+@@ -654,7 +664,8 @@
+ #: ../semanage/seobject.py:671
+ #, python-format
+ msgid "Could not set user in port context for %s/%s"
+-msgstr "Impossible de d?finir l'utilisateur dans le contexte du port pour %s/%s"
++msgstr ""
++"Impossible de d?finir l'utilisateur dans le contexte du port pour %s/%s"
+ 
+ #: ../semanage/seobject.py:675
+ #, python-format
+@@ -669,7 +680,8 @@
+ #: ../semanage/seobject.py:684
+ #, python-format
+ msgid "Could not set mls fields in port context for %s/%s"
+-msgstr "Impossible de d?finir les champs mls dans le contexte de port pour %s/%s"
++msgstr ""
++"Impossible de d?finir les champs mls dans le contexte de port pour %s/%s"
+ 
+ #: ../semanage/seobject.py:688
+ #, python-format
+@@ -752,7 +764,8 @@
+ #: ../semanage/seobject.py:865
+ #, python-format
+ msgid "Could not set user in interface context for %s"
+-msgstr "Impossible de d?finir l'utilisateur dans le contexte d'interface pour %s"
++msgstr ""
++"Impossible de d?finir l'utilisateur dans le contexte d'interface pour %s"
+ 
+ #: ../semanage/seobject.py:869
+ #, python-format
+@@ -767,7 +780,8 @@
+ #: ../semanage/seobject.py:878
+ #, python-format
+ msgid "Could not set mls fields in interface context for %s"
+-msgstr "Impossible de d?finir les champs mls dans le contexte d'interface pour %s"
++msgstr ""
++"Impossible de d?finir les champs mls dans le contexte d'interface pour %s"
+ 
+ #: ../semanage/seobject.py:882
+ #, python-format
+@@ -802,7 +816,8 @@
+ #: ../semanage/seobject.py:959
+ #, python-format
+ msgid "Interface %s is defined in policy, cannot be deleted"
+-msgstr "L'interface %s est d?finie dans les strat?gies, elle ne peut ?tre supprim?e "
++msgstr ""
++"L'interface %s est d?finie dans les strat?gies, elle ne peut ?tre supprim?e "
+ 
+ #: ../semanage/seobject.py:967 ../semanage/seobject.py:971
+ #, python-format
+@@ -832,7 +847,8 @@
+ #: ../semanage/seobject.py:1037
+ #, python-format
+ msgid "Could not set user in file context for %s"
+-msgstr "Impossible de d?finir l'utilisateur dans le contexte de fichier pour %s"
++msgstr ""
++"Impossible de d?finir l'utilisateur dans le contexte de fichier pour %s"
+ 
+ #: ../semanage/seobject.py:1041
+ #, python-format
+@@ -847,7 +863,8 @@
+ #: ../semanage/seobject.py:1050
+ #, python-format
+ msgid "Could not set mls fields in file context for %s"
+-msgstr "Impossible de d?finir les champs mls dans le contexte du fichier pour %s"
++msgstr ""
++"Impossible de d?finir les champs mls dans le contexte du fichier pour %s"
+ 
+ #: ../semanage/seobject.py:1056
+ #, python-format
+@@ -881,7 +898,9 @@
+ #: ../semanage/seobject.py:1131
+ #, python-format
+ msgid "File context for %s is defined in policy, cannot be deleted"
+-msgstr "Le contexte de fichier pour %s est d?fini dans les strat?gie, il ne peu ?tre supprim?"
++msgstr ""
++"Le contexte de fichier pour %s est d?fini dans les strat?gie, il ne peu ?tre "
++"supprim?"
+ 
+ #: ../semanage/seobject.py:1139 ../semanage/seobject.py:1143
+ #, python-format
[...28637 lines suppressed...]
- msgstr ""
+ #: ../semanage/seobject.py:979
+ msgid "Could not list interfaces"
+-msgstr ""
++msgstr "Kunde inte lista gr??nssnitt"
  
--#: ../newrole/newrole.c:903
-+#: ../newrole/newrole.c:864
- msgid "failed to exec shell\n"
- msgstr ""
+ #: ../semanage/seobject.py:1022 ../semanage/seobject.py:1084
+ #: ../semanage/seobject.py:1123 ../semanage/seobject.py:1129
+@@ -873,7 +937,7 @@
  
-@@ -251,27 +251,27 @@
- "         <args ...> are the arguments to that script."
- msgstr ""
+ #: ../semanage/seobject.py:1184
+ msgid "Requires value"
+-msgstr ""
++msgstr "Kr??ver v??rde"
  
--#: ../run_init/run_init.c:267
-+#: ../run_init/run_init.c:264
- #, c-format
- msgid "run_init: incorrect password for %s\n"
- msgstr ""
+ #: ../semanage/seobject.py:1192 ../semanage/seobject.py:1226
+ #: ../semanage/seobject.py:1232
+@@ -917,13 +981,18 @@
  
--#: ../run_init/run_init.c:301
-+#: ../run_init/run_init.c:295
- #, c-format
- msgid "Could not open file %s\n"
- msgstr ""
+ #: ../audit2allow/audit2allow:184
+ msgid "Compiling policy"
+-msgstr ""
++msgstr "Kompilerar policy"
  
--#: ../run_init/run_init.c:328
-+#: ../run_init/run_init.c:322
- #, c-format
- msgid "No context in file %s\n"
+ #: ../audit2allow/audit2allow:195
+ msgid ""
+ "\n"
+ "******************** IMPORTANT ***********************\n"
  msgstr ""
++"\n"
++"********************* VIKTIGT ************************\n"
++
++msgid "******************** IMPORTANT ***********************\n"
++msgstr "********************* VIKTIGT ************************\n"
  
--#: ../run_init/run_init.c:353
-+#: ../run_init/run_init.c:345
+ #: ../audit2allow/audit2allow:196
  #, c-format
- msgid "Sorry, run_init may be used only on a SELinux kernel.\n"
- msgstr ""
- 
--#: ../run_init/run_init.c:372
-+#: ../run_init/run_init.c:364
+@@ -938,4 +1007,7 @@
+ #: ../audit2allow/audit2allow:203
  #, c-format
- msgid "authentication failed.\n"
- msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30.17/restorecond/restorecond.8
---- nsapolicycoreutils/restorecond/restorecond.8	2006-05-15 09:42:57.000000000 -0400
-+++ policycoreutils-1.30.17/restorecond/restorecond.8	2006-07-27 14:45:27.000000000 -0400
-@@ -11,7 +11,7 @@
- .BR restorecond
- program.
- .P
--This daemon uses inotify to watch files listed in the /etc/selinux/POLICYTYPE/restorconfiles.conf, when they are created, this daemon will make sure they have 
-+This daemon uses inotify to watch files listed in the /etc/selinux/restorecond.conf, when they are created, this daemon will make sure they have 
- the correct file context associated with the policy.
- 
- .SH "OPTIONS"
-@@ -25,7 +25,7 @@
- The program was written by Dan Walsh <dwalsh at redhat.com>.
- 
- .SH "FILES"
--/etc/selinux/POLICYTYPE/restorconfiles.conf
-+/etc/selinux/restorecond.conf
- 
- .SH "SEE ALSO"
- .BR restorecon (8),
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.17/restorecond/restorecond.c
---- nsapolicycoreutils/restorecond/restorecond.c	2006-07-03 07:52:43.000000000 -0400
-+++ policycoreutils-1.30.17/restorecond/restorecond.c	2006-07-27 14:45:27.000000000 -0400
-@@ -30,9 +30,10 @@
-  * and makes sure that there security context matches the systems defaults
-  *
-  * USAGE:
-- * restorecond [-d]
-+ * restorecond [-d] [-v]
-  * 
-  * -d   Run in debug mode
-+ * -v   Run in verbose mode (Report missing files)
-  *
-  * EXAMPLE USAGE:
-  * restorecond
-@@ -72,6 +73,7 @@
- #define BUF_LEN        (1024 * (EVENT_SIZE + 16))
- 
- static int debug_mode = 0;
-+static int verbose_mode = 0;
- 
- static void restore(const char *filename);
- 
-@@ -165,8 +167,9 @@
- 
- 	fd = open(filename, O_NOFOLLOW | O_RDONLY);
- 	if (fd < 0) {
--		syslog(LOG_ERR, "Unable to open file (%s) %s\n", filename,
--		       strerror(errno));
-+		if (verbose_mode)
-+			syslog(LOG_ERR, "Unable to open file (%s) %s\n", filename,
-+			       strerror(errno));
- 		return;
- 	}
- 
-@@ -364,7 +367,7 @@
- 
- static void usage(char *program)
- {
--	printf("%s [-d] \n", program);
-+	printf("%s [-d] [-v] \n", program);
- 	exit(0);
- }
- 
-@@ -433,9 +436,14 @@
+ msgid "Options Error: %s "
+-msgstr ""
++msgstr "Flaggfel: %s "
++
++msgid "Options Error: %s"
++msgstr "Flaggfel: %s"
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.22/restorecond/restorecond.c
+--- nsapolicycoreutils/restorecond/restorecond.c	2006-08-01 09:47:23.000000000 -0400
++++ policycoreutils-1.30.22/restorecond/restorecond.c	2006-08-01 09:55:14.000000000 -0400
+@@ -436,9 +436,14 @@
  	/* Make sure we are root */
  	if (getuid() != 0) {
  		fprintf(stderr, "You must be root to run this program.\n");
@@ -28319,37 +914,20 @@
 +	/* Make sure we are root */
 +	if (is_selinux_enabled() != 1) {
 +		fprintf(stderr, "Daemon requires SELinux be enabled to run.\n");
-+		return 2;
++		return 1;
 +	}
  
  	/* Register sighandlers */
  	sa.sa_flags = 0;
-@@ -449,22 +457,25 @@
- 	if (master_fd < 0)
- 		exitApp("inotify_init");
- 
--	while ((opt = getopt(argc, argv, "d")) > 0) {
-+	while ((opt = getopt(argc, argv, "dv")) > 0) {
- 		switch (opt) {
- 		case 'd':
- 			debug_mode = 1;
- 			break;
-+		case 'v':
-+			verbose_mode = 1;
-+			break;
- 		case '?':
- 			usage(argv[0]);
- 		}
- 	}
- 	read_config(master_fd);
- 
--	write_pid_file();
--
- 	if (!debug_mode)
- 		daemon(0, 0);
- 
-+	write_pid_file();
-+
- 	while (watch(master_fd) == 0) {
- 	};
- 
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.22/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2006-07-03 07:52:42.000000000 -0400
++++ policycoreutils-1.30.22/scripts/fixfiles	2006-08-01 09:53:54.000000000 -0400
+@@ -234,7 +234,7 @@
+ # Make sure they specified one of the three valid commands
+ #
+ case "$command" in
+-    restore) restore -p -q ;;
++    restore) restore -p ;;
+     check) restore -n -v ;;
+     relabel) relabel;;
+     *)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- policycoreutils.spec	27 Jul 2006 18:51:20 -0000	1.295
+++ policycoreutils.spec	1 Aug 2006 13:56:38 -0000	1.296
@@ -4,8 +4,8 @@
 %define libselinuxver 1.30.19-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.30.17
-Release: 7
+Version: 1.30.22
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -122,6 +122,15 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-1
+- Update to upstream
+	* Merged restorecond size_t fix from Joshua Brindle.
+	* Merged secon keycreate patch from Michael LeMay.
+	* Merged restorecond fixes from Dan Walsh.
+	  Merged updated po files from Dan Walsh.
+	* Merged python gettext patch from Stephen Bennett.
+	* Merged semodule_deps from Karl MacMillan.
+
 * Thu Jul 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-7
 - Change newrole to exec a login shell to prevent suspend.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- sources	7 Jul 2006 11:34:10 -0000	1.119
+++ sources	1 Aug 2006 13:56:39 -0000	1.120
@@ -1 +1 @@
-2b8a1ac08f54b82f5842a5e75683d5ce  policycoreutils-1.30.17.tgz
+6f622e70c1f498c4b24c4f8c07ea3cb9  policycoreutils-1.30.22.tgz



From fedora-cvs-commits at redhat.com  Tue Aug  1 14:07:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 10:07:42 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.102, 1.103 libsepol.spec, 1.135,
	1.136 sources, 1.103, 1.104
Message-ID: <200608011407.k71E7gEf012984@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 1.12.21-1
- Upgrade to latest from NSA
	* Merged helpful hierarchy check errors patch from Joshua Brindle.
	* Merged semodule_deps patch from Karl MacMillan.
	  This adds source module names to the avrule decls.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	5 Jul 2006 02:24:55 -0000	1.102
+++ .cvsignore	1 Aug 2006 14:07:40 -0000	1.103
@@ -102,3 +102,4 @@
 libsepol-1.12.14.tgz
 libsepol-1.12.17.tgz
 libsepol-1.12.19.tgz
+libsepol-1.12.21.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- libsepol.spec	12 Jul 2006 06:55:59 -0000	1.135
+++ libsepol.spec	1 Aug 2006 14:07:40 -0000	1.136
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.12.19
-Release: 1.1
+Version: 1.12.21
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -37,6 +37,10 @@
 
 %prep
 %setup -q
+# sparc64 is an -fPIC arch, so we need to fix it here
+%ifarch sparc64
+sed -i 's/fpic/fPIC/g' src/Makefile
+%endif
 
 %build
 make clean
@@ -81,6 +85,12 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 1.12.21-1
+- Upgrade to latest from NSA
+	* Merged helpful hierarchy check errors patch from Joshua Brindle.
+	* Merged semodule_deps patch from Karl MacMillan.
+	  This adds source module names to the avrule decls.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.12.19-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- sources	5 Jul 2006 02:24:55 -0000	1.103
+++ sources	1 Aug 2006 14:07:40 -0000	1.104
@@ -1 +1 @@
-6526553bc469ddf37e0af1fe2864ceaf  libsepol-1.12.19.tgz
+f8fc9d63258fb867eabffc8e49d46506  libsepol-1.12.21.tgz



From fedora-cvs-commits at redhat.com  Tue Aug  1 14:16:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 10:16:37 -0400
Subject: rpms/gecko-sharp2/devel gecko-sharp2.spec,1.16,1.17
Message-ID: <200608011416.k71EGbPl025050@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gecko-sharp2.spec 
Log Message:
fix requires


Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gecko-sharp2.spec	31 Jul 2006 21:39:37 -0000	1.16
+++ gecko-sharp2.spec	1 Aug 2006 14:16:35 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.11
-Release:        9
+Release:        10
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk-sharp2 firefox-devel gtk2-devel mono-devel gtk-sharp2-gapi
-Requires:       mozilla 
+Requires:       firefox 
 
 # Mono only availible on these: (s390(x) disabled for now)
 #ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
@@ -48,6 +48,9 @@
 %{_datadir}/pkgconfig/*-sharp-2.0.pc
 
 %changelog
+* Tue Aug  1 2006 Jesse Keating <jkeating at redhat.com> - 0.11-10
+- and change the requires to reflect building against firefox-devel
+
 * Mon Jul 31 2006 Jesse Keating <jkeating at redhat.com> - 0.11-9
 - build against firefox-devel
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 14:28:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 10:28:26 -0400
Subject: rpms/librtas/devel librtas-1.2.4-no_syscall1.patch, NONE,
	1.1 librtas.spec, 1.6, 1.7
Message-ID: <200608011428.k71ESQJL002821@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/librtas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2797

Modified Files:
	librtas.spec 
Added Files:
	librtas-1.2.4-no_syscall1.patch 
Log Message:
Fix build

librtas-1.2.4-no_syscall1.patch:
 syscall_calls.c |   12 ++++++++++++
 1 files changed, 12 insertions(+)

--- NEW FILE librtas-1.2.4-no_syscall1.patch ---
--- librtas-1.2.4/librtas_src/syscall_calls.c.no_syscall	2006-08-01 10:08:03.000000000 -0400
+++ librtas-1.2.4/librtas_src/syscall_calls.c	2006-08-01 10:09:22.000000000 -0400
@@ -93,7 +93,15 @@
 	.interface_exists = sc_interface_exists,
 };
 
+/* The original librtas used the _syscall1 interface to get to the rtas
+ * system call.  On recent versions of Linux though the _syscall1
+ * interface was removed from unistd.h so we have moved to using the
+ * syscall() interface instead.  The use of _syscall1 is left as the
+ * default to avoid breaking the library on older systems.
+ */
+#ifdef _syscall1
 _syscall1(int, rtas, void *, args);
+#endif
 
 #define CALL_AGAIN 1
 
@@ -201,7 +209,11 @@
 	va_end(ap);
 
 	display_rtas_buf(&args, 0);
+#ifdef _syscall1
 	rc = rtas(&args);
+#else
+        rc = syscall(__NR_rtas, &args);
+#endif
 	if (rc != 0) {
 		dbg1("RTAS syscall failure, errno=%d\n", errno);
 		return RTAS_IO_ASSERT;


Index: librtas.spec
===================================================================
RCS file: /cvs/dist/rpms/librtas/devel/librtas.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- librtas.spec	12 Jul 2006 06:55:46 -0000	1.6
+++ librtas.spec	1 Aug 2006 14:28:23 -0000	1.7
@@ -1,11 +1,12 @@
 Summary: Libraries to provide access to RTAS calls and RTAS events.
 Name: librtas
 Version: 1.2.4
-Release: 1.2.2
+Release: 2
 URL: http://librtas.ozlabs.org
 License: IBM Common Public License (CPL) v1.0
 Group: System Environment/Libraries
 Source: librtas-src-1.2.4.tar.gz
+Patch0: librtas-1.2.4-no_syscall1.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 ExclusiveArch: ppc ppc64
@@ -32,6 +33,7 @@
 
 %prep
 %setup 
+%patch0 -p1 -b .no_syscall
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
@@ -62,6 +64,9 @@
 /usr/include/*
 
 %changelog
+* Tue Aug 01 2006 Paul Nasrat <pnasrat at redhat.com> - 1.2.4-2
+- Backport syscall fix from upstream 
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.4-1.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 14:48:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 10:48:56 -0400
Subject: rpms/eclipse-changelog/devel .cvsignore, 1.6,
	1.7 eclipse-changelog.spec, 1.41, 1.42 sources, 1.11, 1.12
Message-ID: <200608011448.k71Emt0c023905@cvs.devel.redhat.com>

Author: ifoox

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

Modified Files:
	.cvsignore eclipse-changelog.spec sources 
Log Message:
* Tue Aug 01 2006 Kyu Lee <klee at redhat.com> 2.2.2-1
- Import version 2.2.2 that fixed the bug which was causing prepare-changelog
menu button to not appear on 3.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Jul 2006 21:20:04 -0000	1.6
+++ .cvsignore	1 Aug 2006 14:48:53 -0000	1.7
@@ -1 +1 @@
-eclipse-changelog-fetched-2.2.1.tar.gz
+eclipse-changelog-fetched-2.2.2.tar.gz


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- eclipse-changelog.spec	25 Jul 2006 21:20:04 -0000	1.41
+++ eclipse-changelog.spec	1 Aug 2006 14:48:53 -0000	1.42
@@ -7,7 +7,7 @@
 %define	changelog_major		2
 %define changelog_minor		2
 %define changelog_majmin	%{changelog_major}.%{changelog_minor}
-%define changelog_micro   	1
+%define changelog_micro   	2
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -138,6 +138,10 @@
 %endif
 
 %changelog
+* Tue Aug 01 2006 Kyu Lee <klee at redhat.com> 2.2.2-1
+- Import version 2.2.2 that fixed the bug which was causing prepare-changelog
+menu button to not appear on 3.2.
+ 
 * Tue Jul 25 2006 Kyu Lee <klee at redhat.com> 2.2.1-1
 - Import version 2.2.1 that has prepare-changelog functionality for 3.2.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 Jul 2006 21:20:04 -0000	1.11
+++ sources	1 Aug 2006 14:48:53 -0000	1.12
@@ -1 +1 @@
-e87bacb5569f0a9e132034485c5f14f5  eclipse-changelog-fetched-2.2.1.tar.gz
+62605bb8908d93f933b2ecbbb0f0e1e2  eclipse-changelog-fetched-2.2.2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  1 15:03:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 11:03:15 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.28, 1.29 rhpxl.spec, 1.33,
	1.34 sources, 1.31, 1.32
Message-ID: <200608011503.k71F3FZO004371@cvs.devel.redhat.com>

Author: clumens

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	28 Jul 2006 20:59:08 -0000	1.28
+++ .cvsignore	1 Aug 2006 15:03:13 -0000	1.29
@@ -6,3 +6,4 @@
 rhpxl-0.23.tar.gz
 rhpxl-0.24.tar.gz
 rhpxl-0.25.tar.gz
+rhpxl-0.26.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rhpxl.spec	28 Jul 2006 20:59:09 -0000	1.33
+++ rhpxl.spec	1 Aug 2006 15:03:13 -0000	1.34
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.25
+Version: 0.26
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,10 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Tue Aug 01 2006 Chris Lumens <clumens at redhat.com> 0.26-1
+- Remove video card ddc probing (notting).
+- Remove monitor ddc probing.
+
 * Fri Jul 28 2006 Chris Lumens <clumens at redhat.com> 0.25-1
 - Convert x startup code into a class, simplifying startup API.
 - Restore call to xStartedCB so mini-wm gets run under anaconda.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	28 Jul 2006 20:59:09 -0000	1.31
+++ sources	1 Aug 2006 15:03:13 -0000	1.32
@@ -1 +1 @@
-69339d7f4e226299d6ae2539f9307bcb  rhpxl-0.25.tar.gz
+88b8f0f2eabdface67895ff1af04ee75  rhpxl-0.26.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  1 15:44:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 11:44:57 -0400
Subject: rpms/comps-extras/devel comps-extras.spec,1.19,1.20
Message-ID: <200608011544.k71FivXl032565@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/comps-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32472

Modified Files:
	comps-extras.spec 
Log Message:
bump


Index: comps-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/comps-extras/devel/comps-extras.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- comps-extras.spec	12 Jul 2006 04:52:18 -0000	1.19
+++ comps-extras.spec	1 Aug 2006 15:44:55 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Images for components and tools for working with the comps file
 Name: comps-extras
 Version: 11.1
-Release: 1.1
+Release: 2
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -31,6 +31,9 @@
 
 
 %changelog
+* Tue Aug  1 2006 Jesse Keating <jkeating at redhat.com> - 11.1-2
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 11.1-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 15:47:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 11:47:01 -0400
Subject: rpms/comps-extras/devel .cvsignore, 1.13, 1.14 comps-extras.spec,
	1.20, 1.21 sources, 1.17, 1.18
Message-ID: <200608011547.k71Fl1dT008921@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/comps-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8091

Modified Files:
	.cvsignore comps-extras.spec sources 
Log Message:
tweak summary



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/comps-extras/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	2 Mar 2006 19:36:27 -0000	1.13
+++ .cvsignore	1 Aug 2006 15:46:58 -0000	1.14
@@ -1 +1 @@
-comps-extras-11.1.tar.gz
+comps-extras-11.2.tar.gz


Index: comps-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/comps-extras/devel/comps-extras.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- comps-extras.spec	1 Aug 2006 15:44:55 -0000	1.20
+++ comps-extras.spec	1 Aug 2006 15:46:58 -0000	1.21
@@ -1,7 +1,7 @@
-Summary: Images for components and tools for working with the comps file
+Summary: Images for components included in Fedora
 Name: comps-extras
-Version: 11.1
-Release: 2
+Version: 11.2
+Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -31,11 +31,8 @@
 
 
 %changelog
-* Tue Aug  1 2006 Jesse Keating <jkeating at redhat.com> - 11.1-2
-- rebuild
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 11.1-1.1
-- rebuild
+* Tue Aug  1 2006 Bill Nottingham <notting at redhat.com> - 11.2-1
+- tweak summary
 
 * Thu Mar  2 2006 Bill Nottingham <notting at redhat.com> - 11.1-1
 - new education icon from Diana Fong


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/comps-extras/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	2 Mar 2006 19:36:28 -0000	1.17
+++ sources	1 Aug 2006 15:46:58 -0000	1.18
@@ -1 +1 @@
-8e15d2ea7a7d07b16b0f2170f5c9dca4  comps-extras-11.1.tar.gz
+f3cd99e837824178ac919f5626d11af0  comps-extras-11.2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  1 15:49:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 11:49:41 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.808,1.809
Message-ID: <200608011549.k71Fnfs3016747@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
sinhala cleverness


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -r1.808 -r1.809
--- openoffice.org.spec	1 Aug 2006 08:40:31 -0000	1.808
+++ openoffice.org.spec	1 Aug 2006 15:49:39 -0000	1.809
@@ -130,6 +130,8 @@
 Patch64: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
 Patch65: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
 Patch66: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch67: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch68: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -927,6 +929,8 @@
 %patch64 -p1 -b .ooo54603.fontconfig.part2.patch
 %patch65 -p1 -b .ooo67976.svx.macroscrash.patch
 %patch66 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch67 -p1 -b .ooo68047.vcl.zwj.patch
+%patch68 -p1 -b .ooo68048.vcl.imsurroundtext.patch
 
 tar xzf %{SOURCE1}
 
@@ -3506,6 +3510,11 @@
 - add openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
 - rh#200703# -> openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
 - rh#200874# -> openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+- rh#200728# ->
+	+ openoffice.org-2.0.3.ooo68047.vcl.zwj, don't drop zero width joiner
+	+ openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext, a bizarre, but
+	perfectly functional input method surrounding text implementation
+	based on the ATK bridge
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch



From fedora-cvs-commits at redhat.com  Tue Aug  1 15:50:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 11:50:58 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo68047.vcl.zwj.patch, NONE,
	1.1 openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch,
	NONE, 1.1
Message-ID: <200608011550.k71FowB7017243@cvs.devel.redhat.com>

Author: caolanm

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

Added Files:
	openoffice.org-2.0.3.ooo68047.vcl.zwj.patch 
	openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch 
Log Message:
new patches

openoffice.org-2.0.3.ooo68047.vcl.zwj.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.3.ooo68047.vcl.zwj.patch ---
Index: source/gdi/sallayout.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/sallayout.cxx,v
retrieving revision 1.78
diff -u -r1.78 sallayout.cxx
--- openoffice.org.orig/vcl/source/gdi/sallayout.cxx	3 May 2006 16:35:28 -0000	1.78
+++ openoffice.org/vcl/source/gdi/sallayout.cxx	1 Aug 2006 15:25:19 -0000
@@ -264,7 +264,7 @@
     if( (0x0001 <= cChar) && (cChar <= 0x001F) )
         return true;
     // formatting characters
-    if( (0x200B <= cChar) && (cChar <= 0x200F) )
+    if( (0x200E <= cChar) && (cChar <= 0x200F) )
         return true;
     if( (0x2028 <= cChar) && (cChar <= 0x202E) )
         return true;

openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch:
 gtkframe.cxx |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 70 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch ---
Index: gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.47
diff -u -r1.47 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	5 May 2006 11:01:02 -0000	1.47
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	1 Aug 2006 15:13:58 -0000
@@ -63,6 +63,9 @@
 
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
 
 using namespace com::sun::star;
 
@@ -2914,13 +2960,79 @@
         pThis->updateIMSpotLocation();
 }
 
+uno::Reference<accessibility::XAccessibleEditableText> 
+	FindFocus(uno::Reference< accessibility::XAccessibleContext > xContext)
+{
+    if (!xContext.is())
+        uno::Reference< accessibility::XAccessibleEditableText >();
+
+	uno::Reference<accessibility::XAccessibleStateSet> xState = xContext->getAccessibleStateSet();
+	if (xState.is())
+	{
+		if (xState->contains(accessibility::AccessibleStateType::FOCUSED))
+			return uno::Reference<accessibility::XAccessibleEditableText>(xContext, uno::UNO_QUERY);
+	}
+
+	for (sal_uInt32 i = 0; i < xContext->getAccessibleChildCount(); ++i)
+	{
+		uno::Reference< accessibility::XAccessible > xChild = xContext->getAccessibleChild(i);
+		if (!xChild.is())
+			continue;
+	    	uno::Reference< accessibility::XAccessibleContext > xChildContext = xChild->getAccessibleContext();
+		if (!xChildContext.is())
+			continue;
+		uno::Reference< accessibility::XAccessibleEditableText > xText = FindFocus(xChildContext);
+		if (xText.is())
+			return xText;
+	}
+	return uno::Reference< accessibility::XAccessibleEditableText >();
+}
+
+uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText()
+{
+    uno::Reference<accessibility::XAccessibleEditableText> xText;
+    Window* pFocusWin = ImplGetSVData()->maWinData.mpFocusWin;
+    if (!pFocusWin)
+	return xText;
+
+    uno::Reference< accessibility::XAccessible > xAccessible( pFocusWin->GetAccessible( true ) );
+    if (xAccessible.is())
+        xText = FindFocus(xAccessible->getAccessibleContext());
+    return xText;
+}
+
 gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pContext, gpointer im_handler )
 {
+    uno::Reference<accessibility::XAccessibleEditableText> xText = lcl_GetxText();
+
+    if (xText.is())
+    {
+        sal_uInt32 nPosition = xText->getCaretPosition();
+        rtl::OUString sAllText = xText->getText();
+		if (!sAllText.getLength())
+            return FALSE;
+	rtl::OString sUTF = rtl::OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8);
+	rtl::OUString sCursorText(sAllText, nPosition);
+	gtk_im_context_set_surrounding(pContext, sUTF.getStr(), sUTF.getLength(), 
+		rtl::OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength());
+	return TRUE;
+    }
+
     return FALSE;
 }
 
-gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext* pContext, gint arg1, gint arg2, gpointer im_handler )
+gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext* pContext, gint offset, gint nchars, 
+    gpointer im_handler )
 {
+    uno::Reference<accessibility::XAccessibleEditableText> xText = lcl_GetxText();
+
+    if (xText.is())
+    {
+        sal_uInt32 nPosition = xText->getCaretPosition();
+	xText->deleteText(nPosition + offset, nPosition + offset + nchars);
+	return TRUE;
+    }
+
     return FALSE;
 }
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 15:57:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 11:57:48 -0400
Subject: rpms/thunderbird/devel thunderbird.spec,1.75,1.76
Message-ID: <200608011557.k71FvmBW019817@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19771

Modified Files:
	thunderbird.spec 
Log Message:
rebuild



Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- thunderbird.spec	28 Jul 2006 00:56:11 -0000	1.75
+++ thunderbird.spec	1 Aug 2006 15:57:45 -0000	1.76
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	1.5.0.5
-Release:	2
+Release:	3
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -212,6 +212,9 @@
 #===============================================================================
 
 %changelog
+* Tue Aug  1 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.5-3
+- Rebuild
+
 * Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-2
 - Update to 1.5.0.5
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 16:11:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 12:11:58 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.163,
	1.164
Message-ID: <200608011611.k71GBwhL022799@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22737

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Tue Aug  1 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_100rh
- Require gcc-java for devel and src post and postun. (199942)
- Require libgcj for plugin post and postun. (199942)




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- java-1.4.2-gcj-compat.spec	31 Jul 2006 16:58:38 -0000	1.163
+++ java-1.4.2-gcj-compat.spec	1 Aug 2006 16:11:56 -0000	1.164
@@ -15,7 +15,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_99rh
+%define release 	40jpp_100rh
 %define cname           java-%{javaver}-%{origin}
 
 %define	sdklnk		java-%{javaver}-%{origin}
@@ -88,6 +88,8 @@
 Requires:	eclipse-ecj
 Requires:	python
 Requires:	gcc%{gccsuffix}-java >= %{gccver}
+Requires(post): gcc%{gccsuffix}-java >= %{gccver}
+Requires(postun): gcc%{gccsuffix}-java >= %{gccver}
 Obsoletes:	java-1.4.2-gcj4-compat-devel <= 1.4.2.0-4jpp_2rh
 
 %description devel
@@ -100,6 +102,8 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	libgcj%{gccsuffix}-src >= %{gccver}
+Requires(post): gcc%{gccsuffix}-java >= %{gccver}
+Requires(postun): gcc%{gccsuffix}-java >= %{gccver}
 
 %description src
 This package installs a versionless src.zip symlink that points to a
@@ -123,6 +127,8 @@
 Requires:       %{_sbindir}/update-alternatives
 Requires(post):       %{_sbindir}/update-alternatives
 Requires(postun):     %{_sbindir}/update-alternatives
+Requires(post): libgcj%{gccsuffix} >= %{gccver}
+Requires(postun): libgcj%{gccsuffix} >= %{gccver}
 Requires:	%{plugindir}
 
 %description plugin
@@ -636,6 +642,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Aug  1 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_100rh
+- Require gcc-java for devel and src post and postun. (199942)
+- Require libgcj for plugin post and postun. (199942)
+
 * Mon Jul 31 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_99rh
 - Add new built-in security providers.
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 16:16:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 12:16:00 -0400
Subject: rpms/irqbalance/devel .cvsignore, 1.3, 1.4 irqbalance.spec, 1.30,
	1.31 sources, 1.2, 1.3
Message-ID: <200608011616.k71GG0Y0027842@cvs.devel.redhat.com>

Author: nhorman

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

Modified Files:
	.cvsignore irqbalance.spec sources 
Log Message:
changing license to be GPLv2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 May 2006 20:46:33 -0000	1.3
+++ .cvsignore	1 Aug 2006 16:15:58 -0000	1.4
@@ -1,2 +1,3 @@
 irqbalance-0.12.tar.gz
 irqbalance-1.12
+irqbalance-0.13.tar.gz


Index: irqbalance.spec
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- irqbalance.spec	29 Jul 2006 04:24:27 -0000	1.30
+++ irqbalance.spec	1 Aug 2006 16:15:58 -0000	1.31
@@ -1,11 +1,11 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
-Version:        1.12
+Version:        1.13
 Release: 	%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL/OSL
-Source0:	irqbalance-0.12.tar.gz
+Source0:	irqbalance-0.13.tar.gz
 Source1:	irqbalance.init
 Source2:	irqbalance.sysconfig
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Tue Aug 01 2006 Neil Horman <nhorman at redhat.com>
+- Change license to GPL in version 0.13
+
 * Sat Jul 29 2006 Dave Jones <davej at redhat.com>
 - identify a bunch more classes.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jan 2005 05:58:43 -0000	1.2
+++ sources	1 Aug 2006 16:15:58 -0000	1.3
@@ -1 +1,2 @@
 1f225b73a01380955231b77d9be60c7a  irqbalance-0.12.tar.gz
+837f1d69e9b6ef0a58bbd4cf4e0d7f28  irqbalance-0.13.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  1 17:06:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 13:06:47 -0400
Subject: rpms/intltool/devel intltool.spec,1.25,1.26
Message-ID: <200608011706.k71H6lMG004954@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/intltool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4538

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



Index: intltool.spec
===================================================================
RCS file: /cvs/dist/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- intltool.spec	12 Jul 2006 06:24:56 -0000	1.25
+++ intltool.spec	1 Aug 2006 17:06:44 -0000	1.26
@@ -1,7 +1,7 @@
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files.
 Version: 0.35.0
-Release: 1.1
+Release: 2
 License: GPL
 Group: Development/Tools
 Source: %{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 Provides: xml-i18n-tools = 0.11
 Requires: perl-XML-Parser
 BuildRequires: perl-XML-Parser
+BuildRequires: gettext
 
 %description
 This tool automatically extracts translatable strings from oaf, glade,
@@ -43,6 +44,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Aug  1 2006 Matthias Clasen <mclasen at redhat.com> - 0.35.0-2
+- Add a missing BuildRequires: gettext
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.35.0-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 17:20:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 13:20:07 -0400
Subject: rpms/kernel/devel/configs config-powerpc32-generic, 1.15,
	1.16 config-powerpc64, 1.15, 1.16
Message-ID: <200608011720.k71HK7WC023844@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-powerpc32-generic config-powerpc64 
Log Message:
git1


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc32-generic,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-powerpc32-generic	15 Jul 2006 06:49:37 -0000	1.15
+++ config-powerpc32-generic	1 Aug 2006 17:20:04 -0000	1.16
@@ -30,6 +30,8 @@
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_MACIO=y
 CONFIG_INPUT_ADBHID=y
+CONFIG_ADB_PMU_LED=y
+CONFIG_ADB_PMU_LED_IDE=y
 
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_BMAC=m
@@ -63,3 +65,4 @@
 
 # CONFIG_HVC_RTAS is not set
 # CONFIG_MAMBO is not set
+


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-powerpc64	15 Jul 2006 06:49:37 -0000	1.15
+++ config-powerpc64	1 Aug 2006 17:20:04 -0000	1.16
@@ -24,6 +24,8 @@
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_RPA=m
 CONFIG_HOTPLUG_PCI_RPA_DLPAR=y
+CONFIG_ADB_PMU_LED=y
+CONFIG_ADB_PMU_LED_IDE=y
 CONFIG_PMAC_SMU=y
 CONFIG_CPU_FREQ_PMAC64=y
 CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y



From fedora-cvs-commits at redhat.com  Tue Aug  1 17:20:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 13:20:06 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc3-git1.bz2.sign, NONE,
	1.1 .cvsignore, 1.501, 1.502 kernel-2.6.spec, 1.2488,
	1.2489 linux-2.6-xen.patch, 1.48, 1.49 sources, 1.465,
	1.466 upstream, 1.407, 1.408 linux-2.6-radeon-backlight.patch,
	1.16, NONE linux-2.6-sysv-hash.patch, 1.1, NONE
Message-ID: <200608011720.k71HK6w3023832@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-xen.patch sources 
	upstream 
Added Files:
	patch-2.6.18-rc3-git1.bz2.sign 
Removed Files:
	linux-2.6-radeon-backlight.patch linux-2.6-sysv-hash.patch 
Log Message:
git1


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

iD8DBQBEzvxsyGugalF9Dw4RAufqAJsFSoNZNakr+GUAbZqwcCBG1R8TPgCfcRYV
mbZwM7deoKcToEUQq1OH568=
=2ZQU
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -r1.501 -r1.502
--- .cvsignore	30 Jul 2006 07:04:45 -0000	1.501
+++ .cvsignore	1 Aug 2006 17:20:03 -0000	1.502
@@ -4,3 +4,4 @@
 linux-2.6.17.tar.bz2
 xen-10730.tar.bz2
 patch-2.6.18-rc3.bz2
+patch-2.6.18-rc3-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2488
retrieving revision 1.2489
diff -u -r1.2488 -r1.2489
--- kernel-2.6.spec	1 Aug 2006 00:56:01 -0000	1.2488
+++ kernel-2.6.spec	1 Aug 2006 17:20:03 -0000	1.2489
@@ -264,6 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc3.bz2
+Patch2: patch-2.6.18-rc3-git1.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -288,7 +289,6 @@
 Patch314: linux-2.6-ppc-rtas-check.patch
 
 # 400 - 499   ia64
-Patch400: linux-2.6-sysv-hash.patch
 
 # 500 - 599   s390(x)
 # 600 - 699   sparc(64)
@@ -401,7 +401,6 @@
 Patch1600: linux-2.6-module_version.patch
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
 Patch1620: linux-2.6-serial-tickle-nmi.patch
-Patch1630: linux-2.6-radeon-backlight.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
@@ -723,6 +722,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -767,10 +767,6 @@
 # Check properly for successful RTAS instantiation
 %patch314 -p1
 
-# Ensure that the vdso is built with sysv hashing to fix
-# ia64 booting (#199634, #199595)
-%patch400 -p1
-
 #
 # Patches 500 through 1000 are reserved for bugfixes to the core system
 # and patches related to how RPMs are build
@@ -935,8 +931,6 @@
 %patch1610 -p1
 # Tickle the NMI whilst doing serial writes.
 %patch1620 -p1
-# Radeon on thinkpad backlight power-management goodness.
-%patch1630 -p1
 # Enable autofs4 to return fail for revalidate during lookup
 %patch1640 -p1
 # Use persistent allocation in softcursor
@@ -1659,6 +1653,9 @@
 %endif
 
 %changelog
+* Tue Aug  1 2006 Dave Jones <davej at redhat.com>
+- 2.6.18rc3-git1
+
 * Tue Aug  1 2006 Juan Quintela <quintela at redhat.com>
 - disable CONFIG_DEBUG_SLAB for xen (should fix #200127).
 

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1182 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |    1 
 arch/ia64/kernel/gate.lds.S                         |    1 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  799 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  569 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  125 
 drivers/xen/netback/interface.c                     |  315 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1122 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1606 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 407 files changed, 85185 insertions(+), 201 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- linux-2.6-xen.patch	31 Jul 2006 20:54:04 -0000	1.48
+++ linux-2.6-xen.patch	1 Aug 2006 17:20:03 -0000	1.49
@@ -149,10 +149,10 @@
  	---help---
  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
  	  the Memory Type Range Registers (MTRRs) may be used to control
-@@ -673,7 +694,7 @@ config MTRR
+@@ -694,7 +694,7 @@ config MTRR
  
  config EFI
- 	bool "Boot from EFI support (EXPERIMENTAL)"
+ 	bool "Boot from EFI support"
 -	depends on ACPI
 +	depends on ACPI && !X86_XEN
  	default n


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- sources	30 Jul 2006 07:04:47 -0000	1.465
+++ sources	1 Aug 2006 17:20:04 -0000	1.466
@@ -1,3 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 4ae2c95631b54820475437c206c3a4c2  xen-10730.tar.bz2
 ba31b754aaf80aa388858f86c34c4d01  patch-2.6.18-rc3.bz2
+3f338a75da0fca3fba1121afa4636f25  patch-2.6.18-rc3-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- upstream	30 Jul 2006 07:04:47 -0000	1.407
+++ upstream	1 Aug 2006 17:20:04 -0000	1.408
@@ -1,2 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc3.bz2
+patch-2.6.18-rc3-git1.bz2


--- linux-2.6-radeon-backlight.patch DELETED ---


--- linux-2.6-sysv-hash.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 17:25:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 13:25:08 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2489,
	1.2490 linux-2.6-w1-hush-debug.patch, 1.1, NONE
Message-ID: <200608011725.k71HP8Cu025762@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-w1-hush-debug.patch 
Log Message:
drop old patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2489
retrieving revision 1.2490
diff -u -r1.2489 -r1.2490
--- kernel-2.6.spec	1 Aug 2006 17:20:03 -0000	1.2489
+++ kernel-2.6.spec	1 Aug 2006 17:25:06 -0000	1.2490
@@ -404,7 +404,6 @@
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
-Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
 Patch1740: linux-2.6-softlockup-disable.patch
@@ -937,8 +936,6 @@
 %patch1670 -p1
 # Add some USB devices to the unusual quirk list.
 %patch1680 -p1
-# Silence debug messages in w1
-%patch1700 -p1
 # Only print migration info on SMP
 %patch1710 -p1
 # setuid /proc/self/maps fix.


--- linux-2.6-w1-hush-debug.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 17:41:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 13:41:43 -0400
Subject: rpms/kernel/devel linux-2.6-lockdep-fixes.patch,1.13,1.14
Message-ID: <200608011741.k71HfhtY030362@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-lockdep-fixes.patch 
Log Message:
sync


linux-2.6-lockdep-fixes.patch:
 b/include/net/ip6_route.h                     |   12 +-
 b/include/net/ipv6.h                          |    3 
 b/net/dccp/ipv6.c                             |    4 
 b/net/ipv6/af_inet6.c                         |    2 
 b/net/ipv6/inet6_connection_sock.c            |    2 
 b/net/ipv6/ip6_output.c                       |  120 +++++++++++++++++---------
 b/net/ipv6/tcp_ipv6.c                         |    4 
 b/net/ipv6/udp.c                              |    3 
 linux-2.6.17-mm6/include/net/sock.h           |   33 ++++++-
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 -
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++
 linux-2.6.18-rc1/net/socket.c                 |   25 +++++
 12 files changed, 168 insertions(+), 58 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-lockdep-fixes.patch	29 Jul 2006 05:23:55 -0000	1.13
+++ linux-2.6-lockdep-fixes.patch	1 Aug 2006 17:41:40 -0000	1.14
@@ -338,150 +338,6 @@
  asmlinkage long sys_socket(int family, int type, int protocol)
 
 
-From davej  Mon Jul 24 15:24:41 2006
-Return-Path: <>
-Received: from pobox.devel.redhat.com [10.11.255.8]
-	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
-	for <davej at localhost> (single-drop); Mon, 24 Jul 2006 15:24:41 -0400 (EDT)
-Received: from pobox.devel.redhat.com ([unix socket])
-	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
-	 Mon, 24 Jul 2006 15:23:20 -0400
-X-Sieve: CMU Sieve 2.2
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6OJNKqN031227
-	for <davej at pobox.devel.redhat.com>; Mon, 24 Jul 2006 15:23:20 -0400
-Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
-	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6OJNK16004919
-	for <davej at redhat.com>; Mon, 24 Jul 2006 15:23:20 -0400
-Received: from pimp.vs19.net (pimp.vs19.net [81.171.100.24])
-	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k6OJND2O024693
-	for <davej at redhat.com>; Mon, 24 Jul 2006 15:23:13 -0400
-Received: from www-data by pimp.vs19.net with local (Exim 4.50)
-	id 1G561D-0004O8-2F
-	for davej at redhat.com; Mon, 24 Jul 2006 19:23:07 +0000
-Received: (majordomo at vger.kernel.org) by vger.kernel.org id S932233AbWGXRWO (ORCPT <rfc822;linux-kernel-outgoing>); Mon, 24 Jul 2006 13:22:14 -0400
-Received: from a222036.upc-a.chello.nl ([62.163.222.36]:11908 "EHLO laptopd505.fenrus.org") by vger.kernel.org with ESMTP id S932231AbWGXRWL (ORCPT <rfc822;linux-kernel at vger.kernel.org>); Mon, 24 Jul 2006 13:22:11 -0400
-Received: from laptopd505.fenrus.org (localhost.localdomain [127.0.0.1]) by laptopd505.fenrus.org (8.13.4/8.13.4) with ESMTP id k6OHLCCi006591; Mon, 24 Jul 2006 19:21:12 +0200
-Received: (from arjan at localhost) by laptopd505.fenrus.org (8.13.4/8.13.4/Submit) id k6OHLB13006590; Mon, 24 Jul 2006 19:21:11 +0200
-X-Authentication-Warning: laptopd505.fenrus.org: arjan set sender to arjan at linux.intel.com using -f
-Subject: [patch] inotify: fix deadlock found by lockdep
-From: Arjan van de Ven <arjan at linux.intel.com>
-To: Reuben Farrelly <reuben-lkml at reub.net>
-Cc: Linux Kernel <linux-kernel at vger.kernel.org>, Ingo Molnar <mingo at elte.hu>,
-        John McCutchan <john at johnmccutchan.com>, Andrew Morton <akpm at osdl.org>,
-        rml at novell.com, viro at zeniv.linux.org.uk
-In-Reply-To: <44C2C90B.6090108 at reub.net>
-References: <20060713224800.6cbdbf5d.akpm at osdl.org>  <44C2C90B.6090108 at reub.net>
-Content-Type: text/plain
-Content-Transfer-Encoding: 7bit
-Date: 	Mon, 24 Jul 2006 19:21:10 +0200
-Message-Id: <1153761671.3043.89.camel at laptopd505.fenrus.org>
-Mime-Version: 1.0
-X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4)
-Sender: linux-kernel-owner at vger.kernel.org
-Precedence: bulk
-X-Mailing-List: 	linux-kernel at vger.kernel.org
-X-RedHat-Spam-Score: 0 
-Status: RO
-Content-Length: 2993
-Lines: 95
-
-Subject: [patch] inotify: fix deadlock found by lockdep
-From: Arjan van de Ven <arjan at linux.intel.com>
-
-This is a real deadlock, a nice complex one:
-(warning: long explanation follows so that Andrew can have a complete
-patch description)
-
-it's an ABCDA deadlock:
-
-A iprune_mutex 
-B inode->inotify_mutex
-C ih->mutex
-D dev->ev_mutex
-
-
-The AB relationship comes straight from invalidate_inodes()
- 
-int invalidate_inodes(struct super_block * sb)
-{
-        int busy;
-        LIST_HEAD(throw_away);
-
-        mutex_lock(&iprune_mutex);
-        spin_lock(&inode_lock);
-        inotify_unmount_inodes(&sb->s_inodes);
-
-where inotify_umount_inodes() takes the 
-                mutex_lock(&inode->inotify_mutex);
-
-The BC relationship comes directly from inotify_find_update_watch():
-s32 inotify_find_update_watch(struct inotify_handle *ih, struct inode *inode,
-                              u32 mask)
-{
-   ...
-        mutex_lock(&inode->inotify_mutex);
-        mutex_lock(&ih->mutex);
-
-
-The CD relationship comes from inotify_rm_wd:
-inotify_rm_wd does
-        mutex_lock(&inode->inotify_mutex);
-        mutex_lock(&ih->mutex)
-and then calls inotify_remove_watch_locked() which calls
-notify_dev_queue_event() which does
-	        mutex_lock(&dev->ev_mutex);
-
-(this strictly is a BCD relationship)
-
-
-The DA relationship comes from the most interesting part:
-
-  [<ffffffff8022d9f2>] shrink_icache_memory+0x42/0x270
-  [<ffffffff80240dc4>] shrink_slab+0x11d/0x1c9
-  [<ffffffff802b5104>] try_to_free_pages+0x187/0x244
-  [<ffffffff8020efed>] __alloc_pages+0x1cd/0x2e0
-  [<ffffffff8025e1f8>] cache_alloc_refill+0x3f8/0x821
-  [<ffffffff8020a5e5>] kmem_cache_alloc+0x85/0xcb
-  [<ffffffff802db027>] kernel_event+0x2e/0x122
-  [<ffffffff8021d61c>] inotify_dev_queue_event+0xcc/0x140
-
-inotify_dev_queue_event schedules a kernel_event which does a
-kmem_cache_alloc( , GFP_KERNEL) which may try to shrink slabs, including
-the inode cache .. which then takes iprune_mutex. 
-
-And voila, there is an AB, a BC, a CD relationship (even a direct BCD),
-and also now a DA relationship -> a circular type AB-BA deadlock but
-involving 4 locks.
-
-The solution is simple: kernel_event() is NOT allowed to use GFP_KERNEL,
-but must use GFP_NOFS to not cause recursion into the VFS.
-
-Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
-
-Index: linux-2.6.18-rc1/fs/inotify_user.c
-===================================================================
---- linux-2.6.18-rc1.orig/fs/inotify_user.c
-+++ linux-2.6.18-rc1/fs/inotify_user.c
-@@ -187,7 +187,7 @@ static struct inotify_kernel_event * ker
- {
- 	struct inotify_kernel_event *kevent;
- 
--	kevent = kmem_cache_alloc(event_cachep, GFP_KERNEL);
-+	kevent = kmem_cache_alloc(event_cachep, GFP_NOFS);
- 	if (unlikely(!kevent))
- 		return NULL;
- 
-
-
-
--
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
-
-
 From davej  Sat Jul 29 00:35:14 2006
 Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S1161468AbWG2Edz at vger.kernel.org>
 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 



From fedora-cvs-commits at redhat.com  Tue Aug  1 17:42:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 13:42:44 -0400
Subject: rpms/kernel/devel/scripts rediffall.pl,1.3,1.4
Message-ID: <200608011742.k71HgiW1030829@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rediffall.pl 
Log Message:
fix


Index: rediffall.pl
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/scripts/rediffall.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rediffall.pl	6 Sep 2005 02:09:13 -0000	1.3
+++ rediffall.pl	1 Aug 2006 17:42:41 -0000	1.4
@@ -10,8 +10,8 @@
 # Suggestion: create a /kernel symbolic link to the top of your CVS tree.
 
 my $workdir = "/dev/shm/redifftree";
-my $origdir = "/home/davej/src/rhat/kernel/devel";
-my $kernver = "linux-2.6.13";
+my $origdir = "/home/davej/devel";
+my $kernver = "linux-2.6.17";
 my $datestrip = "s/^\\(\\(+++\\|---\\) [^[:blank:]]\\+\\)[[:blank:]].*/\\1/";
 my $patchindex = 0;
 my @patchlist;
@@ -21,7 +21,7 @@
 system("mkdir -p $workdir");
 system("rm -rf $workdir/*");
 chdir("$workdir");
-system("tar -jxvf $origdir/$kernver.tar.bz2 &> /dev/null");
+system("tar -jxvf $origdir/$kernver.tar.bz2 > /dev/null");
 system("cp -al $kernver linux-$patchindex");
 
 # phase 2: read the spec from stdin and store all patches



From fedora-cvs-commits at redhat.com  Tue Aug  1 17:48:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 13:48:24 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2490,
	1.2491 linux-2.6-scsi-advansys-pcitable.patch, 1.2,
	1.3 linux-2.6-x86-hp-reboot.patch, 1.1, NONE
Message-ID: <200608011748.k71HmOYx015522@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-scsi-advansys-pcitable.patch 
Removed Files:
	linux-2.6-x86-hp-reboot.patch 
Log Message:
drop unneeded patch (already upstreamed)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2490
retrieving revision 1.2491
diff -u -r1.2490 -r1.2491
--- kernel-2.6.spec	1 Aug 2006 17:25:06 -0000	1.2490
+++ kernel-2.6.spec	1 Aug 2006 17:48:21 -0000	1.2491
@@ -278,7 +278,6 @@
 Patch202: linux-2.6-intel-cache-build.patch
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
-Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
 Patch209: linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch
@@ -747,8 +746,6 @@
 %patch203 -p1
 # Workaround BIOSes that don't list CPU0
 %patch205 -p1
-# Reboot through BIOS on HP systems,.
-%patch206 -p1
 # Support TIF_RESTORE_SIGMASK on x86_64
 %patch207 -p1
 # Add ppoll and pselect syscalls

linux-2.6-scsi-advansys-pcitable.patch:
 drivers/scsi/advansys.c                     |   82 ++++++++++++++--------------
 linux-2.6.17.noarch/drivers/scsi/advansys.c |    8 ++
 2 files changed, 49 insertions(+), 41 deletions(-)

Index: linux-2.6-scsi-advansys-pcitable.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-scsi-advansys-pcitable.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-scsi-advansys-pcitable.patch	31 Oct 2005 03:03:28 -0000	1.2
+++ linux-2.6-scsi-advansys-pcitable.patch	1 Aug 2006 17:48:21 -0000	1.3
@@ -1,21 +1,6 @@
-Remove a lot of duplicate #defines from the advansys driver.
+Remove a lot of duplicate #defines from the advansys driver,
+and make them look like PCI IDs as defined elsewhere in the kernel.
 
---- linux-2.6.14/include/linux/pci_ids.h~	2005-10-30 21:36:21.000000000 -0500
-+++ linux-2.6.14/include/linux/pci_ids.h	2005-10-30 21:37:16.000000000 -0500
-@@ -949,6 +949,13 @@
- #define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006
- #define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016
- 
-+#define PCI_VENDOR_ID_ASP		0x10cd
-+#define PCI_DEVICE_ID_ASP_1200A		0x1100
-+#define PCI_DEVICE_ID_ASP_ABP940	0x1200
-+#define PCI_DEVICE_ID_ASP_ABP940U	0x1300
-+#define PCI_DEVICE_ID_ASP_ABP940UW	0x2300
-+#define PCI_DEVICE_ID_38C0800_REV1	0x2500
-+#define PCI_DEVICE_ID_38C1600_REV1	0x2700
- 
- #define PCI_VENDOR_ID_TCONRAD		0x10da
- #define PCI_DEVICE_ID_TCONRAD_TOKENRING	0x0508
 --- vanilla/drivers/scsi/advansys.c	2005-06-17 15:48:29.000000000 -0400
 +++ linux-2.6.12/drivers/scsi/advansys.c	2005-07-05 23:27:48.000000000 -0400
 @@ -889,10 +889,6 @@ typedef unsigned char uchar;
@@ -184,6 +169,24 @@
      0,                          /* 62 reserved */
 
 
+--- linux-2.6.17.noarch/drivers/scsi/advansys.c~	2006-08-01 13:33:56.000000000 -0400
++++ linux-2.6.17.noarch/drivers/scsi/advansys.c	2006-08-01 13:34:58.000000000 -0400
+@@ -895,6 +895,14 @@ typedef unsigned char uchar;
+ #define  ASC_DVCLIB_CALL_FAILED   (0)
+ #define  ASC_DVCLIB_CALL_ERROR    (-1)
+ 
++#define PCI_VENDOR_ID_ASP		0x10cd
++#define PCI_DEVICE_ID_ASP_1200A		0x1100
++#define PCI_DEVICE_ID_ASP_ABP940	0x1200
++#define PCI_DEVICE_ID_ASP_ABP940U	0x1300
++#define PCI_DEVICE_ID_ASP_ABP940UW	0x2300
++#define PCI_DEVICE_ID_38C0800_REV1	0x2500
++#define PCI_DEVICE_ID_38C1600_REV1	0x2700
++
+ /*
+  * Enable CC_VERY_LONG_SG_LIST to support up to 64K element SG lists.
+  * The SRB structure will have to be changed and the ASC_SRB2SCSIQ()
+
 
 
 The advansys driver needs a lot of TLC. It does all its probing


--- linux-2.6-x86-hp-reboot.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 17:52:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 13:52:18 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2491,
	1.2492 linux-2.6-intel-cache-build.patch, 1.1, NONE
Message-ID: <200608011752.k71HqI5K016961@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-intel-cache-build.patch 
Log Message:
shouldnt be needed anymore


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2491
retrieving revision 1.2492
diff -u -r1.2491 -r1.2492
--- kernel-2.6.spec	1 Aug 2006 17:48:21 -0000	1.2491
+++ kernel-2.6.spec	1 Aug 2006 17:52:15 -0000	1.2492
@@ -275,7 +275,6 @@
 
 Patch200: linux-2.6-x86-tune-generic.patch
 Patch201: linux-2.6-x86-vga-vidfail.patch
-Patch202: linux-2.6-intel-cache-build.patch
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
@@ -740,8 +739,6 @@
 # for the installer cd that wants to automatically fall back to textmode
 # in that case
 %patch201 -p1
-# exitfunc called from initfunc.
-%patch202 -p1
 # Suppress APIC errors on UP x86-64.
 %patch203 -p1
 # Workaround BIOSes that don't list CPU0


--- linux-2.6-intel-cache-build.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 18:18:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 14:18:55 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2492,
	1.2493 linux-2.6-serial-resume.patch, 1.1, NONE
Message-ID: <200608011818.k71IItMW024021@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-serial-resume.patch 
Log Message:
useless patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2492
retrieving revision 1.2493
diff -u -r1.2492 -r1.2493
--- kernel-2.6.spec	1 Aug 2006 17:52:15 -0000	1.2492
+++ kernel-2.6.spec	1 Aug 2006 18:18:51 -0000	1.2493
@@ -405,7 +405,6 @@
 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
-Patch1750: linux-2.6-serial-resume.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
 
@@ -936,8 +935,6 @@
 %patch1720 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
-# serial/tty resume fixing.
-%patch1750 -p1
 # Fix up kmalloc whilst atomic warning during resume.
 #%patch1760 -p1
 # Speed up spinlock debug.


--- linux-2.6-serial-resume.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 18:27:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 14:27:41 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2493,
	1.2494 linux-2.6-selinux-hush.patch, 1.1, NONE
Message-ID: <200608011827.k71IRf2n027396@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-selinux-hush.patch 
Log Message:
more dead patches


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2493
retrieving revision 1.2494
diff -u -r1.2493 -r1.2494
--- kernel-2.6.spec	1 Aug 2006 18:18:51 -0000	1.2493
+++ kernel-2.6.spec	1 Aug 2006 18:27:39 -0000	1.2494
@@ -409,7 +409,6 @@
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
 
 # SELinux/audit patches.
-Patch1800: linux-2.6-selinux-hush.patch
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -940,8 +939,6 @@
 # Speed up spinlock debug.
 %patch1770 -p1
 
-# Silence some selinux messages.
-%patch1800 -p1
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1
 


--- linux-2.6-selinux-hush.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 18:39:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 14:39:36 -0400
Subject: rpms/kernel/devel/configs config-generic,1.237,1.237.4.1
Message-ID: <200608011839.k71Ida6s030699@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
      Tag: private-lspp-46-branch
	config-generic 
Log Message:
* Tue Aug 1 2006 Steve Grubb <sgrubb at redhat.com>
- lspp 46




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237
retrieving revision 1.237.4.1
diff -u -r1.237 -r1.237.4.1
--- config-generic	26 Jul 2006 03:00:34 -0000	1.237
+++ config-generic	1 Aug 2006 18:39:34 -0000	1.237.4.1
@@ -2522,7 +2522,7 @@
 # CONFIG_RCU_TORTURE_TEST is not set
 
 # Turn off these debug options for production kernels.
-CONFIG_DEBUG_SLAB=y
+# CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set



From fedora-cvs-commits at redhat.com  Tue Aug  1 18:39:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 14:39:36 -0400
Subject: rpms/kernel/devel linux-2.6-audit-git.patch, NONE,
	1.1.34.1 kernel-2.6.spec, 1.2485, 1.2485.2.1
Message-ID: <200608011839.k71IdaUE030694@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
      Tag: private-lspp-46-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-46-branch
	linux-2.6-audit-git.patch 
Log Message:
* Tue Aug 1 2006 Steve Grubb <sgrubb at redhat.com>
- lspp 46



linux-2.6-audit-git.patch:
 fs/namei.c               |    8 ++-
 include/linux/audit.h    |   43 +++++++++++------
 include/linux/fsnotify.h |    6 +-
 kernel/audit.c           |    4 -
 kernel/auditfilter.c     |   24 +++++++++
 kernel/auditsc.c         |  117 ++++++++++++++++++++++++++++++-----------------
 6 files changed, 138 insertions(+), 64 deletions(-)

--- NEW FILE linux-2.6-audit-git.patch ---
diff --git a/fs/namei.c b/fs/namei.c
index e01070d..55a1312 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -159,7 +159,7 @@ char * getname(const char __user * filen
 #ifdef CONFIG_AUDITSYSCALL
 void putname(const char *name)
 {
-	if (unlikely(current->audit_context))
+	if (unlikely(!audit_dummy_context()))
 		audit_putname(name);
 	else
 		__putname(name);
@@ -1125,7 +1125,7 @@ static int fastcall do_path_lookup(int d
 	retval = link_path_walk(name, nd);
 out:
 	if (likely(retval == 0)) {
-		if (unlikely(current->audit_context && nd && nd->dentry &&
+		if (unlikely(!audit_dummy_context() && nd && nd->dentry &&
 				nd->dentry->d_inode))
 		audit_inode(name, nd->dentry->d_inode);
 	}
@@ -1357,7 +1357,7 @@ static int may_delete(struct inode *dir,
 		return -ENOENT;
 
 	BUG_ON(victim->d_parent->d_inode != dir);
-	audit_inode_child(victim->d_name.name, victim->d_inode, dir->i_ino);
+	audit_inode_child(victim->d_name.name, victim->d_inode, dir);
 
 	error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
 	if (error)
@@ -1659,6 +1659,7 @@ do_last:
 	 * It already exists.
 	 */
 	mutex_unlock(&dir->d_inode->i_mutex);
+	audit_inode_update(path.dentry->d_inode);
 
 	error = -EEXIST;
 	if (flag & O_EXCL)
@@ -1669,6 +1670,7 @@ do_last:
 		if (flag & O_NOFOLLOW)
 			goto exit_dput;
 	}
+
 	error = -ENOENT;
 	if (!path.dentry->d_inode)
 		goto exit_dput;
diff --git a/include/linux/audit.h b/include/linux/audit.h
index b27d7de..d26060e 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -327,21 +327,31 @@ extern void __audit_getname(const char *
 extern void audit_putname(const char *name);
 extern void __audit_inode(const char *name, const struct inode *inode);
 extern void __audit_inode_child(const char *dname, const struct inode *inode,
-				unsigned long pino);
+				const struct inode *parent);
+extern void __audit_inode_update(const struct inode *inode);
+static inline int audit_dummy_context(void)
+{
+	void *p = current->audit_context;
+	return !p || *(int *)p;
+}
 static inline void audit_getname(const char *name)
 {
-	if (unlikely(current->audit_context))
+	if (unlikely(!audit_dummy_context()))
 		__audit_getname(name);
 }
 static inline void audit_inode(const char *name, const struct inode *inode) {
-	if (unlikely(current->audit_context))
+	if (unlikely(!audit_dummy_context()))
 		__audit_inode(name, inode);
 }
 static inline void audit_inode_child(const char *dname, 
-				     const struct inode *inode, 
-				     unsigned long pino) {
-	if (unlikely(current->audit_context))
-		__audit_inode_child(dname, inode, pino);
+				     const struct inode *inode,
+				     const struct inode *parent) {
+	if (unlikely(!audit_dummy_context()))
+		__audit_inode_child(dname, inode, parent);
+}
+static inline void audit_inode_update(const struct inode *inode) {
+	if (unlikely(!audit_dummy_context()))
+		__audit_inode_update(inode);
 }
 
 				/* Private API (for audit.c only) */
@@ -365,57 +375,61 @@ extern int __audit_mq_getsetattr(mqd_t m
 
 static inline int audit_ipc_obj(struct kern_ipc_perm *ipcp)
 {
-	if (unlikely(current->audit_context))
+	if (unlikely(!audit_dummy_context()))
 		return __audit_ipc_obj(ipcp);
 	return 0;
 }
 static inline int audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode)
 {
-	if (unlikely(current->audit_context))
+	if (unlikely(!audit_dummy_context()))
 		return __audit_ipc_set_perm(qbytes, uid, gid, mode);
 	return 0;
 }
 static inline int audit_mq_open(int oflag, mode_t mode, struct mq_attr __user *u_attr)
 {
-	if (unlikely(current->audit_context))
+	if (unlikely(!audit_dummy_context()))
 		return __audit_mq_open(oflag, mode, u_attr);
 	return 0;
 }
 static inline int audit_mq_timedsend(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec __user *u_abs_timeout)
 {
-	if (unlikely(current->audit_context))
+	if (unlikely(!audit_dummy_context()))
 		return __audit_mq_timedsend(mqdes, msg_len, msg_prio, u_abs_timeout);
 	return 0;
 }
 static inline int audit_mq_timedreceive(mqd_t mqdes, size_t msg_len, unsigned int __user *u_msg_prio, const struct timespec __user *u_abs_timeout)
 {
-	if (unlikely(current->audit_context))
+	if (unlikely(!audit_dummy_context()))
 		return __audit_mq_timedreceive(mqdes, msg_len, u_msg_prio, u_abs_timeout);
 	return 0;
 }
 static inline int audit_mq_notify(mqd_t mqdes, const struct sigevent __user *u_notification)
 {
-	if (unlikely(current->audit_context))
+	if (unlikely(!audit_dummy_context()))
 		return __audit_mq_notify(mqdes, u_notification);
 	return 0;
 }
 static inline int audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)
 {
-	if (unlikely(current->audit_context))
+	if (unlikely(!audit_dummy_context()))
 		return __audit_mq_getsetattr(mqdes, mqstat);
 	return 0;
 }
+extern int audit_n_rules;
 #else
 #define audit_alloc(t) ({ 0; })
 #define audit_free(t) do { ; } while (0)
 #define audit_syscall_entry(ta,a,b,c,d,e) do { ; } while (0)
 #define audit_syscall_exit(f,r) do { ; } while (0)
+#define audit_dummy_context() 0
 #define audit_getname(n) do { ; } while (0)
 #define audit_putname(n) do { ; } while (0)
 #define __audit_inode(n,i) do { ; } while (0)
 #define __audit_inode_child(d,i,p) do { ; } while (0)
+#define __audit_inode_update(i) do { ; } while (0)
 #define audit_inode(n,i) do { ; } while (0)
 #define audit_inode_child(d,i,p) do { ; } while (0)
+#define audit_inode_update(i) do { ; } while (0)
 #define auditsc_get_stamp(c,t,s) do { BUG(); } while (0)
 #define audit_get_loginuid(c) ({ -1; })
 #define audit_ipc_obj(i) ({ 0; })
@@ -430,6 +444,7 @@ #define audit_mq_timedsend(d,l,p,t) ({ 0
 #define audit_mq_timedreceive(d,l,p,t) ({ 0; })
 #define audit_mq_notify(d,n) ({ 0; })
 #define audit_mq_getsetattr(d,s) ({ 0; })
+#define audit_n_rules 0
 #endif
 
 #ifdef CONFIG_AUDIT
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index cc5dec7..d4f219f 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -67,7 +67,7 @@ static inline void fsnotify_move(struct 
 	if (source) {
 		inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL, NULL);
 	}
-	audit_inode_child(new_name, source, new_dir->i_ino);
+	audit_inode_child(new_name, source, new_dir);
 }
 
 /*
@@ -98,7 +98,7 @@ static inline void fsnotify_create(struc
 	inode_dir_notify(inode, DN_CREATE);
 	inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name,
 				  dentry->d_inode);
-	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino);
+	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode);
 }
 
 /*
@@ -109,7 +109,7 @@ static inline void fsnotify_mkdir(struct
 	inode_dir_notify(inode, DN_CREATE);
 	inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0, 
 				  dentry->d_name.name, dentry->d_inode);
-	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino);
+	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode);
 }
 
 /*
diff --git a/kernel/audit.c b/kernel/audit.c
index d417ca1..0a36091 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -690,9 +690,7 @@ #endif
 /* Initialize audit support at boot time. */
 static int __init audit_init(void)
 {
-#ifdef CONFIG_AUDITSYSCALL
 	int i;
-#endif
 
 	printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
 	       audit_default ? "enabled" : "disabled");
@@ -717,10 +715,10 @@ #ifdef CONFIG_AUDITSYSCALL
 	audit_ih = inotify_init(&audit_inotify_ops);
 	if (IS_ERR(audit_ih))
 		audit_panic("cannot initialize inotify handle");
+#endif
 
 	for (i = 0; i < AUDIT_INODE_BUCKETS; i++)
 		INIT_LIST_HEAD(&audit_inode_hash[i]);
-#endif
 
 	return 0;
 }
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 5b4e162..7322f34 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -1134,6 +1134,14 @@ static inline int audit_add_rule(struct 
 	struct audit_watch *watch = entry->rule.watch;
 	struct nameidata *ndp, *ndw;
 	int h, err, putnd_needed = 0;
+#ifdef CONFIG_AUDITSYSCALL
+	int dont_count = 0;
+
+	/* If either of these, don't count towards total */
+	if (entry->rule.listnr == AUDIT_FILTER_USER ||
+		entry->rule.listnr == AUDIT_FILTER_TYPE)
+		dont_count = 1;
+#endif
 
 	if (inode_f) {
 		h = audit_hash_ino(inode_f->val);
@@ -1174,6 +1182,10 @@ static inline int audit_add_rule(struct 
 	} else {
 		list_add_tail_rcu(&entry->list, list);
 	}
+#ifdef CONFIG_AUDITSYSCALL
+	if (!dont_count)
+		audit_n_rules++;
+#endif
 	mutex_unlock(&audit_filter_mutex);
 
 	if (putnd_needed)
@@ -1198,6 +1210,14 @@ static inline int audit_del_rule(struct 
 	struct audit_watch *watch, *tmp_watch = entry->rule.watch;
 	LIST_HEAD(inotify_list);
 	int h, ret = 0;
+#ifdef CONFIG_AUDITSYSCALL
+	int dont_count = 0;
+
+	/* If either of these, don't count towards total */
+	if (entry->rule.listnr == AUDIT_FILTER_USER ||
+		entry->rule.listnr == AUDIT_FILTER_TYPE)
+		dont_count = 1;
+#endif
 
 	if (inode_f) {
 		h = audit_hash_ino(inode_f->val);
@@ -1235,6 +1255,10 @@ static inline int audit_del_rule(struct 
 	list_del_rcu(&e->list);
 	call_rcu(&e->rcu, audit_free_rule_rcu);
 
+#ifdef CONFIG_AUDITSYSCALL
+	if (!dont_count)
+		audit_n_rules--;
+#endif
 	mutex_unlock(&audit_filter_mutex);
 
 	if (!list_empty(&inotify_list))
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index ae40ac8..efc1b74 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -85,6 +85,9 @@ #define AUDIT_NAMES_RESERVED 7
 /* Indicates that audit should log the full pathname. */
 #define AUDIT_NAME_FULL -1
 
+/* number of audit rules */
+int audit_n_rules;
+
 /* When fs/namei.c:getname() is called, we store the pointer in name and
  * we don't let putname() free it (instead we free all of the saved
  * pointers at syscall exit time).
@@ -174,6 +177,7 @@ struct audit_aux_data_path {
 
 /* The per-task audit context. */
 struct audit_context {
+	int		    dummy;	/* must be the first element */
 	int		    in_syscall;	/* 1 if task is in a syscall */
 	enum audit_state    state;
 	unsigned int	    serial;     /* serial number for record */
@@ -514,7 +518,7 @@ static inline struct audit_context *audi
 	context->return_valid = return_valid;
 	context->return_code  = return_code;
 
-	if (context->in_syscall && !context->auditable) {
+	if (context->in_syscall && !context->dummy && !context->auditable) {
 		enum audit_state state;
 
 		state = audit_filter_syscall(tsk, context, &audit_filter_list[AUDIT_FILTER_EXIT]);
@@ -530,17 +534,7 @@ static inline struct audit_context *audi
 	}
 
 get_context:
-	context->pid = tsk->pid;
-	context->ppid = sys_getppid();	/* sic.  tsk == current in all cases */
-	context->uid = tsk->uid;
-	context->gid = tsk->gid;
-	context->euid = tsk->euid;
-	context->suid = tsk->suid;
-	context->fsuid = tsk->fsuid;
-	context->egid = tsk->egid;
-	context->sgid = tsk->sgid;
-	context->fsgid = tsk->fsgid;
-	context->personality = tsk->personality;
+
 	tsk->audit_context = NULL;
 	return context;
 }
@@ -749,6 +743,17 @@ static void audit_log_exit(struct audit_
 	const char *tty;
 
 	/* tsk == current */
+	context->pid = tsk->pid;
+	context->ppid = sys_getppid();	/* sic.  tsk == current in all cases */
+	context->uid = tsk->uid;
+	context->gid = tsk->gid;
+	context->euid = tsk->euid;
+	context->suid = tsk->suid;
+	context->fsuid = tsk->fsuid;
+	context->egid = tsk->egid;
+	context->sgid = tsk->sgid;
+	context->fsgid = tsk->fsgid;
+	context->personality = tsk->personality;
 
 	ab = audit_log_start(context, GFP_KERNEL, AUDIT_SYSCALL);
 	if (!ab)
@@ -1066,7 +1071,8 @@ #endif
 	context->argv[3]    = a4;
 
 	state = context->state;
-	if (state == AUDIT_SETUP_CONTEXT || state == AUDIT_BUILD_CONTEXT)
+	context->dummy = !audit_n_rules;
+	if (!context->dummy && (state == AUDIT_SETUP_CONTEXT || state == AUDIT_BUILD_CONTEXT))
 		state = audit_filter_syscall(tsk, context, &audit_filter_list[AUDIT_FILTER_ENTRY]);
 	if (likely(state == AUDIT_DISABLED))
 		return;
@@ -1199,14 +1205,18 @@ #if AUDIT_DEBUG
 #endif
 }
 
-static void audit_inode_context(int idx, const struct inode *inode)
+/* Copy inode data into an audit_names. */
+static void audit_copy_inode(struct audit_names *name, const struct inode *inode)
 {
-	struct audit_context *context = current->audit_context;
-
-	selinux_get_inode_sid(inode, &context->names[idx].osid);
+	name->ino   = inode->i_ino;
+	name->dev   = inode->i_sb->s_dev;
+	name->mode  = inode->i_mode;
+	name->uid   = inode->i_uid;
+	name->gid   = inode->i_gid;
+	name->rdev  = inode->i_rdev;
+	selinux_get_inode_sid(inode, &name->osid);
 }
 
-
 /**
  * audit_inode - store the inode and device from a lookup
  * @name: name being audited
@@ -1240,20 +1250,14 @@ #if AUDIT_DEBUG
 		++context->ino_count;
 #endif
 	}
-	context->names[idx].ino   = inode->i_ino;
-	context->names[idx].dev	  = inode->i_sb->s_dev;
-	context->names[idx].mode  = inode->i_mode;
-	context->names[idx].uid   = inode->i_uid;
-	context->names[idx].gid   = inode->i_gid;
-	context->names[idx].rdev  = inode->i_rdev;
-	audit_inode_context(idx, inode);
+	audit_copy_inode(&context->names[idx], inode);
 }
 
 /**
  * audit_inode_child - collect inode info for created/removed objects
  * @dname: inode's dentry name
  * @inode: inode being audited
- * @pino: inode number of dentry parent
+ * @parent: inode of dentry parent
  *
  * For syscalls that create or remove filesystem objects, audit_inode
  * can only collect information for the filesystem object's parent.
@@ -1264,7 +1268,7 @@ #endif
  * unsuccessful attempts.
  */
 void __audit_inode_child(const char *dname, const struct inode *inode,
-			 unsigned long pino)
+			 const struct inode *parent)
 {
 	int idx;
 	struct audit_context *context = current->audit_context;
@@ -1278,7 +1282,7 @@ void __audit_inode_child(const char *dna
 	if (!dname)
 		goto update_context;
 	for (idx = 0; idx < context->name_count; idx++)
-		if (context->names[idx].ino == pino) {
+		if (context->names[idx].ino == parent->i_ino) {
 			const char *name = context->names[idx].name;
 
 			if (!name)
@@ -1302,16 +1306,47 @@ #endif
 	context->names[idx].name_len = AUDIT_NAME_FULL;
 	context->names[idx].name_put = 0;	/* don't call __putname() */
 
-	if (inode) {
-		context->names[idx].ino   = inode->i_ino;
-		context->names[idx].dev	  = inode->i_sb->s_dev;
-		context->names[idx].mode  = inode->i_mode;
-		context->names[idx].uid   = inode->i_uid;
-		context->names[idx].gid   = inode->i_gid;
-		context->names[idx].rdev  = inode->i_rdev;
-		audit_inode_context(idx, inode);
-	} else
-		context->names[idx].ino   = (unsigned long)-1;
+	if (!inode)
+		context->names[idx].ino = (unsigned long)-1;
+	else
+		audit_copy_inode(&context->names[idx], inode);
+
+	/* A parent was not found in audit_names, so copy the inode data for the
+	 * provided parent. */
+	if (!found_name) {
+		idx = context->name_count++;
+#if AUDIT_DEBUG
+		context->ino_count++;
+#endif
+		audit_copy_inode(&context->names[idx], parent);
+	}
+}
+
+/**
+ * audit_inode_update - update inode info for last collected name
+ * @inode: inode being audited
+ *
+ * When open() is called on an existing object with the O_CREAT flag, the inode
+ * data audit initially collects is incorrect.  This additional hook ensures
+ * audit has the inode data for the actual object to be opened.
+ */
+void __audit_inode_update(const struct inode *inode)
+{
+	struct audit_context *context = current->audit_context;
+	int idx;
+
+	if (!context->in_syscall || !inode)
+		return;
+
+	if (context->name_count == 0) {
+		context->name_count++;
+#if AUDIT_DEBUG
+		context->ino_count++;
+#endif
+	}
+	idx = context->name_count - 1;
+
+	audit_copy_inode(&context->names[idx], inode);
 }
 
 /**
@@ -1642,7 +1677,7 @@ int audit_bprm(struct linux_binprm *bprm
 	unsigned long p, next;
 	void *to;
 
-	if (likely(!audit_enabled || !context))
+	if (likely(!audit_enabled || !context || context->dummy))
 		return 0;
 
 	ax = kmalloc(sizeof(*ax) + PAGE_SIZE * MAX_ARG_PAGES - bprm->p,
@@ -1680,7 +1715,7 @@ int audit_socketcall(int nargs, unsigned
 	struct audit_aux_data_socketcall *ax;
 	struct audit_context *context = current->audit_context;
 
-	if (likely(!context))
+	if (likely(!context || context->dummy))
 		return 0;
 
 	ax = kmalloc(sizeof(*ax) + nargs * sizeof(unsigned long), GFP_KERNEL);
@@ -1708,7 +1743,7 @@ int audit_sockaddr(int len, void *a)
 	struct audit_aux_data_sockaddr *ax;
 	struct audit_context *context = current->audit_context;
 
-	if (likely(!context))
+	if (likely(!context || context->dummy))
 		return 0;
 
 	ax = kmalloc(sizeof(*ax) + len, GFP_KERNEL);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2485
retrieving revision 1.2485.2.1
diff -u -r1.2485 -r1.2485.2.1
--- kernel-2.6.spec	31 Jul 2006 22:33:49 -0000	1.2485
+++ kernel-2.6.spec	1 Aug 2006 18:39:32 -0000	1.2485.2.1
@@ -9,9 +9,9 @@
 # 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 builddoc 0
-%define buildkdump 1
+%define buildkdump 0
 %define buildheaders 0
 
 # Versions of various parts
@@ -31,7 +31,8 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+%define tag .lspp.46
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%tag
 %define signmodules 0
 %define xen_hv_cset 10730
 %define make_target bzImage
@@ -346,7 +347,6 @@
 Patch1022: linux-2.6-debug-sysfs-crash-debugging.patch
 Patch1023: linux-2.6-debug-sysfs-crash-debugging-xen.patch
 
-
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
 Patch1028: linux-2.6-debug-oops-pause.patch
 Patch1029: linux-2.6-debug-account-kmalloc.patch
@@ -460,6 +460,9 @@
 # Xen hypervisor patches
 Patch20000: xen-build-with-O2.patch
 
+# Audit & lspp patches
+Patch20100: linux-2.6-audit-git.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1018,6 +1021,9 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
+# Audit patches
+%patch20100 -p1
+
 # END OF PATCH APPLICATIONS
 
 cp %{SOURCE10} Documentation/
@@ -1026,11 +1032,11 @@
 
 cp -f %{all_arch_configs} .
 
-
 # now run oldconfig over all the config files
 for i in *.config
 do
   mv $i .config
+  echo "CONFIG_INOTIFY_USER=y" >> .config
   Arch=`head -1 .config | cut -b 3-`
   make ARCH=$Arch nonint_oldconfig > /dev/null
   echo "# $Arch" > configs/$i
@@ -1659,6 +1665,9 @@
 %endif
 
 %changelog
+* Tue Aug 1 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp 46
+
 * Tue Aug  1 2006 Juan Quintela <quintela at redhat.com>
 - disable blktap for xen-ia64 (don't compile).
 - enable ia64-xen (it compiles, but still don't boot).



From fedora-cvs-commits at redhat.com  Tue Aug  1 18:49:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 14:49:50 -0400
Subject: rpms/eclipse/devel eclipse-libswt-xpcom.patch, NONE,
	1.1 eclipse-libswt-mozilla2.patch, 1.3, 1.4 eclipse.spec,
	1.307, 1.308
Message-ID: <200608011849.k71Inoa4016670@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse-libswt-mozilla2.patch eclipse.spec 
Added Files:
	eclipse-libswt-xpcom.patch 
Log Message:
* Tue Aug 01 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_10fc
- Use firefox-devel instead of mozilla-devel.
- Add patch for rh#200929 (include embed_base in xpcom's pkgconfig -I flags).


eclipse-libswt-xpcom.patch:
 xpcom.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eclipse-libswt-xpcom.patch ---
--- xpcom.h.orig	2006-08-01 13:36:53.000000000 -0400
+++ xpcom.h	2006-08-01 13:36:59.000000000 -0400
@@ -32,7 +32,7 @@
 #define NDEBUG
 
 #include "nsXPCOM.h"
-#include "nsEmbedAPI.h"	
+#include "embed_base/nsEmbedAPI.h"	
 #include "nsEmbedString.h"
 #include "nsIInputStream.h"
 #include "nsISupportsUtils.h"

eclipse-libswt-mozilla2.patch:
 build.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Index: eclipse-libswt-mozilla2.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-libswt-mozilla2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-libswt-mozilla2.patch	2 Jun 2006 21:46:06 -0000	1.3
+++ eclipse-libswt-mozilla2.patch	1 Aug 2006 18:49:47 -0000	1.4
@@ -7,9 +7,9 @@
 -	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
 -		GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
 -		GECKO_LIBS=`pkg-config --libs mozilla-xpcom`
-+	if [ x`pkg-config --exists mozilla-xpcom mozilla-gtkmozembed && echo YES` = "xYES" ]; then
-+		GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom mozilla-gtkmozembed`
-+		GECKO_LIBS=`pkg-config --libs mozilla-xpcom mozilla-gtkmozembed`
++	if [ x`pkg-config --exists firefox-xpcom firefox-gtkmozembed && echo YES` = "xYES" ]; then
++		GECKO_INCLUDES=`pkg-config --cflags firefox-xpcom firefox-gtkmozembed`
++		GECKO_LIBS=`pkg-config --libs firefox-xpcom firefox-gtkmozembed`
  		export GECKO_INCLUDES
  		export GECKO_LIBS
  		MAKE_MOZILLA=make_mozilla


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- eclipse.spec	26 Jul 2006 04:35:40 -0000	1.307
+++ eclipse.spec	1 Aug 2006 18:49:47 -0000	1.308
@@ -41,7 +41,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_9fc
+Release:        1jpp_10fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -122,7 +122,10 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
 Patch34:	%{name}-bz162177.patch
 # Use ecj for gcj
-Patch57:	%{name}-ecj-gcj.patch
+Patch57:       %{name}-ecj-gcj.patch
+# firefox-devel's firefox-xpcom.pc needs to include -I<blah>/embed_base
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200929
+Patch58:	%{name}-libswt-xpcom.patch
 
 %if %{gcj_support}
 %else
@@ -138,8 +141,7 @@
 BuildRequires:  libgnome-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  gcc-c++
-BuildRequires:  mozilla = 37:1.7.13
-BuildRequires:  mozilla-devel = 37:1.7.13
+BuildRequires:  firefox-devel
 BuildRequires:  nspr-devel
 BuildRequires:  libXtst-devel
 BuildRequires:  mesa-libGL-devel
@@ -218,7 +220,7 @@
 Requires:       %{name}-rcp = %{epoch}:%{version}-%{release}
 Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires:       /usr/bin/perl
-Requires:       /usr/bin/mozilla
+Requires:       firefox
 
 BuildRequires:    gtk2 >= 2.6
 Requires:         gtk2 >= 2.6
@@ -386,6 +388,11 @@
 %patch0 -p0
 %patch52 -p0
 popd
+# firefox-devel's firefox-xpcom.pc needs to include -I<blah>/embed_base
+# rh#200929
+pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library
+%patch58 -p0
+popd
 %patch2 -p0
 %patch4 -p0
 %patch5 -p0
@@ -1634,6 +1641,10 @@
 %endif
 
 %changelog
+* Tue Aug 01 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_10fc
+- Use firefox-devel instead of mozilla-devel.
+- Add patch for rh#200929 (include embed_base in xpcom's pkgconfig -I flags).
+
 * Tue Jul 25 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_9fc
 - Use sed instead of patches for tomcat version numbers.
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 18:55:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 14:55:16 -0400
Subject: rpms/aqbanking/devel aqbanking.spec, 1.19,
	1.20 aqbanking-2.1.0-visibility.patch, 1.1, NONE
Message-ID: <200608011855.k71ItGAt018779@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18713

Modified Files:
	aqbanking.spec 
Removed Files:
	aqbanking-2.1.0-visibility.patch 
Log Message:
reenable hidden visibility



Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- aqbanking.spec	15 Jul 2006 03:03:12 -0000	1.19
+++ aqbanking.spec	1 Aug 2006 18:55:14 -0000	1.20
@@ -1,14 +1,13 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export.
 Version: 2.1.0
-Release: 2
+Release: 3
 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 License: GPL
 URL: http://sourceforge.net/projects/aqbanking
 Patch: aqbanking-libdir.patch
 Patch2: aqbanking-2.1.0-pkgconfig.patch
-Patch3: aqbanking-2.1.0-visibility.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gwenhywfar-devel >= 1.99.2 qt-devel
 BuildRequires: libofx-devel >= 0.7.0, gettext, autoconf, libtool
@@ -40,7 +39,6 @@
 %setup -q
 %patch -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
@@ -90,6 +88,9 @@
 
 
 %changelog
+* Tue Aug  1 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-3
+- reenable visibility
+
 * Fri Jul 14 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-2
 - port *-config to pkgconfig
 - don't use -fvisibility=hidden


--- aqbanking-2.1.0-visibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 19:02:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 15:02:37 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2494,
	1.2495 linux-2.6-x86_64-smp-on-uphw-cpucount.patch, 1.3, NONE
Message-ID: <200608011902.k71J2Zip021028@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-x86_64-smp-on-uphw-cpucount.patch 
Log Message:
shouldnt be needed


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2494
retrieving revision 1.2495
diff -u -r1.2494 -r1.2495
--- kernel-2.6.spec	1 Aug 2006 18:27:39 -0000	1.2494
+++ kernel-2.6.spec	1 Aug 2006 19:02:30 -0000	1.2495
@@ -276,7 +276,6 @@
 Patch200: linux-2.6-x86-tune-generic.patch
 Patch201: linux-2.6-x86-vga-vidfail.patch
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
-Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
 Patch209: linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch
@@ -739,8 +738,6 @@
 %patch201 -p1
 # Suppress APIC errors on UP x86-64.
 %patch203 -p1
-# Workaround BIOSes that don't list CPU0
-%patch205 -p1
 # Support TIF_RESTORE_SIGMASK on x86_64
 %patch207 -p1
 # Add ppoll and pselect syscalls


--- linux-2.6-x86_64-smp-on-uphw-cpucount.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 19:36:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 15:36:21 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2495,
	1.2496 linux-2.6-usb-unusual-devices.patch, 1.1, NONE
Message-ID: <200608011936.k71JaLNl013373@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-usb-unusual-devices.patch 
Log Message:
already upstream


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2495
retrieving revision 1.2496
diff -u -r1.2495 -r1.2496
--- kernel-2.6.spec	1 Aug 2006 19:02:30 -0000	1.2495
+++ kernel-2.6.spec	1 Aug 2006 19:36:18 -0000	1.2496
@@ -400,7 +400,6 @@
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
-Patch1680: linux-2.6-usb-unusual-devices.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
@@ -923,8 +922,6 @@
 %patch1640 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
-# Add some USB devices to the unusual quirk list.
-%patch1680 -p1
 # Only print migration info on SMP
 %patch1710 -p1
 # setuid /proc/self/maps fix.


--- linux-2.6-usb-unusual-devices.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 19:44:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 15:44:17 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2496,
	1.2497 linux-2.6-utrace.patch, 1.11, 1.12
Message-ID: <200608011944.k71JiHZO015966@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
fix bogus BUG_ON in ptrace_do_wait


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2496
retrieving revision 1.2497
diff -u -r1.2496 -r1.2497
--- kernel-2.6.spec	1 Aug 2006 19:36:18 -0000	1.2496
+++ kernel-2.6.spec	1 Aug 2006 19:44:14 -0000	1.2497
@@ -1632,6 +1632,9 @@
 %endif
 
 %changelog
+* Tue Aug  1 2006 Roland McGrath <roland at redhat.com>
+- fix bogus BUG_ON in ptrace_do_wait
+
 * Tue Aug  1 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3-git1
 

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  455 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  839 +++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  551 ++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            |  650 +++++++++++--
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  688 +++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   74 +
 include/asm-powerpc/tracehook.h         |  303 ++++++
 include/asm-s390/tracehook.h            |  105 ++
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  106 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   86 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  641 +++++++++++++
 include/linux/utrace.h                  |  471 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  259 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1562 +++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1520 +++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 89 files changed, 8167 insertions(+), 3281 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-utrace.patch	31 Jul 2006 23:30:24 -0000	1.11
+++ linux-2.6-utrace.patch	1 Aug 2006 19:44:14 -0000	1.12
@@ -6406,7 +6406,7 @@
 +found:
 +	rcu_read_unlock();
 +
-+	BUG_ON(state->parent != current);
++	BUG_ON(state->parent != tsk);
 +
 +	if (p->exit_state) {
 +		if (unlikely(p->parent == state->parent))
@@ -7072,9 +7072,9 @@
  			read_lock(&binfmt_lock);
 --- linux-2.6/drivers/connector/cn_proc.c.utrace-ptrace-compat
 +++ linux-2.6/drivers/connector/cn_proc.c
-@@ -60,8 +60,8 @@ void proc_fork_connector(struct task_str
- 	get_seq(&msg->seq, &ev->cpu);
- 	ktime_get_ts(&ev->timestamp); /* get high res monotonic timestamp */
+@@ -62,8 +62,8 @@ void proc_fork_connector(struct task_str
+ 	ktime_get_ts(&ts); /* get high res monotonic timestamp */
+ 	ev->timestamp_ns = timespec_to_ns(&ts);
  	ev->what = PROC_EVENT_FORK;
 -	ev->event_data.fork.parent_pid = task->real_parent->pid;
 -	ev->event_data.fork.parent_tgid = task->real_parent->tgid;



From fedora-cvs-commits at redhat.com  Tue Aug  1 19:51:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 15:51:14 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2497, 1.2498
	linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch,
	1.1, NONE linux-2.6-suspend-slab-warnings.patch, 1.1, NONE
Message-ID: <200608011951.k71JpE5j000896@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch 
	linux-2.6-suspend-slab-warnings.patch 
Log Message:
dead patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2497
retrieving revision 1.2498
diff -u -r1.2497 -r1.2498
--- kernel-2.6.spec	1 Aug 2006 19:44:14 -0000	1.2497
+++ kernel-2.6.spec	1 Aug 2006 19:51:11 -0000	1.2498
@@ -403,7 +403,6 @@
 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
 
 # SELinux/audit patches.
@@ -432,8 +431,8 @@
 Patch2202: linux-2.6-sata-ahci-suspend.patch
 
 # ACPI bits
-Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch
 
+# Lockdep fixes.
 Patch2400: linux-2.6-lockdep-fixes.patch
 
 
@@ -928,8 +927,6 @@
 %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.
-#%patch1760 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
 
@@ -969,9 +966,8 @@
 %patch2202 -p1
 
 # ACPI patches
-# Silence more ACPI debug spew from suspend.
-#%patch2300 -p1
 
+# Lockdep fixes
 %patch2400 -p1
 
 #


--- linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch DELETED ---


--- linux-2.6-suspend-slab-warnings.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 19:56:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 15:56:37 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2498,
	1.2499 linux-2.6-debug-account-kmalloc.patch, 1.7,
	NONE linux-2.6-debug-oops-pause.patch, 1.12,
	NONE linux-2.6-debug-periodic-slab-check.patch, 1.6,
	NONE linux-2.6-debug-slab-leak-detector.patch, 1.1, NONE
Message-ID: <200608011956.k71Jub87002954@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-debug-account-kmalloc.patch 
	linux-2.6-debug-oops-pause.patch 
	linux-2.6-debug-periodic-slab-check.patch 
	linux-2.6-debug-slab-leak-detector.patch 
Log Message:
remove dead debug patches


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2498
retrieving revision 1.2499
diff -u -r1.2498 -r1.2499
--- kernel-2.6.spec	1 Aug 2006 19:51:11 -0000	1.2498
+++ kernel-2.6.spec	1 Aug 2006 19:56:34 -0000	1.2499
@@ -343,12 +343,6 @@
 Patch1022: linux-2.6-debug-sysfs-crash-debugging.patch
 Patch1023: linux-2.6-debug-sysfs-crash-debugging-xen.patch
 
-
-Patch1027: linux-2.6-debug-slab-leak-detector.patch
-Patch1028: linux-2.6-debug-oops-pause.patch
-Patch1029: linux-2.6-debug-account-kmalloc.patch
-Patch1030: linux-2.6-debug-periodic-slab-check.patch
-
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
 Patch1051: linux-2.6-devmem-xen.patch
@@ -839,13 +833,6 @@
 %patch1023 -p1
 %endif
 
-# Slab leak detector.
-#%patch1027 -p1
-# Pause on oops.
-#%patch1028 -p1
-#%patch1029 -p1
-#%patch1030 -p1
-
 #
 # Make /dev/mem a need-to-know function
 #


--- linux-2.6-debug-account-kmalloc.patch DELETED ---


--- linux-2.6-debug-oops-pause.patch DELETED ---


--- linux-2.6-debug-periodic-slab-check.patch DELETED ---


--- linux-2.6-debug-slab-leak-detector.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  1 20:07:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 16:07:42 -0400
Subject: rpms/kernel/devel linux-2.6-random-patches.patch,1.18,1.19
Message-ID: <200608012007.k71K7gON005108@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-random-patches.patch 
Log Message:
dead bit

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

Index: linux-2.6-random-patches.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-random-patches.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-random-patches.patch	13 Jul 2006 17:16:11 -0000	1.18
+++ linux-2.6-random-patches.patch	1 Aug 2006 20:07:39 -0000	1.19
@@ -70,14 +70,3 @@
  	}
 
 
-#--- 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  Tue Aug  1 20:21:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 16:21:27 -0400
Subject: rpms/ekiga/devel ekiga.spec,1.20,1.21
Message-ID: <200608012021.k71KLR53024569@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/ekiga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24464

Modified Files:
	ekiga.spec 
Log Message:
rebuild for 200960, Daniel



Index: ekiga.spec
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ekiga.spec	12 Jul 2006 05:43:47 -0000	1.20
+++ ekiga.spec	1 Aug 2006 20:21:25 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
 Version: 2.0.2
-Release: 1.1
+Release: 3
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Tue Aug  1 2006 Daniel Veillard <veillard at redhat.com> - 2.0.2-3
+- rebuilt for #200960
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 20:28:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 16:28:00 -0400
Subject: rpms/libtiff/devel libtiff-3.8.2-ormandy.patch, NONE,
	1.1 libtiff.spec, 1.45, 1.46
Message-ID: <200608012028.k71KS0e5003592@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libtiff/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3577

Modified Files:
	libtiff.spec 
Added Files:
	libtiff-3.8.2-ormandy.patch 
Log Message:
fix several vulnerabilities


libtiff-3.8.2-ormandy.patch:
 tif_dir.c      |   25 +++++++++----
 tif_dirinfo.c  |    6 ++-
 tif_dirread.c  |  107 +++++++++++++++++++++++++++++++++++++++++++--------------
 tif_fax3.c     |    9 ++++
 tif_jpeg.c     |   64 +++++++++++++++++++++++++++++-----
 tif_next.c     |    7 +++
 tif_pixarlog.c |   14 ++++++-
 tif_read.c     |   18 ++++++++-
 8 files changed, 202 insertions(+), 48 deletions(-)

--- NEW FILE libtiff-3.8.2-ormandy.patch ---
diff -ru tiff-3.8.2/libtiff/tif_dir.c tiff-3.8.2-goo/libtiff/tif_dir.c
--- tiff-3.8.2/libtiff/tif_dir.c	2006-03-21 16:42:50.000000000 +0000
+++ tiff-3.8.2-goo/libtiff/tif_dir.c	2006-07-14 13:52:01.027562000 +0100
@@ -122,6 +122,7 @@
 {
 	static const char module[] = "_TIFFVSetField";
 	
+	const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
 	TIFFDirectory* td = &tif->tif_dir;
 	int status = 1;
 	uint32 v32, i, v;
@@ -195,10 +196,12 @@
 		break;
 	case TIFFTAG_ORIENTATION:
 		v = va_arg(ap, uint32);
+		const TIFFFieldInfo* fip;
 		if (v < ORIENTATION_TOPLEFT || ORIENTATION_LEFTBOT < v) {
+			fip = _TIFFFieldWithTag(tif, tag);
 			TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
 			    "Bad value %lu for \"%s\" tag ignored",
-			    v, _TIFFFieldWithTag(tif, tag)->field_name);
+			    v, fip ? fip->field_name : "Unknown");
 		} else
 			td->td_orientation = (uint16) v;
 		break;
@@ -387,11 +390,15 @@
 	     * happens, for example, when tiffcp is used to convert between
 	     * compression schemes and codec-specific tags are blindly copied.
              */
+	    /* 
+	     * better not dereference fip if it is NULL.
+	     * -- taviso at google.com 15 Jun 2006
+	     */
             if(fip == NULL || fip->field_bit != FIELD_CUSTOM) {
 		TIFFErrorExt(tif->tif_clientdata, module,
 		    "%s: Invalid %stag \"%s\" (not supported by codec)",
 		    tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "",
-		    _TIFFFieldWithTag(tif, tag)->field_name);
+		    fip ? fip->field_name : "Unknown");
 		status = 0;
 		break;
             }
@@ -468,7 +475,7 @@
 	    if (fip->field_type == TIFF_ASCII)
 		    _TIFFsetString((char **)&tv->value, va_arg(ap, char *));
 	    else {
-                tv->value = _TIFFmalloc(tv_size * tv->count);
+                tv->value = _TIFFCheckMalloc(tif, tv_size, tv->count, "Tag Value");
 		if (!tv->value) {
 		    status = 0;
 		    goto end;
@@ -563,7 +570,7 @@
           }
 	}
 	if (status) {
-		TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
+		TIFFSetFieldBit(tif, fip->field_bit);
 		tif->tif_flags |= TIFF_DIRTYDIRECT;
 	}
 
@@ -572,12 +579,12 @@
 	return (status);
 badvalue:
 	TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad value %d for \"%s\"",
-		  tif->tif_name, v, _TIFFFieldWithTag(tif, tag)->field_name);
+		  tif->tif_name, v, fip ? fip->field_name : "Unknown");
 	va_end(ap);
 	return (0);
 badvalue32:
 	TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad value %ld for \"%s\"",
-		   tif->tif_name, v32, _TIFFFieldWithTag(tif, tag)->field_name);
+		   tif->tif_name, v32, fip ? fip->field_name : "Unknown");
 	va_end(ap);
 	return (0);
 }
@@ -813,12 +820,16 @@
              * If the client tries to get a tag that is not valid
              * for the image's codec then we'll arrive here.
              */
+	    /*
+	     * dont dereference fip if it's NULL.
+	     * -- taviso at google.com 15 Jun 2006
+	     */
             if( fip == NULL || fip->field_bit != FIELD_CUSTOM )
             {
 				TIFFErrorExt(tif->tif_clientdata, "_TIFFVGetField",
                           "%s: Invalid %stag \"%s\" (not supported by codec)",
                           tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "",
-                          _TIFFFieldWithTag(tif, tag)->field_name);
+                          fip ? fip->field_name : "Unknown");
                 ret_val = 0;
                 break;
             }
diff -ru tiff-3.8.2/libtiff/tif_dirinfo.c tiff-3.8.2-goo/libtiff/tif_dirinfo.c
--- tiff-3.8.2/libtiff/tif_dirinfo.c	2006-02-07 13:51:03.000000000 +0000
+++ tiff-3.8.2-goo/libtiff/tif_dirinfo.c	2006-07-14 13:52:00.953558000 +0100
@@ -775,7 +775,8 @@
 		TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithTag",
 			  "Internal error, unknown tag 0x%x",
                           (unsigned int) tag);
-		assert(fip != NULL);
+		/* assert(fip != NULL); */
+
 		/*NOTREACHED*/
 	}
 	return (fip);
@@ -789,7 +790,8 @@
 	if (!fip) {
 		TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithName",
 			  "Internal error, unknown tag %s", field_name);
-		assert(fip != NULL);
+		/* assert(fip != NULL); */
+		
 		/*NOTREACHED*/
 	}
 	return (fip);
diff -ru tiff-3.8.2/libtiff/tif_dirread.c tiff-3.8.2-goo/libtiff/tif_dirread.c
--- tiff-3.8.2/libtiff/tif_dirread.c	2006-03-21 16:42:50.000000000 +0000
+++ tiff-3.8.2-goo/libtiff/tif_dirread.c	2006-07-14 13:52:00.842557000 +0100
@@ -29,6 +29,9 @@
  *
  * Directory Read Support Routines.
  */
+
+#include <limits.h>
+
 #include "tiffiop.h"
 
 #define	IGNORE	0		/* tag placeholder used below */
@@ -81,6 +84,7 @@
 	uint16 dircount;
 	toff_t nextdiroff;
 	int diroutoforderwarning = 0;
+	int compressionknown = 0;
 	toff_t* new_dirlist;
 
 	tif->tif_diroff = tif->tif_nextdiroff;
@@ -147,13 +151,20 @@
 	} else {
 		toff_t off = tif->tif_diroff;
 
-		if (off + sizeof (uint16) > tif->tif_size) {
-			TIFFErrorExt(tif->tif_clientdata, module,
-			    "%s: Can not read TIFF directory count",
-                            tif->tif_name);
-			return (0);
+		/*
+		 * Check for integer overflow when validating the dir_off, otherwise
+		 * a very high offset may cause an OOB read and crash the client.
+		 * -- taviso at google.com, 14 Jun 2006.
+		 */
+		if (off + sizeof (uint16) > tif->tif_size || 
+			off > (UINT_MAX - sizeof(uint16))) {
+				TIFFErrorExt(tif->tif_clientdata, module,
+				    "%s: Can not read TIFF directory count",
+				    tif->tif_name);
+				return (0);
 		} else
-			_TIFFmemcpy(&dircount, tif->tif_base + off, sizeof (uint16));
+			_TIFFmemcpy(&dircount, tif->tif_base + off,
+					sizeof (uint16));
 		off += sizeof (uint16);
 		if (tif->tif_flags & TIFF_SWAB)
 			TIFFSwabShort(&dircount);
@@ -254,6 +265,7 @@
 		while (fix < tif->tif_nfields &&
 		       tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
 			fix++;
+
 		if (fix >= tif->tif_nfields ||
 		    tif->tif_fieldinfo[fix]->field_tag != dp->tdir_tag) {
 
@@ -264,17 +276,23 @@
 						       dp->tdir_tag,
 						       dp->tdir_tag,
 						       dp->tdir_type);
-
-                    TIFFMergeFieldInfo(tif,
-                                       _TIFFCreateAnonFieldInfo(tif,
-						dp->tdir_tag,
-						(TIFFDataType) dp->tdir_type),
-				       1 );
+					/*
+					 * creating anonymous fields prior to knowing the compression
+					 * algorithm (ie, when the field info has been merged) could cause
+					 * crashes with pathological directories.
+					 * -- taviso at google.com 15 Jun 2006
+					 */
+					if (compressionknown)
+			                    TIFFMergeFieldInfo(tif, _TIFFCreateAnonFieldInfo(tif, dp->tdir_tag, 
+						(TIFFDataType) dp->tdir_type), 1 );
+					else goto ignore;
+		    
                     fix = 0;
                     while (fix < tif->tif_nfields &&
                            tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
 			fix++;
 		}
+		
 		/*
 		 * Null out old tags that we ignore.
 		 */
@@ -326,6 +344,7 @@
 				    dp->tdir_type, dp->tdir_offset);
 				if (!TIFFSetField(tif, dp->tdir_tag, (uint16)v))
 					goto bad;
+				else compressionknown++;
 				break;
 			/* XXX: workaround for broken TIFFs */
 			} else if (dp->tdir_type == TIFF_LONG) {
@@ -540,6 +559,7 @@
 	 * Attempt to deal with a missing StripByteCounts tag.
 	 */
 	if (!TIFFFieldSet(tif, FIELD_STRIPBYTECOUNTS)) {
+		const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
 		/*
 		 * Some manufacturers violate the spec by not giving
 		 * the size of the strips.  In this case, assume there
@@ -556,7 +576,7 @@
 			"%s: TIFF directory is missing required "
 			"\"%s\" field, calculating from imagelength",
 			tif->tif_name,
-		        _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+		        fip ? fip->field_name : "Unknown");
 		if (EstimateStripByteCounts(tif, dir, dircount) < 0)
 		    goto bad;
 /* 
@@ -580,6 +600,7 @@
 	} else if (td->td_nstrips == 1 
                    && td->td_stripoffset[0] != 0 
                    && BYTECOUNTLOOKSBAD) {
+		const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
 		/*
 		 * XXX: Plexus (and others) sometimes give a value of zero for
 		 * a tag when they don't know what the correct value is!  Try
@@ -589,13 +610,14 @@
 		TIFFWarningExt(tif->tif_clientdata, module,
 	"%s: Bogus \"%s\" field, ignoring and calculating from imagelength",
                             tif->tif_name,
-		            _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+		            fip ? fip->field_name : "Unknown");
 		if(EstimateStripByteCounts(tif, dir, dircount) < 0)
 		    goto bad;
 	} else if (td->td_planarconfig == PLANARCONFIG_CONTIG
 		   && td->td_nstrips > 2
 		   && td->td_compression == COMPRESSION_NONE
 		   && td->td_stripbytecount[0] != td->td_stripbytecount[1]) {
+		const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
 		/*
 		 * XXX: Some vendors fill StripByteCount array with absolutely
 		 * wrong values (it can be equal to StripOffset array, for
@@ -604,7 +626,7 @@
 		TIFFWarningExt(tif->tif_clientdata, module,
 	"%s: Wrong \"%s\" field, ignoring and calculating from imagelength",
                             tif->tif_name,
-		            _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+		            fip ? fip->field_name : "Unknown");
 		if (EstimateStripByteCounts(tif, dir, dircount) < 0)
 		    goto bad;
 	}
@@ -870,7 +892,13 @@
 
 	register TIFFDirEntry *dp;
 	register TIFFDirectory *td = &tif->tif_dir;
-	uint16 i;
+	
+	/* i is used to iterate over td->td_nstrips, so must be
+	 * at least the same width.
+	 * -- taviso at google.com 15 Jun 2006
+	 */
+
+	uint32 i;
 
 	if (td->td_stripbytecount)
 		_TIFFfree(td->td_stripbytecount);
@@ -947,16 +975,18 @@
 static int
 CheckDirCount(TIFF* tif, TIFFDirEntry* dir, uint32 count)
 {
+	const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
+
 	if (count > dir->tdir_count) {
 		TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
 	"incorrect count for field \"%s\" (%lu, expecting %lu); tag ignored",
-		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
+		    fip ? fip->field_name : "Unknown",
 		    dir->tdir_count, count);
 		return (0);
 	} else if (count < dir->tdir_count) {
 		TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
 	"incorrect count for field \"%s\" (%lu, expecting %lu); tag trimmed",
-		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
+		    fip ? fip->field_name : "Unknown",
 		    dir->tdir_count, count);
 		return (1);
 	}
@@ -970,6 +1000,7 @@
 TIFFFetchData(TIFF* tif, TIFFDirEntry* dir, char* cp)
 {
 	int w = TIFFDataWidth((TIFFDataType) dir->tdir_type);
+	const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
 	tsize_t cc = dir->tdir_count * w;
 
 	/* Check for overflow. */
@@ -1013,7 +1044,7 @@
 bad:
 	TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
 		     "Error fetching data for field \"%s\"",
-		     _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+		     fip ? fip->field_name : "Unknown");
 	return (tsize_t) 0;
 }
 
@@ -1039,10 +1070,12 @@
 static int
 cvtRational(TIFF* tif, TIFFDirEntry* dir, uint32 num, uint32 denom, float* rv)
 {
+	const TIFFFieldInfo* fip;
 	if (denom == 0) {
+		fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
 		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
 		    "%s: Rational with zero denominator (num = %lu)",
-		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, num);
+		    fip ? fip->field_name : "Unknown", num);
 		return (0);
 	} else {
 		if (dir->tdir_type == TIFF_RATIONAL)
@@ -1159,6 +1192,20 @@
 static int
 TIFFFetchShortPair(TIFF* tif, TIFFDirEntry* dir)
 {
+	/*
+	 * Prevent overflowing the v stack arrays below by performing a sanity
+	 * check on tdir_count, this should never be greater than two.
+	 * -- taviso at google.com 14 Jun 2006.
+	 */
+	if (dir->tdir_count > 2) {
+		const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
+		TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
+				"unexpected count for field \"%s\", %lu, expected 2; ignored.",
+				fip ? fip->field_name : "Unknown",
+				dir->tdir_count);
+		return 0;
+	}
+
 	switch (dir->tdir_type) {
 		case TIFF_BYTE:
 		case TIFF_SBYTE:
@@ -1329,14 +1376,15 @@
 	case TIFF_DOUBLE:
 		return (TIFFFetchDoubleArray(tif, dir, (double*) v));
 	default:
+		{ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
 		/* TIFF_NOTYPE */
 		/* TIFF_ASCII */
 		/* TIFF_UNDEFINED */
 		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
 			     "cannot read TIFF_ANY type %d for field \"%s\"",
 			     dir->tdir_type,
-			     _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
-		return (0);
+			     fip ? fip->field_name : "Unknown");
+		return (0); }
 	}
 	return (1);
 }
@@ -1351,6 +1399,9 @@
 	int ok = 0;
 	const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dp->tdir_tag);
 
+	if (fip == NULL) {
+		return (0);
+	}
 	if (dp->tdir_count > 1) {		/* array of values */
 		char* cp = NULL;
 
@@ -1493,6 +1544,7 @@
 TIFFFetchPerSampleShorts(TIFF* tif, TIFFDirEntry* dir, uint16* pl)
 {
     uint16 samples = tif->tif_dir.td_samplesperpixel;
+    const TIFFFieldInfo* fip;
     int status = 0;
 
     if (CheckDirCount(tif, dir, (uint32) samples)) {
@@ -1510,9 +1562,10 @@
 
             for (i = 1; i < check_count; i++)
                 if (v[i] != v[0]) {
+				fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
 					TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
                               "Cannot handle different per-sample values for field \"%s\"",
-                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                              fip ? fip->field_name : "Unknown");
                     goto bad;
                 }
             *pl = v[0];
@@ -1534,6 +1587,7 @@
 TIFFFetchPerSampleLongs(TIFF* tif, TIFFDirEntry* dir, uint32* pl)
 {
     uint16 samples = tif->tif_dir.td_samplesperpixel;
+    const TIFFFieldInfo* fip;
     int status = 0;
 
     if (CheckDirCount(tif, dir, (uint32) samples)) {
@@ -1551,9 +1605,10 @@
                 check_count = samples;
             for (i = 1; i < check_count; i++)
                 if (v[i] != v[0]) {
+				fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
 					TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
                               "Cannot handle different per-sample values for field \"%s\"",
-                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                              fip ? fip->field_name : "Unknown");
                     goto bad;
                 }
             *pl = v[0];
@@ -1574,6 +1629,7 @@
 TIFFFetchPerSampleAnys(TIFF* tif, TIFFDirEntry* dir, double* pl)
 {
     uint16 samples = tif->tif_dir.td_samplesperpixel;
+    const TIFFFieldInfo* fip;
     int status = 0;
 
     if (CheckDirCount(tif, dir, (uint32) samples)) {
@@ -1591,9 +1647,10 @@
 
             for (i = 1; i < check_count; i++)
                 if (v[i] != v[0]) {
+		    fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
                     TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
                               "Cannot handle different per-sample values for field \"%s\"",
-                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                              fip ? fip->field_name : "Unknown");
                     goto bad;
                 }
             *pl = v[0];
diff -ru tiff-3.8.2/libtiff/tif_fax3.c tiff-3.8.2-goo/libtiff/tif_fax3.c
--- tiff-3.8.2/libtiff/tif_fax3.c	2006-03-21 16:42:50.000000000 +0000
+++ tiff-3.8.2-goo/libtiff/tif_fax3.c	2006-07-14 13:52:00.669557000 +0100
@@ -1136,6 +1136,7 @@
 Fax3VSetField(TIFF* tif, ttag_t tag, va_list ap)
 {
 	Fax3BaseState* sp = Fax3State(tif);
+	const TIFFFieldInfo* fip;
 
 	assert(sp != 0);
 	assert(sp->vsetparent != 0);
@@ -1181,7 +1182,13 @@
 	default:
 		return (*sp->vsetparent)(tif, tag, ap);
 	}
-	TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
+	
+	if ((fip = _TIFFFieldWithTag(tif, tag))) {
+		TIFFSetFieldBit(tif, fip->field_bit);
+	} else {
+		return (0);
+	}
+
 	tif->tif_flags |= TIFF_DIRTYDIRECT;
 	return (1);
 }
diff -ru tiff-3.8.2/libtiff/tif_jpeg.c tiff-3.8.2-goo/libtiff/tif_jpeg.c
--- tiff-3.8.2/libtiff/tif_jpeg.c	2006-03-21 16:42:50.000000000 +0000
+++ tiff-3.8.2-goo/libtiff/tif_jpeg.c	2006-07-14 13:52:00.655560000 +0100
@@ -722,15 +722,31 @@
 		segment_width = TIFFhowmany(segment_width, sp->h_sampling);
 		segment_height = TIFFhowmany(segment_height, sp->v_sampling);
 	}
-	if (sp->cinfo.d.image_width != segment_width ||
-	    sp->cinfo.d.image_height != segment_height) {
+	if (sp->cinfo.d.image_width < segment_width ||
+	    sp->cinfo.d.image_height < segment_height) {
 		TIFFWarningExt(tif->tif_clientdata, module,
                  "Improper JPEG strip/tile size, expected %dx%d, got %dx%d",
                           segment_width, 
                           segment_height,
                           sp->cinfo.d.image_width, 
                           sp->cinfo.d.image_height);
+	} 
+	
+	if (sp->cinfo.d.image_width > segment_width ||
+			sp->cinfo.d.image_height > segment_height) {
+		/*
+		 * This case could be dangerous, if the strip or tile size has been
+		 * reported as less than the amount of data jpeg will return, some
+		 * potential security issues arise. Catch this case and error out.
+		 * -- taviso at google.com 14 Jun 2006
+		 */
+		TIFFErrorExt(tif->tif_clientdata, module, 
+			"JPEG strip/tile size exceeds expected dimensions,"
+			"expected %dx%d, got %dx%d", segment_width, segment_height,
+			sp->cinfo.d.image_width, sp->cinfo.d.image_height);
+		return (0);
 	}
+
 	if (sp->cinfo.d.num_components !=
 	    (td->td_planarconfig == PLANARCONFIG_CONTIG ?
 	     td->td_samplesperpixel : 1)) {
@@ -761,6 +777,22 @@
                                     sp->cinfo.d.comp_info[0].v_samp_factor,
                                     sp->h_sampling, sp->v_sampling);
 
+				/*
+				 * There are potential security issues here for decoders that
+				 * have already allocated buffers based on the expected sampling
+				 * factors. Lets check the sampling factors dont exceed what
+				 * we were expecting.
+				 * -- taviso at google.com 14 June 2006
+				 */
+				if (sp->cinfo.d.comp_info[0].h_samp_factor > sp->h_sampling ||
+					sp->cinfo.d.comp_info[0].v_samp_factor > sp->v_sampling) {
+						TIFFErrorExt(tif->tif_clientdata, module,
+							"Cannot honour JPEG sampling factors that"
+							" exceed those specified.");
+						return (0);
+				}
+
+
 			    /*
 			     * XXX: Files written by the Intergraph software
 			     * has different sampling factors stored in the
@@ -1521,15 +1553,18 @@
 {
 	JPEGState *sp = JState(tif);
 	
-	assert(sp != 0);
+	/* 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);
+	if (sp != NULL) {
+		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;
 
@@ -1541,6 +1576,7 @@
 {
 	JPEGState* sp = JState(tif);
 	TIFFDirectory* td = &tif->tif_dir;
+	const TIFFFieldInfo* fip;
 	uint32 v32;
 
 	assert(sp != NULL);
@@ -1606,7 +1642,13 @@
 	default:
 		return (*sp->vsetparent)(tif, tag, ap);
 	}
-	TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
+
+	if ((fip = _TIFFFieldWithTag(tif, tag))) {
+		TIFFSetFieldBit(tif, fip->field_bit);
+	} else {
+		return (0);
+	}
+
 	tif->tif_flags |= TIFF_DIRTYDIRECT;
 	return (1);
 }
@@ -1726,7 +1768,11 @@
 {
 	JPEGState* sp = JState(tif);
 
-	assert(sp != NULL);
+	/* assert(sp != NULL); */
+	if (sp == NULL) {
+		TIFFWarningExt(tif->tif_clientdata, "JPEGPrintDir", "Unknown JPEGState");
+		return;
+	}
 
 	(void) flags;
 	if (TIFFFieldSet(tif,FIELD_JPEGTABLES))
diff -ru tiff-3.8.2/libtiff/tif_next.c tiff-3.8.2-goo/libtiff/tif_next.c
--- tiff-3.8.2/libtiff/tif_next.c	2005-12-21 12:33:56.000000000 +0000
+++ tiff-3.8.2-goo/libtiff/tif_next.c	2006-07-14 13:52:00.556567000 +0100
@@ -105,11 +105,16 @@
 			 * as codes of the form <color><npixels>
 			 * until we've filled the scanline.
 			 */
+			/*
+			 * Ensure the run does not exceed the scanline
+			 * bounds, potentially resulting in a security issue.
+			 * -- taviso at google.com 14 Jun 2006.
+			 */
 			op = row;
 			for (;;) {
 				grey = (n>>6) & 0x3;
 				n &= 0x3f;
-				while (n-- > 0)
+				while (n-- > 0 && npixels < imagewidth)
 					SETPIXEL(op, grey);
 				if (npixels >= (int) imagewidth)
 					break;
diff -ru tiff-3.8.2/libtiff/tif_pixarlog.c tiff-3.8.2-goo/libtiff/tif_pixarlog.c
--- tiff-3.8.2/libtiff/tif_pixarlog.c	2006-03-21 16:42:50.000000000 +0000
+++ tiff-3.8.2-goo/libtiff/tif_pixarlog.c	2006-07-14 13:52:00.483557000 +0100
@@ -768,7 +768,19 @@
 	if (tif->tif_flags & TIFF_SWAB)
 		TIFFSwabArrayOfShort(up, nsamples);
 
-	for (i = 0; i < nsamples; i += llen, up += llen) {
+	/* 
+	 * if llen is not an exact multiple of nsamples, the decode operation
+	 * may overflow the output buffer, so truncate it enough to prevent that
+	 * but still salvage as much data as possible.
+	 * -- taviso at google.com 14th June 2006
+	 */
+	if (nsamples % llen) 
+		TIFFWarningExt(tif->tif_clientdata, module,
+				"%s: stride %lu is not a multiple of sample count, "
+				"%lu, data truncated.", tif->tif_name, llen, nsamples);
+				
+	
+	for (i = 0; i < nsamples - (nsamples % llen); i += llen, up += llen) {
 		switch (sp->user_datafmt)  {
 		case PIXARLOGDATAFMT_FLOAT:
 			horizontalAccumulateF(up, llen, sp->stride,
diff -ru tiff-3.8.2/libtiff/tif_read.c tiff-3.8.2-goo/libtiff/tif_read.c
--- tiff-3.8.2/libtiff/tif_read.c	2005-12-21 12:33:56.000000000 +0000
+++ tiff-3.8.2-goo/libtiff/tif_read.c	2006-07-14 13:52:00.467568000 +0100
@@ -31,6 +31,8 @@
 #include "tiffiop.h"
 #include <stdio.h>
 
+#include <limits.h>
+
 	int TIFFFillStrip(TIFF*, tstrip_t);
 	int TIFFFillTile(TIFF*, ttile_t);
 static	int TIFFStartStrip(TIFF*, tstrip_t);
@@ -272,7 +274,13 @@
 		if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
 			_TIFFfree(tif->tif_rawdata);
 		tif->tif_flags &= ~TIFF_MYBUFFER;
-		if ( td->td_stripoffset[strip] + bytecount > tif->tif_size) {
+		/*
+		 * This sanity check could potentially overflow, causing an OOB read.
+		 * verify that offset + bytecount is > offset.
+		 * -- taviso at google.com 14 Jun 2006
+		 */
+		if ( td->td_stripoffset[strip] + bytecount > tif->tif_size ||
+			bytecount > (UINT_MAX - td->td_stripoffset[strip])) {
 			/*
 			 * This error message might seem strange, but it's
 			 * what would happen if a read were done instead.
@@ -470,7 +478,13 @@
 		if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
 			_TIFFfree(tif->tif_rawdata);
 		tif->tif_flags &= ~TIFF_MYBUFFER;
-		if ( td->td_stripoffset[tile] + bytecount > tif->tif_size) {
+		/*
+		 * We must check this calculation doesnt overflow, potentially
+		 * causing an OOB read.
+		 * -- taviso at google.com 15 Jun 2006
+		 */
+		if (td->td_stripoffset[tile] + bytecount > tif->tif_size ||
+			bytecount > (UINT_MAX - td->td_stripoffset[tile])) {
 			tif->tif_curtile = NOTILE;
 			return (0);
 		}


Index: libtiff.spec
===================================================================
RCS file: /cvs/dist/rpms/libtiff/devel/libtiff.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- libtiff.spec	12 Jul 2006 06:57:53 -0000	1.45
+++ libtiff.spec	1 Aug 2006 20:27:58 -0000	1.46
@@ -1,11 +1,12 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
 Version: 3.8.2
-Release: 4.1
+Release: 5
 License: distributable
 Group: System Environment/Libraries
 Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
 Patch0: tiffsplit-overflow.patch
+Patch1: libtiff-3.8.2-ormandy.patch
 URL: http://www.libtiff.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel libjpeg-devel
@@ -37,6 +38,7 @@
 %prep
 %setup -q -n tiff-%{version}
 %patch0 -p1 -b .overflow
+%patch1 -p1 -b .ormandy
 
 %build
 %configure
@@ -109,6 +111,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jul 24 2006 Matthias Clasen <mclasen at redhat.com>
+- Fix several vulnerabilities (CVE-2006-3460 CVE-2006-3461
+  CVE-2006-3462 CVE-2006-3463 CVE-2006-3464 CVE-2006-3465)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.8.2-4.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 20:38:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 16:38:50 -0400
Subject: rpms/initscripts/devel .cvsignore, 1.104, 1.105 initscripts.spec,
	1.120, 1.121 sources, 1.115, 1.116
Message-ID: <200608012038.k71Kcohu003815@cvs.devel.redhat.com>

Author: notting

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- .cvsignore	21 Jul 2006 20:29:42 -0000	1.104
+++ .cvsignore	1 Aug 2006 20:38:43 -0000	1.105
@@ -1 +1 @@
-initscripts-8.37.tar.bz2
+initscripts-8.38.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- initscripts.spec	21 Jul 2006 20:29:42 -0000	1.120
+++ initscripts.spec	1 Aug 2006 20:38:46 -0000	1.121
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.37
+Version: 8.38
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -22,10 +22,9 @@
 Conflicts: dhclient < 3.0.3-7
 Conflicts: tcsh < 6.13-5
 Conflicts: xorg-x11, glib2 < 2.11.1-2
-#Conflicts: diskdumputils < 1.1.0
 Obsoletes: rhsound sapinit
 Obsoletes: hotplug
-Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, mktemp, fileutils, sh-utils
+Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, coreutils
 BuildRequires: glib2-devel popt gettext pkgconfig
 
 %description
@@ -42,15 +41,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install 
+make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install
 
-# build file list of locale stuff in with lang tags
-pushd %{buildroot}/%{_datadir}/locale
-for foo in * ; do
-	echo  "%lang($foo) %{_datadir}/locale/$foo/*/*" >> \
-	$RPM_BUILD_DIR/%{name}-%{version}/trans.list
-done
-popd
+%find_lang %{name}
 
 %ifnarch s390 s390x
 rm -f \
@@ -66,9 +59,7 @@
 /usr/sbin/groupadd -g 22 -r -f utmp
 
 %post
-touch /var/log/wtmp
-touch /var/run/utmp
-touch /var/log/btmp
+touch /var/log/wtmp /var/run/utmp /var/log/btmp
 chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp
 chmod 664 /var/log/wtmp /var/run/utmp
 chmod 600 /var/log/btmp
@@ -77,12 +68,8 @@
 /sbin/chkconfig --add network 
 
 # handle serial installs semi gracefully
-if [ $1 = 0 ]; then
-  if [ "$TERM" = "vt100" ]; then
-      tmpfile=`mktemp /etc/sysconfig/tmp.XXXXXX`
-      sed -e '/BOOTUP=color/BOOTUP=serial/' /etc/sysconfig/init > $tmpfile
-      mv -f $tmpfile /etc/sysconfig/init
-  fi
+if [ $1 = 0 -a "$TERM" = "vt100" ]; then
+    sed -i 's/BOOTUP=color/BOOTUP=serial/' /etc/sysconfig/init
 fi
 
 # Handle converting prefdm to run-once
@@ -105,7 +92,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f trans.list
+%files -f %{name}.lang
 %defattr(-,root,root)
 %dir /etc/sysconfig/network-scripts
 %config(noreplace) %verify(not md5 mtime size) /etc/adjtime
@@ -146,6 +133,8 @@
 %config /etc/sysconfig/network-scripts/ifdown-ipsec
 %config /etc/sysconfig/network-scripts/ifup-sit
 %config /etc/sysconfig/network-scripts/ifdown-sit
+%config /etc/sysconfig/network-scripts/ifup-tunnel
+%config /etc/sysconfig/network-scripts/ifdown-tunnel
 %config /etc/sysconfig/network-scripts/ifup-aliases
 %config /etc/sysconfig/network-scripts/ifup-ippp
 %config /etc/sysconfig/network-scripts/ifdown-ippp
@@ -210,6 +199,21 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Tue Aug  1 2006 Bill Nottingham <notting at redhat.com> 8.38-1
+- translation updates
+- bring down bonding slaves on ifdown (#199706)
+- support LINKDELAY for dhcp (#191137)
+- netfs: run multipath on netdev devices (#180977)
+- halt: use /proc/mounts instead of /etc/mtab (#198426, <mitr at redhat.com>)
+- rc.sysinit: fix getkey race (#191453, <mitr at redhat.com>)
+- spec cleanups (#188614, <kloczek at rudy.mif.pg.gda.pl>)
+- support aliases on vlan (#193133, <mitr at redhat.com>)
+- clean up ifcfg file handling (<mitr at redhat.com>, <michal at harddata.com>)
+- GRE and IPIP tunnel support (#168990, <mitr at redhat.com>,
+  <razvan.vilt at linux360.ro>, <aaron.hope at unh.edu>, <sean at enertronllc.com>)
+- rc.sysinit: don't format encrypted swap always (#127378)
+- don't try to add routes to alias devices (#199825, #195656)
+
 * Fri Jul 21 2006 Bill Nottingham <notting at redhat.com> 8.37-1
 - update translations
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- sources	21 Jul 2006 20:29:42 -0000	1.115
+++ sources	1 Aug 2006 20:38:46 -0000	1.116
@@ -1 +1 @@
-1146a7833cfc5cff00cddf815f29b666  initscripts-8.37.tar.bz2
+3ad4f775c87893da52c8d225421aaf83  initscripts-8.38.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug  1 21:09:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 17:09:03 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.29, 1.30 rhpxl.spec, 1.34,
	1.35 sources, 1.32, 1.33
Message-ID: <200608012109.k71L93jd005605@cvs.devel.redhat.com>

Author: clumens

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	1 Aug 2006 15:03:13 -0000	1.29
+++ .cvsignore	1 Aug 2006 21:09:01 -0000	1.30
@@ -7,3 +7,4 @@
 rhpxl-0.24.tar.gz
 rhpxl-0.25.tar.gz
 rhpxl-0.26.tar.gz
+rhpxl-0.27.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rhpxl.spec	1 Aug 2006 15:03:13 -0000	1.34
+++ rhpxl.spec	1 Aug 2006 21:09:01 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.26
+Version: 0.27
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,11 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Tue Aug 01 2006 Chris Lumens <clumens at redhat.com> 0.27-1
+- Don't traceback if there's no module list.
+- Return default strings if monitor or video card names are None.
+- Handle starting up an XServer object with an existing conf file.
+
 * Tue Aug 01 2006 Chris Lumens <clumens at redhat.com> 0.26-1
 - Remove video card ddc probing (notting).
 - Remove monitor ddc probing.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	1 Aug 2006 15:03:13 -0000	1.32
+++ sources	1 Aug 2006 21:09:01 -0000	1.33
@@ -1 +1 @@
-88b8f0f2eabdface67895ff1af04ee75  rhpxl-0.26.tar.gz
+cf9df50b1d024f087cb9bae9a6722cc9  rhpxl-0.27.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  1 21:19:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 17:19:15 -0400
Subject: rpms/libtiff/FC-5 libtiff-3.7.4-ormandy.patch, NONE,
	1.1 libtiff.spec, 1.40, 1.41
Message-ID: <200608012119.k71LJFG0023538@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	libtiff.spec 
Added Files:
	libtiff-3.7.4-ormandy.patch 
Log Message:
Fix several vulnerabilities


libtiff-3.7.4-ormandy.patch:
 tif_dir.c      |   19 +++++-----
 tif_dirinfo.c  |    6 ++-
 tif_dirread.c  |  108 ++++++++++++++++++++++++++++++++++++++++++++-------------
 tif_fax3.c     |    9 ++++
 tif_jpeg.c     |   64 +++++++++++++++++++++++++++++----
 tif_next.c     |    7 +++
 tif_pixarlog.c |   14 ++++++-
 tif_read.c     |   18 ++++++++-
 8 files changed, 197 insertions(+), 48 deletions(-)

--- NEW FILE libtiff-3.7.4-ormandy.patch ---
--- tiff-3.7.4/libtiff/tif_dir.c.ormandy	2005-09-08 04:18:41.000000000 -0400
+++ tiff-3.7.4/libtiff/tif_dir.c	2006-08-01 17:11:49.000000000 -0400
@@ -122,6 +122,7 @@
 {
 	static const char module[] = "_TIFFVSetField";
 	
+	const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
 	TIFFDirectory* td = &tif->tif_dir;
 	int status = 1;
 	uint32 v32, i, v;
@@ -196,10 +197,12 @@
 		break;
 	case TIFFTAG_ORIENTATION:
 		v = va_arg(ap, uint32);
+		const TIFFFieldInfo* fip;
 		if (v < ORIENTATION_TOPLEFT || ORIENTATION_LEFTBOT < v) {
+		        fip = _TIFFFieldWithTag(tif, tag);
 			TIFFWarning(tif->tif_name,
 			    "Bad value %lu for \"%s\" tag ignored",
-			    v, _TIFFFieldWithTag(tif, tag)->field_name);
+				    v, fip ? fip->field_name : "Unknown");
 		} else
 			td->td_orientation = (uint16) v;
 		break;
@@ -440,7 +443,7 @@
 		TIFFError(module,
 		    "%s: Invalid %stag \"%s\" (not supported by codec)",
 		    tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "",
-		    _TIFFFieldWithTag(tif, tag)->field_name);
+			  fip ? fip->field_name : "Unknown");
 		status = 0;
 		break;
             }
@@ -515,7 +518,7 @@
 	    if (fip->field_type == TIFF_ASCII)
 		    _TIFFsetString((char **)&tv->value, va_arg(ap, char *));
 	    else {
-                tv->value = _TIFFmalloc(tv_size * tv->count);
+	      tv->value = _TIFFCheckMalloc(tif, tv_size, tv->count, "Tag Value");
 	        if (!tv->value) {
 		    status = 0;
 		    goto end;
@@ -592,7 +595,7 @@
           }
 	}
 	if (status) {
-		TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
+		TIFFSetFieldBit(tif, fip->field_bit);
 		tif->tif_flags |= TIFF_DIRTYDIRECT;
 	}
 
@@ -601,17 +604,17 @@
 	return (status);
 badvalue:
 	TIFFError(module, "%s: Bad value %d for \"%s\"",
-		  tif->tif_name, v, _TIFFFieldWithTag(tif, tag)->field_name);
+		  tif->tif_name, v, fip ? fip->field_name : "Unknown");
 	va_end(ap);
 	return (0);
 badvalue32:
 	TIFFError(module, "%s: Bad value %ld for \"%s\"",
-		   tif->tif_name, v32, _TIFFFieldWithTag(tif, tag)->field_name);
+		  tif->tif_name, v32, fip ? fip->field_name : "Unknown");
 	va_end(ap);
 	return (0);
 badvaluedbl:
 	TIFFError(module, "%s: Bad value %f for \"%s\"",
-		  tif->tif_name, d, _TIFFFieldWithTag(tif, tag)->field_name);
+		  tif->tif_name, d, fip ? fip->field_name : "Unknown");
 	va_end(ap);
 	return (0);
 }
@@ -891,7 +894,7 @@
                 TIFFError("_TIFFVGetField",
                           "%s: Invalid %stag \"%s\" (not supported by codec)",
                           tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "",
-                          _TIFFFieldWithTag(tif, tag)->field_name);
+                          fip ? fip->field_name : "Unknown");
                 ret_val = 0;
                 break;
             }
--- tiff-3.7.4/libtiff/tif_pixarlog.c.ormandy	2006-08-01 17:11:49.000000000 -0400
+++ tiff-3.7.4/libtiff/tif_pixarlog.c	2006-08-01 17:15:24.000000000 -0400
@@ -768,7 +768,19 @@
 	if (tif->tif_flags & TIFF_SWAB)
 		TIFFSwabArrayOfShort(up, nsamples);
 
-	for (i = 0; i < nsamples; i += llen, up += llen) {
+	/* 
+	 * if llen is not an exact multiple of nsamples, the decode operation
+	 * may overflow the output buffer, so truncate it enough to prevent that
+	 * but still salvage as much data as possible.
+	 * -- taviso at google.com 14th June 2006
+	 */
+	if (nsamples % llen) 
+		TIFFWarning(module,
+				"%s: stride %lu is not a multiple of sample count, "
+				"%lu, data truncated.", tif->tif_name, llen, nsamples);
+				
+	
+	for (i = 0; i < nsamples - (nsamples % llen); i += llen, up += llen) {
 		switch (sp->user_datafmt)  {
 		case PIXARLOGDATAFMT_FLOAT:
 			horizontalAccumulateF(up, llen, sp->stride,
--- tiff-3.7.4/libtiff/tif_next.c.ormandy	2004-11-07 06:08:36.000000000 -0500
+++ tiff-3.7.4/libtiff/tif_next.c	2006-08-01 17:11:49.000000000 -0400
@@ -105,11 +105,16 @@
 			 * as codes of the form <color><npixels>
 			 * until we've filled the scanline.
 			 */
+			/*
+			 * Ensure the run does not exceed the scanline
+			 * bounds, potentially resulting in a security issue.
+			 * -- taviso at google.com 14 Jun 2006.
+			 */
 			op = row;
 			for (;;) {
 				grey = (n>>6) & 0x3;
 				n &= 0x3f;
-				while (n-- > 0)
+				while (n-- > 0 && npixels < imagewidth)
 					SETPIXEL(op, grey);
 				if (npixels >= (int) imagewidth)
 					break;
--- tiff-3.7.4/libtiff/tif_read.c.ormandy	2005-04-15 13:13:34.000000000 -0400
+++ tiff-3.7.4/libtiff/tif_read.c	2006-08-01 17:11:49.000000000 -0400
@@ -31,6 +31,8 @@
 #include "tiffiop.h"
 #include <stdio.h>
 
+#include <limits.h>
+
 	int TIFFFillStrip(TIFF*, tstrip_t);
 	int TIFFFillTile(TIFF*, ttile_t);
 static	int TIFFStartStrip(TIFF*, tstrip_t);
@@ -272,7 +274,13 @@
 		if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
 			_TIFFfree(tif->tif_rawdata);
 		tif->tif_flags &= ~TIFF_MYBUFFER;
-		if ( td->td_stripoffset[strip] + bytecount > tif->tif_size) {
+		/*
+		 * This sanity check could potentially overflow, causing an OOB read.
+		 * verify that offset + bytecount is > offset.
+		 * -- taviso at google.com 14 Jun 2006
+		 */
+		if ( td->td_stripoffset[strip] + bytecount > tif->tif_size ||
+			bytecount > (UINT_MAX - td->td_stripoffset[strip])) {
 			/*
 			 * This error message might seem strange, but it's
 			 * what would happen if a read were done instead.
@@ -470,7 +478,13 @@
 		if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
 			_TIFFfree(tif->tif_rawdata);
 		tif->tif_flags &= ~TIFF_MYBUFFER;
-		if ( td->td_stripoffset[tile] + bytecount > tif->tif_size) {
+		/*
+		 * We must check this calculation doesnt overflow, potentially
+		 * causing an OOB read.
+		 * -- taviso at google.com 15 Jun 2006
+		 */
+		if (td->td_stripoffset[tile] + bytecount > tif->tif_size ||
+			bytecount > (UINT_MAX - td->td_stripoffset[tile])) {
 			tif->tif_curtile = NOTILE;
 			return (0);
 		}
--- tiff-3.7.4/libtiff/tif_dirread.c.ormandy	2006-08-01 17:11:49.000000000 -0400
+++ tiff-3.7.4/libtiff/tif_dirread.c	2006-08-01 17:11:49.000000000 -0400
@@ -29,6 +29,9 @@
  *
  * Directory Read Support Routines.
  */
+
+#include <limits.h>
+
 #include "tiffiop.h"
 
 #define	IGNORE	0		/* tag placeholder used below */
@@ -84,6 +87,7 @@
 	toff_t nextdiroff;
 	char* cp;
 	int diroutoforderwarning = 0;
+	int compressionknown = 0;
 	toff_t* new_dirlist;
 
 	tif->tif_diroff = tif->tif_nextdiroff;
@@ -151,13 +155,21 @@
 	} else {
 		toff_t off = tif->tif_diroff;
 
-		if (off + sizeof (uint16) > tif->tif_size) {
-			TIFFError(module,
-			    "%s: Can not read TIFF directory count",
-                            tif->tif_name);
-			return (0);
-		} else
-			_TIFFmemcpy(&dircount, tif->tif_base + off, sizeof (uint16));
+ 		/*
+ 		 * Check for integer overflow when validating the dir_off, otherwise
+ 		 * a very high offset may cause an OOB read and crash the client.
+ 		 * -- taviso at google.com, 14 Jun 2006.
+ 		 */
+ 		if (off + sizeof (uint16) > tif->tif_size || 
+ 			off > (UINT_MAX - sizeof(uint16))) {
+ 				TIFFError(module,
+					  "%s: Can not read TIFF directory count",
+					  tif->tif_name);
+ 				return (0);
+  		} else
+ 			_TIFFmemcpy(&dircount, tif->tif_base + off,
+ 					sizeof (uint16));
+
 		off += sizeof (uint16);
 		if (tif->tif_flags & TIFF_SWAB)
 			TIFFSwabShort(&dircount);
@@ -257,6 +269,7 @@
 		while (fix < tif->tif_nfields &&
 		       tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
 			fix++;
+
 		if (fix >= tif->tif_nfields ||
 		    tif->tif_fieldinfo[fix]->field_tag != dp->tdir_tag) {
 
@@ -265,11 +278,17 @@
                                 tif->tif_name, dp->tdir_tag, dp->tdir_tag,
                                 dp->tdir_type);
 
-                    TIFFMergeFieldInfo( tif,
-                                        _TIFFCreateAnonFieldInfo( tif,
-                                              dp->tdir_tag,
-					      (TIFFDataType) dp->tdir_type ),
-                                        1 );
+ 					/*
+ 					 * Creating anonymous fields prior to knowing the compression
+ 					 * algorithm (ie, when the field info has been merged) could cause
+ 					 * crashes with pathological directories.
+ 					 * -- taviso at google.com 15 Jun 2006
+ 					 */
+ 					if (compressionknown)
+ 			                    TIFFMergeFieldInfo(tif, _TIFFCreateAnonFieldInfo(tif, dp->tdir_tag, 
+ 						(TIFFDataType) dp->tdir_type), 1 );
+ 					else goto ignore;
+ 		    
                     fix = 0;
                     while (fix < tif->tif_nfields &&
                            tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
@@ -326,6 +345,7 @@
 				    dp->tdir_type, dp->tdir_offset);
 				if (!TIFFSetField(tif, dp->tdir_tag, (uint16)v))
 					goto bad;
+				else compressionknown++;
 				break;
 			/* XXX: workaround for broken TIFFs */
 			} else if (dp->tdir_type == TIFF_LONG) {
@@ -533,6 +553,7 @@
 	 * Attempt to deal with a missing StripByteCounts tag.
 	 */
 	if (!TIFFFieldSet(tif, FIELD_STRIPBYTECOUNTS)) {
+		const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
 		/*
 		 * Some manufacturers violate the spec by not giving
 		 * the size of the strips.  In this case, assume there
@@ -549,7 +570,7 @@
 			"%s: TIFF directory is missing required "
 			"\"%s\" field, calculating from imagelength",
 			tif->tif_name,
-		        _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+		        fip ? fip->field_name : "Unknown");
 		if (EstimateStripByteCounts(tif, dir, dircount) < 0)
 		    goto bad;
 /* 
@@ -573,6 +594,7 @@
 	} else if (td->td_nstrips == 1 
                    && td->td_stripoffset[0] != 0 
                    && BYTECOUNTLOOKSBAD) {
+		const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
 		/*
 		 * Plexus (and others) sometimes give a value
 		 * of zero for a tag when they don't know what
@@ -583,7 +605,7 @@
 		TIFFWarning(module,
 	"%s: Bogus \"%s\" field, ignoring and calculating from imagelength",
                             tif->tif_name,
-		            _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+		            fip ? fip->field_name : "Unknown");
 		if(EstimateStripByteCounts(tif, dir, dircount) < 0)
 		    goto bad;
 	}
@@ -682,7 +704,13 @@
 
 	register TIFFDirEntry *dp;
 	register TIFFDirectory *td = &tif->tif_dir;
-	uint16 i;
+	
+	/* i is used to iterate over td->td_nstrips, so must be
+	 * at least the same width.
+	 * -- taviso at google.com 15 Jun 2006
+	 */
+
+	uint32 i;
 
 	if (td->td_stripbytecount)
 		_TIFFfree(td->td_stripbytecount);
@@ -759,16 +787,18 @@
 static int
 CheckDirCount(TIFF* tif, TIFFDirEntry* dir, uint32 count)
 {
+ 	const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
+ 
 	if (count > dir->tdir_count) {
 		TIFFWarning(tif->tif_name,
 	"incorrect count for field \"%s\" (%lu, expecting %lu); tag ignored",
-		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
+			    fip ? fip->field_name : "Unknown",
 		    dir->tdir_count, count);
 		return (0);
 	} else if (count < dir->tdir_count) {
 		TIFFWarning(tif->tif_name,
 	"incorrect count for field \"%s\" (%lu, expecting %lu); tag trimmed",
-		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
+			    fip ? fip->field_name : "Unknown",
 		    dir->tdir_count, count);
 		return (1);
 	}
@@ -782,6 +812,7 @@
 TIFFFetchData(TIFF* tif, TIFFDirEntry* dir, char* cp)
 {
 	int w = TIFFDataWidth((TIFFDataType) dir->tdir_type);
+	const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
 	tsize_t cc = dir->tdir_count * w;
 
 	/* Check for overflow. */
@@ -824,7 +855,7 @@
 	return (cc);
 bad:
 	TIFFError(tif->tif_name, "Error fetching data for field \"%s\"",
-	    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+		  fip ? fip->field_name : "Unknown");
 	return ((tsize_t) 0);
 }
 
@@ -850,10 +881,13 @@
 static int
 cvtRational(TIFF* tif, TIFFDirEntry* dir, uint32 num, uint32 denom, float* rv)
 {
+	const TIFFFieldInfo* fip;
+
 	if (denom == 0) {
+	        fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
 		TIFFError(tif->tif_name,
 		    "%s: Rational with zero denominator (num = %lu)",
-		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, num);
+			  fip ? fip->field_name : "Unknown", num);
 		return (0);
 	} else {
 		if (dir->tdir_type == TIFF_RATIONAL)
@@ -970,6 +1004,20 @@
 static int
 TIFFFetchShortPair(TIFF* tif, TIFFDirEntry* dir)
 {
+	/*
+	 * Prevent overflowing the v stack arrays below by performing a sanity
+	 * check on tdir_count, this should never be greater than two.
+	 * -- taviso at google.com 14 Jun 2006.
+	 */
+	if (dir->tdir_count > 2) {
+		const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
+		TIFFWarning(tif->tif_name,
+				"unexpected count for field \"%s\", %lu, expected 2; ignored.",
+				fip ? fip->field_name : "Unknown",
+				dir->tdir_count);
+		return 0;
+	}
+
 	switch (dir->tdir_type) {
 		case TIFF_BYTE:
 		case TIFF_SBYTE:
@@ -1140,13 +1188,16 @@
 	case TIFF_DOUBLE:
 		return (TIFFFetchDoubleArray(tif, dir, (double*) v));
 	default:
+	        { 
+                const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
 		/* TIFF_NOTYPE */
 		/* TIFF_ASCII */
 		/* TIFF_UNDEFINED */
 		TIFFError(tif->tif_name,
 		    "cannot read TIFF_ANY type %d for field \"%s\"",
-		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+			  fip ? fip->field_name : "Unknown");
 		return (0);
+                }
 	}
 	return (1);
 }
@@ -1161,6 +1212,9 @@
 	int ok = 0;
 	const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dp->tdir_tag);
 
+	if (fip == NULL) {
+		return (0);
+	}
 	if (dp->tdir_count > 1) {		/* array of values */
 		char* cp = NULL;
 
@@ -1302,6 +1356,7 @@
 TIFFFetchPerSampleShorts(TIFF* tif, TIFFDirEntry* dir, uint16* pl)
 {
     uint16 samples = tif->tif_dir.td_samplesperpixel;
+    const TIFFFieldInfo* fip;
     int status = 0;
 
     if (CheckDirCount(tif, dir, (uint32) samples)) {
@@ -1318,10 +1373,11 @@
                 check_count = samples;
 
             for (i = 1; i < check_count; i++)
-                if (v[i] != v[0]) {
+                if (v[i] != v[0]) {	
+		    fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
                     TIFFError(tif->tif_name,
                               "Cannot handle different per-sample values for field \"%s\"",
-                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                              fip ? fip->field_name : "Unknown");
                     goto bad;
                 }
             *pl = v[0];
@@ -1343,6 +1399,7 @@
 TIFFFetchPerSampleLongs(TIFF* tif, TIFFDirEntry* dir, uint32* pl)
 {
     uint16 samples = tif->tif_dir.td_samplesperpixel;
+    const TIFFFieldInfo* fip;
     int status = 0;
 
     if (CheckDirCount(tif, dir, (uint32) samples)) {
@@ -1360,9 +1417,10 @@
                 check_count = samples;
             for (i = 1; i < check_count; i++)
                 if (v[i] != v[0]) {
+		    fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
                     TIFFError(tif->tif_name,
                               "Cannot handle different per-sample values for field \"%s\"",
-                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                              fip ? fip->field_name : "Unknown");
                     goto bad;
                 }
             *pl = v[0];
@@ -1384,6 +1442,7 @@
 TIFFFetchPerSampleAnys(TIFF* tif, TIFFDirEntry* dir, double* pl)
 {
     uint16 samples = tif->tif_dir.td_samplesperpixel;
+    const TIFFFieldInfo* fip;
     int status = 0;
 
     if (CheckDirCount(tif, dir, (uint32) samples)) {
@@ -1401,9 +1460,10 @@
 
             for (i = 1; i < check_count; i++)
                 if (v[i] != v[0]) {
+		    fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
                     TIFFError(tif->tif_name,
                               "Cannot handle different per-sample values for field \"%s\"",
-                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                              fip ? fip->field_name : "Unknown");
                     goto bad;
                 }
             *pl = v[0];
--- tiff-3.7.4/libtiff/tif_jpeg.c.ormandy	2006-08-01 17:11:49.000000000 -0400
+++ tiff-3.7.4/libtiff/tif_jpeg.c	2006-08-01 17:11:49.000000000 -0400
@@ -710,8 +710,8 @@
 		segment_width = TIFFhowmany(segment_width, sp->h_sampling);
 		segment_height = TIFFhowmany(segment_height, sp->v_sampling);
 	}
-	if (sp->cinfo.d.image_width != segment_width ||
-	    sp->cinfo.d.image_height != segment_height) {
+	if (sp->cinfo.d.image_width < segment_width ||
+	    sp->cinfo.d.image_height < segment_height) {
 		TIFFWarning(module, 
                  "Improper JPEG strip/tile size, expected %dx%d, got %dx%d",
                           segment_width, 
@@ -719,6 +719,22 @@
                           sp->cinfo.d.image_width, 
                           sp->cinfo.d.image_height);
 	}
+ 	if (sp->cinfo.d.image_width > segment_width ||
+	    sp->cinfo.d.image_height > segment_height) {
+ 		/*
+ 		 * This case could be dangerous, if the strip or tile size has been
+ 		 * reported as less than the amount of data jpeg will return, some
+ 		 * potential security issues arise. Catch this case and error out.
+ 		 * -- taviso at google.com 14 Jun 2006
+ 		 */
+ 		TIFFError(module, 
+			  "JPEG strip/tile size exceeds expected dimensions,"
+			  "expected %dx%d, got %dx%d", segment_width, segment_height,
+			  sp->cinfo.d.image_width, sp->cinfo.d.image_height);
+ 		return (0);
+  	}
+
+
 	if (sp->cinfo.d.num_components !=
 	    (td->td_planarconfig == PLANARCONFIG_CONTIG ?
 	     td->td_samplesperpixel : 1)) {
@@ -749,6 +765,22 @@
                                     sp->cinfo.d.comp_info[0].v_samp_factor,
                                     sp->h_sampling, sp->v_sampling);
 
+				/*
+				 * There are potential security issues here for decoders that
+				 * have already allocated buffers based on the expected sampling
+				 * factors. Lets check the sampling factors dont exceed what
+				 * we were expecting.
+				 * -- taviso at google.com 14 June 2006
+				 */
+				if (sp->cinfo.d.comp_info[0].h_samp_factor > sp->h_sampling ||
+					sp->cinfo.d.comp_info[0].v_samp_factor > sp->v_sampling) {
+						TIFFError(module,
+							"Cannot honour JPEG sampling factors that"
+							" exceed those specified.");
+						return (0);
+				}
+
+
 			    /*
 			     * XXX: Files written by the Intergraph software
 			     * has different sampling factors stored in the
@@ -1502,15 +1534,18 @@
 {
 	JPEGState *sp = JState(tif);
 	
-	assert(sp != 0);
+	/* 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);
+	if (sp != NULL) {
+		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;
 }
@@ -1520,6 +1555,7 @@
 {
 	JPEGState* sp = JState(tif);
 	TIFFDirectory* td = &tif->tif_dir;
+	const TIFFFieldInfo* fip;
 	uint32 v32;
 
 	assert(sp != NULL);
@@ -1585,7 +1621,13 @@
 	default:
 		return (*sp->vsetparent)(tif, tag, ap);
 	}
-	TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
+
+	if ((fip = _TIFFFieldWithTag(tif, tag))) {
+		TIFFSetFieldBit(tif, fip->field_bit);
+	} else {
+		return (0);
+	}
+
 	tif->tif_flags |= TIFF_DIRTYDIRECT;
 	return (1);
 }
@@ -1705,7 +1747,11 @@
 {
 	JPEGState* sp = JState(tif);
 
-	assert(sp != NULL);
+	/* assert(sp != NULL); */
+	if (sp == NULL) {
+		TIFFWarning("JPEGPrintDir", "Unknown JPEGState");
+		return;
+	}
 
 	(void) flags;
 	if (TIFFFieldSet(tif,FIELD_JPEGTABLES))
--- tiff-3.7.4/libtiff/tif_fax3.c.ormandy	2006-08-01 17:11:49.000000000 -0400
+++ tiff-3.7.4/libtiff/tif_fax3.c	2006-08-01 17:11:49.000000000 -0400
@@ -1122,6 +1122,7 @@
 Fax3VSetField(TIFF* tif, ttag_t tag, va_list ap)
 {
 	Fax3BaseState* sp = Fax3State(tif);
+	const TIFFFieldInfo* fip;
 
 	assert(sp != 0);
 	assert(sp->vsetparent != 0);
@@ -1167,7 +1168,13 @@
 	default:
 		return (*sp->vsetparent)(tif, tag, ap);
 	}
-	TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
+	
+	if ((fip = _TIFFFieldWithTag(tif, tag))) {
+		TIFFSetFieldBit(tif, fip->field_bit);
+	} else {
+		return (0);
+	}
+
 	tif->tif_flags |= TIFF_DIRTYDIRECT;
 	return (1);
 }
--- tiff-3.7.4/libtiff/tif_dirinfo.c.ormandy	2005-07-28 04:49:23.000000000 -0400
+++ tiff-3.7.4/libtiff/tif_dirinfo.c	2006-08-01 17:11:49.000000000 -0400
@@ -636,7 +636,8 @@
 		TIFFError("TIFFFieldWithTag",
 			  "Internal error, unknown tag 0x%x",
                           (unsigned int) tag);
-		assert(fip != NULL);
+		/* assert(fip != NULL); */
+
 		/*NOTREACHED*/
 	}
 	return (fip);
@@ -650,7 +651,8 @@
 	if (!fip) {
 		TIFFError("TIFFFieldWithName",
 			  "Internal error, unknown tag %s", field_name);
-		assert(fip != NULL);
+		/* assert(fip != NULL); */
+		
 		/*NOTREACHED*/
 	}
 	return (fip);


Index: libtiff.spec
===================================================================
RCS file: /cvs/dist/rpms/libtiff/FC-5/libtiff.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libtiff.spec	28 May 2006 04:09:12 -0000	1.40
+++ libtiff.spec	1 Aug 2006 21:19:12 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
 Version: 3.7.4
-Release: 7
+Release: 8
 License: distributable
 Group: System Environment/Libraries
 Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
@@ -13,6 +13,7 @@
 Patch0: tiff-3.7.1-multiple.patch
 Patch1: tiff-3.6.1-color.patch
 Patch2: tiffsplit-overflow.patch
+Patch3: libtiff-3.7.4-ormandy.patch
 
 %description
 The libtiff package contains a library of functions for manipulating
@@ -42,6 +43,7 @@
 %patch0 -p1 -b .multiple
 %patch1 -p0 -b .color
 %patch2 -p1 -b .overflow
+%patch3 -p1 -b .ormandy
 
 %build
 %configure
@@ -81,6 +83,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jul 24 2006 Matthias Clasen <mclasen at redhat.com>
+- Fix several vulnerabilities (CVE-2006-3460 CVE-2006-3461
+  CVE-2006-3462 CVE-2006-3463 CVE-2006-3464 CVE-2006-3465)
+
 * Sun May 28 2006 Matthias Clasen <mclasen at redhat.com>
 - actually apply the patch
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 21:30:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 17:30:13 -0400
Subject: rpms/kernel/devel linux-2.6-s390-kprobes.patch, NONE,
	1.1 kernel-2.6.spec, 1.2500, 1.2501
Message-ID: <200608012130.k71LUDSN027466@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-s390-kprobes.patch 
Log Message:
s390 kprobes


linux-2.6-s390-kprobes.patch:
 arch/s390/Kconfig              |   14 
 arch/s390/kernel/Makefile      |    1 
 arch/s390/kernel/entry.S       |   12 
 arch/s390/kernel/entry64.S     |   12 
 arch/s390/kernel/kprobes.c     |  683 +++++++++++++++++++++++++++++++++++++++++
 arch/s390/kernel/traps.c       |   41 ++
 arch/s390/kernel/vmlinux.lds.S |    1 
 arch/s390/mm/fault.c           |   40 ++
 include/asm-s390/kdebug.h      |   59 +++
 include/asm-s390/kprobes.h     |  111 ++++++
 10 files changed, 968 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-s390-kprobes.patch ---
Signed-off-by: Michael Grundy <grundym at us.ibm.com>
Signed-off-by: David Wilder <dwilder at us.ibm.com>

diff -Naur linux-2.6.18-rc1/arch/s390/Kconfig linux-2.6.18-rc1.s390-kprob/arch/s390/Kconfig
--- linux-2.6.18-rc1/arch/s390/Kconfig	2006-07-06 11:05:42.000000000 -0700
+++ linux-2.6.18-rc1.s390-kprob/arch/s390/Kconfig	2006-07-11 15:16:24.000000000 -0700
@@ -490,8 +490,22 @@
 
 source "fs/Kconfig"
 
+menu "Instrumentation Support"
+	depends on EXPERIMENTAL
+
 source "arch/s390/oprofile/Kconfig"
 
+config KPROBES
+	bool "Kprobes (EXPERIMENTAL)"
+	depends on EXPERIMENTAL && MODULES
+	help
+	  Kprobes allows you to trap at almost any kernel address and
+	  execute a callback function.  register_kprobe() establishes
+	  a probepoint and specifies the callback.  Kprobes is useful
+	  for kernel debugging, non-intrusive instrumentation and testing.
+	  If in doubt, say "N".
+endmenu
+
 source "arch/s390/Kconfig.debug"
 
 source "security/Kconfig"
diff -Naur linux-2.6.18-rc1/arch/s390/kernel/entry64.S linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/entry64.S
--- linux-2.6.18-rc1/arch/s390/kernel/entry64.S	2006-07-06 11:05:42.000000000 -0700
+++ linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/entry64.S	2006-07-11 15:16:24.000000000 -0700
@@ -518,6 +518,8 @@
 #endif
 	lg	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct
 	lg	%r1,__TI_task(%r9)
+	tm	__LC_PGM_OLD_PSW+1(%r15),0x01	# kernel per event ?
+	jz	kernel_per
 	mvc	__THREAD_per+__PER_atmid(2,%r1),__LC_PER_ATMID
 	mvc	__THREAD_per+__PER_address(8,%r1),__LC_PER_ADDRESS
 	mvc	__THREAD_per+__PER_access_id(1,%r1),__LC_PER_ACCESS_ID
@@ -553,6 +555,16 @@
 	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts
 	j	sysc_do_svc
 
+#
+# per was called from kernel, must be kprobes
+#
+kernel_per:
+	lhi	%r0,__LC_PGM_OLD_PSW
+	sth	%r0,SP_TRAP(%r15)	# set trap indication to pgm check
+	la	%r2,SP_PTREGS(%r15)	# address of register-save area
+	larl	%r14,sysc_leave		# load adr. of system ret, no work
+	jg	do_single_step		# branch to do_single_step
+
 /*
  * IO interrupt handler routine
  */
diff -Naur linux-2.6.18-rc1/arch/s390/kernel/entry.S linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/entry.S
--- linux-2.6.18-rc1/arch/s390/kernel/entry.S	2006-07-06 11:05:42.000000000 -0700
+++ linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/entry.S	2006-07-11 15:16:24.000000000 -0700
@@ -505,6 +505,8 @@
 	mvc	__THREAD_per+__PER_address(4,%r1),__LC_PER_ADDRESS
 	mvc	__THREAD_per+__PER_access_id(1,%r1),__LC_PER_ACCESS_ID
 	oi	__TI_flags+3(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP
+	tm	__LC_PGM_OLD_PSW+1(%r15),0x01	# kernel per event ?
+	bz	BASED(kernel_per)
 	l	%r3,__LC_PGM_ILC	 # load program interruption code
 	la	%r8,0x7f
 	nr	%r8,%r3                  # clear per-event-bit and ilc
@@ -536,6 +538,16 @@
 	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts
 	b	BASED(sysc_do_svc)
 
+#
+# per was called from kernel, must be kprobes
+#
+kernel_per:
+	mvi	SP_TRAP+1(%r15),0x28	# set trap indication to pgm check
+	la	%r2,SP_PTREGS(%r15)	# address of register-save area
+	l	%r1,BASED(.Lhandle_per)	# load adr. of per handler
+	la	%r14,BASED(sysc_leave)	# load adr. of system return
+	br	%r1			# branch to do_single_step
+
 /*
  * IO interrupt handler routine
  */
diff -Naur linux-2.6.18-rc1/arch/s390/kernel/kprobes.c linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/kprobes.c
--- linux-2.6.18-rc1/arch/s390/kernel/kprobes.c	1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/kprobes.c	2006-07-11 15:16:24.000000000 -0700
@@ -0,0 +1,683 @@
+/*
+ *  Kernel Probes (KProbes)
+ *
+ * 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.
+ *
+ * Copyright (C) IBM Corporation, 2002, 2006
+ *
+ * s390 port, used ppc64 as template. Mike Grundy <grundym at us.ibm.com>
+ */
+
+#include <linux/config.h>
+#include <linux/kprobes.h>
+#include <linux/ptrace.h>
+#include <linux/preempt.h>
+#include <linux/stop_machine.h>
+#include <asm/cacheflush.h>
+#include <asm/kdebug.h>
+#include <asm/sections.h>
+#include <asm/uaccess.h>
+#include <linux/module.h>
+
+DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
+DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
+
+int __kprobes arch_prepare_kprobe(struct kprobe *p)
+{
+	/* Make sure the probe isn't going on a difficult instruction */
+	if (is_prohibited_opcode((kprobe_opcode_t *) p->addr))
+		return -EINVAL;
+
+	if ((unsigned long)p->addr & 0x01) {
+		printk("Attempt to register kprobe at an unaligned address\n");
+		return -EINVAL;
+		}
+
+	/* Use the get_insn_slot() facility for correctness */
+	if (!(p->ainsn.insn = get_insn_slot()))
+		return -ENOMEM;
+
+	memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
+
+	get_instruction_type(&p->ainsn);
+	p->opcode = *p->addr;
+	return 0;
+}
+
+int __kprobes is_prohibited_opcode(kprobe_opcode_t *instruction)
+{
+	switch (*(__u8 *) instruction) {
+	case 0x0c:      /* bassm */
+	case 0x0b:      /* bsm   */
+	case 0x83:      /* diag  */
+	case 0x44:      /* ex    */
+		return -EINVAL;
+	}
+	switch (*(__u16 *) instruction) {
+	case 0x0101:    /* pr    */
+	case 0xb25a:    /* bsa   */
+	case 0xb240:    /* bakr  */
+	case 0xb258:    /* bsg   */
+	case 0xb218:    /* pc    */
+	case 0xb228:    /* pt    */
+		return -EINVAL;
+	}
+	return 0;
+}
+
+void __kprobes get_instruction_type(struct arch_specific_insn *ainsn)
+{
+	/* default fixup method */
+	ainsn->fixup = FIXUP_PSW_NORMAL;
+
+	/* save r1 operand */
+	ainsn->reg = (*ainsn->insn & 0xf0) >> 4;
+
+	/* save the instruction length (pop 5-5) in bytes */
+	switch (*(__u8 *) (ainsn->insn) >> 4) {
+	case 0:
+		ainsn->ilen = 2;
+		break;
+	case 1:
+	case 2:
+		ainsn->ilen = 4;
+		break;
+	case 3:
+		ainsn->ilen = 6;
+		break;
+	}
+
+	switch (*(__u8 *) ainsn->insn) {
+	case 0x05:	/* balr	*/
+	case 0x0d:	/* basr */
+		ainsn->fixup = FIXUP_RETURN_REGISTER;
+		/* if r2 = 0, no branch will be taken */
+		if ((*ainsn->insn & 0x0f) == 0)
+			ainsn->fixup |= FIXUP_BRANCH_NOT_TAKEN;
+		break;
+	case 0x06:	/* bctr	*/
+	case 0x07:	/* bcr	*/
+		ainsn->fixup = FIXUP_BRANCH_NOT_TAKEN;
+		break;
+	case 0x45:	/* bal	*/
+	case 0x4d:	/* bas	*/
+		ainsn->fixup = FIXUP_RETURN_REGISTER;
+		break;
+	case 0x47:	/* bc	*/
+	case 0x46:	/* bct	*/
+	case 0x86:	/* bxh	*/
+	case 0x87:	/* bxle	*/
+		ainsn->fixup = FIXUP_BRANCH_NOT_TAKEN;
+		break;
+	case 0x82:	/* lpsw	*/
+		ainsn->fixup = FIXUP_NOT_REQUIRED;
+		break;
+	case 0xb2:	/* lpswe */
+		if (*(((__u8 *) ainsn->insn) + 1) == 0xb2) {
+			ainsn->fixup = FIXUP_NOT_REQUIRED;
+		}
+		break;
+	case 0xa7:	/* bras	*/
+		if ((*ainsn->insn & 0x0f) == 0x05) {
+			ainsn->fixup |= FIXUP_RETURN_REGISTER;
+		}
+		break;
+	case 0xc0:
+		if ((*ainsn->insn & 0x0f) == 0x00) /* larl */
+			ainsn->fixup = FIXUP_RETURN_REGISTER;
+		if ((*ainsn->insn & 0x0f) == 0x05) /* brasl*/
+			ainsn->fixup |= FIXUP_RETURN_REGISTER;
+		break;
+	case 0xeb:
+		if (*(((__u8 *) ainsn->insn) + 5 ) == 0x44 ||	/* bxhg  */
+			*(((__u8 *) ainsn->insn) + 5) == 0x45) {/* bxleg */
+			ainsn->fixup = FIXUP_BRANCH_NOT_TAKEN;
+		}
+		break;
+	case 0xe3:	/* bctg	*/
+		if (*(((__u8 *) ainsn->insn) + 5) == 0x46) {
+			ainsn->fixup = FIXUP_BRANCH_NOT_TAKEN;
+		}
+		break;
+	}
+}
+
+static int __kprobes swap_instruction(void *aref)
+{
+        struct ins_replace_args *args = aref;
+	int err = 0;
+	asm volatile(
+		"0: mvc  0(2,%1),0(%2)\n"
+		"1:\n"
+#ifndef __s390x__
+		".section .fixup,\"ax\"\n"
+		"2: lhi    %0,%3\n"
+		"   bras   1,3f\n"
+		"   .long  1b\n"
+		"3: l      1,0(1)\n"
+		"   br     1\n"	
+		".previous\n"
+		".section __ex_table,\"a\"\n"
+		"   .align 4\n"	
+		"   .long  0b,2b\n"
+		".previous"
+#else /* __s390x__ */
+		".section .fixup,\"ax\"\n"
+		"2: lghi   %0,%3\n"
+		"   jg     1b\n"
+		".previous\n"
+		".section __ex_table,\"a\"\n"
+		"   .align 8\n"	
+		"   .quad  0b,2b\n"
+		".previous"
+#endif /* __s390x__ */
+		: "+&d" (err)
+		: "a" (args->ptr), "a" (&(args->new)),
+		  "K" (-EFAULT), "m" (args->new)
+		: "cc"
+#ifndef __s390x__
+		,"1"
+#endif
+		);
+
+	return err;
+}
+void __kprobes arch_arm_kprobe(struct kprobe *p)
+{
+	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+	unsigned long status = kcb->kprobe_status;
+	struct ins_replace_args args;
+
+	args.ptr = p->addr;
+	args.old = p->opcode;
+	args.new = BREAKPOINT_INSTRUCTION;
+
+	kcb->kprobe_status = KPROBE_SWAP_INST;
+	stop_machine_run(swap_instruction, &args, NR_CPUS);
+	kcb->kprobe_status = status;
+}
+
+void __kprobes arch_disarm_kprobe(struct kprobe *p)
+{
+	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+	unsigned long status = kcb->kprobe_status;
+	struct ins_replace_args args;
+
+	args.ptr = p->addr;
+	args.old = BREAKPOINT_INSTRUCTION;
+	args.new = p->opcode;
+
+	kcb->kprobe_status = KPROBE_SWAP_INST;
+	stop_machine_run(swap_instruction, &args, NR_CPUS);
+	kcb->kprobe_status = status;
+}
+
+void __kprobes arch_remove_kprobe(struct kprobe *p)
+{
+	mutex_lock(&kprobe_mutex);
+	free_insn_slot(p->ainsn.insn);
+	mutex_unlock(&kprobe_mutex);
+}
+
+static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
+{
+	per_cr_bits kprobe_per_regs[1];
+
+	memset(kprobe_per_regs, 0, sizeof(per_cr_bits));
+	regs->psw.addr = (unsigned long)p->ainsn.insn | PSW_ADDR_AMODE;
+
+	/* Set up the per control reg info, will pass to lctl */
+	kprobe_per_regs[0].em_instruction_fetch = 1;
+	kprobe_per_regs[0].starting_addr = (unsigned long)p->ainsn.insn;
+	kprobe_per_regs[0].ending_addr = (unsigned long)p->ainsn.insn + 1;
+
+	/* Set the PER control regs, turns on single step for this address */
+	__ctl_load(kprobe_per_regs, 9, 11);
+	regs->psw.mask |= PSW_MASK_PER;
+	regs->psw.mask &= ~(PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK);
+}
+
+static void __kprobes save_previous_kprobe(struct kprobe_ctlblk *kcb)
+{
+	kcb->prev_kprobe.kp = kprobe_running();
+	kcb->prev_kprobe.status = kcb->kprobe_status;
+	kcb->prev_kprobe.kprobe_saved_imask = kcb->kprobe_saved_imask;
+	memcpy(kcb->prev_kprobe.kprobe_saved_ctl, kcb->kprobe_saved_ctl,
+					sizeof(kcb->kprobe_saved_ctl));
+}
+
+static void __kprobes restore_previous_kprobe(struct kprobe_ctlblk *kcb)
+{
+	__get_cpu_var(current_kprobe) = kcb->prev_kprobe.kp;
+	kcb->kprobe_status = kcb->prev_kprobe.status;
+	kcb->kprobe_saved_imask = kcb->prev_kprobe.kprobe_saved_imask;
+	memcpy(kcb->kprobe_saved_ctl, kcb->prev_kprobe.kprobe_saved_ctl,
+					sizeof(kcb->kprobe_saved_ctl));
+}
+
+static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
+						struct kprobe_ctlblk *kcb)
+{
+	__get_cpu_var(current_kprobe) = p;
+	/* Save the interrupt and per flags */
+	kcb->kprobe_saved_imask = regs->psw.mask &
+	    (PSW_MASK_PER | PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK);
+	/* Save the control regs that govern PER */
+	__ctl_store(kcb->kprobe_saved_ctl, 9, 11);
+}
+
+/* Called with kretprobe_lock held */
+void __kprobes arch_prepare_kretprobe(struct kretprobe *rp,
+					struct pt_regs *regs)
+{
+	struct kretprobe_instance *ri;
+
+	if ((ri = get_free_rp_inst(rp)) != NULL) {
+		ri->rp = rp;
+		ri->task = current;
+		ri->ret_addr = (kprobe_opcode_t *) regs->gprs[14];
+
+		/* Replace the return addr with trampoline addr */
+		regs->gprs[14] = (unsigned long)&kretprobe_trampoline;
+
+		add_rp_inst(ri);
+	} else {
+		rp->nmissed++;
+	}
+}
+
+static int __kprobes kprobe_handler(struct pt_regs *regs)
+{
+	struct kprobe *p;
+	int ret = 0;
+	unsigned long *addr = (unsigned long *)
+		((regs->psw.addr & PSW_ADDR_INSN) - 2);
+	struct kprobe_ctlblk *kcb;
+
+	/*
+	 * We don't want to be preempted for the entire
+	 * duration of kprobe processing
+	 */
+	preempt_disable();
+	kcb = get_kprobe_ctlblk();
+
+	/* Check we're not actually recursing */
+	if (kprobe_running()) {
+		p = get_kprobe(addr);
+		if (p) {
+			if (kcb->kprobe_status == KPROBE_HIT_SS &&
+			    *p->ainsn.insn == BREAKPOINT_INSTRUCTION) {
+				regs->psw.mask &= ~PSW_MASK_PER;
+				regs->psw.mask |= kcb->kprobe_saved_imask;
+				goto no_kprobe;
+			}
+			/* We have reentered the kprobe_handler(), since
+			 * another probe was hit while within the handler.
+			 * We here save the original kprobes variables and
+			 * just single step on the instruction of the new probe
+			 * without calling any user handlers.
+			 */
+			save_previous_kprobe(kcb);
+			set_current_kprobe(p, regs, kcb);
+			kprobes_inc_nmissed_count(p);
+			prepare_singlestep(p, regs);
+			kcb->kprobe_status = KPROBE_REENTER;
+			return 1;
+		} else {
+			p = __get_cpu_var(current_kprobe);
+			if (p->break_handler && p->break_handler(p, regs)) {
+				goto ss_probe;
+			}
+		}
+		goto no_kprobe;
+	}
+
+	p = get_kprobe(addr);
+	if (!p) {
+		if (*addr != BREAKPOINT_INSTRUCTION) {
+			/*
+			 * The breakpoint instruction was removed right
+			 * after we hit it.  Another cpu has removed
+			 * either a probepoint or a debugger breakpoint
+			 * at this address.  In either case, no further
+			 * handling of this interrupt is appropriate.
+			 *
+			 */
+			ret = 1;
+		}
+		/* Not one of ours: let kernel handle it */
+		goto no_kprobe;
+	}
+
+	kcb->kprobe_status = KPROBE_HIT_ACTIVE;
+	set_current_kprobe(p, regs, kcb);
+	if (p->pre_handler && p->pre_handler(p, regs))
+		/* handler has already set things up, so skip ss setup */
+		return 1;
+
+ss_probe:
+	prepare_singlestep(p, regs);
+	kcb->kprobe_status = KPROBE_HIT_SS;
+	return 1;
+
+no_kprobe:
+	preempt_enable_no_resched();
+	return ret;
+}
+
+/*
+ * Function return probe trampoline:
+ * 	- init_kprobes() establishes a probepoint here
+ * 	- When the probed function returns, this probe
+ * 		causes the handlers to fire
+ */
+void kretprobe_trampoline_holder(void)
+{
+	asm volatile (".global kretprobe_trampoline\n"
+		      "kretprobe_trampoline:\n" "bcr 0,0\n");
+}
+
+/*
+ * Called when the probe at kretprobe trampoline is hit
+ */
+int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
+{
+	struct kretprobe_instance *ri = NULL;
+	struct hlist_head *head;
+	struct hlist_node *node, *tmp;
+	unsigned long flags, orig_ret_address = 0;
+	unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline;
+
+	spin_lock_irqsave(&kretprobe_lock, flags);
+	head = kretprobe_inst_table_head(current);
+
+	/*
+	 * It is possible to have multiple instances associated with a given
+	 * task either because an multiple functions in the call path
+	 * have a return probe installed on them, and/or more then one return
+	 * return probe was registered for a target function.
+	 *
+	 * We can handle this because:
+	 *     - instances are always inserted at the head of the list
+	 *     - when multiple return probes are registered for the same
+	 *       function, the first instance's ret_addr will point to the
+	 *       real return address, and all the rest will point to
+	 *       kretprobe_trampoline
+	 */
+	hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
+		if (ri->task != current)
+			/* another task is sharing our hash bucket */
+			continue;
+
+		if (ri->rp && ri->rp->handler)
+			ri->rp->handler(ri, regs);
+
+		orig_ret_address = (unsigned long)ri->ret_addr;
+		recycle_rp_inst(ri);
+
+		if (orig_ret_address != trampoline_address) {
+			/*
+			 * This is the real return address. Any other
+			 * instances associated with this task are for
+			 * other calls deeper on the call stack
+			 */
+			break;
+		}
+	}
+	BUG_ON(!orig_ret_address || (orig_ret_address == trampoline_address));
+	regs->psw.addr = orig_ret_address | PSW_ADDR_AMODE;
+
+	reset_current_kprobe();
+	spin_unlock_irqrestore(&kretprobe_lock, flags);
+	preempt_enable_no_resched();
+
+	/*
+	 * By returning a non-zero value, we are telling
+	 * kprobe_handler() that we don't want the post_handler
+	 * to run (and have re-enabled preemption)
+	 */
+	return 1;
+}
+
+/*
+ * Called after single-stepping.  p->addr is the address of the
+ * instruction whose first byte has been replaced by the "breakpoint"
+ * instruction.  To avoid the SMP problems that can occur when we
+ * temporarily put back the original opcode to single-step, we
+ * single-stepped a copy of the instruction.  The address of this
+ * copy is p->ainsn.insn.
+ */
+static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
+{
+	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+
+	regs->psw.addr &= PSW_ADDR_INSN;
+
+	if (p->ainsn.fixup & FIXUP_PSW_NORMAL)
+		regs->psw.addr = (unsigned long)p->addr +
+				((unsigned long)regs->psw.addr -
+				 (unsigned long)p->ainsn.insn);
+
+	if (p->ainsn.fixup & FIXUP_BRANCH_NOT_TAKEN)
+		if ((unsigned long)regs->psw.addr -
+		    (unsigned long)p->ainsn.insn == p->ainsn.ilen)
+			regs->psw.addr = (unsigned long)p->addr + p->ainsn.ilen;
+
+	if (p->ainsn.fixup & FIXUP_RETURN_REGISTER)
+		regs->gprs[p->ainsn.reg] = ((unsigned long)p->addr +
+						(regs->gprs[p->ainsn.reg] -
+						(unsigned long)p->ainsn.insn))
+						| PSW_ADDR_AMODE;
+
+	regs->psw.addr |= PSW_ADDR_AMODE;
+	/* turn off PER mode */
+	regs->psw.mask &= ~PSW_MASK_PER;
+	/* Restore the original per control regs */
+	__ctl_load(kcb->kprobe_saved_ctl, 9, 11);
+	regs->psw.mask |= kcb->kprobe_saved_imask;
+}
+
+static int __kprobes post_kprobe_handler(struct pt_regs *regs)
+{
+	struct kprobe *cur = kprobe_running();
+	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+
+	if (!cur)
+		return 0;
+
+	if ((kcb->kprobe_status != KPROBE_REENTER) && cur->post_handler) {
+		kcb->kprobe_status = KPROBE_HIT_SSDONE;
+		cur->post_handler(cur, regs, 0);
+	}
+
+	resume_execution(cur, regs);
+
+	/*Restore back the original saved kprobes variables and continue. */
+	if (kcb->kprobe_status == KPROBE_REENTER) {
+		restore_previous_kprobe(kcb);
+		goto out;
+	}
+	reset_current_kprobe();
+out:
+	preempt_enable_no_resched();
+
+	/*
+	 * if somebody else is singlestepping across a probe point, psw mask
+	 * will have PER set, in which case, continue the remaining processing
+	 * of do_single_step, as if this is not a probe hit.
+	 */
+	if (regs->psw.mask & PSW_MASK_PER) {
+		return 0;
+	}
+
+	return 1;
+}
+
+static int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
+{
+	struct kprobe *cur = kprobe_running();
+	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+	const struct exception_table_entry *entry;
+
+	switch(kcb->kprobe_status) {
+	case KPROBE_SWAP_INST:
+		/* We are here because the instruction replacement failed */
+		return 0;
+	case KPROBE_HIT_SS:
+	case KPROBE_REENTER:
+		/*
+		 * We are here because the instruction being single
+		 * stepped caused a page fault. We reset the current
+		 * kprobe and the nip points back to the probe address
+		 * and allow the page fault handler to continue as a
+		 * normal page fault.
+		 */
+		regs->psw.addr = (unsigned long)cur->addr | PSW_ADDR_AMODE;
+		regs->psw.mask &= ~PSW_MASK_PER;
+		regs->psw.mask |= kcb->kprobe_saved_imask;
+		if (kcb->kprobe_status == KPROBE_REENTER)
+			restore_previous_kprobe(kcb);
+		else
+			reset_current_kprobe();
+		preempt_enable_no_resched();
+		break;
+	case KPROBE_HIT_ACTIVE:
+	case KPROBE_HIT_SSDONE:
+		/*
+		 * We increment the nmissed count for accounting,
+		 * we can also use npre/npostfault count for accouting
+		 * these specific fault cases.
+		 */
+		kprobes_inc_nmissed_count(cur);
+
+		/*
+		 * We come here because instructions in the pre/post
+		 * handler caused the page_fault, this could happen
+		 * if handler tries to access user space by
+		 * copy_from_user(), get_user() etc. Let the
+		 * user-specified handler try to fix it first.
+		 */
+		if (cur->fault_handler && cur->fault_handler(cur, regs, trapnr))
+			return 1;
+
+		/*
+		 * In case the user-specified fault handler returned
+		 * zero, try to fix up.
+		 */
+		entry = search_exception_tables(regs->psw.addr & PSW_ADDR_INSN);
+		if (entry) {
+			regs->psw.addr = entry->fixup | PSW_ADDR_AMODE;
+			return 1;
+		}
+
+		/*
+		 * fixup_exception() could not handle it,
+		 * Let do_page_fault() fix it.
+		 */
+		break;
+	default:
+		break;
+	}
+	return 0;
+}
+
+/*
+ * Wrapper routine to for handling exceptions.
+ */
+int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
+				       unsigned long val, void *data)
+{
+	struct die_args *args = (struct die_args *)data;
+	int ret = NOTIFY_DONE;
+
+	switch (val) {
+	case DIE_BPT:
+		if (kprobe_handler(args->regs))
+			ret = NOTIFY_STOP;
+		break;
+	case DIE_SSTEP:
+		if (post_kprobe_handler(args->regs))
+			ret = NOTIFY_STOP;
+		break;
+	case DIE_TRAP:
+	case DIE_PAGE_FAULT:
+		/* kprobe_running() needs smp_processor_id() */
+		preempt_disable();
+		if (kprobe_running() &&
+		    kprobe_fault_handler(args->regs, args->trapnr))
+			ret = NOTIFY_STOP;
+		preempt_enable();
+		break;
+	default:
+		break;
+	}
+	return ret;
+}
+
+int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
+{
+	struct jprobe *jp = container_of(p, struct jprobe, kp);
+	unsigned long addr;
+	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+
+	memcpy(&kcb->jprobe_saved_regs, regs, sizeof(struct pt_regs));
+
+	/* setup return addr to the jprobe handler routine */
+	regs->psw.addr = (unsigned long)(jp->entry) | PSW_ADDR_AMODE;
+
+	/* r14 is the function return address */
+	kcb->jprobe_saved_r14 = (unsigned long)regs->gprs[14];
+	/* r15 is the stack pointer */
+	kcb->jprobe_saved_r15 = (unsigned long)regs->gprs[15];
+	addr = (unsigned long)kcb->jprobe_saved_r15;
+
+	memcpy(kcb->jprobes_stack, (kprobe_opcode_t *) addr,
+	       MIN_STACK_SIZE(addr));
+	return 1;
+}
+
+void __kprobes jprobe_return(void)
+{
+	asm volatile (".word 0x0002");
+}
+
+void __kprobes jprobe_return_end(void)
+{
+	asm volatile ("bcr 0,0");
+}
+
+int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
+{
+	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+	unsigned long stack_addr = (unsigned long)(kcb->jprobe_saved_r15);
+
+	/* Put the regs back */
+	memcpy(regs, &kcb->jprobe_saved_regs, sizeof(struct pt_regs));
+	/* put the stack back */
+	memcpy((kprobe_opcode_t *) stack_addr, kcb->jprobes_stack,
+	       MIN_STACK_SIZE(stack_addr));
+	preempt_enable_no_resched();
+	return 1;
+}
+
+static struct kprobe trampoline_p = {
+	.addr = (kprobe_opcode_t *) & kretprobe_trampoline,
+	.pre_handler = trampoline_probe_handler
+};
+
+int __init arch_init_kprobes(void)
+{
+	return register_kprobe(&trampoline_p);
+}
diff -Naur linux-2.6.18-rc1/arch/s390/kernel/Makefile linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/Makefile
--- linux-2.6.18-rc1/arch/s390/kernel/Makefile	2006-07-06 11:05:42.000000000 -0700
+++ linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/Makefile	2006-07-11 15:16:24.000000000 -0700
@@ -22,6 +22,7 @@
 
 obj-$(CONFIG_VIRT_TIMER)	+= vtime.o
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
+obj-$(CONFIG_KPROBES)		+= kprobes.o
 
 # Kexec part
 S390_KEXEC_OBJS := machine_kexec.o crash.o
diff -Naur linux-2.6.18-rc1/arch/s390/kernel/traps.c linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/traps.c
--- linux-2.6.18-rc1/arch/s390/kernel/traps.c	2006-07-06 11:05:42.000000000 -0700
+++ linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/traps.c	2006-07-11 15:16:24.000000000 -0700
@@ -29,6 +29,7 @@
 #include <linux/module.h>
 #include <linux/kallsyms.h>
 #include <linux/reboot.h>
+#include <linux/kprobes.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -39,6 +40,7 @@
 #include <asm/s390_ext.h>
 #include <asm/lowcore.h>
 #include <asm/debug.h>
+#include <asm/kdebug.h>
 
 /* Called from entry.S only */
 extern void handle_per_exception(struct pt_regs *regs);
@@ -74,6 +76,20 @@
 static int kstack_depth_to_print = 20;
 #endif /* CONFIG_64BIT */
 
+ATOMIC_NOTIFIER_HEAD(s390die_chain);
+
+int register_die_notifier(struct notifier_block *nb)
+{
+	return atomic_notifier_chain_register(&s390die_chain, nb);
+}
+EXPORT_SYMBOL(register_die_notifier);
+
+int unregister_die_notifier(struct notifier_block *nb)
+{
+	return atomic_notifier_chain_unregister(&s390die_chain, nb);
+}
+EXPORT_SYMBOL(unregister_die_notifier);
+
 /*
  * For show_trace we have tree different stack to consider:
  *   - the panic stack which is used if the kernel stack has overflown
@@ -305,8 +321,9 @@
 #endif
 }
 
-static void inline do_trap(long interruption_code, int signr, char *str,
-                           struct pt_regs *regs, siginfo_t *info)
+static void __kprobes inline do_trap(long interruption_code, int signr,
+					char *str, struct pt_regs *regs,
+					siginfo_t *info)
 {
 	/*
 	 * We got all needed information from the lowcore and can
@@ -315,6 +332,10 @@
         if (regs->psw.mask & PSW_MASK_PSTATE)
 		local_irq_enable();
 
+	if (notify_die(DIE_TRAP, str, regs, interruption_code,
+				interruption_code, signr) == NOTIFY_STOP)
+		return;
+
         if (regs->psw.mask & PSW_MASK_PSTATE) {
                 struct task_struct *tsk = current;
 
@@ -357,8 +357,11 @@ static inline void __user *get_check_add
 	return (void __user *)((regs->psw.addr-S390_lowcore.pgm_ilc) & PSW_ADDR_INSN);
 }
 
-void do_single_step(struct pt_regs *regs)
+void __kprobes do_single_step(struct pt_regs *regs)
 {
+	if (notify_die(DIE_SSTEP, "sstep", regs, 0, 0, SIGTRAP) == NOTIFY_STOP)
+		return;
+
 	if (tracehook_consider_fatal_signal(current, SIGTRAP))
 		force_sig(SIGTRAP, current);
 }
@@ -463,8 +488,15 @@
 #endif
 		} else
 			signal = SIGILL;
-	} else
-		signal = SIGILL;
+	} else {
+		/*
+		 * If we get an illegal op in kernel mode, send it through the
+		 * kprobes notifier. If kprobes doesn't pick it up, SIGILL
+		 */
+		if (notify_die(DIE_BPT, "bpt", regs, interruption_code,
+					3, SIGTRAP) != NOTIFY_STOP)
+			signal = SIGILL;
+	}
 
 #ifdef CONFIG_MATHEMU
         if (signal == SIGFPE)
diff -Naur linux-2.6.18-rc1/arch/s390/kernel/vmlinux.lds.S linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/vmlinux.lds.S
--- linux-2.6.18-rc1/arch/s390/kernel/vmlinux.lds.S	2006-07-06 11:05:42.000000000 -0700
+++ linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/vmlinux.lds.S	2006-07-11 15:16:24.000000000 -0700
@@ -24,6 +24,7 @@
 	*(.text)
 	SCHED_TEXT
 	LOCK_TEXT
+	KPROBES_TEXT
 	*(.fixup)
 	*(.gnu.warning)
 	} = 0x0700
diff -Naur linux-2.6.18-rc1/arch/s390/mm/fault.c linux-2.6.18-rc1.s390-kprob/arch/s390/mm/fault.c
--- linux-2.6.18-rc1/arch/s390/mm/fault.c	2006-07-06 11:05:42.000000000 -0700
+++ linux-2.6.18-rc1.s390-kprob/arch/s390/mm/fault.c	2006-07-11 15:16:24.000000000 -0700
@@ -25,10 +25,12 @@
 #include <linux/console.h>
 #include <linux/module.h>
 #include <linux/hardirq.h>
+#include <linux/kprobes.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
+#include <asm/kdebug.h>
 
 #ifndef CONFIG_64BIT
 #define __FAIL_ADDR_MASK 0x7ffff000
@@ -48,6 +50,38 @@
 
 extern void die(const char *,struct pt_regs *,long);
 
+#ifdef CONFIG_KPROBES
+ATOMIC_NOTIFIER_HEAD(notify_page_fault_chain);
+int register_page_fault_notifier(struct notifier_block *nb)
+{
+	return atomic_notifier_chain_register(&notify_page_fault_chain, nb);
+}
+
+int unregister_page_fault_notifier(struct notifier_block *nb)
+{
+	return atomic_notifier_chain_unregister(&notify_page_fault_chain, nb);
+}
+
+static inline int notify_page_fault(enum die_val val, const char *str,
+			struct pt_regs *regs, long err, int trap, int sig)
+{
+	struct die_args args = {
+		.regs = regs,
+		.str = str,
+		.err = err,
+		.trapnr = trap,
+		.signr = sig
+	};
+	return atomic_notifier_call_chain(&notify_page_fault_chain, val, &args);
+}
+#else
+static inline int notify_page_fault(enum die_val val, const char *str,
+			struct pt_regs *regs, long err, int trap, int sig)
+{
+	return NOTIFY_DONE;
+}
+#endif
+
 extern spinlock_t timerlist_lock;
 
 /*
@@ -159,7 +193,7 @@
  *   11       Page translation     ->  Not present       (nullification)
  *   3b       Region third trans.  ->  Not present       (nullification)
  */
-static inline void
+static inline void __kprobes
 do_exception(struct pt_regs *regs, unsigned long error_code, int is_protection)
 {
         struct task_struct *tsk;
@@ -173,6 +207,10 @@
         tsk = current;
         mm = tsk->mm;
 	
+	if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
+					SIGSEGV) == NOTIFY_STOP)
+		return;
+
 	/* 
          * Check for low-address protection.  This needs to be treated
 	 * as a special case because the translation exception code 
diff -Naur linux-2.6.18-rc1/include/asm-s390/kdebug.h linux-2.6.18-rc1.s390-kprob/include/asm-s390/kdebug.h
--- linux-2.6.18-rc1/include/asm-s390/kdebug.h	1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.18-rc1.s390-kprob/include/asm-s390/kdebug.h	2006-07-11 15:17:19.314860992 -0700
@@ -0,0 +1,59 @@
+#ifndef _S390_KDEBUG_H
+#define _S390_KDEBUG_H
+
+/*
+ * Feb 2006 Ported to s390 <grundym at us.ibm.com>
+ */
+#include <linux/notifier.h>
+
+struct pt_regs;
+
+struct die_args {
+	struct pt_regs *regs;
+	const char *str;
+	long err;
+	int trapnr;
+	int signr;
+};
+
+/* Note - you should never unregister because that can race with NMIs.
+ * If you really want to do it first unregister - then synchronize_sched
+ *  - then free.
+ */
+extern int register_die_notifier(struct notifier_block *);
+extern int unregister_die_notifier(struct notifier_block *);
+extern int register_page_fault_notifier(struct notifier_block *);
+extern int unregister_page_fault_notifier(struct notifier_block *);
+extern struct atomic_notifier_head s390die_chain;
+
+
+enum die_val {
+	DIE_OOPS = 1,
+	DIE_BPT,
+	DIE_SSTEP,
+	DIE_PANIC,
+	DIE_NMI,
+	DIE_DIE,
+	DIE_NMIWATCHDOG,
+	DIE_KERNELDEBUG,
+	DIE_TRAP,
+	DIE_GPF,
+	DIE_CALL,
+	DIE_NMI_IPI,
+	DIE_PAGE_FAULT,
+};
+
+static inline int notify_die(enum die_val val, const char *str,
+			struct pt_regs *regs, long err, int trap, int sig)
+{
+	struct die_args args = {
+		.regs = regs,
+		.str = str,
+		.err = err,
+		.trapnr = trap,
+		.signr = sig
+	};
+	return atomic_notifier_call_chain(&s390die_chain, val, &args);
+}
+
+#endif
diff -Naur linux-2.6.18-rc1/include/asm-s390/kprobes.h linux-2.6.18-rc1.s390-kprob/include/asm-s390/kprobes.h
--- linux-2.6.18-rc1/include/asm-s390/kprobes.h	1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.18-rc1.s390-kprob/include/asm-s390/kprobes.h	2006-07-11 15:16:24.985120368 -0700
@@ -0,0 +1,111 @@
+#ifndef _ASM_S390_KPROBES_H
+#define _ASM_S390_KPROBES_H
+/*
+ *  Kernel Probes (KProbes)
+ *
+ * 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.
+ *
+ * Copyright (C) IBM Corporation, 2002, 2006
+ *
+ * 2002-Oct	Created by Vamsi Krishna S <vamsi_krishna at in.ibm.com> Kernel
+ *		Probes initial implementation ( includes suggestions from
+ *		Rusty Russell).
+ * 2004-Nov	Modified for PPC64 by Ananth N Mavinakayanahalli
+ *		<ananth at in.ibm.com>
+ * 2005-Dec	Used as a template for s390 by Mike Grundy
+ * 		<grundym at us.ibm.com>
+ */
+#include <linux/types.h>
+#include <linux/ptrace.h>
+#include <linux/percpu.h>
+
+#define  __ARCH_WANT_KPROBES_INSN_SLOT
+struct pt_regs;
+struct kprobe;
+
+typedef u16 kprobe_opcode_t;
+#define BREAKPOINT_INSTRUCTION	0x0002
+
+/* Maximum instruction size is 3 (16bit) halfwords: */
+#define MAX_INSN_SIZE		0x0003
+#define MAX_STACK_SIZE 		64
+#define MIN_STACK_SIZE(ADDR) (((MAX_STACK_SIZE) < \
+	(((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR))) \
+	? (MAX_STACK_SIZE) \
+	: (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
+
+#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)((func_descr_t *)pentry)
+
+#define ARCH_SUPPORTS_KRETPROBES
+#define ARCH_INACTIVE_KPROBE_COUNT 0
+
+#define KPROBE_SWAP_INST	0x10
+
+#define FIXUP_PSW_NORMAL	0x08
+#define FIXUP_BRANCH_NOT_TAKEN	0x04
+#define FIXUP_RETURN_REGISTER	0x02
+#define FIXUP_NOT_REQUIRED	0x01
+
+/* Architecture specific copy of original instruction */
+struct arch_specific_insn {
+	/* copy of original instruction */
+	kprobe_opcode_t *insn;
+	int fixup;
+	int ilen;
+	int reg;
+};
+
+struct ins_replace_args {
+	kprobe_opcode_t *ptr;
+	kprobe_opcode_t old;
+	kprobe_opcode_t new;
+};
+struct prev_kprobe {
+	struct kprobe *kp;
+	unsigned long status;
+	unsigned long saved_psw;
+	unsigned long kprobe_saved_imask;
+	unsigned long kprobe_saved_ctl[3];
+};
+
+/* per-cpu kprobe control block */
+struct kprobe_ctlblk {
+	unsigned long kprobe_status;
+	unsigned long kprobe_saved_imask;
+	unsigned long kprobe_saved_ctl[3];
+	struct pt_regs jprobe_saved_regs;
+	unsigned long jprobe_saved_r14;
+	unsigned long jprobe_saved_r15;
+	struct prev_kprobe prev_kprobe;
+	kprobe_opcode_t jprobes_stack[MAX_STACK_SIZE];
+};
+
+void arch_remove_kprobe(struct kprobe *p);
+void kretprobe_trampoline(void);
+int  is_prohibited_opcode(kprobe_opcode_t *instruction);
+void get_instruction_type(struct arch_specific_insn *ainsn);
+#endif	/* _ASM_S390_KPROBES_H */
+
+#ifdef CONFIG_KPROBES
+
+extern int kprobe_exceptions_notify(struct notifier_block *self,
+					unsigned long val, void *data);
+#else	/* !CONFIG_KPROBES */
+static inline int kprobe_exceptions_notify(struct notifier_block *self,
+						unsigned long val, void *data)
+{
+	return 0;
+}
+#endif



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2500
retrieving revision 1.2501
diff -u -r1.2500 -r1.2501
--- kernel-2.6.spec	1 Aug 2006 20:57:20 -0000	1.2500
+++ kernel-2.6.spec	1 Aug 2006 21:30:10 -0000	1.2501
@@ -288,6 +288,8 @@
 # 400 - 499   ia64
 
 # 500 - 599   s390(x)
+Patch500: linux-2.6-s390-kprobes.patch
+
 # 600 - 699   sparc(64)
 
 #
@@ -747,8 +749,12 @@
 # Check properly for successful RTAS instantiation
 %patch314 -p1
 
+# S390
+# Kprobes.
+%patch500 -p1
+
 #
-# Patches 500 through 1000 are reserved for bugfixes to the core system
+# Patches 800 through 899 are reserved for bugfixes to the core system
 # and patches related to how RPMs are build
 #
 
@@ -1615,6 +1621,9 @@
 %endif
 
 %changelog
+* Tue Aug  1 2006 Dave Jones <davej at redhat.com>
+- s390 kprobes support.
+
 * Tue Aug  1 2006 Roland McGrath <roland at redhat.com>
 - fix bogus BUG_ON in ptrace_do_wait
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 21:32:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 17:32:31 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2501,1.2502
Message-ID: <200608012132.k71LWV1Z028036@cvs.devel.redhat.com>

Author: davej

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

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


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2501
retrieving revision 1.2502
diff -u -r1.2501 -r1.2502
--- kernel-2.6.spec	1 Aug 2006 21:30:10 -0000	1.2501
+++ kernel-2.6.spec	1 Aug 2006 21:32:26 -0000	1.2502
@@ -631,7 +631,7 @@
 
 %description kdump
 This package includes a kdump version of the Linux kernel. It is
-required only on machines which will use the kexec-base kernel crash dump
+required only on machines which will use the kexec-based kernel crash dump
 mechanism.
 
 %package kdump-devel



From fedora-cvs-commits at redhat.com  Tue Aug  1 21:38:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 17:38:04 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.44,
	1.45 selinux-policy.spec, 1.240, 1.241
Message-ID: <200608012138.k71Lc4aB029565@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-17
- more xen rules


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 mls                                |    9 -
 modules/admin/bootloader.te        |    6 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    5 
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.if       |   21 +++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 ++++++++++++
 modules/kernel/selinux.if          |   18 ++-
 modules/kernel/selinux.te          |    4 
 modules/kernel/storage.fc          |    1 
 modules/kernel/terminal.if         |   18 +++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    2 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    7 +
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cron.if           |   16 ++
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nis.te            |    1 
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |   13 ++
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  146 ++++++++++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    9 -
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |   10 +
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    1 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |    6 -
 modules/system/logging.te          |    9 +
 modules/system/lvm.te              |    3 
 modules/system/mount.te            |    2 
 modules/system/selinuxutil.te      |   29 ++++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |   13 +-
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   50 +++-----
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |   16 ++
 98 files changed, 1059 insertions(+), 265 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- policy-20060608.patch	31 Jul 2006 21:25:08 -0000	1.44
+++ policy-20060608.patch	1 Aug 2006 21:38:02 -0000	1.45
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.3.3/policy/global_booleans
 --- nsaserefpolicy/policy/global_booleans	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/global_booleans	2006-07-19 15:59:32.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_booleans	2006-08-01 17:09:47.000000000 -0400
 @@ -4,6 +4,7 @@
  # file should be used.
  #
@@ -19,7 +19,7 @@
  ## <p>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.3/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/global_tunables	2006-07-19 16:01:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_tunables	2006-08-01 17:09:47.000000000 -0400
 @@ -19,6 +19,14 @@
  
  ## <desc>
@@ -175,7 +175,7 @@
  ## </desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.3.3/policy/mcs
 --- nsaserefpolicy/policy/mcs	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/mcs	2006-07-25 11:04:06.000000000 -0400
++++ serefpolicy-2.3.3/policy/mcs	2006-08-01 17:09:47.000000000 -0400
 @@ -159,8 +159,9 @@
  mlsconstrain process { transition dyntransition }
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
@@ -189,7 +189,7 @@
  	(( h1 dom h2 ) or ( t1 == mcskillall ));
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.3/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/mls	2006-07-31 17:12:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/mls	2006-08-01 17:09:47.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -213,7 +213,7 @@
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.3/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-07-26 13:52:04.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-08-01 17:09:47.000000000 -0400
 @@ -48,7 +48,7 @@
  # bootloader local policy
  #
@@ -244,7 +244,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.3/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-07-28 13:28:33.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-08-01 17:09:47.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -269,7 +269,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.3/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-07-14 17:04:45.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/firstboot.te	2006-07-28 15:12:28.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/firstboot.te	2006-08-01 17:09:47.000000000 -0400
 @@ -120,6 +120,10 @@
  	usermanage_domtrans_useradd(firstboot_t)
  ')
@@ -288,7 +288,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.3.3/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/netutils.te	2006-07-19 12:37:56.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/netutils.te	2006-08-01 17:09:47.000000000 -0400
 @@ -211,11 +211,11 @@
  ifdef(`targeted_policy',`
  	term_use_unallocated_ttys(traceroute_t)
@@ -308,7 +308,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.3/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/prelink.te	2006-07-18 08:54:22.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/prelink.te	2006-08-01 17:09:47.000000000 -0400
 @@ -48,6 +48,7 @@
  corecmd_relabel_all_executables(prelink_t)
  corecmd_mmap_all_executables(prelink_t)
@@ -319,7 +319,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.3/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/rpm.fc	2006-07-17 15:30:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.fc	2006-08-01 17:09:47.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -331,7 +331,7 @@
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.3/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-07-14 17:04:45.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-07-18 09:52:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-08-01 17:09:47.000000000 -0400
 @@ -211,7 +211,7 @@
  
  	files_search_var_lib($1)
@@ -352,7 +352,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.3/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/usermanage.te	2006-07-28 13:32:21.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/usermanage.te	2006-08-01 17:09:47.000000000 -0400
 @@ -260,6 +260,7 @@
  ')
  
@@ -369,9 +369,20 @@
  	nscd_socket_use(useradd_t)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.3/policy/modules/kernel/corecommands.fc
+--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/corecommands.fc	2006-08-01 17:34:30.000000000 -0400
+@@ -62,6 +62,7 @@
+ /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+ 
+ /etc/xen/scripts(/.*)?			gen_context(system_u:object_r:bin_t,s0)
++/etc/xen/qemu-ifup		--	gen_context(system_u:object_r:bin_t,s0)
+ 
+ ifdef(`distro_debian',`
+ /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-07-14 17:04:30.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in	2006-08-01 17:09:47.000000000 -0400
 @@ -62,7 +62,7 @@
  network_port(amavisd_send, tcp,10025,s0)
  network_port(asterisk, tcp,1720,s0, udp,2427,s0, udp,2727,s0, udp,4569,s0, udp,5060,s0)
@@ -400,7 +411,7 @@
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.3/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-07-20 14:37:36.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-08-01 17:09:47.000000000 -0400
 @@ -20,6 +20,7 @@
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
  /dev/full		-c	gen_context(system_u:object_r:null_device_t,s0)
@@ -420,7 +431,7 @@
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.3/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/files.fc	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/files.fc	2006-08-01 17:09:47.000000000 -0400
 @@ -11,6 +11,7 @@
  ifdef(`distro_redhat',`
  /\.autofsck		--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -431,7 +442,7 @@
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.3.3/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.if	2006-07-26 13:51:17.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.if	2006-08-01 17:09:47.000000000 -0400
 @@ -1019,6 +1019,27 @@
  
  ########################################
@@ -462,7 +473,7 @@
  ## <desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.3/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.te	2006-07-18 08:50:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.te	2006-08-01 17:09:47.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -481,8 +492,51 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.3/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/kernel.if	2006-07-17 11:43:02.000000000 -0400
-@@ -2099,3 +2099,41 @@
++++ serefpolicy-2.3.3/policy/modules/kernel/kernel.if	2006-08-01 17:34:54.000000000 -0400
+@@ -1456,6 +1456,42 @@
+ 
+ ########################################
+ ## <summary>
++##	Allow search the kernel key ring.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kernel_search_key',`
++	gen_require(`
++		type kernel_t;
++	')
++
++	allow $1 kernel_t:key search;
++')
++
++########################################
++## <summary>
++##	Allow link to the kernel key ring.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kernel_link_key',`
++	gen_require(`
++		type kernel_t;
++	')
++
++	allow $1 kernel_t:key link;
++')
++
++########################################
++## <summary>
+ ##	Read filesystem sysctls.
+ ## </summary>
+ ## <param name="domain">
+@@ -2099,3 +2135,42 @@
  
  	typeattribute $1 kern_unconfined;
  ')
@@ -524,9 +578,10 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.3.3/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/selinux.if	2006-07-26 13:02:05.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/selinux.if	2006-08-01 17:09:47.000000000 -0400
 @@ -55,7 +55,7 @@
  		type security_t;
  	')
@@ -589,7 +644,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-2.3.3/policy/modules/kernel/selinux.te
 --- nsaserefpolicy/policy/modules/kernel/selinux.te	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/selinux.te	2006-07-26 12:46:07.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/selinux.te	2006-08-01 17:09:47.000000000 -0400
 @@ -40,10 +40,10 @@
  
  if(!secure_mode_policyload) {
@@ -605,7 +660,7 @@
  }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.3.3/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/storage.fc	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/storage.fc	2006-08-01 17:09:47.000000000 -0400
 @@ -23,6 +23,7 @@
  /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
  /dev/lvm			-c	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
@@ -614,9 +669,34 @@
  /dev/nb[^/]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
  /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.3/policy/modules/kernel/terminal.if
+--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/terminal.if	2006-08-01 17:33:29.000000000 -0400
+@@ -949,3 +949,21 @@
+ 	dontaudit $1 ttynode:chr_file { read write };
+ ')
+ 
++########################################
++## <summary>
++##	Get the attributes of a pty filesystem
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`term_getattr_ptys_fs',`
++	gen_require(`
++		type devpts_t;
++	')
++
++	allow $1 devpts_t:filesystem getattr;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.3/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/amavis.te	2006-07-31 09:31:51.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/amavis.te	2006-08-01 17:09:47.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -648,7 +728,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.3/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/apache.te	2006-07-27 12:31:07.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/apache.te	2006-08-01 17:09:47.000000000 -0400
 @@ -273,7 +273,6 @@
  sysnet_read_config(httpd_t)
  
@@ -659,7 +739,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.3/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/automount.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/automount.te	2006-08-01 17:09:47.000000000 -0400
 @@ -36,10 +36,12 @@
  allow automount_t self:unix_dgram_socket create_socket_perms;
  allow automount_t self:tcp_socket create_stream_socket_perms;
@@ -685,18 +765,19 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.3/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/avahi.te	2006-07-17 11:43:02.000000000 -0400
-@@ -78,6 +78,7 @@
++++ serefpolicy-2.3.3/policy/modules/services/avahi.te	2006-08-01 17:36:26.000000000 -0400
+@@ -78,6 +78,8 @@
  miscfiles_read_localization(avahi_t)
  
  sysnet_read_config(avahi_t)
 +sysnet_use_ldap(avahi_t)
++miscfiles_read_certs(avahi_t)
  
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.3.3/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bind.fc	2006-07-21 11:20:26.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bind.fc	2006-08-01 17:09:47.000000000 -0400
 @@ -28,7 +28,8 @@
  ')
  
@@ -709,7 +790,7 @@
  /var/named/slaves(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.3/policy/modules/services/bluetooth.if
 --- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bluetooth.if	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.if	2006-08-01 17:09:47.000000000 -0400
 @@ -111,3 +111,26 @@
  	dontaudit $1 bluetooth_helper_t:dir search;
  	dontaudit $1 bluetooth_helper_t:file { read getattr };
@@ -739,7 +820,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.3/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-07-26 15:13:57.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-08-01 17:09:47.000000000 -0400
 @@ -173,6 +173,7 @@
  allow bluetooth_helper_t self:shm create_shm_perms;
  allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -767,7 +848,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-2.3.3/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/clamav.fc	2006-07-17 12:08:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.fc	2006-08-01 17:09:47.000000000 -0400
 @@ -8,8 +8,9 @@
  /usr/sbin/clamd			--	gen_context(system_u:object_r:clamd_exec_t,s0)
  
@@ -781,7 +862,7 @@
 +/var/spool/amavisd/clamd.sock	-s	gen_context(system_u:object_r:clamd_var_run_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.3/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/clamav.if	2006-07-17 12:07:25.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.if	2006-08-01 17:09:47.000000000 -0400
 @@ -35,11 +35,11 @@
  #
  interface(`clamav_stream_connect',`
@@ -820,7 +901,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.3.3/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/clamav.te	2006-07-17 12:11:30.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.te	2006-08-01 17:09:47.000000000 -0400
 @@ -15,10 +15,6 @@
  type clamd_etc_t;
  files_type(clamd_etc_t)
@@ -897,7 +978,7 @@
  kernel_read_kernel_sysctls(clamscan_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.3/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cron.if	2006-07-31 17:09:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cron.if	2006-08-01 17:09:47.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -942,7 +1023,7 @@
  		# also crontab does a security check for crontab -u
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.3/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-19 16:27:33.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-08-01 17:09:48.000000000 -0400
 @@ -81,6 +81,7 @@
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
@@ -972,7 +1053,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.3/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-07-26 13:06:30.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-08-01 17:09:48.000000000 -0400
 @@ -41,6 +41,7 @@
  allow cyrus_t self:unix_stream_socket connectto;
  allow cyrus_t self:tcp_socket create_stream_socket_perms;
@@ -991,7 +1072,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.3.3/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/dovecot.fc	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.fc	2006-08-01 17:09:48.000000000 -0400
 @@ -29,6 +29,7 @@
  /var/run/dovecot(-login)?(/.*)?		gen_context(system_u:object_r:dovecot_var_run_t,s0)
  
@@ -1002,7 +1083,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.3/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/dovecot.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.te	2006-08-01 17:09:48.000000000 -0400
 @@ -30,6 +30,10 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -1033,7 +1114,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.3.3/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ftp.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ftp.te	2006-08-01 17:09:48.000000000 -0400
 @@ -50,6 +50,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -1052,7 +1133,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.3/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-07-24 07:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-08-01 17:09:48.000000000 -0400
 @@ -22,7 +22,7 @@
  #
  
@@ -1086,7 +1167,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.3.3/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/inetd.te	2006-07-19 21:52:57.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/inetd.te	2006-08-01 17:09:48.000000000 -0400
 @@ -218,10 +218,6 @@
  
  sysnet_read_config(inetd_child_t)
@@ -1112,7 +1193,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-2.3.3/policy/modules/services/ldap.fc
 --- nsaserefpolicy/policy/modules/services/ldap.fc	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ldap.fc	2006-07-24 12:21:11.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.fc	2006-08-01 17:09:48.000000000 -0400
 @@ -9,3 +9,4 @@
  /var/run/openldap(/.*)?		gen_context(system_u:object_r:slapd_var_run_t,s0)
  /var/run/slapd\.args	--	gen_context(system_u:object_r:slapd_var_run_t,s0)
@@ -1120,7 +1201,7 @@
 +/var/run/ldapi		-s	gen_context(system_u:object_r:slapd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.if serefpolicy-2.3.3/policy/modules/services/ldap.if
 --- nsaserefpolicy/policy/modules/services/ldap.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ldap.if	2006-07-25 14:23:31.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.if	2006-08-01 17:09:48.000000000 -0400
 @@ -57,3 +57,24 @@
  	allow slapd_t $1:tcp_socket { acceptfrom recvfrom };
  	kernel_tcp_recvfrom($1)
@@ -1148,7 +1229,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.3/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ldap.te	2006-07-24 12:21:35.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.te	2006-08-01 17:09:48.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -1160,7 +1241,7 @@
  kernel_read_kernel_sysctls(slapd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.3.3/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-07-18 10:41:23.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-08-01 17:09:48.000000000 -0400
 @@ -62,7 +62,7 @@
  	allow $1_lpr_t self:unix_stream_socket create_stream_socket_perms;
  	allow $1_lpr_t self:tcp_socket create_socket_perms;
@@ -1227,7 +1308,7 @@
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-2.3.3/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/mailman.te	2006-07-17 12:13:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/mailman.te	2006-08-01 17:09:48.000000000 -0400
 @@ -6,8 +6,6 @@
  # Declarations
  #
@@ -1269,7 +1350,7 @@
  	allow mailman_cgi_t mailman_archive_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.3/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/nis.te	2006-07-25 14:33:15.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/nis.te	2006-08-01 17:09:48.000000000 -0400
 @@ -86,6 +86,7 @@
  corenet_tcp_bind_reserved_port(ypbind_t)
  corenet_udp_bind_reserved_port(ypbind_t)
@@ -1280,7 +1361,7 @@
  corenet_dontaudit_udp_bind_all_reserved_ports(ypbind_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.3.3/policy/modules/services/nscd.if
 --- nsaserefpolicy/policy/modules/services/nscd.if	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/nscd.if	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/nscd.if	2006-08-01 17:09:48.000000000 -0400
 @@ -144,3 +144,23 @@
  
  	allow $1 nscd_t:nscd *;
@@ -1307,7 +1388,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.3/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ntp.te	2006-07-24 14:57:00.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ntp.te	2006-08-01 17:09:48.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -1319,7 +1400,7 @@
  allow ntpd_t self:fifo_file { read write getattr };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.3/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-07-17 15:55:47.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-08-01 17:09:48.000000000 -0400
 @@ -33,6 +33,10 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -1351,7 +1432,7 @@
  ifdef(`targeted_policy',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.3/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/pegasus.if	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.if	2006-08-01 17:09:48.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -1387,7 +1468,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.3/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/pegasus.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.te	2006-08-01 17:09:48.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -1406,7 +1487,7 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.3/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postfix.te	2006-07-31 09:41:05.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postfix.te	2006-08-01 17:09:48.000000000 -0400
 @@ -160,7 +160,7 @@
  
  init_use_script_ptys(postfix_master_t)
@@ -1458,7 +1539,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-2.3.3/policy/modules/services/postgrey.fc
 --- nsaserefpolicy/policy/modules/services/postgrey.fc	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postgrey.fc	2006-07-17 12:18:17.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.fc	2006-08-01 17:09:48.000000000 -0400
 @@ -6,3 +6,5 @@
  /var/run/postgrey\.pid	--	gen_context(system_u:object_r:postgrey_var_run_t,s0)
  
@@ -1467,7 +1548,7 @@
 +/var/run/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-2.3.3/policy/modules/services/postgrey.if
 --- nsaserefpolicy/policy/modules/services/postgrey.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postgrey.if	2006-07-17 13:32:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.if	2006-08-01 17:09:48.000000000 -0400
 @@ -1 +1,20 @@
  ## <summary>Postfix grey-listing server</summary>
 +
@@ -1491,7 +1572,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-2.3.3/policy/modules/services/postgrey.te
 --- nsaserefpolicy/policy/modules/services/postgrey.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postgrey.te	2006-07-17 12:19:30.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.te	2006-08-01 17:09:48.000000000 -0400
 @@ -40,6 +40,7 @@
  allow postgrey_t postgrey_var_run_t:file create_file_perms;
  allow postgrey_t postgrey_var_run_t:dir rw_dir_perms;
@@ -1525,7 +1606,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.3/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/procmail.te	2006-07-17 12:16:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/procmail.te	2006-08-01 17:09:48.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -1547,7 +1628,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.fc serefpolicy-2.3.3/policy/modules/services/radius.fc
 --- nsaserefpolicy/policy/modules/services/radius.fc	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/radius.fc	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/radius.fc	2006-08-01 17:09:48.000000000 -0400
 @@ -3,6 +3,7 @@
  /etc/cron\.(daily|weekly|monthly)/freeradius -- gen_context(system_u:object_r:radiusd_exec_t,s0)
  
@@ -1558,7 +1639,7 @@
  /usr/sbin/freeradius	--	gen_context(system_u:object_r:radiusd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.3.3/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/radius.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/radius.te	2006-08-01 17:09:48.000000000 -0400
 @@ -13,6 +13,9 @@
  type radiusd_etc_t;
  files_config_file(radiusd_etc_t)
@@ -1583,7 +1664,7 @@
  logging_log_filetrans(radiusd_t,radiusd_log_t,{ file dir })
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.3.3/policy/modules/services/remotelogin.te
 --- nsaserefpolicy/policy/modules/services/remotelogin.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/remotelogin.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/remotelogin.te	2006-08-01 17:09:48.000000000 -0400
 @@ -37,6 +37,7 @@
  allow remote_login_t self:sem create_sem_perms;
  allow remote_login_t self:msgq create_msgq_perms;
@@ -1594,7 +1675,7 @@
  allow remote_login_t remote_login_tmp_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.3/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/samba.te	2006-07-31 10:38:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/samba.te	2006-08-01 17:09:48.000000000 -0400
 @@ -186,11 +186,12 @@
  allow smbd_t self:udp_socket create_socket_perms;
  allow smbd_t self:unix_dgram_socket { create_socket_perms sendto };
@@ -1628,7 +1709,7 @@
  allow nmbd_t samba_var_t:dir rw_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-07-21 08:40:27.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-08-01 17:09:48.000000000 -0400
 @@ -0,0 +1,11 @@
 +# setroubleshoot executables
 +
@@ -1643,7 +1724,7 @@
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if	2006-08-01 17:09:48.000000000 -0400
 @@ -0,0 +1,24 @@
 +## <summary>policy for setroubleshoot</summary>
 +
@@ -1671,7 +1752,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-28 14:41:10.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-08-01 17:09:48.000000000 -0400
 @@ -0,0 +1,146 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -1821,7 +1902,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.3/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/spamassassin.te	2006-07-31 09:36:35.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/spamassassin.te	2006-08-01 17:09:48.000000000 -0400
 @@ -194,3 +194,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -1832,7 +1913,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.3/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-07-28 09:12:30.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-08-01 17:09:48.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -1868,7 +1949,7 @@
  ') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.3/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ssh.if	2006-07-21 09:52:20.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ssh.if	2006-08-01 17:09:48.000000000 -0400
 @@ -71,6 +71,7 @@
  	allow $1_ssh_t self:msgq create_msgq_perms;
  	allow $1_ssh_t self:msg { send receive };
@@ -1879,7 +1960,7 @@
  	allow $1_ssh_t $2:unix_stream_socket rw_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.3/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-08-01 17:09:48.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -1890,7 +1971,7 @@
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.3.3/policy/modules/services/xfs.te
 --- nsaserefpolicy/policy/modules/services/xfs.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/xfs.te	2006-07-17 15:49:07.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xfs.te	2006-08-01 17:09:48.000000000 -0400
 @@ -59,6 +59,8 @@
  term_dontaudit_use_console(xfs_t)
  
@@ -1902,7 +1983,7 @@
  init_use_script_ptys(xfs_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.3/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/xserver.if	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.if	2006-08-01 17:09:48.000000000 -0400
 @@ -317,7 +317,6 @@
  	')
  
@@ -1941,7 +2022,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/xserver.te	2006-07-26 15:58:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.te	2006-08-01 17:09:48.000000000 -0400
 @@ -88,6 +88,7 @@
  allow xdm_t self:unix_dgram_socket create_socket_perms;
  allow xdm_t self:tcp_socket create_stream_socket_perms;
@@ -1961,7 +2042,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.3.3/policy/modules/services/zebra.te
 --- nsaserefpolicy/policy/modules/services/zebra.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-07-19 15:07:01.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-08-01 17:09:48.000000000 -0400
 @@ -42,6 +42,11 @@
  allow zebra_t zebra_conf_t:file r_file_perms;
  allow zebra_t zebra_conf_t:lnk_file { getattr read };
@@ -1988,7 +2069,7 @@
  dev_list_all_dev_nodes(zebra_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.3.3/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/authlogin.if	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/authlogin.if	2006-08-01 17:09:48.000000000 -0400
 @@ -1336,3 +1336,6 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
@@ -1998,7 +2079,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.3/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/authlogin.te	2006-07-17 12:30:07.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/authlogin.te	2006-08-01 17:09:48.000000000 -0400
 @@ -193,6 +193,7 @@
  term_setattr_console(pam_console_t)
  term_getattr_unallocated_ttys(pam_console_t)
@@ -2009,7 +2090,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-2.3.3/policy/modules/system/fstools.fc
 --- nsaserefpolicy/policy/modules/system/fstools.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/fstools.fc	2006-07-17 12:25:16.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/fstools.fc	2006-08-01 17:09:48.000000000 -0400
 @@ -1,3 +1,4 @@
 +/sbin/blkid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/blockdev		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -2017,7 +2098,7 @@
  /sbin/dosfsck		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-2.3.3/policy/modules/system/getty.fc
 --- nsaserefpolicy/policy/modules/system/getty.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/getty.fc	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.fc	2006-08-01 17:09:48.000000000 -0400
 @@ -9,3 +9,4 @@
  /var/run/mgetty\.pid.*	--	gen_context(system_u:object_r:getty_var_run_t,s0)
  
@@ -2025,7 +2106,7 @@
 +/var/spool/voice	--	gen_context(system_u:object_r:getty_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.3.3/policy/modules/system/getty.te
 --- nsaserefpolicy/policy/modules/system/getty.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/getty.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.te	2006-08-01 17:09:48.000000000 -0400
 @@ -37,7 +37,7 @@
  #
  
@@ -2045,7 +2126,7 @@
  init_use_script_ptys(getty_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.3/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-07-28 13:28:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-08-01 17:09:48.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -2070,7 +2151,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hotplug.te serefpolicy-2.3.3/policy/modules/system/hotplug.te
 --- nsaserefpolicy/policy/modules/system/hotplug.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/hotplug.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hotplug.te	2006-08-01 17:09:48.000000000 -0400
 @@ -136,7 +136,7 @@
  	term_dontaudit_use_generic_ptys(hotplug_t)
  
@@ -2082,7 +2163,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.3/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/init.if	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/init.if	2006-08-01 17:09:48.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -2099,7 +2180,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.3/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/libraries.fc	2006-07-30 18:14:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/libraries.fc	2006-08-01 17:09:48.000000000 -0400
 @@ -198,9 +198,9 @@
  # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame
  /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -2114,7 +2195,7 @@
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.3/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/locallogin.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/locallogin.te	2006-08-01 17:09:48.000000000 -0400
 @@ -51,6 +51,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -2125,7 +2206,7 @@
  files_lock_filetrans(local_login_t,local_login_lock_t,file)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.3/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.fc	2006-07-31 14:51:30.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.fc	2006-08-01 17:09:48.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -2135,7 +2216,7 @@
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.3/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.if	2006-07-26 13:00:20.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.if	2006-08-01 17:09:48.000000000 -0400
 @@ -165,6 +165,7 @@
  	')
  
@@ -2172,7 +2253,7 @@
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.3/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-07-31 14:50:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-08-01 17:09:48.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -2207,7 +2288,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.3/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/lvm.te	2006-07-23 12:48:10.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/lvm.te	2006-08-01 17:09:48.000000000 -0400
 @@ -125,7 +125,7 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
@@ -2227,7 +2308,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.3/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/mount.te	2006-07-31 09:50:35.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/mount.te	2006-08-01 17:09:48.000000000 -0400
 @@ -97,6 +97,8 @@
  
  sysnet_use_portmap(mount_t)
@@ -2239,7 +2320,7 @@
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-26 15:14:33.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-08-01 17:09:48.000000000 -0400
 @@ -258,6 +258,8 @@
  allow newrole_t { selinux_config_t default_context_t }:file r_file_perms;
  allow newrole_t { selinux_config_t default_context_t }:lnk_file r_file_perms;
@@ -2337,7 +2418,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.3/policy/modules/system/setrans.te
 --- nsaserefpolicy/policy/modules/system/setrans.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/setrans.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/setrans.te	2006-08-01 17:09:48.000000000 -0400
 @@ -68,3 +68,8 @@
  miscfiles_read_localization(setrans_t)
  
@@ -2349,7 +2430,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.3.3/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/sysnetwork.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/sysnetwork.te	2006-08-01 17:09:48.000000000 -0400
 @@ -277,6 +277,7 @@
  # for /sbin/ip
  allow ifconfig_t self:packet_socket create_socket_perms;
@@ -2360,7 +2441,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.3/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/udev.te	2006-07-17 12:22:21.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/udev.te	2006-08-01 17:09:48.000000000 -0400
 @@ -39,9 +39,9 @@
  # Local policy
  #
@@ -2375,7 +2456,7 @@
  allow udev_t self:fifo_file rw_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.3/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.fc	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.fc	2006-08-01 17:09:48.000000000 -0400
 @@ -9,4 +9,5 @@
  /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -2384,7 +2465,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.3/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-07-31 07:15:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-08-01 17:09:48.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -2409,7 +2490,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.3/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-07-31 07:16:25.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-08-01 17:09:48.000000000 -0400
 @@ -56,10 +56,6 @@
  	')
  
@@ -2444,7 +2525,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-07-18 09:32:58.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-08-01 17:09:48.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -2820,7 +2901,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.3/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-07-31 17:24:25.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-08-01 17:09:48.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -2931,7 +3012,7 @@
  			selinux_set_boolean(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.3/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/xen.if	2006-07-28 13:26:47.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.if	2006-08-01 17:09:48.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -2976,7 +3057,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.3/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-07-29 04:30:00.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-08-01 17:33:12.000000000 -0400
 @@ -70,6 +70,8 @@
  
  allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
@@ -2986,15 +3067,16 @@
  # internal communication is often done using fifo and unix sockets.
  allow xend_t self:fifo_file rw_file_perms;
  allow xend_t self:unix_stream_socket create_stream_socket_perms;
-@@ -130,6 +132,7 @@
+@@ -130,6 +132,8 @@
  corenet_tcp_bind_soundd_port(xend_t)
  corenet_sendrecv_xen_server_packets(xend_t)
  corenet_sendrecv_soundd_server_packets(xend_t)
 +corenet_tcp_bind_generic_port(xend_t)
++corenet_rw_tun_tap_dev(xend_t)
  
  dev_read_urand(xend_t)
  dev_manage_xen(xend_t)
-@@ -144,13 +147,16 @@
+@@ -144,13 +148,17 @@
  files_read_kernel_img(xend_t)
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -3005,13 +3087,14 @@
  term_dontaudit_getattr_all_user_ptys(xend_t)
  term_dontaudit_use_generic_ptys(xend_t)
 +term_use_ptmx(xend_t)
++term_getattr_ptys_fs(xend_t)
  
  init_use_fds(xend_t)
 +init_use_script_ptys(xend_t)
  
  libs_use_ld_so(xend_t)
  libs_use_shared_libs(xend_t)
-@@ -171,7 +177,7 @@
+@@ -171,7 +179,7 @@
  netutils_domtrans(xend_t)
  
  optional_policy(`
@@ -3020,7 +3103,7 @@
  ')
  
  ########################################
-@@ -200,6 +206,7 @@
+@@ -200,6 +208,7 @@
  term_use_console(xenconsoled_t)
  
  init_use_fds(xenconsoled_t)
@@ -3028,7 +3111,7 @@
  
  libs_use_ld_so(xenconsoled_t)
  libs_use_shared_libs(xenconsoled_t)
-@@ -238,10 +245,11 @@
+@@ -238,10 +247,11 @@
  dev_filetrans_xen(xenstored_t)
  dev_rw_xen(xenstored_t)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- selinux-policy.spec	31 Jul 2006 21:25:08 -0000	1.240
+++ selinux-policy.spec	1 Aug 2006 21:38:02 -0000	1.241
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 16
+Release: 17
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-17
+- more xen rules
+
 * Mon Jul 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-16
 - Fixes for Samba
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 21:43:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 17:43:18 -0400
Subject: rpms/libtiff/FC-4 libtiff-3.7.1-ormandy.patch, NONE,
	1.1 libtiff.spec, 1.31, 1.32
Message-ID: <200608012143.k71LhIRe030863@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	libtiff.spec 
Added Files:
	libtiff-3.7.1-ormandy.patch 
Log Message:
fix several vulnerabilities


libtiff-3.7.1-ormandy.patch:
 tif_aux.c      |   19 +++++++++
 tif_dir.c      |   21 ++++++----
 tif_dirinfo.c  |    6 ++-
 tif_dirread.c  |  111 ++++++++++++++++++++++++++++++++++++++++++++-------------
 tif_fax3.c     |    9 ++++
 tif_jpeg.c     |   54 ++++++++++++++++++++++++---
 tif_next.c     |    7 +++
 tif_pixarlog.c |   14 ++++++-
 tif_read.c     |   18 ++++++++-
 tiffiop.h      |    2 +
 10 files changed, 213 insertions(+), 48 deletions(-)

--- NEW FILE libtiff-3.7.1-ormandy.patch ---
--- tiff-3.7.1/libtiff/tiffiop.h.ormandy	2006-08-01 17:37:17.000000000 -0400
+++ tiff-3.7.1/libtiff/tiffiop.h	2006-08-01 17:37:19.000000000 -0400
@@ -257,6 +257,8 @@
 GLOBALDATA(TIFFErrorHandler,_TIFFwarningHandler);
 GLOBALDATA(TIFFErrorHandler,_TIFFerrorHandler);
 
+extern	tdata_t _TIFFCheckMalloc(TIFF*, size_t, size_t, const char*);
+
 extern	int TIFFInitDumpMode(TIFF*, int);
 #ifdef PACKBITS_SUPPORT
 extern	int TIFFInitPackBits(TIFF*, int);
--- tiff-3.7.1/libtiff/tif_dir.c.ormandy	2004-12-04 04:27:59.000000000 -0500
+++ tiff-3.7.1/libtiff/tif_dir.c	2006-08-01 17:32:22.000000000 -0400
@@ -122,6 +122,7 @@
 {
 	static const char module[] = "_TIFFVSetField";
 	
+	const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
 	TIFFDirectory* td = &tif->tif_dir;
 	int status = 1;
 	uint32 v32;
@@ -216,11 +217,13 @@
 		_TIFFsetString(&td->td_copyright, va_arg(ap, char*));
 		break;
 	case TIFFTAG_ORIENTATION:
-		v = va_arg(ap, int);
+		v = va_arg(ap, int);	
+		const TIFFFieldInfo* fip;
 		if (v < ORIENTATION_TOPLEFT || ORIENTATION_LEFTBOT < v) {
+		  fip = _TIFFFieldWithTag(tif, tag);
 			TIFFWarning(tif->tif_name,
 			    "Bad value %ld for \"%s\" tag ignored",
-			    v, _TIFFFieldWithTag(tif, tag)->field_name);
+				    v, fip ? fip->field_name : "Unknown");
 		} else
 			td->td_orientation = (uint16) v;
 		break;
@@ -503,7 +506,7 @@
 		TIFFError(module,
 		    "%s: Invalid %stag \"%s\" (not supported by codec)",
 		    tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "",
-		    _TIFFFieldWithTag(tif, tag)->field_name);
+			  fip ? fip->field_name : "Unknown");
 		status = 0;
 		break;
             }
@@ -622,7 +625,7 @@
 			  "%s: Pass by value is not implemented.",
 			  tif->tif_name);
 
-                tv->value = _TIFFmalloc(tv_size * tv->count);
+                tv->value = _TIFFCheckMalloc(tif, tv_size, tv->count, "Tag value");
 		if (!tv->value) {
 			status = 0;
 			goto end;
@@ -633,7 +636,7 @@
           }
 	}
 	if (status) {
-            TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
+            TIFFSetFieldBit(tif, fip->field_bit);
             tif->tif_flags |= TIFF_DIRTYDIRECT;
 	}
 
@@ -642,17 +645,17 @@
 	return (status);
 badvalue:
 	TIFFError(module, "%s: Bad value %d for \"%s\"",
-		  tif->tif_name, v, _TIFFFieldWithTag(tif, tag)->field_name);
+		  tif->tif_name, v, fip ? fip->field_name : "Unknown");
 	va_end(ap);
 	return (0);
 badvalue32:
 	TIFFError(module, "%s: Bad value %ld for \"%s\"",
-		   tif->tif_name, v32, _TIFFFieldWithTag(tif, tag)->field_name);
+		  tif->tif_name, v32, fip ? fip->field_name : "Unknown");
 	va_end(ap);
 	return (0);
 badvaluedbl:
 	TIFFError(module, "%s: Bad value %f for \"%s\"",
-		  tif->tif_name, d, _TIFFFieldWithTag(tif, tag)->field_name);
+		  tif->tif_name, d, fip ? fip->field_name : "Unknown");
 	va_end(ap);
 	return (0);
 }
@@ -988,7 +991,7 @@
                 TIFFError("_TIFFVGetField",
                           "%s: Invalid %stag \"%s\" (not supported by codec)",
                           tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "",
-                          _TIFFFieldWithTag(tif, tag)->field_name);
+                          fip ? fip->field_name : "Unknown");
                 ret_val = 0;
                 break;
             }
--- tiff-3.7.1/libtiff/tif_pixarlog.c.ormandy	2006-08-01 17:32:22.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_pixarlog.c	2006-08-01 17:32:22.000000000 -0400
@@ -768,7 +768,19 @@
 	if (tif->tif_flags & TIFF_SWAB)
 		TIFFSwabArrayOfShort(up, nsamples);
 
-	for (i = 0; i < nsamples; i += llen, up += llen) {
+	/* 
+	 * if llen is not an exact multiple of nsamples, the decode operation
+	 * may overflow the output buffer, so truncate it enough to prevent that
+	 * but still salvage as much data as possible.
+	 * -- taviso at google.com 14th June 2006
+	 */
+	if (nsamples % llen) 
+		TIFFWarning(module,
+				"%s: stride %lu is not a multiple of sample count, "
+				"%lu, data truncated.", tif->tif_name, llen, nsamples);
+				
+	
+	for (i = 0; i < nsamples - (nsamples % llen); i += llen, up += llen) {
 		switch (sp->user_datafmt)  {
 		case PIXARLOGDATAFMT_FLOAT:
 			horizontalAccumulateF(up, llen, sp->stride,
--- tiff-3.7.1/libtiff/tif_next.c.ormandy	2004-11-07 06:08:36.000000000 -0500
+++ tiff-3.7.1/libtiff/tif_next.c	2006-08-01 17:32:22.000000000 -0400
@@ -105,11 +105,16 @@
 			 * as codes of the form <color><npixels>
 			 * until we've filled the scanline.
 			 */
+			/*
+			 * Ensure the run does not exceed the scanline
+			 * bounds, potentially resulting in a security issue.
+			 * -- taviso at google.com 14 Jun 2006.
+			 */
 			op = row;
 			for (;;) {
 				grey = (n>>6) & 0x3;
 				n &= 0x3f;
-				while (n-- > 0)
+				while (n-- > 0 && npixels < imagewidth)
 					SETPIXEL(op, grey);
 				if (npixels >= (int) imagewidth)
 					break;
--- tiff-3.7.1/libtiff/tif_aux.c.ormandy	2006-08-01 17:35:40.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_aux.c	2006-08-01 17:35:49.000000000 -0400
@@ -33,6 +33,25 @@
 #include "tif_predict.h"
 #include <math.h>
 
+tdata_t
+_TIFFCheckMalloc(TIFF* tif, size_t nmemb, size_t elem_size, const char* what)
+{
+	tdata_t *cp = NULL;
+	tsize_t	bytes = nmemb * elem_size;
+
+	/*
+	 * XXX: Check for integer overflow.
+	 */
+	if (nmemb && elem_size && bytes / elem_size == nmemb)
+		cp = _TIFFmalloc(bytes);
+
+	if (cp == NULL)
+		TIFFError(tif->tif_name, "No space %s", what);
+	
+	return (cp);
+}
+
+
 static int
 TIFFDefaultTransferFunction(TIFFDirectory* td)
 {
--- tiff-3.7.1/libtiff/tif_read.c.ormandy	2004-10-02 09:52:29.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_read.c	2006-08-01 17:32:22.000000000 -0400
@@ -31,6 +31,8 @@
 #include "tiffiop.h"
 #include <stdio.h>
 
+#include <limits.h>
+
 	int TIFFFillStrip(TIFF*, tstrip_t);
 	int TIFFFillTile(TIFF*, ttile_t);
 static	int TIFFStartStrip(TIFF*, tstrip_t);
@@ -272,7 +274,13 @@
 		if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
 			_TIFFfree(tif->tif_rawdata);
 		tif->tif_flags &= ~TIFF_MYBUFFER;
-		if ( td->td_stripoffset[strip] + bytecount > tif->tif_size) {
+		/*
+		 * This sanity check could potentially overflow, causing an OOB read.
+		 * verify that offset + bytecount is > offset.
+		 * -- taviso at google.com 14 Jun 2006
+		 */
+		if ( td->td_stripoffset[strip] + bytecount > tif->tif_size ||
+			bytecount > (UINT_MAX - td->td_stripoffset[strip])) {
 			/*
 			 * This error message might seem strange, but it's
 			 * what would happen if a read were done instead.
@@ -470,7 +478,13 @@
 		if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
 			_TIFFfree(tif->tif_rawdata);
 		tif->tif_flags &= ~TIFF_MYBUFFER;
-		if ( td->td_stripoffset[tile] + bytecount > tif->tif_size) {
+		/*
+		 * We must check this calculation doesnt overflow, potentially
+		 * causing an OOB read.
+		 * -- taviso at google.com 15 Jun 2006
+		 */
+		if (td->td_stripoffset[tile] + bytecount > tif->tif_size ||
+			bytecount > (UINT_MAX - td->td_stripoffset[tile])) {
 			tif->tif_curtile = NOTILE;
 			return (0);
 		}
--- tiff-3.7.1/libtiff/tif_dirread.c.ormandy	2006-08-01 17:32:22.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_dirread.c	2006-08-01 17:32:22.000000000 -0400
@@ -29,6 +29,9 @@
  *
  * Directory Read Support Routines.
  */
+
+#include <limits.h>
+
 #include "tiffiop.h"
 
 #define	IGNORE	0		/* tag placeholder used below */
@@ -103,6 +106,7 @@
 	toff_t nextdiroff;
 	char* cp;
 	int diroutoforderwarning = 0;
+	int compressionknown = 0;
 	toff_t* new_dirlist;
 
 	tif->tif_diroff = tif->tif_nextdiroff;
@@ -170,13 +174,21 @@
 	} else {
 		toff_t off = tif->tif_diroff;
 
-		if (off + sizeof (uint16) > tif->tif_size) {
-			TIFFError(module,
-			    "%s: Can not read TIFF directory count",
-                            tif->tif_name);
-			return (0);
-		} else
-			_TIFFmemcpy(&dircount, tif->tif_base + off, sizeof (uint16));
+ 		/*
+ 		 * Check for integer overflow when validating the dir_off, otherwise
+ 		 * a very high offset may cause an OOB read and crash the client.
+ 		 * -- taviso at google.com, 14 Jun 2006.
+ 		 */
+ 		if (off + sizeof (uint16) > tif->tif_size || 
+ 			off > (UINT_MAX - sizeof(uint16))) {
+ 				TIFFError(module,
+					  "%s: Can not read TIFF directory count",
+					  tif->tif_name);
+ 				return (0);
+  		} else
+ 			_TIFFmemcpy(&dircount, tif->tif_base + off,
+ 					sizeof (uint16));
+
 		off += sizeof (uint16);
 		if (tif->tif_flags & TIFF_SWAB)
 			TIFFSwabShort(&dircount);
@@ -276,6 +288,7 @@
 		while (fix < tif->tif_nfields &&
 		       tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
 			fix++;
+
 		if (fix >= tif->tif_nfields ||
 		    tif->tif_fieldinfo[fix]->field_tag != dp->tdir_tag) {
 
@@ -284,11 +297,17 @@
                                 tif->tif_name, dp->tdir_tag, dp->tdir_tag,
                                 dp->tdir_type);
 
-                    TIFFMergeFieldInfo( tif,
-                                        _TIFFCreateAnonFieldInfo( tif,
-                                              dp->tdir_tag,
-					      (TIFFDataType) dp->tdir_type ),
-                                        1 );
+ 					/*
+ 					 * Creating anonymous fields prior to knowing the compression
+ 					 * algorithm (ie, when the field info has been merged) could cause
+ 					 * crashes with pathological directories.
+ 					 * -- taviso at google.com 15 Jun 2006
+ 					 */
+ 					if (compressionknown)
+ 			                    TIFFMergeFieldInfo(tif, _TIFFCreateAnonFieldInfo(tif, dp->tdir_tag, 
+ 						(TIFFDataType) dp->tdir_type), 1 );
+ 					else goto ignore;
+ 		    
                     fix = 0;
                     while (fix < tif->tif_nfields &&
                            tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
@@ -345,6 +364,7 @@
 				    dp->tdir_type, dp->tdir_offset);
 				if (!TIFFSetField(tif, dp->tdir_tag, (uint16)v))
 					goto bad;
+				else compressionknown++;
 				break;
 			/* XXX: workaround for broken TIFFs */
 			} else if (dp->tdir_type == TIFF_LONG) {
@@ -555,6 +575,7 @@
 	 * Attempt to deal with a missing StripByteCounts tag.
 	 */
 	if (!TIFFFieldSet(tif, FIELD_STRIPBYTECOUNTS)) {
+		const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
 		/*
 		 * Some manufacturers violate the spec by not giving
 		 * the size of the strips.  In this case, assume there
@@ -571,7 +592,7 @@
 			"%s: TIFF directory is missing required "
 			"\"%s\" field, calculating from imagelength",
 			tif->tif_name,
-		        _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+		        fip ? fip->field_name : "Unknown");
 		if (EstimateStripByteCounts(tif, dir, dircount) < 0)
 		    goto bad;
 /*
@@ -591,7 +612,9 @@
       (tif->tif_mode == O_RDONLY && \
        td->td_compression == COMPRESSION_NONE && \
        td->td_stripbytecount[0] < TIFFScanlineSize(tif) * td->td_imagelength) )
-	} else if (td->td_nstrips == 1 && BYTECOUNTLOOKSBAD) {
+	} else if (td->td_nstrips == 1 && BYTECOUNTLOOKSBAD) {	
+	  const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
+
 		/*
 		 * Plexus (and others) sometimes give a value
 		 * of zero for a tag when they don't know what
@@ -602,7 +625,7 @@
 		TIFFWarning(module,
 	"%s: Bogus \"%s\" field, ignoring and calculating from imagelength",
                             tif->tif_name,
-		            _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+		            fip ? fip->field_name : "Unknown");
 		if(EstimateStripByteCounts(tif, dir, dircount) < 0)
 		    goto bad;
 	}
@@ -693,7 +716,13 @@
 
 	register TIFFDirEntry *dp;
 	register TIFFDirectory *td = &tif->tif_dir;
-	uint16 i;
+	
+	/* i is used to iterate over td->td_nstrips, so must be
+	 * at least the same width.
+	 * -- taviso at google.com 15 Jun 2006
+	 */
+
+	uint32 i;
 
 	if (td->td_stripbytecount)
 		_TIFFfree(td->td_stripbytecount);
@@ -770,16 +799,18 @@
 static int
 CheckDirCount(TIFF* tif, TIFFDirEntry* dir, uint32 count)
 {
+ 	const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
+ 
 	if (count > dir->tdir_count) {
 		TIFFWarning(tif->tif_name,
 	"incorrect count for field \"%s\" (%lu, expecting %lu); tag ignored",
-		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
+			    fip ? fip->field_name : "Unknown",
 		    dir->tdir_count, count);
 		return (0);
 	} else if (count < dir->tdir_count) {
 		TIFFWarning(tif->tif_name,
 	"incorrect count for field \"%s\" (%lu, expecting %lu); tag trimmed",
-		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
+			    fip ? fip->field_name : "Unknown",
 		    dir->tdir_count, count);
 		return (1);
 	}
@@ -793,6 +824,7 @@
 TIFFFetchData(TIFF* tif, TIFFDirEntry* dir, char* cp)
 {
 	int w = TIFFDataWidth((TIFFDataType) dir->tdir_type);
+	const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
 	tsize_t cc = dir->tdir_count * w;
 
 	/* Check for overflow. */
@@ -835,7 +867,7 @@
 	return (cc);
 bad:
 	TIFFError(tif->tif_name, "Error fetching data for field \"%s\"",
-	    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+		  fip ? fip->field_name : "Unknown");
 	return ((tsize_t) 0);
 }
 
@@ -861,10 +893,13 @@
 static int
 cvtRational(TIFF* tif, TIFFDirEntry* dir, uint32 num, uint32 denom, float* rv)
 {
+	const TIFFFieldInfo* fip;
+
 	if (denom == 0) {
+	        fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
 		TIFFError(tif->tif_name,
 		    "%s: Rational with zero denominator (num = %lu)",
-		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, num);
+			  fip ? fip->field_name : "Unknown", num);
 		return (0);
 	} else {
 		if (dir->tdir_type == TIFF_RATIONAL)
@@ -982,6 +1017,20 @@
 {
 	uint16 v[4];
 	int ok = 0;
+ 	/*
+ 	 * Prevent overflowing the v stack arrays below by performing a sanity
+ 	 * check on tdir_count, this should never be greater than two.
+ 	 * -- taviso at google.com 14 Jun 2006.
+ 	 */
+ 	if (dir->tdir_count > 2) {
+ 		const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
+ 		TIFFWarning(tif->tif_name,
+ 				"unexpected count for field \"%s\", %lu, expected 2; ignored.",
+ 				fip ? fip->field_name : "Unknown",
+ 				dir->tdir_count);
+ 		return 0;
+ 	}
+ 
 
 	switch (dir->tdir_type) {
 	case TIFF_SHORT:
@@ -1148,13 +1197,16 @@
 	case TIFF_DOUBLE:
 		return (TIFFFetchDoubleArray(tif, dir, (double*) v));
 	default:
+	        { 
+                const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
 		/* TIFF_NOTYPE */
 		/* TIFF_ASCII */
 		/* TIFF_UNDEFINED */
 		TIFFError(tif->tif_name,
 		    "cannot read TIFF_ANY type %d for field \"%s\"",
-		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+			  fip ? fip->field_name : "Unknown");
 		return (0);
+                }
 	}
 	return (1);
 }
@@ -1169,6 +1221,9 @@
 	int ok = 0;
 	const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dp->tdir_tag);
 
+	if (fip == NULL) {
+		return (0);
+	}
 	if (dp->tdir_count > 1) {		/* array of values */
 		char* cp = NULL;
 
@@ -1311,6 +1366,7 @@
 TIFFFetchPerSampleShorts(TIFF* tif, TIFFDirEntry* dir, uint16* pl)
 {
     uint16 samples = tif->tif_dir.td_samplesperpixel;
+    const TIFFFieldInfo* fip;
     int status = 0;
 
     if (CheckDirCount(tif, dir, (uint32) samples)) {
@@ -1327,10 +1383,11 @@
                 check_count = samples;
 
             for (i = 1; i < check_count; i++)
-                if (v[i] != v[0]) {
+                if (v[i] != v[0]) {	
+		    fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
                     TIFFError(tif->tif_name,
                               "Cannot handle different per-sample values for field \"%s\"",
-                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                              fip ? fip->field_name : "Unknown");
                     goto bad;
                 }
             *pl = v[0];
@@ -1352,6 +1409,7 @@
 TIFFFetchPerSampleLongs(TIFF* tif, TIFFDirEntry* dir, uint32* pl)
 {
     uint16 samples = tif->tif_dir.td_samplesperpixel;
+    const TIFFFieldInfo* fip;
     int status = 0;
 
     if (CheckDirCount(tif, dir, (uint32) samples)) {
@@ -1369,9 +1427,10 @@
                 check_count = samples;
             for (i = 1; i < check_count; i++)
                 if (v[i] != v[0]) {
+		    fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
                     TIFFError(tif->tif_name,
                               "Cannot handle different per-sample values for field \"%s\"",
-                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                              fip ? fip->field_name : "Unknown");
                     goto bad;
                 }
             *pl = v[0];
@@ -1393,6 +1452,7 @@
 TIFFFetchPerSampleAnys(TIFF* tif, TIFFDirEntry* dir, double* pl)
 {
     uint16 samples = tif->tif_dir.td_samplesperpixel;
+    const TIFFFieldInfo* fip;
     int status = 0;
 
     if (CheckDirCount(tif, dir, (uint32) samples)) {
@@ -1410,9 +1470,10 @@
 
             for (i = 1; i < check_count; i++)
                 if (v[i] != v[0]) {
+		    fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
                     TIFFError(tif->tif_name,
                               "Cannot handle different per-sample values for field \"%s\"",
-                              _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+                              fip ? fip->field_name : "Unknown");
                     goto bad;
                 }
             *pl = v[0];
--- tiff-3.7.1/libtiff/tif_jpeg.c.ormandy	2006-08-01 17:32:22.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_jpeg.c	2006-08-01 17:32:22.000000000 -0400
@@ -691,8 +691,8 @@
 		segment_width = TIFFhowmany(segment_width, sp->h_sampling);
 		segment_height = TIFFhowmany(segment_height, sp->v_sampling);
 	}
-	if (sp->cinfo.d.image_width != segment_width ||
-	    sp->cinfo.d.image_height != segment_height) {
+	if (sp->cinfo.d.image_width < segment_width ||
+	    sp->cinfo.d.image_height < segment_height) {
 		TIFFWarning(module, 
                  "Improper JPEG strip/tile size, expected %dx%d, got %dx%d",
                           segment_width, 
@@ -700,6 +700,22 @@
                           sp->cinfo.d.image_width, 
                           sp->cinfo.d.image_height);
 	}
+ 	if (sp->cinfo.d.image_width > segment_width ||
+	    sp->cinfo.d.image_height > segment_height) {
+ 		/*
+ 		 * This case could be dangerous, if the strip or tile size has been
+ 		 * reported as less than the amount of data jpeg will return, some
+ 		 * potential security issues arise. Catch this case and error out.
+ 		 * -- taviso at google.com 14 Jun 2006
+ 		 */
+ 		TIFFError(module, 
+			  "JPEG strip/tile size exceeds expected dimensions,"
+			  "expected %dx%d, got %dx%d", segment_width, segment_height,
+			  sp->cinfo.d.image_width, sp->cinfo.d.image_height);
+ 		return (0);
+  	}
+
+
 	if (sp->cinfo.d.num_components !=
 	    (td->td_planarconfig == PLANARCONFIG_CONTIG ?
 	     td->td_samplesperpixel : 1)) {
@@ -721,6 +737,22 @@
                                     sp->cinfo.d.comp_info[0].v_samp_factor,
                                     sp->h_sampling, sp->v_sampling);
 
+				/*
+				 * There are potential security issues here for decoders that
+				 * have already allocated buffers based on the expected sampling
+				 * factors. Lets check the sampling factors dont exceed what
+				 * we were expecting.
+				 * -- taviso at google.com 14 June 2006
+				 */
+				if (sp->cinfo.d.comp_info[0].h_samp_factor > sp->h_sampling ||
+					sp->cinfo.d.comp_info[0].v_samp_factor > sp->v_sampling) {
+						TIFFError(module,
+							"Cannot honour JPEG sampling factors that"
+							" exceed those specified.");
+						return (0);
+				}
+
+
 			    /*
 			     * XXX: Files written by the Intergraph software
 			     * has different sampling factors stored in the
@@ -1353,15 +1385,18 @@
 {
 	JPEGState *sp = JState(tif);
 	
-	assert(sp != 0);
+	/* 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);
+	if (sp != NULL) {
+		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;
 }
@@ -1371,6 +1406,7 @@
 {
 	JPEGState* sp = JState(tif);
 	TIFFDirectory* td = &tif->tif_dir;
+	const TIFFFieldInfo* fip;
 	uint32 v32;
 
 	switch (tag) {
@@ -1527,6 +1563,10 @@
 {
 	JPEGState* sp = JState(tif);
 
+ 	if (sp == NULL) {
+  		TIFFWarning("JPEGPrintDir", "Unknown JPEGState");
+ 		return;
+ 	}
 	(void) flags;
 	if (TIFFFieldSet(tif,FIELD_JPEGTABLES))
 		fprintf(fd, "  JPEG Tables: (%lu bytes)\n",
--- tiff-3.7.1/libtiff/tif_fax3.c.ormandy	2006-08-01 17:32:22.000000000 -0400
+++ tiff-3.7.1/libtiff/tif_fax3.c	2006-08-01 17:32:22.000000000 -0400
@@ -1133,6 +1133,7 @@
 Fax3VSetField(TIFF* tif, ttag_t tag, va_list ap)
 {
 	Fax3BaseState* sp = Fax3State(tif);
+	const TIFFFieldInfo* fip;
 
 	assert(sp != 0);
 	assert(sp->vsetparent != 0);
@@ -1175,7 +1176,13 @@
 	default:
 		return (*sp->vsetparent)(tif, tag, ap);
 	}
-	TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
+	
+	if ((fip = _TIFFFieldWithTag(tif, tag))) {
+		TIFFSetFieldBit(tif, fip->field_bit);
+	} else {
+		return (0);
+	}
+
 	tif->tif_flags |= TIFF_DIRTYDIRECT;
 	return (1);
 }
--- tiff-3.7.1/libtiff/tif_dirinfo.c.ormandy	2004-11-12 12:33:53.000000000 -0500
+++ tiff-3.7.1/libtiff/tif_dirinfo.c	2006-08-01 17:32:22.000000000 -0400
@@ -465,7 +465,8 @@
 		TIFFError("TIFFFieldWithTag",
 			  "Internal error, unknown tag 0x%x",
                           (unsigned int) tag);
-		assert(fip != NULL);
+		/* assert(fip != NULL); */
+
 		/*NOTREACHED*/
 	}
 	return (fip);
@@ -479,7 +480,8 @@
 	if (!fip) {
 		TIFFError("TIFFFieldWithName",
 			  "Internal error, unknown tag %s", field_name);
-		assert(fip != NULL);
+		/* assert(fip != NULL); */
+		
 		/*NOTREACHED*/
 	}
 	return (fip);


Index: libtiff.spec
===================================================================
RCS file: /cvs/dist/rpms/libtiff/FC-4/libtiff.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libtiff.spec	26 May 2006 03:23:16 -0000	1.31
+++ libtiff.spec	1 Aug 2006 21:43:15 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating TIFF format image files.
 Name: libtiff
 Version: 3.7.1
-Release: 6.fc4.2
+Release: 6.fc4.3
 License: distributable
 Group: System Environment/Libraries
 Source0: http://www.libtiff.org/tiff-%{version}.tar.gz
@@ -15,6 +15,7 @@
 Patch5: tiff-3.7.1-multiple.patch
 Patch6: tiff-3.6.1-color.patch
 Patch7: tiffsplit-overflow.patch
+Patch8: libtiff-3.7.1-ormandy.patch
 URL: http://www.libtiff.org/
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: zlib-devel zlib libjpeg-devel libjpeg
@@ -55,6 +56,7 @@
 %patch5 -p1 -b .multiple
 %patch6 -p0 -b .color
 %patch7 -p1 -b .overflow
+%patch8 -p1 -b .ormandy
 
 %build
 
@@ -93,6 +95,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug  1 2006 Matthias Clasen <mclasen at redhat.com>
+- Fix several vulnerabilities (CVE-2006-3460 CVE-2006-3461
+  CVE-2006-3462 CVE-2006-3463 CVE-2006-3464 CVE-2006-3465)
+
 * Thu May 25 2006 Matthias Clasen <mclasen at redhat.com>
 - Fix an overflow in tiffsplit (#193167)
 



From fedora-cvs-commits at redhat.com  Tue Aug  1 21:59:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 17:59:59 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.39,
	1.40 weak-modules, 1.12, 1.13
Message-ID: <200608012159.k71LxxHC018123@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17968

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
reverted back to script weak-modules to avoid python dep (oh well...).



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- module-init-tools.spec	1 Aug 2006 09:55:32 -0000	1.39
+++ module-init-tools.spec	1 Aug 2006 21:59:56 -0000	1.40
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.14
+Release: 0.pre1.4.15
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,11 +98,8 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
-* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.14
-- Fix remove of modules in weak-modules (broken symlinks).
-- Fix depmod handling so we only call once per kernel.
-- Check explicitly if we're trying to install a non-SMP module on an SMP kernel.
-- Change dependency calculation in weak-modules so it doesn't use RPM.
+* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.15
+- Reverted back to script based weak-updates to avoid python dep.
 
 * Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.6
 - Don't call depmod on removing a kernel.


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- weak-modules	1 Aug 2006 09:55:32 -0000	1.12
+++ weak-modules	1 Aug 2006 21:59:56 -0000	1.13
@@ -1,41 +1,112 @@
-#!/usr/bin/python
+#!/bin/bash
 #
-# weak-modules - Red Hat kABI comparison tool
+# weak-modules - determine which modules are kABI compatible with installed
+#                kernels and set up the symlinks in /lib/*/weak-updates.
 #
-# Author: Jon Masters <jcm at redhat.com>
-#
-# When we add and remove kernels from the system, we need to ensure that we
-# keep the symbolic links in /lib/modules up to date. This script magically
-# checks the ABI compatibility of weak-updates and symlinks as appropriate.
-#
-# This software may be freely redistributed under the terms of the GNU
-# General Public License (GPL).
 
-__author__ = "Jon Masters <jcm at redhat.com>"
-__version__ = "2.6"
-__date__ = "2006/08/01 10:54:00"
-__copyright__ = "Copyright (C) 2006 Red Hat, Inc"
-__license__ = "GPL"
-
-import commands
-import getopt
-import os
-import re
-import sha
-import string
-import sys
-
-true = 1
-false = 0
-
-dry_run = "no"
-verbose = "no"
-
-def usage():
-	"""Usage for weak-modules script"""
-	print "usage:\t" + sys.argv[0] + " [options] {--add-modules|--remove-modules}"
-	print "\t" + sys.argv[0] + " [options] {--add-kernel|--remove-kernel} {kernel-release}"
-	print """
+unset LANG LC_ALL LC_COLLATE
+
+tmpdir=$(mktemp -td ${0##*/}.XXXXXX)
+trap "rm -rf $tmpdir" EXIT
+unset ${!changed_modules_*} ${!changed_initrd_*}
+
+# read_modules_list:
+# Read in a list of modules from standard input. Convert the filenames into
+# absolute paths and compute the kernel release for each module (either using
+# the modinfo section or through the absolute path.
+read_modules_list() {
+    local IFS=$'\n'
+    modules=($(cat))
+
+    for ((n = 0; n < ${#modules[@]}; n++)); do
+        if [ ${modules[n]:0:1} != '/' ]; then
+            modules[n]="$PWD/${modules[n]}"
+        fi
+        if [ -f "${modules[n]}" ]; then
+            module_krels[n]=$(krel_of_module ${modules[n]})
+        else
+            # Try to extract the kernel release from the path
+            set -- "${modules[n]#/lib/modules/}"
+            module_krels[n]=${1%%/*}
+        fi
+    done
+}
+
+# krel_of_module:
+# Compute the kernel release of a module.
+krel_of_module() {
+    declare module=$1
+    /sbin/modinfo -F vermagic "$module" | awk '{print $1}'
+}
+
+# module_is_compatible:
+# Determine if a module is compatible with a particular kernel release. Also
+# include any symbol deps that might be introduced by other external KMPs.
+module_is_compatible() {
+    declare module=$1 krel=$2 module_krel=$(krel_of_module "$module")
+
+    if [ ! -e "$tmpdir/all-symvers-$krel-$module_krel" ]; then
+        # Symbols exported by the "new" kernel
+        if [ ! -e $tmpdir/symvers-$krel ]; then
+            if [ -e /boot/symvers-$krel.gz ]; then
+                zcat /boot/symvers-$krel.gz \
+                | sed -r -ne 's:^(0x[0-9a-f]+\t[0-9a-zA-Z_]+)\t.*:\1:p'
+            fi > $tmpdir/symvers-$krel
+        fi
+
+        # Symbols that other add-on modules of the "old" kernel export
+        # (and that this module may require)
+        if [ ! -e "$tmpdir/extra-symvers-$module_krel" ]; then
+            if [ -e /lib/modules/$module_krel/extra ]; then
+                find /lib/modules/$module_krel/extra -name '*.ko' \
+                | xargs nm \
+                | sed -nre 's:^([0-9a-f]+) A __crc_(.*):0x\1 \2:p'
+            fi > $tmpdir/extra-symvers-$module_krel
+        fi
+
+        sort -u $tmpdir/symvers-$krel $tmpdir/extra-symvers-$module_krel \
+        > "$tmpdir/all-symvers-$krel-$module_krel"
+    fi
+
+    # If the module does not have modversions enabled, $tmpdir/modvers
+    # will be empty.
+    /sbin/modprobe --dump-modversions "$module" \
+    | sed -r -e 's:^(0x[0-9a-f]+\t.*):\1:' \
+    | sort -u \
+    > $tmpdir/modvers
+
+    # Only include lines of the second file in the output that don't
+    # match lines in the first file. (The default separator is
+    # <space>, so we are matching the whole line.)
+    join -j 1 -v 2 $tmpdir/all-symvers-$krel-$module_krel \
+                   $tmpdir/modvers > $tmpdir/join
+
+    if [ ! -s $tmpdir/modvers ]; then
+        echo "Warning: Module ${module##*/} from kernel $module_krel has no" \
+             "modversions, so it cannot be reused for kernel $krel" >&2
+    elif [ -s $tmpdir/join ]; then
+        [ -n "$verbose" ] &&
+        echo "Module ${module##*/} from kernel $module_krel is not compatible" \             "with kernel $krel in symbols:" $(sed -e 's:.* ::' $tmpdir/join)
+    else
+        [ -n "$verbose" ] &&
+        echo "Module ${module##*/} from kernel $module_krel is compatible" \
+             "with kernel $krel"
+        return 0
+    fi
+    return 1
+}
+
+# doit:
+# A wrapper used whenever we're going to perform a real operation.
+doit() {
+    [ -n "$verbose" ] && echo "$@"
+    [ -n "$dry_run" ] || "$@"
+}
+
+usage() {
+    echo "Usage: ${0##*/} [options] {--add-modules|--remove-modules}"
+    echo "${0##*/} [options] {--add-kernel|--remove-kernel} {kernel-release}"
+    cat <<'EOF'
 --add-modules
         Add a list of modules read from standard input. Create
         symlinks in compatible kernel's weak-updates/ directory.
@@ -48,404 +119,210 @@
 
 --add-kernel
         Add compatibility symlinks for all compatible modules to the
-        specified kernel.
+        specified or running kernel.
 
 --remove-kernel
-        Remove all compatibility symlinks for the specified kernel.
+        Remove all compatibility symlinks for the specified or current
+        kernel.
 
 --verbose
         Print the commands executed.
 
 -dry-run
         Do not create/remove any files.
-"""
+EOF
+    exit $1
+}
+
+# module_has_changed:
+# Mark if an actual change occured that we need to deal with later by calling
+# depmod or mkinitrd against the affected kernel.
+module_has_changed() {
+    declare module=$1 krel=$2
+
+    module=${module%.ko}
+    module=${module##*/}
+
+    eval "changed_modules_${krel//[^a-zA-Z0-9]/_}=$krel"
+    eval "changed_initrd_${krel//[^a-zA-Z0-9]/_}=$krel"
+}
+
+# add_modules:
+# Read in a list of modules from stdinput and process them for compatibility
+# with installed kernels under /lib/modules.
+add_modules() {
+    read_modules_list || exit 1
+    if [ ${#modules[@]} -gt 0 ]; then
+        for krel in $(ls /lib/modules/); do
+            [ -e "/boot/symvers-$krel.gz" ] || continue
+            for ((n = 0; n < ${#modules[@]}; n++)); do
+                module="${modules[n]}"
+                module_krel="${module_krels[n]}"
+                case "$module" in
+                /lib/modules/$krel/*)
+                    continue ;;
+                esac
+                subpath="${module#/lib/modules/$module_krel/extra}"
+                weak_module="/lib/modules/$krel/weak-updates/${subpath#/}"
+                if [ -r "$weak_module" ]; then
+                    weak_krel=$(krel_of_module "$weak_module")
+                    if [ "$weak_krel" != "$module_krel" ] &&
+                       [ "$(printf "%s\n" "$weak_krel" "$module_krel" \
+                            | /usr/lib/rpm/redhat/rpmsort | head -n 1)" = \
+                         "$module_krel" ]; then
+                        # Keep modules from more recent kernels.
+                        [ -n "$verbose" ] && echo \
+"Keeping module ${module##*/} from kernel $weak_krel for kernel $krel"
+                        continue
+                    fi
+                fi
+                if module_is_compatible $module $krel; then
+                    doit mkdir -p $(dirname $weak_module)
+                    doit ln -sf $module $weak_module
+                    module_has_changed $module $krel
+                fi
+            done
+        done
+    fi
+}
+
+# remove_modules:
+# Read in a list of modules from stdinput and process them for removal.
+remove_modules() {
+    read_modules_list || exit 1
+    if [ ${#modules[@]} -gt 0 ]; then
+        krels=($(ls /lib/modules/ | /usr/lib/rpm/redhat/rpmsort -r))
+        for krel in "${krels[@]}"; do
+            [ -e "/boot/symvers-$krel.gz" ] || continue
+            for ((n = 0; n < ${#modules[@]}; n++)); do
+                module="${modules[n]}"
+                module_krel="${module_krels[n]}"
+                subpath="${module#/lib/modules/$module_krel/extra}"
+                weak_module="/lib/modules/$krel/weak-updates/${subpath#/}"
+                if [ "$module" == "`readlink $weak_module`" ]; then
+                    [ -n "$verbose" ] && echo \
+"Removing compatible module ${module##*/} from kernel $krel"
+                    doit rm -f "$weak_module"
+                    for krel2 in "${krels[@]}"; do
+                        [ -e "/boot/symvers-$krel2.gz" ] || continue
+                        module="/lib/modules/$krel2/extra/$subpath"
+                        [ -e "$module" ] || continue
+                        if module_is_compatible "$module" "$krel2"; then
+                            [ -n "$verbose" ] && echo \
+"Adding compatible module ${module##*/} from kernel $krel2 instead"
+                            doit ln -s "$module" "$weak_module"
+                            break
+                        fi
+                    done
+                    doit rmdir --parents --ignore-fail-on-non-empty \
+                               "$(dirname "$weak_module")"
+                    module_has_changed $module $krel
+                fi
+            done
+        done
+    fi
+}
+
+add_kernel() {
+    add_krel=${1:-$(uname -r)}
+    if [ ! -e "/boot/symvers-$add_krel.gz" ]; then
+        echo "Symvers dump file /boot/symvers-$add_krel.gz" \
+             "not found" >&2
+        exit 1
+    fi
+    for krel in $(ls /lib/modules/ | /usr/lib/rpm/redhat/rpmsort -r); do
+        [ "$add_krel" = "$krel" ] && continue
+        [ -d /lib/modules/$krel/extra ] || continue
+        for module in $(find /lib/modules/$krel/extra -name '*.ko'); do
+            subpath="${module#/lib/modules/$krel/extra}"
+            weak_module="/lib/modules/$add_krel/weak-updates/${subpath#/}"
+            [ -e "$weak_module" ] && continue
+            if module_is_compatible $module $add_krel; then
+                doit mkdir -p $(dirname $weak_module)
+                doit ln -sf $module $weak_module
+            fi
+        done
+    done
+}
+
+remove_kernel() {
+    remove_krel=${1:-$(uname -r)}
+    weak_modules="/lib/modules/$remove_krel/weak-updates"
+    doit rm -rf "$weak_modules"
+}
+
+################################################################################
+################################## MAIN GUTS ###################################
+################################################################################
+
+options=`getopt -o h --long help,add-modules,remove-modules \
+                     --long add-kernel,remove-kernel,dry-run,verbose -- "$@"`
+
+[ $? -eq 0 ] || usage 1
+
+eval set -- "$options"
+
+while :; do
+    case "$1" in
+    --add-modules)
+        do_add_modules=1
+        ;;
+    --remove-modules)
+        do_remove_modules=1
+        ;;
+    --add-kernel)
+        do_add_kernel=1
+        ;;
+    --remove-kernel)
+        do_remove_kernel=1
+        ;;
+    --dry-run)
+        dry_run=1
+        ;;
+    --verbose)
+        verbose=1
+        ;;
+    -h|--help)
+        usage 0
+        ;;
+    --)
+        shift
+        break
+        ;;
+    esac
+    shift
+done
+
+if [ -n "$do_add_modules" ]; then
+	add_modules
+
+elif [ -n "$do_remove_modules" ]; then
+	remove_modules
+
+elif [ -n "$do_add_kernel" ]; then
+	kernel=${1:-$(uname -r)}
+	add_kernel $kernel
+
+elif [ -n "$do_remove_kernel" ]; then
+	kernel=${1:-$(uname -r)}
+	remove_kernel $kernel
+else
+	usage 1
+fi
+
+################################################################################
+###################### CLEANUP POST ADD/REMOVE MODULE/KERNEL ###################
+################################################################################
+
+# run depmod and mkinitrd as needed
+for krel in ${!changed_modules_*}; do
+    krel=${!krel}
+
+    doit /sbin/depmod -ae -F /boot/System.map-$krel $krel
+done
 
-def is_smp(module):
-	"""Determine if a given module is built for an SMP kernel"""
+for krel in ${!changed_initrd_*}; do
+    krel=${!krel}
 
-	if os.path.isfile(module):
-		minfo = os.popen("/sbin/modinfo -F vermagic " + module)
-		smp = (string.split(minfo.readline()))[1]
-		if smp == "SMP" or smp == "smp":
-			return 1
-		else:
-			return 0
-	else:
-		p = re.compile('^.*/lib/modules/([^/]*)smp.*$')
-		m = p.match(module)
-		if m:
-			return 1
-		else:
-			return 0
-	return 0
-
-def read_modules(modules):
-	"""Read a list of modules from standard input, convert the filenames
-	   into absolute names and compute the kernel release of each module."""
-
-	while true:
-		in_line = sys.stdin.readline()
-		if in_line == "":
-			break
-		if in_line == "\n":
-			continue
-		if in_line[0] != '/':
-			module=os.getcwd()+"/"+in_line[:-1]
-		else:
-			module=in_line[:-1]
-
-		# Check it the module exists, extract vermagic, otherwise try
-		# to pull the information out of the path component
-		if os.path.isfile(module):
-			minfo = os.popen("/sbin/modinfo -F vermagic " + module)
-			kver = (string.split(minfo.readline()))[0]
-		else:
-			p = re.compile('^.*/lib/modules/([^/]*).*$')
-			m = p.match(module)
-			if m:
-				kver=m.group(1)
-			else:
-				print "cannot extract kernel version!"
-				sys.exit(1)
-
-		# Store the module version in a dictionary.
-		modules[module] = {	"kver": kver,
-					"kabireq": [],
-					}
-
-def module_kabi(modules):
-	"""Calculate the kabideps for a set of modules"""
-
-	for module in modules:
-		minfo = os.popen("/sbin/modprobe --dump-modversions "+module)
-		while true:
-			in_line = minfo.readline()
-			if in_line == "":
-				break
-			symver,symbol = string.split(in_line)
-			kabireq=symbol+"="+symver
-			modules[module]["kabireq"].append(kabireq)
-		minfo.close()
-
-def kernel_kabi(kernels):
-	"""For each installed kernel, determine the full set of kABI deps for
-	   that kernel and store in a giant dictionary hash."""
-
-	kinfo = os.popen("ls /lib/modules")
-	while true:
-		kernel = (string.strip(kinfo.readline()))
-		if kernel == "":
-			break
-
-		symvers="/boot/symvers-"+kernel+".gz"
-		if not os.path.isfile(symvers):
-			# That kernel is not actually installed
-			continue
-
-		kdeps = os.popen("zcat "+symvers)
-		p = re.compile('^(0x[0-9a-f]+)\t([0-9a-zA-Z_]+)\t.*$')
-		while true:
-			in_line = kdeps.readline()
-			if in_line == "":
-				break
-			m = p.match(in_line)
-
-			if m:
-				kabi=m.group(2)+"="+m.group(1)
-				if kernels.has_key(kernel):
-					kernels[kernel].append([kabi])
-				else:
-					kernels[kernel] = [[kabi]]
-
-		kdeps.close()
-	kinfo.close()
-
-	# debug
-	#for kernel in kernels:
-	#	print "kernel " + kernel + ":"
-	#	for i in range(0,len(kernels[kernel])):
-	#		for j in range(0,len(kernels[kernel][i])):
-	#			print "\t" + kernels[kernel][i][j]
-
-def check_compatibility(modules,kernels,compatibles):
-	"""For each module, check which kernels it is compatible with."""
-
-	for module in modules:
-		for kernel in kernels:
-
-			# Add an SMP check so we don't install non-SMP modules
-			# in an SMP kernel - technically a possibile situation
-			p = re.compile('.*smp$')
-			m = p.match(kernel)
-			if m and not is_smp(module):
-					# skip over this situation
-					continue
-
-			all_matched=1
-			for i in range(0,len(modules[module]["kabireq"])):
-				module_abi=modules[module]["kabireq"][i]
-				matched=0
-				# Check this kABI req against a kernel
-				for j in range(0,len(kernels[kernel])):
-					for k in range(0,len(kernels[kernel][j])):
-						kernel_abi=kernels[kernel][j][k]
-						if kernel_abi==module_abi:
-							matched=1
-				if matched==0:
-					all_matched=0
-
-			if all_matched:
-				# All kABI deps are good
-				if compatibles.has_key(kernel):
-					compatibles[kernel].append(module)
-				else:
-					compatibles[kernel] = [module]
-
-def run_depmod(kernel):
-	"""Run depmod against kernel."""
-
-	depmod_line="/sbin/depmod -ae -F " \
-		+"/boot/System.map-"+kernel \
-		+" "+kernel
-	if verbose == "yes":
-		print "depmod: " + depmod_line
-	os.system(depmod_line)
-
-def run_mkinitrd(kernel):
-	"""Run mkinitrd against kernel."""
-
-	mkinitrd_line = "/sbin/mkinitrd --allow-missing -f /boot/initrd-"\
-			+kernel+".img "+kernel
-
-	if verbose == "yes":
-		print "mkinitrd: " + mkinitrd_line
-	os.system(mkinitrd_line)
-
-def add_modules():
-	"""Read in a list of modules to add from std input. For each module,
-	   attempt to create links in compatible kernel directories."""
-
-	modules={}
-	kernels={}
-	compatibles={}
-
-	read_modules(modules)
-	module_kabi(modules)
-	kernel_kabi(kernels)
-	check_compatibility(modules,kernels,compatibles)
-
-	#debug
-	#if verbose == "yes":
-	#	print "**** Compatible kernels ****"
-	#	for kernel in compatibles:
-	#		print kernel + ":"
-	#		for module in range(0,len(compatibles[kernel])):
-	#			print "\t" + compatibles[kernel][module]
-
-	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
-	for kernel in compatibles:
-
-		do_run_depmod="no"
-
-		for module in range(0,len(compatibles[kernel])):
-			modfile=compatibles[kernel][module]
-			m = p.match(modfile)
-			if not m:
-				print "Non-standard module location"
-				sys.exit(1)
-			mod_kern=modules[modfile]["kver"]
-			weak_dir="/lib/modules/" + kernel \
-				+ "/weak-updates/" + m.group(2)
-			weak_link=weak_dir+"/"+m.group(3)
-
-			if mod_kern != kernel:
-				# ignore the kernel that matches the module
-
-				if verbose == "yes":
-					print "create: " + weak_link
-
-				if dry_run == "no":
-					os.system("mkdir -p " + weak_dir)
-					os.system("ln -sf "+modfile+" "+ weak_link)
-					do_run_depmod="yes"
-
-		if dry_run=="no" and do_run_depmod=="yes":
-			run_depmod(kernel)
-			run_mkinitrd(kernel)
-
-def remove_modules():
-	"""Read in a list of modules to remove from std input. Remove these
-	   modules from all installed kernels"""
-
-	modules = {}
-	kernels = {}
-
-	read_modules(modules)
-	kernel_kabi(kernels)
-
-	p = re.compile('^.*/lib/modules/([^/]*)/extra/([^/]*)/(.*)$')
-	for module in modules:
-
-		m = p.match(module)
-		if not m:
-			print "Non-standard weak module location"
-			sys.exit(1)
-		weak_link=m.group(2)+"/"+m.group(3)
-
-		for kernel in kernels:
-
-			do_run_depmod="no"
-
-			weak_dir = "/lib/modules/" + kernel \
-				+ "/weak-updates/" + m.group(2)
-			weak_path = weak_dir +"/"+m.group(3)
-
-			if os.path.lexists(weak_path):
-				weak_modfile=os.readlink(weak_path)
-				if weak_modfile == module:
-					if verbose == "yes":
-						print "remove: " \
-							+ weak_dir
-					if dry_run == "no":
-						os.system("rm -rf "+weak_dir)
-						do_run_depmod="yes"
-
-			if dry_run=="no" and do_run_depmod=="yes":
-				run_depmod(kernel)
-				run_mkinitrd(kernel)	
-
-def add_kernel(kernel):
-	"""Add the (specified) system kernel and create update links."""
-
-	modules = {}
-	kernels = {}
-	compatibles = {}
-
-	if kernel == "":
-		status,kernel = commands.getstatusoutput('uname -r')
-
-	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)\.ko$')
-
-	# FIXME: at the moment, we sort the modules so that if two versions
-	# of a kmod are installed, we will end up linking the latter. In the
-	# end the module list should just be processed to prune out dups.
-
-	modfiles=os.popen("find /lib/modules | sort")
-	while true:
-		in_line=(modfiles.readline())[:-1]
-		if in_line == "":
-			break
-		m = p.match(in_line)
-		if not m:
-			continue
-		module=in_line
-
-		# Check it the module exists, extract vermagic, otherwise try
-		# to pull the information out of the path component
-		if os.path.isfile(module):
-			minfo = os.popen("/sbin/modinfo -F vermagic " + module)
-			kver = (string.split(minfo.readline()))[0]
-			minfo.close()
-
-		# Store the module version in a dictionary.
-		modules[module] = {	"kver": kver,
-					"kabireq": []
-					}
-
-	modfiles.close()
-
-	module_kabi(modules)
-	kernel_kabi(kernels)
-	check_compatibility(modules,kernels,compatibles)
-
-	if not compatibles.has_key(kernel):
-		sys.exit(0)
-
-	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
-	for module in range(0,len(compatibles[kernel])):
-		modfile=compatibles[kernel][module]
-		m = p.match(modfile)
-		if not m:
-			print "Non-standard module location"
-			sys.exit(1)
-		mod_kern=modules[modfile]["kver"]
-		weak_dir="/lib/modules/" + kernel \
-			+ "/weak-updates/" + m.group(2)
-		weak_link=weak_dir+"/"+m.group(3)
-
-		if mod_kern != kernel:
-			# ignore the kernel that matches the module
-
-			if verbose == "yes":
-				print "create: " + weak_link
-				print "     -> " + modfile
-
-			if dry_run == "no":
-				os.system("mkdir -p " + weak_dir)
-				os.system("ln -sf " + modfile + " " + weak_link)
-
-	if dry_run == "no":
-		run_depmod(kernel)
-		run_mkinitrd(kernel)
-
-def remove_kernel(kernel):
-	"""Remove the given kernel from the system."""
-	
-	weakup_dir = "/lib/modules/"+kernel+"/weak-updates"
-	if not os.path.isdir(weakup_dir):
-		sys.exit(0)
-
-	if verbose == "yes":
-		print "remove: "+weakup_dir
-
-	if dry_run == "no":
-		os.system("rm -rf "+weakup_dir)
-
-if __name__ == "__main__":
-
-	opts, args = getopt.getopt(sys.argv[1:], 'arh', [ 'add-modules', 'remove-modules', 'add-kernel=', 'remove-kernel=', 'dry-run', 'verbose', 'help' ])
-
-	do_add_modules=0
-	do_remove_modules=0
-	do_add_kernel=0
-	do_remove_kernel=0
-	kernel=""
-
-	for o, v in opts:
-		if o == '--add-modules' or o == '-a':
-			do_add_modules=1
-		if o == '--remove-modules' or o == 'r':
-			do_remove_modules=1
-		if o == '--add-kernel':
-			do_add_kernel=1
-			kernel=v
-		if o == '--remove-kernel':
-			do_remove_kernel=1
-			kernel=v
-		if o == '--dry-run':
-			dry_run="yes"
-		if o == '--verbose':
-			verbose="yes"
-		if o == '--help' or o == 'h':
-			usage()
-			sys.exit(0)
-
-	if do_add_modules==1:
-		add_modules()
-		sys.exit(0)
-
-	if do_remove_modules==1:
-		remove_modules()
-		sys.exit(0)
-
-	if do_add_kernel==1:
-		add_kernel(kernel)
-		sys.exit(0)
-
-	if do_remove_kernel==1:
-		remove_kernel(kernel)
-		sys.exit(0)
-
-	print "You didn't ask me to do anything! Here's some usage information!"
-	usage()
-	sys.exit(0)
+    doit /sbin/mkinitrd --allow-missing -f /boot/initrd-$krel.img $krel
+done



From fedora-cvs-commits at redhat.com  Tue Aug  1 22:26:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 18:26:22 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.313, 1.314 anaconda.spec, 1.439,
	1.440 sources, 1.436, 1.437
Message-ID: <200608012226.k71MQMhf005954@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
- update to 11.1.0.75-1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- .cvsignore	1 Aug 2006 01:21:30 -0000	1.313
+++ .cvsignore	1 Aug 2006 22:26:19 -0000	1.314
@@ -1 +1 @@
-anaconda-11.1.0.74.tar.bz2
+anaconda-11.1.0.75.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- anaconda.spec	1 Aug 2006 01:21:30 -0000	1.439
+++ anaconda.spec	1 Aug 2006 22:26:19 -0000	1.440
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.74
+Version: 11.1.0.75
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,12 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Aug  1 2006 Peter Jones <pjones at redhat.com> - 11.1.0.75-1
+- Fix iSCSI and MultiPath coexistance
+- Don't use mygethostbyname on ipv6 yet (dcantrell)
+- Better logging on nfsinstall and kickstart (dcantrell, #195203)
+- Remove ddc probing (clumens)
+
 * Mon Jul 31 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.74-1
 - Fix method=http vs method=ftp (pjones)
 - Various xconfig fixes (clumens, #200755 #200758)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- sources	1 Aug 2006 01:21:30 -0000	1.436
+++ sources	1 Aug 2006 22:26:20 -0000	1.437
@@ -1 +1 @@
-7701f634dd3815c240a944a1447f54bd  anaconda-11.1.0.74.tar.bz2
+c0ed341f38d65d75cfb90cc21b3c0683  anaconda-11.1.0.75.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug  1 23:16:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 19:16:45 -0400
Subject: rpms/kernel/devel linux-2.6-softcursor-persistent-alloc.patch, 1.1,
	1.2 linux-2.6-debug-singlebiterror.patch, 1.8, 1.9
Message-ID: <200608012316.k71NGjiL017183@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-softcursor-persistent-alloc.patch 
	linux-2.6-debug-singlebiterror.patch 
Log Message:
fixes based on upstream feedback

linux-2.6-softcursor-persistent-alloc.patch:
 softcursor.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

Index: linux-2.6-softcursor-persistent-alloc.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softcursor-persistent-alloc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-softcursor-persistent-alloc.patch	28 Dec 2005 23:48:23 -0000	1.1
+++ linux-2.6-softcursor-persistent-alloc.patch	1 Aug 2006 23:16:41 -0000	1.2
@@ -7,11 +7,11 @@
 -	u8 *dst, *src;
 +	u8 *dst;
 +	static u8 *src=NULL;
-+	static int allocsize=0;
++	static int allocsize = 0;
  
  	if (info->state != FBINFO_STATE_RUNNING)
  		return 0;
-@@ -31,9 +33,15 @@ int soft_cursor(struct fb_info *info, st
+@@ -31,9 +33,17 @@ int soft_cursor(struct fb_info *info, st
  	s_pitch = (cursor->image.width + 7) >> 3;
  	dsize = s_pitch * cursor->image.height;
  
@@ -24,8 +24,10 @@
 +		allocsize = dsize + sizeof(struct fb_image);
 +
 +		src = kmalloc(allocsize, GFP_ATOMIC);
-+		if (!src)
++		if (!src) {
++			allocsize = 0;
 +			return -ENOMEM;
++		}
 +	}
  
  	image = (struct fb_image *) (src + dsize);

linux-2.6-debug-singlebiterror.patch:
 slab.c |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-debug-singlebiterror.patch	22 Mar 2006 23:50:26 -0000	1.8
+++ linux-2.6-debug-singlebiterror.patch	1 Aug 2006 23:16:41 -0000	1.9
@@ -13,36 +13,34 @@
 
 Signed-off-by: Dave Jones <davej at redhat.com>
 
---- linux-2.6.16.noarch/mm/slab.c~	2006-03-22 18:29:27.000000000 -0500
-+++ linux-2.6.16.noarch/mm/slab.c	2006-03-22 18:30:58.000000000 -0500
-@@ -1516,10 +1516,33 @@ static void poison_obj(struct kmem_cache
+diff --git a/mm/slab.c b/mm/slab.c
+index 21ba060..39f1183 100644
+--- a/mm/slab.c
++++ b/mm/slab.c
+@@ -1638,10 +1638,29 @@ static void poison_obj(struct kmem_cache
  static void dump_line(char *data, int offset, int limit)
  {
  	int i;
-+	unsigned char total=0, bad_count=0;
++	unsigned char total = 0, bad_count = 0, errors = 0;
  	printk(KERN_ERR "%03x:", offset);
 -	for (i = 0; i < limit; i++)
 +	for (i = 0; i < limit; i++) {
-+		if (data[offset+i] != POISON_FREE) {
-+			total += data[offset+i];
-+			++bad_count;
++		if (data[offset + i] != POISON_FREE) {
++			total += data[offset + i];
++			bad_count++;
 +		}
  		printk(" %02x", (unsigned char)data[offset + i]);
 +	}
  	printk("\n");
++
 +	if (bad_count == 1) {
-+		switch (total) {
-+		case POISON_FREE ^ 0x01:
-+		case POISON_FREE ^ 0x02:
-+		case POISON_FREE ^ 0x04:
-+		case POISON_FREE ^ 0x08:
-+		case POISON_FREE ^ 0x10:
-+		case POISON_FREE ^ 0x20:
-+		case POISON_FREE ^ 0x40:
-+		case POISON_FREE ^ 0x80:
-+			printk (KERN_ERR "Single bit error detected. Possibly bad RAM.\n");
++		errors = total ^ POISON_FREE;
++		if (errors && !(errors & (errors-1))) {
++			printk (KERN_ERR "Single bit error detected. Probably bad RAM.\n");
 +#ifdef CONFIG_X86
-+			printk (KERN_ERR "Run memtest86 or other memory test tool.\n");
++			printk (KERN_ERR "Run memtest86+ or similar memory test tool.\n");
++#else
++			printk (KERN_ERR "Run a memory test tool.\n");
 +#endif
 +			return;
 +		}



From fedora-cvs-commits at redhat.com  Tue Aug  1 23:17:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 19:17:23 -0400
Subject: rpms/kernel/devel linux-2.6-sata-ata_device_add-oops.patch, NONE,
	1.1 kernel-2.6.spec, 1.2502, 1.2503
Message-ID: <200608012317.k71NHNAf021223@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-sata-ata_device_add-oops.patch 
Log Message:
SATA oops on boot fix

linux-2.6-sata-ata_device_add-oops.patch:
 libata-core.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-sata-ata_device_add-oops.patch ---
Subject: Fix reference of uninitialised memory in ata_device_add()
From: Dave Jones <davej at redhat.com>

ata_device_add fails, calls ata_host_remove with pointers to unitialized
memory.

Signed-off-by: Dave Jones <davej at redhat.com>
Cc: Jeff Garzik <jeff at garzik.org>
Cc: Tejun Heo <htejun at gmail.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>

--- linux-2.6/drivers/scsi/libata-core.c~	2006-07-29 12:35:32.000000000 -0400
+++ linux-2.6/drivers/scsi/libata-core.c	2006-07-29 12:39:08.000000000 -0400
@@ -5419,10 +5419,10 @@ int ata_device_add(const struct ata_prob
 		unsigned long xfer_mode_mask;
 
 		ap = ata_host_add(ent, host_set, i);
+		host_set->ports[i] = ap;
 		if (!ap)
 			goto err_out;
 
-		host_set->ports[i] = ap;
 		xfer_mode_mask =(ap->udma_mask << ATA_SHIFT_UDMA) |
 				(ap->mwdma_mask << ATA_SHIFT_MWDMA) |
 				(ap->pio_mask << ATA_SHIFT_PIO);
@@ -5532,6 +5532,8 @@ int ata_device_add(const struct ata_prob
 
 err_out:
 	for (i = 0; i < count; i++) {
+		if (!host_set->ports[i])
+			break;
 		ata_host_remove(host_set->ports[i], 1);
 		scsi_host_put(host_set->ports[i]->host);
 	}


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2502
retrieving revision 1.2503
diff -u -r1.2502 -r1.2503
--- kernel-2.6.spec	1 Aug 2006 21:32:26 -0000	1.2502
+++ kernel-2.6.spec	1 Aug 2006 23:17:21 -0000	1.2503
@@ -424,6 +424,7 @@
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
+Patch2201: linux-2.6-sata-ata_device_add-oops.patch
 Patch2202: linux-2.6-sata-ahci-suspend.patch
 
 # ACPI bits
@@ -955,6 +956,8 @@
 
 # Enable PATA ports on Promise SATA.
 %patch2200 -p1
+# Fix oops on startup
+%patch2201 -p1
 # Fix AHCI Suspend.
 %patch2202 -p1
 
@@ -1623,6 +1626,7 @@
 %changelog
 * Tue Aug  1 2006 Dave Jones <davej at redhat.com>
 - s390 kprobes support.
+- Fix oops in libata ata_device_add()
 
 * Tue Aug  1 2006 Roland McGrath <roland at redhat.com>
 - fix bogus BUG_ON in ptrace_do_wait



From fedora-cvs-commits at redhat.com  Tue Aug  1 23:22:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 19:22:56 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2503,
	1.2504 linux-2.6-lockdep-fixes.patch, 1.14, 1.15
Message-ID: <200608012322.k71NMuGP026204@cvs.devel.redhat.com>

Author: davej

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

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


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2503
retrieving revision 1.2504
diff -u -r1.2503 -r1.2504
--- kernel-2.6.spec	1 Aug 2006 23:17:21 -0000	1.2503
+++ kernel-2.6.spec	1 Aug 2006 23:22:52 -0000	1.2504
@@ -1627,6 +1627,7 @@
 * Tue Aug  1 2006 Dave Jones <davej at redhat.com>
 - s390 kprobes support.
 - Fix oops in libata ata_device_add()
+- Yet more fixes for lockdep triggered bugs.
 
 * Tue Aug  1 2006 Roland McGrath <roland at redhat.com>
 - fix bogus BUG_ON in ptrace_do_wait

linux-2.6-lockdep-fixes.patch:
 a/include/linux/skbuff.h                      |   18 +++
 a/net/core/skbuff.c                           |    7 -
 a/net/ipv6/icmp.c                             |   13 ++
 b/include/net/ip6_route.h                     |   12 +-
 b/include/net/ipv6.h                          |    3 
 b/net/dccp/ipv6.c                             |    4 
 b/net/ipv6/af_inet6.c                         |    2 
 b/net/ipv6/inet6_connection_sock.c            |    2 
 b/net/ipv6/ip6_output.c                       |  120 +++++++++++++++++---------
 b/net/ipv6/tcp_ipv6.c                         |    4 
 b/net/ipv6/udp.c                              |    3 
 linux-2.6.17-mm6/include/net/sock.h           |   33 ++++++-
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 -
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++
 linux-2.6.18-rc1/net/socket.c                 |   25 +++++
 15 files changed, 196 insertions(+), 68 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-lockdep-fixes.patch	1 Aug 2006 17:41:40 -0000	1.14
+++ linux-2.6-lockdep-fixes.patch	1 Aug 2006 23:22:52 -0000	1.15
@@ -726,3 +726,146 @@
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 Please read the FAQ at  http://www.tux.org/lkml/
 
+From: Ingo Molnar <mingo at elte.hu>
+
+Split off __icmpv6_socket's sk->sk_dst_lock class, because it gets used
+from softirqs, which is safe for __icmpv6_sockets (because they never get
+directly used via userspace syscalls), but unsafe for normal sockets.
+
+Has no effect on non-lockdep kernels.
+
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+Cc: "David S. Miller" <davem at davemloft.net>
+Cc: Jeff Garzik <jeff at garzik.org>
+Cc: Arjan van de Ven <arjan at linux.intel.com>
+Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ net/ipv6/icmp.c |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff -puN net/ipv6/icmp.c~lockdep-fix-sk_dst_check-deadlock net/ipv6/icmp.c
+--- a/net/ipv6/icmp.c~lockdep-fix-sk_dst_check-deadlock
++++ a/net/ipv6/icmp.c
+@@ -712,6 +712,11 @@ discard_it:
+ 	return 0;
+ }
+ 
++/*
++ * Special lock-class for __icmpv6_socket:
++ */
++static struct lock_class_key icmpv6_socket_sk_dst_lock_key;
++
+ int __init icmpv6_init(struct net_proto_family *ops)
+ {
+ 	struct sock *sk;
+@@ -730,6 +735,14 @@ int __init icmpv6_init(struct net_proto_
+ 
+ 		sk = per_cpu(__icmpv6_socket, i)->sk;
+ 		sk->sk_allocation = GFP_ATOMIC;
++		/*
++		 * Split off their lock-class, because sk->sk_dst_lock
++		 * gets used from softirqs, which is safe for
++		 * __icmpv6_socket (because those never get directly used
++		 * via userspace syscalls), but unsafe for normal sockets.
++		 */
++		lockdep_set_class(&sk->sk_dst_lock,
++				  &icmpv6_socket_sk_dst_lock_key);
+ 
+ 		/* Enough space for 2 64K ICMP packets, including
+ 		 * sk_buff struct overhead.
+_
+From: Arjan van de Ven <arjan at linux.intel.com>
+
+The skb_queue_head_init() function is used both in drivers for private use
+and in the core networking code.  The usage models are vastly set of
+functions that is only softirq safe; while the driver usage tends to be
+more limited to a few hardirq safe accessor functions.  Rather than
+annotating all 133+ driver usages, for now just split this lock into a per
+queue class.  This change is obviously safe and probably should make
+2.6.18.
+
+Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ include/linux/skbuff.h |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff -puN include/linux/skbuff.h~lockdep-split-the-skb_queue_head_init-lock-class include/linux/skbuff.h
+--- a/include/linux/skbuff.h~lockdep-split-the-skb_queue_head_init-lock-class
++++ a/include/linux/skbuff.h
+@@ -606,10 +606,17 @@ static inline __u32 skb_queue_len(const 
+ 
+ extern struct lock_class_key skb_queue_lock_key;
+ 
++/*
++ * This function creates a split out lock class for each invocation;
++ * this is needed for now since a whole lot of users of the skb-queue
++ * infrastructure in drivers have different locking usage (in hardirq)
++ * than the networking core (in softirq only). In the long run either the
++ * network layer or drivers should need annotation to consolidate the
++ * main types of usage into 3 classes.
++ */
+ static inline void skb_queue_head_init(struct sk_buff_head *list)
+ {
+ 	spin_lock_init(&list->lock);
+-	lockdep_set_class(&list->lock, &skb_queue_lock_key);
+ 	list->prev = list->next = (struct sk_buff *)list;
+ 	list->qlen = 0;
+ }
+_
+From: Adrian Bunk <bunk at stusta.de>
+
+On Thu, Jul 13, 2006 at 10:48:00PM -0700, Andrew Morton wrote:
+>...
+> Changes since 2.6.18-rc1-mm1:
+>...
+> +lockdep-split-the-skb_queue_head_init-lock-class.patch
+>
+>  lockdep-versus-net fix.
+>...
+
+skb_queue_lock_key is no longer used.
+
+Signed-off-by: Adrian Bunk <bunk at stusta.de>
+Acked-by: Arjan van de Ven <arjan at linux.intel.com>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ include/linux/skbuff.h |    2 --
+ net/core/skbuff.c      |    7 -------
+ 2 files changed, 9 deletions(-)
+
+diff -puN include/linux/skbuff.h~lockdep-split-the-skb_queue_head_init-lock-class-tidy include/linux/skbuff.h
+--- a/include/linux/skbuff.h~lockdep-split-the-skb_queue_head_init-lock-class-tidy
++++ a/include/linux/skbuff.h
+@@ -604,8 +604,6 @@ static inline __u32 skb_queue_len(const 
+ 	return list_->qlen;
+ }
+ 
+-extern struct lock_class_key skb_queue_lock_key;
+-
+ /*
+  * This function creates a split out lock class for each invocation;
+  * this is needed for now since a whole lot of users of the skb-queue
+diff -puN net/core/skbuff.c~lockdep-split-the-skb_queue_head_init-lock-class-tidy net/core/skbuff.c
+--- a/net/core/skbuff.c~lockdep-split-the-skb_queue_head_init-lock-class-tidy
++++ a/net/core/skbuff.c
+@@ -71,13 +71,6 @@ static kmem_cache_t *skbuff_head_cache _
+ static kmem_cache_t *skbuff_fclone_cache __read_mostly;
+ 
+ /*
+- * lockdep: lock class key used by skb_queue_head_init():
+- */
+-struct lock_class_key skb_queue_lock_key;
+-
+-EXPORT_SYMBOL(skb_queue_lock_key);
+-
+-/*
+  *	Keep out-of-line to prevent kernel bloat.
+  *	__builtin_return_address is not used because it is not always
+  *	reliable.
+_



From fedora-cvs-commits at redhat.com  Tue Aug  1 23:25:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 19:25:07 -0400
Subject: rpms/kernel/devel linux-2.6-mm-suspend-improvements.patch, NONE,
	1.1 kernel-2.6.spec, 1.2504, 1.2505
Message-ID: <200608012325.k71NP7S9026285@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-mm-suspend-improvements.patch 
Log Message:
Merge numerous patches from -mm to improve software suspend.

linux-2.6-mm-suspend-improvements.patch:
 /dev/null                    |   62 ---------
 a/arch/x86_64/kernel/e820.c  |   48 ++++++
 a/arch/x86_64/kernel/setup.c |    1 
 a/fs/cifs/connect.c          |    1 
 a/include/asm-x86_64/e820.h  |    1 
 a/include/linux/cpu.h        |    8 +
 a/include/linux/sched.h      |    8 +
 a/include/linux/suspend.h    |    8 -
 a/include/linux/swap.h       |    6 
 a/kernel/cpu.c               |  138 +++++++++++++++++---
 a/kernel/power/Makefile      |    2 
 a/kernel/power/disk.c        |    7 -
 a/kernel/power/main.c        |   10 -
 a/kernel/power/power.h       |   65 ++++++++-
 a/kernel/power/process.c     |   26 ++-
 a/kernel/power/snapshot.c    |  113 ++++++++--------
 a/kernel/power/swap.c        |  295 ++++++++++++++++++++++++++++---------------
 a/kernel/power/user.c        |   14 +-
 a/mm/page_io.c               |   25 ++-
 19 files changed, 556 insertions(+), 282 deletions(-)

--- NEW FILE linux-2.6-mm-suspend-improvements.patch ---
swsusp-write-timer.patch
swsusp-write-speedup.patch
swsusp-read-timer.patch
swsusp-read-speedup.patch
swsusp-read-speedup-fix.patch
swsusp-read-speedup-cleanup.patch
swsusp-read-speedup-cleanup-2.patch
swsusp-clean-up-browsing-of-pfns.patch
swsusp-struct-snapshot_handle-cleanup.patch
make-swsusp-avoid-memory-holes-and-reserved-memory-regions-on-x86_64.patch
make-suspend-possible-with-a-traced-process-at-a-breakpoint.patch
allow-cifsd-to-suspend-if-connection-is-lost.patch
disable-cpu-hotplug-during-suspend-2.patch
From: Andrew Morton <akpm at osdl.org>

Add some instrumentation to the swsusp writeout code to show what bandwidth
we're achieving.

Cc: Pavel Machek <pavel at ucw.cz>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 kernel/power/swap.c |   32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff -puN kernel/power/swap.c~swsusp-write-timer kernel/power/swap.c
--- a/kernel/power/swap.c~swsusp-write-timer
+++ a/kernel/power/swap.c
@@ -146,6 +146,26 @@ static void release_swap_writer(struct s
 	handle->bitmap = NULL;
 }
 
+static void show_speed(struct timeval *start, struct timeval *stop,
+			unsigned nr_pages, char *msg)
+{
+	s64 elapsed_centisecs64;
+	int centisecs;
+	int k;
+	int kps;
+
+	elapsed_centisecs64 = timeval_to_ns(stop) - timeval_to_ns(start);
+	do_div(elapsed_centisecs64, NSEC_PER_SEC / 100);
+	centisecs = elapsed_centisecs64;
+	if (centisecs == 0)
+		centisecs = 1;	/* avoid div-by-zero */
+	k = nr_pages * (PAGE_SIZE / 1024);
+	kps = (k * 100) / centisecs;
+	printk("%s %d kbytes in %d.%02d seconds (%d.%02d MB/s)\n", msg, k,
+			centisecs / 100, centisecs % 100,
+			kps / 1000, (kps % 1000) / 10);
+}
+
 static int get_swap_writer(struct swap_map_handle *handle)
 {
 	handle->cur = (struct swap_map_page *)get_zeroed_page(GFP_KERNEL);
@@ -206,17 +226,21 @@ static int flush_swap_writer(struct swap
 
 static int save_image(struct swap_map_handle *handle,
                       struct snapshot_handle *snapshot,
-                      unsigned int nr_pages)
+                      unsigned int nr_to_write)
 {
 	unsigned int m;
 	int ret;
 	int error = 0;
+	int nr_pages;
+	struct timeval start;
+	struct timeval stop;
 
-	printk("Saving image data pages (%u pages) ...     ", nr_pages);
-	m = nr_pages / 100;
+	printk("Saving image data pages (%u pages) ...     ", nr_to_write);
+	m = nr_to_write / 100;
 	if (!m)
 		m = 1;
 	nr_pages = 0;
+	do_gettimeofday(&start);
 	do {
 		ret = snapshot_read_next(snapshot, PAGE_SIZE);
 		if (ret > 0) {
@@ -228,8 +252,10 @@ static int save_image(struct swap_map_ha
 			nr_pages++;
 		}
 	} while (ret > 0);
+	do_gettimeofday(&stop);
 	if (!error)
 		printk("\b\b\b\bdone\n");
+	show_speed(&start, &stop, nr_to_write, "Wrote");
 	return error;
 }
 
_
From: Andrew Morton <akpm at osdl.org>

Switch the swsusp writeout code from 4k-at-a-time to 4MB-at-a-time.

Crufty old PIII testbox:
	12.9 MB/s -> 20.9 MB/s

Sony Vaio:
	14.7 MB/s -> 26.5 MB/s

The implementation is crude.  A better one would use larger BIOs, but wouldn't
gain any performance.

The memcpys will be mostly pipelined with the IO and basically come for free.

The ENOMEM path has not been tested.  It should be.

Cc: Pavel Machek <pavel at ucw.cz>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 include/linux/swap.h |    5 +-
 kernel/power/swap.c  |   93 +++++++++++++++++++++++++++++++++--------
 mm/page_io.c         |   23 +++++++---
 3 files changed, 97 insertions(+), 24 deletions(-)

diff -puN include/linux/swap.h~swsusp-write-speedup include/linux/swap.h
--- a/include/linux/swap.h~swsusp-write-speedup
+++ a/include/linux/swap.h
@@ -12,6 +12,8 @@
 
 struct notifier_block;
 
+struct bio;
+
 #define SWAP_FLAG_PREFER	0x8000	/* set if swap priority specified */
 #define SWAP_FLAG_PRIO_MASK	0x7fff
 #define SWAP_FLAG_PRIO_SHIFT	0
@@ -215,7 +217,8 @@ extern void swap_unplug_io_fn(struct bac
 /* linux/mm/page_io.c */
 extern int swap_readpage(struct file *, struct page *);
 extern int swap_writepage(struct page *page, struct writeback_control *wbc);
-extern int rw_swap_page_sync(int, swp_entry_t, struct page *);
+extern int rw_swap_page_sync(int rw, swp_entry_t entry, struct page *page,
+				struct bio **bio_chain);
 
 /* linux/mm/swap_state.c */
 extern struct address_space swapper_space;
diff -puN kernel/power/swap.c~swsusp-write-speedup kernel/power/swap.c
--- a/kernel/power/swap.c~swsusp-write-speedup
+++ a/kernel/power/swap.c
@@ -49,18 +49,16 @@ static int mark_swapfiles(swp_entry_t st
 {
 	int error;
 
-	rw_swap_page_sync(READ,
-			  swp_entry(root_swap, 0),
-			  virt_to_page((unsigned long)&swsusp_header));
+	rw_swap_page_sync(READ, swp_entry(root_swap, 0),
+			  virt_to_page((unsigned long)&swsusp_header), NULL);
 	if (!memcmp("SWAP-SPACE",swsusp_header.sig, 10) ||
 	    !memcmp("SWAPSPACE2",swsusp_header.sig, 10)) {
 		memcpy(swsusp_header.orig_sig,swsusp_header.sig, 10);
 		memcpy(swsusp_header.sig,SWSUSP_SIG, 10);
 		swsusp_header.image = start;
-		error = rw_swap_page_sync(WRITE,
-					  swp_entry(root_swap, 0),
-					  virt_to_page((unsigned long)
-						       &swsusp_header));
+		error = rw_swap_page_sync(WRITE, swp_entry(root_swap, 0),
+				virt_to_page((unsigned long)&swsusp_header),
+				NULL);
 	} else {
 		pr_debug("swsusp: Partition is not swap space.\n");
 		error = -ENODEV;
@@ -88,16 +86,37 @@ static int swsusp_swap_check(void) /* Th
  *	write_page - Write one page to given swap location.
  *	@buf:		Address we're writing.
  *	@offset:	Offset of the swap page we're writing to.
+ *	@bio_chain:	Link the next write BIO here
  */
 
-static int write_page(void *buf, unsigned long offset)
+static int write_page(void *buf, unsigned long offset, struct bio **bio_chain)
 {
 	swp_entry_t entry;
 	int error = -ENOSPC;
 
 	if (offset) {
+		struct page *page = virt_to_page(buf);
+
+		if (bio_chain) {
+			/*
+			 * Whether or not we successfully allocated a copy page,
+			 * we take a ref on the page here.  It gets undone in
+			 * wait_on_bio_chain().
+			 */
+			struct page *page_copy;
+			page_copy = alloc_page(GFP_ATOMIC);
+			if (page_copy == NULL) {
+				WARN_ON_ONCE(1);
+				bio_chain = NULL;	/* Go synchronous */
+				get_page(page);
+			} else {
+				memcpy(page_address(page_copy),
+					page_address(page), PAGE_SIZE);
+				page = page_copy;
+			}
+		}
 		entry = swp_entry(root_swap, offset);
-		error = rw_swap_page_sync(WRITE, entry, virt_to_page(buf));
+		error = rw_swap_page_sync(WRITE, entry, page, bio_chain);
 	}
 	return error;
 }
@@ -185,37 +204,68 @@ static int get_swap_writer(struct swap_m
 	return 0;
 }
 
-static int swap_write_page(struct swap_map_handle *handle, void *buf)
+static int wait_on_bio_chain(struct bio **bio_chain)
 {
-	int error;
+	struct bio *bio;
+	struct bio *next_bio;
+	int ret = 0;
+
+	if (bio_chain == NULL)
+		return 0;
+
+	bio = *bio_chain;
+	while (bio) {
+		struct page *page;
+
+		next_bio = bio->bi_private;
+		page = bio->bi_io_vec[0].bv_page;
+		wait_on_page_locked(page);
+		if (!PageUptodate(page) || PageError(page))
+			ret = -EIO;
+		put_page(page);
+		bio_put(bio);
+		bio = next_bio;
+	}
+	*bio_chain = NULL;
+	return ret;
+}
+
+static int swap_write_page(struct swap_map_handle *handle, void *buf,
+				struct bio **bio_chain)
+{
+	int error = 0;
 	unsigned long offset;
 
 	if (!handle->cur)
 		return -EINVAL;
 	offset = alloc_swap_page(root_swap, handle->bitmap);
-	error = write_page(buf, offset);
+	error = write_page(buf, offset, bio_chain);
 	if (error)
 		return error;
 	handle->cur->entries[handle->k++] = offset;
 	if (handle->k >= MAP_PAGE_ENTRIES) {
+		error = wait_on_bio_chain(bio_chain);
+		if (error)
+			goto out;
 		offset = alloc_swap_page(root_swap, handle->bitmap);
 		if (!offset)
 			return -ENOSPC;
 		handle->cur->next_swap = offset;
-		error = write_page(handle->cur, handle->cur_swap);
+		error = write_page(handle->cur, handle->cur_swap, NULL);
 		if (error)
-			return error;
+			goto out;
 		memset(handle->cur, 0, PAGE_SIZE);
 		handle->cur_swap = offset;
 		handle->k = 0;
 	}
-	return 0;
+out:
+	return error;
 }
 
 static int flush_swap_writer(struct swap_map_handle *handle)
 {
 	if (handle->cur && handle->cur_swap)
-		return write_page(handle->cur, handle->cur_swap);
+		return write_page(handle->cur, handle->cur_swap, NULL);
 	else
 		return -EINVAL;
 }
@@ -232,6 +282,8 @@ static int save_image(struct swap_map_ha
 	int ret;
 	int error = 0;
 	int nr_pages;
+	int err2;
+	struct bio *bio;
 	struct timeval start;
 	struct timeval stop;
 
@@ -240,11 +292,13 @@ static int save_image(struct swap_map_ha
 	if (!m)
 		m = 1;
 	nr_pages = 0;
+	bio = NULL;
 	do_gettimeofday(&start);
 	do {
 		ret = snapshot_read_next(snapshot, PAGE_SIZE);
 		if (ret > 0) {
-			error = swap_write_page(handle, data_of(*snapshot));
+			error = swap_write_page(handle, data_of(*snapshot),
+						&bio);
 			if (error)
 				break;
 			if (!(nr_pages % m))
@@ -252,8 +306,11 @@ static int save_image(struct swap_map_ha
 			nr_pages++;
 		}
 	} while (ret > 0);
+	err2 = wait_on_bio_chain(&bio);
 	do_gettimeofday(&stop);
 	if (!error)
+		error = err2;
+	if (!error)
 		printk("\b\b\b\bdone\n");
 	show_speed(&start, &stop, nr_to_write, "Wrote");
 	return error;
@@ -307,7 +364,7 @@ int swsusp_write(void)
 	error = get_swap_writer(&handle);
 	if (!error) {
 		unsigned long start = handle.cur_swap;
-		error = swap_write_page(&handle, header);
+		error = swap_write_page(&handle, header, NULL);
 		if (!error)
 			error = save_image(&handle, &snapshot,
 					header->pages - 1);
diff -puN mm/page_io.c~swsusp-write-speedup mm/page_io.c
--- a/mm/page_io.c~swsusp-write-speedup
+++ a/mm/page_io.c
@@ -137,10 +137,12 @@ out:
  * We use end_swap_bio_read() even for writes, because it happens to do what
  * we want.
  */
-int rw_swap_page_sync(int rw, swp_entry_t entry, struct page *page)
+int rw_swap_page_sync(int rw, swp_entry_t entry, struct page *page,
+			struct bio **bio_chain)
 {
 	struct bio *bio;
 	int ret = 0;
+	int bio_rw;
 
 	lock_page(page);
 
@@ -151,11 +153,22 @@ int rw_swap_page_sync(int rw, swp_entry_
 		goto out;
 	}
 
-	submit_bio(rw | (1 << BIO_RW_SYNC), bio);
-	wait_on_page_locked(page);
+	bio_rw = rw;
+	if (!bio_chain)
+		bio_rw |= (1 << BIO_RW_SYNC);
+	if (bio_chain)
+		bio_get(bio);
+	submit_bio(bio_rw, bio);
+	if (bio_chain == NULL) {
+		wait_on_page_locked(page);
 
-	if (!PageUptodate(page) || PageError(page))
-		ret = -EIO;
+		if (!PageUptodate(page) || PageError(page))
+			ret = -EIO;
+	}
+	if (bio_chain) {
+		bio->bi_private = *bio_chain;
+		*bio_chain = bio;
+	}
 out:
 	return ret;
 }
_
From: Andrew Morton <akpm at osdl.org>

Add some instrumentation to the swsusp readin code to show what bandwidth
we're achieving.

Cc: Pavel Machek <pavel at ucw.cz>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 kernel/power/swap.c |    5 +++++
 1 file changed, 5 insertions(+)

diff -puN kernel/power/swap.c~swsusp-read-timer kernel/power/swap.c
--- a/kernel/power/swap.c~swsusp-read-timer
+++ a/kernel/power/swap.c
@@ -522,12 +522,15 @@ static int load_image(struct swap_map_ha
 	unsigned int m;
 	int ret;
 	int error = 0;
+	struct timeval start;
+	struct timeval stop;
 
 	printk("Loading image data pages (%u pages) ...     ", nr_pages);
 	m = nr_pages / 100;
 	if (!m)
 		m = 1;
 	nr_pages = 0;
+	do_gettimeofday(&start);
 	do {
 		ret = snapshot_write_next(snapshot, PAGE_SIZE);
 		if (ret > 0) {
@@ -539,11 +542,13 @@ static int load_image(struct swap_map_ha
 			nr_pages++;
 		}
 	} while (ret > 0);
+	do_gettimeofday(&stop);
 	if (!error) {
 		printk("\b\b\b\bdone\n");
 		if (!snapshot_image_loaded(snapshot))
 			error = -ENODATA;
 	}
+	show_speed(&start, &stop, nr_pages, "Read");
 	return error;
 }
 
_
From: Andrew Morton <akpm at osdl.org>

Implement async reads for swsusp resuming.

Crufty old PIII testbox:
	15.7 MB/s -> 20.3 MB/s

Sony Vaio:
	14.6 MB/s -> 33.3 MB/s

I didn't implement the post-resume bio_set_pages_dirty().  I don't really
understand why resume needs to run set_page_dirty() against these pages.

It might be a worry that this code modifies PG_Uptodate, PG_Error and
PG_Locked against the image pages.  Can this possibly affect the resumed-into
kernel?  Hopefully not, if we're atomically restoring its mem_map?

Cc: Pavel Machek <pavel at ucw.cz>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 include/linux/swap.h    |    1 
 kernel/power/power.h    |    1 
 kernel/power/snapshot.c |   11 ++-
 kernel/power/swap.c     |  109 +++++++++++++++++++++++++-------------
 mm/page_io.c            |    2 
 5 files changed, 83 insertions(+), 41 deletions(-)

diff -puN include/linux/swap.h~swsusp-read-speedup include/linux/swap.h
--- a/include/linux/swap.h~swsusp-read-speedup
+++ a/include/linux/swap.h
@@ -219,6 +219,7 @@ extern int swap_readpage(struct file *, 
 extern int swap_writepage(struct page *page, struct writeback_control *wbc);
 extern int rw_swap_page_sync(int rw, swp_entry_t entry, struct page *page,
 				struct bio **bio_chain);
+extern int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err);
 
 /* linux/mm/swap_state.c */
 extern struct address_space swapper_space;
diff -puN kernel/power/power.h~swsusp-read-speedup kernel/power/power.h
--- a/kernel/power/power.h~swsusp-read-speedup
+++ a/kernel/power/power.h
@@ -58,6 +58,7 @@ struct snapshot_handle {
 	struct pbe	*pbe, *last_pbe;
 	void		*buffer;
 	unsigned int	buf_offset;
+	int		sync_read;
 };
 
 #define data_of(handle)	((handle).buffer + (handle).buf_offset)
diff -puN kernel/power/snapshot.c~swsusp-read-speedup kernel/power/snapshot.c
--- a/kernel/power/snapshot.c~swsusp-read-speedup
+++ a/kernel/power/snapshot.c
@@ -314,7 +314,7 @@ static unsigned int unsafe_pages;
  *	and we count them using unsafe_pages
  */
 
-static inline void *alloc_image_page(gfp_t gfp_mask, int safe_needed)
+static void *alloc_image_page(gfp_t gfp_mask, int safe_needed)
 {
 	void *res;
 
@@ -828,13 +828,16 @@ int snapshot_write_next(struct snapshot_
 	}
 	if (!handle->offset)
 		handle->buffer = buffer;
+	handle->sync_read = 1;
 	if (handle->prev < handle->page) {
 		if (!handle->prev) {
-			error = load_header(handle, (struct swsusp_info *)buffer);
+			error = load_header(handle,
+					(struct swsusp_info *)buffer);
 			if (error)
 				return error;
 		} else if (handle->prev <= nr_meta_pages) {
-			handle->pbe = unpack_orig_addresses(buffer, handle->pbe);
+			handle->pbe = unpack_orig_addresses(buffer,
+							handle->pbe);
 			if (!handle->pbe) {
 				error = prepare_image(handle);
 				if (error)
@@ -842,10 +845,12 @@ int snapshot_write_next(struct snapshot_
 				handle->pbe = pagedir_nosave;
 				handle->last_pbe = NULL;
 				handle->buffer = get_buffer(handle);
+				handle->sync_read = 0;
 			}
 		} else {
 			handle->pbe = handle->pbe->next;
 			handle->buffer = get_buffer(handle);
+			handle->sync_read = 0;
 		}
 		handle->prev = handle->page;
 	}
diff -puN kernel/power/swap.c~swsusp-read-speedup kernel/power/swap.c
--- a/kernel/power/swap.c~swsusp-read-speedup
+++ a/kernel/power/swap.c
@@ -22,6 +22,7 @@
 #include <linux/device.h>
 #include <linux/buffer_head.h>
 #include <linux/bio.h>
+#include <linux/blkdev.h>
 #include <linux/swap.h>
 #include <linux/swapops.h>
 #include <linux/pm.h>
@@ -214,6 +215,9 @@ static int wait_on_bio_chain(struct bio 
 		return 0;
 
 	bio = *bio_chain;
+	if (bio == NULL)
+		return 0;
+	generic_unplug_device(bdev_get_queue(bio->bi_bdev));
 	while (bio) {
 		struct page *page;
 
@@ -349,7 +353,8 @@ int swsusp_write(void)
 	int error;
 
 	if ((error = swsusp_swap_check())) {
-		printk(KERN_ERR "swsusp: Cannot find swap device, try swapon -a.\n");
+		printk(KERN_ERR "swsusp: Cannot find swap device, try "
+				"swapon -a.\n");
 		return error;
 	}
 	memset(&snapshot, 0, sizeof(struct snapshot_handle));
@@ -415,7 +420,8 @@ static struct block_device *resume_bdev;
  *	Then submit it and wait.
  */
 
-static int submit(int rw, pgoff_t page_off, void *page)
+static int submit(int rw, pgoff_t page_off, struct page *page,
+			struct bio **bio_chain)
 {
 	int error = 0;
 	struct bio *bio;
@@ -427,31 +433,41 @@ static int submit(int rw, pgoff_t page_o
 	bio->bi_bdev = resume_bdev;
 	bio->bi_end_io = end_io;
 
-	if (bio_add_page(bio, virt_to_page(page), PAGE_SIZE, 0) < PAGE_SIZE) {
-		printk("swsusp: ERROR: adding page to bio at %ld\n",page_off);
+	if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
+		printk("swsusp: ERROR: adding page to bio at %ld\n", page_off);
 		error = -EFAULT;
 		goto Done;
 	}
 
-	atomic_set(&io_done, 1);
-	submit_bio(rw | (1 << BIO_RW_SYNC), bio);
-	while (atomic_read(&io_done))
-		yield();
-	if (rw == READ)
-		bio_set_pages_dirty(bio);
+	if (bio_chain == NULL) {
+		atomic_set(&io_done, 1);
+		submit_bio(rw | (1 << BIO_RW_SYNC), bio);
+		while (atomic_read(&io_done))
+			yield();
+		if (rw == READ)
+			bio_set_pages_dirty(bio);
+		bio_put(bio);
+	} else {
+		lock_page(page);
+		get_page(page);
+		bio_get(bio);
+		bio->bi_end_io = end_swap_bio_read;
+		bio->bi_private = *bio_chain;
+		*bio_chain = bio;
+		submit_bio(rw, bio);
+	}
  Done:
-	bio_put(bio);
 	return error;
 }
 
-static int bio_read_page(pgoff_t page_off, void *page)
+static int bio_read_page(pgoff_t page_off, void *addr, struct bio **bio_chain)
 {
-	return submit(READ, page_off, page);
+	return submit(READ, page_off, virt_to_page(addr), bio_chain);
 }
 
-static int bio_write_page(pgoff_t page_off, void *page)
+static int bio_write_page(pgoff_t page_off, void *addr)
 {
-	return submit(WRITE, page_off, page);
+	return submit(WRITE, page_off, virt_to_page(addr), NULL);
 }
 
 /**
@@ -476,7 +492,7 @@ static int get_swap_reader(struct swap_m
 	handle->cur = (struct swap_map_page *)get_zeroed_page(GFP_ATOMIC);
 	if (!handle->cur)
 		return -ENOMEM;
-	error = bio_read_page(swp_offset(start), handle->cur);
+	error = bio_read_page(swp_offset(start), handle->cur, NULL);
 	if (error) {
 		release_swap_reader(handle);
 		return error;
@@ -485,7 +501,8 @@ static int get_swap_reader(struct swap_m
 	return 0;
 }
 
-static int swap_read_page(struct swap_map_handle *handle, void *buf)
+static int swap_read_page(struct swap_map_handle *handle, void *buf,
+				struct bio **bio_chain)
 {
 	unsigned long offset;
 	int error;
@@ -495,16 +512,17 @@ static int swap_read_page(struct swap_ma
 	offset = handle->cur->entries[handle->k];
 	if (!offset)
 		return -EFAULT;
-	error = bio_read_page(offset, buf);
+	error = bio_read_page(offset, buf, bio_chain);
 	if (error)
 		return error;
 	if (++handle->k >= MAP_PAGE_ENTRIES) {
+		error = wait_on_bio_chain(bio_chain);
 		handle->k = 0;
 		offset = handle->cur->next_swap;
 		if (!offset)
 			release_swap_reader(handle);
-		else
-			error = bio_read_page(offset, handle->cur);
+		else if (!error)
+			error = bio_read_page(offset, handle->cur, NULL);
 	}
 	return error;
 }
@@ -517,38 +535,55 @@ static int swap_read_page(struct swap_ma
 
 static int load_image(struct swap_map_handle *handle,
                       struct snapshot_handle *snapshot,
-                      unsigned int nr_pages)
+                      unsigned int nr_to_read)
 {
 	unsigned int m;
-	int ret;
 	int error = 0;
 	struct timeval start;
 	struct timeval stop;
+	struct bio *bio;
+	int err2;
+	unsigned nr_pages;
+	int sync = 0;
+	int async = 0;
 
-	printk("Loading image data pages (%u pages) ...     ", nr_pages);
-	m = nr_pages / 100;
+	printk("Loading image data pages (%u pages) ...     ", nr_to_read);
+	m = nr_to_read / 100;
 	if (!m)
 		m = 1;
 	nr_pages = 0;
+	bio = NULL;
 	do_gettimeofday(&start);
-	do {
-		ret = snapshot_write_next(snapshot, PAGE_SIZE);
-		if (ret > 0) {
-			error = swap_read_page(handle, data_of(*snapshot));
-			if (error)
-				break;
-			if (!(nr_pages % m))
-				printk("\b\b\b\b%3d%%", nr_pages / m);
-			nr_pages++;
+	for ( ; ; ) {
+		error = snapshot_write_next(snapshot, PAGE_SIZE);
+		if (error <= 0)
+			break;
+		error = swap_read_page(handle, data_of(*snapshot), &bio);
+		if (error)
+			break;
+		if (snapshot->sync_read) {
+			error = wait_on_bio_chain(&bio);
+			sync++;
+		} else {
+			async++;
 		}
-	} while (ret > 0);
+		if (error)
+			break;
+		if (!(nr_pages % m))
+			printk("\b\b\b\b%3d%%", nr_pages / m);
+		nr_pages++;
+	}
+	err2 = wait_on_bio_chain(&bio);
 	do_gettimeofday(&stop);
+	if (!error)
+		error = err2;
 	if (!error) {
 		printk("\b\b\b\bdone\n");
 		if (!snapshot_image_loaded(snapshot))
 			error = -ENODATA;
 	}
-	show_speed(&start, &stop, nr_pages, "Read");
+	show_speed(&start, &stop, nr_to_read, "Read");
+	printk("sync=%d async=%d\n", sync, async);
 	return error;
 }
 
@@ -571,7 +606,7 @@ int swsusp_read(void)
 	header = (struct swsusp_info *)data_of(snapshot);
 	error = get_swap_reader(&handle, swsusp_header.image);
 	if (!error)
-		error = swap_read_page(&handle, header);
+		error = swap_read_page(&handle, header, NULL);
 	if (!error)
 		error = load_image(&handle, &snapshot, header->pages - 1);
 	release_swap_reader(&handle);
@@ -597,7 +632,7 @@ int swsusp_check(void)
 	if (!IS_ERR(resume_bdev)) {
 		set_blocksize(resume_bdev, PAGE_SIZE);
 		memset(&swsusp_header, 0, sizeof(swsusp_header));
-		if ((error = bio_read_page(0, &swsusp_header)))
+		if ((error = bio_read_page(0, &swsusp_header, NULL)))
 			return error;
 		if (!memcmp(SWSUSP_SIG, swsusp_header.sig, 10)) {
 			memcpy(swsusp_header.sig, swsusp_header.orig_sig, 10);
diff -puN mm/page_io.c~swsusp-read-speedup mm/page_io.c
--- a/mm/page_io.c~swsusp-read-speedup
+++ a/mm/page_io.c
@@ -59,7 +59,7 @@ static int end_swap_bio_write(struct bio
 	return 0;
 }
 
-static int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err)
+int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err)
 {
 	const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
 	struct page *page = bio->bi_io_vec[0].bv_page;
_
From: Andrew Morton <akpm at osdl.org>

Fix an error-path BIO leak.

Cc: Pavel Machek <pavel at ucw.cz>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 kernel/power/swap.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff -puN kernel/power/swap.c~swsusp-read-speedup-fix kernel/power/swap.c
--- a/kernel/power/swap.c~swsusp-read-speedup-fix
+++ a/kernel/power/swap.c
@@ -423,7 +423,6 @@ static struct block_device *resume_bdev;
 static int submit(int rw, pgoff_t page_off, struct page *page,
 			struct bio **bio_chain)
 {
-	int error = 0;
 	struct bio *bio;
 
 	bio = bio_alloc(GFP_ATOMIC, 1);
@@ -435,8 +434,8 @@ static int submit(int rw, pgoff_t page_o
 
 	if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
 		printk("swsusp: ERROR: adding page to bio at %ld\n", page_off);
-		error = -EFAULT;
-		goto Done;
+		bio_put(bio);
+		return -EFAULT;
 	}
 
 	if (bio_chain == NULL) {
@@ -456,8 +455,7 @@ static int submit(int rw, pgoff_t page_o
 		*bio_chain = bio;
 		submit_bio(rw, bio);
 	}
- Done:
-	return error;
+	return 0;
 }
 
 static int bio_read_page(pgoff_t page_off, void *addr, struct bio **bio_chain)
_
From: Andrew Morton <akpm at osdl.org>

Kill off the polled-mode read completion code, clean a few little things up.

Cc: Pavel Machek <pavel at ucw.cz>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 kernel/power/swap.c |   39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff -puN kernel/power/swap.c~swsusp-read-speedup-cleanup kernel/power/swap.c
--- a/kernel/power/swap.c~swsusp-read-speedup-cleanup
+++ a/kernel/power/swap.c
@@ -386,27 +386,6 @@ int swsusp_write(void)
 	return error;
 }
 
-/*
- *	Using bio to read from swap.
- *	This code requires a bit more work than just using buffer heads
- *	but, it is the recommended way for 2.5/2.6.
- *	The following are to signal the beginning and end of I/O. Bios
- *	finish asynchronously, while we want them to happen synchronously.
- *	A simple atomic_t, and a wait loop take care of this problem.
- */
-
-static atomic_t io_done = ATOMIC_INIT(0);
-
-static int end_io(struct bio *bio, unsigned int num, int err)
-{
-	if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) {
-		printk(KERN_ERR "I/O error reading swsusp image.\n");
-		return -EIO;
-	}
-	atomic_set(&io_done, 0);
-	return 0;
-}
-
 static struct block_device *resume_bdev;
 
 /**
@@ -414,12 +393,12 @@ static struct block_device *resume_bdev;
  *	@rw:	READ or WRITE.
  *	@off	physical offset of page.
  *	@page:	page we're reading or writing.
+ *	@bio_chain: list of pending biod (for async reading)
  *
  *	Straight from the textbook - allocate and initialize the bio.
- *	If we're writing, make sure the page is marked as dirty.
- *	Then submit it and wait.
+ *	If we're reading, make sure the page is marked as dirty.
+ *	Then submit it and, if @bio_chain == NULL, wait.
  */
-
 static int submit(int rw, pgoff_t page_off, struct page *page,
 			struct bio **bio_chain)
 {
@@ -430,7 +409,7 @@ static int submit(int rw, pgoff_t page_o
 		return -ENOMEM;
 	bio->bi_sector = page_off * (PAGE_SIZE >> 9);
 	bio->bi_bdev = resume_bdev;
-	bio->bi_end_io = end_io;
+	bio->bi_end_io = end_swap_bio_read;
 
 	if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
 		printk("swsusp: ERROR: adding page to bio at %ld\n", page_off);
@@ -438,19 +417,17 @@ static int submit(int rw, pgoff_t page_o
 		return -EFAULT;
 	}
 
+	lock_page(page);
+	bio_get(bio);
+
 	if (bio_chain == NULL) {
-		atomic_set(&io_done, 1);
 		submit_bio(rw | (1 << BIO_RW_SYNC), bio);
-		while (atomic_read(&io_done))
-			yield();
+		wait_on_page_locked(page);
 		if (rw == READ)
 			bio_set_pages_dirty(bio);
 		bio_put(bio);
 	} else {
-		lock_page(page);
 		get_page(page);
-		bio_get(bio);
-		bio->bi_end_io = end_swap_bio_read;
 		bio->bi_private = *bio_chain;
 		*bio_chain = bio;
 		submit_bio(rw, bio);
_
From: Andrew Morton <akpm at osdl.org>

Remove left-over diagnostic stuff.

Cc: Pavel Machek <pavel at ucw.cz>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 kernel/power/swap.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff -puN kernel/power/swap.c~swsusp-read-speedup-cleanup-2 kernel/power/swap.c
--- a/kernel/power/swap.c~swsusp-read-speedup-cleanup-2
+++ a/kernel/power/swap.c
@@ -519,8 +519,6 @@ static int load_image(struct swap_map_ha
 	struct bio *bio;
 	int err2;
 	unsigned nr_pages;
-	int sync = 0;
-	int async = 0;
 
 	printk("Loading image data pages (%u pages) ...     ", nr_to_read);
 	m = nr_to_read / 100;
@@ -536,12 +534,8 @@ static int load_image(struct swap_map_ha
 		error = swap_read_page(handle, data_of(*snapshot), &bio);
 		if (error)
 			break;
-		if (snapshot->sync_read) {
+		if (snapshot->sync_read)
 			error = wait_on_bio_chain(&bio);
-			sync++;
-		} else {
-			async++;
-		}
 		if (error)
 			break;
 		if (!(nr_pages % m))
@@ -558,7 +552,6 @@ static int load_image(struct swap_map_ha
 			error = -ENODATA;
 	}
 	show_speed(&start, &stop, nr_to_read, "Read");
-	printk("sync=%d async=%d\n", sync, async);
 	return error;
 }
 
_
From: "Rafael J. Wysocki" <rjw at sisk.pl>

Clean up some loops over pfns for each zone in snapshot.c: reduce the
number of additions to perform, rework detection of saveable pages and make
the code a bit less difficult to understand, hopefully.

Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Acked-by: Pavel Machek <pavel at ucw.cz>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 kernel/power/snapshot.c |   62 +++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff -puN kernel/power/snapshot.c~swsusp-clean-up-browsing-of-pfns kernel/power/snapshot.c
--- a/kernel/power/snapshot.c~swsusp-clean-up-browsing-of-pfns
+++ a/kernel/power/snapshot.c
@@ -156,7 +156,7 @@ static inline int save_highmem(void) {re
 static inline int restore_highmem(void) {return 0;}
 #endif
 
-static int pfn_is_nosave(unsigned long pfn)
+static inline int pfn_is_nosave(unsigned long pfn)
 {
 	unsigned long nosave_begin_pfn = __pa(&__nosave_begin) >> PAGE_SHIFT;
 	unsigned long nosave_end_pfn = PAGE_ALIGN(__pa(&__nosave_end)) >> PAGE_SHIFT;
@@ -167,43 +167,43 @@ static int pfn_is_nosave(unsigned long p
  *	saveable - Determine whether a page should be cloned or not.
  *	@pfn:	The page
  *
- *	We save a page if it's Reserved, and not in the range of pages
- *	statically defined as 'unsaveable', or if it isn't reserved, and
- *	isn't part of a free chunk of pages.
+ *	We save a page if it isn't Nosave, and is not in the range of pages
+ *	statically defined as 'unsaveable', and it
+ *	isn't a part of a free chunk of pages.
  */
 
-static int saveable(struct zone *zone, unsigned long *zone_pfn)
+static struct page *saveable_page(unsigned long pfn)
 {
-	unsigned long pfn = *zone_pfn + zone->zone_start_pfn;
 	struct page *page;
 
 	if (!pfn_valid(pfn))
-		return 0;
+		return NULL;
 
 	page = pfn_to_page(pfn);
-	BUG_ON(PageReserved(page) && PageNosave(page));
+
 	if (PageNosave(page))
-		return 0;
+		return NULL;
 	if (PageReserved(page) && pfn_is_nosave(pfn))
-		return 0;
+		return NULL;
 	if (PageNosaveFree(page))
-		return 0;
+		return NULL;
 
-	return 1;
+	return page;
 }
 
 unsigned int count_data_pages(void)
 {
 	struct zone *zone;
-	unsigned long zone_pfn;
+	unsigned long pfn, max_zone_pfn;
 	unsigned int n = 0;
 
 	for_each_zone (zone) {
 		if (is_highmem(zone))
 			continue;
 		mark_free_pages(zone);
-		for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn)
-			n += saveable(zone, &zone_pfn);
+		max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;
+		for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)
+			n += !!saveable_page(pfn);
 	}
 	return n;
 }
@@ -211,7 +211,7 @@ unsigned int count_data_pages(void)
 static void copy_data_pages(struct pbe *pblist)
 {
 	struct zone *zone;
-	unsigned long zone_pfn;
+	unsigned long pfn, max_zone_pfn;
 	struct pbe *pbe, *p;
 
 	pbe = pblist;
@@ -224,13 +224,14 @@ static void copy_data_pages(struct pbe *
 			SetPageNosaveFree(virt_to_page(p));
 		for_each_pbe (p, pblist)
 			SetPageNosaveFree(virt_to_page(p->address));
-		for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn) {
-			if (saveable(zone, &zone_pfn)) {
-				struct page *page;
+		max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;
+		for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++) {
+			struct page *page = saveable_page(pfn);
+
+			if (page) {
 				long *src, *dst;
 				int n;
 
-				page = pfn_to_page(zone_pfn + zone->zone_start_pfn);
 				BUG_ON(!pbe);
 				pbe->orig_address = (unsigned long)page_address(page);
 				/* copy_page and memcpy are not usable for copying task structs. */
@@ -383,13 +384,14 @@ static struct pbe *alloc_pagedir(unsigne
 void swsusp_free(void)
 {
 	struct zone *zone;
-	unsigned long zone_pfn;
+	unsigned long pfn, max_zone_pfn;
 
 	for_each_zone(zone) {
-		for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn)
-			if (pfn_valid(zone_pfn + zone->zone_start_pfn)) {
-				struct page *page;
-				page = pfn_to_page(zone_pfn + zone->zone_start_pfn);
+		max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;
+		for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)
+			if (pfn_valid(pfn)) {
+				struct page *page = pfn_to_page(pfn);
+
 				if (PageNosave(page) && PageNosaveFree(page)) {
 					ClearPageNosave(page);
 					ClearPageNosaveFree(page);
@@ -598,7 +600,7 @@ int snapshot_read_next(struct snapshot_h
 static int mark_unsafe_pages(struct pbe *pblist)
 {
 	struct zone *zone;
-	unsigned long zone_pfn;
+	unsigned long pfn, max_zone_pfn;
 	struct pbe *p;
 
 	if (!pblist) /* a sanity check */
@@ -606,10 +608,10 @@ static int mark_unsafe_pages(struct pbe 
 
 	/* Clear page flags */
 	for_each_zone (zone) {
-		for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn)
-			if (pfn_valid(zone_pfn + zone->zone_start_pfn))
-				ClearPageNosaveFree(pfn_to_page(zone_pfn +
-					zone->zone_start_pfn));
+		max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;
+		for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)
+			if (pfn_valid(pfn))
+				ClearPageNosaveFree(pfn_to_page(pfn));
 	}
 
 	/* Mark orig addresses */
_
From: "Rafael J. Wysocki" <rjw at sisk.pl>

Add comments describing struct snapshot_handle and its members, change the
confusing name of its member 'page' to 'cur'.

Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Cc: Pavel Machek <pavel at ucw.cz>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 kernel/power/power.h    |   64 +++++++++++++++++++++++++++++++++-----
 kernel/power/snapshot.c |   40 +++++++++++------------
 2 files changed, 76 insertions(+), 28 deletions(-)

diff -puN kernel/power/power.h~swsusp-struct-snapshot_handle-cleanup kernel/power/power.h
--- a/kernel/power/power.h~swsusp-struct-snapshot_handle-cleanup
+++ a/kernel/power/power.h
@@ -50,17 +50,65 @@ extern asmlinkage int swsusp_arch_resume
 
 extern unsigned int count_data_pages(void);
 
+/**
+ *	Auxiliary structure used for reading the snapshot image data and
+ *	metadata from and writing them to the list of page backup entries
+ *	(PBEs) which is the main data structure of swsusp.
+ *
+ *	Using struct snapshot_handle we can transfer the image, including its
+ *	metadata, as a continuous sequence of bytes with the help of
+ *	snapshot_read_next() and snapshot_write_next().
+ *
+ *	The code that writes the image to a storage or transfers it to
+ *	the user land is required to use snapshot_read_next() for this
+ *	purpose and it should not make any assumptions regarding the internal
+ *	structure of the image.  Similarly, the code that reads the image from
+ *	a storage or transfers it from the user land is required to use
+ *	snapshot_write_next().
+ *
+ *	This may allow us to change the internal structure of the image
+ *	in the future with considerably less effort.
+ */
+
 struct snapshot_handle {
-	loff_t		offset;
-	unsigned int	page;
-	unsigned int	page_offset;
-	unsigned int	prev;
-	struct pbe	*pbe, *last_pbe;
-	void		*buffer;
-	unsigned int	buf_offset;
-	int		sync_read;
+	loff_t		offset;	/* number of the last byte ready for reading
+				 * or writing in the sequence
+				 */
+	unsigned int	cur;	/* number of the block of PAGE_SIZE bytes the
+				 * next operation will refer to (ie. current)
+				 */
+	unsigned int	cur_offset;	/* offset with respect to the current
+					 * block (for the next operation)
+					 */
+	unsigned int	prev;	/* number of the block of PAGE_SIZE bytes that
+				 * was the current one previously
+				 */
+	struct pbe	*pbe;	/* PBE that corresponds to 'buffer' */
+	struct pbe	*last_pbe;	/* When the image is restored (eg. read
+					 * from disk) we can store some image
+					 * data directly in the page frames
+					 * in which they were before suspend.
+					 * In such a case the PBEs that
+					 * correspond to them will be unused.
+					 * This is the last PBE, so far, that
+					 * does not correspond to such data.
+					 */
+	void		*buffer;	/* address of the block to read from
+					 * or write to
+					 */
+	unsigned int	buf_offset;	/* location to read from or write to,
+					 * given as a displacement from 'buffer'
+					 */
+	int		sync_read;	/* Set to one to notify the caller of
+					 * snapshot_write_next() that it may
+					 * need to call wait_on_bio_chain()
+					 */
 };
 
+/* This macro returns the address from/to which the caller of
+ * snapshot_read_next()/snapshot_write_next() is allowed to
+ * read/write data after the function returns
+ */
 #define data_of(handle)	((handle).buffer + (handle).buf_offset)
 
 extern int snapshot_read_next(struct snapshot_handle *handle, size_t count);
diff -puN kernel/power/snapshot.c~swsusp-struct-snapshot_handle-cleanup kernel/power/snapshot.c
--- a/kernel/power/snapshot.c~swsusp-struct-snapshot_handle-cleanup
+++ a/kernel/power/snapshot.c
@@ -555,7 +555,7 @@ static inline struct pbe *pack_orig_addr
 
 int snapshot_read_next(struct snapshot_handle *handle, size_t count)
 {
-	if (handle->page > nr_meta_pages + nr_copy_pages)
+	if (handle->cur > nr_meta_pages + nr_copy_pages)
 		return 0;
 	if (!buffer) {
 		/* This makes the buffer be freed by swsusp_free() */
@@ -568,8 +568,8 @@ int snapshot_read_next(struct snapshot_h
 		handle->buffer = buffer;
 		handle->pbe = pagedir_nosave;
 	}
-	if (handle->prev < handle->page) {
-		if (handle->page <= nr_meta_pages) {
+	if (handle->prev < handle->cur) {
+		if (handle->cur <= nr_meta_pages) {
 			handle->pbe = pack_orig_addresses(buffer, handle->pbe);
 			if (!handle->pbe)
 				handle->pbe = pagedir_nosave;
@@ -577,15 +577,15 @@ int snapshot_read_next(struct snapshot_h
 			handle->buffer = (void *)handle->pbe->address;
 			handle->pbe = handle->pbe->next;
 		}
-		handle->prev = handle->page;
+		handle->prev = handle->cur;
 	}
-	handle->buf_offset = handle->page_offset;
-	if (handle->page_offset + count >= PAGE_SIZE) {
-		count = PAGE_SIZE - handle->page_offset;
-		handle->page_offset = 0;
-		handle->page++;
+	handle->buf_offset = handle->cur_offset;
+	if (handle->cur_offset + count >= PAGE_SIZE) {
+		count = PAGE_SIZE - handle->cur_offset;
+		handle->cur_offset = 0;
+		handle->cur++;
 	} else {
-		handle->page_offset += count;
+		handle->cur_offset += count;
 	}
 	handle->offset += count;
 	return count;
@@ -820,7 +820,7 @@ int snapshot_write_next(struct snapshot_
 {
 	int error = 0;
 
-	if (handle->prev && handle->page > nr_meta_pages + nr_copy_pages)
+	if (handle->prev && handle->cur > nr_meta_pages + nr_copy_pages)
 		return 0;
 	if (!buffer) {
 		/* This makes the buffer be freed by swsusp_free() */
@@ -831,7 +831,7 @@ int snapshot_write_next(struct snapshot_
 	if (!handle->offset)
 		handle->buffer = buffer;
 	handle->sync_read = 1;
-	if (handle->prev < handle->page) {
+	if (handle->prev < handle->cur) {
 		if (!handle->prev) {
 			error = load_header(handle,
 					(struct swsusp_info *)buffer);
@@ -854,15 +854,15 @@ int snapshot_write_next(struct snapshot_
 			handle->buffer = get_buffer(handle);
 			handle->sync_read = 0;
 		}
-		handle->prev = handle->page;
+		handle->prev = handle->cur;
 	}
-	handle->buf_offset = handle->page_offset;
-	if (handle->page_offset + count >= PAGE_SIZE) {
-		count = PAGE_SIZE - handle->page_offset;
-		handle->page_offset = 0;
-		handle->page++;
+	handle->buf_offset = handle->cur_offset;
+	if (handle->cur_offset + count >= PAGE_SIZE) {
+		count = PAGE_SIZE - handle->cur_offset;
+		handle->cur_offset = 0;
+		handle->cur++;
 	} else {
-		handle->page_offset += count;
+		handle->cur_offset += count;
 	}
 	handle->offset += count;
 	return count;
@@ -871,5 +871,5 @@ int snapshot_write_next(struct snapshot_
 int snapshot_image_loaded(struct snapshot_handle *handle)
 {
 	return !(!handle->pbe || handle->pbe->next || !nr_copy_pages ||
-		handle->page <= nr_meta_pages + nr_copy_pages);
+		handle->cur <= nr_meta_pages + nr_copy_pages);
 }
_
From: "Rafael J. Wysocki" <rjw at sisk.pl>

On x86_64 machines with more than 2 GB of RAM there are large memory gaps
(with no corresponding kernel virtual addresses) and reserved memory
regions between areas of usable physical RAM.  Moreover, if CONFIG_FLATMEM
is set, they appear within the normal zone.  swsusp should not try to save
them, so the corresponding page structs have to be marked as 'nosave'.

Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Cc: Mel Gorman <mel at csn.ul.ie>
Acked-by: Pavel Machek <pavel at ucw.cz>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 arch/x86_64/kernel/e820.c  |   48 +++++++++++++++++++++++++++++++++++
 arch/x86_64/kernel/setup.c |    1 
 include/asm-x86_64/e820.h  |    1 
 3 files changed, 50 insertions(+)

diff -puN arch/x86_64/kernel/e820.c~make-swsusp-avoid-memory-holes-and-reserved-memory-regions-on-x86_64 arch/x86_64/kernel/e820.c
--- a/arch/x86_64/kernel/e820.c~make-swsusp-avoid-memory-holes-and-reserved-memory-regions-on-x86_64
+++ a/arch/x86_64/kernel/e820.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/kexec.h>
 #include <linux/module.h>
+#include <linux/mm.h>
 
 #include <asm/pgtable.h>
 #include <asm/page.h>
@@ -293,6 +294,53 @@ void __init e820_reserve_resources(void)
 	}
 }
 
+/* Mark pages corresponding to given address range as nosave */
+static void __init
+e820_mark_nosave_range(unsigned long start, unsigned long end)
+{
+	unsigned long pfn, max_pfn;
+
+	if (start >= end)
+		return;
+
+	printk("Nosave address range: %016lx - %016lx\n", start, end);
+	max_pfn = end >> PAGE_SHIFT;
+	for (pfn = start >> PAGE_SHIFT; pfn < max_pfn; pfn++)
+		if (pfn_valid(pfn))
+			SetPageNosave(pfn_to_page(pfn));
+}
+
+/*
+ * Find the ranges of physical addresses that do not correspond to
+ * e820 RAM areas and mark the corresponding pages as nosave for software
+ * suspend and suspend to RAM.
+ *
+ * This function requires the e820 map to be sorted and without any
+ * overlapping entries and assumes the first e820 area to be RAM.
+ */
+void __init e820_mark_nosave_regions(void)
+{
+	int i;
+	unsigned long paddr;
+
+	paddr = round_down(e820.map[0].addr + e820.map[0].size, PAGE_SIZE);
+	for (i = 1; i < e820.nr_map; i++) {
+		struct e820entry *ei = &e820.map[i];
+
+		if (paddr < ei->addr)
+			e820_mark_nosave_range(paddr,
+					round_up(ei->addr, PAGE_SIZE));
+
+		paddr = round_down(ei->addr + ei->size, PAGE_SIZE);
+		if (ei->type != E820_RAM)
+			e820_mark_nosave_range(round_up(ei->addr, PAGE_SIZE),
+					paddr);
+
+		if (paddr >= (end_pfn << PAGE_SHIFT))
+			break;
+	}
+}
+
 /* 
  * Add a memory region to the kernel e820 map.
  */ 
diff -puN arch/x86_64/kernel/setup.c~make-swsusp-avoid-memory-holes-and-reserved-memory-regions-on-x86_64 arch/x86_64/kernel/setup.c
--- a/arch/x86_64/kernel/setup.c~make-swsusp-avoid-memory-holes-and-reserved-memory-regions-on-x86_64
+++ a/arch/x86_64/kernel/setup.c
@@ -678,6 +678,7 @@ void __init setup_arch(char **cmdline_p)
 	 */
 	probe_roms();
 	e820_reserve_resources(); 
+	e820_mark_nosave_regions();
 
 	request_resource(&iomem_resource, &video_ram_resource);
 
diff -puN include/asm-x86_64/e820.h~make-swsusp-avoid-memory-holes-and-reserved-memory-regions-on-x86_64 include/asm-x86_64/e820.h
--- a/include/asm-x86_64/e820.h~make-swsusp-avoid-memory-holes-and-reserved-memory-regions-on-x86_64
+++ a/include/asm-x86_64/e820.h
@@ -46,6 +46,7 @@ extern void setup_memory_region(void);
 extern void contig_e820_setup(void); 
 extern unsigned long e820_end_of_ram(void);
 extern void e820_reserve_resources(void);
+extern void e820_mark_nosave_regions(void);
 extern void e820_print_map(char *who);
 extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
 extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);
_
From: "Rafael J. Wysocki" <rjw at sisk.pl>

It should be possible to suspend, either to RAM or to disk, if there's a
traced process that has just reached a breakpoint.  However, this is a
special case, because its parent process might have been frozen already and
then we are unable to deliver the "freeze" signal to the traced process. 
If this happens, it's better to cancel the freezing of the traced process.

Ref. http://bugzilla.kernel.org/show_bug.cgi?id=6787

Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Acked-by: Pavel Machek <pavel at ucw.cz>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 include/linux/sched.h  |    8 ++++++++
 kernel/power/process.c |   26 ++++++++++++++++++--------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff -puN include/linux/sched.h~make-suspend-possible-with-a-traced-process-at-a-breakpoint include/linux/sched.h
--- a/include/linux/sched.h~make-suspend-possible-with-a-traced-process-at-a-breakpoint
+++ a/include/linux/sched.h
@@ -1567,6 +1567,14 @@ static inline void freeze(struct task_st
 }
 
 /*
+ * Sometimes we may need to cancel the previous 'freeze' request
+ */
+static inline void do_not_freeze(struct task_struct *p)
+{
+	p->flags &= ~PF_FREEZE;
+}
+
+/*
  * Wake up a frozen process
  */
 static inline int thaw_process(struct task_struct *p)
diff -puN kernel/power/process.c~make-suspend-possible-with-a-traced-process-at-a-breakpoint kernel/power/process.c
--- a/kernel/power/process.c~make-suspend-possible-with-a-traced-process-at-a-breakpoint
+++ a/kernel/power/process.c
@@ -66,13 +66,25 @@ static inline void freeze_process(struct
 	}
 }
 
+static void cancel_freezing(struct task_struct *p)
+{
+	unsigned long flags;
+
+	if (freezing(p)) {
+		pr_debug("  clean up: %s\n", p->comm);
+		do_not_freeze(p);
+		spin_lock_irqsave(&p->sighand->siglock, flags);
+		recalc_sigpending_tsk(p);
+		spin_unlock_irqrestore(&p->sighand->siglock, flags);
+	}
+}
+
 /* 0 = success, else # of processes that we failed to stop */
 int freeze_processes(void)
 {
 	int todo, nr_user, user_frozen;
 	unsigned long start_time;
 	struct task_struct *g, *p;
-	unsigned long flags;
 
 	printk( "Stopping tasks: " );
 	start_time = jiffies;
@@ -85,6 +97,10 @@ int freeze_processes(void)
 				continue;
 			if (frozen(p))
 				continue;
+			if (p->state == TASK_TRACED && frozen(p->parent)) {
+				cancel_freezing(p);
+				continue;
+			}
 			if (p->mm && !(p->flags & PF_BORROWED_MM)) {
 				/* The task is a user-space one.
 				 * Freeze it unless there's a vfork completion
@@ -126,13 +142,7 @@ int freeze_processes(void)
 		do_each_thread(g, p) {
 			if (freezeable(p) && !frozen(p))
 				printk(KERN_ERR "  %s\n", p->comm);
-			if (freezing(p)) {
-				pr_debug("  clean up: %s\n", p->comm);
-				p->flags &= ~PF_FREEZE;
-				spin_lock_irqsave(&p->sighand->siglock, flags);
-				recalc_sigpending_tsk(p);
-				spin_unlock_irqrestore(&p->sighand->siglock, flags);
-			}
+			cancel_freezing(p);
 		} while_each_thread(g, p);
 		read_unlock(&tasklist_lock);
 		return todo;
_
From: "Rafael J. Wysocki" <rjw at sisk.pl>

Make cifsd allow us to suspend if it has lost the connection with the server.

Ref. http://bugzilla.kernel.org/show_bug.cgi?id=6811

Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Acked-by: Pavel Machek <pavel at ucw.cz>
Cc: Steven French <sfrench at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 fs/cifs/connect.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN fs/cifs/connect.c~allow-cifsd-to-suspend-if-connection-is-lost fs/cifs/connect.c
--- a/fs/cifs/connect.c~allow-cifsd-to-suspend-if-connection-is-lost
+++ a/fs/cifs/connect.c
@@ -182,6 +182,7 @@ cifs_reconnect(struct TCP_Server_Info *s
 
 	while ((server->tcpStatus != CifsExiting) && (server->tcpStatus != CifsGood))
 	{
+		try_to_freeze();
 		if(server->protocolType == IPV6) {
 			rc = ipv6_connect(&server->addr.sockAddr6,&server->ssocket);
 		} else {
_
From: "Rafael J. Wysocki" <rjw at sisk.pl>

The current suspend code has to be run on one CPU, so we use the CPU
hotplug to take the non-boot CPUs offline on SMP machines.  However, we
should also make sure that these CPUs will not be enabled by someone else
after we have disabled them.

The functions disable_nonboot_cpus() and enable_nonboot_cpus() are moved to
kernel/cpu.c, because they now refer to some stuff in there that should
better be static.  Also it's better if disable_nonboot_cpus() returns an
error instead of panicking if something goes wrong, and
enable_nonboot_cpus() has no reason to panic(), because the CPUs may have
been enabled by the userland before it tries to take them online.

Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Acked-by: Pavel Machek <pavel at ucw.cz>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 include/linux/cpu.h     |    8 ++
 include/linux/suspend.h |    8 --
 kernel/cpu.c            |  138 ++++++++++++++++++++++++++++++++------
 kernel/power/Makefile   |    2 
 kernel/power/disk.c     |    7 +
 kernel/power/main.c     |   10 +-
 kernel/power/smp.c      |   62 -----------------
 kernel/power/user.c     |   14 ++-
 8 files changed, 145 insertions(+), 104 deletions(-)

diff -puN include/linux/cpu.h~disable-cpu-hotplug-during-suspend-2 include/linux/cpu.h
--- a/include/linux/cpu.h~disable-cpu-hotplug-during-suspend-2
+++ a/include/linux/cpu.h
@@ -89,4 +89,12 @@ int cpu_down(unsigned int cpu);
 static inline int cpu_is_offline(int cpu) { return 0; }
 #endif
 
+#ifdef CONFIG_SUSPEND_SMP
+extern int disable_nonboot_cpus(void);
+extern void enable_nonboot_cpus(void);
+#else
+static inline int disable_nonboot_cpus(void) { return 0; }
+static inline void enable_nonboot_cpus(void) {}
+#endif
+
 #endif /* _LINUX_CPU_H_ */
diff -puN include/linux/suspend.h~disable-cpu-hotplug-during-suspend-2 include/linux/suspend.h
--- a/include/linux/suspend.h~disable-cpu-hotplug-during-suspend-2
+++ a/include/linux/suspend.h
@@ -57,14 +57,6 @@ static inline int software_suspend(void)
 }
 #endif /* CONFIG_PM */
 
-#ifdef CONFIG_SUSPEND_SMP
-extern void disable_nonboot_cpus(void);
-extern void enable_nonboot_cpus(void);
-#else
-static inline void disable_nonboot_cpus(void) {}
-static inline void enable_nonboot_cpus(void) {}
-#endif
-
 void save_processor_state(void);
 void restore_processor_state(void);
 struct saved_context;
diff -puN kernel/cpu.c~disable-cpu-hotplug-during-suspend-2 kernel/cpu.c
--- a/kernel/cpu.c~disable-cpu-hotplug-during-suspend-2
+++ a/kernel/cpu.c
@@ -21,6 +21,11 @@ static DEFINE_MUTEX(cpu_bitmask_lock);
 
 static __cpuinitdata BLOCKING_NOTIFIER_HEAD(cpu_chain);
 
+/* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
+ * Should always be manipulated under cpu_add_remove_lock
+ */
+static int cpu_hotplug_disabled;
+
 #ifdef CONFIG_HOTPLUG_CPU
 
 /* Crappy recursive lock-takers in cpufreq! Complain loudly about idiots */
@@ -108,30 +113,25 @@ static int take_cpu_down(void *unused)
 	return 0;
 }
 
-int cpu_down(unsigned int cpu)
+/* Requires cpu_add_remove_lock to be held */
+static int _cpu_down(unsigned int cpu)
 {
 	int err;
 	struct task_struct *p;
 	cpumask_t old_allowed, tmp;
 
-	mutex_lock(&cpu_add_remove_lock);
-	if (num_online_cpus() == 1) {
-		err = -EBUSY;
-		goto out;
-	}
+	if (num_online_cpus() == 1)
+		return -EBUSY;
 
-	if (!cpu_online(cpu)) {
-		err = -EINVAL;
-		goto out;
-	}
+	if (!cpu_online(cpu))
+		return -EINVAL;
 
 	err = blocking_notifier_call_chain(&cpu_chain, CPU_DOWN_PREPARE,
 						(void *)(long)cpu);
 	if (err == NOTIFY_BAD) {
 		printk("%s: attempt to take down CPU %u failed\n",
 				__FUNCTION__, cpu);
-		err = -EINVAL;
-		goto out;
+		return -EINVAL;
 	}
 
 	/* Ensure that we are not runnable on dying cpu */
@@ -179,22 +179,32 @@ out_thread:
 	err = kthread_stop(p);
 out_allowed:
 	set_cpus_allowed(current, old_allowed);
-out:
+	return err;
+}
+
+int cpu_down(unsigned int cpu)
+{
+	int err = 0;
+
+	mutex_lock(&cpu_add_remove_lock);
+	if (cpu_hotplug_disabled)
+		err = -EBUSY;
+	else
+		err = _cpu_down(cpu);
+
 	mutex_unlock(&cpu_add_remove_lock);
 	return err;
 }
 #endif /*CONFIG_HOTPLUG_CPU*/
 
-int __devinit cpu_up(unsigned int cpu)
+/* Requires cpu_add_remove_lock to be held */
+static int __devinit _cpu_up(unsigned int cpu)
 {
 	int ret;
 	void *hcpu = (void *)(long)cpu;
 
-	mutex_lock(&cpu_add_remove_lock);
-	if (cpu_online(cpu) || !cpu_present(cpu)) {
-		ret = -EINVAL;
-		goto out;
-	}
+	if (cpu_online(cpu) || !cpu_present(cpu))
+		return -EINVAL;
 
 	ret = blocking_notifier_call_chain(&cpu_chain, CPU_UP_PREPARE, hcpu);
 	if (ret == NOTIFY_BAD) {
@@ -219,7 +229,95 @@ out_notify:
 	if (ret != 0)
 		blocking_notifier_call_chain(&cpu_chain,
 				CPU_UP_CANCELED, hcpu);
+
+	return ret;
+}
+
+int __devinit cpu_up(unsigned int cpu)
+{
+	int err = 0;
+
+	mutex_lock(&cpu_add_remove_lock);
+	if (cpu_hotplug_disabled)
+		err = -EBUSY;
+	else
+		err = _cpu_up(cpu);
+
+	mutex_unlock(&cpu_add_remove_lock);
+	return err;
+}
+
+#ifdef CONFIG_SUSPEND_SMP
+static cpumask_t frozen_cpus;
+
+int disable_nonboot_cpus(void)
+{
+	int cpu, first_cpu, error;
+
+	mutex_lock(&cpu_add_remove_lock);
+	first_cpu = first_cpu(cpu_present_map);
+	if (!cpu_online(first_cpu)) {
+		error = _cpu_up(first_cpu);
+		if (error) {
+			printk(KERN_ERR "Could not bring CPU%d up.\n",
+				first_cpu);
+			goto out;
+		}
+	}
+	error = set_cpus_allowed(current, cpumask_of_cpu(first_cpu));
+	if (error) {
+		printk(KERN_ERR "Could not run on CPU%d\n", first_cpu);
+		goto out;
+	}
+	/* We take down all of the non-boot CPUs in one shot to avoid races
+	 * with the userspace trying to use the CPU hotplug at the same time
+	 */
+	cpus_clear(frozen_cpus);
+	printk("Disabling non-boot CPUs ...\n");
+	for_each_online_cpu(cpu) {
+		if (cpu == first_cpu)
+			continue;
+		error = _cpu_down(cpu);
+		if (!error) {
+			cpu_set(cpu, frozen_cpus);
+			printk("CPU%d is down\n", cpu);
+		} else {
+			printk(KERN_ERR "Error taking CPU%d down: %d\n",
+				cpu, error);
+			break;
+		}
+	}
+	if (!error) {
+		BUG_ON(num_online_cpus() > 1);
+		/* Make sure the CPUs won't be enabled by someone else */
+		cpu_hotplug_disabled = 1;
+	} else {
+		printk(KERN_ERR "Non-boot CPUs are not disabled");
+	}
 out:
 	mutex_unlock(&cpu_add_remove_lock);
-	return ret;
+	return error;
+}
+
+void enable_nonboot_cpus(void)
+{
+	int cpu, error;
+
+	/* Allow everyone to use the CPU hotplug again */
+	mutex_lock(&cpu_add_remove_lock);
+	cpu_hotplug_disabled = 0;
+	mutex_unlock(&cpu_add_remove_lock);
+
+	printk("Enabling non-boot CPUs ...\n");
+	for_each_cpu_mask(cpu, frozen_cpus) {
+		error = cpu_up(cpu);
+		if (!error) {
+			printk("CPU%d is up\n", cpu);
+			continue;
+		}
+		printk(KERN_WARNING "Error taking CPU%d up: %d\n",
+			cpu, error);
+	}
+	cpus_clear(frozen_cpus);
 }
+#endif
diff -puN kernel/power/disk.c~disable-cpu-hotplug-during-suspend-2 kernel/power/disk.c
--- a/kernel/power/disk.c~disable-cpu-hotplug-during-suspend-2
+++ a/kernel/power/disk.c
@@ -18,6 +18,7 @@
 #include <linux/fs.h>
 #include <linux/mount.h>
 #include <linux/pm.h>
+#include <linux/cpu.h>
 
 #include "power.h"
 
@@ -72,7 +73,10 @@ static int prepare_processes(void)
 	int error;
 
 	pm_prepare_console();
-	disable_nonboot_cpus();
+
+	error = disable_nonboot_cpus();
+	if (error)
+		goto enable_cpus;
 
 	if (freeze_processes()) {
 		error = -EBUSY;
@@ -84,6 +88,7 @@ static int prepare_processes(void)
 		return 0;
 thaw:
 	thaw_processes();
+enable_cpus:
 	enable_nonboot_cpus();
 	pm_restore_console();
 	return error;
diff -puN kernel/power/main.c~disable-cpu-hotplug-during-suspend-2 kernel/power/main.c
--- a/kernel/power/main.c~disable-cpu-hotplug-during-suspend-2
+++ a/kernel/power/main.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/pm.h>
 #include <linux/console.h>
+#include <linux/cpu.h>
 
 #include "power.h"
 
@@ -51,7 +52,7 @@ void pm_set_ops(struct pm_ops * ops)
 
 static int suspend_prepare(suspend_state_t state)
 {
-	int error = 0;
+	int error;
 	unsigned int free_pages;
 
 	if (!pm_ops || !pm_ops->enter)
@@ -63,12 +64,9 @@ static int suspend_prepare(suspend_state
 
 	pm_prepare_console();
 
-	disable_nonboot_cpus();
-
-	if (num_online_cpus() != 1) {
-		error = -EPERM;
+	error = disable_nonboot_cpus();
+	if (error)
 		goto Enable_cpu;
-	}
 
 	if (freeze_processes()) {
 		error = -EAGAIN;
diff -puN kernel/power/Makefile~disable-cpu-hotplug-during-suspend-2 kernel/power/Makefile
--- a/kernel/power/Makefile~disable-cpu-hotplug-during-suspend-2
+++ a/kernel/power/Makefile
@@ -7,6 +7,4 @@ obj-y				:= main.o process.o console.o
 obj-$(CONFIG_PM_LEGACY)		+= pm.o
 obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp.o disk.o snapshot.o swap.o user.o
 
-obj-$(CONFIG_SUSPEND_SMP)	+= smp.o
-
 obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o
diff -puN kernel/power/smp.c~disable-cpu-hotplug-during-suspend-2 /dev/null
--- a/kernel/power/smp.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * drivers/power/smp.c - Functions for stopping other CPUs.
- *
- * Copyright 2004 Pavel Machek <pavel at suse.cz>
- * Copyright (C) 2002-2003 Nigel Cunningham <ncunningham at clear.net.nz>
- *
- * This file is released under the GPLv2.
- */
-
-#undef DEBUG
-
-#include <linux/smp_lock.h>
-#include <linux/interrupt.h>
-#include <linux/suspend.h>
-#include <linux/module.h>
-#include <linux/cpu.h>
-#include <asm/atomic.h>
-#include <asm/tlbflush.h>
-
-/* This is protected by pm_sem semaphore */
-static cpumask_t frozen_cpus;
-
-void disable_nonboot_cpus(void)
-{
-	int cpu, error;
-
-	error = 0;
-	cpus_clear(frozen_cpus);
-	printk("Freezing cpus ...\n");
-	for_each_online_cpu(cpu) {
-		if (cpu == 0)
-			continue;
-		error = cpu_down(cpu);
-		if (!error) {
-			cpu_set(cpu, frozen_cpus);
-			printk("CPU%d is down\n", cpu);
-			continue;
-		}
-		printk("Error taking cpu %d down: %d\n", cpu, error);
-	}
-	BUG_ON(raw_smp_processor_id() != 0);
-	if (error)
-		panic("cpus not sleeping");
-}
-
-void enable_nonboot_cpus(void)
-{
-	int cpu, error;
-
-	printk("Thawing cpus ...\n");
-	for_each_cpu_mask(cpu, frozen_cpus) {
-		error = cpu_up(cpu);
-		if (!error) {
-			printk("CPU%d is up\n", cpu);
-			continue;
-		}
-		printk("Error taking cpu %d up: %d\n", cpu, error);
-		panic("Not enough cpus");
-	}
-	cpus_clear(frozen_cpus);
-}
-
diff -puN kernel/power/user.c~disable-cpu-hotplug-during-suspend-2 kernel/power/user.c
--- a/kernel/power/user.c~disable-cpu-hotplug-during-suspend-2
+++ a/kernel/power/user.c
@@ -19,6 +19,7 @@
 #include <linux/swapops.h>
 #include <linux/pm.h>
 #include <linux/fs.h>
+#include <linux/cpu.h>
 
 #include <asm/uaccess.h>
 
@@ -139,12 +140,15 @@ static int snapshot_ioctl(struct inode *
 		if (data->frozen)
 			break;
 		down(&pm_sem);
-		disable_nonboot_cpus();
-		if (freeze_processes()) {
-			thaw_processes();
-			enable_nonboot_cpus();
-			error = -EBUSY;
+		error = disable_nonboot_cpus();
+		if (!error) {
+			error = freeze_processes();
+			if (error) {
+				thaw_processes();
+				error = -EBUSY;
+			}
 		}
+		enable_nonboot_cpus();
 		up(&pm_sem);
 		if (!error)
 			data->frozen = 1;
_


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2504
retrieving revision 1.2505
diff -u -r1.2504 -r1.2505
--- kernel-2.6.spec	1 Aug 2006 23:22:52 -0000	1.2504
+++ kernel-2.6.spec	1 Aug 2006 23:25:03 -0000	1.2505
@@ -394,6 +394,7 @@
 Patch1600: linux-2.6-module_version.patch
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
 Patch1620: linux-2.6-serial-tickle-nmi.patch
+Patch1630: linux-2.6-mm-suspend-improvements.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
@@ -911,6 +912,8 @@
 %patch1610 -p1
 # Tickle the NMI whilst doing serial writes.
 %patch1620 -p1
+# Numerous patches to improve software suspend.
+%patch1630 -p1
 # Enable autofs4 to return fail for revalidate during lookup
 %patch1640 -p1
 # Use persistent allocation in softcursor
@@ -1628,6 +1631,7 @@
 - s390 kprobes support.
 - Fix oops in libata ata_device_add()
 - Yet more fixes for lockdep triggered bugs.
+- Merge numerous patches from -mm to improve software suspend.
 
 * Tue Aug  1 2006 Roland McGrath <roland at redhat.com>
 - fix bogus BUG_ON in ptrace_do_wait



From fedora-cvs-commits at redhat.com  Tue Aug  1 23:26:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 19:26:50 -0400
Subject: rpms/kernel/devel linux-2.6-debug-singlebiterror.patch,1.9,1.10
Message-ID: <200608012326.k71NQo48026389@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-singlebiterror.patch 
Log Message:
grammar police found me

linux-2.6-debug-singlebiterror.patch:
 slab.c |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-debug-singlebiterror.patch	1 Aug 2006 23:16:41 -0000	1.9
+++ linux-2.6-debug-singlebiterror.patch	1 Aug 2006 23:26:48 -0000	1.10
@@ -38,7 +38,7 @@
 +		if (errors && !(errors & (errors-1))) {
 +			printk (KERN_ERR "Single bit error detected. Probably bad RAM.\n");
 +#ifdef CONFIG_X86
-+			printk (KERN_ERR "Run memtest86+ or similar memory test tool.\n");
++			printk (KERN_ERR "Run memtest86+ or a similar memory test tool.\n");
 +#else
 +			printk (KERN_ERR "Run a memory test tool.\n");
 +#endif



From fedora-cvs-commits at redhat.com  Tue Aug  1 23:45:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 19:45:01 -0400
Subject: rpms/kernel/devel linux-2.6-s390-kprobes.patch,1.1,1.2
Message-ID: <200608012345.k71Nj1Z2005610@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-s390-kprobes.patch 
Log Message:
buildfix

linux-2.6-s390-kprobes.patch:
 linux-2.6.17.noarch/include/asm-s390/kprobes.h             |    1 
 linux-2.6.18-rc1.s390-kprob/arch/s390/Kconfig              |   14 
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/Makefile      |    1 
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/entry.S       |   12 
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/entry64.S     |   12 
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/kprobes.c     |  683 +++++++++++++
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/traps.c       |   41 
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/vmlinux.lds.S |    1 
 linux-2.6.18-rc1.s390-kprob/arch/s390/mm/fault.c           |   40 
 linux-2.6.18-rc1.s390-kprob/include/asm-s390/kdebug.h      |   59 +
 linux-2.6.18-rc1.s390-kprob/include/asm-s390/kprobes.h     |  111 ++
 11 files changed, 969 insertions(+), 6 deletions(-)

Index: linux-2.6-s390-kprobes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-s390-kprobes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-s390-kprobes.patch	1 Aug 2006 21:30:10 -0000	1.1
+++ linux-2.6-s390-kprobes.patch	1 Aug 2006 23:44:59 -0000	1.2
@@ -1142,3 +1142,13 @@
 +}
 +#endif
 
+--- linux-2.6.17.noarch/include/asm-s390/kprobes.h~	2006-08-01 19:44:20.000000000 -0400
++++ linux-2.6.17.noarch/include/asm-s390/kprobes.h	2006-08-01 19:44:25.000000000 -0400
+@@ -50,6 +50,7 @@ typedef u16 kprobe_opcode_t;
+ 
+ #define ARCH_SUPPORTS_KRETPROBES
+ #define ARCH_INACTIVE_KPROBE_COUNT 0
++#define flush_insn_slot(p)	do { } while (0)
+ 
+ #define KPROBE_SWAP_INST	0x10
+ 



From fedora-cvs-commits at redhat.com  Tue Aug  1 23:49:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 19:49:37 -0400
Subject: rpms/kernel/devel linux-2.6-debug-singlebiterror.patch,1.10,1.11
Message-ID: <200608012349.k71NnbK3022056@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-singlebiterror.patch 
Log Message:
everyone has a comment.

linux-2.6-debug-singlebiterror.patch:
 slab.c |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-debug-singlebiterror.patch	1 Aug 2006 23:26:48 -0000	1.10
+++ linux-2.6-debug-singlebiterror.patch	1 Aug 2006 23:49:34 -0000	1.11
@@ -17,11 +17,11 @@
 index 21ba060..39f1183 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
-@@ -1638,10 +1638,29 @@ static void poison_obj(struct kmem_cache
+@@ -1638,10 +1638,28 @@ static void poison_obj(struct kmem_cache
  static void dump_line(char *data, int offset, int limit)
  {
  	int i;
-+	unsigned char total = 0, bad_count = 0, errors = 0;
++	unsigned char total = 0, bad_count = 0, errors;
  	printk(KERN_ERR "%03x:", offset);
 -	for (i = 0; i < limit; i++)
 +	for (i = 0; i < limit; i++) {
@@ -42,7 +42,6 @@
 +#else
 +			printk (KERN_ERR "Run a memory test tool.\n");
 +#endif
-+			return;
 +		}
 +	}
  }



From fedora-cvs-commits at redhat.com  Wed Aug  2 00:05:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 20:05:48 -0400
Subject: rpms/kernel/devel linux-2.6-section-bugs.patch, NONE,
	1.1 kernel-2.6.spec, 1.2505,
	1.2506 linux-2.6-debug-singlebiterror.patch, 1.11, 1.12
Message-ID: <200608020005.k7205mqd026712@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-debug-singlebiterror.patch 
Added Files:
	linux-2.6-section-bugs.patch 
Log Message:
for the love of 

linux-2.6-section-bugs.patch:
 mce.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-section-bugs.patch ---
From: Andrew Morton <akpm at osdl.org>

mce_disabled cannot be __initdata - we access it during APM resume.

Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 arch/i386/kernel/cpu/mcheck/mce.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/i386/kernel/cpu/mcheck/mce.h~mce-section-fix arch/i386/kernel/cpu/mcheck/mce.h
--- a/arch/i386/kernel/cpu/mcheck/mce.h~mce-section-fix
+++ a/arch/i386/kernel/cpu/mcheck/mce.h
@@ -9,6 +9,6 @@ void winchip_mcheck_init(struct cpuinfo_
 /* Call the installed machine check handler for this CPU setup. */
 extern fastcall void (*machine_check_vector)(struct pt_regs *, long error_code);
 
-extern int mce_disabled __initdata;
+extern int mce_disabled;
 extern int nr_mce_banks;
 
_


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2505
retrieving revision 1.2506
diff -u -r1.2505 -r1.2506
--- kernel-2.6.spec	1 Aug 2006 23:25:03 -0000	1.2505
+++ kernel-2.6.spec	2 Aug 2006 00:05:44 -0000	1.2506
@@ -396,6 +396,7 @@
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-mm-suspend-improvements.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
+Patch1650: linux-2.6-section-bugs.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
@@ -916,6 +917,8 @@
 %patch1630 -p1
 # Enable autofs4 to return fail for revalidate during lookup
 %patch1640 -p1
+# Incorrect section tags cause oopses.
+%patch1650 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
 # Only print migration info on SMP
@@ -1632,6 +1635,7 @@
 - Fix oops in libata ata_device_add()
 - Yet more fixes for lockdep triggered bugs.
 - Merge numerous patches from -mm to improve software suspend.
+- Fix incorrect section usage in MCE code that blew up on resume.
 
 * Tue Aug  1 2006 Roland McGrath <roland at redhat.com>
 - fix bogus BUG_ON in ptrace_do_wait

linux-2.6-debug-singlebiterror.patch:
 slab.c |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-debug-singlebiterror.patch	1 Aug 2006 23:49:34 -0000	1.11
+++ linux-2.6-debug-singlebiterror.patch	2 Aug 2006 00:05:45 -0000	1.12
@@ -36,11 +36,11 @@
 +	if (bad_count == 1) {
 +		errors = total ^ POISON_FREE;
 +		if (errors && !(errors & (errors-1))) {
-+			printk (KERN_ERR "Single bit error detected. Probably bad RAM.\n");
++			printk(KERN_ERR "Single bit error detected. Probably bad RAM.\n");
 +#ifdef CONFIG_X86
-+			printk (KERN_ERR "Run memtest86+ or a similar memory test tool.\n");
++			printk(KERN_ERR "Run memtest86+ or a similar memory test tool.\n");
 +#else
-+			printk (KERN_ERR "Run a memory test tool.\n");
++			printk(KERN_ERR "Run a memory test tool.\n");
 +#endif
 +		}
 +	}



From fedora-cvs-commits at redhat.com  Wed Aug  2 00:08:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 20:08:48 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2506,
	1.2507 linux-2.6-section-bugs.patch, 1.1, NONE
Message-ID: <200608020008.k7208m8a027333@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-section-bugs.patch 
Log Message:
oops


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2506
retrieving revision 1.2507
diff -u -r1.2506 -r1.2507
--- kernel-2.6.spec	2 Aug 2006 00:05:44 -0000	1.2506
+++ kernel-2.6.spec	2 Aug 2006 00:08:45 -0000	1.2507
@@ -396,7 +396,6 @@
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-mm-suspend-improvements.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
-Patch1650: linux-2.6-section-bugs.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
@@ -917,8 +916,6 @@
 %patch1630 -p1
 # Enable autofs4 to return fail for revalidate during lookup
 %patch1640 -p1
-# Incorrect section tags cause oopses.
-%patch1650 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
 # Only print migration info on SMP


--- linux-2.6-section-bugs.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 01:51:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 21:51:57 -0400
Subject: rpms/scim-anthy/FC-5 scim-anthy.spec,1.30,1.31
Message-ID: <200608020151.k721pvrH019995@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-anthy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19895

Modified Files:
	scim-anthy.spec 
Log Message:
- rebuild against new libstdc++so7 (#197718)



Index: scim-anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/FC-5/scim-anthy.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- scim-anthy.spec	31 Jul 2006 05:32:24 -0000	1.30
+++ scim-anthy.spec	2 Aug 2006 01:51:54 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name:           scim-anthy
 Version:        1.2.0
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Aug  2 2006 Jens Petersen <petersen at redhat.com> - 1.2.0-1.fc5.1
+- rebuild against new libstdc++so7 (#197718)
+
 * Mon Jul 31 2006 Akira TAGOH <tagoh at redhat.com> - 1.2.0-1
 - New upstream release.
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 02:11:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 22:11:40 -0400
Subject: rpms/scim-chewing/FC-5 scim-chewing.spec,1.10,1.11
Message-ID: <200608020211.k722Be0o000411@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-chewing/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv398

Modified Files:
	scim-chewing.spec 
Log Message:
rebuild against new libstdc++so7 (#197718)



Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/FC-5/scim-chewing.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scim-chewing.spec	14 Jun 2006 03:40:14 -0000	1.10
+++ scim-chewing.spec	2 Aug 2006 02:11:38 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:		scim-chewing
 Version:	0.2.1
-Release:	5.2
+Release:	5.3%{?dist}
 Summary:	Chewing Chinese input method for SCIM
 
 License:	GPL
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Wed Aug  2 2006 Jens Petersen <petersen at redhat.com> - 0.2.1-5.3.fc5
+- rebuild against new libstdc++so7 (#197718)
+
 * Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
 - update libstdc++so7 libtool tweak to handle gcc-4.1.x
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 02:34:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 22:34:53 -0400
Subject: rpms/scim-hangul/FC-5 scim-hangul.spec,1.18,1.19
Message-ID: <200608020234.k722YrG5015532@cvs.devel.redhat.com>

Author: petersen

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

Modified Files:
	scim-hangul.spec 
Log Message:
rebuild against new libstdc++so7 (#197718)



Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/FC-5/scim-hangul.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scim-hangul.spec	25 Jun 2006 13:23:22 -0000	1.18
+++ scim-hangul.spec	2 Aug 2006 02:34:51 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           scim-hangul
 Version:        0.2.2
-Release:        2.fc5
+Release:        2%{?dist}.1
 
 License:        GPL
 URL:            http://www.scim-im.org/
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Wed Aug  2 2006 Jens Petersen <petersen at redhat.com> - 0.2.2-2.fc5.1
+- rebuild against new libstdc++so7 (#197718)
+
 * Thu Jun 22 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-2.fc5
 - rebuilt to fix the broken upgrade path.
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 02:44:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 22:44:15 -0400
Subject: rpms/scim-m17n/FC-5 scim-m17n.spec,1.8,1.9
Message-ID: <200608020244.k722iF9Y027432@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-m17n/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27337

Modified Files:
	scim-m17n.spec 
Log Message:
- rebuild against new libstdc++so7 (#197718)



Index: scim-m17n.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-m17n/FC-5/scim-m17n.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-m17n.spec	14 Jun 2006 03:47:05 -0000	1.8
+++ scim-m17n.spec	2 Aug 2006 02:44:13 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           scim-m17n
 Version:        0.2.0
-Release:        2.1
+Release:        2.2%{?dist}
 Summary:        SCIM IMEngine for m17n-lib
 
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Wed Aug  2 2006 Jens Petersen <petersen at redhat.com> - 0.2.0-2.2.fc5
+- rebuild against new libstdc++so7 (#197718)
+
 * Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
 - update libstdc++so7 libtool tweak to handle gcc-4.1.x
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 03:03:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 23:03:24 -0400
Subject: rpms/scim-pinyin/FC-5 scim-pinyin.spec,1.16,1.17
Message-ID: <200608020303.k7233OBO016000@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-pinyin/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15946

Modified Files:
	scim-pinyin.spec 
Log Message:
rebuild against new libstdc++so7 (#197718)



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/FC-5/scim-pinyin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scim-pinyin.spec	19 Jun 2006 08:56:04 -0000	1.16
+++ scim-pinyin.spec	2 Aug 2006 03:03:21 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        4%{?dist}.5
+Release:	4.5%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Aug  2 2006 Jens Petersen <petersen at redhat.com> - 0.5.91-4.5.fc5
+- rebuild against new libstdc++so7 (#197718)
+
 * Mon Jun 19 2006 Qian Shen <qshen at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 03:39:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 1 Aug 2006 23:39:24 -0400
Subject: rpms/scim-tables/FC-5 scim-tables.spec,1.25,1.26
Message-ID: <200608020339.k723dOhp008896@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim-tables/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8832

Modified Files:
	scim-tables.spec 
Log Message:
- build against new libstdc++so7 (#197718)
- buildrequire automake and libtool (jkeating)



Index: scim-tables.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-tables/FC-5/scim-tables.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- scim-tables.spec	14 Jun 2006 03:50:35 -0000	1.25
+++ scim-tables.spec	2 Aug 2006 03:39:16 -0000	1.26
@@ -8,7 +8,7 @@
 
 Name:		scim-tables
 Version:	0.5.6
-Release:	3.1
+Release:	3.2%{?dist}
 Summary:	SCIM Generic Table IMEngine
 
 License:	GPL
@@ -18,7 +18,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires:	scim-devel, gtk2-devel
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-devel automake libtool
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
@@ -452,6 +452,10 @@
 
 
 %changelog
+* Wed Aug  2 2006 Jens Petersen <petersen at redhat.com> - 0.5.6-3.2.fc5
+- build against new libstdc++so7 (#197718)
+- buildrequire automake and libtool (jkeating)
+
 * Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
 - update libstdc++so7 libtool tweak to handle gcc-4.1.x
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 04:19:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 00:19:49 -0400
Subject: rpms/gtksourceview/FC-5 .cvsignore, 1.20, 1.21 gtksourceview.spec,
	1.30, 1.31 sources, 1.20, 1.21
Message-ID: <200608020419.k724JnnC010015@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gtksourceview.spec sources 
Log Message:
Update to 1.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/FC-5/.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	2 Aug 2006 04:19:44 -0000	1.21
@@ -1 +1 @@
-gtksourceview-1.6.0.tar.bz2
+gtksourceview-1.6.2.tar.bz2


Index: gtksourceview.spec
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/FC-5/gtksourceview.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gtksourceview.spec	10 Apr 2006 16:19:54 -0000	1.30
+++ gtksourceview.spec	2 Aug 2006 04:19:44 -0000	1.31
@@ -3,8 +3,8 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview
-Version: 1.6.1
-Release: 1.fc5.1
+Version: 1.6.2
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.2-1.fc5
+- Update to 1.6.2
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.1-1.fc5.1
 - Update to 1.6.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Apr 2006 16:19:54 -0000	1.20
+++ sources	2 Aug 2006 04:19:44 -0000	1.21
@@ -1 +1 @@
-f8ca3a1a746477b2b46de7ebea276db5  gtksourceview-1.6.1.tar.bz2
+57f4ee84f0c494fd943c7badb0a68785  gtksourceview-1.6.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 04:26:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 00:26:54 -0400
Subject: rpms/gnome-utils/FC-5 .cvsignore, 1.46, 1.47 gnome-utils.spec, 1.107,
	1.108 sources, 1.49, 1.50
Message-ID: <200608020426.k724QsSH017368@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
zenity 2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-5/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	30 May 2006 02:17:01 -0000	1.46
+++ .cvsignore	2 Aug 2006 04:26:43 -0000	1.47
@@ -18,3 +18,4 @@
 zenity-2.14.0.tar.bz2
 zenity-2.14.1.tar.bz2
 zenity-2.14.2.tar.bz2
+zenity-2.14.3.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-5/gnome-utils.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- gnome-utils.spec	30 May 2006 02:17:01 -0000	1.107
+++ gnome-utils.spec	2 Aug 2006 04:26:43 -0000	1.108
@@ -14,14 +14,14 @@
 
 %define gcalctool_version 5.7.32
 %define gucharmap_version 1.6.0
-%define zenity_version 2.14.2
+%define zenity_version 2.14.3
 
 %define dbus_version 0.60
 
 Summary: GNOME utility programs.
 Name: gnome-utils
 Version: 2.14.0
-Release: 4.fc5.2
+Release: 5%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/System
@@ -230,6 +230,9 @@
 %{_sysconfdir}/pam.d/gnome-system-log
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-5.fc5
+- Update to zenity 2.14.3
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-4.fc5.2
 - Update zenity to 2.14.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-5/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	30 May 2006 02:17:01 -0000	1.49
+++ sources	2 Aug 2006 04:26:44 -0000	1.50
@@ -1,5 +1,4 @@
 d1d16ff6bfc1f6ddc110d18ec4dfdbfa  gnome-utils-2.14.0.tar.bz2
 8af03f350c988d1565922b10776bc725  gucharmap-1.6.0.tar.bz2
 c4d4234f6951389027399e9c596a8abe  gcalctool-5.7.32.tar.gz
-2445b652a93581436164cb6ad5e9c36b  zenity-2.14.1.tar.bz2
-35fe28593effb339e0a6b152eb8050bf  zenity-2.14.2.tar.bz2
+00c0930abb905a5552f67ee764bd6177  zenity-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 04:37:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 00:37:54 -0400
Subject: rpms/epiphany/FC-5 .cvsignore, 1.39, 1.40 epiphany.spec, 1.97,
	1.98 sources, 1.40, 1.41
Message-ID: <200608020437.k724bsOI018861@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epiphany/FC-5/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	30 May 2006 01:52:52 -0000	1.39
+++ .cvsignore	2 Aug 2006 04:37:49 -0000	1.40
@@ -1 +1 @@
-epiphany-2.14.2.1.tar.bz2
+epiphany-2.14.3.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/FC-5/epiphany.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- epiphany.spec	30 May 2006 01:52:52 -0000	1.97
+++ epiphany.spec	2 Aug 2006 04:37:50 -0000	1.98
@@ -9,8 +9,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.14.2.1
-Release: 1.fc5.1
+Version: 2.14.3
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -134,6 +134,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Wed Aug  2 2005 Matthias Clasen  <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Mon May 29 2006  Matthias Clasen <mclasen at redhat.com> - 2.14.2.1-1.fc5.1
 - Update to 2.14.2.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/FC-5/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	30 May 2006 01:52:52 -0000	1.40
+++ sources	2 Aug 2006 04:37:50 -0000	1.41
@@ -1 +1 @@
-872ef8d5e95cdc359f93b5ded501d98d  epiphany-2.14.2.1.tar.bz2
+40ec39f661ed603d15dc01c86e08d384  epiphany-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 04:39:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 00:39:16 -0400
Subject: rpms/epiphany/FC-5 epiphany.spec,1.98,1.99
Message-ID: <200608020439.k724dGjY019056@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	epiphany.spec 
Log Message:
2.14.3



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/FC-5/epiphany.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- epiphany.spec	2 Aug 2006 04:37:50 -0000	1.98
+++ epiphany.spec	2 Aug 2006 04:38:59 -0000	1.99
@@ -134,7 +134,7 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
-* Wed Aug  2 2005 Matthias Clasen  <mclasen at redhat.com> - 2.14.3-1.fc5
+* Wed Aug  2 2006 Matthias Clasen  <mclasen at redhat.com> - 2.14.3-1.fc5
 - Update to 2.14.3
 
 * Mon May 29 2006  Matthias Clasen <mclasen at redhat.com> - 2.14.2.1-1.fc5.1



From fedora-cvs-commits at redhat.com  Wed Aug  2 04:42:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 00:42:43 -0400
Subject: rpms/gnome-games/FC-5 .cvsignore, 1.36, 1.37 gnome-games.spec, 1.73,
	1.74 sources, 1.41, 1.42
Message-ID: <200608020442.k724ghCT019785@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/FC-5/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	29 May 2006 19:19:55 -0000	1.36
+++ .cvsignore	2 Aug 2006 04:42:40 -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.2.tar.bz2
+gnome-games-2.14.3.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/FC-5/gnome-games.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gnome-games.spec	29 May 2006 19:19:55 -0000	1.73
+++ gnome-games.spec	2 Aug 2006 04:42:40 -0000	1.74
@@ -10,8 +10,8 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.14.2
-Release: 1
+Version: 2.14.3
+Release: 1%{?dist}
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -181,6 +181,9 @@
 
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.3-1.fc5
+- Update to 2.14.3
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.2-1
 - Update to 2.14.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/FC-5/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	29 May 2006 19:19:55 -0000	1.41
+++ sources	2 Aug 2006 04:42:40 -0000	1.42
@@ -1,2 +1,2 @@
 01464739e83449288c6a58685604f86e  gnome-games-extra-data-2.14.0.tar.bz2
-45916c97dab20631f22291ff9ab05319  gnome-games-2.14.2.tar.bz2
+20f7c2e0ee4a65d15733332f34ac3cd4  gnome-games-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 04:49:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 00:49:05 -0400
Subject: rpms/yelp/FC-5 .cvsignore, 1.27, 1.28 sources, 1.27, 1.28 yelp.spec,
	1.58, 1.59
Message-ID: <200608020449.k724n49t026432@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yelp/FC-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	30 May 2006 00:32:37 -0000	1.27
+++ .cvsignore	2 Aug 2006 04:48:56 -0000	1.28
@@ -1 +1 @@
-yelp-2.14.2.tar.bz2
+yelp-2.14.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yelp/FC-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	30 May 2006 00:32:37 -0000	1.27
+++ sources	2 Aug 2006 04:48:56 -0000	1.28
@@ -1 +1 @@
-4294fe3b01824675bd8be9d7936dcaa7  yelp-2.14.2.tar.bz2
+d3c4300c9a7d38ff2179b934ca5e2d1a  yelp-2.14.3.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/FC-5/yelp.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- yelp.spec	30 May 2006 00:32:37 -0000	1.58
+++ yelp.spec	2 Aug 2006 04:48:56 -0000	1.59
@@ -12,8 +12,8 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.14.2
-Release: 1
+Version: 2.14.3
+Release: 1%{?dist}
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
@@ -116,6 +116,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 04:52:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 00:52:37 -0400
Subject: rpms/gnome-utils/FC-5 gnome-utils.spec,1.108,1.109
Message-ID: <200608020452.k724qbFn003627@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
fix build reqs



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-5/gnome-utils.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- gnome-utils.spec	2 Aug 2006 04:26:43 -0000	1.108
+++ gnome-utils.spec	2 Aug 2006 04:52:34 -0000	1.109
@@ -58,13 +58,19 @@
 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:  libXmu-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libgtop2-devel
+BuildRequires:  e2fsprogs-devel
+BuildRequires:  usermode
+BuildRequires:  gettext
+
 %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



From fedora-cvs-commits at redhat.com  Wed Aug  2 04:55:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 00:55:22 -0400
Subject: rpms/gnome-games/FC-5 gnome-games.spec,1.74,1.75
Message-ID: <200608020455.k724tM1S004382@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-games.spec 
Log Message:
drop upstreamed patch



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/FC-5/gnome-games.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gnome-games.spec	2 Aug 2006 04:42:40 -0000	1.74
+++ gnome-games.spec	2 Aug 2006 04:55:20 -0000	1.75
@@ -41,8 +41,6 @@
 BuildRequires: perl-XML-Parser
 BuildRequires: autoconf
 
-Patch0: gnome-games-2.14.1-fix-schema.patch
-
 %description
 
 The gnome-games package includes some small games that come with the
@@ -51,7 +49,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-schema
 
 tar xjf %{SOURCE2}
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:04:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:04:00 -0400
Subject: rpms/epiphany/FC-5 epiphany.spec,1.99,1.100
Message-ID: <200608020504.k72540gh006993@cvs.devel.redhat.com>

Author: mclasen

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

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



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/FC-5/epiphany.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- epiphany.spec	2 Aug 2006 04:38:59 -0000	1.99
+++ epiphany.spec	2 Aug 2006 05:03:58 -0000	1.100
@@ -35,7 +35,10 @@
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_ver}
 BuildRequires: gnome-desktop-devel
 BuildRequires: startup-notification-devel
+%ifnarch s390 s390x
 BuildRequires: NetworkManager-devel
+%endif
+BuildRequires: pygtk2-devel, gnome-python2
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:07:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:07:58 -0400
Subject: rpms/yelp/FC-5 yelp.spec,1.59,1.60
Message-ID: <200608020507.k7257wn5007978@cvs.devel.redhat.com>

Author: mclasen

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

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



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/FC-5/yelp.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- yelp.spec	2 Aug 2006 04:48:56 -0000	1.59
+++ yelp.spec	2 Aug 2006 05:07:55 -0000	1.60
@@ -50,6 +50,13 @@
 BuildRequires: GConf2-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils 
+BuildRequires: startup-notification-devel >= %{startup_notification_version}
+BuildRequires: libgnomeprintui22-devel
+BuildRequires: libXt-devel
+BuildRequires: perl-XML-Simple
+BuildRequires: dbus-devel
+BuildRequires: gettext-devel
+
 
 %ifnarch  s390 s390x ppc64
 BuildRequires:  libbeagle-devel



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:14:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:14:15 -0400
Subject: rpms/gnome-utils/FC-5 gnome-utils.spec,1.109,1.110
Message-ID: <200608020514.k725EFYA009146@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
fix build reqs`



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-5/gnome-utils.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- gnome-utils.spec	2 Aug 2006 04:52:34 -0000	1.109
+++ gnome-utils.spec	2 Aug 2006 05:14:03 -0000	1.110
@@ -71,6 +71,10 @@
 BuildRequires:  usermode
 BuildRequires:  gettext
 
+BuildRequires: atk-devel >= 1.5
+BuildRequires: scrollkeeper
+
+
 %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



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:20:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:20:44 -0400
Subject: rpms/gnome-themes/FC-5 .cvsignore, 1.28, 1.29 gnome-themes.spec,
	1.56, 1.57 sources, 1.28, 1.29
Message-ID: <200608020520.k725Ki8p025634@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/FC-5/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	29 May 2006 19:31:14 -0000	1.28
+++ .cvsignore	2 Aug 2006 05:20:42 -0000	1.29
@@ -2,3 +2,4 @@
 clearlooks-metacity-2.0.tar.gz
 gnome-themes-2.14.0.tar.bz2
 gnome-themes-2.14.2.tar.bz2
+gnome-themes-2.14.3.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/FC-5/gnome-themes.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-themes.spec	7 Jun 2006 13:15:51 -0000	1.56
+++ gnome-themes.spec	2 Aug 2006 05:20:42 -0000	1.57
@@ -3,8 +3,8 @@
 
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.14.2
-Release: 1.fc5.1
+Version: 2.14.3
+Release: 1%{?dist}
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 Source: %{name}-%{version}.tar.bz2
 Source1: clearlooks-%{clearlooks_version}.tar.bz2
@@ -90,6 +90,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1
 - Fix a problem in %%post (#194323)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	29 May 2006 19:31:31 -0000	1.28
+++ sources	2 Aug 2006 05:20:42 -0000	1.29
@@ -1,3 +1,3 @@
 451ef33d1bffa261c5cbe01182199f97  clearlooks-0.6.2.tar.bz2
 64bffb05ef1c8d2f3a3cbb18480cd3f0  clearlooks-metacity-2.0.tar.gz
-aa369e130f9fc3b8fd0fd4481766a56c  gnome-themes-2.14.2.tar.bz2
+7c07c4c01404b447f2624e8e400ee787  gnome-themes-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:25:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:25:44 -0400
Subject: rpms/libwnck/FC-5 .cvsignore, 1.32, 1.33 libwnck.spec, 1.46,
	1.47 sources, 1.33, 1.34
Message-ID: <200608020525.k725PiDC004541@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwnck/FC-5/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	30 May 2006 01:21:54 -0000	1.32
+++ .cvsignore	2 Aug 2006 05:25:42 -0000	1.33
@@ -1 +1 @@
-libwnck-2.14.2.tar.bz2
+libwnck-2.14.3.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/FC-5/libwnck.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libwnck.spec	30 May 2006 01:21:54 -0000	1.46
+++ libwnck.spec	2 Aug 2006 05:25:42 -0000	1.47
@@ -5,8 +5,8 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.14.2
-Release: 1
+Version: 2.14.3
+Release: 1%{?dist}
 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
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwnck/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	30 May 2006 01:21:54 -0000	1.33
+++ sources	2 Aug 2006 05:25:42 -0000	1.34
@@ -1 +1 @@
-df5c7a764e81a7214d493194ee394918  libwnck-2.14.2.tar.bz2
+5796c0c26c5dfbad6d4fdf77858feae6  libwnck-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:33:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:33:02 -0400
Subject: rpms/libwnck/FC-5 libwnck.spec,1.47,1.48
Message-ID: <200608020533.k725X2hI004674@cvs.devel.redhat.com>

Author: mclasen

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

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



Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/FC-5/libwnck.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libwnck.spec	2 Aug 2006 05:25:42 -0000	1.47
+++ libwnck.spec	2 Aug 2006 05:33:00 -0000	1.48
@@ -21,7 +21,10 @@
 BuildRequires:	gtk2-devel >= %{gtk2_version}
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  startup-notification-devel >= %{startup_notification_version}
-
+BuildRequires:  libXt-devel
+BuildRequires:  libXres-devel
+BuildRequires:  perl-XML-Parser
+BuildRequires:  gettext
 
 %description
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:36:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:36:59 -0400
Subject: rpms/gnome-applets/FC-5 .cvsignore, 1.38, 1.39 gnome-applets.spec,
	1.132, 1.133 sources, 1.40, 1.41
Message-ID: <200608020536.k725axqO004792@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
fix build reqs



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-5/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	29 May 2006 02:10:45 -0000	1.38
+++ .cvsignore	2 Aug 2006 05:36:57 -0000	1.39
@@ -1,3 +1,4 @@
 gnome-applets-2.9.3.1-modemlights.tar.bz2
 gnome-applets-2.14.0.tar.bz2
 gnome-applets-2.14.2.tar.bz2
+gnome-applets-2.14.3.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-5/gnome-applets.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- gnome-applets.spec	29 May 2006 02:41:12 -0000	1.132
+++ gnome-applets.spec	2 Aug 2006 05:36:57 -0000	1.133
@@ -17,8 +17,8 @@
 
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
-Version: 	2.14.2
-Release:  	1.fc5.1
+Version: 	2.14.3
+Release:  	1%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -57,9 +57,10 @@
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  gnome-doc-utils
 BuildRequires:  which
+BuildRequires:  libtool autoconf gettext
+BuildRequires:  pkgconfig
 
 Requires:	gnome-panel >= %{gnome_panel_version}
-Requires:	libxklavier >= %{libxklavier_version}
 Requires:	gstreamer-plugins-base >= %{gstreamer_plugins_version}
 Requires:	gstreamer-plugins-good >= %{gstreamer_plugins_version}
 
@@ -197,6 +198,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Sun May 28 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/gnome-applets/FC-5/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	29 May 2006 02:10:45 -0000	1.40
+++ sources	2 Aug 2006 05:36:57 -0000	1.41
@@ -1,2 +1,2 @@
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
-e6da539e78da1256b9a9bee1301fd44f  gnome-applets-2.14.2.tar.bz2
+ab96f071db993461533cb740281a7373  gnome-applets-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:41:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:41:28 -0400
Subject: rpms/gnome-desktop/FC-5 .cvsignore, 1.29, 1.30 gnome-desktop.spec,
	1.56, 1.57 sources, 1.31, 1.32
Message-ID: <200608020541.k725fSQf015671@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/FC-5/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	30 May 2006 00:49:22 -0000	1.29
+++ .cvsignore	2 Aug 2006 05:41:26 -0000	1.30
@@ -1 +1 @@
-gnome-desktop-2.14.2.tar.bz2
+gnome-desktop-2.14.3.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/FC-5/gnome-desktop.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-desktop.spec	30 May 2006 00:49:22 -0000	1.56
+++ gnome-desktop.spec	2 Aug 2006 05:41:26 -0000	1.57
@@ -11,8 +11,8 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
-Version: 2.14.2
-Release: 1
+Version: 2.14.3
+Release: 1%{?dist}
 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/html/gnome-desktop/
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update tp 2.14.3
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	30 May 2006 00:49:22 -0000	1.31
+++ sources	2 Aug 2006 05:41:26 -0000	1.32
@@ -1 +1 @@
-9c252124a80453d47377664b31159590  gnome-desktop-2.14.2.tar.bz2
+2a8547ab0dcb10a1ad297874ae95b06b  gnome-desktop-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:44:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:44:27 -0400
Subject: rpms/gnome-menus/FC-5 .cvsignore, 1.11, 1.12 gnome-menus.spec, 1.28,
	1.29 sources, 1.12, 1.13
Message-ID: <200608020544.k725iR5T016845@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/FC-5/.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	2 Aug 2006 05:44:25 -0000	1.12
@@ -1,7 +1 @@
-<<<<<<< .cvsignore
-gnome-menus-2.11.91.tar.bz2
-gnome-menus-2.12.0.tar.bz2
-=======
-gnome-menus-2.12.0.tar.bz2
->>>>>>> 1.10
-gnome-menus-2.13.5.tar.bz2
+gnome-menus-2.14.3.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/FC-5/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:43:04 -0000	1.28
+++ gnome-menus.spec	2 Aug 2006 05:44:25 -0000	1.29
@@ -6,8 +6,8 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.14.0
-Release: 1.fc5.1
+Version: 2.14.3
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -89,6 +89,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Mon Apr 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1.fc5.1
 - Update to 2.14.0
 - Drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Apr 2006 16:43:04 -0000	1.12
+++ sources	2 Aug 2006 05:44:25 -0000	1.13
@@ -1 +1 @@
-7aa0c08fc8b9caabb4be46e1cfb595fc  gnome-menus-2.14.0.tar.bz2
+9926e7ad14255d1a08c7e774052f8a3a  gnome-menus-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:48:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:48:12 -0400
Subject: rpms/gnome-applets/FC-5 gnome-applets.spec,1.133,1.134
Message-ID: <200608020548.k725mCOb000464@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Log Message:
fix build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-5/gnome-applets.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- gnome-applets.spec	2 Aug 2006 05:36:57 -0000	1.133
+++ gnome-applets.spec	2 Aug 2006 05:48:10 -0000	1.134
@@ -46,6 +46,7 @@
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  gail-devel >= %{gail_version}
 BuildRequires:  libxklavier-devel >= %{libxklavier_version}
+BuildRequires:  gstreamer-devel
 BuildRequires:  gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
 BuildRequires:  gstreamer-plugins-good-devel >= %{gstreamer_plugins_version}
 BuildRequires:  /usr/bin/automake



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:53:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:53:22 -0400
Subject: rpms/gnome-panel/FC-5 .cvsignore, 1.40, 1.41 gnome-panel.spec, 1.131,
	1.132 sources, 1.42, 1.43
Message-ID: <200608020553.k725rMqD002450@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/.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	2 Aug 2006 05:53:19 -0000	1.41
@@ -1 +1 @@
-gnome-panel-2.14.0.tar.bz2
+gnome-panel-2.14.3.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- gnome-panel.spec	7 Jun 2006 20:21:03 -0000	1.131
+++ gnome-panel.spec	2 Aug 2006 05:53:19 -0000	1.132
@@ -19,8 +19,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.14.2
-Release: 1.fc5.1
+Version: 2.14.3
+Release: 1%{?dist}
 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
@@ -222,6 +222,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1
 - Add some BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	30 May 2006 03:10:05 -0000	1.42
+++ sources	2 Aug 2006 05:53:19 -0000	1.43
@@ -1 +1 @@
-7db1afb3f6cbca12acecc49c68b4a655  gnome-panel-2.14.2.tar.bz2
+14ab4c3d3ff3d0c1be397b6799a8626c  gnome-panel-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 05:57:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 01:57:02 -0400
Subject: rpms/gnome-session/FC-5 .cvsignore, 1.22, 1.23 gnome-session.spec,
	1.68, 1.69 sources, 1.23, 1.24
Message-ID: <200608020557.k725v2mk003874@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	30 May 2006 01:40:56 -0000	1.22
+++ .cvsignore	2 Aug 2006 05:57:00 -0000	1.23
@@ -1 +1 @@
-gnome-session-2.14.2.tar.bz2
+gnome-session-2.14.3.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/FC-5/gnome-session.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gnome-session.spec	6 Jun 2006 17:09:19 -0000	1.68
+++ gnome-session.spec	2 Aug 2006 05:57:00 -0000	1.69
@@ -13,8 +13,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.14.2
-Release: 1.fc5.1
+Version: 2.14.3
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -164,6 +164,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1
 - Require system-logos, not fedora-logos
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	30 May 2006 01:40:56 -0000	1.23
+++ sources	2 Aug 2006 05:57:00 -0000	1.24
@@ -1 +1 @@
-191dc3a18eb37aca391914b404cf1cd7  gnome-session-2.14.2.tar.bz2
+34eb4641e2791ae51acf6f1edfcf3d64  gnome-session-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 07:51:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 03:51:32 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.16, 1.17
Message-ID: <200608020751.k727pWM1002444@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
Log Message:
rh#200871# autotext config stuff

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
 bin/modules/installer/scriptitems.pm                                 |    0 
 com/sun/star/wizards/letter/LetterWizardDialogImpl.java              |    0 
 com/sun/star/wizards/letter/LetterWizardDialogResources.java         |    0 
 desktop/source/app/langselect.cxx                                    |   14 
 desktop/source/app/langselect.hxx                                    |    2 
 desktop/source/migration/wizard.cxx                                  |   19 
 framework/source/services/substitutepathvars.cxx                     |   93 +++
 framework/util/makefile.mk                                           |    1 
 sfx2/source/appl/sfxhelp.cxx                                         |   69 ++
 solenv/bin/modules/installer/scriptitems.pm                          |    3 
 source/app/langselect.cxx                                            |    0 
 source/app/langselect.hxx                                            |    0 
 source/appl/sfxhelp.cxx                                              |    0 
 source/formwizard/dbwizres.src                                       |    0 
 source/migration/wizard.cxx                                          |    0 
 source/rc/resmgr.cxx                                                 |    0 
 source/services/substitutepathvars.cxx                               |    0 
 source/treeview/tvread.cxx                                           |    0 
 source/ui/misc/glosdoc.cxx                                           |    0 
 svx/source/dialog/optgdlg.cxx                                        |  248 +++++-----
 svx/source/dialog/optgdlg.hxx                                        |    4 
 sw/source/ui/misc/glosdoc.cxx                                        |   14 
 tools/source/rc/resmgr.cxx                                           |   19 
 util/makefile.mk                                                     |    0 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java      |   20 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java |    2 
 wizards/source/formwizard/dbwizres.src                               |   11 
 xmlhelp/source/treeview/tvread.cxx                                   |    6 
 28 files changed, 345 insertions(+), 180 deletions(-)

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	20 Jul 2006 11:33:52 -0000	1.16
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	2 Aug 2006 07:51:29 -0000	1.17
@@ -392,31 +392,6 @@
  
  		if(pGlosArr)
  		{
-Index: registry/schema/org/openoffice/Office/Common.xcs
-===================================================================
-RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
-retrieving revision 1.107
-diff -u -p -u -r1.107 Common.xcs
---- openoffice.org.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs	2 Feb 2005 16:41:38 -0000	1.107
-+++ openoffice.org/officecfg/registry/schema/org/openoffice/Office/Common.xcs	29 Jun 2005 11:08:26 -0000
-@@ -1288,7 +1288,7 @@ Dymamic border coloring means that when 
- 						<author>OS</author>
- 						<desc>Contains the directory which contains the AutoText modules.</desc>
- 					</info>
--					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(userurl)/autotext</value>
-+					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(insturl)/share/autotext/en-US:$(userurl)/autotext</value>
- 				</prop>
- 				<prop oor:name="Backup" oor:type="xs:string">
- 					<info>
-@@ -1460,7 +1460,7 @@ Dymamic border coloring means that when 
- 					<info>
- 						<desc>Specifies the default directory where the AutoText modules are located.</desc>
- 					</info>
--					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(userurl)/autotext</value>
-+					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(insturl)/share/autotext/en-US:$(userurl)/autotext</value>
- 				</prop>
- 				<prop oor:name="Backup" oor:type="xs:string">
- 					<info>
 Index: com/sun/star/wizards/letter/LetterWizardDialogImpl.java
 ===================================================================
 RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java,v



From fedora-cvs-commits at redhat.com  Wed Aug  2 09:11:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 05:11:53 -0400
Subject: rpms/rdist/devel rdist-6.1.5-fix-msgsndnotify-loop.patch, NONE,
	1.1 rdist.spec, 1.21, 1.22
Message-ID: <200608020911.k729Br2a006160@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/rdist/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6103

Modified Files:
	rdist.spec 
Added Files:
	rdist-6.1.5-fix-msgsndnotify-loop.patch 
Log Message:
- Fixed problem with memory leak (#192229)


rdist-6.1.5-fix-msgsndnotify-loop.patch:
 message.c |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

--- NEW FILE rdist-6.1.5-fix-msgsndnotify-loop.patch ---
--- rdist-6.1.5/src/message.c.thestokes	2006-04-19 17:30:39.000000000 -0400
+++ rdist-6.1.5/src/message.c	2006-04-19 17:36:37.000000000 -0400
@@ -793,15 +793,20 @@
 	char *msg;
 {
 	static char buf[MSGBUFSIZ];
-
-	++nerrs;
-
-	if (isserver)
-		(void) sprintf(buf, "REMOTE ERROR: %s", msg);
-	else
-		(void) sprintf(buf, "LOCAL ERROR: %s", msg);
-
-	_message(MT_FERROR, buf);
+	/* Don't reenter this function. There is a nasty infinite recursion
+	   case that pops up when msgsndnotify tries to exit. */
+	static int inside=0; 
+
+	if(inside==0){
+	        ++nerrs;
+		inside=1;
+
+	        if (isserver)
+		        (void) sprintf(buf, "REMOTE ERROR: %s", msg);
+	        else
+		        (void) sprintf(buf, "LOCAL ERROR: %s", msg);
+		_message(MT_FERROR, buf);
+	}
 
 	exit(nerrs);
 }


Index: rdist.spec
===================================================================
RCS file: /cvs/dist/rpms/rdist/devel/rdist.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rdist.spec	12 Jul 2006 07:58:05 -0000	1.21
+++ rdist.spec	2 Aug 2006 09:11:50 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Maintains identical copies of files on multiple machines.
 Name: rdist
 Version: 6.1.5
-Release: 43.1
+Release: 44
 Epoch: 1
 License: BSD
 Group: Applications/System
@@ -22,6 +22,7 @@
 Patch11: rdist-6.1.5-mkstemp.patch
 Patch12: rdist-6.1.5-stat64.patch
 Patch13: rdist-6.1.5-re_args.patch
+Patch14: rdist-6.1.5-fix-msgsndnotify-loop.patch
 URL: http://www.MagniComp.com/rdist
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: byacc bison
@@ -54,6 +55,7 @@
 %patch11 -p1 -b .mkstemp
 %patch12 -p1 -b .stat64
 %patch13 -p1 -b .re_args
+%patch14 -p1 -b .fix-msgsndnotify-loop
 
 %build
 make
@@ -87,6 +89,9 @@
 %{_mandir}/man8/rdist.8*
 
 %changelog
+* Wed Aug 02 2006 Phil Knirsch <pknirsch at redhat.com> 1:6.1.5-44
+- Fixed problem with memory leak (#192229)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:6.1.5-43.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 09:37:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 05:37:37 -0400
Subject: rpms/cups/devel cups-lspp.patch,1.1,1.2 cups.spec,1.237,1.238
Message-ID: <200608020937.k729bb7W028003@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-lspp.patch cups.spec 
Log Message:
* Wed Aug  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-7
- Updated LSPP patch from Matt Anderson.


cups-lspp.patch:
 Makedefs.in                 |    2 
 config-scripts/cups-lspp.m4 |   36 +++++
 config.h.in                 |    7 +
 configure.in                |    2 
 cups/cups.h                 |    8 +
 data/Makefile               |    5 
 data/mls                    |  277 ++++++++++++++++++++++++++++++++++++++++++++
 data/selinux                |  277 ++++++++++++++++++++++++++++++++++++++++++++
 data/te                     |  277 ++++++++++++++++++++++++++++++++++++++++++++
 scheduler/Makefile          |    6 
 scheduler/client.c          |  101 +++++++++++++++-
 scheduler/client.h          |   14 ++
 scheduler/conf.c            |   42 ++++++
 scheduler/conf.h            |    8 +
 scheduler/ipp.c             |  213 +++++++++++++++++++++++++++++++++
 scheduler/job.c             |  141 ++++++++++++++++++++++
 scheduler/job.h             |   11 +
 scheduler/lspp-access.c     |   56 ++++++++
 scheduler/main.c            |   20 +++
 scheduler/printers.c        |   16 ++
 20 files changed, 1513 insertions(+), 6 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-lspp.patch	21 Jul 2006 12:00:05 -0000	1.1
+++ cups-lspp.patch	2 Aug 2006 09:37:30 -0000	1.2
@@ -1,44 +1,23 @@
---- /dev/null	2006-07-21 09:48:40.571484750 +0100
-+++ cups-1.2.2/config-scripts/cups-lspp.m4	2006-07-21 12:42:40.000000000 +0100
-@@ -0,0 +1,36 @@
-+dnl
-+dnl   LSPP code for the Common UNIX Printing System (CUPS).
-+dnl
-+dnl   Copyright 2005-2006 by Hewlett-Packard Development Company, L.P.
-+dnl
-+dnl   This program is free software; you can redistribute it and/or modify
-+dnl   it under the terms of the GNU General Public License as published by
-+dnl   the Free Software Foundation; version 2.
-+dnl
-+dnl   This program is distributed in the hope that it will be useful, but
-+dnl   WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+dnl   General Public License for more details.
-+dnl
-+dnl   You should have received a copy of the GNU General Public License
-+dnl   along with this program; if not, write to the Free Software Foundation,
-+dnl   Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301 USA
-+dnl
+diff -burN cups-1.2.2-vanilla/config.h.in cups-1.2.2/config.h.in
+--- cups-1.2.2-vanilla/config.h.in	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/config.h.in	2006-08-01 07:08:37.000000000 -0400
+@@ -443,6 +443,13 @@
+ #undef HAVE_APPLETALK_AT_PROTO_H
+ 
+ 
++/*
++ * Are we trying to meet LSPP requirements?
++ */
 +
-+dnl Are we trying to meet LSPP requirements
-+AC_ARG_ENABLE(lspp, [  --enable-lspp           turn on auditing and label support, default=no])
++#undef WITH_LSPP
 +
-+if test x"$enable_lspp" != xno; then
-+    case "$uname" in
-+        Linux)
-+            AC_CHECK_LIB(audit,audit_log_user_message, [LIBAUDIT="-laudit" AC_SUBST(LIBAUDIT)])
-+            AC_CHECK_HEADER(libaudit.h)
-+            AC_CHECK_LIB(selinux,getpeercon, [LIBSELINUX="-lselinux" AC_SUBST(LIBSELINUX)])
-+            AC_CHECK_HEADER(selinux/selinux.h)
-+            AC_DEFINE(WITH_LSPP)
-+            ;;
-+        *)
-+            # All others
-+            ;;
-+    esac
-+fi
---- cups-1.2.2/configure.in.lspp	2006-05-30 21:31:10.000000000 +0100
-+++ cups-1.2.2/configure.in	2006-07-21 12:42:40.000000000 +0100
++
+ #endif /* !_CUPS_CONFIG_H_ */
+ 
+ /*
+diff -burN cups-1.2.2-vanilla/configure.in cups-1.2.2/configure.in
+--- cups-1.2.2-vanilla/configure.in	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/configure.in	2006-08-01 07:08:37.000000000 -0400
 @@ -47,6 +47,8 @@
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -48,19 +27,49 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
---- cups-1.2.2/Makedefs.in.lspp	2006-07-21 12:42:35.000000000 +0100
-+++ cups-1.2.2/Makedefs.in	2006-07-21 12:42:40.000000000 +0100
-@@ -135,7 +135,7 @@
- 			@LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM)
- LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
- LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
--LIBS		=	$(LINKCUPS) $(COMMONLIBS)
-+LIBS		=	$(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@
- OPTIM		=	@OPTIM@
- OPTIONS		=
- PAMLIBS		=	@PAMLIBS@
---- /dev/null	2006-07-21 09:48:40.571484750 +0100
-+++ cups-1.2.2/data/mls	2006-07-21 12:42:40.000000000 +0100
+diff -burN cups-1.2.2-vanilla/cups/cups.h cups-1.2.2/cups/cups.h
+--- cups-1.2.2-vanilla/cups/cups.h	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/cups/cups.h	2006-08-01 07:08:37.000000000 -0400
+@@ -24,6 +24,8 @@
+  *   This file is subject to the Apple OS-Developed Software exception.
+  */
+ 
++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
++
+ #ifndef _CUPS_CUPS_H_
+ #  define _CUPS_CUPS_H_
+ 
+@@ -68,6 +70,12 @@
+ #  define CUPS_DATE_ANY		-1
+ 
+ 
++# ifdef WITH_LSPP
++# define MLS_CONFIG "mls"
++# define TE_CONFIG "te"
++# define SELINUX_CONFIG "SELinux"
++# define UNKNOWN_SL "UNKNOWN SL"
++# endif /* WITH_LSPP */
+ /*
+  * Types and structures...
+  */
+diff -burN cups-1.2.2-vanilla/data/Makefile cups-1.2.2/data/Makefile
+--- cups-1.2.2-vanilla/data/Makefile	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/data/Makefile	2006-08-01 07:08:37.000000000 -0400
+@@ -34,7 +34,10 @@
+ 		secret \
+ 		standard \
+ 		topsecret \
+-		unclassified
++		unclassified \
++		selinux \
++		mls \
++		te
+ 
+ CHARMAPS =	\
+ 		euc-cn.txt \
+diff -burN cups-1.2.2-vanilla/data/mls cups-1.2.2/data/mls
+--- cups-1.2.2-vanilla/data/mls	1969-12-31 19:00:00.000000000 -0500
++++ cups-1.2.2/data/mls	2006-08-01 07:08:37.000000000 -0400
 @@ -0,0 +1,277 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -339,8 +348,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
---- /dev/null	2006-07-21 09:48:40.571484750 +0100
-+++ cups-1.2.2/data/selinux	2006-07-21 12:42:40.000000000 +0100
+diff -burN cups-1.2.2-vanilla/data/selinux cups-1.2.2/data/selinux
+--- cups-1.2.2-vanilla/data/selinux	1969-12-31 19:00:00.000000000 -0500
++++ cups-1.2.2/data/selinux	2006-08-01 07:08:37.000000000 -0400
 @@ -0,0 +1,277 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -619,8 +629,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
---- /dev/null	2006-07-21 09:48:40.571484750 +0100
-+++ cups-1.2.2/data/te	2006-07-21 12:42:40.000000000 +0100
+diff -burN cups-1.2.2-vanilla/data/te cups-1.2.2/data/te
+--- cups-1.2.2-vanilla/data/te	1969-12-31 19:00:00.000000000 -0500
++++ cups-1.2.2/data/te	2006-08-01 07:08:37.000000000 -0400
 @@ -0,0 +1,277 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -899,269 +910,166 @@
 +% End of "$Id$".
 +%
 +%%EOF
---- cups-1.2.2/data/Makefile.lspp	2006-03-19 03:23:34.000000000 +0000
-+++ cups-1.2.2/data/Makefile	2006-07-21 12:42:40.000000000 +0100
-@@ -34,7 +34,10 @@
- 		secret \
- 		standard \
- 		topsecret \
--		unclassified
-+		unclassified \
-+		selinux \
-+		mls \
-+		te
- 
- CHARMAPS =	\
- 		euc-cn.txt \
---- cups-1.2.2/config.h.in.lspp	2006-06-05 19:42:53.000000000 +0100
-+++ cups-1.2.2/config.h.in	2006-07-21 12:42:40.000000000 +0100
-@@ -443,6 +443,13 @@
- #undef HAVE_APPLETALK_AT_PROTO_H
- 
- 
-+/*
-+ * Are we trying to meet LSPP requirements?
-+ */
-+
-+#undef WITH_LSPP
-+
-+
- #endif /* !_CUPS_CONFIG_H_ */
- 
- /*
---- cups-1.2.2/scheduler/printers.c.lspp	2006-07-21 12:42:35.000000000 +0100
-+++ cups-1.2.2/scheduler/printers.c	2006-07-21 12:42:40.000000000 +0100
-@@ -57,6 +57,8 @@
-  *                                 printing desktop tools.
+diff -burN cups-1.2.2-vanilla/Makedefs.in cups-1.2.2/Makedefs.in
+--- cups-1.2.2-vanilla/Makedefs.in	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/Makedefs.in	2006-08-01 07:08:43.000000000 -0400
+@@ -135,7 +135,7 @@
+ 			@LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM)
+ LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
+ LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
+-LIBS		=	$(LINKCUPS) $(COMMONLIBS)
++LIBS		=	$(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@
+ OPTIM		=	@OPTIM@
+ OPTIONS		=
+ PAMLIBS		=	@PAMLIBS@
+diff -burN cups-1.2.2-vanilla/scheduler/client.c cups-1.2.2/scheduler/client.c
+--- cups-1.2.2-vanilla/scheduler/client.c	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/scheduler/client.c	2006-08-01 07:08:37.000000000 -0400
+@@ -43,12 +43,17 @@
+  *   make_certificate()      - Make a self-signed SSL/TLS certificate.
+  *   pipe_command()          - Pipe the output of a command to the remote client.
+  *   write_file()            - Send a file via HTTP.
++ *   client_pid_to_auid()    - Get the audit login uid of the client.
   */
  
++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
 +/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
 +
  /*
   * Include necessary headers...
   */
-@@ -79,6 +81,9 @@
- static void	write_irix_state(cupsd_printer_t *p);
- #endif /* __sgi */
- 
-+#ifdef WITH_LSPP
-+#  include <libaudit.h>
-+#endif /* WITH_LSPP */
- 
- /*
-  * 'cupsdAddPrinter()' - Add a printer to the system.
-@@ -1472,6 +1477,9 @@
- 		  "two-sided-long-edge",
- 		  "two-sided-short-edge"
- 		};
-+#ifdef WITH_LSPP
-+  char		*audit_message;		/* Audit message string */
-+#endif /* WITH_LSPP */
- 
- 
-   DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1578,6 +1586,14 @@
-       attr->values[1].string.text = _cupsStrAlloc(Classification ?
- 	                                   Classification : p->job_sheets[1]);
-     }
-+#ifdef WITH_LSPP
-+    audit_message = NULL;
-+    cupsdSetStringf(&audit_message, "[Config] printer=%s uri=%s banners set to %s %s",
-+                    p->name, p->device_uri, p->job_sheets[0], p->job_sheets[1]);
-+    audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
-+                           ServerName, NULL, NULL, 1);
-+    free(audit_message);
-+#endif /* WITH_LSPP */
-   }
  
-   printer_type = p->type;
---- cups-1.2.2/scheduler/job.c.lspp	2006-07-21 12:42:35.000000000 +0100
-+++ cups-1.2.2/scheduler/job.c	2006-07-21 12:42:40.000000000 +0100
-@@ -68,6 +68,9 @@
-  *   unload_job()               - Unload a job from memory.
-  */
++#define _GNU_SOURCE
+ #include <cups/http-private.h>
+ #include "cupsd.h"
  
-+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
-+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
-+
- /*
-  * Include necessary headers...
-  */
-@@ -77,6 +80,11 @@
- #include <cups/backend.h>
- #include <cups/dir.h>
+@@ -64,6 +69,11 @@
+ #  include <gnutls/x509.h>
+ #endif /* HAVE_GNUTLS */
  
 +#ifdef WITH_LSPP
 +#include <selinux/selinux.h>
-+#include <selinux/context.h>
-+#include <libaudit.h>
++#include <fcntl.h>
 +#endif /* WITH_LSPP */
++
  
  /*
-  * Local globals...
-@@ -985,6 +993,23 @@
-     cupsdSetString(&job->dest, dest);
-   }
+  * Local functions...
+@@ -380,6 +390,53 @@
+                   "cupsdAcceptClient: %d connected to server on %s:%d",
+                   con->http.fd, con->servername, con->serverport);
  
 +#ifdef WITH_LSPP
-+  if ((attr = ippFindAttribute(job->attrs, "security-context", IPP_TAG_NAME)) != NULL)
-+    cupsdSetString(&job->scon, attr->values[0].string.text);
-+  else if (is_lspp_config())
++  if (is_lspp_config())
 +  {
++    struct ucred cr;
++    unsigned int cl=sizeof(cr);
++
++    if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl) == 0)
++    {
++     /*
++      * client_pid_to_auid() can be racey
++      * In this case the pid is based on a socket connected to the client
++      */
++      if ((con->auid = client_pid_to_auid(cr.pid)) == -1)
++      {
++        close(con->http.fd);
++        cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: unable to determine client auid");
++        return (cupsdCloseClient(con));
++      }
++      cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: peer's pid=%d, uid=%d, gid=%d, auid=%d",
++                      cr.pid, cr.uid, cr.gid, con->auid);
++    }
++    else
++    {
++      close(con->http.fd);
++      cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getsockopt() failed");
++      return (cupsdCloseClient(con));
++    }
++
 +   /*
-+    * There was no security context so delete the job
++    * get the context of the peer connection
 +    */
-+    cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!",
-+                    jobfile);
-+    ippDelete(job->attrs);
-+    job->attrs = NULL;
-+    unlink(jobfile);
-+    return;
++    if (getpeercon(con->http.fd, &con->scon))
++    {
++      cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getpeercon() failed");
++      cupsdSetString(&con->scon, UNKNOWN_SL);
++    }
++
++    cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: client context=%s", con->scon);
++
++  }
++  else
++  {
++    cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: skipping getpeercon()");
++    cupsdSetString(&con->scon, UNKNOWN_SL);
 +  }
 +#endif /* WITH_LSPP */
 +
-   job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
-                                      IPP_TAG_INTEGER);
-   job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -2428,6 +2453,17 @@
-   int			remote_job;	/* Remote print job? */
-   static char		*options = NULL;/* Full list of options */
-   static int		optlength = 0;	/* Length of option buffer */
-+#ifdef WITH_LSPP
-+  int			acstatus = 0;	/* return value of the access check */
-+  pid_t			acpid = -1;	/* pid for the access check */
-+  const char		*mls_label = NULL;	/* SL to put in classification env var */
-+  char			*audit_message = NULL;	/* Audit message string */
-+  char			*printerfile = NULL;	/* Device file pointed to by the printer */
-+  char			*acargv[3];	/* Command line args */
-+  char			buffer[1024] = {0};	/* argv[0] buffer */
-+  char			*acenvp[MAX_ENV];	/* Environment */
-+  context_t		job_context;	/* SELinux context of the job */
-+#endif /* WITH_LSPP */
- 
+  /*
+   * Using TCP_NODELAY improves responsiveness, especially on systems
+   * with a slow loopback interface...  Since we write large buffers
+@@ -3465,7 +3522,6 @@
+   time_t		curtime;	/* Current time */
+   int			result;		/* Result of GNU TLS calls */
  
-   cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: id = %d, file = %d/%d",
-@@ -2709,6 +2745,76 @@
+-
+  /*
+   * Create the encryption key...
+   */
+@@ -3664,6 +3720,49 @@
+ #endif /* HAVE_SSL */
  
-   cupsdLogMessage(CUPSD_LOG_DEBUG, "banner_page = %d", banner_page);
  
 +#ifdef WITH_LSPP
-+  if (is_lspp_config())
-+  {
-+   /*
-+    * Perform an access check before printing, but only if the printer starts with /dev/
-+    */
-+    printerfile = strdup(printer->device_uri);
-+    if ((printerfile = strrchr(printer->device_uri, '=')) == NULL)
-+    {
-+      if ((printerfile = strrchr(printer->device_uri, ':')) == NULL)
-+      {
-+        cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to determine printer device file");
-+        cupsdCancelJob(job, 0);
-+        return;
-+      }
-+    }
++/*
++ * 'client_pid_to_auid()' - Using the client's pid, read /proc and determine the loginuid.
++ */
 +
-+    printerfile++;
-+    if (strncmp(printerfile, "/dev/", 5) == 0)
-+    {
-+      if (setexeccon(job->scon) != 0)
-+      {
-+        cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to setexeccon to %s", job->scon);
-+        cupsdCancelJob(job, 0);
-+        return;
-+      }
++uid_t client_pid_to_auid(pid_t clipid)
++{
++  uid_t uid;
++  int len, in;
++  char buf[16] = {0};
++  char fname[32] = {0};
 +
-+      cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: Attempting to check access on printer device %s",
-+                      printerfile);
 +
-+      snprintf(buffer, sizeof(buffer), "%s/daemon/access", ServerBin);
-+      acargv[0] = "access";
-+      acargv[1] = printerfile;
-+      acargv[2] = NULL;
++ /*
++  * Hopefully this pid is still the one we are interested in.
++  */
++  snprintf(fname, 32, "/proc/%d/loginuid", clipid);
++  in = open(fname, O_NOFOLLOW|O_RDONLY);
 +
-+      cupsdLoadEnv(acenvp, (int)(sizeof(acenvp) / sizeof(acenvp[0])));
++  if (in < 0)
++    return -1;
 +
-+      if (!cupsdStartProcess(buffer, acargv, acenvp, -1, -1, -1, -1, 0, &acpid))
-+      {
-+        waitpid(acpid, &acstatus, 0);
-+        if (WIFEXITED(acstatus))
-+        {
-+          if (WEXITSTATUS(acstatus) != 0) 
-+          {
-+           /*
-+            * The access check failed, so cancel the job and send an audit message
-+            */
-+            audit_message = NULL;
-+            cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s cancelled,"
-+                                            " unable to access printer=%s",
-+                            job->id, job->auid, job->username, job->scon, printer->name);
-+            audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
-+                                   ServerName, NULL, NULL, 0);
-+            free(audit_message);
++  errno = 0;
 +
-+            cupsdCancelJob(job, 0);
++  do {
++    len = read(in, buf, sizeof(buf));
++  } while (len < 0 && errno == EINTR);
 +
-+            return;
-+          }
-+          else
-+          {
-+            cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: access check succeeded (returned %d)",
-+                            WEXITSTATUS(acstatus));
-+          }
-+        }
-+      }
-+    }
-+  }
-+#endif /* WITH_LSPP */
++  close(in);
 +
-  /*
-   * Building the options string is harder than it needs to be, but
-   * for the moment we need to pass strings for command-line args and
-@@ -3026,6 +3132,41 @@
-     envp[envc ++] = final_content_type;
-   }
- 
-+#ifdef WITH_LSPP
-+  if (is_lspp_config())
-+  {
-+    if (job->scon == NULL)
-+    {
-+      audit_message = NULL;
-+      cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s",
-+                      job->id, job->auid, job->username, printer->name);
-+      audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message,
-+                             ServerName, NULL, NULL, 1);
-+      free(audit_message);
-+    }
-+    else 
-+    {
-+      job_context = context_new(job->scon);
-+      if (strcasecmp(Classification, MLS_CONFIG) == 0)
-+        mls_label = context_range_get(job_context);
-+      else if (strcasecmp(Classification, TE_CONFIG) == 0)
-+        mls_label = context_type_get(job_context);
-+      else  // default is SELinux which means print the whole context
-+        mls_label = context_str(job_context);
-+      snprintf(classification, sizeof(classification), "CLASSIFICATION=%s",
-+               mls_label);
-+      envp[envc ++] = classification;
-+      audit_message = NULL;
-+      cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s obj=%s",
-+                      job->id, job->auid, job->username, printer->name, job->scon);
-+      audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
-+                             ServerName, NULL, NULL, 1);
-+      context_free(job_context);
-+      free(audit_message);
-+    }
-+  }
-+  else 
++  if (len < 0 || len >= sizeof(buf))
++    return -1;
++
++  buf[len] = 0;
++  uid = strtol(buf, 0, 10);
++
++  if (errno != 0)
++    return -1;
++  else
++    return uid;
++}
 +#endif /* WITH_LSPP */
-   if (Classification && !banner_page)
-   {
-     if ((attr = ippFindAttribute(job->attrs, "job-sheets",
---- cups-1.2.2/scheduler/client.h.lspp	2006-03-18 03:05:12.000000000 +0000
-+++ cups-1.2.2/scheduler/client.h	2006-07-21 12:42:40.000000000 +0100
++
+ /*
+  * 'pipe_command()' - Pipe the output of a command to the remote client.
+  */
+diff -burN cups-1.2.2-vanilla/scheduler/client.h cups-1.2.2/scheduler/client.h
+--- cups-1.2.2-vanilla/scheduler/client.h	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/scheduler/client.h	2006-08-01 07:08:37.000000000 -0400
 @@ -22,6 +22,13 @@
   *         WWW: http://www.cups.org
   */
@@ -1197,85 +1105,143 @@
  
  
  /*
---- cups-1.2.2/scheduler/main.c.lspp	2006-07-21 12:42:35.000000000 +0100
-+++ cups-1.2.2/scheduler/main.c	2006-07-21 12:42:40.000000000 +0100
-@@ -47,6 +47,8 @@
-  *   usage()                   - Show scheduler usage.
+diff -burN cups-1.2.2-vanilla/scheduler/conf.c cups-1.2.2/scheduler/conf.c
+--- cups-1.2.2-vanilla/scheduler/conf.c	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/scheduler/conf.c	2006-08-01 07:08:37.000000000 -0400
+@@ -35,6 +35,7 @@
+  *   read_configuration()     - Read a configuration file.
+  *   read_location()          - Read a <Location path> definition.
+  *   read_policy()            - Read a <Policy name> definition.
++ *   is_lspp_config()         - Is the system configured for LSPP
   */
  
-+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
-+
  /*
-  * Include necessary headers...
-  */
-@@ -69,6 +71,9 @@
- #  include <notify.h>
- #endif /* HAVE_NOTIFY_H */
+@@ -60,6 +61,9 @@
+ #  define INADDR_NONE	0xffffffff
+ #endif /* !INADDR_NONE */
  
 +#ifdef WITH_LSPP
 +#  include <libaudit.h>
 +#endif /* WITH_LSPP */
  
  /*
-  * Local functions...
-@@ -351,6 +356,17 @@
- #endif /* DEBUG */
+  * Configuration variable structure...
+@@ -161,6 +165,9 @@
+   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_STRING },
+ #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
+ #endif /* HAVE_SSL */
++#ifdef WITH_LSPP
++  { "AuditLog",			&AuditLog,		CUPSD_VARTYPE_INTEGER },
++#endif /* WITH_LSPP */
+ #ifdef HAVE_LAUNCHD
+   { "LaunchdTimeout",		&LaunchdTimeout,	CUPSD_VARTYPE_INTEGER },
+   { "LaunchdConf",		&LaunchdConf,		CUPSD_VARTYPE_STRING },
+@@ -223,6 +230,9 @@
+ 		*old_requestroot;	/* Old RequestRoot */
+   const char	*tmpdir;		/* TMPDIR environment variable */
+   struct stat	tmpinfo;		/* Temporary directory info */
++#ifdef WITH_LSPP
++  char		*audit_message;		/* Audit message string */
++#endif /* WITH_LSPP */
+ 
+ 
+  /*
+@@ -377,6 +387,16 @@
+     }
    }
  
 +#ifdef WITH_LSPP
-+  if ((AuditLog = audit_open()) < 0 )
-+  {
-+    if (is_lspp_config())
-+    {
-+      fprintf(stderr, "cupsd: unable to start auditing");
-+      return -1;
-+    }
-+  }
++  /*
++   * ClassifyOverride is set during read_configuration, if its on, report it now
++   */
++  if (ClassifyOverride)
++    audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG,
++              "[Config] ClassifyOverride=enabled Users can override print banners",
++              ServerName, NULL, NULL, 1);
 +#endif /* WITH_LSPP */
 +
   /*
-   * Set the timezone info...
+   * Numeric options...
    */
-@@ -1115,6 +1131,10 @@
-   free(input);
-   free(output);
+@@ -779,7 +799,16 @@
+     cupsdClearString(&Classification);
  
+   if (Classification)
++  {
+     cupsdLogMessage(CUPSD_LOG_INFO, "Security set to \"%s\"", Classification);
 +#ifdef WITH_LSPP
-+  audit_close(AuditLog);
++    audit_message = NULL;
++    cupsdSetStringf(&audit_message, "[Config] Security level=%s", Classification);
++    audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
++                           ServerName, NULL, NULL, 1);
++    free(audit_message);
 +#endif /* WITH_LSPP */
-+
-   return (!stop_scheduler);
- }
++  }
  
---- cups-1.2.2/scheduler/job.h.lspp	2006-04-14 19:17:18.000000000 +0100
-+++ cups-1.2.2/scheduler/job.h	2006-07-21 12:42:40.000000000 +0100
-@@ -22,6 +22,13 @@
-  *         WWW: http://www.cups.org
-  */
+  /*
+   * Update the MaxClientsPerHost value, as needed...
+@@ -2233,7 +2262,6 @@
+ 
+       cupsd_dirsvc_addr_t	*dira;	/* New browse address array */
+ 
+-
+       if (NumBrowsers == 0)
+         dira = malloc(sizeof(cupsd_dirsvc_addr_t));
+       else
+@@ -3286,6 +3314,18 @@
+   return (0);
+ }
  
-+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
-+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
-+
-+#ifdef WITH_LSPP
-+#include <selinux/selinux.h>
-+#endif /* WITH_LSPP */
-+
- /*
-  * Job request structure...
-  */
-@@ -55,6 +62,10 @@
-   int			status;		/* Status code from filters */
-   cupsd_printer_t	*printer;	/* Printer this job is assigned to */
-   int			tries;		/* Number of tries for this job */
 +#ifdef WITH_LSPP
-+  security_context_t	scon;		/* Security context of job */
-+  uid_t			auid;		/* Audit loginuid for this job */
++int is_lspp_config()
++{
++  if (Classification != NULL)
++    return ((strcasecmp(Classification, MLS_CONFIG) == 0) 
++            || (strcasecmp(Classification, TE_CONFIG) == 0)
++            || (strcasecmp(Classification, SELINUX_CONFIG) == 0));
++  else
++    return 0;
++}
 +#endif /* WITH_LSPP */
- } cupsd_job_t;
++
+ 
+ /*
+  * End of "$Id$".
+diff -burN cups-1.2.2-vanilla/scheduler/conf.h cups-1.2.2/scheduler/conf.h
+--- cups-1.2.2-vanilla/scheduler/conf.h	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/scheduler/conf.h	2006-08-01 07:08:37.000000000 -0400
+@@ -182,7 +182,6 @@
+ 					/* Number of MIME types */
+ VAR const char		**MimeTypes		VALUE(NULL);
+ 					/* Array of MIME types */
+-
+ #ifdef HAVE_SSL
+ VAR char		*ServerCertificate	VALUE(NULL);
+ 					/* Server certificate file */
+@@ -191,6 +190,10 @@
+ 					/* Server key file */
+ #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
+ #endif /* HAVE_SSL */
++#ifdef WITH_LSPP
++VAR int			AuditLog		VALUE(-1);
++					/* File descriptor for audit */
++#endif /* WITH_LSPP */
+ 
+ #ifdef HAVE_LAUNCHD
+ VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
+@@ -213,6 +216,9 @@
+ ;
+ extern int	cupsdLogPage(cupsd_job_t *job, const char *page);
  
++#ifdef WITH_LSPP
++extern int	is_lspp_config(void);
++#endif /* WITH_LSPP */
  
---- cups-1.2.2/scheduler/ipp.c.lspp	2006-07-21 12:42:35.000000000 +0100
-+++ cups-1.2.2/scheduler/ipp.c	2006-07-21 12:42:40.000000000 +0100
+ /*
+  * End of "$Id$".
+diff -burN cups-1.2.2-vanilla/scheduler/ipp.c cups-1.2.2/scheduler/ipp.c
+--- cups-1.2.2-vanilla/scheduler/ipp.c	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/scheduler/ipp.c	2006-08-01 07:08:37.000000000 -0400
 @@ -96,6 +96,9 @@
   *   validate_user()             - Validate the user for the request.
   */
@@ -1374,7 +1340,7 @@
 +        return (NULL);
 +      }
 +
-+      snprintf(buffer, sizeof(buffer), "%s/daemon/access", ServerBin);
++      snprintf(buffer, sizeof(buffer), "%s/daemon/lspp-access", ServerBin);
 +      argv[0] = "access";
 +      argv[1] = printerfile;
 +      argv[2] = NULL;
@@ -1572,173 +1538,279 @@
       /*
        * Yes...
        */
---- cups-1.2.2/scheduler/conf.c.lspp	2006-07-21 12:42:35.000000000 +0100
-+++ cups-1.2.2/scheduler/conf.c	2006-07-21 12:42:40.000000000 +0100
-@@ -35,6 +35,7 @@
-  *   read_configuration()     - Read a configuration file.
-  *   read_location()          - Read a <Location path> definition.
-  *   read_policy()            - Read a <Policy name> definition.
-+ *   is_lspp_config()         - Is the system configured for LSPP
+diff -burN cups-1.2.2-vanilla/scheduler/job.c cups-1.2.2/scheduler/job.c
+--- cups-1.2.2-vanilla/scheduler/job.c	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/scheduler/job.c	2006-08-01 07:08:37.000000000 -0400
+@@ -68,6 +68,9 @@
+  *   unload_job()               - Unload a job from memory.
   */
  
++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
++
  /*
-@@ -60,6 +61,9 @@
- #  define INADDR_NONE	0xffffffff
- #endif /* !INADDR_NONE */
+  * Include necessary headers...
+  */
+@@ -77,6 +80,11 @@
+ #include <cups/backend.h>
+ #include <cups/dir.h>
  
 +#ifdef WITH_LSPP
-+#  include <libaudit.h>
++#include <selinux/selinux.h>
++#include <selinux/context.h>
++#include <libaudit.h>
 +#endif /* WITH_LSPP */
  
  /*
-  * Configuration variable structure...
-@@ -161,6 +165,9 @@
-   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_STRING },
- #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
- #endif /* HAVE_SSL */
-+#ifdef WITH_LSPP
-+  { "AuditLog",			&AuditLog,		CUPSD_VARTYPE_INTEGER },
-+#endif /* WITH_LSPP */
- #ifdef HAVE_LAUNCHD
-   { "LaunchdTimeout",		&LaunchdTimeout,	CUPSD_VARTYPE_INTEGER },
-   { "LaunchdConf",		&LaunchdConf,		CUPSD_VARTYPE_STRING },
-@@ -223,6 +230,9 @@
- 		*old_requestroot;	/* Old RequestRoot */
-   const char	*tmpdir;		/* TMPDIR environment variable */
-   struct stat	tmpinfo;		/* Temporary directory info */
-+#ifdef WITH_LSPP
-+  char		*audit_message;		/* Audit message string */
-+#endif /* WITH_LSPP */
- 
- 
-  /*
-@@ -377,6 +387,16 @@
-     }
+  * Local globals...
+@@ -985,6 +993,23 @@
+     cupsdSetString(&job->dest, dest);
    }
  
 +#ifdef WITH_LSPP
-+  /*
-+   * ClassifyOverride is set during read_configuration, if its on, report it now
-+   */
-+  if (ClassifyOverride)
-+    audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG,
-+              "[Config] ClassifyOverride=enabled Users can override print banners",
-+              ServerName, NULL, NULL, 1);
++  if ((attr = ippFindAttribute(job->attrs, "security-context", IPP_TAG_NAME)) != NULL)
++    cupsdSetString(&job->scon, attr->values[0].string.text);
++  else if (is_lspp_config())
++  {
++   /*
++    * There was no security context so delete the job
++    */
++    cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!",
++                    jobfile);
++    ippDelete(job->attrs);
++    job->attrs = NULL;
++    unlink(jobfile);
++    return;
++  }
 +#endif /* WITH_LSPP */
 +
-  /*
-   * Numeric options...
-   */
-@@ -779,7 +799,16 @@
-     cupsdClearString(&Classification);
- 
-   if (Classification)
-+  {
-     cupsdLogMessage(CUPSD_LOG_INFO, "Security set to \"%s\"", Classification);
+   job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
+                                      IPP_TAG_INTEGER);
+   job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
+@@ -2428,6 +2453,17 @@
+   int			remote_job;	/* Remote print job? */
+   static char		*options = NULL;/* Full list of options */
+   static int		optlength = 0;	/* Length of option buffer */
 +#ifdef WITH_LSPP
-+    audit_message = NULL;
-+    cupsdSetStringf(&audit_message, "[Config] Security level=%s", Classification);
-+    audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
-+                           ServerName, NULL, NULL, 1);
-+    free(audit_message);
++  int			acstatus = 0;	/* return value of the access check */
++  pid_t			acpid = -1;	/* pid for the access check */
++  const char		*mls_label = NULL;	/* SL to put in classification env var */
++  char			*audit_message = NULL;	/* Audit message string */
++  char			*printerfile = NULL;	/* Device file pointed to by the printer */
++  char			*acargv[3];	/* Command line args */
++  char			buffer[1024] = {0};	/* argv[0] buffer */
++  char			*acenvp[MAX_ENV];	/* Environment */
++  context_t		job_context;	/* SELinux context of the job */
 +#endif /* WITH_LSPP */
-+  }
  
-  /*
-   * Update the MaxClientsPerHost value, as needed...
-@@ -2233,7 +2262,6 @@
  
-       cupsd_dirsvc_addr_t	*dira;	/* New browse address array */
+   cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: id = %d, file = %d/%d",
+@@ -2709,6 +2745,76 @@
  
--
-       if (NumBrowsers == 0)
-         dira = malloc(sizeof(cupsd_dirsvc_addr_t));
-       else
-@@ -3286,6 +3314,18 @@
-   return (0);
- }
+   cupsdLogMessage(CUPSD_LOG_DEBUG, "banner_page = %d", banner_page);
  
 +#ifdef WITH_LSPP
-+int is_lspp_config()
-+{
-+  if (Classification != NULL)
-+    return ((strcasecmp(Classification, MLS_CONFIG) == 0) 
-+            || (strcasecmp(Classification, TE_CONFIG) == 0)
-+            || (strcasecmp(Classification, SELINUX_CONFIG) == 0));
-+  else
-+    return 0;
-+}
-+#endif /* WITH_LSPP */
-+
- 
- /*
-  * End of "$Id$".
---- /dev/null	2006-07-21 09:48:40.571484750 +0100
-+++ cups-1.2.2/scheduler/access.c	2006-07-21 12:42:40.000000000 +0100
-@@ -0,0 +1,56 @@
-+/*
-+ *   Copyright (C) Hewlett-Packard Development Company, L.P., 2006
-+ *
-+ *   This program is free software;  you can redistribute it and/or modify
-+ *   it under the terms of the GNU General Public License as published by
-+ *   the Free Software Foundation; either version 2 of the License, or
-+ *   (at your option) any later version.
-+ *
-+ *   This program is distributed in the hope that it will be useful,
-+ *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
-+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-+ *   the GNU General Public License for more details.
-+ *
-+ *   You should have received a copy of the GNU General Public License
-+ *   along with this program;  if not, write to the Free Software
-+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * Contents:
-+ *
-+ *   main()               - Main entry for the access checker.
-+ */
++  if (is_lspp_config())
++  {
++   /*
++    * Perform an access check before printing, but only if the printer starts with /dev/
++    */
++    printerfile = strdup(printer->device_uri);
++    if ((printerfile = strrchr(printer->device_uri, '=')) == NULL)
++    {
++      if ((printerfile = strrchr(printer->device_uri, ':')) == NULL)
++      {
++        cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to determine printer device file");
++        cupsdCancelJob(job, 0);
++        return;
++      }
++    }
 +
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <string.h>
++    printerfile++;
++    if (strncmp(printerfile, "/dev/", 5) == 0)
++    {
++      if (setexeccon(job->scon) != 0)
++      {
++        cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to setexeccon to %s", job->scon);
++        cupsdCancelJob(job, 0);
++        return;
++      }
 +
-+int main(int argc, char *argv[]) {
-+  int status = -1;
-+  char filename[FILENAME_MAX+1] = {0};
++      cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: Attempting to check access on printer device %s",
++                      printerfile);
 +
-+  if (argc < 2)
-+  {
-+    printf("Check for access to which file? ");
-+    scanf("%s", (char *)&filename);
-+  }
-+  else
-+  {
-+    strncpy(filename, argv[1], FILENAME_MAX);
-+  }
++      snprintf(buffer, sizeof(buffer), "%s/daemon/lspp-access", ServerBin);
++      acargv[0] = "access";
++      acargv[1] = printerfile;
++      acargv[2] = NULL;
 +
-+  status = access(filename, R_OK|W_OK);
++      cupsdLoadEnv(acenvp, (int)(sizeof(acenvp) / sizeof(acenvp[0])));
 +
-+  if (argc < 2)
-+  {
-+   /*
-+    * Assume the user would like to hear the answer on the terminal
-+    * since the filename was received interactively.
-+    */
-+    if (status != 0)
-+      printf("Unable to access that file.\n");
-+    else
-+      printf("Access Granted\n");
++      if (!cupsdStartProcess(buffer, acargv, acenvp, -1, -1, -1, -1, 0, &acpid))
++      {
++        waitpid(acpid, &acstatus, 0);
++        if (WIFEXITED(acstatus))
++        {
++          if (WEXITSTATUS(acstatus) != 0) 
++          {
++           /*
++            * The access check failed, so cancel the job and send an audit message
++            */
++            audit_message = NULL;
++            cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s cancelled,"
++                                            " unable to access printer=%s",
++                            job->id, job->auid, job->username, job->scon, printer->name);
++            audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
++                                   ServerName, NULL, NULL, 0);
++            free(audit_message);
++
++            cupsdCancelJob(job, 0);
++
++            return;
++          }
++          else
++          {
++            cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: access check succeeded (returned %d)",
++                            WEXITSTATUS(acstatus));
++          }
++        }
++      }
++    }
 +  }
-+  
-+  return status;
-+}
---- cups-1.2.2/scheduler/Makefile.lspp	2006-07-13 20:59:36.000000000 +0100
-+++ cups-1.2.2/scheduler/Makefile	2006-07-21 12:42:40.000000000 +0100
++#endif /* WITH_LSPP */
++
+  /*
+   * Building the options string is harder than it needs to be, but
+   * for the moment we need to pass strings for command-line args and
+@@ -3026,6 +3132,41 @@
+     envp[envc ++] = final_content_type;
+   }
+ 
++#ifdef WITH_LSPP
++  if (is_lspp_config())
++  {
++    if (job->scon == NULL)
++    {
++      audit_message = NULL;
++      cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s",
++                      job->id, job->auid, job->username, printer->name);
++      audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message,
++                             ServerName, NULL, NULL, 1);
++      free(audit_message);
++    }
++    else 
++    {
++      job_context = context_new(job->scon);
++      if (strcasecmp(Classification, MLS_CONFIG) == 0)
++        mls_label = context_range_get(job_context);
++      else if (strcasecmp(Classification, TE_CONFIG) == 0)
++        mls_label = context_type_get(job_context);
++      else  // default is SELinux which means print the whole context
++        mls_label = context_str(job_context);
++      snprintf(classification, sizeof(classification), "CLASSIFICATION=%s",
++               mls_label);
++      envp[envc ++] = classification;
++      audit_message = NULL;
++      cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s obj=%s",
++                      job->id, job->auid, job->username, printer->name, job->scon);
++      audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
++                             ServerName, NULL, NULL, 1);
++      context_free(job_context);
++      free(audit_message);
++    }
++  }
++  else 
++#endif /* WITH_LSPP */
+   if (Classification && !banner_page)
+   {
+     if ((attr = ippFindAttribute(job->attrs, "job-sheets",
+diff -burN cups-1.2.2-vanilla/scheduler/job.h cups-1.2.2/scheduler/job.h
+--- cups-1.2.2-vanilla/scheduler/job.h	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/scheduler/job.h	2006-08-01 07:08:37.000000000 -0400
+@@ -22,6 +22,13 @@
+  *         WWW: http://www.cups.org
+  */
+ 
++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
++
++#ifdef WITH_LSPP
++#include <selinux/selinux.h>
++#endif /* WITH_LSPP */
++
+ /*
+  * Job request structure...
+  */
+@@ -55,6 +62,10 @@
+   int			status;		/* Status code from filters */
+   cupsd_printer_t	*printer;	/* Printer this job is assigned to */
+   int			tries;		/* Number of tries for this job */
++#ifdef WITH_LSPP
++  security_context_t	scon;		/* Security context of job */
++  uid_t			auid;		/* Audit loginuid for this job */
++#endif /* WITH_LSPP */
+ } cupsd_job_t;
+ 
+ 
+diff -burN cups-1.2.2-vanilla/scheduler/main.c cups-1.2.2/scheduler/main.c
+--- cups-1.2.2-vanilla/scheduler/main.c	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/scheduler/main.c	2006-08-01 07:08:37.000000000 -0400
+@@ -47,6 +47,8 @@
+  *   usage()                   - Show scheduler usage.
+  */
+ 
++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
++
+ /*
+  * Include necessary headers...
+  */
+@@ -69,6 +71,9 @@
+ #  include <notify.h>
+ #endif /* HAVE_NOTIFY_H */
+ 
++#ifdef WITH_LSPP
++#  include <libaudit.h>
++#endif /* WITH_LSPP */
+ 
+ /*
+  * Local functions...
+@@ -351,6 +359,17 @@
+ #endif /* DEBUG */
+   }
+ 
++#ifdef WITH_LSPP
++  if ((AuditLog = audit_open()) < 0 )
++  {
++    if (is_lspp_config())
++    {
++      fprintf(stderr, "cupsd: unable to start auditing");
++      return -1;
++    }
++  }
++#endif /* WITH_LSPP */
++
+  /*
+   * Set the timezone info...
+   */
+@@ -1115,6 +1142,10 @@
+   free(input);
+   free(output);
+ 
++#ifdef WITH_LSPP
++  audit_close(AuditLog);
++#endif /* WITH_LSPP */
++
+   return (!stop_scheduler);
+ }
+ 
+diff -burN cups-1.2.2-vanilla/scheduler/Makefile cups-1.2.2/scheduler/Makefile
+--- cups-1.2.2-vanilla/scheduler/Makefile	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/scheduler/Makefile	2006-08-01 07:08:37.000000000 -0400
 @@ -54,6 +54,7 @@
  OBJS	=	\
  		$(CUPSDOBJS) \
  		$(MIMEOBJS) \
-+		access.o \
++		lspp-access.o \
  		cups-deviced.o \
  		cups-driverd.o \
  		cups-lpd.o \
@@ -1746,216 +1818,176 @@
  		testspeed.o \
  		util.o
  TARGETS	=	\
-+		access \
++		lspp-access \
  		cupsd \
  		cups-deviced \
  		cups-driverd \
-@@ -111,7 +113,8 @@
+@@ -111,11 +113,12 @@
  	$(INSTALL_DIR) -m 755 $(SERVERBIN)
  	echo Creating $(SERVERBIN)/daemon...
  	$(INSTALL_DIR) -m 755 $(SERVERBIN)/daemon
 -	echo Installing cups-deviced, cups-driverd, cups-lpd, and cups-polld in $(SERVERBIN)/daemon...
-+	echo Installing access cups-deviced, cups-driverd, cups-lpd, and cups-polld in $(SERVERBIN)/daemon...
-+	$(INSTALL_BIN) access $(SERVERBIN)/daemon
++	echo Installing cups-deviced, cups-driverd, cups-lpd, cups-polld, and lspp-access in $(SERVERBIN)/daemon...
  	$(INSTALL_BIN) cups-deviced $(SERVERBIN)/daemon
  	$(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon
  	$(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
-@@ -157,6 +160,7 @@
- 
- uninstall:	all
- 	$(RM) $(SBINDIR)/cupsd
-+	$(RM) $(SERVERBIN)/daemon/access
- 	$(RM) $(SERVERBIN)/daemon/cups-deviced
+ 	$(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
++	$(INSTALL_BIN) lspp-access $(SERVERBIN)/daemon
+ 	echo Creating $(SERVERBIN)/driver...
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
+ 	echo Creating $(SERVERROOT)...
+@@ -161,6 +164,7 @@
  	$(RM) $(SERVERBIN)/daemon/cups-driverd
  	$(RM) $(SERVERBIN)/daemon/cups-lpd
---- cups-1.2.2/scheduler/conf.h.lspp	2006-07-21 12:42:35.000000000 +0100
-+++ cups-1.2.2/scheduler/conf.h	2006-07-21 12:42:40.000000000 +0100
-@@ -182,7 +182,6 @@
- 					/* Number of MIME types */
- VAR const char		**MimeTypes		VALUE(NULL);
- 					/* Array of MIME types */
--
- #ifdef HAVE_SSL
- VAR char		*ServerCertificate	VALUE(NULL);
- 					/* Server certificate file */
-@@ -191,6 +190,10 @@
- 					/* Server key file */
- #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
- #endif /* HAVE_SSL */
-+#ifdef WITH_LSPP
-+VAR int			AuditLog		VALUE(-1);
-+					/* File descriptor for audit */
-+#endif /* WITH_LSPP */
- 
- #ifdef HAVE_LAUNCHD
- VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
-@@ -213,6 +216,9 @@
- ;
- extern int	cupsdLogPage(cupsd_job_t *job, const char *page);
- 
-+#ifdef WITH_LSPP
-+extern int	is_lspp_config(void);
-+#endif /* WITH_LSPP */
- 
- /*
-  * End of "$Id$".
---- cups-1.2.2/scheduler/client.c.lspp	2006-07-21 12:42:35.000000000 +0100
-+++ cups-1.2.2/scheduler/client.c	2006-07-21 12:43:29.000000000 +0100
-@@ -43,12 +43,17 @@
-  *   make_certificate()      - Make a self-signed SSL/TLS certificate.
-  *   pipe_command()          - Pipe the output of a command to the remote client.
-  *   write_file()            - Send a file via HTTP.
-+ *   client_pid_to_auid()    - Get the audit login uid of the client.
+ 	$(RM) $(SERVERBIN)/daemon/cups-polld
++	$(RM) $(SERVERBIN)/daemon/lspp-access
+ 	-$(RMDIR) $(STATEDIR)/certs
+ 	-$(RMDIR) $(STATEDIR)
+ 	-$(RMDIR) $(SERVERROOT)/ppd
+diff -burN cups-1.2.2-vanilla/scheduler/printers.c cups-1.2.2/scheduler/printers.c
+--- cups-1.2.2-vanilla/scheduler/printers.c	2006-08-01 07:07:28.000000000 -0400
++++ cups-1.2.2/scheduler/printers.c	2006-08-01 07:08:37.000000000 -0400
+@@ -57,6 +57,8 @@
+  *                                 printing desktop tools.
   */
  
-+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
 +/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
 +
  /*
   * Include necessary headers...
   */
- 
-+#define _GNU_SOURCE
- #include <cups/http-private.h>
- #include "cupsd.h"
- 
-@@ -64,6 +69,11 @@
- #  include <gnutls/x509.h>
- #endif /* HAVE_GNUTLS */
+@@ -79,6 +81,9 @@
+ static void	write_irix_state(cupsd_printer_t *p);
+ #endif /* __sgi */
  
 +#ifdef WITH_LSPP
-+#include <selinux/selinux.h>
-+#include <fcntl.h>
++#  include <libaudit.h>
 +#endif /* WITH_LSPP */
-+
  
  /*
-  * Local functions...
-@@ -380,6 +390,45 @@
-                   "cupsdAcceptClient: %d connected to server on %s:%d",
-                   con->http.fd, con->servername, con->serverport);
- 
+  * 'cupsdAddPrinter()' - Add a printer to the system.
+@@ -1472,6 +1477,9 @@
+ 		  "two-sided-long-edge",
+ 		  "two-sided-short-edge"
+ 		};
 +#ifdef WITH_LSPP
-+  if (is_lspp_config())
-+  {
-+    struct ucred cr;
-+    unsigned int cl=sizeof(cr);
-+
-+    if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl)==0) {
-+     /*
-+      * client_pid_to_auid() can be racey
-+      * In this case the pid is based on a socket connected to the client
-+      */
-+      con->auid = client_pid_to_auid(cr.pid);
-+      cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: peer's pid=%d, uid=%d, gid=%d, auid=%d",
-+                      cr.pid, cr.uid, cr.gid, con->auid);
-+    } else {
-+      close(con->http.fd);
-+      cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getsockopt() failed");
-+      return (cupsdCloseClient(con));
-+    }
-+
-+   /*
-+    * get the context of the peer connection
-+    */
-+    if (getpeercon(con->http.fd, &con->scon))
-+    {
-+      cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getpeercon() failed");
-+      cupsdSetString(&con->scon, UNKNOWN_SL);
-+    }
-+
-+    cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: client context=%s", con->scon);
-+
-+  }
-+  else
-+  {
-+    cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: skipping getpeercon()");
-+    cupsdSetString(&con->scon, UNKNOWN_SL);
-+  }
++  char		*audit_message;		/* Audit message string */
 +#endif /* WITH_LSPP */
-+
-  /*
-   * Using TCP_NODELAY improves responsiveness, especially on systems
-   * with a slow loopback interface...  Since we write large buffers
-@@ -3465,7 +3514,6 @@
-   time_t		curtime;	/* Current time */
-   int			result;		/* Result of GNU TLS calls */
- 
--
-  /*
-   * Create the encryption key...
-   */
-@@ -3664,6 +3712,49 @@
- #endif /* HAVE_SSL */
  
  
+   DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
+@@ -1578,6 +1586,14 @@
+       attr->values[1].string.text = _cupsStrAlloc(Classification ?
+ 	                                   Classification : p->job_sheets[1]);
+     }
 +#ifdef WITH_LSPP
-+/*
-+ * 'client_pid_to_auid()' - Using the client's pid, read /proc and determine the loginuid.
-+ */
-+
-+uid_t client_pid_to_auid(pid_t clipid)
-+{
-+  uid_t uid;
-+  int len, in;
-+  char buf[16] = {0};
-+  char fname[32] = {0};
-+
-+
-+ /*
-+  * Hopefully this pid is still the one we are interested in.
-+  */
-+  snprintf(fname, 32, "/proc/%d/loginuid", clipid);
-+  in = open(fname, O_NOFOLLOW|O_RDONLY);
-+
-+  if (in < 0)
-+    return -1;
-+
-+  errno = 0;
++    audit_message = NULL;
++    cupsdSetStringf(&audit_message, "[Config] printer=%s uri=%s banners set to %s %s",
++                    p->name, p->device_uri, p->job_sheets[0], p->job_sheets[1]);
++    audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
++                           ServerName, NULL, NULL, 1);
++    free(audit_message);
++#endif /* WITH_LSPP */
+   }
+ 
+   printer_type = p->type;
+--- /dev/null	2006-07-21 09:48:40.571484750 +0100
++++ cups-1.2.2/config-scripts/cups-lspp.m4	2006-07-21 12:42:40.000000000 +0100
+@@ -0,0 +1,36 @@
++dnl
++dnl   LSPP code for the Common UNIX Printing System (CUPS).
++dnl
++dnl   Copyright 2005-2006 by Hewlett-Packard Development Company, L.P.
++dnl
++dnl   This program is free software; you can redistribute it and/or modify
++dnl   it under the terms of the GNU General Public License as published by
++dnl   the Free Software Foundation; version 2.
++dnl
++dnl   This program is distributed in the hope that it will be useful, but
++dnl   WITHOUT ANY WARRANTY; without even the implied warranty of
++dnl   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++dnl   General Public License for more details.
++dnl
++dnl   You should have received a copy of the GNU General Public License
++dnl   along with this program; if not, write to the Free Software Foundation,
++dnl   Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301 USA
++dnl
 +
-+  do {
-+    len = read(in, buf, sizeof(buf));
-+  } while (len < 0 && errno == EINTR);
++dnl Are we trying to meet LSPP requirements
++AC_ARG_ENABLE(lspp, [  --enable-lspp           turn on auditing and label support, default=no])
 +
-+  close(in);
++if test x"$enable_lspp" != xno; then
++    case "$uname" in
++        Linux)
++            AC_CHECK_LIB(audit,audit_log_user_message, [LIBAUDIT="-laudit" AC_SUBST(LIBAUDIT)])
++            AC_CHECK_HEADER(libaudit.h)
++            AC_CHECK_LIB(selinux,getpeercon, [LIBSELINUX="-lselinux" AC_SUBST(LIBSELINUX)])
++            AC_CHECK_HEADER(selinux/selinux.h)
++            AC_DEFINE(WITH_LSPP)
++            ;;
++        *)
++            # All others
++            ;;
++    esac
++fi
+--- /dev/null	2006-07-21 09:48:40.571484750 +0100
++++ cups-1.2.2/scheduler/lspp-access.c	2006-07-21 12:42:40.000000000 +0100
+@@ -0,0 +1,56 @@
++/*
++ *   Copyright (C) Hewlett-Packard Development Company, L.P., 2006
++ *
++ *   This program is free software;  you can redistribute it and/or modify
++ *   it under the terms of the GNU General Public License as published by
++ *   the Free Software Foundation; either version 2 of the License, or
++ *   (at your option) any later version.
++ *
++ *   This program is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
++ *   the GNU General Public License for more details.
++ *
++ *   You should have received a copy of the GNU General Public License
++ *   along with this program;  if not, write to the Free Software
++ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ * Contents:
++ *
++ *   main()               - Main entry for the access checker.
++ */
 +
-+  if (len < 0 || len >= sizeof(buf))
-+    return -1;
++#include <stdio.h>
++#include <unistd.h>
++#include <string.h>
 +
-+  buf[len] = 0;
-+  uid = strtol(buf, 0, 10);
++int main(int argc, char *argv[]) {
++  int status = -1;
++  char filename[FILENAME_MAX+1] = {0};
 +
-+  if (errno != 0)
-+    return -1;
++  if (argc < 2)
++  {
++    printf("Check for access to which file? ");
++    scanf("%s", (char *)&filename);
++  }
 +  else
-+    return uid;
-+}
-+#endif /* WITH_LSPP */
++  {
++    strncpy(filename, argv[1], FILENAME_MAX);
++  }
 +
- /*
-  * 'pipe_command()' - Pipe the output of a command to the remote client.
-  */
---- cups-1.2.2/cups/cups.h.lspp	2006-03-06 03:39:28.000000000 +0000
-+++ cups-1.2.2/cups/cups.h	2006-07-21 12:42:40.000000000 +0100
-@@ -24,6 +24,8 @@
-  *   This file is subject to the Apple OS-Developed Software exception.
-  */
- 
-+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
++  status = access(filename, R_OK|W_OK);
 +
- #ifndef _CUPS_CUPS_H_
- #  define _CUPS_CUPS_H_
- 
-@@ -68,6 +70,12 @@
- #  define CUPS_DATE_ANY		-1
- 
- 
-+# ifdef WITH_LSPP
-+# define MLS_CONFIG "mls"
-+# define TE_CONFIG "te"
-+# define SELINUX_CONFIG "SELinux"
-+# define UNKNOWN_SL "UNKNOWN SL"
-+# endif /* WITH_LSPP */
- /*
-  * Types and structures...
-  */
++  if (argc < 2)
++  {
++   /*
++    * Assume the user would like to hear the answer on the terminal
++    * since the filename was received interactively.
++    */
++    if (status != 0)
++      printf("Unable to access that file.\n");
++    else
++      printf("Access Granted\n");
++  }
++  
++  return status;
++}
+
+


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- cups.spec	28 Jul 2006 14:45:41 -0000	1.237
+++ cups.spec	2 Aug 2006 09:37:31 -0000	1.238
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -409,6 +409,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Aug  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-7
+- Updated LSPP patch from Matt Anderson.
+
 * Fri Jul 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-6
 - Use replacement snmp.c from STR #1737 (bug #193093).
 - Re-enable LSPP; doesn't harm browsing after all.



From fedora-cvs-commits at redhat.com  Wed Aug  2 09:40:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 05:40:37 -0400
Subject: rpms/openoffice.org/devel workspace.gcjsix.patch, NONE,
	1.1 openoffice.org.spec, 1.809,
	1.810 openoffice.org-2.0.2-rhXXXXXX.solenv.gcjproblem.patch, 1.1,
	NONE openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch,
	1.5, NONE
Message-ID: <200608020940.k729ebQh028732@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.gcjsix.patch 
Removed Files:
	openoffice.org-2.0.2-rhXXXXXX.solenv.gcjproblem.patch 
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch 
Log Message:
reshuffle

workspace.gcjsix.patch:
 bean/native/unix/makefile.mk                 |    6 +++---
 config_office/configure.in                   |    6 ++++--
 config_office/set_soenv.in                   |    7 +++----
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |    7 +++++++
 native/unix/makefile.mk                      |    0 
 plugins/sunmajor/pluginlib/gnujre.cxx        |    0 
 6 files changed, 17 insertions(+), 9 deletions(-)

--- NEW FILE workspace.gcjsix.patch ---
Index: plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.7
diff -u -r1.7 gnujre.cxx
--- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	16 Mar 2006 13:13:00 -0000	1.7
+++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	20 Jul 2006 16:33:05 -0000
@@ -63,6 +63,11 @@
 char const* const* GnuInfo::getRuntimePaths(int * size)
 {
     static char const* ar[]= {
+#ifdef WNT
+          "/bin/client/jvm.dll",
+#elif UNX
+          "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+#endif
 #ifdef X86_64
           "/lib64/libgcj.so.7",
           "/lib64/libgcj.so.6"
--- openoffice.org.orig/config_office/configure.in	2006-07-20 20:38:59.000000000 +0100
+++ openoffice.org/config_office/configure.in	2006-07-20 20:41:08.000000000 +0100
@@ -2036,7 +2036,9 @@
       elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
         JDK=gcj
         AC_MSG_RESULT([checked (gcj)]) 
-        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
+        if test -z "$JAVA_HOME"; then
+         JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
+        fi
       elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
         JDK=bea
 
@@ -2208,7 +2210,7 @@
       AC_CHECK_LIB(jawt, JAWT_GetAWT, [ AWTLIB=-ljawt ] )
    fi
    if test -z "$AWTLIB"; then
-      AC_MSG_ERROR([either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj])
+      AC_MSG_WARN([either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj])
    fi
    AC_SUBST(AWTLIB)
 
Index: native/unix/makefile.mk
===================================================================
RCS file: /cvs/api/bean/native/unix/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- openoffice.org.orig/bean/native/unix/makefile.mk	16 Jun 2005 14:38:39 -0000	1.7
+++ openoffice.org/bean/native/unix/makefile.mk	21 Jul 2006 08:58:02 -0000
@@ -28,9 +28,9 @@
 SHL1TARGET=$(TARGET)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
 SHL1STDLIBS=$(AWTLIB)
-.IF "$(JDK)" == "gcj"
-SHL1STDLIBS+=-lgcj
-.ENDIF
+#.IF "$(JDK)" == "gcj"
+#SHL1STDLIBS+=-lgcj
+#.ENDIF
 
 .IF "$(OS)" == "LINUX"
 .IF "$(CPUNAME)" == "S390"
--- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2006-07-20 22:37:37.000000000 +0100
+++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2006-07-20 22:40:28.000000000 +0100
@@ -69,9 +69,11 @@
           "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
 #endif
 #ifdef X86_64
+          "/lib64/gcj-4.1.1/libjvm.so",
           "/lib64/libgcj.so.7",
           "/lib64/libgcj.so.6"
 #else
+          "/lib/gcj-4.1.1/libjvm.so",
           "/lib/libgcj.so.7",
           "/lib/libgcj.so.6"
 #endif
--- openoffice.org.orig/config_office/set_soenv.in	2006-07-30 10:33:54.000000000 +0100
+++ openoffice.org/config_office/set_soenv.in	2006-07-30 10:35:32.000000000 +0100
@@ -425,10 +425,9 @@
       $CPU            = "P";
       $CPUNAME        = "POWERPC";
       $OUTPATH        = "unxlngppc";
-# j2sdk is IBMJava2-ppc-142
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."bin";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."bin";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
    }
    elsif ($platform =~ m/^s390/)
    {  print "Setting Linux S/390 specific values... ";


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -r1.809 -r1.810
--- openoffice.org.spec	1 Aug 2006 15:49:39 -0000	1.809
+++ openoffice.org.spec	2 Aug 2006 09:40:33 -0000	1.810
@@ -111,7 +111,7 @@
 Patch45: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch46: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch47: ooobuild.VBAObjects.patch
-Patch48: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
+Patch48: workspace.gcjsix.patch
 Patch49: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
 Patch50: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
 Patch51: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
@@ -910,7 +910,7 @@
 %patch45 -p1 -b .rh187919.gtkunderkde.patch
 %patch46 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch47 -p0 -b .ooobuild.VBAObjects.patch
-%patch48 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
+%patch48 -p1 -b .workspace.gcjsix.patch
 %patch49 -p1 -b .ooo67644.sw.spacing.patch
 %patch50 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
 %patch51 -p1 -b .ooo67658.sfx2.reloadcrash.patch
@@ -1076,7 +1076,7 @@
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE11}
 
 # rh#163147# convert non AMT to AMT fonts
-sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
+sed -i -e "s/Thorndale/Times New Roman;Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
 sed -i -e "s/Albany /Albany AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu 
 sed -i -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu 
 


--- openoffice.org-2.0.2-rhXXXXXX.solenv.gcjproblem.patch DELETED ---


--- openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 11:09:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 07:09:08 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.810,
	1.811 openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch,
	1.1, NONE
Message-ID: <200608021109.k72B98L5001888@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch 
Log Message:
bring in updated icu work


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.810
retrieving revision 1.811
diff -u -r1.810 -r1.811
--- openoffice.org.spec	2 Aug 2006 09:40:33 -0000	1.810
+++ openoffice.org.spec	2 Aug 2006 11:09:06 -0000	1.811
@@ -83,7 +83,7 @@
 Patch17: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
 Patch18: openoffice.org-1.9.128.ooo54479.systemicu.patch
 Patch19: workspace.targetedaot.patch
-Patch20: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
+Patch20: workspace.icuupgrade.patch
 Patch21: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
 Patch22: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
 Patch23: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
@@ -882,7 +882,7 @@
 %patch17 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
 %patch18 -p1 -b .ooo54479.systemicu.patch
 %patch19 -p1 -b .workspace.targetedaot.patch
-%patch20 -p1 -b .ooo58663.vcl.missingglyph.patch
+%patch20 -p1 -b .workspace.icuupgrade.patch
 %patch21 -p1 -b .ooo58606.sw.pre-edit.patch
 %patch22 -p1 -b .ooo59997.sw.defaultbullets.patch
 %patch23 -p1 -b .ooo19976.framework.nofocussteal.patch
@@ -3515,6 +3515,7 @@
 	+ openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext, a bizarre, but
 	perfectly functional input method surrounding text implementation
 	based on the ATK bridge
+- rh#200805# replace ooo58663 missing glyph patch with workspace.icuupgrade.patch
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch


--- openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 11:16:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 07:16:59 -0400
Subject: rpms/sed/FC-4 sed-4.1.5-str_append.patch, NONE, 1.1 sed.spec, 1.27,
	1.28
Message-ID: <200608021116.k72BGxev022239@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	sed.spec 
Added Files:
	sed-4.1.5-str_append.patch 
Log Message:
- remove superfluous multibyte processing in str_append (#177246)


sed-4.1.5-str_append.patch:
 execute.c |   22 ----------------------
 1 files changed, 22 deletions(-)

--- NEW FILE sed-4.1.5-str_append.patch ---
diff -Bburp sed-4.1.5/sed/execute.c sed-4.1.5-my/sed/execute.c
--- sed-4.1.5/sed/execute.c	2006-08-02 12:59:30.000000000 +0200
+++ sed-4.1.5-my/sed/execute.c	2006-08-02 13:00:23.000000000 +0200
@@ -227,28 +227,6 @@ str_append(to, string, length)
     resize_line(to, new_length);
   MEMCPY(to->active + to->length, string, length);
   to->length = new_length;
-
-#ifdef HAVE_MBRTOWC
-  if (mb_cur_max == 1)
-    return;
-
-  while (length)
-    {
-      int n = MBRLEN (string, length, &to->mbstate);
-
-      /* An invalid sequence is treated like a singlebyte character. */
-      if (n == -1)
-	{
-	  memset (&to->mbstate, 0, sizeof (to->mbstate));
-	  n = 1;
-	}
-
-      if (n > 0)
-	length -= n;
-      else
-	break;
-    }
-#endif
 }
 
 static void str_append_modified P_((struct line *, const char *, size_t,


Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/FC-4/sed.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sed.spec	17 Jul 2006 11:39:11 -0000	1.27
+++ sed.spec	2 Aug 2006 11:16:57 -0000	1.28
@@ -5,12 +5,13 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 3.fc4
+Release: 4.fc4
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
 Source1: http://sed.sourceforge.net/sedfaq.txt
 Patch0: sed-4.1.5-bz185374.patch
+Patch1: sed-4.1.5-str_append.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --without-included-regex
@@ -65,7 +67,10 @@
 %{_mandir}/man*/*
 
 %changelog
-* Thu Mar 17 2005 Jakub Jelinek <jakub at redhat.com> 4.1.5-3
+* Wed Aug  2 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-4.fc4
+- remove superfluous multibyte processing in str_append (#177246)
+
+* Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-3.fc4
 - sync with devel branch
   - update to 4.1.5
   - #185374:



From fedora-cvs-commits at redhat.com  Wed Aug  2 11:24:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 07:24:20 -0400
Subject: rpms/sed/FC-5 sed-4.1.5-str_append.patch, NONE, 1.1 sed.spec, 1.31,
	1.32
Message-ID: <200608021124.k72BOKtM032141@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	sed.spec 
Added Files:
	sed-4.1.5-str_append.patch 
Log Message:
- remove superfluous multibyte processing in str_append (#177246)


sed-4.1.5-str_append.patch:
 execute.c |   22 ----------------------
 1 files changed, 22 deletions(-)

--- NEW FILE sed-4.1.5-str_append.patch ---
diff -Bburp sed-4.1.5/sed/execute.c sed-4.1.5-my/sed/execute.c
--- sed-4.1.5/sed/execute.c	2006-08-02 12:59:30.000000000 +0200
+++ sed-4.1.5-my/sed/execute.c	2006-08-02 13:00:23.000000000 +0200
@@ -227,28 +227,6 @@ str_append(to, string, length)
     resize_line(to, new_length);
   MEMCPY(to->active + to->length, string, length);
   to->length = new_length;
-
-#ifdef HAVE_MBRTOWC
-  if (mb_cur_max == 1)
-    return;
-
-  while (length)
-    {
-      int n = MBRLEN (string, length, &to->mbstate);
-
-      /* An invalid sequence is treated like a singlebyte character. */
-      if (n == -1)
-	{
-	  memset (&to->mbstate, 0, sizeof (to->mbstate));
-	  n = 1;
-	}
-
-      if (n > 0)
-	length -= n;
-      else
-	break;
-    }
-#endif
 }
 
 static void str_append_modified P_((struct line *, const char *, size_t,


Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/FC-5/sed.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sed.spec	17 Jul 2006 09:02:35 -0000	1.31
+++ sed.spec	2 Aug 2006 11:24:18 -0000	1.32
@@ -5,12 +5,13 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
 Source1: http://sed.sourceforge.net/sedfaq.txt
 Patch0: sed-4.1.5-bz185374.patch
+Patch1: sed-4.1.5-str_append.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --without-included-regex
@@ -65,6 +67,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Aug  2 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-4
+- remove superfluous multibyte processing in str_append (#177246)
+
 * Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-3
 - sync with devel branch
   - #185374:



From fedora-cvs-commits at redhat.com  Wed Aug  2 11:43:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 07:43:15 -0400
Subject: rpms/frysk/devel frysk.spec,1.79,1.80
Message-ID: <200608021143.k72BhF5O004754@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4726

Modified Files:
	frysk.spec 
Log Message:
- BuildRequires latest dogtail


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- frysk.spec	28 Jul 2006 22:25:51 -0000	1.79
+++ frysk.spec	2 Aug 2006 11:43:12 -0000	1.80
@@ -25,7 +25,7 @@
 BuildRequires:	libgconf-java-devel
 BuildRequires:	libvte-java-devel >= 0.12.0
 BuildRequires:  vte-devel >= 0.12.1
-BuildRequires:  dogtail >=  0.5.1
+BuildRequires:  dogtail >= 0.5.2
 BuildRequires:  xmlto
 BuildRequires:  sharutils
 BuildRequires:	transfig >= 3.2.0 
@@ -99,6 +99,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Aug  2 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.25.rh1-3
+- BuildRequires latest dogtail
+
 * Fri Jul 28 2006 Phil Muldoon <pmuldoon at redhat.com> -  0.0.1.2006.07.25.rh1-3
 - Add dogtail to BuildRequires 
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 11:47:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 07:47:10 -0400
Subject: rpms/sed/devel sed-4.1.5-str_append.patch, NONE, 1.1 sed.spec, 1.35,
	1.36
Message-ID: <200608021147.k72BlAGL016162@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/sed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14725

Modified Files:
	sed.spec 
Added Files:
	sed-4.1.5-str_append.patch 
Log Message:
- remove superfluous multibyte processing in str_append (#177246)


sed-4.1.5-str_append.patch:
 execute.c |   22 ----------------------
 1 files changed, 22 deletions(-)

--- NEW FILE sed-4.1.5-str_append.patch ---
diff -Bburp sed-4.1.5/sed/execute.c sed-4.1.5-my/sed/execute.c
--- sed-4.1.5/sed/execute.c	2006-08-02 12:59:30.000000000 +0200
+++ sed-4.1.5-my/sed/execute.c	2006-08-02 13:00:23.000000000 +0200
@@ -227,28 +227,6 @@ str_append(to, string, length)
     resize_line(to, new_length);
   MEMCPY(to->active + to->length, string, length);
   to->length = new_length;
-
-#ifdef HAVE_MBRTOWC
-  if (mb_cur_max == 1)
-    return;
-
-  while (length)
-    {
-      int n = MBRLEN (string, length, &to->mbstate);
-
-      /* An invalid sequence is treated like a singlebyte character. */
-      if (n == -1)
-	{
-	  memset (&to->mbstate, 0, sizeof (to->mbstate));
-	  n = 1;
-	}
-
-      if (n > 0)
-	length -= n;
-      else
-	break;
-    }
-#endif
 }
 
 static void str_append_modified P_((struct line *, const char *, size_t,


Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/devel/sed.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sed.spec	17 Jul 2006 08:59:43 -0000	1.35
+++ sed.spec	2 Aug 2006 11:47:08 -0000	1.36
@@ -5,12 +5,13 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
 Source1: http://sed.sourceforge.net/sedfaq.txt
 Patch0: sed-4.1.5-bz185374.patch
+Patch1: sed-4.1.5-str_append.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --without-included-regex
@@ -65,6 +67,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Aug  2 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-4
+- remove superfluous multibyte processing in str_append (#177246)
+
 * Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-3
 - use dist tag
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 13:21:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 09:21:56 -0400
Subject: rpms/ftp/devel netkit-ftp-0.17-multiipv6.patch, NONE, 1.1 ftp.spec,
	1.28, 1.29
Message-ID: <200608021321.k72DLu2M013148@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/ftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18822

Modified Files:
	ftp.spec 
Added Files:
	netkit-ftp-0.17-multiipv6.patch 
Log Message:
--- netkit-ftp-0.17/ftp/ftp.c.multiipv6 2006-08-02 15:03:26.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp.c   2006-08-02 15:06:19.000000000 +0200
@@ -78,9 +78,7 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <arpa/ftp.h>
-#include <arpa/inet.h>
 #include <arpa/telnet.h>
-
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
@@ -132,7 +130,7 @@
 static sigjmp_buf ptabort;
 static int ptabflg = 0;
 static int abrtflag = 0;
-struct sockaddr_in source;
+struct sockaddr_storage source;

 void lostpeer(int);
 extern int connected;
@@ -154,8 +152,8 @@
 char *
 hookup(const char *host, const char *port)
 {
-       int s, tos, error, alen;
-       socklen_t len;
+       int s, tos, error;
+       socklen_t len, alen;
        static char hostnamebuf[256];
        struct addrinfo hints, *res, *res0;
        char hbuf[MAXHOSTNAMELEN], pbuf[NI_MAXSERV];
@@ -281,7 +279,15 @@
                printf("Connected to %s (%s).\n", hostname, hbuf);
        alen = sizeof(source);
        getsockname(s,(struct sockaddr*)&source, &alen);
-       source.sin_port = 0;    /* We just want the addr, not the port */
+       switch (source.ss_family) {
+           /* We just want the addr, not the port */
+           case AF_INET:
+               ((struct sockaddr_in *) &source)->sin_port = 0;
+               break;
+           case AF_INET6:
+               ((struct sockaddr_in6 *) &source)->sin6_port = 0;
+               break;
+       }

        if (getreply(0) > 2) {  /* read startup message from server    */
                if (cin)
@@ -1260,11 +1266,11 @@
                        return(1);
                }
                if((multihome) &&
-                       bind(data, (struct sockaddr*)&source, sizeof(source)) == -1) {
-                       close(data);
-                       data = -1;
-                       perror("ftp multihome bind");
-                       return(1);
+                       bind(data, (struct sockaddr *)&source, sizeof(source)) == -1) {
+                       close(data);
+                       data = -1;
+                       perror("ftp multihome bind");
+                       return(1);
                 }
                if (options & SO_DEBUG &&
                    setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on


netkit-ftp-0.17-multiipv6.patch:
 ftp.c |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

--- NEW FILE netkit-ftp-0.17-multiipv6.patch ---
--- netkit-ftp-0.17/ftp/ftp.c.multiipv6	2006-08-02 15:03:26.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp.c	2006-08-02 15:06:19.000000000 +0200
@@ -78,9 +78,7 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <arpa/ftp.h>
-#include <arpa/inet.h>
 #include <arpa/telnet.h>
-
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
@@ -132,7 +130,7 @@
 static sigjmp_buf ptabort;
 static int ptabflg = 0;
 static int abrtflag = 0;
-struct sockaddr_in source;
+struct sockaddr_storage source;
 
 void lostpeer(int);
 extern int connected;
@@ -154,8 +152,8 @@
 char *
 hookup(const char *host, const char *port)
 {
-	int s, tos, error, alen;
-	socklen_t len;
+	int s, tos, error;
+	socklen_t len, alen;
 	static char hostnamebuf[256];
 	struct addrinfo hints, *res, *res0;
 	char hbuf[MAXHOSTNAMELEN], pbuf[NI_MAXSERV];
@@ -281,7 +279,15 @@
 		printf("Connected to %s (%s).\n", hostname, hbuf);
 	alen = sizeof(source);
 	getsockname(s,(struct sockaddr*)&source, &alen);
-	source.sin_port = 0;    /* We just want the addr, not the port */
+	switch (source.ss_family) {
+	    /* We just want the addr, not the port */
+	    case AF_INET:
+		((struct sockaddr_in *) &source)->sin_port = 0;
+	        break;
+	    case AF_INET6:
+		((struct sockaddr_in6 *) &source)->sin6_port = 0;
+	        break;
+	}
 
 	if (getreply(0) > 2) { 	/* read startup message from server    */
 		if (cin)
@@ -1260,11 +1266,11 @@
 			return(1);
 		}
 		if((multihome) &&
-			bind(data, (struct sockaddr*)&source, sizeof(source)) == -1) {
-			close(data);
-			data = -1;
-			perror("ftp multihome bind");
-			return(1);
+                       bind(data, (struct sockaddr *)&source, sizeof(source)) == -1) {
+                       close(data);
+                       data = -1;
+                       perror("ftp multihome bind");
+                       return(1);
                 }
 		if (options & SO_DEBUG &&
 		    setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,


Index: ftp.spec
===================================================================
RCS file: /cvs/dist/rpms/ftp/devel/ftp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ftp.spec	26 Jul 2006 12:56:27 -0000	1.28
+++ ftp.spec	2 Aug 2006 13:21:51 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Name: ftp
 Version: 0.17
-Release: 32.1.2.2
+Release: 32.1.2.4
 License: BSD
 Group: Applications/Internet
 Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2
@@ -19,6 +19,7 @@
 Patch12: netkit-ftp-0.17-data.patch
 Patch13: netkit-ftp-0.17-multihome.patch
 Patch14: netkit-ftp-0.17-longnames.patch
+Patch15: netkit-ftp-0.17-multiipv6.patch
 
 BuildRoot: /var/tmp/%{name}-root
 BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel, perl
@@ -46,7 +47,8 @@
 %patch11 -p1 -b .C-Frame121
 %patch12 -p1 -b .data
 %patch13 -p1 -b .multihome
-%patch14 -p1 -b .longnames
+%patch14 -p1 -b .patch
+%patch15 -p1 -b .multiipv6
 
 %build
 sh configure --with-c-compiler=gcc --enable-ipv6
@@ -80,7 +82,10 @@
 %{_mandir}/man5/netrc.*
 
 %changelog
-* Thu Jul 25 2006 Marcela Maslanova <mmaslano at redhat.com> - 0.17-32.1.2.2
+* Wed Aug 2 2006 Marcela Maslanova <mmaslano at redhat.com> - 0.17-32.1.2.4
+- fix (#199145) patch for IPv6 multihome
+
+* Thu Jul 25 2006 Marcela Maslanova <mmaslano at redhat.com> - 0.17-32.1.2.3
 - fix (#196103) patch for long filenames
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.1.2.1



From fedora-cvs-commits at redhat.com  Wed Aug  2 13:49:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 09:49:42 -0400
Subject: rpms/gnome-screensaver/FC-5 .cvsignore, 1.18,
	1.19 gnome-screensaver.spec, 1.69, 1.70 sources, 1.21, 1.22
Message-ID: <200608021349.k72Dng1a002671@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/FC-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	30 May 2006 02:05:20 -0000	1.18
+++ .cvsignore	2 Aug 2006 13:49:40 -0000	1.19
@@ -9,3 +9,4 @@
 gnome-screensaver-2.13.92.tar.bz2
 gnome-screensaver-2.14.0.tar.bz2
 gnome-screensaver-2.14.2.tar.bz2
+gnome-screensaver-2.14.3.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/FC-5/gnome-screensaver.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gnome-screensaver.spec	6 Jun 2006 17:01:21 -0000	1.69
+++ gnome-screensaver.spec	2 Aug 2006 13:49:40 -0000	1.70
@@ -12,8 +12,8 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.14.2
-Release: 1.fc5.1
+Version: 2.14.3
+Release: 1%{?dist}
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -43,6 +43,11 @@
 BuildRequires: libXinerama-devel libXmu-devel
 # this is here because the configure tests look for protocol headers
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: gettext
+BuildRequires: perl-XML-Parser
+BuildRequires: nss-devel
+BuildRequires: automake, autoconf, libtool, intltool
+
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: libgnomeui >= %{libgnomeui_version}
@@ -161,6 +166,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-1.fc5.2
 - Require system-logos, not fedora-logos
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/FC-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	30 May 2006 02:05:20 -0000	1.21
+++ sources	2 Aug 2006 13:49:40 -0000	1.22
@@ -1,2 +1,2 @@
 661b1551a16e6aa948248b2443bad117  fedoralogo-floaters-lock-dialog.tar.gz
-f76677180432a89ac46a8507fe34b45a  gnome-screensaver-2.14.2.tar.bz2
+2ed0b9322d284bb1739e037165ca94f2  gnome-screensaver-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 13:54:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 09:54:46 -0400
Subject: rpms/eog/FC-5 .cvsignore, 1.29, 1.30 eog.spec, 1.47, 1.48 sources,
	1.30, 1.31
Message-ID: <200608021354.k72Dskmm004652@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eog/FC-5/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	28 May 2006 05:04:51 -0000	1.29
+++ .cvsignore	2 Aug 2006 13:54:44 -0000	1.30
@@ -1 +1 @@
-eog-2.14.2.tar.bz2
+eog-2.14.3.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/FC-5/eog.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- eog.spec	28 May 2006 05:04:51 -0000	1.47
+++ eog.spec	2 Aug 2006 13:54:44 -0000	1.48
@@ -12,8 +12,8 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.14.2
-Release: 1.fc5.1
+Version: 2.14.3
+Release: 1%{?dist}
 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
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Sun May 28 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/eog/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	28 May 2006 05:04:51 -0000	1.30
+++ sources	2 Aug 2006 13:54:44 -0000	1.31
@@ -1 +1 @@
-7653ae35509bd799bccfa4e6d819882a  eog-2.14.2.tar.bz2
+e90e4c1e314cfab04414464088098a16  eog-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 13:57:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 09:57:13 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-shutdown-races.patch, NONE,
	1.1 autofs.spec, 1.134, 1.135
Message-ID: <200608021357.k72DvDXo005681@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-shutdown-races.patch 
Log Message:
- Fix some shutdown races exposed by the connecathon tests.


autofs-5.0.1-rc1-shutdown-races.patch:
 CHANGELOG              |    1 
 Makefile.rules         |    2 
 daemon/automount.c     |  289 +++++++++-------------------------------------
 daemon/direct.c        |  305 ++++++++++++++++++++++++++-----------------------
 daemon/indirect.c      |  143 ++++++++++++----------
 daemon/lookup.c        |    6 
 daemon/state.c         |    5 
 include/automount.h    |    8 -
 include/parse_subs.h   |    5 
 lib/cache.c            |   13 +-
 lib/master.c           |   28 ----
 lib/mounts.c           |   68 ++++++++--
 lib/parse_subs.c       |  217 ++++++++++++++++++++++++++++++++++
 modules/lookup_file.c  |   14 +-
 modules/lookup_ldap.c  |    4 
 modules/lookup_yp.c    |    2 
 modules/mount_autofs.c |    1 
 modules/parse_sun.c    |   70 -----------
 18 files changed, 625 insertions(+), 556 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-shutdown-races.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index f68e16e..b0a255a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@
 - cthon more parser corrections and attempt to fix multi-mounts
   with various combinations of submounts (still broken).
 - cthon fix expire of various forms of nested mounts.
+- cthon fix some shutdown races.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/Makefile.rules b/Makefile.rules
index 7796269..7a19d5f 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -27,7 +27,7 @@ LDFLAGS   = -g
 STRIP     = :
 else
 ifdef DONTSTRIP
-CFLAGS    = -O2 -g
+CFLAGS    ?= -O2 -g
 LDFLAGS   = -g
 STRIP     = :
 else
diff --git a/daemon/automount.c b/daemon/automount.c
index 91f4d15..35d443c 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -36,6 +36,7 @@ #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/poll.h>
 #include <dirent.h>
+#include <sys/vfs.h>
 
 #include "automount.h"
 
@@ -175,177 +176,6 @@ int rmdir_path(struct autofs_point *ap, 
 	return 0;
 }
 
-static int umount_offsets(struct autofs_point *ap, struct mnt_list *mnts, const char *base)
-{
-	char path[PATH_MAX + 1];
-	char *offset = path;
-	struct list_head list, head, *pos, *p;
-	char key[PATH_MAX + 1];
-	struct map_source *map;
-	struct mapent_cache *mc = NULL;
-	struct mapent *me = NULL;
-	char *ind_key;
-	int ret = 0, status;
-
-	INIT_LIST_HEAD(&list);
-	INIT_LIST_HEAD(&head);
-
-	if (!tree_get_mnt_list(mnts, &list, base, 0))
-		return 0;
-
-	list_for_each(p, &list) {
-		struct mnt_list *this;
-
-		this = list_entry(p, struct mnt_list, list);
-
-		if (strcmp(this->fs_type, "autofs"))
-			continue;
-
-		INIT_LIST_HEAD(&this->ordered);
-		add_ordered_list(this, &head);
-	}
-
-	/*
-	 * If it's a direct mount it's base is the key otherwise
-	 * the last path component is the indirect entry key.
-	 */
-	ind_key = strrchr(base, '/');
-	if (ind_key)
-		ind_key++;
-
-	master_source_readlock(ap->entry);
-	map = ap->entry->first;
-	while (map) {
-		mc = map->mc;
-		cache_readlock(mc);
-		me = cache_lookup_distinct(mc, base);
-		if (!me)
-			me = cache_lookup_distinct(mc, ind_key);
-		if (me)
-			break;
-		cache_unlock(mc);
-		map = map->next;
-	}
-	master_source_unlock(ap->entry);
-
-	if (!me)
-		return 0;
-
-	pos = NULL;
-	while ((offset = get_offset(base, offset, &head, &pos))) {
-		struct mapent *oe;
-
-		if (strlen(base) + strlen(offset) >= PATH_MAX) {
-			warn(ap->logopt, "can't umount - mount path too long");
-			ret++;
-			continue;
-		}
-
-		sched_yield();
-
-		strcpy(key, base);
-		strcat(key, offset);
-		oe = cache_lookup_distinct(mc, key);
-
-		if (!oe) {
-			debug(ap->logopt, "offset key %s not found", key);
-			continue;
-		}
-
-		warn(ap->logopt, "umount offset %s", key);
-
-		/*
-		 * We're in trouble if umounting the triggers fails.
-		 * It should always succeed due to the expire design.
-		 */
-		pthread_cleanup_push(cache_lock_cleanup, mc);
-		if (umount_autofs_offset(ap, oe)) {
-			crit(ap->logopt, "failed to umount offset %s", key);
-			ret++;
-		}
-		pthread_cleanup_pop(0);
-	}
-
-	if (!ret && me->multi == me) {
-		cache_multi_lock(mc);
-		status = cache_delete_offset_list(mc, me->key);
-		cache_multi_unlock(mc);
-		if (status != CHE_OK)
-			warn(ap->logopt, "couldn't delete offset list");
-	}
-	cache_unlock(mc);
-
-	return ret;
-}
-
-static int umount_ent(struct autofs_point *ap, const char *path, const char *type)
-{
-	struct stat st;
-	int sav_errno;
-	int is_smbfs = (strcmp(type, "smbfs") == 0);
-	int status;
-	int ret, rv = 1;
-
-	status = lstat(path, &st);
-	sav_errno = errno;
-
-	if (status < 0)
-		warn(ap->logopt, "lstat of %s failed with %d", path, status);
-
-	/*
-	 * lstat failed and we're an smbfs fs returning an error that is not
-	 * EIO or EBADSLT or the lstat failed so it's a bad path. Return
-	 * a fail.
-	 *
-	 * EIO appears to correspond to an smb mount that has gone away
-	 * and EBADSLT relates to CD changer not responding.
-	 */
-	if (!status && (S_ISDIR(st.st_mode) && st.st_dev != ap->dev)) {
-		rv = spawnll(log_debug, PATH_UMOUNT, PATH_UMOUNT, path, NULL);
-	} else if (is_smbfs && (sav_errno == EIO || sav_errno == EBADSLT)) {
-		rv = spawnll(log_debug, PATH_UMOUNT, PATH_UMOUNT, path, NULL);
-	}
-
-	/* We are doing a forced shutcwdown down so unlink busy mounts */
-	if (rv && (ap->state == ST_SHUTDOWN_FORCE || ap->state == ST_SHUTDOWN)) {
-		ret = stat(path, &st);
-		if (ret == -1 && errno == ENOENT) {
-			warn(ap->logopt, "mount point does not exist");
-			return 0;
-		}
-
-		if (ret == 0 && !S_ISDIR(st.st_mode)) {
-			warn(ap->logopt, "mount point is not a directory");
-			return 0;
-		}
-
-		if (ap->state == ST_SHUTDOWN_FORCE) {
-			msg("forcing umount of %s", path);
-			rv = spawnll(log_debug, PATH_UMOUNT, PATH_UMOUNT, "-l", path, NULL);
-		}
-
-		/*
-		 * Verify that we actually unmounted the thing.  This is a
-		 * belt and suspenders approach to not eating user data.
-		 * We have seen cases where umount succeeds, but there is
-		 * still a file system mounted on the mount point.  How
-		 * this happens has not yet been determined, but we want to
-		 * make sure to return failure here, if that is the case,
-		 * so that we do not try to call rmdir_path on the
-		 * directory.
[...1868 lines suppressed...]
 
-static int read_one(FILE *f, char *key, unsigned *k_len, char *mapent, unsigned *m_len)
+static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsigned int *m_len)
 {
 	char *kptr, *p;
 	int mapent_len, key_len;
@@ -346,7 +346,8 @@ int lookup_read_master(struct master *ma
 	char *ent;
 	struct stat st;
 	FILE *f;
-	int entry, path_len, ent_len;
+	unsigned int path_len, ent_len;
+	int entry;
 
 	if (master->recurse)
 		return NSS_STATUS_UNAVAIL;
@@ -593,7 +594,8 @@ int lookup_read_map(struct autofs_point 
 	char *mapent;
 	struct stat st;
 	FILE *f;
-	int entry, k_len, m_len;
+	unsigned int k_len, m_len;
+	int entry;
 
 	source = ap->entry->current;
 	ap->entry->current = NULL;
@@ -720,7 +722,8 @@ static int lookup_one(struct autofs_poin
 	char mapent[MAPENT_MAX_LEN + 1];
 	time_t age = time(NULL);
 	FILE *f;
-	int entry, ret, k_len, m_len;
+	unsigned int k_len, m_len;
+	int entry, ret;
 
 	source = ap->entry->current;
 	ap->entry->current = NULL;
@@ -817,7 +820,8 @@ static int lookup_wild(struct autofs_poi
 	char mapent[MAPENT_MAX_LEN + 1];
 	time_t age = time(NULL);
 	FILE *f;
-	int entry, ret, k_len, m_len;
+	unsigned int k_len, m_len;
+	int entry, ret;
 
 	source = ap->entry->current;
 	ap->entry->current = NULL;
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 8c627b4..4959c12 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1146,9 +1146,9 @@ static int read_one_map(struct autofs_po
 
 	while (e) {
 		char *mapent = NULL;
+		size_t mapent_len = 0;
 		char *k_val;
 		ber_len_t k_len;
-		size_t mapent_len;
 		char *s_key;
 
 		bvKey = ldap_get_values_len(ldap, e, entry);
@@ -1388,10 +1388,10 @@ static int lookup_one(struct autofs_poin
 
 	while (e) {
 		char *mapent = NULL;
+		size_t mapent_len = 0;
 		char *k_val;
 		ber_len_t k_len;
 		char *s_key;
-		size_t mapent_len;
 
 		bvKey = ldap_get_values_len(ldap, e, entry);
 		if (!bvKey || !*bvKey) {
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index dec4a21..483e586 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -248,7 +248,7 @@ int yp_all_callback(int status, char *yp
 	struct map_source *source = cbdata->source;
 	struct mapent_cache *mc = source->mc;
 	time_t age = cbdata->age;
-	char *tmp, *key, *mapent;
+	char *key, *mapent;
 	int ret;
 
 	if (status != YP_TRUE)
diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
index 9bccdd1..c9baf57 100644
--- a/modules/mount_autofs.c
+++ b/modules/mount_autofs.c
@@ -59,7 +59,6 @@ int mount_mount(struct autofs_point *ap,
 	char buf[MAX_ERR_BUF];
 	char *options, *p;
 	int ret;
-	struct list_head *l;
 
 	fullpath = alloca(strlen(root) + name_len + 2);
 	if (!fullpath) {
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 6007828..0f2c3ab 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -661,71 +661,6 @@ add_offset_entry(struct autofs_point *ap
 	return ret;
 }
 
-static int mount_multi_triggers(struct autofs_point *ap, char *root, struct mapent *me, const char *base)
-{
-	char path[PATH_MAX + 1];
-	char *offset = path;
-	struct mapent *oe;
-	struct list_head *pos = NULL;
-	unsigned int fs_path_len;
-	struct statfs fs;
-	struct stat st;
-	unsigned int is_autofs_fs;
-	int ret, start;
-
-	fs_path_len = strlen(root) + strlen(base);
-	if (fs_path_len > PATH_MAX)
-		return 0;
-
-	strcpy(path, root);
-	strcat(path, base);
-	ret = statfs(path, &fs);
-	if (ret == -1) {
-		/* There's no mount yet - it must be autofs */
-		if (errno == ENOENT)
-			is_autofs_fs = 1;
-		else
-			return 0;
-	} else
-		is_autofs_fs = fs.f_type == AUTOFS_SUPER_MAGIC ? 1 : 0;
-
-	start = strlen(root);
-	offset = cache_get_offset(base, offset, start, &me->multi_list, &pos);
-	while (offset) {
-		int plen = fs_path_len + strlen(offset);
-
-		if (plen > PATH_MAX) {
-			warn(ap->logopt, MODPREFIX "path loo long");
-			goto cont;
-		}
-
-		oe = cache_lookup_offset(base, offset, start, &me->multi_list);
-		if (!oe)
-			goto cont;
-
-		/*
-		 * If the host filesystem is not an autofs fs
-		 * we require the mount point directory exist
-		 * and that permissions are OK.
-		 */
-		if (!is_autofs_fs) {
-			ret = stat(oe->key, &st);
-			if (ret == -1)
-				goto cont;
-		}
-
-		debug(ap->logopt, MODPREFIX "mount offset %s", oe->key);
-
-		if (mount_autofs_offset(ap, oe, is_autofs_fs) < 0)
-			warn(ap->logopt, MODPREFIX "failed to mount offset");
-cont:
-		offset = cache_get_offset(base,
-				offset, start, &me->multi_list, &pos);
-	}
-
-	return 1;
-}
-
 static int validate_location(char *loc)
 {
 	char *ptr = loc;
@@ -762,7 +697,7 @@ static int parse_mapent(const char *ent,
 {
 	char buf[MAX_ERR_BUF];
 	const char *p;
-	char *tmp, *myoptions, *loc;
+	char *myoptions, *loc;
 	int l;
 
 	p = ent;
@@ -1040,7 +975,6 @@ int parse_mount(struct autofs_point *ap,
 		/* It's a multi-mount; deal with it */
 		do {
 			char *path, *myoptions, *loc;
-			unsigned int s_len = 0;
 			int status;
 
 			if (*p != '/') {
@@ -1272,6 +1206,8 @@ int parse_mount(struct autofs_point *ap,
 		free(loc);
 		free(options);
 
+		if (rv)
+			return rv;
 		/*
 		 * If it's a multi-mount insert the triggers
 		 * These are always direct mount triggers so root = ""


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- autofs.spec	27 Jul 2006 09:24:54 -0000	1.134
+++ autofs.spec	2 Aug 2006 13:57:11 -0000	1.135
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.8
+%define release 0.rc1.9
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -25,6 +25,7 @@
 Patch12: autofs-5.0.1-rc1-cthon-parse-and-submounts.patch
 Patch13: autofs-5.0.1-rc1-cthon-expire-nested.patch
 Patch14: autofs-5.0.1-rc1-compile-error.patch
+Patch15: autofs-5.0.1-rc1-shutdown-races.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -78,6 +79,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -134,6 +136,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Aug 2 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.9
+- cthon fix some shutdown races.
+
 * Thu Jul 27 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.8
 - Fix compile error.
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 13:59:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 09:59:29 -0400
Subject: rpms/eel2/FC-5 .cvsignore, 1.32, 1.33 eel2.spec, 1.43, 1.44 sources,
	1.33, 1.34
Message-ID: <200608021359.k72DxThu006559@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eel2/FC-5/.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	2 Aug 2006 13:59:27 -0000	1.33
@@ -1,18 +1 @@
-eel-2.7.92.tar.bz2
-eel-2.8.0.tar.bz2
-eel-2.8.1.tar.bz2
-eel-2.9.90.tar.bz2
-eel-2.9.91.tar.bz2
-eel-2.10.0.tar.bz2
-eel-2.11.3.tar.bz2
-eel-2.11.90.tar.bz2
-eel-2.11.91.tar.bz2
-eel-2.12.0.tar.bz2
-eel-2.12.1.tar.bz2
-eel-2.13.2.tar.bz2
-eel-2.13.3.tar.bz2
-eel-2.13.4.tar.bz2
-eel-2.13.90.tar.bz2
-eel-2.13.91.tar.bz2
-eel-2.13.92.tar.bz2
-eel-2.14.0.tar.bz2
+eel-2.14.3.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/FC-5/eel2.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- eel2.spec	11 Apr 2006 04:49:49 -0000	1.43
+++ eel2.spec	2 Aug 2006 13:59:27 -0000	1.44
@@ -15,8 +15,8 @@
 
 Name:		eel2
 Summary:        Eazel Extensions Library.
-Version: 	2.14.1
-Release: 	1.fc5.1
+Version: 	2.14.3
+Release: 	1%{?dist}
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -105,6 +105,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Tue Apr 11 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/eel2/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	11 Apr 2006 04:49:50 -0000	1.33
+++ sources	2 Aug 2006 13:59:27 -0000	1.34
@@ -1 +1 @@
-7002f4f99317ed11da8b9db15b7e4a2b  eel-2.14.1.tar.bz2
+cdff898f9a054b35f5e3b7c0142cc2a5  eel-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 14:03:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:03:56 -0400
Subject: rpms/eog/FC-5 eog.spec,1.48,1.49
Message-ID: <200608021403.k72E3uG6007432@cvs.devel.redhat.com>

Author: mclasen

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

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



Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/FC-5/eog.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- eog.spec	2 Aug 2006 13:54:44 -0000	1.48
+++ eog.spec	2 Aug 2006 14:03:53 -0000	1.49
@@ -36,6 +36,10 @@
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 Prereq:        desktop-file-utils >= %{desktop_file_utils_version}
 
+BuildRequires: gnome-doc-utils
+BuildRequires: gnome-desktop-devel
+BuildRequires: libXt-devel
+
 # Needed for gconftool
 Prereq: GConf2
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 14:07:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:07:56 -0400
Subject: rpms/nautilus-cd-burner/FC-5 .cvsignore, 1.31,
	1.32 nautilus-cd-burner.spec, 1.55, 1.56 sources, 1.32, 1.33
Message-ID: <200608021407.k72E7ubk008261@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8211

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/FC-5/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	30 May 2006 19:23:36 -0000	1.31
+++ .cvsignore	2 Aug 2006 14:07:37 -0000	1.32
@@ -1 +1 @@
-nautilus-cd-burner-2.14.2.tar.bz2
+nautilus-cd-burner-2.14.3.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/FC-5/nautilus-cd-burner.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- nautilus-cd-burner.spec	30 May 2006 19:23:36 -0000	1.55
+++ nautilus-cd-burner.spec	2 Aug 2006 14:07:37 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.14.2
-Release: 1
+Version: 2.14.3
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1
+- Update to 2.14.3
+
 * Tue May 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	30 May 2006 19:23:36 -0000	1.32
+++ sources	2 Aug 2006 14:07:37 -0000	1.33
@@ -1 +1 @@
-5e85fc810f6160916fac26caa805cc65  nautilus-cd-burner-2.14.2.tar.bz2
+c85642630b3db5ee0a40e2fdbf4fdf94  nautilus-cd-burner-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 14:12:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:12:26 -0400
Subject: rpms/eel2/FC-5 eel2.spec,1.44,1.45
Message-ID: <200608021412.k72ECQtp009684@cvs.devel.redhat.com>

Author: mclasen

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

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



Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/FC-5/eel2.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- eel2.spec	2 Aug 2006 13:59:27 -0000	1.44
+++ eel2.spec	2 Aug 2006 14:12:24 -0000	1.45
@@ -44,7 +44,10 @@
 BuildRequires: gail-devel >= %{gail_version}
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
 BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
-BuildRequires: pango
+BuildRequires: libXt-devel
+BuildRequires: libtool
+BuildRequires: gettext
+BuildRequires: perl-XML-Parser
 
 %description
 Eazel Extensions Library is a collection of widgets and functions for



From fedora-cvs-commits at redhat.com  Wed Aug  2 14:12:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:12:30 -0400
Subject: rpms/emacs/FC-5 ispell-german-utf-8.patch, NONE, 1.1 emacs.spec,
	1.69, 1.70
Message-ID: <200608021412.k72ECUAS009730@cvs.devel.redhat.com>

Author: coldwell

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

Modified Files:
	emacs.spec 
Added Files:
	ispell-german-utf-8.patch 
Log Message:
fix German spell checking for UTF-8 encoded buffers (Daniel Hammer #197737)

ispell-german-utf-8.patch:
 ispell.el |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ispell-german-utf-8.patch ---
--- emacs-21.4/lisp/textmodes/ispell.el~	2006-08-01 17:29:01.000000000 -0400
+++ emacs-21.4/lisp/textmodes/ispell.el	2006-08-01 17:30:20.000000000 -0400
@@ -532,7 +532,7 @@ See `ispell-dictionary-alist'."
    ("deutsch8"
     "[a-zA-Z\304\326\334\344\366\337\374]"
     "[^a-zA-Z\304\326\334\344\366\337\374]"
-    "[']" t ("-C" "-d" "deutsch") "~latin1" iso-8859-1)
+    "[']" t ("-C" "-d" "deutsch" "--encoding=iso8859-1") "~latin1" iso-8859-1)
    ("english"				; make English explicitly selectable
     "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)))
 
@@ -569,7 +569,7 @@ See `ispell-dictionary-alist'."
    ("german8"
     "[a-zA-Z\304\326\334\344\366\337\374]"
     "[^a-zA-Z\304\326\334\344\366\337\374]"
-    "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1)
+    "[']" t ("-C" "-d" "german" "--encoding=iso8859-1") "~latin1" iso-8859-1)
    ("italiano"                         ; Italian.aff
     "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]"
     "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]"


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/FC-5/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	2 Aug 2006 14:12:27 -0000	1.70
@@ -11,7 +11,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 14
+Release: 15
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -126,6 +126,7 @@
 %endif
 Patch124: mule-cmd.el-X11-locale.alias-173781.patch
 Patch125: sort-columns-posix-key-182282.patch
+Patch126: ispell-german-utf-8.patch
 
 %description
 Emacs is a powerful, customizable, self-documenting, modeless text
@@ -268,6 +269,8 @@
 %patch124 -p1
 # sort-columns posix key defs
 %patch125 -p1
+# German spell-checking for UTF-8 encoded buffers
+%patch126 -p1
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -549,6 +552,9 @@
 %endif
 
 %changelog
+* Tue Aug  1 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-15
+- fix German spell checking for UTF-8 encoded buffers (Daniel Hammer #197737)
+
 * 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  Wed Aug  2 14:26:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:26:09 -0400
Subject: rpms/cups/devel pstopdf,NONE,1.1 cups.spec,1.238,1.239
Message-ID: <200608021426.k72EQ9oE029774@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	pstopdf 
Log Message:
- Ship pstopdf filter for LSPP.


--- NEW FILE pstopdf ---
#!/bin/sh
#
# CUPS filter script for Ghostscript.
#
# Copyright 2001-2002 by Easy Software Products.
# Copyright 2006 by Hewlett-Packard Development Company, L.P.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#

# Installation directories...
prefix=/usr
exec_prefix=${prefix}
bindir=${exec_prefix}/bin

# Set the library/font path...
GS_FONTPATH="$CUPS_FONTPATH"
export GS_FONTPATH

# Options we use with Ghostscript...
gsopts="-dQUIET -dDEBUG -dPARANOIDSAFER -dNOPAUSE -dBATCH "
gsopts="$gsopts -dNOMEDIAATTRS -sDEVICE=pdfwrite -sstdout=%stderr"

# See if we have a profile=n,n,n,n,n,n,n,n,n,n,n option...
profile=""
for option in $5; do
    case $option in
        profile=*)
	    profile="-scupsProfile=`echo $option | awk -F= '{print $2}'`"
	    ;;
    esac
done

# See if we have a filename on the command-line...
if test -z "$6"; then
	ifile="-"
else
	ifile="$6"
fi

# Now run Ghostscript...
$bindir/gs $gsopts -sOUTPUTFILE="%stdout" $profile $ifile



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- cups.spec	2 Aug 2006 09:37:31 -0000	1.238
+++ cups.spec	2 Aug 2006 14:26:07 -0000	1.239
@@ -13,6 +13,7 @@
 Source1: cups.init
 Source2: cupsprinter.png
 Source3: snmp-str1737.c
+Source4: pstopdf
 Source5: cups-lpd
 Source6: pstoraster
 Source7: pstoraster.convs
@@ -239,6 +240,11 @@
 install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{cups_serverbin}/filter
 install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
 
+# Ship pstopdf for LSPP systems to deal with malicious postscript
+%if %lspp
+install -c -m 755 %{SOURCE14} $RPM_BUILD_ROOT%{cups_serverbin}/filter
+%endif
+
 # Ship a generic postscript PPD file (#73061)
 install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
 
@@ -411,6 +417,7 @@
 %changelog
 * Wed Aug  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-7
 - Updated LSPP patch from Matt Anderson.
+- Ship pstopdf filter for LSPP.
 
 * Fri Jul 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-6
 - Use replacement snmp.c from STR #1737 (bug #193093).



From fedora-cvs-commits at redhat.com  Wed Aug  2 14:32:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:32:52 -0400
Subject: rpms/nautilus/FC-5 .cvsignore, 1.37, 1.38 nautilus.spec, 1.99,
	1.100 sources, 1.41, 1.42
Message-ID: <200608021432.k72EWqmO031599@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus/FC-5/.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	2 Aug 2006 14:32:35 -0000	1.38
@@ -1,18 +1 @@
-nautilus-2.7.92.tar.bz2
-nautilus-2.8.0.tar.bz2
-nautilus-2.8.1.tar.bz2
-nautilus-2.9.90.tar.bz2
-nautilus-2.9.91.tar.bz2
-nautilus-2.10.0.tar.bz2
-nautilus-2.11.3.tar.bz2
-nautilus-2.11.90.tar.bz2
-nautilus-2.11.91.tar.bz2
-nautilus-2.12.0.tar.bz2
-nautilus-2.12.1.tar.bz2
-nautilus-2.13.2.tar.bz2
-nautilus-2.13.3.tar.bz2
-nautilus-2.13.4.tar.bz2
-nautilus-2.13.90.tar.bz2
-nautilus-2.13.91.tar.bz2
-nautilus-2.13.92.tar.bz2
-nautilus-2.14.0.tar.bz2
+nautilus-2.14.3.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/FC-5/nautilus.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- nautilus.spec	11 Apr 2006 05:03:19 -0000	1.99
+++ nautilus.spec	2 Aug 2006 14:32:35 -0000	1.100
@@ -17,8 +17,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.14.1
-Release:	1.fc5.1
+Version: 	2.14.3
+Release:	1%{?dist}
 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
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
+- Update to 2.14.3
+
 * Tue Apr 11 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/nautilus/FC-5/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	11 Apr 2006 04:58:40 -0000	1.41
+++ sources	2 Aug 2006 14:32:35 -0000	1.42
@@ -1 +1 @@
-d8bad8b9141bc823c612abb7d460b725  nautilus-2.14.1.tar.bz2
+e82df2a1cb11719d054959539b74b3c7  nautilus-2.14.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 14:39:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:39:31 -0400
Subject: rpms/file-roller/FC-5 .cvsignore, 1.35, 1.36 file-roller.spec, 1.58,
	1.59 sources, 1.38, 1.39
Message-ID: <200608021439.k72EdVSx000995@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv970

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.14.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file-roller/FC-5/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	29 May 2006 19:46:28 -0000	1.35
+++ .cvsignore	2 Aug 2006 14:39:28 -0000	1.36
@@ -1 +1 @@
-file-roller-2.14.3.tar.bz2
+file-roller-2.14.4.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/FC-5/file-roller.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- file-roller.spec	29 May 2006 19:46:28 -0000	1.58
+++ file-roller.spec	2 Aug 2006 14:39:28 -0000	1.59
@@ -10,8 +10,8 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.14.3
-Release:	1
+Version:	2.14.4
+Release:	1%{?dist}
 
 License:	GPL
 Group:		Applications/Archiving
@@ -27,6 +27,8 @@
 BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
 BuildRequires: nautilus >= %{nautilus_version}
 BuildRequires: libtool
+BuildRequires: autoconf
+BuildRequires: gettext
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: scrollkeeper
@@ -118,7 +120,10 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
-* Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> 0 2.14.3-1
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.4-1.fc5
+- Update to 2.14.4
+
+* Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1
 - Update to 2.14.3
 
 * Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc5.1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/FC-5/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	29 May 2006 19:46:28 -0000	1.38
+++ sources	2 Aug 2006 14:39:28 -0000	1.39
@@ -1 +1 @@
-11a11675a9ec5f8b0164713fc60894af  file-roller-2.14.3.tar.bz2
+e86c78b3ecc90af20cf66511f4622c5c  file-roller-2.14.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 14:45:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:45:50 -0400
Subject: rpms/nautilus/FC-5 nautilus.spec,1.100,1.101
Message-ID: <200608021445.k72EjooZ003186@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	nautilus.spec 
Log Message:
2.14.3



Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/FC-5/nautilus.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- nautilus.spec	2 Aug 2006 14:32:35 -0000	1.100
+++ nautilus.spec	2 Aug 2006 14:45:47 -0000	1.101
@@ -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.14.1
+%define eel2_version 2.14.3
 %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  Wed Aug  2 14:49:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:49:39 -0400
Subject: rpms/cups/devel cups.spec,1.239,1.240
Message-ID: <200608021449.k72EndhE019382@cvs.devel.redhat.com>

Author: twaugh

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

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


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- cups.spec	2 Aug 2006 14:26:07 -0000	1.239
+++ cups.spec	2 Aug 2006 14:49:36 -0000	1.240
@@ -204,6 +204,11 @@
 install -c -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/cups/pdftops.conf
 ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 
+# Ship pstopdf for LSPP systems to deal with malicious postscript
+%if %lspp
+install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{cups_serverbin}/filter
+%endif
+
 # Deal with users trying to access the admin tool at
 # /usr/share/doc/cups-%{version}/index.html rather than the
 # correct http://localhost:631/
@@ -240,11 +245,6 @@
 install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{cups_serverbin}/filter
 install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
 
-# Ship pstopdf for LSPP systems to deal with malicious postscript
-%if %lspp
-install -c -m 755 %{SOURCE14} $RPM_BUILD_ROOT%{cups_serverbin}/filter
-%endif
-
 # Ship a generic postscript PPD file (#73061)
 install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 14:52:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:52:52 -0400
Subject: rpms/gimp/devel gimp-2.2.12-filename.patch, NONE, 1.1 gimp.spec,
	1.105, 1.106
Message-ID: <200608021452.k72EqqWi020613@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20508

Modified Files:
	gimp.spec 
Added Files:
	gimp-2.2.12-filename.patch 
Log Message:
allow spaces in filenames when saving (#200888, patch by Michael Natterer)


gimp-2.2.12-filename.patch:
 gimpfiledialog.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gimp-2.2.12-filename.patch ---
--- gimp-2.2.12/app/widgets/gimpfiledialog.c.filename	2006-06-26 11:49:39.000000000 +0200
+++ gimp-2.2.12/app/widgets/gimpfiledialog.c	2006-08-02 16:36:03.000000000 +0200
@@ -412,7 +412,7 @@
   gimp_file_dialog_set_file_proc (dialog, NULL);
 
   dirname  = g_path_get_dirname (uri);
-  basename = g_path_get_basename (uri);
+  basename = file_utils_uri_display_basename (uri);
 
   if (dirname && strlen (dirname) && strcmp (dirname, "."))
     gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- gimp.spec	18 Jul 2006 14:11:30 -0000	1.105
+++ gimp.spec	2 Aug 2006 14:52:50 -0000	1.106
@@ -36,7 +36,7 @@
 %define age 0
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -96,6 +96,7 @@
 Patch4:		gimp-2.2.4-gifload.patch
 Patch5:     gimp-2.2.11-htmlview.patch
 Patch6:     gimp-2.2.11-gimptool.patch
+Patch7:     gimp-2.2.12-filename.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -150,6 +151,7 @@
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
+%patch7 -p1 -b .filename
 
 %build
 libtoolize --copy --force
@@ -394,6 +396,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Aug 02 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-3
+- allow spaces in filenames when saving (#200888, patch by Michael Natterer)
+
 * Tue Jul 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-2
 - split off libraries into gimp-libs to allow multilib installations
 - remove pre-release cruft



From fedora-cvs-commits at redhat.com  Wed Aug  2 14:53:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:53:35 -0400
Subject: rpms/gnome-applets/FC-5 gnome-applets.spec,1.134,1.135
Message-ID: <200608021453.k72ErZJR020936@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Log Message:
fix build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-5/gnome-applets.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- gnome-applets.spec	2 Aug 2006 05:48:10 -0000	1.134
+++ gnome-applets.spec	2 Aug 2006 14:53:31 -0000	1.135
@@ -61,6 +61,7 @@
 BuildRequires:  libtool autoconf gettext
 BuildRequires:  pkgconfig
 
+
 Requires:	gnome-panel >= %{gnome_panel_version}
 Requires:	gstreamer-plugins-base >= %{gstreamer_plugins_version}
 Requires:	gstreamer-plugins-good >= %{gstreamer_plugins_version}



From fedora-cvs-commits at redhat.com  Wed Aug  2 14:54:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 10:54:59 -0400
Subject: rpms/gimp/FC-5 gimp-2.2.12-filename.patch, NONE, 1.1 gimp.spec, 1.96,
	1.97
Message-ID: <200608021454.k72EsxZj021455@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Added Files:
	gimp-2.2.12-filename.patch 
Log Message:
allow spaces in filenames when saving (#200888, patch by Michael Natterer)


gimp-2.2.12-filename.patch:
 gimpfiledialog.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gimp-2.2.12-filename.patch ---
--- gimp-2.2.12/app/widgets/gimpfiledialog.c.filename	2006-06-26 11:49:39.000000000 +0200
+++ gimp-2.2.12/app/widgets/gimpfiledialog.c	2006-08-02 16:36:03.000000000 +0200
@@ -412,7 +412,7 @@
   gimp_file_dialog_set_file_proc (dialog, NULL);
 
   dirname  = g_path_get_dirname (uri);
-  basename = g_path_get_basename (uri);
+  basename = file_utils_uri_display_basename (uri);
 
   if (dirname && strlen (dirname) && strcmp (dirname, "."))
     gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/gimp.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gimp.spec	10 Jul 2006 12:17:36 -0000	1.96
+++ gimp.spec	2 Aug 2006 14:54:56 -0000	1.97
@@ -27,7 +27,7 @@
 #
 #
 
-Summary:	The GNU Image Manipulation Program
+Summary:	GNU Image Manipulation Program
 Name: 		gimp
 Version: 	2.2.12
 %define binver 2.2
@@ -36,8 +36,7 @@
 %define age 0
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-#define prever pre2
-Release: %{?prever:0.0.%{prever}.}1%{?dist}
+Release: 3%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -86,38 +85,45 @@
 Requires:	pango >= 1.6.0
 Requires:	fontconfig >= 2.2.0
 Requires:	gimp-print >= 4.2.0
-Requires(post): /sbin/ldconfig
 Requires(post): /usr/bin/update-desktop-database
 Requires(post): hicolor-icon-theme
-Requires(postun): /sbin/ldconfig
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): hicolor-icon-theme
-Source0: 	ftp://ftp.gimp.org/pub/gimp/v%{binver}/%{?prever:testing/}gimp-%{version}%{?prever:-%{prever}}.tar.bz2
+Source0: 	ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
 Patch0:		gimp-2.0pre3-buildroot.patch
 Patch1:		gimp-2.0.1-gimphelpmissing.patch
 Patch2:		gimp-2.2.3-icontheme.patch
 Patch4:		gimp-2.2.4-gifload.patch
 Patch5:     gimp-2.2.11-htmlview.patch
 Patch6:     gimp-2.2.11-gimptool.patch
+Patch7:     gimp-2.2.12-filename.patch
 
 %description
-The GIMP (GNU Image Manipulation Program) is a powerful image
-composition and editing program, which can be extremely useful for
-creating logos and other graphics for webpages. The GIMP has many of
-the tools and filters you would expect to find in similar commercial
-offerings, and some interesting extras as well. The GIMP provides a
-large image manipulation toolbox, including channel operations and
-layers, effects, sub-pixel imaging and anti-aliasing, and conversions,
-all with multi-level undo.
+GIMP (GNU Image Manipulation Program) is a powerful image composition and
+editing program, which can be extremely useful for creating logos and other
+graphics for webpages. GIMP has many of the tools and filters you would expect
+to find in similar commercial offerings, and some interesting extras as well.
+GIMP provides a large image manipulation toolbox, including channel operations
+and layers, effects, sub-pixel imaging and anti-aliasing, and conversions, all
+with multi-level undo.
+
+%package libs
+Summary:    GIMP libraries
+Group:      System Environment/Libraries
+
+%description libs
+The gimp-libs package contains shared libraries needed for the GNU Image
+Manipulation Program (GIMP).
 
 %package devel
-Summary: GIMP plugin and extension development kit
+Summary:    GIMP plugin and extension development kit
 Group: 		Applications/Multimedia
-Requires:   %{name} = %{epoch}:%{version}-%{release}
+Requires:   %{name}-libs = %{epoch}:%{version}-%{release}
 Requires: 	gtk2-devel
 Requires:   glib2-devel
 Requires:   pkgconfig
 Obsoletes:	gimp2-devel gimp-beta-devel <= %{version}
+
 %description devel
 The gimp-devel package contains the static libraries and header files
 for writing GNU Image Manipulation Program (GIMP) plug-ins and
@@ -138,13 +144,14 @@
 
 EOF
 
-%setup -q -n gimp-%{version}%{?prever:-%{prever}}
+%setup -q -n gimp-%{version}
 %patch0 -p1 -b .buildroot
 %patch1 -p1 -b .gimphelpmissing
 %patch2 -p1 -b .icontheme
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
+%patch7 -p1 -b .filename
 
 %build
 libtoolize --copy --force
@@ -249,7 +256,6 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 /usr/bin/update-desktop-database %{_datadir}/applications
 if [ -x %{_sbindir}/xsane-install-gimp-plugin ]; then
     %{_sbindir}/xsane-install-gimp-plugin --install %{interfacever}
@@ -266,7 +272,6 @@
 fi
 
 %postun
-/sbin/ldconfig
 if [ "$1" = "0" ]; then
     /usr/bin/update-desktop-database %{_datadir}/applications
 fi
@@ -275,6 +280,9 @@
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %files -f gimp.files
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING ChangeLog NEWS README
@@ -326,29 +334,6 @@
 
 #%{_datadir}/locale/*/*/*
 
-#%{_libdir}/libgck-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-#%{_libdir}/libgck-%{interfacever}.so.%{age}
-%{_libdir}/libgimp-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimp-%{interfacever}.so.%{age}
-%{_libdir}/libgimpbase-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpbase-%{interfacever}.so.%{age}
-%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}
-%{_libdir}/libgimpmath-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpmath-%{interfacever}.so.%{age}
-%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}
-%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}
-%{_libdir}/libgimpui-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpui-%{interfacever}.so.%{age}
-%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}
-#%{_libdir}/libgimpproxy-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-#%{_libdir}/libgimpproxy-%{interfacever}.so.%{age}
-#%{_libdir}/libgimptool-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-#%{_libdir}/libgimptool-%{interfacever}.so.%{age}
-
 %{_bindir}/gimp-%{binver}
 %{_bindir}/gimp-remote-%{binver}
 %{_bindir}/gimptool-%{interfacever}
@@ -375,6 +360,25 @@
 
 %{_datadir}/icons/hicolor/48x48/apps/gimp.png
 
+%files libs
+%defattr(-, root, root, 0755)
+%{_libdir}/libgimp-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimp-%{interfacever}.so.%{age}
+%{_libdir}/libgimpbase-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpbase-%{interfacever}.so.%{age}
+%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}
+%{_libdir}/libgimpmath-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpmath-%{interfacever}.so.%{age}
+%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}
+%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}
+%{_libdir}/libgimpui-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpui-%{interfacever}.so.%{age}
+%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}
+
 %files devel
 %defattr (-, root, root, 0755)
 %doc HACKING
@@ -392,6 +396,16 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Aug 02 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-3
+- allow spaces in filenames when saving (#200888, patch by Michael Natterer)
+
+* Tue Jul 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-2
+- split off libraries into gimp-libs to allow multilib installations
+- remove pre-release cruft
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.12-1.1
+- rebuild
+
 * Mon Jul 10 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-1
 - version 2.2.12
 - use %%dist/%%fedora/%%redhat



From fedora-cvs-commits at redhat.com  Wed Aug  2 15:03:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 11:03:21 -0400
Subject: rpms/gnome-session/FC-5 gnome-session.spec,1.69,1.70
Message-ID: <200608021503.k72F3L6s024061@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-session.spec 
Log Message:
drop patch`



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/FC-5/gnome-session.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gnome-session.spec	2 Aug 2006 05:57:00 -0000	1.69
+++ gnome-session.spec	2 Aug 2006 15:03:06 -0000	1.70
@@ -52,7 +52,6 @@
 # too much crashing
 Patch9: gnome-session-2.13.4-no-crashes.patch
 Patch12: gnome-session-2.13.92-desensitize-invalid-buttons.patch
-Patch13: gnome-session-2.13.92-make-config-dir.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -86,7 +85,6 @@
 %patch8 -p1 -b .shaped
 %patch9 -p1 -b .no-crashes
 %patch12 -p1 -b .desensitize-invalid-buttons
-%patch13 -p1 -b .make-config-dir
 
 %build
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 15:11:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 11:11:35 -0400
Subject: rpms/gnome-applets/FC-5 gnome-applets.spec,1.135,1.136
Message-ID: <200608021511.k72FBZKB025659@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Log Message:
fix build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-5/gnome-applets.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- gnome-applets.spec	2 Aug 2006 14:53:31 -0000	1.135
+++ gnome-applets.spec	2 Aug 2006 15:11:33 -0000	1.136
@@ -57,6 +57,7 @@
 BuildRequires:  dbus-devel >= %{dbus_version}
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  gnome-doc-utils
+BuildRequires:  libxml2-python
 BuildRequires:  which
 BuildRequires:  libtool autoconf gettext
 BuildRequires:  pkgconfig



From fedora-cvs-commits at redhat.com  Wed Aug  2 15:20:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 11:20:44 -0400
Subject: rpms/gimp/devel gimp-2.2.12-filename.patch,1.1,1.2
Message-ID: <200608021520.k72FKivG011408@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11261

Modified Files:
	gimp-2.2.12-filename.patch 
Log Message:
fix for gimp-2-2 branch


gimp-2.2.12-filename.patch:
 gimpfiledialog.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: gimp-2.2.12-filename.patch
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp-2.2.12-filename.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gimp-2.2.12-filename.patch	2 Aug 2006 14:52:50 -0000	1.1
+++ gimp-2.2.12-filename.patch	2 Aug 2006 15:20:41 -0000	1.2
@@ -5,7 +5,7 @@
  
    dirname  = g_path_get_dirname (uri);
 -  basename = g_path_get_basename (uri);
-+  basename = file_utils_uri_display_basename (uri);
++  basename = file_utils_uri_to_utf8_basename (uri);
  
    if (dirname && strlen (dirname) && strcmp (dirname, "."))
      gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),



From fedora-cvs-commits at redhat.com  Wed Aug  2 15:21:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 11:21:26 -0400
Subject: rpms/gimp/FC-5 gimp-2.2.12-filename.patch,1.1,1.2
Message-ID: <200608021521.k72FLQgA011720@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp-2.2.12-filename.patch 
Log Message:
fix for gimp-2-2 branch


gimp-2.2.12-filename.patch:
 gimpfiledialog.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: gimp-2.2.12-filename.patch
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/gimp-2.2.12-filename.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gimp-2.2.12-filename.patch	2 Aug 2006 14:54:56 -0000	1.1
+++ gimp-2.2.12-filename.patch	2 Aug 2006 15:21:23 -0000	1.2
@@ -5,7 +5,7 @@
  
    dirname  = g_path_get_dirname (uri);
 -  basename = g_path_get_basename (uri);
-+  basename = file_utils_uri_display_basename (uri);
++  basename = file_utils_uri_to_utf8_basename (uri);
  
    if (dirname && strlen (dirname) && strcmp (dirname, "."))
      gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),



From fedora-cvs-commits at redhat.com  Wed Aug  2 15:27:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 11:27:46 -0400
Subject: rpms/cups/devel cups.spec,1.240,1.241
Message-ID: <200608021527.k72FRkEZ014317@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
Fixed another typo.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- cups.spec	2 Aug 2006 14:49:36 -0000	1.240
+++ cups.spec	2 Aug 2006 15:27:44 -0000	1.241
@@ -365,7 +365,7 @@
 %{cups_serverbin}/cgi-bin
 %dir %{cups_serverbin}/daemon
 %if %lspp
-%{cups_serverbin}/daemon/access
+%{cups_serverbin}/daemon/lspp-access
 %endif
 %{cups_serverbin}/daemon/cups-polld
 %{cups_serverbin}/daemon/cups-deviced



From fedora-cvs-commits at redhat.com  Wed Aug  2 15:38:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 11:38:48 -0400
Subject: rpms/gnome-utils/FC-5 gnome-utils.spec,1.110,1.111
Message-ID: <200608021538.k72FcmAt017409@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
fix build req



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-5/gnome-utils.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- gnome-utils.spec	2 Aug 2006 05:14:03 -0000	1.110
+++ gnome-utils.spec	2 Aug 2006 15:38:46 -0000	1.111
@@ -66,6 +66,7 @@
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires:  libXmu-devel
 BuildRequires:  libX11-devel
+BuildRequires:  libXt-devel
 BuildRequires:  libgtop2-devel
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  usermode



From fedora-cvs-commits at redhat.com  Wed Aug  2 15:50:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 11:50:54 -0400
Subject: rpms/gnome-applets/devel
	gnome-applets-2.15.1.1-dont-require-display.patch, NONE,
	1.1 gnome-applets.spec, 1.157, 1.158
Message-ID: <200608021550.k72FosUA003868@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.15.1.1-dont-require-display.patch 
Log Message:
- don't require a display to build invest applet (bug 200970).
  Problem discovered by Nalin Dahyabhai <nalin at redhat.com>


gnome-applets-2.15.1.1-dont-require-display.patch:
 configure.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gnome-applets-2.15.1.1-dont-require-display.patch ---
--- gnome-applets-2.15.1.1/configure.in.dont-require-display	2006-08-02 11:43:36.000000000 -0400
+++ gnome-applets-2.15.1.1/configure.in	2006-08-02 11:44:55.000000000 -0400
@@ -545,8 +545,9 @@ dnl *** invest-applet specific checks   
 dnl ***************************************************************************
 
 if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
-	AM_CHECK_PYMOD(gnomeapplet,,
-			BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
+dnl	AM_CHECK_PYMOD(gnomeapplet,,
+dnl			BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
+	BUILD_INVEST_APPLET="yes"
 else
 	BUILD_INVEST_APPLET="no"
 fi


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- gnome-applets.spec	29 Jul 2006 18:34:53 -0000	1.157
+++ gnome-applets.spec	2 Aug 2006 15:50:52 -0000	1.158
@@ -30,7 +30,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.1.1
-Release:  	6
+Release:  	7%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -42,6 +42,8 @@
 Patch4:		gnome-applets-2.15.1.1-cpufreq.patch
 Patch9:	        gnome-applets-2.14.0-gswitchit-export-dynamic.patch
 Patch10:	gnome-applets-2.15.1.1-invest.patch
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
+Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
 URL:		http://www.gnome.org/
 
@@ -118,6 +120,7 @@
 %patch4 -p1 -b .cpufreq
 %patch9 -p1 -b .gswitchit-export-dynamic
 %patch10 -p1 -b .invest
+%patch11 -p1 -b .dont-require-display
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -247,6 +250,10 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Wed Aug  2 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.1.1-7
+- don't require a display to build invest applet (bug 200970).
+  Problem discovered by Nalin Dahyabhai <nalin at redhat.com>
+
 * Sat Jul 29 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.1.1-6
 - Require gnome-python2-libegg for invest applet (#200640)
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 16:00:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 12:00:01 -0400
Subject: rpms/cups/FC-5 cups-try_connect.patch, 1.1, 1.2 cups.spec, 1.201,
	1.202
Message-ID: <200608021600.k72G01K5016220@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-try_connect.patch cups.spec 
Log Message:
* Wed Aug  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.4
- Use sigaction, not signal, to set the alarm handler in the snmp backend
  (bug #200205).


cups-try_connect.patch:
 snmp.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

Index: cups-try_connect.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-try_connect.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-try_connect.patch	1 Aug 2006 12:46:24 -0000	1.1
+++ cups-try_connect.patch	2 Aug 2006 15:59:58 -0000	1.2
@@ -1,5 +1,5 @@
---- cups-1.2.2/backend/snmp.c.try_connect	2006-08-01 13:20:56.000000000 +0100
-+++ cups-1.2.2/backend/snmp.c	2006-08-01 13:22:30.000000000 +0100
+--- cups-1.2.2/backend/snmp.c.try_connect	2006-08-01 13:24:43.000000000 +0100
++++ cups-1.2.2/backend/snmp.c	2006-08-02 16:58:56.000000000 +0100
 @@ -1692,7 +1692,8 @@
  
    debug_printf("DEBUG: %.3f Probing %s...\n", run_time(), device->addrname);
@@ -10,3 +10,23 @@
    {
     /*
      * IPP is supported...
+@@ -2320,6 +2321,7 @@
+ {
+   int	fd;				/* Socket */
+   int	status;				/* Connection status */
++  struct sigaction act;
+ 
+ 
+   debug_printf("DEBUG: %.3f Trying %s://%s:%d...\n", run_time(),
+@@ -2333,7 +2335,10 @@
+ 
+   addr->ipv4.sin_port = htons(port);
+ 
+-  signal(SIGALRM, alarm_handler);
++  act.sa_handler = alarm_handler;
++  sigemptyset(&act.sa_mask);
++  act.sa_flags = 0;
++  sigaction(SIGALRM, &act, NULL);
+   alarm(1);
+ 
+   status = connect(fd, (void *)addr, httpAddrLength(addr));


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- cups.spec	1 Aug 2006 12:46:24 -0000	1.201
+++ cups.spec	2 Aug 2006 15:59:58 -0000	1.202
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 1.3
+Release: 1.4
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -402,6 +402,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Aug  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.4
+- Use sigaction, not signal, to set the alarm handler in the snmp backend
+  (bug #200205).
+
 * Tue Aug  1 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.3
 - Use try_connect() before httpConnect() in snmp backend (bug #200205).
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 16:39:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 12:39:56 -0400
Subject: rpms/frysk/devel frysk-20060725-fixes.patch, NONE,
	1.1 frysk-20060725-xfail-x86_64.patch, NONE,
	1.1 frysk-20060725-xfail.patch, NONE, 1.1 frysk.spec, 1.80, 1.81
Message-ID: <200608021639.k72Gduhw005117@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31562

Modified Files:
	frysk.spec 
Added Files:
	frysk-20060725-fixes.patch frysk-20060725-xfail-x86_64.patch 
	frysk-20060725-xfail.patch 
Log Message:
- Add make check to %check
- Add patches to fix or disable failing tests.


frysk-20060725-fixes.patch:
 dw/ChangeLog                   |   10 ++
 dw/cni/Dwfl.cxx                |    2 
 dw/tests/TestDwfl.java         |    7 +-
 opcodes/ChangeLog              |   15 ++++
 opcodes/tests/TestOpcodes.java |  137 +++++++++++++++++++++++++++++------------
 5 files changed, 130 insertions(+), 41 deletions(-)

--- NEW FILE frysk-20060725-fixes.patch ---
Index: frysk-imports/lib/dw/ChangeLog
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/dw/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.22
diff -u -r1.20 -r1.22
--- frysk-imports/lib/dw/ChangeLog	25 Jul 2006 16:23:01 -0000	1.20
+++ frysk-imports/lib/dw/ChangeLog	31 Jul 2006 19:05:13 -0000	1.22
@@ -1,3 +1,11 @@
+2006-07-31  Adam Jocksch  <ajocksch at redhat.com>
+
+	* tests/TestDwfl.java (testGetLine): Fixed, test now works on x86_64.
+
+2006-07-27  Mark Wielaard  <mark at klomp.org>
+
+	* tests/TestDwfl.java (testGetLine): Mark as broken bug #2965.
+
 2006-07-25  Adam Jocksch  <ajocksch at redhat.com>
 
 	* Dwfl.java (getDie): Now returns an instance of DwflDieBias.
@@ -121,4 +129,4 @@
 	* cni/Dwarf.cxx: Created.
 	* cni/Dwfl.cxx: Ditto.
 	* cni/DwflLine.cxx: Ditto.
-	
\ No newline at end of file
+	
Index: frysk-imports/lib/dw/cni/Dwfl.cxx
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/dw/cni/Dwfl.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- frysk-imports/lib/dw/cni/Dwfl.cxx	25 Jul 2006 16:23:02 -0000	1.9
+++ frysk-imports/lib/dw/cni/Dwfl.cxx	31 Jul 2006 19:05:13 -0000	1.10
@@ -98,7 +98,7 @@
 	Dwarf_Addr bias;
 	Dwarf_Die *die = ::dwfl_addrdie(DWFL_POINTER, (::Dwarf_Addr) addr, &bias);
 	
-	if(!die)
+	if(die == NULL)
 		return NULL;
 	
 	lib::dw::DwflDieBias *retval = new lib::dw::DwflDieBias();
Index: frysk-imports/lib/dw/tests/TestDwfl.java
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/dw/tests/TestDwfl.java,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -r1.8 -r1.10
--- frysk-imports/lib/dw/tests/TestDwfl.java	25 Jul 2006 16:23:02 -0000	1.8
+++ frysk-imports/lib/dw/tests/TestDwfl.java	31 Jul 2006 19:05:13 -0000	1.10
@@ -46,6 +46,8 @@
 import lib.dw.DwflDieBias;
 import lib.dw.DwflLine;
 
+import frysk.imports.Build;
+
 public class TestDwfl
     extends TestCase
 {
@@ -76,7 +78,10 @@
     String filename = line.getSourceFile();
     assertEquals("TestLib.cxx",
                  filename.substring(filename.lastIndexOf("/") + 1));
-    assertEquals(51, line.getLineNum());
+    if(Build.BUILD_ARCH.indexOf("_64") == -1)
+      assertEquals(51, line.getLineNum());
+    else
+      assertEquals(52, line.getLineNum());
     assertEquals(0, line.getColumn());
   }
 
Index: frysk-imports/lib/opcodes/ChangeLog
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/opcodes/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -r1.7 -r1.11
--- frysk-imports/lib/opcodes/ChangeLog	14 Jul 2006 14:51:29 -0000	1.7
+++ frysk-imports/lib/opcodes/ChangeLog	31 Jul 2006 20:04:21 -0000	1.11
@@ -1,3 +1,16 @@
+2006-05-31  Adam Jocksch  <ajocksch at redhat.com>
+
+	* tests/TestOpcodes.java (brokenPpcXXX): Added.
+
+	* tests/TestOpcodes.java (testDisassembler): Re-failed for ppc/ppc64.
+
+	* tests/TestOpcodes.java (testDisassembler): Fixed, test now works
+	on x86_64.
+
+2006-07-27  Mark Wielaard  <mark at klomp.org>
+
+	* tests/TestOpcodes.java (testDisassembler): Mark as broken bug #2712.
+
 2006-07-14  Mike Cvet  <mcvet at redhat.com>
 
 	* Disassembler.java (Disassembler): Applied GNU formatting.
@@ -47,4 +60,4 @@
 	* Instruction.java: Ditto.
 	* OpcodesException.java: Ditto.
 	* cni: Ditto.
-	* cni/Disassembler.cxx: Ditto.
\ No newline at end of file
+	* cni/Disassembler.cxx: Ditto.
Index: frysk-imports/lib/opcodes/tests/TestOpcodes.java
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/opcodes/tests/TestOpcodes.java,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -r1.3 -r1.8
--- frysk-imports/lib/opcodes/tests/TestOpcodes.java	24 May 2006 19:07:27 -0000	1.3
+++ frysk-imports/lib/opcodes/tests/TestOpcodes.java	31 Jul 2006 20:40:24 -0000	1.8
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2005, Red Hat Inc.
+// Copyright 2005, 2006 Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -36,6 +36,8 @@
 // modification, you must delete this exception statement from your
 // version and license this file solely under the GPL without
 // exception.
+
+
 package lib.opcodes.tests;
 
 import inua.eio.ByteBuffer;
@@ -46,42 +48,103 @@
 import lib.opcodes.Disassembler;
 import lib.opcodes.Instruction;
 import lib.opcodes.OpcodesException;
+import frysk.imports.Build;
+
+public class TestOpcodes
+    extends TestCase
+{
+
+  /**
+   * A variable that has the value true. Used by code trying to stop the
+   * optimizer realise that there's dead code around.
+   */
+  static boolean trueXXX = true;
+
+  /**
+   * A function that returns true, and prints skip. Used by test cases that want
+   * to be skipped (vis: if(broken()) return) while trying to avoid the
+   * compiler's optimizer realizing that the rest of the function is dead.
+   */
+  protected static boolean brokenXXX (int bug)
+  {
+    System.out.print("<<BROKEN http://sourceware.org/bugzilla/show_bug.cgi?id="
+                     + bug + " >>");
+    return trueXXX;
+  }
+
+  /**
+   * See above
+   */
+  protected static boolean brokenPpcXXX (int bug)
+  {
+    return brokenXXX(bug);
+  }
+
+  /*
+   * Note: this test is expected to fail on anything but i386 for the time
+   * being. TODO: come up with a way of doing the correct assertEquals for other
+   * archs
+   */
+  public void testDisassembler ()
+  {
+
+    if (Build.BUILD_ARCH.indexOf("ppc") != - 1)
+      {
+        if (brokenPpcXXX(2712))
+          return;
+      }
+
+    ByteBuffer buffer = new DummyByteBuffer();
+    final int numInstructions = 16;
+
+    Disassembler disAsm = new Disassembler(buffer);
+    LinkedList list = null;
+    try
+      {
+        list = disAsm.disassembleInstructions(0, numInstructions);
+      }
+    catch (OpcodesException e)
+      {
+        e.printStackTrace(System.err);
+        fail("Exception thrown during disassembly");
+      }
+
+    assertNotNull(list);
+    assertEquals(list.size(), numInstructions);
+
+    String[] addrs = { "0", "2", "4", "6", "7", "8", "a", "c", "e", "f", "10",
+                      "12", "14", "16", "17", "18" };
+
+    String[] insts;
+
+    boolean is64 = Build.BUILD_ARCH.indexOf("_64") != - 1;
+
+    if (! is64)
+      {
+        insts = new String[] { "DWORD PTR [ecx]", "BYTE PTR [ebx]", "0x5",
+                              "es", "es", "al", "BYTE PTR [ebx]", "0x5", "es",
+                              "es", "al", "BYTE PTR [ebx]", "0x5", "es", "es",
+                              "al" };
+
+      }
+    else
+      {
+        insts = new String[] { "DWORD PTR [rcx]", "BYTE PTR [rbx]", "0x5",
+                              "(bad)  ", "(bad)  ", "al", "BYTE PTR [rbx]",
+                              "0x5", "(bad)  ", "(bad)  ", "al" };
+      }
+
+    assertNotNull(insts);
+
+    int instCount = is64 ? 11 : 16;
 
-public class TestOpcodes extends TestCase {
+    for (int i = 0; i < instCount; i++)
+      {
+        Instruction inst = (Instruction) list.get(i);
+        assertNotNull(inst);
 
-	/*
-	 * Note: this test is expected to fail on anything but i386 for the time being.
-	 * TODO: come up with a way of doing the correct assertEquals for other archs
-	 */
-	public void testDisassembler(){
-		ByteBuffer buffer = new DummyByteBuffer();
-		final int numInstructions = 16;
-		
-		Disassembler disAsm = new Disassembler(buffer);
-		LinkedList list = null;
-		try{
-			list = disAsm.disassembleInstructions(0, numInstructions);
-		}
-		catch(OpcodesException e){
-			e.printStackTrace(System.err);
-			fail("Exception thrown during disassembly");
-		}
-		
-		assertNotNull(list);
-		assertEquals(list.size(), numInstructions);
-		
-		String[] addrs = {"0", "2", "4", "6", "7", "8", "a", "c", "e", "f",
-				"10", "12", "14", "16", "17", "18"};
-		String[] insts = {"DWORD PTR [ecx]", "BYTE PTR [ebx]", "0x5", "es", "es", "al",
-				"BYTE PTR [ebx]", "0x5", "es", "es", "al",
-				"BYTE PTR [ebx]", "0x5", "es", "es", "al"};
-		
-		for(int i = 0; i < list.size(); i++){
-			Instruction inst = (Instruction) list.get(i);
-			assertNotNull(inst);
-			
-			assertEquals(addrs[i], Long.toHexString(inst.address));
-			assertEquals(insts[i], inst.instruction);
-		}
-	}
+        assertEquals(addrs[i], Long.toHexString(inst.address));
+        assertEquals(insts[i], inst.instruction);
+      }
+  }
 }

frysk-20060725-xfail-x86_64.patch:
 ChangeLog          |    5 +++
 tests/TestElf.java |   79 +++++++++++++++++++++++++++++++++--------------------
 2 files changed, 55 insertions(+), 29 deletions(-)

--- NEW FILE frysk-20060725-xfail-x86_64.patch ---
Index: frysk-imports/lib/elf/ChangeLog
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/elf/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- frysk-imports/lib/elf/ChangeLog	24 Jul 2006 21:57:57 -0000	1.32
+++ frysk-imports/lib/elf/ChangeLog	27 Jul 2006 14:10:55 -0000	1.33
@@ -1,3 +1,8 @@
+2006-07-27  Mark Wielaard  <mark at klomp.org>
+
+	* tests/TestElf.java (testObjectFile): Mark as broken bug #2712.
+	Add assert descriptions.
+
 2006-07-24  Adam Jocksch  <ajocksch at redhat.com>
 
 	* ElfSection.cxx (elf_getshdr): Now uses proper namespace for
Index: frysk-imports/lib/elf/tests/TestElf.java
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/elf/tests/TestElf.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- frysk-imports/lib/elf/tests/TestElf.java	24 Jul 2006 21:25:49 -0000	1.8
+++ frysk-imports/lib/elf/tests/TestElf.java	27 Jul 2006 14:10:55 -0000	1.9
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2005, Red Hat Inc.
+// Copyright 2005, 2006 Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -60,6 +60,24 @@
 public class TestElf
     extends TestCase
 {
+    /**
+     * A variable that has the value true.  Used by code trying to
+     * stop the optimizer realise that there's dead code around.
+     */
+    static boolean trueXXX = true;
+    /**
+     * A function that returns true, and prints skip.  Used by test
+     * cases that want to be skipped (vis: if(broken()) return) while
+     * trying to avoid the compiler's optimizer realizing that the
+     * rest of the function is dead.
+     */
+    protected static boolean brokenXXX (int bug)
+    {
+	System.out.print ("<<BROKEN http://sourceware.org/bugzilla/show_bug.cgi?id=" + bug + " >>");
+	return trueXXX;
+    }
+
+
 
   public void testCore () throws ElfException, ElfFileException
   {
@@ -131,6 +149,9 @@
 
   public void testObjectFile () throws ElfException, ElfFileException
   {
+    if (brokenXXX(2712))
+      return;
+
     Elf testElf = new Elf(Build.ABS_BUILDDIR + "/lib/elf/tests/helloworld.o",
                           ElfCommand.ELF_C_READ);
 
@@ -138,18 +159,18 @@
     assertEquals(testElf.getBase(), 0);
 
     ElfEHeader header = testElf.getEHeader();
-    assertEquals(3, header.machine);
-    assertEquals(52, header.ehsize);
-    assertEquals(0, header.entry);
-    assertEquals(1, header.version);
-    assertEquals(0, header.flags);
-    assertEquals(1, header.type);
-    assertEquals(11, header.shnum);
-    assertEquals(40, header.shentsize);
-    assertEquals(236, header.shoff);
-    assertEquals(0, header.phnum);
-    assertEquals(0, header.phentsize);
-    assertEquals(0, header.phoff);
+    assertEquals("machine", 3, header.machine);
+    assertEquals("ehsize", 52, header.ehsize);
+    assertEquals("entry", 0, header.entry);
+    assertEquals("version", 1, header.version);
+    assertEquals("flags", 0, header.flags);
+    assertEquals("type", 1, header.type);
+    assertEquals("shnum", 11, header.shnum);
+    assertEquals("shentsize", 40, header.shentsize);
+    assertEquals("shoff", 236, header.shoff);
+    assertEquals("phnum", 0, header.phnum);
+    assertEquals("phentsize", 0, header.phentsize);
+    assertEquals("phoff", 0, header.phoff);
 
     int[] expectedIndices = { 0, 52, 864, 96, 96, 96, 110, 155, 155, 676, 836 };
     int[] expectedInfo = { 0, 0, 1, 0, 0, 0, 0, 0, 0, 8, 0 };
@@ -174,30 +195,30 @@
     for (int i = 0; i < header.shnum; i++)
       {
         ElfSection section = testElf.getSection(i);
-        assertNotNull(section);
-        assertEquals(section.getIndex(), i);
+        assertNotNull("section-" + i, section);
+        assertEquals("section-" + i + ".getIndex()", section.getIndex(), i);
 
         ElfSectionHeader sheader = section.getSectionHeader();
         assertNotNull(sheader);
 
-        assertEquals(0, sheader.addr);
-        assertEquals(expectedIndices[i], sheader.offset);
-        assertEquals(expectedInfo[i], sheader.info);
-        assertEquals(expectedAlign[i], sheader.addralign);
-        assertEquals(expectedEntrySize[i], sheader.entsize);
-        assertEquals(expectedFlags[i], sheader.flags);
-        assertEquals(expectedNames[i], sheader.name);
-        assertEquals(expectedSize[i], sheader.size);
-        assertEquals(expectedTypes[i], sheader.type);
+        assertEquals("section-" + i + "-addr", 0, sheader.addr);
+        assertEquals("section-" + i + "-offset", expectedIndices[i], sheader.offset);
+        assertEquals("section-" + i + "-info", expectedInfo[i], sheader.info);
+        assertEquals("section-" + i + "-addralign", expectedAlign[i], sheader.addralign);
+        assertEquals("section-" + i + "-entsize", expectedEntrySize[i], sheader.entsize);
+        assertEquals("section-" + i + "-flags", expectedFlags[i], sheader.flags);
+        assertEquals("section-" + i + "-name", expectedNames[i], sheader.name);
+        assertEquals("section-" + i + "-size", expectedSize[i], sheader.size);
+        assertEquals("section-" + i + "-type", expectedTypes[i], sheader.type);
 
         ElfData data = section.getData();
         assertNotNull(data);
-        assertEquals(0, data.getAlignment());
-        assertEquals(0, data.getOffset());
-        assertEquals(expectedDataSizes[i], data.getSize());
-        assertEquals(expectedDataTypes[i], data.getType());
+        assertEquals("section-" + i + "-alignment", 0, data.getAlignment());
+        assertEquals("section-" + i + "-offset", 0, data.getOffset());
+        assertEquals("section-" + i + "-size", expectedDataSizes[i], data.getSize());
+        assertEquals("section-" + i + "-type", expectedDataTypes[i], data.getType());
         if (data.getSize() != 0)
-          assertEquals(expectedBytes[i], data.getByte(0));
+          assertEquals("section-" + i + "-byte", expectedBytes[i], data.getByte(0));
       }
   }
 

frysk-20060725-xfail.patch:
 frysk-core/frysk/proc/TestProcGet.java             |    3 +++
 frysk-core/frysk/proc/TestTaskSyscallObserver.java |    6 +++---
 frysk-imports/elfutils/tests/Makefile.in           |    2 +-
 frysk-imports/tests/Makefile.in                    |    4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE frysk-20060725-xfail.patch ---
There are three failures and one error there:

1) frysk-imports/tests: frysk2130/strace-clone-exec.sh

2) frysk-imports/elfutils/tests: run-elflint-self.sh
	http://sourceware.org/bugzilla/show_bug.cgi?id=2947

3) frysk-core TestRunner:
Running testExecSyscall(frysk.proc.TestTaskSyscallObserver) ...FAIL
  junit.framework.AssertionFailedError: Caught exec syscall expected:<false> but was:<true>

4) frysk-core TestRunner:
Running testGetAuxv(frysk.proc.TestProcGet) ...ERROR
  java.lang.RuntimeException: unknown word size for auxv (1|32l|64l|32b|64b 10000)

--- frysk-imports/tests/Makefile.in.orig	2006-07-25 12:26:41.000000000 +0200
+++ frysk-imports/tests/Makefile.in	2006-08-02 15:58:00.657944000 +0200
@@ -372,7 +372,7 @@
 	frysk2492/java.sh frysk1840/gcj.sh \
 	frysk2595/ptrace_peek_wrong_thread \
 	frysk2595/ptrace_before_forked_thread_exits frysk2670/gcj.sh \
-	frysk2630/noerror.sh frysk2631/ice.sh frysk2760/barriertest
+	frysk2630/noerror.sh frysk2631/ice.sh frysk2760/barriertest frysk2130/strace-clone-exec.sh
 
 # Frysk, when creating test processes uses the sequence vfork -> fork
 # -> exec to create a process of known pid that has process 1 as its
@@ -385,7 +385,7 @@
 	frysk2595/ptrace_after_exec \
 	frysk2595/ptrace_after_exec_of_thread $(process_TESTS) \
 	frysk1929/gcj.sh cdtparserversion/cdttest.sh cmdline/print \
-	frysk2130/strace-clone-exec.sh frysk2299/GCTest \
+	frysk2299/GCTest \
 	vfork-exec/vfork-exec
 CLEANFILES = $(TESTS) $(noinst_SCRIPTS) *.gcno frysk2490/Child.h \
 	frysk2490/Parent.h frysk2137/*.gcno frysk2137/*.gcda \
--- frysk-imports/elfutils/tests/Makefile.in.orig	2006-07-25 12:26:47.000000000 +0200
+++ frysk-imports/elfutils/tests/Makefile.in	2006-08-02 16:49:52.022062000 +0200
@@ -390,7 +390,7 @@
 	run-strip-test.sh run-strip-test2.sh run-strip-test3.sh \
 	run-strip-test4.sh run-strip-test5.sh run-strip-test6.sh \
 	run-ecp-test.sh run-ecp-test2.sh run-elflint-test.sh \
-	run-elflint-self.sh run-ranlib-test.sh run-ranlib-test2.sh \
+	run-ranlib-test.sh run-ranlib-test2.sh \
 	run-ranlib-test3.sh run-ranlib-test4.sh run-addrscopes.sh \
 	run-strings-test.sh run-funcscopes.sh run-find-prologues.sh \
 	run-allregs.sh run-readelf-test1.sh run-native-test.sh \
--- frysk-core/frysk/proc/TestTaskSyscallObserver.java.orig	2006-07-25 12:13:37.000000000 +0200
+++ frysk-core/frysk/proc/TestTaskSyscallObserver.java	2006-08-02 17:11:12.786017000 +0200
@@ -108,9 +108,9 @@
      */
     public void testExecSyscall(){
   
-  //	if (brokenXXX (2245))
-  //	    return;
-  //	    
+	if (brokenXXX (2245))
+	    return;
+	    
     	//	  Create an unattached child process.
     	AckProcess child = new DetachedAckProcess ();
     
--- frysk-core/frysk/proc/TestProcGet.java.orig	2006-04-16 03:33:50.000000000 +0200
+++ frysk-core/frysk/proc/TestProcGet.java	2006-08-02 17:16:45.107365000 +0200
@@ -59,6 +59,9 @@
      */
     public void testGetAuxv ()
     {
+	if (brokenXXX (0))
+		return;
+
 	TmpFile tmpFile = new TmpFile ();
 	new StopEventLoopWhenChildProcRemoved ();
 	AttachedDaemonProcess child = new AttachedDaemonProcess (new String[]


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- frysk.spec	2 Aug 2006 11:43:12 -0000	1.80
+++ frysk.spec	2 Aug 2006 16:39:54 -0000	1.81
@@ -1,12 +1,18 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.07.25.rh1
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
 
+# Disable the tests which fail:
+Patch0:		frysk-20060725-xfail.patch
+Patch1:		frysk-20060725-xfail-x86_64.patch
+# Backported fixes:
+Patch2:		frysk-20060725-fixes.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	libgtk-java >= 2.8.4
@@ -43,6 +49,11 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
+%ifarch x86-64
+%patch1
+%endif
+%patch2
 
 %build 
 
@@ -70,6 +81,9 @@
 
 make %{?_smp_mflags}
 
+%check
+make %{?_smp_mflags} -k check || :
+
 %install
 
 rm -rf %{buildroot}
@@ -99,6 +113,10 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Aug  2 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.25.rh1-4
+- Add make check to %%check
+- Add patches to fix or disable failing tests.
+
 * Wed Aug  2 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.25.rh1-3
 - BuildRequires latest dogtail
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 16:44:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 12:44:26 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2507,
	1.2508 linux-2.6-gfs2-dlm.patch, 1.11, 1.12
Message-ID: <200608021644.k72GiQjl011029@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-gfs2-dlm.patch 
Log Message:
More GFS2 bugfixing.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2507
retrieving revision 1.2508
diff -u -r1.2507 -r1.2508
--- kernel-2.6.spec	2 Aug 2006 00:08:45 -0000	1.2507
+++ kernel-2.6.spec	2 Aug 2006 16:44:23 -0000	1.2508
@@ -1627,6 +1627,9 @@
 %endif
 
 %changelog
+* Wed Aug  2 2006 Dave Jones <davej at redhat.com>
+- More GFS2 bugfixing.
+
 * Tue Aug  1 2006 Dave Jones <davej at redhat.com>
 - s390 kprobes support.
 - Fix oops in libata ata_device_add()

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   21 
 fs/dlm/Makefile                    |   19 
 fs/dlm/ast.c                       |  172 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 +++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  384 +++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  539 +++++
 fs/dlm/lock.c                      | 3845 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   61 
 fs/dlm/lockspace.c                 |  705 ++++++
 fs/dlm/lockspace.h                 |   25 
 fs/dlm/lowcomms.c                  | 1238 +++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   97 
 fs/dlm/member.c                    |  312 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  115 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  457 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  776 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  285 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/user.c                      |  785 +++++++
 fs/dlm/user.h                      |   16 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1236 +++++++++++
 fs/gfs2/bmap.h                     |   27 
 fs/gfs2/daemon.c                   |  196 +
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1976 +++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++
 fs/gfs2/eattr.h                    |   97 
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2279 +++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  564 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  658 ++++++
 fs/gfs2/inode.c                    | 1344 ++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  295 ++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  301 ++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 +++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 +++++++
 fs/gfs2/lops.h                     |   96 
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  780 +++++++
 fs/gfs2/meta_io.h                  |   74 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  308 ++
 fs/gfs2/ops_address.c              |  778 +++++++
 fs/gfs2/ops_address.h              |   18 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  293 ++
 fs/gfs2/ops_export.h               |   19 
 fs/gfs2/ops_file.c                 |  812 +++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  836 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1165 +++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  471 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  194 +
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/quota.c                    | 1286 ++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  575 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1528 ++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  979 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 +++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/Kbuild               |   33 
 include/linux/dlm.h                |  302 ++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  443 ++++
 include/linux/iflags.h             |  102 
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   41 
 mm/filemap.c                       |    3 
 mm/readahead.c                     |    1 
 131 files changed, 40621 insertions(+), 21 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-gfs2-dlm.patch	31 Jul 2006 20:48:12 -0000	1.11
+++ linux-2.6-gfs2-dlm.patch	2 Aug 2006 16:44:24 -0000	1.12
@@ -14188,10 +14188,10 @@
 +#endif /* __DAEMON_DOT_H__ */
 diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
 new file mode 100644
-index 0000000..563b99e
+index 0000000..76a23c1
 --- /dev/null
 +++ b/fs/gfs2/dir.c
-@@ -0,0 +1,1974 @@
+@@ -0,0 +1,1976 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -14409,6 +14409,7 @@
 +		if (error)
 +			goto fail;
 +
++		buf += amount;
 +		copied += amount;
 +		lblock++;
 +		dblock++;
@@ -14529,6 +14530,7 @@
 +		if (error)
 +			goto fail;
 +
++		buf += amount;
 +		copied += amount;
 +		lblock++;
 +



From fedora-cvs-commits at redhat.com  Wed Aug  2 16:47:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 12:47:17 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2508,
	1.2509 linux-2.6-vm-clear-unreclaimable.patch, 1.2, NONE
Message-ID: <200608021647.k72GlHZL023616@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-vm-clear-unreclaimable.patch 
Log Message:
broken


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2508
retrieving revision 1.2509
diff -u -r1.2508 -r1.2509
--- kernel-2.6.spec	2 Aug 2006 16:44:23 -0000	1.2508
+++ kernel-2.6.spec	2 Aug 2006 16:47:14 -0000	1.2509
@@ -413,8 +413,7 @@
 
 # VM bits.
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
-Patch2002: linux-2.6-vm-clear-unreclaimable.patch
-Patch2003: linux-2.6-mm-tracking-dirty-pages.patch
+Patch2002: linux-2.6-mm-tracking-dirty-pages.patch
 
 # Tweak some defaults.
 Patch2100: linux-2.6-defaults-fat-utf8.patch
@@ -940,10 +939,8 @@
 #
 # Silence GFP_ATOMIC failures.
 %patch2001 -p1
-# VM oom killer tweaks.
-%patch2002 -p1
 # track dirty pages
-%patch2003 -p1
+%patch2002 -p1
 
 # Changes to upstream defaults.
 # Use UTF-8 by default on VFAT.


--- linux-2.6-vm-clear-unreclaimable.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 16:50:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 12:50:34 -0400
Subject: rpms/gnome-utils/FC-5 gnome-utils.spec,1.111,1.112
Message-ID: <200608021650.k72GoY6M028009@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
fix build reqs



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-5/gnome-utils.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- gnome-utils.spec	2 Aug 2006 15:38:46 -0000	1.111
+++ gnome-utils.spec	2 Aug 2006 16:50:32 -0000	1.112
@@ -71,6 +71,7 @@
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  usermode
 BuildRequires:  gettext
+BuildRequires:  libxml2-python
 
 BuildRequires: atk-devel >= 1.5
 BuildRequires: scrollkeeper



From fedora-cvs-commits at redhat.com  Wed Aug  2 16:57:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 12:57:16 -0400
Subject: rpms/frysk/devel frysk-20060725-xfail-x86_64.patch, 1.1,
	1.2 frysk.spec, 1.81, 1.82 frysk-20060725-fixes.patch, 1.1, NONE
Message-ID: <200608021657.k72GvGDA030600@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30532

Modified Files:
	frysk-20060725-xfail-x86_64.patch frysk.spec 
Removed Files:
	frysk-20060725-fixes.patch 
Log Message:
Fix the previous attempt.

frysk-20060725-xfail-x86_64.patch:
 dw/tests/TestDwfl.java         |    3 +
 elf/ChangeLog                  |    5 ++
 elf/tests/TestElf.java         |   79 +++++++++++++++++++++++++----------------
 opcodes/ChangeLog              |    6 ++-
 opcodes/tests/TestOpcodes.java |   23 +++++++++++
 5 files changed, 85 insertions(+), 31 deletions(-)

Index: frysk-20060725-xfail-x86_64.patch
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk-20060725-xfail-x86_64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- frysk-20060725-xfail-x86_64.patch	2 Aug 2006 16:39:54 -0000	1.1
+++ frysk-20060725-xfail-x86_64.patch	2 Aug 2006 16:57:13 -0000	1.2
@@ -1,3 +1,25 @@
+2006-07-27  Mark Wielaard  <mark at klomp.org>
+
+	* tests/TestDwfl.java (testGetLine): Mark as broken bug #2965.
+
+Index: frysk-imports/lib/dw/tests/TestDwfl.java
+===================================================================
+RCS file: /cvs/frysk/frysk-imports/lib/dw/tests/TestDwfl.java,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -r1.8 -r1.9
+--- frysk-imports/lib/dw/tests/TestDwfl.java	25 Jul 2006 16:23:02 -0000	1.8
++++ frysk-imports/lib/dw/tests/TestDwfl.java	27 Jul 2006 14:10:55 -0000	1.9
+@@ -69,6 +69,9 @@
+ 
+   public void testGetLine ()
+   {
++    if (brokenXXX(2965))
++      return;
++
+     Dwfl dwfl = new Dwfl(TestLib.getPid());
+     assertNotNull(dwfl);
+     DwflLine line = dwfl.getSourceLine(TestLib.getFuncAddr());
 Index: frysk-imports/lib/elf/ChangeLog
 ===================================================================
 RCS file: /cvs/frysk/frysk-imports/lib/elf/ChangeLog,v
@@ -144,3 +166,75 @@
        }
    }
  
+Index: frysk-imports/lib/opcodes/ChangeLog
+===================================================================
+RCS file: /cvs/frysk/frysk-imports/lib/opcodes/ChangeLog,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- frysk-imports/lib/opcodes/ChangeLog	14 Jul 2006 14:51:29 -0000	1.7
++++ frysk-imports/lib/opcodes/ChangeLog	27 Jul 2006 14:10:55 -0000	1.8
+@@ -1,3 +1,7 @@
++2006-07-27  Mark Wielaard  <mark at klomp.org>
++
++	* tests/TestOpcodes.java (testDisassembler): Mark as broken bug #2712.
++
+ 2006-07-14  Mike Cvet  <mcvet at redhat.com>
+ 
+ 	* Disassembler.java (Disassembler): Applied GNU formatting.
+@@ -47,4 +51,4 @@
+ 	* Instruction.java: Ditto.
+ 	* OpcodesException.java: Ditto.
+ 	* cni: Ditto.
+-	* cni/Disassembler.cxx: Ditto.
+\ No newline at end of file
++	* cni/Disassembler.cxx: Ditto.
+Index: frysk-imports/lib/opcodes/tests/TestOpcodes.java
+===================================================================
+RCS file: /cvs/frysk/frysk-imports/lib/opcodes/tests/TestOpcodes.java,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- frysk-imports/lib/opcodes/tests/TestOpcodes.java	24 May 2006 19:07:27 -0000	1.3
++++ frysk-imports/lib/opcodes/tests/TestOpcodes.java	27 Jul 2006 14:10:55 -0000	1.4
+@@ -1,6 +1,6 @@
+ // This file is part of the program FRYSK.
+ //
+-// Copyright 2005, Red Hat Inc.
++// Copyright 2005, 2006 Red Hat Inc.
+ //
+ // FRYSK is free software; you can redistribute it and/or modify it
+ // under the terms of the GNU General Public License as published by
+@@ -49,11 +49,32 @@
+ 
+ public class TestOpcodes extends TestCase {
+ 
++    /**
++     * A variable that has the value true.  Used by code trying to
++     * stop the optimizer realise that there's dead code around.
++     */
++    static boolean trueXXX = true;
++    /**
++     * A function that returns true, and prints skip.  Used by test
++     * cases that want to be skipped (vis: if(broken()) return) while
++     * trying to avoid the compiler's optimizer realizing that the
++     * rest of the function is dead.
++     */
++    protected static boolean brokenXXX (int bug)
++    {
++	System.out.print ("<<BROKEN http://sourceware.org/bugzilla/show_bug.cgi?id=" + bug + " >>");
++	return trueXXX;
++    }
++
+ 	/*
+ 	 * Note: this test is expected to fail on anything but i386 for the time being.
+ 	 * TODO: come up with a way of doing the correct assertEquals for other archs
+ 	 */
+ 	public void testDisassembler(){
++
++	  if (brokenXXX(2712))
++	    return;
++
+ 		ByteBuffer buffer = new DummyByteBuffer();
+ 		final int numInstructions = 16;
+ 		


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- frysk.spec	2 Aug 2006 16:39:54 -0000	1.81
+++ frysk.spec	2 Aug 2006 16:57:13 -0000	1.82
@@ -10,8 +10,6 @@
 # Disable the tests which fail:
 Patch0:		frysk-20060725-xfail.patch
 Patch1:		frysk-20060725-xfail-x86_64.patch
-# Backported fixes:
-Patch2:		frysk-20060725-fixes.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -53,7 +51,6 @@
 %ifarch x86-64
 %patch1
 %endif
-%patch2
 
 %build 
 
@@ -115,7 +112,7 @@
 %changelog
 * Wed Aug  2 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.25.rh1-4
 - Add make check to %%check
-- Add patches to fix or disable failing tests.
+- Add patches to disable failing tests.
 
 * Wed Aug  2 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.25.rh1-3
 - BuildRequires latest dogtail


--- frysk-20060725-fixes.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 17:11:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 13:11:20 -0400
Subject: rpms/glibc/devel .cvsignore, 1.160, 1.161 glibc-fedora.patch, 1.164,
	1.165 glibc.spec, 1.251, 1.252 sources, 1.184, 1.185
Message-ID: <200608021711.k72HBKZ1001323@cvs.devel.redhat.com>

Author: jakub

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- .cvsignore	31 Jul 2006 08:33:02 -0000	1.160
+++ .cvsignore	2 Aug 2006 17:11:18 -0000	1.161
@@ -1,2 +1,2 @@
-glibc-20060731T0706.tar.bz2
-glibc-fedora-20060731T0706.tar.bz2
+glibc-20060802T1650.tar.bz2
+glibc-fedora-20060802T1650.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 57 files changed, 1394 insertions(+), 631 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- glibc-fedora.patch	31 Jul 2006 08:33:02 -0000	1.164
+++ glibc-fedora.patch	2 Aug 2006 17:11:18 -0000	1.165
@@ -1,5 +1,5 @@
---- glibc-20060731T0706/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060731T0706-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060802T1650/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060802T1650-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060731T0706/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060731T0706-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060802T1650/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060802T1650-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060731T0706/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060731T0706-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060802T1650/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060802T1650-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060731T0706/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060731T0706-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060802T1650/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060802T1650-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060731T0706/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060731T0706-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060802T1650/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060802T1650-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060731T0706/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060731T0706-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060802T1650/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060802T1650-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060731T0706/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060731T0706-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060802T1650/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060802T1650-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060731T0706/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060731T0706-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060802T1650/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060802T1650-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060731T0706/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060731T0706-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060802T1650/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060802T1650-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060731T0706/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060731T0706-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060802T1650/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060802T1650-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060731T0706/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060731T0706-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060802T1650/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1650-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-20060731T0706/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060731T0706-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060802T1650/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1650-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-20060731T0706/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060731T0706-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060802T1650/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060802T1650-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060731T0706/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060731T0706-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060802T1650/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060802T1650-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060731T0706/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060731T0706-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060802T1650/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060802T1650-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060731T0706/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060731T0706-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060802T1650/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060802T1650-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060731T0706/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060731T0706-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060802T1650/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060802T1650-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060731T0706/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060731T0706-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060802T1650/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060802T1650-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060731T0706/localedata/SUPPORTED	26 May 2006 17:02:50 -0000	1.94
-+++ glibc-20060731T0706-fedora/localedata/SUPPORTED	31 May 2006 15:10:34 -0000	1.71.2.11
+--- glibc-20060802T1650/localedata/SUPPORTED	26 May 2006 17:02:50 -0000	1.94
++++ glibc-20060802T1650-fedora/localedata/SUPPORTED	31 May 2006 15:10:34 -0000	1.71.2.11
 @@ -76,6 +76,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060731T0706/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060731T0706-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060802T1650/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060802T1650-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060731T0706/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
-+++ glibc-20060731T0706-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
+--- glibc-20060802T1650/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
++++ glibc-20060802T1650-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20060731T0706/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060731T0706-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060802T1650/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1650-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -950,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060731T0706/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060731T0706-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060802T1650/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060802T1650-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -979,8 +979,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060731T0706/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060731T0706-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060802T1650/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060802T1650-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1056,8 +1056,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060731T0706/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060731T0706-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060802T1650/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060802T1650-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -1113,17 +1113,17 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060731T0706/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060731T0706-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060802T1650/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060802T1650-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060731T0706/nptl/ChangeLog	31 Jul 2006 05:58:51 -0000	1.902
-+++ glibc-20060731T0706-fedora/nptl/ChangeLog	31 Jul 2006 07:17:00 -0000	1.706.2.93
-@@ -939,6 +939,15 @@
+--- glibc-20060802T1650/nptl/ChangeLog	1 Aug 2006 07:09:14 -0000	1.904
++++ glibc-20060802T1650-fedora/nptl/ChangeLog	2 Aug 2006 16:57:41 -0000	1.706.2.94
+@@ -952,6 +952,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1139,7 +1139,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1675,6 +1684,11 @@
+@@ -1688,6 +1697,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1151,7 +1151,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3749,6 +3763,11 @@
+@@ -3762,6 +3776,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1163,8 +1163,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060731T0706/nptl/Makefile	31 Jul 2006 05:58:25 -0000	1.182
-+++ glibc-20060731T0706-fedora/nptl/Makefile	31 Jul 2006 07:17:00 -0000	1.157.2.22
+--- glibc-20060802T1650/nptl/Makefile	1 Aug 2006 06:05:02 -0000	1.183
++++ glibc-20060802T1650-fedora/nptl/Makefile	2 Aug 2006 16:57:41 -0000	1.157.2.23
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1187,8 +1187,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060731T0706/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060731T0706-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060802T1650/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060802T1650-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1213,8 +1213,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060731T0706/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060731T0706-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1222,8 +1222,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060731T0706/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
-+++ glibc-20060731T0706-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
+--- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
++++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
 @@ -68,6 +68,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1559,8 +1559,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060731T0706/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060731T0706-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@@ -1706,8 +1706,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060731T0706/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060731T0706-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
 @@ -44,9 +44,16 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -1808,8 +1808,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060731T0706/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060731T0706-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1951,8 +1951,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060731T0706/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
-+++ glibc-20060731T0706-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
+--- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
++++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
 @@ -49,6 +49,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2340,8 +2340,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060731T0706/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060731T0706-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
 @@ -46,8 +46,13 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -2436,8 +2436,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060731T0706/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060731T0706-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060802T1650/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060802T1650-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2460,8 +2460,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060731T0706/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060731T0706-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060802T1650/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060802T1650-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2480,8 +2480,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060731T0706/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060731T0706-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060802T1650/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060802T1650-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2493,8 +2493,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060731T0706/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060731T0706-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060802T1650/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060802T1650-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -2535,8 +2535,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060731T0706/posix/Makefile	4 Jun 2006 04:59:05 -0000	1.191
-+++ glibc-20060731T0706-fedora/posix/Makefile	30 Jun 2006 09:16:34 -0000	1.171.2.19
+--- glibc-20060802T1650/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
++++ glibc-20060802T1650-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2570,8 +2570,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060731T0706/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060731T0706-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060802T1650/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1650-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -2588,8 +2588,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060731T0706/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060731T0706-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060802T1650/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060802T1650-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -2605,8 +2605,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060731T0706/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060731T0706-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060802T1650/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060802T1650-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2620,8 +2620,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060731T0706/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060731T0706-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060802T1650/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060802T1650-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -2633,8 +2633,8 @@
  endif
  endif
  
---- glibc-20060731T0706/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060731T0706-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060802T1650/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060802T1650-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -2986,8 +2986,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060731T0706/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060731T0706-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060802T1650/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1650-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3073,8 +3073,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060731T0706/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060731T0706-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060802T1650/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060802T1650-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
 @@ -41,7 +41,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3089,15 +3089,14 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060731T0706/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060731T0706-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
-@@ -18,12 +18,15 @@
+--- glibc-20060802T1650/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+@@ -18,11 +18,14 @@
     02111-1307 USA.  */
  
  #include <string.h>
 +#include <errno.h>
  #include <fcntl.h>
- #include <sys/sysctl.h>
  #include <sys/utsname.h>
  #include <kernel-features.h>
  #include <dl-sysdep.h>
@@ -3107,7 +3106,7 @@
  
  #ifndef MIN
  # define MIN(a,b) (((a)<(b))?(a):(b))
-@@ -177,5 +180,31 @@ _dl_setup_stack_chk_guard (void)
+@@ -176,5 +179,31 @@ _dl_setup_stack_chk_guard (void)
    unsigned char *p = (unsigned char *) &ret;
    p[sizeof (ret) - 1] = 255;
    p[sizeof (ret) - 2] = '\n';
@@ -3139,8 +3138,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060731T0706/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060731T0706-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060802T1650/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -3183,8 +3182,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060731T0706/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060731T0706-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060802T1650/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -3194,8 +3193,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060731T0706/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060731T0706-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060802T1650/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -3241,8 +3240,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060731T0706/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060731T0706-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060802T1650/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -3303,8 +3302,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060731T0706/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060731T0706-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060802T1650/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -3337,24 +3336,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060731T0706/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060731T0706-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060802T1650/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20060731T0706/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060731T0706-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060802T1650/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20060731T0706/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060731T0706-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060802T1650/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060802T1650-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.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- glibc.spec	31 Jul 2006 08:33:03 -0000	1.251
+++ glibc.spec	2 Aug 2006 17:11:18 -0000	1.252
@@ -1,9 +1,9 @@
-%define glibcdate 20060731T0706
+%define glibcdate 20060802T1650
 %define glibcname glibc
-%define glibcsrcdir glibc-20060731T0706
+%define glibcsrcdir glibc-20060802T1650
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 15
+%define glibcrelease 16
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1438,8 +1438,17 @@
 %endif
 
 %changelog
+* Wed Aug  2 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-16
+- fix dladdr on binaries/libraries with only DT_GNU_HASH and no
+  DT_HASH (#200635)
+- fix early timeout of initgroups data in nscd (#173019)
+- add am/pm display to es_PE and es_NI locales (#167101)
+- fix nss_compat failures when nis/nis+ unavailable (#192072)
+
 * Mon Jul 31 2006 Roland McGrath <roland at redhat.com> 2.4.90-15
 - fix missing destructor calls in dlclose (#197932)
+- enable transliteration support in all locales (#196713)
+- disallow RTLD_GLOBAL flag for dlmopen in secondary namespaces (#197462)
 - PI mutex support
 
 * Tue Jul 10 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-13


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- sources	31 Jul 2006 08:33:04 -0000	1.184
+++ sources	2 Aug 2006 17:11:18 -0000	1.185
@@ -1,2 +1,2 @@
-e3123774ae5559c34158ee23ec49e081  glibc-20060731T0706.tar.bz2
-9fab186a74fa3cbed9803ca01af45d26  glibc-fedora-20060731T0706.tar.bz2
+87aac24ea4854507282b8283eaec8606  glibc-20060802T1650.tar.bz2
+45d7a84cf4197cefb33fe03f3005e99b  glibc-fedora-20060802T1650.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 17:20:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 13:20:40 -0400
Subject: rpms/kernel/devel/configs config-powerpc64-generic,1.4,1.5
Message-ID: <200608021720.k72HKeug019621@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-powerpc64-generic 
Log Message:
64K pages for ppc64


Index: config-powerpc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-powerpc64-generic	23 Mar 2006 09:13:56 -0000	1.4
+++ config-powerpc64-generic	2 Aug 2006 17:20:38 -0000	1.5
@@ -10,7 +10,7 @@
 CONFIG_RTAS_PROC=y
 CONFIG_IOMMU_VMERGE=y
 CONFIG_NUMA=y
-# CONFIG_PPC_64K_PAGES is not set
+CONFIG_PPC_64K_PAGES=y
 CONFIG_SCHED_SMT=y
 
 # CONFIG_MV643XX_ETH is not set



From fedora-cvs-commits at redhat.com  Wed Aug  2 17:30:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 13:30:24 -0400
Subject: rpms/kernel/devel/configs config-xen-ia64,1.2,1.3
Message-ID: <200608021730.k72HUOl2023284@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-xen-ia64 
Log Message:
update ia64 xen configuration


Index: config-xen-ia64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-ia64,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-xen-ia64	31 Jul 2006 22:30:35 -0000	1.2
+++ config-xen-ia64	2 Aug 2006 17:30:20 -0000	1.3
@@ -1,14 +1,3 @@
-# override i686 xen
-
-# CONFIG_X86 is not set
-# CONFIG_X86_XEN is not set
-CONFIG_IA64=y
-CONFIG_XEN=y
-CONFIG_XEN_IA64_DOM0_VP=y
-CONFIG_XEN_DISABLE_SERIAL=y
-
-# override ia64 generic
-
 # CONFIG_IA64_GENERIC is not set
 CONFIG_IA64_DIG=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -16,9 +5,15 @@
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 
+CONFIG_XEN=y
+CONFIG_XEN_IA64_DOM0_VP=y
+CONFIG_XEN_DISABLE_SERIAL=y
+# CONFIG_XEN_BLKDEV_TAP is not set
+# CONFIG_XEN_PCIDEV_BACKEND is not set
+# CONFIG_XEN_PCIDEV_BACKEND_VPCI is not set
+# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
+# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+
 # internal #defines conflict with xen-ia64
 # CONFIG_FB_NEOMAGIC is not set
-
-# don't compile
-#  error: implicit declaration of function 'create_lookup_pte_addr'
-# CONFIG_XEN_BLKDEV_TAP is not set



From fedora-cvs-commits at redhat.com  Wed Aug  2 17:33:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 13:33:33 -0400
Subject: rpms/spamassassin/devel .cvsignore, 1.30, 1.31 sources, 1.29,
	1.30 spamassassin.spec, 1.72, 1.73
Message-ID: <200608021733.k72HXXEA023590@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23539

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
3.1.4 maintenance release



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	5 Jun 2006 20:53:18 -0000	1.30
+++ .cvsignore	2 Aug 2006 17:33:16 -0000	1.31
@@ -1 +1 @@
-Mail-SpamAssassin-3.1.3.tar.bz2
+Mail-SpamAssassin-3.1.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	5 Jun 2006 20:53:18 -0000	1.29
+++ sources	2 Aug 2006 17:33:16 -0000	1.30
@@ -1 +1 @@
-5f049f0b9fc63585a85593a3c68409bb  Mail-SpamAssassin-3.1.3.tar.bz2
+c620b0a20791999a8f8091b0888e0195  Mail-SpamAssassin-3.1.4.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- spamassassin.spec	17 Jul 2006 21:08:44 -0000	1.72
+++ spamassassin.spec	2 Aug 2006 17:33:16 -0000	1.73
@@ -5,8 +5,8 @@
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
-Version: 3.1.3
-Release: 5%{?dist}
+Version: 3.1.4
+Release: 1%{?dist}
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -162,6 +162,9 @@
 exit 0
 
 %changelog
+* Wed Aug 02 2006 Warren Togami <wtogami at redhat.com> - 3.1.4-1
+- 3.1.4 maintenance release
+
 * Mon Jul 17 2006 Warren Togami <wtogami at redhat.com> - 3.1.3-5
 - req perl-IO-Socket-SSL for spamc/spamd SSL communication
 - req perl-IO-Socket-INET6 for IPv6



From fedora-cvs-commits at redhat.com  Wed Aug  2 17:39:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 13:39:23 -0400
Subject: rpms/nautilus/FC-5 nautilus.spec,1.101,1.102
Message-ID: <200608021739.k72HdNKg025379@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	nautilus.spec 
Log Message:
fix BRs



Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/FC-5/nautilus.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- nautilus.spec	2 Aug 2006 14:45:47 -0000	1.101
+++ nautilus.spec	2 Aug 2006 17:39:03 -0000	1.102
@@ -60,6 +60,7 @@
 BuildRequires:  librsvg2
 BuildRequires:  intltool
 BuildRequires:  libX11-devel
+BuildRequires:  libXt-devel
 BuildRequires:  fontconfig
 BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:  libtool >= 1.4.2-10



From fedora-cvs-commits at redhat.com  Wed Aug  2 17:39:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 13:39:41 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt-libhover-jar.patch,1.1,1.2
Message-ID: <200608021739.k72HdfHT025436@cvs.devel.redhat.com>

Author: jjohnstn

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

Modified Files:
	eclipse-cdt-libhover-jar.patch 
Log Message:

Fix patch as it was initially created against invalid source tar.


eclipse-cdt-libhover-jar.patch:
 LibHover.java |  145 ++++++++++++++++++++--------------------------------------
 1 files changed, 50 insertions(+), 95 deletions(-)

Index: eclipse-cdt-libhover-jar.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt-libhover-jar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-cdt-libhover-jar.patch	31 Jul 2006 20:50:37 -0000	1.1
+++ eclipse-cdt-libhover-jar.patch	2 Aug 2006 17:39:26 -0000	1.2
@@ -1,15 +1,14 @@
---- com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java.fix	2006-07-31 15:56:12.000000000 -0400
-+++ com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java	2006-07-31 15:56:31.000000000 -0400
-@@ -15,43 +15,45 @@
+--- com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java.fix	2006-08-02 13:34:36.000000000 -0400
++++ com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java	2006-08-02 13:34:57.000000000 -0400
+@@ -15,40 +15,45 @@
  
  package com.redhat.eclipse.cdt.autotools.ui;
  
 -import java.util.*;
--import java.net.MalformedURLException;
 -import java.net.URL;
 -import java.io.File;
  import java.io.IOException;
- import java.io.InputStream;
++import java.io.InputStream;
 +import java.net.MalformedURLException;
 +import java.util.ArrayList;
  
@@ -26,7 +25,7 @@
 -import com.redhat.eclipse.cdt.autotools.AutotoolsPlugin;
 -import org.eclipse.cdt.ui.ICHelpProvider;
 -import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
- import org.eclipse.cdt.ui.CUIPlugin;
++import org.eclipse.cdt.ui.CUIPlugin;
  import org.eclipse.cdt.ui.ICHelpBook;
 +import org.eclipse.cdt.ui.ICHelpProvider;
  import org.eclipse.cdt.ui.ICHelpResourceDescriptor;
@@ -61,7 +60,7 @@
              "dtype",
  	        "enum",
  	        "function",
-@@ -66,108 +68,39 @@ public class LibHover implements ICHelpP
+@@ -63,70 +68,39 @@ public class LibHover implements ICHelpP
  	    static final int typeIndex          = 4;
  	    static final int unionIndex         = 5;
  
@@ -118,54 +117,25 @@
 +     
 +	public void getLibHoverDocs() {
  		if (null != plugin) {
--//			URL hoverdocsURL;
--//			URL homeURL = plugin.find(new Path("."));
- 			Document doc = null;
+-			URL homeURL = plugin.find(new Path("."));
++			Document doc = null;
  			try {
--//				homeURL = Platform.asLocalURL(homeURL);
--//				IPath topPath = (new Path(homeURL.getPath())).removeLastSegments(1);
--//				IPath homePath = topPath;
--//				if (null != root) homePath = homePath.append(root);
--//				if (null != path) homePath = homePath.append(path);
--//				homePath = homePath.addTrailingSeparator();
--//				docsRootPath = homePath.toOSString();
+-				homeURL = Platform.asLocalURL(homeURL);
+-				IPath topPath = (new Path(homeURL.getPath())).removeLastSegments(1);
+-				IPath homePath = topPath;
+-				if (null != root) homePath = homePath.append(root);
+-				if (null != path) homePath = homePath.append(path);
+-				homePath = homePath.addTrailingSeparator();
+-				docsRootPath = homePath.toOSString();
 -
  				// see comment in initialize()
 -				// document = getDocument(((null == defaultSearchPath) ? "!" : defaultSearchPath), "glibc.xml");
- 				try {
--					Path p = new Path("libhoverdocs/glibc.xml");
+-				document = getDocument("./libhoverdocs:~/libhoverdocs:/usr/share/eclipse/libhoverdocs:!", "glibc.xml");
++				try {
 +					// Use the FileLocator class to open the magic hover doc file
 +					// in the plugin's jar.
 +					Path p = new Path("libhoverdocs/glibc.xml"); //$NON-NLS-1$
- 					InputStream docStream = FileLocator.openStream(AutotoolsPlugin.getDefault().getBundle(), p, false);
--					System.out.println("docStream created");
--//					Path x = new Path(hoverdocsURL.getPath());
--//					x.append("glibc.xml");
--//					System.out.println(x.toString());
--		               DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
--		                factory.setValidating(true);
--		                try {
--		                    DocumentBuilder builder = factory.newDocumentBuilder();
--//		                    builder.setErrorHandler(new TextHoverErrorHandler());
--		                    doc = builder.parse(docStream);
--		                    System.out.println("doc parsed successfully");
--		                }
--		                catch (SAXParseException saxException) {
--		                    doc = null;
--		                    System.out.println("SAXParseException");
--		                }
--		                catch (SAXException saxEx) {
--		                    doc = null;
--		                    System.out.println("SAXException");
--		                }
--		                catch (ParserConfigurationException pce) {
--		                    doc = null;
--		                    System.out.println("ParserConfigurationException");
--		                }
--		                catch (IOException ioe) {
--		                    doc = null;
--		                    System.out.println("IOException");
--		                }
++					InputStream docStream = FileLocator.openStream(AutotoolsPlugin.getDefault().getBundle(), p, false);
 +					DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 +					factory.setValidating(true);
 +					try {
@@ -184,16 +154,14 @@
 +					catch (IOException ioe) {
 +						doc = null;
 +					}
- 				} catch (MalformedURLException e) {
- 					CUIPlugin.getDefault().log(e);
- 				}
--
- 				document = doc;
--//				document = getDocument("./libhoverdocs:~/libhoverdocs:/usr/share/eclipse/libhoverdocs:!", "glibc.xml");
++				} catch (MalformedURLException e) {
++					CUIPlugin.getDefault().log(e);
++				}
++				document = doc;
  			}
  			catch (IOException ioe) {
  			}
-@@ -176,26 +109,7 @@ public class LibHover implements ICHelpP
+@@ -135,26 +109,7 @@ public class LibHover implements ICHelpP
  	
  	public void initialize() {
  		plugin = (Plugin)AutotoolsPlugin.getDefault();



From fedora-cvs-commits at redhat.com  Wed Aug  2 17:41:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 13:41:22 -0400
Subject: rpms/spamassassin/devel spamassassin.spec, 1.73,
	1.74 spamassassin-3.1.1-nls-spamd-init.patch, 1.1, NONE
Message-ID: <200608021741.k72HfMnC025928@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25833

Modified Files:
	spamassassin.spec 
Removed Files:
	spamassassin-3.1.1-nls-spamd-init.patch 
Log Message:
spamassassin-3.1.1-nls-spamd-init.patch was included upstream.



Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- spamassassin.spec	2 Aug 2006 17:33:16 -0000	1.73
+++ spamassassin.spec	2 Aug 2006 17:41:20 -0000	1.74
@@ -19,7 +19,6 @@
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-Patch123: spamassassin-3.1.1-nls-spamd-init.patch
 Patch124: spamassassin-3.1.3-serviceorder.patch
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -68,7 +67,6 @@
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-%patch123 -p1
 %patch124 -p1
 # end of patches
 


--- spamassassin-3.1.1-nls-spamd-init.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 17:55:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 13:55:10 -0400
Subject: rpms/vte/devel .cvsignore, 1.43, 1.44 sources, 1.43, 1.44 vte.spec,
	1.87, 1.88
Message-ID: <200608021755.k72HtA8X013500@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13384

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.13.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	25 Jul 2006 15:31:40 -0000	1.43
+++ .cvsignore	2 Aug 2006 17:55:08 -0000	1.44
@@ -1 +1 @@
-vte-0.13.4.tar.bz2
+vte-0.13.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	25 Jul 2006 15:31:40 -0000	1.43
+++ sources	2 Aug 2006 17:55:08 -0000	1.44
@@ -1 +1 @@
-6b963ce0b5999d83b382089ef94d2874  vte-0.13.4.tar.bz2
+47ea2c90bd64a7e8749cf7640dc82a28  vte-0.13.5.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- vte.spec	25 Jul 2006 15:31:40 -0000	1.87
+++ vte.spec	2 Aug 2006 17:55:08 -0000	1.88
@@ -1,6 +1,6 @@
 Name: vte
-Version: 0.13.4
-Release: 1
+Version: 0.13.5
+Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPL
 Group: User Interface/X
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 0.13.5-1.fc6
+- Update to 0.13.5
+
 * Tue Jul 25 2006 Behdad Esfahbod <besfahbo at redhat.com> 0.13.4-1
 - Update to 0.13.4
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 18:03:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 14:03:05 -0400
Subject: rpms/fedora-release-notes/devel fedora-release-notes.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200608021803.k72I35hh015907@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release-notes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15866/devel

Modified Files:
	fedora-release-notes.spec sources 
Log Message:
auto-import fedora-release-notes-5.91-5 on branch devel from fedora-release-notes-5.91-5.src.rpm


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-release-notes.spec	27 Jul 2006 03:06:43 -0000	1.2
+++ fedora-release-notes.spec	2 Aug 2006 18:03:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		fedora-release-notes
 Version:	5.91
-Release:	4
+Release:	5%{?dist}
 Summary:	Release Notes for Fedora Core %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
@@ -38,8 +38,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -m 644 -D index.html $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/index.html
-install -m 644 -D fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/fedora.css
+install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
+install -m 644 index.html fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
+install -m 644 README-Accessibility $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
 for DIR in css img stylesheet-images ; do
   install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$DIR
   find $DIR -type f -exec install -m 644 {} $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$DIR \;
@@ -74,6 +75,9 @@
 
 
 %changelog
+* Wed Aug  2 2006 Paul W. Frields <stickster at gmail.com> - 5.91-5
+- Add README-Accessibility (moved from fedora-release)
+
 * Wed Jul 26 2006 Paul W. Frields <stickster at gmail.com> - 5.91-4
 - Process paths correctly (#200266)
 - Package standalone HTML
@@ -85,6 +89,6 @@
 - Don't require fedora-release, fedora-release requires us.
 - Add a URL tag
 
-* Sun Jul 16 2006 Paul W. Frields <stickster at gmail.com> - 5.91-1%{?dist}
+* Sun Jul 16 2006 Paul W. Frields <stickster at gmail.com> - 5.91-1
 - Initial release for Fedora Core 6 test2.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Jul 2006 03:06:43 -0000	1.3
+++ sources	2 Aug 2006 18:03:02 -0000	1.4
@@ -1 +1 @@
-e9b5ae7c2aeebba64f28bff746df98f2  fedora-release-notes-5.91.tar.gz
+fe5148b10dc87555d8dda074460c127c  fedora-release-notes-5.91.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug  2 18:06:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 14:06:43 -0400
Subject: rpms/pango/devel .cvsignore, 1.37, 1.38 pango.spec, 1.77,
	1.78 sources, 1.37, 1.38
Message-ID: <200608021806.k72I6hkO016390@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16285

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
Update to 1.13.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	25 Jul 2006 14:19:51 -0000	1.37
+++ .cvsignore	2 Aug 2006 18:06:41 -0000	1.38
@@ -1 +1 @@
-pango-1.13.4.tar.bz2
+pango-1.13.5.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- pango.spec	27 Jul 2006 22:22:24 -0000	1.77
+++ pango.spec	2 Aug 2006 18:06:41 -0000	1.78
@@ -7,8 +7,8 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.13.4
-Release: 2
+Version: 1.13.5
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.13/pango-%{version}.tar.bz2
@@ -190,6 +190,9 @@
 
 
 %changelog
+* Wed Aug 02 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.13.5-1
+- Update to 1.13.5
+
 * Mon Jul 27 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.13.4-2
 - Add umask 022 to post (#185419)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	25 Jul 2006 14:19:52 -0000	1.37
+++ sources	2 Aug 2006 18:06:41 -0000	1.38
@@ -1 +1 @@
-73dc3a691a7832aeca200a6a3c5490db  pango-1.13.4.tar.bz2
+e670733d74e52f344bc7d9f7766390a6  pango-1.13.5.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 18:08:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 14:08:25 -0400
Subject: rpms/pam/devel pam-0.99.5.0-keyinit-multiinit.patch, NONE,
	1.1 pam.spec, 1.127, 1.128
Message-ID: <200608021808.k72I8PnV016922@cvs.devel.redhat.com>

Author: tmraz

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

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.5.0-keyinit-multiinit.patch 
Log Message:
* Wed Aug  2 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-6
- revoke keyrings properly when pam_keyinit called more than once (#201048)
  patch by David Howells


pam-0.99.5.0-keyinit-multiinit.patch:
 pam_keyinit.c |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

--- NEW FILE pam-0.99.5.0-keyinit-multiinit.patch ---
diff -uNrp Linux-PAM-0.99.5.0.orig/modules/pam_keyinit/pam_keyinit.c Linux-PAM-0.99.5.0.fix/modules/pam_keyinit/pam_keyinit.c
--- Linux-PAM-0.99.5.0.orig/modules/pam_keyinit/pam_keyinit.c	2006-08-01 16:19:48.000000000 +0100
+++ Linux-PAM-0.99.5.0.fix/modules/pam_keyinit/pam_keyinit.c	2006-08-02 15:18:53.000000000 +0100
@@ -31,6 +31,7 @@
 #define KEYCTL_LINK			8 /* link a key into a keyring */
 
 static int my_session_keyring;
+static int session_counter;
 static int do_revoke;
 static int xdebug = 0;
 
@@ -95,10 +96,8 @@ static int init_keyrings(pam_handle_t *p
 
 		/* if the user session keyring is our keyring, then we don't
 		 * need to do anything if we're not forcing */
-		if (session != usession) {
-			do_revoke = 0;
+		if (session != usession)
 			return PAM_SUCCESS;
-		}
 	}
 
 	/* create a session keyring, discarding the old one */
@@ -132,6 +131,8 @@ static void kill_keyrings(pam_handle_t *
 		syscall(__NR_keyctl,
 			KEYCTL_REVOKE,
 			my_session_keyring);
+
+		my_session_keyring = 0;
 	}
 }
 
@@ -155,6 +156,16 @@ int pam_sm_open_session(pam_handle_t *pa
 			do_revoke = 1;
 	}
 
+	/* don't do anything if already created a keyring (will be called
+	 * multiple times if mentioned more than once in a pam script)
+	 */
+	session_counter++;
+
+	debug(pamh, "OPEN %d", session_counter);
+
+	if (my_session_keyring > 0)
+		return PAM_SUCCESS;
+
 	/* look up the target UID */
 	ret = pam_get_user(pamh, &username, "key user");
 	if (ret != PAM_SUCCESS)
@@ -202,7 +213,12 @@ PAM_EXTERN
 int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED,
 			 int argc UNUSED, const char **argv UNUSED)
 {
-	if (do_revoke)
+	debug(pamh, "CLOSE %d,%d,%d",
+	      session_counter, my_session_keyring, do_revoke);
+
+	session_counter--;
+
+	if (session_counter == 0 && my_session_keyring > 0 && do_revoke)
 		kill_keyrings(pamh);
 
 	return PAM_SUCCESS;


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- pam.spec	21 Jul 2006 22:36:15 -0000	1.127
+++ pam.spec	2 Aug 2006 18:08:23 -0000	1.128
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.5.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -37,6 +37,7 @@
 Patch85: pam-0.99.5.0-selinux-enoent.patch
 Patch86: pam-0.99.5.0-console-no-ainit.patch
 Patch87: pam-0.99.5.0-keyinit-no-debug.patch
+Patch88: pam-0.99.5.0-keyinit-multiinit.patch
 Patch90: pam-0.99.5.0-namespace-init.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
@@ -102,6 +103,7 @@
 %patch85 -p1 -b .enoent
 %patch86 -p1 -b .no-ainit
 %patch87 -p1 -b .no-debug
+%patch88 -p1 -b .multiinit
 %patch90 -p1 -b .namespace-init
 
 for readme in modules/pam_*/README ; do
@@ -369,6 +371,10 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Wed Aug  2 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-6
+- revoke keyrings properly when pam_keyinit called more than once (#201048)
+  patch by David Howells
+
 * Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-5
 - don't log pam_keyinit debug messages by default (#199783)
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 18:17:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 14:17:58 -0400
Subject: rpms/fedora-release-notes/devel fedora-release-notes.spec,1.3,1.4
Message-ID: <200608021817.k72IHwnF002307@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release-notes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2281

Modified Files:
	fedora-release-notes.spec 
Log Message:
remove dist tag


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-release-notes.spec	2 Aug 2006 18:03:02 -0000	1.3
+++ fedora-release-notes.spec	2 Aug 2006 18:17:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		fedora-release-notes
 Version:	5.91
-Release:	5%{?dist}
+Release:	5
 Summary:	Release Notes for Fedora Core %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 18:18:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 14:18:45 -0400
Subject: rpms/openssl/devel openssl-0.9.8b-enc-bufsize.patch, NONE,
	1.1 openssl.spec, 1.81, 1.82
Message-ID: <200608021818.k72IIjH2002679@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2622

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8b-enc-bufsize.patch 
Log Message:
* Wed Aug  2 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-5
- set buffering to none on stdio/stdout FILE when bufsize is set (#200580)
  patch by IBM


openssl-0.9.8b-enc-bufsize.patch:
 enc.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE openssl-0.9.8b-enc-bufsize.patch ---
--- openssl-0.9.8a/apps/enc.c.orig	2006-07-27 18:37:05.000000000 -0500
+++ openssl-0.9.8a/apps/enc.c	2006-07-27 18:38:30.000000000 -0500
@@ -340,7 +340,7 @@
 			}
 
 		/* It must be large enough for a base64 encoded line */
-		if (n < 80) n=80;
+		if (base64 && n < 80) n=80;
 
 		bsize=(int)n;
 		if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize);
@@ -370,7 +370,11 @@
 		}
 
 	if (inf == NULL)
+	        {
+		if (bufsize != NULL)
+			setvbuf(stdin, (char *)NULL, _IONBF, 0);
 		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+	        }
 	else
 		{
 		if (BIO_read_filename(in,inf) <= 0)
@@ -421,6 +425,8 @@
 	if (outf == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+		if (bufsize != NULL)
+			setvbuf(stdout, (char *)NULL, _IONBF, 0);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- openssl.spec	29 Jul 2006 02:54:33 -0000	1.81
+++ openssl.spec	2 Aug 2006 18:18:43 -0000	1.82
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8b
-Release: 4.1
+Release: 5
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -48,6 +48,7 @@
 Patch36: openssl-0.9.8a-use-poll.patch
 Patch38: openssl-0.9.8a-reuse-cipher-change.patch
 Patch39: openssl-0.9.8b-ipv6-apps.patch
+Patch40: openssl-0.9.8b-enc-bufsize.patch
 # Backported fixes including security fixes
 Patch51: openssl-0.9.8b-block-padding.patch
 Patch52: openssl-0.9.8b-pkcs12-fix.patch
@@ -111,6 +112,7 @@
 %patch36 -p1 -b .use-poll
 %patch38 -p1 -b .cipher-change
 %patch39 -p1 -b .ipv6-apps
+%patch40 -p1 -b .enc-bufsize
 
 %patch51 -p1 -b .block-padding
 %patch52 -p1 -b .pkcs12-fix
@@ -351,6 +353,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Aug  2 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-5
+- set buffering to none on stdio/stdout FILE when bufsize is set (#200580)
+  patch by IBM
+
 * Fri Jul 28 2006 Alexandre Oliva <aoliva at redhat.com> - 0.9.8b-4.1
 - rebuild with new binutils (#200330)
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 18:28:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 14:28:12 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.214,
	1.215 policycoreutils.spec, 1.296,
	1.297 policycoreutils-1.30.10-audit-mass-relabel.patch, 1.2,
	NONE policycoreutils-1.30.10-secon.patch, 1.2,
	NONE policycoreutils-1.30.12-audit-mass-relabel.patch, 1.1,
	NONE policycoreutils-1.30.9-secon.patch, 1.1, NONE
Message-ID: <200608021828.k72ISCBE006389@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6344

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Removed Files:
	policycoreutils-1.30.10-audit-mass-relabel.patch 
	policycoreutils-1.30.10-secon.patch 
	policycoreutils-1.30.12-audit-mass-relabel.patch 
	policycoreutils-1.30.9-secon.patch 
Log Message:
* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-2
- Stop restorecond init script when selinux is not enabled


policycoreutils-rhat.patch:
 newrole/newrole.c            |    8 +
 po/fr.po                     |   54 ++++++---
 po/sv.po                     |  252 +++++++++++++++++++++++++++----------------
 po/ta.po                     |   34 ++---
 restorecond/restorecond.c    |    7 +
 restorecond/restorecond.init |    2 
 scripts/fixfiles             |    2 
 7 files changed, 229 insertions(+), 130 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- policycoreutils-rhat.patch	1 Aug 2006 13:56:38 -0000	1.214
+++ policycoreutils-rhat.patch	2 Aug 2006 18:28:08 -0000	1.215
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.22/newrole/newrole.c
 --- nsapolicycoreutils/newrole/newrole.c	2006-07-03 07:52:43.000000000 -0400
-+++ policycoreutils-1.30.22/newrole/newrole.c	2006-08-01 09:53:54.000000000 -0400
++++ policycoreutils-1.30.22/newrole/newrole.c	2006-08-02 14:22:10.000000000 -0400
 @@ -47,6 +47,7 @@
   *
   *************************************************************************/
@@ -32,7 +32,7 @@
  	perror(_("failed to exec shell\n"));
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fr.po policycoreutils-1.30.22/po/fr.po
 --- nsapolicycoreutils/po/fr.po	2006-08-01 09:47:27.000000000 -0400
-+++ policycoreutils-1.30.22/po/fr.po	2006-08-01 09:56:24.000000000 -0400
++++ policycoreutils-1.30.22/po/fr.po	2006-08-02 14:22:10.000000000 -0400
 @@ -8,14 +8,14 @@
  msgstr ""
  "Project-Id-Version: Policy Core Utils 1.0\n"
@@ -208,7 +208,7 @@
 -
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.30.22/po/sv.po
 --- nsapolicycoreutils/po/sv.po	2006-08-01 09:47:27.000000000 -0400
-+++ policycoreutils-1.30.22/po/sv.po	2006-08-01 09:56:24.000000000 -0400
++++ policycoreutils-1.30.22/po/sv.po	2006-08-02 14:22:10.000000000 -0400
 @@ -1,46 +1,64 @@
 +# Swedish messages for policycoreutils.
 +# Copyright (C) 2006 Christian Rose.
@@ -900,9 +900,99 @@
 +
 +msgid "Options Error: %s"
 +msgstr "Flaggfel: %s"
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-1.30.22/po/ta.po
+--- nsapolicycoreutils/po/ta.po	2006-08-01 09:47:27.000000000 -0400
++++ policycoreutils-1.30.22/po/ta.po	2006-08-02 14:25:00.000000000 -0400
+@@ -8,14 +8,14 @@
+ "Project-Id-Version: ta\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2006-05-26 13:48-0400\n"
+-"PO-Revision-Date: 2006-05-10 18:00+0530\n"
++"PO-Revision-Date: 2006-08-02 10:19+0530\n"
+ "Last-Translator: Felix <ifelix at redhat.com>\n"
+ "Language-Team: Tamil <ta at li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: KBabel 1.9.1\n"
+-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n\n"
+ "\n"
+ 
+ #: ../load_policy/load_policy.c:22
+@@ -361,42 +361,40 @@
+ msgstr "chcat -l +CompanyConfidential juser"
+ 
+ #: ../semanage/semanage:122
+-#, fuzzy
+ msgid "Requires 2 or more arguments"
+-msgstr "?????????????????????????????? ?????????????????? ??????????????????????????? ??????????????????????????????????????????"
++msgstr "2 ?????????????????? ?????????????????? ???????????? ?????????????????????????????????????????? ??????????????????????????????????????????"
+ 
+ #: ../semanage/semanage:127
+-#, fuzzy, c-format
++#, c-format
+ msgid "%s not defined"
+-msgstr "???????????? %s/%s ?????????????????????????????????????????????????????????"
++msgstr "%s ?????????????????????????????????????????????????????????"
+ 
+ #: ../semanage/semanage:151
+-#, fuzzy, c-format
++#, c-format
+ msgid "%s not valid for %s objects\n"
+-msgstr "%s ?????????????????? ??????????????? ???????????????\n"
++msgstr "%s ?????????????????? %s ??????????????????????????????????????? ??????????????????????????????\n"
+ 
+ #: ../semanage/semanage:178 ../semanage/semanage:186
+-#, fuzzy
+ msgid "range not supported on Non MLS machines"
+-msgstr "non-MLS ?????????????????????????????? ???????????????????????????????????? ????????????????????????"
++msgstr "Non MLS ?????????????????????????????? ?????????????????????????????? ??????????????????????????????"
+ 
+ #: ../semanage/semanage:244
+ msgid "You must specify a role"
+-msgstr ""
++msgstr "????????????????????? ????????? ????????????????????? ??????????????????????????? ????????????????????????"
+ 
+ #: ../semanage/semanage:246
+ msgid "You must specify a prefix"
+-msgstr ""
++msgstr "????????????????????? ????????? ???????????????????????????????????? ??????????????????????????? ????????????????????????"
+ 
+ #: ../semanage/semanage:295
+-#, fuzzy, c-format
++#, c-format
+ msgid "Options Error %s "
+-msgstr "???????????????????????????????????? ????????????: %s "
++msgstr "???????????????????????????????????? ???????????? %s "
+ 
+ #: ../semanage/semanage:299
+-#, fuzzy, c-format
++#, c-format
+ msgid "Invalid value %s"
+-msgstr "??????????????? ???????????? '%s' "
++msgstr "??????????????? ????????????????????? %s"
+ 
+ #: ../semanage/seobject.py:124
+ msgid "translations not supported on non-MLS machines"
+@@ -405,8 +403,7 @@
+ #: ../semanage/seobject.py:131
+ #, python-format
+ msgid "Unable to open %s: translations not supported on non-MLS machines"
+-msgstr ""
+-"%s??? ?????????????????? ?????????????????????????????????: MLS ??????????????? ?????????????????????????????? ??????????????????????????????????????????????????? ???????????? ?????????????????????????????????"
++msgstr "%s??? ?????????????????? ?????????????????????????????????: MLS ??????????????? ?????????????????????????????? ??????????????????????????????????????????????????? ???????????? ?????????????????????????????????"
+ 
+ #: ../semanage/seobject.py:171 ../semanage/seobject.py:185
+ #, python-format
+@@ -972,3 +969,4 @@
+ #, c-format
+ msgid "Options Error: %s "
+ msgstr "???????????????????????????????????? ????????????: %s "
++
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.22/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2006-08-01 09:47:23.000000000 -0400
-+++ policycoreutils-1.30.22/restorecond/restorecond.c	2006-08-01 09:55:14.000000000 -0400
++++ policycoreutils-1.30.22/restorecond/restorecond.c	2006-08-02 14:22:10.000000000 -0400
 @@ -436,9 +436,14 @@
  	/* Make sure we are root */
  	if (getuid() != 0) {
@@ -919,9 +1009,21 @@
  
  	/* Register sighandlers */
  	sa.sa_flags = 0;
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30.22/restorecond/restorecond.init
+--- nsapolicycoreutils/restorecond/restorecond.init	2006-05-15 09:42:57.000000000 -0400
++++ policycoreutils-1.30.22/restorecond/restorecond.init	2006-08-02 14:23:49.000000000 -0400
+@@ -11,6 +11,8 @@
+ # Source function library.
+ . /etc/rc.d/init.d/functions
+ 
++[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 0
++
+ start() 
+ {
+         echo -n $"Starting restorecond: "
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.22/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2006-07-03 07:52:42.000000000 -0400
-+++ policycoreutils-1.30.22/scripts/fixfiles	2006-08-01 09:53:54.000000000 -0400
++++ policycoreutils-1.30.22/scripts/fixfiles	2006-08-02 14:22:10.000000000 -0400
 @@ -234,7 +234,7 @@
  # Make sure they specified one of the three valid commands
  #


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- policycoreutils.spec	1 Aug 2006 13:56:38 -0000	1.296
+++ policycoreutils.spec	2 Aug 2006 18:28:09 -0000	1.297
@@ -1,11 +1,11 @@
 %define libauditver 1.1.4-3
-%define libsepolver 1.12.19-1
+%define libsepolver 1.12.21-1
 %define libsemanagever 1.6.11-1
 %define libselinuxver 1.30.19-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.22
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -112,16 +112,14 @@
    /sbin/chkconfig --del restorecond
 fi
 
-%postun
-if [ $1 -ge 1 ]; then
-   /sbin/service restorecond condrestart > /dev/null 2>&1 || :
-fi
-
 %post
 /sbin/chkconfig --add restorecond
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-2
+- Stop restorecond init script when selinux is not enabled
+
 * Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-1
 - Update to upstream
 	* Merged restorecond size_t fix from Joshua Brindle.


--- policycoreutils-1.30.10-audit-mass-relabel.patch DELETED ---


--- policycoreutils-1.30.10-secon.patch DELETED ---


--- policycoreutils-1.30.12-audit-mass-relabel.patch DELETED ---


--- policycoreutils-1.30.9-secon.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 18:29:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 14:29:56 -0400
Subject: rpms/glibc/devel .cvsignore, 1.161, 1.162 glibc-fedora.patch, 1.165,
	1.166 glibc.spec, 1.252, 1.253 sources, 1.185, 1.186
Message-ID: <200608021829.k72ITuH0007168@cvs.devel.redhat.com>

Author: jakub

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- .cvsignore	2 Aug 2006 17:11:18 -0000	1.161
+++ .cvsignore	2 Aug 2006 18:29:53 -0000	1.162
@@ -1,2 +1,2 @@
-glibc-20060802T1650.tar.bz2
-glibc-fedora-20060802T1650.tar.bz2
+glibc-20060802T1808.tar.bz2
+glibc-fedora-20060802T1808.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 57 files changed, 1394 insertions(+), 631 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- glibc-fedora.patch	2 Aug 2006 17:11:18 -0000	1.165
+++ glibc-fedora.patch	2 Aug 2006 18:29:53 -0000	1.166
@@ -1,5 +1,5 @@
---- glibc-20060802T1650/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060802T1650-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060802T1808/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060802T1808-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060802T1650/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060802T1650-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060802T1808/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060802T1808-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060802T1650/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060802T1650-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060802T1808/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060802T1808-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060802T1650/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060802T1650-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060802T1808/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060802T1808-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060802T1650/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060802T1650-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060802T1808/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060802T1808-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060802T1650/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060802T1650-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060802T1808/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060802T1808-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060802T1650/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060802T1650-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060802T1808/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060802T1808-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060802T1650/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060802T1650-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060802T1808/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060802T1808-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060802T1650/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060802T1650-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060802T1808/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060802T1808-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060802T1650/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060802T1650-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060802T1808/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060802T1808-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060802T1650/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1650-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060802T1808/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1808-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-20060802T1650/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1650-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060802T1808/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1808-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-20060802T1650/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060802T1650-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060802T1808/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060802T1808-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060802T1650/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060802T1650-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060802T1808/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060802T1808-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060802T1650/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060802T1650-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060802T1808/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060802T1808-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060802T1650/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060802T1650-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060802T1808/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060802T1808-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060802T1650/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060802T1650-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060802T1808/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060802T1808-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060802T1650/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060802T1650-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060802T1808/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060802T1808-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060802T1650/localedata/SUPPORTED	26 May 2006 17:02:50 -0000	1.94
-+++ glibc-20060802T1650-fedora/localedata/SUPPORTED	31 May 2006 15:10:34 -0000	1.71.2.11
+--- glibc-20060802T1808/localedata/SUPPORTED	26 May 2006 17:02:50 -0000	1.94
++++ glibc-20060802T1808-fedora/localedata/SUPPORTED	31 May 2006 15:10:34 -0000	1.71.2.11
 @@ -76,6 +76,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060802T1650/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060802T1650-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060802T1808/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060802T1808-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060802T1650/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
-+++ glibc-20060802T1650-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
+--- glibc-20060802T1808/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
++++ glibc-20060802T1808-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20060802T1650/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1650-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060802T1808/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1808-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -950,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060802T1650/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060802T1650-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060802T1808/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060802T1808-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -979,8 +979,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060802T1650/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060802T1650-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060802T1808/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060802T1808-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1056,8 +1056,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060802T1650/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060802T1650-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060802T1808/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060802T1808-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -1113,16 +1113,16 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060802T1650/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060802T1650-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060802T1808/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060802T1808-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060802T1650/nptl/ChangeLog	1 Aug 2006 07:09:14 -0000	1.904
-+++ glibc-20060802T1650-fedora/nptl/ChangeLog	2 Aug 2006 16:57:41 -0000	1.706.2.94
+--- glibc-20060802T1808/nptl/ChangeLog	1 Aug 2006 07:09:14 -0000	1.904
++++ glibc-20060802T1808-fedora/nptl/ChangeLog	2 Aug 2006 16:57:41 -0000	1.706.2.94
 @@ -952,6 +952,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1163,8 +1163,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060802T1650/nptl/Makefile	1 Aug 2006 06:05:02 -0000	1.183
-+++ glibc-20060802T1650-fedora/nptl/Makefile	2 Aug 2006 16:57:41 -0000	1.157.2.23
+--- glibc-20060802T1808/nptl/Makefile	1 Aug 2006 06:05:02 -0000	1.183
++++ glibc-20060802T1808-fedora/nptl/Makefile	2 Aug 2006 16:57:41 -0000	1.157.2.23
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1187,8 +1187,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060802T1650/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060802T1650-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060802T1808/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060802T1808-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1213,8 +1213,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1222,8 +1222,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
-+++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
+--- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
++++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
 @@ -68,6 +68,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1559,8 +1559,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@@ -1706,8 +1706,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
 @@ -44,9 +44,16 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -1808,8 +1808,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1951,8 +1951,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
-+++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
+--- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
++++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
 @@ -49,6 +49,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2340,8 +2340,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060802T1650/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060802T1650-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
 @@ -46,8 +46,13 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -2436,8 +2436,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060802T1650/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060802T1650-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060802T1808/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060802T1808-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2460,8 +2460,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060802T1650/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060802T1650-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060802T1808/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060802T1808-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2480,8 +2480,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060802T1650/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060802T1650-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060802T1808/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060802T1808-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2493,8 +2493,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060802T1650/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060802T1650-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060802T1808/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060802T1808-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -2535,8 +2535,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060802T1650/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
-+++ glibc-20060802T1650-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
+--- glibc-20060802T1808/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
++++ glibc-20060802T1808-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2570,8 +2570,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060802T1650/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1650-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060802T1808/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1808-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -2588,8 +2588,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060802T1650/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060802T1650-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060802T1808/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060802T1808-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -2605,8 +2605,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060802T1650/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060802T1650-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060802T1808/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060802T1808-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2620,8 +2620,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060802T1650/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060802T1650-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060802T1808/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060802T1808-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -2633,8 +2633,8 @@
  endif
  endif
  
---- glibc-20060802T1650/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060802T1650-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060802T1808/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060802T1808-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -2986,8 +2986,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060802T1650/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1650-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060802T1808/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1808-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3073,8 +3073,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060802T1650/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060802T1650-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060802T1808/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060802T1808-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
 @@ -41,7 +41,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3089,8 +3089,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060802T1650/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
-+++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+--- glibc-20060802T1808/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20060802T1808-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
 @@ -18,11 +18,14 @@
     02111-1307 USA.  */
  
@@ -3138,8 +3138,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060802T1650/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060802T1808/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060802T1808-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;
@@ -3182,8 +3182,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060802T1650/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060802T1808/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060802T1808-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"
@@ -3193,8 +3193,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060802T1650/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060802T1808/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060802T1808-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;
@@ -3240,8 +3240,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060802T1650/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060802T1808/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1808-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.
@@ -3302,8 +3302,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060802T1650/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060802T1808/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060802T1808-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)
@@ -3336,24 +3336,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060802T1650/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060802T1808/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1808-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-20060802T1650/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060802T1808/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060802T1808-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-20060802T1650/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060802T1650-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060802T1808/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060802T1808-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.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- glibc.spec	2 Aug 2006 17:11:18 -0000	1.252
+++ glibc.spec	2 Aug 2006 18:29:53 -0000	1.253
@@ -1,9 +1,9 @@
-%define glibcdate 20060802T1650
+%define glibcdate 20060802T1808
 %define glibcname glibc
-%define glibcsrcdir glibc-20060802T1650
+%define glibcsrcdir glibc-20060802T1808
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 16
+%define glibcrelease 17
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -792,6 +792,9 @@
 %ifarch i686
 BuildFlags="-march=i686 -mtune=pentium4 -DUSE_CFA_VAL_EXPRESSION"
 %endif
+%ifarch i386
+BuildFlags="$BuildFlags -mno-tls-direct-seg-refs"
+%endif
 %ifarch x86_64
 BuildFlags="-DUSE_CFA_VAL_EXPRESSION"
 %endif
@@ -1032,6 +1035,8 @@
   cp -a $i $i.tmp
   sed -e 's~=/%{_lib}/libpcprofile.so~=%{_prefix}/%{_lib}/libpcprofile.so~' \
       -e 's~=/%{_lib}/libmemusage.so~=%{_prefix}/%{_lib}/libmemusage.so~' \
+      -e 's~=/\$LIB/libpcprofile.so~=%{_prefix}/$LIB/libpcprofile.so~' \
+      -e 's~=/\$LIB/libmemusage.so~=%{_prefix}/$LIB/libmemusage.so~' \
     $i.tmp > $i
   chmod 755 $i; rm -f $i.tmp
 done
@@ -1438,6 +1443,11 @@
 %endif
 
 %changelog
+* Wed Aug  2 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-17
+- typo fix for the dladdr patch
+- build i?86 glibc with -mno-tls-direct-seg-refs (#200469)
+- fix memusage and xtrace scripts (#200736)
+
 * Wed Aug  2 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-16
 - fix dladdr on binaries/libraries with only DT_GNU_HASH and no
   DT_HASH (#200635)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- sources	2 Aug 2006 17:11:18 -0000	1.185
+++ sources	2 Aug 2006 18:29:53 -0000	1.186
@@ -1,2 +1,2 @@
-87aac24ea4854507282b8283eaec8606  glibc-20060802T1650.tar.bz2
-45d7a84cf4197cefb33fe03f3005e99b  glibc-fedora-20060802T1650.tar.bz2
+7a1c70538c72b4ccb8b7f4e5249136bd  glibc-20060802T1808.tar.bz2
+c547953e0be4a94b3d185bf592c8350b  glibc-fedora-20060802T1808.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 18:32:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 14:32:44 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.314, 1.315 anaconda.spec, 1.440,
	1.441 sources, 1.437, 1.438
Message-ID: <200608021832.k72IWikg007512@cvs.devel.redhat.com>

Author: clumens

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- .cvsignore	1 Aug 2006 22:26:19 -0000	1.314
+++ .cvsignore	2 Aug 2006 18:32:41 -0000	1.315
@@ -1 +1 @@
-anaconda-11.1.0.75.tar.bz2
+anaconda-11.1.0.76.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- anaconda.spec	1 Aug 2006 22:26:19 -0000	1.440
+++ anaconda.spec	2 Aug 2006 18:32:41 -0000	1.441
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.75
+Version: 11.1.0.76
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Aug 02 2006 Chris Lumens <clumens at redhat.com> 11.1.0.76-1
+- Don't raise an exception when someone tries to delete empty space (pjones).
+- Fix X ks writing traceback (#201047).
+- Add file to describe initrd to fir LPAR installs (katzj, #197773).
+- Add libXau for s390 (katzj, #200985).
+- Sleep for disks to settle (katzj, #200589).
+
 * Tue Aug  1 2006 Peter Jones <pjones at redhat.com> - 11.1.0.75-1
 - Fix iSCSI and MultiPath coexistance
 - Don't use mygethostbyname on ipv6 yet (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- sources	1 Aug 2006 22:26:20 -0000	1.437
+++ sources	2 Aug 2006 18:32:41 -0000	1.438
@@ -1 +1 @@
-c0ed341f38d65d75cfb90cc21b3c0683  anaconda-11.1.0.75.tar.bz2
+5ae41cc544159c11427b289b939128f6  anaconda-11.1.0.76.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 18:37:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 14:37:29 -0400
Subject: rpms/gucharmap/devel .cvsignore, 1.2, 1.3 gucharmap.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200608021837.k72IbT83008697@cvs.devel.redhat.com>

Author: besfahbo

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

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
Update to 1.7.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Apr 2006 15:25:09 -0000	1.2
+++ .cvsignore	2 Aug 2006 18:37:26 -0000	1.3
@@ -1 +1 @@
-gucharmap-1.6.0.tar.bz2
+gucharmap-1.7.0.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/dist/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gucharmap.spec	12 Jul 2006 06:18:52 -0000	1.5
+++ gucharmap.spec	2 Aug 2006 18:37:26 -0000	1.6
@@ -3,14 +3,14 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        1.6.0
-Release:        8.1
+Version:        1.7.0
+Release:        1
 Summary:        Unicode character picker and font browser
 
 Group:          Applications/System
 License:        GPL
 URL:            http://live.gnome.org/Gucharmap
-Source0:        http://ftp.gnome.org/pub/gnome/sources/gucharmap/1.6/gucharmap-1.6.0.tar.bz2
+Source:         http://ftp.gnome.org/pub/gnome/sources/gucharmap/1.7/gucharmap-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gnome-doc-utils >= 0.3.2
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Wed Aug 02 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.7.0-1
+- Update to 1.7.0
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gucharmap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Apr 2006 15:25:09 -0000	1.2
+++ sources	2 Aug 2006 18:37:26 -0000	1.3
@@ -1 +1 @@
-8af03f350c988d1565922b10776bc725  gucharmap-1.6.0.tar.bz2
+1c83ffe6044acc6f03e0d851d409c200  gucharmap-1.7.0.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 18:43:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 14:43:36 -0400
Subject: rpms/fedora-release-notes/devel fedora-release-notes.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200608021843.k72IhaXN010667@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release-notes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10626/devel

Modified Files:
	fedora-release-notes.spec sources 
Log Message:
auto-import fedora-release-notes-5.91-6 on branch devel from fedora-release-notes-5.91-6.src.rpm


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-release-notes.spec	2 Aug 2006 18:17:55 -0000	1.4
+++ fedora-release-notes.spec	2 Aug 2006 18:43:33 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		fedora-release-notes
 Version:	5.91
-Release:	5
+Release:	6
 Summary:	Release Notes for Fedora Core %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Aug  2 2006 Jesse Keating <jkeating at redhat.com> - 5.91-6
+- bump
+
 * Wed Aug  2 2006 Paul W. Frields <stickster at gmail.com> - 5.91-5
 - Add README-Accessibility (moved from fedora-release)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Aug 2006 18:03:02 -0000	1.4
+++ sources	2 Aug 2006 18:43:33 -0000	1.5
@@ -1 +1 @@
-fe5148b10dc87555d8dda074460c127c  fedora-release-notes-5.91.tar.gz
+08d21825690e79103c634986fa836ac0  fedora-release-notes-5.91.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug  2 18:44:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 14:44:07 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.215,
	1.216 policycoreutils.spec, 1.297, 1.298
Message-ID: <200608021844.k72Ii7n9010907@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10868

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-2
- Stop restorecond init script when selinux is not enabled


policycoreutils-rhat.patch:
 newrole/newrole.c            |    8 +
 po/fr.po                     |   54 ++++++---
 po/sv.po                     |  252 +++++++++++++++++++++++++++----------------
 po/ta.po                     |   34 ++---
 restorecond/restorecond.c    |    7 +
 restorecond/restorecond.init |    2 
 scripts/fixfiles             |    2 
 scripts/genhomedircon        |    2 
 semodule_deps/Makefile       |    1 
 9 files changed, 231 insertions(+), 131 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- policycoreutils-rhat.patch	2 Aug 2006 18:28:08 -0000	1.215
+++ policycoreutils-rhat.patch	2 Aug 2006 18:44:04 -0000	1.216
@@ -1033,3 +1033,26 @@
      check) restore -n -v ;;
      relabel) relabel;;
      *)
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.22/scripts/genhomedircon
+--- nsapolicycoreutils/scripts/genhomedircon	2006-08-01 09:47:23.000000000 -0400
++++ policycoreutils-1.30.22/scripts/genhomedircon	2006-08-02 14:43:21.000000000 -0400
+@@ -346,7 +346,7 @@
+ 
+ if os.getuid() > 0 or os.geteuid() > 0:
+ 	print _("You must be root to run %s.") % sys.argv[0]
+-	sys.exit(0)
++	sys.exit(1)
+ 
+ #
+ # This script will generate home dir file context
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_deps/Makefile policycoreutils-1.30.22/semodule_deps/Makefile
+--- nsapolicycoreutils/semodule_deps/Makefile	2006-08-01 09:47:23.000000000 -0400
++++ policycoreutils-1.30.22/semodule_deps/Makefile	2006-08-02 14:33:29.000000000 -0400
+@@ -17,6 +17,7 @@
+ 	-mkdir -p $(BINDIR)
+ 	install -m 755 semodule_deps $(BINDIR)
+ 	test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8
++	install -m 644 semodule_deps.8 $(MANDIR)/man8/
+ 
+ relabel:
+ 


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- policycoreutils.spec	2 Aug 2006 18:28:09 -0000	1.297
+++ policycoreutils.spec	2 Aug 2006 18:44:04 -0000	1.298
@@ -76,6 +76,7 @@
 %{_bindir}/audit2allow
 %{_bindir}/chcat
 %{_bindir}/secon
+%{_bindir}/semodule_deps
 %{_bindir}/semodule_expand
 %{_bindir}/semodule_link
 %{_bindir}/semodule_package
@@ -85,6 +86,7 @@
 %{_mandir}/man8/sestatus.8.gz
 %{_mandir}/man8/semanage.8.gz
 %{_mandir}/man8/semodule.8.gz
+%{_mandir}/man8/semodule_deps.8.gz
 %{_mandir}/man8/semodule_link.8.gz
 %{_mandir}/man8/semodule_package.8.gz
 %{_mandir}/man8/semodule_expand.8.gz



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:05:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:05:23 -0400
Subject: rpms/gnome-terminal/devel .cvsignore, 1.28, 1.29 gnome-terminal.spec,
	1.63, 1.64 sources, 1.29, 1.30
Message-ID: <200608021905.k72J5NZT007520@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	12 Jul 2006 18:59:50 -0000	1.28
+++ .cvsignore	2 Aug 2006 19:05:21 -0000	1.29
@@ -1 +1 @@
-gnome-terminal-2.15.2.tar.bz2
+gnome-terminal-2.15.4.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gnome-terminal.spec	12 Jul 2006 18:59:50 -0000	1.63
+++ gnome-terminal.spec	2 Aug 2006 19:05:21 -0000	1.64
@@ -12,8 +12,8 @@
 
 Summary: GNOME Terminal
 Name: gnome-terminal
-Version: 2.15.2
-Release: 1
+Version: 2.15.4
+Release: 1%{?dist}
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Patch0: gnome-terminal-2.12.0-inputmethod.patch
@@ -116,6 +116,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1.fc6
+- Update to 2.15.4
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	12 Jul 2006 18:59:50 -0000	1.29
+++ sources	2 Aug 2006 19:05:21 -0000	1.30
@@ -1 +1 @@
-d8ee2e59283ab397b404de20a49055a5  gnome-terminal-2.15.2.tar.bz2
+847ba835f312064c350435d99427ec17  gnome-terminal-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:14:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:14:26 -0400
Subject: rpms/gtk2-engines/devel .cvsignore, 1.19, 1.20 gtk2-engines.spec,
	1.43, 1.44 sources, 1.20, 1.21
Message-ID: <200608021914.k72JEQoS019590@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gtk2-engines.spec sources 
Log Message:
2.7.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Jul 2006 05:56:33 -0000	1.19
+++ .cvsignore	2 Aug 2006 19:14:23 -0000	1.20
@@ -1 +1 @@
-gtk-engines-2.7.5.tar.bz2
+gtk-engines-2.7.6.tar.bz2


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gtk2-engines.spec	12 Jul 2006 06:16:01 -0000	1.43
+++ gtk2-engines.spec	2 Aug 2006 19:14:23 -0000	1.44
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.7.5
-Release:	1.1
+Version:        2.7.6
+Release:	1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 Source:         gtk-engines-%{version}.tar.bz2
@@ -60,6 +60,9 @@
 %{_datadir}/themes
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.6-1.fc6
+- Update to 2.7.6
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.5-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	12 Jul 2006 05:56:33 -0000	1.20
+++ sources	2 Aug 2006 19:14:23 -0000	1.21
@@ -1 +1 @@
-0736d5acf468a9d25148e683131d8dd5  gtk-engines-2.7.5.tar.bz2
+82f069f0fe3dc343df112a9a0e6098ae  gtk-engines-2.7.6.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:20:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:20:19 -0400
Subject: rpms/openoffice.org/devel workspace.kendy10.patch, NONE,
	1.1 openoffice.org.spec, 1.811,
	1.812 openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch,
	1.1, NONE
Message-ID: <200608021920.k72JKJIJ004031@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.kendy10.patch 
Removed Files:
	openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch 
Log Message:
recently used into a workspace now

workspace.kendy10.patch:
 recently_used_file_handler.cxx |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

--- NEW FILE workspace.kendy10.patch ---
Index: shell/source/unix/sysshell/recently_used_file_handler.cxx
===================================================================
RCS file: /cvs/gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx,v
retrieving revision 1.5
diff -u -p -u -w -r1.5 recently_used_file_handler.cxx
--- openoffice.org.orig/shell/source/unix/sysshell/recently_used_file_handler.cxx	7 Sep 2005 19:56:25 -0000	1.5
+++ openoffice.org/shell/source/unix/sysshell/recently_used_file_handler.cxx	16 Jun 2006 10:40:51 -0000
@@ -49,6 +49,10 @@
 #include "rtl/string.hxx"
 #endif
 
+#ifndef _RTL_STRBUF_HXX_
+#include "rtl/strbuf.hxx"
+#endif
+
 #include "osl/thread.h"
 
 #ifndef INCLUDED_RECENTLY_USED_FILE_HXX
@@ -212,10 +216,33 @@ namespace /* private */ {
             write_xml_end_tag(TAG_RECENT_ITEM, file);            
         }
         
+		static rtl::OString escape_content(const string_t &text)
+		{
+			rtl::OStringBuffer aBuf;
+			for (sal_Int32 i = 0; i < text.length(); i++)
+			{
+#               define MAP(a,b) case a: aBuf.append(b); break
+				switch (text[i])
+				{
+					MAP ('&',  "&amp;");
+					MAP ('<',  "&lt;");
+					MAP ('>',  "&gt;");
+					MAP ('\'', "&apos;");
+					MAP ('"',  "&quot;");
+				default:
+					aBuf.append(text[i]);
+					break;
+				}
+#               undef MAP
+			}
+			return aBuf.makeStringAndClear();
+		}
+        
         void write_xml_tag(const string_t& name, const string_t& value, const recently_used_file& file) const
         {            
             write_xml_start_tag(name, file);
-            file.write(value.c_str(), value.length());
+			rtl::OString escaped = escape_content (value);
+            file.write(escaped.getStr(), escaped.getLength());
             write_xml_end_tag(name, file);
         }
         
@@ -541,7 +568,7 @@ const rtl::OUString DEFAULT_CONTEXT = rt
 
 // We need to re-encode file urls because osl_getFileURLFromSystemPath converts
 // to UTF-8 before encoding non ascii characters, which is not what other apps expect.
-rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
+static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
 {
 	rtl::OUString extUrl;
 		
@@ -572,7 +599,7 @@ extern "C" void add_to_recently_used_fil
         rtl::OUString externalUrl = translateToExternalUrl(file_url);
 	
         read_recently_used_items(ruf, item_list);	
-        recently_used_item_list_add(item_list, (externalUrl.getLength()) ? externalUrl : file_url, mime_type);
+        recently_used_item_list_add(item_list, externalUrl.getLength() ? externalUrl : file_url, mime_type);
         write_recently_used_items(ruf, item_list);                                
     }
     catch(const char* ex)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.811
retrieving revision 1.812
diff -u -r1.811 -r1.812
--- openoffice.org.spec	2 Aug 2006 11:09:06 -0000	1.811
+++ openoffice.org.spec	2 Aug 2006 19:20:17 -0000	1.812
@@ -107,7 +107,7 @@
 Patch41: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
 Patch42: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
 Patch43: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch44: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
+Patch44: workspace.kendy10.patch
 Patch45: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch46: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch47: ooobuild.VBAObjects.patch
@@ -156,7 +156,6 @@
 %package core
 Summary: core modules for %{name}
 Group: Applications/Productivity
-Requires: dejavu-lgc-fonts
 Requires: urw-fonts
 %ifarch %{ppc}
 # Ensure we have 32-bit theme libs in 64-bit multilib environments.
@@ -401,6 +400,7 @@
 Summary: Greek language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: dejavu-lgc-fonts
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-el
 Obsoletes: openoffice.org2-langpack-el_GR
@@ -682,6 +682,7 @@
 Summary: Russian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: dejavu-lgc-fonts
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ru
 
@@ -906,7 +907,7 @@
 %patch41 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
 %patch42 -p1 -b .ooo66851.i18npool.x86_64.patch
 %patch43 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch44 -p1 -b .ooo66510.shell.recentlyused.patch
+%patch44 -p1 -b .workspace.kendy10.patch
 %patch45 -p1 -b .rh187919.gtkunderkde.patch
 %patch46 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch47 -p0 -b .ooobuild.VBAObjects.patch
@@ -3515,7 +3516,8 @@
 	+ openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext, a bizarre, but
 	perfectly functional input method surrounding text implementation
 	based on the ATK bridge
-- rh#200805# replace ooo58663 missing glyph patch with workspace.icuupgrade.patch
+- rh#200805# replace ooo58663 missing glyph patch -> workspace.icuupgrade
+- ooo#66510# recentlyused fix -> workspace.kendy10
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch


--- openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:22:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:22:50 -0400
Subject: rpms/openoffice.org/devel workspace.fwk40.patch, NONE,
	1.1 openoffice.org.spec, 1.812,
	1.813 openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch,
	1.2, NONE
Message-ID: <200608021922.k72JMoV5005036@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.fwk40.patch 
Removed Files:
	openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch 
Log Message:
merge to upstream workspace

workspace.fwk40.patch:
 embeddedobj/source/msole/olepersist.cxx |    9 ++++++++-
 sfx2/source/doc/docfile.cxx             |   20 ++++++++++++--------
 source/msole/olepersist.cxx             |    0 
 3 files changed, 20 insertions(+), 9 deletions(-)

--- NEW FILE workspace.fwk40.patch ---
Index: source/msole/olepersist.cxx
===================================================================
RCS file: /cvs/framework/embeddedobj/source/msole/olepersist.cxx,v
retrieving revision 1.28
diff -u -r1.28 olepersist.cxx
--- openoffice.org.orig/embeddedobj/source/msole/olepersist.cxx	26 Apr 2006 14:23:04 -0000	1.28
+++ openoffice.org/embeddedobj/source/msole/olepersist.cxx	6 Jun 2006 08:34:33 -0000
@@ -788,11 +791,18 @@
 		uno::Sequence< uno::Any > aArgs( 2 );
 		aArgs[0] <<= xStream;
 		aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
-		uno::Reference< container::XNameContainer > xNameContainer(
+		uno::Reference< container::XNameContainer > xNameContainer;
+		try
+		{
+			xNameContainer = uno::Reference< container::XNameContainer >(
 				m_xFactory->createInstanceWithArguments(
 						::rtl::OUString::createFromAscii( "com.sun.star.embed.OLESimpleStorage" ),
 						aArgs ),
 				uno::UNO_QUERY );
+		}
+		catch( uno::Exception& )
+		{}
+
 
 		if ( xNameContainer.is() )
 		{
Index: source/doc/docfile.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/docfile.cxx,v
retrieving revision 1.179
retrieving revision 1.179.30.1
diff -u -r1.179 -r1.179.30.1
--- openoffice.org.orig/sfx2/source/doc/docfile.cxx	2 May 2006 16:41:30 -0000	1.179
+++ openoffice.org/sfx2/source/doc/docfile.cxx	8 Jun 2006 11:29:48 -0000	1.179.30.1
@@ -2640,15 +2640,19 @@
 	// The probably exsisting SvStream wrappers should be closed first
     CloseStreams_Impl();
 
-    try
-    {
-        if ( xInToClose.is() )
-            xInToClose->closeInput();
-        if ( xOutToClose.is() )
-            xOutToClose->closeOutput();
-    }
-    catch ( uno::Exception& )
+    // in case of salvage mode the storage is based on the streams
+    if ( !pImp->m_bSalvageMode )
     {
+        try
+        {
+            if ( xInToClose.is() )
+                xInToClose->closeInput();
+            if ( xOutToClose.is() )
+                xOutToClose->closeOutput();
+        }
+        catch ( uno::Exception& )
+        {
+        }
     }
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.812
retrieving revision 1.813
diff -u -r1.812 -r1.813
--- openoffice.org.spec	2 Aug 2006 19:20:17 -0000	1.812
+++ openoffice.org.spec	2 Aug 2006 19:22:48 -0000	1.813
@@ -101,7 +101,7 @@
 Patch35: openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch
 Patch36: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
 Patch37: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
-Patch38: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
+Patch38: workspace.fwk40.patch
 Patch39: openoffice.org-2.0.3.ooo65519.printing.samba.patch
 Patch40: workspace.sixtyfour06.patch
 Patch41: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
@@ -901,7 +901,7 @@
 %patch35 -p1 -b .ooo65767.vcl.removemenukey.patch
 %patch36 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
 %patch37 -p1 -b .rh192588.officecfg.defaultcairooff.patch
-%patch38 -p1 -b .ooo66067.embeddedobj.crash.patch
+%patch38 -p1 -b .workspace.fwk40.patch
 %patch39 -p1 -b .ooo65519.printing.samba.patch
 %patch40 -p1 -b .workspace.sixtyfour06.patch
 %patch41 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
@@ -3517,7 +3517,8 @@
 	perfectly functional input method surrounding text implementation
 	based on the ATK bridge
 - rh#200805# replace ooo58663 missing glyph patch -> workspace.icuupgrade
-- ooo#66510# recentlyused fix -> workspace.kendy10
+- replace ooo#66510# recentlyused fix -> workspace.kendy10
+- replace ooo#66067# embeddedobj crash -> workspace.fwk40
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch


--- openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:24:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:24:37 -0400
Subject: rpms/gtk-doc/devel .cvsignore, 1.10, 1.11 gtk-doc.spec, 1.22,
	1.23 sources, 1.10, 1.11
Message-ID: <200608021924.k72JObbO005750@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk-doc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5517

Modified Files:
	.cvsignore gtk-doc.spec sources 
Log Message:
1.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Apr 2006 13:49:20 -0000	1.10
+++ .cvsignore	2 Aug 2006 19:24:35 -0000	1.11
@@ -1,4 +1 @@
-gtk-doc-1.2.tar.bz2
-gtk-doc-1.3.tar.bz2
-gtk-doc-1.4.tar.bz2
-gtk-doc-1.6.tar.bz2
+gtk-doc-1.7.tar.bz2


Index: gtk-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gtk-doc.spec	12 Jul 2006 06:16:15 -0000	1.22
+++ gtk-doc.spec	2 Aug 2006 19:24:35 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
-Version: 1.6
-Release: 3.1
+Version: 1.7
+Release: 1%{?dist}
 License: LGPL
 Group: Development/Tools
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.6/gtk-doc-1.6.tar.bz2 
@@ -66,6 +66,9 @@
 %{_datadir}/omf/gtk-doc/
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1.7-1.fc6
+- Update to 1.7
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.6-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Apr 2006 13:49:20 -0000	1.10
+++ sources	2 Aug 2006 19:24:35 -0000	1.11
@@ -1 +1 @@
-09c7a89efff2e0bbaba02a12bff58dfd  gtk-doc-1.6.tar.bz2
+2543a3f5a7b5347fb135855ca55adea1  gtk-doc-1.7.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:25:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:25:06 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-add-makedumpfile1.patch,
	NONE, 1.1 kexec-tools-1.101-add-makedumpfile2.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 kexec-tools.spec, 1.37, 1.38 sources,
	1.2, 1.3
Message-ID: <200608021925.k72JP6dP005958@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5920

Modified Files:
	.cvsignore kexec-tools.spec sources 
Added Files:
	kexec-tools-1.101-add-makedumpfile1.patch 
	kexec-tools-1.101-add-makedumpfile2.patch 
Log Message:
adding build sources for makedumpfile

kexec-tools-1.101-add-makedumpfile1.patch:
 config.h             |  104 +
 dwarf.h              |  924 +++++++++++++
 dwarf_abbrev.h       |   45 
 dwarf_alloc.c        | 1223 ++++++++++++++++++
 dwarf_alloc.h        |  167 ++
 dwarf_arange.h       |   63 
 dwarf_base_types.h   |  109 +
 dwarf_config.h       |   80 +
 dwarf_die_deliv.c    |  798 +++++++++++
 dwarf_die_deliv.h    |   56 
 dwarf_error.c        |  385 +++++
 dwarf_error.h        |   43 
 dwarf_form.c         |  708 ++++++++++
 dwarf_frame.h        |  398 +++++
 dwarf_funcs.h        |   42 
 dwarf_global.h       |  124 +
 dwarf_incl.h         |   57 
 dwarf_init_finish.c  |  815 ++++++++++++
 dwarf_leb.c          |  149 ++
 dwarf_line.c         | 1808 +++++++++++++++++++++++++++
 dwarf_line.h         |  320 ++++
 dwarf_loc.c          |  947 ++++++++++++++
 dwarf_loc.h          |   46 
 dwarf_macro.h        |   44 
 dwarf_names.c        | 3412 +++++++++++++++++++++++++++++++++++++++++++++++++++
 dwarf_names.h        |   49 
 dwarf_opaque.h       |  296 ++++
 dwarf_query.c        |  610 +++++++++
 dwarf_types.h        |   41 
 dwarf_util.c         |  385 +++++
 dwarf_util.h         |  270 ++++
 dwarf_vars.h         |   41 
 dwarf_weaks.h        |   41 
 dwarfdump.c          |  710 ++++++++++
 dwconf.h             |   89 +
 esb.c                |  210 +++
 esb.h                |   83 +
 globals.h            |  209 +++
 libdwarf.h           | 1973 +++++++++++++++++++++++++++++
 libdwarfdefs.h       |   91 +
 makename.h           |   53 
 malloc_check.c       |  335 +++++
 malloc_check.h       |   62 
 print_die.c          | 1069 +++++++++++++++
 print_frames.h       |   49 
 pro_alloc.h          |   40 
 pro_arange.h         |   62 
 pro_die.h            |   68 +
 pro_encode_nm.h      |   48 
 pro_error.h          |   52 
 pro_expr.h           |   45 
 pro_frame.h          |  126 +
 pro_incl.h           |   76 +
 pro_line.h           |  111 +
 pro_macinfo.h        |   40 
 pro_opaque.h         |  493 +++++++
 pro_reloc.h          |   47 
 pro_reloc_stream.h   |   63 
 pro_reloc_symbolic.h |   55 
 pro_section.h        |  112 +
 pro_types.h          |   44 
 pro_util.h           |  124 +
 62 files changed, 21139 insertions(+)

--- NEW FILE kexec-tools-1.101-add-makedumpfile1.patch ---
--- /dev/null	2006-07-27 05:57:56.962333472 -0400
+++ kexec-tools-1.101/makedumpfile/dwarfinfo/dwarf_names.h	2006-08-02 14:05:24.000000000 -0400
@@ -0,0 +1,49 @@
+/* automatically generated routines */
+extern string get_TAG_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_children_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_FORM_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_AT_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_OP_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_ATE_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_DS_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_END_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_ACCESS_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_VIS_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_VIRTUALITY_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_LANG_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_ID_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_CC_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_INL_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_ORD_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_DSC_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_LNS_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_LNE_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_MACINFO_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_EH_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_FRAME_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_CHILDREN_name (Dwarf_Debug dbg, Dwarf_Half val);
+
+extern string get_ADDR_name (Dwarf_Debug dbg, Dwarf_Half val);
+
--- /dev/null	2006-07-27 05:57:56.962333472 -0400
+++ kexec-tools-1.101/makedumpfile/dwarfinfo/malloc_check.h	2006-08-02 14:05:24.000000000 -0400
@@ -0,0 +1,62 @@
+/*
+
+  Copyright (C) 2005 Silicon Graphics, Inc.  All Rights Reserved.
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2.1 of the GNU Lesser General Public License
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it would be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+  Further, this software is distributed without any warranty that it is
+  free of the rightful claim of any third person regarding infringement
+  or the like.  Any license provided herein, whether implied or
+  otherwise, applies only to this software file.  Patent licenses, if
+  any, provided herein do not apply to combinations of this program with
+  other software, or any other product whatsoever.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this program; if not, write the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307,
+  USA.
+
+  Contact information:  Silicon Graphics, Inc., 1500 Crittenden Lane,
+  Mountain View, CA 94043, or:
+
+  http://www.sgi.com
+
+  For further information regarding this notice, see:
+
+  http://oss.sgi.com/projects/GenInfo/NoticeExplan
+
+*/
+
+
+/* malloc_check.h */
+
+/* A simple libdwarf-aware malloc checker. 
+   define WANT_LIBBDWARF_MALLOC_CHECK and rebuild libdwarf
+   do make a checking-for-alloc-mistakes libdwarf.
+   NOT  recommended for production use.
+
+   When defined, also add malloc_check.c to the list of
+   files in Makefile.
+*/
+
+#undef WANT_LIBBDWARF_MALLOC_CHECK 
+/*#define WANT_LIBBDWARF_MALLOC_CHECK  1 */
+
+#ifdef WANT_LIBBDWARF_MALLOC_CHECK
+
+void dwarf_malloc_check_alloc_data(void * addr,unsigned char code);
+void dwarf_malloc_check_dealloc_data(void * addr,unsigned char code);
+void dwarf_malloc_check_complete(char *wheremsg); /* called at exit of app */
+
+#else /* !WANT_LIBBDWARF_MALLOC_CHECK */
+
+#define dwarf_malloc_check_alloc_data(a,b)  /* nothing */
+#define dwarf_malloc_check_dealloc_data(a,b)  /* nothing */
+#define dwarf_malloc_check_complete(a) /* nothing */
+
+#endif /* WANT_LIBBDWARF_MALLOC_CHECK */
--- /dev/null	2006-07-27 05:57:56.962333472 -0400
+++ kexec-tools-1.101/makedumpfile/dwarfinfo/pro_incl.h	2006-08-02 14:05:24.000000000 -0400
@@ -0,0 +1,76 @@
+/*
+
+  Copyright (C) 2000,2002,2004 Silicon Graphics, Inc.  All Rights Reserved.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2.1 of the GNU Lesser General Public License 
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it would be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+  Further, this software is distributed without any warranty that it is
+  free of the rightful claim of any third person regarding infringement 
+  or the like.  Any license provided herein, whether implied or 
+  otherwise, applies only to this software file.  Patent licenses, if
+  any, provided herein do not apply to combinations of this program with 
+  other software, or any other product whatsoever.  
+
+  You should have received a copy of the GNU Lesser General Public 
+  License along with this program; if not, write the Free Software 
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, 
+  USA.
+
+  Contact information:  Silicon Graphics, Inc., 1500 Crittenden Lane,
+  Mountain View, CA 94043, or:
+
+  http://www.sgi.com
+
+  For further information regarding this notice, see:
+
+  http://oss.sgi.com/projects/GenInfo/NoticeExplan
+
+*/
+
+
+#ifdef HAVE_ELF_H
+#include <elf.h>
+#elif defined(HAVE_LIBELF_H) 
+/* On one platform without elf.h this gets Elf32_Rel 
+   type defined (a required type). */
+#include <libelf.h>
+#endif
+
+/* The target address is given: the place in the source integer
+   is to be determined.
+*/
+#ifdef WORDS_BIGENDIAN
+#define WRITE_UNALIGNED(dbg,dest,source, srclength,len_out) \
+    { \
+      dbg->de_copy_word(dest, \
+                        ((char *)source) +srclength-len_out,  \
+			len_out) ; \
+    }
+
+
+#else /* LITTLE ENDIAN */
+
+#define WRITE_UNALIGNED(dbg,dest,source, srclength,len_out) \
+    { \
+      dbg->de_copy_word( (dest) , \
+                        ((char *)source) ,  \
+			len_out) ; \
+    }
+#endif
+
+
+
+#include "libdwarf.h"
+
+#include "dwarf.h"
+#include "pro_opaque.h"
+#include "pro_error.h"
+#include "pro_util.h"
+#include "pro_encode_nm.h"
+#include "pro_alloc.h"
--- /dev/null	2006-07-27 05:57:56.962333472 -0400
+++ kexec-tools-1.101/makedumpfile/dwarfinfo/pro_reloc_symbolic.h	2006-08-02 14:05:24.000000000 -0400
@@ -0,0 +1,55 @@
[...20926 lines suppressed...]
+
+    li_offset is used by _dwarf_addr_finder() which is called
+    by rqs(1), an sgi utility for 'moving' shared libraries
+    as if the static linker (ld) had linked the shared library
+    at the newly-specified address.  Most libdwarf-using 
+    apps will ignore li_offset and _dwarf_addr_finder().
+    
+*/
+struct Dwarf_Line_s {
+    Dwarf_Addr li_address;	/* pc value of machine instr */
+    union addr_or_line_s {
+	struct li_inner_s {
+	    Dwarf_Sword li_file;	/* int identifying src file */
+	    /* li_file is a number 1-N, indexing into a conceptual
+	       source file table as described in dwarf2/3 spec line
+	       table doc. (see Dwarf_File_Entry lc_file_entries; and
+	       Dwarf_Sword lc_file_entry_count;) */
+
+	    Dwarf_Sword li_line;	/* source file line number. */
+	    Dwarf_Half li_column;	/* source file column number */
+	    Dwarf_Small li_isa;
+
+	    /* To save space, use bit flags. */
+	    /* indicate start of stmt */
+	    unsigned char li_is_stmt:1;
+
+	    /* indicate start basic block */
+	    unsigned char li_basic_block:1;
+
+	    /* first post sequence instr */
+	    unsigned char li_end_sequence:1;
+
+	    unsigned char li_prologue_end:1;
+	    unsigned char li_epilogue_begin:1;
+	} li_l_data;
+	Dwarf_Off li_offset;	/* for rqs */
+    } li_addr_line;
+    Dwarf_Line_Context li_context;	/* assoc Dwarf_Line_Context_s */
+};
+
+
+int _dwarf_line_address_offsets(Dwarf_Debug dbg,
+				Dwarf_Die die,
+				Dwarf_Addr ** addrs,
+				Dwarf_Off ** offs,
+				Dwarf_Unsigned * returncount,
+				Dwarf_Error * err);
+int _dwarf_internal_srclines(Dwarf_Die die,
+			     Dwarf_Line ** linebuf,
+			     Dwarf_Signed * count,
+			     Dwarf_Bool doaddrs,
+			     Dwarf_Bool dolines, Dwarf_Error * error);
+
+
+
+/* The LOP, WHAT_IS_OPCODE stuff is here so it can
+   be reused in 3 places.  Seemed hard to keep
+   the 3 places the same without an inline func or
+   a macro.
+
+   Handling the line section where the header and the
+   file being processed do not match (unusual, but
+   planned for in the  design of .debug_line)
+   is too tricky to recode this several times and keep
+   it right.
+
+   As it is the code starting up line-reading is duplicated
+   and that is just wrong to do. FIXME!
+*/
+#define LOP_EXTENDED 1
+#define LOP_DISCARD  2
+#define LOP_STANDARD 3
+#define LOP_SPECIAL  4
+
+#define WHAT_IS_OPCODE(type,opcode,base,opcode_length,line_ptr,highest_std) \
+        if( (opcode) < (base) ) {                          \
+           /* we know we must treat as a standard op       \
+                or a special case.                         \
+           */                                              \
+           if((opcode) == DW_EXTENDED_OPCODE) {            \
+                type = LOP_EXTENDED;                       \
+           } else  if( ((highest_std)+1) >=  (base)) {     \
+                /* == Standard case: compile of            \
+                   dwarf_line.c and object                 \
+                   have same standard op codes set.        \
+                                                           \
+                   >  Special case: compile of dwarf_line.c\
+                   has things in standard op codes list    \
+                   in dwarf.h header not                   \
+                   in the object: handle this as a standard\
+                   op code in switch below.                \
+                   The header special ops overlap the      \
+                   object standard ops.                    \
+                   The new standard op codes will not      \
+                   appear in the object.                   \
+                */                                         \
+                type = LOP_STANDARD;                       \
+           } else  {                                       \
+                /* These are standard opcodes in the object\
+                ** that were not defined  in the header    \
+                ** at the time dwarf_line.c                \
+                ** was compiled. Provides the ability of   \
+                ** out-of-date dwarf reader to read newer  \
+                ** line table data transparently.          \
+                */                                         \
+                type = LOP_DISCARD;                         \
+           }                                                \
+                                                            \
+        } else {                                            \
+	   /* Is  a special op code.                        \
+	   */                                               \
+           type =  LOP_SPECIAL;                             \
+        }
+
+/* The following is from  the dwarf definition of 'ubyte'
+   and is specifically  mentioned in section  6.2.5.1, page 54
+   of the Rev 2.0.0 dwarf specification.
+*/
+
+#define MAX_LINE_OP_CODE  255
+
+
+/* The following structs (Line_Table_File_Entry_s,Line_Table_Prefix_s)
+   and functions allow refactoring common code into a single
+   reader routine.
+*/
+/* There can be zero of more of these needed for 1 line prologue. */
+struct Line_Table_File_Entry_s {
+    Dwarf_Small *lte_filename;
+    Dwarf_Unsigned lte_directory_index;
+    Dwarf_Unsigned lte_last_modification_time;
+    Dwarf_Unsigned lte_length_of_file;
+};
+
+/* Data  picked up from the line table prologue for a single
+CU. */
+struct Line_Table_Prefix_s {
+
+    /* pf_total_length is the value of the length field for the line
+       table of this CU. So it does not count the length of itself (the 
+       length value) for consistency with the say lenghts recorded in
+       DWARF2/3. */
+    Dwarf_Unsigned pf_total_length;
+
+    /* Length of the initial length field itself. */
+    Dwarf_Half pf_length_field_length;
+
+    /* The version is 2 for DWARF2, 3 for DWARF3 */
+    Dwarf_Half pf_version;
+
+    Dwarf_Unsigned pf_prologue_length;
+    Dwarf_Small pf_minimum_instruction_length;
+
+    /* Start and end of this CU line area. pf_line_ptr_start +
+       pf_total_length + pf_length_field_length == pf_line_ptr_end.
+       Meaning pf_line_ptr_start is before the length info. */
+    Dwarf_Small *pf_line_ptr_start;
+    Dwarf_Small *pf_line_ptr_end;
+
+    /* Used to check that decoding of the line prologue is done right. */
+    Dwarf_Small *pf_line_prologue_start;
+
+    Dwarf_Small pf_default_is_stmt;
+    Dwarf_Sbyte pf_line_base;
+    Dwarf_Small pf_line_range;
+
+    /* Highest std opcode (+1).  */
+    Dwarf_Small pf_opcode_base;
+
+    /* pf_opcode_base -1 entries (each a count, normally the value of
+       each entry is 0 or 1). */
+    Dwarf_Small *pf_opcode_length_table;
+
+    Dwarf_Unsigned pf_include_directories_count;
+    /* Array of pointers to dir strings. pf_include_directories_count
+       entriesin the array. */
+    Dwarf_Small **pf_include_directories;
+
+    /* Count of entries in line_table_file_entries array. */
+    Dwarf_Unsigned pf_files_count;
+    struct Line_Table_File_Entry_s *pf_line_table_file_entries;
+
+    /* The number to treat as standard ops. This is a special
+       accomodation of gcc using the new standard opcodes but not
+       updating the version number. It's legal dwarf2, but much better
+       for the user to understand as dwarf3 when 'it looks ok'. */
+    Dwarf_Bool pf_std_op_count;
+
+};
+
+void dwarf_init_line_table_prefix(struct Line_Table_Prefix_s *pf);
+void dwarf_free_line_table_prefix(struct Line_Table_Prefix_s *pf);
+
+int
+  dwarf_read_line_table_prefix(Dwarf_Debug dbg,
+			       Dwarf_Small * data_start,
+			       Dwarf_Unsigned data_length,
+			       Dwarf_Small ** updated_data_start_out,
+			       struct Line_Table_Prefix_s *prefix_out,
+			       Dwarf_Error * err);

kexec-tools-1.101-add-makedumpfile2.patch:
 Makefile                      |   75 
 dwarfinfo/dwarf_alloc.c       |  170 --
 dwarfinfo/dwarf_alloc.h       |    7 
 dwarfinfo/dwarf_die_deliv.c   |    5 
 dwarfinfo/dwarf_error.c       |    7 
 dwarfinfo/dwarf_form.c        |   33 
 dwarfinfo/dwarf_incl.h        |   37 
 dwarfinfo/dwarf_init_finish.c |  324 ---
 dwarfinfo/dwarf_leb.c         |    5 
 dwarfinfo/dwarf_line.c        | 1277 ---------------
 dwarfinfo/dwarf_loc.c         |  158 -
 dwarfinfo/dwarf_names.c       | 3461 ++++++------------------------------------
 dwarfinfo/dwarf_query.c       |  331 ----
 dwarfinfo/dwarf_util.c        |    5 
 dwarfinfo/dwarfdump.c         |  567 +-----
 dwarfinfo/esb.c               |   78 
 dwarfinfo/globals.h           |   29 
 dwarfinfo/malloc_check.c      |   42 
 dwarfinfo/print_die.c         |  699 +++-----
 makedumpfile.c                |  502 +++---
 makedumpfile.h                |   30 
 21 files changed, 1427 insertions(+), 6415 deletions(-)

--- NEW FILE kexec-tools-1.101-add-makedumpfile2.patch ---
--- kexec-tools-1.101/makedumpfile/Makefile.orig	2006-04-25 10:33:07.000000000 -0400
+++ kexec-tools-1.101/makedumpfile/Makefile	2006-08-02 14:13:17.000000000 -0400
@@ -1,11 +1,80 @@
 CC	= gcc
-CFLAGS	= -g -Wall `gtk-config --cflags` `gtk-config --libs` -D_FILE_OFFSET_BITS=64
+CFLAGS	= -g -O2 -Wall
+CFLAGS2	= -g -O2 -Wall `gtk-config --cflags` `gtk-config --libs` -D_FILE_OFFSET_BITS=64
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
 			       -e s/arm.*/arm/ -e s/sa110/arm/ \
 			       -e s/s390x/s390/ -e s/parisc64/parisc/ \
 			       -e s/ppc64/powerpc/ )
 CFLAGS += -D__$(ARCH)__
+CFLAGS2 += -D__$(ARCH)__
+CFLAGS_DEBUG	= $(CFLAGS) -DDEBUG
+DW	= dwarfinfo
+DW3	= dwarfinfo/../dwarfinfo
+SRC	= makedumpfile.c makedumpfile.h diskdump_mod.h
+SRC2	= $(DW)/dwarf_alloc.c $(DW)/dwarf_die_deliv.c $(DW)/dwarf_error.c \
+	  $(DW)/dwarf_form.c $(DW)/dwarf_init_finish.c $(DW)/dwarf_line.c \
+	  $(DW)/dwarf_loc.c $(DW)/dwarf_query.c $(DW)/dwarf_util.c \
+	  $(DW)/dwarf_leb.c $(DW)/malloc_check.c $(DW)/dwarfdump.c \
+	  $(DW)/print_die.c
+SRC_DEBUG = \
+	  $(DW3)/dwarf_alloc.c $(DW3)/dwarf_die_deliv.c $(DW3)/dwarf_error.c \
+	  $(DW3)/dwarf_form.c $(DW3)/dwarf_init_finish.c $(DW3)/dwarf_line.c \
+	  $(DW3)/dwarf_loc.c $(DW3)/dwarf_query.c $(DW3)/dwarf_util.c \
+	  $(DW3)/dwarf_leb.c $(DW3)/malloc_check.c $(DW3)/dwarfdump.c \
+	  $(DW3)/print_die.c \
+	  $(DW3)/dwarf_names.c $(DW3)/esb.c
+OBJ2	= $(DW)/dwarf_alloc.o $(DW)/dwarf_die_deliv.o $(DW)/dwarf_error.o \
+	  $(DW)/dwarf_form.o $(DW)/dwarf_init_finish.o $(DW)/dwarf_line.o \
+	  $(DW)/dwarf_loc.o $(DW)/dwarf_query.o $(DW)/dwarf_util.o \
+	  $(DW)/dwarf_leb.o $(DW)/malloc_check.o $(DW)/dwarfdump.o \
+	  $(DW)/print_die.o
+OBJ_DEBUG = \
+	  $(DW3)/dwarf_alloc.o $(DW3)/dwarf_die_deliv.o $(DW3)/dwarf_error.o \
+	  $(DW3)/dwarf_form.o $(DW3)/dwarf_init_finish.o $(DW3)/dwarf_line.o \
+	  $(DW3)/dwarf_loc.o $(DW3)/dwarf_query.o $(DW3)/dwarf_util.o \
+	  $(DW3)/dwarf_leb.o $(DW3)/malloc_check.o $(DW3)/dwarfdump.o \
+	  $(DW3)/print_die.o \
+	  $(DW3)/dwarf_names.o $(DW3)/esb.o
+HEAD2	= $(DW)/config.h $(DW)/dwarf.h $(DW)/dwarf_abbrev.h \
+	  $(DW)/dwarf_alloc.h $(DW)/dwarf_arange.h $(DW)/dwarf_base_types.h \
+	  $(DW)/dwarf_config.h $(DW)/dwarf_die_deliv.h $(DW)/dwarf_error.h \
+	  $(DW)/dwarf_frame.h $(DW)/dwarf_funcs.h $(DW)/dwarf_global.h \
+	  $(DW)/dwarf_incl.h $(DW)/dwarf_line.h $(DW)/dwarf_loc.h \
+	  $(DW)/dwarf_macro.h $(DW)/dwarf_names.h $(DW)/dwarf_opaque.h \
+	  $(DW)/dwarf_types.h $(DW)/dwarf_util.h $(DW)/dwarf_vars.h \
+	  $(DW)/dwarf_weaks.h $(DW)/dwconf.h $(DW)/esb.h \
+	  $(DW)/globals.h $(DW)/libdwarf.h $(DW)/libdwarfdefs.h \
+	  $(DW)/makename.h $(DW)/malloc_check.h $(DW)/print_frames.h \
+	  $(DW)/pro_alloc.h $(DW)/pro_arange.h $(DW)/pro_die.h \
+	  $(DW)/pro_encode_nm.h $(DW)/pro_error.h $(DW)/pro_expr.h \
+	  $(DW)/pro_frame.h $(DW)/pro_incl.h $(DW)/pro_line.h \
+	  $(DW)/pro_macinfo.h $(DW)/pro_opaque.h $(DW)/pro_reloc.h \
+	  $(DW)/pro_reloc_stream.h $(DW)/pro_reloc_symbolic.h \
+	  $(DW)/pro_section.h $(DW)/pro_types.h $(DW)/pro_util.h
 
-makedumpfile: makedumpfile.c
-	$(CC) $(CFLAGS) -o $@ -lz $<
+all: makedumpfile
+
+$(OBJ2): $(SRC2) $(HEAD2)
+	cd ./dwarfinfo; \
+	$(CC) $(CFLAGS) -I. -c -o ../$@ ../$(@:.o=.c) ; \
+	cd ..;
+
+makedumpfile: $(SRC) $(OBJ2)
+	$(CC) $(CFLAGS2) -I./dwarfinfo $(OBJ2) -lelf -lz -o $@ $<
+
+clean:
+	rm -f $(OBJ2) makedumpfile
+
+debug: readdwarfinfo
+
+$(OBJ_DEBUG): $(SRC_DEBUG) $(HEAD2)
+	cd ./dwarfinfo; \
+	$(CC) $(CFLAGS_DEBUG) -I. -c -o ../$@ ../$(@:.o=.c) ; \
+	cd ..;
+
+readdwarfinfo: $(SRC_DEBUG) $(OBJ_DEBUG)
+	$(CC) $(CFLAGS_DEBUG) $(OBJ_DEBUG) -lelf -o $@
+
+install:
+	cp ./makedumpfile /usr/sbin
--- kexec-tools-1.101/makedumpfile/dwarfinfo/malloc_check.c.orig	2006-08-02 14:05:24.000000000 -0400
+++ kexec-tools-1.101/makedumpfile/dwarfinfo/malloc_check.c	2006-08-02 14:13:17.000000000 -0400
@@ -2,6 +2,11 @@
 
   Copyright (C) 2005 Silicon Graphics, Inc.  All Rights Reserved.
 
+  Copyright (C) 2006  NEC Corporation
+  This file was modified from dwarfdump to analyze kernel debug information
+  in makedumpfile.
+  See below for the original copyright notice.
+
   This program is free software; you can redistribute it and/or modify it
   under the terms of version 2.1 of the GNU Lesser General Public License
   as published by the Free Software Foundation.
@@ -52,14 +57,9 @@
 #include "config.h"
 #include "dwarf_incl.h"
 #include "malloc_check.h"
+#include "globals.h"
 #ifdef  WANT_LIBBDWARF_MALLOC_CHECK
 
-/* To turn off printing every entry, just change the define
-   to set PRINT_MALLOC_DETAILS 0.
-*/
-#define PRINT_MALLOC_DETAILS 0
-
-#define MC_TYPE_UNKNOWN 0
 #define MC_TYPE_ALLOC 1
 #define MC_TYPE_DEALLOC 2
 
@@ -77,10 +77,6 @@ struct mc_data_s {
 						   node. */
 };
 
-/* 
-   
-   
-*/
 #define HASH_TABLE_SIZE 10501
 static struct mc_data_s *mc_data_hash[HASH_TABLE_SIZE];
 static long mc_data_list_size = 0;
@@ -141,29 +137,16 @@ hash_address(unsigned long addr)
     return a % HASH_TABLE_SIZE;
 }
 
-#if PRINT_MALLOC_DETAILS
-static void
-print_alloc_dealloc_detail(unsigned long addr,
-			   int code, char *whichisit)
-{
-    fprintf(stderr,
-	    "%s  addr 0x%lx code %d (%s) entry %ld\n",
-	    whichisit, addr, code, alloc_type_name[code],
-	    mc_data_list_size);
-}
-#else
-#define  print_alloc_dealloc_detail(a,b,c)	/* nothing */
-#endif
-
 /* Create a zeroed struct or die. */
 static void *
 newone(void)
 {
     struct mc_data_s *newd = malloc(sizeof(struct mc_data_s));
 
-    if (newd == 0) {
+    if (newd == NULL) {
 	fprintf(stderr, "out of memory , # %ld\n", mc_data_list_size);
-	exit(1);
+	check_error = 1
+	longjmp(jmpbuf, 0);
     }
     memset(newd, 0, sizeof(struct mc_data_s));
     return newd;
@@ -177,7 +160,6 @@ dwarf_malloc_check_alloc_data(void *addr
     unsigned long addr = (unsigned long) addr_in;
     struct mc_data_s **base = &mc_data_hash[hash_address(addr)];
 
-    print_alloc_dealloc_detail(addr, code, "alloc   ");
     newd->mc_address = addr;
     newd->mc_alloc_code = code;
     newd->mc_type = MC_TYPE_ALLOC;
@@ -250,7 +232,6 @@ dwarf_malloc_check_dealloc_data(void *ad
     struct mc_data_s **base = &mc_data_hash[hash_address(addr)];
 
 
-    print_alloc_dealloc_detail(addr, code, "dealloc ");
     newd->mc_address = (unsigned long) addr;
     newd->mc_alloc_code = code;
     newd->mc_type = MC_TYPE_DEALLOC;
@@ -269,7 +250,8 @@ dwarf_malloc_check_dealloc_data(void *ad
 	    }
 	}
 	abort();
-	exit(3);
+	check_error = 1
+	longjmp(jmpbuf, 0);
     }
     addr_match->mc_dealloc_noted = 1;
     addr_match->mc_dealloc_noted_count += 1;
@@ -292,7 +274,9 @@ dwarf_malloc_check_complete(char *msg)
     long hash_slots_used = 0;
     long max_chain_length = 0;
 
+#ifdef DEBUG
     fprintf(stderr, "Run complete, %s. %ld entries\n", msg, total);
+#endif
     for (; i < HASH_TABLE_SIZE; ++i) {
 	struct mc_data_s *cur = mc_data_hash[i];
 	long cur_chain_length = 0;
--- kexec-tools-1.101/makedumpfile/dwarfinfo/dwarf_query.c.orig	2006-08-02 14:05:24.000000000 -0400
+++ kexec-tools-1.101/makedumpfile/dwarfinfo/dwarf_query.c	2006-08-02 14:13:17.000000000 -0400
@@ -2,6 +2,11 @@
[...9269 lines suppressed...]
-		bm2.buf_size = BUFSIZE_BITMAP;
-		bm2.offset  -= BUFSIZE_BITMAP;
-		if (!write_cache_bufsz(&bm2))
-			goto out;
-	}
-	if (!info->flag_elf_dumpfile
-	    && !write_cache_bufsz(&pdesc))
-		goto out;
 	if (!write_cache_bufsz(&pdata))
 		goto out;
 
+	if (!info->flag_elf_dumpfile) {
+		if (!write_cache_bufsz(&pdesc))
+			goto out;
+		if (flag_change_bitmap) {
+			bm2.buf_size = BUFSIZE_BITMAP;
+			bm2.offset  -= BUFSIZE_BITMAP;
+			if (!write_cache_bufsz(&bm2))
+				goto out;
+		}
+	}
 	/*
 	 * Print the progress of the end.
 	 */
@@ -1721,6 +1748,58 @@ out:
 	return FALSE;
 }
 
+int write_dump_bitmap(struct DumpInfo *info)
+{
+	struct cache_data bm;
+	unsigned long buf_size;
+	const off_t failed = (off_t)-1;
+
+	if (info->flag_elf_dumpfile)
+		return TRUE;
+
+	bm.fd        = info->fd_bitmap;
+	bm.file_name = info->name_bitmap;
+	bm.offset    = 0;
+	bm.buf       = NULL;
+
+	if ((bm.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) {
+		ERRMSG("Can't allocate memory for dump bitmap buffer. %s\n",
+		    strerror(errno));
+		goto out;
+	}
+	if (lseek(info->fd_dumpfile, info->offset_bitmap1, SEEK_SET)
+	    == failed) {
+		ERRMSG("Can't seek the dump file(%s). %s\n",
+		    info->name_dumpfile, strerror(errno));
+		goto out;
+	}
+	buf_size = info->len_bitmap;
+
+	while (buf_size > 0) {
+		if (buf_size >= BUFSIZE_BITMAP)
+			bm.cache_size = BUFSIZE_BITMAP;
+		else
+			bm.cache_size = buf_size;
+
+		if(!read_cache(&bm))
+			goto out;
+
+		if (write(info->fd_dumpfile, bm.buf, bm.cache_size)
+		    != bm.cache_size) {
+			ERRMSG("Can't write the dump file(%s). %s\n",
+			    info->name_dumpfile, strerror(errno));
+			goto out;
+		}
+		buf_size -= BUFSIZE_BITMAP;
+	}
+	g_free(bm.buf);
+	return TRUE;
+out:
+	if (bm.buf != NULL)
+		g_free(bm.buf);
+	return FALSE;
+}
+
 void
 close_system_map(struct DumpInfo *info)
 {
@@ -1746,12 +1825,23 @@ close_dump_file(struct DumpInfo *info)
 	if (close(info->fd_dumpfile) < 0)
 		ERRMSG("Can't close the dump file(%s). %s\n",
 		    info->name_dumpfile, strerror(errno));
-	if (info->flag_elf_dumpfile) {
-		if (close(info->fd_bitmap) < 0)
-			ERRMSG("Can't close the bitmap file(%s). %s\n",
-			    info->name_bitmap, strerror(errno));
-		g_free(info->name_bitmap);
-	}
+}
+
+void
+close_dump_bitmap(struct DumpInfo *info)
+{
+	if (close(info->fd_bitmap) < 0)
+		ERRMSG("Can't close the bitmap file(%s). %s\n",
+		    info->name_bitmap, strerror(errno));
+	g_free(info->name_bitmap);
+}
+
+void
+close_kernel_file(int fd)
+{
+	if (close(fd) < 0)
+		ERRMSG("Can't close vmlinux file(%s). %s\n",
+			dwarf_info.vmlinux_name, strerror(errno));
 }
 
 int
@@ -1772,7 +1862,7 @@ main(int argc, char *argv[])
 		goto out;
 	}
 
-	while ((opt = getopt(argc, argv, "b:cd:E")) != -1) {
+	while ((opt = getopt(argc, argv, "b:cd:Ex:")) != -1) {
 		switch (opt) {
 		case 'b':
 			info->block_order = atoi(optarg);
@@ -1786,6 +1876,9 @@ main(int argc, char *argv[])
 		case 'E':
 			info->flag_elf_dumpfile = 1;
 			break;
+		case 'x':
+			dwarf_info.vmlinux_name = optarg;
+			break;
 		case '?':
 			ERRMSG("Commandline parameter is invalid.\n");
 			print_usage();
@@ -1800,7 +1893,7 @@ main(int argc, char *argv[])
 	}
 	if ((optind + 3 < argc) 
 	    || ((info->dump_level <= 1) && (argc  < optind + 2))
-	    || ((info->dump_level != 1) && (argc != optind + 3))
+	    || ((info->dump_level >= 2) && (argc != optind + 3))
 	    || ((info->flag_compress == 1) && (info->flag_elf_dumpfile == 1))) {
 		ERRMSG("Commandline parameter is invalid.\n");
 		print_usage();
@@ -1825,31 +1918,38 @@ main(int argc, char *argv[])
 	if (!open_dump_file(info))
 		goto out;
 
+	if (!open_dump_bitmap(info))
+		goto out;
+
+	dwarf_info.vmlinux_fd = open_kernel_file(dwarf_info.vmlinux_name);
+	if (dwarf_info.vmlinux_fd == -1)
+		goto out;
+
 	if (!initial(info))
 		goto out;
 
-	if (info->flag_elf_dumpfile) {
-		info->offset_bitmap1 = 0;
-	} else {
-		if (!write_diskdump_header(info))
-			goto out;
-	}
-	if (!create_bitmap(info))
+	if (!create_dump_bitmap(info))
+		goto out;
+
+	if (!write_dump_header(info))
 		goto out;
 
-	if (info->flag_elf_dumpfile) {
-		if (!write_elf_header(info))
-			goto out;
-	}
 	if (!write_pages(info))
 		goto out;
 
+	if (!write_dump_bitmap(info))
+		goto out;
+
 	close_system_map(info);
 
 	close_dump_memory(info);
 
 	close_dump_file(info);
 
+	close_dump_bitmap(info);
+
+	close_kernel_file(dwarf_info.vmlinux_fd);
+
 	MSG("\n");
 	MSG("The dumpfile is saved to %s.\n", info->name_dumpfile);
 	MSG("makedumpfile Completed.\n");
@@ -1867,6 +1967,8 @@ out:
 		close(info->fd_memory);
 	if (info->fd_dumpfile)
 		close(info->fd_dumpfile);
+	if (info->fd_bitmap)
+		close(info->fd_bitmap);
 	if (info->pt_load_segments != NULL)
 		g_free(info->pt_load_segments);
 	if (info->dump_header != NULL)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Aug 2005 20:12:47 -0000	1.2
+++ .cvsignore	2 Aug 2006 19:25:03 -0000	1.3
@@ -1 +1,2 @@
 kexec-tools-1.101.tar.gz
+makedumpfile.tar.gz


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kexec-tools.spec	31 Jul 2006 14:55:12 -0000	1.37
+++ kexec-tools.spec	2 Aug 2006 19:25:03 -0000	1.38
@@ -11,9 +11,10 @@
 Source4: kdump.conf
 Source5: kcp.c
 Source6: Makefile.kcp
+Source7: makedumpfile.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires(pre): coreutils chkconfig sed
-BuildRequires: zlib-devel
+BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel xorg-x11-devel
 
 #
 # Patches 0 through 100 are meant for x86 kexec-tools enablement
@@ -51,6 +52,8 @@
 Patch601: kexec-tools-1.101-Makefile.patch
 Patch602: kexec-tools-1.101-Makefile-kcp.patch
 Patch603: kexec-tools-1.101-et-dyn.patch
+Patch604: kexec-tools-1.101-add-makedumpfile1.patch
+Patch605: kexec-tools-1.101-add-makedumpfile2.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -79,6 +82,11 @@
 mkdir -p -m755 kcp
 cp $RPM_SOURCE_DIR/kcp.c kcp/kcp.c
 cp $RPM_SOURCE_DIR/Makefile.kcp kcp/Makefile
+mkdir makedumpfile 
+tar -C makedumpfile -z -x -v -f $RPM_SOURCE_DIR/makedumpfile.tar.gz
+
+%patch604 -p1
+%patch605 -p1
 
 %build
 %configure --sbindir=/sbin
@@ -129,6 +137,9 @@
 %doc TODO
 
 %changelog
+* Wed Aug 02 2006 Neil Horman <nhorman at redhat.com> - 1.101-33%{dist}.1
+- added makedumpconfig source to package
+
 * Mon Jul 31 2006 Neil Horman <nhorman at redhat.com> - 1.101-32%{dist}.1
 - added et-dyn patch to allow loading of relocatable kernels
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2005 20:12:47 -0000	1.2
+++ sources	2 Aug 2006 19:25:03 -0000	1.3
@@ -1 +1,2 @@
 b4f7ffcc294d41a6a4c40d6e44b7734d  kexec-tools-1.101.tar.gz
+aa738475824ee3d25e5030fc506366bd  makedumpfile.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:26:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:26:48 -0400
Subject: rpms/gtk-doc/devel gtk-doc.spec,1.23,1.24
Message-ID: <200608021926.k72JQmxF006674@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk-doc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6588

Modified Files:
	gtk-doc.spec 
Log Message:
1.7



Index: gtk-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gtk-doc.spec	2 Aug 2006 19:24:35 -0000	1.23
+++ gtk-doc.spec	2 Aug 2006 19:26:45 -0000	1.24
@@ -4,7 +4,7 @@
 Release: 1%{?dist}
 License: LGPL
 Group: Development/Tools
-Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.6/gtk-doc-1.6.tar.bz2 
+Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.6/gtk-doc-%{version}.tar.bz2 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gtk.org/gtk-doc



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:27:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:27:30 -0400
Subject: rpms/openoffice.org/devel workspace.opensymbol01.patch, NONE,
	1.1 openoffice.org.spec, 1.813,
	1.814 openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch,
	1.1, NONE
Message-ID: <200608021927.k72JRUAB006996@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.opensymbol01.patch 
Removed Files:
	openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch 
Log Message:
merge to upstream workspace

workspace.opensymbol01.patch:
 source/core/doc/number.cxx    |    0 
 sw/source/core/doc/number.cxx |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE workspace.opensymbol01.patch ---
Index: source/core/doc/number.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/doc/number.cxx,v
retrieving revision 1.32
diff -u -p -u -r1.32 number.cxx
--- openoffice.org.orig/sw/source/core/doc/number.cxx	8 Nov 2005 17:17:38 -0000	1.32
+++ openoffice.org/sw/source/core/doc/number.cxx	3 Jan 2006 17:19:09 -0000
@@ -986,8 +986,8 @@ void SwNumRule::Indent(short nAmount, in
 sal_Unicode GetBulletChar(BYTE nLevel)
 {
     static sal_Unicode nLevelChars[MAXLEVEL] =
-        { 0x25cf, 0x25cb, 0x25a0, 0x25cf, 0x25cb,
-          0x25a0, 0x25cf, 0x25cb, 0x25a0, 0x25cf };
+        { 0x25cf, 0xe572, 0x25a0, 0x25cf, 0xe572,
+          0x25a0, 0x25cf, 0xe572, 0x25a0, 0x25cf };
 
     if (nLevel > MAXLEVEL)
         nLevel = MAXLEVEL;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -r1.813 -r1.814
--- openoffice.org.spec	2 Aug 2006 19:22:48 -0000	1.813
+++ openoffice.org.spec	2 Aug 2006 19:27:28 -0000	1.814
@@ -85,7 +85,7 @@
 Patch19: workspace.targetedaot.patch
 Patch20: workspace.icuupgrade.patch
 Patch21: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch22: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
+Patch22: workspace.opensymbol01.patch
 Patch23: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
 Patch24: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch25: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
@@ -885,7 +885,7 @@
 %patch19 -p1 -b .workspace.targetedaot.patch
 %patch20 -p1 -b .workspace.icuupgrade.patch
 %patch21 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch22 -p1 -b .ooo59997.sw.defaultbullets.patch
+%patch22 -p1 -b .workspace.opensymbol01.patch
 %patch23 -p1 -b .ooo19976.framework.nofocussteal.patch
 %patch24 -p1
 %patch25 -p1 -b .ooo64463.extensions.noxaw.patch
@@ -3519,6 +3519,7 @@
 - rh#200805# replace ooo58663 missing glyph patch -> workspace.icuupgrade
 - replace ooo#66510# recentlyused fix -> workspace.kendy10
 - replace ooo#66067# embeddedobj crash -> workspace.fwk40
+- replace ooo#59997# defaultbullets -> workspace.opensymbol01
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch


--- openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:27:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:27:44 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.38,1.39
Message-ID: <200608021927.k72JRiKS007113@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7081

Modified Files:
	kexec-tools.spec 
Log Message:
bumping revision


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kexec-tools.spec	2 Aug 2006 19:25:03 -0000	1.38
+++ kexec-tools.spec	2 Aug 2006 19:27:42 -0000	1.39
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 32%{dist}.1
+Release: 33%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:30:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:30:32 -0400
Subject: rpms/openoffice.org/devel workspace.os84.patch, NONE,
	1.1 openoffice.org.spec, 1.814,
	1.815 openoffice.org-2.0.3.ooo65081.sw.layout.patch, 1.1, NONE
Message-ID: <200608021930.k72JUW4O008121@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.os84.patch 
Removed Files:
	openoffice.org-2.0.3.ooo65081.sw.layout.patch 
Log Message:
merge to upstream workspace

workspace.os84.patch:
 _viewsh.sdi |    6 ------
 1 files changed, 6 deletions(-)

--- NEW FILE workspace.os84.patch ---
Index: _viewsh.sdi
===================================================================
RCS file: /cvs/sw/sw/sdi/_viewsh.sdi,v
retrieving revision 1.28.82.1
retrieving revision 1.28
diff -u -r1.28.82.1 -r1.28
--- openoffice.org.orig/sw/sdi/_viewsh.sdi	30 Jun 2006 05:47:01 -0000	1.28.82.1
+++ openoffice.org/sw/sdi/_viewsh.sdi	2 May 2006 15:16:04 -0000	1.28
@@ -622,12 +622,6 @@
         Export = FALSE;
     ]
 
-    FN_PRINT_LAYOUT
-    [
-        ExecMethod = ExecViewOptions ;
-        StateMethod = StateViewOptions ;
-        Export = FALSE;
-    ]
      // alles ab hier kann weg (Export = FALSE;), wenn die vorangehenden funktionieren
     FN_RULER // status()
     [


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.814
retrieving revision 1.815
diff -u -r1.814 -r1.815
--- openoffice.org.spec	2 Aug 2006 19:27:28 -0000	1.814
+++ openoffice.org.spec	2 Aug 2006 19:30:30 -0000	1.815
@@ -124,7 +124,7 @@
 Patch58: openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
 Patch59: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
 Patch60: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch61: openoffice.org-2.0.3.ooo65081.sw.layout.patch
+Patch61: workspace.os84.patch
 Patch62: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
 Patch63: workspace.configure18.patch
 Patch64: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
@@ -924,7 +924,7 @@
 %patch58 -p1 -b .ooo67779.svx.toolbarcrash.patch
 %patch59 -p1 -b .ooo67793.sw.stickymenu.patch
 %patch60 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch61 -p1 -b .ooo65081.sw.layout.patch
+%patch61 -p1 -b .workspace.os84.patch
 %patch62 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
 %patch63 -p1 -b .workspace.configure18.patch
 %patch64 -p1 -b .ooo54603.fontconfig.part2.patch
@@ -3520,6 +3520,7 @@
 - replace ooo#66510# recentlyused fix -> workspace.kendy10
 - replace ooo#66067# embeddedobj crash -> workspace.fwk40
 - replace ooo#59997# defaultbullets -> workspace.opensymbol01
+- replace ooo#65081# switch layout -> workspace.os84
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch


--- openoffice.org-2.0.3.ooo65081.sw.layout.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:32:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:32:23 -0400
Subject: rpms/openoffice.org/devel workspace.impress96.patch, NONE,
	1.1 openoffice.org.spec, 1.815,
	1.816 openoffice.org-2.0.3.ooo65308.notespaste.sd.patch, 1.1, NONE
Message-ID: <200608021932.k72JWNPQ008331@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impress96.patch 
Removed Files:
	openoffice.org-2.0.3.ooo65308.notespaste.sd.patch 
Log Message:
merge to upstream workspace

workspace.impress96.patch:
 sd/source/ui/view/sdview3.cxx |    6 ++++++
 source/ui/view/sdview3.cxx    |    0 
 2 files changed, 6 insertions(+)

--- NEW FILE workspace.impress96.patch ---
Index: source/ui/view/sdview3.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/view/sdview3.cxx,v
retrieving revision 1.63
diff -u -r1.63 sdview3.cxx
--- openoffice.org.orig/sd/source/ui/view/sdview3.cxx	1 Feb 2006 18:41:14 -0000	1.63
+++ openoffice.org/sd/source/ui/view/sdview3.cxx	11 May 2006 17:27:27 -0000
@@ -718,6 +718,12 @@
 				}
 			}
 		}
+		else if (!pOwnData->GetWorkDocument())
+		{
+			OSL_ASSERT (pOwnData->GetWorkDocument()!=NULL);
+			aDropErrorTimer.Start();
+			bReturn = FALSE;
+		}
 		else
 		{
 		    SdDrawDocument*	pWorkModel = (SdDrawDocument*) pOwnData->GetWorkDocument();


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.815
retrieving revision 1.816
diff -u -r1.815 -r1.816
--- openoffice.org.spec	2 Aug 2006 19:30:30 -0000	1.815
+++ openoffice.org.spec	2 Aug 2006 19:32:20 -0000	1.816
@@ -92,7 +92,7 @@
 Patch26: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch27: workspace.bfsixtyfour.patch
 Patch28: openoffice.org-2.0.3.ooo65318.agg24.canvas.patch
-Patch29: openoffice.org-2.0.3.ooo65308.notespaste.sd.patch
+Patch29: workspace.impress96.patch
 Patch30: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
 Patch31: workspace.fpicker6.patch
 Patch32: workspace.vcl59.patch
@@ -892,7 +892,7 @@
 %patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch27 -p1 -b .workspace.bfsixtyfour.patch
 %patch28 -p1 -b .ooo65318.agg24.canvas.patch
-%patch29 -p1 -b .ooo65308.notespaste.sd.patch
+%patch29 -p1 -b .workspace.impress96.patch
 %patch30 -p1 -b .ooo65327.builddep.writerperfect.patch
 %patch31 -p1 -b .workspace.fpicker6.patch
 %patch32 -p1 -b .workspace.vcl59.patch
@@ -3521,6 +3521,7 @@
 - replace ooo#66067# embeddedobj crash -> workspace.fwk40
 - replace ooo#59997# defaultbullets -> workspace.opensymbol01
 - replace ooo#65081# switch layout -> workspace.os84
+- replace ooo#65308# notes paste -> workspace.impress96
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch


--- openoffice.org-2.0.3.ooo65308.notespaste.sd.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:36:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:36:19 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.45,
	1.46 selinux-policy.spec, 1.241, 1.242
Message-ID: <200608021936.k72JaJu3009045@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-18
- yet more xen rules
 
* Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-17
- more xen rules


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 mls                                |    9 -
 modules/admin/bootloader.te        |    6 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    5 
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.if       |   21 +++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 ++++++++++++
 modules/kernel/selinux.if          |   18 ++-
 modules/kernel/selinux.te          |    4 
 modules/kernel/storage.fc          |    1 
 modules/kernel/terminal.if         |   18 +++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    2 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    7 +
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cron.if           |   16 ++
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nis.te            |    1 
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |   13 ++
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  146 ++++++++++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    9 -
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |   10 +
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    1 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |    6 -
 modules/system/logging.te          |    9 +
 modules/system/lvm.te              |    3 
 modules/system/mount.te            |    2 
 modules/system/selinuxutil.te      |   29 ++++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |   13 +-
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   50 +++-----
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |   26 +++-
 98 files changed, 1064 insertions(+), 270 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- policy-20060608.patch	1 Aug 2006 21:38:02 -0000	1.45
+++ policy-20060608.patch	2 Aug 2006 19:36:17 -0000	1.46
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.3.3/policy/global_booleans
---- nsaserefpolicy/policy/global_booleans	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/global_booleans	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/global_booleans	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_booleans	2006-08-02 15:33:08.000000000 -0400
 @@ -4,6 +4,7 @@
  # file should be used.
  #
@@ -18,8 +18,8 @@
  ## <desc>
  ## <p>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.3/policy/global_tunables
---- nsaserefpolicy/policy/global_tunables	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/global_tunables	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/global_tunables	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_tunables	2006-08-02 15:33:08.000000000 -0400
 @@ -19,6 +19,14 @@
  
  ## <desc>
@@ -174,8 +174,8 @@
  ## </p>
  ## </desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.3.3/policy/mcs
---- nsaserefpolicy/policy/mcs	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/mcs	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/mcs	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/mcs	2006-08-02 15:33:08.000000000 -0400
 @@ -159,8 +159,9 @@
  mlsconstrain process { transition dyntransition }
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
@@ -188,8 +188,8 @@
  mlsconstrain process { sigkill sigstop }
  	(( h1 dom h2 ) or ( t1 == mcskillall ));
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.3/policy/mls
---- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/mls	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/mls	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/mls	2006-08-02 15:33:08.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -212,8 +212,8 @@
  	((( l1 dom l2 ) and ( l1 domby h2 )) or
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.3/policy/modules/admin/bootloader.te
---- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-08-02 15:33:08.000000000 -0400
 @@ -48,7 +48,7 @@
  # bootloader local policy
  #
@@ -243,8 +243,8 @@
  mls_file_read_up(bootloader_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.3/policy/modules/admin/consoletype.te
---- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-08-02 15:33:08.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -268,8 +268,8 @@
 +	xen_dontaudit_use_fds(consoletype_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.3/policy/modules/admin/firstboot.te
---- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-07-14 17:04:45.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/firstboot.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/firstboot.te	2006-08-02 15:33:08.000000000 -0400
 @@ -120,6 +120,10 @@
  	usermanage_domtrans_useradd(firstboot_t)
  ')
@@ -287,8 +287,8 @@
  ') dnl end TODO
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.3.3/policy/modules/admin/netutils.te
---- nsaserefpolicy/policy/modules/admin/netutils.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/netutils.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/netutils.te	2006-08-02 15:33:08.000000000 -0400
 @@ -211,11 +211,11 @@
  ifdef(`targeted_policy',`
  	term_use_unallocated_ttys(traceroute_t)
@@ -307,8 +307,8 @@
  
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.3/policy/modules/admin/prelink.te
---- nsaserefpolicy/policy/modules/admin/prelink.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/prelink.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/prelink.te	2006-08-02 15:33:08.000000000 -0400
 @@ -48,6 +48,7 @@
  corecmd_relabel_all_executables(prelink_t)
  corecmd_mmap_all_executables(prelink_t)
@@ -318,8 +318,8 @@
  dev_read_urand(prelink_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.3/policy/modules/admin/rpm.fc
---- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/rpm.fc	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -330,8 +330,8 @@
  
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.3/policy/modules/admin/rpm.if
---- nsaserefpolicy/policy/modules/admin/rpm.if	2006-07-14 17:04:45.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/rpm.if	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-08-02 15:33:08.000000000 -0400
 @@ -211,7 +211,7 @@
  
  	files_search_var_lib($1)
@@ -351,8 +351,8 @@
  ')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.3/policy/modules/admin/usermanage.te
---- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/usermanage.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/usermanage.te	2006-08-02 15:33:08.000000000 -0400
 @@ -260,6 +260,7 @@
  ')
  
@@ -370,8 +370,8 @@
  ')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.3/policy/modules/kernel/corecommands.fc
---- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/corecommands.fc	2006-08-01 17:34:30.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/corecommands.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -381,8 +381,8 @@
  ifdef(`distro_debian',`
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in
---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-07-14 17:04:30.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in	2006-08-02 15:33:08.000000000 -0400
 @@ -62,7 +62,7 @@
  network_port(amavisd_send, tcp,10025,s0)
  network_port(asterisk, tcp,1720,s0, udp,2427,s0, udp,2727,s0, udp,4569,s0, udp,5060,s0)
@@ -410,8 +410,8 @@
  
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.3/policy/modules/kernel/devices.fc
---- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -20,6 +20,7 @@
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
  /dev/full		-c	gen_context(system_u:object_r:null_device_t,s0)
@@ -430,8 +430,8 @@
  /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.3/policy/modules/kernel/files.fc
---- nsaserefpolicy/policy/modules/kernel/files.fc	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/files.fc	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/files.fc	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/files.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -11,6 +11,7 @@
  ifdef(`distro_redhat',`
  /\.autofsck		--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -441,8 +441,8 @@
  /forcefsck 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.3.3/policy/modules/kernel/filesystem.if
---- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.if	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.if	2006-08-02 15:33:08.000000000 -0400
 @@ -1019,6 +1019,27 @@
  
  ########################################
@@ -472,8 +472,8 @@
  ## </summary>
  ## <desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.3/policy/modules/kernel/filesystem.te
---- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.te	2006-08-02 15:33:08.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -491,8 +491,8 @@
  ########################################
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.3/policy/modules/kernel/kernel.if
---- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/kernel.if	2006-08-01 17:34:54.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/kernel.if	2006-08-02 15:33:08.000000000 -0400
 @@ -1456,6 +1456,42 @@
  
  ########################################
@@ -580,8 +580,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.3.3/policy/modules/kernel/selinux.if
---- nsaserefpolicy/policy/modules/kernel/selinux.if	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/selinux.if	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/selinux.if	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/selinux.if	2006-08-02 15:33:08.000000000 -0400
 @@ -55,7 +55,7 @@
  		type security_t;
  	')
@@ -643,8 +643,8 @@
  	allow $1 security_t:file { getattr read write };
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-2.3.3/policy/modules/kernel/selinux.te
---- nsaserefpolicy/policy/modules/kernel/selinux.te	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/selinux.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/selinux.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/selinux.te	2006-08-02 15:33:08.000000000 -0400
 @@ -40,10 +40,10 @@
  
  if(!secure_mode_policyload) {
@@ -659,8 +659,8 @@
  	')
  }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.3.3/policy/modules/kernel/storage.fc
---- nsaserefpolicy/policy/modules/kernel/storage.fc	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/storage.fc	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/storage.fc	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/storage.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -23,6 +23,7 @@
  /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
  /dev/lvm			-c	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
@@ -670,8 +670,8 @@
  /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.3/policy/modules/kernel/terminal.if
---- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/terminal.if	2006-08-01 17:33:29.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/terminal.if	2006-08-02 15:33:08.000000000 -0400
 @@ -949,3 +949,21 @@
  	dontaudit $1 ttynode:chr_file { read write };
  ')
@@ -695,8 +695,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.3/policy/modules/services/amavis.te
---- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/amavis.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/amavis.te	2006-08-02 15:33:08.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -727,8 +727,8 @@
 +	postfix_read_config(amavis_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.3/policy/modules/services/apache.te
---- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/apache.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/apache.te	2006-08-02 15:33:08.000000000 -0400
 @@ -273,7 +273,6 @@
  sysnet_read_config(httpd_t)
  
@@ -738,8 +738,8 @@
  mta_send_mail(httpd_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.3/policy/modules/services/automount.te
---- nsaserefpolicy/policy/modules/services/automount.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/automount.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/automount.te	2006-08-02 15:33:08.000000000 -0400
 @@ -36,10 +36,12 @@
  allow automount_t self:unix_dgram_socket create_socket_perms;
  allow automount_t self:tcp_socket create_stream_socket_perms;
@@ -764,8 +764,8 @@
 +	kerberos_dontaudit_write_config(automount_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.3/policy/modules/services/avahi.te
---- nsaserefpolicy/policy/modules/services/avahi.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/avahi.te	2006-08-01 17:36:26.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/avahi.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/avahi.te	2006-08-02 15:33:08.000000000 -0400
 @@ -78,6 +78,8 @@
  miscfiles_read_localization(avahi_t)
  
@@ -776,8 +776,8 @@
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.3.3/policy/modules/services/bind.fc
---- nsaserefpolicy/policy/modules/services/bind.fc	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bind.fc	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/bind.fc	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bind.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -28,7 +28,8 @@
  ')
  
@@ -789,8 +789,8 @@
  /var/named(/.*)?		gen_context(system_u:object_r:named_zone_t,s0)
  /var/named/slaves(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.3/policy/modules/services/bluetooth.if
---- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bluetooth.if	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.if	2006-08-02 15:33:08.000000000 -0400
 @@ -111,3 +111,26 @@
  	dontaudit $1 bluetooth_helper_t:dir search;
  	dontaudit $1 bluetooth_helper_t:file { read getattr };
@@ -819,8 +819,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.3/policy/modules/services/bluetooth.te
---- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-08-02 15:33:08.000000000 -0400
 @@ -173,6 +173,7 @@
  allow bluetooth_helper_t self:shm create_shm_perms;
  allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -847,8 +847,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-2.3.3/policy/modules/services/clamav.fc
---- nsaserefpolicy/policy/modules/services/clamav.fc	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/clamav.fc	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/clamav.fc	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -8,8 +8,9 @@
  /usr/sbin/clamd			--	gen_context(system_u:object_r:clamd_exec_t,s0)
  
@@ -861,8 +861,8 @@
  /var/log/clamav/freshclam.*	--	gen_context(system_u:object_r:freshclam_var_log_t,s0)
 +/var/spool/amavisd/clamd.sock	-s	gen_context(system_u:object_r:clamd_var_run_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.3/policy/modules/services/clamav.if
---- nsaserefpolicy/policy/modules/services/clamav.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/clamav.if	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/clamav.if	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.if	2006-08-02 15:33:08.000000000 -0400
 @@ -35,11 +35,11 @@
  #
  interface(`clamav_stream_connect',`
@@ -900,8 +900,8 @@
 +	allow $1 clamd_var_lib_t:dir search;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.3.3/policy/modules/services/clamav.te
---- nsaserefpolicy/policy/modules/services/clamav.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/clamav.te	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/clamav.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.te	2006-08-02 15:33:08.000000000 -0400
 @@ -15,10 +15,6 @@
  type clamd_etc_t;
  files_type(clamd_etc_t)
@@ -977,8 +977,8 @@
  
  kernel_read_kernel_sysctls(clamscan_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.3/policy/modules/services/cron.if
---- nsaserefpolicy/policy/modules/services/cron.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cron.if	2006-08-01 17:09:47.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/cron.if	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cron.if	2006-08-02 15:33:08.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -1022,8 +1022,8 @@
  		# fcron wants an instant update of a crontab change for the administrator
  		# also crontab does a security check for crontab -u
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.3/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-08-02 15:33:08.000000000 -0400
 @@ -81,6 +81,7 @@
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
@@ -1052,8 +1052,8 @@
  sysnet_read_config(cupsd_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.3/policy/modules/services/cyrus.te
---- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-08-02 15:33:08.000000000 -0400
 @@ -41,6 +41,7 @@
  allow cyrus_t self:unix_stream_socket connectto;
  allow cyrus_t self:tcp_socket create_stream_socket_perms;
@@ -1071,8 +1071,8 @@
 +	ldap_stream_connect(cyrus_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.3.3/policy/modules/services/dovecot.fc
---- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/dovecot.fc	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -29,6 +29,7 @@
  /var/run/dovecot(-login)?(/.*)?		gen_context(system_u:object_r:dovecot_var_run_t,s0)
  
@@ -1082,8 +1082,8 @@
  
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.3/policy/modules/services/dovecot.te
---- nsaserefpolicy/policy/modules/services/dovecot.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/dovecot.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/dovecot.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.te	2006-08-02 15:33:08.000000000 -0400
 @@ -30,6 +30,10 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -1113,8 +1113,8 @@
  ')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.3.3/policy/modules/services/ftp.te
---- nsaserefpolicy/policy/modules/services/ftp.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ftp.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ftp.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ftp.te	2006-08-02 15:33:08.000000000 -0400
 @@ -50,6 +50,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -1132,8 +1132,8 @@
  ')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.3/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-08-02 15:33:08.000000000 -0400
 @@ -22,7 +22,7 @@
  #
  
@@ -1166,8 +1166,8 @@
  ')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.3.3/policy/modules/services/inetd.te
---- nsaserefpolicy/policy/modules/services/inetd.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/inetd.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/inetd.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/inetd.te	2006-08-02 15:33:08.000000000 -0400
 @@ -218,10 +218,6 @@
  
  sysnet_read_config(inetd_child_t)
@@ -1192,16 +1192,16 @@
 +
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-2.3.3/policy/modules/services/ldap.fc
---- nsaserefpolicy/policy/modules/services/ldap.fc	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ldap.fc	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ldap.fc	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -9,3 +9,4 @@
  /var/run/openldap(/.*)?		gen_context(system_u:object_r:slapd_var_run_t,s0)
  /var/run/slapd\.args	--	gen_context(system_u:object_r:slapd_var_run_t,s0)
  /var/run/slapd\.pid	--	gen_context(system_u:object_r:slapd_var_run_t,s0)
 +/var/run/ldapi		-s	gen_context(system_u:object_r:slapd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.if serefpolicy-2.3.3/policy/modules/services/ldap.if
---- nsaserefpolicy/policy/modules/services/ldap.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ldap.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ldap.if	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.if	2006-08-02 15:33:08.000000000 -0400
 @@ -57,3 +57,24 @@
  	allow slapd_t $1:tcp_socket { acceptfrom recvfrom };
  	kernel_tcp_recvfrom($1)
@@ -1228,8 +1228,8 @@
 +	allow $1 slapd_t:unix_stream_socket connectto;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.3/policy/modules/services/ldap.te
---- nsaserefpolicy/policy/modules/services/ldap.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ldap.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ldap.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.te	2006-08-02 15:33:08.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -1240,8 +1240,8 @@
  kernel_read_system_state(slapd_t)
  kernel_read_kernel_sysctls(slapd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.3.3/policy/modules/services/lpd.if
---- nsaserefpolicy/policy/modules/services/lpd.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/lpd.if	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-08-02 15:33:08.000000000 -0400
 @@ -62,7 +62,7 @@
  	allow $1_lpr_t self:unix_stream_socket create_stream_socket_perms;
  	allow $1_lpr_t self:tcp_socket create_socket_perms;
@@ -1307,8 +1307,8 @@
  
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-2.3.3/policy/modules/services/mailman.te
---- nsaserefpolicy/policy/modules/services/mailman.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/mailman.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/mailman.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/mailman.te	2006-08-02 15:33:08.000000000 -0400
 @@ -6,8 +6,6 @@
  # Declarations
  #
@@ -1349,8 +1349,8 @@
  	allow mailman_cgi_t mailman_archive_t:lnk_file create_lnk_perms;
  	allow mailman_cgi_t mailman_archive_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.3/policy/modules/services/nis.te
---- nsaserefpolicy/policy/modules/services/nis.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/nis.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/nis.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/nis.te	2006-08-02 15:33:08.000000000 -0400
 @@ -86,6 +86,7 @@
  corenet_tcp_bind_reserved_port(ypbind_t)
  corenet_udp_bind_reserved_port(ypbind_t)
@@ -1360,8 +1360,8 @@
  corenet_dontaudit_tcp_bind_all_reserved_ports(ypbind_t)
  corenet_dontaudit_udp_bind_all_reserved_ports(ypbind_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.3.3/policy/modules/services/nscd.if
---- nsaserefpolicy/policy/modules/services/nscd.if	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/nscd.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/nscd.if	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/nscd.if	2006-08-02 15:33:08.000000000 -0400
 @@ -144,3 +144,23 @@
  
  	allow $1 nscd_t:nscd *;
@@ -1387,8 +1387,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.3/policy/modules/services/ntp.te
---- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ntp.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ntp.te	2006-08-02 15:33:08.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -1399,8 +1399,8 @@
  allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
  allow ntpd_t self:fifo_file { read write getattr };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.3/policy/modules/services/openvpn.te
---- nsaserefpolicy/policy/modules/services/openvpn.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/openvpn.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-08-02 15:33:08.000000000 -0400
 @@ -33,6 +33,10 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -1431,8 +1431,8 @@
  
  ifdef(`targeted_policy',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.3/policy/modules/services/pegasus.if
---- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/pegasus.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.if	2006-08-02 15:33:08.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -1467,8 +1467,8 @@
 +	allow pegasus_t $1:process sigchld;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.3/policy/modules/services/pegasus.te
---- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/pegasus.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.te	2006-08-02 15:33:08.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -1486,8 +1486,8 @@
  
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.3/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postfix.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/postfix.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postfix.te	2006-08-02 15:33:08.000000000 -0400
 @@ -160,7 +160,7 @@
  
  init_use_script_ptys(postfix_master_t)
@@ -1538,8 +1538,8 @@
 +	postgrey_socket_access(postfix_smtpd_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-2.3.3/policy/modules/services/postgrey.fc
---- nsaserefpolicy/policy/modules/services/postgrey.fc	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postgrey.fc	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/postgrey.fc	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -6,3 +6,5 @@
  /var/run/postgrey\.pid	--	gen_context(system_u:object_r:postgrey_var_run_t,s0)
  
@@ -1547,8 +1547,8 @@
 +
 +/var/run/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-2.3.3/policy/modules/services/postgrey.if
---- nsaserefpolicy/policy/modules/services/postgrey.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postgrey.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/postgrey.if	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.if	2006-08-02 15:33:08.000000000 -0400
 @@ -1 +1,20 @@
  ## <summary>Postfix grey-listing server</summary>
 +
@@ -1571,8 +1571,8 @@
 +	allow $1 postgrey_t:unix_stream_socket connectto;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-2.3.3/policy/modules/services/postgrey.te
---- nsaserefpolicy/policy/modules/services/postgrey.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postgrey.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/postgrey.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.te	2006-08-02 15:33:08.000000000 -0400
 @@ -40,6 +40,7 @@
  allow postgrey_t postgrey_var_run_t:file create_file_perms;
  allow postgrey_t postgrey_var_run_t:dir rw_dir_perms;
@@ -1605,8 +1605,8 @@
 +	allow $1 postgrey_t:unix_stream_socket connectto;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.3/policy/modules/services/procmail.te
---- nsaserefpolicy/policy/modules/services/procmail.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/procmail.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/procmail.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/procmail.te	2006-08-02 15:33:08.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -1627,8 +1627,8 @@
  ')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.fc serefpolicy-2.3.3/policy/modules/services/radius.fc
---- nsaserefpolicy/policy/modules/services/radius.fc	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/radius.fc	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/radius.fc	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/radius.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -3,6 +3,7 @@
  /etc/cron\.(daily|weekly|monthly)/freeradius -- gen_context(system_u:object_r:radiusd_exec_t,s0)
  
@@ -1638,8 +1638,8 @@
  /usr/sbin/radiusd	--	gen_context(system_u:object_r:radiusd_exec_t,s0)
  /usr/sbin/freeradius	--	gen_context(system_u:object_r:radiusd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.3.3/policy/modules/services/radius.te
---- nsaserefpolicy/policy/modules/services/radius.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/radius.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/radius.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/radius.te	2006-08-02 15:33:08.000000000 -0400
 @@ -13,6 +13,9 @@
  type radiusd_etc_t;
  files_config_file(radiusd_etc_t)
@@ -1663,8 +1663,8 @@
  allow radiusd_t radiusd_log_t:dir create_dir_perms;
  logging_log_filetrans(radiusd_t,radiusd_log_t,{ file dir })
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.3.3/policy/modules/services/remotelogin.te
---- nsaserefpolicy/policy/modules/services/remotelogin.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/remotelogin.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/remotelogin.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/remotelogin.te	2006-08-02 15:33:08.000000000 -0400
 @@ -37,6 +37,7 @@
  allow remote_login_t self:sem create_sem_perms;
  allow remote_login_t self:msgq create_msgq_perms;
@@ -1674,8 +1674,8 @@
  allow remote_login_t remote_login_tmp_t:dir create_dir_perms;
  allow remote_login_t remote_login_tmp_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.3/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/samba.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/samba.te	2006-08-02 15:33:08.000000000 -0400
 @@ -186,11 +186,12 @@
  allow smbd_t self:udp_socket create_socket_perms;
  allow smbd_t self:unix_dgram_socket { create_socket_perms sendto };
@@ -1709,7 +1709,7 @@
  allow nmbd_t samba_var_t:dir rw_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-08-01 17:09:48.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -0,0 +1,11 @@
 +# setroubleshoot executables
 +
@@ -1724,7 +1724,7 @@
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if	2006-08-01 17:09:48.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if	2006-08-02 15:33:08.000000000 -0400
 @@ -0,0 +1,24 @@
 +## <summary>policy for setroubleshoot</summary>
 +
@@ -1752,7 +1752,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-08-01 17:09:48.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-08-02 15:33:08.000000000 -0400
 @@ -0,0 +1,146 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -1901,8 +1901,8 @@
 +	rpm_dontaudit_manage_db(setroubleshoot_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.3/policy/modules/services/spamassassin.te
---- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/spamassassin.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/spamassassin.te	2006-08-02 15:33:08.000000000 -0400
 @@ -194,3 +194,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -1912,8 +1912,8 @@
 +	postfix_read_config(spamd_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.3/policy/modules/services/squid.te
---- nsaserefpolicy/policy/modules/services/squid.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/squid.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-08-02 15:33:08.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -1948,8 +1948,8 @@
  allow squid_t tmpfs_t:file { read write };
  ') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.3/policy/modules/services/ssh.if
---- nsaserefpolicy/policy/modules/services/ssh.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ssh.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ssh.if	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ssh.if	2006-08-02 15:33:08.000000000 -0400
 @@ -71,6 +71,7 @@
  	allow $1_ssh_t self:msgq create_msgq_perms;
  	allow $1_ssh_t self:msg { send receive };
@@ -1959,8 +1959,8 @@
  	# for rsync
  	allow $1_ssh_t $2:unix_stream_socket rw_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.3/policy/modules/services/tftp.te
---- nsaserefpolicy/policy/modules/services/tftp.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/tftp.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-08-02 15:33:08.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -1970,8 +1970,8 @@
  userdom_dontaudit_use_unpriv_user_fds(tftpd_t)
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.3.3/policy/modules/services/xfs.te
---- nsaserefpolicy/policy/modules/services/xfs.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/xfs.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/xfs.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xfs.te	2006-08-02 15:33:08.000000000 -0400
 @@ -59,6 +59,8 @@
  term_dontaudit_use_console(xfs_t)
  
@@ -1982,8 +1982,8 @@
  init_use_fds(xfs_t)
  init_use_script_ptys(xfs_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.3/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/xserver.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.if	2006-08-02 15:33:08.000000000 -0400
 @@ -317,7 +317,6 @@
  	')
  
@@ -2021,8 +2021,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.3/policy/modules/services/xserver.te
---- nsaserefpolicy/policy/modules/services/xserver.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/xserver.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/xserver.te	2006-07-14 17:07:14.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.te	2006-08-02 15:33:08.000000000 -0400
 @@ -88,6 +88,7 @@
  allow xdm_t self:unix_dgram_socket create_socket_perms;
  allow xdm_t self:tcp_socket create_stream_socket_perms;
@@ -2041,8 +2041,8 @@
  
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.3.3/policy/modules/services/zebra.te
---- nsaserefpolicy/policy/modules/services/zebra.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/zebra.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-08-02 15:33:08.000000000 -0400
 @@ -42,6 +42,11 @@
  allow zebra_t zebra_conf_t:file r_file_perms;
  allow zebra_t zebra_conf_t:lnk_file { getattr read };
@@ -2068,8 +2068,8 @@
  dev_associate_usbfs(zebra_var_run_t)
  dev_list_all_dev_nodes(zebra_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.3.3/policy/modules/system/authlogin.if
---- nsaserefpolicy/policy/modules/system/authlogin.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/authlogin.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/authlogin.if	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/authlogin.if	2006-08-02 15:33:08.000000000 -0400
 @@ -1336,3 +1336,6 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
@@ -2078,8 +2078,8 @@
 +
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.3/policy/modules/system/authlogin.te
---- nsaserefpolicy/policy/modules/system/authlogin.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/authlogin.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/authlogin.te	2006-08-02 15:33:08.000000000 -0400
 @@ -193,6 +193,7 @@
  term_setattr_console(pam_console_t)
  term_getattr_unallocated_ttys(pam_console_t)
@@ -2089,24 +2089,24 @@
  auth_use_nsswitch(pam_console_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-2.3.3/policy/modules/system/fstools.fc
---- nsaserefpolicy/policy/modules/system/fstools.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/fstools.fc	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/fstools.fc	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/fstools.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -1,3 +1,4 @@
 +/sbin/blkid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/blockdev		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/cfdisk		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/dosfsck		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-2.3.3/policy/modules/system/getty.fc
---- nsaserefpolicy/policy/modules/system/getty.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/getty.fc	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/getty.fc	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -9,3 +9,4 @@
  /var/run/mgetty\.pid.*	--	gen_context(system_u:object_r:getty_var_run_t,s0)
  
  /var/spool/fax		--	gen_context(system_u:object_r:getty_var_run_t,s0)
 +/var/spool/voice	--	gen_context(system_u:object_r:getty_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.3.3/policy/modules/system/getty.te
---- nsaserefpolicy/policy/modules/system/getty.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/getty.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/getty.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.te	2006-08-02 15:33:08.000000000 -0400
 @@ -37,7 +37,7 @@
  #
  
@@ -2125,8 +2125,8 @@
  init_rw_utmp(getty_t)
  init_use_script_ptys(getty_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.3/policy/modules/system/hostname.te
---- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-08-02 15:33:08.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -2150,8 +2150,8 @@
 +')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hotplug.te serefpolicy-2.3.3/policy/modules/system/hotplug.te
---- nsaserefpolicy/policy/modules/system/hotplug.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/hotplug.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/hotplug.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hotplug.te	2006-08-02 15:33:08.000000000 -0400
 @@ -136,7 +136,7 @@
  	term_dontaudit_use_generic_ptys(hotplug_t)
  
@@ -2162,8 +2162,8 @@
  ')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.3/policy/modules/system/init.if
---- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/init.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/init.if	2006-08-02 15:33:08.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -2179,8 +2179,8 @@
  
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.3/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/libraries.fc	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/libraries.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -198,9 +198,9 @@
  # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame
  /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -2194,8 +2194,8 @@
  /usr/lib(64)?/xine/plugins/.*\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.3/policy/modules/system/locallogin.te
---- nsaserefpolicy/policy/modules/system/locallogin.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/locallogin.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/locallogin.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/locallogin.te	2006-08-02 15:33:08.000000000 -0400
 @@ -51,6 +51,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -2205,8 +2205,8 @@
  allow local_login_t local_login_lock_t:file create_file_perms;
  files_lock_filetrans(local_login_t,local_login_lock_t,file)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.3/policy/modules/system/logging.fc
---- nsaserefpolicy/policy/modules/system/logging.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.fc	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/logging.fc	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -2215,8 +2215,8 @@
 +/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.3/policy/modules/system/logging.if
---- nsaserefpolicy/policy/modules/system/logging.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/logging.if	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.if	2006-08-02 15:33:08.000000000 -0400
 @@ -165,6 +165,7 @@
  	')
  
@@ -2252,8 +2252,8 @@
  
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.3/policy/modules/system/logging.te
---- nsaserefpolicy/policy/modules/system/logging.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/logging.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-08-02 15:33:08.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -2287,8 +2287,8 @@
  ')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.3/policy/modules/system/lvm.te
---- nsaserefpolicy/policy/modules/system/lvm.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/lvm.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/lvm.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/lvm.te	2006-08-02 15:33:08.000000000 -0400
 @@ -125,7 +125,7 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
@@ -2307,8 +2307,8 @@
  fs_dontaudit_read_removable_files(lvm_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.3/policy/modules/system/mount.te
---- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/mount.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/mount.te	2006-08-02 15:33:08.000000000 -0400
 @@ -97,6 +97,8 @@
  
  sysnet_use_portmap(mount_t)
@@ -2319,8 +2319,8 @@
  
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-08-02 15:33:08.000000000 -0400
 @@ -258,6 +258,8 @@
  allow newrole_t { selinux_config_t default_context_t }:file r_file_perms;
  allow newrole_t { selinux_config_t default_context_t }:lnk_file r_file_perms;
@@ -2417,8 +2417,8 @@
  	nscd_socket_use(semanage_t)
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.3/policy/modules/system/setrans.te
---- nsaserefpolicy/policy/modules/system/setrans.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/setrans.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/setrans.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/setrans.te	2006-08-02 15:33:08.000000000 -0400
 @@ -68,3 +68,8 @@
  miscfiles_read_localization(setrans_t)
  
@@ -2429,8 +2429,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.3.3/policy/modules/system/sysnetwork.te
---- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/sysnetwork.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/sysnetwork.te	2006-08-02 15:33:08.000000000 -0400
 @@ -277,6 +277,7 @@
  # for /sbin/ip
  allow ifconfig_t self:packet_socket create_socket_perms;
@@ -2440,8 +2440,8 @@
  files_read_etc_files(ifconfig_t);
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.3/policy/modules/system/udev.te
---- nsaserefpolicy/policy/modules/system/udev.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/udev.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/udev.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/udev.te	2006-08-02 15:33:08.000000000 -0400
 @@ -39,9 +39,9 @@
  # Local policy
  #
@@ -2455,8 +2455,8 @@
  allow udev_t self:fd use;
  allow udev_t self:fifo_file rw_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.3/policy/modules/system/unconfined.fc
---- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.fc	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.fc	2006-08-02 15:33:08.000000000 -0400
 @@ -9,4 +9,5 @@
  /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -2464,8 +2464,8 @@
 +/usr/bin/xine		 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.3/policy/modules/system/unconfined.if
---- nsaserefpolicy/policy/modules/system/unconfined.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-08-02 15:33:08.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -2489,8 +2489,8 @@
  	')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.3/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-08-02 15:33:08.000000000 -0400
 @@ -56,10 +56,6 @@
  	')
  
@@ -2524,8 +2524,8 @@
 +	')
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.3/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-08-02 15:33:08.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -2900,8 +2900,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.3/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-08-02 15:33:08.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -3011,8 +3011,8 @@
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.3/policy/modules/system/xen.if
---- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/xen.if	2006-08-01 17:09:48.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.if	2006-08-02 15:33:08.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -3056,8 +3056,15 @@
 +	dontaudit $1 xen_t:fd use;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.3/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-08-01 17:33:12.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-08-02 15:33:25.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+-policy_module(xen,1.0.7)
++policy_module(xen,1.0.8)
+ 
+ ########################################
+ #
 @@ -70,6 +70,8 @@
  
  allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
@@ -3067,6 +3074,15 @@
  # internal communication is often done using fifo and unix sockets.
  allow xend_t self:fifo_file rw_file_perms;
  allow xend_t self:unix_stream_socket create_stream_socket_perms;
+@@ -79,7 +81,7 @@
+ allow xend_t self:packet_socket create_socket_perms;
+ 
+ allow xend_t xen_image_t:dir r_dir_perms;
+-allow xend_t xen_image_t:file r_file_perms;
++allow xend_t xen_image_t:file rw_file_perms;
+ 
+ # pid file
+ allow xend_t xend_var_run_t:file manage_file_perms;
 @@ -130,6 +132,8 @@
  corenet_tcp_bind_soundd_port(xend_t)
  corenet_sendrecv_xen_server_packets(xend_t)
@@ -3084,8 +3100,10 @@
  
  storage_raw_read_fixed_disk(xend_t)
  
- term_dontaudit_getattr_all_user_ptys(xend_t)
- term_dontaudit_use_generic_ptys(xend_t)
+-term_dontaudit_getattr_all_user_ptys(xend_t)
+-term_dontaudit_use_generic_ptys(xend_t)
++term_getattr_all_user_ptys(xend_t)
++term_use_generic_ptys(xend_t)
 +term_use_ptmx(xend_t)
 +term_getattr_ptys_fs(xend_t)
  
@@ -3103,7 +3121,12 @@
  ')
  
  ########################################
-@@ -200,6 +208,7 @@
+@@ -196,10 +204,11 @@
+ kernel_read_xen_state(xenconsoled_t)
+ 
+ term_create_pty(xenconsoled_t,xen_devpts_t);
+-term_dontaudit_use_generic_ptys(xenconsoled_t)
++term_use_generic_ptys(xenconsoled_t)
  term_use_console(xenconsoled_t)
  
  init_use_fds(xenconsoled_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- selinux-policy.spec	1 Aug 2006 21:38:02 -0000	1.241
+++ selinux-policy.spec	2 Aug 2006 19:36:17 -0000	1.242
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 17
+Release: 18
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-18
+- yet more xen rules
+ 
 * Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-17
 - more xen rules
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:41:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:41:07 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.39,1.40
Message-ID: <200608021941.k72Jf7ng010391@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10357

Modified Files:
	kexec-tools.spec 
Log Message:
enabling makedumpfile in build


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kexec-tools.spec	2 Aug 2006 19:27:42 -0000	1.39
+++ kexec-tools.spec	2 Aug 2006 19:41:04 -0000	1.40
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 33%{dist}.1
+Release: 34%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -92,6 +92,7 @@
 %configure --sbindir=/sbin
 rm -f kexec-tools.spec.in
 make
+make -C makedumpfile
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -102,6 +103,7 @@
 install -m 755 kdump.init $RPM_BUILD_ROOT/etc/rc.d/init.d/kdump
 install -m 755 mkdumprd $RPM_BUILD_ROOT/sbin/mkdumprd
 install -m 755 kdump.conf $RPM_BUILD_ROOT/etc/kdump.conf
+install -m 755 makedumpfile/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -137,8 +139,11 @@
 %doc TODO
 
 %changelog
+* Wed Aug 02 2006 Neil Horman <nhorman at redhat.com> - 1.101-34%{dist}.1
+- enabling makedumpfile in build
+
 * Wed Aug 02 2006 Neil Horman <nhorman at redhat.com> - 1.101-33%{dist}.1
-- added makedumpconfig source to package
+- added makedumpfile source to package
 
 * Mon Jul 31 2006 Neil Horman <nhorman at redhat.com> - 1.101-32%{dist}.1
 - added et-dyn patch to allow loading of relocatable kernels



From fedora-cvs-commits at redhat.com  Wed Aug  2 19:56:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 15:56:23 -0400
Subject: rpms/gnome-themes/devel .cvsignore, 1.31, 1.32 gnome-themes.spec,
	1.63, 1.64 sources, 1.32, 1.33
Message-ID: <200608021956.k72JuN9c031088@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	12 Jul 2006 18:00:14 -0000	1.31
+++ .cvsignore	2 Aug 2006 19:56:20 -0000	1.32
@@ -5,3 +5,4 @@
 gnome-themes-2.15.2.tar.bz2
 gnome-themes-2.15.3.tar.bz2
 gnome-themes-2.15.4.tar.bz2
+gnome-themes-2.15.90.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gnome-themes.spec	12 Jul 2006 17:44:37 -0000	1.63
+++ gnome-themes.spec	2 Aug 2006 19:56:20 -0000	1.64
@@ -2,14 +2,13 @@
 
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.15.4
-Release: 1
+Version: 2.15.90
+Release: 1%{?dist}
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 Source: %{name}-%{version}.tar.bz2
 Source1: clearlooks-%{clearlooks_version}.tar.bz2
 Patch2: gnome-themes-2.15.4-clearlooks.patch
 Patch3: clearlooks-0.5-inherit-bluecurve.patch
-Patch4: gnome-themes-2.11.90-redmond.patch
 License: LGPL
 Group: User Interface/Desktops
 BuildArch: noarch
@@ -43,7 +42,6 @@
 mv clearlooks-%{clearlooks_version}/themes/Clearlooks-Olive gtk-themes
 mv clearlooks-%{clearlooks_version}/themes/Clearlooks-Quicksilver gtk-themes
 %patch2 -p1 -b .clearlooks
-#%patch4 -p1 -b .redmond
 
 %build
 autoconf
@@ -84,6 +82,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc5
+- Update to 2.15.90
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 - Drop the variant of the Clearlooks metacity theme


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	12 Jul 2006 18:00:14 -0000	1.32
+++ sources	2 Aug 2006 19:56:20 -0000	1.33
@@ -1,2 +1,2 @@
 451ef33d1bffa261c5cbe01182199f97  clearlooks-0.6.2.tar.bz2
-d402cd1acd3fc7b50b1ce4ea0e53f16a  gnome-themes-2.15.4.tar.bz2
+9ee69574d10a81215448f38a02e262e3  gnome-themes-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:02:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:02:47 -0400
Subject: rpms/xorg-x11-drv-i128/devel i128-1.2.0-1600sw-range-hack.patch,
	NONE, 1.1 xorg-x11-drv-i128.spec, 1.11, 1.12
Message-ID: <200608022002.k72K2lX6000322@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-i128.spec 
Added Files:
	i128-1.2.0-1600sw-range-hack.patch 
Log Message:
* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-3
- i128-1.2.0-1600sw-range-hack.patch: Attempt to force the sync ranges
  correctly when we detect a 1600SW panel but don't get EDID info from it.


i128-1.2.0-1600sw-range-hack.patch:
 i128_driver.c |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE i128-1.2.0-1600sw-range-hack.patch ---
--- xf86-video-i128-1.2.0/src/i128_driver.c.jx	2006-04-07 15:10:18.000000000 -0400
+++ xf86-video-i128-1.2.0/src/i128_driver.c	2006-08-02 15:52:33.000000000 -0400
@@ -1077,6 +1077,15 @@
              pI128->FlatPanel = TRUE;
     	     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
 			"Digital flat panel detected\n");
+	     if (!mon) {
+		 /* Since DDC can be unreliable, jam in known 1600SW ranges */
+		 pScrn->monitor->nHsync = 1;
+		 pScrn->monitor->hsync[0].lo = 30.0;
+		 pScrn->monitor->hsync[0].hi = 72.0;
+		 pScrn->monitor->nVrefresh = 1;
+		 pScrn->monitor->vrefresh[0].lo = 58;
+		 pScrn->monitor->vrefresh[0].hi = 62;
+	     }
           } else if (pI128->FlatPanel)
     	     xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
 			"Digital flat panel forced\n");


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-i128.spec	12 Jul 2006 08:59:16 -0000	1.11
+++ xorg-x11-drv-i128.spec	2 Aug 2006 20:02:32 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i128 video driver
 Name:      xorg-x11-drv-i128
 Version:   1.2.0
-Release:   2.1
+Release:   3
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -16,6 +16,8 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i128.xinf
 
+Patch0:	    i128-1.2.0-1600sw-range-hack.patch
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
@@ -29,6 +31,8 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p1 -b .1600sw-hack
+
 %build
 %configure --disable-static
 make
@@ -58,7 +62,11 @@
 %{_mandir}/man4/i128.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-3
+- i128-1.2.0-1600sw-range-hack.patch: Attempt to force the sync ranges
+  correctly when we detect a 1600SW panel but don't get EDID info from it.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.2.0-2.1
 - rebuild
 
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-2



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:33:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:33:07 -0400
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.6.1-no-dri-on-rn50.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.36, 1.37
Message-ID: <200608022033.k72KX7Uw024487@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.6.1-no-dri-on-rn50.patch 
Log Message:
* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-7.fc6
- Make sure DRI and Render accel are disabled on RN50.


radeon-6.6.1-no-dri-on-rn50.patch:
 radeon_driver.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE radeon-6.6.1-no-dri-on-rn50.patch ---
--- xf86-video-ati-6.6.1/src/radeon_driver.c.rn50-dri	2006-08-02 14:35:58.000000000 -0400
+++ xf86-video-ati-6.6.1/src/radeon_driver.c	2006-08-02 14:48:38.000000000 -0400
@@ -3015,6 +3015,12 @@
 #ifdef RENDER
     info->RenderAccel = xf86ReturnOptValBool (info->Options,
 					      OPTION_RENDER_ACCEL, TRUE);
+    if (info->Chipset == PCI_CHIP_RN50_515E ||
+	info->Chipset == PCI_CHIP_RN50_5969) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		   "Render acceleration not supported on RN50\n");
+	info->RenderAccel = FALSE;
+    }
 #endif
 
     return TRUE;
@@ -4510,6 +4516,13 @@
     if (info->IsSecondary)
         return FALSE;
 
+    if (info->Chipset == PCI_CHIP_RN50_515E ||
+	info->Chipset == PCI_CHIP_RN50_5969) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		   "Direct rendering not supported on RN50 or ES1000\n");
+	return FALSE;
+    }
+
     if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 		   "[dri] Acceleration disabled, not initializing the DRI\n");


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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-x11-drv-ati.spec	29 Jul 2006 19:48:21 -0000	1.36
+++ xorg-x11-drv-ati.spec	2 Aug 2006 20:32:55 -0000	1.37
@@ -24,8 +24,11 @@
 Source2:   r128.xinf
 Source3:   radeon.xinf
 
+# Radeon patches (0-99)
 Patch0:    radeon-6.6.1-dotclock-filter.patch
-# Rage 128 patches
+Patch1:    radeon-6.6.1-no-dri-on-rn50.patch
+
+# Rage 128 patches (100-199)
 Patch100:  r128-missing-xf86ForceHWCursor-symbol-bug168753.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
@@ -46,6 +49,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %patch0 -p1 -b .dotclock-filter
+%patch1 -p1 -b .rn50-dri
 %patch100 -p0 -b .r128-missing-xf86ForceHWCursor-symbol-bug168753
 
 %build
@@ -90,6 +94,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-7.fc6
+- Make sure DRI and Render accel are disabled on RN50.
+
 * Sat Jul 29 2006 Kristian H??gsberg <krh at redhat.com> 6.6.1-6.fc5.aiglx
 - Build for fc5 aiglx repo.
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:36:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:36:01 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.60, 1.61 firstboot.spec, 1.81,
	1.82 sources, 1.77, 1.78
Message-ID: <200608022036.k72Ka16H025142@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25101

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	28 Jul 2006 21:02:48 -0000	1.60
+++ .cvsignore	2 Aug 2006 20:35:59 -0000	1.61
@@ -32,3 +32,4 @@
 firstboot-1.4.15.tar.bz2
 firstboot-1.4.16.tar.bz2
 firstboot-1.4.17.tar.bz2
+firstboot-1.4.18.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- firstboot.spec	28 Jul 2006 21:02:48 -0000	1.81
+++ firstboot.spec	2 Aug 2006 20:35:59 -0000	1.82
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.17
+Version: 1.4.18
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Wed Aug 02 2006 Chris Lumens <clumens at redhat.com> 1.4.18-1
+- Remove ddc probe support that rhpxl no longer provides.
+
 * Fri Jul 28 2006 Chris Lumens <clumens at redhat.com> 1.4.17-1
 - Pick up new or_IN translation (#200210).
 - Use new rhpxl X startup code.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	28 Jul 2006 21:02:48 -0000	1.77
+++ sources	2 Aug 2006 20:35:59 -0000	1.78
@@ -1 +1 @@
-d3d2e287740ff4cc114e1f7b43709214  firstboot-1.4.17.tar.bz2
+df4995e88c3777ca0fc670565625cff2  firstboot-1.4.18.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:49:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:49:20 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2510,1.2511
Message-ID: <200608022049.k72KnKpM012041@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
try this again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2510
retrieving revision 1.2511
diff -u -r1.2510 -r1.2511
--- kernel-2.6.spec	2 Aug 2006 20:10:15 -0000	1.2510
+++ kernel-2.6.spec	2 Aug 2006 20:49:17 -0000	1.2511
@@ -1214,11 +1214,11 @@
     [ -z "$DevelLink" ] || ln -sf `basename $DevelDir` $RPM_BUILD_ROOT/$DevelLink
 
 	# Temporary fix for upstream "make prepare" bug.
-#	pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
-#	if [ -f Makefile ]; then
-#		make prepare
-#	fi
-#	popd > /dev/null
+	pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
+	if [ -f Makefile ]; then
+		make prepare
+	fi
+	popd > /dev/null
 }
 
 ###



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:53:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:53:39 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.216,
	1.217 policycoreutils.spec, 1.298, 1.299
Message-ID: <200608022053.k72Krd2I013749@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13706

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-3
- Fix audit2allow to handle reload of policy


policycoreutils-rhat.patch:
 audit2allow/audit2allow      |    2 
 audit2allow/avc.py           |    3 
 newrole/newrole.c            |    8 +
 po/fr.po                     |   54 ++++++---
 po/sv.po                     |  252 +++++++++++++++++++++++++++----------------
 po/ta.po                     |   34 ++---
 restorecond/restorecond.c    |    7 +
 restorecond/restorecond.init |    2 
 scripts/fixfiles             |    2 
 scripts/genhomedircon        |    2 
 semodule_deps/Makefile       |    1 
 11 files changed, 235 insertions(+), 132 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- policycoreutils-rhat.patch	2 Aug 2006 18:44:04 -0000	1.216
+++ policycoreutils-rhat.patch	2 Aug 2006 20:53:36 -0000	1.217
@@ -1,3 +1,28 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.22/audit2allow/audit2allow
+--- nsapolicycoreutils/audit2allow/audit2allow	2006-08-01 09:47:23.000000000 -0400
++++ policycoreutils-1.30.22/audit2allow/audit2allow	2006-08-02 16:50:29.000000000 -0400
+@@ -176,7 +176,7 @@
+ 			sys.exit(0)
+ 
+ 		if auditlogs and os.path.exists("/var/log/audit/audit.log"):
+-			inputfd = os.popen("ausearch -m avc")
++			inputfd = os.popen("ausearch -m avc,MAC_POLICY_LOAD")
+ 			serules.load(inputfd)
+ 
+ 		if buildPP:
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.22/audit2allow/avc.py
+--- nsapolicycoreutils/audit2allow/avc.py	2006-07-03 07:52:43.000000000 -0400
++++ policycoreutils-1.30.22/audit2allow/avc.py	2006-08-02 16:50:50.000000000 -0400
+@@ -352,6 +352,9 @@
+                             if i == "security_compute_sid:":
+                                 self.security_compute_sid(rec)
+                                 found = 1
++                            elif i == "type=MAC_POLICY_LOAD" and self.last_reload:
++                                self.initialize()
++                                break
+                             else:
+                                 dict.append(i)
+                     if found:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.22/newrole/newrole.c
 --- nsapolicycoreutils/newrole/newrole.c	2006-07-03 07:52:43.000000000 -0400
 +++ policycoreutils-1.30.22/newrole/newrole.c	2006-08-02 14:22:10.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- policycoreutils.spec	2 Aug 2006 18:44:04 -0000	1.298
+++ policycoreutils.spec	2 Aug 2006 20:53:36 -0000	1.299
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.22
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -119,6 +119,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-3
+- Fix audit2allow to handle reload of policy
+
 * Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-2
 - Stop restorecond init script when selinux is not enabled
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:55:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:55:21 -0400
Subject: rpms/kernel/devel linux-2.6-serial-460800.patch, NONE,
	1.1 kernel-2.6.spec, 1.2511, 1.2512
Message-ID: <200608022055.k72KtLMD014440@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-serial-460800.patch 
Log Message:
* Wed Aug  2 2006 Dave Jones <davej at redhat.com>
- Readd patch to allow 460800 baud on 16C950 UARTs.


linux-2.6-serial-460800.patch:
 8250.c |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-serial-460800.patch ---
http://marc.theaimsgroup.com/?l=linux-kernel&m=112687270832687&w=2
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
http://lkml.org/lkml/2006/8/2/208

--- linux-2.6.13-org/drivers/serial/8250.c	2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13/drivers/serial/8250.c	2005-09-16 12:18:14.000000000 +0200
@@ -7,6 +7,9 @@
  *
  *  Copyright (C) 2001 Russell King.
  *
+ *  2005/09/16: Enabled higher baud rates for 16C95x.
+ *		(Mathias Adam <a2 at adamis.de>)
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -1652,6 +1655,14 @@
 	else if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
 		 baud == (port->uartclk/8))
 		quot = 0x8002;
+	/*
+	 * For 16C950s UART_TCR is used in combination with divisor==1
+	 * to achieve baud rates up to baud_base*4.
+	 */
+	else if ((port->type == PORT_16C950) &&
+		 baud > (port->uartclk/16))
+		quot = 1;
+
 	else
 		quot = uart_get_divisor(port, baud);
 
@@ -1665,7 +1676,7 @@
 	struct uart_8250_port *up = (struct uart_8250_port *)port;
 	unsigned char cval, fcr = 0;
 	unsigned long flags;
-	unsigned int baud, quot;
+	unsigned int baud, quot, max_baud;
 
 	switch (termios->c_cflag & CSIZE) {
 	case CS5:
@@ -1697,7 +1708,8 @@
 	/*
 	 * Ask the core to calculate the divisor for us.
 	 */
-	baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+	max_baud = (up->port.type == PORT_16C950 ? port->uartclk/4 : port->uartclk/16);
+	baud = uart_get_baud_rate(port, termios, old, 0, max_baud); 
 	quot = serial8250_get_divisor(port, baud);
 
 	/*
@@ -1733,6 +1745,19 @@
 	 */
 	spin_lock_irqsave(&up->port.lock, flags);
 
+	/* 
+	 * 16C950 supports additional prescaler ratios between 1:16 and 1:4
+	 * thus increasing max baud rate to uartclk/4.
+	 */
+	if (up->port.type == PORT_16C950) {
+		if (baud == port->uartclk/4)
+			serial_icr_write(up, UART_TCR, 0x4);
+		else if (baud == port->uartclk/8)
+			serial_icr_write(up, UART_TCR, 0x8);
+		else
+			serial_icr_write(up, UART_TCR, 0);
+	}
+	
 	/*
 	 * Update the per-port timeout.
 	 */



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2511
retrieving revision 1.2512
diff -u -r1.2511 -r1.2512
--- kernel-2.6.spec	2 Aug 2006 20:49:17 -0000	1.2511
+++ kernel-2.6.spec	2 Aug 2006 20:55:18 -0000	1.2512
@@ -396,6 +396,7 @@
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-mm-suspend-improvements.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
+Patch1650: linux-2.6-serial-460800.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
@@ -917,6 +918,8 @@
 %patch1630 -p1
 # Enable autofs4 to return fail for revalidate during lookup
 %patch1640 -p1
+# Allow to use 480600 baud on 16C950 UARTs
+%patch1650 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
 # Only print migration info on SMP
@@ -1626,6 +1629,9 @@
 %endif
 
 %changelog
+* Wed Aug  2 2006 Dave Jones <davej at redhat.com>
+- Readd patch to allow 460800 baud on 16C950 UARTs.
+
 * Wed Aug  2 2006 Jeremy Katz <katzj at redhat.com> 
 - add necessary ia64 hv fixes (#201040)
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:57:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:57:00 -0400
Subject: rpms/kernel/FC-5 linux-2.6-serial-460800.patch, NONE,
	1.1 kernel-2.6.spec, 1.2165, 1.2166
Message-ID: <200608022057.k72Kv0rL015100@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-serial-460800.patch 
Log Message:
* Wed Aug  2 2006 Dave Jones <davej at redhat.com>
- Readd patch to allow 460800 baud on 16C950 UARTs


linux-2.6-serial-460800.patch:
 8250.c |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-serial-460800.patch ---
http://marc.theaimsgroup.com/?l=linux-kernel&m=112687270832687&w=2
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
http://lkml.org/lkml/2006/8/2/208

--- linux-2.6.13-org/drivers/serial/8250.c	2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13/drivers/serial/8250.c	2005-09-16 12:18:14.000000000 +0200
@@ -7,6 +7,9 @@
  *
  *  Copyright (C) 2001 Russell King.
  *
+ *  2005/09/16: Enabled higher baud rates for 16C95x.
+ *		(Mathias Adam <a2 at adamis.de>)
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -1652,6 +1655,14 @@
 	else if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
 		 baud == (port->uartclk/8))
 		quot = 0x8002;
+	/*
+	 * For 16C950s UART_TCR is used in combination with divisor==1
+	 * to achieve baud rates up to baud_base*4.
+	 */
+	else if ((port->type == PORT_16C950) &&
+		 baud > (port->uartclk/16))
+		quot = 1;
+
 	else
 		quot = uart_get_divisor(port, baud);
 
@@ -1665,7 +1676,7 @@
 	struct uart_8250_port *up = (struct uart_8250_port *)port;
 	unsigned char cval, fcr = 0;
 	unsigned long flags;
-	unsigned int baud, quot;
+	unsigned int baud, quot, max_baud;
 
 	switch (termios->c_cflag & CSIZE) {
 	case CS5:
@@ -1697,7 +1708,8 @@
 	/*
 	 * Ask the core to calculate the divisor for us.
 	 */
-	baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+	max_baud = (up->port.type == PORT_16C950 ? port->uartclk/4 : port->uartclk/16);
+	baud = uart_get_baud_rate(port, termios, old, 0, max_baud); 
 	quot = serial8250_get_divisor(port, baud);
 
 	/*
@@ -1733,6 +1745,19 @@
 	 */
 	spin_lock_irqsave(&up->port.lock, flags);
 
+	/* 
+	 * 16C950 supports additional prescaler ratios between 1:16 and 1:4
+	 * thus increasing max baud rate to uartclk/4.
+	 */
+	if (up->port.type == PORT_16C950) {
+		if (baud == port->uartclk/4)
+			serial_icr_write(up, UART_TCR, 0x4);
+		else if (baud == port->uartclk/8)
+			serial_icr_write(up, UART_TCR, 0x8);
+		else
+			serial_icr_write(up, UART_TCR, 0);
+	}
+	
 	/*
 	 * Update the per-port timeout.
 	 */



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2165
retrieving revision 1.2166
diff -u -r1.2165 -r1.2166
--- kernel-2.6.spec	29 Jul 2006 19:44:10 -0000	1.2165
+++ kernel-2.6.spec	2 Aug 2006 20:56:58 -0000	1.2166
@@ -347,6 +347,7 @@
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-radeon-backlight.patch
 Patch1640: linux-2.6-ide-tune-locking.patch
+Patch1650: linux-2.6-serial-460800.patch
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
@@ -900,6 +901,8 @@
 %patch1630 -p1
 # Fix IDE locking bug.
 %patch1640 -p1
+# Allow to use 480600 baud on 16C950 UARTs
+%patch1650 -p1
 #
 %patch1660 -p1
 # Use persistent allocation in softcursor
@@ -1550,6 +1553,9 @@
 %endif
 
 %changelog
+* Wed Aug  2 2006 Dave Jones <davej at redhat.com>
+- Readd patch to allow 460800 baud on 16C950 UARTs
+
 * Sat Jul 29 2006 Dave Jones <davej at redhat.com>
 - Silence noisy SCSI ioctl. (#200638)
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:57:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:57:23 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2166,
	1.2167 linux-2.6-vm-clear-unreclaimable.patch, 1.2, NONE
Message-ID: <200608022057.k72KvNLh015251@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-vm-clear-unreclaimable.patch 
Log Message:
drop


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2166
retrieving revision 1.2167
diff -u -r1.2166 -r1.2167
--- kernel-2.6.spec	2 Aug 2006 20:56:58 -0000	1.2166
+++ kernel-2.6.spec	2 Aug 2006 20:57:21 -0000	1.2167
@@ -374,7 +374,6 @@
 
 # VM bits.
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
-Patch2002: linux-2.6-vm-clear-unreclaimable.patch
 
 # Tweak some defaults.
 Patch2100: linux-2.6-defaults-max-symlinks.patch
@@ -945,8 +944,6 @@
 #
 # Silence GFP_ATOMIC failures.
 %patch2001 -p1
-# VM oom killer tweaks.
-%patch2002 -p1
 
 # Changes to upstream defaults.
 # Bump up the number of recursive symlinks.


--- linux-2.6-vm-clear-unreclaimable.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:58:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:58:05 -0400
Subject: rpms/at-spi/devel .cvsignore, 1.25,
	1.26 at-spi-1.7.9-corba-refs.patch, 1.1, 1.2 at-spi.spec, 1.48,
	1.49 sources, 1.25, 1.26
Message-ID: <200608022058.k72Kw5qT015537@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore at-spi-1.7.9-corba-refs.patch at-spi.spec sources 
Log Message:
1.7.10



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	12 Jul 2006 20:26:24 -0000	1.25
+++ .cvsignore	2 Aug 2006 20:58:02 -0000	1.26
@@ -1 +1 @@
-at-spi-1.7.9.tar.bz2
+at-spi-1.7.10.tar.bz2

at-spi-1.7.9-corba-refs.patch:
 util.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: at-spi-1.7.9-corba-refs.patch
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi-1.7.9-corba-refs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- at-spi-1.7.9-corba-refs.patch	28 Jul 2006 20:18:22 -0000	1.1
+++ at-spi-1.7.9-corba-refs.patch	2 Aug 2006 20:58:02 -0000	1.2
@@ -1,19 +1,3 @@
-Index: atk-bridge/bridge.c
-===================================================================
-RCS file: /cvs/gnome/at-spi/atk-bridge/bridge.c,v
-retrieving revision 1.93
-diff -u -p -r1.93 bridge.c
---- atk-bridge/bridge.c	14 Jun 2006 15:22:44 -0000	1.93
-+++ atk-bridge/bridge.c	28 Jul 2006 19:20:57 -0000
-@@ -696,7 +696,7 @@ spi_atk_emit_eventv (const GObject      
-   
-   g_free (e.type);
- 
--  if (e.any_data._release) CORBA_free (&e.any_data._value);
-+  if (e.any_data._release) CORBA_free (e.any_data._value);
-   
-   va_end (args);
- 
 Index: libspi/util.c
 ===================================================================
 RCS file: /cvs/gnome/at-spi/libspi/util.c,v


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- at-spi.spec	28 Jul 2006 20:18:22 -0000	1.48
+++ at-spi.spec	2 Aug 2006 20:58:02 -0000	1.49
@@ -6,8 +6,8 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.7.9
-Release: 3
+Version: 1.7.10
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 Patch1: at-spi-1.7.9-corba-refs.patch
@@ -97,6 +97,9 @@
 %{_includedir}/* 
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.10-1.fc6
+- Update to 1.7.10
+
 * Fri Jul 28 2006 Alexander Larsson <alexl at redhat.com> - 1.7.9-3
 - Fix segfault if a11y enabled on x86-64 (#196063)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	12 Jul 2006 20:26:24 -0000	1.25
+++ sources	2 Aug 2006 20:58:02 -0000	1.26
@@ -1 +1 @@
-04e88cfd462861f12ed2d11da3279d31  at-spi-1.7.9.tar.bz2
+4d233cbccb69865c07358d04e97d86cf  at-spi-1.7.10.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:58:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:58:22 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2167,
	1.2168 linux-2.6-x86-hp-reboot.patch, 1.1, NONE
Message-ID: <200608022058.k72KwMbF015686@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-x86-hp-reboot.patch 
Log Message:
already applied


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2167
retrieving revision 1.2168
diff -u -r1.2167 -r1.2168
--- kernel-2.6.spec	2 Aug 2006 20:57:21 -0000	1.2167
+++ kernel-2.6.spec	2 Aug 2006 20:58:20 -0000	1.2168
@@ -243,7 +243,6 @@
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch204: linux-2.6-edid-check.patch
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
-Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86-cpu_index-false.patch
 Patch208: linux-2.6-x86_64-noisy-syscalls.patch
 Patch210: linux-2.6-x86-alternatives-smp-only.patch
@@ -710,8 +709,6 @@
 %patch204 -p1
 # Workaround BIOSes that don't list CPU0
 %patch205 -p1
-# Reboot through BIOS on HP systems,.
-%patch206 -p1
 # cpu_index >= NR_CPUS becomming always false.
 %patch207 -p1
 # Hush noisy unimplemented 32bit syscalls


--- linux-2.6-x86-hp-reboot.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:58:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:58:50 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2168,
	1.2169 linux-2.6-serial-resume.patch, 1.1, NONE
Message-ID: <200608022058.k72KwoUq015899@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-serial-resume.patch 
Log Message:
does squat


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2168
retrieving revision 1.2169
diff -u -r1.2168 -r1.2169
--- kernel-2.6.spec	2 Aug 2006 20:58:20 -0000	1.2168
+++ kernel-2.6.spec	2 Aug 2006 20:58:47 -0000	1.2169
@@ -356,7 +356,6 @@
 Patch1720: linux-2.6-proc-self-maps-fix.patch
 Patch1730: linux-2.6-ac97_unregister_controls_ad18xx.patch
 Patch1740: linux-2.6-softlockup-disable.patch
-Patch1750: linux-2.6-serial-resume.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
 Patch1790: linux-2.6-console-suspend.patch
@@ -917,8 +916,6 @@
 %patch1730 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
-# serial/tty resume fixing.
-%patch1750 -p1
 # Fix up kmalloc whilst atomic warning during resume.
 %patch1760 -p1
 # Speed up spinlock debug.


--- linux-2.6-serial-resume.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:59:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:59:30 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2169,
	1.2170 linux-2.6-usb-unusual-devices.patch, 1.1, NONE
Message-ID: <200608022059.k72KxUA5016184@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-usb-unusual-devices.patch 
Log Message:
already applied


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2169
retrieving revision 1.2170
diff -u -r1.2169 -r1.2170
--- kernel-2.6.spec	2 Aug 2006 20:58:47 -0000	1.2169
+++ kernel-2.6.spec	2 Aug 2006 20:59:28 -0000	1.2170
@@ -349,7 +349,6 @@
 Patch1650: linux-2.6-serial-460800.patch
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
-Patch1680: linux-2.6-usb-unusual-devices.patch
 Patch1690: linux-2.6-autofs-invalidate.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
@@ -902,8 +901,6 @@
 %patch1660 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
-# Add some USB devices to the unusual quirk list.
-%patch1680 -p1
 # autofs4 - need to invalidate children on tree mount expire
 %patch1690 -p1
 # Silence debug messages in w1


--- linux-2.6-usb-unusual-devices.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 20:59:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 16:59:54 -0400
Subject: rpms/libdhcp/devel .cvsignore, 1.11, 1.12 libdhcp.spec, 1.30,
	1.31 sources, 1.23, 1.24
Message-ID: <200608022059.k72KxslG016389@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16338

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Jul 2006 18:27:15 -0000	1.11
+++ .cvsignore	2 Aug 2006 20:59:51 -0000	1.12
@@ -1 +1 @@
-libdhcp-1.9.tar.gz
+libdhcp-1.10.tar.gz


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libdhcp.spec	13 Jul 2006 18:27:15 -0000	1.30
+++ libdhcp.spec	2 Aug 2006 20:59:51 -0000	1.31
@@ -1,13 +1,13 @@
-Summary: 	A library for network interface configuration with DHCP
-Name: 		libdhcp
-Version: 	1.9
-Release: 	1
-License: 	GPL
-Group: 		Development/Libraries
-URL: 		http://people.redhat.com/~jvdias/libdhcp-1.0.tar.gz
-Source0: 	%{name}-%{version}.tar.gz
+Summary:    A library for network interface configuration with DHCP
+Name:       libdhcp
+Version:    1.10
+Release:    1
+License:    GPL
+Group:      Development/Libraries
+URL:        http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.gz
+Source0:    %{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  dhcp-devel, libdhcp4client-devel >= 12:3.0.4-17
+BuildRequires: dhcp-devel, libdhcp4client-devel >= 12:3.0.4-17
 BuildRequires:	libdhcp6client-devel, libnl-devel, pkgconfig, doxygen
 
 %description
@@ -20,10 +20,10 @@
 network parameter autoconfiguration with DHCP.
 
 %package devel
-Summary:	C header files for development with libdhcp.
-Group: 		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	libdhcp4client-devel, libdhcp6client-devel, libnl-devel
+Summary:	 C header files for development with libdhcp.
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: libdhcp4client-devel, libdhcp6client-devel, libnl-devel
 
 %description devel
 C header files for development with libdhcp.
@@ -76,6 +76,13 @@
 %{pkgcfgdir}/libdhcp.pc
 
 %changelog
+* Wed Aug 02 2006 David Cantrell <dcantrell at redhat.com> - 1.10-1
+- Make the README file a little more readable
+- Set char pointers to NULL after free() in dhcpv4_control_free()
+- In dhcp4_nic_callback(), set state string for DHC_TIMEDOUT
+- In dhcp6_nic_callback(), set state string for DHC_TIMEDOUT
+- Don't free null pointers in dhcp_nic_va()
+
 * Thu Jul 13 2006 David Cantrell <dcantrell at redhat.com> - 1.9-1
 - Added IP_STRLEN() macro to ip_addr.h
 - In pumpSetupInterface(), removed return_ok, make close/free calls as


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Jul 2006 18:27:15 -0000	1.23
+++ sources	2 Aug 2006 20:59:51 -0000	1.24
@@ -1 +1 @@
-1dc1bfbdd2e40462360a083f70226070  libdhcp-1.9.tar.gz
+65180634359358b39964a796960ff993  libdhcp-1.10.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug  2 21:00:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 17:00:21 -0400
Subject: rpms/kernel/FC-5 linux-2.6-softcursor-persistent-alloc.patch, 1.1,
	1.2
Message-ID: <200608022100.k72L0L9F016531@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-softcursor-persistent-alloc.patch 
Log Message:
update

linux-2.6-softcursor-persistent-alloc.patch:
 softcursor.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

Index: linux-2.6-softcursor-persistent-alloc.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-softcursor-persistent-alloc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-softcursor-persistent-alloc.patch	28 Dec 2005 23:48:23 -0000	1.1
+++ linux-2.6-softcursor-persistent-alloc.patch	2 Aug 2006 21:00:02 -0000	1.2
@@ -7,11 +7,11 @@
 -	u8 *dst, *src;
 +	u8 *dst;
 +	static u8 *src=NULL;
-+	static int allocsize=0;
++	static int allocsize = 0;
  
  	if (info->state != FBINFO_STATE_RUNNING)
  		return 0;
-@@ -31,9 +33,15 @@ int soft_cursor(struct fb_info *info, st
+@@ -31,9 +33,17 @@ int soft_cursor(struct fb_info *info, st
  	s_pitch = (cursor->image.width + 7) >> 3;
  	dsize = s_pitch * cursor->image.height;
  
@@ -24,8 +24,10 @@
 +		allocsize = dsize + sizeof(struct fb_image);
 +
 +		src = kmalloc(allocsize, GFP_ATOMIC);
-+		if (!src)
++		if (!src) {
++			allocsize = 0;
 +			return -ENOMEM;
++		}
 +	}
  
  	image = (struct fb_image *) (src + dsize);



From fedora-cvs-commits at redhat.com  Wed Aug  2 21:05:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 17:05:45 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.113, 1.114 libselinux.spec,
	1.214, 1.215 sources, 1.115, 1.116
Message-ID: <200608022105.k72L5jS8017014@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Tue Aug  1 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.20-1
- Upgrade to latest from NSA
	* Merged context_*_set errno patch from Jim Meyering.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- .cvsignore	5 Jul 2006 10:42:47 -0000	1.113
+++ .cvsignore	2 Aug 2006 21:05:39 -0000	1.114
@@ -88,3 +88,4 @@
 libselinux-1.30.12.tgz
 libselinux-1.30.15.tgz
 libselinux-1.30.19.tgz
+libselinux-1.30.20.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- libselinux.spec	1 Aug 2006 18:38:57 -0000	1.214
+++ libselinux.spec	2 Aug 2006 21:05:42 -0000	1.215
@@ -1,8 +1,8 @@
-%define libsepolver 1.12.19-1
+%define libsepolver 1.12.21-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.19
-Release: 5
+Version: 1.30.20
+Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -117,6 +117,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue Aug  1 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.20-1
+- Upgrade to latest from NSA
+	* Merged context_*_set errno patch from Jim Meyering.
+
 * Tue Aug  1 2006 Jeremy Katz <katzj at redhat.com> - 1.30.19-5
 - only build non-fpic objects with -mno-tls-direct-seg-refs
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- sources	5 Jul 2006 10:42:47 -0000	1.115
+++ sources	2 Aug 2006 21:05:42 -0000	1.116
@@ -1 +1 @@
-dfc39b26d6c61e725bba2cbeae67414a  libselinux-1.30.19.tgz
+5ccb52638b39f60b3f2d02d73d5fba5b  libselinux-1.30.20.tgz



From fedora-cvs-commits at redhat.com  Wed Aug  2 21:06:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 17:06:27 -0400
Subject: rpms/kernel/devel linux-2.6-scsi-advansys-pcitable.patch,1.3,1.4
Message-ID: <200608022106.k72L6RV4017159@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-scsi-advansys-pcitable.patch 
Log Message:
patch consolidation

linux-2.6-scsi-advansys-pcitable.patch:
 advansys.c |   90 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 49 insertions(+), 41 deletions(-)

Index: linux-2.6-scsi-advansys-pcitable.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-scsi-advansys-pcitable.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-scsi-advansys-pcitable.patch	1 Aug 2006 17:48:21 -0000	1.3
+++ linux-2.6-scsi-advansys-pcitable.patch	2 Aug 2006 21:06:24 -0000	1.4
@@ -14,6 +14,21 @@
  #define ASC_PCI_REVISION_3150             0x02
  #define ASC_PCI_REVISION_3050             0x03
  
+@@ -895,6 +895,14 @@ typedef unsigned char uchar;
+ #define  ASC_DVCLIB_CALL_FAILED   (0)
+ #define  ASC_DVCLIB_CALL_ERROR    (-1)
+ 
++#define PCI_VENDOR_ID_ASP		0x10cd
++#define PCI_DEVICE_ID_ASP_1200A		0x1100
++#define PCI_DEVICE_ID_ASP_ABP940	0x1200
++#define PCI_DEVICE_ID_ASP_ABP940U	0x1300
++#define PCI_DEVICE_ID_ASP_ABP940UW	0x2300
++#define PCI_DEVICE_ID_38C0800_REV1	0x2500
++#define PCI_DEVICE_ID_38C1600_REV1	0x2700
++
+ /*
+  * Enable CC_VERY_LONG_SG_LIST to support up to 64K element SG lists.
+  * The SRB structure will have to be changed and the ASC_SRB2SCSIQ()
 @@ -1493,8 +1489,6 @@ typedef struct asc_dvc_cfg {
  #define ASC_INIT_STATE_END_INQUIRY   0x0080
  #define ASC_INIT_RESET_SCSI_DONE     0x0100
@@ -169,25 +184,6 @@
      0,                          /* 62 reserved */
 
 
---- linux-2.6.17.noarch/drivers/scsi/advansys.c~	2006-08-01 13:33:56.000000000 -0400
-+++ linux-2.6.17.noarch/drivers/scsi/advansys.c	2006-08-01 13:34:58.000000000 -0400
-@@ -895,6 +895,14 @@ typedef unsigned char uchar;
- #define  ASC_DVCLIB_CALL_FAILED   (0)
- #define  ASC_DVCLIB_CALL_ERROR    (-1)
- 
-+#define PCI_VENDOR_ID_ASP		0x10cd
-+#define PCI_DEVICE_ID_ASP_1200A		0x1100
-+#define PCI_DEVICE_ID_ASP_ABP940	0x1200
-+#define PCI_DEVICE_ID_ASP_ABP940U	0x1300
-+#define PCI_DEVICE_ID_ASP_ABP940UW	0x2300
-+#define PCI_DEVICE_ID_38C0800_REV1	0x2500
-+#define PCI_DEVICE_ID_38C1600_REV1	0x2700
-+
- /*
-  * Enable CC_VERY_LONG_SG_LIST to support up to 64K element SG lists.
-  * The SRB structure will have to be changed and the ASC_SRB2SCSIQ()
-
-
 
 The advansys driver needs a lot of TLC. It does all its probing
 for devices in a prehistoric way.  This patch at least allows



From fedora-cvs-commits at redhat.com  Wed Aug  2 21:09:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 17:09:47 -0400
Subject: rpms/kernel/devel linux-2.6-softcursor-persistent-alloc.patch, 1.2,
	1.3
Message-ID: <200608022109.k72L9lSX017912@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-softcursor-persistent-alloc.patch 
Log Message:
take upstream patch instead

linux-2.6-softcursor-persistent-alloc.patch:
 fbcon.c      |    3 +++
 fbcon.h      |    2 ++
 softcursor.c |   31 +++++++++++++++++++++----------
 3 files changed, 26 insertions(+), 10 deletions(-)

Index: linux-2.6-softcursor-persistent-alloc.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softcursor-persistent-alloc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-softcursor-persistent-alloc.patch	1 Aug 2006 23:16:41 -0000	1.2
+++ linux-2.6-softcursor-persistent-alloc.patch	2 Aug 2006 21:09:33 -0000	1.3
@@ -1,39 +1,122 @@
---- linux-2.6.14/drivers/video/console/softcursor.c~	2005-12-28 18:40:08.000000000 -0500
-+++ linux-2.6.14/drivers/video/console/softcursor.c	2005-12-28 18:45:50.000000000 -0500
-@@ -23,7 +23,9 @@ int soft_cursor(struct fb_info *info, st
+
+From: Dave Jones <davej at redhat.com>
+
+Every time the console cursor blinks, we do a kmalloc/kfree pair.
+This patch turns that into a single allocation.
+
+This allocation was the most frequent kmalloc I saw on my test box.
+
+[adaplas]
+Per Alan's suggestion, move global variables to fbcon's private structure.
+This would also avoid resource leaks when fbcon is unloaded.
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+Acked-by: Alan Cox <alan at redhat.com>
+Signed-off-by: Antonino Daplas <adaplas at pol.net>
+---
+
+Oops, I used u8 for cursor_size.
+
+Tony
+
+ drivers/video/console/fbcon.c      |    3 +++
+ drivers/video/console/fbcon.h      |    2 ++
+ drivers/video/console/softcursor.c |   31 +++++++++++++++++++++----------
+ 3 files changed, 26 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
+index 390439b..6165fd9 100644
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
+@@ -3225,7 +3225,10 @@ #endif
+ 			module_put(info->fbops->owner);
+ 
+ 			if (info->fbcon_par) {
++				struct fbcon_ops *ops = info->fbcon_par;
++
+ 				fbcon_del_cursor_timer(info);
++				kfree(ops->cursor_src);
+ 				kfree(info->fbcon_par);
+ 				info->fbcon_par = NULL;
+ 			}
+diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
+index f244ad0..b9386d1 100644
+--- a/drivers/video/console/fbcon.h
++++ b/drivers/video/console/fbcon.h
+@@ -80,6 +80,8 @@ struct fbcon_ops {
+ 	char  *cursor_data;
+ 	u8    *fontbuffer;
+ 	u8    *fontdata;
++	u8    *cursor_src;
++	u32    cursor_size;
+ 	u32    fd_size;
+ };
+     /*
+diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c
+index 557c563..7d07d83 100644
+--- a/drivers/video/console/softcursor.c
++++ b/drivers/video/console/softcursor.c
+@@ -20,11 +20,12 @@ #include "fbcon.h"
+ 
+ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
+ {
++	struct fbcon_ops *ops = info->fbcon_par;
+ 	unsigned int scan_align = info->pixmap.scan_align - 1;
  	unsigned int buf_align = info->pixmap.buf_align - 1;
  	unsigned int i, size, dsize, s_pitch, d_pitch;
  	struct fb_image *image;
 -	u8 *dst, *src;
 +	u8 *dst;
-+	static u8 *src=NULL;
-+	static int allocsize = 0;
  
  	if (info->state != FBINFO_STATE_RUNNING)
  		return 0;
-@@ -31,9 +33,17 @@ int soft_cursor(struct fb_info *info, st
+@@ -32,11 +33,19 @@ int soft_cursor(struct fb_info *info, st
  	s_pitch = (cursor->image.width + 7) >> 3;
  	dsize = s_pitch * cursor->image.height;
  
 -	src = kmalloc(dsize + sizeof(struct fb_image), GFP_ATOMIC);
 -	if (!src)
 -		return -ENOMEM;
-+	if (dsize + sizeof(struct fb_image) != allocsize) {
-+		if (src != NULL)
-+			kfree(src);
-+		allocsize = dsize + sizeof(struct fb_image);
-+
-+		src = kmalloc(allocsize, GFP_ATOMIC);
-+		if (!src) {
-+			allocsize = 0;
++	if (dsize + sizeof(struct fb_image) != ops->cursor_size) {
++		if (ops->cursor_src != NULL)
++			kfree(ops->cursor_src);
++		ops->cursor_size = dsize + sizeof(struct fb_image);
+ 
+-	image = (struct fb_image *) (src + dsize);
++		ops->cursor_src = kmalloc(ops->cursor_size, GFP_ATOMIC);
++		if (!ops->cursor_src) {
++			ops->cursor_size = 0;
 +			return -ENOMEM;
 +		}
 +	}
- 
- 	image = (struct fb_image *) (src + dsize);
++
++	image = (struct fb_image *) (ops->cursor_src + dsize);
  	*image = cursor->image;
-@@ -61,7 +69,6 @@ int soft_cursor(struct fb_info *info, st
- 	fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height);
+ 	d_pitch = (s_pitch + scan_align) & ~scan_align;
+ 
+@@ -48,21 +57,23 @@ int soft_cursor(struct fb_info *info, st
+ 		switch (cursor->rop) {
+ 		case ROP_XOR:
+ 			for (i = 0; i < dsize; i++)
+-				src[i] = image->data[i] ^ cursor->mask[i];
++				ops->cursor_src[i] = image->data[i] ^
++					cursor->mask[i];
+ 			break;
+ 		case ROP_COPY:
+ 		default:
+ 			for (i = 0; i < dsize; i++)
+-				src[i] = image->data[i] & cursor->mask[i];
++				ops->cursor_src[i] = image->data[i] &
++					cursor->mask[i];
+ 			break;
+ 		}
+ 	} else
+-		memcpy(src, image->data, dsize);
++		memcpy(ops->cursor_src, image->data, dsize);
+ 
+-	fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height);
++	fb_pad_aligned_buffer(dst, d_pitch, ops->cursor_src, s_pitch,
++			      image->height);
  	image->data = dst;
  	info->fbops->fb_imageblit(info, image);
 -	kfree(src);



From fedora-cvs-commits at redhat.com  Wed Aug  2 21:11:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 17:11:43 -0400
Subject: rpms/ORBit2/devel .cvsignore, 1.17, 1.18 ORBit2.spec, 1.41,
	1.42 sources, 1.17, 1.18
Message-ID: <200608022111.k72LBhw4018249@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ORBit2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18116

Modified Files:
	.cvsignore ORBit2.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	14 Mar 2006 21:06:05 -0000	1.17
+++ .cvsignore	2 Aug 2006 21:11:40 -0000	1.18
@@ -1 +1 @@
-ORBit2-2.14.0.tar.bz2
+ORBit2-2.14.2.tar.bz2


Index: ORBit2.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ORBit2.spec	12 Jul 2006 07:36:40 -0000	1.41
+++ ORBit2.spec	2 Aug 2006 21:11:40 -0000	1.42
@@ -3,8 +3,8 @@
 
 Summary: A high-performance CORBA Object Request Broker.
 Name: ORBit2
-Version: 2.14.0
-Release: 3.1
+Version: 2.14.2
+Release: 1%{?dist}
 Source: %{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPL/GPL
@@ -123,6 +123,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc6
+- Update to 2.14.2
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	14 Mar 2006 21:06:05 -0000	1.17
+++ sources	2 Aug 2006 21:11:40 -0000	1.18
@@ -1 +1 @@
-bb1b4859522cb6e1a3a3dc4b7397db64  ORBit2-2.14.0.tar.bz2
+88ea9b8e686ab0dd27b4199e0f41ac84  ORBit2-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 21:18:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 17:18:22 -0400
Subject: rpms/gcc/devel .cvsignore, 1.162, 1.163 gcc41-pr20297-test.patch,
	1.3, 1.4 gcc41.spec, 1.88, 1.89 sources, 1.164,
	1.165 gcc41-java-backport-class-loader.patch, 1.1,
	NONE gcc41-java-backport-gcjplugin.patch, 1.1,
	NONE gcc41-java-backport.patch.bz2, 1.1,
	NONE gcc41-java-backport2.patch, 1.3,
	NONE gcc41-java-plugins.patch, 1.1, NONE
Message-ID: <200608022118.k72LIM1H030276@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc41-pr20297-test.patch gcc41.spec sources 
Removed Files:
	gcc41-java-backport-class-loader.patch 
	gcc41-java-backport-gcjplugin.patch 
	gcc41-java-backport.patch.bz2 gcc41-java-backport2.patch 
	gcc41-java-plugins.patch 
Log Message:
4.1.1-14


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- .cvsignore	21 Jul 2006 15:26:08 -0000	1.162
+++ .cvsignore	2 Aug 2006 21:18:16 -0000	1.163
@@ -1 +1 @@
-gcc-4.1.1-20060721.tar.bz2
+gcc-4.1.1-20060802.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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcc41-pr20297-test.patch	6 Apr 2006 16:56:54 -0000	1.3
+++ gcc41-pr20297-test.patch	2 Aug 2006 21:18:17 -0000	1.4
@@ -22,7 +22,7 @@
 -extern void* memcpy (void *, const void *, __SIZE_TYPE__);
 -#pragma GCC visibility pop
 -
--struct a { int a[10]; };
+-struct a { int a[1024]; };
 -
 -extern void *bar (struct a *, struct a *, int);
 -
@@ -50,7 +50,7 @@
 +extern void* memcpy (void *, const void *, __SIZE_TYPE__);
 +#pragma GCC visibility pop
 +
-+struct a { int a[10]; };
++struct a { int a[1024]; };
 +
 +extern void *bar (struct a *, struct a *, int);
 +


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gcc41.spec	25 Jul 2006 18:27:23 -0000	1.88
+++ gcc41.spec	2 Aug 2006 21:18:17 -0000	1.89
@@ -1,6 +1,6 @@
-%define DATE 20060721
+%define DATE 20060802
 %define gcc_version 4.1.1
-%define gcc_release 13
+%define gcc_release 14
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -105,7 +105,6 @@
 Prereq: /sbin/install-info
 AutoReq: true
 
-Patch0: gcc41-java-backport.patch.bz2
 Patch1: gcc41-ice-hack.patch
 Patch2: gcc41-ppc64-m32-m64-multilib-only.patch
 Patch3: gcc41-ia64-libunwind.patch
@@ -136,11 +135,7 @@
 Patch28: gcc41-pr28407.patch
 Patch29: gcc41-power6.patch
 Patch30: gcc41-CVE-2006-3619.patch
-Patch31: gcc41-java-backport2.patch
-Patch32: gcc41-java-libdotdotlib.patch
-Patch33: gcc41-java-plugins.patch
-Patch34: gcc41-java-backport-gcjplugin.patch
-Patch35: gcc41-java-backport-class-loader.patch
+Patch31: gcc41-java-libdotdotlib.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -325,7 +320,7 @@
 Requires: glib2 >= 2.4.0
 BuildRequires: glib2-devel >= 2.4.0
 Requires: libart_lgpl >= 2.1.0
-BuildRequires: mozilla-devel
+BuildRequires: firefox-devel
 BuildRequires: libart_lgpl-devel >= 2.1.0
 BuildRequires: alsa-lib-devel
 BuildRequires: libXtst-devel
@@ -422,7 +417,6 @@
 
 %prep
 %setup -q -n gcc-%{version}-%{DATE}
-%patch0 -p0 -E -b .java-backport~
 %patch1 -p0 -b .ice-hack~
 %patch2 -p0 -b .ppc64-m32-m64-multilib-only~
 %patch3 -p0 -b .ia64-libunwind~
@@ -453,11 +447,7 @@
 %patch28 -p0 -b .pr28407~
 %patch29 -p0 -b .power6~
 %patch30 -p0 -b .CVE-2006-3619~
-%patch31 -p0 -b .java-backport2~
-%patch32 -p0 -b .java-libdotdotlib~
-%patch33 -p0 -b .java-plugins~
-%patch34 -p0 -b .java-gcjplugin~
-%patch35 -p0 -b .java-class-loader~
+%patch31 -p0 -b .java-libdotdotlib~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1520,12 +1510,23 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Aug  2 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-14
+- update from gcc-4_1-branch (-r115644:115877)
+  - PRs c++/27572, c++/27668, c++/27962, c++/28025, c++/28258, c++/28523,
+	debug/25468, fortran/20892, fortran/27874, fortran/28129,
+	fortran/28439, libgfortran/28335, libgfortran/28339,
+	middle-end/28402, middle-end/28403, middle-end/28473,
+	target/27287, target/28247, tree-optimization/26719,
+	tree-optimization/27639, tree-optimization/27795,
+	tree-optimization/28029, tree-optimization/28238
+- BuildRequire firefox-devel instead of mozilla-devel
+
 * Tue Jul 25 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13
-- Backport fix by Andrew Haley for build problems related with the
-bootstrap ClassLoader.
+- backport fix by Andrew Haley for build problems related with the
+  bootstrap ClassLoader
 
 * Mon Jul 24 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-12
-- Backport fix by Mark Wielaard for NullPointerException in GCJ web plugin.
+- backport fix by Mark Wielaard for NullPointerException in GCJ web plugin
 
 * Fri Jul 21 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-11
 - update from gcc-4_1-branch (-r115565:115644)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- sources	21 Jul 2006 15:26:08 -0000	1.164
+++ sources	2 Aug 2006 21:18:18 -0000	1.165
@@ -1 +1 @@
-e5945134c55627b8e8d40d02966607df  gcc-4.1.1-20060721.tar.bz2
+bea3fb5e55d9510ad89e03d521fe5744  gcc-4.1.1-20060802.tar.bz2


--- gcc41-java-backport-class-loader.patch DELETED ---


--- gcc41-java-backport-gcjplugin.patch DELETED ---


--- gcc41-java-backport.patch.bz2 DELETED ---


--- gcc41-java-backport2.patch DELETED ---


--- gcc41-java-plugins.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  2 21:22:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 17:22:51 -0400
Subject: rpms/libIDL/devel .cvsignore, 1.8, 1.9 libIDL.spec, 1.24,
	1.25 sources, 1.8, 1.9
Message-ID: <200608022122.k72LMpI4003670@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libIDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3618

Modified Files:
	.cvsignore libIDL.spec sources 
Log Message:
0.8.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libIDL/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Sep 2005 19:41:14 -0000	1.8
+++ .cvsignore	2 Aug 2006 21:22:49 -0000	1.9
@@ -1,3 +1 @@
-libIDL-0.8.4.tar.bz2
-libIDL-0.8.5.tar.bz2
-libIDL-0.8.6.tar.bz2
+libIDL-0.8.7.tar.bz2


Index: libIDL.spec
===================================================================
RCS file: /cvs/dist/rpms/libIDL/devel/libIDL.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libIDL.spec	12 Jul 2006 06:53:34 -0000	1.24
+++ libIDL.spec	2 Aug 2006 21:22:49 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Library for parsing IDL (Interface Definition Language)
 Name: libIDL
-Version: 0.8.6
-Release: 6.1
+Version: 0.8.7
+Release: 1%{?dist}
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/%{name}-%{version}.tar.bz2
 Patch0: libIDL-0.8.6-multilib.patch
 Group: System Environment/Libraries
@@ -75,6 +75,9 @@
 %{_infodir}/libIDL2.info.gz
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.7-1.fc6
+- Update to 0.8.7
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.6-6.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libIDL/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Sep 2005 19:41:14 -0000	1.8
+++ sources	2 Aug 2006 21:22:49 -0000	1.9
@@ -1 +1 @@
-2fde1aed5ea77d532f9e11442f761b81  libIDL-0.8.6.tar.bz2
+53a3874beb42ddfd9a5030047a0db740  libIDL-0.8.7.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 21:26:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 17:26:25 -0400
Subject: rpms/grub/devel grub-0.97-mpath.patch,NONE,1.1 grub.spec,1.45,1.46
Message-ID: <200608022126.k72LQP3E004834@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4774

Modified Files:
	grub.spec 
Added Files:
	grub-0.97-mpath.patch 
Log Message:
- update for multipath support


grub-0.97-mpath.patch:
 grub-install.in |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE grub-0.97-mpath.patch ---
--- grub-0.97/util/grub-install.in.mpath	2006-08-02 17:21:53.000000000 -0400
+++ grub-0.97/util/grub-install.in	2006-08-02 17:23:23.000000000 -0400
@@ -107,6 +107,7 @@
 				  -e 's%\(fd[0-9]*\)$%\1%' \
 				  -e 's%/part[0-9]*$%/disc%' \
 				  -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
+	  -e 's%\(/mapper/[[:alpha:]]\+[[:digit:]]\+\)p[[:digit:]]\+$%\1%' \
 	  -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
 	tmp_part=`echo "$1" | grep -v '/mapper/control$' |
 		grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
@@ -116,6 +117,7 @@
 				  -e 's%.*/floppy/[0-9]*$%%' \
 				  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
 				  -e 's%.*c[0-7]d[0-9]*p%%' \
+	  -e 's%.*/mapper/[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
 	  -e 's%.*/mapper/[[:alpha:]]\+_[[:alpha:]]\+\([[:digit:]]\+\)$%\1%' |
 		grep -v '.*/mapper/.*'`
 	;;


Index: grub.spec
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- grub.spec	12 Jul 2006 06:14:37 -0000	1.45
+++ grub.spec	2 Aug 2006 21:26:22 -0000	1.46
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 9.1
+Release: 10
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPL
@@ -104,6 +104,9 @@
 # fix error reporting
 Patch1149: grub-0.97-stderr.patch
 
+# fix grub-install to notice mpath partitions
+Patch1150: grub-0.97-mpath.patch
+
 ExclusiveArch: i386 x86_64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, texinfo
 BuildRequires: automake /usr/lib/crt1.o
@@ -181,6 +184,8 @@
 
 %patch1149 -p1 -b .stderr
 
+%patch1150 -p1 -b .mpath
+
 %build
 autoreconf --install --force
 GCCVERS=$(gcc --version | head -1 | cut -d\  -f3 | cut -d. -f1)
@@ -232,6 +237,9 @@
 %{_datadir}/grub
 
 %changelog
+* Wed Aug  2 2006 Peter Jones <pjones at redhat.com> - 0.97-10
+- Fix grub-install for multipath
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.97-9.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug  2 21:29:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 17:29:52 -0400
Subject: rpms/gcc/devel gcc41.spec,1.89,1.90
Message-ID: <200608022129.k72LTqCa025341@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41.spec 
Log Message:
4.1.1-14


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- gcc41.spec	2 Aug 2006 21:18:17 -0000	1.89
+++ gcc41.spec	2 Aug 2006 21:29:50 -0000	1.90
@@ -452,8 +452,6 @@
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
 
-find . -name \*.java-backport~ | xargs rm
-
 cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 
 # Hack to avoid building multilib libjava



From fedora-cvs-commits at redhat.com  Wed Aug  2 22:11:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 18:11:53 -0400
Subject: rpms/gail/devel .cvsignore, 1.20, 1.21 gail.spec, 1.47, 1.48 sources,
	1.20, 1.21
Message-ID: <200608022211.k72MBrl9010511@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10437

Modified Files:
	.cvsignore gail.spec sources 
Log Message:
1.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	12 Jul 2006 20:29:39 -0000	1.20
+++ .cvsignore	2 Aug 2006 22:11:50 -0000	1.21
@@ -1 +1 @@
-gail-1.9.0.tar.bz2
+gail-1.9.1.tar.bz2


Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gail.spec	28 Jul 2006 21:23:20 -0000	1.47
+++ gail.spec	2 Aug 2006 22:11:50 -0000	1.48
@@ -4,8 +4,8 @@
 
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
-Version: 1.9.0
-Release: 2
+Version: 1.9.1
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=345074
@@ -81,6 +81,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1.9.1-1.fc6
+- Update to 1.9.1
+
 * Fri Jul 28 2006 Matthias Clasen <mclasen at redhat.com> - 1.9.0-2
 - Fix removal of notebook tabs
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	12 Jul 2006 20:29:39 -0000	1.20
+++ sources	2 Aug 2006 22:11:50 -0000	1.21
@@ -1 +1 @@
-ab0ab7ff000ddf3bb610ef0d2d20ea04  gail-1.9.0.tar.bz2
+afdfbf3e27cad67abaeb8ce0d174b09e  gail-1.9.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 22:22:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 18:22:00 -0400
Subject: rpms/libtheora/devel .cvsignore, 1.4, 1.5 libtheora.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <200608022222.k72MM0p8029072@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/libtheora/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28902

Modified Files:
	.cvsignore libtheora.spec sources 
Log Message:
Update libtheora to upstream (1.0alpha7)




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libtheora/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Nov 2005 20:49:42 -0000	1.4
+++ .cvsignore	2 Aug 2006 22:21:58 -0000	1.5
@@ -1,3 +1,4 @@
 libtheora-1.0alpha3.tar.bz2
 libtheora-1.0alpha4.tar.bz2
 libtheora-1.0alpha5.tar.gz
+libtheora-1.0alpha7.tar.gz


Index: libtheora.spec
===================================================================
RCS file: /cvs/dist/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libtheora.spec	12 Jul 2006 06:57:42 -0000	1.12
+++ libtheora.spec	2 Aug 2006 22:21:58 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
-Version: 1.0alpha5
-Release: 1.2.2
+Version: 1.0alpha7
+Release: 1
 Epoch: 0
 License: BSD
 Group: System Environment/Libraries
@@ -83,6 +83,9 @@
 %{_bindir}/*
 
 %changelog
+* Wed Aug 02 2006 Monty <cmontgom at redhat.com> - 0:1.0alpha7-1
+- Update to 1.0alpha7
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0alpha5-1.2.2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libtheora/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Nov 2005 20:49:42 -0000	1.4
+++ sources	2 Aug 2006 22:21:58 -0000	1.5
@@ -1 +1 @@
-5add710b80b1cd8f3db9867d1fc9d151  libtheora-1.0alpha5.tar.gz
+55ee3c6db3e0927e7918309891a8f52b  libtheora-1.0alpha7.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug  2 22:26:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 18:26:22 -0400
Subject: rpms/kernel/devel linux-2.6-x86_64-entry-more-unwind.patch, NONE,
	1.1 kernel-2.6.spec, 1.2512, 1.2513
Message-ID: <200608022226.k72MQMl4030768@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-x86_64-entry-more-unwind.patch 
Log Message:
Fix backtracing for interrupt stacks

linux-2.6-x86_64-entry-more-unwind.patch:
 entry.S |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-x86_64-entry-more-unwind.patch ---
Fix backtracing for interrupt stacks

Readd backlink for old style unwinder to stack switching.
Add proper stack frame and CFI annotations to call_softirq

This prevents a oops when backtracing with fallback through
the interrupt stack top.

Suggested by Jan Beulich and Herbert Xu wanted it in 2.6.18.

Cc: jbeulich at novell.com

Signed-off-by: Andi Kleen <ak at suse.de>

---
 arch/x86_64/kernel/entry.S |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

Index: linux/arch/x86_64/kernel/entry.S
===================================================================
--- linux.orig/arch/x86_64/kernel/entry.S
+++ linux/arch/x86_64/kernel/entry.S
@@ -521,6 +521,7 @@ END(stub_rt_sigreturn)
 	swapgs	
 1:	incl	%gs:pda_irqcount	# RED-PEN should check preempt count
 	cmoveq %gs:pda_irqstackptr,%rsp
+	push    %rbp			# backlink for old unwinder
 	/*
 	 * We entered an interrupt context - irqs are off:
 	 */
@@ -1144,18 +1145,21 @@ ENTRY(machine_check)
 END(machine_check)
 #endif
 
+/* Call softirq on interrupt stack. Interrupts are off. */
 ENTRY(call_softirq)
 	CFI_STARTPROC
-	movq %gs:pda_irqstackptr,%rax
-	movq %rsp,%rdx
-	CFI_DEF_CFA_REGISTER	rdx
+	push %rbp
+	CFI_ADJUST_CFA_OFFSET	8
+	CFI_REL_OFFSET rbp,0
+	mov  %rsp,%rbp
+	CFI_DEF_CFA_REGISTER rbp
 	incl %gs:pda_irqcount
-	cmove %rax,%rsp
-	pushq %rdx
-	/*todo CFI_DEF_CFA_EXPRESSION ...*/
+	cmove %gs:pda_irqstackptr,%rsp
+	push  %rbp			# backlink for old unwinder
 	call __do_softirq
-	popq %rsp
+	leaveq
 	CFI_DEF_CFA_REGISTER	rsp
+	CFI_ADJUST_CFA_OFFSET   -8
 	decl %gs:pda_irqcount
 	ret
 	CFI_ENDPROC


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2512
retrieving revision 1.2513
diff -u -r1.2512 -r1.2513
--- kernel-2.6.spec	2 Aug 2006 20:55:18 -0000	1.2512
+++ kernel-2.6.spec	2 Aug 2006 22:26:20 -0000	1.2513
@@ -275,6 +275,7 @@
 
 Patch200: linux-2.6-x86-tune-generic.patch
 Patch201: linux-2.6-x86-vga-vidfail.patch
+Patch202: linux-2.6-x86_64-entry-more-unwind.patch
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
@@ -734,6 +735,8 @@
 # for the installer cd that wants to automatically fall back to textmode
 # in that case
 %patch201 -p1
+# Fix backtracing for interrupt stacks.
+%patch202 -p1
 # Suppress APIC errors on UP x86-64.
 %patch203 -p1
 # Support TIF_RESTORE_SIGMASK on x86_64
@@ -1631,6 +1634,7 @@
 %changelog
 * Wed Aug  2 2006 Dave Jones <davej at redhat.com>
 - Readd patch to allow 460800 baud on 16C950 UARTs.
+- Fix backtracing for interrupt stacks
 
 * Wed Aug  2 2006 Jeremy Katz <katzj at redhat.com> 
 - add necessary ia64 hv fixes (#201040)



From fedora-cvs-commits at redhat.com  Wed Aug  2 22:27:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 18:27:06 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.315, 1.316 anaconda.spec, 1.441,
	1.442 sources, 1.438, 1.439
Message-ID: <200608022227.k72MR6Q5031080@cvs.devel.redhat.com>

Author: pnasrat

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- .cvsignore	2 Aug 2006 18:32:41 -0000	1.315
+++ .cvsignore	2 Aug 2006 22:27:04 -0000	1.316
@@ -1 +1 @@
-anaconda-11.1.0.76.tar.bz2
+anaconda-11.1.0.77.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- anaconda.spec	2 Aug 2006 18:32:41 -0000	1.441
+++ anaconda.spec	2 Aug 2006 22:27:04 -0000	1.442
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.76
+Version: 11.1.0.77
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -15,7 +15,7 @@
 BuildPreReq: libsepol-devel
 BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
 BuildPreReq: glib2-devel >= 2.11.1-5
-BuildPreReq: libdhcp-devel >= 1.9, mkinitrd-devel >= 5.1.2-1
+BuildPreReq: libdhcp-devel >= 1.10, mkinitrd-devel >= 5.1.2-1
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, booty
 Requires: parted >= 1.7.1, pyparted >= 1.7.2
 Requires: kudzu > 1.2.0, yum >= 2.9.2, pirut >= 1.1.0
@@ -103,6 +103,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Aug 02 2006 Paul Nasrat <pnasrat at redhat.com> 11.1.0.77-1
+- Fix pkgorder isdir check
+- Reinstate frequent rescanning of devices (clumens)
+
 * Wed Aug 02 2006 Chris Lumens <clumens at redhat.com> 11.1.0.76-1
 - Don't raise an exception when someone tries to delete empty space (pjones).
 - Fix X ks writing traceback (#201047).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- sources	2 Aug 2006 18:32:41 -0000	1.438
+++ sources	2 Aug 2006 22:27:04 -0000	1.439
@@ -1 +1 @@
-5ae41cc544159c11427b289b939128f6  anaconda-11.1.0.76.tar.bz2
+fc1dd50380f0dc1d450c73ac66c729cb  anaconda-11.1.0.77.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 22:42:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 18:42:59 -0400
Subject: rpms/cman/devel .cvsignore, 1.10, 1.11 cman.spec, 1.53, 1.54 sources,
	1.19, 1.20
Message-ID: <200608022242.k72MgxKG002769@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2744

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
New sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Jul 2006 19:50:03 -0000	1.10
+++ .cvsignore	2 Aug 2006 22:42:57 -0000	1.11
@@ -1 +1 @@
-cman-2.0.4.tar.gz
+cman-2.0.5.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- cman.spec	24 Jul 2006 19:50:03 -0000	1.53
+++ cman.spec	2 Aug 2006 22:42:57 -0000	1.54
@@ -10,7 +10,7 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.4
+%define cman_minor 0.5
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	24 Jul 2006 19:50:03 -0000	1.19
+++ sources	2 Aug 2006 22:42:57 -0000	1.20
@@ -1 +1 @@
-33ff33830b0c8dc0925e6791c64f80ef  cman-2.0.4.tar.gz
+7fd2fcc7489b3524a9eaea6d414cb4a5  cman-2.0.5.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug  2 22:49:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 18:49:56 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2513,1.2514
Message-ID: <200608022249.k72MnuGF019561@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
still busted


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2513
retrieving revision 1.2514
diff -u -r1.2513 -r1.2514
--- kernel-2.6.spec	2 Aug 2006 22:26:20 -0000	1.2513
+++ kernel-2.6.spec	2 Aug 2006 22:49:53 -0000	1.2514
@@ -1220,11 +1220,11 @@
     [ -z "$DevelLink" ] || ln -sf `basename $DevelDir` $RPM_BUILD_ROOT/$DevelLink
 
 	# Temporary fix for upstream "make prepare" bug.
-	pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
-	if [ -f Makefile ]; then
-		make prepare
-	fi
-	popd > /dev/null
+#	pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
+#	if [ -f Makefile ]; then
+#		make prepare
+#	fi
+#	popd > /dev/null
 }
 
 ###



From fedora-cvs-commits at redhat.com  Wed Aug  2 22:56:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 18:56:42 -0400
Subject: rpms/kernel/devel .cvsignore, 1.502, 1.503 kernel-2.6.spec, 1.2514,
	1.2515 sources, 1.466, 1.467 upstream, 1.408, 1.409
Message-ID: <200608022256.k72Mugsx021607@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Log Message:
git2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -r1.502 -r1.503
--- .cvsignore	1 Aug 2006 17:20:03 -0000	1.502
+++ .cvsignore	2 Aug 2006 22:56:39 -0000	1.503
@@ -4,4 +4,4 @@
 linux-2.6.17.tar.bz2
 xen-10730.tar.bz2
 patch-2.6.18-rc3.bz2
-patch-2.6.18-rc3-git1.bz2
+patch-2.6.18-rc3-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2514
retrieving revision 1.2515
diff -u -r1.2514 -r1.2515
--- kernel-2.6.spec	2 Aug 2006 22:49:53 -0000	1.2514
+++ kernel-2.6.spec	2 Aug 2006 22:56:39 -0000	1.2515
@@ -264,7 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc3.bz2
-Patch2: patch-2.6.18-rc3-git1.bz2
+Patch2: patch-2.6.18-rc3-git2.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1633,6 +1633,7 @@
 
 %changelog
 * Wed Aug  2 2006 Dave Jones <davej at redhat.com>
+- 2.6.18rc3-git2
 - Readd patch to allow 460800 baud on 16C950 UARTs.
 - Fix backtracing for interrupt stacks
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -r1.466 -r1.467
--- sources	1 Aug 2006 17:20:04 -0000	1.466
+++ sources	2 Aug 2006 22:56:39 -0000	1.467
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 4ae2c95631b54820475437c206c3a4c2  xen-10730.tar.bz2
 ba31b754aaf80aa388858f86c34c4d01  patch-2.6.18-rc3.bz2
-3f338a75da0fca3fba1121afa4636f25  patch-2.6.18-rc3-git1.bz2
+1beb7e5f3b822bb4a0c6d04bb7411c62  patch-2.6.18-rc3-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- upstream	1 Aug 2006 17:20:04 -0000	1.408
+++ upstream	2 Aug 2006 22:56:39 -0000	1.409
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc3.bz2
-patch-2.6.18-rc3-git1.bz2
+patch-2.6.18-rc3-git2.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 23:00:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 19:00:52 -0400
Subject: rpms/gnome-mag/devel .cvsignore, 1.20, 1.21 gnome-mag.spec, 1.37,
	1.38 sources, 1.20, 1.21
Message-ID: <200608022300.k72N0qBc022892@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	12 Jul 2006 13:21:47 -0000	1.20
+++ .cvsignore	2 Aug 2006 23:00:42 -0000	1.21
@@ -1 +1 @@
-gnome-mag-0.13.0.tar.bz2
+gnome-mag-0.13.1.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-mag.spec	12 Jul 2006 13:21:49 -0000	1.37
+++ gnome-mag.spec	2 Aug 2006 23:00:49 -0000	1.38
@@ -2,8 +2,8 @@
 
 Summary: GNOME Magnifier
 Name: gnome-mag
-Version: 0.13.0
-Release: 1
+Version: 0.13.1
+Release: 1%{?dist}
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -69,6 +69,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 0.13.1-1.fc6
+- Update to 0.13.1
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> 0.13.0-1
 - Update to 0.13.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	12 Jul 2006 13:21:49 -0000	1.20
+++ sources	2 Aug 2006 23:00:50 -0000	1.21
@@ -1 +1 @@
-977009557cfe3de977ca62daf40cd29a  gnome-mag-0.13.0.tar.bz2
+4b16b95fd978640c103a6f9cf452c579  gnome-mag-0.13.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 23:03:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 19:03:19 -0400
Subject: rpms/cman/devel cman.spec,1.54,1.55
Message-ID: <200608022303.k72N3JxF023474@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23446

Modified Files:
	cman.spec 
Log Message:
Added libraryfix patch.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cman.spec	2 Aug 2006 22:42:57 -0000	1.54
+++ cman.spec	2 Aug 2006 23:03:16 -0000	1.55
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.0
+Release: 0.fc6.1
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -30,6 +30,7 @@
 Requires: openais
 URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz
+Patch0: cman-2.0.5-libraryfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -45,6 +46,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .libraryfix
 
 %build
 TOPDIR=`pwd`
@@ -53,7 +55,7 @@
 cd dlm ; ./configure --kernel_src=/usr/ --libdir=%{_libdir}; cd ..
 cd cman; ./configure --ccsincdir=${TOPDIR}/ccs/lib --ccslibdir=${TOPDIR}/ccs/lib --libdir=%{_libdir}  ; cd ..
 cd group; ./configure --kernel_src=/usr/ --libdir=%{_libdir} --cmanlibdir=${TOPDIR}/cman/lib; cd ..
-cd fence; ./configure -ccslibdir=${TOPDIR}/ccs/lib --ccsincdir=${TOPDIR}/ccs/lib --cmanincdir=${TOPDIR}/cman/lib ; cd ..
+cd fence; ./configure --ccslibdir=${TOPDIR}/ccs/lib --ccsincdir=${TOPDIR}/ccs/lib --cmanincdir=${TOPDIR}/cman/lib ; cd ..
 
 for dir in ccs cman dlm fence group; do
   cd $dir



From fedora-cvs-commits at redhat.com  Wed Aug  2 23:04:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 19:04:39 -0400
Subject: rpms/cman/devel cman-2.0.5-libraryfix.patch, NONE, 1.1 cman.spec,
	1.55, 1.56
Message-ID: <200608022304.k72N4dKm023780@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23742

Modified Files:
	cman.spec 
Added Files:
	cman-2.0.5-libraryfix.patch 
Log Message:
Added patch.

cman-2.0.5-libraryfix.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cman-2.0.5-libraryfix.patch ---
--- cman-2.0.5/cman/cman_tool/Makefile.libraryfix	2006-08-02 18:02:05.000000000 -0500
+++ cman-2.0.5/cman/cman_tool/Makefile	2006-08-02 18:02:18.000000000 -0500
@@ -32,7 +32,7 @@ copytobin: all
 	cp ${TARGET} ${top_srcdir}/bin
 
 cman_tool: main.o join.o ../lib/libcman.a
-	$(CC) $(LDFLAGS) -L$(ccslibdir) -o $@ $^ -L../lib -lccs
+	$(CC) $(LDFLAGS) -L$(ccslibdir) -o $@ $^ -L$(ccsincdir) -lccs
 
 main.o: main.c cman_tool.h
 	$(CC) $(CFLAGS) -c -o $@ $<


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- cman.spec	2 Aug 2006 23:03:16 -0000	1.55
+++ cman.spec	2 Aug 2006 23:04:36 -0000	1.56
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.1
+Release: 0.fc6.2
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager



From fedora-cvs-commits at redhat.com  Wed Aug  2 23:05:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 19:05:56 -0400
Subject: rpms/gnopernicus/devel .cvsignore, 1.31, 1.32 gnopernicus.spec, 1.45,
	1.46 sources, 1.32, 1.33
Message-ID: <200608022305.k72N5u8Q024058@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnopernicus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24013

Modified Files:
	.cvsignore gnopernicus.spec sources 
Log Message:
1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	13 Jul 2006 14:18:32 -0000	1.31
+++ .cvsignore	2 Aug 2006 23:05:52 -0000	1.32
@@ -1 +1 @@
-gnopernicus-1.0.6.tar.bz2
+gnopernicus-1.1.1.tar.bz2


Index: gnopernicus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/gnopernicus.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnopernicus.spec	13 Jul 2006 14:18:32 -0000	1.45
+++ gnopernicus.spec	2 Aug 2006 23:05:52 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: GNOME screen reader
 Name: gnopernicus
-Version: 1.0.6
-Release: 1
+Version: 1.1.1
+Release: 1%{?dist}
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.baum.ro/gnopernicus.html
@@ -73,9 +73,26 @@
 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
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    SCHEMAS="brlmonitor.schemas gnopernicus.schemas remote.schemas"
+    for S in $SCHEMAS; do
+      gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null || :
+    done
+fi
 
 %postun
 /usr/bin/scrollkeeper-update
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
@@ -91,15 +108,17 @@
 %{_datadir}/gnome/help/gnopernicus
 %{_datadir}/gnopernicus
 %{_datadir}/omf/gnopernicus
-%{_datadir}/pixmaps/*png
+%{_datadir}/icons/hicolor/48x48/apps/gnopernicus.png
 
 %files devel
-
 %{_libdir}/gnopernicus-1.0/lib*.so
 %{_libdir}/pkgconfig/*pc
 %{_includedir}/gnopernicus-1.0
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1.1.1-1.fc6
+- Update to 1.1.1
+
 * Thu Jul 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.6-1
 - Update to 1.0.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	13 Jul 2006 14:18:32 -0000	1.32
+++ sources	2 Aug 2006 23:05:52 -0000	1.33
@@ -1 +1 @@
-48b4fb06920053048418036f91069763  gnopernicus-1.0.6.tar.bz2
+e691c408de4ca885a3589a0b6fa297be  gnopernicus-1.1.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 23:14:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 19:14:13 -0400
Subject: rpms/cman/devel cman-2.0.5-libraryfix.patch, 1.1, 1.2 cman.spec,
	1.56, 1.57
Message-ID: <200608022314.k72NEDon025762@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25729

Modified Files:
	cman-2.0.5-libraryfix.patch cman.spec 
Log Message:
Updated libraryfix patch.

cman-2.0.5-libraryfix.patch:
 cman_tool/Makefile |    2 +-
 configure          |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Index: cman-2.0.5-libraryfix.patch
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman-2.0.5-libraryfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cman-2.0.5-libraryfix.patch	2 Aug 2006 23:04:36 -0000	1.1
+++ cman-2.0.5-libraryfix.patch	2 Aug 2006 23:14:09 -0000	1.2
@@ -1,5 +1,15 @@
---- cman-2.0.5/cman/cman_tool/Makefile.libraryfix	2006-08-02 18:02:05.000000000 -0500
-+++ cman-2.0.5/cman/cman_tool/Makefile	2006-08-02 18:02:18.000000000 -0500
+--- cman-2.0.5/cman/configure.libraryfix	2006-07-07 01:58:20.000000000 -0500
++++ cman-2.0.5/cman/configure	2006-08-02 18:13:27.000000000 -0500
+@@ -95,6 +95,7 @@ if (!$libexecdir) {
+ }
+ if (!$ccslibdir) {
+   $ccslibdir="${libdir}";
++  print "Setting ccslibdir to $ccslibdir\n";
+ }
+ if (!$mandir) {
+   $mandir="${prefix}/usr/share/man";
+--- cman-2.0.5/cman/cman_tool/Makefile.libraryfix	2006-07-03 07:13:55.000000000 -0500
++++ cman-2.0.5/cman/cman_tool/Makefile	2006-08-02 18:03:03.000000000 -0500
 @@ -32,7 +32,7 @@ copytobin: all
  	cp ${TARGET} ${top_srcdir}/bin
  


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- cman.spec	2 Aug 2006 23:04:36 -0000	1.56
+++ cman.spec	2 Aug 2006 23:14:09 -0000	1.57
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.2
+Release: 0.fc6.3
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager



From fedora-cvs-commits at redhat.com  Wed Aug  2 23:48:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 19:48:16 -0400
Subject: rpms/bug-buddy/devel .cvsignore, 1.28, 1.29 bug-buddy.spec, 1.56,
	1.57 sources, 1.28, 1.29
Message-ID: <200608022348.k72NmGVg031567@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31470

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	13 Jun 2006 17:15:37 -0000	1.28
+++ .cvsignore	2 Aug 2006 23:48:12 -0000	1.29
@@ -1 +1 @@
-bug-buddy-2.15.0.tar.bz2
+bug-buddy-2.15.90.tar.bz2


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- bug-buddy.spec	22 Jul 2006 04:35:53 -0000	1.56
+++ bug-buddy.spec	2 Aug 2006 23:48:12 -0000	1.57
@@ -4,8 +4,8 @@
 %define gnome_doc_utils_version 0.2.0
 
 Name: bug-buddy
-Version: 2.15.0
-Release: 3
+Version: 2.15.90
+Release: 1%{?dist}
 Epoch: 1
 Summary: A bug reporting utility for GNOME.
 License: GPL
@@ -14,9 +14,6 @@
 URL: http://ftp.gnome.org/pub/GNOME/sources/bug-buddy/
 BuildRoot:%{_tmppath}/%{name}-%{version}-root
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=304508
-#Patch1: bug-buddy-2.13.0-save.patch
-
 Requires: gdb
 
 PreReq:        desktop-file-utils >= %{desktop_file_utils_version}
@@ -55,7 +52,6 @@
 
 %prep
 %setup -q
-#%patch1 -p1 -b .save
 
 %build
 
@@ -80,6 +76,7 @@
   --add-category X-Red-Hat-Extra                            \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
+rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 %find_lang %name
 
@@ -90,19 +87,31 @@
 %post
 update-desktop-database %{_datadir}/applications
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="bug-buddy.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/bug-buddy.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
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/bug-buddy.schemas > /dev/null || :
+fi
 
 %postun
 update-desktop-database %{_datadir}/applications
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING COPYING.ximian-logos ChangeLog INSTALL NEWS README TODO
 
-%{_datadir}/pixmaps
+%{_datadir}/icons/hicolor/48x48/apps/bug-buddy.png
 %{_datadir}/bug-buddy
 %{_datadir}/applications
 %{_datadir}/gnome
@@ -112,6 +121,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-1.fc6
+- Update to 2.15.90
+
 * Sat Jul 22 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.0-3
 - Hide bug-buddy from the menus, since it is now strictly
   a crash-reporting tool


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	13 Jun 2006 17:15:37 -0000	1.28
+++ sources	2 Aug 2006 23:48:12 -0000	1.29
@@ -1 +1 @@
-58ca17dca26bfae3354f17fdfa6cdcee  bug-buddy-2.15.0.tar.bz2
+38c092ad09b5b1a9dae04beb35311234  bug-buddy-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  2 23:54:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 19:54:14 -0400
Subject: rpms/gcalctool/devel .cvsignore, 1.7, 1.8 gcalctool.spec, 1.19,
	1.20 sources, 1.8, 1.9
Message-ID: <200608022354.k72NsEkY001350@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.8.19



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Jul 2006 16:51:17 -0000	1.7
+++ .cvsignore	2 Aug 2006 23:54:11 -0000	1.8
@@ -1 +1 @@
-gcalctool-5.8.17.tar.bz2
+gcalctool-5.8.19.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gcalctool.spec	12 Jul 2006 16:51:17 -0000	1.19
+++ gcalctool.spec	2 Aug 2006 23:54:11 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           gcalctool
-Version:        5.8.17
-Release:        1
+Version:        5.8.19
+Release:        1%{?dist}
 Summary:        A desktop calculator
 
 Group:          Applications/System
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 5.8.19-1.fc6
+- Update to 5.8.19
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 5.8.17-1
 - Update to 5.8.17
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Jul 2006 16:51:17 -0000	1.8
+++ sources	2 Aug 2006 23:54:11 -0000	1.9
@@ -1 +1 @@
-2cf984fcec7db4796edf242405b297f9  gcalctool-5.8.17.tar.bz2
+9fbf0f2552f6fd1a0fadf54a2125fef2  gcalctool-5.8.19.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 00:03:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 20:03:35 -0400
Subject: rpms/evolution/FC-5 evolution.spec, 1.143,
	1.144 evo-calendar-print-with-pango-4.patch, 1.2,
	NONE evo-calendar-print-with-pango-5.patch, 1.1,
	NONE evo-conduits-multi-day-crash.patch, 1.1,
	NONE evolution-2.0.2-fix_alarm_notify_cleanup.patch, 1.1,
	NONE evolution-2.0.2-unmatched-vfolder-properties-141458.patch,
	1.1, NONE evolution-2.1.6-gcc4-fixes.patch, 1.1,
	NONE evolution-2.2.0-XB73192.patch, 1.1,
	NONE evolution-2.2.0-fix-for-dbus31.patch, 1.1,
	NONE evolution-2.2.0-port-to-pilot-link-0.12.patch, 1.3,
	NONE evolution-2.2.1.1-XB73844.patch, 1.1,
	NONE evolution-2.2.2-commit-enter-on-calendar.patch, 1.2,
	NONE evolution-2.2.2-fix-new-mail-notify.patch, 1.1,
	NONE gb-309138-attach-48417-fix-evo-conduit-memleaks.patch, 1.1,
	NONE rh-161817-attach-116019-conduit_pilot_link_updates.diff,
	1.1, NONE
Message-ID: <200608030003.k7303ZDg004131@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Removed Files:
	evo-calendar-print-with-pango-4.patch 
	evo-calendar-print-with-pango-5.patch 
	evo-conduits-multi-day-crash.patch 
	evolution-2.0.2-fix_alarm_notify_cleanup.patch 
	evolution-2.0.2-unmatched-vfolder-properties-141458.patch 
	evolution-2.1.6-gcc4-fixes.patch evolution-2.2.0-XB73192.patch 
	evolution-2.2.0-fix-for-dbus31.patch 
	evolution-2.2.0-port-to-pilot-link-0.12.patch 
	evolution-2.2.1.1-XB73844.patch 
	evolution-2.2.2-commit-enter-on-calendar.patch 
	evolution-2.2.2-fix-new-mail-notify.patch 
	gb-309138-attach-48417-fix-evo-conduit-memleaks.patch 
	rh-161817-attach-116019-conduit_pilot_link_updates.diff 
Log Message:
- Update to 2.6.3
- No longer packaging unused patches.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- evolution.spec	29 Jul 2006 07:21:24 -0000	1.143
+++ evolution.spec	3 Aug 2006 00:03:33 -0000	1.144
@@ -59,8 +59,6 @@
 Patch100: evo-addressbook-print-with-pango-2.patch
 Patch101: evo-calendar-print-with-pango-7.patch
 
-#Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
-
 # Fix for RH bug #154360:
 Patch106: evolution-2.5.5.1-commit-enter-on-calendar.patch
 
@@ -215,36 +213,15 @@
 
 %prep
 %setup -q
-# these are in CVS already on the 1-4-branch
-
-# these are in CVS already on the gnome-2-8 branch
-
-# Red Hat specific patches
-#patch11 -p1 -b .rhatify
-
-#patch99 -p1 -b .db3pthread
-
 %patch98 -p1 -b .ldaphack
-
-# patches sent upstream
-#%patch100 -p0 -b .addressbook-print-with-pango
 %patch101 -p1 -b .calendar-print-with-pango
-
 %patch106 -p1 -b .commit-enter-on-calendar
 %patch107 -p1 -b .move-autosave-file
 cd widgets/table
 %patch108 -p3 -b .fix-150458
 cd ../..
 %patch109 -p1 -b .fix-164957
-
 %patch110 -p1 -b .hide-switcher-buttons-by-default
-
-#patch200 -p1 -b .commandlength
-
-#patch500 -p0 -b .wombatsm
-
-#patch700 -p1 -b .filechooser
-
 # %patch800 -p1 -b .fix-conduits
 %patch802 -p1 -b .fix-conduit-dir
 %patch803 -p1 -b .no-gnome-common
@@ -643,6 +620,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Aug  2 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-1.fc5.1
+- Update to 2.6.3
+- No longer packaging unused patches.
+
 * Sat Jul 29 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.2-1.fc5.7
 - Add patch for RH bug #167157.
 


--- evo-calendar-print-with-pango-4.patch DELETED ---


--- evo-calendar-print-with-pango-5.patch DELETED ---


--- evo-conduits-multi-day-crash.patch DELETED ---


--- evolution-2.0.2-fix_alarm_notify_cleanup.patch DELETED ---


--- evolution-2.0.2-unmatched-vfolder-properties-141458.patch DELETED ---


--- evolution-2.1.6-gcc4-fixes.patch DELETED ---


--- evolution-2.2.0-XB73192.patch DELETED ---


--- evolution-2.2.0-fix-for-dbus31.patch DELETED ---


--- evolution-2.2.0-port-to-pilot-link-0.12.patch DELETED ---


--- evolution-2.2.1.1-XB73844.patch DELETED ---


--- evolution-2.2.2-commit-enter-on-calendar.patch DELETED ---


--- evolution-2.2.2-fix-new-mail-notify.patch DELETED ---


--- gb-309138-attach-48417-fix-evo-conduit-memleaks.patch DELETED ---


--- rh-161817-attach-116019-conduit_pilot_link_updates.diff DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 00:05:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 20:05:22 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.144,1.145
Message-ID: <200608030005.k7305M6S004635@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Log Message:
Forgot to bump Version and Release.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- evolution.spec	3 Aug 2006 00:03:33 -0000	1.144
+++ evolution.spec	3 Aug 2006 00:05:19 -0000	1.145
@@ -38,8 +38,8 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.6.2
-Release: 1.fc5.7
+Version: 2.6.3
+Release: 1.fc5.1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/



From fedora-cvs-commits at redhat.com  Thu Aug  3 00:10:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 20:10:52 -0400
Subject: rpms/compiz/devel .cvsignore, 1.3, 1.4 compiz.spec, 1.14,
	1.15 sources, 1.3, 1.4
Message-ID: <200608030010.k730AqsU005887@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5832

Modified Files:
	.cvsignore compiz.spec sources 
Log Message:

* Wed Aug  2 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.13.20060721git.fc5.aiglx
- Add 'desktop effects' dialog box.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2006 18:59:46 -0000	1.3
+++ .cvsignore	3 Aug 2006 00:10:39 -0000	1.4
@@ -1 +1,2 @@
 compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
+desktop-effects-0.6.tar.gz


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- compiz.spec	31 Jul 2006 15:48:57 -0000	1.14
+++ compiz.spec	3 Aug 2006 00:10:39 -0000	1.15
@@ -8,7 +8,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.12.%{snapshot}git.fc5.aiglx
+Release:        0.13.%{snapshot}git.fc5.aiglx
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +29,7 @@
 BuildRequires:  gettext
 
 Source0:        %{name}-%{sha1}.tar.bz2
+Source1:	desktop-effects-0.6.tar.gz
 
 Patch100: gl-include-inferiors.patch
 Patch101: aiglx-defaults.patch
@@ -61,6 +62,7 @@
 windows and compositing manager.
 
 %prep
+%setup -q -T -b1 -n desktop-effects-0.6
 %setup -q -n %{name}-%{sha1}
 
 %patch100 -p1 -b .gl-include-inferiors
@@ -76,11 +78,22 @@
 
 make %{?_smp_mflags} 
 
+# desktop-effects
+cd ../desktop-effects-0.6
+%configure 
+make
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install || exit 1
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+echo INSTALLING DESKTOP EFFECTS
+cd ../desktop-effects-0.6
+make DESTDIR=$RPM_BUILD_ROOT install || exit 1
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
@@ -110,6 +123,9 @@
 %{_datadir}/compiz/*.png
 %{_datadir}/gnome/wm-properties/compiz.desktop
 %{_datadir}/locale/*/LC_MESSAGES/compiz.mo
+%{_bindir}/desktop-effects
+%{_datadir}/compiz/desktop-effects.glade
+%{_datadir}/applications/desktop-effects.desktop
 
 %files devel
 %defattr(-, root, root)
@@ -117,6 +133,9 @@
 %{_includedir}/compiz
 
 %changelog
+* Wed Aug  2 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.13.20060721git.fc5.aiglx
+- Add 'desktop effects' dialog box.
+
 * Mon Jul 31 2006 Kristian H??gsberg <krh at redhat.com> 0.0.13-0.12.20060721git.fc5.aiglx
 - Add libwnck requires.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2006 18:59:46 -0000	1.3
+++ sources	3 Aug 2006 00:10:39 -0000	1.4
@@ -1 +1,2 @@
 16382b2db6ffc65161a6edc70559ee67  compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
+101df08c0adb11640e512db33165acf4  desktop-effects-0.6.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug  3 00:18:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 20:18:28 -0400
Subject: rpms/evolution/FC-5 .cvsignore, 1.47, 1.48 evolution.spec, 1.145,
	1.146 sources, 1.48,
	1.49 evolution-2.6.2-fix-crash-on-paste.patch, 1.1, NONE
Message-ID: <200608030018.k730IShM022649@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution.spec sources 
Removed Files:
	evolution-2.6.2-fix-crash-on-paste.patch 
Log Message:
- Remove patch for RH bug #167157, as it fixed it the wrong way.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	30 May 2006 14:30:46 -0000	1.47
+++ .cvsignore	3 Aug 2006 00:18:25 -0000	1.48
@@ -1 +1 @@
-evolution-2.6.2.tar.bz2
+evolution-2.6.3.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- evolution.spec	3 Aug 2006 00:05:19 -0000	1.145
+++ evolution.spec	3 Aug 2006 00:18:25 -0000	1.146
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.3
-Release: 1.fc5.1
+Release: 1.fc5.2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -100,9 +100,6 @@
 Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 Patch809: evolution-2.6.0-prototypes.patch
 
-# RH bug #167157 / Gnome.org bug #334464
-Patch810: evolution-2.6.2-fix-crash-on-paste.patch
-
 # Removed to placate the build system.  Feel free to try to re-add it, but,
 # wash your dog first.
 ExcludeArch: s390 s390x
@@ -230,7 +227,6 @@
 %patch806 -p1 -b .notification-cleanups
 %patch808 -p1 -b .fix-missing-declarations-2.5.5.1
 %patch809 -p1 -b .prototypes
-%patch810 -p1 -b .fix-crash-on-paste
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -620,6 +616,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Aug  2 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-1.fc5.2
+- Remove patch for RH bug #167157, as it fixed it the wrong way.
+
 * Wed Aug  2 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-1.fc5.1
 - Update to 2.6.3
 - No longer packaging unused patches.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	30 May 2006 14:30:46 -0000	1.48
+++ sources	3 Aug 2006 00:18:25 -0000	1.49
@@ -1 +1 @@
-24b97cf70a3c1e9e34f6e328e6910ab1  evolution-2.6.2.tar.bz2
+d7db71aaff2764f03083e6ce74c8ebde  evolution-2.6.3.tar.bz2


--- evolution-2.6.2-fix-crash-on-paste.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 00:19:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 20:19:26 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.40,
	1.41 weak-modules, 1.13, 1.14
Message-ID: <200608030019.k730JQx1023043@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22766

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
Made a shell version of rpmsort so we can not PreReq redhat-rpm-config here.



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- module-init-tools.spec	1 Aug 2006 21:59:56 -0000	1.40
+++ module-init-tools.spec	3 Aug 2006 00:19:24 -0000	1.41
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.15
+Release: 0.pre1.4.17
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,12 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Thu Aug  3 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.17
+- Build in a shell version of rpmsort to avoid unnecessary dep.
+
+* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.16
+- Add pre-req for /usr/lib/rpm/redhat/rpmsort
+
 * Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.15
 - Reverted back to script based weak-updates to avoid python dep.
 


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- weak-modules	1 Aug 2006 21:59:56 -0000	1.13
+++ weak-modules	3 Aug 2006 00:19:24 -0000	1.14
@@ -10,6 +10,62 @@
 trap "rm -rf $tmpdir" EXIT
 unset ${!changed_modules_*} ${!changed_initrd_*}
 
+#!/bin/sh
+
+# rpmsort: The sort in coreutils can't sort the RPM list how we want it so we
+# instead transform the list into a form it will sort correctly, then sort.
+rpmsort() {
+
+	rpmlist=($(cat))
+
+	if [ "$1" == "-r" ]; then
+		reverse=1
+	else
+		reverse=0
+	fi
+
+        if [ ${#rpmlist[@]} = 1 ]; then
+        # By definition already sorted
+                return
+        fi
+
+        # Hash every value in the rpmlist
+        for ((i = 0; i < ${#rpmlist[@]}; i++)); do
+                rpmhash[i]="$(echo ${rpmlist[i]} | awk '{decode="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-."; split($1,tmp,"");for (i=1;i<=length($1);i++){ printf "%02x",index(decode,tmp[i]) } }')"
+        done
+
+        for ((i = 0; i < ${#rpmlist[@]}; i++)); do
+
+                for ((j = 0; j < ${#rpmlist[@]}-1; j++)); do
+
+                        rpm1=${rpmlist[j]}      rpm2=${rpmlist[j+1]}
+                        hex1=${rpmhash[j]}      hex2=${rpmhash[j+1]}
+
+                        if [ ${#rpm1} -lt ${#rpm2} ]; then
+                                len=$((${#rpm1}*2));
+                        else
+                                len=$((${#rpm2}*2));
+                        fi
+
+                        if [ "$(printf "%s\n" ${hex1:0:$len} ${hex2:0:$len} \
+                              | sort | head -n 1)" = "$hex2" ]; then
+                                rpmlist[j]=$rpm2; rpmlist[j+1]=$rpm1
+                                rpmhash[j]=$hex2; rpmhash[j+1]=$hex1
+                        fi
+                done
+        done
+
+	if [ $reverse = 0 ]; then
+        	for ((n = 0; n < ${#rpmlist[@]} ; n++)); do
+                	echo "${rpmlist[$n]}"
+        	done
+	else
+		for ((n = ${#rpmlist[@]}-1; n >= 0; n--)); do
+			echo "${rpmlist[$n]}"
+		done
+	fi
+}
+
 # read_modules_list:
 # Read in a list of modules from standard input. Convert the filenames into
 # absolute paths and compute the kernel release for each module (either using
@@ -168,7 +224,7 @@
                     weak_krel=$(krel_of_module "$weak_module")
                     if [ "$weak_krel" != "$module_krel" ] &&
                        [ "$(printf "%s\n" "$weak_krel" "$module_krel" \
-                            | /usr/lib/rpm/redhat/rpmsort | head -n 1)" = \
+                            | rpmsort | head -n 1)" = \
                          "$module_krel" ]; then
                         # Keep modules from more recent kernels.
                         [ -n "$verbose" ] && echo \
@@ -191,7 +247,7 @@
 remove_modules() {
     read_modules_list || exit 1
     if [ ${#modules[@]} -gt 0 ]; then
-        krels=($(ls /lib/modules/ | /usr/lib/rpm/redhat/rpmsort -r))
+        krels=($(ls /lib/modules/ | rpmsort -r))
         for krel in "${krels[@]}"; do
             [ -e "/boot/symvers-$krel.gz" ] || continue
             for ((n = 0; n < ${#modules[@]}; n++)); do
@@ -230,7 +286,7 @@
              "not found" >&2
         exit 1
     fi
-    for krel in $(ls /lib/modules/ | /usr/lib/rpm/redhat/rpmsort -r); do
+    for krel in $(ls /lib/modules/ | rpmsort -r); do
         [ "$add_krel" = "$krel" ] && continue
         [ -d /lib/modules/$krel/extra ] || continue
         for module in $(find /lib/modules/$krel/extra -name '*.ko'); do



From fedora-cvs-commits at redhat.com  Thu Aug  3 01:00:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 21:00:53 -0400
Subject: rpms/xorg-x11-drv-i810/devel intel-prune-by-edid-pixclock.patch,
	NONE, 1.1 intel-virtual-sizing-bogon.patch, NONE,
	1.1 xorg-x11-drv-i810.spec, 1.28, 1.29
Message-ID: <200608030100.k7310rF2021959@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-prune-by-edid-pixclock.patch 
	intel-virtual-sizing-bogon.patch 
Log Message:
* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-13.20060717modeset.fc6
- intel-prune-by-edid-pixclock.patch: Honor the EDID-reported maximum pixel
  clock when computing the modes list.
- intel-virtual-sizing-bogon.patch: Don't interpret the size of the display
  in centimeters as the size of the display in pixels.


intel-prune-by-edid-pixclock.patch:
 i830_modes.c     |    8 +++++++-
 i830_xf86Modes.c |   21 +++++++++++++++++++++
 i830_xf86Modes.h |    4 ++++
 3 files changed, 32 insertions(+), 1 deletion(-)

--- NEW FILE intel-prune-by-edid-pixclock.patch ---
--- xf86-video-intel/src/i830_xf86Modes.h.edid-pixclock	2006-07-24 14:13:53.000000000 -0400
+++ xf86-video-intel/src/i830_xf86Modes.h	2006-08-02 17:57:59.000000000 -0400
@@ -57,6 +57,10 @@
 			  MonPtr mon);
 
 void
+i830xf86ValidateModesClock(ScrnInfoPtr pScrn, DisplayModePtr modeList,
+			  MonPtr mon);
+
+void
 i830xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList,
 			  Bool verbose);
 
--- xf86-video-intel/src/i830_modes.c.edid-pixclock	2006-07-24 14:13:53.000000000 -0400
+++ xf86-video-intel/src/i830_modes.c	2006-08-02 18:28:04.000000000 -0400
@@ -601,7 +601,7 @@
     xf86MonPtr ddc;
     MonPtr mon;
     DisplayModePtr userModes;
-    int i;
+    int i, clock;
 
     ddc = xf86DoEDID_DDC2(pScrn->scrnIndex, pDDCBus);
 
@@ -623,6 +623,9 @@
 	    mon->vrefresh[mon->nVrefresh].lo = det_mon->section.ranges.min_v;
 	    mon->vrefresh[mon->nVrefresh].hi = det_mon->section.ranges.max_v;
 	    mon->nVrefresh++;
+	    clock = det_mon->section.ranges.max_clock * 1000;
+	    if (clock > mon->maxPixClock)
+		mon->maxPixClock = clock;
 	    break;
 	default:
 	    /* We probably don't care about trying to contruct ranges around
@@ -642,6 +645,7 @@
 	i830xf86ValidateModesSize(pScrn, userModes, ddc->features.hsize,
 				  ddc->features.vsize, -1);
     }
+    i830xf86ValidateModesClock(pScrn, userModes, mon);
     i830xf86PruneInvalidModes(pScrn, &userModes, TRUE);
 
     i830AppendModes(pScrn, &mon->Modes, userModes);
@@ -806,6 +810,8 @@
 				   V_INTERLACE);
 	i830xf86ValidateModesClocks(pScrn, pI830->pipeMon[pipe]->Modes,
 				    &minclock, &maxclock, 1);
+	i830xf86ValidateModesClock(pScrn, pI830->pipeMon[pipe]->Modes,
+				   pI830->pipeMon[pipe]);
 
 	i830xf86PruneInvalidModes(pScrn, &pI830->pipeMon[pipe]->Modes, TRUE);
 
--- xf86-video-intel/src/i830_xf86Modes.c.edid-pixclock	2006-07-24 14:13:53.000000000 -0400
+++ xf86-video-intel/src/i830_xf86Modes.c	2006-08-02 17:57:59.000000000 -0400
@@ -373,6 +373,27 @@
 }
 
 /**
+ * Marks as bad any modes exceeding the maximum pixel clock of the monitor.
+ *
+ * \param modeList doubly-linked or circular list of modes.
+ *
+ * This is not in xf86Modes.c, but would be part of the proposed new API.
+ */
+void
+i830xf86ValidateModesClock(ScrnInfoPtr pScrn, DisplayModePtr modeList,
+			  MonPtr mon)
+{
+    DisplayModePtr mode;
+
+    if (!mon || !mon->maxPixClock)
+	return;
+
+    for (mode = modeList; mode != NULL; mode = mode->next)
+	if (mode->Clock > mon->maxPixClock)
+	    mode->status = MODE_CLOCK_HIGH;
+}
+
+/**
  * Marks as bad any modes extending beyond outside of the given clock ranges.
  *
  * \param modeList doubly-linked or circular list of modes.

intel-virtual-sizing-bogon.patch:
 i830_modes.c |    4 ----
 1 files changed, 4 deletions(-)

--- NEW FILE intel-virtual-sizing-bogon.patch ---
--- xf86-video-intel/src/i830_modes.c.jx	2006-08-02 19:44:32.000000000 -0400
+++ xf86-video-intel/src/i830_modes.c	2006-08-02 20:25:50.000000000 -0400
@@ -641,10 +641,6 @@
     userModes = i830DuplicateModes(pScrn, pScrn->monitor->Modes);
 
     i830xf86ValidateModesSync(pScrn, userModes, mon);
-    if (ddc->features.hsize > 0 && ddc->features.vsize > 0) {
-	i830xf86ValidateModesSize(pScrn, userModes, ddc->features.hsize,
-				  ddc->features.vsize, -1);
-    }
     i830xf86ValidateModesClock(pScrn, userModes, mon);
     i830xf86PruneInvalidModes(pScrn, &userModes, TRUE);
 


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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-x11-drv-i810.spec	24 Jul 2006 18:23:23 -0000	1.28
+++ xorg-x11-drv-i810.spec	3 Aug 2006 01:00:51 -0000	1.29
@@ -14,7 +14,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   12.%{gitdate}modeset%{?dist}
+Release:   13.%{gitdate}modeset%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -24,6 +24,9 @@
 Source0:   xf86-video-intel-1.6.0-git-modesetting-%{gitdate}.tar.bz2
 Source1:   i810.xinf
 
+Patch0: intel-prune-by-edid-pixclock.patch
+Patch1: intel-virtual-sizing-bogon.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: pkgconfig
@@ -51,6 +54,8 @@
 %prep
 #%setup -q -n %{tarball}-%{version}
 %setup -q -n xf86-video-intel
+%patch0 -p1 -b .edid-pixclock
+%patch1 -p1 -b .virtual-bogon
 
 %build
 ./autogen.sh --disable-static \
@@ -99,7 +104,13 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
-* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-12.20060717modeset.gc6
+* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-13.20060717modeset.fc6
+- intel-prune-by-edid-pixclock.patch: Honor the EDID-reported maximum pixel
+  clock when computing the modes list.
+- intel-virtual-sizing-bogon.patch: Don't interpret the size of the display
+  in centimeters as the size of the display in pixels.
+
+* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-12.20060717modeset.fc6
 - Disable spread-spectrum LVDS, various crash and hang fixes, saner output
   probing.
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 01:24:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 21:24:58 -0400
Subject: rpms/icon-naming-utils/devel icon-naming-utils.spec,1.6,1.7
Message-ID: <200608030124.k731OwJS018264@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/icon-naming-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18224

Modified Files:
	icon-naming-utils.spec 
Log Message:
add disttag



Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/devel/icon-naming-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- icon-naming-utils.spec	12 Jul 2006 18:31:11 -0000	1.6
+++ icon-naming-utils.spec	3 Aug 2006 01:24:53 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           icon-naming-utils
 Version:        0.7.3
-Release:        1
+Release:        1%{?dist}
 Summary: 	A script to handle icon names in desktop icon themes
 
 Group:          Development/Tools/Other
@@ -48,6 +48,9 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Wed Aug 02 2006 Warren Togami <wtogami at redhat.com> - 0.7.3-1
+- add disttag
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.3-1
 - Update to 0.7.3
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 01:29:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 21:29:56 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.100,1.101
Message-ID: <200608030129.k731TuZ0020151@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	nfs-utils.spec 
Log Message:
add epoch (#196359)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- nfs-utils.spec	28 Jul 2006 19:38:07 -0000	1.100
+++ nfs-utils.spec	3 Aug 2006 01:29:53 -0000	1.101
@@ -1,7 +1,8 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.9
-Release: 2%{?dist}
+Release: 3%{?dist}
+Epoch: 1
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -248,6 +249,9 @@
 %endif
 
 %changelog
+* Wed Aug 02 2006 <wtogami at redhatcom> 1.0.9-3
+- add epoch (#196359)
+
 * Fri Jul 28 2006 <SteveD at RedHat.com> 1.0.9-2
 - Enabled the creating of mount.nfs and umount.nfs binaries
 - Added mount option fixes suggested by upstream.



From fedora-cvs-commits at redhat.com  Thu Aug  3 01:42:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 21:42:10 -0400
Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec,1.8,1.9
Message-ID: <200608030142.k731gA60022999@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	perl-String-CRC32.spec 
Log Message:
bump



Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-String-CRC32/devel/perl-String-CRC32.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-String-CRC32.spec	12 Jul 2006 07:47:16 -0000	1.8
+++ perl-String-CRC32.spec	3 Aug 2006 01:42:07 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-String-CRC32
 Version:        1.4
-Release:        1.FC6.1
+Release:        2%{?dist}
 
 Summary:        Perl interface for cyclic redundency check generation
 
@@ -53,7 +53,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Aug 02 2006 Warren Togami <wtogami at redhat.com> 1.4-2
+- bump
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 
 - rebuild
 
 * Wed May 31 2006 Jason Vas Dias <jvdias at redhat.com> - 1.4-1.FC6



From fedora-cvs-commits at redhat.com  Thu Aug  3 02:18:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 22:18:03 -0400
Subject: rpms/eog/devel .cvsignore, 1.33, 1.34 eog.spec, 1.55, 1.56 sources,
	1.33, 1.34
Message-ID: <200608030218.k732I3JU031037@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30977

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	12 Jul 2006 18:40:45 -0000	1.33
+++ .cvsignore	3 Aug 2006 02:18:00 -0000	1.34
@@ -1 +1 @@
-eog-2.15.4.tar.bz2
+eog-2.15.90.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- eog.spec	12 Jul 2006 18:40:45 -0000	1.55
+++ eog.spec	3 Aug 2006 02:18:00 -0000	1.56
@@ -12,8 +12,8 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.15.4
-Release: 1
+Version: 2.15.90
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
 License: GPL 
@@ -106,6 +106,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	12 Jul 2006 18:40:45 -0000	1.33
+++ sources	3 Aug 2006 02:18:00 -0000	1.34
@@ -1 +1 @@
-6005450c992cf3f94b3fe3c001e010e1  eog-2.15.4.tar.bz2
+dbf8b439f84f5e326bb0ad110c3073a8  eog-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 02:44:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 2 Aug 2006 22:44:19 -0400
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.25,1.26
Message-ID: <200608030244.k732iJnT006658@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-3.fc6
- Bump for upgrade path from FC5.



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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-drv-nv.spec	24 Jul 2006 17:48:03 -0000	1.25
+++ xorg-x11-drv-nv.spec	3 Aug 2006 02:44:16 -0000	1.26
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.2.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -65,6 +65,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-3.fc6
+- Bump for upgrade path from FC5.
+
 * Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-2.fc6
 - Update nv.xinf: Add about 30 new cards, disable a handful that pci.ids
   says aren't video cards, and comments galore.



From fedora-cvs-commits at redhat.com  Thu Aug  3 04:25:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 00:25:43 -0400
Subject: rpms/gthumb/devel gthumb-2.7.8-options.patch, NONE, 1.1 .cvsignore,
	1.21, 1.22 gthumb.spec, 1.46, 1.47 sources, 1.22, 1.23
Message-ID: <200608030425.k734Phop006531@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6457

Modified Files:
	.cvsignore gthumb.spec sources 
Added Files:
	gthumb-2.7.8-options.patch 
Log Message:
2.7.8


gthumb-2.7.8-options.patch:
 gthumb.1 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gthumb-2.7.8-options.patch ---
--- gthumb-2.7.8/data/gthumb.1.options	2006-08-02 23:34:07.000000000 -0400
+++ gthumb-2.7.8/data/gthumb.1	2006-08-02 23:34:45.000000000 -0400
@@ -5,7 +5,7 @@
 
 .SH "SYNOPSIS"
 .B gthumb 
-[\-\-help] [\-\-version] [\-f] [\-\-fullscreen] [\-s] [\-\-slideshow] 
+[\-\-help] [\-\-version] [\-\-fullscreen] [\-\-slideshow] 
 [\-\-import\-photos] [\fIdirectory\fP] [\fIfilename\fP] ...
 
 .SH "DESCRIPTION"
@@ -18,10 +18,10 @@
 .SH "OPTIONS"
 .LP 
 .TP 
-\fB\-f, \-\-fullscreen\fR
+\fB\-\-fullscreen\fR
 Start in fullscreen mode.
 .TP
-\fB\-s, \-\-slideshow\fR
+\fB\-\-slideshow\fR
 Automatically start a slideshow.
 .TP
 \fB\-\-import\-photos\fR


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	23 May 2006 02:43:51 -0000	1.21
+++ .cvsignore	3 Aug 2006 04:25:39 -0000	1.22
@@ -1 +1 @@
-gthumb-2.7.7.tar.bz2
+gthumb-2.7.8.tar.bz2


Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gthumb.spec	14 Jul 2006 16:44:43 -0000	1.46
+++ gthumb.spec	3 Aug 2006 04:25:39 -0000	1.47
@@ -9,8 +9,8 @@
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
-Version: 2.7.7
-Release: 4
+Version: 2.7.8
+Release: 1%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2
 License: GPL
@@ -43,6 +43,7 @@
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 Patch0: gthumb-2.7.3-use-local-filename.patch
+Patch1: gthumb-2.7.8-options.patch
 
 %description
 gthumb is an application for viewing, editing, and organizing 
@@ -51,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .use-local-filename
+%patch1 -p1 -b .options
 
 %build
 
@@ -111,6 +113,10 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.8-1.fc6
+- Update to 2.7.8
+- Fix some documentation inaccuracies (#175165)
+
 * Fri Jul 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.7-4
 - Don't BR gphoto2-devel on s390
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 May 2006 02:43:51 -0000	1.22
+++ sources	3 Aug 2006 04:25:39 -0000	1.23
@@ -1 +1 @@
-cb2fac94310bd6289b5a31b7a9fc50db  gthumb-2.7.7.tar.bz2
+fa5634b5f7fcd5b50dd88fa6036a0042  gthumb-2.7.8.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 04:46:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 00:46:37 -0400
Subject: rpms/sound-juicer/devel .cvsignore, 1.25, 1.26 sound-juicer.spec,
	1.58, 1.59 sources, 1.27, 1.28
Message-ID: <200608030446.k734kbCQ009528@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9453

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	14 Jun 2006 11:43:54 -0000	1.25
+++ .cvsignore	3 Aug 2006 04:46:31 -0000	1.26
@@ -1 +1 @@
-sound-juicer-2.15.3.tar.bz2
+sound-juicer-2.15.4.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sound-juicer.spec	19 Jul 2006 15:37:28 -0000	1.58
+++ sound-juicer.spec	3 Aug 2006 04:46:31 -0000	1.59
@@ -12,8 +12,8 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.15.3
-Release:	3
+Version:	2.15.4
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -79,8 +79,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` 
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/sound-juicer.schemas > /dev/null
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` 
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/sound-juicer.schemas > /dev/null
+fi
 
 %post
 scrollkeeper-update -q
@@ -110,6 +112,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1.fc6
+- Update to 2.15.4
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-3
 - Rebuild against dbus
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	14 Jun 2006 11:43:54 -0000	1.27
+++ sources	3 Aug 2006 04:46:31 -0000	1.28
@@ -1 +1 @@
-050cc1db0c681d023b784a4c8a9c9738  sound-juicer-2.15.3.tar.bz2
+cfe4be06f6fa4b349cad6331e045de7a  sound-juicer-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 05:04:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 01:04:04 -0400
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.30,
	1.31 gnome-icon-theme.spec, 1.51, 1.52 sources, 1.33, 1.34
Message-ID: <200608030504.k73544In029153@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29044

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	12 Jul 2006 17:52:55 -0000	1.30
+++ .cvsignore	3 Aug 2006 05:03:55 -0000	1.31
@@ -1 +1 @@
-gnome-icon-theme-2.15.3.tar.bz2
+gnome-icon-theme-2.15.90.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnome-icon-theme.spec	12 Jul 2006 17:52:55 -0000	1.51
+++ gnome-icon-theme.spec	3 Aug 2006 05:03:55 -0000	1.52
@@ -1,13 +1,13 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.15.3
-Release: 1
+Version: 2.15.90
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
 BuildArch: noarch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: icon-naming-utils >= 0.7.2
+BuildRequires: icon-naming-utils >= 0.7.3
 BuildRequires: perl-XML-Parser
 BuildRequires: pkgconfig
 BuildRequires: gettext
@@ -69,6 +69,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Thu Aug  2 2006 Matthias Clasen <mclasen at redhat.com> 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1
 - Update to 2.15.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	12 Jul 2006 17:52:55 -0000	1.33
+++ sources	3 Aug 2006 05:03:55 -0000	1.34
@@ -1 +1 @@
-ddb23c7f01e4b5d94f8e9e084712191a  gnome-icon-theme-2.15.3.tar.bz2
+e2d9221450d2f4ac3d77d353b5e0df7a  gnome-icon-theme-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 05:11:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 01:11:35 -0400
Subject: rpms/icon-naming-utils/devel icon-naming-utils.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200608030511.k735BZNA030808@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/icon-naming-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30750

Modified Files:
	icon-naming-utils.spec sources 
Log Message:
0.8.0



Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/devel/icon-naming-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- icon-naming-utils.spec	3 Aug 2006 01:24:53 -0000	1.7
+++ icon-naming-utils.spec	3 Aug 2006 05:11:32 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           icon-naming-utils
-Version:        0.7.3
+Version:        0.8.0
 Release:        1%{?dist}
 Summary: 	A script to handle icon names in desktop icon themes
 
@@ -48,6 +48,9 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.0-1.fc6
+- Update to 0.8.0
+
 * Wed Aug 02 2006 Warren Togami <wtogami at redhat.com> - 0.7.3-1
 - add disttag
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Jul 2006 18:31:11 -0000	1.5
+++ sources	3 Aug 2006 05:11:32 -0000	1.6
@@ -1 +1 @@
-279563513efcb61f3af99358f061ae66  icon-naming-utils-0.7.3.tar.gz
+4cdb3ad449abe8b55e4559b85d0ac4e0  icon-naming-utils-0.8.0.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug  3 07:10:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 03:10:37 -0400
Subject: rpms/gdm/devel gdm-2.15.6-fix-face-browser.patch, NONE,
	1.1 gdm-2.15.5-reset-pam.patch, 1.1, 1.2 gdm.spec, 1.185, 1.186
Message-ID: <200608030710.k737AaqP008931@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30974

Modified Files:
	gdm-2.15.5-reset-pam.patch gdm.spec 
Added Files:
	gdm-2.15.6-fix-face-browser.patch 
Log Message:
- fix face browser
  (http://bugzilla.gnome.org/show_bug.cgi?id=349640)
- fix error message reporting
  (http://bugzilla.gnome.org/show_bug.cgi?id=349758)


gdm-2.15.6-fix-face-browser.patch:
 greeter.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE gdm-2.15.6-fix-face-browser.patch ---
--- gdm-2.15.6/gui/greeter/greeter.c.dont-setup-io-channel-until-after-faces	2006-08-03 01:43:22.000000000 -0400
+++ gdm-2.15.6/gui/greeter/greeter.c	2006-08-03 01:44:29.000000000 -0400
@@ -1138,20 +1138,6 @@ main (int argc, char *argv[])
 	  gdm_common_fail_greeter ("Could not set signal mask!");
   }
   
-  if G_LIKELY (! DOING_GDM_DEVELOPMENT) {
-    ctrlch = g_io_channel_unix_new (STDIN_FILENO);
-    g_io_channel_set_encoding (ctrlch, NULL, NULL);
-    g_io_channel_set_buffered (ctrlch, TRUE);
-    g_io_channel_set_flags (ctrlch, 
-			    g_io_channel_get_flags (ctrlch) | G_IO_FLAG_NONBLOCK,
-			    NULL);
-    g_io_add_watch (ctrlch, 
-		    G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-		    (GIOFunc) greeter_ctrl_handler,
-		    NULL);
-    g_io_channel_unref (ctrlch);
-  }
-
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
   if G_UNLIKELY (DOING_GDM_DEVELOPMENT) {
@@ -1338,6 +1324,20 @@ main (int argc, char *argv[])
   
   greeter_setup_items ();
 
+  if G_LIKELY (! DOING_GDM_DEVELOPMENT) {
+    ctrlch = g_io_channel_unix_new (STDIN_FILENO);
+    g_io_channel_set_encoding (ctrlch, NULL, NULL);
+    g_io_channel_set_buffered (ctrlch, TRUE);
+    g_io_channel_set_flags (ctrlch, 
+			    g_io_channel_get_flags (ctrlch) | G_IO_FLAG_NONBLOCK,
+			    NULL);
+    g_io_add_watch (ctrlch, 
+		    G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+		    (GIOFunc) greeter_ctrl_handler,
+		    NULL);
+    g_io_channel_unref (ctrlch);
+  }
+
   gdm_common_setup_blinking ();
 
   gtk_widget_show_all (window);

gdm-2.15.5-reset-pam.patch:
 daemon/gdm.c          |    8 ++++++++
 daemon/gdm.h          |    4 ++++
 daemon/slave.c        |   34 +++++++++++++++++++++++++++-------
 gui/greeter/greeter.c |   18 +++++-------------
 4 files changed, 44 insertions(+), 20 deletions(-)

Index: gdm-2.15.5-reset-pam.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.5-reset-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.15.5-reset-pam.patch	7 Jul 2006 21:26:52 -0000	1.1
+++ gdm-2.15.5-reset-pam.patch	3 Aug 2006 07:10:32 -0000	1.2
@@ -168,10 +168,10 @@
 -	    g_free (tmp);
 -	  }
 -
++
 +	greeter_item_ulist_unset_selected_user ();
 +	greeter_item_pam_prompt ("", PW_ENTRY_SIZE, TRUE);
 +	greeter_item_pam_message ("");
-+	greeter_item_pam_error ("");
 + 
  	printf ("%c\n", STX);
  	fflush (stdout);


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- gdm.spec	22 Jul 2006 04:13:19 -0000	1.185
+++ gdm.spec	3 Aug 2006 07:10:32 -0000	1.186
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 13
+Release: 14%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -51,6 +51,7 @@
 Patch23: gdm-2.15.6-fix-setup-hang.patch
 Patch24: gdm-2.15.6-wtmp.patch
 Patch25: gdm-2.15.6-center-cursor.patch
+Patch26: gdm-2.15.6-fix-face-browser.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -135,6 +136,7 @@
 %patch23 -p1 -b .fix-setup-hang
 %patch24 -p1 -b .wtmp
 %patch25 -p1 -b .center-cursor
+%patch26 -p1 -b .fix-face-browser
 
 # 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
@@ -330,6 +332,12 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Thu Aug 3 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-14
+- fix face browser
+  (http://bugzilla.gnome.org/show_bug.cgi?id=349640)
+- fix error message reporting
+  (http://bugzilla.gnome.org/show_bug.cgi?id=349758)
+
 * Fri Jul 21 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-13
 - simply all the security token code by only using one pam stack
 - drop lame kill on token removal feature



From fedora-cvs-commits at redhat.com  Thu Aug  3 07:40:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 03:40:19 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2515,1.2516
Message-ID: <200608030740.k737eJn8000497@cvs.devel.redhat.com>

Author: jcm

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Hopefully fixed #197220 by copying config to include/config/auto.conf



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2515
retrieving revision 1.2516
diff -u -r1.2515 -r1.2516
--- kernel-2.6.spec	2 Aug 2006 22:56:39 -0000	1.2515
+++ kernel-2.6.spec	3 Aug 2006 07:40:16 -0000	1.2516
@@ -1165,6 +1165,8 @@
     # external modules can be built
     touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h
     touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/autoconf.h
+    # Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
+    cp $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf
     cd ..
 
     #
@@ -1632,6 +1634,10 @@
 %endif
 
 %changelog
+* Thu Aug  3 2006 Jon Masters <jcm at redhat.com>
+- Copy .config to include/config/auto.conf to avoid unnecessary "make prepare".
+- This should finally fix #197220.
+
 * Wed Aug  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3-git2
 - Readd patch to allow 460800 baud on 16C950 UARTs.



From fedora-cvs-commits at redhat.com  Thu Aug  3 08:45:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 04:45:52 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-shutdown-submount-expire.patch,
	NONE, 1.1 autofs.spec, 1.135, 1.136
Message-ID: <200608030845.k738jplg016523@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-shutdown-submount-expire.patch 
Log Message:
* Thu Aug 3 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.10
- cthon corrections for shutdown patch below and fix shutdown expire.


autofs-5.0.1-rc1-shutdown-submount-expire.patch:
 CHANGELOG           |    1 
 daemon/automount.c  |   16 ++----
 daemon/direct.c     |  121 +++++++++++++++++++++++++++++++---------------------
 daemon/indirect.c   |   90 ++++++++++++++++++++++++++++----------
 include/automount.h |    2 
 lib/master.c        |   41 ++++++-----------
 6 files changed, 165 insertions(+), 106 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-shutdown-submount-expire.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index b0a255a..3baff69 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@
   with various combinations of submounts (still broken).
 - cthon fix expire of various forms of nested mounts.
 - cthon fix some shutdown races.
+- cthon corrections for above patch and fix shutdown expire.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 35d443c..ff05ae2 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -198,8 +198,6 @@ static int walk_tree(const char *base, i
 			while (n--) {
 				int ret, size;
 
-				sched_yield();
-
 				if (strcmp(de[n]->d_name, ".") == 0 ||
 				    strcmp(de[n]->d_name, "..") == 0) {
 					free(de[n]);
@@ -387,7 +385,7 @@ int umount_multi(struct autofs_point *ap
 
 		me = lookup_source_mapent(ap, ind_key);
 		if (!me) {
-			warn(ap->logopt, "no mounts found under %s", path);
+			warn(ap->logopt, "map entry not found for %s", path);
 			return 0;
 		}
 	}
@@ -421,7 +419,7 @@ int umount_multi(struct autofs_point *ap
 	}
 	cache_unlock(me->source->mc);
 
-	if (left || is_autofs_fs || ap->submount)
+	if (left || is_autofs_fs)
 		return left;
 
 	/*
@@ -1034,10 +1032,8 @@ static void handle_mounts_cleanup(void *
 	st_remove_tasks(ap);
 	umount_autofs(ap, 1);
 
-	if (submount)
-		master_signal_submount(ap, MASTER_SUBMNT_JOIN);
-	else
-		master_remove_mapent(ap->entry);
+	master_signal_submount(ap, MASTER_SUBMNT_JOIN);
+	master_remove_mapent(ap->entry);
 	master_free_mapent_sources(ap->entry, 1);
 	master_free_mapent(ap->entry);
 
@@ -1161,8 +1157,8 @@ void *handle_mounts(void *arg)
 	 * So, the solution is a recipe for disaster.
 	 * Hope we don't get a really busy system!
 	 */
-	sleep(1);
-	/* sched_yield(); */
+	/*sleep(1);*/
+	sched_yield();
 
 	return NULL;
 }
diff --git a/daemon/direct.c b/daemon/direct.c
index a2aea9c..c155617 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -112,13 +112,13 @@ static int autofs_init_direct(struct aut
 int do_umount_autofs_direct(struct autofs_point *ap, struct mnt_list *mnts, struct mapent *me)
 {
 	char buf[MAX_ERR_BUF];
-	int ioctlfd, rv, left;
+	int ioctlfd, rv, left, retries;
 
 	left = umount_multi(ap, me->key, 1);
 	if (left) {
 		warn(ap->logopt, "could not unmount %d dirs under %s",
 		     left, me->key);
-		return -1;
+		return 1;
 	}
 
 	if (me->ioctlfd != -1) {
@@ -161,9 +161,19 @@ int do_umount_autofs_direct(struct autof
 		error(ap->logopt,
 		      "couldn't get ioctl fd for offset %s", me->key);
 		debug(ap->logopt, "open: %s", estr);
+		return 1;
+	}
+
+	sched_yield();
+
+	retries = UMOUNT_RETRIES;
+	while ((rv = umount(me->key)) == -1 && retries--) {
+		struct timespec tm = {0, 100000000};
+		if (errno != EBUSY)
+			break;
+		nanosleep(&tm, NULL);
 	}
 
-	rv = umount(me->key);
 	if (rv == -1) {
 		switch (errno) {
 		case ENOENT:
@@ -230,7 +240,6 @@ int umount_autofs_direct(struct autofs_p
 		cache_readlock(mc);
 		me = cache_enumerate(mc, NULL);
 		while (me) {
-			sched_yield();
 			/* TODO: check return, locking me */
 			do_umount_autofs_direct(ap, mnts, me);
 			me = cache_enumerate(mc, me);
@@ -491,7 +500,7 @@ int mount_autofs_direct(struct autofs_po
 int umount_autofs_offset(struct autofs_point *ap, struct mapent *me)
 {
 	char buf[MAX_ERR_BUF];
-	int ioctlfd, rv = 1;
+	int ioctlfd, rv = 1, retries;
 
 	if (me->ioctlfd != -1) {
 		if (is_mounted(_PATH_MOUNTED, me->key, MNTS_REAL)) {
@@ -543,7 +552,16 @@ int umount_autofs_offset(struct autofs_p
 		goto force_umount;
 	}
 
-	rv = umount(me->key);
+	sched_yield();
+
+	retries = UMOUNT_RETRIES;
+	while ((rv = umount(me->key)) == -1 && retries--) {
+		struct timespec tm = {0, 100000000};
+		if (errno != EBUSY)
+			break;
+		nanosleep(&tm, NULL);
+	}
+
 	if (rv == -1) {
 		switch (errno) {
 		case ENOENT:
@@ -703,6 +721,49 @@ out_err:
 	return -1;
 }
 
+static int expire_direct(int ioctlfd, const char *path, unsigned int when, int count, unsigned int logopt)
+{
+	char *estr, buf[MAX_ERR_BUF];
+	int ret, retries = count;
+
+	while (retries--) {
+		struct timespec tm = {0, 100000000};
+		int busy = 0;
+
+		ret = ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &busy);
+		if (ret == -1) {
+			/* Mount has gone away */
+			if (errno == EBADF)
+				return 1;
+
+			estr = strerror_r(errno, buf, MAX_ERR_BUF);
+			error(logopt, "ioctl failed: %s", estr);
+			return 0;
+		}
+
+		/* No need to go further */
+		if (busy)
+			return 0;
+
+		sched_yield();
+
+		/* Ggenerate expire message for the mount. */
+		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_DIRECT, &when);
+		if (ret == -1) {
+			/* Mount has gone away */
+			if (errno == EBADF)
+				return 1;
+
+			/* Need to wait for the kernel ? */
+			if (errno != EAGAIN)
+				return 0;
+		}
+		nanosleep(&tm, NULL);
+	}
+
+	return 1;
+}
+
 void *expire_proc_direct(void *arg)
 {
 	struct map_source *map;
@@ -710,7 +771,7 @@ void *expire_proc_direct(void *arg)
 	struct expire_args *ea;
 	struct autofs_point *ap;
 	struct mapent_cache *mc = NULL;
-	struct mapent *ro, *me = NULL;
+	struct mapent *me = NULL;
 	unsigned int now;
 	int ioctlfd = -1;
 	int status, ret;
@@ -751,11 +812,9 @@ void *expire_proc_direct(void *arg)
 			continue;
 
 		/* Skip offsets */
-		if (strstr(next->opts, "offsets"))
+		if (strstr(next->opts, "offset"))
 			continue;
 
-		sched_yield();
-
 		/*
 		 * All direct mounts must be present in the map
 		 * entry cache.
@@ -787,48 +846,16 @@ void *expire_proc_direct(void *arg)
 
 		debug(ap->logopt, "send expire to trigger %s", next->path);
 
-		/* Finally generate an expire message for the direct mount. */
-		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_DIRECT, &now);
-		if (ret < 0 && errno != EAGAIN) {
+		ret = expire_direct(ioctlfd, next->path,
+				    now, EXPIRE_RETRIES, ap->logopt);
+		if (!ret) {
 			debug(ap->logopt,
-			      "failed to expire mount %s", next->path);
-			ea->status = 1;
+			     "failed to expire mount %s", next->path);
+			ea->status++;
 		}
 	}
 	free_mnt_list(mnts);
 
-	pthread_cleanup_push(master_source_lock_cleanup, ap->entry);
-	master_source_readlock(ap->entry);
-	map = ap->entry->first;
-	while (map) {
-		mc = map->mc;
-		pthread_cleanup_push(cache_lock_cleanup, mc);
-		cache_readlock(mc);
-		me = cache_enumerate(mc, NULL);
-		while (me) {
-			sched_yield();
-
-			if (me->ioctlfd >= 0)
-				/* Real mounts have an open ioctl fd */
-				ioctlfd = me->ioctlfd;
-			else {
-				me = cache_enumerate(mc, me);
-				continue;
-			}
-
-			if (!ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {
-				if (!ret) {
-					ea->status = 1;
-					break;
-				}
-			}
-			me = cache_enumerate(mc, me);
-		}
-		pthread_cleanup_pop(1);
-		map = map->next;
-	}
-
-	pthread_cleanup_pop(1);
 	pthread_cleanup_pop(1);
 
 	return NULL;
diff --git a/daemon/indirect.c b/daemon/indirect.c
index 406bf72..af84629 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -281,8 +281,7 @@ int mount_autofs_indirect(struct autofs_
 int umount_autofs_indirect(struct autofs_point *ap)
 {
 	char buf[MAX_ERR_BUF];
-	struct stat st;
-	int ret, rv;
+	int ret, rv, retries;
 
 	/*
 	 * Since submounts look after themselves the parent never knows
@@ -318,7 +317,16 @@ int umount_autofs_indirect(struct autofs
 	if (ap->kpipefd >= 0)
 		close(ap->kpipefd);
 
-	rv = umount(ap->path);
+	sched_yield();
+
+	retries = UMOUNT_RETRIES;
+	while ((rv = umount(ap->path)) == -1 && retries--) {
+		struct timespec tm = {0, 100000000};
+		if (errno != EBUSY)
+			break;
+		nanosleep(&tm, NULL);
+	}
+
 	if (rv == -1) {
 		switch (errno) {
 		case ENOENT:
@@ -356,6 +364,50 @@ force_umount:
 	return rv;
 }
 
+static int expire_indirect(int ioctlfd, const char *path, unsigned int when, int count, unsigned int logopt)
+{
+	char *estr, buf[MAX_ERR_BUF];
+	int ret, retries = count;
+
+	while (retries--) {
+		struct timespec tm = {0, 100000000};
+		int busy = 0;
+
+		ret = ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &busy);
+		if (ret == -1) {
+			/* Mount has gone away */
+			if (errno == EBADF)
+				return 1;
+
+			estr = strerror_r(errno, buf, MAX_ERR_BUF);
+			error(logopt, "ioctl failed: %s", estr);
+			return 0;
+		}
+
+		/* No need to go further */
+		if (busy)
+			return 0;
+
+		sched_yield();
+
+		/* Ggenerate expire message for the mount. */
+		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_DIRECT, &when);
+		if (ret == -1) {
+			/* Mount has gone away */
+			if (errno == EBADF)
+				return 1;
+
+			/* Need to wait for the kernel ? */
+			if (errno != EAGAIN)
+				return 0;
+		}
+
+		nanosleep(&tm, NULL);
+	}
+
+	return 1;
+}
+
 void *expire_proc_indirect(void *arg)
 {
 	struct map_source *map;
@@ -368,7 +420,6 @@ void *expire_proc_indirect(void *arg)
 	int offsets, submnts, count;
 	int ioctlfd, limit;
 	int status, ret;
-	char buf[MAX_ERR_BUF];
 
 	ea = (struct expire_args *) arg;
 
@@ -407,8 +458,6 @@ void *expire_proc_indirect(void *arg)
 		if (!strcmp(next->fs_type, "autofs"))
 			continue;
 
-		sched_yield();
-
 		/*
 		 * If the mount corresponds to an offset trigger then
 		 * the key is the path, otherwise it's the last component.
@@ -452,14 +501,13 @@ void *expire_proc_indirect(void *arg)
 
 		debug(ap->logopt, "expire %s", next->path);
 
-		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_MULTI, &now);
-		if (ret < 0 && errno != EAGAIN) {
-			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-			warn(ap->logopt,
-			     "failed to expire mount %s:", next->path, estr);
-			ea->status = 1;
+		ret = expire_indirect(ioctlfd, next->path,
+				      now, EXPIRE_RETRIES, ap->logopt);
+		if (!ret) {
+			debug(ap->logopt,
+			      "failed to expire mount %s", next->path);
+			ea->status++;
 		}
-
 	}
 	free_mnt_list(mnts);
 
@@ -469,17 +517,11 @@ void *expire_proc_indirect(void *arg)
 	 * umount them here.
 	 */
 	limit = count_mounts(ap, ap->path);
-	while (limit--) {
-		ret = ioctl(ap->ioctlfd, AUTOFS_IOC_EXPIRE_MULTI, &now);
-		if (ret < 0) {
-			if (errno == EAGAIN)
-				break;
-			warn(ap->logopt,
-			      "failed to expire offsets under %s",
-			      ap->path);
-			ea->status = 1;
-			break;
-		}
+	ret = expire_indirect(ap->ioctlfd, ap->path, now, limit, ap->logopt);
+	if (!ret) {
+		debug(ap->logopt,
+		      "failed to expire offsets under %s", ap->path);
+		ea->status++;
 	}
 
 	count = offsets = submnts = 0;
diff --git a/include/automount.h b/include/automount.h
index 4c4d507..800e7b0 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -123,6 +123,8 @@ #define CHE_DUPLICATE	0x0020
 
 #define HASHSIZE		77
 #define NEGATIVE_TIMEOUT	10
+#define UMOUNT_RETRIES		25
+#define EXPIRE_RETRIES		15
 
 struct mapent_cache {
 	pthread_rwlock_t rwlock;
diff --git a/lib/master.c b/lib/master.c
index bcda72a..d76ffac 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -131,13 +131,6 @@ void master_free_autofs_point(struct aut
 	if (!ap)
 		return;
 
-	if (ap->submount) {
-		mounts_mutex_lock(ap);
-		ap->parent->submnt_count--;
-		list_del(&ap->mounts);
-		mounts_mutex_unlock(ap);
-	}
-
 	status = pthread_mutex_destroy(&ap->state_mutex);
 	if (status)
 		fatal(status);
@@ -631,6 +624,9 @@ void master_add_mapent(struct master *ma
 
 void master_remove_mapent(struct master_mapent *entry)
 {
+	if (entry->ap->submount)
+		return;
+
 	master_mutex_lock();
 	if (!list_empty(&entry->list))
 		list_del_init(&entry->list);
@@ -739,13 +735,17 @@ int master_read_master(struct master *ma
 	return 1;
 }
 
-static void notify_submounts(struct autofs_point *ap, enum states state)
+void master_notify_submounts(struct autofs_point *ap, enum states state)
 {
 	struct list_head *head, *p;
 	struct autofs_point *this;
 	pthread_t thid;
 	int status;
 
+	/* Initiate from master entries only */
+	if (ap->submount || list_empty(&ap->submounts))
+		return;
+
 	mounts_mutex_lock(ap);
 
 	head = &ap->submounts;
@@ -756,7 +756,7 @@ static void notify_submounts(struct auto
 		p = p->next;
 
 		if (!list_empty(&this->submounts))
-			notify_submounts(this, state);
+			master_notify_submounts(this, state);
 
 		state_mutex_lock(this);
 
@@ -776,11 +776,9 @@ static void notify_submounts(struct auto
 			if (status)
 				fatal(status);
 			if (ap->mounts_signaled == MASTER_SUBMNT_JOIN) {
-				mounts_mutex_unlock(ap);
 				status = pthread_join(thid, NULL);
 				if (status)
 					fatal(status);
-				mounts_mutex_lock(ap);
 			}
 		}
 	}
@@ -790,30 +788,23 @@ static void notify_submounts(struct auto
 	return;
 }
 
-void master_notify_submounts(struct autofs_point *ap, enum states state)
-{
-	/* Initiate from master entries only */
-	if (ap->submount || list_empty(&ap->submounts))
-		return;
-	master_mutex_lock();
-	notify_submounts(ap, state);
-	master_mutex_unlock();
-	return;
-}
-
 void master_signal_submount(struct autofs_point *ap, unsigned int join)
 {
 	int status;
 
-	if (!ap->parent)
+	if (!ap->parent || !ap->submount)
 		return;
 
 	mounts_mutex_lock(ap->parent);
 
-	if (join)
+	if (join) {
+		/* We are finishing up */
+		ap->parent->submnt_count--;
+		list_del(&ap->mounts);
 		ap->parent->mounts_signaled = 1;
-	else
+	} else
 		ap->parent->mounts_signaled = 2;
+
 	status = pthread_cond_signal(&ap->parent->mounts_cond);
 	if (status)
 		fatal(status);


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- autofs.spec	2 Aug 2006 13:57:11 -0000	1.135
+++ autofs.spec	3 Aug 2006 08:45:48 -0000	1.136
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.9
+%define release 0.rc1.10
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -26,6 +26,7 @@
 Patch13: autofs-5.0.1-rc1-cthon-expire-nested.patch
 Patch14: autofs-5.0.1-rc1-compile-error.patch
 Patch15: autofs-5.0.1-rc1-shutdown-races.patch
+Patch16: autofs-5.0.1-rc1-shutdown-submount-expire.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -80,6 +81,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -136,6 +138,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Aug 3 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.10
+- cthon corrections for shutdown patch below and fix shutdown expire.
+
 * Wed Aug 2 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.9
 - cthon fix some shutdown races.
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 08:48:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 04:48:29 -0400
Subject: rpms/hwdata/devel .cvsignore, 1.70, 1.71 hwdata.spec, 1.72,
	1.73 sources, 1.73, 1.74
Message-ID: <200608030848.k738mT3F032023@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30224

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
- Last update for pci.ids before final.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	25 Jul 2006 14:56:03 -0000	1.70
+++ .cvsignore	3 Aug 2006 08:48:27 -0000	1.71
@@ -1 +1 @@
-hwdata-0.185.tar.gz
+hwdata-0.186.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- hwdata.spec	25 Jul 2006 14:56:03 -0000	1.72
+++ hwdata.spec	3 Aug 2006 08:48:27 -0000	1.73
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.185
+Version: 0.186
 Release: 1
 License: GPL/MIT
 Group: System Environment/Base
@@ -33,6 +33,9 @@
 %config /usr/share/hwdata/*
 
 %changelog
+* Thu Aug 03 2006 Phil Knirsch <pknirsch at redhat.com> - 0.186-1
+- Updated pci.ids once more.
+
 * Tue Jul 25 2006 Phil Knirsch <pknirsch at redhat.com> - 0.185-1
 - Added the 17inch Philips LCD monitor entry (#199828)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	25 Jul 2006 14:56:03 -0000	1.73
+++ sources	3 Aug 2006 08:48:27 -0000	1.74
@@ -1 +1 @@
-2c3f10095780106114e12944b764a396  hwdata-0.185.tar.gz
+17b3340c70005f25edac235ed0f72254  hwdata-0.186.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug  3 08:50:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 04:50:10 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc3-git2.bz2.sign,NONE,1.1
Message-ID: <200608030850.k738oAHV032648@cvs.devel.redhat.com>

Author: jcm

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

Added Files:
	patch-2.6.18-rc3-git2.bz2.sign 
Log Message:
make SRPM was failing.



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

iD8DBQBE0PdfyGugalF9Dw4RAoh2AJ9l/CCn00cnbGOQf8qvYf5zYINaOwCfVrJK
r+yFuZ2jZQvgQRZ23WfRkug=
=GjEk
-----END PGP SIGNATURE-----



From fedora-cvs-commits at redhat.com  Thu Aug  3 08:53:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 04:53:07 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2516,1.2517
Message-ID: <200608030853.k738r7Mg001202@cvs.devel.redhat.com>

Author: jcm

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Updated spec file for previous commit.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2516
retrieving revision 1.2517
diff -u -r1.2516 -r1.2517
--- kernel-2.6.spec	3 Aug 2006 07:40:16 -0000	1.2516
+++ kernel-2.6.spec	3 Aug 2006 08:53:00 -0000	1.2517
@@ -1637,6 +1637,7 @@
 * Thu Aug  3 2006 Jon Masters <jcm at redhat.com>
 - Copy .config to include/config/auto.conf to avoid unnecessary "make prepare".
 - This should finally fix #197220.
+- Pulled in patch-2.6.18-rc3-git2.bz2.sign to fix SRPM build failure.
 
 * Wed Aug  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3-git2



From fedora-cvs-commits at redhat.com  Thu Aug  3 08:59:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 04:59:19 -0400
Subject: rpms/openoffice.org/devel workspace.icuupgrade.patch, NONE,
	1.1 openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch,
	1.1, NONE openoffice.org.2.0.3-gcc28409.anonymousexternc.patch,
	1.1, NONE
Message-ID: <200608030859.k738xJv4003314@cvs.devel.redhat.com>

Author: caolanm

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

Added Files:
	workspace.icuupgrade.patch 
Removed Files:
	openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch 
	openoffice.org.2.0.3-gcc28409.anonymousexternc.patch 
Log Message:
remove some dead wood, and replace patches with their respective workspace names

workspace.icuupgrade.patch:
 gdi/sallayout.cxx       |   82 +++++++++++++++++++++++++-----------------------
 glyphs/gcach_layout.cxx |   31 ++++++++++++++----
 2 files changed, 68 insertions(+), 45 deletions(-)

--- NEW FILE workspace.icuupgrade.patch ---
Index: gsl/vcl/source/gdi/sallayout.cxx
diff -u gsl/vcl/source/gdi/sallayout.cxx:1.80 gsl/vcl/source/gdi/sallayout.cxx:1.78.42.5
--- gsl/vcl/source/gdi/sallayout.cxx:1.80	Mon Jun 19 12:31:39 2006
+++ gsl/vcl/source/gdi/sallayout.cxx	Fri Jul  7 03:28:33 2006
@@ -77,6 +77,8 @@
 #pragma warning(pop)
 #endif 
 
+#include <algorithm>
+
 // =======================================================================
 
 int GetVerticalFlags( sal_Unicode nChar )
@@ -635,48 +637,48 @@
 
 bool ImplLayoutArgs::PrepareFallback()
 {
-    // return early if a fallback is not needed
+    // short circuit if no fallback is needed
     if( maReruns.IsEmpty() )
     {
         maRuns.Clear();
         return false;
     }
 
-    // convert the fallback request to a layout request
-
-    // sort out chars that were not requested anyway
-    ImplLayoutRuns aOrigRuns = maRuns;
-    maRuns.Clear();
+    // convert the fallback requests to layout requests
     bool bRTL;
-    int nMin1, nEnd1;
+    int nMin, nEnd;
+
+    // get the individual fallback requests
+    typedef std::vector<int> IntVector;
+    IntVector aPosVector;
+    aPosVector.reserve( mnLength );
     maReruns.ResetPos();
-    for(; maReruns.GetRun( &nMin1, &nEnd1, &bRTL ); maReruns.NextRun() )
+    for(; maReruns.GetRun( &nMin, &nEnd, &bRTL ); maReruns.NextRun() )
+        for( int i = nMin; i < nEnd; ++i )
+            aPosVector.push_back( i );
+    maReruns.Clear();
+
+    // sort the individual fallback requests
+    std::sort( aPosVector.begin(), aPosVector.end() );
+
+    // adjust fallback runs to have the same order and limits of the original runs
+    ImplLayoutRuns aNewRuns;
+    maRuns.ResetPos();
+    for(; maRuns.GetRun( &nMin, &nEnd, &bRTL ); maRuns.NextRun() )
     {
-        // find a matching layout run and clip the fallback run to it
-        // TODO: improve O(n^2) algorithm
-        int nMin2, nEnd2;
-        aOrigRuns.ResetPos();
-        for(; aOrigRuns.GetRun( &nMin2, &nEnd2, &bRTL ); aOrigRuns.NextRun() )
-        {
-            // ignore runs that don't overlap
-            if( nMin1 >= nEnd2 )
-                continue;
-            if( nEnd1 <= nMin2 )
-                continue;
-            // clip the fallback run to the layout run
-            if( nMin1 < nMin2 )
-                nMin1 = nMin2;
-            if( nEnd1 > nEnd2 )
-                nEnd1 = nEnd2;
-            // if there is something left request the fallback
-            if( nMin1 < nEnd1 )
-                maRuns.AddRun( nMin1, nEnd1, bRTL );
-            break;
+        if( !bRTL) {
+            IntVector::const_iterator it = std::lower_bound( aPosVector.begin(), aPosVector.end(), nMin );
+            for(; (it != aPosVector.end()) && (*it < nEnd); ++it )
+                aNewRuns.AddPos( *it, bRTL );
+        } else {
+            IntVector::const_iterator it = std::upper_bound( aPosVector.begin(), aPosVector.end(), nEnd );
+            while( (it != aPosVector.begin()) && (*--it >= nMin) )
+                aNewRuns.AddPos( *it, bRTL );
         }
     }
 
+    maRuns = aNewRuns;  // TODO: use vector<>::swap()
     maRuns.ResetPos();
-    maReruns.Clear();
     return true;
 }
 
@@ -1063,7 +1065,8 @@
         n = pG->mnCharPos - rArgs.mnMinCharPos;
         if( (n < 0) || (nCharCount <= n) )
             continue;
-        pLogCluster[ n ] = i;
+        if( pLogCluster[ n ] < 0 )
+            pLogCluster[ n ] = i;
         if( nBasePointX < 0 )
             nBasePointX = pG->maLinearPos.X();
     }
@@ -1740,20 +1743,23 @@
             }
         }
 
-        // if a justification array is available => override the advance width
+        // if a justification array is available
+        // => use it directly to advance to the next x-position
         if( aMultiArgs.mpDXArray )
         {
             // the run advance is the width from the first char
             // in the run to the first char in the next run
             nRunAdvance = 0;
-            int nRelPos = nCharPos[0] - mnMinCharPos;
-            if( nRelPos > 0 )
-                nRunAdvance += aMultiArgs.mpDXArray[ nRelPos-1 ];
-            nRelPos = nActiveCharPos - mnMinCharPos;
-            if( nRelPos > 0 )
-                nRunAdvance -= aMultiArgs.mpDXArray[ nRelPos-1 ];
-            if( nRunAdvance < 0 )
+            const bool bLTR = (nActiveCharPos < nCharPos[0]);
+            int nDXIndex = nCharPos[0] - mnMinCharPos - bLTR;
+            if( nDXIndex >= 0 )
+                nRunAdvance += aMultiArgs.mpDXArray[ nDXIndex ];
+            nDXIndex = nActiveCharPos - mnMinCharPos - bLTR;
+            if( nDXIndex >= 0 )
+                nRunAdvance -= aMultiArgs.mpDXArray[ nDXIndex ];
+            if( !bLTR )
                 nRunAdvance = -nRunAdvance;
+
             // convert justification array units into fallback font units
             nRunAdvance *= mpLayouts[n]->GetUnitsPerPixel();
         }
Index: gsl/vcl/source/glyphs/gcach_layout.cxx
diff -u gsl/vcl/source/glyphs/gcach_layout.cxx:1.39 gsl/vcl/source/glyphs/gcach_layout.cxx:1.38.62.2
--- gsl/vcl/source/glyphs/gcach_layout.cxx:1.39	Mon Jun 19 12:32:50 2006
+++ gsl/vcl/source/glyphs/gcach_layout.cxx	Fri Jul  7 03:29:44 2006
@@ -390,7 +390,7 @@
 
     struct IcuPosition{ float fX, fY; };
     const int nAllocSize = sizeof(LEGlyphID) + sizeof(le_int32) + sizeof(IcuPosition);
-    LEGlyphID* pIcuGlyphs = (LEGlyphID*)alloca( nGlyphCapacity * nAllocSize + sizeof(IcuPosition) );
+    LEGlyphID* pIcuGlyphs = (LEGlyphID*)alloca( (nGlyphCapacity * nAllocSize) + sizeof(IcuPosition) );
     le_int32* pCharIndices = (le_int32*)((char*)pIcuGlyphs + nGlyphCapacity * sizeof(LEGlyphID) );
     IcuPosition* pGlyphPositions = (IcuPosition*)((char*)pCharIndices + nGlyphCapacity * sizeof(le_int32) );
 
@@ -466,11 +466,22 @@
             ||  (nGlyphIndex == ICU_DELETED_GLYPH) )
                 continue;  // ignore these glyphs
 
-            int nCharPos = pCharIndices[i] + nMinRunPos;
+            // adjust the relative char pos
+            int nCharPos = pCharIndices[i];
+            if( nCharPos >= 0 ) {
+                nCharPos += nMinRunPos;
+                // ICU seems to return bad pCharIndices
+                // for some combinations of ICU+font+text
+                // => better give up now than crash later
+                if( nCharPos >= nEndRunPos )
+                    continue;
+            }
+
             // when glyph fallback is needed update LayoutArgs
             if( !nGlyphIndex )
             {
-                rArgs.NeedFallback( nCharPos, bRightToLeft );
+                if( nCharPos >= 0 )
+                    rArgs.NeedFallback( nCharPos, bRightToLeft );
                 if( SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags )
                     continue;
             }
@@ -484,14 +495,18 @@
                     nCharPos = nLastCharPos;
 
             // apply vertical flags, etc.
-            sal_Unicode aChar = rArgs.mpStr[ nCharPos ];
-            nGlyphIndex = rFont.FixupGlyphIndex( nGlyphIndex, aChar );
+            if( nCharPos >= 0 )
+            {
+                sal_Unicode aChar = rArgs.mpStr[ nCharPos ];
+                nGlyphIndex = rFont.FixupGlyphIndex( nGlyphIndex, aChar );
+            }
 
+            // get glyph position and its metrics
             aNewPos = Point( (int)(pPos->fX+0.5), (int)(pPos->fY+0.5) );
             const GlyphMetric& rGM = rFont.GetGlyphMetric( nGlyphIndex );
             int nGlyphWidth = rGM.GetCharWidth();
 
-            // heuristic to detect group clusters using the "smoothed" char positions
+            // heuristic to detect group clusters using "smoothed" char positions
             long nGlyphFlags = 0;
             if( nLastCharPos != -1 )
                 if( (nCharPos == nLastCharPos) || (nGlyphWidth <= 0) )
@@ -499,6 +514,7 @@
             if( bRightToLeft )
                 nGlyphFlags |= GlyphItem::IS_RTL_GLYPH;
 
+            // add resulting glyph item to layout
             GlyphItem aGI( nCharPos, nGlyphIndex, aNewPos, nGlyphFlags, nGlyphWidth );
             rLayout.AppendGlyph( aGI );
             ++nFilteredRunGlyphCount;
@@ -508,8 +524,9 @@
         nGlyphCount += nFilteredRunGlyphCount;
     }
 
+    // sort glyphs in visual order
     rLayout.SortGlyphItems();
-    
+
     // determine need for kashida justification
     if( (rArgs.mpDXArray || rArgs.mnLayoutWidth)
     &&  ((meScriptCode == arabScriptCode) || (meScriptCode == syrcScriptCode)) )


--- openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch DELETED ---


--- openoffice.org.2.0.3-gcc28409.anonymousexternc.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 09:32:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 05:32:09 -0400
Subject: rpms/device-mapper/devel device-mapper.spec,1.38,1.39
Message-ID: <200608030932.k739W9Rx031669@cvs.devel.redhat.com>

Author: mbroz

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26086

Modified Files:
	device-mapper.spec 
Log Message:
- rpmlint cleaning, summary, permissions




Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- device-mapper.spec	12 Jul 2006 22:53:59 -0000	1.38
+++ device-mapper.spec	3 Aug 2006 09:32:02 -0000	1.39
@@ -1,7 +1,7 @@
-Summary: device mapper library
+Summary: Device mapper library
 Name: device-mapper
 Version: 1.02.07
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
@@ -38,16 +38,19 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LIB INSTALL INTRO README VERSION WHATS_NEW
-%{_libdir}/libdevmapper.so*
-%{_libdir}/libdevmapper.a*
-%{_sbindir}/dmsetup
-%{_sbindir}/dmsetup.static
+%attr(755,root,root) %{_libdir}/libdevmapper.so*
+%attr(755,root,root) %{_libdir}/libdevmapper.a*
+%attr(755,root,root) %{_sbindir}/dmsetup
+%attr(755,root,root) %{_sbindir}/dmsetup.static
 %{_mandir}/*/*
 %{_includedir}/libdevmapper.h
 /usr/%{_lib}/pkgconfig/*.pc
 
 
 %changelog
+* Thu Aug 03 2006 Milan Broz <mbroz at redhat.com> - 1.02.07-1.2
+- rpmlint cleaning, summary, permissions
+
 * Wed Jul 12 2006 Peter Jones <pjones at redhat.com> - 1.02.07-1.1
 - Fix _exec_prefix during %%configure so .pc files have correct paths
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 09:40:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 05:40:18 -0400
Subject: rpms/mod_auth_kerb/devel mod_auth_kerb-5.0-rc6-krb15.patch, 1.1,
	1.2 mod_auth_kerb.spec, 1.13, 1.14
Message-ID: <200608030940.k739eHhu004684@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/mod_auth_kerb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4673

Modified Files:
	mod_auth_kerb-5.0-rc6-krb15.patch mod_auth_kerb.spec 
Log Message:
* Thu Aug  3 2006 Joe Orton <jorton at redhat.com> 5.0-10
- fix segfault at startup (#201145)


mod_auth_kerb-5.0-rc6-krb15.patch:
 mod_auth_kerb.c |   52 ++--------------------------------------------------
 1 files changed, 2 insertions(+), 50 deletions(-)

Index: mod_auth_kerb-5.0-rc6-krb15.patch
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_kerb/devel/mod_auth_kerb-5.0-rc6-krb15.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_auth_kerb-5.0-rc6-krb15.patch	20 Jul 2006 10:16:24 -0000	1.1
+++ mod_auth_kerb-5.0-rc6-krb15.patch	3 Aug 2006 09:40:04 -0000	1.2
@@ -1,12 +1,14 @@
-
-Forcibly disable the replay cache using the environment variable
-rather than trying to hack through libkrb5 internals (doomed to failure).
-
-Patch by: Russ Allbery <rra stanford.edu>
-
---- mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c.krb14	2006-07-20 11:05:41.000000000 +0100
-+++ mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c	2006-07-20 11:11:16.000000000 +0100
-@@ -215,35 +215,6 @@
+--- mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c.krb15	2006-08-02 09:06:56.000000000 +0100
++++ mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c	2006-08-03 10:37:45.000000000 +0100
+@@ -62,6 +62,7 @@
+ #endif
+ 
+ #include <unistd.h>
++#include <stdlib.h>
+ 
+ #ifdef KRB5
+ #include <krb5.h>
+@@ -215,35 +216,6 @@
     { NULL }
  };
  
@@ -42,7 +44,7 @@
  /*************************************************************************** 
   Auth Configuration Initialization
   ***************************************************************************/
-@@ -1055,27 +1026,6 @@
+@@ -1055,27 +1027,6 @@
  		 		     "gss_acquire_cred() failed"));
        return HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -70,12 +72,11 @@
     
     return 0;
  }
-@@ -1455,6 +1405,8 @@
+@@ -1455,6 +1406,7 @@
        		  apr_pool_t *ptemp, server_rec *s)
  {
     ap_add_version_component(p, "mod_auth_kerb/" MODAUTHKERB_VERSION);
-+   if (getenv("KRB5RCACHETYPE") == NULL)
-+      putenv("KRB5RCACHETYPE=none");
++   setenv("KRB5RCACHETYPE", "none", 0);
     return OK;
  }
  


Index: mod_auth_kerb.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_kerb/devel/mod_auth_kerb.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_auth_kerb.spec	20 Jul 2006 10:15:56 -0000	1.13
+++ mod_auth_kerb.spec	3 Aug 2006 09:40:04 -0000	1.14
@@ -4,7 +4,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.0
-Release: 9
+Release: 10
 License: Apache
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -56,6 +56,9 @@
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Thu Aug  3 2006 Joe Orton <jorton at redhat.com> 5.0-10
+- fix segfault at startup (#201145)
+
 * Thu Jul 20 2006 Joe Orton <jorton at redhat.com> 5.0-9
 - add Russ Allbery's fix for disabling replay cache with krb15
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 09:58:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 05:58:43 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.816,1.817
Message-ID: <200608030958.k739whsE019762@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
rh#201143# more indian langpacks


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.816
retrieving revision 1.817
diff -u -r1.816 -r1.817
--- openoffice.org.spec	2 Aug 2006 19:32:20 -0000	1.816
+++ openoffice.org.spec	3 Aug 2006 09:58:40 -0000	1.817
@@ -16,7 +16,7 @@
 %endif
 
 %if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr-CS ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts
+%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr-CS ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn-IN
 %else
 %define langpack_langs en-US
 %endif
@@ -171,7 +171,6 @@
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-kde
 Obsoletes: openoffice.org-langpack-eo
-Obsoletes: openoffice.org-langpack-kn_IN
 Obsoletes: openoffice.org2-core
 
 %description core
@@ -859,6 +858,73 @@
 %description langpack-zu_ZA
 Provides additional zulu translations for %{name}
 
+%package langpack-as_IN
+Summary: Assamese language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org2-langpack-as_IN
+
+%description langpack-as_IN
+Provides additional assamese translations for %{name}
+
+%package langpack-mr_IN
+Summary: Marathi language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org2-langpack-mr_IN
+
+%description langpack-mr_IN
+Provides additional marathi translations for %{name}
+
+%package langpack-ml_IN
+Summary: Malayalam language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-malayalam
+Obsoletes: openoffice.org2-langpack-ml_IN
+
+%description langpack-ml_IN
+Provides additional malayalam translations for %{name}
+
+%package langpack-or_IN
+Summary: Oriya language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-oriya
+Obsoletes: openoffice.org2-langpack-or_IN
+
+%description langpack-or_IN
+Provides additional oriya translations for %{name}
+
+%package langpack-te_IN
+Summary: Telugu language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-telugu
+Obsoletes: openoffice.org2-langpack-te_IN
+
+%description langpack-te_IN
+Provides additional telugu translations for %{name}
+
+%package langpack-ur
+Summary: Urdu language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org2-langpack-ur
+
+%description langpack-ur
+Provides additional urdu translations for %{name}
+
+%package langpack-kn_IN
+Summary: Kannada language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-kannada
+Obsoletes: openoffice.org2-langpack-kn_IN
+
+%description langpack-kn_IN
+Provides additional kannada translations for %{name}
+
 %prep
 %setup -q -n %{ooo_base_name}
 %patch0  -p1 -b .rh133741.alwaysgtk.desktop.patch
@@ -2422,6 +2488,154 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-xh.xcu
+
+%files langpack-as_IN
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/share
+%{instdir}/program/resource/*680as-IN.res
+%{instdir}/share/readme/LICENSE_as-IN*
+%{instdir}/share/readme/README_as-IN*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/as-IN
+%dir %{instdir}/share/template
+%{instdir}/share/template/as-IN
+%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-as-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_as-IN.xcu
+
+%files langpack-mr_IN
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/share
+%{instdir}/program/resource/*680mr-IN.res
+%{instdir}/share/readme/LICENSE_mr-IN*
+%{instdir}/share/readme/README_mr-IN*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/mr-IN
+%dir %{instdir}/share/template
+%{instdir}/share/template/mr-IN
+%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-mr-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_mr-IN.xcu
+
+%files langpack-ml_IN
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/share
+%{instdir}/program/resource/*680ml-IN.res
+%{instdir}/share/readme/LICENSE_ml-IN*
+%{instdir}/share/readme/README_ml-IN*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/ml-IN
+%dir %{instdir}/share/template
+%{instdir}/share/template/ml-IN
+%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-ml-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ml-IN.xcu
+
+%files langpack-or_IN
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/share
+%{instdir}/program/resource/*680or-IN.res
+%{instdir}/share/readme/LICENSE_or-IN*
+%{instdir}/share/readme/README_or-IN*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/or-IN
+%dir %{instdir}/share/template
+%{instdir}/share/template/or-IN
+%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-or-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_or-IN.xcu
+
+%files langpack-te_IN
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/share
+%{instdir}/program/resource/*680te-IN.res
+%{instdir}/share/readme/LICENSE_te-IN*
+%{instdir}/share/readme/README_te-IN*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/te-IN
+%dir %{instdir}/share/template
+%{instdir}/share/template/te-IN
+%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-te-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_te-IN.xcu
+
+%files langpack-ur
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/share
+%{instdir}/program/resource/*680ur-IN.res
+%{instdir}/share/readme/LICENSE_ur-IN*
+%{instdir}/share/readme/README_ur-IN*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/ur-IN
+%dir %{instdir}/share/template
+%{instdir}/share/template/ur-IN
+%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-ur-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ur-IN.xcu
+
+%files langpack-kn_IN
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/share
+%{instdir}/program/resource/*680kn-IN.res
+%{instdir}/share/readme/LICENSE_kn-IN*
+%{instdir}/share/readme/README_kn-IN*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/kn-IN
+%dir %{instdir}/share/template
+%{instdir}/share/template/kn-IN
+%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-kn-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_kn-IN.xcu
+
 %endif
 
 %files core



From fedora-cvs-commits at redhat.com  Thu Aug  3 09:59:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 05:59:24 -0400
Subject: rpms/net-snmp/devel net-snmp-5.3.1-retrans_time.patch, NONE,
	1.1 net-snmp.spec, 1.81,
	1.82 net-snmp-5.3-ipv6_retrans_ms.patch, 1.1, NONE
Message-ID: <200608030959.k739xOuJ019792@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-snmp.spec 
Added Files:
	net-snmp-5.3.1-retrans_time.patch 
Removed Files:
	net-snmp-5.3-ipv6_retrans_ms.patch 
Log Message:
- better patch for depreciated sysctl call

net-snmp-5.3.1-retrans_time.patch:
 interface_linux.c |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

--- NEW FILE net-snmp-5.3.1-retrans_time.patch ---
Index: agent/mibgroup/if-mib/data_access/interface_linux.c
===================================================================
--- agent/mibgroup/if-mib/data_access/interface_linux.c.orig
+++ agent/mibgroup/if-mib/data_access/interface_linux.c
@@ -22,6 +22,8 @@
 #include "interface_ioctl.h"
 
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #ifdef HAVE_LINUX_ETHTOOL_H
 #include <sys/types.h>
@@ -40,6 +42,10 @@ unsigned int
 netsnmp_linux_interface_get_if_speed_mii(int fd, const char *name);
 #endif
 
+#define PROC_SYS_NET_IPVx_NEIGH_RETRANS_TIME_MS "/proc/sys/net/ipv%d/neigh/%s/retrans_time_ms"
+#define PROC_SYS_NET_IPVx_NEIGH_RETRANS_TIME    "/proc/sys/net/ipv%d/neigh/%s/retrans_time"
+static char *proc_sys_retrans_time;
+static unsigned short retrans_time_factor = 0;
 
 void
 netsnmp_arch_interface_init(void)
@@ -47,6 +53,20 @@ netsnmp_arch_interface_init(void)
     /*
      * nothing to do
      */
+    char proc_path[64+IF_NAMESIZE];
+    char proc_path2[64+IF_NAMESIZE];
+    struct stat st;
+
+    snprintf(proc_path,  sizeof(proc_path),  PROC_SYS_NET_IPVx_NEIGH_RETRANS_TIME_MS, 6, "default");
+    snprintf(proc_path2, sizeof(proc_path2), PROC_SYS_NET_IPVx_NEIGH_RETRANS_TIME_MS, 4, "default");
+
+    if ((stat(proc_path, &st) == 0) || (stat(proc_path2, &st) == 0)) {
+        proc_sys_retrans_time = PROC_SYS_NET_IPVx_NEIGH_RETRANS_TIME_MS;
+    }
+    else {
+        proc_sys_retrans_time = PROC_SYS_NET_IPVx_NEIGH_RETRANS_TIME;
+        retrans_time_factor = 10;
+    }
 }
 
 /*
@@ -161,7 +181,7 @@ _arch_interface_flags_v4_get(netsnmp_int
     /*
      * get the retransmit time
      */
-    snprintf(line,sizeof(line),"/proc/sys/net/ipv4/neigh/%s/retrans_time",
+    snprintf(line,sizeof(line),proc_sys_retrans_time, 4,
              entry->name);
     if (!(fin = fopen(line, "r"))) {
         DEBUGMSGTL(("access:interface",
@@ -169,7 +189,12 @@ _arch_interface_flags_v4_get(netsnmp_int
     }
     else {
         if (fgets(line, sizeof(line), fin)) {
-            entry->retransmit_v4 = atoi(line) * 100;
+            if (retrans_time_factor) {
+                entry->retransmit_v4 = atoi(line) * retrans_time_factor;
+            }
+            else {
+                entry->retransmit_v4 = atoi(line);
+            };
             entry->ns_flags |= NETSNMP_INTERFACE_FLAGS_HAS_V4_RETRANSMIT;
         }
         fclose(fin);
@@ -191,7 +216,7 @@ _arch_interface_flags_v6_get(netsnmp_int
     /*
      * get the retransmit time
      */
-    snprintf(line,sizeof(line),"/proc/sys/net/ipv6/neigh/%s/retrans_time",
+    snprintf(line,sizeof(line),proc_sys_retrans_time, 6,
              entry->name);
     if (!(fin = fopen(line, "r"))) {
         DEBUGMSGTL(("access:interface",
@@ -199,7 +224,12 @@ _arch_interface_flags_v6_get(netsnmp_int
     }
     else {
         if (fgets(line, sizeof(line), fin)) {
-            entry->retransmit_v6 = atoi(line);
+            if (retrans_time_factor) {
+                entry->retransmit_v6 = atoi(line) * retrans_time_factor;
+            }
+            else {
+                entry->retransmit_v6 = atoi(line);
+            };
             entry->ns_flags |= NETSNMP_INTERFACE_FLAGS_HAS_V6_RETRANSMIT;
         }
         fclose(fin);


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- net-snmp.spec	17 Jul 2006 11:32:22 -0000	1.81
+++ net-snmp.spec	3 Aug 2006 09:59:22 -0000	1.82
@@ -7,7 +7,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: %{major_ver}.0
-Release: 1
+Release: 2
 
 License: BSDish
 Group: System Environment/Daemons
@@ -35,9 +35,9 @@
 Patch21: net-snmp-5.3.0.1-maxsensors.patch
 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.1-multilib.patch
+Patch28: net-snmp-5.3.1-retrans_time.patch
 
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -138,12 +138,10 @@
 %patch12 -p1 -b .dir-fix
 %patch19 -p1 -b .file_offset
 %patch21 -p1 -b .maxsensors
-#%patch22 -p0
 %patch23 -p1 -b .proc_if
 %patch24 -p1 -b .size_t
-%patch25 -p1 -b .retrans_ms
-#%patch26 -p0
 %patch27 -p1 -b .multilib
+%patch28 -p0 -b .retrans_ms
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -345,6 +343,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Aug  3 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.0-2
+- better patch for depreciated sysctl call
+
 * Mon Jul 17 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.0-1
 - update to 5.3.1 final version, fix version number
 


--- net-snmp-5.3-ipv6_retrans_ms.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 10:18:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 06:18:02 -0400
Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec,1.21,1.22
Message-ID: <200608031018.k73AI2pg015391@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	compat-gcc-32.spec 
Log Message:
3.2.3-56


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- compat-gcc-32.spec	12 Jul 2006 04:51:50 -0000	1.21
+++ compat-gcc-32.spec	3 Aug 2006 10:17:59 -0000	1.22
@@ -2,7 +2,7 @@
 %define LIBSTDCXXDATE 20040818
 %define DATE 20040701
 %define gcc_version 3.2.3
-%define gcc_release 55.fc5
+%define gcc_release 56
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define build_java 0
@@ -21,7 +21,7 @@
 Summary: The compatibility GNU Compiler Collection
 Name: compat-gcc-32
 Version: %{gcc_version}
-Release: %{gcc_release}.1
+Release: %{gcc_release}
 License: GPL
 Group: Development/Languages
 Source0: gcc-%{gcc_version}-%{DATE}.tar.bz2
@@ -636,6 +636,9 @@
 %{_prefix}/%{_lib}/libg2c.so.0*
 
 %changelog
+* Thu Aug  3 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-56
+- rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-55.fc5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 10:22:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 06:22:30 -0400
Subject: rpms/openoffice.org/devel workspace.inplaceobjects.patch, NONE,
	1.1 workspace.pb17.patch, NONE, 1.1 workspace.thbpp4.patch,
	NONE, 1.1 workspace.vcl60.patch, NONE,
	1.1 workspace.vcl63.patch, NONE, 1.1 openoffice.org.spec,
	1.817, 1.818 workspace.fwk40.patch, 1.1,
	1.2 workspace.sixtyfour06.patch, 1.1,
	1.2 openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch,
	1.2, NONE openoffice.org-2.0.3.ooo65318.agg24.canvas.patch,
	1.1, NONE openoffice.org-2.0.3.ooo65519.printing.samba.patch, 1.1,
	NONE openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch,
	1.2, NONE openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch, 1.1,
	NONE openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch,
	1.1, NONE openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch,
	1.2, NONE openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch,
	1.1, NONE
Message-ID: <200608031022.k73AMU3C017094@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.fwk40.patch 
	workspace.sixtyfour06.patch 
Added Files:
	workspace.inplaceobjects.patch workspace.pb17.patch 
	workspace.thbpp4.patch workspace.vcl60.patch 
	workspace.vcl63.patch 
Removed Files:
	openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch 
	openoffice.org-2.0.3.ooo65318.agg24.canvas.patch 
	openoffice.org-2.0.3.ooo65519.printing.samba.patch 
	openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch 
	openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch 
	openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch 
	openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch 
	openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch 
Log Message:
clean up into respective accepted-upstream workspaces

workspace.inplaceobjects.patch:
 framework/source/helper/statusindicatorfactory.cxx |    2 ++
 framework/source/loadenv/loadenv.cxx               |    3 ++-
 source/helper/statusindicatorfactory.cxx           |    0 
 source/loadenv/loadenv.cxx                         |    0 
 4 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE workspace.inplaceobjects.patch ---
Index: source/helper/statusindicatorfactory.cxx
===================================================================
RCS file: /cvs/framework/framework/source/helper/statusindicatorfactory.cxx,v
retrieving revision 1.21
diff -u -p -u -r1.21 statusindicatorfactory.cxx
--- openoffice.org.orig/framework/source/helper/statusindicatorfactory.cxx	23 Sep 2005 15:41:23 -0000	1.21
+++ openoffice.org/framework/source/helper/statusindicatorfactory.cxx	4 Jan 2006 21:41:06 -0000
@@ -496,9 +496,11 @@ void StatusIndicatorFactory::implts_make
 
     if (xParentWindow.is())
         xParentWindow->setVisible(sal_True);
+#if 0
     css::uno::Reference< css::awt::XTopWindow > xParentWindowTop(xParentWindow, css::uno::UNO_QUERY);
     if (xParentWindowTop.is())
         xParentWindowTop->toFront();
+#endif
 }
 
 //-----------------------------------------------
Index: source/loadenv/loadenv.cxx
===================================================================
RCS file: /cvs/framework/framework/source/loadenv/loadenv.cxx,v
retrieving revision 1.21
diff -u -p -u -r1.21 loadenv.cxx
--- openoffice.org.orig/framework/source/loadenv/loadenv.cxx	11 Nov 2005 12:06:12 -0000	1.21
+++ openoffice.org/framework/source/loadenv/loadenv.cxx	4 Jan 2006 21:41:08 -0000
@@ -1774,9 +1774,10 @@ void LoadEnv::impl_makeFrameWindowVisibl
 
     if (xWindow.is())
         xWindow->setVisible(sal_True);
-
+#if 0
     if (xTopWindow.is())
         xTopWindow->toFront();
+#endif
 
 /* #i19976#
     We tried to prevent a toFront() call in case the user putted the

workspace.pb17.patch:
 sfx2/source/dialog/versdlg.cxx |   10 +++++-----
 source/dialog/cfg.cxx          |    0 
 source/dialog/versdlg.cxx      |    0 
 svx/source/dialog/cfg.cxx      |    3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE workspace.pb17.patch ---
Index: source/dialog/versdlg.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/dialog/versdlg.cxx,v
retrieving revision 1.10
diff -u -r1.10 versdlg.cxx
--- openoffice.org.orig/sfx2/source/dialog/versdlg.cxx	2 May 2006 16:39:52 -0000	1.10
+++ openoffice.org/sfx2/source/dialog/versdlg.cxx	25 Jul 2006 09:49:54 -0000
@@ -242,6 +242,11 @@
 	aVersionBox.SetTabs( &nTabs_Impl[0], MAP_APPFONT );
 	aVersionBox.Resize();	// OS: Hack fuer richtige Selektion
 	Init_Impl();
+
+	// set dialog title (filename or docinfo title)
+	String sText = GetText();
+	( sText += ' ' ) += pViewFrame->GetObjectShell()->GetTitle();
+	SetText( sText );
 }
 
 String ConvertWhiteSpaces_Impl( const String& rText )
@@ -298,11 +303,6 @@
 	aSaveButton.Enable( !pObjShell->IsReadOnly() );
 	aSaveCheckBox.Enable( !pObjShell->IsReadOnly() );
 	aDeleteButton.Enable( FALSE );
-
-	// set dialog title (filename or docinfo title)
-	String sText = GetText();
-	( sText += ' ' ) += pObjShell->GetTitle();
-	SetText( sText );
 }
 
 SfxVersionDialog::~SfxVersionDialog ()
Index: source/dialog/cfg.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/cfg.cxx,v
retrieving revision 1.32
diff -u -r1.32 cfg.cxx
--- openoffice.org.orig/svx/source/dialog/cfg.cxx	28 Feb 2006 12:53:48 -0000	1.32
+++ openoffice.org/svx/source/dialog/cfg.cxx	26 Jul 2006 08:58:29 -0000
@@ -1705,6 +1705,9 @@
     aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
     aDescriptionField.SetAutoScroll( TRUE );
     aDescriptionField.EnableCursor( FALSE );
+
+    aMoveUpButton.Enable( FALSE );
+    aMoveDownButton.Enable( FALSE );
 }
 
 SvxConfigPage::~SvxConfigPage()

workspace.thbpp4.patch:
 canvas/source/tools/image.cxx |   55 ++++++++++++++++++++++--------------------
 source/tools/image.cxx        |    0 
 2 files changed, 29 insertions(+), 26 deletions(-)

--- NEW FILE workspace.thbpp4.patch ---
Index: source/tools/image.cxx
===================================================================
RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
retrieving revision 1.4
diff -u -r1.4 image.cxx
--- openoffice.org.orig/canvas/source/tools/image.cxx	14 Dec 2005 11:16:19 -0000	1.4
+++ openoffice.org/canvas/source/tools/image.cxx	11 May 2006 12:49:26 -0000
@@ -76,15 +76,14 @@
 #include <agg2/agg_renderer_outline_aa.h>
 #include <agg2/agg_renderer_primitives.h>
 #include <agg2/agg_path_storage.h>
-#include <agg2/agg_span_pattern.h>
 #include <agg2/agg_span_pattern_rgba.h>
-#include <agg2/agg_span_pattern_resample_rgb.h>
-#include <agg2/agg_span_pattern_resample_rgba.h>
+#include <agg2/agg_span_image_filter_rgb.h>
+#include <agg2/agg_span_image_filter_rgba.h>
 #include <agg2/agg_span_interpolator_linear.h>
 #include <agg2/agg_span_gradient.h>
-#include <agg2/agg_span_image_resample_rgb.h>
-#include <agg2/agg_span_image_resample_rgba.h>
+#include <agg2/agg_span_allocator.h>
 #include <agg2/agg_image_filters.h>
+#include <agg2/agg_image_accessors.h>
 #include <agg2/agg_dda_line.h>
 #include <agg2/agg_scanline_storage_aa.h>
 #include <agg2/agg_scanline_storage_bin.h>
@@ -1145,7 +1144,7 @@
 // cachedPrimitiveFTPP [cachedPrimitive for [F]ill[T]extured[P]oly[P]olygon]
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class pixel_format,class span_gen_type>
+template<class pixel_format_dst,class span_gen_type>
 class cachedPrimitiveFTPP : public ImageCachedPrimitive
 {
 	public:
@@ -1157,10 +1156,12 @@
 			aTransform(rTransform),
 			inter(tm),
 			filter(filter_kernel),
-			sg(sa,src,inter,filter),
-			pixf(dst),
-			rb(pixf),
-			ren(rb,sg)
+			pixs(const_cast<agg::rendering_buffer&>(src)),
+			source(pixs),
+			sg(source,inter,filter),
+			pixd(dst),
+			rb(pixd),
+			ren(rb,sa,sg)
 		{
 			::basegfx::B2DHomMatrix aFinalTransform(aTransform);
 			aFinalTransform *= rViewTransform;
@@ -1192,16 +1193,21 @@
 	private:
 
 		typedef agg::span_interpolator_linear<> interpolator_type;
-		typedef agg::renderer_base<pixel_format> renderer_base;
-		typedef agg::renderer_scanline_aa<renderer_base, span_gen_type> renderer_type;
+		typedef agg::renderer_base<pixel_format_dst> renderer_base;
+		typedef agg::span_allocator< typename span_gen_type::color_type > span_alloc_type;
+		typedef agg::renderer_scanline_aa<renderer_base, span_alloc_type, span_gen_type> renderer_type;
+		typedef typename span_gen_type::source_type source_type;
+		typedef typename span_gen_type::source_type::pixfmt_type pixel_format_src;
 
 		::basegfx::B2DHomMatrix aTransform;
 		interpolator_type inter;
 		agg::image_filter_bilinear filter_kernel;
 		agg::image_filter_lut filter;
-		agg::span_allocator< typename span_gen_type::color_type > sa;
+		span_alloc_type sa;
+		pixel_format_src pixs;
+        	source_type source;
 		span_gen_type sg;
-		pixel_format pixf;
+		pixel_format_dst pixd;
 		renderer_base rb;
 		mutable renderer_type ren;
 		mutable agg::scanline_p8 sl;
@@ -1414,14 +1420,12 @@
 	typedef agg::wrap_mode_repeat wrap_y_type;
 	typedef agg::pixfmt_rgb24 pixfmt_rgb24;
 	typedef agg::pixfmt_rgba32 pixfmt_rgba32;
-	typedef agg::span_pattern_resample_rgba_affine<	pixfmt_rgba32::color_type, 
-													pixfmt_rgba32::order_type,
-													wrap_x_type,
-													wrap_y_type> span_gen_type_rgba;
-	typedef agg::span_pattern_resample_rgb_affine< pixfmt_rgb24::color_type, 
-													pixfmt_rgb24::order_type, 
-													wrap_x_type,
-													wrap_y_type> span_gen_type_rgb;
+
+	typedef agg::image_accessor_wrap< pixfmt_rgba32, wrap_x_type, wrap_y_type > img_source_type_rgba;
+	typedef agg::image_accessor_wrap< pixfmt_rgb24, wrap_x_type, wrap_y_type > img_source_type_rgb;
+
+	typedef agg::span_image_resample_rgba_affine< img_source_type_rgba > span_gen_type_rgba;
+	typedef agg::span_image_resample_rgb_affine< img_source_type_rgb > span_gen_type_rgb;
 
 	const Format nDest = maDesc.eFormat;
 	const Format nSource = rTexture.maDesc.eFormat;
@@ -1572,8 +1576,7 @@
 							interpolator_type,
 							gradient_polymorphic_wrapper_base,
 							color_generator_type > gradient_span_gen;
-	gradient_span_gen span_gen(span_alloc,
-                               inter,
+	gradient_span_gen span_gen(inter,
                                *gf[rValues.meType],
                                colors,
                                0,
@@ -1593,8 +1596,8 @@
 	// [in contrast to solid renderers, that is]
 	// the instance of this particular renderer combines the
 	// renderbuffer [i.e. destination] and the spanline generator [i.e. source]
-	typedef agg::renderer_scanline_aa<renderer_base, gradient_span_gen> renderer_gradient;
-	renderer_gradient r1(rb, span_gen);
+	typedef agg::renderer_scanline_aa<renderer_base, gradient_span_alloc, gradient_span_gen> renderer_gradient;
+	renderer_gradient r1(rb, span_alloc, span_gen);
 
 	// instantiate the rasterizer and feed the incoming polypolygon.
 	agg::rasterizer_scanline_aa<> ras;

workspace.vcl60.patch:
 gtkframe.cxx |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE workspace.vcl60.patch ---
diff -ru vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	2006-05-18 12:25:04.000000000 +0100
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	2006-05-18 12:29:56.000000000 +0100
@@ -2275,7 +2275,10 @@
 
     if( pThis->m_pIMHandler )
         if( pThis->m_pIMHandler->handleKeyEvent( pEvent ) )
+        {
+            pThis->m_bSingleAltPress = false;
             return TRUE;
+        }
     GTK_YIELD_GRAB();
 
 	// handle modifiers

workspace.vcl63.patch:
 source/window/window.cxx     |    0 
 vcl/source/window/window.cxx |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE workspace.vcl63.patch ---
Index: source/window/window.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
retrieving revision 1.234.22.2
diff -u -r1.234.22.2 window.cxx
--- openoffice.org.orig/vcl/source/window/window.cxx	18 May 2006 07:03:13 -0000	1.234.22.2
+++ openoffice.org/vcl/source/window/window.cxx	21 Jul 2006 10:56:06 -0000
@@ -822,7 +827,8 @@
         if( nStyle & WB_NOSHADOW )
             nFrameStyle |= SAL_FRAME_STYLE_NOSHADOW;
 
-        if( mpWindowImpl->mnType == WINDOW_DIALOG           ||
+        if( mpWindowImpl->mnType == WINDOW_DIALOG          ||
+            mpWindowImpl->mnType == WINDOW_TABDIALOG       ||
             mpWindowImpl->mnType == WINDOW_MODALDIALOG     ||
             mpWindowImpl->mnType == WINDOW_MODELESSDIALOG )
             nFrameStyle |= SAL_FRAME_STYLE_DIALOG;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.817
retrieving revision 1.818
diff -u -r1.817 -r1.818
--- openoffice.org.spec	3 Aug 2006 09:58:40 -0000	1.817
+++ openoffice.org.spec	3 Aug 2006 10:22:27 -0000	1.818
@@ -86,52 +86,49 @@
 Patch20: workspace.icuupgrade.patch
 Patch21: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
 Patch22: workspace.opensymbol01.patch
-Patch23: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch23: workspace.inplaceobjects.patch
 Patch24: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch25: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch26: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch27: workspace.bfsixtyfour.patch
-Patch28: openoffice.org-2.0.3.ooo65318.agg24.canvas.patch
+Patch28: workspace.thbpp4.patch
 Patch29: workspace.impress96.patch
 Patch30: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
 Patch31: workspace.fpicker6.patch
 Patch32: workspace.vcl59.patch
 Patch33: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
 Patch34: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch35: openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch
+Patch35: workspace.vcl60.patch
 Patch36: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
 Patch37: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
 Patch38: workspace.fwk40.patch
-Patch39: openoffice.org-2.0.3.ooo65519.printing.samba.patch
-Patch40: workspace.sixtyfour06.patch
-Patch41: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch42: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
-Patch43: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch44: workspace.kendy10.patch
-Patch45: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch46: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch47: ooobuild.VBAObjects.patch
-Patch48: workspace.gcjsix.patch
-Patch49: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch50: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
-Patch51: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch52: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch53: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch54: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch55: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch56: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
-Patch57: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch58: openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
-Patch59: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch60: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch61: workspace.os84.patch
-Patch62: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch63: workspace.configure18.patch
-Patch64: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch65: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch66: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch67: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch68: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch39: workspace.sixtyfour06.patch
+Patch40: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch41: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch42: workspace.kendy10.patch
+Patch43: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch44: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch45: ooobuild.VBAObjects.patch
+Patch46: workspace.gcjsix.patch
+Patch47: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch48: workspace.vcl63.patch
+Patch49: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch50: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch51: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch52: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch53: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch54: workspace.pb17.patch
+Patch55: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch56: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch57: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch58: workspace.os84.patch
+Patch59: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch60: workspace.configure18.patch
+Patch61: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch62: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch63: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch64: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch65: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -952,52 +949,49 @@
 %patch20 -p1 -b .workspace.icuupgrade.patch
 %patch21 -p1 -b .ooo58606.sw.pre-edit.patch
 %patch22 -p1 -b .workspace.opensymbol01.patch
-%patch23 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch23 -p1 -b .workspace.inplaceobjects.patch
 %patch24 -p1
 %patch25 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch27 -p1 -b .workspace.bfsixtyfour.patch
-%patch28 -p1 -b .ooo65318.agg24.canvas.patch
+%patch28 -p1 -b .workspace.thbpp4.patch
 %patch29 -p1 -b .workspace.impress96.patch
 %patch30 -p1 -b .ooo65327.builddep.writerperfect.patch
 %patch31 -p1 -b .workspace.fpicker6.patch
 %patch32 -p1 -b .workspace.vcl59.patch
 %patch33 -p1 -b .oooXXXXX.atkbroken.vcl.patch
 %patch34 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch35 -p1 -b .ooo65767.vcl.removemenukey.patch
+%patch35 -p1 -b .workspace.vcl60.patch
 %patch36 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
 %patch37 -p1 -b .rh192588.officecfg.defaultcairooff.patch
 %patch38 -p1 -b .workspace.fwk40.patch
-%patch39 -p1 -b .ooo65519.printing.samba.patch
-%patch40 -p1 -b .workspace.sixtyfour06.patch
-%patch41 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch42 -p1 -b .ooo66851.i18npool.x86_64.patch
-%patch43 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch44 -p1 -b .workspace.kendy10.patch
-%patch45 -p1 -b .rh187919.gtkunderkde.patch
-%patch46 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch47 -p0 -b .ooobuild.VBAObjects.patch
-%patch48 -p1 -b .workspace.gcjsix.patch
-%patch49 -p1 -b .ooo67644.sw.spacing.patch
-%patch50 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
-%patch51 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch52 -p1 -b .ooo67716.svx.overflow.patch
-%patch53 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch54 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch55 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch56 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
-%patch57 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch58 -p1 -b .ooo67779.svx.toolbarcrash.patch
-%patch59 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch60 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch61 -p1 -b .workspace.os84.patch
-%patch62 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch63 -p1 -b .workspace.configure18.patch
-%patch64 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch65 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch66 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch67 -p1 -b .ooo68047.vcl.zwj.patch
-%patch68 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch39 -p1 -b .workspace.sixtyfour06.patch
+%patch40 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch41 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch42 -p1 -b .workspace.kendy10.patch
+%patch43 -p1 -b .rh187919.gtkunderkde.patch
+%patch44 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch45 -p0 -b .ooobuild.VBAObjects.patch
+%patch46 -p1 -b .workspace.gcjsix.patch
+%patch47 -p1 -b .ooo67644.sw.spacing.patch
+%patch48 -p1 -b .workspace.vcl63.patch
+%patch49 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch50 -p1 -b .ooo67716.svx.overflow.patch
+%patch51 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch52 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch53 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch54 -p1 -b .workspace.pb17.patch
+%patch55 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch56 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch57 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch58 -p1 -b .workspace.os84.patch
+%patch59 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch60 -p1 -b .workspace.configure18.patch
+%patch61 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch62 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch63 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch64 -p1 -b .ooo68047.vcl.zwj.patch
+%patch65 -p1 -b .ooo68048.vcl.imsurroundtext.patch
 
 tar xzf %{SOURCE1}
 
@@ -3733,9 +3727,18 @@
 - rh#200805# replace ooo58663 missing glyph patch -> workspace.icuupgrade
 - replace ooo#66510# recentlyused fix -> workspace.kendy10
 - replace ooo#66067# embeddedobj crash -> workspace.fwk40
+- replace ooo#65519# samba printing ->> workspace.fwk40
 - replace ooo#59997# defaultbullets -> workspace.opensymbol01
 - replace ooo#65081# switch layout -> workspace.os84
 - replace ooo#65308# notes paste -> workspace.impress96
+- replace ooo#19976# nofocussteal -> workspace.inplaceobjects
+- replace ooo#65318# agg24 -> workspace.thbpp4.patch
+- replace ooo#65767# menu key -> workspace.vcl60.patch
+- replace ooo#66851# x86_64 i18npool ->> workspace.sixtyfour06
+- replace ooo#67656# tabdialogs minimize -> workspace.vcl63
+- replace ooo#67750# dont expand title -> workspace.pb17
+- replace ooo#67750# dont expand title ->> workspace.pb17
+- rh#201143# more Indian langpacks
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch

workspace.fwk40.patch:
 embeddedobj/source/msole/olepersist.cxx |    9 ++++++++-
 sfx2/source/doc/docfile.cxx             |   20 ++++++++++++--------
 sfx2/source/doc/objmisc.cxx             |    3 +++
 source/msole/olepersist.cxx             |    0 
 tools/inc/urlobj.hxx                    |    6 ++++--
 tools/source/fsys/urlobj.cxx            |    6 ++++++
 6 files changed, 33 insertions(+), 11 deletions(-)

Index: workspace.fwk40.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.fwk40.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.fwk40.patch	2 Aug 2006 19:22:48 -0000	1.1
+++ workspace.fwk40.patch	3 Aug 2006 10:22:27 -0000	1.2
@@ -61,3 +61,76 @@
      }
  }
  
+diff -rup sfx2/source/doc/objmisc.cxx sfx2/source/doc/objmisc.cxx
+--- openoffice.org.org.orig/sfx2/source/doc/objmisc.cxx	2006-05-18 09:48:27.000000000 +0200
++++ openoffice.org/sfx2/source/doc/objmisc.cxx	2006-05-18 09:49:19.000000000 +0200
+@@ -857,6 +857,9 @@ String SfxObjectShell::GetTitle
+ 		// ggf. Titel aus Dateiname generieren
+ 		if ( !pImp->aTitle.Len() )
+ 			pImp->aTitle = aURL.GetBase();
++
++		if ( !pImp->aTitle.Len() )
++			pImp->aTitle = aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
+ 	}
+ 
+ 	// ganzer Titel
+diff -rup tools/inc/urlobj.hxx tools/inc/urlobj.hxx
+--- openoffice.org.orig/tools/inc/urlobj.hxx	2006-05-18 09:47:10.000000000 +0200
++++ openoffice.org/tools/inc/urlobj.hxx	2006-05-18 09:47:18.000000000 +0200
+@@ -105,6 +105,7 @@ namespace com { namespace sun { namespac
+ #define INET_DB_SCHEME "db:"
+ #define INET_BUGID_SCHEME "bugid:"
+ #define INET_TELNET_SCHEME "telnet://"
++#define INET_SAMBA_SCHEME "smb://"
+ 
+ #define URL_PREFIX_PRIV_SOFFICE "private:"
+ enum
+@@ -162,8 +163,9 @@ enum INetProtocol
+     INET_PROT_TELNET = 28,
+     INET_PROT_VND_SUN_STAR_EXPAND = 29,
+     INET_PROT_VND_SUN_STAR_TDOC = 30,
+-    INET_PROT_GENERIC = 31,
+-	INET_PROT_END = 32
++	INET_PROT_SAMBA = 31,
++    INET_PROT_GENERIC = 32,
++	INET_PROT_END = 33
+ };
+ 
+ //============================================================================
+diff -rup tools/source/fsys/urlobj.cxx tools/source/fsys/urlobj.cxx
+--- openoffice.org.orig/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:10.000000000 +0200
++++ openoffice.org/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:18.000000000 +0200
+@@ -288,6 +288,8 @@ using namespace com::sun;
+    vnd-sun-star-tdoc-url = "VND.SUN.STAR.TDOC:/" segment *("/" segment)
+    segment = *pchar
+ 
++   ; private (http://ubiqx.org/cifs/Appendix-D.html)
++   samba-url = smb://[[[authdomain;]user@]host[:port][/share[/path][/name]]][?context]
+ 
+    ; private
+    unknown-url = scheme ":" 1*uric
+@@ -452,6 +454,8 @@ static INetURLObject::SchemeInfo const a
+ 		  false, false, false, false, false },
+         { "vnd.sun.star.tdoc", "vnd.sun.star.tdoc:", 0, false, false, false,
+           false, false, false, true, false },
++		{ "smb", "smb://", 139, true, true, false, true, true, true, true,
++		  false },
+         { "", "", 0, false, false, false, false, false, false, false, false } };
+ 
+ // static
+@@ -2086,6 +2090,7 @@ INetURLObject::getPrefix(sal_Unicode con
+ 			  INET_PROT_PRIV_SOFFICE, PrefixInfo::INTERNAL },
+ 			{ "slot:", "staroffice.slot:", INET_PROT_SLOT,
+ 			  PrefixInfo::INTERNAL },
++			{ "smb:", 0, INET_PROT_SAMBA, PrefixInfo::OFFICIAL },
+ 			{ "staroffice.component:", ".component:", INET_PROT_COMPONENT,
+ 			  PrefixInfo::EXTERNAL },
+ 			{ "staroffice.db:", "db:", INET_PROT_DB, PrefixInfo::EXTERNAL },
+@@ -2472,6 +2477,7 @@ bool INetURLObject::parsePath(INetProtoc
+ 			return false;
+ 
+ 		case INET_PROT_FTP:
++		case INET_PROT_SAMBA:
+ 		case INET_PROT_IMAP:
+ 			if (pPos < pEnd && *pPos != '/')
+ 				return false;

workspace.sixtyfour06.patch:
 breakiterator/xdictionary.cxx                   |   12 +++---
 fpicker/source/unx/gnome/SalGtkFilePicker.cxx   |    8 ++--
 fpicker/source/unx/gnome/SalGtkFolderPicker.cxx |    2 -
 inc/solar.h                                     |    0 
 source/breakiterator/xdictionary.cxx            |    0 
 tools/inc/solar.h                               |    3 -
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx        |   46 ++++++++++++------------
 7 files changed, 34 insertions(+), 37 deletions(-)

Index: workspace.sixtyfour06.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.sixtyfour06.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.sixtyfour06.patch	27 Jun 2006 15:26:36 -0000	1.1
+++ workspace.sixtyfour06.patch	3 Aug 2006 10:22:27 -0000	1.2
@@ -287,3 +287,33 @@
  #ifdef _SOLAR__PRIVATE
  #undef _SOLAR__PRIVATE
  #endif
+Index: source/breakiterator/xdictionary.cxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/breakiterator/xdictionary.cxx,v
+retrieving revision 1.11
+diff -u -r1.11 xdictionary.cxx
+--- openoffice.org.orig/i18npoolsource/breakiterator/xdictionary.cxx	1 Nov 2005 14:52:31 -0000	1.11
++++ openoffice.org/i18npool/source/breakiterator/xdictionary.cxx	29 Jun 2006 09:29:14 -0000
+@@ -67,16 +70,16 @@
+     aBuf.appendAscii( "dict_" ).appendAscii( lang ).appendAscii( SAL_DLLEXTENSION );
+         hModule = osl_loadModule( aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT );
+         if( hModule ) {
+-            int (*func)();
+-            func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getExistMark").pData );
++            sal_IntPtr (*func)();
++            func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getExistMark").pData );
+             existMark = (sal_uInt8*) (*func)();
+-            func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex1").pData );
++            func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex1").pData );
+             index1 = (sal_Int16*) (*func)();
+-            func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex2").pData );
++            func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex2").pData );
+             index2 = (sal_Int32*) (*func)();
+-            func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getLenArray").pData );
++            func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getLenArray").pData );
+             lenArray = (sal_Int32*) (*func)();
+-            func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getDataArea").pData );
++            func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getDataArea").pData );
+             dataArea = (sal_Unicode*) (*func)();
+         }
+         else


--- openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch DELETED ---


--- openoffice.org-2.0.3.ooo65318.agg24.canvas.patch DELETED ---


--- openoffice.org-2.0.3.ooo65519.printing.samba.patch DELETED ---


--- openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch DELETED ---


--- openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch DELETED ---


--- openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch DELETED ---


--- openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch DELETED ---


--- openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 10:31:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 06:31:44 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.818,1.819
Message-ID: <200608031031.k73AViXK020106@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
fonts for those languages


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.818
retrieving revision 1.819
diff -u -r1.818 -r1.819
--- openoffice.org.spec	3 Aug 2006 10:22:27 -0000	1.818
+++ openoffice.org.spec	3 Aug 2006 10:31:32 -0000	1.819
@@ -859,6 +859,7 @@
 Summary: Assamese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-bengali
 Obsoletes: openoffice.org2-langpack-as_IN
 
 %description langpack-as_IN
@@ -868,6 +869,7 @@
 Summary: Marathi language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-hindi
 Obsoletes: openoffice.org2-langpack-mr_IN
 
 %description langpack-mr_IN
@@ -907,6 +909,7 @@
 Summary: Urdu language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: fonts-arabic
 Obsoletes: openoffice.org2-langpack-ur
 
 %description langpack-ur



From fedora-cvs-commits at redhat.com  Thu Aug  3 10:44:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 06:44:49 -0400
Subject: rpms/icu/devel .cvsignore, 1.3, 1.4 icu.spec, 1.20, 1.21 sources,
	1.3, 1.4 rh190879.patch, 1.1, NONE
Message-ID: <200608031044.k73AinSE023770@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23734

Modified Files:
	.cvsignore icu.spec sources 
Removed Files:
	rh190879.patch 
Log Message:
upgrade to get sinhala support


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Sep 2005 18:35:57 -0000	1.3
+++ .cvsignore	3 Aug 2006 10:44:47 -0000	1.4
@@ -1,2 +1,3 @@
 icu-2.6.2.tar.gz
 icu-3.4.tgz
+icu4c-3_6_d01-src.tgz


Index: icu.spec
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- icu.spec	12 Jul 2006 17:33:04 -0000	1.20
+++ icu.spec	3 Aug 2006 10:44:47 -0000	1.21
@@ -1,12 +1,12 @@
 Name:           icu
-Version:        3.4
-Release: 	10.1.1
+Version:        3.6
+Release: 	0.1.d01
 Summary:        International Components for Unicode
 
 Group:          System Environment/Libraries
 License:        X License
 URL:            http://www.ibm.com/software/globalization/icu/
-Source0:        ftp://ftp.software.ibm.com/software/globalization/icu/%{version}/%{name}-%{version}.tgz
+Source0:        ftp://ftp.software.ibm.com/software/globalization/icu/icu4c-3_6_d01-src.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  doxygen, autoconf
@@ -14,8 +14,6 @@
 Patch1: icu-gcc41.patch
 Patch2: icu-config
 Patch3: icu-3.4-multiarchdevel.patch
-Patch4: icu-3.4-sinhala1.patch
-Patch5: rh190879.patch
 
 %description
 The International Components for Unicode (ICU) libraries provide
@@ -57,8 +55,6 @@
 %patch0 -p1 -b .gnustack
 %patch1 -p1 -b .gcc41
 %patch3 -p1 -b .multiarchdevel
-%patch4 -p1 -b .sinhala1
-%patch5 -p1 -b .rh190879
 
 %build
 cd source
@@ -97,6 +93,7 @@
 %{_bindir}/derb
 %{_bindir}/genbrk
 %{_bindir}/gencnval
+%{_bindir}/genctd
 %{_bindir}/genrb
 %{_bindir}/makeconv
 %{_bindir}/pkgdata
@@ -105,6 +102,8 @@
 %{_mandir}/man1/derb.1*
 %{_mandir}/man1/gencnval.1*
 %{_mandir}/man1/genrb.1*
+%{_mandir}/man1/genbrk.1*
+%{_mandir}/man1/genctd.1*
 %{_mandir}/man1/makeconv.1*
 %{_mandir}/man1/pkgdata.1*
 %{_mandir}/man1/uconv.1*
@@ -124,10 +123,10 @@
 %{_libdir}/%{name}
 %{_libdir}/pkgconfig/icu.pc
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/%{version}
-%{_datadir}/%{name}/%{version}/mkinstalldirs
-%{_datadir}/%{name}/%{version}/config
-%doc %{_datadir}/%{name}/%{version}/license.html
+%dir %{_datadir}/%{name}/3.6
+%{_datadir}/%{name}/3.6/mkinstalldirs
+%{_datadir}/%{name}/3.6/config
+%doc %{_datadir}/%{name}/3.6/license.html
 
 %files -n lib%{name}-doc
 %defattr(-,root,root,-)
@@ -135,6 +134,11 @@
 
 
 %changelog
+* Mon Jul 31 2006 Caolan McNamara <caolanm at redhat.com> - 3.6-0.1.d01
+- rh#200728# update to prelease 3.6d01 to pick up on sinhala fixes
+- drop integrated rh190879.patch
+- drop integrated icu-3.4-sinhala1.patch
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4-10.1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2005 18:35:57 -0000	1.3
+++ sources	3 Aug 2006 10:44:47 -0000	1.4
@@ -1 +1 @@
-b19f3b9eec1c44fba86b07f287801084  icu-3.4.tgz
+982db0ab875be8d5941cfc5c78cfaf25  icu4c-3_6_d01-src.tgz


--- rh190879.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 10:45:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 06:45:33 -0400
Subject: rpms/icu/devel icu-3.4-sinhala1.patch,1.1,NONE
Message-ID: <200608031045.k73AjXjZ024100@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24064

Removed Files:
	icu-3.4-sinhala1.patch 
Log Message:
upgrade to get sinhala support


--- icu-3.4-sinhala1.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 10:48:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 06:48:46 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.819,1.820
Message-ID: <200608031048.k73AmkMQ007610@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
bump icu require for sinhala


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -r1.819 -r1.820
--- openoffice.org.spec	3 Aug 2006 10:31:32 -0000	1.819
+++ openoffice.org.spec	3 Aug 2006 10:48:44 -0000	1.820
@@ -57,9 +57,9 @@
 BuildRequires:	libICE-devel, evolution-data-server-devel, libxslt-devel,
 BuildRequires:	desktop-file-utils >= 0.9, libxslt-devel, unixODBC-devel
 BuildRequires:  db4-devel, db4-java >= 4.3.28-3, firefox-devel, agg-devel
-BuildRequires:  libwpd-devel >= 0.8.0, xmlsec1-nss-devel >= 1.2.8-2, icu >= 3.4
+BuildRequires:  libwpd-devel >= 0.8.0, xmlsec1-nss-devel >= 1.2.8-2, icu >= 3.6
 BuildRequires:	hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
-BuildRequires:	libicu-devel >= 3.4, ant, perl-Archive-Zip
+BuildRequires:	libicu-devel >= 3.6, ant, perl-Archive-Zip
 
 Patch0:  openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
 Patch1:  openoffice.org-1.9.114.rh161886.rpath.desktop.patch



From fedora-cvs-commits at redhat.com  Thu Aug  3 11:24:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 07:24:31 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch, NONE, 1.1
Message-ID: <200608031124.k73BOVNg001063@cvs.devel.redhat.com>

Author: caolanm

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

Added Files:
	openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch 
Log Message:
macros crash on invalid hierarchy

openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch:
 source/dialog/selector.cxx     |    0 
 svx/source/dialog/selector.cxx |    6 ++++++
 2 files changed, 6 insertions(+)

--- NEW FILE openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch ---
Index: source/dialog/selector.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/selector.cxx,v
retrieving revision 1.17
diff -u -r1.17 selector.cxx
--- openoffice.org.orig/svx/source/dialog/selector.cxx	8 Sep 2005 22:01:09 -0000	1.17
+++ openoffice.org/svx/source/dialog/selector.cxx	31 Jul 2006 10:03:28 -0000
@@ -586,6 +586,8 @@
 							node is a first level child of the Root and is NOT
 							either the current document, user or share */
 							Reference< browse::XBrowseNode >& theChild = children[n];
+							if (!theChild.is())
+								continue;
                             ::rtl::OUString uiName = theChild->getName();
 							BOOL bDisplay = TRUE;
 
@@ -905,6 +907,8 @@
 
 					for ( ULONG n = 0; n < children.getLength(); n++ )
 					{
+         				if (!children[n].is())
+							continue;
 						if (children[n]->getType() == browse::BrowseNodeTypes::SCRIPT)
 						{
 							OUString uri;
@@ -1061,6 +1065,8 @@
 							node is a first level child of the Root and is NOT
 							either the current document, user or share */
 							Reference< browse::XBrowseNode >& theChild = children[n];
+                            if (!theChild.is())
+                                continue;
                             ::rtl::OUString uiName = theChild->getName();
 							BOOL bDisplay = TRUE;
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 12:05:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 08:05:43 -0400
Subject: rpms/procps/devel procps-3.2.7-zombie.patch, NONE, 1.1 procps.spec,
	1.51, 1.52
Message-ID: <200608031205.k73C5hUN027671@cvs.devel.redhat.com>

Author: kzak

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

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-zombie.patch 
Log Message:
fix defunct in ps/top/w

procps-3.2.7-zombie.patch:
 escape.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE procps-3.2.7-zombie.patch ---
--- procps-3.2.7/proc/escape.c.zombie	2006-08-03 13:25:07.000000000 +0200
+++ procps-3.2.7/proc/escape.c	2006-08-03 13:35:20.000000000 +0200
@@ -192,7 +192,21 @@
     overhead += 2;
   }
   if(flags & ESC_DEFUNCT){
-    if(pp->state=='Z') overhead += 10;    // chars in " <defunct>"
+    if(pp->state=='Z') 
+    {
+	    if (pp->tgid==pp->tid && pp->nlwp > 1)
+		    /*
+		     * It's possible that initial thread is in Zombie state,
+		     * but there is still other running thread in same process. 
+		     *	
+		     * The 'defunct' means that the process has exited, but in
+		     * particular case it's not true. The process is still runnig.
+		     *  -- kzak at redhat.com
+		     */
+		    flags &= ~ESC_DEFUNCT;
+	    else
+		    overhead += 10;    // chars in " <defunct>"
+    }
     else flags &= ~ESC_DEFUNCT;
   }
   if(overhead + 1 >= *cells){  // if no room for even one byte of the command name


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- procps.spec	19 Jul 2006 22:06:49 -0000	1.51
+++ procps.spec	3 Aug 2006 12:05:39 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -36,6 +36,8 @@
 Patch16: procps-3.2.7-vmstat-cpusteal.patch
 # 134516 - ps ignores /proc/#/cmdline if contents 2047 bytes
 Patch17: procps-3.2.7-longcmd.patch
+# 139827 - ps(1) outputs a multi-threads process as a defunct process.
+Patch18: procps-3.2.7-zombie.patch
 
 BuildRequires: ncurses-devel
 
@@ -78,6 +80,7 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 cp %SOURCE1 .
 
@@ -115,6 +118,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Thu Aug  3 2006 Karel Zak <kzak at redhat.com> - 3.2.7-4
+- fix #139827 - ps(1) outputs a multi-threads process as a defunct process.
+
 * Wed Jul 19 2006 Karel Zak <kzak at redhat.com> - 3.2.7-3
 - spec file cleanup
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 12:40:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 08:40:57 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.83, 1.84 sources,
	1.86, 1.87 system-config-printer.spec, 1.48, 1.49
Message-ID: <200608031240.k73CevaU003816@cvs.devel.redhat.com>

Author: twaugh

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .cvsignore	24 Jul 2006 15:06:02 -0000	1.83
+++ .cvsignore	3 Aug 2006 12:40:54 -0000	1.84
@@ -63,3 +63,4 @@
 system-config-printer-0.7.21.tar.bz2
 system-config-printer-0.7.22.tar.bz2
 system-config-printer-0.7.23.tar.bz2
+system-config-printer-0.7.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sources	24 Jul 2006 15:06:02 -0000	1.86
+++ sources	3 Aug 2006 12:40:54 -0000	1.87
@@ -1,2 +1,2 @@
 c853b55286216568f14dde8a5ae21a21  pycups-1.9.12.tar.bz2
-a2c8d3a92e107a7f5deab234c1b5bc08  system-config-printer-0.7.23.tar.bz2
+fae7d89ee41274afd39ca1cc63c6af05  system-config-printer-0.7.24.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- system-config-printer.spec	24 Jul 2006 15:06:02 -0000	1.48
+++ system-config-printer.spec	3 Aug 2006 12:40:54 -0000	1.49
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.23
+Version: 0.7.24
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -114,6 +114,9 @@
 exit 0
 
 %changelog
+* Thu Aug  3 2006 Tim Waugh <twaugh at redhat.com> 0.7.24-1
+- 0.7.24.
+
 * Mon Jul 24 2006 Tim Waugh <twaugh at redhat.com> 0.7.23-1
 - 0.7.23.  Fixes bug #197866.
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 12:51:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 08:51:00 -0400
Subject: rpms/httpd/devel httpd.init,1.11,1.12 httpd.spec,1.97,1.98
Message-ID: <200608031251.k73Cp0cr022308@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	httpd.init httpd.spec 
Log Message:
* Thu Aug  3 2006 Joe Orton <jorton at redhat.com> 2.2.3-3
- init: use killproc() delay to avoid race killing parent



Index: httpd.init
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- httpd.init	29 Mar 2005 12:19:40 -0000	1.11
+++ httpd.init	3 Aug 2006 12:50:58 -0000	1.12
@@ -65,9 +65,13 @@
         [ $RETVAL = 0 ] && touch ${lockfile}
         return $RETVAL
 }
+
+# When stopping httpd a delay of >10 second is required before SIGKILLing the
+# httpd parent; this gives enough time for the httpd parent to SIGKILL any
+# errant children.
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc $httpd
+	killproc -d 10 $httpd
 	RETVAL=$?
 	echo
 	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- httpd.spec	28 Jul 2006 15:19:20 -0000	1.97
+++ httpd.spec	3 Aug 2006 12:50:58 -0000	1.98
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.3
-Release: 2
+Release: 3
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -49,6 +49,7 @@
 BuildRequires: db4-devel, expat-devel, zlib-devel, libselinux-devel
 BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0, 
 Requires: /etc/mime.types, gawk, /usr/share/magic.mime, /usr/bin/find
+Requires: initscripts >= 8.36
 Obsoletes: httpd-suexec
 Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
 Prereq: sh-utils, textutils, /usr/sbin/useradd
@@ -481,6 +482,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Aug  3 2006 Joe Orton <jorton at redhat.com> 2.2.3-3
+- init: use killproc() delay to avoid race killing parent
+
 * Fri Jul 28 2006 Joe Orton <jorton at redhat.com> 2.2.3-2
 - update to 2.2.3
 - trim %%changelog to >=2.0.52



From fedora-cvs-commits at redhat.com  Thu Aug  3 12:56:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 08:56:40 -0400
Subject: rpms/libwnck/devel .cvsignore, 1.35, 1.36 libwnck.spec, 1.51,
	1.52 sources, 1.35, 1.36
Message-ID: <200608031256.k73CuegZ024469@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24410

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	12 Jul 2006 16:17:55 -0000	1.35
+++ .cvsignore	3 Aug 2006 12:56:37 -0000	1.36
@@ -1 +1 @@
-libwnck-2.15.4.tar.bz2
+libwnck-2.15.90.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- libwnck.spec	12 Jul 2006 16:17:55 -0000	1.51
+++ libwnck.spec	3 Aug 2006 12:56:37 -0000	1.52
@@ -5,8 +5,8 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.15.4
-Release: 1
+Version: 2.15.90
+Release: 1%{?dist}
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -90,6 +90,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	12 Jul 2006 16:17:55 -0000	1.35
+++ sources	3 Aug 2006 12:56:37 -0000	1.36
@@ -1 +1 @@
-f9f586cb28758b7356ee27e6bd25d1f4  libwnck-2.15.4.tar.bz2
+04b124fd057b73414a5f9b8904f1a68b  libwnck-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 13:32:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 09:32:56 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.40,1.41
Message-ID: <200608031332.k73DWqSu016828@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16798

Modified Files:
	kexec-tools.spec 
Log Message:
updating dependencies for fc6


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kexec-tools.spec	2 Aug 2006 19:41:04 -0000	1.40
+++ kexec-tools.spec	3 Aug 2006 13:32:49 -0000	1.41
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 34%{dist}.1
+Release: 35%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -14,7 +14,7 @@
 Source7: makedumpfile.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires(pre): coreutils chkconfig sed
-BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel xorg-x11-devel
+BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel libXi-devel gtk+-devel
 
 #
 # Patches 0 through 100 are meant for x86 kexec-tools enablement
@@ -139,6 +139,9 @@
 %doc TODO
 
 %changelog
+* Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-35%{dist}.1
+- fixing up FC6/RHEL5 BuildRequires line to build in brew
+
 * Wed Aug 02 2006 Neil Horman <nhorman at redhat.com> - 1.101-34%{dist}.1
 - enabling makedumpfile in build
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 13:36:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 09:36:26 -0400
Subject: rpms/sed/devel sed-4.1.5-utf8performance.patch, NONE, 1.1 sed.spec,
	1.36, 1.37 sed-4.1.5-str_append.patch, 1.1, NONE
Message-ID: <200608031336.k73DaQ9F017825@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/sed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17618/devel

Modified Files:
	sed.spec 
Added Files:
	sed-4.1.5-utf8performance.patch 
Removed Files:
	sed-4.1.5-str_append.patch 
Log Message:
- remove superfluous multibyte processing in str_append for UTF-8
  encoding (thanks Paolo Bonzini, #177246)


sed-4.1.5-utf8performance.patch:
 execute.c |   35 ++++++++++++++++++-----------------
 mbcs.c    |   25 +++++++++++++++++++++++++
 sed.h     |    1 +
 3 files changed, 44 insertions(+), 17 deletions(-)

--- NEW FILE sed-4.1.5-utf8performance.patch ---
* looking for bonzini at gnu.org--2004b/sed--stable--4.1--patch-69 to compare with
* comparing to bonzini at gnu.org--2004b/sed--stable--4.1--patch-69
M  sed/mbcs.c
M  sed/sed.h
M  sed/execute.c

* modified files

--- orig/sed/execute.c
+++ mod/sed/execute.c
@@ -235,25 +235,26 @@ str_append(to, string, length)
   to->length = new_length;
 
 #ifdef HAVE_MBRTOWC
-  if (mb_cur_max == 1)
-    return;
-
-  while (length)
-    {
-      int n = MBRLEN (string, length, &to->mbstate);
+  if (mb_cur_max > 1 && !is_utf8)
+    while (length)
+      {
+        size_t n = MBRLEN (string, length, &to->mbstate);
 
-      /* An invalid sequence is treated like a singlebyte character. */
-      if (n == -1)
-	{
-	  memset (&to->mbstate, 0, sizeof (to->mbstate));
-	  n = 1;
-	}
+        /* An invalid sequence is treated like a singlebyte character. */
+        if (n == (size_t) -1)
+	  {
+	    memset (&to->mbstate, 0, sizeof (to->mbstate));
+	    n = 1;
+	  }
 
-      if (n > 0)
-	length -= n;
-      else
-	break;
-    }
+        if (n > 0)
+	  {
+	    string += n;
+	    length -= n;
+	  }
+        else
+	  break;
+      }
 #endif
 }
 


--- orig/sed/mbcs.c
+++ mod/sed/mbcs.c
@@ -18,7 +18,12 @@
 #include "sed.h"
 #include <stdlib.h>
 
+#ifdef HAVE_LANGINFO_CODESET
+#include <langinfo.h>
+#endif
+
 int mb_cur_max;
+bool is_utf8;
 
 #ifdef HAVE_MBRTOWC
 /* Add a byte to the multibyte character represented by the state
@@ -47,6 +52,26 @@ int brlen (ch, cur_stat)
 void
 initialize_mbcs ()
 {
+  /* For UTF-8, we know that the encoding is stateless.  */
+  const char *codeset_name;
+
+#ifdef HAVE_LANGINFO_CODESET
+  codeset_name = nl_langinfo (CODESET);
+#else
+  codeset_name = getenv ("LC_ALL");
+  if (codeset_name == NULL || codeset_name[0] == '\0')
+    codeset_name = getenv ("LC_CTYPE");
+  if (codeset_name == NULL || codeset_name[0] == '\0')
+    codeset_name = getenv ("LANG");
+  if (codeset_name == NULL)
+    codeset_name = "";
+  else if (strchr (codeset_name, '.') !=  NULL)
+    codeset_name = strchr (codeset_name, '.') + 1;
+#endif
+
+  is_utf8 = (strcasecmp (codeset_name, "UTF-8") == 0
+	     || strcasecmp (codeset_name, "UTF8") == 0);
+
 #ifdef HAVE_MBRTOWC
   mb_cur_max = MB_CUR_MAX;
 #else


--- orig/sed/sed.h
+++ mod/sed/sed.h
@@ -233,6 +233,7 @@ extern bool use_extended_syntax_p;
 
 /* Declarations for multibyte character sets.  */
 extern int mb_cur_max;
+extern bool is_utf8;
 
 #ifdef HAVE_MBRTOWC
 #ifdef HAVE_BTOWC





Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/devel/sed.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sed.spec	2 Aug 2006 11:47:08 -0000	1.36
+++ sed.spec	3 Aug 2006 13:36:23 -0000	1.37
@@ -10,8 +10,8 @@
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
 Source1: http://sed.sourceforge.net/sedfaq.txt
-Patch0: sed-4.1.5-bz185374.patch
-Patch1: sed-4.1.5-str_append.patch
+Patch0: sed-4.1.5-utf8performance.patch
+Patch1: sed-4.1.5-bz185374.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -67,8 +67,9 @@
 %{_mandir}/man*/*
 
 %changelog
-* Wed Aug  2 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-4
-- remove superfluous multibyte processing in str_append (#177246)
+* Wed Aug  3 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-4
+- remove superfluous multibyte processing in str_append for UTF-8
+  encoding (thanks Paolo Bonzini, #177246)
 
 * Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-3
 - use dist tag


--- sed-4.1.5-str_append.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 13:36:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 09:36:25 -0400
Subject: rpms/sed/FC-5 sed-4.1.5-utf8performance.patch, NONE, 1.1 sed.spec,
	1.32, 1.33 sed-4.1.5-str_append.patch, 1.1, NONE
Message-ID: <200608031336.k73DaPW8017809@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	sed.spec 
Added Files:
	sed-4.1.5-utf8performance.patch 
Removed Files:
	sed-4.1.5-str_append.patch 
Log Message:
- remove superfluous multibyte processing in str_append for UTF-8
  encoding (thanks Paolo Bonzini, #177246)


sed-4.1.5-utf8performance.patch:
 execute.c |   35 ++++++++++++++++++-----------------
 mbcs.c    |   25 +++++++++++++++++++++++++
 sed.h     |    1 +
 3 files changed, 44 insertions(+), 17 deletions(-)

--- NEW FILE sed-4.1.5-utf8performance.patch ---
* looking for bonzini at gnu.org--2004b/sed--stable--4.1--patch-69 to compare with
* comparing to bonzini at gnu.org--2004b/sed--stable--4.1--patch-69
M  sed/mbcs.c
M  sed/sed.h
M  sed/execute.c

* modified files

--- orig/sed/execute.c
+++ mod/sed/execute.c
@@ -235,25 +235,26 @@ str_append(to, string, length)
   to->length = new_length;
 
 #ifdef HAVE_MBRTOWC
-  if (mb_cur_max == 1)
-    return;
-
-  while (length)
-    {
-      int n = MBRLEN (string, length, &to->mbstate);
+  if (mb_cur_max > 1 && !is_utf8)
+    while (length)
+      {
+        size_t n = MBRLEN (string, length, &to->mbstate);
 
-      /* An invalid sequence is treated like a singlebyte character. */
-      if (n == -1)
-	{
-	  memset (&to->mbstate, 0, sizeof (to->mbstate));
-	  n = 1;
-	}
+        /* An invalid sequence is treated like a singlebyte character. */
+        if (n == (size_t) -1)
+	  {
+	    memset (&to->mbstate, 0, sizeof (to->mbstate));
+	    n = 1;
+	  }
 
-      if (n > 0)
-	length -= n;
-      else
-	break;
-    }
+        if (n > 0)
+	  {
+	    string += n;
+	    length -= n;
+	  }
+        else
+	  break;
+      }
 #endif
 }
 


--- orig/sed/mbcs.c
+++ mod/sed/mbcs.c
@@ -18,7 +18,12 @@
 #include "sed.h"
 #include <stdlib.h>
 
+#ifdef HAVE_LANGINFO_CODESET
+#include <langinfo.h>
+#endif
+
 int mb_cur_max;
+bool is_utf8;
 
 #ifdef HAVE_MBRTOWC
 /* Add a byte to the multibyte character represented by the state
@@ -47,6 +52,26 @@ int brlen (ch, cur_stat)
 void
 initialize_mbcs ()
 {
+  /* For UTF-8, we know that the encoding is stateless.  */
+  const char *codeset_name;
+
+#ifdef HAVE_LANGINFO_CODESET
+  codeset_name = nl_langinfo (CODESET);
+#else
+  codeset_name = getenv ("LC_ALL");
+  if (codeset_name == NULL || codeset_name[0] == '\0')
+    codeset_name = getenv ("LC_CTYPE");
+  if (codeset_name == NULL || codeset_name[0] == '\0')
+    codeset_name = getenv ("LANG");
+  if (codeset_name == NULL)
+    codeset_name = "";
+  else if (strchr (codeset_name, '.') !=  NULL)
+    codeset_name = strchr (codeset_name, '.') + 1;
+#endif
+
+  is_utf8 = (strcasecmp (codeset_name, "UTF-8") == 0
+	     || strcasecmp (codeset_name, "UTF8") == 0);
+
 #ifdef HAVE_MBRTOWC
   mb_cur_max = MB_CUR_MAX;
 #else


--- orig/sed/sed.h
+++ mod/sed/sed.h
@@ -233,6 +233,7 @@ extern bool use_extended_syntax_p;
 
 /* Declarations for multibyte character sets.  */
 extern int mb_cur_max;
+extern bool is_utf8;
 
 #ifdef HAVE_MBRTOWC
 #ifdef HAVE_BTOWC





Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/FC-5/sed.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sed.spec	2 Aug 2006 11:24:18 -0000	1.32
+++ sed.spec	3 Aug 2006 13:36:23 -0000	1.33
@@ -10,8 +10,8 @@
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
 Source1: http://sed.sourceforge.net/sedfaq.txt
-Patch0: sed-4.1.5-bz185374.patch
-Patch1: sed-4.1.5-str_append.patch
+Patch0: sed-4.1.5-utf8performance.patch
+Patch1: sed-4.1.5-bz185374.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -67,8 +67,9 @@
 %{_mandir}/man*/*
 
 %changelog
-* Wed Aug  2 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-4
-- remove superfluous multibyte processing in str_append (#177246)
+* Wed Aug  3 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-4
+- remove superfluous multibyte processing in str_append for UTF-8
+  encoding (thanks Paolo Bonzini, #177246)
 
 * Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-3
 - sync with devel branch


--- sed-4.1.5-str_append.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 13:36:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 09:36:19 -0400
Subject: rpms/sed/FC-4 sed-4.1.5-utf8performance.patch, NONE, 1.1 sed.spec,
	1.28, 1.29 sed-4.1.5-str_append.patch, 1.1, NONE
Message-ID: <200608031336.k73DaJ05017772@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	sed.spec 
Added Files:
	sed-4.1.5-utf8performance.patch 
Removed Files:
	sed-4.1.5-str_append.patch 
Log Message:
- remove superfluous multibyte processing in str_append for UTF-8
  encoding (thanks Paolo Bonzini, #177246)


sed-4.1.5-utf8performance.patch:
 execute.c |   35 ++++++++++++++++++-----------------
 mbcs.c    |   25 +++++++++++++++++++++++++
 sed.h     |    1 +
 3 files changed, 44 insertions(+), 17 deletions(-)

--- NEW FILE sed-4.1.5-utf8performance.patch ---
* looking for bonzini at gnu.org--2004b/sed--stable--4.1--patch-69 to compare with
* comparing to bonzini at gnu.org--2004b/sed--stable--4.1--patch-69
M  sed/mbcs.c
M  sed/sed.h
M  sed/execute.c

* modified files

--- orig/sed/execute.c
+++ mod/sed/execute.c
@@ -235,25 +235,26 @@ str_append(to, string, length)
   to->length = new_length;
 
 #ifdef HAVE_MBRTOWC
-  if (mb_cur_max == 1)
-    return;
-
-  while (length)
-    {
-      int n = MBRLEN (string, length, &to->mbstate);
+  if (mb_cur_max > 1 && !is_utf8)
+    while (length)
+      {
+        size_t n = MBRLEN (string, length, &to->mbstate);
 
-      /* An invalid sequence is treated like a singlebyte character. */
-      if (n == -1)
-	{
-	  memset (&to->mbstate, 0, sizeof (to->mbstate));
-	  n = 1;
-	}
+        /* An invalid sequence is treated like a singlebyte character. */
+        if (n == (size_t) -1)
+	  {
+	    memset (&to->mbstate, 0, sizeof (to->mbstate));
+	    n = 1;
+	  }
 
-      if (n > 0)
-	length -= n;
-      else
-	break;
-    }
+        if (n > 0)
+	  {
+	    string += n;
+	    length -= n;
+	  }
+        else
+	  break;
+      }
 #endif
 }
 


--- orig/sed/mbcs.c
+++ mod/sed/mbcs.c
@@ -18,7 +18,12 @@
 #include "sed.h"
 #include <stdlib.h>
 
+#ifdef HAVE_LANGINFO_CODESET
+#include <langinfo.h>
+#endif
+
 int mb_cur_max;
+bool is_utf8;
 
 #ifdef HAVE_MBRTOWC
 /* Add a byte to the multibyte character represented by the state
@@ -47,6 +52,26 @@ int brlen (ch, cur_stat)
 void
 initialize_mbcs ()
 {
+  /* For UTF-8, we know that the encoding is stateless.  */
+  const char *codeset_name;
+
+#ifdef HAVE_LANGINFO_CODESET
+  codeset_name = nl_langinfo (CODESET);
+#else
+  codeset_name = getenv ("LC_ALL");
+  if (codeset_name == NULL || codeset_name[0] == '\0')
+    codeset_name = getenv ("LC_CTYPE");
+  if (codeset_name == NULL || codeset_name[0] == '\0')
+    codeset_name = getenv ("LANG");
+  if (codeset_name == NULL)
+    codeset_name = "";
+  else if (strchr (codeset_name, '.') !=  NULL)
+    codeset_name = strchr (codeset_name, '.') + 1;
+#endif
+
+  is_utf8 = (strcasecmp (codeset_name, "UTF-8") == 0
+	     || strcasecmp (codeset_name, "UTF8") == 0);
+
 #ifdef HAVE_MBRTOWC
   mb_cur_max = MB_CUR_MAX;
 #else


--- orig/sed/sed.h
+++ mod/sed/sed.h
@@ -233,6 +233,7 @@ extern bool use_extended_syntax_p;
 
 /* Declarations for multibyte character sets.  */
 extern int mb_cur_max;
+extern bool is_utf8;
 
 #ifdef HAVE_MBRTOWC
 #ifdef HAVE_BTOWC





Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/FC-4/sed.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sed.spec	2 Aug 2006 11:16:57 -0000	1.28
+++ sed.spec	3 Aug 2006 13:36:17 -0000	1.29
@@ -10,8 +10,8 @@
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
 Source1: http://sed.sourceforge.net/sedfaq.txt
-Patch0: sed-4.1.5-bz185374.patch
-Patch1: sed-4.1.5-str_append.patch
+Patch0: sed-4.1.5-utf8performance.patch
+Patch1: sed-4.1.5-bz185374.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -67,8 +67,9 @@
 %{_mandir}/man*/*
 
 %changelog
-* Wed Aug  2 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-4.fc4
-- remove superfluous multibyte processing in str_append (#177246)
+* Wed Aug  3 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-4.fc4
+- remove superfluous multibyte processing in str_append for UTF-8
+  encoding (thanks Paolo Bonzini, #177246)
 
 * Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-3.fc4
 - sync with devel branch


--- sed-4.1.5-str_append.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 13:43:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 09:43:38 -0400
Subject: rpms/file/devel file-4.17-empty.patch,NONE,1.1 file.spec,1.52,1.53
Message-ID: <200608031343.k73Dhckn019583@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19463

Modified Files:
	file.spec 
Added Files:
	file-4.17-empty.patch 
Log Message:
* Thu Aug 03 2006 Martin Bacovsky <mbacovsk at redhat.com> - 4.17-6
- fix gziped empty file (#72986)


file-4.17-empty.patch:
 funcs.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE file-4.17-empty.patch ---
--- file-4.17/src/funcs.c.empty	2006-08-03 14:19:45.000000000 +0200
+++ file-4.17/src/funcs.c	2006-08-03 14:20:41.000000000 +0200
@@ -123,7 +123,7 @@
 protected int
 file_buffer(struct magic_set *ms, int fd, const void *buf, size_t nb)
 {
-    int m;
+    int m, anb = nb;
     /* try compression stuff */
     if ((m = file_zmagic(ms, fd, buf, nb)) == 0) {
 	/* Check if we have a tar file */
@@ -132,11 +132,13 @@
 	    if ((m = file_softmagic(ms, buf, nb)) == 0) {
 		/* try known keywords, check whether it is ASCII */
 		if ((m = file_ascmagic(ms, buf, nb)) == 0) {
+			/* count actual buf len without '\0' added by process*/
+			if (nb > 0 && ((char *)buf)[nb-1] == '\0') anb--;
 		    /* abandon hope, all ye who remain here */
 		    if (file_printf(ms, ms->flags & MAGIC_MIME ?
-			(nb ? "application/octet-stream" :
+			(anb  ? "application/octet-stream" :
 			    "application/empty") :
-			(nb ? "data" :
+			(anb ? "data" :
 			    "empty")) == -1)
 			    return -1;
 		    m = 1;


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- file.spec	12 Jul 2006 05:48:18 -0000	1.52
+++ file.spec	3 Aug 2006 13:43:36 -0000	1.53
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.17
-Release: 5.1
+Release: 6
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -21,6 +21,7 @@
 Patch16: file-4.17-oracle.patch
 Patch17: file-4.17-clamav.patch
 Patch18: file-4.17-powerpoint.patch
+Patch19: file-4.17-empty.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -48,6 +49,7 @@
 %patch16 -p1 -b .oracle
 %patch17 -p1 -b .clamav
 %patch18 -p1 -b .powerpoint
+%patch19 -p1 -b .empty
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -93,6 +95,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Thu Aug 03 2006 Martin Bacovsky <mbacovsk at redhat.com> - 4.17-6
+- fix gziped empty file (#72986)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.17-5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 13:54:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 09:54:37 -0400
Subject: rpms/vim/devel vim.spec,1.129,1.130
Message-ID: <200608031354.k73DsbC3006155@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	vim.spec 
Log Message:
- clean up spec file


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- vim.spec	24 Jul 2006 13:32:41 -0000	1.129
+++ vim.spec	3 Aug 2006 13:54:35 -0000	1.130
@@ -6,16 +6,7 @@
 %define desktop_file_utils_version 0.2.93
 %endif
 
-# Set this to 1 if you're building the enterprise version
-%define enterprise 0
-%define withruby 0
-
-%if %{enterprise}
-# don't include ruby interpreter
 %define withnetbeans 0
-%else
-%define withnetbeans 1
-%endif
 
 %define withcvim 0
 
@@ -29,7 +20,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1
+Release: 2
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -103,23 +94,18 @@
 Patch3002: vim-6.1-rh2.patch
 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
-Patch3009: vim-6.4-checkhl.patch
-Patch3010: vim-7.0-fstabsyntax.patch
-Patch3011: vim-6.4-lib64.patch
-Patch3012: vim-7.0-warning.patch
-
+Patch3005: vim-6.4-cvim.patch
+Patch3006: vim-6.4-checkhl.patch
+Patch3007: vim-7.0-fstabsyntax.patch
+Patch3008: vim-6.4-lib64.patch
+Patch3009: vim-7.0-warning.patch
+#
 Patch3100: vim-selinux.patch
 Patch3101: vim-selinux2.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildrequires: python-devel perl libtermcap-devel gettext
 Buildrequires: libacl-devel gpm-devel autoconf
-%if "%{withruby}" == "1"
-Buildrequires: ruby ruby-devel
-%endif
 %if %{WITH_SELINUX}
 Buildrequires: libselinux-devel
 %endif
@@ -278,13 +264,11 @@
 %patch3002 -p1
 %patch3003 -p1
 %patch3004 -p1
-#patch3005 -p1
-#patch3006 -p1
 
+%patch3006 -p1
+%patch3007 -p1
+%patch3008 -p1
 %patch3009 -p1
-%patch3010 -p1
-%patch3011 -p1
-%patch3012 -p1
 
 %if %{WITH_SELINUX}
 %patch3100 -p1
@@ -294,21 +278,16 @@
 %if "%{withcvim}" == "1"
 mkdir cvim
 ( cd cvim; unzip %{SOURCE12}; )
-patch -p1 < %{PATCH3008}
+patch -p1 < %{PATCH3005}
 %endif
 
 
 %build
 cd src
 autoconf
-#perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimdir},g" os_unix.h
-#perl -pi -e "s,\\\$VIM,/usr/share/vim/%{vimdir}/macros,g" os_unix.h
 
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
-%if "%{withruby}" == "1"
-export  RUBY_CFLAGS=-I$(ruby -r rbconfig -e 'p Config::CONFIG["archdir"]')
-%endif
 
 %configure --with-features=huge --enable-pythoninterp --enable-perlinterp \
   --disable-tclinterp --with-x=yes \
@@ -321,9 +300,6 @@
 %else
   --disable-netbeans \
 %endif
-%if "%{withruby}" == "1"
-  --enable-rubyinterp
-%endif
 
 make
 cp vim gvim
@@ -339,9 +315,6 @@
 %else
   --disable-netbeans \
 %endif
-%if "%{withruby}" == "1"
-  --enable-rubyinterp
-%endif
 
 make
 cp vim enhanced-vim
@@ -608,6 +581,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Aug 03 2006  Karsten Hopp <karsten at redhat.de> 7.0.042-2
+- clean up spec file
+
 * Mon Jul 24 2006 Karsten Hopp <karsten at redhat.de> 7.0.042-1
 - patchlevel 42
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 14:13:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 10:13:09 -0400
Subject: rpms/gnome-menus/devel .cvsignore, 1.13, 1.14 gnome-menus.spec, 1.34,
	1.35 sources, 1.13, 1.14
Message-ID: <200608031413.k73ED94R011157@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	12 Jul 2006 17:14:45 -0000	1.13
+++ .cvsignore	3 Aug 2006 14:13:07 -0000	1.14
@@ -1 +1 @@
-gnome-menus-2.15.4.1.tar.bz2
+gnome-menus-2.15.90.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnome-menus.spec	12 Jul 2006 17:30:12 -0000	1.34
+++ gnome-menus.spec	3 Aug 2006 14:13:07 -0000	1.35
@@ -6,8 +6,8 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.15.4.1
-Release: 1
+Version: 2.15.90
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -91,6 +91,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Thu Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4.1-1
 - Update to 2.15.4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Jul 2006 17:14:45 -0000	1.13
+++ sources	3 Aug 2006 14:13:07 -0000	1.14
@@ -1 +1 @@
-2a28a9abba689205a05ece3d0fa93a0b  gnome-menus-2.15.4.1.tar.bz2
+e3c0e6bb376ad250aae6fb99b06f94be  gnome-menus-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 14:18:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 10:18:32 -0400
Subject: rpms/system-config-display/devel .cvsignore, 1.27, 1.28 sources,
	1.34, 1.35 system-config-display.spec, 1.39,
	1.40 system-config-display-1.0.36-pam.patch, 1.1, NONE
Message-ID: <200608031418.k73EIW1D027856@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore sources system-config-display.spec 
Removed Files:
	system-config-display-1.0.36-pam.patch 
Log Message:
update to 1.0.39



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Jul 2006 15:26:54 -0000	1.27
+++ .cvsignore	3 Aug 2006 14:18:30 -0000	1.28
@@ -1,6 +1 @@
-system-config-display-1.0.33.tar.bz2
-system-config-display-1.0.34.tar.bz2
-system-config-display-1.0.35.tar.bz2
-system-config-display-1.0.36.tar.bz2
-system-config-display-1.0.37.tar.bz2
-system-config-display-1.0.38.tar.bz2
+system-config-display-1.0.39.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	26 Jul 2006 15:32:56 -0000	1.34
+++ sources	3 Aug 2006 14:18:30 -0000	1.35
@@ -1 +1 @@
-49054b619a227f5be01ee169b1baa0ee  system-config-display-1.0.38.tar.bz2
+bd66206955f513db0ceb820183f58a51  system-config-display-1.0.39.tar.bz2


Index: system-config-display.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- system-config-display.spec	26 Jul 2006 15:32:56 -0000	1.39
+++ system-config-display.spec	3 Aug 2006 14:18:30 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
-Version: 1.0.38
+Version: 1.0.39
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -9,7 +9,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
-Patch0: system-config-display-1.0.36-pam.patch
 ExcludeArch: s390 s390x ppc64
 Obsoletes: redhat-config-xfree86
 BuildRequires: desktop-file-utils
@@ -37,7 +36,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .pm
 
 %build
 make
@@ -83,6 +81,10 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
 
 %changelog
+* Thu Aug  3 2006 Bill Nottingham <notting at redhat.com> 1.0.39-1
+- adjust to new rhpxl (<clumens at redhat.com>)
+- work with newer, sparser, config files
+
 * Wed Jul 26 2006 Chris Lumens <clumens at redhat.com> 1.0.38-1
 - Fix CHARSET in te and kn translations (#200203).
 - Add gettext to buildrequires.


--- system-config-display-1.0.36-pam.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 14:24:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 10:24:32 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.41, 1.42 gnome-games.spec, 1.84,
	1.85 sources, 1.44, 1.45
Message-ID: <200608031424.k73EOWL7030235@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.15.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	12 Jul 2006 19:53:19 -0000	1.41
+++ .cvsignore	3 Aug 2006 14:24:30 -0000	1.42
@@ -11,3 +11,4 @@
 gnome-games-2.15.2.tar.bz2
 gnome-games-2.15.3.tar.bz2
 gnome-games-2.15.4.tar.bz2
+gnome-games-2.15.5.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gnome-games.spec	26 Jul 2006 03:26:41 -0000	1.84
+++ gnome-games.spec	3 Aug 2006 14:24:30 -0000	1.85
@@ -13,8 +13,8 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.15.4
-Release: 3
+Version: 2.15.5
+Release: 1%{?dist}
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -284,6 +284,9 @@
 
 
 %changelog
+* Thu Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.5-1.fc6
+- Update to 2.15.5
+
 * Tue Jul 25 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.4-3
 - install new gconf schemas. rework the way we do it to be more
   future proof (bug 193777)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	12 Jul 2006 19:53:19 -0000	1.44
+++ sources	3 Aug 2006 14:24:30 -0000	1.45
@@ -1,2 +1,2 @@
 01464739e83449288c6a58685604f86e  gnome-games-extra-data-2.14.0.tar.bz2
-b8c50818ad905f6ecd4f8d90cd0111fc  gnome-games-2.15.4.tar.bz2
+a8dae17f465b280610a22896877d8037  gnome-games-2.15.5.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 14:36:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 10:36:18 -0400
Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec,1.22,1.23
Message-ID: <200608031436.k73EaI7Q001091@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	compat-gcc-32.spec 
Log Message:
3.2.3-57


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- compat-gcc-32.spec	3 Aug 2006 10:17:59 -0000	1.22
+++ compat-gcc-32.spec	3 Aug 2006 14:36:15 -0000	1.23
@@ -2,7 +2,7 @@
 %define LIBSTDCXXDATE 20040818
 %define DATE 20040701
 %define gcc_version 3.2.3
-%define gcc_release 56
+%define gcc_release 57
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define build_java 0
@@ -468,6 +468,17 @@
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib*/libiberty.a
 rm -f $RPM_BUILD_ROOT/lib*/libgcc_s*
 
+%ifarch %{multilib_64_archs}
+# Remove libraries for the other arch on multilib arches
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib/lib*.so*
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib/lib*.a
+%else
+%ifarch sparc ppc
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/lib*.so*
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/lib*.a
+%endif
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -636,8 +647,10 @@
 %{_prefix}/%{_lib}/libg2c.so.0*
 
 %changelog
-* Thu Aug  3 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-56
-- rebuilt
+* Thu Aug  3 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-57
+- in 64-bit builds remove 32-bit /usr/lib/lib* libraries from the
+  buildroots (and similarly on 32-bit builds remove 64-bit /usr/lib64/lib*)
+  before AutoReq generation
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-55.fc5.1
 - rebuild



From fedora-cvs-commits at redhat.com  Thu Aug  3 14:41:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 10:41:40 -0400
Subject: rpms/gnome-games/devel gnome-games.spec,1.85,1.86
Message-ID: <200608031441.k73EfeWE002679@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-games.spec 
Log Message:
bump  glib req



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- gnome-games.spec	3 Aug 2006 14:24:30 -0000	1.85
+++ gnome-games.spec	3 Aug 2006 14:41:36 -0000	1.86
@@ -3,7 +3,7 @@
 %define build_card 1
 %define build_tali 1
 
-%define glib2_version 2.6.0
+%define glib2_version 2.12.0
 %define pango_version 1.8.0
 %define gtk2_version 2.6.0
 %define libgnomeui_version 2.5.0
@@ -286,6 +286,7 @@
 %changelog
 * Thu Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.5-1.fc6
 - Update to 2.15.5
+- Bump glib requirement (#197566)
 
 * Tue Jul 25 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.4-3
 - install new gconf schemas. rework the way we do it to be more



From fedora-cvs-commits at redhat.com  Thu Aug  3 14:46:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 10:46:09 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-add-makedumpfile2.patch,
	1.1, 1.2 kexec-tools.spec, 1.41, 1.42
Message-ID: <200608031446.k73Ek9gk004735@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4386

Modified Files:
	kexec-tools-1.101-add-makedumpfile2.patch kexec-tools.spec 
Log Message:
updating dependencies

kexec-tools-1.101-add-makedumpfile2.patch:
 Makefile                      |   75 
 dwarfinfo/dwarf_alloc.c       |  170 --
 dwarfinfo/dwarf_alloc.h       |    7 
 dwarfinfo/dwarf_die_deliv.c   |    5 
 dwarfinfo/dwarf_error.c       |    7 
 dwarfinfo/dwarf_form.c        |   33 
 dwarfinfo/dwarf_incl.h        |   37 
 dwarfinfo/dwarf_init_finish.c |  324 ---
 dwarfinfo/dwarf_leb.c         |    5 
 dwarfinfo/dwarf_line.c        | 1277 ---------------
 dwarfinfo/dwarf_loc.c         |  158 -
 dwarfinfo/dwarf_names.c       | 3461 ++++++------------------------------------
 dwarfinfo/dwarf_query.c       |  331 ----
 dwarfinfo/dwarf_util.c        |    5 
 dwarfinfo/dwarfdump.c         |  567 +-----
 dwarfinfo/esb.c               |   78 
 dwarfinfo/globals.h           |   29 
 dwarfinfo/malloc_check.c      |   42 
 dwarfinfo/print_die.c         |  699 +++-----
 makedumpfile.c                |  502 +++---
 makedumpfile.h                |   30 
 21 files changed, 1427 insertions(+), 6415 deletions(-)

Index: kexec-tools-1.101-add-makedumpfile2.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-add-makedumpfile2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kexec-tools-1.101-add-makedumpfile2.patch	2 Aug 2006 19:25:03 -0000	1.1
+++ kexec-tools-1.101-add-makedumpfile2.patch	3 Aug 2006 14:46:07 -0000	1.2
@@ -4,7 +4,7 @@
  CC	= gcc
 -CFLAGS	= -g -Wall `gtk-config --cflags` `gtk-config --libs` -D_FILE_OFFSET_BITS=64
 +CFLAGS	= -g -O2 -Wall
-+CFLAGS2	= -g -O2 -Wall `gtk-config --cflags` `gtk-config --libs` -D_FILE_OFFSET_BITS=64
++CFLAGS2	= -g -O2 -Wall `glib-config --cflags` -lglib -D_FILE_OFFSET_BITS=64 
  
  ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
  			       -e s/arm.*/arm/ -e s/sa110/arm/ \


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kexec-tools.spec	3 Aug 2006 13:32:49 -0000	1.41
+++ kexec-tools.spec	3 Aug 2006 14:46:07 -0000	1.42
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 35%{dist}.1
+Release: 36%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -14,7 +14,7 @@
 Source7: makedumpfile.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires(pre): coreutils chkconfig sed
-BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel libXi-devel gtk+-devel
+BuildRequires: zlib-devel elfutils-libelf-devel glib-devel
 
 #
 # Patches 0 through 100 are meant for x86 kexec-tools enablement
@@ -139,6 +139,9 @@
 %doc TODO
 
 %changelog
+* Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-36%{dist}.1
+- Removing unneeded deps after Makefile fixup for makedumpfile
+
 * Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-35%{dist}.1
 - fixing up FC6/RHEL5 BuildRequires line to build in brew
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 14:47:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 10:47:25 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.46,
	1.47 selinux-policy.spec, 1.242, 1.243
Message-ID: <200608031447.k73ElPlu012299@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-19
- Fix anaconda transitions


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 mls                                |    9 -
 modules/admin/anaconda.te          |   10 +
 modules/admin/bootloader.te        |    6 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    5 
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.if       |   21 +++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 ++++++++++++
 modules/kernel/selinux.if          |   18 ++-
 modules/kernel/selinux.te          |    4 
 modules/kernel/storage.fc          |    1 
 modules/kernel/terminal.if         |   18 +++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    2 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    7 +
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cron.if           |   16 ++
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nis.te            |    1 
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |   13 ++
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  146 ++++++++++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    9 -
 modules/services/ssh.if            |   24 ++++
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |   10 +
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    1 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |    6 -
 modules/system/logging.te          |    9 +
 modules/system/lvm.te              |    3 
 modules/system/mount.te            |    2 
 modules/system/selinuxutil.te      |   29 ++++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |   13 +-
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   50 +++-----
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |   26 +++-
 100 files changed, 1094 insertions(+), 274 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- policy-20060608.patch	2 Aug 2006 19:36:17 -0000	1.46
+++ policy-20060608.patch	3 Aug 2006 14:47:22 -0000	1.47
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.3.3/policy/global_booleans
 --- nsaserefpolicy/policy/global_booleans	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/global_booleans	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_booleans	2006-08-03 10:26:57.000000000 -0400
 @@ -4,6 +4,7 @@
  # file should be used.
  #
@@ -19,7 +19,7 @@
  ## <p>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.3/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/global_tunables	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_tunables	2006-08-03 10:26:57.000000000 -0400
 @@ -19,6 +19,14 @@
  
  ## <desc>
@@ -175,7 +175,7 @@
  ## </desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.3.3/policy/mcs
 --- nsaserefpolicy/policy/mcs	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/mcs	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/mcs	2006-08-03 10:26:57.000000000 -0400
 @@ -159,8 +159,9 @@
  mlsconstrain process { transition dyntransition }
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
@@ -189,7 +189,7 @@
  	(( h1 dom h2 ) or ( t1 == mcskillall ));
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.3/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/mls	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/mls	2006-08-03 10:26:57.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -211,9 +211,37 @@
  mlsconstrain dir { add_name remove_name reparent rmdir }
  	((( l1 dom l2 ) and ( l1 domby h2 )) or
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.3/policy/modules/admin/anaconda.te
+--- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:07:13.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/anaconda.te	2006-08-03 10:40:23.000000000 -0400
+@@ -25,8 +25,12 @@
+ 
+ modutils_domtrans_insmod(anaconda_t)
+ 
++seutil_domtrans_semanage(anaconda_t)
++
+ unconfined_domain(anaconda_t)
+ 
++userdom_generic_user_home_dir_filetrans_generic_user_home_content(anaconda_t,{ dir file lnk_file fifo_file sock_file })
++
+ ifdef(`distro_redhat',`
+ 	bootloader_create_runtime_file(anaconda_t)
+ ')
+@@ -51,9 +55,7 @@
+ 	usermanage_domtrans_admin_passwd(anaconda_t)
+ ')
+ 
+-ifdef(`TODO',`
+ optional_policy(`
+-	role system_r types sysadm_ssh_agent_t;
+-	domain_auto_trans(anaconda_t, ssh_agent_exec_t, sysadm_ssh_agent_t)
+-')
++	ssh_domtrans_keygen(anaconda_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.3/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-08-03 10:26:57.000000000 -0400
 @@ -48,7 +48,7 @@
  # bootloader local policy
  #
@@ -244,7 +272,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.3/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-08-03 10:26:57.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -269,7 +297,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.3/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/firstboot.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/firstboot.te	2006-08-03 10:26:57.000000000 -0400
 @@ -120,6 +120,10 @@
  	usermanage_domtrans_useradd(firstboot_t)
  ')
@@ -288,7 +316,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.3.3/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/netutils.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/netutils.te	2006-08-03 10:26:57.000000000 -0400
 @@ -211,11 +211,11 @@
  ifdef(`targeted_policy',`
  	term_use_unallocated_ttys(traceroute_t)
@@ -308,7 +336,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.3/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/prelink.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/prelink.te	2006-08-03 10:26:57.000000000 -0400
 @@ -48,6 +48,7 @@
  corecmd_relabel_all_executables(prelink_t)
  corecmd_mmap_all_executables(prelink_t)
@@ -319,7 +347,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.3/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/rpm.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -331,7 +359,7 @@
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.3/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-08-03 10:26:57.000000000 -0400
 @@ -211,7 +211,7 @@
  
  	files_search_var_lib($1)
@@ -352,7 +380,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.3/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/usermanage.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/usermanage.te	2006-08-03 10:26:57.000000000 -0400
 @@ -260,6 +260,7 @@
  ')
  
@@ -371,7 +399,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.3/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/corecommands.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/corecommands.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -382,7 +410,7 @@
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in	2006-08-03 10:26:57.000000000 -0400
 @@ -62,7 +62,7 @@
  network_port(amavisd_send, tcp,10025,s0)
  network_port(asterisk, tcp,1720,s0, udp,2427,s0, udp,2727,s0, udp,4569,s0, udp,5060,s0)
@@ -411,7 +439,7 @@
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.3/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -20,6 +20,7 @@
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
  /dev/full		-c	gen_context(system_u:object_r:null_device_t,s0)
@@ -431,7 +459,7 @@
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.3/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/files.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/files.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -11,6 +11,7 @@
  ifdef(`distro_redhat',`
  /\.autofsck		--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -442,7 +470,7 @@
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.3.3/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.if	2006-08-03 10:26:57.000000000 -0400
 @@ -1019,6 +1019,27 @@
  
  ########################################
@@ -473,7 +501,7 @@
  ## <desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.3/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.te	2006-08-03 10:26:57.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -492,7 +520,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.3/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/kernel.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/kernel.if	2006-08-03 10:26:57.000000000 -0400
 @@ -1456,6 +1456,42 @@
  
  ########################################
@@ -581,7 +609,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.3.3/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/selinux.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/selinux.if	2006-08-03 10:26:57.000000000 -0400
 @@ -55,7 +55,7 @@
  		type security_t;
  	')
@@ -644,7 +672,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-2.3.3/policy/modules/kernel/selinux.te
 --- nsaserefpolicy/policy/modules/kernel/selinux.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/selinux.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/selinux.te	2006-08-03 10:26:57.000000000 -0400
 @@ -40,10 +40,10 @@
  
  if(!secure_mode_policyload) {
@@ -660,7 +688,7 @@
  }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.3.3/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/storage.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/storage.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -23,6 +23,7 @@
  /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
  /dev/lvm			-c	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
@@ -671,7 +699,7 @@
  /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.3/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/terminal.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/terminal.if	2006-08-03 10:26:57.000000000 -0400
 @@ -949,3 +949,21 @@
  	dontaudit $1 ttynode:chr_file { read write };
  ')
@@ -696,7 +724,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.3/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/amavis.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/amavis.te	2006-08-03 10:26:57.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -728,7 +756,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.3/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/apache.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/apache.te	2006-08-03 10:26:57.000000000 -0400
 @@ -273,7 +273,6 @@
  sysnet_read_config(httpd_t)
  
@@ -739,7 +767,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.3/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/automount.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/automount.te	2006-08-03 10:26:57.000000000 -0400
 @@ -36,10 +36,12 @@
  allow automount_t self:unix_dgram_socket create_socket_perms;
  allow automount_t self:tcp_socket create_stream_socket_perms;
@@ -765,7 +793,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.3/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/avahi.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/avahi.te	2006-08-03 10:26:57.000000000 -0400
 @@ -78,6 +78,8 @@
  miscfiles_read_localization(avahi_t)
  
@@ -777,7 +805,7 @@
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.3.3/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bind.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bind.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -28,7 +28,8 @@
  ')
  
@@ -790,7 +818,7 @@
  /var/named/slaves(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.3/policy/modules/services/bluetooth.if
 --- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bluetooth.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.if	2006-08-03 10:26:57.000000000 -0400
 @@ -111,3 +111,26 @@
  	dontaudit $1 bluetooth_helper_t:dir search;
  	dontaudit $1 bluetooth_helper_t:file { read getattr };
@@ -820,7 +848,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.3/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-08-03 10:26:57.000000000 -0400
 @@ -173,6 +173,7 @@
  allow bluetooth_helper_t self:shm create_shm_perms;
  allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -848,7 +876,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-2.3.3/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/clamav.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -8,8 +8,9 @@
  /usr/sbin/clamd			--	gen_context(system_u:object_r:clamd_exec_t,s0)
  
@@ -862,7 +890,7 @@
 +/var/spool/amavisd/clamd.sock	-s	gen_context(system_u:object_r:clamd_var_run_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.3/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/clamav.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.if	2006-08-03 10:26:57.000000000 -0400
 @@ -35,11 +35,11 @@
  #
  interface(`clamav_stream_connect',`
@@ -901,7 +929,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.3.3/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/clamav.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.te	2006-08-03 10:26:57.000000000 -0400
 @@ -15,10 +15,6 @@
  type clamd_etc_t;
  files_type(clamd_etc_t)
@@ -978,7 +1006,7 @@
  kernel_read_kernel_sysctls(clamscan_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.3/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cron.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cron.if	2006-08-03 10:26:57.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -1023,7 +1051,7 @@
  		# also crontab does a security check for crontab -u
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.3/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-08-03 10:26:57.000000000 -0400
 @@ -81,6 +81,7 @@
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
@@ -1053,7 +1081,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.3/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-08-03 10:26:57.000000000 -0400
 @@ -41,6 +41,7 @@
  allow cyrus_t self:unix_stream_socket connectto;
  allow cyrus_t self:tcp_socket create_stream_socket_perms;
@@ -1072,7 +1100,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.3.3/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/dovecot.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -29,6 +29,7 @@
  /var/run/dovecot(-login)?(/.*)?		gen_context(system_u:object_r:dovecot_var_run_t,s0)
  
@@ -1083,7 +1111,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.3/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/dovecot.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.te	2006-08-03 10:26:57.000000000 -0400
 @@ -30,6 +30,10 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -1114,7 +1142,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.3.3/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ftp.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ftp.te	2006-08-03 10:26:57.000000000 -0400
 @@ -50,6 +50,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -1133,7 +1161,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.3/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-08-03 10:26:57.000000000 -0400
 @@ -22,7 +22,7 @@
  #
  
@@ -1167,7 +1195,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.3.3/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/inetd.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/inetd.te	2006-08-03 10:26:57.000000000 -0400
 @@ -218,10 +218,6 @@
  
  sysnet_read_config(inetd_child_t)
@@ -1193,7 +1221,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-2.3.3/policy/modules/services/ldap.fc
 --- nsaserefpolicy/policy/modules/services/ldap.fc	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ldap.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -9,3 +9,4 @@
  /var/run/openldap(/.*)?		gen_context(system_u:object_r:slapd_var_run_t,s0)
  /var/run/slapd\.args	--	gen_context(system_u:object_r:slapd_var_run_t,s0)
@@ -1201,7 +1229,7 @@
 +/var/run/ldapi		-s	gen_context(system_u:object_r:slapd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.if serefpolicy-2.3.3/policy/modules/services/ldap.if
 --- nsaserefpolicy/policy/modules/services/ldap.if	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ldap.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.if	2006-08-03 10:26:57.000000000 -0400
 @@ -57,3 +57,24 @@
  	allow slapd_t $1:tcp_socket { acceptfrom recvfrom };
  	kernel_tcp_recvfrom($1)
@@ -1229,7 +1257,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.3/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ldap.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.te	2006-08-03 10:26:57.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -1241,7 +1269,7 @@
  kernel_read_kernel_sysctls(slapd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.3.3/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-08-03 10:26:57.000000000 -0400
 @@ -62,7 +62,7 @@
  	allow $1_lpr_t self:unix_stream_socket create_stream_socket_perms;
  	allow $1_lpr_t self:tcp_socket create_socket_perms;
@@ -1308,7 +1336,7 @@
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-2.3.3/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/mailman.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/mailman.te	2006-08-03 10:26:57.000000000 -0400
 @@ -6,8 +6,6 @@
  # Declarations
  #
@@ -1350,7 +1378,7 @@
  	allow mailman_cgi_t mailman_archive_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.3/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/nis.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/nis.te	2006-08-03 10:26:57.000000000 -0400
 @@ -86,6 +86,7 @@
  corenet_tcp_bind_reserved_port(ypbind_t)
  corenet_udp_bind_reserved_port(ypbind_t)
@@ -1361,7 +1389,7 @@
  corenet_dontaudit_udp_bind_all_reserved_ports(ypbind_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.3.3/policy/modules/services/nscd.if
 --- nsaserefpolicy/policy/modules/services/nscd.if	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/nscd.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/nscd.if	2006-08-03 10:26:57.000000000 -0400
 @@ -144,3 +144,23 @@
  
  	allow $1 nscd_t:nscd *;
@@ -1388,7 +1416,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.3/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ntp.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ntp.te	2006-08-03 10:26:57.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -1400,7 +1428,7 @@
  allow ntpd_t self:fifo_file { read write getattr };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.3/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-08-03 10:26:57.000000000 -0400
 @@ -33,6 +33,10 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -1432,7 +1460,7 @@
  ifdef(`targeted_policy',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.3/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/pegasus.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.if	2006-08-03 10:26:57.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -1468,7 +1496,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.3/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/pegasus.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.te	2006-08-03 10:26:57.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -1487,7 +1515,7 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.3/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postfix.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postfix.te	2006-08-03 10:26:57.000000000 -0400
 @@ -160,7 +160,7 @@
  
  init_use_script_ptys(postfix_master_t)
@@ -1539,7 +1567,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-2.3.3/policy/modules/services/postgrey.fc
 --- nsaserefpolicy/policy/modules/services/postgrey.fc	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postgrey.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -6,3 +6,5 @@
  /var/run/postgrey\.pid	--	gen_context(system_u:object_r:postgrey_var_run_t,s0)
  
@@ -1548,7 +1576,7 @@
 +/var/run/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-2.3.3/policy/modules/services/postgrey.if
 --- nsaserefpolicy/policy/modules/services/postgrey.if	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postgrey.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.if	2006-08-03 10:26:57.000000000 -0400
 @@ -1 +1,20 @@
  ## <summary>Postfix grey-listing server</summary>
 +
@@ -1572,7 +1600,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-2.3.3/policy/modules/services/postgrey.te
 --- nsaserefpolicy/policy/modules/services/postgrey.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postgrey.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.te	2006-08-03 10:26:57.000000000 -0400
 @@ -40,6 +40,7 @@
  allow postgrey_t postgrey_var_run_t:file create_file_perms;
  allow postgrey_t postgrey_var_run_t:dir rw_dir_perms;
@@ -1606,7 +1634,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.3/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/procmail.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/procmail.te	2006-08-03 10:26:57.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -1628,7 +1656,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.fc serefpolicy-2.3.3/policy/modules/services/radius.fc
 --- nsaserefpolicy/policy/modules/services/radius.fc	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/radius.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/radius.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -3,6 +3,7 @@
  /etc/cron\.(daily|weekly|monthly)/freeradius -- gen_context(system_u:object_r:radiusd_exec_t,s0)
  
@@ -1639,7 +1667,7 @@
  /usr/sbin/freeradius	--	gen_context(system_u:object_r:radiusd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.3.3/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/radius.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/radius.te	2006-08-03 10:26:57.000000000 -0400
 @@ -13,6 +13,9 @@
  type radiusd_etc_t;
  files_config_file(radiusd_etc_t)
@@ -1664,7 +1692,7 @@
  logging_log_filetrans(radiusd_t,radiusd_log_t,{ file dir })
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.3.3/policy/modules/services/remotelogin.te
 --- nsaserefpolicy/policy/modules/services/remotelogin.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/remotelogin.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/remotelogin.te	2006-08-03 10:26:57.000000000 -0400
 @@ -37,6 +37,7 @@
  allow remote_login_t self:sem create_sem_perms;
  allow remote_login_t self:msgq create_msgq_perms;
@@ -1675,7 +1703,7 @@
  allow remote_login_t remote_login_tmp_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.3/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/samba.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/samba.te	2006-08-03 10:26:57.000000000 -0400
 @@ -186,11 +186,12 @@
  allow smbd_t self:udp_socket create_socket_perms;
  allow smbd_t self:unix_dgram_socket { create_socket_perms sendto };
@@ -1709,7 +1737,7 @@
  allow nmbd_t samba_var_t:dir rw_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -0,0 +1,11 @@
 +# setroubleshoot executables
 +
@@ -1724,7 +1752,7 @@
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if	2006-08-03 10:26:57.000000000 -0400
 @@ -0,0 +1,24 @@
 +## <summary>policy for setroubleshoot</summary>
 +
@@ -1752,7 +1780,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-08-03 10:26:57.000000000 -0400
 @@ -0,0 +1,146 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -1902,7 +1930,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.3/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/spamassassin.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/spamassassin.te	2006-08-03 10:26:57.000000000 -0400
 @@ -194,3 +194,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -1913,7 +1941,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.3/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-08-03 10:26:57.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -1949,7 +1977,7 @@
  ') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.3/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ssh.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ssh.if	2006-08-03 10:32:50.000000000 -0400
 @@ -71,6 +71,7 @@
  	allow $1_ssh_t self:msgq create_msgq_perms;
  	allow $1_ssh_t self:msg { send receive };
@@ -1958,9 +1986,36 @@
  
  	# for rsync
  	allow $1_ssh_t $2:unix_stream_socket rw_socket_perms;
+@@ -752,3 +753,26 @@
+ 
+ 	dontaudit $1 sshd_key_t:file { getattr read };
+ ')
++
++########################################
++## <summary>
++##	Execute ssh_keygen_exec_t in the ssh_keygen_t domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`ssh_domtrans_keygen',`
++	gen_require(`
++		type ssh_keygen_t, ssh_keygen_exec_t;
++	')
++
++	domain_auto_trans($1,ssh_keygen_exec_t,ssh_keygen_t)
++
++	allow $1 ssh_keygen_t:fd use;
++	allow ssh_keygen_t $1:fd use;
++	allow ssh_keygen_t $1:fifo_file rw_file_perms;
++	allow ssh_keygen_t $1:process sigchld;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.3/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-08-03 10:26:57.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -1971,7 +2026,7 @@
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.3.3/policy/modules/services/xfs.te
 --- nsaserefpolicy/policy/modules/services/xfs.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/xfs.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xfs.te	2006-08-03 10:26:57.000000000 -0400
 @@ -59,6 +59,8 @@
  term_dontaudit_use_console(xfs_t)
  
@@ -1983,7 +2038,7 @@
  init_use_script_ptys(xfs_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.3/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/xserver.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.if	2006-08-03 10:26:57.000000000 -0400
 @@ -317,7 +317,6 @@
  	')
  
@@ -2022,7 +2077,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/xserver.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.te	2006-08-03 10:26:57.000000000 -0400
 @@ -88,6 +88,7 @@
  allow xdm_t self:unix_dgram_socket create_socket_perms;
  allow xdm_t self:tcp_socket create_stream_socket_perms;
@@ -2042,7 +2097,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.3.3/policy/modules/services/zebra.te
 --- nsaserefpolicy/policy/modules/services/zebra.te	2006-07-14 17:07:13.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-08-03 10:26:57.000000000 -0400
 @@ -42,6 +42,11 @@
  allow zebra_t zebra_conf_t:file r_file_perms;
  allow zebra_t zebra_conf_t:lnk_file { getattr read };
@@ -2069,7 +2124,7 @@
  dev_list_all_dev_nodes(zebra_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.3.3/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/authlogin.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/authlogin.if	2006-08-03 10:26:57.000000000 -0400
 @@ -1336,3 +1336,6 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
@@ -2079,7 +2134,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.3/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/authlogin.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/authlogin.te	2006-08-03 10:26:57.000000000 -0400
 @@ -193,6 +193,7 @@
  term_setattr_console(pam_console_t)
  term_getattr_unallocated_ttys(pam_console_t)
@@ -2090,7 +2145,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-2.3.3/policy/modules/system/fstools.fc
 --- nsaserefpolicy/policy/modules/system/fstools.fc	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/fstools.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/fstools.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -1,3 +1,4 @@
 +/sbin/blkid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/blockdev		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -2098,7 +2153,7 @@
  /sbin/dosfsck		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-2.3.3/policy/modules/system/getty.fc
 --- nsaserefpolicy/policy/modules/system/getty.fc	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/getty.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -9,3 +9,4 @@
  /var/run/mgetty\.pid.*	--	gen_context(system_u:object_r:getty_var_run_t,s0)
  
@@ -2106,7 +2161,7 @@
 +/var/spool/voice	--	gen_context(system_u:object_r:getty_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.3.3/policy/modules/system/getty.te
 --- nsaserefpolicy/policy/modules/system/getty.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/getty.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.te	2006-08-03 10:26:57.000000000 -0400
 @@ -37,7 +37,7 @@
  #
  
@@ -2126,7 +2181,7 @@
  init_use_script_ptys(getty_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.3/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-08-03 10:26:57.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -2151,7 +2206,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hotplug.te serefpolicy-2.3.3/policy/modules/system/hotplug.te
 --- nsaserefpolicy/policy/modules/system/hotplug.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/hotplug.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hotplug.te	2006-08-03 10:26:57.000000000 -0400
 @@ -136,7 +136,7 @@
  	term_dontaudit_use_generic_ptys(hotplug_t)
  
@@ -2163,7 +2218,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.3/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/init.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/init.if	2006-08-03 10:26:57.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -2180,7 +2235,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.3/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/libraries.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/libraries.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -198,9 +198,9 @@
  # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame
  /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -2195,7 +2250,7 @@
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.3/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/locallogin.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/locallogin.te	2006-08-03 10:26:57.000000000 -0400
 @@ -51,6 +51,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -2206,7 +2261,7 @@
  files_lock_filetrans(local_login_t,local_login_lock_t,file)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.3/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -2216,7 +2271,7 @@
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.3/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.if	2006-08-03 10:26:57.000000000 -0400
 @@ -165,6 +165,7 @@
  	')
  
@@ -2253,7 +2308,7 @@
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.3/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-08-03 10:26:57.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -2288,7 +2343,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.3/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/lvm.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/lvm.te	2006-08-03 10:26:57.000000000 -0400
 @@ -125,7 +125,7 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
@@ -2308,7 +2363,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.3/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/mount.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/mount.te	2006-08-03 10:26:57.000000000 -0400
 @@ -97,6 +97,8 @@
  
  sysnet_use_portmap(mount_t)
@@ -2320,7 +2375,7 @@
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-08-03 10:26:57.000000000 -0400
 @@ -258,6 +258,8 @@
  allow newrole_t { selinux_config_t default_context_t }:file r_file_perms;
  allow newrole_t { selinux_config_t default_context_t }:lnk_file r_file_perms;
@@ -2418,7 +2473,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.3/policy/modules/system/setrans.te
 --- nsaserefpolicy/policy/modules/system/setrans.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/setrans.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/setrans.te	2006-08-03 10:26:57.000000000 -0400
 @@ -68,3 +68,8 @@
  miscfiles_read_localization(setrans_t)
  
@@ -2430,7 +2485,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.3.3/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/sysnetwork.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/sysnetwork.te	2006-08-03 10:26:57.000000000 -0400
 @@ -277,6 +277,7 @@
  # for /sbin/ip
  allow ifconfig_t self:packet_socket create_socket_perms;
@@ -2439,9 +2494,19 @@
  allow ifconfig_t self:tcp_socket { create ioctl };
  files_read_etc_files(ifconfig_t);
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.3/policy/modules/system/udev.fc
+--- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:07:12.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/udev.fc	2006-08-03 10:41:24.000000000 -0400
+@@ -1,5 +1,6 @@
+ # udev
+ 
++/dev/\.udev(/.*)?	gen_context(system_u:object_r:udev_tbl_t,s0)
+ /dev/\.udevdb	--	gen_context(system_u:object_r:udev_tbl_t,s0)
+ /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.3/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/udev.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/udev.te	2006-08-03 10:26:57.000000000 -0400
 @@ -39,9 +39,9 @@
  # Local policy
  #
@@ -2456,7 +2521,7 @@
  allow udev_t self:fifo_file rw_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.3/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.fc	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.fc	2006-08-03 10:26:57.000000000 -0400
 @@ -9,4 +9,5 @@
  /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -2465,7 +2530,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.3/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-08-03 10:26:57.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -2490,7 +2555,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.3/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-08-03 10:26:57.000000000 -0400
 @@ -56,10 +56,6 @@
  	')
  
@@ -2525,7 +2590,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-08-03 10:26:57.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -2901,7 +2966,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.3/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-08-03 10:26:57.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -3012,7 +3077,7 @@
  			selinux_set_boolean(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.3/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/xen.if	2006-08-02 15:33:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.if	2006-08-03 10:26:57.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -3057,7 +3122,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.3/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-08-02 15:33:25.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-08-03 10:26:57.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(xen,1.0.7)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- selinux-policy.spec	2 Aug 2006 19:36:17 -0000	1.242
+++ selinux-policy.spec	3 Aug 2006 14:47:22 -0000	1.243
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 18
+Release: 19
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-19
+- Fix anaconda transitions
+
 * Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-18
 - yet more xen rules
  



From fedora-cvs-commits at redhat.com  Thu Aug  3 14:51:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 10:51:51 -0400
Subject: rpms/emacs/FC-5 emacs.spec,1.70,1.71
Message-ID: <200608031451.k73Eppcs021019@cvs.devel.redhat.com>

Author: coldwell

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

Modified Files:
	emacs.spec 
Log Message:
fix the release number to stay behind rawhide


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/FC-5/emacs.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- emacs.spec	2 Aug 2006 14:12:27 -0000	1.70
+++ emacs.spec	3 Aug 2006 14:51:48 -0000	1.71
@@ -11,7 +11,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 15
+Release: 14.1
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -552,7 +552,7 @@
 %endif
 
 %changelog
-* Tue Aug  1 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-15
+* Tue Aug  1 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-14.1
 - fix German spell checking for UTF-8 encoded buffers (Daniel Hammer #197737)
 
 * Tue Mar  7 2006 Jens Petersen <petersen at redhat.com> - 21.4-14



From fedora-cvs-commits at redhat.com  Thu Aug  3 14:52:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 10:52:21 -0400
Subject: rpms/system-config-display/devel .cvsignore, 1.28, 1.29 sources,
	1.35, 1.36 system-config-display.spec, 1.40, 1.41
Message-ID: <200608031452.k73EqLxh021243@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore sources system-config-display.spec 
Log Message:
update to 1.0.40



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	3 Aug 2006 14:18:30 -0000	1.28
+++ .cvsignore	3 Aug 2006 14:52:19 -0000	1.29
@@ -1 +1 @@
-system-config-display-1.0.39.tar.bz2
+system-config-display-1.0.40.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	3 Aug 2006 14:18:30 -0000	1.35
+++ sources	3 Aug 2006 14:52:19 -0000	1.36
@@ -1 +1 @@
-bd66206955f513db0ceb820183f58a51  system-config-display-1.0.39.tar.bz2
+4d014981b3779e4e3f293ee2410c8c94  system-config-display-1.0.40.tar.bz2


Index: system-config-display.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- system-config-display.spec	3 Aug 2006 14:18:30 -0000	1.40
+++ system-config-display.spec	3 Aug 2006 14:52:19 -0000	1.41
@@ -1,6 +1,6 @@
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
-Version: 1.0.39
+Version: 1.0.40
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -81,6 +81,9 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
 
 %changelog
+* Thu Aug  3 2006 Bill Nottingham <notting at redhat.com> 1.0.40-1
+- when dealing with autoprobed monitors, pull current resolution from randr
+
 * Thu Aug  3 2006 Bill Nottingham <notting at redhat.com> 1.0.39-1
 - adjust to new rhpxl (<clumens at redhat.com>)
 - work with newer, sparser, config files



From fedora-cvs-commits at redhat.com  Thu Aug  3 15:16:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 11:16:33 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-add-makedumpfile2.patch,
	1.2, 1.3 kexec-tools.spec, 1.42, 1.43
Message-ID: <200608031516.k73FGX8r003362@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1532

Modified Files:
	kexec-tools-1.101-add-makedumpfile2.patch kexec-tools.spec 
Log Message:
updating makedumpconfig makefile to use pkg-config

kexec-tools-1.101-add-makedumpfile2.patch:
 Makefile                      |   75 
 dwarfinfo/dwarf_alloc.c       |  170 --
 dwarfinfo/dwarf_alloc.h       |    7 
 dwarfinfo/dwarf_die_deliv.c   |    5 
 dwarfinfo/dwarf_error.c       |    7 
 dwarfinfo/dwarf_form.c        |   33 
 dwarfinfo/dwarf_incl.h        |   37 
 dwarfinfo/dwarf_init_finish.c |  324 ---
 dwarfinfo/dwarf_leb.c         |    5 
 dwarfinfo/dwarf_line.c        | 1277 ---------------
 dwarfinfo/dwarf_loc.c         |  158 -
 dwarfinfo/dwarf_names.c       | 3461 ++++++------------------------------------
 dwarfinfo/dwarf_query.c       |  331 ----
 dwarfinfo/dwarf_util.c        |    5 
 dwarfinfo/dwarfdump.c         |  567 +-----
 dwarfinfo/esb.c               |   78 
 dwarfinfo/globals.h           |   29 
 dwarfinfo/malloc_check.c      |   42 
 dwarfinfo/print_die.c         |  699 +++-----
 makedumpfile.c                |  502 +++---
 makedumpfile.h                |   30 
 21 files changed, 1427 insertions(+), 6415 deletions(-)

Index: kexec-tools-1.101-add-makedumpfile2.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-add-makedumpfile2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kexec-tools-1.101-add-makedumpfile2.patch	3 Aug 2006 14:46:07 -0000	1.2
+++ kexec-tools-1.101-add-makedumpfile2.patch	3 Aug 2006 15:16:27 -0000	1.3
@@ -4,7 +4,7 @@
  CC	= gcc
 -CFLAGS	= -g -Wall `gtk-config --cflags` `gtk-config --libs` -D_FILE_OFFSET_BITS=64
 +CFLAGS	= -g -O2 -Wall
-+CFLAGS2	= -g -O2 -Wall `glib-config --cflags` -lglib -D_FILE_OFFSET_BITS=64 
++CFLAGS2	= -g -O2 -Wall `pkg-config --cflags glib` -lglib -D_FILE_OFFSET_BITS=64 
  
  ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
  			       -e s/arm.*/arm/ -e s/sa110/arm/ \


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kexec-tools.spec	3 Aug 2006 14:46:07 -0000	1.42
+++ kexec-tools.spec	3 Aug 2006 15:16:27 -0000	1.43
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 36%{dist}.1
+Release: 37%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -14,7 +14,7 @@
 Source7: makedumpfile.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires(pre): coreutils chkconfig sed
-BuildRequires: zlib-devel elfutils-libelf-devel glib-devel
+BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel
 
 #
 # Patches 0 through 100 are meant for x86 kexec-tools enablement
@@ -139,6 +139,9 @@
 %doc TODO
 
 %changelog
+* Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-37%{dist}.1
+- updating makedumpfile makefile to use pkg-config
+
 * Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-36%{dist}.1
 - Removing unneeded deps after Makefile fixup for makedumpfile
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 15:17:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 11:17:12 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.43,1.44
Message-ID: <200608031517.k73FHC1x010011@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9625

Modified Files:
	kexec-tools.spec 
Log Message:
updating makedumpconfig makefile to use pkg-config


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kexec-tools.spec	3 Aug 2006 15:16:27 -0000	1.43
+++ kexec-tools.spec	3 Aug 2006 15:17:10 -0000	1.44
@@ -14,7 +14,7 @@
 Source7: makedumpfile.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires(pre): coreutils chkconfig sed
-BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel
+BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel pkgconfig
 
 #
 # Patches 0 through 100 are meant for x86 kexec-tools enablement



From fedora-cvs-commits at redhat.com  Thu Aug  3 15:23:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 11:23:53 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.103, 1.104 libsepol.spec, 1.136,
	1.137 sources, 1.104, 1.105
Message-ID: <200608031523.k73FNroP016278@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 1.12.23-1
- Upgrade to latest from NSA
	* Merged symtab datum patch from Karl MacMillan.
	* Merged netfilter contexts support from Chris PeBenito.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	1 Aug 2006 14:07:40 -0000	1.103
+++ .cvsignore	3 Aug 2006 15:23:51 -0000	1.104
@@ -103,3 +103,4 @@
 libsepol-1.12.17.tgz
 libsepol-1.12.19.tgz
 libsepol-1.12.21.tgz
+libsepol-1.12.23.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- libsepol.spec	1 Aug 2006 14:07:40 -0000	1.136
+++ libsepol.spec	3 Aug 2006 15:23:51 -0000	1.137
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.12.21
+Version: 1.12.23
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -85,6 +85,11 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 1.12.23-1
+- Upgrade to latest from NSA
+	* Merged symtab datum patch from Karl MacMillan.
+	* Merged netfilter contexts support from Chris PeBenito.
+
 * Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 1.12.21-1
 - Upgrade to latest from NSA
 	* Merged helpful hierarchy check errors patch from Joshua Brindle.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	1 Aug 2006 14:07:40 -0000	1.104
+++ sources	3 Aug 2006 15:23:51 -0000	1.105
@@ -1 +1 @@
-f8fc9d63258fb867eabffc8e49d46506  libsepol-1.12.21.tgz
+11961ec5bd76ac532031417f3a9449a1  libsepol-1.12.23.tgz



From fedora-cvs-commits at redhat.com  Thu Aug  3 15:25:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 11:25:58 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-add-makedumpfile2.patch,
	1.3, 1.4 kexec-tools.spec, 1.44, 1.45
Message-ID: <200608031525.k73FPwmF016362@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16341

Modified Files:
	kexec-tools-1.101-add-makedumpfile2.patch kexec-tools.spec 
Log Message:
once again fixing makedumpfile Makefile

kexec-tools-1.101-add-makedumpfile2.patch:
 Makefile                      |   75 
 dwarfinfo/dwarf_alloc.c       |  170 --
 dwarfinfo/dwarf_alloc.h       |    7 
 dwarfinfo/dwarf_die_deliv.c   |    5 
 dwarfinfo/dwarf_error.c       |    7 
 dwarfinfo/dwarf_form.c        |   33 
 dwarfinfo/dwarf_incl.h        |   37 
 dwarfinfo/dwarf_init_finish.c |  324 ---
 dwarfinfo/dwarf_leb.c         |    5 
 dwarfinfo/dwarf_line.c        | 1277 ---------------
 dwarfinfo/dwarf_loc.c         |  158 -
 dwarfinfo/dwarf_names.c       | 3461 ++++++------------------------------------
 dwarfinfo/dwarf_query.c       |  331 ----
 dwarfinfo/dwarf_util.c        |    5 
 dwarfinfo/dwarfdump.c         |  567 +-----
 dwarfinfo/esb.c               |   78 
 dwarfinfo/globals.h           |   29 
 dwarfinfo/malloc_check.c      |   42 
 dwarfinfo/print_die.c         |  699 +++-----
 makedumpfile.c                |  502 +++---
 makedumpfile.h                |   30 
 21 files changed, 1427 insertions(+), 6415 deletions(-)

Index: kexec-tools-1.101-add-makedumpfile2.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-add-makedumpfile2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kexec-tools-1.101-add-makedumpfile2.patch	3 Aug 2006 15:16:27 -0000	1.3
+++ kexec-tools-1.101-add-makedumpfile2.patch	3 Aug 2006 15:25:55 -0000	1.4
@@ -4,7 +4,7 @@
  CC	= gcc
 -CFLAGS	= -g -Wall `gtk-config --cflags` `gtk-config --libs` -D_FILE_OFFSET_BITS=64
 +CFLAGS	= -g -O2 -Wall
-+CFLAGS2	= -g -O2 -Wall `pkg-config --cflags glib` -lglib -D_FILE_OFFSET_BITS=64 
++CFLAGS2	= -g -O2 -Wall `pkg-config --cflags glib-2.0` -lglib -D_FILE_OFFSET_BITS=64 
  
  ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
  			       -e s/arm.*/arm/ -e s/sa110/arm/ \


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kexec-tools.spec	3 Aug 2006 15:17:10 -0000	1.44
+++ kexec-tools.spec	3 Aug 2006 15:25:55 -0000	1.45
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 37%{dist}.1
+Release: 38%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -139,6 +139,9 @@
 %doc TODO
 
 %changelog
+* Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-38%{dist}.1
+- updating makedumpfile makefile to use pkg-config on glib-2.0
+
 * Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-37%{dist}.1
 - updating makedumpfile makefile to use pkg-config
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 15:27:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 11:27:04 -0400
Subject: rpms/system-config-display/devel .cvsignore, 1.29, 1.30 sources,
	1.36, 1.37 system-config-display.spec, 1.41, 1.42
Message-ID: <200608031527.k73FR4uh016455@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore sources system-config-display.spec 
Log Message:
bump for bugfix



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	3 Aug 2006 14:52:19 -0000	1.29
+++ .cvsignore	3 Aug 2006 15:27:02 -0000	1.30
@@ -1 +1 @@
-system-config-display-1.0.40.tar.bz2
+system-config-display-1.0.41.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	3 Aug 2006 14:52:19 -0000	1.36
+++ sources	3 Aug 2006 15:27:02 -0000	1.37
@@ -1 +1 @@
-4d014981b3779e4e3f293ee2410c8c94  system-config-display-1.0.40.tar.bz2
+fc32744253bf8294a72448ad979f9e17  system-config-display-1.0.41.tar.bz2


Index: system-config-display.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- system-config-display.spec	3 Aug 2006 14:52:19 -0000	1.41
+++ system-config-display.spec	3 Aug 2006 15:27:02 -0000	1.42
@@ -1,6 +1,6 @@
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
-Version: 1.0.40
+Version: 1.0.41
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -81,12 +81,10 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
 
 %changelog
-* Thu Aug  3 2006 Bill Nottingham <notting at redhat.com> 1.0.40-1
-- when dealing with autoprobed monitors, pull current resolution from randr
-
-* Thu Aug  3 2006 Bill Nottingham <notting at redhat.com> 1.0.39-1
+* Thu Aug  3 2006 Bill Nottingham <notting at redhat.com> 1.0.41-1
 - adjust to new rhpxl (<clumens at redhat.com>)
 - work with newer, sparser, config files
+- when dealing with autoprobed monitors, pull current resolution from randr
 
 * Wed Jul 26 2006 Chris Lumens <clumens at redhat.com> 1.0.38-1
 - Fix CHARSET in te and kn translations (#200203).



From fedora-cvs-commits at redhat.com  Thu Aug  3 15:42:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 11:42:27 -0400
Subject: rpms/emacs/devel ispell-german-utf-8.patch,NONE,1.1
Message-ID: <200608031542.k73FgR5F027794@cvs.devel.redhat.com>

Author: coldwell

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27744

Added Files:
	ispell-german-utf-8.patch 
Log Message:
patch to fix ispell for German on UTF-8 encoded files

ispell-german-utf-8.patch:
 ispell.el |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ispell-german-utf-8.patch ---
--- emacs-21.4/lisp/textmodes/ispell.el~	2006-08-01 17:29:01.000000000 -0400
+++ emacs-21.4/lisp/textmodes/ispell.el	2006-08-01 17:30:20.000000000 -0400
@@ -532,7 +532,7 @@ See `ispell-dictionary-alist'."
    ("deutsch8"
     "[a-zA-Z\304\326\334\344\366\337\374]"
     "[^a-zA-Z\304\326\334\344\366\337\374]"
-    "[']" t ("-C" "-d" "deutsch") "~latin1" iso-8859-1)
+    "[']" t ("-C" "-d" "deutsch" "--encoding=iso8859-1") "~latin1" iso-8859-1)
    ("english"				; make English explicitly selectable
     "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)))
 
@@ -569,7 +569,7 @@ See `ispell-dictionary-alist'."
    ("german8"
     "[a-zA-Z\304\326\334\344\366\337\374]"
     "[^a-zA-Z\304\326\334\344\366\337\374]"
-    "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1)
+    "[']" t ("-C" "-d" "german" "--encoding=iso8859-1") "~latin1" iso-8859-1)
    ("italiano"                         ; Italian.aff
     "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]"
     "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]"



From fedora-cvs-commits at redhat.com  Thu Aug  3 15:45:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 11:45:10 -0400
Subject: rpms/emacs/devel emacs.spec,1.73,1.74
Message-ID: <200608031545.k73FjAdF028876@cvs.devel.redhat.com>

Author: coldwell

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28844

Modified Files:
	emacs.spec 
Log Message:
fix german ispell on UTF-8 encoded files


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- emacs.spec	26 Jul 2006 17:26:54 -0000	1.73
+++ emacs.spec	3 Aug 2006 15:45:08 -0000	1.74
@@ -9,7 +9,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 15
+Release: 16
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -126,6 +126,7 @@
 %endif
 Patch124: mule-cmd.el-X11-locale.alias-173781.patch
 Patch125: sort-columns-posix-key-182282.patch
+Patch126: ispell-german-utf-8.patch
 
 %description
 Emacs is a powerful, customizable, self-documenting, modeless text
@@ -269,6 +270,8 @@
 %patch124 -p1
 # sort-columns posix key defs
 %patch125 -p1
+# German spell-checking for UTF-8 encoded buffers
+%patch126 -p1
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -550,6 +553,9 @@
 %endif
 
 %changelog
+* Thu Aug  3 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-16
+- fix German spell checking for UTF-8 encoded buffers (Daniel Hammer #197737)
+
 * Wed Jul 26 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-15
 - fix src/unexelf.c to build on PowerPC64 (backport from emacs-22, #183304)
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 16:04:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 12:04:40 -0400
Subject: rpms/emacs/FC-5 ppc64-unexelf.patch,NONE,1.1 emacs.spec,1.71,1.72
Message-ID: <200608031604.k73G4emM017307@cvs.devel.redhat.com>

Author: coldwell

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

Modified Files:
	emacs.spec 
Added Files:
	ppc64-unexelf.patch 
Log Message:
bring in PPC64 fix from devel

ppc64-unexelf.patch:
 unexelf.c |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

--- NEW FILE ppc64-unexelf.patch ---
--- emacs-21.4/src/unexelf.c	2002-10-15 10:21:44.000000000 -0400
+++ emacs-21.4.works/src/unexelf.c	2006-07-26 11:08:05.000000000 -0400
@@ -697,7 +697,7 @@ unexec (new_name, old_name, data_start, 
   ElfW(Addr) new_data2_addr;
 
   int n, nn;
-  int old_bss_index, old_sbss_index;
+  int old_bss_index, old_sbss_index, old_plt_index;
   int old_data_index, new_data2_index;
   int old_mdebug_index;
   struct stat stat_buf;
@@ -759,12 +759,31 @@ unexec (new_name, old_name, data_start, 
     if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
       old_sbss_index = -1;
 
-  if (old_sbss_index == -1)
+  /* PowerPC64 has .plt in the BSS section.  */
+  old_plt_index = find_section (".plt", old_section_names,
+				old_name, old_file_h, old_section_h, 1);
+  if (old_plt_index != -1)
+    if (OLD_SECTION_H (old_plt_index).sh_type != SHT_NOBITS)
+      old_plt_index = -1;
+
+  if (old_sbss_index == -1 && old_plt_index == -1)
     {
       old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
       old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
       new_data2_index = old_bss_index;
     }
+  else if (old_plt_index != -1
+	   && (old_sbss_index == -1
+	       || (OLD_SECTION_H (old_sbss_index).sh_addr
+		   > OLD_SECTION_H (old_plt_index).sh_addr)))
+    {
+      old_bss_addr = OLD_SECTION_H (old_plt_index).sh_addr;
+      old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
+	+ OLD_SECTION_H (old_plt_index).sh_size;
+      if (old_sbss_index != -1)
+	old_bss_size += OLD_SECTION_H (old_sbss_index).sh_size;
+      new_data2_index = old_plt_index;
+    }
   else
     {
       old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
@@ -955,7 +974,7 @@ unexec (new_name, old_name, data_start, 
       if (n == old_bss_index
 	  /* The new bss and sbss section's size is zero, and its file offset
 	     and virtual address should be off by NEW_DATA2_SIZE.  */
-	  || n == old_sbss_index
+	  || n == old_sbss_index || n == old_plt_index
 	  )
 	{
 	  /* NN should be `old_s?bss_index + 1' at this point. */
@@ -986,9 +1005,8 @@ unexec (new_name, old_name, data_start, 
 	      >= OLD_SECTION_H (old_bss_index-1).sh_offset)
 	    NEW_SECTION_H (nn).sh_offset += new_data2_size;
 #else
-	  if (round_up (NEW_SECTION_H (nn).sh_offset,
-			OLD_SECTION_H (old_bss_index).sh_addralign)
-	      >= new_data2_offset)
+	  if (NEW_SECTION_H (nn).sh_offset + NEW_SECTION_H (nn).sh_size
+	      > new_data2_offset)
 	    NEW_SECTION_H (nn).sh_offset += new_data2_size;
 #endif
 	  /* Any section that was originally placed after the section


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/FC-5/emacs.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- emacs.spec	3 Aug 2006 14:51:48 -0000	1.71
+++ emacs.spec	3 Aug 2006 16:04:37 -0000	1.72
@@ -1,6 +1,4 @@
 # This file is encoded in UTF-8.  -*- coding: utf-8 -*-
-# FIXME: doesn't currently build on ppc64
-ExcludeArch: ppc64
 
 %define emacs21 1
 %define muleucs_ver current
@@ -11,7 +9,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 14.1
+Release: 15.1
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -102,6 +100,8 @@
 Patch26: xfree86-4.3-modifiers.dpatch
 # generated from ftp://fly.isti.cnr.it/pub/etags.c.gz
 Patch27: etags-update-to-cvs.patch
+# required to build on PowerPC64
+Patch34: ppc64-unexelf.patch
 %endif
 
 # Lisp and doc patches
@@ -232,6 +232,7 @@
 %patch25 -p1 -b .25-scroll-margin
 %patch26 -p1 -b .26-xmodifier
 %patch27 -p1 -b .27-14.21
+%patch34 -p1 -b .34-ppc64-unexelf
 %endif
 
 # patches 2 and 3 touch configure.in
@@ -552,8 +553,9 @@
 %endif
 
 %changelog
-* Tue Aug  1 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-14.1
+* Tue Aug  1 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-15.1
 - fix German spell checking for UTF-8 encoded buffers (Daniel Hammer #197737)
+- fix src/unexelf.c to build on PowerPC64 (backport from emacs-22, #183304)
 
 * 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



From fedora-cvs-commits at redhat.com  Thu Aug  3 16:36:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 12:36:17 -0400
Subject: rpms/gdm/FC-5 gdm-2.14.10-update-switchdesk-location.patch, NONE,
	1.1 .cvsignore, 1.26, 1.27 gdm.spec, 1.152, 1.153 sources,
	1.30, 1.31 gdm-2.13.0.4-update-switchdesk-location.patch, 1.1, NONE
Message-ID: <200608031636.k73GaH3x009115@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	.cvsignore gdm.spec sources 
Added Files:
	gdm-2.14.10-update-switchdesk-location.patch 
Removed Files:
	gdm-2.13.0.4-update-switchdesk-location.patch 
Log Message:
- Update to 2.14.10


gdm-2.14.10-update-switchdesk-location.patch:
 gdmsession.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gdm-2.14.10-update-switchdesk-location.patch ---
--- gdm-2.14.10/gui/gdmsession.c.update-switchdesk-location	2006-08-03 12:30:49.000000000 -0400
+++ gdm-2.14.10/gui/gdmsession.c	2006-08-03 12:31:18.000000000 -0400
@@ -448,7 +448,7 @@ gdm_session_lookup (const char *saved_se
 	       * irrelevant, we are in "switchdesk mode" and the relevant
 	       * thing is the saved session in .Xclients
 	       */
-	      if (g_access ("/usr/bin/switchdesk", F_OK) == 0)
+	      if (g_access ("/usr/share/switchdesk/switchdesk-gui.py", F_OK) == 0)
 	        {
 	          firstmsg = g_strdup_printf (_("You have chosen %s for this "
 	                                        "session"),


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	17 Jun 2006 08:01:50 -0000	1.26
+++ .cvsignore	3 Aug 2006 16:36:14 -0000	1.27
@@ -1 +1 @@
-gdm-2.14.9.tar.bz2
+gdm-2.14.10.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- gdm.spec	17 Jun 2006 08:01:50 -0000	1.152
+++ gdm.spec	3 Aug 2006 16:36:14 -0000	1.153
@@ -14,8 +14,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.14.9
-Release: 1
+Version: 2.14.10
+Release: 1%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -28,7 +28,7 @@
 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
+Patch5: gdm-2.14.10-update-switchdesk-location.patch
 Patch6: gdm-2.6.0.7-wait-for-bootup.patch
 Patch7: gdm-2.8.0.2-clean-up-xsession-errors.patch
 Patch8: gdm-2.8.0.2-merge-resources.patch
@@ -315,6 +315,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Thu Jun  8 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.10-1
+- Update to 2.14.10
+
 * Thu Jun  8 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.9-1
 - Update to 2.14.9
 - Fixes autologin problem (bug 195014).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	17 Jun 2006 08:01:51 -0000	1.30
+++ sources	3 Aug 2006 16:36:15 -0000	1.31
@@ -1 +1 @@
-7e46bc3b0a5b08e79f1f2f1b869caf40  gdm-2.14.9.tar.bz2
+e880558dc3574f804f3abca869992a4f  gdm-2.14.10.tar.bz2


--- gdm-2.13.0.4-update-switchdesk-location.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 16:50:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 12:50:30 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.47,
	1.48 selinux-policy.spec, 1.243, 1.244
Message-ID: <200608031650.k73GoUAv027640@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-20
- More fixes for xen


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 mls                                |    9 -
 modules/admin/anaconda.te          |   10 +
 modules/admin/bootloader.te        |    6 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    5 
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.if       |   21 +++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 ++++++++++++
 modules/kernel/selinux.if          |   18 ++-
 modules/kernel/selinux.te          |    4 
 modules/kernel/storage.fc          |    1 
 modules/kernel/terminal.if         |   18 +++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    2 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    7 +
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cron.if           |   16 ++
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nis.te            |    1 
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |   13 ++
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  146 ++++++++++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    9 -
 modules/services/ssh.if            |   24 ++++
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |   10 +
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    1 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |    6 -
 modules/system/logging.te          |    9 +
 modules/system/lvm.te              |    3 
 modules/system/mount.te            |    2 
 modules/system/selinuxutil.te      |   29 ++++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |   13 +-
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   50 +++-----
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |   30 +++--
 100 files changed, 1098 insertions(+), 274 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- policy-20060608.patch	3 Aug 2006 14:47:22 -0000	1.47
+++ policy-20060608.patch	3 Aug 2006 16:50:26 -0000	1.48
@@ -1977,7 +1977,7 @@
  ') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.3/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-07-14 17:07:14.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ssh.if	2006-08-03 10:32:50.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ssh.if	2006-08-03 10:49:34.000000000 -0400
 @@ -71,6 +71,7 @@
  	allow $1_ssh_t self:msgq create_msgq_perms;
  	allow $1_ssh_t self:msg { send receive };
@@ -3077,7 +3077,7 @@
  			selinux_set_boolean(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.3/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/xen.if	2006-08-03 10:26:57.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.if	2006-08-03 12:41:40.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -3096,10 +3096,10 @@
 +#
 +interface(`xen_use_fds',`
 +	gen_require(`
-+		type xen_t;
++		type xend_t;
 +	')
 +
-+	allow $1 xen_t:fd use;
++	allow $1 xend_t:fd use;
 +')
 +
 +########################################
@@ -3115,14 +3115,14 @@
 +#
 +interface(`xen_dontaudit_use_fds',`
 +	gen_require(`
-+		type xen_t;
++		type xend_t;
 +	')
 +
-+	dontaudit $1 xen_t:fd use;
++	dontaudit $1 xend_t:fd use;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.3/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-07-14 17:07:12.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-08-03 10:26:57.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-08-03 12:45:18.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(xen,1.0.7)
@@ -3130,16 +3130,18 @@
  
  ########################################
  #
-@@ -70,6 +70,8 @@
+@@ -69,7 +69,10 @@
+ #
  
  allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
++dontaudit xend_t self:capability { sys_ptrace };
  allow xend_t self:process { signal sigkill };
 +dontaudit xend_t self:process ptrace;
 +
  # internal communication is often done using fifo and unix sockets.
  allow xend_t self:fifo_file rw_file_perms;
  allow xend_t self:unix_stream_socket create_stream_socket_perms;
-@@ -79,7 +81,7 @@
+@@ -79,7 +82,7 @@
  allow xend_t self:packet_socket create_socket_perms;
  
  allow xend_t xen_image_t:dir r_dir_perms;
@@ -3148,7 +3150,7 @@
  
  # pid file
  allow xend_t xend_var_run_t:file manage_file_perms;
-@@ -130,6 +132,8 @@
+@@ -130,6 +133,8 @@
  corenet_tcp_bind_soundd_port(xend_t)
  corenet_sendrecv_xen_server_packets(xend_t)
  corenet_sendrecv_soundd_server_packets(xend_t)
@@ -3157,7 +3159,14 @@
  
  dev_read_urand(xend_t)
  dev_manage_xen(xend_t)
-@@ -144,13 +148,17 @@
+@@ -138,19 +143,24 @@
+ 
+ domain_read_all_domains_state(xend_t)
+ domain_dontaudit_read_all_domains_state(xend_t)
++domain_dontaudit_ptrace_all_domains(xend_t)
+ 
+ files_read_etc_files(xend_t)
+ files_read_kernel_symbol_table(xend_t)
  files_read_kernel_img(xend_t)
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -3177,7 +3186,7 @@
  
  libs_use_ld_so(xend_t)
  libs_use_shared_libs(xend_t)
-@@ -171,7 +179,7 @@
+@@ -171,7 +181,7 @@
  netutils_domtrans(xend_t)
  
  optional_policy(`
@@ -3186,7 +3195,14 @@
  ')
  
  ########################################
-@@ -196,10 +204,11 @@
+@@ -191,15 +201,18 @@
+ allow xenconsoled_t xenconsoled_var_run_t:dir rw_dir_perms;
+ files_pid_filetrans(xenconsoled_t,xenconsoled_var_run_t, { file sock_file })
+ 
++domain_dontaudit_ptrace_all_domains(xenconsoled_t)
++
+ kernel_read_kernel_sysctls(xenconsoled_t)
+ kernel_write_xen_state(xenconsoled_t)
  kernel_read_xen_state(xenconsoled_t)
  
  term_create_pty(xenconsoled_t,xen_devpts_t);
@@ -3199,7 +3215,7 @@
  
  libs_use_ld_so(xenconsoled_t)
  libs_use_shared_libs(xenconsoled_t)
-@@ -238,10 +247,11 @@
+@@ -238,10 +251,11 @@
  dev_filetrans_xen(xenstored_t)
  dev_rw_xen(xenstored_t)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- selinux-policy.spec	3 Aug 2006 14:47:22 -0000	1.243
+++ selinux-policy.spec	3 Aug 2006 16:50:26 -0000	1.244
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 19
+Release: 20
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-20
+- More fixes for xen
+
 * Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-19
 - Fix anaconda transitions
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 16:58:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 12:58:29 -0400
Subject: rpms/epiphany/FC-5 epiphany.spec,1.100,1.101
Message-ID: <200608031658.k73GwTn0030659@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	epiphany.spec 
Log Message:
- add some funky compiler options without thinking about it too
hard



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/FC-5/epiphany.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- epiphany.spec	2 Aug 2006 05:03:58 -0000	1.100
+++ epiphany.spec	3 Aug 2006 16:58:27 -0000	1.101
@@ -81,7 +81,7 @@
 %endif
 
 %configure --disable-scrollkeeper --enable-zeroconf %{enable_nm} 
-make %{?_smp_mflags}
+make %{?_smp_mflags} CXXFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend" CFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend"
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Thu Aug  3 16:58:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 12:58:46 -0400
Subject: rpms/dasher/devel .cvsignore, 1.15, 1.16 dasher.spec, 1.49,
	1.50 sources, 1.15, 1.16
Message-ID: <200608031658.k73Gwktb030851@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30773

Modified Files:
	.cvsignore dasher.spec sources 
Log Message:
4.1.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	12 Jul 2006 04:41:37 -0000	1.15
+++ .cvsignore	3 Aug 2006 16:58:43 -0000	1.16
@@ -1 +1 @@
-dasher-4.1.7.tar.bz2
+dasher-4.1.8.tar.bz2


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- dasher.spec	26 Jul 2006 19:54:17 -0000	1.49
+++ dasher.spec	3 Aug 2006 16:58:43 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 4.1.7
-Release: 3%{?dist} 
+Version: 4.1.8
+Release: 1%{?dist} 
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -99,7 +99,10 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
-* Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 4.1.7-3%{?dist}
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.8-1.fc6
+- Update to 4.1.8
+
+* Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 4.1.7-3.fc6
 - Add dist tag and rebuild
 
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.7-2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	12 Jul 2006 04:41:37 -0000	1.15
+++ sources	3 Aug 2006 16:58:43 -0000	1.16
@@ -1 +1 @@
-ca65b0903b8e7448900bdea6b0fb41cc  dasher-4.1.7.tar.bz2
+7247d8741257cd59bb02b0dc267e13ce  dasher-4.1.8.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:04:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:04:32 -0400
Subject: rpms/gucharmap/devel gucharmap.spec,1.6,1.7
Message-ID: <200608031704.k73H4W0g032059@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gucharmap.spec 
Log Message:
trry again



Index: gucharmap.spec
===================================================================
RCS file: /cvs/dist/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gucharmap.spec	2 Aug 2006 18:37:26 -0000	1.6
+++ gucharmap.spec	3 Aug 2006 17:04:22 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           gucharmap
 Version:        1.7.0
-Release:        1
+Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
 Group:          Applications/System
@@ -112,10 +112,13 @@
 
 
 %changelog
+* Thu Aug 02 2006 Matthias Clasen <mclasen at redhat.com> 
+- Rebuild 
+
 * Wed Aug 02 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.7.0-1
 - Update to 1.7.0
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.6.0-8.1
 - rebuild
 
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 1.6.0-8



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:09:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:09:39 -0400
Subject: rpms/librsvg2/devel .cvsignore, 1.25, 1.26 librsvg2.spec, 1.52,
	1.53 sources, 1.26, 1.27
Message-ID: <200608031709.k73H9d1K000763@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/librsvg2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv712

Modified Files:
	.cvsignore librsvg2.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	11 May 2006 04:05:15 -0000	1.25
+++ .cvsignore	3 Aug 2006 17:09:37 -0000	1.26
@@ -1 +1 @@
-librsvg-2.15.0.tar.bz2
+librsvg-2.15.90.tar.bz2


Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- librsvg2.spec	12 Jul 2006 06:55:42 -0000	1.52
+++ librsvg2.spec	3 Aug 2006 17:09:37 -0000	1.53
@@ -11,8 +11,8 @@
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
-Version: 2.15.0
-Release: 3.1
+Version: 2.15.90
+Release: 1%{?dist}
 
 License: 	LGPL
 Group: System Environment/Libraries
@@ -117,6 +117,9 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.0-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	11 May 2006 04:05:18 -0000	1.26
+++ sources	3 Aug 2006 17:09:37 -0000	1.27
@@ -1 +1 @@
-65fd0f35bc163dd655d69300ac7f2086  librsvg-2.15.0.tar.bz2
+aa3788c32b5af38bb6417b7524443562  librsvg-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:18:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:18:22 -0400
Subject: rpms/kexec-tools/devel
	kexec-tools-1.101-makedumpfile-acrchbuild.patch, NONE,
	1.1 kexec-tools.spec, 1.45, 1.46
Message-ID: <200608031718.k73HIM5i018422@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18396

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-makedumpfile-acrchbuild.patch 
Log Message:
patching makedumpfile to build on arches besides x86_64 and x86

kexec-tools-1.101-makedumpfile-acrchbuild.patch:
 makedumpfile.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kexec-tools-1.101-makedumpfile-acrchbuild.patch ---
--- kexec-tools-1.101/makedumpfile/makedumpfile.h.orig	2006-08-03 11:31:48.000000000 -0400
+++ kexec-tools-1.101/makedumpfile/makedumpfile.h	2006-08-03 11:37:20.000000000 -0400
@@ -149,10 +149,15 @@
 #ifdef __x86_64__
 #define MAXMEM			0x3fffffffffffUL
 #endif /* x86_64 */
-
 #ifdef __ia64__ /* ia64 */
+#define MAXMEM			0x3fffffffffffUL
 #endif          /* ia64 */
 
+#ifndef MAXMEM
+#warn "MAXMEM is not defined for the arch.  makedumpfile will likely not work"
+#define MAXMEM 0
+#endif
+
 #define MSG(x...)	fprintf(stdout, x)
 #define ERRMSG(x...)	fprintf(stderr, x)
 


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kexec-tools.spec	3 Aug 2006 15:25:55 -0000	1.45
+++ kexec-tools.spec	3 Aug 2006 17:18:20 -0000	1.46
@@ -54,6 +54,7 @@
 Patch603: kexec-tools-1.101-et-dyn.patch
 Patch604: kexec-tools-1.101-add-makedumpfile1.patch
 Patch605: kexec-tools-1.101-add-makedumpfile2.patch
+Patch606: kexec-tools-1.101-makedumpfile-archbuild.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -87,6 +88,7 @@
 
 %patch604 -p1
 %patch605 -p1
+%patch606 -p1
 
 %build
 %configure --sbindir=/sbin
@@ -139,6 +141,9 @@
 %doc TODO
 
 %changelog
+* Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-39%{dist}.1
+- patch makedumpfile to build on other arches besides x86[_64]
+
 * Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-38%{dist}.1
 - updating makedumpfile makefile to use pkg-config on glib-2.0
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:18:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:18:23 -0400
Subject: rpms/libgnomeui/devel .cvsignore, 1.27, 1.28 libgnomeui.spec, 1.51,
	1.52 sources, 1.27, 1.28
Message-ID: <200608031718.k73HINBv018439@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18369

Modified Files:
	.cvsignore libgnomeui.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	12 Jul 2006 19:24:41 -0000	1.27
+++ .cvsignore	3 Aug 2006 17:18:20 -0000	1.28
@@ -1 +1 @@
-libgnomeui-2.15.2.tar.bz2
+libgnomeui-2.15.90.tar.bz2


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- libgnomeui.spec	26 Jul 2006 04:30:47 -0000	1.51
+++ libgnomeui.spec	3 Aug 2006 17:18:20 -0000	1.52
@@ -17,8 +17,8 @@
 
 Summary: GNOME base GUI library
 Name: libgnomeui
-Version: 2.15.2
-Release: 2
+Version: 2.15.90
+Release: 1%{?dist}
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Patch0: libgnomeui-2.15.2-undead-code.patch
@@ -164,6 +164,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Wed Jul 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-2
 - Make GnomeIconList work again
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	12 Jul 2006 19:24:41 -0000	1.27
+++ sources	3 Aug 2006 17:18:20 -0000	1.28
@@ -1 +1 @@
-ec5841c2c01d79e97bc363414e446240  libgnomeui-2.15.2.tar.bz2
+8da68a3e49d2af4ab61518f79420cc3b  libgnomeui-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:24:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:24:56 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.46,1.47
Message-ID: <200608031724.k73HOu9E020924@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20901

Modified Files:
	kexec-tools.spec 
Log Message:
excluding makedumpfile from non-x86 arches


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kexec-tools.spec	3 Aug 2006 17:18:20 -0000	1.46
+++ kexec-tools.spec	3 Aug 2006 17:24:53 -0000	1.47
@@ -94,7 +94,9 @@
 %configure --sbindir=/sbin
 rm -f kexec-tools.spec.in
 make
+%ifarch %{ix86} x86_64
 make -C makedumpfile
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -105,7 +107,9 @@
 install -m 755 kdump.init $RPM_BUILD_ROOT/etc/rc.d/init.d/kdump
 install -m 755 mkdumprd $RPM_BUILD_ROOT/sbin/mkdumprd
 install -m 755 kdump.conf $RPM_BUILD_ROOT/etc/kdump.conf
+%ifarch %{ix86} x86_64
 install -m 755 makedumpfile/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -142,7 +146,7 @@
 
 %changelog
 * Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-39%{dist}.1
-- patch makedumpfile to build on other arches besides x86[_64]
+- exclude makedumpfile from build on non-x86[_64] arches 
 
 * Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-38%{dist}.1
 - updating makedumpfile makefile to use pkg-config on glib-2.0



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:25:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:25:50 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.47,1.48
Message-ID: <200608031725.k73HPoNm021313@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21289

Modified Files:
	kexec-tools.spec 
Log Message:
bumping revision number


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kexec-tools.spec	3 Aug 2006 17:24:53 -0000	1.47
+++ kexec-tools.spec	3 Aug 2006 17:25:48 -0000	1.48
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 38%{dist}.1
+Release: 39%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:28:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:28:20 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc3-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.503, 1.504 kernel-2.6.spec, 1.2517,
	1.2518 linux-2.6-lockdep-fixes.patch, 1.15, 1.16 sources,
	1.467, 1.468 upstream, 1.409,
	1.410 linux-2.6-x86_64-entry-more-unwind.patch, 1.1,
	NONE patch-2.6.18-rc3-git1.bz2.sign, 1.1,
	NONE patch-2.6.18-rc3-git2.bz2.sign, 1.1, NONE
Message-ID: <200608031728.k73HSKeN022273@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-lockdep-fixes.patch 
	sources upstream 
Added Files:
	patch-2.6.18-rc3-git3.bz2.sign 
Removed Files:
	linux-2.6-x86_64-entry-more-unwind.patch 
	patch-2.6.18-rc3-git1.bz2.sign patch-2.6.18-rc3-git2.bz2.sign 
Log Message:
git3


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

iD8DBQBE0Z9syGugalF9Dw4RAnyMAJ4ypKLLHy5A1vuAMSvlM9Dxb+abmwCcC00a
k4+fX0avlgMnt21qBaaevy4=
=YJrT
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -r1.503 -r1.504
--- .cvsignore	2 Aug 2006 22:56:39 -0000	1.503
+++ .cvsignore	3 Aug 2006 17:28:17 -0000	1.504
@@ -4,4 +4,4 @@
 linux-2.6.17.tar.bz2
 xen-10730.tar.bz2
 patch-2.6.18-rc3.bz2
-patch-2.6.18-rc3-git2.bz2
+patch-2.6.18-rc3-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2517
retrieving revision 1.2518
diff -u -r1.2517 -r1.2518
--- kernel-2.6.spec	3 Aug 2006 08:53:00 -0000	1.2517
+++ kernel-2.6.spec	3 Aug 2006 17:28:17 -0000	1.2518
@@ -264,7 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc3.bz2
-Patch2: patch-2.6.18-rc3-git2.bz2
+Patch2: patch-2.6.18-rc3-git3.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -275,7 +275,6 @@
 
 Patch200: linux-2.6-x86-tune-generic.patch
 Patch201: linux-2.6-x86-vga-vidfail.patch
-Patch202: linux-2.6-x86_64-entry-more-unwind.patch
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
@@ -735,8 +734,6 @@
 # for the installer cd that wants to automatically fall back to textmode
 # in that case
 %patch201 -p1
-# Fix backtracing for interrupt stacks.
-%patch202 -p1
 # Suppress APIC errors on UP x86-64.
 %patch203 -p1
 # Support TIF_RESTORE_SIGMASK on x86_64
@@ -1634,6 +1631,9 @@
 %endif
 
 %changelog
+* Thu Aug  3 2006 Dave Jones <davej at redhat.com>
+- 2.6.18rc3-git3
+
 * Thu Aug  3 2006 Jon Masters <jcm at redhat.com>
 - Copy .config to include/config/auto.conf to avoid unnecessary "make prepare".
 - This should finally fix #197220.

linux-2.6-lockdep-fixes.patch:
 a/net/ipv6/icmp.c                             |   13 ++++++++++
 linux-2.6.17-mm6/include/net/sock.h           |   33 +++++++++++++++++++++++---
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++++++++-
 linux-2.6.18-rc1/net/socket.c                 |    8 +++++-
 5 files changed, 64 insertions(+), 8 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6-lockdep-fixes.patch	1 Aug 2006 23:22:52 -0000	1.15
+++ linux-2.6-lockdep-fixes.patch	3 Aug 2006 17:28:17 -0000	1.16
@@ -338,394 +338,6 @@
  asmlinkage long sys_socket(int family, int type, int protocol)
 
 
-From davej  Sat Jul 29 00:35:14 2006
-Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S1161468AbWG2Edz at vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
-	nwo.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-101.8 required=5.0 tests=AWL,BAYES_00,
-	USER_IN_WHITELIST autolearn=ham version=3.1.3
-Envelope-to: davej at kernelslacker.org
-Delivery-date: Sat, 29 Jul 2006 05:34:29 +0100
-Received: from testure.choralone.org [194.9.77.134]
-	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
-	for <davej at localhost> (single-drop); Sat, 29 Jul 2006 00:35:14 -0400 (EDT)
-Received: from vger.kernel.org ([209.132.176.167])
-	by testure.choralone.org with esmtp (Exim 4.62)
-	(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S1161468AbWG2Edz at vger.kernel.org>)
-	id 1G6gWy-0002hG-HE
-	for davej at kernelslacker.org; Sat, 29 Jul 2006 05:34:29 +0100
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
-	id S1161468AbWG2Edz (ORCPT <rfc822;davej at kernelslacker.org>);
-	Sat, 29 Jul 2006 00:33:55 -0400
-Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1161464AbWG2Edz
-	(ORCPT <rfc822;linux-kernel-outgoing>);
-	Sat, 29 Jul 2006 00:33:55 -0400
-Received: from rhun.apana.org.au ([64.62.148.172]:63751 "EHLO
-	arnor.apana.org.au") by vger.kernel.org with ESMTP id S1161466AbWG2Edy
-	(ORCPT <rfc822;linux-kernel at vger.kernel.org>);
-	Sat, 29 Jul 2006 00:33:54 -0400
-Received: from gondolin.me.apana.org.au ([192.168.0.6])
-	by arnor.apana.org.au with esmtp (Exim 4.50 #1 (Debian))
-	id 1G6gWD-0007H2-SX; Sat, 29 Jul 2006 14:33:41 +1000
-Received: from herbert by gondolin.me.apana.org.au with local (Exim 3.36 #1 (Debian))
-	id 1G6gVx-0001px-00; Sat, 29 Jul 2006 14:33:25 +1000
-Date:	Sat, 29 Jul 2006 14:33:25 +1000
-To:	"David S. Miller" <davem at davemloft.net>,
-	YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>,
-	Matt Domsch <Matt_Domsch at dell.com>
-Cc:	linux-kernel at vger.kernel.org, netdev at vger.kernel.org
-Subject: [IPV6]: Audit all ip6_dst_lookup/ip6_dst_store calls
-Message-ID: <20060729043325.GA7035 at gondor.apana.org.au>
-References: <20060728194531.GA17744 at lists.us.dell.com>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <20060728194531.GA17744 at lists.us.dell.com>
-User-Agent: Mutt/1.5.9i
-From:	Herbert Xu <herbert at gondor.apana.org.au>
-Sender:	linux-kernel-owner at vger.kernel.org
-Precedence: bulk
-X-Mailing-List:	linux-kernel at vger.kernel.org
-Status: RO
-Content-Length: 10664
-Lines: 334
-
-On Fri, Jul 28, 2006 at 07:45:31PM +0000, Matt Domsch wrote:
-> Triggered on Fedora rawhide kernel-2.6.17-1.2462.fc6 x86_64 which is
-> based on 2.6.18rc2-git6.  IPv6 was in use at the time.
-> 
-> =================================
-> [ INFO: inconsistent lock state ]
-> ---------------------------------
-> inconsistent {softirq-on-W} -> {in-softirq-R} usage.
-> swapper/0 [HC0[0]:SC1[1]:HE1:SE0] takes:
->  (&sk->sk_dst_lock){---?}, at: [<ffffffff80418ef3>]
->  sk_dst_check+0x26/0x12b
-> {softirq-on-W} state was registered at:
->   [<ffffffff802a874d>] lock_acquire+0x4a/0x69
->   [<ffffffff802672a1>] _write_lock+0x24/0x31
->   [<ffffffff8044a26b>] ip4_datagram_connect+0x2e1/0x350
->   [<ffffffff80451214>] inet_dgram_connect+0x57/0x65
->   [<ffffffff8041652a>] sys_connect+0x7d/0xa4
->   [<ffffffff8025ff0d>] system_call+0x7d/0x83
-
-Thanks for the report.  This is actually a false positive because
-by these two paths can't intersect since one is a UDP while the other
-is TCP.
-
-However, here is a patch which should shut up the validator as well
-as removing unnecessary locking from most callers of ip6_dst_lookup.
-
-[IPV6]: Audit all ip6_dst_lookup/ip6_dst_store calls
-
-The current users of ip6_dst_lookup can be divided into two classes:
-
-1) The caller holds no locks and is in user-context (UDP).
-2) The caller does not want to lookup the dst cache at all.
-
-The second class covers everyone except UDP because most people do
-the cache lookup directly before calling ip6_dst_lookup.  This patch
-adds ip6_sk_dst_lookup for the first class.
-
-Similarly ip6_dst_store users can be divded into those that need to
-take the socket dst lock and those that don't.  This patch adds
-__ip6_dst_store for those (everyone except UDP/datagram) that don't
-need an extra lock.
-
-Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
-
-Cheers,
--- 
-Visit Openswan at http://www.openswan.org/
-Email: Herbert Xu ~{PmV>HI~} <herbert at gondor.apana.org.au>
-Home Page: http://gondor.apana.org.au/~herbert/
-PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
---
-diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
-index ab29daf..96b0e66 100644
---- a/include/net/ip6_route.h
-+++ b/include/net/ip6_route.h
-@@ -139,16 +139,22 @@ extern rwlock_t rt6_lock;
- /*
-  *	Store a destination cache entry in a socket
-  */
--static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
--				     struct in6_addr *daddr)
-+static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst,
-+				   struct in6_addr *daddr)
- {
- 	struct ipv6_pinfo *np = inet6_sk(sk);
- 	struct rt6_info *rt = (struct rt6_info *) dst;
- 
--	write_lock(&sk->sk_dst_lock);
- 	sk_setup_caps(sk, dst);
- 	np->daddr_cache = daddr;
- 	np->dst_cookie = rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0;
-+}
-+
-+static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
-+				 struct in6_addr *daddr)
-+{
-+	write_lock(&sk->sk_dst_lock);
-+	__ip6_dst_store(sk, dst, daddr);
- 	write_unlock(&sk->sk_dst_lock);
- }
- 
-diff --git a/include/net/ipv6.h b/include/net/ipv6.h
-index a8fdf79..ece7e8a 100644
---- a/include/net/ipv6.h
-+++ b/include/net/ipv6.h
-@@ -468,6 +468,9 @@ extern void			ip6_flush_pending_frames(s
- extern int			ip6_dst_lookup(struct sock *sk,
- 					       struct dst_entry **dst,
- 					       struct flowi *fl);
-+extern int			ip6_sk_dst_lookup(struct sock *sk,
-+						  struct dst_entry **dst,
-+						  struct flowi *fl);
- 
- /*
-  *	skb processing functions
-diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
-index 9f3d4d7..610c722 100644
---- a/net/dccp/ipv6.c
-+++ b/net/dccp/ipv6.c
-@@ -230,7 +230,7 @@ static int dccp_v6_connect(struct sock *
- 	ipv6_addr_copy(&np->saddr, saddr);
- 	inet->rcv_saddr = LOOPBACK4_IPV6;
- 
--	ip6_dst_store(sk, dst, NULL);
-+	__ip6_dst_store(sk, dst, NULL);
- 
- 	icsk->icsk_ext_hdr_len = 0;
- 	if (np->opt != NULL)
-@@ -863,7 +863,7 @@ static struct sock *dccp_v6_request_recv
- 	 * comment in that function for the gory details. -acme
- 	 */
- 
--	ip6_dst_store(newsk, dst, NULL);
-+	__ip6_dst_store(newsk, dst, NULL);
- 	newsk->sk_route_caps = dst->dev->features & ~(NETIF_F_IP_CSUM |
- 						      NETIF_F_TSO);
- 	newdp6 = (struct dccp6_sock *)newsk;
-diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
-index 5a0ba58..ac85e9c 100644
---- a/net/ipv6/af_inet6.c
-+++ b/net/ipv6/af_inet6.c
-@@ -658,7 +658,7 @@ int inet6_sk_rebuild_header(struct sock 
- 			return err;
- 		}
- 
--		ip6_dst_store(sk, dst, NULL);
-+		__ip6_dst_store(sk, dst, NULL);
- 	}
- 
- 	return 0;
-diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
-index 5c950cc..bf49107 100644
---- a/net/ipv6/inet6_connection_sock.c
-+++ b/net/ipv6/inet6_connection_sock.c
-@@ -185,7 +185,7 @@ int inet6_csk_xmit(struct sk_buff *skb, 
- 			return err;
- 		}
- 
--		ip6_dst_store(sk, dst, NULL);
-+		__ip6_dst_store(sk, dst, NULL);
- 	}
- 
- 	skb->dst = dst_clone(dst);
-diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
-index 3bc74ce..5e74a37 100644
---- a/net/ipv6/ip6_output.c
-+++ b/net/ipv6/ip6_output.c
-@@ -723,48 +723,51 @@ fail:
- 	return err;
- }
- 
--int ip6_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi *fl)
-+static struct dst_entry *ip6_sk_dst_check(struct sock *sk,
-+					  struct dst_entry *dst,
-+					  struct flowi *fl)
- {
--	int err = 0;
-+	struct ipv6_pinfo *np = inet6_sk(sk);
-+	struct rt6_info *rt = (struct rt6_info *)dst;
- 
--	*dst = NULL;
--	if (sk) {
--		struct ipv6_pinfo *np = inet6_sk(sk);
--	
--		*dst = sk_dst_check(sk, np->dst_cookie);
--		if (*dst) {
--			struct rt6_info *rt = (struct rt6_info*)*dst;
--	
--			/* Yes, checking route validity in not connected
--			 * case is not very simple. Take into account,
--			 * that we do not support routing by source, TOS,
--			 * and MSG_DONTROUTE 		--ANK (980726)
--			 *
--			 * 1. If route was host route, check that
--			 *    cached destination is current.
--			 *    If it is network route, we still may
--			 *    check its validity using saved pointer
--			 *    to the last used address: daddr_cache.
--			 *    We do not want to save whole address now,
--			 *    (because main consumer of this service
--			 *    is tcp, which has not this problem),
--			 *    so that the last trick works only on connected
--			 *    sockets.
--			 * 2. oif also should be the same.
--			 */
--			if (((rt->rt6i_dst.plen != 128 ||
--			      !ipv6_addr_equal(&fl->fl6_dst,
--					       &rt->rt6i_dst.addr))
--			     && (np->daddr_cache == NULL ||
--				 !ipv6_addr_equal(&fl->fl6_dst,
--						  np->daddr_cache)))
--			    || (fl->oif && fl->oif != (*dst)->dev->ifindex)) {
--				dst_release(*dst);
--				*dst = NULL;
--			}
--		}
-+	if (!dst)
-+		goto out;
-+
-+	/* Yes, checking route validity in not connected
-+	 * case is not very simple. Take into account,
-+	 * that we do not support routing by source, TOS,
-+	 * and MSG_DONTROUTE 		--ANK (980726)
-+	 *
-+	 * 1. If route was host route, check that
-+	 *    cached destination is current.
-+	 *    If it is network route, we still may
-+	 *    check its validity using saved pointer
-+	 *    to the last used address: daddr_cache.
-+	 *    We do not want to save whole address now,
-+	 *    (because main consumer of this service
-+	 *    is tcp, which has not this problem),
-+	 *    so that the last trick works only on connected
-+	 *    sockets.
-+	 * 2. oif also should be the same.
-+	 */
-+	if (((rt->rt6i_dst.plen != 128 ||
-+	      !ipv6_addr_equal(&fl->fl6_dst, &rt->rt6i_dst.addr))
-+	     && (np->daddr_cache == NULL ||
-+		 !ipv6_addr_equal(&fl->fl6_dst, np->daddr_cache)))
-+	    || (fl->oif && fl->oif != dst->dev->ifindex)) {
-+		dst_release(dst);
-+		dst = NULL;
- 	}
- 
-+out:
-+	return dst;
-+}
-+
-+static int ip6_dst_lookup_tail(struct sock *sk,
-+			       struct dst_entry **dst, struct flowi *fl)
-+{
-+	int err;
-+
- 	if (*dst == NULL)
- 		*dst = ip6_route_output(sk, fl);
- 
-@@ -773,7 +776,6 @@ int ip6_dst_lookup(struct sock *sk, stru
- 
- 	if (ipv6_addr_any(&fl->fl6_src)) {
- 		err = ipv6_get_saddr(*dst, &fl->fl6_dst, &fl->fl6_src);
--
- 		if (err)
- 			goto out_err_release;
- 	}
-@@ -786,8 +788,48 @@ out_err_release:
- 	return err;
- }
- 
-+/**
-+ *	ip6_dst_lookup - perform route lookup on flow
-+ *	@sk: socket which provides route info
-+ *	@dst: pointer to dst_entry * for result
-+ *	@fl: flow to lookup
-+ *
-+ *	This function performs a route lookup on the given flow.
-+ *
-+ *	It returns zero on success, or a standard errno code on error.
-+ */
-+int ip6_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi *fl)
-+{
-+	*dst = NULL;
-+	return ip6_dst_lookup_tail(sk, dst, fl);
-+}
- EXPORT_SYMBOL_GPL(ip6_dst_lookup);
- 
-+/**
-+ *	ip6_sk_dst_lookup - perform socket cached route lookup on flow
-+ *	@sk: socket which provides the dst cache and route info
-+ *	@dst: pointer to dst_entry * for result
-+ *	@fl: flow to lookup
-+ *
-+ *	This function performs a route lookup on the given flow with the
-+ *	possibility of using the cached route in the socket if it is valid.
-+ *	It will take the socket dst lock when operating on the dst cache.
-+ *	As a result, this function can only be used in process context.
-+ *
-+ *	It returns zero on success, or a standard errno code on error.
-+ */
-+int ip6_sk_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi *fl)
-+{
-+	*dst = NULL;
-+	if (sk) {
-+		*dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie);
-+		*dst = ip6_sk_dst_check(sk, *dst, fl);
-+	}
-+
-+	return ip6_dst_lookup_tail(sk, dst, fl);
-+}
-+EXPORT_SYMBOL_GPL(ip6_sk_dst_lookup);
-+
- static inline int ip6_ufo_append_data(struct sock *sk,
- 			int getfrag(void *from, char *to, int offset, int len,
- 			int odd, struct sk_buff *skb),
-diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
-index 923989d..b76fd7f 100644
---- a/net/ipv6/tcp_ipv6.c
-+++ b/net/ipv6/tcp_ipv6.c
-@@ -270,7 +270,7 @@ static int tcp_v6_connect(struct sock *s
- 	inet->rcv_saddr = LOOPBACK4_IPV6;
- 
- 	sk->sk_gso_type = SKB_GSO_TCPV6;
--	ip6_dst_store(sk, dst, NULL);
-+	__ip6_dst_store(sk, dst, NULL);
- 
- 	icsk->icsk_ext_hdr_len = 0;
- 	if (np->opt)
-@@ -947,7 +947,7 @@ static struct sock * tcp_v6_syn_recv_soc
- 	 */
- 
- 	sk->sk_gso_type = SKB_GSO_TCPV6;
--	ip6_dst_store(newsk, dst, NULL);
-+	__ip6_dst_store(newsk, dst, NULL);
- 
- 	newtcp6sk = (struct tcp6_sock *)newsk;
- 	inet_sk(newsk)->pinet6 = &newtcp6sk->inet6;
-diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
-index ccc57f4..3d54f24 100644
---- a/net/ipv6/udp.c
-+++ b/net/ipv6/udp.c
-@@ -782,7 +782,7 @@ do_udp_sendmsg:
- 		connected = 0;
- 	}
- 
--	err = ip6_dst_lookup(sk, &dst, fl);
-+	err = ip6_sk_dst_lookup(sk, &dst, fl);
- 	if (err)
- 		goto out;
- 	if (final_p)
--
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
-
 From: Ingo Molnar <mingo at elte.hu>
 
 Split off __icmpv6_socket's sk->sk_dst_lock class, because it gets used
@@ -776,96 +388,3 @@
  		/* Enough space for 2 64K ICMP packets, including
  		 * sk_buff struct overhead.
 _
-From: Arjan van de Ven <arjan at linux.intel.com>
-
-The skb_queue_head_init() function is used both in drivers for private use
-and in the core networking code.  The usage models are vastly set of
-functions that is only softirq safe; while the driver usage tends to be
-more limited to a few hardirq safe accessor functions.  Rather than
-annotating all 133+ driver usages, for now just split this lock into a per
-queue class.  This change is obviously safe and probably should make
-2.6.18.
-
-Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
-Signed-off-by: Ingo Molnar <mingo at elte.hu>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- include/linux/skbuff.h |    9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff -puN include/linux/skbuff.h~lockdep-split-the-skb_queue_head_init-lock-class include/linux/skbuff.h
---- a/include/linux/skbuff.h~lockdep-split-the-skb_queue_head_init-lock-class
-+++ a/include/linux/skbuff.h
-@@ -606,10 +606,17 @@ static inline __u32 skb_queue_len(const 
- 
- extern struct lock_class_key skb_queue_lock_key;
- 
-+/*
-+ * This function creates a split out lock class for each invocation;
-+ * this is needed for now since a whole lot of users of the skb-queue
-+ * infrastructure in drivers have different locking usage (in hardirq)
-+ * than the networking core (in softirq only). In the long run either the
-+ * network layer or drivers should need annotation to consolidate the
-+ * main types of usage into 3 classes.
-+ */
- static inline void skb_queue_head_init(struct sk_buff_head *list)
- {
- 	spin_lock_init(&list->lock);
--	lockdep_set_class(&list->lock, &skb_queue_lock_key);
- 	list->prev = list->next = (struct sk_buff *)list;
- 	list->qlen = 0;
- }
-_
-From: Adrian Bunk <bunk at stusta.de>
-
-On Thu, Jul 13, 2006 at 10:48:00PM -0700, Andrew Morton wrote:
->...
-> Changes since 2.6.18-rc1-mm1:
->...
-> +lockdep-split-the-skb_queue_head_init-lock-class.patch
->
->  lockdep-versus-net fix.
->...
-
-skb_queue_lock_key is no longer used.
-
-Signed-off-by: Adrian Bunk <bunk at stusta.de>
-Acked-by: Arjan van de Ven <arjan at linux.intel.com>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- include/linux/skbuff.h |    2 --
- net/core/skbuff.c      |    7 -------
- 2 files changed, 9 deletions(-)
-
-diff -puN include/linux/skbuff.h~lockdep-split-the-skb_queue_head_init-lock-class-tidy include/linux/skbuff.h
---- a/include/linux/skbuff.h~lockdep-split-the-skb_queue_head_init-lock-class-tidy
-+++ a/include/linux/skbuff.h
-@@ -604,8 +604,6 @@ static inline __u32 skb_queue_len(const 
- 	return list_->qlen;
- }
- 
--extern struct lock_class_key skb_queue_lock_key;
--
- /*
-  * This function creates a split out lock class for each invocation;
-  * this is needed for now since a whole lot of users of the skb-queue
-diff -puN net/core/skbuff.c~lockdep-split-the-skb_queue_head_init-lock-class-tidy net/core/skbuff.c
---- a/net/core/skbuff.c~lockdep-split-the-skb_queue_head_init-lock-class-tidy
-+++ a/net/core/skbuff.c
-@@ -71,13 +71,6 @@ static kmem_cache_t *skbuff_head_cache _
- static kmem_cache_t *skbuff_fclone_cache __read_mostly;
- 
- /*
-- * lockdep: lock class key used by skb_queue_head_init():
-- */
--struct lock_class_key skb_queue_lock_key;
--
--EXPORT_SYMBOL(skb_queue_lock_key);
--
--/*
-  *	Keep out-of-line to prevent kernel bloat.
-  *	__builtin_return_address is not used because it is not always
-  *	reliable.
-_


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- sources	2 Aug 2006 22:56:39 -0000	1.467
+++ sources	3 Aug 2006 17:28:17 -0000	1.468
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 4ae2c95631b54820475437c206c3a4c2  xen-10730.tar.bz2
 ba31b754aaf80aa388858f86c34c4d01  patch-2.6.18-rc3.bz2
-1beb7e5f3b822bb4a0c6d04bb7411c62  patch-2.6.18-rc3-git2.bz2
+2b8d22d3832b97c2bbd87e75755b36c9  patch-2.6.18-rc3-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- upstream	2 Aug 2006 22:56:39 -0000	1.409
+++ upstream	3 Aug 2006 17:28:17 -0000	1.410
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc3.bz2
-patch-2.6.18-rc3-git2.bz2
+patch-2.6.18-rc3-git3.bz2


--- linux-2.6-x86_64-entry-more-unwind.patch DELETED ---


--- patch-2.6.18-rc3-git1.bz2.sign DELETED ---


--- patch-2.6.18-rc3-git2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:40:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:40:18 -0400
Subject: rpms/kexec-tools/devel
	kexec-tools-1.101-makedumpfile-archbuild.patch, NONE,
	1.1 kexec-tools.spec, 1.48,
	1.49 kexec-tools-1.101-makedumpfile-acrchbuild.patch, 1.1, NONE
Message-ID: <200608031740.k73HeIDg024774@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24744

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-makedumpfile-archbuild.patch 
Removed Files:
	kexec-tools-1.101-makedumpfile-acrchbuild.patch 
Log Message:
fixing stupid spelling typo

kexec-tools-1.101-makedumpfile-archbuild.patch:
 makedumpfile.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kexec-tools-1.101-makedumpfile-archbuild.patch ---
--- kexec-tools-1.101/makedumpfile/makedumpfile.h.orig	2006-08-03 11:31:48.000000000 -0400
+++ kexec-tools-1.101/makedumpfile/makedumpfile.h	2006-08-03 11:37:20.000000000 -0400
@@ -149,10 +149,15 @@
 #ifdef __x86_64__
 #define MAXMEM			0x3fffffffffffUL
 #endif /* x86_64 */
-
 #ifdef __ia64__ /* ia64 */
+#define MAXMEM			0x3fffffffffffUL
 #endif          /* ia64 */
 
+#ifndef MAXMEM
+#warn "MAXMEM is not defined for the arch.  makedumpfile will likely not work"
+#define MAXMEM 0
+#endif
+
 #define MSG(x...)	fprintf(stdout, x)
 #define ERRMSG(x...)	fprintf(stderr, x)
 


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kexec-tools.spec	3 Aug 2006 17:25:48 -0000	1.48
+++ kexec-tools.spec	3 Aug 2006 17:40:16 -0000	1.49
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 39%{dist}.1
+Release: 40%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -145,6 +145,9 @@
 %doc TODO
 
 %changelog
+* Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-40%{dist}.1
+- exclude makedumpfile from build on non-x86[_64] arches 
+
 * Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-39%{dist}.1
 - exclude makedumpfile from build on non-x86[_64] arches 
 


--- kexec-tools-1.101-makedumpfile-acrchbuild.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:51:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:51:27 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.38, 1.39 file-roller.spec, 1.66,
	1.67 sources, 1.39, 1.40
Message-ID: <200608031751.k73HpRaj011327@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11275

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	12 Jul 2006 19:40:43 -0000	1.38
+++ .cvsignore	3 Aug 2006 17:51:24 -0000	1.39
@@ -1 +1 @@
-file-roller-2.15.1.tar.bz2
+file-roller-2.15.90.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- file-roller.spec	30 Jul 2006 18:04:00 -0000	1.66
+++ file-roller.spec	3 Aug 2006 17:51:24 -0000	1.67
@@ -10,8 +10,8 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.15.1
-Release: 	2
+Version:	2.15.90
+Release: 	1%{?dist}
 
 License:	GPL
 Group:		Applications/Archiving
@@ -126,6 +126,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Sun Jul 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-2
 - Avoid warnings from recent menu
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	12 Jul 2006 19:40:43 -0000	1.39
+++ sources	3 Aug 2006 17:51:24 -0000	1.40
@@ -1 +1 @@
-ec829899b9d17860244b05182e8ed69f  file-roller-2.15.1.tar.bz2
+f51b05db9761532682ae3af4223e8a22  file-roller-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:51:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:51:32 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2518,1.2519
Message-ID: <200608031751.k73HpWO2011379@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
fix scriptlets


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2518
retrieving revision 1.2519
diff -u -r1.2518 -r1.2519
--- kernel-2.6.spec	3 Aug 2006 17:28:17 -0000	1.2518
+++ kernel-2.6.spec	3 Aug 2006 17:51:29 -0000	1.2519
@@ -1390,15 +1390,24 @@
 %post
 if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ]; then
   if [ -f /etc/sysconfig/kernel ]; then
-    /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel
+    /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel || exit $?
   fi
 fi
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}
-/sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL}
-[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}
+if [ -x /usr/sbin/module_upgrade ]
+then
+    /usr/sbin/module_upgrade %{rpmversion}-%{release} || exit $?
+fi
+/sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL} || exit $?
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --add-kernel %{KVERREL} || exit $?
+fi
 
 %post devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ -f /etc/sysconfig/kernel ]
+then
+    . /etc/sysconfig/kernel || exit $?
+fi
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
@@ -1406,12 +1415,21 @@
 fi
 
 %post smp
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}smp
-/sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp
-[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}smp
+if [ -x /usr/sbin/module_upgrade ]
+then
+    /usr/sbin/module_upgrade %{rpmversion}-%{release}smp || exit $?
+fi
+/sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp || exit $?
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --add-kernel %{KVERREL}smp || exit $?
+fi
 
 %post smp-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ -f /etc/sysconfig/kernel ]
+then
+    . /etc/sysconfig/kernel || exit $?
+fi
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-smp-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
@@ -1422,12 +1440,21 @@
 if [ -f /etc/sysconfig/kernel ]; then
     /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel-PAE/' /etc/sysconfig/kernel
 fi
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}PAE
-/sbin/new-kernel-pkg --package kernel-PAE --mkinitrd --depmod --install %{KVERREL}PAE
-[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}PAE
+if [ -x /usr/sbin/module_upgrade ]
+then
+    /usr/sbin/module_upgrade %{rpmversion}-%{release}PAE || exit $?
+fi
+/sbin/new-kernel-pkg --package kernel-PAE --mkinitrd --depmod --install %{KVERREL}PAE || exit $?
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --add-kernel %{KVERREL}PAE || exit $?
+fi
 
 %post PAE-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ -f /etc/sysconfig/kernel ]
+then
+    . /etc/sysconfig/kernel || exit $?
+fi
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-PAE-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
@@ -1435,17 +1462,29 @@
 fi
 
 %post xen
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen
+if [ -x /usr/sbin/module_upgrade ]
+then
+    /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen || exit $?
+fi
 if [ -e /proc/xen/xsd_kva -o ! -d /proc/xen ]; then
-	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL} %{KVERREL}xen
+	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL} %{KVERREL}xen || exit $?
 else
-	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
+	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen || exit $?
+fi
+if [ -x /sbin/ldconfig ]
+then
+    /sbin/ldconfig -X || exit $?
+fi
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --add-kernel %{KVERREL}xen || exit $?
 fi
-[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}xen
 
 %post xen-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ -f /etc/sysconfig/kernel ]
+then
+    . /etc/sysconfig/kernel || exit $?
+fi
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
@@ -1453,12 +1492,21 @@
 fi
 
 %post kdump
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-kdump
-/sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump
-[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}kdump
+if [ -x /usr/sbin/module_upgrade ]
+then
+    /usr/sbin/module_upgrade %{rpmversion}-%{release}-kdump || exit $?
+fi
+/sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump || exit $?
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --add-kernel %{KVERREL}kdump || exit $?
+fi
 
 %post kdump-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ -f /etc/sysconfig/kernel ]
+then
+    . /etc/sysconfig/kernel || exit $?
+fi
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-kdump-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
@@ -1466,24 +1514,39 @@
 fi
 
 %preun
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}
-[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL} || exit $?
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --remove-kernel %{KVERREL} || exit $?
+fi
 
 %preun smp
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp
-[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}smp
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp || exit $?
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --remove-kernel %{KVERREL}smp || exit $?
+fi
 
 %preun PAE
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}PAE
-[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}PAE
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}PAE || exit $?
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --remove-kernel %{KVERREL}PAE || exit $?
+fi
 
 %preun kdump
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}kdump
-[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}kdump
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}kdump || exit $?
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --remove-kernel %{KVERREL}kdump || exit $?
+fi
 
 %preun xen
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
-[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}xen
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen || exit $?
+if [ -x /sbin/weak-modules ]
+then
+    /sbin/weak-modules --remove-kernel %{KVERREL}xen || exit $?
+fi
 
 ###
 ### file lists



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:52:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:52:54 -0400
Subject: rpms/epiphany/FC-5 epiphany.spec,1.101,1.102
Message-ID: <200608031752.k73Hqsii011893@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	epiphany.spec 
Log Message:
- the funky compiler options didn't fix things, removing



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/FC-5/epiphany.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- epiphany.spec	3 Aug 2006 16:58:27 -0000	1.101
+++ epiphany.spec	3 Aug 2006 17:52:51 -0000	1.102
@@ -81,7 +81,7 @@
 %endif
 
 %configure --disable-scrollkeeper --enable-zeroconf %{enable_nm} 
-make %{?_smp_mflags} CXXFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend" CFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend"
+make %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Thu Aug  3 17:58:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 13:58:43 -0400
Subject: rpms/kernel/devel .cvsignore,1.504,1.505
Message-ID: <200608031758.k73Hwhtj023900@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore 
Log Message:
ignore clog


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -r1.504 -r1.505
--- .cvsignore	3 Aug 2006 17:28:17 -0000	1.504
+++ .cvsignore	3 Aug 2006 17:58:41 -0000	1.505
@@ -1,3 +1,4 @@
+clog
 kernel-2.6.*.config
 temp-*
 kernel-2.6.17



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:07:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:07:34 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.107,
	1.108 evolution-data-server-1.0.0-fix_warnings.patch, 1.1,
	NONE evolution-data-server-1.0.2-add-debug-logging.patch, 1.1,
	NONE evolution-data-server-1.0.2-calendar-optimisation-XB59904.patch,
	1.1, NONE evolution-data-server-1.1.6-fix-namespace-clear.patch,
	1.2,
	NONE evolution-data-server-1.2.0-cope-with-a-macro-called-read.patch,
	1.1, NONE gb-309079-attach-48376.patch, 1.1,
	NONE gb-309079-attach-48377.patch, 1.1, NONE
Message-ID: <200608031807.k73I7Y8v024113@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-data-server.spec 
Removed Files:
	evolution-data-server-1.0.0-fix_warnings.patch 
	evolution-data-server-1.0.2-add-debug-logging.patch 
	evolution-data-server-1.0.2-calendar-optimisation-XB59904.patch 
	evolution-data-server-1.1.6-fix-namespace-clear.patch 
	evolution-data-server-1.2.0-cope-with-a-macro-called-read.patch 
	gb-309079-attach-48376.patch gb-309079-attach-48377.patch 
Log Message:
- Remove patches for Gnome.org bug #309079 (rejected upstream).
- One of these patches was causing RH bug #167157.
- No longer packaging unused patches.



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- evolution-data-server.spec	31 Jul 2006 19:48:55 -0000	1.107
+++ evolution-data-server.spec	3 Aug 2006 18:07:31 -0000	1.108
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.4
-Release: 3
+Release: 5.test.1
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -36,18 +36,14 @@
 Patch11: evolution-1.4.4-ldap-x86_64-hack.patch
 Patch12: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch
 Patch13: evolution-data-server-1.3.8-fix-implicit-function-declarations
-
-# Leak fixes by Mark G. Adams
-Patch14: gb-309079-attach-48376.patch
-Patch15: gb-309079-attach-48377.patch
-
-Patch16: evolution-data-server-1.5.4-make_imap4_optional.patch
+Patch14: evolution-data-server-1.5.4-make_imap4_optional.patch
 
 # Gnome.org bug #344693
-Patch17: evolution-data-server-1.7.4-with-libdb-fix.patch
+Patch15: evolution-data-server-1.7.4-with-libdb-fix.patch
 
 # Gnome.org bug #348725
-#Patch18: evolution-data-server-1.7.90.1-missing-function-decl.patch
+# Getting ahead of ourselves... reenable on upgrade.
+#Patch16: evolution-data-server-1.7.90.1-missing-function-decl.patch
 
 ### Dependencies ###
 
@@ -85,6 +81,7 @@
 %else
 BuildRequires: openssl-devel
 %endif
+
 %if %{use_gtk_doc}
 BuildRequires: gtk-doc
 %endif
@@ -128,11 +125,9 @@
 %patch11 -p1 -b .ldaphack
 %patch12 -p1 -b .fix_open_calendar_declaration
 %patch13 -p1 -b .fix-implicit-function-declarations
-%patch14 -p0 -b .fix-uid-leak
-%patch15 -p0 -b .fix-comp-ref-leak
-%patch16 -p1 -b .make_imap4_optional
-%patch17 -p1 -b .with-libdb-fix
-#%patch18 -p1 -b .missing-function-decl
+%patch14 -p1 -b .make_imap4_optional
+%patch15 -p1 -b .with-libdb-fix
+#patch16 -p1 -b .missing-function-decl
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -335,6 +330,11 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Thu Aug  3 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-4
+- Remove patches for Gnome.org bug #309079 (rejected upstream).
+- One of these patches was causing RH bug #167157.
+- No longer packaging unused patches.
+
 * Mon Jul 31 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-3
 - Revert to version 1.7.4 to prevent API/ABI breakage.
 - Add back patch to make --with-libdb configure option work.


--- evolution-data-server-1.0.0-fix_warnings.patch DELETED ---


--- evolution-data-server-1.0.2-add-debug-logging.patch DELETED ---


--- evolution-data-server-1.0.2-calendar-optimisation-XB59904.patch DELETED ---


--- evolution-data-server-1.1.6-fix-namespace-clear.patch DELETED ---


--- evolution-data-server-1.2.0-cope-with-a-macro-called-read.patch DELETED ---


--- gb-309079-attach-48376.patch DELETED ---


--- gb-309079-attach-48377.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:07:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:07:40 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-add-makedumpfile2.patch,
	1.4, 1.5 kexec-tools.spec, 1.49, 1.50
Message-ID: <200608031807.k73I7dPe024137@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24109

Modified Files:
	kexec-tools-1.101-add-makedumpfile2.patch kexec-tools.spec 
Log Message:
fixing another makefile error

kexec-tools-1.101-add-makedumpfile2.patch:
 Makefile                      |   75 
 dwarfinfo/dwarf_alloc.c       |  170 --
 dwarfinfo/dwarf_alloc.h       |    7 
 dwarfinfo/dwarf_die_deliv.c   |    5 
 dwarfinfo/dwarf_error.c       |    7 
 dwarfinfo/dwarf_form.c        |   33 
 dwarfinfo/dwarf_incl.h        |   37 
 dwarfinfo/dwarf_init_finish.c |  324 ---
 dwarfinfo/dwarf_leb.c         |    5 
 dwarfinfo/dwarf_line.c        | 1277 ---------------
 dwarfinfo/dwarf_loc.c         |  158 -
 dwarfinfo/dwarf_names.c       | 3461 ++++++------------------------------------
 dwarfinfo/dwarf_query.c       |  331 ----
 dwarfinfo/dwarf_util.c        |    5 
 dwarfinfo/dwarfdump.c         |  567 +-----
 dwarfinfo/esb.c               |   78 
 dwarfinfo/globals.h           |   29 
 dwarfinfo/malloc_check.c      |   42 
 dwarfinfo/print_die.c         |  699 +++-----
 makedumpfile.c                |  502 +++---
 makedumpfile.h                |   30 
 21 files changed, 1427 insertions(+), 6415 deletions(-)

Index: kexec-tools-1.101-add-makedumpfile2.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-add-makedumpfile2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kexec-tools-1.101-add-makedumpfile2.patch	3 Aug 2006 15:25:55 -0000	1.4
+++ kexec-tools-1.101-add-makedumpfile2.patch	3 Aug 2006 18:07:36 -0000	1.5
@@ -4,7 +4,7 @@
  CC	= gcc
 -CFLAGS	= -g -Wall `gtk-config --cflags` `gtk-config --libs` -D_FILE_OFFSET_BITS=64
 +CFLAGS	= -g -O2 -Wall
-+CFLAGS2	= -g -O2 -Wall `pkg-config --cflags glib-2.0` -lglib -D_FILE_OFFSET_BITS=64 
++CFLAGS2	= -g -O2 -Wall `pkg-config --cflags glib-2.0` `pkg-config --libs glib-2.0` -D_FILE_OFFSET_BITS=64 
  
  ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
  			       -e s/arm.*/arm/ -e s/sa110/arm/ \


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kexec-tools.spec	3 Aug 2006 17:40:16 -0000	1.49
+++ kexec-tools.spec	3 Aug 2006 18:07:36 -0000	1.50
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 40%{dist}.1
+Release: 41%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -144,7 +144,10 @@
 %doc COPYING
 %doc TODO
 
-%changelog
+%chaNgelog
+* Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-41%{dist}.1
+- fix another silly makefile error for makedumpfile 
+
 * Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-40%{dist}.1
 - exclude makedumpfile from build on non-x86[_64] arches 
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:10:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:10:24 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.108,
	1.109
Message-ID: <200608031810.k73IAOxb024332@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-data-server.spec 
Log Message:
Fix Release tag.



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- evolution-data-server.spec	3 Aug 2006 18:07:31 -0000	1.108
+++ evolution-data-server.spec	3 Aug 2006 18:10:22 -0000	1.109
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.4
-Release: 5.test.1
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:10:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:10:19 -0400
Subject: rpms/libgnomeui/devel .cvsignore, 1.28, 1.29 libgnomeui.spec, 1.52,
	1.53 sources, 1.28, 1.29
Message-ID: <200608031810.k73IAJkk024308@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24283

Modified Files:
	.cvsignore libgnomeui.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	3 Aug 2006 17:18:20 -0000	1.28
+++ .cvsignore	3 Aug 2006 18:10:17 -0000	1.29
@@ -1 +1,2 @@
 libgnomeui-2.15.90.tar.bz2
+doc.tar.gz


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- libgnomeui.spec	3 Aug 2006 17:18:20 -0000	1.52
+++ libgnomeui.spec	3 Aug 2006 18:10:17 -0000	1.53
@@ -21,7 +21,10 @@
 Release: 1%{?dist}
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
+# 2.15.90 shipped without docs
+Source1: doc.tar.gz
 Patch0: libgnomeui-2.15.2-undead-code.patch
+
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -117,6 +120,9 @@
 
 %prep
 %setup -q
+
+tar xzf %{SOURCE1}
+
 %patch0 -p1 -b .undead-code
 
 %build


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	3 Aug 2006 17:18:20 -0000	1.28
+++ sources	3 Aug 2006 18:10:17 -0000	1.29
@@ -1 +1,2 @@
 8da68a3e49d2af4ab61518f79420cc3b  libgnomeui-2.15.90.tar.bz2
+823754e5a363dd4831f4d3b443c78451  doc.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:12:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:12:04 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.109,
	1.110
Message-ID: <200608031812.k73IC4EV024429@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-data-server.spec 
Log Message:
Try again.



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- evolution-data-server.spec	3 Aug 2006 18:10:22 -0000	1.109
+++ evolution-data-server.spec	3 Aug 2006 18:12:02 -0000	1.110
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.4
-Release: 4
+Release: 5
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -330,9 +330,11 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
-* Thu Aug  3 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-4
+* Thu Aug  3 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-5
 - Remove patches for Gnome.org bug #309079 (rejected upstream).
 - One of these patches was causing RH bug #167157.
+
+* Thu Aug  3 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-4
 - No longer packaging unused patches.
 
 * Mon Jul 31 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-3



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:12:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:12:46 -0400
Subject: rpms/emacs/FC-5 emacs.spec, 1.72, 1.73 lang-coding-systems-init.el,
	1.6, 1.7
Message-ID: <200608031812.k73ICkle024508@cvs.devel.redhat.com>

Author: coldwell

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

Modified Files:
	emacs.spec lang-coding-systems-init.el 
Log Message:
use UTF-8 keyboard input encoding on terminals that support it (Axel Thimm #185399)


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/FC-5/emacs.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- emacs.spec	3 Aug 2006 16:04:37 -0000	1.72
+++ emacs.spec	3 Aug 2006 18:12:44 -0000	1.73
@@ -9,7 +9,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 15.1
+Release: 16.1
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -553,6 +553,9 @@
 %endif
 
 %changelog
+* Thu Aug  3 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-16.1
+- use UTF-8 keyboard input encoding on terminals that support it (Axel Thimm #185399)
+
 * Tue Aug  1 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-15.1
 - fix German spell checking for UTF-8 encoded buffers (Daniel Hammer #197737)
 - fix src/unexelf.c to build on PowerPC64 (backport from emacs-22, #183304)


Index: lang-coding-systems-init.el
===================================================================
RCS file: /cvs/dist/rpms/emacs/FC-5/lang-coding-systems-init.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lang-coding-systems-init.el	25 Nov 2005 09:04:10 -0000	1.6
+++ lang-coding-systems-init.el	3 Aug 2006 18:12:44 -0000	1.7
@@ -23,8 +23,8 @@
 	 (set-default-coding-systems 'utf-8)
 	 (set-terminal-coding-system 'utf-8)
 	 (let ((term (getenv "TERM")))
-	   (when (or (equal term "linux")
-		     (equal term "xterm"))
+	   (when (or (string-match "^linux" term)
+		     (string-match "^xterm" term))
 	     (set-keyboard-coding-system 'utf-8))))
 	((equal lang "ja")
 	 (set-default-coding-systems 'euc-jp)



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:12:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:12:45 -0400
Subject: rpms/evolution/devel evolution.spec, 1.171,
	1.172 evo-conduits-multi-day-crash.patch, 1.1,
	NONE evolution-2.0.2-fix_alarm_notify_cleanup.patch, 1.1,
	NONE evolution-2.0.2-unmatched-vfolder-properties-141458.patch,
	1.1, NONE evolution-2.1.6-gcc4-fixes.patch, 1.1,
	NONE evolution-2.2.0-XB73192.patch, 1.1,
	NONE evolution-2.2.0-fix-for-dbus31.patch, 1.1,
	NONE evolution-2.2.1.1-XB73844.patch, 1.1,
	NONE evolution-2.2.2-commit-enter-on-calendar.patch, 1.2,
	NONE evolution-2.2.2-fix-new-mail-notify.patch, 1.1,
	NONE evolution-2.3.5.1-fix-150458.patch, 1.3,
	NONE evolution-2.7.4-fix-crash-on-paste.patch, 1.1,
	NONE gb-309138-attach-48417-fix-evo-conduit-memleaks.patch, 1.1,
	NONE rh-161817-attach-116019-conduit_pilot_link_updates.diff,
	1.1, NONE
Message-ID: <200608031812.k73ICj2a024501@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Removed Files:
	evo-conduits-multi-day-crash.patch 
	evolution-2.0.2-fix_alarm_notify_cleanup.patch 
	evolution-2.0.2-unmatched-vfolder-properties-141458.patch 
	evolution-2.1.6-gcc4-fixes.patch evolution-2.2.0-XB73192.patch 
	evolution-2.2.0-fix-for-dbus31.patch 
	evolution-2.2.1.1-XB73844.patch 
	evolution-2.2.2-commit-enter-on-calendar.patch 
	evolution-2.2.2-fix-new-mail-notify.patch 
	evolution-2.3.5.1-fix-150458.patch 
	evolution-2.7.4-fix-crash-on-paste.patch 
	gb-309138-attach-48417-fix-evo-conduit-memleaks.patch 
	rh-161817-attach-116019-conduit_pilot_link_updates.diff 
Log Message:
- Remove patch for RH bug #167157, as it fixed it the wrong way.
- The real fix for #167157 is in evolution-data-server-1.7.4-5.
- No longer packaging unused patches.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- evolution.spec	31 Jul 2006 19:06:03 -0000	1.171
+++ evolution.spec	3 Aug 2006 18:12:42 -0000	1.172
@@ -48,7 +48,7 @@
 
 Name: evolution
 Version: 2.7.4
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -79,16 +79,20 @@
 # Patch15: evolution-2.5.4-fix-conduits.patch
 
 # Move .conduit files from share to lib (for the sake of multilib)
+# This patch effects other parts of evolution.spec and so is necessary
+# for a successful build.
 Patch16: evolution-2.5.4-fix-conduit-dir.patch
 
 # Remove gnome-common macros from configure.in.
 # We do not ship gnome-common (or at least we're not supposed to).
 Patch17: evolution-2.7.1-no-gnome-common.patch
 
+# XXX Make sure these are still needed and push them upstream.
 Patch18: evolution-2.4.1-fix-missing-declarations.patch
 Patch19: evolution-2.5.4-fix-missing-declarations.patch
-Patch20: evolution-2.7.1-notification-cleanups.patch
-Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
+Patch20: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
+
+Patch21: evolution-2.7.1-notification-cleanups.patch
 Patch22: evolution-2.6.0-prototypes.patch
 
 # Gnome.org #343331
@@ -112,13 +116,9 @@
 # RH bug #178295 / Gnome.org bug #348638
 Patch29: evolution-2.7.4-deleting-preedit-buffer.patch
 
-# RH bug #167157 / Gnome.org bug #334464
-Patch30: evolution-2.7.4-fix-crash-on-paste.patch
-
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
-Requires: ORBit2 >= 2.7.5
 Requires: dbus >= %{dbus_version}
 Requires: evolution-data-server >= %{eds_version}
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -232,13 +232,13 @@
 %patch12 -p1 -b .move-autosave-file
 %patch13 -p1 -b .fix-164957
 %patch14 -p1 -b .hide-switcher-buttons-by-default
-#patch15 -p1 -b .fix-conduits
+#patch15 -p1 -b .fix-conduits  # leave commented
 %patch16 -p1 -b .fix-conduit-dir
 %patch17 -p1 -b .no-gnome-common
 %patch18 -p1 -b .fix-missing-declarations
 %patch19 -p1 -b .fix-missing-declarations-2-5-4
-%patch20 -p1 -b .notification-cleanups
-%patch21 -p1 -b .fix-missing-declarations-2.5.5.1
+%patch20 -p1 -b .fix-missing-declarations-2.5.5.1
+%patch21 -p1 -b .notification-cleanups
 %patch22 -p1 -b .prototypes
 %patch23 -p1 -b .quit-resize-crash
 %patch24 -p1 -b .candidate-window-position-task
@@ -247,7 +247,6 @@
 %patch27 -p1 -b .replicated-cjk-input
 %patch28 -p1 -b .submit-bug-report
 %patch29 -p1 -b .deleting-preedit-buffer
-%patch30 -p1 -b .fix-crash-on-paste
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -638,6 +637,11 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Aug  2 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-5
+- Remove patch for RH bug #167157, as it fixed it the wrong way.
+- The real fix for #167157 is in evolution-data-server-1.7.4-5.
+- No longer packaging unused patches.
+
 * Mon Jul 31 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-4
 - Add patch for RH bug #178295.
 - Add patch for RH bug #167157.


--- evo-conduits-multi-day-crash.patch DELETED ---


--- evolution-2.0.2-fix_alarm_notify_cleanup.patch DELETED ---


--- evolution-2.0.2-unmatched-vfolder-properties-141458.patch DELETED ---


--- evolution-2.1.6-gcc4-fixes.patch DELETED ---


--- evolution-2.2.0-XB73192.patch DELETED ---


--- evolution-2.2.0-fix-for-dbus31.patch DELETED ---


--- evolution-2.2.1.1-XB73844.patch DELETED ---


--- evolution-2.2.2-commit-enter-on-calendar.patch DELETED ---


--- evolution-2.2.2-fix-new-mail-notify.patch DELETED ---


--- evolution-2.3.5.1-fix-150458.patch DELETED ---


--- evolution-2.7.4-fix-crash-on-paste.patch DELETED ---


--- gb-309138-attach-48417-fix-evo-conduit-memleaks.patch DELETED ---


--- rh-161817-attach-116019-conduit_pilot_link_updates.diff DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:23:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:23:46 -0400
Subject: rpms/eel2/devel .cvsignore, 1.36, 1.37 eel2.spec, 1.51, 1.52 sources,
	1.36, 1.37
Message-ID: <200608031823.k73INkPP007307@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7290

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
bump gnome-menus req



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	12 Jul 2006 15:50:52 -0000	1.36
+++ .cvsignore	3 Aug 2006 18:23:44 -0000	1.37
@@ -1 +1 @@
-eel-2.15.4.tar.bz2
+eel-2.15.90.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- eel2.spec	12 Jul 2006 21:27:40 -0000	1.51
+++ eel2.spec	3 Aug 2006 18:23:44 -0000	1.52
@@ -8,15 +8,15 @@
 %define libart_lgpl_version 2.3.8
 %define gail_version 0.17-2
 %define desktop_file_utils_version 0.7
-%define gnome_menus_version 2.10.0
+%define gnome_menus_version 2.14.0
 %define gnome_desktop_version 2.10.0
 
 %define po_package eel-2.0
 
 Name:		eel2
 Summary:        Eazel Extensions Library
-Version: 	2.15.4
-Release: 	2
+Version: 	2.15.90
+Release: 	1%{?dist}
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -109,6 +109,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	12 Jul 2006 15:50:52 -0000	1.36
+++ sources	3 Aug 2006 18:23:44 -0000	1.37
@@ -1 +1 @@
-52a3b2e23aec64b613afb721a67c3d38  eel-2.15.4.tar.bz2
+52c521e0bbf017e3fad4f4270a747f1b  eel-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:23:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:23:49 -0400
Subject: rpms/gdm/devel gdm-2.13.0.4-update-switchdesk-location.patch, 1.1,
	1.2 gdm.spec, 1.186, 1.187 gdm-2.13.0.4-add-ve-cflags.patch,
	1.1, NONE gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch,
	1.1, NONE gdm-2.13.0.4-fix-selinux-check.patch, 1.1,
	NONE gdm-2.13.0.5-clock-format.patch, 1.1,
	NONE gdm-2.13.0.7.0.2006.02.12-move-gdm-defaults-conf.patch,
	1.1, NONE gdm-2.13.0.8-malloc-freed-memory.patch, 1.1,
	NONE gdm-2.15.0-make-it-compile.patch, 1.1,
	NONE gdm-2.15.5-process-all-ops.patch, 1.3,
	NONE gdm-2.15.6-fix-setup-hang.patch, 1.1,
	NONE gdm-2.6.0.0-update-switchdesk-location.patch, 1.1, NONE
Message-ID: <200608031823.k73INnsF007332@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7292

Modified Files:
	gdm-2.13.0.4-update-switchdesk-location.patch gdm.spec 
Removed Files:
	gdm-2.13.0.4-add-ve-cflags.patch 
	gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch 
	gdm-2.13.0.4-fix-selinux-check.patch 
	gdm-2.13.0.5-clock-format.patch 
	gdm-2.13.0.7.0.2006.02.12-move-gdm-defaults-conf.patch 
	gdm-2.13.0.8-malloc-freed-memory.patch 
	gdm-2.15.0-make-it-compile.patch 
	gdm-2.15.5-process-all-ops.patch 
	gdm-2.15.6-fix-setup-hang.patch 
	gdm-2.6.0.0-update-switchdesk-location.patch 
Log Message:
- update to 2.15.7


gdm-2.13.0.4-update-switchdesk-location.patch:
 gdmsession.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: gdm-2.13.0.4-update-switchdesk-location.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.13.0.4-update-switchdesk-location.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.13.0.4-update-switchdesk-location.patch	9 Jan 2006 10:06:50 -0000	1.1
+++ gdm-2.13.0.4-update-switchdesk-location.patch	3 Aug 2006 18:23:46 -0000	1.2
@@ -1,5 +1,5 @@
---- gdm-2.13.0.4/gui/greeter/greeter_session.c.update-switchdesk-location	2005-12-24 21:30:15.000000000 -0500
-+++ gdm-2.13.0.4/gui/greeter/greeter_session.c	2006-01-08 23:25:22.000000000 -0500
+--- gdm-2.13.0.4/gui/gdmsession.c.update-switchdesk-location	2005-12-24 21:30:15.000000000 -0500
++++ gdm-2.13.0.4/gui/gdmsession.c	2006-01-08 23:25:22.000000000 -0500
 @@ -165,7 +165,7 @@ greeter_session_lookup (const char *save
  	       * irrelevant, we are in "switchdesk mode" and the relevant
  	       * thing is the saved session in .Xclients


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- gdm.spec	3 Aug 2006 07:10:32 -0000	1.186
+++ gdm.spec	3 Aug 2006 18:23:46 -0000	1.187
@@ -15,8 +15,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.15.6
-Release: 14%{?dist}
+Version: 2.15.7
+Release: 1%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -43,12 +43,10 @@
 Patch15: gdm-2.8.0.4-dont-call-xsm.patch
 Patch16: gdm-2.13.0.4-add-gnome-cflags.patch
 Patch17: gdm-2.13.0.7-pam_stack.patch
-Patch18: gdm-2.15.5-process-all-ops.patch
 Patch19: gdm-2.15.5-move-default-message.patch
 Patch20: gdm-2.15.5-reset-pam.patch
 Patch21: gdm-2.15.6-security-tokens.patch
 Patch22: gdm-2.15.6-session-keyring.patch
-Patch23: gdm-2.15.6-fix-setup-hang.patch
 Patch24: gdm-2.15.6-wtmp.patch
 Patch25: gdm-2.15.6-center-cursor.patch
 Patch26: gdm-2.15.6-fix-face-browser.patch
@@ -128,12 +126,10 @@
 %patch15 -p1 -b .dont-call-xsm
 %patch16 -p1 -b .add-gnome-cflags
 #%patch17 -p1 -b .pam_stack
-%patch18 -p1 -b .process-all-ops
 %patch19 -p1 -b .move-default-message
 %patch20 -p1 -b .reset-pam
 %patch21 -p1 -b .security-tokens
 %patch22 -p1 -b .session-keyring
-%patch23 -p1 -b .fix-setup-hang
 %patch24 -p1 -b .wtmp
 %patch25 -p1 -b .center-cursor
 %patch26 -p1 -b .fix-face-browser
@@ -332,6 +328,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Thu Aug 3 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.7-1
+- update to 2.15.7
+
 * Thu Aug 3 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-14
 - fix face browser
   (http://bugzilla.gnome.org/show_bug.cgi?id=349640)


--- gdm-2.13.0.4-add-ve-cflags.patch DELETED ---


--- gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch DELETED ---


--- gdm-2.13.0.4-fix-selinux-check.patch DELETED ---


--- gdm-2.13.0.5-clock-format.patch DELETED ---


--- gdm-2.13.0.7.0.2006.02.12-move-gdm-defaults-conf.patch DELETED ---


--- gdm-2.13.0.8-malloc-freed-memory.patch DELETED ---


--- gdm-2.15.0-make-it-compile.patch DELETED ---


--- gdm-2.15.5-process-all-ops.patch DELETED ---


--- gdm-2.15.6-fix-setup-hang.patch DELETED ---


--- gdm-2.6.0.0-update-switchdesk-location.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:44:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:44:40 -0400
Subject: rpms/nautilus/devel .cvsignore, 1.41, 1.42 nautilus.spec, 1.112,
	1.113 sources, 1.44, 1.45
Message-ID: <200608031844.k73IielY019867@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7915

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	13 Jul 2006 02:12:04 -0000	1.41
+++ .cvsignore	3 Aug 2006 18:44:37 -0000	1.42
@@ -1 +1 @@
-nautilus-2.15.4.tar.bz2
+nautilus-2.15.90.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- nautilus.spec	18 Jul 2006 15:37:28 -0000	1.112
+++ nautilus.spec	3 Aug 2006 18:44:37 -0000	1.113
@@ -22,8 +22,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.15.4
-Release:	3
+Version: 	2.15.90
+Release:	1%{?dist}
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -177,6 +177,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-3
 - Spec file cleanups
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	13 Jul 2006 02:12:04 -0000	1.44
+++ sources	3 Aug 2006 18:44:37 -0000	1.45
@@ -1 +1 @@
-720c96c2f4ddbd65c69eda6ab54b42ec  nautilus-2.15.4.tar.bz2
+ade4e3580a9cb641b4ff51aced9124dc  nautilus-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:47:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:47:53 -0400
Subject: rpms/nfs-utils-lib/devel librpcsecgss-0.13-compile.patch, 1.1,
	1.2 nfs-utils-lib.spec, 1.10, 1.11
Message-ID: <200608031847.k73IlrcP003376@cvs.devel.redhat.com>

Author: steved

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

Modified Files:
	librpcsecgss-0.13-compile.patch nfs-utils-lib.spec 
Log Message:
Updated librpcsecgss to 0.14


librpcsecgss-0.13-compile.patch:
 Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: librpcsecgss-0.13-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/librpcsecgss-0.13-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- librpcsecgss-0.13-compile.patch	26 Jul 2006 17:57:29 -0000	1.1
+++ librpcsecgss-0.13-compile.patch	3 Aug 2006 18:47:50 -0000	1.2
@@ -1,8 +1,11 @@
---- nfs-utils-lib-1.0.8/librpcsecgss-0.13/src/Makefile.am.orig	2006-04-14 13:03:09.000000000 -0400
-+++ nfs-utils-lib-1.0.8/librpcsecgss-0.13/src/Makefile.am	2006-07-26 11:52:01.348163000 -0400
-@@ -1,3 +1,5 @@
+--- nfs-utils-lib-1.0.8/librpcsecgss/src/Makefile.am.orig	2006-08-01 10:21:26.000000000 -0400
++++ nfs-utils-lib-1.0.8/librpcsecgss/src/Makefile.am	2006-08-02 13:42:30.593502000 -0400
+@@ -1,5 +1,7 @@
 +LIBS = $(GSSAPI_LIBS)
 +
  lib_LTLIBRARIES = librpcsecgss.la
- librpcsecgss_la_LDFLAGS = -version-info 2:0:0
+-librpcsecgss_la_LDFLAGS = -version-info 3:0:0
++librpcsecgss_la_LDFLAGS = -version-info 2:1:0
  librpcsecgss_la_SOURCES = \
+ 	auth_gss.c authgss_prot.c svc.c svc_run.c svc_auth.c \
+ 	svc_auth_none.c svc_auth_unix.c svc_auth_gss.c \


Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nfs-utils-lib.spec	26 Jul 2006 17:57:29 -0000	1.10
+++ nfs-utils-lib.spec	3 Aug 2006 18:47:50 -0000	1.11
@@ -1,18 +1,17 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 6
+Release: 7
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
 %define idmapvers 0.16
-%define libnfsidmap libnfsidmap-%{idmapvers}
-%define rpcsecgssvers 0.13
-%define librpcsecgss librpcsecgss-%{rpcsecgssvers}
+%define libnfsidmap libnfsidmap
+%define rpcsecgssvers 0.14
+%define librpcsecgss librpcsecgss
 %define libs %{librpcsecgss} %{libnfsidmap}
-
-Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/%{libnfsidmap}.tar.gz
-Source1: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{librpcsecgss}.tar.gz
+Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/%{libnfsidmap}-%{idmapvers}.tar.gz
+Source1: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{librpcsecgss}-%{rpcsecgssvers}.tar.gz
 
 Patch0: librpcsecgss-0.13-compile.patch
 
@@ -40,6 +39,9 @@
 
 %prep
 %setup -c -q -a1
+mv %{libnfsidmap}-%{idmapvers} %{libnfsidmap}
+mv %{librpcsecgss}-%{rpcsecgssvers} %{librpcsecgss}
+
 %patch -p1
 
 %build
@@ -113,13 +115,19 @@
 %{_includedir}/rpcsecgss/rpc/auth_gss.h
 %{_includedir}/rpcsecgss/rpc/svc.h
 %{_includedir}/rpcsecgss/rpc/svc_auth.h
+%{_includedir}/rpcsecgss/rpc/rpc.h
+%{_includedir}/rpcsecgss/rpc/rpcsecgss_rename.h
 %{_includedir}/nfsidmap.h
 %{_libdir}/libnfsidmap.so
 %{_libdir}/libnfsidmap.a
 
 %changelog
+* Wed Aug  2 2006 Steve Dickson <steved at redhat.com> 1.0.8-7
+- Updated librpcsecgss to -0.14
+
 * Wed Jul 26 2006 Steve Dickson <steved at redhat.com> 1.0.8-6
 - Added GSSLIBS to the linking of librpcsecgss (bz 198238)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8-5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:48:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:48:58 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.237,
	1.237.6.1 config-x86-generic, 1.63,
	1.63.10.1 config-x86_64-generic, 1.50, 1.50.10.1
Message-ID: <200608031848.k73ImwTo003890@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc6-4-branch
	config-generic config-x86-generic config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237
retrieving revision 1.237.6.1
diff -u -r1.237 -r1.237.6.1
--- config-generic	26 Jul 2006 03:00:34 -0000	1.237
+++ config-generic	3 Aug 2006 18:48:55 -0000	1.237.6.1
@@ -1071,6 +1071,10 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW3945 is not set
+# CONFIG_IPW3945_DEBUG is not set
+# CONFIG_IPW3945_MONITOR is not set
+# CONFIG_IPW3945_PROMISCUOUS is not set
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.63
retrieving revision 1.63.10.1
diff -u -r1.63 -r1.63.10.1
--- config-x86-generic	15 Jul 2006 06:49:38 -0000	1.63
+++ config-x86-generic	3 Aug 2006 18:48:55 -0000	1.63.10.1
@@ -242,6 +242,9 @@
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.50
retrieving revision 1.50.10.1
diff -u -r1.50 -r1.50.10.1
--- config-x86_64-generic	15 Jul 2006 06:49:38 -0000	1.50
+++ config-x86_64-generic	3 Aug 2006 18:48:55 -0000	1.50.10.1
@@ -112,6 +112,9 @@
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:48:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:48:58 -0400
Subject: rpms/kernel/devel jwltest-e1000-7_1_6.patch, NONE,
	1.1.6.1 jwltest-e1000-7_1_9-k4.patch, NONE,
	1.1.4.1 jwltest-ipw3945-1_0_5.patch, NONE,
	1.1.10.1 jwltest-ipw3945-1_1_0.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2519, 1.2519.2.1
Message-ID: <200608031848.k73ImwZG003876@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc6-4-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc6-4-branch
	jwltest-e1000-7_1_6.patch jwltest-e1000-7_1_9-k4.patch 
	jwltest-ipw3945-1_0_5.patch jwltest-ipw3945-1_1_0.patch 
Log Message:


jwltest-e1000-7_1_6.patch:
 e1000.h         |   28 -
 e1000_ethtool.c |   41 +
 e1000_hw.c      | 1377 +++++++++++++++++++++++++-------------------------------
 e1000_hw.h      |   83 ++-
 e1000_main.c    |  342 ++++++-------
 e1000_osdep.h   |    4 
 e1000_param.c   |   94 ++-
 7 files changed, 923 insertions(+), 1046 deletions(-)

--- NEW FILE jwltest-e1000-7_1_6.patch ---
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_param.c.orig	2006-07-25 13:27:03.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_param.c	2006-07-25 13:52:41.000000000 -0400
@@ -342,9 +342,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ?
 			E1000_MAX_TXD : E1000_MAX_82544_TXD;
 
-		tx_ring->count = TxDescriptors[bd];
-		e1000_validate_option(&tx_ring->count, &opt, adapter);
-		E1000_ROUNDUP(tx_ring->count, REQ_TX_DESCRIPTOR_MULTIPLE);
+			tx_ring->count = TxDescriptors[bd];
+			e1000_validate_option(&tx_ring->count, &opt, adapter);
+			E1000_ROUNDUP(tx_ring->count,
+						REQ_TX_DESCRIPTOR_MULTIPLE);
 		for (i = 0; i < adapter->num_tx_queues; i++)
 			tx_ring[i].count = tx_ring->count;
 	}
@@ -363,9 +364,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
 			E1000_MAX_82544_RXD;
 
-		rx_ring->count = RxDescriptors[bd];
-		e1000_validate_option(&rx_ring->count, &opt, adapter);
-		E1000_ROUNDUP(rx_ring->count, REQ_RX_DESCRIPTOR_MULTIPLE);
+			rx_ring->count = RxDescriptors[bd];
+			e1000_validate_option(&rx_ring->count, &opt, adapter);
+			E1000_ROUNDUP(rx_ring->count,
+						REQ_RX_DESCRIPTOR_MULTIPLE);
 		for (i = 0; i < adapter->num_rx_queues; i++)
 			rx_ring[i].count = rx_ring->count;
 	}
@@ -377,9 +379,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_ENABLED
 		};
 
-		int rx_csum = XsumRX[bd];
-		e1000_validate_option(&rx_csum, &opt, adapter);
-		adapter->rx_csum = rx_csum;
+			int rx_csum = XsumRX[bd];
+			e1000_validate_option(&rx_csum, &opt, adapter);
+			adapter->rx_csum = rx_csum;
 	}
 	{ /* Flow Control */
 
@@ -399,9 +401,9 @@ e1000_check_options(struct e1000_adapter
 					 .p = fc_list }}
 		};
 
-		int fc = FlowControl[bd];
-		e1000_validate_option(&fc, &opt, adapter);
-		adapter->hw.fc = adapter->hw.original_fc = fc;
+			int fc = FlowControl[bd];
+			e1000_validate_option(&fc, &opt, adapter);
+			adapter->hw.fc = adapter->hw.original_fc = fc;
 	}
 	{ /* Transmit Interrupt Delay */
 		struct e1000_option opt = {
@@ -413,8 +415,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXDELAY }}
 		};
 
-		adapter->tx_int_delay = TxIntDelay[bd];
-		e1000_validate_option(&adapter->tx_int_delay, &opt, adapter);
+			adapter->tx_int_delay = TxIntDelay[bd];
+			e1000_validate_option(&adapter->tx_int_delay, &opt,
+								adapter);
 	}
 	{ /* Transmit Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -426,9 +429,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXABSDELAY }}
 		};
 
-		adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
-		e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
-		                      adapter);
+			adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
+			e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
+								adapter);
 	}
 	{ /* Receive Interrupt Delay */
 		struct e1000_option opt = {
@@ -440,8 +443,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXDELAY }}
 		};
 
-		adapter->rx_int_delay = RxIntDelay[bd];
-		e1000_validate_option(&adapter->rx_int_delay, &opt, adapter);
+			adapter->rx_int_delay = RxIntDelay[bd];
+			e1000_validate_option(&adapter->rx_int_delay, &opt,
+								adapter);
 	}
 	{ /* Receive Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -453,9 +457,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXABSDELAY }}
 		};
 
-		adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
-		e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
-		                      adapter);
+			adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
+			e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
+								adapter);
 	}
 	{ /* Interrupt Throttling Rate */
 		struct e1000_option opt = {
@@ -467,19 +471,21 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_ITR }}
 		};
 
-		adapter->itr = InterruptThrottleRate[bd];
-		switch (adapter->itr) {
-		case 0:
-			DPRINTK(PROBE, INFO, "%s turned off\n", opt.name);
-			break;
-		case 1:
-			DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
-				opt.name);
-			break;
-		default:
-			e1000_validate_option(&adapter->itr, &opt, adapter);
-			break;
-		}
+			adapter->itr = InterruptThrottleRate[bd];
+			switch (adapter->itr) {
+			case 0:
+				DPRINTK(PROBE, INFO, "%s turned off\n",
+					opt.name);
+				break;
+			case 1:
+				DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
+					opt.name);
+				break;
+			default:
+				e1000_validate_option(&adapter->itr, &opt,
+					adapter);
+				break;
+			}
 	}
 	{ /* Smart Power Down */
 		struct e1000_option opt = {
@@ -489,9 +495,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_DISABLED
 		};
 
-		int spd = SmartPowerDownEnable[bd];
-		e1000_validate_option(&spd, &opt, adapter);
-		adapter->smart_power_down = spd;
+			int spd = SmartPowerDownEnable[bd];
+			e1000_validate_option(&spd, &opt, adapter);
+			adapter->smart_power_down = spd;
 	}
 	{ /* Kumeran Lock Loss Workaround */
 		struct e1000_option opt = {
@@ -577,8 +583,8 @@ e1000_check_copper_options(struct e1000_
 					 .p = speed_list }}
 		};
 
-		speed = Speed[bd];
-		e1000_validate_option(&speed, &opt, adapter);
+			speed = Speed[bd];
+			e1000_validate_option(&speed, &opt, adapter);
 	}
 	{ /* Duplex */
 		struct e1000_opt_list dplx_list[] = {{           0, "" },
@@ -600,8 +606,8 @@ e1000_check_copper_options(struct e1000_
 			        "Speed/Duplex/AutoNeg parameter ignored.\n");
 			return;
 		}
-		dplx = Duplex[bd];
-		e1000_validate_option(&dplx, &opt, adapter);
+			dplx = Duplex[bd];
+			e1000_validate_option(&dplx, &opt, adapter);
 	}
 
 	if (AutoNeg[bd] != OPTION_UNSET && (speed != 0 || dplx != 0)) {
@@ -653,8 +659,8 @@ e1000_check_copper_options(struct e1000_
 					 .p = an_list }}
 		};
 
-		an = AutoNeg[bd];
-		e1000_validate_option(&an, &opt, adapter);
+			an = AutoNeg[bd];
+			e1000_validate_option(&an, &opt, adapter);
 		adapter->hw.autoneg_advertised = an;
 	}
 
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_hw.h.orig	2006-07-25 13:27:03.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_hw.h	2006-07-25 13:28:17.000000000 -0400
@@ -306,6 +306,7 @@ typedef enum {
 /* Initialization */
 int32_t e1000_reset_hw(struct e1000_hw *hw);
 int32_t e1000_init_hw(struct e1000_hw *hw);
+int32_t e1000_id_led_init(struct e1000_hw * hw);
 int32_t e1000_set_mac_type(struct e1000_hw *hw);
 void e1000_set_media_type(struct e1000_hw *hw);
 
@@ -313,8 +314,10 @@ void e1000_set_media_type(struct e1000_h
 int32_t e1000_setup_link(struct e1000_hw *hw);
[...5055 lines suppressed...]
-/**
- * e1000_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch, as if from a cold-boot. Implementation
- * resembles the first-half of the e1000_resume routine.
- */
-static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
-{
-	struct net_device *netdev = pci_get_drvdata(pdev);
-	struct e1000_adapter *adapter = netdev->priv;
-
-	if (pci_enable_device(pdev)) {
-		printk(KERN_ERR "e1000: Cannot re-enable PCI device after reset.\n");
-		return PCI_ERS_RESULT_DISCONNECT;
-	}
-	pci_set_master(pdev);
-
-	pci_enable_wake(pdev, 3, 0);
-	pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
-
-	/* Perform card reset only on one instance of the card */
-	if (PCI_FUNC (pdev->devfn) != 0)
-		return PCI_ERS_RESULT_RECOVERED;
-
-	e1000_reset(adapter);
-	E1000_WRITE_REG(&adapter->hw, WUS, ~0);
-
-	return PCI_ERS_RESULT_RECOVERED;
-}
-
-/**
- * e1000_io_resume - called when traffic can start flowing again.
- * @pdev: Pointer to PCI device
- *
- * This callback is called when the error recovery driver tells us that
- * its OK to resume normal operation. Implementation resembles the
- * second-half of the e1000_resume routine.
- */
-static void e1000_io_resume(struct pci_dev *pdev)
-{
-	struct net_device *netdev = pci_get_drvdata(pdev);
-	struct e1000_adapter *adapter = netdev->priv;
-	uint32_t manc, swsm;
-
-	if (netif_running(netdev)) {
-		if (e1000_up(adapter)) {
-			printk("e1000: can't bring device back up after reset\n");
-			return;
-		}
-	}
-
-	netif_device_attach(netdev);
-
-	if (adapter->hw.mac_type >= e1000_82540 &&
-	    adapter->hw.media_type == e1000_media_type_copper) {
-		manc = E1000_READ_REG(&adapter->hw, MANC);
-		manc &= ~(E1000_MANC_ARP_EN);
-		E1000_WRITE_REG(&adapter->hw, MANC, manc);
-	}
-
-	switch (adapter->hw.mac_type) {
-	case e1000_82573:
-		swsm = E1000_READ_REG(&adapter->hw, SWSM);
-		E1000_WRITE_REG(&adapter->hw, SWSM,
-				swsm | E1000_SWSM_DRV_LOAD);
-		break;
-	default:
-		break;
-	}
-
-	if (netif_running(netdev))
-		mod_timer(&adapter->watchdog_timer, jiffies);
-}
-
 /* e1000_main.c */
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_ethtool.c.orig	2006-07-25 13:27:03.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_ethtool.c	2006-07-25 13:28:17.000000000 -0400
@@ -33,6 +33,21 @@
 
 #include <asm/uaccess.h>
 
+extern char e1000_driver_name[];
+extern char e1000_driver_version[];
+
+extern int e1000_up(struct e1000_adapter *adapter);
+extern void e1000_down(struct e1000_adapter *adapter);
+extern void e1000_reinit_locked(struct e1000_adapter *adapter);
+extern void e1000_reset(struct e1000_adapter *adapter);
+extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
+extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
+extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
+extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
+extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
+extern void e1000_update_stats(struct e1000_adapter *adapter);
+
+
 struct e1000_stats {
 	char stat_string[ETH_GSTRING_LEN];
 	int sizeof_stat;
@@ -415,12 +430,12 @@ e1000_get_regs(struct net_device *netdev
 		regs_buff[23] = regs_buff[18]; /* mdix mode */
 		e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
 	} else {
-        	e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
+		e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
 		regs_buff[13] = (uint32_t)phy_data; /* cable length */
 		regs_buff[14] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
 		regs_buff[15] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
 		regs_buff[16] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-        	e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+		e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
 		regs_buff[17] = (uint32_t)phy_data; /* extended 10bt distance */
 		regs_buff[18] = regs_buff[13]; /* cable polarity */
 		regs_buff[19] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
@@ -629,7 +644,7 @@ e1000_set_ringparam(struct net_device *n
 	tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
 	rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues;
 
-	while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+	if (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
 		msleep(1);
 
 	if (netif_running(adapter->netdev))
@@ -696,7 +711,6 @@ e1000_set_ringparam(struct net_device *n
 	}
 
 	clear_bit(__E1000_RESETTING, &adapter->flags);
-
 	return 0;
 err_setup_tx:
 	e1000_free_all_rx_resources(adapter);
@@ -751,7 +765,7 @@ e1000_reg_test(struct e1000_adapter *ada
 	/* The status register is Read Only, so a write should fail.
 	 * Some bits that get toggled are ignored.
 	 */
-        switch (adapter->hw.mac_type) {
+	switch (adapter->hw.mac_type) {
 	/* there are several bits on newer hardware that are r/w */
 	case e1000_82571:
 	case e1000_82572:
@@ -882,10 +896,10 @@ e1000_intr_test(struct e1000_adapter *ad
 	*data = 0;
 
 	/* Hook up test interrupt handler just for this test */
-	if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED,
-			 netdev->name, netdev)) {
- 		shared_int = FALSE;
- 	} else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
+	if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name,
+	                 netdev))
+		shared_int = FALSE;
+	else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ,
 			      netdev->name, netdev)){
 		*data = 1;
 		return -1;
@@ -1208,7 +1222,7 @@ e1000_nonintegrated_phy_loopback(struct 
 	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8100);
 
 	/* Wait for reset to complete. */
-	udelay(500);
+	usec_delay(500);
 
 	/* Have to setup TX_CLK and TX_CRS after software reset */
 	e1000_phy_reset_clk_and_crs(adapter);
@@ -1306,7 +1320,7 @@ e1000_integrated_phy_loopback(struct e10
 	if (adapter->hw.phy_type == e1000_phy_m88)
 		e1000_phy_disable_receiver(adapter);
 
-	udelay(500);
+	usec_delay(500);
 
 	return 0;
 }
@@ -1705,6 +1719,7 @@ e1000_get_wol(struct net_device *netdev,
 	default:
 		wol->supported = WAKE_UCAST | WAKE_MCAST |
 				 WAKE_BCAST | WAKE_MAGIC;
+
 		wol->wolopts = 0;
 
 do_defaults:
@@ -1908,7 +1923,7 @@ static struct ethtool_ops e1000_ethtool_
 	.set_pauseparam		= e1000_set_pauseparam,
 	.get_rx_csum		= e1000_get_rx_csum,
 	.set_rx_csum		= e1000_set_rx_csum,
-	.get_tx_csum		= e1000_get_tx_csum,
+	.get_tx_csum            = e1000_get_tx_csum,
 	.set_tx_csum		= e1000_set_tx_csum,
 	.get_sg			= ethtool_op_get_sg,
 	.set_sg			= ethtool_op_set_sg,
@@ -1922,7 +1937,7 @@ static struct ethtool_ops e1000_ethtool_
 	.phys_id                = e1000_phys_id,
 	.get_stats_count        = e1000_get_stats_count,
 	.get_ethtool_stats      = e1000_get_ethtool_stats,
-	.get_perm_addr		= ethtool_op_get_perm_addr,
+	.get_perm_addr  		= ethtool_op_get_perm_addr,
 };
 
 void e1000_set_ethtool_ops(struct net_device *netdev)

jwltest-e1000-7_1_9-k4.patch:
 e1000.h         |   28 +
 e1000_ethtool.c |   41 -
 e1000_hw.c      | 1377 ++++++++++++++++++++++++++++++--------------------------
 e1000_hw.h      |   83 ---
 e1000_main.c    |  342 +++++++------
 e1000_osdep.h   |    4 
 e1000_param.c   |   94 +--
 7 files changed, 1046 insertions(+), 923 deletions(-)

--- NEW FILE jwltest-e1000-7_1_9-k4.patch ---
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_param.c.orig	2006-07-26 14:35:27.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_param.c	2006-07-26 14:36:39.000000000 -0400
@@ -342,10 +342,9 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ?
 			E1000_MAX_TXD : E1000_MAX_82544_TXD;
 
-			tx_ring->count = TxDescriptors[bd];
-			e1000_validate_option(&tx_ring->count, &opt, adapter);
-			E1000_ROUNDUP(tx_ring->count,
-						REQ_TX_DESCRIPTOR_MULTIPLE);
+		tx_ring->count = TxDescriptors[bd];
+		e1000_validate_option(&tx_ring->count, &opt, adapter);
+		E1000_ROUNDUP(tx_ring->count, REQ_TX_DESCRIPTOR_MULTIPLE);
 		for (i = 0; i < adapter->num_tx_queues; i++)
 			tx_ring[i].count = tx_ring->count;
 	}
@@ -364,10 +363,9 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
 			E1000_MAX_82544_RXD;
 
-			rx_ring->count = RxDescriptors[bd];
-			e1000_validate_option(&rx_ring->count, &opt, adapter);
-			E1000_ROUNDUP(rx_ring->count,
-						REQ_RX_DESCRIPTOR_MULTIPLE);
+		rx_ring->count = RxDescriptors[bd];
+		e1000_validate_option(&rx_ring->count, &opt, adapter);
+		E1000_ROUNDUP(rx_ring->count, REQ_RX_DESCRIPTOR_MULTIPLE);
 		for (i = 0; i < adapter->num_rx_queues; i++)
 			rx_ring[i].count = rx_ring->count;
 	}
@@ -379,9 +377,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_ENABLED
 		};
 
-			int rx_csum = XsumRX[bd];
-			e1000_validate_option(&rx_csum, &opt, adapter);
-			adapter->rx_csum = rx_csum;
+		int rx_csum = XsumRX[bd];
+		e1000_validate_option(&rx_csum, &opt, adapter);
+		adapter->rx_csum = rx_csum;
 	}
 	{ /* Flow Control */
 
@@ -401,9 +399,9 @@ e1000_check_options(struct e1000_adapter
 					 .p = fc_list }}
 		};
 
-			int fc = FlowControl[bd];
-			e1000_validate_option(&fc, &opt, adapter);
-			adapter->hw.fc = adapter->hw.original_fc = fc;
+		int fc = FlowControl[bd];
+		e1000_validate_option(&fc, &opt, adapter);
+		adapter->hw.fc = adapter->hw.original_fc = fc;
 	}
 	{ /* Transmit Interrupt Delay */
 		struct e1000_option opt = {
@@ -415,9 +413,8 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXDELAY }}
 		};
 
-			adapter->tx_int_delay = TxIntDelay[bd];
-			e1000_validate_option(&adapter->tx_int_delay, &opt,
-								adapter);
+		adapter->tx_int_delay = TxIntDelay[bd];
+		e1000_validate_option(&adapter->tx_int_delay, &opt, adapter);
 	}
 	{ /* Transmit Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -429,9 +426,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXABSDELAY }}
 		};
 
-			adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
-			e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
-								adapter);
+		adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
+		e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
+		                      adapter);
 	}
 	{ /* Receive Interrupt Delay */
 		struct e1000_option opt = {
@@ -443,9 +440,8 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXDELAY }}
 		};
 
-			adapter->rx_int_delay = RxIntDelay[bd];
-			e1000_validate_option(&adapter->rx_int_delay, &opt,
-								adapter);
+		adapter->rx_int_delay = RxIntDelay[bd];
+		e1000_validate_option(&adapter->rx_int_delay, &opt, adapter);
 	}
 	{ /* Receive Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -457,9 +453,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXABSDELAY }}
 		};
 
-			adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
-			e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
-								adapter);
+		adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
+		e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
+		                      adapter);
 	}
 	{ /* Interrupt Throttling Rate */
 		struct e1000_option opt = {
@@ -471,21 +467,19 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_ITR }}
 		};
 
-			adapter->itr = InterruptThrottleRate[bd];
-			switch (adapter->itr) {
-			case 0:
-				DPRINTK(PROBE, INFO, "%s turned off\n",
-					opt.name);
-				break;
-			case 1:
-				DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
-					opt.name);
-				break;
-			default:
-				e1000_validate_option(&adapter->itr, &opt,
-					adapter);
-				break;
-			}
+		adapter->itr = InterruptThrottleRate[bd];
+		switch (adapter->itr) {
+		case 0:
+			DPRINTK(PROBE, INFO, "%s turned off\n", opt.name);
+			break;
+		case 1:
+			DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
+				opt.name);
+			break;
+		default:
+			e1000_validate_option(&adapter->itr, &opt, adapter);
+			break;
+		}
 	}
 	{ /* Smart Power Down */
 		struct e1000_option opt = {
@@ -495,9 +489,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_DISABLED
 		};
 
-			int spd = SmartPowerDownEnable[bd];
-			e1000_validate_option(&spd, &opt, adapter);
-			adapter->smart_power_down = spd;
+		int spd = SmartPowerDownEnable[bd];
+		e1000_validate_option(&spd, &opt, adapter);
+		adapter->smart_power_down = spd;
 	}
 	{ /* Kumeran Lock Loss Workaround */
 		struct e1000_option opt = {
@@ -583,8 +577,8 @@ e1000_check_copper_options(struct e1000_
 					 .p = speed_list }}
 		};
 
-			speed = Speed[bd];
-			e1000_validate_option(&speed, &opt, adapter);
+		speed = Speed[bd];
+		e1000_validate_option(&speed, &opt, adapter);
 	}
 	{ /* Duplex */
 		struct e1000_opt_list dplx_list[] = {{           0, "" },
@@ -606,8 +600,8 @@ e1000_check_copper_options(struct e1000_
 			        "Speed/Duplex/AutoNeg parameter ignored.\n");
 			return;
 		}
-			dplx = Duplex[bd];
-			e1000_validate_option(&dplx, &opt, adapter);
+		dplx = Duplex[bd];
+		e1000_validate_option(&dplx, &opt, adapter);
 	}
 
 	if (AutoNeg[bd] != OPTION_UNSET && (speed != 0 || dplx != 0)) {
@@ -659,8 +653,8 @@ e1000_check_copper_options(struct e1000_
 					 .p = an_list }}
 		};
 
-			an = AutoNeg[bd];
-			e1000_validate_option(&an, &opt, adapter);
+		an = AutoNeg[bd];
+		e1000_validate_option(&an, &opt, adapter);
 		adapter->hw.autoneg_advertised = an;
 	}
 
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_hw.h.orig	2006-07-26 14:35:27.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_hw.h	2006-07-26 14:36:39.000000000 -0400
@@ -306,7 +306,6 @@ typedef enum {
 /* Initialization */
 int32_t e1000_reset_hw(struct e1000_hw *hw);
 int32_t e1000_init_hw(struct e1000_hw *hw);
-int32_t e1000_id_led_init(struct e1000_hw * hw);
 int32_t e1000_set_mac_type(struct e1000_hw *hw);
 void e1000_set_media_type(struct e1000_hw *hw);
 
@@ -314,10 +313,8 @@ void e1000_set_media_type(struct e1000_h
 int32_t e1000_setup_link(struct e1000_hw *hw);
[...5055 lines suppressed...]
+/**
+ * e1000_io_slot_reset - called after the pci bus has been reset.
+ * @pdev: Pointer to PCI device
+ *
+ * Restart the card from scratch, as if from a cold-boot. Implementation
+ * resembles the first-half of the e1000_resume routine.
+ */
+static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
+{
+	struct net_device *netdev = pci_get_drvdata(pdev);
+	struct e1000_adapter *adapter = netdev->priv;
+
+	if (pci_enable_device(pdev)) {
+		printk(KERN_ERR "e1000: Cannot re-enable PCI device after reset.\n");
+		return PCI_ERS_RESULT_DISCONNECT;
+	}
+	pci_set_master(pdev);
+
+	pci_enable_wake(pdev, 3, 0);
+	pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
+
+	/* Perform card reset only on one instance of the card */
+	if (PCI_FUNC (pdev->devfn) != 0)
+		return PCI_ERS_RESULT_RECOVERED;
+
+	e1000_reset(adapter);
+	E1000_WRITE_REG(&adapter->hw, WUS, ~0);
+
+	return PCI_ERS_RESULT_RECOVERED;
+}
+
+/**
+ * e1000_io_resume - called when traffic can start flowing again.
+ * @pdev: Pointer to PCI device
+ *
+ * This callback is called when the error recovery driver tells us that
+ * its OK to resume normal operation. Implementation resembles the
+ * second-half of the e1000_resume routine.
+ */
+static void e1000_io_resume(struct pci_dev *pdev)
+{
+	struct net_device *netdev = pci_get_drvdata(pdev);
+	struct e1000_adapter *adapter = netdev->priv;
+	uint32_t manc, swsm;
+
+	if (netif_running(netdev)) {
+		if (e1000_up(adapter)) {
+			printk("e1000: can't bring device back up after reset\n");
+			return;
+		}
+	}
+
+	netif_device_attach(netdev);
+
+	if (adapter->hw.mac_type >= e1000_82540 &&
+	    adapter->hw.media_type == e1000_media_type_copper) {
+		manc = E1000_READ_REG(&adapter->hw, MANC);
+		manc &= ~(E1000_MANC_ARP_EN);
+		E1000_WRITE_REG(&adapter->hw, MANC, manc);
+	}
+
+	switch (adapter->hw.mac_type) {
+	case e1000_82573:
+		swsm = E1000_READ_REG(&adapter->hw, SWSM);
+		E1000_WRITE_REG(&adapter->hw, SWSM,
+				swsm | E1000_SWSM_DRV_LOAD);
+		break;
+	default:
+		break;
+	}
+
+	if (netif_running(netdev))
+		mod_timer(&adapter->watchdog_timer, jiffies);
+}
+
 /* e1000_main.c */
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_ethtool.c.orig	2006-07-26 14:35:27.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_ethtool.c	2006-07-26 14:36:39.000000000 -0400
@@ -33,21 +33,6 @@
 
 #include <asm/uaccess.h>
 
-extern char e1000_driver_name[];
-extern char e1000_driver_version[];
-
-extern int e1000_up(struct e1000_adapter *adapter);
-extern void e1000_down(struct e1000_adapter *adapter);
-extern void e1000_reinit_locked(struct e1000_adapter *adapter);
-extern void e1000_reset(struct e1000_adapter *adapter);
-extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
-extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
-extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
-extern void e1000_update_stats(struct e1000_adapter *adapter);
-
-
 struct e1000_stats {
 	char stat_string[ETH_GSTRING_LEN];
 	int sizeof_stat;
@@ -430,12 +415,12 @@ e1000_get_regs(struct net_device *netdev
 		regs_buff[23] = regs_buff[18]; /* mdix mode */
 		e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
 	} else {
-		e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
+        	e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
 		regs_buff[13] = (uint32_t)phy_data; /* cable length */
 		regs_buff[14] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
 		regs_buff[15] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
 		regs_buff[16] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-		e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+        	e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
 		regs_buff[17] = (uint32_t)phy_data; /* extended 10bt distance */
 		regs_buff[18] = regs_buff[13]; /* cable polarity */
 		regs_buff[19] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
@@ -644,7 +629,7 @@ e1000_set_ringparam(struct net_device *n
 	tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
 	rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues;
 
-	if (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+	while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
 		msleep(1);
 
 	if (netif_running(adapter->netdev))
@@ -711,6 +696,7 @@ e1000_set_ringparam(struct net_device *n
 	}
 
 	clear_bit(__E1000_RESETTING, &adapter->flags);
+
 	return 0;
 err_setup_tx:
 	e1000_free_all_rx_resources(adapter);
@@ -765,7 +751,7 @@ e1000_reg_test(struct e1000_adapter *ada
 	/* The status register is Read Only, so a write should fail.
 	 * Some bits that get toggled are ignored.
 	 */
-	switch (adapter->hw.mac_type) {
+        switch (adapter->hw.mac_type) {
 	/* there are several bits on newer hardware that are r/w */
 	case e1000_82571:
 	case e1000_82572:
@@ -896,10 +882,10 @@ e1000_intr_test(struct e1000_adapter *ad
 	*data = 0;
 
 	/* Hook up test interrupt handler just for this test */
-	if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name,
-	                 netdev))
-		shared_int = FALSE;
-	else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ,
+	if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED,
+			 netdev->name, netdev)) {
+ 		shared_int = FALSE;
+ 	} else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
 			      netdev->name, netdev)){
 		*data = 1;
 		return -1;
@@ -1222,7 +1208,7 @@ e1000_nonintegrated_phy_loopback(struct 
 	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8100);
 
 	/* Wait for reset to complete. */
-	usec_delay(500);
+	udelay(500);
 
 	/* Have to setup TX_CLK and TX_CRS after software reset */
 	e1000_phy_reset_clk_and_crs(adapter);
@@ -1320,7 +1306,7 @@ e1000_integrated_phy_loopback(struct e10
 	if (adapter->hw.phy_type == e1000_phy_m88)
 		e1000_phy_disable_receiver(adapter);
 
-	usec_delay(500);
+	udelay(500);
 
 	return 0;
 }
@@ -1719,7 +1705,6 @@ e1000_get_wol(struct net_device *netdev,
 	default:
 		wol->supported = WAKE_UCAST | WAKE_MCAST |
 				 WAKE_BCAST | WAKE_MAGIC;
-
 		wol->wolopts = 0;
 
 do_defaults:
@@ -1923,7 +1908,7 @@ static struct ethtool_ops e1000_ethtool_
 	.set_pauseparam		= e1000_set_pauseparam,
 	.get_rx_csum		= e1000_get_rx_csum,
 	.set_rx_csum		= e1000_set_rx_csum,
-	.get_tx_csum            = e1000_get_tx_csum,
+	.get_tx_csum		= e1000_get_tx_csum,
 	.set_tx_csum		= e1000_set_tx_csum,
 	.get_sg			= ethtool_op_get_sg,
 	.set_sg			= ethtool_op_set_sg,
@@ -1937,7 +1922,7 @@ static struct ethtool_ops e1000_ethtool_
 	.phys_id                = e1000_phys_id,
 	.get_stats_count        = e1000_get_stats_count,
 	.get_ethtool_stats      = e1000_get_ethtool_stats,
-	.get_perm_addr  		= ethtool_op_get_perm_addr,
+	.get_perm_addr		= ethtool_op_get_perm_addr,
 };
 
 void e1000_set_ethtool_ops(struct net_device *netdev)

jwltest-ipw3945-1_0_5.patch:
 Documentation/networking/README.ipw3945 |  984 +
 drivers/net/wireless/Kconfig            |   62 
 drivers/net/wireless/Makefile           |    2 
 drivers/net/wireless/ipw3945.c          |16651 ++++++++++++++++++++++++++++++++
 drivers/net/wireless/ipw3945.h          | 2556 ++++
 drivers/net/wireless/ipw3945_daemon.h   |  403 
 6 files changed, 20658 insertions(+)

--- NEW FILE jwltest-ipw3945-1_0_5.patch ---
--- linux-2.6.17.noarch/Documentation/networking/README.ipw3945.orig	2006-06-26 12:09:00.000000000 -0400
+++ linux-2.6.17.noarch/Documentation/networking/README.ipw3945	2006-06-26 12:09:05.000000000 -0400
@@ -0,0 +1,998 @@
+
+Intel(R) PRO/Wireless 3945ABG Network Connection driver for Linux* in 
+support of:
+
+Intel(R) PRO/Wireless 3945ABG Network Connection Adapter
+Intel(R) PRO/Wireless 3945BG Network Connection Adapter
+
+Note: The Intel(R) PRO/Wireless 3945ABG Network Connection driver for 
+Linux is a unified driver that works on both hardware adapters listed 
+above. In this document the Intel(R) PRO/Wireless 3945ABG Network Connection 
+driver for Linux will be used to reference the unified driver.
+
+Copyright (C) 2005 - 2006, Intel Corporation
+
+README.ipw3945
+
+Version: 1.0.5
+Date   : May 22, 2006
+
+
+Index
+-----------------------------------------------
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+1.   Introduction
+1.1. Overview of Features
+2.   Loading the Driver
+3.   Feature Details
+3.1. LEDs
+3.2. Association Details
+3.3. Roaming Details
+3.4. Scanning Details
+3.5. Antenna Selection and "Diversity"
+3.6. IEEE 802.11h Details 
+3.7. Tx Power 
+3.8. Security Details
+3.9. Power Management
+4.   Configuring the driver
+4.1. Command Line Parameters
+4.3. Sysfs Helper Files:
+5.   Wireless Tools Details
+5.1. iwlist
+5.2. iwpriv
+5.3. iwconfig
+6.   Support
+7.   License
+
+
+===============================================
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+===============================================
+
+Important Notice FOR ALL USERS OR DISTRIBUTORS!!!! 
+
+Intel wireless LAN adapters are engineered, manufactured, tested, and
+quality checked to ensure that they meet all necessary local and
+governmental regulatory agency requirements for the regions that they
+are designated and/or marked to ship into. Since wireless LANs are
+generally unlicensed devices that share spectrum with radars,
+satellites, and other licensed and unlicensed devices, it is sometimes
+necessary to dynamically detect, avoid, and limit usage to avoid
+interference with these devices. In many instances Intel is required to
+provide test data to prove regional and local compliance to regional and
+governmental regulations before certification or approval to use the
+product is granted. Intel's wireless LAN's EEPROM, firmware, and
+software driver are designed to carefully control parameters that affect
+radio operation and to ensure electromagnetic compliance (EMC). These
+parameters include, without limitation, RF power, spectrum usage,
+channel scanning, and human exposure. 
+
+For these reasons Intel cannot permit any manipulation by third parties
+of the software provided in binary format with the wireless WLAN
+adapters (e.g., the EEPROM and firmware). Furthermore, if you use any
+patches, utilities, or code with the Intel wireless LAN adapters that
+have been manipulated by an unauthorized party (i.e., patches,
+utilities, or code (including open source code modifications) which have
+not been validated by Intel), (i) you will be solely responsible for
+ensuring the regulatory compliance of the products, (ii) Intel will bear
+no liability, under any theory of liability for any issues associated
+with the modified products, including without limitation, claims under
+the warranty and/or issues arising from regulatory non-compliance, and
+(iii) Intel will not provide or be required to assist in providing
+support to any third parties for such modified products.  
+
+Note: Many regulatory agencies consider Wireless LAN adapters to be
+modules, and accordingly, condition system-level regulatory approval
+upon receipt and review of test data documenting that the antennas and
+system configuration do not cause the EMC and radio operation to be
+non-compliant.
+
+The drivers available for download from SourceForge are provided as a 
+part of a development project.  Conformance to local regulatory 
+requirements is the responsibility of the individual developer.  As 
+such, if you are interested in deploying or shipping a driver as part of 
+solution intended to be used for purposes other than development, please 
+obtain a tested driver from Intel Customer Support at:
+
+http://support.intel.com/support/notebook/sb/CS-006408.htm
+
+
+===============================================
+1.   Introduction
+===============================================
+The following sections attempt to provide a brief introduction to using 
+the Intel(R) PRO/Wireless 3945ABG driver for Linux.
+
+This document is not meant to be a comprehensive manual on 
+understanding or using wireless technologies, but should be sufficient 
+to get you moving without wires on Linux.
+
+For information on building and installing the driver, see the INSTALL
+file.
+
+
+1.1. Overview of Features
+-----------------------------------------------
+The current release (1.0.5) supports the following features:
+
++ BSS mode (Infrastructure, Managed)
++ IBSS mode (Ad-Hoc)
++ WEP (OPEN and SHARED KEY mode)
++ 802.1x EAP via wpa_supplicant and xsupplicant
++ 802.11i (WPA/WPA2)
++ Wireless Extension support 
++ Full B and G rate support
++ Full A rate support (ABG only)
++ Transmit power control
++ S state support (ACPI suspend/resume)
+
+The following features are currently enabled, but not officially
+supported:
+
++ QoS
++ Monitor mode (aka RFMon)
++ Associated RF promiscuous mode
++ Frame Rx simulation
+
+The distinction between officially supported and enabled is a reflection 
+of the amount of validation and interoperability testing that has been
+performed on a given feature. Note: in addition, the features may not have 
+all of the code in the driver to fully enable the feature.
+
+
+===============================================
+2. Loading the Driver
+===============================================
+
+See the INSTALL document for information on installing the driver.
+
+Once installed, a typical method for launching the driver and the 
+regulatory daemon is via the load script provided in the source package:
+
+	# ./load debug=0x43fff   <--- You need to be root for this
+
+NOTE:  You will not be able to rmmod the driver so long as the 
+ipw3945d daemon is running.  
+
+If you followed the steps of the INSTALL document to set up your
+modprobe.conf, you can load the module by simply running:
+
+	# modprobe ipw3945       <--- You need to be root for this
+
+If you did not configure your modprobe.conf to automatically launch the 
+regulatory daemon (see INSTALL), you must do so manually after loading 
+the module:
+
+	# /sbin/ipw3945d	<--- You need to be root for this
+
+If you want to unload the module (and kill the deamon as well), you can 
+simply use the unload script:
+
+	# ./unload               <--- You need to be root for this
+
+or likewise if you configured modprobe.conf:
+
+	# modprobe -r ipw3945       <--- You need to be root for this
+
+If you did not configure modprobe.conf to unload the regulatory daemon 
+and are not using the unload script, you need to kill the regulatory 
+daemon before you will be able to unload the module:
+
+	# /sbin/ipw3945d --kill	<--- You need to be root for this
+	# modprobe -r ipw3945
+
+
+===============================================
+3. Feature Details
+===============================================
+
+3.1. LEDs
+-----------------------------------------------
+
+The driver will attempt to control the wireless LED, if one is 
+configured in hardware.  There are typically two LEDs:
+
+	Activity -- used to indicate wireless activity
+	Link     -- used to indicate wireless link
[...20303 lines suppressed...]
+ * a command to appear. Currently set to 60s. */
+#define DAEMON_POLL_INTERVAL 60000
+
+#define DAEMON_BUF_SIZE 3000
+
+struct daemon_cmd_hdr {
+	u8 cmd;
+	u8 flags;
+	u8 token;
+	u8 reserved1;
+	u16 version;
+	u16 data_len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+struct daemon_cmd {
+	struct daemon_cmd_hdr hdr;
+	u8 data[DAEMON_BUF_SIZE];
+} __attribute__ ((packed));
+
+/*  driver <- daemon error response */
+struct daemon_error {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon synchronous command done */
+struct daemon_cmd_done {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon regulatory information
+ *
+ * The following is sent from the daemon to the driver
+ * to inform the driver of current channel capabilities and
+ * restrictions.
+ *
+ * Immediately after INIT is provided from the driver the
+ * daemon will send the full channel map.
+ *
+ * After a channel has been selected via rx_config, the
+ * daemon will send periodic updates when the channel limits
+ * change for a specific channel.
+ *
+ * NOTE:  The txpower field represents the current configured
+ * power as directed by either the user (sent to the daemon
+ * through the DAEMON_SYNC::DAEMON_SYNC_TXPOWER_LIMIT command)
+ * or as specified through the currently associated access
+ * point.  The max_txpower is the highest the channel is
+ * allowed to transmit.
+ *
+ */
+enum {
+	DAEMON_A_BAND = (1 << 0),	/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	DAEMON_IBSS_ALLOWED = (1 << 1),
+	DAEMON_ACTIVE_ALLOWED = (1 << 2),
+	DAEMON_RADAR_DETECT = (1 << 3),
+};
+struct daemon_channel_info {
+	u8 channel;
+	u8 flags;
+	s8 txpower;
+	s8 max_txpower;
+};
+struct daemon_regulatory_info {
+	u16 count;		/* Number of channels provided */
+	struct daemon_channel_info channel_info[0];
+} __attribute__ ((packed));
+
+/* driver <- daemon information request */
+struct daemon_request_info {
+	u8 request;
+} __attribute__ ((packed));
+
+/* driver <- daemon set state */
+struct daemon_set_state {
+	u8 state;
+} __attribute__ ((packed));
+
+/* driver -> daemon scan request */
+#define DAEMON_MIN_24GHZ_CHANNEL 1
+#define DAEMON_MAX_24GHZ_CHANNEL 14
+#define DAEMON_MIN_52GHZ_CHANNEL 34
+#define DAEMON_MAX_52GHZ_CHANNEL 165
+
+#define DAEMON_SCAN_FLAG_24GHZ  (1<<0)
+#define DAEMON_SCAN_FLAG_52GHZ  (1<<1)
+#define DAEMON_SCAN_FLAG_ACTIVE (1<<2)
+#define DAEMON_SCAN_FLAG_DIRECT (1<<3)
+
+#define DAEMON_MAX_CMD_SIZE 1024
+
+enum {
+	DAEMON_TXRATE_1 = 0xa,
+	DAEMON_TXRATE_2 = 0x14,
+	DAEMON_TXRATE_5_5 = 0x37,
+	DAEMON_TXRATE_6 = 0xd,
+	DAEMON_TXRATE_9 = 0xf,
+	DAEMON_TXRATE_11 = 0x6e,
+	DAEMON_TXRATE_12 = 0x5,
+	DAEMON_TXRATE_18 = 0x7,
+	DAEMON_TXRATE_24 = 0x9,
+	DAEMON_TXRATE_36 = 0xb,
+	DAEMON_TXRATE_48 = 0x1,
+	DAEMON_TXRATE_54 = 0x3,
+};
+
+struct daemon_scan_channel {
+	u8 channel;
+	u8 request_active;
+	u16 active_dwell;
+	u16 passive_dwell;
+} __attribute__ ((packed));
+
+struct daemon_ssid_ie {
+	u8 id;
+	u8 len;
+	u8 ssid[32];
+} __attribute__ ((packed));
+
+struct daemon_rx_config {
+	u8 dev_type;
+	u16 channel;
+	u32 flags;
+	u32 filter_flags;
+	u8 ofdm_basic_rates;
+	u8 cck_basic_rates;
+	u8 node_addr[6];
+	u8 bssid_addr[6];
+	u16 assoc_id;
+	u16 beacon_interval;
+} __attribute__ ((packed));
+
+#define DAEMON_MAX_SCAN_SIZE 1024
+struct daemon_scan_request {
+	u8 flags;		/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	u8 channel_count;
+	u16 probe_request_len;
+	u16 quiet_time;		/* dwell only this long on quiet chnl (active scan) */
+	u16 quiet_plcp_th;	/* quiet chnl is < this # pkts (typ. 1) */
+	u32 suspend_time;	/* pause scan this long when returning to svc chnl */
+	u32 max_out_time;	/* max msec to be out of associated (service) chnl */
+	u8 probe_request_rate;	/* rate to send probe request */
+	u32 filter_flags;
+	u32 rxon_flags;
+	struct daemon_ssid_ie direct_scan;
+	u8 data[0];
+	/*
+	   The channels start after the probe request payload and are of type:
+
+	   struct daemon_scan_channel channels[0];
+
+	   NOTE:  Only one band of channels can be scanned per pass.  You
+	   can not mix 2.4Ghz channels and 5.2Ghz channels and must
+	   request a scan multiple times (not concurrently)
+
+	 */
+} __attribute__ ((packed));
+
+/* driver -> daemon 11h frame */
+struct daemon_80211_frame {
+	u8 channel;
+	u8 reserved1;
+	u16 rssi;
+	u16 reserved2;
+	u64 tsf;
+	u32 beacon_time;
+	u16 frame_len;
+	u8 frame[0];
+} __attribute__ ((packed));
+
+struct daemon_sync_txpower_limit {
+	u8 channel;
+	s8 power;
+} __attribute__ ((packed));
+
+enum {
+	DAEMON_SYNC_UNINIT = 0,
+	DAEMON_SYNC_INIT,
+	DAEMON_SYNC_SCAN_COMPLETE,
+	DAEMON_SYNC_TXPOWER_LIMIT,
+	DAEMON_SYNC_MEASURE_REPORT,
+	DAEMON_SYNC_TX_STATUS,
+	DAEMON_SYNC_SUSPEND,
+	DAEMON_SYNC_RESUME,
+};
+
+/* driver  -> daemon */
+struct daemon_sync_cmd {
+	u16 state;
+	u16 len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+#endif

jwltest-ipw3945-1_1_0.patch:
 ipw3945.c |  809 ++++++++++++++++++++++++++++++++++----------------------------
 ipw3945.h |   17 -
 2 files changed, 452 insertions(+), 374 deletions(-)

--- NEW FILE jwltest-ipw3945-1_1_0.patch ---
--- linux-2.6.17.noarch/drivers/net/wireless/ipw3945.c.orig	2006-08-03 14:15:53.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/wireless/ipw3945.c	2006-08-03 14:28:40.000000000 -0400
@@ -65,8 +65,16 @@
 #include <net/ieee80211_radiotap.h>
 #include <asm/div64.h>
 
+/* This matches the current version in FC6/RHEL5... */
+#define IEEE80211_API_VERSION	2
+
 #include "ipw3945.h"
 
+#if IEEE80211_API_VERSION != 1 && \
+    IEEE80211_API_VERSION != 2
+#error Incompatible ieee80211 subsystem version.  Please upgrade ipw3945 driver sources.
+#endif
+
 #ifdef CONFIG_IPW3945_DEBUG
 #define VD "d"
 #else
@@ -97,7 +105,7 @@
 #define VQ
 #endif
 
-#define IPW3945_VERSION "1.0.5" VD VM VP VR VQ
+#define IPW3945_VERSION "1.1.0" VD VM VP VR VQ
 
 #define DRV_DESCRIPTION	"Intel(R) PRO/Wireless 3945 Network Connection driver for Linux"
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"
@@ -210,8 +218,6 @@ static void ipw_bg_up(void *);
 static void ipw_down(struct ipw_priv *);
 static void ipw_bg_down(void *);
 
-static int init_supported_rates(struct ipw_priv *priv,
-				struct ipw_supported_rates *prates);
 static int ipw_card_show_info(struct ipw_priv *priv);
 static int ipw_query_eeprom(struct ipw_priv *priv, u32 offset,
 			    u32 len, u8 * buf);
@@ -2085,7 +2091,7 @@ static ssize_t show_channels(struct devi
 			       geo->bg[i].max_power,
 			       geo->bg[i].
 			       flags & IEEE80211_CH_RADAR_DETECT ?
-			       " (IEEE 802.11h requried)" : "",
+			       " (radar spectrum)" : "",
 			       ((geo->bg[i].flags & IEEE80211_CH_NO_IBSS)
 				|| (geo->bg[i].
 				    flags &
@@ -2877,7 +2883,27 @@ static int ipw_send_rx_config(struct ipw
 	return rc;
 }
 
-static int ipw_send_rxon_assoc(struct ipw_priv *priv)
+static int ipw_rxon_assoc_callback(struct ipw_priv *priv,
+				   struct ipw_cmd *cmd, struct sk_buff *skb)
+{
+	struct ipw_rx_packet *res = NULL;
+
+	if (!skb) {
+		IPW_ERROR("error: response NULL in REPLY_RX_ON_ASSOC.\n");
+		return 1;
+	}
+
+	res = (struct ipw_rx_packet *)skb->data;
+	if (res->hdr.flags & 0x40) {
+		IPW_ERROR("bad return from REPLY_RX_ON_ASSOC.\n");
+		return 1;
+	}
+
+	dev_kfree_skb_any(skb);
+	return 0;
+}
+
+static int ipw_send_rxon_assoc(struct ipw_priv *priv, u8 flags)
 {
 	int rc = 0;
 	struct ipw_rx_packet *res = NULL;
@@ -2885,10 +2911,13 @@ static int ipw_send_rxon_assoc(struct ip
 	struct ipw_host_cmd cmd = {
 		.id = REPLY_RX_ON_ASSOC,
 		.len = sizeof(struct ipw_rxon_assoc_cmd),
-		.meta.flags = CMD_WANT_SKB,
+		.meta.flags = flags,
 		.data = &rxon_assoc,
 	};
 
+	if (flags & CMD_ASYNC)
+		cmd.meta.u.callback = ipw_rxon_assoc_callback;
+
 	rxon_assoc.flags = priv->rxon.flags;
 	rxon_assoc.filter_flags = priv->rxon.filter_flags;
 	rxon_assoc.ofdm_basic_rates = priv->rxon.ofdm_basic_rates;
@@ -2896,7 +2925,7 @@ static int ipw_send_rxon_assoc(struct ip
 	rxon_assoc.reserved = 0;
 
 	rc = ipw_send_cmd(priv, &cmd);
-	if (rc)
+	if (rc || (flags & CMD_ASYNC))
 		return rc;
 
 	res = (struct ipw_rx_packet *)cmd.meta.u.skb->data;
@@ -2910,6 +2939,18 @@ static int ipw_send_rxon_assoc(struct ip
 	return rc;
 }
 
+static int ipw_rxon_assoc_async(struct ipw_priv *priv)
+{
+	u8 flags = CMD_ASYNC | CMD_NO_LOCK;
+	return ipw_send_rxon_assoc(priv, flags);
+}
+
+static int ipw_rxon_assoc_sync(struct ipw_priv *priv)
+{
+	u8 flags = CMD_WANT_SKB;
+	return ipw_send_rxon_assoc(priv, flags);
+}
+
 static int ipw_add_sta_sync_callback(struct ipw_priv *priv,
 				     struct ipw_cmd *cmd, struct sk_buff *skb)
 {
@@ -3091,25 +3132,6 @@ static inline int ipw_rate_plcp2rate_sca
 	return -1;
 }
 
-static int ipw_rate_ieee2index(u8 x)
-{
-	int i;
-	for (i = 0; i < ARRAY_SIZE(rate_table_info); i++) {
-		if (rate_table_info[i].rate_ieee == x)
-			return i;
-	}
-	return -1;
-}
-
-static u8 ipw_rate_index2ieee(int x)
-{
-
-	if (x < ARRAY_SIZE(rate_table_info))
-		return rate_table_info[x].rate_ieee;
-
-	return IPW_INVALID_RATE;
-}
-
 static int ipw_rate_index2rate_scale(int x)
 {
 
@@ -3307,7 +3329,7 @@ static int ipw_rxon_call(struct ipw_priv
 	 * If we're not associated, we need to request the regulatory
 	 * daemon to tune and configure the radio via ipw_send_rxon. */
 	if (is_assoc)
-		rc = ipw_send_rxon_assoc(priv);
+		rc = ipw_rxon_assoc_sync(priv);
 	else
 		rc = ipw_send_rx_config(priv);
 
@@ -3553,28 +3575,110 @@ static int ipw_setup_rxon_timing(struct 
 	return rc;
 }
 
+#define IEEE80211_MAX_RATES (IEEE80211_NUM_OFDM_RATES + \
+                             IEEE80211_NUM_CCK_RATES)
+#define IEEE80211_CCK_RATE_1MB_INDEX		0
+#define IEEE80211_CCK_RATE_2MB_INDEX		1
+#define IEEE80211_CCK_RATE_5MB_INDEX		2
+#define IEEE80211_CCK_RATE_11MB_INDEX		3
+#define IEEE80211_OFDM_RATE_6MB_INDEX		4
+#define IEEE80211_OFDM_RATE_9MB_INDEX		5
+#define IEEE80211_OFDM_RATE_12MB_INDEX		6
+#define IEEE80211_OFDM_RATE_18MB_INDEX		7
+#define IEEE80211_OFDM_RATE_24MB_INDEX		8
+#define IEEE80211_OFDM_RATE_36MB_INDEX		9
+#define IEEE80211_OFDM_RATE_48MB_INDEX		10
+#define IEEE80211_OFDM_RATE_54MB_INDEX		11
+#define IEEE80211_RATE_ENTRY(mod, rate) \
+        [IEEE80211_## mod ##_RATE_## rate ##MB_INDEX] = \
+        IEEE80211_## mod ##_RATE_## rate ##MB
+
+static u8 ipw_index_to_rate(int i)
+{
+	u8 rates[IEEE80211_MAX_RATES] = {
+		IEEE80211_RATE_ENTRY(CCK, 1),
+		IEEE80211_RATE_ENTRY(CCK, 2),
+		IEEE80211_RATE_ENTRY(CCK, 5),
+		IEEE80211_RATE_ENTRY(CCK, 11),
+		IEEE80211_RATE_ENTRY(OFDM, 6),
+		IEEE80211_RATE_ENTRY(OFDM, 9),
+		IEEE80211_RATE_ENTRY(OFDM, 12),
+		IEEE80211_RATE_ENTRY(OFDM, 18),
+		IEEE80211_RATE_ENTRY(OFDM, 24),
+		IEEE80211_RATE_ENTRY(OFDM, 36),
+		IEEE80211_RATE_ENTRY(OFDM, 48),
+		IEEE80211_RATE_ENTRY(OFDM, 54),
+	};
+
+	if (i >= IPW_MAX_RATES)
+		return 0xff;
+
+	return rates[i];
+}
+
+static void ipw_fill_network_rates(struct ieee80211_network *network,
+				   u32 rates_mask)
+{
+	int i, in_ex = 0;
+
+	network->rates_len = 0;
+	network->rates_ex_len = 0;
+
+	for (i = 0; i < IPW_MAX_RATES; i++) {
+		if (!(rates_mask & (1 << i)))
+			continue;
+
+		if (!in_ex) {
+			network->rates[network->rates_len] =
+			    ipw_index_to_rate(i);
+
+			/* If the rates mask has this rate flagged
+			 * as a basic rate then set the basic rate
+			 * bit on the rate entry */
+			if (rates_mask & (1 << (i + 16)))
+				network->rates[network->rates_len] |=
+				    IEEE80211_BASIC_RATE_MASK;
+
+			network->rates_len++;
+
+			if (network->rates_len == MAX_RATES_LENGTH)
+				in_ex = 1;
+		} else {
+			network->rates_ex[network->rates_ex_len] =
+			    ipw_index_to_rate(i);
+			if (rates_mask & (1 << (i + 16)))
+				network->rates_ex[network->rates_ex_len] |=
+				    IEEE80211_BASIC_RATE_MASK;
+			network->rates_ex_len++;
+		}
+	}
+}
+
 /*
   fill in the supported rate in IE fiels
   return : set the bit for each supported rate insert in ie
 */
 static u16 ipw_supported_rate_to_ie(struct ieee80211_info_element *ie,
-				    u16 supported_rate,
-				    u16 basic_rate, int max_count)
+				    const u16 rates_mask,
+				    const u16 basic_rate, const int max_count)
 {
-	u16 ret_rates = 0, bit;
+	u16 ret_rates = 0, mask;
+	u8 *rates = ie->data;
 	int i;
-	u8 *rates;
 
-	rates = &ie->data[0];
+	ie->len = 0;
+
+	for (i = 0, mask = 1; i < IPW_MAX_RATES; i++, mask <<= 1) {
+		if (rates_mask & mask) {
+			ret_rates |= mask;
+			rates[ie->len++] = ipw_index_to_rate(i) |
+			    ((mask & basic_rate) ? 0x80 : 0x00);
 
-	for (bit = 1, i = 0; i < IPW_MAX_RATES; i++, bit <<= 1) {
-		if (bit & supported_rate) {
-			ret_rates |= bit;
-			rates[ie->len++] = ipw_rate_index2ieee(i) |
-			    ((bit & basic_rate) ? 0x80 : 0x00);
 			if (ie->len >= max_count)
 				break;
-			//todoG for IBSS return only cck rates only in the first ie
+
+			/* todoG for IBSS return only cck rates only in
+			 * the first ie */
 		}
 	}
 
@@ -3715,6 +3819,11 @@ static int ipw_fill_association_req(stru
 
 	frame->capability = priv->assoc_request.capability & capability;
 
+	if (priv->assoc_request.ieee_mode == IPW_G_MODE)
+		frame->capability |= WLAN_CAPABILITY_SHORT_SLOT_TIME;
+	if (priv->assoc_request.ieee_mode != IPW_A_MODE)
+		frame->capability |= WLAN_CAPABILITY_SHORT_PREAMBLE;
+
 	if (priv->config & CFG_PREAMBLE_LONG)
 		frame->capability &= ~WLAN_CAPABILITY_SHORT_PREAMBLE;
 
@@ -3733,12 +3842,17 @@ static int ipw_fill_association_req(stru
 	/* fill in supported rate */
 	info_element->id = MFIE_TYPE_RATES;
 	info_element->len = 0;
+	IPW_DEBUG_INFO("ASSOC REQ: Rates: %08X %08X\n", priv->active_rate,
+		       priv->active_rate_basic);
 	ret_rates =
-	    ipw_supported_rate_to_ie(info_element, priv->active_rate,
+	    ipw_supported_rate_to_ie(info_element,
+				     priv->active_rate & priv->rates_mask,
 				     priv->active_rate_basic,
 				     IPW_SUPPORTED_RATES_IE_LEN);
 
 	ret_rates = ~ret_rates & priv->active_rate;
+	IPW_DEBUG_INFO("ASSOC REQ: Rates: %08X %08X\n", priv->active_rate,
+		       priv->active_rate_basic);
 
 	/* Account for the size we know... */
 	len = sizeof(struct ieee80211_assoc_request) +
@@ -4114,6 +4228,14 @@ static int ipw_post_associate(struct ipw
 	rxon->filter_flags |= RXON_FILTER_ASSOC_MSK;
 	rxon->assoc_id = assoc_id;
 	rxon->beacon_interval = priv->assoc_request.beacon_interval;
+
+	if (priv->assoc_request.capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
+		rxon->flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
+
+	if ((priv->assoc_request.ieee_mode == IPW_G_MODE) &&
+	    (priv->assoc_request.capability & WLAN_CAPABILITY_SHORT_SLOT_TIME))
+		rxon->flags |= RXON_FLG_SHORT_SLOT_MSK;
+
 /*	switch (priv->ieee->sec.level) {
 	case SEC_LEVEL_1:
 	rxon->flags |= */
@@ -4186,17 +4308,9 @@ static int ipw_send_associate(struct ipw
 	memcpy(priv->ieee->bssid, priv->bssid, ETH_ALEN);
 	memcpy(rxon->bssid_addr, associate->bssid, ETH_ALEN);
 	rxon->channel = associate->channel;
-	rxon->flags =
-	    (RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK | RXON_FLG_ANT_B_MSK);
 
 	rxon->filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;	// todoG is this needed
 
-	if (associate->ieee_mode == IPW_A_MODE)
-		rxon->flags |= RXON_FLG_SHORT_SLOT_MSK;
-	else
-		rxon->flags |=
-		    (RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK);
-
 	switch (priv->ieee->iw_mode) {
 	case IW_MODE_INFRA:
 		rxon->dev_type = RXON_DEV_TYPE_ESS;
@@ -4224,16 +4338,19 @@ static int ipw_send_associate(struct ipw
 				       RXON_FILTER_CTL2HOST_MSK);
 #endif
 
+	rxon->flags =
+	    (RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK | RXON_FLG_ANT_B_MSK);
+
 	if (associate->ieee_mode == IPW_A_MODE) {
-		priv->rxon.flags &=
+		rxon->flags &=
 		    ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK
 		      | RXON_FLG_CCK_MSK);
-		priv->rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
+		rxon->flags |= RXON_FLG_SHORT_SLOT_MSK;
 	} else {
-		priv->rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
-		priv->rxon.flags |= RXON_FLG_BAND_24G_MSK;
-		priv->rxon.flags |= RXON_FLG_AUTO_DETECT_MSK;
-		priv->rxon.flags &= ~RXON_FLG_CCK_MSK;
+		rxon->flags &= ~RXON_FLG_SHORT_SLOT_MSK;
+		rxon->flags |= RXON_FLG_BAND_24G_MSK;
+		rxon->flags |= RXON_FLG_AUTO_DETECT_MSK;
+		rxon->flags &= ~RXON_FLG_CCK_MSK;
 	}
 
 	if ((associate->capability & WLAN_CAPABILITY_SHORT_PREAMBLE))
@@ -4241,29 +4358,27 @@ static int ipw_send_associate(struct ipw
 	else
 		priv->rxon.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
 
-	if ((priv->rxon.flags & RXON_FLG_BAND_24G_MSK) &&
+	if ((rxon->flags & RXON_FLG_BAND_24G_MSK) &&
 	    (associate->ieee_mode == IPW_G_MODE)) {
 		if (associate->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
-			priv->rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
+			rxon->flags |= RXON_FLG_SHORT_SLOT_MSK;
 		else
-			priv->rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
+			rxon->flags &= ~RXON_FLG_SHORT_SLOT_MSK;
 
 		if (associate->erp_value & IEEE80211_ERP_USE_PROTECTION)
-			priv->rxon.flags |= RXON_FLG_TGG_PROTECT_MSK;
+			rxon->flags |= RXON_FLG_TGG_PROTECT_MSK;
 		else
-			priv->rxon.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
+			rxon->flags &= ~RXON_FLG_TGG_PROTECT_MSK;
 	}
 
-	priv->rxon.cck_basic_rates =
-	    ((priv->active_rate_basic & 0xF) | R_1M_MSK);
-	priv->rxon.ofdm_basic_rates =
-	    ((priv->active_rate_basic >> 4) | R_6M_MSK);
+	rxon->cck_basic_rates = ((priv->active_rate_basic & 0xF) | R_1M_MSK);
+	rxon->ofdm_basic_rates = ((priv->active_rate_basic >> 4) | R_6M_MSK);
 
 	if ((priv->active_rate_basic & 0xF) == 0)
-		priv->rxon.cck_basic_rates =
+		rxon->cck_basic_rates =
 		    R_1M_MSK | R_2M_MSK | R_5_5M_MSK | R_11M_MSK;
 	if (priv->active_rate_basic >> 4 == 0)
-		priv->rxon.ofdm_basic_rates = R_6M_MSK | R_12M_MSK | R_24M_MSK;
+		rxon->ofdm_basic_rates = R_6M_MSK | R_12M_MSK | R_24M_MSK;
 
 	rc = ipw_rxon_call(priv, 0);
 	if (rc)
@@ -4287,10 +4402,15 @@ static int ipw_send_associate(struct ipw
 		} else {
 			unsigned long flags;
 			spin_lock_irqsave(&priv->lock, flags);
+#if IEEE80211_API_VERSION >= 2
 			rc = ieee80211_tx_frame(priv->ieee,
 						(struct ieee80211_hdr
-						 *)&frame, IEEE80211_3ADDR_LEN,
-						sizeof(frame), 0);
+						 *)&frame, 0, sizeof(frame), 0);
+#else
+			rc = ieee80211_tx_frame(priv->ieee,
+						(struct ieee80211_hdr
+						 *)&frame, sizeof(frame));
+#endif
 			spin_unlock_irqrestore(&priv->lock, flags);
 		}
 	}
@@ -4407,27 +4527,24 @@ static int ipw_send_power_mode(struct ip
 	return rc;
 }
 
-static void ipw_send_supported_rates(struct ipw_priv *priv, struct ipw_supported_rates
-				     *rates)
+static void ipw_set_supported_rates_mask(struct ipw_priv *priv, int rates_mask)
 {
-	int index, i;
-	u8 rate, basic;
+	priv->active_rate = rates_mask & 0xffff;
+	priv->active_rate_basic = (rates_mask >> 16) & 0xffff;
+}
 
-	priv->active_rate = 0;
-	priv->active_rate_basic = 0;
-	for (i = 0; i < rates->num_rates; i++) {
-		rate = rates->supported_rates[i];
-		if (rate & IEEE80211_BASIC_RATE_MASK)
-			basic = 1;
-		else
-			basic = 0;
-		rate &= ~IEEE80211_BASIC_RATE_MASK;
-		index = ipw_rate_ieee2index(rate);
-		if (index != -1) {
-			priv->active_rate |= (1 << index);
-			if (basic == 1)
-				priv->active_rate_basic |= (1 << index);
-		}
+static void ipw_init_rates_mask(struct ipw_priv *priv)
+{
+	priv->rates_mask = 0;
+
+	if (priv->ieee->modulation & IEEE80211_OFDM_MODULATION) {
+		priv->rates_mask |= IEEE80211_OFDM_DEFAULT_RATES_MASK;
+		priv->rates_mask |= IEEE80211_OFDM_BASIC_RATES_MASK << 16;
+	}
+
+	if (priv->ieee->modulation & IEEE80211_CCK_MODULATION) {
+		priv->rates_mask |= IEEE80211_CCK_DEFAULT_RATES_MASK;
+		priv->rates_mask |= IEEE80211_CCK_BASIC_RATES_MASK << 16;
 	}
 }
 
@@ -4476,8 +4593,8 @@ static void ipw_bg_calibrated_work(void 
 		netif_carrier_off(priv->net_dev);
 	}
 
-	init_supported_rates(priv, &priv->rates);
-	ipw_send_supported_rates(priv, &priv->rates);
+	ipw_init_rates_mask(priv);
+	ipw_set_supported_rates_mask(priv, priv->rates_mask);
 
 #ifdef CONFIG_IPW3945_QOS
 	ipw_qos_activate(priv, NULL);
@@ -4761,10 +4878,15 @@ static void ipw_bg_daemon_cmd(void *data
 			break;
 
 		case DAEMON_FRAME_TX:
+#if IEEE80211_API_VERSION >= 2
 			ieee80211_tx_frame(priv->ieee, (struct ieee80211_hdr *)
-					   daemon_cmd->cmd.data,
-					   IEEE80211_3ADDR_LEN,
+					   daemon_cmd->cmd.data, 0,
 					   daemon_cmd->cmd.data_len, 0);
+#else
+			ieee80211_tx_frame(priv->ieee, (struct ieee80211_hdr *)
+					   daemon_cmd->cmd.data,
+					   daemon_cmd->cmd.data_len);
+#endif
 			daemon_cmd->cmd.data_len = 0;
 			spin_lock_irqsave(&priv->daemon_lock, flags);
 			list_add_tail(&daemon_cmd->list,
@@ -7179,208 +7301,151 @@ static int ipw_queue_tx_hcmd(struct ipw_
 	return 0;
 }
 
-static int ipw_is_rate_in_mask(struct ipw_priv *priv, int ieee_mode, u8 rate)
+#define IEEE80211_RATE_INDEX_MASK (0xf)
+#define IEEE80211_RATE_MASKED (1 << 14)
+#define IEEE80211_RATE_INVALID (1 << 13)
+/* Given a modulation (OFDM or CCK), the rate (1,2,5,6,9,11,12,18,24,36,48,54)
+ * and a bit mask, verify that the rate is supported in that bitmask and return
+ * the rate with the IEEE80211_RATE_MASKED bit set or cleared as appropriate */
+#define IEEE80211_RATE_IN_MASK(mod, rate, mask) \
+        case IEEE80211_## mod ##_RATE_## rate ##MB: \
+             return (mask & IEEE80211_## mod ##_RATE_## rate ##MB_MASK) ? \
+                     IEEE80211_## mod ##_RATE_## rate ##MB_INDEX : \
+                     (IEEE80211_RATE_MASKED | \
+                     IEEE80211_## mod ##_RATE_## rate ##MB_INDEX)
+
+static u16 ipw_is_rate_in_mask(struct ipw_priv *priv, u8 rate, u16 mask)
 {
 	rate &= ~IEEE80211_BASIC_RATE_MASK;
-	if (ieee_mode == IEEE_A) {
-		switch (rate) {
-		case IEEE80211_OFDM_RATE_6MB:
-			return priv->
-			    rates_mask & IEEE80211_OFDM_RATE_6MB_MASK ? 1 : 0;
-		case IEEE80211_OFDM_RATE_9MB:
-			return priv->
-			    rates_mask & IEEE80211_OFDM_RATE_9MB_MASK ? 1 : 0;
-		case IEEE80211_OFDM_RATE_12MB:
-			return priv->
-			    rates_mask & IEEE80211_OFDM_RATE_12MB_MASK ? 1 : 0;
-		case IEEE80211_OFDM_RATE_18MB:
-			return priv->
-			    rates_mask & IEEE80211_OFDM_RATE_18MB_MASK ? 1 : 0;
-		case IEEE80211_OFDM_RATE_24MB:
-			return priv->
-			    rates_mask & IEEE80211_OFDM_RATE_24MB_MASK ? 1 : 0;
-		case IEEE80211_OFDM_RATE_36MB:
-			return priv->
-			    rates_mask & IEEE80211_OFDM_RATE_36MB_MASK ? 1 : 0;
-		case IEEE80211_OFDM_RATE_48MB:
-			return priv->
-			    rates_mask & IEEE80211_OFDM_RATE_48MB_MASK ? 1 : 0;
-		case IEEE80211_OFDM_RATE_54MB:
-			return priv->
-			    rates_mask & IEEE80211_OFDM_RATE_54MB_MASK ? 1 : 0;
-		default:
-			return 0;
-		}
-	}
 
-	/* B and G mixed */
 	switch (rate) {
-	case IEEE80211_CCK_RATE_1MB:
-		return priv->rates_mask & IEEE80211_CCK_RATE_1MB_MASK ? 1 : 0;
-	case IEEE80211_CCK_RATE_2MB:
-		return priv->rates_mask & IEEE80211_CCK_RATE_2MB_MASK ? 1 : 0;
-	case IEEE80211_CCK_RATE_5MB:
-		return priv->rates_mask & IEEE80211_CCK_RATE_5MB_MASK ? 1 : 0;
-	case IEEE80211_CCK_RATE_11MB:
-		return priv->rates_mask & IEEE80211_CCK_RATE_11MB_MASK ? 1 : 0;
-	}
-
-	/* If we are limited to B modulations, bail at this point */
-	if (ieee_mode == IEEE_B)
-		return 0;
-	/* G */
-	switch (rate) {
-	case IEEE80211_OFDM_RATE_6MB:
-		return priv->rates_mask & IEEE80211_OFDM_RATE_6MB_MASK ? 1 : 0;
-	case IEEE80211_OFDM_RATE_9MB:
-		return priv->rates_mask & IEEE80211_OFDM_RATE_9MB_MASK ? 1 : 0;
-	case IEEE80211_OFDM_RATE_12MB:
-		return priv->rates_mask & IEEE80211_OFDM_RATE_12MB_MASK ? 1 : 0;
-	case IEEE80211_OFDM_RATE_18MB:
-		return priv->rates_mask & IEEE80211_OFDM_RATE_18MB_MASK ? 1 : 0;
-	case IEEE80211_OFDM_RATE_24MB:
-		return priv->rates_mask & IEEE80211_OFDM_RATE_24MB_MASK ? 1 : 0;
-	case IEEE80211_OFDM_RATE_36MB:
-		return priv->rates_mask & IEEE80211_OFDM_RATE_36MB_MASK ? 1 : 0;
-	case IEEE80211_OFDM_RATE_48MB:
-		return priv->rates_mask & IEEE80211_OFDM_RATE_48MB_MASK ? 1 : 0;
-	case IEEE80211_OFDM_RATE_54MB:
-		return priv->rates_mask & IEEE80211_OFDM_RATE_54MB_MASK ? 1 : 0;
-	}
-
-	return 0;
-}
+		IEEE80211_RATE_IN_MASK(OFDM, 6, mask);
+		IEEE80211_RATE_IN_MASK(OFDM, 9, mask);
+		IEEE80211_RATE_IN_MASK(OFDM, 12, mask);
+		IEEE80211_RATE_IN_MASK(OFDM, 18, mask);
+		IEEE80211_RATE_IN_MASK(OFDM, 24, mask);
+		IEEE80211_RATE_IN_MASK(OFDM, 36, mask);
+		IEEE80211_RATE_IN_MASK(OFDM, 48, mask);
+		IEEE80211_RATE_IN_MASK(OFDM, 54, mask);
+		IEEE80211_RATE_IN_MASK(CCK, 1, mask);
+		IEEE80211_RATE_IN_MASK(CCK, 2, mask);
+		IEEE80211_RATE_IN_MASK(CCK, 5, mask);
+		IEEE80211_RATE_IN_MASK(CCK, 11, mask);
+	}
+
+	return IEEE80211_RATE_INVALID;
+}
+
+static u32 ipw_find_compatible_rates(struct ipw_priv *priv,
+				     const struct ieee80211_network *network,
+				     u16 rates_mask)
+{
+	int bit_index, i;
+	u32 rates = 0;
+
+	/* rates */
+	for (i = 0; i < network->rates_len; i++) {
+		bit_index = ipw_is_rate_in_mask(priv, network->rates[i],
+						rates_mask);
+		if (bit_index & IEEE80211_RATE_INVALID) {
+			IPW_DEBUG_RATE("Invalid rate requested: "
+				       "%02X\n", network->rates[i]);
+			continue;
+		}
 
-static int ipw_compatible_rates(struct ipw_priv *priv, const struct ieee80211_network
-				*network, struct ipw_supported_rates *rates)
-{
-	int num_rates, i;
-	memset(rates, 0, sizeof(*rates));
-	num_rates = min(network->rates_len, (u8) IPW_MAX_RATES);
-	rates->num_rates = 0;
-	for (i = 0; i < num_rates; i++) {
-		if (!ipw_is_rate_in_mask
-		    (priv, network->mode, network->rates[i])) {
+		if (bit_index & IEEE80211_RATE_MASKED) {
+			if (!(network->rates[i] & IEEE80211_BASIC_RATE_MASK)) {
+				IPW_DEBUG_RATE("Rate %02X masked : 0x%08X\n",
+					       network->rates[i], rates_mask);
 
-			if (network->rates[i] & IEEE80211_BASIC_RATE_MASK) {
-				IPW_DEBUG_SCAN
-				    ("Adding masked mandatory "
-				     "rate %02X\n", network->rates[i]);
-				rates->supported_rates[rates->
-						       num_rates++] =
-				    network->rates[i];
 				continue;
 			}
 
-			IPW_DEBUG_SCAN("Rate %02X masked : 0x%08X\n",
-				       network->rates[i], priv->rates_mask);
-			continue;
+			/* Clear out any bits set in the mask that are not
+			 * specific rates (INVALID and MASKED bits) */
+			bit_index &= IEEE80211_RATE_INDEX_MASK;
+
+			IPW_DEBUG_RATE("Adding masked mandatory "
+				       "rate %02X\n", network->rates[i]);
 		}
 
-		rates->supported_rates[rates->num_rates++] = network->rates[i];
+		if (network->rates[i] & IEEE80211_BASIC_RATE_MASK)
+			rates |= (1 << (bit_index + 16));
+
+		rates |= (1 << bit_index);
 	}
 
-	num_rates = min(network->rates_ex_len,
-			(u8) (IPW_MAX_RATES - num_rates));
-	for (i = 0; i < num_rates; i++) {
-		if (!ipw_is_rate_in_mask
-		    (priv, network->mode, network->rates_ex[i])) {
-			if (network->rates_ex[i] & IEEE80211_BASIC_RATE_MASK) {
-				IPW_DEBUG_SCAN
-				    ("Adding masked mandatory "
-				     "rate %02X\n", network->rates_ex[i]);
-				rates->supported_rates[rates->
-						       num_rates++] =
-				    network->rates[i];
+	/* extended rates */
+	for (i = 0; i < network->rates_ex_len; i++) {
+		bit_index = ipw_is_rate_in_mask(priv, network->rates_ex[i],
+						rates_mask);
+		if (bit_index & IEEE80211_RATE_INVALID) {
+			IPW_DEBUG_RATE("Invalid rate requested: "
+				       "%02X\n", network->rates_ex[i]);
+			continue;
+		}
+
+		if (bit_index & IEEE80211_RATE_MASKED) {
+			if (!(network->rates_ex[i] & IEEE80211_BASIC_RATE_MASK)) {
+				IPW_DEBUG_RATE("Rate %02X masked : 0x%08X\n",
+					       network->rates_ex[i],
+					       rates_mask);
+
 				continue;
 			}
 
-			IPW_DEBUG_SCAN("Rate %02X masked : 0x%08X\n",
-				       network->rates_ex[i], priv->rates_mask);
-			continue;
+			bit_index &= ~IEEE80211_RATE_INDEX_MASK;
+
+			IPW_DEBUG_RATE("Adding masked mandatory "
+				       "rate %02X\n", network->rates_ex[i]);
 		}
 
-		rates->supported_rates[rates->num_rates++] =
-		    network->rates_ex[i];
+		if (network->rates_ex[i] & IEEE80211_BASIC_RATE_MASK)
+			rates |= (1 << (bit_index + 16));
+
+		rates |= (1 << bit_index);
 	}
 
-	return 1;
+	return rates;
 }
 
-static inline void ipw_copy_rates(struct ipw_supported_rates *dest, const struct ipw_supported_rates
-				  *src)
+#if 0
+static int ipw_compatible_basic_rates(struct ipw_priv *priv,
+				      struct ieee80211_network *network,
+				      u32 rates_mask)
 {
-	u8 i;
-	for (i = 0; i < src->num_rates; i++)
-		dest->supported_rates[i] = src->supported_rates[i];
-	dest->num_rates = src->num_rates;
-}
-
-/* TODO: Look at sniffed packets in the air to determine if the basic rate
- * mask should ever be used -- right now all callers to add the scan rates are
- * set with the modulation = CCK, so BASIC_RATE_MASK is never set... */
-static void ipw_add_cck_scan_rates(struct ipw_supported_rates
-				   *rates, u8 modulation, u32 rate_mask)
-{
-	u8 basic_mask =
-	    (IEEE80211_OFDM_MODULATION ==
-	     modulation) ? IEEE80211_BASIC_RATE_MASK : 0;
-	if (rate_mask & IEEE80211_CCK_RATE_1MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_1MB;
-	if (rate_mask & IEEE80211_CCK_RATE_2MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_2MB;
-	if (rate_mask & IEEE80211_CCK_RATE_5MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    basic_mask | IEEE80211_CCK_RATE_5MB;
-	if (rate_mask & IEEE80211_CCK_RATE_11MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    basic_mask | IEEE80211_CCK_RATE_11MB;
-}
-
-static void ipw_add_ofdm_scan_rates(struct ipw_supported_rates
-				    *rates, u8 modulation, u32 rate_mask)
-{
-	u8 basic_mask =
-	    (IEEE80211_OFDM_MODULATION ==
-	     modulation) ? IEEE80211_BASIC_RATE_MASK : 0;
-	if (rate_mask & IEEE80211_OFDM_RATE_6MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    basic_mask | IEEE80211_OFDM_RATE_6MB;
-	if (rate_mask & IEEE80211_OFDM_RATE_9MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    IEEE80211_OFDM_RATE_9MB;
-	if (rate_mask & IEEE80211_OFDM_RATE_12MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    basic_mask | IEEE80211_OFDM_RATE_12MB;
-	if (rate_mask & IEEE80211_OFDM_RATE_18MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    IEEE80211_OFDM_RATE_18MB;
-	if (rate_mask & IEEE80211_OFDM_RATE_24MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    basic_mask | IEEE80211_OFDM_RATE_24MB;
-	if (rate_mask & IEEE80211_OFDM_RATE_36MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    IEEE80211_OFDM_RATE_36MB;
-	if (rate_mask & IEEE80211_OFDM_RATE_48MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    IEEE80211_OFDM_RATE_48MB;
-	if (rate_mask & IEEE80211_OFDM_RATE_54MB_MASK)
-		rates->supported_rates[rates->num_rates++] =
-		    IEEE80211_OFDM_RATE_54MB;
+	int i;
+
+	for (i = 0; i < network->rates_len; i++) {
+		if (!(network->rates[i] & IEEE80211_BASIC_RATE_MASK))
+			continue;
+		if (!ipw_is_rate_in_mask(priv, network->rates[i], rates_mask))
+			return 1;
+	}
+
+	for (i = 0; i < network->rates_ex_len; i++) {
+		if (!(network->rates_ex[i] & IEEE80211_BASIC_RATE_MASK))
+			continue;
+		if (!ipw_is_rate_in_mask(priv, network->rates_ex[i],
+					 rates_mask))
+			return 1;
+	}
+
+	return 0;
 }
+#endif
 
 struct ipw_network_match {
 	struct ieee80211_network *network;
-	struct ipw_supported_rates rates;
+	u32 rates_mask;
 };
+
 static int ipw_find_adhoc_network(struct ipw_priv *priv,
 				  struct ipw_network_match *match,
 				  struct ieee80211_network *network,
 				  int roaming)
 {
-	struct ipw_supported_rates rates;
+	u16 rates_mask;
 	/* Verify that this network's capability is compatible with the
 	 * current mode (AdHoc or Infrastructure) */
 	if ((priv->ieee->iw_mode == IW_MODE_ADHOC &&
@@ -7524,10 +7589,10 @@ static int ipw_find_adhoc_network(struct
 				MAC_ARG(network->bssid));
 		return 0;
 	}
-
+#if 0
 	/* Ensure that the rates supported by the driver are compatible with
 	 * this AP, including verification of basic rates (mandatory) */
-	if (!ipw_compatible_rates(priv, network, &rates)) {
+	if (!ipw_compatible_basic_rates(priv, network, priv->rates_mask)) {
 		IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
 				"because configured rate mask excludes "
 				"AP mandatory rate.\n",
@@ -7536,8 +7601,10 @@ static int ipw_find_adhoc_network(struct
 				MAC_ARG(network->bssid));
 		return 0;
 	}
+#endif
 
-	if (rates.num_rates == 0) {
+	rates_mask = ipw_find_compatible_rates(priv, network, priv->rates_mask);
+	if (!rates_mask) {
 		IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
 				"because of no compatible rates.\n",
 				escape_essid(network->ssid,
@@ -7551,7 +7618,7 @@ static int ipw_find_adhoc_network(struct
 	 * should occur within a generic IEEE 802.11 user space tool.  */
 
 	/* Set up 'new' AP to this network */
-	ipw_copy_rates(&match->rates, &rates);
+	match->rates_mask = rates_mask;
 	match->network = network;
 	IPW_DEBUG_MERGE("Network '%s (" MAC_FMT
 			")' is a viable match.\n",
@@ -7607,7 +7674,8 @@ static int ipw_best_network(struct ipw_p
 			    struct ipw_network_match *match,
 			    struct ieee80211_network *network, int roaming)
 {
-	struct ipw_supported_rates rates;
+	u32 rates_mask;
+
 	/* Verify that this network's capability is compatible with the
 	 * current mode (AdHoc or Infrastructure) */
 	if ((priv->ieee->iw_mode == IW_MODE_INFRA &&
@@ -7632,18 +7700,6 @@ static int ipw_best_network(struct ipw_p
 		return 0;
 	}
 
-	/* 802.11h Sanity Checks */
-	if ((ieee80211_get_channel_flags(priv->ieee, network->channel)
-	     & IEEE80211_CH_RADAR_DETECT)
-	    && !(network->capability & WLAN_CAPABILITY_SPECTRUM_MGMT)) {
-		IPW_DEBUG_SCAN("Network '%s (" MAC_FMT ")' "
-			       "is invalid - Spectrum Management mismatch.\n",
-			       escape_essid(network->ssid,
-					    network->ssid_len),
-			       MAC_ARG(network->bssid));
-		return 0;
-	}
-
 	if (network->capability & WLAN_CAPABILITY_SPECTRUM_MGMT) {
 		if ((network->capability & WLAN_CAPABILITY_IBSS) &&
 		    !(network->flags & NETWORK_HAS_IBSS_DFS)) {
@@ -7822,10 +7878,10 @@ static int ipw_best_network(struct ipw_p
 				MAC_ARG(network->bssid));
 		return 0;
 	}
-
+#if 0
 	/* Ensure that the rates supported by the driver are compatible with
 	 * this AP, including verification of basic rates (mandatory) */
-	if (!ipw_compatible_rates(priv, network, &rates)) {
+	if (!ipw_compatible_basic_rates(priv, network, priv->rates_mask)) {
 		IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
 				"because configured rate mask excludes "
 				"AP mandatory rate.\n",
@@ -7834,8 +7890,10 @@ static int ipw_best_network(struct ipw_p
 				MAC_ARG(network->bssid));
 		return 0;
 	}
+#endif
 
-	if (rates.num_rates == 0) {
+	rates_mask = ipw_find_compatible_rates(priv, network, priv->rates_mask);
+	if (!rates_mask) {
 		IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
 				"because of no compatible rates.\n",
 				escape_essid(network->ssid,
@@ -7849,7 +7907,7 @@ static int ipw_best_network(struct ipw_p
 	 * should occur within a generic IEEE 802.11 user space tool.  */
 
 	/* Set up 'new' AP to this network */
-	ipw_copy_rates(&match->rates, &rates);
+	match->rates_mask = rates_mask;
 	match->network = network;
 	IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT
 			")' is a viable match.\n",
@@ -7964,12 +8022,8 @@ static int ipw_adhoc_create(struct ipw_p
 		network->capability |= WLAN_CAPABILITY_SHORT_PREAMBLE;
 	if (priv->capability & CAP_PRIVACY_ON)
 		network->capability |= WLAN_CAPABILITY_PRIVACY;
-	network->rates_len = min(priv->rates.num_rates, MAX_RATES_LENGTH);
-	memcpy(network->rates, priv->rates.supported_rates, network->rates_len);
-	network->rates_ex_len = priv->rates.num_rates - network->rates_len;
-	memcpy(network->rates_ex,
-	       &priv->rates.supported_rates[network->rates_len],
-	       network->rates_ex_len);
+	ipw_fill_network_rates(network, priv->rates_mask);
+
 	network->last_scanned = 0;
 	network->flags = 0;
 	network->last_associate = 0;
@@ -9319,8 +9373,27 @@ static void ipw_auth_work(void *data)
 		if (auth->algorithm == WLAN_AUTH_SHARED_KEY &&
 		    *state <= CMAS_RX_AUTH_SEQ_4) {
 			if (auth->transaction == 2) {
-				struct sk_buff *skb_auth = NULL;
 				struct ieee80211_auth *auth2;
+#if IEEE80211_API_VERSION >= 2
+				BUG_ON(!priv->auth_frame);
+				auth2 = priv->auth_frame;
+				auth2->header.seq_ctl = 0;
+
+				memcpy(auth2->header.addr1, priv->bssid, 6);
+				memcpy(auth2->header.addr2, priv->mac_addr, 6);
+				memcpy(auth2->header.addr3,
+				       priv->ieee->bssid, 6);
+				auth2->algorithm = WLAN_AUTH_SHARED_KEY;
+				auth2->transaction = 3;
+				auth2->status = 0;
+
+				ieee80211_tx_frame(priv->ieee,
+						   (struct ieee80211_hdr *)
+						   priv->auth_frame,
+						   IEEE80211_3ADDR_LEN,
+						   sizeof(*auth2) + 130, 1);
+#else
+				struct sk_buff *skb_auth = NULL;
 				int tx_key =
 				    !(priv->ieee->sec.
 				      flags & SEC_ACTIVE_KEY) ? 0 : priv->ieee->
@@ -9377,13 +9450,14 @@ static void ipw_auth_work(void *data)
 
 				memcpy(priv->auth_frame,
 				       skb_auth->data, skb_auth->len);
+
 				ieee80211_tx_frame(priv->ieee,
 						   (struct ieee80211_hdr *)
 						   priv->auth_frame,
-						   IEEE80211_3ADDR_LEN,
-						   skb_auth->len, 0);
+						   skb_auth->len);
 				dev_kfree_skb_any(skb_auth);
 			      out_fail2:
+#endif
 				spin_unlock_irqrestore(&priv->lock, flags);
 				mutex_unlock(&priv->mutex);
 				return;
@@ -9426,8 +9500,12 @@ static void ipw_auth_work(void *data)
 		if (len) {
 			IPW_DEBUG_11H("Sending %d bytes.\n", len);
 			spin_lock_irqsave(&priv->lock, flags);
-			ieee80211_tx_frame(priv->ieee, &frame->u.frame,
-					   IEEE80211_3ADDR_LEN, len, 0);
+#if IEEE80211_API_VERSION >= 2
+			ieee80211_tx_frame(priv->ieee, &frame->u.frame, 0, len,
+					   0);
+#else
+			ieee80211_tx_frame(priv->ieee, &frame->u.frame, len);
+#endif
 			spin_unlock_irqrestore(&priv->lock, flags);
 		}
 
@@ -9496,9 +9574,11 @@ static int ipw_handle_probe_request(stru
 		IPW_DEBUG_11H("Sending %d bytes.\n", len);
 		out_frame->u.frame.frame_ctl = IEEE80211_FTYPE_MGMT |
 		    IEEE80211_STYPE_PROBE_RESP;
-
-		ieee80211_tx_frame(priv->ieee, &out_frame->u.frame,
-				   IEEE80211_3ADDR_LEN, len, 0);
+#if IEEE80211_API_VERSION >= 2
+		ieee80211_tx_frame(priv->ieee, &out_frame->u.frame, 0, len, 0);
+#else
+		ieee80211_tx_frame(priv->ieee, &out_frame->u.frame, len);
+#endif
 	}
 
 	ipw_free_frame(priv, out_frame);
@@ -9571,8 +9651,7 @@ static int ipw_handle_deauth(struct net_
 	   priv->auth_state = CMAS_INIT;
 
 	   ieee80211_tx_frame(priv->ieee,
-	   		      (struct ieee80211_hdr *)&frame, 
-			      IEEE80211_3ADDR_LEN, sizeof(frame), 0);
+	   (struct ieee80211_hdr *)&frame, sizeof(frame));
 
 	   return 0;
 	 */
@@ -9736,6 +9815,7 @@ static int ipw_handle_assoc_response(str
 	cancel_delayed_work(&priv->associate_timeout);
 
 	priv->assoc_request.assoc_id = resp->aid & 0x3fff;
+	priv->assoc_request.capability = network->capability;
 	queue_work(priv->workqueue, &priv->post_associate);
 #ifdef CONFIG_IPW3945_QOS
 	ipw_qos_association_resp(priv, network);
@@ -9771,7 +9851,7 @@ static int ipw_handle_disassoc(struct ne
 
 static int ipw_associate_network(struct ipw_priv *priv,
 				 struct ieee80211_network *network,
-				 struct ipw_supported_rates *rates, int roaming)
+				 u32 rates_mask, int roaming)
 {
 	int err;
 	unsigned long flags;
@@ -9829,14 +9909,14 @@ static int ipw_associate_network(struct 
 
 	IPW_DEBUG_ASSOC
 	    ("%sssociation attempt [%s]: '%s', channel %d, "
-	     "802.11%c [%d], %s[:%s], enc=%s%s%s%c%c\n",
+	     "802.11%c [%08X], %s[:%s], enc=%s%s%s%c%c\n",
 	     roaming ? "Rea" : "A",
 	     (priv->
 	      capability & WLAN_CAPABILITY_IBSS) ? "IBSS" : "BSS",
 	     escape_essid(priv->essid, priv->essid_len),
 	     network->channel,
 	     ipw_modes[priv->assoc_request.ieee_mode],
-	     rates->num_rates,
+	     rates_mask,
 	     (priv->assoc_request.preamble_length ==
 	      DCT_FLAG_LONG_PREAMBLE) ? "long" : "short",
 	     network->
@@ -9881,9 +9961,8 @@ static int ipw_associate_network(struct 
 	}
 
 	priv->assoc_request.listen_interval = network->listen_interval;
-	rates->ieee_mode = priv->assoc_request.ieee_mode;
-	rates->purpose = IPW_RATE_CONNECT;
-	ipw_send_supported_rates(priv, rates);
+
+	ipw_set_supported_rates_mask(priv, rates_mask);
 
 	/*
 	 * If preemption is enabled, it is possible for the association
@@ -9977,8 +10056,8 @@ static void ipw_roam(void *data)
 	}
 
 	/* Second pass through ROAM process -- request association */
-	ipw_compatible_rates(priv, priv->assoc_network, &match.rates);
-	ipw_associate_network(priv, priv->assoc_network, &match.rates, 1);
+	ipw_find_compatible_rates(priv, priv->assoc_network, match.rates_mask);
+	ipw_associate_network(priv, priv->assoc_network, match.rates_mask, 1);
 	priv->status &= ~STATUS_ROAMING;
 }
 
@@ -10001,7 +10080,7 @@ static int ipw_associate(void *data)
 	struct ipw_network_match match = {
 		.network = NULL
 	};
-	struct ipw_supported_rates *rates;
+	u32 rates_mask;
 	struct list_head *element;
 	unsigned long flags;
 
@@ -10050,7 +10129,7 @@ static int ipw_associate(void *data)
 	list_for_each_entry(network, &priv->ieee->network_list, list)
 	    ipw_best_network(priv, &match, network, 0);
 	network = match.network;
-	rates = &match.rates;
+	rates_mask = match.rates_mask;
 	if (network == NULL &&
 	    priv->ieee->iw_mode == IW_MODE_ADHOC &&
 	    priv->config & CFG_ADHOC_CREATE &&
@@ -10060,7 +10139,7 @@ static int ipw_associate(void *data)
 		element = priv->ieee->network_free_list.next;
 		network = list_entry(element, struct ieee80211_network, list);
 		if (!ipw_adhoc_create(priv, network)) {
-			rates = &priv->rates;
+			rates_mask = priv->rates_mask;
 			list_del(element);
 			list_add_tail(&network->list,
 				      &priv->ieee->network_list);
@@ -10077,7 +10156,7 @@ static int ipw_associate(void *data)
 		return 0;
 	}
 
-	ipw_associate_network(priv, network, rates, 0);
+	ipw_associate_network(priv, network, rates_mask, 0);
 	return 1;
 }
 
@@ -11853,7 +11932,7 @@ static int ipw_wx_get_range(struct net_d
 	struct ipw_priv *priv = ieee80211_priv(dev);
 	struct iw_range *range = (struct iw_range *)extra;
 	const struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee);
-	int i = 0, j;
+	int i = 0, j, mask;
 
 	if (!ipw_is_ready(priv))
 		return -EAGAIN;
@@ -11873,10 +11952,16 @@ static int ipw_wx_get_range(struct net_d
 	range->avg_qual.noise = 0;
 	range->avg_qual.updated = 7;	/* Updated all three */
 	mutex_lock(&priv->mutex);
-	range->num_bitrates = min(priv->rates.num_rates, (u8) IW_MAX_BITRATES);
-	for (i = 0; i < range->num_bitrates; i++)
-		range->bitrate[i] =
-		    (priv->rates.supported_rates[i] & 0x7F) * 500000;
+
+	j = 0;
+	for (i = 0, mask = 1; i < IPW_MAX_RATES; i++, mask <<= 1) {
+		if (!(priv->active_rate & mask))
+			continue;
+		range->bitrate[i] = ipw_index_to_rate(i) * 500000;
+		j++;
+	}
+	range->num_bitrates = j;
+
 	range->max_rts = MAX_RTS_THRESHOLD;
 	range->min_frag = MIN_FRAG_THRESHOLD;
 	range->max_frag = MAX_FRAG_THRESHOLD;
@@ -12117,8 +12202,7 @@ static int ipw_wx_set_rate(struct net_de
 	struct ipw_priv *priv = ieee80211_priv(dev);
 	u32 target_rate = wrqu->bitrate.value;
 	u32 fixed, mask;
-	int ret = 0, rc = -1;
-	struct ipw_supported_rates rates;
+	int rc = -1;
 
 	if (!ipw_is_ready(priv))
 		return -EAGAIN;
@@ -12194,7 +12278,7 @@ static int ipw_wx_set_rate(struct net_de
 		priv->config &= ~CFG_FIXED_RATE;
 	else
 		priv->config |= CFG_FIXED_RATE;
-	if (priv->rates_mask == mask) {
+	if ((priv->rates_mask & 0xffff) == mask) {
 		IPW_DEBUG_WX("Mask set to current mask.\n");
 		mutex_unlock(&priv->mutex);
 		return 0;
@@ -12206,11 +12290,14 @@ static int ipw_wx_set_rate(struct net_de
 		unsigned long flags;
 
 		spin_lock_irqsave(&priv->ieee->lock, flags);
-		ret = ipw_compatible_rates(priv, priv->assoc_network, &rates);
+		mask =
+		    ipw_find_compatible_rates(priv, priv->assoc_network,
+					      priv->rates_mask);
 		spin_unlock_irqrestore(&priv->ieee->lock, flags);
 	}
-	if ((ret) && (rates.num_rates != 0)) {
-		ipw_send_supported_rates(priv, &rates);
+
+	if (mask) {
+		ipw_set_supported_rates_mask(priv, mask);
 		priv->rxon.cck_basic_rates =
 		    ((priv->active_rate_basic & 0xF) | R_1M_MSK);
 		priv->rxon.ofdm_basic_rates =
@@ -12224,8 +12311,8 @@ static int ipw_wx_set_rate(struct net_de
 			    R_6M_MSK | R_12M_MSK | R_24M_MSK;
 
 		rc = ipw_rxon_call(priv, 1);
-
 	}
+
 	if (rc) {
 		/* Network configuration changed -- force [re]association */
 		IPW_DEBUG_ASSOC
@@ -13113,13 +13200,18 @@ static int ipw_wx_set_wireless_mode(stru
 	priv->ieee->mode = mode;
 	priv->ieee->freq_band = band;
 	priv->ieee->modulation = modulation;
-	init_supported_rates(priv, &priv->rates);
+
+	ipw_init_rates_mask(priv);
+	ipw_set_supported_rates_mask(priv, priv->rates_mask);
+
+	IPW_DEBUG_INFO("ASSOC REQ: Rates: %08X %08X %08X\n",
+		       priv->rates_mask,
+		       priv->active_rate, priv->active_rate_basic);
+
 	/* Network configuration changed -- force [re]association */
 	IPW_DEBUG_ASSOC("[re]association triggered due to mode change.\n");
-	if (!ipw_disassociate(priv)) {
-		ipw_send_supported_rates(priv, &priv->rates);
+	if (!ipw_disassociate(priv))
 		ipw_associate(priv);
-	}
 
 	IPW_DEBUG_WX("PRIV SET MODE: %c%c%c\n",
 		     mode & IEEE_A ? 'a' : '.',
@@ -15435,43 +15527,6 @@ static void shim__set_security(struct ne
 	mutex_unlock(&priv->mutex);
 }
 
-static int init_supported_rates(struct ipw_priv *priv,
-				struct ipw_supported_rates *rates)
-{
-	/* TODO: Mask out rates based on priv->rates_mask */
-
-	memset(rates, 0, sizeof(*rates));
-	/* configure supported rates */
-	switch (priv->ieee->freq_band) {
-	case IEEE80211_52GHZ_BAND:
-		rates->ieee_mode = IPW_A_MODE;
-		rates->purpose = IPW_RATE_CAPABILITIES;
-		ipw_add_ofdm_scan_rates(rates,
-					IEEE80211_OFDM_MODULATION,
-					IEEE80211_OFDM_DEFAULT_RATES_MASK);
-		break;
-	default:		/* Mixed or 2.4Ghz */
-		rates->ieee_mode = IPW_G_MODE;
-		rates->purpose = IPW_RATE_CAPABILITIES;
-		ipw_add_cck_scan_rates(rates,
-				       IEEE80211_CCK_MODULATION,
-				       IEEE80211_CCK_DEFAULT_RATES_MASK);
-		if (priv->ieee->modulation & IEEE80211_OFDM_MODULATION) {
-			u8 modulation = IEEE80211_CCK_MODULATION;
-
-			if (!
-			    (priv->ieee->modulation & IEEE80211_CCK_MODULATION))
-				modulation = IEEE80211_OFDM_MODULATION;
-
-			ipw_add_ofdm_scan_rates(rates, modulation,
-						IEEE80211_OFDM_DEFAULT_RATES_MASK);
-		}
-		break;
-	}
-
-	return 0;
-}
-
 /*
   Power management (not Tx power!) functions
 */
@@ -15646,11 +15701,14 @@ static int ipw_card_remove_notify(struct
   call registered function about change in current network
   beacon
 */
-static int ipw_card_bss_active_changed_notify(struct ipw_priv *priv, struct ieee80211_network
-					      *network)
+static int ipw_card_bss_active_changed_notify(struct ipw_priv *priv,
+					      struct ieee80211_network *network)
 {
 	int rc = 0;
 	u8 period = 0;
+	struct daemon_rx_config rxon;
+
+	memcpy(&rxon, &priv->rxon, sizeof(rxon));
 
 	if (network != NULL)
 		period = network->tim.tim_period;
@@ -15663,6 +15721,29 @@ static int ipw_card_bss_active_changed_n
 		else
 			priv->power_data.active_index = IPW_POWER_RANGE_1;
 	}
+
+	if (network->capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
+		priv->rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
+	else
+		priv->rxon.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
+
+	if (priv->assoc_request.ieee_mode == IPW_G_MODE) {
+		if (network->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
+			priv->rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
+		else
+			priv->rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
+
+		if (network->erp_value & IEEE80211_ERP_USE_PROTECTION)
+			priv->rxon.flags |= RXON_FLG_TGG_PROTECT_MSK;
+		else
+			priv->rxon.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
+	}
+
+	if (memcmp(&rxon, &priv->rxon, sizeof(rxon))) {
+		IPW_DEBUG_INFO("rxon changed\n");
+		ipw_rxon_assoc_async(priv);
+	}
+
 	return rc;
 }
 
@@ -16265,7 +16346,9 @@ static int ipw_pci_probe(struct pci_dev 
 		goto out_destroy_workqueue;
 	}
 
-	priv->rates_mask = IEEE80211_DEFAULT_RATES_MASK;
+	priv->rates_mask = IEEE80211_DEFAULT_RATES_MASK |
+	    (IEEE80211_OFDM_BASIC_RATES_MASK |
+	     IEEE80211_CCK_BASIC_RATES_MASK) << 16;
 	priv->missed_beacon_threshold = IPW_MB_DISASSOCIATE_THRESHOLD_DEFAULT;
 	priv->roaming_threshold = IPW_MB_ROAMING_THRESHOLD_DEFAULT;
 	priv->rts_threshold = DEFAULT_RTS_THRESHOLD;
--- linux-2.6.17.noarch/drivers/net/wireless/ipw3945.h.orig	2006-08-03 14:15:53.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/wireless/ipw3945.h	2006-08-03 14:15:53.000000000 -0400
@@ -1752,14 +1752,6 @@ struct ipw_rx_queue {
 	spinlock_t lock;
 };				/* Not transferred over network, so not  __attribute__ ((packed)) */
 
-#define IPW_SUPPORTED_RATES_IE_LEN         8
-#define IPW_MAX_RATES                     12
-
-struct ipw_rates {
-	u8 num_rates;
-	u8 rates[IPW_MAX_RATES];
-} __attribute__ ((packed));
-
 struct ipw_multicast_addr {
 	u8 num_of_multicast_addresses;
 	u8 reserved[3];
@@ -1801,6 +1793,9 @@ struct ipw_associate {
 	u8 erp_value;
 } __attribute__ ((packed));
 
+#define IPW_SUPPORTED_RATES_IE_LEN         8
+#define IPW_MAX_RATES                     12
+
 struct ipw_supported_rates {
 	u8 ieee_mode;
 	u8 num_rates;
@@ -2178,6 +2173,8 @@ struct ipw_priv {
 	struct ipw_activity_blink activity;
 	unsigned long led_packets;
 	int led_state;
+
+	u32 rates_mask;
 	u16 active_rate;
 	u16 active_rate_basic;
 
@@ -2215,15 +2212,13 @@ struct ipw_priv {
 	struct ipw_associate assoc_request;
 	struct ieee80211_network *assoc_network;
 
-	struct ipw_supported_rates rates;
-
 	struct ipw_notif_statistics statistics;
 
 	/* context information */
 	u8 essid[IW_ESSID_MAX_SIZE];
 	u8 essid_len;
 	u8 nick[IW_ESSID_MAX_SIZE];
-	u16 rates_mask;
+
 	u8 channel;
 	u32 power_mode;
 	u32 antenna;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519
retrieving revision 1.2519.2.1
diff -u -r1.2519 -r1.2519.2.1
--- kernel-2.6.spec	3 Aug 2006 17:51:29 -0000	1.2519
+++ kernel-2.6.spec	3 Aug 2006 18:48:54 -0000	1.2519.2.1
@@ -31,7 +31,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.jwltest.4
 %define signmodules 0
 %define xen_hv_cset 10730
 %define make_target bzImage
@@ -365,6 +365,10 @@
 Patch1203: linux-2.6-NFSD-badness.patch
 
 # NIC driver updates
+Patch1300: jwltest-ipw3945-1_0_5.patch
+Patch1301: jwltest-ipw3945-1_1_0.patch
+Patch1302: jwltest-e1000-7_1_6.patch
+Patch1303: jwltest-e1000-7_1_9-k4.patch
 
 # Filesystem stuff.
 # Squashfs
@@ -881,6 +885,14 @@
 %patch1203 -p1
 
 # NIC driver fixes.
+# ipw3945 1.0.5
+%patch1300 -p1
+# ipw3945 1.1.0
+%patch1301 -p1
+# e1000 7.1.6
+%patch1302 -p1
+# e1000 7.1.9-k4
+%patch1303 -p1
 
 # Filesystem patches.
 # Squashfs



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:53:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:53:24 -0400
Subject: rpms/thunderbird/devel thunderbird-mimeeobj-externalc.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 thunderbird.spec, 1.76, 1.77
Message-ID: <200608031853.k73IrOhd005709@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5617

Modified Files:
	.cvsignore thunderbird.spec 
Added Files:
	thunderbird-mimeeobj-externalc.patch 
Log Message:
* Thu Aug  3 2006 Kai Engert <kengert at redhat.com> - 1.5.0.5-4
- Fix a build failure in mailnews mime code.


thunderbird-mimeeobj-externalc.patch:
 mimeeobj.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE thunderbird-mimeeobj-externalc.patch ---
--- mozilla/mailnews/mime/src/mimeeobj.h.preextc	2006-08-03 17:04:10.000000000 +0200
+++ mozilla/mailnews/mime/src/mimeeobj.h	2006-08-03 17:05:42.000000000 +0200
@@ -54,7 +54,7 @@
   MimeLeafClass leaf;
 };
 
-extern MimeExternalObjectClass mimeExternalObjectClass;
+extern "C" MimeExternalObjectClass mimeExternalObjectClass;
 
 struct MimeExternalObject {
   MimeLeaf leaf;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	12 Jun 2006 23:26:02 -0000	1.12
+++ .cvsignore	3 Aug 2006 18:53:22 -0000	1.13
@@ -1,2 +1,2 @@
-thunderbird-1.5.0.4-source.tar.bz2
-thunderbird-langpacks-1.5.0.4-20060612.tar.bz2
+thunderbird-1.5.0.5-source.tar.bz2
+thunderbird-langpacks-1.5.0.5-20060726.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- thunderbird.spec	1 Aug 2006 15:57:45 -0000	1.76
+++ thunderbird.spec	3 Aug 2006 18:53:22 -0000	1.77
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	1.5.0.5
-Release:	3
+Release:	4
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -34,6 +34,7 @@
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         firefox-1.1-visibility.patch
 Patch6:         firefox-1.1-nss-system-nspr.patch
+Patch7:         thunderbird-mimeeobj-externalc.patch
 
 Patch10:        thunderbird-0.7.3-psfonts.patch
 Patch11:        thunderbird-0.7.3-gnome-uriloader.patch
@@ -94,6 +95,7 @@
 %endif
 
 %patch6 -p1
+%patch7 -p1
 %patch10 -p1 -b .psfonts
 %patch11 -p1 -b .gnome-uriloader
 %patch24 -p1
@@ -212,6 +214,9 @@
 #===============================================================================
 
 %changelog
+* Thu Aug  3 2006 Kai Engert <kengert at redhat.com> - 1.5.0.5-4
+- Fix a build failure in mailnews mime code.
+
 * Tue Aug  1 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.5-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:55:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:55:51 -0400
Subject: rpms/zenity/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 zenity.spec,
	1.12, 1.13
Message-ID: <200608031855.k73Itpci006683@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/zenity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6634

Modified Files:
	.cvsignore sources zenity.spec 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 May 2006 17:56:37 -0000	1.5
+++ .cvsignore	3 Aug 2006 18:55:48 -0000	1.6
@@ -1 +1 @@
-zenity-2.15.2.tar.bz2
+zenity-2.15.90.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 May 2006 17:56:37 -0000	1.5
+++ sources	3 Aug 2006 18:55:49 -0000	1.6
@@ -1 +1 @@
-2ed3ebf98e37f321a9ea0fa86602d849  zenity-2.15.2.tar.bz2
+01ba5b78e7b9c09de1d7a391f3c62fa0  zenity-2.15.90.tar.bz2


Index: zenity.spec
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- zenity.spec	12 Jul 2006 19:21:39 -0000	1.12
+++ zenity.spec	3 Aug 2006 18:55:49 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           zenity
-Version:        2.15.2
-Release:        4
+Version:        2.15.90
+Release:        1%{?dist}
 Summary: 	Display dialog boxes from shell scripts
 Group:  	Applications/System 
 License:        GPL
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.2-4
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 18:56:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 14:56:36 -0400
Subject: rpms/emacs/devel emacs.spec, 1.74, 1.75 lang-coding-systems-init.el,
	1.6, 1.7
Message-ID: <200608031856.k73IuaLS006977@cvs.devel.redhat.com>

Author: coldwell

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6947

Modified Files:
	emacs.spec lang-coding-systems-init.el 
Log Message:
use UTF-8 keyboard input encoding on terminals that support it (Axel Thimm #185399)


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- emacs.spec	3 Aug 2006 15:45:08 -0000	1.74
+++ emacs.spec	3 Aug 2006 18:56:33 -0000	1.75
@@ -9,7 +9,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 16
+Release: 17
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -553,6 +553,9 @@
 %endif
 
 %changelog
+* Thu Aug  3 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-17
+- use UTF-8 keyboard input encoding on terminals that support it (Axel Thimm #185399)
+
 * Thu Aug  3 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-16
 - fix German spell checking for UTF-8 encoded buffers (Daniel Hammer #197737)
 


Index: lang-coding-systems-init.el
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/lang-coding-systems-init.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lang-coding-systems-init.el	25 Nov 2005 09:04:10 -0000	1.6
+++ lang-coding-systems-init.el	3 Aug 2006 18:56:33 -0000	1.7
@@ -23,8 +23,8 @@
 	 (set-default-coding-systems 'utf-8)
 	 (set-terminal-coding-system 'utf-8)
 	 (let ((term (getenv "TERM")))
-	   (when (or (equal term "linux")
-		     (equal term "xterm"))
+	   (when (or (string-match "^linux" term)
+		     (string-match "^xterm" term))
 	     (set-keyboard-coding-system 'utf-8))))
 	((equal lang "ja")
 	 (set-default-coding-systems 'euc-jp)



From fedora-cvs-commits at redhat.com  Thu Aug  3 19:09:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 15:09:41 -0400
Subject: rpms/firefox/FC-5 .cvsignore, 1.23, 1.24 firefox.spec, 1.117,
	1.118 sources, 1.28, 1.29
Message-ID: <200608031909.k73J9fUt009577@cvs.devel.redhat.com>

Author: kengert

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

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Thu Aug 03 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-1.1.fc5
- Update to 1.5.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	12 Jun 2006 22:12:45 -0000	1.23
+++ .cvsignore	3 Aug 2006 19:09:38 -0000	1.24
@@ -1,2 +1,2 @@
-firefox-1.5.0.4-source.tar.bz2
-firefox-langpacks-1.5.0.4-20060612.tar.bz2
+firefox-1.5.0.6-source.tar.bz2
+firefox-langpacks-1.5.0.6-20060803.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/firefox.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- firefox.spec	27 Jul 2006 18:20:13 -0000	1.117
+++ firefox.spec	3 Aug 2006 19:09:38 -0000	1.118
@@ -8,7 +8,7 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.5.0.5
+Version:        1.5.0.6
 Release:        1.1.fc5
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
@@ -19,7 +19,7 @@
 %define tarball firefox-1.5rc3-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source2:        firefox-langpacks-%{version}-20060726.tar.bz2
+Source2:        firefox-langpacks-%{version}-20060803.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html
@@ -271,6 +271,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Aug 03 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-1.1.fc5
+- Update to 1.5.0.6
+
 * Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-1.1.fc5
 - Update to 1.5.0.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	27 Jul 2006 18:20:13 -0000	1.28
+++ sources	3 Aug 2006 19:09:38 -0000	1.29
@@ -1,2 +1,2 @@
-4ef41c8983c47c36efada10a867ffa6f  firefox-1.5.0.5-source.tar.bz2
-b7021e012b02a745e73e51e05308cd49  firefox-langpacks-1.5.0.5-20060726.tar.bz2
+3a659d384744cab77f90920f6d529c89  firefox-1.5.0.6-source.tar.bz2
+a040d41c7c6e6466d60b12f61a54268a  firefox-langpacks-1.5.0.6-20060803.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 19:22:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 15:22:09 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2519.2.1,
	1.2519.2.2 jwltest-e1000-7_1_6.patch, 1.1.6.1,
	NONE jwltest-e1000-7_1_9-k4.patch, 1.1.4.1, NONE
Message-ID: <200608031922.k73JM9wq028705@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc6-4-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-jwltest-fc6-4-branch
	jwltest-e1000-7_1_6.patch jwltest-e1000-7_1_9-k4.patch 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.2.1
retrieving revision 1.2519.2.2
diff -u -r1.2519.2.1 -r1.2519.2.2
--- kernel-2.6.spec	3 Aug 2006 18:48:54 -0000	1.2519.2.1
+++ kernel-2.6.spec	3 Aug 2006 19:22:06 -0000	1.2519.2.2
@@ -367,8 +367,6 @@
 # NIC driver updates
 Patch1300: jwltest-ipw3945-1_0_5.patch
 Patch1301: jwltest-ipw3945-1_1_0.patch
-Patch1302: jwltest-e1000-7_1_6.patch
-Patch1303: jwltest-e1000-7_1_9-k4.patch
 
 # Filesystem stuff.
 # Squashfs
@@ -889,10 +887,6 @@
 %patch1300 -p1
 # ipw3945 1.1.0
 %patch1301 -p1
-# e1000 7.1.6
-%patch1302 -p1
-# e1000 7.1.9-k4
-%patch1303 -p1
 
 # Filesystem patches.
 # Squashfs


--- jwltest-e1000-7_1_6.patch DELETED ---


--- jwltest-e1000-7_1_9-k4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 19:32:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 15:32:11 -0400
Subject: rpms/gnome-volume-manager/devel .cvsignore, 1.19,
	1.20 gnome-volume-manager-1.5.11-rh-defaults.patch, 1.1,
	1.2 gnome-volume-manager.spec, 1.47, 1.48 sources, 1.19, 1.20
Message-ID: <200608031932.k73JWBCx032114@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32055

Modified Files:
	.cvsignore gnome-volume-manager-1.5.11-rh-defaults.patch 
	gnome-volume-manager.spec sources 
Log Message:
- Update to 2.15.0
- Add dist tag to release
- Fix defaults to run the autophoto program when a camera is inserted



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Mar 2006 20:07:16 -0000	1.19
+++ .cvsignore	3 Aug 2006 19:32:06 -0000	1.20
@@ -1 +1,2 @@
 gnome-volume-manager-1.5.15.tar.bz2
+gnome-volume-manager-2.15.0.tar.bz2

gnome-volume-manager-1.5.11-rh-defaults.patch:
 gnome-volume-manager.schemas.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Index: gnome-volume-manager-1.5.11-rh-defaults.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager-1.5.11-rh-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-volume-manager-1.5.11-rh-defaults.patch	13 Feb 2006 16:17:03 -0000	1.1
+++ gnome-volume-manager-1.5.11-rh-defaults.patch	3 Aug 2006 19:32:06 -0000	1.2
@@ -1,6 +1,15 @@
---- gnome-volume-manager-1.5.11/gnome-volume-manager.schemas.in.rh-defaults	2006-01-09 14:16:42.000000000 -0500
-+++ gnome-volume-manager-1.5.11/gnome-volume-manager.schemas.in	2006-02-13 11:15:14.000000000 -0500
-@@ -180,7 +180,7 @@
+--- gnome-volume-manager-2.15.0/gnome-volume-manager.schemas.in.rh-defaults	2006-07-20 16:48:23.000000000 -0400
++++ gnome-volume-manager-2.15.0/gnome-volume-manager.schemas.in	2006-08-03 15:27:25.000000000 -0400
+@@ -189,7 +189,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autophoto</key>
+ 	<applyto>/desktop/gnome/volume_manager/autophoto</applyto>
+ 	<type>bool</type>
+-	<default>false</default>
++	<default>true</default>
+ 	<locale name="C">
+ 	  <short>Run photo management command</short>
+ 	  <long>Whether, when a digital camera is connected or media from a
+@@ -202,7 +202,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
  	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
  	<type>string</type>
@@ -9,7 +18,7 @@
  	<locale name="C">
  	  <short>Photo management command</short>
  	  <long>Command to run when a digital camera is connected or media 
-@@ -215,7 +215,7 @@
+@@ -237,7 +237,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoprinter</key>
  	<applyto>/desktop/gnome/volume_manager/autoprinter</applyto>
  	<type>bool</type>
@@ -18,7 +27,7 @@
  	<locale name="C">
  	  <short>Run printer program</short>
  	  <long>Whether, when a printer is connected, gnome-volume-manager should run
-@@ -227,7 +227,7 @@
+@@ -249,7 +249,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoprinter_command</key>
  	<applyto>/desktop/gnome/volume_manager/autoprinter_command</applyto>
  	<type>string</type>


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnome-volume-manager.spec	19 Jul 2006 18:40:47 -0000	1.47
+++ gnome-volume-manager.spec	3 Aug 2006 19:32:06 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
-Version: 1.5.15
-Release: 4 
+Version: 2.15.0
+Release: 1%{?dist} 
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -84,6 +84,11 @@
 %{_datadir}/gnome/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Thu Aug 03 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.0-1
+- Update to 2.15.0
+- Add dist tag to release
+- Fix defaults to run the autophoto program when a camera is inserted
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 1.5.15-4
 - Add BR for dbus-glib-devel
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Mar 2006 20:07:16 -0000	1.19
+++ sources	3 Aug 2006 19:32:06 -0000	1.20
@@ -1 +1 @@
-0bf3ee007c951a5d833a3c17bbe59ec6  gnome-volume-manager-1.5.15.tar.bz2
+d723bc2069fd19cf1c31961fbc1cf3c8  gnome-volume-manager-2.15.0.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 19:42:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 15:42:00 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.35, 1.36 gnome-vfs2.spec, 1.124,
	1.125 sources, 1.36, 1.37
Message-ID: <200608031942.k73Jg0bP002275@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	12 Jul 2006 15:05:12 -0000	1.35
+++ .cvsignore	3 Aug 2006 19:41:57 -0000	1.36
@@ -1,2 +1 @@
-gnome-vfs-2.15.3.tar.bz2
-gnome-vfs-monikers-2.15.3.tar.bz2
+gnome-vfs-2.15.90.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- gnome-vfs2.spec	27 Jul 2006 22:42:17 -0000	1.124
+++ gnome-vfs2.spec	3 Aug 2006 19:41:57 -0000	1.125
@@ -12,8 +12,8 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.15.3
-Release: 7
+Version: 2.15.90
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -59,8 +59,6 @@
 
 Patch4:  gnome-vfs-2.15.1-use-sys-inotify.patch
 
-Patch5: gnome-vfs-2.15.3-dbus-deprecated.patch
-
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -102,8 +100,6 @@
 
 %patch4 -p1 -b .use-sys-inotify
 
-%patch5 -p1 -b .dbus-deprecated
-
 # send to upstream
 %patch101 -p1 -b .schema_about
 
@@ -194,6 +190,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-7
 - Disable gtk-doc to fix multilib conflicts
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	19 Jul 2006 01:57:56 -0000	1.36
+++ sources	3 Aug 2006 19:41:57 -0000	1.37
@@ -1 +1 @@
-f7eb8f2c658d6c8dfc34b5a2161e6890  gnome-vfs-2.15.3.tar.bz2
+5922610d181ec7a8b35aeb826dbe107d  gnome-vfs-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 19:44:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 15:44:15 -0400
Subject: rpms/libgtop2/devel .cvsignore, 1.25, 1.26 libgtop2.spec, 1.36,
	1.37 sources, 1.25, 1.26
Message-ID: <200608031944.k73JiFHQ003192@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgtop2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3145

Modified Files:
	.cvsignore libgtop2.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	10 Apr 2006 17:22:33 -0000	1.25
+++ .cvsignore	3 Aug 2006 19:44:12 -0000	1.26
@@ -1,19 +1 @@
-libgtop-2.7.92.tar.bz2
-libgtop-2.8.0.tar.bz2
-libgtop-2.9.90.tar.bz2
-libgtop-2.9.91.tar.bz2
-libgtop-2.9.92.tar.bz2
-libgtop-2.10.0.tar.bz2
-libgtop-2.10.1.tar.bz2
-libgtop-2.11.1.tar.bz2
-libgtop-2.11.90.tar.bz2
-libgtop-2.11.91.tar.bz2
-libgtop-2.12.0.tar.bz2
-libgtop-2.12.2.tar.bz2
-libgtop-2.13.0.tar.bz2
-libgtop-2.13.1.tar.bz2
-libgtop-2.13.2.tar.bz2
-libgtop-2.13.3.tar.bz2
-libgtop-2.13.92.tar.bz2
-libgtop-2.14.0.tar.bz2
-libgtop-2.14.1.tar.bz2
+libgtop-2.14.2.tar.bz2


Index: libgtop2.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libgtop2.spec	13 Jul 2006 20:38:10 -0000	1.36
+++ libgtop2.spec	3 Aug 2006 19:44:12 -0000	1.37
@@ -6,8 +6,8 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.14.1
-Release: 	4
+Version: 	2.14.2
+Release: 	1%{?dist}
 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
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1.fc6
+- Update to 2.14.2
+
 * Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 2.14.1-4
 - rebuild
 - add missing br libtool gettext


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	10 Apr 2006 17:22:33 -0000	1.25
+++ sources	3 Aug 2006 19:44:12 -0000	1.26
@@ -1 +1 @@
-59cc661ae518fcae158517cc029b2add  libgtop-2.14.1.tar.bz2
+adcc07c6d1c115c6d275a3c9bb1f3b68  libgtop-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 19:51:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 15:51:58 -0400
Subject: rpms/werken-xpath/devel werken-xpath.spec,1.2,1.3
Message-ID: <200608031951.k73JpwQV020945@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/werken-xpath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20876

Modified Files:
	werken-xpath.spec 
Log Message:
Remove define gcj_support and rebuild




Index: werken-xpath.spec
===================================================================
RCS file: /cvs/dist/rpms/werken-xpath/devel/werken-xpath.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- werken-xpath.spec	25 Jul 2006 21:19:22 -0000	1.2
+++ werken-xpath.spec	3 Aug 2006 19:51:56 -0000	1.3
@@ -28,8 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _gcj_support 1
-
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define dotname werken.xpath
@@ -38,7 +36,7 @@
 
 Name:           werken-xpath
 Version:        0.9.4
-Release:        0.beta.11jpp_1fc
+Release:        0.beta.11jpp_2fc
 Epoch:          0
 Summary:        XPath implementation using JDOM
 License:        Apache Software License-like
@@ -195,6 +193,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 03 2006 Fernando Nasser <fnasser at redhat.com> 0:0.9.4-0.beta.11jpp_2fc
+- Remove define gcj_support and rebuild
+
 * Tue Jul 25 2006 Fernando Nasser <fnasser at redhat.com> 0:0.9.4-0.beta.11jpp_1fc
 - Merge with upstream
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 19:56:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 15:56:18 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.146,1.147
Message-ID: <200608031956.k73JuImI022559@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Log Message:
- Remove evo-calendar-print-with-pango-7.patch (fixed upstream).
- Remove patch for RH bug #150458 (fixed upstream).
- Clean up spec file, renumber patches.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- evolution.spec	3 Aug 2006 00:18:25 -0000	1.146
+++ evolution.spec	3 Aug 2006 19:56:16 -0000	1.147
@@ -37,91 +37,73 @@
 
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
+### Abstract ###
+
 Name: evolution
 Version: 2.6.3
-Release: 1.fc5.2
+Release: 1.fc5.3
 License: GPL
+Group: Applications/Productivity
+Summary: GNOME's next-generation groupware suite
+URL: http://www.gnome.org/projects/evolution/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-URL: http://www.ximian.com/
-Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/2.1/%{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
 
-# patches pulled from upstream CVS
+# Removed to placate the build system.
+# Feel free to try to re-add it, but, wash your dog first.
+ExcludeArch: s390 s390x
 
-# Red Hat Linux specific patches
-#Patch11: evolution-1.3.2-redhatify.patch
+### Patches ###
 
-# db3 starts using POSIX/thread/library for mutexes with nptl otherwise :/
-#Patch99: db3-dont-use-pthread.patch
 # bad hack
-Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
-
-# patches sent upstream
-Patch100: evo-addressbook-print-with-pango-2.patch
-Patch101: evo-calendar-print-with-pango-7.patch
+Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
 
 # Fix for RH bug #154360:
-Patch106: evolution-2.5.5.1-commit-enter-on-calendar.patch
+Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch
 
 # Move autosave file
-Patch107: evolution-2.5.4-move-autosave-file.patch
-
-# Fix for RH bug 150458:
-Patch108: evolution-2.3.5.1-fix-150458.patch
+Patch12: evolution-2.5.4-move-autosave-file.patch
 
 # Fix for RH bug 164957 (was for 145552):
-Patch109: evolution-2.0.2-fix-145552.patch
+Patch13: evolution-2.0.2-fix-145552.patch
 
 # Part of RH bug 170799:
-Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch
-
-# not accepted, but proposed on a few occasions.  fixes problems with
-# some cyrus servers
-#Patch200: evolution-1.4.5-imap-command-length.patch
-
-# this was rejected due to adding a dependency on DISPLAY for 
-# evolution-wombat but it does work to fix the problem
-#Patch500: evolution-wombat-sm.patch
+Patch14: evolution-2.4.1-hide-switcher-buttons-by-default.patch
 
-# This was added upstream in 1.5.93, with configure-time detection
-#Patch700: evolution-1.5.9.1-filechooser.patch
-
-# Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams):
-# Patch800: evolution-2.5.4-fix-conduits.patch
+# Patches for conduits, based upon
+# rh-161817-attach-116019-conduit_pilot_link_updates.diff
+# (the latter patch was originally by Mark G. Adams):
+# Patch15: evolution-2.5.4-fix-conduits.patch
 
 # Move .conduit files from share to lib (for the sake of multilib)
-Patch802: evolution-2.5.4-fix-conduit-dir.patch
-
-# Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools):
-Patch803: evolution-2.6.2-no-gnome-common.patch
+Patch16: evolution-2.5.4-fix-conduit-dir.patch
 
-Patch804: evolution-2.4.1-fix-missing-declarations.patch
-Patch805: evolution-2.5.4-fix-missing-declarations.patch
-Patch806: evolution-2.5.5.1-notification-cleanups.patch
-Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
-Patch809: evolution-2.6.0-prototypes.patch
-
-# Removed to placate the build system.  Feel free to try to re-add it, but,
-# wash your dog first.
-ExcludeArch: s390 s390x
+# Remove gnome-common macros from configure.in.
+# We do not ship gnome-common (or at least we're not supposed to).
+Patch17: evolution-2.6.2-no-gnome-common.patch
+
+Patch18: evolution-2.4.1-fix-missing-declarations.patch
+Patch19: evolution-2.5.4-fix-missing-declarations.patch
+Patch20: evolution-2.5.5.1-notification-cleanups.patch
+Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
+Patch22: evolution-2.6.0-prototypes.patch
 
-Summary: GNOME's next-generation groupware suite
-Group: Applications/Productivity
+### Dependencies ###
 
-Requires: scrollkeeper >= 0.1.4
-Requires: ORBit2 >= 2.7.5
-Requires: libsoup >= %{soup_version}
+Requires: ORBit2 >= %{orbit2_version}
+Requires: dbus >= %{dbus_version}
 Requires: evolution-data-server >= %{eds_version}
+Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: gnome-spell >= 1.0.2
+Requires: gnome-vfs2 >= %{gnomevfs2_version}
+Requires: gnutls
 Requires: gtk2 >= 2.4.0
 Requires: libbonoboui >= %{libbonoboui_version}
-Requires: ORBit2 >= %{orbit2_version}
-Requires: spamassassin
-Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
-Requires: redhat-menus >= %{redhat_menus_version}
-Requires: gnutls
-Requires: dbus >= %{dbus_version}
 Requires: libgnomeprint22 >= %{libgnomeprint22_version}
-Requires: gnome-vfs2 >= %{gnomevfs2_version}
+Requires: libsoup >= %{soup_version}
+Requires: redhat-menus >= %{redhat_menus_version}
+Requires: scrollkeeper >= 0.1.4
+Requires: spamassassin
 
 %if %{libnotify_support}
 Requires: libnotify
@@ -129,24 +111,32 @@
 
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
-BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
-BuildRequires: libsoup-devel >= %{soup_version}
-BuildRequires: evolution-data-server-devel >= %{eds_version}
-BuildRequires: libbonobo-devel >= 2.0
-BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
-BuildRequires: libgnomeui-devel >= 2.0
-BuildRequires: libgnomecanvas-devel >= 2.0
-BuildRequires: libxml2-devel
+### Build Dependencies ###
+
 BuildRequires: GConf2-devel
-BuildRequires: intltool
 BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: atk-devel
-# kind of silly...
-BuildRequires: flex bison byacc libtool gettext
-BuildRequires: gnutls-devel
+BuildRequires: bison
+BuildRequires: byacc
 BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: desktop-file-utils
+BuildRequires: evolution-data-server-devel >= %{eds_version}
+BuildRequires: flex
+BuildRequires: gettext
+BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
+BuildRequires: gnutls-devel
 BuildRequires: gtk-doc
+BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
+BuildRequires: intltool
+BuildRequires: libbonobo-devel >= 2.0
+BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
+BuildRequires: libgnomecanvas-devel >= 2.0
+BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version}
+BuildRequires: libgnomeui-devel >= 2.0
+BuildRequires: libsoup-devel >= %{soup_version}
+BuildRequires: libtool
+BuildRequires: libxml2-devel
+BuildRequires: pkgconfig
 
 %if %{use_mozilla_nss}
 BuildRequires: nspr-devel
@@ -155,10 +145,6 @@
 BuildRequires: openssl-devel
 %endif
 
-BuildRequires: pkgconfig
-BuildRequires: desktop-file-utils
-BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version}
-
 %if %{inline_audio_support}
 # audio-inline plugin requires gstreamer to build:
 BuildRequires: gstreamer08-devel
@@ -210,23 +196,19 @@
 
 %prep
 %setup -q
-%patch98 -p1 -b .ldaphack
-%patch101 -p1 -b .calendar-print-with-pango
-%patch106 -p1 -b .commit-enter-on-calendar
-%patch107 -p1 -b .move-autosave-file
-cd widgets/table
-%patch108 -p3 -b .fix-150458
-cd ../..
-%patch109 -p1 -b .fix-164957
-%patch110 -p1 -b .hide-switcher-buttons-by-default
-# %patch800 -p1 -b .fix-conduits
-%patch802 -p1 -b .fix-conduit-dir
-%patch803 -p1 -b .no-gnome-common
-%patch804 -p1 -b .fix-missing-declarations
-%patch805 -p1 -b .fix-missing-declarations-2-5-4
-%patch806 -p1 -b .notification-cleanups
-%patch808 -p1 -b .fix-missing-declarations-2.5.5.1
-%patch809 -p1 -b .prototypes
+%patch10 -p1 -b .ldaphack
+%patch11 -p1 -b .commit-enter-on-calendar
+%patch12 -p1 -b .move-autosave-file
+%patch13 -p1 -b .fix-164957
+%patch14 -p1 -b .hide-switcher-buttons-by-default
+#patch15 -p1 -b .fix-conduits
+%patch16 -p1 -b .fix-conduit-dir
+%patch17 -p1 -b .no-gnome-common
+%patch18 -p1 -b .fix-missing-declarations
+%patch19 -p1 -b .fix-missing-declarations-2-5-4
+%patch20 -p1 -b .notification-cleanups
+%patch21 -p1 -b .fix-missing-declarations-2.5.5.1
+%patch22 -p1 -b .prototypes
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -616,6 +598,11 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Aug  2 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-1.fc5.3
+- Remove evo-calendar-print-with-pango-7.patch (fixed upstream).
+- Remove patch for RH bug #150458 (fixed upstream).
+- Clean up spec file, renumber patches.
+
 * Wed Aug  2 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-1.fc5.2
 - Remove patch for RH bug #167157, as it fixed it the wrong way.
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 19:58:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 15:58:17 -0400
Subject: rpms/evolution/FC-5 evo-calendar-print-with-pango-7.patch, 1.1,
	NONE evolution-2.3.5.1-fix-150458.patch, 1.3, NONE
Message-ID: <200608031958.k73JwHub023374@cvs.devel.redhat.com>

Author: mbarnes

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

Removed Files:
	evo-calendar-print-with-pango-7.patch 
	evolution-2.3.5.1-fix-150458.patch 
Log Message:
- Actually remove old patches.



--- evo-calendar-print-with-pango-7.patch DELETED ---


--- evolution-2.3.5.1-fix-150458.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 20:04:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 16:04:54 -0400
Subject: rpms/gtksourceview/devel .cvsignore, 1.21, 1.22 gtksourceview.spec,
	1.32, 1.33 sources, 1.20, 1.21
Message-ID: <200608032004.k73K4sIr024550@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtksourceview/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24410

Modified Files:
	.cvsignore gtksourceview.spec sources 
Log Message:
1.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	10 Apr 2006 16:17:34 -0000	1.21
+++ .cvsignore	3 Aug 2006 20:04:51 -0000	1.22
@@ -1,2 +1 @@
-gtksourceview-1.6.0.tar.bz2
-gtksourceview-1.6.1.tar.bz2
+gtksourceview-1.7.1.tar.bz2


Index: gtksourceview.spec
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gtksourceview.spec	12 Jul 2006 06:18:17 -0000	1.32
+++ gtksourceview.spec	3 Aug 2006 20:04:51 -0000	1.33
@@ -3,8 +3,8 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview
-Version: 1.6.1
-Release: 2.1 
+Version: 1.7.1
+Release: 1%{?dist} 
 License: LGPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.1-1.fc6
+- Update to 1.7.1
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.6.1-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Apr 2006 16:17:35 -0000	1.20
+++ sources	3 Aug 2006 20:04:51 -0000	1.21
@@ -1 +1 @@
-f8ca3a1a746477b2b46de7ebea276db5  gtksourceview-1.6.1.tar.bz2
+1aa0806f5433724357c91910fdd2a8e6  gtksourceview-1.7.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 20:26:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 16:26:12 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.104, 1.105 libsepol.spec, 1.137,
	1.138 sources, 1.105, 1.106
Message-ID: <200608032026.k73KQCm6014040@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 1.12.24-1
- Upgrade to latest from NSA
	* Merged libsepol unit tests from Joshua Brindle.
	* Merged symtab datum patch from Karl MacMillan.
	* Merged netfilter contexts support from Chris PeBenito.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- .cvsignore	3 Aug 2006 15:23:51 -0000	1.104
+++ .cvsignore	3 Aug 2006 20:26:10 -0000	1.105
@@ -104,3 +104,4 @@
 libsepol-1.12.19.tgz
 libsepol-1.12.21.tgz
 libsepol-1.12.23.tgz
+libsepol-1.12.24.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- libsepol.spec	3 Aug 2006 15:23:51 -0000	1.137
+++ libsepol.spec	3 Aug 2006 20:26:10 -0000	1.138
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.12.23
+Version: 1.12.24
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -85,8 +85,9 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
-* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 1.12.23-1
+* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 1.12.24-1
 - Upgrade to latest from NSA
+	* Merged libsepol unit tests from Joshua Brindle.
 	* Merged symtab datum patch from Karl MacMillan.
 	* Merged netfilter contexts support from Chris PeBenito.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	3 Aug 2006 15:23:51 -0000	1.105
+++ sources	3 Aug 2006 20:26:10 -0000	1.106
@@ -1 +1 @@
-11961ec5bd76ac532031417f3a9449a1  libsepol-1.12.23.tgz
+316bf9a44eafa3345afd7af90e1b36e4  libsepol-1.12.24.tgz



From fedora-cvs-commits at redhat.com  Thu Aug  3 20:43:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 16:43:35 -0400
Subject: rpms/kernel/devel/scripts rebase-xen.sh,1.5,1.6
Message-ID: <200608032043.k73KhZkg018760@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	rebase-xen.sh 
Log Message:
fix grep to get the right line


Index: rebase-xen.sh
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/scripts/rebase-xen.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rebase-xen.sh	24 Jul 2006 22:45:43 -0000	1.5
+++ rebase-xen.sh	3 Aug 2006 20:43:32 -0000	1.6
@@ -8,7 +8,7 @@
 make clean
 popd
 
-CSET=`hg tip | grep changeset | cut -f2 -d':' | sed 's/ //g'`
+CSET=`hg tip | grep "changeset:" | cut -f2 -d':' | sed 's/ //g'`
 tar cvf xen-$CSET.tar xen || exit 1
 rm -f xen-$CSET.tar.bz2
 bzip2 -v9 xen-$CSET.tar || exit 1



From fedora-cvs-commits at redhat.com  Thu Aug  3 20:44:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 16:44:01 -0400
Subject: rpms/kernel/devel .cvsignore, 1.505, 1.506 kernel-2.6.spec, 1.2519,
	1.2520 sources, 1.468, 1.469
Message-ID: <200608032044.k73Ki1XQ018942@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore kernel-2.6.spec sources 
Log Message:
Update xen HV cset 10294


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -r1.505 -r1.506
--- .cvsignore	3 Aug 2006 17:58:41 -0000	1.505
+++ .cvsignore	3 Aug 2006 20:43:58 -0000	1.506
@@ -6,3 +6,4 @@
 xen-10730.tar.bz2
 patch-2.6.18-rc3.bz2
 patch-2.6.18-rc3-git3.bz2
+xen-10924.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519
retrieving revision 1.2520
diff -u -r1.2519 -r1.2520
--- kernel-2.6.spec	3 Aug 2006 17:51:29 -0000	1.2519
+++ kernel-2.6.spec	3 Aug 2006 20:43:58 -0000	1.2520
@@ -33,7 +33,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_hv_cset 10730
+%define xen_hv_cset 10924
 %define make_target bzImage
 %define kernel_image x86
 %define xen_flags debug=y verbose=y crash_debug=y
@@ -1694,6 +1694,9 @@
 %endif
 
 %changelog
+* Thu Aug  3 2006 Juan Quintela <quintela at redhat.com>
+- Update xen HV cset 10294.
+
 * Thu Aug  3 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3-git3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- sources	3 Aug 2006 17:28:17 -0000	1.468
+++ sources	3 Aug 2006 20:43:58 -0000	1.469
@@ -2,3 +2,4 @@
 4ae2c95631b54820475437c206c3a4c2  xen-10730.tar.bz2
 ba31b754aaf80aa388858f86c34c4d01  patch-2.6.18-rc3.bz2
 2b8d22d3832b97c2bbd87e75755b36c9  patch-2.6.18-rc3-git3.bz2
+32a856cececcc35cb834cfaccc3c2523  xen-10924.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 20:47:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 16:47:09 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2520,1.2521
Message-ID: <200608032047.k73Kl9Ed029702@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
xen HV ia64 bits already upstream


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2520
retrieving revision 1.2521
diff -u -r1.2520 -r1.2521
--- kernel-2.6.spec	3 Aug 2006 20:43:58 -0000	1.2520
+++ kernel-2.6.spec	3 Aug 2006 20:47:06 -0000	1.2521
@@ -448,7 +448,6 @@
 
 # Xen hypervisor patches
 Patch20000: xen-build-with-O2.patch
-Patch20001: xen-ia64-hv.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -704,7 +703,6 @@
 cd xen
 # Any necessary hypervisor patches go here
 %patch20000 -p1
-%patch20001 -p1
 
 cd ..
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 20:57:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 16:57:41 -0400
Subject: rpms/kernel/devel linux-2.6-ppc-dac960-ipr-clash.patch, NONE,
	1.1 kernel-2.6.spec, 1.2521, 1.2522
Message-ID: <200608032057.k73Kvf5T015658@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ppc-dac960-ipr-clash.patch 
Log Message:
Fix PCI ID clash between ipr and dac960

linux-2.6-ppc-dac960-ipr-clash.patch:
 DAC960.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc-dac960-ipr-clash.patch ---
The PCI ID table in the DAC960 driver conflicts with some devices
that use the ipr driver. All ipr adapters that use this chip
have an IBM subvendor ID and all DAC960 adapters that use this
chip have a Mylex subvendor id.

Signed-off-by: Brian King <brking at us.ibm.com>
---

 linux-2.6-bjking1/drivers/block/DAC960.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.17.noarch/drivers/block/DAC960.c~	2006-08-03 16:50:56.000000000 -0400
+++ linux-2.6.17.noarch/drivers/block/DAC960.c	2006-08-03 16:51:38.000000000 -0400
@@ -7125,7 +7125,7 @@ static struct pci_device_id DAC960_id_ta
 	{
 		.vendor 	= PCI_VENDOR_ID_MYLEX,
 		.device		= PCI_DEVICE_ID_MYLEX_DAC960_GEM,
-		.subvendor	= PCI_ANY_ID,
+		.subvendor	= PCI_VENDOR_ID_MYLEX,
 		.subdevice	= PCI_ANY_ID,
 		.driver_data	= (unsigned long) &DAC960_GEM_privdata,
 	},


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2521
retrieving revision 1.2522
diff -u -r1.2521 -r1.2522
--- kernel-2.6.spec	3 Aug 2006 20:47:06 -0000	1.2521
+++ kernel-2.6.spec	3 Aug 2006 20:57:38 -0000	1.2522
@@ -281,9 +281,10 @@
 Patch209: linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch
 
 # 300 - 399   ppc(64)
-Patch305: linux-2.6-cell-mambo-drivers.patch
-Patch306: linux-2.6-hvc-console.patch
-Patch314: linux-2.6-ppc-rtas-check.patch
+Patch300: linux-2.6-ppc-dac960-ipr-clash.patch
+Patch301: linux-2.6-cell-mambo-drivers.patch
+Patch302: linux-2.6-hvc-console.patch
+Patch303: linux-2.6-ppc-rtas-check.patch
 
 # 400 - 499   ia64
 
@@ -744,12 +745,14 @@
 #
 # PowerPC
 #
+# IPR uses same ID as DAC960
+%patch300 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
-%patch305 -p1
+%patch301 -p1
 # Make HVC console generic; support simulator console device using it.
-#%patch306 -p1
+#%patch302 -p1
 # Check properly for successful RTAS instantiation
-%patch314 -p1
+%patch303 -p1
 
 # S390
 # Kprobes.
@@ -1697,6 +1700,7 @@
 
 * Thu Aug  3 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3-git3
+- Fix PCI ID clash between ipr and dac960
 
 * Thu Aug  3 2006 Jon Masters <jcm at redhat.com>
 - Copy .config to include/config/auto.conf to avoid unnecessary "make prepare".



From fedora-cvs-commits at redhat.com  Thu Aug  3 21:02:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 17:02:46 -0400
Subject: rpms/cman/devel cman-makefix.patch,NONE,1.1 cman.spec,1.57,1.58
Message-ID: <200608032102.k73L2kw7015775@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15754

Modified Files:
	cman.spec 
Added Files:
	cman-makefix.patch 
Log Message:
Added patch to install static lib for group.

cman-makefix.patch:
 Makefile |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE cman-makefix.patch ---
--- cman-2.0.5/group/lib/Makefile.makefix	2006-08-03 16:00:20.000000000 -0500
+++ cman-2.0.5/group/lib/Makefile	2006-08-03 16:01:35.000000000 -0500
@@ -34,6 +34,9 @@ libgroup.o: libgroup.c
 copytobin: all
 
 install: all
+	install -d ${incdir}
+	install -d ${libdir}
+	install $(LIBNAME).a ${libdir}
 
 uninstall:
 


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- cman.spec	2 Aug 2006 23:14:09 -0000	1.57
+++ cman.spec	3 Aug 2006 21:02:44 -0000	1.58
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.3
+Release: 0.fc6.4
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -31,6 +31,7 @@
 URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz
 Patch0: cman-2.0.5-libraryfix.patch
+Patch1: cman-makefix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -47,6 +48,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libraryfix
+%patch1 -p1 -b .makefix
 
 %build
 TOPDIR=`pwd`



From fedora-cvs-commits at redhat.com  Thu Aug  3 21:31:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 17:31:28 -0400
Subject: rpms/compiz/devel .cvsignore, 1.4, 1.5 compiz.spec, 1.15,
	1.16 sources, 1.4, 1.5
Message-ID: <200608032131.k73LVS0c031186@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31168

Modified Files:
	.cvsignore compiz.spec sources 
Log Message:
* Wed Aug  2 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.13.20060721git.fc5.aiglx
- New version of dialog box. Macro the version number.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Aug 2006 00:10:39 -0000	1.4
+++ .cvsignore	3 Aug 2006 21:31:21 -0000	1.5
@@ -1,2 +1,3 @@
 compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
 desktop-effects-0.6.tar.gz
+desktop-effects-0.6.1.tar.gz


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- compiz.spec	3 Aug 2006 00:10:39 -0000	1.15
+++ compiz.spec	3 Aug 2006 21:31:21 -0000	1.16
@@ -3,12 +3,14 @@
 %define		sha1 fc6b7773fc52f6104b66a9f86c18395f8a958848
 %define		snapshot 20060721
 
+%define		dialogversion	0.6.1
+
 Name:           compiz
 Url:            http://www.freedesktop.org/Software/compiz
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.13.%{snapshot}git.fc5.aiglx
+Release:        0.14.%{snapshot}git.fc5.aiglx
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,7 +31,7 @@
 BuildRequires:  gettext
 
 Source0:        %{name}-%{sha1}.tar.bz2
-Source1:	desktop-effects-0.6.tar.gz
+Source1:	desktop-effects-%{dialogversion}.tar.gz
 
 Patch100: gl-include-inferiors.patch
 Patch101: aiglx-defaults.patch
@@ -62,7 +64,7 @@
 windows and compositing manager.
 
 %prep
-%setup -q -T -b1 -n desktop-effects-0.6
+%setup -q -T -b1 -n desktop-effects-%{dialogversion}
 %setup -q -n %{name}-%{sha1}
 
 %patch100 -p1 -b .gl-include-inferiors
@@ -79,7 +81,7 @@
 make %{?_smp_mflags} 
 
 # desktop-effects
-cd ../desktop-effects-0.6
+cd ../desktop-effects-%{dialogversion}
 %configure 
 make
 
@@ -91,7 +93,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 echo INSTALLING DESKTOP EFFECTS
-cd ../desktop-effects-0.6
+cd ../desktop-effects-%{dialogversion}
 make DESTDIR=$RPM_BUILD_ROOT install || exit 1
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -134,6 +136,9 @@
 
 %changelog
 * Wed Aug  2 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.13.20060721git.fc5.aiglx
+- New version of dialog box. Macro the version number.
+
+* Wed Aug  2 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.13.20060721git.fc5.aiglx
 - Add 'desktop effects' dialog box.
 
 * Mon Jul 31 2006 Kristian H??gsberg <krh at redhat.com> 0.0.13-0.12.20060721git.fc5.aiglx


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Aug 2006 00:10:39 -0000	1.4
+++ sources	3 Aug 2006 21:31:21 -0000	1.5
@@ -1,2 +1,3 @@
 16382b2db6ffc65161a6edc70559ee67  compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
 101df08c0adb11640e512db33165acf4  desktop-effects-0.6.tar.gz
+85c612c6ad47e31c70f0ba85063882e4  desktop-effects-0.6.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug  3 21:39:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 17:39:36 -0400
Subject: rpms/kernel/devel xen-ia64-hv.patch, 1.1,
	NONE xen-fix_huge_timeouts.patch, 1.1, NONE
Message-ID: <200608032139.k73Ldafc031540@cvs.devel.redhat.com>

Author: quintela

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

Removed Files:
	xen-ia64-hv.patch xen-fix_huge_timeouts.patch 
Log Message:
remove ald unused xen HV patches


--- xen-ia64-hv.patch DELETED ---


--- xen-fix_huge_timeouts.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 21:49:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 17:49:17 -0400
Subject: rpms/kernel/devel Config.mk, 1.3, 1.4 kernel-2.6.spec, 1.2522,
	1.2523 xen-build-with-O2.patch, 1.1, NONE
Message-ID: <200608032149.k73LnHi3025920@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	Config.mk kernel-2.6.spec 
Removed Files:
	xen-build-with-O2.patch 
Log Message:
xen hv compiled with -O2 through Config.mk


Index: Config.mk
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Config.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Config.mk	26 Jul 2006 03:17:21 -0000	1.3
+++ Config.mk	3 Aug 2006 21:49:14 -0000	1.4
@@ -36,7 +36,7 @@
 CFLAGS    ?= -O2 -fomit-frame-pointer
 CFLAGS    += -DNDEBUG
 else
-CFLAGS    += -g
+CFLAGS    += -O2 -g
 endif
 
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2522
retrieving revision 1.2523
diff -u -r1.2522 -r1.2523
--- kernel-2.6.spec	3 Aug 2006 20:57:38 -0000	1.2522
+++ kernel-2.6.spec	3 Aug 2006 21:49:14 -0000	1.2523
@@ -448,7 +448,6 @@
 Patch10001: linux-2.6-random-patches.patch
 
 # Xen hypervisor patches
-Patch20000: xen-build-with-O2.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -703,7 +702,6 @@
 
 cd xen
 # Any necessary hypervisor patches go here
-%patch20000 -p1
 
 cd ..
 
@@ -1696,6 +1694,7 @@
 
 %changelog
 * Thu Aug  3 2006 Juan Quintela <quintela at redhat.com>
+- xen hv compiled with -O2 through Config.mk
 - Update xen HV cset 10294.
 
 * Thu Aug  3 2006 Dave Jones <davej at redhat.com>


--- xen-build-with-O2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 21:49:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 17:49:53 -0400
Subject: rpms/kernel/devel .cvsignore,1.506,1.507 sources,1.469,1.470
Message-ID: <200608032149.k73LnrKE026135@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore sources 
Log Message:
didn't remove the old files in previous upload


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -r1.506 -r1.507
--- .cvsignore	3 Aug 2006 20:43:58 -0000	1.506
+++ .cvsignore	3 Aug 2006 21:49:51 -0000	1.507
@@ -3,7 +3,6 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-xen-10730.tar.bz2
 patch-2.6.18-rc3.bz2
 patch-2.6.18-rc3-git3.bz2
 xen-10924.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- sources	3 Aug 2006 20:43:58 -0000	1.469
+++ sources	3 Aug 2006 21:49:51 -0000	1.470
@@ -1,5 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-4ae2c95631b54820475437c206c3a4c2  xen-10730.tar.bz2
 ba31b754aaf80aa388858f86c34c4d01  patch-2.6.18-rc3.bz2
 2b8d22d3832b97c2bbd87e75755b36c9  patch-2.6.18-rc3-git3.bz2
 32a856cececcc35cb834cfaccc3c2523  xen-10924.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 22:01:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 18:01:27 -0400
Subject: rpms/gnome-session/devel gnome-session-2.15.4-window-manager.patch,
	NONE, 1.1 gnome-session.spec, 1.76, 1.77
Message-ID: <200608032201.k73M1RXK029882@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	gnome-session.spec 
Added Files:
	gnome-session-2.15.4-window-manager.patch 
Log Message:
* Thu Aug 3 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.4-3
- Add patch to (a) add configuration option for window manager, (b)
  start the window manager, and (c) disable splash screen by default.



gnome-session-2.15.4-window-manager.patch:
 gnome-session.schemas.in |   13 ++++++-
 main.c                   |   84 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 1 deletion(-)

--- NEW FILE gnome-session-2.15.4-window-manager.patch ---
? birnan
? depcomp
? sdsf
? stamp-h1
? windowmanager
? gnome-session/gsm-wm.c
? gnome-session/gsm-wm.h
? po/stamp-it
Index: gnome-session/gnome-session.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/gnome-session.schemas.in,v
retrieving revision 1.3
diff -u -r1.3 gnome-session.schemas.in
--- gnome-session/gnome-session.schemas.in	26 Apr 2005 10:56:50 -0000	1.3
+++ gnome-session/gnome-session.schemas.in	3 Aug 2006 21:58:04 -0000
@@ -2,11 +2,22 @@
 <gconfschemafile>
    <schemalist>
       <schema>
+         <key>/schemas/apps/gnome-session/rh/window_manager</key>
+         <applyto>/apps/gnome-session/rh/window_manager</applyto>
+         <owner>gnome</owner>
+         <type>string</type>
+         <default>metacity</default>
+         <locale name="C">
+	    <short>Window Manager to start</short>
+	    <long>The Window manager that gnome-session will start. Valid values are "metacity" and "compiz".</long>
+         </locale>
+      </schema>
+      <schema>
          <key>/schemas/apps/gnome-session/options/show_splash_screen</key>
          <applyto>/apps/gnome-session/options/show_splash_screen</applyto>
          <owner>gnome</owner>
          <type>bool</type>
-         <default>true</default>
+         <default>false</default>
          <locale name="C">
             <short>Show the splash screen</short>
             <long>Show the splash screen when the session starts up</long>
Index: gnome-session/main.c
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/main.c,v
retrieving revision 1.80
diff -u -r1.80 main.c
--- gnome-session/main.c	26 Jul 2006 12:46:36 -0000	1.80
+++ gnome-session/main.c	3 Aug 2006 21:58:04 -0000
@@ -321,6 +321,8 @@
   return (tm->tm_year >= 105); /* We start on Jan 1 2006 */
 }
 
+static void start_window_manager (void);
+
 int
 main (int argc, char *argv[])
 {
@@ -490,6 +492,8 @@
   if (splashing)
     splash_start ();
 
+  start_window_manager ();
+  
   start_session (the_session);
 
   if (a_t_support) /* the ATs are happier if the session has started */
@@ -511,4 +515,84 @@
   g_free (session_name);
 
   return 0;
+}
+
+/*
+ * Patch to start metacity or compiz depending on
+ * a gconf setting
+ */
+typedef enum {
+  COMPIZ,
+  METACITY
+} WindowManager;
+
+static gboolean
+start_compiz (GError **err)
+{
+  if (!g_spawn_command_line_async ("gnome-window-decorator", err))
+    return FALSE;
+  
+  if (!g_spawn_command_line_async ("compiz --replace gconf", err))
+    return FALSE;
+  
+  return TRUE;
+}
+
+static gboolean
+start_metacity (GError **err)
+{
+  if (!g_spawn_command_line_async ("metacity --replace", err))
+    return FALSE;
+  
+  return TRUE;
+}
+
+#define WINDOW_MANAGER_KEY "/apps/gnome-session/rh/window_manager"
+
+static WindowManager
+get_wm_from_gconf (GError **err)
+{
+  GError *tmp = NULL;
+  WindowManager result;
+  GConfClient *client = gsm_get_conf_client ();
+  
+  const char *str = gconf_client_get_string (client, WINDOW_MANAGER_KEY, &tmp);
+  
+  if (tmp)
+    {
+      g_propagate_error (err, tmp);
+      result = METACITY;
+    }
+  else if (str && strcmp (str, "compiz") == 0)
+    {
+      result = COMPIZ;
+    }
+  else
+    {
+      result = METACITY;
+    }
+  
+  return result;
+}
+
+static void
+start_window_manager (void)
+{
+  WindowManager wm = get_wm_from_gconf (NULL);
+  /* start the window manager */
+  
+  switch (wm)
+    {
+    case COMPIZ:
+      start_compiz (NULL);
+      break;
+      
+    case METACITY:
+      start_metacity (NULL);
+      break;
+      
+    default:
+      g_assert_not_reached ();
+      break;
+    }
 }


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gnome-session.spec	19 Jul 2006 17:36:23 -0000	1.76
+++ gnome-session.spec	3 Aug 2006 22:01:24 -0000	1.77
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.15.4
-Release: 2 
+Release: 3
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -49,6 +49,7 @@
 # too much crashing
 Patch9: gnome-session-2.13.4-no-crashes.patch
 Patch12: gnome-session-2.13.92-desensitize-invalid-buttons.patch
+Patch13: gnome-session-2.15.4-window-manager.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -87,6 +88,7 @@
 %patch8 -p1 -b .shaped
 %patch9 -p1 -b .no-crashes
 %patch12 -p1 -b .desensitize-invalid-buttons
+%patch13 -p0 -b .window-manager
 
 %build
 
@@ -164,6 +166,10 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Thu Aug 3 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.4-3
+- Add patch to (a) add configuration option for window manager, (b) start the window
+  manager, and (c) disable splash screen by default.
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.4-2
 - Add BR for dbus-glib-devel
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 22:04:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 18:04:19 -0400
Subject: rpms/cman/devel cman-plocktemp.patch, NONE, 1.1 cman-makefix.patch,
	1.1, 1.2 cman.spec, 1.58, 1.59
Message-ID: <200608032204.k73M4JOX030354@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30329

Modified Files:
	cman-makefix.patch cman.spec 
Added Files:
	cman-plocktemp.patch 
Log Message:
Added plock patch & fix for makefix patch."


cman-plocktemp.patch:
 lock_dlm_plock.h |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+)

--- NEW FILE cman-plocktemp.patch ---
diff -uNr cman-2.0.5.plock/group/include/linux/lock_dlm_plock.h cman-2.0.5/group/include/linux/lock_dlm_plock.h
--- cman-2.0.5.plock/group/include/linux/lock_dlm_plock.h	1969-12-31 18:00:00.000000000 -0600
+++ cman-2.0.5/group/include/linux/lock_dlm_plock.h	2006-08-03 16:54:01.000000000 -0500
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2005 Red Hat, Inc.  All rights reserved.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License v.2.
+ */
+
+#ifndef __LOCK_DLM_PLOCK_DOT_H__
+#define __LOCK_DLM_PLOCK_DOT_H__
+
+#define GDLM_PLOCK_MISC_NAME		"lock_dlm_plock"
+
+#define GDLM_PLOCK_VERSION_MAJOR	1
+#define GDLM_PLOCK_VERSION_MINOR	1
+#define GDLM_PLOCK_VERSION_PATCH	0
+
+enum {
+	GDLM_PLOCK_OP_LOCK = 1,
+	GDLM_PLOCK_OP_UNLOCK,
+	GDLM_PLOCK_OP_GET,
+};
+
+struct gdlm_plock_info {
+	__u32 version[3];
+	__u8 optype;
+	__u8 ex;
+	__u8 wait;
+	__u8 pad;
+	__u32 pid;
+	__s32 nodeid;
+	__s32 rv;
+	__u32 fsid;
+	__u64 number;
+	__u64 start;
+	__u64 end;
+	__u64 owner;
+};
+
+#endif
+

cman-makefix.patch:
 Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Index: cman-makefix.patch
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman-makefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cman-makefix.patch	3 Aug 2006 21:02:44 -0000	1.1
+++ cman-makefix.patch	3 Aug 2006 22:04:16 -0000	1.2
@@ -1,10 +1,20 @@
---- cman-2.0.5/group/lib/Makefile.makefix	2006-08-03 16:00:20.000000000 -0500
-+++ cman-2.0.5/group/lib/Makefile	2006-08-03 16:01:35.000000000 -0500
-@@ -34,6 +34,9 @@ libgroup.o: libgroup.c
+--- cman-2.0.5/group/lib/Makefile.makefix	2005-06-23 10:32:30.000000000 -0500
++++ cman-2.0.5/group/lib/Makefile	2006-08-03 16:58:16.000000000 -0500
+@@ -18,7 +18,7 @@
+ top_srcdir=..
+ UNINSTALL=${top_srcdir}/scripts/uninstall.pl
+ 
+-# include ${top_srcdir}/make/defines.mk
++include ${top_srcdir}/make/defines.mk
+ 
+ CFLAGS += -g -O -I. -fPIC -I../daemon
+ 
+@@ -34,6 +34,10 @@
  copytobin: all
  
  install: all
 +	install -d ${incdir}
++	install libgroup.h ${incdir}
 +	install -d ${libdir}
 +	install $(LIBNAME).a ${libdir}
  


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- cman.spec	3 Aug 2006 21:02:44 -0000	1.58
+++ cman.spec	3 Aug 2006 22:04:16 -0000	1.59
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.4
+Release: 0.fc6.5
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -32,6 +32,7 @@
 Source0: %{name}-%{version}.tar.gz
 Patch0: cman-2.0.5-libraryfix.patch
 Patch1: cman-makefix.patch
+Patch2: cman-plocktemp.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,6 +50,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libraryfix
 %patch1 -p1 -b .makefix
+%patch2 -p1 -b .plock
 
 %build
 TOPDIR=`pwd`



From fedora-cvs-commits at redhat.com  Thu Aug  3 22:08:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 18:08:33 -0400
Subject: rpms/compiz/devel compiz.spec,1.16,1.17
Message-ID: <200608032208.k73M8XsF031548@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31508

Modified Files:
	compiz.spec 
Log Message:

* Thu Aug  3 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.14.20060721git.fc5.aiglx
- Add Requires: gnome-session 2.15.4-3



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- compiz.spec	3 Aug 2006 21:31:21 -0000	1.16
+++ compiz.spec	3 Aug 2006 22:08:31 -0000	1.17
@@ -22,6 +22,7 @@
 Requires:	mesa-libGL >= 6.5-9
 Requires:	libwnck >= 2.15.4
 Requires:       system-logos
+Requires:	gnome-session >= 2.15.4-3
 
 BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
@@ -135,7 +136,10 @@
 %{_includedir}/compiz
 
 %changelog
-* Wed Aug  2 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.13.20060721git.fc5.aiglx
+* Thu Aug  3 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.14.20060721git.fc5.aiglx
+- Add Requires: gnome-session 2.15.4-3
+
+* Wed Aug  3 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.13.20060721git.fc5.aiglx
 - New version of dialog box. Macro the version number.
 
 * Wed Aug  2 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.13.20060721git.fc5.aiglx



From fedora-cvs-commits at redhat.com  Thu Aug  3 22:26:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 18:26:45 -0400
Subject: rpms/python-pyblock/devel .cvsignore, 1.15, 1.16 python-pyblock.spec,
	1.26, 1.27 sources, 1.19, 1.20
Message-ID: <200608032226.k73MQjXn018664@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
- update to 0.18-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	26 Jul 2006 15:37:15 -0000	1.15
+++ .cvsignore	3 Aug 2006 22:26:43 -0000	1.16
@@ -1 +1,2 @@
 pyblock-0.17.tar.bz2
+pyblock-0.18.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- python-pyblock.spec	28 Jul 2006 20:23:26 -0000	1.26
+++ python-pyblock.spec	3 Aug 2006 22:26:43 -0000	1.27
@@ -5,8 +5,8 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.17
-Release: 2
+Version: 0.18
+Release: 1
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
@@ -41,6 +41,9 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Thu Aug  3 2006 Peter Jones <pjones at redhat.com> - 0.18-1
+- Fixes for multiple multipaths
+
 * Fri Jul 28 2006 Peter Jones <pjones at redhat.com> - 0.17-2
 - Require dmraid, since we're using the .so now.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	26 Jul 2006 15:37:15 -0000	1.19
+++ sources	3 Aug 2006 22:26:43 -0000	1.20
@@ -1 +1,2 @@
 0eb2cd51b2d36557c55baf9a1c65870c  pyblock-0.17.tar.bz2
+cbcb850601f4b213f0f074a35dfe3da9  pyblock-0.18.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 22:42:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 18:42:08 -0400
Subject: rpms/libgtop2/devel libgtop2.spec,1.37,1.38
Message-ID: <200608032242.k73Mg8Yi022423@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgtop2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22362

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



Index: libgtop2.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libgtop2.spec	3 Aug 2006 19:44:12 -0000	1.37
+++ libgtop2.spec	3 Aug 2006 22:42:05 -0000	1.38
@@ -16,6 +16,9 @@
 Requires:	glib2 >= %{glib2_version}
 BuildRequires:	glib2-devel >= %{glib2_version}
 BuildRequires:  texinfo libtool gettext
+BuildRequires:  intltool
+BuildRequires:  autoconf automake 
+
 Patch: libgtop-2.0.2-prog_as.patch
 
 %description



From fedora-cvs-commits at redhat.com  Thu Aug  3 22:57:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 18:57:48 -0400
Subject: rpms/gdm/devel gdm-autologin-pam, NONE, 1.1 gdm-pam, NONE,
	1.1 gdmsetup-pam, NONE, 1.1 gdm-2.15.6-security-tokens.patch,
	1.6, 1.7 gdm.spec, 1.187,
	1.188 gdm-2.13.0.4-add-gnome-cflags.patch, 1.1,
	NONE gdm-2.6.0.7-wait-for-bootup.patch, 1.6,
	NONE gdm-2.6.0.8-boot-throbber.patch, 1.2,
	NONE gdm-2.6.0.8-xdmcp.patch, 1.1,
	NONE gdm-2.8.0.2-hide-throbber.patch, 1.1,
	NONE gdm-2.8.0.2-session-errors-in-tmp.patch, 1.1,
	NONE gdm-2.8.0.4-call-dbus-launch.patch, 1.1,
	NONE gdm-2.8.0.4-dont-call-xsm.patch, 1.1,
	NONE gdm-allow-login.init, 1.3, NONE gdm-early-login.init, 1.5,
	NONE zzz-bootup-complete.init, 1.1, NONE
Message-ID: <200608032257.k73MvmG2010748@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10673

Modified Files:
	gdm-2.15.6-security-tokens.patch gdm.spec 
Added Files:
	gdm-autologin-pam gdm-pam gdmsetup-pam 
Removed Files:
	gdm-2.13.0.4-add-gnome-cflags.patch 
	gdm-2.6.0.7-wait-for-bootup.patch 
	gdm-2.6.0.8-boot-throbber.patch gdm-2.6.0.8-xdmcp.patch 
	gdm-2.8.0.2-hide-throbber.patch 
	gdm-2.8.0.2-session-errors-in-tmp.patch 
	gdm-2.8.0.4-call-dbus-launch.patch 
	gdm-2.8.0.4-dont-call-xsm.patch gdm-allow-login.init 
	gdm-early-login.init zzz-bootup-complete.init 
Log Message:
- update to 2.15.7
- drop selinux patch that I don't think was ever finished



--- NEW FILE gdm-autologin-pam ---
 #%PAM-1.0
auth       required    pam_env.so
auth       required    pam_permit.so
account    required    pam_nologin.so
account    include     system-auth
password   include     system-auth
session    optional    pam_keyinit.so force revoke
session    include     system-auth
session    required    pam_loginuid.so
session    optional    pam_console.so


--- NEW FILE gdm-pam ---
#%PAM-1.0
auth       required    pam_env.so
auth       include     system-auth
account    required    pam_nologin.so
account    include     system-auth
password   include     system-auth
session    optional    pam_keyinit.so force revoke
session    include     system-auth
session    required    pam_loginuid.so
session    optional    pam_console.so



--- NEW FILE gdmsetup-pam ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       sufficient   pam_timestamp.so
auth       required     pam_stack.so service=system-auth
session    required     pam_permit.so
session    optional     pam_xauth.so
session    optional     pam_timestamp.so
account    required     pam_permit.so

gdm-2.15.6-security-tokens.patch:
 config/Makefile.am            |   31 +
 config/gdm.conf.in            |    4 
 config/securitytokens.conf.in |    3 
 configure.ac                  |    3 
 daemon/Makefile.am            |    7 
 daemon/gdm.c                  |   93 ++++
 daemon/securitytoken.c        |  602 ++++++++++++++++++++++++++++++
 daemon/securitytoken.h        |  101 +++++
 daemon/securitytokenmonitor.c |  840 ++++++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h |   81 ++++
 daemon/verify-pam.c           |    3 
 11 files changed, 1762 insertions(+), 6 deletions(-)

Index: gdm-2.15.6-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.6-security-tokens.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdm-2.15.6-security-tokens.patch	22 Jul 2006 04:13:19 -0000	1.6
+++ gdm-2.15.6-security-tokens.patch	3 Aug 2006 22:57:45 -0000	1.7
@@ -61,46 +61,6 @@
  
  	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
  	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
---- gdm-2.15.6/config/gdm
-+++ gdm-2.15.6/config/gdm
-@@ -1,8 +1,10 @@
- #%PAM-1.0
--auth       required	pam_env.so
--auth       required	pam_stack.so service=system-auth
--auth       required	pam_nologin.so
--account    required	pam_stack.so service=system-auth
--password   required	pam_stack.so service=system-auth
--session    required	pam_stack.so service=system-auth
--session    optional     pam_console.so
-+auth       required    pam_env.so
-+auth       include     system-auth
-+account    required    pam_nologin.so
-+account    include     system-auth
-+password   include     system-auth
-+session    include     system-auth
-+session    required    pam_loginuid.so
-+session    optional    pam_console.so
-+
---- gdm-2.15.6/config/gdm-autologin
-+++ gdm-2.15.6/config/gdm-autologin
-@@ -1,8 +1,9 @@
--#%PAM-1.0
--auth       required	pam_env.so
--auth       required	pam_nologin.so
--auth       required	pam_permit.so
--account    required	pam_stack.so service=system-auth
--password   required	pam_stack.so service=system-auth
--session    required	pam_stack.so service=system-auth
--session    optional     pam_console.so
-+ #%PAM-1.0
-+auth       required    pam_env.so
-+auth       required    pam_permit.so
-+account    required    pam_nologin.so
-+account    include     system-auth
-+password   include     system-auth
-+session    include     system-auth
-+session    required    pam_loginuid.so
-+session    optional    pam_console.so
 --- gdm-2.15.6/config/gdm.conf.in
 +++ gdm-2.15.6/config/gdm.conf.in
 @@ -196,6 +196,10 @@ # How long gdm should wait before it ass


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- gdm.spec	3 Aug 2006 18:23:46 -0000	1.187
+++ gdm.spec	3 Aug 2006 22:57:46 -0000	1.188
@@ -22,33 +22,40 @@
 Group: User Interface/X
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm
 Source: gdm-%{PACKAGE_VERSION}.tar.bz2
-Source1: gdm-allow-login.init
-Source2: gdm-early-login.init
-Source3: zzz-bootup-complete.init
+Source1: gdm-pam
+Source2: gdm-autologin-pam
+Source3: gdmsetup-pam
 
 Patch1: gdm-2.15.6-change-defaults.patch
-Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch
-Patch3: gdm-2.8.0.2-session-errors-in-tmp.patch
 Patch4: gdm-2.13.0.4-update-switchdesk-location.patch
-Patch5: gdm-2.6.0.7-wait-for-bootup.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=301817
 Patch6: gdm-2.8.0.2-clean-up-xsession-errors.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=301826
 Patch7: gdm-2.8.0.2-merge-resources.patch
-Patch8: gdm-2.6.0.8-boot-throbber.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=349829
 Patch9: gdm-2.8.0.2-dont-malloc-in-signal-handlers.patch
-Patch10: gdm-2.6.0.8-xdmcp.patch
-Patch11: gdm-2.8.0.2-hide-throbber.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=349835
 Patch12: gdm-2.13.0.4-audit-login.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=349836
 Patch13: gdm-2.13.0.4-modularx.patch
-Patch14: gdm-2.8.0.4-call-dbus-launch.patch
-Patch15: gdm-2.8.0.4-dont-call-xsm.patch
-Patch16: gdm-2.13.0.4-add-gnome-cflags.patch
-Patch17: gdm-2.13.0.7-pam_stack.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=347798
 Patch19: gdm-2.15.5-move-default-message.patch
 Patch20: gdm-2.15.5-reset-pam.patch
 Patch21: gdm-2.15.6-security-tokens.patch
-Patch22: gdm-2.15.6-session-keyring.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=347871
 Patch24: gdm-2.15.6-wtmp.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=327530
 Patch25: gdm-2.15.6-center-cursor.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=349640
 Patch26: gdm-2.15.6-fix-face-browser.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
@@ -110,34 +117,24 @@
 %setup -q
 
 %patch1 -p1 -b .change-defaults
-%patch2 -p1 -b .add-pam-timestamp-module
-%patch3 -p1 -b .session-errors-in-tmp
 %patch4 -p1 -b .update-switchdesk-location
-##%patch5 -p1 -b .wait-for-bootup
 %patch6 -p1 -b .clean-up-xsession-errors
 %patch7 -p1 -b .merge-resources
-##%patch8 -p1 -b .boot-throbber
 %patch9 -p1 -b .dont-malloc-in-signal-handlers
-##%patch10 -p1 -b .xdmcp
-%patch11 -p1 -b .hide-throbber
 %patch12 -p1 -b .audit-login
 %patch13 -p1 -b .modularx
-%patch14 -p1 -b .call-dbus-launch
-%patch15 -p1 -b .dont-call-xsm
-%patch16 -p1 -b .add-gnome-cflags
-#%patch17 -p1 -b .pam_stack
 %patch19 -p1 -b .move-default-message
 %patch20 -p1 -b .reset-pam
 %patch21 -p1 -b .security-tokens
-%patch22 -p1 -b .session-keyring
 %patch24 -p1 -b .wtmp
 %patch25 -p1 -b .center-cursor
 %patch26 -p1 -b .fix-face-browser
 
-# 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
-
 %build
+cp -f %{SOURCE1} config/gdm
+cp -f %{SOURCE2} config/gdm-autologin
+cp -f %{SOURCE3} gdmsetup-pam
+
 intltoolize --force --copy
 aclocal-1.9
 libtoolize --force --copy
@@ -200,14 +197,6 @@
 
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
-#mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-#install -m755 ${RPM_SOURCE_DIR}/gdm-early-login.init                          \
-#              ${RPM_BUILD_ROOT}/etc/rc.d/init.d/gdm-early-login
-#install -m755 ${RPM_SOURCE_DIR}/gdm-allow-login.init                          \
-#              ${RPM_BUILD_ROOT}/etc/rc.d/init.d/gdm-allow-login
-#install -m755 ${RPM_SOURCE_DIR}/zzz-bootup-complete.init                      \
-#              ${RPM_BUILD_ROOT}/etc/rc.d/init.d/zzz-bootup-complete
-
 %find_lang gdm
 
 %clean
@@ -306,7 +295,6 @@
 %config %{_sysconfdir}/pam.d/gdmsetup
 %config %{_sysconfdir}/pam.d/gdm-autologin
 %config %{_sysconfdir}/security/console.apps/gdmsetup
-#%config %{_sysconfdir}/rc.d/init.d/*
 %dir %{_sysconfdir}/gdm/Init
 %dir %{_sysconfdir}/gdm/PreSession
 %dir %{_sysconfdir}/gdm/PostSession
@@ -330,6 +318,7 @@
 %changelog
 * Thu Aug 3 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.7-1
 - update to 2.15.7
+- drop selinux patch that I don't think was ever finished
 
 * Thu Aug 3 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-14
 - fix face browser


--- gdm-2.13.0.4-add-gnome-cflags.patch DELETED ---


--- gdm-2.6.0.7-wait-for-bootup.patch DELETED ---


--- gdm-2.6.0.8-boot-throbber.patch DELETED ---


--- gdm-2.6.0.8-xdmcp.patch DELETED ---


--- gdm-2.8.0.2-hide-throbber.patch DELETED ---


--- gdm-2.8.0.2-session-errors-in-tmp.patch DELETED ---


--- gdm-2.8.0.4-call-dbus-launch.patch DELETED ---


--- gdm-2.8.0.4-dont-call-xsm.patch DELETED ---


--- gdm-allow-login.init DELETED ---


--- gdm-early-login.init DELETED ---


--- zzz-bootup-complete.init DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug  3 22:59:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 18:59:49 -0400
Subject: rpms/gdm/devel .cvsignore,1.30,1.31 sources,1.32,1.33
Message-ID: <200608032259.k73Mxns2011572@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11510

Modified Files:
	.cvsignore sources 
Log Message:
add new source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	12 Jul 2006 18:15:18 -0000	1.30
+++ .cvsignore	3 Aug 2006 22:59:47 -0000	1.31
@@ -1 +1 @@
-gdm-2.15.6.tar.bz2
+gdm-2.15.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	12 Jul 2006 18:15:18 -0000	1.32
+++ sources	3 Aug 2006 22:59:47 -0000	1.33
@@ -1 +1 @@
-3a81b01f31b7509a5efcbe9d3108b96a  gdm-2.15.6.tar.bz2
+23197330573ff1610c4b642e5c1df422  gdm-2.15.7.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug  3 23:07:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 19:07:05 -0400
Subject: rpms/totem/devel .cvsignore, 1.24, 1.25 sources, 1.24,
	1.25 totem.spec, 1.69, 1.70
Message-ID: <200608032307.k73N75hU013035@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12975

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
1.5.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	12 Jul 2006 05:25:58 -0000	1.24
+++ .cvsignore	3 Aug 2006 23:07:03 -0000	1.25
@@ -1 +1 @@
-totem-1.5.4.tar.bz2
+totem-1.5.90.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	12 Jul 2006 05:25:58 -0000	1.24
+++ sources	3 Aug 2006 23:07:03 -0000	1.25
@@ -1 +1 @@
-8f34cf7bc8f6d5f91137333e8558ce1a  totem-1.5.4.tar.bz2
+f4d03b463cfb08299b5bce75e3ed3ec1  totem-1.5.90.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- totem.spec	31 Jul 2006 15:33:31 -0000	1.69
+++ totem.spec	3 Aug 2006 23:07:03 -0000	1.70
@@ -4,15 +4,14 @@
 
 Summary: Movie player for GNOME 2
 Name: totem
-Version: 1.5.4
-Release: 4
+Version: 1.5.90
+Release: 1%{?dist} 
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
 Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/0.99/totem-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Patch1: totem-0.99.19-feature-help-removal.patch
-Patch2: totem-1.5.4-dbus-disconnect.patch
 Patch3: totem-1.5.4-firefox.patch
 
 Requires(post): GConf2
@@ -76,7 +75,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .feature-help-removal
-%patch2 -p1 -b .dbus-disconnect
 %patch3 -p1 -b .firefox
 
 %build
@@ -134,6 +132,16 @@
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    SCHEMAS="totem.schemas totem-handlers.schemas totem-video-thumbnail.schemas"
+    for S in $SCHEMAS; do
+      gconftool-2 --makefile-uninstall-rule \
+        %{_sysconfdir}/gconf/schemas/$S > /dev/null || :
+    done
+fi
+ 
 %postun
 /sbin/ldconfig
 update-desktop-database -q
@@ -171,6 +179,9 @@
 %{_libdir}/*so
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.90-1.fc6
+- Update to 1.5.90
+
 * Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.4-4
 - Rebuild against firefox-devel
 



From fedora-cvs-commits at redhat.com  Thu Aug  3 23:14:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 19:14:21 -0400
Subject: rpms/cman/devel cman-makefix.patch,1.2,1.3 cman.spec,1.59,1.60
Message-ID: <200608032314.k73NELRR014417@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14394

Modified Files:
	cman-makefix.patch cman.spec 
Log Message:
Fixed lib64 problem w/ make.

cman-makefix.patch:
 cman/daemon/Makefile |    2 +-
 group/lib/Makefile   |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

Index: cman-makefix.patch
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman-makefix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cman-makefix.patch	3 Aug 2006 22:04:16 -0000	1.2
+++ cman-makefix.patch	3 Aug 2006 23:14:16 -0000	1.3
@@ -1,6 +1,6 @@
 --- cman-2.0.5/group/lib/Makefile.makefix	2005-06-23 10:32:30.000000000 -0500
-+++ cman-2.0.5/group/lib/Makefile	2006-08-03 16:58:16.000000000 -0500
-@@ -18,7 +18,7 @@
++++ cman-2.0.5/group/lib/Makefile	2006-08-03 18:10:46.000000000 -0500
+@@ -18,7 +18,7 @@ STATICLIB=$(LIBNAME).a
  top_srcdir=..
  UNINSTALL=${top_srcdir}/scripts/uninstall.pl
  
@@ -9,7 +9,7 @@
  
  CFLAGS += -g -O -I. -fPIC -I../daemon
  
-@@ -34,6 +34,10 @@
+@@ -34,6 +34,10 @@ libgroup.o: libgroup.c
  copytobin: all
  
  install: all
@@ -20,3 +20,14 @@
  
  uninstall:
  
+--- cman-2.0.5/cman/daemon/Makefile.makefix	2006-08-03 18:12:33.000000000 -0500
++++ cman-2.0.5/cman/daemon/Makefile	2006-08-03 18:12:58.000000000 -0500
+@@ -33,7 +33,7 @@ copytobin: all
+ 	cp ${TARGET} ${top_srcdir}/bin
+ 
+ service_cman.lcrso: ${CMAN_OBJS}
+-	$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L${ccslibdir} -lccs
++	$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L$(ccslibdir) -lccs
+ 
+ daemon.o: daemon.c list.h cnxman-socket.h cnxman-private.h \
+   daemon.h logging.h commands.h barrier.h cmanccs.h


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- cman.spec	3 Aug 2006 22:04:16 -0000	1.59
+++ cman.spec	3 Aug 2006 23:14:16 -0000	1.60
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.5
+Release: 0.fc6.6
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager



From fedora-cvs-commits at redhat.com  Thu Aug  3 23:18:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 19:18:12 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-edid-mode-injection-2.patch, 1.2,
	1.3 xorg-x11-server.spec, 1.138, 1.139
Message-ID: <200608032318.k73NICe1026462@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server-1.1.0-edid-mode-injection-2.patch 
	xorg-x11-server.spec 
Log Message:
* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-15.fc6
- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Allow HorizSync and
  VertRefresh to be overridden independently.


xorg-x11-server-1.1.0-edid-mode-injection-2.patch:
 common/xf86Config.c |    1 
 common/xf86Mode.c   |    6 ++++
 common/xf86str.h    |    1 
 ddc/ddcProperty.c   |   64 ++++++++++++++++++++++++++++++++++++++--------------
 4 files changed, 54 insertions(+), 18 deletions(-)

Index: xorg-x11-server-1.1.0-edid-mode-injection-2.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-edid-mode-injection-2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-server-1.1.0-edid-mode-injection-2.patch	26 Jun 2006 23:22:28 -0000	1.2
+++ xorg-x11-server-1.1.0-edid-mode-injection-2.patch	3 Aug 2006 23:18:09 -0000	1.3
@@ -4,18 +4,62 @@
   elsewhere such that recording it makes your screen VERY VERY BRIGHT.
 * Record the maximum dot clock of the monitor, and filter by it.
 * De-fang an open-coded reduced-blanking check to not cripple LCDs.
+* Allow HorizSync and VertRefresh to be overridden independently.
 
 This probably needs a second glance before pushing it upstream, and of
 course this depends on the first -edid- patch.  - ajax
 
---- xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c.edid2	2006-06-26 16:59:05.000000000 -0400
-+++ xorg-server-1.1.0/hw/xfree86/ddc/ddcProperty.c	2006-06-26 16:59:33.000000000 -0400
-@@ -296,14 +296,18 @@
+--- xorg-server-1.1.1/hw/xfree86/common/xf86Config.c.edid2	2006-07-05 14:38:47.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86Config.c	2006-08-02 11:51:42.000000000 -0400
+@@ -2220,6 +2220,7 @@
+     monitorp->heightmm = conf_monitor->mon_height;
+     monitorp->reducedblanking = FALSE;
+     monitorp->options = conf_monitor->mon_option_lst;
++    monitorp->maxPixClock = 0;
+ 
+     /*
+      * fill in the monitor structure
+--- xorg-server-1.1.1/hw/xfree86/common/xf86str.h.edid2	2006-07-05 14:38:47.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-02 11:51:42.000000000 -0400
+@@ -208,6 +208,7 @@
+     pointer		options;
+     pointer		DDC;
+     Bool                reducedblanking; /* Allow CVT reduced blanking modes? */
++    int			maxPixClock;	 /* in kHz, like mode->Clock */
+ } MonRec, *MonPtr;
+ 
+ /* the list of clock ranges */
+--- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.edid2	2006-08-02 11:51:42.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-02 11:51:42.000000000 -0400
+@@ -810,6 +810,9 @@
+         }
+     }
+ 
++    if ((monitor->maxPixClock) && (mode->Clock > monitor->maxPixClock))
++	return MODE_CLOCK_HIGH;
++
+     return MODE_OK;
+ }
+ 
+@@ -1573,7 +1576,8 @@
+ 			 * horizontal timing parameters that CRTs may have
+ 			 * problems with.
+ 			 */
+-			if ((q->type & M_T_DEFAULT) &&
++			if (!scrp->monitor->reducedblanking &&
++			    (q->type & M_T_DEFAULT) &&
+ 			    ((double)q->HTotal / (double)q->HDisplay) < 1.15)
+ 			    continue;
+ 
+--- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.edid2	2006-08-02 11:51:42.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-02 12:00:49.000000000 -0400
+@@ -296,14 +296,19 @@
  xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
  {
      DisplayModePtr Modes = NULL, Mode;
 -    int i;
 +    int i, clock;
++    Bool have_hsync = FALSE, have_vrefresh = FALSE;
      
      if (!Monitor || !DDC)
          return;
@@ -31,10 +75,61 @@
          Monitor->gamma.red = DDC->features.gamma;
          Monitor->gamma.green = DDC->features.gamma;
          Monitor->gamma.blue = DDC->features.gamma;
-@@ -345,6 +349,15 @@
-             Monitor->vrefresh[0].lo = DDC->det_mon[i].section.ranges.min_v;
-             Monitor->vrefresh[0].hi = DDC->det_mon[i].section.ranges.max_v;
- 
+@@ -325,25 +330,50 @@
+     Mode = DDCModesFromStandardTiming(scrnIndex, DDC->timings2);
+     Modes = xf86ModesAdd(Modes, Mode);
+ 
++    /* Skip EDID ranges if they were specified in the config file */
++    have_hsync = (Monitor->nHsync != 0);
++    have_vrefresh = (Monitor->nVrefresh != 0);
++
+     /* Go through the detailed monitor sections */
+     for (i = 0; i < DET_TIMINGS; i++)
+         switch (DDC->det_mon[i].type) {
+         case DS_RANGES:
+-            if (Monitor->nHsync && Monitor->nVrefresh) {
+-                xf86DrvMsg(scrnIndex, X_INFO, "Ignoring EDID Ranges. Using"
+-                           " configured ranges.\n");
+-                break;
+-            }
+-
+-            xf86DrvMsg(scrnIndex, X_INFO, "Using EDID ranges info for Monitor"
+-                       " timing.\n");
+-            Monitor->nHsync = 1;
+-            Monitor->hsync[0].lo = DDC->det_mon[i].section.ranges.min_h;
+-            Monitor->hsync[0].hi = DDC->det_mon[i].section.ranges.max_h;
+-            
+-            Monitor->nVrefresh = 1;
+-            Monitor->vrefresh[0].lo = DDC->det_mon[i].section.ranges.min_v;
+-            Monitor->vrefresh[0].hi = DDC->det_mon[i].section.ranges.max_v;
++	    if (!have_hsync) {
++		if (!Monitor->nHsync)
++		    xf86DrvMsg(scrnIndex, X_INFO,
++			    "Using EDID range info for horizontal sync\n");
++		Monitor->nHsync++;
++		Monitor->hsync[Monitor->nHsync].lo =
++		    DDC->det_mon[i].section.ranges.min_h;
++		Monitor->hsync[Monitor->nHsync].hi =
++		    DDC->det_mon[i].section.ranges.max_h;
++	    } else {
++		xf86DrvMsg(scrnIndex, X_INFO,
++			"Using hsync ranges from config file\n");
++	    }
++
++	    if (!have_vrefresh) {
++		if (!Monitor->nVrefresh)
++		    xf86DrvMsg(scrnIndex, X_INFO,
++			    "Using EDID range info for vertical refresh\n");
++		Monitor->nVrefresh++;
++		Monitor->vrefresh[Monitor->nVrefresh].lo =
++		    DDC->det_mon[i].section.ranges.min_v;
++		Monitor->vrefresh[Monitor->nVrefresh].hi =
++		    DDC->det_mon[i].section.ranges.max_v;
++	    } else {
++		xf86DrvMsg(scrnIndex, X_INFO,
++			"Using vrefresh ranges from config file\n");
++	    }
++
 +	    /*
 +	     * Strictly this is wrong.  If the monitor reports multiple
 +	     * ranges, each one might have a different maximum, but I've
@@ -43,49 +138,6 @@
 +	    clock = DDC->det_mon[i].section.ranges.max_clock * 1000;
 +	    if (clock > Monitor->maxPixClock)
 +		Monitor->maxPixClock = clock;
-+
+ 
              break;
          case DT:
-             Mode = DDCModeFromDetailedTiming(scrnIndex, 
---- xorg-server-1.1.0/hw/xfree86/common/xf86Config.c.edid2	2006-04-06 21:40:52.000000000 -0400
-+++ xorg-server-1.1.0/hw/xfree86/common/xf86Config.c	2006-06-26 16:59:05.000000000 -0400
-@@ -2220,6 +2220,7 @@
-     monitorp->heightmm = conf_monitor->mon_height;
-     monitorp->reducedblanking = FALSE;
-     monitorp->options = conf_monitor->mon_option_lst;
-+    monitorp->maxPixClock = 0;
- 
-     /*
-      * fill in the monitor structure
---- xorg-server-1.1.0/hw/xfree86/common/xf86Mode.c.edid2	2006-06-26 16:59:05.000000000 -0400
-+++ xorg-server-1.1.0/hw/xfree86/common/xf86Mode.c	2006-06-26 17:00:40.000000000 -0400
-@@ -810,6 +810,9 @@
-         }
-     }
- 
-+    if ((monitor->maxPixClock) && (mode->Clock > monitor->maxPixClock))
-+	return MODE_CLOCK_HIGH;
-+
-     return MODE_OK;
- }
- 
-@@ -1573,7 +1576,8 @@
- 			 * horizontal timing parameters that CRTs may have
- 			 * problems with.
- 			 */
--			if ((q->type & M_T_DEFAULT) &&
-+			if (!scrp->monitor->reducedblanking &&
-+			    (q->type & M_T_DEFAULT) &&
- 			    ((double)q->HTotal / (double)q->HDisplay) < 1.15)
- 			    continue;
- 
---- xorg-server-1.1.0/hw/xfree86/common/xf86str.h.edid2	2006-03-07 18:58:22.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/common/xf86str.h	2006-06-26 16:59:05.000000000 -0400
-@@ -208,6 +208,7 @@
-     pointer		options;
-     pointer		DDC;
-     Bool                reducedblanking; /* Allow CVT reduced blanking modes? */
-+    int			maxPixClock;	 /* in kHz, like mode->Clock */
- } MonRec, *MonPtr;
- 
- /* the list of clock ranges */


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- xorg-x11-server.spec	28 Jul 2006 21:35:38 -0000	1.138
+++ xorg-x11-server.spec	3 Aug 2006 23:18:09 -0000	1.139
@@ -678,6 +678,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-15.fc6
+- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Allow HorizSync and
+  VertRefresh to be overridden independently.
+
 * Fri Jul 28 2006 Kevin E Martin <kem at redhat.com> - 1.1.1-14.fc6
 - xorg-x11-server-1.1.1-revert-xkb-change.patch: Revert change to xkb that
   broke XkbGetKeyboard().



From fedora-cvs-commits at redhat.com  Thu Aug  3 23:19:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 19:19:37 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.139,1.140
Message-ID: <200608032319.k73NJbTO030792@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
bump


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- xorg-x11-server.spec	3 Aug 2006 23:18:09 -0000	1.139
+++ xorg-x11-server.spec	3 Aug 2006 23:19:35 -0000	1.140
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   14%{?dist}
+Release:   15%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X



From fedora-cvs-commits at redhat.com  Thu Aug  3 23:59:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 19:59:09 -0400
Subject: rpms/conga/FC-5 conga.spec,1.7,1.8 sources,1.9,1.10
Message-ID: <200608032359.k73Nx9N3026194@cvs.devel.redhat.com>

Author: kupcevic

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

Modified Files:
	conga.spec sources 
Log Message:
Fix login issues, add cluster resources, styling...


Index: conga.spec
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/conga.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- conga.spec	28 Jul 2006 17:41:04 -0000	1.7
+++ conga.spec	3 Aug 2006 23:59:07 -0000	1.8
@@ -11,7 +11,7 @@
 ###############################################################################
 
 %define vers 0.8
-%define rel  9.1%{?dist}
+%define rel  10%{?dist}
 
 %define include_zope_and_plone     no
 %define zope_archive               Zope-2.9.3
@@ -143,7 +143,7 @@
 				%{_libdir}/luci/
 %endif
 				%{_docdir}/luci-%{version}/
-%defattr(-,luci,root)
+%defattr(-,luci,luci)
 				%{_localstatedir}/lib/luci
 
 %pre -n luci
@@ -153,42 +153,35 @@
 
 %post -n luci
 /sbin/chkconfig --add luci
+/sbin/service luci status >/dev/null 2>&1
+LUCI_RUNNING=$?
+if [ "$LUCI_RUNNING" = "0" ]; then
+   /sbin/service luci stop >/dev/null 2>&1
+fi
 if [ -e /var/lib/luci/var/luci_backup.xml ]; then
-   /sbin/service luci status >/dev/null 2>$1
-   LUCI_RUNNING=$?
-   if [ "$LUCI_RUNNING" = "0" ]; then
-      /sbin/service luci stop >/dev/null 2>$1
-   fi
-   /usr/sbin/luci_admin restore >/dev/null 2>$1
-   if [ "$LUCI_RUNNING" = "0" ]; then
-      /sbin/service luci start >/dev/null 2>$1
-   fi
+   /usr/sbin/luci_admin restore >/dev/null 2>&1
 fi
 if [ ! -e /var/lib/luci/var/certs/privkey.pem ]; then
    # no privkey.pem -> luci not initialized
-   # set initial random admin password
-   T_PASS=`dd if=/dev/urandom bs=5M count=1 2> /dev/null | sha1sum`
-   for i in $T_PASS; do
-      if [ "-" != $i ] ; then
-	echo -n "admin:{SHA}$i" > /var/lib/luci/inituser
-      fi
-   done
-   /bin/chmod 600 /var/lib/luci/inituser
-   /bin/chown luci /var/lib/luci/inituser
+   /usr/sbin/luci_admin password --random >/dev/null 2>&1
+fi
+if [ "$LUCI_RUNNING" = "0" ]; then
+   /sbin/service luci start >/dev/null 2>&1
 fi
 
+
 %preun -n luci
-/sbin/service luci status >/dev/null 2>$1
+/sbin/service luci status >/dev/null 2>&1
 LUCI_RUNNING=$?
 if [ "$LUCI_RUNNING" = "0" ]; then
-   /sbin/service luci stop >/dev/null 2>$1
+   /sbin/service luci stop >/dev/null 2>&1
 fi
-/usr/sbin/luci_admin backup >/dev/null 2>$1
+/usr/sbin/luci_admin backup >/dev/null 2>&1
 if [ "$LUCI_RUNNING" = "0" ]; then
-   /sbin/service luci start >/dev/null 2>$1
+   /sbin/service luci start >/dev/null 2>&1
 fi
 if [ "$1" = "0" ]; then
-   /sbin/service luci stop >/dev/null 2>$1
+   /sbin/service luci stop >/dev/null 2>&1
    /sbin/chkconfig --del luci
 fi
 
@@ -472,6 +465,9 @@
 
 
 %changelog
+* Thu Aug 03 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-10
+- Added zopectl to luci
+- Luci: fix login issues, add cluster resources, styling... 
 * Wed Jul 26 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-9
 - Update Luci to Plone 2.5
 * Tue Jul 25 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-8
@@ -482,7 +478,7 @@
 * Tue Jun 27 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-6
 - Luci persists users/clusters/systems/permissions across upgrades 
 * Fri Jun 16 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-4
-- Moved storage, service, log and rpm modules into main ricci.rpm.
+- Moved storage, service, log and rpm modules into main ricci.rpm
 * Wed Jun 14 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-1
 - Packaged cluster-snmp (cluster snmp agent)
 - Packaged cluster-cim (cluster CIM provider)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Jul 2006 17:41:04 -0000	1.9
+++ sources	3 Aug 2006 23:59:07 -0000	1.10
@@ -1 +1 @@
-7235c492f32e01c68e70950364f536e8  conga-0.8.tar.gz
+1ed3953833d3838e791904780525733f  conga-0.8.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug  4 00:46:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 20:46:47 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2523,
	1.2524 linux-2.6-xen.patch, 1.49, 1.50
Message-ID: <200608040046.k740klme008762@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
- Update linux-2.6-xen patch.
  * linux-2.6-xen-fedora cset 34931:a3fda906fb82
  * linux-2.6-xen cset 22777:158b51d317b76ebc94d61c25ad6a01d121dff750
  * xen-unstable cset  10866:4833dc75ce4d08e2adc4c5866b945c930a96f225




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2523
retrieving revision 1.2524
diff -u -r1.2523 -r1.2524
--- kernel-2.6.spec	3 Aug 2006 21:49:14 -0000	1.2523
+++ kernel-2.6.spec	4 Aug 2006 00:46:44 -0000	1.2524
@@ -1693,6 +1693,12 @@
 %endif
 
 %changelog
+* Fri Aug  3 2006 Juan Quintela <quintela at anano.mitica>
+- Update linux-2.6-xen patch.
+  * linux-2.6-xen-fedora cset 34931:a3fda906fb82
+  * linux-2.6-xen cset 22777:158b51d317b76ebc94d61c25ad6a01d121dff750
+  * xen-unstable cset  10866:4833dc75ce4d08e2adc4c5866b945c930a96f225
+
 * Thu Aug  3 2006 Juan Quintela <quintela at redhat.com>
 - xen hv compiled with -O2 through Config.mk
 - Update xen HV cset 10294.

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  698 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   80 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  260 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  134 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  409 ++
 arch/ia64/xen/hypervisor.c                          |  811 +++++
 arch/ia64/xen/util.c                                |  133 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   55 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  251 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  569 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  383 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  123 
 drivers/xen/netback/interface.c                     |  299 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1125 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1655 +++++++++++
 drivers/xen/pciback/Makefile                        |   14 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  912 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  295 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  220 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  517 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  440 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  602 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  158 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   77 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 410 files changed, 86101 insertions(+), 202 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.49 -r 1.50 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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- linux-2.6-xen.patch	1 Aug 2006 17:20:03 -0000	1.49
+++ linux-2.6-xen.patch	4 Aug 2006 00:46:44 -0000	1.50
@@ -1,6 +1,6 @@
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
 --- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -24,8 +24,8 @@
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
---- linux-2.6/arch/i386/Kconfig	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-07-26 17:11:03.000000000 +0200
+--- linux-2.6/arch/i386/Kconfig	2006-08-01 06:44:38.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-08-02 18:15:29.000000000 +0200
 @@ -16,10 +16,12 @@ config X86_32
  
  config GENERIC_TIME
@@ -149,7 +149,7 @@
  	---help---
  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
  	  the Memory Type Range Registers (MTRRs) may be used to control
-@@ -694,7 +694,7 @@ config MTRR
+@@ -673,7 +694,7 @@ config MTRR
  
  config EFI
  	bool "Boot from EFI support"
@@ -313,7 +313,7 @@
  	default y
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.cpu linux-2.6-xen-fedora/arch/i386/Kconfig.cpu
 --- linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-08-01 02:30:59.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -332,7 +332,7 @@
  	default y
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.debug linux-2.6-xen-fedora/arch/i386/Kconfig.debug
 --- linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-07-22 20:37:34.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-08-01 02:30:59.000000000 +0200
 @@ -2,6 +2,7 @@ menu "Kernel hacking"
  
  config TRACE_IRQFLAGS_SUPPORT
@@ -351,7 +351,7 @@
            would otherwise cause a system to silently reboot. Disabling this
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/boot-xen.c linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c
 --- linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-07-22 20:37:34.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-08-01 02:30:59.000000000 +0200
 @@ -0,0 +1,1168 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1523,7 +1523,7 @@
 +}
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/Makefile linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile
 --- linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1534,7 +1534,7 @@
 +endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
 --- linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-07-22 20:37:34.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-01 02:30:59.000000000 +0200
 @@ -4,7 +4,11 @@
  #include <asm/alternative.h>
  #include <asm/sections.h>
@@ -1549,7 +1549,7 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/apic-xen.c linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c
 --- linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-07-22 20:37:34.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-08-01 02:30:59.000000000 +0200
 @@ -0,0 +1,160 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1713,7 +1713,7 @@
 +}
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/asm-offsets.c linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c
 --- linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-07-22 21:45:45.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-08-01 02:30:59.000000000 +0200
 @@ -66,9 +66,14 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
@@ -1732,7 +1732,7 @@
  	DEFINE(VDSO_PRELINK, VDSO_PRELINK);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/common-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c
 --- linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-08-03 22:52:02.000000000 +0200
 @@ -0,0 +1,740 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
@@ -2476,7 +2476,7 @@
 +#endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile
 --- linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2488,7 +2488,7 @@
 +endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c
 --- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-08-01 02:31:00.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2689,7 +2689,7 @@
 +subsys_initcall(mtrr_init);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile
 --- linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -3,3 +3,10 @@ obj-y		+= amd.o
  obj-y		+= cyrix.o
  obj-y		+= centaur.o
@@ -2703,13 +2703,13 @@
 +endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/early_printk-xen.c linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c
 --- linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-08-01 02:31:00.000000000 +0200
 @@ -0,0 +1,2 @@
 +
 +#include "../../x86_64/kernel/early_printk-xen.c"
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/entry.S linux-2.6-xen-fedora/arch/i386/kernel/entry.S
---- linux-2.6/arch/i386/kernel/entry.S	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-07-22 21:45:45.000000000 +0200
+--- linux-2.6/arch/i386/kernel/entry.S	2006-08-01 06:44:38.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-08-02 18:15:29.000000000 +0200
 @@ -265,7 +265,7 @@ ENTRY(sysenter_entry)
  	CFI_STARTPROC simple
  	CFI_DEF_CFA esp, 0
@@ -2739,13 +2739,13 @@
  	pushl $sysenter_past_esp
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/entry-xen.S linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S
 --- linux-2.6/arch/i386/kernel/entry-xen.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S	2006-07-22 21:45:45.000000000 +0200
-@@ -0,0 +1,1188 @@
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S	2006-08-02 18:15:29.000000000 +0200
+@@ -0,0 +1,1209 @@
 +/*
 + *  linux/arch/i386/entry.S
 + *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds 
-+*/
++ *  Copyright (C) 1991, 1992  Linus Torvalds
++ */
 +
 +/*
 + * entry.S contains the system-call and fault low-level handling routines.
@@ -2977,7 +2977,7 @@
 +ENTRY(ret_from_fork)
 +	CFI_STARTPROC
 +	pushl %eax
-+	CFI_ADJUST_CFA_OFFSET -4
++	CFI_ADJUST_CFA_OFFSET 4
 +	call schedule_tail
 +	GET_THREAD_INFO(%ebp)
 +	popl %eax
@@ -3109,8 +3109,10 @@
 +14:	__DISABLE_INTERRUPTS
 +sysexit_ecrit:	/**** END OF SYSEXIT CRITICAL REGION ****/
 +	push %esp
++	CFI_ADJUST_CFA_OFFSET 4
 +	call evtchn_do_upcall
 +	add  $4,%esp
++	CFI_ADJUST_CFA_OFFSET -4
 +	jmp  ret_from_intr
 +#else
 +	sti
@@ -3158,7 +3160,6 @@
 +	movb CS(%esp), %al
 +	andl $(VM_MASK | (4 << 8) | 3), %eax
 +	cmpl $((4 << 8) | 3), %eax
-+	CFI_REMEMBER_STATE
 +	je ldt_ss			# returning to user-space with LDT SS
 +restore_nocheck:
 +#else
@@ -3173,6 +3174,7 @@
 +	jnz restore_all_enable_events	#        != 0 => enable event delivery
[...6130 lines suppressed...]
@@ -88467,7 +89510,7 @@
 +#endif /* _XEN_XENBUS_H */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/xen/xencons.h linux-2.6-xen-fedora/include/xen/xencons.h
 --- linux-2.6/include/xen/xencons.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/xencons.h	2006-07-18 03:28:32.000000000 +0200
++++ linux-2.6-xen-fedora/include/xen/xencons.h	2006-08-01 02:31:26.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef __ASM_XENCONS_H__
 +#define __ASM_XENCONS_H__
@@ -88485,7 +89528,7 @@
 +#endif /* __ASM_XENCONS_H__ */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/xen/xen_proc.h linux-2.6-xen-fedora/include/xen/xen_proc.h
 --- linux-2.6/include/xen/xen_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/xen_proc.h	2006-07-18 03:28:32.000000000 +0200
++++ linux-2.6-xen-fedora/include/xen/xen_proc.h	2006-08-01 02:31:26.000000000 +0200
 @@ -0,0 +1,13 @@
 +
 +#ifndef __ASM_XEN_PROC_H__
@@ -88502,7 +89545,7 @@
 +#endif /* __ASM_XEN_PROC_H__ */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/fork.c linux-2.6-xen-fedora/kernel/fork.c
 --- linux-2.6/kernel/fork.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/fork.c	2006-07-22 20:37:56.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/fork.c	2006-08-01 02:31:26.000000000 +0200
 @@ -275,6 +275,9 @@ static inline int dup_mmap(struct mm_str
  		if (retval)
  			goto out;
@@ -88514,9 +89557,9 @@
  out:
  	up_write(&mm->mmap_sem);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/irq/manage.c linux-2.6-xen-fedora/kernel/irq/manage.c
---- linux-2.6/kernel/irq/manage.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/irq/manage.c	2006-07-22 20:37:56.000000000 +0200
-@@ -326,7 +326,6 @@ void free_irq(unsigned int irq, void *de
+--- linux-2.6/kernel/irq/manage.c	2006-08-01 06:44:39.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/irq/manage.c	2006-08-02 18:15:29.000000000 +0200
+@@ -350,7 +350,6 @@ void free_irq(unsigned int irq, void *de
  	struct irqaction **p;
  	unsigned long flags;
  
@@ -88526,7 +89569,7 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/Kconfig.preempt linux-2.6-xen-fedora/kernel/Kconfig.preempt
 --- linux-2.6/kernel/Kconfig.preempt	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/Kconfig.preempt	2006-07-18 03:28:32.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/Kconfig.preempt	2006-08-01 02:31:26.000000000 +0200
 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
  
  config PREEMPT
@@ -88536,8 +89579,8 @@
  	  This option reduces the latency of the kernel by making
  	  all kernel code (that is not executing in a critical section)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/timer.c linux-2.6-xen-fedora/kernel/timer.c
---- linux-2.6/kernel/timer.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/timer.c	2006-07-22 20:37:56.000000000 +0200
+--- linux-2.6/kernel/timer.c	2006-08-01 06:44:39.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/timer.c	2006-08-02 18:15:30.000000000 +0200
 @@ -554,6 +554,22 @@ found:
  	if (time_before(expires, jiffies))
  		return jiffies;
@@ -88563,19 +89606,19 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/lib/Kconfig.debug linux-2.6-xen-fedora/lib/Kconfig.debug
 --- linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-07-22 20:37:56.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-08-02 18:15:30.000000000 +0200
 @@ -325,7 +325,7 @@ config FRAME_POINTER
  
  config UNWIND_INFO
  	bool "Compile the kernel with frame unwind information"
 -	depends on !IA64 && !PARISC
-+	depends on !IA64 && !PARISC && !XEN
++	depends on !IA64 && !PARISC && !X86_64_XEN
  	depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
  	help
  	  If you say Y here the resulting kernel image will be slightly larger
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/lib/Makefile linux-2.6-xen-fedora/lib/Makefile
 --- linux-2.6/lib/Makefile	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/lib/Makefile	2006-07-22 20:37:56.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Makefile	2006-08-01 02:31:26.000000000 +0200
 @@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
  obj-$(CONFIG_SMP) += percpu_counter.o
  
@@ -88588,7 +89631,7 @@
  clean-files	:= crc32table.h
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/highmem.c linux-2.6-xen-fedora/mm/highmem.c
 --- linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/highmem.c	2006-07-22 20:37:56.000000000 +0200
++++ linux-2.6-xen-fedora/mm/highmem.c	2006-08-01 02:31:27.000000000 +0200
 @@ -142,6 +142,17 @@ start:
  	return vaddr;
  }
@@ -88609,7 +89652,7 @@
  	unsigned long vaddr;
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/Kconfig linux-2.6-xen-fedora/mm/Kconfig
 --- linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/Kconfig	2006-07-22 20:37:56.000000000 +0200
++++ linux-2.6-xen-fedora/mm/Kconfig	2006-08-01 02:31:27.000000000 +0200
 @@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
  # Default to 4 for wider testing, though 8 might be more appropriate.
  # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -88627,7 +89670,7 @@
  #
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
 --- linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/memory.c	2006-07-22 20:37:57.000000000 +0200
++++ linux-2.6-xen-fedora/mm/memory.c	2006-08-01 02:31:27.000000000 +0200
 @@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
  	 * and that the resulting page looks ok.
  	 */
@@ -88770,7 +89813,7 @@
   * which was read non-atomically.  Before making any commitment, on
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/mmap.c linux-2.6-xen-fedora/mm/mmap.c
 --- linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/mmap.c	2006-07-22 20:37:57.000000000 +0200
++++ linux-2.6-xen-fedora/mm/mmap.c	2006-08-01 02:31:27.000000000 +0200
 @@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
  	unsigned long nr_accounted = 0;
  	unsigned long end;
@@ -88784,7 +89827,7 @@
  	tlb = tlb_gather_mmu(mm, 1);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/page_alloc.c linux-2.6-xen-fedora/mm/page_alloc.c
 --- linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-07-22 20:37:57.000000000 +0200
++++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-08-01 02:31:27.000000000 +0200
 @@ -443,7 +443,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -88807,7 +89850,7 @@
  		page->mapping = NULL;
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
 --- linux-2.6/net/core/dev.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/dev.c	2006-07-23 03:42:00.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/dev.c	2006-08-01 02:31:27.000000000 +0200
 @@ -117,6 +117,12 @@
  #include <linux/dmaengine.h>
  #include <linux/err.h>
@@ -88908,7 +89951,7 @@
  EXPORT_SYMBOL(br_handle_frame_hook);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/pktgen.c linux-2.6-xen-fedora/net/core/pktgen.c
 --- linux-2.6/net/core/pktgen.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/pktgen.c	2006-07-22 20:37:57.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/pktgen.c	2006-08-01 02:31:27.000000000 +0200
 @@ -6,7 +6,7 @@
   *
   * Alexey Kuznetsov  <kuznet at ms2.inr.ac.ru>
@@ -88920,7 +89963,7 @@
   * modify it under the terms of the GNU General Public License
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
 --- linux-2.6/net/core/skbuff.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-07-22 20:37:57.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-01 02:31:27.000000000 +0200
 @@ -146,6 +146,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -89009,7 +90052,7 @@
  	C(priority);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c
 --- linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-18 03:28:34.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-08-01 02:31:27.000000000 +0200
 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -89026,7 +90069,7 @@
  							   hdr->check));
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c
 --- linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-22 20:37:58.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-08-01 02:31:27.000000000 +0200
 @@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
@@ -89043,7 +90086,7 @@
  							   hdr->check));
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/xfrm4_output.c linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c
 --- linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-07-22 20:37:58.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-08-01 02:31:28.000000000 +0200
 @@ -18,6 +18,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
@@ -89066,7 +90109,7 @@
  		if (err)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
 --- linux-2.6/net/ipv6/addrconf.c	2006-07-16 19:14:10.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-07-22 20:37:58.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-08-01 02:31:28.000000000 +0200
 @@ -2488,6 +2488,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  
@@ -89085,7 +90128,7 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/scripts/Makefile.xen linux-2.6-xen-fedora/scripts/Makefile.xen
 --- linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-07-18 03:28:35.000000000 +0200
++++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-08-01 02:31:28.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)



From fedora-cvs-commits at redhat.com  Fri Aug  4 00:49:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 20:49:52 -0400
Subject: rpms/SysVinit/FC-4 sysvinit-selretryopen.patch, NONE,
	1.1 SysVinit.spec, 1.27, 1.28
Message-ID: <200608040049.k740nqML017655@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	SysVinit.spec 
Added Files:
	sysvinit-selretryopen.patch 
Log Message:
futureproof against new kernels (#201242)


sysvinit-selretryopen.patch:
 init.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

--- NEW FILE sysvinit-selretryopen.patch ---
--- sysvinit-2.85/src/init.c.selretryopen	2005-09-28 07:29:57.000000000 -0400
+++ sysvinit-2.85/src/init.c	2005-09-28 07:31:30.000000000 -0400
@@ -281,16 +281,15 @@
 
 	snprintf(policy_file,sizeof(policy_file),"%s.%d",selinux_binary_policy_path(),policy_version);
 	fd = open(policy_file, O_RDONLY);
-	if (fd < 0) {
-		/* Check previous version to see if old policy is available
-		 */
-		snprintf(policy_file,sizeof(policy_file),"%s.%d",selinux_binary_policy_path(),policy_version-1);
+	while (fd < 0 && errno == ENOENT && --policy_version) {
+		/* Check prior versions to see if old policy is available */
+		snprintf(policy_file,sizeof(policy_file),"%s.%d",selinux_binary_policy_path(),policy_version);
 		fd = open(policy_file, O_RDONLY);
-		if (fd < 0) {
-			log(L_VB,  "Can't open '%s.%d':  %s\n",
-			    selinux_binary_policy_path(),policy_version,strerror(errno));
-			goto UMOUNT;
-		}
+	}
+	if (fd < 0) {
+		log(L_VB,  "Can't open '%s.%d':  %s\n",
+		    selinux_binary_policy_path(),policy_version,strerror(errno));
+		goto UMOUNT;
 	}
   
 	if (fstat(fd, &sb) < 0) {


Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/FC-4/SysVinit.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SysVinit.spec	27 Apr 2005 15:41:25 -0000	1.27
+++ SysVinit.spec	4 Aug 2006 00:49:49 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.85
-Release: 39
+Release: 39.1
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -28,6 +28,7 @@
 Patch26: sysvinit-2.85-fixscripts.patch
 Patch27: sysvinit-2.85-chroot.patch
 Patch28: sysvinit-2.85-loginshell.patch
+Patch30: sysvinit-selretryopen.patch 
 Source1: change_console.c
 Source2: change_console.8
 Buildroot: /var/tmp/init-root
@@ -67,6 +68,7 @@
 %patch26 -p1 -b .fixscripts
 %patch27 -p1 -b .chroot
 %patch28 -p1 -b .loginshell
+%patch30 -p1 -b .retryinit
 
 %build
 make %{?_smp_mflags} CC=%{__cc} -C src
@@ -122,6 +124,9 @@
 /dev/initctl
 
 %changelog
+* Thu Aug  3 2006 Bill Nottingham <notting at redhat.com> - 2.85-39.1
+- retry for all policy versions (#201242, Stephen Smalley)
+
 * Wed Apr 27 2005 Bill Nottingham <notting at redhat.com> - 2.85-39
 - invoke single-user shell as a login shell (#105653)
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 01:56:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 21:56:35 -0400
Subject: rpms/gnome-desktop/devel .cvsignore, 1.33, 1.34 gnome-desktop.spec,
	1.60, 1.61 sources, 1.33, 1.34
Message-ID: <200608040156.k741uZSc002571@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	12 Jul 2006 13:03:00 -0000	1.33
+++ .cvsignore	4 Aug 2006 01:56:32 -0000	1.34
@@ -1 +1 @@
-gnome-desktop-2.15.4.tar.bz2
+gnome-desktop-2.15.90.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gnome-desktop.spec	12 Jul 2006 13:03:00 -0000	1.60
+++ gnome-desktop.spec	4 Aug 2006 01:56:32 -0000	1.61
@@ -11,8 +11,8 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
-Version: 2.15.4
-Release: 1
+Version: 2.15.90
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
 # FIXME: why are these needed ?
@@ -132,6 +132,9 @@
 %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15-90-1.fc6
+- Update to 2.15.90
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	12 Jul 2006 13:03:00 -0000	1.33
+++ sources	4 Aug 2006 01:56:32 -0000	1.34
@@ -1 +1 @@
-13b68f7780b885621515e487572d3eb1  gnome-desktop-2.15.4.tar.bz2
+73296a341779037ca62a82a736bcabe7  gnome-desktop-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 01:59:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 21:59:49 -0400
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.61,1.62
Message-ID: <200608040159.k741xnoe003861@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-desktop.spec 
Log Message:
2.15.90



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gnome-desktop.spec	4 Aug 2006 01:56:32 -0000	1.61
+++ gnome-desktop.spec	4 Aug 2006 01:59:47 -0000	1.62
@@ -94,6 +94,7 @@
 # stuff we don't want
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %find_lang %{po_package}
 
@@ -125,7 +126,6 @@
 %files devel
 %defattr(-,root,root,-)
 
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
@@ -134,6 +134,7 @@
 %changelog
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15-90-1.fc6
 - Update to 2.15.90
+- Don't ship static libraries
 
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4



From fedora-cvs-commits at redhat.com  Fri Aug  4 02:17:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 22:17:53 -0400
Subject: rpms/gnome-applets/devel
	gnome-applets-2.15.2-use-old-modemlights.patch, NONE,
	1.1 .cvsignore, 1.40, 1.41 gnome-applets.spec, 1.158,
	1.159 sources, 1.41, 1.42
Message-ID: <200608040217.k742HrpZ023273@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-applets.spec sources 
Added Files:
	gnome-applets-2.15.2-use-old-modemlights.patch 
Log Message:
2.15.90


gnome-applets-2.15.2-use-old-modemlights.patch:
 configure.in |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE gnome-applets-2.15.2-use-old-modemlights.patch ---
--- gnome-applets-2.15.2/configure.in.use-old-modemlights	2006-07-26 11:36:14.000000000 -0400
+++ gnome-applets-2.15.2/configure.in	2006-08-03 19:31:07.000000000 -0400
@@ -575,6 +575,7 @@
 AM_CONDITIONAL(BUILD_CPUFREQ_APPLET, test x$build_cpufreq_applet = xyes)
 AM_CONDITIONAL(BUILD_CPUFREQ_SELECTOR, test x$enable_selector = xyes)
 AM_CONDITIONAL(CPUFREQ_SELECTOR_SUID, test x$suid = xyes)
+AM_CONDITIONAL(APPLET_MODEMLIGHTS, true)
 
 dnl ***************************************************************************
 dnl *** invest-applet specific checks                                       ***
@@ -697,6 +698,9 @@
 drivemount/Makefile
 drivemount/help/Makefile
 modemlights/Makefile
+modemlights/docs/Makefile
+modemlights/docs/C/Makefile
+modemlights/docs/eu/Makefile
 multiload/Makefile
 multiload/docs/Makefile
 gkb-new/Makefile


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	19 Jun 2006 12:47:14 -0000	1.40
+++ .cvsignore	4 Aug 2006 02:17:51 -0000	1.41
@@ -3,3 +3,4 @@
 gnome-applets-2.14.1.tar.bz2
 gnome-applets-2.14.2.tar.bz2
 gnome-applets-2.15.1.1.tar.bz2
+gnome-applets-2.15.2.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- gnome-applets.spec	2 Aug 2006 15:50:52 -0000	1.158
+++ gnome-applets.spec	4 Aug 2006 02:17:51 -0000	1.159
@@ -29,18 +29,17 @@
 
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
-Version: 	2.15.1.1
-Release:  	7%{?dist}
+Version: 	2.15.2
+Release:  	1%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
 Source1:	gnome-applets-2.9.3.1-modemlights.tar.bz2
-Patch0:		gnome-applets-2.15.1.1-use-old-modemlights.patch
+Patch0:		gnome-applets-2.15.2-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.15.1.1-cpufreq.patch
-Patch9:	        gnome-applets-2.14.0-gswitchit-export-dynamic.patch
 Patch10:	gnome-applets-2.15.1.1-invest.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
@@ -118,7 +117,6 @@
 %patch0 -p1 -b .use-old-modemlights
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
-%patch9 -p1 -b .gswitchit-export-dynamic
 %patch10 -p1 -b .invest
 %patch11 -p1 -b .dont-require-display
 
@@ -140,6 +138,9 @@
 	--enable-mini-commander 
 make
 
+echo "NoDisplay=true" >> libgswitchit/gswitchit-plugins.desktop
+echo "NoDisplay=true" >> invest-applet/data/invest-chart.desktop
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -215,6 +216,7 @@
 %{_datadir}/xmodmap
 %{_datadir}/omf/*
 %{_datadir}/applications/gnome-invest-chart.desktop
+%{_datadir}/applications/gnome-gswitchit-plugins.desktop
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*
 %{python_sitelib}/invest/
@@ -250,6 +252,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.2-1.fc6
+- Update to 2.15.2
+
 * Wed Aug  2 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.1.1-7
 - don't require a display to build invest applet (bug 200970).
   Problem discovered by Nalin Dahyabhai <nalin at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	19 Jun 2006 12:47:14 -0000	1.41
+++ sources	4 Aug 2006 02:17:51 -0000	1.42
@@ -1,2 +1,2 @@
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
-d632538ac5a4ed880302be25dbdc0f69  gnome-applets-2.15.1.1.tar.bz2
+f7693a0780fe4b288c62c25d410395a9  gnome-applets-2.15.2.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 02:41:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 22:41:10 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.159,1.160
Message-ID: <200608040241.k742fAML030265@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Log Message:
fix build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- gnome-applets.spec	4 Aug 2006 02:17:51 -0000	1.159
+++ gnome-applets.spec	4 Aug 2006 02:41:08 -0000	1.160
@@ -84,6 +84,7 @@
 BuildRequires:  which
 BuildRequires:  libtool autoconf gettext
 BuildRequires:  pkgconfig
+BuildRequires:  gnome-icon-theme 
 
 Requires:	gnome-panel >= %{gnome_panel_version}
 Requires:	libxklavier >= %{libxklavier_version}



From fedora-cvs-commits at redhat.com  Fri Aug  4 03:26:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 23:26:51 -0400
Subject: rpms/gedit/devel .cvsignore, 1.44, 1.45 gedit.spec, 1.90,
	1.91 sources, 1.46, 1.47
Message-ID: <200608040326.k743QpK2026398@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26350

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.15.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	12 Jul 2006 20:50:57 -0000	1.44
+++ .cvsignore	4 Aug 2006 03:26:48 -0000	1.45
@@ -1 +1,2 @@
-gedit-2.15.4.tar.bz2
+gedit-2.15.5.tar.bz2
+docs.tar.gz


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- gedit.spec	12 Jul 2006 20:50:57 -0000	1.90
+++ gedit.spec	4 Aug 2006 03:26:48 -0000	1.91
@@ -16,12 +16,13 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.15.4
-Release: 	1
+Version: 	2.15.5
+Release: 	1%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/2.8/gedit-%{version}.tar.bz2
+Source1:	docs.tar.gz
 
 URL:		http://gedit.sourceforge.net/
 BuildRoot:	%{_tmppath}/gedit-%{version}-root
@@ -100,6 +101,8 @@
 %prep
 %setup -n gedit-%{version} -q
 
+tar xzf %{SOURCE1}
+
 %patch0 -p1 -b .filesel
 %ifarch ppc64,x86_64,ia64,s390x
 %patch1 -p1 -b .libdir
@@ -183,6 +186,9 @@
 %{_datadir}/gtk-doc/html/gedit/
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.5-1.fc6
+- Update to 2.15.6
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.4-1
 - Update to 2.15.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	12 Jul 2006 20:50:57 -0000	1.46
+++ sources	4 Aug 2006 03:26:48 -0000	1.47
@@ -1 +1,2 @@
-7f9e6a27cd674598a291b3124c4b9b33  gedit-2.15.4.tar.bz2
+252a105dfdf6488e21fa7cc9eb080418  gedit-2.15.5.tar.bz2
+f7e6256ae092d7db3590b16cf3508a9b  docs.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug  4 03:36:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 3 Aug 2006 23:36:06 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.46, 1.47 gnome-utils.spec,
	1.123, 1.124 sources, 1.50, 1.51
Message-ID: <200608040336.k743a6fa028523@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	13 Jun 2006 15:48:32 -0000	1.46
+++ .cvsignore	4 Aug 2006 03:36:04 -0000	1.47
@@ -1 +1 @@
-gnome-utils-2.15.3.tar.bz2
+gnome-utils-2.15.90.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- gnome-utils.spec	25 Jul 2006 18:02:47 -0000	1.123
+++ gnome-utils.spec	4 Aug 2006 03:36:04 -0000	1.124
@@ -9,8 +9,8 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.15.3
-Release:        2
+Version:        2.15.90
+Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -223,6 +223,9 @@
 
 
 %changelog
+* Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Tue Jul 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2
 - Obsolete the baobab package from Extras (#191298)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	13 Jun 2006 15:48:32 -0000	1.50
+++ sources	4 Aug 2006 03:36:04 -0000	1.51
@@ -1 +1 @@
-e74f8e3039660da6754e931afbab8619  gnome-utils-2.15.3.tar.bz2
+357c86a994503f9ba74d2c96345555d9  gnome-utils-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 04:45:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 00:45:28 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.124,1.125
Message-ID: <200608040445.k744jSQr008262@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
2.15.90



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- gnome-utils.spec	4 Aug 2006 03:36:04 -0000	1.124
+++ gnome-utils.spec	4 Aug 2006 04:45:20 -0000	1.125
@@ -21,7 +21,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: 	logview-close-crash.patch
-Patch1:         gnome-utils-2.15.3-chooser.patch
 
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: 	glib2-devel >= %{glib2_version}
@@ -79,7 +78,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .logview-close
-%patch1 -p1 -b .chooser
 
 # Hide from menus
 pushd gsearchtool
@@ -119,6 +117,14 @@
   --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
+desktop-file-install --vendor gnome --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+  --copy-generic-name-to-name				    \
+  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-baobab.desktop
+
+sed -i -e "s/Icon=logviewer/Icon=system-logviewer/" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-log.desktop
+  
 %find_lang gnome-utils-2.0
 
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 04:47:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 00:47:38 -0400
Subject: rpms/gdm/devel gdm.spec,1.188,1.189 gdmsetup-pam,1.1,1.2
Message-ID: <200608040447.k744lc0K011359@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9440

Modified Files:
	gdm.spec gdmsetup-pam 
Log Message:
- update gdmsetup pam file to use config-util stacks



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- gdm.spec	3 Aug 2006 22:57:46 -0000	1.188
+++ gdm.spec	4 Aug 2006 04:47:35 -0000	1.189
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -316,6 +316,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Fri Aug 4 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.7-2
+- update gdmsetup pam file to use config-util stacks
+
 * Thu Aug 3 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.7-1
 - update to 2.15.7
 - drop selinux patch that I don't think was ever finished


Index: gdmsetup-pam
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdmsetup-pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdmsetup-pam	3 Aug 2006 22:57:46 -0000	1.1
+++ gdmsetup-pam	4 Aug 2006 04:47:35 -0000	1.2
@@ -1,8 +1,4 @@
 #%PAM-1.0
-auth       sufficient   pam_rootok.so
-auth       sufficient   pam_timestamp.so
-auth       required     pam_stack.so service=system-auth
-session    required     pam_permit.so
-session    optional     pam_xauth.so
-session    optional     pam_timestamp.so
-account    required     pam_permit.so
+auth            include         config-util
+account         include         config-util
+session         include         config-util



From fedora-cvs-commits at redhat.com  Fri Aug  4 04:55:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 00:55:01 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic,1.39,1.40
Message-ID: <200608040455.k744t1S7025527@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	config-ia64-generic 
Log Message:
* Thu Aug  3 2006 Roland McGrath <roland at redhat.com>
- New utrace patch:
  - fix s390 single-step
  - first third of ia64 support, enable CONFIG_UTRACE (no ptrace yet)




Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- config-ia64-generic	27 Jul 2006 00:18:27 -0000	1.39
+++ config-ia64-generic	4 Aug 2006 04:54:58 -0000	1.40
@@ -176,5 +176,4 @@
 CONFIG_HW_RANDOM_INTEL=m
 
 # FIXME
-# CONFIG_UTRACE is not set
-
+# CONFIG_PTRACE is not set



From fedora-cvs-commits at redhat.com  Fri Aug  4 04:55:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 00:55:01 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2524,
	1.2525 linux-2.6-utrace.patch, 1.12, 1.13
Message-ID: <200608040455.k744t1lO025517@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
* Thu Aug  3 2006 Roland McGrath <roland at redhat.com>
- New utrace patch:
  - fix s390 single-step
  - first third of ia64 support, enable CONFIG_UTRACE (no ptrace yet)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2524
retrieving revision 1.2525
diff -u -r1.2524 -r1.2525
--- kernel-2.6.spec	4 Aug 2006 00:46:44 -0000	1.2524
+++ kernel-2.6.spec	4 Aug 2006 04:54:58 -0000	1.2525
@@ -1693,6 +1693,11 @@
 %endif
 
 %changelog
+* Thu Aug  3 2006 Roland McGrath <roland at redhat.com>
+- New utrace patch:
+  - fix s390 single-step
+  - first third of ia64 support, enable CONFIG_UTRACE (no ptrace yet)
+
 * Fri Aug  3 2006 Juan Quintela <quintela at anano.mitica>
 - Update linux-2.6-xen patch.
   * linux-2.6-xen-fedora cset 34931:a3fda906fb82
@@ -1717,7 +1722,7 @@
 - Readd patch to allow 460800 baud on 16C950 UARTs.
 - Fix backtracing for interrupt stacks
 
-* Wed Aug  2 2006 Jeremy Katz <katzj at redhat.com> 
+* Wed Aug  2 2006 Jeremy Katz <katzj at redhat.com>
 - add necessary ia64 hv fixes (#201040)
 
 * Wed Aug  2 2006 Dave Jones <davej at redhat.com>

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  455 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  839 +++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/ia32_entry.S             |    2 
 arch/ia64/ia32/sys_ia32.c               |   23 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/ia64/kernel/signal.c               |    4 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  553 ++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  688 +++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   74 +
 include/asm-ia64/tracehook.h            |   67 +
 include/asm-powerpc/tracehook.h         |  303 ++++++
 include/asm-s390/tracehook.h            |  105 ++
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  106 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   86 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  641 +++++++++++++
 include/linux/utrace.h                  |  471 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  259 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1562 +++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1520 +++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 92 files changed, 8245 insertions(+), 3302 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-utrace.patch	1 Aug 2006 19:44:14 -0000	1.12
+++ linux-2.6-utrace.patch	4 Aug 2006 04:54:58 -0000	1.13
@@ -10,11 +10,13 @@
  arch/i386/kernel/ptrace.c               |  839 +++++++++--------
  arch/i386/kernel/signal.c               |   39 -
  arch/i386/kernel/vm86.c                 |    7 
- arch/ia64/ia32/sys_ia32.c               |    2 
+ arch/ia64/ia32/ia32_entry.S             |    2 
+ arch/ia64/ia32/sys_ia32.c               |   23 
  arch/ia64/kernel/asm-offsets.c          |    2 
  arch/ia64/kernel/fsys.S                 |   16 
  arch/ia64/kernel/mca.c                  |    2 
  arch/ia64/kernel/ptrace.c               |   41 -
+ arch/ia64/kernel/signal.c               |    4 
  arch/mips/kernel/ptrace.c               |   21 
  arch/mips/kernel/sysirix.c              |    2 
  arch/powerpc/kernel/Makefile            |    4 
@@ -32,12 +34,12 @@
  arch/s390/kernel/compat_linux.c         |    3 
  arch/s390/kernel/compat_signal.c        |    5 
  arch/s390/kernel/process.c              |    3 
- arch/s390/kernel/ptrace.c               |  551 ++++++++++-
+ arch/s390/kernel/ptrace.c               |  553 ++++++++++-
  arch/s390/kernel/signal.c               |    4 
  arch/s390/kernel/traps.c                |    6 
  arch/sparc64/kernel/entry.S             |    6 
  arch/sparc64/kernel/process.c           |    3 
- arch/sparc64/kernel/ptrace.c            |  650 +++++++++++--
+ arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
  arch/sparc64/kernel/signal.c            |    2 
  arch/sparc64/kernel/signal32.c          |    2 
  arch/sparc64/kernel/sys_sparc32.c       |    3 
@@ -66,6 +68,7 @@
  include/asm-i386/signal.h               |    4 
  include/asm-i386/thread_info.h          |    7 
  include/asm-i386/tracehook.h            |   74 +
+ include/asm-ia64/tracehook.h            |   67 +
  include/asm-powerpc/tracehook.h         |  303 ++++++
  include/asm-s390/tracehook.h            |  105 ++
  include/asm-sparc64/tracehook.h         |   44 +
@@ -87,11 +90,12 @@
  kernel/timer.c                          |    6 
  kernel/utrace.c                         | 1520 ++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |    6 
- 89 files changed, 8168 insertions(+), 3282 deletions(-)
+ 92 files changed, 8246 insertions(+), 3303 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
  create mode 100644 include/asm-i386/tracehook.h
+ create mode 100644 include/asm-ia64/tracehook.h
  create mode 100644 include/asm-powerpc/tracehook.h
  create mode 100644 include/asm-s390/tracehook.h
  create mode 100644 include/asm-sparc64/tracehook.h
@@ -406,6 +410,76 @@
 +
 +
 +#endif
+--- linux-2.6/include/asm-ia64/tracehook.h.utrace-ptrace-compat
++++ linux-2.6/include/asm-ia64/tracehook.h
+@@ -0,0 +1,67 @@
++/*
++ * Copyright (C)2006 Intel Co
++ *	Anil S Keshavamurthy <anil.s.keshavamurthy at intel.com>
++ *	and Bibo Mao <bibo.mao at intel.com> adapted from i386.
++ *
++ * 	Tracing hooks, ia64 CPU support
++ */
++
++#ifndef _ASM_TRACEHOOK_H
++#define _ASM_TRACEHOOK_H	1
++
++#include <linux/sched.h>
++#include <asm/ptrace.h>
++
++/*
++ * See linux/tracehook.h for the descriptions of what these need to do.
++ */
++
++#define ARCH_HAS_SINGLE_STEP	(1)
++#define ARCH_HAS_BLOCK_STEP	(1)
++
++static inline void tracehook_enable_single_step(struct task_struct *tsk)
++{
++	struct pt_regs *pt = task_pt_regs(tsk);
++	ia64_psr(pt)->ss = 1;
++}
++
++static inline void tracehook_disable_single_step(struct task_struct *tsk)
++{
++	struct pt_regs *pt = task_pt_regs(tsk);
++	ia64_psr(pt)->ss = 0;
++}
++
++static inline void tracehook_enable_block_step(struct task_struct *tsk)
++{
++	struct pt_regs *pt = task_pt_regs(tsk);
++	ia64_psr(pt)->tb = 1;
++}
++
++static inline void tracehook_disable_block_step(struct task_struct *tsk)
++{
++	struct pt_regs *pt = task_pt_regs(tsk);
++	ia64_psr(pt)->tb = 0;
++}
++
++static inline void tracehook_enable_syscall_trace(struct task_struct *tsk)
++{
++	set_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE);
++}
++
++static inline void tracehook_disable_syscall_trace(struct task_struct *tsk)
++{
++	clear_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE);
++}
++
++static inline int tracehook_single_step_enabled(struct task_struct *tsk)
++{
++	struct pt_regs *pt = task_pt_regs(tsk);
++	return ia64_psr(pt)->ss;
++}
++
++static inline void tracehook_abort_syscall(struct pt_regs *regs)
++{
++	regs->r15 = -1L;
++}
++
++#endif
 --- linux-2.6/include/asm-i386/i387.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-i386/i387.h
 @@ -126,17 +126,12 @@ extern int save_i387( struct _fpstate __
@@ -2639,7 +2713,7 @@
  		csec->ptrace_sid = psec->sid;
  	return rc;
  }
-@@ -4385,7 +4385,7 @@ static int selinux_setprocattr(struct ta
+@@ -4381,7 +4381,7 @@ static int selinux_setprocattr(struct ta
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and fail. */
  		task_lock(p);
@@ -2849,7 +2923,7 @@
  
  /*
   * Handle magic process-wide effects of stop/continue signals.
-@@ -887,7 +884,7 @@ __group_complete_signal(int sig, struct 
+@@ -896,7 +893,7 @@ __group_complete_signal(int sig, struct 
  	 */
  	if (sig_fatal(p, sig) && !(p->signal->flags & SIGNAL_GROUP_EXIT) &&
  	    !sigismember(&t->real_blocked, sig) &&
@@ -2858,7 +2932,7 @@
  		/*
  		 * This signal will be fatal to the whole group.
  		 */
-@@ -1429,8 +1426,7 @@ void do_notify_parent(struct task_struct
+@@ -1438,8 +1435,7 @@ void do_notify_parent(struct task_struct
   	/* do_notify_parent_cldstop should have been called instead.  */
   	BUG_ON(tsk->state & (TASK_STOPPED|TASK_TRACED));
  
@@ -2868,7 +2942,7 @@
  
  	info.si_signo = sig;
  	info.si_errno = 0;
-@@ -1455,7 +1451,7 @@ void do_notify_parent(struct task_struct
+@@ -1464,7 +1460,7 @@ void do_notify_parent(struct task_struct
  
  	psig = tsk->parent->sighand;
  	spin_lock_irqsave(&psig->siglock, flags);
@@ -2877,7 +2951,7 @@
  	    (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN ||
  	     (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) {
  		/*
-@@ -1483,20 +1479,13 @@ void do_notify_parent(struct task_struct
+@@ -1492,20 +1488,13 @@ void do_notify_parent(struct task_struct
  	spin_unlock_irqrestore(&psig->siglock, flags);
  }
  
@@ -2899,7 +2973,7 @@
  	info.si_signo = SIGCHLD;
  	info.si_errno = 0;
  	info.si_pid = tsk->pid;
-@@ -1521,6 +1510,15 @@ static void do_notify_parent_cldstop(str
+@@ -1530,6 +1519,15 @@ static void do_notify_parent_cldstop(str
   		BUG();
   	}
  
@@ -2915,7 +2989,7 @@
  	sighand = parent->sighand;
  	spin_lock_irqsave(&sighand->siglock, flags);
  	if (sighand->action[SIGCHLD-1].sa.sa_handler != SIG_IGN &&
-@@ -1533,110 +1531,6 @@ static void do_notify_parent_cldstop(str
+@@ -1542,110 +1540,6 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -3026,7 +3100,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1645,7 +1539,7 @@ finish_stop(int stop_count)
+@@ -1654,7 +1548,7 @@ finish_stop(int stop_count)
  	 * a group stop in progress and we are the last to stop,
  	 * report to the parent.  When ptraced, every thread reports itself.
  	 */
@@ -3035,7 +3109,7 @@
  		read_lock(&tasklist_lock);
  		do_notify_parent_cldstop(current, CLD_STOPPED);
  		read_unlock(&tasklist_lock);
-@@ -1770,44 +1664,24 @@ relock:
+@@ -1779,44 +1673,24 @@ relock:
  		    handle_group_stop())
  			goto relock;
  
@@ -3096,7 +3170,7 @@
  		if (ka->sa.sa_handler == SIG_IGN) /* Do nothing.  */
  			continue;
  		if (ka->sa.sa_handler != SIG_DFL) {
-@@ -1852,7 +1726,7 @@ relock:
+@@ -1861,7 +1735,7 @@ relock:
  				spin_lock_irq(&current->sighand->siglock);
  			}
  
@@ -3105,7 +3179,7 @@
  				/* It released the siglock.  */
  				goto relock;
  			}
-@@ -1879,13 +1753,13 @@ relock:
+@@ -1888,13 +1762,13 @@ relock:
  			 * first and our do_group_exit call below will use
  			 * that value and ignore the one we pass it.
  			 */
@@ -3121,7 +3195,7 @@
  		/* NOTREACHED */
  	}
  	spin_unlock_irq(&current->sighand->siglock);
-@@ -1898,7 +1772,6 @@ EXPORT_SYMBOL(flush_signals);
+@@ -1907,7 +1781,6 @@ EXPORT_SYMBOL(flush_signals);
  EXPORT_SYMBOL(force_sig);
  EXPORT_SYMBOL(kill_pg);
  EXPORT_SYMBOL(kill_proc);
@@ -10353,7 +10427,7 @@
   * Copyright (C) 1997 Jakub Jelinek (jj at sunsite.mff.cuni.cz)
   *
   * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson,
-@@ -11,103 +11,597 @@
+@@ -11,103 +11,598 @@
   */
  
  #include <linux/kernel.h>
@@ -10383,7 +10457,13 @@
  #include <asm/page.h>
  #include <asm/cpudata.h>
 +#include <asm/psrcompat.h>
-+
+ 
+-/* Returning from ptrace is a bit tricky because the syscall return
+- * low level code assumes any value returned which is negative and
+- * is a valid errno will mean setting the condition codes to indicate
+- * an error return.  This doesn't work, so we have this hook.
+- */
+-static inline void pt_error_return(struct pt_regs *regs, unsigned long error)
 +#define GENREG_G0	0
 +#define GENREG_O0	8
 +#define GENREG_L0	16
@@ -10399,7 +10479,11 @@
 +		       const struct utrace_regset *regset,
 +		       unsigned int pos, unsigned int count,
 +		       void *kbuf, void __user *ubuf)
-+{
+ {
+-	regs->u_regs[UREG_I0] = error;
+-	regs->tstate |= (TSTATE_ICARRY | TSTATE_XCARRY);
+-	regs->tpc = regs->tnpc;
+-	regs->tnpc += 4;
 +	struct pt_regs *regs = task_pt_regs(target);
 +	int err;
 +
@@ -10449,16 +10533,12 @@
 +	}
 +
 +	return err;
-+}
+ }
  
--/* Returning from ptrace is a bit tricky because the syscall return
-- * low level code assumes any value returned which is negative and
-- * is a valid errno will mean setting the condition codes to indicate
-- * an error return.  This doesn't work, so we have this hook.
+-static inline void pt_succ_return(struct pt_regs *regs, unsigned long value)
 +/* Consistent with signal handling, we only allow userspace to
 + * modify the %asi, %icc, and %xcc fields of the %tstate register.
-  */
--static inline void pt_error_return(struct pt_regs *regs, unsigned long error)
++ */
 +#define TSTATE_DEBUGCHANGE	(TSTATE_ASI | TSTATE_ICC | TSTATE_XCC)
 +
 +static int genregs_set(struct task_struct *target,
@@ -10466,8 +10546,8 @@
 +		       unsigned int pos, unsigned int count,
 +		       const void *kbuf, const void __user *ubuf)
  {
--	regs->u_regs[UREG_I0] = error;
--	regs->tstate |= (TSTATE_ICARRY | TSTATE_XCARRY);
+-	regs->u_regs[UREG_I0] = value;
+-	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
 -	regs->tpc = regs->tnpc;
 -	regs->tnpc += 4;
 +	struct pt_regs *regs = task_pt_regs(target);
@@ -10532,7 +10612,8 @@
 +	return err;
  }
  
--static inline void pt_succ_return(struct pt_regs *regs, unsigned long value)
+-static inline void
+-pt_succ_return_linux(struct pt_regs *regs, unsigned long value, void __user *addr)
 +#define FPREG_F0	0
 +#define FPREG_FSR	32
 +#define FPREG_GSR	33
@@ -10545,10 +10626,16 @@
 +		      unsigned int pos, unsigned int count,
 +		      void *kbuf, void __user *ubuf)
  {
--	regs->u_regs[UREG_I0] = value;
--	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
--	regs->tpc = regs->tnpc;
--	regs->tnpc += 4;
+-	if (test_thread_flag(TIF_32BIT)) {
+-		if (put_user(value, (unsigned int __user *) addr)) {
+-			pt_error_return(regs, EFAULT);
+-			return;
+-		}
+-	} else {
+-		if (put_user(value, (long __user *) addr)) {
+-			pt_error_return(regs, EFAULT);
+-			return;
+-		}
 +	struct thread_info *t = task_thread_info(target);
 +	int err;
 +
@@ -10572,27 +10659,26 @@
 +			*(unsigned long *) kbuf = regs->fprs;
 +		else if (put_user(regs->fprs, (unsigned long __user *) ubuf))
 +			return -EFAULT;
-+	}
+ 	}
+-	regs->u_regs[UREG_I0] = 0;
+-	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
+-	regs->tpc = regs->tnpc;
+-	regs->tnpc += 4;
 +
 +	return err;
  }
  
--static inline void
--pt_succ_return_linux(struct pt_regs *regs, unsigned long value, void __user *addr)
+-static void
+-pt_os_succ_return (struct pt_regs *regs, unsigned long val, void __user *addr)
 +static int fpregs_set(struct task_struct *target,
 +		      const struct utrace_regset *regset,
 +		      unsigned int pos, unsigned int count,
 +		      const void *kbuf, const void __user *ubuf)
  {
--	if (test_thread_flag(TIF_32BIT)) {
--		if (put_user(value, (unsigned int __user *) addr)) {
--			pt_error_return(regs, EFAULT);
--			return;
--		}
--	} else {
--		if (put_user(value, (long __user *) addr)) {
--			pt_error_return(regs, EFAULT);
--			return;
+-	if (current->personality == PER_SUNOS)
+-		pt_succ_return (regs, val);
+-	else
+-		pt_succ_return_linux (regs, val, addr);
 +	struct thread_info *t = task_thread_info(target);
 +	int err;
 +
@@ -10619,8 +10705,10 @@
 +	}
 +
 +	return err;
-+}
-+
+ }
+ 
+-/* #define ALLOW_INIT_TRACING */
+-/* #define DEBUG_PTRACE */
 +static const struct utrace_regset native_regsets[] = {
 +	{
 +		.n = SPARC64_NGREGS,
@@ -10633,12 +10721,21 @@
 +		.get = fpregs_get, .set = fpregs_set
 +	},
 +};
-+
+ 
+-#ifdef DEBUG_PTRACE
+-char *pt_rq [] = {
+-	/* 0  */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
+-	/* 4  */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
+-	/* 8  */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
+-	/* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
+-	/* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
+-	/* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
+-	/* 24 */ "SYSCALL", ""
 +const struct utrace_regset_view utrace_sparc64_native_view = {
 +	.name = UTS_MACHINE, .e_machine = ELF_ARCH,
 +	.regsets = native_regsets,
 +	.n = sizeof native_regsets / sizeof native_regsets[0],
-+};
+ };
 +EXPORT_SYMBOL_GPL(utrace_sparc64_native_view);
 +
 +#ifdef CONFIG_COMPAT
@@ -10722,12 +10819,8 @@
 +				ubuf += sizeof(u32);
 +			pos += sizeof(u32);
 +			count -= sizeof(u32);
- 		}
- 	}
--	regs->u_regs[UREG_I0] = 0;
--	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
--	regs->tpc = regs->tnpc;
--	regs->tnpc += 4;
++		}
++	}
 +
 +	if (count > 0 && pos == (GENREG32_PSR * 4)) {
 +		u32 psr = tstate_to_psr(regs->tstate);
@@ -10791,19 +10884,13 @@
 +	}
 +
 +	return 0;
- }
- 
--static void
--pt_os_succ_return (struct pt_regs *regs, unsigned long val, void __user *addr)
++}
++
 +static int genregs32_set(struct task_struct *target,
 +			 const struct utrace_regset *regset,
 +			 unsigned int pos, unsigned int count,
 +			 const void *kbuf, const void __user *ubuf)
- {
--	if (current->personality == PER_SUNOS)
--		pt_succ_return (regs, val);
--	else
--		pt_succ_return_linux (regs, val, addr);
++{
 +	struct pt_regs *regs = task_pt_regs(target);
 +
 +	while (count > 0 && pos < (GENREG32_L0 * 4)) {
@@ -10917,25 +11004,8 @@
 +	/* Ignore WIM and TBR */
 +
 +	return 0;
- }
- 
--/* #define ALLOW_INIT_TRACING */
--/* #define DEBUG_PTRACE */
-+#define FPREG32_F0	0
-+#define FPREG32_FSR	32
- 
--#ifdef DEBUG_PTRACE
--char *pt_rq [] = {
--	/* 0  */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
--	/* 4  */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
--	/* 8  */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
--	/* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
--	/* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
--	/* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
--	/* 24 */ "SYSCALL", ""
--};
--#endif
-+#define SPARC32_NFPREGS	33
++}
+ #endif
  
 -/*
 - * Called by kernel/ptrace.c when detaching..
@@ -10943,6 +11013,11 @@
 - * Make sure single step bits etc are not set.
 - */
 -void ptrace_disable(struct task_struct *child)
++#define FPREG32_F0	0
++#define FPREG32_FSR	32
++
++#define SPARC32_NFPREGS	33
++
 +static int fpregs32_get(struct task_struct *target,
 +			const struct utrace_regset *regset,
 +			unsigned int pos, unsigned int count,
@@ -11015,7 +11090,20 @@
  /* To get the necessary page struct, access_process_vm() first calls
   * get_user_pages().  This has done a flush_dcache_page() on the
   * accessed page.  Then our caller (copy_{to,from}_user_page()) did
-@@ -644,7 +1138,8 @@ out:
+@@ -167,6 +662,7 @@ void flush_ptrace_access(struct vm_area_
+ 	}
+ }
+ 
++#if 0				/* XXX */
+ asmlinkage void do_ptrace(struct pt_regs *regs)
+ {
+ 	int request = regs->u_regs[UREG_I0];
+@@ -640,11 +1136,13 @@ out_tsk:
+ out:
+ 	unlock_kernel();
+ }
++#endif
+ 
  asmlinkage void syscall_trace(struct pt_regs *regs, int syscall_exit_p)
  {
  	/* do the secure computing check first */
@@ -11025,21 +11113,21 @@
  
  	if (unlikely(current->audit_context) && syscall_exit_p) {
  		unsigned long tstate = regs->tstate;
-@@ -656,26 +1151,9 @@ asmlinkage void syscall_trace(struct pt_
+@@ -656,26 +1154,9 @@ asmlinkage void syscall_trace(struct pt_
  		audit_syscall_exit(result, regs->u_regs[UREG_I0]);
  	}
  
 -	if (!(current->ptrace & PT_PTRACED))
 -		goto out;
-+	if (test_thread_flag(TIF_SYSCALL_TRACE))
-+		tracehook_report_syscall(regs, syscall_exit_p);
- 
+-
 -	if (!test_thread_flag(TIF_SYSCALL_TRACE))
 -		goto out;
 -
 -	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
 -				 ? 0x80 : 0));
--
++	if (test_thread_flag(TIF_SYSCALL_TRACE))
++		tracehook_report_syscall(regs, syscall_exit_p);
+ 
 -	/*
 -	 * this isn't the same as continuing with a signal, but it will do
 -	 * for normal use.  strace only continues with a signal if the
@@ -11134,6 +11222,26 @@
  	INIT_LIST_HEAD(&p->children);
  	INIT_LIST_HEAD(&p->sibling);
  	strncpy(p->comm, type, sizeof(p->comm)-1);
+--- linux-2.6/arch/ia64/kernel/signal.c.utrace-ptrace-compat
++++ linux-2.6/arch/ia64/kernel/signal.c
+@@ -10,7 +10,7 @@
+ #include <linux/errno.h>
+ #include <linux/kernel.h>
+ #include <linux/mm.h>
+-#include <linux/ptrace.h>
++#include <linux/tracehook.h>
+ #include <linux/sched.h>
+ #include <linux/signal.h>
+ #include <linux/smp.h>
+@@ -471,6 +471,8 @@ handle_signal (unsigned long sig, struct
+ 		sigaddset(&current->blocked, sig);
+ 	recalc_sigpending();
+ 	spin_unlock_irq(&current->sighand->siglock);
++
++	tracehook_report_handle_signal(sig, ka, oldset, &scr->pt);
+ 	return 1;
+ }
+ 
 --- linux-2.6/arch/ia64/kernel/fsys.S.utrace-ptrace-compat
 +++ linux-2.6/arch/ia64/kernel/fsys.S
 @@ -83,29 +83,29 @@ ENTRY(fsys_getppid)
@@ -11275,9 +11383,54 @@
  	DEFINE(IA64_TASK_SIGHAND_OFFSET,offsetof (struct task_struct, sighand));
  	DEFINE(IA64_TASK_SIGNAL_OFFSET,offsetof (struct task_struct, signal));
  	DEFINE(IA64_TASK_TGID_OFFSET, offsetof (struct task_struct, tgid));
+--- linux-2.6/arch/ia64/ia32/ia32_entry.S.utrace-ptrace-compat
++++ linux-2.6/arch/ia64/ia32/ia32_entry.S
+@@ -236,7 +236,7 @@ ia32_syscall_table:
+ 	data8 sys_setuid	/* 16-bit version */
+ 	data8 sys_getuid	/* 16-bit version */
+ 	data8 compat_sys_stime    /* 25 */
+-	data8 sys32_ptrace
++	data8 compat_sys_ptrace
+ 	data8 sys32_alarm
+ 	data8 sys_ni_syscall
+ 	data8 sys32_pause
 --- linux-2.6/arch/ia64/ia32/sys_ia32.c.utrace-ptrace-compat
 +++ linux-2.6/arch/ia64/ia32/sys_ia32.c
-@@ -1842,9 +1842,11 @@ sys32_ptrace (int request, pid_t pid, un
+@@ -1419,25 +1419,6 @@ sys32_waitpid (int pid, unsigned int *st
+ 	return compat_sys_wait4(pid, stat_addr, options, NULL);
+ }
+ 
+-static unsigned int
+-ia32_peek (struct task_struct *child, unsigned long addr, unsigned int *val)
+-{
+-	size_t copied;
+-	unsigned int ret;
+-
+-	copied = access_process_vm(child, addr, val, sizeof(*val), 0);
+-	return (copied != sizeof(ret)) ? -EIO : 0;
+-}
+-
+-static unsigned int
+-ia32_poke (struct task_struct *child, unsigned long addr, unsigned int val)
+-{
+-
+-	if (access_process_vm(child, addr, &val, sizeof(val), 1) != sizeof(val))
+-		return -EIO;
+-	return 0;
+-}
+-
+ /*
+  *  The order in which registers are stored in the ptrace regs structure
+  */
+@@ -1735,6 +1716,7 @@ restore_ia32_fpxstate (struct task_struc
+ 	return 0;
+ }
+ 
++#if 0				/* XXX */
+ asmlinkage long
+ sys32_ptrace (int request, pid_t pid, unsigned int addr, unsigned int data)
+ {
+@@ -1842,9 +1824,11 @@ sys32_ptrace (int request, pid_t pid, un
  					    compat_ptr(data));
  		break;
  
@@ -11289,6 +11442,14 @@
  
  	      case PTRACE_SYSCALL:	/* continue, stop after next syscall */
  	      case PTRACE_CONT:		/* restart after signal. */
+@@ -1865,6 +1849,7 @@ sys32_ptrace (int request, pid_t pid, un
+ 	unlock_kernel();
+ 	return ret;
+ }
++#endif
+ 
+ typedef struct {
+ 	unsigned int	ss_sp;
 --- linux-2.6/arch/ppc/kernel/asm-offsets.c.utrace-ptrace-compat
 +++ linux-2.6/arch/ppc/kernel/asm-offsets.c
 @@ -37,7 +37,6 @@ main(void)
@@ -11421,7 +11582,7 @@
  
  #ifdef CONFIG_COMPAT
  #include "compat_ptrace.h"
-@@ -87,31 +91,497 @@ FixPerRegisters(struct task_struct *task
+@@ -87,31 +91,499 @@ FixPerRegisters(struct task_struct *task
  }
  
  void
@@ -11430,6 +11591,7 @@
  {
  	task->thread.per_info.single_step = 1;
  	FixPerRegisters(task);
++	set_tsk_thread_flag(task, TIF_SINGLE_STEP);
  }
  
  void
@@ -11438,6 +11600,7 @@
  {
  	task->thread.per_info.single_step = 0;
  	FixPerRegisters(task);
++	clear_tsk_thread_flag(task, TIF_SINGLE_STEP);
  }
  
 +int
@@ -11928,7 +12091,7 @@
  #ifndef CONFIG_64BIT
  # define __ADDR_MASK 3
  #else
-@@ -593,6 +1063,7 @@ do_ptrace_emu31(struct task_struct *chil
+@@ -593,6 +1065,7 @@ do_ptrace_emu31(struct task_struct *chil
  			copied += sizeof(unsigned int);
  		}
  		return 0;
@@ -11936,7 +12099,7 @@
  	case PTRACE_GETEVENTMSG:
  		return put_user((__u32) child->ptrace_message,
  				(unsigned int __user *) data);
-@@ -606,6 +1077,7 @@ do_ptrace_emu31(struct task_struct *chil
+@@ -606,6 +1079,7 @@ do_ptrace_emu31(struct task_struct *chil
  			return -EINVAL;
  		return copy_siginfo_from_user32(child->last_siginfo,
  						(compat_siginfo_t __user *) data);
@@ -11944,7 +12107,7 @@
  	}
  	return ptrace_request(child, request, addr, data);
  }
-@@ -656,7 +1128,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -656,7 +1130,7 @@ do_ptrace(struct task_struct *child, lon
  			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
  		child->exit_code = data;
  		/* make sure the single step bit is not set. */
@@ -11953,7 +12116,7 @@
  		wake_up_process(child);
  		return 0;
  
-@@ -670,7 +1142,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -670,7 +1144,7 @@ do_ptrace(struct task_struct *child, lon
  			return 0;
  		child->exit_code = SIGKILL;
  		/* make sure the single step bit is not set. */
@@ -11962,7 +12125,7 @@
  		wake_up_process(child);
  		return 0;
  
-@@ -683,7 +1155,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -683,7 +1157,7 @@ do_ptrace(struct task_struct *child, lon
  		if (data)
  			set_tsk_thread_flag(child, TIF_SINGLE_STEP);
  		else
@@ -11971,7 +12134,7 @@
  		/* give it a chance to run. */
  		wake_up_process(child);
  		return 0;
-@@ -704,31 +1176,9 @@ do_ptrace(struct task_struct *child, lon
+@@ -704,31 +1178,9 @@ do_ptrace(struct task_struct *child, lon
  	/* Not reached.  */
  	return -EIO;
  }
@@ -12004,7 +12167,7 @@
  
  asmlinkage void
  syscall_trace(struct pt_regs *regs, int entryexit)
-@@ -736,30 +1186,17 @@ syscall_trace(struct pt_regs *regs, int 
+@@ -736,30 +1188,17 @@ syscall_trace(struct pt_regs *regs, int 
  	if (unlikely(current->audit_context) && entryexit)
  		audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
  



From fedora-cvs-commits at redhat.com  Fri Aug  4 05:24:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 01:24:04 -0400
Subject: rpms/gnome-session/devel .cvsignore, 1.24, 1.25 gnome-session.spec,
	1.77, 1.78 sources, 1.24, 1.25
Message-ID: <200608040524.k745O4RV015881@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	13 Jul 2006 02:02:31 -0000	1.24
+++ .cvsignore	4 Aug 2006 05:24:01 -0000	1.25
@@ -1 +1 @@
-gnome-session-2.15.4.tar.bz2
+gnome-session-2.15.90.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gnome-session.spec	3 Aug 2006 22:01:24 -0000	1.77
+++ gnome-session.spec	4 Aug 2006 05:24:01 -0000	1.78
@@ -13,8 +13,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.15.4
-Release: 3
+Version: 2.15.90
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -62,6 +62,7 @@
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: libnotify-devel
 BuildRequires: control-center-devel
+BuildRequires: desktop-file-utils
 
 # this is so the configure checks find /usr/bin/halt etc.
 BuildRequires: usermode
@@ -166,6 +167,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Thu Aug 4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Thu Aug 3 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.4-3
 - Add patch to (a) add configuration option for window manager, (b) start the window
   manager, and (c) disable splash screen by default.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	13 Jul 2006 02:02:31 -0000	1.24
+++ sources	4 Aug 2006 05:24:01 -0000	1.25
@@ -1 +1 @@
-3d01584d05221f708a4e05b67aefaac2  gnome-session-2.15.4.tar.bz2
+0f2a6d75c8ec82e54ac1531fb2297a27  gnome-session-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 05:34:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 01:34:57 -0400
Subject: rpms/gnome-applets/devel gnome-applets-2.15.2-multiload.patch, NONE,
	1.1 gnome-applets.spec, 1.160, 1.161
Message-ID: <200608040534.k745YuH6018927@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.15.2-multiload.patch 
Log Message:
fix multiload schema


gnome-applets-2.15.2-multiload.patch:
 multiload.schemas.in |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gnome-applets-2.15.2-multiload.patch ---
--- gnome-applets-2.15.2/multiload/multiload.schemas.in.multiload	2006-08-04 01:35:14.000000000 -0400
+++ gnome-applets-2.15.2/multiload/multiload.schemas.in	2006-08-04 01:35:27.000000000 -0400
@@ -50,6 +50,7 @@
 	<key>/schemas/apps/multiload/prefs/view_diskload</key>
 	<owner>multiload-applet-2</owner>
 	<type>bool</type>
+	<default>false</default>
 	<locale name="C">
 		<short>Enable disk load graph</short>
 	</locale>


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- gnome-applets.spec	4 Aug 2006 02:41:08 -0000	1.160
+++ gnome-applets.spec	4 Aug 2006 05:34:54 -0000	1.161
@@ -30,7 +30,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.2
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -43,6 +43,7 @@
 Patch10:	gnome-applets-2.15.1.1-invest.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
+Patch12:	gnome-applets-2.15.2-multiload.patch
 
 URL:		http://www.gnome.org/
 
@@ -120,6 +121,7 @@
 %patch4 -p1 -b .cpufreq
 %patch10 -p1 -b .invest
 %patch11 -p1 -b .dont-require-display
+%patch12 -p1 -b .multiload
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -253,6 +255,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.2-2.fc6
+- Fix the multiload schema
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.2-1.fc6
 - Update to 2.15.2
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 05:43:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 01:43:31 -0400
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.32,
	1.33 gnome-system-monitor.spec, 1.54, 1.55 sources, 1.32, 1.33
Message-ID: <200608040543.k745hVDs021553@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21486

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	12 Jul 2006 05:24:36 -0000	1.32
+++ .cvsignore	4 Aug 2006 05:43:28 -0000	1.33
@@ -1 +1 @@
-gnome-system-monitor-2.15.4.tar.bz2
+gnome-system-monitor-2.15.90.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-system-monitor.spec	12 Jul 2006 05:24:36 -0000	1.54
+++ gnome-system-monitor.spec	4 Aug 2006 05:43:28 -0000	1.55
@@ -10,8 +10,8 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.15.4
-Release: 1
+Version: 2.15.90
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2
@@ -94,6 +94,9 @@
 %{_datadir}/omf
 
 %changelog
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> 2.15.4-1
 - Update to 2.15.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	12 Jul 2006 05:24:36 -0000	1.32
+++ sources	4 Aug 2006 05:43:28 -0000	1.33
@@ -1 +1 @@
-f1ae8e398b3f824c2d4807d9faedf241  gnome-system-monitor-2.15.4.tar.bz2
+5db589b63f0d08fff52920bd0a27473e  gnome-system-monitor-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 05:51:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 01:51:05 -0400
Subject: rpms/gnome-system-monitor/devel gnome-system-monitor.spec, 1.55,
	1.56
Message-ID: <200608040551.k745p5OB015805@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15792

Modified Files:
	gnome-system-monitor.spec 
Log Message:
fix build reqs



Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-system-monitor.spec	4 Aug 2006 05:43:28 -0000	1.55
+++ gnome-system-monitor.spec	4 Aug 2006 05:51:02 -0000	1.56
@@ -30,6 +30,7 @@
 BuildRequires: startup-notification-devel
 BuildRequires: intltool scrollkeeper gettext
 BuildRequires: libselinux-devel >= %{libselinux_version}
+BuildRequires: gnome-icon-theme
 
 Requires(post): GConf2
 Requires(post): scrollkeeper



From fedora-cvs-commits at redhat.com  Fri Aug  4 05:53:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 01:53:22 -0400
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.24,
	1.25 gnome-screensaver.spec, 1.96, 1.97 sources, 1.27, 1.28
Message-ID: <200608040553.k745rMOJ015882@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
drop patch



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Jul 2006 19:18:21 -0000	1.24
+++ .cvsignore	4 Aug 2006 05:53:20 -0000	1.25
@@ -1,3 +1 @@
-gnome-screensaver-2.15.3.tar.bz2
-lock-dialog-fedoralogo-floaters.tar.gz
-gnome-screensaver-2.15.4.tar.bz2
+gnome-screensaver-2.15.5.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gnome-screensaver.spec	24 Jul 2006 03:48:11 -0000	1.96
+++ gnome-screensaver.spec	4 Aug 2006 05:53:20 -0000	1.97
@@ -12,8 +12,8 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.15.4
-Release: 6
+Version: 2.15.5
+Release: 1%{?dist} 
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -24,7 +24,6 @@
 Patch2: gnome-screensaver-2.15.4-shrink-em.patch
 Patch3: gnome-screensaver-2.15.1-invisible-char.patch
 Patch4: gnome-screensaver-2.15.4-securitytoken.patch
-Patch5: gnome-screensaver-2.15.4-dbus-deprecated.patch
 Patch6: gnome-screensaver-2.15.4-compile-warnings.patch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -68,7 +67,6 @@
 %patch2 -p1 -b .shrink-em
 %patch3 -p1 -b .invisible-char
 %patch4 -p1 -b .securitytoken
-%patch5 -p1 -b .dbus-deprecated
 %patch6 -p1 -b .compile-warnings
 
 %build
@@ -159,6 +157,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.5-1.fc6
+- Update to 2.15.5
+
 * Sun Jul 23 2006 Ray Strode <rstrode at redhat.com> - 2.15.4-6
 - don't listen for smart card events unless session was
   initiated after smart card authentication.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	11 Jul 2006 19:18:21 -0000	1.27
+++ sources	4 Aug 2006 05:53:20 -0000	1.28
@@ -1 +1 @@
-819b0b66bc4b55e0ac21639dd9b99a63  gnome-screensaver-2.15.4.tar.bz2
+a756ad73fce75f213b754786e0c75853  gnome-screensaver-2.15.5.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 06:21:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 02:21:57 -0400
Subject: rpms/kernel/FC-4 .cvsignore, 1.198, 1.199 kernel-2.6.spec, 1.1667,
	1.1668 linux-2.6-compile-fixes.patch, 1.11, 1.12 sources,
	1.182, 1.183 upstream, 1.123, 1.124
Message-ID: <200608040621.k746LvmP012277@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Log Message:
17.8rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- .cvsignore	28 Jul 2006 20:45:08 -0000	1.198
+++ .cvsignore	4 Aug 2006 06:21:51 -0000	1.199
@@ -3,3 +3,4 @@
 kernel-2.6.17
 linux-2.6.17.tar.bz2
 patch-2.6.17.7.bz2
+patch-2.6.17.8-rc1.gz


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1667
retrieving revision 1.1668
diff -u -r1.1667 -r1.1668
--- kernel-2.6.spec	29 Jul 2006 17:41:05 -0000	1.1667
+++ kernel-2.6.spec	4 Aug 2006 06:21:51 -0000	1.1668
@@ -203,6 +203,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17.7.bz2
+Patch2: patch-2.6.17.8-rc1.gz
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -464,6 +465,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -722,7 +724,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
@@ -1079,6 +1081,9 @@
 %endif
 
 %changelog
+* Fri Aug  4 2006 Dave Jones <davej at redhat.com>
+- 2.6.17.8-rc1
+
 * Sat Jul 29 2006 Dave Jones <davej at redhat.com>
 - Silence noisy SCSI ioctl. (#200638)
 

linux-2.6-compile-fixes.patch:
 0 files changed

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-compile-fixes.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-compile-fixes.patch	29 Jul 2006 02:58:45 -0000	1.11
+++ linux-2.6-compile-fixes.patch	4 Aug 2006 06:21:51 -0000	1.12
@@ -1,54 +0,0 @@
-[PATCH 2.6.17.7] Fix budget-av compile failure
-
-From: Andrew de Quincey <adq_dvb at lidskialf.net>
-
-Currently I am doing lots of refactoring work in the dvb tree. This bugfix
-became necessary to fix 2.6.17 whilst I was in the middle of this work. 
-Unfortunately after I tested the original code for the patch, I generated 
-the diff against the wrong tree (I accidentally used a tree with part of 
-the refactoring code in it). This resulted in the reported compile errors 
-because that tree (a) was incomplete, and (b) used features which are 
-simply not in the mainline kernel yet.
-
-Many apologies for the error and problems this has caused. :(
-
-Signed-off-by: Andrew de Quincey <adq_dvb at lidskialf.net>
-Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
-
-diff -Naur linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c
---- linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c	2006-07-25 14:53:19.000000000 +0100
-+++ linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c	2006-07-25 15:25:32.000000000 +0100
-@@ -58,6 +58,7 @@
- 	struct tasklet_struct ciintf_irq_tasklet;
- 	int slot_status;
- 	struct dvb_ca_en50221 ca;
-+	u8 reinitialise_demod:1;
- };
- 
- /* GPIO Connections:
-@@ -214,8 +215,9 @@
- 	while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
- 		msleep(100);
- 
--	/* reinitialise the frontend */
--	dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
-+	/* reinitialise the frontend if necessary */
-+	if (budget_av->reinitialise_demod)
-+		dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
- 
- 	if (timeout <= 0)
- 	{
-@@ -1064,12 +1066,10 @@
- 		fe = tda10021_attach(&philips_cu1216_config,
- 				     &budget_av->budget.i2c_adap,
- 				     read_pwm(budget_av));
--		if (fe) {
--			fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
--		}
- 		break;
- 
- 	case SUBID_DVBC_KNC1_PLUS:
-+		budget_av->reinitialise_demod = 1;
- 		fe = tda10021_attach(&philips_cu1216_config,
- 				     &budget_av->budget.i2c_adap,
- 				     read_pwm(budget_av));


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- sources	28 Jul 2006 20:45:08 -0000	1.182
+++ sources	4 Aug 2006 06:21:51 -0000	1.183
@@ -1,2 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 f2c255cdf482ba589151f5da03fed418  patch-2.6.17.7.bz2
+aeb071b739141bf2b3f422a057ae11ed  patch-2.6.17.8-rc1.gz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- upstream	28 Jul 2006 20:44:41 -0000	1.123
+++ upstream	4 Aug 2006 06:21:51 -0000	1.124
@@ -1,2 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.17.7.bz2
+patch-2.6.17.8-rc1.gz



From fedora-cvs-commits at redhat.com  Fri Aug  4 06:22:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 02:22:05 -0400
Subject: rpms/kernel/FC-4 patch-2.6.17.8-rc1.gz.sign,NONE,1.1
Message-ID: <200608040622.k746M5cQ012347@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	patch-2.6.17.8-rc1.gz.sign 
Log Message:
sign


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

iD8DBQBE0twRyGugalF9Dw4RAvhXAJ4td+GZCAV6Q9s+GphFPdEqKnxS5QCcCdKq
V7ZLCqG/Q4tVGZdf0cMfq4E=
=+TKQ
-----END PGP SIGNATURE-----



From fedora-cvs-commits at redhat.com  Fri Aug  4 06:22:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 02:22:19 -0400
Subject: rpms/kernel/FC-4 .cvsignore,1.199,1.200
Message-ID: <200608040622.k746MJ4U012452@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore 
Log Message:
ignore


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- .cvsignore	4 Aug 2006 06:21:51 -0000	1.199
+++ .cvsignore	4 Aug 2006 06:22:17 -0000	1.200
@@ -1,3 +1,4 @@
+clog
 kernel-2.6.*.config
 temp-*
 kernel-2.6.17



From fedora-cvs-commits at redhat.com  Fri Aug  4 06:22:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 02:22:43 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1668,1.1669
Message-ID: <200608040622.k746Mhh8012612@cvs.devel.redhat.com>

Author: davej

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

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.1668
retrieving revision 1.1669
diff -u -r1.1668 -r1.1669
--- kernel-2.6.spec	4 Aug 2006 06:21:51 -0000	1.1668
+++ kernel-2.6.spec	4 Aug 2006 06:22:40 -0000	1.1669
@@ -1081,7 +1081,7 @@
 %endif
 
 %changelog
-* Fri Aug  4 2006 Dave Jones <davej at redhat.com>
+* Fri Aug  4 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2145_FC4]
 - 2.6.17.8-rc1
 
 * Sat Jul 29 2006 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Fri Aug  4 06:26:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 02:26:19 -0400
Subject: rpms/kernel/FC-5 patch-2.6.17.8-rc1.bz2.sign, NONE, 1.1 .cvsignore,
	1.411, 1.412 kernel-2.6.spec, 1.2170,
	1.2171 linux-2.6-compile-fixes.patch, 1.57, 1.58 sources,
	1.352, 1.353 upstream, 1.321, 1.322
Message-ID: <200608040626.k746QJmJ013989@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Added Files:
	patch-2.6.17.8-rc1.bz2.sign 
Log Message:
17.8rc1


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

iD8DBQBE0twRyGugalF9Dw4RAljbAJ9b/wbqJ92ya3w6KSJmfH5tnYDfxACghAz2
A3q27fnRRbYKcMGMUAcbris=
=tgZO
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- .cvsignore	29 Jul 2006 17:43:53 -0000	1.411
+++ .cvsignore	4 Aug 2006 06:26:16 -0000	1.412
@@ -4,3 +4,4 @@
 linux-2.6.17.tar.bz2
 xen-20060708.tar.bz2
 patch-2.6.17.7.bz2
+patch-2.6.17.8-rc1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2170
retrieving revision 1.2171
diff -u -r1.2170 -r1.2171
--- kernel-2.6.spec	2 Aug 2006 20:59:28 -0000	1.2170
+++ kernel-2.6.spec	4 Aug 2006 06:26:16 -0000	1.2171
@@ -232,6 +232,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.17.7.bz2
+Patch2: patch-2.6.17.8-rc1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -675,6 +676,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -978,7 +980,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-%patch10000 -p1
+#%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
@@ -1541,6 +1543,9 @@
 %endif
 
 %changelog
+* Fri Aug  4 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2171_FC5]
+- 2.6.17.8rc1
+
 * Wed Aug  2 2006 Dave Jones <davej at redhat.com>
 - Readd patch to allow 460800 baud on 16C950 UARTs
 

linux-2.6-compile-fixes.patch:
 0 files changed

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-compile-fixes.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- linux-2.6-compile-fixes.patch	29 Jul 2006 19:07:24 -0000	1.57
+++ linux-2.6-compile-fixes.patch	4 Aug 2006 06:26:16 -0000	1.58
@@ -1,54 +0,0 @@
-[PATCH 2.6.17.7] Fix budget-av compile failure
-
-From: Andrew de Quincey <adq_dvb at lidskialf.net>
-
-Currently I am doing lots of refactoring work in the dvb tree. This bugfix
-became necessary to fix 2.6.17 whilst I was in the middle of this work. 
-Unfortunately after I tested the original code for the patch, I generated 
-the diff against the wrong tree (I accidentally used a tree with part of 
-the refactoring code in it). This resulted in the reported compile errors 
-because that tree (a) was incomplete, and (b) used features which are 
-simply not in the mainline kernel yet.
-
-Many apologies for the error and problems this has caused. :(
-
-Signed-off-by: Andrew de Quincey <adq_dvb at lidskialf.net>
-Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
-
-diff -Naur linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c
---- linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c	2006-07-25 14:53:19.000000000 +0100
-+++ linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c	2006-07-25 15:25:32.000000000 +0100
-@@ -58,6 +58,7 @@
- 	struct tasklet_struct ciintf_irq_tasklet;
- 	int slot_status;
- 	struct dvb_ca_en50221 ca;
-+	u8 reinitialise_demod:1;
- };
- 
- /* GPIO Connections:
-@@ -214,8 +215,9 @@
- 	while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
- 		msleep(100);
- 
--	/* reinitialise the frontend */
--	dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
-+	/* reinitialise the frontend if necessary */
-+	if (budget_av->reinitialise_demod)
-+		dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
- 
- 	if (timeout <= 0)
- 	{
-@@ -1064,12 +1066,10 @@
- 		fe = tda10021_attach(&philips_cu1216_config,
- 				     &budget_av->budget.i2c_adap,
- 				     read_pwm(budget_av));
--		if (fe) {
--			fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
--		}
- 		break;
- 
- 	case SUBID_DVBC_KNC1_PLUS:
-+		budget_av->reinitialise_demod = 1;
- 		fe = tda10021_attach(&philips_cu1216_config,
- 				     &budget_av->budget.i2c_adap,
- 				     read_pwm(budget_av));


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- sources	29 Jul 2006 17:43:53 -0000	1.352
+++ sources	4 Aug 2006 06:26:16 -0000	1.353
@@ -1,3 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 5f0d888de4286f08e5661e81b95c69a8  xen-20060708.tar.bz2
 f2c255cdf482ba589151f5da03fed418  patch-2.6.17.7.bz2
+3f4e32df921d09a68969698b2571ecbf  patch-2.6.17.8-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- upstream	29 Jul 2006 17:43:53 -0000	1.321
+++ upstream	4 Aug 2006 06:26:16 -0000	1.322
@@ -1,2 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.17.7.bz2
+patch-2.6.17.8-rc1.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 06:54:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 02:54:00 -0400
Subject: rpms/ftp/FC-5 netkit-ftp-0.17-longnames.patch,NONE,1.1
Message-ID: <200608040654.k746s0d1004900@cvs.devel.redhat.com>

Author: mmaslano

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

Added Files:
	netkit-ftp-0.17-longnames.patch 
Log Message:
--- netkit-ftp-0.17/ftp/cmds.c.longnames        2006-07-25 11:13:55.000000000 +0200
+++ netkit-ftp-0.17/ftp/cmds.c  2006-07-24 17:52:10.000000000 +0200
@@ -1057,10 +1057,9 @@
 status(void)
 {
        int i;
-
-       if (connected)
+       if (connected)
                printf("Connected to %s.\n", hostname);
-       else
+       else
                printf("Not connected.\n");
        if (!proxy) {
                pswitch(1);
@@ -1081,7 +1080,7 @@
                onoff(runique));
        printf("Case: %s; CR stripping: %s\n",onoff(mcase),onoff(crflag));
        if (ntflag) {
-               printf("Ntrans: (in) %s (out) %s\n", ntin,ntout);
+               printf("Ntrans: (in) %s (out) %s\n",ntin,ntout);
        }
        else {
                printf("Ntrans: off\n");
@@ -1948,14 +1947,14 @@
        }
        ntflag++;
        code = ntflag;
-       (void) strncpy(ntin, argv[1], 16);
-       ntin[16] = '\0';
+       (void) strncpy(ntin, argv[1], NTRANS_MAX);
+       ntin[NTRANS_MAX] = '\0';
        if (argc == 2) {
                ntout[0] = '\0';
                return;
        }
-       (void) strncpy(ntout, argv[2], 16);
-       ntout[16] = '\0';
+       (void) strncpy(ntout, argv[2], NTRANS_MAX);
+       ntout[NTRANS_MAX] = '\0';
 }

 static char *
@@ -1965,10 +1964,10 @@
        char *cp1, *cp2 = new;
        register int i, ostop, found;

-       for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++);
+       for (ostop = 0; *(ntout + ostop) && ostop < NTRANS_MAX; ostop++);
        for (cp1 = name; *cp1; cp1++) {
                found = 0;
-               for (i = 0; *(ntin + i) && i < 16; i++) {
+               for (i = 0; *(ntin + i) && i < NTRANS_MAX; i++) {
                        if (*cp1 == *(ntin + i)) {
                                found++;
                                if (i < ostop) {
--- netkit-ftp-0.17/ftp/ftp.c.longnames 2006-07-25 11:13:56.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp.c   2006-07-24 17:46:14.000000000 +0200
@@ -1656,8 +1656,8 @@
                int runqe;
                int mcse;
                int ntflg;
-               char nti[17];
-               char nto[17];
+               char nti[NTRANS_MAX+1];
+               char nto[NTRANS_MAX+1];
                int mapflg;
                char mi[MAXPATHLEN];
                char mo[MAXPATHLEN];
@@ -1712,11 +1712,11 @@
        mcase = op->mcse;
        ip->ntflg = ntflag;
        ntflag = op->ntflg;
-       (void) strncpy(ip->nti, ntin, 16);
-       (ip->nti)[16] = '\0';           /* shouldn't use strlen */
+       (void) strncpy(ip->nti, ntin, NTRANS_MAX);
+       (ip->nti)[NTRANS_MAX] = '\0';           /* shouldn't use strlen */
        (void) strcpy(ntin, op->nti);
-       (void) strncpy(ip->nto, ntout, 16);
-       (ip->nto)[16] = '\0';
+       (void) strncpy(ip->nto, ntout, NTRANS_MAX);
+       (ip->nto)[NTRANS_MAX] = '\0';
        (void) strcpy(ntout, op->nto);
        ip->mapflg = mapflag;
        mapflag = op->mapflg;
--- netkit-ftp-0.17/ftp/ftp_var.h.longnames     2006-07-25 11:13:56.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp_var.h       2006-07-24 15:49:37.000000000 +0200
@@ -42,6 +42,7 @@

 #include <setjmp.h>
 #include <sys/param.h>
+#define NTRANS_MAX     64

 /*
  * Tick counter step size.
@@ -82,8 +83,8 @@
 Extern char     pasv[64];       /* passive port for proxy data connection */
 Extern int      passivemode;    /* passive mode enabled */
 Extern char    *altarg;        /* argv[1] with no shell-like preprocessing  */
-Extern char    ntin[17];       /* input translation table */
-Extern char    ntout[17];      /* output translation table */
+Extern char    ntin[NTRANS_MAX+1];     /* input translation table */
+Extern char    ntout[NTRANS_MAX+1];    /* output translation table */
 Extern char    mapin[MAXPATHLEN];      /* input map template */
 Extern char    mapout[MAXPATHLEN];     /* output map template */
 Extern char    typename[32];           /* name of file transfer type */



netkit-ftp-0.17-longnames.patch:
 cmds.c    |   19 +++++++++----------
 ftp.c     |   12 ++++++------
 ftp_var.h |    5 +++--
 3 files changed, 18 insertions(+), 18 deletions(-)

--- NEW FILE netkit-ftp-0.17-longnames.patch ---
--- netkit-ftp-0.17/ftp/cmds.c.longnames	2006-07-25 11:13:55.000000000 +0200
+++ netkit-ftp-0.17/ftp/cmds.c	2006-07-24 17:52:10.000000000 +0200
@@ -1057,10 +1057,9 @@
 status(void)
 {
 	int i;
-
-	if (connected)
+	if (connected) 
 		printf("Connected to %s.\n", hostname);
-	else
+	else 
 		printf("Not connected.\n");
 	if (!proxy) {
 		pswitch(1);
@@ -1081,7 +1080,7 @@
 		onoff(runique));
 	printf("Case: %s; CR stripping: %s\n",onoff(mcase),onoff(crflag));
 	if (ntflag) {
-		printf("Ntrans: (in) %s (out) %s\n", ntin,ntout);
+		printf("Ntrans: (in) %s (out) %s\n",ntin,ntout);
 	}
 	else {
 		printf("Ntrans: off\n");
@@ -1948,14 +1947,14 @@
 	}
 	ntflag++;
 	code = ntflag;
-	(void) strncpy(ntin, argv[1], 16);
-	ntin[16] = '\0';
+	(void) strncpy(ntin, argv[1], NTRANS_MAX);
+	ntin[NTRANS_MAX] = '\0';
 	if (argc == 2) {
 		ntout[0] = '\0';
 		return;
 	}
-	(void) strncpy(ntout, argv[2], 16);
-	ntout[16] = '\0';
+	(void) strncpy(ntout, argv[2], NTRANS_MAX);
+ 	ntout[NTRANS_MAX] = '\0';
 }
 
 static char *
@@ -1965,10 +1964,10 @@
 	char *cp1, *cp2 = new;
 	register int i, ostop, found;
 
-	for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++);
+	for (ostop = 0; *(ntout + ostop) && ostop < NTRANS_MAX; ostop++);
 	for (cp1 = name; *cp1; cp1++) {
 		found = 0;
-		for (i = 0; *(ntin + i) && i < 16; i++) {
+		for (i = 0; *(ntin + i) && i < NTRANS_MAX; i++) {
 			if (*cp1 == *(ntin + i)) {
 				found++;
 				if (i < ostop) {
--- netkit-ftp-0.17/ftp/ftp.c.longnames	2006-07-25 11:13:56.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp.c	2006-07-24 17:46:14.000000000 +0200
@@ -1656,8 +1656,8 @@
 		int runqe;
 		int mcse;
 		int ntflg;
-		char nti[17];
-		char nto[17];
+		char nti[NTRANS_MAX+1];
+		char nto[NTRANS_MAX+1];
 		int mapflg;
 		char mi[MAXPATHLEN];
 		char mo[MAXPATHLEN];
@@ -1712,11 +1712,11 @@
 	mcase = op->mcse;
 	ip->ntflg = ntflag;
 	ntflag = op->ntflg;
-	(void) strncpy(ip->nti, ntin, 16);
-	(ip->nti)[16] = '\0';		/* shouldn't use strlen */
+	(void) strncpy(ip->nti, ntin, NTRANS_MAX);
+	(ip->nti)[NTRANS_MAX] = '\0';		/* shouldn't use strlen */
 	(void) strcpy(ntin, op->nti);
-	(void) strncpy(ip->nto, ntout, 16);
-	(ip->nto)[16] = '\0';
+	(void) strncpy(ip->nto, ntout, NTRANS_MAX);
+	(ip->nto)[NTRANS_MAX] = '\0';
 	(void) strcpy(ntout, op->nto);
 	ip->mapflg = mapflag;
 	mapflag = op->mapflg;
--- netkit-ftp-0.17/ftp/ftp_var.h.longnames	2006-07-25 11:13:56.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp_var.h	2006-07-24 15:49:37.000000000 +0200
@@ -42,6 +42,7 @@
 
 #include <setjmp.h>
 #include <sys/param.h>
+#define NTRANS_MAX	64
 
 /*
  * Tick counter step size.
@@ -82,8 +83,8 @@
 Extern char     pasv[64];       /* passive port for proxy data connection */
 Extern int      passivemode;    /* passive mode enabled */
 Extern char	*altarg;	/* argv[1] with no shell-like preprocessing  */
-Extern char	ntin[17];	/* input translation table */
-Extern char	ntout[17];	/* output translation table */
+Extern char	ntin[NTRANS_MAX+1];	/* input translation table */
+Extern char	ntout[NTRANS_MAX+1];	/* output translation table */
 Extern char	mapin[MAXPATHLEN];	/* input map template */
 Extern char	mapout[MAXPATHLEN];	/* output map template */
 Extern char	typename[32];		/* name of file transfer type */



From fedora-cvs-commits at redhat.com  Fri Aug  4 07:05:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 03:05:58 -0400
Subject: rpms/ftp/FC-5 ftp.spec,1.26,1.27
Message-ID: <200608040705.k7475w2o008364@cvs.devel.redhat.com>

Author: mmaslano

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

Modified Files:
	ftp.spec 
Log Message:
Spec changed.



Index: ftp.spec
===================================================================
RCS file: /cvs/dist/rpms/ftp/FC-5/ftp.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ftp.spec	11 Feb 2006 02:46:57 -0000	1.26
+++ ftp.spec	4 Aug 2006 07:05:55 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Name: ftp
 Version: 0.17
-Release: 32.1.2
+Release: 32.1.2.fc5
 License: BSD
 Group: Applications/Internet
 Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2
@@ -18,6 +18,7 @@
 Patch11: netkit-ftp-0.17-C-Frame121.patch
 Patch12: netkit-ftp-0.17-data.patch
 Patch13: netkit-ftp-0.17-multihome.patch
+Patch14: netkit-ftp-0.17-longnames.patch
 BuildRoot: /var/tmp/%{name}-root
 BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel, perl
 
@@ -44,6 +45,7 @@
 %patch11 -p1 -b .C-Frame121
 %patch12 -p1 -b .data
 %patch13 -p1 -b .multihome
+%patch14 -p1 -b .longnames
 
 %build
 sh configure --with-c-compiler=gcc --enable-ipv6
@@ -77,6 +79,9 @@
 %{_mandir}/man5/netrc.*
 
 %changelog
+* Fri Aug 4 2006 Marcela Maslanova <mmaslano at redhat.com> - 0.17-32.1.2.fc5
+- fix (#196103) patch for long filenames
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 09:19:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 05:19:20 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools-0.6.5-pre6.patch, NONE,
	1.1 ipsec-tools.spec, 1.31, 1.32
Message-ID: <200608040919.k749JKJi032058@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30731

Modified Files:
	ipsec-tools.spec 
Added Files:
	ipsec-tools-0.6.5-pre6.patch 
Log Message:
- backport of important 0.6.6 fixes:
  - sets NAT-T ports to 0 if no NAT encapsulation
  - fixed memory leak


ipsec-tools-0.6.5-pre6.patch:
 ipsec_doi.c    |    2 +-
 isakmp.c       |   12 ------------
 isakmp_xauth.c |    7 ++++++-
 pfkey.c        |   14 ++++++++++++++
 4 files changed, 21 insertions(+), 14 deletions(-)

--- NEW FILE ipsec-tools-0.6.5-pre6.patch ---
diff -ur ipsec-tools-0.6.5/src/racoon/ipsec_doi.c ipsec-tools-0.6.6/src/racoon/ipsec_doi.c
--- ipsec-tools-0.6.5/src/racoon/ipsec_doi.c	2006-08-04 10:40:13.000000000 +0200
+++ ipsec-tools-0.6.6/src/racoon/ipsec_doi.c	2006-02-02 15:37:17.000000000 +0100
@@ -2704,7 +2695,7 @@
 		attrlen += sizeof(struct isakmp_data)
 			+ sizeof(struct isakmp_data);
 		if (sa->lifetime > 0xffff)
-                        attrlen += sizeof(u_int32_t);
+			attrlen += sizeof(lifetime);
 		if (buf) {
 			p = isakmp_set_attr_l(p, OAKLEY_ATTR_SA_LD_TYPE,
 						OAKLEY_ATTR_SA_LD_TYPE_SEC);
diff -ur ipsec-tools-0.6.5/src/racoon/isakmp.c ipsec-tools-0.6.6/src/racoon/isakmp.c
--- ipsec-tools-0.6.5/src/racoon/isakmp.c	2006-08-04 10:40:13.000000000 +0200
+++ ipsec-tools-0.6.6/src/racoon/isakmp.c	2006-02-02 11:31:01.000000000 +0100
@@ -247,18 +247,6 @@
 		if ((len = recvfrom(so_isakmp, (char *)&isakmp, sizeof(isakmp),
 			    0, (struct sockaddr *)&remote, &remote_len)) < 0) {
 			plog(LLV_ERROR, LOCATION, NULL,
-				"failed to receive isakmp packet\n");
-		}
-		goto end;
-	}
-
-	/* reject it if the size is tooooo big. */
-	if (ntohl(isakmp.len) > 0xffff) {
-		plog(LLV_ERROR, LOCATION, NULL,
-			"the length of the isakmp header is too big.\n");
-		if ((len = recvfrom(so_isakmp, (char *)&isakmp, sizeof(isakmp),
-			    0, (struct sockaddr *)&remote, &remote_len)) < 0) {
-			plog(LLV_ERROR, LOCATION, NULL,
 				"failed to receive isakmp packet: %s\n",
 				strerror (errno));
 		}
diff -ur ipsec-tools-0.6.5/src/racoon/isakmp_xauth.c ipsec-tools-0.6.6/src/racoon/isakmp_xauth.c
--- ipsec-tools-0.6.5/src/racoon/isakmp_xauth.c	2005-05-20 09:31:09.000000000 +0200
+++ ipsec-tools-0.6.6/src/racoon/isakmp_xauth.c	2006-06-12 20:06:01.000000000 +0200
@@ -611,7 +611,7 @@
 	const void *data;
 	size_t len;
 	int type;
-	char *remote;
+	char *remote = NULL;
 	pam_handle_t *pam = NULL;
 
 	if (isakmp_cfg_config.port_pool == NULL) {
@@ -674,11 +674,16 @@
 		goto out;
 	}
 
+	if (remote != NULL)
+		free(remote);
+
 	return 0;
 
 out:
 	pam_end(pam, error);
 	isakmp_cfg_config.port_pool[port].pam = NULL;
+	if (remote != NULL)
+		free(remote);
 	return -1;
 }
 #endif
diff -ur ipsec-tools-0.6.5/src/racoon/pfkey.c ipsec-tools-0.6.6/src/racoon/pfkey.c
--- ipsec-tools-0.6.5/src/racoon/pfkey.c	2006-08-04 10:40:13.000000000 +0200
+++ ipsec-tools-0.6.6/src/racoon/pfkey.c	2006-05-05 11:09:03.000000000 +0200
@@ -874,6 +874,16 @@
 			return -1;
 		}
 
+#ifdef ENABLE_NATT
+		/* XXX should we do a copy of src/dst for each pr ?
+		 */
+		if (! pr->udp_encap) {
+			/* Remove port information, that SA doesn't use it */
+			set_port(src, 0);
+			set_port(dst, 0);
+		}
+#endif
+
 		plog(LLV_DEBUG, LOCATION, NULL, "call pfkey_send_getspi\n");
 		if (pfkey_send_getspi(
 				lcconf->sock_pfkey,
@@ -1094,6 +1091,10 @@
 			natt.frag = iph2->ph1->rmconf->esp_frag;
 		} else {
 			memset (&natt, 0, sizeof (natt));
+
+			/* Remove port information, that SA doesn't use it */
+			set_port(src, 0);
+			set_port(dst, 0);
 		}
 
 		if (pfkey_send_update_nat(


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ipsec-tools.spec	12 Jul 2006 06:25:30 -0000	1.31
+++ ipsec-tools.spec	4 Aug 2006 09:19:17 -0000	1.32
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.5
-Release: 3.1
+Release: 4
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -17,6 +17,7 @@
 Patch5: ipsec-tools-0.5-64bit.patch
 #Patch6: ipsec-tools-0.6.1-openssl-098.patch
 Patch7: ipsec-tools-0.6.5-mls.patch
+Patch8: ipsec-tools-0.6.5-pre6.patch
 
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -37,6 +38,7 @@
 %patch5 -p1 -b .64bit
 #%patch6 -p1 -b .openssl-098
 %patch7 -p1 -b .mls
+%patch8 -p1 -b .pre6
 
 mkdir -p kernel-headers/linux
 cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux
@@ -95,6 +97,11 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Fri Aug  4 2006 Harald Hoyer <harald at redhat.com> - 0.6.5-4
+- backport of important 0.6.6 fixes:
+  - sets NAT-T ports to 0 if no NAT encapsulation
+  - fixed memory leak
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 09:22:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 05:22:00 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-program-wild-expire-fix.patch,
	NONE, 1.1 autofs.spec, 1.136, 1.137
Message-ID: <200608040922.k749M0Ps000396@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-program-wild-expire-fix.patch 
Log Message:
* Thu Aug 4 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.11
- cthon fix expire of wildcard and program mounts broken by recent patches.


autofs-5.0.1-rc1-program-wild-expire-fix.patch:
 CHANGELOG                 |    2 ++
 daemon/automount.c        |    4 ++--
 daemon/direct.c           |   35 ++++++++++-------------------------
 daemon/indirect.c         |   36 +++++++++++-------------------------
 daemon/lookup.c           |   19 +++++++++++--------
 include/automount.h       |    6 +++---
 modules/lookup_hesiod.c   |   11 +++++++++++
 modules/lookup_program.c  |    6 ++++++
 modules/lookup_userhome.c |   18 ++++++++++++++++++
 modules/parse_sun.c       |    2 +-
 10 files changed, 75 insertions(+), 64 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-program-wild-expire-fix.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 3baff69..c0c6dd6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,8 @@
 - cthon fix expire of various forms of nested mounts.
 - cthon fix some shutdown races.
 - cthon corrections for above patch and fix shutdown expire.
+- cthon fix expire of wildcard and program mounts broken by above
+  patches.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index ff05ae2..9c3f1e9 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -375,7 +375,7 @@ int umount_multi(struct autofs_point *ap
 
 	is_autofs_fs = fs.f_type == AUTOFS_SUPER_MAGIC ? 1 : 0;
 
-	me = lookup_source_mapent(ap, path);
+	me = lookup_source_mapent(ap, path, LKP_DISTINCT);
 	if (!me) {
 		char *ind_key;
 
@@ -383,7 +383,7 @@ int umount_multi(struct autofs_point *ap
 		if (ind_key)
 			ind_key++;
 
-		me = lookup_source_mapent(ap, ind_key);
+		me = lookup_source_mapent(ap, ind_key, LKP_DISTINCT);
 		if (!me) {
 			warn(ap->logopt, "map entry not found for %s", path);
 			return 0;
diff --git a/daemon/direct.c b/daemon/direct.c
index c155617..974a50e 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -721,10 +721,10 @@ out_err:
 	return -1;
 }
 
-static int expire_direct(int ioctlfd, const char *path, unsigned int when, int count, unsigned int logopt)
+static int expire_direct(int ioctlfd, const char *path, unsigned int when, unsigned int logopt)
 {
 	char *estr, buf[MAX_ERR_BUF];
-	int ret, retries = count;
+	int ret, retries = EXPIRE_RETRIES;
 
 	while (retries--) {
 		struct timespec tm = {0, 100000000};
@@ -733,7 +733,7 @@ static int expire_direct(int ioctlfd, co
 		ret = ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &busy);
 		if (ret == -1) {
 			/* Mount has gone away */
-			if (errno == EBADF)
+			if (errno == EBADF || errno == EINVAL)
 				return 1;
 
 			estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -751,7 +751,7 @@ static int expire_direct(int ioctlfd, co
 		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_DIRECT, &when);
 		if (ret == -1) {
 			/* Mount has gone away */
-			if (errno == EBADF)
+			if (errno == EBADF || errno == EINVAL)
 				return 1;
 
 			/* Need to wait for the kernel ? */
@@ -766,11 +766,9 @@ static int expire_direct(int ioctlfd, co
 
 void *expire_proc_direct(void *arg)
 {
-	struct map_source *map;
 	struct mnt_list *mnts, *next;
 	struct expire_args *ea;
 	struct autofs_point *ap;
-	struct mapent_cache *mc = NULL;
 	struct mapent *me = NULL;
 	unsigned int now;
 	int ioctlfd = -1;
@@ -819,35 +817,22 @@ void *expire_proc_direct(void *arg)
 		 * All direct mounts must be present in the map
 		 * entry cache.
 		 */
-		master_source_readlock(ap->entry);
-		map = ap->entry->first;
-		while (map) {
-			mc = map->mc;
-			cache_readlock(mc);
-			me = cache_lookup_distinct(mc, next->path);
-			if (me)
-				break;
-			cache_unlock(mc);
-			map = map->next;
-		}
-		master_source_unlock(ap->entry);
-
+		me = lookup_source_mapent(ap, next->path, LKP_DISTINCT);
 		if (!me)
 			continue;
 
 		if (me->ioctlfd >= 0) {
 			/* Real mounts have an open ioctl fd */
 			ioctlfd = me->ioctlfd;
-			cache_unlock(mc);
+			cache_unlock(me->source->mc);
 		} else {
-			cache_unlock(mc);
+			cache_unlock(me->source->mc);
 			continue;
 		}
 
 		debug(ap->logopt, "send expire to trigger %s", next->path);
 
-		ret = expire_direct(ioctlfd, next->path,
-				    now, EXPIRE_RETRIES, ap->logopt);
+		ret = expire_direct(ioctlfd, next->path, now, ap->logopt);
 		if (!ret) {
 			debug(ap->logopt,
 			     "failed to expire mount %s", next->path);
@@ -926,7 +911,7 @@ static void *do_expire_direct(void *arg)
 		send_fail(mt->ioctlfd, mt->wait_queue_token);
 	else {
 		struct mapent *me;
-		me = lookup_source_mapent(ap, mt->name);
+		me = lookup_source_mapent(ap, mt->name, LKP_DISTINCT);
 		me->ioctlfd = -1;
 		cache_unlock(me->source->mc);
 		send_ready(mt->ioctlfd, mt->wait_queue_token);
@@ -1225,7 +1210,7 @@ cont:
 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);
 	if (status) {
 		struct mapent *me;
-		me = lookup_source_mapent(ap, mt->name);
+		me = lookup_source_mapent(ap, mt->name, LKP_DISTINCT);
 		me->ioctlfd = mt->ioctlfd;
 		cache_unlock(me->source->mc);
 		send_ready(mt->ioctlfd, mt->wait_queue_token);
diff --git a/daemon/indirect.c b/daemon/indirect.c
index af84629..b57bbd1 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -294,7 +294,7 @@ int umount_autofs_indirect(struct autofs
 
 	/* If we are trying to shutdown make sure we can umount */
 	rv = ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret);
-	if (rv) {
+	if (rv == -1) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		error(ap->logopt, "ioctl failed: %s", estr);
 		return 1;
@@ -364,7 +364,7 @@ force_umount:
 	return rv;
 }
 
-static int expire_indirect(int ioctlfd, const char *path, unsigned int when, int count, unsigned int logopt)
+static int expire_indirect(int ioctlfd, const char *path, unsigned int when, unsigned int count, unsigned int logopt)
 {
 	char *estr, buf[MAX_ERR_BUF];
 	int ret, retries = count;
@@ -376,7 +376,7 @@ static int expire_indirect(int ioctlfd, 
 		ret = ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &busy);
 		if (ret == -1) {
 			/* Mount has gone away */
-			if (errno == EBADF)
+			if (errno == EBADF || errno == EINVAL)
 				return 1;
 
 			estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -394,7 +394,7 @@ static int expire_indirect(int ioctlfd, 
 		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_DIRECT, &when);
 		if (ret == -1) {
 			/* Mount has gone away */
-			if (errno == EBADF)
+			if (errno == EBADF || errno == EINVAL)
 				return 1;
 
 			/* Need to wait for the kernel ? */
@@ -410,9 +410,7 @@ static int expire_indirect(int ioctlfd, 
 
 void *expire_proc_indirect(void *arg)
 {
-	struct map_source *map;
 	struct autofs_point *ap;
-	struct mapent_cache *mc = NULL;
 	struct mapent *me = NULL;
 	struct mnt_list *mnts, *next;
 	struct expire_args *ea;
@@ -420,6 +418,7 @@ void *expire_proc_indirect(void *arg)
 	int offsets, submnts, count;
 	int ioctlfd, limit;
 	int status, ret;
+	unsigned int retries = EXPIRE_RETRIES;
 
 	ea = (struct expire_args *) arg;
 
@@ -473,36 +472,23 @@ void *expire_proc_indirect(void *arg)
 		 * Otherwise it's a top level indirect mount (possibly
 		 * with offsets in it) and we use the usual ioctlfd.
 		 */
-		master_source_readlock(ap->entry);
-		map = ap->entry->first;
-		while (map) {
-			mc = map->mc;
-			cache_readlock(mc);
-			me = cache_lookup_distinct(mc, next->path);
-			if (!me)
-				me = cache_lookup_distinct(mc, ind_key);
-			if (me)
-				break;
-			cache_unlock(mc);
-			map = map->next;
-		}
-		master_source_unlock(ap->entry);
-
+		me = lookup_source_mapent(ap, next->path, LKP_DISTINCT);
+		if (!me && ind_key)
+			lookup_source_mapent(ap, ind_key, LKP_NORMAL);
 		if (!me)
 			continue;
 
 		if (*me->key == '/') {
 			ioctlfd = me->ioctlfd;
-			cache_unlock(mc);
+			cache_unlock(me->source->mc);
 		} else {
 			ioctlfd = ap->ioctlfd;
-			cache_unlock(mc);
+			cache_unlock(me->source->mc);
 		}
 
 		debug(ap->logopt, "expire %s", next->path);
 
-		ret = expire_indirect(ioctlfd, next->path,
-				      now, EXPIRE_RETRIES, ap->logopt);
+		ret = expire_indirect(ioctlfd, next->path, now, retries, ap->logopt);
 		if (!ret) {
 			debug(ap->logopt,
 			      "failed to expire mount %s", next->path);
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 6942121..87be647 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -931,15 +931,15 @@ int lookup_prune_cache(struct autofs_poi
 				free(path);
 				goto next;
 			}
-			status = CHE_FAIL;
-			if (this->ioctlfd == -1)
-				status = cache_delete(mc, key);
-			cache_unlock(mc);
 
-			if (status != CHE_FAIL) {
-				if (!is_mounted(_PROC_MOUNTS, path, MNTS_AUTOFS))
+			if (!is_mounted(_PROC_MOUNTS, path, MNTS_AUTOFS)) {
+				status = CHE_FAIL;
+				if (this->ioctlfd == -1)
+					status = cache_delete(mc, key);
+				if (status != CHE_FAIL)
 					rmdir_path(ap, path);
 			}
+			cache_unlock(mc);
 
 			if (!next_key) {
 				free(key);
@@ -965,7 +965,7 @@ next:
 }
 
 /* Return with cache readlock held */
-struct mapent *lookup_source_mapent(struct autofs_point *ap, const char *key)
+struct mapent *lookup_source_mapent(struct autofs_point *ap, const char *key, unsigned int type)
 {
 	struct master_mapent *entry = ap->entry;
 	struct map_source *map;
@@ -978,7 +978,10 @@ struct mapent *lookup_source_mapent(stru
 	while (map) {
 		mc = map->mc;
 		cache_readlock(mc);
-		me = cache_lookup_distinct(mc, key);
+		if (type == LKP_DISTINCT)
+			me = cache_lookup_distinct(mc, key);
+		else
+			me = cache_lookup_distinct(mc, key);
 		if (me)
 			break;
 		cache_unlock(mc);
diff --git a/include/automount.h b/include/automount.h
index 800e7b0..f7345c5 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -95,8 +95,8 @@ #define LKP_WILD	0x0100
 #define LKP_LOOKUP	0x0200
 #define LKP_GHOST	0x0400
 #define LKP_REREAD	0x0800
-#define LKP_EMPTY	0x1000
-#define LKP_ERR_FORMAT	0x2000
+#define LKP_NORMAL	0x1000
+#define LKP_DISTINCT	0x2000
 #define LKP_ERR_MOUNT	0x4000
 #define LKP_NOTSUP	0x8000
 
@@ -228,7 +228,7 @@ int lookup_ghost(struct autofs_point *ap
 int lookup_nss_mount(struct autofs_point *ap, const char *name, int name_len);
 void lookup_close_lookup(struct autofs_point *ap);
 int lookup_prune_cache(struct autofs_point *ap, time_t age);
-struct mapent *lookup_source_mapent(struct autofs_point *ap, const char *key);
+struct mapent *lookup_source_mapent(struct autofs_point *ap, const char *key, unsigned int type);
 int lookup_source_close_ioctlfd(struct autofs_point *ap, const char *key);
 
 #ifdef MODULE_LOOKUP
diff --git a/modules/lookup_hesiod.c b/modules/lookup_hesiod.c
index 1664afc..f30e9b2 100644
--- a/modules/lookup_hesiod.c
+++ b/modules/lookup_hesiod.c
@@ -100,15 +100,20 @@ int lookup_read_map(struct autofs_point 
  */
 int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *context)
 {
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char **hes_result;
 	struct lookup_context *ctxt = (struct lookup_context *) context;
 	int status, rv;
 	char **record, *best_record = NULL, *p;
 	int priority, lowest_priority = INT_MAX;	
 
+	source = ap->entry->current;
 	ap->entry->current = NULL;
 	master_source_current_signal(ap->entry);
 
+	mc = source->mc;
+
 	debug(ap->logopt,
 	      MODPREFIX "looking up root=\"%s\", name=\"%s\"",
 	      ap->path, name);
@@ -148,6 +153,12 @@ int lookup_mount(struct autofs_point *ap
 	    }
 	}
 
+	cache_writelock(mc);
+	rv = cache_update(mc, source, name, best_record, time(NULL));
+	cache_unlock(mc);
+	if (rv == CHE_FAIL)
+		return NSS_STATUS_UNAVAIL;
+
 	debug(ap->logopt,
 	      MODPREFIX "lookup for \"%s\" gave \"%s\"",
 	      name, best_record);
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index c589d05..0076596 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -346,6 +346,12 @@ int lookup_mount(struct autofs_point *ap
 		goto out_free;
 	}
 
+	cache_writelock(mc);
+	ret = cache_update(mc, source, name, mapent, time(NULL));
+	cache_unlock(mc);
+	if (ret == CHE_FAIL)
+		return NSS_STATUS_UNAVAIL;
+
 	debug(ap->logopt, MODPREFIX "%s -> %s", name, mapent);
 
 	master_source_current_wait(ap->entry);
diff --git a/modules/lookup_userhome.c b/modules/lookup_userhome.c
index cc0b4fa..efcab0b 100644
--- a/modules/lookup_userhome.c
+++ b/modules/lookup_userhome.c
@@ -49,11 +49,18 @@ int lookup_read_map(struct autofs_point 
 
 int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *context)
 {
+	struct map_source *source;
+	struct mapent_cache *mc;
 	struct passwd *pw;
 	char buf[MAX_ERR_BUF];
+	int ret;
 
+	source = ap->entry->current;
 	ap->entry->current = NULL;
 	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	debug(ap->logopt, MODPREFIX "looking up %s", name);
 
 	/* Get the equivalent username */
@@ -70,12 +77,23 @@ int lookup_mount(struct autofs_point *ap
 		return NSS_STATUS_UNAVAIL;
 	}
 
+	cache_writelock(mc);
+	ret = cache_update(mc, source, name, NULL, time(NULL));
+	cache_unlock(mc);
+
+	if (ret == CHE_FAIL) {
+		ret = chdir("/");
+		return NSS_STATUS_UNAVAIL;
+	}
+
 	if (symlink(pw->pw_dir, name) && errno != EEXIST) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		error(ap->logopt, MODPREFIX "symlink failed: %s", estr);
 		return NSS_STATUS_UNAVAIL;
 	}
 
+	ret = chdir("/");
+
 	return NSS_STATUS_SUCCESS;
 }
 
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 0f2c3ab..25d2eda 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -1215,7 +1215,7 @@ int parse_mount(struct autofs_point *ap,
 		if (ap->submount)
 			oap = ap->parent;
 
-		me = lookup_source_mapent(oap, name);
+		me = lookup_source_mapent(oap, name, LKP_DISTINCT);
 		if (me) {
 			char *m_key;
 			int start;


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- autofs.spec	3 Aug 2006 08:45:48 -0000	1.136
+++ autofs.spec	4 Aug 2006 09:21:57 -0000	1.137
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.10
+%define release 0.rc1.11
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -27,6 +27,7 @@
 Patch14: autofs-5.0.1-rc1-compile-error.patch
 Patch15: autofs-5.0.1-rc1-shutdown-races.patch
 Patch16: autofs-5.0.1-rc1-shutdown-submount-expire.patch
+Patch17: autofs-5.0.1-rc1-program-wild-expire-fix.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -82,6 +83,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -138,6 +140,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Aug 4 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.11
+- cthon fix expire of wildcard and program mounts broken by recent
+  patches.
+
 * Thu Aug 3 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.10
 - cthon corrections for shutdown patch below and fix shutdown expire.
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 09:53:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 05:53:40 -0400
Subject: rpms/autofs/devel autofs.spec,1.137,1.138
Message-ID: <200608040953.k749reTq023438@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Log Message:
* Thu Aug 4 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.12
- enable mtab locking until I can resolve the race with it.



Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- autofs.spec	4 Aug 2006 09:21:57 -0000	1.137
+++ autofs.spec	4 Aug 2006 09:53:37 -0000	1.138
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.11
+%define release 0.rc1.12
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -87,7 +87,7 @@
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
-%configure --disable-mount-locking --enable-ignore-busy
+%configure --enable-ignore-busy
 make initdir=/etc/rc.d/init.d DONTSTRIP=1
 
 %install
@@ -140,6 +140,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Aug 4 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.12
+- enable mtab locking until I can resolve the race with it.
+
 * Thu Aug 4 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.11
 - cthon fix expire of wildcard and program mounts broken by recent
   patches.



From fedora-cvs-commits at redhat.com  Fri Aug  4 10:24:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 06:24:23 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.164,
	1.165
Message-ID: <200608041024.k74AONUH015338@cvs.devel.redhat.com>

Author: gbenson

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15260

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Fri Aug  4 2006 Gary Benson <gbenson at redhat.com>
- Move aot-compile and its libraries to the devel subpackage.



Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- java-1.4.2-gcj-compat.spec	1 Aug 2006 16:11:56 -0000	1.164
+++ java-1.4.2-gcj-compat.spec	4 Aug 2006 10:24:21 -0000	1.165
@@ -592,9 +592,6 @@
 %dir %{jvmjardir}
 %if ! %{custom}
 %{_bindir}/rebuild-gcj-db
-%{_bindir}/aot-compile
-%{python_sitelib}/aotcompile.py*
-%{python_sitelib}/classfile.py*
 %endif
 %{jvmjardir}/*.jar
 %{_jvmdir}/%{jrelnk}
@@ -618,7 +615,10 @@
 %doc
 %dir %{_jvmdir}/%{sdkdir}/bin
 %if ! %{custom}
+%{_bindir}/aot-compile
 %{_bindir}/aot-compile-rpm
+%{python_sitelib}/aotcompile.py*
+%{python_sitelib}/classfile.py*
 %endif
 %{_jvmdir}/%{sdkdir}/lib
 %{_jvmdir}/%{sdkdir}/include
@@ -642,6 +642,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Fri Aug  4 2006 Gary Benson <gbenson at redhat.com>
+- Move aot-compile and its libraries to the devel subpackage.
+
 * Tue Aug  1 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_100rh
 - Require gcc-java for devel and src post and postun. (199942)
 - Require libgcj for plugin post and postun. (199942)



From fedora-cvs-commits at redhat.com  Fri Aug  4 11:50:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 07:50:36 -0400
Subject: rpms/nfs-utils-lib/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200608041150.k74BoaLQ025117@cvs.devel.redhat.com>

Author: steved

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

Modified Files:
	.cvsignore sources 
Log Message:
uploaded librpcsecgss-0.14.tar.gz



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jun 2006 18:28:33 -0000	1.3
+++ .cvsignore	4 Aug 2006 11:50:34 -0000	1.4
@@ -2,3 +2,4 @@
 librpcsecgss-0.7.tar.gz
 librpcsecgss-0.13.tar.gz
 libnfsidmap-0.16.tar.gz
+librpcsecgss-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Jun 2006 18:28:33 -0000	1.3
+++ sources	4 Aug 2006 11:50:34 -0000	1.4
@@ -1,2 +1,2 @@
-024143270490e0e252832c9f64499645  librpcsecgss-0.13.tar.gz
 ab167a7449c029bd9f26e8275cc95c7b  libnfsidmap-0.16.tar.gz
+0d4cdee46a98731b1b71e30504589281  librpcsecgss-0.14.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug  4 12:17:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 08:17:42 -0400
Subject: rpms/squid/devel squid.spec,1.69,1.70
Message-ID: <200608041217.k74CHgVl020596@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20567

Modified Files:
	squid.spec 
Log Message:
added patch for #198253 - squid: don't chgrp another pkg's directory


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- squid.spec	31 Jul 2006 08:01:04 -0000	1.69
+++ squid.spec	4 Aug 2006 12:17:39 -0000	1.70
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.6.STABLE2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -319,9 +319,14 @@
 fi
 
 %triggerin -- samba-common
-chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
+/usr/sbin/usermod -a -G winbind squid >/dev/null 2>&1 || \
+    chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri Aug 04 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE2-2
+- added patch for #198253 - squid: don't chgrp another pkg's
+  files/directory
+
 * Mon Jul 31 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE2-1
 - the latest stable upstream
 - reworked fd config patch



From fedora-cvs-commits at redhat.com  Fri Aug  4 12:23:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 08:23:04 -0400
Subject: rpms/libgssapi/devel .cvsignore, 1.5, 1.6 libgssapi.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200608041223.k74CN4sn022625@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/libgssapi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22546

Modified Files:
	.cvsignore libgssapi.spec sources 
Log Message:
Upgraded to libgssapi version 0.10 which is need for
compatibility with krb5-libs 1.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jun 2006 20:35:36 -0000	1.5
+++ .cvsignore	4 Aug 2006 12:23:02 -0000	1.6
@@ -1,2 +1,3 @@
 libgssapi-0.7.tar.gz
 libgssapi-0.9.tar.gz
+libgssapi-0.10.tar.gz


Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libgssapi.spec	12 Jul 2006 06:53:07 -0000	1.11
+++ libgssapi.spec	4 Aug 2006 12:23:02 -0000	1.12
@@ -1,16 +1,16 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
-Version: 0.9
-Release: 2.1
+Version: 0.10
+Release: 1
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
-Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.9.tar.gz
+Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.10.tar.gz
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig
-PreReq: krb5-libs
+PreReq: krb5-libs >= 1.5
 
 %description
 This library exports a gssapi interface, but doesn't implement any gssapi
@@ -66,6 +66,10 @@
 %{_libdir}/pkgconfig/libgssapi.pc
 
 %changelog
+* Fri Aug  4 2006 Steve Dickson <steved at redhat.com> - 0.10-1
+- Upgraded to libgssapi version 0.10 which is need for
+  compatibility with krb5-libs 1.5.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jun 2006 20:35:36 -0000	1.5
+++ sources	4 Aug 2006 12:23:02 -0000	1.6
@@ -1 +1 @@
-6a71e2d1d0d865baee12f1a1aace0d6a  libgssapi-0.9.tar.gz
+0a384f8efaefe45373bb206b592152b5  libgssapi-0.10.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug  4 12:27:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 08:27:30 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-directory-cleanup.patch, NONE,
	1.1 autofs.spec, 1.138, 1.139
Message-ID: <200608041227.k74CRU8Y024333@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-directory-cleanup.patch 
Log Message:
* Thu Aug 4 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.13
- tidy up directory cleanup and add validation check to rmdir_path.


autofs-5.0.1-rc1-directory-cleanup.patch:
 CHANGELOG                |    1 +
 daemon/automount.c       |   24 +++++++++++++++++-------
 daemon/direct.c          |    6 ++++--
 daemon/indirect.c        |    2 +-
 daemon/lookup.c          |    8 ++++++--
 include/automount.h      |    2 +-
 modules/lookup_file.c    |    2 +-
 modules/lookup_ldap.c    |    2 +-
 modules/lookup_nisplus.c |    2 +-
 modules/lookup_yp.c      |    2 +-
 modules/mount_bind.c     |   16 ++++++++--------
 modules/mount_changer.c  |   12 +++++++-----
 modules/mount_ext2.c     |   12 +++++++-----
 modules/mount_generic.c  |   11 ++++++-----
 modules/mount_nfs.c      |   11 ++++++-----
 15 files changed, 68 insertions(+), 45 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-directory-cleanup.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index c0c6dd6..5a594ff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@
 - cthon corrections for above patch and fix shutdown expire.
 - cthon fix expire of wildcard and program mounts broken by above
   patches.
+- tidy up directory cleanup and add validation check to rmdir_path.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 9c3f1e9..736d54a 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -106,13 +106,14 @@ int mkdir_path(const char *path, mode_t 
 }
 
 /* Remove as much as possible of a path */
-int rmdir_path(struct autofs_point *ap, const char *path)
+int rmdir_path(struct autofs_point *ap, const char *path, dev_t dev)
 {
 	int len = strlen(path);
 	char *buf = alloca(len + 1);
 	char *cp;
 	int first = 1;
 	struct stat st;
+	struct statfs fs;
 
 	strcpy(buf, path);
 	cp = buf + len;
@@ -131,15 +132,24 @@ int rmdir_path(struct autofs_point *ap, 
 			return -1;
 		}
 
-		if (st.st_dev != ap->dev) {
-			crit(ap->logopt, "attempt to remove files from a "
-			     "mounted file system!");
-			crit(ap->logopt,
-			    "ap->dev == %llu, \"%s\" dev == %llu", ap->dev,
-			     buf, st.st_dev);
+		/* Termination condition removing full path within autofs fs */
+		if (st.st_dev != dev)
+			return 0;
+
+		if (statfs(buf, &fs) != 0) {
+			error(ap->logopt, "could not stat fs of %s", buf);
 			return -1;
 		}
 
+		if (fs.f_type != AUTOFS_SUPER_MAGIC) {
+			crit(ap->logopt, "attempt to remove directory from a "
+			     "non-autofs filesystem!");
+			crit(ap->logopt,
+			     "requestor dev == %llu, \"%s\" owner dev == %llu",
+			     dev, buf, st.st_dev);
+			return -1;
+		}
+			     
 		/*
 		 * Last element of path may be a symbolic link; all others
 		 * are directories (and the last directory element is
diff --git a/daemon/direct.c b/daemon/direct.c
index 974a50e..e6c1f35 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -715,8 +715,10 @@ out_close:
 out_umount:
 	umount(me->key);
 out_err:
-	if (me->dir_created)
-		rmdir_path(ap, me->key);
+	if (is_autofs_fs) {
+		if (stat(me->key, &st) == 0 && me->dir_created)
+			 rmdir_path(ap, me->key, st.st_dev);
+	}
 
 	return -1;
 }
diff --git a/daemon/indirect.c b/daemon/indirect.c
index b57bbd1..970215c 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -226,7 +226,7 @@ out_umount:
 	umount(ap->path);
 out_rmdir:
 	if (ap->dir_created)
-		rmdir_path(ap, ap->path);
+		rmdir_path(ap, ap->path, ap->dev);
 out_err:
 	if (options)
 		free(options);
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 87be647..aeda909 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -936,8 +936,12 @@ int lookup_prune_cache(struct autofs_poi
 				status = CHE_FAIL;
 				if (this->ioctlfd == -1)
 					status = cache_delete(mc, key);
-				if (status != CHE_FAIL)
-					rmdir_path(ap, path);
+				if (status != CHE_FAIL) {
+					if (ap->type == LKP_INDIRECT)
+						rmdir_path(ap, path, ap->dev);
+					else
+						rmdir_path(ap, path, this->dev);
+				}
 			}
 			cache_unlock(mc);
 
diff --git a/include/automount.h b/include/automount.h
index f7345c5..1c6e0dc 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -208,7 +208,7 @@ int do_mount(struct autofs_point *ap, co
 	     int name_len, const char *what, const char *fstype,
 	     const char *options);
 int mkdir_path(const char *path, mode_t mode);
-int rmdir_path(struct autofs_point *ap, const char *path);
+int rmdir_path(struct autofs_point *ap, const char *path, dev_t dev);
 
 /* Prototype for module functions */
 
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 376da2e..6485ef2 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -949,7 +949,7 @@ static int check_map_indirect(struct aut
 			cache_delete(mc, "*");
 
 		if (cache_delete(mc, key) && wild & (CHE_MISSING | CHE_FAIL))
-			rmdir_path(ap, key);
+			rmdir_path(ap, key, ap->dev);
 		pthread_cleanup_pop(1);
 	}
 
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 4959c12..40864d8 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1543,7 +1543,7 @@ static int check_map_indirect(struct aut
 		cache_writelock(mc);
 		pthread_cleanup_push(cache_lock_cleanup, mc);
 		if (cache_delete(mc, key))
-			rmdir_path(ap, key);
+			rmdir_path(ap, key, ap->dev);
 		pthread_cleanup_pop(1);
 	}
 
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index 4ea7609..e891c25 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -401,7 +401,7 @@ static int check_map_indirect(struct aut
 			cache_delete(mc, "*");
 
 		if (cache_delete(mc, key) && wild & (CHE_MISSING | CHE_FAIL))
-			rmdir_path(ap, key);
+			rmdir_path(ap, key, ap->dev);
 		pthread_cleanup_pop(1);
 	}
 
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 483e586..29a72fb 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -507,7 +507,7 @@ static int check_map_indirect(struct aut
 			cache_delete(mc, "*");
 
 		if (cache_delete(mc, key) && wild & (CHE_MISSING | CHE_FAIL))
-			rmdir_path(ap, key);
+			rmdir_path(ap, key, ap->dev);
 		pthread_cleanup_pop(1);
 	}
 
diff --git a/modules/mount_bind.c b/modules/mount_bind.c
index 695dc9a..22abd91 100644
--- a/modules/mount_bind.c
+++ b/modules/mount_bind.c
@@ -154,11 +154,12 @@ int mount_mount(struct autofs_point *ap,
 			     what, fullpath, NULL);
 
 		if (err) {
-			if ((!ap->ghost && name_len) || !existed) {
-				if (!chdir(ap->path))
-					rmdir_path(ap, name);
-				err = chdir("/");
-			}
+			if (ap->type != LKP_INDIRECT)
+				return 1;
+
+			if ((!ap->ghost && name_len) || !existed)
+				rmdir_path(ap, fullpath, ap->dev);
+
 			return 1;
 		} else {
 			debug(ap->logopt,
@@ -202,9 +203,8 @@ int mount_mount(struct autofs_point *ap,
 			if (ap->ghost && !status)
 				mkdir_path(fullpath, 0555);
 			else {
-				if (!chdir(ap->path))
-					rmdir_path(ap, name);
-				err = chdir("/");
+				if (ap->type == LKP_INDIRECT)
+					rmdir_path(ap, fullpath, ap->dev);
 			}
 			return 1;
 		} else {
diff --git a/modules/mount_changer.c b/modules/mount_changer.c
index 29485cb..83e6bdf 100644
--- a/modules/mount_changer.c
+++ b/modules/mount_changer.c
@@ -129,14 +129,16 @@ int mount_mount(struct autofs_point *ap,
 	}
 
 	if (err) {
-		if ((!ap->ghost && name_len) || !existed) {
-			if (!chdir(ap->path))
-				rmdir_path(ap, name);
-			chdir("/");
-		}
 		error(ap->logopt,
 		      MODPREFIX "failed to mount %s (type %s) on %s",
 		      what, fstype, fullpath);
+
+		if (ap->type != LKP_INDIRECT)
+			return 1;
+
+		if ((!ap->ghost && name_len) || !existed)
+			rmdir_path(ap, fullpath, ap->dev);
+
 		return 1;
 	} else {
 		debug(ap->logopt,
diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c
index b395235..deebf8b 100644
--- a/modules/mount_ext2.c
+++ b/modules/mount_ext2.c
@@ -145,14 +145,16 @@ #endif
 	}
 
 	if (err) {
-		if ((!ap->ghost && name_len) || !existed) {
-			if (!chdir(ap->path))
-				rmdir_path(ap, name);
-			err = chdir("/");
-		}
 		error(ap->logopt,
 		      MODPREFIX "failed to mount %s (type %s) on %s",
 		      what, fstype, fullpath);
+
+		if (ap->type != LKP_INDIRECT)
+			return 1;
+
+		if ((!ap->ghost && name_len) || !existed)
+			rmdir_path(ap, fullpath, ap->dev);
+
 		return 1;
 	} else {
 		debug(ap->logopt,
diff --git a/modules/mount_generic.c b/modules/mount_generic.c
index 37ada41..9dabfce 100644
--- a/modules/mount_generic.c
+++ b/modules/mount_generic.c
@@ -105,15 +105,16 @@ int mount_mount(struct autofs_point *ap,
 	}
 
 	if (err) {
-		if ((!ap->ghost && name_len) || !existed) {
-			if (!chdir(ap->path))
-				rmdir_path(ap, name);
-			err = chdir("/");
-		}
 		error(ap->logopt,
 		      MODPREFIX "failed to mount %s (type %s) on %s",
 		      what, fstype, fullpath);
 
+		if (ap->type != LKP_INDIRECT)
+			return 1;
+
+		if ((!ap->ghost && name_len) || !existed)
+			rmdir_path(ap, fullpath, ap->dev);
+
 		return 1;
 	} else {
 		debug(ap->logopt,
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index 0ab2faf..b24f54a 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -253,15 +253,16 @@ int mount_mount(struct autofs_point *ap,
 	free_host_list(&hosts);
 
 	/* If we get here we've failed to complete the mount */
-	if ((!ap->ghost && name_len) || !existed) {
-		if (!chdir(ap->path))
-			rmdir_path(ap, name);
-		err = chdir("/");
-	}
 
 	error(ap->logopt,
 	      MODPREFIX "nfs: mount failure %s on %s", what, fullpath);
 
+	if (ap->type != LKP_INDIRECT)
+		return 1;
+
+	if ((!ap->ghost && name_len) || !existed)
+		rmdir_path(ap, fullpath, ap->dev);
+
 	return 1;
 }
 


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- autofs.spec	4 Aug 2006 09:53:37 -0000	1.138
+++ autofs.spec	4 Aug 2006 12:27:28 -0000	1.139
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.12
+%define release 0.rc1.13
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -28,6 +28,7 @@
 Patch15: autofs-5.0.1-rc1-shutdown-races.patch
 Patch16: autofs-5.0.1-rc1-shutdown-submount-expire.patch
 Patch17: autofs-5.0.1-rc1-program-wild-expire-fix.patch
+Patch18: autofs-5.0.1-rc1-directory-cleanup.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -84,6 +85,7 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -140,6 +142,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Aug 4 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.13
+- tidy up directory cleanup and add validation check to rmdir_path.
+
 * Thu Aug 4 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.12
 - enable mtab locking until I can resolve the race with it.
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 12:36:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 08:36:37 -0400
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.11,1.12
Message-ID: <200608041236.k74Cab55026484@cvs.devel.redhat.com>

Author: steved

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

Modified Files:
	nfs-utils-lib.spec 
Log Message:
bumped the dependence on libgssapi to version 0.10



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nfs-utils-lib.spec	3 Aug 2006 18:47:50 -0000	1.11
+++ nfs-utils-lib.spec	4 Aug 2006 12:36:35 -0000	1.12
@@ -18,10 +18,10 @@
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig, gettext, autoconf
-BuildRequires: libgssapi-devel >= 0.9, openldap-devel
+BuildRequires: libgssapi-devel >= 0.10, openldap-devel
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig
-Requires: libgssapi >= 0.9, openldap
+Requires: libgssapi >= 0.10, openldap
 
 %description
 Support libaries that are needed by the commands and 



From fedora-cvs-commits at redhat.com  Fri Aug  4 13:34:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 09:34:16 -0400
Subject: rpms/shadow-utils/devel shadow-4.0.17-notInheritFd.patch, NONE,
	1.1 shadow-utils.spec, 1.78, 1.79
Message-ID: <200608041334.k74DYGWa008517@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.0.17-notInheritFd.patch 
Log Message:
do not inherit file desc. in execve(nscd)


shadow-4.0.17-notInheritFd.patch:
 commonio.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE shadow-4.0.17-notInheritFd.patch ---
--- shadow-4.0.17/lib/commonio.c.fdInherit	2006-08-04 10:56:52.000000000 +0200
+++ shadow-4.0.17/lib/commonio.c	2006-08-04 11:00:05.000000000 +0200
@@ -457,6 +457,10 @@
 		}
 		return 0;
 	}
+
+	/* not not inherit fd */
+	fcntl(fileno(db->fp), F_SETFD, FD_CLOEXEC);
+
 #ifdef WITH_SELINUX
 	db->scontext = NULL;
 	if ((is_selinux_enabled () > 0) && (!db->readonly)) {


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- shadow-utils.spec	17 Jul 2006 11:40:26 -0000	1.78
+++ shadow-utils.spec	4 Aug 2006 13:34:12 -0000	1.79
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.17
-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,8 @@
 Patch3: shadow-4.0.14-goodname.patch
 Patch4: shadow-4.0.13-newgrpPwd.patch
 Patch5: shadow-4.0.16-lOption.patch
+Patch6: shadow-4.0.17-UID_GID.patch
+Patch7: shadow-4.0.17-notInheritFd.patch
 
 License: BSD
 Group: System Environment/Base
@@ -49,8 +51,11 @@
 %patch3 -p1 -b .goodname
 %patch4 -p1 -b .newgrpPwd
 %patch5 -p1 -b .lOption
+%patch6 -p1 -b .UID_GID
+
 #replace whole file
 cp %{SOURCE3} lib/nscd.c
+%patch7 -p1 -b .notInheritFd
 
 rm po/*.gmo
 rm po/stamp-po
@@ -205,6 +210,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Fri Aug 08 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-2
+- do not inherit file desc. in execve(nscd)
+
 * Mon Jul 17 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-1
 - upgrade
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 13:40:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 09:40:48 -0400
Subject: rpms/shadow-utils/devel shadow-utils.spec,1.79,1.80
Message-ID: <200608041340.k74Demjt009959@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	shadow-utils.spec 
Log Message:
fix UID/GID overflow in user* group* (#198920)



Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- shadow-utils.spec	4 Aug 2006 13:34:12 -0000	1.79
+++ shadow-utils.spec	4 Aug 2006 13:40:45 -0000	1.80
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.17
-Release: 2
+Release: 3
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -210,6 +210,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Fri Aug 08 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-3
+- fix UID/GID overflow in user* group* (#198920)
+
 * Fri Aug 08 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-2
 - do not inherit file desc. in execve(nscd)
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 13:45:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 09:45:20 -0400
Subject: rpms/cman/devel cman-makefix.patch,1.3,1.4 cman.spec,1.60,1.61
Message-ID: <200608041345.k74DjKMs011529@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11498

Modified Files:
	cman-makefix.patch cman.spec 
Log Message:
More ccslibdir fixes.

cman-makefix.patch:
 cman/daemon/Makefile      |    2 +-
 cman/qdisk/Makefile       |    2 +-
 fence/fence_node/Makefile |    2 +-
 fence/fence_tool/Makefile |    2 +-
 group/lib/Makefile        |    6 +++++-
 5 files changed, 9 insertions(+), 5 deletions(-)

Index: cman-makefix.patch
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman-makefix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cman-makefix.patch	3 Aug 2006 23:14:16 -0000	1.3
+++ cman-makefix.patch	4 Aug 2006 13:45:18 -0000	1.4
@@ -1,5 +1,5 @@
 --- cman-2.0.5/group/lib/Makefile.makefix	2005-06-23 10:32:30.000000000 -0500
-+++ cman-2.0.5/group/lib/Makefile	2006-08-03 18:10:46.000000000 -0500
++++ cman-2.0.5/group/lib/Makefile	2006-08-04 08:42:36.000000000 -0500
 @@ -18,7 +18,7 @@ STATICLIB=$(LIBNAME).a
  top_srcdir=..
  UNINSTALL=${top_srcdir}/scripts/uninstall.pl
@@ -20,8 +20,8 @@
  
  uninstall:
  
---- cman-2.0.5/cman/daemon/Makefile.makefix	2006-08-03 18:12:33.000000000 -0500
-+++ cman-2.0.5/cman/daemon/Makefile	2006-08-03 18:12:58.000000000 -0500
+--- cman-2.0.5/cman/daemon/Makefile.makefix	2006-07-07 02:53:14.000000000 -0500
++++ cman-2.0.5/cman/daemon/Makefile	2006-08-04 08:42:36.000000000 -0500
 @@ -33,7 +33,7 @@ copytobin: all
  	cp ${TARGET} ${top_srcdir}/bin
  
@@ -31,3 +31,36 @@
  
  daemon.o: daemon.c list.h cnxman-socket.h cnxman-private.h \
    daemon.h logging.h commands.h barrier.h cmanccs.h
+--- cman-2.0.5/cman/qdisk/Makefile.makefix	2006-08-04 08:43:42.000000000 -0500
++++ cman-2.0.5/cman/qdisk/Makefile	2006-08-04 08:43:55.000000000 -0500
+@@ -32,7 +32,7 @@ install: ${TARGET}
+ 
+ qdiskd: disk.o crc32.o disk_util.o main.o score.o bitmap.o clulog.o \
+ 	gettid.o proc.o ../lib/libcman.a
+-	gcc -o $@ $^ -lpthread -L../lib -L${ccslibdir} -lccs
++	gcc -o $@ $^ -lpthread -L../lib -L$(ccslibdir) -lccs
+ 
+ mkqdisk: disk.o crc32.o disk_util.o \
+ 	 proc.o mkqdisk.o
+--- cman-2.0.5/fence/fence_node/Makefile.makefix	2006-08-04 08:44:22.000000000 -0500
++++ cman-2.0.5/fence/fence_node/Makefile	2006-08-04 08:44:30.000000000 -0500
+@@ -25,7 +25,7 @@ endif
+ 
+ INCLUDE = -I${top_srcdir}/include -I${ccsincdir} -I${incdir} -I${top_srcdir}/config -I${top_srcdir}/../cman/lib
+ 
+-LDFLAGS+= -L${ccslibdir} -L${libdir} -L${top_srcdir}/../cman/lib
++LDFLAGS+= -L$(ccslibdir) -L${libdir} -L${top_srcdir}/../cman/lib
+ LOADLIBES+= -lccs -lcman
+ 
+ FENCE_NODE_SRC = \
+--- cman-2.0.5/fence/fence_tool/Makefile.makefix	2006-08-04 08:44:03.000000000 -0500
++++ cman-2.0.5/fence/fence_tool/Makefile	2006-08-04 08:44:15.000000000 -0500
+@@ -25,7 +25,7 @@ endif
+ 
+ INCLUDE = -I${top_srcdir}/include -I${ccsincdir} -I${cmanincdir} -I${incdir} -I${top_srcdir}/config
+ 
+-LDFLAGS+= -L${ccslibdir} -L${libdir} -L${top_srcdir}/../cman/lib -lcman
++LDFLAGS+= -L$(ccslibdir) -L${libdir} -L${top_srcdir}/../cman/lib -lcman
+ LOADLIBES+= -lccs -lcman
+ 
+ FENCE_TOOL_SRC = \


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- cman.spec	3 Aug 2006 23:14:16 -0000	1.60
+++ cman.spec	4 Aug 2006 13:45:18 -0000	1.61
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.6
+Release: 0.fc6.7
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager



From fedora-cvs-commits at redhat.com  Fri Aug  4 13:58:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 09:58:00 -0400
Subject: rpms/shadow-utils/devel shadow-4.0.17-UID_GID.patch,NONE,1.1
Message-ID: <200608041358.k74Dw0nS031022@cvs.devel.redhat.com>

Author: pvrabec

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

Added Files:
	shadow-4.0.17-UID_GID.patch 
Log Message:
add UID_GID.patch patch


shadow-4.0.17-UID_GID.patch:
 groupadd.c |   29 +++++++++++++++++++----------
 groupmod.c |   35 +++++++++++++++++++++++------------
 useradd.c  |   55 ++++++++++++++++++++++++++++++-------------------------
 usermod.c  |   58 +++++++++++++++++++++++++++++++---------------------------
 4 files changed, 103 insertions(+), 74 deletions(-)

--- NEW FILE shadow-4.0.17-UID_GID.patch ---
--- shadow-4.0.17/src/groupadd.c.UID_GID	2006-07-27 13:35:46.000000000 +0200
+++ shadow-4.0.17/src/groupadd.c	2006-07-27 13:40:19.000000000 +0200
@@ -89,6 +89,7 @@
 static void close_files (void);
 static void open_files (void);
 static void fail_exit (int);
+static gid_t get_gid (const char *gidstr);
 
 /*
  * usage - display usage message and exit
@@ -377,6 +378,23 @@
 }
 
 /*
+ * get_id - validate and get group ID
+ */
+static gid_t get_gid (const char *gidstr)
+{
+	long val;
+	char *errptr;
+
+	val = strtol (gidstr, &errptr, 10);
+	if (*errptr || errno == ERANGE || val < 0) {
+		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
+			 gidstr);
+		exit (E_BAD_ARG);
+	}
+	return val;
+}
+
+/*
  * main - groupadd command
  */
 
@@ -441,16 +459,7 @@
 	                        break;
 			case 'g':
 				gflg++;
-				if (!isdigit (optarg[0]))
-					usage ();
-
-				group_id = strtoul (optarg, &cp, 10);
-				if (*cp != '\0') {
-					fprintf (stderr,
-						 _("%s: invalid group %s\n"),
-						 Prog, optarg);
-					fail_exit (E_BAD_ARG);
-				}
+				group_id = get_gid (optarg);
 				break;
 			case 'h':
 				usage ();
--- shadow-4.0.17/src/groupmod.c.UID_GID	2006-07-27 13:35:46.000000000 +0200
+++ shadow-4.0.17/src/groupmod.c	2006-07-27 13:46:50.000000000 +0200
@@ -89,6 +89,7 @@
 static void process_flags (int, char **);
 static void close_files (void);
 static void open_files (void);
+static gid_t get_gid (const char *gidstr);
 
 /*
  * usage - display usage message and exit
@@ -310,6 +311,23 @@
 }
 
 /*
+ * get_id - validate and get group ID
+ */
+static gid_t get_gid (const char *gidstr)
+{
+	long val;
+	char *errptr;
+
+	val = strtol (gidstr, &errptr, 10);
+	if (*errptr || errno == ERANGE || val < 0) {
+		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
+			 gidstr);
+		exit (E_BAD_ARG);
+	}
+	return val;
+}
+
+/*
  * process_flags - perform command line argument setting
  *
  *	process_flags() interprets the command line arguments and sets the
@@ -318,25 +336,18 @@
  */
 static void process_flags (int argc, char **argv)
 {
-	char *end;
 	int arg;
 
 	while ((arg = getopt (argc, argv, "g:n:o")) != EOF) {
 		switch (arg) {
 		case 'g':
 			gflg++;
-			group_newid = strtoul (optarg, &end, 10);
-			if (*end != '\0') {
-				fprintf (stderr,
-					 _("%s: invalid group %s\n"),
-					 Prog, optarg);
-#ifdef WITH_AUDIT
-				audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
-					      "modifying group", NULL,
-					      group_newid, 0);
+			group_newid = get_gid (optarg);
+#ifdef WITH_AUDIT
+			audit_logger (AUDIT_USER_CHAUTHTOK,
+				      Prog, "modifying group",
+				      NULL, group_newid, 0);
 #endif
-				exit (E_BAD_ARG);
-			}
 			break;
 		case 'n':
 			nflg++;
--- shadow-4.0.17/src/useradd.c.UID_GID	2006-07-27 13:35:46.000000000 +0200
+++ shadow-4.0.17/src/useradd.c	2006-07-27 13:40:19.000000000 +0200
@@ -201,42 +201,47 @@
 	exit (code);
 }
 
-static struct group *getgr_nam_gid (const char *name)
+static struct group *getgr_nam_gid (const char *grname)
 {
-	gid_t gid;
-	char *ep;
-
-	gid = strtoul (name, &ep, 10);
-	if (*name != '\0' && *ep == '\0')	/* valid numeric GID */
-		return getgrgid (gid);
+	long gid;
+	char *errptr;
 
-	return getgrnam (name);
+	gid = strtol (grname, &errptr, 10);
+	if (*errptr || errno == ERANGE || gid < 0) {
+		fprintf (stderr,
+			 _("%s: invalid numeric argument '%s'\n"), Prog, grname);
+		exit (E_BAD_ARG);
+	}
+	return getgrnam (grname);
 }
 
-static long get_number (const char *cp)
+static long get_number (const char *numstr)
 {
 	long val;
-	char *ep;
-
-	val = strtol (cp, &ep, 10);
-	if (*cp != '\0' && *ep == '\0')	/* valid number */
-		return val;
+	char *errptr;
 
-	fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog, cp);
-	exit (E_BAD_ARG);
+	val = strtol (numstr, &errptr, 10);
+	if (*errptr || errno == ERANGE) {
+		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
+			 numstr);
+		exit (E_BAD_ARG);
+	}
+	return val;
 }
 
-static uid_t get_uid (const char *cp)
+static uid_t get_uid (const char *uidstr)
 {
-	uid_t val;
-	char *ep;
-
-	val = strtoul (cp, &ep, 10);
-	if (*cp != '\0' && *ep == '\0')	/* valid number */
-		return val;
+	long val;
+	char *errptr;
 
-	fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog, cp);
-	exit (E_BAD_ARG);
+	val = strtol (uidstr, &errptr, 10);
+	if (*errptr || errno == ERANGE || val < 0) {
+		fprintf (stderr,
+			 _("%s: invalid numeric argument '%s'\n"), Prog,
+			 uidstr);
+		exit (E_BAD_ARG);
+	}
+	return val;
 }
 
 #define MATCH(x,y) (strncmp((x),(y),strlen(y)) == 0)
--- shadow-4.0.17/src/usermod.c.UID_GID	2006-07-27 13:35:46.000000000 +0200
+++ shadow-4.0.17/src/usermod.c	2006-07-27 13:40:19.000000000 +0200
@@ -68,12 +68,12 @@
 #define E_USAGE		2	/* invalid command syntax */
 #define E_BAD_ARG	3	/* invalid argument to option */
 #define E_UID_IN_USE	4	/* UID already in use (and no -o) */
-/* #define E_BAD_PWFILE     5 *//* passwd file contains errors */
+/* #define E_BAD_PWFILE	5 *//* passwd file contains errors */
 #define E_NOTFOUND	6	/* specified user/group doesn't exist */
 #define E_USER_BUSY	8	/* user to modify is logged in */
 #define E_NAME_IN_USE	9	/* username already in use */
 #define E_GRP_UPDATE	10	/* can't update group file */
-/* #define E_NOSPACE        11 *//* insufficient space to move home dir */
+/* #define E_NOSPACE	11*//* insufficient space to move home dir */
 #define E_HOMEDIR	12	/* unable to complete home dir move */
 #define	VALID(s)	(strcspn (s, ":\n") == strlen (s))
 /*
@@ -160,16 +160,18 @@
  * "56k-family"... ergh.
  * --Pac.
  */
-static struct group *getgr_nam_gid (const char *name)
+static struct group *getgr_nam_gid (const char *grname)
 {
-	gid_t gid;
-	char *ep;
-
-	gid = strtoul (name, &ep, 10);
-	if (*name != '\0' && *ep == '\0')	/* valid numeric GID */
-		return getgrgid (gid);
+	long val;
+	char *errptr;
 
-	return getgrnam (name);
+	val = strtol (grname, &errptr, 10);
+	if (*errptr || errno == ERANGE || val < 0) {
+		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
+			 grname);
+		exit (E_BAD_ARG);
+	}
+	return getgrnam (grname);
 }
 
 /*
@@ -803,30 +805,32 @@
 	return ret;
 }
 
-static long get_number (const char *cp)
+static long get_number (const char *numstr)
 {
 	long val;
-	char *ep;
-
-	val = strtol (cp, &ep, 10);
-	if (*cp != '\0' && *ep == '\0')	/* valid number */
-		return val;
+	char *errptr;
 
-	fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog, cp);
-	exit (E_BAD_ARG);
+	val = strtol (numstr, &errptr, 10);
+	if (*errptr || errno == ERANGE) {
+		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
+			 numstr);
+		exit (E_BAD_ARG);
+	}
+	return val;
 }
 
-static uid_t get_id (const char *cp)
+static uid_t get_id (const char *uidstr)
 {
-	uid_t val;
-	char *ep;
-
-	val = strtoul (cp, &ep, 10);
-	if (*cp != '\0' && *ep == '\0')	/* valid number */
-		return val;
+	long val;
+	char *errptr;
 
-	fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog, cp);
-	exit (E_BAD_ARG);
+	val = strtol (uidstr, &errptr, 10);
+	if (*errptr || errno == ERANGE || val < 0) {
+		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
+			 uidstr);
+		exit (E_BAD_ARG);
+	}
+	return val;
 }
 
 /*



From fedora-cvs-commits at redhat.com  Fri Aug  4 14:03:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 10:03:18 -0400
Subject: rpms/evolution-data-server/FC-5 evolution-data-server.spec, 1.92,
	1.93 evolution-data-server-1.0.0-fix_warnings.patch, 1.1,
	NONE evolution-data-server-1.0.2-add-debug-logging.patch, 1.1,
	NONE evolution-data-server-1.0.2-calendar-optimisation-XB59904.patch,
	1.1,
	NONE evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch,
	1.1, NONE evolution-data-server-1.0.2-fix-64-bit-build.patch, 1.1,
	NONE evolution-data-server-1.0.2-fix-calendar-factory-GType.patch,
	1.1, NONE evolution-data-server-1.1.6-fix-namespace-clear.patch,
	1.2,
	NONE evolution-data-server-1.2.0-cope-with-a-macro-called-read.patch,
	1.1, NONE gb-309079-attach-48376.patch, 1.1,
	NONE gb-309079-attach-48377.patch, 1.1, NONE
Message-ID: <200608041403.k74E3ILu032065@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-data-server.spec 
Removed Files:
	evolution-data-server-1.0.0-fix_warnings.patch 
	evolution-data-server-1.0.2-add-debug-logging.patch 
	evolution-data-server-1.0.2-calendar-optimisation-XB59904.patch 
	evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch 
	evolution-data-server-1.0.2-fix-64-bit-build.patch 
	evolution-data-server-1.0.2-fix-calendar-factory-GType.patch 
	evolution-data-server-1.1.6-fix-namespace-clear.patch 
	evolution-data-server-1.2.0-cope-with-a-macro-called-read.patch 
	gb-309079-attach-48376.patch gb-309079-attach-48377.patch 
Log Message:
- Remove patches for Gnome.org bug #309079 (rejected upstream).
- One of these patches was causing RH bug #167157.
- No longer packaging unused patches.



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- evolution-data-server.spec	1 Aug 2006 01:35:53 -0000	1.92
+++ evolution-data-server.spec	4 Aug 2006 14:03:03 -0000	1.93
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.6.3
-Release: 1.fc5.1
+Release: 1.fc5.2
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for evolution
@@ -37,12 +37,7 @@
 Patch12: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch
 Patch13: evolution-data-server-1.3.8-fix-implicit-function-declarations
 Patch14: evolution-data-server-1.6.2-validatehelo.patch
-
-# Leak fixes by Mark G. Adams
-Patch15: gb-309079-attach-48376.patch
-Patch16: gb-309079-attach-48377.patch
-
-Patch17: evolution-data-server-1.5.4-make_imap4_optional.patch
+Patch15: evolution-data-server-1.5.4-make_imap4_optional.patch
 
 ### Dependencies ###
 
@@ -123,9 +118,7 @@
 %patch12 -p1 -b .fix_open_calendar_declaration
 %patch13 -p1 -b .fix-implicit-function-declarations
 %patch14 -p1 -b .validatehelo
-%patch15 -p0 -b .fix-uid-leak
-%patch16 -p0 -b .fix-comp-ref-leak
-%patch17 -p1 -b .make_imap4_optional
+%patch15 -p1 -b .make_imap4_optional
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -326,6 +319,11 @@
 
 
 %changelog
+* Thu Aug  3 2006 Matthew Barnes <mbarnes at redhat.com> - 1.6.3-1.fc5.2
+- Remove patches for Gnome.org bug #309079 (rejected upstream).
+- One of these patches was causing RH bug #167157.
+- No longer packaging unused patches.
+
 * Mon Jul 31 2006 Matthew Barnes <mbarnes at redhat.com> - 1.6.3-1.fc5.1
 - Update to 1.6.3
 - Dynamically link to BDB.


--- evolution-data-server-1.0.0-fix_warnings.patch DELETED ---


--- evolution-data-server-1.0.2-add-debug-logging.patch DELETED ---


--- evolution-data-server-1.0.2-calendar-optimisation-XB59904.patch DELETED ---


--- evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch DELETED ---


--- evolution-data-server-1.0.2-fix-64-bit-build.patch DELETED ---


--- evolution-data-server-1.0.2-fix-calendar-factory-GType.patch DELETED ---


--- evolution-data-server-1.1.6-fix-namespace-clear.patch DELETED ---


--- evolution-data-server-1.2.0-cope-with-a-macro-called-read.patch DELETED ---


--- gb-309079-attach-48376.patch DELETED ---


--- gb-309079-attach-48377.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug  4 14:36:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 10:36:30 -0400
Subject: rpms/evolution-connector/FC-5 .cvsignore, 1.30,
	1.31 evolution-connector.spec, 1.61, 1.62 sources, 1.31,
	1.32 evolution-connector-2.0.2-domain-fix.patch, 1.1,
	NONE evolution-connector-2.6.1-generated-autotool.patch, 1.1,
	NONE ximian-connector-2.1.4-fix-convenience-libraries.patch,
	1.1, NONE ximian-connector-2.2.2-install-debug-utilities.patch,
	1.1, NONE ximian-connector-2.2.2-noinst-ltlibraries.patch, 1.1, NONE
Message-ID: <200608041436.k74EaUM3030872@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-connector.spec sources 
Removed Files:
	evolution-connector-2.0.2-domain-fix.patch 
	evolution-connector-2.6.1-generated-autotool.patch 
	ximian-connector-2.1.4-fix-convenience-libraries.patch 
	ximian-connector-2.2.2-install-debug-utilities.patch 
	ximian-connector-2.2.2-noinst-ltlibraries.patch 
Log Message:
- Update to 2.6.3
- Bump required evolution version to 2.6.3.
- Add BuildRequires for GNU Autotool packages.
- Clean up spec file, renumber patches.
- No longer packaging unused patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-5/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	30 May 2006 15:04:19 -0000	1.30
+++ .cvsignore	4 Aug 2006 14:36:27 -0000	1.31
@@ -1 +1 @@
-evolution-exchange-2.6.2.tar.bz2
+evolution-exchange-2.6.3.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-5/evolution-connector.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- evolution-connector.spec	8 Jun 2006 03:47:00 -0000	1.61
+++ evolution-connector.spec	4 Aug 2006 14:36:27 -0000	1.62
@@ -1,63 +1,63 @@
-%define evolution_version 2.5.2
+%define evolution_version 2.6.3
 %define libsoup_version 2.2.6.1
 
 %define eds_major 1.2
 %define evo_major 2.6
 %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
 
+### Abstract ###
+
 Name: evolution-connector
-Version: 2.6.2
-Release: 1.fc5.4
+Version: 2.6.3
+Release: 1.fc5.1
 License: GPL
 Group: Applications/Productivity
-URL:  http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.4/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Summary: Evolution plugin to interact with MS Exchange Server
+URL: http://www.gnome.org/projects/evolution/
 Source: evolution-exchange-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+ExcludeArch: s390
+ExcludeArch: s390x
+
+### Patches ###
 
-# Patches we apply to the autotool files:
 Patch100: ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch
-#Patch101: ximian-connector-2.2.2-noinst-ltlibraries.patch
-#Patch102: ximian-connector-2.2.2-install-debug-utilities.patch
+Patch101: evolution-exchange-2.5.3-fix-marshaller.patch
+Patch102: evolution-exchange-2.5.91-fix-missing-declarations-2.5.91.patch
 
-# 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: evolution-connector-2.6.1-generated-autotool.patch
-
-# Other patches:
-Patch300: evolution-exchange-2.5.3-fix-marshaller.patch
-Patch301: evolution-exchange-2.5.91-fix-missing-declarations-2.5.91.patch
+### Dependencies ###
+
+Requires: evolution >= %{evolution_version}
+Requires: gnutls
+Requires: libsoup >= %{libsoup_version}
+Requires: openldap
+
+### Build Dependencies ###
+
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake >= 1.9
 BuildRequires: evolution >= %{evolution_version}
-BuildRequires: evolution-devel >= %{evolution_version}
 BuildRequires: evolution-data-server-devel
+BuildRequires: evolution-devel >= %{evolution_version}
+BuildRequires: gettext
+BuildRequires: gnutls
+BuildRequires: intltool >= 0.34
 BuildRequires: libsoup-devel >= %{libsoup_version}
-# This is a virtual provide supplied by a version of the openldap-devel package
-# which includes the necessary stuff in %%{_libdir}/evolution-openldap.
+BuildRequires: libtool >= 1.5
 BuildRequires: openldap-evolution-devel
-BuildRequires: gnutls
 BuildRequires: openssl-devel
-Requires: evolution >= %{evolution_version}
-Requires: openldap
-Requires: libsoup >= %{libsoup_version}
-Requires: gnutls
-ExcludeArch: s390
-ExcludeArch: s390x
-Summary: Evolution plugin to interact with MS Exchange Server
 
 %description
 The connector enables added functionality to Evolution when used with a 
 Microsoft Exchange Server.
 
 %prep
-
 %setup -q -n evolution-exchange-%{version}
 
-# As discussed above, the "source patches" go into the SRPM, but only the resulting patch is applied:
-%patch200 -p1 -b .autotool-results
-
-# Other patches:
-%patch300 -p1 -b .fix-marshaller
-%patch301 -p1 -b .fix-missing-declarations-2.5.91
+%patch100 -p1 -b .64bit-fix-acinclude.m4
+%patch101 -p1 -b .fix-marshaller
+%patch102 -p1 -b .fix-missing-declarations-2.5.91
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -Werror-implicit-function-declaration -DLDAP_DEPRECATED"; export CFLAGS
@@ -69,9 +69,19 @@
 	LIBS="-lsasl2 -lssl -lcrypto"
 fi
 export LIBS
+
+# Rerun the GNU Autotools since we patched some of the input files.
+aclocal
+autoheader
+automake
+libtoolize
+intltoolize --force
+autoconf
+
 %configure \
   --with-openldap=%{_libdir}/evolution-openldap \
   --with-static-ldap
+
 make %{?_smp_mflags} LDFLAGS="-R %{plibdir}"
 
 %install
@@ -100,6 +110,13 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-1.fc5.1
+- Update to 2.6.3
+- Bump required evolution version to 2.6.3.
+- Add BuildRequires for GNU Autotool packages.
+- Clean up spec file, renumber patches.
+- No longer packaging unused patches.
+
 * Wed Jun 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.2-1.fc5.4
 - Bump for new eds
 - Disable s390(x) due to evolution not building there.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	30 May 2006 15:04:19 -0000	1.31
+++ sources	4 Aug 2006 14:36:28 -0000	1.32
@@ -1 +1 @@
-8b36ac9d4d3682a1bb73bf37e2a959b3  evolution-exchange-2.6.2.tar.bz2
+c98c41db650707fb394e3a8b0cef019b  evolution-exchange-2.6.3.tar.bz2


--- evolution-connector-2.0.2-domain-fix.patch DELETED ---


--- evolution-connector-2.6.1-generated-autotool.patch DELETED ---


--- ximian-connector-2.1.4-fix-convenience-libraries.patch DELETED ---


--- ximian-connector-2.2.2-install-debug-utilities.patch DELETED ---


--- ximian-connector-2.2.2-noinst-ltlibraries.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug  4 14:51:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 10:51:58 -0400
Subject: rpms/adaptx/devel adaptx.spec,1.13,1.14
Message-ID: <200608041451.k74Epw7W027775@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/adaptx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27720

Modified Files:
	adaptx.spec 
Log Message:

Added missing requirements. 




Index: adaptx.spec
===================================================================
RCS file: /cvs/dist/rpms/adaptx/devel/adaptx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- adaptx.spec	24 Jul 2006 03:46:34 -0000	1.13
+++ adaptx.spec	4 Aug 2006 14:51:56 -0000	1.14
@@ -28,15 +28,13 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define	section	free
 
 Name:		adaptx
 Version:	0.9.13
-Release:	2jpp_3fc
+Release:	3jpp.1
 Epoch:		0
 Summary:	AdaptX
 License:	Exolab Software License
@@ -69,6 +67,8 @@
 %package javadoc
 Group:		Development/Java
 Summary:	Javadoc for %{name}
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -148,7 +148,7 @@
 %{_javadir}/*
 
 %if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/adaptx-0.9.13.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %files javadoc
@@ -160,6 +160,9 @@
 %doc build/doc/*
 
 %changelog
+* Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> 0:0.9.13-3jpp.1
+- Added missing requirements. 
+
 * Sun Jul 23 2006 Deepak Bhole <dbhole at redhat.com> 0:0.9.13-2jpp_3fc
 - Adding missing dependency
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 14:52:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 10:52:57 -0400
Subject: rpms/antlr/devel antlr.spec,1.25,1.26
Message-ID: <200608041452.k74Eqvr4028210@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28159

Modified Files:
	antlr.spec 
Log Message:

Add missing requirements.




Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- antlr.spec	22 Jul 2006 21:51:01 -0000	1.25
+++ antlr.spec	4 Aug 2006 14:52:55 -0000	1.26
@@ -28,8 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 %define build_jedit  %{?_with_jedit:1}%{!?_without_jedit:0}
 
@@ -39,7 +37,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.6
-Release:        3jpp_5fc
+Release:        4jpp.1
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -108,6 +106,8 @@
 %package        javadoc
 Group:          Development/Documentation
 Summary:        Javadoc for %{name}
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -279,6 +279,9 @@
 
 
 %changelog
+* Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> = 0:2.7.6-4jpp.1
+- Add missing requirements.
+
 * Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.7.6-3jpp_5fc
 - Unstub docs.
 
@@ -290,11 +293,11 @@
 - Require hack-libgcj for build. (dist-fc6-java)
 - Bump release number.
 
-* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.om> = 0:2.7.6-3jpp_2fc
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> = 0:2.7.6-3jpp_2fc
 - From gbenson at redhat:
 -   Omit the jedit subpackage to fix dependencies. 
 
-* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.om> = 0:2.7.6-3jpp_1fc
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> = 0:2.7.6-3jpp_1fc
 - Added conditional native compilation.
 
 * Fri Jan 13 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.7.6-2jpp



From fedora-cvs-commits at redhat.com  Fri Aug  4 14:54:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 10:54:30 -0400
Subject: rpms/evolution-connector/FC-5
	evolution-exchange-2.6.3-no-gnome-common.patch, NONE,
	1.1 evolution-connector.spec, 1.62, 1.63
Message-ID: <200608041454.k74EsUdo028868@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-connector.spec 
Added Files:
	evolution-exchange-2.6.3-no-gnome-common.patch 
Log Message:
- Add patch to not require gnome-common, since we don't ship it.


evolution-exchange-2.6.3-no-gnome-common.patch:
 configure.in |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE evolution-exchange-2.6.3-no-gnome-common.patch ---
--- evolution-exchange-2.6.3/configure.in.no_gnome_common	2006-08-02 09:45:41.000000000 -0400
+++ evolution-exchange-2.6.3/configure.in	2006-08-02 09:45:54.000000000 -0400
@@ -96,8 +96,6 @@
 dnl CFLAGS and LIBS and stuff
 dnl *************************
 
-GNOME_COMPILE_WARNINGS(maximum)
-CFLAGS="$CFLAGS $WARN_CFLAGS"
 case $CFLAGS in
 *-Wall*)
 	CFLAGS="$CFLAGS -Wno-sign-compare"


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-5/evolution-connector.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- evolution-connector.spec	4 Aug 2006 14:36:27 -0000	1.62
+++ evolution-connector.spec	4 Aug 2006 14:54:27 -0000	1.63
@@ -26,6 +26,10 @@
 Patch101: evolution-exchange-2.5.3-fix-marshaller.patch
 Patch102: evolution-exchange-2.5.91-fix-missing-declarations-2.5.91.patch
 
+# Remove gnome-common macros from configure.in.
+# We do not ship gnome-common (or at least we're not supposed to).
+Patch103: evolution-exchange-2.6.3-no-gnome-common.patch
+
 ### Dependencies ###
 
 Requires: evolution >= %{evolution_version}
@@ -58,6 +62,7 @@
 %patch100 -p1 -b .64bit-fix-acinclude.m4
 %patch101 -p1 -b .fix-marshaller
 %patch102 -p1 -b .fix-missing-declarations-2.5.91
+%patch103 -p1 -b .no-gnome-common
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -Werror-implicit-function-declaration -DLDAP_DEPRECATED"; export CFLAGS
@@ -114,6 +119,7 @@
 - Update to 2.6.3
 - Bump required evolution version to 2.6.3.
 - Add BuildRequires for GNU Autotool packages.
+- Add patch to not require gnome-common, since we don't ship it.
 - Clean up spec file, renumber patches.
 - No longer packaging unused patches.
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 15:28:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 11:28:33 -0400
Subject: rpms/evolution-connector/FC-5 evolution-connector.spec, 1.63,
	1.64 64bit-fix, 1.4, NONE regenerate-patch.sh, 1.14, NONE
Message-ID: <200608041528.k74FSXU4022062@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-connector.spec 
Removed Files:
	64bit-fix regenerate-patch.sh 
Log Message:
- Just adding a comment.



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-5/evolution-connector.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- evolution-connector.spec	4 Aug 2006 14:54:27 -0000	1.63
+++ evolution-connector.spec	4 Aug 2006 15:28:30 -0000	1.64
@@ -24,6 +24,8 @@
 
 Patch100: ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch
 Patch101: evolution-exchange-2.5.3-fix-marshaller.patch
+
+# Gnome.org bug #349949
 Patch102: evolution-exchange-2.5.91-fix-missing-declarations-2.5.91.patch
 
 # Remove gnome-common macros from configure.in.


--- 64bit-fix DELETED ---


--- regenerate-patch.sh DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug  4 15:31:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 11:31:42 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.115.ooo51931.systemxmlsec.patch, 1.3, 1.4
Message-ID: <200608041531.k74FVgRV022758@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.115.ooo51931.systemxmlsec.patch 
Log Message:
rh#201305# wrong xmlsec lib flags in action

openoffice.org-1.9.115.ooo51931.systemxmlsec.patch:
 config_office/configure.in                                    |   22 
 config_office/set_soenv.in                                    |    1 
 openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.cxx | 1836 ++++++++++
 openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.hxx |  238 +
 scp2/source/ooo/file_library_ooo.scp                          |    2 
 scp2/source/ooo/makefile.mk                                   |    4 
 scp2/source/ooo/shortcut_ooo.scp                              |    2 
 source/ooo/file_library_ooo.scp                               |    0 
 source/ooo/makefile.mk                                        |    0 
 source/ooo/shortcut_ooo.scp                                   |    0 
 source/xmlsec/makefile.mk                                     |    0 
 source/xmlsec/nss/makefile.mk                                 |    0 
 source/xmlsec/nss/securityenvironment_nssimpl.cxx             |    0 
 xmlsecurity/source/xmlsec/makefile.mk                         |    5 
 xmlsecurity/source/xmlsec/nss/makefile.mk                     |   10 
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |    4 
 16 files changed, 2122 insertions(+), 2 deletions(-)

Index: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.115.ooo51931.systemxmlsec.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.115.ooo51931.systemxmlsec.patch	15 Jul 2005 11:40:03 -0000	1.3
+++ openoffice.org-1.9.115.ooo51931.systemxmlsec.patch	4 Aug 2006 15:31:29 -0000	1.4
@@ -142,7 +142,7 @@
  .ENDIF
  
 +.IF "$(SYSTEM_XMLSEC)" == "YES"
-+PKGCONFIG_MODULES=xmlsec1
++PKGCONFIG_MODULES=xmlsec1-nss
 +.INCLUDE: pkg_config.mk
 +.ENDIF
 +
@@ -161,7 +161,7 @@
  .ENDIF
  
 +.IF "$(SYSTEM_XMLSEC)" == "YES"
-+PKGCONFIG_MODULES=xmlsec1
++PKGCONFIG_MODULES=xmlsec1-nss
 +.INCLUDE: pkg_config.mk
 +CFLAGS+=-DSYSTEM_XMLSEC
 +.ENDIF



From fedora-cvs-commits at redhat.com  Fri Aug  4 15:56:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 11:56:01 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.25,1.26
Message-ID: <200608041556.k74Fu1Vw012961@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12875

Modified Files:
	xdoclet.spec 
Log Message:
- Merge with upstream version
- Remove unnecessary define with_gcj_support
- Add missing javadoc requires
- Add missing javadoc postun



Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xdoclet.spec	26 Jul 2006 21:02:40 -0000	1.25
+++ xdoclet.spec	4 Aug 2006 15:55:58 -0000	1.26
@@ -28,8 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define section free
@@ -43,7 +41,7 @@
 
 Name:		xdoclet
 Version:	1.2.3
-Release:	6jpp_4fc
+Release:	7jpp.1
 Epoch:		0
 Summary:	XDoclet Attribute Orientated Programming Framework
 License:	XDoclet Open Source Licence
@@ -132,6 +130,8 @@
 %package javadoc
 Summary:	XDoclet Javadoc
 Group:		Development/Documentation
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 This package contains XDoclet javadoc
@@ -217,6 +217,11 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -292,6 +297,12 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Thu Aug 03 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-7jpp.1
+- Merge with upstream version
+- Remove unnecessary define with_gcj_support
+- Add missing javadoc requires
+- Add missing javadoc postun
+
 * Wed Jul 26 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-6jpp_4fc
 - Remove xalan-j2 and xalan-j2-serializer from the ant OPT_JAR_LIST
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 16:51:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 12:51:03 -0400
Subject: rpms/nss/devel blank-cert8.db, NONE, 1.1 blank-key3.db, NONE,
	1.1 blank-secmod.db, NONE, 1.1 nss.spec, 1.14, 1.15
Message-ID: <200608041651.k74Gp3Pc025601@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/nss/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25452

Modified Files:
	nss.spec 
Added Files:
	blank-cert8.db blank-key3.db blank-secmod.db 
Log Message:
* Thu Aug 03 2006 Kai Engert <kengert at redhat.com> - 3.11.2-2
- Add /etc/pki/nssdb



--- NEW FILE blank-cert8.db ---









?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
????








?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
????????????????????????????????

--- NEW FILE blank-key3.db ---



?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?Sq????~???????j
sion


?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
????????

--- NEW FILE blank-secmod.db ---






Module???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????!
 ??????????????????????????????????????????????????????????????!
 ????????
????????

Index: nss.spec
===================================================================
RCS file: /cvs/dist/rpms/nss/devel/nss.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nss.spec	12 Jul 2006 07:29:20 -0000	1.14
+++ nss.spec	4 Aug 2006 16:51:01 -0000	1.15
@@ -3,7 +3,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11.2
-Release:          1.1
+Release:          2
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -18,6 +18,9 @@
 Source0:          %{name}-%{version}.tar.gz
 Source1:          nss.pc.in
 Source2:          nss-config.in
+Source3:          blank-cert8.db
+Source4:          blank-key3.db
+Source5:          blank-secmod.db
 
 
 %description
@@ -157,6 +160,12 @@
   %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
+# Install the empty NSS db files
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb
+%{__install} -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
+%{__install} -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
+%{__install} -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
+
 # Copy the development libraries we want
 for file in libcrmf.a libnssb.a libnssckfw.a
 do
@@ -198,7 +207,10 @@
 %{_libdir}/libnssckbi.so
 %{_libdir}/libfreebl3.so
 %{_libdir}/libfreebl3.chk
-
+%dir %{_sysconfdir}/pki/nssdb
+%config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
+%config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
+%config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
 
 %files tools
 %defattr(-,root,root)
@@ -314,7 +326,10 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Thu Aug 03 2006 Kai Engert <kengert at redhat.com> - 3.11.2-2
+- Add /etc/pki/nssdb
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.11.2-1.1
 - rebuild
 
 * Fri Jun 30 2006 Kai Engert <kengert at redhat.com> - 3.11.2-1



From fedora-cvs-commits at redhat.com  Fri Aug  4 16:56:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 12:56:01 -0400
Subject: rpms/cman/devel .cvsignore, 1.11, 1.12 cman-makefix.patch, 1.4,
	1.5 cman.spec, 1.61, 1.62 sources, 1.20, 1.21
Message-ID: <200608041656.k74Gu1Sw005036@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5020

Modified Files:
	.cvsignore cman-makefix.patch cman.spec sources 
Log Message:
New sources, removed unneeded changes from makefix.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Aug 2006 22:42:57 -0000	1.11
+++ .cvsignore	4 Aug 2006 16:55:58 -0000	1.12
@@ -1 +1 @@
-cman-2.0.5.tar.gz
+cman-2.0.6.tar.gz

cman-makefix.patch:
 Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Index: cman-makefix.patch
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman-makefix.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cman-makefix.patch	4 Aug 2006 13:45:18 -0000	1.4
+++ cman-makefix.patch	4 Aug 2006 16:55:58 -0000	1.5
@@ -20,47 +20,3 @@
  
  uninstall:
  
---- cman-2.0.5/cman/daemon/Makefile.makefix	2006-07-07 02:53:14.000000000 -0500
-+++ cman-2.0.5/cman/daemon/Makefile	2006-08-04 08:42:36.000000000 -0500
-@@ -33,7 +33,7 @@ copytobin: all
- 	cp ${TARGET} ${top_srcdir}/bin
- 
- service_cman.lcrso: ${CMAN_OBJS}
--	$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L${ccslibdir} -lccs
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L$(ccslibdir) -lccs
- 
- daemon.o: daemon.c list.h cnxman-socket.h cnxman-private.h \
-   daemon.h logging.h commands.h barrier.h cmanccs.h
---- cman-2.0.5/cman/qdisk/Makefile.makefix	2006-08-04 08:43:42.000000000 -0500
-+++ cman-2.0.5/cman/qdisk/Makefile	2006-08-04 08:43:55.000000000 -0500
-@@ -32,7 +32,7 @@ install: ${TARGET}
- 
- qdiskd: disk.o crc32.o disk_util.o main.o score.o bitmap.o clulog.o \
- 	gettid.o proc.o ../lib/libcman.a
--	gcc -o $@ $^ -lpthread -L../lib -L${ccslibdir} -lccs
-+	gcc -o $@ $^ -lpthread -L../lib -L$(ccslibdir) -lccs
- 
- mkqdisk: disk.o crc32.o disk_util.o \
- 	 proc.o mkqdisk.o
---- cman-2.0.5/fence/fence_node/Makefile.makefix	2006-08-04 08:44:22.000000000 -0500
-+++ cman-2.0.5/fence/fence_node/Makefile	2006-08-04 08:44:30.000000000 -0500
-@@ -25,7 +25,7 @@ endif
- 
- INCLUDE = -I${top_srcdir}/include -I${ccsincdir} -I${incdir} -I${top_srcdir}/config -I${top_srcdir}/../cman/lib
- 
--LDFLAGS+= -L${ccslibdir} -L${libdir} -L${top_srcdir}/../cman/lib
-+LDFLAGS+= -L$(ccslibdir) -L${libdir} -L${top_srcdir}/../cman/lib
- LOADLIBES+= -lccs -lcman
- 
- FENCE_NODE_SRC = \
---- cman-2.0.5/fence/fence_tool/Makefile.makefix	2006-08-04 08:44:03.000000000 -0500
-+++ cman-2.0.5/fence/fence_tool/Makefile	2006-08-04 08:44:15.000000000 -0500
-@@ -25,7 +25,7 @@ endif
- 
- INCLUDE = -I${top_srcdir}/include -I${ccsincdir} -I${cmanincdir} -I${incdir} -I${top_srcdir}/config
- 
--LDFLAGS+= -L${ccslibdir} -L${libdir} -L${top_srcdir}/../cman/lib -lcman
-+LDFLAGS+= -L$(ccslibdir) -L${libdir} -L${top_srcdir}/../cman/lib -lcman
- LOADLIBES+= -lccs -lcman
- 
- FENCE_TOOL_SRC = \


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- cman.spec	4 Aug 2006 13:45:18 -0000	1.61
+++ cman.spec	4 Aug 2006 16:55:58 -0000	1.62
@@ -10,11 +10,11 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.5
+%define cman_minor 0.6
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.7
+Release: 0.fc6.0
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	2 Aug 2006 22:42:57 -0000	1.20
+++ sources	4 Aug 2006 16:55:58 -0000	1.21
@@ -1 +1 @@
-7fd2fcc7489b3524a9eaea6d414cb4a5  cman-2.0.5.tar.gz
+15d92c47deae098b73623feab2fbecb2  cman-2.0.6.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug  4 17:06:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 13:06:04 -0400
Subject: rpms/system-config-securitylevel/FC-5 lokkit-range.patch, NONE,
	1.1 system-config-securitylevel-range.patch, NONE,
	1.1 system-config-securitylevel.spec, 1.76, 1.77
Message-ID: <200608041706.k74H64jX005232@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-securitylevel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5207

Modified Files:
	system-config-securitylevel.spec 
Added Files:
	lokkit-range.patch system-config-securitylevel-range.patch 
Log Message:
Add patches backported from rawhide to support dashes in the names of ports.


lokkit-range.patch:
 lokkit.c |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

--- NEW FILE lokkit-range.patch ---
Index: src/lokkit.c
===================================================================
RCS file: /usr/local/CVS/redhat-config-securitylevel/src/lokkit.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- src/lokkit.c	2 May 2006 17:01:13 -0000	1.50
+++ src/lokkit.c	5 Jun 2006 17:26:34 -0000	1.51
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -347,13 +348,24 @@
 	numports = 0;
 }
 
+static int is_numbers (char *name) {
+   char *ch;
+
+   for (ch = name; *ch != '\0'; ch++) {
+      if (isalpha(*ch))
+         return 0;
+   }
+
+   return 1;
+}
+
 void add_port(char *name) {
 	char *tmp, *tmp2;
 	char *protospec;
 	struct servent *service;
 	int x, found = 0, start_port = 0, end_port = 0;
 
-	if ((tmp = strstr(name,":"))) {
+	if ((tmp = strstr(name,":")) != NULL) {
 		*tmp = '\0';
 		tmp++;
 		protospec = tmp;
@@ -365,7 +377,7 @@
 	 * specified.  Split it out into starting and ending ports.  Otherwise,
 	 * leave the end port at 0.
 	 */
-	if ((tmp2 = strstr(name, "-"))) {
+	if (is_numbers (name) && (tmp2 = strstr(name, "-")) != NULL) {
 		*tmp2 = '\0';
 		tmp2++;
 		start_port = strtol(name, &tmp2-1, 10);
@@ -374,7 +386,7 @@
 		start_port = strtol(name, &tmp, 10);
 	}
 
-	if (tmp) {
+	if (tmp && end_port == 0) {
 		service = getservbyname(name, protospec);
 
 		if (service) {
@@ -405,16 +417,16 @@
 	struct servent *service;
 	
 	memset(tmp,'\0', 256);
-	service = getservbyport(htons(port->start_port), port->proto);
 
-	if (service) {
-		snprintf(tmp, 255, "%s:%s", service->s_name, port->proto);
-	} else {
-		if (port->end_port == 0)
-			snprintf(tmp, 255, "%d:%s", port->start_port, port->proto);
+        if (port->end_port == 0) {
+		service = getservbyport(htons(port->start_port), port->proto);
+
+		if (service)
+			snprintf(tmp, 255, "%s:%s", service->s_name, port->proto);
 		else
-			snprintf(tmp, 255, "%d-%d:%s", port->start_port, port->end_port, port->proto);
-	}
+			snprintf(tmp, 255, "%d:%s", port->start_port, port->proto);
+        } else
+		snprintf(tmp, 255, "%d-%d:%s", port->start_port, port->end_port, port->proto);
 
 	ret = calloc((orig ? strlen(orig) : 0) + strlen(tmp) + 2, sizeof(char));
 

system-config-securitylevel-range.patch:
 securitylevel.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-securitylevel-range.patch ---
Index: src/securitylevel.py
===================================================================
RCS file: /usr/local/CVS/redhat-config-securitylevel/src/securitylevel.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- src/securitylevel.py	19 Jun 2006 14:59:45 -0000	1.64
+++ src/securitylevel.py	11 Jul 2006 17:18:02 -0000	1.65
@@ -365,7 +365,7 @@
         return None
 
     def portIsValid(self, port):
-        namepat = re.compile("^[A-Za-z]+$")
+        namepat = re.compile("[^-0-9]")
         pattern = re.compile("^[0-9]+(-[0-9]+)?$")
         return pattern.match(port) is not None or \
                namepat.match(port) is not None


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/FC-5/system-config-securitylevel.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- system-config-securitylevel.spec	22 May 2006 14:31:29 -0000	1.76
+++ system-config-securitylevel.spec	4 Aug 2006 17:06:02 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
 Version: 1.6.16
-Release: 2
+Release: 3
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -10,6 +10,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Source0: %{name}-%{version}.tar.bz2
 Patch0: %{name}-selinux.patch
+Patch1: %{name}-range.patch
+Patch2: lokkit-range.patch
 BuildRequires: desktop-file-utils newt-devel slang-devel popt
 BuildRequires: gettext
 BuildRequires: intltool
@@ -41,6 +43,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
+%patch2 -p0
 
 %build
 make
@@ -99,6 +103,9 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Fri Aug 04 2006 Chris Lumens <clumens at redhat.com> 1.6.16-3
+- Support named ports with a dash in the name (#197486, #200725).
+
 * Mon May 22 2006 Chris Lumens <clumens at redhat.com> 1.6.16-2
 - Don't display the SELinux page if no policy is installed (#186554,
   #192544).



From fedora-cvs-commits at redhat.com  Fri Aug  4 17:07:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 13:07:03 -0400
Subject: rpms/eel2/devel eel-2.15.90-background-mtime.patch, NONE,
	1.1 eel2.spec, 1.52, 1.53
Message-ID: <200608041707.k74H73fo005315@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5300

Modified Files:
	eel2.spec 
Added Files:
	eel-2.15.90-background-mtime.patch 
Log Message:
fix background setting from firefox


eel-2.15.90-background-mtime.patch:
 eel-background.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE eel-2.15.90-background-mtime.patch ---
--- eel-2.15.90/eel/eel-background.c.mtime	2006-01-12 05:43:45.000000000 -0500
+++ eel-2.15.90/eel/eel-background.c	2006-08-04 12:49:39.000000000 -0400
@@ -125,6 +125,7 @@
 	gboolean constant_size;
 	
 	char *image_uri;
+	time_t image_mtime;
 	GdkPixbuf *image;
 	int image_width_unscaled;
 	int image_height_unscaled;
@@ -1545,10 +1546,21 @@
 				     gboolean emit_appearance_change,
 				     gboolean load_async)
 {
+        time_t mtime;
+        GnomeVFSFileInfo *info;
+
 	g_return_val_if_fail (EEL_IS_BACKGROUND (background), FALSE);
 
-	if (eel_strcmp (background->details->image_uri, image_uri) == 0) {
-		background->details->emit_after_load = emit_appearance_change;
+        mtime = background->details->image_mtime;
+        info = gnome_vfs_file_info_new ();
+        if (gnome_vfs_get_file_info (image_uri, info,
+                                     GNOME_VFS_FILE_INFO_FOLLOW_LINKS) == GNOME_VFS_OK) {
+                 mtime = info->mtime;
+        }
+        gnome_vfs_file_info_unref (info);
+	if (eel_strcmp (background->details->image_uri, image_uri) == 0 &&
+            mtime == background->details->image_mtime) {
+	   	background->details->emit_after_load = emit_appearance_change;
 		return FALSE;
 	}
 
@@ -1556,6 +1568,7 @@
 	
 	g_free (background->details->image_uri);
 	background->details->image_uri = g_strdup (image_uri);
+        background->details->image_mtime = mtime;
 
 	/* We do not get rid of the current image here. This gets done after the new
 	 * image loads - in eel_background_load_image_callback. This way the


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- eel2.spec	3 Aug 2006 18:23:44 -0000	1.52
+++ eel2.spec	4 Aug 2006 17:07:01 -0000	1.53
@@ -16,10 +16,11 @@
 Name:		eel2
 Summary:        Eazel Extensions Library
 Version: 	2.15.90
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
+Patch0:		eel-2.15.90-background-mtime.patch
 URL: 		http://www.gnome.org/projects/nautilus/
 BuildRoot:	/var/tmp/%{name}-%{version}-root
 
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n eel-%{version}
+%patch0 -p1 -b .background-mtime
 
 %build
 %configure
@@ -109,6 +111,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-2.fc6
+- Compare mtimes of images when the uri has not changed
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 17:20:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 13:20:18 -0400
Subject: rpms/control-center/devel .cvsignore, 1.43, 1.44 control-center.spec,
	1.159, 1.160 sources, 1.46, 1.47
Message-ID: <200608041720.k74HKIrk020571@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20556

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	13 Jul 2006 14:26:44 -0000	1.43
+++ .cvsignore	4 Aug 2006 17:20:16 -0000	1.44
@@ -1 +1 @@
-control-center-2.15.3.tar.bz2
+control-center-2.15.90.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- control-center.spec	24 Jul 2006 04:49:42 -0000	1.159
+++ control-center.spec	4 Aug 2006 17:20:16 -0000	1.160
@@ -20,8 +20,8 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.15.4
-Release: 6 
+Version: 2.15.90
+Release: 1%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -249,6 +249,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Mon Jul 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-6
 - Make gnome-about-me start 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	13 Jul 2006 14:26:44 -0000	1.46
+++ sources	4 Aug 2006 17:20:16 -0000	1.47
@@ -1 +1 @@
-de3a495fc1265e9ed84212299ade5a0a  control-center-2.15.4.tar.bz2
+e0864dc5e354064599a9ea50e155c0b8  control-center-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 17:28:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 13:28:58 -0400
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.35,
	1.36 nautilus-cd-burner.spec, 1.68, 1.69 sources, 1.35, 1.36
Message-ID: <200608041728.k74HSwiO020678@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20663

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.15.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	12 Jul 2006 21:51:05 -0000	1.35
+++ .cvsignore	4 Aug 2006 17:28:56 -0000	1.36
@@ -1 +1 @@
-nautilus-cd-burner-2.15.4.tar.bz2
+nautilus-cd-burner-2.15.5.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- nautilus-cd-burner.spec	19 Jul 2006 16:57:07 -0000	1.68
+++ nautilus-cd-burner.spec	4 Aug 2006 17:28:56 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.15.4
-Release: 3
+Version: 2.15.5
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 Patch0: nautilus-cd-burner-2.15.4-dbus-disconnect.patch
 License: LGPL/GPL
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.5-1.fc6
+- Update to 2.15.5
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-3
 - Don't use deprecated dbus api
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	12 Jul 2006 21:51:05 -0000	1.35
+++ sources	4 Aug 2006 17:28:56 -0000	1.36
@@ -1 +1 @@
-e0c9e4758c8cd785704c76f04f9ac5e5  nautilus-cd-burner-2.15.4.tar.bz2
+ed2887cef0675e8b3ef7b9cdeb1bc9e8  nautilus-cd-burner-2.15.5.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 17:44:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 13:44:50 -0400
Subject: rpms/gnome-panel/devel .cvsignore, 1.42, 1.43 gnome-panel.spec,
	1.135, 1.136 sources, 1.42, 1.43
Message-ID: <200608041744.k74HioJf032594@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
- update to 2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	30 May 2006 01:46:50 -0000	1.42
+++ .cvsignore	4 Aug 2006 17:44:48 -0000	1.43
@@ -1 +1 @@
-gnome-panel-2.14.2.tar.bz2
+gnome-panel-2.15.90.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- gnome-panel.spec	28 Jul 2006 15:13:25 -0000	1.135
+++ gnome-panel.spec	4 Aug 2006 17:44:48 -0000	1.136
@@ -19,8 +19,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.14.2
-Release: 8
+Version: 2.15.90
+Release: 1%{?dist} 
 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
@@ -74,7 +74,6 @@
 Patch4: gnome-panel-2.13.2-rename-system-menu.patch
 Patch5: gnome-panel-2.12.1-about-fedora.patch
 Patch6: gnome-panel-2.13.5-switch-user.patch
-Patch7: gnome-panel-2.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.1-remove-duplicate-entry.patch
@@ -108,7 +107,6 @@
 %patch4 -p1 -b .rename-system-menu
 %patch5 -p1 -b .about-fedora
 %patch6 -p1 -b .switch-user
-%patch7 -p1 -b .gpm-integration
 %patch8 -p1 -b .use-beagle
 %patch9 -p1 -b .ignore-unknown-options
 %patch10 -p1 -b .remove-duplicate-entry
@@ -229,6 +227,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Aug  4 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-1
+- update to 2.15.90
+
 * Fri Jul 28 2006 Ray Strode <rstrode at redhat.com> - 2.14.2-8
 - don't get stuck in infinite recursion loop from previous
   fix.  Patch by Fredric Crozat


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	30 May 2006 01:46:50 -0000	1.42
+++ sources	4 Aug 2006 17:44:48 -0000	1.43
@@ -1 +1 @@
-7db1afb3f6cbca12acecc49c68b4a655  gnome-panel-2.14.2.tar.bz2
+e3e7d3924fdfea18131b26fd3b321cbd  gnome-panel-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 18:02:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 14:02:24 -0400
Subject: rpms/evolution/FC-5 evolution.spec, 1.147,
	1.148 evo-addressbook-print-with-pango-2.patch, 1.1,
	NONE evolution-2.5.4-fix-conduits.patch, 1.1, NONE
Message-ID: <200608041802.k74I2Oxh020793@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Removed Files:
	evo-addressbook-print-with-pango-2.patch 
	evolution-2.5.4-fix-conduits.patch 
Log Message:
- Require evolution-data-server 1.6.3.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- evolution.spec	3 Aug 2006 19:56:16 -0000	1.147
+++ evolution.spec	4 Aug 2006 18:02:18 -0000	1.148
@@ -1,6 +1,6 @@
 %define gtkhtml_version 3.9.2
 %define soup_version 2.2.2
-%define eds_version 1.6.2
+%define eds_version 1.6.3
 %define use_mozilla_nss 1
 %define evo_major 2.6
 %define libbonoboui_version 2.4.2
@@ -41,7 +41,7 @@
 
 Name: evolution
 Version: 2.6.3
-Release: 1.fc5.3
+Release: 1.fc5.4
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -598,6 +598,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-1.fc5.4
+- Require evolution-data-server 1.6.3.
+
 * Wed Aug  2 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-1.fc5.3
 - Remove evo-calendar-print-with-pango-7.patch (fixed upstream).
 - Remove patch for RH bug #150458 (fixed upstream).


--- evo-addressbook-print-with-pango-2.patch DELETED ---


--- evolution-2.5.4-fix-conduits.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug  4 18:40:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 14:40:10 -0400
Subject: rpms/gnome-panel/devel
	gnome-panel-2.15.90-move-suspend-to-menu.patch, NONE,
	1.1 gnome-panel.spec, 1.136,
	1.137 gnome-panel-2.10.0-vendor.patch, 1.1,
	NONE gnome-panel-2.11.4-remove-screenshot-menuitem.patch, 1.1,
	NONE gnome-panel-2.12.1-close.patch, 1.1,
	NONE gnome-panel-2.12.1-remove-screenshot-menuitem.patch, 1.1,
	NONE gnome-panel-2.12.1-rename-system-menu.patch, 1.2,
	NONE gnome-panel-2.13.3-fix-crash.patch, 1.1,
	NONE gnome-panel-2.13.90-gpm-integration.patch, 1.1,
	NONE gnome-panel-2.14.0-gpm-integration.patch, 1.3,
	NONE gnome-panel-2.14.1-about.patch, 1.1, NONE
Message-ID: <200608041840.k74IeAdo014374@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.15.90-move-suspend-to-menu.patch 
Removed Files:
	gnome-panel-2.10.0-vendor.patch 
	gnome-panel-2.11.4-remove-screenshot-menuitem.patch 
	gnome-panel-2.12.1-close.patch 
	gnome-panel-2.12.1-remove-screenshot-menuitem.patch 
	gnome-panel-2.12.1-rename-system-menu.patch 
	gnome-panel-2.13.3-fix-crash.patch 
	gnome-panel-2.13.90-gpm-integration.patch 
	gnome-panel-2.14.0-gpm-integration.patch 
	gnome-panel-2.14.1-about.patch 
Log Message:
- move suspend to menu again


gnome-panel-2.15.90-move-suspend-to-menu.patch:
 panel-action-button.c |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++
 panel-enums.h         |    1 
 panel-menu-items.c    |   23 +++++++++++++++++++++-
 panel-typebuiltins.c  |    1 
 4 files changed, 76 insertions(+), 1 deletion(-)

--- NEW FILE gnome-panel-2.15.90-move-suspend-to-menu.patch ---
--- gnome-panel-2.15.90/gnome-panel/panel-menu-items.c.move-suspend-to-menu	2006-08-04 13:59:37.000000000 -0400
+++ gnome-panel-2.15.90/gnome-panel/panel-menu-items.c	2006-08-04 14:27:02.000000000 -0400
@@ -49,6 +49,7 @@
 #include "panel-recent.h"
 #include "panel-stock-icons.h"
 #include "panel-util.h"
+#include "panel-power-manager.h"
 
 #define BOOKMARKS_FILENAME      ".gtk-bookmarks"
 #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
@@ -1005,10 +1006,22 @@ panel_desktop_menu_item_new (gboolean us
 	}
 
 	menuitem->priv->append_lock_logout = append_lock_logout;
-	if (append_lock_logout)
+	if (append_lock_logout) {
+		PanelPowerManager *manager;
+
 		panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu),
 					   menuitem);
 
+		manager = panel_get_power_manager ();
+
+		g_signal_connect_swapped (manager, "notify::is-connected",
+					  G_CALLBACK
+					  (panel_desktop_menu_item_recreate_menu), 
+					  menuitem);
+
+		g_object_unref (manager);
+	}
+
 	menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem);
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
 				   menuitem->priv->menu);
@@ -1113,6 +1126,14 @@ panel_menu_items_append_lock_logout (Gtk
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	}
 
+	item = panel_menu_items_create_action_item (PANEL_ACTION_SUSPEND);
+	if (item != NULL) {
+		if (!separator_inserted)
+			add_menu_separator (menu);
+
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	}
+
 	item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN);
 	if (item != NULL) {
 		if (!separator_inserted)
--- gnome-panel-2.15.90/gnome-panel/panel-enums.h.move-suspend-to-menu	2006-08-04 14:04:53.000000000 -0400
+++ gnome-panel-2.15.90/gnome-panel/panel-enums.h	2006-08-04 14:32:59.000000000 -0400
@@ -96,6 +96,7 @@ typedef enum {
 	PANEL_ACTION_FORCE_QUIT,
 	PANEL_ACTION_CONNECT_SERVER,
 	PANEL_ACTION_SHUTDOWN,
+	PANEL_ACTION_SUSPEND,
 	/* compatibility with GNOME < 2.13.90 */
         PANEL_ACTION_SCREENSHOT,
         PANEL_ACTION_LAST
--- gnome-panel-2.15.90/gnome-panel/panel-typebuiltins.c.move-suspend-to-menu	2006-08-04 14:02:40.000000000 -0400
+++ gnome-panel-2.15.90/gnome-panel/panel-typebuiltins.c	2006-08-04 14:33:43.000000000 -0400
@@ -154,6 +154,7 @@ static const GEnumValue _panel_action_bu
   { PANEL_ACTION_FORCE_QUIT, "PANEL_ACTION_FORCE_QUIT", "force-quit" },
   { PANEL_ACTION_CONNECT_SERVER, "PANEL_ACTION_CONNECT_SERVER", "connect-server" },
   { PANEL_ACTION_SHUTDOWN, "PANEL_ACTION_SHUTDOWN", "shutdown" },
+  { PANEL_ACTION_SUSPEND, "PANEL_ACTION_SUSPEND", "suspend" },
   { PANEL_ACTION_SCREENSHOT, "PANEL_ACTION_SCREENSHOT", "screenshot" },
   { PANEL_ACTION_LAST, "PANEL_ACTION_LAST", "last" },
   { 0, NULL, NULL }
--- gnome-panel-2.15.90/gnome-panel/panel-action-button.c.move-suspend-to-menu	2006-02-12 07:36:56.000000000 -0500
+++ gnome-panel-2.15.90/gnome-panel/panel-action-button.c	2006-08-04 14:33:32.000000000 -0400
@@ -47,10 +47,16 @@
 #include "panel-lockdown.h"
 #include "panel-logout.h"
 #include "panel-compatibility.h"
+#include "panel-power-manager.h"
 #include "panel-gdm.h"
 
 #define PANEL_ACTION_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_ACTION_BUTTON, PanelActionButtonPrivate))
 
+static gboolean panel_action_can_suspend (void);
+static gboolean panel_action_logout_is_disabled (void);
+static gboolean panel_action_suspend_is_disabled (void);
+static void panel_action_suspend (GtkWidget *widget);
+
 enum {
 	PROP_0,
 	PROP_ACTION_TYPE,
@@ -77,6 +83,7 @@ static GConfEnumStringPair panel_action_
 	{ PANEL_ACTION_FORCE_QUIT,     "force-quit"     },
 	{ PANEL_ACTION_CONNECT_SERVER, "connect-server" },
 	{ PANEL_ACTION_SHUTDOWN,       "shutdown"       },
+	{ PANEL_ACTION_SUSPEND,        "suspend"       },
 	/* compatibility with GNOME < 2.13.90 */
 	{ PANEL_ACTION_SCREENSHOT,     "screenshot"     },
 	{ 0,                           NULL             },
@@ -167,12 +174,47 @@ panel_action_shutdown (GtkWidget *widget
 }
 
 static gboolean
+panel_action_can_suspend (void)
+{
+  PanelPowerManager *manager;
+  gboolean can_suspend;
+
+  manager = panel_get_power_manager ();
+
+  can_suspend = panel_power_manager_can_suspend (manager);
+
+  g_object_unref (manager);
+
+  return can_suspend;
+}
+
+static gboolean
 panel_action_shutdown_is_disabled (void)
 {
 	return (panel_lockdown_get_disable_log_out() ||
 		!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN));
 }
 
+
+
+static gboolean
+panel_action_suspend_is_disabled (void)
+{
+  return !panel_action_can_suspend ();
+}
+
+static void
+panel_action_suspend (GtkWidget *widget)
+{
+  PanelPowerManager *manager;
+
+  manager = panel_get_power_manager ();
+
+  panel_power_manager_attempt_suspend (manager);
+
+  g_object_unref (manager);
+}
+
 /* Run Application
  */
 static void
@@ -358,6 +400,16 @@ static PanelAction actions [] = {
 		panel_action_shutdown, NULL, NULL,
 		panel_action_shutdown_is_disabled
 	},
+        {
+                PANEL_ACTION_SUSPEND,
+                "screensaver",
+                N_("Suspend"),
+                N_("Suspend the computer"),
+                "gospanel-20",
+                "ACTION:suspend:NEW",
+                panel_action_suspend, NULL, NULL,
+                panel_action_suspend_is_disabled
+	},
 	/* deprecated actions */
 	{
 		PANEL_ACTION_SCREENSHOT,


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- gnome-panel.spec	4 Aug 2006 17:44:48 -0000	1.136
+++ gnome-panel.spec	4 Aug 2006 18:40:05 -0000	1.137
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.15.90
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -80,6 +80,7 @@
 # support transparent background in the notification area
 Patch11: transparent-systray.patch
 Patch12: gnome-panel-2.14.2-xio-error.patch
+Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -112,6 +113,7 @@
 %patch10 -p1 -b .remove-duplicate-entry
 %patch11 -p1 -b .transparent-systray
 %patch12 -p1 -b .xio-error
+%patch13 -p1 -b .move-suspend-to-menu
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE2} m4
@@ -227,6 +229,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Aug  4 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-2
+- move suspend to menu again
+
 * Fri Aug  4 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-1
 - update to 2.15.90
 


--- gnome-panel-2.10.0-vendor.patch DELETED ---


--- gnome-panel-2.11.4-remove-screenshot-menuitem.patch DELETED ---


--- gnome-panel-2.12.1-close.patch DELETED ---


--- gnome-panel-2.12.1-remove-screenshot-menuitem.patch DELETED ---


--- gnome-panel-2.12.1-rename-system-menu.patch DELETED ---


--- gnome-panel-2.13.3-fix-crash.patch DELETED ---


--- gnome-panel-2.13.90-gpm-integration.patch DELETED ---


--- gnome-panel-2.14.0-gpm-integration.patch DELETED ---


--- gnome-panel-2.14.1-about.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug  4 18:50:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 14:50:06 -0400
Subject: rpms/nautilus/devel nautilus-2.15.90-background.patch, NONE,
	1.1 nautilus.spec, 1.113, 1.114
Message-ID: <200608041850.k74Io6sW000479@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv421

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.15.90-background.patch 
Log Message:
2.15.90


nautilus-2.15.90-background.patch:
 nautilus-directory-background.c |   37 ++++++++-----------------------------
 1 files changed, 8 insertions(+), 29 deletions(-)

--- NEW FILE nautilus-2.15.90-background.patch ---
--- nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c.wallpaper	2006-08-04 11:38:13.000000000 -0400
+++ nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c	2006-08-04 12:19:02.000000000 -0400
@@ -442,14 +442,13 @@
 	g_free (image);
 }
 
-static gboolean
+static void
 initialize_background_from_settings (NautilusFile *file,
 				     EelBackground *background)
 {
         char *color, *old_color;
         char *image, *old_image;
 	EelBackgroundImagePlacement placement, old_placement;
-        gboolean changed;
 	
         g_assert (NAUTILUS_IS_FILE (file));
         g_assert (EEL_IS_BACKGROUND (background));
@@ -482,33 +481,14 @@
                  G_CALLBACK (background_changed_callback),
                  file);
 
-
-        changed = FALSE;
-        
-        old_color = eel_background_get_color (background);
-        if (eel_strcmp (color, old_color) != 0) {
-                eel_background_set_color (background, color);
-                changed = TRUE;
-        }
-        g_free (old_color);
-
-        old_image = eel_background_get_image_uri (background);
-        if (eel_strcmp (image, old_image) != 0) {
-                if (eel_background_is_desktop(background)) {
-                        eel_background_set_image_uri_sync (background, image);
-                }
-                else {
-                        eel_background_set_image_uri (background, image);
-                }
-                changed = TRUE;
+        eel_background_set_color (background, color);
+        if (eel_background_is_desktop(background)) {
+                eel_background_set_image_uri_sync (background, image);
         }
-        g_free (old_image);
-        
-        old_placement = eel_background_get_image_placement (background);
-        if (old_placement != placement) {
-                eel_background_set_image_placement (background, placement);
-                changed = TRUE;
+        else {
+                eel_background_set_image_uri (background, image);
         }
+        eel_background_set_image_placement (background, placement);
 	
 	/* Unblock the handler. */
         g_signal_handlers_unblock_by_func
@@ -527,8 +507,7 @@
 saved_settings_changed_callback (NautilusFile *file,
                                  EelBackground *background)
 {
-        gboolean changed;
-	changed = initialize_background_from_settings (file, background);
+	initialize_background_from_settings (file, background);
 }
 
 /* handle the theme changing */


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- nautilus.spec	3 Aug 2006 18:44:37 -0000	1.113
+++ nautilus.spec	4 Aug 2006 18:50:03 -0000	1.114
@@ -85,6 +85,7 @@
 Patch1:         nautilus-2.5.7-rhconfig.patch
 Patch2:         nautilus-2.15.2-format.patch
 Patch3:		background-no-delay.patch
+Patch4:		nautilus-2.15.90-background.patch
 
 %description
 Nautilus integrates access to files, applications, media,
@@ -99,6 +100,7 @@
 %patch1 -p1 -b .rhconfig
 %patch2 -p1 -b .format
 %patch3 -p1 -b .no-delay
+%patch4 -p1 -b .background
 
 %build
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 18:55:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 14:55:55 -0400
Subject: rpms/gnome-python2/devel .cvsignore, 1.17, 1.18 gnome-python.spec,
	1.42, 1.43 sources, 1.17, 1.18
Message-ID: <200608041855.k74IttGq002719@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-python.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Jul 2006 04:29:48 -0000	1.17
+++ .cvsignore	4 Aug 2006 18:55:52 -0000	1.18
@@ -1 +1 @@
-gnome-python-2.15.4.tar.bz2
+gnome-python-2.15.90.tar.bz2


Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-python.spec	14 Jul 2006 19:42:56 -0000	1.42
+++ gnome-python.spec	4 Aug 2006 18:55:52 -0000	1.43
@@ -6,8 +6,8 @@
 
 Summary: The sources for the PyGNOME Python extension module.
 Name: gnome-python2
-Version: 2.15.4
-Release: 2
+Version: 2.15.90
+Release: 1%{?dist}
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-python/gnome-python-%{version}.tar.bz2
 Patch1: gnome-python-2.15.4-gnome-vfs.patch
 
@@ -185,6 +185,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Fri Jul 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
 - Fix gnome-vfs dependencies
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	13 Jul 2006 04:29:49 -0000	1.17
+++ sources	4 Aug 2006 18:55:52 -0000	1.18
@@ -1 +1 @@
-d97bbe81bb6c3a2a02740d5af9eb1d2a  gnome-python-2.15.4.tar.bz2
+192e7bf570b76ca3749fad3778abefe7  gnome-python-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 18:59:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 14:59:49 -0400
Subject: rpms/nautilus/devel nautilus-2.15.90-background.patch,1.1,1.2
Message-ID: <200608041859.k74Ixndi004279@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4220

Modified Files:
	nautilus-2.15.90-background.patch 
Log Message:
fix patch


nautilus-2.15.90-background.patch:
 nautilus-directory-background.c |   39 ++++++++-------------------------------
 1 files changed, 8 insertions(+), 31 deletions(-)

Index: nautilus-2.15.90-background.patch
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus-2.15.90-background.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-2.15.90-background.patch	4 Aug 2006 18:50:03 -0000	1.1
+++ nautilus-2.15.90-background.patch	4 Aug 2006 18:59:47 -0000	1.2
@@ -1,5 +1,5 @@
---- nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c.wallpaper	2006-08-04 11:38:13.000000000 -0400
-+++ nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c	2006-08-04 12:19:02.000000000 -0400
+--- nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c.background	2006-08-04 14:58:29.000000000 -0400
++++ nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c	2006-08-04 14:59:03.000000000 -0400
 @@ -442,14 +442,13 @@
  	g_free (image);
  }
@@ -27,7 +27,10 @@
 -        if (eel_strcmp (color, old_color) != 0) {
 -                eel_background_set_color (background, color);
 -                changed = TRUE;
--        }
++        eel_background_set_color (background, color);
++        if (eel_background_is_desktop(background)) {
++                eel_background_set_image_uri_sync (background, image);
+         }
 -        g_free (old_color);
 -
 -        old_image = eel_background_get_image_uri (background);
@@ -39,10 +42,7 @@
 -                        eel_background_set_image_uri (background, image);
 -                }
 -                changed = TRUE;
-+        eel_background_set_color (background, color);
-+        if (eel_background_is_desktop(background)) {
-+                eel_background_set_image_uri_sync (background, image);
-         }
+-        }
 -        g_free (old_image);
 -        
 -        old_placement = eel_background_get_image_placement (background);
@@ -56,7 +56,16 @@
  	
  	/* Unblock the handler. */
          g_signal_handlers_unblock_by_func
-@@ -527,8 +507,7 @@
+@@ -518,8 +498,6 @@
+ 	
+ 	g_free (color);
+ 	g_free (image);
+-
+-        return changed;
+ }
+ 
+ /* handle the file changed signal */
+@@ -527,8 +505,7 @@
  saved_settings_changed_callback (NautilusFile *file,
                                   EelBackground *background)
  {



From fedora-cvs-commits at redhat.com  Fri Aug  4 19:21:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 15:21:40 -0400
Subject: rpms/gnome-python2/devel gnome-python.spec,1.43,1.44
Message-ID: <200608041921.k74JLe7e025112@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-python.spec 
Log Message:
2.15.90



Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnome-python.spec	4 Aug 2006 18:55:52 -0000	1.43
+++ gnome-python.spec	4 Aug 2006 19:21:38 -0000	1.44
@@ -9,7 +9,6 @@
 Version: 2.15.90
 Release: 1%{?dist}
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-python/gnome-python-%{version}.tar.bz2
-Patch1: gnome-python-2.15.4-gnome-vfs.patch
 
 License: LGPL
 Group: Development/Languages
@@ -109,7 +108,6 @@
 
 %prep
 %setup -q -n gnome-python-%{version}
-%patch1 -p1 -b .gnome-vfs
 
 %build
 # gnome-vfs patch changes configure.in



From fedora-cvs-commits at redhat.com  Fri Aug  4 19:27:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 15:27:40 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.26,1.27
Message-ID: <200608041927.k74JRe4R027459@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27128

Modified Files:
	xdoclet.spec 
Log Message:
- Rebuild with define with_gcj_support



Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xdoclet.spec	4 Aug 2006 15:55:58 -0000	1.26
+++ xdoclet.spec	4 Aug 2006 19:27:38 -0000	1.27
@@ -28,6 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define _with_gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define section free
@@ -41,7 +43,7 @@
 
 Name:		xdoclet
 Version:	1.2.3
-Release:	7jpp.1
+Release:	7jpp.2
 Epoch:		0
 Summary:	XDoclet Attribute Orientated Programming Framework
 License:	XDoclet Open Source Licence
@@ -297,6 +299,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Fri Aug 04 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-7jpp.2
+- Rebuild with define with_gcj_support
+
 * Thu Aug 03 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-7jpp.1
 - Merge with upstream version
 - Remove unnecessary define with_gcj_support



From fedora-cvs-commits at redhat.com  Fri Aug  4 19:29:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 15:29:01 -0400
Subject: rpms/gnome-python2/devel gnome-python.spec,1.44,1.45
Message-ID: <200608041929.k74JT18N028038@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-python.spec 
Log Message:
fix file lists



Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-python.spec	4 Aug 2006 19:21:38 -0000	1.44
+++ gnome-python.spec	4 Aug 2006 19:28:58 -0000	1.45
@@ -168,8 +168,7 @@
 
 %files gnomevfs
 %defattr(-,root,root,-)
-%{_libdir}/python?.?/site-packages/gtk-2.0/gnome/vfs.*
-%{_libdir}/python?.?/site-packages/gtk-2.0/gnomevfs.so
+%{_libdir}/python?.?/site-packages/gtk-2.0/gnomevfs
 %{_libdir}/gnome-vfs-2.0/modules/libpythonmethod.so
 %{_includedir}/gnome-python-2.0/pygnomevfs.h
 %defattr(644,root,root,755)



From fedora-cvs-commits at redhat.com  Fri Aug  4 19:35:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 15:35:15 -0400
Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.6,
	1.7 gnome-python-desktop.spec, 1.18, 1.19 sources, 1.6, 1.7
Message-ID: <200608041935.k74JZFot029152@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29107

Modified Files:
	.cvsignore gnome-python-desktop.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Jul 2006 04:37:06 -0000	1.6
+++ .cvsignore	4 Aug 2006 19:35:13 -0000	1.7
@@ -1 +1 @@
-gnome-python-desktop-2.15.4.tar.bz2
+gnome-python-desktop-2.15.90.tar.bz2


Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-python-desktop.spec	20 Jul 2006 14:18:54 -0000	1.18
+++ gnome-python-desktop.spec	4 Aug 2006 19:35:13 -0000	1.19
@@ -14,8 +14,8 @@
 
 Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop.
 Name: gnome-python2-desktop
-Version: 2.15.4
-Release: 2
+Version: 2.15.90
+Release: 1%{?dist}
 License: GPL/LGPL
 Group: Development/Languages
 Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-desktop/2.13/gnome-python-desktop-%{version}.tar.bz2
@@ -254,6 +254,9 @@
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.90
+
 * Thu Jul 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
 - Rebuild against dbus
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jul 2006 04:37:07 -0000	1.6
+++ sources	4 Aug 2006 19:35:13 -0000	1.7
@@ -1 +1 @@
-83dd68a0cec2f32966660a6b9abbef08  gnome-python-desktop-2.15.4.tar.bz2
+ddff73b70371c93f49df460d072db948  gnome-python-desktop-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 19:37:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 15:37:38 -0400
Subject: rpms/gnome-python2/devel gnome-python.spec,1.45,1.46
Message-ID: <200608041937.k74JbcMo030059@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-python.spec 
Log Message:
fix file lists 



Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-python.spec	4 Aug 2006 19:28:58 -0000	1.45
+++ gnome-python.spec	4 Aug 2006 19:37:35 -0000	1.46
@@ -169,8 +169,10 @@
 %files gnomevfs
 %defattr(-,root,root,-)
 %{_libdir}/python?.?/site-packages/gtk-2.0/gnomevfs
+%{_libdir}/python?.?/site-packages/gtk-2.0/gnome/vfs*
 %{_libdir}/gnome-vfs-2.0/modules/libpythonmethod.so
 %{_includedir}/gnome-python-2.0/pygnomevfs.h
+%{_includedir}/gnome-python-2.0/pygnomevfsbonobo.h
 %defattr(644,root,root,755)
 %doc examples/vfs/*
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 20:18:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 16:18:00 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs-2.15.90-dbus-spew.patch, NONE,
	1.1 gnome-vfs2.spec, 1.125, 1.126
Message-ID: <200608042018.k74KI0Y9021895@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.15.90-dbus-spew.patch 
Log Message:
remove debug spew


gnome-vfs-2.15.90-dbus-spew.patch:
 gnome-vfs-dbus-utils.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-vfs-2.15.90-dbus-spew.patch ---
--- gnome-vfs-2.15.90/libgnomevfs/gnome-vfs-dbus-utils.c.dbus-spew	2006-08-04 16:14:21.000000000 -0400
+++ gnome-vfs-2.15.90/libgnomevfs/gnome-vfs-dbus-utils.c	2006-08-04 16:14:43.000000000 -0400
@@ -124,7 +124,7 @@
 				       DBUS_TYPE_STRING, &new_owner,
 				       DBUS_TYPE_INVALID);
 
-		g_print ("NameOwnerChanged %s %s->%s\n", service, old_owner, new_owner);
+		d(g_print ("NameOwnerChanged %s %s->%s\n", service, old_owner, new_owner));
 		
 		if (strcmp (service, DVD_DAEMON_SERVICE) == 0) {
 			if (strcmp (old_owner, "") != 0 &&


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gnome-vfs2.spec	3 Aug 2006 19:41:57 -0000	1.125
+++ gnome-vfs2.spec	4 Aug 2006 20:17:57 -0000	1.126
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -59,6 +59,9 @@
 
 Patch4:  gnome-vfs-2.15.1-use-sys-inotify.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=349979
+Patch5: gnome-vfs-2.15.90-dbus-spew.patch
+
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -100,6 +103,8 @@
 
 %patch4 -p1 -b .use-sys-inotify
 
+%patch5 -p1 -b .dbus-spew
+
 # send to upstream
 %patch101 -p1 -b .schema_about
 
@@ -190,6 +195,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> -2.15.90-2.fc6
+- Remove debug spew
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 20:37:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 16:37:23 -0400
Subject: rpms/evolution-data-server/devel .cvsignore, 1.48,
	1.49 evolution-data-server.spec, 1.110, 1.111 sources, 1.48,
	1.49 evolution-data-server-1.7.4-with-libdb-fix.patch, 1.3, NONE
Message-ID: <200608042037.k74KbN1b030080@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-1.7.4-with-libdb-fix.patch 
Log Message:
- Update to 1.7.90.1 (again)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	31 Jul 2006 19:48:55 -0000	1.48
+++ .cvsignore	4 Aug 2006 20:37:20 -0000	1.49
@@ -1 +1 @@
-evolution-data-server-1.7.4.tar.bz2
+evolution-data-server-1.7.90.1.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- evolution-data-server.spec	3 Aug 2006 18:12:02 -0000	1.110
+++ evolution-data-server.spec	4 Aug 2006 20:37:20 -0000	1.111
@@ -21,7 +21,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.7.4
+Version: 1.7.90.1
 Release: 5
 License: LGPL
 Group: System Environment/Libraries
@@ -38,12 +38,8 @@
 Patch13: evolution-data-server-1.3.8-fix-implicit-function-declarations
 Patch14: evolution-data-server-1.5.4-make_imap4_optional.patch
 
-# Gnome.org bug #344693
-Patch15: evolution-data-server-1.7.4-with-libdb-fix.patch
-
 # Gnome.org bug #348725
-# Getting ahead of ourselves... reenable on upgrade.
-#Patch16: evolution-data-server-1.7.90.1-missing-function-decl.patch
+Patch15: evolution-data-server-1.7.90.1-missing-function-decl.patch
 
 ### Dependencies ###
 
@@ -126,8 +122,7 @@
 %patch12 -p1 -b .fix_open_calendar_declaration
 %patch13 -p1 -b .fix-implicit-function-declarations
 %patch14 -p1 -b .make_imap4_optional
-%patch15 -p1 -b .with-libdb-fix
-#patch16 -p1 -b .missing-function-decl
+%patch15 -p1 -b .missing-function-decl
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -330,6 +325,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.90.1-5
+- Update to 1.7.90.1 (again)
+
 * Thu Aug  3 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-5
 - Remove patches for Gnome.org bug #309079 (rejected upstream).
 - One of these patches was causing RH bug #167157.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	31 Jul 2006 19:48:55 -0000	1.48
+++ sources	4 Aug 2006 20:37:20 -0000	1.49
@@ -1 +1 @@
-b992845da75badd6eb5fecea022b5a50  evolution-data-server-1.7.4.tar.bz2
+07fa3db5725d41093b22d4e90c2ced87  evolution-data-server-1.7.90.1.tar.bz2


--- evolution-data-server-1.7.4-with-libdb-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug  4 20:38:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 16:38:30 -0400
Subject: rpms/gnome-speech/devel .cvsignore, 1.13, 1.14 gnome-speech.spec,
	1.29, 1.30 sources, 1.13, 1.14
Message-ID: <200608042038.k74KcUAf030557@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-speech.spec sources 
Log Message:
0.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	12 Jul 2006 03:50:19 -0000	1.13
+++ .cvsignore	4 Aug 2006 20:38:27 -0000	1.14
@@ -1 +1 @@
-gnome-speech-0.4.1.tar.bz2
+gnome-speech-0.4.2.tar.bz2


Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-speech.spec	12 Jul 2006 06:09:24 -0000	1.29
+++ gnome-speech.spec	4 Aug 2006 20:38:27 -0000	1.30
@@ -2,8 +2,8 @@
 
 Summary: GNOME Text to Speech
 Name: gnome-speech
-Version: 0.4.1
-Release: 1.1
+Version: 0.4.2
+Release: 1%{?dist}
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.2-1.fc6
+- Update to 0.4.2
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4.1-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Jul 2006 03:50:19 -0000	1.13
+++ sources	4 Aug 2006 20:38:27 -0000	1.14
@@ -1 +1 @@
-1e42617a404449476cfe150d406e8349  gnome-speech-0.4.1.tar.bz2
+df06441a5b560830264c0557e3d3c376  gnome-speech-0.4.2.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug  4 20:48:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 16:48:15 -0400
Subject: rpms/kernel/devel .cvsignore, 1.507, 1.508 kernel-2.6.spec, 1.2525,
	1.2526 linux-2.6-compile-fixes.patch, 1.97, 1.98 sources,
	1.470, 1.471 upstream, 1.410,
	1.411 patch-2.6.18-rc3-git3.bz2.sign, 1.1, NONE
Message-ID: <200608042048.k74KmFal016011@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Removed Files:
	patch-2.6.18-rc3-git3.bz2.sign 
Log Message:
git6


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -r1.507 -r1.508
--- .cvsignore	3 Aug 2006 21:49:51 -0000	1.507
+++ .cvsignore	4 Aug 2006 20:48:12 -0000	1.508
@@ -4,5 +4,5 @@
 kernel-2.6.17
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc3.bz2
-patch-2.6.18-rc3-git3.bz2
 xen-10924.tar.bz2
+patch-2.6.18-rc3-git6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2525
retrieving revision 1.2526
diff -u -r1.2525 -r1.2526
--- kernel-2.6.spec	4 Aug 2006 04:54:58 -0000	1.2525
+++ kernel-2.6.spec	4 Aug 2006 20:48:12 -0000	1.2526
@@ -264,7 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc3.bz2
-Patch2: patch-2.6.18-rc3-git3.bz2
+Patch2: patch-2.6.18-rc3-git6.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1693,6 +1693,9 @@
 %endif
 
 %changelog
+* Fri Aug  4 2006 Dave Jones <davej at redhat.com>
+- 2.6.18rc3-git6
+
 * Thu Aug  3 2006 Roland McGrath <roland at redhat.com>
 - New utrace patch:
   - fix s390 single-step

linux-2.6-compile-fixes.patch:
 Makefile                      |    4 ----
 arch/ia64/kernel/ia64_ksyms.c |    1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- linux-2.6-compile-fixes.patch	31 Jul 2006 21:31:31 -0000	1.97
+++ linux-2.6-compile-fixes.patch	4 Aug 2006 20:48:12 -0000	1.98
@@ -22,45 +22,3 @@
  
  #define __KERNEL_SYSCALLS__
  #include <asm/unistd.h>
-Date: Mon, 31 Jul 2006 09:17:01 -0400
-From: Prarit Bhargava <prarit at redhat.com>
-Subject: [RHEL5/Fedora]: BZ 196903 Fix ia64 compile
-
-CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the 
-same
-change in arch/ia64
-
-Signed-off-by: Prarit Bhargava <prarit at redhat.com>
-Signed-off-by: Aron Griffis <aron at hp.com>
-
-
-
-CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the same
-change in arch/ia64
-
-Signed-off-by: Prarit Bhargava <prarit at redhat.com>
-Signed-off-by: Aron Griffis <aron at hp.com>
-
---- linux-2.6.17.ia64.orig/arch/ia64/kernel/ia64_ksyms.c	2006-07-27 15:21:47.000000000 -0400
-+++ linux-2.6.17.ia64/arch/ia64/kernel/ia64_ksyms.c	2006-07-31 09:02:06.000000000 -0400
-@@ -68,7 +68,7 @@ EXPORT_SYMBOL(__udivdi3);
- EXPORT_SYMBOL(__moddi3);
- EXPORT_SYMBOL(__umoddi3);
- 
--#if defined(CONFIG_MD_RAID5) || defined(CONFIG_MD_RAID5_MODULE)
-+#if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)
- extern void xor_ia64_2(void);
- extern void xor_ia64_3(void);
- extern void xor_ia64_4(void);
---- linux-2.6.17.ia64.orig/arch/ia64/lib/Makefile	2006-07-27 09:20:01.000000000 -0400
-+++ linux-2.6.17.ia64/arch/ia64/lib/Makefile	2006-07-31 09:02:41.000000000 -0400
-@@ -14,7 +14,7 @@ lib-y := __divsi3.o __udivsi3.o __modsi3
- lib-$(CONFIG_ITANIUM)	+= copy_page.o copy_user.o memcpy.o
- lib-$(CONFIG_MCKINLEY)	+= copy_page_mck.o memcpy_mck.o
- lib-$(CONFIG_PERFMON)	+= carta_random.o
--lib-$(CONFIG_MD_RAID5)	+= xor.o
-+lib-$(CONFIG_MD_RAID456)	+= xor.o
- 
- AFLAGS___divdi3.o	=
- AFLAGS___udivdi3.o	= -DUNSIGNED
-


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- sources	3 Aug 2006 21:49:51 -0000	1.470
+++ sources	4 Aug 2006 20:48:13 -0000	1.471
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 ba31b754aaf80aa388858f86c34c4d01  patch-2.6.18-rc3.bz2
-2b8d22d3832b97c2bbd87e75755b36c9  patch-2.6.18-rc3-git3.bz2
 32a856cececcc35cb834cfaccc3c2523  xen-10924.tar.bz2
+0f5249b65cce6767af38d0d02efdb077  patch-2.6.18-rc3-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- upstream	3 Aug 2006 17:28:17 -0000	1.410
+++ upstream	4 Aug 2006 20:48:13 -0000	1.411
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc3.bz2
-patch-2.6.18-rc3-git3.bz2
+patch-2.6.18-rc3-git6.bz2


--- patch-2.6.18-rc3-git3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug  4 20:51:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 16:51:57 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.237,
	1.238 config-powerpc-generic, 1.24, 1.25
Message-ID: <200608042051.k74KpvE0017431@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic config-powerpc-generic 
Log Message:
dead syms



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- config-generic	26 Jul 2006 03:00:34 -0000	1.237
+++ config-generic	4 Aug 2006 20:51:54 -0000	1.238
@@ -2180,7 +2180,6 @@
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_AIRPRIME=m
-CONFIG_USB_SERIAL_ANYDATA=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CP2101=m
@@ -2432,7 +2431,6 @@
 CONFIG_CONFIGFS_FS=m
 
 CONFIG_DLM=m
-CONFIG_DLM_DEVICE=m
 CONFIG_DLM_DEBUG=y
 CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_NOLOCK=m


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- config-powerpc-generic	22 Jul 2006 19:28:43 -0000	1.24
+++ config-powerpc-generic	4 Aug 2006 20:51:54 -0000	1.25
@@ -33,7 +33,6 @@
 CONFIG_BLK_DEV_IDE_PMAC=y
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 CONFIG_BLK_DEV_IDEDMA_PMAC=y
-CONFIG_BLK_DEV_IDE_PMAC_BLINK=y
 
 CONFIG_ADB=y
 CONFIG_ADB_PMU=y



From fedora-cvs-commits at redhat.com  Fri Aug  4 20:55:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 16:55:36 -0400
Subject: rpms/adaptx/devel adaptx.spec,1.14,1.15
Message-ID: <200608042055.k74KtaQG018816@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/adaptx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18761

Modified Files:
	adaptx.spec 
Log Message:

Set _with_gcj_support to 1




Index: adaptx.spec
===================================================================
RCS file: /cvs/dist/rpms/adaptx/devel/adaptx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- adaptx.spec	4 Aug 2006 14:51:56 -0000	1.14
+++ adaptx.spec	4 Aug 2006 20:55:33 -0000	1.15
@@ -28,6 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define _with_gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define	section	free



From fedora-cvs-commits at redhat.com  Fri Aug  4 21:09:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 17:09:34 -0400
Subject: rpms/kernel/devel/configs config-generic,1.238,1.239
Message-ID: <200608042109.k74L9Ysn022084@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
signed modules fix


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- config-generic	4 Aug 2006 20:51:54 -0000	1.238
+++ config-generic	4 Aug 2006 21:09:31 -0000	1.239
@@ -2590,6 +2590,9 @@
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_SIGNATURE=y
+CONFIG_CRYPTO_SIGNATURE_DSA=y
+CONFIG_CRYPTO_MPILIB=y
 
 #
 # Library routines



From fedora-cvs-commits at redhat.com  Fri Aug  4 21:09:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 17:09:34 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2526,
	1.2527 linux-2.6-modsign-crypto.patch, 1.1,
	1.2 linux-2.6-modsign-ksign.patch, 1.2, 1.3
Message-ID: <200608042109.k74L9YTE022072@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-modsign-crypto.patch 
	linux-2.6-modsign-ksign.patch 
Log Message:
signed modules fix


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2526
retrieving revision 1.2527
diff -u -r1.2526 -r1.2527
--- kernel-2.6.spec	4 Aug 2006 20:48:12 -0000	1.2526
+++ kernel-2.6.spec	4 Aug 2006 21:09:30 -0000	1.2527
@@ -776,12 +776,12 @@
 #
 # GPG signed kernel modules
 #
-#%patch900 -p1
-#%patch901 -p1
-#%patch902 -p1
-#%patch903 -p1
-#%patch904 -p1
-#%patch905 -p1
+%patch900 -p1
+%patch901 -p1
+%patch902 -p1
+%patch903 -p1
+%patch904 -p1
+%patch905 -p1
 
 # Tux
 %patch910 -p1
@@ -1695,6 +1695,7 @@
 %changelog
 * Fri Aug  4 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3-git6
+- Return of signed modules.
 
 * Thu Aug  3 2006 Roland McGrath <roland at redhat.com>
 - New utrace patch:

linux-2.6-modsign-crypto.patch:
 crypto/Kconfig         |   19 +++++++++++++++++++
 crypto/Makefile        |    3 +++
 crypto/api.c           |   14 ++++++++++++--
 include/linux/crypto.h |    4 ++++
 4 files changed, 38 insertions(+), 2 deletions(-)

Index: linux-2.6-modsign-crypto.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-modsign-crypto.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-modsign-crypto.patch	16 Oct 2005 22:23:45 -0000	1.1
+++ linux-2.6-modsign-crypto.patch	4 Aug 2006 21:09:31 -0000	1.2
@@ -1,7 +1,7 @@
 diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/api.c linux-901/crypto/api.c
 --- linux-900/crypto/api.c
 +++ linux-901/crypto/api.c
-@@ -117,12 +117,19 @@ static void crypto_exit_ops(struct crypt
+@@ -117,12 +117,17 @@ static void crypto_exit_ops(struct crypt
  	}
  }
  
@@ -14,12 +14,10 @@
  	unsigned int tfm_size;
  
 -	alg = crypto_alg_mod_lookup(name);
-+	if (!nomodload) {
++	if (!nomodload)
 +		alg = crypto_alg_mod_lookup(name);
-+	}
-+	else {
++	else
 +		alg = crypto_alg_lookup(name);
-+	}
 +
  	if (alg == NULL)
  		goto out;
@@ -92,3 +90,4 @@
  void crypto_free_tfm(struct crypto_tfm *tfm);
  
  /*
+

linux-2.6-modsign-ksign.patch:
 linux-2.6.14/crypto/signature/ksign-keyring.c |    2 
 linux-902/crypto/digest.c                     |    8 
 linux-902/crypto/signature/Makefile           |   10 
 linux-902/crypto/signature/dsa.c              |   98 ++++
 linux-902/crypto/signature/key.h              |    7 
 linux-902/crypto/signature/ksign-keyring.c    |  112 ++++
 linux-902/crypto/signature/ksign-parse.c      |  609 ++++++++++++++++++++++++++
 linux-902/crypto/signature/ksign-publickey.c  |   19 
 linux-902/crypto/signature/ksign.c            |  179 +++++++
 linux-902/crypto/signature/local.h            |  163 ++++++
 linux-902/include/linux/crypto.h              |   10 
 linux-902/include/linux/crypto/ksign.h        |   22 
 12 files changed, 1239 insertions(+)

Index: linux-2.6-modsign-ksign.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-modsign-ksign.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-modsign-ksign.patch	22 Nov 2005 19:12:58 -0000	1.2
+++ linux-2.6-modsign-ksign.patch	4 Aug 2006 21:09:31 -0000	1.3
@@ -8,7 +8,7 @@
 +static void update_kernel(struct crypto_tfm *tfm,
 +			  const void *data, size_t count)
 +{
-+	tfm->__crt_alg->cra_digest.dia_update(crypto_tfm_ctx(tfm), data, count);
++	tfm->__crt_alg->cra_digest.dia_update(tfm, data, count);
 +	crypto_yield(tfm);
 +}
 +



From fedora-cvs-commits at redhat.com  Fri Aug  4 21:25:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 17:25:51 -0400
Subject: rpms/NetworkManager/devel
	NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch,
	NONE, 1.1 NetworkManager.spec, 1.114, 1.115
Message-ID: <200608042125.k74LPpPK009394@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9309

Modified Files:
	NetworkManager.spec 
Added Files:
	NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch 
Log Message:
- Don't ever elect inactive wired devices (bug 194124).


NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch:
 NetworkManagerPolicy.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch ---
--- NetworkManager-0.7.0/src/NetworkManagerPolicy.c.dont-choose-inactive-wired-device	2006-08-04 17:10:44.000000000 -0400
+++ NetworkManager-0.7.0/src/NetworkManagerPolicy.c	2006-08-04 17:10:53.000000000 -0400
@@ -213,6 +213,8 @@ static NMDevice * nm_policy_auto_get_bes
 				continue;
 
 			if (!link_active)
+				continue;
+			else
 				prio += 1;
 
 			if (nm_device_get_act_request (dev) && link_active)


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- NetworkManager.spec	19 Jul 2006 18:27:56 -0000	1.114
+++ NetworkManager.spec	4 Aug 2006 21:25:47 -0000	1.115
@@ -16,7 +16,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.7.0
-Release: 0%{?nm_cvs_version}.3
+Release: 0%{?nm_cvs_version}.4
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -216,6 +216,9 @@
 
 
 %changelog
+* Fri Aug  4 2006 Ray Strode <rstrode at redhat.com> - 0.7.0-0.cvs20060529.4
+- Don't ever elect inactive wired devices (bug 194124).
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.7.0-0.cvs20060529.3
 - Add patch to fix deprecated dbus functions
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 21:28:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 17:28:31 -0400
Subject: rpms/antlr/devel antlr.spec,1.26,1.27
Message-ID: <200608042128.k74LSVeJ010282@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10214

Modified Files:
	antlr.spec 
Log Message:

Define _with_gcj_support = 1




Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- antlr.spec	4 Aug 2006 14:52:55 -0000	1.26
+++ antlr.spec	4 Aug 2006 21:28:25 -0000	1.27
@@ -28,6 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define _with_gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 %define build_jedit  %{?_with_jedit:1}%{!?_without_jedit:0}
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 21:29:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 17:29:21 -0400
Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.24,
	1.25
Message-ID: <200608042129.k74LTLm6010655@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10626

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
* Fri Aug  4 2006 Adam Jackson <ajackson at redhat.com> 7.1-4.fc6
- xvidtune-1.0.1-buffer-stomp.patch: Fix a heap smash. (#189146)



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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-server-utils.spec	19 Jul 2006 22:26:17 -0000	1.24
+++ xorg-x11-server-utils.spec	4 Aug 2006 21:29:18 -0000	1.25
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -40,6 +40,7 @@
 Patch1200: xset-1.0.2-spurious-xprint.patch
 # xvidtune section
 #Patch1700: xvidtune-0.99.1-datadir-app-defaults-fix.patch
+Patch1700: xvidtune-1.0.1-buffer-stomp.patch
 
 # FIXME: Temporary build dep on automake, autoconf while they're still used
 # in the specfile.
@@ -59,7 +60,7 @@
 BuildRequires: xorg-x11-util-macros libXxf86vm-devel libXrandr-devel
 BuildRequires: libXrender-devel libXi-devel libXt-devel libXaw-devel
 BuildRequires: libXpm-devel libXxf86misc-devel libXfontcache-devel
-BuildRequires: libXp-devel zlib-devel
+BuildRequires: zlib-devel
 # ENDNOTE
 
 # FIXME: check if still needed for X11R7
@@ -88,6 +89,7 @@
 %patch1100 -p0 -b .datadir-rgbpath-fix
 %patch1200 -p0 -b .xprint
 #%patch1700 -p0 -b .datadir-app-defaults-fix
+%patch1700 -p1 -b .buffer-stomp
 
 %build
 
@@ -202,6 +204,9 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* Fri Aug  4 2006 Adam Jackson <ajackson at redhat.com> 7.1-4.fc6
+- xvidtune-1.0.1-buffer-stomp.patch: Fix a heap smash. (#189146)
+
 * Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 7.1-3.fc6
 - Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
 - Add 'dist' tag to package release string.



From fedora-cvs-commits at redhat.com  Fri Aug  4 21:30:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 17:30:54 -0400
Subject: rpms/xorg-x11-server-utils/devel xvidtune-1.0.1-buffer-stomp.patch,
	NONE, 1.1
Message-ID: <200608042130.k74LUs5E011165@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11141

Added Files:
	xvidtune-1.0.1-buffer-stomp.patch 
Log Message:
* Fri Aug  4 2006 Adam Jackson <ajackson at redhat.com> 7.1-4.fc6
- xvidtune-1.0.1-buffer-stomp.patch: Fix a heap smash. (#189146)


xvidtune-1.0.1-buffer-stomp.patch:
 xvidtune.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xvidtune-1.0.1-buffer-stomp.patch ---
--- xorg-x11-server-utils-7.1/xvidtune-1.0.1/xvidtune.c.jx	2004-04-23 15:55:08.000000000 -0400
+++ xorg-x11-server-utils-7.1/xvidtune-1.0.1/xvidtune.c	2006-08-04 17:16:17.000000000 -0400
@@ -965,7 +965,7 @@
 
     wids[0] = XtCreateWidget (w1name, labelWidgetClass, form, NULL, 0);
     if (findex >= PixelClock && findex <= VSyncRate)
-	(void) sprintf(buf, "%6.2f", (float)AppRes.field[findex].val / 1000.0);
+	(void) snprintf(buf, 10, "%6.2f", (float)AppRes.field[findex].val / 1000.0);
     else
 	(void) sprintf (buf, "%5d", AppRes.field[findex].val);
     wids[1] = XtVaCreateWidget (w2name, labelWidgetClass,



From fedora-cvs-commits at redhat.com  Fri Aug  4 21:58:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 17:58:40 -0400
Subject: rpms/avalon-logkit/devel avalon-logkit.spec,1.22,1.23
Message-ID: <200608042158.k74LwemP000965@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/avalon-logkit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv911

Modified Files:
	avalon-logkit.spec 
Log Message:

Added missing requirements.




Index: avalon-logkit.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-logkit/devel/avalon-logkit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- avalon-logkit.spec	22 Jul 2006 08:35:45 -0000	1.22
+++ avalon-logkit.spec	4 Aug 2006 21:58:33 -0000	1.23
@@ -28,8 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define short_name      logkit
@@ -38,7 +36,7 @@
 
 Name:		avalon-%{short_name}
 Version:	1.2
-Release:	4jpp_2fc
+Release:	4jpp.3
 Epoch:		0
 Summary:	Java logging toolkit
 License:	Apache Software License
@@ -81,6 +79,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -155,6 +155,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> 0:0.9.13-4jpp.3
+- Added missing requirements.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2-4jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 22:05:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 18:05:39 -0400
Subject: rpms/avalon-logkit/devel avalon-logkit.spec,1.23,1.24
Message-ID: <200608042205.k74M5coM002700@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/avalon-logkit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2626

Modified Files:
	avalon-logkit.spec 
Log Message:

Set _with_gcj_support = 1




Index: avalon-logkit.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-logkit/devel/avalon-logkit.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- avalon-logkit.spec	4 Aug 2006 21:58:33 -0000	1.23
+++ avalon-logkit.spec	4 Aug 2006 22:05:33 -0000	1.24
@@ -28,6 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define _with_gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define short_name      logkit



From fedora-cvs-commits at redhat.com  Fri Aug  4 22:26:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 18:26:11 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc3-git6.bz2.sign,NONE,1.1
Message-ID: <200608042226.k74MQBW6022730@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	patch-2.6.18-rc3-git6.bz2.sign 
Log Message:
sign


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

iD8DBQBE05msyGugalF9Dw4RAnvYAJwN/na5XqUe6Q0yZdH3pzg05YOszwCeMsSR
VwvybepWL1FWHe4/CaXaqqs=
=PgGd
-----END PGP SIGNATURE-----



From fedora-cvs-commits at redhat.com  Fri Aug  4 22:49:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 18:49:51 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.114, 1.115 libselinux.spec,
	1.215, 1.216 sources, 1.116, 1.117
Message-ID: <200608042249.k74MnpFG017763@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Tue Aug  1 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.22-1
- Upgrade to latest from NSA
	* Merged no-tls-direct-seg-refs patch from Jeremy Katz.
	* Merged netfilter_contexts support patch from Chris PeBenito.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- .cvsignore	2 Aug 2006 21:05:39 -0000	1.114
+++ .cvsignore	4 Aug 2006 22:49:48 -0000	1.115
@@ -89,3 +89,4 @@
 libselinux-1.30.15.tgz
 libselinux-1.30.19.tgz
 libselinux-1.30.20.tgz
+libselinux-1.30.22.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- libselinux.spec	2 Aug 2006 21:05:42 -0000	1.215
+++ libselinux.spec	4 Aug 2006 22:49:48 -0000	1.216
@@ -1,12 +1,11 @@
 %define libsepolver 1.12.21-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.20
+Version: 1.30.22
 Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
-Patch0: libselinux-tlssegneg.patch
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver} setransd
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +46,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .tlssegneg
 
 %build
 make clean
@@ -117,6 +115,11 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue Aug  1 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.22-1
+- Upgrade to latest from NSA
+	* Merged no-tls-direct-seg-refs patch from Jeremy Katz.
+	* Merged netfilter_contexts support patch from Chris PeBenito.
+
 * Tue Aug  1 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.20-1
 - Upgrade to latest from NSA
 	* Merged context_*_set errno patch from Jim Meyering.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- sources	2 Aug 2006 21:05:42 -0000	1.116
+++ sources	4 Aug 2006 22:49:48 -0000	1.117
@@ -1 +1 @@
-5ccb52638b39f60b3f2d02d73d5fba5b  libselinux-1.30.20.tgz
+0c64015c84796361265c30add29d1566  libselinux-1.30.22.tgz



From fedora-cvs-commits at redhat.com  Fri Aug  4 22:52:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 18:52:06 -0400
Subject: rpms/axis/devel axis.spec,1.20,1.21
Message-ID: <200608042252.k74Mq6NG017852@cvs.devel.redhat.com>

Author: dbhole

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

Modified Files:
	axis.spec 
Log Message:

Added missing requirements




Index: axis.spec
===================================================================
RCS file: /cvs/dist/rpms/axis/devel/axis.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- axis.spec	22 Jul 2006 08:35:51 -0000	1.20
+++ axis.spec	4 Aug 2006 22:52:01 -0000	1.21
@@ -8,7 +8,7 @@
 
 Name:          axis
 Version:       1.2.1
-Release:       2jpp_5fc
+Release:       2jpp.6
 Epoch:         0
 Summary:       A SOAP implementation in Java
 License:       Apache Software License
@@ -80,7 +80,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Libraries/Java
-Prereq: coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -210,6 +211,9 @@
 %doc docs/*
 
 %changelog
+* Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> 0:0.9.13-4jpp.6
+- Added missing requirements
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.1-2jpp_5fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 22:56:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 18:56:28 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.63, 1.64 libsemanage.spec, 1.98,
	1.99 sources, 1.65, 1.66
Message-ID: <200608042256.k74MuS0h017930@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.13-1
- Upgrade to latest from NSA
	* Merged netfilter contexts support from Chris PeBenito.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	12 Jul 2006 02:53:48 -0000	1.63
+++ .cvsignore	4 Aug 2006 22:56:25 -0000	1.64
@@ -69,3 +69,4 @@
 libsemanage-1.6.9.tgz
 libsemanage-1.6.11.tgz
 libsemanage-1.6.12.tgz
+libsemanage-1.6.13.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- libsemanage.spec	17 Jul 2006 13:12:48 -0000	1.98
+++ libsemanage.spec	4 Aug 2006 22:56:25 -0000	1.99
@@ -2,8 +2,8 @@
 %define libselinuxver 1.30.19-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.6.12
-Release: 2
+Version: 1.6.13
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -75,6 +75,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.13-1
+- Upgrade to latest from NSA
+	* Merged netfilter contexts support from Chris PeBenito.
+
 * Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.12-2
 - Rebuild for new gcc
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	12 Jul 2006 02:53:48 -0000	1.65
+++ sources	4 Aug 2006 22:56:25 -0000	1.66
@@ -1 +1 @@
-73ac0f49a67e67792c9712b6f5a4ec19  libsemanage-1.6.12.tgz
+b1224e4891618d62c21bcb69068e5379  libsemanage-1.6.13.tgz



From fedora-cvs-commits at redhat.com  Fri Aug  4 22:58:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 18:58:14 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch, NONE,
	1.1 .cvsignore, 1.76, 1.77 selinux-policy.spec, 1.244,
	1.245 sources, 1.80, 1.81
Message-ID: <200608042258.k74MwE6K018006@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore selinux-policy.spec sources 
Added Files:
	policy-20060802.patch 
Log Message:
* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.4-1
- Update to the latest from upstream


policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   10 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/rpm.fc               |    2 
 modules/admin/usermanage.te        |    4 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    3 
 modules/kernel/devices.te          |    2 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 ++++++++++++
 modules/kernel/terminal.if         |   19 +++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cups.te           |    6 
 modules/services/dbus.if           |    5 
 modules/services/ldap.te           |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    4 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  102 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   25 +++-
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   51 +++++++-
 modules/services/xserver.te        |   14 +-
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/mount.te            |    2 
 modules/system/selinuxutil.te      |    6 
 modules/system/udev.fc             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  231 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   50 +++-----
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |   26 +++-
 56 files changed, 703 insertions(+), 164 deletions(-)

--- NEW FILE policy-20060802.patch ---
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.4/policy/mls
--- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
+++ serefpolicy-2.3.4/policy/mls	2006-08-03 16:23:23.000000000 -0400
@@ -184,19 +184,12 @@
 	 ( t2 == mlstrustedobject ));
 
 # the "single level" file "write" ops
-mlsconstrain { file lnk_file fifo_file } { write create setattr relabelfrom append unlink link rename mounton }
+mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
 	(( l1 eq l2 ) or
 	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
 	 ( t1 == mlsfilewrite ) or
 	 ( t2 == mlstrustedobject ));
 
-# the "ranged" file "write" ops
-mlsconstrain { dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
-	((( l1 dom l2 ) and ( l1 domby h2 )) or
-	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
-	 ( t1 == mlsfilewrite ) or
-	 ( t2 == mlstrustedobject ));
-
 mlsconstrain dir { add_name remove_name reparent rmdir }
 	((( l1 dom l2 ) and ( l1 domby h2 )) or
 	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.4/policy/modules/admin/anaconda.te
--- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/admin/anaconda.te	2006-08-03 16:23:23.000000000 -0400
@@ -25,8 +25,12 @@
 
 modutils_domtrans_insmod(anaconda_t)
 
+seutil_domtrans_semanage(anaconda_t)
+
 unconfined_domain(anaconda_t)
 
+userdom_generic_user_home_dir_filetrans_generic_user_home_content(anaconda_t,{ dir file lnk_file fifo_file sock_file })
+
 ifdef(`distro_redhat',`
 	bootloader_create_runtime_file(anaconda_t)
 ')
@@ -51,9 +55,7 @@
 	usermanage_domtrans_admin_passwd(anaconda_t)
 ')
 
-ifdef(`TODO',`
 optional_policy(`
-	role system_r types sysadm_ssh_agent_t;
-	domain_auto_trans(anaconda_t, ssh_agent_exec_t, sysadm_ssh_agent_t)
-')
+	ssh_domtrans_keygen(anaconda_t)
 ')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.4/policy/modules/admin/consoletype.te
--- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/admin/consoletype.te	2006-08-03 16:23:23.000000000 -0400
@@ -8,7 +8,12 @@
 
 type consoletype_t;
 type consoletype_exec_t;
-init_domain(consoletype_t,consoletype_exec_t)
+#dont transition from initrc
+#init_domain(consoletype_t,consoletype_exec_t)
+domain_type(consoletype_t)
+domain_entry_file(consoletype_t,consoletype_exec_t)
+role system_r types consoletype_t;
+
 mls_file_read_up(consoletype_t)
 mls_file_write_down(consoletype_t)
 role system_r types consoletype_t;
@@ -114,3 +119,7 @@
 	xen_append_log(consoletype_t)
 	xen_dontaudit_rw_unix_stream_sockets(consoletype_t)
 ')
+
+optional_policy(`
+	xen_dontaudit_use_fds(consoletype_t)
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.4/policy/modules/admin/firstboot.te
--- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/admin/firstboot.te	2006-08-03 16:23:23.000000000 -0400
@@ -106,7 +106,7 @@
 ')
 
 optional_policy(`
-	hal_dbus_send(firstboot_t)
+	hal_dbus_chat(firstboot_t)
 ')
 
 optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.4/policy/modules/admin/rpm.fc
--- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/admin/rpm.fc	2006-08-03 16:23:23.000000000 -0400
@@ -19,6 +19,8 @@
 /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
 /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 /usr/sbin/up2date		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+/usr/bin/apt-get		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+/usr/bin/apt-shell		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 ')
 
 /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.4/policy/modules/admin/usermanage.te
--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/admin/usermanage.te	2006-08-03 16:23:23.000000000 -0400
@@ -260,7 +260,7 @@
 ')
 
 optional_policy(`
-	nscd_exec(groupadd_t)
+	nscd_domtrans(groupadd_t)
 	nscd_socket_use(groupadd_t)
 ')
 
@@ -535,7 +535,7 @@
 ')
 
 optional_policy(`
-	nscd_exec(useradd_t)
+	nscd_domtrans(useradd_t)
 	nscd_socket_use(useradd_t)
 ')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.4/policy/modules/apps/mozilla.if
--- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-07-14 17:04:31.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/apps/mozilla.if	2006-08-03 16:23:23.000000000 -0400
@@ -63,6 +63,7 @@
 	allow $1_mozilla_t self:unix_stream_socket { listen accept };
 	# Browse the web, connect to printer
 	allow $1_mozilla_t self:tcp_socket create_socket_perms;
+	allow $1_mozilla_t self:netlink_route_socket r_netlink_socket_perms;
 
 	# for bash - old mozilla binary
 	can_exec($1_mozilla_t, mozilla_exec_t)
@@ -175,6 +176,7 @@
 	logging_send_syslog_msg($1_mozilla_t)
 
 	miscfiles_read_fonts($1_mozilla_t)
+	miscfiles_read_localization($1_mozilla_t)
 
 	# Browse the web, connect to printer
 	sysnet_dns_name_resolve($1_mozilla_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.4/policy/modules/kernel/corecommands.fc
--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-02 10:34:05.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/kernel/corecommands.fc	2006-08-03 16:23:23.000000000 -0400
@@ -62,6 +62,7 @@
 /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
 
 /etc/xen/scripts(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+/etc/xen/qemu-ifup		--	gen_context(system_u:object_r:bin_t,s0)
 
 ifdef(`distro_debian',`
 /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.4/policy/modules/kernel/corenetwork.te.in
--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/kernel/corenetwork.te.in	2006-08-04 18:56:39.000000000 -0400
@@ -73,6 +73,7 @@
 network_port(dhcpc, udp,68,s0)
 network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
 network_port(dict, tcp,2628,s0)
+network_port(setroubleshoot, tcp,3267,s0)
 network_port(distccd, tcp,3632,s0)
 network_port(dns, udp,53,s0, tcp,53,s0)
 network_port(fingerd, tcp,79,s0)
@@ -84,7 +85,7 @@
 network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy
 network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp,8009,s0)
 network_port(howl, tcp,5335,s0, udp,5353,s0)
-network_port(hplip, tcp,50000,s0, tcp,50002,s0, tcp,1782,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0)
+network_port(hplip, tcp,50000,s0, tcp,50002,s0, tcp,2208,s0 tcp,2207,s0 tcp,1782,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0)
 network_port(i18n_input, tcp,9010,s0)
 network_port(imaze, tcp,5323,s0, udp,5323,s0)
 network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.4/policy/modules/kernel/devices.te
--- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/kernel/devices.te	2006-08-03 16:23:23.000000000 -0400
@@ -166,7 +166,7 @@
 dev_node(vmware_device_t)
 
 type watchdog_device_t;
-dev_node(vmware_device_t)
+dev_node(watchdog_device_t)
 
 type xen_device_t;
 dev_node(xen_device_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.4/policy/modules/kernel/filesystem.te
--- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/kernel/filesystem.te	2006-08-03 16:23:23.000000000 -0400
@@ -24,6 +24,7 @@
 fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
 fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
 fs_use_xattr gfs2 gen_context(system_u:object_r:fs_t,s0);
+fs_use_xattr gfs gen_context(system_u:object_r:fs_t,s0);
 fs_use_xattr jfs gen_context(system_u:object_r:fs_t,s0);
 fs_use_xattr xfs gen_context(system_u:object_r:fs_t,s0);
 
@@ -181,7 +182,6 @@
 genfscon hfs / gen_context(system_u:object_r:nfs_t,s0)
 genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0)
 genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
-genfscon gfs / gen_context(system_u:object_r:nfs_t,s0)
 
 ########################################
 #
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.4/policy/modules/kernel/kernel.if
--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/kernel/kernel.if	2006-08-03 16:23:23.000000000 -0400
@@ -1456,6 +1456,42 @@
 
 ########################################
 ## <summary>
+##	Allow search the kernel key ring.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`kernel_search_key',`
+	gen_require(`
+		type kernel_t;
+	')
+
+	allow $1 kernel_t:key search;
+')
+
+########################################
+## <summary>
+##	Allow link to the kernel key ring.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`kernel_link_key',`
+	gen_require(`
+		type kernel_t;
+	')
+
+	allow $1 kernel_t:key link;
+')
+
+########################################
+## <summary>
 ##	Read filesystem sysctls.
 ## </summary>
 ## <param name="domain">
@@ -2099,3 +2135,42 @@
 
 	typeattribute $1 kern_unconfined;
 ')
+
+########################################
+## <summary>
+##	Do not audit attempts to list sysctl_type directories.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`kernel_dontaudit_list_sysctls',`
+	gen_require(`
+		attribute sysctl_type;
+	')
+
+	dontaudit $1 sysctl_type:dir list_dir_perms;
+')
+
+
+########################################
+## <summary>
+##	Do not audit attempts to list proc_type file/directories.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`kernel_dontaudit_list_all_proc',`
+	gen_require(`
+		attribute proc_type;
+	')
+
+	dontaudit $1 proc_type:dir list_dir_perms;
+	dontaudit $1 proc_type:file getattr;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.4/policy/modules/kernel/terminal.if
--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-02 10:34:05.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/kernel/terminal.if	2006-08-03 16:23:23.000000000 -0400
@@ -308,6 +308,7 @@
 		type devpts_t;
 	')
 
+	dev_dontaudit_list_all_dev_nodes($1)
 	dontaudit $1 devpts_t:dir search;
 ')
 
@@ -948,3 +949,21 @@
 	dontaudit $1 ttynode:chr_file { read write };
 ')
 
+########################################
+## <summary>
+##	Get the attributes of a pty filesystem
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`term_getattr_ptys_fs',`
+	gen_require(`
+		type devpts_t;
+	')
+
+	allow $1 devpts_t:filesystem getattr;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.4/policy/modules/services/amavis.te
--- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/amavis.te	2006-08-03 16:23:23.000000000 -0400
@@ -62,10 +62,12 @@
 allow amavis_t amavis_quarantine_t:dir create_dir_perms;
 
 # Spool Files
+files_search_spool(amavis_t)
 allow amavis_t amavis_spool_t:dir manage_dir_perms;
 allow amavis_t amavis_spool_t:file manage_file_perms;
 allow amavis_t amavis_spool_t:sock_file manage_file_perms;
 files_spool_filetrans(amavis_t,amavis_spool_t,{ dir file })
+type_transition amavis_t amavis_spool_t:sock_file amavis_var_run_t;
 
 # tmp files
 allow amavis_t amavis_tmp_t:file create_file_perms;
@@ -116,6 +118,7 @@
 # bind to incoming port
 corenet_tcp_bind_amavisd_recv_port(amavis_t)
 corenet_udp_bind_generic_port(amavis_t)
+corenet_tcp_connect_razor_port(amavis_t)
 
 dev_read_rand(amavis_t)
 dev_read_urand(amavis_t)
@@ -180,3 +183,7 @@
 	spamassassin_exec(amavis_t)
 	spamassassin_exec_client(amavis_t)
 ')
+
+optional_policy(`
+	postfix_read_config(amavis_t)
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.4/policy/modules/services/apache.te
--- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/apache.te	2006-08-03 16:23:23.000000000 -0400
@@ -273,7 +273,6 @@
 sysnet_read_config(httpd_t)
 
 userdom_use_unpriv_users_fds(httpd_t)
-userdom_dontaudit_search_sysadm_home_dirs(httpd_t)
 
 mta_send_mail(httpd_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.4/policy/modules/services/avahi.te
--- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/avahi.te	2006-08-03 16:23:23.000000000 -0400
@@ -79,6 +79,7 @@
 
 sysnet_read_config(avahi_t)
 sysnet_use_ldap(avahi_t)
+miscfiles_read_certs(avahi_t)
 
 userdom_dontaudit_use_unpriv_user_fds(avahi_t)
 userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.4/policy/modules/services/bluetooth.te
--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/bluetooth.te	2006-08-03 16:23:23.000000000 -0400
@@ -247,3 +247,8 @@
 optional_policy(`
        	xserver_stream_connect_xdm(bluetooth_helper_t)
 ')	
+
+optional_policy(`
+	nis_use_ypbind(bluetooth_helper_t)
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.4/policy/modules/services/clamav.if
--- nsaserefpolicy/policy/modules/services/clamav.if	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/clamav.if	2006-08-03 16:23:23.000000000 -0400
@@ -102,3 +102,4 @@
 	allow clamscan_t $1:fifo_file rw_file_perms;
 	allow clamscan_t $1:process sigchld;
 ')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.4/policy/modules/services/cron.if
--- nsaserefpolicy/policy/modules/services/cron.if	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/cron.if	2006-08-03 16:23:23.000000000 -0400
@@ -181,6 +181,7 @@
 	allow $1_crontab_t $2:fd use;
 	allow $1_crontab_t $2:fifo_file rw_file_perms;
 	allow $1_crontab_t $2:process sigchld;
+	allow $2 $1_crontab_t:process sigchld;
 
 	# crontab shows up in user ps
 	allow $2 $1_crontab_t:dir { search getattr read };
@@ -194,14 +195,19 @@
 	# Allow crond to read those crontabs in cron spool.
 	allow crond_t $1_cron_spool_t:file create_file_perms;
 
+	allow $1_crontab_t tmp_t:dir rw_dir_perms;
+	allow $1_crontab_t $1_tmp_t:file create_file_perms;
+	type_transition $1_crontab_t tmp_t:file $1_tmp_t;
+
 	# dac_override is to create the file in the directory under /tmp
-	allow $1_crontab_t self:capability { setuid setgid chown dac_override };
+	allow $1_crontab_t self:capability { fowner setuid setgid chown dac_override };
 	allow $1_crontab_t self:process signal_perms;
 
 	# create files in /var/spool/cron
-	allow $1_crontab_t $1_cron_spool_t:file create_file_perms;
+	files_search_spool($1_crontab_t)
 	allow $1_crontab_t cron_spool_t:dir rw_dir_perms;
-	type_transition $1_crontab_t $1_cron_spool_t:file $1_cron_spool_t;
+	allow $1_crontab_t $1_cron_spool_t:file create_file_perms;
+	type_transition $1_crontab_t cron_spool_t:file $1_cron_spool_t;
 
 	# crontab signals crond by updating the mtime on the spooldir
 	allow $1_crontab_t cron_spool_t:dir setattr;
@@ -239,6 +245,10 @@
 	# Read user crontabs
 	userdom_read_user_home_content_files($1,$1_crontab_t)
 
+	optional_policy(`
+		nscd_socket_use($1_crontab_t)
+	')
+
 	tunable_policy(`fcron_crond', `
 		# fcron wants an instant update of a crontab change for the administrator
 		# also crontab does a security check for crontab -u
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.4/policy/modules/services/cups.te
--- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/cups.te	2006-08-03 16:23:23.000000000 -0400
@@ -81,6 +81,7 @@
 allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
 allow cupsd_t self:unix_dgram_socket create_socket_perms;
 allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
+allow cupsd_t self:netlink_selinux_socket create_socket_perms;
 allow cupsd_t self:netlink_route_socket r_netlink_socket_perms;
 allow cupsd_t self:tcp_socket { create_stream_socket_perms connectto acceptfrom recvfrom };
 allow cupsd_t self:udp_socket create_socket_perms;
@@ -153,6 +154,8 @@
 dev_read_sysfs(cupsd_t)
 dev_read_usbfs(cupsd_t)
 
+domain_read_all_domains_state(cupsd_t)
+
 fs_getattr_all_fs(cupsd_t)
 fs_search_auto_mountpoints(cupsd_t)
 # from old usercanread attrib:
@@ -202,7 +205,8 @@
 # invoking ghostscript needs to read fonts
 miscfiles_read_fonts(cupsd_t)
 
-seutil_dontaudit_read_config(cupsd_t)
+seutil_read_config(cupsd_t)
+selinux_compute_access_vector(cupsd_t)
 
 sysnet_read_config(cupsd_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.4/policy/modules/services/dbus.if
--- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/dbus.if	2006-08-03 16:23:23.000000000 -0400
@@ -171,6 +171,11 @@
 		xserver_use_xdm_fds($1_dbusd_t)
 		xserver_rw_xdm_pipes($1_dbusd_t)
 	')
+
+	optional_policy(`
+		hal_dbus_chat($1_dbusd_t)
+	')
+
 ')
 
 #######################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.4/policy/modules/services/ldap.te
--- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/ldap.te	2006-08-03 16:23:23.000000000 -0400
@@ -72,7 +72,7 @@
 
 allow slapd_t slapd_var_run_t:file create_file_perms;
 allow slapd_t slapd_var_run_t:dir rw_dir_perms;
-files_pid_filetrans(slapd_t,slapd_var_run_t,file)
+files_pid_filetrans(slapd_t,slapd_var_run_t,{ file socket })
 
 kernel_read_system_state(slapd_t)
 kernel_read_kernel_sysctls(slapd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.4/policy/modules/services/nis.te
--- nsaserefpolicy/policy/modules/services/nis.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/nis.te	2006-08-03 16:23:23.000000000 -0400
@@ -249,8 +249,6 @@
 allow ypserv_t self:unix_dgram_socket create_socket_perms;
 allow ypserv_t self:unix_stream_socket create_stream_socket_perms;
 allow ypserv_t self:netlink_route_socket r_netlink_socket_perms;
-allow ypserv_t self:tcp_socket connected_stream_socket_perms;
-allow ypserv_t self:udp_socket create_socket_perms;
 
 allow ypserv_t var_yp_t:dir rw_dir_perms;
 allow ypserv_t var_yp_t:file create_file_perms;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.4/policy/modules/services/ntp.te
--- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/ntp.te	2006-08-03 16:23:23.000000000 -0400
@@ -32,7 +32,7 @@
 
 # sys_resource and setrlimit is for locking memory
 # ntpdate wants sys_nice
-allow ntpd_t self:capability { chown dac_override kill setgid setuid sys_time ipc_lock sys_chroot sys_nice sys_resource };
+allow ntpd_t self:capability { chown dac_override kill setgid setuid sys_time ipc_lock net_bind_service sys_chroot sys_nice sys_resource };
 dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
 allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
 allow ntpd_t self:fifo_file { read write getattr };
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.4/policy/modules/services/pegasus.if
--- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/pegasus.if	2006-08-03 16:23:23.000000000 -0400
@@ -1 +1,32 @@
 ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
+
+########################################
+## <summary>
+##	Execute a domain transition to run pegasus.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed to transition.
+##	</summary>
+## </param>
+#
+interface(`pegasus_domtrans',`
+	gen_require(`
+		type pegasus_t, pegasus_exec_t;
+	')
+
+	ifdef(`targeted_policy',`
+		if(pegasus_disable_trans) {
+			can_exec($1,pegasus_exec_t)
+		} else {
+			domain_auto_trans($1,pegasus_exec_t,pegasus_t)
+		}
+	', `
+		domain_auto_trans($1,pegasus_exec_t,pegasus_t)
+	')
+
+	allow $1 pegasus_t:fd use;
+	allow pegasus_t $1:fd use;
+	allow pegasus_t $1:fifo_file rw_file_perms;
+	allow pegasus_t $1:process sigchld;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.4/policy/modules/services/pegasus.te
--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/pegasus.te	2006-08-03 16:23:23.000000000 -0400
@@ -100,13 +100,12 @@
 
 auth_use_nsswitch(pegasus_t)
 auth_domtrans_chk_passwd(pegasus_t)
+auth_read_shadow(pegasus_t)
 
 domain_use_interactive_fds(pegasus_t)
 domain_read_all_domains_state(pegasus_t)
 
-files_read_etc_files(pegasus_t)
-files_list_var_lib(pegasus_t)
-files_read_var_lib_files(pegasus_t)
+files_read_all_files(pegasus_t)
 files_read_var_lib_symlinks(pegasus_t)
 
 hostname_exec(pegasus_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.4/policy/modules/services/postfix.te
--- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/postfix.te	2006-08-03 16:23:23.000000000 -0400
@@ -250,6 +250,7 @@
 allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
 
 allow postfix_cleanup_t postfix_spool_bounce_t:dir r_dir_perms;
+corecmd_exec_bin(postfix_cleanup_t)
 
 ########################################
 #
@@ -293,6 +294,10 @@
 	procmail_domtrans(postfix_local_t)
 ')
 
+optional_policy(`
+	clamav_search_lib(postfix_local_t)
+')
+
 ########################################
 #
 # Postfix map local policy
@@ -519,6 +524,7 @@
 allow postfix_qmgr_t postfix_spool_bounce_t:dir { getattr read search };
 allow postfix_qmgr_t postfix_spool_bounce_t:file { read getattr };
 allow postfix_qmgr_t postfix_spool_bounce_t:lnk_file { getattr read };
+corecmd_exec_bin(postfix_qmgr_t)
 
 ########################################
 #
@@ -589,6 +595,7 @@
 # for OpenSSL certificates
 files_read_usr_files(postfix_smtpd_t)
 mta_read_aliases(postfix_smtpd_t)
+corecmd_exec_bin(postfix_smtpd_t)
 
 optional_policy(`
 	postgrey_stream_connect(postfix_smtpd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.4/policy/modules/services/procmail.te
--- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/procmail.te	2006-08-03 16:23:23.000000000 -0400
@@ -29,6 +29,7 @@
 kernel_read_kernel_sysctls(procmail_t)
 
 corenet_non_ipsec_sendrecv(procmail_t)
+corenet_udp_bind_inaddr_any_node(procmail_t)
 corenet_tcp_sendrecv_all_if(procmail_t)
 corenet_udp_sendrecv_all_if(procmail_t)
 corenet_tcp_sendrecv_all_nodes(procmail_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.4/policy/modules/services/samba.te
--- nsaserefpolicy/policy/modules/services/samba.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/samba.te	2006-08-03 16:23:23.000000000 -0400
@@ -191,7 +191,7 @@
 allow smbd_t samba_etc_t:dir rw_dir_perms;
 allow smbd_t samba_etc_t:file { rw_file_perms setattr };
 
-allow smbd_t samba_log_t:dir { ra_dir_perms setattr };
+allow smbd_t samba_log_t:dir { create ra_dir_perms setattr };
 dontaudit smbd_t samba_log_t:dir remove_name;
 allow smbd_t samba_log_t:file { create ra_file_perms };
 
@@ -367,7 +367,7 @@
 allow nmbd_t samba_etc_t:dir { search getattr };
 allow nmbd_t samba_etc_t:file { getattr read };
 
-allow nmbd_t samba_log_t:dir { ra_dir_perms setattr };
+allow nmbd_t samba_log_t:dir { create ra_dir_perms setattr };
 allow nmbd_t samba_log_t:file { create ra_file_perms };
 
 allow nmbd_t samba_var_t:dir rw_dir_perms;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.4/policy/modules/services/setroubleshoot.fc
--- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
+++ serefpolicy-2.3.4/policy/modules/services/setroubleshoot.fc	2006-08-03 16:23:23.000000000 -0400
@@ -0,0 +1,9 @@
+# setroubleshoot executables
+
+/usr/sbin/setroubleshootd		--	gen_context(system_u:object_r:setroubleshootd_exec_t,s0)
+
+/var/run/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_run_t,s0)
+
+/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
+
+/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.4/policy/modules/services/setroubleshoot.if
--- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
+++ serefpolicy-2.3.4/policy/modules/services/setroubleshoot.if	2006-08-03 16:23:23.000000000 -0400
@@ -0,0 +1,3 @@
+## <summary>policy for setroubleshoot</summary>
+
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.4/policy/modules/services/setroubleshoot.te
--- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
+++ serefpolicy-2.3.4/policy/modules/services/setroubleshoot.te	2006-08-03 16:23:23.000000000 -0400
@@ -0,0 +1,102 @@
+policy_module(setroubleshoot,1.0.0)
+
+########################################
+#
+# Declarations 
+#
+
+type setroubleshootd_t;
+type setroubleshootd_exec_t;
+domain_type(setroubleshootd_t)
+init_daemon_domain(setroubleshootd_t, setroubleshootd_exec_t)
+typealias setroubleshootd_t alias setroubleshoot_t;
+
+# log files
+type setroubleshoot_var_log_t;
+logging_log_file(setroubleshoot_var_log_t)
+
+# pid files
+type setroubleshoot_var_run_t;
+files_pid_file(setroubleshoot_var_run_t)
+
+type setroubleshoot_var_lib_t;
+files_type(setroubleshoot_var_lib_t)
+
+########################################
+#
+# setroubleshootd local policy
+#
+allow setroubleshootd_t self:capability { dac_override sys_tty_config };
+allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
+allow setroubleshootd_t self:process { signal getattr };
+allow setroubleshootd_t self:fifo_file { read write };
+allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+allow setroubleshootd_t self:unix_dgram_socket create_socket_perms;
+allow setroubleshootd_t self:netlink_route_socket r_netlink_socket_perms;
+
+files_dontaudit_getattr_tmp_dirs(setroubleshootd_t)
+files_dontaudit_search_home(setroubleshootd_t)
+files_read_usr_files(setroubleshootd_t)
+files_read_etc_files(setroubleshootd_t)
+
+libs_use_ld_so(setroubleshootd_t)
+libs_use_shared_libs(setroubleshootd_t)
+miscfiles_read_localization(setroubleshootd_t)
+
+logging_send_syslog_msg(setroubleshootd_t)
+logging_audit_stream_connect(setroubleshootd_t)
+
+# pid file
+files_search_pids(setroubleshootd_t)
+allow setroubleshootd_t setroubleshoot_var_run_t:file manage_file_perms;
+allow setroubleshootd_t setroubleshoot_var_run_t:sock_file manage_file_perms;
+allow setroubleshootd_t setroubleshoot_var_run_t:dir rw_dir_perms;
+files_pid_filetrans(setroubleshootd_t,setroubleshoot_var_run_t, { file sock_file })
+
+# log files
+logging_search_logs(setroubleshootd_t)
+allow setroubleshootd_t setroubleshoot_var_log_t:file create_file_perms;
+allow setroubleshootd_t setroubleshoot_var_log_t:sock_file create_file_perms;
+allow setroubleshootd_t setroubleshoot_var_log_t:dir { rw_dir_perms setattr };
+logging_log_filetrans(setroubleshootd_t,setroubleshoot_var_log_t,{ file dir })
+
+# database files
+allow setroubleshootd_t setroubleshoot_var_lib_t:file create_file_perms;
+allow setroubleshootd_t setroubleshoot_var_lib_t:dir { rw_dir_perms setattr };
+files_var_lib_filetrans(setroubleshootd_t,setroubleshoot_var_lib_t,{ file dir })
+corenet_tcp_bind_generic_node(setroubleshootd_t)
+corenet_tcp_bind_lo_node(setroubleshootd_t)
+corenet_tcp_bind_setroubleshoot_port(setroubleshootd_t)
+corenet_non_ipsec_sendrecv(setroubleshootd_t)
+corenet_tcp_sendrecv_generic_if(setroubleshootd_t)
+corenet_raw_sendrecv_generic_if(setroubleshootd_t)
+corenet_tcp_sendrecv_all_nodes(setroubleshootd_t)
+corenet_raw_sendrecv_all_nodes(setroubleshootd_t)
+corenet_tcp_sendrecv_all_ports(setroubleshootd_t)
+corenet_tcp_bind_all_nodes(setroubleshootd_t)
+corenet_tcp_connect_smtp_port(setroubleshootd_t)
+
+corecmd_exec_sbin(setroubleshootd_t)
+corecmd_exec_bin(setroubleshootd_t)
+
+dev_read_urand(setroubleshootd_t)
+
+kernel_read_kernel_sysctls(setroubleshootd_t)
+kernel_read_system_state(setroubleshootd_t)
+
+init_read_utmp(setroubleshootd_t)
+init_dontaudit_write_utmp(setroubleshootd_t)
+init_use_fds(setroubleshootd_t)
+
+sysnet_read_config(setroubleshootd_t)
+
+seutil_read_config(setroubleshootd_t)
+selinux_get_enforce_mode(setroubleshootd_t)
+
+term_dontaudit_use_console(setroubleshootd_t)
+term_dontaudit_use_generic_ptys(setroubleshootd_t)
+
+optional_policy(`
+	rpm_read_db(setroubleshootd_t)
+	rpm_dontaudit_manage_db(setroubleshootd_t)
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.4/policy/modules/services/spamassassin.te
--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/spamassassin.te	2006-08-03 16:23:23.000000000 -0400
@@ -194,3 +194,7 @@
 optional_policy(`
 	udev_read_db(spamd_t)
 ')
+
+optional_policy(`
+	postfix_read_config(spamd_t)
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.4/policy/modules/services/squid.te
--- nsaserefpolicy/policy/modules/services/squid.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/squid.te	2006-08-03 16:23:23.000000000 -0400
@@ -28,9 +28,9 @@
 # Local policy
 #
 
-allow squid_t self:capability { setgid setuid dac_override };
+allow squid_t self:capability { setgid setuid dac_override sys_resource };
 dontaudit squid_t self:capability sys_tty_config;
-allow squid_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+allow squid_t self:process ~{ ptrace setcurrent setexec setfscreate execmem execstack execheap };
 allow squid_t self:fifo_file rw_file_perms;
 allow squid_t self:sock_file r_file_perms;
 allow squid_t self:fd use;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.4/policy/modules/services/ssh.if
--- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/ssh.if	2006-08-03 16:23:23.000000000 -0400
@@ -1,5 +1,4 @@
 ## <summary>Secure shell client and server policy.</summary>
-
 #######################################
 ## <summary>
 ##	Basic SSH client template.
@@ -717,3 +716,27 @@
 
 	dontaudit $1 sshd_key_t:file { getattr read };
 ')
+
+
+########################################
+## <summary>
+##	Execute ssh_keygen_exec_t in the ssh_keygen_t domain.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`ssh_domtrans_keygen',`
+	gen_require(`
+		type ssh_keygen_t, ssh_keygen_exec_t;
+	')
+
+	domain_auto_trans($1,ssh_keygen_exec_t,ssh_keygen_t)
+
+	allow $1 ssh_keygen_t:fd use;
+	allow ssh_keygen_t $1:fd use;
+	allow ssh_keygen_t $1:fifo_file rw_file_perms;
+	allow ssh_keygen_t $1:process sigchld;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.4/policy/modules/services/stunnel.te
--- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/stunnel.te	2006-08-03 16:23:23.000000000 -0400
@@ -105,6 +105,10 @@
 	')
 
 	optional_policy(`
+        	mount_send_nfs_client_request(stunnel_t)
+	')
+
+	optional_policy(`
         	seutil_sigchld_newrole(stunnel_t)
 	')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.4/policy/modules/services/xserver.if
--- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/xserver.if	2006-08-03 16:23:23.000000000 -0400
@@ -45,7 +45,6 @@
 	allow $1_xserver_t self:capability { dac_override fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
 	dontaudit $1_xserver_t self:capability chown;
 	allow $1_xserver_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
-	allow $1_xserver_t self:process { execmem execheap execstack setsched };
 	allow $1_xserver_t self:fd use;
 	allow $1_xserver_t self:fifo_file rw_file_perms;
 	allow $1_xserver_t self:sock_file r_file_perms;
@@ -120,7 +119,9 @@
 	dev_setattr_generic_dirs($1_xserver_t)
 	# raw memory access is needed if not using the frame buffer
 	dev_read_raw_memory($1_xserver_t)
-	dev_write_raw_memory($1_xserver_t)
+	dev_wx_raw_memory($1_xserver_t)
+	dev_rw_sysfs($1_xserver_t)
+	
 	# for other device nodes such as the NVidia binary-only driver
 	dev_rw_xserver_misc($1_xserver_t)
 	# read events - the synaptics touchpad driver reads raw events
@@ -160,6 +161,10 @@
 	sysnet_read_config($1_xserver_t)
 
 	optional_policy(`
+		apm_stream_connect($1_xserver_t)
+	')
+
+	optional_policy(`
 		auth_search_pam_console_data($1_xserver_t)
 	')
 
@@ -1125,7 +1130,47 @@
 	')
 
 	files_search_tmp($1)
-	allow $1 xdm_xserver_tmp_t:dir search_dir_perms;
+	xserver_search_xdm_xserver_tmp_dir($1)
 	allow $1 xdm_xserver_tmp_t:sock_file write;
 	allow $1 xdm_xserver_t:unix_stream_socket connectto;
 ')
+
+
+########################################
+## <summary>
+##	search xdm temporary directory
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit
+##	</summary>
+## </param>
+#
+interface(`xserver_search_xdm_xserver_tmp_dir',`
+	gen_require(`
+		type xdm_xserver_tmp_t;
+	')
+
+	allow $1 xdm_xserver_tmp_t:dir search_dir_perms;
+')
+
+########################################
+## <summary>
+##	Create a named socket in a ice
+##	temporary directory.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`xserver_create_ice_tmp_sockets',`
+	gen_require(`
+		type ice_tmp_t;
+	')
+
+	files_search_tmp($1)
+	allow $1 ice_tmp_t:dir ra_dir_perms;
+	allow $1 ice_tmp_t:sock_file create_file_perms;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.4/policy/modules/services/xserver.te
--- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/services/xserver.te	2006-08-03 16:23:23.000000000 -0400
@@ -81,7 +81,7 @@
 #
 
 allow xdm_t self:capability { setgid setuid sys_resource kill sys_tty_config mknod chown dac_override dac_read_search fowner fsetid ipc_owner sys_nice sys_rawio net_bind_service };
-allow xdm_t self:process { setexec setpgid setsched setrlimit signal_perms setkeycreate };
+allow xdm_t self:process { setexec setpgid getsched setsched setrlimit signal_perms setkeycreate };
 allow xdm_t self:fifo_file rw_file_perms;
 allow xdm_t self:shm create_shm_perms;
 allow xdm_t self:sem create_sem_perms;
@@ -89,7 +89,9 @@
 allow xdm_t self:unix_dgram_socket create_socket_perms;
 allow xdm_t self:tcp_socket create_stream_socket_perms;
 allow xdm_t self:udp_socket create_socket_perms;
-allow xdm_t self:key write;
+allow xdm_t self:socket create_socket_perms;
+allow xdm_t self:appletalk_socket create_socket_perms;
+allow xdm_t self:key { search write };
 
 # Supress permission check on .ICE-unix
 dontaudit xdm_t ice_tmp_t:dir { getattr setattr };
@@ -106,6 +108,7 @@
 
 kernel_read_system_state(xdm_t)
 kernel_read_kernel_sysctls(xdm_t)
+kernel_read_network_state(xdm_t)
 
 corecmd_exec_shell(xdm_t)
 corecmd_exec_bin(xdm_t)
@@ -154,6 +157,7 @@
 domain_dontaudit_read_all_domains_state(xdm_t)
 
 files_read_etc_files(xdm_t)
+files_read_var_files(xdm_t)
 files_read_etc_runtime_files(xdm_t)
 files_exec_etc_files(xdm_t)
 files_list_mnt(xdm_t)
@@ -257,7 +261,7 @@
 	allow xdm_t xdm_xserver_tmp_t:sock_file unlink;
 	allow xdm_t xdm_xserver_tmp_t:file unlink;
 
-	allow xdm_t xserver_log_t:dir { rw_dir_perms setattr };
+	allow xdm_t xserver_log_t:dir { create_dir_perms setattr };
 	allow xdm_t xserver_log_t:file manage_file_perms;
 	allow xdm_t xserver_log_t:fifo_file manage_file_perms;
 	logging_log_filetrans(xdm_t,xserver_log_t,file)
@@ -284,7 +288,7 @@
 ')
 
 ifdef(`targeted_policy',`
-	allow xdm_t self:process { execheap execmem };
+#	allow xdm_t self:process { execheap execmem };
 	unconfined_domain(xdm_t)
 	unconfined_domtrans(xdm_t)
 	userdom_generic_user_home_dir_filetrans_generic_user_home_content(xdm_t, {file dir })
@@ -412,7 +416,7 @@
 ')
 
 ifdef(`targeted_policy',`
-	allow xdm_xserver_t self:process { execheap execmem };
+#	allow xdm_xserver_t self:process { execheap execmem };
 
 	unconfined_domain_noaudit(xdm_xserver_t)
 	unconfined_domtrans(xdm_xserver_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.4/policy/modules/system/fstools.te
--- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/fstools.te	2006-08-03 16:23:23.000000000 -0400
@@ -111,6 +111,7 @@
 corecmd_read_sbin_files(fsadm_t)
 corecmd_read_sbin_pipes(fsadm_t)
 corecmd_read_sbin_sockets(fsadm_t)
+corecmd_exec_shell(fsadm_t)
 
 domain_use_interactive_fds(fsadm_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.4/policy/modules/system/hostname.te
--- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/hostname.te	2006-08-03 16:23:23.000000000 -0400
@@ -8,7 +8,10 @@
 
 type hostname_t;
 type hostname_exec_t;
-init_system_domain(hostname_t,hostname_exec_t)
+
+#dont transition from initrc
+domain_type(hostname_t)
+domain_entry_file(hostname_t,hostname_exec_t)
 role system_r types hostname_t;
 
 ########################################
@@ -56,6 +59,7 @@
 sysnet_read_config(hostname_t)
 sysnet_dns_name_resolve(hostname_t)
 
-
-
+optional_policy(`
+	xen_dontaudit_use_fds(hostname_t)
+')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.4/policy/modules/system/init.if
--- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:04:44.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/init.if	2006-08-03 16:23:23.000000000 -0400
@@ -158,13 +158,6 @@
 	allow $1 initrc_t:fifo_file rw_file_perms;
 	allow $1 initrc_t:process sigchld;
 
-	ifdef(`hide_broken_symptoms',`
-		# RHEL4 systems seem to have a stray
-		# fds open from the initrd
-		ifdef(`distro_rhel4',`
-			kernel_dontaudit_use_fds($1)
-		')
-	')
 ')
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.4/policy/modules/system/libraries.fc
--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/libraries.fc	2006-08-03 16:23:23.000000000 -0400
@@ -200,7 +200,7 @@
 /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libavcodec-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-/usr/lib(64)?/libavutil-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/lib(64)?/libavutil.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.4/policy/modules/system/locallogin.te
--- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/locallogin.te	2006-08-03 16:23:23.000000000 -0400
@@ -47,7 +47,7 @@
 allow local_login_t self:sem create_sem_perms;
 allow local_login_t self:msgq create_msgq_perms;
 allow local_login_t self:msg { send receive };
-allow local_login_t self:key write;
+allow local_login_t self:key { search write };
 
 allow local_login_t local_login_lock_t:file create_file_perms;
 files_lock_filetrans(local_login_t,local_login_lock_t,file)
@@ -58,6 +58,8 @@
 
 kernel_read_system_state(local_login_t)
 kernel_read_kernel_sysctls(local_login_t)
+kernel_search_key(local_login_t)
+kernel_link_key(local_login_t)
 
 dev_setattr_mouse_dev(local_login_t)
 dev_getattr_mouse_dev(local_login_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.4/policy/modules/system/logging.fc
--- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/logging.fc	2006-08-03 16:23:23.000000000 -0400
@@ -38,3 +38,6 @@
 /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
 
 /var/tinydns/log/main(/.*)?	gen_context(system_u:object_r:var_log_t,s0)
+
+/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
+/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.4/policy/modules/system/logging.if
--- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/logging.if	2006-08-03 16:23:23.000000000 -0400
@@ -553,3 +553,24 @@
 	allow $1 var_log_t:dir rw_dir_perms;
 	allow $1 var_log_t:file create_file_perms;
 ')
+
+########################################
+## <summary>
+##	Connect to auditdstored over an unix stream socket.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`logging_audit_stream_connect',`
+	gen_require(`
+		type auditd_t, auditd_var_run_t;
+	')
+
+	files_search_pids($1)
+	allow $1 auditd_var_run_t:dir search;
+	allow $1 auditd_var_run_t:sock_file rw_file_perms;
+	allow $1 auditd_t:unix_stream_socket connectto;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.4/policy/modules/system/logging.te
--- nsaserefpolicy/policy/modules/system/logging.te	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/logging.te	2006-08-03 16:23:23.000000000 -0400
@@ -120,9 +120,10 @@
 allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
 allow auditd_t var_log_t:dir search;
 
+allow auditd_t auditd_var_run_t:sock_file create_file_perms;
 allow auditd_t auditd_var_run_t:file create_file_perms;
 allow auditd_t auditd_var_run_t:dir rw_dir_perms;
-files_pid_filetrans(auditd_t,auditd_var_run_t,file)
+files_pid_filetrans(auditd_t,auditd_var_run_t,{ file sock_file })
 
 kernel_read_kernel_sysctls(auditd_t)
 # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.4/policy/modules/system/miscfiles.fc
--- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/miscfiles.fc	2006-08-03 16:23:23.000000000 -0400
@@ -9,6 +9,7 @@
 # /etc
 #
 /etc/localtime		--	gen_context(system_u:object_r:locale_t,s0)
+/etc/avahi/etc/localtime --	gen_context(system_u:object_r:locale_t,s0)
 /etc/pki(/.*)?			gen_context(system_u:object_r:cert_t,s0)
 
 #
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.4/policy/modules/system/mount.te
--- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/mount.te	2006-08-03 16:23:23.000000000 -0400
@@ -97,6 +97,8 @@
 
 sysnet_use_portmap(mount_t)
 
+selinux_get_enforce_mode(mount_t)
+
 userdom_use_all_users_fds(mount_t)
 
 ifdef(`distro_redhat',`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.4/policy/modules/system/selinuxutil.te
--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/selinuxutil.te	2006-08-03 16:23:23.000000000 -0400
@@ -355,6 +355,8 @@
 kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
 kernel_relabelfrom_unlabeled_pipes(restorecon_t)
 kernel_relabelfrom_unlabeled_sockets(restorecon_t)
+kernel_dontaudit_list_all_proc(restorecon_t)
+kernel_dontaudit_list_sysctls(restorecon_t)
 
 dev_relabel_all_dev_nodes(restorecon_t)
 # cjp: why is this needed?
@@ -613,6 +615,10 @@
 	userdom_read_generic_user_home_content_files(semanage_t)
 ')
 
+ifdef(`enable_mls',`
+	userdom_read_user_tmp_files(secadm, semanage_t)
+')
+
 optional_policy(`
 	nscd_socket_use(semanage_t)
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.4/policy/modules/system/udev.fc
--- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/udev.fc	2006-08-03 16:23:23.000000000 -0400
@@ -1,5 +1,6 @@
 # udev
 
+/dev/\.udev(/.*)?	gen_context(system_u:object_r:udev_tbl_t,s0)
 /dev/\.udevdb	--	gen_context(system_u:object_r:udev_tbl_t,s0)
 /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.4/policy/modules/system/unconfined.if
--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/unconfined.if	2006-08-03 16:23:23.000000000 -0400
@@ -20,6 +20,7 @@
 	# Use any Linux capability.
 	allow $1 self:capability *;
 	allow $1 self:fifo_file create_file_perms;
+	allow $1 self:key *;
 
 	# Transition to myself, to make get_ordered_context_list happy.
 	allow $1 self:process transition;
@@ -37,6 +38,7 @@
 	dev_unconfined($1)
 	domain_unconfined($1)
 	domain_dontaudit_read_all_domains_state($1)
+	domain_dontaudit_ptrace_all_domains($1)
 	files_unconfined($1)
 	fs_unconfined($1)
 	selinux_unconfined($1)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.4/policy/modules/system/unconfined.te
--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/unconfined.te	2006-08-03 16:23:23.000000000 -0400
@@ -195,4 +195,9 @@
 ifdef(`targeted_policy',`
 	allow unconfined_execmem_t self:process { execstack execmem };
 	unconfined_domain_noaudit(unconfined_execmem_t)
+	optional_policy(`
+		init_dbus_chat_script(unconfined_execmem_t)
+		dbus_stub(unconfined_execmem_t)
+		unconfined_dbus_chat(unconfined_execmem_t)
+	')
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.4/policy/modules/system/userdomain.if
--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/userdomain.if	2006-08-03 16:23:23.000000000 -0400
@@ -8,11 +8,10 @@
 ## <desc>
 ##	<p>
 ##	This template creates a user domain, types, and
-##	rules for the user's tty, pty, home directories,
-##	tmp, and tmpfs files.
+##	rules for the user's tty, pty, tmp, and tmpfs files.
 ##	</p>
 ##	<p>
-##	This generally should not be used, rather the
+##	This should only be used for new non login user roles, rather the
 ##	unpriv_user_template or admin_user_template should
 ##	be used.
 ##	</p>
@@ -25,7 +24,9 @@
 ## </param>
 #
 template(`base_user_template',`
-
+	gen_require(`
+		attribute userdomain, unpriv_userdomain;
+	')
 	attribute $1_file_type;
 
 	type $1_t, userdomain;
@@ -42,44 +43,17 @@
 	term_user_pty($1_t,$1_devpts_t)
 	files_type($1_devpts_t)
 
-	# type for contents of home directory
-	type $1_home_t, $1_file_type, home_type;
-	files_type($1_home_t)
-	files_associate_tmp($1_home_t)
-	fs_associate_tmpfs($1_home_t)
-
-	# type of home directory
-	type $1_home_dir_t, home_dir_type, home_type;
-	files_type($1_home_dir_t)
-	files_associate_tmp($1_home_dir_t)
-	fs_associate_tmpfs($1_home_dir_t)
-
 	type $1_tmp_t, $1_file_type;
 	files_tmp_file($1_tmp_t)
 
 	type $1_tmpfs_t;
 	files_tmpfs_file($1_tmpfs_t)
 
-	# types for network-obtained content
-	type $1_untrusted_content_t, $1_file_type, untrusted_content_type; #, customizable
-	files_type($1_untrusted_content_t)
-	files_poly_member($1_untrusted_content_t)
-
-	type $1_untrusted_content_tmp_t, $1_file_type, untrusted_content_tmp_type; # customizable
-	files_tmp_file($1_untrusted_content_tmp_t)
-
 	type $1_tty_device_t; 
 	term_tty($1_t,$1_tty_device_t)
 
 	##############################
 	#
-	# User home directory file rules
-	#
-
-	allow $1_file_type $1_home_t:filesystem associate;
-
-	##############################
-	#
 	# User domain Local policy
 	#
 
@@ -103,19 +77,6 @@
 	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
 	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
 
-	# execute files in the home directory
-	can_exec($1_t,$1_home_t)
-
-	# full control of the home directory
-	allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto entrypoint };
-	allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto };
-	allow $1_t $1_home_t:dir { create_dir_perms relabelfrom relabelto };
-	allow $1_t $1_home_t:sock_file { create_file_perms relabelfrom relabelto };
-	allow $1_t $1_home_t:fifo_file { create_file_perms relabelfrom relabelto };
-	allow $1_t $1_home_dir_t:dir { create_dir_perms relabelfrom relabelto };
-	type_transition $1_t $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
-	files_search_home($1_t)
-
 	can_exec($1_t,$1_tmp_t)
 
 	# user temporary files
@@ -138,15 +99,16 @@
 	fs_tmpfs_filetrans($1_t,$1_tmpfs_t, { dir notdevfile_class_set } )
 
 	allow $1_t $1_tty_device_t:chr_file { setattr rw_file_perms };
-
-	# Allow user to relabel untrusted content
-	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:dir { create_dir_perms relabelto relabelfrom };
-	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:file { getattr unlink relabelto relabelfrom rename };
+	allow $1_t $1_devpts_t:chr_file { setattr rw_file_perms };
+	term_create_pty($1_t,$1_devpts_t)
 
 	allow $1_t unpriv_userdomain:fd use;
 
+	kernel_read_system_state($1_t)
+	kernel_read_network_state($1_t)
 	kernel_read_kernel_sysctls($1_t)
 	kernel_read_net_sysctls($1_t)
+	kernel_read_fs_sysctls($1_t)
 	kernel_dontaudit_list_unlabeled($1_t)
 	kernel_dontaudit_getattr_unlabeled_files($1_t)
 	kernel_dontaudit_getattr_unlabeled_symlinks($1_t)
@@ -165,8 +127,10 @@
 
 	corenet_non_ipsec_sendrecv($1_t)
 	corenet_tcp_sendrecv_all_if($1_t)
+	corenet_raw_sendrecv_all_if($1_t)
 	corenet_udp_sendrecv_all_if($1_t)
 	corenet_tcp_sendrecv_all_nodes($1_t)
+	corenet_raw_sendrecv_all_nodes($1_t)
 	corenet_udp_sendrecv_all_nodes($1_t)
 	corenet_tcp_sendrecv_all_ports($1_t)
 	corenet_udp_sendrecv_all_ports($1_t)
@@ -193,6 +157,7 @@
 	fs_getattr_all_fs($1_t)
 	fs_getattr_all_dirs($1_t)
 	fs_search_auto_mountpoints($1_t)
+	fs_list_inotifyfs($1_t)
 
 	# cjp: some of this probably can be removed
 	selinux_get_fs_mount($1_t)
@@ -234,6 +199,11 @@
 	files_dontaudit_getattr_non_security_sockets($1_t)
 	files_dontaudit_getattr_non_security_blk_files($1_t)
 	files_dontaudit_getattr_non_security_chr_files($1_t)
+	files_read_var_files($1_t)
+	files_read_etc_files($1_t)
+	files_read_etc_runtime_files($1_t)
+	files_read_usr_files($1_t)
+	files_exec_usr_files($1_t)
 
 	# Caused by su - init scripts
 	init_dontaudit_use_script_ptys($1_t)
@@ -254,16 +224,88 @@
 	seutil_read_default_contexts($1_t)
 	seutil_run_newrole($1_t,$1_r,{ $1_devpts_t $1_tty_device_t })
 
-	tunable_policy(`allow_execmem',`
-		# Allow loading DSOs that require executable stack.
-		allow $1_t self:process execmem;
-	')
+	sysnet_dns_name_resolve($1_t)
 
-	tunable_policy(`allow_execmem && allow_execstack',`
-		# Allow making the stack executable via mprotect.
-		allow $1_t self:process execstack;
+')
+#######################################
+## <summary>
+##	The template containing rules common to unprivileged
+##	users and administrative users.
+## </summary>
+## <desc>
+##	<p>
+##	This template creates a user home directories,
+##	</p>
+##	<p>
+##	This generally should not be used, rather the
+##	unpriv_user_template or admin_user_template should
+##	be used.
+##	</p>
+## </desc>
+## <param name="userdomain_prefix">
+##	<summary>
+##	The prefix of the user domain (e.g., user
+##	is the prefix for user_t).
+##	</summary>
+## </param>
+#
+template(`base_login_user_template',`
+
+	gen_require(`
+		attribute $1_file_type;
+		attribute home_dir_type, home_type;
+		attribute untrusted_content_type;
 	')
 
+	# type for contents of home directory
+	type $1_home_t, $1_file_type, home_type;
+	files_type($1_home_t)
+	files_associate_tmp($1_home_t)
+	fs_associate_tmpfs($1_home_t)
+
+	# type of home directory
+	type $1_home_dir_t, home_dir_type, home_type;
+	files_type($1_home_dir_t)
+	files_associate_tmp($1_home_dir_t)
+	fs_associate_tmpfs($1_home_dir_t)
+
+	# types for network-obtained content
+	type $1_untrusted_content_t, $1_file_type, untrusted_content_type; #, customizable
+	files_type($1_untrusted_content_t)
+	files_poly_member($1_untrusted_content_t)
+
+	type $1_untrusted_content_tmp_t, $1_file_type, untrusted_content_tmp_type; # customizable
+	files_tmp_file($1_untrusted_content_tmp_t)
+
+	##############################
+	#
+	# User home directory file rules
+	#
+
+	allow $1_file_type $1_home_t:filesystem associate;
+
+	##############################
+	#
+	# User domain Local policy
+	#
+
+	# execute files in the home directory
+	can_exec($1_t,$1_home_t)
+
+	# full control of the home directory
+	allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto entrypoint };
+	allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto };
+	allow $1_t $1_home_t:dir { create_dir_perms relabelfrom relabelto };
+	allow $1_t $1_home_t:sock_file { create_file_perms relabelfrom relabelto };
+	allow $1_t $1_home_t:fifo_file { create_file_perms relabelfrom relabelto };
+	allow $1_t $1_home_dir_t:dir { create_dir_perms relabelfrom relabelto };
+	type_transition $1_t $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
+	files_search_home($1_t)
+
+	# Allow user to relabel untrusted content
+	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:dir { create_dir_perms relabelto relabelfrom };
+	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:file { getattr unlink relabelto relabelfrom rename };
+
 	tunable_policy(`read_default_t',`
 		files_list_default($1_t)
 		files_read_default_files($1_t)
@@ -322,6 +364,10 @@
 	')
 
 	optional_policy(`
+		alsa_read_rw_config($1_t)
+	')
+
+	optional_policy(`
 		canna_stream_connect($1_t)
 	')
 
@@ -472,6 +518,7 @@
 		xserver_read_xdm_pid($1_t)
 		# gnome-session creates socket under /tmp/.ICE-unix/
 		xserver_create_xdm_tmp_sockets($1_t)
+		xserver_create_ice_tmp_sockets($1_t)
 	')
 ')
 
@@ -501,6 +548,7 @@
 
 	# Inherit rules for ordinary users.
 	base_user_template($1)
+	base_login_user_template($1)
 
 	typeattribute $1_t unpriv_userdomain;
 	domain_interactive_fd($1_t)
@@ -521,9 +569,6 @@
 	# Local policy
 	#
 
-	allow $1_t $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
-	term_create_pty($1_t,$1_devpts_t)
-
 	# Rules used to associate a homedir as a mountpoint
 	allow $1_home_t self:filesystem associate;
 	allow $1_file_type $1_home_t:filesystem associate;
@@ -535,10 +580,6 @@
 	allow privhome $1_home_t:sock_file create_file_perms;
 	allow privhome $1_home_t:fifo_file create_file_perms;
 	type_transition privhome $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
-
-	kernel_read_system_state($1_t)
-	kernel_read_network_state($1_t)
-
 	dev_read_sysfs($1_t)
 
 	corecmd_exec_all_executables($1_t)
@@ -546,11 +587,8 @@
 	# port access is audited even if dac would not have allowed it, so dontaudit it here
 	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
 
-	files_read_etc_files($1_t)
-	files_read_etc_runtime_files($1_t)
+
 	files_list_home($1_t)
-	files_read_usr_files($1_t)
-	files_exec_usr_files($1_t)
 	# Read directories and files with the readable_t type.
 	# This type is a general type for "world"-readable files.
 	files_list_world_readable($1_t)
@@ -558,8 +596,6 @@
 	files_read_world_readable_symlinks($1_t)
 	files_read_world_readable_pipes($1_t)
 	files_read_world_readable_sockets($1_t)
-	# cjp: why?
-	files_read_kernel_symbol_table($1_t)
 
 	init_read_utmp($1_t)
 	# The library functions always try to open read-write first,
@@ -748,6 +784,7 @@
 
 	# Inherit rules for ordinary users.
 	base_user_template($1)
+	base_login_user_template($1)
 
 	typeattribute $1_t privhome;
 	domain_obj_id_change_exemption($1_t)
@@ -783,11 +820,6 @@
 
 	allow $1_t self:netlink_audit_socket nlmsg_readpriv;
 
-	allow $1_t $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
-	term_create_pty($1_t,$1_devpts_t)
-
-	kernel_read_system_state($1_t)
-	kernel_read_network_state($1_t)
 	kernel_read_software_raid_state($1_t)
 	kernel_getattr_core_if($1_t)
 	kernel_getattr_message_if($1_t)
@@ -855,6 +887,7 @@
 	domain_getattr_all_sockets($1_t)
 
 	files_exec_usr_src_files($1_t)
+	files_create_boot_flag($1_t)
 
 	init_rw_initctl($1_t)
 
@@ -3408,6 +3441,25 @@
 
 ########################################
 ## <summary>
+##	Do not audit attempts to append to the sysadm
+##	users home directory.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`userdom_dontaudit_append_sysadm_home_content_files',`
+	gen_require(`
+		type sysadm_home_t;
+	')
+
+	dontaudit $1 sysadm_home_t:file append;
+')
+
+########################################
+## <summary>
 ##	Read files in the staff users home directory.
 ## </summary>
 ## <param name="domain">
@@ -4128,7 +4180,7 @@
 	gen_require(`
 		type user_home_dir_t;
 	')
-
+	allow $1 user_home_dir_t:dir manage_dir_perms;
 	files_home_filetrans($1,user_home_dir_t,dir)
 ')
 
@@ -4789,3 +4841,34 @@
 	allow $1 user_home_dir_t:dir create_dir_perms;
 	files_home_filetrans($1,user_home_dir_t,dir)
 ')
+
+########################################
+## <summary>
+##	The template containing rules for changing from one role to another
+## </summary>
+## <desc>
+##	<p>
+##	This should only be used for new non login user roles, rather the
+##	unpriv_user_template or admin_user_template should
+##	be used.
+##	</p>
+## </desc>
+## <param name="userdomain_prefix">
+##	<summary>
+##	userdomain changing from 
+##	</summary>
+## </param>
+## <param name="userdomain_prefix">
+##	<summary>
+##	userdomain changing to
+##	</summary>
+## </param>
+#
+template(`role_change_template',`
+        allow $1_r $2_r;
+        type_change $2_t $1_devpts_t:chr_file $2_devpts_t;
+        type_change $2_t $1_tty_device_t:chr_file $2_tty_device_t;
+        # avoid annoying messages on terminal hangup
+        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.4/policy/modules/system/userdomain.te
--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/userdomain.te	2006-08-03 16:23:23.000000000 -0400
@@ -56,14 +56,6 @@
 # Local policy
 #
 
-define(`role_change',`
-	allow $1_r $2_r;
-	type_change $2_t $1_devpts_t:chr_file $2_devpts_t;
-	type_change $2_t $1_tty_device_t:chr_file $2_tty_device_t;
-	# avoid annoying messages on terminal hangup
-	dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
-')
-
 ifdef(`targeted_policy',`
 	# Define some type aliases to help with compatibility with
 	# macros and domains from the "strict" policy.
@@ -85,7 +77,7 @@
 	# compatibility for switching from strict
 #	dominance { role secadm_r { role system_r; }}
 #	dominance { role auditadm_r { role system_r; }}
-#	dominance { role sysadm_r { role system_r; }}
+	dominance { role sysadm_r { role system_r; }}
 #	dominance { role user_r { role system_r; }}
 #	dominance { role staff_r { role system_r; }}
 
@@ -124,34 +116,34 @@
 
 	# user role change rules:
 	# sysadm_r can change to user roles
-	role_change(sysadm, user)
-	role_change(sysadm, staff)
+	role_change_template(sysadm, user)
+	role_change_template(sysadm, staff)
 
 	# only staff_r can change to sysadm_r
-	role_change(staff, sysadm)
+	role_change_template(staff, sysadm)
 
 	ifdef(`enable_mls',`
 		unpriv_user_template(secadm)
 		unpriv_user_template(auditadm)
 
-		role_change(staff,auditadm)
-		role_change(staff,secadm)
+		role_change_template(staff,auditadm)
+		role_change_template(staff,secadm)
 
-		role_change(sysadm,secadm)
-		role_change(sysadm,auditadm)
+		role_change_template(sysadm,secadm)
+		role_change_template(sysadm,auditadm)
 
-		role_change(auditadm,secadm)
-		role_change(auditadm,sysadm)
+		role_change_template(auditadm,secadm)
+		role_change_template(auditadm,sysadm)
 
-		role_change(secadm,auditadm)
-		role_change(secadm,sysadm)
+		role_change_template(secadm,auditadm)
+		role_change_template(secadm,sysadm)
 	')
 
 	# this should be tunable_policy, but
 	# currently type_change and RBAC allow
 	# do not work in conditionals
 	ifdef(`user_canbe_sysadm',`
-		role_change(user,sysadm)
+		role_change_template(user,sysadm)
 	')
 
 	allow privhome home_root_t:dir { getattr search };
@@ -172,6 +164,8 @@
 
 	mls_process_read_up(sysadm_t)
 
+	term_getattr_all_user_ttys(sysadm_t)
+
 	init_exec(sysadm_t)
 
 	ifdef(`direct_sysadm_daemon',`
@@ -210,7 +204,9 @@
 		init_exec(secadm_t)
 		logging_read_audit_log(secadm_t)
 	        logging_read_generic_logs(secadm_t)
-		userdom_dontaudit_append_staff_home_content_files(secadm_t)
+		userdom_dontaudit_append_sysadm_home_content_files(secadm_t)
+		userdom_dontaudit_read_sysadm_home_content_files(secadm_t)
+
 	', `
 		logging_manage_audit_log(sysadm_t)
 		logging_manage_audit_config(sysadm_t)
@@ -443,11 +439,11 @@
 			selinux_set_parameters(secadm_t)
 
 			seutil_manage_bin_policy(secadm_t)
-			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
-			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
-			seutil_run_semanage(secadm_t,secadm_r,admin_terminal)
-			seutil_run_setfiles(secadm_t,secadm_r,admin_terminal)
-			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
+			seutil_run_checkpolicy(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_loadpolicy(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_semanage(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_setfiles(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_restorecon(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
 		', `
 			selinux_set_enforce_mode(sysadm_t)
 			selinux_set_boolean(sysadm_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.4/policy/modules/system/xen.if
--- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/xen.if	2006-08-03 16:23:23.000000000 -0400
@@ -127,3 +127,41 @@
 	allow xm_t $1:fifo_file rw_file_perms;
 	allow xm_t $1:process sigchld;
 ')
+
+
+########################################
+## <summary>
+##	Inherit and use xen file descriptors.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`xen_use_fds',`
+	gen_require(`
+		type xend_t;
+	')
+
+	allow $1 xend_t:fd use;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to inherit
+##	xen file descriptors.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`xen_dontaudit_use_fds',`
+	gen_require(`
+		type xend_t;
+	')
+
+	dontaudit $1 xend_t:fd use;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.4/policy/modules/system/xen.te
--- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.4/policy/modules/system/xen.te	2006-08-03 16:23:23.000000000 -0400
@@ -69,7 +69,10 @@
 #
 
 allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
+dontaudit xend_t self:capability { sys_ptrace };
 allow xend_t self:process { signal sigkill };
+dontaudit xend_t self:process ptrace;
+
 # internal communication is often done using fifo and unix sockets.
 allow xend_t self:fifo_file rw_file_perms;
 allow xend_t self:unix_stream_socket create_stream_socket_perms;
@@ -79,7 +82,7 @@
 allow xend_t self:packet_socket create_socket_perms;
 
 allow xend_t xen_image_t:dir r_dir_perms;
-allow xend_t xen_image_t:file r_file_perms;
+allow xend_t xen_image_t:file rw_file_perms;
 
 # pid file
 allow xend_t xend_var_run_t:file manage_file_perms;
@@ -130,6 +133,8 @@
 corenet_tcp_bind_soundd_port(xend_t)
 corenet_sendrecv_xen_server_packets(xend_t)
 corenet_sendrecv_soundd_server_packets(xend_t)
+corenet_tcp_bind_generic_port(xend_t)
+corenet_rw_tun_tap_dev(xend_t)
 
 dev_read_urand(xend_t)
 dev_manage_xen(xend_t)
@@ -138,19 +143,24 @@
 
 domain_read_all_domains_state(xend_t)
 domain_dontaudit_read_all_domains_state(xend_t)
+domain_dontaudit_ptrace_all_domains(xend_t)
 
 files_read_etc_files(xend_t)
 files_read_kernel_symbol_table(xend_t)
 files_read_kernel_img(xend_t)
 files_manage_etc_runtime_files(xend_t)
 files_etc_filetrans_etc_runtime(xend_t,file)
+files_read_usr_files(xend_t)
 
 storage_raw_read_fixed_disk(xend_t)
 
-term_dontaudit_getattr_all_user_ptys(xend_t)
-term_dontaudit_use_generic_ptys(xend_t)
+term_getattr_all_user_ptys(xend_t)
+term_use_generic_ptys(xend_t)
+term_use_ptmx(xend_t)
+term_getattr_ptys_fs(xend_t)
 
 init_use_fds(xend_t)
+init_use_script_ptys(xend_t)
 
 libs_use_ld_so(xend_t)
 libs_use_shared_libs(xend_t)
@@ -191,15 +201,18 @@
 allow xenconsoled_t xenconsoled_var_run_t:dir rw_dir_perms;
 files_pid_filetrans(xenconsoled_t,xenconsoled_var_run_t, { file sock_file })
 
+domain_dontaudit_ptrace_all_domains(xenconsoled_t)
+
 kernel_read_kernel_sysctls(xenconsoled_t)
 kernel_write_xen_state(xenconsoled_t)
 kernel_read_xen_state(xenconsoled_t)
 
 term_create_pty(xenconsoled_t,xen_devpts_t);
-term_dontaudit_use_generic_ptys(xenconsoled_t)
+term_use_generic_ptys(xenconsoled_t)
 term_use_console(xenconsoled_t)
 
 init_use_fds(xenconsoled_t)
+init_use_script_ptys(xenconsoled_t)
 
 libs_use_ld_so(xenconsoled_t)
 libs_use_shared_libs(xenconsoled_t)
@@ -238,10 +251,11 @@
 dev_filetrans_xen(xenstored_t)
 dev_rw_xen(xenstored_t)
 
-term_dontaudit_use_generic_ptys(xenstored_t)
-term_dontaudit_use_console(xenconsoled_t)
+term_use_generic_ptys(xenstored_t)
+term_use_console(xenconsoled_t)
 
 init_use_fds(xenstored_t)
+init_use_script_ptys(xenstored_t)
 
 libs_use_ld_so(xenstored_t)
 libs_use_shared_libs(xenstored_t)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	17 Jul 2006 17:14:27 -0000	1.76
+++ .cvsignore	4 Aug 2006 22:58:10 -0000	1.77
@@ -77,3 +77,4 @@
 serefpolicy-2.3.1.tgz
 serefpolicy-2.3.2.tgz
 serefpolicy-2.3.3.tgz
+serefpolicy-2.3.4.tgz


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- selinux-policy.spec	3 Aug 2006 16:50:26 -0000	1.244
+++ selinux-policy.spec	4 Aug 2006 22:58:10 -0000	1.245
@@ -15,12 +15,12 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.3
-Release: 20
+Version: 2.3.4
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20060608.patch
+patch: policy-20060802.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.4-1
+- Update to the latest from upstream
+
 * Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-20
 - More fixes for xen
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	17 Jul 2006 17:14:27 -0000	1.80
+++ sources	4 Aug 2006 22:58:10 -0000	1.81
@@ -1 +1 @@
-ccd4a3f6ed18a4309d0369e3d18bcd57  serefpolicy-2.3.3.tgz
+7a8e96bc64499224226e0442a5da40a9  serefpolicy-2.3.4.tgz



From fedora-cvs-commits at redhat.com  Fri Aug  4 23:02:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 19:02:40 -0400
Subject: rpms/tanukiwrapper/devel
	tanukiwrapper-Makefile-s390-s390x-ppc.patch, NONE,
	1.1 tanukiwrapper-build.patch, NONE,
	1.1 tanukiwrapper-crosslink.patch, NONE,
	1.1 tanukiwrapper-makefile-linux-x86-32.patch, NONE,
	1.1 tanukiwrapper-nosun-jvm-64.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 sources, 1.5, 1.6 tanukiwrapper.spec, 1.20,
	1.21 tanukiwrapper-3.1.1.patch, 1.1,
	NONE tanukiwrapper-jpeg.patch, 1.1,
	NONE tanukiwrapper-nonative2ascii.patch, 1.1,
	NONE tanukiwrapper-notarget.patch, 1.1, NONE
Message-ID: <200608042302.k74N2e0U018187@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/tanukiwrapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18158

Modified Files:
	.cvsignore sources tanukiwrapper.spec 
Added Files:
	tanukiwrapper-Makefile-s390-s390x-ppc.patch 
	tanukiwrapper-build.patch tanukiwrapper-crosslink.patch 
	tanukiwrapper-makefile-linux-x86-32.patch 
	tanukiwrapper-nosun-jvm-64.patch 
Removed Files:
	tanukiwrapper-3.1.1.patch tanukiwrapper-jpeg.patch 
	tanukiwrapper-nonative2ascii.patch 
	tanukiwrapper-notarget.patch 
Log Message:
- Merge with latest from JPP.
- Partially add new naming convention (.1 suffix).
- Clean new source tar ball.
- Add patch to add -lm in x86-32 Makefile.
- Add patch to avoid use of obscure property not supported on GCJ.
- Add missing makefiles for architectures pertinent to FC.



tanukiwrapper-Makefile-s390-s390x-ppc.patch:
 Makefile-linux-ppc-32   |   41 +++++++++++++++++++++++++++++++++++++++++
 Makefile-linux-s390-32  |   39 +++++++++++++++++++++++++++++++++++++++
 Makefile-linux-s390x-64 |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 119 insertions(+)

--- NEW FILE tanukiwrapper-Makefile-s390-s390x-ppc.patch ---
--- src/c/Makefile-linux-s390-32.old	1969-12-31 19:00:00.000000000 -0500
+++ src/c/Makefile-linux-s390-32	2006-08-04 16:39:15.000000000 -0400
@@ -0,0 +1,39 @@
+COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables -Wall --pedantic
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	>> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
--- src/c/Makefile-linux-s390x-64.old	1969-12-31 19:00:00.000000000 -0500
+++ src/c/Makefile-linux-s390x-64	2006-08-04 16:38:53.000000000 -0400
@@ -0,0 +1,39 @@
+COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables -Wall --pedantic
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	>> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
--- src/c/Makefile-linux-ppc-32.old	1969-12-31 19:00:00.000000000 -0500
+++ src/c/Makefile-linux-ppc-32	2006-08-04 17:43:10.000000000 -0400
@@ -0,0 +1,41 @@
+# This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
+# If you know how to fix it then please help out.
+COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -fasynchronous-unwind-tables -fPIC --pedantic
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	>> .deps/$(*F).P; \
+	rm .deps/$(*F).pp

tanukiwrapper-build.patch:
 build.xml |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE tanukiwrapper-build.patch ---
--- build.xml~	2006-03-01 05:34:34.000000000 +0200
+++ build.xml	2006-05-09 11:15:33.000000000 +0300
@@ -294,2 +294,3 @@
     <target name="convert" depends="init:msg, init:java-missing">
+    <!-- No-op, but prevents build using ant-nodeps built with non-Sun JDK :(
         <native2ascii src="${src.dir}/java"
@@ -299,2 +300,3 @@
                       includes="**/*.native" />
+    -->
     </target>

tanukiwrapper-crosslink.patch:
 build.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE tanukiwrapper-crosslink.patch ---
--- build.xml~	2006-05-09 11:15:33.000000000 +0300
+++ build.xml	2006-05-09 11:18:34.000000000 +0300
@@ -15,3 +15,4 @@
     <!-- property name="classpath"     value=""/ -->
-    
+    <property name="jdk.api" value="http://java.sun.com/j2se/1.5/docs/api/" />
+
     <property name="ant.dist.version" value="1.6.2"/>
@@ -577,2 +578,3 @@
             destdir="${jdoc.dir}"
+            link="${jdk.api}"
             author="true"

tanukiwrapper-makefile-linux-x86-32.patch:
 Makefile-linux-x86-32 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tanukiwrapper-makefile-linux-x86-32.patch ---
--- ./src/c/Makefile-linux-x86-32.orig	2006-08-04 01:07:48.000000000 -0400
+++ ./src/c/Makefile-linux-x86-32	2006-08-04 01:09:35.000000000 -0400
@@ -24,7 +24,7 @@
 	if test ! -d .deps; then mkdir .deps; fi
 
 wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+	$(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
 	${COMPILE} -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so

tanukiwrapper-nosun-jvm-64.patch:
 build.xml |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE tanukiwrapper-nosun-jvm-64.patch ---
--- ./build.xml.old	2006-08-04 02:49:07.000000000 -0400
+++ ./build.xml	2006-08-04 02:50:25.000000000 -0400
@@ -65,6 +65,7 @@
                 <equals arg1="${os.arch}" arg2="IA32"/>
                 <equals arg1="${os.arch}" arg2="ia64"/>
                 <equals arg1="${os.arch}" arg2="x86"/>
+                <equals arg1="${os.arch}" arg2="x86_64"/>
                 <equals arg1="${os.arch}" arg2="i686"/>
                 <equals arg1="${os.arch}" arg2="i586"/>
                 <equals arg1="${os.arch}" arg2="i486"/>
@@ -168,12 +169,14 @@
         </condition>
         
         <!-- Not all JVMs support the sun.arch.data.model property.  Default to 32-bit. -->
+	<!--
         <property name="sun.arch.data.model" value="32"/>
         <condition property="bits-mismatch" value="true">
             <not>
                 <equals arg1="${sun.arch.data.model}" arg2="${bits}"/>
             </not>
         </condition>
+	-->
 
         <condition property="pre-release.disable" value="true">
             <not>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Feb 2006 23:54:24 -0000	1.6
+++ .cvsignore	4 Aug 2006 23:02:25 -0000	1.7
@@ -1,4 +1 @@
-wrapper_3.1.1_src-RHCLEAN.tar.bz2
-wrapper_3.1.1_src
-i386
-*.src.rpm
+wrapper_3.2.1_src-RHCLEAN.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Feb 2006 23:54:24 -0000	1.5
+++ sources	4 Aug 2006 23:02:25 -0000	1.6
@@ -1 +1 @@
-eb6555c36e5ae6a99eacbd24c376dcf4  wrapper_3.1.1_src-RHCLEAN.tar.bz2
+003fd35086dad5347dbaf246eafff455  wrapper_3.2.1_src-RHCLEAN.tar.gz


Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tanukiwrapper.spec	22 Jul 2006 08:45:40 -0000	1.20
+++ tanukiwrapper.spec	4 Aug 2006 23:02:25 -0000	1.21
@@ -1,143 +1,195 @@
-%define name		tanukiwrapper
-%define version		3.1.1
-%define release 	4jpp_9fc
-%define section		devel
-
+# Copyright (c) 2000-2006, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+%define section	free
+
+Name:		tanukiwrapper
+Version:	3.2.1
+Release:	2jpp.1
 Summary:	Java Service Wrapper
-URL:		http://wrapper.tanukisoftware.org/
-Source0:	wrapper_3.1.1_src-RHCLEAN.tar.bz2
-Patch0:		%{name}-%{version}.patch
-Patch1:		%{name}-nonative2ascii.patch
-Patch2:		%{name}-jpeg.patch
-Patch3:		%{name}-notarget.patch
-
-Name:		%{name}
-Version:	%{version}
-Release:        %{release}
 Epoch:		0
-License:	Tanuki Software License (open source)
+License:	BSD
+URL:		http://wrapper.tanukisoftware.org/
+Source0:	wrapper_3.2.1_src-RHCLEAN.tar.gz
+Patch1:		%{name}-build.patch
+Patch2:		%{name}-crosslink.patch
+Patch3:		%{name}-makefile-linux-x86-32.patch
+Patch4:		%{name}-nosun-jvm-64.patch
+#Add Makefiles so package builds for all FC architectures.
+Patch5:		%{name}-Makefile-s390-s390x-ppc.patch
 Group:		Development/Java
-BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:  glibc-devel
-BuildRequires:  ant >= 1.6.1
-BuildRequires:  ant-nodeps
-BuildRequires:  junit
-BuildRequires:  xerces-j2
-BuildRequires:  xml-commons-apis
-BuildRequires:  %{__perl}
-Requires:	jpackage-utils >= 0:1.5
-Requires:       xerces-j2
-Requires:       xml-commons-apis
+BuildRequires:	jpackage-utils >= 0:1.6
+BuildRequires:	glibc-devel
+BuildRequires:	ant >= 0:1.6.1
+BuildRequires:	ant-nodeps >= 0:1.6.1
+BuildRequires:	ant-junit
+BuildRequires:	xerces-j2
+BuildRequires:	xml-commons-apis
+BuildRequires:	%{__perl}
+BuildRequires:	java-javadoc
+Requires:	jpackage-utils >= 0:1.6
+Requires:	xerces-j2
+Requires:	xml-commons-apis
+Obsoletes:	%{name}-demo < 0:3.1.2-2jpp
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 The Java Service Wrapper is an application which has 
 evolved out of a desire to solve a number of problems 
 common to many Java applications: 
-- Run as a Windows Service or Unix Daemon 
-- Application Reliability 
-- Standard, Out of the Box Scripting 
-- On Demand Restarts 
-- Flexible Configuration 
-- Ease Application Installations 
-- Logging 
+- Run as a Windows Service or Unix Daemon
+- Application Reliability
+- Standard, Out of the Box Scripting
+- On Demand Restarts
+- Flexible Configuration
+- Ease Application installations
+- Logging
 
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
+Requires(post): %{__rm}
+Requires(post): /bin/ln
+Requires(postun): %{__rm}
 
 %description javadoc
-%{summary}
+%{summary}.
 
 %package manual
 Summary:        Documents for %{name}
 Group:          Development/Documentation
 
 %description manual
-%{summary}
-
-%package demo
-Summary:        Usage examples for %{name}
-Group:          Development/Documentation
-
-%description demo
-%{summary}
+%{summary}.
 
 %prep
-%setup -q -n wrapper_3.1.1_src
-chmod -R go=u-w *
-find . -name "*.jar" -exec rm -f {} \;
-%patch0
-%patch1 -p1
-%patch2 -p1
-%patch3 -p0
-%{__perl} -pi -e 's|-O3|$ENV{RPM_OPT_FLAGS}|' src/c/Makefile*
+%setup -q -n wrapper_%{version}_src
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+find . -name "*.jar" -exec %__rm -f {} \;
+%__perl -p -i -e 's/\r//' doc/AUTHORS
+%__perl -p -i -e 's|-O3|%optflags|' src/c/Makefile*
+%__perl -p -e \
+  's|=\.\./lib/wrapper\.jar$|=%{_javadir}/%{name}.jar| ;
+   s|=\.\./lib$|=%{_libdir}|' \
+  src/conf/wrapper.conf.in > wrapper.conf.sample
+%__perl -p -e \
+  's|"\./wrapper"|"%{_sbindir}/%{name}"| ;
+   s|"\.\./conf/wrapper\.conf"|"/path/to/wrapper.conf"|' \
+  src/bin/sh.script.in > script.sh.sample
 
 %build
-export CLASSPATH=$(build-classpath \
-ant/ \
-ant-nodeps/ \
-junit \
-xerces-j2 \
-xml-commons-apis
-)
-export JAVA_HOME="%{java_home}"
-ant -Dbuild.sysclasspath=first release-common
+export CLASSPATH=$(build-classpath ant junit xerces-j2 xml-commons-apis)
+%ifarch x86_64 ia64 ppc64 sparc64 s390x
+bits=64
+%else
+bits=32
+%endif
+%ant -Dbuild.sysclasspath=first -Djdk.api=%{_javadocdir}/java -Dbits=$bits \
+  main jdoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf %{buildroot}
 
 # jar
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 0644 lib/wrapper.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -p -m 0644 lib/wrappertest.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-test-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+%__mkdir_p %{buildroot}%{_javadir}
+%__install -p -m 0644 lib/wrapper.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s}f ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
 # jni
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -p -m 755 lib/libwrapper.so $RPM_BUILD_ROOT%{_libdir}
+%__install -d -m 755 %{buildroot}%{_libdir}
+%__install -p -m 755 lib/libwrapper.so %{buildroot}%{_libdir}
 
 # commands
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/bin
-install -m 755 bin/testwrapper $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/bin
-install -m 755 bin/wrapper $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/bin
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/conf
-install -m 644 conf/wrapper.conf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/conf
-
-# demo
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/test
-cp -pr test/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/test
+%__install -d -m 755 %{buildroot}%{_sbindir}
+%__install -p -m 755 bin/wrapper %{buildroot}%{_sbindir}/%{name}
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr jdoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-
-# manual
-install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -pr doc/*  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%__install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+%__cp -a jdoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf %{buildroot}
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -sf %{name}-%{version} %{_javadocdir}/%{name}
+%__rm -f %{_javadocdir}/%{name}
+%{__ln_s}f %{name}-%{version} %{_javadocdir}/%{name}
 
 %postun javadoc
 if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/%{name}
+  %__rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(-,root,root,-)
-%{_javadir}/*
-%{_docdir}/%{name}-%{version}/license.txt
+%doc doc/license.txt *.sample
+%{_sbindir}/%{name}
 %{_libdir}/libwrapper.so
-%{_datadir}/%{name}-%{version}/bin
-%{_datadir}/%{name}-%{version}/conf
+%{_javadir}/%{name}*.jar
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/tanukiwrapper-3.2.1.jar.*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -146,13 +198,17 @@
 
 %files manual
 %defattr(0644,root,root,0755)
-%{_docdir}/%{name}-%{version}
-
-%files demo
-%defattr(0644,root,root,0755)
-%{_datadir}/%{name}-%{version}/test
+%doc doc/*
 
 %changelog
+* Fri Aug 4 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.2.1-2jpp
+- Merge with latest from JPP.
+- Partially add new naming convention (.1 suffix).
+- Clean new source tar ball.
+- Add patch to add -lm in x86-32 Makefile.
+- Add patch to avoid use of obscure property not supported on GCJ.
+- Add missing makefiles for architectures pertinent to FC.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:3.1.1-4jpp_9fc
 - Rebuilt
 


--- tanukiwrapper-3.1.1.patch DELETED ---


--- tanukiwrapper-jpeg.patch DELETED ---


--- tanukiwrapper-nonative2ascii.patch DELETED ---


--- tanukiwrapper-notarget.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug  4 23:12:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 19:12:20 -0400
Subject: rpms/tanukiwrapper/devel tanukiwrapper.spec,1.21,1.22
Message-ID: <200608042312.k74NCKGY022504@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/tanukiwrapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18324

Modified Files:
	tanukiwrapper.spec 
Log Message:
- Rebuild.




Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tanukiwrapper.spec	4 Aug 2006 23:02:25 -0000	1.21
+++ tanukiwrapper.spec	4 Aug 2006 23:12:13 -0000	1.22
@@ -201,7 +201,10 @@
 %doc doc/*
 
 %changelog
-* Fri Aug 4 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.2.1-2jpp
+* Fri Aug 4 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.2.1-2jpp.2
+- Rebuild.
+
+* Fri Aug 4 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.2.1-2jpp.1
 - Merge with latest from JPP.
 - Partially add new naming convention (.1 suffix).
 - Clean new source tar ball.



From fedora-cvs-commits at redhat.com  Fri Aug  4 23:13:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 19:13:28 -0400
Subject: rpms/tanukiwrapper/devel tanukiwrapper.spec,1.22,1.23
Message-ID: <200608042313.k74NDSKp028919@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/tanukiwrapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28852

Modified Files:
	tanukiwrapper.spec 
Log Message:
- Rebuild.




Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tanukiwrapper.spec	4 Aug 2006 23:12:13 -0000	1.22
+++ tanukiwrapper.spec	4 Aug 2006 23:13:25 -0000	1.23
@@ -35,7 +35,7 @@
 
 Name:		tanukiwrapper
 Version:	3.2.1
-Release:	2jpp.1
+Release:	2jpp.2
 Summary:	Java Service Wrapper
 Epoch:		0
 License:	BSD



From fedora-cvs-commits at redhat.com  Fri Aug  4 23:15:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 19:15:10 -0400
Subject: rpms/bsf/devel bsf.spec,1.13,1.14
Message-ID: <200608042315.k74NFAIR029319@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/bsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29266

Modified Files:
	bsf.spec 
Log Message:

Added missing requirements.




Index: bsf.spec
===================================================================
RCS file: /cvs/dist/rpms/bsf/devel/bsf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bsf.spec	22 Jul 2006 08:21:13 -0000	1.13
+++ bsf.spec	4 Aug 2006 23:15:07 -0000	1.14
@@ -36,7 +36,7 @@
 
 Name:		bsf
 Version:	2.3.0
-Release:	10jpp_3fc
+Release:	11jpp.1
 Epoch:		0
 Summary:        Bean Scripting Framework
 License:        Apache License
@@ -93,6 +93,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -175,6 +177,9 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> 0:2.3.0-11jpp.1
+- Added missing requirements.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:2.3.0-10jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 23:32:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 19:32:48 -0400
Subject: rpms/hsqldb/devel hsqldb-1.8.0.4-scripts.patch, NONE,
	1.1 hsqldb-1.8.0.4-standard-server.properties, NONE,
	1.1 hsqldb-1.8.0.4-standard-sqltool.rc, NONE,
	1.1 hsqldb-1.8.0.4-standard-webserver.properties, NONE,
	1.1 hsqldb-1.8.0.4-standard.cfg, NONE, 1.1 .cvsignore, 1.6,
	1.7 hsqldb.spec, 1.21, 1.22 sources, 1.5,
	1.6 hsqldb-1.80.1-scripts.patch, 1.1,
	NONE hsqldb-1.80.1-standard-server.properties, 1.1,
	NONE hsqldb-1.80.1-standard-sqltool.rc, 1.1,
	NONE hsqldb-1.80.1-standard-webserver.properties, 1.1,
	NONE hsqldb-1.80.1-standard.cfg, 1.1, NONE
Message-ID: <200608042332.k74NWmoZ016113@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/hsqldb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16028

Modified Files:
	.cvsignore hsqldb.spec sources 
Added Files:
	hsqldb-1.8.0.4-scripts.patch 
	hsqldb-1.8.0.4-standard-server.properties 
	hsqldb-1.8.0.4-standard-sqltool.rc 
	hsqldb-1.8.0.4-standard-webserver.properties 
	hsqldb-1.8.0.4-standard.cfg 
Removed Files:
	hsqldb-1.80.1-scripts.patch 
	hsqldb-1.80.1-standard-server.properties 
	hsqldb-1.80.1-standard-sqltool.rc 
	hsqldb-1.80.1-standard-webserver.properties 
	hsqldb-1.80.1-standard.cfg 
Log Message:

Add missing requirements.
Upgrade to 1.8.0.4.



hsqldb-1.8.0.4-scripts.patch:
 runUtil.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hsqldb-1.8.0.4-scripts.patch ---
--- bin/runUtil.sh.orig	2004-08-10 16:04:01.000000000 +0200
+++ bin/runUtil.sh	2004-08-10 16:05:43.000000000 +0200
@@ -31,7 +31,7 @@
 progname=`basename $0`
 
 # ../ will lead us to the home
-dbhome="$progdir/.."
+dbhome=/var/lib/hsqldb
 
 # absolutize dbhome
 
@@ -40,7 +40,7 @@
 #
 # bring in needed functions
 
-. ${dbhome}/lib/functions
+. /var/lib/hsqldb/lib/functions
 
 #--------------------------------------------------------------------------------------------------------------
 pre_main


--- NEW FILE hsqldb-1.8.0.4-standard-server.properties ---
# Hsqldb Server cfg file.
# See the Advanced Topics chapter of the Hsqldb User Guide.

server.database.0   file:data/db0
server.dbname.0     firstdb
server.urlid.0      db0-url
server.silent       true
server.trace        false

server.port         9001
server.no_system_exit         true


***** Error reading new file: [Errno 2] No such file or directory: 'hsqldb-1.8.0.4-standard-sqltool.rc'

--- NEW FILE hsqldb-1.8.0.4-standard-webserver.properties ---
# Hsqldb Server cfg file.
# See the Advanced Topics chapter of the Hsqldb User Guide.

server.database.0   file:data/db0
server.dbname.0     firstdb
server.urlid.0      db0-url
server.silent       true
server.trace        false

server.port         80
server.default_page index.html
server.root		./
.html=text/html


***** Error reading new file: [Errno 2] No such file or directory: 'hsqldb-1.8.0.4-standard.cfg'

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Aug 2005 10:43:59 -0000	1.6
+++ .cvsignore	4 Aug 2006 23:32:44 -0000	1.7
@@ -1,4 +1 @@
-hsqldb_1_8_0_1-RHCLEAN.zip
-hsqldb
-i386
-*.src.rpm
+hsqldb_1_8_0_4-RHCLEAN.zip


Index: hsqldb.spec
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- hsqldb.spec	22 Jul 2006 08:39:51 -0000	1.21
+++ hsqldb.spec	4 Aug 2006 23:32:44 -0000	1.22
@@ -1,14 +1,45 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section		devel
 
-%define name		hsqldb
-%define version		1.80.1
-%define cvs_version	1_8_0_1
-%define release 	1jpp_11fc
-
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
-Epoch:		0
+%define cvs_version	1_8_0_4
+
+Name:		hsqldb
+Version:	1.8.0.4
+Release:	1jpp.1
+Epoch:		1
 Summary:	Hsqldb Database Engine
 License:	BSD Style
 Url:		http://hsqldb.sourceforge.net/
@@ -19,23 +50,23 @@
 Source4:	%{name}-%{version}-standard-sqltool.rc
 Patch0:		%{name}-%{version}-scripts.patch
 Requires:	servletapi5
+Requires(post):   /bin/rm,/bin/ln
+Requires(preun): /bin/rm
 BuildRequires:	ant
 BuildRequires:	junit
 BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:	tomcat5-servlet-2.4-api
+BuildRequires:	servletapi5
 Group:		Development/Java
+%if ! %{gcj_support}
+Buildarch:	noarch
+%endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-Requires(pre):	shadow-utils
-Requires(post): coreutils
-Requires(preun): coreutils
-
-# tomcat5-servlet-2.4-api is only available here
-ExcludeArch: ppc64 s390 s390x
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 HSQLdb is a relational database engine written in JavaTM , with a JDBC
@@ -64,7 +95,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Java
-Prereq: coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(preun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -144,7 +176,9 @@
 cp -r doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp index.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -154,7 +188,7 @@
 # we need a shell to be able to use su - later
 %{_sbindir}/groupadd -g 96 -f -r %{name} 2> /dev/null || :
 %{_sbindir}/useradd -u 96 -g %{name} -s /sbin/nologin \
-    -d %{_localstatedir}/lib/%{name} -r %{name} 2> /dev/null || :
+     -d %{_localstatedir}/lib/%{name} -r %{name} 2> /dev/null || :
 
 %post
 rm -f %{_localstatedir}/lib/%{name}/lib/hsqldb.jar
@@ -163,7 +197,13 @@
     ln -s $(build-classpath hsqldb) hsqldb.jar
     ln -s $(build-classpath servletapi5) servlet.jar
 )
-%{_bindir}/rebuild-gcj-db
+
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %preun
 if [ "$1" = "0" ]; then
@@ -173,9 +213,6 @@
     #%{_sbindir}/groupdel %{name} >> /dev/null 2>&1 || :
 fi
 
-%postun
-%{_bindir}/rebuild-gcj-db
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -197,7 +234,10 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/server.properties
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/webserver.properties
 %attr(0600,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/sqltool.rc
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -212,70 +252,32 @@
 %{_datadir}/%{name}
 
 %changelog
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.80.1-1jpp_11fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.80.1-1jpp_10fc
-- rebuild
-
-* Wed Mar  8 2006 Bill Nottingham <notting at redhat.com> - 0:1.80.1-1jpp_9fc
-- use an assigned user/group id
-- don't do usermod
-- add missing requirements (#182796, #182797)
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.80.1-1jpp_8fc
-- stop scriptlet spew
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.80.1-1jpp_7fc
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.80.1-1jpp_6fc
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Tue Jan 03 2006 Jesse Keating <jkeating at redhat.com> 0:1.80.1-1jpp_5fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Wed Nov 23 2005 Archit Shah <ashah at redhat.com> 0:1.80.1-1jpp_4fc
-- Change hsqldb user shell to /sbin/nologin.
-
-* Mon Oct 24 2005 Gary Benson <gbenson at redhat.com> 0:1.80.1-1jpp_3fc
-- Change /etc/init.d to /etc/rc.d/init.d.
-
-* Mon Oct 24 2005 Gary Benson <gbenson at redhat.com> 0:1.80.1-1jpp_2fc
-- Create hsqldb user and group with low IDs (#165670).
-- Do not remove hsqldb user and group on uninstall.
-
-* Thu Aug  4 2005 Gary Benson <gbenson at redhat.com> 0:1.80.1-1jpp_1fc
-- BC-compile.
-
-* Wed Aug  3 2005 Gary Benson <gbenson at redhat.com>
-- Upgrade to 1.8.0.1 (#164072).
+* Fri Aug 04 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-2jpp.1
+- Add missing requirements.
+- Merge with fc spec.
+  - From gbenson at redhat.com:
+    - Change /etc/init.d to /etc/rc.d/init.d.
+    - Create hsqldb user and group with low IDs (RH bz #165670).
+    - Do not remove hsqldb user and group on uninstall.
+    - Build with servletapi5.
+  - From ashah at redhat.com:
+    - Change hsqldb user shell to /sbin/nologin.
+  - From notting at redhat.com
+    - use an assigned user/group id
+
+* Fri Apr 28 2006 Fernando Nasser <fnasser at redhat.com> 1:1.8.0.4-1jpp
+- First JPP 1.7 build
+- Upgrade to 1.8.0.4
 
 * Tue Jul 26 2005 Fernando Nasser <fnasser at redhat.com> 0:1.80.1-1jpp
 - Upgrade to 1.8.0.1
 
-* Thu Jun 16 2005 Gary Benson <gbenson at redhat.com> 0:1.73.0-2jpp_1fc
-- Build into Fedora.
-
-* Thu Jun  9 2005 Gary Benson <gbenson at redhat.com>
-- Remove jarfiles from the tarball.
-
-* Thu Jun  2 2005 Gary Benson <gbenson at redhat.com>
-- Avoid Sun-specific classes.
-- Build with servletapi5.
-
 * Mon Mar 07 2005 Fernando Nasser <fnasser at redhat.com> 0:1.73.3-1jpp
 - Upgrade to 1.7.3.3
 
 * Wed Mar 02 2005 Fernando Nasser <fnasser at redhat.com> 0:1.73.0-1jpp
 - Upgrade to 1.7.3.0
 
-* Thu Dec 23 2004 Fernando Nasser <fnasser at redhat.com> 0:1.72.3-2jpp_1rh
-- First Red Hat release
-
 * Wed Aug 25 2004 Ralph Apel <r.apel at r-apel.de> 0:1.72.3-2jpp
 - Build with ant-1.6.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Aug 2005 09:09:58 -0000	1.5
+++ sources	4 Aug 2006 23:32:44 -0000	1.6
@@ -1 +1 @@
-bef8dccc4278e1d7a35a6f2ade0892bc  hsqldb_1_8_0_1-RHCLEAN.zip
+ea506781107b1d618b4f99306deab590  hsqldb_1_8_0_4-RHCLEAN.zip


--- hsqldb-1.80.1-scripts.patch DELETED ---


--- hsqldb-1.80.1-standard-server.properties DELETED ---


--- hsqldb-1.80.1-standard-sqltool.rc DELETED ---


--- hsqldb-1.80.1-standard-webserver.properties DELETED ---


--- hsqldb-1.80.1-standard.cfg DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug  4 23:36:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 19:36:35 -0400
Subject: rpms/jdom/devel jdom.spec,1.16,1.17
Message-ID: <200608042336.k74NaZdh017004@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jdom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16948

Modified Files:
	jdom.spec 
Log Message:

- Added missing requirements.
- Remove jaxen requirement, since we don't have it in fc yet.
- Merge with fc spec.




Index: jdom.spec
===================================================================
RCS file: /cvs/dist/rpms/jdom/devel/jdom.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jdom.spec	22 Jul 2006 08:43:40 -0000	1.16
+++ jdom.spec	4 Aug 2006 23:36:32 -0000	1.17
@@ -1,27 +1,66 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section free
 
 Name:           jdom
 Version:        1.0
-Release:        1jpp_7fc
+Release:        4jpp.1
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        Apache Software License-like
 URL:            http://www.jdom.org/
 Group:          Development/Libraries/Java
+#http://www.jdom.org/dist/source/jdom-1.0.tar.gz
 Source0:        jdom-1.0-RHCLEAN.tar.bz2
 Patch0:         %{name}-crosslink.patch
 Requires:       xalan-j2 >= 0:2.2.0
-BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:  java-javadoc
-BuildRequires:  ant
+BuildRequires:  ant >= 0:1.6
 BuildRequires:  xalan-j2 >= 0:2.2.0
-
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.35
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  java-javadoc
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 JDOM is, quite simply, a Java representation of an XML document. JDOM
 provides a way to represent that document for easy and efficient
@@ -33,7 +72,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -54,7 +94,6 @@
 find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.class" -exec rm -f {} \;
 
-
 %build
 export CLASSPATH=$(build-classpath xalan-j2)
 sed -e 's|<property name="build.compiler".*||' build.xml > tempf; cp tempf build.xml; rm tempf
@@ -78,28 +117,50 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-aot-compile-rpm
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/usr/bin/rebuild-gcj-db %{_libdir}
-
-%postun
-/usr/bin/rebuild-gcj-db %{_libdir}
 
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
+%if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 %{_javadir}/%{name}*.jar
 
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jdom-1.0.jar.*
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %ghost %doc %{_javadocdir}/%{name}
@@ -111,36 +172,17 @@
 
 
 %changelog
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0-1jpp_7fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-1jpp_6fc
-- rebuild
-
-* Wed Jun  7 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-1jpp_5fc
-- Removing .so ownership from demo package
-
-* Wed Jun  7 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-1jpp_4fc
-- Build natively
-- Remove spurious xml-commons-api requirement
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0-1jpp_3fc
-- stop scriptlet spew
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Wed Jun 22 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-1jpp_2fc
-- Remove classes from the tarball too.
-
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-1jpp_1fc
-- Build into Fedora.
-
-* Thu Jun  9 2005 Gary Benson <gbenson at redhat.com>
-- Remove jarfiles from the tarball.
+* Fri Aug 04 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-4jpp.1
+- Added missing requirements.
+- Remove jaxen requirement, since we don't have it in fc yet.
+- Merge with fc spec.
+
+* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-3jpp
+- First JPP-1.7 release
+- Drop false xalan dependency
 
-* Tue Oct 19 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.0-1jpp_1rh
-- First Red Hat build
+* Tue Oct 11 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-2jpp
+- Add jaxen to Requires and classpath
 
 * Sat Sep 18 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-1jpp
 - Upgrade to 1.0 final



From fedora-cvs-commits at redhat.com  Fri Aug  4 23:43:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 19:43:32 -0400
Subject: rpms/hsqldb/devel hsqldb.spec,1.22,1.23
Message-ID: <200608042343.k74NhWCk018386@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/hsqldb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18332

Modified Files:
	hsqldb.spec 
Log Message:

Bumping release.




Index: hsqldb.spec
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- hsqldb.spec	4 Aug 2006 23:32:44 -0000	1.22
+++ hsqldb.spec	4 Aug 2006 23:43:29 -0000	1.23
@@ -38,7 +38,7 @@
 
 Name:		hsqldb
 Version:	1.8.0.4
-Release:	1jpp.1
+Release:	2jpp.1
 Epoch:		1
 Summary:	Hsqldb Database Engine
 License:	BSD Style



From fedora-cvs-commits at redhat.com  Fri Aug  4 23:52:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 19:52:10 -0400
Subject: rpms/jsch/devel jsch.spec,1.17,1.18
Message-ID: <200608042352.k74NqABt003694@cvs.devel.redhat.com>

Author: dbhole

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

Modified Files:
	jsch.spec 
Log Message:

Added missing requirements.




Index: jsch.spec
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jsch.spec	22 Jul 2006 08:44:10 -0000	1.17
+++ jsch.spec	4 Aug 2006 23:52:07 -0000	1.18
@@ -1,9 +1,42 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
 %define section   free
-%define gcj_support 	1
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 Name:           jsch
 Version:        0.1.28
-Release:        1jpp_3fc
+Release:        1jpp.4
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -16,6 +49,11 @@
 BuildRequires:  java-devel >= 1.4.2
 BuildRequires:  jzlib >= 0:1.0.5
 BuildRequires:  ant
+
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
+
 %if %{gcj_support}
 BuildRequires:  java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31
@@ -31,7 +69,8 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 %{summary}.
@@ -39,7 +78,8 @@
 %package        demo
 Summary:        Examples for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description    demo
 %{summary}.
@@ -89,10 +129,19 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %post demo
 rm -f %{_datadir}/%{name}
 ln -s %{name}-%{version} %{_datadir}/%{name}
 
+%postun demo
+if [ "$1" = "0" ]; then
+    rm -f %{_datadir}/%{name}
+fi
 
 %files
 %defattr(-,root,root,-)
@@ -114,6 +163,9 @@
 
 
 %changelog
+* Fri Aug 04 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.1.28-1jpp.4
+- Added missing requirements.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:0.1.28-1jpp_3fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 23:56:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 19:56:48 -0400
Subject: rpms/antlr/devel antlr.spec,1.27,1.28
Message-ID: <200608042356.k74NumD5005404@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5348

Modified Files:
	antlr.spec 
Log Message:

Add missing postun for javadoc




Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- antlr.spec	4 Aug 2006 21:28:25 -0000	1.27
+++ antlr.spec	4 Aug 2006 23:56:46 -0000	1.28
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.6
-Release:        4jpp.1
+Release:        4jpp.2
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -241,6 +241,10 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ $1 -eq 0 ]; then
+  %{__rm} -f %{_javadocdir}/%{name}
+fi
 
 %if %{native}
 %files native
@@ -281,6 +285,9 @@
 
 
 %changelog
+* Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> = 0:2.7.6-4jpp.2
+- Add missing postun for javadoc.
+
 * Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> = 0:2.7.6-4jpp.1
 - Add missing requirements.
 



From fedora-cvs-commits at redhat.com  Fri Aug  4 23:59:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 19:59:32 -0400
Subject: rpms/regexp/devel regexp.spec,1.32,1.33
Message-ID: <200608042359.k74NxW4H006441@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/regexp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6334

Modified Files:
	regexp.spec 
Log Message:
- Merge with latest from JPP.
- Remove prebuilt jars from new source tar ball.




Index: regexp.spec
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/regexp.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- regexp.spec	22 Jul 2006 08:45:21 -0000	1.32
+++ regexp.spec	4 Aug 2006 23:59:29 -0000	1.33
@@ -1,28 +1,61 @@
-%define name		regexp
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define full_name	jakarta-%{name}
-%define version		1.3
-%define release 	2jpp_9fc
 %define section		free
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           regexp
+Version:        1.4
+Release:        2jpp.1
 Epoch:          0
 Summary:        Simple regular expressions API
 License:        Apache Software License
 Group:          Development/Libraries/Java
 Url:            http://jakarta.apache.org/%{name}/
-Source0:        jakarta-regexp-%{version}-RHCLEAN.tar.bz2
-BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:  ant >= 0:1.6
-BuildRequires:  coreutils
+Source0:        jakarta-regexp-%{version}-RHCLEAN.tar.gz
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  ant >= 1.6
+%if ! %{gcj_support}
+Buildarch:      noarch
+%endif
 Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
-# RHEL3 and FC2
-Obsoletes:	%{full_name} <= 0:1.2
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 Regexp is a 100% Pure Java Regular Expression package that was
@@ -35,7 +68,9 @@
 %package javadoc
 Group:          Development/Java
 Summary:        Javadoc for %{name}
-Prereq: coreutils
+Requires(post): %{__rm}
+Requires(postun): %{__rm}
+Requires(post): /bin/ln
 
 %description javadoc
 Javadoc for %{name}.
@@ -50,6 +85,7 @@
 mkdir lib
 ant -Djakarta-site2.dir=. jar javadocs
 
+
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -60,21 +96,13 @@
 cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 rm -rf docs/api
 
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-rm -f %{_javadir}/%{full_name}.jar
-rm -f %{_javadir}/%{name}.jar
-
-%post
-%{_bindir}/rebuild-gcj-db
-
-%postun
-%{_bindir}/rebuild-gcj-db
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -84,17 +112,40 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE.txt
+%doc LICENSE
 %{_javadir}/*.jar
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Aug 4 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:1.4-2jpp.1
+- Merge with latest from JPP.
+- Remove prebuilt jars from new source tar ball.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.3-2jpp_9fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 00:01:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 20:01:56 -0400
Subject: rpms/regexp/devel .cvsignore,1.5,1.6 sources,1.3,1.4
Message-ID: <200608050001.k7501uSn007164@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/regexp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7085

Modified Files:
	.cvsignore sources 
Log Message:
- New sources for version upgrade.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Jun 2005 13:43:57 -0000	1.5
+++ .cvsignore	5 Aug 2006 00:01:52 -0000	1.6
@@ -1,4 +1 @@
-jakarta-regexp-1.3-RHCLEAN.tar.bz2
-jakarta-regexp-1.3
-i386
-*.src.rpm
+jakarta-regexp-1.4-RHCLEAN.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Jun 2005 13:43:57 -0000	1.3
+++ sources	5 Aug 2006 00:01:52 -0000	1.4
@@ -1 +1 @@
-7074dcced4de07e939434daa82bbe630  jakarta-regexp-1.3-RHCLEAN.tar.bz2
+3869ec6a6b7ad1c139f2e39219e509ec  jakarta-regexp-1.4-RHCLEAN.tar.gz



From fedora-cvs-commits at redhat.com  Sat Aug  5 00:02:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 20:02:36 -0400
Subject: rpms/lucene/devel lucene.spec,1.19,1.20
Message-ID: <200608050002.k7502aAX007283@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/lucene/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7205

Modified Files:
	lucene.spec 
Log Message:

- Added missing requirements
- Added proper post/postun's for javadoc





Index: lucene.spec
===================================================================
RCS file: /cvs/dist/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lucene.spec	22 Jul 2006 08:44:40 -0000	1.19
+++ lucene.spec	5 Aug 2006 00:02:23 -0000	1.20
@@ -4,7 +4,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        1.4.3
-Release:	1jpp_13fc
+Release:	1jpp.14
 Epoch:          0
 License:        Apache Software License
 URL:            http://jakarta.apache.org/lucene/
@@ -35,6 +35,8 @@
 %package javadoc
 Summary:        Javadoc for Lucene
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for Lucene.
@@ -123,6 +125,15 @@
 
 # -----------------------------------------------------------------------------
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -168,6 +179,10 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Aug 04 2006 Deepak Bhole <dbhole at redhat.com> 0:1.4.3-1jpp.14
+- Added missing requirements
+- Added proper post/postun's for javadoc
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.4.3-1jpp_13fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 00:04:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 20:04:33 -0400
Subject: rpms/regexp/devel regexp.spec,1.33,1.34
Message-ID: <200608050004.k7504XeN007695@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/regexp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7626

Modified Files:
	regexp.spec 
Log Message:
Bump release number.




Index: regexp.spec
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/regexp.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- regexp.spec	4 Aug 2006 23:59:29 -0000	1.33
+++ regexp.spec	5 Aug 2006 00:04:31 -0000	1.34
@@ -37,7 +37,7 @@
 
 Name:           regexp
 Version:        1.4
-Release:        2jpp.1
+Release:        2jpp.2
 Epoch:          0
 Summary:        Simple regular expressions API
 License:        Apache Software License
@@ -142,6 +142,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Aug 4 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:1.4-2jpp.2
+- Rebuild.
+
 * Fri Aug 4 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:1.4-2jpp.1
 - Merge with latest from JPP.
 - Remove prebuilt jars from new source tar ball.



From fedora-cvs-commits at redhat.com  Sat Aug  5 00:05:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 20:05:17 -0400
Subject: rpms/evolution/devel .cvsignore, 1.53, 1.54 evolution.spec, 1.172,
	1.173 sources, 1.53, 1.54
Message-ID: <200608050005.k7505H90007881@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:
- Update to 2.7.90
- Require evolution-data-server-1.7.90.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	31 Jul 2006 19:06:03 -0000	1.53
+++ .cvsignore	5 Aug 2006 00:05:14 -0000	1.54
@@ -1 +1 @@
-evolution-2.7.4.tar.bz2
+evolution-2.7.90.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- evolution.spec	3 Aug 2006 18:12:42 -0000	1.172
+++ evolution.spec	5 Aug 2006 00:05:14 -0000	1.173
@@ -1,54 +1,50 @@
-%define gtkhtml_version 3.9.2
-%define soup_version 2.2.2
-%define eds_version 1.5.92
-%define use_mozilla_nss 1
-%define evo_major 2.8
-%define libbonoboui_version 2.4.2
-%define orbit2_version 2.9.8
-%define gnome_icon_theme_version 1.3.6
-%define libgnomeprint22_version 2.8.0
-%define dbus_version 0.90
 %define dbus_glib_version 0.70
+%define dbus_version 0.90
+%define eds_version 1.7.90.1
+%define gnome_icon_theme_version 1.3.6
+%define gnome_pilot_version 2.0.13
 %define gnomevfs2_version 2.4
+%define gtkhtml_version 3.9.2
 %define last_libgal2_version 2:2.5.3-2
-
+%define libbonoboui_version 2.4.2
+%define libgnomeprint22_version 2.8.0
+%define orbit2_version 2.9.8
 %define pilot_link_version 2:0.11.8
-%define gnome_pilot_version 2.0.13
+%define redhat_menus_version 5.0.4
+%define soup_version 2.2.2
+
+%define evo_major 2.8
 
+%define exchange_support 1
+%define inline_audio_support 0
 %define ldap_support 1
+%define libnotify_support 1
 %define krb5_support 1
-%ifarch s390 s390x
-%define pilot_support 0
-%else
-%define pilot_support 1
-%endif
-# note that nntp is non-functional in evo 1.3.x
 %define nntp_support 1
-%define exchange_support 1
-
 %ifnarch s390 s390x 
 %define nm_support 1
 %else
 %define nm_support 0
 %endif
-
-%define libnotify_support 1
-%define inline_audio_support 0
+%ifarch s390 s390x
+%define pilot_support 0
+%else
+%define pilot_support 1
+%endif
+%define use_mozilla_nss 1
 
 # Upstream tarballs often contain instances of undeclared functions; these tend
 # to work on i386 but fail on 64-bit architectures.  Leave this on to trap the
 # warnings as errors (and ideally get the flag into the upstream build):
 %define require_function_declarations 0
 
-%define redhat_menus_version 5.0.4
-
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 ### Abstract ###
 
 Name: evolution
-Version: 2.7.4
-Release: 5
+Version: 2.7.90
+Release: 1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -637,6 +633,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-1
+- Update to 2.7.90
+- Require evolution-data-server-1.7.90.1.
+
 * Wed Aug  2 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-5
 - Remove patch for RH bug #167157, as it fixed it the wrong way.
 - The real fix for #167157 is in evolution-data-server-1.7.4-5.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	31 Jul 2006 19:06:03 -0000	1.53
+++ sources	5 Aug 2006 00:05:14 -0000	1.54
@@ -1 +1 @@
-5d9770b3d86953e8edcd36ec9f9b8852  evolution-2.7.4.tar.bz2
+aae1aac8c521aef1aa9dbb1aed9a9f6e  evolution-2.7.90.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug  5 00:06:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 20:06:56 -0400
Subject: rpms/bsh/devel bsh.spec,1.9,1.10
Message-ID: <200608050006.k7506umw008276@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/bsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8236

Modified Files:
	bsh.spec 
Log Message:

Added missing requirements.




Index: bsh.spec
===================================================================
RCS file: /cvs/dist/rpms/bsh/devel/bsh.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bsh.spec	22 Jul 2006 08:36:19 -0000	1.9
+++ bsh.spec	5 Aug 2006 00:06:54 -0000	1.10
@@ -36,7 +36,7 @@
 
 Name:           bsh
 Version:        1.3.0
-Release:        8jpp_3fc
+Release:        9jpp.1
 Epoch:		0
 Summary:        Lightweight Scripting for Java
 License:        LGPL
@@ -89,6 +89,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Java
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -209,6 +211,15 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -250,6 +261,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Fri Aug 04 2006 Deepak Bhole <dbhole at redhat.com> 0:1.3.0-9jpp.1
+- Added missing requirements
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:1.3.0-8jpp_3fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 00:07:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 20:07:16 -0400
Subject: rpms/evolution/devel evolution.spec,1.173,1.174
Message-ID: <200608050007.k7507G2h008331@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Log Message:
- Bump the release.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- evolution.spec	5 Aug 2006 00:05:14 -0000	1.173
+++ evolution.spec	5 Aug 2006 00:07:02 -0000	1.174
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 2.7.90
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -633,7 +633,7 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
-* Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-1
+* Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-2
 - Update to 2.7.90
 - Require evolution-data-server-1.7.90.1.
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 00:08:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 20:08:13 -0400
Subject: rpms/evolution/devel evolution.spec,1.174,1.175
Message-ID: <200608050008.k7508D7w008672@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Log Message:
- Try it again.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- evolution.spec	5 Aug 2006 00:07:02 -0000	1.174
+++ evolution.spec	5 Aug 2006 00:08:09 -0000	1.175
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 2.7.90
-Release: 2
+Release: 5
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -633,7 +633,7 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
-* Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-2
+* Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-5
 - Update to 2.7.90
 - Require evolution-data-server-1.7.90.1.
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 00:14:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 20:14:13 -0400
Subject: rpms/castor/devel castor.spec,1.13,1.14
Message-ID: <200608050014.k750ED41009760@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/castor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9737

Modified Files:
	castor.spec 
Log Message:

Added missing requirements.




Index: castor.spec
===================================================================
RCS file: /cvs/dist/rpms/castor/devel/castor.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- castor.spec	22 Jul 2006 08:36:32 -0000	1.13
+++ castor.spec	5 Aug 2006 00:14:09 -0000	1.14
@@ -7,7 +7,7 @@
 Summary:        An open source data binding framework for Java
 Name:           castor
 Version:        0.9.5
-Release:        1jpp_6fc
+Release:        1jpp.7
 Epoch:          0
 Group:          Development/Libraries/Java
 License:        Exolab Software License
@@ -101,7 +101,8 @@
 %package javadoc
 Group:          Development/Documentation
 Summary:        Javadoc for %{name}
-Prereq: coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -283,6 +284,9 @@
 %doc build/doc/*
 
 %changelog
+* Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.9.5-1jpp.7
+- Added missing requirements.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:0.9.5-1jpp_6fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 00:17:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 20:17:23 -0400
Subject: rpms/xmlrpc/devel xmlrpc.spec,1.15,1.16
Message-ID: <200608050017.k750HNjm022611@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/xmlrpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18415

Modified Files:
	xmlrpc.spec 
Log Message:
- Merge with latest from JPP.




Index: xmlrpc.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xmlrpc.spec	22 Jul 2006 08:46:58 -0000	1.15
+++ xmlrpc.spec	5 Aug 2006 00:17:20 -0000	1.16
@@ -1,12 +1,40 @@
-%define name		xmlrpc
-%define version		2.0.1
-%define release		1jpp_8.2fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define	section		free
-%define gcj_support     1
 
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		xmlrpc
+Version:	2.0.1
+Release:	3jpp.1
 Epoch:		0
 Summary:	Java XML-RPC implementation
 License:	Apache Software License
@@ -14,28 +42,25 @@
 Url:		http://xml.apache.org/%{name}/
 Source0:	http://www.apache.org/dist/ws/xmlrpc/source/xmlrpc-%{version}-src.tar.gz
 Requires:	servletapi5
-Requires:	commons-httpclient >= 2.0.2
-Requires:	commons-codec >= 1.3
-Requires:	junit >= 3.8.1
-%if %{gcj_support}
-Requires(post):		java-gcj-compat >= 1.0.33
-Requires(post):		java-gcj-compat >= 1.0.33
-Requires(postun):	coreutils
-Requires(postun):	coreutils
-BuildRequires:	java-gcj-compat-devel >= 1.0.33
-%endif
+Requires:	jakarta-commons-httpclient
+Requires:	jakarta-commons-codec >= 1.3
+Requires:	junit
 BuildRequires:	ant
-BuildRequires:	jpackage-utils >= 0:1.5
+BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	servletapi5
-BuildRequires:	junit >= 3.8.1
-BuildRequires:	commons-httpclient >= 2.0.2	
-BuildRequires:	commons-codec >= 1.3
+BuildRequires:	junit
+BuildRequires:	jakarta-commons-httpclient
+BuildRequires:	jakarta-commons-codec >= 1.3
+%if ! %{gcj_support}
+Buildarch:	noarch
+%endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
-#Distribution:	JPackage
-#Vendor:		JPackage Project
 
-# s390 excluded due to eclipse
-ExcludeArch: s390x ppc64 s390
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
@@ -47,12 +72,9 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Java
-%if %{gcj_support}
-Requires(post):		java-gcj-compat >= 1.0.33
-Requires(post):		java-gcj-compat >= 1.0.33
-%endif
-Requires(postun):	coreutils
-Requires(postun):	coreutils
+Requires(post): %{__rm}
+Requires(postun): %{__rm}
+Requires(post): /bin/ln
 
 %description javadoc
 Javadoc for %{name}.
@@ -82,7 +104,7 @@
 cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %if %{gcj_support}
-aot-compile-rpm
+%{_bindir}/aot-compile-rpm
 %endif
 
 %clean
@@ -91,29 +113,46 @@
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
 
 %postun javadoc
 if [ "$1" = "0" ]; then
     rm -f %{_javadocdir}/%{name}
 fi
+
+%if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 %endif
 
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt README.txt
 %{_javadir}/*
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xmlrpc-applet-2.0.1.jar.*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Aug 04 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.0.1-3jpp.1
+- Merge with latest from JPP.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.0.1-1jpp_8.2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 00:18:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 20:18:57 -0400
Subject: rpms/xmlrpc/devel xmlrpc.spec,1.16,1.17
Message-ID: <200608050018.k750IvfL026174@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/xmlrpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25917

Modified Files:
	xmlrpc.spec 
Log Message:
- Add _with_gcj_support to ensure native compilation.




Index: xmlrpc.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xmlrpc.spec	5 Aug 2006 00:17:20 -0000	1.16
+++ xmlrpc.spec	5 Aug 2006 00:18:54 -0000	1.17
@@ -28,6 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define _with_gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define	section		free



From fedora-cvs-commits at redhat.com  Sat Aug  5 00:59:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 20:59:33 -0400
Subject: rpms/jakarta-commons-collections/devel
	jakarta-commons-collections.spec, 1.43, 1.44
Message-ID: <200608050059.k750xWTM021081@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20902

Modified Files:
	jakarta-commons-collections.spec 
Log Message:
- Partially adopt new naming convention.
- Add proper Requires(x) statements where appropriate.




Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- jakarta-commons-collections.spec	22 Jul 2006 08:40:30 -0000	1.43
+++ jakarta-commons-collections.spec	5 Aug 2006 00:59:29 -0000	1.44
@@ -44,7 +44,7 @@
 
 Name:		jakarta-%{short_name}
 Version:	3.1
-Release:	5jpp_2fc
+Release:	5jpp.3
 Epoch:		0
 Summary:	Jakarta Commons Collections Package
 License:	Apache Software License v2
@@ -117,6 +117,9 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Requires(post): %{__rm}
+Requires(post): /bin/ln
+Requires(postun): %{__rm}
 
 %description javadoc
 %{summary}.
@@ -124,6 +127,9 @@
 %package testframework-javadoc
 Summary:	Javadoc for %{name}-testframework
 Group:		Development/Documentation
+Requires(post): %{__rm}
+Requires(post): /bin/ln
+Requires(postun): %{__rm}
 
 %description testframework-javadoc
 %{summary}.
@@ -329,6 +335,10 @@
 %endif
 
 %changelog
+* Fri Aug 04 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-5jpp.3
+- Partially adopt new naming convention.
+- Add proper Requires(x) statements where appropriate.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:3.1-5jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 01:21:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 21:21:15 -0400
Subject: rpms/jakarta-commons-collections/devel
	jakarta-commons-collections.spec, 1.44, 1.45
Message-ID: <200608050121.k751LFDR008306@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8185

Modified Files:
	jakarta-commons-collections.spec 
Log Message:
- Resync with JPP.




Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- jakarta-commons-collections.spec	5 Aug 2006 00:59:29 -0000	1.44
+++ jakarta-commons-collections.spec	5 Aug 2006 01:21:11 -0000	1.45
@@ -44,7 +44,7 @@
 
 Name:		jakarta-%{short_name}
 Version:	3.1
-Release:	5jpp.3
+Release:	6jpp.1
 Epoch:		0
 Summary:	Jakarta Commons Collections Package
 License:	Apache Software License v2
@@ -335,6 +335,9 @@
 %endif
 
 %changelog
+* Fri Aug 04 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-6jpp.1
+- Resync with JPP.
+
 * Fri Aug 04 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-5jpp.3
 - Partially adopt new naming convention.
 - Add proper Requires(x) statements where appropriate.



From fedora-cvs-commits at redhat.com  Sat Aug  5 01:51:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 21:51:13 -0400
Subject: rpms/java_cup/devel java_cup.spec,1.18,1.19
Message-ID: <200608050151.k751pDx4006861@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/java_cup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6841

Modified Files:
	java_cup.spec 
Log Message:
- Re-sync with latest version from JPP.
- Partially adopt new naming convention.




Index: java_cup.spec
===================================================================
RCS file: /cvs/dist/rpms/java_cup/devel/java_cup.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- java_cup.spec	22 Jul 2006 08:43:28 -0000	1.18
+++ java_cup.spec	5 Aug 2006 01:51:11 -0000	1.19
@@ -37,7 +37,7 @@
 
 Name:		java_cup
 Version:	0.10
-Release:	0.k.5jpp_2fc
+Release:	0.k.6jpp.1
 Epoch:		1
 Summary:	Java source interpreter
 License:	BSD-style
@@ -65,6 +65,9 @@
 %package javadoc
 Summary:	Javadoc for java_cup
 Group:		Development/Java
+Requires(post): %{__rm}
+Requires(post): /bin/ln
+Requires(postun): %{__rm}
 
 %description javadoc
 Javadoc for java_cup
@@ -153,6 +156,14 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Aug 04 2006 Vivek Lakshmanan <vivekl at redhat.com> - 1:0.10-0.k.6jpp.1
+- Re-sync with latest version from JPP.
+- Partially adopt new naming convention.
+
+* Thu Jul 20 2006 Vivek Lakshmanan <vivekl at redhat.com> - 1:0.10-0.k.5jpp_1fc
+- Re-sync with latest version from JPP.
+
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:0.10-0.k.5jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 01:54:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 21:54:34 -0400
Subject: rpms/java_cup/devel java_cup.spec,1.19,1.20
Message-ID: <200608050154.k751sYgE006892@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/java_cup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6879

Modified Files:
	java_cup.spec 
Log Message:
Rebuild.




Index: java_cup.spec
===================================================================
RCS file: /cvs/dist/rpms/java_cup/devel/java_cup.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- java_cup.spec	5 Aug 2006 01:51:11 -0000	1.19
+++ java_cup.spec	5 Aug 2006 01:54:32 -0000	1.20
@@ -163,7 +163,6 @@
 * Thu Jul 20 2006 Vivek Lakshmanan <vivekl at redhat.com> - 1:0.10-0.k.5jpp_1fc
 - Re-sync with latest version from JPP.
 
-
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:0.10-0.k.5jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 01:57:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 21:57:36 -0400
Subject: rpms/java_cup/devel java_cup.spec,1.20,1.21
Message-ID: <200608050157.k751va5D006931@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/java_cup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6918

Modified Files:
	java_cup.spec 
Log Message:
-Rebuild.




Index: java_cup.spec
===================================================================
RCS file: /cvs/dist/rpms/java_cup/devel/java_cup.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- java_cup.spec	5 Aug 2006 01:54:32 -0000	1.20
+++ java_cup.spec	5 Aug 2006 01:57:34 -0000	1.21
@@ -160,9 +160,6 @@
 - Re-sync with latest version from JPP.
 - Partially adopt new naming convention.
 
-* Thu Jul 20 2006 Vivek Lakshmanan <vivekl at redhat.com> - 1:0.10-0.k.5jpp_1fc
-- Re-sync with latest version from JPP.
-
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:0.10-0.k.5jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 02:39:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 22:39:54 -0400
Subject: rpms/jlex/devel jlex.spec,1.12,1.13
Message-ID: <200608050239.k752dsUV009014@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jlex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8964

Modified Files:
	jlex.spec 
Log Message:
- Re-sync with latest JPP version.
- Use new naming convention.




Index: jlex.spec
===================================================================
RCS file: /cvs/dist/rpms/jlex/devel/jlex.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jlex.spec	22 Jul 2006 08:43:51 -0000	1.12
+++ jlex.spec	5 Aug 2006 02:39:35 -0000	1.13
@@ -36,7 +36,7 @@
 
 Name:           jlex
 Version:        1.2.6
-Release:        4jpp_2fc
+Release:        5jpp.1
 Epoch:		0
 Summary:        A Lexical Analyzer Generator for Java
 License:        Free
@@ -62,7 +62,10 @@
 
 %package javadoc
 Group:          Development/Java
-Summary:        Javadoc for %{name}
+Summary:        Javadoc for %{name}.
+Requires(post):		%{__rm}
+Requires(post):		/bin/ln
+Requires(postun):	%{__rm}
 
 %description javadoc
 Javadoc for %{name}.
@@ -93,6 +96,15 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -119,9 +131,14 @@
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Aug 04 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.2.6-5jpp.1
+- Re-sync with latest JPP version.
+- Use new naming convention.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.6-4jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 02:51:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 4 Aug 2006 22:51:24 -0400
Subject: rpms/jlex/devel jlex.spec,1.13,1.14
Message-ID: <200608050251.k752pOct027979@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jlex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27644

Modified Files:
	jlex.spec 
Log Message:
- Create symlink in install section for javadoc.




Index: jlex.spec
===================================================================
RCS file: /cvs/dist/rpms/jlex/devel/jlex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jlex.spec	5 Aug 2006 02:39:35 -0000	1.13
+++ jlex.spec	5 Aug 2006 02:51:22 -0000	1.14
@@ -88,6 +88,7 @@
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm



From fedora-cvs-commits at redhat.com  Sat Aug  5 12:19:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 08:19:34 -0400
Subject: rpms/planner/devel planner.spec,1.27,1.28
Message-ID: <200608051219.k75CJYNO022738@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/planner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22701

Modified Files:
	planner.spec 
Log Message:
bump for eds


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/planner.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- planner.spec	12 Jul 2006 07:49:56 -0000	1.27
+++ planner.spec	5 Aug 2006 12:19:31 -0000	1.28
@@ -8,7 +8,7 @@
 Summary:   A graphical project management tool.
 Name:      planner
 Version:   0.14
-Release:   1.1
+Release:   2
 URL:       http://planner.imendio.org
 License:   GPL
 Group:     Applications/Productivity
@@ -210,6 +210,9 @@
 # Changelog
 ##################################
 %changelog
+* Sat Aug 05 2006 Caolan McNamara <caolanm at redhat.com> - 0.14-2
+- rebuild against eds
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.14-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 12:21:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 08:21:33 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.114,
	1.115 openoffice.org.spec, 1.820, 1.821 sources, 1.187, 1.188
Message-ID: <200608051221.k75CLXet023519@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
create a table of the langpacks so I can easily manage them


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- .cvsignore	27 Jun 2006 14:32:17 -0000	1.114
+++ .cvsignore	5 Aug 2006 12:21:30 -0000	1.115
@@ -178,3 +178,4 @@
 OOC680_m5.tar.bz2
 OOC680_m6.tar.bz2
 OOC680_m7.tar.bz2
+openoffice.org.langpack.template.tar.gz


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.820
retrieving revision 1.821
diff -u -r1.820 -r1.821
--- openoffice.org.spec	3 Aug 2006 10:48:44 -0000	1.820
+++ openoffice.org.spec	5 Aug 2006 12:21:30 -0000	1.821
@@ -46,6 +46,7 @@
 Source10:       AutoSaveRecovery.xcu
 Source11:       AutoSaveCommon.xcu
 Source12:       ooo64726.sdf
+Source13:       openoffice.org.langpack.template.tar.gz
 BuildRequires:	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
 BuildRequires:	autoconf, make >= 3.79.1, flex, bison, perl-Compress-Zlib
 BuildRequires:	gcc, gcc-c++ >= 4.1.1, binutils, gcc-java >= 4.1.1 
@@ -57,9 +58,9 @@
 BuildRequires:	libICE-devel, evolution-data-server-devel, libxslt-devel,
 BuildRequires:	desktop-file-utils >= 0.9, libxslt-devel, unixODBC-devel
 BuildRequires:  db4-devel, db4-java >= 4.3.28-3, firefox-devel, agg-devel
-BuildRequires:  libwpd-devel >= 0.8.0, xmlsec1-nss-devel >= 1.2.8-2, icu >= 3.6
+BuildRequires:  libwpd-devel >= 0.8.0, xmlsec1-nss-devel >= 1.2.8-2, icu >= 3.4
 BuildRequires:	hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
-BuildRequires:	libicu-devel >= 3.6, ant, perl-Archive-Zip
+BuildRequires:	libicu-devel >= 3.4, ant, perl-Archive-Zip
 
 Patch0:  openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
 Patch1:  openoffice.org-1.9.114.rh161886.rpath.desktop.patch
@@ -1166,6 +1167,66 @@
 done
 popd
 
+#auto generate the langpack file lists
+langpackdetails=\
+(\
+af	help	*af_ZA*	western		ar	nohelp	nodict	ctl	\
+bg	help	*bg_BG*	western 	bn	help	nodict	western	\
+ca	help	*ca_ES*	western 	cs	help	*cs_CZ*	western	\
+cy	help	*cy_GB*	western 	da	help	*da_DK*	western	\
+de	help	*de_*	western 	el	help 	*el_GR*	western	\
+es	help	*es_*	western 	et	help	nodict	western	\
+eu	nohelp	nodict	western 	fi	help	*fi_*	western	\
+fr	help	*fr_*	western 	ga	nohelp	*ga_IE*	western	\
+gl	nohelp	*gl_ES*	western 	gu-IN	nohelp	nodict	ctl	\
+pa-IN	nohelp	nodict	ctl 		he	nohelp	*he_IL*	ctl	\
+hi-IN	help	nodict	ctl 		hu	help	*hu_HU*	western	\
+hr	help	*hr_HR*	western 	it	help	*it_IT*	western	\
+ja	help	nodict	cjk 		ko	help	nodict	cjk	\
+lt	help	*lt_LT*	western 	ms	nohelp	*ms_MY*	western	\
+nb	help	*nb_NO*	western 	nl	help	*nl_*	western	\
+nn	help	*nn_NO*	western 	pl	help	*pl_PL*	western	\
+pt	nohelp	*pt_PT*	western 	pt-BR	help	*pt_BR*	western	\
+ru	help	*ru_RU*	western 	sk	help	*sk_SK*	western	\
+sl	help	*sl_SI*	western 	sr-CS	help	nodict	western	\
+sv	help	*sv_SE*	western 	ta-IN	nohelp	nodict	ctl	\
+th	help	*th_TH*	ctl 		tr	help	nodict	western	\
+zh-CN	help	nodict	cjk 		zh-TW	help	nodict	cjk	\
+zu	help	*zu_ZA*	western 	tn	help	nodict	western	\
+ts	help	nodict	western 	as-IN	nohelp	nodict	western	\
+mr-IN	nohelp	nodict	western		ml-IN	nohelp	nodict	western	\
+or-IN	nohelp	nodict	western		te-IN	nohelp	nodict	western	\
+ur-IN	nohelp	nodict	western		kn-IN	nohelp	nodict	western	\
+xh	help	nodict	western		ve	nohelp	nodict	western \
+st	help	nodict	western		ss	nohelp	nodict	western \
+nr	help	nodict	western		ns	help	nodict	western	\
+)
+tar xzf %{SOURCE13}
+i=0
+while [ $i -lt ${#langpackdetails[@]} ]; do
+   lang=${langpackdetails[$i]}
+   sed -e "s/LANG/$lang/g" openoffice.org.langpack-common.template > $lang.filelist
+   i=$[i+1]
+   help=${langpackdetails[$i]}
+   if [ "$help" = "help" ]; then
+     sed -e "s/LANG/$lang/g" openoffice.org.langpack-help.template >> $lang.filelist
+   fi
+   i=$[i+1]
+   dict=${langpackdetails[$i]}
+   if [ ! "$dict" = "nodict" ]; then
+     sed -e "s/DICTPATTERN/$dict/g" openoffice.org.langpack-dict.template >> $lang.filelist
+   fi
+   i=$[i+1]
+   type=${langpackdetails[$i]}
+   if [ "$type" = "ctl" ]; then
+     sed -e "s/LANG/$lang/g" openoffice.org.langpack-ctl.template >> $lang.filelist
+   fi
+   if [ "$type" = "cjk" ]; then
+     sed -e "s/LANG/$lang/g" openoffice.org.langpack-cjk.template >> $lang.filelist
+   fi
+   i=$[i+1]
+done
+
 #add in some templates
 tar xzf %{SOURCE7} -C $RPM_BUILD_ROOT/%{instdir}/share
 tar xzf %{SOURCE8} -C $RPM_BUILD_ROOT/%{instdir}/share
@@ -1307,1332 +1368,69 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{langpacks}
-
-%files langpack-af_ZA
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/af
-%dir %{instdir}/program
-%dir %{instdir}/program/resource
-%{instdir}/program/resource/*680af.res
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*af_ZA*
-%dir %{instdir}/share
-%dir %{instdir}/share/readme
-%{instdir}/share/readme/LICENSE_af*
-%{instdir}/share/readme/README_af*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/af
-%dir %{instdir}/share/template
-%{instdir}/share/template/af
-%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-af.xcu
-
-%files langpack-ar
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/program
-%dir %{instdir}/program/resource
-%{instdir}/program/resource/*680ar.res
-%dir %{instdir}/share
-%{instdir}/share/readme/LICENSE_ar*
-%{instdir}/share/readme/README_ar*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ar
-%dir %{instdir}/share/template
-%{instdir}/share/template/ar
-%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-ar.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ar.xcu
-
-%files langpack-bg_BG
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/help/bg
-%{instdir}/program/resource/*680bg.res
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*bg_BG*
-%{instdir}/share/readme/LICENSE_bg*
-%{instdir}/share/readme/README_bg*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/bg
-%dir %{instdir}/share/template
-%{instdir}/share/template/bg
-%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-bg.xcu
-
-%files langpack-bn
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/bn
-%dir %{instdir}/share
-%{instdir}/program/resource/*680bn.res
-%{instdir}/share/readme/LICENSE_bn*
-%{instdir}/share/readme/README_bn*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/bn
-%dir %{instdir}/share/template
-%{instdir}/share/template/bn
-%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-bn.xcu
-
-%files langpack-ca_ES
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/ca
-%dir %{instdir}/share
-%{instdir}/program/resource/*680ca.res
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*ca_ES*
-%{instdir}/share/readme/LICENSE_ca*
-%{instdir}/share/readme/README_ca*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ca
-%dir %{instdir}/share/template
-%{instdir}/share/template/ca
-%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-ca.xcu
-
-%files langpack-cs_CZ
-%defattr(-,root,root)
-%dir %{instdir}
-%{instdir}/help/cs
-%dir %{instdir}/share
-%{instdir}/program/resource/*680cs.res
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*cs_CZ*
-%{instdir}/share/readme/LICENSE_cs*
-%{instdir}/share/readme/README_cs*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/cs
-%dir %{instdir}/share/template
-%{instdir}/share/template/cs
-%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-cs.xcu
-
-%files langpack-cy_GB
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/cy
-%dir %{instdir}/share
-%{instdir}/program/resource/*680cy.res
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*cy_GB*
-%{instdir}/share/readme/LICENSE_cy*
-%{instdir}/share/readme/README_cy*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/cy
-%dir %{instdir}/share/template
-%{instdir}/share/template/cy
-%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-cy.xcu
-
-%files langpack-da_DK
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/da
-%{instdir}/program/resource/*680da.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*da_DK*
-%{instdir}/share/readme/LICENSE_da*
-%{instdir}/share/readme/README_da*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/da
-%dir %{instdir}/share/template
-%{instdir}/share/template/da
-%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-da.xcu
-
-%files langpack-de
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/de
-%{instdir}/program/resource/*680de.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*de_*
+%files langpack-af_ZA 	-f af.filelist
+%files langpack-ar  	-f ar.filelist
+%files langpack-bg_BG 	-f bg.filelist
+%files langpack-bn  	-f bn.filelist
+%files langpack-ca_ES 	-f ca.filelist
+%files langpack-cs_CZ 	-f cs.filelist
+%files langpack-cy_GB 	-f cy.filelist
+%files langpack-da_DK 	-f da.filelist
+%files langpack-de 	-f de.filelist
 %{instdir}/share/dict/ooo/INSTALL_de.txt
-%{instdir}/share/readme/LICENSE_de*
-%{instdir}/share/readme/README_de*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/de
-%dir %{instdir}/share/template
-%{instdir}/share/template/de
-%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-de.xcu
-
-%files langpack-el_GR
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/el
-%{instdir}/program/resource/*680el.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*el_GR*
-%{instdir}/share/readme/LICENSE_el*
-%{instdir}/share/readme/README_el*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/el
-%dir %{instdir}/share/template
-%{instdir}/share/template/el
-%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-el.xcu
-
-%files langpack-es
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/es
-%{instdir}/program/resource/*680es.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*es_*
+%files langpack-el_GR 	-f el.filelist
+%files langpack-es	-f es.filelist
 %{instdir}/share/dict/ooo/README-COMO-HYPH_ES.txt
-%{instdir}/share/readme/LICENSE_es*
-%{instdir}/share/readme/README_es*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/es
-%dir %{instdir}/share/template
-%{instdir}/share/template/es
-%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-es.xcu
-
-
-%files langpack-et_EE
-%defattr(-,root,root)
-%dir %{instdir}
-%{instdir}/help/et
-%dir %{instdir}/share
-%{instdir}/program/resource/*680et.res
-%{instdir}/share/readme/LICENSE_et*
-%{instdir}/share/readme/README_et*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/et
-%dir %{instdir}/share/template
-%{instdir}/share/template/et
-%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-et.xcu
-
-%files langpack-eu_ES
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/program/resource/*680eu.res
-%{instdir}/share/readme/LICENSE_eu*
-%{instdir}/share/readme/README_eu*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/eu
-%dir %{instdir}/share/template
-%{instdir}/share/template/eu
-%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-eu.xcu
-
-%files langpack-fi_FI
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/fi
-%{instdir}/program/resource/*680fi.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*fi_*
-%{instdir}/share/readme/LICENSE_fi*
-%{instdir}/share/readme/README_fi*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/fi
-%dir %{instdir}/share/template
-%{instdir}/share/template/fi
-%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-fi.xcu
-
-%files langpack-fr
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/fr
-%{instdir}/program/resource/*680fr.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*fr_*
-%{instdir}/share/readme/LICENSE_fr*
-%{instdir}/share/readme/README_fr*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/fr
-%dir %{instdir}/share/template
-%{instdir}/share/template/fr
-%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-fr.xcu
-
-%files langpack-ga_IE
-%defattr(-,root,root)
-%dir %{instdir}
-%{instdir}/program/resource/*680ga.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*ga_IE*
-%{instdir}/share/readme/LICENSE_ga*
-%{instdir}/share/readme/README_ga*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ga
-%dir %{instdir}/share/template
-%{instdir}/share/template/ga
-%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-ga.xcu
-
-%files langpack-gl_ES
-%defattr(-,root,root)
-%dir %{instdir}
-%{instdir}/program/resource/*680gl.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*gl_ES*
-%{instdir}/share/readme/LICENSE_gl*
-%{instdir}/share/readme/README_gl*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/gl
-%dir %{instdir}/share/template
-%{instdir}/share/template/gl
-%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-gl.xcu
-
-%files langpack-gu_IN
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/program/resource/*680gu-IN.res
-%{instdir}/share/readme/LICENSE_gu-IN*
-%{instdir}/share/readme/README_gu-IN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/gu-IN
-%dir %{instdir}/share/template
-%{instdir}/share/template/gu-IN
-%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-gu-IN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_gu-IN.xcu
-
-%files langpack-pa_IN
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/program/resource/*680pa-IN.res
-%{instdir}/share/readme/LICENSE_pa-IN*
-%{instdir}/share/readme/README_pa-IN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/pa-IN
-%dir %{instdir}/share/template
-%{instdir}/share/template/pa-IN
-%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-pa-IN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_pa-IN.xcu
-
-%files langpack-he_IL
-%defattr(-,root,root)
-%dir %{instdir}
-%{instdir}/program/resource/*680he.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*he_IL*
-%{instdir}/share/readme/LICENSE_he*
-%{instdir}/share/readme/README_he*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/he
-%dir %{instdir}/share/template
-%{instdir}/share/template/he
-%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-he.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_he.xcu
-
-%files langpack-hi_IN
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/hi-IN
-%dir %{instdir}/share
-%{instdir}/program/resource/*680hi-IN.res
-%{instdir}/share/readme/LICENSE_hi-IN*
-%{instdir}/share/readme/README_hi-IN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/hi-IN
-%dir %{instdir}/share/template
-%{instdir}/share/template/hi-IN
-%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-hi-IN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_hi-IN.xcu
-
-%files langpack-hu_HU
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/hu
-%{instdir}/program/resource/*680hu.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*hu_HU*
-%{instdir}/share/readme/LICENSE_hu*
-%{instdir}/share/readme/README_hu*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/hu
-%dir %{instdir}/share/template
-%{instdir}/share/template/hu
-%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-hu.xcu
-
-%files langpack-hr_HR
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/hr
-%{instdir}/program/resource/*680hr.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*hr_HR*
-%{instdir}/share/readme/LICENSE_hr*
-%{instdir}/share/readme/README_hr*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/hr
-%dir %{instdir}/share/template
-%{instdir}/share/template/hr
-%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-hr.xcu
-
-%files langpack-it
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/it
-%{instdir}/program/resource/*680it.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*it_IT*
-%{instdir}/share/readme/LICENSE_it*
-%{instdir}/share/readme/README_it*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/it
-%dir %{instdir}/share/template
-%{instdir}/share/template/it
-%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-it.xcu
-
-%files langpack-ja_JP
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/ja
-%{instdir}/program/resource/*680ja.res
-%dir %{instdir}/share
-%{instdir}/share/readme/LICENSE_ja*
-%{instdir}/share/readme/README_ja*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ja
-%dir %{instdir}/share/template
-%{instdir}/share/template/ja
-%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-ja.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_ja.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ja.xcu
-
-%files langpack-ko_KR
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/ko
-%dir %{instdir}/share
-%{instdir}/program/resource/*680ko.res
-%{instdir}/share/readme/LICENSE_ko*
-%{instdir}/share/readme/README_ko*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ko
-%dir %{instdir}/share/template
-%{instdir}/share/template/ko
-%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-ko.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_ko.xcu
+%files langpack-et_EE 	-f et.filelist
+%files langpack-eu_ES 	-f eu.filelist
+%files langpack-fi_FI 	-f fi.filelist
+%files langpack-fr 	-f fr.filelist
+%files langpack-ga_IE 	-f ga.filelist
+%files langpack-gl_ES	-f gl.filelist
+%files langpack-gu_IN	-f gu-IN.filelist
+%files langpack-pa_IN	-f pa-IN.filelist
+%files langpack-he_IL	-f he.filelist
+%files langpack-hi_IN	-f hi-IN.filelist
+%files langpack-hu_HU	-f hu.filelist
+%files langpack-hr_HR	-f hr.filelist
+%files langpack-it	-f it.filelist
+%files langpack-ja_JP 	-f ja.filelist
+%files langpack-ko_KR	-f ko.filelist
 %{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-korea.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ko.xcu
-
-%files langpack-lt_LT
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/lt
-%{instdir}/program/resource/*680lt.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*lt_LT*
-%{instdir}/share/readme/LICENSE_lt*
-%{instdir}/share/readme/README_lt*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/lt
-%dir %{instdir}/share/template
-%{instdir}/share/template/lt
-%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-lt.xcu
-
-%files langpack-ms_MY
-%defattr(-,root,root)
-%dir %{instdir}
-%{instdir}/program/resource/*680ms.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*ms_MY*
-%{instdir}/share/readme/LICENSE_ms*
-%{instdir}/share/readme/README_ms*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ms
-%dir %{instdir}/share/template
-%{instdir}/share/template/ms
-%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-ms.xcu
-
-%files langpack-nb_NO
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/nb
-%{instdir}/program/resource/*680nb.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*nb_NO*
-%{instdir}/share/readme/LICENSE_nb*
-%{instdir}/share/readme/README_nb*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/nb
-%dir %{instdir}/share/template
-%{instdir}/share/template/nb
-%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-nb.xcu
-
-%files langpack-nl
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/nl
-%{instdir}/program/resource/*680nl.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*nl_*
-%{instdir}/share/readme/LICENSE_nl*
-%{instdir}/share/readme/README_nl*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/nl
-%dir %{instdir}/share/template
-%{instdir}/share/template/nl
-%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-nl.xcu
-
-%files langpack-nn_NO
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/nn
-%{instdir}/program/resource/*680nn.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*nn_NO*
-%{instdir}/share/readme/LICENSE_nn*
-%{instdir}/share/readme/README_nn*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/nn
-%dir %{instdir}/share/template
-%{instdir}/share/template/nn
-%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-nn.xcu
-
-%files langpack-pl_PL
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/pl
-%{instdir}/program/resource/*680pl.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*pl_PL*
-%{instdir}/share/readme/LICENSE_pl*
-%{instdir}/share/readme/README_pl*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/pl
-%dir %{instdir}/share/template
-%{instdir}/share/template/pl
-%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-pl.xcu
-
-%files langpack-pt_PT
-%defattr(-,root,root)
-%dir %{instdir}
-%{instdir}/program/resource/*680pt.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*pt_PT*
-%{instdir}/share/readme/LICENSE_pt
-%{instdir}/share/readme/LICENSE_pt.html
-%{instdir}/share/readme/README_pt
-%{instdir}/share/readme/README_pt.html
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/pt
-%dir %{instdir}/share/template
-%{instdir}/share/template/pt
-%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-pt.xcu
-
-%files langpack-pt_BR
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/pt-BR
-%{instdir}/program/resource/*680pt-BR.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*pt_BR*
-%{instdir}/share/readme/LICENSE_pt-BR*
-%{instdir}/share/readme/README_pt-BR*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/pt-BR
-%dir %{instdir}/share/template
-%{instdir}/share/template/pt-BR
-%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-pt-BR.xcu
-
-%files langpack-ru
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/ru
-%{instdir}/program/resource/*680ru.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*ru_RU*
-%{instdir}/share/readme/LICENSE_ru*
-%{instdir}/share/readme/README_ru*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ru
-%dir %{instdir}/share/template
-%{instdir}/share/template/ru
-%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-ru.xcu
-
-%files langpack-sk_SK
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/sk
-%{instdir}/program/resource/*680sk.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*sk_SK*
-%{instdir}/share/readme/LICENSE_sk*
-%{instdir}/share/readme/README_sk*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/sk
-%dir %{instdir}/share/template
-%{instdir}/share/template/sk
-%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-sk.xcu
-
-%files langpack-sl_SI
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/sl
-%{instdir}/program/resource/*680sl.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*sl_SI*
-%{instdir}/share/readme/LICENSE_sl*
-%{instdir}/share/readme/README_sl*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/sl
-%dir %{instdir}/share/template
-%{instdir}/share/template/sl
-%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-sl.xcu
-
-%files langpack-sr_CS
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/sr-CS
-%{instdir}/program/resource/*680sr-CS.res
-%dir %{instdir}/share
-%{instdir}/share/readme/LICENSE_sr-CS*
-%{instdir}/share/readme/README_sr-CS*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/sr-CS
-%dir %{instdir}/share/template
-%{instdir}/share/template/sr-CS
-%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-sr-CS.xcu
-
-%files langpack-sv
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/sv
-%{instdir}/program/resource/*680sv.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*sv_SE*
-%{instdir}/share/readme/LICENSE_sv*
-%{instdir}/share/readme/README_sv*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/sv
-%dir %{instdir}/share/template
-%{instdir}/share/template/sv
-%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-sv.xcu
-
-%files langpack-ta_IN
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/program/resource/*680ta-IN.res
-%{instdir}/share/readme/LICENSE_ta-IN*
-%{instdir}/share/readme/README_ta-IN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ta-IN
-%dir %{instdir}/share/template
-%{instdir}/share/template/ta-IN
-%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-ta-IN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ta-IN.xcu
-
-%files langpack-th_TH
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/th
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*th_TH*
-%{instdir}/program/resource/*680th.res
-%{instdir}/share/readme/LICENSE_th*
-%{instdir}/share/readme/README_th*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/th
-%dir %{instdir}/share/template
-%{instdir}/share/template/th
-%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-th.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_th.xcu
-
-%files langpack-tr_TR
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/tr
-%dir %{instdir}/share
-%{instdir}/program/resource/*680tr.res
-%{instdir}/share/readme/LICENSE_tr*
-%{instdir}/share/readme/README_tr*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/tr
-%dir %{instdir}/share/template
-%{instdir}/share/template/tr
-%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-tr.xcu
-
-%files langpack-zh_CN
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/zh-CN
-%dir %{instdir}/share
-%{instdir}/program/resource/*680zh-CN.res
-%{instdir}/share/readme/LICENSE_zh-CN*
-%{instdir}/share/readme/README_zh-CN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/zh-CN
-%dir %{instdir}/share/template
-%{instdir}/share/template/zh-CN
-%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-zh-CN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_zh-CN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-CN.xcu
-
-%files langpack-zh_TW
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/zh-TW
-%dir %{instdir}/share
-%{instdir}/program/resource/*680zh-TW.res
-%{instdir}/share/readme/LICENSE_zh-TW*
-%{instdir}/share/readme/README_zh-TW*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/zh-TW
-%dir %{instdir}/share/template
-%{instdir}/share/template/zh-TW
-%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-zh-TW.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_zh-TW.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-TW.xcu
-
-%files langpack-zu_ZA
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/zu
-%{instdir}/program/resource/*680zu.res
-%dir %{instdir}/share
-%dir %{instdir}/share/dict
-%dir %{instdir}/share/dict/ooo
-%{instdir}/share/dict/ooo/*zu_ZA*
-%{instdir}/share/readme/LICENSE_zu*
-%{instdir}/share/readme/README_zu*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/zu
-%dir %{instdir}/share/template
-%{instdir}/share/template/zu
-%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-zu.xcu
-
-%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
-
-%files langpack-nr_ZA
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/nr
-%{instdir}/program/resource/*680nr.res
-%dir %{instdir}/share
-%{instdir}/share/readme/LICENSE_nr*
-%{instdir}/share/readme/README_nr*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/nr
-%dir %{instdir}/share/template
-%{instdir}/share/template/nr
-%dir %{instdir}/share/registry/modules
-%dir %{instdir}/share/registry/modules/org
-%dir %{instdir}/share/registry/modules/org/openoffice
-%dir %{instdir}/share/registry/modules/org/openoffice/Setup
-%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-nr.xcu
-
-%files langpack-ss_ZA
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/program
-%dir %{instdir}/program/resource
-%{instdir}/program/resource/*680ss.res
-%dir %{instdir}/share
-%{instdir}/share/readme/LICENSE_ss*
-%{instdir}/share/readme/README_ss*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ss
-%dir %{instdir}/share/template
-%{instdir}/share/template/ss
-%dir %{instdir}/share/registry/modules
-%dir %{instdir}/share/registry/modules/org
-%dir %{instdir}/share/registry/modules/org/openoffice
-%dir %{instdir}/share/registry/modules/org/openoffice/Setup
-%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ss.xcu
-
-%files langpack-st_ZA
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/st
-%{instdir}/program/resource/*680st.res
-%dir %{instdir}/share
-%{instdir}/share/readme/LICENSE_st*
-%{instdir}/share/readme/README_st*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/st
-%dir %{instdir}/share/template
-%{instdir}/share/template/st
-%dir %{instdir}/share/registry/modules
-%dir %{instdir}/share/registry/modules/org
-%dir %{instdir}/share/registry/modules/org/openoffice
-%dir %{instdir}/share/registry/modules/org/openoffice/Setup
-%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-st.xcu
-
-%files langpack-ve_ZA
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/program
-%dir %{instdir}/program/resource
-%{instdir}/program/resource/*680ve.res
-%dir %{instdir}/share
-%{instdir}/share/readme/LICENSE_ve*
-%{instdir}/share/readme/README_ve*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ve
-%dir %{instdir}/share/template
-%{instdir}/share/template/ve
-%dir %{instdir}/share/registry/modules
-%dir %{instdir}/share/registry/modules/org
-%dir %{instdir}/share/registry/modules/org/openoffice
-%dir %{instdir}/share/registry/modules/org/openoffice/Setup
-%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ve.xcu
-
-%files langpack-xh_ZA
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/xh
-%{instdir}/program/resource/*680xh.res
-%dir %{instdir}/share
-%{instdir}/share/readme/LICENSE_xh*
-%{instdir}/share/readme/README_xh*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/xh
-%dir %{instdir}/share/template
-%{instdir}/share/template/xh
-%dir %{instdir}/share/registry/modules
-%dir %{instdir}/share/registry/modules/org
-%dir %{instdir}/share/registry/modules/org/openoffice
-%dir %{instdir}/share/registry/modules/org/openoffice/Setup
-%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-xh.xcu
-
-%files langpack-as_IN
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/program/resource/*680as-IN.res
-%{instdir}/share/readme/LICENSE_as-IN*
-%{instdir}/share/readme/README_as-IN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/as-IN
-%dir %{instdir}/share/template
-%{instdir}/share/template/as-IN
-%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-as-IN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_as-IN.xcu
-
-%files langpack-mr_IN
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/program/resource/*680mr-IN.res
-%{instdir}/share/readme/LICENSE_mr-IN*
-%{instdir}/share/readme/README_mr-IN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/mr-IN
-%dir %{instdir}/share/template
-%{instdir}/share/template/mr-IN
-%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-mr-IN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_mr-IN.xcu
-
-%files langpack-ml_IN
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/program/resource/*680ml-IN.res
-%{instdir}/share/readme/LICENSE_ml-IN*
-%{instdir}/share/readme/README_ml-IN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ml-IN
-%dir %{instdir}/share/template
-%{instdir}/share/template/ml-IN
-%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-ml-IN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ml-IN.xcu
-
-%files langpack-or_IN
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/program/resource/*680or-IN.res
-%{instdir}/share/readme/LICENSE_or-IN*
-%{instdir}/share/readme/README_or-IN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/or-IN
-%dir %{instdir}/share/template
-%{instdir}/share/template/or-IN
-%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-or-IN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_or-IN.xcu
-
-%files langpack-te_IN
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/program/resource/*680te-IN.res
-%{instdir}/share/readme/LICENSE_te-IN*
-%{instdir}/share/readme/README_te-IN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/te-IN
-%dir %{instdir}/share/template
-%{instdir}/share/template/te-IN
-%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-te-IN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_te-IN.xcu
-
-%files langpack-ur
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/program/resource/*680ur-IN.res
-%{instdir}/share/readme/LICENSE_ur-IN*
-%{instdir}/share/readme/README_ur-IN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/ur-IN
-%dir %{instdir}/share/template
-%{instdir}/share/template/ur-IN
-%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-ur-IN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ur-IN.xcu
-
-%files langpack-kn_IN
-%defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/share
-%{instdir}/program/resource/*680kn-IN.res
-%{instdir}/share/readme/LICENSE_kn-IN*
-%{instdir}/share/readme/README_kn-IN*
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/res
-%{instdir}/share/registry/res/kn-IN
-%dir %{instdir}/share/template
-%{instdir}/share/template/kn-IN
-%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-kn-IN.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_kn-IN.xcu
-
+%files langpack-lt_LT	-f lt.filelist
+%files langpack-ms_MY	-f ms.filelist
+%files langpack-nb_NO	-f nb.filelist
+%files langpack-nl	-f nl.filelist
+%files langpack-nn_NO	-f nn.filelist
+%files langpack-pl_PL	-f pl.filelist
+%files langpack-pt_PT	-f pt.filelist
+%files langpack-pt_BR	-f pt-BR.filelist
+%files langpack-ru	-f ru.filelist
+%files langpack-sk_SK	-f sk.filelist
+%files langpack-sl_SI	-f sl.filelist
+%files langpack-sr_CS	-f sr-CS.filelist
+%files langpack-sv	-f sv.filelist
+%files langpack-ta_IN	-f ta-IN.filelist
+%files langpack-th_TH	-f th.filelist
+%files langpack-tr_TR	-f tr.filelist
+%files langpack-zh_CN	-f zh-CN.filelist
+%files langpack-zh_TW	-f zh-TW.filelist
+%files langpack-zu_ZA	-f zu.filelist
+%files langpack-tn_ZA	-f tn.filelist
+%files langpack-ts_ZA	-f ts.filelist
+%files langpack-nso_ZA	-f ns.filelist
+%files langpack-nr_ZA	-f nr.filelist
+%files langpack-ss_ZA	-f ss.filelist
+%files langpack-st_ZA	-f st.filelist
+%files langpack-ve_ZA	-f ve.filelist
+%files langpack-xh_ZA	-f xh.filelist
+%files langpack-as_IN	-f as-IN.filelist
+%files langpack-mr_IN	-f mr-IN.filelist
+%files langpack-ml_IN	-f ml-IN.filelist
+%files langpack-or_IN	-f or-IN.filelist
+%files langpack-te_IN	-f te-IN.filelist
+%files langpack-ur	-f ur-IN.filelist
+%files langpack-kn_IN	-f kn-IN.filelist
 %endif
 
 %files core


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- sources	28 Jul 2006 16:11:27 -0000	1.187
+++ sources	5 Aug 2006 12:21:30 -0000	1.188
@@ -11,3 +11,4 @@
 2618cff7bfdf0a9ca30233e349df73c6  openoffice.org-myspell-contrib.tar.gz
 156fca901e2850226f16dd5034b6c941  openoffice.org-simple-crash_report.sh
 927a894d9bb8b8753c8e536ce8a671ab  OOC680_m7.tar.bz2
+0ee333127e54353d49bf30aa112faee4  openoffice.org.langpack.template.tar.gz



From fedora-cvs-commits at redhat.com  Sat Aug  5 12:22:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 08:22:24 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.821,1.822
Message-ID: <200608051222.k75CMOUe023869@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
bump for new sinhala supporting icu


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.821
retrieving revision 1.822
diff -u -r1.821 -r1.822
--- openoffice.org.spec	5 Aug 2006 12:21:30 -0000	1.821
+++ openoffice.org.spec	5 Aug 2006 12:22:22 -0000	1.822
@@ -58,9 +58,9 @@
 BuildRequires:	libICE-devel, evolution-data-server-devel, libxslt-devel,
 BuildRequires:	desktop-file-utils >= 0.9, libxslt-devel, unixODBC-devel
 BuildRequires:  db4-devel, db4-java >= 4.3.28-3, firefox-devel, agg-devel
-BuildRequires:  libwpd-devel >= 0.8.0, xmlsec1-nss-devel >= 1.2.8-2, icu >= 3.4
+BuildRequires:  libwpd-devel >= 0.8.0, xmlsec1-nss-devel >= 1.2.8-2, icu >= 3.6
 BuildRequires:	hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
-BuildRequires:	libicu-devel >= 3.4, ant, perl-Archive-Zip
+BuildRequires:	libicu-devel >= 3.6, ant, perl-Archive-Zip
 
 Patch0:  openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
 Patch1:  openoffice.org-1.9.114.rh161886.rpath.desktop.patch



From fedora-cvs-commits at redhat.com  Sat Aug  5 12:28:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 08:28:07 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.822,1.823
Message-ID: <200608051228.k75CS6Fp026050@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
catalog what's already upstreamed into workspaces


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.822
retrieving revision 1.823
diff -u -r1.822 -r1.823
--- openoffice.org.spec	5 Aug 2006 12:22:22 -0000	1.822
+++ openoffice.org.spec	5 Aug 2006 12:28:04 -0000	1.823
@@ -2526,20 +2526,22 @@
 	perfectly functional input method surrounding text implementation
 	based on the ATK bridge
 - rh#200805# replace ooo58663 missing glyph patch -> workspace.icuupgrade
-- replace ooo#66510# recentlyused fix -> workspace.kendy10
-- replace ooo#66067# embeddedobj crash -> workspace.fwk40
-- replace ooo#65519# samba printing ->> workspace.fwk40
-- replace ooo#59997# defaultbullets -> workspace.opensymbol01
-- replace ooo#65081# switch layout -> workspace.os84
-- replace ooo#65308# notes paste -> workspace.impress96
-- replace ooo#19976# nofocussteal -> workspace.inplaceobjects
-- replace ooo#65318# agg24 -> workspace.thbpp4.patch
-- replace ooo#65767# menu key -> workspace.vcl60.patch
-- replace ooo#66851# x86_64 i18npool ->> workspace.sixtyfour06
-- replace ooo#67656# tabdialogs minimize -> workspace.vcl63
-- replace ooo#67750# dont expand title -> workspace.pb17
-- replace ooo#67750# dont expand title ->> workspace.pb17
 - rh#201143# more Indian langpacks
+- rh#201305# digital signature compile flags mismatch
+- 2.0.4+ accepted
+	+ ooo#66510# recentlyused fix -> workspace.kendy10
+	+ ooo#66067# embeddedobj crash -> workspace.fwk40
+	+ ooo#65519# samba printing ->> workspace.fwk40
+	+ ooo#59997# defaultbullets -> workspace.opensymbol01
+	+ ooo#65081# switch layout -> workspace.os84
+	+ ooo#65308# notes paste -> workspace.impress96
+	+ ooo#19976# nofocussteal -> workspace.inplaceobjects
+	+ ooo#65318# agg24 -> workspace.thbpp4.patch
+	+ ooo#65767# menu key -> workspace.vcl60.patch
+	+ ooo#66851# x86_64 i18npool ->> workspace.sixtyfour06
+	+ ooo#67656# tabdialogs minimize -> workspace.vcl63
+	+ ooo#67750# dont expand title -> workspace.pb17
+	+ ooo#67750# dont expand title ->> workspace.pb17
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch



From fedora-cvs-commits at redhat.com  Sat Aug  5 13:05:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 09:05:58 -0400
Subject: rpms/gnome-panel/devel
	gnome-panel-2.15.90-move-suspend-to-menu.patch, 1.1,
	1.2 gnome-panel.spec, 1.137, 1.138
Message-ID: <200608051305.k75D5wnB025370@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	gnome-panel-2.15.90-move-suspend-to-menu.patch 
	gnome-panel.spec 
Log Message:
fix patch

gnome-panel-2.15.90-move-suspend-to-menu.patch:
 panel-action-button.c |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++
 panel-enums.h         |    1 
 panel-menu-items.c    |   23 +++++++++++++++++++++-
 3 files changed, 75 insertions(+), 1 deletion(-)

Index: gnome-panel-2.15.90-move-suspend-to-menu.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.15.90-move-suspend-to-menu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-panel-2.15.90-move-suspend-to-menu.patch	4 Aug 2006 18:40:04 -0000	1.1
+++ gnome-panel-2.15.90-move-suspend-to-menu.patch	5 Aug 2006 13:05:55 -0000	1.2
@@ -57,16 +57,6 @@
  	/* compatibility with GNOME < 2.13.90 */
          PANEL_ACTION_SCREENSHOT,
          PANEL_ACTION_LAST
---- gnome-panel-2.15.90/gnome-panel/panel-typebuiltins.c.move-suspend-to-menu	2006-08-04 14:02:40.000000000 -0400
-+++ gnome-panel-2.15.90/gnome-panel/panel-typebuiltins.c	2006-08-04 14:33:43.000000000 -0400
-@@ -154,6 +154,7 @@ static const GEnumValue _panel_action_bu
-   { PANEL_ACTION_FORCE_QUIT, "PANEL_ACTION_FORCE_QUIT", "force-quit" },
-   { PANEL_ACTION_CONNECT_SERVER, "PANEL_ACTION_CONNECT_SERVER", "connect-server" },
-   { PANEL_ACTION_SHUTDOWN, "PANEL_ACTION_SHUTDOWN", "shutdown" },
-+  { PANEL_ACTION_SUSPEND, "PANEL_ACTION_SUSPEND", "suspend" },
-   { PANEL_ACTION_SCREENSHOT, "PANEL_ACTION_SCREENSHOT", "screenshot" },
-   { PANEL_ACTION_LAST, "PANEL_ACTION_LAST", "last" },
-   { 0, NULL, NULL }
 --- gnome-panel-2.15.90/gnome-panel/panel-action-button.c.move-suspend-to-menu	2006-02-12 07:36:56.000000000 -0500
 +++ gnome-panel-2.15.90/gnome-panel/panel-action-button.c	2006-08-04 14:33:32.000000000 -0400
 @@ -47,10 +47,16 @@


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gnome-panel.spec	4 Aug 2006 18:40:05 -0000	1.137
+++ gnome-panel.spec	5 Aug 2006 13:05:55 -0000	1.138
@@ -231,6 +231,7 @@
 %changelog
 * Fri Aug  4 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-2
 - move suspend to menu again
+- remove autogenerated panel-typebuiltins.c from move-suspend-to-menu (caolanm)
 
 * Fri Aug  4 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-1
 - update to 2.15.90



From fedora-cvs-commits at redhat.com  Sat Aug  5 15:19:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 11:19:44 -0400
Subject: rpms/shadow-utils/devel .cvsignore, 1.14, 1.15 shadow-utils.spec,
	1.80, 1.81 sources, 1.14, 1.15 shadow-4.0.15-login.defs, 1.2, NONE
Message-ID: <200608051519.k75FJix0018688@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	.cvsignore shadow-utils.spec sources 
Removed Files:
	shadow-4.0.15-login.defs 
Log Message:
fix userdel, it didn't delete user's group (#201379)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Jul 2006 11:48:22 -0000	1.14
+++ .cvsignore	5 Aug 2006 15:19:40 -0000	1.15
@@ -1,3 +1,4 @@
 shadow-4.0.16.tar.bz2
 shadow-4.0.16-nscd.c
 shadow-4.0.17.tar.bz2
+shadow-4.0.17-login.defs


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- shadow-utils.spec	4 Aug 2006 13:40:45 -0000	1.80
+++ shadow-utils.spec	5 Aug 2006 15:19:40 -0000	1.81
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.17
-Release: 3
+Release: 4
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -210,6 +210,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Sat Aug 09 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-4
+- fix userdel, it didn't delete user's group (#201379)
+
 * Fri Aug 08 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-3
 - fix UID/GID overflow in user* group* (#198920)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	17 Jul 2006 11:48:22 -0000	1.14
+++ sources	5 Aug 2006 15:19:40 -0000	1.15
@@ -1,2 +1,3 @@
 7ebc6a5cd0207246a6b2c9ebf9b30391  shadow-4.0.16-nscd.c
 bc5972a195290533b4c0576276056ed9  shadow-4.0.17.tar.bz2
+7edc1f4d9c1f734b7cb3fd40570e04db  shadow-4.0.17-login.defs


--- shadow-4.0.15-login.defs DELETED ---



From fedora-cvs-commits at redhat.com  Sat Aug  5 15:23:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 11:23:02 -0400
Subject: rpms/shadow-utils/devel shadow-4.0.17-login.defs,NONE,1.1
Message-ID: <200608051523.k75FN2ir030199@cvs.devel.redhat.com>

Author: pvrabec

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

Added Files:
	shadow-4.0.17-login.defs 
Log Message:
add shadow-4.0.17-login.defs



--- NEW FILE shadow-4.0.17-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 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

# This enables userdel to remove user groups if no members exist.
#
USERGROUPS_ENAB yes



From fedora-cvs-commits at redhat.com  Sat Aug  5 15:28:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 11:28:47 -0400
Subject: rpms/shadow-utils/devel shadow-utils.spec,1.81,1.82
Message-ID: <200608051528.k75FSlQR030256@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	shadow-utils.spec 
Log Message:
fix sources in spec file



Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- shadow-utils.spec	5 Aug 2006 15:19:40 -0000	1.81
+++ shadow-utils.spec	5 Aug 2006 15:28:45 -0000	1.82
@@ -9,7 +9,7 @@
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
-Source1: shadow-4.0.15-login.defs
+Source1: shadow-4.0.17-login.defs
 Source2: shadow-970616.useradd
 Source3: shadow-4.0.16-nscd.c
 Patch0: shadow-4.0.17-redhat.patch



From fedora-cvs-commits at redhat.com  Sat Aug  5 16:35:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 12:35:31 -0400
Subject: rpms/ekiga/devel ekiga.spec,1.21,1.22
Message-ID: <200608051635.k75GZVdD022050@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/ekiga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22023

Modified Files:
	ekiga.spec 
Log Message:
rebuild needed


Index: ekiga.spec
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ekiga.spec	1 Aug 2006 20:21:25 -0000	1.21
+++ ekiga.spec	5 Aug 2006 16:35:25 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
 Version: 2.0.2
-Release: 3
+Release: 4
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Sat Aug  5 2006 Caolan McNamara <caolanm at redhat.com> - 2.0.2-4
+- rebuild against new e-d-s
+
 * Tue Aug  1 2006 Daniel Veillard <veillard at redhat.com> - 2.0.2-3
 - rebuilt for #200960
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 16:37:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 12:37:17 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.57,1.58
Message-ID: <200608051637.k75GbHEq022493@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22456

Modified Files:
	bug-buddy.spec 
Log Message:
rebuild against new e-d-s


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- bug-buddy.spec	2 Aug 2006 23:48:12 -0000	1.57
+++ bug-buddy.spec	5 Aug 2006 16:37:14 -0000	1.58
@@ -5,7 +5,7 @@
 
 Name: bug-buddy
 Version: 2.15.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Summary: A bug reporting utility for GNOME.
 License: GPL
@@ -121,6 +121,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sat Aug  5 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.15.90-2.fc6
+- rebuild against new e-d-s
+
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-1.fc6
 - Update to 2.15.90
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 16:38:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 12:38:20 -0400
Subject: rpms/evolution/devel evolution.spec,1.175,1.176
Message-ID: <200608051638.k75GcKR7022909@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Log Message:
- Try it again.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- evolution.spec	5 Aug 2006 00:08:09 -0000	1.175
+++ evolution.spec	5 Aug 2006 16:38:17 -0000	1.176
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 2.7.90
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -633,7 +633,7 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
-* Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-5
+* Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-6
 - Update to 2.7.90
 - Require evolution-data-server-1.7.90.1.
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 16:39:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 12:39:31 -0400
Subject: rpms/control-center/devel control-center.spec,1.160,1.161
Message-ID: <200608051639.k75GdVA3023309@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23274

Modified Files:
	control-center.spec 
Log Message:
rebuild against new e-d-s


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- control-center.spec	4 Aug 2006 17:20:16 -0000	1.160
+++ control-center.spec	5 Aug 2006 16:39:28 -0000	1.161
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -249,6 +249,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Aug  5 2006 Caolan McNamara <caolanm at redhat.com> - 2.15.90-2.fc6
+- rebuild against new e-d-s
+
 * Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 16:43:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 12:43:14 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.68,1.69
Message-ID: <200608051643.k75GhE54024265@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	evolution-connector.spec 
Log Message:
rebuild against new e-d-s


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- evolution-connector.spec	12 Jul 2006 22:25:38 -0000	1.68
+++ evolution-connector.spec	5 Aug 2006 16:43:11 -0000	1.69
@@ -18,7 +18,7 @@
 
 Name: evolution-connector
 Version: 2.7.4
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -134,6 +134,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Sat Aug 05 2006 Caolan McNamara <caolanm at redhat.com> - 2.7.4-2
+- rebuild against new e-d-s
+
 * Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-1
 - Update to 2.7.4
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 16:46:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 12:46:57 -0400
Subject: rpms/evolution-connector/devel .cvsignore, 1.35,
	1.36 evolution-connector.spec, 1.69, 1.70 sources, 1.35,
	1.36 64bit-fix, 1.4, NONE regenerate-patch.sh, 1.15, NONE
Message-ID: <200608051646.k75GkvRk001717@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-connector.spec sources 
Removed Files:
	64bit-fix regenerate-patch.sh 
Log Message:
- Update to 2.7.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	12 Jul 2006 22:25:38 -0000	1.35
+++ .cvsignore	5 Aug 2006 16:46:54 -0000	1.36
@@ -1 +1 @@
-evolution-exchange-2.7.4.tar.bz2
+evolution-exchange-2.7.90.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- evolution-connector.spec	5 Aug 2006 16:43:11 -0000	1.69
+++ evolution-connector.spec	5 Aug 2006 16:46:54 -0000	1.70
@@ -1,7 +1,8 @@
-%define evolution_version 2.5.2
+%define evo_version 2.7.90
+%define eds_version 1.7.90
 %define libsoup_version 2.2.6.1
 
-%define eds_major 1.2
+%define eds_major 1.8
 %define evo_major 2.8
 
 # Make sure the evolution package is upgraded first, or else this variable
@@ -17,54 +18,49 @@
 ### Abstract ###
 
 Name: evolution-connector
-Version: 2.7.4
-Release: 2
+Version: 2.7.90
+Release: 1
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
 URL: http://www.gnome.org/projects/evolution/
 Source: evolution-exchange-%{version}.tar.bz2
-# 2.7.3 shipped without translations...
-#Source1: evolution-exchange-2.7.2.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
+### Patches ###
+
+Patch100: ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch
+Patch101: evolution-exchange-2.5.3-fix-marshaller.patch
+
+# Gnome.org bug #349949
+Patch102: evolution-exchange-2.5.91-fix-missing-declarations-2.5.91.patch
+
+# Remove gnome-common macros from configure.in.
+# We do not ship gnome-common (or at least we're not supposed to).
+Patch103: evolution-exchange-2.7.2-no_gnome_common.patch
+
 ### Dependencies ###
 
-Requires: evolution >= %{evolution_version}
+Requires: evolution >= %{evo_version}
 Requires: openldap
 Requires: libsoup >= %{libsoup_version}
 Requires: gnutls
 
 ### Build Dependencies ###
 
-# Require specific versions of GNU Autotools packages,
-# since we rerun them during the build phase.
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.9
-BuildRequires: intltool >= 0.35
-BuildRequires: libtool >= 1.5
+BuildRequires: evolution >= %{evo_version}
+BuildRequires: evolution-data-server-devel >= %{eds_version}
+BuildRequires: evolution-devel >= %{evo_version}
 BuildRequires: gettext
-
-BuildRequires: evolution >= %{evolution_version}
-BuildRequires: evolution-devel >= %{evolution_version}
-BuildRequires: evolution-data-server-devel
+BuildRequires: gnutls
+BuildRequires: gtk-doc
+BuildRequires: intltool >= 0.35
 BuildRequires: libsoup-devel >= %{libsoup_version}
-# This is a virtual provide supplied by a version of the openldap-devel package
-# which includes the necessary stuff in %%{_libdir}/evolution-openldap.
+BuildRequires: libtool >= 1.5
 BuildRequires: openldap-evolution-devel
-BuildRequires: gnutls
 BuildRequires: openssl-devel
-BuildRequires: gtk-doc
-
-### Patches ###
-
-Patch100: ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch
-Patch101: evolution-exchange-2.5.3-fix-marshaller.patch
-Patch102: evolution-exchange-2.5.91-fix-missing-declarations-2.5.91.patch
-
-# Remove gnome-common macros from configure.in.
-# We do not ship gnome-common (or at least we're not supposed to).
-Patch103: evolution-exchange-2.7.2-no_gnome_common.patch
 
 %description
 The connector enables added functionality to Evolution when used with a 
@@ -73,10 +69,6 @@
 %prep
 %setup -q -n evolution-exchange-%{version}
 
-# 2.7.3 shipped without translations
-#tar xjf %{SOURCE1}
-#cp -f evolution-exchange-2.7.2/po/* po
-
 %patch100 -p1 -b .64bit-fix-acinclude.m4
 %patch101 -p1 -b .fix-marshaller
 %patch102 -p1 -b .fix-missing-declarations-2.5.91
@@ -134,6 +126,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Sat Aug  5 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-1
+- Update to 2.7.90
+
 * Sat Aug 05 2006 Caolan McNamara <caolanm at redhat.com> - 2.7.4-2
 - rebuild against new e-d-s
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	12 Jul 2006 22:25:38 -0000	1.35
+++ sources	5 Aug 2006 16:46:54 -0000	1.36
@@ -1 +1 @@
-cf94c6e264fc857afdb205c6f4f5a86e  evolution-exchange-2.7.4.tar.bz2
+8057d7e9fd6c9bd39cca2e96e35ac20a  evolution-exchange-2.7.90.tar.bz2


--- 64bit-fix DELETED ---


--- regenerate-patch.sh DELETED ---



From fedora-cvs-commits at redhat.com  Sat Aug  5 16:47:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 12:47:09 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.18,1.19
Message-ID: <200608051647.k75Gl9gD003048@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2495

Modified Files:
	nautilus-sendto.spec 
Log Message:
rebuild against new e-d-s


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nautilus-sendto.spec	12 Jul 2006 07:26:11 -0000	1.18
+++ nautilus-sendto.spec	5 Aug 2006 16:47:06 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.7
-Release: 	1.1
+Release: 	2
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -81,7 +81,10 @@
 %endif
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Sat Aug 05 2006 Caolan McNamara <caolanm at redhat.com> - 0.7-2
+- rebuild against new e-d-s
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7-1.1
 - rebuild
 
 * Tue Jul 11 2006 Matthias Clasen  <mclasen at redhat.com> - 0.7-1



From fedora-cvs-commits at redhat.com  Sat Aug  5 16:49:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 12:49:50 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.161,1.162
Message-ID: <200608051649.k75GnoC2009070@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	gnome-applets.spec 
Log Message:
rebuild against new gucharmap


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gnome-applets.spec	4 Aug 2006 05:34:54 -0000	1.161
+++ gnome-applets.spec	5 Aug 2006 16:49:47 -0000	1.162
@@ -30,7 +30,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.2
-Release:  	2%{?dist}
+Release:  	3%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -255,6 +255,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sat Aug  5 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.15.2-3.fc6
+- rebuild against new gucharmap
+
 * Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.2-2.fc6
 - Fix the multiload schema
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 16:54:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 12:54:20 -0400
Subject: rpms/evolution-sharp/devel evolution-sharp-0.11.1-evo28.patch, 1.2,
	1.3 evolution-sharp.spec, 1.20, 1.21
Message-ID: <200608051654.k75GsKbH010794@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-sharp-0.11.1-evo28.patch evolution-sharp.spec 
Log Message:
- Rebuild for evolution-data-server-1.7.90
- Update required sonames from e-d-s.


evolution-sharp-0.11.1-evo28.patch:
 configure.in |   10 ++++++++++
 1 files changed, 10 insertions(+)

Index: evolution-sharp-0.11.1-evo28.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp-0.11.1-evo28.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-sharp-0.11.1-evo28.patch	21 Jun 2006 18:26:47 -0000	1.2
+++ evolution-sharp-0.11.1-evo28.patch	5 Aug 2006 16:54:17 -0000	1.3
@@ -14,8 +14,8 @@
  
 +if test "x$edsver" = "x1.8"; then
 +	EDS_VERSION=-1.2
-+	EDS_SOVERSION=7
-+	EBOOK_SOVERSION=5  # Not sure if this is correct
++	EDS_SOVERSION=8
++	EBOOK_SOVERSION=9
 +	ECAL_SOVERSION=6
 +fi
 +


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- evolution-sharp.spec	12 Jul 2006 05:47:02 -0000	1.20
+++ evolution-sharp.spec	5 Aug 2006 16:54:17 -0000	1.21
@@ -2,12 +2,12 @@
 
 Name:           evolution-sharp
 Version:        0.11.1
-Release:        5.1
+Release:        6
 License:        LGPL
 Group:          System Environment/Libraries
 Summary:        Evolution Data Server Mono Bindings
 URL:            http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/0.10/
-Source:         evolution-sharp-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 # Mono only availible on these:
@@ -69,6 +69,10 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Sat Aug  5 2006 Matthew Barnes <mbarnes at redhat.com> - 0.11.1-6
+- Rebuild for evolution-data-server-1.7.90
+- Update required sonames from e-d-s.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.11.1-5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 17:19:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 13:19:37 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.70,1.71
Message-ID: <200608051719.k75HJbHr000344@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	evolution-connector.spec 
Log Message:
trampling on eachother, oops


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- evolution-connector.spec	5 Aug 2006 16:46:54 -0000	1.70
+++ evolution-connector.spec	5 Aug 2006 17:19:35 -0000	1.71
@@ -129,9 +129,6 @@
 * Sat Aug  5 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-1
 - Update to 2.7.90
 
-* Sat Aug 05 2006 Caolan McNamara <caolanm at redhat.com> - 2.7.4-2
-- rebuild against new e-d-s
-
 * Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-1
 - Update to 2.7.4
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 17:21:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 13:21:20 -0400
Subject: rpms/control-center/devel control-center.spec,1.161,1.162
Message-ID: <200608051721.k75HLK9Q000997@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv957

Modified Files:
	control-center.spec 
Log Message:
revert


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- control-center.spec	5 Aug 2006 16:39:28 -0000	1.161
+++ control-center.spec	5 Aug 2006 17:21:18 -0000	1.162
@@ -249,9 +249,6 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Sat Aug  5 2006 Caolan McNamara <caolanm at redhat.com> - 2.15.90-2.fc6
-- rebuild against new e-d-s
-
 * Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 



From fedora-cvs-commits at redhat.com  Sat Aug  5 17:49:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 13:49:30 -0400
Subject: rpms/gaim/devel gaim.spec,1.133,1.134
Message-ID: <200608051749.k75HnUb8024601@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24552

Modified Files:
	gaim.spec 
Log Message:
bump for eds


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- gaim.spec	31 Jul 2006 16:06:23 -0000	1.133
+++ gaim.spec	5 Aug 2006 17:49:27 -0000	1.134
@@ -29,7 +29,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.10.%{betaver}%{?dist}
+Release:	0.11.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -297,7 +297,7 @@
 %{_libdir}/pkgconfig/gaim.pc
 
 %changelog
-* Mon Jul 31 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.10.beta3
+* Mon Jul 31 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.11.beta3
 - rebuild for new libebook
 
 * Tue Jul 25 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.9.beta3



From fedora-cvs-commits at redhat.com  Sun Aug  6 00:00:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 20:00:22 -0400
Subject: rpms/libsemanage/devel libsemanage.spec,1.99,1.100
Message-ID: <200608060000.k7600MQR004461@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libsemanage.spec 
Log Message:
* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.13-1
- Upgrade to latest from NSA
	* Merged netfilter contexts support from Chris PeBenito.



Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- libsemanage.spec	4 Aug 2006 22:56:25 -0000	1.99
+++ libsemanage.spec	6 Aug 2006 00:00:19 -0000	1.100
@@ -1,5 +1,5 @@
-%define libsepolver 1.12.19-1
-%define libselinuxver 1.30.19-1
+%define libsepolver 1.12.23-1
+%define libselinuxver 1.30.22-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.6.13



From fedora-cvs-commits at redhat.com  Sun Aug  6 00:03:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 20:03:45 -0400
Subject: rpms/audit/devel audit-setroubleshoot.patch, 1.4, 1.5 audit.spec,
	1.104, 1.105
Message-ID: <200608060003.k7603idb005117@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5076

Modified Files:
	audit-setroubleshoot.patch audit.spec 
Log Message:
* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-6
- Change audisp to use a named pipe


audit-setroubleshoot.patch:
 AuditMsg.py |   63 ++++++++++++++++++++++++-------
 audispd     |  121 +++++++++++++++++++++++++-----------------------------------
 2 files changed, 101 insertions(+), 83 deletions(-)

Index: audit-setroubleshoot.patch
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit-setroubleshoot.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- audit-setroubleshoot.patch	27 Jul 2006 20:56:59 -0000	1.4
+++ audit-setroubleshoot.patch	6 Aug 2006 00:03:41 -0000	1.5
@@ -1,6 +1,6 @@
 --- audit-1.2.5/audisp/audispd.setroubleshoot	2006-07-13 13:37:04.000000000 -0400
-+++ audit-1.2.5/audisp/audispd	2006-07-27 16:56:12.000000000 -0400
-@@ -1,22 +1,25 @@
++++ audit-1.2.5/audisp/audispd	2006-08-02 17:32:37.000000000 -0400
+@@ -1,76 +1,44 @@
  #! /usr/bin/env python
  import os, string, select, syslog
 -import audit, avc, traceback
@@ -8,85 +8,141 @@
  import AuditMsg
  import subprocess, signal
 -PLUGIN_DIRS = ['/etc/audisp.d', "/usr/lib/audit", "/usr/lib32/audit"]
-+PLUGIN_DIRS = ["/usr/lib/audit", "/usr/lib64/audit"]
  import glob
++from socket import *
  
  HUP=False
  def huphandler(signum, frame):
      global HUP
      HUP=True
-+
-+def childhandler(signum, frame):
-+    syslog.syslog("Child Died %d %d " % os.wait() )
-+    return
-     
- class Plugin:
-     def __init__(self, cmd):
-         self.cmd = cmd
-         self.sub_process = None
+-    
+-class Plugin:
+-    def __init__(self, cmd):
+-        self.cmd = cmd
+-        self.sub_process = None
 -        self.pid = None
 -        
-+
-     def run(self):
-         self.sub_process = subprocess.Popen(self.cmd, \
-             stdin=subprocess.PIPE, stdout=None, stderr=None, \
-@@ -27,6 +30,19 @@
-     def stop(self):
-         self.stdin.close()
- 
-+    def get_pid(self):
-+        if self.subprocess is None:
-+            return None
-+        return self.subprocess.pid
-+        
-+    def get_stdin(self):
-+        if self.subprocess is None:
-+            return None
-+        return self.subprocess.stdin
-+        
-+    pid   = property(get_pid)
-+    stdin = property(get_stdin)
-+        
+-    def run(self):
+-        self.sub_process = subprocess.Popen(self.cmd, \
+-            stdin=subprocess.PIPE, stdout=None, stderr=None, \
+-            close_fds=True, shell=True)
+-        self.stdin = self.sub_process.stdin
+-        self.pid = self.sub_process.pid
+-
+-    def stop(self):
+-        self.stdin.close()
+ 
  class audit_dispatcher:
-     def __init__(self):
+-    def __init__(self):
++    def __init__(self, server_address):
          self.data = []
-@@ -50,6 +66,8 @@
-                     self.plugins.append(p)
-                 except OSError, e:
-                     syslog.syslog("plugin %s failed to start: %s" % (plugin, e))
-+		except IOError,e:
-+                    syslog.syslog("plugin %s failed to start: IOError exception %s" % (plugin, e))
- 
-         for p in self.plugins:
-             if p.cmd not in new_plugins:
-@@ -68,9 +86,14 @@
+-        self.plugins = []
+-        self.load_plugins()
++        self.outList=[]
++        self.auSock=socket(AF_UNIX,SOCK_STREAM)
++        if os.path.exists(server_address):
++            os.remove(server_address)
++        self.auSock.bind(server_address)
++        self.auSock.listen(5)
++        self.inList=[0, self.auSock]
+         
+-    def plugin_exists(self, cmd):
+-        for p in self.plugins:
+-            if p.cmd == cmd:
+-                return True
+-        return False
+-        
+-    def load_plugins(self):
+-        new_plugins = self.get_plugins()
+-        for plugin in self.get_plugins():
+-            if not self.plugin_exists(plugin):
+-                syslog.syslog("Starting %s" %  plugin)
+-                p = Plugin(plugin)
+-                try:
+-                    p.run()
+-                    self.plugins.append(p)
+-                except OSError, e:
+-                    syslog.syslog("plugin %s failed to start: %s" % (plugin, e))
+-
+-        for p in self.plugins:
+-            if p.cmd not in new_plugins:
+-                p.stop()
+-                self.plugins.remove(p)
+-
+-    def get_plugins(self):
+-        plugins = []
+-        for dir in PLUGIN_DIRS:
+-            plugins.extend(glob.glob(os.path.join(dir, '*')))
+-        return plugins
+-
+     def add(self, msg):
+         self.data.append(msg)
+         
      def process(self):
          if len(self.data) > 0:
              msg=self.data.pop(0)
 -            for plugin in self.plugins:
 -#                syslog.syslog("sending plugin %s: '%s'" % (plugin.cmd, msg.get_body()))
 -                plugin.stdin.write(msg.binary())
-+            try:
-+                for plugin in self.plugins:
-+                    #syslog.syslog("sending plugin %s: '%s'" % (plugin.cmd, msg.get_body()))
-+                    plugin.stdin.write(msg.binary())
-+            except IOError,e:
-+                syslog.syslog("plugin %s failed: IOError exception %s" % (plugin.cmd, e))
-+                self.plugins.remove(plugin)
-+
++            for s in self.outList:
++                try:
++                    s.send(msg.binary())
++                except IOError,e:
++                    syslog.syslog("IOError exception %s" % (e))
++                    s.close()
++                    self.outList.remove(s)
++                except error,e:
++                    syslog.syslog("Socket error %s" % (e))
++                    s.close()
++                    self.outList.remove(s)
              return 0
          else:
              return 500
-@@ -86,6 +109,7 @@
-                     if not msg.read_from_fd(0):
-                         syslog.syslog("Connection closing")
-                         return
-+                    #syslog.syslog("Read Input: type=%d body='%s'" % (msg.get_msg_type(), msg.get_body()))
-                     self.add(msg)
-                     sleep=0
-                 else:
-@@ -98,22 +122,24 @@
-                         self.load_plugins()
+@@ -78,42 +46,55 @@
+     def run(self):
+         global HUP
+         sleep=500
+-        while 1:
++        while True:
+             try:
+-                input,output, err = select.select([0],[], [], sleep)
+-                if 0 in input:
+-                    msg = AuditMsg.AuditMsg()                    
+-                    if not msg.read_from_fd(0):
+-                        syslog.syslog("Connection closing")
+-                        return
+-                    self.add(msg)
+-                    sleep=0
+-                else:
+-                    sleep=self.process()
++                input,output, err = select.select(self.inList,[], self.outList, sleep)
++                for s in input:
++                    if s == 0:
++                        syslog.syslog("s == 0")
++                        msg = AuditMsg.AuditMsg()                    
++                        if not msg.read_from_fd(0):
++                            syslog.syslog("Connection closing")
++                            return
++                        self.add(msg)
++                        sleep=0
++
++                    if s == self.auSock:
++                        c,address=self.auSock.accept()
++                        self.outList.append(c)
++
++                for s in err:
++                    syslog.syslog("s in err")
++                    if s in self.outList:
++                        s.close()
++                        self.outList.remove(s)
++
++                sleep=self.process()
+ 
+             except select.error, e:
+                 if e[0] == 4:
+                     if HUP:
+                         syslog.syslog("HUP signal")
+-                        self.load_plugins()
                          HUP=False
                  else:
 -                    syslog.syslog("select exception %s " % e.args)
@@ -97,13 +153,15 @@
 -                syslog.syslog("Type exception %s " % e.args)
 +                syslog.syslog("Type exception %s " % e)
                  syslog.syslog(traceback.format_exc())
- 
+-
++                return
++                
  try:
      syslog.openlog("audispd")
      syslog.syslog("starting audispd")
      signal.signal(signal.SIGHUP, huphandler)
-+    signal.signal(signal.SIGCHLD, childhandler)
-     dispatcher=audit_dispatcher()
+-    dispatcher=audit_dispatcher()
++    dispatcher=audit_dispatcher("/var/run/auditd_sock")
      dispatcher.run()
  
  except IOError,e:
@@ -114,7 +172,7 @@
  except Exception, e:
      syslog.syslog("Unexpected exception %s " % e)
 --- audit-1.2.5/audisp/AuditMsg.py.setroubleshoot	2006-07-13 13:36:08.000000000 -0400
-+++ audit-1.2.5/audisp/AuditMsg.py	2006-07-21 09:08:55.000000000 -0400
++++ audit-1.2.5/audisp/AuditMsg.py	2006-08-02 17:30:27.000000000 -0400
 @@ -1,33 +1,55 @@
  import struct, os
 +


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- audit.spec	27 Jul 2006 21:34:08 -0000	1.104
+++ audit.spec	6 Aug 2006 00:03:41 -0000	1.105
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.5
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -168,6 +168,9 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-6
+- Change audisp to use a named pipe
+
 * Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-5
 - Fix dispatcher to handle sigchld
 - Fix library location for 64 bit



From fedora-cvs-commits at redhat.com  Sun Aug  6 00:18:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 20:18:23 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.116,
	1.117 policycoreutils-rhat.patch, 1.217,
	1.218 policycoreutils.spec, 1.299, 1.300 sources, 1.120, 1.121
Message-ID: <200608060018.k760INFc023958@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23874

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 1.30.25-1
- Update to upstream
	* Merged patch from Dan Walsh with:
	  * audit2allow: process MAC_POLICY_LOAD events
	  * newrole:  run shell with - prefix to start a login shell
	  * po:  po file updates
	  * restorecond:  bail if SELinux not enabled
	  * fixfiles: omit -q 
	  * genhomedircon:  fix exit code if non-root
	  * semodule_deps:  install man page
	* Merged secon Makefile fix from Joshua Brindle.
	* Merged netfilter contexts support patch from Chris PeBenito.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- .cvsignore	1 Aug 2006 13:56:38 -0000	1.116
+++ .cvsignore	6 Aug 2006 00:18:19 -0000	1.117
@@ -108,3 +108,4 @@
 policycoreutils-1.30.14.tgz
 policycoreutils-1.30.17.tgz
 policycoreutils-1.30.22.tgz
+policycoreutils-1.30.25.tgz

policycoreutils-rhat.patch:
 po/fr.po                     |   54 ++++++---
 po/sv.po                     |  252 +++++++++++++++++++++++++++----------------
 po/ta.po                     |   34 ++---
 restorecond/restorecond.c    |    7 +
 restorecond/restorecond.init |    2 
 scripts/fixfiles             |    2 
 scripts/genhomedircon        |    2 
 semodule_deps/Makefile       |    1 
 8 files changed, 225 insertions(+), 129 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- policycoreutils-rhat.patch	2 Aug 2006 20:53:36 -0000	1.217
+++ policycoreutils-rhat.patch	6 Aug 2006 00:18:19 -0000	1.218
@@ -1,60 +1,3 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.22/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow	2006-08-01 09:47:23.000000000 -0400
-+++ policycoreutils-1.30.22/audit2allow/audit2allow	2006-08-02 16:50:29.000000000 -0400
-@@ -176,7 +176,7 @@
- 			sys.exit(0)
- 
- 		if auditlogs and os.path.exists("/var/log/audit/audit.log"):
--			inputfd = os.popen("ausearch -m avc")
-+			inputfd = os.popen("ausearch -m avc,MAC_POLICY_LOAD")
- 			serules.load(inputfd)
- 
- 		if buildPP:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.22/audit2allow/avc.py
---- nsapolicycoreutils/audit2allow/avc.py	2006-07-03 07:52:43.000000000 -0400
-+++ policycoreutils-1.30.22/audit2allow/avc.py	2006-08-02 16:50:50.000000000 -0400
-@@ -352,6 +352,9 @@
-                             if i == "security_compute_sid:":
-                                 self.security_compute_sid(rec)
-                                 found = 1
-+                            elif i == "type=MAC_POLICY_LOAD" and self.last_reload:
-+                                self.initialize()
-+                                break
-                             else:
-                                 dict.append(i)
-                     if found:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.22/newrole/newrole.c
---- nsapolicycoreutils/newrole/newrole.c	2006-07-03 07:52:43.000000000 -0400
-+++ policycoreutils-1.30.22/newrole/newrole.c	2006-08-02 14:22:10.000000000 -0400
-@@ -47,6 +47,7 @@
-  *
-  *************************************************************************/
- 
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <stdlib.h>		/* for malloc(), realloc(), free() */
- #include <pwd.h>		/* for getpwuid() */
-@@ -855,7 +856,10 @@
- 
- 	if (optind < 1)
- 		optind = 1;
--	argv[optind - 1] = pw->pw_shell;
-+	if (asprintf(&argv[optind - 1], "-%s", pw->pw_shell) < 0) {
-+		fprintf(stderr, _("Error allocating shell.\n"));
-+	}
-+
- #ifdef CANTSPELLGDB
- 	{
- 		int i;
-@@ -897,7 +901,7 @@
- 	}
- #endif
- 	freecon(old_context);
--	execv(argv[optind - 1], argv + optind - 1);
-+	execv(pw->pw_shell, argv + optind - 1);
- 
- 	/* If we reach here, then we failed to exec the new shell. */
- 	perror(_("failed to exec shell\n"));
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fr.po policycoreutils-1.30.22/po/fr.po
 --- nsapolicycoreutils/po/fr.po	2006-08-01 09:47:27.000000000 -0400
 +++ policycoreutils-1.30.22/po/fr.po	2006-08-02 14:22:10.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- policycoreutils.spec	2 Aug 2006 20:53:36 -0000	1.299
+++ policycoreutils.spec	6 Aug 2006 00:18:20 -0000	1.300
@@ -1,15 +1,14 @@
 %define libauditver 1.1.4-3
-%define libsepolver 1.12.21-1
-%define libsemanagever 1.6.11-1
-%define libselinuxver 1.30.19-1
+%define libsepolver 1.12.23-1
+%define libsemanagever 1.6.13-1
+%define libselinuxver 1.30.22-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.30.22
-Release: 3
+Version: 1.30.25
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
-Patch: policycoreutils-rhat.patch
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel gettext
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
@@ -36,7 +35,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat 
 
 %build
 make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -119,6 +117,19 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 1.30.25-1
+- Update to upstream
+	* Merged patch from Dan Walsh with:
+	  * audit2allow: process MAC_POLICY_LOAD events
+	  * newrole:  run shell with - prefix to start a login shell
+	  * po:  po file updates
+	  * restorecond:  bail if SELinux not enabled
+	  * fixfiles: omit -q 
+	  * genhomedircon:  fix exit code if non-root
+	  * semodule_deps:  install man page
+	* Merged secon Makefile fix from Joshua Brindle.
+	* Merged netfilter contexts support patch from Chris PeBenito.
+
 * Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-3
 - Fix audit2allow to handle reload of policy
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- sources	1 Aug 2006 13:56:39 -0000	1.120
+++ sources	6 Aug 2006 00:18:20 -0000	1.121
@@ -1 +1 @@
-6f622e70c1f498c4b24c4f8c07ea3cb9  policycoreutils-1.30.22.tgz
+963bc94e0c1bbe0008e509135ec4fdf5  policycoreutils-1.30.25.tgz



From fedora-cvs-commits at redhat.com  Sun Aug  6 00:22:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 20:22:34 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.12, 1.13 setroubleshoot.init,
	1.3, 1.4 setroubleshoot.spec, 1.16, 1.17 sources, 1.14, 1.15
Message-ID: <200608060022.k760MYh8025584@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25537/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.17-1 on branch devel from setroubleshoot-0.17-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 Jul 2006 04:28:33 -0000	1.12
+++ .cvsignore	6 Aug 2006 00:22:32 -0000	1.13
@@ -1 +1 @@
-setroubleshoot-0.16.tar.gz
+setroubleshoot-0.17.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- setroubleshoot.init	27 Jul 2006 14:28:34 -0000	1.3
+++ setroubleshoot.init	6 Aug 2006 00:22:32 -0000	1.4
@@ -24,6 +24,10 @@
 # Source function library.
 . /etc/init.d/functions
 
+
+# Silently exit is SELinux is not enabled
+[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 0
+
 # Check that we are root ... so non-root users stop here
 test `id -u` = 0  || exit 4
 


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- setroubleshoot.spec	28 Jul 2006 04:28:33 -0000	1.16
+++ setroubleshoot.spec	6 Aug 2006 00:22:32 -0000	1.17
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.16
+Version: 0.17
 Release: 1
 License: GPL
 Group: Applications/System
@@ -24,7 +24,7 @@
 %define pkglogdir     %{_localstatedir}/log/%{name}
 %define auditlibdir   %{_libdir}/audit
 
-Requires: audit-libs-python
+Requires: audit-libs-python >= 1.2.5-6
 Requires: libselinux >= 1.30.15-1
 Requires: pygtk2 >= 2.9.2
 Requires: notify-python
@@ -94,6 +94,46 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+
+* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> - 0.17-1
+- John Dennis  <jdennis at redhat.com>
+
+	* add ability fo serialize to/from xml for classes which can
+	inititialized from strings and serialized as strings (e.g. numbers,
+	TimeStamps, etc.)
+	* add count of how many times a signature is reported, the date
+	when first and last reported, add columns for report count and
+	last date count to browser.
+	* checkpoint browser code, list pane and detail pane now working.
+	* add initial support for browser applet, move some functions which
+	kept getting reused to util.py
+	* add reporting of environment to email alert (email alerts still
+	need work)
+
+- Dan Walsh <dwalsh at redhat.com>
+
+	* Fix disable_trans.py set_boolean call
+	* Complete all boolean plugins except disable
+	* Change interface to use audit unix domain socket
+
+
+* Mon Jul 28 2006 Dan Walsh <dwalsh at redhat.com> - 0.16-1
+- John Dennis  <jdennis at redhat.com>
+	* modify SetFilter in server to return errors instead of
+	throwing an exception. Default the filter list on each alert display.
+	* minor tweaks to alert queue handling
+	* fix analyze() parameter list in ftp_is_daemon.py plugin
+	* sealert now responds to pending alerts more correctly, it shows
+	how many pending alerts are in the queue, if you filter the pending
+	alert status is updated, the next alert button will advance you
+	to the next alert in the queue
+	* simplify major pieces of sealert by coalescing common code
+	into subroutines.
+- Dan Walsh <dwalsh at redhat.com>
+	* Complete all boolean plugins except disable
+	* Make Close button work.
+	* Make setroubleshoot_dispatcher exit if it gets an avc about itself
+
 * Mon Jul 26 2006 Dan Walsh <dwalsh at redhat.com> - 0.15-1
 -  Karl MacMillan 
 	* Add generic templating mechanism to Plugin


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Jul 2006 04:28:33 -0000	1.14
+++ sources	6 Aug 2006 00:22:32 -0000	1.15
@@ -1 +1 @@
-a0fd9b48fb28c7ee9c841fe66abaabe2  setroubleshoot-0.16.tar.gz
+63837eef5bd2809e7151d89f74b0ec35  setroubleshoot-0.17.tar.gz



From fedora-cvs-commits at redhat.com  Sun Aug  6 00:34:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 20:34:40 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch,1.1,1.2
Message-ID: <200608060034.k760YelI029355@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060802.patch 
Log Message:
* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.4-1
- Update to the latest from upstream


policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   10 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/rpm.fc               |    2 
 modules/admin/usermanage.te        |    4 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    3 
 modules/kernel/devices.te          |    2 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 ++++++++++++
 modules/kernel/terminal.if         |   19 +++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cups.te           |    6 
 modules/services/dbus.if           |    5 
 modules/services/ldap.te           |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    4 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  102 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   25 +++-
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   51 +++++++-
 modules/services/xserver.te        |   14 +-
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/mount.te            |    2 
 modules/system/selinuxutil.te      |    6 
 modules/system/udev.fc             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  231 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   50 +++-----
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |   26 +++-
 57 files changed, 704 insertions(+), 164 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20060802.patch	4 Aug 2006 22:58:10 -0000	1.1
+++ policy-20060802.patch	6 Aug 2006 00:34:38 -0000	1.2
@@ -152,7 +152,7 @@
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.4/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/kernel/corenetwork.te.in	2006-08-04 18:56:39.000000000 -0400
++++ serefpolicy-2.3.4/policy/modules/kernel/corenetwork.te.in	2006-08-05 20:14:55.000000000 -0400
 @@ -73,6 +73,7 @@
  network_port(dhcpc, udp,68,s0)
  network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
@@ -166,7 +166,7 @@
  network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp,8009,s0)
  network_port(howl, tcp,5335,s0, udp,5353,s0)
 -network_port(hplip, tcp,50000,s0, tcp,50002,s0, tcp,1782,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0)
-+network_port(hplip, tcp,50000,s0, tcp,50002,s0, tcp,2208,s0 tcp,2207,s0 tcp,1782,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0)
++network_port(hplip, tcp,50000,s0, tcp,50002,s0, tcp,2208,s0, tcp,2207,s0, tcp,1782,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0)
  network_port(i18n_input, tcp,9010,s0)
  network_port(imaze, tcp,5323,s0, udp,5323,s0)
  network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
@@ -377,6 +377,17 @@
  
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.4/policy/modules/services/bind.te
+--- nsaserefpolicy/policy/modules/services/bind.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.4/policy/modules/services/bind.te	2006-08-05 06:30:41.000000000 -0400
+@@ -226,6 +226,7 @@
+ allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow ndc_t dnssec_t:file { getattr read };
++allow ndc_t dnssec_t:lnk_file { getattr read };
+ 
+ allow ndc_t named_t:tcp_socket { connectto recvfrom };
+ allow ndc_t named_t:unix_stream_socket connectto;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.4/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.4/policy/modules/services/bluetooth.te	2006-08-03 16:23:23.000000000 -0400



From fedora-cvs-commits at redhat.com  Sun Aug  6 02:44:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 22:44:01 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.71,1.72
Message-ID: <200608060244.k762i1XT012866@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-connector.spec 
Log Message:
- Fix eds_major (bumped it when I shouldn't have).



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- evolution-connector.spec	5 Aug 2006 17:19:35 -0000	1.71
+++ evolution-connector.spec	6 Aug 2006 02:43:58 -0000	1.72
@@ -2,7 +2,7 @@
 %define eds_version 1.7.90
 %define libsoup_version 2.2.6.1
 
-%define eds_major 1.8
+%define eds_major 1.2
 %define evo_major 2.8
 
 # Make sure the evolution package is upgraded first, or else this variable
@@ -19,7 +19,7 @@
 
 Name: evolution-connector
 Version: 2.7.90
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -126,6 +126,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Sat Aug  5 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-2
+- Fix eds_major (bumped it when I shouldn't have).
+
 * Sat Aug  5 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-1
 - Update to 2.7.90
 



From fedora-cvs-commits at redhat.com  Sun Aug  6 02:48:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 5 Aug 2006 22:48:45 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.72,1.73
Message-ID: <200608060248.k762mjUe029365@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-connector.spec 
Log Message:
- CVS collision, bumping release.



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- evolution-connector.spec	6 Aug 2006 02:43:58 -0000	1.72
+++ evolution-connector.spec	6 Aug 2006 02:48:42 -0000	1.73
@@ -19,7 +19,7 @@
 
 Name: evolution-connector
 Version: 2.7.90
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -126,7 +126,7 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
-* Sat Aug  5 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-2
+* Sat Aug  5 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-3
 - Fix eds_major (bumped it when I shouldn't have).
 
 * Sat Aug  5 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-1



From fedora-cvs-commits at redhat.com  Sun Aug  6 05:35:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 6 Aug 2006 01:35:44 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc3-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.508, 1.509 kernel-2.6.spec, 1.2527,
	1.2528 sources, 1.471, 1.472 upstream, 1.411,
	1.412 patch-2.6.18-rc3-git6.bz2.sign, 1.1, NONE
Message-ID: <200608060535.k765Zi3C000722@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc3-git7.bz2.sign 
Removed Files:
	patch-2.6.18-rc3-git6.bz2.sign 
Log Message:
git7


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

iD8DBQBE1EJryGugalF9Dw4RAjJIAJ4/zbY84r+aqi8s5qfezNyU+xQogQCeI3Jk
jHqLHvEHg1HjmujlfmlGXGg=
=JAZM
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -r1.508 -r1.509
--- .cvsignore	4 Aug 2006 20:48:12 -0000	1.508
+++ .cvsignore	6 Aug 2006 05:35:39 -0000	1.509
@@ -5,4 +5,4 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc3.bz2
 xen-10924.tar.bz2
-patch-2.6.18-rc3-git6.bz2
+patch-2.6.18-rc3-git7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2527
retrieving revision 1.2528
diff -u -r1.2527 -r1.2528
--- kernel-2.6.spec	4 Aug 2006 21:09:30 -0000	1.2527
+++ kernel-2.6.spec	6 Aug 2006 05:35:40 -0000	1.2528
@@ -264,7 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc3.bz2
-Patch2: patch-2.6.18-rc3-git6.bz2
+Patch2: patch-2.6.18-rc3-git7.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1693,6 +1693,9 @@
 %endif
 
 %changelog
+* Sun Aug  6 2006 Dave Jones <davej at redhat.com>
+- 2.6.18rc3-git7
+
 * Fri Aug  4 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3-git6
 - Return of signed modules.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -r1.471 -r1.472
--- sources	4 Aug 2006 20:48:13 -0000	1.471
+++ sources	6 Aug 2006 05:35:40 -0000	1.472
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 ba31b754aaf80aa388858f86c34c4d01  patch-2.6.18-rc3.bz2
 32a856cececcc35cb834cfaccc3c2523  xen-10924.tar.bz2
-0f5249b65cce6767af38d0d02efdb077  patch-2.6.18-rc3-git6.bz2
+6b6891209419b5db20b060a0cd6161b5  patch-2.6.18-rc3-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- upstream	4 Aug 2006 20:48:13 -0000	1.411
+++ upstream	6 Aug 2006 05:35:40 -0000	1.412
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc3.bz2
-patch-2.6.18-rc3-git6.bz2
+patch-2.6.18-rc3-git7.bz2


--- patch-2.6.18-rc3-git6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Aug  6 10:58:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 6 Aug 2006 06:58:34 -0400
Subject: rpms/cups/FC-5 cups-str1881.patch,NONE,1.1 cups.spec,1.202,1.203
Message-ID: <200608061058.k76AwYsI023791@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1881.patch 
Log Message:
* Sun Aug  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.5
- Apply patch from STR #1881 for remote IPP printing (bug #201167).


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

--- NEW FILE cups-str1881.patch ---
--- cups-1.2.2/scheduler/job.c.str1881	2006-08-06 11:56:07.000000000 +0100
+++ cups-1.2.2/scheduler/job.c	2006-08-06 11:56:29.000000000 +0100
@@ -3018,7 +3018,8 @@
   envp[envc ++] = device_uri;
   envp[envc ++] = printer_name;
 
-  if ((filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
+  if (!remote_job &&
+      (filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
   {
     snprintf(final_content_type, sizeof(final_content_type),
              "FINAL_CONTENT_TYPE=%s/%s",


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- cups.spec	2 Aug 2006 15:59:58 -0000	1.202
+++ cups.spec	6 Aug 2006 10:58:30 -0000	1.203
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 1.4
+Release: 1.5
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -24,6 +24,7 @@
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
+Patch4: cups-str1881.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
@@ -119,6 +120,7 @@
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
+%patch4 -p1 -b .str1881
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
@@ -402,6 +404,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sun Aug  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.5
+- Apply patch from STR #1881 for remote IPP printing (bug #201167).
+
 * Wed Aug  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.4
 - Use sigaction, not signal, to set the alarm handler in the snmp backend
   (bug #200205).



From fedora-cvs-commits at redhat.com  Sun Aug  6 11:04:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 6 Aug 2006 07:04:40 -0400
Subject: rpms/cups/devel cups-str1881.patch,NONE,1.1 cups.spec,1.241,1.242
Message-ID: <200608061104.k76B4emP024814@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1881.patch 
Log Message:
* Sun Aug  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-8
- Apply patch from STR #1881 for remote IPP printing (bug #201167).


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

--- NEW FILE cups-str1881.patch ---
--- cups-1.2.2/scheduler/job.c.str1881	2006-08-06 11:56:07.000000000 +0100
+++ cups-1.2.2/scheduler/job.c	2006-08-06 11:56:29.000000000 +0100
@@ -3018,7 +3018,8 @@
   envp[envc ++] = device_uri;
   envp[envc ++] = printer_name;
 
-  if ((filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
+  if (!remote_job &&
+      (filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
   {
     snprintf(final_content_type, sizeof(final_content_type),
              "FINAL_CONTENT_TYPE=%s/%s",


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- cups.spec	2 Aug 2006 15:27:44 -0000	1.241
+++ cups.spec	6 Aug 2006 11:04:17 -0000	1.242
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -40,6 +40,7 @@
 Patch15: cups-maxlogsize.patch
 Patch16: cups-pid.patch
 Patch17: cups-relro.patch
+Patch18: cups-str1881.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -139,6 +140,7 @@
 %patch15 -p1 -b .maxlogsize
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .relro
+%patch18 -p1 -b .str1881
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -415,6 +417,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sun Aug  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-8
+- Apply patch from STR #1881 for remote IPP printing (bug #201167).
+
 * Wed Aug  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-7
 - Updated LSPP patch from Matt Anderson.
 - Ship pstopdf filter for LSPP.



From fedora-cvs-commits at redhat.com  Sun Aug  6 18:21:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 6 Aug 2006 14:21:06 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2171,
	1.2172 linux-2.6-defaults-disable-split-ptlock.patch, 1.3, 1.4
Message-ID: <200608061821.k76IL6k2002526@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-defaults-disable-split-ptlock.patch 
Log Message:
Fix split lock patch for 64bit.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2171
retrieving revision 1.2172
diff -u -r1.2171 -r1.2172
--- kernel-2.6.spec	4 Aug 2006 06:26:16 -0000	1.2171
+++ kernel-2.6.spec	6 Aug 2006 18:21:03 -0000	1.2172
@@ -1543,6 +1543,9 @@
 %endif
 
 %changelog
+* Fri Aug  4 2006 Dave Jones <davej at redhat.com>
+- Fix split lock patch for 64bit.
+
 * Fri Aug  4 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2171_FC5]
 - 2.6.17.8rc1
 

linux-2.6-defaults-disable-split-ptlock.patch:
 Kconfig |    1 +
 1 files changed, 1 insertion(+)

Index: linux-2.6-defaults-disable-split-ptlock.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-defaults-disable-split-ptlock.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-defaults-disable-split-ptlock.patch	15 Jul 2006 21:42:26 -0000	1.3
+++ linux-2.6-defaults-disable-split-ptlock.patch	6 Aug 2006 18:21:03 -0000	1.4
@@ -1,12 +1,12 @@
 
 --- linux-2.6.17.noarch/mm/Kconfig~	2006-07-11 22:44:36.615338000 -0400
 +++ linux-2.6.17.noarch/mm/Kconfig	2006-07-11 22:44:41.992952000 -0400
-@@ -134,7 +134,7 @@ config SPLIT_PTLOCK_CPUS
+@@ -134,7 +134,8 @@ config SPLIT_PTLOCK_CPUS
  	default "4096" if ARM && !CPU_CACHE_VIPT
  	default "4096" if PARISC && !PA20
  	default "4096" if X86_XEN || X86_64_XEN
--	default "4"
 +	default "4096" if !64BIT
+ 	default "4"
  
  #
  # support for page migration



From fedora-cvs-commits at redhat.com  Mon Aug  7 02:54:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 6 Aug 2006 22:54:25 -0400
Subject: rpms/xorg-x11-drv-i810/FC-5 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-i810.spec, 1.10, 1.11
Message-ID: <200608070254.k772sPc5000624@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-i810/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv585/FC-5

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Log Message:
auto-import xorg-x11-drv-i810-1.5.1.0-1 on branch FC-5 from xorg-x11-drv-i810-1.5.1.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:34:13 -0000	1.6
+++ .cvsignore	7 Aug 2006 02:54:22 -0000	1.7
@@ -1 +1 @@
-xf86-video-i810-1.4.1.3.tar.bz2
+xf86-video-i810-1.5.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:34:14 -0000	1.6
+++ sources	7 Aug 2006 02:54:22 -0000	1.7
@@ -1 +1 @@
-aebee9cc7608b02962e01d12ffd764e2  xf86-video-i810-1.4.1.3.tar.bz2
+b8f757ad051b4ea91e145baabcba0c6d  xf86-video-i810-1.5.1.0.tar.bz2


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/FC-5/xorg-x11-drv-i810.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-i810.spec	7 Feb 2006 14:26:49 -0000	1.10
+++ xorg-x11-drv-i810.spec	7 Aug 2006 02:54:22 -0000	1.11
@@ -6,8 +6,8 @@
 
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
-Version:   1.4.1.3
-Release:   3.1
+Version:   1.5.1.0
+Release:   1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i810.xinf
@@ -74,6 +74,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Sun Aug  6 2006 Adam Jackson <ajackson at redhat.com> 1.5.1.0-1
+- Update to 1.5.1.0.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1.3-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 04:59:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 00:59:44 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-expire-multi-correction.patch,
	NONE, 1.1 autofs-5.0.1-rc1-multi-mount-expire-locking.patch,
	NONE, 1.1 autofs-5.0.1-rc1-release-notes-spelling.patch, NONE,
	1.1 autofs-5.0.1-rc1-remove-sigchld-handler.patch, NONE,
	1.1 autofs-5.0.1-rc1-sloppyopt-nfs.patch, NONE,
	1.1 autofs-5.0.1-rc1-verbose-messages.patch, NONE,
	1.1 autofs.spec, 1.139, 1.140
Message-ID: <200608070459.k774xiD9008490@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-expire-multi-correction.patch 
	autofs-5.0.1-rc1-multi-mount-expire-locking.patch 
	autofs-5.0.1-rc1-release-notes-spelling.patch 
	autofs-5.0.1-rc1-remove-sigchld-handler.patch 
	autofs-5.0.1-rc1-sloppyopt-nfs.patch 
	autofs-5.0.1-rc1-verbose-messages.patch 
Log Message:
* Thu Aug 7 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.14
- remove SIGCHLD handler because it is no longer needed and was causing expire problems.
- alter expire locking of multi-mounts to lock sub-tree instead of entire tree.
- review verbose message feedback and update.
- correction for expire of multi-mounts.
- spelling corrections to release notes (Jeff Moyer).
- add back sloppy mount option, removed for Connectathon testing.
- disable mtab locking again.


autofs-5.0.1-rc1-expire-multi-correction.patch:
 CHANGELOG          |    1 +
 daemon/automount.c |    6 ++++--
 lib/parse_subs.c   |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-expire-multi-correction.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 24dbe19..cd5b242 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@
 - alter expire locking of multi-mounts to lock sub-tree instead of
   entire tree.
 - review verbose message feedback and update.
+- correction for expire of multi-mounts.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 5e2b4c3..cc6e9e0 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -375,6 +375,7 @@ int umount_multi(struct autofs_point *ap
 	struct statfs fs;
 	int is_autofs_fs;
 	int ret, left;
+	unsigned int is_mm_root;
 
 	debug(ap->logopt, "path %s incl %d", path, incl);
 
@@ -404,6 +405,7 @@ int umount_multi(struct autofs_point *ap
 	cache_multi_lock(me->parent);
 
 	mc = me->source->mc;
+	is_mm_root = (me->multi == me);
 
 	left = 0;
 
@@ -414,7 +416,7 @@ int umount_multi(struct autofs_point *ap
 		if (ap->submount)
 			oap = ap->parent;
 
-		if (me == me->multi && !strchr(me->key, '/')) {
+		if (is_mm_root && !strchr(me->key, '/')) {
 			/* Indirect multi-mount root */
 			root = alloca(strlen(ap->path) + strlen(me->key) + 2);
 			strcpy(root, ap->path);
@@ -443,7 +445,7 @@ int umount_multi(struct autofs_point *ap
 	 * If this is the root of a multi-mount we've had to umount
 	 * it already to ensure it's ok to remove any offset triggers
 	 */
-	if (me != me->multi) {
+	if (!is_mm_root) {
 		msg("unmounting dir = %s", path);
 
 		if (umount_ent(ap, path)) {
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index 77651cf..68bdf8d 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -462,7 +462,7 @@ cont:
 		 * delete the offsets from the cache and we need to put
 		 * the offset triggers back.
 		 */
-		if (is_mounted(_PATH_MOUNTED, path, MNTS_REAL)) {
+		if (is_mounted(_PATH_MOUNTED, root, MNTS_REAL)) {
 			msg("unmounting dir = %s", root);
 			if (umount_ent(ap, root)) {
 				if (!mount_multi_triggers(ap, root, me, "/"))

autofs-5.0.1-rc1-multi-mount-expire-locking.patch:
 CHANGELOG           |    2 +
 autofs.spec         |    2 -
 daemon/automount.c  |   18 ++++++++--
 daemon/direct.c     |   21 ------------
 daemon/indirect.c   |   38 +++-------------------
 include/automount.h |   15 +++++---
 lib/cache.c         |   87 ++++++++++++++++++++++++++++++++++++++++++++--------
 lib/parse_subs.c    |    2 -
 modules/parse_sun.c |   55 ++++++++++++--------------------
 9 files changed, 128 insertions(+), 112 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-multi-mount-expire-locking.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 3e801e2..866ae0a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,8 @@
   patches.
 - tidy up directory cleanup and add validation check to rmdir_path.
 - remove SIGCHLD handler.
+- alter expire locking of multi-mounts to lock sub-tree instead of
+  entire tree.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/autofs.spec b/autofs.spec
index 7532b80..cc1ee93 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -59,7 +59,7 @@ inkludera n?tfilsystem, CD-ROM, floppydi
 echo %{version}-%{release} > .version
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --libdir=%{_libdir} --enable-ignore-busy
+CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --libdir=%{_libdir} --disable-mount-locking --enable-ignore-busy
 CFLAGS="$RPM_OPT_FLAGS -Wall" make initdir=/etc/rc.d/init.d DONTSTRIP=1
 
 %install
diff --git a/daemon/automount.c b/daemon/automount.c
index 5217347..5fba783 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -370,6 +370,7 @@ static void update_map_cache(struct auto
    it also tries to umount path itself */
 int umount_multi(struct autofs_point *ap, const char *path, int incl)
 {
+	struct mapent_cache *mc;
 	struct mapent *me;
 	struct statfs fs;
 	int is_autofs_fs;
@@ -400,16 +401,20 @@ int umount_multi(struct autofs_point *ap
 		}
 	}
 
+	cache_multi_lock(me->parent);
+
+	mc = me->source->mc;
+
 	left = 0;
 
-	if (me && me->multi) {
+	if (me->multi) {
 		struct autofs_point *oap = ap;
 		char *root, *base;
 
 		if (ap->submount)
 			oap = ap->parent;
 
-		 if (me == me->multi && !strchr(me->key, '/')) {
+		if (me == me->multi && !strchr(me->key, '/')) {
 			/* Indirect multi-mount root */
 			root = alloca(strlen(ap->path) + strlen(me->key) + 2);
 			strcpy(root, ap->path);
@@ -427,10 +432,12 @@ int umount_multi(struct autofs_point *ap
 			left++;
 		}
 	}
-	cache_unlock(me->source->mc);
 
-	if (left || is_autofs_fs)
+	if (left || is_autofs_fs) {
+		cache_multi_unlock(me->parent);
+		cache_unlock(mc);
 		return left;
+	}
 
 	/*
 	 * If this is the root of a multi-mount we've had to umount
@@ -451,6 +458,9 @@ int umount_multi(struct autofs_point *ap
 		check_rm_dirs(ap, path, incl);
 	}
 
+	cache_multi_unlock(me->parent);
+	cache_unlock(mc);
+
 	return left;
 }
 
diff --git a/daemon/direct.c b/daemon/direct.c
index e6c1f35..5a528fc 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -725,29 +725,10 @@ out_err:
 
 static int expire_direct(int ioctlfd, const char *path, unsigned int when, unsigned int logopt)
 {
-	char *estr, buf[MAX_ERR_BUF];
 	int ret, retries = EXPIRE_RETRIES;
 
 	while (retries--) {
 		struct timespec tm = {0, 100000000};
-		int busy = 0;
-
-		ret = ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &busy);
-		if (ret == -1) {
-			/* Mount has gone away */
-			if (errno == EBADF || errno == EINVAL)
-				return 1;
-
-			estr = strerror_r(errno, buf, MAX_ERR_BUF);
-			error(logopt, "ioctl failed: %s", estr);
-			return 0;
-		}
-
-		/* No need to go further */
-		if (busy)
-			return 0;
-
-		sched_yield();
 
 		/* Ggenerate expire message for the mount. */
 		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_DIRECT, &when);
@@ -756,7 +737,7 @@ static int expire_direct(int ioctlfd, co
 			if (errno == EBADF || errno == EINVAL)
 				return 1;
 
-			/* Need to wait for the kernel ? */
+			/* Other than need to wait for the kernel ? */
 			if (errno != EAGAIN)
 				return 0;
 		}
diff --git a/daemon/indirect.c b/daemon/indirect.c
index 970215c..766ec08 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -366,29 +366,10 @@ force_umount:
 
 static int expire_indirect(int ioctlfd, const char *path, unsigned int when, unsigned int count, unsigned int logopt)
 {
-	char *estr, buf[MAX_ERR_BUF];
 	int ret, retries = count;
 
 	while (retries--) {
 		struct timespec tm = {0, 100000000};
-		int busy = 0;
-
-		ret = ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &busy);
-		if (ret == -1) {
-			/* Mount has gone away */
-			if (errno == EBADF || errno == EINVAL)
-				return 1;
-
-			estr = strerror_r(errno, buf, MAX_ERR_BUF);
-			error(logopt, "ioctl failed: %s", estr);
-			return 0;
-		}
-
-		/* No need to go further */
-		if (busy)
-			return 0;
-
-		sched_yield();
 
 		/* Ggenerate expire message for the mount. */
 		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_DIRECT, &when);
@@ -397,7 +378,7 @@ static int expire_indirect(int ioctlfd, 
 			if (errno == EBADF || errno == EINVAL)
 				return 1;
 
-			/* Need to wait for the kernel ? */
+			/* Other than need to wait for the kernel ? */
 			if (errno != EAGAIN)
 				return 0;
 		}
@@ -480,11 +461,10 @@ void *expire_proc_indirect(void *arg)
 
 		if (*me->key == '/') {
 			ioctlfd = me->ioctlfd;
-			cache_unlock(me->source->mc);
 		} else {
 			ioctlfd = ap->ioctlfd;
-			cache_unlock(me->source->mc);
 		}
+		cache_unlock(me->source->mc);
 
 		debug(ap->logopt, "expire %s", next->path);
 
@@ -502,7 +482,7 @@ void *expire_proc_indirect(void *arg)
 	 * have some offset mounts with no '/' offset so we need to
 	 * umount them here.
 	 */
-	limit = count_mounts(ap, ap->path);
+	limit = count_mounts(ap, ap->path) * 2;
 	ret = expire_indirect(ap->ioctlfd, ap->path, now, limit, ap->logopt);
 	if (!ret) {
 		debug(ap->logopt,
@@ -525,28 +505,22 @@ void *expire_proc_indirect(void *arg)
 	}
 	free_mnt_list(mnts);
 
-	if (submnts) {
+	if (submnts)
 		debug(ap->logopt,
 		      "%d submounts remaining in %s", submnts, ap->path);
-		ea->status = 1;
-		pthread_exit(NULL);
-	}
 
 	/* 
 	 * EXPIRE_MULTI is synchronous, so we can be sure (famous last
 	 * words) the umounts are done by the time we reach here
 	 */
-	if (count) {
+	if (count)
 		debug(ap->logopt, "%d remaining in %s", count, ap->path);
-		ea->status = 1;
-		pthread_exit(NULL);
-	}
 
 	/* If we are trying to shutdown make sure we can umount */
 	if (!ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {
 		if (!ret) {
 			warn(ap->logopt, "mount still busy %s", ap->path);
-			ea->status = 1;
+			ea->status++;
 		}
 	}
 
diff --git a/include/automount.h b/include/automount.h
index 54a7180..90a9c7a 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -123,12 +123,11 @@ #define CHE_DUPLICATE	0x0020
 
 #define HASHSIZE		77
 #define NEGATIVE_TIMEOUT	10
-#define UMOUNT_RETRIES		25
-#define EXPIRE_RETRIES		15
+#define UMOUNT_RETRIES		50
+#define EXPIRE_RETRIES		25
 
 struct mapent_cache {
 	pthread_rwlock_t rwlock;
-	pthread_mutex_t multi_mutex;
 	unsigned int size;
 	struct list_head *ino_index;
 	struct mapent **hash;
@@ -137,11 +136,14 @@ struct mapent_cache {
 struct mapent {
 	struct mapent *next;
 	struct list_head ino_index;
+	pthread_mutex_t multi_mutex;
 	struct list_head multi_list;
 	/* Map source of the cache entry */
 	struct map_source *source;
-	/* Need to know owner if we're a multi mount */
+	/* Need to know owner if we're a multi-mount */
 	struct mapent *multi;
+	/* Parent nesting point within multi-mount */
+	struct mapent *parent;
 	char *key;
 	char *mapent;
 	time_t age;
@@ -173,11 +175,12 @@ struct mapent *cache_partial_match(struc
 int cache_add(struct mapent_cache *mc, struct map_source *source,
 			const char *key, const char *mapent, time_t age);
 int cache_add_offset(struct mapent_cache *mc, const char *mkey, const char *key, const char *mapent, time_t age);
+int cache_set_parents(struct mapent *mm);
 int cache_update(struct mapent_cache *mc, struct map_source *source,
 			const char *key, const char *mapent, time_t age);
 int cache_delete(struct mapent_cache *mc, const char *key);
-void cache_multi_lock(struct mapent_cache *mc);
-void cache_multi_unlock(struct mapent_cache *mc);
+void cache_multi_lock(struct mapent *me);
+void cache_multi_unlock(struct mapent *me);
 int cache_delete_offset_list(struct mapent_cache *mc, const char *key);
 void cache_release(struct map_source *map);
 struct mapent *cache_enumerate(struct mapent_cache *mc, struct mapent *me);
diff --git a/lib/cache.c b/lib/cache.c
index a047320..432270b 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -98,11 +98,14 @@ void cache_lock_cleanup(void *arg)
 	cache_unlock(mc);
 }
 
-void cache_multi_lock(struct mapent_cache *mc)
+void cache_multi_lock(struct mapent *me)
 {
 	int status;
 
-	status = pthread_mutex_lock(&mc->multi_mutex);
+	if (!me)
+		return;
+
+	status = pthread_mutex_lock(&me->multi_mutex);
 	if (status) {
 		error(LOGOPT_ANY, "mapent cache multi mutex lock failed");
 		fatal(status);
@@ -110,17 +113,21 @@ void cache_multi_lock(struct mapent_cach
 	return;
 }
 
-void cache_multi_unlock(struct mapent_cache *mc)
+void cache_multi_unlock(struct mapent *me)
 {
 	int status;
 
-	status = pthread_mutex_unlock(&mc->multi_mutex);
+	if (!me)
+		return;
+
+	status = pthread_mutex_unlock(&me->multi_mutex);
 	if (status) {
 		error(LOGOPT_ANY, "mapent cache multi mutex unlock failed");
 		fatal(status);
 	}
 	return;
 }
+
 struct mapent_cache *cache_init(struct map_source *map)
 {
 	struct mapent_cache *mc;
@@ -153,10 +160,6 @@ struct mapent_cache *cache_init(struct m
 	if (status)
 		fatal(status);
 
-	status = pthread_mutex_init(&mc->multi_mutex, NULL);
-	if (status)
-		fatal(status);
-
 	cache_writelock(mc);
 
 	for (i = 0; i < mc->size; i++) {
@@ -411,6 +414,7 @@ int cache_add(struct mapent_cache *mc, s
 	struct mapent *me, *existing = NULL;
 	char *pkey, *pent;
 	unsigned int hashval = hash(key);
+	int status;
 
 	me = (struct mapent *) malloc(sizeof(struct mapent));
 	if (!me)
@@ -440,10 +444,15 @@ int cache_add(struct mapent_cache *mc, s
 	INIT_LIST_HEAD(&me->ino_index);
 	INIT_LIST_HEAD(&me->multi_list);
 	me->multi = NULL;
+	me->parent = NULL;
 	me->ioctlfd = -1;
 	me->dev = (dev_t) -1;
 	me->ino = (ino_t) -1;
 
+	status = pthread_mutex_init(&me->multi_mutex, NULL);
+	if (status)
+		fatal(status);
+
 	/* 
 	 * We need to add to the end if values exist in order to
 	 * preserve the order in which the map was read on lookup.
@@ -526,6 +535,56 @@ done:
 	return ret; 
 }
 
+static struct mapent *get_parent(const char *key, struct list_head *head, struct list_head **pos)
+{
+	struct list_head *next;
+	struct mapent *this, *last;
+	int eq;
+
+	last = NULL;
+	next = *pos ? (*pos)->next : head->next;
+
+	list_for_each(next, head) {
+		this = list_entry(next, struct mapent, multi_list);
+
+		if (!strcmp(this->key, key))
+			break;
+
+		eq = strncmp(this->key, key, strlen(this->key));
+		if (eq == 0) {
+			*pos = next;
+			last = this;
+			continue;
+		}
+	}
+
+	return last;
+}
+
+int cache_set_parents(struct mapent *mm)
+{
+	struct list_head *multi_head, *p, *pos;
+	struct mapent *this;
+
+	if (!mm->multi)
+		return 0;
+
+	pos = NULL;
+	multi_head = &mm->multi->multi_list;
+
+	list_for_each(p, multi_head) {
+		struct mapent *parent;
+		this = list_entry(p, struct mapent, multi_list);
+		parent = get_parent(this->key, multi_head, &pos);
+		if (parent)
+			this->parent = parent;
+		else
+			this->parent = mm->multi;
+	}
+
+	return 1;
+}
+
 /* cache must be write locked by caller */
 int cache_update(struct mapent_cache *mc, struct map_source *source,
 		 const char *key, const char *mapent, time_t age)
@@ -568,7 +627,7 @@ int cache_delete(struct mapent_cache *mc
 {
 	struct mapent *me = NULL, *pred;
 	unsigned int hashval = hash(key);
-	int ret = CHE_OK;
+	int status, ret = CHE_OK;
 
 	me = mc->hash[hashval];
 	if (!me) {
@@ -585,6 +644,9 @@ int cache_delete(struct mapent_cache *mc
 				goto done;
 			}
 			pred->next = me->next;
+			status = pthread_mutex_destroy(&me->multi_mutex);
+			if (status)
+				fatal(status);
 			if (!list_empty(&me->ino_index))
 				list_del(&me->ino_index);
 			free(me->key);
@@ -605,6 +667,9 @@ int cache_delete(struct mapent_cache *mc
 			goto done;
 		}
 		mc->hash[hashval] = me->next;
+		status = pthread_mutex_destroy(&me->multi_mutex);
+		if (status)
+			fatal(status);
 		if (!list_empty(&me->ino_index))
 			list_del(&me->ino_index);
 		free(me->key);
@@ -713,10 +778,6 @@ void cache_release(struct map_source *ma
 	if (status)
 		fatal(status);
 
-	status = pthread_mutex_destroy(&mc->multi_mutex);
-	if (status)
-		fatal(status);
-
 	free(mc->hash);
 	free(mc->ino_index);
 	free(mc);
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index 6fb9895..a24e6da 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -472,9 +472,7 @@ cont:
 		}
 
 		/* We're done - clean out the offsets */
-		cache_multi_lock(mc);
 		status = cache_delete_offset_list(mc, me->key);
-		cache_multi_unlock(mc);
 		if (status != CHE_OK)
 			warn(ap->logopt, "couldn't delete offset list");
 	}
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 25d2eda..7dc8339 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -645,12 +645,7 @@ add_offset_entry(struct autofs_point *ap
 	} else
 		strcpy(m_mapent, loc);
 
-	cache_readlock(mc);
-	cache_multi_lock(mc);
 	ret = cache_add_offset(mc, name, m_key, m_mapent, age);
-	cache_multi_unlock(mc);
-	cache_unlock(mc);
-
 	if (ret == CHE_OK)
 		debug(ap->logopt, MODPREFIX
 		      "added multi-mount offset %s -> %s", path, m_mapent);
@@ -956,22 +951,25 @@ int parse_mount(struct autofs_point *ap,
 				return 1;
 			}
 		}
+		cache_unlock(mc);
 
+		cache_readlock(mc);
 		me = cache_lookup_distinct(mc, name);
 		if (me) {
 			/* So we know we're the multi-mount root */
 			if (!me->multi)
 				me->multi = me;
 		}
-		cache_unlock(mc);
 
 		if (!me) {
 			error(ap->logopt,
 			      MODPREFIX "can't find multi root %s", name);
 			free(options);
+			cache_unlock(mc);
 			return 1;
 		}
 
+		cache_multi_lock(me);
 		/* It's a multi-mount; deal with it */
 		do {
 			char *path, *myoptions, *loc;
@@ -991,10 +989,8 @@ int parse_mount(struct autofs_point *ap,
 
 			if (!path) {
 				warn(ap->logopt, MODPREFIX "null path or out of memory");
-				cache_readlock(mc);
-				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
-				cache_multi_unlock(mc);
+				cache_multi_unlock(me);
 				cache_unlock(mc);
 				free(options);
 				return 1;
@@ -1005,10 +1001,8 @@ int parse_mount(struct autofs_point *ap,
 
 			l = parse_mapent(p, options, &myoptions, &loc, ap->logopt);
 			if (!l) {
-				cache_readlock(mc);
-				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
-				cache_multi_unlock(mc);
+				cache_multi_unlock(me);
 				cache_unlock(mc);
 				free(path);
 				free(options);
@@ -1027,10 +1021,8 @@ int parse_mount(struct autofs_point *ap,
 
 			if (status != CHE_OK) {
 				warn(ap->logopt, MODPREFIX "error adding multi-mount");
-				cache_readlock(mc);
-				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
-				cache_multi_unlock(mc);
+				cache_multi_unlock(me);
 				cache_unlock(mc);
 				free(path);
 				free(options);
@@ -1044,19 +1036,11 @@ int parse_mount(struct autofs_point *ap,
 			free(myoptions);
 		} while (*p == '/');
 
-		cache_readlock(mc);
-		me = cache_lookup_distinct(mc, name);
-		if (!me) {
-			error(ap->logopt,
-			      MODPREFIX
-			      "failed to find cache entry for %s", name);
-			cache_multi_lock(mc);
-			cache_delete_offset_list(mc, name);
-			cache_multi_unlock(mc);
-			cache_unlock(mc);
-			free(options);
-			return 1;
-		}
+		/*
+		 * We've got the ordered list of multi-mount entries so go
+		 * through and set the parent entry of each
+		 */
+		cache_set_parents(me);
 
 		/* Mount root offset if it exists */
 		ro = cache_lookup_offset("/", "/", strlen(m_root), &me->multi_list);
@@ -1068,9 +1052,8 @@ int parse_mount(struct autofs_point *ap,
 			if (!rv) {
 				warn(ap->logopt,
 				      MODPREFIX "failed to mount root offset");
-				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
-				cache_multi_unlock(mc);
+				cache_multi_unlock(me);
 				cache_unlock(mc);
 				free(options);
 				return 1;
@@ -1086,9 +1069,8 @@ int parse_mount(struct autofs_point *ap,
 				warn(ap->logopt,
 				      MODPREFIX
 				      "mount multi-mount root %s failed", name);
-				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
-				cache_multi_unlock(mc);
+				cache_multi_unlock(me);
 				cache_unlock(mc);
 				free(options);
 				return rv;
@@ -1098,9 +1080,12 @@ int parse_mount(struct autofs_point *ap,
 		if (!mount_multi_triggers(ap, m_root, me, "/")) {
 			warn(ap->logopt,
 			      MODPREFIX "failed to mount offset triggers");
+			cache_multi_unlock(me);
+			cache_unlock(mc);
 			free(options);
 			return 1;
 		}
+		cache_multi_unlock(me);
 		cache_unlock(mc);
 
 		free(options);
@@ -1217,11 +1202,13 @@ int parse_mount(struct autofs_point *ap,
 
 		me = lookup_source_mapent(oap, name, LKP_DISTINCT);
 		if (me) {
+			struct mapent *mm;
 			char *m_key;
 			int start;
 			char *base, *m_root;
 
 			mc = me->source->mc;
+			mm = me->multi;
 
 			if (!me->multi) {
 				cache_unlock(mc);
@@ -1253,13 +1240,13 @@ int parse_mount(struct autofs_point *ap,
 
 			base = &me->key[start];
 
-			cache_multi_lock(mc);
+			cache_multi_lock(mm);
 			if (!mount_multi_triggers(oap, m_root, me->multi, base)) {
 				error(ap->logopt,
 				      MODPREFIX "failed to mount offset triggers");
 				rv = 1;
 			}
-			cache_multi_unlock(mc);
+			cache_multi_unlock(mm);
 			cache_unlock(mc);
 		}
 	}

autofs-5.0.1-rc1-release-notes-spelling.patch:
 CHANGELOG         |    1 +
 README.v5.release |    9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-release-notes-spelling.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index cd5b242..6fe9697 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@
   entire tree.
 - review verbose message feedback and update.
 - correction for expire of multi-mounts.
+- spelling corrections to release notes (Jeff Moyer).
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/README.v5.release b/README.v5.release
index 2c7967e..3f23b91 100644
--- a/README.v5.release
+++ b/README.v5.release
@@ -36,7 +36,7 @@ New in 5.0.0 is:
 
 - improved direct mount map support
   - single level map entries now work as expected.
-  - top level directory of direct mount heirachy no longer obscurses
+  - top level directory of direct mount hierarchy no longer obscures
     directory tree below.
 
 - `+' map inclusion
@@ -46,10 +46,10 @@ New in 5.0.0 is:
 - added nsswitch map source support
   - is now used to locate maps if no map source is given in their
     specification.
-  - is used for bothe master map and mount maps.
+  - is used for both master map and mount maps.
 
 - rewrote multi-mount map code
-  - multi-mount map entry offsets now mount and expire indpendently
+  - multi-mount map entry offsets now mount and expire independently
     instead of having to mount and umount all offset entries at once.
 
 - added LDAP encryption and authentication support
@@ -65,13 +65,13 @@ New in 5.0.0 is:
   - an entry like "/net -hosts" is now understood and uses the new
     multi-mount semantics for lazy mount/umount of exports from the host.
   - the implementation is quite simple minded at this stage and will need
-    refinment. It just iterates through the host table and addes any host
+    refinement. It just iterates through the host table and adds any host
     names it finds to the internal map.
 
 Things not yet done
 ===================
 
-- I have no way to test the Gentoo setup here anymore so it is unlikey
+- I have no way to test the Gentoo setup here anymore so it is unlikely
   to work. Patches from anyone who needs this are welcome.
 
 Ian

autofs-5.0.1-rc1-remove-sigchld-handler.patch:
 CHANGELOG                |    1 
 daemon/automount.c       |    7 -
 daemon/spawn.c           |  189 +++--------------------------------------------
 include/automount.h      |    3 
 modules/lookup_program.c |    8 -
 5 files changed, 17 insertions(+), 191 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-remove-sigchld-handler.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 5a594ff..3e801e2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@
 - cthon fix expire of wildcard and program mounts broken by above
   patches.
 - tidy up directory cleanup and add validation check to rmdir_path.
+- remove SIGCHLD handler.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 736d54a..5217347 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1519,13 +1519,6 @@ #endif
 		close(start_pipefd[1]);
 		exit(1);
 	}
-
-	if (!sigchld_start_handler()) {
-		crit(LOGOPT_ANY, "failed to create SIGCHLD handler thread!");
-		master_kill(master_list);
-		close(start_pipefd[1]);
-		exit(1);
-	}
 #if 0
 	if (!load_autofs4_module()) {
 		crit(LOGOPT_ANY, "%s: can't load %s filesystem module",
diff --git a/daemon/spawn.c b/daemon/spawn.c
index a85b667..7dc4a81 100644
--- a/daemon/spawn.c
+++ b/daemon/spawn.c
@@ -31,44 +31,6 @@ #ifdef ENABLE_MOUNT_LOCKING
 static pthread_mutex_t spawn_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif
 
-/*
- * SIGCHLD handling.
- *
- * We need to manage SIGCHLD process wide so that when we fork
- * programs we can reap the exit status in the calling thread by
- * blocking the signal. There is also the need to be able to reap
- * the exit status for child processes that are asynchronous to
- * the main program such as submount processes.
- * 
- * The method used to achieve this in our threaded environment
- * is to define a signal handler thread for SIGCHLD (and SIGCONT)
- * and, before we fork, tell it not to wait for signals so that
- * the waitpid in the subroutine that forks and execs can reap the
- * exit status.
- *
- * An added complication is that more than one thread at a time
- * may be forking program execution so we can't just simply tell
- * the handler to start listening for the signal again when done.
- * To deal with this a usage counter is used to identify when
- * there are no more threads that need to obtain an exit status
- * and we can tell the handler to start listening for the signal
- * again.
- */
-struct sigchld_mutex {
-	pthread_mutex_t mutex;
-	pthread_cond_t ready;
-	pthread_t thid;
-	unsigned int catch;
-	unsigned int count;
-};
-
-/* Start out catching SIGCHLD signals */
-static struct sigchld_mutex sm = {PTHREAD_MUTEX_INITIALIZER,
-				  PTHREAD_COND_INITIALIZER,
-				  0, 1, 0};
-
-extern pthread_attr_t thread_attr;
-
 inline void dump_core(void)
 {
 	sigset_t segv;
@@ -81,134 +43,6 @@ inline void dump_core(void)
 	raise(SIGSEGV);
 }
 
-void *sigchld(void *dummy)
-{
-	pid_t pid;
-	sigset_t sig_child;
-	int sig;
-	int status;
-
-	sigemptyset(&sig_child);
-	sigaddset(&sig_child, SIGCHLD);
-	sigaddset(&sig_child, SIGCONT);
-
-	while (1) {
-		sigwait(&sig_child, &sig);
-
-		status = pthread_mutex_lock(&sm.mutex);
-		if (status)
-			fatal(status);
-
-		/*
-		 * We could receive SIGCONT from two sources at the same
-		 * time. For example if we are a submount process whose startup
-		 * up is now complete and from a thread performing a fork and
-		 * exec (via sigchld_block below). So we are being told to
-		 * continue at the same time as we are bieng told to wait on
-		 * the condition. In this case catching the signal is enough
-		 * for us to continue and we also wait on the condition
-		 * (sm.catch == 0).
-		 */
-		if (!sm.catch) {
-			status = pthread_cond_wait(&sm.ready, &sm.mutex);
-			if (status)
-				error(LOGOPT_ANY,
-				      "SIGCHLD condition wait failed");
-		}
-
-		if (sig != SIGCONT)
-			while ((pid = waitpid(-1, NULL, WNOHANG)) > 0)
-				debug(LOGOPT_NONE,
-				      "received SIGCHLD from %d", pid);
-
-		status = pthread_mutex_unlock(&sm.mutex);
-		if (status)
-			error(LOGOPT_ANY,
-			      "failed to unlock SIGCHLD handler mutex");
-	}
-}
-
-int sigchld_start_handler(void)
-{
-	pthread_attr_t attrs;
-	pthread_attr_t *pattrs = &attrs;
-	int status;
-
-	status = pthread_attr_init(pattrs);
-	if (status)
-		pattrs = NULL;
-	else {
-		pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED);
-#ifdef _POSIX_THREAD_ATTR_STACKSIZE
-		pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4);
-#endif
-	}
-
-	status = pthread_create(&sm.thid, pattrs, sigchld, NULL);
-	if (status)
-	 	return 0;
-
-	return 1;
-}
-
-int sigchld_block(void)
-{
-	int status;
-
-	status = pthread_mutex_lock(&sm.mutex);
-	if (status) {
-		error(LOGOPT_ANY, "failed to lock SIGCHLD mutex");
-		return 0;
-	}
-
-	/*
-	 * If this is the first request to block then disable
-	 * signal catching and tell the handler.
-	 */
-	if (sm.count == 0) {
-		sm.catch = 0;
-		pthread_kill(sm.thid, SIGCONT);
-	}
-
-	sm.count++;
-
-	status = pthread_mutex_unlock(&sm.mutex);
-	if (status)
-		error(LOGOPT_ANY, "failed to unlock SIGCHLD mutex");
-
-	return 1;
-}
-
-int sigchld_unblock(void)
-{
-	int status;
-
-	status = pthread_mutex_lock(&sm.mutex);
-	if (status) {
-		error(LOGOPT_ANY, "failed to lock SIGCHLD mutex");
-		return 0;
-	}
-
-	sm.count--;
-
-	/*
-	 * If this is the last request for blocking then enable
-	 * signal catching and tell the handler.
-	 */
-	if (sm.count == 0) {
-		sm.catch = 1;
-		status = pthread_cond_signal(&sm.ready);
-		if (status)
-			error(LOGOPT_ANY, "SIGCHLD condition signal failed");
-	}
-
-	status = pthread_mutex_unlock(&sm.mutex);
-	if (status)
-		error(LOGOPT_ANY, "failed to unlock SIGCHLD mutex");
-	
-	return 1;
-}
-
 /*
  * Used by subprocesses which exec to avoid carrying over the main
  * daemon's signalling environment
@@ -268,20 +102,23 @@ static int do_spawn(logger *log, int use
 	int status, pipefd[2];
 	char errbuf[ERRBUFSIZ + 1], *p, *sp;
 	int errp, errn;
-#ifdef ENABLE_MOUNT_LOCKING
 	int cancel_state;
-#endif
+	sigset_t allsigs, tmpsig, oldsig;
 
 	if (pipe(pipefd))
 		return -1;
 
-	sigchld_block();
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cancel_state);
+
+	sigfillset(&allsigs);
+	pthread_sigmask(SIG_BLOCK, &allsigs, &oldsig);
 
 #ifdef ENABLE_MOUNT_LOCKING
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cancel_state);
 	if (use_lock) {
 		if (pthread_mutex_lock(&spawn_mutex)) {
 			log(LOGOPT_ANY, "failed to lock spawn_mutex");
+			pthread_sigmask(SIG_SETMASK, &oldsig, NULL);
+			pthread_setcancelstate(cancel_state, NULL);
 			return -1;
 		}
 	}
@@ -298,14 +135,20 @@ #endif
 		execv(prog, (char *const *) argv);
 		_exit(255);	/* execv() failed */
 	} else {
+		tmpsig = oldsig;
+
+		sigaddset(&tmpsig, SIGCHLD);
+		pthread_sigmask(SIG_SETMASK, &tmpsig, NULL);
+
 		close(pipefd[1]);
 
 		if (f < 0) {
 			close(pipefd[0]);
+			pthread_sigmask(SIG_SETMASK, &oldsig, NULL);
 #ifdef ENABLE_MOUNT_LOCKING
 			spawn_unlock(&use_lock);
 #endif
-			sigchld_unblock();
+			pthread_setcancelstate(cancel_state, NULL);
 			return -1;
 		}
 
@@ -350,11 +193,11 @@ #endif
 		if (waitpid(f, &status, 0) != f)
 			status = -1;	/* waitpid() failed */
 
+		pthread_sigmask(SIG_SETMASK, &oldsig, NULL);
 #ifdef ENABLE_MOUNT_LOCKING
 		spawn_unlock(&use_lock);
-		pthread_setcancelstate(cancel_state, &cancel_state);
 #endif
-		sigchld_unblock();
+		pthread_setcancelstate(cancel_state, NULL);
 
 		return status;
 	}
diff --git a/include/automount.h b/include/automount.h
index 1c6e0dc..54a7180 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -191,9 +191,6 @@ int compare_argv(int argc1, const char *
 int free_argv(int argc, const char **argv);
 
 inline void dump_core(void);
-int sigchld_start_handler(void);
-int sigchld_block(void);
-int sigchld_unblock(void);
 int aquire_lock(void);
 void release_lock(void);
 int spawnl(logger *log, const char *prog, ...);
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index 0076596..eb18638 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -174,19 +174,14 @@ int lookup_mount(struct autofs_point *ap
 	 * want to send stderr to the syslog, and we don't use spawnl()
 	 * because we need the pipe hooks
 	 */
-
-	sigchld_block();
-
 	if (pipe(pipefd)) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		error(ap->logopt, MODPREFIX "pipe: %s", estr);
-		sigchld_unblock();
 		goto out_free;
 	}
 	if (pipe(epipefd)) {
 		close(pipefd[0]);
 		close(pipefd[1]);
-		sigchld_unblock();
 		goto out_free;
 	}
 
@@ -198,7 +193,6 @@ int lookup_mount(struct autofs_point *ap
 		close(pipefd[1]);
 		close(epipefd[0]);
 		close(epipefd[1]);
-		sigchld_unblock();
 		goto out_free;
 	} else if (f == 0) {
 		reset_signals();
@@ -339,8 +333,6 @@ int lookup_mount(struct autofs_point *ap
 		goto out_free;
 	}
 
-	sigchld_unblock();
-
 	if (mapp == mapent || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
 		error(ap->logopt, MODPREFIX "lookup for %s failed", name);
 		goto out_free;

autofs-5.0.1-rc1-sloppyopt-nfs.patch:
 mount_nfs.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autofs-5.0.1-rc1-sloppyopt-nfs.patch ---
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index 19c0817..8b4ddac 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -227,7 +227,7 @@ int mount_mount(struct autofs_point *ap,
 
 			err = spawnll(log_debug,
 				     PATH_MOUNT, PATH_MOUNT, "-t",
-				     "nfs", "-o", nfsoptions,
+				     "nfs", SLOPPYOPT "-o", nfsoptions,
 				     loc, fullpath, NULL);
 		} else {
 			debug(ap->logopt,

autofs-5.0.1-rc1-verbose-messages.patch:
 CHANGELOG                |    1 +
 daemon/automount.c       |    2 +-
 daemon/direct.c          |   14 ++++++++------
 daemon/indirect.c        |   10 ++++++----
 lib/parse_subs.c         |    1 +
 modules/cyrus-sasl.c     |    5 ++---
 modules/lookup_file.c    |   11 +++++------
 modules/lookup_hosts.c   |    1 +
 modules/lookup_program.c |    2 +-
 modules/mount_bind.c     |    1 +
 modules/mount_changer.c  |   10 ++++------
 modules/mount_ext2.c     |    5 ++---
 modules/mount_generic.c  |   10 ++++------
 modules/mount_nfs.c      |    6 ++----
 modules/parse_sun.c      |    4 ++--
 15 files changed, 41 insertions(+), 42 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-verbose-messages.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 866ae0a..24dbe19 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,7 @@
 - remove SIGCHLD handler.
 - alter expire locking of multi-mounts to lock sub-tree instead of
   entire tree.
+- review verbose message feedback and update.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 5fba783..5e2b4c3 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -444,7 +444,7 @@ int umount_multi(struct autofs_point *ap
 	 * it already to ensure it's ok to remove any offset triggers
 	 */
 	if (me != me->multi) {
-		warn(ap->logopt, "unmounting dir = %s", path);
+		msg("unmounting dir = %s", path);
 
 		if (umount_ent(ap, path)) {
 			warn(ap->logopt, "could not umount dir %s", path);
diff --git a/daemon/direct.c b/daemon/direct.c
index 5a528fc..4b6162b 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -199,10 +199,10 @@ int do_umount_autofs_direct(struct autof
 
 force_umount:
 	if (rv != 0) {
-		msg("forcing umount of %s", me->key);
+		msg("forcing umount of direct mount %s", me->key);
 		rv = umount2(me->key, MNT_DETACH);
 	} else
-		msg("umounted %s", me->key);
+		msg("umounted direct mount %s", me->key);
 
 	if (!rv && me->dir_created) {
 		if  (rmdir(me->key) == -1) {
@@ -372,6 +372,8 @@ int do_mount_autofs_direct(struct autofs
 		goto out_err;
 	}
 
+	msg("mounted autofs direct mount on %s", me->key);
+
 	/* Root directory for ioctl()'s */
 	ioctlfd = open(me->key, O_RDONLY);
 	if (ioctlfd < 0) {
@@ -583,10 +585,10 @@ int umount_autofs_offset(struct autofs_p
 
 force_umount:
 	if (rv != 0) {
-		msg("forcing umount of %s", me->key);
+		msg("forcing umount of offset mount %s", me->key);
 		rv = umount2(me->key, MNT_DETACH);
 	} else
-		msg("umounted offset %s", me->key);
+		msg("umounted offset mount %s", me->key);
 
 	return rv;
 }
@@ -741,6 +743,7 @@ static int expire_direct(int ioctlfd, co
 			if (errno != EAGAIN)
 				return 0;
 		}
+
 		nanosleep(&tm, NULL);
 	}
 
@@ -817,8 +820,7 @@ void *expire_proc_direct(void *arg)
 
 		ret = expire_direct(ioctlfd, next->path, now, ap->logopt);
 		if (!ret) {
-			debug(ap->logopt,
-			     "failed to expire mount %s", next->path);
+			msg("mount apparently busy %s", next->path);
 			ea->status++;
 		}
 	}
diff --git a/daemon/indirect.c b/daemon/indirect.c
index 766ec08..8748413 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -171,6 +171,8 @@ static int do_mount_autofs_indirect(stru
 
 	options = NULL;
 
+	msg("mounted autofs indirect mount on %s", ap->path);
+
 	/* Root directory for ioctl()'s */
 	ap->ioctlfd = open(ap->path, O_RDONLY);
 	if (ap->ioctlfd < 0) {
@@ -353,10 +355,11 @@ int umount_autofs_indirect(struct autofs
 
 force_umount:
 	if (rv != 0) {
-		warn(ap->logopt, "forcing umount of %s", ap->path);
+		warn(ap->logopt,
+		     "forcing umount of indirect mount %s", ap->path);
 		rv = umount2(ap->path, MNT_DETACH);
 	} else {
-		msg("umounted %s", ap->path);
+		msg("umounted indirect mount %s", ap->path);
 		if (ap->submount)
 			rm_unwanted(ap->path, 1, ap->dev);
 	}
@@ -470,8 +473,7 @@ void *expire_proc_indirect(void *arg)
 
 		ret = expire_indirect(ioctlfd, next->path, now, retries, ap->logopt);
 		if (!ret) {
-			debug(ap->logopt,
-			      "failed to expire mount %s", next->path);
+			msg("mount apparently busy %s", next->path);
 			ea->status++;
 		}
 	}
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index a24e6da..77651cf 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -463,6 +463,7 @@ cont:
 		 * the offset triggers back.
 		 */
 		if (is_mounted(_PATH_MOUNTED, path, MNTS_REAL)) {
+			msg("unmounting dir = %s", root);
 			if (umount_ent(ap, root)) {
 				if (!mount_multi_triggers(ap, root, me, "/"))
 					warn(ap->logopt,
diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
index 6058548..8821f84 100644
--- a/modules/cyrus-sasl.c
+++ b/modules/cyrus-sasl.c
@@ -196,9 +196,8 @@ get_server_SASL_mechanisms(LDAP *ld)
 	ldap_msgfree(results);
 	if (mechanisms == NULL) {
 		/* Well, that was a waste of time. */
-		info(LOGOPT_ANY,
-		     "No SASL authentication mechanisms are supported"
-		     " by the LDAP server.\n");
+		msg("No SASL authentication mechanisms are supported"
+		    " by the LDAP server.\n");
 		return NULL;
 	}
 
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 6485ef2..9a9f498 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -75,17 +75,15 @@ int lookup_init(const char *mapfmt, int 
 	ctxt->mapname = argv[0];
 
 	if (ctxt->mapname[0] != '/') {
-		debug(LOGOPT_NONE,
-		      MODPREFIX "file map %s is not an absolute pathname",
-		      ctxt->mapname);
+		msg(MODPREFIX "file map %s is not an absolute pathname",
+		    ctxt->mapname);
 		free(ctxt);
 		return 1;
 	}
 
 	if (access(ctxt->mapname, R_OK)) {
-		warn(LOGOPT_ANY,
-		     MODPREFIX "file map %s missing or not readable",
-		     ctxt->mapname);
+		msg(MODPREFIX "file map %s missing or not readable",
+		    ctxt->mapname);
 		free(ctxt);
 		return 1;
 	}
@@ -1051,6 +1049,7 @@ int lookup_mount(struct autofs_point *ap
 
 			debug(ap->logopt,
 			      MODPREFIX "check indirect map lookup failed");
+
 			return NSS_STATUS_NOTFOUND;
 		}
 	}
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index 7255794..3b8c4ae 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -186,6 +186,7 @@ done:
 		ap->entry->current = source;
 
 		debug(ap->logopt, MODPREFIX "%s -> %s", name, me->mapent);
+
 		ret = ctxt->parse->parse_mount(ap, name, name_len,
 				 mapent, ctxt->parse->context);
 
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index eb18638..1cdbf80 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -334,7 +334,7 @@ int lookup_mount(struct autofs_point *ap
 	}
 
 	if (mapp == mapent || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-		error(ap->logopt, MODPREFIX "lookup for %s failed", name);
+		msg(MODPREFIX "lookup for %s failed", name);
 		goto out_free;
 	}
 
diff --git a/modules/mount_bind.c b/modules/mount_bind.c
index 22abd91..96ca29b 100644
--- a/modules/mount_bind.c
+++ b/modules/mount_bind.c
@@ -66,6 +66,7 @@ int mount_init(void **context)
 	}
 
 	debug(LOGOPT_NONE, MODPREFIX "bind_works = %d", bind_works);
+
 	spawnl(log_debug,
 	       PATH_UMOUNT, PATH_UMOUNT, "-n", tmp2, NULL);
 
diff --git a/modules/mount_changer.c b/modules/mount_changer.c
index 83e6bdf..eb29c8c 100644
--- a/modules/mount_changer.c
+++ b/modules/mount_changer.c
@@ -129,9 +129,8 @@ int mount_mount(struct autofs_point *ap,
 	}
 
 	if (err) {
-		error(ap->logopt,
-		      MODPREFIX "failed to mount %s (type %s) on %s",
-		      what, fstype, fullpath);
+		msg(MODPREFIX "failed to mount %s (type %s) on %s",
+		    what, fstype, fullpath);
 
 		if (ap->type != LKP_INDIRECT)
 			return 1;
@@ -141,9 +140,8 @@ int mount_mount(struct autofs_point *ap,
 
 		return 1;
 	} else {
-		debug(ap->logopt,
-		      MODPREFIX "mounted %s type %s on %s",
-		      what, fstype, fullpath);
+		msg(MODPREFIX "mounted %s type %s on %s",
+		    what, fstype, fullpath);
 		return 0;
 	}
 }
diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c
index deebf8b..7774adf 100644
--- a/modules/mount_ext2.c
+++ b/modules/mount_ext2.c
@@ -145,9 +145,8 @@ #endif
 	}
 
 	if (err) {
-		error(ap->logopt,
-		      MODPREFIX "failed to mount %s (type %s) on %s",
-		      what, fstype, fullpath);
+		msg(MODPREFIX "failed to mount %s (type %s) on %s",
+		    what, fstype, fullpath);
 
 		if (ap->type != LKP_INDIRECT)
 			return 1;
diff --git a/modules/mount_generic.c b/modules/mount_generic.c
index 9dabfce..ad726e7 100644
--- a/modules/mount_generic.c
+++ b/modules/mount_generic.c
@@ -105,9 +105,8 @@ int mount_mount(struct autofs_point *ap,
 	}
 
 	if (err) {
-		error(ap->logopt,
-		      MODPREFIX "failed to mount %s (type %s) on %s",
-		      what, fstype, fullpath);
+		msg(MODPREFIX "failed to mount %s (type %s) on %s",
+		     what, fstype, fullpath);
 
 		if (ap->type != LKP_INDIRECT)
 			return 1;
@@ -117,9 +116,8 @@ int mount_mount(struct autofs_point *ap,
 
 		return 1;
 	} else {
-		debug(ap->logopt,
-		      MODPREFIX "mounted %s type %s on %s",
-		      what, fstype, fullpath);
+		msg(MODPREFIX "mounted %s type %s on %s",
+		    what, fstype, fullpath);
 		return 0;
 	}
 }
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index b24f54a..19c0817 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -239,8 +239,7 @@ int mount_mount(struct autofs_point *ap,
 		}
 
 		if (!err) {
-			debug(ap->logopt,
-			      MODPREFIX "mounted %s on %s", loc, fullpath);
+			msg(MODPREFIX "mounted %s on %s", loc, fullpath);
 			free(loc);
 			free_host_list(&hosts);
 			return 0;
@@ -254,8 +253,7 @@ int mount_mount(struct autofs_point *ap,
 
 	/* If we get here we've failed to complete the mount */
 
-	error(ap->logopt,
-	      MODPREFIX "nfs: mount failure %s on %s", what, fullpath);
+	msg(MODPREFIX "nfs: mount failure %s on %s", what, fullpath);
 
 	if (ap->type != LKP_INDIRECT)
 		return 1;
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 7dc8339..3f489ed 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -620,7 +620,7 @@ add_offset_entry(struct autofs_point *ap
 		p_len--;
 	m_key_len = m_root_len + p_len;
 	if (m_key_len > PATH_MAX) {
-		warn(ap->logopt, MODPREFIX "multi mount key too long");
+		error(ap->logopt, MODPREFIX "multi mount key too long");
 		return CHE_FAIL;
 	}
 	strcpy(m_key, m_root);
@@ -633,7 +633,7 @@ add_offset_entry(struct autofs_point *ap
 
 	m_mapent_len = strlen(loc);
 	if (m_mapent_len + m_options_len > MAPENT_MAX_LEN) {
-		warn(ap->logopt, MODPREFIX "multi mount mapent too long");
+		error(ap->logopt, MODPREFIX "multi mount mapent too long");
 		return CHE_FAIL;
 	}
 


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- autofs.spec	4 Aug 2006 12:27:28 -0000	1.139
+++ autofs.spec	7 Aug 2006 04:59:41 -0000	1.140
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.13
+%define release 0.rc1.14
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -29,6 +29,12 @@
 Patch16: autofs-5.0.1-rc1-shutdown-submount-expire.patch
 Patch17: autofs-5.0.1-rc1-program-wild-expire-fix.patch
 Patch18: autofs-5.0.1-rc1-directory-cleanup.patch
+Patch19: autofs-5.0.1-rc1-remove-sigchld-handler.patch
+Patch20: autofs-5.0.1-rc1-multi-mount-expire-locking.patch
+Patch21: autofs-5.0.1-rc1-verbose-messages.patch
+Patch22: autofs-5.0.1-rc1-expire-multi-correction.patch
+Patch23: autofs-5.0.1-rc1-sloppyopt-nfs.patch
+Patch24: autofs-5.0.1-rc1-release-notes-spelling.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -86,10 +92,16 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
-%configure --enable-ignore-busy
+%configure --disable-mount-locking --enable-ignore-busy
 make initdir=/etc/rc.d/init.d DONTSTRIP=1
 
 %install
@@ -142,6 +154,17 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Aug 7 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.14
+- remove SIGCHLD handler because it is no longer needed and was
+  causing expire problems.
+- alter expire locking of multi-mounts to lock sub-tree instead of
+  entire tree.
+- review verbose message feedback and update.
+- correction for expire of multi-mounts.
+- spelling corrections to release notes (Jeff Moyer).
+- add back sloppy mount option, removed for Connectathon testing.
+- disable mtab locking again.
+
 * Thu Aug 4 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.13
 - tidy up directory cleanup and add validation check to rmdir_path.
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 08:02:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 04:02:16 -0400
Subject: rpms/gettext/devel .cvsignore, 1.10, 1.11 gettext.spec, 1.54,
	1.55 po-mode-init.el, 1.1, 1.2 sources, 1.11,
	1.12 gettext-0.14.1-amd64-libtool.patch, 1.1,
	NONE gettext-0.14.1-phase0getc.patch, 1.1,
	NONE gettext-0.14.1-tempfile.patch, 1.1,
	NONE gettext-0.14.3-gcc4.patch, 1.1, NONE
Message-ID: <200608070802.k7782GOY005667@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/gettext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5635

Modified Files:
	.cvsignore gettext.spec po-mode-init.el sources 
Removed Files:
	gettext-0.14.1-amd64-libtool.patch 
	gettext-0.14.1-phase0getc.patch gettext-0.14.1-tempfile.patch 
	gettext-0.14.3-gcc4.patch 
Log Message:
- update to 0.14.6
- include preloadable_libintl.so again (Roozbeh Pournader, #149809)
- remove .la files (Kjartan Maraas, #172624)
- cleanup spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Aug 2005 05:06:25 -0000	1.10
+++ .cvsignore	7 Aug 2006 08:02:10 -0000	1.11
@@ -1,3 +1 @@
-gettext-0.14.1.tar.gz
-gettext-0.14.3.tar.gz
-gettext-0.14.5.tar.gz
+gettext-0.14.6.tar.gz


Index: gettext.spec
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gettext.spec	25 Jul 2006 16:18:35 -0000	1.54
+++ gettext.spec	7 Aug 2006 08:02:10 -0000	1.55
@@ -1,25 +1,19 @@
-%define libtoolize :
-%define install_info /sbin/install-info
-%define remove_install_info /sbin/install-info --delete
-
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
-Version: 0.14.5
-Release: 4
+Version: 0.14.6
+Release: 1%{?dist}
 License: GPL/LGPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 URL: http://www.gnu.org/software/gettext/
 Source1: po-mode-init.el
 Source2: msghack.py
-Patch1: gettext-0.14.3-gcc4.patch
-#Patch2: gettext-0.14.1-tempfile.patch
 Prereq: /sbin/install-info
 %ifarch x86_64 ppc64 s390x
 BuildRequires: automake >= 1.8, autoconf >= 2.5
 %endif
 BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj
-BuildRequires: /usr/bin/fastjar
+BuildRequires: %{_bindir}/fastjar
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -34,29 +28,29 @@
 catalogs and is a powerful and simple method for internationalizing
 programs.
 
-%package	devel
-Summary:	Development files for %{name}
-Group:      Development/Tools
-License:	LGPL
-Requires:	%{name} = %{version}-%{release}
-Requires:	cvs
-Provides:	devel(libintl)
-Prereq:		/sbin/install-info
 
-%description	devel
+%package devel
+Summary: Development files for %{name}
+Group: Development/Tools
+License: LGPL
+Requires: %{name} = %{version}-%{release}
+Requires: cvs
+Provides: devel(libintl)
+PreReq: /sbin/install-info
+
+%description devel
 This package contains all development related files necessary for
 developing or compiling applications/libraries that needs
 internationalization capability. You also need this package if you
 want to add gettext support for your project.
 
+
 %prep
-rm -rf %{buildroot}
 %setup -q
-%patch1 -p1 -b .gcc4
-#%patch2 -p1 -b .tempfile
+
 
 %build
-[ -f  /usr/share/automake/depcomp ] && cp -f /usr/share/automake/{depcomp,ylwrap} . || :
+[ -f  %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} . || :
 
 # Rerun autotools for new version
 #    aclocal --force
@@ -82,21 +76,21 @@
 	--enable-shared --with-pic-=yes --disable-csharp
 make
 
+
 %install
 rm -rf %{buildroot}
 
-# Fix busted no-emacs install for $lispdir/po-mode.el
-%makeinstall lispdir=%{buildroot}/usr/share/emacs/site-lisp \
-    aclocaldir=%{buildroot}/usr/share/aclocal
+%makeinstall lispdir=${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp \
+    aclocaldir=${RPM_BUILD_ROOT}%{_datadir}/aclocal
     
-mkdir -p %{buildroot}/bin
-mv %{buildroot}/%{_bindir}/gettext %{buildroot}/bin
-ln -s ../../bin/gettext %{buildroot}/%{_bindir}/gettext
-install -m 755 %SOURCE2 $RPM_BUILD_ROOT/%{_bindir}/msghack
+# move gettext to /bin
+mkdir -p ${RPM_BUILD_ROOT}/bin
+mv ${RPM_BUILD_ROOT}%{_bindir}/gettext ${RPM_BUILD_ROOT}/bin
+ln -s ../../bin/gettext ${RPM_BUILD_ROOT}%{_bindir}/gettext
 
-pushd %{buildroot}
-rm -f .%{_infodir}/dir .%{_includedir}/libintl.h
-popd
+install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/msghack
+
+rm ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 pushd %{buildroot}/%{_datadir}/locale
 for foo in `find . -maxdepth 1 -mindepth 1 -type d` ; do
@@ -106,42 +100,47 @@
 done
 popd
 
-mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d
+install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d
 
 # doc relocations
 for i in gettext-runtime/man/*.html; do
-  rm -f $RPM_BUILD_ROOT%{_datadir}/doc/gettext/`basename $i`
+  rm ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/`basename $i`
 done
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gettext/javadoc*
+rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/javadoc*
 
 rm -rf htmldoc examples
 mkdir htmldoc
-mv $RPM_BUILD_ROOT%{_datadir}/doc/gettext/examples examples
-mv $RPM_BUILD_ROOT%{_datadir}/doc/gettext/* $RPM_BUILD_ROOT/%{_datadir}/doc/libasprintf/* htmldoc
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libasprintf
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gettext
-
+mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/examples examples
+mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/* ${RPM_BUILD_ROOT}/%{_datadir}/doc/libasprintf/* htmldoc
+rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf
+rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
 
 # remove unpackaged files from the buildroot
-rm -rf $RPM_BUILD_ROOT/usr/doc
-rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
-rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
-rm -rf $RPM_BUILD_ROOT%{_libdir}/preloadable_libintl.so
+rm -r ${RPM_BUILD_ROOT}%{_datadir}/emacs
+rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf ${RPM_BUILD_ROOT}
+
+
+%define install_info /sbin/install-info
+%define remove_install_info /sbin/install-info --delete
+
 
 %post
 /sbin/ldconfig
 %{install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir
 
+
 %preun
 if [ "$1" = 0 ]; then
     %{remove_install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir
 fi
 exit 0
 
+
 %postun
 /sbin/ldconfig
 
@@ -150,11 +149,13 @@
 /sbin/ldconfig
 %{install_info} %{_infodir}/autosprintf.info %{_infodir}/dir
 
+
 %preun devel
 if [ "$1" = 0 ]; then
     %{remove_install_info} %{_infodir}/autosprintf.info %{_infodir}/dir
 fi
 
+
 %postun devel
 /sbin/ldconfig
 
@@ -167,18 +168,19 @@
 %doc gettext-runtime/man/*.1.html
 %doc gettext-runtime/intl/COPYING*
 /bin/*
-/usr/bin/*
+%{_bindir}/*
 %exclude %{_bindir}/autopoint
 %exclude %{_bindir}/gettextize
 
 # These aren't in glibc...
-%dir /usr/share/locale/en at boldquot
-%dir /usr/share/locale/en at boldquot/LC_MESSAGES
-%dir /usr/share/locale/en at quot
-%dir /usr/share/locale/en at quot/LC_MESSAGES
+%dir %{_datadir}/locale/en at boldquot
+%dir %{_datadir}/locale/en at boldquot/LC_MESSAGES
+%dir %{_datadir}/locale/en at quot
+%dir %{_datadir}/locale/en at quot/LC_MESSAGES
 
 %{_libdir}/libgettextlib*.so
 %{_libdir}/libgettextsrc*.so
+%{_libdir}/preloadable_libintl.so
 %{_infodir}/gettext*
 %{_mandir}/man1/*
 %exclude %{_mandir}/man1/gettextize.1.gz
@@ -207,7 +209,6 @@
 %{_includedir}/*
 %{_infodir}/autosprintf*
 %{_libdir}/lib*.a
-%{_libdir}/lib*.la
 %{_libdir}/libasprintf.so*
 %{_libdir}/libgettextpo.so*
 %{_mandir}/man1/gettextize.1.gz
@@ -217,7 +218,14 @@
 %doc gettext-runtime/intl-java/javadoc*
 %{_libdir}/%{name}/gnu.gettext.*
 
+
 %changelog
+* Mon Aug  7 2006 Jens Petersen <petersen at redhat.com> - 0.14.6-1
+- update to 0.14.6
+- include preloadable_libintl.so again (Roozbeh Pournader, #149809)
+- remove .la files (Kjartan Maraas, #172624)
+- cleanup spec file
+
 * Tue Jul 25 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.14.5-4
 - Bump release number.
 
@@ -260,7 +268,7 @@
 
 * Wed Dec 01 2004 Leon Ho <llch at redhat.com>
 - Add env var to redirect use fastjar instead of jar
-- BuildRequires /usr/bin/fastjar and libgcj
+- BuildRequires %{_bindir}/fastjar and libgcj
 
 * Mon Nov 01 2004 Leon Ho <llch at redhat.com>
 - fix call on phase0_getc()


Index: po-mode-init.el
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/po-mode-init.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- po-mode-init.el	9 Sep 2004 05:03:51 -0000	1.1
+++ po-mode-init.el	7 Aug 2006 08:02:10 -0000	1.2
@@ -1,11 +1,10 @@
-;; Use po-mode for translation files
+;;; po-mode-init.el
 
 (autoload 'po-mode "po-mode")
 (setq auto-mode-alist (cons '("\\.po[tx]?\\'\\|\\.po\\." . po-mode)
                             auto-mode-alist))
 
-;;; To automatically use proper fonts under Emacs 20, also add:
-
+;; autodetect coding-system
 (autoload 'po-find-file-coding-system "po-mode")
 (modify-coding-system-alist 'file "\\.po[tx]?\\'\\|\\.po\\."
                             'po-find-file-coding-system)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Sep 2005 06:58:47 -0000	1.11
+++ sources	7 Aug 2006 08:02:10 -0000	1.12
@@ -1 +1 @@
-e2f6581626a22a0de66dce1d81d00de3  gettext-0.14.5.tar.gz
+c26fc7f0a493c5c7c39bbc4e7ed42790  gettext-0.14.6.tar.gz


--- gettext-0.14.1-amd64-libtool.patch DELETED ---


--- gettext-0.14.1-phase0getc.patch DELETED ---


--- gettext-0.14.1-tempfile.patch DELETED ---


--- gettext-0.14.3-gcc4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug  7 09:29:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 05:29:15 -0400
Subject: rpms/ruby/devel ruby.spec,1.73,1.74
Message-ID: <200608070929.k779TFGG011377@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11364

Modified Files:
	ruby.spec 
Log Message:
* Mon Aug  7 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-12
- owns sitearchdir. (#201208)


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ruby.spec	21 Jul 2006 11:15:22 -0000	1.73
+++ ruby.spec	7 Aug 2006 09:29:13 -0000	1.74
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -416,10 +416,8 @@
 %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}
+%{sitedir}
+%{sitedir2}
 
 %files tcltk -f ruby-tcltk.files
 %defattr(-, root, root)
@@ -454,6 +452,9 @@
 %endif
 
 %changelog
+* Mon Aug  7 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-12
+- owns sitearchdir. (#201208)
+
 * Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-11
 - security fixes [CVE-2006-3694]
   - ruby-1.8.4-fix-insecure-dir-operation.patch:



From fedora-cvs-commits at redhat.com  Mon Aug  7 09:32:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 05:32:58 -0400
Subject: rpms/net-tools/devel net-tools-1.60-skip.patch, NONE,
	1.1 net-tools.spec, 1.73, 1.74
Message-ID: <200608070932.k779WwrQ011466@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-tools.spec 
Added Files:
	net-tools-1.60-skip.patch 
Log Message:
 - directory entries . and .. should be skipped

net-tools-1.60-skip.patch:
 netstat.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE net-tools-1.60-skip.patch ---
--- net-tools-1.60/netstat.c.skip	2006-08-07 10:45:25.000000000 +0200
+++ net-tools-1.60/netstat.c	2006-08-07 11:17:37.000000000 +0200
@@ -444,6 +444,10 @@
 #ifdef DIRENT_HAVE_D_TYPE_WORKS
 	    if (direfd->d_type!=DT_LNK) 
 		continue;
+#else
+	/* Skip . and .. */
+	    if (!isdigit(direfd->d_name[0])) 
+		continue;
 #endif
 	    if (procfdlen+1+strlen(direfd->d_name)+1>sizeof(line)) 
 		continue;


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- net-tools.spec	12 Jul 2006 07:27:03 -0000	1.73
+++ net-tools.spec	7 Aug 2006 09:32:55 -0000	1.74
@@ -3,7 +3,7 @@
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 72.1
+Release: 73
 License: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@@ -67,6 +67,7 @@
 Patch53: net-tools-1.60-arp_man.patch
 Patch54: net-tools-1.60-ifconfig-long-iface-crasher.patch
 Patch55: net-tools-1.60-netdevice.patch
+Patch56: net-tools-1.60-skip.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires(post,preun): chkconfig
@@ -130,7 +131,8 @@
 %patch52 -p1 -b .sctp
 %patch53 -p1
 %patch54 -p1 -b .long_iface
-%patch55 -p1 -b .netdevice
+#%patch55 -p1 -b .netdevice
+%patch56 -p1 -b .skip
 
 cp %SOURCE2 ./config.h
 cp %SOURCE3 ./config.make
@@ -242,6 +244,9 @@
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Mon Aug  7 2006 Radek Vokal <rvokal at redhat.com> - 1.60-73
+- directory entries . and .. should be skipped
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.60-72.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 09:39:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 05:39:21 -0400
Subject: rpms/foomatic/devel foomatic.spec,1.139,1.140
Message-ID: <200608070939.k779dL0U011578@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11566

Modified Files:
	foomatic.spec 
Log Message:
Include bug ID.


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- foomatic.spec	12 Jul 2006 22:14:11 -0000	1.139
+++ foomatic.spec	7 Aug 2006 09:39:18 -0000	1.140
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    37
+Release:    38
 License:	GPL
 Group: System Environment/Libraries
 
@@ -39,6 +39,9 @@
 Patch6: foomatic-ppdload.patch
 Patch7: foomatic-ppdload-ppd.patch
 
+# Make CUPS driver work with drivers containing '-' in their names.
+Patch8: foomatic-driver-names.patch
+
 # Don't break gimp-print driver
 Patch9: foomatic-printoutmode.patch
 
@@ -104,6 +107,7 @@
 chmod a+x mkinstalldirs
 %patch2 -p1 -b .libdir
 %patch6 -p1 -b .ppdload
+%patch8 -p1 -b .driver-names
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
@@ -274,6 +278,10 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Thu Aug  3 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-38
+- Make CUPS driver work with drivers containing '-' in their names
+  (bug #201398).
+
 * Thu Jul 13 2006 Karsten Hopp <karsten at redhat.de> 3.0.2-37
 - buildrequires autoconf, automake
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 09:59:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 05:59:26 -0400
Subject: rpms/hplip/devel .cvsignore, 1.12, 1.13 hplip.spec, 1.89,
	1.90 sources, 1.12, 1.13
Message-ID: <200608070959.k779xQ0h009443@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore hplip.spec sources 
Log Message:
* Mon Aug  7 2006 Tim Waugh <twaugh at redhat.com> 1.6.7-2
- 1.6.7.
- Conflict with selinux-policy < 2.3.4 to make sure new port numbers are
  known about (bug #201357).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 Jun 2006 07:53:52 -0000	1.12
+++ .cvsignore	7 Aug 2006 09:59:22 -0000	1.13
@@ -9,3 +9,4 @@
 hplip-0.9.11.tar.gz
 hplip-1.6.6.tar.gz
 hplip-1.6.6a.tar.gz
+hplip-1.6.7.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- hplip.spec	12 Jul 2006 06:22:36 -0000	1.89
+++ hplip.spec	7 Aug 2006 09:59:22 -0000	1.90
@@ -1,13 +1,16 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 1.6.6a
-Release: 3.1
+Version: 1.6.7
+Release: 2
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
 Obsoletes: hpoj <= 0.91
 Obsoletes: xojpanel <= 0.91
 
+# Need selinux-policy to know about new port numbers (bug #201357).
+Conflicts: selinux-policy < 2.3.4-1
+
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
 Patch1: hplip-desktop.patch
@@ -181,6 +184,11 @@
 exit 0
 
 %changelog
+* Mon Aug  7 2006 Tim Waugh <twaugh at redhat.com> 1.6.7-2
+- 1.6.7.
+- Conflict with selinux-policy < 2.3.4 to make sure new port numbers are
+  known about (bug #201357).
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - (none):1.6.6a-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Jun 2006 07:53:52 -0000	1.12
+++ sources	7 Aug 2006 09:59:22 -0000	1.13
@@ -1 +1 @@
-606704fc8b2fe344e49190b592b438e0  hplip-1.6.6a.tar.gz
+b1e814c7f5ef2a5033e4c3e5162ac694  hplip-1.6.7.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug  7 10:18:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 06:18:52 -0400
Subject: rpms/hplip/devel hplip.spec,1.90,1.91 hplip-config.patch,1.2,NONE
Message-ID: <200608071018.k77AIqCA029021@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Removed Files:
	hplip-config.patch 
Log Message:
Don't patch hplip.conf


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- hplip.spec	7 Aug 2006 09:59:22 -0000	1.90
+++ hplip.spec	7 Aug 2006 10:18:49 -0000	1.91
@@ -14,7 +14,6 @@
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
 Patch1: hplip-desktop.patch
-Patch2: hplip-config.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-compile.patch
@@ -69,9 +68,6 @@
 # Use /usr/share/applications for putting desktop files in.
 %patch1 -p1 -b .desktop
 
-# Use static IP ports (for SELinux policy).
-%patch2 -p1 -b .config
-
 # Quieten hpssd on startup.
 %patch3 -p1 -b .quiet
 


--- hplip-config.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug  7 10:23:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 06:23:40 -0400
Subject: rpms/procps/devel procps-3.2.7-vmstat-pgpg.patch, NONE,
	1.1 procps.spec, 1.52, 1.53
Message-ID: <200608071023.k77ANeB9030853@cvs.devel.redhat.com>

Author: kzak

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

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-vmstat-pgpg.patch 
Log Message:
fix libproc vm_ counters

procps-3.2.7-vmstat-pgpg.patch:
 proc/sysinfo.c |  112 ++++++++++++++++++++++++++++++---------------------------
 proc/sysinfo.h |   10 ++---
 vmstat.c       |   14 +++----
 3 files changed, 71 insertions(+), 65 deletions(-)

--- NEW FILE procps-3.2.7-vmstat-pgpg.patch ---
--- procps-3.2.7/proc/sysinfo.h.kzak	2006-06-25 08:41:48.000000000 +0200
+++ procps-3.2.7/proc/sysinfo.h	2006-08-04 11:19:09.000000000 +0200
@@ -57,7 +57,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, jiff *restrict czzz,
-	     unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout,
+	     unsigned long long *restrict pin, unsigned long long *restrict pout, unsigned long long *restrict s_in, unsigned long long *restrict sout,
 	     unsigned *restrict intr, unsigned *restrict ctxt,
 	     unsigned int *restrict running, unsigned int *restrict blocked,
 	     unsigned int *restrict btime, unsigned int *restrict processes);
@@ -72,10 +72,10 @@
 extern unsigned long vm_nr_reverse_maps;
 extern unsigned long vm_nr_mapped;
 extern unsigned long vm_nr_slab;
-extern unsigned long vm_pgpgin;
-extern unsigned long vm_pgpgout;
-extern unsigned long vm_pswpin;
-extern unsigned long vm_pswpout;
+extern unsigned long long vm_pgpgin;
+extern unsigned long long vm_pgpgout;
+extern unsigned long long vm_pswpin;
+extern unsigned long long vm_pswpout;
 extern unsigned long vm_pgalloc;
 extern unsigned long vm_pgfree;
 extern unsigned long vm_pgactivate;
--- procps-3.2.7/proc/sysinfo.c.kzak	2006-06-25 08:41:48.000000000 +0200
+++ procps-3.2.7/proc/sysinfo.c	2006-08-04 12:04:06.000000000 +0200
@@ -368,7 +368,7 @@
 /***********************************************************************/
 
 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 long long *restrict pin, unsigned long long *restrict pout, unsigned long long *restrict s_in, unsigned long long *restrict sout,
 	     unsigned *restrict intr, unsigned *restrict ctxt,
 	     unsigned int *restrict running, unsigned int *restrict blocked,
 	     unsigned int *restrict btime, unsigned int *restrict processes) {
@@ -396,11 +396,11 @@
   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);
+  if(b) sscanf(b,  "page %llu %llu", pin, pout);
   else need_vmstat_file = 1;
 
   b = strstr(buff, "swap ");
-  if(b) sscanf(b,  "swap %lu %lu", s_in, sout);
+  if(b) sscanf(b,  "swap %llu %llu", s_in, sout);
   else need_vmstat_file = 1;
 
   b = strstr(buff, "intr ");
@@ -611,9 +611,12 @@
 
 typedef struct vm_table_struct {
   const char *name;     /* VM statistic name */
-  unsigned long *slot;       /* slot in return struct */
+  void *slot;           /* slot in return struct */
+  int  sz;		/* size of slot value */
 } vm_table_struct;
 
+#define VM_TABENTRY(_name_)	{ # _name_, &vm_ ## _name_, sizeof(vm_ ## _name_) }
+
 static int compare_vm_table_structs(const void *a, const void *b){
   return strcmp(((const vm_table_struct*)a)->name,((const vm_table_struct*)b)->name);
 }
@@ -626,10 +629,10 @@
 unsigned long vm_nr_reverse_maps;    // includes PageDirect
 unsigned long vm_nr_mapped;          // mapped into pagetables
 unsigned long vm_nr_slab;            // in slab
-unsigned long vm_pgpgin;             // kB disk reads  (same as 1st num on /proc/stat page line)
-unsigned long vm_pgpgout;            // kB disk writes (same as 2nd num on /proc/stat page line)
-unsigned long vm_pswpin;             // swap reads     (same as 1st num on /proc/stat swap line)
-unsigned long vm_pswpout;            // swap writes    (same as 2nd num on /proc/stat swap line)
+unsigned long long vm_pgpgin;        // kB disk reads  (same as 1st num on /proc/stat page line)
+unsigned long long vm_pgpgout;       // kB disk writes (same as 2nd num on /proc/stat page line)
+unsigned long long vm_pswpin;        // swap reads     (same as 1st num on /proc/stat swap line)
+unsigned long long vm_pswpout;       // swap writes    (same as 2nd num on /proc/stat swap line)
 unsigned long vm_pgalloc;            // page allocations
 unsigned long vm_pgfree;             // page freeings
 unsigned long vm_pgactivate;         // pages moved inactive -> active
@@ -668,54 +671,54 @@
 
 void vminfo(void){
   char namebuf[16]; /* big enough to hold any row name */
-  vm_table_struct findme = { namebuf, NULL};
+  vm_table_struct findme = { namebuf, NULL, 0};
   vm_table_struct *found;
   char *head;
   char *tail;
   static const vm_table_struct vm_table[] = {
-  {"allocstall",          &vm_allocstall},
-  {"kswapd_inodesteal",   &vm_kswapd_inodesteal},
-  {"kswapd_steal",        &vm_kswapd_steal},
-  {"nr_dirty",            &vm_nr_dirty},           // page version of meminfo Dirty
-  {"nr_mapped",           &vm_nr_mapped},          // page version of meminfo Mapped
-  {"nr_page_table_pages", &vm_nr_page_table_pages},// same as meminfo PageTables
-  {"nr_pagecache",        &vm_nr_pagecache},       // gone in 2.5.66+ kernels
-  {"nr_reverse_maps",     &vm_nr_reverse_maps},    // page version of meminfo ReverseMaps GONE
-  {"nr_slab",             &vm_nr_slab},            // page version of meminfo Slab
-  {"nr_unstable",         &vm_nr_unstable},
-  {"nr_writeback",        &vm_nr_writeback},       // page version of meminfo Writeback
-  {"pageoutrun",          &vm_pageoutrun},
-  {"pgactivate",          &vm_pgactivate},
-  {"pgalloc",             &vm_pgalloc},  // GONE (now separate dma,high,normal)
-  {"pgalloc_dma",         &vm_pgalloc_dma},
-  {"pgalloc_high",        &vm_pgalloc_high},
-  {"pgalloc_normal",      &vm_pgalloc_normal},
-  {"pgdeactivate",        &vm_pgdeactivate},
-  {"pgfault",             &vm_pgfault},
-  {"pgfree",              &vm_pgfree},
-  {"pginodesteal",        &vm_pginodesteal},
-  {"pgmajfault",          &vm_pgmajfault},
-  {"pgpgin",              &vm_pgpgin},     // important
-  {"pgpgout",             &vm_pgpgout},     // important
-  {"pgrefill",            &vm_pgrefill},  // GONE (now separate dma,high,normal)
-  {"pgrefill_dma",        &vm_pgrefill_dma},
-  {"pgrefill_high",       &vm_pgrefill_high},
-  {"pgrefill_normal",     &vm_pgrefill_normal},
-  {"pgrotated",           &vm_pgrotated},
-  {"pgscan",              &vm_pgscan},  // GONE (now separate direct,kswapd and dma,high,normal)
-  {"pgscan_direct_dma",   &vm_pgscan_direct_dma},
-  {"pgscan_direct_high",  &vm_pgscan_direct_high},
-  {"pgscan_direct_normal",&vm_pgscan_direct_normal},
-  {"pgscan_kswapd_dma",   &vm_pgscan_kswapd_dma},
-  {"pgscan_kswapd_high",  &vm_pgscan_kswapd_high},
-  {"pgscan_kswapd_normal",&vm_pgscan_kswapd_normal},
-  {"pgsteal",             &vm_pgsteal},  // GONE (now separate dma,high,normal)
-  {"pgsteal_dma",         &vm_pgsteal_dma},
-  {"pgsteal_high",        &vm_pgsteal_high},
-  {"pgsteal_normal",      &vm_pgsteal_normal},
-  {"pswpin",              &vm_pswpin},     // important
-  {"pswpout",             &vm_pswpout},     // important
-  {"slabs_scanned",       &vm_slabs_scanned},
+  	VM_TABENTRY(allocstall),
+	VM_TABENTRY(kswapd_inodesteal),
+	VM_TABENTRY(kswapd_steal),
+	VM_TABENTRY(nr_dirty),
+	VM_TABENTRY(nr_mapped),
+	VM_TABENTRY(nr_page_table_pages),
+	VM_TABENTRY(nr_pagecache),
+	VM_TABENTRY(nr_reverse_maps),
+	VM_TABENTRY(nr_slab),
+	VM_TABENTRY(nr_unstable),
+	VM_TABENTRY(nr_writeback),
+	VM_TABENTRY(pageoutrun),
+	VM_TABENTRY(pgactivate),
+	VM_TABENTRY(pgalloc),
+	VM_TABENTRY(pgalloc_dma),
+	VM_TABENTRY(pgalloc_high),
+	VM_TABENTRY(pgalloc_normal),
+	VM_TABENTRY(pgdeactivate),
+	VM_TABENTRY(pgfault),
+	VM_TABENTRY(pgfree),
+	VM_TABENTRY(pginodesteal),
+	VM_TABENTRY(pgmajfault),
+	VM_TABENTRY(pgpgin),
+	VM_TABENTRY(pgpgout),
+	VM_TABENTRY(pgrefill),
+	VM_TABENTRY(pgrefill_dma),
+	VM_TABENTRY(pgrefill_high),
+	VM_TABENTRY(pgrefill_normal),
+	VM_TABENTRY(pgrotated),
+	VM_TABENTRY(pgscan),
+	VM_TABENTRY(pgscan_direct_dma),
+	VM_TABENTRY(pgscan_direct_high),
+	VM_TABENTRY(pgscan_direct_normal),
+	VM_TABENTRY(pgscan_kswapd_dma),
+	VM_TABENTRY(pgscan_kswapd_high),
+	VM_TABENTRY(pgscan_kswapd_normal),
+	VM_TABENTRY(pgsteal),
+	VM_TABENTRY(pgsteal_dma),
+	VM_TABENTRY(pgsteal_high),
+	VM_TABENTRY(pgsteal_normal),
+	VM_TABENTRY(pswpin),
+	VM_TABENTRY(pswpout),
+	VM_TABENTRY(slabs_scanned)
   };
   const int vm_table_count = sizeof(vm_table)/sizeof(vm_table_struct);
 
@@ -741,7 +744,10 @@
     );
     head = tail+1;
     if(!found) goto nextline;
-    *(found->slot) = strtoul(head,&tail,10);
+    if (found->sz == sizeof(unsigned long long))
+	    *((unsigned long long *) found->slot) = strtoull(head,&tail,10);
+    else
+	    *((unsigned long *) found->slot) = strtoul(head,&tail,10);
 nextline:
 
 //if(found) fprintf(stderr,"%s=%d\n",found->name,*(found->slot));
--- procps-3.2.7/vmstat.c.kzak	2006-08-04 10:52:38.000000000 +0200
+++ procps-3.2.7/vmstat.c	2006-08-04 12:05:49.000000000 +0200
@@ -180,7 +180,7 @@
   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], cpu_zzz[2];
   jiff duse, dsys, didl, diow, dstl, Div, divo2;
-  unsigned long pgpgin[2], pgpgout[2], pswpin[2], pswpout[2];
+  unsigned long long pgpgin[2], pgpgout[2], pswpin[2], pswpout[2];
   unsigned int intr[2], ctxt[2];
   unsigned int sleep_half; 
   unsigned long kb_per_page = sysconf(_SC_PAGESIZE) / 1024ul;
@@ -509,7 +509,7 @@
 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, cpu_zzz;
-  unsigned long pgpgin, pgpgout, pswpin, pswpout;
+  unsigned long long pgpgin, pgpgout, pswpin, pswpout;
   unsigned int intr, ctxt;
 
   meminfo();
@@ -539,10 +539,10 @@
   printf("%13Lu IRQ cpu ticks\n", cpu_xxx);
   printf("%13Lu softirq cpu ticks\n", cpu_yyy);
   printf("%13Lu stolen cpu ticks\n", cpu_zzz);
-  printf("%13lu pages paged in\n", pgpgin);
-  printf("%13lu pages paged out\n", pgpgout);
-  printf("%13lu pages swapped in\n", pswpin);
-  printf("%13lu pages swapped out\n", pswpout);
+  printf("%13llu pages paged in\n", pgpgin);
+  printf("%13llu pages paged out\n", pgpgout);
+  printf("%13llu pages swapped in\n", pswpin);
+  printf("%13llu pages swapped out\n", pswpout);
   printf("%13u interrupts\n", intr);
   printf("%13u CPU context switches\n", ctxt);
   printf("%13u boot time\n", btime);
@@ -554,7 +554,7 @@
 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, cpu_zzz;
-  unsigned long pgpgin, pgpgout, pswpin, pswpout;
+  unsigned long long pgpgin, pgpgout, pswpin, pswpout;
   unsigned int intr, ctxt;
 
   getstat(&cpu_use, &cpu_nic, &cpu_sys, &cpu_idl,


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- procps.spec	3 Aug 2006 12:05:39 -0000	1.52
+++ procps.spec	7 Aug 2006 10:23:37 -0000	1.53
@@ -38,6 +38,8 @@
 Patch17: procps-3.2.7-longcmd.patch
 # 139827 - ps(1) outputs a multi-threads process as a defunct process.
 Patch18: procps-3.2.7-zombie.patch
+# 189349 - 32bit vmstat on 64bit kernel
+Patch19: procps-3.2.7-vmstat-pgpg.patch
 
 BuildRequires: ncurses-devel
 
@@ -80,7 +82,8 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p1
+%patch18 -p1 -b .kzak
+%patch19 -p1
 
 cp %SOURCE1 .
 
@@ -118,6 +121,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Fri Aug  7 2006 Karel Zak <kzak at redhat.com> - 3.2.7-5
+- fix #189349 - 32bit vmstat on 64bit kernel
+
 * Thu Aug  3 2006 Karel Zak <kzak at redhat.com> - 3.2.7-4
 - fix #139827 - ps(1) outputs a multi-threads process as a defunct process.
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 10:28:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 06:28:27 -0400
Subject: rpms/procps/devel procps.spec,1.53,1.54
Message-ID: <200608071028.k77ASRde032722@cvs.devel.redhat.com>

Author: kzak

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

Modified Files:
	procps.spec 
Log Message:
release++ ....


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- procps.spec	7 Aug 2006 10:23:37 -0000	1.53
+++ procps.spec	7 Aug 2006 10:28:25 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug  7 11:02:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 07:02:31 -0400
Subject: rpms/net-tools/devel net-tools.spec,1.74,1.75
Message-ID: <200608071102.k77B2VO7025771@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-tools.spec 
Log Message:
allow netdevice patch


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- net-tools.spec	7 Aug 2006 09:32:55 -0000	1.74
+++ net-tools.spec	7 Aug 2006 11:02:28 -0000	1.75
@@ -131,7 +131,7 @@
 %patch52 -p1 -b .sctp
 %patch53 -p1
 %patch54 -p1 -b .long_iface
-#%patch55 -p1 -b .netdevice
+%patch55 -p1 -b .netdevice
 %patch56 -p1 -b .skip
 
 cp %SOURCE2 ./config.h



From fedora-cvs-commits at redhat.com  Mon Aug  7 12:18:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 08:18:18 -0400
Subject: rpms/control-center/devel control-center-2.15.90-newapi.patch, NONE,
	1.1
Message-ID: <200608071218.k77CIIaa031896@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31882

Added Files:
	control-center-2.15.90-newapi.patch 
Log Message:
- add fix for new libebook api

control-center-2.15.90-newapi.patch:
 gnome-about-me.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE control-center-2.15.90-newapi.patch ---
--- control-center-2.15.90/capplets/about-me/gnome-about-me.c	2006-08-07 14:07:34.000000000 +0200
+++ control-center-2.15.90_new/capplets/about-me/gnome-about-me.c	2006-08-07 14:08:57.000000000 +0200
@@ -452,7 +452,7 @@
 
 	if (photo) {
 		me->have_image = TRUE;
-		e_image_chooser_set_image_data (E_IMAGE_CHOOSER (widget), photo->data, photo->length);
+		e_image_chooser_set_image_data (E_IMAGE_CHOOSER (widget), photo->data.inlined.data, photo->data.inlined.length);
 		e_contact_photo_free (photo);
 	} else {
 		me->have_image = FALSE;
@@ -523,15 +523,15 @@
 		}
 
 		photo = g_new0 (EContactPhoto, 1);
-		photo->data = data;
-		photo->length = length;
+		photo->data.inlined.data = data;
+		photo->data.inlined.length = length;
 		e_contact_set (me->contact, E_CONTACT_PHOTO, photo);
 
 		/* Save the image for GDM */
 		/* FIXME: I would have to read the default used by the gdmgreeter program */
 		file = g_strdup_printf ("%s/.face", g_get_home_dir ());
 		fp = fopen (file, "wb");
-		fwrite (photo->data, 1, photo->length, fp);
+		fwrite (photo->data.inlined.data, 1, photo->data.inlined.length, fp);
 		fclose (fp);
 
 		g_free (file);	



From fedora-cvs-commits at redhat.com  Mon Aug  7 12:18:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 08:18:24 -0400
Subject: rpms/control-center/devel control-center.spec,1.163,1.164
Message-ID: <200608071218.k77CIOGO031919@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31906

Modified Files:
	control-center.spec 
Log Message:
- add fix for new libebook api


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- control-center.spec	6 Aug 2006 17:14:55 -0000	1.163
+++ control-center.spec	7 Aug 2006 12:18:22 -0000	1.164
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -37,6 +37,7 @@
 Patch9: control-center-2.15.4-add-dbus-flags.patch
 # Dobey being unreasonable again
 Patch10: control-center-2.15.4-finish.patch
+Patch11: control-center-2.15.90-newapi.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -81,7 +82,7 @@
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
 # For intltool:
 BuildRequires: perl-XML-Parser >= 2.31-16
-BuildRequires: evolution-data-server-devel
+BuildRequires: evolution-data-server-devel >= 1.7.90
 BuildRequires: libXxf86misc-devel 
 BuildRequires: libxkbfile-devel
 BuildRequires: libXScrnSaver-devel
@@ -131,6 +132,7 @@
 %patch7 -p1 -b .gecos
 %patch9 -p1 -b .add-dbus-flags
 %patch10 -p1 -b .finish
+%patch11 -p1 -b .newapi
 
 %build
 
@@ -249,6 +251,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Aug 07 2006 Karsten Hopp <karsten at redhat.com> 2.15.90-4
+- add fix for new libebook api
+
 * Sun Aug 06 2006 Florian La Roche <laroche at redhat.com>
 - rebuild for deps
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 12:27:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 08:27:42 -0400
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.47,1.48
Message-ID: <200608071227.k77CRgZ4032047@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	alsa-lib.spec 
Log Message:
new upstream


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- alsa-lib.spec	20 Jul 2006 13:15:15 -0000	1.47
+++ alsa-lib.spec	7 Aug 2006 12:27:39 -0000	1.48
@@ -1,10 +1,11 @@
-%define prever         rc1
+%define prever         rc2
+%define prever_dot     .rc2
 %define version_main   1.0.12
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 1.rc1
+Release: 1%{?prever_dot}%{?dist}
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
@@ -89,6 +90,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Mon Aug 07 2006 Martin Stransky <stransky at redhat.com> 1.0.12-1.rc2
+- new upstream
+
 * Thu Jul 20 2006 Martin Stransky <stransky at redhat.com> 1.0.12-1.rc1
 - new upstream
 - removed ainit (no longer needed in the new upstream)



From fedora-cvs-commits at redhat.com  Mon Aug  7 12:28:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 08:28:11 -0400
Subject: rpms/alsa-lib/devel .cvsignore,1.21,1.22 sources,1.23,1.24
Message-ID: <200608071228.k77CSBki032081@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	.cvsignore sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	20 Jul 2006 13:15:15 -0000	1.21
+++ .cvsignore	7 Aug 2006 12:28:08 -0000	1.22
@@ -8,3 +8,4 @@
 alsa-lib-1.0.11rc2.tar.bz2
 ainit-0.7.tar.gz
 alsa-lib-1.0.12rc1.tar.bz2
+alsa-lib-1.0.12rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	20 Jul 2006 13:15:15 -0000	1.23
+++ sources	7 Aug 2006 12:28:08 -0000	1.24
@@ -1 +1,2 @@
 8a3f6d218a9285426556fb3006054725  alsa-lib-1.0.12rc1.tar.bz2
+4062701630b1dc15aa3721eb0a3c23ec  alsa-lib-1.0.12rc2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug  7 12:50:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 08:50:01 -0400
Subject: rpms/alsa-utils/devel .cvsignore, 1.16, 1.17 alsa-utils.spec, 1.43,
	1.44 sources, 1.19, 1.20
Message-ID: <200608071250.k77Co1lQ028371@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	.cvsignore alsa-utils.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	30 May 2006 08:10:30 -0000	1.16
+++ .cvsignore	7 Aug 2006 12:49:58 -0000	1.17
@@ -9,3 +9,4 @@
 alsa-utils-1.0.11rc2.tar.bz2
 alsa-lib-1.0.11.tar.bz2
 alsa-utils-1.0.11.tar.bz2
+alsa-utils-1.0.12rc2.tar.bz2


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- alsa-utils.spec	20 Jul 2006 13:37:32 -0000	1.43
+++ alsa-utils.spec	7 Aug 2006 12:49:58 -0000	1.44
@@ -1,9 +1,10 @@
-%define prever rc1
+%define prever      rc2
+%define prever_dot .rc2
 
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.12
-Release: 	1.rc1
+Release: 	1%{prever_dot}%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -67,6 +68,9 @@
 /usr/share/locale/*
 
 %changelog
+* Mon Aug 07 2006 Martin Stransky <stransky at redhat.com> 1.0.12-1.rc2
+- new upstream
+
 * Thu Jul 20 2006 Martin Stransky <stransky at redhat.com> 1.0.12-1.rc1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	20 Jul 2006 13:36:29 -0000	1.19
+++ sources	7 Aug 2006 12:49:58 -0000	1.20
@@ -1 +1 @@
-fe05a1cad553547e991fd159e22ff5bf  alsa-utils-1.0.12rc1.tar.bz2
+ec3ee0143b0af21effbd112e4458613e  alsa-utils-1.0.12rc2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug  7 12:59:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 08:59:02 -0400
Subject: rpms/udev/devel udev-rules.patch,1.17,1.18 udev.spec,1.177,1.178
Message-ID: <200608071259.k77Cx2e1031527@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31464

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
- fixed CAPI device nodes (bug #139321)
- fixed bug #201422


udev-rules.patch:
 05-udev-early.rules |    1 +
 50-udev.rules       |   12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- udev-rules.patch	12 Jul 2006 09:26:05 -0000	1.17
+++ udev-rules.patch	7 Aug 2006 12:59:00 -0000	1.18
@@ -1,6 +1,16 @@
---- udev-095/etc/udev/redhat/50-udev.rules.rhrules	2006-07-12 11:20:05.000000000 +0200
-+++ udev-095/etc/udev/redhat/50-udev.rules	2006-07-12 11:19:47.000000000 +0200
-@@ -217,8 +217,11 @@
+--- udev-095/etc/udev/redhat/50-udev.rules.rhrules	2006-07-04 12:34:55.000000000 +0200
++++ udev-095/etc/udev/redhat/50-udev.rules	2006-08-07 14:53:56.000000000 +0200
+@@ -28,7 +28,8 @@
+ 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=="capi",                 NAME="capi20", GROUP="uucp", MODE="0660"
++KERNEL=="capi*",                NAME="capi/%n", GROUP="uucp", 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"
+@@ -217,8 +218,11 @@
  KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
  KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
  
@@ -14,7 +24,7 @@
  
  # Section for zaptel device
  KERNEL=="zapctl",     		NAME="zap/ctl"
-@@ -229,8 +232,6 @@
+@@ -229,8 +233,6 @@
  
  KERNEL=="pktcdvd", NAME="%k/control"
  
@@ -23,3 +33,13 @@
  KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
  	SYSFS{device/media}=="floppy", \
  	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
+--- udev-095/etc/udev/redhat/05-udev-early.rules.rhrules	2006-08-07 14:58:23.000000000 +0200
++++ udev-095/etc/udev/redhat/05-udev-early.rules	2006-08-07 14:50:58.000000000 +0200
+@@ -1,6 +1,7 @@
+ # 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"
++ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"                    
+ 
+ # ignore these events until someone needs them
+ SUBSYSTEM=="drivers",		OPTIONS="ignore_device"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- udev.spec	12 Jul 2006 09:27:01 -0000	1.177
+++ udev.spec	7 Aug 2006 12:59:00 -0000	1.178
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -325,6 +325,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Mon Aug  7 2006 Harald Hoyer <harald at redhat.com> - 095-4
+- fixed CAPI device nodes (bug #139321)
+- fixed bug #201422
+
 * Wed Jul 12 2006 Harald Hoyer <harald at redhat.com> - 095-3
 - more infiniband rules (bug #198501)
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 13:08:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 09:08:41 -0400
Subject: rpms/alsa-lib/devel sources,1.24,1.25
Message-ID: <200608071308.k77D8fWv001029@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	sources 
Log Message:
removed old sources


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	7 Aug 2006 12:28:08 -0000	1.24
+++ sources	7 Aug 2006 13:08:38 -0000	1.25
@@ -1,2 +1 @@
-8a3f6d218a9285426556fb3006054725  alsa-lib-1.0.12rc1.tar.bz2
 4062701630b1dc15aa3721eb0a3c23ec  alsa-lib-1.0.12rc2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug  7 13:22:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 09:22:08 -0400
Subject: rpms/lvm2-cluster/FC-5 .cvsignore, 1.4, 1.5 Makefile, 1.4,
	1.5 lvm2-cluster.spec, 1.15, 1.16 sources, 1.4, 1.5
Message-ID: <200608071322.k77DM8oM019446@cvs.devel.redhat.com>

Author: mbroz

Update of /cvs/dist/rpms/lvm2-cluster/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19301

Modified Files:
	.cvsignore Makefile lvm2-cluster.spec sources 
Log Message:
- spec changes for FC-5 branch
- lvm version tarball to match FC-5
- Requires chkconfig, ldconfig, dm and lvm versions
- Exclusive arch set to match dlm, gulm
- Add lvmconf to rpm
- Permissions set to 755 (rpmlint)

VS: ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lvm2-cluster/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Apr 2005 15:52:01 -0000	1.4
+++ .cvsignore	7 Aug 2006 13:22:04 -0000	1.5
@@ -1 +1 @@
-LVM2.2.01.09.tgz
+LVM2.2.02.01.tgz


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/lvm2-cluster/FC-5/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	21 Dec 2004 22:27:01 -0000	1.4
+++ Makefile	7 Aug 2006 13:22:04 -0000	1.5
@@ -1,9 +1,6 @@
 # Makefile for source rpm: lvm2-cluster
-# $Id$
 NAME := lvm2-cluster
 SPECFILE = $(firstword $(wildcard *.spec))
 UPSTREAM_CHECKS = asc
-BHC_FLAGS = -n 
-COLLECTION = dist-fc4
 
 include ../common/Makefile.common


Index: lvm2-cluster.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2-cluster/FC-5/lvm2-cluster.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lvm2-cluster.spec	23 May 2005 21:05:53 -0000	1.15
+++ lvm2-cluster.spec	7 Aug 2006 13:22:04 -0000	1.16
@@ -1,31 +1,32 @@
 Summary: Cluster extenstions for userland logical volume management tools 
 Name: lvm2-cluster
-Version: 2.01.09
-Release: 3.0
+Version: 2.02.01
+Release: 1.0
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
 Source0: LVM2.%{version}.tgz
-Patch0: clvmd-gulm.patch
-Patch1: clvmd-init.patch
-Patch2: clvmd-init-chkconfig.patch
+Patch0: clvmd-init-chkconfig.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper >= 1.01
-BuildRequires: libselinux-devel
+Requires(post): chkconfig
+Requires(post): ldconfig
+Requires(preun): chkconfig
+Requires(preun): device-mapper >= 1.02.02
+Requires(preun): lvm2 >= 2.02
+Requires(postun): ldconfig
+BuildRequires: device-mapper >= 1.02.02
+BuildRequires: libselinux-devel, libsepol-devel
 BuildRequires: dlm-devel, gulm-devel, ccs-devel
-Requires: lvm2 >= 2.01
-ExclusiveArch: i386 ppc ppc64 x86_64
-%define _exec_prefix /usr
+Requires: lvm2 >= 2.02
+ExclusiveArch: %{ix86} x86_64
 
 %description
-Extensions to LVM2 for clusters.
+Extensions to LVM2 to support clusters.
 
 %prep
 %setup -q -n LVM2.%{version}
 
-%patch0 -p1 -b .gulm
-%patch1 -p1 -b .init
-%patch2 -p1 -b .chkconfig
+%patch0 -p1 -b .chkconfig
 
 %build
 %configure --with-clvmd=all --with-cluster=shared --with-user= --with-group=
@@ -36,27 +37,41 @@
 make install_cluster DESTDIR=$RPM_BUILD_ROOT
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 install scripts/clvmd_init_rhel4 $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd
+install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/usr/sbin/lvmconf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add clvmd
+/sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %preun
 if [ "$1" = 0 ]; then
-        /sbin/chkconfig --del clvmd
+    /sbin/chkconfig --del clvmd
+    /usr/sbin/lvmconf --disable-cluster
 fi
 
 %files
 %defattr(-,root,root,-)
-/usr/sbin/clvmd
-%{_libdir}/liblvm2clusterlock.so
-%{_libdir}/liblvm2clusterlock.so.2.01
+%attr(755,root,root) %{_sbindir}/clvmd
+%{_sbindir}/lvmconf
+%attr(755,root,root) %{_libdir}/liblvm2clusterlock.so
+%attr(755,root,root) %{_libdir}/liblvm2clusterlock.so.2.02
 %{_mandir}/man8/clvmd.8.gz
-%config /etc/rc.d/init.d/clvmd
+/etc/rc.d/init.d/clvmd
 
 %changelog
+* Mon Aug 07 2006 Milan Broz <mbroz at redhat.com> - 2.02.01-1.0
+- spec changes for FC-5 branch
+- lvm version tarball to match FC-5
+- Requires chkconfig, ldconfig, dm and lvm versions
+- Exclusive arch set to match dlm, gulm
+- Add lvmconf to rpm
+- Permissions set to 755 (rpmlint)
+
 * Mon May 23 2005 Alasdair Kergon <agk at redhat.com> - 2.01.09-3.0
 - Changed arch again, now: 'ExclusiveArch: i386 ppc ppc64 x86_64'
 - Fix clvmd init script.
@@ -97,7 +112,7 @@
 - Added init script for clvm.
 
 * Wed Dec 15 2004 Chris Feist <cfeist at redhat.com> - 2.00.29-1.11
-- Use %{_libdir} which fixes 64 bit architecture build problems.
+- Use %%{_libdir} which fixes 64 bit architecture build problems.
 
 * Wed Dec 1 2004 Alasdair Kergon <agk at redhat.com> - 2.00.29-1.2
 - Remove superfluous Requires.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lvm2-cluster/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Apr 2005 15:52:01 -0000	1.4
+++ sources	7 Aug 2006 13:22:04 -0000	1.5
@@ -1 +1 @@
-ed6fe3b734d05c6497cfa4f9932046e6  LVM2.2.01.09.tgz
+5514514bd7992fa0597406ca2f80d0e5  LVM2.2.02.01.tgz



From fedora-cvs-commits at redhat.com  Mon Aug  7 13:23:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 09:23:02 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.128.ooo54479.systemicu.patch, 1.12,
	1.13 openoffice.org.spec, 1.823, 1.824
Message-ID: <200608071323.k77DN20B019751@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.128.ooo54479.systemicu.patch 
	openoffice.org.spec 
Log Message:
icu syntax silently changed

openoffice.org-1.9.128.ooo54479.systemicu.patch:
 config_office/configure.in                              |   52 ++++++++--------
 config_office/set_soenv.in                              |    6 -
 i18npool/prj/build.lst                                  |    2 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   19 ++++-
 i18npool/source/breakiterator/makefile.mk               |   16 ++--
 i18npool/source/collator/collator_unicode.cxx           |   32 ++++-----
 i18npool/source/collator/gencoll_rule.cxx               |    4 -
 linguistic/source/hhconvdic.cxx                         |    2 
 prj/build.lst                                           |    0 
 scp2/prj/build.lst                                      |    2 
 scp2/source/ooo/file_library_ooo.scp                    |    4 +
 scp2/source/ooo/makefile.mk                             |   11 ++-
 scp2/source/ooo/shortcut_ooo.scp                        |   30 ---------
 source/breakiterator/breakiterator_unicode.cxx          |    0 
 source/breakiterator/makefile.mk                        |    0 
 source/collator/collator_unicode.cxx                    |    0 
 source/collator/gencoll_rule.cxx                        |    0 
 source/hhconvdic.cxx                                    |    0 
 vcl/prj/build.lst                                       |    2 
 19 files changed, 82 insertions(+), 100 deletions(-)

Index: openoffice.org-1.9.128.ooo54479.systemicu.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.128.ooo54479.systemicu.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openoffice.org-1.9.128.ooo54479.systemicu.patch	8 May 2006 15:32:55 -0000	1.12
+++ openoffice.org-1.9.128.ooo54479.systemicu.patch	7 Aug 2006 13:23:00 -0000	1.13
@@ -86,82 +86,6 @@
  ToFile( "SYSTEM_JPEG",       "@SYSTEM_JPEG@",      "e" );
  ToFile( "SYSTEM_FREETYPE",   "@SYSTEM_FREETYPE@",  "e" );
  ToFile( "FREETYPE_CFLAGS",   "@FREETYPE_CFLAGS@",  "e" );
-Index: inc/collator_unicode.hxx
-===================================================================
-RCS file: /cvs/l10n/i18npool/inc/collator_unicode.hxx,v
-retrieving revision 1.7
-diff -u -p -u -r1.7 collator_unicode.hxx
---- openoffice.org.orig/i18npool/inc/collator_unicode.hxx	21 Jul 2005 14:26:51 -0000	1.7
-+++ openoffice.org/i18npool/inc/collator_unicode.hxx	13 Sep 2005 13:49:44 -0000
-@@ -110,6 +110,7 @@ protected:
-     const sal_uInt8 *rulesImage;
- private:
- 	RuleBasedCollator *collator;
-+	RuleBasedCollator *ucacollator;
- };
- 
- #define COLLATOR( algorithm ) \
-Index: source/breakiterator/makefile.mk
-===================================================================
-RCS file: /cvs/l10n/i18npool/source/breakiterator/makefile.mk,v
-retrieving revision 1.7
-diff -u -p -u -r1.7 makefile.mk
---- openoffice.org.orig/i18npool/source/breakiterator/makefile.mk	23 Mar 2005 10:51:00 -0000	1.7
-+++ openoffice.org/i18npool/source/breakiterator/makefile.mk	13 Sep 2005 13:49:44 -0000
-@@ -79,6 +79,8 @@ MY_BRK_TXTFILES:=$(shell ls data/*.txt)
- # insert "OpenOffice" as icu package name in front of the  name of each rule file for searching on application provided data
- MY_BRK_BRKFILES:=$(subst,data/,$(MISC)$/OpenOffice_ $(MY_BRK_TXTFILES:s/.txt/.brk/))
- 
-+MY_BRK_NAMEDBRKFILES:=$(subst,data/,OpenOffice_ $(MY_BRK_TXTFILES:s/.txt/.brk/))
-+
- # OpenOffice_icu_dat.c is a generated file from the rule file list by gencmn
- MY_MISC_CXXFILES := \
-         $(MISC)$/OpenOffice_icu_dat.c \
-@@ -107,8 +109,8 @@ APP1STDLIBS = $(SALLIB) \
- 
- # 'gencmn', 'genbrk' and 'genccode' are tools generated and delivered by icu project to process icu breakiterator rules.
- $(MISC)$/OpenOffice_icu_dat.c :  $(MY_BRK_BRKFILES)
--    +$(WRAPCMD) $(SOLARBINDIR)$/gencmn -e OpenOffice_icu -n OpenOffice_icu -S -d $(MISC) O $(mktmp $(MY_BRK_BRKFILES:t"\n"))
-+    +$(WRAPCMD) gencmn -e OpenOffice_icu -n OpenOffice_icu -S -d $(MISC) O $(mktmp $(MY_BRK_NAMEDBRKFILES:t"\n"))
- $(MISC)$/OpenOffice_%.brk : data/%.txt
--    +$(WRAPCMD) $(SOLARBINDIR)$/genbrk -r $< -o $(MISC)$/OpenOffice_$*.brk
-+    +$(WRAPCMD) genbrk -r $< -o $(MISC)$/OpenOffice_$*.brk
- $(MISC)$/%_brk.c : $(MISC)$/%.brk
--    +$(WRAPCMD) $(SOLARBINDIR)$/genccode -d $(MISC)$ $(MISC)$/$*.brk
-+    +$(WRAPCMD) genccode -e OpenOffice_icu -n OpenOffice_icu -d $(MISC)$ $(MISC)$/$*.brk
-Index: source/collator/collator_unicode.cxx
-===================================================================
-RCS file: /cvs/l10n/i18npool/source/collator/collator_unicode.cxx,v
-retrieving revision 1.7
-diff -u -p -u -r1.7 collator_unicode.cxx
---- openoffice.org.orig/i18npool/source/collator/collator_unicode.cxx	30 Jul 2004 14:39:21 -0000	1.7
-+++ openoffice.org/i18npool/source/collator/collator_unicode.cxx	13 Sep 2005 13:49:44 -0000
-@@ -48,11 +48,13 @@
- {
- 	implementationName = "com.sun.star.i18n.Collator_Unicode";
- 	collator = NULL;
-+	ucacollator = NULL;
- }
- 
- Collator_Unicode::~Collator_Unicode()
- {
- 	if (collator) delete collator;
-+	if (ucacollator) delete ucacollator;
- }
- 
- sal_Int32 SAL_CALL
-@@ -108,7 +110,10 @@
-                 }
-                 if (func) {
-                     const sal_uInt8* ruleImage=func();
--                    collator = new RuleBasedCollator(reinterpret_cast<const uint8_t*>(ruleImage), status);
-+                    ucacollator = (RuleBasedCollator*) icu::Collator::createInstance("", status);
-+                    if (! U_SUCCESS(status))
-+                        throw RuntimeException();
-+                    collator = new RuleBasedCollator(ruleImage, -1, ucacollator, status);
-                     if (! U_SUCCESS(status))
-                         throw RuntimeException();
-                 }
 Index: source/hhconvdic.cxx
 ===================================================================
 RCS file: /cvs/sw/linguistic/source/hhconvdic.cxx,v
@@ -346,10 +270,10 @@
 Index: prj/build.lst
 ===================================================================
 RCS file: /cvs/l10n/i18npool/prj/build.lst,v
-retrieving revision 1.18
-diff -u -r1.18 build.lst
---- openoffice.org.orig/i18npool/prj/build.lst	1 Nov 2005 14:51:56 -0000	1.18
-+++ openoffice.org/i18npool/prj/build.lst	5 Nov 2005 16:13:03 -0000
+retrieving revision 1.20
+diff -u -r1.20 build.lst
+--- openoffice.org.orig/i18npool/prj/build.lst	7 Apr 2006 14:30:57 -0000	1.20
++++ openoffice.org/i18npool/prj/build.lst	7 Aug 2006 12:47:54 -0000
 @@ -1,4 +1,4 @@
 -inp  i18npool    :   bridges sax stoc comphelper icu i18nutil regexp NULL
 +inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil regexp NULL
@@ -359,45 +283,169 @@
 Index: source/breakiterator/breakiterator_unicode.cxx
 ===================================================================
 RCS file: /cvs/l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx,v
-retrieving revision 1.20
-diff -u -r1.20 breakiterator_unicode.cxx
---- openoffice.org.orgi/i18npool/source/breakiterator/breakiterator_unicode.cxx	17 Oct 2005 15:42:30 -0000	1.20
-+++ openoffice.org/i18npool/source/breakiterator/breakiterator_unicode.cxx	5 Nov 2005 16:14:56 -0000
-@@ -42,7 +42,9 @@
- extern const char OpenOffice_icu_dat[];
+retrieving revision 1.22
+diff -u -r1.22 breakiterator_unicode.cxx
+--- openoffice.org.orig/i18npool/source/breakiterator/breakiterator_unicode.cxx	17 Nov 2005 20:30:35 -0000	1.22
++++ openoffice.org/i18npool/source/breakiterator/breakiterator_unicode.cxx	7 Aug 2006 12:47:55 -0000
+@@ -37,9 +37,10 @@
+ #include <unicode/locid.h>
+ #include <unicode/rbbi.h>
+ #include <unicode/udata.h>
++#include <rtl/strbuf.hxx>
+ 
+ U_CDECL_BEGIN
+-extern const char OpenOffice_icu_dat[];
++extern const char OpenOffice_dat[];
  U_CDECL_END
  
--using namespace ::com::sun::star::uno;
-+using ::com::sun::star::uno::RuntimeException;
-+using ::com::sun::star::uno::Reference;
-+using ::com::sun::star::uno::Sequence;
- using namespace ::com::sun::star::lang;
- using namespace ::rtl;
+ using namespace ::com::sun::star::uno;
+@@ -99,16 +100,22 @@
+                         rWordType == WordType::DICTIONARY_WORD ? "dict_word" : "edit_word";
  
-@@ -103,13 +105,21 @@
+             status = U_ZERO_ERROR;
+-            udata_setAppData("OpenOffice", OpenOffice_icu_dat, &status);
++            udata_setAppData("OpenOffice", OpenOffice_dat, &status);
              if ( !U_SUCCESS(status) ) throw ERROR;
  
              status = U_ZERO_ERROR;
 -            icuBI->aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", 
-+            UDataMemory *pData;
-+            if (!rLocale.Language.getLength())
-+                pData=0;
-+            else
-+                pData = udata_open("OpenOffice_icu/OpenOffice", "brk", 
-                     OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
+-                    OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
 -                    RTL_TEXTENCODING_ASCII_US).getStr(), &status), status);
--            if (!U_SUCCESS(status) ) {
-+                    RTL_TEXTENCODING_ASCII_US).getStr(), &status);
-+
-+            icuBI->aBreakIterator = (pData && U_SUCCESS(status)) ? new RuleBasedBreakIterator(pData, status) : 0;
-+
-+            if ((!U_SUCCESS(status) || !icuBI->aBreakIterator)) {
++            OStringBuffer aUDName(64);
++            aUDName.append(rule);
++            aUDName.append('_');
++            aUDName.append( OUStringToOString(rLocale.Language, RTL_TEXTENCODING_ASCII_US));
++            UDataMemory* pUData = udata_open("OpenOffice", "brk", aUDName.getStr(), &status);
++            if( U_SUCCESS(status) )
++                icuBI->aBreakIterator = new RuleBasedBreakIterator( pUData, status);
+             if (!U_SUCCESS(status) ) {
                  status = U_ZERO_ERROR;
 -                icuBI->aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", rule, &status), status);
--                if (!U_SUCCESS(status) ) icuBI->aBreakIterator=NULL;
-+                pData = udata_open("OpenOffice_icu/OpenOffice", "brk", rule, &status);
-+                icuBI->aBreakIterator = (pData && U_SUCCESS(status)) ? new RuleBasedBreakIterator(pData, status) : 0;
-+                if (!U_SUCCESS(status) ) icuBI->aBreakIterator=NULL;
++                pUData = udata_open("OpenOffice", "brk", rule, &status);
++                if( U_SUCCESS(status) )
++                    icuBI->aBreakIterator = new RuleBasedBreakIterator( pUData, status);
+                 if (!U_SUCCESS(status) ) icuBI->aBreakIterator=NULL;
+             }
+         }
+Index: source/breakiterator/makefile.mk
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/breakiterator/makefile.mk,v
+retrieving revision 1.9
+diff -u -r1.9 makefile.mk
+--- openoffice.org.orig/i18npool/source/breakiterator/makefile.mk	1 Nov 2005 14:52:19 -0000	1.9
++++ openoffice.org/i18npool/source/breakiterator/makefile.mk	7 Aug 2006 12:47:55 -0000
+@@ -51,11 +51,11 @@
+ MY_BRK_TXTFILES:=$(shell ls data/*.txt)
+ 
+ # insert "OpenOffice" as icu package name in front of the  name of each rule file for searching on application provided data
+-MY_BRK_BRKFILES:=$(subst,data/,$(MISC)$/OpenOffice_ $(MY_BRK_TXTFILES:s/.txt/.brk/))
++MY_BRK_BRKFILES:=$(subst,data/,$(MISC)$/ $(MY_BRK_TXTFILES:s/.txt/.brk/))
+ 
+-# OpenOffice_icu_dat.c is a generated file from the rule file list by gencmn
++# OpenOffice_dat.c is a generated file from the rule file list by gencmn
+ MY_MISC_CXXFILES := \
+-        $(MISC)$/OpenOffice_icu_dat.c \
++        $(MISC)$/OpenOffice_dat.c \
+         $(MY_BRK_BRKFILES:s/.brk/_brk.c/)
+ 
+ SLOFILES=   \
+@@ -79,9 +79,9 @@
+ .INCLUDE :	target.mk
+ 
+ # 'gencmn', 'genbrk' and 'genccode' are tools generated and delivered by icu project to process icu breakiterator rules.
+-$(MISC)$/OpenOffice_icu_dat.c :  $(MY_BRK_BRKFILES)
+-    +$(WRAPCMD) $(SOLARBINDIR)$/gencmn -e OpenOffice_icu -n OpenOffice_icu -S -d $(MISC) O $(mktmp $(MY_BRK_BRKFILES:t"\n"))
+-$(MISC)$/OpenOffice_%.brk : data/%.txt
+-    +$(WRAPCMD) $(SOLARBINDIR)$/genbrk -r $< -o $(MISC)$/OpenOffice_$*.brk
++$(MISC)$/OpenOffice_dat.c :  $(MY_BRK_BRKFILES) makefile.mk
++    +$(WRAPCMD) gencmn -n OpenOffice -S -d $(MISC) O $(mktmp $(subst,$(MISC)$/, $(MY_BRK_BRKFILES:t"\n")))
++$(MISC)$/%.brk : data/%.txt
++    +$(WRAPCMD) genbrk -r $< -o $(MISC)$/$*.brk
+ $(MISC)$/%_brk.c : $(MISC)$/%.brk
+-    +$(WRAPCMD) $(SOLARBINDIR)$/genccode -d $(MISC)$ $(MISC)$/$*.brk
++    +$(WRAPCMD) genccode -n OpenOffice -d $(MISC)$ $(MISC)$/$*.brk
+Index: source/collator/collator_unicode.cxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/collator/collator_unicode.cxx,v
+retrieving revision 1.12
+diff -u -r1.12 collator_unicode.cxx
+--- openoffice.org.orig/i18npool/source/collator/collator_unicode.cxx	20 Apr 2006 13:41:49 -0000	1.12
++++ openoffice.org/i18npool/source/collator/collator_unicode.cxx	7 Aug 2006 12:47:56 -0000
+@@ -73,8 +73,21 @@
+ 	throw(RuntimeException)
+ {
+ 	if (!collator) {
++        /** ICU collators are loaded using a locale only.
++            ICU uses Variant as collation algorithm name (like de__PHONEBOOK
++            locale), note the empty territory (Country) designator in this special
++            case here. The icu::Locale contructor changes the algorithm name to
++            uppercase itself, so we don't have to bother with that.
++        */
++        icu::Locale icuLocale(
++               OUStringToOString(rLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(),
++               OUStringToOString(rLocale.Country, RTL_TEXTENCODING_ASCII_US).getStr(),
++               OUStringToOString(rAlgorithm, RTL_TEXTENCODING_ASCII_US).getStr());
+         // load ICU collator
+         UErrorCode status = U_ZERO_ERROR;
++        collator = (RuleBasedCollator*) icu::Collator::createInstance(icuLocale, status);
++        if (! U_SUCCESS(status))
++            throw RuntimeException();
+         if (OUString::createFromAscii(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) {
+             OUStringBuffer aBuf;
+ #ifdef SAL_DLLPREFIX
+@@ -108,29 +121,12 @@
+                 }
+                 if (func) {
+                     const sal_uInt8* ruleImage=func();
+-                    collator = new RuleBasedCollator(reinterpret_cast<const uint8_t*>(ruleImage), status);
++                    collator = new RuleBasedCollator(reinterpret_cast<const uint8_t*>(ruleImage), -1, collator, status);
+                     if (! U_SUCCESS(status))
+                         throw RuntimeException();
+                 }
+                 osl_unloadModule(hModule);
              }
+-        }
+-        if (!collator) {
+-           // load ICU collator
+-            /** ICU collators are loaded using a locale only.
+-                ICU uses Variant as collation algorithm name (like de__PHONEBOOK
+-                locale), note the empty territory (Country) designator in this special
+-                case here. The icu::Locale contructor changes the algorithm name to
+-                uppercase itself, so we don't have to bother with that.
+-            */
+-           icu::Locale icuLocale(
+-                   OUStringToOString(rLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(),
+-                   OUStringToOString(rLocale.Country, RTL_TEXTENCODING_ASCII_US).getStr(),
+-                   OUStringToOString(rAlgorithm, RTL_TEXTENCODING_ASCII_US).getStr());
+-
+-            collator = (RuleBasedCollator*) icu::Collator::createInstance(icuLocale, status);
+-            if (! U_SUCCESS(status))
+-                throw RuntimeException();
          }
+     }
+ 
+Index: source/collator/gencoll_rule.cxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/collator/gencoll_rule.cxx,v
+retrieving revision 1.7
+diff -u -r1.7 gencoll_rule.cxx
+--- openoffice.org.orig/i18npool/source/collator/gencoll_rule.cxx	31 Jan 2006 18:36:13 -0000	1.7
++++ openoffice.org/i18npool/source/collator/gencoll_rule.cxx	7 Aug 2006 12:47:56 -0000
+@@ -81,9 +81,6 @@
+ 
+ }
+ 
+-U_CAPI uint8_t* U_EXPORT2
+-ucol_cloneRuleData(const UCollator *coll, int32_t *length, UErrorCode *status);
+-
+ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
+ {
+ 	FILE *fp;
+@@ -125,7 +122,6 @@
+     if (U_SUCCESS(status)) {
+ 
+         int32_t len = 0;
+-        //uint8_t *data = ucol_cloneRuleData(coll, &len, &status);
+         uint8_t *data = coll->cloneRuleData(len, status);
  
+         if (U_SUCCESS(status) && data != NULL)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.823
retrieving revision 1.824
diff -u -r1.823 -r1.824
--- openoffice.org.spec	5 Aug 2006 12:28:04 -0000	1.823
+++ openoffice.org.spec	7 Aug 2006 13:23:00 -0000	1.824
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 8
+%define rh_rpm_release 9
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2516,6 +2516,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Aug 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
+- icu syntax changed :-(
+
 * Mon Jul 31 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.8
 - add openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
 - rh#200703# -> openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch



From fedora-cvs-commits at redhat.com  Mon Aug  7 13:34:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 09:34:36 -0400
Subject: rpms/lvm2-cluster/FC-5 LVM2.2.01.07.tgz.asc, 1.1,
	NONE LVM2.2.01.09.tgz.asc, 1.1, NONE clvmd-gulm.patch, 1.1,
	NONE clvmd-init.patch, 1.1, NONE
Message-ID: <200608071334.k77DYaCc023520@cvs.devel.redhat.com>

Author: mbroz

Update of /cvs/dist/rpms/lvm2-cluster/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23390

Removed Files:
	LVM2.2.01.07.tgz.asc LVM2.2.01.09.tgz.asc clvmd-gulm.patch 
	clvmd-init.patch 
Log Message:
- removing old patches




--- LVM2.2.01.07.tgz.asc DELETED ---


--- LVM2.2.01.09.tgz.asc DELETED ---


--- clvmd-gulm.patch DELETED ---


--- clvmd-init.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug  7 13:49:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 09:49:25 -0400
Subject: rpms/lvm2-cluster/FC-5 lvm2-cluster.spec,1.16,1.17
Message-ID: <200608071349.k77DnPAO010277@cvs.devel.redhat.com>

Author: mbroz

Update of /cvs/dist/rpms/lvm2-cluster/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10070

Modified Files:
	lvm2-cluster.spec 
Log Message:
- tag for FC5



Index: lvm2-cluster.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2-cluster/FC-5/lvm2-cluster.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lvm2-cluster.spec	7 Aug 2006 13:22:04 -0000	1.16
+++ lvm2-cluster.spec	7 Aug 2006 13:49:23 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Cluster extenstions for userland logical volume management tools 
 Name: lvm2-cluster
 Version: 2.02.01
-Release: 1.0
+Release: 1.0.FC5
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2



From fedora-cvs-commits at redhat.com  Mon Aug  7 13:55:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 09:55:09 -0400
Subject: rpms/kdenetwork/devel kdenetwork-3.5.4-kde#130630.patch, NONE,
	1.1 kdenetwork.spec, 1.86,
	1.87 kdenetwork-3.5.3-kde#77626.patch, 1.1,
	NONE kdenetwork-3.5.3.diff, 1.1, NONE
Message-ID: <200608071355.k77Dt9gK012502@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-3.5.4-kde#130630.patch 
Removed Files:
	kdenetwork-3.5.3-kde#77626.patch kdenetwork-3.5.3.diff 
Log Message:
- apply upstream patch,
    no connection to icq-server kde#130630


kdenetwork-3.5.4-kde#130630.patch:
 oscartypes.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdenetwork-3.5.4-kde#130630.patch ---
Index: kopete/protocols/oscar/liboscar/oscartypes.h
===================================================================
--- kopete/protocols/oscar/liboscar/oscartypes.h	(Revision 568262)
+++ kopete/protocols/oscar/liboscar/oscartypes.h	(Revision 568263)
@@ -237,7 +237,7 @@
 	const WORD ICQ_MAJOR 			= 0x0014;
 	const WORD ICQ_MINOR 			= 0x0034;
 	const WORD ICQ_POINT 			= 0x0000;
-	const WORD ICQ_BUILD 			= 0x0A0F;
+	const WORD ICQ_BUILD 			= 0x0BB8;
 	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
 	const char ICQ_COUNTRY[] 		= "us";
 	const char ICQ_LANG[] 			= "en";


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kdenetwork.spec	24 Jul 2006 16:07:31 -0000	1.86
+++ kdenetwork.spec	7 Aug 2006 13:55:07 -0000	1.87
@@ -13,7 +13,7 @@
 
 Name: kdenetwork
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -36,8 +36,7 @@
 Patch5: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
 
 # upstream patches
-Patch100: kdenetwork-3.5.3.diff
-Patch101: kdenetwork-3.5.3-kde#77626.patch
+Patch100: kdenetwork-3.5.4-kde#130630.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -84,8 +83,7 @@
 %patch5 -p1 -b .libgadu-va_copy
 
 # upstream patches
-#%patch100 -p0 -b .setuid-check
-#%patch101 -p0 -b .kde#77626
+%patch100 -p0 -b .kde#130630
 
 echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
 
@@ -229,6 +227,10 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Mon Aug 07 2006 Than Ngo <than at redhat.com> 7:3.5.4-1
+- apply upstream patch,
+    no connection to icq-server kde#130630
+
 * Mon Jul 24 2006 Petr Rockai <prockai at redhat.com> 7:3.5.4-0.pre1
 - prerelease of kde 3.5.4 (from the first-cut tag)
 


--- kdenetwork-3.5.3-kde#77626.patch DELETED ---


--- kdenetwork-3.5.3.diff DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug  7 14:18:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 10:18:27 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-edid-mode-injection-2.patch, 1.3,
	1.4 xorg-x11-server.spec, 1.140, 1.141
Message-ID: <200608071418.k77EIRVl001333@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server-1.1.0-edid-mode-injection-2.patch 
	xorg-x11-server.spec 
Log Message:
* Mon Aug  7 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-16.fc6
- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Off-by-one error in
  range storage.


xorg-x11-server-1.1.0-edid-mode-injection-2.patch:
 common/xf86Config.c |    1 
 common/xf86Mode.c   |    6 ++++
 common/xf86str.h    |    1 
 ddc/ddcProperty.c   |   64 ++++++++++++++++++++++++++++++++++++++--------------
 4 files changed, 54 insertions(+), 18 deletions(-)

Index: xorg-x11-server-1.1.0-edid-mode-injection-2.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-edid-mode-injection-2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-server-1.1.0-edid-mode-injection-2.patch	3 Aug 2006 23:18:09 -0000	1.3
+++ xorg-x11-server-1.1.0-edid-mode-injection-2.patch	7 Aug 2006 14:18:24 -0000	1.4
@@ -106,11 +106,11 @@
 +		if (!Monitor->nHsync)
 +		    xf86DrvMsg(scrnIndex, X_INFO,
 +			    "Using EDID range info for horizontal sync\n");
-+		Monitor->nHsync++;
 +		Monitor->hsync[Monitor->nHsync].lo =
 +		    DDC->det_mon[i].section.ranges.min_h;
 +		Monitor->hsync[Monitor->nHsync].hi =
 +		    DDC->det_mon[i].section.ranges.max_h;
++		Monitor->nHsync++;
 +	    } else {
 +		xf86DrvMsg(scrnIndex, X_INFO,
 +			"Using hsync ranges from config file\n");
@@ -120,11 +120,11 @@
 +		if (!Monitor->nVrefresh)
 +		    xf86DrvMsg(scrnIndex, X_INFO,
 +			    "Using EDID range info for vertical refresh\n");
-+		Monitor->nVrefresh++;
 +		Monitor->vrefresh[Monitor->nVrefresh].lo =
 +		    DDC->det_mon[i].section.ranges.min_v;
 +		Monitor->vrefresh[Monitor->nVrefresh].hi =
 +		    DDC->det_mon[i].section.ranges.max_v;
++		Monitor->nVrefresh++;
 +	    } else {
 +		xf86DrvMsg(scrnIndex, X_INFO,
 +			"Using vrefresh ranges from config file\n");


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- xorg-x11-server.spec	3 Aug 2006 23:19:35 -0000	1.140
+++ xorg-x11-server.spec	7 Aug 2006 14:18:24 -0000	1.141
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   15%{?dist}
+Release:   16%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -678,6 +678,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Aug  7 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-16.fc6
+- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Off-by-one error in
+  range storage.
+
 * Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-15.fc6
 - xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Allow HorizSync and
   VertRefresh to be overridden independently.



From fedora-cvs-commits at redhat.com  Mon Aug  7 14:35:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 10:35:51 -0400
Subject: rpms/mdadm/devel .cvsignore, 1.13, 1.14 mdadm.spec, 1.32,
	1.33 sources, 1.13, 1.14
Message-ID: <200608071435.k77EZp0v006552@cvs.devel.redhat.com>

Author: dledford

Update of /cvs/dist/rpms/mdadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6515

Modified Files:
	.cvsignore mdadm.spec sources 
Log Message:
Update to 2.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	7 Jul 2006 19:24:16 -0000	1.13
+++ .cvsignore	7 Aug 2006 14:35:49 -0000	1.14
@@ -2,3 +2,4 @@
 mdadm-2.2.tar.bz2
 mdadm-2.3.1.tgz
 mdadm-2.5.2.tar.bz2
+mdadm-2.5.3.tar.bz2


Index: mdadm.spec
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mdadm.spec	12 Jul 2006 07:19:51 -0000	1.32
+++ mdadm.spec	7 Aug 2006 14:35:49 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:     mdadm controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     2.5.2
-Release: 1.1
+Version:     2.5.3
+Release: 1
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     mdmpd-0.4.tgz
@@ -87,6 +87,9 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Mon Aug  7 2006 Doug Ledford <dledford at redhat.com> - 2.5.3-1
+- Update to 2.5.3 which upstream calls a "bug fix" release
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.5.2-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	7 Jul 2006 19:24:16 -0000	1.13
+++ sources	7 Aug 2006 14:35:49 -0000	1.14
@@ -1,2 +1,2 @@
 d173fc81f2cc11cb84522fac63e876f1  mdmpd-0.4.tgz
-f95d58d3ce8d43c628345d76197ce97b  mdadm-2.5.2.tar.bz2
+9ca780fbb2002e935ba5f7a21e50ab66  mdadm-2.5.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug  7 14:41:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 10:41:14 -0400
Subject: rpms/eject/devel eject-timeout.patch,NONE,1.1 eject.spec,1.25,1.26
Message-ID: <200608071441.k77EfEBZ008189@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/eject/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7961

Modified Files:
	eject.spec 
Added Files:
	eject-timeout.patch 
Log Message:
apply patch to fix timeout issue



eject-timeout.patch:
 eject.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eject-timeout.patch ---
--- eject/eject.c.orig	2006-08-07 16:35:15.000000000 +0200
+++ eject/eject.c	2006-08-07 16:35:54.000000000 +0200
@@ -723,7 +723,7 @@
 	io_hdr.dxfer_len = 0;
 	io_hdr.dxferp = inqBuff;
 	io_hdr.sbp = sense_buffer;
-	io_hdr.timeout = 2000;
+	io_hdr.timeout = 10000;
 
 	io_hdr.cmdp = allowRmBlk;
 	status = ioctl(fd, SG_IO, (void *)&io_hdr);


Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/eject.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- eject.spec	12 Jul 2006 05:43:39 -0000	1.25
+++ eject.spec	7 Aug 2006 14:41:12 -0000	1.26
@@ -1,11 +1,12 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
 Version: 2.1.5
-Release: 1.1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
 Patch1: eject-2.1.1-verbose.patch
+Patch2: eject-timeout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 URL: http://www.pobox.com/~tranter
 ExcludeArch: s390 s390x
@@ -26,6 +27,7 @@
 %prep
 %setup -q -n %{name}
 %patch1 -p1 -b .versbose
+%patch2 -p1 -b .timeout
 
 %build
 %configure
@@ -49,6 +51,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 07 2006 Than Ngo <than at redhat.com> 2.1.5-2
+- apply patch to fix timeout issue
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1.5-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 14:50:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 10:50:54 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.30, 1.31 rhpxl.spec, 1.35,
	1.36 sources, 1.33, 1.34
Message-ID: <200608071450.k77Eor5c026677@cvs.devel.redhat.com>

Author: clumens

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	1 Aug 2006 21:09:01 -0000	1.30
+++ .cvsignore	7 Aug 2006 14:50:51 -0000	1.31
@@ -8,3 +8,4 @@
 rhpxl-0.25.tar.gz
 rhpxl-0.26.tar.gz
 rhpxl-0.27.tar.gz
+rhpxl-0.28.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- rhpxl.spec	1 Aug 2006 21:09:01 -0000	1.35
+++ rhpxl.spec	7 Aug 2006 14:50:51 -0000	1.36
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.27
+Version: 0.28
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,10 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Mon Aug 07 2006 Chris Lumens <clumens at redhat.com> 0.28-1
+- Fixes to init_from_xconfig for system-config-display.
+- Close X server stdout and stderr as having two log files is confusing.
+
 * Tue Aug 01 2006 Chris Lumens <clumens at redhat.com> 0.27-1
 - Don't traceback if there's no module list.
 - Return default strings if monitor or video card names are None.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	1 Aug 2006 21:09:01 -0000	1.33
+++ sources	7 Aug 2006 14:50:51 -0000	1.34
@@ -1 +1 @@
-cf9df50b1d024f087cb9bae9a6722cc9  rhpxl-0.27.tar.gz
+fbfeb85a10bd91c9fd1b6087be689857  rhpxl-0.28.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug  7 15:34:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 11:34:33 -0400
Subject: rpms/gnome-panel/devel gnome-panel-2.15.90-fix-double-free.patch,
	NONE, 1.1 gnome-panel.spec, 1.138, 1.139
Message-ID: <200608071534.k77FYXe1022984@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.15.90-fix-double-free.patch 
Log Message:
- fix double free in menu editor launcher (bug 201439)


gnome-panel-2.15.90-fix-double-free.patch:
 panel-menu-bar.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE gnome-panel-2.15.90-fix-double-free.patch ---
--- gnome-panel-2.15.90/gnome-panel/panel-menu-bar.c.fix-double-free	2006-08-07 11:08:42.000000000 -0400
+++ gnome-panel-2.15.90/gnome-panel/panel-menu-bar.c	2006-08-07 11:12:11.000000000 -0400
@@ -468,6 +468,7 @@ panel_menu_bar_invoke_menu (PanelMenuBar
 					   &error);
 		if (error) {
 			g_error_free (error);
+			error = NULL;
 			panel_launch_desktop_file ("gmenu-simple-editor.desktop",
 						   "gmenu-simple-editor",
 						   screen,
@@ -481,6 +482,7 @@ panel_menu_bar_invoke_menu (PanelMenuBar
 					    "gmenu-simple-editor",
 					    error->message);
 			g_error_free (error);
+			error = NULL;
 		}
 	}
 }


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gnome-panel.spec	5 Aug 2006 13:05:55 -0000	1.138
+++ gnome-panel.spec	7 Aug 2006 15:34:30 -0000	1.139
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.15.90
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 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
@@ -81,6 +81,7 @@
 Patch11: transparent-systray.patch
 Patch12: gnome-panel-2.14.2-xio-error.patch
 Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch
+Patch14: gnome-panel-2.15.90-fix-double-free.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -114,6 +115,7 @@
 %patch11 -p1 -b .transparent-systray
 %patch12 -p1 -b .xio-error
 %patch13 -p1 -b .move-suspend-to-menu
+%patch14 -p1 -b .fix-double-free
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE2} m4
@@ -229,6 +231,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Aug  7 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-3
+- fix double free in menu editor launcher (bug 201439)
+
 * Fri Aug  4 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-2
 - move suspend to menu again
 - remove autogenerated panel-typebuiltins.c from move-suspend-to-menu (caolanm)



From fedora-cvs-commits at redhat.com  Mon Aug  7 15:53:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 11:53:56 -0400
Subject: rpms/crash/devel crash.patch,1.11,1.12 crash.spec,1.15,1.16
Message-ID: <200608071553.k77FruYk020827@cvs.devel.redhat.com>

Author: anderson

Update of /cvs/dist/rpms/crash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20592

Modified Files:
	crash.patch crash.spec 
Log Message:
Updated crash.patch to match upstream version 4.0-3.1.
Added kdump reference to crash.spec description.
Added s390 and s390x to crash.spec ExclusiveArch list.  BZ #199125


crash.patch:
 Makefile                     |   62 +
 README                       |   36 
 alpha.c                      |    5 
 cmdline.c                    |   14 
 configure.c                  |    2 
 defs.h                       |  486 +++++++++++-
 dev.c                        |    4 
 diskdump.c                   |  447 +++++++++++
 diskdump.h                   |   58 +
 extensions.c                 |    7 
 extensions/Makefile          |   41 +
 extensions/dminfo.c          | 1531 +++++++++++++++++++++++++++++++++++++++
 extensions/echo.c            |  105 ++
 filesys.c                    |  126 ++-
 gdb-6.1.patch                |    9 
 gdb-6.1/gdb/ppc-linux-tdep.c | 1116 +++++++++++++++++++++++++++++
 gdb_interface.c              |   12 
 help.c                       |  154 ++--
 ia64.c                       |  326 +++++---
 kernel.c                     |  698 ++++++++++++++++--
 lkcd_common.c                |  100 ++
 lkcd_dump_v5.h               |    2 
 lkcd_dump_v7.h               |    2 
 lkcd_v7.c                    |    6 
 lkcd_v8.c                    |   14 
 lkcd_x86_trace.c             |  263 ++++++
 main.c                       |  112 ++
 memory.c                     | 1600 ++++++++++++++++++++++++++++++++++++-----
 net.c                        |  220 ++++-
 netdump.c                    |  696 +++++++++++++++---
 netdump.h                    |   34 
 ppc.c                        |   15 
 ppc64.c                      |  422 ++++++++++
 s390.c                       |    9 
 s390_dump.c                  |    7 
 s390x.c                      |    9 
 symbols.c                    |   67 +
 task.c                       |  585 ++++++++++++---
 tools.c                      |   74 +
 unwind.c                     |   19 
 va_server.c                  |    4 
 vas_crash.h                  |    2 
 x86.c                        | 1653 ++++++++++++++++++++++++++++++++++++++++---
 x86_64.c                     | 1550 +++++++++++++++++++++++++++++++++++++---
 xendump.c                    | 1170 ++++++++++++++++++++++++++++++
 xendump.h                    |   97 ++
 46 files changed, 12848 insertions(+), 1123 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.11 -r 1.12 crash.patch
Index: crash.patch
===================================================================
RCS file: /cvs/dist/rpms/crash/devel/crash.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- crash.patch	15 May 2006 21:24:47 -0000	1.11
+++ crash.patch	7 Aug 2006 15:53:53 -0000	1.12
@@ -1,4 +1,4 @@
---- crash/extensions/Makefile.orig	2006-05-15 17:21:18.000000000 -0400
+--- crash/extensions/Makefile.orig	2006-08-07 11:31:15.000000000 -0400
 +++ crash/extensions/Makefile	2005-11-08 11:38:21.000000000 -0500
 @@ -0,0 +1,41 @@
 +#
@@ -42,8 +42,8 @@
 +dminfo.so: ../defs.h dminfo.c
 +	gcc -nostartfiles -shared -rdynamic -o dminfo.so dminfo.c -fPIC -D$(TARGET)
 +	
---- crash/extensions/echo.c.orig	2006-05-15 17:21:18.000000000 -0400
-+++ crash/extensions/echo.c	2005-11-10 16:12:50.000000000 -0500
+--- crash/extensions/echo.c.orig	2006-08-07 11:31:15.000000000 -0400
++++ crash/extensions/echo.c	2006-05-16 15:43:05.000000000 -0400
 @@ -0,0 +1,105 @@
 +/* echo.c - simple example of a crash extension
 + *
@@ -150,8 +150,8 @@
 +};
 +
 +
---- crash/extensions/dminfo.c.orig	2006-05-15 17:21:18.000000000 -0400
-+++ crash/extensions/dminfo.c	2005-11-10 16:12:50.000000000 -0500
+--- crash/extensions/dminfo.c.orig	2006-08-07 11:31:15.000000000 -0400
++++ crash/extensions/dminfo.c	2006-05-16 15:43:05.000000000 -0400
 @@ -0,0 +1,1531 @@
 +/* dminfo.c - crash extension module for device-mapper analysis
 + *
@@ -1684,7 +1684,7 @@
 +{
 +	return 0;
 +}
---- crash/gdb-6.1/gdb/ppc-linux-tdep.c.orig	2006-05-15 17:21:18.000000000 -0400
+--- crash/gdb-6.1/gdb/ppc-linux-tdep.c.orig	2006-08-07 11:31:15.000000000 -0400
 +++ crash/gdb-6.1/gdb/ppc-linux-tdep.c	2005-11-04 17:37:54.000000000 -0500
 @@ -0,0 +1,1116 @@
 +/* Target-dependent code for GDB, the GNU debugger.
@@ -2803,9 +2803,9 @@
 +                         ppc_linux_init_abi);
 +  add_core_fns (&ppc_linux_regset_core_fns);
 +}
---- crash/main.c.orig	2006-05-15 17:21:18.000000000 -0400
-+++ crash/main.c	2006-04-26 15:41:04.000000000 -0400
-@@ -35,11 +35,13 @@
+--- crash/main.c.orig	2006-08-07 11:31:15.000000000 -0400
++++ crash/main.c	2006-08-03 16:58:32.000000000 -0400
+@@ -35,11 +35,15 @@
  	{"no_data_debug", 0, 0, 0},
  	{"no_crashrc", 0, 0, 0},
  	{"no_kmem_cache", 0, 0, 0},
@@ -2816,10 +2816,12 @@
  	{"version", 0, 0, 0},
  	{"buildinfo", 0, 0, 0},
 +	{"shadow_page_tables", 0, 0, 0},
++        {"cpus", 1, 0, 0},
++        {"no_ikconfig", 0, 0, 0},
          {0, 0, 0, 0}
  };
  
-@@ -55,7 +57,7 @@
+@@ -55,7 +59,7 @@
  	 */
  	opterr = 0;
  	optind = 0;
@@ -2828,7 +2830,18 @@
         		long_options, &option_index)) != -1) {
  		switch (c)
  		{
-@@ -98,6 +100,10 @@
+@@ -77,6 +81,10 @@
+ 				kt->flags |= NO_MODULE_ACCESS;
+ 
+ 		        if (STREQ(long_options[option_index].name, 
++			    "no_ikconfig")) 
++				kt->flags |= NO_IKCONFIG;
++
++		        if (STREQ(long_options[option_index].name, 
+ 			    "no_namelist_gzip")) 
+ 				pc->flags |= NAMELIST_NO_GZIP;
+ 
+@@ -98,6 +106,10 @@
  				vt->flags |= KMEM_CACHE_UNAVAIL;
  
  		        if (STREQ(long_options[option_index].name, 
@@ -2839,7 +2852,7 @@
  			    "readnow")) 
  				pc->flags |= READNOW;
  
-@@ -123,6 +129,10 @@
+@@ -123,6 +135,13 @@
  				clean_exit(0);
  			}
  
@@ -2847,10 +2860,22 @@
 +			    "shadow_page_tables")) 
 +				kt->xen_flags |= SHADOW_PAGE_TABLES;
 +
++		        if (STREQ(long_options[option_index].name, "cpus")) 
++				kt->cpus_override = optarg;
++
  			break;
  
  		case 'f':
-@@ -193,6 +203,10 @@
+@@ -168,7 +187,7 @@
+ 		case 's':
+ 			pc->flags |= SILENT;
+ 			pc->flags &= ~SCROLL;
+-			pc->scroll_command = SCROLL_NONE;
++//   			pc->scroll_command = SCROLL_NONE;   (why?)
+ 			break;
+ 
+ 		case 'L':
+@@ -193,6 +212,10 @@
  			set_vas_debug(pc->debug);
  			break;
  
@@ -2861,7 +2886,7 @@
  		default:
  			if (STREQ(argv[optind-1], "-h"))
  				program_usage(LONG_FORM);
-@@ -264,6 +278,28 @@
+@@ -264,6 +287,28 @@
                                  pc->readmem = read_netdump;
                                  pc->writemem = write_netdump;
  
@@ -2890,18 +2915,17 @@
  			} else if (is_diskdump(argv[optind])) {
                                  if (pc->flags & MEMORY_SOURCES) {
                                          error(INFO,
-@@ -335,8 +371,8 @@
+@@ -335,8 +380,7 @@
  	machdep_init(PRE_SYMTAB);
          symtab_init();
  	machdep_init(PRE_GDB);
 -	kernel_init(PRE_GDB);
 -	verify_version();
-+//	kernel_init(PRE_GDB);
-+//	verify_version();
++	read_in_kernel_config(IKCFG_INIT);
          datatype_init();
  
  	/*
-@@ -361,6 +397,8 @@
+@@ -361,6 +405,8 @@
  {
          if (!(pc->flags & GDB_INIT)) {
  		gdb_session_init();
@@ -2910,7 +2934,7 @@
  		kernel_init(POST_GDB);
  		machdep_init(POST_GDB);
          	vm_init();
-@@ -591,6 +629,8 @@
+@@ -591,6 +637,8 @@
  	int i;
  	char *p1;
  	char buf[BUFSIZE];
@@ -2919,7 +2943,7 @@
  	FILE *afp;
  	char *program;
  
-@@ -685,11 +725,11 @@
+@@ -685,11 +733,11 @@
  			pc->home = "(unknown)";
  		} else
  			strcpy(pc->home, p1);
@@ -2935,7 +2959,7 @@
  	                else {
  	                        while (fgets(buf, BUFSIZE, afp))
  	                                resolve_rc_cmd(buf, ALIAS_RCHOME);
-@@ -698,11 +738,12 @@
+@@ -698,11 +746,12 @@
  	        }
  	}
  
@@ -2952,7 +2976,7 @@
  		else {
  			while (fgets(buf, BUFSIZE, afp)) 
  				resolve_rc_cmd(buf, ALIAS_RCLOCAL);
-@@ -840,13 +881,22 @@
+@@ -840,13 +889,22 @@
          if (pc->flags & REM_S390D)
                  sprintf(&buf[strlen(buf)],
                          "%sREM_S390D", others++ ? "|" : "");
@@ -2977,7 +3001,7 @@
                  sprintf(&buf[strlen(buf)],
                          "%sDISKDUMP", others++ ? "|" : "");
          if (pc->flags & SYSMAP)
-@@ -855,21 +905,24 @@
+@@ -855,21 +913,24 @@
          if (pc->flags & SYSMAP_ARG)
                  sprintf(&buf[strlen(buf)],
[...8149 lines suppressed...]
-@@ -3418,6 +3687,23 @@
+@@ -3418,6 +3786,23 @@
  void get_diskdump_regs(struct bt_info *, ulong *, ulong *);
  
  /*
@@ -15125,7 +18465,7 @@
   *  net.c
   */
  void net_init(void);
-@@ -3560,6 +3846,7 @@
+@@ -3560,6 +3945,7 @@
  #define LKCD_DUMP_V7                  (0x7)  /* DUMP_VERSION_NUMBER */
  #define LKCD_DUMP_V8                  (0x8)  /* DUMP_VERSION_NUMBER */
  #define LKCD_DUMP_V9                  (0x9)  /* DUMP_VERSION_NUMBER */
@@ -15133,7 +18473,7 @@
  
  #define LKCD_DUMP_VERSION_NUMBER_MASK (0xf)
  #define LKCD_DUMP_RAW                 (0x1)   /* DUMP_[DH_]RAW */ 
---- crash/vas_crash.h.orig	2006-05-15 17:21:18.000000000 -0400
+--- crash/vas_crash.h.orig	2006-08-07 11:31:15.000000000 -0400
 +++ crash/vas_crash.h	2006-05-15 16:50:28.000000000 -0400
 @@ -19,7 +19,7 @@
   */
@@ -15144,9 +18484,9 @@
  
  void save_core(void);
  
---- crash/netdump.h.orig	2006-05-15 17:21:18.000000000 -0400
-+++ crash/netdump.h	2005-11-04 17:37:53.000000000 -0500
-@@ -24,3 +24,14 @@
+--- crash/netdump.h.orig	2006-08-07 11:31:15.000000000 -0400
++++ crash/netdump.h	2006-06-28 14:16:16.000000000 -0400
+@@ -24,3 +24,37 @@
  
  #define NT_TASKSTRUCT 4
  #define NT_DISKDUMP   0x70000001
@@ -15161,7 +18501,30 @@
 +#endif
 +
 +#endif  /* NOTDEF */
---- crash/diskdump.h.orig	2006-05-15 17:21:18.000000000 -0400
++
++/*
++ *  Proposed ELF note for Xen (writable pagetable) per-vcpu CR3.
++ */
++#define NT_XEN_KDUMP_CR3 0x10000001
++
++struct xen_kdump_data {
++	ulong flags;
++	ulong cr3;
++	ulong p2m_mfn;
++	char *page;
++	ulong last_mfn_read;
++	ulong cache_hits;
++	ulong accesses;
++	int p2m_frames;
++        ulong *p2m_mfn_frame_list;
++};
++
++#define KDUMP_P2M_INIT  (0x1)
++#define KDUMP_CR3       (0x2)
++#define KDUMP_MFN_LIST  (0x4)
++
++#define P2M_FAILURE ((physaddr_t)(0xffffffffffffffffLL))
+--- crash/diskdump.h.orig	2006-08-07 11:31:15.000000000 -0400
 +++ crash/diskdump.h	2005-11-30 15:15:00.000000000 -0500
 @@ -3,6 +3,8 @@
   *
@@ -15234,8 +18597,8 @@
 +#define PAGE_VALID		(0x1)	/* flags */
 +#define DISKDUMP_VALID_PAGE(flags)	((flags) & PAGE_VALID)
 +
---- crash/xendump.h.orig	2006-05-15 17:21:18.000000000 -0400
-+++ crash/xendump.h	2006-04-26 15:58:59.000000000 -0400
+--- crash/xendump.h.orig	2006-08-07 11:31:15.000000000 -0400
++++ crash/xendump.h	2006-06-09 11:26:09.000000000 -0400
 @@ -0,0 +1,97 @@
 +/* 
 + * xendump.h
@@ -15289,8 +18652,8 @@
 +	struct pfn_offset_cache *poc;
 +
 +	struct xc_core_data {
-+		int ptm_frames;
-+		ulong *ptm_frame_index_list;
++		int p2m_frames;
++		ulong *p2m_frame_index_list;
 +		struct xc_core_header header;
 +	} xc_core;
 +
@@ -15314,7 +18677,7 @@
 +
 +#define XC_SAVE           (XENDUMP_LOCAL << 1)
 +#define XC_CORE           (XENDUMP_LOCAL << 2)
-+#define XC_CORE_PTM_INIT  (XENDUMP_LOCAL << 3)
++#define XC_CORE_P2M_INIT  (XENDUMP_LOCAL << 3)
 +
 +#define MACHINE_BYTE_ORDER()  \
 +        (machine_type("X86") || \
@@ -15334,7 +18697,7 @@
 +
 +#define MFN_NOT_FOUND (-1)
 +#define PFN_NOT_FOUND (-1)
---- crash/lkcd_dump_v5.h.orig	2006-05-15 17:21:18.000000000 -0400
+--- crash/lkcd_dump_v5.h.orig	2006-08-07 11:31:15.000000000 -0400
 +++ crash/lkcd_dump_v5.h	2006-03-22 08:45:35.000000000 -0500
 @@ -35,7 +35,7 @@
  #ifndef _DUMP_H
@@ -15345,7 +18708,7 @@
  
  /* define TRUE and FALSE for use in our dump modules */
  #ifndef FALSE
---- crash/lkcd_dump_v7.h.orig	2006-05-15 17:21:18.000000000 -0400
+--- crash/lkcd_dump_v7.h.orig	2006-08-07 11:31:15.000000000 -0400
 +++ crash/lkcd_dump_v7.h	2006-03-22 08:45:57.000000000 -0500
 @@ -35,7 +35,7 @@
  #ifndef _DUMP_H
@@ -15356,8 +18719,8 @@
  
  /* define TRUE and FALSE for use in our dump modules */
  #ifndef FALSE
---- crash/Makefile.orig	2006-05-15 17:21:18.000000000 -0400
-+++ crash/Makefile	2006-05-15 17:21:18.000000000 -0400
+--- crash/Makefile.orig	2006-08-07 11:31:15.000000000 -0400
++++ crash/Makefile	2006-08-07 11:31:15.000000000 -0400
 @@ -3,8 +3,8 @@
  # Copyright (C) 1999, 2000, 2001, 2002 Mission Critical Linux, Inc.
  #       www.missioncriticallinux.com, info at missioncriticallinux.com
@@ -15533,7 +18896,7 @@
 +
 +do_extensions:
 +	@(cd extensions; make -i OBJECTS="$(EXTENSION_OBJECT_FILES)" TARGET=$(TARGET))
---- crash/gdb-6.1.patch.orig	2006-05-15 17:21:18.000000000 -0400
+--- crash/gdb-6.1.patch.orig	2006-08-07 11:31:15.000000000 -0400
 +++ crash/gdb-6.1.patch	2006-01-03 13:36:25.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- gdb-6.1/bfd/coff-alpha.c.orig
@@ -15547,14 +18910,14 @@
 + 	}
 + 
 +       if (lita_sec_data->gp != 0)
---- crash/README.orig	2006-05-15 17:21:18.000000000 -0400
-+++ crash/README	2006-05-15 17:21:16.000000000 -0400
+--- crash/README.orig	2006-08-07 11:31:15.000000000 -0400
++++ crash/README	2006-08-07 11:31:12.000000000 -0400
 @@ -69,7 +69,7 @@
       After the kernel is re-compiled, the uncompressed "vmlinux" kernel
       that is created in the top-level kernel build directory must be saved.
  
 -  To build this utility, simply uncompress the tar file, enter the crash-4.0
-+  To build this utility, simply uncompress the tar file, enter the crash-4.0-2.26
++  To build this utility, simply uncompress the tar file, enter the crash-4.0-3.1
    subdirectory, and type "make".  The initial build will take several minutes 
    because the gdb module must be configured and and built.  Alternatively, the
    crash source RPM file may be installed and built, and the resultant crash
@@ -15566,7 +18929,7 @@
 -    Copyright (C) 2002, 2003, 2004, 2005  Red Hat, Inc.
 -    Copyright (C) 2004, 2005  IBM Corporation
 -    Copyright (C) 1999-2005  Hewlett-Packard Co
-+    crash 4.0-2.26
++    crash 4.0-3.1
 +    Copyright (C) 2002, 2003, 2004, 2005, 2006  Red Hat, Inc.
 +    Copyright (C) 2004, 2005, 2006  IBM Corporation
 +    Copyright (C) 1999-2006  Hewlett-Packard Co
@@ -15580,7 +18943,7 @@
          DUMPFILE: /dev/mem
              CPUS: 1
 -            DATE: Wed Jul 13 13:26:00 2005
-+            DATE: Mon May 15 17:21:15 2006
++            DATE: Mon Aug  7 11:31:12 2006
            UPTIME: 10 days, 22:55:18
      LOAD AVERAGE: 0.08, 0.03, 0.01
             TASKS: 42
@@ -15589,7 +18952,7 @@
      extend         mach           repeat         timer          
      
 -    crash version: 4.0      gdb version: 6.1
-+    crash version: 4.0-2.26   gdb version: 6.1
++    crash version: 4.0-3.1   gdb version: 6.1
      For help on any command above, enter "help <command>".
      For help on input options, enter "help input".
      For help on output options, enter "help output".
@@ -15601,7 +18964,7 @@
 -    Copyright (C) 2002, 2003, 2004, 2005  Red Hat, Inc.
 -    Copyright (C) 2004, 2005  IBM Corporation
 -    Copyright (C) 1999-2005  Hewlett-Packard Co
-+    crash 4.0-2.26
++    crash 4.0-3.1
 +    Copyright (C) 2002, 2003, 2004, 2005, 2006  Red Hat, Inc.
 +    Copyright (C) 2004, 2005, 2006  IBM Corporation
 +    Copyright (C) 1999-2006  Hewlett-Packard Co
@@ -15618,7 +18981,7 @@
 -    Copyright (C) 2002, 2003, 2004, 2005  Red Hat, Inc.
 -    Copyright (C) 2004, 2005  IBM Corporation
 -    Copyright (C) 1999-2005  Hewlett-Packard Co
-+    crash 4.0-2.26
++    crash 4.0-3.1
 +    Copyright (C) 2002, 2003, 2004, 2005, 2006  Red Hat, Inc.
 +    Copyright (C) 2004, 2005, 2006  IBM Corporation
 +    Copyright (C) 1999-2006  Hewlett-Packard Co


Index: crash.spec
===================================================================
RCS file: /cvs/dist/rpms/crash/devel/crash.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- crash.spec	15 Jul 2006 04:38:46 -0000	1.15
+++ crash.spec	7 Aug 2006 15:53:53 -0000	1.16
@@ -4,13 +4,13 @@
 Summary: crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles
 Name: crash
 Version: 4.0
-Release: 3
+Release: 3.1
 License: GPL
 Group: Development/Debuggers
 Source: %{name}-%{version}.tar.gz
 URL: http://people.redhat.com/anderson
 ExclusiveOS: Linux
-ExclusiveArch: i386 ia64 x86_64 ppc64
+ExclusiveArch: i386 ia64 x86_64 ppc64 s390 s390x
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: ncurses-devel zlib-devel
 Patch0: crash.patch
@@ -18,7 +18,7 @@
 %description
 The core analysis suite is a self-contained tool that can be used to
 investigate either live systems, kernel core dumps created from the
-netdump and diskdump packages from Red Hat Linux, the mcore kernel patch
+netdump, diskdump and kdump packages from Red Hat Linux, the mcore kernel patch
 offered by Mission Critical Linux, or the LKCD kernel patch.
 
 %prep
@@ -45,6 +45,11 @@
 %doc README
 
 %changelog
+* Mon Aug  7 2006 Dave Anderson <anderson at redhat.com> - 4.0-3.1
+- Updated crash.patch to match upstream version 4.0-3.1.
+- Added kdump reference to description.
+- Added s390 and s390x to ExclusiveArch list.  BZ #199125
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 4.0-3
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 17:46:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 13:46:56 -0400
Subject: rpms/kernel/FC-4 patch-2.6.17.8.bz2.sign, NONE, 1.1 .cvsignore,
	1.200, 1.201 kernel-2.6.spec, 1.1669, 1.1670 sources, 1.183,
	1.184 upstream, 1.124, 1.125 patch-2.6.17.7.bz2.sign, 1.1,
	NONE patch-2.6.17.8-rc1.gz.sign, 1.1, NONE
Message-ID: <200608071746.k77HkufO009552@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17.8.bz2.sign 
Removed Files:
	patch-2.6.17.7.bz2.sign patch-2.6.17.8-rc1.gz.sign 
Log Message:
.8


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

iD8DBQBE1srLyGugalF9Dw4RAv+mAJ9U3n5rOwxCmmC6aVGr23vYC76GeQCgh/3y
hOu9mp+mF1K9XmZvmar5xPw=
=Wh0Q
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- .cvsignore	4 Aug 2006 06:22:17 -0000	1.200
+++ .cvsignore	7 Aug 2006 17:46:53 -0000	1.201
@@ -3,5 +3,4 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-patch-2.6.17.7.bz2
-patch-2.6.17.8-rc1.gz
+patch-2.6.17.8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1669
retrieving revision 1.1670
diff -u -r1.1669 -r1.1670
--- kernel-2.6.spec	4 Aug 2006 06:22:40 -0000	1.1669
+++ kernel-2.6.spec	7 Aug 2006 17:46:53 -0000	1.1670
@@ -202,8 +202,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.7.bz2
-Patch2: patch-2.6.17.8-rc1.gz
+Patch1: patch-2.6.17.8.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -465,7 +464,6 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1081,6 +1079,9 @@
 %endif
 
 %changelog
+* Mon Aug  7 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2146_FC4]
+- 2.6.17.8
+
 * Fri Aug  4 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2145_FC4]
 - 2.6.17.8-rc1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- sources	4 Aug 2006 06:21:51 -0000	1.183
+++ sources	7 Aug 2006 17:46:53 -0000	1.184
@@ -1,3 +1,2 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-f2c255cdf482ba589151f5da03fed418  patch-2.6.17.7.bz2
-aeb071b739141bf2b3f422a057ae11ed  patch-2.6.17.8-rc1.gz
+791940106e40ff60fa1756e29f7b0488  patch-2.6.17.8.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- upstream	4 Aug 2006 06:21:51 -0000	1.124
+++ upstream	7 Aug 2006 17:46:53 -0000	1.125
@@ -1,3 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.7.bz2
-patch-2.6.17.8-rc1.gz
+patch-2.6.17.8.bz2


--- patch-2.6.17.7.bz2.sign DELETED ---


--- patch-2.6.17.8-rc1.gz.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug  7 17:51:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 13:51:53 -0400
Subject: rpms/crash/devel crash.patch,1.12,1.13
Message-ID: <200608071751.k77HprvN017997@cvs.devel.redhat.com>

Author: anderson

Update of /cvs/dist/rpms/crash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17770

Modified Files:
	crash.patch 
Log Message:
s390/s390x build requires removal of pt_regs reference in lkcd asm struct


crash.patch:
 Makefile                     |   62 +
 README                       |   36 
 alpha.c                      |    5 
 cmdline.c                    |   14 
 configure.c                  |    2 
 defs.h                       |  486 +++++++++++-
 dev.c                        |    4 
 diskdump.c                   |  447 +++++++++++
 diskdump.h                   |   58 +
 extensions.c                 |    7 
 extensions/Makefile          |   41 +
 extensions/dminfo.c          | 1531 +++++++++++++++++++++++++++++++++++++++
 extensions/echo.c            |  105 ++
 filesys.c                    |  126 ++-
 gdb-6.1.patch                |    9 
 gdb-6.1/gdb/ppc-linux-tdep.c | 1116 +++++++++++++++++++++++++++++
 gdb_interface.c              |   12 
 help.c                       |  154 ++--
 ia64.c                       |  326 +++++---
 kernel.c                     |  698 ++++++++++++++++--
 lkcd_common.c                |  100 ++
 lkcd_dump_v5.h               |    2 
 lkcd_dump_v7.h               |    2 
 lkcd_v7.c                    |    6 
 lkcd_v8.c                    |   14 
 lkcd_vmdump_v1.h             |    4 
 lkcd_x86_trace.c             |  263 ++++++
 main.c                       |  112 ++
 memory.c                     | 1600 ++++++++++++++++++++++++++++++++++++-----
 net.c                        |  220 ++++-
 netdump.c                    |  696 +++++++++++++++---
 netdump.h                    |   34 
 ppc.c                        |   15 
 ppc64.c                      |  422 ++++++++++
 s390.c                       |    9 
 s390_dump.c                  |    7 
 s390x.c                      |    9 
 symbols.c                    |   67 +
 task.c                       |  585 ++++++++++++---
 tools.c                      |   74 +
 unwind.c                     |   19 
 va_server.c                  |    4 
 vas_crash.h                  |    2 
 x86.c                        | 1653 ++++++++++++++++++++++++++++++++++++++++---
 x86_64.c                     | 1550 +++++++++++++++++++++++++++++++++++++---
 xendump.c                    | 1170 ++++++++++++++++++++++++++++++
 xendump.h                    |   97 ++
 47 files changed, 12852 insertions(+), 1123 deletions(-)

Index: crash.patch
===================================================================
RCS file: /cvs/dist/rpms/crash/devel/crash.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- crash.patch	7 Aug 2006 15:53:53 -0000	1.12
+++ crash.patch	7 Aug 2006 17:51:51 -0000	1.13
@@ -1,4 +1,4 @@
---- crash/extensions/Makefile.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/extensions/Makefile.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/extensions/Makefile	2005-11-08 11:38:21.000000000 -0500
 @@ -0,0 +1,41 @@
 +#
@@ -42,7 +42,7 @@
 +dminfo.so: ../defs.h dminfo.c
 +	gcc -nostartfiles -shared -rdynamic -o dminfo.so dminfo.c -fPIC -D$(TARGET)
 +	
---- crash/extensions/echo.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/extensions/echo.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/extensions/echo.c	2006-05-16 15:43:05.000000000 -0400
 @@ -0,0 +1,105 @@
 +/* echo.c - simple example of a crash extension
@@ -150,7 +150,7 @@
 +};
 +
 +
---- crash/extensions/dminfo.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/extensions/dminfo.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/extensions/dminfo.c	2006-05-16 15:43:05.000000000 -0400
 @@ -0,0 +1,1531 @@
 +/* dminfo.c - crash extension module for device-mapper analysis
@@ -1684,7 +1684,7 @@
 +{
 +	return 0;
 +}
---- crash/gdb-6.1/gdb/ppc-linux-tdep.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/gdb-6.1/gdb/ppc-linux-tdep.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/gdb-6.1/gdb/ppc-linux-tdep.c	2005-11-04 17:37:54.000000000 -0500
 @@ -0,0 +1,1116 @@
 +/* Target-dependent code for GDB, the GNU debugger.
@@ -2803,7 +2803,7 @@
 +                         ppc_linux_init_abi);
 +  add_core_fns (&ppc_linux_regset_core_fns);
 +}
---- crash/main.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/main.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/main.c	2006-08-03 16:58:32.000000000 -0400
 @@ -35,11 +35,15 @@
  	{"no_data_debug", 0, 0, 0},
@@ -3065,7 +3065,7 @@
          else if (pc->writemem == write_memory_device)
                  fprintf(fp, "         writemem: write_memory_device()\n");
          else
---- crash/tools.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/tools.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/tools.c	2006-07-06 16:21:55.000000000 -0400
 @@ -2004,6 +2004,10 @@
  				pc->flags &= ~(DUMPFILE_TYPES);
@@ -3183,7 +3183,7 @@
 +
 +        return ((c2 == '\0') && (c1 == '/') && (*p1 == '\0')) ? 0 : c1 - c2;
 +}
---- crash/memory.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/memory.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/memory.c	2006-08-02 10:32:08.000000000 -0400
 @@ -45,6 +45,8 @@
  	ulong *addrlist;
@@ -5670,7 +5670,7 @@
 +		}
 +	}
 +}
---- crash/filesys.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/filesys.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/filesys.c	2006-07-06 16:40:52.000000000 -0400
 @@ -1,8 +1,8 @@
  /* filesys.c - core analysis suite
@@ -5920,7 +5920,7 @@
   * get_pathname() fills in a pathname string for an ending dentry
   * See __d_path() in the kernel for help fixing problems.
   */
---- crash/help.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/help.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/help.c	2006-08-03 16:59:00.000000000 -0400
 @@ -1,8 +1,8 @@
  /* help.c - core analysis suite
@@ -6253,7 +6253,7 @@
  "Copyright (C) 1999, 2002  Silicon Graphics, Inc.",
  "Copyright (C) 1999, 2000, 2001, 2002  Mission Critical Linux, Inc.",
  "This program is free software, covered by the GNU General Public License,",
---- crash/task.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/task.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/task.c	2006-06-26 09:13:03.000000000 -0400
 @@ -27,6 +27,7 @@
  static void refresh_pidhash_task_table(void);
@@ -7172,7 +7172,7 @@
  	sigset = task_signal(tc->task);
  	if (!tt->last_task_read)
  		return;
---- crash/kernel.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/kernel.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/kernel.c	2006-08-03 17:25:27.000000000 -0400
 @@ -20,7 +20,7 @@
  
@@ -8157,7 +8157,7 @@
 +			break;
 +	}
  }
---- crash/gdb_interface.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/gdb_interface.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/gdb_interface.c	2006-04-11 17:25:48.000000000 -0400
 @@ -31,9 +31,6 @@
  {
@@ -8189,7 +8189,7 @@
  			gdb_interface(req);
          		if (!(req->flags & GNU_COMMAND_FAILED)) 
  				goto retry;
---- crash/configure.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/configure.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/configure.c	2006-03-23 15:44:46.000000000 -0500
 @@ -1128,7 +1128,7 @@
  	printf("License: GPL\n");
@@ -8200,7 +8200,7 @@
  	printf("Distribution: Linux 2.2 or greater\n");
  	printf("Vendor: Red Hat, Inc.\n");
  	printf("Packager: Dave Anderson <anderson at redhat.com>\n");
---- crash/net.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/net.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/net.c	2006-05-11 11:17:01.000000000 -0400
 @@ -50,6 +50,7 @@
  #define STRUCT_NET_DEVICE (0x4)
@@ -8557,7 +8557,7 @@
  			break;
  		}
  		break;
---- crash/dev.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/dev.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/dev.c	2005-11-23 11:09:08.000000000 -0500
 @@ -91,13 +91,13 @@
                  switch(c)
@@ -8575,7 +8575,7 @@
  				option_not_supported(c);
  			do_pci();
  			return;
---- crash/alpha.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/alpha.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/alpha.c	2006-08-02 10:30:58.000000000 -0400
 @@ -186,7 +186,8 @@
  				"irq_desc", NULL, 0);
@@ -8596,7 +8596,7 @@
          fprintf(fp, ")\n");
  	fprintf(fp, "             kvbase: %lx\n", machdep->kvbase);
  	fprintf(fp, "  identity_map_base: %lx\n", machdep->identity_map_base);
---- crash/x86.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/x86.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/x86.c	2006-08-03 11:15:55.000000000 -0400
 @@ -176,6 +176,7 @@
  static void db_symbol_values(db_sym_t, char **, db_expr_t *);
@@ -10543,7 +10543,7 @@
 +	return machdep->get_stack_frame(bt, eip, esp);
 +}
  #endif /* X86 */
---- crash/ppc.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/ppc.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/ppc.c	2006-08-02 10:31:13.000000000 -0400
 @@ -135,9 +135,13 @@
  				"irq_desc", NULL, 0);
@@ -10581,7 +10581,7 @@
  	fprintf(fp, "           machspec: %lx\n", (ulong)machdep->machspec);
  }
  
---- crash/ia64.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/ia64.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/ia64.c	2006-08-03 14:28:37.000000000 -0400
 @@ -1,8 +1,8 @@
  /* ia64.c - core analysis suite
@@ -11105,7 +11105,7 @@
  
  	if (DUMPFILE() && ia64_in_init_stack(SWITCH_STACK_ADDR(CURRENT_TASK())))
  		machdep->flags |= INIT;
---- crash/s390.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/s390.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/s390.c	2006-08-02 10:31:22.000000000 -0400
 @@ -158,7 +158,8 @@
  		machdep->nr_irqs = 0;  /* TBD */
@@ -11137,7 +11137,7 @@
  			}
  			for(j=0; j< frame_size; j+=4){
  				if(j % 16 == 0){
---- crash/s390x.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/s390x.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/s390x.c	2006-08-02 10:31:24.000000000 -0400
 @@ -173,7 +173,8 @@
  		machdep->nr_irqs = 0;  /* TBD */
@@ -11169,7 +11169,7 @@
  			}
  			for(j=0; j< frame_size; j+=4){
  				if(j % 16 == 0){
---- crash/ppc64.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/ppc64.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/ppc64.c	2006-08-02 10:31:29.000000000 -0400
 @@ -47,6 +47,9 @@
  static char * ppc64_check_eframe(struct ppc64_pt_regs *);
@@ -11746,7 +11746,7 @@
 +        	machdep->machspec->last_level4_read = 0;
 +}
  #endif /* PPC64 */ 
---- crash/x86_64.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/x86_64.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/x86_64.c	2006-08-02 10:31:34.000000000 -0400
 @@ -18,7 +18,10 @@
  #ifdef X86_64
@@ -13698,7 +13698,7 @@
 +	}
 +}
  #endif  /* X86_64 */ 
---- crash/extensions.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/extensions.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/extensions.c	2005-11-10 09:47:46.000000000 -0500
 @@ -18,9 +18,6 @@
  #include "defs.h"
@@ -13728,7 +13728,7 @@
  unload_extension(char *lib)
  {
          struct extension_table *ext;
---- crash/va_server.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/va_server.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/va_server.c	2006-03-22 08:55:34.000000000 -0500
 @@ -57,13 +57,15 @@
  
@@ -13747,7 +13747,7 @@
  	if(read_map(crash_file)) {
  		if(va_server_init_v1(crash_file, start, end, stride))
  			return -1;
---- crash/symbols.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/symbols.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/symbols.c	2006-08-03 14:43:54.000000000 -0400
 @@ -1,8 +1,8 @@
  /* symbols.c - core analysis suite
@@ -13911,7 +13911,7 @@
  
          fprintf(fp, "\n                   array_table:\n");
  	/*
---- crash/cmdline.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/cmdline.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/cmdline.c	2006-07-10 10:59:57.000000000 -0400
 @@ -71,14 +71,17 @@
  	 *    4. from a terminal.
@@ -13951,7 +13951,7 @@
  
  	restore_gdb_sanity();
  
---- crash/lkcd_common.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/lkcd_common.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/lkcd_common.c	2006-06-15 10:34:53.000000000 -0400
 @@ -53,6 +53,8 @@
  
@@ -14131,7 +14131,7 @@
  
  	if ((lkcd->flags & LKCD_VALID) && (page > lkcd->total_pages)) 
  		lkcd->total_pages = page;
---- crash/lkcd_v7.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/lkcd_v7.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/lkcd_v7.c	2005-11-10 15:21:50.000000000 -0500
 @@ -89,7 +89,11 @@
  	ifd = 0;
@@ -14146,7 +14146,7 @@
  	dump_index_size = (lkcd->memory_pages * sizeof(off_t));	
  	lkcd->page_offsets = 0;
  	strcpy(dumpfile_index_name, dumpfile);
---- crash/lkcd_v8.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/lkcd_v8.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/lkcd_v8.c	2005-12-15 08:59:52.000000000 -0500
 @@ -26,6 +26,7 @@
  // static dump_header_asm_t dump_header_asm_v8 = { 0 };
@@ -14207,7 +14207,7 @@
  		set_mb_benchmark((granularity * (i+1))/lkcd->page_size);
  	}
  }
---- crash/s390_dump.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/s390_dump.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/s390_dump.c	2006-05-15 17:15:56.000000000 -0400
 @@ -16,7 +16,7 @@
   * GNU General Public License for more details.
@@ -14233,7 +14233,7 @@
  }
  
  int 
---- crash/lkcd_x86_trace.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/lkcd_x86_trace.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/lkcd_x86_trace.c	2006-05-15 16:28:35.000000000 -0400
 @@ -47,11 +47,13 @@
  static int setup_trace_rec(kaddr_t, kaddr_t, int, trace_t *);
@@ -14603,7 +14603,7 @@
   *  Cache 2k starting from the passed-in text address.  This sits on top
   *  of the instrbuf 256-byte cache, but we don't want to extend its size
   *  because we can run off the end of a module segment -- if this routine
---- crash/netdump.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/netdump.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/netdump.c	2006-07-10 11:01:03.000000000 -0400
 @@ -22,12 +22,12 @@
  	physaddr_t phys_end;
@@ -15778,7 +15778,7 @@
 +	
 +	return paddr;
 +}
---- crash/diskdump.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/diskdump.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/diskdump.c	2006-03-23 14:29:25.000000000 -0500
 @@ -1,16 +1,16 @@
  /* 
@@ -16302,7 +16302,7 @@
  }
  
  /*
---- crash/xendump.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/xendump.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/xendump.c	2006-07-11 09:36:03.000000000 -0400
 @@ -0,0 +1,1170 @@
 +/* 
@@ -17475,7 +17475,7 @@
 +		}
 +	}
 +}
---- crash/unwind.c.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/unwind.c.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/unwind.c	2005-11-23 09:37:52.000000000 -0500
 @@ -1397,9 +1397,22 @@
  	req = &request;
@@ -17503,7 +17503,7 @@
  		machdep->machspec->unw_tables_offset =
  			 req->member_offset/BITS_PER_BYTE;
  
---- crash/defs.h.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/defs.h.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/defs.h	2006-08-03 17:25:55.000000000 -0400
 @@ -1,8 +1,8 @@
  /* defs.h - core analysis suite
@@ -18473,7 +18473,7 @@
  
  #define LKCD_DUMP_VERSION_NUMBER_MASK (0xf)
  #define LKCD_DUMP_RAW                 (0x1)   /* DUMP_[DH_]RAW */ 
---- crash/vas_crash.h.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/vas_crash.h.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/vas_crash.h	2006-05-15 16:50:28.000000000 -0400
 @@ -19,7 +19,7 @@
   */
@@ -18484,7 +18484,7 @@
  
  void save_core(void);
  
---- crash/netdump.h.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/netdump.h.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/netdump.h	2006-06-28 14:16:16.000000000 -0400
 @@ -24,3 +24,37 @@
  
@@ -18524,7 +18524,7 @@
 +#define KDUMP_MFN_LIST  (0x4)
 +
 +#define P2M_FAILURE ((physaddr_t)(0xffffffffffffffffLL))
---- crash/diskdump.h.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/diskdump.h.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/diskdump.h	2005-11-30 15:15:00.000000000 -0500
 @@ -3,6 +3,8 @@
   *
@@ -18597,7 +18597,7 @@
 +#define PAGE_VALID		(0x1)	/* flags */
 +#define DISKDUMP_VALID_PAGE(flags)	((flags) & PAGE_VALID)
 +
---- crash/xendump.h.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/xendump.h.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/xendump.h	2006-06-09 11:26:09.000000000 -0400
 @@ -0,0 +1,97 @@
 +/* 
@@ -18697,7 +18697,22 @@
 +
 +#define MFN_NOT_FOUND (-1)
 +#define PFN_NOT_FOUND (-1)
---- crash/lkcd_dump_v5.h.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/lkcd_vmdump_v1.h.orig	2006-08-07 13:51:46.000000000 -0400
++++ crash/lkcd_vmdump_v1.h	2006-08-07 13:50:37.000000000 -0400
+@@ -114,8 +114,12 @@
+ 
+ 	/* the dump registers */
+ #ifndef IA64
++#ifndef S390
++#ifndef S390X
+ 	struct pt_regs       dh_regs;
+ #endif
++#endif
++#endif
+ 
+ 	/* the address of the current task */
+ 	struct task_struct  *dh_current_task;
+--- crash/lkcd_dump_v5.h.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/lkcd_dump_v5.h	2006-03-22 08:45:35.000000000 -0500
 @@ -35,7 +35,7 @@
  #ifndef _DUMP_H
@@ -18708,7 +18723,7 @@
  
  /* define TRUE and FALSE for use in our dump modules */
  #ifndef FALSE
---- crash/lkcd_dump_v7.h.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/lkcd_dump_v7.h.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/lkcd_dump_v7.h	2006-03-22 08:45:57.000000000 -0500
 @@ -35,7 +35,7 @@
  #ifndef _DUMP_H
@@ -18719,8 +18734,8 @@
  
  /* define TRUE and FALSE for use in our dump modules */
  #ifndef FALSE
---- crash/Makefile.orig	2006-08-07 11:31:15.000000000 -0400
-+++ crash/Makefile	2006-08-07 11:31:15.000000000 -0400
+--- crash/Makefile.orig	2006-08-07 13:51:46.000000000 -0400
++++ crash/Makefile	2006-08-07 13:51:46.000000000 -0400
 @@ -3,8 +3,8 @@
  # Copyright (C) 1999, 2000, 2001, 2002 Mission Critical Linux, Inc.
  #       www.missioncriticallinux.com, info at missioncriticallinux.com
@@ -18896,7 +18911,7 @@
 +
 +do_extensions:
 +	@(cd extensions; make -i OBJECTS="$(EXTENSION_OBJECT_FILES)" TARGET=$(TARGET))
---- crash/gdb-6.1.patch.orig	2006-08-07 11:31:15.000000000 -0400
+--- crash/gdb-6.1.patch.orig	2006-08-07 13:51:46.000000000 -0400
 +++ crash/gdb-6.1.patch	2006-01-03 13:36:25.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- gdb-6.1/bfd/coff-alpha.c.orig
@@ -18910,8 +18925,8 @@
 + 	}
 + 
 +       if (lita_sec_data->gp != 0)
---- crash/README.orig	2006-08-07 11:31:15.000000000 -0400
-+++ crash/README	2006-08-07 11:31:12.000000000 -0400
+--- crash/README.orig	2006-08-07 13:51:46.000000000 -0400
++++ crash/README	2006-08-07 13:51:42.000000000 -0400
 @@ -69,7 +69,7 @@
       After the kernel is re-compiled, the uncompressed "vmlinux" kernel
       that is created in the top-level kernel build directory must be saved.
@@ -18943,7 +18958,7 @@
          DUMPFILE: /dev/mem
              CPUS: 1
 -            DATE: Wed Jul 13 13:26:00 2005
-+            DATE: Mon Aug  7 11:31:12 2006
++            DATE: Mon Aug  7 13:51:42 2006
            UPTIME: 10 days, 22:55:18
      LOAD AVERAGE: 0.08, 0.03, 0.01
             TASKS: 42



From fedora-cvs-commits at redhat.com  Mon Aug  7 17:53:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 13:53:03 -0400
Subject: rpms/crash/devel crash.spec,1.16,1.17
Message-ID: <200608071753.k77Hr3qe018491@cvs.devel.redhat.com>

Author: anderson

Update of /cvs/dist/rpms/crash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18444

Modified Files:
	crash.spec 
Log Message:
Removed LKCD v1 pt_regs references for s390/s390x build.



Index: crash.spec
===================================================================
RCS file: /cvs/dist/rpms/crash/devel/crash.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- crash.spec	7 Aug 2006 15:53:53 -0000	1.16
+++ crash.spec	7 Aug 2006 17:53:01 -0000	1.17
@@ -49,6 +49,7 @@
 - Updated crash.patch to match upstream version 4.0-3.1.
 - Added kdump reference to description.
 - Added s390 and s390x to ExclusiveArch list.  BZ #199125
+- Removed LKCD v1 pt_regs references for s390/s390x build.
 
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 4.0-3
 - rebuild



From fedora-cvs-commits at redhat.com  Mon Aug  7 18:18:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 14:18:52 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2528,1.2529
Message-ID: <200608071818.k77IIqDV012729@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
fix defines


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2528
retrieving revision 1.2529
diff -u -r1.2528 -r1.2529
--- kernel-2.6.spec	6 Aug 2006 05:35:40 -0000	1.2528
+++ kernel-2.6.spec	7 Aug 2006 18:18:50 -0000	1.2529
@@ -83,7 +83,7 @@
 %ifarch %{all_x86}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
-#define signmodules 1
+%define signmodules 1
 %endif
 
 %ifarch i686
@@ -95,13 +95,13 @@
 %ifarch x86_64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
-#define signmodules 1
+%define signmodules 1
 %endif
 
 %ifarch ppc64 ppc64iseries
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
-#define signmodules 1
+%define signmodules 1
 %define make_target vmlinux
 %define kernel_image vmlinux
 %define kernel_image_elf 1
@@ -146,7 +146,7 @@
 %ifarch ia64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64*.config
 %define image_install_path boot/efi/EFI/redhat
-#define signmodules 1
+%define signmodules 1
 %define make_target compressed
 %define kernel_image vmlinux.gz
 # ia64 xen HV doesn't building with debug=y at the moment



From fedora-cvs-commits at redhat.com  Mon Aug  7 18:32:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 14:32:29 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-offscreen-pixmaps.patch, NONE,
	1.1 xorg-x11-server.spec, 1.141, 1.142
Message-ID: <200608071832.k77IWT5e013035@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-offscreen-pixmaps.patch 
Log Message:
* Mon Aug  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-17.fc6
- Add xorg-x11-server-1.1.1-offscreen-pixmaps.patch to default
  XaaNoOffscreenPixmaps to false, for now.


xorg-x11-server-1.1.1-offscreen-pixmaps.patch:
 xaaInitAccel.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.1-offscreen-pixmaps.patch ---
Patch to force pixmaps to be allocated in host memory.  Work in
progress, will eventually allow the xserver to keep pixmaps in video
memory until the root window is redirected.  At that point pixmaps are
evicted to host memory and subsequent pixmap allocations are done in
host memory.

--- ./hw/xfree86/xaa/xaaInitAccel.c.no-offscreen-pixmaps	2006-08-07 14:21:11.000000000 -0400
+++ ./hw/xfree86/xaa/xaaInitAccel.c	2006-08-07 14:20:44.000000000 -0400
@@ -92,7 +92,7 @@
     {XAAOPT_PIXMAP_CACHE,		"XaaNoPixmapCache",
 				OPTV_BOOLEAN,	{0}, FALSE },
     {XAAOPT_OFFSCREEN_PIXMAPS,		"XaaNoOffscreenPixmaps",
-				OPTV_BOOLEAN,	{0}, FALSE },
+				OPTV_BOOLEAN,	{0}, TRUE },
     { -1,				NULL,
 				OPTV_NONE,	{0}, FALSE }
 };


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- xorg-x11-server.spec	7 Aug 2006 14:18:24 -0000	1.141
+++ xorg-x11-server.spec	7 Aug 2006 18:32:27 -0000	1.142
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   16%{?dist}
+Release:   17%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -32,6 +32,8 @@
 Patch104:  xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
 Patch105:  xorg-x11-server-1.1.1-enable-composite.patch
 Patch106:  xorg-x11-server-1.1.1-no-composite-in-xnest.patch
+# Work-in-progress; for now just defaults XaaNoOffscreenPixmaps to false.
+Patch107:  xorg-x11-server-1.1.1-offscreen-pixmaps.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -329,6 +331,7 @@
 %patch104 -p0 -b .mesa-copy-sub-buffer
 %patch105 -p0 -b .enable-composite
 %patch106 -p1 -b .no-xnest-composite
+%patch107 -p0 -b .offscreen-pixmaps
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
@@ -678,6 +681,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Aug  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-17.fc6
+- Add xorg-x11-server-1.1.1-offscreen-pixmaps.patch to default
+  XaaNoOffscreenPixmaps to false, for now.
+
 * Mon Aug  7 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-16.fc6
 - xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Off-by-one error in
   range storage.



From fedora-cvs-commits at redhat.com  Mon Aug  7 18:44:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 14:44:18 -0400
Subject: rpms/kernel/FC-5 .cvsignore, 1.412, 1.413 kernel-2.6.spec, 1.2172,
	1.2173 sources, 1.353, 1.354 upstream, 1.322, 1.323
Message-ID: <200608071844.k77IiILi024841@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Log Message:
* Mon Aug  7 2006 Dave Jones <davej at redhat.com>
- 2.6.17.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- .cvsignore	4 Aug 2006 06:26:16 -0000	1.412
+++ .cvsignore	7 Aug 2006 18:44:15 -0000	1.413
@@ -3,5 +3,4 @@
 kernel-2.6.17
 linux-2.6.17.tar.bz2
 xen-20060708.tar.bz2
-patch-2.6.17.7.bz2
-patch-2.6.17.8-rc1.bz2
+patch-2.6.17.8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2172
retrieving revision 1.2173
diff -u -r1.2172 -r1.2173
--- kernel-2.6.spec	6 Aug 2006 18:21:03 -0000	1.2172
+++ kernel-2.6.spec	7 Aug 2006 18:44:15 -0000	1.2173
@@ -231,8 +231,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.7.bz2
-Patch2: patch-2.6.17.8-rc1.bz2
+Patch1: patch-2.6.17.8.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -676,7 +675,6 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1543,6 +1541,9 @@
 %endif
 
 %changelog
+* Mon Aug  7 2006 Dave Jones <davej at redhat.com>
+- 2.6.17.8
+
 * Fri Aug  4 2006 Dave Jones <davej at redhat.com>
 - Fix split lock patch for 64bit.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- sources	4 Aug 2006 06:26:16 -0000	1.353
+++ sources	7 Aug 2006 18:44:16 -0000	1.354
@@ -1,4 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 5f0d888de4286f08e5661e81b95c69a8  xen-20060708.tar.bz2
-f2c255cdf482ba589151f5da03fed418  patch-2.6.17.7.bz2
-3f4e32df921d09a68969698b2571ecbf  patch-2.6.17.8-rc1.bz2
+791940106e40ff60fa1756e29f7b0488  patch-2.6.17.8.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- upstream	4 Aug 2006 06:26:16 -0000	1.322
+++ upstream	7 Aug 2006 18:44:16 -0000	1.323
@@ -1,3 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.7.bz2
-patch-2.6.17.8-rc1.bz2
+patch-2.6.17.8.bz2



From fedora-cvs-commits at redhat.com  Mon Aug  7 18:44:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 14:44:37 -0400
Subject: rpms/kernel/FC-5 patch-2.6.17.8.bz2.sign, NONE,
	1.1 patch-2.6.17.7.bz2.sign, 1.1,
	NONE patch-2.6.17.8-rc1.bz2.sign, 1.1, NONE
Message-ID: <200608071844.k77Iib7f024981@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	patch-2.6.17.8.bz2.sign 
Removed Files:
	patch-2.6.17.7.bz2.sign patch-2.6.17.8-rc1.bz2.sign 
Log Message:
sigs


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

iD8DBQBE1srLyGugalF9Dw4RAv+mAJ9U3n5rOwxCmmC6aVGr23vYC76GeQCgh/3y
hOu9mp+mF1K9XmZvmar5xPw=
=Wh0Q
-----END PGP SIGNATURE-----


--- patch-2.6.17.7.bz2.sign DELETED ---


--- patch-2.6.17.8-rc1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug  7 18:44:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 14:44:48 -0400
Subject: rpms/kernel/FC-5 .cvsignore,1.413,1.414
Message-ID: <200608071844.k77IimJB025070@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore 
Log Message:
hush cvs


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- .cvsignore	7 Aug 2006 18:44:15 -0000	1.413
+++ .cvsignore	7 Aug 2006 18:44:45 -0000	1.414
@@ -4,3 +4,4 @@
 linux-2.6.17.tar.bz2
 xen-20060708.tar.bz2
 patch-2.6.17.8.bz2
+clog



From fedora-cvs-commits at redhat.com  Mon Aug  7 19:00:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 15:00:41 -0400
Subject: rpms/crash/devel crash.patch,1.13,1.14 crash.spec,1.17,1.18
Message-ID: <200608071900.k77J0fqh013197@cvs.devel.redhat.com>

Author: anderson

Update of /cvs/dist/rpms/crash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13163

Modified Files:
	crash.patch crash.spec 
Log Message:
Removed LKCD v2_v3 pt_regs references for for s390/s390x build.


crash.patch:
 Makefile                     |   62 +
 README                       |   36 
 alpha.c                      |    5 
 cmdline.c                    |   14 
 configure.c                  |    2 
 defs.h                       |  486 +++++++++++-
 dev.c                        |    4 
 diskdump.c                   |  447 +++++++++++
 diskdump.h                   |   58 +
 extensions.c                 |    7 
 extensions/Makefile          |   41 +
 extensions/dminfo.c          | 1531 +++++++++++++++++++++++++++++++++++++++
 extensions/echo.c            |  105 ++
 filesys.c                    |  126 ++-
 gdb-6.1.patch                |    9 
 gdb-6.1/gdb/ppc-linux-tdep.c | 1116 +++++++++++++++++++++++++++++
 gdb_interface.c              |   12 
 help.c                       |  154 ++--
 ia64.c                       |  326 +++++---
 kernel.c                     |  698 ++++++++++++++++--
 lkcd_common.c                |  100 ++
 lkcd_dump_v5.h               |    2 
 lkcd_dump_v7.h               |    2 
 lkcd_v7.c                    |    6 
 lkcd_v8.c                    |   14 
 lkcd_vmdump_v1.h             |    4 
 lkcd_vmdump_v2_v3.h          |    4 
 lkcd_x86_trace.c             |  263 ++++++
 main.c                       |  112 ++
 memory.c                     | 1600 ++++++++++++++++++++++++++++++++++++-----
 net.c                        |  220 ++++-
 netdump.c                    |  696 +++++++++++++++---
 netdump.h                    |   34 
 ppc.c                        |   15 
 ppc64.c                      |  422 ++++++++++
 s390.c                       |    9 
 s390_dump.c                  |    7 
 s390x.c                      |    9 
 symbols.c                    |   67 +
 task.c                       |  585 ++++++++++++---
 tools.c                      |   74 +
 unwind.c                     |   19 
 va_server.c                  |    4 
 vas_crash.h                  |    2 
 x86.c                        | 1653 ++++++++++++++++++++++++++++++++++++++++---
 x86_64.c                     | 1550 +++++++++++++++++++++++++++++++++++++---
 xendump.c                    | 1170 ++++++++++++++++++++++++++++++
 xendump.h                    |   97 ++
 48 files changed, 12856 insertions(+), 1123 deletions(-)

Index: crash.patch
===================================================================
RCS file: /cvs/dist/rpms/crash/devel/crash.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- crash.patch	7 Aug 2006 17:51:51 -0000	1.13
+++ crash.patch	7 Aug 2006 19:00:29 -0000	1.14
@@ -1,4 +1,4 @@
---- crash/extensions/Makefile.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/extensions/Makefile.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/extensions/Makefile	2005-11-08 11:38:21.000000000 -0500
 @@ -0,0 +1,41 @@
 +#
@@ -42,7 +42,7 @@
 +dminfo.so: ../defs.h dminfo.c
 +	gcc -nostartfiles -shared -rdynamic -o dminfo.so dminfo.c -fPIC -D$(TARGET)
 +	
---- crash/extensions/echo.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/extensions/echo.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/extensions/echo.c	2006-05-16 15:43:05.000000000 -0400
 @@ -0,0 +1,105 @@
 +/* echo.c - simple example of a crash extension
@@ -150,7 +150,7 @@
 +};
 +
 +
---- crash/extensions/dminfo.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/extensions/dminfo.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/extensions/dminfo.c	2006-05-16 15:43:05.000000000 -0400
 @@ -0,0 +1,1531 @@
 +/* dminfo.c - crash extension module for device-mapper analysis
@@ -1684,7 +1684,7 @@
 +{
 +	return 0;
 +}
---- crash/gdb-6.1/gdb/ppc-linux-tdep.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/gdb-6.1/gdb/ppc-linux-tdep.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/gdb-6.1/gdb/ppc-linux-tdep.c	2005-11-04 17:37:54.000000000 -0500
 @@ -0,0 +1,1116 @@
 +/* Target-dependent code for GDB, the GNU debugger.
@@ -2803,7 +2803,7 @@
 +                         ppc_linux_init_abi);
 +  add_core_fns (&ppc_linux_regset_core_fns);
 +}
---- crash/main.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/main.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/main.c	2006-08-03 16:58:32.000000000 -0400
 @@ -35,11 +35,15 @@
  	{"no_data_debug", 0, 0, 0},
@@ -3065,7 +3065,7 @@
          else if (pc->writemem == write_memory_device)
                  fprintf(fp, "         writemem: write_memory_device()\n");
          else
---- crash/tools.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/tools.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/tools.c	2006-07-06 16:21:55.000000000 -0400
 @@ -2004,6 +2004,10 @@
  				pc->flags &= ~(DUMPFILE_TYPES);
@@ -3183,7 +3183,7 @@
 +
 +        return ((c2 == '\0') && (c1 == '/') && (*p1 == '\0')) ? 0 : c1 - c2;
 +}
---- crash/memory.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/memory.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/memory.c	2006-08-02 10:32:08.000000000 -0400
 @@ -45,6 +45,8 @@
  	ulong *addrlist;
@@ -5670,7 +5670,7 @@
 +		}
 +	}
 +}
---- crash/filesys.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/filesys.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/filesys.c	2006-07-06 16:40:52.000000000 -0400
 @@ -1,8 +1,8 @@
  /* filesys.c - core analysis suite
@@ -5920,7 +5920,7 @@
   * get_pathname() fills in a pathname string for an ending dentry
   * See __d_path() in the kernel for help fixing problems.
   */
---- crash/help.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/help.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/help.c	2006-08-03 16:59:00.000000000 -0400
 @@ -1,8 +1,8 @@
  /* help.c - core analysis suite
@@ -6253,7 +6253,7 @@
  "Copyright (C) 1999, 2002  Silicon Graphics, Inc.",
  "Copyright (C) 1999, 2000, 2001, 2002  Mission Critical Linux, Inc.",
  "This program is free software, covered by the GNU General Public License,",
---- crash/task.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/task.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/task.c	2006-06-26 09:13:03.000000000 -0400
 @@ -27,6 +27,7 @@
  static void refresh_pidhash_task_table(void);
@@ -7172,7 +7172,7 @@
  	sigset = task_signal(tc->task);
  	if (!tt->last_task_read)
  		return;
---- crash/kernel.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/kernel.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/kernel.c	2006-08-03 17:25:27.000000000 -0400
 @@ -20,7 +20,7 @@
  
@@ -8157,7 +8157,7 @@
 +			break;
 +	}
  }
---- crash/gdb_interface.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/gdb_interface.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/gdb_interface.c	2006-04-11 17:25:48.000000000 -0400
 @@ -31,9 +31,6 @@
  {
@@ -8189,7 +8189,7 @@
  			gdb_interface(req);
          		if (!(req->flags & GNU_COMMAND_FAILED)) 
  				goto retry;
---- crash/configure.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/configure.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/configure.c	2006-03-23 15:44:46.000000000 -0500
 @@ -1128,7 +1128,7 @@
  	printf("License: GPL\n");
@@ -8200,7 +8200,7 @@
  	printf("Distribution: Linux 2.2 or greater\n");
  	printf("Vendor: Red Hat, Inc.\n");
  	printf("Packager: Dave Anderson <anderson at redhat.com>\n");
---- crash/net.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/net.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/net.c	2006-05-11 11:17:01.000000000 -0400
 @@ -50,6 +50,7 @@
  #define STRUCT_NET_DEVICE (0x4)
@@ -8557,7 +8557,7 @@
  			break;
  		}
  		break;
---- crash/dev.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/dev.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/dev.c	2005-11-23 11:09:08.000000000 -0500
 @@ -91,13 +91,13 @@
                  switch(c)
@@ -8575,7 +8575,7 @@
  				option_not_supported(c);
  			do_pci();
  			return;
---- crash/alpha.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/alpha.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/alpha.c	2006-08-02 10:30:58.000000000 -0400
 @@ -186,7 +186,8 @@
  				"irq_desc", NULL, 0);
@@ -8596,7 +8596,7 @@
          fprintf(fp, ")\n");
  	fprintf(fp, "             kvbase: %lx\n", machdep->kvbase);
  	fprintf(fp, "  identity_map_base: %lx\n", machdep->identity_map_base);
---- crash/x86.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/x86.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/x86.c	2006-08-03 11:15:55.000000000 -0400
 @@ -176,6 +176,7 @@
  static void db_symbol_values(db_sym_t, char **, db_expr_t *);
@@ -10543,7 +10543,7 @@
 +	return machdep->get_stack_frame(bt, eip, esp);
 +}
  #endif /* X86 */
---- crash/ppc.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/ppc.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/ppc.c	2006-08-02 10:31:13.000000000 -0400
 @@ -135,9 +135,13 @@
  				"irq_desc", NULL, 0);
@@ -10581,7 +10581,7 @@
  	fprintf(fp, "           machspec: %lx\n", (ulong)machdep->machspec);
  }
  
---- crash/ia64.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/ia64.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/ia64.c	2006-08-03 14:28:37.000000000 -0400
 @@ -1,8 +1,8 @@
  /* ia64.c - core analysis suite
@@ -11105,7 +11105,7 @@
  
  	if (DUMPFILE() && ia64_in_init_stack(SWITCH_STACK_ADDR(CURRENT_TASK())))
  		machdep->flags |= INIT;
---- crash/s390.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/s390.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/s390.c	2006-08-02 10:31:22.000000000 -0400
 @@ -158,7 +158,8 @@
  		machdep->nr_irqs = 0;  /* TBD */
@@ -11137,7 +11137,7 @@
  			}
  			for(j=0; j< frame_size; j+=4){
  				if(j % 16 == 0){
---- crash/s390x.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/s390x.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/s390x.c	2006-08-02 10:31:24.000000000 -0400
 @@ -173,7 +173,8 @@
  		machdep->nr_irqs = 0;  /* TBD */
@@ -11169,7 +11169,7 @@
  			}
  			for(j=0; j< frame_size; j+=4){
  				if(j % 16 == 0){
---- crash/ppc64.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/ppc64.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/ppc64.c	2006-08-02 10:31:29.000000000 -0400
 @@ -47,6 +47,9 @@
  static char * ppc64_check_eframe(struct ppc64_pt_regs *);
@@ -11746,7 +11746,7 @@
 +        	machdep->machspec->last_level4_read = 0;
 +}
  #endif /* PPC64 */ 
---- crash/x86_64.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/x86_64.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/x86_64.c	2006-08-02 10:31:34.000000000 -0400
 @@ -18,7 +18,10 @@
  #ifdef X86_64
@@ -13698,7 +13698,7 @@
 +	}
 +}
  #endif  /* X86_64 */ 
---- crash/extensions.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/extensions.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/extensions.c	2005-11-10 09:47:46.000000000 -0500
 @@ -18,9 +18,6 @@
  #include "defs.h"
@@ -13728,7 +13728,7 @@
  unload_extension(char *lib)
  {
          struct extension_table *ext;
---- crash/va_server.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/va_server.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/va_server.c	2006-03-22 08:55:34.000000000 -0500
 @@ -57,13 +57,15 @@
  
@@ -13747,7 +13747,7 @@
  	if(read_map(crash_file)) {
  		if(va_server_init_v1(crash_file, start, end, stride))
  			return -1;
---- crash/symbols.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/symbols.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/symbols.c	2006-08-03 14:43:54.000000000 -0400
 @@ -1,8 +1,8 @@
  /* symbols.c - core analysis suite
@@ -13911,7 +13911,7 @@
  
          fprintf(fp, "\n                   array_table:\n");
  	/*
---- crash/cmdline.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/cmdline.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/cmdline.c	2006-07-10 10:59:57.000000000 -0400
 @@ -71,14 +71,17 @@
  	 *    4. from a terminal.
@@ -13951,7 +13951,7 @@
  
  	restore_gdb_sanity();
  
---- crash/lkcd_common.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/lkcd_common.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/lkcd_common.c	2006-06-15 10:34:53.000000000 -0400
 @@ -53,6 +53,8 @@
  
@@ -14131,7 +14131,7 @@
  
  	if ((lkcd->flags & LKCD_VALID) && (page > lkcd->total_pages)) 
  		lkcd->total_pages = page;
---- crash/lkcd_v7.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/lkcd_v7.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/lkcd_v7.c	2005-11-10 15:21:50.000000000 -0500
 @@ -89,7 +89,11 @@
  	ifd = 0;
@@ -14146,7 +14146,7 @@
  	dump_index_size = (lkcd->memory_pages * sizeof(off_t));	
  	lkcd->page_offsets = 0;
  	strcpy(dumpfile_index_name, dumpfile);
---- crash/lkcd_v8.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/lkcd_v8.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/lkcd_v8.c	2005-12-15 08:59:52.000000000 -0500
 @@ -26,6 +26,7 @@
  // static dump_header_asm_t dump_header_asm_v8 = { 0 };
@@ -14207,7 +14207,7 @@
  		set_mb_benchmark((granularity * (i+1))/lkcd->page_size);
  	}
  }
---- crash/s390_dump.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/s390_dump.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/s390_dump.c	2006-05-15 17:15:56.000000000 -0400
 @@ -16,7 +16,7 @@
   * GNU General Public License for more details.
@@ -14233,7 +14233,7 @@
  }
  
  int 
---- crash/lkcd_x86_trace.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/lkcd_x86_trace.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/lkcd_x86_trace.c	2006-05-15 16:28:35.000000000 -0400
 @@ -47,11 +47,13 @@
  static int setup_trace_rec(kaddr_t, kaddr_t, int, trace_t *);
@@ -14603,7 +14603,7 @@
   *  Cache 2k starting from the passed-in text address.  This sits on top
   *  of the instrbuf 256-byte cache, but we don't want to extend its size
   *  because we can run off the end of a module segment -- if this routine
---- crash/netdump.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/netdump.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/netdump.c	2006-07-10 11:01:03.000000000 -0400
 @@ -22,12 +22,12 @@
  	physaddr_t phys_end;
@@ -15778,7 +15778,7 @@
 +	
 +	return paddr;
 +}
---- crash/diskdump.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/diskdump.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/diskdump.c	2006-03-23 14:29:25.000000000 -0500
 @@ -1,16 +1,16 @@
  /* 
@@ -16302,7 +16302,7 @@
  }
  
  /*
---- crash/xendump.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/xendump.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/xendump.c	2006-07-11 09:36:03.000000000 -0400
 @@ -0,0 +1,1170 @@
 +/* 
@@ -17475,7 +17475,7 @@
 +		}
 +	}
 +}
---- crash/unwind.c.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/unwind.c.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/unwind.c	2005-11-23 09:37:52.000000000 -0500
 @@ -1397,9 +1397,22 @@
  	req = &request;
@@ -17503,7 +17503,7 @@
  		machdep->machspec->unw_tables_offset =
  			 req->member_offset/BITS_PER_BYTE;
  
---- crash/defs.h.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/defs.h.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/defs.h	2006-08-03 17:25:55.000000000 -0400
 @@ -1,8 +1,8 @@
  /* defs.h - core analysis suite
@@ -18473,7 +18473,7 @@
  
  #define LKCD_DUMP_VERSION_NUMBER_MASK (0xf)
  #define LKCD_DUMP_RAW                 (0x1)   /* DUMP_[DH_]RAW */ 
---- crash/vas_crash.h.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/vas_crash.h.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/vas_crash.h	2006-05-15 16:50:28.000000000 -0400
 @@ -19,7 +19,7 @@
   */
@@ -18484,7 +18484,7 @@
  
  void save_core(void);
  
---- crash/netdump.h.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/netdump.h.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/netdump.h	2006-06-28 14:16:16.000000000 -0400
 @@ -24,3 +24,37 @@
  
@@ -18524,7 +18524,7 @@
 +#define KDUMP_MFN_LIST  (0x4)
 +
 +#define P2M_FAILURE ((physaddr_t)(0xffffffffffffffffLL))
---- crash/diskdump.h.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/diskdump.h.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/diskdump.h	2005-11-30 15:15:00.000000000 -0500
 @@ -3,6 +3,8 @@
   *
@@ -18597,7 +18597,7 @@
 +#define PAGE_VALID		(0x1)	/* flags */
 +#define DISKDUMP_VALID_PAGE(flags)	((flags) & PAGE_VALID)
 +
---- crash/xendump.h.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/xendump.h.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/xendump.h	2006-06-09 11:26:09.000000000 -0400
 @@ -0,0 +1,97 @@
 +/* 
@@ -18697,7 +18697,7 @@
 +
 +#define MFN_NOT_FOUND (-1)
 +#define PFN_NOT_FOUND (-1)
---- crash/lkcd_vmdump_v1.h.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/lkcd_vmdump_v1.h.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/lkcd_vmdump_v1.h	2006-08-07 13:50:37.000000000 -0400
 @@ -114,8 +114,12 @@
  
@@ -18712,7 +18712,21 @@
  
  	/* the address of the current task */
  	struct task_struct  *dh_current_task;
---- crash/lkcd_dump_v5.h.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/lkcd_vmdump_v2_v3.h.orig	2006-08-07 15:00:37.000000000 -0400
++++ crash/lkcd_vmdump_v2_v3.h	2006-08-07 14:55:38.000000000 -0400
+@@ -81,7 +81,11 @@
+ 	uint32_t             dha_eip;
+ 
+ 	/* the dump registers */
++#ifndef S390
++#ifndef S390X
+ 	struct pt_regs       dha_regs;
++#endif
++#endif
+ 
+ } dump_header_asm_t;
+ 
+--- crash/lkcd_dump_v5.h.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/lkcd_dump_v5.h	2006-03-22 08:45:35.000000000 -0500
 @@ -35,7 +35,7 @@
  #ifndef _DUMP_H
@@ -18723,7 +18737,7 @@
  
  /* define TRUE and FALSE for use in our dump modules */
  #ifndef FALSE
---- crash/lkcd_dump_v7.h.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/lkcd_dump_v7.h.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/lkcd_dump_v7.h	2006-03-22 08:45:57.000000000 -0500
 @@ -35,7 +35,7 @@
  #ifndef _DUMP_H
@@ -18734,8 +18748,8 @@
  
  /* define TRUE and FALSE for use in our dump modules */
  #ifndef FALSE
---- crash/Makefile.orig	2006-08-07 13:51:46.000000000 -0400
-+++ crash/Makefile	2006-08-07 13:51:46.000000000 -0400
+--- crash/Makefile.orig	2006-08-07 15:00:37.000000000 -0400
++++ crash/Makefile	2006-08-07 15:00:37.000000000 -0400
 @@ -3,8 +3,8 @@
  # Copyright (C) 1999, 2000, 2001, 2002 Mission Critical Linux, Inc.
  #       www.missioncriticallinux.com, info at missioncriticallinux.com
@@ -18911,7 +18925,7 @@
 +
 +do_extensions:
 +	@(cd extensions; make -i OBJECTS="$(EXTENSION_OBJECT_FILES)" TARGET=$(TARGET))
---- crash/gdb-6.1.patch.orig	2006-08-07 13:51:46.000000000 -0400
+--- crash/gdb-6.1.patch.orig	2006-08-07 15:00:37.000000000 -0400
 +++ crash/gdb-6.1.patch	2006-01-03 13:36:25.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- gdb-6.1/bfd/coff-alpha.c.orig
@@ -18925,8 +18939,8 @@
 + 	}
 + 
 +       if (lita_sec_data->gp != 0)
---- crash/README.orig	2006-08-07 13:51:46.000000000 -0400
-+++ crash/README	2006-08-07 13:51:42.000000000 -0400
+--- crash/README.orig	2006-08-07 15:00:37.000000000 -0400
++++ crash/README	2006-08-07 15:00:33.000000000 -0400
 @@ -69,7 +69,7 @@
       After the kernel is re-compiled, the uncompressed "vmlinux" kernel
       that is created in the top-level kernel build directory must be saved.
@@ -18958,7 +18972,7 @@
          DUMPFILE: /dev/mem
              CPUS: 1
 -            DATE: Wed Jul 13 13:26:00 2005
-+            DATE: Mon Aug  7 13:51:42 2006
++            DATE: Mon Aug  7 15:00:33 2006
            UPTIME: 10 days, 22:55:18
      LOAD AVERAGE: 0.08, 0.03, 0.01
             TASKS: 42


Index: crash.spec
===================================================================
RCS file: /cvs/dist/rpms/crash/devel/crash.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- crash.spec	7 Aug 2006 17:53:01 -0000	1.17
+++ crash.spec	7 Aug 2006 19:00:29 -0000	1.18
@@ -50,6 +50,7 @@
 - Added kdump reference to description.
 - Added s390 and s390x to ExclusiveArch list.  BZ #199125
 - Removed LKCD v1 pt_regs references for s390/s390x build.
+- Removed LKCD v2_v3 pt_regs references for for s390/s390x build.
 
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 4.0-3
 - rebuild



From fedora-cvs-commits at redhat.com  Mon Aug  7 19:07:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 15:07:47 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc4.bz2.sign, NONE, 1.1 .cvsignore,
	1.509, 1.510 kernel-2.6.spec, 1.2529, 1.2530 sources, 1.472,
	1.473 upstream, 1.412, 1.413 patch-2.6.18-rc3-git7.bz2.sign,
	1.1, NONE patch-2.6.18-rc3.bz2.sign, 1.1, NONE
Message-ID: <200608071907.k77J7lbg014411@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc4.bz2.sign 
Removed Files:
	patch-2.6.18-rc3-git7.bz2.sign patch-2.6.18-rc3.bz2.sign 
Log Message:
rc4 (make prep broken right now, Roland has utrace fixes pending commit
after this)



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

iD8DBQBE14ziyGugalF9Dw4RAkF5AJ9rysWWjAhH+cEdP0ncmKtJ15/OEwCfdPC+
tuLi/bt/pWy6uNJ5kk7b/88=
=43HW
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -r1.509 -r1.510
--- .cvsignore	6 Aug 2006 05:35:39 -0000	1.509
+++ .cvsignore	7 Aug 2006 19:07:44 -0000	1.510
@@ -3,6 +3,5 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-patch-2.6.18-rc3.bz2
 xen-10924.tar.bz2
-patch-2.6.18-rc3-git7.bz2
+patch-2.6.18-rc4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2529
retrieving revision 1.2530
diff -u -r1.2529 -r1.2530
--- kernel-2.6.spec	7 Aug 2006 18:18:50 -0000	1.2529
+++ kernel-2.6.spec	7 Aug 2006 19:07:44 -0000	1.2530
@@ -263,8 +263,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.18-rc3.bz2
-Patch2: patch-2.6.18-rc3-git7.bz2
+Patch1: patch-2.6.18-rc4.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -711,7 +710,6 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1693,6 +1691,9 @@
 %endif
 
 %changelog
+* Mon Aug  7 2006 Dave Jones <davej at redhat.com>
+- 2.6.18rc4
+
 * Sun Aug  6 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3-git7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -r1.472 -r1.473
--- sources	6 Aug 2006 05:35:40 -0000	1.472
+++ sources	7 Aug 2006 19:07:44 -0000	1.473
@@ -1,4 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-ba31b754aaf80aa388858f86c34c4d01  patch-2.6.18-rc3.bz2
 32a856cececcc35cb834cfaccc3c2523  xen-10924.tar.bz2
-6b6891209419b5db20b060a0cd6161b5  patch-2.6.18-rc3-git7.bz2
+780289cba0d4529ff80956e145ce567a  patch-2.6.18-rc4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- upstream	6 Aug 2006 05:35:40 -0000	1.412
+++ upstream	7 Aug 2006 19:07:45 -0000	1.413
@@ -1,3 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.18-rc3.bz2
-patch-2.6.18-rc3-git7.bz2
+patch-2.6.18-rc4.bz2


--- patch-2.6.18-rc3-git7.bz2.sign DELETED ---


--- patch-2.6.18-rc3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug  7 19:08:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 15:08:01 -0400
Subject: rpms/kernel/devel linux-2.6-utrace.patch,1.13,1.14
Message-ID: <200608071908.k77J81wY014521@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	linux-2.6-utrace.patch 
Log Message:
utrace rebased to 2.6.18-rc4

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  455 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  839 +++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/ia32_entry.S             |    2 
 arch/ia64/ia32/sys_ia32.c               |   23 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/ia64/kernel/signal.c               |    4 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  553 ++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  688 +++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   74 +
 include/asm-ia64/tracehook.h            |   67 +
 include/asm-powerpc/tracehook.h         |  303 ++++++
 include/asm-s390/tracehook.h            |  105 ++
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  106 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   86 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  644 +++++++++++++
 include/linux/utrace.h                  |  470 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  259 +----
 kernel/fork.c                           |   62 -
 kernel/ptrace.c                         | 1565 +++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1520 +++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 92 files changed, 8250 insertions(+), 3304 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-utrace.patch	4 Aug 2006 04:54:58 -0000	1.13
+++ linux-2.6-utrace.patch	7 Aug 2006 19:07:58 -0000	1.14
@@ -78,19 +78,19 @@
  include/linux/init_task.h               |    3 
  include/linux/ptrace.h                  |   86 +-
  include/linux/sched.h                   |   25 
- include/linux/tracehook.h               |  641 +++++++++++++
- include/linux/utrace.h                  |  471 +++++++++
+ include/linux/tracehook.h               |  644 +++++++++++++
+ include/linux/utrace.h                  |  470 +++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
  kernel/exit.c                           |  259 +----
- kernel/fork.c                           |   60 -
- kernel/ptrace.c                         | 1562 ++++++++++++++++++++++++-------
+ kernel/fork.c                           |   62 -
+ kernel/ptrace.c                         | 1565 ++++++++++++++++++++++++-------
  kernel/signal.c                         |  211 +---
  kernel/sys.c                            |    2 
  kernel/timer.c                          |    6 
  kernel/utrace.c                         | 1520 ++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |    6 
- 92 files changed, 8246 insertions(+), 3303 deletions(-)
+ 92 files changed, 8251 insertions(+), 3305 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -1007,7 +1007,7 @@
  extern int send_sig(int, struct task_struct *, int);
 --- linux-2.6/include/linux/utrace.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/utrace.h
-@@ -0,0 +1,471 @@
+@@ -0,0 +1,470 @@
 +/*
 + * User Debugging Data & Event Rendezvous
 + *
@@ -1261,11 +1261,10 @@
 +	/*
 +	 * Event reported for parent using CLONE_VFORK or vfork system call.
 +	 * The child has died or exec'd, so the vfork parent has unblocked
-+	 * and is about to return child->pid.
++	 * and is about to return child_pid.
 +	 */
 +	u32 (*report_vfork_done)(struct utrace_attached_engine *engine,
-+				 struct task_struct *parent,
-+				 struct task_struct *child);
++				 struct task_struct *parent, pid_t child_pid);
 +
 +	/*
 +	 * Event reported after UTRACE_ACTION_QUIESCE is set, when the target
@@ -1466,7 +1465,7 @@
 +int utrace_get_signal(struct task_struct *, struct pt_regs *,
 +		      siginfo_t *, struct k_sigaction *);
 +void utrace_report_clone(unsigned long clone_flags, struct task_struct *child);
-+void utrace_report_vfork_done(struct task_struct *child);
++void utrace_report_vfork_done(pid_t child_pid);
 +void utrace_report_exit(long *exit_code);
 +void utrace_report_death(struct task_struct *);
 +int utrace_report_jctl(int type);
@@ -1593,7 +1592,7 @@
  	.sibling	= LIST_HEAD_INIT(tsk.sibling),			\
 --- linux-2.6/include/linux/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/tracehook.h
-@@ -0,0 +1,641 @@
+@@ -0,0 +1,644 @@
 +/*
 + * Tracing hooks
 + *
@@ -2186,12 +2185,15 @@
 +/*
 + * Called after a CLONE_VFORK parent has waited for the child to complete.
 + * The clone/vfork system call will return immediately after this.
++ * The child pointer may be invalid if a self-reaping child died and
++ * tracehook_report_clone took no action to prevent it from self-reaping.
 + */
-+static inline void tracehook_report_vfork_done(struct task_struct *child)
++static inline void tracehook_report_vfork_done(struct task_struct *child,
++					       pid_t child_pid)
 +{
 +#ifdef CONFIG_UTRACE
 +	if (current->utrace_flags & UTRACE_EVENT(VFORK_DONE))
-+		utrace_report_vfork_done(child);
++		utrace_report_vfork_done(child_pid);
 +#endif
 +}
 +
@@ -2827,7 +2829,7 @@
  
  	p = copy_process(clone_flags, stack_start, regs, stack_size, parent_tidptr, child_tidptr, nr);
  	/*
-@@ -1367,28 +1343,26 @@ long do_fork(unsigned long clone_flags,
+@@ -1367,30 +1343,26 @@ long do_fork(unsigned long clone_flags,
  			init_completion(&vfork);
  		}
  
@@ -2859,9 +2861,11 @@
  
  		if (clone_flags & CLONE_VFORK) {
  			wait_for_completion(&vfork);
--			if (unlikely (current->ptrace & PT_TRACE_VFORK_DONE))
+-			if (unlikely (current->ptrace & PT_TRACE_VFORK_DONE)) {
+-				current->ptrace_message = nr;
 -				ptrace_notify ((PTRACE_EVENT_VFORK_DONE << 8) | SIGTRAP);
-+			tracehook_report_vfork_done(p);
+-			}
++			tracehook_report_vfork_done(p, nr);
  		}
  	} else {
  		free_pid(pid);
@@ -4144,7 +4148,7 @@
 + * Called iff UTRACE_EVENT(VFORK_DONE) flag is set.
 + */
 +void
-+utrace_report_vfork_done(struct task_struct *child)
++utrace_report_vfork_done(pid_t child_pid)
 +{
 +	struct task_struct *tsk = current;
 +	struct utrace *utrace = tsk->utrace;
@@ -4157,7 +4161,7 @@
 +	list_for_each_safe_rcu(pos, next, &utrace->engines) {
 +		engine = list_entry(pos, struct utrace_attached_engine, entry);
 +		if (engine->flags & UTRACE_EVENT(VFORK_DONE))
-+			REPORT(report_vfork_done, child);
++			REPORT(report_vfork_done, child_pid);
 +		if (action & UTRACE_ACTION_HIDE)
 +			break;
 +	}
@@ -5481,7 +5485,7 @@
  /*
   * Access another process' address space.
   * Source/target buffer must be kernel space, 
-@@ -295,249 +125,1303 @@ int access_process_vm(struct task_struct
+@@ -295,249 +125,1306 @@ int access_process_vm(struct task_struct
  	return buf - old_buf;
  }
  
@@ -6792,8 +6796,11 @@
 -	return ret;
 +static u32
 +ptrace_report_vfork_done(struct utrace_attached_engine *engine,
-+			 struct task_struct *parent, struct task_struct *child)
++			 struct task_struct *parent, pid_t child_pid)
 +{
++	struct ptrace_state *state = (struct ptrace_state *) engine->data;
++	state->u.live.have_eventmsg = 1;
++	state->u.live.u.eventmsg = child_pid;
 +	return ptrace_event(engine, parent, PTRACE_EVENT_VFORK_DONE);
 +}
 +



From fedora-cvs-commits at redhat.com  Mon Aug  7 19:19:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 15:19:56 -0400
Subject: rpms/kernel/devel linux-2.6-defaults-unicode-vt.patch, 1.1,
	1.2 linux-2.6-mm-suspend-improvements.patch, 1.1, 1.2
Message-ID: <200608071919.k77JJuJ2000454@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-defaults-unicode-vt.patch 
	linux-2.6-mm-suspend-improvements.patch 
Log Message:
fix rejects

linux-2.6-defaults-unicode-vt.patch:
 linux-2.6.11/drivers/char/vt.c              |    2 +-
 linux-2.6.17.noarch/drivers/char/keyboard.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6-defaults-unicode-vt.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-defaults-unicode-vt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-defaults-unicode-vt.patch	19 Apr 2006 21:24:16 -0000	1.1
+++ linux-2.6-defaults-unicode-vt.patch	7 Aug 2006 19:19:53 -0000	1.2
@@ -12,14 +12,14 @@
  	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;
+--- linux-2.6.17.noarch/drivers/char/keyboard.c~	2006-08-07 15:15:48.000000000 -0400
++++ linux-2.6.17.noarch/drivers/char/keyboard.c	2006-08-07 15:15:59.000000000 -0400
+@@ -1370,7 +1370,7 @@ int __init kbd_init(void)
+ 		kbd_table[i].lockstate = KBD_DEFLOCK;
+ 		kbd_table[i].slockstate = 0;
+ 		kbd_table[i].modeflags = KBD_DEFMODE;
+-		kbd_table[i].kbdmode = VC_XLATE;
++		kbd_table[i].kbdmode = VC_UNICODE;
+ 	}
  
-         for (i = 0 ; i < MAX_NR_CONSOLES ; i++)
-                 kbd_table[i] = kbd0;
+ 	input_register_handler(&kbd_handler);

linux-2.6-mm-suspend-improvements.patch:
 /dev/null                    |   62 ---------
 a/arch/x86_64/kernel/e820.c  |   48 ++++++
 a/arch/x86_64/kernel/setup.c |    1 
 a/fs/cifs/connect.c          |    1 
 a/include/asm-x86_64/e820.h  |    1 
 a/include/linux/cpu.h        |    8 +
 a/include/linux/suspend.h    |    8 -
 a/include/linux/swap.h       |    6 
 a/kernel/cpu.c               |  138 +++++++++++++++++---
 a/kernel/power/Makefile      |    2 
 a/kernel/power/disk.c        |    7 -
 a/kernel/power/main.c        |   10 -
 a/kernel/power/power.h       |   65 ++++++++-
 a/kernel/power/snapshot.c    |  113 ++++++++--------
 a/kernel/power/swap.c        |  295 ++++++++++++++++++++++++++++---------------
 a/kernel/power/user.c        |   14 +-
 a/mm/page_io.c               |   25 ++-
 17 files changed, 530 insertions(+), 274 deletions(-)

Index: linux-2.6-mm-suspend-improvements.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-mm-suspend-improvements.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-mm-suspend-improvements.patch	1 Aug 2006 23:25:03 -0000	1.1
+++ linux-2.6-mm-suspend-improvements.patch	7 Aug 2006 19:19:54 -0000	1.2
@@ -8,7 +8,6 @@
 swsusp-clean-up-browsing-of-pfns.patch
 swsusp-struct-snapshot_handle-cleanup.patch
 make-swsusp-avoid-memory-holes-and-reserved-memory-regions-on-x86_64.patch
-make-suspend-possible-with-a-traced-process-at-a-breakpoint.patch
 allow-cifsd-to-suspend-if-connection-is-lost.patch
 disable-cpu-hotplug-during-suspend-2.patch
 From: Andrew Morton <akpm at osdl.org>
@@ -1390,100 +1389,6 @@
 _
 From: "Rafael J. Wysocki" <rjw at sisk.pl>
 
-It should be possible to suspend, either to RAM or to disk, if there's a
-traced process that has just reached a breakpoint.  However, this is a
-special case, because its parent process might have been frozen already and
-then we are unable to deliver the "freeze" signal to the traced process. 
-If this happens, it's better to cancel the freezing of the traced process.
-
-Ref. http://bugzilla.kernel.org/show_bug.cgi?id=6787
-
-Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
-Acked-by: Pavel Machek <pavel at ucw.cz>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- include/linux/sched.h  |    8 ++++++++
- kernel/power/process.c |   26 ++++++++++++++++++--------
- 2 files changed, 26 insertions(+), 8 deletions(-)
-
-diff -puN include/linux/sched.h~make-suspend-possible-with-a-traced-process-at-a-breakpoint include/linux/sched.h
---- a/include/linux/sched.h~make-suspend-possible-with-a-traced-process-at-a-breakpoint
-+++ a/include/linux/sched.h
-@@ -1567,6 +1567,14 @@ static inline void freeze(struct task_st
- }
- 
- /*
-+ * Sometimes we may need to cancel the previous 'freeze' request
-+ */
-+static inline void do_not_freeze(struct task_struct *p)
-+{
-+	p->flags &= ~PF_FREEZE;
-+}
-+
-+/*
-  * Wake up a frozen process
-  */
- static inline int thaw_process(struct task_struct *p)
-diff -puN kernel/power/process.c~make-suspend-possible-with-a-traced-process-at-a-breakpoint kernel/power/process.c
---- a/kernel/power/process.c~make-suspend-possible-with-a-traced-process-at-a-breakpoint
-+++ a/kernel/power/process.c
-@@ -66,13 +66,25 @@ static inline void freeze_process(struct
- 	}
- }
- 
-+static void cancel_freezing(struct task_struct *p)
-+{
-+	unsigned long flags;
-+
-+	if (freezing(p)) {
-+		pr_debug("  clean up: %s\n", p->comm);
-+		do_not_freeze(p);
-+		spin_lock_irqsave(&p->sighand->siglock, flags);
-+		recalc_sigpending_tsk(p);
-+		spin_unlock_irqrestore(&p->sighand->siglock, flags);
-+	}
-+}
-+
- /* 0 = success, else # of processes that we failed to stop */
- int freeze_processes(void)
- {
- 	int todo, nr_user, user_frozen;
- 	unsigned long start_time;
- 	struct task_struct *g, *p;
--	unsigned long flags;
- 
- 	printk( "Stopping tasks: " );
- 	start_time = jiffies;
-@@ -85,6 +97,10 @@ int freeze_processes(void)
- 				continue;
- 			if (frozen(p))
- 				continue;
-+			if (p->state == TASK_TRACED && frozen(p->parent)) {
-+				cancel_freezing(p);
-+				continue;
-+			}
- 			if (p->mm && !(p->flags & PF_BORROWED_MM)) {
- 				/* The task is a user-space one.
- 				 * Freeze it unless there's a vfork completion
-@@ -126,13 +142,7 @@ int freeze_processes(void)
- 		do_each_thread(g, p) {
- 			if (freezeable(p) && !frozen(p))
- 				printk(KERN_ERR "  %s\n", p->comm);
--			if (freezing(p)) {
--				pr_debug("  clean up: %s\n", p->comm);
--				p->flags &= ~PF_FREEZE;
--				spin_lock_irqsave(&p->sighand->siglock, flags);
--				recalc_sigpending_tsk(p);
--				spin_unlock_irqrestore(&p->sighand->siglock, flags);
--			}
-+			cancel_freezing(p);
- 		} while_each_thread(g, p);
- 		read_unlock(&tasklist_lock);
- 		return todo;
-_
-From: "Rafael J. Wysocki" <rjw at sisk.pl>
-
 Make cifsd allow us to suspend if it has lost the connection with the server.
 
 Ref. http://bugzilla.kernel.org/show_bug.cgi?id=6811



From fedora-cvs-commits at redhat.com  Mon Aug  7 19:49:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 15:49:04 -0400
Subject: rpms/glibc/devel .cvsignore, 1.162, 1.163 glibc-fedora.patch, 1.166,
	1.167 glibc.spec, 1.253, 1.254 sources, 1.186, 1.187
Message-ID: <200608071949.k77Jn4kx014652@cvs.devel.redhat.com>

Author: jakub

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- .cvsignore	2 Aug 2006 18:29:53 -0000	1.162
+++ .cvsignore	7 Aug 2006 19:49:00 -0000	1.163
@@ -1,2 +1,2 @@
-glibc-20060802T1808.tar.bz2
-glibc-fedora-20060802T1808.tar.bz2
+glibc-20060807T1859.tar.bz2
+glibc-fedora-20060807T1859.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 57 files changed, 1394 insertions(+), 631 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- glibc-fedora.patch	2 Aug 2006 18:29:53 -0000	1.166
+++ glibc-fedora.patch	7 Aug 2006 19:49:00 -0000	1.167
@@ -1,5 +1,5 @@
---- glibc-20060802T1808/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060802T1808-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060807T1859/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060807T1859-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060802T1808/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060802T1808-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060807T1859/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060807T1859-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060802T1808/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060802T1808-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060807T1859/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060807T1859-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060802T1808/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060802T1808-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060807T1859/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060807T1859-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060802T1808/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060802T1808-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060807T1859/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060807T1859-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060802T1808/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060802T1808-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060807T1859/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060807T1859-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060802T1808/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060802T1808-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060807T1859/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060807T1859-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060802T1808/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060802T1808-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060807T1859/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060807T1859-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060802T1808/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060802T1808-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060807T1859/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060807T1859-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060802T1808/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060802T1808-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060807T1859/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060807T1859-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060802T1808/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1808-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060807T1859/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060807T1859-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-20060802T1808/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1808-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060807T1859/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060807T1859-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-20060802T1808/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060802T1808-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060807T1859/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060807T1859-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060802T1808/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060802T1808-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060807T1859/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060807T1859-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060802T1808/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060802T1808-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060807T1859/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060807T1859-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060802T1808/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060802T1808-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060807T1859/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060807T1859-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060802T1808/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060802T1808-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060807T1859/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060807T1859-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060802T1808/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060802T1808-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060807T1859/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060807T1859-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,9 +806,9 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060802T1808/localedata/SUPPORTED	26 May 2006 17:02:50 -0000	1.94
-+++ glibc-20060802T1808-fedora/localedata/SUPPORTED	31 May 2006 15:10:34 -0000	1.71.2.11
-@@ -76,6 +76,7 @@ cy_GB.UTF-8/UTF-8 \
+--- glibc-20060807T1859/localedata/SUPPORTED	3 Aug 2006 08:16:23 -0000	1.95
++++ glibc-20060807T1859-fedora/localedata/SUPPORTED	7 Aug 2006 19:28:25 -0000	1.71.2.12
+@@ -77,6 +77,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
  da_DK/ISO-8859-1 \
@@ -816,7 +816,7 @@
  de_AT.UTF-8/UTF-8 \
  de_AT/ISO-8859-1 \
  de_AT at euro/ISO-8859-15 \
-@@ -105,6 +106,7 @@ en_DK.UTF-8/UTF-8 \
+@@ -106,6 +107,7 @@ en_DK.UTF-8/UTF-8 \
  en_DK/ISO-8859-1 \
  en_GB.UTF-8/UTF-8 \
  en_GB/ISO-8859-1 \
@@ -824,7 +824,7 @@
  en_HK.UTF-8/UTF-8 \
  en_HK/ISO-8859-1 \
  en_IE.UTF-8/UTF-8 \
-@@ -119,6 +121,7 @@ en_SG.UTF-8/UTF-8 \
+@@ -120,6 +122,7 @@ en_SG.UTF-8/UTF-8 \
  en_SG/ISO-8859-1 \
  en_US.UTF-8/UTF-8 \
  en_US/ISO-8859-1 \
@@ -832,7 +832,7 @@
  en_ZA.UTF-8/UTF-8 \
  en_ZA/ISO-8859-1 \
  en_ZW.UTF-8/UTF-8 \
-@@ -274,6 +277,8 @@ nl_NL/ISO-8859-1 \
+@@ -275,6 +278,8 @@ nl_NL/ISO-8859-1 \
  nl_NL at euro/ISO-8859-15 \
  nn_NO.UTF-8/UTF-8 \
  nn_NO/ISO-8859-1 \
@@ -841,7 +841,7 @@
  nr_ZA/UTF-8 \
  nso_ZA/UTF-8 \
  oc_FR.UTF-8/UTF-8 \
-@@ -325,6 +330,7 @@ sv_FI/ISO-8859-1 \
+@@ -326,6 +331,7 @@ sv_FI/ISO-8859-1 \
  sv_FI at euro/ISO-8859-15 \
  sv_SE.UTF-8/UTF-8 \
  sv_SE/ISO-8859-1 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060802T1808/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060802T1808-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060807T1859/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060807T1859-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060802T1808/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
-+++ glibc-20060802T1808-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
+--- glibc-20060807T1859/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
++++ glibc-20060807T1859-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20060802T1808/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1808-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060807T1859/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060807T1859-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -950,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060802T1808/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060802T1808-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060807T1859/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060807T1859-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -979,8 +979,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060802T1808/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060802T1808-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060807T1859/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060807T1859-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1056,8 +1056,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060802T1808/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060802T1808-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060807T1859/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060807T1859-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -1113,17 +1113,17 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060802T1808/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060802T1808-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060807T1859/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060807T1859-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060802T1808/nptl/ChangeLog	1 Aug 2006 07:09:14 -0000	1.904
-+++ glibc-20060802T1808-fedora/nptl/ChangeLog	2 Aug 2006 16:57:41 -0000	1.706.2.94
-@@ -952,6 +952,15 @@
+--- glibc-20060807T1859/nptl/ChangeLog	3 Aug 2006 09:36:43 -0000	1.906
++++ glibc-20060807T1859-fedora/nptl/ChangeLog	7 Aug 2006 19:28:26 -0000	1.706.2.95
+@@ -960,6 +960,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1139,7 +1139,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1688,6 +1697,11 @@
+@@ -1696,6 +1705,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1151,7 +1151,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3762,6 +3776,11 @@
+@@ -3770,6 +3784,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1163,8 +1163,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060802T1808/nptl/Makefile	1 Aug 2006 06:05:02 -0000	1.183
-+++ glibc-20060802T1808-fedora/nptl/Makefile	2 Aug 2006 16:57:41 -0000	1.157.2.23
+--- glibc-20060807T1859/nptl/Makefile	1 Aug 2006 06:05:02 -0000	1.183
++++ glibc-20060807T1859-fedora/nptl/Makefile	2 Aug 2006 16:57:41 -0000	1.157.2.23
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1187,8 +1187,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060802T1808/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060802T1808-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060807T1859/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060807T1859-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1213,8 +1213,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1222,8 +1222,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
-+++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
+--- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
++++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
 @@ -68,6 +68,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1559,8 +1559,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@@ -1706,8 +1706,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
 @@ -44,9 +44,16 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -1808,8 +1808,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1951,8 +1951,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
-+++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
+--- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
++++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
 @@ -49,6 +49,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2340,8 +2340,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060802T1808/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060802T1808-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
 @@ -46,8 +46,13 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -2436,8 +2436,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060802T1808/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060802T1808-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060807T1859/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060807T1859-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2460,8 +2460,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060802T1808/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060802T1808-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060807T1859/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060807T1859-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2480,8 +2480,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060802T1808/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060802T1808-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060807T1859/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060807T1859-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2493,8 +2493,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060802T1808/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060802T1808-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060807T1859/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060807T1859-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -2535,8 +2535,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060802T1808/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
-+++ glibc-20060802T1808-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
+--- glibc-20060807T1859/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
++++ glibc-20060807T1859-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2570,8 +2570,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060802T1808/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1808-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060807T1859/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060807T1859-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -2588,8 +2588,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060802T1808/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060802T1808-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060807T1859/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060807T1859-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -2605,8 +2605,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060802T1808/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060802T1808-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060807T1859/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060807T1859-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2620,8 +2620,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060802T1808/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060802T1808-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060807T1859/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060807T1859-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -2633,8 +2633,8 @@
  endif
  endif
  
---- glibc-20060802T1808/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060802T1808-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060807T1859/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060807T1859-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -2986,8 +2986,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060802T1808/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1808-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060807T1859/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060807T1859-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3073,8 +3073,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060802T1808/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060802T1808-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060807T1859/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060807T1859-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
 @@ -41,7 +41,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3089,8 +3089,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060802T1808/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
-+++ glibc-20060802T1808-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+--- glibc-20060807T1859/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20060807T1859-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
 @@ -18,11 +18,14 @@
     02111-1307 USA.  */
  
@@ -3138,8 +3138,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060802T1808/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060802T1808-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060807T1859/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060807T1859-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;
@@ -3182,8 +3182,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060802T1808/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060802T1808-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060807T1859/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060807T1859-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"
@@ -3193,8 +3193,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060802T1808/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060802T1808-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060807T1859/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060807T1859-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;
@@ -3240,8 +3240,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060802T1808/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1808-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060807T1859/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060807T1859-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.
@@ -3302,8 +3302,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060802T1808/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060802T1808-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060807T1859/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060807T1859-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)
@@ -3336,24 +3336,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060802T1808/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1808-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060807T1859/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060807T1859-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-20060802T1808/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060802T1808-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060807T1859/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060807T1859-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-20060802T1808/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060802T1808-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060807T1859/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060807T1859-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.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- glibc.spec	2 Aug 2006 18:29:53 -0000	1.253
+++ glibc.spec	7 Aug 2006 19:49:00 -0000	1.254
@@ -1,9 +1,9 @@
-%define glibcdate 20060802T1808
+%define glibcdate 20060807T1859
 %define glibcname glibc
-%define glibcsrcdir glibc-20060802T1808
+%define glibcsrcdir glibc-20060807T1859
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 17
+%define glibcrelease 18
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1035,8 +1035,8 @@
   cp -a $i $i.tmp
   sed -e 's~=/%{_lib}/libpcprofile.so~=%{_prefix}/%{_lib}/libpcprofile.so~' \
       -e 's~=/%{_lib}/libmemusage.so~=%{_prefix}/%{_lib}/libmemusage.so~' \
-      -e 's~=/\$LIB/libpcprofile.so~=%{_prefix}/$LIB/libpcprofile.so~' \
-      -e 's~=/\$LIB/libmemusage.so~=%{_prefix}/$LIB/libmemusage.so~' \
+      -e 's~='\''/\\\$LIB/libpcprofile.so~='\''%{_prefix}/\\$LIB/libpcprofile.so~' \
+      -e 's~='\''/\\\$LIB/libmemusage.so~='\''%{_prefix}/\\$LIB/libmemusage.so~' \
     $i.tmp > $i
   chmod 755 $i; rm -f $i.tmp
 done
@@ -1443,10 +1443,15 @@
 %endif
 
 %changelog
+* Mon Aug  7 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-18
+- NIS+ fixes
+- fix memusage and xtrace scripts (#200736)
+- redirect /sbin/service sshd condrestart std{out,err} to /dev/null
+  when executed from glibc_post_upgrade
+
 * Wed Aug  2 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-17
 - typo fix for the dladdr patch
 - build i?86 glibc with -mno-tls-direct-seg-refs (#200469)
-- fix memusage and xtrace scripts (#200736)
 
 * Wed Aug  2 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-16
 - fix dladdr on binaries/libraries with only DT_GNU_HASH and no


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- sources	2 Aug 2006 18:29:53 -0000	1.186
+++ sources	7 Aug 2006 19:49:00 -0000	1.187
@@ -1,2 +1,2 @@
-7a1c70538c72b4ccb8b7f4e5249136bd  glibc-20060802T1808.tar.bz2
-c547953e0be4a94b3d185bf592c8350b  glibc-fedora-20060802T1808.tar.bz2
+76063e957e7367695babc72713f6e0a0  glibc-20060807T1859.tar.bz2
+1bf45107806237657d4dc437aaa68286  glibc-fedora-20060807T1859.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug  7 19:53:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 15:53:52 -0400
Subject: rpms/evolution-connector/devel .cvsignore, 1.36,
	1.37 evolution-connector.spec, 1.73, 1.74 sources, 1.36, 1.37
Message-ID: <200608071953.k77Jrq2o024244@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-connector.spec sources 
Log Message:
- Update to 2.7.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	5 Aug 2006 16:46:54 -0000	1.36
+++ .cvsignore	7 Aug 2006 19:53:50 -0000	1.37
@@ -1 +1 @@
-evolution-exchange-2.7.90.tar.bz2
+evolution-exchange-2.7.91.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- evolution-connector.spec	6 Aug 2006 02:48:42 -0000	1.73
+++ evolution-connector.spec	7 Aug 2006 19:53:50 -0000	1.74
@@ -18,8 +18,8 @@
 ### Abstract ###
 
 Name: evolution-connector
-Version: 2.7.90
-Release: 3
+Version: 2.7.91
+Release: 1
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -126,6 +126,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-1
+- Update to 2.7.91
+
 * Sat Aug  5 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-3
 - Fix eds_major (bumped it when I shouldn't have).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	5 Aug 2006 16:46:54 -0000	1.36
+++ sources	7 Aug 2006 19:53:50 -0000	1.37
@@ -1 +1 @@
-8057d7e9fd6c9bd39cca2e96e35ac20a  evolution-exchange-2.7.90.tar.bz2
+2103cce17b5da9851e72014c2e94faeb  evolution-exchange-2.7.91.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug  7 20:05:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 16:05:59 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.148,1.149
Message-ID: <200608072005.k77K5wne027344@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Log Message:
- Rebuild



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- evolution.spec	4 Aug 2006 18:02:18 -0000	1.148
+++ evolution.spec	7 Aug 2006 20:05:54 -0000	1.149
@@ -41,7 +41,7 @@
 
 Name: evolution
 Version: 2.6.3
-Release: 1.fc5.4
+Release: 1.fc5.5
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -598,6 +598,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-1.fc5.5
+- Rebuild
+
 * Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-1.fc5.4
 - Require evolution-data-server 1.6.3.
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 20:17:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 16:17:17 -0400
Subject: rpms/evolution-data-server/devel .cvsignore, 1.49,
	1.50 evolution-data-server.spec, 1.111, 1.112 sources, 1.49,
	1.50 evolution-data-server-1.7.90.1-missing-function-decl.patch,
	1.1, NONE
Message-ID: <200608072017.k77KHHAj007414@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-1.7.90.1-missing-function-decl.patch 
Log Message:
- Update to 1.7.91
- Remove patch for Gnome.org bug #348725 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	4 Aug 2006 20:37:20 -0000	1.49
+++ .cvsignore	7 Aug 2006 20:17:14 -0000	1.50
@@ -1 +1 @@
-evolution-data-server-1.7.90.1.tar.bz2
+evolution-data-server-1.7.91.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- evolution-data-server.spec	4 Aug 2006 20:37:20 -0000	1.111
+++ evolution-data-server.spec	7 Aug 2006 20:17:14 -0000	1.112
@@ -21,8 +21,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.7.90.1
-Release: 5
+Version: 1.7.91
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -38,9 +38,6 @@
 Patch13: evolution-data-server-1.3.8-fix-implicit-function-declarations
 Patch14: evolution-data-server-1.5.4-make_imap4_optional.patch
 
-# Gnome.org bug #348725
-Patch15: evolution-data-server-1.7.90.1-missing-function-decl.patch
-
 ### Dependencies ###
 
 Requires: GConf2
@@ -122,7 +119,6 @@
 %patch12 -p1 -b .fix_open_calendar_declaration
 %patch13 -p1 -b .fix-implicit-function-declarations
 %patch14 -p1 -b .make_imap4_optional
-%patch15 -p1 -b .missing-function-decl
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -325,6 +321,10 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.91-1
+- Update to 1.7.91
+- Remove patch for Gnome.org bug #348725 (fixed upstream).
+
 * Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.90.1-5
 - Update to 1.7.90.1 (again)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	4 Aug 2006 20:37:20 -0000	1.49
+++ sources	7 Aug 2006 20:17:14 -0000	1.50
@@ -1 +1 @@
-07fa3db5725d41093b22d4e90c2ced87  evolution-data-server-1.7.90.1.tar.bz2
+384f2bd20966f175fc18e6d1903fe040  evolution-data-server-1.7.91.tar.bz2


--- evolution-data-server-1.7.90.1-missing-function-decl.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug  7 20:37:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 16:37:11 -0400
Subject: rpms/evolution/devel .cvsignore, 1.54,
	1.55 evolution-2.7.3-submit-bug-report.patch, 1.1,
	1.2 evolution.spec, 1.176, 1.177 sources, 1.54, 1.55
Message-ID: <200608072037.k77KbB2S018062@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-2.7.3-submit-bug-report.patch 
	evolution.spec sources 
Log Message:
- Update to 2.7.91
- Update patch for RH bug #197834 for use with bug-buddy 2.15.90.
- Require bug-buddy >= 2.15.90.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	5 Aug 2006 00:05:14 -0000	1.54
+++ .cvsignore	7 Aug 2006 20:37:08 -0000	1.55
@@ -1 +1 @@
-evolution-2.7.90.tar.bz2
+evolution-2.7.91.tar.bz2

evolution-2.7.3-submit-bug-report.patch:
 e-shell-window-commands.c |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

Index: evolution-2.7.3-submit-bug-report.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.3-submit-bug-report.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.7.3-submit-bug-report.patch	7 Jul 2006 15:25:51 -0000	1.1
+++ evolution-2.7.3-submit-bug-report.patch	7 Aug 2006 20:37:08 -0000	1.2
@@ -1,6 +1,6 @@
---- evolution-2.7.3/shell/e-shell-window-commands.c.submit-bug-report	2006-07-07 09:09:56.000000000 -0400
-+++ evolution-2.7.3/shell/e-shell-window-commands.c	2006-07-07 10:47:19.000000000 -0400
-@@ -114,26 +114,35 @@
+--- evolution-2.7.90/shell/e-shell-window-commands.c.submit-bug-report	2006-04-24 06:49:10.000000000 -0400
++++ evolution-2.7.90/shell/e-shell-window-commands.c	2006-08-07 13:11:24.000000000 -0400
+@@ -114,26 +114,22 @@
  		    EShellWindow *window,
  		    const char *path)
  {
@@ -20,24 +20,15 @@
 -        }
 +	gchar *command_line;
 +	GError *error = NULL;
++
++        command_line = "bug-buddy --sm-disable --package=Evolution";
  
 -        pid = gnome_execute_async (NULL, 4, args);
 -        g_free (args[0]);
-+        /* For the --appname option, Bug Buddy does not recognize the true
-+         * filename of the application (evolution-2.x, as g_get_prgname()
-+         * would return), so we have to use the package name (evolution).
-+         * XXX Might be nice to also supply the --name and --email options. */
-+	command_line = g_strdup_printf (
-+		"bug-buddy"
-+		" --sm-disable"
-+		" --package=" PACKAGE
-+		" --package-ver=" VERSION
-+		" --appname=" PACKAGE_NAME
-+		" --pid=%ld",
-+		getpid ());
-+
 +	g_debug ("Spawning: %s", command_line);
-+
+ 
+-        if (pid == -1)
+-                e_notice (NULL, GTK_MESSAGE_ERROR, _("Bug buddy could not be run."));
 +	if (!g_spawn_command_line_async (command_line, &error)) {
 +		if (error->code == G_SPAWN_ERROR_NOENT)
 +			e_notice (NULL, GTK_MESSAGE_ERROR,
@@ -47,10 +38,6 @@
 +				_("Bug buddy could not be run."));
 +		g_error_free (error);
 +	}
- 
--        if (pid == -1)
--                e_notice (NULL, GTK_MESSAGE_ERROR, _("Bug buddy could not be run."));
-+	g_free (command_line);
  }
  
  /* must be in utf8, the weird breaking of escaped strings


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- evolution.spec	5 Aug 2006 16:38:17 -0000	1.176
+++ evolution.spec	7 Aug 2006 20:37:08 -0000	1.177
@@ -1,3 +1,4 @@
+%define bug_buddy_version 2.15.90
 %define dbus_glib_version 0.70
 %define dbus_version 0.90
 %define eds_version 1.7.90.1
@@ -43,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.7.90
-Release: 6
+Version: 2.7.91
+Release: 1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -115,6 +116,7 @@
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
+Requires: bug-buddy >= %{bug_buddy_version}
 Requires: dbus >= %{dbus_version}
 Requires: evolution-data-server >= %{eds_version}
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -633,6 +635,11 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-1
+- Update to 2.7.91
+- Update patch for RH bug #197834 for use with bug-buddy 2.15.90.
+- Require bug-buddy >= 2.15.90.
+
 * Fri Aug  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-6
 - Update to 2.7.90
 - Require evolution-data-server-1.7.90.1.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	5 Aug 2006 00:05:14 -0000	1.54
+++ sources	7 Aug 2006 20:37:08 -0000	1.55
@@ -1 +1 @@
-aae1aac8c521aef1aa9dbb1aed9a9f6e  evolution-2.7.90.tar.bz2
+c7aa347eb188d53b22941129d9300fb4  evolution-2.7.91.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug  7 20:47:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 16:47:52 -0400
Subject: rpms/gtkhtml3/devel .cvsignore, 1.38, 1.39 gtkhtml3.spec, 1.67,
	1.68 sources, 1.38, 1.39
Message-ID: <200608072047.k77KlqUO003957@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3878

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
- Update to 3.11.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	25 Jul 2006 11:28:07 -0000	1.38
+++ .cvsignore	7 Aug 2006 20:47:49 -0000	1.39
@@ -1 +1 @@
-gtkhtml-3.11.90.1.tar.bz2
+gtkhtml-3.11.91.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gtkhtml3.spec	25 Jul 2006 11:28:07 -0000	1.67
+++ gtkhtml3.spec	7 Aug 2006 20:47:49 -0000	1.68
@@ -5,7 +5,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.11.90.1
+Version: 3.11.91
 Release: 1
 License: LGPL/GPL
 Group: System Environment/Libraries
@@ -108,6 +108,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.91-1
+- Update to 3.11.91
+
 * Tue Jul 25 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.90.1-1
 - Update to 3.11.90.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	25 Jul 2006 11:28:07 -0000	1.38
+++ sources	7 Aug 2006 20:47:49 -0000	1.39
@@ -1 +1 @@
-b379e9a9117f50e13a7310a821023be6  gtkhtml-3.11.90.1.tar.bz2
+e1c38c3c12371281895353e25757b959  gtkhtml-3.11.91.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug  7 20:54:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 16:54:59 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.142,1.143
Message-ID: <200608072054.k77Ksxcu006734@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Aug  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-17.fc5.aiglx
- Build for fc5 aiglx repo.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- xorg-x11-server.spec	7 Aug 2006 18:32:27 -0000	1.142
+++ xorg-x11-server.spec	7 Aug 2006 20:54:56 -0000	1.143
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   17%{?dist}
+Release:   17.fc5.aiglx
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -681,6 +681,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Aug  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-17.fc5.aiglx
+- Build for fc5 aiglx repo.
+
 * Mon Aug  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-17.fc6
 - Add xorg-x11-server-1.1.1-offscreen-pixmaps.patch to default
   XaaNoOffscreenPixmaps to false, for now.



From fedora-cvs-commits at redhat.com  Mon Aug  7 21:11:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 17:11:30 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.316, 1.317 anaconda.spec, 1.442,
	1.443 sources, 1.439, 1.440
Message-ID: <200608072111.k77LBUFr019875@cvs.devel.redhat.com>

Author: clumens

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- .cvsignore	2 Aug 2006 22:27:04 -0000	1.316
+++ .cvsignore	7 Aug 2006 21:11:28 -0000	1.317
@@ -1 +1 @@
-anaconda-11.1.0.77.tar.bz2
+anaconda-11.1.0.78.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- anaconda.spec	2 Aug 2006 22:27:04 -0000	1.442
+++ anaconda.spec	7 Aug 2006 21:11:28 -0000	1.443
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.77
+Version: 11.1.0.78
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,19 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Aug 07 2006 Chris Lumens <clumens at redhat.com> 11.1.0.78-1
+- Fix password writing for interactive kickstart installs (#201455).
+- Don't check percentage on preexisting LVs (#193341).
+- Log added repos (#201212).
+- Start adding things for ia64 Xen (katzj).
+- Use new raid module name (katzj, #201361).
+- Look for ifconfig in the right place during rescue mode (#201372).
+- Fix segfault in FTP and HTTP path typos (#197403, #201243, #201367).
+- Don't display the askmethod screen on CD installs (#201108).
+- Do a better job at updating mkfs percentage bar (pjones).
+- Fix finding the release notes (#201232).
+- Add libvolume_id for gfs2-utils (katzj).
+
 * Wed Aug 02 2006 Paul Nasrat <pnasrat at redhat.com> 11.1.0.77-1
 - Fix pkgorder isdir check
 - Reinstate frequent rescanning of devices (clumens)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- sources	2 Aug 2006 22:27:04 -0000	1.439
+++ sources	7 Aug 2006 21:11:28 -0000	1.440
@@ -1 +1 @@
-fc1dd50380f0dc1d450c73ac66c729cb  anaconda-11.1.0.77.tar.bz2
+a2926360bcbc9c285c4bfe7dd120b175  anaconda-11.1.0.78.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug  7 21:35:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 17:35:09 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.317, 1.318 anaconda.spec, 1.443,
	1.444 sources, 1.440, 1.441
Message-ID: <200608072135.k77LZ9Qr002433@cvs.devel.redhat.com>

Author: clumens

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- .cvsignore	7 Aug 2006 21:11:28 -0000	1.317
+++ .cvsignore	7 Aug 2006 21:35:06 -0000	1.318
@@ -1 +1 @@
-anaconda-11.1.0.78.tar.bz2
+anaconda-11.1.0.79.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- anaconda.spec	7 Aug 2006 21:11:28 -0000	1.443
+++ anaconda.spec	7 Aug 2006 21:35:06 -0000	1.444
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.78
+Version: 11.1.0.79
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Aug 07 2006 Chris Lumens <clumens at redhat.com> 11.1.0.79-1
+- s390 build fix.
+
 * Mon Aug 07 2006 Chris Lumens <clumens at redhat.com> 11.1.0.78-1
 - Fix password writing for interactive kickstart installs (#201455).
 - Don't check percentage on preexisting LVs (#193341).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- sources	7 Aug 2006 21:11:28 -0000	1.440
+++ sources	7 Aug 2006 21:35:06 -0000	1.441
@@ -1 +1 @@
-a2926360bcbc9c285c4bfe7dd120b175  anaconda-11.1.0.78.tar.bz2
+6e14e437e7436c50a38e0406cdb13c9d  anaconda-11.1.0.79.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug  7 22:06:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 18:06:21 -0400
Subject: rpms/metacity/devel .cvsignore, 1.44, 1.45 metacity.spec, 1.86,
	1.87 sources, 1.44, 1.45
Message-ID: <200608072206.k77M6LKB002382@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
* Mon Aug 7 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.13-1
- Update to 2.15.13. Disable compositing manager.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	6 Jun 2006 17:09:14 -0000	1.44
+++ .cvsignore	7 Aug 2006 22:06:18 -0000	1.45
@@ -10,3 +10,4 @@
 libcm-0.0.22.tar.gz
 metacity-2.15.5-jun1-2006.tar.gz
 metacity-2.15.5-jun6-2006.tar.gz
+metacity-2.15.13.tar.gz


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- metacity.spec	12 Jul 2006 07:20:17 -0000	1.86
+++ metacity.spec	7 Aug 2006 22:06:18 -0000	1.87
@@ -1,6 +1,5 @@
 %define gettext_package metacity
 
-%define libcm_version 0.0.22
 %define metacity_version 2.15.5
 
 %define metacity_filename metacity-%{metacity_version}-jun6-2006
@@ -12,7 +11,6 @@
 Release: 6.1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{metacity_filename}.tar.gz
-Source1: libcm-%{libcm_version}.tar.gz
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -28,13 +26,10 @@
 BuildRequires: xorg-x11-proto-devel >= 7.0-13
 BuildRequires: libSM-devel, libGL-devel, libGLU-devel, libICE-devel, libX11-devel
 BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel
-BuildRequires: libXcursor-devel, libXdamage-devel, libXtst-devel, libXfixes-devel, 
-BuildRequires: libXcomposite-devel >= 0.3
-BuildRequires: mesa-libGL-devel >= 6.5-7
+BuildRequires: libXcursor-devel
 
 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
@@ -46,48 +41,22 @@
 
 %prep
 %setup -q -n %{metacity_filename}
-%setup -D -T -a1 -n %{metacity_filename}
 
 %patch0 -p1 -b .ctrlaltdel
 %patch1 -p1 -b .static-cm
 
 %build
 rm -rf $RPM_BUILD_ROOT
-%ifnarch s390 s390x ppc64
-pushd libcm-%{libcm_version}
-%configure
-make
-make install DESTDIR=$RPM_BUILD_ROOT 
-popd
-%endif
-
-LIBS="$LIBS -lGL -lGLU"
-LIBS="$LIBS -lICE -lSM"
-LIBS="$LIBS -lX11 -lXext -lXinerama -lXrandr"
-LIBS="$LIBS -lXrender -lXcursor"
-LIBS="$LIBS -lXdamage -lXtst -lXfixes -lXcomposite"
-%ifnarch s390 s390x ppc64
-LIBS="$LIBS $PWD/libcm-%{libcm_version}/src/.libs/libcm.a"
-%endif
-export LIBS
 
 CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
 export CPPFLAGS
 
 autoreconf
 
-%ifnarch s390 s390x ppc64
-%configure --enable-compositor
-%else
 %configure
-%endif
 
 SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
 
-%ifnarch s390 s390x ppc64
-SHOULD_HAVE_DEFINED="$SHOULD_HAVE_DEFINED HAVE_COMPOSITE_EXTENSIONS"
-%endif
-
 for I in $SHOULD_HAVE_DEFINED; do
   if ! grep -q "define $I" config.h; then
     echo "$I was not defined in config.h"
@@ -141,6 +110,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 7 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.13-1
+- Update to 2.15.13. Disable compositing manager.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.5-6.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	6 Jun 2006 17:09:15 -0000	1.44
+++ sources	7 Aug 2006 22:06:18 -0000	1.45
@@ -1,2 +1,3 @@
 9675b782627ef9fdbbaaec30ee9f1b77  libcm-0.0.22.tar.gz
 6b09abf0f66bc7a6f595b6f6be180a69  metacity-2.15.5-jun6-2006.tar.gz
+dd4c19b5332102166735c1482252ac5e  metacity-2.15.13.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug  7 22:08:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 18:08:31 -0400
Subject: rpms/metacity/devel metacity.spec,1.87,1.88
Message-ID: <200608072208.k77M8VAl003023@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	metacity.spec 
Log Message:
Forgot to actually commit version bump


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- metacity.spec	7 Aug 2006 22:06:18 -0000	1.87
+++ metacity.spec	7 Aug 2006 22:08:28 -0000	1.88
@@ -1,6 +1,6 @@
 %define gettext_package metacity
 
-%define metacity_version 2.15.5
+%define metacity_version 2.15.13
 
 %define metacity_filename metacity-%{metacity_version}-jun6-2006
 #-apr13-2005
@@ -8,7 +8,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 6.1
+Release: 1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{metacity_filename}.tar.gz
 License: GPL



From fedora-cvs-commits at redhat.com  Mon Aug  7 22:09:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 18:09:51 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.13, 1.14 setroubleshoot.spec,
	1.17, 1.18 sources, 1.15, 1.16
Message-ID: <200608072209.k77M9p1b003411@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3368/devel

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Aug 2006 00:22:32 -0000	1.13
+++ .cvsignore	7 Aug 2006 22:09:36 -0000	1.14
@@ -1 +1 @@
-setroubleshoot-0.17.tar.gz
+setroubleshoot-0.18.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- setroubleshoot.spec	6 Aug 2006 00:22:32 -0000	1.17
+++ setroubleshoot.spec	7 Aug 2006 22:09:36 -0000	1.18
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.17
+Version: 0.18
 Release: 1
 License: GPL
 Group: Applications/System
@@ -95,8 +95,37 @@
 
 %changelog
 
-* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> - 0.17-1
+* Mon Aug 7 2006 Dan Walsh <dwalsh at redhat.com> - 0.18-1
+- Add dispatcher.py
+
+* Sat Aug 5 2006 Dan Walsh <dwalsh at redhat.com> - 0.17-1
 - John Dennis  <jdennis at redhat.com>
+	* clean up and rework the timestamp code in util.py so that
+	time zones are handled properly, there were a number of bugs.
+	Hopefully it's correct now because timezone handling is a pain.
+	
+	* change the time format in the browser so all times are displayed
+	identically, the friendly time relative format was hard to compare.
+	
+	* modify the plugin 'make install' to delete all existing plugin's
+	  prior to installing the new ones
+
+	* add popup menu to status icon to choose between browser and
+	alert GUI (not fully connected yet). Several bug fixes related
+	to changing the filter_type from a string to an int.
+	
+	* add filter selection to bottom pane, change filter_type from
+	string to integer constant. Enhance how columns are handled.
+	Get init_combo_box to work. Remove unused RPM and Bugzilla
+	fields from bottom pane. Modify the default size of the browser
+	window. Fix missing import in util.py.
+	
+	* add ability in broswer to sort on columns, initially the report
+	count column and the last seen date column. The date column now
+	stores a TimeStamp object instead of a string. Add new method
+	to TimeStamp to return a friendly string relative to the current
+	time. The date column in the browser now has a cell data function
+	which invokes the friendly format method of the TimeStamp object.
 
 	* add ability fo serialize to/from xml for classes which can
 	inititialized from strings and serialized as strings (e.g. numbers,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Aug 2006 00:22:32 -0000	1.15
+++ sources	7 Aug 2006 22:09:36 -0000	1.16
@@ -1 +1 @@
-63837eef5bd2809e7151d89f74b0ec35  setroubleshoot-0.17.tar.gz
+072936e9619b027c9b1f1ba291accc8d  setroubleshoot-0.18.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug  7 22:14:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 18:14:43 -0400
Subject: rpms/metacity/devel metacity.spec,1.88,1.89
Message-ID: <200608072214.k77MEhUE004437@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	metacity.spec 
Log Message:
Remove leftover snapshot string


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- metacity.spec	7 Aug 2006 22:08:28 -0000	1.88
+++ metacity.spec	7 Aug 2006 22:14:39 -0000	1.89
@@ -2,13 +2,12 @@
 
 %define metacity_version 2.15.13
 
-%define metacity_filename metacity-%{metacity_version}-jun6-2006
-#-apr13-2005
+%define metacity_filename metacity-%{metacity_version}
 
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 1
+Release: 2
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{metacity_filename}.tar.gz
 License: GPL
@@ -110,6 +109,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 7 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.13-2
+- Remove leftover snapshot string.
+
 * Mon Aug 7 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.13-1
 - Update to 2.15.13. Disable compositing manager.
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 22:38:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 18:38:28 -0400
Subject: rpms/ekiga/devel ekiga.spec,1.22,1.23
Message-ID: <200608072238.k77McSxF026072@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/ekiga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26029

Modified Files:
	ekiga.spec 
Log Message:
- Rebuild against evolution-data-server-1.7.91



Index: ekiga.spec
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ekiga.spec	5 Aug 2006 16:35:25 -0000	1.22
+++ ekiga.spec	7 Aug 2006 22:38:25 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
 Version: 2.0.2
-Release: 4
+Release: 5
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.0.2-5
+- Rebuild against evolution-data-server-1.7.91
+
 * Sat Aug  5 2006 Caolan McNamara <caolanm at redhat.com> - 2.0.2-4
 - rebuild against new e-d-s
 



From fedora-cvs-commits at redhat.com  Mon Aug  7 22:39:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 18:39:27 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.139,1.140
Message-ID: <200608072239.k77MdRZu026377@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	gnome-panel.spec 
Log Message:
- Rebuild against evolution-data-server-1.7.91



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gnome-panel.spec	7 Aug 2006 15:34:30 -0000	1.139
+++ gnome-panel.spec	7 Aug 2006 22:39:23 -0000	1.140
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.15.90
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 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
@@ -231,6 +231,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.90-4
+- Rebuild against evolution-data-server-1.7.91
+
 * Mon Aug  7 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-3
 - fix double free in menu editor launcher (bug 201439)
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 00:26:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 20:26:53 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.77,
	1.78 policy-20060802.patch, 1.2, 1.3 selinux-policy.spec,
	1.245, 1.246 sources, 1.81, 1.82
Message-ID: <200608080026.k780QrTh023377@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policy-20060802.patch selinux-policy.spec sources 
Log Message:
* Mon Aug 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.5-1
- Fix setroubleshootd



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	4 Aug 2006 22:58:10 -0000	1.77
+++ .cvsignore	8 Aug 2006 00:26:46 -0000	1.78
@@ -78,3 +78,4 @@
 serefpolicy-2.3.2.tgz
 serefpolicy-2.3.3.tgz
 serefpolicy-2.3.4.tgz
+serefpolicy-2.3.5.tgz

policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   10 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/usermanage.te        |    4 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    3 
 modules/kernel/devices.te          |    2 
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 ++++++++++++
 modules/kernel/terminal.if         |   19 +++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cups.te           |    6 
 modules/services/dbus.if           |    5 
 modules/services/ldap.te           |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    4 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  105 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   25 +++-
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   51 +++++++-
 modules/services/xserver.te        |   14 +-
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/mount.te            |    2 
 modules/system/selinuxutil.te      |    9 +
 modules/system/udev.fc             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  231 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   50 +++-----
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |   26 +++-
 59 files changed, 730 insertions(+), 165 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policy-20060802.patch	6 Aug 2006 00:34:38 -0000	1.2
+++ policy-20060802.patch	8 Aug 2006 00:26:46 -0000	1.3
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.4/policy/mls
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.5/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.4/policy/mls	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/mls	2006-08-07 19:45:48.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -22,9 +22,9 @@
  mlsconstrain dir { add_name remove_name reparent rmdir }
  	((( l1 dom l2 ) and ( l1 domby h2 )) or
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.4/policy/modules/admin/anaconda.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.5/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/admin/anaconda.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/admin/anaconda.te	2006-08-07 19:45:48.000000000 -0400
 @@ -25,8 +25,12 @@
  
  modutils_domtrans_insmod(anaconda_t)
@@ -50,9 +50,9 @@
 +	ssh_domtrans_keygen(anaconda_t)
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.4/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.5/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/admin/consoletype.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/admin/consoletype.te	2006-08-07 19:45:48.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -75,9 +75,9 @@
 +optional_policy(`
 +	xen_dontaudit_use_fds(consoletype_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.4/policy/modules/admin/firstboot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.5/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/admin/firstboot.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/admin/firstboot.te	2006-08-07 19:45:48.000000000 -0400
 @@ -106,7 +106,7 @@
  ')
  
@@ -87,9 +87,26 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.4/policy/modules/admin/rpm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.5/policy/modules/admin/prelink.te
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/admin/prelink.te	2006-08-07 19:45:48.000000000 -0400
+@@ -1,4 +1,3 @@
+-
+ policy_module(prelink,1.1.5)
+ 
+ ########################################
+@@ -74,6 +73,8 @@
+ 
+ miscfiles_read_localization(prelink_t)
+ 
++selinux_get_enforce_mode(prelink_t)
++
+ optional_policy(`
+ 	cron_system_entry(prelink_t, prelink_exec_t)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.5/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/admin/rpm.fc	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/admin/rpm.fc	2006-08-07 19:45:48.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -99,9 +116,9 @@
  ')
  
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.4/policy/modules/admin/usermanage.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.5/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/admin/usermanage.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/admin/usermanage.te	2006-08-07 19:45:48.000000000 -0400
 @@ -260,7 +260,7 @@
  ')
  
@@ -120,9 +137,9 @@
  	nscd_socket_use(useradd_t)
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.4/policy/modules/apps/mozilla.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.5/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/apps/mozilla.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/apps/mozilla.if	2006-08-07 19:45:48.000000000 -0400
 @@ -63,6 +63,7 @@
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
@@ -139,9 +156,9 @@
  
  	# Browse the web, connect to printer
  	sysnet_dns_name_resolve($1_mozilla_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.4/policy/modules/kernel/corecommands.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.5/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/kernel/corecommands.fc	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/kernel/corecommands.fc	2006-08-07 19:45:48.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -150,9 +167,9 @@
  
  ifdef(`distro_debian',`
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.4/policy/modules/kernel/corenetwork.te.in
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.5/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/kernel/corenetwork.te.in	2006-08-05 20:14:55.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/kernel/corenetwork.te.in	2006-08-07 19:45:48.000000000 -0400
 @@ -73,6 +73,7 @@
  network_port(dhcpc, udp,68,s0)
  network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
@@ -170,9 +187,9 @@
  network_port(i18n_input, tcp,9010,s0)
  network_port(imaze, tcp,5323,s0, udp,5323,s0)
  network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.4/policy/modules/kernel/devices.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.5/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/kernel/devices.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/kernel/devices.te	2006-08-07 19:45:48.000000000 -0400
 @@ -166,7 +166,7 @@
  dev_node(vmware_device_t)
  
@@ -182,9 +199,37 @@
  
  type xen_device_t;
  dev_node(xen_device_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.4/policy/modules/kernel/filesystem.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.5/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/kernel/files.if	2006-08-07 19:45:48.000000000 -0400
+@@ -2934,6 +2934,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Do not audit attempts to search the tmp directory (/tmp).
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_dontaudit_search_tmp',`
++	gen_require(`
++		type tmp_t;
++	')
++
++	dontaudit $1 tmp_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
+ ##	Read the tmp directory (/tmp).
+ ## </summary>
+ ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.5/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/kernel/filesystem.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/kernel/filesystem.te	2006-08-07 19:45:48.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -201,9 +246,9 @@
  
  ########################################
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.4/policy/modules/kernel/kernel.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.5/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/kernel/kernel.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/kernel/kernel.if	2006-08-07 19:45:48.000000000 -0400
 @@ -1456,6 +1456,42 @@
  
  ########################################
@@ -290,9 +335,9 @@
 +	dontaudit $1 proc_type:file getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.4/policy/modules/kernel/terminal.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.5/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/kernel/terminal.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/kernel/terminal.if	2006-08-07 19:45:48.000000000 -0400
 @@ -308,6 +308,7 @@
  		type devpts_t;
  	')
@@ -323,9 +368,9 @@
 +	allow $1 devpts_t:filesystem getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.4/policy/modules/services/amavis.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.5/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/amavis.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/amavis.te	2006-08-07 19:45:48.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -355,9 +400,9 @@
 +optional_policy(`
 +	postfix_read_config(amavis_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.4/policy/modules/services/apache.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.5/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/apache.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/apache.te	2006-08-07 19:45:48.000000000 -0400
 @@ -273,7 +273,6 @@
  sysnet_read_config(httpd_t)
  
@@ -366,9 +411,9 @@
  
  mta_send_mail(httpd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.4/policy/modules/services/avahi.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.5/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/avahi.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/avahi.te	2006-08-07 19:45:48.000000000 -0400
 @@ -79,6 +79,7 @@
  
  sysnet_read_config(avahi_t)
@@ -377,9 +422,9 @@
  
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.4/policy/modules/services/bind.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.5/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/bind.te	2006-08-05 06:30:41.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/bind.te	2006-08-07 19:45:48.000000000 -0400
 @@ -226,6 +226,7 @@
  allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
  
@@ -388,9 +433,9 @@
  
  allow ndc_t named_t:tcp_socket { connectto recvfrom };
  allow ndc_t named_t:unix_stream_socket connectto;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.4/policy/modules/services/bluetooth.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.5/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/bluetooth.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/bluetooth.te	2006-08-07 19:45:48.000000000 -0400
 @@ -247,3 +247,8 @@
  optional_policy(`
         	xserver_stream_connect_xdm(bluetooth_helper_t)
@@ -400,17 +445,17 @@
 +	nis_use_ypbind(bluetooth_helper_t)
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.4/policy/modules/services/clamav.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.5/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/clamav.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/clamav.if	2006-08-07 19:45:48.000000000 -0400
 @@ -102,3 +102,4 @@
  	allow clamscan_t $1:fifo_file rw_file_perms;
  	allow clamscan_t $1:process sigchld;
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.4/policy/modules/services/cron.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.5/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/cron.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/cron.if	2006-08-07 19:45:48.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -453,9 +498,9 @@
  	tunable_policy(`fcron_crond', `
  		# fcron wants an instant update of a crontab change for the administrator
  		# also crontab does a security check for crontab -u
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.4/policy/modules/services/cups.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.5/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/cups.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/cups.te	2006-08-07 19:45:48.000000000 -0400
 @@ -81,6 +81,7 @@
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
@@ -483,9 +528,9 @@
  
  sysnet_read_config(cupsd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.4/policy/modules/services/dbus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.5/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/dbus.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/dbus.if	2006-08-07 19:45:48.000000000 -0400
 @@ -171,6 +171,11 @@
  		xserver_use_xdm_fds($1_dbusd_t)
  		xserver_rw_xdm_pipes($1_dbusd_t)
@@ -498,9 +543,9 @@
  ')
  
  #######################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.4/policy/modules/services/ldap.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.5/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/ldap.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/ldap.te	2006-08-07 19:45:48.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -510,9 +555,9 @@
  
  kernel_read_system_state(slapd_t)
  kernel_read_kernel_sysctls(slapd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.4/policy/modules/services/nis.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.5/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/nis.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/nis.te	2006-08-07 19:45:48.000000000 -0400
 @@ -249,8 +249,6 @@
  allow ypserv_t self:unix_dgram_socket create_socket_perms;
  allow ypserv_t self:unix_stream_socket create_stream_socket_perms;
@@ -522,9 +567,9 @@
  
  allow ypserv_t var_yp_t:dir rw_dir_perms;
  allow ypserv_t var_yp_t:file create_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.4/policy/modules/services/ntp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.5/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/ntp.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/ntp.te	2006-08-07 19:45:48.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -534,9 +579,9 @@
  dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
  allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
  allow ntpd_t self:fifo_file { read write getattr };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.4/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.5/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/pegasus.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/pegasus.if	2006-08-07 19:45:48.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -570,9 +615,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.4/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.5/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/pegasus.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/pegasus.te	2006-08-07 19:45:48.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -589,9 +634,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.4/policy/modules/services/postfix.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.5/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/postfix.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/postfix.te	2006-08-07 19:45:48.000000000 -0400
 @@ -250,6 +250,7 @@
  allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
  
@@ -627,9 +672,9 @@
  
  optional_policy(`
  	postgrey_stream_connect(postfix_smtpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.4/policy/modules/services/procmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.5/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/procmail.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/procmail.te	2006-08-07 19:45:48.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -638,9 +683,9 @@
  corenet_tcp_sendrecv_all_if(procmail_t)
  corenet_udp_sendrecv_all_if(procmail_t)
  corenet_tcp_sendrecv_all_nodes(procmail_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.4/policy/modules/services/samba.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.5/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/samba.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/samba.te	2006-08-07 19:45:48.000000000 -0400
 @@ -191,7 +191,7 @@
  allow smbd_t samba_etc_t:dir rw_dir_perms;
  allow smbd_t samba_etc_t:file { rw_file_perms setattr };
@@ -659,9 +704,9 @@
  allow nmbd_t samba_log_t:file { create ra_file_perms };
  
  allow nmbd_t samba_var_t:dir rw_dir_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.4/policy/modules/services/setroubleshoot.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.5/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.4/policy/modules/services/setroubleshoot.fc	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.fc	2006-08-07 19:45:48.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -672,17 +717,17 @@
 +/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
 +
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.4/policy/modules/services/setroubleshoot.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.5/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.4/policy/modules/services/setroubleshoot.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.if	2006-08-07 19:45:48.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.4/policy/modules/services/setroubleshoot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.5/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.4/policy/modules/services/setroubleshoot.te	2006-08-03 16:23:23.000000000 -0400
-@@ -0,0 +1,102 @@
++++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.te	2006-08-07 19:45:48.000000000 -0400
+@@ -0,0 +1,105 @@
 +policy_module(setroubleshoot,1.0.0)
 +
 +########################################
@@ -785,9 +830,12 @@
 +	rpm_read_db(setroubleshootd_t)
 +	rpm_dontaudit_manage_db(setroubleshootd_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.4/policy/modules/services/spamassassin.te
++
++files_dontaudit_search_tmp(setroubleshootd_t)
++files_dontaudit_search_src(setroubleshootd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.5/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/spamassassin.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/spamassassin.te	2006-08-07 19:45:48.000000000 -0400
 @@ -194,3 +194,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -796,9 +844,9 @@
 +optional_policy(`
 +	postfix_read_config(spamd_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.4/policy/modules/services/squid.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.5/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/squid.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/squid.te	2006-08-07 19:45:48.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -811,9 +859,9 @@
  allow squid_t self:fifo_file rw_file_perms;
  allow squid_t self:sock_file r_file_perms;
  allow squid_t self:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.4/policy/modules/services/ssh.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.5/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/ssh.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/ssh.if	2006-08-07 19:45:48.000000000 -0400
 @@ -1,5 +1,4 @@
  ## <summary>Secure shell client and server policy.</summary>
 -
@@ -848,9 +896,9 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.4/policy/modules/services/stunnel.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.5/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/stunnel.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/stunnel.te	2006-08-07 19:45:48.000000000 -0400
 @@ -105,6 +105,10 @@
  	')
  
@@ -862,9 +910,9 @@
          	seutil_sigchld_newrole(stunnel_t)
  	')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.4/policy/modules/services/xserver.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.5/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/xserver.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/xserver.if	2006-08-07 19:45:48.000000000 -0400
 @@ -45,7 +45,6 @@
  	allow $1_xserver_t self:capability { dac_override fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
  	dontaudit $1_xserver_t self:capability chown;
@@ -944,9 +992,9 @@
 +	allow $1 ice_tmp_t:dir ra_dir_perms;
 +	allow $1 ice_tmp_t:sock_file create_file_perms;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.4/policy/modules/services/xserver.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.5/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/services/xserver.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/services/xserver.te	2006-08-07 19:45:48.000000000 -0400
 @@ -81,7 +81,7 @@
  #
  
@@ -1010,9 +1058,9 @@
  
  	unconfined_domain_noaudit(xdm_xserver_t)
  	unconfined_domtrans(xdm_xserver_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.4/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.5/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/fstools.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/fstools.te	2006-08-07 19:45:48.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -1021,9 +1069,9 @@
  
  domain_use_interactive_fds(fsadm_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.4/policy/modules/system/hostname.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.5/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/hostname.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/hostname.te	2006-08-07 19:45:48.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -1046,9 +1094,9 @@
 +	xen_dontaudit_use_fds(hostname_t)
 +')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.4/policy/modules/system/init.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.5/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/init.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/init.if	2006-08-07 19:45:48.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -1063,9 +1111,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.4/policy/modules/system/libraries.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.5/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/libraries.fc	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/libraries.fc	2006-08-07 19:45:48.000000000 -0400
 @@ -200,7 +200,7 @@
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -1075,9 +1123,9 @@
  /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.4/policy/modules/system/locallogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.5/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/locallogin.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/locallogin.te	2006-08-07 19:45:48.000000000 -0400
 @@ -47,7 +47,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -1096,9 +1144,9 @@
  
  dev_setattr_mouse_dev(local_login_t)
  dev_getattr_mouse_dev(local_login_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.4/policy/modules/system/logging.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.5/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/logging.fc	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/logging.fc	2006-08-07 19:45:48.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -1106,9 +1154,9 @@
 +
 +/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.4/policy/modules/system/logging.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.5/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/logging.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/logging.if	2006-08-07 19:45:48.000000000 -0400
 @@ -553,3 +553,24 @@
  	allow $1 var_log_t:dir rw_dir_perms;
  	allow $1 var_log_t:file create_file_perms;
@@ -1134,9 +1182,9 @@
 +	allow $1 auditd_var_run_t:sock_file rw_file_perms;
 +	allow $1 auditd_t:unix_stream_socket connectto;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.4/policy/modules/system/logging.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.5/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/logging.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/logging.te	2006-08-07 19:45:48.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -1149,9 +1197,9 @@
  
  kernel_read_kernel_sysctls(auditd_t)
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.4/policy/modules/system/miscfiles.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.5/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/miscfiles.fc	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/miscfiles.fc	2006-08-07 19:45:48.000000000 -0400
 @@ -9,6 +9,7 @@
  # /etc
  #
@@ -1160,9 +1208,9 @@
  /etc/pki(/.*)?			gen_context(system_u:object_r:cert_t,s0)
  
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.4/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.5/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/mount.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/mount.te	2006-08-07 19:45:48.000000000 -0400
 @@ -97,6 +97,8 @@
  
  sysnet_use_portmap(mount_t)
@@ -1172,9 +1220,9 @@
  userdom_use_all_users_fds(mount_t)
  
  ifdef(`distro_redhat',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.4/policy/modules/system/selinuxutil.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.5/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/selinuxutil.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/selinuxutil.te	2006-08-07 20:14:05.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -1184,7 +1232,17 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-@@ -613,6 +615,10 @@
+@@ -593,6 +595,9 @@
+ 
+ miscfiles_read_localization(semanage_t)
+ 
++allow semanage_t default_context_t:dir rw_dir_perms;
++allow semanage_t default_context_t:file create_file_perms;
++
+ seutil_search_default_contexts(semanage_t)
+ seutil_manage_file_contexts(semanage_t)
+ seutil_manage_selinux_config(semanage_t)
+@@ -613,6 +618,10 @@
  	userdom_read_generic_user_home_content_files(semanage_t)
  ')
  
@@ -1195,9 +1253,9 @@
  optional_policy(`
  	nscd_socket_use(semanage_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.4/policy/modules/system/udev.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.5/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/udev.fc	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/udev.fc	2006-08-07 19:45:48.000000000 -0400
 @@ -1,5 +1,6 @@
  # udev
  
@@ -1205,9 +1263,9 @@
  /dev/\.udevdb	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.4/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.5/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/unconfined.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/unconfined.if	2006-08-07 19:45:48.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -1224,9 +1282,9 @@
  	files_unconfined($1)
  	fs_unconfined($1)
  	selinux_unconfined($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.4/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.5/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/unconfined.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/unconfined.te	2006-08-07 19:45:48.000000000 -0400
 @@ -195,4 +195,9 @@
  ifdef(`targeted_policy',`
  	allow unconfined_execmem_t self:process { execstack execmem };
@@ -1237,9 +1295,9 @@
 +		unconfined_dbus_chat(unconfined_execmem_t)
 +	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.4/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.5/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/userdomain.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/userdomain.if	2006-08-07 19:45:48.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1646,9 +1704,9 @@
 +        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.4/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.5/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/userdomain.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/userdomain.te	2006-08-07 19:45:48.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -1757,9 +1815,9 @@
  		', `
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.4/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.5/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/xen.if	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/xen.if	2006-08-07 19:45:48.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -1802,9 +1860,9 @@
 +
 +	dontaudit $1 xend_t:fd use;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.4/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.5/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.4/policy/modules/system/xen.te	2006-08-03 16:23:23.000000000 -0400
++++ serefpolicy-2.3.5/policy/modules/system/xen.te	2006-08-07 19:45:48.000000000 -0400
 @@ -69,7 +69,10 @@
  #
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- selinux-policy.spec	4 Aug 2006 22:58:10 -0000	1.245
+++ selinux-policy.spec	8 Aug 2006 00:26:46 -0000	1.246
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.4
+Version: 2.3.5
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Mon Aug 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.5-1
+- Fix setroubleshootd
+
 * Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.4-1
 - Update to the latest from upstream
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	4 Aug 2006 22:58:10 -0000	1.81
+++ sources	8 Aug 2006 00:26:46 -0000	1.82
@@ -1 +1 @@
-7a8e96bc64499224226e0442a5da40a9  serefpolicy-2.3.4.tgz
+dd1d9d958535e36048d5470580d3f108  serefpolicy-2.3.5.tgz



From fedora-cvs-commits at redhat.com  Tue Aug  8 02:59:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 22:59:01 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.74,1.75
Message-ID: <200608080259.k782x1o7008185@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-connector.spec 
Log Message:
- Rebuild against correct evolution-data-server.



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- evolution-connector.spec	7 Aug 2006 19:53:50 -0000	1.74
+++ evolution-connector.spec	8 Aug 2006 02:58:59 -0000	1.75
@@ -1,5 +1,5 @@
-%define evo_version 2.7.90
-%define eds_version 1.7.90
+%define evo_version 2.7.91
+%define eds_version 1.7.91
 %define libsoup_version 2.2.6.1
 
 %define eds_major 1.2
@@ -19,7 +19,7 @@
 
 Name: evolution-connector
 Version: 2.7.91
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -126,6 +126,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-2
+- Rebuild against correct evolution-data-server.
+
 * Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-1
 - Update to 2.7.91
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 03:09:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 23:09:16 -0400
Subject: rpms/evolution-sharp/devel evolution-sharp-0.11.1-evo28.patch, 1.3,
	1.4 evolution-sharp.spec, 1.21, 1.22
Message-ID: <200608080309.k7839Gi1010294@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-sharp-0.11.1-evo28.patch evolution-sharp.spec 
Log Message:
- Rebuild for evolution-data-server-1.7.91
- Update required sonames from e-d-s.


evolution-sharp-0.11.1-evo28.patch:
 configure.in |   10 ++++++++++
 1 files changed, 10 insertions(+)

Index: evolution-sharp-0.11.1-evo28.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp-0.11.1-evo28.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-sharp-0.11.1-evo28.patch	5 Aug 2006 16:54:17 -0000	1.3
+++ evolution-sharp-0.11.1-evo28.patch	8 Aug 2006 03:09:13 -0000	1.4
@@ -16,7 +16,7 @@
 +	EDS_VERSION=-1.2
 +	EDS_SOVERSION=8
 +	EBOOK_SOVERSION=9
-+	ECAL_SOVERSION=6
++	ECAL_SOVERSION=7
 +fi
 +
  AC_SUBST(EDS_VERSION)


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- evolution-sharp.spec	5 Aug 2006 16:54:17 -0000	1.21
+++ evolution-sharp.spec	8 Aug 2006 03:09:13 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           evolution-sharp
 Version:        0.11.1
-Release:        6
+Release:        7
 License:        LGPL
 Group:          System Environment/Libraries
 Summary:        Evolution Data Server Mono Bindings
@@ -68,7 +68,16 @@
 %{_prefix}/lib/mono/evolution-sharp/evolution-sharp.dll
 %{_prefix}/share/gapi-2.0/*
 
+# !!! REMINDER !!!
+#
+# If building against a new version of evolution-data-server, the required
+# sonames may need to be updated in evolution-sharp's configure.in.
+
 %changelog
+* Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 0.11.1-7
+- Rebuild for evolution-data-server-1.7.91
+- Update required sonames from e-d-s.
+
 * Sat Aug  5 2006 Matthew Barnes <mbarnes at redhat.com> - 0.11.1-6
 - Rebuild for evolution-data-server-1.7.90
 - Update required sonames from e-d-s.



From fedora-cvs-commits at redhat.com  Tue Aug  8 03:57:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 7 Aug 2006 23:57:20 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2173,
	1.2174 linux-2.6-iscsi-update-to-2-6-18-upstream.patch, 1.1, NONE
Message-ID: <200608080357.k783vKsi026015@cvs.devel.redhat.com>

Author: mchristi

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-iscsi-update-to-2-6-18-upstream.patch 
Log Message:
drop iscsi update patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2173
retrieving revision 1.2174
diff -u -r1.2173 -r1.2174
--- kernel-2.6.spec	7 Aug 2006 18:44:15 -0000	1.2173
+++ kernel-2.6.spec	8 Aug 2006 03:57:17 -0000	1.2174
@@ -325,8 +325,7 @@
 
 # SCSI bits.
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
-Patch1103: linux-2.6-iscsi-update-to-2-6-18-upstream.patch
-Patch1104: linux-2.6-scsi-noisy-ioctl.patch
+Patch1103: linux-2.6-scsi-noisy-ioctl.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
@@ -856,11 +855,8 @@
 #
 # Add a pci table to advansys driver.
 %patch1102 -p1
-# iSCSI driver update that can be dropped when kernel is rebased
-# against a kernel that has the SCSI updates for 2.6.18
-%patch1103 -p1
 # Silence noisy SCSI ioctl.
-%patch1104 -p1
+%patch1103 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -1541,6 +1537,9 @@
 %endif
 
 %changelog
+* Mon Aug  7 2006 Mike Christie <mchristi at redhat.com>
+- Drop iscsi update patch.
+
 * Mon Aug  7 2006 Dave Jones <davej at redhat.com>
 - 2.6.17.8
 


--- linux-2.6-iscsi-update-to-2-6-18-upstream.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  8 08:09:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 04:09:13 -0400
Subject: rpms/vsftpd/devel vsftpd-2.0.5-add_ipv6_option.patch, NONE,
	1.1 vsftpd.spec, 1.47, 1.48
Message-ID: <200608080809.k7889D5H007166@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7114

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.0.5-add_ipv6_option.patch 
Log Message:
Two listen options repaired

vsftpd-2.0.5-add_ipv6_option.patch:
 vsftpd.conf |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE vsftpd-2.0.5-add_ipv6_option.patch ---
--- vsftpd-2.0.5/vsftpd.conf.old	2006-08-01 13:56:18.000000000 +0200
+++ vsftpd-2.0.5/vsftpd.conf	2006-08-01 13:59:15.000000000 +0200
@@ -103,7 +103,11 @@
 
 pam_service_name=vsftpd
 userlist_enable=YES
-#enable for standalone mode
+# When enabled, vsftpd runs in standalone mode, but listen only to IPv6 sockets. 
+# This directive cannot be used in conjunction with the listen directive.
+# Make sure, that one of listen options are commited
+# enable for standalone mode
 listen=YES
-listen_ipv6=YES
+#listen_ipv6=YES
+
 tcp_wrappers=YES


Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- vsftpd.spec	1 Aug 2006 12:04:31 -0000	1.47
+++ vsftpd.spec	8 Aug 2006 08:09:10 -0000	1.48
@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.5
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -32,6 +32,7 @@
 Patch17: vsftpd-2.0.3-pam_hostname.patch
 Patch18: vsftpd-close-std-fds.patch
 Patch19: vsftpd-2.0.5-default_ipv6.patch
+Patch20: vsftpd-2.0.5-add_ipv6_option.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -78,6 +79,7 @@
 %patch17 -p1 -b .old-pam
 %patch18 -p1 -b .close-fds
 %patch19 -p1
+%patch20 -p1
 
 %build
 %ifarch s390x
@@ -136,9 +138,11 @@
 /var/ftp
 
 %changelog
+* Tue Aug 08 2006 Maros Barabas	<mbarabas at redhat.com> - 2.0.5-5
+- option to change listening to IPv6 protocol
+
 * Thu Aug 01 2006 Maros Barabas <mbarabas at redhat.com> - 2.0.5-4
 - listen to IPv4 connections in default conf file
-- option to change listening to IPv6 protocol
 
 * Mon Jul 17 2006 Radek Vokal <rvokal at redhat.com> - 2.0.5-3
 - listen to IPv6 connections in default conf file



From fedora-cvs-commits at redhat.com  Tue Aug  8 08:12:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 04:12:52 -0400
Subject: rpms/m17n-db/devel .cvsignore, 1.23, 1.24 m17n-db.spec, 1.31,
	1.32 sources, 1.25, 1.26
Message-ID: <200608080812.k788Cq3J008147@cvs.devel.redhat.com>

Author: majain

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

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
Updated bn-probhat.mim according to https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200890#c4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	1 Aug 2006 13:24:44 -0000	1.23
+++ .cvsignore	8 Aug 2006 08:12:49 -0000	1.24
@@ -1,2 +1,2 @@
 m17n-db-1.3.3.tar.gz
-m17n-db-indic-0.4.12.tar.gz
+m17n-db-indic-0.4.13.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- m17n-db.spec	1 Aug 2006 13:24:44 -0000	1.31
+++ m17n-db.spec	8 Aug 2006 08:12:49 -0000	1.32
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.12
+%define indic_ver 0.4.13
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	16%{?dist}
+Release:	17%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -682,6 +682,10 @@
 
 
 %changelog
+* Tue Aug 8 2006 Mayank Jain <majain at redhat.com>
+- Updated bn-probhat.mim for RH bz #200890 ...weird... that previous update didnt showed up!
+- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200890#c4
+
 * Tue Aug 1 2006 Mayank Jain <majain at redhat.com>
 - Corrected bn-probhat.mim file, RH bz #200890, added U+09CE
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	1 Aug 2006 13:24:44 -0000	1.25
+++ sources	8 Aug 2006 08:12:49 -0000	1.26
@@ -1,3 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-cf315686111755874fcfbd8330c1d008  m17n-db-indic-0.4.11.tar.gz
-e04fad37fd346c9650373af4dcc6f034  m17n-db-indic-0.4.12.tar.gz
+63035b690cca5df3319b12cbf35ad9f9  m17n-db-indic-0.4.13.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  8 09:23:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 05:23:22 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch, 1.1,
	1.2 openoffice.org-2.0.3.ooo68047.vcl.zwj.patch, 1.1, 1.2
Message-ID: <200608080923.k789NMol007170@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch 
	openoffice.org-2.0.3.ooo68047.vcl.zwj.patch 
Log Message:
hack in support for zwj in fallback runs

openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch:
 psprint/inc/psprint/fontmanager.hxx       |    2 -
 psprint/source/fontmanager/fontconfig.cxx |   42 +++++++++++++++++++++++++++++-
 vcl/source/gdi/outdev3.cxx                |   28 ++++++++++----------
 3 files changed, 57 insertions(+), 15 deletions(-)

Index: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch	31 Jul 2006 08:19:33 -0000	1.1
+++ openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch	8 Aug 2006 09:23:19 -0000	1.2
@@ -167,7 +167,7 @@
 +
      // Try cached fallbacks first
 -    if ( !symbolFont && (nMissingUnicodes > 0) )
-+    if ( !symbolFont && aGlyphs.empty() )
++    if ( !symbolFont && !aGlyphs.empty() )
      {
 -        aSelData.maSearchName = pOrigFontEntry->GetFallbackForUnicode( pMissingUnicodes[0] );
 +        aSelData.maSearchName = pOrigFontEntry->GetFallbackForUnicode( aGlyphs[0] );

openoffice.org-2.0.3.ooo68047.vcl.zwj.patch:
 source/gdi/sallayout.cxx           |    0 
 vcl/source/gdi/sallayout.cxx       |    2 +-
 vcl/source/glyphs/gcach_layout.cxx |    4 ++++
 3 files changed, 5 insertions(+), 1 deletion(-)

Index: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo68047.vcl.zwj.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.ooo68047.vcl.zwj.patch	1 Aug 2006 15:50:56 -0000	1.1
+++ openoffice.org-2.0.3.ooo68047.vcl.zwj.patch	8 Aug 2006 09:23:19 -0000	1.2
@@ -14,3 +14,17 @@
          return true;
      if( (0x2028 <= cChar) && (cChar <= 0x202E) )
          return true;
+--- openoffice.org.orig/vcl/source/glyphs/gcach_layout.cxx	2006-08-08 10:18:47.000000000 +0100
++++ openoffice.org/vcl/source/glyphs/gcach_layout.cxx	2006-08-08 10:20:49.000000000 +0100
+@@ -481,7 +481,11 @@
+             if( !nGlyphIndex )
+             {
+                 if( nCharPos >= 0 )
++		{
+                     rArgs.NeedFallback( nCharPos, bRightToLeft );
++		    if ( (nCharPos > 0) && ((rArgs.mpStr[nCharPos-1] == 0x200C) || (rArgs.mpStr[nCharPos-1] == 0x200D)) )
++                    	rArgs.NeedFallback( nCharPos-1, bRightToLeft );
++		}
+                 if( SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags )
+                     continue;
+             }



From fedora-cvs-commits at redhat.com  Tue Aug  8 09:52:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 05:52:32 -0400
Subject: rpms/kdebase/devel kdebase-3.5.4-halbackend-dbus.patch, NONE,
	1.1 kdebase.spec, 1.209,
	1.210 kdebase-3.5.2-krdb-xresource.patch, 1.1,
	NONE kdebase-3.5.3-kde#116209.patch, 1.1,
	NONE kdebase-3.5.3-kde#127971.patch, 1.1,
	NONE kdebase-3.5.3-kde#130774.patch, 1.1,
	NONE kdebase-3.5.3-kfind-largefile.patch, 1.1,
	NONE kdebase-3.5.3-kicker-panel.patch, 1.1,
	NONE kdebase-3.5.3-kioslave_media_dbus-fuser.patch, 1.1,
	NONE kdebase-3.5.3-kioslave_media_dbus.patch, 1.2,
	NONE kdebase-3.5.3-kscreensaver.patch, 1.1,
	NONE kdebase-3.5.3-kxkb-kcmlayout.patch, 1.1,
	NONE kdebase-3.5.3.diff, 1.1, NONE post-3.5.0-kdebase-kdm.diff,
	1.1, NONE
Message-ID: <200608080952.k789qW4x002161@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-halbackend-dbus.patch 
Removed Files:
	kdebase-3.5.2-krdb-xresource.patch 
	kdebase-3.5.3-kde#116209.patch kdebase-3.5.3-kde#127971.patch 
	kdebase-3.5.3-kde#130774.patch 
	kdebase-3.5.3-kfind-largefile.patch 
	kdebase-3.5.3-kicker-panel.patch 
	kdebase-3.5.3-kioslave_media_dbus-fuser.patch 
	kdebase-3.5.3-kioslave_media_dbus.patch 
	kdebase-3.5.3-kscreensaver.patch 
	kdebase-3.5.3-kxkb-kcmlayout.patch kdebase-3.5.3.diff 
	post-3.5.0-kdebase-kdm.diff 
Log Message:
- apply upstream patch to fix KDED crashing on startup when D-BUS is unavailable.



kdebase-3.5.4-halbackend-dbus.patch:
 halbackend.cpp |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE kdebase-3.5.4-halbackend-dbus.patch ---
Index: kioslave/media/mediamanager/halbackend.cpp
===================================================================
--- kioslave/media/mediamanager/halbackend.cpp	(Revision 566465)
+++ kioslave/media/mediamanager/halbackend.cpp	(Revision 566466)
@@ -112,6 +112,14 @@
     DBusError error;
     dbus_error_init(&error);
     dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error);
+
+    if (!dbus_connection || dbus_error_is_set(&error)) {
+        dbus_error_free(&error);
+        libhal_ctx_free(m_halContext);
+        m_halContext = NULL;
+        return false;
+    }
+
     dbus_bus_register(dbus_connection, &error);
 
     if (dbus_error_is_set(&error)) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- kdebase.spec	24 Jul 2006 14:09:10 -0000	1.209
+++ kdebase.spec	8 Aug 2006 09:52:30 -0000	1.210
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -48,30 +48,16 @@
 Patch8: kdebase-3.2.92-logo.patch 
 Patch10: kdebase-3.4.2-kdesktop-konsole.patch
 Patch11: kdebase-3.5.1-xdg.patch
-Patch12: kdebase-3.5.3-kioslave_media_dbus.patch
 Patch13: kdebase-3.5.3-dbus.patch
 Patch14: kdebase-3.5.1-kdm-readme.patch
 Patch15: kdebase-3.5.1-konsole-fonts.patch
-Patch16: kdebase-3.5.2-krdb-xresource.patch
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
-Patch19: kdebase-3.5.3-kioslave_media_dbus-fuser.patch
 Patch20: kdebase-3.5.3-keyinit.patch
 Patch21: kdebase-3.5.3-khelpcenter-sort.patch
 
 # upstream patches
-Patch100: kdebase-3.5.3-kfind-largefile.patch
-Patch101: kdebase-3.5.3-kicker-panel.patch
-Patch102: kdebase-3.5.3-kscreensaver.patch
-Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
-Patch104: kdebase-3.5.3.diff
-Patch105: kdebase-3.5.3-kde#127971.patch
-Patch106: kdebase-3.5.3-kde#130774.patch
-Patch107: kdebase-3.5.3-kde#116209.patch
-
-# Security fixes
-# Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
-Patch300: post-3.5.0-kdebase-kdm.diff
+Patch100: kdebase-3.5.4-halbackend-dbus.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -169,33 +155,16 @@
 %patch8 -p1 -b .logo
 %patch10 -p1 -b .kdestop-konsole
 %patch11 -p1 -b .xdg
-# upstreamed
-#%patch12 -p1 -b .kioslave_media_dbus
 %patch13 -p1 -b .dbus
 %patch14 -p1 -b .kdm-readme
 %patch15 -p1 -b .konsole-fonts
-# upstreamed
-#%patch16 -p1 -b .krdb-xresource
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
-# upstreamed
-#%patch19 -p1 -b .fuser
 %patch20 -p1 -b .keyinit
 %patch21 -p1 -b .khelpcenter-sort
 
 # upstream patches
-#%patch100 -p1 -b .kfind-largefile
-#%patch101 -p1 -b .kicker-panel
-#%patch102 -p1 -b .kscreensaver
-#%patch103 -p1 -b .kxkb-kcmlayout
-#%patch104 -p0 -b .setuid-check
-#%patch105 -p0 -b .kde#127971
-#%patch106 -p0 -b .kde#130774
-#%patch107 -p0 -b .kde#116209
-
-# security fixes
-# upstreamed
-# %patch300 -p0 -b .CVE-2006-2449
+%patch100 -p0 -b .halbackend-dbus
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -565,6 +534,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Tue Aug 08 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
+- apply upstream patch to fix KDED crashing on startup when D-BUS is unavailable.
+
 * Mon Jul 24 2006 Petr Rockai <prockai at redhat.com> - 6:3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 - disable --enable-final on s390x in case it would cause problems


--- kdebase-3.5.2-krdb-xresource.patch DELETED ---


--- kdebase-3.5.3-kde#116209.patch DELETED ---


--- kdebase-3.5.3-kde#127971.patch DELETED ---


--- kdebase-3.5.3-kde#130774.patch DELETED ---


--- kdebase-3.5.3-kfind-largefile.patch DELETED ---


--- kdebase-3.5.3-kicker-panel.patch DELETED ---


--- kdebase-3.5.3-kioslave_media_dbus-fuser.patch DELETED ---


--- kdebase-3.5.3-kioslave_media_dbus.patch DELETED ---


--- kdebase-3.5.3-kscreensaver.patch DELETED ---


--- kdebase-3.5.3-kxkb-kcmlayout.patch DELETED ---


--- kdebase-3.5.3.diff DELETED ---


--- post-3.5.0-kdebase-kdm.diff DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  8 10:00:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 06:00:58 -0400
Subject: rpms/arts/devel .cvsignore, 1.26, 1.27 arts.spec, 1.63, 1.64 sources,
	1.28, 1.29 arts-1.5.3-1.5.4.patch, 1.1, NONE
Message-ID: <200608081000.k78A0wnh002300@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore arts.spec sources 
Removed Files:
	arts-1.5.3-1.5.4.patch 
Log Message:
rebuilt



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	31 May 2006 12:35:24 -0000	1.26
+++ .cvsignore	8 Aug 2006 10:00:47 -0000	1.27
@@ -10,3 +10,4 @@
 arts-1.5.1.tar.bz2
 arts-1.5.2.tar.bz2
 arts-1.5.3.tar.bz2
+arts-1.5.4.tar.bz2


Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/arts.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- arts.spec	24 Jul 2006 11:55:10 -0000	1.63
+++ arts.spec	8 Aug 2006 10:00:48 -0000	1.64
@@ -8,18 +8,17 @@
 %define make_cvs 1
 
 Version: 1.5.4
-Release: 0.pre1
+Release: 1
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
 Group: System Environment/Daemons
 License: LGPL
 Epoch: 8
 Url: http://www.kde.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-1.5.3.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: gslconfig-wrapper.h
 
-Patch0: arts-1.5.3-1.5.4.patch
 Patch1: arts-1.1.4-debug.patch
 Patch2: arts-1.3.92-glib2.patch
 Patch5: arts-1.3.1-alsa.patch
@@ -27,8 +26,10 @@
 Patch7: arts-1.5.0-check_tmp_dir.patch
 Patch8: arts-1.5.2-multilib.patch
 
-Prereq: /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: audiofile
+
 Obsoletes: kdelibs-sound
 Provides: kdelibs-sound
 
@@ -84,8 +85,7 @@
 KDE applications using sound).
 
 %prep
-%setup -q -n %{name}-1.5.3
-%patch0 -p0 -b .libtool
+%setup -q
 %patch1 -p1 -b .debug
 %patch2 -p1 -b .glib
 %patch5 -p1 -b .alsa
@@ -162,6 +162,9 @@
 %{_libdir}/pkgconfig/artsc.pc
 
 %changelog
+* Tue Aug 08 2006 Than Ngo <than at redhat.com> 8:1.5.4-1
+- rebuilt
+
 * Mon Jul 24 2006 Than Ngo <than at redhat.com> 8:1.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	31 May 2006 12:35:24 -0000	1.28
+++ sources	8 Aug 2006 10:00:48 -0000	1.29
@@ -1 +1 @@
-1707ce44708a70acecd7a50ef05d365e  arts-1.5.3.tar.bz2
+886ba4a13dc0da312d94c09f50c3ffe6  arts-1.5.4.tar.bz2


--- arts-1.5.3-1.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  8 10:04:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 06:04:46 -0400
Subject: rpms/planner/devel planner.spec,1.28,1.29
Message-ID: <200608081004.k78A4k9k002429@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/planner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2416

Modified Files:
	planner.spec 
Log Message:
another rebuild


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/planner.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- planner.spec	5 Aug 2006 12:19:31 -0000	1.28
+++ planner.spec	8 Aug 2006 10:04:44 -0000	1.29
@@ -8,7 +8,7 @@
 Summary:   A graphical project management tool.
 Name:      planner
 Version:   0.14
-Release:   2
+Release:   3
 URL:       http://planner.imendio.org
 License:   GPL
 Group:     Applications/Productivity
@@ -210,6 +210,9 @@
 # Changelog
 ##################################
 %changelog
+* Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 0.14-3
+- rebuild against eds, deja-vu
+
 * Sat Aug 05 2006 Caolan McNamara <caolanm at redhat.com> - 0.14-2
 - rebuild against eds
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 10:13:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 06:13:01 -0400
Subject: rpms/evolution-webcal/devel evolution-webcal.spec,1.27,1.28
Message-ID: <200608081013.k78AD0S9013722@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-webcal.spec 
Log Message:
- Rebuild for new libecal.



Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-webcal/devel/evolution-webcal.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- evolution-webcal.spec	12 Jul 2006 05:47:11 -0000	1.27
+++ evolution-webcal.spec	8 Aug 2006 10:12:58 -0000	1.28
@@ -1,26 +1,35 @@
-%define libsoup_version 2.1.8
 %define eds_version 1.1.0
+%define libsoup_version 2.1.8
 
 %define gettext_package evolution-webcal
 
+### Abstract ###
+
 Name: evolution-webcal
-Summary: A handler for webcal URIs
 Version: 2.7.1
-Release: 4.1
+Release: 5
 License: GPL
 Group: Applications/Internet
-Source0: %{name}-%{version}.tar.bz2
+Summary: A handler for webcal URIs
+Source: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: libsoup >= %{libsoup_version}
+
+### Dependencies ###
+
 Requires: evolution-data-server >=  %{eds_version}
 Requires: libgnomeui
-BuildRequires: libsoup-devel >= %{libsoup_version}
+Requires: libsoup >= %{libsoup_version}
+
+### Build Dependencies ###
+
 BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: libgnomeui-devel perl(XML::Parser) gettext
 
 %description
-evolution-webcal is a small helper application that can be run when webcal URIs are clicked in web browsers.
-It adds the calendar to your evolution-data-server, which will make the calendar appear in Evolution and in the gnome-panel's calendar.
+evolution-webcal is a small helper application that can be run when
+webcal URIs are clicked in web browsers.  It adds the calendar to your
+evolution-data-server, which will make the calendar appear in Evolution
+and in the gnome-panel's calendar.
 
 %prep
 %setup -q
@@ -31,11 +40,9 @@
 
 %install
 rm -rf %{buildroot}
-
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
 %find_lang %{gettext_package}
 grep -q '/usr/share/locale' %{gettext_package}.lang || exit 1
 
@@ -56,6 +63,9 @@
 
 
 %changelog
+* Tue Aug  8 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.1-5
+- Rebuild for new libecal.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.1-4.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 10:21:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 06:21:05 -0400
Subject: rpms/kdelibs/devel .cvsignore, 1.36, 1.37 kdelibs.spec, 1.165,
	1.166 sources, 1.47, 1.48 kdelibs-3.5.3-gcc-4.1.1-8.patch, 1.1,
	NONE kdelibs-3.5.3-kde#106795.patch, 1.1,
	NONE kdelibs-3.5.3-kde#116092.patch, 1.1,
	NONE kdelibs-3.5.3-kde#118277.patch, 1.1,
	NONE kdelibs-3.5.3-kde#123307.patch, 1.1,
	NONE kdelibs-3.5.3-kde#123315.patch, 1.2,
	NONE kdelibs-3.5.3-kde#128760.patch, 1.1,
	NONE kdelibs-3.5.3-kde#128842.patch, 1.1,
	NONE kdelibs-3.5.3-kde#128902.patch, 1.1,
	NONE kdelibs-3.5.3-kde#129187.patch, 1.1,
	NONE kdelibs-3.5.3-kde#130605.patch, 1.1,
	NONE kdelibs-3.5.3-kde#57159.patch, 1.1,
	NONE kdelibs-3.5.3-kde#65546.patch, 1.1,
	NONE kdelibs-3.5.3-kde#67849.patch, 1.1,
	NONE kdelibs-3.5.3-kde#81806.patch, 1.1,
	NONE kdelibs-3.5.3-khtml-regression.patch, 1.1,
	NONE kdelibs-3.5.3-konqueror-khtml.patch, 1.1,
	NONE kdelibs-3.5.3-to-3.5.4.patch, 1.1,
	NONE kdelibs-3.5.3.diff, 1.1, NONE
Message-ID: <200608081021.k78AL5OF031437@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-3.5.3-gcc-4.1.1-8.patch kdelibs-3.5.3-kde#106795.patch 
	kdelibs-3.5.3-kde#116092.patch kdelibs-3.5.3-kde#118277.patch 
	kdelibs-3.5.3-kde#123307.patch kdelibs-3.5.3-kde#123315.patch 
	kdelibs-3.5.3-kde#128760.patch kdelibs-3.5.3-kde#128842.patch 
	kdelibs-3.5.3-kde#128902.patch kdelibs-3.5.3-kde#129187.patch 
	kdelibs-3.5.3-kde#130605.patch kdelibs-3.5.3-kde#57159.patch 
	kdelibs-3.5.3-kde#65546.patch kdelibs-3.5.3-kde#67849.patch 
	kdelibs-3.5.3-kde#81806.patch 
	kdelibs-3.5.3-khtml-regression.patch 
	kdelibs-3.5.3-konqueror-khtml.patch 
	kdelibs-3.5.3-to-3.5.4.patch kdelibs-3.5.3.diff 
Log Message:
rebuilt



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	31 May 2006 13:18:36 -0000	1.36
+++ .cvsignore	8 Aug 2006 10:21:02 -0000	1.37
@@ -11,3 +11,4 @@
 kdelibs-3.5.1.tar.bz2
 kdelibs-3.5.2.tar.bz2
 kdelibs-3.5.3.tar.bz2
+kdelibs-3.5.4.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- kdelibs.spec	26 Jul 2006 10:03:28 -0000	1.165
+++ kdelibs.spec	8 Aug 2006 10:21:03 -0000	1.166
@@ -8,7 +8,7 @@
 %define cups_epoch 1
 
 %define qt_version 3.3.6
-%define arts_version 1.5.3
+%define arts_version 1.5.4
 %define kde_major_version 3
 
 %define qtdocdir %{_docdir}/qt-devel-%{qt_version}
@@ -17,7 +17,7 @@
 %define arts 1
 
 Version: 3.5.4
-Release: 0.pre2%{?dist}
+Release: 1{?dist}
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -25,14 +25,11 @@
 Group: System Environment/Libraries
 License: LGPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-
-# 3.5.3 temporarily, since we are at 3.5.4 but through patches
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kde.sh
 Source2: kde.csh
 Source3: devices.protocol
 
-Patch0: kdelibs-3.5.3-to-3.5.4.patch
 Patch1: kdelibs-3.5.1-xdg-menu.patch
 Patch2: kdelibs-3.0.0-ndebug.patch
 Patch4: kdelibs-3.0.4-ksyscoca.patch
@@ -48,26 +45,6 @@
 Patch35: kdelibs-3.4.92-inttype.patch
 Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
 Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
-Patch39: kdelibs-3.5.3-gcc-4.1.1-8.patch
-
-# upstream patches
-Patch100: kdelibs-3.5.3-konqueror-khtml.patch
-Patch101: kdelibs-3.5.3-khtml-regression.patch
-Patch102: kdelibs-3.5.3.diff
-Patch103: kdelibs-3.5.3-kde#57159.patch
-Patch104: kdelibs-3.5.3-kde#118277.patch
-Patch105: kdelibs-3.5.3-kde#123315.patch
-Patch106: kdelibs-3.5.3-kde#65546.patch
-Patch107: kdelibs-3.5.3-kde#128842.patch
-Patch108: kdelibs-3.5.3-kde#128902.patch
-Patch109: kdelibs-3.5.3-kde#67849.patch
-Patch110: kdelibs-3.5.3-kde#81806.patch
-Patch111: kdelibs-3.5.3-kde#128760.patch
-Patch112: kdelibs-3.5.3-kde#123307.patch
-Patch113: kdelibs-3.5.3-kde#106795.patch
-Patch114: kdelibs-3.5.3-kde#130605.patch
-Patch115: kdelibs-3.5.3-kde#129187.patch
-Patch116: kdelibs-3.5.3-kde#116092.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -175,8 +152,7 @@
 
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0 -b .kde3.5.4
+%setup -q
 %patch1 -p1 -b .xdg-menu
 %if %{debug} == 0
 %patch2 -p1 -b .debug
@@ -194,26 +170,6 @@
 %patch35 -p1 -b .inttype
 %patch37 -p1 -b .kdebug-kmail-quiet
 %patch38 -p1 -b .cupsdconf2-group
-#%patch39 -p1 -b .gcc-4.1.1-8
-
-# upstream patches
-#%patch100 -p1 -b .konqueror-khtml
-#%patch101 -p1 -b .khtml-regression
-#%patch102 -p0 -b .return-check
-#%patch103 -p0 -b .kde#57159
-#%patch104 -p0 -b .kde#118277
-#%patch105 -p0 -b .kde#123315
-#%patch106 -p0 -b .kde#65546
-#%patch107 -p0 -b .kde#128842
-#%patch108 -p0 -b .kde#128902
-#%patch109 -p0 -b .kde#67849
-#%patch110 -p0 -b .kde#81806
-#%patch111 -p0 -b .kde#128760
-#%patch112 -p0 -b .kde#130252
-#%patch113 -p0 -b .kde#106795
-#%patch114 -p0 -b .kde#130605
-#%patch115 -p0 -b .kde#129187
-#%patch116 -p0 -b .kde#116092
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -440,6 +396,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Tue Aug 08 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
+- rebuilt
+
 * Wed Jul 26 2006 Petr Rockai <prockai at redhat.com> - 6:3.5.4-0.pre2
 - drop the gcc workaround, problem fixed in gcc/g++
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	31 May 2006 13:18:36 -0000	1.47
+++ sources	8 Aug 2006 10:21:03 -0000	1.48
@@ -1 +1 @@
-972c2c6855f912179bd7830bf2ed91d8  kdelibs-3.5.3.tar.bz2
+979d056ca0e21c12caed270126e60e3e  kdelibs-3.5.4.tar.bz2


--- kdelibs-3.5.3-gcc-4.1.1-8.patch DELETED ---


--- kdelibs-3.5.3-kde#106795.patch DELETED ---


--- kdelibs-3.5.3-kde#116092.patch DELETED ---


--- kdelibs-3.5.3-kde#118277.patch DELETED ---


--- kdelibs-3.5.3-kde#123307.patch DELETED ---


--- kdelibs-3.5.3-kde#123315.patch DELETED ---


--- kdelibs-3.5.3-kde#128760.patch DELETED ---


--- kdelibs-3.5.3-kde#128842.patch DELETED ---


--- kdelibs-3.5.3-kde#128902.patch DELETED ---


--- kdelibs-3.5.3-kde#129187.patch DELETED ---


--- kdelibs-3.5.3-kde#130605.patch DELETED ---


--- kdelibs-3.5.3-kde#57159.patch DELETED ---


--- kdelibs-3.5.3-kde#65546.patch DELETED ---


--- kdelibs-3.5.3-kde#67849.patch DELETED ---


--- kdelibs-3.5.3-kde#81806.patch DELETED ---


--- kdelibs-3.5.3-khtml-regression.patch DELETED ---


--- kdelibs-3.5.3-konqueror-khtml.patch DELETED ---


--- kdelibs-3.5.3-to-3.5.4.patch DELETED ---


--- kdelibs-3.5.3.diff DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  8 10:24:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 06:24:15 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.166,1.167
Message-ID: <200608081024.k78AOF3h032679@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Log Message:
typo



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kdelibs.spec	8 Aug 2006 10:21:03 -0000	1.166
+++ kdelibs.spec	8 Aug 2006 10:24:12 -0000	1.167
@@ -17,7 +17,7 @@
 %define arts 1
 
 Version: 3.5.4
-Release: 1{?dist}
+Release: 1%{?dist}
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/



From fedora-cvs-commits at redhat.com  Tue Aug  8 10:26:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 06:26:17 -0400
Subject: rpms/evolution-webcal/devel evolution-webcal.spec,1.28,1.29
Message-ID: <200608081026.k78AQHZg001005@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-webcal.spec 
Log Message:
- Add missing BR libsoup-devel.



Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-webcal/devel/evolution-webcal.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- evolution-webcal.spec	8 Aug 2006 10:12:58 -0000	1.28
+++ evolution-webcal.spec	8 Aug 2006 10:26:15 -0000	1.29
@@ -7,7 +7,7 @@
 
 Name: evolution-webcal
 Version: 2.7.1
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/Internet
 Summary: A handler for webcal URIs
@@ -23,7 +23,10 @@
 ### Build Dependencies ###
 
 BuildRequires: evolution-data-server-devel >= %{eds_version}
-BuildRequires: libgnomeui-devel perl(XML::Parser) gettext
+BuildRequires: gettext
+BuildRequires: libgnomeui-devel
+BuildRequires: libsoup-devel >= %{libsoup_version}
+BuildRequires: perl(XML::Parser)
 
 %description
 evolution-webcal is a small helper application that can be run when
@@ -63,6 +66,9 @@
 
 
 %changelog
+* Tue Aug  8 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.1-6
+- Add missing BR libsoup-devel.
+
 * Tue Aug  8 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.1-5
 - Rebuild for new libecal.
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 11:32:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 07:32:55 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.128.ooo54479.systemicu.patch, 1.13, 1.14
Message-ID: <200608081132.k78BWtiL018392@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.128.ooo54479.systemicu.patch 
Log Message:
rh#201546# icu doesn't reference count or copy the string

openoffice.org-1.9.128.ooo54479.systemicu.patch:
 config_office/configure.in                              |   52 ++++++++--------
 config_office/set_soenv.in                              |    6 -
 i18npool/inc/breakiterator_unicode.hxx                  |    1 
 i18npool/prj/build.lst                                  |    2 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   24 +++++--
 i18npool/source/breakiterator/makefile.mk               |   16 ++--
 i18npool/source/collator/collator_unicode.cxx           |   32 ++++-----
 i18npool/source/collator/gencoll_rule.cxx               |    4 -
 inc/breakiterator_unicode.hxx                           |    0 
 linguistic/source/hhconvdic.cxx                         |    2 
 prj/build.lst                                           |    0 
 scp2/prj/build.lst                                      |    2 
 scp2/source/ooo/file_library_ooo.scp                    |    4 +
 scp2/source/ooo/makefile.mk                             |   11 ++-
 scp2/source/ooo/shortcut_ooo.scp                        |   30 ---------
 source/breakiterator/breakiterator_unicode.cxx          |    0 
 source/breakiterator/makefile.mk                        |    0 
 source/collator/collator_unicode.cxx                    |    0 
 source/collator/gencoll_rule.cxx                        |    0 
 source/hhconvdic.cxx                                    |    0 
 vcl/prj/build.lst                                       |    2 
 21 files changed, 87 insertions(+), 101 deletions(-)

Index: openoffice.org-1.9.128.ooo54479.systemicu.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.128.ooo54479.systemicu.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice.org-1.9.128.ooo54479.systemicu.patch	7 Aug 2006 13:23:00 -0000	1.13
+++ openoffice.org-1.9.128.ooo54479.systemicu.patch	8 Aug 2006 11:32:53 -0000	1.14
@@ -267,13 +267,28 @@
  vc	vcl										usr1	-	all	vc_mkout NULL
  vc	vcl\source\unotypes						nmake	-	all	vc_unot NULL
  vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_unot NULL
+Index: inc/breakiterator_unicode.hxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/inc/breakiterator_unicode.hxx,v
+retrieving revision 1.12
+diff -u -r1.12 breakiterator_unicode.hxx
+--- openoffice.org.orig/i18npool/inc/breakiterator_unicode.hxx	17 Nov 2005 20:30:00 -0000	1.12
++++ openoffice.org/i18npool/inc/breakiterator_unicode.hxx	8 Aug 2006 11:31:48 -0000
+@@ -92,6 +92,7 @@
+ 
+     struct {
+         rtl::OUString aText;
++	UnicodeString aICUText;
+         icu::BreakIterator *aBreakIterator;
+     } character, word, sentence, line, *icuBI; 
+     com::sun::star::lang::Locale aLocale;
 Index: prj/build.lst
 ===================================================================
 RCS file: /cvs/l10n/i18npool/prj/build.lst,v
 retrieving revision 1.20
 diff -u -r1.20 build.lst
 --- openoffice.org.orig/i18npool/prj/build.lst	7 Apr 2006 14:30:57 -0000	1.20
-+++ openoffice.org/i18npool/prj/build.lst	7 Aug 2006 12:47:54 -0000
++++ openoffice.org/i18npool/prj/build.lst	8 Aug 2006 11:31:48 -0000
 @@ -1,4 +1,4 @@
 -inp  i18npool    :   bridges sax stoc comphelper icu i18nutil regexp NULL
 +inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil regexp NULL
@@ -286,7 +301,7 @@
 retrieving revision 1.22
 diff -u -r1.22 breakiterator_unicode.cxx
 --- openoffice.org.orig/i18npool/source/breakiterator/breakiterator_unicode.cxx	17 Nov 2005 20:30:35 -0000	1.22
-+++ openoffice.org/i18npool/source/breakiterator/breakiterator_unicode.cxx	7 Aug 2006 12:47:55 -0000
++++ openoffice.org/i18npool/source/breakiterator/breakiterator_unicode.cxx	8 Aug 2006 11:31:48 -0000
 @@ -37,9 +37,10 @@
  #include <unicode/locid.h>
  #include <unicode/rbbi.h>
@@ -327,13 +342,25 @@
                  if (!U_SUCCESS(status) ) icuBI->aBreakIterator=NULL;
              }
          }
+@@ -151,7 +158,10 @@
+ 
+     if (newBreak || !icuBI->aText.equals(rText)) {
+         icuBI->aText = rText;
+-        icuBI->aBreakIterator->setText(UnicodeString(icuBI->aText.getStr(), icuBI->aText.getLength()));
++	//ICU doesn't copy or reference such a UnicodeString, only a pointer to it, so it must exist
++	//for the duration of the usage
++        icuBI->aICUText = UnicodeString(icuBI->aText.getStr(), icuBI->aText.getLength());
++        icuBI->aBreakIterator->setText(icuBI->aICUText);
+     }
+ }
+ 
 Index: source/breakiterator/makefile.mk
 ===================================================================
 RCS file: /cvs/l10n/i18npool/source/breakiterator/makefile.mk,v
 retrieving revision 1.9
 diff -u -r1.9 makefile.mk
 --- openoffice.org.orig/i18npool/source/breakiterator/makefile.mk	1 Nov 2005 14:52:19 -0000	1.9
-+++ openoffice.org/i18npool/source/breakiterator/makefile.mk	7 Aug 2006 12:47:55 -0000
++++ openoffice.org/i18npool/source/breakiterator/makefile.mk	8 Aug 2006 11:31:48 -0000
 @@ -51,11 +51,11 @@
  MY_BRK_TXTFILES:=$(shell ls data/*.txt)
  
@@ -370,7 +397,7 @@
 retrieving revision 1.12
 diff -u -r1.12 collator_unicode.cxx
 --- openoffice.org.orig/i18npool/source/collator/collator_unicode.cxx	20 Apr 2006 13:41:49 -0000	1.12
-+++ openoffice.org/i18npool/source/collator/collator_unicode.cxx	7 Aug 2006 12:47:56 -0000
++++ openoffice.org/i18npool/source/collator/collator_unicode.cxx	8 Aug 2006 11:31:49 -0000
 @@ -73,8 +73,21 @@
  	throw(RuntimeException)
  {
@@ -430,7 +457,7 @@
 retrieving revision 1.7
 diff -u -r1.7 gencoll_rule.cxx
 --- openoffice.org.orig/i18npool/source/collator/gencoll_rule.cxx	31 Jan 2006 18:36:13 -0000	1.7
-+++ openoffice.org/i18npool/source/collator/gencoll_rule.cxx	7 Aug 2006 12:47:56 -0000
++++ openoffice.org/i18npool/source/collator/gencoll_rule.cxx	8 Aug 2006 11:31:49 -0000
 @@ -81,9 +81,6 @@
  
  }



From fedora-cvs-commits at redhat.com  Tue Aug  8 11:47:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 07:47:40 -0400
Subject: rpms/kdebase/devel kdebase-3.5.4-kde#128552.patch, NONE,
	1.1 .cvsignore, 1.50, 1.51 kdebase.spec, 1.210, 1.211 sources,
	1.69, 1.70 kdebase-3.5.3-to-3.5.4.patch, 1.1, NONE
Message-ID: <200608081147.k78BleVG005220@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdebase.spec sources 
Added Files:
	kdebase-3.5.4-kde#128552.patch 
Removed Files:
	kdebase-3.5.3-to-3.5.4.patch 
Log Message:
- apply upstream patch to fix kde#128552, kicker regression


kdebase-3.5.4-kde#128552.patch:
 taskbar.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.4-kde#128552.patch ---
Index: kicker/taskbar/taskbar.cpp
===================================================================
--- kicker/taskbar/taskbar.cpp	(Revision 570839)
+++ kicker/taskbar/taskbar.cpp	(Revision 570840)
@@ -177,14 +177,14 @@
 
         if (containerCount() == 0)
         {
-            actualMax = maxSize.height();
+            actualMax = minButtonHeight;
         }
 
         if (actualMax > maxSize.height())
         {
             return maxSize;
         }
-        return QSize( maxSize.width(), maxSize.height() );
+        return QSize( maxSize.width(), actualMax );
     }
     else
     {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	11 Jul 2006 13:13:02 -0000	1.50
+++ .cvsignore	8 Aug 2006 11:47:37 -0000	1.51
@@ -24,3 +24,4 @@
 kdebase-3.5.2.tar.bz2
 kdebase-3.5.3.tar.bz2
 kde-redhat-config-3.5-fc5-0.3.tar.bz2
+kdebase-3.5.4.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- kdebase.spec	8 Aug 2006 09:52:30 -0000	1.210
+++ kdebase.spec	8 Aug 2006 11:47:38 -0000	1.211
@@ -24,8 +24,7 @@
 Group: User Interface/Desktops
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: konsole.desktop
 Source2: KDE.session.gnome
 Source3: kde.desktop
@@ -35,9 +34,7 @@
 Source7: mailsettings.cc
 Source8: env.sh
 
-# is really independent of all others and need 0 for 3.5.3->3.5.4 patch
 Patch200: kde-libtool.patch
-Patch0: kdebase-3.5.3-to-3.5.4.patch
 Patch1: kdebase-3.5.4-1-redhat.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
@@ -58,6 +55,7 @@
 
 # upstream patches
 Patch100: kdebase-3.5.4-halbackend-dbus.patch
+Patch101: kdebase-3.5.4-kde#128552.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -143,8 +141,7 @@
 Kate plugins or KWin styles.
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0
+%setup -q
 %patch1 -p1 -b .redhat
 %patch2 -p1 -b .vroot
 %patch3 -p1 -b .shortcuts
@@ -165,6 +162,7 @@
 
 # upstream patches
 %patch100 -p0 -b .halbackend-dbus
+%patch101 -p0 -b .kde#128552
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -536,6 +534,7 @@
 %changelog
 * Tue Aug 08 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
 - apply upstream patch to fix KDED crashing on startup when D-BUS is unavailable.
+- apply upstream patch to fix kde#128552, kicker regression
 
 * Mon Jul 24 2006 Petr Rockai <prockai at redhat.com> - 6:3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	11 Jul 2006 13:13:02 -0000	1.69
+++ sources	8 Aug 2006 11:47:38 -0000	1.70
@@ -1,2 +1,2 @@
-9cb6b8291c4f3f986e16f72129e8fcd0  kdebase-3.5.3.tar.bz2
 fcd1283fbdc542b1d484bbb4aa273980  kde-redhat-config-3.5-fc5-0.3.tar.bz2
+882a9729c08b197caef2c8712c980d9c  kdebase-3.5.4.tar.bz2


--- kdebase-3.5.3-to-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  8 11:57:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 07:57:02 -0400
Subject: rpms/sudo/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 sudo.spec,
	1.43, 1.44
Message-ID: <200608081157.k78Bv23A008790@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/sudo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8704

Modified Files:
	.cvsignore sources sudo.spec 
Log Message:
use Red Hat specific default sudoers file



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sudo/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 Nov 2005 07:46:20 -0000	1.13
+++ .cvsignore	8 Aug 2006 11:57:00 -0000	1.14
@@ -1 +1,2 @@
 sudo-1.6.8p12.tar.gz
+sudo-1.6.8p12-sudoers


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sudo/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Nov 2005 07:46:20 -0000	1.13
+++ sources	8 Aug 2006 11:57:00 -0000	1.14
@@ -1 +1,2 @@
 b29893c06192df6230dd5f340f3badf5  sudo-1.6.8p12.tar.gz
+a7e16582ef741f70961a74020ceaec33  sudo-1.6.8p12-sudoers


Index: sudo.spec
===================================================================
RCS file: /cvs/dist/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sudo.spec	16 Jul 2006 22:37:37 -0000	1.43
+++ sudo.spec	8 Aug 2006 11:57:00 -0000	1.44
@@ -1,11 +1,12 @@
 Summary: Allows restricted root access for specified users.
 Name: sudo
 Version: 1.6.8p12
-Release: 7
+Release: 8
 License: BSD
 Group: Applications/System
-Source: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
 URL: http://www.courtesan.com/sudo/
+Source0: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
+Source1: sudo-1.6.8p12-sudoers
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: /etc/pam.d/system-auth, vim-minimal
 
@@ -79,6 +80,7 @@
 make install DESTDIR="$RPM_BUILD_ROOT" install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g`
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* 
 install -d -m 700 $RPM_BUILD_ROOT/var/run/sudo
+install -c -m 0440 %{SOURCE1} $RPM_BUILD_ROOT/etc/sudoers
 
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 cat > $RPM_BUILD_ROOT/etc/pam.d/sudo << EOF
@@ -124,6 +126,9 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Tue Aug 08 2006 Peter Vrabec <pvrabec at redhat.com> 1.6.8p12-8
+- use Red Hat specific default sudoers file
+
 * Sun Jul 16 2006 Karel Zak <kzak at redhat.com> 1.6.8p12-7
 - fix #198755 - make login processes (sudo -i) initialise session keyring
   (thanks for PAM config files to David Howells)



From fedora-cvs-commits at redhat.com  Tue Aug  8 11:58:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 07:58:35 -0400
Subject: rpms/openssh/devel openssh-4.3p2-no-v6only.patch, NONE,
	1.1 openssh.spec, 1.94, 1.95 openssh-4.3p2-pam-session.patch,
	1.1, NONE
Message-ID: <200608081158.k78BwZIV009377@cvs.devel.redhat.com>

Author: tmraz

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

Modified Files:
	openssh.spec 
Added Files:
	openssh-4.3p2-no-v6only.patch 
Removed Files:
	openssh-4.3p2-pam-session.patch 
Log Message:
* Tue Aug  8 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-8
- drop the pam-session patch from the previous build (#201341)
- don't set IPV6_V6ONLY sock opt when listening on wildcard addr (#201594)


openssh-4.3p2-no-v6only.patch:
 channels.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openssh-4.3p2-no-v6only.patch ---
--- openssh-4.3p2/channels.c.no-v6only	2006-07-17 15:39:31.000000000 +0200
+++ openssh-4.3p2/channels.c	2006-08-08 12:44:51.000000000 +0200
@@ -2794,7 +2794,7 @@
 				}
 			}
 #ifdef IPV6_V6ONLY
-			if (ai->ai_family == AF_INET6) {
+			if (x11_use_localhost && ai->ai_family == AF_INET6) {
 				int on = 1;
 				if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0)
 					error("setsockopt IPV6_V6ONLY: %.100s", strerror(errno));


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- openssh.spec	20 Jul 2006 11:06:42 -0000	1.94
+++ openssh.spec	8 Aug 2006 11:58:33 -0000	1.95
@@ -2,6 +2,8 @@
 %if %{WITH_SELINUX}
 # Audit patch applicable only over SELinux patch
 %define WITH_AUDIT 1
+%else
+%define WITH_AUDIT 0
 %endif
 
 # OpenSSH privilege separation requires a user & group ID
@@ -49,6 +51,7 @@
 # Is this a build for the rescue CD (without PAM, with MD5)? (1=yes 0=no)
 %define rescue 0
 %{?build_rescue:%define rescue 1}
+%{?build_rescue:%define rescue_rel rescue}
 
 # Turn off some stuff for resuce builds
 %if %{rescue}
@@ -58,12 +61,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 4.3p2
-%define rel 7
-%if %{rescue}
-%define %{rel}rescue
-%else
-Release: %{rel}
-%endif
+Release: 8%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.sig
@@ -92,7 +90,7 @@
 Patch36: openssh-4.3p2-buffer-len.patch
 Patch37: openssh-4.3p2-configure-typo.patch
 Patch38: openssh-4.3p2-askpass-grab-info.patch
-Patch39: openssh-4.3p2-pam-session.patch
+Patch39: openssh-4.3p2-no-v6only.patch
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -220,7 +218,7 @@
 %patch36 -p0 -b .buffer-len
 %patch37 -p1 -b .typo
 %patch38 -p1 -b .grab-info
-%patch39 -p0 -b .pam-session
+%patch39 -p1 -b .no-v6only
 
 autoreconf
 
@@ -462,6 +460,10 @@
 %endif
 
 %changelog
+* Tue Aug  8 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-8
+- drop the pam-session patch from the previous build (#201341)
+- don't set IPV6_V6ONLY sock opt when listening on wildcard addr (#201594)
+
 * Thu Jul 20 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-7
 - dropped old ssh obsoletes
 - call the pam_session_open/close from the monitor when privsep is


--- openssh-4.3p2-pam-session.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  8 12:01:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 08:01:04 -0400
Subject: rpms/sudo/devel sudo-1.6.8p12-sudoers,NONE,1.1
Message-ID: <200608081201.k78C146u010054@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/sudo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10013

Added Files:
	sudo-1.6.8p12-sudoers 
Log Message:
add new sudoers file



--- NEW FILE sudo-1.6.8p12-sudoers ---
## Sudoers allows particular users to run various commands as
## the root user, without needing the root password.
##
## Examples are provided at the bottom of the file for collections
## of related commands, which can then be delegated out to particular
## users or groups.
## 
## This file must be edited with the 'visudo' command.

## Host Aliases
## Groups of machines. You may prefer to use hostnames (perhap using 
## wildcards for entire domains) or IP addresses instead.
# Host_Alias     FILESERVERS = fs1, fs2
# Host_Alias     MAILSERVERS = smtp, smtp2

## User Aliases
## These aren't often necessary, as you can use regular groups
## (ie, from files, LDAP, NIS, etc) in this file - just use %groupname 
## rather than USERALIAS
# User_Alias ADMINS = jsmith, mikem


## Command Aliases
## These are groups of related commands...

## Networking
Cmnd_Alias NETWORKING = /sbin/route, /sbin/ifconfig, /bin/ping, /sbin/dhclient, /usr/bin/net, /sbin/iptables, /usr/bin/rfcomm, /usr/bin/wvdial, /sbin/iwconfig, /sbin/mii-tool

## Installation and management of software
Cmnd_Alias SOFTWARE = /bin/rpm, /usr/bin/up2date, /usr/bin/yum

## Services
Cmnd_Alias SERVICES = /sbin/service, /sbin/chkconfig

## Updating the locate database
Cmnd_Alias LOCATE = /usr/sbin/updatedb

## Storage
Cmnd_Alias STORAGE = /sbin/fdisk, /sbin/sfdisk, /sbin/parted, /sbin/partprobe, /bin/mount, /bin/umount

## Delegating permissions
Cmnd_Alias DELEGATING = /usr/sbin/visudo, /bin/chown, /bin/chmod, /bin/chgrp 

## Processes
Cmnd_Alias PROCESSES = /bin/nice, /bin/kill, /usr/bin/kill, /usr/bin/killall

## Drivers
Cmnd_Alias DRIVERS = /sbin/modprobe

# Defaults specification

#
# Disable "ssh hostname sudo <cmd>", because it will show the password in clear. 
#         You have to run "ssh -t hostname sudo <cmd>".
#
Defaults    requiretty

Defaults    env_reset
Defaults    env_keep = "COLORS DISPLAY HOSTNAME HISTSIZE INPUTRC KDEDIR \
                        LS_COLORS MAIL PS1 PS2 QTDIR USERNAME \
                        LANG LC_ADDRESS LC_CTYPE LC_COLLATE LC_IDENTIFICATION \
                        LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC \
                        LC_PAPER LC_TELEPHONE LC_TIME LC_ALL LANGUAGE LINGUAS \
                        _XKB_CHARSET"

## Next comes the main part: which users can run what software on 
## which machines (the sudoers file can be shared between multiple
## systems).
## Syntax:
##
## 	user	MACHINE=COMMANDS
##
## The COMMANDS section may have other options added to it.
##
## Allow root to run any commands anywhere 
root	ALL=(ALL) 	ALL

## Allows members of the 'sys' group to run networking, software, 
## service management apps and more.
# %sys ALL = NETWORKING, SOFTWARE, SERVICES, STORAGE, DELEGATING, PROCESSES, LOCATE, DRIVERS

## Allows people in group wheel to run all commands
# %wheel	ALL=(ALL)	ALL

## Same thing without a password
# %wheel	ALL=(ALL)	NOPASSWD: ALL

## Allows members of the users group to mount and unmount the 
## cdrom as root
# %users  ALL=/sbin/mount /mnt/cdrom, /sbin/umount /mnt/cdrom

## Allows members of the users group to shutdown this system
# %users  localhost=/sbin/shutdown -h now




From fedora-cvs-commits at redhat.com  Tue Aug  8 12:03:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 08:03:41 -0400
Subject: rpms/star/devel .cvsignore, 1.15, 1.16 sources, 1.16, 1.17 star.spec,
	1.29, 1.30
Message-ID: <200608081203.k78C3eoi010321@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	.cvsignore sources star.spec 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/star/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	24 Apr 2006 10:04:36 -0000	1.15
+++ .cvsignore	8 Aug 2006 12:03:38 -0000	1.16
@@ -1 +1 @@
-star-1.5a74.tar.bz2
+star-1.5a75.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/star/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	2 Jun 2006 10:53:52 -0000	1.16
+++ sources	8 Aug 2006 12:03:38 -0000	1.17
@@ -1 +1 @@
-da1a088602d92abd3b8bc7207edbf6c3  star-1.5a74.tar.bz2
+5caa472e213964065baed871ca0f06f7  star-1.5a75.tar.bz2


Index: star.spec
===================================================================
RCS file: /cvs/dist/rpms/star/devel/star.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- star.spec	12 Jul 2006 08:18:26 -0000	1.29
+++ star.spec	8 Aug 2006 12:03:38 -0000	1.30
@@ -3,8 +3,8 @@
 %endif
 Summary:  An archiving tool with ACL support
 Name: star
-Version: 1.5a74
-Release: 3.1
+Version: 1.5a75
+Release: 1
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2
 Patch1: star-1.5-newMake.patch
@@ -97,6 +97,9 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Tue Aug 08 2006 Peter Vrabec <pvrabec at redhat.com> 1.5a75-1
+- upgrade
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5a74-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 13:00:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 09:00:53 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060802.patch, NONE, 1.1 .cvsignore,
	1.59, 1.60 selinux-policy.spec, 1.177, 1.178 sources, 1.63, 1.64
Message-ID: <200608081300.k78D0rD2008681@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore selinux-policy.spec sources 
Added Files:
	policy-20060802.patch 
Log Message:
* Tue Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 2.3.5-1.fc5
- Bump for FC5


policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   10 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/usermanage.te        |    4 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    3 
 modules/kernel/devices.te          |    2 
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 ++++++++++++
 modules/kernel/terminal.if         |   19 +++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cups.te           |    6 
 modules/services/dbus.if           |    5 
 modules/services/ldap.te           |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    4 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  105 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   25 +++-
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   50 +++++++-
 modules/services/xserver.te        |   10 +
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/mount.te            |    2 
 modules/system/selinuxutil.te      |    9 +
 modules/system/udev.fc             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  231 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   50 +++-----
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |   26 +++-
 59 files changed, 728 insertions(+), 162 deletions(-)

--- NEW FILE policy-20060802.patch ---
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.5/policy/mls
--- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
+++ serefpolicy-2.3.5/policy/mls	2006-08-07 19:45:48.000000000 -0400
@@ -184,19 +184,12 @@
 	 ( t2 == mlstrustedobject ));
 
 # the "single level" file "write" ops
-mlsconstrain { file lnk_file fifo_file } { write create setattr relabelfrom append unlink link rename mounton }
+mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
 	(( l1 eq l2 ) or
 	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
 	 ( t1 == mlsfilewrite ) or
 	 ( t2 == mlstrustedobject ));
 
-# the "ranged" file "write" ops
-mlsconstrain { dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
-	((( l1 dom l2 ) and ( l1 domby h2 )) or
-	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
-	 ( t1 == mlsfilewrite ) or
-	 ( t2 == mlstrustedobject ));
-
 mlsconstrain dir { add_name remove_name reparent rmdir }
 	((( l1 dom l2 ) and ( l1 domby h2 )) or
 	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.5/policy/modules/admin/anaconda.te
--- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/admin/anaconda.te	2006-08-07 19:45:48.000000000 -0400
@@ -25,8 +25,12 @@
 
 modutils_domtrans_insmod(anaconda_t)
 
+seutil_domtrans_semanage(anaconda_t)
+
 unconfined_domain(anaconda_t)
 
+userdom_generic_user_home_dir_filetrans_generic_user_home_content(anaconda_t,{ dir file lnk_file fifo_file sock_file })
+
 ifdef(`distro_redhat',`
 	bootloader_create_runtime_file(anaconda_t)
 ')
@@ -51,9 +55,7 @@
 	usermanage_domtrans_admin_passwd(anaconda_t)
 ')
 
-ifdef(`TODO',`
 optional_policy(`
-	role system_r types sysadm_ssh_agent_t;
-	domain_auto_trans(anaconda_t, ssh_agent_exec_t, sysadm_ssh_agent_t)
-')
+	ssh_domtrans_keygen(anaconda_t)
 ')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.5/policy/modules/admin/consoletype.te
--- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/admin/consoletype.te	2006-08-07 19:45:48.000000000 -0400
@@ -8,7 +8,12 @@
 
 type consoletype_t;
 type consoletype_exec_t;
-init_domain(consoletype_t,consoletype_exec_t)
+#dont transition from initrc
+#init_domain(consoletype_t,consoletype_exec_t)
+domain_type(consoletype_t)
+domain_entry_file(consoletype_t,consoletype_exec_t)
+role system_r types consoletype_t;
+
 mls_file_read_up(consoletype_t)
 mls_file_write_down(consoletype_t)
 role system_r types consoletype_t;
@@ -114,3 +119,7 @@
 	xen_append_log(consoletype_t)
 	xen_dontaudit_rw_unix_stream_sockets(consoletype_t)
 ')
+
+optional_policy(`
+	xen_dontaudit_use_fds(consoletype_t)
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.5/policy/modules/admin/firstboot.te
--- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/admin/firstboot.te	2006-08-07 19:45:48.000000000 -0400
@@ -106,7 +106,7 @@
 ')
 
 optional_policy(`
-	hal_dbus_send(firstboot_t)
+	hal_dbus_chat(firstboot_t)
 ')
 
 optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.5/policy/modules/admin/prelink.te
--- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/admin/prelink.te	2006-08-07 19:45:48.000000000 -0400
@@ -1,4 +1,3 @@
-
 policy_module(prelink,1.1.5)
 
 ########################################
@@ -74,6 +73,8 @@
 
 miscfiles_read_localization(prelink_t)
 
+selinux_get_enforce_mode(prelink_t)
+
 optional_policy(`
 	cron_system_entry(prelink_t, prelink_exec_t)
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.5/policy/modules/admin/rpm.fc
--- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/admin/rpm.fc	2006-08-07 19:45:48.000000000 -0400
@@ -19,6 +19,8 @@
 /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
 /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 /usr/sbin/up2date		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+/usr/bin/apt-get		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+/usr/bin/apt-shell		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 ')
 
 /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.5/policy/modules/admin/usermanage.te
--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/admin/usermanage.te	2006-08-07 19:45:48.000000000 -0400
@@ -260,7 +260,7 @@
 ')
 
 optional_policy(`
-	nscd_exec(groupadd_t)
+	nscd_domtrans(groupadd_t)
 	nscd_socket_use(groupadd_t)
 ')
 
@@ -535,7 +535,7 @@
 ')
 
 optional_policy(`
-	nscd_exec(useradd_t)
+	nscd_domtrans(useradd_t)
 	nscd_socket_use(useradd_t)
 ')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.5/policy/modules/apps/mozilla.if
--- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-07-14 17:04:31.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/apps/mozilla.if	2006-08-07 19:45:48.000000000 -0400
@@ -63,6 +63,7 @@
 	allow $1_mozilla_t self:unix_stream_socket { listen accept };
 	# Browse the web, connect to printer
 	allow $1_mozilla_t self:tcp_socket create_socket_perms;
+	allow $1_mozilla_t self:netlink_route_socket r_netlink_socket_perms;
 
 	# for bash - old mozilla binary
 	can_exec($1_mozilla_t, mozilla_exec_t)
@@ -175,6 +176,7 @@
 	logging_send_syslog_msg($1_mozilla_t)
 
 	miscfiles_read_fonts($1_mozilla_t)
+	miscfiles_read_localization($1_mozilla_t)
 
 	# Browse the web, connect to printer
 	sysnet_dns_name_resolve($1_mozilla_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.5/policy/modules/kernel/corecommands.fc
--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-02 10:34:05.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/kernel/corecommands.fc	2006-08-07 19:45:48.000000000 -0400
@@ -62,6 +62,7 @@
 /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
 
 /etc/xen/scripts(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+/etc/xen/qemu-ifup		--	gen_context(system_u:object_r:bin_t,s0)
 
 ifdef(`distro_debian',`
 /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.5/policy/modules/kernel/corenetwork.te.in
--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/kernel/corenetwork.te.in	2006-08-07 19:45:48.000000000 -0400
@@ -73,6 +73,7 @@
 network_port(dhcpc, udp,68,s0)
 network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
 network_port(dict, tcp,2628,s0)
+network_port(setroubleshoot, tcp,3267,s0)
 network_port(distccd, tcp,3632,s0)
 network_port(dns, udp,53,s0, tcp,53,s0)
 network_port(fingerd, tcp,79,s0)
@@ -84,7 +85,7 @@
 network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy
 network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp,8009,s0)
 network_port(howl, tcp,5335,s0, udp,5353,s0)
-network_port(hplip, tcp,50000,s0, tcp,50002,s0, tcp,1782,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0)
+network_port(hplip, tcp,50000,s0, tcp,50002,s0, tcp,2208,s0, tcp,2207,s0, tcp,1782,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0)
 network_port(i18n_input, tcp,9010,s0)
 network_port(imaze, tcp,5323,s0, udp,5323,s0)
 network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.5/policy/modules/kernel/devices.te
--- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/kernel/devices.te	2006-08-07 19:45:48.000000000 -0400
@@ -166,7 +166,7 @@
 dev_node(vmware_device_t)
 
 type watchdog_device_t;
-dev_node(vmware_device_t)
+dev_node(watchdog_device_t)
 
 type xen_device_t;
 dev_node(xen_device_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.5/policy/modules/kernel/files.if
--- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/kernel/files.if	2006-08-07 19:45:48.000000000 -0400
@@ -2934,6 +2934,24 @@
 
 ########################################
 ## <summary>
+##	Do not audit attempts to search the tmp directory (/tmp).
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`files_dontaudit_search_tmp',`
+	gen_require(`
+		type tmp_t;
+	')
+
+	dontaudit $1 tmp_t:dir search_dir_perms;
+')
+
+########################################
+## <summary>
 ##	Read the tmp directory (/tmp).
 ## </summary>
 ## <param name="domain">
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.5/policy/modules/kernel/filesystem.te
--- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/kernel/filesystem.te	2006-08-07 19:45:48.000000000 -0400
@@ -24,6 +24,7 @@
 fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
 fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
 fs_use_xattr gfs2 gen_context(system_u:object_r:fs_t,s0);
+fs_use_xattr gfs gen_context(system_u:object_r:fs_t,s0);
 fs_use_xattr jfs gen_context(system_u:object_r:fs_t,s0);
 fs_use_xattr xfs gen_context(system_u:object_r:fs_t,s0);
 
@@ -181,7 +182,6 @@
 genfscon hfs / gen_context(system_u:object_r:nfs_t,s0)
 genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0)
 genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
-genfscon gfs / gen_context(system_u:object_r:nfs_t,s0)
 
 ########################################
 #
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.5/policy/modules/kernel/kernel.if
--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/kernel/kernel.if	2006-08-07 19:45:48.000000000 -0400
@@ -1456,6 +1456,42 @@
 
 ########################################
 ## <summary>
+##	Allow search the kernel key ring.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`kernel_search_key',`
+	gen_require(`
+		type kernel_t;
+	')
+
+	allow $1 kernel_t:key search;
+')
+
+########################################
+## <summary>
+##	Allow link to the kernel key ring.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`kernel_link_key',`
+	gen_require(`
+		type kernel_t;
+	')
+
+	allow $1 kernel_t:key link;
+')
+
+########################################
+## <summary>
 ##	Read filesystem sysctls.
 ## </summary>
 ## <param name="domain">
@@ -2099,3 +2135,42 @@
 
 	typeattribute $1 kern_unconfined;
 ')
+
+########################################
+## <summary>
+##	Do not audit attempts to list sysctl_type directories.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`kernel_dontaudit_list_sysctls',`
+	gen_require(`
+		attribute sysctl_type;
+	')
+
+	dontaudit $1 sysctl_type:dir list_dir_perms;
+')
+
+
+########################################
+## <summary>
+##	Do not audit attempts to list proc_type file/directories.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`kernel_dontaudit_list_all_proc',`
+	gen_require(`
+		attribute proc_type;
+	')
+
+	dontaudit $1 proc_type:dir list_dir_perms;
+	dontaudit $1 proc_type:file getattr;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.5/policy/modules/kernel/terminal.if
--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-02 10:34:05.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/kernel/terminal.if	2006-08-07 19:45:48.000000000 -0400
@@ -308,6 +308,7 @@
 		type devpts_t;
 	')
 
+	dev_dontaudit_list_all_dev_nodes($1)
 	dontaudit $1 devpts_t:dir search;
 ')
 
@@ -948,3 +949,21 @@
 	dontaudit $1 ttynode:chr_file { read write };
 ')
 
+########################################
+## <summary>
+##	Get the attributes of a pty filesystem
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`term_getattr_ptys_fs',`
+	gen_require(`
+		type devpts_t;
+	')
+
+	allow $1 devpts_t:filesystem getattr;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.5/policy/modules/services/amavis.te
--- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/amavis.te	2006-08-07 19:45:48.000000000 -0400
@@ -62,10 +62,12 @@
 allow amavis_t amavis_quarantine_t:dir create_dir_perms;
 
 # Spool Files
+files_search_spool(amavis_t)
 allow amavis_t amavis_spool_t:dir manage_dir_perms;
 allow amavis_t amavis_spool_t:file manage_file_perms;
 allow amavis_t amavis_spool_t:sock_file manage_file_perms;
 files_spool_filetrans(amavis_t,amavis_spool_t,{ dir file })
+type_transition amavis_t amavis_spool_t:sock_file amavis_var_run_t;
 
 # tmp files
 allow amavis_t amavis_tmp_t:file create_file_perms;
@@ -116,6 +118,7 @@
 # bind to incoming port
 corenet_tcp_bind_amavisd_recv_port(amavis_t)
 corenet_udp_bind_generic_port(amavis_t)
+corenet_tcp_connect_razor_port(amavis_t)
 
 dev_read_rand(amavis_t)
 dev_read_urand(amavis_t)
@@ -180,3 +183,7 @@
 	spamassassin_exec(amavis_t)
 	spamassassin_exec_client(amavis_t)
 ')
+
+optional_policy(`
+	postfix_read_config(amavis_t)
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.5/policy/modules/services/apache.te
--- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/apache.te	2006-08-07 19:45:48.000000000 -0400
@@ -273,7 +273,6 @@
 sysnet_read_config(httpd_t)
 
 userdom_use_unpriv_users_fds(httpd_t)
-userdom_dontaudit_search_sysadm_home_dirs(httpd_t)
 
 mta_send_mail(httpd_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.5/policy/modules/services/avahi.te
--- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/avahi.te	2006-08-07 19:45:48.000000000 -0400
@@ -79,6 +79,7 @@
 
 sysnet_read_config(avahi_t)
 sysnet_use_ldap(avahi_t)
+miscfiles_read_certs(avahi_t)
 
 userdom_dontaudit_use_unpriv_user_fds(avahi_t)
 userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.5/policy/modules/services/bind.te
--- nsaserefpolicy/policy/modules/services/bind.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/bind.te	2006-08-07 19:45:48.000000000 -0400
@@ -226,6 +226,7 @@
 allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
 
 allow ndc_t dnssec_t:file { getattr read };
+allow ndc_t dnssec_t:lnk_file { getattr read };
 
 allow ndc_t named_t:tcp_socket { connectto recvfrom };
 allow ndc_t named_t:unix_stream_socket connectto;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.5/policy/modules/services/bluetooth.te
--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/bluetooth.te	2006-08-07 19:45:48.000000000 -0400
@@ -247,3 +247,8 @@
 optional_policy(`
        	xserver_stream_connect_xdm(bluetooth_helper_t)
 ')	
+
+optional_policy(`
+	nis_use_ypbind(bluetooth_helper_t)
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.5/policy/modules/services/clamav.if
--- nsaserefpolicy/policy/modules/services/clamav.if	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/clamav.if	2006-08-07 19:45:48.000000000 -0400
@@ -102,3 +102,4 @@
 	allow clamscan_t $1:fifo_file rw_file_perms;
 	allow clamscan_t $1:process sigchld;
 ')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.5/policy/modules/services/cron.if
--- nsaserefpolicy/policy/modules/services/cron.if	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/cron.if	2006-08-07 19:45:48.000000000 -0400
@@ -181,6 +181,7 @@
 	allow $1_crontab_t $2:fd use;
 	allow $1_crontab_t $2:fifo_file rw_file_perms;
 	allow $1_crontab_t $2:process sigchld;
+	allow $2 $1_crontab_t:process sigchld;
 
 	# crontab shows up in user ps
 	allow $2 $1_crontab_t:dir { search getattr read };
@@ -194,14 +195,19 @@
 	# Allow crond to read those crontabs in cron spool.
 	allow crond_t $1_cron_spool_t:file create_file_perms;
 
+	allow $1_crontab_t tmp_t:dir rw_dir_perms;
+	allow $1_crontab_t $1_tmp_t:file create_file_perms;
+	type_transition $1_crontab_t tmp_t:file $1_tmp_t;
+
 	# dac_override is to create the file in the directory under /tmp
-	allow $1_crontab_t self:capability { setuid setgid chown dac_override };
+	allow $1_crontab_t self:capability { fowner setuid setgid chown dac_override };
 	allow $1_crontab_t self:process signal_perms;
 
 	# create files in /var/spool/cron
-	allow $1_crontab_t $1_cron_spool_t:file create_file_perms;
+	files_search_spool($1_crontab_t)
 	allow $1_crontab_t cron_spool_t:dir rw_dir_perms;
-	type_transition $1_crontab_t $1_cron_spool_t:file $1_cron_spool_t;
+	allow $1_crontab_t $1_cron_spool_t:file create_file_perms;
+	type_transition $1_crontab_t cron_spool_t:file $1_cron_spool_t;
 
 	# crontab signals crond by updating the mtime on the spooldir
 	allow $1_crontab_t cron_spool_t:dir setattr;
@@ -239,6 +245,10 @@
 	# Read user crontabs
 	userdom_read_user_home_content_files($1,$1_crontab_t)
 
+	optional_policy(`
+		nscd_socket_use($1_crontab_t)
+	')
+
 	tunable_policy(`fcron_crond', `
 		# fcron wants an instant update of a crontab change for the administrator
 		# also crontab does a security check for crontab -u
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.5/policy/modules/services/cups.te
--- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/cups.te	2006-08-07 19:45:48.000000000 -0400
@@ -81,6 +81,7 @@
 allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
 allow cupsd_t self:unix_dgram_socket create_socket_perms;
 allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
+allow cupsd_t self:netlink_selinux_socket create_socket_perms;
 allow cupsd_t self:netlink_route_socket r_netlink_socket_perms;
 allow cupsd_t self:tcp_socket { create_stream_socket_perms connectto acceptfrom recvfrom };
 allow cupsd_t self:udp_socket create_socket_perms;
@@ -153,6 +154,8 @@
 dev_read_sysfs(cupsd_t)
 dev_read_usbfs(cupsd_t)
 
+domain_read_all_domains_state(cupsd_t)
+
 fs_getattr_all_fs(cupsd_t)
 fs_search_auto_mountpoints(cupsd_t)
 # from old usercanread attrib:
@@ -202,7 +205,8 @@
 # invoking ghostscript needs to read fonts
 miscfiles_read_fonts(cupsd_t)
 
-seutil_dontaudit_read_config(cupsd_t)
+seutil_read_config(cupsd_t)
+selinux_compute_access_vector(cupsd_t)
 
 sysnet_read_config(cupsd_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.5/policy/modules/services/dbus.if
--- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/dbus.if	2006-08-07 19:45:48.000000000 -0400
@@ -171,6 +171,11 @@
 		xserver_use_xdm_fds($1_dbusd_t)
 		xserver_rw_xdm_pipes($1_dbusd_t)
 	')
+
+	optional_policy(`
+		hal_dbus_chat($1_dbusd_t)
+	')
+
 ')
 
 #######################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.5/policy/modules/services/ldap.te
--- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/ldap.te	2006-08-07 19:45:48.000000000 -0400
@@ -72,7 +72,7 @@
 
 allow slapd_t slapd_var_run_t:file create_file_perms;
 allow slapd_t slapd_var_run_t:dir rw_dir_perms;
-files_pid_filetrans(slapd_t,slapd_var_run_t,file)
+files_pid_filetrans(slapd_t,slapd_var_run_t,{ file socket })
 
 kernel_read_system_state(slapd_t)
 kernel_read_kernel_sysctls(slapd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.5/policy/modules/services/nis.te
--- nsaserefpolicy/policy/modules/services/nis.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/nis.te	2006-08-07 19:45:48.000000000 -0400
@@ -249,8 +249,6 @@
 allow ypserv_t self:unix_dgram_socket create_socket_perms;
 allow ypserv_t self:unix_stream_socket create_stream_socket_perms;
 allow ypserv_t self:netlink_route_socket r_netlink_socket_perms;
-allow ypserv_t self:tcp_socket connected_stream_socket_perms;
-allow ypserv_t self:udp_socket create_socket_perms;
 
 allow ypserv_t var_yp_t:dir rw_dir_perms;
 allow ypserv_t var_yp_t:file create_file_perms;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.5/policy/modules/services/ntp.te
--- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/ntp.te	2006-08-07 19:45:48.000000000 -0400
@@ -32,7 +32,7 @@
 
 # sys_resource and setrlimit is for locking memory
 # ntpdate wants sys_nice
-allow ntpd_t self:capability { chown dac_override kill setgid setuid sys_time ipc_lock sys_chroot sys_nice sys_resource };
+allow ntpd_t self:capability { chown dac_override kill setgid setuid sys_time ipc_lock net_bind_service sys_chroot sys_nice sys_resource };
 dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
 allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
 allow ntpd_t self:fifo_file { read write getattr };
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.5/policy/modules/services/pegasus.if
--- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/pegasus.if	2006-08-07 19:45:48.000000000 -0400
@@ -1 +1,32 @@
 ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
+
+########################################
+## <summary>
+##	Execute a domain transition to run pegasus.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed to transition.
+##	</summary>
+## </param>
+#
+interface(`pegasus_domtrans',`
+	gen_require(`
+		type pegasus_t, pegasus_exec_t;
+	')
+
+	ifdef(`targeted_policy',`
+		if(pegasus_disable_trans) {
+			can_exec($1,pegasus_exec_t)
+		} else {
+			domain_auto_trans($1,pegasus_exec_t,pegasus_t)
+		}
+	', `
+		domain_auto_trans($1,pegasus_exec_t,pegasus_t)
+	')
+
+	allow $1 pegasus_t:fd use;
+	allow pegasus_t $1:fd use;
+	allow pegasus_t $1:fifo_file rw_file_perms;
+	allow pegasus_t $1:process sigchld;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.5/policy/modules/services/pegasus.te
--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/pegasus.te	2006-08-07 19:45:48.000000000 -0400
@@ -100,13 +100,12 @@
 
 auth_use_nsswitch(pegasus_t)
 auth_domtrans_chk_passwd(pegasus_t)
+auth_read_shadow(pegasus_t)
 
 domain_use_interactive_fds(pegasus_t)
 domain_read_all_domains_state(pegasus_t)
 
-files_read_etc_files(pegasus_t)
-files_list_var_lib(pegasus_t)
-files_read_var_lib_files(pegasus_t)
+files_read_all_files(pegasus_t)
 files_read_var_lib_symlinks(pegasus_t)
 
 hostname_exec(pegasus_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.5/policy/modules/services/postfix.te
--- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/postfix.te	2006-08-07 19:45:48.000000000 -0400
@@ -250,6 +250,7 @@
 allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
 
 allow postfix_cleanup_t postfix_spool_bounce_t:dir r_dir_perms;
+corecmd_exec_bin(postfix_cleanup_t)
 
 ########################################
 #
@@ -293,6 +294,10 @@
 	procmail_domtrans(postfix_local_t)
 ')
 
+optional_policy(`
+	clamav_search_lib(postfix_local_t)
+')
+
 ########################################
 #
 # Postfix map local policy
@@ -519,6 +524,7 @@
 allow postfix_qmgr_t postfix_spool_bounce_t:dir { getattr read search };
 allow postfix_qmgr_t postfix_spool_bounce_t:file { read getattr };
 allow postfix_qmgr_t postfix_spool_bounce_t:lnk_file { getattr read };
+corecmd_exec_bin(postfix_qmgr_t)
 
 ########################################
 #
@@ -589,6 +595,7 @@
 # for OpenSSL certificates
 files_read_usr_files(postfix_smtpd_t)
 mta_read_aliases(postfix_smtpd_t)
+corecmd_exec_bin(postfix_smtpd_t)
 
 optional_policy(`
 	postgrey_stream_connect(postfix_smtpd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.5/policy/modules/services/procmail.te
--- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/procmail.te	2006-08-07 19:45:48.000000000 -0400
@@ -29,6 +29,7 @@
 kernel_read_kernel_sysctls(procmail_t)
 
 corenet_non_ipsec_sendrecv(procmail_t)
+corenet_udp_bind_inaddr_any_node(procmail_t)
 corenet_tcp_sendrecv_all_if(procmail_t)
 corenet_udp_sendrecv_all_if(procmail_t)
 corenet_tcp_sendrecv_all_nodes(procmail_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.5/policy/modules/services/samba.te
--- nsaserefpolicy/policy/modules/services/samba.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/samba.te	2006-08-07 19:45:48.000000000 -0400
@@ -191,7 +191,7 @@
 allow smbd_t samba_etc_t:dir rw_dir_perms;
 allow smbd_t samba_etc_t:file { rw_file_perms setattr };
 
-allow smbd_t samba_log_t:dir { ra_dir_perms setattr };
+allow smbd_t samba_log_t:dir { create ra_dir_perms setattr };
 dontaudit smbd_t samba_log_t:dir remove_name;
 allow smbd_t samba_log_t:file { create ra_file_perms };
 
@@ -367,7 +367,7 @@
 allow nmbd_t samba_etc_t:dir { search getattr };
 allow nmbd_t samba_etc_t:file { getattr read };
 
-allow nmbd_t samba_log_t:dir { ra_dir_perms setattr };
+allow nmbd_t samba_log_t:dir { create ra_dir_perms setattr };
 allow nmbd_t samba_log_t:file { create ra_file_perms };
 
 allow nmbd_t samba_var_t:dir rw_dir_perms;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.5/policy/modules/services/setroubleshoot.fc
--- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
+++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.fc	2006-08-07 19:45:48.000000000 -0400
@@ -0,0 +1,9 @@
+# setroubleshoot executables
+
+/usr/sbin/setroubleshootd		--	gen_context(system_u:object_r:setroubleshootd_exec_t,s0)
+
+/var/run/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_run_t,s0)
+
+/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
+
+/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.5/policy/modules/services/setroubleshoot.if
--- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
+++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.if	2006-08-07 19:45:48.000000000 -0400
@@ -0,0 +1,3 @@
+## <summary>policy for setroubleshoot</summary>
+
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.5/policy/modules/services/setroubleshoot.te
--- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
+++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.te	2006-08-07 19:45:48.000000000 -0400
@@ -0,0 +1,105 @@
+policy_module(setroubleshoot,1.0.0)
+
+########################################
+#
+# Declarations 
+#
+
+type setroubleshootd_t;
+type setroubleshootd_exec_t;
+domain_type(setroubleshootd_t)
+init_daemon_domain(setroubleshootd_t, setroubleshootd_exec_t)
+typealias setroubleshootd_t alias setroubleshoot_t;
+
+# log files
+type setroubleshoot_var_log_t;
+logging_log_file(setroubleshoot_var_log_t)
+
+# pid files
+type setroubleshoot_var_run_t;
+files_pid_file(setroubleshoot_var_run_t)
+
+type setroubleshoot_var_lib_t;
+files_type(setroubleshoot_var_lib_t)
+
+########################################
+#
+# setroubleshootd local policy
+#
+allow setroubleshootd_t self:capability { dac_override sys_tty_config };
+allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
+allow setroubleshootd_t self:process { signal getattr };
+allow setroubleshootd_t self:fifo_file { read write };
+allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+allow setroubleshootd_t self:unix_dgram_socket create_socket_perms;
+allow setroubleshootd_t self:netlink_route_socket r_netlink_socket_perms;
+
+files_dontaudit_getattr_tmp_dirs(setroubleshootd_t)
+files_dontaudit_search_home(setroubleshootd_t)
+files_read_usr_files(setroubleshootd_t)
+files_read_etc_files(setroubleshootd_t)
+
+libs_use_ld_so(setroubleshootd_t)
+libs_use_shared_libs(setroubleshootd_t)
+miscfiles_read_localization(setroubleshootd_t)
+
+logging_send_syslog_msg(setroubleshootd_t)
+logging_audit_stream_connect(setroubleshootd_t)
+
+# pid file
+files_search_pids(setroubleshootd_t)
+allow setroubleshootd_t setroubleshoot_var_run_t:file manage_file_perms;
+allow setroubleshootd_t setroubleshoot_var_run_t:sock_file manage_file_perms;
+allow setroubleshootd_t setroubleshoot_var_run_t:dir rw_dir_perms;
+files_pid_filetrans(setroubleshootd_t,setroubleshoot_var_run_t, { file sock_file })
+
+# log files
+logging_search_logs(setroubleshootd_t)
+allow setroubleshootd_t setroubleshoot_var_log_t:file create_file_perms;
+allow setroubleshootd_t setroubleshoot_var_log_t:sock_file create_file_perms;
+allow setroubleshootd_t setroubleshoot_var_log_t:dir { rw_dir_perms setattr };
+logging_log_filetrans(setroubleshootd_t,setroubleshoot_var_log_t,{ file dir })
+
+# database files
+allow setroubleshootd_t setroubleshoot_var_lib_t:file create_file_perms;
+allow setroubleshootd_t setroubleshoot_var_lib_t:dir { rw_dir_perms setattr };
+files_var_lib_filetrans(setroubleshootd_t,setroubleshoot_var_lib_t,{ file dir })
+corenet_tcp_bind_generic_node(setroubleshootd_t)
+corenet_tcp_bind_lo_node(setroubleshootd_t)
+corenet_tcp_bind_setroubleshoot_port(setroubleshootd_t)
+corenet_non_ipsec_sendrecv(setroubleshootd_t)
+corenet_tcp_sendrecv_generic_if(setroubleshootd_t)
+corenet_raw_sendrecv_generic_if(setroubleshootd_t)
+corenet_tcp_sendrecv_all_nodes(setroubleshootd_t)
+corenet_raw_sendrecv_all_nodes(setroubleshootd_t)
+corenet_tcp_sendrecv_all_ports(setroubleshootd_t)
+corenet_tcp_bind_all_nodes(setroubleshootd_t)
+corenet_tcp_connect_smtp_port(setroubleshootd_t)
+
+corecmd_exec_sbin(setroubleshootd_t)
+corecmd_exec_bin(setroubleshootd_t)
+
+dev_read_urand(setroubleshootd_t)
+
+kernel_read_kernel_sysctls(setroubleshootd_t)
+kernel_read_system_state(setroubleshootd_t)
+
+init_read_utmp(setroubleshootd_t)
+init_dontaudit_write_utmp(setroubleshootd_t)
+init_use_fds(setroubleshootd_t)
+
+sysnet_read_config(setroubleshootd_t)
+
+seutil_read_config(setroubleshootd_t)
+selinux_get_enforce_mode(setroubleshootd_t)
+
+term_dontaudit_use_console(setroubleshootd_t)
+term_dontaudit_use_generic_ptys(setroubleshootd_t)
+
+optional_policy(`
+	rpm_read_db(setroubleshootd_t)
+	rpm_dontaudit_manage_db(setroubleshootd_t)
+')
+
+files_dontaudit_search_tmp(setroubleshootd_t)
+files_dontaudit_search_src(setroubleshootd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.5/policy/modules/services/spamassassin.te
--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:04:41.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/spamassassin.te	2006-08-07 19:45:48.000000000 -0400
@@ -194,3 +194,7 @@
 optional_policy(`
 	udev_read_db(spamd_t)
 ')
+
+optional_policy(`
+	postfix_read_config(spamd_t)
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.5/policy/modules/services/squid.te
--- nsaserefpolicy/policy/modules/services/squid.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/squid.te	2006-08-07 19:45:48.000000000 -0400
@@ -28,9 +28,9 @@
 # Local policy
 #
 
-allow squid_t self:capability { setgid setuid dac_override };
+allow squid_t self:capability { setgid setuid dac_override sys_resource };
 dontaudit squid_t self:capability sys_tty_config;
-allow squid_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+allow squid_t self:process ~{ ptrace setcurrent setexec setfscreate execmem execstack execheap };
 allow squid_t self:fifo_file rw_file_perms;
 allow squid_t self:sock_file r_file_perms;
 allow squid_t self:fd use;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.5/policy/modules/services/ssh.if
--- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/ssh.if	2006-08-07 19:45:48.000000000 -0400
@@ -1,5 +1,4 @@
 ## <summary>Secure shell client and server policy.</summary>
-
 #######################################
 ## <summary>
 ##	Basic SSH client template.
@@ -717,3 +716,27 @@
 
 	dontaudit $1 sshd_key_t:file { getattr read };
 ')
+
+
+########################################
+## <summary>
+##	Execute ssh_keygen_exec_t in the ssh_keygen_t domain.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`ssh_domtrans_keygen',`
+	gen_require(`
+		type ssh_keygen_t, ssh_keygen_exec_t;
+	')
+
+	domain_auto_trans($1,ssh_keygen_exec_t,ssh_keygen_t)
+
+	allow $1 ssh_keygen_t:fd use;
+	allow ssh_keygen_t $1:fd use;
+	allow ssh_keygen_t $1:fifo_file rw_file_perms;
+	allow ssh_keygen_t $1:process sigchld;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.5/policy/modules/services/stunnel.te
--- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/stunnel.te	2006-08-07 19:45:48.000000000 -0400
@@ -105,6 +105,10 @@
 	')
 
 	optional_policy(`
+        	mount_send_nfs_client_request(stunnel_t)
+	')
+
+	optional_policy(`
         	seutil_sigchld_newrole(stunnel_t)
 	')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.5/policy/modules/services/xserver.if
--- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/xserver.if	2006-08-07 19:45:48.000000000 -0400
@@ -120,7 +119,9 @@
 	dev_setattr_generic_dirs($1_xserver_t)
 	# raw memory access is needed if not using the frame buffer
 	dev_read_raw_memory($1_xserver_t)
-	dev_write_raw_memory($1_xserver_t)
+	dev_wx_raw_memory($1_xserver_t)
+	dev_rw_sysfs($1_xserver_t)
+	
 	# for other device nodes such as the NVidia binary-only driver
 	dev_rw_xserver_misc($1_xserver_t)
 	# read events - the synaptics touchpad driver reads raw events
@@ -160,6 +161,10 @@
 	sysnet_read_config($1_xserver_t)
 
 	optional_policy(`
+		apm_stream_connect($1_xserver_t)
+	')
+
+	optional_policy(`
 		auth_search_pam_console_data($1_xserver_t)
 	')
 
@@ -1125,7 +1130,47 @@
 	')
 
 	files_search_tmp($1)
-	allow $1 xdm_xserver_tmp_t:dir search_dir_perms;
+	xserver_search_xdm_xserver_tmp_dir($1)
 	allow $1 xdm_xserver_tmp_t:sock_file write;
 	allow $1 xdm_xserver_t:unix_stream_socket connectto;
 ')
+
+
+########################################
+## <summary>
+##	search xdm temporary directory
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit
+##	</summary>
+## </param>
+#
+interface(`xserver_search_xdm_xserver_tmp_dir',`
+	gen_require(`
+		type xdm_xserver_tmp_t;
+	')
+
+	allow $1 xdm_xserver_tmp_t:dir search_dir_perms;
+')
+
+########################################
+## <summary>
+##	Create a named socket in a ice
+##	temporary directory.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`xserver_create_ice_tmp_sockets',`
+	gen_require(`
+		type ice_tmp_t;
+	')
+
+	files_search_tmp($1)
+	allow $1 ice_tmp_t:dir ra_dir_perms;
+	allow $1 ice_tmp_t:sock_file create_file_perms;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.5/policy/modules/services/xserver.te
--- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-02 10:34:07.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/services/xserver.te	2006-08-07 19:45:48.000000000 -0400
@@ -81,7 +81,7 @@
 #
 
 allow xdm_t self:capability { setgid setuid sys_resource kill sys_tty_config mknod chown dac_override dac_read_search fowner fsetid ipc_owner sys_nice sys_rawio net_bind_service };
-allow xdm_t self:process { setexec setpgid setsched setrlimit signal_perms setkeycreate };
+allow xdm_t self:process { setexec setpgid getsched setsched setrlimit signal_perms setkeycreate };
 allow xdm_t self:fifo_file rw_file_perms;
 allow xdm_t self:shm create_shm_perms;
 allow xdm_t self:sem create_sem_perms;
@@ -89,7 +89,9 @@
 allow xdm_t self:unix_dgram_socket create_socket_perms;
 allow xdm_t self:tcp_socket create_stream_socket_perms;
 allow xdm_t self:udp_socket create_socket_perms;
-allow xdm_t self:key write;
+allow xdm_t self:socket create_socket_perms;
+allow xdm_t self:appletalk_socket create_socket_perms;
+allow xdm_t self:key { search write };
 
 # Supress permission check on .ICE-unix
 dontaudit xdm_t ice_tmp_t:dir { getattr setattr };
@@ -106,6 +108,7 @@
 
 kernel_read_system_state(xdm_t)
 kernel_read_kernel_sysctls(xdm_t)
+kernel_read_network_state(xdm_t)
 
 corecmd_exec_shell(xdm_t)
 corecmd_exec_bin(xdm_t)
@@ -154,6 +157,7 @@
 domain_dontaudit_read_all_domains_state(xdm_t)
 
 files_read_etc_files(xdm_t)
+files_read_var_files(xdm_t)
 files_read_etc_runtime_files(xdm_t)
 files_exec_etc_files(xdm_t)
 files_list_mnt(xdm_t)
@@ -257,7 +261,7 @@
 	allow xdm_t xdm_xserver_tmp_t:sock_file unlink;
 	allow xdm_t xdm_xserver_tmp_t:file unlink;
 
-	allow xdm_t xserver_log_t:dir { rw_dir_perms setattr };
+	allow xdm_t xserver_log_t:dir { create_dir_perms setattr };
 	allow xdm_t xserver_log_t:file manage_file_perms;
 	allow xdm_t xserver_log_t:fifo_file manage_file_perms;
 	logging_log_filetrans(xdm_t,xserver_log_t,file)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.5/policy/modules/system/fstools.te
--- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/fstools.te	2006-08-07 19:45:48.000000000 -0400
@@ -111,6 +111,7 @@
 corecmd_read_sbin_files(fsadm_t)
 corecmd_read_sbin_pipes(fsadm_t)
 corecmd_read_sbin_sockets(fsadm_t)
+corecmd_exec_shell(fsadm_t)
 
 domain_use_interactive_fds(fsadm_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.5/policy/modules/system/hostname.te
--- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/hostname.te	2006-08-07 19:45:48.000000000 -0400
@@ -8,7 +8,10 @@
 
 type hostname_t;
 type hostname_exec_t;
-init_system_domain(hostname_t,hostname_exec_t)
+
+#dont transition from initrc
+domain_type(hostname_t)
+domain_entry_file(hostname_t,hostname_exec_t)
 role system_r types hostname_t;
 
 ########################################
@@ -56,6 +59,7 @@
 sysnet_read_config(hostname_t)
 sysnet_dns_name_resolve(hostname_t)
 
-
-
+optional_policy(`
+	xen_dontaudit_use_fds(hostname_t)
+')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.5/policy/modules/system/init.if
--- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:04:44.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/init.if	2006-08-07 19:45:48.000000000 -0400
@@ -158,13 +158,6 @@
 	allow $1 initrc_t:fifo_file rw_file_perms;
 	allow $1 initrc_t:process sigchld;
 
-	ifdef(`hide_broken_symptoms',`
-		# RHEL4 systems seem to have a stray
-		# fds open from the initrd
-		ifdef(`distro_rhel4',`
-			kernel_dontaudit_use_fds($1)
-		')
-	')
 ')
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.5/policy/modules/system/libraries.fc
--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/libraries.fc	2006-08-07 19:45:48.000000000 -0400
@@ -200,7 +200,7 @@
 /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libavcodec-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-/usr/lib(64)?/libavutil-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/lib(64)?/libavutil.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.5/policy/modules/system/locallogin.te
--- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/locallogin.te	2006-08-07 19:45:48.000000000 -0400
@@ -47,7 +47,7 @@
 allow local_login_t self:sem create_sem_perms;
 allow local_login_t self:msgq create_msgq_perms;
 allow local_login_t self:msg { send receive };
-allow local_login_t self:key write;
+allow local_login_t self:key { search write };
 
 allow local_login_t local_login_lock_t:file create_file_perms;
 files_lock_filetrans(local_login_t,local_login_lock_t,file)
@@ -58,6 +58,8 @@
 
 kernel_read_system_state(local_login_t)
 kernel_read_kernel_sysctls(local_login_t)
+kernel_search_key(local_login_t)
+kernel_link_key(local_login_t)
 
 dev_setattr_mouse_dev(local_login_t)
 dev_getattr_mouse_dev(local_login_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.5/policy/modules/system/logging.fc
--- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/logging.fc	2006-08-07 19:45:48.000000000 -0400
@@ -38,3 +38,6 @@
 /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
 
 /var/tinydns/log/main(/.*)?	gen_context(system_u:object_r:var_log_t,s0)
+
+/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
+/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.5/policy/modules/system/logging.if
--- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/logging.if	2006-08-07 19:45:48.000000000 -0400
@@ -553,3 +553,24 @@
 	allow $1 var_log_t:dir rw_dir_perms;
 	allow $1 var_log_t:file create_file_perms;
 ')
+
+########################################
+## <summary>
+##	Connect to auditdstored over an unix stream socket.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`logging_audit_stream_connect',`
+	gen_require(`
+		type auditd_t, auditd_var_run_t;
+	')
+
+	files_search_pids($1)
+	allow $1 auditd_var_run_t:dir search;
+	allow $1 auditd_var_run_t:sock_file rw_file_perms;
+	allow $1 auditd_t:unix_stream_socket connectto;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.5/policy/modules/system/logging.te
--- nsaserefpolicy/policy/modules/system/logging.te	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/logging.te	2006-08-07 19:45:48.000000000 -0400
@@ -120,9 +120,10 @@
 allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
 allow auditd_t var_log_t:dir search;
 
+allow auditd_t auditd_var_run_t:sock_file create_file_perms;
 allow auditd_t auditd_var_run_t:file create_file_perms;
 allow auditd_t auditd_var_run_t:dir rw_dir_perms;
-files_pid_filetrans(auditd_t,auditd_var_run_t,file)
+files_pid_filetrans(auditd_t,auditd_var_run_t,{ file sock_file })
 
 kernel_read_kernel_sysctls(auditd_t)
 # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.5/policy/modules/system/miscfiles.fc
--- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/miscfiles.fc	2006-08-07 19:45:48.000000000 -0400
@@ -9,6 +9,7 @@
 # /etc
 #
 /etc/localtime		--	gen_context(system_u:object_r:locale_t,s0)
+/etc/avahi/etc/localtime --	gen_context(system_u:object_r:locale_t,s0)
 /etc/pki(/.*)?			gen_context(system_u:object_r:cert_t,s0)
 
 #
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.5/policy/modules/system/mount.te
--- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/mount.te	2006-08-07 19:45:48.000000000 -0400
@@ -97,6 +97,8 @@
 
 sysnet_use_portmap(mount_t)
 
+selinux_get_enforce_mode(mount_t)
+
 userdom_use_all_users_fds(mount_t)
 
 ifdef(`distro_redhat',`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.5/policy/modules/system/selinuxutil.te
--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/selinuxutil.te	2006-08-07 20:14:05.000000000 -0400
@@ -355,6 +355,8 @@
 kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
 kernel_relabelfrom_unlabeled_pipes(restorecon_t)
 kernel_relabelfrom_unlabeled_sockets(restorecon_t)
+kernel_dontaudit_list_all_proc(restorecon_t)
+kernel_dontaudit_list_sysctls(restorecon_t)
 
 dev_relabel_all_dev_nodes(restorecon_t)
 # cjp: why is this needed?
@@ -593,6 +595,9 @@
 
 miscfiles_read_localization(semanage_t)
 
+allow semanage_t default_context_t:dir rw_dir_perms;
+allow semanage_t default_context_t:file create_file_perms;
+
 seutil_search_default_contexts(semanage_t)
 seutil_manage_file_contexts(semanage_t)
 seutil_manage_selinux_config(semanage_t)
@@ -613,6 +618,10 @@
 	userdom_read_generic_user_home_content_files(semanage_t)
 ')
 
+ifdef(`enable_mls',`
+	userdom_read_user_tmp_files(secadm, semanage_t)
+')
+
 optional_policy(`
 	nscd_socket_use(semanage_t)
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.5/policy/modules/system/udev.fc
--- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/udev.fc	2006-08-07 19:45:48.000000000 -0400
@@ -1,5 +1,6 @@
 # udev
 
+/dev/\.udev(/.*)?	gen_context(system_u:object_r:udev_tbl_t,s0)
 /dev/\.udevdb	--	gen_context(system_u:object_r:udev_tbl_t,s0)
 /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.5/policy/modules/system/unconfined.if
--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/unconfined.if	2006-08-07 19:45:48.000000000 -0400
@@ -20,6 +20,7 @@
 	# Use any Linux capability.
 	allow $1 self:capability *;
 	allow $1 self:fifo_file create_file_perms;
+	allow $1 self:key *;
 
 	# Transition to myself, to make get_ordered_context_list happy.
 	allow $1 self:process transition;
@@ -37,6 +38,7 @@
 	dev_unconfined($1)
 	domain_unconfined($1)
 	domain_dontaudit_read_all_domains_state($1)
+	domain_dontaudit_ptrace_all_domains($1)
 	files_unconfined($1)
 	fs_unconfined($1)
 	selinux_unconfined($1)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.5/policy/modules/system/unconfined.te
--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/unconfined.te	2006-08-07 19:45:48.000000000 -0400
@@ -195,4 +195,9 @@
 ifdef(`targeted_policy',`
 	allow unconfined_execmem_t self:process { execstack execmem };
 	unconfined_domain_noaudit(unconfined_execmem_t)
+	optional_policy(`
+		init_dbus_chat_script(unconfined_execmem_t)
+		dbus_stub(unconfined_execmem_t)
+		unconfined_dbus_chat(unconfined_execmem_t)
+	')
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.5/policy/modules/system/userdomain.if
--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/userdomain.if	2006-08-07 19:45:48.000000000 -0400
@@ -8,11 +8,10 @@
 ## <desc>
 ##	<p>
 ##	This template creates a user domain, types, and
-##	rules for the user's tty, pty, home directories,
-##	tmp, and tmpfs files.
+##	rules for the user's tty, pty, tmp, and tmpfs files.
 ##	</p>
 ##	<p>
-##	This generally should not be used, rather the
+##	This should only be used for new non login user roles, rather the
 ##	unpriv_user_template or admin_user_template should
 ##	be used.
 ##	</p>
@@ -25,7 +24,9 @@
 ## </param>
 #
 template(`base_user_template',`
-
+	gen_require(`
+		attribute userdomain, unpriv_userdomain;
+	')
 	attribute $1_file_type;
 
 	type $1_t, userdomain;
@@ -42,44 +43,17 @@
 	term_user_pty($1_t,$1_devpts_t)
 	files_type($1_devpts_t)
 
-	# type for contents of home directory
-	type $1_home_t, $1_file_type, home_type;
-	files_type($1_home_t)
-	files_associate_tmp($1_home_t)
-	fs_associate_tmpfs($1_home_t)
-
-	# type of home directory
-	type $1_home_dir_t, home_dir_type, home_type;
-	files_type($1_home_dir_t)
-	files_associate_tmp($1_home_dir_t)
-	fs_associate_tmpfs($1_home_dir_t)
-
 	type $1_tmp_t, $1_file_type;
 	files_tmp_file($1_tmp_t)
 
 	type $1_tmpfs_t;
 	files_tmpfs_file($1_tmpfs_t)
 
-	# types for network-obtained content
-	type $1_untrusted_content_t, $1_file_type, untrusted_content_type; #, customizable
-	files_type($1_untrusted_content_t)
-	files_poly_member($1_untrusted_content_t)
-
-	type $1_untrusted_content_tmp_t, $1_file_type, untrusted_content_tmp_type; # customizable
-	files_tmp_file($1_untrusted_content_tmp_t)
-
 	type $1_tty_device_t; 
 	term_tty($1_t,$1_tty_device_t)
 
 	##############################
 	#
-	# User home directory file rules
-	#
-
-	allow $1_file_type $1_home_t:filesystem associate;
-
-	##############################
-	#
 	# User domain Local policy
 	#
 
@@ -103,19 +77,6 @@
 	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
 	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
 
-	# execute files in the home directory
-	can_exec($1_t,$1_home_t)
-
-	# full control of the home directory
-	allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto entrypoint };
-	allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto };
-	allow $1_t $1_home_t:dir { create_dir_perms relabelfrom relabelto };
-	allow $1_t $1_home_t:sock_file { create_file_perms relabelfrom relabelto };
-	allow $1_t $1_home_t:fifo_file { create_file_perms relabelfrom relabelto };
-	allow $1_t $1_home_dir_t:dir { create_dir_perms relabelfrom relabelto };
-	type_transition $1_t $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
-	files_search_home($1_t)
-
 	can_exec($1_t,$1_tmp_t)
 
 	# user temporary files
@@ -138,15 +99,16 @@
 	fs_tmpfs_filetrans($1_t,$1_tmpfs_t, { dir notdevfile_class_set } )
 
 	allow $1_t $1_tty_device_t:chr_file { setattr rw_file_perms };
-
-	# Allow user to relabel untrusted content
-	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:dir { create_dir_perms relabelto relabelfrom };
-	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:file { getattr unlink relabelto relabelfrom rename };
+	allow $1_t $1_devpts_t:chr_file { setattr rw_file_perms };
+	term_create_pty($1_t,$1_devpts_t)
 
 	allow $1_t unpriv_userdomain:fd use;
 
+	kernel_read_system_state($1_t)
+	kernel_read_network_state($1_t)
 	kernel_read_kernel_sysctls($1_t)
 	kernel_read_net_sysctls($1_t)
+	kernel_read_fs_sysctls($1_t)
 	kernel_dontaudit_list_unlabeled($1_t)
 	kernel_dontaudit_getattr_unlabeled_files($1_t)
 	kernel_dontaudit_getattr_unlabeled_symlinks($1_t)
@@ -165,8 +127,10 @@
 
 	corenet_non_ipsec_sendrecv($1_t)
 	corenet_tcp_sendrecv_all_if($1_t)
+	corenet_raw_sendrecv_all_if($1_t)
 	corenet_udp_sendrecv_all_if($1_t)
 	corenet_tcp_sendrecv_all_nodes($1_t)
+	corenet_raw_sendrecv_all_nodes($1_t)
 	corenet_udp_sendrecv_all_nodes($1_t)
 	corenet_tcp_sendrecv_all_ports($1_t)
 	corenet_udp_sendrecv_all_ports($1_t)
@@ -193,6 +157,7 @@
 	fs_getattr_all_fs($1_t)
 	fs_getattr_all_dirs($1_t)
 	fs_search_auto_mountpoints($1_t)
+	fs_list_inotifyfs($1_t)
 
 	# cjp: some of this probably can be removed
 	selinux_get_fs_mount($1_t)
@@ -234,6 +199,11 @@
 	files_dontaudit_getattr_non_security_sockets($1_t)
 	files_dontaudit_getattr_non_security_blk_files($1_t)
 	files_dontaudit_getattr_non_security_chr_files($1_t)
+	files_read_var_files($1_t)
+	files_read_etc_files($1_t)
+	files_read_etc_runtime_files($1_t)
+	files_read_usr_files($1_t)
+	files_exec_usr_files($1_t)
 
 	# Caused by su - init scripts
 	init_dontaudit_use_script_ptys($1_t)
@@ -254,16 +224,88 @@
 	seutil_read_default_contexts($1_t)
 	seutil_run_newrole($1_t,$1_r,{ $1_devpts_t $1_tty_device_t })
 
-	tunable_policy(`allow_execmem',`
-		# Allow loading DSOs that require executable stack.
-		allow $1_t self:process execmem;
-	')
+	sysnet_dns_name_resolve($1_t)
 
-	tunable_policy(`allow_execmem && allow_execstack',`
-		# Allow making the stack executable via mprotect.
-		allow $1_t self:process execstack;
+')
+#######################################
+## <summary>
+##	The template containing rules common to unprivileged
+##	users and administrative users.
+## </summary>
+## <desc>
+##	<p>
+##	This template creates a user home directories,
+##	</p>
+##	<p>
+##	This generally should not be used, rather the
+##	unpriv_user_template or admin_user_template should
+##	be used.
+##	</p>
+## </desc>
+## <param name="userdomain_prefix">
+##	<summary>
+##	The prefix of the user domain (e.g., user
+##	is the prefix for user_t).
+##	</summary>
+## </param>
+#
+template(`base_login_user_template',`
+
+	gen_require(`
+		attribute $1_file_type;
+		attribute home_dir_type, home_type;
+		attribute untrusted_content_type;
 	')
 
+	# type for contents of home directory
+	type $1_home_t, $1_file_type, home_type;
+	files_type($1_home_t)
+	files_associate_tmp($1_home_t)
+	fs_associate_tmpfs($1_home_t)
+
+	# type of home directory
+	type $1_home_dir_t, home_dir_type, home_type;
+	files_type($1_home_dir_t)
+	files_associate_tmp($1_home_dir_t)
+	fs_associate_tmpfs($1_home_dir_t)
+
+	# types for network-obtained content
+	type $1_untrusted_content_t, $1_file_type, untrusted_content_type; #, customizable
+	files_type($1_untrusted_content_t)
+	files_poly_member($1_untrusted_content_t)
+
+	type $1_untrusted_content_tmp_t, $1_file_type, untrusted_content_tmp_type; # customizable
+	files_tmp_file($1_untrusted_content_tmp_t)
+
+	##############################
+	#
+	# User home directory file rules
+	#
+
+	allow $1_file_type $1_home_t:filesystem associate;
+
+	##############################
+	#
+	# User domain Local policy
+	#
+
+	# execute files in the home directory
+	can_exec($1_t,$1_home_t)
+
+	# full control of the home directory
+	allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto entrypoint };
+	allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto };
+	allow $1_t $1_home_t:dir { create_dir_perms relabelfrom relabelto };
+	allow $1_t $1_home_t:sock_file { create_file_perms relabelfrom relabelto };
+	allow $1_t $1_home_t:fifo_file { create_file_perms relabelfrom relabelto };
+	allow $1_t $1_home_dir_t:dir { create_dir_perms relabelfrom relabelto };
+	type_transition $1_t $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
+	files_search_home($1_t)
+
+	# Allow user to relabel untrusted content
+	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:dir { create_dir_perms relabelto relabelfrom };
+	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:file { getattr unlink relabelto relabelfrom rename };
+
 	tunable_policy(`read_default_t',`
 		files_list_default($1_t)
 		files_read_default_files($1_t)
@@ -322,6 +364,10 @@
 	')
 
 	optional_policy(`
+		alsa_read_rw_config($1_t)
+	')
+
+	optional_policy(`
 		canna_stream_connect($1_t)
 	')
 
@@ -472,6 +518,7 @@
 		xserver_read_xdm_pid($1_t)
 		# gnome-session creates socket under /tmp/.ICE-unix/
 		xserver_create_xdm_tmp_sockets($1_t)
+		xserver_create_ice_tmp_sockets($1_t)
 	')
 ')
 
@@ -501,6 +548,7 @@
 
 	# Inherit rules for ordinary users.
 	base_user_template($1)
+	base_login_user_template($1)
 
 	typeattribute $1_t unpriv_userdomain;
 	domain_interactive_fd($1_t)
@@ -521,9 +569,6 @@
 	# Local policy
 	#
 
-	allow $1_t $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
-	term_create_pty($1_t,$1_devpts_t)
-
 	# Rules used to associate a homedir as a mountpoint
 	allow $1_home_t self:filesystem associate;
 	allow $1_file_type $1_home_t:filesystem associate;
@@ -535,10 +580,6 @@
 	allow privhome $1_home_t:sock_file create_file_perms;
 	allow privhome $1_home_t:fifo_file create_file_perms;
 	type_transition privhome $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
-
-	kernel_read_system_state($1_t)
-	kernel_read_network_state($1_t)
-
 	dev_read_sysfs($1_t)
 
 	corecmd_exec_all_executables($1_t)
@@ -546,11 +587,8 @@
 	# port access is audited even if dac would not have allowed it, so dontaudit it here
 	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
 
-	files_read_etc_files($1_t)
-	files_read_etc_runtime_files($1_t)
+
 	files_list_home($1_t)
-	files_read_usr_files($1_t)
-	files_exec_usr_files($1_t)
 	# Read directories and files with the readable_t type.
 	# This type is a general type for "world"-readable files.
 	files_list_world_readable($1_t)
@@ -558,8 +596,6 @@
 	files_read_world_readable_symlinks($1_t)
 	files_read_world_readable_pipes($1_t)
 	files_read_world_readable_sockets($1_t)
-	# cjp: why?
-	files_read_kernel_symbol_table($1_t)
 
 	init_read_utmp($1_t)
 	# The library functions always try to open read-write first,
@@ -748,6 +784,7 @@
 
 	# Inherit rules for ordinary users.
 	base_user_template($1)
+	base_login_user_template($1)
 
 	typeattribute $1_t privhome;
 	domain_obj_id_change_exemption($1_t)
@@ -783,11 +820,6 @@
 
 	allow $1_t self:netlink_audit_socket nlmsg_readpriv;
 
-	allow $1_t $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
-	term_create_pty($1_t,$1_devpts_t)
-
-	kernel_read_system_state($1_t)
-	kernel_read_network_state($1_t)
 	kernel_read_software_raid_state($1_t)
 	kernel_getattr_core_if($1_t)
 	kernel_getattr_message_if($1_t)
@@ -855,6 +887,7 @@
 	domain_getattr_all_sockets($1_t)
 
 	files_exec_usr_src_files($1_t)
+	files_create_boot_flag($1_t)
 
 	init_rw_initctl($1_t)
 
@@ -3408,6 +3441,25 @@
 
 ########################################
 ## <summary>
+##	Do not audit attempts to append to the sysadm
+##	users home directory.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`userdom_dontaudit_append_sysadm_home_content_files',`
+	gen_require(`
+		type sysadm_home_t;
+	')
+
+	dontaudit $1 sysadm_home_t:file append;
+')
+
+########################################
+## <summary>
 ##	Read files in the staff users home directory.
 ## </summary>
 ## <param name="domain">
@@ -4128,7 +4180,7 @@
 	gen_require(`
 		type user_home_dir_t;
 	')
-
+	allow $1 user_home_dir_t:dir manage_dir_perms;
 	files_home_filetrans($1,user_home_dir_t,dir)
 ')
 
@@ -4789,3 +4841,34 @@
 	allow $1 user_home_dir_t:dir create_dir_perms;
 	files_home_filetrans($1,user_home_dir_t,dir)
 ')
+
+########################################
+## <summary>
+##	The template containing rules for changing from one role to another
+## </summary>
+## <desc>
+##	<p>
+##	This should only be used for new non login user roles, rather the
+##	unpriv_user_template or admin_user_template should
+##	be used.
+##	</p>
+## </desc>
+## <param name="userdomain_prefix">
+##	<summary>
+##	userdomain changing from 
+##	</summary>
+## </param>
+## <param name="userdomain_prefix">
+##	<summary>
+##	userdomain changing to
+##	</summary>
+## </param>
+#
+template(`role_change_template',`
+        allow $1_r $2_r;
+        type_change $2_t $1_devpts_t:chr_file $2_devpts_t;
+        type_change $2_t $1_tty_device_t:chr_file $2_tty_device_t;
+        # avoid annoying messages on terminal hangup
+        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.5/policy/modules/system/userdomain.te
--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/userdomain.te	2006-08-07 19:45:48.000000000 -0400
@@ -56,14 +56,6 @@
 # Local policy
 #
 
-define(`role_change',`
-	allow $1_r $2_r;
-	type_change $2_t $1_devpts_t:chr_file $2_devpts_t;
-	type_change $2_t $1_tty_device_t:chr_file $2_tty_device_t;
-	# avoid annoying messages on terminal hangup
-	dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
-')
-
 ifdef(`targeted_policy',`
 	# Define some type aliases to help with compatibility with
 	# macros and domains from the "strict" policy.
@@ -85,7 +77,7 @@
 	# compatibility for switching from strict
 #	dominance { role secadm_r { role system_r; }}
 #	dominance { role auditadm_r { role system_r; }}
-#	dominance { role sysadm_r { role system_r; }}
+	dominance { role sysadm_r { role system_r; }}
 #	dominance { role user_r { role system_r; }}
 #	dominance { role staff_r { role system_r; }}
 
@@ -124,34 +116,34 @@
 
 	# user role change rules:
 	# sysadm_r can change to user roles
-	role_change(sysadm, user)
-	role_change(sysadm, staff)
+	role_change_template(sysadm, user)
+	role_change_template(sysadm, staff)
 
 	# only staff_r can change to sysadm_r
-	role_change(staff, sysadm)
+	role_change_template(staff, sysadm)
 
 	ifdef(`enable_mls',`
 		unpriv_user_template(secadm)
 		unpriv_user_template(auditadm)
 
-		role_change(staff,auditadm)
-		role_change(staff,secadm)
+		role_change_template(staff,auditadm)
+		role_change_template(staff,secadm)
 
-		role_change(sysadm,secadm)
-		role_change(sysadm,auditadm)
+		role_change_template(sysadm,secadm)
+		role_change_template(sysadm,auditadm)
 
-		role_change(auditadm,secadm)
-		role_change(auditadm,sysadm)
+		role_change_template(auditadm,secadm)
+		role_change_template(auditadm,sysadm)
 
-		role_change(secadm,auditadm)
-		role_change(secadm,sysadm)
+		role_change_template(secadm,auditadm)
+		role_change_template(secadm,sysadm)
 	')
 
 	# this should be tunable_policy, but
 	# currently type_change and RBAC allow
 	# do not work in conditionals
 	ifdef(`user_canbe_sysadm',`
-		role_change(user,sysadm)
+		role_change_template(user,sysadm)
 	')
 
 	allow privhome home_root_t:dir { getattr search };
@@ -172,6 +164,8 @@
 
 	mls_process_read_up(sysadm_t)
 
+	term_getattr_all_user_ttys(sysadm_t)
+
 	init_exec(sysadm_t)
 
 	ifdef(`direct_sysadm_daemon',`
@@ -210,7 +204,9 @@
 		init_exec(secadm_t)
 		logging_read_audit_log(secadm_t)
 	        logging_read_generic_logs(secadm_t)
-		userdom_dontaudit_append_staff_home_content_files(secadm_t)
+		userdom_dontaudit_append_sysadm_home_content_files(secadm_t)
+		userdom_dontaudit_read_sysadm_home_content_files(secadm_t)
+
 	', `
 		logging_manage_audit_log(sysadm_t)
 		logging_manage_audit_config(sysadm_t)
@@ -443,11 +439,11 @@
 			selinux_set_parameters(secadm_t)
 
 			seutil_manage_bin_policy(secadm_t)
-			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
-			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
-			seutil_run_semanage(secadm_t,secadm_r,admin_terminal)
-			seutil_run_setfiles(secadm_t,secadm_r,admin_terminal)
-			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
+			seutil_run_checkpolicy(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_loadpolicy(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_semanage(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_setfiles(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_restorecon(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
 		', `
 			selinux_set_enforce_mode(sysadm_t)
 			selinux_set_boolean(sysadm_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.5/policy/modules/system/xen.if
--- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/xen.if	2006-08-07 19:45:48.000000000 -0400
@@ -127,3 +127,41 @@
 	allow xm_t $1:fifo_file rw_file_perms;
 	allow xm_t $1:process sigchld;
 ')
+
+
+########################################
+## <summary>
+##	Inherit and use xen file descriptors.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`xen_use_fds',`
+	gen_require(`
+		type xend_t;
+	')
+
+	allow $1 xend_t:fd use;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to inherit
+##	xen file descriptors.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`xen_dontaudit_use_fds',`
+	gen_require(`
+		type xend_t;
+	')
+
+	dontaudit $1 xend_t:fd use;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.5/policy/modules/system/xen.te
--- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
+++ serefpolicy-2.3.5/policy/modules/system/xen.te	2006-08-07 19:45:48.000000000 -0400
@@ -69,7 +69,10 @@
 #
 
 allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
+dontaudit xend_t self:capability { sys_ptrace };
 allow xend_t self:process { signal sigkill };
+dontaudit xend_t self:process ptrace;
+
 # internal communication is often done using fifo and unix sockets.
 allow xend_t self:fifo_file rw_file_perms;
 allow xend_t self:unix_stream_socket create_stream_socket_perms;
@@ -79,7 +82,7 @@
 allow xend_t self:packet_socket create_socket_perms;
 
 allow xend_t xen_image_t:dir r_dir_perms;
-allow xend_t xen_image_t:file r_file_perms;
+allow xend_t xen_image_t:file rw_file_perms;
 
 # pid file
 allow xend_t xend_var_run_t:file manage_file_perms;
@@ -130,6 +133,8 @@
 corenet_tcp_bind_soundd_port(xend_t)
 corenet_sendrecv_xen_server_packets(xend_t)
 corenet_sendrecv_soundd_server_packets(xend_t)
+corenet_tcp_bind_generic_port(xend_t)
+corenet_rw_tun_tap_dev(xend_t)
 
 dev_read_urand(xend_t)
 dev_manage_xen(xend_t)
@@ -138,19 +143,24 @@
 
 domain_read_all_domains_state(xend_t)
 domain_dontaudit_read_all_domains_state(xend_t)
+domain_dontaudit_ptrace_all_domains(xend_t)
 
 files_read_etc_files(xend_t)
 files_read_kernel_symbol_table(xend_t)
 files_read_kernel_img(xend_t)
 files_manage_etc_runtime_files(xend_t)
 files_etc_filetrans_etc_runtime(xend_t,file)
+files_read_usr_files(xend_t)
 
 storage_raw_read_fixed_disk(xend_t)
 
-term_dontaudit_getattr_all_user_ptys(xend_t)
-term_dontaudit_use_generic_ptys(xend_t)
+term_getattr_all_user_ptys(xend_t)
+term_use_generic_ptys(xend_t)
+term_use_ptmx(xend_t)
+term_getattr_ptys_fs(xend_t)
 
 init_use_fds(xend_t)
+init_use_script_ptys(xend_t)
 
 libs_use_ld_so(xend_t)
 libs_use_shared_libs(xend_t)
@@ -191,15 +201,18 @@
 allow xenconsoled_t xenconsoled_var_run_t:dir rw_dir_perms;
 files_pid_filetrans(xenconsoled_t,xenconsoled_var_run_t, { file sock_file })
 
+domain_dontaudit_ptrace_all_domains(xenconsoled_t)
+
 kernel_read_kernel_sysctls(xenconsoled_t)
 kernel_write_xen_state(xenconsoled_t)
 kernel_read_xen_state(xenconsoled_t)
 
 term_create_pty(xenconsoled_t,xen_devpts_t);
-term_dontaudit_use_generic_ptys(xenconsoled_t)
+term_use_generic_ptys(xenconsoled_t)
 term_use_console(xenconsoled_t)
 
 init_use_fds(xenconsoled_t)
+init_use_script_ptys(xenconsoled_t)
 
 libs_use_ld_so(xenconsoled_t)
 libs_use_shared_libs(xenconsoled_t)
@@ -238,10 +251,11 @@
 dev_filetrans_xen(xenstored_t)
 dev_rw_xen(xenstored_t)
 
-term_dontaudit_use_generic_ptys(xenstored_t)
-term_dontaudit_use_console(xenconsoled_t)
+term_use_generic_ptys(xenstored_t)
+term_use_console(xenconsoled_t)
 
 init_use_fds(xenstored_t)
+init_use_script_ptys(xenstored_t)
 
 libs_use_ld_so(xenstored_t)
 libs_use_shared_libs(xenstored_t)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	22 Jul 2006 18:03:11 -0000	1.59
+++ .cvsignore	8 Aug 2006 13:00:32 -0000	1.60
@@ -71,3 +71,4 @@
 serefpolicy-2.2.47.tgz
 serefpolicy-2.3.2.tgz
 serefpolicy-2.3.3.tgz
+serefpolicy-2.3.5.tgz


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- selinux-policy.spec	22 Jul 2006 18:03:11 -0000	1.177
+++ selinux-policy.spec	8 Aug 2006 13:00:32 -0000	1.178
@@ -15,12 +15,12 @@
 %define CHECKPOLICYVER 1.30.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.3
-Release: 8.fc5
+Version: 2.3.5
+Release: 1.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20060608.patch
+patch: policy-20060802.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -39,7 +39,6 @@
 BuildRequires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
 PreReq: policycoreutils >= %{POLICYCOREUTILSVER}
 Obsoletes: policy 
-Obsoletes: selinux-policy-devel
 
 %description 
 SELinux Base package
@@ -49,15 +48,29 @@
 %doc %{_usr}/share/doc/%{name}-%{version}
 %dir %{_usr}/share/selinux
 %dir %{_sysconfdir}/selinux
-%dir %{_usr}/share/selinux/devel
-%dir %{_usr}/share/selinux/devel/include
 %ghost %config(noreplace) %{_sysconfdir}/selinux/config
 %ghost %{_sysconfdir}/sysconfig/selinux
+
+%package devel
+Summary: SELinux policy development
+Group: System Environment/Base
+Prereq: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
+Prereq: selinux-policy = %{version}-%{release}
+
+%description devel
+SELinux Policy development package
+
+%files devel
+%dir %{_usr}/share/selinux/devel
+%dir %{_usr}/share/selinux/devel/include
 %{_usr}/share/selinux/devel/include/*
 %{_usr}/share/selinux/devel/Makefile
 %{_usr}/share/selinux/devel/policygentool
 %{_usr}/share/selinux/devel/example.*
 %attr(755,root,root) %{_usr}/share/selinux/devel/policyhelp
+%dir %{_usr}/share/selinux/targeted
+%dir %{_usr}/share/selinux/strict
+%dir %{_usr}/share/selinux/mls
 
 %define setupCmds() \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 bare \
@@ -65,6 +78,9 @@
 cp -f ${RPM_SOURCE_DIR}/modules-%1.conf  ./policy/modules.conf \
 cp -f ${RPM_SOURCE_DIR}/booleans-%1.conf ./policy/booleans.conf \
 
+%define moduleList() %([ -f %{_sourcedir}/modules-%{1}.conf ] && \
+awk '$1 !~ "/^#/" && $2 == "=" && $3 == "module" { printf "-i %%s.pp ", $1 }' %{_sourcedir}/modules-%{1}.conf )
+
 %define installCmds() \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 base.pp \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 modules \
@@ -91,7 +107,6 @@
 
 %define fileList() \
 %defattr(-,root,root) \
-%dir %{_usr}/share/selinux/%1 \
 %{_usr}/share/selinux/%1/*.pp \
 %dir %{_sysconfdir}/selinux/%1 \
 %config(noreplace) %{_sysconfdir}/selinux/%1/setrans.conf \
@@ -130,8 +145,7 @@
 
 %define rebuildpolicy() \
 ( cd /usr/share/selinux/%1; \
-x=`ls *.pp | grep -v -e base.pp -e enableaudit.pp | awk '{ print "-i " $1 }'`; \
-semodule -b base.pp $x -s %1; \
+semodule -b base.pp %{expand:%%moduleList %1} -s %1; \
 );\
 rm -f %{_sysconfdir}/selinux/%1/policy/policy.*.rpmnew
 
@@ -160,6 +174,9 @@
 touch %{buildroot}%{_sysconfdir}/selinux/config
 touch %{buildroot}%{_sysconfdir}/sysconfig/selinux
 
+# Always create policy module package directories
+mkdir -p %{buildroot}%{_usr}/share/selinux/{targeted,strict,mls}/
+
 # Install devel
 make clean
 make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=%3 install-headers install-docs
@@ -232,6 +249,16 @@
 ">> /etc/selinux/config
 fi
 
+%postun
+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
+
 %if %{BUILD_TARGETED}
 %package targeted
 Summary: SELinux targeted base policy
@@ -280,9 +307,6 @@
 %rebuildpolicy mls
 %relabel mls
 
-%triggerpostun mls -- mls <= 2.0.7
-%{rebuildpolicy} mls 
-
 %files mls
 %fileList mls
 
@@ -315,7 +339,7 @@
 semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init -r libraries -r locallogin -r logging -r lvm -r miscfiles -r modutils -r mount -r mta -r netutils -r selinuxutil -r storage -r sysnetwork -r udev -r userdomain -r vpnc -r xend $x -s strict
 
 %triggerpostun strict -- strict <= 2.0.7
-%{rebuildpolicy} strict 
+%rebuildpolicy strict 
 
 %files strict
 %fileList strict
@@ -323,6 +347,54 @@
 %endif
 
 %changelog
+* Tue Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 2.3.5-1.fc5
+- Bump for FC5
+
+* Mon Aug 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.5-1
+- Fix setroubleshootd
+
+* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.4-1
+- Update to the latest from upstream
+
+* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-20
+- More fixes for xen
+
+* Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-19
+- Fix anaconda transitions
+
+* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-18
+- yet more xen rules
+ 
+* Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-17
+- more xen rules
+
+* Mon Jul 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-16
+- Fixes for Samba
+
+* Sat Jul 29 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-15
+- Fixes for xen
+
+* Fri Jul 28 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-14
+- Allow setroubleshootd to send mail
+
+* Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-13
+- Add nagios policy
+
+* Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-12
+-  fixes for setroubleshoot
+
+* Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-11
+- Added Paul Howarth patch to only load policy packages shipped 
+  with this package
+- Allow pidof from initrc to ptrace higher level domains
+- Allow firstboot to communicate with hal via dbus
+
+* Mon Jul 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-10
+- Add policy for /var/run/ldapi
+
+* Sat Jul 22 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-9
+- Fix setroubleshoot policy
+
 * Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-8.fc5
 - Bump for FC5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	22 Jul 2006 18:03:11 -0000	1.63
+++ sources	8 Aug 2006 13:00:32 -0000	1.64
@@ -1 +1 @@
-ccd4a3f6ed18a4309d0369e3d18bcd57  serefpolicy-2.3.3.tgz
+dd1d9d958535e36048d5470580d3f108  serefpolicy-2.3.5.tgz



From fedora-cvs-commits at redhat.com  Tue Aug  8 13:54:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 09:54:23 -0400
Subject: rpms/a2ps/devel a2ps-tmpdir.patch,1.1,1.2 a2ps.spec,1.37,1.38
Message-ID: <200608081354.k78DsN49020807@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	a2ps-tmpdir.patch a2ps.spec 
Log Message:
* Tue Aug  8 2006 Tim Waugh <twaugh at redhat.com> 4.13b-54
- Prevent fixps tmpdir problem (bug #188156).


a2ps-tmpdir.patch:
 fixps.in    |    3 +--
 pdiff.in    |    2 +-
 psmandup.in |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

Index: a2ps-tmpdir.patch
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps-tmpdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- a2ps-tmpdir.patch	15 Feb 2006 11:19:38 -0000	1.1
+++ a2ps-tmpdir.patch	8 Aug 2006 13:54:20 -0000	1.2
@@ -1,5 +1,5 @@
---- a2ps-4.13/contrib/psmandup.in.tmpdir	2006-02-15 11:03:50.000000000 +0000
-+++ a2ps-4.13/contrib/psmandup.in	2006-02-15 11:03:50.000000000 +0000
+--- a2ps-4.13/contrib/psmandup.in.tmpdir	1999-10-24 14:06:42.000000000 +0100
++++ a2ps-4.13/contrib/psmandup.in	2006-08-08 14:52:22.000000000 +0100
 @@ -36,7 +36,7 @@
  message=
  psselect=${PSSELECT:-psselect}
@@ -9,19 +9,34 @@
  
  # These two must be kept in synch.  They are opposed.
  verbose=echo
---- a2ps-4.13/contrib/fixps.in.tmpdir	2006-02-15 11:06:07.000000000 +0000
-+++ a2ps-4.13/contrib/fixps.in	2006-02-15 11:06:33.000000000 +0000
-@@ -38,7 +38,7 @@
+--- a2ps-4.13/contrib/fixps.in.tmpdir	2000-02-21 08:16:15.000000000 +0000
++++ a2ps-4.13/contrib/fixps.in	2006-08-08 14:53:36.000000000 +0100
+@@ -38,7 +38,6 @@
  run_gs=0
  # What action to perform: fixps, cat, check, and gs
  task=fixps
 -tmpdir=/tmp/$program.$$
-+tmpdir=$(mktemp -d /tmp/$program.XXXXXX)
  verbose=echo
  
  # The version/usage strings
---- a2ps-4.13/contrib/pdiff.in.tmpdir	2006-02-15 11:05:44.000000000 +0000
-+++ a2ps-4.13/contrib/pdiff.in	2006-02-15 11:05:56.000000000 +0000
+@@ -183,6 +182,7 @@
+       exit 1;;
+ esac
+ 
++tmpdir=$(mktemp -d /tmp/$program.XXXXXX)
+ if test -n "$debug"; then
+   # Set -x now if debugging
+   set -x
+@@ -191,7 +191,6 @@
+   trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
+ fi
+ 
+-mkdir $tmpdir
+ fixps_sed=$tmpdir/fixps.sed
+ 
+ # If printing from stdin, save into a tmp file
+--- a2ps-4.13/contrib/pdiff.in.tmpdir	1999-10-24 16:07:51.000000000 +0100
++++ a2ps-4.13/contrib/pdiff.in	2006-08-08 14:52:22.000000000 +0100
 @@ -34,7 +34,7 @@
  diff_options='-u'
  file=


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- a2ps.spec	14 Jul 2006 14:43:43 -0000	1.37
+++ a2ps.spec	8 Aug 2006 13:54:20 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
 Version: 4.13b
-Release: 53
+Release: 54
 License: GPL
 Group: Applications/Publishing
 Source: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -232,6 +232,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Tue Aug  8 2006 Tim Waugh <twaugh at redhat.com> 4.13b-54
+- Prevent fixps tmpdir problem (bug #188156).
+
 * Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com> 4.13b-53
 - Fixed Hebrew font names (bug #174304).
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 15:09:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 11:09:54 -0400
Subject: rpms/icu/devel icu.spec,1.21,1.22
Message-ID: <200608081509.k78F9sjG016692@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16674

Modified Files:
	icu.spec 
Log Message:
strict aliasing


Index: icu.spec
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- icu.spec	3 Aug 2006 10:44:47 -0000	1.21
+++ icu.spec	8 Aug 2006 15:09:52 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           icu
 Version:        3.6
-Release: 	0.1.d01
+Release: 	0.2.d01
 Summary:        International Components for Unicode
 
 Group:          System Environment/Libraries
@@ -59,6 +59,7 @@
 %build
 cd source
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 autoconf
 %configure --with-data-packaging=library --disable-samples
 make # %{?_smp_mflags} # -j(X>1) may "break" man pages as of 3.2, b.f.u #2357
@@ -134,6 +135,9 @@
 
 
 %changelog
+* Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 3.6-0.2.d01
+- c++ code not alias correct
+
 * Mon Jul 31 2006 Caolan McNamara <caolanm at redhat.com> - 3.6-0.1.d01
 - rh#200728# update to prelease 3.6d01 to pick up on sinhala fixes
 - drop integrated rh190879.patch



From fedora-cvs-commits at redhat.com  Tue Aug  8 15:17:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 11:17:55 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.824,1.825
Message-ID: <200608081517.k78FHt62031934@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
next rev


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.824
retrieving revision 1.825
diff -u -r1.824 -r1.825
--- openoffice.org.spec	7 Aug 2006 13:23:00 -0000	1.824
+++ openoffice.org.spec	8 Aug 2006 15:17:53 -0000	1.825
@@ -2516,8 +2516,8 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Aug 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
-- icu syntax changed :-(
+* Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
+- icu settext ownership of string data changed silently
 
 * Mon Jul 31 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.8
 - add openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch



From fedora-cvs-commits at redhat.com  Tue Aug  8 15:19:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 11:19:09 -0400
Subject: rpms/hsqldb/devel hsqldb.spec,1.23,1.24
Message-ID: <200608081519.k78FJ95F032055@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/hsqldb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32038

Modified Files:
	hsqldb.spec 
Log Message:

Fix regression re: missing shadow-utils prereq.




Index: hsqldb.spec
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- hsqldb.spec	4 Aug 2006 23:43:29 -0000	1.23
+++ hsqldb.spec	8 Aug 2006 15:19:06 -0000	1.24
@@ -38,7 +38,7 @@
 
 Name:		hsqldb
 Version:	1.8.0.4
-Release:	2jpp.1
+Release:	2jpp.2
 Epoch:		1
 Summary:	Hsqldb Database Engine
 License:	BSD Style
@@ -52,6 +52,7 @@
 Requires:	servletapi5
 Requires(post):   /bin/rm,/bin/ln
 Requires(preun): /bin/rm
+Requires(pre):	shadow-utils
 BuildRequires:	ant
 BuildRequires:	junit
 BuildRequires:	jpackage-utils >= 0:1.5
@@ -188,7 +189,7 @@
 # we need a shell to be able to use su - later
 %{_sbindir}/groupadd -g 96 -f -r %{name} 2> /dev/null || :
 %{_sbindir}/useradd -u 96 -g %{name} -s /sbin/nologin \
-     -d %{_localstatedir}/lib/%{name} -r %{name} 2> /dev/null || :
+    -d %{_localstatedir}/lib/%{name} -r %{name} 2> /dev/null || :
 
 %post
 rm -f %{_localstatedir}/lib/%{name}/lib/hsqldb.jar
@@ -252,6 +253,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Aug 08 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-2jpp.2
+- Fix regression re: missing shadow-utils prereq.
+
 * Fri Aug 04 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-2jpp.1
 - Add missing requirements.
 - Merge with fc spec.



From fedora-cvs-commits at redhat.com  Tue Aug  8 15:31:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 11:31:33 -0400
Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.13,
	1.14 intel-prune-by-edid-pixclock.patch, 1.1, 1.2 sources,
	1.13, 1.14 xorg-x11-drv-i810.spec, 1.29,
	1.30 intel-virtual-sizing-bogon.patch, 1.1, NONE
Message-ID: <200608081531.k78FVXQ8032427@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore intel-prune-by-edid-pixclock.patch sources 
	xorg-x11-drv-i810.spec 
Removed Files:
	intel-virtual-sizing-bogon.patch 
Log Message:
auto-import xorg-x11-drv-i810-1.6.0-14.20060808modeset.fc6 on branch devel from xorg-x11-drv-i810-1.6.0-14.20060808modeset.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	24 Jul 2006 18:23:23 -0000	1.13
+++ .cvsignore	8 Aug 2006 15:31:21 -0000	1.14
@@ -1 +1 @@
-xf86-video-intel-1.6.0-git-modesetting-20060717.tar.bz2
+xf86-video-intel-1.6.0-git-modesetting-20060808.tar.bz2

intel-prune-by-edid-pixclock.patch:
 i830_modes.c     |    8 +++++++-
 i830_xf86Modes.c |   21 +++++++++++++++++++++
 i830_xf86Modes.h |    4 ++++
 3 files changed, 32 insertions(+), 1 deletion(-)

Index: intel-prune-by-edid-pixclock.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/intel-prune-by-edid-pixclock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-prune-by-edid-pixclock.patch	3 Aug 2006 01:00:51 -0000	1.1
+++ intel-prune-by-edid-pixclock.patch	8 Aug 2006 15:31:21 -0000	1.2
@@ -1,5 +1,5 @@
---- xf86-video-intel/src/i830_xf86Modes.h.edid-pixclock	2006-07-24 14:13:53.000000000 -0400
-+++ xf86-video-intel/src/i830_xf86Modes.h	2006-08-02 17:57:59.000000000 -0400
+--- xf86-video-intel/src/i830_xf86Modes.h.edid-pixclock	2006-08-08 11:14:35.000000000 -0400
++++ xf86-video-intel/src/i830_xf86Modes.h	2006-08-08 11:22:48.000000000 -0400
 @@ -57,6 +57,10 @@
  			  MonPtr mon);
  
@@ -11,8 +11,8 @@
  i830xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList,
  			  Bool verbose);
  
---- xf86-video-intel/src/i830_modes.c.edid-pixclock	2006-07-24 14:13:53.000000000 -0400
-+++ xf86-video-intel/src/i830_modes.c	2006-08-02 18:28:04.000000000 -0400
+--- xf86-video-intel/src/i830_modes.c.edid-pixclock	2006-08-08 11:14:35.000000000 -0400
++++ xf86-video-intel/src/i830_modes.c	2006-08-08 11:23:19.000000000 -0400
 @@ -601,7 +601,7 @@
      xf86MonPtr ddc;
      MonPtr mon;
@@ -32,15 +32,15 @@
  	    break;
  	default:
  	    /* We probably don't care about trying to contruct ranges around
-@@ -642,6 +645,7 @@
- 	i830xf86ValidateModesSize(pScrn, userModes, ddc->features.hsize,
- 				  ddc->features.vsize, -1);
-     }
+@@ -638,6 +641,7 @@
+     userModes = i830DuplicateModes(pScrn, pScrn->monitor->Modes);
+ 
+     i830xf86ValidateModesSync(pScrn, userModes, mon);
 +    i830xf86ValidateModesClock(pScrn, userModes, mon);
      i830xf86PruneInvalidModes(pScrn, &userModes, TRUE);
  
      i830AppendModes(pScrn, &mon->Modes, userModes);
-@@ -806,6 +810,8 @@
+@@ -802,6 +806,8 @@
  				   V_INTERLACE);
  	i830xf86ValidateModesClocks(pScrn, pI830->pipeMon[pipe]->Modes,
  				    &minclock, &maxclock, 1);
@@ -49,8 +49,8 @@
  
  	i830xf86PruneInvalidModes(pScrn, &pI830->pipeMon[pipe]->Modes, TRUE);
  
---- xf86-video-intel/src/i830_xf86Modes.c.edid-pixclock	2006-07-24 14:13:53.000000000 -0400
-+++ xf86-video-intel/src/i830_xf86Modes.c	2006-08-02 17:57:59.000000000 -0400
+--- xf86-video-intel/src/i830_xf86Modes.c.edid-pixclock	2006-08-08 11:14:35.000000000 -0400
++++ xf86-video-intel/src/i830_xf86Modes.c	2006-08-08 11:22:48.000000000 -0400
 @@ -373,6 +373,27 @@
  }
  


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	24 Jul 2006 18:23:23 -0000	1.13
+++ sources	8 Aug 2006 15:31:21 -0000	1.14
@@ -1 +1 @@
-2a94ea7a4714f02d71a4f50935a0893b  xf86-video-intel-1.6.0-git-modesetting-20060717.tar.bz2
+666c06eedbe560fce410ab2f198bae5d  xf86-video-intel-1.6.0-git-modesetting-20060808.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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xorg-x11-drv-i810.spec	3 Aug 2006 01:00:51 -0000	1.29
+++ xorg-x11-drv-i810.spec	8 Aug 2006 15:31:21 -0000	1.30
@@ -8,13 +8,13 @@
 %define with_dri        0
 %endif
 
-%define gitdate 20060717
+%define gitdate 20060808
 
 # GIT SNAPSHOT.  EATS BABIES.
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   13.%{gitdate}modeset%{?dist}
+Release:   14.%{gitdate}modeset%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -25,7 +25,6 @@
 Source1:   i810.xinf
 
 Patch0: intel-prune-by-edid-pixclock.patch
-Patch1: intel-virtual-sizing-bogon.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -54,8 +53,9 @@
 %prep
 #%setup -q -n %{tarball}-%{version}
 %setup -q -n xf86-video-intel
+%if 0
 %patch0 -p1 -b .edid-pixclock
-%patch1 -p1 -b .virtual-bogon
+%endif
 
 %build
 ./autogen.sh --disable-static \
@@ -104,6 +104,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Tue Aug  8 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-14.20060808modeset.fc6
+- Today's snapshot: I2C bus creation fix.
+
 * Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-13.20060717modeset.fc6
 - intel-prune-by-edid-pixclock.patch: Honor the EDID-reported maximum pixel
   clock when computing the modes list.


--- intel-virtual-sizing-bogon.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  8 15:33:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 11:33:49 -0400
Subject: rpms/gnome-power-manager/devel
	gnome-power-manager-2.15.4-nodefaultbeep.patch, NONE,
	1.1 gnome-power-manager.spec, 1.52, 1.53
Message-ID: <200608081533.k78FXnfK032522@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32507

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.15.4-nodefaultbeep.patch 
Log Message:
- turn off beeps by default
- actually write a changelog message for this release! ;)


gnome-power-manager-2.15.4-nodefaultbeep.patch:
 gnome-power-manager.schemas.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-power-manager-2.15.4-nodefaultbeep.patch ---
--- gnome-power-manager-2.15.4/data/gnome-power-manager.schemas.in.nodefaultbeep	2006-08-08 11:26:38.000000000 -0400
+++ gnome-power-manager-2.15.4/data/gnome-power-manager.schemas.in	2006-08-08 11:26:48.000000000 -0400
@@ -6,7 +6,7 @@
       <applyto>/apps/gnome-power-manager/enable_pcskr_beeping</applyto>
       <owner>gnome-power-manager</owner>
       <type>bool</type>
-      <default>true</default>
+      <default>false</default>
       <locale name="C">
         <short>If the PC speaker (beeping) should be used</short>
         <long>If the PC speaker should be used to beep when the power is low, or inhibit requests have stopped the policy action.</long>


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-power-manager.spec	18 Jul 2006 20:22:23 -0000	1.52
+++ gnome-power-manager.spec	8 Aug 2006 15:33:43 -0000	1.53
@@ -5,10 +5,11 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.15.4
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
+Patch0: gnome-power-manager-2.5.14-nodefaultbeep.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .nodefaultbeep
 
 %build
 %configure --disable-scrollkeeper --disable-actions-menu --disable-policykit
@@ -103,6 +105,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Aug  8 2006 Peter Jones <pjones at redhat.com> - 2.15.4-3
+- Don't beep by default, since there's no UI to turn it off.
+
 * Tue Jul 18 2006 Ray Strode <rstrode at redhat.com> - 2.15.3-2
 - explicitly disable policykit since we don't ship it
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 15:34:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 11:34:12 -0400
Subject: rpms/xorg-x11-drv-i810/FC-5 xorg-x11-drv-i810.spec,1.11,1.12
Message-ID: <200608081534.k78FYCEI032566@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-i810/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32525

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
Add BuildRequires


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/FC-5/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	7 Aug 2006 02:54:22 -0000	1.11
+++ xorg-x11-drv-i810.spec	8 Aug 2006 15:33:59 -0000	1.12
@@ -20,6 +20,7 @@
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 BuildRequires: libXvMC-devel
+BuildRequires: libXext-devel
 
 Requires:  xorg-x11-server-Xorg
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 15:40:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 11:40:17 -0400
Subject: rpms/xorg-x11-drv-i810/FC-5 xorg-x11-drv-i810.spec,1.12,1.13
Message-ID: <200608081540.k78FeHDk010684@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-i810/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10640

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
Add another BuildRequires (libdrm this time)


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/FC-5/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	8 Aug 2006 15:33:59 -0000	1.12
+++ xorg-x11-drv-i810.spec	8 Aug 2006 15:40:14 -0000	1.13
@@ -21,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 BuildRequires: libXvMC-devel
 BuildRequires: libXext-devel
+BuildRequires: libdrm
 
 Requires:  xorg-x11-server-Xorg
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 15:44:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 11:44:25 -0400
Subject: rpms/control-center/FC-5 control-center.spec,1.138,1.139
Message-ID: <200608081544.k78FiPX1012073@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/control-center/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11984

Modified Files:
	control-center.spec 
Log Message:
- Rebuild against new evolution-data-server.



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/FC-5/control-center.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- control-center.spec	26 Jul 2006 19:57:40 -0000	1.138
+++ control-center.spec	8 Aug 2006 15:44:23 -0000	1.139
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.14.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -248,6 +248,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Aug  8 2006 Matthew Barnes <mbarnes at redhat.com> - 2.14.2-5.fc5
+- Rebuild against new evolution-data-server.
+
 * Wed Jul 26 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-4.fc5
 - Add devel package.
 - Add gnome-doc-utils build requires.



From fedora-cvs-commits at redhat.com  Tue Aug  8 15:44:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 11:44:40 -0400
Subject: rpms/xorg-x11-drv-i810/FC-5 xorg-x11-drv-i810.spec,1.13,1.14
Message-ID: <200608081544.k78Fieg8012183@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-i810/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12155

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
Uh, I mean, libdrm-devel


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/FC-5/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	8 Aug 2006 15:40:14 -0000	1.13
+++ xorg-x11-drv-i810.spec	8 Aug 2006 15:44:38 -0000	1.14
@@ -21,7 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 BuildRequires: libXvMC-devel
 BuildRequires: libXext-devel
-BuildRequires: libdrm
+BuildRequires: libdrm-devel
 
 Requires:  xorg-x11-server-Xorg
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 16:01:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 12:01:33 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.167,1.168
Message-ID: <200608081601.k78G1XC1000452@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Log Message:
add BR on gettext, cups



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kdelibs.spec	8 Aug 2006 10:24:12 -0000	1.167
+++ kdelibs.spec	8 Aug 2006 16:01:08 -0000	1.168
@@ -17,7 +17,7 @@
 %define arts 1
 
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -64,8 +64,11 @@
 Requires: shadow-utils
 Requires: libkdnssd
 
+BuildRequires: qt-devel-docs
+BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel >= %{cups_epoch}:1.1.20
+BuildRequires: cups >= %{cups_epoch}:1.1.20
 BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
@@ -100,7 +103,6 @@
 BuildRequires: db4-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: pkgconfig
-# glibc-kernheaders required for inotify support
 BuildRequires: glibc-kernheaders
 
 Obsoletes: %{name}2
@@ -396,6 +398,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Tue Aug 08 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
+- add BR on gettext, cups
+
 * Tue Aug 08 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 16:19:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 12:19:34 -0400
Subject: rpms/openais/devel revision-1173.patch, NONE,
	1.1 revision-1179.patch, NONE, 1.1 revision-1180.patch, NONE,
	1.1 revision-1181.patch, NONE, 1.1 revision-1182.patch, NONE,
	1.1 revision-1183.patch, NONE, 1.1 revision-1184.patch, NONE,
	1.1 revision-1185.patch, NONE, 1.1 revision-1186.patch, NONE,
	1.1 revision-1187.patch, NONE, 1.1 revision-1188.patch, NONE,
	1.1 revision-1189.patch, NONE, 1.1 revision-1190.patch, NONE,
	1.1 revision-1191.patch, NONE, 1.1 revision-1192.patch, NONE,
	1.1 revision-1193.patch, NONE, 1.1 openais.spec, 1.9, 1.10
Message-ID: <200608081619.k78GJYQl019783@cvs.devel.redhat.com>

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19724/devel

Modified Files:
	openais.spec 
Added Files:
	revision-1173.patch revision-1179.patch revision-1180.patch 
	revision-1181.patch revision-1182.patch revision-1183.patch 
	revision-1184.patch revision-1185.patch revision-1186.patch 
	revision-1187.patch revision-1188.patch revision-1189.patch 
	revision-1190.patch revision-1191.patch revision-1192.patch 
	revision-1193.patch 
Log Message:
auto-import openais-0.80-1.1 on branch devel from openais-0.80-1.1.src.rpm

revision-1173.patch:
 sync.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE revision-1173.patch ---
Index: exec/sync.c
===================================================================
--- exec/sync.c	(revision 1155)
+++ exec/sync.c	(revision 1173)
@@ -411,7 +411,7 @@
 	/*
 	 * This sync is complete so activate and start next service sync
 	 */
-	if (sync_callbacks.sync_activate) {
+	if (barrier_completed && sync_callbacks.sync_activate) {
 		sync_callbacks.sync_activate ();
 	
 		log_printf (LOG_LEVEL_NOTICE,

revision-1179.patch:
 saCkpt.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE revision-1179.patch ---
Index: include/saCkpt.h
===================================================================
--- include/saCkpt.h	(revision 1173)
+++ include/saCkpt.h	(revision 1179)
@@ -176,7 +176,7 @@
 
 SaAisErrorT
 saCkptCheckpointUnlink (
-	SaCkptCheckpointHandleT checkpointHandle,
+	SaCkptHandleT ckptHandle,
 	const SaNameT *checkpointName);
 
 SaAisErrorT

revision-1180.patch:
 print.c   |  124 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
 wthread.c |   25 +++++++++++-
 wthread.h |    2 -
 3 files changed, 124 insertions(+), 27 deletions(-)

--- NEW FILE revision-1180.patch ---
Index: exec/wthread.c
===================================================================
--- exec/wthread.c	(revision 1179)
+++ exec/wthread.c	(revision 1180)
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2005 MontaVista Software, Inc.
+ * Copyright (c) 2006 Red Hat, Inc.
  *
  * All rights reserved.
  *
@@ -75,8 +76,15 @@
 			&worker_thread->new_work_mutex);
 		}
 
+		/*
+		 * We unlock then relock the new_work_mutex to allow the
+		 * worker function to execute and also allow new work to be
+		 * added to the work queue
+	  	 */
 		data_for_worker_fn = queue_item_get (&worker_thread->queue);
+		pthread_mutex_unlock (&worker_thread->new_work_mutex);
 		worker_thread->worker_thread_group->worker_fn (orf_token_mcast_thread_state, data_for_worker_fn);
+		pthread_mutex_lock (&worker_thread->new_work_mutex);
 		queue_item_remove (&worker_thread->queue);
 		pthread_mutex_unlock (&worker_thread->new_work_mutex);
 		pthread_mutex_lock (&worker_thread->done_work_mutex);
@@ -109,8 +117,14 @@
 	}
 
 	for (i = 0; i < threads; i++) {
-		worker_thread_group->threads[i].thread_state = malloc (thread_state_size);
-		thread_state_constructor (worker_thread_group->threads[i].thread_state);
+		if (thread_state_size) {
+			worker_thread_group->threads[i].thread_state = malloc (thread_state_size);
+		} else {
+			worker_thread_group->threads[i].thread_state = NULL;
+		}
+		if (thread_state_constructor) {
+			thread_state_constructor (worker_thread_group->threads[i].thread_state);
+		}
 		worker_thread_group->threads[i].worker_thread_group = worker_thread_group;
 		pthread_mutex_init (&worker_thread_group->threads[i].new_work_mutex, NULL);
 		pthread_cond_init (&worker_thread_group->threads[i].new_work_cond, NULL);
@@ -128,7 +142,7 @@
 	return (0);
 }
 
-void worker_thread_group_work_add (
+int worker_thread_group_work_add (
 	struct worker_thread_group *worker_thread_group,
 	void *item)
 {
@@ -138,9 +152,14 @@
 	worker_thread_group->last_scheduled = schedule;
 
 	pthread_mutex_lock (&worker_thread_group->threads[schedule].new_work_mutex);
+	if (queue_is_full (&worker_thread_group->threads[schedule].queue)) {
+		pthread_mutex_unlock (&worker_thread_group->threads[schedule].new_work_mutex);
+		return (-1);
+	}
 	queue_item_add (&worker_thread_group->threads[schedule].queue, item);
 	pthread_cond_signal (&worker_thread_group->threads[schedule].new_work_cond);
 	pthread_mutex_unlock (&worker_thread_group->threads[schedule].new_work_mutex);
+	return (0);
 }
 
 void worker_thread_group_wait (
Index: exec/wthread.h
===================================================================
--- exec/wthread.h	(revision 1179)
+++ exec/wthread.h	(revision 1180)
@@ -51,7 +51,7 @@
 	void (*thread_state_constructor)(void *),
 	void (*worker_fn)(void *thread_state, void *work_item));
 
-extern void worker_thread_group_work_add (
+extern int worker_thread_group_work_add (
 	struct worker_thread_group *worker_thread_group,
 	void *item);
 
Index: exec/print.c
===================================================================
--- exec/print.c	(revision 1179)
+++ exec/print.c	(revision 1180)
@@ -1,12 +1,13 @@
 /*
  * Copyright (c) 2002-2004 MontaVista Software, Inc.
+ * Copyright (c) 2006 Ericsson AB.
  *
- * Author: Steven Dake (sdake at mvista.com)
+ * Author: Steven Dake (sdake at redhat.com)
+ *	original work, Add worker thread to avoid blocking syslog
  *
- * Copyright (c) 2006 Ericsson AB.
- *		Author: Hans Feldt
- *      Description: Added support for runtime installed loggers, tags tracing,
- *                   and file & line printing.
+ * Author: Hans Feldt
+ *      Added support for runtime installed loggers, tags tracing, 
+ *	and file & line printing.
  *
  * All rights reserved.
  *
@@ -53,16 +54,26 @@
 #endif
 #include <syslog.h>
 #include <stdlib.h>
+#include <pthread.h>
 
 #include "print.h"
 #include "totemip.h"
 #include "../include/saAis.h"
 #include "mainconfig.h"
+#include "wthread.h"
 
 static unsigned int logmode = LOG_MODE_BUFFER | LOG_MODE_STDERR | LOG_MODE_SYSLOG;
+
 static char *logfile = 0;
+
 static int log_setup_called;
 
+static pthread_mutex_t log_mode_mutex;
+
+static struct worker_thread_group log_thread_group;
+
+static unsigned int dropped_log_entries = 0;
+
 #ifndef MAX_LOGGERS
 #define MAX_LOGGERS 32
 #endif
@@ -70,8 +81,7 @@
 
 static FILE *log_file_fp = 0;
 
-struct log_entry
-{
+struct log_entry {
 	char *file;
 	int line;
 	int level;
@@ -80,8 +90,15 @@
 };
 
 static struct log_entry *head;
+
 static struct log_entry *tail;
 
+struct log_data {
+	unsigned int syslog_pos;
+	unsigned int level;
+	char *log_string;
+};
+
 static int logger_init (const char *ident, int tags, int level, int mode)
 {
 	int i;
@@ -131,9 +148,31 @@
 	vsnprintf(entry->str, sizeof(entry->str), format, ap);
 }
 
+static void log_printf_worker_fn (void *thread_data, void *work_item)
+{
+	struct log_data *log_data = (struct log_data *)work_item;
+
+	/*
+	 * Output the log data
+	 */
+	if (logmode & LOG_MODE_FILE && log_file_fp != 0) {
+		fprintf (log_file_fp, "%s", log_data->log_string);
+		fflush (log_file_fp);
+	}
+	if (logmode & LOG_MODE_STDERR) {
+		fprintf (stderr, "%s", log_data->log_string);
+		fflush (stdout);
+	}
+
+	if (logmode & LOG_MODE_SYSLOG) {
+		syslog (log_data->level, &log_data->log_string[log_data->syslog_pos]);
+	}
+	free (log_data->log_string);
+}
+
 static void _log_printf (char *file, int line,
-						 int level, int id,
-						 char *format, va_list ap)
+	int level, int id,
+	char *format, va_list ap)
 {
 	char newstring[4096];
 	char log_string[4096];
@@ -141,14 +180,18 @@
 	struct timeval tv;
 	int i = 0;
 	int len;
+	struct log_data log_data;
+	unsigned int res = 0;
 
 	assert (id < MAX_LOGGERS);
 
+	pthread_mutex_lock (&log_mode_mutex);
 	/*
 	** Buffer before log_setup() has been called.
 	*/
 	if (logmode & LOG_MODE_BUFFER) {
 		buffered_log_printf(file, line, level, format, ap);
+		pthread_mutex_unlock (&log_mode_mutex);
 		return;
 	}
 
@@ -165,7 +208,18 @@
 	} else {	
 		sprintf (&newstring[i], "[%-5s] %s", loggers[id].ident, format);
 	}
-	len = vsprintf (log_string, newstring, ap);
+	if (dropped_log_entries) {
+		/*
+		 * Get rid of \n if there is one
+		 */
+		if (newstring[strlen (newstring) - 1] == '\n') {
+			newstring[strlen (newstring) - 1] = '\0';
+		}
+		len = sprintf (log_string,
+			"%s - prior to this log entry, openais logger dropped '%d' messages because of overflow.", newstring, dropped_log_entries + 1);
+	} else {
+		len = vsprintf (log_string, newstring, ap);
+	}
 
 	/*
 	** add line feed if not done yet
@@ -176,20 +230,32 @@
 	}
 
 	/*
-	 * Output the log data
+	 * Create work thread data
 	 */
-	if (logmode & LOG_MODE_FILE && log_file_fp != 0) {
-		fprintf (log_file_fp, "%s", log_string);
-		fflush (log_file_fp);
+	log_data.syslog_pos = i;
+	log_data.level = level;
+	log_data.log_string = strdup (log_string);
+	if (log_data.log_string == NULL) {
+		goto drop_log_msg;
 	}
-	if (logmode & LOG_MODE_STDERR) {
-		fprintf (stderr, "%s", log_string);
+	
+	if (log_setup_called) {
+		res = worker_thread_group_work_add (&log_thread_group, &log_data);
+		if (res == 0) {
+			dropped_log_entries = 0;
+		} else {
+			dropped_log_entries += 1;
+		}
+	} else {
+		log_printf_worker_fn (NULL, &log_data);	
 	}
-	fflush (stdout);
 
-	if (logmode & LOG_MODE_SYSLOG) {
-		syslog (level, &log_string[i]);
-	}
+	pthread_mutex_unlock (&log_mode_mutex);
+	return;
+
+drop_log_msg:
+	dropped_log_entries++;
+	pthread_mutex_unlock (&log_mode_mutex);
 }
 
 int _log_init (const char *ident)
@@ -222,7 +288,9 @@
 		}
 	}
 
+	pthread_mutex_lock (&log_mode_mutex);
 	logmode = config->logmode;
+	pthread_mutex_unlock (&log_mode_mutex);
 	logfile = config->logfile;
 
 	if (config->logmode & LOG_MODE_SYSLOG) {
@@ -249,13 +317,23 @@
 			config->logger[i].level = LOG_LEVEL_INFO;
 		config->logger[i].tags |= TAG_LOG;
 		logger_init (config->logger[i].ident,
-					 config->logger[i].tags,
-					 config->logger[i].level,
-					 config->logger[i].mode);
+			config->logger[i].tags,
+			config->logger[i].level,
+			config->logger[i].mode);
 	}
 
 	log_setup_called = 1;
 
+	worker_thread_group_init (
+		&log_thread_group,
+		1,
+		1024,
+		sizeof (struct log_data),
+		0,
+		NULL,
+		log_printf_worker_fn);
+
+
 	/*
 	** Flush what we have buffered
 	*/

revision-1181.patch:
 ckpt-rd.c |    8 +++++---
 ckpt-wr.c |   19 +------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

--- NEW FILE revision-1181.patch ---
Index: test/ckpt-wr.c
===================================================================
--- test/ckpt-wr.c	(revision 1180)
+++ test/ckpt-wr.c	(revision 1181)
@@ -67,7 +67,7 @@
 	.creationFlags =        SA_CKPT_WR_ALL_REPLICAS,
 	.checkpointSize =       250000,
 	.retentionDuration =    SA_TIME_ONE_SECOND * 60,
-	.maxSections =          5,
+	.maxSections =          1,
 	.maxSectionSize =       250000,
 	.maxSectionIdSize =     10
 };
@@ -130,23 +130,6 @@
 
 
     do{
-			error = saCkptCheckpointRead (checkpointHandle,
-											ReadVectorElements,
-											1,
-											&erroroneousVectorIndex);
-			if (error != SA_AIS_OK) {
-				if (error == SA_AIS_ERR_TRY_AGAIN) {
-					continue;
-				}
-				return (0);
-			}
-			
-			if (ReadVectorElements->dataBuffer == 0) {
-				printf ("Default Checkpoint has no data\n");
-			} else {
-				count = atol((char *)ReadVectorElements->dataBuffer);
-			}
-			
 			count++;
 			sprintf((char*)&data, "%d",(int)count);
 			writeElement.sectionId = (SaCkptSectionIdT)SA_CKPT_DEFAULT_SECTION_ID;
Index: test/ckpt-rd.c
===================================================================
--- test/ckpt-rd.c	(revision 1180)
+++ test/ckpt-rd.c	(revision 1181)
@@ -52,7 +52,7 @@
 int ckptinv;
 void printSaNameT (SaNameT *name)
 {
-	int i;
+	int i = 0;
 
 	for (i = 0; i < name->length; i++) {
 		printf ("%c", name->value[i]);
@@ -90,12 +90,14 @@
 	SaAisErrorT error;
 	SaUint32T erroroneousVectorIndex = 0;
 	struct timespec delay;	
+	int i = 0;
+
 	delay.tv_sec = 1;
 	delay.tv_nsec = 0;
-
-
 	
 	error = saCkptInitialize (&ckptHandle, &callbacks, &version);
+	printf ("%s: initialize of checkpoint service\n",
+		get_test_output (error, SA_AIS_OK));
 	
 	error = saCkptCheckpointOpen (ckptHandle,
 		&checkpointName,

revision-1182.patch:
 evs.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE revision-1182.patch ---
Index: lib/evs.c
===================================================================
--- lib/evs.c	(revision 1181)
+++ lib/evs.c	(revision 1182)
@@ -1,4 +1,3 @@
-#define PROCESSOR_COUNT_MAX 32
 /*
  * vi: set autoindent tabstop=4 shiftwidth=4 :
 
@@ -46,6 +45,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
+#include "../exec/totem.h"
 #include "../include/saAis.h"
 #include "../include/evs.h"
 #include "../include/ipc_evs.h"

revision-1183.patch:
 totemnet.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE revision-1183.patch ---
Index: exec/totemnet.c
===================================================================
--- exec/totemnet.c	(revision 1182)
+++ exec/totemnet.c	(revision 1183)
@@ -1024,7 +1024,7 @@
 		memset(&mreq, 0, sizeof(mreq));
 		mreq.imr_multiaddr.s_addr = mcast_sin->sin_addr.s_addr;
 		mreq.imr_interface.s_addr = boundto_sin->sin_addr.s_addr;
-		res = setsockopt (sockets->mcast_send, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+		res = setsockopt (sockets->mcast_recv, IPPROTO_IP, IP_ADD_MEMBERSHIP,
 			&mreq, sizeof (mreq));
 		if (res == -1) {
 			perror ("join ipv4 multicast group failed");

revision-1184.patch:
 exec/clm.c        |   12 ++++--------
 include/mar_clm.h |   28 +++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 13 deletions(-)

--- NEW FILE revision-1184.patch ---
Index: include/mar_clm.h
===================================================================
--- include/mar_clm.h	(revision 1183)
+++ include/mar_clm.h	(revision 1184)
@@ -1,9 +1,10 @@
 /*
  * Copyright (C) 2006 Red Hat, Inc.
+ * Copyright (C) 2006 Sun Microsystems, Inc.
  *
  * All rights reserved.
  *
- * Author: Steven Dake (sdake at mvista.com)
+ * Author: Steven Dake (sdake at redhat.com)
  *
  * This software licensed under BSD license, the text of which follows:
  * 
@@ -35,6 +36,7 @@
 #ifndef AIS_MAR_CLM_H_DEFINED
 #define AIS_MAR_CLM_H_DEFINED
 
+#include "swab.h"
 #include "saAis.h"
 #include "saClm.h"
 #include "mar_gen.h"
@@ -55,6 +57,12 @@
 	unsigned char value[MAR_CLM_MAX_ADDRESS_LENGTH] __attribute__((aligned(8)));
 } mar_clm_node_address_t;
 
+static inline void swab_mar_clm_node_address_t(mar_clm_node_address_t *to_swab)
+{
+	swab_mar_uint16_t (&to_swab->length);
+	swab_mar_uint32_t (&to_swab->family);
+}
+
 static inline void marshall_from_mar_clm_node_address_t (
 	SaClmNodeAddressT *dest,
 	mar_clm_node_address_t *src)
@@ -77,14 +85,24 @@
  * Marshalling the SaClmClusterNodeT data structure
  */
 typedef struct {
-	unsigned int node_id __attribute__((aligned(8)));
+	mar_uint32_t node_id __attribute__((aligned(8)));
 	mar_clm_node_address_t node_address __attribute__((aligned(8)));
 	mar_name_t node_name __attribute__((aligned(8)));
-	unsigned int member __attribute__((aligned(8)));
-	unsigned long long boot_timestamp __attribute__((aligned(8)));
-	unsigned long long initial_view_number __attribute__((aligned(8)));
+	mar_uint32_t member __attribute__((aligned(8)));
+	mar_uint64_t boot_timestamp __attribute__((aligned(8)));
+	mar_uint64_t initial_view_number __attribute__((aligned(8)));
 } mar_clm_cluster_node_t;
 
+static inline void swab_mar_clm_cluster_node_t(mar_clm_cluster_node_t *to_swab)
+{
+	swab_mar_uint32_t (&to_swab->node_id);
+	swab_mar_uint32_t (&to_swab->member);
+	swab_mar_clm_node_address_t (&to_swab->node_address);
+	swab_mar_name_t (&to_swab->node_name);
+	swab_mar_uint64_t (&to_swab->boot_timestamp);
+	swab_mar_uint64_t (&to_swab->initial_view_number);
+}
+
 static inline void marshall_to_mar_clm_cluster_node_t (
 	mar_clm_cluster_node_t *dest,
 	SaClmClusterNodeT *src)
Index: exec/clm.c
===================================================================
--- exec/clm.c	(revision 1183)
+++ exec/clm.c	(revision 1184)
@@ -1,10 +1,11 @@
 /*
  * Copyright (c) 2002-2006 MontaVista Software, Inc.
  * Copyright (c) 2006 Red Hat, Inc.
+ * Copyright (C) 2006 Sun Microsystems, Inc.
  *
  * All rights reserved.
  *
- * Author: Steven Dake (sdake at mvista.com)
+ * Author: Steven Dake (sdake at redhat.com)
  *
  * This software licensed under BSD license, the text of which follows:
  * 
@@ -70,7 +71,6 @@
 #include "ipc.h"
 #include "mempool.h"
 #include "service.h"
-#include "../include/swab.h"
 #include "print.h"
 
 enum clm_message_req_types {
@@ -575,12 +575,8 @@
 {
 	struct req_exec_clm_nodejoin *node_join = msg;
 
-	node_join->cluster_node.node_id = swab32(node_join->cluster_node.node_id);
-	node_join->cluster_node.node_address.family = swab32(node_join->cluster_node.node_address.family);
-	node_join->cluster_node.node_address.length = swab16(node_join->cluster_node.node_address.length);
-	node_join->cluster_node.initial_view_number = swab64(node_join->cluster_node.initial_view_number);
-	node_join->cluster_node.boot_timestamp = swab64(node_join->cluster_node.boot_timestamp);
-
+	swab_mar_req_header_t (&node_join->header);
+	swab_mar_clm_cluster_node_t (&node_join->cluster_node);
 }
 
 static void message_handler_req_exec_clm_nodejoin (

revision-1185.patch:
 exec/cpg.c        |   10 +++++++---
 include/mar_cpg.h |   15 +++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

--- NEW FILE revision-1185.patch ---
Index: include/mar_cpg.h
===================================================================
--- include/mar_cpg.h	(revision 1184)
+++ include/mar_cpg.h	(revision 1185)
@@ -1,10 +1,11 @@
 /*
  * Copyright (c) 2006 Red Hat, Inc.
+ * Author: Patrick Caulfield (pcaulfie at redhat.com)
  *
+ * Copyright (c) 2006 Sun Microsystems, Inc.
+ *
  * All rights reserved.
  *
- * Author: Patrick Caulfield (pcaulfie at redhat.com)
- *
  * This software licensed under BSD license, the text of which follows:
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,12 +36,18 @@
 #define MAR_CPG_H_DEFINED
 
 #include "cpg.h"
+#include "swab.h"
 
 typedef struct {
-	uint32_t length __attribute((aligned(8)));
-	char value[CPG_MAX_NAME_LENGTH] __attribute((aligned(8)));
+	uint32_t length __attribute__((aligned(8)));
+	char value[CPG_MAX_NAME_LENGTH] __attribute__((aligned(8)));
 } mar_cpg_name_t;
 
+static inline void swab_mar_cpg_name_t (mar_cpg_name_t *to_swab)
+{
+	swab_mar_uint32_t (&to_swab->length);
+}
+
 static inline void marshall_from_mar_cpg_name_t (
 	struct cpg_name *dest,
 	mar_cpg_name_t *src)
Index: exec/cpg.c
===================================================================
--- exec/cpg.c	(revision 1184)
+++ exec/cpg.c	(revision 1185)
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2006 Red Hat, Inc.
+ * Copyright (c) 2006 Sun Microsystems, Inc.
  *
  * All rights reserved.
  *
@@ -610,7 +611,7 @@
 	struct req_exec_cpg_procjoin *req_exec_cpg_procjoin = (struct req_exec_cpg_procjoin *)msg;
 
 	req_exec_cpg_procjoin->pid = swab32(req_exec_cpg_procjoin->pid);
-	req_exec_cpg_procjoin->group_name.length = swab32(req_exec_cpg_procjoin->group_name.length);
+	swab_mar_cpg_name_t (&req_exec_cpg_procjoin->group_name);
 	req_exec_cpg_procjoin->reason = swab32(req_exec_cpg_procjoin->reason);
 }
 
@@ -619,9 +620,11 @@
 	mar_res_header_t *res = (mar_res_header_t *)msg;
 	struct join_list_entry *jle = (struct join_list_entry *)(msg + sizeof(mar_res_header_t));
 
+	/* XXX shouldn't mar_res_header be swabbed? */
+
 	while ((void*)jle < msg + res->size) {
 		jle->pid = swab32(jle->pid);
-		jle->group_name.length = swab32(jle->group_name.length);
+		swab_mar_cpg_name_t (&jle->group_name);
 		jle++;
 	}
 }
@@ -630,9 +633,10 @@
 {
 	struct req_exec_cpg_mcast *req_exec_cpg_mcast = (struct req_exec_cpg_mcast *)msg;
 
+	swab_mar_req_header_t (&req_exec_cpg_mcast->header);
+	swab_mar_cpg_name_t (&req_exec_cpg_mcast->group_name);
 	req_exec_cpg_mcast->pid = swab32(req_exec_cpg_mcast->pid);
 	req_exec_cpg_mcast->msglen = swab32(req_exec_cpg_mcast->msglen);
-	req_exec_cpg_mcast->group_name.length = swab32(req_exec_cpg_mcast->group_name.length);
 
 }
 

revision-1186.patch:
 evs.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE revision-1186.patch ---
Index: exec/evs.c
===================================================================
--- exec/evs.c	(revision 1185)
+++ exec/evs.c	(revision 1186)
@@ -1,11 +1,12 @@
 /*
  * Copyright (c) 2004-2006 MontaVista Software, Inc.
  * Copyright (c) 2006 Red Hat, Inc.
+ * Author: Steven Dake (sdake at mvista.com)
  *
+ * Copyright (c) 2006 Sun Microsystems, Inc.
+ *
  * All rights reserved.
  *
- * Author: Steven Dake (sdake at mvista.com)
- *
  * This software licensed under BSD license, the text of which follows:
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -55,6 +56,7 @@
 #include "../include/list.h"
 #include "../include/queue.h"
 #include "../lcr/lcr_comp.h"
+#include "../include/swab.h"
 #include "totempg.h"
 #include "main.h"
 #include "ipc.h"
@@ -465,6 +467,11 @@
 
 static void req_exec_mcast_endian_convert (void *msg)
 {
+	struct req_exec_evs_mcast *req_exec_evs_mcast =
+		(struct req_exec_evs_mcast *)msg;
+	req_exec_evs_mcast->group_entries =
+		swab32 (req_exec_evs_mcast->group_entries);
+	req_exec_evs_mcast->msg_len = swab32 (req_exec_evs_mcast->msg_len);
 }
 
 static void message_handler_req_exec_mcast (

revision-1187.patch:
 evt.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE revision-1187.patch ---
Index: exec/evt.c
===================================================================
--- exec/evt.c	(revision 1186)
+++ exec/evt.c	(revision 1187)
@@ -2,6 +2,8 @@
  * Copyright (c) 2004-2006 Mark Haverkamp
  * Copyright (c) 2004-2006 Open Source Development Lab
  *
+ * Copyright (c) 2006 Sun Microsystems, Inc.
+ *
  * All rights reserved.
  *
  * This software licensed under BSD license, the text of which follows:
@@ -2017,11 +2019,11 @@
 	 * led_svr_channel_handle and led_lib_channel_handle.
 	 */
 
-	evt->led_chan_name.length = swab16(evt->led_chan_name.length);
+	swab_mar_name_t (&evt->led_chan_name);
 	evt->led_chan_unlink_id = swab64(evt->led_chan_unlink_id);
 	evt->led_event_id = swab64(evt->led_event_id);
 	evt->led_sub_id = swab32(evt->led_sub_id);
-	evt->led_publisher_name.length = swab32(evt->led_publisher_name.length);
+	swab_mar_name_t (&evt->led_publisher_name);
 	evt->led_retention_time = swab64(evt->led_retention_time);
 	evt->led_publish_time = swab64(evt->led_publish_time);
 	evt->led_user_data_offset = swab32(evt->led_user_data_offset);
@@ -3601,14 +3603,13 @@
 	switch (cpkt->chc_op) {
 	
 	case EVT_OPEN_CHAN_OP:
-		cpkt->u.chc_chan.ocr_name.length =
-			swab16(cpkt->u.chc_chan.ocr_name.length);
+		swab_mar_name_t (&cpkt->u.chc_chan.ocr_name);
 		cpkt->u.chc_chan.ocr_serial_no = swab64(cpkt->u.chc_chan.ocr_serial_no);
 		break;
 
 	case EVT_UNLINK_CHAN_OP:
 	case EVT_CLOSE_CHAN_OP:
-		cpkt->u.chcu.chcu_name.length = swab16(cpkt->u.chcu.chcu_name.length);
+		swab_mar_name_t (&cpkt->u.chcu.chcu_name);
 		cpkt->u.chcu.chcu_unlink_id = swab64(cpkt->u.chcu.chcu_unlink_id);
 		break;
 
@@ -3623,8 +3624,7 @@
 		break;
 
 	case EVT_OPEN_COUNT:
-		cpkt->u.chc_set_opens.chc_chan_name.length = 
-			swab16(cpkt->u.chc_set_opens.chc_chan_name.length);
+		swab_mar_name_t (&cpkt->u.chc_set_opens.chc_chan_name);
 		cpkt->u.chc_set_opens.chc_open_count = 
 			swab32(cpkt->u.chc_set_opens.chc_open_count);
 		break;

revision-1188.patch:
 lcr_ifact.c |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

--- NEW FILE revision-1188.patch ---
Index: lcr/lcr_ifact.c
===================================================================
--- lcr/lcr_ifact.c	(revision 1187)
+++ lcr/lcr_ifact.c	(revision 1188)
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2006 Steven Dake (sdake at mvista.com)
+ * Copyright (c) 2006 Sun Microsystems, Inc.
  *
  * This software licensed under BSD license, the text of which follows:
  * 
@@ -32,6 +33,7 @@
 #include <dlfcn.h>
 #include <dirent.h>
 #include <errno.h>
+#include <string.h>
 #include <unistd.h>
 #include <fnmatch.h>
 #include "lcr_comp.h"
@@ -177,28 +179,21 @@
 {
 	char *ld_library_path;
 	char *my_ld_library_path;
-	char *p_s;
-	unsigned int i;
-	unsigned int len;
+	char *p_s, *ptrptr;
 
 	ld_library_path = getenv ("LD_LIBRARY_PATH");
 	if (ld_library_path == NULL) {
 		return;
 	}
 	my_ld_library_path = strdup (ld_library_path);
-	if (my_ld_library_path == 0) {
+	if (my_ld_library_path == NULL) {
 		return;
 	}
 
-	len = strlen (my_ld_library_path) + 1;
-
-	for (i = 0, p_s = my_ld_library_path, i = 0; i < len; i++) {
-		if (my_ld_library_path[i] == ':' || my_ld_library_path[i] == '\0') {
-			my_ld_library_path[i]='\0';
-//printf ("path list %x path list entries %d\n", path_list, path_list_entries);
-			path_list[path_list_entries++] = strdup (p_s);
-			p_s = &my_ld_library_path[i];
-		}
+	p_s = strtok_r (my_ld_library_path, ":", &ptrptr);
+	while (p_s != NULL) {
+		path_list[path_list_entries++] = strdup (p_s);
+		p_s = strtok_r (NULL, ":", &ptrptr);
 	}
 
 	free (my_ld_library_path);

revision-1189.patch:
 vsf_ykd.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE revision-1189.patch ---
Index: exec/vsf_ykd.c
===================================================================
--- exec/vsf_ykd.c	(revision 1188)
+++ exec/vsf_ykd.c	(revision 1189)
@@ -1,11 +1,12 @@
 /*
  * Copyright (c) 2005 MontaVista Software, Inc.
  * Copyright (c) 2006 Red Hat, Inc.
+ * Author: Steven Dake (sdake at mvista.com)
  *
+ * Copyright (c) 2006 Sun Microsystems, Inc.
+ *
  * All rights reserved.
  *
- * Author: Steven Dake (sdake at mvista.com)
- *
  * This software licensed under BSD license, the text of which follows:
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -32,6 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include <assert.h>
 #include <pwd.h>
 #include <grp.h>
@@ -302,10 +304,12 @@
 {
 	int i;
 
-	ykd_session->member_list_entries = swab32 (ykd_session->member_list_entries);
+	ykd_session->member_list_entries =
+		swab32 (ykd_session->member_list_entries);
 	ykd_session->session_id = swab32 (ykd_session->session_id);
 	for (i = 0; i < ykd_session->member_list_entries; i++) {
-// TODO		totemip_copy_endian_convert (&ykd_session->member_list[i], &ykd_session->member_list[i]);
+		ykd_session->member_list[i] =
+			swab32 (ykd_session->member_list[i]);
 	}
 }
 
@@ -355,7 +359,8 @@
 		return;
 	}
 #endif
-	if (endian_conversion_required) {
+	if (endian_conversion_required &&
+	    (iovec->iov_len > sizeof (struct ykd_header))) {
 		ykd_state_endian_convert ((struct ykd_state *)msg_state);
 	}
 
@@ -384,6 +389,7 @@
 
 	switch (ykd_mode) {
 		case YKD_MODE_SENDSTATE:
+			assert (iovec->iov_len > sizeof (struct ykd_header));
 			/*
 			 * Copy state information for the sending processor
 			 */

revision-1190.patch:
 exec/totempg.c |    1 +
 include/swab.h |   20 +-------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

--- NEW FILE revision-1190.patch ---
Index: include/swab.h
===================================================================
--- include/swab.h	(revision 1189)
+++ include/swab.h	(revision 1190)
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2005 MontaVista Software, Inc.
+ * Copyright (c) 2006 Sun Microsystems, Inc.
  *
  * All rights reserved.
  *
@@ -29,26 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <assert.h>
-#include <sys/mman.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-#include <sched.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/poll.h>
 
 #define swab16(x) \
 ({ \
Index: exec/totempg.c
===================================================================
--- exec/totempg.c	(revision 1189)
+++ exec/totempg.c	(revision 1190)
@@ -88,6 +88,7 @@
 #include <string.h>
 #include <assert.h>
 #include <pthread.h>
+#include <errno.h>
 
 #include "../include/hdb.h"
 #include "../include/list.h"

revision-1191.patch:
 amf.c      |   12 
 amfcomp.c  |    8 
 ckpt.c     |  566 +++++++++++++++++++-------------------
 evt.c      |  888 ++++++++++++++++++++++++++++++-------------------------------
 ipc.c      |    9 
 lck.c      |   82 ++---
 main.c     |    2 
 print.h    |    9 
 totem.h    |    8 
 totemnet.c |    7 
 totempg.c  |    3 
 totemrrp.c |    4 
 totemsrp.c |    7 
 13 files changed, 813 insertions(+), 792 deletions(-)

--- NEW FILE revision-1191.patch ---
Index: exec/totemnet.c
===================================================================
--- exec/totemnet.c	(revision 1190)
+++ exec/totemnet.c	(revision 1191)
@@ -1,10 +1,12 @@
 /*
  * Copyright (c) 2005 MontaVista Software, Inc.
+ * Copyright (c) 2006 Red Hat, Inc.
+ * Copyright (c) 2006 Sun Microsystems, Inc.
  *
  * All rights reserved.
  *
  * Author: Steven Dake (sdake at mvista.com)
- *
+
  * This software licensed under BSD license, the text of which follows:
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -32,7 +34,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include <assert.h>
 #include <pthread.h>
 #include <sys/mman.h>
@@ -137,7 +138,7 @@
 
 	int totemnet_log_level_debug;
 
-	void (*totemnet_log_printf) (char *file, int line, int level, char *format, ...);
+	void (*totemnet_log_printf) (char *file, int line, int level, char *format, ...) __attribute__((format(printf, 4, 5)));
 
 	totemnet_handle handle;
 
Index: exec/print.h
===================================================================
--- exec/print.h	(revision 1190)
+++ exec/print.h	(revision 1191)
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2002-2004 MontaVista Software, Inc.
- *
  * Author: Steven Dake (sdake at mvista.com)
  *
  * Copyright (c) 2006 Ericsson AB.
@@ -8,6 +7,8 @@
  *      Description: Added support for runtime installed loggers, tags tracing,
  *                   and file & line printing.
  *
+ * Copyright (c) 2006 Sun Microsystems, Inc.
+ *
  * All rights reserved.
  *
  * This software licensed under BSD license, the text of which follows:
@@ -93,9 +94,9 @@
 */
 static int logger_identifier __attribute__((unused));
 
-extern void internal_log_printf (char *file, int line, int priority, char *format, ...);
-extern void internal_log_printf2 (char *file, int line, int level, int id, char *format, ...);
-extern void trace (char *file, int line, int tag, int id, char *format, ...);
+extern void internal_log_printf (char *file, int line, int priority, char *format, ...) __attribute__((format(printf, 4, 5)));
+extern void internal_log_printf2 (char *file, int line, int level, int id, char *format, ...) __attribute__((format(printf, 5, 6)));
+extern void trace (char *file, int line, int tag, int id, char *format, ...) __attribute__((format(printf, 5, 6)));
 extern void log_flush(void);
 
 #define LEVELMASK 0x07                 /* 3 bits */
Index: exec/ipc.c
===================================================================
--- exec/ipc.c	(revision 1190)
+++ exec/ipc.c	(revision 1191)
@@ -155,6 +155,7 @@
 	void *message)
 {
 	SaAisErrorT error = SA_AIS_ERR_ACCESS;
+	size_t cinfo = (size_t)conn_info;
 	mar_req_lib_response_init_t *req_lib_response_init = (mar_req_lib_response_init_t *)message;
 	mar_res_lib_response_init_t res_lib_response_init;
 
@@ -165,7 +166,7 @@
 	res_lib_response_init.header.size = sizeof (mar_res_lib_response_init_t);
 	res_lib_response_init.header.id = MESSAGE_RES_INIT;
 	res_lib_response_init.header.error = error;
-	res_lib_response_init.conn_info = (unsigned long long)conn_info;
+	res_lib_response_init.conn_info = (mar_uint64_t)cinfo;
 
 	openais_conn_send_response (
 		conn_info,
@@ -184,6 +185,7 @@
 	void *message)
 {
 	SaAisErrorT error = SA_AIS_ERR_ACCESS;
+	size_t cinfo;
 	mar_req_lib_dispatch_init_t *req_lib_dispatch_init = (mar_req_lib_dispatch_init_t *)message;
 	mar_res_lib_dispatch_init_t res_lib_dispatch_init;
 	struct conn_info *msg_conn_info;
@@ -195,10 +197,11 @@
 		else
 			error = SA_AIS_OK;
 
-		conn_info->conn_info_partner = (struct conn_info *)req_lib_dispatch_init->conn_info;
+		cinfo = (size_t)req_lib_dispatch_init->conn_info;
+		conn_info->conn_info_partner = (struct conn_info *)cinfo;
 		conn_info->conn_info_partner->shared_mutex = conn_info->shared_mutex;
 
-		msg_conn_info = (struct conn_info *)req_lib_dispatch_init->conn_info;
+		msg_conn_info = (struct conn_info *)cinfo;
 		msg_conn_info->conn_info_partner = conn_info;
 
 		if (error == SA_AIS_OK) {
Index: exec/totempg.c
===================================================================
--- exec/totempg.c	(revision 1190)
+++ exec/totempg.c	(revision 1191)
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2003-2005 MontaVista Software, Inc.
  * Copyright (c) 2005 OSDL.
+ * Copyright (c) 2006 Sun Microsystems, Inc.
  *
  * All rights reserved.
  *
@@ -150,7 +151,7 @@
 static int totempg_log_level_warning;
 static int totempg_log_level_notice;
 static int totempg_log_level_debug;
-static void (*totempg_log_printf) (char *file, int line, int level, char *format, ...) = NULL;
+static void (*totempg_log_printf) (char *file, int line, int level, char *format, ...) __attribute__((format(printf, 4, 5))) = NULL;
 
 struct totem_config *totempg_totem_config;
 
Index: exec/amfcomp.c
===================================================================
--- exec/amfcomp.c	(revision 1190)
+++ exec/amfcomp.c	(revision 1191)
@@ -1130,7 +1130,7 @@
 
 SaAisErrorT amf_comp_register (struct amf_comp *comp)
 {
-	TRACE2("Exec comp register '%s'", &comp->name.value);
+	TRACE2("Exec comp register '%s'", comp->name.value);
 
 	if (comp->saAmfCompPresenceState == SA_AMF_PRESENCE_RESTARTING) {
 		comp_presence_state_set (comp, SA_AMF_PRESENCE_INSTANTIATED);
@@ -1150,7 +1150,7 @@
 {
 	struct res_lib_amf_componenterrorreport res_lib;
 
-	TRACE2("Exec comp error report '%s'", &comp->name.value);
+	TRACE2("Exec comp error report '%s'", comp->name.value);
 
 	if (amf_su_is_local (comp->su)) {
 		res_lib.header.size = sizeof (struct res_lib_amf_componenterrorreport);
@@ -1171,7 +1171,7 @@
 void amf_comp_healthcheck_tmo (
 	struct amf_comp *comp, struct amf_healthcheck *healthcheck)
 {
-	TRACE2("Exec healthcheck tmo for '%s'", &comp->name.value);
+	TRACE2("Exec healthcheck tmo for '%s'", comp->name.value);
 
 	/* report to SU and let it handle the problem */
 	report_error_suspected (comp, healthcheck->recommendedRecovery);
@@ -1190,7 +1190,7 @@
  */
 void amf_comp_cleanup_completed (struct amf_comp *comp)
 {
-	TRACE2("Exec CLC cleanup completed for '%s'", &comp->name.value);
+	TRACE2("Exec CLC cleanup completed for '%s'", comp->name.value);
 
     /* Set all CSI's confirmed HA state to unknown  */
 	amf_comp_foreach_csi_assignment (comp, clear_ha_state);
Index: exec/evt.c
===================================================================
--- exec/evt.c	(revision 1190)
+++ exec/evt.c	(revision 1191)
@@ -72,18 +72,18 @@
  *
  * esi_version:				Version that the library is running.
  * esi_open_chans:			list of open channels associated with this
- * 							instance.  Used to clean up any data left
- * 							allocated when the finalize is done.
- * 							(event_svr_channel_open.eco_instance_entry)
+ *							instance.  Used to clean up any data left
+ *							allocated when the finalize is done.
+ *							(event_svr_channel_open.eco_instance_entry)
  * esi_events:				list of pending events to be delivered on this
- *  						instance (struct chan_event_list.cel_entry)
+ *							instance (struct chan_event_list.cel_entry)
  * esi_queue_blocked:		non-zero if the delivery queue got too full
- * 							and we're blocking new messages until we
- * 							drain some of the queued messages.
+ *							and we're blocking new messages until we
+ *							drain some of the queued messages.
  * esi_nevents:				Number of events in events lists to be sent.
  * esi_hdb:					Handle data base for open channels on this
- * 							instance.  Used for a quick lookup of
- * 							open channel data from a lib api message.
+ *							instance.  Used for a quick lookup of
[...4213 lines suppressed...]
 			/*
 			 * Add pending locks to granted list
 			 */
-		   	list_p = &resource->pr_pending_list_head.next;
+			list_p = resource->pr_pending_list_head.next;
 			list_del (&resource->pr_pending_list_head);
 			list_add_tail (list_p,
 				&resource->pr_granted_list_head);
@@ -1087,7 +1087,7 @@
 		req_exec_lck_resourcelock->req_lib_lck_resourcelock.async_call;
 	resource_lock->invocation =
 		req_exec_lck_resourcelock->req_lib_lck_resourcelock.invocation;
-	
+
 	/*
 	 * Waiter callback source
 	 */
@@ -1106,7 +1106,7 @@
 			req_exec_lck_resourcelock->resource_handle);
 
 		assert (resource_cleanup);
-			
+
 		list_add (&resource_lock->resource_cleanup_list,
 			&resource_cleanup->resource_lock_list_head);
 
@@ -1115,7 +1115,7 @@
 		 */
 		if (resource_lock->lock_status != SA_LCK_LOCK_NO_STATUS) {
 			/*
-			 * If lock granted or denied, deliver callback or 
+			 * If lock granted or denied, deliver callback or
 			 * response to library for non-async calls
 			 */
 			lock_response_deliver (
@@ -1153,8 +1153,8 @@
 	struct req_exec_lck_resourceunlock *req_exec_lck_resourceunlock = (struct req_exec_lck_resourceunlock *)message;
 	struct res_lib_lck_resourceunlock res_lib_lck_resourceunlock;
 	struct res_lib_lck_resourceunlockasync res_lib_lck_resourceunlockasync;
-	struct resource *resource = 0;
-	struct resource_lock *resource_lock = 0;
+	struct resource *resource = NULL;
+	struct resource_lock *resource_lock = NULL;
 	SaAisErrorT error = SA_AIS_OK;
 
 	log_printf (LOG_LEVEL_NOTICE, "EXEC request: saLckResourceUnlock %s\n",
@@ -1243,7 +1243,7 @@
 	if (resource == 0) {
 		goto error_exit;
 	}
-		
+
 error_exit:
 	if (message_source_is_local(&req_exec_lck_lockpurge->source)) {
 //		lck_resource_cleanup_remove (req_exec_lck_lockpurge->source.conn,
@@ -1278,7 +1278,7 @@
 	memcpy (&req_exec_lck_resourceopen.resource_name,
 		&req_lib_lck_resourceopen->lockResourceName,
 		sizeof (SaNameT));
-	
+
 	req_exec_lck_resourceopen.open_flags = req_lib_lck_resourceopen->resourceOpenFlags;
 	req_exec_lck_resourceopen.async_call = 0;
 	req_exec_lck_resourceopen.invocation = 0;
@@ -1392,7 +1392,7 @@
 	memcpy (&req_exec_lck_resourcelock.req_lib_lck_resourcelock,
 		req_lib_lck_resourcelock,
 		sizeof (struct req_lib_lck_resourcelock));
-	
+
 	req_exec_lck_resourcelock.resource_handle = req_lib_lck_resourcelock->resourceHandle;
 	req_exec_lck_resourcelock.async_call = 0;
 	req_exec_lck_resourcelock.invocation = 0;
@@ -1425,7 +1425,7 @@
 	memcpy (&req_exec_lck_resourcelock.req_lib_lck_resourcelock,
 		req_lib_lck_resourcelock,
 		sizeof (struct req_lib_lck_resourcelock));
-	
+
 	req_exec_lck_resourcelock.resource_handle = req_lib_lck_resourcelock->resourceHandle;
 	req_exec_lck_resourcelock.async_call = 1;
 	req_exec_lck_resourcelock.invocation = req_lib_lck_resourcelock->invocation;
@@ -1521,7 +1521,7 @@
 	memcpy (&req_exec_lck_lockpurge.req_lib_lck_lockpurge,
 		req_lib_lck_lockpurge,
 		sizeof (struct req_lib_lck_lockpurge));
-	
+
 	iovecs[0].iov_base = (char *)&req_exec_lck_lockpurge;
 	iovecs[0].iov_len = sizeof (req_exec_lck_lockpurge);
 
Index: exec/totemrrp.c
===================================================================
--- exec/totemrrp.c	(revision 1190)
+++ exec/totemrrp.c	(revision 1191)
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2005 MontaVista Software, Inc.
  * Copyright (c) 2006 Red Hat, Inc.
+ * Copyright (c) 2006 Sun Microsystems, Inc.
  *
  * All rights reserved.
  *
@@ -33,7 +34,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include <assert.h>
 #include <pthread.h>
 #include <sys/mman.h>
@@ -194,7 +194,7 @@
 
 	int totemrrp_log_level_debug;
 
-	void (*totemrrp_log_printf) (char *file, int line, int level, char *format, ...);
+	void (*totemrrp_log_printf) (char *file, int line, int level, char *format, ...) __attribute__((format(printf, 4, 5)));
 
 	totemrrp_handle handle;
 
Index: exec/totemsrp.c
===================================================================
--- exec/totemsrp.c	(revision 1190)
+++ exec/totemsrp.c	(revision 1191)
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2003-2006 MontaVista Software, Inc.
  * Copyright (c) 2006 Red Hat, Inc.
+ * Copyright (c) 2006 Sun Microsystems, Inc.
  *
  * All rights reserved.
  *
@@ -423,7 +424,7 @@
 
 	int totemsrp_log_level_debug;
 
-	void (*totemsrp_log_printf) (char *file, int line, int level, char *format, ...);
+	void (*totemsrp_log_printf) (char *file, int line, int level, char *format, ...) __attribute__((format(printf, 4, 5)));
 
 	enum memb_state memb_state;
 
@@ -1350,7 +1351,7 @@
 	struct totemsrp_instance *instance = (struct totemsrp_instance *)data;
 
 	log_printf (instance->totemsrp_log_level_notice,
-		"The token was lost in state %d from timer %x\n", instance->memb_state, data);
+		"The token was lost in state %d from timer %p\n", instance->memb_state, data);
 	switch (instance->memb_state) {
 		case MEMB_STATE_OPERATIONAL:
 			totemrrp_iface_check (instance->totemrrp_handle);
@@ -2798,7 +2799,7 @@
 		return;
 	}
 	log_printf (instance->totemsrp_log_level_notice,
-		"Storing new sequence id for ring %d\n", commit_token->ring_id.seq);
+		"Storing new sequence id for ring %llx\n", commit_token->ring_id.seq);
 	//assert (fd > 0);
 	res = write (fd, &commit_token->ring_id.seq, sizeof (unsigned long long));
 	assert (res == sizeof (unsigned long long));
Index: exec/main.c
===================================================================
--- exec/main.c	(revision 1190)
+++ exec/main.c	(revision 1191)
@@ -218,7 +218,7 @@
 	struct group *group;
 	group = getgrnam (main_config->group);
 	if (group == 0) {
-		log_printf (LOG_LEVEL_ERROR, "ERROR: The '%s' group is not found in /etc/group, please read the documentation.\n", group);
+		log_printf (LOG_LEVEL_ERROR, "ERROR: The '%s' group is not found in /etc/group, please read the documentation.\n", group->gr_name);
 		openais_exit_error (AIS_DONE_GID_DETERMINE);
 	}
 	gid_valid = group->gr_gid;
Index: exec/totem.h
===================================================================
--- exec/totem.h	(revision 1190)
+++ exec/totem.h	(revision 1191)
@@ -1,10 +1,12 @@
 /*
  * Copyright (c) 2005 MontaVista Software, Inc.
+ * Copyright (c) 2006 Red Hat, Inc.
+ * Copyright (c) 2006 Sun Microsystems, Inc.
  *
+ * Author: Steven Dake (sdake at mvista.com)
+ *
  * All rights reserved.
  *
- * Author: Steven Dake (sdake at mvista.com)
- *
  * This software licensed under BSD license, the text of which follows:
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -70,7 +72,7 @@
 };
 
 struct totem_logging_configuration {
-	void (*log_printf) (char *, int, int, char *, ...);
+	void (*log_printf) (char *, int, int, char *, ...) __attribute__((format(printf, 4, 5)));
 	int log_level_security;
 	int log_level_error;
 	int log_level_warning;

revision-1192.patch:
 ckpt.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE revision-1192.patch ---
Index: exec/ckpt.c
===================================================================
--- exec/ckpt.c	(revision 1191)
+++ exec/ckpt.c	(revision 1192)
@@ -1351,7 +1351,7 @@
 	struct checkpoint *checkpoint;
 
 	if (list_empty(head)) {
-		log_printf (LOG_LEVEL_NOTICE, "clean_checkpoint_list: List is empty \n");
+		log_printf (LOG_LEVEL_DEBUG, "clean_checkpoint_list: List is empty \n");
 		return;
 	}
 
@@ -1365,7 +1365,7 @@
 		* If checkpoint has been unlinked and this is the last reference, delete it
 		*/
 		 if (checkpoint->unlinked && checkpoint->referenceCount == 1) { /*defect 1129*/
-			log_printf (LOG_LEVEL_NOTICE,"clean_checkpoint_list: deallocating checkpoint %s.\n",
+			log_printf (LOG_LEVEL_DEBUG,"clean_checkpoint_list: deallocating checkpoint %s.\n",
                                                                                                 checkpoint->name.value);
 			checkpoint_list = checkpoint_list->next;
 			checkpoint_release (checkpoint);
@@ -1373,7 +1373,7 @@
 
 		}
 		else if ((checkpoint->expired == 0) && (checkpoint->referenceCount == 1)) { /*defect 1192*/
-			log_printf (LOG_LEVEL_NOTICE, "clean_checkpoint_list: Starting timer to release checkpoint %s.\n",
+			log_printf (LOG_LEVEL_DEBUG, "clean_checkpoint_list: Starting timer to release checkpoint %s.\n",
 				checkpoint->name.value);
 			openais_timer_delete (checkpoint->retention_timer);
 			openais_timer_add (
@@ -2562,7 +2562,7 @@
 		if (section_descriptor->section_size
 			> checkpoint_section->section_descriptor.section_size) {
 
-			log_printf (LOG_LEVEL_NOTICE,
+			log_printf (LOG_LEVEL_DEBUG,
 				"recovery_section_create reallocating data. Present Size: %d, New Size: %d\n",
 				(int)checkpoint_section->section_descriptor.section_size,
 				(int)section_descriptor->section_size);

revision-1193.patch:
 ckpt.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE revision-1193.patch ---
Index: exec/ckpt.c
===================================================================
--- exec/ckpt.c	(revision 1192)
+++ exec/ckpt.c	(revision 1193)
@@ -1006,6 +1006,7 @@
 							sizeof(mar_ckpt_section_descriptor_t));
 
 					request_exec_sync_state.nodeid = this_ip->nodeid;
+					request_exec_sync_state.ckpt_id = checkpoint->ckpt_id;
 
 					for (i = 0; i < PROCESSOR_COUNT_MAX; i++) {
 


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openais.spec	24 Jul 2006 01:45:46 -0000	1.9
+++ openais.spec	8 Aug 2006 16:19:31 -0000	1.10
@@ -1,12 +1,28 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
 Version: 0.80
-Release: 1.0
+Release: 1.1
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz
 Patch0: openais-0.76-defaultconfig.patch
+Patch1: revision-1173.patch
+Patch2: revision-1179.patch
+Patch3: revision-1180.patch
+Patch4: revision-1181.patch
+Patch5: revision-1182.patch
+Patch6: revision-1183.patch
+Patch7: revision-1184.patch
+Patch8: revision-1185.patch
+Patch9: revision-1186.patch
+Patch10: revision-1187.patch
+Patch11: revision-1188.patch
+Patch12: revision-1189.patch
+Patch13: revision-1190.patch
+Patch14: revision-1191.patch
+Patch15: revision-1192.patch
+Patch16: revision-1193.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x
 Requires(pre): /usr/sbin/useradd
@@ -31,6 +47,22 @@
 %prep
 %setup -q -n openais-%{version}
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
+%patch10 -p0
+%patch11 -p0
+%patch12 -p0
+%patch13 -p0
+%patch14 -p0
+%patch15 -p0
+%patch16 -p0
 
 %build
 # -O3 required for performance reasons
@@ -164,6 +196,9 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
+* Tue Aug 8 2006 Steven Dake <sdake at redhat.com>  - 0.80-1.1
+- New process of tracking any revisions in the upstream stable branch.
+
 * Sun Jul 23 2006 Steven Dake <sdake at redhat.com> - 0.80-1.0
 - New upstream release.
 - Added openais-cfgtool tool to install.



From fedora-cvs-commits at redhat.com  Tue Aug  8 16:25:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 12:25:04 -0400
Subject: rpms/kernel/devel/configs config-s390-generic,1.20,1.21
Message-ID: <200608081625.k78GP4Bh021958@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-s390-generic 
Log Message:
build sclp cpi as a module


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- config-s390-generic	26 Jul 2006 22:32:29 -0000	1.20
+++ config-s390-generic	8 Aug 2006 16:25:02 -0000	1.21
@@ -63,7 +63,7 @@
 CONFIG_SCLP_CONSOLE=y
 CONFIG_SCLP_VT220_TTY=y
 CONFIG_SCLP_VT220_CONSOLE=y
-CONFIG_SCLP_CPI=y
+CONFIG_SCLP_CPI=m
 CONFIG_S390_TAPE=m
 CONFIG_S390_TAPE_3590=m
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 16:33:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 12:33:13 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-offscreen-pixmaps.patch, 1.1,
	1.2 xorg-x11-server.spec, 1.143, 1.144
Message-ID: <200608081633.k78GXDAP024574@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server-1.1.1-offscreen-pixmaps.patch 
	xorg-x11-server.spec 
Log Message:
* Tue Aug  8 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-18.fc6
- Update offscreen-pixmaps patch to migrate pixmaps when the compiz
  selection is taken.


xorg-x11-server-1.1.1-offscreen-pixmaps.patch:
 xaaInit.c |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

Index: xorg-x11-server-1.1.1-offscreen-pixmaps.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-offscreen-pixmaps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.1-offscreen-pixmaps.patch	7 Aug 2006 18:32:27 -0000	1.1
+++ xorg-x11-server-1.1.1-offscreen-pixmaps.patch	8 Aug 2006 16:33:11 -0000	1.2
@@ -1,17 +1,60 @@
-Patch to force pixmaps to be allocated in host memory.  Work in
-progress, will eventually allow the xserver to keep pixmaps in video
-memory until the root window is redirected.  At that point pixmaps are
-evicted to host memory and subsequent pixmap allocations are done in
-host memory.
-
---- ./hw/xfree86/xaa/xaaInitAccel.c.no-offscreen-pixmaps	2006-08-07 14:21:11.000000000 -0400
-+++ ./hw/xfree86/xaa/xaaInitAccel.c	2006-08-07 14:20:44.000000000 -0400
-@@ -92,7 +92,7 @@
-     {XAAOPT_PIXMAP_CACHE,		"XaaNoPixmapCache",
- 				OPTV_BOOLEAN,	{0}, FALSE },
-     {XAAOPT_OFFSCREEN_PIXMAPS,		"XaaNoOffscreenPixmaps",
--				OPTV_BOOLEAN,	{0}, FALSE },
-+				OPTV_BOOLEAN,	{0}, TRUE },
-     { -1,				NULL,
- 				OPTV_NONE,	{0}, FALSE }
- };
+--- ./hw/xfree86/xaa/xaaInit.c.offscreen-pixmaps	2006-07-05 14:31:42.000000000 -0400
++++ ./hw/xfree86/xaa/xaaInit.c	2006-08-07 18:44:21.000000000 -0400
+@@ -98,6 +98,34 @@
+     xfree(infoRec);
+ }
+ 
++static void
++SelectionChangedCallback (CallbackListPtr *list,
++			  pointer xaaData, pointer callData)
++{
++    static Atom atom = BAD_RESOURCE;
++    static char atom_name[] = "_COMPIZ_GL_INCLUDE_INFERIORS";
++
++    SelectionInfoPtr info = call_data;
++    XAAInfoRecPtr infoRec = xaa_data;
++
++    if (atom == BAD_RESOURCE)
++    {
++	atom = MakeAtom(atom_name, strlen(atom_name), True);
++	if (atom == BAD_RESOURCE)
++	    return;
++    }
++
++    if (info->selection->selection == atom &&
++	info->kind == SelectionSetOwner &&
++	info->selection->window != None)
++    {
++	infoRec->offscreenDepths = 0;
++	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
++       
++	XAAMoveOutOffscreenPixmaps(pScreen);
++	XAAInvalidatePixmapCache(pScreen);
++    }
++}
+ 
+ Bool 
+ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
+@@ -228,11 +256,11 @@
+     if(infoRec->Flags & MICROSOFT_ZERO_LINE_BIAS)
+ 	miSetZeroLineBias(pScreen, OCTANT1 | OCTANT2 | OCTANT3 | OCTANT4);
+ 
++    AddCallback(&SelectionCallback, SelectionChangedCallback, infoRec);
++
+     return TRUE;
+ }
+ 
+-
+-
+ static Bool
+ XAACloseScreen (int i, ScreenPtr pScreen)
+ {
+@@ -264,6 +292,8 @@
+ 
+     xfree ((pointer) pScreenPriv);
+ 
++    DeleteCallback(&SelectionCallback, SelectionChangedCallback, infoRec);
++
+     return (*pScreen->CloseScreen) (i, pScreen);
+ }
+ 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- xorg-x11-server.spec	7 Aug 2006 20:54:56 -0000	1.143
+++ xorg-x11-server.spec	8 Aug 2006 16:33:11 -0000	1.144
@@ -7,8 +7,8 @@
 # For rawhide builds, bump the number /before/ the dist tag.  For package
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
-# the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   17.fc5.aiglx
+# the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
+Release:   18%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -32,7 +32,6 @@
 Patch104:  xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
 Patch105:  xorg-x11-server-1.1.1-enable-composite.patch
 Patch106:  xorg-x11-server-1.1.1-no-composite-in-xnest.patch
-# Work-in-progress; for now just defaults XaaNoOffscreenPixmaps to false.
 Patch107:  xorg-x11-server-1.1.1-offscreen-pixmaps.patch
 
 # Red Hat specific tweaking, not intended for upstream
@@ -331,7 +330,7 @@
 %patch104 -p0 -b .mesa-copy-sub-buffer
 %patch105 -p0 -b .enable-composite
 %patch106 -p1 -b .no-xnest-composite
-%patch107 -p0 -b .offscreen-pixmaps
+%patch107 -p1 -b .offscreen-pixmaps
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
@@ -681,6 +680,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Aug  8 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-18.fc6
+- Update offscreen-pixmaps patch to migrate pixmaps when the compiz
+  selection is taken.
+
 * Mon Aug  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-17.fc5.aiglx
 - Build for fc5 aiglx repo.
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 16:34:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 12:34:09 -0400
Subject: rpms/kde-i18n/devel .cvsignore, 1.36, 1.37 kde-i18n.spec, 1.66,
	1.67 sources, 1.38, 1.39
Message-ID: <200608081634.k78GY9Is024879@cvs.devel.redhat.com>

Author: than

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	4 Jun 2006 21:18:56 -0000	1.36
+++ .cvsignore	8 Aug 2006 16:34:06 -0000	1.37
@@ -297,3 +297,42 @@
 kde-i18n-zh_CN-3.5.3.tar.bz2
 kde-i18n-zh_TW-3.5.3.tar.bz2
 kde-i18n-ko-3.5.3.tar.bz2
+kde-i18n-ar-3.5.4.tar.bz2
+kde-i18n-bg-3.5.4.tar.bz2
+kde-i18n-bn-3.5.4.tar.bz2
+kde-i18n-ca-3.5.4.tar.bz2
+kde-i18n-cs-3.5.4.tar.bz2
+kde-i18n-da-3.5.4.tar.bz2
+kde-i18n-de-3.5.4.tar.bz2
+kde-i18n-el-3.5.4.tar.bz2
+kde-i18n-en_GB-3.5.4.tar.bz2
+kde-i18n-es-3.5.4.tar.bz2
+kde-i18n-et-3.5.4.tar.bz2
+kde-i18n-fi-3.5.4.tar.bz2
+kde-i18n-fr-3.5.4.tar.bz2
+kde-i18n-he-3.5.4.tar.bz2
+kde-i18n-hi-3.5.4.tar.bz2
+kde-i18n-hu-3.5.4.tar.bz2
+kde-i18n-is-3.5.4.tar.bz2
+kde-i18n-it-3.5.4.tar.bz2
+kde-i18n-ja-3.5.4.tar.bz2
+kde-i18n-ko-3.5.4.tar.bz2
+kde-i18n-lt-3.5.4.tar.bz2
+kde-i18n-nb-3.5.4.tar.bz2
+kde-i18n-nl-3.5.4.tar.bz2
+kde-i18n-nn-3.5.4.tar.bz2
+kde-i18n-pa-3.5.4.tar.bz2
+kde-i18n-pl-3.5.4.tar.bz2
+kde-i18n-pt-3.5.4.tar.bz2
+kde-i18n-pt_BR-3.5.4.tar.bz2
+kde-i18n-ro-3.5.4.tar.bz2
+kde-i18n-ru-3.5.4.tar.bz2
+kde-i18n-sk-3.5.4.tar.bz2
+kde-i18n-sl-3.5.4.tar.bz2
+kde-i18n-sr-3.5.4.tar.bz2
+kde-i18n-sv-3.5.4.tar.bz2
+kde-i18n-ta-3.5.4.tar.bz2
+kde-i18n-tr-3.5.4.tar.bz2
+kde-i18n-uk-3.5.4.tar.bz2
+kde-i18n-zh_CN-3.5.4.tar.bz2
+kde-i18n-zh_TW-3.5.4.tar.bz2


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kde-i18n.spec	9 Jun 2006 17:41:11 -0000	1.66
+++ kde-i18n.spec	8 Aug 2006 16:34:06 -0000	1.67
@@ -3,8 +3,8 @@
 %define redhatify 1
 
 Name: kde-i18n
-Version: 3.5.3
-Release: 3
+Version: 3.5.4
+Release: 1
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -1145,6 +1145,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Tue Aug 08 2006 Than Ngo <than at redhat.com> 1:3.5.4-1
+- 3.5.4
+
 * Fri Jun 09 2006 Than Ngo <than at redhat.com> 1:3.5.3-3
 - fix dangling symlinks
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	4 Jun 2006 21:18:56 -0000	1.38
+++ sources	8 Aug 2006 16:34:06 -0000	1.39
@@ -1,39 +1,39 @@
-66358501eade79f2600f65767826268a  kde-i18n-ar-3.5.3.tar.bz2
-5ee352d11d976d133343575c0267e7df  kde-i18n-bg-3.5.3.tar.bz2
-a2764d9391d71125ebba255dcde003f7  kde-i18n-bn-3.5.3.tar.bz2
-c9519abf1f62bf69a7288f4144d680c9  kde-i18n-ca-3.5.3.tar.bz2
-e7a350afd2914188449749f10ad6d0bf  kde-i18n-cs-3.5.3.tar.bz2
-0e347230250eb65f8f6722ecacbaface  kde-i18n-da-3.5.3.tar.bz2
-e449fb462911191447210b8e2c8ccb8d  kde-i18n-de-3.5.3.tar.bz2
-aeeea7a9079ff5fd8f0bcfd34452ee4e  kde-i18n-el-3.5.3.tar.bz2
-1029cfba62fdd93fa2dc900111df2a4c  kde-i18n-en_GB-3.5.3.tar.bz2
-a84067e863f9c4eb6fdc1f64d03010b9  kde-i18n-es-3.5.3.tar.bz2
-e6b667f07e4426c2bdb1cda59b081272  kde-i18n-et-3.5.3.tar.bz2
-def712679b92b831b04ae704157f0c4f  kde-i18n-fi-3.5.3.tar.bz2
-02cd975bb784378b443855b8827b9607  kde-i18n-fr-3.5.3.tar.bz2
-2800fd107ca1879abec14d0600704a5d  kde-i18n-he-3.5.3.tar.bz2
-cde643d8b8760d092a16b475fdef3e89  kde-i18n-hi-3.5.3.tar.bz2
-18faeab413d89d3c9bde9fe1a6fb17a6  kde-i18n-hu-3.5.3.tar.bz2
-ecfd4dcb121a15fc69af80354d48d0f1  kde-i18n-is-3.5.3.tar.bz2
-ad8e550f7a2656fa6c5210881fd09bc7  kde-i18n-it-3.5.3.tar.bz2
-0bd28615477ec56978dcf5e700c1e5c3  kde-i18n-ja-3.5.3.tar.bz2
-e36ddd66007a7a405369731bea56ae83  kde-i18n-lt-3.5.3.tar.bz2
-b8698e7aa889cc25a65c948fb4228b9c  kde-i18n-nb-3.5.3.tar.bz2
-ebc1507bf23421c07e0e1bce2bcb216e  kde-i18n-nl-3.5.3.tar.bz2
-eed3d9cd4271df35b78fdb7aaf9c11e4  kde-i18n-nn-3.5.3.tar.bz2
-1bf7fb2adbf61536be4872d8be1dd5cd  kde-i18n-pa-3.5.3.tar.bz2
-7a57d7bf02a2700c71cb495894e08f81  kde-i18n-pl-3.5.3.tar.bz2
-31017190b2d125f4b072b84e6f8752f4  kde-i18n-pt-3.5.3.tar.bz2
-d76371a7a63cd728bfc6ff26c8f059bc  kde-i18n-pt_BR-3.5.3.tar.bz2
-e1a7a05994927ab9ac76174430d76991  kde-i18n-ro-3.5.3.tar.bz2
-a30e44b4dcaf0ff2937eb870903f3a47  kde-i18n-ru-3.5.3.tar.bz2
-6d74e2e2d58e0c10c177d9852e283f14  kde-i18n-sk-3.5.3.tar.bz2
-49f0579ca96ecbe65cee0ad13e2fd144  kde-i18n-sl-3.5.3.tar.bz2
-d8823f8b5765a61b290346257c660c61  kde-i18n-sr-3.5.3.tar.bz2
-dad7a462acf4dc90790aaeb63320e839  kde-i18n-sv-3.5.3.tar.bz2
-987f75a1f89abaa6f3562ef94d75d84d  kde-i18n-ta-3.5.3.tar.bz2
-598d5f55f9e4512757ee40f802968097  kde-i18n-tr-3.5.3.tar.bz2
-a852a8e6f9ee1c807e16f511ba4981a3  kde-i18n-uk-3.5.3.tar.bz2
-b57a6684ef11d1b0ac6d18824ac42799  kde-i18n-zh_CN-3.5.3.tar.bz2
-957f858c53efa4c62ed4bfa3dd06ddfe  kde-i18n-zh_TW-3.5.3.tar.bz2
-6076f24c27ad2a52eb3675e10e6b2af9  kde-i18n-ko-3.5.3.tar.bz2
+d537027991c11417e4d3ede0ced3c142  kde-i18n-ar-3.5.4.tar.bz2
+2340d20511d54856883c53536138da41  kde-i18n-bg-3.5.4.tar.bz2
+a68c7180e9229db5c308892d89a626d5  kde-i18n-bn-3.5.4.tar.bz2
+3666508969cbe2ce8a52f0a6f67bf3f4  kde-i18n-ca-3.5.4.tar.bz2
+639887411d07ea92f0c733e66eb01b47  kde-i18n-cs-3.5.4.tar.bz2
+ef845c89fac91948ea9784593cd1b3fb  kde-i18n-da-3.5.4.tar.bz2
+45b90d7e08391836108ca3db19c0febf  kde-i18n-de-3.5.4.tar.bz2
+00d834a86e31d9d03a583c6c40565094  kde-i18n-el-3.5.4.tar.bz2
+244175fa2be8023a4a6246c795972b5e  kde-i18n-en_GB-3.5.4.tar.bz2
+2c4e049753425d9405e86fed98f3c958  kde-i18n-es-3.5.4.tar.bz2
+7209f997e7c418d2884bc278ff6d642c  kde-i18n-et-3.5.4.tar.bz2
+c2ef5fad94bcb04ee7e1a363593ff685  kde-i18n-fi-3.5.4.tar.bz2
+1fdeb2af12a6096258d08ff339000e8c  kde-i18n-fr-3.5.4.tar.bz2
+b861796702141e198873614b1428cc3a  kde-i18n-he-3.5.4.tar.bz2
+9b07d10f948803f6fca49666934517c3  kde-i18n-hi-3.5.4.tar.bz2
+cc25aebee25f07bfe6510cdcf39e743d  kde-i18n-hu-3.5.4.tar.bz2
+ff1e7b4b500a2032530c101a1473895a  kde-i18n-is-3.5.4.tar.bz2
+b050d738e3e7386134e4a657a38b5c24  kde-i18n-it-3.5.4.tar.bz2
+48f1c83d7a1b08429ec4ac003a85293f  kde-i18n-ja-3.5.4.tar.bz2
+af106fb9c73f61b08eb5441b0c15871f  kde-i18n-ko-3.5.4.tar.bz2
+5c8bf80d151685785cf16d0d60912441  kde-i18n-lt-3.5.4.tar.bz2
+c322d1d4a04e327a76effd78d36b407d  kde-i18n-nb-3.5.4.tar.bz2
+c97771e5c1398182a99d50926fa58eb3  kde-i18n-nl-3.5.4.tar.bz2
+97b12a156442c4da083423789f8d1506  kde-i18n-nn-3.5.4.tar.bz2
+c513951282dc7918acde5e29220f7103  kde-i18n-pa-3.5.4.tar.bz2
+47787ef2ad8516f4e0ca21b5daec64cc  kde-i18n-pl-3.5.4.tar.bz2
+7ccc83aacaaa1609a66378661ee0b10b  kde-i18n-pt-3.5.4.tar.bz2
+42e5ed51573df1415f245d201a13095d  kde-i18n-pt_BR-3.5.4.tar.bz2
+40f3c27e4aa33d80fe4d7d97ae761d74  kde-i18n-ro-3.5.4.tar.bz2
+b916c3eb4af74da0a620fa006defcd8a  kde-i18n-ru-3.5.4.tar.bz2
+2c4d939f395894b14c976235b81ae81e  kde-i18n-sk-3.5.4.tar.bz2
+7f253c3e29e1fed72014b2101a9c2ce9  kde-i18n-sl-3.5.4.tar.bz2
+6736f6480dcdffab6bd25883495fb661  kde-i18n-sr-3.5.4.tar.bz2
+5097306cb3d02d45366471cfa4dbe7b2  kde-i18n-sv-3.5.4.tar.bz2
+e5e11f4e3b1b3e4a40079ad963efbfe3  kde-i18n-ta-3.5.4.tar.bz2
+01453f054f5595660c8bc0aa5d589520  kde-i18n-tr-3.5.4.tar.bz2
+5ee00967f1e91474f1aa462e1bf0fac3  kde-i18n-uk-3.5.4.tar.bz2
+c1f8e26b1129513ef83357c65ab2db94  kde-i18n-zh_CN-3.5.4.tar.bz2
+8893190922de3905ebd909ad58e45dc9  kde-i18n-zh_TW-3.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug  8 16:56:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 12:56:07 -0400
Subject: rpms/gnucash/devel gnucash.spec,1.51,1.52
Message-ID: <200608081656.k78Gu7ku014270@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	gnucash.spec 
Log Message:
fix schema list



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnucash.spec	1 Aug 2006 13:54:01 -0000	1.51
+++ gnucash.spec	8 Aug 2006 16:56:05 -0000	1.52
@@ -7,9 +7,9 @@
 Summary: GnuCash is an application to keep track of your finances.
 Version: 2.0.1
 %if %{buildsvn}
-Release: 1.%{svnrev}svn.1
+Release: 2.%{svnrev}svn.1
 %else
-Release: 1
+Release: 2
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -120,8 +120,7 @@
 /usr/bin/scrollkeeper-update -o %{_datadir}/omf/gnucash-docs
 
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-SCHEMAS="apps_gnucash_dialog_business_common.schemas apps_gnucash_dialog_commodities.schemas apps_gnucash_dialog_common.schemas apps_gnucash_dialog_hbci.schemas apps_gnucash_dialog_prices.schemas apps_gnucash_dialog_reconcile.schemas apps_gnucash_dialog_totd.schemas apps_gnucash_general.schemas apps_gnucash_history.schemas apps_gnucash_import_generic_matcher.schemas apps_gnucash_warnings.schemas apps_gnucash_window_pages_account_tree.schemas apps_gnucash_window_pages_register.schemas"
-
+SCHEMAS="apps_gnucash_dialog_business_common.schemas apps_gnucash_dialog_commodities.schemas apps_gnucash_dialog_common.schemas apps_gnucash_dialog_hbci.schemas apps_gnucash_dialog_prices.schemas apps_gnucash_dialog_print_checks.schemas apps_gnucash_dialog_reconcile.schemas apps_gnucash_dialog_scheduled_transctions.schemas apps_gnucash_dialog_totd.schemas apps_gnucash_general.schemas apps_gnucash_history.schemas apps_gnucash_import_generic_matcher.schemas apps_gnucash_warnings.schemas apps_gnucash_window_pages_account_tree.schemas apps_gnucash_window_pages_register.schemas"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
 done
@@ -151,6 +150,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Aug  8 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-2
+- fix schema list
+
 * Tue Aug  1 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-1
 - update to 2.0.1
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 17:12:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 13:12:50 -0400
Subject: rpms/pm-utils/devel .cvsignore, 1.21,
	1.22 pm-utils-0.19-vidhooks.patch, 1.3, 1.4 pm-utils.spec,
	1.41, 1.42 sources, 1.26, 1.27
Message-ID: <200608081712.k78HCokE018367@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	.cvsignore pm-utils-0.19-vidhooks.patch pm-utils.spec sources 
Log Message:
- fixes for intel i810 and various hardware
- workaround stupid vbetool feature



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	14 Jun 2006 02:59:28 -0000	1.21
+++ .cvsignore	8 Aug 2006 17:12:47 -0000	1.22
@@ -1,4 +1,3 @@
 vbetool_0.5-1.tar.gz
 radeontool-1.5.tar.gz
-pm-utils-0.18.tar.gz
-pm-utils-0.19.tar.gz
+pm-utils-0.19.1.tar.gz

pm-utils-0.19-vidhooks.patch:
 Makefile.am      |    3 +
 Makefile.in      |    3 +
 functions        |   91 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 functions-ati    |   96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 functions-intel  |   29 ++++++++++++++++
 functions-nvidia |   30 +++++++++++++++++
 hooks/20video    |   34 +++++++------------
 7 files changed, 265 insertions(+), 21 deletions(-)

Index: pm-utils-0.19-vidhooks.patch
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils-0.19-vidhooks.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pm-utils-0.19-vidhooks.patch	31 Jul 2006 19:24:32 -0000	1.3
+++ pm-utils-0.19-vidhooks.patch	8 Aug 2006 17:12:47 -0000	1.4
@@ -258,7 +258,7 @@
 +resume_video()
 +{
 +{
-+	/usr/sbin/vbetool post
++	/usr/sbin/vbetool post < /dev/tty1
 +#	/usr/sbin/vbetool vbestate restore < /var/run/vbestate
 +} >/dev/null 2>&1
 +}


Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pm-utils.spec	31 Jul 2006 19:24:32 -0000	1.41
+++ pm-utils.spec	8 Aug 2006 17:12:47 -0000	1.42
@@ -1,8 +1,8 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
-Version: 0.19
-Release: 3 
+Version: 0.19.1
+Release: 1
 Group: System Environment/Base
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
@@ -114,6 +114,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Aug  8 2006 Peter Jones <pjones at redhat.com> - 0.19.1-1
+- Hopefully fix Centrino ThinkPad suspend+resume
+- Hopefully fix Intel Mac Mini/MacBook suspend+resume
+
 * Mon Jul 31 2006 Jeremy Katz <katzj at redhat.com> - 0.19-3
 - doing the vbestate save/restore on intel video with the modesetting 
   intel xorg driver is broken.  so don't do it.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Jun 2006 04:10:51 -0000	1.26
+++ sources	8 Aug 2006 17:12:47 -0000	1.27
@@ -1,4 +1,3 @@
 8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
 950a87f99d17bc4f4ced73cec7103859  vbetool_0.5-1.tar.gz
-1dba0a22ca8ccd235ee40de0ed59442a  pm-utils-0.18.tar.gz
-2c83f260940deb244f19e7545543e829  pm-utils-0.19.tar.gz
+843c93269c70684269e515b60e8f9b1d  pm-utils-0.19.1.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  8 17:21:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 13:21:02 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.14, 1.15 setroubleshoot.spec,
	1.18, 1.19 sources, 1.16, 1.17
Message-ID: <200608081721.k78HL2Or003692@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3658/devel

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	7 Aug 2006 22:09:36 -0000	1.14
+++ .cvsignore	8 Aug 2006 17:20:59 -0000	1.15
@@ -1 +1 @@
-setroubleshoot-0.18.tar.gz
+setroubleshoot-0.19.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- setroubleshoot.spec	7 Aug 2006 22:09:36 -0000	1.18
+++ setroubleshoot.spec	8 Aug 2006 17:20:59 -0000	1.19
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.18
+Version: 0.19
 Release: 1
 License: GPL
 Group: Applications/System
@@ -95,6 +95,30 @@
 
 %changelog
 
+* Tue Aug 8 2006 Dan Walsh <dwalsh at redhat.com> - 0.19-1
+
+2006-08-08  Dan Walsh <dwalsh at redhat.com>
+	* Fix up handling of mls ranges in context
+	* Cleanup some pychecker errors
+
+2006-08-07  John Dennis  <jdennis at redhat.com>
+	* add first seen, last seen, and report count to alert detail view
+
+	* make the seen icon work, if the alert has been displayed more
+	than N seconds, mark the alert as having been seen by the user
+	and update the icon is the list view
+
+	* change the schema for the xml data; the database now has a version,
+	there is a local id attached to each signature, the filter list in
+	the siginfo was replaced by a list of per user data, the per user
+	data now contains the filter, seen_flag. Modify all the code which
+	was operating on the filter information to use the new model.
+
+	* fix the xml serialization so that booleans can be used as a basic
+	type and also so that non-string types can be used in element
+	attributes (e.g. int, bool) and the serialization code will
+	automatically convert between python types and strings.
+
 * Mon Aug 7 2006 Dan Walsh <dwalsh at redhat.com> - 0.18-1
 - Add dispatcher.py
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Aug 2006 22:09:36 -0000	1.16
+++ sources	8 Aug 2006 17:20:59 -0000	1.17
@@ -1 +1 @@
-072936e9619b027c9b1f1ba291accc8d  setroubleshoot-0.18.tar.gz
+85bf0e61214dac42eca4e86ab1360eec  setroubleshoot-0.19.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  8 17:21:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 13:21:31 -0400
Subject: rpms/firefox/FC-5 firefox.spec,1.118,1.119
Message-ID: <200608081721.k78HLVuQ003930@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	firefox.spec 
Log Message:
bump, add dist



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/firefox.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- firefox.spec	3 Aug 2006 19:09:38 -0000	1.118
+++ firefox.spec	8 Aug 2006 17:21:29 -0000	1.119
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.6
-Release:        1.1.fc5
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -271,6 +271,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Aug 08 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0.6-2
+- Use dist tag
+- rebuild
+
 * Thu Aug 03 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-1.1.fc5
 - Update to 1.5.0.6
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 17:25:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 13:25:59 -0400
Subject: rpms/audit/devel audit-setroubleshoot.patch,1.5,1.6
Message-ID: <200608081725.k78HPxMu005663@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5593

Modified Files:
	audit-setroubleshoot.patch 
Log Message:
Remove debug lines


audit-setroubleshoot.patch:
 AuditMsg.py |   63 +++++++++++++++++++++++++------
 audispd     |  119 ++++++++++++++++++++++++------------------------------------
 2 files changed, 99 insertions(+), 83 deletions(-)

Index: audit-setroubleshoot.patch
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit-setroubleshoot.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- audit-setroubleshoot.patch	6 Aug 2006 00:03:41 -0000	1.5
+++ audit-setroubleshoot.patch	8 Aug 2006 17:25:56 -0000	1.6
@@ -1,5 +1,5 @@
 --- audit-1.2.5/audisp/audispd.setroubleshoot	2006-07-13 13:37:04.000000000 -0400
-+++ audit-1.2.5/audisp/audispd	2006-08-02 17:32:37.000000000 -0400
++++ audit-1.2.5/audisp/audispd	2006-08-08 13:25:04.000000000 -0400
 @@ -1,76 +1,44 @@
  #! /usr/bin/env python
  import os, string, select, syslog
@@ -98,7 +98,7 @@
              return 0
          else:
              return 500
-@@ -78,42 +46,55 @@
+@@ -78,42 +46,53 @@
      def run(self):
          global HUP
          sleep=500
@@ -118,7 +118,6 @@
 +                input,output, err = select.select(self.inList,[], self.outList, sleep)
 +                for s in input:
 +                    if s == 0:
-+                        syslog.syslog("s == 0")
 +                        msg = AuditMsg.AuditMsg()                    
 +                        if not msg.read_from_fd(0):
 +                            syslog.syslog("Connection closing")
@@ -131,7 +130,6 @@
 +                        self.outList.append(c)
 +
 +                for s in err:
-+                    syslog.syslog("s in err")
 +                    if s in self.outList:
 +                        s.close()
 +                        self.outList.remove(s)
@@ -172,7 +170,7 @@
  except Exception, e:
      syslog.syslog("Unexpected exception %s " % e)
 --- audit-1.2.5/audisp/AuditMsg.py.setroubleshoot	2006-07-13 13:36:08.000000000 -0400
-+++ audit-1.2.5/audisp/AuditMsg.py	2006-08-02 17:30:27.000000000 -0400
++++ audit-1.2.5/audisp/AuditMsg.py	2006-08-08 13:24:30.000000000 -0400
 @@ -1,33 +1,55 @@
  import struct, os
 +



From fedora-cvs-commits at redhat.com  Tue Aug  8 17:26:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 13:26:40 -0400
Subject: rpms/audit/devel audit.spec,1.105,1.106
Message-ID: <200608081726.k78HQeFw005940@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5890

Modified Files:
	audit.spec 
Log Message:
* Wed Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-7
- Remove debug lines from dispatcher



Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- audit.spec	6 Aug 2006 00:03:41 -0000	1.105
+++ audit.spec	8 Aug 2006 17:26:37 -0000	1.106
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.5
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -168,6 +168,9 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Wed Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-7
+- Remove debug lines from dispatcher
+
 * Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-6
 - Change audisp to use a named pipe
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 17:27:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 13:27:42 -0400
Subject: rpms/firefox/devel .cvsignore, 1.28, 1.29 firefox.spec, 1.138,
	1.139 sources, 1.31, 1.32
Message-ID: <200608081727.k78HRgR6006355@cvs.devel.redhat.com>

Author: kengert

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

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Thu Aug 03 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-2
- Update to 1.5.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	30 Jul 2006 04:08:01 -0000	1.28
+++ .cvsignore	8 Aug 2006 17:27:39 -0000	1.29
@@ -1,3 +1,2 @@
-firefox-1.5.0.5-source.tar.bz2
-firefox-langpacks-1.5.0.5-20060726.tar.bz2
-firefox-mozconfig
+firefox-1.5.0.6-source.tar.bz2
+firefox-langpacks-1.5.0.6-20060803.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- firefox.spec	30 Jul 2006 04:08:01 -0000	1.138
+++ firefox.spec	8 Aug 2006 17:27:39 -0000	1.139
@@ -10,8 +10,8 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.5.0.5
-Release:        8
+Version:        1.5.0.6
+Release:        2
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -21,7 +21,7 @@
 %define tarball firefox-1.5rc3-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source2:        firefox-langpacks-%{version}-20060726.tar.bz2
+Source2:        firefox-langpacks-%{version}-20060803.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html
@@ -354,6 +354,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Aug 03 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-2
+- Update to 1.5.0.6
+
 * Sun Jul 30 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.5-8
 - Pass --libdir to configure
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	27 Jul 2006 17:18:41 -0000	1.31
+++ sources	8 Aug 2006 17:27:39 -0000	1.32
@@ -1,2 +1,2 @@
-4ef41c8983c47c36efada10a867ffa6f  firefox-1.5.0.5-source.tar.bz2
-b7021e012b02a745e73e51e05308cd49  firefox-langpacks-1.5.0.5-20060726.tar.bz2
+3a659d384744cab77f90920f6d529c89  firefox-1.5.0.6-source.tar.bz2
+a040d41c7c6e6466d60b12f61a54268a  firefox-langpacks-1.5.0.6-20060803.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug  8 17:35:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 13:35:28 -0400
Subject: rpms/firefox/devel firefox.spec,1.139,1.140
Message-ID: <200608081735.k78HZSfP008124@cvs.devel.redhat.com>

Author: kengert

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

Modified Files:
	firefox.spec 
Log Message:
* Tue Aug 08 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-3
- Rebuild



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- firefox.spec	8 Aug 2006 17:27:39 -0000	1.139
+++ firefox.spec	8 Aug 2006 17:35:26 -0000	1.140
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.6
-Release:        2
+Release:        3
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -354,6 +354,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Aug 08 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-3
+- Rebuild
+
 * Thu Aug 03 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-2
 - Update to 1.5.0.6
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 17:51:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 13:51:57 -0400
Subject: rpms/thunderbird/FC-5 .cvsignore, 1.12, 1.13 sources, 1.15,
	1.16 thunderbird.spec, 1.71, 1.72
Message-ID: <200608081751.k78HpvQS028700@cvs.devel.redhat.com>

Author: kengert

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

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
* Tue Aug 08 2006 Kai Engert <kengert at redhat.com> - 1.5.0.5-1.1
- Update to 1.5.0.5
- Use dist tag



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	12 Jun 2006 23:30:00 -0000	1.12
+++ .cvsignore	8 Aug 2006 17:51:54 -0000	1.13
@@ -1,2 +1,2 @@
-thunderbird-1.5.0.4-source.tar.bz2
-thunderbird-langpacks-1.5.0.4-20060612.tar.bz2
+thunderbird-1.5.0.5-source.tar.bz2
+thunderbird-langpacks-1.5.0.5-20060726.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	12 Jun 2006 23:30:00 -0000	1.15
+++ sources	8 Aug 2006 17:51:54 -0000	1.16
@@ -1,2 +1,2 @@
-ada9c163f5b26fe81958e7a85340811e  thunderbird-1.5.0.4-source.tar.bz2
-b47823f68664d8a278be8b9a796cdce0  thunderbird-langpacks-1.5.0.4-20060612.tar.bz2
+b09d29f912c2133a75b44f4801fc62b0  thunderbird-1.5.0.5-source.tar.bz2
+937994ce5b8351902bd10df8da1b05aa  thunderbird-langpacks-1.5.0.5-20060726.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/thunderbird.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- thunderbird.spec	13 Jun 2006 04:06:18 -0000	1.71
+++ thunderbird.spec	8 Aug 2006 17:51:54 -0000	1.72
@@ -7,8 +7,8 @@
 
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
-Version:	1.5.0.4
-Release:	1.1.fc5
+Version:	1.5.0.5
+Release:	1.1%{?dist}
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -19,7 +19,7 @@
 %define tarball thunderbird-1.5rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-%{version}-20060612.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20060726.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -212,6 +212,10 @@
 #===============================================================================
 
 %changelog
+* Tue Aug 08 2006 Kai Engert <kengert at redhat.com> - 1.5.0.5-1.1
+- Update to 1.5.0.5
+- Use dist tag
+
 * Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-1.1.fc5
 - Update to 1.5.0.4
 - Fix desktop-file-utils requires



From fedora-cvs-commits at redhat.com  Tue Aug  8 18:04:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 14:04:09 -0400
Subject: rpms/jzlib/devel jzlib.spec,1.9,1.10
Message-ID: <200608081804.k78I49Ec007825@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jzlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7812

Modified Files:
	jzlib.spec 
Log Message:
- Re-sync with latest from JPP.
- Partially adopt new naming convention.




Index: jzlib.spec
===================================================================
RCS file: /cvs/dist/rpms/jzlib/devel/jzlib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jzlib.spec	24 Jul 2006 04:26:58 -0000	1.9
+++ jzlib.spec	8 Aug 2006 18:04:07 -0000	1.10
@@ -36,7 +36,7 @@
 
 Name:           jzlib
 Version:        1.0.7
-Release:        3jpp_2fc
+Release:        4jpp.1
 Epoch:          0
 Summary:        JZlib re-implementation of zlib in pure Java
 
@@ -69,6 +69,9 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post): 	%{__rm}
+Requires(post): 	/bin/ln
+Requires(postun):	%{__rm}
 
 %description    javadoc
 %{summary}.
@@ -76,6 +79,9 @@
 %package        demo
 Summary:        Examples for %{name}
 Group:          Development/Libraries/Java
+Requires(post): 	%{__rm}
+Requires(post): 	/bin/ln
+Requires(postun):	%{__rm}
 
 %description    demo
 %{summary}.
@@ -120,10 +126,19 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %post demo
 rm -f %{_datadir}/%{name}
 ln -s %{name}-%{version} %{_datadir}/%{name}
 
+%postun demo
+if [ "$1" = "0" ]; then
+    rm -f %{_datadir}/%{name}
+fi
 
 %post
 %if %{gcj_support}
@@ -161,6 +176,10 @@
 %ghost %doc %{_datadir}/%{name}
 
 %changelog
+* Tue Aug 08 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0.7-4jpp.1
+- Re-sync with latest from JPP.
+- Partially adopt new naming convention.
+
 * Sat Jul 22 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0.7-3jpp_2fc
 - Rebuild.
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 18:17:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 14:17:38 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-offscreen-pixmaps.patch, 1.2, 1.3
Message-ID: <200608081817.k78IHcfb023016@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server-1.1.1-offscreen-pixmaps.patch 
Log Message:
Update offscreen-pixmaps patch to always look up atom.

xorg-x11-server-1.1.1-offscreen-pixmaps.patch:
 xaaInit.c |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

Index: xorg-x11-server-1.1.1-offscreen-pixmaps.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-offscreen-pixmaps.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-server-1.1.1-offscreen-pixmaps.patch	8 Aug 2006 16:33:11 -0000	1.2
+++ xorg-x11-server-1.1.1-offscreen-pixmaps.patch	8 Aug 2006 18:17:36 -0000	1.3
@@ -1,6 +1,22 @@
---- ./hw/xfree86/xaa/xaaInit.c.offscreen-pixmaps	2006-07-05 14:31:42.000000000 -0400
-+++ ./hw/xfree86/xaa/xaaInit.c	2006-08-07 18:44:21.000000000 -0400
-@@ -98,6 +98,34 @@
+--- xorg-server-1.1.1/hw/xfree86/xaa/xaaInit.c.offscreen-pixmaps	2006-07-05 14:31:42.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/xaa/xaaInit.c	2006-08-08 14:02:05.000000000 -0400
+@@ -4,6 +4,7 @@
+ #include <xorg-config.h>
+ #endif
+ 
++#include <string.h>
+ #include "misc.h"
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+@@ -20,6 +21,7 @@
+ #include "xaawrap.h"
+ #include "xf86fbman.h"
+ #include "servermd.h"
++#include "selection.h"
+ 
+ #define MAX_PREALLOC_MEM	65536	/* MUST be >= 1024 */
+ 
+@@ -98,6 +100,29 @@
      xfree(infoRec);
  }
  
@@ -8,19 +24,14 @@
 +SelectionChangedCallback (CallbackListPtr *list,
 +			  pointer xaaData, pointer callData)
 +{
-+    static Atom atom = BAD_RESOURCE;
 +    static char atom_name[] = "_COMPIZ_GL_INCLUDE_INFERIORS";
 +
-+    SelectionInfoPtr info = call_data;
-+    XAAInfoRecPtr infoRec = xaa_data;
-+
-+    if (atom == BAD_RESOURCE)
-+    {
-+	atom = MakeAtom(atom_name, strlen(atom_name), True);
-+	if (atom == BAD_RESOURCE)
-+	    return;
-+    }
++    SelectionInfoRec *info = callData;
++    XAAInfoRecPtr infoRec = xaaData;
++    ScreenPtr pScreen = infoRec->pScrn->pScreen;
++    Atom atom;
 +
++    atom = MakeAtom(atom_name, strlen(atom_name), 0);
 +    if (info->selection->selection == atom &&
 +	info->kind == SelectionSetOwner &&
 +	info->selection->window != None)
@@ -35,7 +46,7 @@
  
  Bool 
  XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
-@@ -228,11 +256,11 @@
+@@ -228,11 +253,11 @@
      if(infoRec->Flags & MICROSOFT_ZERO_LINE_BIAS)
  	miSetZeroLineBias(pScreen, OCTANT1 | OCTANT2 | OCTANT3 | OCTANT4);
  
@@ -49,11 +60,12 @@
  static Bool
  XAACloseScreen (int i, ScreenPtr pScreen)
  {
-@@ -264,6 +292,8 @@
+@@ -264,6 +289,9 @@
  
      xfree ((pointer) pScreenPriv);
  
-+    DeleteCallback(&SelectionCallback, SelectionChangedCallback, infoRec);
++    DeleteCallback(&SelectionCallback, SelectionChangedCallback,
++		   pScreenPriv->AccelInfoRec);
 +
      return (*pScreen->CloseScreen) (i, pScreen);
  }



From fedora-cvs-commits at redhat.com  Tue Aug  8 19:28:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 15:28:11 -0400
Subject: rpms/kernel/devel git-gregkh.patch, NONE, 1.1 kernel-2.6.spec,
	1.2530, 1.2531
Message-ID: <200608081928.k78JSBj0014567@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	git-gregkh.patch 
Log Message:
GregKH's bits du jour.


git-gregkh.patch:
 Makefile                       |   23 ++++++-
 drivers/s390/char/tape_class.c |    2 
 drivers/s390/cio/device_fsm.c  |    1 
 drivers/s390/cio/device_ops.c  |    3 +
 fs/jfs/inode.c                 |   16 +----
 fs/jfs/jfs_inode.h             |    1 
 fs/jfs/super.c                 |  118 +++++++++++++++++++++++++++++++++++++++--
 usr/Makefile                   |    3 +
 8 files changed, 146 insertions(+), 21 deletions(-)

--- NEW FILE git-gregkh.patch ---
diff --git a/Makefile b/Makefile
index c2f78a5..c53ed56 100644
--- a/Makefile
+++ b/Makefile
@@ -436,12 +436,13 @@ core-y		:= usr/
 endif # KBUILD_EXTMOD
 
 ifeq ($(dot-config),1)
-# In this section, we need .config
+# Read in config
+-include include/config/auto.conf
 
+ifeq ($(KBUILD_EXTMOD),)
 # Read in dependencies to all Kconfig* files, make sure to run
 # oldconfig if changes are detected.
 -include include/config/auto.conf.cmd
--include include/config/auto.conf
 
 # To avoid any implicit rule to kick in, define an empty command
 $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
@@ -451,16 +452,27 @@ # with it and forgot to run make oldconf
 # if auto.conf.cmd is missing then we are probably in a cleaned tree so
 # we execute the config step to be sure to catch updated Kconfig files
 include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
-ifeq ($(KBUILD_EXTMOD),)
 	$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
 else
-	$(error kernel configuration not valid - run 'make prepare' in $(srctree) to update it)
-endif
+# external modules needs include/linux/autoconf.h and include/config/auto.conf
+# but do not care if they are up-to-date. Use auto.conf to trigger the test
+PHONY += include/config/auto.conf
+
+include/config/auto.conf:
+	$(Q)test -e include/linux/autoconf.h -a -e $@ || (		\
+	echo;								\
+	echo "  ERROR: Kernel configuration is invalid.";		\
+	echo "         include/linux/autoconf.h or $@ are missing.";	\
+	echo "         Run 'make oldconfig && make prepare' on kernel src to fix it.";	\
+	echo;								\
+	/bin/false)
+
+endif # KBUILD_EXTMOD
 
 else
 # Dummy target needed, because used as prerequisite
 include/config/auto.conf: ;
-endif
+endif # $(dot-config)
 
 # The all: target is the default when no target is given on the
 # command line.
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index 643b6d0..56b8761 100644
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -76,7 +76,7 @@ struct tape_class_device *register_tape_
 				device,
 				"%s", tcd->device_name
 			);
-	rc = PTR_ERR(tcd->class_device);
+	rc = IS_ERR(tcd->class_device) ? PTR_ERR(tcd->class_device) : 0;
 	if (rc)
 		goto fail_with_cdev;
 	rc = sysfs_create_link(
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 7a39e0b..6d91c2e 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -772,6 +772,7 @@ ccw_device_online_verify(struct ccw_devi
 	stsch(sch->schid, &sch->schib);
 
 	if (sch->schib.scsw.actl != 0 ||
+	    (sch->schib.scsw.stctl & SCSW_STCTL_STATUS_PEND) ||
 	    (cdev->private->irb.scsw.stctl & SCSW_STCTL_STATUS_PEND)) {
 		/*
 		 * No final status yet or final status not yet delivered
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index a601242..9e3de0b 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -263,6 +263,9 @@ ccw_device_wake_up(struct ccw_device *cd
 	/* Abuse intparm for error reporting. */
 	if (IS_ERR(irb))
 		cdev->private->intparm = -EIO;
+	else if (irb->scsw.cc == 1)
+		/* Retry for deferred condition code. */
+		cdev->private->intparm = -EAGAIN;
 	else if ((irb->scsw.dstat !=
 		  (DEV_STAT_CHN_END|DEV_STAT_DEV_END)) ||
 		 (irb->scsw.cstat != 0)) {
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 43e3f56..a223cf4 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -168,16 +168,15 @@ void jfs_dirty_inode(struct inode *inode
 	set_cflag(COMMIT_Dirty, inode);
 }
 
-static int
-jfs_get_blocks(struct inode *ip, sector_t lblock, unsigned long max_blocks,
-			struct buffer_head *bh_result, int create)
+int jfs_get_block(struct inode *ip, sector_t lblock,
+		  struct buffer_head *bh_result, int create)
 {
 	s64 lblock64 = lblock;
 	int rc = 0;
 	xad_t xad;
 	s64 xaddr;
 	int xflag;
-	s32 xlen = max_blocks;
+	s32 xlen = bh_result->b_size >> ip->i_blkbits;
 
 	/*
 	 * Take appropriate lock on inode
@@ -188,7 +187,7 @@ jfs_get_blocks(struct inode *ip, sector_
 		IREAD_LOCK(ip);
 
 	if (((lblock64 << ip->i_sb->s_blocksize_bits) < ip->i_size) &&
-	    (!xtLookup(ip, lblock64, max_blocks, &xflag, &xaddr, &xlen, 0)) &&
+	    (!xtLookup(ip, lblock64, xlen, &xflag, &xaddr, &xlen, 0)) &&
 	    xaddr) {
 		if (xflag & XAD_NOTRECORDED) {
 			if (!create)
@@ -255,13 +254,6 @@ #endif				/* _JFS_4K */
 	return rc;
 }
 
-static int jfs_get_block(struct inode *ip, sector_t lblock,
-			 struct buffer_head *bh_result, int create)
-{
-	return jfs_get_blocks(ip, lblock, bh_result->b_size >> ip->i_blkbits,
-			bh_result, create);
-}
-
 static int jfs_writepage(struct page *page, struct writeback_control *wbc)
 {
 	return nobh_writepage(page, jfs_get_block, wbc);
diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h
index b5c7da6..1fc48df 100644
--- a/fs/jfs/jfs_inode.h
+++ b/fs/jfs/jfs_inode.h
@@ -32,6 +32,7 @@ extern void jfs_truncate_nolock(struct i
 extern void jfs_free_zero_link(struct inode *);
 extern struct dentry *jfs_get_parent(struct dentry *dentry);
 extern void jfs_set_inode_flags(struct inode *);
+extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
 
 extern const struct address_space_operations jfs_aops;
 extern struct inode_operations jfs_dir_inode_operations;
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 4f6cfeb..143bcd1 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -26,6 +26,7 @@ #include <linux/mount.h>
 #include <linux/moduleparam.h>
 #include <linux/kthread.h>
 #include <linux/posix_acl.h>
+#include <linux/buffer_head.h>
 #include <asm/uaccess.h>
 #include <linux/seq_file.h>
 
@@ -298,7 +299,7 @@ static int parse_options(char *options, 
 			break;
 		}
 
-#if defined(CONFIG_QUOTA)
+#ifdef CONFIG_QUOTA
 		case Opt_quota:
 		case Opt_usrquota:
 			*flag |= JFS_USRQUOTA;
@@ -597,7 +598,7 @@ static int jfs_show_options(struct seq_f
 	if (sbi->flag & JFS_NOINTEGRITY)
 		seq_puts(seq, ",nointegrity");
 
-#if defined(CONFIG_QUOTA)
+#ifdef CONFIG_QUOTA
 	if (sbi->flag & JFS_USRQUOTA)
 		seq_puts(seq, ",usrquota");
 
@@ -608,6 +609,113 @@ #endif
 	return 0;
 }
 
+#ifdef CONFIG_QUOTA
+
+/* Read data from quotafile - avoid pagecache and such because we cannot afford
+ * acquiring the locks... As quota files are never truncated and quota code
+ * itself serializes the operations (and noone else should touch the files)
+ * we don't have to be afraid of races */
+static ssize_t jfs_quota_read(struct super_block *sb, int type, char *data,
+			      size_t len, loff_t off)
+{
+	struct inode *inode = sb_dqopt(sb)->files[type];
+	sector_t blk = off >> sb->s_blocksize_bits;
+	int err = 0;
+	int offset = off & (sb->s_blocksize - 1);
+	int tocopy;
+	size_t toread;
+	struct buffer_head tmp_bh;
+	struct buffer_head *bh;
+	loff_t i_size = i_size_read(inode);
+
+	if (off > i_size)
+		return 0;
+	if (off+len > i_size)
+		len = i_size-off;
+	toread = len;
+	while (toread > 0) {
+		tocopy = sb->s_blocksize - offset < toread ?
+				sb->s_blocksize - offset : toread;
+
+		tmp_bh.b_state = 0;
+		tmp_bh.b_size = 1 << inode->i_blkbits;
+		err = jfs_get_block(inode, blk, &tmp_bh, 0);
+		if (err)
+			return err;
+		if (!buffer_mapped(&tmp_bh))	/* A hole? */
+			memset(data, 0, tocopy);
+		else {
+			bh = sb_bread(sb, tmp_bh.b_blocknr);
+			if (!bh)
+				return -EIO;
+			memcpy(data, bh->b_data+offset, tocopy);
+			brelse(bh);
+		}
+		offset = 0;
+		toread -= tocopy;
+		data += tocopy;
+		blk++;
+	}
+	return len;
+}
+
+/* Write to quotafile */
+static ssize_t jfs_quota_write(struct super_block *sb, int type,
+			       const char *data, size_t len, loff_t off)
+{
+	struct inode *inode = sb_dqopt(sb)->files[type];
+	sector_t blk = off >> sb->s_blocksize_bits;
+	int err = 0;
+	int offset = off & (sb->s_blocksize - 1);
+	int tocopy;
+	size_t towrite = len;
+	struct buffer_head tmp_bh;
+	struct buffer_head *bh;
+
+	mutex_lock(&inode->i_mutex);
+	while (towrite > 0) {
+		tocopy = sb->s_blocksize - offset < towrite ?
+				sb->s_blocksize - offset : towrite;
+
+		tmp_bh.b_state = 0;
+		tmp_bh.b_size = 1 << inode->i_blkbits;
+		err = jfs_get_block(inode, blk, &tmp_bh, 1);
+		if (err)
+			goto out;
+		if (offset || tocopy != sb->s_blocksize)
+			bh = sb_bread(sb, tmp_bh.b_blocknr);
+		else
+			bh = sb_getblk(sb, tmp_bh.b_blocknr);
+		if (!bh) {
+			err = -EIO;
+			goto out;
+		}
+		lock_buffer(bh);
+		memcpy(bh->b_data+offset, data, tocopy);
+		flush_dcache_page(bh->b_page);
+		set_buffer_uptodate(bh);
+		mark_buffer_dirty(bh);
+		unlock_buffer(bh);
+		brelse(bh);
+		offset = 0;
+		towrite -= tocopy;
+		data += tocopy;
+		blk++;
+	}
+out:
+	if (len == towrite)
+		return err;
+	if (inode->i_size < off+len-towrite)
+		i_size_write(inode, off+len-towrite);
+	inode->i_version++;
+	inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+	mark_inode_dirty(inode);
+	mutex_unlock(&inode->i_mutex);
+	return len - towrite;
+}
+
+#endif
+
 static struct super_operations jfs_super_operations = {
 	.alloc_inode	= jfs_alloc_inode,
 	.destroy_inode	= jfs_destroy_inode,
@@ -621,7 +729,11 @@ static struct super_operations jfs_super
 	.unlockfs       = jfs_unlockfs,
 	.statfs		= jfs_statfs,
 	.remount_fs	= jfs_remount,
-	.show_options	= jfs_show_options
+	.show_options	= jfs_show_options,
+#ifdef CONFIG_QUOTA
+	.quota_read	= jfs_quota_read,
+	.quota_write	= jfs_quota_write,
+#endif
 };
 
 static struct export_operations jfs_export_operations = {
diff --git a/usr/Makefile b/usr/Makefile
index e938242..5b31c0b 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -35,6 +35,9 @@ quiet_cmd_initfs = GEN     $@
       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
 
 targets := initramfs_data.cpio.gz
+# do not try to update files included in initramfs
+$(deps_initramfs): ;
+
 $(deps_initramfs): klibcdirs
 # We rebuild initramfs_data.cpio.gz if:
 # 1) Any included file is newer then initramfs_data.cpio.gz


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2530
retrieving revision 1.2531
diff -u -r1.2530 -r1.2531
--- kernel-2.6.spec	7 Aug 2006 19:07:44 -0000	1.2530
+++ kernel-2.6.spec	8 Aug 2006 19:28:09 -0000	1.2531
@@ -264,6 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc4.bz2
+Patch2: git-gregkh.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -710,6 +711,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1691,6 +1693,9 @@
 %endif
 
 %changelog
+* Tue Aug  8 2006 Dave Jones <davej at redhat.com>
+- Pull post-rc4 fixes from GregKH's git tree.
+
 * Mon Aug  7 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc4
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 19:32:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 15:32:38 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.61, 1.62 firstboot.spec, 1.82,
	1.83 sources, 1.78, 1.79
Message-ID: <200608081932.k78JWc06015654@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15580

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	2 Aug 2006 20:35:59 -0000	1.61
+++ .cvsignore	8 Aug 2006 19:32:34 -0000	1.62
@@ -33,3 +33,4 @@
 firstboot-1.4.16.tar.bz2
 firstboot-1.4.17.tar.bz2
 firstboot-1.4.18.tar.bz2
+firstboot-1.4.19.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- firstboot.spec	2 Aug 2006 20:35:59 -0000	1.82
+++ firstboot.spec	8 Aug 2006 19:32:34 -0000	1.83
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.18
+Version: 1.4.19
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -108,6 +108,10 @@
 
 
 %changelog
+* Tue Aug 08 2006 Chris Lumens <clumens at redhat.com> 1.4.19-1
+- Don't fill in the Create User UI with whatever user happens to have
+  UID 500 (#200695).
+
 * Wed Aug 02 2006 Chris Lumens <clumens at redhat.com> 1.4.18-1
 - Remove ddc probe support that rhpxl no longer provides.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- sources	2 Aug 2006 20:35:59 -0000	1.78
+++ sources	8 Aug 2006 19:32:34 -0000	1.79
@@ -1 +1 @@
-df4995e88c3777ca0fc670565625cff2  firstboot-1.4.18.tar.bz2
+5fe397700f4a33125c53be68ab270fd9  firstboot-1.4.19.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug  8 19:46:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 15:46:47 -0400
Subject: rpms/gnucash/FC-5 gnucash.spec, 1.18.2.18, 1.18.2.19 sources,
	1.12.2.8, 1.12.2.9
Message-ID: <200608081946.k78Jklqj023734@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
      Tag: gnucash-g2-branch
	gnucash.spec sources 
Log Message:
update



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/gnucash.spec,v
retrieving revision 1.18.2.18
retrieving revision 1.18.2.19
diff -u -r1.18.2.18 -r1.18.2.19
--- gnucash.spec	13 Jul 2006 03:21:19 -0000	1.18.2.18
+++ gnucash.spec	8 Aug 2006 19:46:45 -0000	1.18.2.19
@@ -5,7 +5,7 @@
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 2.0.0
+Version: 2.0.1
 %if %{buildsvn}
 Release: 2.%{svnrev}svn.1
 %else
@@ -56,6 +56,7 @@
 #%patch3 -p1 -b .icon
 %patch4 -p1 -b .64bit
 #%patch5 -p1 -b .aq
+#%patch7 -p1 -b .guile
 
 %build
 %if %{buildsvn}
@@ -119,8 +120,7 @@
 /usr/bin/scrollkeeper-update -o %{_datadir}/omf/gnucash-docs
 
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-SCHEMAS="apps_gnucash_dialog_business_common.schemas apps_gnucash_dialog_commodities.schemas apps_gnucash_dialog_common.schemas apps_gnucash_dialog_hbci.schemas apps_gnucash_dialog_prices.schemas apps_gnucash_dialog_reconcile.schemas apps_gnucash_dialog_totd.schemas apps_gnucash_general.schemas apps_gnucash_history.schemas apps_gnucash_import_generic_matcher.schemas apps_gnucash_warnings.schemas apps_gnucash_window_pages_account_tree.schemas apps_gnucash_window_pages_register.schemas"
-
+SCHEMAS="apps_gnucash_dialog_business_common.schemas apps_gnucash_dialog_commodities.schemas apps_gnucash_dialog_common.schemas apps_gnucash_dialog_hbci.schemas apps_gnucash_dialog_prices.schemas apps_gnucash_dialog_print_checks.schemas apps_gnucash_dialog_reconcile.schemas apps_gnucash_dialog_scheduled_transctions.schemas apps_gnucash_dialog_totd.schemas apps_gnucash_general.schemas apps_gnucash_history.schemas apps_gnucash_import_generic_matcher.schemas apps_gnucash_warnings.schemas apps_gnucash_window_pages_account_tree.schemas apps_gnucash_window_pages_register.schemas"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
 done
@@ -150,7 +150,19 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
-* Mon Jul 10 2006 Bill Nottingham <notting at redhat.com> - 2.0.0-1.fc5
+* Tue Aug  8 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-1.fc5
+- fix schema list
+
+* Tue Aug  1 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-1
+- update to 2.0.1
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.0-2.1
+- rebuild
+
+* Tue Jul 11 2006 Bill Nottingham <notting at redhat.com> - 2.0.0-2
+- rebuild against new aqbanking
+
+* Mon Jul 10 2006 Bill Nottingham <notting at redhat.com> - 2.0.0-1
 - update to 2.0.0. Woo.
 
 * Mon Jun 19 2006 Bill Nottingham <notting at redhat.com> - 1.9.8-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/sources,v
retrieving revision 1.12.2.8
retrieving revision 1.12.2.9
diff -u -r1.12.2.8 -r1.12.2.9
--- sources	13 Jul 2006 03:21:19 -0000	1.12.2.8
+++ sources	8 Aug 2006 19:46:45 -0000	1.12.2.9
@@ -1,2 +1,2 @@
-d5802c398825500ec322bb2b3229aadd  gnucash-2.0.0.tar.gz
+627bdf6fab9152a1857e5bb8d4887f2a  gnucash-2.0.1.tar.gz
 9a84f681330aa61ea1aa7448b87e86a4  gnucash-docs-2.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug  8 19:51:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 15:51:27 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt-mm-builder.patch, NONE,
	1.1 eclipse-cdt.spec, 1.51, 1.52
Message-ID: <200608081951.k78JpRV8003985@cvs.devel.redhat.com>

Author: jjohnstn

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

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-mm-builder.patch 
Log Message:

* Tue Aug 08 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_11fc
- Fix Build Special Targets bug when importing a CVS project and
  using ManagedMake Project Wizard.
- Bugzilla 201269




eclipse-cdt-mm-builder.patch:
 AutotoolsMakefileBuilder.java |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

--- NEW FILE eclipse-cdt-mm-builder.patch ---
--- com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java.fix	2006-08-08 14:47:55.000000000 -0400
+++ com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java	2006-08-08 14:48:25.000000000 -0400
@@ -18,12 +18,19 @@ import java.util.Vector;
 
 import org.eclipse.cdt.make.core.IMakeBuilderInfo;
 import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
 import org.eclipse.cdt.managedbuilder.internal.core.GeneratedMakefileBuilder;
+import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo;
 import org.eclipse.core.resources.ICommand;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
 
 /**
  * This is the incremental builder associated with a managed build project. It dynamically 
@@ -34,6 +41,8 @@ import org.eclipse.core.runtime.IProgres
 public class AutotoolsMakefileBuilder extends GeneratedMakefileBuilder {
 	public static final String BUILDER_NAME = "genmakebuilder"; //$NON-NLS-1$
 	public static final String BUILDER_ID = AutotoolsPlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
+	public static final String MANAGED_BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
+	public static final String AUTOTOOLS_CONFIG_ID = AutotoolsPlugin.getUniqueIdentifier() + ".configuration1"; //$NON-NLS-1$
 
 	private IMakeBuilderInfo info;
 	
@@ -46,16 +55,21 @@ public class AutotoolsMakefileBuilder ex
 		IProjectDescription description = project.getDescription();
 		ICommand[] commands = description.getBuildSpec();
 
-		// TODO Remove this when the new StandardBuild nature adds the cbuilder
+		// TODO Remove the cbuilder check when the new StandardBuild nature adds the cbuilder
 		for (int i = 0; i < commands.length; i++) {
 			ICommand command = commands[i];
-			if (command.getBuilderName().equals("org.eclipse.cdt.core.cbuilder")) { //$NON-NLS-1$
+			String builderName = command.getBuilderName();
+			// If there is a ManagedMake makefile generator, remove it as it will
+			// cause an additional build "all" to occur when we are making any target.
+			if (builderName.equals("org.eclipse.cdt.core.cbuilder") ||
+					builderName.equals(MANAGED_BUILDER_ID)) { //$NON-NLS-1$
 				// Remove the command
 				Vector vec = new Vector(Arrays.asList(commands));
 				vec.removeElementAt(i);
 				vec.trimToSize();
 				ICommand[] tempCommands = (ICommand[]) vec.toArray(new ICommand[commands.length-1]); 
 				description.setBuildSpec(tempCommands);
+				project.setDescription(description, null);
 				break;
 			}
 		}
@@ -84,12 +98,18 @@ public class AutotoolsMakefileBuilder ex
 	
 	public static boolean hasTargetBuilder(IProject project) {
 		try {
-			IProjectDescription description = project.getDescription();
-			ICommand[] commands = description.getBuildSpec();
-			// See if the builder is already there
-			
-			for (int i = 0; i < commands.length; ++i) {
-				if (commands[i].getBuilderName().equals(BUILDER_ID)) {
+			// When a project is converted to an Autotools project, we
+			// replace the ManagedMake builder with a special one that
+			// handles MakeTargets.  If a project is brought into Eclipse and
+			// uses the New Project Wizard to create a ManagedMake project that
+			// is of type: Autotools, this added step is not done.  If we know
+			// we have an Autotools project from the configuration id, then
+			// we should add the builder now and return true.
+			if (project.getNature(ManagedCProjectNature.MNG_NATURE_ID) != null) {
+				IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+				IConfiguration config = info.getDefaultConfiguration();
+				if (config.getParent().getId().equals(AUTOTOOLS_CONFIG_ID)) {
+					addAutotoolsBuilder(project, new NullProgressMonitor());
 					return true;
 				}
 			}


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- eclipse-cdt.spec	31 Jul 2006 20:50:37 -0000	1.51
+++ eclipse-cdt.spec	8 Aug 2006 19:51:24 -0000	1.52
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_10fc
+Release: 	1jpp_11fc
 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
@@ -51,6 +51,7 @@
 Patch4: %{name}-no-tests.patch
 Patch5: %{name}-dynamic-scannerinfo-ext.patch
 Patch6: %{name}-libhover-jar.patch
+Patch7: %{name}-mm-builder.patch
 
 BuildRequires: eclipse-pde
 %if %{gcj_support}
@@ -100,6 +101,7 @@
 pushd autotools
 tar -xzf %{SOURCE1}
 %patch6 -p0
+%patch7 -p0
 popd
 
 # Upstream CVS includes random .so files.  Let's remove them now.
@@ -268,6 +270,11 @@
 %endif
 
 %changelog
+* Tue Aug 08 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_11fc
+- Fix Build Special Targets bug when importing a CVS project and
+  using ManagedMake Project Wizard.
+- Bugzilla 201269
+
 * Mon Jul 31 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_10fc
 - Fix bug with library hover help.
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 20:22:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 16:22:51 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2531,
	1.2532 linux-2.6-utrace.patch, 1.14, 1.15
Message-ID: <200608082022.k78KMphH028478@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
Fix utrace/ptrace interactions with SELinux.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2531
retrieving revision 1.2532
diff -u -r1.2531 -r1.2532
--- kernel-2.6.spec	8 Aug 2006 19:28:09 -0000	1.2531
+++ kernel-2.6.spec	8 Aug 2006 20:22:48 -0000	1.2532
@@ -1693,6 +1693,9 @@
 %endif
 
 %changelog
+* Tue Aug  8 2006 Roland McGrath <roland at redhat.com>
+- Fix utrace/ptrace interactions with SELinux.
+
 * Tue Aug  8 2006 Dave Jones <davej at redhat.com>
 - Pull post-rc4 fixes from GregKH's git tree.
 

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  455 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  839 +++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/ia32_entry.S             |    2 
 arch/ia64/ia32/sys_ia32.c               |   23 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/ia64/kernel/signal.c               |    4 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  553 ++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  688 +++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |   14 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   74 +
 include/asm-ia64/tracehook.h            |   67 +
 include/asm-powerpc/tracehook.h         |  303 ++++++
 include/asm-s390/tracehook.h            |  105 ++
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  106 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   86 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  641 +++++++++++++
 include/linux/utrace.h                  |  481 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  259 +----
 kernel/fork.c                           |   62 -
 kernel/ptrace.c                         | 1563 +++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1526 +++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |   54 -
 security/selinux/include/objsec.h       |    1 
 93 files changed, 8297 insertions(+), 3325 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-utrace.patch	7 Aug 2006 19:07:58 -0000	1.14
+++ linux-2.6-utrace.patch	8 Aug 2006 20:22:48 -0000	1.15
@@ -62,7 +62,7 @@
  fs/binfmt_flat.c                        |    3 
  fs/binfmt_som.c                         |    2 
  fs/exec.c                               |   11 
- fs/proc/array.c                         |    7 
+ fs/proc/array.c                         |   14 
  fs/proc/base.c                          |   17 
  include/asm-i386/i387.h                 |   13 
  include/asm-i386/signal.h               |    4 
@@ -78,19 +78,20 @@
  include/linux/init_task.h               |    3 
  include/linux/ptrace.h                  |   86 +-
  include/linux/sched.h                   |   25 
- include/linux/tracehook.h               |  644 +++++++++++++
- include/linux/utrace.h                  |  470 +++++++++
+ include/linux/tracehook.h               |  641 +++++++++++++
+ include/linux/utrace.h                  |  481 ++++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
  kernel/exit.c                           |  259 +----
  kernel/fork.c                           |   62 -
- kernel/ptrace.c                         | 1565 ++++++++++++++++++++++++-------
+ kernel/ptrace.c                         | 1563 ++++++++++++++++++++++++-------
  kernel/signal.c                         |  211 +---
  kernel/sys.c                            |    2 
  kernel/timer.c                          |    6 
- kernel/utrace.c                         | 1520 ++++++++++++++++++++++++++++++
- security/selinux/hooks.c                |    6 
- 92 files changed, 8251 insertions(+), 3305 deletions(-)
+ kernel/utrace.c                         | 1526 ++++++++++++++++++++++++++++++
+ security/selinux/hooks.c                |   54 +
+ security/selinux/include/objsec.h       |    1 
+ 93 files changed, 8298 insertions(+), 3326 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -1007,7 +1008,7 @@
  extern int send_sig(int, struct task_struct *, int);
 --- linux-2.6/include/linux/utrace.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/utrace.h
-@@ -0,0 +1,470 @@
+@@ -0,0 +1,481 @@
 +/*
 + * User Debugging Data & Event Rendezvous
 + *
@@ -1382,11 +1383,22 @@
 +			   struct task_struct *target);
 +
 +	/*
-+	 * Return the value to display after "TracerPid:" in /proc/PID/status.
-+	 * If this engine returns zero, another engine may supply the value.
++	 * Return the task_struct for the task using ptrace on this one, or
++	 * NULL.  Always called with rcu_read_lock held to keep the
++	 * returned struct alive.
++	 *
++	 * At exec time, this may be called with task_lock(target) still
++	 * held from when unsafe_exec was just called.  In that case it
++	 * must give results consistent with those unsafe_exec results,
++	 * i.e. non-NULL if any LSM_UNSAFE_PTRACE_* bits were set.
++	 *
++	 * The value is also used to display after "TracerPid:" in
++	 * /proc/PID/status, where it is called with only rcu_read_lock held.
++	 *
++	 * If this engine returns NULL, another engine may supply the result.
 +	 */
-+	pid_t (*tracer_pid)(struct utrace_attached_engine *engine,
-+			    struct task_struct *target);
++	struct task_struct *(*tracer_task)(struct utrace_attached_engine *,
++					   struct task_struct *target);
 +};
 +
 +
@@ -1471,7 +1483,7 @@
 +int utrace_report_jctl(int type);
 +void utrace_report_exec(struct linux_binprm *bprm, struct pt_regs *regs);
 +void utrace_report_syscall(struct pt_regs *regs, int is_exit);
-+pid_t utrace_tracer_pid(struct task_struct *);
++struct task_struct *utrace_tracer_task(struct task_struct *);
 +int utrace_allow_access_process_vm(struct task_struct *);
 +int utrace_unsafe_exec(struct task_struct *);
 +void utrace_signal_handler_singlestep(struct task_struct *, struct pt_regs *);
@@ -1592,7 +1604,7 @@
  	.sibling	= LIST_HEAD_INIT(tsk.sibling),			\
 --- linux-2.6/include/linux/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/tracehook.h
-@@ -0,0 +1,644 @@
+@@ -0,0 +1,641 @@
 +/*
 + * Tracing hooks
 + *
@@ -1842,18 +1854,6 @@
 +#include <linux/utrace.h>
 +#endif
 +
-+/*
-+ * Return the value to display after "TracerPid:" in /proc/PID/status.
-+ * Called without locks.
-+ */
-+static inline pid_t tracehook_tracer_pid(struct task_struct *p)
-+{
-+#ifdef CONFIG_UTRACE
-+	if (p->utrace_flags)
-+		return utrace_tracer_pid(p);
-+#endif
-+	return 0;
-+}
 +
 +/*
 + * Called in copy_process when setting up the copied task_struct,
@@ -2073,13 +2073,22 @@
 +}
 +
 +/*
-+ * Return nonzero if the task is being traced so security checks should apply.
-+ * Called with task_lock(tsk) held.
++ * Return the task_struct for the task using ptrace on this one, or NULL.
++ * Must be called with rcu_read_lock held to keep the returned struct alive.
++ *
++ * At exec time, this may be called with task_lock(p) still held from when
++ * tracehook_unsafe_exec was just called.
++ *
++ * The value is also used to display after "TracerPid:" in /proc/PID/status,
++ * where it is called with only rcu_read_lock held.
 + */
-+static inline int tracehook_security_ptrace(struct task_struct *tsk)
++static inline struct task_struct *tracehook_tracer_task(struct task_struct *p)
 +{
-+	return 0;
-+	// return (p->ptrace & PT_PTRACED);
++#ifdef CONFIG_UTRACE
++	if (p->utrace_flags)
++		return utrace_tracer_task(p);
++#endif
++	return NULL;
 +}
 +
 +/*
@@ -2695,6 +2704,16 @@
 +value.  It says to push the signal back on the thread's queue, with
 +the signal number and details possibly changed in info.  When the
 +thread is allowed to resume, it will dequeue and report it again.
+--- linux-2.6/security/selinux/include/objsec.h.utrace-ptrace-compat
++++ linux-2.6/security/selinux/include/objsec.h
+@@ -34,7 +34,6 @@ struct task_security_struct {
+ 	u32 create_sid;      /* fscreate SID */
+ 	u32 keycreate_sid;   /* keycreate SID */
+ 	u32 sockcreate_sid;  /* fscreate SID */
+-	u32 ptrace_sid;      /* SID of ptrace parent */
+ };
+ 
+ struct inode_security_struct {
 --- linux-2.6/security/selinux/hooks.c.utrace-ptrace-compat
 +++ linux-2.6/security/selinux/hooks.c
 @@ -21,7 +21,7 @@
@@ -2706,24 +2725,115 @@
  #include <linux/errno.h>
  #include <linux/sched.h>
  #include <linux/security.h>
-@@ -1397,7 +1397,7 @@ static int selinux_ptrace(struct task_st
+@@ -159,7 +159,7 @@ static int task_alloc_security(struct ta
+ 		return -ENOMEM;
  
- 	rc = task_has_perm(parent, child, PROCESS__PTRACE);
- 	/* Save the SID of the tracing process for later use in apply_creds. */
+ 	tsec->task = task;
+-	tsec->osid = tsec->sid = tsec->ptrace_sid = SECINITSID_UNLABELED;
++	tsec->osid = tsec->sid = SECINITSID_UNLABELED;
+ 	task->security = tsec;
+ 
+ 	return 0;
+@@ -1387,19 +1387,13 @@ static int inode_security_set_sid(struct
+ 
+ static int selinux_ptrace(struct task_struct *parent, struct task_struct *child)
+ {
+-	struct task_security_struct *psec = parent->security;
+-	struct task_security_struct *csec = child->security;
+ 	int rc;
+ 
+ 	rc = secondary_ops->ptrace(parent,child);
+ 	if (rc)
+ 		return rc;
+ 
+-	rc = task_has_perm(parent, child, PROCESS__PTRACE);
+-	/* Save the SID of the tracing process for later use in apply_creds. */
 -	if (!(child->ptrace & PT_PTRACED) && !rc)
-+	if (/* XXX !(child->ptrace & PT_PTRACED) && */ !rc)
- 		csec->ptrace_sid = psec->sid;
- 	return rc;
+-		csec->ptrace_sid = psec->sid;
+-	return rc;
++	return task_has_perm(parent, child, PROCESS__PTRACE);
+ }
+ 
+ static int selinux_capget(struct task_struct *target, kernel_cap_t *effective,
+@@ -1821,12 +1815,24 @@ static void selinux_bprm_apply_creds(str
+ 		/* Check for ptracing, and update the task SID if ok.
+ 		   Otherwise, leave SID unchanged and kill. */
+ 		if (unsafe & (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) {
+-			rc = avc_has_perm(tsec->ptrace_sid, sid,
+-					  SECCLASS_PROCESS, PROCESS__PTRACE,
+-					  NULL);
+-			if (rc) {
+-				bsec->unsafe = 1;
+-				return;
++			struct task_struct *t;
++
++			rcu_read_lock();
++			t = tracehook_tracer_task(current);
++			if (unlikely(t == NULL))
++				rcu_read_unlock();
++			else {
++				struct task_security_struct *sec = t->security;
++				u32 ptsid = sec->sid;
++				rcu_read_unlock();
++
++				rc = avc_has_perm(ptsid, sid,
++						  SECCLASS_PROCESS,
++						  PROCESS__PTRACE, NULL);
++				if (rc) {
++					bsec->unsafe = 1;
++					return;
++				}
+ 			}
+ 		}
+ 		tsec->sid = sid;
+@@ -2684,11 +2690,6 @@ static int selinux_task_alloc_security(s
+ 	tsec2->keycreate_sid = tsec1->keycreate_sid;
+ 	tsec2->sockcreate_sid = tsec1->sockcreate_sid;
+ 
+-	/* Retain ptracer SID across fork, if any.
+-	   This will be reset by the ptrace hook upon any
+-	   subsequent ptrace_attach operations. */
+-	tsec2->ptrace_sid = tsec1->ptrace_sid;
+-
+ 	return 0;
  }
-@@ -4381,7 +4381,7 @@ static int selinux_setprocattr(struct ta
+ 
+@@ -4293,6 +4294,7 @@ static int selinux_setprocattr(struct ta
+ 			       char *name, void *value, size_t size)
+ {
+ 	struct task_security_struct *tsec;
++	struct task_struct *tracer;
+ 	u32 sid = 0;
+ 	int error;
+ 	char *str = value;
+@@ -4381,18 +4383,24 @@ static int selinux_setprocattr(struct ta
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and fail. */
  		task_lock(p);
 -		if (p->ptrace & PT_PTRACED) {
-+		if (tracehook_security_ptrace(p)) {
- 			error = avc_has_perm_noaudit(tsec->ptrace_sid, sid,
+-			error = avc_has_perm_noaudit(tsec->ptrace_sid, sid,
++		rcu_read_lock();
++		tracer = tracehook_tracer_task(p);
++		if (tracer != NULL) {
++			struct task_security_struct *ptsec = tracer->security;
++			u32 ptsid = ptsec->sid;
++			rcu_read_unlock();
++			error = avc_has_perm_noaudit(ptsid, sid,
  						     SECCLASS_PROCESS,
  						     PROCESS__PTRACE, &avd);
+ 			if (!error)
+ 				tsec->sid = sid;
+ 			task_unlock(p);
+-			avc_audit(tsec->ptrace_sid, sid, SECCLASS_PROCESS,
++			avc_audit(ptsid, sid, SECCLASS_PROCESS,
+ 				  PROCESS__PTRACE, &avd, error, NULL);
+ 			if (error)
+ 				return error;
+ 		} else {
++			rcu_read_unlock();
+ 			tsec->sid = sid;
+ 			task_unlock(p);
+ 		}
 --- linux-2.6/kernel/fork.c.utrace-ptrace-compat
 +++ linux-2.6/kernel/fork.c
 @@ -36,7 +36,7 @@
@@ -3209,7 +3319,7 @@
  EXPORT_SYMBOL(sigprocmask);
 --- linux-2.6/kernel/utrace.c.utrace-ptrace-compat
 +++ linux-2.6/kernel/utrace.c
-@@ -0,0 +1,1520 @@
+@@ -0,0 +1,1526 @@
 +#include <linux/utrace.h>
 +#include <linux/tracehook.h>
 +#include <linux/err.h>
@@ -4646,16 +4756,23 @@
 +
 +
 +/*
-+ * Return the value to display after "TracerPid:" in /proc/PID/status.
-+ * Called without locks.
++ * Return the task_struct for the task using ptrace on this one, or NULL.
++ * Must be called with rcu_read_lock held to keep the returned struct alive.
++ *
++ * At exec time, this may be called with task_lock(p) still held from when
++ * tracehook_unsafe_exec was just called.  In that case it must give
++ * results consistent with those unsafe_exec results, i.e. non-NULL if
++ * any LSM_UNSAFE_PTRACE_* bits were set.
++ *
++ * The value is also used to display after "TracerPid:" in /proc/PID/status,
++ * where it is called with only rcu_read_lock held.
 + */
-+pid_t
-+utrace_tracer_pid(struct task_struct *target)
++struct task_struct *
++utrace_tracer_task(struct task_struct *target)
 +{
 +	struct utrace *utrace;
-+	pid_t pid = 0;
++	struct task_struct *tracer = NULL;
 +
-+	rcu_read_lock();
 +	utrace = rcu_dereference(target->utrace);
 +	if (utrace != NULL) {
 +		struct list_head *pos, *next;
@@ -4665,16 +4782,15 @@
 +			engine = list_entry(pos, struct utrace_attached_engine,
 +					    entry);
 +			ops = rcu_dereference(engine->ops);
-+			if (ops->tracer_pid) {
-+				pid = (*ops->tracer_pid)(engine, target);
-+				if (pid)
++			if (ops->tracer_task) {
++				tracer = (*ops->tracer_task)(engine, target);
++				if (tracer != NULL)
 +					break;
 +			}
 +		}
 +	}
-+	rcu_read_unlock();
 +
-+	return pid;
++	return tracer;
 +}
 +
 +int
@@ -5485,7 +5601,7 @@
  /*
   * Access another process' address space.
   * Source/target buffer must be kernel space, 
-@@ -295,249 +125,1306 @@ int access_process_vm(struct task_struct
+@@ -295,249 +125,1304 @@ int access_process_vm(struct task_struct
  	return buf - old_buf;
  }
  
@@ -5690,7 +5806,9 @@
 +			retval = -EPERM;
 +	}
 +	else {
++		task_lock(current);
 +		retval = security_ptrace(current->parent, current);
++		task_unlock(current);
 +		if (!retval)
 +			retval = ptrace_setup(current, engine,
 +					      current->parent, 0, 0);
@@ -5759,7 +5877,7 @@
 +	struct ptrace_state *state = (struct ptrace_state *) engine->data;
 +	/*
 +	 * Clearing ->data before detach makes sure an unrelated task
-+	 * calling into ptrace_tracer_pid won't try to touch stale state.
++	 * calling into ptrace_tracer_task won't try to touch stale state.
 +	 */
 +	rcu_assign_pointer(engine->data, 0UL);
 +	utrace_detach(task, engine);
@@ -6892,24 +7010,20 @@
 +	return unsafe;
 +}
 +
-+static pid_t
-+ptrace_tracer_pid(struct utrace_attached_engine *engine,
-+		  struct task_struct *target)
++static struct task_struct *
++ptrace_tracer_task(struct utrace_attached_engine *engine,
++		   struct task_struct *target)
 +{
 +	struct ptrace_state *state;
-+	pid_t pid;
 +
 +	/*
 +	 * This call is not necessarily made by the target task,
 +	 * so ptrace might be getting detached while we run here.
 +	 * The state pointer will be NULL if that happens.
 +	 */
-+	rcu_read_lock();
 +	state = rcu_dereference((struct ptrace_state *) engine->data);
-+	pid = state == NULL ? 0 : state->parent->pid;
-+	rcu_read_unlock();
 +
-+	return pid;
++	return state == NULL ? NULL : state->parent;
 +}
 +
 +static int
@@ -6949,7 +7063,7 @@
 +	.report_exit = ptrace_report_exit,
 +	.report_death = ptrace_report_death,
 +	.unsafe_exec = ptrace_unsafe_exec,
-+	.tracer_pid = ptrace_tracer_pid,
++	.tracer_task = ptrace_tracer_task,
 +	.allow_access_process_vm = ptrace_allow_access_process_vm,
 +};
 +
@@ -7055,18 +7169,36 @@
  #include <linux/rcupdate.h>
  #include <linux/delayacct.h>
  
-@@ -175,8 +176,8 @@ static inline char * task_state(struct t
+@@ -158,10 +159,17 @@ static inline const char * get_task_stat
+ 
+ static inline char * task_state(struct task_struct *p, char *buffer)
+ {
++	struct task_struct *tracer;
++	pid_t tracer_pid;
+ 	struct group_info *group_info;
+ 	int g;
+ 	struct fdtable *fdt = NULL;
+ 
++	rcu_read_lock();
++	tracer = tracehook_tracer_task(p);
++	tracer_pid = tracer == NULL ? 0 : tracer->pid;
++	rcu_read_unlock();
++
+ 	read_lock(&tasklist_lock);
+ 	buffer += sprintf(buffer,
+ 		"State:\t%s\n"
+@@ -175,8 +183,8 @@ static inline char * task_state(struct t
  		get_task_state(p),
  		(p->sleep_avg/1024)*100/(1020000000/1024),
  	       	p->tgid,
 -		p->pid, pid_alive(p) ? p->group_leader->real_parent->tgid : 0,
 -		pid_alive(p) && p->ptrace ? p->parent->pid : 0,
 +		p->pid, pid_alive(p) ? p->group_leader->parent->tgid : 0,
-+		tracehook_tracer_pid(p),
++		tracer_pid,
  		p->uid, p->euid, p->suid, p->fsuid,
  		p->gid, p->egid, p->sgid, p->fsgid);
  	read_unlock(&tasklist_lock);
-@@ -386,7 +387,7 @@ static int do_task_stat(struct task_stru
+@@ -386,7 +394,7 @@ static int do_task_stat(struct task_stru
  			stime = cputime_add(stime, task->signal->stime);
  		}
  	}



From fedora-cvs-commits at redhat.com  Tue Aug  8 20:35:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 16:35:51 -0400
Subject: rpms/pm-utils/devel pm-utils-0.19-vidhooks.patch,1.4,1.5
Message-ID: <200608082035.k78KZpWT031975@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	pm-utils-0.19-vidhooks.patch 
Log Message:
- I love race conditions.


pm-utils-0.19-vidhooks.patch:
 Makefile.am      |    3 +
 Makefile.in      |    3 +
 functions        |   91 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 functions-ati    |   96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 functions-intel  |   32 ++++++++++++++++++
 functions-nvidia |   30 +++++++++++++++++
 hooks/20video    |   34 +++++++------------
 7 files changed, 268 insertions(+), 21 deletions(-)

Index: pm-utils-0.19-vidhooks.patch
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils-0.19-vidhooks.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pm-utils-0.19-vidhooks.patch	8 Aug 2006 17:12:47 -0000	1.4
+++ pm-utils-0.19-vidhooks.patch	8 Aug 2006 20:35:48 -0000	1.5
@@ -242,7 +242,7 @@
  	suspend)
 --- /dev/null	2006-06-09 14:24:51.853484500 -0400
 +++ pm-utils-0.19/pm/functions-intel	2006-06-14 00:15:55.000000000 -0400
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,32 @@
 +#!/bin/bash
 +
 +[ -x /usr/sbin/vbetool ] || return
@@ -251,26 +251,29 @@
 +{
 +{
 +#	/usr/sbin/vbetool vbestate save > /var/run/vbestate
-+	/usr/sbin/vbetool dpms suspend
++#	/usr/sbin/vbetool dpms suspend
++	return 0
 +} >/dev/null 2>&1
 +}
 +
 +resume_video()
 +{
-+{
-+	/usr/sbin/vbetool post < /dev/tty1
++	TTY=$(tty)
++	/usr/sbin/vbetool post < $(TTY) >/dev/null 2>&1
++	usleep 100000
 +#	/usr/sbin/vbetool vbestate restore < /var/run/vbestate
-+} >/dev/null 2>&1
 +}
 +
 +lcd_on()
 +{
-+	/usr/sbin/vbetool dpms on >/dev/null 2>&1
++#	/usr/sbin/vbetool dpms on >/dev/null 2>&1
++	return 0
 +}
 +
 +lcd_off()
 +{
-+	/usr/sbin/vbetool dpms off >/dev/null 2>&1
++#	/usr/sbin/vbetool dpms off >/dev/null 2>&1
++	return 0
 +}
 --- /dev/null	2006-06-09 14:24:51.853484500 -0400
 +++ pm-utils-0.19/pm/functions-nvidia	2006-06-14 00:15:55.000000000 -0400



From fedora-cvs-commits at redhat.com  Tue Aug  8 20:40:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 16:40:39 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.78,
	1.79 policy-20060802.patch, 1.3, 1.4 selinux-policy.spec,
	1.246, 1.247 sources, 1.82, 1.83
Message-ID: <200608082040.k78Ked0k001094@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policy-20060802.patch selinux-policy.spec sources 
Log Message:
* Tue Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-1
- Quiet down anaconda audit messages



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	8 Aug 2006 00:26:46 -0000	1.78
+++ .cvsignore	8 Aug 2006 20:40:36 -0000	1.79
@@ -79,3 +79,4 @@
 serefpolicy-2.3.3.tgz
 serefpolicy-2.3.4.tgz
 serefpolicy-2.3.5.tgz
+serefpolicy-2.3.6.tgz

policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/usermanage.te        |    4 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    3 
 modules/kernel/devices.te          |    2 
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 ++++++++++++
 modules/kernel/terminal.if         |   19 +++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cups.te           |    8 -
 modules/services/dbus.if           |    5 
 modules/services/ldap.te           |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    4 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  105 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   25 +++-
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   51 +++++++-
 modules/services/xserver.te        |   14 +-
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/mount.te            |    3 
 modules/system/selinuxutil.te      |    9 +
 modules/system/udev.fc             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  231 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   50 +++-----
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |   26 +++-
 59 files changed, 742 insertions(+), 166 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- policy-20060802.patch	8 Aug 2006 00:26:46 -0000	1.3
+++ policy-20060802.patch	8 Aug 2006 20:40:36 -0000	1.4
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.5/policy/mls
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.6/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.5/policy/mls	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/mls	2006-08-08 16:15:43.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -22,9 +22,9 @@
  mlsconstrain dir { add_name remove_name reparent rmdir }
  	((( l1 dom l2 ) and ( l1 domby h2 )) or
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.5/policy/modules/admin/anaconda.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.6/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/anaconda.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/anaconda.te	2006-08-08 16:15:43.000000000 -0400
 @@ -25,8 +25,12 @@
  
  modutils_domtrans_insmod(anaconda_t)
@@ -38,7 +38,15 @@
  ifdef(`distro_redhat',`
  	bootloader_create_runtime_file(anaconda_t)
  ')
-@@ -51,9 +55,7 @@
+@@ -41,6 +45,7 @@
+ 
+ optional_policy(`
+ 	rpm_domtrans(anaconda_t)
++	rpm_domtrans_script(anaconda_t)
+ ')
+ 
+ optional_policy(`
+@@ -51,9 +56,16 @@
  	usermanage_domtrans_admin_passwd(anaconda_t)
  ')
  
@@ -50,9 +58,18 @@
 +	ssh_domtrans_keygen(anaconda_t)
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.5/policy/modules/admin/consoletype.te
++
++# The following is just to quiet the anaconda complaining during the install
++type anaconda_exec_t;
++kernel_domtrans_to(anaconda_t,anaconda_exec_t)
++allow anaconda_t self:process execmem;
++dontaudit domain anaconda_t:fd use;
++dontaudit domain anaconda_t:fifo_file r_file_perms;
++dontaudit domain anaconda_t:unix_stream_socket connectto;
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.6/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/consoletype.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/consoletype.te	2006-08-08 16:15:43.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -75,9 +92,9 @@
 +optional_policy(`
 +	xen_dontaudit_use_fds(consoletype_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.5/policy/modules/admin/firstboot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.6/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/firstboot.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/firstboot.te	2006-08-08 16:15:43.000000000 -0400
 @@ -106,7 +106,7 @@
  ')
  
@@ -87,9 +104,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.5/policy/modules/admin/prelink.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.6/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/prelink.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/prelink.te	2006-08-08 16:15:43.000000000 -0400
 @@ -1,4 +1,3 @@
 -
  policy_module(prelink,1.1.5)
@@ -104,9 +121,9 @@
  optional_policy(`
  	cron_system_entry(prelink_t, prelink_exec_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.5/policy/modules/admin/rpm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.6/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/rpm.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/rpm.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -116,9 +133,9 @@
  ')
  
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.5/policy/modules/admin/usermanage.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.6/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/usermanage.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/usermanage.te	2006-08-08 16:15:43.000000000 -0400
 @@ -260,7 +260,7 @@
  ')
  
@@ -137,9 +154,9 @@
  	nscd_socket_use(useradd_t)
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.5/policy/modules/apps/mozilla.if
---- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/apps/mozilla.if	2006-08-07 19:45:48.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.6/policy/modules/apps/mozilla.if
+--- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/apps/mozilla.if	2006-08-08 16:15:43.000000000 -0400
 @@ -63,6 +63,7 @@
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
@@ -148,7 +165,7 @@
  
  	# for bash - old mozilla binary
  	can_exec($1_mozilla_t, mozilla_exec_t)
-@@ -175,6 +176,7 @@
+@@ -170,6 +171,7 @@
  	logging_send_syslog_msg($1_mozilla_t)
  
  	miscfiles_read_fonts($1_mozilla_t)
@@ -156,9 +173,9 @@
  
  	# Browse the web, connect to printer
  	sysnet_dns_name_resolve($1_mozilla_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.5/policy/modules/kernel/corecommands.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/corecommands.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -167,9 +184,9 @@
  
  ifdef(`distro_debian',`
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.5/policy/modules/kernel/corenetwork.te.in
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/corenetwork.te.in	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in	2006-08-08 16:15:43.000000000 -0400
 @@ -73,6 +73,7 @@
  network_port(dhcpc, udp,68,s0)
  network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
@@ -187,9 +204,9 @@
  network_port(i18n_input, tcp,9010,s0)
  network_port(imaze, tcp,5323,s0, udp,5323,s0)
  network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.5/policy/modules/kernel/devices.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.6/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/devices.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/devices.te	2006-08-08 16:15:43.000000000 -0400
 @@ -166,7 +166,7 @@
  dev_node(vmware_device_t)
  
@@ -199,9 +216,9 @@
  
  type xen_device_t;
  dev_node(xen_device_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.5/policy/modules/kernel/files.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.6/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/files.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/files.if	2006-08-08 16:38:46.000000000 -0400
 @@ -2934,6 +2934,24 @@
  
  ########################################
@@ -227,9 +244,9 @@
  ##	Read the tmp directory (/tmp).
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.5/policy/modules/kernel/filesystem.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.6/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/filesystem.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/filesystem.te	2006-08-08 16:15:43.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -246,9 +263,9 @@
  
  ########################################
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.5/policy/modules/kernel/kernel.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.6/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/kernel.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/kernel.if	2006-08-08 16:15:43.000000000 -0400
 @@ -1456,6 +1456,42 @@
  
  ########################################
@@ -335,9 +352,9 @@
 +	dontaudit $1 proc_type:file getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.5/policy/modules/kernel/terminal.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.6/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/terminal.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/terminal.if	2006-08-08 16:15:43.000000000 -0400
 @@ -308,6 +308,7 @@
  		type devpts_t;
  	')
@@ -368,9 +385,9 @@
 +	allow $1 devpts_t:filesystem getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.5/policy/modules/services/amavis.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.6/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/amavis.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/amavis.te	2006-08-08 16:15:43.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -400,9 +417,9 @@
 +optional_policy(`
 +	postfix_read_config(amavis_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.5/policy/modules/services/apache.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.6/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/apache.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/apache.te	2006-08-08 16:15:43.000000000 -0400
 @@ -273,7 +273,6 @@
  sysnet_read_config(httpd_t)
  
@@ -411,9 +428,9 @@
  
  mta_send_mail(httpd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.5/policy/modules/services/avahi.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.6/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/avahi.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/avahi.te	2006-08-08 16:15:43.000000000 -0400
 @@ -79,6 +79,7 @@
  
  sysnet_read_config(avahi_t)
@@ -422,9 +439,9 @@
  
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.5/policy/modules/services/bind.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.6/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/bind.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/bind.te	2006-08-08 16:15:43.000000000 -0400
 @@ -226,6 +226,7 @@
  allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
  
@@ -433,9 +450,9 @@
  
  allow ndc_t named_t:tcp_socket { connectto recvfrom };
  allow ndc_t named_t:unix_stream_socket connectto;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.5/policy/modules/services/bluetooth.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.6/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/bluetooth.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/bluetooth.te	2006-08-08 16:15:43.000000000 -0400
 @@ -247,3 +247,8 @@
  optional_policy(`
         	xserver_stream_connect_xdm(bluetooth_helper_t)
@@ -445,17 +462,17 @@
 +	nis_use_ypbind(bluetooth_helper_t)
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.5/policy/modules/services/clamav.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.6/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/clamav.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/clamav.if	2006-08-08 16:15:43.000000000 -0400
 @@ -102,3 +102,4 @@
  	allow clamscan_t $1:fifo_file rw_file_perms;
  	allow clamscan_t $1:process sigchld;
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.5/policy/modules/services/cron.if
---- nsaserefpolicy/policy/modules/services/cron.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/cron.if	2006-08-07 19:45:48.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.6/policy/modules/services/cron.if
+--- nsaserefpolicy/policy/modules/services/cron.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cron.if	2006-08-08 16:15:43.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -464,7 +481,7 @@
  
  	# crontab shows up in user ps
  	allow $2 $1_crontab_t:dir { search getattr read };
-@@ -194,14 +195,19 @@
+@@ -193,14 +194,19 @@
  	# Allow crond to read those crontabs in cron spool.
  	allow crond_t $1_cron_spool_t:file create_file_perms;
  
@@ -487,7 +504,7 @@
  
  	# crontab signals crond by updating the mtime on the spooldir
  	allow $1_crontab_t cron_spool_t:dir setattr;
-@@ -239,6 +245,10 @@
+@@ -238,6 +244,10 @@
  	# Read user crontabs
  	userdom_read_user_home_content_files($1,$1_crontab_t)
  
@@ -498,10 +515,18 @@
  	tunable_policy(`fcron_crond', `
  		# fcron wants an instant update of a crontab change for the administrator
  		# also crontab does a security check for crontab -u
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.5/policy/modules/services/cups.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.6/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/cups.te	2006-08-07 19:45:48.000000000 -0400
-@@ -81,6 +81,7 @@
++++ serefpolicy-2.3.6/policy/modules/services/cups.te	2006-08-08 16:15:43.000000000 -0400
+@@ -74,13 +74,14 @@
+ #
+ 
+ # /usr/lib/cups/backend/serial needs sys_admin(?!)
+-allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_tty_config audit_write };
++allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_resource sys_tty_config audit_write };
+ dontaudit cupsd_t self:capability { sys_tty_config net_admin };
+ allow cupsd_t self:process { setsched signal_perms };
+ allow cupsd_t self:fifo_file rw_file_perms;
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
  allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
@@ -528,9 +553,9 @@
  
  sysnet_read_config(cupsd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.5/policy/modules/services/dbus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.6/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/dbus.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/dbus.if	2006-08-08 16:15:43.000000000 -0400
 @@ -171,6 +171,11 @@
  		xserver_use_xdm_fds($1_dbusd_t)
  		xserver_rw_xdm_pipes($1_dbusd_t)
@@ -543,9 +568,9 @@
  ')
  
  #######################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.5/policy/modules/services/ldap.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.6/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/ldap.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ldap.te	2006-08-08 16:15:43.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -555,9 +580,9 @@
  
  kernel_read_system_state(slapd_t)
  kernel_read_kernel_sysctls(slapd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.5/policy/modules/services/nis.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.6/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/nis.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/nis.te	2006-08-08 16:15:43.000000000 -0400
 @@ -249,8 +249,6 @@
  allow ypserv_t self:unix_dgram_socket create_socket_perms;
  allow ypserv_t self:unix_stream_socket create_stream_socket_perms;
@@ -567,9 +592,9 @@
  
  allow ypserv_t var_yp_t:dir rw_dir_perms;
  allow ypserv_t var_yp_t:file create_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.5/policy/modules/services/ntp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.6/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/ntp.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ntp.te	2006-08-08 16:15:43.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -579,9 +604,9 @@
  dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
  allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
  allow ntpd_t self:fifo_file { read write getattr };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.5/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.6/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/pegasus.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/pegasus.if	2006-08-08 16:15:43.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -615,9 +640,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.5/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.6/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/pegasus.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/pegasus.te	2006-08-08 16:15:43.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -634,9 +659,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.5/policy/modules/services/postfix.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.6/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/postfix.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/postfix.te	2006-08-08 16:15:43.000000000 -0400
 @@ -250,6 +250,7 @@
  allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
  
@@ -672,9 +697,9 @@
  
  optional_policy(`
  	postgrey_stream_connect(postfix_smtpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.5/policy/modules/services/procmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.6/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/procmail.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/procmail.te	2006-08-08 16:15:43.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -683,9 +708,9 @@
  corenet_tcp_sendrecv_all_if(procmail_t)
  corenet_udp_sendrecv_all_if(procmail_t)
  corenet_tcp_sendrecv_all_nodes(procmail_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.5/policy/modules/services/samba.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.6/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/samba.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/samba.te	2006-08-08 16:15:43.000000000 -0400
 @@ -191,7 +191,7 @@
  allow smbd_t samba_etc_t:dir rw_dir_perms;
  allow smbd_t samba_etc_t:file { rw_file_perms setattr };
@@ -704,9 +729,9 @@
  allow nmbd_t samba_log_t:file { create ra_file_perms };
  
  allow nmbd_t samba_var_t:dir rw_dir_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.5/policy/modules/services/setroubleshoot.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -717,16 +742,16 @@
 +/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
 +
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.5/policy/modules/services/setroubleshoot.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if	2006-08-08 16:15:43.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.5/policy/modules/services/setroubleshoot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te	2006-08-08 16:15:43.000000000 -0400
 @@ -0,0 +1,105 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -833,9 +858,9 @@
 +
 +files_dontaudit_search_tmp(setroubleshootd_t)
 +files_dontaudit_search_src(setroubleshootd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.5/policy/modules/services/spamassassin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.6/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/spamassassin.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/spamassassin.te	2006-08-08 16:15:43.000000000 -0400
 @@ -194,3 +194,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -844,9 +869,9 @@
 +optional_policy(`
 +	postfix_read_config(spamd_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.5/policy/modules/services/squid.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.6/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/squid.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/squid.te	2006-08-08 16:15:43.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -859,9 +884,9 @@
  allow squid_t self:fifo_file rw_file_perms;
  allow squid_t self:sock_file r_file_perms;
  allow squid_t self:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.5/policy/modules/services/ssh.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.6/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/ssh.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ssh.if	2006-08-08 16:15:43.000000000 -0400
 @@ -1,5 +1,4 @@
  ## <summary>Secure shell client and server policy.</summary>
 -
@@ -896,9 +921,9 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.5/policy/modules/services/stunnel.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.6/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/stunnel.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/stunnel.te	2006-08-08 16:15:43.000000000 -0400
 @@ -105,6 +105,10 @@
  	')
  
@@ -910,9 +935,9 @@
          	seutil_sigchld_newrole(stunnel_t)
  	')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.5/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/xserver.if	2006-08-07 19:45:48.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.6/policy/modules/services/xserver.if
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/xserver.if	2006-08-08 16:15:43.000000000 -0400
 @@ -45,7 +45,6 @@
  	allow $1_xserver_t self:capability { dac_override fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
  	dontaudit $1_xserver_t self:capability chown;
@@ -943,7 +968,7 @@
  		auth_search_pam_console_data($1_xserver_t)
  	')
  
-@@ -1125,7 +1130,47 @@
+@@ -1103,7 +1108,47 @@
  	')
  
  	files_search_tmp($1)
@@ -992,9 +1017,9 @@
 +	allow $1 ice_tmp_t:dir ra_dir_perms;
 +	allow $1 ice_tmp_t:sock_file create_file_perms;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.5/policy/modules/services/xserver.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.6/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/xserver.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/xserver.te	2006-08-08 16:15:43.000000000 -0400
 @@ -81,7 +81,7 @@
  #
  
@@ -1058,9 +1083,9 @@
  
  	unconfined_domain_noaudit(xdm_xserver_t)
  	unconfined_domtrans(xdm_xserver_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.5/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.6/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/fstools.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/fstools.te	2006-08-08 16:15:43.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -1069,9 +1094,9 @@
  
  domain_use_interactive_fds(fsadm_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.5/policy/modules/system/hostname.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.6/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/hostname.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/hostname.te	2006-08-08 16:15:43.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -1094,9 +1119,9 @@
 +	xen_dontaudit_use_fds(hostname_t)
 +')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.5/policy/modules/system/init.if
---- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/init.if	2006-08-07 19:45:48.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.6/policy/modules/system/init.if
+--- nsaserefpolicy/policy/modules/system/init.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/init.if	2006-08-08 16:15:43.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -1111,9 +1136,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.5/policy/modules/system/libraries.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.6/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/libraries.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/libraries.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -200,7 +200,7 @@
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -1123,9 +1148,9 @@
  /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.5/policy/modules/system/locallogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.6/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/locallogin.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/locallogin.te	2006-08-08 16:15:43.000000000 -0400
 @@ -47,7 +47,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -1144,9 +1169,9 @@
  
  dev_setattr_mouse_dev(local_login_t)
  dev_getattr_mouse_dev(local_login_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.5/policy/modules/system/logging.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.6/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/logging.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -1154,9 +1179,9 @@
 +
 +/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.5/policy/modules/system/logging.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.6/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/logging.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.if	2006-08-08 16:15:43.000000000 -0400
 @@ -553,3 +553,24 @@
  	allow $1 var_log_t:dir rw_dir_perms;
  	allow $1 var_log_t:file create_file_perms;
@@ -1182,9 +1207,9 @@
 +	allow $1 auditd_var_run_t:sock_file rw_file_perms;
 +	allow $1 auditd_t:unix_stream_socket connectto;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.5/policy/modules/system/logging.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.6/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/logging.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.te	2006-08-08 16:15:43.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -1197,9 +1222,9 @@
  
  kernel_read_kernel_sysctls(auditd_t)
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.5/policy/modules/system/miscfiles.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.6/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/miscfiles.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/miscfiles.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -9,6 +9,7 @@
  # /etc
  #
@@ -1208,10 +1233,18 @@
  /etc/pki(/.*)?			gen_context(system_u:object_r:cert_t,s0)
  
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.5/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.6/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/mount.te	2006-08-07 19:45:48.000000000 -0400
-@@ -97,6 +97,8 @@
++++ serefpolicy-2.3.6/policy/modules/system/mount.te	2006-08-08 16:38:58.000000000 -0400
+@@ -80,6 +80,7 @@
+ files_read_isid_type_files(mount_t)
+ # For reading cert files
+ files_read_usr_files(mount_t)
++files_list_mnt(mount_t)
+ 
+ init_use_fds(mount_t)
+ init_use_script_ptys(mount_t)
+@@ -97,6 +98,8 @@
  
  sysnet_use_portmap(mount_t)
  
@@ -1220,9 +1253,9 @@
  userdom_use_all_users_fds(mount_t)
  
  ifdef(`distro_redhat',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.5/policy/modules/system/selinuxutil.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.6/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/selinuxutil.te	2006-08-07 20:14:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/selinuxutil.te	2006-08-08 16:15:43.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -1253,9 +1286,9 @@
  optional_policy(`
  	nscd_socket_use(semanage_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.5/policy/modules/system/udev.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.6/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/udev.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/udev.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -1,5 +1,6 @@
  # udev
  
@@ -1263,9 +1296,9 @@
  /dev/\.udevdb	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.5/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.6/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/unconfined.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/unconfined.if	2006-08-08 16:15:43.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -1282,9 +1315,9 @@
  	files_unconfined($1)
  	fs_unconfined($1)
  	selinux_unconfined($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.5/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.6/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/unconfined.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/unconfined.te	2006-08-08 16:15:43.000000000 -0400
 @@ -195,4 +195,9 @@
  ifdef(`targeted_policy',`
  	allow unconfined_execmem_t self:process { execstack execmem };
@@ -1295,9 +1328,9 @@
 +		unconfined_dbus_chat(unconfined_execmem_t)
 +	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.5/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.6/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/userdomain.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/userdomain.if	2006-08-08 16:15:43.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1704,9 +1737,9 @@
 +        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.5/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.6/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/userdomain.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/userdomain.te	2006-08-08 16:15:43.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -1815,9 +1848,9 @@
  		', `
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.5/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.6/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/xen.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/xen.if	2006-08-08 16:15:43.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -1860,9 +1893,9 @@
 +
 +	dontaudit $1 xend_t:fd use;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.5/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.6/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/xen.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/xen.te	2006-08-08 16:15:43.000000000 -0400
 @@ -69,7 +69,10 @@
  #
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- selinux-policy.spec	8 Aug 2006 00:26:46 -0000	1.246
+++ selinux-policy.spec	8 Aug 2006 20:40:36 -0000	1.247
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.5
+Version: 2.3.6
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -259,7 +259,6 @@
 	fi
 fi
 
-
 %if %{BUILD_TARGETED}
 %package targeted
 Summary: SELinux targeted base policy
@@ -348,6 +347,9 @@
 %endif
 
 %changelog
+* Tue Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-1
+- Quiet down anaconda audit messages
+
 * Mon Aug 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.5-1
 - Fix setroubleshootd
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	8 Aug 2006 00:26:46 -0000	1.82
+++ sources	8 Aug 2006 20:40:36 -0000	1.83
@@ -1 +1 @@
-dd1d9d958535e36048d5470580d3f108  serefpolicy-2.3.5.tgz
+d374829a4b5a08e44d337dc5cbf77d21  serefpolicy-2.3.6.tgz



From fedora-cvs-commits at redhat.com  Tue Aug  8 20:44:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 16:44:11 -0400
Subject: rpms/log4j/devel log4j-bz157585.patch,1.1,1.2 log4j.spec,1.19,1.20
Message-ID: <200608082044.k78KiBXl002347@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/log4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2035

Modified Files:
	log4j-bz157585.patch log4j.spec 
Log Message:
- Resync with latest from JPP.
- Update patch for BZ #157585 to apply cleanly.
- Partially adopt new naming convention.



log4j-bz157585.patch:
 DetailPanel.java |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: log4j-bz157585.patch
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/log4j-bz157585.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j-bz157585.patch	23 May 2005 17:24:21 -0000	1.1
+++ log4j-bz157585.patch	8 Aug 2006 20:44:09 -0000	1.2
@@ -1,11 +1,11 @@
---- jakarta-log4j-1.2.8/src/java/org/apache/log4j/chainsaw/DetailPanel.java~	2003-02-20 01:07:36.000000000 +0000
-+++ jakarta-log4j-1.2.8/src/java/org/apache/log4j/chainsaw/DetailPanel.java	2005-05-23 17:50:36.000000000 +0100
-@@ -34,7 +34,7 @@
- 
-     /** used to format the logging event **/
-     private static final MessageFormat FORMATTER = new MessageFormat(
--        "<b>Time:</b> <code>{0,time,medium}</code>" +
-+        "<b>Time:</b> <code>{0,time}</code>" +
-         "&nbsp;&nbsp;<b>Priority:</b> <code>{1}</code>" +
-         "&nbsp;&nbsp;<b>Thread:</b> <code>{2}</code>" +
-         "&nbsp;&nbsp;<b>NDC:</b> <code>{3}</code>" +
+--- ./src/java/org/apache/log4j/chainsaw/DetailPanel.java.orig	2005-12-04 22:00:58.000000000 -0500
++++ ./src/java/org/apache/log4j/chainsaw/DetailPanel.java	2006-08-08 16:20:46.000000000 -0400
+@@ -43,7 +43,7 @@
+ 
+     /** used to format the logging event **/
+     private static final MessageFormat FORMATTER = new MessageFormat(
+-        "<b>Time:</b> <code>{0,time,medium}</code>" +
++        "<b>Time:</b> <code>{0,time}</code>" +
+         "&nbsp;&nbsp;<b>Priority:</b> <code>{1}</code>" +
+         "&nbsp;&nbsp;<b>Thread:</b> <code>{2}</code>" +
+         "&nbsp;&nbsp;<b>NDC:</b> <code>{3}</code>" +


Index: log4j.spec
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/log4j.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- log4j.spec	22 Jul 2006 08:44:34 -0000	1.19
+++ log4j.spec	8 Aug 2006 20:44:09 -0000	1.20
@@ -36,7 +36,7 @@
 
 Name:           log4j
 Version:        1.2.13
-Release:        2jpp_2fc
+Release:        3jpp.1
 Epoch:          0
 Summary:        Java logging package
 License:        Apache Software License
@@ -54,6 +54,7 @@
 Source7:        %{name}.catalog
 Patch0:         %{name}-logfactor5-userdir.patch
 Patch1:         %{name}-javadoc-xlink.patch
+#FIXME: Is this patch required?
 Patch2:         %{name}-bz157585.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant
@@ -97,16 +98,19 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          System/Logging
+Requires(post):		%{__rm}
+Requires(post):		/bin/ln
+Requires(postun):	%{__rm}
 
 %description    javadoc
 Javadoc for %{name}.
 
-
 %prep
 %setup -q -n logging-%{name}-%{version}
 %patch0 -b .sav
 %patch1 -b .sav
-#%patch2 -p1
+# FIXME: Is this patch still required?
+%patch2 -p1
 
 %{__perl} -pi -e 's/\r//g' LICENSE.txt
 
@@ -267,6 +271,11 @@
 
 
 %changelog
+* Tue Aug 08 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.2.13-3jpp.1
+- Re-sync with latest from JPP.
+- Update patch for BZ #157585 to apply cleanly.
+- Partially adopt new naming convention.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.13-2jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 21:00:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 17:00:05 -0400
Subject: rpms/samba/devel .cvsignore, 1.32, 1.33 samba.spec, 1.69,
	1.70 sources, 1.34, 1.35 samba-3.0.23a-samr_alias.patch, 1.1, NONE
Message-ID: <200608082100.k78L05p8030661@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30629

Modified Files:
	.cvsignore samba.spec sources 
Removed Files:
	samba-3.0.23a-samr_alias.patch 
Log Message:
3.0.23b



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	24 Jul 2006 16:49:14 -0000	1.32
+++ .cvsignore	8 Aug 2006 21:00:02 -0000	1.33
@@ -1 +1 @@
-samba-3.0.23a.tar.gz
+samba-3.0.23b.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- samba.spec	24 Jul 2006 21:15:21 -0000	1.69
+++ samba.spec	8 Aug 2006 21:00:02 -0000	1.70
@@ -2,8 +2,8 @@
 
 Summary: The Samba SMB server.
 Name: samba
-Version: 3.0.23a
-Release: 3
+Version: 3.0.23b
+Release: 2
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -28,7 +28,7 @@
 
 # upstream patches.  Applied first so that they'll break our patches rather
 # than the other way around
-Patch1: samba-3.0.23a-samr_alias.patch
+# (none right now)
 
 # generic patches
 Patch101: samba-2.2.0-smbw.patch
@@ -112,8 +112,7 @@
 cp %{SOURCE8} packaging/Fedora/winbind.init
 
 # Upstream patches
-%patch1 -p1
-
+#(none)
 # generic patches
 %patch101 -p1 -b .smbw
 %patch102 -p1 -b .pipedir
@@ -446,6 +445,9 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Tue Aug 8 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23b-2
+- New upstream release.
+
 * Mon Jul 24 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23a-3
 - Fix the -logfiles patch to close
   bz#199607 Samba compiled with wrong log path.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	24 Jul 2006 16:49:14 -0000	1.34
+++ sources	8 Aug 2006 21:00:03 -0000	1.35
@@ -1 +1 @@
-e48f196fa51c22ff67463680ce95a58d  samba-3.0.23a.tar.gz
+f2d1a513fd7138fd1515d3bdf702f7c7  samba-3.0.23b.tar.gz


--- samba-3.0.23a-samr_alias.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug  8 21:24:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 17:24:30 -0400
Subject: rpms/gnome-applets/devel
	gnome-applets-2.15.1.1-destroy-on-close.patch, NONE,
	1.1 gnome-applets.spec, 1.162, 1.163
Message-ID: <200608082124.k78LOUc7028071@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.15.1.1-destroy-on-close.patch 
Log Message:
- destroy about dialog on close (bug 197975)


gnome-applets-2.15.1.1-destroy-on-close.patch:
 about.py |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gnome-applets-2.15.1.1-destroy-on-close.patch ---
--- gnome-applets-2.15.1.1/invest-applet/invest/about.py.destroy-on-close	2006-08-08 17:19:44.000000000 -0400
+++ gnome-applets-2.15.1.1/invest-applet/invest/about.py	2006-08-08 17:20:06.000000000 -0400
@@ -42,4 +42,5 @@
 	for prop, val in infos.items():
 		about.set_property(prop, val)
 
+	about.connect("response", lambda self, *args: self.destroy())
 	about.show_all()


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gnome-applets.spec	5 Aug 2006 16:49:47 -0000	1.162
+++ gnome-applets.spec	8 Aug 2006 21:24:24 -0000	1.163
@@ -30,7 +30,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.2
-Release:  	3%{?dist}
+Release:  	4%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -44,6 +44,7 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 Patch12:	gnome-applets-2.15.2-multiload.patch
+Patch13:        gnome-applets-2.15.1.1-destroy-on-close.patch
 
 URL:		http://www.gnome.org/
 
@@ -122,6 +123,7 @@
 %patch10 -p1 -b .invest
 %patch11 -p1 -b .dont-require-display
 %patch12 -p1 -b .multiload
+%patch13 -p1 -b .destroy-on-close
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -255,6 +257,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Tue Aug  8 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.2-4.fc6
+- destroy about dialog on close (bug 197975)
+
 * Sat Aug  5 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.15.2-3.fc6
 - rebuild against new gucharmap
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 21:35:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 17:35:25 -0400
Subject: rpms/gnome-applets/devel
	gnome-applets-2.15.1.1-destroy-on-close.patch, 1.1, 1.2
Message-ID: <200608082135.k78LZPL7031349@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-applets-2.15.1.1-destroy-on-close.patch 
Log Message:
try to make the patch again, I apparently didn't do so well the
first time


gnome-applets-2.15.1.1-destroy-on-close.patch:
 about.py |    1 +
 1 files changed, 1 insertion(+)

Index: gnome-applets-2.15.1.1-destroy-on-close.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets-2.15.1.1-destroy-on-close.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applets-2.15.1.1-destroy-on-close.patch	8 Aug 2006 21:24:24 -0000	1.1
+++ gnome-applets-2.15.1.1-destroy-on-close.patch	8 Aug 2006 21:35:21 -0000	1.2
@@ -1,8 +1,8 @@
---- gnome-applets-2.15.1.1/invest-applet/invest/about.py.destroy-on-close	2006-08-08 17:19:44.000000000 -0400
-+++ gnome-applets-2.15.1.1/invest-applet/invest/about.py	2006-08-08 17:20:06.000000000 -0400
+--- gnome-applets-2.15.2/invest-applet/invest/about.py.destroy-on-close	2006-04-13 11:11:25.000000000 -0400
++++ gnome-applets-2.15.2/invest-applet/invest/about.py	2006-08-08 17:33:47.000000000 -0400
 @@ -42,4 +42,5 @@
  	for prop, val in infos.items():
  		about.set_property(prop, val)
- 
-+	about.connect("response", lambda self, *args: self.destroy())
+ 	
++ 	about.connect("response", lambda self, *args: self.destroy())
  	about.show_all()



From fedora-cvs-commits at redhat.com  Tue Aug  8 21:35:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 17:35:25 -0400
Subject: rpms/velocity/devel velocity.spec,1.20,1.21
Message-ID: <200608082135.k78LZPrD031364@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/velocity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31134

Modified Files:
	velocity.spec 
Log Message:
- Resync with latest from JPP.
- Partially adopt new naming convention.




Index: velocity.spec
===================================================================
RCS file: /cvs/dist/rpms/velocity/devel/velocity.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- velocity.spec	24 Jul 2006 03:57:05 -0000	1.20
+++ velocity.spec	8 Aug 2006 21:35:22 -0000	1.21
@@ -37,7 +37,7 @@
 
 Name:           velocity
 Version:        1.4
-Release:        5jpp_2fc
+Release:        6jpp.1
 Epoch:          0
 Summary:        Java-based template engine
 License:        Apache Software License
@@ -116,6 +116,9 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):		%{__rm}
+Requires(post):		/bin/ln
+Requires(postun):	%{__rm}
 
 %description    javadoc
 Javadoc for %{name}.
@@ -250,10 +253,6 @@
 
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/velocity-1.4.jar.*
-#FIXME: This was not generated by spec-convert-gcj-* script
-#but natively compiled by aot-compile-rpm. There doesnt seem
-#to be a jar in the buildroot for classloader, yet it is
-#compiled by aot-compile-rpm! Find out why.
 %attr(-,root,root) %{_libdir}/gcj/%{name}/classloader.*
 %endif
 
@@ -284,6 +283,10 @@
 #%endif
 
 %changelog
+* Tue Aug 08 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.4-6jpp.1
+- Resync with latest from JPP.
+- Partially adopt new naming convention.
+
 * Sat Jul 22 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.4-5jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 21:43:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 17:43:29 -0400
Subject: rpms/cachefilesd/devel cachefilesd-0.4-initscript.patch, NONE,
	1.1 cachefilesd.spec, 1.12, 1.13
Message-ID: <200608082143.k78LhTjp000853@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/cachefilesd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv753

Modified Files:
	cachefilesd.spec 
Added Files:
	cachefilesd-0.4-initscript.patch 
Log Message:
- Updated init.d script to look for cachefilesd in /sbin
- Added postun and preun rules so cachefilesd is stopped
  and started when the rpm is updated or removed.


cachefilesd-0.4-initscript.patch:
 cachefilesd.initd |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cachefilesd-0.4-initscript.patch ---
--- cachefilesd-0.4/cachefilesd.initd.orig	2006-08-01 11:52:50.000000000 -0400
+++ cachefilesd-0.4/cachefilesd.initd	2006-08-08 17:25:39.513713000 -0400
@@ -26,7 +26,7 @@
 MODPROBE_ARGS=""
 PROG="cachefilesd"
 
-[ ! -x /usr/sbin/$PROG ] && exit 0
+[ ! -x /sbin/$PROG ] && exit 0
 
 # Check for and source configuration file otherwise set defaults
 [ -f /etc/sysconfig/$PROG ] && . /etc/sysconfig/$PROG


Index: cachefilesd.spec
===================================================================
RCS file: /cvs/dist/rpms/cachefilesd/devel/cachefilesd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cachefilesd.spec	7 Aug 2006 22:05:37 -0000	1.12
+++ cachefilesd.spec	8 Aug 2006 21:43:24 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           cachefilesd
 Version:        0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CacheFiles userspace management daemon
 Group:          System Environment/Daemons
 License:        GPL
@@ -12,6 +12,8 @@
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 
+Patch1: cachefilesd-0.4-initscript.patch
+
 %description
 The cachefilesd daemon manages the caching files and directory that are
 that are used by network filesystems such a AFS and NFS to  
@@ -20,6 +22,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %ifarch s390 s390x
 PIE="-fPIE"
@@ -50,9 +54,15 @@
 
 %preun
 if [ $1 -eq 0 ]; then
+	/sbin/service cachefilesd stop
 	/sbin/chkconfig --del %{name}
 fi
 
+%postun
+if [ "$1" -ge 1 ]; then
+	/sbin/service cachefilesd condrestart > /dev/null
+fi
+
 
 %files
 %defattr(-,root,root)
@@ -63,6 +73,11 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Aug  8 2006 Steve Dickson <steved at redhat.com> 0.4-3
+- Updated init.d script to look for cachefilesd in /sbin
+- Added postun and preun rules so cachefilesd is stopped
+  and started when the rpm is updated or removed.
+
 * Tue Aug  7 2006 Jesse Keating <jkeating at redhat.com> 0.4-2
 - require /sbin/chkconfig not /usr/bin/chkconfig
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 21:44:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 17:44:32 -0400
Subject: rpms/cachefilesd/devel cachefilesd.spec,1.13,1.14
Message-ID: <200608082144.k78LiWdf001050@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/cachefilesd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1010

Modified Files:
	cachefilesd.spec 
Log Message:
Added /sbin/service to requires



Index: cachefilesd.spec
===================================================================
RCS file: /cvs/dist/rpms/cachefilesd/devel/cachefilesd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cachefilesd.spec	8 Aug 2006 21:43:24 -0000	1.13
+++ cachefilesd.spec	8 Aug 2006 21:44:29 -0000	1.14
@@ -9,8 +9,8 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: automake, autoconf
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
+Requires(post): /sbin/chkconfig, /sbin/service
+Requires(preun): /sbin/chkconfig, /sbin/service
 
 Patch1: cachefilesd-0.4-initscript.patch
 



From fedora-cvs-commits at redhat.com  Tue Aug  8 21:55:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 17:55:45 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.318, 1.319 anaconda.spec, 1.444,
	1.445 sources, 1.441, 1.442
Message-ID: <200608082155.k78Ltj51019079@cvs.devel.redhat.com>

Author: pnasrat

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- .cvsignore	7 Aug 2006 21:35:06 -0000	1.318
+++ .cvsignore	8 Aug 2006 21:55:42 -0000	1.319
@@ -1 +1 @@
-anaconda-11.1.0.79.tar.bz2
+anaconda-11.1.0.80.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- anaconda.spec	7 Aug 2006 21:35:06 -0000	1.444
+++ anaconda.spec	8 Aug 2006 21:55:42 -0000	1.445
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.79
+Version: 11.1.0.80
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,12 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Aug 08 2006 Paul Nasrat <pnasrat at redhat.com> 11.1.0.80-1
+- Blacklist e2fsprogs.ppc64 on upgrades (#200233)
+- Set self.currentMedia to [] (dcantrel, #201722).
+- Remove multiple error messages (dcantrel, #201247)
+- Revert logMessage calls (clumens, #201707)
+
 * Mon Aug 07 2006 Chris Lumens <clumens at redhat.com> 11.1.0.79-1
 - s390 build fix.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- sources	7 Aug 2006 21:35:06 -0000	1.441
+++ sources	8 Aug 2006 21:55:42 -0000	1.442
@@ -1 +1 @@
-6e14e437e7436c50a38e0406cdb13c9d  anaconda-11.1.0.79.tar.bz2
+c2e0dc8aa99bf0de8814b3c9eedb6049  anaconda-11.1.0.80.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  9 01:02:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 8 Aug 2006 21:02:39 -0400
Subject: rpms/SysVinit/devel sysvinit-2.86-quiet.patch, NONE,
	1.1 SysVinit.spec, 1.46, 1.47
Message-ID: <200608090102.k7912dkk009521@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9394

Modified Files:
	SysVinit.spec 
Added Files:
	sysvinit-2.86-quiet.patch 
Log Message:
be quiet when booted with 'quiet'


sysvinit-2.86-quiet.patch:
 init.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE sysvinit-2.86-quiet.patch ---
--- sysvinit-2.86/src/init.c.silence	2006-08-08 20:50:37.000000000 -0400
+++ sysvinit-2.86/src/init.c	2006-08-08 20:54:24.000000000 -0400
@@ -117,6 +117,7 @@
 char *console_dev;		/* Console device. */
 int pipe_fd = -1;		/* /dev/initctl */
 int did_boot = 0;		/* Did we already do BOOT* stuff? */
+int quiet = 0;			/* Should we be relatively silent? */
 int main(int, char **);
 
 /*	Used by re-exec part */
@@ -1673,7 +1674,7 @@
 			initlog(L_SY, "Trying to re-exec init");
 			return 'U';
 		default:
-		  	initlog(L_VB, "Switching to runlevel: %c", foo);
+		  	if (!quiet) initlog(L_VB, "Switching to runlevel: %c", foo);
 	}
 
 	if (foo == 'Q') return runlevel;
@@ -2425,7 +2426,7 @@
   	/*
 	 *	Say hello to the world
 	 */
-  	initlog(L_CO, bootmsg, "booting");
+  	if (!quiet) initlog(L_CO, bootmsg, "booting");
 
   	/*
 	 *	See if we have to start an emergency shell.
@@ -2657,6 +2658,8 @@
 		else if (!strcmp(argv[f], "-z")) {
 			/* Ignore -z xxx */
 			if (argv[f + 1]) f++;
+		} else if (!strcmp(argv[f], "quiet")) {
+			quiet = 1;
 		} else if (strchr("0123456789sS", argv[f][0])
 			&& strlen(argv[f]) == 1)
 			dfl_level = argv[f][0];


Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- SysVinit.spec	19 Jul 2006 14:31:10 -0000	1.46
+++ SysVinit.spec	9 Aug 2006 01:02:33 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -130,6 +130,9 @@
 /dev/initctl
 
 %changelog
+* Tue Aug  8 2006 Bill Nottingham <notting at redhat.com> - 2.86-7
+- be slightly less verbose when booted with 'quiet'
+
 * Wed Jul 19 2006 Bill Nottingham <notting at redhat.com> - 2.86-6
 - fix IPv6 patch (<mzazrive at redhat.com>)
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 05:21:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 01:21:02 -0400
Subject: rpms/cairo/devel .cvsignore, 1.17, 1.18 cairo.spec, 1.54,
	1.55 sources, 1.17,
	1.18 cairo-1.1.4-work-with-older-poppler.patch, 1.1,
	NONE cairo-1.1.6-do-not-build-pdf2svg.patch, 1.4, NONE
Message-ID: <200608090521.k795L2hv024554@cvs.devel.redhat.com>

Author: besfahbo

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

Modified Files:
	.cvsignore cairo.spec sources 
Removed Files:
	cairo-1.1.4-work-with-older-poppler.patch 
	cairo-1.1.6-do-not-build-pdf2svg.patch 
Log Message:
Update to 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	4 Jul 2006 03:10:48 -0000	1.17
+++ .cvsignore	9 Aug 2006 05:20:58 -0000	1.18
@@ -1 +1 @@
-cairo-1.2.0.tar.gz
+cairo-1.2.2.tar.gz


Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cairo.spec	18 Jul 2006 16:23:15 -0000	1.54
+++ cairo.spec	9 Aug 2006 05:20:58 -0000	1.55
@@ -3,10 +3,10 @@
 
 Summary:   A vector graphics library
 Name:      cairo
-Version:   1.2.0
-Release:   2
+Version:   1.2.2
+Release:   1
 URL:       http://cairographics.org
-Source0:   %{name}-%{version}.tar.gz
+Source0:   http://cairographics.org/releases/%{name}-%{version}.tar.gz
 License:   LGPL/MPL
 Group:     System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -28,7 +28,7 @@
 Cairo is a vector graphics library designed to provide high-quality
 display and print output. Currently supported output targets include
 the X Window System, OpenGL (via glitz), in-memory image buffers, and
-image files (PDF and PostScript).  Cairo is designed to produce
+image files (PDF, PostScript, and SVG).  Cairo is designed to produce
 identical output on all output media while taking advantage of display
 hardware acceleration when available (eg. through the X Render
 Extension or OpenGL).
@@ -83,6 +83,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Wed Aug  9 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.2.2-1
+- Update to 1.2.2
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 1.2.0-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	4 Jul 2006 03:10:48 -0000	1.17
+++ sources	9 Aug 2006 05:20:58 -0000	1.18
@@ -1 +1 @@
-5c9ad71d1b582907eee0497b196689ef  cairo-1.2.0.tar.gz
+2460487b1257a5583c889b1b9d2033ec  cairo-1.2.2.tar.gz


--- cairo-1.1.4-work-with-older-poppler.patch DELETED ---


--- cairo-1.1.6-do-not-build-pdf2svg.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  9 05:21:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 01:21:30 -0400
Subject: rpms/pango/devel pango.spec,1.78,1.79
Message-ID: <200608090521.k795LUxa024755@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24690

Modified Files:
	pango.spec 
Log Message:
Update to 1.14.0



Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- pango.spec	2 Aug 2006 18:06:41 -0000	1.78
+++ pango.spec	9 Aug 2006 05:21:27 -0000	1.79
@@ -3,15 +3,15 @@
 %define pkgconfig_version 0.12
 %define freetype_version 2.1.3-3
 %define fontconfig_version 2.0
-%define cairo_version 1.1.2
+%define cairo_version 1.2.2
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.13.5
+Version: 1.14.0
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
-Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.13/pango-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2
 URL: http://www.pango.org
 BuildRoot: %{_tmppath}/pango-%{PACKAGE_VERSION}-root
 
@@ -21,7 +21,6 @@
 Requires(pre): libXrender, libX11, libXext, libXft
 Requires: freetype >= %{freetype_version}
 Requires: cairo >= %{cairo_version}
-BuildRequires: libtool >= 1.4.2-10
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pkgconfig >= %{pkgconfig_version}
 BuildRequires: freetype-devel >= %{freetype_version}
@@ -190,6 +189,9 @@
 
 
 %changelog
+* Wed Aug 07 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.14.0-1
+- Update to 1.14.0
+
 * Wed Aug 02 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.13.5-1
 - Update to 1.13.5
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 06:06:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 02:06:26 -0400
Subject: rpms/pango/devel .cvsignore, 1.38, 1.39 pango.spec, 1.79,
	1.80 sources, 1.38, 1.39
Message-ID: <200608090606.k7966QLV019309@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19290

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
Fix sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	2 Aug 2006 18:06:41 -0000	1.38
+++ .cvsignore	9 Aug 2006 06:06:20 -0000	1.39
@@ -1 +1 @@
-pango-1.13.5.tar.bz2
+pango-1.14.0.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- pango.spec	9 Aug 2006 05:21:27 -0000	1.79
+++ pango.spec	9 Aug 2006 06:06:20 -0000	1.80
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.14.0
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Wed Aug 07 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.14.0-2
+- Incorrect sources in last update.  Fix.
+
 * Wed Aug 07 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.14.0-1
 - Update to 1.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	2 Aug 2006 18:06:41 -0000	1.38
+++ sources	9 Aug 2006 06:06:20 -0000	1.39
@@ -1 +1 @@
-e670733d74e52f344bc7d9f7766390a6  pango-1.13.5.tar.bz2
+39144843f377ec6b60dbbf1a25d2a49a  pango-1.14.0.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  9 06:14:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 02:14:43 -0400
Subject: rpms/kde-i18n/devel kde-i18n.spec,1.67,1.68
Message-ID: <200608090614.k796Eh1m030371@cvs.devel.redhat.com>

Author: than

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

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



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kde-i18n.spec	8 Aug 2006 16:34:06 -0000	1.67
+++ kde-i18n.spec	9 Aug 2006 06:14:25 -0000	1.68
@@ -57,7 +57,7 @@
 
 BuildPrereq: kdelibs-devel
 BuildPrereq: findutils
-BuildPrereq: gettext-devel
+BuildPrereq: gettext
 
 %description
 Internationalization support for KDE
@@ -769,6 +769,7 @@
 %defattr(-,root,root)
 %lang(de) %{_datadir}/locale/de/*
 %lang(de) %doc %{_docdir}/HTML/de
+%lang(de) %{_datadir}/apps/klettres/de
 %lang(de) %{_datadir}/apps/ktuberling/sounds/de/*
 %lang(de) %{_datadir}/apps/khangman/data/de
 %lang(de) %{_datadir}/apps/khangman/de.txt
@@ -810,6 +811,7 @@
 %defattr(-,root,root)
 %lang(et) %{_datadir}/locale/et/*
 %lang(et) %doc %{_docdir}/HTML/et
+%lang(et) %{_datadir}/apps/kanagram/data/et
 %lang(et) %{_datadir}/apps/khangman/data/et
 %lang(et) %{_datadir}/apps/khangman/et.txt
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 06:27:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 02:27:23 -0400
Subject: rpms/gnome-panel/devel
	gnome-panel-2.15.90-move-suspend-to-menu.patch, 1.2,
	1.3 gnome-panel.spec, 1.140, 1.141
Message-ID: <200608090627.k796RNhU012983@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-panel-2.15.90-move-suspend-to-menu.patch 
	gnome-panel.spec 
Log Message:
- remove suspend from logout dialog


gnome-panel-2.15.90-move-suspend-to-menu.patch:
 panel-action-button.c |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++
 panel-enums.h         |    1 
 panel-logout.c        |    4 ---
 panel-menu-items.c    |   23 +++++++++++++++++++++-
 4 files changed, 75 insertions(+), 5 deletions(-)

Index: gnome-panel-2.15.90-move-suspend-to-menu.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.15.90-move-suspend-to-menu.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-panel-2.15.90-move-suspend-to-menu.patch	5 Aug 2006 13:05:55 -0000	1.2
+++ gnome-panel-2.15.90-move-suspend-to-menu.patch	9 Aug 2006 06:27:19 -0000	1.3
@@ -1,5 +1,5 @@
---- gnome-panel-2.15.90/gnome-panel/panel-menu-items.c.move-suspend-to-menu	2006-08-04 13:59:37.000000000 -0400
-+++ gnome-panel-2.15.90/gnome-panel/panel-menu-items.c	2006-08-04 14:27:02.000000000 -0400
+--- gnome-panel-2.15.90/gnome-panel/panel-menu-items.c.move-suspend-to-menu	2006-08-07 11:14:02.000000000 -0400
++++ gnome-panel-2.15.90/gnome-panel/panel-menu-items.c	2006-08-07 11:14:02.000000000 -0400
 @@ -49,6 +49,7 @@
  #include "panel-recent.h"
  #include "panel-stock-icons.h"
@@ -8,7 +8,7 @@
  
  #define BOOKMARKS_FILENAME      ".gtk-bookmarks"
  #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
-@@ -1005,10 +1006,22 @@ panel_desktop_menu_item_new (gboolean us
+@@ -1005,10 +1006,22 @@
  	}
  
  	menuitem->priv->append_lock_logout = append_lock_logout;
@@ -32,7 +32,7 @@
  	menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem);
  	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
  				   menuitem->priv->menu);
-@@ -1113,6 +1126,14 @@ panel_menu_items_append_lock_logout (Gtk
+@@ -1113,6 +1126,14 @@
  		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
  	}
  
@@ -47,9 +47,9 @@
  	item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN);
  	if (item != NULL) {
  		if (!separator_inserted)
---- gnome-panel-2.15.90/gnome-panel/panel-enums.h.move-suspend-to-menu	2006-08-04 14:04:53.000000000 -0400
-+++ gnome-panel-2.15.90/gnome-panel/panel-enums.h	2006-08-04 14:32:59.000000000 -0400
-@@ -96,6 +96,7 @@ typedef enum {
+--- gnome-panel-2.15.90/gnome-panel/panel-enums.h.move-suspend-to-menu	2006-07-24 10:50:32.000000000 -0400
++++ gnome-panel-2.15.90/gnome-panel/panel-enums.h	2006-08-07 11:14:02.000000000 -0400
+@@ -96,6 +96,7 @@
  	PANEL_ACTION_FORCE_QUIT,
  	PANEL_ACTION_CONNECT_SERVER,
  	PANEL_ACTION_SHUTDOWN,
@@ -58,7 +58,7 @@
          PANEL_ACTION_SCREENSHOT,
          PANEL_ACTION_LAST
 --- gnome-panel-2.15.90/gnome-panel/panel-action-button.c.move-suspend-to-menu	2006-02-12 07:36:56.000000000 -0500
-+++ gnome-panel-2.15.90/gnome-panel/panel-action-button.c	2006-08-04 14:33:32.000000000 -0400
++++ gnome-panel-2.15.90/gnome-panel/panel-action-button.c	2006-08-07 11:14:02.000000000 -0400
 @@ -47,10 +47,16 @@
  #include "panel-lockdown.h"
  #include "panel-logout.h"
@@ -76,7 +76,7 @@
  enum {
  	PROP_0,
  	PROP_ACTION_TYPE,
-@@ -77,6 +83,7 @@ static GConfEnumStringPair panel_action_
+@@ -77,6 +83,7 @@
  	{ PANEL_ACTION_FORCE_QUIT,     "force-quit"     },
  	{ PANEL_ACTION_CONNECT_SERVER, "connect-server" },
  	{ PANEL_ACTION_SHUTDOWN,       "shutdown"       },
@@ -84,7 +84,7 @@
  	/* compatibility with GNOME < 2.13.90 */
  	{ PANEL_ACTION_SCREENSHOT,     "screenshot"     },
  	{ 0,                           NULL             },
-@@ -167,12 +174,47 @@ panel_action_shutdown (GtkWidget *widget
+@@ -167,12 +174,47 @@
  }
  
  static gboolean
@@ -132,7 +132,7 @@
  /* Run Application
   */
  static void
-@@ -358,6 +400,16 @@ static PanelAction actions [] = {
+@@ -358,6 +400,16 @@
  		panel_action_shutdown, NULL, NULL,
  		panel_action_shutdown_is_disabled
  	},
@@ -149,3 +149,16 @@
  	/* deprecated actions */
  	{
  		PANEL_ACTION_SCREENSHOT,
+--- gnome-panel-2.15.90/gnome-panel/panel-logout.c.move-suspend-to-menu	2006-08-09 02:25:53.000000000 -0400
++++ gnome-panel-2.15.90/gnome-panel/panel-logout.c	2006-08-09 02:25:58.000000000 -0400
+@@ -334,10 +334,6 @@
+ 		primary_text   = _("Shut down this system now?");
+ 
+ 		logout_dialog->priv->default_response = PANEL_LOGOUT_RESPONSE_SHUTDOWN;
+-		if (panel_power_manager_can_suspend (logout_dialog->priv->power_manager))
+-			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+-					       _("S_uspend"),
+-					       PANEL_LOGOUT_RESPONSE_STR);
+ 
+ 		if (panel_power_manager_can_hibernate (logout_dialog->priv->power_manager))
+ 			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gnome-panel.spec	7 Aug 2006 22:39:23 -0000	1.140
+++ gnome-panel.spec	9 Aug 2006 06:27:19 -0000	1.141
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.15.90
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 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
@@ -231,7 +231,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
-* Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.90-4
+* Wed Aug  9 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-5
+- remove suspend from logout dialog
+
+-* Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.90-4
 - Rebuild against evolution-data-server-1.7.91
 
 * Mon Aug  7 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-3



From fedora-cvs-commits at redhat.com  Wed Aug  9 07:25:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 03:25:23 -0400
Subject: rpms/sysstat/devel sysstat-7.0.0.tar.gz,1.1,NONE
Message-ID: <200608090725.k797PNFc032026@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/sysstat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31779

Removed Files:
	sysstat-7.0.0.tar.gz 
Log Message:
systat-7.0.0.tar.gz removed from directory.



--- sysstat-7.0.0.tar.gz DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  9 07:51:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 03:51:23 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr-2.33.0.tar.bz2, NONE,
	1.1 .cvsignore, 1.5, 1.6 man-pages-fr.spec, 1.21, 1.22 sources,
	1.5, 1.6
Message-ID: <200608090751.k797pN6I021338@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21145

Modified Files:
	.cvsignore man-pages-fr.spec sources 
Added Files:
	man-pages-fr-2.33.0.tar.bz2 
Log Message:
New source for man-pages



--- NEW FILE man-pages-fr-2.33.0.tar.bz2 ---
BZh91AY&SY???n???????????????????????????}:}?!????b???
??VM???7?????G???[w??w????????As
?--???

?n?nb??msnm???w?k??@?????r??????
??z?r*(??P??F????T(;???@v????Z????UF?`?????????
???
	?3

=&?Oj??F????

?r??X??d??????????????{?k??Zu??oz??i??ly?{???????Lm^?z??K{C?s6-k|?=`??	z?????????loI?????%2EZ??'lxL??%???F????
???cpZ-K????/???R???9%?v????????$??0F?

?vn?T1??`???f??OXJ??+W!*TT*?{?`?r???@?1!???zy???h{??????YE??d?4???z0?p3viS?]?Mk[???????i??.???EJ?d&?l?%????7fi5????V?9?????/0V-?e???n6?f???????{????-d??q??Y?0jo{q???oJZB???9???????M&???\W??]?P%Ep*?Q
??+?
U??"`I?
i?$Fb!%QD??R??b??????Vt???A#H3!?#???????T???=???A?X??????
P_g?F?2J)P2@???s????=???
}#3'0?("??n???zG?????????p^1?o
????y?????????Nhtl@??<,??H?J???)?o"G??o?{??7????#?R?.];?o^?yP?D???????:???m?BHza??s?(??I6?dt?M?@?h?????u?%??U?*?S?W?????_???8???{V???y?_+?>?}G?,????T;??G~???????F?????'OoS???!???S?/????Z?r[?g?????G??c?b???[?ur?z????Qo?????[???0???z}K???mN????
$??????;|???????]?;%??/.?^Ix%@?Y???/???I?B-?/46?UJ|????UGL?7<E+????????{A?N5?????n
???p(?<#@?*??SF?k86*?????I??K??oi????>???c?"???????o??x?M'?:ro??p?9^?????_(???r?Qs?4?G?JEUv??yL ??MHaR??N??g?????9;??
A??}?Mb?
????<?}0??a???
VH5]??/????S???`)U+ZUhT?<D?:~??q??&????Md???dv*? ???j-}????!Vi?I???J???H"?2?*??*???^?_?e????g[?*}~?]?6?M+>???WQc?my?Y?x???Z??.?8?+T???%B?J? ??F~m??P??f??b?_????Z?>g?????????"W>????gCC?s/???;???:>?$
?d??????<(??:????+N|?8???n?|9B??1jGE?%?????l?}?Q9?w&?m??d?md*7????t\?tb0t?K$UK??+Is??]?|kP?w?*?~?z????6?r??D?z????UHm
J%??
T?#??K?@c?B'??Z??????0??????????3#2?\J}T?h???[???$rfzU?	???p` ??:??A???v-????:pC??!???
?D?	???P?:?J??????C??~?%(]?????v????7???Z??E??
}?????3???&?a????0??q????Dn??y???t??4??A?p??V8\?1??????[????????q???X??Fu??N[o%??? J?????1?????????W?u?G????\???CK1?$?9?F???M?OHFF?|?
=p????????((?????)ib??+?~??C??????????Xb???>???XP?O??d
????J??Z??r?(?'??'?J?=?L?S?]??~{????v??
J?{?????6V?uiZ?G??T??a~e?RR????????zJ??Pj??j=0?B?V?<W????`V?N???qU??P?]v
_???&???yTB?G	;/??y#??????<>? ??i
R?(?? ?y???5??;?????b??!}????u?+????t??????????{dL>???D^?1Dv ?%3??C?
G??K???1?w>Ws?9???Z??C??P??";Q	P??XZ
j?
)??3B/?A???0

?qG??=5|.?>???????/?"????E9'm<S?[{y???@?Z?(?yu?????A{h=??j??
jN????&QGo???G??G??m????~T?
?{?"??2v???
?"???????b?F??????j??$??8,?GlPEMN?????????Y?Z3?TR?E@???EW!MlfJ?n??(?V?
I/?6?????'?????????r??9??.??
J?UgDlc`m#m???QV?5QuImM??u??11D??QUB?.[U???S??Q???Uu
A?;?????z?|A?`??v???R5L]0?oJ?Dt??*?R,k8\?|?B
"?b?<??????????????K?I?r???????V???"??u?s%???(?
??F;?	??4?~????
?`?v??C?r??? b1?y??=?|??-?.?????
p??a?Q??e?:v
?G?2??!??l????I?[X2?>nn?
v/???0?n?a$~??t????????????]\=?????}?k??????B?????A?????]?\)?"????/??i??~H?"1?o??.?8Ps}???o??c????p??o?????n]\??|?Ir\??=???f?O?^??o???w?A??
???t??1???Vd??r??aH?F?`&.??M?ni?????*
??Y??QG9.????}]??^>??F?:??W??[??!???9?,
?[?/?/???.??
?~	??c?fF???0???W?9??9??
??m]?@!?3?y+.?i?jCG?J
~&?????wfY???K?t????.?N??7???????<?KID???F?????4l
???}?^?o??W???_??JD$
???N????1???????>??????<3????Z??j(G?sz???????	??c???bc???????}=?k~S?z?A????/@??k}_??a?9wq?f?Iz??????????o?&0??????iBM???y??M?j??N???+6h?????l}??K?????/?[??!??,
!??????%???5?????????s%Z?)?<?#I??
?J
???????p???p?????D?SS?3?|??R???????w????\?a??t?g,t>?78*"
B,???N?b%?N????N2??N?i?)!????4*?B????$j???'??E?Y?>??y#]%yc?f?:???8^????8_x???7Q~?0?|????L?!%9K?q?!A
AC?%'??!??d5{j1?J
L!?????:????????`!?pr(??T
?,*?????*????P????*?I???9?)
?y??? }&?????????????4??H??>_??C?????0+??0?.hQin???????$????????G;0?%?o????qoN????iq?H7????$G?L??????l{??=?(H6??????"bBdIv]?G?d??p"`Ya<Y5?9@???Qy??4
????(n?=???3???[???Sy[Y?@l[V????K??^D
?Z?+??g??????^r~?_v??
l?T??????@?
????p
d>?]??+????}??-?i?!?j7H\a?|O0????"???g??<??x?l|y??[|??oRn?=.9w?????7~?E?
1??}???=?????8???W????q?i?:
e??????4ED??TI*??J:o?g??H	?T
?~????|ChkDo?N?w?"??|#????S????????
???????10??_????Bt?????
??:7r????1???Yn?H?&J???$?	?r? TM??1?e*?z??!?P????$?C!?x,??4q:c????.c.?l?n?G??N1-??*?????:????x?g\A???&`?	40t?Oa???sg??D?\?09B?c??
??
?w???OO/???Vh?D
??Xi+eJ%??(U?We3????J?0???ULa??2??:??HY???C?ek?7?za??Bc*,?=?PLE??e1??zI?[*R1z,e?a??K???ci
KK	ei??	??\?l3?)\??gf?k*?Rl??UB??c'j?Z???Z????9?????*ZX?V??????0??S@?????Y?=!?????1%??zj?W??????^|??bMjiz?VoZ?}e??]?N????|??5J?)??????giPW?j?????,???i?????fOQ?'?"?-;????6?HP?!Aq??v???W?OL?Fs??
U??w??????e??AX ?7?>[)??K
Gav?a??3????8?9D?_?kQR?b[?-?eF4g??<h??? +V?h?lapd??
??<??M?
k???7?|?^??X??????DA????P"z????[????$e??`f???7????,;?h?OF2?%???bq?gsx???j?P60?*??e[??-???n?$??1qE?[5?;\?0?????????????>??????F??d%?M????p? ????dmnz????t???I???
y>???f{????O??L
~?Q U
`0???????????_?i=]?m<r???WW?????????4??.????i?y?$@t??S	?h???;?2?s+xv(?????n?HK??f?+G(??l??~;&l??A0??r? ??	Ow??t?S??{?i????.????
?D???????u?SH?l?P?qo8C???
z??]t??Y??Q?*<?kq?r???Q?/d?????#??>.?Hq??5?????D?????<??????w$bk?r?g?:?uKu?6?<m???????????5o	M???s?+?g???u?g?Nv??????F?#?|c???W??|?????#b8??r??%??O?:???????????~??????3:v7?m?'?>O?lG?c?~?~?p??@^?w?????h?6???]N?7??"?/???-H?L5?q??y?{?xs|"|?
???N?i?8???7??S??>7???x????????SgVO??a??????5?o?????^Kft?L??
???W?I?<??0?[??L????n?zs?I	?:??h?????{?u??|9}?|:???~????[y????ox????o????#?????Oq
?lc?w?3??????x?-?$??O?
%?$r?+????
}??Rc?????????M??0:?y??????w7??91hc??Frz?????????
????r>??IC??????a??Q???
 ?t{v???*?	,???!??	_???.??#???3??????????
??T???3??J?o@p
z9?????????{4??S??*??0?p?u?????~o??
!?n|S???(?\>`???????0????????l\%U???X???6???|OY2 at qS??!<??s?h(?H?n??????4?????%()F???Nq??E???r????A)????|??????T)??????#f
V_(???A?D?|U?????h?0???????j??j?Hg????I?>????O?S?9???F;Q???? ?t?^?)??i??????i+.???????n?X?m?B	!&?(?g at 4????!?n?g]???9?S?_ga?!?}?????7Gdx#???o?????=??
?kO??%F??j?oW?D??SV"??nmpKZX?$??????U??_??Q?h?p??v???h4J??!/???{h??Gd??d??[T??c?&?4Y?]??H?/\?????Z??????5??j?..0?????????IR??G(???M??w?J ??n??????+????Lf?????g
?A?n?%f?!???clpQI?P???wH??e??n??^n?????K??$$??*Zn?)????1??AP?????????!?r
?=??A??Cp??x 
UA?? ???Y????d%????G?(???Hf?T+?(?k???G????????
???$??qT<q#$A$m ?]??2??#$?m??d??!???[???A?$??x?~z???8g???Ho?u4q?n:?xp???????:???????]h2C??D-?n?????
?v+?+??p???OL??|T??p?Q/8}>?????&????wg@?0?8%?#M?s????ZA??[???A??"?b??!?H?? ?u59??????w5???oe0|?D|q5U%??HG??a??cI0k????1?7^?F?f?$???????????-
?A???`?f#?M??????#???????##?*???u?????7?????
???rw???(?
W??4
yS?IG?%?i????Z??)&,?????????H%DO!?A?????bD??f?B?fU??X~??????A??&?,?

??l???????&???
=????6?r?@?
6`&????2t?0?????X??A?fB?$"?@?'??`??h?.????Z?+???e?x
???M0WU??????pz?6????s??4QR?????g???<??z???8n!?????????~?? ??T??x???y?5?I?Xj
???_?R??H{?C??I?@.?CUT?f?~?f?Qg:
!???F??0?????}?????;I?C?s??f9;\??Q?{=185!/dc"?)????6?5z??!l???
??J???6eXC??s??[?H?T??m{+?[?M??J??Gr??'H?Ag%?A?1 A!>H??@???!???:??-Ej6?
,$?A
????b???#??\???Y??"?d???8??4x+q?)zk7yO??{:??:Ckb?*Wh?i
???e???M>??????'T??u3?-??????SHK??&&? *??)?D?>???*???????}?<?5???
?9??RQN)?"??;l"??sDH??;?h at u?6???????-|?$:
;??#?6???[l?XIU2.?b".?
??)`?"?????????;??1?5???????*<?T*????+??H???l????????????7a	??|?%?l?b?;x`n???V/??5????W?3RAm??UYhIM?:??rPHaJ2o??D?l
@vr?6??&t????M?K??????'R??????????y???????W?<|<??R7H??P???a?S?Y
??7?v4?R??U?M??L??|?,Fe??u?>,??i??e$?$?J?g?~9D9???Jq???9??????????:HnJr???//????[?r????s??I?????u
??v?X???????ZX?H?????+?/;??$83??V?[?.?.i???fJB????Bu?T|G!n??1??e?}V?Z?S<|??{s??*??x!"??B.?W?$????!?K????L*??7F?Y?mD8)	??>/????d&|??d&?x?s?$I???Cf#?J?	??C???0??N8??&???????`'?E:?+? ??{J6???i?3;???????SyN&??+?+?1i?k??o5dC1Z??24Z]???:z.v?]???y???'i????}Ap?+\?TWv???Q?,Yf+J???pdT??w??^?;p?Yj
H?V?U4-?F7x~??????Z???a????m?k?O,dz#JKH????r!
e?~OS?t??
{H&?B?_???j_=?????%???@EF????<?,l?g???????:?kE?I?	 i???@~D?q?m??h?e???g?????r|?C_fw?,d1\_^????????aa???`Bb?d?r;Cd??L?;tC\g?a"???L
L at l?A^??A??Y,A????D????????

&L?J??,?O????{E??b/n?NMYz_??S?`Q???.?v?Y??????lboWF??@
$?
???
?a??i?sX??4???????K}<?%??????7???H???a????/???+??????????2?P?1????}????@PPA5D??n?u??Eo8?y~????2"????H?7 C?w??Z??????@??????
_?rnO???[.mdl?Q????hb?????W??????	?"B?????8??A?)(???G?z??W?_?????[??d????o?%??????g???~??\??it?n???UG??<y1?xg??Q??????(??a?:4?UB???>?DDb? %<????z'mk+I?L(????
??Xs?r?	MM???!?E????<??@?o???|o?????
???5]?}"@F9iP?%k!????h??
?$T}????N?&???????P?1Qn?YUG?]?Q?iF?<?b8??o?
??????????w???????d?????t??u ?Y>?
?;?????$E??;e??;????_?{??H:
,??%%??(d??]??X8j8?}??vt??"?7?k??1]?L??.??????+?{?f%???a]?W?"??VHU?X??????D????"??????????????<W????u=C??>?e? ??5d??u
1?n ?^bP????#
????|?-?i?@???@f`?q?:taB?m??.`"??????????LQ)Y?'??tJpaT???6Y?0?#?/L3?j?I?`YSP
?5?2??@??

????-??W???<d??	??+*&>lD????]??k?<y?e?? ???Dv??/???)r	$6?6???
?J??XL???[??v?????X`?,of?$<?a(?G??<q?0qIa)8??0?'#5???????2j???J*?5X8?z??f[?;UQ=?%X)?$?e????F??,o???(?}?|???X{_??cfx???????????`?&w???i????UC?k/]wo?.??v??&.s 7??|?wmW\???+i~??;F9???5??,?n?????{?q?J??G???k???;N??[???Bl6e??a??-1Z?G|?5)w????????x?$Q
v?L??W?6T?JAThn0???kD?y?~J?OK
?Qf???*c?/u?????vB_??8

&a?$?hD?\kyo@?~/t??m?
???C4$0????!????,?W???.??x????/5?zg?????v)l??{???`?u,??5!??X??9?
D2?&P???4?aOpw???:/?9?I??l??@??h?>?h
???{\??vBO???B?TgZ#b???'!?_-?m???
?dlct????????d? ??/????#{)???
??>?#b?O$=?N?%???J*d/??>?
?E8?????f?(*????F(??Z??!???E'???H?????b9????h?t
5?j
?Y?D?f'?\???/?6??Jbj%-[MEB?Z??L???uWK?<??9~???I|*??X????+???( ?k?(8??5jj????=?????Eg??~???~?e? %'qwS?N??^p??8`??s??v????zg?^Cz?|??}3.?%?????Z^????k]~???????"?20?6?j?
???G???|3R?bG????'???j?2?t?0
|???iH?j???U4S@?Q?AU,?E:M?~???w5? %!Jii
:?jQ5?E jJ?l)?????A?????E>??'U
??^g??S???z#?????]&???????#?P~??W???,??????,l;?4Z-?????8Z??iU???C7????????w?Os???????????AU
???`??O?O?#??'A?uG?	K?+?v?LK??-kyA!?(.??G?Vxo?Q?/??????	????*?j?3?l?q1?uP???????n?|Z:?d?P|?m?`f?????????vY?0?7????=S[:J?Gk?:??TB?/Gq??;V+=\??????r?C??f?[/,?,??????R_=0??4?#?#W.??2??4:?HM???w?S??/v?I]??????~r2?D-?`????e????-#??V9d.?????U?u +
?2?66"+???D~?fX`p?H?g?\9?????}6\{):%P?5??n?S^??04?@;?(-?c&i??
?????P?[???rd??C???
?7?
?{???iS4:??{;???????1v??a??$=y?R$\6??
?
???g5Y????{???[N??cu??+W????j???A?*?%?<????(?cQ??J?q	u?y???.???(.????? &????
f???A~n&r??F3????????????vNb1??????E/??&??_??????1??????
????H??$?c?J^??:????[F?m?2??U]????/7?#??Gp??z??
????v?(??;
?{???????^?2~??
???*?t?z?e5?sPR?qk???_y5??O????j?V6????lq?$%CT??KP????????j^??G|7?6??YZ_??????9O?M???$Yj????x??I??????oZ????BD@????+ui!*??$?77K]? ?U??????1?[t{N?n?:???E?:	?|?Z/?l:3]?t???k????"6?????;?UOx2??	???'y?4?\????
?q?1t!C??[S??????(?`?{?T?8?4?$??a?AK?Y?G??/?ji??1?=W?_'????w?gq*?q???;Sbz??#mf?~?rsb?1?RN????Q?Be??TP<ZEU??????B?d??be?B*?*,?Q??h2??,??[?H?i4???????0??\?W?z?,\
??3w4?c7????Bc?Q??Z?F+??:?E?Tt?q??C??
??????7oO???<?%F???9M(?#??I?1?x?R?|?RH1?m????D??\c??vmUq[????Z??cM??Z?+??.??\8?IF??@??P:?`?WR?ZQI???
????T?4XUU	26??7??l??18??EKT+?J??p?b57???;A?m/3J		-:???+?????{????Q[n???Q/[?x??/????v?? ?G?E????"\?_^?X4?J??E????<???/??p?K?c?-&Z?w???5?v?!???-???)^???\??LX?
W#+??Z????4?+/Y????????M??2VE?x???c
?:7~k^??z??g9???????3???qN(???1?b??????b????dm(?b1=?ZY?J%q'??????t?@?He?V???Bf?&D?,.??sJ?!?)d???jZ??^C"???j?v????????D??%?-?????G?J
?6???Z?9j?H1&&?,?x?#3/???d??mW???M-l??-??$Lm5?ku?????iHZ,T?	??????()I???T??G?L??-=?R:??E?r0?????????fe?!5???J??J?hb??^???;P?@]l??Ch????@?h6?F???S\?Q??gJH?3?T\@???????]w??EQ?
d??????Z???8?N????????a??]gd??BH?(b?(jS?kA?3!?9.????/{??@.K??`?JY??`???o? bN	?????	??,3??M??v?P#y???B?Q	
D0?5@}'???q???x?c?m
??M
????W?M??|??]?f>U???^???O)? ??=????a??7?He.?H????????L?D@b=(??7??OO?? $?????`?D?H?2 ?;x??a?d???}
??
??????$m??}u^=v??????@=??z????;?????????G?a?_
???*

??l???=w??]wW>Re? ?A??
,????N??-|???x3??B??Rl??"S5S[???xOL???s??n???C-?D?`6}?\?i?j	????,?m??bo'm+H?N?!?e	?4h`?y
??Hc?rZDT$1??f0??b????u?A?Y??;??????nQM?;??.?a??lW6Wl??T????e????h?m[???Qa?~y?.???N???q0f>??F?m?RR~?s7p~??j
h????p????Z?ma??b?C?????????P??.??5@Pl?2Oe??sw^?a???4yGR=P??????(?????H??e???X4?	?Ig?????G}??7?5}?Q?e??n??b\{??~????x??+?????]?hRZ,???9I??n
s7???t???????3??U)Q?G'????
?Q0??#)?D?`??r??	RK{??ol?Y?u?5????
v2aXK??A
@???V????,*?Y4??Nm<???
I??????JbN?G?K?????b
C?qsV???(????y???
6R	'??$??_??_??<???O??f?3??^????+?;W??^?<E?????\8?????}=0??j?B2AO??kd0??8?q???)
??s?gtj???M??????}?
.*?3.Z?`?$4??x???MU????X???G#?X%@+p????oC?/?PPE 
??t??s0$?RB???]?g?pC?W?#?4??`?B`??(?#??N?????8F?
??(????O???n?
?QN??)?p????H?E1Q20u??;?!9hwyG?r
?I??
D?2T?o?(???K??h?
?r???v???`*?g<???U/sD)R?4??f???Vm??X??|???Y?b
B???Q?$?
?AR
tA?%??
8?#K?)??????s???oX?VM??I?[????*?v?@??P??7?????6??aq"D?8A?yj?4?W????????Ts???5????????9???gX-?]
?>5p??'?=IK?J?xGr??H????hC?uj????&<???UF???6??E/????????C??????
"?%????bl_?????????|
t^)"?4?7.???bS?J()??H??;7?<*???*?
??b??C?????A?RX???i??5?????????Y??d_?\??`z?_"(???[?dd{{??<E6'???????`5?k?E8?	)?uw??>????????:?#@?2?L???d
??W?????H?M33A"?O].?kJ?[?%5??????M???e?x?i?????s[K?????_(??y?r?!?" ??$??0'TB<I"
nC?Q$??Z?'???X.???????.\:bWZ?????cD?? ??.???]?T??HZBC?M??7zVr6??x??9??7-?D??1)p?$?LyH?c????d???(?l:?L????!???????,?X0?????????kG??>?????;_^?????4??v+?.Q?21?Hr?O?7???4?S
?
?J????b????G??	DT1?T?J??????:t0J?IQK??
?j??J??@r6?
????aD?8???
??~=???bKW	
??
?BT??5K?0i%~????????}??????{Q?????W??=?/????M??xdX|???QzwW^?????<@D?
?~	P????X??s?X??????(m??????3???C?j?c????_?v	????69;?? z??9q?Z???F&?????$v??????7??UUWl??.?>??????a?<>1?0?&
??j&????RE1DAA5DCM4
o
#???????=???p?/?g????
? /??D?_Tu?8???R.?'l?>m?#??F~?T???;??]
???Y-?7*???a??U)???NW??y???<~?;:/?B???
?b?oE5,??4?IL??????G????????f?&?????7????w???????]H "?h)$*)??????S??~]??g^X?b6Kb??m???QF??i??2?4?caB??Nw0??b?9????U^??????E[[BZa*!*o?V????u??&?]9(
?#?~????|?rz~jP????E?b;kt}??"?-n??
??? t?upE:k?f?????#?9QL??"?}??|?u ?p? ??/??
??
?b)??(D* ?M?r+???0?????,:
P>??;7/??????5'??TURI$?&??????<????/??????W!?Z?E8??8??5?"??????@???cdl??}?-~??5?-?4?H??????[Q???'?f?????L?bqC?m??????k??V?????UQ???=
??y???6;[,?w"?^?1Vn?_)%??7|??
????<C?r?n?Cm%???<	?H???SGR?C??*?w?q?4M??VO$
+F???????#???????????nl?QLD?E?a%?.?????!???\?	?
?yF?????<?P????"8??{?C9?!??{q=!?
_@s?@??I@??u]???2????U"UqBG?q?9DLh?L??6??	?pI SA??U?????????x??!???????#?;?]p?9?]
n8#l??A???????w??????>????5???{?i]????l??+???h?od??]/??????i at II??????	c?"??G?G???(??	?$????????
Y??MM????j??$bAP???wB=,?
(?x?f?G?u@?I
TW?[?f??
??????x???1?>uCm?E
QIC"wT???????FH?&????????0Zw?????$?v????P,??
????f?????@%O?R1??8??????>???F???h?????y?s??o????<??O??M??
1SA$?T~??????G}???(&????4<?*??????>|[~>??ee<:???|? ?C
?wtB(?2????kI?????R?=????Ox?y~~???\^l@}??5I
H??????=w??>y? ?c{?u??~???8?g???P?J:????????x?????????
?(?)ThU?>??n?Z????#???
???EQz????85QZYf[#Y?kXa/??WM?[}uf?gSw??t???|????P*???
???????[??O????fGS?t{N????0HaP?p???tb^2b!??t??^DT?!E?B??F???>?????)?
???6'??b????f?q?T&???N ?
C
????p???!???"v,???
??E
`?????V??`?.????SQ-	2?Q@???pw?pz?CBEAT?E$@UQ??PA??V}
Bv^???5????????y??)
L????F??nk??R?(Ny.=vC??%?????P?^? ??9??&* (???B???P????t$KJUPP2??y~}8???g<
????f??P??[??orJuw???t??Q
????????S??AQG????h?6c?D?-?i?1-Z??|DR??C?M???uvL
3GA?v?9?QV????:J?^?&
?B?dD?da?s? 
????L?
U5Q?R????N???????r??????M4t?n???Q?`P??xSx?C?5
????`??????D?8@??k	???y??n2PzK?R??Z???C???????? ??v!?0n?????8"wb'?b???".?+??
4s?{R??>?P?
?DM??j-???A??-????9?s?o?????O?2i?9a????E ??????=
??("?=~?k???H?k?Q??"t?,|3Pz???p??|??x?:??A??0?S????^RbRJ?q ??????????f?:??/7XhbJ?3z?eP??{??n?
?JRQ9??L??????????WL8??N?O<???z??Z?Q??d??<`??
`?G??C????????????CQDW???R/?(?*#Tcq??????5?rJ??(?0?????j?Z?

???? n?<A?+?`
o??5`H??_???OH?V
?X?Fz1	?N?/D?K???q=???s?qh?f4Rix??WR?|?;??+?7?w?
h?6O\??sl?2|?[ggP?6#S?I?Ct???+?+?63????7???l??26???G|??6(?.??? Ra?[?????o?@JT?? ??j?[?H!F?"K??6???????Az~???SM?n\q??S??????????[5?^?47A???i^6?Fw????X,5??Ja?M??????Pa?u:?: ??k?T??<K.o???.????
=sq???O?XI???????[???N?~?)???trpxY?????????pf????H?"Gm?????-?|?H)???
?iaqt4Sb????l??]???['d2?????@?''??^9M??|????(|e6l?b??9B????RL<=4?O?z~M?63?V???Mv?
!???,i??n=cF??0}f??$??z?{7*/~_g[?>)?= m?}y?Q{???O?????yf?<I)nB1??o?+8??e?.?P;?d?x??;?A???????:? (??????2U?O??t?&?r%2??????R?T
?
??1??????????-??o?<?(Y?t	?
?@?@?RU?I?
?do@?<?@I?!???*>???????I?2
???t???0G????tk????j.q?E
???<???f???v??G??*???R??d??N[?7?JZ??????	??=???b??+h	?A?R??~j??j?V1???s?X	???
???H?\*?|7W??????????? ?w??????j?"B?/???dG?>?;???m??=??yH?,x?H????9
??o??????O?G?)rs?_????sq9???iO? ??
9I?O???
&H/Ra??/?XS????W??U????	?+|XoU?:Iu?P??m???s??5???`7ue@??A??wO*?]1X?
????*;&,y6?j?imM?aBjm?*x????????_
?M??o8
??ujO?????Z$2R??0??xn?*??*?N??z???<d?5????????
???q??????PQ????tu5??z???<?Y????
?2??w??C??~?d7?e??m???
F??r?
hByTb T???????3???C??Y?E?????n?@????=/!*?4$g?|(7d????,??? @???2???je??29s-??^dn9?Q?/??{$??e?)?Tm
???
?Xq4??
.??S5??????h?<??F??W?u?Cf_???ZV??E???????[gk??X$??l??m?,?Q??:(?????z@;??-?i?^4??0???r?X?I\C????F???#A???????Tj?zG

?95???e??|'?-??????w?%?+V???Xz???????g&??a???2????Q?$?-?dtGW??_F??_??x?N?????D?vUR?f6?/????{E??D0?#?A?	??????_;?V;<7?????w?S???H?C/wH?????4mG_n>Zg????p-\D??
9'?M?q?cQX??!q???
?L6???E?tdO??c??..?????+??????M?Y????j??"???
??? ??a?T??9?|???~?.?
??p
??v?????%vM??s?O??A?jD?r??c????????????fa????n
U!????)uZ5o??G??vo???????tl7?????S????.(?f??-s?Pq????K?%??Nls?ow??
R?&?{?#?Q?Y?????????~dfk??3???????R?T?H???vf1?h?K'??J-?%?,??Z$????3?y?c?XMK??Ld??m@??|D5???????y??x???jY'g???s?<?1????AS?G?8?????*V<??!
?ck?/??????\?(?4??]????swH?M\~???S?B????"?cp?J?5?????t6????O??[Rk?^H?\????hh??a?V?fyX	??????????d?;?<
.?r????z^???L???IsS????Jp??/??t>??????M?@"????:
?:??'?????b???g?????K???~?}?????????+1???;????I0t???-?B??L?+?xy??\&??.?@?W??N|????	'N0c????K??w?yK??4#????
??#_??????g????>?J??5{dKV?T?d?)k:Cc??l??a?SV????????y?)M*??m???x?
?d9Hi?'?I?s?f??-u?V:-
?ze???g???4????????vC\N':S?=?N?F?4????Zw????M??.i?d??Q?8??7^?3wM7?H?E??*UUY???m1????{??;Pz??M?l?S?Y??0??? ?h ??+???=:?u?6e??d???U8??<?-??p???f??D??4?????'a?.?????GWvO?Y??~18?w?Q????6\?(#^?;??J?[??ayn??/????sb????N?K????l??????43? ;?&v?Vqy2S?!????Il	?v?4+?!?7Zs?K<'g?`?J?F?????H???YP3#????~k_K ?N?1?k?.???XU?k?I?1EC<?(?c???r????W??I??*???2??:9}?J??r?JkL?4o?sy.?*?R?A-T_Y?x???
??hD?8(7?l????vj??s?`h?????W??? ?pA#pl??|???e??????H?????W??],??8?%?T?
??0z?O?m_???U?N??%??GB8iKw????w+??x??\????????W???o?^Kp??[?1?<?	a??t??$f??t???)????????|??1???>?G;O?A1?????<?d?V:??5Ej4[??Cg??3????I"???i??@?cHqvk?@p??,
?^?k\??-?6Y<?4?~Q-+)@U????	L-H3??&??toL'?B?c??????g|??
??????2???L?i'????Ofy?*;?????8Y?`?PrId???gOeT????Q?NN$??????L??????????w?GL???f????CA??gZ:??d?F?u_?)?E??HdP0?????'??????!K?????????*???????7?????j??W?1???v?dn1~)????????LZ??{????q???hN,? b??9i????=6K?o5?r??_k4b2?k?	#2i???M?"]\???}&????
u?)8?T\Y?o
p??h??r*
?:????o[???|??X???.?[?r???g?y?rJ?????9??n?????w?{?x?v{	!m?v?:???????tr???I?40?\??>K?2???????H?g?Z??&??r?}?ysC?p????????h=???#yO9Q?
??h???0????)??z.#?O???z???v4;???
8r??f)???QP]U???B5?"??I%?#???3????Yhr???VKI5|??(7???G|1QU4?-DETSA?e$LDg^-N??m-1q??????~?}F????*??
?=?l<D??????U
~???A?W????e?E?o??!O??????h???/???mQ??>?^????????3	|?

?,P?6$I)??n?2'Y??I??
?c?N??]~?????E
sf?l{?ln?i?z?a???jF???M?w?????kk{?H?{???4n?R??.	F?f?X?n?QQ
Yj??f??[
?????? ? B?
4r?`DB#t@?)?f????O??u?B;???wCF????r?`
0?$??????`?3?
|?????f?@
{o???k??3<
T
?{?w\/Z?9??{????Z?
???????????
????v????"<s!?7H?bTym?<??\F9(??8+!/??#????u3H???I?E??????????{8ktr????d??0|???z?<R??=??BA??W|?!'?????0??N?]??5?e?????,?"???R'??~?g0??

R?{B???????????????g??G?<?>_W??????cF??)Z????.??f????ow?V^?Y?{4????{?I?P?x???AI?iMmiY?E???????N?'F??
????$?Xn?
??vo??????@;[Uv at j??.Eh?kh???-?Ek?????? ?miP???3?[???n??n???????W?nnl?%UU ?H??%???C???(??P? Lu?????:??????8m??????????<gj?aGB?i?G <E|??x ??x????????36???`o?????{s?:w?h???)?*s(???A?Nv??u???????<OJb?????m???Vz<u?H??@?
?v?w??Q4?aQh~?`??
?????  ???*????vf?$g?w?_????Gq??Bb?fK??F??[?e?iI??K???hR?55ha?M?z???Nu????t?I%1BQH???f???n???i}??>u???\?8???+??
L=??????
p??p???b
??
3????J??i5B??o=?a?r?&TVb? ?<? ;?b?E?c??e?IK$@????$\???[?x#
?[
6??H0??????lmk????"?k??????r>p?? ???[)?T@?H! 	(R?0V?w???4??>H???A@??aP
$??'f?s5?AM?+??94IG??/#?n??J?*l???v??????:.!?0??%??	"D?$\???@?1Q!	

?3I+
[...3758 lines suppressed...]
??? ?
l[???s?lQ.?`??	b&???I?$??'w2??????[ (??C?Xy?"9?8?{??"??
?	\H?)?T0^
?*?????oO???{??h*??!?????1:??Z?PU??6?r???
i.???h-??{@?d??C????@
+4??$B at T?Q
TK0P?x,
?@I!?e????"?~??/?U?????/v
??Th????$?cQ!r?.P(???? `??%K1?	?
??R?J?f????????a??hxP?`?????7?<??%?D??`?Qk???Z2?6???IK\t?69??D??9!???Q?N???"???"????= o-K??v??.&G?d??=?s}f??????S=?c???)QJ??,??j0/????????D1????t?~1?A!y(???"?????O??Jv?????udy?^??y????T	't5??d??!?f?j?M|?9&?H?
GB
??????*?2?!???
x?Nv#???7a????;C?qm????????^Z?Pf??j??q[<???nx??t`B$`?E?
B?'}??u5??????no<?5??????sF????QA???)M???????l?
?
??
P?=?<w?J&??j?4???~?go????B|z?>??W?????-?????Q???f??n:?*Z?J?*sf^&~AT??B!(X???}sFTbkenI??t?u?T?????a{???s???/n?Si?_1I??{?in_???_E*?aZI?,????i?F?J??X?=/\Dh?????O????xm5??H??~Px|?3?|qx+??????A?m?
R??#=/SK?7(
t?j???j(?????@H>?????Qt
k#?c?
??*P??W??????}r??%7????N?
??????????~?????????o?????????y?n??????ks?????????????????'???w????z??_?~????7???~???????h???????????????????'?~????????7?#???+(b?)??(Y) ??T|???????????	?T????bd?
d?	1MEI???$??d???B????J@ ???*D???zx????I?|D?\w?L?@??fJ?????_???9?3?e?b-??????0xgA???`???k?????]?L?????([@?
?t#0????%???????J?`G?X? ?X?J;B?7????k?l?Apt??*
?l???B D@?

?vkcT
'RD
t??d????^o^ ?W??????t?	?TpWX?R???+OP?u?Jur]$???4#?P??*
???1???$???hc=?q???I?x?9c?y9??|;Jtvd/???I{??;??s?5?G?b???&$Yt?F??p??k??I??????*??UJ+z?h{???>k]?S?ny???vs??>?
?4?3?F??vB???C7??h$?Kx?????q??hCBb???A?+?}s????XT?,???Q???GpMT?:.??.?)T?:]?
???HLD?C0????
Og????!p??+\-??m?O?C????!<??y??J?H???u?m>	????>??TF??	og???????L?R??a?TD?QmOJ?,??]??&!?u~_???2????%?????q2b!??qpP? ?T	?'??~0r????A???J??8-HT????hE
/?(??sO4?{2???????l??^????????k?r????P(dX?i-?T)???/
??OK?7??????Pq?c4?????4d??PX?0??!?Y??w?\?	?9d?m????s[u8?YM?%?3hM?J?d0wB??N2?&??n??
&?F?8?$!????8g????c??iX?0TF/&QK?a
D?	K)X?????=OL8?????fR1?Sc???k??@?a?[?4?F???'O??\?G4U?Q???=S??+:Q7??????`;??=????/|NI at TAMR4??	?mlnm	???d??0)?,R'd?d?a?L?!naXU???0??eJlp?hL?,?&???F1!?Aa???7v???????-?D;"?
??B?C#?Ebs?2??\???u??{
`p?????i<??Jz3T`??)"B???<Bp????<)w?-?????????w????`#?t'H[`?gp?
?o????-?7/????????))$je???&?
V?F?p?:?????c?{???t??rE1????~???V??I%?????)????TY2????]qi*D?`?I^?`?0$??R????5?????x?B????I??S??I???KMTX",-????~WP?!?7rE?9!;??FF??p??B????{???<i???t
c
k???S???v?[(??r?m?_4_??P?e??
???)n?????<?q??<?{g??T?I?zjL????e7vH?p??n?X?????&Z?????P.BK?????bM???N?U???|Kc???#?u?gk???????l????T??#@?F?????AzR?l)???>?a??`?V??i?????}??????	?,s?
	+?
x?v|_?]????J$1
?????"ZI?\?;? 2?T1I$?	E??A`?!%?@?C`?P?
?(?"V??(Z?P??c!??^???|???d?v???2?|3?????Pf}???f????!0?|??0]4EQ&'??B:V?????/?:r?CEb?gZ?5tv?p??\
????BA]+???????????&@???B~??"??2Qks???G?k78M`???N"(?&U?? _E?{[?.!?%?V?4y?,JT at b?f1??)"??????1\%?????J??s??????ic@?t???e?*V@?+ ?????4?????X?Z??E&q??Q?];??????)P???z??H
J????)??fR \?{yC:??`?D?M"?%*@PP--^??^eD???qD?q8???H/"<kn??c;c?j2?????p?^??+??y'?02???c?[e6?* ????U8I?????r????\??????b&*?}?8?B]?,??b?E?=p$????????o?%

????????JA*0?70?c??\,?O$`?43c?]
b?S???????
???????xGs5??9'C??l??R?\?<?Y?V??t?
F????0??z??.{?+0J?(?m?08???????Y?xwQE???
???????s??W????^??L
?!???8?1*?FNu???"??G????E?Cy?v?A<?\?`?(?"M?9????E????9<,A2h*??RV??%?????????F?zT??8[??????WS?????????M?,V	T,h???*	#UAV?REI??MSEOX
q?1?N??`???H?
6?k4FX.6"??UBQrbMr?5ESE%?i?b???????.nDU??Z,????d??3F?????????
?????EC33
???TX?V?j?Z??2i??r??	??E(?M%D?B?e\?F?M?lb*(?6S?	???"?J?B?Z?DM31A?c?QQ4?6???j???:?lkc
[h??F?D15Th???s?"?&?J?)ii)!???N????QA??h??4??@d???#0??3????9<(??"
!&??H!?
`???X?[e?1?%&I?U?????"??qTD??[L??RSF?&?t(?!?h.X??TSQ?`?+?1???UP?5???-h????U?mh,FJ?LUA?&?1??i?a???p??&"!"i?4?N?Z???QTD??( ?!(??@hZ?
?? `?C?h???N"	$4????f?1?m???1I%UTZ?U?
.(?1??(X????iJbk<???'?y%J("%?(
?R!?Y ?H)?
JP)?????e?"b????D	BSrt?8????x at qQ9+?Oy???C(????(,?@(??????J?
?a~??#K?iD?h??z?D/?Hw
KE4?Q??i?)
?fi????i????"Z?Jr9?h??5bh??'3?
?A55EJ????>d??:??E????I?
??????f?C??`?e??????i?@?ea(??C?YQ
ST???>??J?`?<F?vH/ Z
?"?!IH?RY	??]Nq
??/sOo
6???????	$#
2A??U
@?(???t?r?J????????C?^????Np?]d?Z?&I?Q?????>?>?	JI?5M?Z?????MX?d
$?????8?y?F?t ?
?`???0?9o?Y?#??)?G??|??^?%??biP?B4D=??
k*'H??^?"hl??H??????C?G???,UJ?_~???:?????4?|?)?B???1????W?f?b??6/??t??O??????r?18&???n?~??n*?+?`II"?$??#?K???{DIowcd>??

??;??w??????`????SV?.ce??7??????B?@?Q?u"QI?	????)|oD?AK???|@?}?D?CSP?b???

"???
E!u??;l???5K????y?8AD?????yR!?(M(??;?w??!???9at????????/wSCy???P??b???X?U9?sD?R??~??4??:???4???rELQg??
?????
4'P????f??!q???m??j??D
-R?? ??#H???<?J+?G?s?*?i7??j?!
??z?/??{??3??:8a????i?z??I??P?=5R?{??L???dG????M#]xG???????

HW(?dPl?O?{K??gSW#?OG???a???
|?<??-<??d?y??4???#8jMi+?JL?6k???C??j??*????????fDN?"H?<??,
=????W??T?M??$9?l"? ???@?W 4P?t??V?i????"???@i*??'???h?F$j???? I_????Z???$>?
z???v? ??_Q?N??k??0j?F'?????P(?v<??????0s???pI/?r<@????????Z?????Q,B?
QB?2??!??Q?H?AJ
(hi
Z	?????h@??"J
??8????????? A???E
@@[?s?h?
+I??ihR%?bH??h??
?
???xO?CKT?L?1WS
??
?D?d	?1???O??r%bj)?D`,???oi5j'???X?I,R?+???lv??p2F????K??SCKE0?bQ2t??bG??O
?qu???(
???nj??? ?? ????r|?l??h????l@S??.???B?G?????R???y
 ??_\N???B?q?p?g>@Xw?a??.*TxA?;!???'?{H?@????20???'?<?V?Cga?V????B???}RhX JZ??o???~r??jJH?(?E"???L:????/????k?rp?m?????*?W?S??Y-?
???l?&:()?????o?r@.??,?????Br????R6?`??E%?E??_?????b??????V??#i??????????cC??E??	?E?@?t\?:?{(?q?.???7?????o?????T>})%??=?+:?????????/O}?????E	??d?????!SfP
 ?eKNJ????,P?Gj;???I??&?{?-?`?	?a&0?c>?J??]?j
?IB?\E%?.??ru ??????I??}??"??ZQY
D?AH?i?Z(U)
>$R?\?5???G6LZ??O????e???F???]?f!	???w?=&???u??d?tb$8 P??F0?/!8UP?L0?n&???k9?`
?
?W]??%?L2P?ALHQ?1?'?T????G?A9??*
y?S???D?(J
?H??	???	?D???Z?wK xP?4-???4	?b?#?R??U44%
????d

?C???JJ?)??(")(i(**i?!??A!??}???A@
?&?S?5???T:??, at 1???A"H??>q?K??'e??Ql???}sU7?{???|^?>?D???B???UH?F???O?5????Y_?^?'hb??H??E?:?e0?#l
???S?8Jh ??M{???=?i
Az?4????x=?\:??B?(e??CHE ?(@?
?RmqK??@q??`?A?Y??????F??JhyS?
8???$^??????I:U??ie
???3]+5??GH*??;???I<P??N??u?%Ia*??1=


??UY?%?;???!m????EH*??4?$???q???AQ?J?%B?q?^?!??<???=?5???pTDP?<'?>????Hj???</e_?E?I?~??nU???#?f?PX"??S=X?????R????1)?5??M1?????OTM&
cU?ki?2??1!L????h????L!?=??;J2&?z???9?B??UJ?P?@?4PE?
?4V????QUU???????l?!'k???J?JqM?o????I?O??-??-???????gVP?[?EA??q??Q????&0???f9[qXb?eXE+L?#s-??Y0?QS&????Y?2?%???CercU710I?`
?r??????AG???t???ME?]h?@??1?z???{-*?????+????2??
?`??N??se]`?L?5c????*??53?????,?P???K?!?+?4?an???[???c,GAu?
?T???J7????
????g????QIZ)?(??kDL??s?u?0???
???bA
?#")2%
???BL?V??.B?qF??d?'?gR???%<??Qd??`???T??
1?lJZ?1??r?V?2?*?D?Z?,Sh?n`?R?1?\??Z????-%????
 T??r??I4?!?tfQ2?[SF?+9???y????pY??J,230?????
k?B?"$????&?6?"?& 5????
?*?sL?????E??!KX?[??e\
?X?F???&e???)U???f8??I)??m???i)??h?Z?8?!NK?Z?)j?????m??s;F+X6???Y??%?
??G???
6??<?cS)??Db"11?N????Z?T?r??gA???TL??[UD??*9?
?m??l?L??5?MU
?????j?????f?9??.\ib[JT????E?s?E[h???DSp??5???-6????1DD?)?XM???V?,X????jV2??
j5?*n??`?+????D?-???wxiCR??0$??X?
?r???v?pht???$X ??????*" ?A?p`?
(?+Q?\1??????e*?4K`???7!Q2?2??"V?1B?"?Kl`????TL?Z-e??.E<?3?
v?*?[B??HTp?2?Z??De??
c?6?hX?32????>?&???n ????`??h?1???Ae+??{??L???0UUB?CUU]?
?EAX1U?s?xi?V??=?q?[?????'??I??}??H
Sa??????;?1??;???x	??TQ0}p??T??d?/@??sdI?QRK?d?h
_Qf????p?
?_{Caw
??!???3E???6?i+I2????4??\^?u?8??]WZs|h????\?Gb?Vc?L?1?|?H?m??Bd?%??Uk9E?*`
tt??oK.????D???"'?qUmD@??]H?z?!?l??= ?N]???$> ???'????O*??~ R at A-P???????????R?B???*@??v?%y1
??,?-7#??T?p?@?E?]P~?;Xmw??/???au
???e?$????3E?v?	5????Y?>? 	#?[??J/T???1?F??}??)???????W/~??????UR?9??_C?A* ??>^?z?????LO?d???}?)(	???????Ki?<YRM8?!?]??@???"ZCoVZ?3yy$0??G???u1?`????f?*?Z?????L??Y?Y?????-$n???	?6???s3sTb???2?w,???T?b9?????f???KTr?s,AB????^??)??,?)?d?)?0F"?e?6????"#????\????c%?(??8?M????B*?IPcj?????b???j??GK??+ZG?QJ???=
???yo?y?IQ	???v?T]??vyds????????q>
???LC?Q
???4?
Q+?
 ? ????#????gQfW??t?Mb??????Ji?
?.!?k?????=k??V?H???

c??-&????,U ???F?T?? P??'y?*?K\?wQ?
??S??*???a{t?c??????@kG?h?h?r???M??????????K@?Q?9``U?Y??@r3)h$/?$?YS?
??8?b	?Gy??
:?P:?:?{6????
??W'???fH;?
???
 C??u@? ???0?B?<?????`?F?Y>]??G???^Z?,?$p	i?B????A?????k@?_
??M%?1:ttR?T?e??Z?LSAm?(????5QKPEI.??'
??%??%???t???5???h?N????h?94Q5?LDMZ???????G??ePy 8g?
?^B?T??????a?=??"?? 
?f??A?)*?:??????lr?h?!??"?#t
????/???"	???{{?@R?F?X??????7?<?j ??pP8???????!?? ??l?6?%_?:8`u?
d?P?&M	??b??M???l5????<?y? ?????A????????????O?_D(?/??UiE??U.^9o?'#????I=?	R?9"~hC???

?8????E?K??X?V???<?z??P^??!?6UzXJ?4??Ex-d?J?|"l\57??l???????h:?lJM???\e?s<?<?2|'??E??{=D?l?;<???WV?b?!??????ohl^z9(?Y??%_?mWj?????????F??{d?Xa#????Gk	?*iU?f?????^?n2?)+:?0*Gz}/|???U2d
/C?:?????f!.???@?5m??+qK3??
???O???jO???	L?????V???o??.???x?%?4?
??R t?4?Ys??zN?????v?%TU5eI??
]??p?X???????z???????yU?:???DBQ}???????"??J?n???^N??B?*????h?%???2??y????s?m+R?n???(?????H?D?
ye??v?F?????-`s???6????M??6&?,?V???N??x?T!to?????M?l?dz?d???l??????o????v-:?WH??????*B?9*k??q1??\J3??t?L?????????????K???0??YV-%D?e??B?F-?E????~???u?&????YlT\ ?ewl??T4???o0?- ?????
P??-?G??????|Tk??-.?< ?iR??E?????+??!?1?r??????????.???gJi????????UN3?U?
l?{NV?*?????<?a???-
C?UPj?S1?8??wx???6??EP%X!?-5??]????=7?dgi?HHBCA?P????$k ?T$f??W?]RI?F?k???x?x??_iz?Q:mR??U??? ??ju????j?b?o?<?????b6????k????,4?
m????Q&??e??Tc???????????b?T3T?2??	??`c?(PHQ?AHK?@??s/??2???5;?1?*?y??Y???????'???-;6?~3??<)???:?0V?.??T`??v??G>
i*#J!?ISAvCc"2"M????zr??tm
@
???
e?
???HRr?????bK???????u???????xi??<Q2???GW+?YlgW@??T?????`$?x?
C?DqF]8??&?????[|1Vk??g
?????B?$?q?UQ???;?(????IIU9{???iR(x?dRN?y?=+???jbb??!??????c????????????.?Nr?J0Q[?Su?????=???|?-0?hLM
pm?^???Du?4	??v?Wt???|m?
??GgO[shb??OrB'???????2?)N??:?Hg5?M??+?M??]?Em??&?????:??S????{??o\Y?6:6l^??m?	f?
j?Rq?'$????j-??b???Y?*??q*dS????????Y
`e??b?????|R?,]??I????????I?]??L:|_;o
4H[5?Q?]?f?????h?????I4??g\W???Q?Z???\??)N?Td??.Qgc???;???K??VQ?S?????7p5??1????x??]??^??H?V??GBG
???M?we$;BTt!|???2{??s??p?[?ib4#?f ?a???K??l????pg?(?x???{?1??X???m??)sI?&??sm/Lj?mWA}?J,^Mwj
???sM??????g?o???X?????f#?~?^????}F??UYTb
?n&???Vl?z?i?8???}-?fK?3???BM?}#?zE%yA??b:?7???&?'W?z?d??r?@?,t????????
??3'A??3z?y3?:?|?V,????r??V?0i?????1??-?MqTZ
?j"$?^?]?.??Zb?H3???@Ma?u
?DHEi?y3?^C?????5?hF"??~DE?zlQ???[R?mL?Z?K?M7zN?9????<^_?N???m???????)Y???uu??/}4??n?h?????$2L??(!?y?Q2?::?.????:
?.??of??$????~:|L7?P?3?yo'!?U? S{?c??Q?????W???S?y?q%?U?"????zZ]??my{??T?S?F+9??S;k?!??v?v/??\	?0??i?n??U??????s??{???mf?B???
?*?^??r?t?/*???#{?????:??l?Nu???-?Lt?1?n?-??v?
%?Ob(eu??U	V???H?????!WS k?
#i?/^???D?M;$V?1??*J#W????&???^,?S??r?kD?'}?2?Qb?x?0?o7??I	Zx?p`???EwL?#!??SQ?
???8$[X???$?
???Y&ZP%???bL??Xe??P??f??$?j.*?;????5)??[???rf??D????G?:?L???g?I^6??m???	?Z?CiU4u????He?!j?_N?E??h??2?b
Q????v?-?o? y^{?V?5?]X??J?????+???}????m?e??v[UVY?1l??xL???Y?????J???A??$h?	]???>?O?kh?#=U7~x??YJ??$?OJ8&sh
??AlKZ???-S?-M3iA????e???+y/y*?E??
eeJ@?$,8???H?!???6?r^uF(#gl??j??k????<ZIv???m???
???c??????oP??y????]W?[?\???6?N?5??H??i??Ze?>t9?N??????q????????3?^???{
u??$?%?(
ATLz?^?c??z:_P}??j??o?G??8?a?<????8N??7??3kS?n()??(0?:??)%B<?'8??????Z??W????r?<??o??I?:?????"q?????(??rN?n{?C??I??1.>qJe?8?v?m?????????????;" ???????{|
&Q?Pq?????6????|?9?B?PD??^?
??[? ?(???D?????? w*??R?m?W!-??????????8Y?;???T??:?d??|$&P7

6?/;?*`?:y<X???>
???ht,Zh???W?i??? ?)????????????qx.?"e??????y???<??'?zjMd@?3???**??L?F?Q?u}??<
?^N???+)?0%???????u??]??!(`??.?5??5???????
??Ra?\???.??NcPA?QJ????[J????UUT???S?f?xv?F4=??*7?G???)V???&	?PI?f???kU~3???>??H????&{???`<????WP|??_????r!?N?????%?"??r:???ic?or?9r
??+"??(??????_?p
,	???(G??
J
?
???T?TPD!I at P?#M#E??[k?????O?H"?p?q??#?$?????FxiV
1i'??1A'?
?D??s%??I?8?F?????l)?Co>~%{?tI??
?	???g9??m??!gd????guD,(???4n	>????JZJB JB???@?>?????
?`???????;????2????P,????A??_#?y????	
?y??????,???a?j??k
u1?????P??`???????pq????U(?????B|VE???g$?d
CB????U??d????)r?Lc?[&a?X@?20(
;?tm?A???\???Z?[C????
???T>d?c??q1???Y~??&R?D??U@U(?8q^V????O N?Z3L????jU?z_)?P0??`????H?0??t??D"????#??G?
??zU2 ?
i?U?E ii?j?Z@(F?)??(i???? f?)
J??????$?<F? ?vw??bI9?@@=????'???o???Px'N
?K=?m??????,1|?????e??Z?!??m???{????b?GE>??????Y??^?B???4?A?4?N???S
 =??E>?`???"v????t????????????~?@?i?{???????4J?????~ ?RZ?i??-$?m??8M/????[E??}?*4??U?T?h?<Mg?W?k?~???EDZ???	I?H???U?T?y7xe?Zq??m??y1Yk??`?x????#??L
?]
j6)%*4?^?.?*?C,?i?????&?????X?u??:?Oj???????:???C?ht??
:I?K??v?y.?
?=<wv6?R?!*?w}1Av?@W^:????????????
Zisa?0?k=?????dQ??Z?f:m*??E??-0,
E
F\?lG?.??K*6?????:???kP?Zt\???`?yEC?ZII?eX?eG?Ct?X?-?H???*??Z?24???lv?t*? ?("EM?7g2r2??ebc???b?bLD??????M?v??EB?3????/CU??ds?[L?3??
LGKS??:?5?!c0C?&??X????-??'?M??D?????X?ki???Z????D^?"??6!p??D$?????J????Z?0W???zy?S??v????&??????Q6%?ZQ?F"J?.??	??iw??J?5?X$?????$??Q#?=?????l]Z?T??K??????"+?????;????[?Z|k+M?E????M?U5Oz??(?HlN|?-???bU???!????K?F??VB]??'?dT?[T??]4???|??o???uj1??N6dEQ\0???e???????!?	Vr??????l??w*.Y*??n)PP!pz???w&??nM,?(hhH
ATop?-V*VJ"?iA?{|???mU.Y?,tUZe*r?????s????????????????m5h????p??? ??S?I?rsre*m?5?*8]??`?n??#???b?BB?Z?4R??[?
??+?a?C"h?Q5?C?+??W?b????!?J*?!y??"*)Q}.r?\??U??.?%DJ*.????m[tG??\,1-??t?$???O????
?S?V:R?LX?????E????!3n?L??5??Tk?R?(b?m?J`?h????[??TLD?U718D??0V?Q?\5????
??ZF?mRr????C+Dj(T%r?baL???qST?T{?O?wW?:???L?6??q?E??F7+(GU`???.??)4"&D??????}?v*?+K ?t????o2?Qi?ec??4???,L?f?.??U?Q?????I????%$??S?&?95\}14?z???<?[/d??"??b?M?t?e??[????ei?9-??&.d1?fZ?#,V?b(?;???d????@??????Y"ku???)???m??W??z_j?C?cSg0b???8?6
????DJyP?????Gj?5??????m??=???sh?????b?????I??H??????[-?????ui??+?.??H[i?#*?#?A?Y-?7??k??^<?`?(????A??R?"HJ$A????E??7?Km?(????3.MM?7.y??t?Z?c??????*??$?`?S?????q%??mq??+??8?Y?I
Q)[cG????y iS???,I*Ck$?T#Bmj?|?????u?j??c??/Y#iI?U??;?????AbE?`?a?TW?lY5????Yv??2??a?tB?cb?q?Pt86?
??n(q6?\??????+[%?2Z.cj???Q?e??7???R?r
?????+?%X????P9??v???xM-lnb???'*e
nXa??cH?n????sy?V*?C??g?&?)V%?c?u???????+d?d??px??Hl?W?!?bV???j6?)h?m????????????T??????f?0?[;U?V??6??j?f?TQQ6K??f??'????A?5?KZ?????>?u?&m?Lb?2;$%Zi$u?=??oy????????????"_?WW??>?????q*???QS?re'?TDZ7qRV?,??X???$?y????f???&????b#>??;"?|?LY???GL?\??[UMK?Wvu??q4*?z?d?jR????SbB???D?V???????????/-?1??ie?<i?kY??Vx?gh???:?k?(??)??T@p@?l??????$u????????x????1?T?1G??K??=n????&?X????{???t<???s
??.!VF??>?mW?????1?P?>?z????????;????6?]?Iv?????e??????]?~w??C??m??=?p???':????h?????)e3n?BXX?2?_L]Gl????N??`C*j?X?????$Ex??v??k}?eJ'(sw3???b8[?*
pZ^????~?AqS??A????
]????R+??*?l^?+?????(???{?~p\?h?9?H,?[Yrqv????h?`L&???2?Cpd??3??X,P&?ywx?u???+?????
%zF?|7?i??J?g1?e??X?? Zl?$?p2???Se?g??_8??~<??,??`?,l???)??	C=??5??????r?^D?P5
?1?M??z?N??C?x?]?{I\W??K??@????9&d?_N
??A???;8B3???xd???|(<??i?9??g?m?/?????X???}f?????k?=?}?]@]j?)?va2\ZD?qeh?[??dT??n???
e
???-h????jM?K?K?K?%?D(%? ?l??kxa??	??~???\??GN?g?h?*?}q1?v?Uky??k??G??,???p7?u?????B[m$??6u?[t??JT?}???&?sYF
????a?qZ?V?zy+\?Ei
??4?????W????]l?<??K?;???C?N??j???z???^p?u????) ??T??????rzqX????v[1^b[9?????;?uQ??~\??[/1?,??)?]??gT??]Q?Vx??k&!WMBo??El?pYe?2?Fh?8h?n??P???????D9?@?z?l?{?O6=??qHm???wH????????fw???|?:?TP?????v?O<???????????+?=??D?}??#???????"?S?S?}??p??x?s??I,??]?5?o}^?Z???????????E?
/
??"fP|0?]??W??6??h???????YE??f??_4??.B@?K?~OwAx=????7???P?
?n?hqE?'???????/PW*??F!v??M?Zn?.?6($kQ??z??;n?????EQA?*_???????!?K?=???o????K?2J:lb?/?
DA?V9??C<?e???vF????C?5?cNl???????eS) F}U??;Nb?PQQ?Z???x?~?_???a?z#wW?h????????????I:0?E?Z??????^0?5???;?????????w??}(5?D)w???????<k?:??~??C'5f???
??g???????6UH?????&#?*&?*?m??(b??|/?_
j??,??:???k?*q???/?w????m[L????????D?'???+???J?H??????[?/?????W?????W?????y?6?B9=?????0?[???U?k?^ny?]w<?,f???g???K?t??x??)?Ys?eF?<??f?o?}???
???
?ikw?jys???/b.9?"-x6?(??Z
I??(R?(?
DT3b?0?qJ?D<u?r??R?U>Tz?7ze
???O!
????@wy"?U?@??V???)?[Dh\???Z&ac?!??:bw??1:???LNt?.]A?%??%??\"???St??YJ???c?eLZJ ?rUSA?<7????LeGi??k?????\
?j???
????????1o?U????ZT?????0B?????=?-???J?? k?
uB??1?gu?0?"???e%???d\???d??8?!??Um???F?gd???d?
,Q??s,??5Q??,	???F???????g?8&xC?.J'a3(c@m????D.?BR?q??a??8?????Z???qYS 	???C?gZd4?1???F??Sl?Kf??N?tYZ????(?X?????1w?;?4
???H?2Z<qo2?9e??f??0?\?]?l????Q?M??XwN0?4??L\Vc?L?PW?9#????[?
Df?ws?F?:e??YK???%?[?/FJZ???Ywq?I?|[t?\i??W??? i??????|??J?|EA?&??m?!?]???7?a??[DDB?w"?,b???c?PY
REU??~l??
)O0?D????|?u???M?y??Is2??x-`^:IS(????A???E???? g??Q??5C'?|`\M?)0 ?e<
???/?|e=KAI?H????;j???<|??@???????{???\???J??{SRN?48???v???s;?,???{b?????R????R? ??y??????Ifv?)
?ss*?GCJjgpR?F?.JcA@?Nx??
s?Q??F+?????l6I}"?????T+C1d??^w?&?????7????Q?????9?V?
?Kn?J??????/~?Q??*??DK??O$H????twgd??
c]??f????????ROl?d???????5?m???y_????P?	??hn{3??s?5p4X??du???@\??'\O???y?D?y???x???`.!?
f???q1??????!?5wK?%??q??h???}??y-???????^?X?[??gm?????p**?`u?&???Fm
???	S?9??M?Ki?????&?im??ZH?Xj?Q?f??
??3m?%Ji!hgh.<MV%j???%??k0DX?9)h{??)??;Sl?JM	 Dc#%?}Qe???ZZV?	?;?qH?L-????[V??N86?S	?4????C[Mm{?"???S??F??hDx?3
ol?6???R?^??/H??????C?
???,?,?}?x@	rK??(??fj?Jb?~??M????'???M!???=	??)?c??C?na?mR?mli?R?????n?h?c??>5????
N?????????$??K??!tn??&?(?Q?1|k?DY???sqRx?LdjvLD=:T?.?MX?MP??u????x?7g?v?????
?nG;7??????zc[N??g???????j??8?i?P{1?????\5??o???4j?9wZ7@?t?*?T?<?rJg???8@?????;;aq?c??u?W????D??????J?U????Pj?0Z???	$?HE$=)?o?j?h????i??F???%???2LeI`?~???5!?(?(mN??w??u???rSJ?n?{q5*?m???????D@Q5??"???
?B?nTF&BziE`?3s2??????<P
b@??W??
???"???H?+???
?t$9K{?.V??L??-@?tf(????]????[i??m/1?G'?$9
`???*(]%A?,.?BvF?
L?`4Z?s???]????J???ETu?D?Qm??%?ZX(*?(?
m)?3??f!???i?&hNP?&3]??{cF??=?A?1LTI?1
??ERV??w??4?y???[H???7P???XT{?b??Q?nX?P-?=??d?L??SU???dN???????L|?????9E???#???CX???_????????
?*???. ?BD?#??????j*??f?{??~?$[u????????r ?!?h???eT?@?
?R???F?AS?????g*ODA:?N?)?H ??:?9k?=znI?Md&???????&?J!???]	t?"???a18?O??n??g?%P?$?@
0)J?K??z??q??y
'?
?i1?A????[?
2CMRA??*?????4?GPh???D?UX?T4?G???h??"??OY?'??9Uh????4???6?]Cr?.????9q&??N??<XP???T?Ci????Lq=L?-??I?5??	?q??l1C??q?4??%??'P?????1,?/???,H??2?6I??`H'Pq
?????:?q??`???9?z???R
aR???B(R?Qu????q??)?W?q???<??$?#?T??#
?J/???aHT?<????6 x??z??
3???Rnv??????0?{??8??iT?JO/?????!?_{???????%7=-?!??`(?P?
L?/y?:\????z?[3D??[Ch?(?c\??P!
?????+????B???Q9???>>?F?YJ??gw?(%(?c	??R???
y?)}?
?)F5
????b4?)?4h?
d?	??0b?.Y???)9)??Hz???A?/V~j,9e?[????;0?p?Z	??Z?t???"???r'`?????&???0]T?tW?H??0?K??E?E1Q&*?!??,??????SW?a??)3????R???MA)STL???Q??USTT?Rp????/
???:
-R+Aj?l1??Yq?4?!TA1B??S??f&?	?%	Q4?
J??Y??????*d???i ??j?X????i??)?*???Y???I??"Z???`??l?5G?(Z?J")?
???V?E!QHMPDUUTV?Km???(`? ?$?\??????$	
???QB#??&s??E?C?e? ??EJ???RS,|??;U??<Ms???de???@??
yU#_?(?"e?2
?"
???j%*?B???D?t???4??TA$s?????Oo????????h?JB{8???S??>???[O?Z????
s?Z????`TU?F??{i??
?\?~?????????????????????ADL?DL?UA$U35A351QA1AUUTTIUPA33QA0?S1@?I
7d?^????F??4?.??ck?T????j0?]??8
??G???p?????e}y

o?C_?B)???uSC????fdf??w????F??B?q???8???????w_???sn?D??c?X?Im?Ov???0I`?\?7}?Fs?P`???#a?c
?Q??B?ZP6??#?)$xw?n??T??)w?,&*??g????C?B?8X!y?7"?h?\??X&????a1=GO?4r
|m?????I!;??J8?????D:??Y)????<?R?~?i??G??????16B99?1I3?????'!??<?&?`;?????A?6?/???UU\?*???6LD4????I?D??Q???t"??)i?b?@?Z0=???'?.>-ie?v9?xT?RP?J?AdQ(?lO?:R>???r>=??XT?!???s,????
??p???
????h???!???S]
j"???????c"?????????A?mi???R?	B1	???G????p?=??3 at e?dD?AC??Hb?L?Y
???]?\4??(??~^?JD?N=?V~:?
kb??a?<?g??$^,?h??YJp8h??r?Q???FO'??]oJRB???????ruH?8? ??,?s?^y9?h0?9?3h2H6?t/?U?8?po?X$"U"H't,?9?;
j??c)(TlYO"?rtk??>23Z??Y? ??	???S???}l2?????=1D??`
@?? ??????'4,?E???c??$?q(?LI(33=???????????"'?L??A???9U)???hZ?x0x?dP? !?P?M?DPC?8???w??3?L?[?)???lE?Dq???????????;???3+???,G???n???o??^]????\???~?S????????1G??P?E?g????c?m?-????
j???
?????	??9??!Y???*txW????'L??Sx??h???$h~z,w?Ucp?
??}???L???????o??:W????j???????S
?k]?"??????
?kp??a^
?????"?3?????n;(<?????BBF ???T:?C?'v?P??R~d%p?v????~.D??9O??N???}3?c ??d"/!?OM??v?A?"
?\?_?y]f`]???
E\uv2?]?????`b??R@??4???El?H??Qal????feY?X?1??PI????\?3#;????W?Y9?8?H?:???0()?h???????i
*??	???RU
M6??!?j?RV???
??\??)57h"*+T???????&????r?!????	???/??`?~??_???9?6}???????H^0??@??3???<?????Y???D?@0????%
?dO?lQ/?????WiuR1`????u?i|&?9???L?0I)??T7D???IJ?? ??@??M#?DL?QH??K? ?~#I?B?
??)??R?t??nD???W?KT4?=??h?Uo????B????t?????A?oX`????????>???{W??[+??"y?G+~y??Bc?????t?/:1UTm?:??w????w
g$???x????Hj?l??z????H$????yc???M????????????thU/??X???/<??
?	?o;??[?ve
??V?EB?2Z??\v??SHI!$???/?M?J?+?7?z?
r&?\?????<Mw<,?G5'EJ?`???k$5-???{?\?
G?=G??;HF?tQ??FO????AbS?????t??83?/??z????????FNkd?V,??* ??,2?R
Z?4???9??HM_?:???u???p
???vo?].?{;?3b(????K
l?>?}??0??RB?PpOg???07?5{????v(bO???*??~? ??#?K?G?/94p??n??.!LucF?	:??I$L?Db?EO?h?u)?????`b!08!??????rP??DI?q8?R????fb?l????7?y???	
?_K???k??5????gJ*?z?
?:W?v?
?y?+?:???{??????????.R7:]Y?<??ZY?T??n|???&????X????|^-???????B
???R??D??{?$?/?)? ?A?A????F?qI??I?N??H|#???
(O?????I???j? *?(??nv??;q???
U!??~???:/??/?}T?O?h?w?=>?S\@$P?????X?_????3i?r>?t??????????g-??????t?[???TxTx_?]????M?biy?[<?4Qh7\??
E?yA???X?[??8???I????\???Ek7B???v???Aj????Qo?*mqM??.1????c;?p?u`$??i5&??7???4?o?z??{?~?????????????q????{d?
O????,???T?????J????I?4un??7Y4ET?H?!??)??@?@?H!Q.n?????N?
??
??%+?Gp?b?????@"??T@?

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jul 2006 12:55:23 -0000	1.5
+++ .cvsignore	9 Aug 2006 07:51:18 -0000	1.6
@@ -1,2 +1,2 @@
 mansupfr.tar.bz2
-man-pages-fr-2.22.0.tar.bz2
+man-pages-fr-2.33.0.tar.bz2


Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- man-pages-fr.spec	24 Jul 2006 09:55:35 -0000	1.21
+++ man-pages-fr.spec	9 Aug 2006 07:51:18 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
-Version:	2.22.0
-Release:	4
+Version:	2.33.0
+Release:	1
 License:	Distributable
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -102,6 +102,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Wed Aug 09 2006 Marcela Maslanova <mmaslano at redhat.com> 2.33.0-1
+- new version of man-pages from source0
+
 * Mon Jul 24 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22.0-4
 - new spec file for better encoding
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jul 2006 12:55:23 -0000	1.5
+++ sources	9 Aug 2006 07:51:18 -0000	1.6
@@ -1,3 +1,2 @@
-9b52a6a416f0aa23979a095e99419141  man-pages-fr-2.22.0.tar.bz2
 d5c654c7391dd2f452c21edb442d8f4e  mansupfr.tar.bz2
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 08:10:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 04:10:31 -0400
Subject: rpms/man-pages-fr/devel sources, 1.6,
	1.7 man-pages-fr-2.33.0.tar.bz2, 1.1, NONE
Message-ID: <200608090810.k798AV4X026754@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26641

Modified Files:
	sources 
Removed Files:
	man-pages-fr-2.33.0.tar.bz2 
Log Message:
Change source file.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Aug 2006 07:51:18 -0000	1.6
+++ sources	9 Aug 2006 08:10:26 -0000	1.7
@@ -1,2 +1,3 @@
 d5c654c7391dd2f452c21edb442d8f4e  mansupfr.tar.bz2
 
+e5ecced18ccca6d4454f59f17aaf3fa8  man-pages-fr-2.33.0.tar.bz2


--- man-pages-fr-2.33.0.tar.bz2 DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  9 08:12:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 04:12:52 -0400
Subject: rpms/xpdf/devel xpdf.spec,1.79,1.80
Message-ID: <200608090812.k798CqRe027345@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/xpdf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27302

Modified Files:
	xpdf.spec 
Log Message:
fix #200608, install icon in the wrong dir



Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- xpdf.spec	14 Jul 2006 08:58:39 -0000	1.79
+++ xpdf.spec	9 Aug 2006 08:12:49 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 15
+Release: 16
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -108,13 +108,13 @@
          $RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-traditional \
          $RPM_BUILD_ROOT%{_datadir}/xpdf/japanese \
          $RPM_BUILD_ROOT%{_datadir}/xpdf/korean \
-         $RPM_BUILD_ROOT%{_datadir}/icons
+         $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
 install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/applications/net-xpdf.desktop
-install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/icons/xpdf.png
+install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/pixmaps/xpdf.png
 
 cp -rf xpdf-chinese-simplified/* $RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-simplified/
 cp -rf xpdf-chinese-traditional/* $RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-traditional/
@@ -146,7 +146,7 @@
 %{_bindir}/xpdf
 %{_mandir}/man?/xpdf*
 %config(noreplace) %verify(not md5 size mtime) /etc/xpdfrc
-%{_datadir}/icons/xpdf.png
+%{_datadir}/pixmaps/xpdf.png
 %dir %{_datadir}/xpdf
 %{_datadir}/applications/*
 %lang(zh_CN) %{_datadir}/xpdf/chinese-simplified
@@ -160,6 +160,9 @@
 %{_mandir}/man?/pdf*
 
 %changelog
+* Wed Aug 09 2006 Than Ngo <than at redhat.com> 1:3.01-16
+- fix #200608, install icon in the wrong dir
+
 * Fri Jul 14 2006 Than Ngo <than at redhat.com> 1:3.01-15
 - fix build problem with new freetype
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 09:15:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 05:15:45 -0400
Subject: rpms/vim/devel vimrc,1.13,1.14
Message-ID: <200608090915.k799FjU4008015@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	vimrc 
Log Message:
use new syntax for bs settings


Index: vimrc
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vimrc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vimrc	11 Oct 2005 11:33:54 -0000	1.13
+++ vimrc	9 Aug 2006 09:15:40 -0000	1.14
@@ -3,7 +3,7 @@
 endif
 
 set nocompatible	" Use Vim defaults (much better!)
-set bs=2		" allow backspacing over everything in insert mode
+set bs=indent,eol,start		" allow backspacing over everything in insert mode
 "set ai			" always set autoindenting on
 "set backup		" keep a backup file
 set viminfo='20,\"50	" read/write a .viminfo file, don't store more



From fedora-cvs-commits at redhat.com  Wed Aug  9 11:36:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 07:36:25 -0400
Subject: rpms/man-pages/devel .cvsignore, 1.25, 1.26 man-pages.spec, 1.47,
	1.48 sources, 1.25, 1.26
Message-ID: <200608091136.k79BaPIq026569@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26474

Modified Files:
	.cvsignore man-pages.spec sources 
Log Message:
New version man-pages-2.39



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	18 Jul 2006 09:35:39 -0000	1.25
+++ .cvsignore	9 Aug 2006 11:36:19 -0000	1.26
@@ -1,3 +1,4 @@
 man-pages-extralocale.tar.bz2
 man2.tar.gz
 man-pages-2.36.tar.bz2
+man-pages-2.39.tar.bz2


Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- man-pages.spec	20 Jul 2006 11:23:32 -0000	1.47
+++ man-pages.spec	9 Aug 2006 11:36:20 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
-Version: 2.36
-Release: 2
+Version: 2.39
+Release: 1
 License: distributable
 Group: Documentation
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
@@ -174,6 +174,9 @@
 %{_mandir}/en/man*
 
 %changelog
+* Wed Aug 09 2006 Marcela Maslanova <mmaslano at redhat.com> 2.39-1
+- new version 2.39
+
 * Thu Jul 20 2006 Marcela Maslanova <mmaslano at redhat.com> 2.36-2
 - fix (#198903)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	18 Jul 2006 09:35:39 -0000	1.25
+++ sources	9 Aug 2006 11:36:20 -0000	1.26
@@ -1,3 +1,3 @@
 57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
 af09d031dcee66929510e078d00066f2  man2.tar.gz
-c661eb3ff67a3bfe45fe966d74dd22df  man-pages-2.36.tar.bz2
+94f69eed6a1cf2268e7e645cfbcdce9f  man-pages-2.39.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  9 11:41:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 07:41:04 -0400
Subject: rpms/man-pages/devel .cvsignore,1.26,1.27
Message-ID: <200608091141.k79Bf3KR027677@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27522

Modified Files:
	.cvsignore 
Log Message:
New version man-pages-2.39, changes in sources etc.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	9 Aug 2006 11:36:19 -0000	1.26
+++ .cvsignore	9 Aug 2006 11:40:57 -0000	1.27
@@ -1,4 +1,3 @@
 man-pages-extralocale.tar.bz2
 man2.tar.gz
-man-pages-2.36.tar.bz2
 man-pages-2.39.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:27:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:27:34 -0400
Subject: rpms/man-pages/devel man-pages.spec, 1.48,
	1.49 man-pages-2.34-typo.patch, 1.1, NONE
Message-ID: <200608091227.k79CRY7Y003570@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3391

Modified Files:
	man-pages.spec 
Removed Files:
	man-pages-2.34-typo.patch 
Log Message:
Fixed #200681 - typo.



Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- man-pages.spec	9 Aug 2006 11:36:20 -0000	1.48
+++ man-pages.spec	9 Aug 2006 12:27:27 -0000	1.49
@@ -28,12 +28,12 @@
 Patch23: man-pages-2.25-dbopen.patch
 Patch24: man-pages-2.25-malloc.patch
 Patch26: man-pages-2.34-inet.patch
-Patch27: man-pages-2.34-typo.patch
 Patch28: man-pages-2.34-nscd.patch
 Patch29: man-pages-2.34-getrlimit.patch
 Patch30: man-pages-2.34-libaio-includes.patch
 Patch31: man-pages-2.34-write.patch
 Patch32: man-pages-2.34-wait16.patch
+Patch33: man-pages-2.39-typo.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Autoreq: false
@@ -69,12 +69,12 @@
 %patch23 -p1
 %patch24 -p1
 %patch26 -p1
-%patch27 -p1
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
 
 %build
 
@@ -174,6 +174,9 @@
 %{_mandir}/en/man*
 
 %changelog
+* Wed Aug 09 2006 Marcela Maslanova <mmaslano at redhat.com> 2.39-2
+- fix(#200681) typo
+
 * Wed Aug 09 2006 Marcela Maslanova <mmaslano at redhat.com> 2.39-1
 - new version 2.39
 


--- man-pages-2.34-typo.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:28:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:28:55 -0400
Subject: rpms/vim/devel 7.0.043,NONE,1.1
Message-ID: <200608091228.k79CSsol003983@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	7.0.043 
Log Message:
- Patchlevel 43


--- NEW FILE 7.0.043 ---
To: vim-dev at vim.org
Subject: Patch 7.0.043
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.043
Problem:    Using "%!" at the start of 'statusline' doesn't work.
Solution:   Recognize the special item when the option is being set.
Files:	    src/option.c


*** ../vim-7.0.042/src/option.c	Sat May 13 14:41:15 2006
--- src/option.c	Mon Jul 10 22:41:20 2006
***************
*** 6325,6331 ****
  	    else
  		errmsg = check_stl_option(p_ruf);
  	}
! 	else
  	    errmsg = check_stl_option(s);
  	if (varp == &p_ruf && errmsg == NULL)
  	    comp_col();
--- 6325,6332 ----
  	    else
  		errmsg = check_stl_option(p_ruf);
  	}
! 	/* check 'statusline' only if it doesn't start with "%!" */
! 	else if (varp != &p_stl || s[0] != '%' || s[1] != '!')
  	    errmsg = check_stl_option(s);
  	if (varp == &p_ruf && errmsg == NULL)
  	    comp_col();
*** ../vim-7.0.042/src/version.c	Sun Jul 23 22:37:29 2006
--- src/version.c	Tue Aug  8 16:29:24 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     43,
  /**/

-- 
There's no place like $(HOME)!

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:28:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:28:59 -0400
Subject: rpms/vim/devel 7.0.044,NONE,1.1
Message-ID: <200608091228.k79CSxPe004035@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	7.0.044 
Log Message:
- Patchlevel 44


--- NEW FILE 7.0.044 ---
To: vim-dev at vim.org
Subject: Patch 7.0.044
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.044
Problem:    Perl: setting a buffer line in another buffer may result in
	    changing the current buffer.
Solution:   Properly change to the buffer to be changed.
Files:	    src/if_perl.xs


*** ../vim-7.0.043/src/if_perl.xs	Tue Mar  7 00:18:16 2006
--- src/if_perl.xs	Thu Jun 22 21:22:18 2006
***************
*** 1056,1062 ****
      int i;
      long lnum;
      char *line;
-     buf_T *savebuf;
      PPCODE:
      if (buf_valid(vimbuf))
      {
--- 1056,1061 ----
***************
*** 1069,1082 ****
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
! 		savebuf = curbuf;
  		curbuf = vimbuf;
  		if (u_savesub(lnum) == OK)
  		{
  		    ml_replace(lnum, (char_u *)line, TRUE);
  		    changed_bytes(lnum, 0);
  		}
! 		curbuf = savebuf;
  	    }
  	}
      }
--- 1068,1098 ----
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
!     #ifdef FEAT_AUTOCMD
! 		aco_save_T	aco;
! 
! 		/* set curwin/curbuf for "vimbuf" and save some things */
! 		aucmd_prepbuf(&aco, vimbuf);
!     #else
! 		buf_T	*save_curbuf = curbuf;
! 
  		curbuf = vimbuf;
+ 		curwin->w_buffer = vimbuf;
+     #endif
  		if (u_savesub(lnum) == OK)
  		{
  		    ml_replace(lnum, (char_u *)line, TRUE);
  		    changed_bytes(lnum, 0);
  		}
! 
!     #ifdef FEAT_AUTOCMD
! 		/* restore curwin/curbuf and a few other things */
! 		aucmd_restbuf(&aco);
! 		/* Careful: autocommands may have made "vimbuf" invalid! */
!     #else
! 		curwin->w_buffer = save_curbuf;
! 		curbuf = save_curbuf;
!     #endif
  	    }
  	}
      }
***************
*** 1087,1093 ****
  
      PREINIT:
      long i, lnum = 0, count = 0;
-     buf_T *savebuf;
      PPCODE:
      if (buf_valid(vimbuf))
      {
--- 1103,1108 ----
***************
*** 1114,1129 ****
  	    {
  		if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
  		{
! 		    savebuf = curbuf;
  		    curbuf = vimbuf;
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
  			deleted_lines_mark(lnum, 1L);
! 			if (savebuf == curbuf)
  			    check_cursor();
  		    }
! 		    curbuf = savebuf;
  		    update_curbuf(VALID);
  		}
  	    }
--- 1129,1159 ----
  	    {
  		if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
  		{
! 		    buf_T	*save_curbuf = curbuf;
!     #ifdef FEAT_AUTOCMD
! 		    aco_save_T	aco;
! 
! 		    /* set curwin/curbuf for "vimbuf" and save some things */
! 		    aucmd_prepbuf(&aco, vimbuf);
!     #else
  		    curbuf = vimbuf;
+ 		    curwin->w_buffer = vimbuf;
+     #endif
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
  			deleted_lines_mark(lnum, 1L);
! 			if (save_curbuf == curbuf)
  			    check_cursor();
  		    }
!     #ifdef FEAT_AUTOCMD
! 		    /* restore curwin/curbuf and a few other things */
! 		    aucmd_restbuf(&aco);
! 		    /* Careful: autocommands may have made "vimbuf" invalid! */
!     #else
! 		    curwin->w_buffer = save_curbuf;
! 		    curbuf = save_curbuf;
!     #endif
  		    update_curbuf(VALID);
  		}
  	    }
***************
*** 1138,1144 ****
      int		i;
      long	lnum;
      char	*line;
-     buf_T	*savebuf;
      PPCODE:
      if (buf_valid(vimbuf))
      {
--- 1168,1173 ----
***************
*** 1151,1164 ****
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
! 		savebuf = curbuf;
  		curbuf = vimbuf;
  		if (u_inssub(lnum + 1) == OK)
  		{
  		    ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
  		    appended_lines_mark(lnum, 1L);
  		}
! 		curbuf = savebuf;
  		update_curbuf(VALID);
  	    }
  	}
--- 1180,1210 ----
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
!     #ifdef FEAT_AUTOCMD
! 		aco_save_T	aco;
! 
! 		/* set curwin/curbuf for "vimbuf" and save some things */
! 		aucmd_prepbuf(&aco, vimbuf);
!     #else
! 		buf_T	*save_curbuf = curbuf;
! 
  		curbuf = vimbuf;
+ 		curwin->w_buffer = vimbuf;
+     #endif
  		if (u_inssub(lnum + 1) == OK)
  		{
  		    ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
  		    appended_lines_mark(lnum, 1L);
  		}
! 
!     #ifdef FEAT_AUTOCMD
! 		/* restore curwin/curbuf and a few other things */
! 		aucmd_restbuf(&aco);
! 		/* Careful: autocommands may have made "vimbuf" invalid! */
!     #else
! 		curwin->w_buffer = save_curbuf;
! 		curbuf = save_curbuf;
!     #endif
  		update_curbuf(VALID);
  	    }
  	}
*** ../vim-7.0.043/src/version.c	Tue Aug  8 16:30:51 2006
--- src/version.c	Tue Aug  8 16:45:40 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     44,
  /**/

-- 
Momento mori, ergo carpe diem

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:29:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:29:04 -0400
Subject: rpms/vim/devel 7.0.045,NONE,1.1
Message-ID: <200608091229.k79CT428004090@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	7.0.045 
Log Message:
- Patchlevel 45


--- NEW FILE 7.0.045 ---
To: vim-dev at vim.org
Subject: Patch 7.0.045 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.045 (extra)
Problem:    Win32: Warnings when compiling OLE version with MSVC 2005.
Solution:   Move including vim.h to before windows.h. (Ilya Bobir)
Files:	    src/if_ole.cpp


*** ../vim-7.0.044/src/if_ole.cpp	Wed May  3 23:18:50 2006
--- src/if_ole.cpp	Sat Jun 24 13:36:52 2006
***************
*** 13,23 ****
   * See os_mswin.c for the client side.
   */
  
  #include <windows.h>
  #include <oleauto.h>
  
  extern "C" {
- #include "vim.h"
  extern HWND s_hwnd;
  extern HWND vim_parent_hwnd;
  }
--- 13,26 ----
   * See os_mswin.c for the client side.
   */
  
+ extern "C" {
+ #include "vim.h"
+ }
+ 
  #include <windows.h>
  #include <oleauto.h>
  
  extern "C" {
  extern HWND s_hwnd;
  extern HWND vim_parent_hwnd;
  }
*** ../vim-7.0.044/src/version.c	Tue Aug  8 16:47:38 2006
--- src/version.c	Tue Aug  8 17:04:14 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     45,
  /**/

-- 
>From "know your smileys":
 %	Bike accident.  A bit far-fetched, I suppose; although...
             o      _     _         _
     _o     /\_   _ \\o  (_)\__/o  (_)
   _< \_   _>(_) (_)/<_    \_| \   _|/' \/
  (_)>(_) (_)        (_)   (_)    (_)'  _\o_

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:29:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:29:09 -0400
Subject: rpms/vim/devel 7.0.046,NONE,1.1
Message-ID: <200608091229.k79CT9OP004134@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	7.0.046 
Log Message:
- Patchlevel 46


--- NEW FILE 7.0.046 ---
To: vim-dev at vim.org
Subject: Patch 7.0.046
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.046
Problem:    The matchparen plugin ignores parens in strings, but not in single
	    quotes, often marked with "character".
Solution:   Also ignore parens in syntax items matching "character".
Files:	    runtime/plugin/matchparen.vim


*** ../vim-7.0.045/runtime/plugin/matchparen.vim	Sat May 13 14:52:02 2006
--- runtime/plugin/matchparen.vim	Mon Jun 26 10:53:35 2006
***************
*** 1,6 ****
  " Vim plugin for showing matching parens
  " Maintainer:  Bram Moolenaar <Bram at vim.org>
! " Last Change: 2006 May 11
  
  " Exit quickly when:
  " - this plugin was already loaded (or disabled)
--- 1,6 ----
  " Vim plugin for showing matching parens
  " Maintainer:  Bram Moolenaar <Bram at vim.org>
! " Last Change: 2006 Jun 26
  
  " Exit quickly when:
  " - this plugin was already loaded (or disabled)
***************
*** 96,102 ****
  
    " When not in a string or comment ignore matches inside them.
    let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
! 	\ '=~?  "string\\|comment"'
    execute 'if' s_skip '| let s_skip = 0 | endif'
  
    let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
--- 96,102 ----
  
    " When not in a string or comment ignore matches inside them.
    let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
! 	\ '=~?  "string\\|character\\|singlequote\\|comment"'
    execute 'if' s_skip '| let s_skip = 0 | endif'
  
    let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
*** ../vim-7.0.045/src/version.c	Tue Aug  8 17:06:21 2006
--- src/version.c	Tue Aug  8 18:07:37 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     46,
  /**/

-- 
I AM THANKFUL...
...for the taxes that I pay because it means that I am employed.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:29:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:29:14 -0400
Subject: rpms/vim/devel 7.0.047,NONE,1.1
Message-ID: <200608091229.k79CTE4d004187@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	7.0.047 
Log Message:
- Patchlevel 47


--- NEW FILE 7.0.047 ---
To: vim-dev at vim.org
Subject: Patch 7.0.047
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.047
Problem:    When running configure the exit status is wrong.
Solution:   Handle the exit status properly. (Matthew Woehlke)
Files:	    configure, src/configure


*** ../vim-7.0.046/configure	Sun Jun 13 21:32:42 2004
--- configure	Mon Jul 10 20:26:26 2006
***************
*** 3,6 ****
  # This is just a stub for the Unix configure script, to provide support for
  # doing "./configure" in the top Vim directory.
  
! cd src && ./configure "$@"
--- 3,6 ----
  # This is just a stub for the Unix configure script, to provide support for
  # doing "./configure" in the top Vim directory.
  
! cd src && exec ./configure "$@"
*** ../vim-7.0.046/src/configure	Thu Dec 22 23:38:38 2005
--- src/configure	Mon Jul 10 20:26:53 2006
***************
*** 2,6 ****
--- 2,10 ----
  # run the automatically generated configure script
  CONFIG_STATUS=auto/config.status \
  	auto/configure "$@" --srcdir="${srcdir:-.}" --cache-file=auto/config.cache
+ result=$?
+ 
  # Stupid autoconf 2.5x causes this file to be left behind.
  if test -f configure.lineno; then rm -f configure.lineno; fi
+ 
+ exit $result
*** ../vim-7.0.046/src/version.c	Tue Aug  8 18:08:54 2006
--- src/version.c	Tue Aug  8 19:09:54 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     47,
  /**/

-- 
The primary purpose of the DATA statement is to give names to constants;
instead of referring to pi as 3.141592653589793 at every appearance, the
variable PI can be given that value with a DATA statement and used instead
of the longer form of the constant.  This also simplifies modifying the
program, should the value of pi change.
	-- FORTRAN manual for Xerox Computers

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:29:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:29:19 -0400
Subject: rpms/vim/devel 7.0.048,NONE,1.1
Message-ID: <200608091229.k79CTJiX004243@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	7.0.048 
Log Message:
- Patchlevel 48


--- NEW FILE 7.0.048 ---
To: vim-dev at vim.org
Subject: Patch 7.0.048
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.048
Problem:    Writing a compressed file fails when there are parens in the name.
	    (Wang Jian)
Solution:   Put quotes around the temp file name.
Files:	    runtime/autoload/gzip.vim


*** ../vim-7.0.047/runtime/autoload/gzip.vim	Wed Apr  5 22:17:15 2006
--- runtime/autoload/gzip.vim	Wed Jul 19 23:53:52 2006
***************
*** 1,6 ****
  " Vim autoload file for editing compressed files.
  " Maintainer: Bram Moolenaar <Bram at vim.org>
! " Last Change: 2006 Mar 31
  
  " These functions are used by the gzip plugin.
  
--- 1,6 ----
  " Vim autoload file for editing compressed files.
  " Maintainer: Bram Moolenaar <Bram at vim.org>
! " Last Change: 2006 Jul 19
  
  " These functions are used by the gzip plugin.
  
***************
*** 127,135 ****
      let nmt = s:tempname(nm)
      if rename(nm, nmt) == 0
        if exists("b:gzip_comp_arg")
! 	call system(a:cmd . " " . b:gzip_comp_arg . " " . nmt)
        else
! 	call system(a:cmd . " " . nmt)
        endif
        call rename(nmt . "." . expand("<afile>:e"), nm)
      endif
--- 127,135 ----
      let nmt = s:tempname(nm)
      if rename(nm, nmt) == 0
        if exists("b:gzip_comp_arg")
! 	call system(a:cmd . " " . b:gzip_comp_arg . " '" . nmt . "'")
        else
! 	call system(a:cmd . " '" . nmt . "'")
        endif
        call rename(nmt . "." . expand("<afile>:e"), nm)
      endif
*** ../vim-7.0.047/src/version.c	Tue Aug  8 19:10:35 2006
--- src/version.c	Tue Aug  8 19:26:51 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     48,
  /**/

-- 
A fool learns from his mistakes, a wise man from someone else's.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:29:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:29:27 -0400
Subject: rpms/vim/devel 7.0.049,NONE,1.1
Message-ID: <200608091229.k79CTRlq004307@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	7.0.049 
Log Message:
- Patchlevel 49


--- NEW FILE 7.0.049 ---
To: vim-dev at vim.org
Subject: Patch 7.0.049
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.049
Problem:    Some TCL scripts are not recognized. (Steven Atkinson)
Solution:   Check for "exec wish" in the file.
Files:	    runtime/scripts.vim


*** ../vim-7.0.048/runtime/scripts.vim	Tue Mar 28 23:07:11 2006
--- runtime/scripts.vim	Sat Jul  8 22:20:51 2006
***************
*** 1,7 ****
  " Vim support file to detect file types in scripts
  "
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last change:	2006 Mar 28
  
  " This file is called by an autocommand for every file that has just been
  " loaded into a buffer.  It checks if the type of file can be recognized by
--- 1,7 ----
  " Vim support file to detect file types in scripts
  "
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last change:	2006 Jul 08
  
  " This file is called by an autocommand for every file that has just been
  " loaded into a buffer.  It checks if the type of file can be recognized by
***************
*** 52,57 ****
--- 52,63 ----
      let s:name = substitute(s:line1, '^#!\s*\([^/\\ ]*\>\).*', '\1', '')
    else
      let s:name = substitute(s:line1, '^#!\s*\S*[/\\]\(\i\+\).*', '\1', '')
+   endif
+ 
+   " tcl scripts may have #!/bin/sh in the first line and "exec wish" in the
+   " third line.  Suggested by Steven Atkinson.
+   if getline(3) =~ '^exec wish'
+     let s:name = 'wish'
    endif
  
    " Bourne-like shell scripts: bash bash2 ksh ksh93 sh
*** ../vim-7.0.048/src/version.c	Tue Aug  8 19:55:06 2006
--- src/version.c	Tue Aug  8 20:53:58 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     49,
  /**/

-- 
I AM THANKFUL...
...for the piles of laundry and ironing because it means I
have plenty of clothes to wear.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:29:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:29:32 -0400
Subject: rpms/vim/devel 7.0.050,NONE,1.1
Message-ID: <200608091229.k79CTWBU004360@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	7.0.050 
Log Message:
- Patchlevel 50


--- NEW FILE 7.0.050 ---
To: vim-dev at vim.org
Subject: Patch 7.0.050
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.050
Problem:    After using the netbeans interface close command a stale pointer
	    may be used.
Solution:   Clear the pointer to the closed buffer. (Xaview de Gaye)
Files:	    src/netbeans.c


*** ../vim-7.0.049/src/netbeans.c	Sun Apr 23 00:21:07 2006
--- src/netbeans.c	Fri Aug  4 23:02:54 2006
***************
*** 1986,1991 ****
--- 1986,1993 ----
  	    if (buf->bufp != NULL)
  		do_buffer(DOBUF_WIPE, DOBUF_FIRST, FORWARD,
  						     buf->bufp->b_fnum, TRUE);
+ 	    buf->bufp = NULL;
+ 	    buf->initDone = FALSE;
  	    doupdate = 1;
  /* =====================================================================*/
  	}
*** ../vim-7.0.049/src/version.c	Tue Aug  8 20:56:11 2006
--- src/version.c	Tue Aug  8 21:35:25 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     50,
  /**/

-- 
>From "know your smileys":
 :-E	Has major dental problems

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:30:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:30:49 -0400
Subject: rpms/vim/devel README.patches,1.52,1.53 vim.spec,1.130,1.131
Message-ID: <200608091230.k79CUnFr004718@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	README.patches vim.spec 
Log Message:
- patchlevel 50


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- README.patches	24 Jul 2006 13:32:41 -0000	1.52
+++ README.patches	9 Aug 2006 12:30:46 -0000	1.53
@@ -67,3 +67,11 @@
   1946  7.0.040  mouse selection with "z=" and inputlist() gets wrong entry
   2229  7.0.041  cursor([1, 2]) failed, required third item in the list
   1603  7.0.042  crash or hang when pasting a block in Insert mode
+  1534  7.0.043  "%!" at start of 'statusline' didn't work
+  5277  7.0.044  Perl: changing a line in a non-current buffer may not work
+  1741  7.0.045  (extra) Win32: MSVC 2005 compiler warnings for OLE version
+  2318  7.0.046  the matchparen plugin didn't handle parens in single quotes
+  2219  7.0.047  the exit status of the configure script can be wrong
+  2173  7.0.048  the gzip plugin can't handle file names that have a paren
+  2221  7.0.049  some Tcl scripts are not recognized
+  1437  7.0.050  can't properly close a buffer through the NetBeans interface


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- vim.spec	3 Aug 2006 13:54:35 -0000	1.130
+++ vim.spec	9 Aug 2006 12:30:46 -0000	1.131
@@ -15,12 +15,12 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 042
+%define patchlevel 050
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 2
+Release: 1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -87,6 +87,14 @@
 Patch040: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.040
 Patch041: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.041
 Patch042: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.042
+Patch043: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.043
+Patch044: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.044
+Patch045: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.045
+Patch046: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.046
+Patch047: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.047
+Patch048: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.048
+Patch049: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.049
+Patch050: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.050
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -258,6 +266,15 @@
 %patch040 -p0
 %patch041 -p0
 %patch042 -p0
+%patch043 -p0
+%patch044 -p0
+# Win32:
+#patch045 -p0
+%patch046 -p0
+%patch047 -p0
+%patch048 -p0
+%patch049 -p0
+%patch050 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -581,6 +598,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Aug 09 2006 Karsten Hopp <karsten at redhat.de> 7.0.050-1
+- Patchlevel 50
+
 * Thu Aug 03 2006  Karsten Hopp <karsten at redhat.de> 7.0.042-2
 - clean up spec file
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:31:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:31:54 -0400
Subject: rpms/man-pages/devel man-pages-2.39-typo.patch,NONE,1.1
Message-ID: <200608091231.k79CVslK005010@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4953

Added Files:
	man-pages-2.39-typo.patch 
Log Message:
Add patch on CVS.


man-pages-2.39-typo.patch:
 dlopen.3 |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE man-pages-2.39-typo.patch ---
--- man-pages-2.39/man3/dlopen.3.typo	2006-08-03 15:57:30.000000000 +0200
+++ man-pages-2.39/man3/dlopen.3	2006-08-09 14:15:14.000000000 +0200
@@ -353,6 +353,7 @@
 .if t .ft CW
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <dlfcn.h>
 
 int main(int argc, char **argv) {



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:40:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:40:05 -0400
Subject: rpms/rusers/devel netkit-rusers-0.17-procdiskstats.patch, NONE,
	1.1 rusers.spec, 1.22, 1.23
Message-ID: <200608091240.k79Ce4W1006969@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/rusers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6912

Modified Files:
	rusers.spec 
Added Files:
	netkit-rusers-0.17-procdiskstats.patch 
Log Message:
- Modified the RHEL3 procpartitions patch to work on recent 2.6 kernels (#201839)


netkit-rusers-0.17-procdiskstats.patch:
 rstat_proc.c |  112 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 82 insertions(+), 30 deletions(-)

--- NEW FILE netkit-rusers-0.17-procdiskstats.patch ---
--- netkit-rusers-0.17/rpc.rstatd/rstat_proc.c.procdiskstats	2006-08-09 14:15:27.000000000 +0200
+++ netkit-rusers-0.17/rpc.rstatd/rstat_proc.c	2006-08-09 14:28:45.000000000 +0200
@@ -397,9 +397,88 @@
 };
 
 static void
+getdiskstat(struct _ldisk *d)
+{
+  FILE *statfp;
+  int dsk = 0;
+  unsigned int active;
+  unsigned int ma, mi, xfer;
+  /* merges, ticks, in flight meals, and aveq are not used */
+  unsigned int rd_ios, rd_merges, rd_sectors, rd_ticks;
+  unsigned int wr_ios, wr_merges, wr_sectors, wr_ticks;
+  unsigned int ios_in_flight, io_ticks, aveq;
+  int cd_check = 0;
+  char disk_name[256];
+  static char line[2560];
+  char *s;
+  
+  /* Open /proc/partitions file */
+  if ((statfp = fopen("/proc/diskstats", "r")) == NULL) {
+    syslog(LOG_ERR, "Cannot open %s: %s\n", "/proc/diskstats", strerror(errno));
+    exit(1);
+  }
+
+  /* The first two lines are unimportant. */
+  fgets(line, 2560, statfp);
+  fgets(line, 2560, statfp);
+  while (fgets(line, 2560, statfp) != NULL && dsk < MAX_DISKS) {
+    sscanf (line, "%4d %4d %s %d %d %d %d %d %d %d %d %d %d %d",
+            &ma, &mi, disk_name,
+            &rd_ios, &rd_merges, &rd_sectors, &rd_ticks,
+            &wr_ios, &wr_merges, &wr_sectors, &wr_ticks,
+            &ios_in_flight, &io_ticks, &aveq);
+    /* Check for compaq devices */
+    for(s=disk_name;*s;s++) {
+      if(*s == '/') {
+        cd_check=1;
+      }
+    }
+
+    /*
+     * if we set cd_check we need to check
+     * the name of the device using the compaq c#d#p# 
+     * format, else we can just use the h/sda# format
+     */
+    if(cd_check) {
+      /*
+       * if the second or third from the last character
+       * is p then this is a partition
+       */
+      if((s[-2] == 'p') || (s[-3] == 'p'))
+        continue;
+      goto found_dsk;
+    } else {
+      /*
+       * if the last value is a digit, its a
+       * partition, so go back to the top of the whlie loop
+       */
+      if (isdigit(s[-1])) {
+        continue;
+      }
+found_dsk:
+      xfer = rd_ios + wr_ios;
+      /* this is how /proc/stat determines which devices to display in /proc/stat */
+      active = xfer + rd_sectors, wr_sectors;
+      if (active) {
+        dsk++;
+        d->xfer[dsk] = xfer;
+        d->rio[dsk] = rd_ios;
+        d->rblk[dsk] = rd_sectors;
+        d->wio[dsk] = wr_ios;
+        d->wblk[dsk] = wr_sectors;
+      } else {
+        /* Do not count inactive devices. */
+      }
+    }
+  }
+  /* Close /proc/partitions file */
+   fclose(statfp);
+}
+
+static void
 getstat(unsigned long *cuse, unsigned long *cice, unsigned long *csys, unsigned long *cide,
 	     unsigned *pin, unsigned *pout, unsigned *sin, unsigned *sout,
-	     unsigned *itot, unsigned *i1, unsigned *ct, struct _ldisk *d)
+	     unsigned *itot, unsigned *i1, unsigned *ct)
 {
   static int stat;
 #define	BUFFSIZE	1024
@@ -428,34 +507,6 @@
     b = strstr(buff, "cpu ");
     if(b)
     sscanf(b, "cpu  %lu %lu %lu %lu", cuse, cice, csys, cide);
-    b = strstr(buff, "disk ");
-    if(b)
-      sscanf(b, "disk %u %u %u %u", &d->xfer[0], &d->xfer[1], &d->xfer[2], &d->xfer[3]);
-    b = strstr(buff, "disk_rio ");
-    if(b)
-      sscanf(b, "disk_rio %u %u %u %u", &d->rio[0], &d->rio[1], &d->rio[2], &d->rio[3]);
-    b = strstr(buff, "disk_wio ");
-    if(b)
-      sscanf(b, "disk_wio %u %u %u %u", &d->wio[0], &d->wio[1], &d->wio[2], &d->wio[3]);
-    b = strstr(buff, "disk_rblk ");
-    if(b)
-      sscanf(b, "disk_rblk %u %u %u %u", &d->rblk[0], &d->rblk[1], &d->rblk[2], &d->rblk[3]);
-    b = strstr(buff, "disk_wblk ");
-    if(b)
-      sscanf(b, "disk_wblk %u %u %u %u", &d->wblk[0], &d->wblk[1], &d->wblk[2], &d->wblk[3]);
-
-    b = strstr(buff, "disk_io:");
-    if(b) {
-      ndisks = 0;
-      while ( (b = strstr(b, "):")) != NULL && ndisks < MAX_DISKS ) {
-        sscanf (b, "):(%u,%u,%u,%u,%u)", &d->xfer[ndisks], 
-	        &d->rio[ndisks], &d->rblk[ndisks], 
-	        &d->wio[ndisks], &d->wblk[ndisks]);
-        ndisks++;
-        b += 2;
-      }
-    }
-
     b = strstr(buff, "page ");
     if(b)
     sscanf(b, "page %u %u", pin, pout);
@@ -664,7 +715,8 @@
 
 	getstat(cpu_use+tog,cpu_nic+tog,cpu_sys+tog,cpu_idl+tog,
 		pgpgin+tog,pgpgout+tog,pswpin+tog,pswpout+tog,
-		inter+tog,ticks+tog,ctxt+tog, disk+tog);
+		inter+tog,ticks+tog,ctxt+tog);
+	getdiskstat(disk+tog);
 
 	dk_ndrive = 0;
 	for (i = 0; i < 4; i++) {


Index: rusers.spec
===================================================================
RCS file: /cvs/dist/rpms/rusers/devel/rusers.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rusers.spec	12 Jul 2006 08:04:17 -0000	1.22
+++ rusers.spec	9 Aug 2006 12:39:57 -0000	1.23
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 46.1
+Release: 47
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -26,6 +26,7 @@
 Patch11: netkit-rusers-0.17-rup-stack.patch
 Patch12: netkit-rusers-0.17-bigendian.patch
 Patch13: netkit-rusers-0.17-return.patch
+Patch14: netkit-rusers-0.17-procdiskstats.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: procps libselinux-devel
 
@@ -70,6 +71,7 @@
 %patch11 -p1 -b .rup-stack
 %patch12 -p1 -b .bigendian
 %patch13 -p1 -b .return
+%patch14 -p1 -b .procdiskstats
 
 %build
 cat > MCONFIG <<EOF
@@ -142,6 +144,9 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Wed Aug 09 2006 Phil Knirsch <pknirsch at redhat.com> 0.17-47
+- Modified the RHEL3 procpartitions patch to work on recent 2.6 kernels (#201839)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-46.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:51:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:51:50 -0400
Subject: rpms/mtools/FC-5 mtools.spec,1.21,1.22
Message-ID: <200608091251.k79CpoBG024373@cvs.devel.redhat.com>

Author: jkudrnac

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

Modified Files:
	mtools.spec 
Log Message:
* Wed Aug 09 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 3.9.10-1.3
- rebuilt to prevent corruption on the 13th character (#195528)



Index: mtools.spec
===================================================================
RCS file: /cvs/dist/rpms/mtools/FC-5/mtools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mtools.spec	11 Feb 2006 04:38:45 -0000	1.21
+++ mtools.spec	9 Aug 2006 12:51:41 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks.
 Name: mtools
 Version: 3.9.10
-Release: 1.2.1
+Release: 1.3
 License: GPL
 Group: Applications/System
 Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2
@@ -70,6 +70,9 @@
 %{_infodir}/*
 
 %changelog
+* Wed Aug 09 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 3.9.10-1.3
+- rebuilt to prevent corruption on the 13th character (#195528)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.9.10-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 12:54:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 08:54:37 -0400
Subject: rpms/mtools/FC-5 mtools.spec,1.22,1.23
Message-ID: <200608091254.k79CsbOo025165@cvs.devel.redhat.com>

Author: jkudrnac

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

Modified Files:
	mtools.spec 
Log Message:
added fc5 to release 



Index: mtools.spec
===================================================================
RCS file: /cvs/dist/rpms/mtools/FC-5/mtools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mtools.spec	9 Aug 2006 12:51:41 -0000	1.22
+++ mtools.spec	9 Aug 2006 12:54:35 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks.
 Name: mtools
 Version: 3.9.10
-Release: 1.3
+Release: 1.3.fc5
 License: GPL
 Group: Applications/System
 Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  9 13:02:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 09:02:20 -0400
Subject: rpms/mtools/FC-5 mtools.spec,1.23,1.24
Message-ID: <200608091302.k79D2Jp9027373@cvs.devel.redhat.com>

Author: jkudrnac

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

Modified Files:
	mtools.spec 
Log Message:
* Wed Aug 09 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 3.9.10-2
- rebuilt to prevent corruption on the 13th character (#195528)



Index: mtools.spec
===================================================================
RCS file: /cvs/dist/rpms/mtools/FC-5/mtools.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mtools.spec	9 Aug 2006 12:54:35 -0000	1.23
+++ mtools.spec	9 Aug 2006 13:02:15 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks.
 Name: mtools
 Version: 3.9.10
-Release: 1.3.fc5
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2
@@ -70,7 +70,7 @@
 %{_infodir}/*
 
 %changelog
-* Wed Aug 09 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 3.9.10-1.3
+* Wed Aug 09 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 3.9.10-2
 - rebuilt to prevent corruption on the 13th character (#195528)
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.9.10-1.2.1



From fedora-cvs-commits at redhat.com  Wed Aug  9 13:13:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 09:13:34 -0400
Subject: rpms/man-pages/devel man-pages.spec,1.49,1.50
Message-ID: <200608091313.k79DDY6E006704@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6691

Modified Files:
	man-pages.spec 
Log Message:
Try to update spec.



Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- man-pages.spec	9 Aug 2006 12:27:27 -0000	1.49
+++ man-pages.spec	9 Aug 2006 13:13:31 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
 Version: 2.39
-Release: 1
+Release: 2
 License: distributable
 Group: Documentation
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  9 14:05:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 10:05:59 -0400
Subject: rpms/log4j/devel log4j.spec, 1.20, 1.21 log4j-bz157585.patch, 1.2,
	NONE
Message-ID: <200608091405.k79E5x4M005027@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/log4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5007

Modified Files:
	log4j.spec 
Removed Files:
	log4j-bz157585.patch 
Log Message:
- Remove patch for BZ #157585 because it doesnt seem to be needed anymore.




Index: log4j.spec
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/log4j.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- log4j.spec	8 Aug 2006 20:44:09 -0000	1.20
+++ log4j.spec	9 Aug 2006 14:05:57 -0000	1.21
@@ -36,7 +36,7 @@
 
 Name:           log4j
 Version:        1.2.13
-Release:        3jpp.1
+Release:        3jpp.2
 Epoch:          0
 Summary:        Java logging package
 License:        Apache Software License
@@ -54,8 +54,6 @@
 Source7:        %{name}.catalog
 Patch0:         %{name}-logfactor5-userdir.patch
 Patch1:         %{name}-javadoc-xlink.patch
-#FIXME: Is this patch required?
-Patch2:         %{name}-bz157585.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant
 #Use classpathx-jaf for now
@@ -109,8 +107,6 @@
 %setup -q -n logging-%{name}-%{version}
 %patch0 -b .sav
 %patch1 -b .sav
-# FIXME: Is this patch still required?
-%patch2 -p1
 
 %{__perl} -pi -e 's/\r//g' LICENSE.txt
 
@@ -271,6 +267,9 @@
 
 
 %changelog
+* Wed Aug 09 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.2.13-3jpp.2
+- Remove patch for BZ #157585 because it doesnt seem to be needed anymore.
+
 * Tue Aug 08 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.2.13-3jpp.1
 - Re-sync with latest from JPP.
 - Update patch for BZ #157585 to apply cleanly.


--- log4j-bz157585.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  9 15:41:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 11:41:44 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.111,1.112
Message-ID: <200608091541.k79FfiL1023649@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23610

Modified Files:
	epiphany.spec 
Log Message:
bump


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- epiphany.spec	30 Jul 2006 14:58:53 -0000	1.111
+++ epiphany.spec	9 Aug 2006 15:41:32 -0000	1.112
@@ -9,7 +9,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.15.4
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -159,6 +159,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Aug  9 2006 Jesse Keating <jkeating at redhat.com> - 2.15.4-2
+- bump
+
 * Sat Jul 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 - Rebuild against firefox-devel



From fedora-cvs-commits at redhat.com  Wed Aug  9 16:14:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 12:14:51 -0400
Subject: rpms/NetworkManager/devel
	NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch,
	1.1, 1.2 NetworkManager.spec, 1.115, 1.116
Message-ID: <200608091614.k79GEpmd015859@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15779

Modified Files:
	NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch 
	NetworkManager.spec 
Log Message:
- actually make the patch in 0.7.0-0.cvs20060529.4 apply


NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch:
 NetworkManagerPolicy.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Index: NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch	4 Aug 2006 21:25:47 -0000	1.1
+++ NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch	9 Aug 2006 16:14:47 -0000	1.2
@@ -1,11 +1,15 @@
---- NetworkManager-0.7.0/src/NetworkManagerPolicy.c.dont-choose-inactive-wired-device	2006-08-04 17:10:44.000000000 -0400
-+++ NetworkManager-0.7.0/src/NetworkManagerPolicy.c	2006-08-04 17:10:53.000000000 -0400
-@@ -213,6 +213,8 @@ static NMDevice * nm_policy_auto_get_bes
+--- NetworkManager-0.7.0/src/NetworkManagerPolicy.c.dont-choose-inactive-wired-device	2006-05-28 16:02:48.000000000 -0400
++++ NetworkManager-0.7.0/src/NetworkManagerPolicy.c	2006-08-09 12:13:07.000000000 -0400
+@@ -212,8 +212,10 @@
+ 			if (!(caps & NM_DEVICE_CAP_CARRIER_DETECT))
  				continue;
  
- 			if (!link_active)
+-			if (link_active)
+-				prio += 1;
++			if (!link_active)
 +				continue;
-+			else
- 				prio += 1;
++
++			prio += 1;
  
  			if (nm_device_get_act_request (dev) && link_active)
+ 				prio += 1;


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- NetworkManager.spec	4 Aug 2006 21:25:47 -0000	1.115
+++ NetworkManager.spec	9 Aug 2006 16:14:47 -0000	1.116
@@ -22,6 +22,7 @@
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
 Patch0: NetworkManager-0.7.0-dbus-deprecated.patch
+Patch1: NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 PreReq:   chkconfig
@@ -118,6 +119,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .dbus-deprecated
+%patch1 -p1 -b .dont-choose-inactive-wired-device
 
 %build
 %configure \
@@ -216,6 +218,9 @@
 
 
 %changelog
+* Wed Aug  9 2006 Ray Strode <rstrode at redhat.com> - 0.7.0-0.cvs20060529.5
+- actually make the patch in 0.7.0-0.cvs20060529.4 apply
+
 * Fri Aug  4 2006 Ray Strode <rstrode at redhat.com> - 0.7.0-0.cvs20060529.4
 - Don't ever elect inactive wired devices (bug 194124).
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 16:18:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 12:18:22 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.116,1.117
Message-ID: <200608091618.k79GIM4U031998@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24218

Modified Files:
	NetworkManager.spec 
Log Message:
- actually make the patch in 0.7.0-0.cvs20060529.4 apply



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- NetworkManager.spec	9 Aug 2006 16:14:47 -0000	1.116
+++ NetworkManager.spec	9 Aug 2006 16:18:19 -0000	1.117
@@ -16,7 +16,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.7.0
-Release: 0%{?nm_cvs_version}.4
+Release: 0%{?nm_cvs_version}.5
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/



From fedora-cvs-commits at redhat.com  Wed Aug  9 16:29:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 12:29:36 -0400
Subject: rpms/cairo/devel cairo.spec,1.55,1.56
Message-ID: <200608091629.k79GTaHv013062@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	cairo.spec 
Log Message:
- add lame libXt-devel BuildReq to get things building again.
- small spec tweaks to follow conventions



Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- cairo.spec	9 Aug 2006 05:20:58 -0000	1.55
+++ cairo.spec	9 Aug 2006 16:29:32 -0000	1.56
@@ -4,7 +4,7 @@
 Summary:   A vector graphics library
 Name:      cairo
 Version:   1.2.2
-Release:   1
+Release:   2%{?dist}
 URL:       http://cairographics.org
 Source0:   http://cairographics.org/releases/%{name}-%{version}.tar.gz
 License:   LGPL/MPL
@@ -19,6 +19,7 @@
 BuildRequires: pkgconfig
 BuildRequires: libXrender-devel
 BuildRequires: libX11-devel
+BuildRequires: libXt-devel
 BuildRequires: libpng-devel
 BuildRequires: libxml2-devel
 BuildRequires: freetype-devel >= %{freetype_version}
@@ -52,6 +53,7 @@
 
 %build
 %configure --enable-warnings --disable-glitz --disable-quartz \
+        --enable-xlib \
 	--disable-atsui --disable-xcb --disable-win32 \
 	--disable-gtk-doc
 make
@@ -59,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall 
+make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/*.a
 
@@ -83,6 +85,10 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Wed Aug  9 2006 Ray Strode <rstrode at redhat.com> - 1.2.2-2
+- add lame libXt-devel BuildReq to get things building again.
+- small spec tweaks to follow conventions
+
 * Wed Aug  9 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.2.2-1
 - Update to 1.2.2
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 17:22:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 13:22:25 -0400
Subject: rpms/pciutils/devel pciutils-2.2.3-sata.patch, NONE,
	1.1 pciutils.spec, 1.41, 1.42
Message-ID: <200608091722.k79HMOge026125@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	pciutils.spec 
Added Files:
	pciutils-2.2.3-sata.patch 
Log Message:
- add sata storage class definitions


pciutils-2.2.3-sata.patch:
 header.h |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE pciutils-2.2.3-sata.patch ---
--- pciutils-2.2.3/lib/header.h.sata	2006-08-09 13:16:07.000000000 -0400
+++ pciutils-2.2.3/lib/header.h	2006-08-09 13:17:45.000000000 -0400
@@ -855,6 +855,8 @@
 #define PCI_CLASS_STORAGE_FLOPPY	0x0102
 #define PCI_CLASS_STORAGE_IPI		0x0103
 #define PCI_CLASS_STORAGE_RAID		0x0104
+#define PCI_CLASS_STORAGE_ATA		0x0105
+#define PCI_CLASS_STORAGE_SATA		0x0106
 #define PCI_CLASS_STORAGE_OTHER		0x0180
 
 #define PCI_BASE_CLASS_NETWORK		0x02


Index: pciutils.spec
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pciutils.spec	17 Jul 2006 23:57:56 -0000	1.41
+++ pciutils.spec	9 Aug 2006 17:22:22 -0000	1.42
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.3
-Release: 	3
+Release: 	4
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch0:		pciutils-strip.patch
 Patch2:		pciutils-2.1.10-scan.patch
@@ -9,6 +9,7 @@
 Patch6: 	pciutils-2.2.1-idpath.patch
 Patch7:		pciutils-2.1.99-gcc4.patch
 Patch8: 	pciutils-2.2.3-multilib.patch
+Patch9:		pciutils-2.2.3-sata.patch
 License:	GPL
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 Buildroot: 	%{_tmppath}/%{name}-%{version}-root
@@ -40,6 +41,7 @@
 %patch6 -p1 -b .idpath
 %patch7 -p1 -b .glibcmacros
 %patch8 -p1 -b .multilib
+%patch9 -p1 -b .sata
 
 %build
 make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata"
@@ -72,6 +74,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Aug  9 2006 Peter Jones <pjones at redhat.com> - 2.2.3-4
+- Add definitions for more pci storage classes
+
 * Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 2.2.3-3
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 17:45:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 13:45:35 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.50,1.51
Message-ID: <200608091745.k79HjZtH000798@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv769

Modified Files:
	kexec-tools.spec 
Log Message:
Add /var/crash dir to package so default kdump setup works w/o diskdumputils or netdump installed


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kexec-tools.spec	3 Aug 2006 18:07:36 -0000	1.50
+++ kexec-tools.spec	9 Aug 2006 17:45:32 -0000	1.51
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 41%{dist}.1
+Release: 42%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -103,6 +103,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/sysconfig
+mkdir -p -m755 $RPM_BUILD_ROOT/var/crash
 install -m 644 kdump.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/kdump
 install -m 755 kdump.init $RPM_BUILD_ROOT/etc/rc.d/init.d/kdump
 install -m 755 mkdumprd $RPM_BUILD_ROOT/sbin/mkdumprd
@@ -137,6 +138,7 @@
 %config(noreplace,missingok) /etc/sysconfig/kdump
 %config(noreplace,missingok) /etc/kdump.conf
 %config /etc/rc.d/init.d/kdump
+%dir /var/crash
 %ifarch %{ix86} x86_64
 %{_libdir}/kexec-tools/kexec_test
 %endif
@@ -144,7 +146,10 @@
 %doc COPYING
 %doc TODO
 
-%chaNgelog
+%changelog
+* Wed Aug 09 2006 Jarod Wilson <jwilson at redhat.com> - 1.101-42%{dist}
+- Add %dir /var/crash, so default kdump setup works
+
 * Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-41%{dist}.1
 - fix another silly makefile error for makedumpfile 
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 17:52:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 13:52:39 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.122, 1.123 kudzu.spec, 1.139,
	1.140 sources, 1.136, 1.137
Message-ID: <200608091752.k79Hqd4w018484@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18405

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
- update to 1.2.42-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- .cvsignore	28 Jul 2006 20:58:48 -0000	1.122
+++ .cvsignore	9 Aug 2006 17:52:36 -0000	1.123
@@ -1 +1 @@
-kudzu-1.2.41.tar.gz
+kudzu-1.2.42.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- kudzu.spec	28 Jul 2006 20:58:48 -0000	1.139
+++ kudzu.spec	9 Aug 2006 17:52:36 -0000	1.140
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.41
+Version: 1.2.42
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -11,7 +11,7 @@
 Requires: pam >= 0.74-17, hwdata
 Conflicts: netconfig < 0.8.18, kernel < 2.6.13
 Requires: hwdata >= 0.169-1, hal >= 0.2.96
-BuildPrereq: pciutils-devel >= 2.1.99.test8-3, python-devel python gettext
+BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -79,6 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Wed Aug  9 2006 Peter Jones <pjones at redhat.com> - 1.2.42-1
+- make pci storage classes for "ATA" and "SATA" work
+
 * Fri Jul 28 2006 Bill Nottingham <notting at redhat.com> - 1.2.41-1
 - disable DDC probe; let X sort it out (fixes #189602, #189131,
   #186538, #177456, #176869)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- sources	28 Jul 2006 20:58:49 -0000	1.136
+++ sources	9 Aug 2006 17:52:36 -0000	1.137
@@ -1 +1 @@
-26d66dcf1aeece30abbd76b1f9ba02ba  kudzu-1.2.41.tar.gz
+f2b6d392f5a37d684239300d3f9138b8  kudzu-1.2.42.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug  9 18:32:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 14:32:18 -0400
Subject: rpms/kudzu/devel kudzu.spec,1.140,1.141 sources,1.137,1.138
Message-ID: <200608091832.k79IWICi012656@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12625

Modified Files:
	kudzu.spec sources 
Log Message:
update


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- kudzu.spec	9 Aug 2006 17:52:36 -0000	1.140
+++ kudzu.spec	9 Aug 2006 18:32:13 -0000	1.141
@@ -79,7 +79,12 @@
 %{_includedir}/kudzu
 
 %changelog
-* Wed Aug  9 2006 Peter Jones <pjones at redhat.com> - 1.2.42-1
+* Wed Aug  9 2006 Bill Nottingham <notting at redhat.com> - 1.2.42-1
+- always insert aliases at head of list (<ajackson at redhat.com>)
+- don't parse videoaliases that don't end in .xinf (<ajackson at redhat.com>)
+- fix ppc build
+
+* Wed Aug  9 2006 Peter Jones <pjones at redhat.com>
 - make pci storage classes for "ATA" and "SATA" work
 
 * Fri Jul 28 2006 Bill Nottingham <notting at redhat.com> - 1.2.41-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- sources	9 Aug 2006 17:52:36 -0000	1.137
+++ sources	9 Aug 2006 18:32:13 -0000	1.138
@@ -1 +1 @@
-f2b6d392f5a37d684239300d3f9138b8  kudzu-1.2.42.tar.gz
+14530af489f5a1cccabaecf569402349  kudzu-1.2.42.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug  9 18:42:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 14:42:59 -0400
Subject: rpms/kernel/devel linux-2.6-lockdep-fixes.patch, 1.16,
	1.17 kernel-2.6.spec, 1.2532, 1.2533
Message-ID: <200608091842.k79IgxI1015145@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-lockdep-fixes.patch kernel-2.6.spec 
Log Message:
Another lockdep fix for networking.

linux-2.6-lockdep-fixes.patch:
 a/net/ipv6/icmp.c                             |   23 ++++++++++++++++++
 b/net/ipv6/addrconf.c                         |    4 +--
 linux-2.6.17-mm6/include/net/sock.h           |   33 +++++++++++++++++++++++---
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++++++++-
 linux-2.6.18-rc1/net/socket.c                 |    8 +++++-
 6 files changed, 76 insertions(+), 10 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-lockdep-fixes.patch	3 Aug 2006 17:28:17 -0000	1.16
+++ linux-2.6-lockdep-fixes.patch	9 Aug 2006 18:42:54 -0000	1.17
@@ -388,3 +388,60 @@
  		/* Enough space for 2 64K ICMP packets, including
  		 * sk_buff struct overhead.
 _
+From: Herbert Xu <herbert at gondor.apana.org.au>
+To: davem at davemloft.net, davej at redhat.com (Dave Jones)
+Subject: Re: another networking lockdep trace.
+Cc: netdev at vger.kernel.org, yoshfuji at linux-ipv6.org, mingo at elte.hu,
+        arjan at linux.intel.com
+In-Reply-To: <20060808184157.GB4880 at redhat.com>
+Message-Id: <E1GAmbn-0006Ts-00 at gondolin.me.apana.org.au>
+Date: Wed, 09 Aug 2006 21:52:23 +1000
+
+Dave Jones <davej at redhat.com> wrote:
+>
+> Aug  7 06:47:44 localhost kernel: inconsistent {in-softirq-W} -> {softirq-on-W}
+> usage.
+> Aug  7 06:47:44 localhost kernel: ip/2617 [HC0[0]:SC0[0]:HE1:SE1] takes:
+> Aug  7 06:47:44 localhost kernel:  (&ifa->lock){-+..}, at: [<f90a3836>]
+> inet6_addr_add+0xf8/0x13e [ipv6]
+> Aug  7 06:47:44 localhost kernel: {in-softirq-W} state was registered at:
+> Aug  7 06:47:44 localhost kernel:   [<c043bfb9>] lock_acquire+0x4b/0x6a
+> Aug  7 06:47:44 localhost kernel:   [<c060f428>] _spin_lock_bh+0x1e/0x2d
+> Aug  7 06:47:44 localhost kernel:   [<f90a4757>] addrconf_dad_timer+0x3a/0xe2 [ipv6]
+
+Nice.  This is a bug introduced less than 2 weeks ago.  We're finally
+getting some dividends from the lock validator :) Thanks guys!
+
+[IPV6]: The ifa lock is a BH lock
+
+The ifa lock is expected to be taken in BH context (by addrconf timers)
+so we must disable BH when accessing it from user context.
+
+Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
+
+Cheers,
+-- 
+Visit Openswan at http://www.openswan.org/
+Email: Herbert Xu ~{PmV>HI~} <herbert at gondor.apana.org.au>
+Home Page: http://gondor.apana.org.au/~herbert/
+PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
+--
+diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
+index 8ea1e36..0c5042e 100644
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -1909,11 +1909,11 @@ static int inet6_addr_add(int ifindex, s
+ 	ifp = ipv6_add_addr(idev, pfx, plen, scope, ifa_flags);
+ 
+ 	if (!IS_ERR(ifp)) {
+-		spin_lock(&ifp->lock);
++		spin_lock_bh(&ifp->lock);
+ 		ifp->valid_lft = valid_lft;
+ 		ifp->prefered_lft = prefered_lft;
+ 		ifp->tstamp = jiffies;
+-		spin_unlock(&ifp->lock);
++		spin_unlock_bh(&ifp->lock);
+ 
+ 		addrconf_dad_start(ifp, 0);
+ 		in6_ifa_put(ifp);
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2532
retrieving revision 1.2533
diff -u -r1.2532 -r1.2533
--- kernel-2.6.spec	8 Aug 2006 20:22:48 -0000	1.2532
+++ kernel-2.6.spec	9 Aug 2006 18:42:54 -0000	1.2533
@@ -1693,6 +1693,9 @@
 %endif
 
 %changelog
+* Wed Aug  9 2006 Dave Jones <davej at redhat.com>
+- Another lockdep fix for networking.
+
 * Tue Aug  8 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace/ptrace interactions with SELinux.
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 18:43:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 14:43:59 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2533,1.2534
Message-ID: <200608091843.k79Ihxqa015387@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Change some hotplug PCI options.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2533
retrieving revision 1.2534
diff -u -r1.2533 -r1.2534
--- kernel-2.6.spec	9 Aug 2006 18:42:54 -0000	1.2533
+++ kernel-2.6.spec	9 Aug 2006 18:43:56 -0000	1.2534
@@ -1695,6 +1695,7 @@
 %changelog
 * Wed Aug  9 2006 Dave Jones <davej at redhat.com>
 - Another lockdep fix for networking.
+- Change some hotplug PCI options.
 
 * Tue Aug  8 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace/ptrace interactions with SELinux.



From fedora-cvs-commits at redhat.com  Wed Aug  9 18:43:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 14:43:59 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.239,
	1.240 config-x86-generic, 1.63, 1.64 config-x86_64-generic,
	1.50, 1.51
Message-ID: <200608091843.k79Ihxqs015395@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
Log Message:
Change some hotplug PCI options.


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- config-generic	4 Aug 2006 21:09:31 -0000	1.239
+++ config-generic	9 Aug 2006 18:43:56 -0000	1.240
@@ -245,9 +245,8 @@
 CONFIG_ISAPNP=y
 # CONFIG_PNPBIOS is not set
 
-# FIXME: Broken in 2.6.18rc1git3
-# CONFIG_HOTPLUG_PCI_ACPI is not set
-# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
 
 #
 # Block devices


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- config-x86-generic	15 Jul 2006 06:49:38 -0000	1.63
+++ config-x86-generic	9 Aug 2006 18:43:57 -0000	1.64
@@ -143,7 +143,7 @@
 CONFIG_ACPI_IBM=m
 CONFIG_PNPACPI=y
 CONFIG_ACPI_DOCK=m
-CONFIG_ACPI_IBM_DOCK=y
+# CONFIG_ACPI_IBM_DOCK is not set
 CONFIG_ACPI_SBS=m
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
 # CONFIG_ACPI_HOTKEY is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- config-x86_64-generic	15 Jul 2006 06:49:38 -0000	1.50
+++ config-x86_64-generic	9 Aug 2006 18:43:57 -0000	1.51
@@ -76,7 +76,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
-CONFIG_ACPI_IBM_DOCK=y
+# CONFIG_ACPI_IBM_DOCK is not set
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_SBS=m
@@ -92,7 +92,7 @@
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
-# CONFIG_HOTPLUG_PCI_SHPC is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
 CONFIG_HPET=y



From fedora-cvs-commits at redhat.com  Wed Aug  9 18:50:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 14:50:34 -0400
Subject: rpms/kudzu/devel sources,1.138,1.139
Message-ID: <200608091850.k79IoYe8031899@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31800

Modified Files:
	sources 
Log Message:
update


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- sources	9 Aug 2006 18:32:13 -0000	1.138
+++ sources	9 Aug 2006 18:50:31 -0000	1.139
@@ -1 +1 @@
-14530af489f5a1cccabaecf569402349  kudzu-1.2.42.tar.gz
+b0b65938cd87ccfb2c6fd790baccf052  kudzu-1.2.42.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug  9 19:08:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 15:08:47 -0400
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.14,
	1.15 libsemanage.spec, 1.100, 1.101
Message-ID: <200608091908.k79J8lma004867@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Wed Aug 9 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.13-2
- Change netfilter stuff to be non-fatal so update can proceed.


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

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libsemanage-rhat.patch	16 Jun 2006 17:38:35 -0000	1.14
+++ libsemanage-rhat.patch	9 Aug 2006 19:08:44 -0000	1.15
@@ -1,25 +1,17 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/conf-parse.y libsemanage-1.6.8/src/conf-parse.y
---- nsalibsemanage/src/conf-parse.y	2006-06-05 13:20:27.000000000 -0400
-+++ libsemanage-1.6.8/src/conf-parse.y	2006-06-16 13:27:59.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <selinux/selinux.h>
- #include <semanage/handle.h>
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.6.13/src/semanage_store.c
+--- nsalibsemanage/src/semanage_store.c	2006-08-03 11:22:25.000000000 -0400
++++ libsemanage-1.6.13/src/semanage_store.c	2006-08-09 15:03:06.000000000 -0400
+@@ -1072,8 +1072,11 @@
  
-+#include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -187,7 +188,12 @@
- 	if ((conf->setfiles = calloc(1, sizeof(*(current_conf->setfiles)))) == NULL) {
- 		return -1;
- 	}
--	if ((conf->setfiles->path = strdup("/sbin/setfiles")) == NULL ||
-+	if (access("/sbin/setfiles",X_OK) == 0) {
-+		conf->setfiles->path = strdup("/sbin/setfiles");
-+	} else {
-+		conf->setfiles->path = strdup("/usr/sbin/setfiles");
-+	}
-+	if ((conf->setfiles->path == NULL) ||
- 	    (conf->setfiles->args = strdup("-q -c $@ $<")) == NULL) {
- 		return -1;
+ 	snprintf(store_nc, PATH_MAX, "%s%s", storepath, running_nc);
+ 	if (semanage_copy_file(active_nc, store_nc, sh->conf->file_mode) == -1) {
+-		ERR(sh, "Could not copy %s to %s.", active_nc, store_nc);
+-		goto cleanup;
++		INFO(sh, "Could not copy %s to %s.", active_nc, store_nc);
++		/* 
++		   ERR(sh, "Could not copy %s to %s.", active_nc, store_nc);
++		  goto cleanup;
++		*/
  	}
+ 
+ 	if (!sh->do_reload)


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- libsemanage.spec	6 Aug 2006 00:00:19 -0000	1.100
+++ libsemanage.spec	9 Aug 2006 19:08:44 -0000	1.101
@@ -3,10 +3,11 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.6.13
-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} 
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -75,6 +77,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 9 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.13-2
+- Change netfilter stuff to be non-fatal so update can proceed.
+
 * Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.13-1
 - Upgrade to latest from NSA
 	* Merged netfilter contexts support from Chris PeBenito.



From fedora-cvs-commits at redhat.com  Wed Aug  9 19:11:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 15:11:55 -0400
Subject: rpms/SysVinit/devel sysvinit-2.86-godot.patch, NONE,
	1.1 SysVinit.spec, 1.47, 1.48
Message-ID: <200608091911.k79JBtfV005586@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5489

Modified Files:
	SysVinit.spec 
Added Files:
	sysvinit-2.86-godot.patch 
Log Message:
preserve waiting state across re-exec (#143289, rhel bugs #199305,
#201146)


sysvinit-2.86-godot.patch:
 init.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE sysvinit-2.86-godot.patch ---
--- sysvinit-2.86/src/init.c.wait	2006-08-09 15:05:01.000000000 -0400
+++ sysvinit-2.86/src/init.c	2006-08-09 15:05:59.000000000 -0400
@@ -187,6 +187,7 @@
 	{"RU",RUNNING},
 	{"DE",DEMAND},
 	{"XD",XECUTED},
+	{"WT",WAITING},
 	{NULL,0}
 };
 


Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- SysVinit.spec	9 Aug 2006 01:02:33 -0000	1.47
+++ SysVinit.spec	9 Aug 2006 19:11:52 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -20,6 +20,8 @@
 Patch13: sysvinit-2.86-single.patch
 Patch14: sysvinit-2.86-maxproclen.patch
 Patch15: sysvinit-2.86-ipv6.patch
+Patch16: sysvinit-2.86-quiet.patch
+Patch17: sysvinit-2.86-godot.patch
 Patch20: sysvinit-selinux.patch
 Source1: change_console.c
 Source2: change_console.8
@@ -71,6 +73,10 @@
 %patch14 -p1 -b .maxproclen
 # ipv6 support in last
 %patch15 -p1 -b .ipv6
+# Be less verbose when booted with 'quiet'
+%patch16 -p1 -b .quiet
+# Preserve 'waiting' across re-exec (#199305, #201146, #143289)
+%patch17 -p1 -b .godot
 # SELinux support for init - loading policy, etc.
 %patch20 -p1 -b .selinux
 
@@ -130,6 +136,10 @@
 /dev/initctl
 
 %changelog
+* Wed Aug  9 2006 Bill Nottingham <notting at redhat.com> - 2.86-8
+- preserve 'WAITING' across re-exec (#143289, others)
+- actually apply quiet patch
+
 * Tue Aug  8 2006 Bill Nottingham <notting at redhat.com> - 2.86-7
 - be slightly less verbose when booted with 'quiet'
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 19:14:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 15:14:27 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch, 1.4,
	1.5 selinux-policy.spec, 1.247, 1.248
Message-ID: <200608091914.k79JERsp006358@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060802.patch selinux-policy.spec 
Log Message:
* Wed Aug 9 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-2
- More fixes for strict policy


policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/usermanage.te        |    4 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.te          |    2 
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 +++++++++++
 modules/kernel/terminal.if         |   19 ++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cron.te           |    1 
 modules/services/cups.te           |    8 -
 modules/services/cyrus.te          |    1 
 modules/services/dbus.if           |    6 
 modules/services/ldap.te           |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    4 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  105 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   25 +++
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   69 ++++++++++
 modules/services/xserver.te        |   19 ++
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/init.te             |    2 
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/miscfiles.if        |   18 ++
 modules/system/mount.te            |    3 
 modules/system/selinuxutil.te      |   11 +
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  236 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   50 +++----
 modules/system/xen.if              |   38 +++++
 modules/system/xen.te              |   26 +++-
 64 files changed, 796 insertions(+), 169 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- policy-20060802.patch	8 Aug 2006 20:40:36 -0000	1.4
+++ policy-20060802.patch	9 Aug 2006 19:14:24 -0000	1.5
@@ -186,7 +186,7 @@
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in	2006-08-09 12:58:00.000000000 -0400
 @@ -73,6 +73,7 @@
  network_port(dhcpc, udp,68,s0)
  network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
@@ -204,6 +204,14 @@
  network_port(i18n_input, tcp,9010,s0)
  network_port(imaze, tcp,5323,s0, udp,5323,s0)
  network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
+@@ -126,6 +127,7 @@
+ network_port(rsh, tcp,514,s0)
+ network_port(rsync, tcp,873,s0, udp,873,s0)
+ network_port(smbd, tcp,137-139,s0, tcp,445,s0)
++network_port(lmtp, tcp,24,s0, udp,24,s0)
+ network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
+ network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
+ network_port(spamd, tcp,783,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.6/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/kernel/devices.te	2006-08-08 16:15:43.000000000 -0400
@@ -515,6 +523,17 @@
  	tunable_policy(`fcron_crond', `
  		# fcron wants an instant update of a crontab change for the administrator
  		# also crontab does a security check for crontab -u
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.6/policy/modules/services/cron.te
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cron.te	2006-08-09 09:15:00.000000000 -0400
+@@ -173,6 +173,7 @@
+ 	allow crond_t crond_tmp_t:dir create_dir_perms;
+ 	allow crond_t crond_tmp_t:file create_file_perms;
+ 	files_tmp_filetrans(crond_t, crond_tmp_t, { file dir })
++	files_pid_filetrans(system_crond_t,crond_var_run_t,file)
+ 
+ 	mta_send_mail(crond_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.6/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/services/cups.te	2006-08-08 16:15:43.000000000 -0400
@@ -553,10 +572,29 @@
  
  sysnet_read_config(cupsd_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.6/policy/modules/services/cyrus.te
+--- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cyrus.te	2006-08-09 12:58:45.000000000 -0400
+@@ -69,6 +69,7 @@
+ corenet_udp_sendrecv_all_ports(cyrus_t)
+ corenet_tcp_bind_all_nodes(cyrus_t)
+ corenet_tcp_bind_mail_port(cyrus_t)
++corenet_tcp_bind_lmtp_port(cyrus_t)
+ corenet_tcp_bind_pop_port(cyrus_t)
+ corenet_tcp_connect_all_ports(cyrus_t)
+ corenet_sendrecv_mail_server_packets(cyrus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.6/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/dbus.if	2006-08-08 16:15:43.000000000 -0400
-@@ -171,6 +171,11 @@
++++ serefpolicy-2.3.6/policy/modules/services/dbus.if	2006-08-09 11:12:25.000000000 -0400
+@@ -123,6 +123,7 @@
+ 	selinux_compute_relabel_context($1_dbusd_t)
+ 	selinux_compute_user_contexts($1_dbusd_t)
+ 
++	corecmd_bin_domtrans($1_dbusd_t, $1_t)
+ 	corecmd_list_bin($1_dbusd_t)
+ 	corecmd_read_bin_symlinks($1_dbusd_t)
+ 	corecmd_read_bin_files($1_dbusd_t)
+@@ -171,6 +172,11 @@
  		xserver_use_xdm_fds($1_dbusd_t)
  		xserver_rw_xdm_pipes($1_dbusd_t)
  	')
@@ -937,7 +975,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.6/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-08 14:59:36.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/xserver.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/xserver.if	2006-08-09 11:16:27.000000000 -0400
 @@ -45,7 +45,6 @@
  	allow $1_xserver_t self:capability { dac_override fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
  	dontaudit $1_xserver_t self:capability chown;
@@ -968,7 +1006,32 @@
  		auth_search_pam_console_data($1_xserver_t)
  	')
  
-@@ -1103,7 +1108,47 @@
+@@ -1051,6 +1056,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Read xdm temporary files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit
++##	</summary>
++## </param>
++#
++interface(`xserver_read_xdm_tmp_files',`
++	gen_require(`
++		type xdm_tmp_t;
++	')
++
++	allow $1 xdm_tmp_t:file { getattr read };
++')
++
++########################################
++## <summary>
+ ##	Kill XDM X servers
+ ## </summary>
+ ## <param name="domain">
+@@ -1103,7 +1126,47 @@
  	')
  
  	files_search_tmp($1)
@@ -1019,17 +1082,19 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.6/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/xserver.te	2006-08-08 16:15:43.000000000 -0400
-@@ -81,7 +81,7 @@
++++ serefpolicy-2.3.6/policy/modules/services/xserver.te	2006-08-09 11:18:55.000000000 -0400
+@@ -81,15 +81,19 @@
  #
  
  allow xdm_t self:capability { setgid setuid sys_resource kill sys_tty_config mknod chown dac_override dac_read_search fowner fsetid ipc_owner sys_nice sys_rawio net_bind_service };
 -allow xdm_t self:process { setexec setpgid setsched setrlimit signal_perms setkeycreate };
 +allow xdm_t self:process { setexec setpgid getsched setsched setrlimit signal_perms setkeycreate };
  allow xdm_t self:fifo_file rw_file_perms;
++allow xdm_t self:key link;
  allow xdm_t self:shm create_shm_perms;
  allow xdm_t self:sem create_sem_perms;
-@@ -89,7 +89,9 @@
+ allow xdm_t self:unix_stream_socket { connectto create_stream_socket_perms };
++allow xdm_t self:netlink_route_socket r_netlink_socket_perms;
  allow xdm_t self:unix_dgram_socket create_socket_perms;
  allow xdm_t self:tcp_socket create_stream_socket_perms;
  allow xdm_t self:udp_socket create_socket_perms;
@@ -1040,15 +1105,16 @@
  
  # Supress permission check on .ICE-unix
  dontaudit xdm_t ice_tmp_t:dir { getattr setattr };
-@@ -106,6 +108,7 @@
+@@ -106,6 +110,8 @@
  
  kernel_read_system_state(xdm_t)
  kernel_read_kernel_sysctls(xdm_t)
++kernel_read_net_sysctls(xdm_t)
 +kernel_read_network_state(xdm_t)
  
  corecmd_exec_shell(xdm_t)
  corecmd_exec_bin(xdm_t)
-@@ -154,6 +157,7 @@
+@@ -154,6 +160,7 @@
  domain_dontaudit_read_all_domains_state(xdm_t)
  
  files_read_etc_files(xdm_t)
@@ -1056,7 +1122,16 @@
  files_read_etc_runtime_files(xdm_t)
  files_exec_etc_files(xdm_t)
  files_list_mnt(xdm_t)
-@@ -257,7 +261,7 @@
+@@ -180,6 +187,8 @@
+ 
+ auth_manage_pam_pid(xdm_t)
+ auth_manage_pam_console_data(xdm_t)
++auth_rw_faillog(xdm_t)
++auth_write_login_records(xdm_t)
+ 
+ init_use_script_ptys(xdm_t)
+ # Run telinit->init to shutdown.
+@@ -257,7 +266,7 @@
  	allow xdm_t xdm_xserver_tmp_t:sock_file unlink;
  	allow xdm_t xdm_xserver_tmp_t:file unlink;
  
@@ -1065,7 +1140,7 @@
  	allow xdm_t xserver_log_t:file manage_file_perms;
  	allow xdm_t xserver_log_t:fifo_file manage_file_perms;
  	logging_log_filetrans(xdm_t,xserver_log_t,file)
-@@ -284,7 +288,7 @@
+@@ -284,7 +293,7 @@
  ')
  
  ifdef(`targeted_policy',`
@@ -1074,7 +1149,7 @@
  	unconfined_domain(xdm_t)
  	unconfined_domtrans(xdm_t)
  	userdom_generic_user_home_dir_filetrans_generic_user_home_content(xdm_t, {file dir })
-@@ -412,7 +416,7 @@
+@@ -412,7 +421,7 @@
  ')
  
  ifdef(`targeted_policy',`
@@ -1136,14 +1211,28 @@
  ')
  
  ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.6/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/init.te	2006-08-09 09:15:19.000000000 -0400
+@@ -361,6 +361,8 @@
+ logging_read_audit_config(initrc_t)
+ 
+ miscfiles_read_localization(initrc_t)
++miscfiles_write_localization(initrc_t)
++
+ # slapd needs to read cert files from its initscript
+ miscfiles_read_certs(initrc_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.6/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/libraries.fc	2006-08-08 16:15:43.000000000 -0400
-@@ -200,7 +200,7 @@
++++ serefpolicy-2.3.6/policy/modules/system/libraries.fc	2006-08-09 14:03:56.000000000 -0400
+@@ -199,8 +199,8 @@
+ /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/libavcodec-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/libavcodec-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 -/usr/lib(64)?/libavutil-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libavcodec.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libavutil.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -1233,6 +1322,34 @@
  /etc/pki(/.*)?			gen_context(system_u:object_r:cert_t,s0)
  
  #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.6/policy/modules/system/miscfiles.if
+--- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/miscfiles.if	2006-08-09 09:15:31.000000000 -0400
+@@ -116,6 +116,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Allow process to write localization info
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`miscfiles_write_localization',`
++	gen_require(`
++		type locale_t;
++	')
++
++	allow $1 locale_t:file rw_file_perms;
++')
++
++########################################
++## <summary>
+ ##	Allow process to read legacy time localization info
+ ## </summary>
+ ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.6/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/system/mount.te	2006-08-08 16:38:58.000000000 -0400
@@ -1255,7 +1372,7 @@
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.6/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/selinuxutil.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/selinuxutil.te	2006-08-09 11:02:28.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -1275,17 +1392,19 @@
  seutil_search_default_contexts(semanage_t)
  seutil_manage_file_contexts(semanage_t)
  seutil_manage_selinux_config(semanage_t)
-@@ -613,6 +618,10 @@
+@@ -611,6 +616,12 @@
+ 	# Handle pp files created in homedir and /tmp
+ 	files_read_generic_tmp_files(semanage_t)
  	userdom_read_generic_user_home_content_files(semanage_t)
++',`
++	ifdef(`enable_mls',`
++		userdom_read_user_tmp_files(secadm, semanage_t)
++	',`
++		userdom_read_user_tmp_files(sysadm, semanage_t)
++	')
  ')
  
-+ifdef(`enable_mls',`
-+	userdom_read_user_tmp_files(secadm, semanage_t)
-+')
-+
  optional_policy(`
- 	nscd_socket_use(semanage_t)
- ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.6/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/system/udev.fc	2006-08-08 16:15:43.000000000 -0400
@@ -1296,6 +1415,17 @@
  /dev/\.udevdb	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.6/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/udev.te	2006-08-09 09:15:39.000000000 -0400
+@@ -129,6 +129,7 @@
+ mls_file_upgrade(udev_t)
+ mls_file_downgrade(udev_t)
+ mls_process_write_down(udev_t)
++mcs_ptrace_all(udev_t)
+ 
+ modutils_domtrans_insmod(udev_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.6/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/system/unconfined.if	2006-08-08 16:15:43.000000000 -0400
@@ -1330,7 +1460,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.6/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/userdomain.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/userdomain.if	2006-08-09 14:04:54.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1580,15 +1710,18 @@
  		canna_stream_connect($1_t)
  	')
  
-@@ -472,6 +518,7 @@
+@@ -470,8 +516,10 @@
+ 		xserver_stream_connect_xdm($1_t)
+ 		# certain apps want to read xdm.pid file
  		xserver_read_xdm_pid($1_t)
++		xserver_read_xdm_tmp_files($1_t)
  		# gnome-session creates socket under /tmp/.ICE-unix/
  		xserver_create_xdm_tmp_sockets($1_t)
 +		xserver_create_ice_tmp_sockets($1_t)
  	')
  ')
  
-@@ -501,6 +548,7 @@
+@@ -501,6 +549,7 @@
  
  	# Inherit rules for ordinary users.
  	base_user_template($1)
@@ -1596,7 +1729,7 @@
  
  	typeattribute $1_t unpriv_userdomain;
  	domain_interactive_fd($1_t)
-@@ -521,9 +569,6 @@
+@@ -521,9 +570,6 @@
  	# Local policy
  	#
  
@@ -1606,7 +1739,7 @@
  	# Rules used to associate a homedir as a mountpoint
  	allow $1_home_t self:filesystem associate;
  	allow $1_file_type $1_home_t:filesystem associate;
-@@ -535,10 +580,6 @@
+@@ -535,10 +581,6 @@
  	allow privhome $1_home_t:sock_file create_file_perms;
  	allow privhome $1_home_t:fifo_file create_file_perms;
  	type_transition privhome $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
@@ -1617,7 +1750,7 @@
  	dev_read_sysfs($1_t)
  
  	corecmd_exec_all_executables($1_t)
-@@ -546,11 +587,8 @@
+@@ -546,11 +588,8 @@
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
  
@@ -1630,7 +1763,7 @@
  	# Read directories and files with the readable_t type.
  	# This type is a general type for "world"-readable files.
  	files_list_world_readable($1_t)
-@@ -558,8 +596,6 @@
+@@ -558,8 +597,6 @@
  	files_read_world_readable_symlinks($1_t)
  	files_read_world_readable_pipes($1_t)
  	files_read_world_readable_sockets($1_t)
@@ -1639,7 +1772,25 @@
  
  	init_read_utmp($1_t)
  	# The library functions always try to open read-write first,
-@@ -748,6 +784,7 @@
+@@ -665,6 +702,8 @@
+ 
+ 	# do not audit read on disk devices
+ 	dontaudit $1_t { removable_device_t fixed_disk_device_t }:blk_file read;
++	dontaudit $1_t sysadm_home_t:file { read append };
++	userdom_dontaudit_append_sysadm_home_content_files($1_t)
+ 
+ 	ifdef(`xdm.te', `
+ 		allow xdm_t $1_home_t:lnk_file read;
+@@ -701,8 +740,6 @@
+ 	# Do not audit write denials to /etc/ld.so.cache.
+ 	dontaudit $1_t ld_so_cache_t:file write;
+ 
+-	dontaudit $1_t sysadm_home_t:file { read append };
+-
+ 	allow $1_t initrc_t:fifo_file write;
+ 	') dnl end TODO
+ ')
+@@ -748,6 +785,7 @@
  
  	# Inherit rules for ordinary users.
  	base_user_template($1)
@@ -1647,7 +1798,7 @@
  
  	typeattribute $1_t privhome;
  	domain_obj_id_change_exemption($1_t)
-@@ -783,11 +820,6 @@
+@@ -783,11 +821,6 @@
  
  	allow $1_t self:netlink_audit_socket nlmsg_readpriv;
  
@@ -1659,7 +1810,7 @@
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -855,6 +887,7 @@
+@@ -855,6 +888,7 @@
  	domain_getattr_all_sockets($1_t)
  
  	files_exec_usr_src_files($1_t)
@@ -1667,7 +1818,7 @@
  
  	init_rw_initctl($1_t)
  
-@@ -3408,6 +3441,25 @@
+@@ -3408,6 +3442,25 @@
  
  ########################################
  ## <summary>
@@ -1685,7 +1836,7 @@
 +		type sysadm_home_t;
 +	')
 +
-+	dontaudit $1 sysadm_home_t:file append;
++	dontaudit $1 sysadm_home_t:file ra_file_perms;
 +')
 +
 +########################################
@@ -1693,7 +1844,7 @@
  ##	Read files in the staff users home directory.
  ## </summary>
  ## <param name="domain">
-@@ -4128,7 +4180,7 @@
+@@ -4128,7 +4181,7 @@
  	gen_require(`
  		type user_home_dir_t;
  	')
@@ -1702,7 +1853,7 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-@@ -4789,3 +4841,34 @@
+@@ -4789,3 +4842,34 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- selinux-policy.spec	8 Aug 2006 20:40:36 -0000	1.247
+++ selinux-policy.spec	9 Aug 2006 19:14:24 -0000	1.248
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.6
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -37,7 +37,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
-PreReq: policycoreutils >= %{POLICYCOREUTILSVER}
+PreReq: policycoreutils >= %{POLICYCOREUTILSVER} libsemanage > 1.6.13-1
 Obsoletes: policy 
 
 %description 
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Wed Aug 9 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-2
+- More fixes for strict policy
+
 * Tue Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-1
 - Quiet down anaconda audit messages
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 19:24:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 15:24:48 -0400
Subject: rpms/xorg-x11-drv-amd/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xorg-x11-drv-amd.spec, 1.1, 1.2
Message-ID: <200608091924.k79JOmwH024712@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-drv-amd.spec 
Log Message:
auto-import xorg-x11-drv-amd-0.0-1.20060809git.fc6 on branch devel from xorg-x11-drv-amd-0.0-1.20060809git.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Jul 2006 21:19:56 -0000	1.2
+++ .cvsignore	9 Aug 2006 19:24:45 -0000	1.3
@@ -1 +1 @@
-xf86-video-amd-0.0-git20060707.tar.bz2
+xf86-video-amd-0.0-git20060809.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Jul 2006 21:19:56 -0000	1.2
+++ sources	9 Aug 2006 19:24:45 -0000	1.3
@@ -1 +1 @@
-5126aaf38eafc636defb21b1a79e02e0  xf86-video-amd-0.0-git20060707.tar.bz2
+7c50fa68151a5f6f081f99df1b4b3ebf  xf86-video-amd-0.0-git20060809.tar.bz2


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-amd.spec	11 Jul 2006 21:19:56 -0000	1.1
+++ xorg-x11-drv-amd.spec	9 Aug 2006 19:24:45 -0000	1.2
@@ -2,7 +2,7 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20060707
+%define gitdate 20060809
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
@@ -18,8 +18,12 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 BuildRequires: gcc >= 3.4.0
+%if "%{dist}" == ".fc5"
+BuildRequires: xorg-x11-server-sdk
+%else
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
+%endif
 
 Requires:  xorg-x11-server-Xorg >= 1.1.0
 
@@ -31,7 +35,7 @@
 %setup -q -n %{tarball}
 
 %build
-%configure --disable-static
+./autogen.sh --disable-static --libdir=%{_libdir} --mandir=%{_mandir}
 make
 
 %install
@@ -58,5 +62,9 @@
 %{_mandir}/man4/amd.4*
 
 %changelog
+* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 0.0-1.git20060809.fc6
+- git update: olpc dcon support, Xv fixes.
+- Attempted support for building against FC5.
+
 * Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 0.0-0.git20060706.fc6
 - Initial spec (from -nsc) and git snapshot.



From fedora-cvs-commits at redhat.com  Wed Aug  9 19:34:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 15:34:11 -0400
Subject: rpms/xorg-x11-drv-amd/devel xorg-x11-drv-amd.spec,1.2,1.3
Message-ID: <200608091934.k79JYBCo004615@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-amd.spec 
Log Message:
* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 0.0-1.git20060809.fc6
- git update: olpc dcon support, Xv fixes.
- Attempted support for building against FC5.



Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-amd.spec	9 Aug 2006 19:24:45 -0000	1.2
+++ xorg-x11-drv-amd.spec	9 Aug 2006 19:34:07 -0000	1.3
@@ -18,6 +18,8 @@
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: gcc >= 3.4.0
 %if "%{dist}" == ".fc5"
 BuildRequires: xorg-x11-server-sdk



From fedora-cvs-commits at redhat.com  Wed Aug  9 19:38:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 15:38:35 -0400
Subject: rpms/frysk/devel .cvsignore, 1.23, 1.24 frysk.spec, 1.82,
	1.83 sources, 1.23, 1.24
Message-ID: <200608091938.k79JcZsd004803@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4786

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
- New upstream version, incorporates both the patches.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	25 Jul 2006 10:33:35 -0000	1.23
+++ .cvsignore	9 Aug 2006 19:38:32 -0000	1.24
@@ -1 +1 @@
-frysk-0.0.1.2006.07.25.rh1.tar.bz2
+frysk-0.0.1.2006.08.09.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- frysk.spec	2 Aug 2006 16:57:13 -0000	1.82
+++ frysk.spec	9 Aug 2006 19:38:32 -0000	1.83
@@ -1,16 +1,12 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.07.25.rh1
-Release:	4%{?dist}
+Version:	0.0.1.2006.08.09.rh1
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
 
-# Disable the tests which fail:
-Patch0:		frysk-20060725-xfail.patch
-Patch1:		frysk-20060725-xfail-x86_64.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	libgtk-java >= 2.8.4
@@ -29,11 +25,17 @@
 BuildRequires:	libgconf-java-devel
 BuildRequires:	libvte-java-devel >= 0.12.0
 BuildRequires:  vte-devel >= 0.12.1
-BuildRequires:  dogtail >= 0.5.2
 BuildRequires:  xmlto
 BuildRequires:  sharutils
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:  ghostscript
+BuildRequires:  dogtail >= 0.5.2
+
+# FIXME:
+# Needed by dogtail-run-headless; should be Required by dogtail:
+BuildRequires:	xorg-x11-xinit
+# Needed by "dogtail-run-headless -n":
+Buildrequires:	metacity
 
 ExclusiveArch: %{ix86} x86_64
 
@@ -47,10 +49,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
-%ifarch x86-64
-%patch1
-%endif
 
 %build 
 
@@ -110,6 +108,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Aug  9 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.09.rh1-1
+- New upstream version, incorporates both the patches.
+
 * Wed Aug  2 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.25.rh1-4
 - Add make check to %%check
 - Add patches to disable failing tests.
@@ -184,7 +185,7 @@
 
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-1
 - Patch for new linux/unistd.h.
-- Patch to avoid scanf("%a[..]").
+- Patch to avoid scanf("%%a[..]").
 
 * Thu Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-0
 - New upstream version.
@@ -221,7 +222,7 @@
 - Import frysk 0.0.1.2006.02.12.
 
 * Thu Feb 09 2006 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2006.02.09-0.FC5.0
-- Removed ftrace from %files and added libexedir files and man pages.
+- Removed ftrace from %%files and added libexedir files and man pages.
 - Imported new frysk tarball, 
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.1.2006.01.22-0.FC5.1.1
@@ -266,7 +267,7 @@
 
 * Wed Nov 10  2005 Igor Foox <ifoox at redhat.com> 0.0.0.20051109-0.1
 - Updated source, changed cdtparser dependency to eclipse-cdt. Added build
-restriction to i386. Added %{?_smp_flags} to make command.
+restriction to i386. Added %%{?_smp_flags} to make command.
 
 * Fri Oct 28  2005 Igor Foox <ifoox at redhat.com> 0.0-2
 - Validated all Requires and BuildRequires clauses, fixed some of them.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	25 Jul 2006 10:33:35 -0000	1.23
+++ sources	9 Aug 2006 19:38:32 -0000	1.24
@@ -1 +1 @@
-68e9a2c795e6ea34f42e0375caf10c72  frysk-0.0.1.2006.07.25.rh1.tar.bz2
+c126b0790be2c8b95fede5d26b0b4cbb  frysk-0.0.1.2006.08.09.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug  9 19:51:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 15:51:42 -0400
Subject: rpms/xorg-x11-drv-amd/devel xorg-x11-drv-amd.spec,1.3,1.4
Message-ID: <200608091951.k79JpgVG020158@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-amd.spec 
Log Message:
BuildRequires: libtool


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-amd.spec	9 Aug 2006 19:34:07 -0000	1.3
+++ xorg-x11-drv-amd.spec	9 Aug 2006 19:51:40 -0000	1.4
@@ -20,6 +20,7 @@
 BuildRequires: pkgconfig
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: libtool
 BuildRequires: gcc >= 3.4.0
 %if "%{dist}" == ".fc5"
 BuildRequires: xorg-x11-server-sdk



From fedora-cvs-commits at redhat.com  Wed Aug  9 19:53:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 15:53:39 -0400
Subject: rpms/frysk/devel frysk-20060725-xfail-x86_64.patch, 1.2,
	NONE frysk-20060725-xfail.patch, 1.1, NONE
Message-ID: <200608091953.k79JrdWj020264@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20252

Removed Files:
	frysk-20060725-xfail-x86_64.patch frysk-20060725-xfail.patch 
Log Message:
- New upstream version, incorporates both the patches.


--- frysk-20060725-xfail-x86_64.patch DELETED ---


--- frysk-20060725-xfail.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  9 20:20:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 16:20:56 -0400
Subject: rpms/xorg-x11-drv-amd/devel xorg-x11-drv-amd.spec,1.4,1.5
Message-ID: <200608092020.k79KKu6H016573@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-amd.spec 
Log Message:
* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 0.0-2.20060809git.fc6
- FC5 build fixes, mostly BuildRequires.



Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-amd.spec	9 Aug 2006 19:51:40 -0000	1.4
+++ xorg-x11-drv-amd.spec	9 Aug 2006 20:20:48 -0000	1.5
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   1.%{gitdate}git%{?dist}
+Release:   2.%{gitdate}git%{?dist}
 URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
@@ -27,6 +27,7 @@
 %else
 BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 %endif
+BuildRequires: xorg-x11-proto-devel
 
 Requires:  xorg-x11-server-Xorg >= 1.1.0
 
@@ -65,7 +66,10 @@
 %{_mandir}/man4/amd.4*
 
 %changelog
-* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 0.0-1.git20060809.fc6
+* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 0.0-2.20060809git.fc6
+- FC5 build fixes, mostly BuildRequires.
+
+* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 0.0-1.20060809git.fc6
 - git update: olpc dcon support, Xv fixes.
 - Attempted support for building against FC5.
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 20:48:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 16:48:26 -0400
Subject: rpms/xorg-x11-drv-amd/devel xorg-x11-drv-amd.spec,1.5,1.6
Message-ID: <200608092048.k79KmQZ1006332@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-amd.spec 
Log Message:
* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 0.0-3.20060809git.fc6
- Fix FC5 Requires too.



Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-amd.spec	9 Aug 2006 20:20:48 -0000	1.5
+++ xorg-x11-drv-amd.spec	9 Aug 2006 20:48:23 -0000	1.6
@@ -29,7 +29,11 @@
 %endif
 BuildRequires: xorg-x11-proto-devel
 
+%if "%{dist}" == "fc5"
 Requires:  xorg-x11-server-Xorg >= 1.1.0
+%else
+Requires:  xorg-x11-server-Xorg >= 1.1.0
+%endif
 
 %description 
 X.Org X11 AMD Geode video driver.
@@ -66,6 +70,9 @@
 %{_mandir}/man4/amd.4*
 
 %changelog
+* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 0.0-3.20060809git.fc6
+- Fix FC5 Requires too.
+
 * Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 0.0-2.20060809git.fc6
 - FC5 build fixes, mostly BuildRequires.
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 20:48:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 16:48:53 -0400
Subject: rpms/xorg-x11-drv-amd/devel xorg-x11-drv-amd.spec,1.6,1.7
Message-ID: <200608092048.k79KmrIB006544@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-amd.spec 
Log Message:
* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 0.0-3.20060809git.fc6
- Fix FC5 Requires too.



Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-amd.spec	9 Aug 2006 20:48:23 -0000	1.6
+++ xorg-x11-drv-amd.spec	9 Aug 2006 20:48:51 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   2.%{gitdate}git%{?dist}
+Release:   3.%{gitdate}git%{?dist}
 URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:03:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:03:20 -0400
Subject: rpms/kernel/devel git-gregkh.patch, 1.1, 1.2 kernel-2.6.spec, 1.2534,
	1.2535 linux-2.6-sata-ata_device_add-oops.patch, 1.1, NONE
Message-ID: <200608092103.k79L3KHR011455@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	git-gregkh.patch kernel-2.6.spec 
Removed Files:
	linux-2.6-sata-ata_device_add-oops.patch 
Log Message:
more greg bits

git-gregkh.patch:
 b/Makefile                                    |   23 +
 b/drivers/media/dvb/bt8xx/dst.c               |   58 +--
 b/drivers/media/dvb/dvb-core/Makefile         |    6 
 b/drivers/media/radio/Kconfig                 |   12 
 b/drivers/media/radio/Makefile                |    1 
 b/drivers/media/radio/dsbr100.c               |  430 ++++++++++++++++++++++++++
 b/drivers/media/video/Kconfig                 |   12 
 b/drivers/media/video/Makefile                |    2 
 b/drivers/media/video/compat_ioctl32.c        |   32 +
 b/drivers/media/video/cx25840/cx25840-core.c  |    4 
 b/drivers/media/video/cx88/cx88-video.c       |    4 
 b/drivers/media/video/msp3400-kthreads.c      |    4 
 b/drivers/media/video/pwc/Kconfig             |    2 
 b/drivers/media/video/pwc/pwc-if.c            |    1 
 b/drivers/media/video/saa7134/saa7134-video.c |    2 
 b/drivers/media/video/tuner-types.c           |   14 
 b/drivers/media/video/v4l1-compat.c           |    4 
 b/drivers/media/video/v4l2-common.c           |    6 
 b/drivers/media/video/videodev.c              |    2 
 b/drivers/media/video/vivi.c                  |    4 
 b/drivers/net/myri10ge/myri10ge.c             |    2 
 b/drivers/net/tg3.c                           |   51 +--
 b/drivers/net/tg3.h                           |    8 
 b/drivers/s390/char/tape_class.c              |    2 
 b/drivers/s390/cio/device_fsm.c               |    1 
 b/drivers/s390/cio/device_ops.c               |    3 
 b/drivers/scsi/ata_piix.c                     |    5 
 b/drivers/scsi/libata-core.c                  |   34 --
 b/drivers/scsi/libata-scsi.c                  |   13 
 b/drivers/scsi/sata_sil24.c                   |    1 
 b/fs/jfs/inode.c                              |   16 
 b/fs/jfs/jfs_inode.h                          |    1 
 b/fs/jfs/super.c                              |  118 ++++++-
 b/include/linux/skbuff.h                      |    4 
 b/include/media/v4l2-dev.h                    |    2 
 b/net/core/dst.c                              |    3 
 b/net/core/pktgen.c                           |    4 
 b/net/core/rtnetlink.c                        |   15 
 b/net/core/skbuff.c                           |    4 
 b/net/core/wireless.c                         |   24 +
 b/net/ipv4/route.c                            |    2 
 b/net/ipv4/tcp_output.c                       |   12 
 b/net/ipx/af_ipx.c                            |   10 
 b/sound/oss/Kconfig                           |    6 
 b/sound/pci/Kconfig                           |   70 ++--
 b/usr/Makefile                                |    3 
 drivers/media/video/dsbr100.c                 |  430 --------------------------
 47 files changed, 834 insertions(+), 633 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 git-gregkh.patch
Index: git-gregkh.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-gregkh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-gregkh.patch	8 Aug 2006 19:28:09 -0000	1.1
+++ git-gregkh.patch	9 Aug 2006 21:03:07 -0000	1.2
@@ -1,3 +1,730 @@
+commit a4657141091c2f975fa35ac1ad28fffdd756091e
+Merge: 54f58d6... 7c91767...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date:   Wed Aug 9 11:49:13 2006 -0700
+
+    Merge gregkh at master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
+
+commit 54f58d6c4f15f3bdf15d43fa640ca6de9487f50e
+Merge: 897e11a... 013b68b...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date:   Wed Aug 9 11:46:30 2006 -0700
+
+    Merge branch 'upstream-greg' of gregkh at master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
+
+commit 897e11a40baf24224bd0edc948f908ed07c5675d
+Merge: ad55269... 22aac08...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date:   Wed Aug 9 11:45:59 2006 -0700
+
+    Merge branch 'upstream-greg' of gregkh at master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
+
+commit 7c91767a6b701543c93ebcd611dab61deff3dad1
+Author: Dmitry Mishin <dim at openvz.org>
+Date:   Wed Aug 9 02:25:54 2006 -0700
+
+    [NET]: add_timer -> mod_timer() in dst_run_gc()
+    
+    Patch from Dmitry Mishin <dim at openvz.org>:
+    
+    Replace add_timer() by mod_timer() in dst_run_gc
+    in order to avoid BUG message.
+    
+           CPU1                            CPU2
+    dst_run_gc()  entered           dst_run_gc() entered
+    spin_lock(&dst_lock)                   .....
+    del_timer(&dst_gc_timer)         fail to get lock
+           ....                         mod_timer() <--- puts
+                                                     timer back
+                                                     to the list
+    add_timer(&dst_gc_timer) <--- BUG because timer is in list already.
+    
+    Found during OpenVZ internal testing.
+    
+    At first we thought that it is OpenVZ specific as we
+    added dst_run_gc(0) call in dst_dev_event(),
+    but as Alexey pointed to me it is possible to trigger
+    this condition in mainstream kernel.
+    
+    F.e. timer has fired on CPU2, but the handler was preeempted
+    by an irq before dst_lock is tried.
+    Meanwhile, someone on CPU1 adds an entry to gc list and
+    starts the timer.
+    If CPU2 was preempted long enough, this timer can expire
+    simultaneously with resuming timer handler on CPU1, arriving
+    exactly to the situation described.
+    
+    Signed-off-by: Dmitry Mishin <dim at openvz.org>
+    Signed-off-by: Kirill Korotaev <dev at openvz.org>
+    Signed-off-by: Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit 22aac0896b1b0b8cabaf00714c55dd12f25d5738
+Author: Tejun Heo <htejun at gmail.com>
+Date:   Tue Aug 8 14:08:59 2006 +0900
+
+    [PATCH] libata: clear sdev->locked on door lock failure
+    
+    SCSI EH locks door if sdev->locked is set.  Sometimes door lock
+    command fails continuously (e.g. when medium is not present) and as
+    libata uses EH to acquire sense data, this easily creates a loop where
+    a failed lock door invokes EH and EH issues lock door on completion.
+    
+    This patch clears sdev->locked on door lock failure to break this
+    loop.  This problem has been spotted and diagnosed by Unicorn Chang
+    <uchang at tw.ibm.com>.
+    
+    Signed-off-by: Tejun Heo <htejun at gmail.com>
+    Signed-off-by: Jeff Garzik <jeff at garzik.org>
+
+commit 85455dd34219376dcc7dce94bea67058f0b7d731
+Author: Keith Owens <kaos at ocs.com.au>
+Date:   Tue Aug 8 13:51:02 2006 +1000
+
+    [PATCH] Fix compile problem when sata debugging is on
+    
+    Fix a sata debug print statement that still uses an old variable name.
+    
+    Signed-off-by: Keith Owens <kaos at ocs.com.au>
+    Signed-off-by: Jeff Garzik <jeff at garzik.org>
+
+commit 013b68bf7cb4edfb8753aac9bde3cb60c84bc067
+Author: Brice Goglin <brice at myri.com>
+Date:   Wed Aug 9 00:07:53 2006 -0400
+
+    [PATCH] myri10ge: always re-enable dummy rdmas in myri10ge_resume
+    
+    Dummy RDMA are always enabled on device startup since commit
+    9a71db721a2cbb9921b929b2699ab181f5a3c6c0 (to work around buggy
+    PCIe chipsets which do not implement resending properly). But,
+    we also need to always re-enable them when resuming the device.
+    
+    Signed-off-by: Brice Goglin <brice at myri.com>
+    Signed-off-by: Jeff Garzik <jeff at garzik.org>
+
+commit c71d6be54e92c4b2d31faf51850354aff22b82b0
+Merge: 9f73763... 77f3f87...
+Author: Jeff Garzik <jeff at garzik.org>
+Date:   Tue Aug 8 23:59:39 2006 -0400
+
+    Merge branch 'tj-upstream-fixes' of git://htj.dyndns.org/libata-tj into upstream-fixes
+
+commit 2f96740c26f1dcff9111dca3e01379ab12aafde5
+Merge: 9f73763... 782a667...
+Author: Jeff Garzik <jeff at garzik.org>
+Date:   Tue Aug 8 23:48:48 2006 -0400
+
+    Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
+
+commit 7b1ba8de569460894efa892457af7a37c0d574f9
+Author: Stephen Hemminger <shemminger at osdl.org>
+Date:   Tue Aug 8 16:48:51 2006 -0700
+
+    [IPX]: Another nonlinear receive fix
+    
+    Need to check some more cases in IPX receive.  If the skb is purely
+    fragments, the IPX header needs to be extracted. The function
+    pskb_may_pull() may in theory invalidate all the pointers in the skb,
+    so references to ipx header must be refreshed.
+    
+    Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit 70f8e78e150425b01c1099087ad3decacf7e4ccf
+Author: David S. Miller <davem at sunset.davemloft.net>
+Date:   Tue Aug 8 16:47:37 2006 -0700
+
+    [RTNETLINK]: Fix IFLA_ADDRESS handling.
+    
+    The ->set_mac_address handlers expect a pointer to a
+    sockaddr which contains the MAC address, whereas
+    IFLA_ADDRESS provides just the MAC address itself.
+    
+    So whip up a sockaddr to wrap around the netlink
+    attribute for the ->set_mac_address call.
+    
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit ad552692a4489917fa4b71f9c6a91baae4aee799
+Merge: 20dbfad... 0851fb4...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date:   Tue Aug 8 14:19:23 2006 -0700
+
+    Merge gregkh at master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
+
+commit 0851fb48486c044476b019029245cb9b348fca33
+Author: Yeasah Pell <yeasah at schwide.com>
+Date:   Tue Aug 8 09:10:18 2006 -0300
+
+    V4L/DVB (4431): Add several error checks to dst
+    
+    Signed-off-by: Yeasah Pell <yeasah at shwide.com>
+    Signed-off-by: Manu Abraham <manu at linuxtv.org>
+    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
+
+commit eafa98177a388700d613c187c7716e11869b7171
+Author: Diego Calleja <diegocg at gmail.com>
+Date:   Tue Aug 8 09:10:17 2006 -0300
+
+    V4L/DVB (4430): Quickcam_messenger compilation fix
+    
+    In bugzilla #6943, Maxim Britov reported:
+    "I can enable Logitech quickcam support in .config, but it want be compile.
+    I have to add into drivers/media/video/Makefile:
+    obj-$(CONFIG_USB_QUICKCAM_MESSENGER)    += usbvideo/"
+    He's right, just enable that driver as module while disabling every other
+    driver that gets into that directory, nothing will get compiled.
+    This patch fixes the Makefile.
+    
+    Signed-off-by: Diego Calleja <diegocg at gmail.com>
+    Acked-by: Michael Krufky <mkrufky at linuxtv.org>
+    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
+
+commit 8a016dcc8383bedc731bca9fdedae77ff52a6ad7
+Author: Mauro Carvalho Chehab <mchehab at infradead.org>
+Date:   Tue Aug 8 09:10:16 2006 -0300
+
+    V4L/DVB (4427): Fix V4L1 Compat for VIDIOCGPICT ioctl
+    
+    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
+
+commit 43c560fa59ef2688d891f6431e972b7763b73a00
[...2665 lines suppressed...]
+ 	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+ 		goto out;
+ 
+-	ipx		= ipx_hdr(skb);
+-	ipx_pktsize	= ntohs(ipx->ipx_pktsize);
++	if (!pskb_may_pull(skb, sizeof(struct ipxhdr)))
++		goto drop;
++
++	ipx_pktsize = ntohs(ipxhdr(skb)->ipx_pktsize);
+ 	
+ 	/* Too small or invalid header? */
+-	if (ipx_pktsize < sizeof(struct ipxhdr) || ipx_pktsize > skb->len)
++	if (ipx_pktsize < sizeof(struct ipxhdr) ||
++	    !pskb_may_pull(skb, ipx_pktsize))
+ 		goto drop;
+                         
++	ipx = ipx_hdr(skb);
+ 	if (ipx->ipx_checksum != IPX_NO_CHECKSUM &&
+ 	   ipx->ipx_checksum != ipx_cksum(ipx, ipx_pktsize))
+ 		goto drop;
+diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
+index f4980ca..1b7c3df 100644
+--- a/sound/oss/Kconfig
++++ b/sound/oss/Kconfig
+@@ -31,7 +31,7 @@ config SOUND_EMU10K1
+ 	  For more information on this driver and the degree of support for
+ 	  the different card models please check:
+ 
+-	        <http://sourceforge.net/projects/emu10k1/>
++		<http://sourceforge.net/projects/emu10k1/>
+ 
+ 	  It is now possible to load dsp microcode patches into the EMU10K1
+ 	  chip.  These patches are used to implement real time sound
+@@ -140,7 +140,7 @@ config SOUND_TRIDENT
+ 	  system support" and "Sysctl support", and after the /proc file
+ 	  system has been mounted, executing the command
+ 
+-	  	command			what is enabled
++		command			what is enabled
+ 
+ 	  echo 0>/proc/ALi5451	pcm out is also set to S/PDIF out. (Default).
+ 
+@@ -838,7 +838,7 @@ config SOUND_WAVEARTIST
+ 
+ config SOUND_TVMIXER
+ 	tristate "TV card (bt848) mixer support"
+-	depends on SOUND_PRIME && I2C
++	depends on SOUND_PRIME && I2C && VIDEO_V4L1
+ 	help
+ 	  Support for audio mixer facilities on the BT848 TV frame-grabber
+ 	  card.
+diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
+index d7ad32f..e49c0fe 100644
+--- a/sound/pci/Kconfig
++++ b/sound/pci/Kconfig
+@@ -16,16 +16,16 @@ config SND_AD1889
+ 	  will be called snd-ad1889.
+ 
+ config SND_ALS300
+-        tristate "Avance Logic ALS300/ALS300+"
+-        depends on SND
+-        select SND_PCM
+-        select SND_AC97_CODEC
+-        select SND_OPL3_LIB
+-        help
+-          Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+
++	tristate "Avance Logic ALS300/ALS300+"
++	depends on SND
++	select SND_PCM
++	select SND_AC97_CODEC
++	select SND_OPL3_LIB
++	help
++	  Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+
+ 
+-          To compile this driver as a module, choose M here: the module
+-          will be called snd-als300
++	  To compile this driver as a module, choose M here: the module
++	  will be called snd-als300
+ 
+ config SND_ALS4000
+ 	tristate "Avance Logic ALS4000"
+@@ -78,49 +78,49 @@ config SND_ATIIXP_MODEM
+ 	  will be called snd-atiixp-modem.
+ 
+ config SND_AU8810
+-        tristate "Aureal Advantage"
+-        depends on SND
++	tristate "Aureal Advantage"
++	depends on SND
+ 	select SND_MPU401_UART
+ 	select SND_AC97_CODEC
+-        help
++	help
+ 	  Say Y here to include support for Aureal Advantage soundcards.
+ 
+ 	  Supported features: Hardware Mixer, SRC, EQ and SPDIF output.
+-          3D support code is in place, but not yet useable. For more info, 
+-          email the ALSA developer list, or <mjander at users.sourceforge.net>.
++	  3D support code is in place, but not yet useable. For more info,
++	  email the ALSA developer list, or <mjander at users.sourceforge.net>.
+ 
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called snd-au8810.
+- 
++
+ config SND_AU8820
+-        tristate "Aureal Vortex"
+-        depends on SND
++	tristate "Aureal Vortex"
++	depends on SND
+ 	select SND_MPU401_UART
+ 	select SND_AC97_CODEC
+-        help
++	help
+ 	  Say Y here to include support for Aureal Vortex soundcards.
+ 
+-          Supported features: Hardware Mixer and SRC. For more info, email 
+-          the ALSA developer list, or <mjander at users.sourceforge.net>.
++	  Supported features: Hardware Mixer and SRC. For more info, email
++	  the ALSA developer list, or <mjander at users.sourceforge.net>.
+ 
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called snd-au8820.
+- 
++
+ config SND_AU8830
+-        tristate "Aureal Vortex 2"
+-        depends on SND
++	tristate "Aureal Vortex 2"
++	depends on SND
+ 	select SND_MPU401_UART
+ 	select SND_AC97_CODEC
+-        help
++	help
+ 	  Say Y here to include support for Aureal Vortex 2 soundcards.
+ 
+-          Supported features: Hardware Mixer, SRC, EQ and SPDIF output.
+-          3D support code is in place, but not yet useable. For more info, 
+-          email the ALSA developer list, or <mjander at users.sourceforge.net>.
++	  Supported features: Hardware Mixer, SRC, EQ and SPDIF output.
++	  3D support code is in place, but not yet useable. For more info,
++	  email the ALSA developer list, or <mjander at users.sourceforge.net>.
+ 
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called snd-au8830.
+- 
++
+ config SND_AZT3328
+ 	tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)"
+ 	depends on SND && EXPERIMENTAL
+@@ -135,10 +135,10 @@ config SND_AZT3328
+ 	  will be called snd-azt3328.
+ 
+ config SND_BT87X
+-        tristate "Bt87x Audio Capture"
+-        depends on SND
++	tristate "Bt87x Audio Capture"
++	depends on SND
+ 	select SND_PCM
+-        help
++	help
+ 	  If you want to record audio from TV cards based on
+ 	  Brooktree Bt878/Bt879 chips, say Y here and read
+ 	  <file:Documentation/sound/alsa/Bt87x.txt>.
+@@ -209,7 +209,7 @@ config SND_CS46XX
+ config SND_CS46XX_NEW_DSP
+ 	bool "Cirrus Logic (Sound Fusion) New DSP support"
+ 	depends on SND_CS46XX
+-        default y
++	default y
+ 	help
+ 	  Say Y here to use a new DSP image for SPDIF and dual codecs.
+ 
+@@ -225,7 +225,7 @@ config SND_CS5535AUDIO
+ 	  referred to as NS CS5535 IO or AMD CS5535 IO companion in
+ 	  various literature. This driver also supports the CS5536 audio
+ 	  device. However, for both chips, on certain boards, you may
+-	  need to use ac97_quirk=hp_only if your board has physically 
++	  need to use ac97_quirk=hp_only if your board has physically
+ 	  mapped headphone out to master output. If that works for you,
+ 	  send lspci -vvv output to the mailing list so that your board
+ 	  can be identified in the quirks list.
+@@ -468,11 +468,13 @@ config SND_FM801_TEA575X_BOOL
+ 	  FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media
+ 	  Forte SF256-PCS-02) into the snd-fm801 driver.
+ 
++	  This will enable support for the old V4L1 API.
++
+ config SND_FM801_TEA575X
+ 	tristate
+ 	depends on SND_FM801_TEA575X_BOOL
+ 	default SND_FM801
+-	select VIDEO_DEV
++	select VIDEO_V4L1
+ 
+ config SND_HDA_INTEL
+ 	tristate "Intel HD Audio"
 diff --git a/usr/Makefile b/usr/Makefile
 index e938242..5b31c0b 100644
 --- a/usr/Makefile


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2534
retrieving revision 1.2535
diff -u -r1.2534 -r1.2535
--- kernel-2.6.spec	9 Aug 2006 18:43:56 -0000	1.2534
+++ kernel-2.6.spec	9 Aug 2006 21:03:07 -0000	1.2535
@@ -426,8 +426,7 @@
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
-Patch2201: linux-2.6-sata-ata_device_add-oops.patch
-Patch2202: linux-2.6-sata-ahci-suspend.patch
+Patch2201: linux-2.6-sata-ahci-suspend.patch
 
 # ACPI bits
 
@@ -960,10 +959,8 @@
 
 # Enable PATA ports on Promise SATA.
 %patch2200 -p1
-# Fix oops on startup
-%patch2201 -p1
 # Fix AHCI Suspend.
-%patch2202 -p1
+%patch2201 -p1
 
 # ACPI patches
 
@@ -1696,6 +1693,7 @@
 * Wed Aug  9 2006 Dave Jones <davej at redhat.com>
 - Another lockdep fix for networking.
 - Change some hotplug PCI options.
+- Daily update from GregKH's git tree.
 
 * Tue Aug  8 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace/ptrace interactions with SELinux.


--- linux-2.6-sata-ata_device_add-oops.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:25:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:25:51 -0400
Subject: rpms/gtk2/devel gtk+-2.10.1-fix-tree-crash.patch, NONE,
	1.1 gtk2.spec, 1.167, 1.168
Message-ID: <200608092125.k79LPpsI032714@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.10.1-fix-tree-crash.patch 
Log Message:
- patch from Jonathan Matthew <jontahn at kaolin.wh9.net> to fix
  crash in GtkTreeModelFilter (upstream bug 346800)


gtk+-2.10.1-fix-tree-crash.patch:
 gtktreemodelfilter.c |    5 +----
 1 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE gtk+-2.10.1-fix-tree-crash.patch ---
--- gtk+-2.10.1/gtk/gtktreemodelfilter.c	12 Jun 2006 14:48:43 -0000	1.46
+++ gtk+-2.10.1/gtk/gtktreemodelfilter.c	6 Aug 2006 03:44:52 -0000
@@ -927,10 +927,7 @@ gtk_tree_model_filter_fetch_child (GtkTr
   g_array_insert_val (level->array, i, elt);
   *index = i;
 
-  if (i > 0)
-    i--;
-
-  for ( ; i < level->array->len; i++)
+  for (i = 0 ; i < level->array->len; i++)
     {
       FilterElt *e = &(g_array_index (level->array, FilterElt, i));
       if (e->children)


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gtk2.spec	24 Jul 2006 03:44:08 -0000	1.167
+++ gtk2.spec	9 Aug 2006 21:25:49 -0000	1.168
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -28,6 +28,8 @@
 Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
 # Filechooser search
 Patch2: gtk+-2.10.1-search.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=346800
+Patch3: gtk+-2.10.1-fix-tree-crash.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -108,6 +110,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .search
+%patch3 -p1 -b .fix-tree-crash
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -167,7 +170,9 @@
   echo 1>&2 "Host mismatch: compile='$compile_host', spec file='$host'" && exit 1
 fi
 
-%makeinstall RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_LOADER_TEST=false
+make install DESTDIR=$RPM_BUILD_ROOT        \
+             RUN_QUERY_IMMODULES_TEST=false \
+             RUN_QUERY_LOADER_TEST=false 
 
 %find_lang gtk20
 %find_lang gtk20-properties
@@ -277,6 +282,10 @@
 %doc tmpdocs/examples
 
 %changelog
+* Wed Aug  9 2006 Ray Strode <rstrode at redhat.com> - 2.10.1-2
+- patch from Jonathan Matthew <jontahn at kaolin.wh9.net> to fix
+  crash in GtkTreeModelFilter (upstream bug 346800)
+
 * Sun Jul 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.1-1
 - Update to 2.10.1
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:28:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:28:24 -0400
Subject: rpms/conga/FC-5 conga.spec,1.8,1.9 sources,1.10,1.11
Message-ID: <200608092128.k79LSOFP001086@cvs.devel.redhat.com>

Author: kupcevic

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

Modified Files:
	conga.spec sources 
Log Message:
- Separate clustermon.srpm (modcluster, cluster-snmp and
   cluster-cim) from conga.srpm
- Luci: tighten down security




Index: conga.spec
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/conga.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- conga.spec	3 Aug 2006 23:59:07 -0000	1.8
+++ conga.spec	9 Aug 2006 21:28:21 -0000	1.9
@@ -11,7 +11,7 @@
 ###############################################################################
 
 %define vers 0.8
-%define rel  10%{?dist}
+%define rel  11%{?dist}
 
 %define include_zope_and_plone     no
 %define zope_archive               Zope-2.9.3
@@ -42,7 +42,7 @@
 %if "%{include_zope_and_plone}" == yes
 Source1: %{zope_archive_file}
 Source2: %{plone_archive_file}
-Patch2:  Plone-2.5_Marhsall_ro_file.patch
+Patch2:  Plone-2.5_CMFPlone.patch
 %endif
 Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
 
@@ -53,7 +53,6 @@
 %endif
 BuildRequires: glibc-devel gcc-c++ libxml2-devel make
 BuildRequires: openssl-devel dbus-devel pam-devel
-BuildRequires: net-snmp-devel tog-pegasus-devel
 
 %description
 Conga is a project developing management system for remote stations. 
@@ -76,7 +75,6 @@
 ln -s ../%{plone_archive} luci/plone
 cd luci/plone
 %patch2 -p1
-rm -rf Five README.txt
 cd $CURRENT_DIR
 %endif
 
@@ -89,12 +87,12 @@
 		--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
 		--include_zope_and_plone=%{include_zope_and_plone}
 #make %{?_smp_mflags}
-make
+make conga
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install_conga
 
 
 %clean
@@ -139,11 +137,11 @@
 %config(noreplace)		%{_sysconfdir}/sysconfig/luci
 				%{_sysconfdir}/rc.d/init.d/luci
 				%{_sbindir}/luci_admin
+				%{_docdir}/luci-%{version}/
+%defattr(-,luci,luci)
 %if "%{include_zope_and_plone}" == yes
 				%{_libdir}/luci/
 %endif
-				%{_docdir}/luci-%{version}/
-%defattr(-,luci,luci)
 				%{_localstatedir}/lib/luci
 
 %pre -n luci
@@ -205,7 +203,7 @@
 Requires: chkconfig initscripts
 Requires: oddjob dbus openssl pam
 Requires: sed util-linux
-Requires: ricci-modcluster = %{version}-%{release}
+Requires: modcluster = %{version}-%{release}
 
 # modreboot
 Provides: ricci-modreboot = %{version}-%{release}
@@ -240,7 +238,7 @@
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
 			%{_sysconfdir}/rc.d/init.d/ricci
-%attr(-,ricci,root)	%{_localstatedir}/lib/ricci
+%attr(-,ricci,ricci)	%{_localstatedir}/lib/ricci
 			%{_sbindir}/ricci
 %attr(4755,root,root)	%{_sbindir}/ricci-auth
 			%{_sbindir}/ricci-worker
@@ -312,161 +310,16 @@
 
 
 
-###  cluster module  ###
-
-
-%package -n ricci-modcluster
-Group: System Environment/Base
-Summary: Conga Remote Management System - Managed Clustered Station
-URL: http://sources.redhat.com/cluster/conga
-
-Requires: chkconfig initscripts
-Requires: oddjob openssl
-Requires: sed util-linux
-Conflicts: clumon
-
-%description -n ricci-modcluster
-Conga is a project developing management system for remote stations. 
-It consists of luci, https frontend, and ricci, secure daemon that dispatches 
-incoming messages to underlying management modules. 
-
-This package contains Red Hat Enterprise Linux Cluster Suite 
-ricci management module. 
-
-
-%files -n ricci-modcluster
-%defattr(-,root,root)
-%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modcluster.oddjob.conf
-%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modcluster.systembus.conf
-			%{_sysconfdir}/rc.d/init.d/ricci-modclusterd
-			%{_sbindir}/ricci-modcluster
-			%{_sbindir}/ricci-modcluster.exe
-			%{_sbindir}/ricci-modclusterd
-			%{_docdir}/ricci-modcluster-%{version}/
-
-%post -n ricci-modcluster
-/sbin/chkconfig --add ricci-modclusterd
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-RUNS=(`/sbin/runlevel`)
-RUNLEVEL=${RUNS[1]}
-STATE=`/sbin/chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
-if [ "$STATE" = "on" ]; then
-   /sbin/service ricci-modclusterd restart > /dev/null 2>&1
-fi
-
-%preun -n ricci-modcluster
-if [ "$1" = "0" ]; then
-   /sbin/service ricci-modclusterd stop > /dev/null 2>&1
-   /sbin/chkconfig --del ricci-modclusterd
-fi
-
-%postun -n ricci-modcluster
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-if [ "$1" -ge "1" ]; then
-   /sbin/service ricci-modclusterd condrestart > /dev/null 2>&1
-fi
-exit 0
-
-
-
-
-###  cluster-snmp  ###
-
-
-%package -n cluster-snmp
-Group: System Environment/Base
-Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
-URL: http://sources.redhat.com/cluster/conga
-
-Requires: ricci-modcluster = %{version}-%{release}
-Requires: net-snmp 
-Requires: oddjob openssl
-Conflicts: clumon-snmp
-
-%description -n cluster-snmp
-SNMP agent for Red Hat Enterprise Linux Cluster Suite.
-
-%files -n cluster-snmp
-%defattr(-,root,root)
-			%{_libdir}/cluster-snmp/
-			%{_datadir}/snmp/mibs/REDHAT-MIB
-			%{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
-			%{_docdir}/cluster-snmp-%{version}/
-
-%pre -n cluster-snmp
-exit 0
-
-%post -n cluster-snmp
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service snmpd condrestart > /dev/null 2>&1
-exit 0
-
-%preun -n cluster-snmp
-exit 0
-
-%postun -n cluster-snmp
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service snmpd condrestart > /dev/null 2>&1
-exit 0
-
-
-
-
-
-###  cluster-cim  ###
-
-
-%package -n cluster-cim
-Group: System Environment/Base
-Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
-URL: http://sources.redhat.com/cluster/conga
-
-Requires: ricci-modcluster = %{version}-%{release}
-Requires: tog-pegasus 
-Requires: oddjob openssl
-Conflicts: clumon-cim
-
-%description -n cluster-cim
-CIM provider for Red Hat Enterprise Linux Cluster Suite.
-
-%files -n cluster-cim
-%defattr(-,root,root)
-			%{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so
-			%{_docdir}/cluster-cim-%{version}/
-
-%pre -n cluster-cim
-exit 0
-
-%post -n cluster-cim
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service tog-pegasus condrestart > /dev/null 2>&1
-exit 0
-
-%preun -n cluster-cim
-exit 0
-
-%postun -n cluster-cim
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service tog-pegasus condrestart > /dev/null 2>&1
-exit 0
-
-
-
-
-
 
 ###  changelog ###
 
 
 %changelog
+* Wed Aug 09 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-11
+- Separate clustermon.srpm (modcluster, cluster-snmp and 
+   cluster-cim) from conga.srpm
+- Luci: tighten down security
 * Thu Aug 03 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-10
-- Added zopectl to luci
 - Luci: fix login issues, add cluster resources, styling... 
 * Wed Jul 26 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-9
 - Update Luci to Plone 2.5


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Aug 2006 23:59:07 -0000	1.10
+++ sources	9 Aug 2006 21:28:21 -0000	1.11
@@ -1 +1 @@
-1ed3953833d3838e791904780525733f  conga-0.8.tar.gz
+dd30ba43abcb4e187821f5ffed6d42b7  conga-0.8.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:30:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:30:35 -0400
Subject: rpms/kernel/devel linux-2.6-xen-unbreak-oprofile.patch, NONE,
	1.1 kernel-2.6.spec, 1.2535, 1.2536
Message-ID: <200608092130.k79LUZwd001749@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-xen-unbreak-oprofile.patch 
Log Message:
Unbreak SMP locking in oprofile.

linux-2.6-xen-unbreak-oprofile.patch:
 oprof.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-xen-unbreak-oprofile.patch ---
From: Markus Armbruster <armbru at redhat.com>

Dave Jones <davej at redhat.com> writes:

[...]
> This is caused by linux-2.6-xen.patch
> It's calling spin_lock/spin_unlock() on a mutex.

I have no idea how this crept in.  It's correct in my archive of
patches...  Anyway, here's the obvious fix:

diff -r a3fda906fb82 drivers/oprofile/oprof.c
--- a/drivers/oprofile/oprof.c	Fri Aug 04 00:04:12 2006 +0200
+++ b/drivers/oprofile/oprof.c	Wed Aug 09 09:26:43 2006 +0200
@@ -44,9 +44,9 @@ int oprofile_set_active(int active_domai
 	if (!oprofile_ops.set_active)
 		return -EINVAL;
 
-	spin_lock(&start_mutex);
+	mutex_lock(&start_mutex);
 	err = oprofile_ops.set_active(active_domains, adomains);
-	spin_unlock(&start_mutex);
+	mutex_unlock(&start_mutex);
 	return err;
 }
 
@@ -57,9 +57,9 @@ int oprofile_set_passive(int passive_dom
 	if (!oprofile_ops.set_passive)
 		return -EINVAL;
 
-	spin_lock(&start_mutex);
+	mutex_lock(&start_mutex);
 	err = oprofile_ops.set_passive(passive_domains, pdomains);
-	spin_unlock(&start_mutex);
+	mutex_unlock(&start_mutex);
 	return err;
 }
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2535
retrieving revision 1.2536
diff -u -r1.2535 -r1.2536
--- kernel-2.6.spec	9 Aug 2006 21:03:07 -0000	1.2535
+++ kernel-2.6.spec	9 Aug 2006 21:30:20 -0000	1.2536
@@ -323,7 +323,7 @@
 Patch954: linux-2.6-xen-execshield.patch
 Patch955: linux-2.6-xen-tux.patch
 Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
-
+Patch957: linux-2.6-xen-unbreak-oprofile.patch
 
 Patch990: linux-2.6-xen-compile-fixes.patch
 
@@ -812,6 +812,7 @@
 %patch954 -p1
 %patch955 -p1
 %patch956 -p1
+%patch957 -p1
 
 #%patch990 -p1
 
@@ -1694,6 +1695,7 @@
 - Another lockdep fix for networking.
 - Change some hotplug PCI options.
 - Daily update from GregKH's git tree.
+- Unbreak SMP locking in oprofile.
 
 * Tue Aug  8 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace/ptrace interactions with SELinux.



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:34:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:34:53 -0400
Subject: rpms/kernel/devel linux-2.6-hotplug-cpu-workqueue.patch, NONE,
	1.1 kernel-2.6.spec, 1.2536, 1.2537
Message-ID: <200608092134.k79LYrGA002594@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-hotplug-cpu-workqueue.patch 
Log Message:
Fix hotplug CPU locking in workqueue creation.

linux-2.6-hotplug-cpu-workqueue.patch:
 workqueue.c |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

--- NEW FILE linux-2.6-hotplug-cpu-workqueue.patch ---

From: Andrew Morton <akpm at osdl.org>

Use a private lock instead.  It protects all per-cpu data structures in
workqueue.c, including the workqueues list.

Fix a bug in schedule_on_each_cpu(): it was forgetting to lock down the
per-cpu resources.

Unfixed long-standing bug: if someone unplugs the CPU identified by
`singlethread_cpu' the kernel will get very sick.

Cc: Dave Jones <davej at codemonkey.org.uk>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 kernel/workqueue.c |   33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff -puN kernel/workqueue.c~workqueue-remove-lock_cpu_hotplug kernel/workqueue.c
--- a/kernel/workqueue.c~workqueue-remove-lock_cpu_hotplug
+++ a/kernel/workqueue.c
@@ -68,7 +68,7 @@ struct workqueue_struct {
 
 /* All the per-cpu workqueues on the system, for hotplug cpu to add/remove
    threads to each one as cpus come/go. */
-static DEFINE_SPINLOCK(workqueue_lock);
+static DEFINE_MUTEX(workqueue_mutex);
 static LIST_HEAD(workqueues);
 
 static int singlethread_cpu;
@@ -320,10 +320,10 @@ void fastcall flush_workqueue(struct wor
 	} else {
 		int cpu;
 
-		lock_cpu_hotplug();
+		mutex_lock(&workqueue_mutex);
 		for_each_online_cpu(cpu)
 			flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, cpu));
-		unlock_cpu_hotplug();
+		mutex_unlock(&workqueue_mutex);
 	}
 }
 EXPORT_SYMBOL_GPL(flush_workqueue);
@@ -371,8 +371,7 @@ struct workqueue_struct *__create_workqu
 	}
 
 	wq->name = name;
-	/* We don't need the distraction of CPUs appearing and vanishing. */
-	lock_cpu_hotplug();
+	mutex_lock(&workqueue_mutex);
 	if (singlethread) {
 		INIT_LIST_HEAD(&wq->list);
 		p = create_workqueue_thread(wq, singlethread_cpu);
@@ -381,9 +380,7 @@ struct workqueue_struct *__create_workqu
 		else
 			wake_up_process(p);
 	} else {
-		spin_lock(&workqueue_lock);
 		list_add(&wq->list, &workqueues);
-		spin_unlock(&workqueue_lock);
 		for_each_online_cpu(cpu) {
 			p = create_workqueue_thread(wq, cpu);
 			if (p) {
@@ -393,7 +390,7 @@ struct workqueue_struct *__create_workqu
 				destroy = 1;
 		}
 	}
-	unlock_cpu_hotplug();
+	mutex_unlock(&workqueue_mutex);
 
 	/*
 	 * Was there any error during startup? If yes then clean up:
@@ -434,17 +431,15 @@ void destroy_workqueue(struct workqueue_
 	flush_workqueue(wq);
 
 	/* We don't need the distraction of CPUs appearing and vanishing. */
-	lock_cpu_hotplug();
+	mutex_lock(&workqueue_mutex);
 	if (is_single_threaded(wq))
 		cleanup_workqueue_thread(wq, singlethread_cpu);
 	else {
 		for_each_online_cpu(cpu)
 			cleanup_workqueue_thread(wq, cpu);
-		spin_lock(&workqueue_lock);
 		list_del(&wq->list);
-		spin_unlock(&workqueue_lock);
 	}
-	unlock_cpu_hotplug();
+	mutex_unlock(&workqueue_mutex);
 	free_percpu(wq->cpu_wq);
 	kfree(wq);
 }
@@ -515,11 +510,13 @@ int schedule_on_each_cpu(void (*func)(vo
 	if (!works)
 		return -ENOMEM;
 
+	mutex_lock(&workqueue_mutex);
 	for_each_online_cpu(cpu) {
 		INIT_WORK(per_cpu_ptr(works, cpu), func, info);
 		__queue_work(per_cpu_ptr(keventd_wq->cpu_wq, cpu),
 				per_cpu_ptr(works, cpu));
 	}
+	mutex_unlock(&workqueue_mutex);
 	flush_workqueue(keventd_wq);
 	free_percpu(works);
 	return 0;
@@ -635,6 +632,7 @@ static int __devinit workqueue_cpu_callb
 
 	switch (action) {
 	case CPU_UP_PREPARE:
+		mutex_lock(&workqueue_mutex);
 		/* Create a new workqueue thread for it. */
 		list_for_each_entry(wq, &workqueues, list) {
 			if (!create_workqueue_thread(wq, hotcpu)) {
@@ -653,6 +651,7 @@ static int __devinit workqueue_cpu_callb
 			kthread_bind(cwq->thread, hotcpu);
 			wake_up_process(cwq->thread);
 		}
+		mutex_unlock(&workqueue_mutex);
 		break;
 
 	case CPU_UP_CANCELED:
@@ -664,6 +663,15 @@ static int __devinit workqueue_cpu_callb
 				     any_online_cpu(cpu_online_map));
 			cleanup_workqueue_thread(wq, hotcpu);
 		}
+		mutex_unlock(&workqueue_mutex);
+		break;
+
+	case CPU_DOWN_PREPARE:
+		mutex_lock(&workqueue_mutex);
+		break;
+
+	case CPU_DOWN_FAILED:
+		mutex_unlock(&workqueue_mutex);
 		break;
 
 	case CPU_DEAD:
@@ -671,6 +679,7 @@ static int __devinit workqueue_cpu_callb
 			cleanup_workqueue_thread(wq, hotcpu);
 		list_for_each_entry(wq, &workqueues, list)
 			take_over_work(wq, hotcpu);
+		mutex_unlock(&workqueue_mutex);
 		break;
 	}
 
_



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2536
retrieving revision 1.2537
diff -u -r1.2536 -r1.2537
--- kernel-2.6.spec	9 Aug 2006 21:30:20 -0000	1.2536
+++ kernel-2.6.spec	9 Aug 2006 21:34:39 -0000	1.2537
@@ -398,6 +398,7 @@
 Patch1630: linux-2.6-mm-suspend-improvements.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
 Patch1650: linux-2.6-serial-460800.patch
+Patch1660: linux-2.6-hotplug-cpu-workqueue.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
@@ -919,6 +920,8 @@
 %patch1640 -p1
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
+# Fix hotplug CPU locking in workqueue creation.
+%patch1660 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
 # Only print migration info on SMP
@@ -1696,6 +1699,7 @@
 - Change some hotplug PCI options.
 - Daily update from GregKH's git tree.
 - Unbreak SMP locking in oprofile.
+- Fix hotplug CPU locking in workqueue creation.
 
 * Tue Aug  8 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace/ptrace interactions with SELinux.



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:37:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:37:55 -0400
Subject: rpms/kernel/devel linux-2.6-ide-missing-bits.patch, NONE,
	1.1 kernel-2.6.spec, 1.2537, 1.2538
Message-ID: <200608092137.k79LbtCQ003383@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ide-missing-bits.patch 
Log Message:
Fix IDE oops on boot.

linux-2.6-ide-missing-bits.patch:
 generic.c |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+)

--- NEW FILE linux-2.6-ide-missing-bits.patch ---
Subject: PATCH: 2.6.18 oops on boot fix for IDE
From: Alan Cox <alan at lxorguk.ukuu.org.uk>
To: gregkh at kroah.com, davej at redhat.com
Date: Wed, 09 Aug 2006 15:04:58 +0100
Message-Id: <1155132298.5729.171.camel at localhost.localdomain>

When the IDE fix for Jmicron went in one piece went walking somewhere
(send log shows my end somehow). Without this sometimes you get an oops
on boot.

Definitely needed for 2.6.18, problem not present in .17 so no backport
needed

Signed-off-by: Alan Cox <alan at redhat.com>

--- linux.vanilla-2.6.18-rc3/drivers/ide/pci/generic.c	2006-08-09 14:03:48.801986000 +0100
+++ linux-2.6.18-rc3/drivers/ide/pci/generic.c	2006-08-09 14:28:20.493254920 +0100
@@ -180,6 +180,36 @@
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.bootable	= OFF_BOARD,
+	},{	/* 15 */
+		.name		= "JMB361",
+		.init_hwif	= init_hwif_generic,
+		.channels	= 2,
+		.autodma	= AUTODMA,
+		.bootable	= OFF_BOARD,
+	},{	/* 16 */
+		.name		= "JMB363",
+		.init_hwif	= init_hwif_generic,
+		.channels	= 2,
+		.autodma	= AUTODMA,
+		.bootable	= OFF_BOARD,
+	},{	/* 17 */
+		.name		= "JMB365",
+		.init_hwif	= init_hwif_generic,
+		.channels	= 2,
+		.autodma	= AUTODMA,
+		.bootable	= OFF_BOARD,
+	},{	/* 18 */
+		.name		= "JMB366",
+		.init_hwif	= init_hwif_generic,
+		.channels	= 2,
+		.autodma	= AUTODMA,
+		.bootable	= OFF_BOARD,
+	},{	/* 19 */
+		.name		= "JMB368",
+		.init_hwif	= init_hwif_generic,
+		.channels	= 2,
+		.autodma	= AUTODMA,
+		.bootable	= OFF_BOARD,
 	}
 };
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2537
retrieving revision 1.2538
diff -u -r1.2537 -r1.2538
--- kernel-2.6.spec	9 Aug 2006 21:34:39 -0000	1.2537
+++ kernel-2.6.spec	9 Aug 2006 21:37:53 -0000	1.2538
@@ -400,6 +400,7 @@
 Patch1650: linux-2.6-serial-460800.patch
 Patch1660: linux-2.6-hotplug-cpu-workqueue.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
+Patch1680: linux-2.6-ide-missing-bits.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
@@ -924,6 +925,8 @@
 %patch1660 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
+# Add some missing IDE fixes.
+%patch1680 -p1
 # Only print migration info on SMP
 %patch1710 -p1
 # setuid /proc/self/maps fix.
@@ -1700,6 +1703,7 @@
 - Daily update from GregKH's git tree.
 - Unbreak SMP locking in oprofile.
 - Fix hotplug CPU locking in workqueue creation.
+- Fix IDE oops on boot.
 
 * Tue Aug  8 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace/ptrace interactions with SELinux.



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:43:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:43:25 -0400
Subject: rpms/conga/FC-5 sources,1.11,1.12
Message-ID: <200608092143.k79LhPeM004670@cvs.devel.redhat.com>

Author: kupcevic

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

Modified Files:
	sources 
Log Message:
typo


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	9 Aug 2006 21:28:21 -0000	1.11
+++ sources	9 Aug 2006 21:43:22 -0000	1.12
@@ -1 +1 @@
-dd30ba43abcb4e187821f5ffed6d42b7  conga-0.8.tar.gz
+262ceb4fe63b1dbe86853b0d7d72bd78  conga-0.8.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:45:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:45:03 -0400
Subject: rpms/kernel/devel linux-2.6-x86-64-edac-support.patch, NONE,
	1.1 kernel-2.6.spec, 1.2538, 1.2539
Message-ID: <200608092145.k79Lj3KN005019@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-x86-64-edac-support.patch 
Log Message:
K8 EDAC support

linux-2.6-x86-64-edac-support.patch:
 MAINTAINERS            |    6 
 drivers/edac/Kconfig   |    7 
 drivers/edac/Makefile  |    1 
 drivers/edac/edac_mc.c |   28 
 drivers/edac/edac_mc.h |    1 
 drivers/edac/k8_edac.c | 1882 +++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 1925 insertions(+)

--- NEW FILE linux-2.6-x86-64-edac-support.patch ---
Index: linux-2.6.17.noarch/drivers/edac/edac_mc.c
===================================================================
--- linux-2.6.17.noarch.orig/drivers/edac/edac_mc.c	2006-07-31 09:00:32.000000000 -0300
+++ linux-2.6.17.noarch/drivers/edac/edac_mc.c	2006-07-31 09:05:27.000000000 -0300
@@ -1392,6 +1392,34 @@
 }
 
 /**
+ * edac_mc_find: Search for a mem_ctl_info structure whose index is 'idx'.
+ *
+ * If found, return a pointer to the structure.
+ * Else return NULL.
+ *
+ * Caller must hold mem_ctls_mutex.
+ */
+struct mem_ctl_info * edac_mc_find(int idx)
+{
+	struct list_head *item;
+	struct mem_ctl_info *mci;
+
+	list_for_each(item, &mc_devices) {
+		mci = list_entry(item, struct mem_ctl_info, link);
+
+		if (mci->mc_idx >= idx) {
+			if (mci->mc_idx == idx)
+				return mci;
+
+			break;
+		}
+	}
+
+	return NULL;
+}
+EXPORT_SYMBOL(edac_mc_find);
+
+/**
  * edac_mc_add_mc: Insert the 'mci' structure into the mci global list and
  *                 create sysfs entries associated with mci structure
  * @mci: pointer to the mci structure to be added to the list
Index: linux-2.6.17.noarch/drivers/edac/edac_mc.h
===================================================================
--- linux-2.6.17.noarch.orig/drivers/edac/edac_mc.h	2006-07-31 09:00:32.000000000 -0300
+++ linux-2.6.17.noarch/drivers/edac/edac_mc.h	2006-07-31 09:05:27.000000000 -0300
@@ -412,6 +412,7 @@
 void edac_mc_dump_csrow(struct csrow_info *csrow);
 #endif  /* CONFIG_EDAC_DEBUG */
 
+extern struct mem_ctl_info * edac_mc_find(int idx);
 extern int edac_mc_add_mc(struct mem_ctl_info *mci,int mc_idx);
 extern struct mem_ctl_info * edac_mc_del_mc(struct device *dev);
 extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
Index: linux-2.6.17.noarch/drivers/edac/k8_edac.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.17.noarch/drivers/edac/k8_edac.c	2006-07-31 09:08:17.000000000 -0300
@@ -0,0 +1,1882 @@
+/*
+ * AMD K8 class Memory Controller kernel module
+ *
+ * This file may be distributed under the terms of the
+ * GNU General Public License.
+ *
+ * Written by Thayne Harbaugh Linux Networx (http://lnxi.com)
+ *
+ *      Changes by Douglas "norsk" Thompson  <norsk5 at xmission.com>:
+ *          - K8 CPU Revision D and greater support
+ *
+ *      Changes by Dave Peterson <dsp at llnl.gov> <dave_peterson at pobox.com>:
+ *          - Module largely rewritten, with new (and hopefully correct)
+ *            code for dealing with node and chip select interleaving, various
+ *            code cleanup, and bug fixes
+ *          - Added support for memory hoisting using DRAM hole address
+ *            register
+ *
+ * This module is based on the following document (available from
+ * http://www.amd.com/):
+ *
+ *     Title: BIOS and Kernel Developer's Guide for AMD Athlon 64 and AMD
+ *            Opteron Processors
+ *     AMD publication #: 26094
+ *     Revision: 3.26
+ *
+ * Unless otherwise stated, section numbers mentioned in the comments below
+ * refer to this document.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/slab.h>
+#include <asm/mmzone.h>
+#include "edac_mc.h"
+
+#define k8_printk(level, fmt, arg...) \
+	edac_printk(level, "k8", fmt, ##arg)
+
+#define k8_mc_printk(mci, level, fmt, arg...) \
+	edac_mc_chipset_printk(mci, level, "k8", fmt, ##arg)
+
+/* Throughout the comments in this code, the terms SysAddr, DramAddr, and
+ * InputAddr are used.  These terms come directly from the k8 documentation
+ * (AMD publication #26094).  They are defined as follows:
+ *
+ *     SysAddr:
+ *         This is a physical address generated by a CPU core or a device
+ *         doing DMA.  If generated by a CPU core, a SysAddr is the result of
+ *         a virtual to physical address translation by the CPU core's address
+ *         translation mechanism (MMU).
+ *
+ *     DramAddr:
+ *         A DramAddr is derived from a SysAddr by subtracting an offset that
+ *         depends on which node the SysAddr maps to and whether the SysAddr
+ *         is within a range affected by memory hoisting.  The DRAM Base
+ *         (section 3.4.4.1) and DRAM Limit (section 3.4.4.2) registers
+ *         determine which node a SysAddr maps to.
+ *
+ *         If the DRAM Hole Address Register (DHAR) is enabled and the SysAddr
+ *         is within the range of addresses specified by this register, then
+ *         a value x from the DHAR is subtracted from the SysAddr to produce a
+ *         DramAddr.  Here, x represents the base address for the node that
+ *         the SysAddr maps to plus an offset due to memory hoisting.  See
+ *         section 3.4.8 and the comments in get_dram_hole_info() and
+ *         sys_addr_to_dram_addr() below for more information.
+ *
+ *         If the SysAddr is not affected by the DHAR then a value y is
+ *         subtracted from the SysAddr to produce a DramAddr.  Here, y is the
+ *         base address for the node that the SysAddr maps to.  See section
+ *         3.4.4 and the comments in sys_addr_to_dram_addr() below for more
+ *         information.
+ *
+ *     InputAddr:
+ *         A DramAddr is translated to an InputAddr before being passed to the
+ *         memory controller for the node that the DramAddr is associated
+ *         with.  The memory controller then maps the InputAddr to a csrow.
+ *         If node interleaving is not in use, then the InputAddr has the same
+ *         value as the DramAddr.  Otherwise, the InputAddr is produced by
+ *         discarding the bits used for node interleaving from the DramAddr.
+ *         See section 3.4.4 for more information.
+ *
+ *         The memory controller for a given node uses its DRAM CS Base and
+ *         DRAM CS Mask registers to map an InputAddr to a csrow.  See
+ *         sections 3.5.4 and 3.5.5 for more information.
+ */
+
+/*
+ * Alter this version for the K8 module when modifications are made
+ */
+#define EDAC_K8_VERSION    " Ver: 2.0.0 " __DATE__
+#define EDAC_MOD_STR	"k8_edac"
+
+#ifndef PCI_DEVICE_ID_AMD_OPT_0_HT
+#define PCI_DEVICE_ID_AMD_OPT_0_HT	0x1100
+#endif				/* PCI_DEVICE_ID_AMD_OPT_0_HT */
+
+#ifndef PCI_DEVICE_ID_AMD_OPT_1_ADDRMAP
+#define PCI_DEVICE_ID_AMD_OPT_1_ADDRMAP	0x1101
+#endif				/* PCI_DEVICE_ID_AMD_OPT_1_ADDRMAP */
+
+#ifndef PCI_DEVICE_ID_AMD_OPT_2_MEMCTL
+#define PCI_DEVICE_ID_AMD_OPT_2_MEMCTL	0x1102
+#endif				/* PCI_DEVICE_ID_AMD_OPT_2_MEMCTL */
+
+#ifndef PCI_DEVICE_ID_AMD_OPT_3_MISCCTL
+#define PCI_DEVICE_ID_AMD_OPT_3_MISCCTL	0x1103
+#endif				/* PCI_DEVICE_ID_AMD_OPT_3_MISCCTL */
+
+/* Extended Model from CPUID, for CPU Revision numbers */
+#define OPTERON_CPU_LE_REV_C    0
+#define OPTERON_CPU_REV_D       1
+#define OPTERON_CPU_REV_E       2
+
+#define K8_NR_CSROWS 8
+#define MAX_K8_NODES 8
+
+/* K8 register addresses - device 0 function 1 - Address Map */
+#define K8_DBR		0x40	/* DRAM Base Register (8 x 32b
+				 * interlaced with K8_DLR)
+				 *
+				 * 31:16 DRAM Base addr 39:24
+				 * 15:11 reserved
+				 * 10:8  interleave enable
+				 *  7:2  reserved
+				 *  1    write enable
+				 *  0    read enable
+				 */
+
+#define K8_DLR		0x44	/* DRAM Limit Register (8 x 32b
+				 * interlaced with K8_DBR)
+				 *
+				 * 31:16 DRAM Limit addr 32:24
+				 * 15:11 reserved
+				 * 10:8  interleave select
+				 *  7:3  reserved
+				 *  2:0  destination node ID
+				 */
+
+#define K8_DHAR         0xf0    /* DRAM Hole Address Register
+				 *
+				 * 31:24 DramHoleBase
+				 * 23:16 reserved
+				 * 15:8  DramHoleOffset
+				 *  7:1  reserved
+				 *    0  DramHoleValid
+				 */
+
+/* K8 register addresses - device 0 function 2 - DRAM controller */
+#define K8_DCSB		0x40	/* DRAM Chip-Select Base (8 x 32b)
+				 *
+				 * 31:21 Base addr high 35:25
+				 * 20:16 reserved
+				 * 15:9  Base addr low 19:13 (interlvd)
+				 *  8:1  reserved
+				 *  0    chip-select bank enable
+				 */
+
+#define K8_DCSM		0x60	/* DRAM Chip-Select Mask (8 x 32b)
+				 *
+				 * 31:30 reserved
+				 * 29:21 addr mask high 33:25
+				 * 20:16 reserved
+				 * 15:9  addr mask low  19:13
+				 *  8:0  reserved
+				 */
+
+/* selects bits 29-21 and 15-9 from DCSM */
+#define DCSM_MASK_BITS 0x3fe0fe00
+
+#define K8_DBAM		0x80	/* DRAM Base Addr Mapping (32b) */
+
+#define K8_DCL		0x90	/* DRAM configuration low reg (32b)
+				 *
+				 * 31:28 reserved
+				 * 27:25 Bypass Max: 000b=respect
+				 * 24    Dissable receivers - no sockets
+				 * 23:20 x4 DIMMS
+				 * 19    32byte chunks
+				 * 18    Unbuffered
+				 * 17    ECC enabled
+				 * 16    128/64 bit (dual/single chan)
+				 * 15:14 R/W Queue bypass count
+				 * 13    Self refresh
+				 * 12    exit self refresh
+				 * 11    mem clear status
+				 * 10    DRAM enable
+				 *  9    reserved
+				 *  8    DRAM init
+				 *  7:4  reserved
+				 *  3    dis DQS hysteresis
+				 *  2    QFC enabled
+				 *  1    DRAM drive strength
+				 *  0    Digital Locked Loop disable
+				 */
+
+/* K8 register addresses - device 0 function 3 - Misc Control */
+#define K8_NBCTL	0x40	/* MCA NB Control (32b)
+				 *
+				 *  1    MCA UE Reporting
+				 *  0    MCA CE Reporting
+				 */
+
+#define K8_NBCFG	0x44	/* MCA NB Config (32b)
+				 *
+				 * 23    Chip-kill x4 ECC enable
+				 * 22    ECC enable
+				 *  1    CPU ECC enable
+				 */
+
+#define K8_NBSL		0x48	/* MCA NB Status Low (32b)
+				 *
+				 * 31:24 Syndrome 15:8 chip-kill x4
+				 * 23:20 reserved
+				 * 19:16 Extended err code
+				 * 15:0  Err code
+				 */
+
+#define K8_NBSH		0x4C	/* MCA NB Status High (32b)
+				 *
+				 * 31    Err valid
+				 * 30    Err overflow
+				 * 29    Uncorrected err
+				 * 28    Err enable
+				 * 27    Misc err reg valid
+				 * 26    Err addr valid
+				 * 25    proc context corrupt
+				 * 24:23 reserved
+				 * 22:15 Syndrome 7:0
+				 * 14    CE
+				 * 13    UE
+				 * 12:9  reserved
+				 *  8    err found by scrubber
+				 *  7    reserved
+				 *  6:4  Hyper-transport link number
+				 *  3:2  reserved
+				 *  1    Err CPU 1
+				 *  0    Err CPU 0
+				 */
+
+#define K8_NBSH_VALID_BIT BIT(31)
+
+#define K8_NBEAL	0x50	/* MCA NB err addr low (32b)
+				 *
+				 * 31:3  Err addr low 31:3
+				 *  2:0  reserved
+				 */
+
+#define K8_NBEAH	0x54	/* MCA NB err addr high (32b)
+				 *
+				 * 31:8  reserved
+				 *  7:0  Err addr high 39:32
+				 */
+
+#define K8_NBCAP	0xE8	/* MCA NB capabilities (32b)
+				 *
+				 * 31:9  reserved
+				 *  4    S4ECD4ED capable
+				 *  3    SECDED capable
+				 */
+
+				/* MSR's */
+
+				/*
+				 * K8_MSR_MCxCTL (64b)
+				 * (0x400,404,408,40C,410)
+				 * 63    Enable reporting source 63
+				 *  .
+				 *  .
+				 *  .
+				 *  2    Enable error source 2
+				 *  1    Enable error source 1
+				 *  0    Enable error source 0
+				 */
+
+				/*
+				 * K8_MSR_MCxSTAT (64b)
+				 * (0x401,405,409,40D,411)
+				 * 63    Error valid
+				 * 62    Status overflow
+				 * 61    UE
+				 * 60    Enabled error condition
+				 * 59    Misc register valid (not used)
+				 * 58    Err addr register valid
+				 * 57    Processor context corrupt
+				 * 56:32 Other information
+				 * 31:16 Model specific error code
+				 * 15:0  MCA err code
+				 */
+
+				/*
+				 * K8_MSR_MCxADDR (64b)
+				 * (0x402,406,40A,40E,412)
+				 * 63:48 reserved
+				 * 47:0  Address
+				 */
+
+				/*
+				 * K8_MSR_MCxMISC (64b)
+				 * (0x403,407,40B,40F,413)
+				 * Unused on Athlon64 and K8
+				 */
+
+#define K8_MSR_MCGCTL	0x017b	/* Machine Chk Global report ctl (64b)
+				 *
+				 * 31:5  reserved
+				 *  4    North Bridge
+				 *  3    Load/Store
+				 *  2    Bus Unit
+				 *  1    Instruction Cache
+				 *  0    Data Cache
+				 */
+
+#define K8_MSR_MC4CTL	0x0410	/* North Bridge Check report ctl (64b) */
+#define K8_MSR_MC4STAT	0x0411	/* North Bridge status (64b) */
+#define K8_MSR_MC4ADDR	0x0412	/* North Bridge Address (64b) */
+
+static inline int MCI_TO_NODE_ID(struct mem_ctl_info *mci)
+{
+	return PCI_SLOT(to_pci_dev(mci->dev)->devfn) - 0x18;
+}
+
+/* Ugly hack that allows module to compile when built as part of a 32-bit
+ * kernel.  Just in case anyone wants to run a 32-bit kernel on their Opteron.
+ */
+#ifndef MAXNODE
+#define MAXNODE 8
+#endif
+
+/* Each entry holds the CPU revision of all CPU cores for the given node. */
+static int k8_node_revision_table[MAXNODE] = { 0 };
+
+static inline int node_rev(int node_id)
+{
+	return k8_node_revision_table[node_id];
+}
+
+static void store_node_revision(void *param)
+{
+	int node_id, revision;
+
+	/* Multiple CPU cores on the same node will all write their revision
+	 * number to the same array entry.  This is ok.  For a given node, all
+	 * CPU cores are on the same piece of silicon and share the same
+	 * revision number.
+	 */
+	node_id = (cpuid_ebx(1) >> 24) & 0x07;
+	revision = (cpuid_eax(1) >> 16) & 0x0f;
+	k8_node_revision_table[node_id] = revision;
+}
+
+/* Initialize k8_node_revision_table. */
+static void build_node_revision_table(void)
+{
+	static int initialized = 0;
+
+	if (initialized)
+		return;
+
+	on_each_cpu(store_node_revision, NULL, 1, 1);
+	initialized = 1;
+}
+
+enum k8_chips {
+	OPTERON = 0,
+};
+
+struct k8_pvt {
+	struct pci_dev *addr_map;
+	struct pci_dev *misc_ctl;
+
+	int node_id;  /* ID of this node */
+
+	/* The values of these registers will remain constant so we might as
+	 * well cache them here.
+	 */
+	u32 dcl;
+	u32 dbr[MAX_K8_NODES];
+	u32 dlr[MAX_K8_NODES];
+	u32 nbcap;
+	u32 dcsb[K8_NR_CSROWS];
+	u32 dcsm[K8_NR_CSROWS];
+	u32 dhar;
+	u32 dbam;
+};
+
+struct k8_error_info_regs {
+	u32 nbsh;
+	u32 nbsl;
+	u32 nbeah;
+	u32 nbeal;
+};
+
+struct k8_error_info {
+	struct k8_error_info_regs error_info;
+	u32 nbcfg;
+	int race_condition_detected;
+};
+
+struct k8_dev_info {
+	const char *ctl_name;
+	u16 addr_map;
+	u16 misc_ctl;
+};
+
+static const struct k8_dev_info k8_devs[] = {
+	[OPTERON] = {
+		     .ctl_name = "Athlon64/Opteron",
+		     .addr_map = PCI_DEVICE_ID_AMD_OPT_1_ADDRMAP,
+		     .misc_ctl = PCI_DEVICE_ID_AMD_OPT_3_MISCCTL},
+};
+
+static struct pci_dev * pci_get_related_function(unsigned int vendor,
+		unsigned int device, struct pci_dev *related)
+{
+	struct pci_dev *dev;
+
+	dev = NULL;
+
+	while ((dev = pci_get_device(vendor, device, dev)) != NULL) {
+		if ((dev->bus->number == related->bus->number) &&
+		    (PCI_SLOT(dev->devfn) == PCI_SLOT(related->devfn)))
+			break;
+	}
+
+	return dev;
+}
+
+/* FIXME - stolen from msr.c - the calls in msr.c could be exported */
+struct msr_command {
+	int cpu;
+	int err;
+	u32 reg;
+	u32 data[2];
+};
+
+static void smp_wrmsr(void *cmd_block)
+{
+	struct msr_command *cmd = cmd_block;
+	wrmsr(cmd->reg, cmd->data[0], cmd->data[1]);
+}
+
+static void smp_rdmsr(void *cmd_block)
+{
+	struct msr_command *cmd = cmd_block;
+	rdmsr(cmd->reg, cmd->data[0], cmd->data[1]);
+}
+
+static void do_wrmsr(int cpu, u32 reg, u32 eax, u32 edx)
+{
+	struct msr_command cmd;
+
+	cmd.cpu = raw_smp_processor_id();
+	cmd.reg = reg;
+	cmd.data[0] = eax;
+	cmd.data[1] = edx;
+	on_each_cpu(smp_wrmsr, &cmd, 1, 1);
+}
+
+static void do_rdmsr(int cpu, u32 reg, u32 *eax, u32 *edx)
+{
+	struct msr_command cmd;
+
+	cmd.cpu = raw_smp_processor_id();
+	cmd.reg = reg;
+	on_each_cpu(smp_rdmsr, &cmd, 1, 1);
+	*eax = cmd.data[0];
+	*edx = cmd.data[1];
+}
+
+/*
+ * FIXME - This is a large chunk of memory to suck up just to decode the
+ * syndrome.  It would be nice to discover a pattern in the syndromes that
+ * could be used to quickly identify the channel.  The big problems with
+ * this table is memory usage, lookup speed (could sort and binary search),
+ * correctness (there could be a transcription error).  A zero in any nibble
+ * for a syndrom is always channel 0, but that only decodes some of the
+ * syndromes.  Can anyone find any other patterns?
+ *
+ * The comment in the left column is the nibble that is in error.  The least
+ * significant nibble of the syndrome is the mask for the bits that are
+ * in error (need to be toggled) for the particular nibble.
+ */
+#define SYNDROME_TABLE_SIZE 270
+static const unsigned long syndromes_chan0[SYNDROME_TABLE_SIZE] = {
+	/*0 */ 0xe821, 0x7c32, 0x9413, 0xbb44, 0x5365, 0xc776, 0x2f57,
+	0xdd88, 0x35a9, 0xa1ba, 0x499b, 0x66cc, 0x8eed, 0x1afe, 0xf2df,
+	/*1 */ 0x5d31, 0xa612, 0xfb23, 0x9584, 0xc8b5, 0x3396, 0x6ea7,
+	0xeac8, 0xb7f9, 0x4cda, 0x11eb, 0x7f4c, 0x227d, 0xd95e, 0x846f,
+	/*2 */ 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+	0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+	/*3 */ 0x2021, 0x3032, 0x1013, 0x4044, 0x6065, 0x7076, 0x5057,
+	0x8088, 0xa0a9, 0xb0ba, 0x909b, 0xc0cc, 0xe0ed, 0xf0fe, 0xd0df,
+	/*4 */ 0x5041, 0xa082, 0xf0c3, 0x9054, 0xc015, 0x30d6, 0x6097,
+	0xe0a8, 0xb0e9, 0x402a, 0x106b, 0x70fc, 0x20bd, 0xd07e, 0x803f,
+	/*5 */ 0xbe21, 0xd732, 0x6913, 0x2144, 0x9f65, 0xf676, 0x4857,
+	0x3288, 0x8ca9, 0xe5ba, 0x5b9b, 0x13cc, 0xaded, 0xc4fe, 0x7adf,
+	/*6 */ 0x4951, 0x8ea2, 0xc7f3, 0x5394, 0x1ac5, 0xdd36, 0x9467,
+	0xa1e8, 0xe8b9, 0x2f4a, 0x661b, 0xf27c, 0xbb2d, 0x7cde, 0x358f,
+	/*7 */ 0x74e1, 0x9872, 0xec93, 0xd6b4, 0xa255, 0x4ec6, 0x3a27,
+	0x6bd8, 0x1f39, 0xf3aa, 0x874b, 0xbd6c, 0xc98d, 0x251e, 0x51ff,
+	/*8 */ 0x15c1, 0x2a42, 0x3f83, 0xcef4, 0xdb35, 0xe4b6, 0xf177,
+	0x4758, 0x5299, 0x6d1a, 0x78db, 0x89ac, 0x9c6d, 0xa3ee, 0xb62f,
+	/*9 */ 0x3d01, 0x1602, 0x2b03, 0x8504, 0xb805, 0x9306, 0xae07,
+	0xca08, 0xf709, 0xdc0a, 0xe10b, 0x4f0c, 0x720d, 0x590e, 0x640f,
+	/*a */ 0x9801, 0xec02, 0x7403, 0x6b04, 0xf305, 0x8706, 0x1f07,
+	0xbd08, 0x2509, 0x510a, 0xc90b, 0xd60c, 0x4e0d, 0x3a0e, 0xa20f,
+	/*b */ 0xd131, 0x6212, 0xb323, 0x3884, 0xe9b5, 0x5a96, 0x8ba7,
+	0x1cc8, 0xcdf9, 0x7eda, 0xafeb, 0x244c, 0xf57d, 0x465e, 0x976f,
+	/*c */ 0xe1d1, 0x7262, 0x93b3, 0xb834, 0x59e5, 0xca56, 0x2b87,
+	0xdc18, 0x3dc9, 0xae7a, 0x4fab, 0x542c, 0x85fd, 0x164e, 0xf79f,
+	/*d */ 0x6051, 0xb0a2, 0xd0f3, 0x1094, 0x70c5, 0xa036, 0xc067,
+	0x20e8, 0x40b9, 0x904a, 0x601b, 0x307c, 0x502d, 0x80de, 0xe08f,
+	/*e */ 0xa4c1, 0xf842, 0x5c83, 0xe6f4, 0x4235, 0x1eb6, 0xba77,
+	0x7b58, 0xdf99, 0x831a, 0x27db, 0x9dac, 0x396d, 0x65ee, 0xc12f,
+	/*f */ 0x11c1, 0x2242, 0x3383, 0xc8f4, 0xd935, 0xeab6, 0xfb77,
+	0x4c58, 0x5d99, 0x6e1a, 0x7fdb, 0x84ac, 0x9562, 0xa6ee, 0xb72f,
+
+	/*20 */ 0xbe01, 0xd702, 0x6903, 0x2104, 0x9f05, 0xf606, 0x4807,
+	0x3208, 0x8c09, 0xe50a, 0x5b0b, 0x130c, 0xad0d, 0xc40e, 0x7a0f,
+	/*21 */ 0x4101, 0x8202, 0xc303, 0x5804, 0x1905, 0xda06, 0x9b07,
+	0xac08, 0xed09, 0x2e0a, 0x6f0b, 0x640c, 0xb50d, 0x760e, 0x370f
+};
+
+static const unsigned long syndromes_chan1[SYNDROME_TABLE_SIZE] = {
+	/*10 */ 0x45d1, 0x8a62, 0xcfb3, 0x5e34, 0x1be5, 0xd456, 0x9187,
+	0xa718, 0xe2c9, 0x2d7a, 0x68ab, 0xf92c, 0xbcfd, 0x734e, 0x369f,
+	/*11 */ 0x63e1, 0xb172, 0xd293, 0x14b4, 0x7755, 0xa5c6, 0xc627,
+	0x28d8, 0x4b39, 0x99aa, 0xfa4b, 0x3c6c, 0x5f8d, 0x8d1e, 0xeeff,
+	/*12 */ 0xb741, 0xd982, 0x6ec3, 0x2254, 0x9515, 0xfbd6, 0x4c97,
+	0x33a8, 0x84e9, 0xea2a, 0x5d6b, 0x11fc, 0xa6bd, 0xc87e, 0x7f3f,
+	/*13 */ 0xdd41, 0x6682, 0xbbc3, 0x3554, 0xe815, 0x53d6, 0xce97,
+	0x1aa8, 0xc7e9, 0x7c2a, 0xa1fb, 0x2ffc, 0xf2bd, 0x497e, 0x943f,
+	/*14 */ 0x2bd1, 0x3d62, 0x16b3, 0x4f34, 0x64e5, 0x7256, 0x5987,
+	0x8518, 0xaec9, 0xb87a, 0x93ab, 0xca2c, 0xe1fd, 0xf74e, 0xdc9f,
+	/*15 */ 0x83c1, 0xc142, 0x4283, 0xa4f4, 0x2735, 0x65b6, 0xe677,
+	0xf858, 0x7b99, 0x391a, 0xbadb, 0x5cac, 0xdf6d, 0x9dee, 0x1e2f,
+	/*16 */ 0x8fd1, 0xc562, 0x4ab3, 0xa934, 0x26e5, 0x6c56, 0xe387,
+	0xfe18, 0x71c9, 0x3b7a, 0xb4ab, 0x572c, 0xd8fd, 0x924e, 0x1d9f,
+	/*17 */ 0x4791, 0x89e2, 0xce73, 0x5264, 0x15f5, 0xdb86, 0x9c17,
+	0xa3b8, 0xe429, 0x2a5a, 0x6dcb, 0xf1dc, 0xb64d, 0x783e, 0x3faf,
+	/*18 */ 0x5781, 0xa9c2, 0xfe43, 0x92a4, 0xc525, 0x3b66, 0x6ce7,
+	0xe3f8, 0xb479, 0x4a3a, 0x1dbb, 0x715c, 0x26dd, 0xd89e, 0x8f1f,
+	/*19 */ 0xbf41, 0xd582, 0x6ac3, 0x2954, 0x9615, 0xfcd6, 0x4397,
+	0x3ea8, 0x81e9, 0xeb2a, 0x546b, 0x17fc, 0xa8bd, 0xc27e, 0x7d3f,
+	/*1a */ 0x9891, 0xe1e2, 0x7273, 0x6464, 0xf7f5, 0x8586, 0x1617,
+	0xb8b8, 0x2b29, 0x595a, 0xcacb, 0xdcdc, 0x4f4d, 0x3d3e, 0xaeaf,
+	/*1b */ 0xcce1, 0x4472, 0x8893, 0xfdb4, 0x3f55, 0xb9c6, 0x7527,
+	0x56d8, 0x9a39, 0x12aa, 0xde4b, 0xab6c, 0x678d, 0xef1e, 0x23ff,
+	/*1c */ 0xa761, 0xf9b2, 0x5ed3, 0xe214, 0x4575, 0x1ba6, 0xbcc7,
+	0x7328, 0xd449, 0x8a9a, 0x2dfb, 0x913c, 0x365d, 0x688e, 0xcfef,
+	/*1d */ 0xff61, 0x55b2, 0xaad3, 0x7914, 0x8675, 0x2ca6, 0xd3c7,
+	0x9e28, 0x6149, 0xcb9a, 0x34fb, 0xe73c, 0x185d, 0xb28e, 0x4def,
+	/*1e */ 0x5451, 0xa8a2, 0xfcf3, 0x9694, 0xc2c5, 0x3e36, 0x6a67,
+	0xebe8, 0xbfb9, 0x434a, 0x171b, 0x7d7c, 0x292d, 0xd5de, 0x818f,
+	/*1f */ 0x6fc1, 0xb542, 0xda83, 0x19f4, 0x7635, 0xacb6, 0xc377,
+	0x2e58, 0x4199, 0x9b1a, 0xf4db, 0x37ac, 0x586d, 0x82ee, 0xed2f,
+
+	/*22 */ 0xc441, 0x4882, 0x8cc3, 0xf654, 0x3215, 0xbed6, 0x7a97,
+	0x5ba8, 0x9fe9, 0x132a, 0xd76b, 0xadfc, 0x69bd, 0xe57e, 0x213f,
+	/*23 */ 0x7621, 0x9b32, 0xed13, 0xda44, 0xac65, 0x4176, 0x3757,
+	0x6f88, 0x19a9, 0xf4ba, 0x829b, 0xb5cc, 0xc3ed, 0x2efe, 0x58df
+};
+
+static int chan_from_chipkill_syndrome(unsigned long syndrome)
+{
+	int i;
+
+	debugf0("%s()\n", __func__);
+
+	for (i = 0; i < SYNDROME_TABLE_SIZE; i++) {
+		if (syndromes_chan0[i] == syndrome)
+			return 0;
+		if (syndromes_chan1[i] == syndrome)
+			return 1;
+	}
+
+	debugf0("%s(): syndrome(%lx) not found\n", __func__, syndrome);
+	return -1;
+}
+
+static const char *tt_msgs[] = {	/* transaction type */
+	"inst",
+	"data",
+	"generic",
+	"reserved"
+};
+
+static const char *ll_msgs[] = {	/* cache level */
+	"0",
+	"1",
+	"2",
+	"generic"
+};
+
+static const char *memtt_msgs[] = {
+	"generic",
+	"generic read",
+	"generic write",
+	"data read",
+	"data write",
+	"inst fetch",
+	"prefetch",
+	"evict",
+	"snoop",
+	"unknown error 9",
+	"unknown error 10",
+	"unknown error 11",
+	"unknown error 12",
+	"unknown error 13",
+	"unknown error 14",
+	"unknown error 15"
+};
+
+static const char *pp_msgs[] = {	/* participating processor */
+	"local node origin",
+	"local node response",
+	"local node observed",
+	"generic"
+};
+
+static const char *to_msgs[] = {
+	"no timeout",
+	"timed out"
+};
+
+static const char *ii_msgs[] = {	/* memory or i/o */
+	"mem access",
+	"reserved",
+	"i/o access",
+	"generic"
+};
+
+static const char *ext_msgs[] = {	/* extended error */
+	"ECC error",
+	"CRC error",
+	"sync error",
+	"mst abort",
+	"tgt abort",
+	"GART error",
+	"RMW error",
+	"watchdog error",
+	"ECC chipkill x4 error",
+	"unknown error 9",
+	"unknown error 10",
+	"unknown error 11",
+	"unknown error 12",
+	"unknown error 13",
+	"unknown error 14",
+	"unknown error 15"
+};
+
+static const char *htlink_msgs[] = {
+	"none",
+	"1",
+	"2",
+	"1 2",
+	"3",
+	"1 3",
+	"2 3",
+	"1 2 3"
+};
+
+static inline u64 base_from_dcsb(u32 dcsb)
+{
+	/* 0xffe0fe00 selects bits 31-21 and 15-9 of a DRAM CS Base Address
+	 * Register (section 3.5.4).  Shifting the bits left 4 puts them in
+	 * their proper bit positions of 35-25 and 19-13.
+	 */
+	return ((u64) (dcsb & 0xffe0fe00)) << 4;
+}
+
+static u64 mask_from_dcsm(u32 dcsm)
+{
+	u64 dcsm_bits, other_bits;
+
+	/* Extract bits bits 29-21 and 15-9 from DCSM (section 3.5.5). */
+	dcsm_bits = dcsm & DCSM_MASK_BITS;
+
+	/* Set all bits except bits 33-25 and 19-13. */
+	other_bits = DCSM_MASK_BITS;
+	other_bits = ~(other_bits << 4);
+
+	/* The extracted bits from DCSM belong in the spaces represented by
+	 * the cleared bits in other_bits.
+	 */
+	return (dcsm_bits << 4) | other_bits;
+}
+
+/* In *base and *limit, pass back the full 40-bit base and limit physical
+ * addresses for the node given by node_id.  This information is obtained from
+ * DRAM Base (section 3.4.4.1) and DRAM Limit (section 3.4.4.2) registers. The
+ * base and limit addresses are of type SysAddr, as defined at the start of
+ * section 3.4.4 (p. 70).  They are the lowest and highest physical addresses
+ * in the address range they represent.
+ */
+static void get_base_and_limit(struct k8_pvt *pvt, int node_id,
+		u64 *base, u64 *limit)
+{
+	*base = ((u64) (pvt->dbr[node_id] & 0xffff0000)) << 8;
+
+	/* Since the limit represents the highest address in the range, we
+	 * must set its lowest 24 bits to 1.
+	 */
+	*limit = (((u64) (pvt->dlr[node_id] & 0xffff0000)) << 8) | 0xffffff;
+}
+
+/* Return 1 if the SysAddr given by sys_addr matches the base/limit associated
+ * with node_id
+ */
+static int base_limit_match(struct k8_pvt *pvt, u64 sys_addr, int node_id)
+{
+	u64 base, limit, addr;
+
+	get_base_and_limit(pvt, node_id, &base, &limit);
+
+	/* The k8 treats this as a 40-bit value.  However, bits 63-40 will be
+	 * all ones if the most significant implemented address bit is 1.
+	 * Here we discard bits 63-40.  See section 3.4.2 of AMD publication
+	 * 24592: AMD x86-64 Architecture Programmer's Manual Volume 1
+	 * Application Programming.
+	 */
+	addr = sys_addr & 0x000000ffffffffffull;
+
+	return (addr >= base) && (addr <= limit);
+}
+
+/* Attempt to map a SysAddr to a node.  On success, return a pointer to the
+ * mem_ctl_info structure for the node that the SysAddr maps to.  On failure,
+ * return NULL.
+ */
+static struct mem_ctl_info * find_mc_by_sys_addr(struct mem_ctl_info *mci,
+						u64 sys_addr)
+{
+	struct k8_pvt *pvt;
+	int node_id;
+	u32 intlv_en, bits;
+
+	/* Here we use the DRAM Base (section 3.4.4.1) and DRAM Limit (section
+	 * 3.4.4.2) registers to map the SysAddr to a node ID.
+	 */
+
+	pvt = mci->pvt_info;
+
+	/* The value of this field should be the same for all DRAM Base
+	 * registers.  Therefore we arbitrarily choose to read it from the
+	 * register for node 0.
+	 */
+	intlv_en = pvt->dbr[0] & (0x07 << 8);
+
+	if (intlv_en == 0) {  /* node interleaving is disabled */
+		debugf2("%s(): node interleaving disabled\n", __func__);
+		for (node_id = 0; ; ) {
+			if (base_limit_match(pvt, sys_addr, node_id))
+				break;
+
+			if (++node_id == MAX_K8_NODES) {
+				debugf2("%s(): sys_addr 0x%lx "
+					"does not match any node\n", __func__,
+					(unsigned long) sys_addr);
+				return NULL;
+			}
+		}
+
+		goto found;
+	}
+
+	if (unlikely((intlv_en != (0x01 << 8)) &&
+		     (intlv_en != (0x03 << 8)) &&
+		     (intlv_en != (0x07 << 8)))) {
+		k8_printk(KERN_WARNING,
+			  "%s(): junk value of 0x%x extracted from IntlvEn "
+			  "field of DRAM Base Register for node 0: This "
+			  "probably indicates a BIOS bug.\n", __func__,
+			  intlv_en);
+		return NULL;
+	}
+
+	/* If we get this far, node interleaving is enabled. */
+	debugf2("%s(): node interleaving enabled\n", __func__);
+	bits = (((u32) sys_addr) >> 12) & intlv_en;
+
+	for (node_id = 0; ; ) {
+		if ((pvt->dlr[node_id] & intlv_en) == bits)
+			break;  /* intlv_sel field matches */
+
+		if (++node_id == MAX_K8_NODES) {
+			debugf2("%s(): sys_addr 0x%lx does not match any "
+				"node\n", __func__, (unsigned long) sys_addr);
+			return NULL;
+		}
+	}
+
+	/* sanity test for sys_addr */
+	if (unlikely(!base_limit_match(pvt, sys_addr, node_id))) {
+		k8_printk(KERN_WARNING,
+			  "%s(): sys_addr 0x%lx falls outside base/limit "
+			  "address range for node %d with node interleaving "
+			  "enabled.\n", __func__, (unsigned long) sys_addr,
+			  node_id);
+		return NULL;
+	}
+
+found:
+	debugf2("%s(): sys_addr 0x%lx matches node %d\n", __func__,
+		(unsigned long) sys_addr, node_id);
+	return edac_mc_find(node_id);
+}
+
+/* Return the base value defined by the DRAM Base register for the node
+ * represented by mci.  This function returns the full 40-bit value despite
+ * the fact that the register only stores bits 39-24 of the value.  See
+ * section 3.4.4.1.
+ */
+static inline u64 get_dram_base(struct mem_ctl_info *mci)
+{
+	struct k8_pvt *pvt;
+
+	pvt = mci->pvt_info;
+	return ((u64) (pvt->dbr[pvt->node_id] & 0xffff0000)) << 8;
+}
+
+/* Obtain info from the DRAM Hole Address Register (section 3.4.8) for the
+ * node represented by mci.  Info is passed back in *hole_base, *hole_offset,
+ * and *hole_size.  Function returns 0 if info is valid or 1 if info is
+ * invalid.  Info may be invalid for either of the following reasons:
+ *
+ *     - The revision of the node is not E or greater.  In this case, the DRAM
+ *       Hole Address Register does not exist.
+ *     - The DramHoleValid bit is cleared in the DRAM Hole Address Register,
+ *       indicating that its contents are not valid.
+ *
+ * The values passed back in *hole_base, *hole_offset, and *hole_size are
+ * complete 32-bit values despite the fact that the bitfields in the DHAR
+ * only represent bits 31-24 of the base and offset values.
+ */
+static int get_dram_hole_info(struct mem_ctl_info *mci, u64 *hole_base,
+		u64 *hole_offset, u64 *hole_size)
+{
+	struct k8_pvt *pvt;
+	u64 base;
+
+	pvt = mci->pvt_info;
+
+	if (node_rev(pvt->node_id) < OPTERON_CPU_REV_E) {
+		debugf2("revision %d for node %d does not support DHAR\n",
+			node_rev(pvt->node_id), pvt->node_id);
+		return 1;
+	}
+
+	if ((pvt->dhar & 0x01) == 0) {
+		debugf2("DramHoleValid bit cleared in DHAR for node %d\n",
+			pvt->node_id);
+		return 1;  /* DramHoleValid bit is cleared */
+	}
+
+	/* +------------------+--------------------+--------------------+-----
+	 * | memory           | DRAM hole          | relocated          |
+	 * | [0, (x - 1)]     | [x, 0xffffffff]    | addresses from     |
+	 * |                  |                    | DRAM hole          |
+	 * |                  |                    | [0x100000000,      |
+	 * |                  |                    |  (0x100000000+     |
+	 * |                  |                    |   (0xffffffff-x))] |
+	 * +------------------+--------------------+--------------------+-----
+	 *
+	 * Above is a diagram of physical memory showing the DRAM hole and the
+	 * relocated addresses from the DRAM hole.  As shown, the DRAM hole
+	 * starts at address x (the base address) and extends through address
+	 * 0xffffffff.  The DRAM Hole Address Register (DHAR) relocates the
+	 * addresses in the hole so that they start at 0x100000000.
+	 */
+
+	base = pvt->dhar & 0xff000000;
+	*hole_base = base;
+	*hole_offset = (pvt->dhar & 0x0000ff00) << 16;
+	*hole_size = (0x1ull << 32) - base;
+	debugf2("DHAR info for node %d: base 0x%lx offset 0x%lx size 0x%lx\n",
+		pvt->node_id, (unsigned long) *hole_base,
+		(unsigned long) *hole_offset, (unsigned long) *hole_size);
+	return 0;
+}
+
+/* Return the DramAddr that the SysAddr given by sys_addr maps to.  It is
+ * assumed that sys_addr maps to the node given by mci.
+ */
+static u64 sys_addr_to_dram_addr(struct mem_ctl_info *mci, u64 sys_addr)
+{
+	u64 dram_base, hole_base, hole_offset, hole_size, dram_addr;
+
+	/* The first part of section 3.4.4 (p. 70) shows how the DRAM Base
+	 * (section 3.4.4.1) and DRAM Limit (section 3.4.4.2) registers are
+	 * used to translate a SysAddr to a DramAddr.  If the DRAM Hole
+	 * Address Register (DHAR) is enabled, then it is also involved in
+	 * translating a SysAddr to a DramAddr.  Sections 3.4.8 and 3.5.8.2
+	 * describe the DHAR and how it is used for memory hoisting.  These
+	 * parts of the documentation are unclear.  I interpret them as
+	 * follows:
+	 *
+	 *     When node n receives a SysAddr, it processes the SysAddr as
+	 *     follows:
+	 *
+	 *         1.  It extracts the DRAMBase and DRAMLimit values from the
+	 *             DRAM Base and DRAM Limit registers for node n.  If the
+	 *             SysAddr is not within the range specified by the base
+	 *             and limit values, then node n ignores the Sysaddr
+	 *             (since it does not map to node n).  Otherwise continue
+	 *             to step 2 below.
+	 *
+	 *         2.  If the DramHoleValid bit of the DHAR for node n is
+	 *             clear, the DHAR is disabled so skip to step 3 below.
+	 *             Otherwise see if the SysAddr is within the range of
+	 *             relocated addresses (starting at 0x100000000) from the
+	 *             DRAM hole.  If not, skip to step 3 below.  Else get the
+	 *             value of the DramHoleOffset field from the DHAR.  To
+	 *             obtain the DramAddr, subtract the offset defined by
+	 *             this value from the SysAddr.
+	 *
+	 *         3.  Obtain the base address for node n from the DRAMBase
+	 *             field of the DRAM Base register for node n.  To obtain
+	 *             the DramAddr, subtract the base address from the
+	 *             SysAddr, as shown near the start of section 3.4.4
+	 *             (p. 70).
+	 */
+
+	dram_base = get_dram_base(mci);
+
+	if (!get_dram_hole_info(mci, &hole_base, &hole_offset, &hole_size)) {
+		if ((sys_addr >= (1ull << 32)) &&
+		    (sys_addr < ((1ull << 32) + hole_size))) {
+			/* use DHAR to translate SysAddr to DramAddr */
+			dram_addr = sys_addr - hole_offset;
+			debugf2("using DHAR to translate SysAddr 0x%lx to "
+				"DramAddr 0x%lx\n",
+				(unsigned long) sys_addr,
+				(unsigned long) dram_addr);
+			return dram_addr;
+		}
+	}
+
+	/* Translate the SysAddr to a DramAddr as shown near the start of
+	 * section 3.4.4 (p. 70).  Although sys_addr is a 64-bit value, the k8
+	 * only deals with 40-bit values.  Therefore we discard bits 63-40 of
+	 * sys_addr below.  If bit 39 of sys_addr is 1 then the bits we
+	 * discard are all 1s.  Otherwise the bits we discard are all 0s.  See
+	 * section 3.4.2 of AMD publication 24592: AMD x86-64 Architecture
+	 * Programmer's Manual Volume 1 Application Programming.
+	 */
+	dram_addr = (sys_addr & 0xffffffffffull) - dram_base;
+
+	debugf2("using DRAM Base register to translate SysAddr 0x%lx to "
+		"DramAddr 0x%lx\n", (unsigned long) sys_addr,
+		(unsigned long) dram_addr);
+	return dram_addr;
+}
+
+/* Parameter intlv_en is the value of the IntlvEn field from a DRAM Base
+ * register (section 3.4.4.1).  Return the number of bits from a SysAddr that
+ * are used for node interleaving.
+ */
+static int num_node_interleave_bits(unsigned intlv_en)
+{
+	static const int intlv_shift_table[] = { 0, 1, 0, 2, 0, 0, 0, 3 };
+	int n;
+
+	BUG_ON(intlv_en > 7);
+	n = intlv_shift_table[intlv_en];
+	debugf2("using %d bits for node interleave\n", n);
+	return n;
+}
+
+/* Translate the DramAddr given by dram_addr to an InputAddr and return the
+ * result.
+ */
+static u64 dram_addr_to_input_addr(struct mem_ctl_info *mci, u64 dram_addr)
+{
+	struct k8_pvt *pvt;
+	int intlv_shift;
+	u64 input_addr;
+
+	pvt = mci->pvt_info;
+
+	/* Near the start of section 3.4.4 (p. 70), the k8 documentation gives
+	 * instructions for translating a DramAddr to an InputAddr.  Here we
+	 * are following these instructions.
+	 */
+	intlv_shift = num_node_interleave_bits((pvt->dbr[0] >> 8) & 0x07);
+	input_addr = ((dram_addr >> intlv_shift) & 0xffffff000ull) +
+	    (dram_addr & 0xfff);
+
+	debugf2("DramAddr 0x%lx translates to InputAddr 0x%lx\n",
+		(unsigned long) dram_addr, (unsigned long) input_addr);
+	return input_addr;
+}
+
+/* Translate the SysAddr represented by sys_addr to an InputAddr and return
+ * the result.  It is assumed that sys_addr maps to the node given by mci.
+ */
+static u64 sys_addr_to_input_addr(struct mem_ctl_info *mci, u64 sys_addr)
+{
+	u64 input_addr;
+
+	input_addr = dram_addr_to_input_addr(
+				mci, sys_addr_to_dram_addr(mci, sys_addr));
+	debugf2("%s(): SysAdddr 0x%lx translates to InputAddr 0x%lx\n",
+		__func__, (unsigned long) sys_addr,
+		(unsigned long) input_addr);
+	return input_addr;
+}
+
+/* input_addr is an InputAddr associated with the node given by mci.  Return
+ * the csrow that input_addr maps to, or -1 on failure (no csrow claims
+ * input_addr).
+ */
+static int input_addr_to_csrow(struct mem_ctl_info *mci, u64 input_addr)
+{
+	struct k8_pvt *pvt;
+	int i;
+	u32 dcsb, dcsm;
+	u64 base, mask;
+
+	pvt = mci->pvt_info;
+
+	/* Here we use the DRAM CS Base (section 3.5.4) and DRAM CS Mask
+	 * (section 3.5.5) registers.  For each CS base/mask register pair,
+	 * test the condition shown near the start of section 3.5.4 (p. 84).
+	 */
+
+	for (i = 0; i < K8_NR_CSROWS; i++) {
+		dcsb = pvt->dcsb[i];
+		dcsm = pvt->dcsm[i];
+
+		if ((dcsb & 0x01) == 0) {
+			debugf2("input_addr_to_csrow: CSBE bit is cleared "
+				"for csrow %d (node %d)\n", i,
+				pvt->node_id);
+			continue;  /* CSBE bit is cleared */
+		}
+
+		base = base_from_dcsb(dcsb);
+		mask = ~mask_from_dcsm(dcsm);
+
+		if ((input_addr & mask) == (base & mask)) {
+			debugf2("InputAddr 0x%lx matches csrow %d "
+				"(node %d)\n", (unsigned long) input_addr, i,
+				pvt->node_id);
+			return i;  /* success: csrow i matches */
+		}
+	}
+
+	debugf2("no matching csrow for InputAddr 0x%lx (node %d)\n",
+		(unsigned long) input_addr, pvt->node_id);
+	return -1;  /* failed to find matching csrow */
+}
+
+/* input_addr is an InputAddr associated with the node represented by mci.
+ * Translate input_addr to a DramAddr and return the result.
+ */
+static u64 input_addr_to_dram_addr(struct mem_ctl_info *mci, u64 input_addr)
+{
+	struct k8_pvt *pvt;
+	int node_id, intlv_shift;
+	u64 bits, dram_addr;
+	u32 intlv_sel;
+
+	/* Near the start of section 3.4.4 (p. 70), the k8 documentation shows
+	 * how to translate a DramAddr to an InputAddr.  Here we reverse this
+	 * procedure.  When translating from a DramAddr to an InputAddr, the
+	 * bits used for node interleaving are discarded.  Here we recover
+	 * these bits from the IntlvSel field of the DRAM Limit register
+	 * (section 3.4.4.2) for the node that input_addr is associated with.
+	 */
+
+	pvt = mci->pvt_info;
+	node_id = pvt->node_id;
+	BUG_ON((node_id < 0) || (node_id > 7));
+	intlv_shift = num_node_interleave_bits((pvt->dbr[0] >> 8) & 0x07);
+
+	if (intlv_shift == 0) {
+		debugf1("node interleaving disabled: InputAddr 0x%lx "
+			"translates to DramAddr of same value\n",
+			(unsigned long) input_addr);
+		return input_addr;
+	}
+
+	bits = ((input_addr & 0xffffff000ull) << intlv_shift) +
+	       (input_addr & 0xfff);
+	intlv_sel = pvt->dlr[node_id] & (((1 << intlv_shift) - 1) << 8);
+	dram_addr = bits + (intlv_sel << 4);
+	debugf1("InputAddr 0x%lx translates to DramAddr 0x%lx "
+		"(%d node interleave bits)\n", (unsigned long) input_addr,
+		(unsigned long) dram_addr, intlv_shift);
+	return dram_addr;
+}
+
+/* dram_addr is a DramAddr that maps to the node represented by mci.  Convert
+ * dram_addr to a SysAddr and return the result.
+ */
+static u64 dram_addr_to_sys_addr(struct mem_ctl_info *mci, u64 dram_addr)
+{
+	struct k8_pvt *pvt;
+	u64 hole_base, hole_offset, hole_size, base, limit, sys_addr;
+
+	pvt = mci->pvt_info;
+
+	if (!get_dram_hole_info(mci, &hole_base, &hole_offset, &hole_size)) {
+		if ((dram_addr >= hole_base) &&
+		    (dram_addr < (hole_base + hole_size))) {
+			/* use DHAR to translate DramAddr to SysAddr */
+			sys_addr = dram_addr + hole_offset;
+			debugf1("using DHAR to translate DramAddr 0x%lx to "
+				"SysAddr 0x%lx\n", (unsigned long) dram_addr,
+				(unsigned long) sys_addr);
+			return sys_addr;
+		}
+	}
+
+	get_base_and_limit(pvt, pvt->node_id, &base, &limit);
+	sys_addr = dram_addr + base;
+
+	/* The sys_addr we have computed up to this point is a 40-bit value
+	 * because the k8 deals with 40-bit values.  However, the value we are
+	 * supposed to return is a full 64-bit physical address.  The AMD
+	 * x86-64 architecture specifies that the most significant implemented
+	 * address bit through bit 63 of a physical address must be either all
+	 * 0s or all 1s.  Therefore we sign-extend the 40-bit sys_addr to a
+	 * 64-bit value below.  See section 3.4.2 of AMD publication 24592:
+	 * AMD x86-64 Architecture Programmer's Manual Volume 1 Application
+	 * Programming.
+	 */
+	sys_addr |= ~((sys_addr & (1ull << 39)) - 1);
+
+	debugf1("Using DRAM Base register for node %d to translate "
+		"DramAddr 0x%lx to SysAddr 0x%lx\n", pvt->node_id,
+		(unsigned long) dram_addr, (unsigned long) sys_addr);
+	return sys_addr;
+}
+
+/* input_addr is an InputAddr associated with the node given by mci.
+ * Translate input_addr to a SysAddr and return the result.
+ */
+static inline u64 input_addr_to_sys_addr(struct mem_ctl_info *mci,
+		u64 input_addr)
+{
+	return dram_addr_to_sys_addr(
+			mci, input_addr_to_dram_addr(mci, input_addr));
+}
+
+/* Find the minimum and maximum InputAddr values that map to the given csrow.
+ * Pass back these values in *input_addr_min and *input_addr_max.
+ */
+static void find_csrow_limits(struct mem_ctl_info *mci, int csrow,
+		u64 *input_addr_min, u64 *input_addr_max)
+{
+	struct k8_pvt *pvt;
+	u64 base, mask;
+
+	pvt = mci->pvt_info;
+	BUG_ON((csrow < 0) || (csrow >= K8_NR_CSROWS));
+	base = base_from_dcsb(pvt->dcsb[csrow]);
+	mask = mask_from_dcsm(pvt->dcsm[csrow]);
+	*input_addr_min = base & ~mask;
+
+	/* To find the max InputAddr for the csrow, start with the base
+	 * address and set all bits that are "don't care" bits in the test at
+	 * the start of section 3.5.4 (p. 84).  The "don't care" bits are all
+	 * set bits in the mask and all bits in the gaps between bit ranges
+	 * [35-25] and [19-13].  The value 0x1f01fff represents bits [24-20]
+	 * and [12-0], which are all bits in the above-mentioned gaps.
+	 */
+	*input_addr_max = base | mask | 0x1f01fff;
+}
+
+/* Extract error address from MCA NB Address Low (section 3.6.4.5) and
+ * MCA NB Address High (section 3.6.4.6) register values and return the
+ * result.
+ */
+static inline u64 error_address_from_k8_error_info(
+		struct k8_error_info *info)
+{
+	return (((u64) (info->error_info.nbeah & 0xff)) << 32) +
+	       (info->error_info.nbeal & ~0x03);
+}
+
+static inline void error_address_to_page_and_offset(u64 error_address,
+		u32 *page, u32 *offset)
+{
+	*page = (u32) (error_address >> PAGE_SHIFT);
+	*offset = ((u32) error_address) & ~PAGE_MASK;
+}
+
+/* Return 1 if registers contain valid error information.  Else return 0. */
+static inline int k8_error_info_valid(struct k8_error_info_regs *regs)
+{
+	return ((regs->nbsh & K8_NBSH_VALID_BIT) != 0);
+}
+
+/* return 0 if regs contains valid error info; else return 1 */
+static int k8_get_error_info_regs(struct mem_ctl_info *mci,
+		struct k8_error_info_regs *regs)
+{
+	struct k8_pvt *pvt;
+
+	pvt = mci->pvt_info;
+	pci_read_config_dword(pvt->misc_ctl, K8_NBSH, &regs->nbsh);
+
+	if (!k8_error_info_valid(regs))
+		return 1;
+
+	pci_read_config_dword(pvt->misc_ctl, K8_NBSL, &regs->nbsl);
+	pci_read_config_dword(pvt->misc_ctl, K8_NBEAH, &regs->nbeah);
+	pci_read_config_dword(pvt->misc_ctl, K8_NBEAL, &regs->nbeal);
+	return 0;
+}
+
+static void k8_get_error_info(struct mem_ctl_info *mci,
+		struct k8_error_info *info)
+{
+	struct k8_pvt *pvt;
+	struct k8_error_info_regs regs;
+
+	pvt = mci->pvt_info;
+	info->race_condition_detected = 0;
+
+	if (k8_get_error_info_regs(mci, &info->error_info))
+		return;
+
+	/*
+	 * Here's the problem with the K8's EDAC reporting:
+	 * There are four registers which report pieces of error
+	 * information.  These four registers are shared between
+	 * CEs and UEs.  Furthermore, contrary to what is stated in
+	 * the OBKG, the overflow bit is never used!  Every error
+	 * always updates the reporting registers.
+	 *
+	 * Can you see the race condition?  All four error reporting
+	 * registers must be read before a new error updates them!
+	 * There is no way to read all four registers atomically.  The
+	 * best than can be done is to detect that a race has occured
+	 * and then report the error without any kind of precision.
+	 *
+	 * What is still positive is that errors are
+	 * still reported and thus problems can still be detected -
+	 * just not localized because the syndrome and address are
+	 * spread out across registers.
+	 *
+	 * Grrrrr!!!!!  Here's hoping that AMD fixes this in some
+	 * future K8 rev. UEs and CEs should have separate
+	 * register sets with proper overflow bits that are used!
+	 * At very least the problem can be fixed by honoring the
+	 * ErrValid bit in nbsh and not updating registers - just
+	 * set the overflow bit - unless the current error is CE
+	 * and the new error is UE which would be the only situation
+	 * for overwriting the current values.
+	 */
+
+	regs = info->error_info;
+
+	/* Use info from the second read - most current */
+	if (unlikely(k8_get_error_info_regs(mci, &info->error_info)))
+		return;
+
+	/* clear the error */
+	pci_write_bits32(pvt->misc_ctl, K8_NBSH, 0, K8_NBSH_VALID_BIT);
+
+	pci_read_config_dword(pvt->misc_ctl, K8_NBCFG, &info->nbcfg);
+	info->race_condition_detected =
+	    ((regs.nbsh != info->error_info.nbsh) ||
+	     (regs.nbsl != info->error_info.nbsl) ||
+	     (regs.nbeah != info->error_info.nbeah) ||
+	     (regs.nbeal != info->error_info.nbeal));
+}
+
+static inline void decode_gart_tlb_error(struct mem_ctl_info *mci,
+					 struct k8_error_info *info)
+{
+	u32 err_code;
+	u32 ec_tt;		/* error code transaction type (2b) */
+	u32 ec_ll;		/* error code cache level (2b) */
+
+	err_code = info->error_info.nbsl & 0xffffUL;
+	ec_tt = (err_code >> 2) & 0x03UL;
+	ec_ll = (err_code >> 0) & 0x03UL;
+	k8_mc_printk(mci, KERN_ERR,
+		     "GART TLB errorr: transaction type(%s), "
+		     "cache level(%s)\n", tt_msgs[ec_tt], ll_msgs[ec_ll]);
+}
+
+static inline void decode_cache_error(struct mem_ctl_info *mci,
+				      struct k8_error_info *info)
+{
+	u32 err_code;
+	u32 ec_rrrr;		/* error code memory transaction (4b) */
+	u32 ec_tt;		/* error code transaction type (2b) */
+	u32 ec_ll;		/* error code cache level (2b) */
+
+	err_code = info->error_info.nbsl & 0xffffUL;
+	ec_rrrr = (err_code >> 4) & 0x0fUL;
+	ec_tt = (err_code >> 2) & 0x03UL;
+	ec_ll = (err_code >> 0) & 0x03UL;
+	k8_mc_printk(mci, KERN_ERR,
+		     "cache heirarchy error: memory transaction type(%s), "
+		     "transaction type(%s), cache level(%s)\n",
+		     memtt_msgs[ec_rrrr], tt_msgs[ec_tt], ll_msgs[ec_ll]);
+}
+
+/* sys_addr is an error address (a SysAddr) extracted from the MCA NB Address
+ * Low (section 3.6.4.5) and MCA NB Address High (section 3.6.4.6) registers
+ * of a node that detected an ECC memory error.  mci represents the node that
+ * the error address maps to (possibly different from the node that detected
+ * the error).  Return the number of the csrow that sys_addr maps to, or -1 on
+ * error.
+ */
+static int sys_addr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr)
+{
+	int csrow;
+
+	csrow = input_addr_to_csrow(mci,
+				    sys_addr_to_input_addr(mci, sys_addr));
+
+	if (csrow == -1)
+		k8_mc_printk(mci, KERN_ERR,
+			     "Failed to translate InputAddr to csrow for "
+			     "address 0x%lx\n", (unsigned long) sys_addr);
+
+	return csrow;
+}
+
+static void k8_handle_ce(struct mem_ctl_info *mci, struct k8_error_info *info)
+{
+	struct k8_pvt *pvt;
+	unsigned syndrome;
+	u64 error_address;
+	u32 page, offset;
+	int channel, csrow;
+	struct mem_ctl_info *log_mci, *src_mci;
+
+	log_mci = mci;
+	pvt = mci->pvt_info;
+
+	if ((info->error_info.nbsh & BIT(26)) == 0)
+		goto no_info;  /* error address not valid */
+
+	error_address = error_address_from_k8_error_info(info);
+	syndrome = ((info->error_info.nbsh >> 15) & 0xff);
+
+	if (info->nbcfg & BIT(23)) {
+		/* chipkill ecc mode */
+		syndrome += (info->error_info.nbsl >> 16) & 0xff00;
+		channel = chan_from_chipkill_syndrome(syndrome);
+
+		if (channel < 0) {
+			/* If the syndrome couldn't be found then the race
+			 * condition for error reporting registers likely
+			 * occurred.  There's alot more in doubt than just the
+			 * channel.  Might as well just log the error without
+			 * any info.
+			 */
+			k8_mc_printk(mci, KERN_WARNING,
+				     "unknown syndrome 0x%x - possible error "
+				     "reporting race\n", syndrome);
+			goto no_info;
+		}
+	} else
+		/* non-chipkill ecc mode
+		 *
+		 * The k8 documentation is unclear about how to determine the
+		 * channel number when using non-chipkill memory.  This method
+		 * was obtained from email communication with someone at AMD.
+		 */
+		channel = ((error_address & BIT(3)) != 0);
+
+	/* Find out which node the error address belongs to.  This may be
+	 * different from the node that detected the error.
+	 */
+	if ((src_mci = find_mc_by_sys_addr(mci, error_address)) == NULL) {
+		k8_mc_printk(mci, KERN_ERR,
+			     "failed to map error address 0x%lx to a node\n",
+			     (unsigned long) error_address);
+		goto no_info;
+	}
+
+	log_mci = src_mci;
+
+	if ((csrow = sys_addr_to_csrow(log_mci, error_address)) < 0)
+		goto no_info;
+
+	error_address_to_page_and_offset(error_address, &page, &offset);
+	edac_mc_handle_ce(log_mci, page, offset, syndrome, csrow, channel,
+			  EDAC_MOD_STR);
+	return;
+
+no_info:
+	edac_mc_handle_ce_no_info(log_mci,EDAC_MOD_STR);
+}
+
+static void k8_handle_ue(struct mem_ctl_info *mci, struct k8_error_info *info)
+{
+	int csrow;
+	u64 error_address;
+	u32 page, offset;
+	struct mem_ctl_info *log_mci, *src_mci;
+
+	log_mci = mci;
+
+	if ((info->error_info.nbsh & BIT(26)) == 0)
+		goto no_info;  /* error address not valid */
+
+	error_address = error_address_from_k8_error_info(info);
+
+	/* Find out which node the error address belongs to.  This may be
+	 * different from the node that detected the error.
+	 */
+	if ((src_mci = find_mc_by_sys_addr(mci, error_address)) == NULL) {
+		k8_mc_printk(mci, KERN_ERR,
+			     "failed to map error address 0x%lx to a node\n",
+			     (unsigned long) error_address);
+		goto no_info;
+	}
+
+	log_mci = src_mci;
+
+	if ((csrow = sys_addr_to_csrow(log_mci, error_address)) < 0)
+		goto no_info;
+
+	error_address_to_page_and_offset(error_address, &page, &offset);
+	edac_mc_handle_ue(log_mci, page, offset, csrow, EDAC_MOD_STR);
+	return;
+
+no_info:
+	edac_mc_handle_ue_no_info(log_mci, EDAC_MOD_STR);
+}
+
+static void decode_bus_error(struct mem_ctl_info *mci,
+		struct k8_error_info *info)
+{
+	u32 err_code, ext_ec;
+	u32 ec_pp;    /* error code participating processor (2p) */
+	u32 ec_to;    /* error code timed out (1b) */
+	u32 ec_rrrr;  /* error code memory transaction (4b) */
+	u32 ec_ii;    /* error code memory or I/O (2b) */
+	u32 ec_ll;    /* error code cache level (2b) */
+
+	debugf0("MC%d: %s()\n", mci->mc_idx, __func__);
+	err_code = info->error_info.nbsl & 0xffffUL;
+	ec_pp = (err_code >> 9) & 0x03UL;
+	ec_to = (err_code >> 8) & 0x01UL;
+	ec_rrrr = (err_code >> 4) & 0x0fUL;
+	ec_ii = (err_code >> 2) & 0x03UL;
+	ec_ll = (err_code >> 0) & 0x03UL;
+	ext_ec = (info->error_info.nbsl >> 16) & 0xfUL;
+
+	/* FIXME - these should report through EDAC channels */
+	k8_mc_printk(mci, KERN_ERR, "general bus error: participating "
+		     "processor(%s), time-out(%s) memory transaction "
+		     "type(%s), mem or i/o(%s), cache level(%s)\n",
+		     pp_msgs[ec_pp], to_msgs[ec_to], memtt_msgs[ec_rrrr],
+		     ii_msgs[ec_ii], ll_msgs[ec_ll]);
+
+	if (ec_pp & 0x02)
+		return;  /* We aren't the node involved */
+
+	/* FIXME - other errors should have other error handling mechanisms */
+	if (ext_ec && (ext_ec != 0x8)) {
+		k8_mc_printk(mci, KERN_ERR,
+			     "no special error handling for this error\n");
+		return;
+	}
+
+	if (info->error_info.nbsh & BIT(14))
+		k8_handle_ce(mci, info);
+	else if (info->error_info.nbsh & BIT(13))
+		k8_handle_ue(mci, info);
+
+	/* If main error is CE then overflow must be CE.  If main error is UE
+	 * then overflow is unknown.  We'll call the overflow a CE - if
+	 * panic_on_ue is set then we're already panic'ed and won't arrive
+	 * here.  If panic_on_ue is not set then apparently someone doesn't
+	 * think that UE's are catastrophic.
+	 */
+	if (info->error_info.nbsh & BIT(30))
+		edac_mc_handle_ce_no_info(mci,
+		    EDAC_MOD_STR " Error Overflow set");
+}
+
+/* return 1 if error found or 0 if error not found */
+static int k8_process_error_info(struct mem_ctl_info *mci,
+		struct k8_error_info *info, int handle_errors)
+{
+	struct k8_pvt *pvt;
+	struct k8_error_info_regs *regs;
+	u32 err_code, ext_ec;
+	int gart_tlb_error;
+
+	pvt = mci->pvt_info;
+
+	/* check for an error */
+	if (!k8_error_info_valid(&info->error_info))
+		return 0;
+
+	if (!handle_errors)
+		return 1;
+
+	if (info->race_condition_detected)
+		k8_mc_printk(mci, KERN_WARNING, "race condition detected!\n");
+
+	gart_tlb_error = 0;
+	regs = &info->error_info;
+	err_code = info->error_info.nbsl & 0xffffUL;
+	ext_ec = (info->error_info.nbsl >> 16) & 0x0fUL;
+	debugf1("NorthBridge ERROR: mci(0x%p) node(%d) ErrAddr(0x%.8x-%.8x) "
+		"nbsh(0x%.8x) nbsl(0x%.8x)\n", mci, pvt->node_id, regs->nbeah,
+		regs->nbeal, regs->nbsh, regs->nbsl);
+
+	if ((err_code & 0xfff0UL) == 0x0010UL) {
+		debugf1("GART TLB error\n");
+		gart_tlb_error = 1;
+		decode_gart_tlb_error(mci, info);
+	} else if ((err_code & 0xff00UL) == 0x0100UL) {
+		debugf1("Cache error\n");
+		decode_cache_error(mci, info);
+	} else if ((err_code & 0xf800UL) == 0x0800UL) {
+		debugf1("Bus error\n");
+		decode_bus_error(mci, info);
+	} else
+		/* shouldn't reach here! */
+		k8_mc_printk(mci, KERN_WARNING,
+			     "%s(): unknown MCE error 0x%x\n", __func__,
+			     err_code);
+
+	k8_mc_printk(mci, KERN_ERR, "extended error code: %s\n",
+		     ext_msgs[ext_ec]);
+
+	if (((ext_ec >= 1 && ext_ec <= 4) || (ext_ec == 6)) &&
+	    ((info->error_info.nbsh >> 4) & 0x07UL))
+		k8_mc_printk(mci, KERN_ERR,
+		    "Error on hypertransport link: %s\n",
+		    htlink_msgs[(info->error_info.nbsh >> 4) & 0x07UL]);
+
+	/* GART errors are benign as per AMD, do not panic on them */
+	if (!gart_tlb_error && (regs->nbsh & BIT(29))) {
+		k8_mc_printk(mci, KERN_CRIT, "uncorrected error\n");
+		edac_mc_handle_ue_no_info(mci, "UE bit is set\n");
+	}
+
+	if (regs->nbsh & BIT(25))
+		panic("MC%d: processor context corrupt", mci->mc_idx);
+
+	return 1;
+}
+
+static void k8_check(struct mem_ctl_info *mci)
+{
+	struct k8_error_info info;
+
+	debugf3("%s()\n", __func__);
+	k8_get_error_info(mci, &info);
+	k8_process_error_info(mci, &info, 1);
+}
+
+static int k8_get_devs(struct mem_ctl_info *mci, int dev_idx)
+{
+	const struct k8_dev_info *k8_dev = &k8_devs[dev_idx];
+	struct k8_pvt *pvt;
+	struct pci_dev *pdev;
+
+	pdev = to_pci_dev(mci->dev);
+	pvt = mci->pvt_info;
+
+	/* The address mapping device provides a table that indicates which
+	 * physical address ranges are owned by which node.  Each node's
+	 * memory controller has memory controller addresses that begin at
+	 * 0x0.
+	 */
+	pvt->addr_map = pci_get_related_function(PCI_VENDOR_ID_AMD,
+						 k8_dev->addr_map, pdev);
+
+	if (pvt->addr_map == NULL) {
+		k8_printk(KERN_ERR, "error address map device not found: "
+			  "vendor %x device 0x%x (broken BIOS?)\n",
+			  PCI_VENDOR_ID_AMD, k8_dev->addr_map);
+		return 1;
+	}
+
+	debugf1("Addr Map device PCI Bus ID:\t%s\n",
+		pci_name(pvt->addr_map));
+
+	pvt->misc_ctl = pci_get_related_function(PCI_VENDOR_ID_AMD,
+						 k8_dev->misc_ctl, pdev);
+
+	if (pvt->misc_ctl == NULL) {
+		pci_dev_put(pvt->addr_map);
+		pvt->addr_map = NULL;
+		k8_printk(KERN_ERR, "error miscellaneous device not found: "
+			  "vendor %x device 0x%x (broken BIOS?)\n",
+			  PCI_VENDOR_ID_AMD, k8_dev->misc_ctl);
+		return 1;
+	}
+
+	debugf1("Misc device PCI Bus ID:\t\t%s\n",
+		pci_name(pvt->misc_ctl));
+
+	return 0;
+}
+
+static void k8_get_mc_regs(struct mem_ctl_info *mci)
+{
+	struct k8_pvt *pvt;
+	struct pci_dev *pdev;
+	int i;
+
+	pdev = to_pci_dev(mci->dev);
+	pvt = mci->pvt_info;
+	debugf1("k8 regs:\n");
+
+	for (i = 0; i < MAX_K8_NODES; i++) {
+		pci_read_config_dword(pvt->addr_map, K8_DBR + (i * 8),
+				      &pvt->dbr[i]);
+		pci_read_config_dword(pvt->addr_map, K8_DLR + (i * 8),
+				      &pvt->dlr[i]);
+		debugf1("    dbr[%d]: 0x%x\n", i, pvt->dbr[i]);
+		debugf1("    dlr[%d]: 0x%x\n", i, pvt->dlr[i]);
+	}
+
+	pci_read_config_dword(pvt->misc_ctl, K8_NBCAP, &pvt->nbcap);
+	debugf1("    nbcap: %u\n", pvt->nbcap);
+
+	for (i = 0; i < K8_NR_CSROWS; i++) {
+		pci_read_config_dword(pdev, K8_DCSB + (i * 4), &pvt->dcsb[i]);
+		pci_read_config_dword(pdev, K8_DCSM + (i * 4), &pvt->dcsm[i]);
+		debugf1("    dcsb[%d]: 0x%x\n", i, pvt->dcsb[i]);
+		debugf1("    dcsm[%d]: 0x%x\n", i, pvt->dcsm[i]);
+	}
+
+	pci_read_config_dword(pvt->addr_map, K8_DHAR, &pvt->dhar);
+	pci_read_config_dword(pdev, K8_DBAM, &pvt->dbam);
+	debugf1("    dhar: 0x%x\n", pvt->dhar);
+	debugf1("    dbam: 0x%x\n", pvt->dbam);
+}
+
+/* Return 1 if dual channel mode is active.  Else return 0. */
+static inline int dual_channel_active(u32 dcl)
+{
+	return (dcl >> 16) & 0x1;
+}
+
+static u32 csrow_nr_pages(int csrow_nr, struct k8_pvt *pvt)
+{
+	u32 cs;
+
+	/* The math on this doesn't look right on the surface because x/2*4
+	 * can be simplified to x*2 but this expression makes use of the fact
+	 * that it is integral math where 1/2=0
+	 */
+	cs = (pvt->dbam >> ((csrow_nr / 2) * 4)) & 0xF;  /* PG88 */
+
+	/* This line is tricky. It collapses the table used by revision D and
+	 * later to one that matches revision CG and earlier
+	 */
+	cs -= (node_rev(pvt->node_id) >= OPTERON_CPU_REV_D) ?
+	      (cs > 8 ? 4 : (cs > 5 ? 3 : (cs > 2 ? 1 : 0))) : 0;
+
+	/* 25 is 32MiB minimum DIMM size */
+	return 1 << (cs + 25 - PAGE_SHIFT + dual_channel_active(pvt->dcl));
+}
+
+static int k8_init_csrows(struct mem_ctl_info *mci)
+{
+	struct csrow_info *csrow;
+	struct k8_pvt *pvt;
+	int i, empty;
+	u64 input_addr_min, input_addr_max, sys_addr;
+	u32 nbcfg;
+
+	pvt = mci->pvt_info;
+	pci_read_config_dword(pvt->misc_ctl, K8_NBCFG, &nbcfg);
+	empty = 1;
+
+	for (i = 0; i < K8_NR_CSROWS; i++) {
+		csrow = &mci->csrows[i];
+
+		if ((pvt->dcsb[i] & 0x01) == 0) {
+			debugf1("csrow %d empty for node %d\n", i,
+				pvt->node_id);
+			continue;  /* empty */
+		}
+
+		debugf1("revision for this node (%d) is %d\n",
+			pvt->node_id, node_rev(pvt->node_id));
+		empty = 0;
+		csrow->nr_pages = csrow_nr_pages(i, pvt);
+		find_csrow_limits(mci, i, &input_addr_min, &input_addr_max);
+		sys_addr = input_addr_to_sys_addr(mci, input_addr_min);
+		csrow->first_page = (u32) (sys_addr >> PAGE_SHIFT);
+		sys_addr = input_addr_to_sys_addr(mci, input_addr_max);
+		csrow->last_page = (u32) (sys_addr >> PAGE_SHIFT);
+		csrow->page_mask = ~mask_from_dcsm(pvt->dcsm[i]);
+		csrow->grain = 8;  /* 8 bytes of resolution */
+		csrow->mtype = ((pvt->dcl >> 18) & 0x1) ? MEM_DDR : MEM_RDDR;
+		csrow->dtype = ((pvt->dcl >> (20 + (i / 2))) & 0x01) ?
+			       DEV_X4 : DEV_UNKNOWN;
+		debugf1("for node %d csrow %d:\n    nr_pages: %u "
+			"input_addr_min: 0x%lx input_addr_max: 0x%lx "
+			"sys_addr: 0x%lx first_page: 0x%lx last_page: 0x%lx "
+			"page_mask: 0x%lx\n", pvt->node_id, i,
+			(unsigned) csrow->nr_pages,
+			(unsigned long) input_addr_min,
+			(unsigned long) input_addr_max,
+			(unsigned long) sys_addr,
+			csrow->first_page, csrow->last_page,
+			csrow->page_mask);
+
+		if (nbcfg & BIT(22))
+			csrow->edac_mode = (nbcfg & BIT(23)) ?
+					   EDAC_S4ECD4ED : EDAC_SECDED;
+		else
+			csrow->edac_mode = EDAC_NONE;
+	}
+
+	return empty;
+}
+
+static void k8_enable_error_reporting(struct mem_ctl_info *mci)
+{
+	struct k8_pvt *pvt;
+	u32 mc4ctl_l=0, mc4ctl_h=0, mcgctl_l=0, mcgctl_h=0;
+
+	pvt = mci->pvt_info;
+	pci_write_bits32(pvt->misc_ctl, K8_NBCTL, 0x3UL, 0x3UL);
+	do_rdmsr(pvt->node_id, K8_MSR_MC4CTL, &mc4ctl_l, &mc4ctl_h);
+	mc4ctl_l |= BIT(0) | BIT(1);
+	do_wrmsr(pvt->node_id, K8_MSR_MC4CTL, mc4ctl_l, mc4ctl_h);
+	do_rdmsr(pvt->node_id, K8_MSR_MC4CTL, &mc4ctl_l, &mc4ctl_h);
+	do_rdmsr(pvt->node_id, K8_MSR_MCGCTL, &mcgctl_l, &mcgctl_h);
+	mcgctl_l |= BIT(4);
+	do_wrmsr(pvt->node_id, K8_MSR_MCGCTL, mcgctl_l, mcgctl_h);
+	do_rdmsr(pvt->node_id, K8_MSR_MCGCTL, &mcgctl_l, &mcgctl_h);
+}
+
+static int k8_probe1(struct pci_dev *pdev, int dev_idx)
+{
+	struct mem_ctl_info *mci;
+	struct k8_pvt *pvt;
+	u32 dcl, dual_channel;
+
+	debugf0("%s()\n", __func__);
+	build_node_revision_table();
+	debugf1("pdev bus %u devfn %u\n", pdev->bus->number, pdev->devfn);
+	pci_read_config_dword(pdev, K8_DCL, &dcl);
+	dual_channel = dual_channel_active(dcl);
+	debugf1("dual_channel is %u (dcl is 0x%x)\n", dual_channel, dcl);
+	mci = edac_mc_alloc(sizeof(*pvt), K8_NR_CSROWS, dual_channel + 1);
+
+	if (mci == NULL)
+		return -ENOMEM;
+
+	debugf0("%s(): mci = %p\n", __func__, mci);
+	pvt = mci->pvt_info;
+	pvt->dcl = dcl;
+	mci->dev = &pdev->dev;
+	pvt->node_id = MCI_TO_NODE_ID(mci);
+
+	if (k8_get_devs(mci, dev_idx))
+		goto fail0;
+
+	k8_get_mc_regs(mci);
+	mci->mtype_cap = MEM_FLAG_DDR | MEM_FLAG_RDDR;
+	mci->edac_ctl_cap = EDAC_FLAG_NONE;
+	debugf1("Initializing mci->edac_cap to EDAC_FLAG_NONE\n");
+	mci->edac_cap = EDAC_FLAG_NONE;
+
+	if ((pvt->nbcap >> 3) & 0x1)
+		mci->edac_ctl_cap |= EDAC_FLAG_SECDED;
+
+	if ((pvt->nbcap >> 4) & 0x1)
+		mci->edac_ctl_cap |= EDAC_FLAG_S4ECD4ED;
+
+	if ((pvt->dcl >> 17) & 0x1) {
+		debugf1("setting EDAC_FLAG_SECDED in mci->edac_cap\n");
+		mci->edac_cap |= EDAC_FLAG_SECDED;
+
+		if (dual_channel) {
+			debugf1("setting EDAC_FLAG_S4ECD4ED in "
+				"mci->edac_cap\n");
+			mci->edac_cap |= EDAC_FLAG_S4ECD4ED;
+		}
+	}
+
+	mci->mod_name = EDAC_MOD_STR;
+	mci->mod_ver = EDAC_K8_VERSION;
+	mci->ctl_name = k8_devs[dev_idx].ctl_name;
+	mci->edac_check = k8_check;
+	mci->ctl_page_to_phys = NULL;
+
+	if (k8_init_csrows(mci)) {
+		debugf1("Setting mci->edac_cap to EDAC_FLAG_NONE "
+			"because k8_init_csrows() returned nonzero "
+			"value\n");
+		mci->edac_cap = EDAC_FLAG_NONE;  /* no csrows found */
+	} else
+		k8_enable_error_reporting(mci);
+
+	if (edac_mc_add_mc(mci, pvt->node_id)) {
+		debugf1("%s(): failed edac_mc_add_mc()\n", __func__);
+		/* FIXME: perhaps some code should go here that disables error
+		 * reporting if we just enabled it
+		 */
+		goto fail1;
+	}
+
+	debugf1("%s(): success\n", __func__);
+	return 0;
+
+fail1:
+	pci_dev_put(pvt->addr_map);
+	pci_dev_put(pvt->misc_ctl);
+
+fail0:
+	edac_mc_free(mci);
+	return -ENODEV;
+}
+
+/* returns count (>= 0), or negative on error */
+static int __devinit k8_init_one(struct pci_dev *pdev,
+				 const struct pci_device_id *ent)
+{
+	debugf0("%s()\n", __func__);
+
+	/* wake up and enable device */
+	return pci_enable_device(pdev) ?
+	    -EIO : k8_probe1(pdev, ent->driver_data);
+}
+
+static void __devexit k8_remove_one(struct pci_dev *pdev)
+{
+	struct mem_ctl_info *mci;
+	struct k8_pvt *pvt;
+
+	debugf0("%s()\n", __func__);
+
+	if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
+		return;
+
+	pvt = mci->pvt_info;
+	pci_dev_put(pvt->addr_map);
+	pci_dev_put(pvt->misc_ctl);
+	edac_mc_free(mci);
+}
+
+static const struct pci_device_id k8_pci_tbl[] __devinitdata = {
+	{PCI_VEND_DEV(AMD, OPT_2_MEMCTL), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	 OPTERON},
+	{0,}			/* 0 terminated list. */
+};
+
+MODULE_DEVICE_TABLE(pci, k8_pci_tbl);
+
+static struct pci_driver k8_driver = {
+	.name = EDAC_MOD_STR,
+	.probe = k8_init_one,
+	.remove = __devexit_p(k8_remove_one),
+	.id_table = k8_pci_tbl,
+};
+
+int __init k8_init(void)
+{
+	return pci_module_init(&k8_driver);
+}
+
+static void __exit k8_exit(void)
+{
+	pci_unregister_driver(&k8_driver);
+}
+
+module_init(k8_init);
+module_exit(k8_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh");
+MODULE_DESCRIPTION("MC support for AMD K8 memory controllers - " EDAC_K8_VERSION );
Index: linux-2.6.17.noarch/drivers/edac/Kconfig
===================================================================
--- linux-2.6.17.noarch.orig/drivers/edac/Kconfig	2006-06-17 22:49:35.000000000 -0300
+++ linux-2.6.17.noarch/drivers/edac/Kconfig	2006-07-31 09:05:27.000000000 -0300
@@ -90,6 +90,13 @@
 	  Support for error detection and correction on the Intel
 	  82860 chipset.
 
+config EDAC_K8
+	tristate "AMD K8 (Opteron, Athlon64)"
+	depends on EDAC_MM_EDAC && X86 && PCI
+	help
+	  Support for error detection and correction on the AMD
+	  K8 Memory Controller
+
 config EDAC_R82600
 	tristate "Radisys 82600 embedded chipset"
 	depends on EDAC_MM_EDAC && PCI && X86_32
Index: linux-2.6.17.noarch/drivers/edac/Makefile
===================================================================
--- linux-2.6.17.noarch.orig/drivers/edac/Makefile	2006-06-17 22:49:35.000000000 -0300
+++ linux-2.6.17.noarch/drivers/edac/Makefile	2006-07-31 09:05:27.000000000 -0300
@@ -14,5 +14,6 @@
 obj-$(CONFIG_EDAC_E752X)		+= e752x_edac.o
 obj-$(CONFIG_EDAC_I82875P)		+= i82875p_edac.o
 obj-$(CONFIG_EDAC_I82860)		+= i82860_edac.o
+obj-$(CONFIG_EDAC_K8)			+= k8_edac.o
 obj-$(CONFIG_EDAC_R82600)		+= r82600_edac.o
 
Index: linux-2.6.17.noarch/MAINTAINERS
===================================================================
--- linux-2.6.17.noarch.orig/MAINTAINERS	2006-07-31 09:01:14.000000000 -0300
+++ linux-2.6.17.noarch/MAINTAINERS	2006-07-31 09:05:27.000000000 -0300
@@ -952,6 +952,12 @@
 W:	bluesmoke.sourceforge.net
 S:	Supported
 
+EDAC-K8
+P:	Doug Thompson
+M:	norsk5 at xmission.com
+L:	bluesmoke-devel at lists.sourceforge.net
+W:	bluesmoke.sourceforge.net
+
 EDAC-E752X
 P:	Mark Gross
 M:	mark.gross at intel.com


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2538
retrieving revision 1.2539
diff -u -r1.2538 -r1.2539
--- kernel-2.6.spec	9 Aug 2006 21:37:53 -0000	1.2538
+++ kernel-2.6.spec	9 Aug 2006 21:45:00 -0000	1.2539
@@ -275,6 +275,7 @@
 
 Patch200: linux-2.6-x86-tune-generic.patch
 Patch201: linux-2.6-x86-vga-vidfail.patch
+Patch202: linux-2.6-x86-64-edac-support.patch
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
@@ -732,6 +733,8 @@
 # for the installer cd that wants to automatically fall back to textmode
 # in that case
 %patch201 -p1
+# EDAC support for K8
+%patch202 -p1
 # Suppress APIC errors on UP x86-64.
 %patch203 -p1
 # Support TIF_RESTORE_SIGMASK on x86_64
@@ -1704,6 +1707,7 @@
 - Unbreak SMP locking in oprofile.
 - Fix hotplug CPU locking in workqueue creation.
 - Fix IDE oops on boot.
+- K8 EDAC support.
 
 * Tue Aug  8 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace/ptrace interactions with SELinux.



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:45:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:45:04 -0400
Subject: rpms/kernel/devel/configs config-x86-generic, 1.64,
	1.65 config-x86_64-generic, 1.51, 1.52
Message-ID: <200608092145.k79Lj4sK005029@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86-generic config-x86_64-generic 
Log Message:
K8 EDAC support


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- config-x86-generic	9 Aug 2006 18:43:57 -0000	1.64
+++ config-x86-generic	9 Aug 2006 21:45:01 -0000	1.65
@@ -284,6 +284,7 @@
 CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
+CONFIG_EDAC_K8=m
 
 CONFIG_SCHED_MC=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- config-x86_64-generic	9 Aug 2006 18:43:57 -0000	1.51
+++ config-x86_64-generic	9 Aug 2006 21:45:01 -0000	1.52
@@ -154,6 +154,7 @@
 CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
+CONFIG_EDAC_K8=m
 
 CONFIG_REORDER=y
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:46:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:46:47 -0400
Subject: rpms/lsof/devel lsof_4.78C-threads.patch, NONE, 1.1 lsof.spec, 1.33,
	1.34 lsof_4.78B-rh-selinux.patch, 1.1, NONE
Message-ID: <200608092146.k79Lklwl005372@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5350

Modified Files:
	lsof.spec 
Added Files:
	lsof_4.78C-threads.patch 
Removed Files:
	lsof_4.78B-rh-selinux.patch 
Log Message:
fix problem with threads

lsof_4.78C-threads.patch:
 dproc.c |   80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 72 insertions(+), 8 deletions(-)

--- NEW FILE lsof_4.78C-threads.patch ---
--- lsof_4.78C-rh/dialects/linux/dproc.c.kzak	2006-06-12 19:10:05.000000000 +0200
+++ lsof_4.78C-rh/dialects/linux/dproc.c	2006-08-09 23:25:14.000000000 +0200
@@ -69,7 +69,8 @@
 _PROTOTYPE(static int read_proc_stat,(char *p, int pid, char **cmd, int *ppid,
 	   int *pgid));
 _PROTOTYPE(static int statEx,(char *p, struct stat *s, int *ss));
- 
+_PROTOTYPE(static int get_other_thread,(int pid, char **tid));
+
 
 #if	defined(HASSELINUX)
 _PROTOTYPE(static int cmp_cntx_eq,(char *pcntx, char *ucntx));
@@ -148,6 +149,7 @@
 	static char *path = (char *)NULL;
 	static int pathl = 0;
 	int pgid, pid, ppid;
+	char *tid = NULL;
 	static char *pidpath = (char *)NULL;
 	static MALLOC_S pidpathl = 0;
 	static MALLOC_S pidx = 0;
@@ -253,6 +255,13 @@
 	    }
 	    if (f)
 		continue;
+
+	    tid = NULL;
+	    if (get_other_thread(pid, &tid) < 0)
+		continue;
+	    if (tid)
+		n += sizeof("task/") + strlen(tid);
+
 	/*
 	 * Build path to PID's directory.
 	 */
@@ -266,7 +275,14 @@
 		    Exit(1);
 		}
 	    }
-	    (void) snpf(pidpath + pidx, pidpathl - pidx, "%s/", dp->d_name);
+	    if (tid) {
+		/* /proc/<pid> is useless (zombie), we have to use /proc/<pid>/task/<tid>
+		 * where is still running thread
+		 */
+		(void) snpf(pidpath + pidx, pidpathl - pidx, "%s/task/%s/", dp->d_name, tid);
+		free(tid);
+	    } else
+		(void) snpf(pidpath + pidx, pidpathl - pidx, "%s/", dp->d_name);
 	    n += (pidx + 1);
 	/*
 	 * Process the PID's stat info.
@@ -897,6 +913,60 @@
 	(void) fclose(ms);
 }
 
+/* fill tid if the initial thread is zombie, 
+ * but other thread still alive 
+ *
+ * returns -1=error, 0=nothing, 1=ok
+ */
+static int
+get_other_thread(pid, tid)
+	int pid;
+	char **tid;
+{
+	char path[MAXPATHLEN];
+	DIR *tdp;
+	struct dirent *td;
+	char pstate;
+	FILE *f;
+	int _pid;
+	int re = 0;
+
+	snpf(path, sizeof(path), "%s/%d/stat", PROCFS, pid);
+	if (!(f = fopen(path, "r")))
+		return;
+	fscanf(f, "%d %*s %c", &_pid, &pstate);
+	fclose(f);
+	if (_pid != pid)
+		return -1;		/* corrupted /proc? */
+	if (pstate!='Z') 
+		return 0;		/* ignore normal proceses */
+
+	snpf(path, sizeof(path), "%s/%d/task", PROCFS, pid);
+
+	/* open /proc/<pid>/task */
+	if (!(tdp = opendir(path)))
+		return 0;		/* kernel < 2.6.x */
+	
+	/* look for first alive thread */
+	while ((td = readdir(tdp))) {
+		if (strcmp(td->d_name, ".")==0 || strcmp(td->d_name, "..")==0)
+			continue;
+		
+		/* /proc/<pid>/task/<tid>/stat */
+		snpf(path, sizeof(path), "%s/%d/task/%s/stat", PROCFS, pid, td->d_name);
+		if (!(f = fopen(path, "r")))
+			continue;
+		fscanf(f, "%*d %*s %c", &pstate);
+		fclose(f);
+		if (pstate!='Z') {
+			re = 1;
+			*tid = strdup(td->d_name);
+			break;
+		}
+	}
+	closedir(tdp);
+	return re;
+}
 
 /*
  * read_proc_stat() - read process status
@@ -931,12 +1001,6 @@
 	if ((nf = get_fields(buf, (char *)NULL, &fp, (int *)NULL, 0)) < 5)
 	    return(1);
 /*
- * Convert the first field to an integer; its conversion must match the
- * PID argument.
- */
-	if (atoi(fp[0]) != pid)
-	    return(1);
-/*
  * Get the command name from the second field.  Strip a starting '(' and
  * an ending ')'.  Allocate space to hold the result and return the space
  * pointer.


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- lsof.spec	19 Jul 2006 21:58:20 -0000	1.33
+++ lsof.spec	9 Aug 2006 21:46:34 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system.
 Name: lsof
 Version: 4.78
-Release: 1
+Release: 2
 License: Free
 %define lsofrh lsof_4.78C-rh
 Group: Development/Debuggers
@@ -12,6 +12,8 @@
 
 BuildRequires: libselinux-devel
 
+Patch1: lsof_4.78C-threads.patch
+
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
 information about files that are open by the processes running on a
@@ -20,6 +22,8 @@
 %prep
 %setup -q -n %{lsofrh}
 
+%patch1 -p1 -b .kzak
+
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
 
@@ -42,6 +46,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Aug  9 2006 Karel Zak <kzak at redhat.com> 4.78-2
+- fix #184338 - allow lsof access nptl threads
+
 * Wed Jul 19 2006 Karel Zak <kzak at redhat.com> 4.78-1
 - rebuild
 


--- lsof_4.78B-rh-selinux.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:52:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:52:41 -0400
Subject: rpms/kernel/devel/configs config-generic,1.240,1.241
Message-ID: <200608092152.k79Lqf17021886@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
- IPsec labelling enhancements for MLS
- Netlabel: CIPSO labeled networking




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- config-generic	9 Aug 2006 18:43:56 -0000	1.240
+++ config-generic	9 Aug 2006 21:52:38 -0000	1.241
@@ -815,6 +815,8 @@
 # CONFIG_TIPC_ADVANCED is not set
 # CONFIG_TIPC_DEBUG is not set
 
+CONFIG_NETLABEL=y
+
 #
 # QoS and/or fair queueing
 #



From fedora-cvs-commits at redhat.com  Wed Aug  9 21:52:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 17:52:41 -0400
Subject: rpms/kernel/devel linux-2.6-net-ipsec-labelling.patch, NONE,
	1.1 linux-2.6-net-netlabel-cipso.patch, NONE,
	1.1 kernel-2.6.spec, 1.2539, 1.2540
Message-ID: <200608092152.k79Lqfvs021874@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-net-ipsec-labelling.patch 
	linux-2.6-net-netlabel-cipso.patch 
Log Message:
- IPsec labelling enhancements for MLS
- Netlabel: CIPSO labeled networking



linux-2.6-net-ipsec-labelling.patch:
 Documentation/networking/secid.txt           |   14 +
 include/linux/security.h                     |  214 +++++++++++++++++++++++---
 include/net/flow.h                           |    5 
 include/net/request_sock.h                   |    1 
 include/net/route.h                          |    3 
 include/net/sock.h                           |   14 +
 include/net/xfrm.h                           |    2 
 net/core/flow.c                              |    7 
 net/core/sock.c                              |    2 
 net/dccp/ipv4.c                              |    4 
 net/dccp/ipv6.c                              |    9 +
 net/ipv4/af_inet.c                           |    1 
 net/ipv4/icmp.c                              |    2 
 net/ipv4/inet_connection_sock.c              |    3 
 net/ipv4/ip_output.c                         |    2 
 net/ipv4/netfilter/ipt_REJECT.c              |    1 
 net/ipv4/raw.c                               |    1 
 net/ipv4/syncookies.c                        |    5 
 net/ipv4/tcp_ipv4.c                          |    3 
 net/ipv4/udp.c                               |    1 
 net/ipv6/af_inet6.c                          |    1 
 net/ipv6/datagram.c                          |    2 
 net/ipv6/icmp.c                              |    2 
 net/ipv6/inet6_connection_sock.c             |    1 
 net/ipv6/ndisc.c                             |    1 
 net/ipv6/netfilter/ip6t_REJECT.c             |    1 
 net/ipv6/raw.c                               |    1 
 net/ipv6/tcp_ipv6.c                          |    9 +
 net/ipv6/udp.c                               |    2 
 net/key/af_key.c                             |   37 ++++
 net/xfrm/xfrm_policy.c                       |   27 +--
 net/xfrm/xfrm_state.c                        |   14 +
 net/xfrm/xfrm_user.c                         |   58 +++++--
 security/dummy.c                             |   58 ++++++-
 security/selinux/hooks.c                     |  183 +++++++++++++++-------
 security/selinux/include/av_perm_to_string.h |    1 
 security/selinux/include/av_permissions.h    |    1 
 security/selinux/include/objsec.h            |    1 
 security/selinux/include/security.h          |    2 
 security/selinux/include/xfrm.h              |   43 +++--
 security/selinux/ss/mls.c                    |   20 --
 security/selinux/ss/mls.h                    |   20 ++
 security/selinux/ss/services.c               |   69 ++++++++
 security/selinux/xfrm.c                      |  216 ++++++++++++++++++++++-----
 44 files changed, 854 insertions(+), 210 deletions(-)

--- NEW FILE linux-2.6-net-ipsec-labelling.patch ---
Date: Tue, 8 Aug 2006 00:20:01 -0400 (EDT)
From: James Morris <jmorris at redhat.com>
Subject: [SELINUX/NETWORK 1/2] IPsec labeling enhancements for MLS
Message-ID: <Pine.LNX.4.44.0608080013270.13632-100000 at redline.boston.redhat.com>

This patch, from TCS, enhances the IPsec xfrm labeling for MLS, to allow 
Linux to be certified against LSPP.

The upstream post of the first patch is here:
http://marc.theaimsgroup.com/?l=linux-netdev&m=115324352321637&w=2

This code has been merged into the upstream 2.6.19 networking tree and is 
also included in the latest -mm kernel.

Signed-off-by: Venkat Yekkirala <vyekkirala at TrustedCS.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: James Morris <jmorris at redhat.com>

---

 Documentation/networking/secid.txt           |   14 +
 include/linux/security.h                     |  214 +++++++++++++++++++++++---
 include/net/flow.h                           |    5 
 include/net/request_sock.h                   |    1 
 include/net/route.h                          |    3 
 include/net/sock.h                           |   14 +
 include/net/xfrm.h                           |    2 
 net/core/flow.c                              |    7 
 net/core/sock.c                              |    2 
 net/dccp/ipv4.c                              |    4 
 net/dccp/ipv6.c                              |    9 +
 net/ipv4/af_inet.c                           |    1 
 net/ipv4/icmp.c                              |    2 
 net/ipv4/inet_connection_sock.c              |    3 
 net/ipv4/ip_output.c                         |    2 
 net/ipv4/netfilter/ipt_REJECT.c              |    1 
 net/ipv4/raw.c                               |    1 
 net/ipv4/syncookies.c                        |    5 
 net/ipv4/tcp_ipv4.c                          |    3 
 net/ipv4/udp.c                               |    1 
 net/ipv6/af_inet6.c                          |    1 
 net/ipv6/datagram.c                          |    2 
 net/ipv6/icmp.c                              |    2 
 net/ipv6/inet6_connection_sock.c             |    1 
 net/ipv6/ndisc.c                             |    1 
 net/ipv6/netfilter/ip6t_REJECT.c             |    1 
 net/ipv6/raw.c                               |    1 
 net/ipv6/tcp_ipv6.c                          |    9 +
 net/ipv6/udp.c                               |    2 
 net/key/af_key.c                             |   37 ++++
 net/xfrm/xfrm_policy.c                       |   27 +--
 net/xfrm/xfrm_state.c                        |   14 +
 net/xfrm/xfrm_user.c                         |   58 +++++--
 security/dummy.c                             |   58 ++++++-
 security/selinux/hooks.c                     |  183 +++++++++++++++-------
 security/selinux/include/av_perm_to_string.h |    1 
 security/selinux/include/av_permissions.h    |    1 
 security/selinux/include/objsec.h            |    1 
 security/selinux/include/security.h          |    2 
 security/selinux/include/xfrm.h              |   43 +++--
 security/selinux/ss/mls.c                    |   20 --
 security/selinux/ss/mls.h                    |   20 ++
 security/selinux/ss/services.c               |   69 ++++++++
 security/selinux/xfrm.c                      |  216 ++++++++++++++++++++++-----
 44 files changed, 854 insertions(+), 210 deletions(-)


diff -purN -X dontdiff linux-2.6.17.i686/Documentation/networking/secid.txt linux-2.6.17.i686.w/Documentation/networking/secid.txt
--- linux-2.6.17.i686/Documentation/networking/secid.txt	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.i686.w/Documentation/networking/secid.txt	2006-08-07 20:29:29.000000000 -0400
@@ -0,0 +1,14 @@
+flowi structure:
+
+The secid member in the flow structure is used in LSMs (e.g. SELinux) to indicate
+the label of the flow. This label of the flow is currently used in selecting
+matching labeled xfrm(s).
+
+If this is an outbound flow, the label is derived from the socket, if any, or
+the incoming packet this flow is being generated as a response to (e.g. tcp
+resets, timewait ack, etc.). It is also conceivable that the label could be
+derived from other sources such as process context, device, etc., in special
+cases, as may be appropriate.
+
+If this is an inbound flow, the label is derived from the IPSec security
+associations, if any, used by the packet.
diff -purN -X dontdiff linux-2.6.17.i686/include/linux/security.h linux-2.6.17.i686.w/include/linux/security.h
--- linux-2.6.17.i686/include/linux/security.h	2006-08-07 10:40:09.000000000 -0400
+++ linux-2.6.17.i686.w/include/linux/security.h	2006-08-07 20:34:49.000000000 -0400
@@ -31,6 +31,8 @@
 #include <linux/msg.h>
 #include <linux/sched.h>
 #include <linux/key.h>
+#include <linux/xfrm.h>
+#include <net/flow.h>
 
 struct ctl_table;
 
@@ -88,6 +90,7 @@ extern int cap_netlink_recv(struct sk_bu
 struct nfsctl_arg;
 struct sched_param;
 struct swap_info_struct;
+struct request_sock;
 
 /* bprm_apply_creds unsafe reasons */
 #define LSM_UNSAFE_SHARE	1
@@ -812,9 +815,19 @@ struct swap_info_struct;
  *      which is used to copy security attributes between local stream sockets.
  * @sk_free_security:
  *	Deallocate security structure.
- * @sk_getsid:
- *	Retrieve the LSM-specific sid for the sock to enable caching of network
+ * @sk_clone_security:
+ *	Clone/copy security structure.
+ * @sk_getsecid:
+ *	Retrieve the LSM-specific secid for the sock to enable caching of network
  *	authorizations.
+ * @sock_graft:
+ *	Sets the socket's isec sid to the sock's sid.
+ * @inet_conn_request:
+ *	Sets the openreq's sid to socket's sid with MLS portion taken from peer sid.
+ * @inet_csk_clone:
+ *	Sets the new child socket's sid to the openreq sid.
+ * @req_classify_flow:
+ *	Sets the flow's sid to the openreq sid.
  *
  * Security hooks for XFRM operations.
  *
@@ -823,9 +836,10 @@ struct swap_info_struct;
  *	used by the XFRM system.
  *	@sec_ctx contains the security context information being provided by
  *	the user-level policy update program (e.g., setkey).
- *	Allocate a security structure to the xp->security field.
- *	The security field is initialized to NULL when the xfrm_policy is
- *	allocated.
+ *	@sk refers to the sock from which to derive the security context.
+ *	Allocate a security structure to the xp->security field; the security
+ *	field is initialized to NULL when the xfrm_policy is allocated. Only
+ *	one of sec_ctx or sock can be specified.
  *	Return 0 if operation was successful (memory to allocate, legal context)
  * @xfrm_policy_clone_security:
  *	@old contains an existing xfrm_policy in the SPD.
@@ -844,9 +858,14 @@ struct swap_info_struct;
  *	Database by the XFRM system.
  *	@sec_ctx contains the security context information being provided by
  *	the user-level SA generation program (e.g., setkey or racoon).
- *	Allocate a security structure to the x->security field.  The
- *	security field is initialized to NULL when the xfrm_state is
- *	allocated.
+ *	@polsec contains the security context information associated with a xfrm
+ *	policy rule from which to take the base context. polsec must be NULL
+ *	when sec_ctx is specified.
+ *	@secid contains the secid from which to take the mls portion of the context.
+ *	Allocate a security structure to the x->security field; the security
+ *	field is initialized to NULL when the xfrm_state is allocated. Set the
+ *	context to correspond to either sec_ctx or polsec, with the mls portion
+ *	taken from secid in the latter case.
  *	Return 0 if operation was successful (memory to allocate, legal context).
  * @xfrm_state_free_security:
  *	@x contains the xfrm_state.
@@ -857,13 +876,27 @@ struct swap_info_struct;
  * @xfrm_policy_lookup:
  *	@xp contains the xfrm_policy for which the access control is being
  *	checked.
- *	@sk_sid contains the sock security label that is used to authorize
+ *	@fl_secid contains the flow security label that is used to authorize
  *	access to the policy xp.
  *	@dir contains the direction of the flow (input or output).
- *	Check permission when a sock selects a xfrm_policy for processing
+ *	Check permission when a flow selects a xfrm_policy for processing
  *	XFRMs on a packet.  The hook is called when selecting either a
  *	per-socket policy or a generic xfrm policy.
  *	Return 0 if permission is granted.
+ * @xfrm_state_pol_flow_match:
+ *	@x contains the state to match.
+ *	@xp contains the policy to check for a match.
+ *	@fl contains the flow to check for a match.
+ *	Return 1 if there is a match.
+ * @xfrm_flow_state_match:
+ *	@fl contains the flow key to match.
+ *	@xfrm points to the xfrm_state to match.
+ *	Return 1 if there is a match.
+ * @xfrm_decode_session:
+ *	@skb points to skb to decode.
+ *	@secid points to the flow key secid to set.
+ *	@ckall says if all xfrms used should be checked for same secid.
+ *	Return 0 if ckall is zero or all xfrms used have the same secid.
  *
  * Security hooks affecting all Key Management operations
  *
@@ -1332,18 +1365,31 @@ struct security_operations {
 	int (*socket_getpeersec_dgram) (struct socket *sock, struct sk_buff *skb, u32 *secid);
 	int (*sk_alloc_security) (struct sock *sk, int family, gfp_t priority);
 	void (*sk_free_security) (struct sock *sk);
-	unsigned int (*sk_getsid) (struct sock *sk, struct flowi *fl, u8 dir);
+	void (*sk_clone_security) (const struct sock *sk, struct sock *newsk);
+	void (*sk_getsecid) (struct sock *sk, u32 *secid);
+	void (*sock_graft)(struct sock* sk, struct socket *parent);
+	int (*inet_conn_request)(struct sock *sk, struct sk_buff *skb,
+					struct request_sock *req);
[...1949 lines suppressed...]
+				if (!sid_set) {
+					*sid = ctx->ctx_sid;
+					sid_set = 1;
+
+					if (!ckall)
+						break;
+				}
+				else if (*sid != ctx->ctx_sid)
+					return -EINVAL;
+			}
+		}
+	}
+
+	return 0;
+}
+
+/*
  * Security blob allocation for xfrm_policy and xfrm_state
  * CTX does not have a meaningful value on input
  */
-static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_user_sec_ctx *uctx)
+static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp,
+	struct xfrm_user_sec_ctx *uctx, struct xfrm_sec_ctx *pol, u32 sid)
 {
 	int rc = 0;
 	struct task_security_struct *tsec = current->security;
-	struct xfrm_sec_ctx *ctx;
+	struct xfrm_sec_ctx *ctx = NULL;
+	char *ctx_str = NULL;
+	u32 str_len;
+	u32 ctx_sid;
 
-	BUG_ON(!uctx);
-	BUG_ON(uctx->ctx_doi != XFRM_SC_ALG_SELINUX);
+	BUG_ON(uctx && pol);
+
+	if (!uctx)
+		goto not_from_user;
+
+	if (uctx->ctx_doi != XFRM_SC_ALG_SELINUX)
+		return -EINVAL;
 
 	if (uctx->ctx_len >= PAGE_SIZE)
 		return -ENOMEM;
@@ -141,9 +249,43 @@ static int selinux_xfrm_sec_ctx_alloc(st
 
 	return rc;
 
+not_from_user:
+	if (pol) {
+		rc = security_sid_mls_copy(pol->ctx_sid, sid, &ctx_sid);
+		if (rc)
+			goto out;
+	}
+	else
+		ctx_sid = sid;
+
+	rc = security_sid_to_context(ctx_sid, &ctx_str, &str_len);
+	if (rc)
+		goto out;
+
+	*ctxp = ctx = kmalloc(sizeof(*ctx) +
+			      str_len,
+			      GFP_ATOMIC);
+
+	if (!ctx) {
+		rc = -ENOMEM;
+		goto out;
+	}
+
+	ctx->ctx_doi = XFRM_SC_DOI_LSM;
+	ctx->ctx_alg = XFRM_SC_ALG_SELINUX;
+	ctx->ctx_sid = ctx_sid;
+	ctx->ctx_len = str_len;
+	memcpy(ctx->ctx_str,
+	       ctx_str,
+	       str_len);
+
+	goto out2;
+
 out:
 	*ctxp = NULL;
 	kfree(ctx);
+out2:
+	kfree(ctx_str);
 	return rc;
 }
 
@@ -151,13 +293,23 @@ out:
  * LSM hook implementation that allocs and transfers uctx spec to
  * xfrm_policy.
  */
-int selinux_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *uctx)
+int selinux_xfrm_policy_alloc(struct xfrm_policy *xp,
+		struct xfrm_user_sec_ctx *uctx, struct sock *sk)
 {
 	int err;
+	u32 sid;
 
 	BUG_ON(!xp);
+	BUG_ON(uctx && sk);
 
-	err = selinux_xfrm_sec_ctx_alloc(&xp->security, uctx);
+	if (sk) {
+		struct sk_security_struct *ssec = sk->sk_security;
+		sid = ssec->sid;
+	}
+	else
+		sid = SECSID_NULL;
+
+	err = selinux_xfrm_sec_ctx_alloc(&xp->security, uctx, NULL, sid);
 	return err;
 }
 
@@ -217,13 +369,14 @@ int selinux_xfrm_policy_delete(struct xf
  * LSM hook implementation that allocs and transfers sec_ctx spec to
  * xfrm_state.
  */
-int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *uctx)
+int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *uctx,
+		struct xfrm_sec_ctx *pol, u32 secid)
 {
 	int err;
 
 	BUG_ON(!x);
 
-	err = selinux_xfrm_sec_ctx_alloc(&x->security, uctx);
+	err = selinux_xfrm_sec_ctx_alloc(&x->security, uctx, pol, secid);
 	return err;
 }
 
@@ -329,38 +482,30 @@ int selinux_xfrm_state_delete(struct xfr
  * we need to check for unlabelled access since this may not have
  * gone thru the IPSec process.
  */
-int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
+int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb,
+				struct avc_audit_data *ad)
 {
 	int i, rc = 0;
 	struct sec_path *sp;
+	u32 sel_sid = SECINITSID_UNLABELED;
 
 	sp = skb->sp;
 
 	if (sp) {
-		/*
-		 * __xfrm_policy_check does not approve unless xfrm_policy_ok
-		 * says that spi's match for policy and the socket.
-		 *
-		 *  Only need to verify the existence of an authorizable sp.
-		 */
 		for (i = 0; i < sp->len; i++) {
 			struct xfrm_state *x = sp->xvec[i];
 
-			if (x && selinux_authorizable_xfrm(x))
-				goto accept;
+			if (x && selinux_authorizable_xfrm(x)) {
+				struct xfrm_sec_ctx *ctx = x->security;
+				sel_sid = ctx->ctx_sid;
+				break;
+			}
 		}
 	}
 
-	/* check SELinux sock for unlabelled access */
-	rc = avc_has_perm(isec_sid, SECINITSID_UNLABELED, SECCLASS_ASSOCIATION,
-			  ASSOCIATION__RECVFROM, NULL);
-	if (rc)
-		goto drop;
-
-accept:
-	return 0;
+	rc = avc_has_perm(isec_sid, sel_sid, SECCLASS_ASSOCIATION,
+			  ASSOCIATION__RECVFROM, ad);
 
-drop:
 	return rc;
 }
 
@@ -371,7 +516,8 @@ drop:
  * If we do have a authorizable security association, then it has already been
  * checked in xfrm_policy_lookup hook.
  */
-int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb)
+int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
+					struct avc_audit_data *ad)
 {
 	struct dst_entry *dst;
 	int rc = 0;
@@ -391,7 +537,7 @@ int selinux_xfrm_postroute_last(u32 isec
 	}
 
 	rc = avc_has_perm(isec_sid, SECINITSID_UNLABELED, SECCLASS_ASSOCIATION,
-			  ASSOCIATION__SENDTO, NULL);
+			  ASSOCIATION__SENDTO, ad);
 out:
 	return rc;
 }


linux-2.6-net-netlabel-cipso.patch:
 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  781 ++++++
 Documentation/netlabel/introduction.txt                   |   46 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 Documentation/networking/ip-sysctl.txt                    |   35 
 include/linux/ip.h                                        |    1 
 include/linux/security.h                                  |   25 
 include/linux/sysctl.h                                    |    4 
 include/linux/utsrelease.h                                |    1 
 include/net/cipso_ipv4.h                                  |  250 ++
 include/net/inet_sock.h                                   |    2 
 include/net/netlabel.h                                    |  291 ++
 net/Kconfig                                               |    2 
 net/Makefile                                              |    1 
 net/ipv4/Makefile                                         |    1 
 net/ipv4/ah4.c                                            |    2 
 net/ipv4/cipso_ipv4.c                                     | 1607 ++++++++++++++
 net/ipv4/ip_options.c                                     |   19 
 net/ipv4/sysctl_net_ipv4.c                                |   35 
 net/netlabel/Kconfig                                      |   14 
 net/netlabel/Makefile                                     |   16 
 net/netlabel/netlabel_cipso_v4.c                          |  542 ++++
 net/netlabel/netlabel_cipso_v4.h                          |  217 +
 net/netlabel/netlabel_domainhash.c                        |  513 ++++
 net/netlabel/netlabel_domainhash.h                        |   63 
 net/netlabel/netlabel_kapi.c                              |  231 ++
 net/netlabel/netlabel_mgmt.c                              |  624 +++++
 net/netlabel/netlabel_mgmt.h                              |  246 ++
 net/netlabel/netlabel_unlabeled.c                         |  253 ++
 net/netlabel/netlabel_unlabeled.h                         |   98 
 net/netlabel/netlabel_user.c                              |  158 +
 net/netlabel/netlabel_user.h                              |  214 +
 net/socket.c                                              |   13 
 security/dummy.c                                          |    6 
 security/selinux/hooks.c                                  |   58 
 security/selinux/include/objsec.h                         |    8 
 security/selinux/include/selinux_netlabel.h               |  125 +
 security/selinux/ss/ebitmap.c                             |  144 +
 security/selinux/ss/ebitmap.h                             |    6 
 security/selinux/ss/mls.c                                 |  156 +
 security/selinux/ss/mls.h                                 |   21 
 security/selinux/ss/services.c                            |  488 ++++
 44 files changed, 7393 insertions(+), 31 deletions(-)

--- NEW FILE linux-2.6-net-netlabel-cipso.patch ---
Date: Tue, 8 Aug 2006 00:25:40 -0400 (EDT)
From: James Morris <jmorris at redhat.com>
Subject: [SELINUX/NETWORK 2/2] Netlabel: CIPSO labeled networking support

This patch implements a legacy MLS network labeling scheme (including, but 
generally referred to as CIPSO, with this particular implementation called 
Netlabel).

It's from HP, and is an alternative to the native Linux IPsec xfrm 
labeling.  Its purpose is to provide interoperability with legacy Trusted 
Solaris systems.

The upstream post of the first patch is here:
http://marc.theaimsgroup.com/?l=linux-netdev&m=115463625625389&w=2

This code has been merged into the upstream 2.6.19 networking tree and is 
also included in the latest -mm kernel.

This patch is a backport for FC6 and RHEL5.

Signed-off-by: Paul Moore <paul.moore at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: James Morris <jmorris at redhat.com>

---

 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  781 ++++++
 Documentation/netlabel/introduction.txt                   |   46 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 Documentation/networking/ip-sysctl.txt                    |   35 
 include/linux/ip.h                                        |    1 
 include/linux/security.h                                  |   25 
 include/linux/sysctl.h                                    |    4 
 include/linux/utsrelease.h                                |    1 
 include/net/cipso_ipv4.h                                  |  250 ++
 include/net/inet_sock.h                                   |    2 
 include/net/netlabel.h                                    |  291 ++
 net/Kconfig                                               |    2 
 net/Makefile                                              |    1 
 net/ipv4/Makefile                                         |    1 
 net/ipv4/ah4.c                                            |    2 
 net/ipv4/cipso_ipv4.c                                     | 1607 ++++++++++++++
 net/ipv4/ip_options.c                                     |   19 
 net/ipv4/sysctl_net_ipv4.c                                |   35 
 net/netlabel/Kconfig                                      |   14 
 net/netlabel/Makefile                                     |   16 
 net/netlabel/netlabel_cipso_v4.c                          |  542 ++++
 net/netlabel/netlabel_cipso_v4.h                          |  217 +
 net/netlabel/netlabel_domainhash.c                        |  513 ++++
 net/netlabel/netlabel_domainhash.h                        |   63 
 net/netlabel/netlabel_kapi.c                              |  231 ++
 net/netlabel/netlabel_mgmt.c                              |  624 +++++
 net/netlabel/netlabel_mgmt.h                              |  246 ++
 net/netlabel/netlabel_unlabeled.c                         |  253 ++
 net/netlabel/netlabel_unlabeled.h                         |   98 
 net/netlabel/netlabel_user.c                              |  158 +
 net/netlabel/netlabel_user.h                              |  214 +
 net/socket.c                                              |   13 
 security/dummy.c                                          |    6 
 security/selinux/hooks.c                                  |   58 
 security/selinux/include/objsec.h                         |    8 
 security/selinux/include/selinux_netlabel.h               |  125 +
 security/selinux/ss/ebitmap.c                             |  144 +
 security/selinux/ss/ebitmap.h                             |    6 
 security/selinux/ss/mls.c                                 |  156 +
 security/selinux/ss/mls.h                                 |   21 
 security/selinux/ss/services.c                            |  488 ++++
 44 files changed, 7393 insertions(+), 31 deletions(-)


diff -purN -X dontdiff linux-2.6.17.i686.p/Documentation/00-INDEX linux-2.6.17.i686.w/Documentation/00-INDEX
--- linux-2.6.17.i686.p/Documentation/00-INDEX	2006-06-17 21:49:35.000000000 -0400
+++ linux-2.6.17.i686.w/Documentation/00-INDEX	2006-08-07 21:03:07.000000000 -0400
@@ -184,6 +184,8 @@ mtrr.txt
 	- how to use PPro Memory Type Range Registers to increase performance.
 nbd.txt
 	- info on a TCP implementation of a network block device.
+netlabel/
+	- directory with information on the NetLabel subsystem.
 networking/
 	- directory with info on various aspects of networking with Linux.
 nfsroot.txt
diff -purN -X dontdiff linux-2.6.17.i686.p/Documentation/netlabel/00-INDEX linux-2.6.17.i686.w/Documentation/netlabel/00-INDEX
--- linux-2.6.17.i686.p/Documentation/netlabel/00-INDEX	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.i686.w/Documentation/netlabel/00-INDEX	2006-08-07 21:03:07.000000000 -0400
@@ -0,0 +1,10 @@
+00-INDEX
+	- this file.
+cipso_ipv4.txt
+	- documentation on the IPv4 CIPSO protocol engine.
+draft-ietf-cipso-ipsecurity-01.txt
+	- IETF draft of the CIPSO protocol, dated 16 July 1992.
+introduction.txt
+	- NetLabel introduction, READ THIS FIRST.
+lsm_interface.txt
+	- documentation on the NetLabel kernel security module API.
diff -purN -X dontdiff linux-2.6.17.i686.p/Documentation/netlabel/cipso_ipv4.txt linux-2.6.17.i686.w/Documentation/netlabel/cipso_ipv4.txt
--- linux-2.6.17.i686.p/Documentation/netlabel/cipso_ipv4.txt	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.i686.w/Documentation/netlabel/cipso_ipv4.txt	2006-08-07 21:03:07.000000000 -0400
@@ -0,0 +1,48 @@
+NetLabel CIPSO/IPv4 Protocol Engine
+==============================================================================
+Paul Moore, paul.moore at hp.com
+
+May 17, 2006
+
+ * Overview
+
+The NetLabel CIPSO/IPv4 protocol engine is based on the IETF Commercial IP
+Security Option (CIPSO) draft from July 16, 1992.  A copy of this draft can be
+found in this directory, consult '00-INDEX' for the filename.  While the IETF
+draft never made it to an RFC standard it has become a de-facto standard for
+labeled networking and is used in many trusted operating systems.
+
+ * Outbound Packet Processing
+
+The CIPSO/IPv4 protocol engine applies the CIPSO IP option to packets by
+adding the CIPSO label to the socket.  This causes all packets leaving the
+system through the socket to have the CIPSO IP option applied.  The socket's
+CIPSO label can be changed at any point in time, however, it is recommended
+that it is set upon the socket's creation.  The LSM can set the socket's CIPSO
+label by using the NetLabel security module API; if the NetLabel "domain" is
+configured to use CIPSO for packet labeling then a CIPSO IP option will be
+generated and attached to the socket.
+
+ * Inbound Packet Processing
+
+The CIPSO/IPv4 protocol engine validates every CIPSO IP option it finds at the
+IP layer without any special handling required by the LSM.  However, in order
+to decode and translate the CIPSO label on the packet the LSM must use the
+NetLabel security module API to extract the security attributes of the packet.
+This is typically done at the socket layer using the 'socket_sock_rcv_skb()'
+LSM hook.
+
+ * Label Translation
+
+The CIPSO/IPv4 protocol engine contains a mechanism to translate CIPSO security
+attributes such as sensitivity level and category to values which are
+appropriate for the host.  These mappings are defined as part of a CIPSO
+Domain Of Interpretation (DOI) definition and are configured through the
+NetLabel user space communication layer.  Each DOI definition can have a
+different security attribute mapping table.
+
+ * Label Translation Cache
+
+The NetLabel system provides a framework for caching security attribute
+mappings from the network labels to the corresponding LSM identifiers.  The
+CIPSO/IPv4 protocol engine supports this caching mechanism.
diff -purN -X dontdiff linux-2.6.17.i686.p/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt linux-2.6.17.i686.w/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
--- linux-2.6.17.i686.p/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.i686.w/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt	2006-08-07 21:03:07.000000000 -0400
@@ -0,0 +1,791 @@
+IETF CIPSO Working Group
+16 July, 1992
+
+
+
+                 COMMERCIAL IP SECURITY OPTION (CIPSO 2.2)
+
+
+
+1.    Status
+
+This Internet Draft provides the high level specification for a Commercial
+IP Security Option (CIPSO).  This draft reflects the version as approved by
+the CIPSO IETF Working Group.  Distribution of this memo is unlimited.
+
+This document is an Internet Draft.  Internet Drafts are working documents
+of the Internet Engineering Task Force (IETF), its Areas, and its Working
+Groups. Note that other groups may also distribute working documents as
+Internet Drafts.
+
+Internet Drafts are draft documents valid for a maximum of six months.
+Internet Drafts may be updated, replaced, or obsoleted by other documents
+at any time.  It is not appropriate to use Internet Drafts as reference
+material or to cite them other than as a "working draft" or "work in
+progress."
+
+Please check the I-D abstract listing contained in each Internet Draft
+directory to learn the current status of this or any other Internet Draft.
+
+
+
+
+2.    Background
+
+Currently the Internet Protocol includes two security options.  One of
+these options is the DoD Basic Security Option (BSO) (Type 130) which allows
+IP datagrams to be labeled with security classifications.  This option
+provides sixteen security classifications and a variable number of handling
+restrictions.  To handle additional security information, such as security
+categories or compartments, another security option (Type 133) exists and
+is referred to as the DoD Extended Security Option (ESO).  The values for
+the fixed fields within these two options are administered by the Defense
+Information Systems Agency (DISA).
+
[...7591 lines suppressed...]
+/**
+ * selinux_netlbl_socket_post_create - Label a socket using NetLabel
+ * @sock: the socket to label
+ * @sock_family: the socket family
+ * @sid: the SID to use
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism using the given
+ * SID.  Returns zero values on success, negative values on failure.
+ *
+ */
+int selinux_netlbl_socket_post_create(struct socket *sock,
+				      int sock_family,
+				      u32 sid)
+{
+	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+	struct sk_security_struct *sksec = sock->sk->sk_security;
+
+	if (sock_family != PF_INET)
+		return 0;
+
+	sksec->sclass = isec->sclass;
+	sksec->nlbl_state = NLBL_REQUIRE;
+	return selinux_netlbl_socket_setsid(sock, sid);
+}
+
+/**
+ * selinux_netlbl_sock_graft - Netlabel the new socket
+ * @sk: the new connection
+ * @sock: the new socket
+ *
+ * Description:
+ * The connection represented by @sk is being grafted onto @sock so set the
+ * socket's NetLabel to match the SID of @sk.
+ *
+ */
+void selinux_netlbl_sock_graft(struct sock *sk, struct socket *sock)
+{
+	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+	struct sk_security_struct *sksec = sk->sk_security;
+
+	if (sk->sk_family != PF_INET)
+		return;
+
+	sksec->nlbl_state = NLBL_REQUIRE;
+	sksec->peer_sid = sksec->sid;
+	sksec->sclass = isec->sclass;
+
+	/* Try to set the NetLabel on the socket to save time later, if we fail
+	 * here we will pick up the pieces in later calls to
+	 * selinux_netlbl_inode_permission(). */
+	selinux_netlbl_socket_setsid(sock, sksec->sid);
+}
+
+/**
+ * selinux_netlbl_inet_conn_request - Handle a new connection request
+ * @skb: the packet
+ * @sock_sid: the SID of the parent socket
+ *
+ * Description:
+ * If present, use the security attributes of the packet in @skb and the
+ * parent sock's SID to arrive at a SID for the new child sock.  Returns the
+ * SID of the connection or SECSID_NULL on failure.
+ *
+ */
+u32 selinux_netlbl_inet_conn_request(struct sk_buff *skb, u32 sock_sid)
+{
+	int rc;
+	u32 peer_sid;
+
+	rc = selinux_netlbl_skbuff_getsid(skb, sock_sid, &peer_sid);
+	if (rc != 0)
+		return SECSID_NULL;
+
+	if (peer_sid == SECINITSID_UNLABELED)
+		return SECSID_NULL;
+
+	return peer_sid;
+}
+
+/**
+ * __selinux_netlbl_inode_permission - Label a socket using NetLabel
+ * @inode: the file descriptor's inode
+ * @mask: the permission mask
+ *
+ * Description:
+ * Try to label a socket with the inode's SID using NetLabel.  Returns zero on
+ * success, negative values on failure.
+ *
+ */
+int __selinux_netlbl_inode_permission(struct inode *inode, int mask)
+{
+	int rc;
+	struct socket *sock = SOCKET_I(inode);
+	struct sk_security_struct *sksec = sock->sk->sk_security;
+
+	lock_sock(sock->sk);
+	rc = selinux_netlbl_socket_setsid(sock, sksec->sid);
+	release_sock(sock->sk);
+
+	return rc;
+}
+
+/**
+ * selinux_netlbl_sock_rcv_skb - Do an inbound access check using NetLabel
+ * @sksec: the sock's sk_security_struct
+ * @skb: the packet
+ * @ad: the audit data
+ *
+ * Description:
+ * Fetch the NetLabel security attributes from @skb and perform an access check
+ * against the receiving socket.  Returns zero on success, negative values on
+ * error.
+ *
+ */
+int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
+				struct sk_buff *skb,
+				struct avc_audit_data *ad)
+{
+	int rc;
+	u32 netlbl_sid;
+	u32 recv_perm;
+
+	rc = selinux_netlbl_skbuff_getsid(skb, sksec->sid, &netlbl_sid);
+	if (rc != 0)
+		return rc;
+
+	if (netlbl_sid == SECINITSID_UNLABELED)
+		return 0;
+
+	switch (sksec->sclass) {
+	case SECCLASS_UDP_SOCKET:
+		recv_perm = UDP_SOCKET__RECV_MSG;
+		break;
+	case SECCLASS_TCP_SOCKET:
+		recv_perm = TCP_SOCKET__RECV_MSG;
+		break;
+	default:
+		recv_perm = RAWIP_SOCKET__RECV_MSG;
+	}
+
+	rc = avc_has_perm(sksec->sid,
+			  netlbl_sid,
+			  sksec->sclass,
+			  recv_perm,
+			  ad);
+	if (rc == 0)
+		return 0;
+
+	netlbl_skbuff_err(skb, rc);
+	return rc;
+}
+
+/**
+ * selinux_netlbl_socket_peersid - Return the peer SID of a connected socket
+ * @sock: the socket
+ *
+ * Description:
+ * Examine @sock to find the connected peer's SID.  Returns the SID on success
+ * or SECSID_NULL on error.
+ *
+ */
+u32 selinux_netlbl_socket_getpeersec_stream(struct socket *sock)
+{
+	struct sk_security_struct *sksec = sock->sk->sk_security;
+
+	if (sksec->peer_sid == SECINITSID_UNLABELED)
+		return SECSID_NULL;
+
+	return sksec->peer_sid;
+}
+
+/**
+ * selinux_netlbl_socket_getpeersec_dgram - Return the SID of a NetLabel packet
+ * @skb: the packet
+ *
+ * Description:
+ * Examine @skb to find the SID assigned to it by NetLabel.  Returns the SID on
+ * success, SECSID_NULL on error.
+ *
+ */
+u32 selinux_netlbl_socket_getpeersec_dgram(struct sk_buff *skb)
+{
+	int peer_sid;
+	struct sock *sk = skb->sk;
+	struct inode_security_struct *isec;
+
+	if (sk == NULL || sk->sk_socket == NULL)
+		return SECSID_NULL;
+
+	isec = SOCK_INODE(sk->sk_socket)->i_security;
+	if (selinux_netlbl_skbuff_getsid(skb, isec->sid, &peer_sid) != 0)
+		return SECSID_NULL;
+	if (peer_sid == SECINITSID_UNLABELED)
+		return SECSID_NULL;
+
+	return peer_sid;
+}
+#endif /* CONFIG_NETLABEL */



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2539
retrieving revision 1.2540
diff -u -r1.2539 -r1.2540
--- kernel-2.6.spec	9 Aug 2006 21:45:00 -0000	1.2539
+++ kernel-2.6.spec	9 Aug 2006 21:52:38 -0000	1.2540
@@ -366,7 +366,9 @@
 Patch1201: linux-2.6-NFSD-ctlbits.patch
 Patch1203: linux-2.6-NFSD-badness.patch
 
-# NIC driver updates
+# core networking changes.
+Patch1300: linux-2.6-net-ipsec-labelling.patch
+Patch1301: linux-2.6-net-netlabel-cipso.patch
 
 # Filesystem stuff.
 # Squashfs
@@ -383,7 +385,7 @@
 Patch1424: linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch
 Patch1425: linux-2.6-inode-diet-squashfs.patch
 
-#NFS superblock sharing / CacheFS
+# NFS superblock sharing / CacheFS
 Patch1430: linux-2.6-nfs-superblock-sharing.patch
 Patch1431: linux-2.6-cachefiles.patch
 Patch1432: linux-2.6-filesystem-caching-for-afs-and-nfs.patch
@@ -884,7 +886,9 @@
 # Fix badness.
 %patch1203 -p1
 
-# NIC driver fixes.
+# core networking changes.
+%patch1300 -p1
+%patch1301 -p1
 
 # Filesystem patches.
 # Squashfs
@@ -1708,6 +1712,8 @@
 - Fix hotplug CPU locking in workqueue creation.
 - Fix IDE oops on boot.
 - K8 EDAC support.
+- IPsec labelling enhancements for MLS
+- Netlabel: CIPSO labeled networking
 
 * Tue Aug  8 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace/ptrace interactions with SELinux.



From fedora-cvs-commits at redhat.com  Wed Aug  9 22:21:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 18:21:17 -0400
Subject: rpms/lsof/devel lsof.spec, 1.34, 1.35 lsof_4.78C-threads.patch, 1.1,
	1.2
Message-ID: <200608092221.k79MLH12012098@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12069

Modified Files:
	lsof.spec lsof_4.78C-threads.patch 
Log Message:
fix minor bugs in previous commit


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- lsof.spec	9 Aug 2006 21:46:34 -0000	1.34
+++ lsof.spec	9 Aug 2006 22:21:13 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system.
 Name: lsof
 Version: 4.78
-Release: 2
+Release: 3
 License: Free
 %define lsofrh lsof_4.78C-rh
 Group: Development/Debuggers
@@ -22,7 +22,7 @@
 %prep
 %setup -q -n %{lsofrh}
 
-%patch1 -p1 -b .kzak
+%patch1 -p1
 
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
@@ -46,6 +46,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Aug 10 2006 Karel Zak <kzak at redhat.com> 4.78-3
+- minor changes to thread patch
+
 * Wed Aug  9 2006 Karel Zak <kzak at redhat.com> 4.78-2
 - fix #184338 - allow lsof access nptl threads
 

lsof_4.78C-threads.patch:
 dproc.c |   84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 76 insertions(+), 8 deletions(-)

Index: lsof_4.78C-threads.patch
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof_4.78C-threads.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lsof_4.78C-threads.patch	9 Aug 2006 21:46:34 -0000	1.1
+++ lsof_4.78C-threads.patch	9 Aug 2006 22:21:13 -0000	1.2
@@ -1,5 +1,5 @@
 --- lsof_4.78C-rh/dialects/linux/dproc.c.kzak	2006-06-12 19:10:05.000000000 +0200
-+++ lsof_4.78C-rh/dialects/linux/dproc.c	2006-08-09 23:25:14.000000000 +0200
++++ lsof_4.78C-rh/dialects/linux/dproc.c	2006-08-10 00:14:23.000000000 +0200
 @@ -69,7 +69,8 @@
  _PROTOTYPE(static int read_proc_stat,(char *p, int pid, char **cmd, int *ppid,
  	   int *pgid));
@@ -48,7 +48,7 @@
  	    n += (pidx + 1);
  	/*
  	 * Process the PID's stat info.
-@@ -897,6 +913,60 @@
+@@ -897,6 +913,64 @@
  	(void) fclose(ms);
  }
  
@@ -68,13 +68,15 @@
 +	char pstate;
 +	FILE *f;
 +	int _pid;
-+	int re = 0;
++	int re = 0, x;
 +
 +	snpf(path, sizeof(path), "%s/%d/stat", PROCFS, pid);
 +	if (!(f = fopen(path, "r")))
-+		return;
-+	fscanf(f, "%d %*s %c", &_pid, &pstate);
++		return -1;
++	x = fscanf(f, "%d %*s %c", &_pid, &pstate);
 +	fclose(f);
++	if (x!=2)
++		return -1;
 +	if (_pid != pid)
 +		return -1;		/* corrupted /proc? */
 +	if (pstate!='Z') 
@@ -95,8 +97,10 @@
 +		snpf(path, sizeof(path), "%s/%d/task/%s/stat", PROCFS, pid, td->d_name);
 +		if (!(f = fopen(path, "r")))
 +			continue;
-+		fscanf(f, "%*d %*s %c", &pstate);
++		x = fscanf(f, "%*d %*s %c", &pstate);
 +		fclose(f);
++		if (x!=1)
++			continue;
 +		if (pstate!='Z') {
 +			re = 1;
 +			*tid = strdup(td->d_name);
@@ -109,7 +113,7 @@
  
  /*
   * read_proc_stat() - read process status
-@@ -931,12 +1001,6 @@
+@@ -931,12 +1005,6 @@
  	if ((nf = get_fields(buf, (char *)NULL, &fp, (int *)NULL, 0)) < 5)
  	    return(1);
  /*



From fedora-cvs-commits at redhat.com  Wed Aug  9 22:49:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 18:49:13 -0400
Subject: rpms/xorg-x11-drv-i810/devel intel-945gm-lfp-blacklist.patch, NONE,
	1.1 intel-driver-rename.patch, NONE, 1.1 .cvsignore, 1.14,
	1.15 sources, 1.14, 1.15 xorg-x11-drv-i810.spec, 1.30, 1.31
Message-ID: <200608092249.k79MnDY9011983@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Added Files:
	intel-945gm-lfp-blacklist.patch intel-driver-rename.patch 
Log Message:
auto-import xorg-x11-drv-i810-1.6.4-1.fc6 on branch devel from xorg-x11-drv-i810-1.6.4-1.fc6.src.rpm

intel-945gm-lfp-blacklist.patch:
 i830_driver.c |   12 ++++++++++++
 1 files changed, 12 insertions(+)

--- NEW FILE intel-945gm-lfp-blacklist.patch ---
--- xf86-video-intel/src/i830_driver.c.lfp-blacklist	2006-08-08 11:14:35.000000000 -0400
+++ xf86-video-intel/src/i830_driver.c	2006-08-09 18:40:14.000000000 -0400
@@ -1684,6 +1684,18 @@
       has_lvds = FALSE;
    }
 
+   /* Blacklist machines with known broken BIOSes */
+   if ((pI830->PciInfo->chipType == PCI_CHIP_I945_GM) &&
+	   /* aopen mini-pc */
+	(((pI830->PciInfo->subsysVendor == 0xa0a0) &&
+	  (pI830->PciInfo->subsysCard == 0x0589)) ||
+	   /* mac mini */
+	 ((pI830->PciInfo->subsysVendor == 0x8086) &&
+	  (pI830->PciInfo->subsysCard == 0x7270))))
+   {
+       has_lvds = FALSE;
+   }
+
    if ((s = xf86GetOptValString(pI830->Options, OPTION_MONITOR_LAYOUT)) &&
       I830IsPrimary(pScrn)) {
       char *Mon1;

intel-driver-rename.patch:
 Makefile.am   |   10 +++++-----
 i810_driver.c |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE intel-driver-rename.patch ---
--- xf86-video-intel/src/i810_driver.c.driver-rename	2006-08-08 11:14:35.000000000 -0400
+++ xf86-video-intel/src/i810_driver.c	2006-08-09 10:04:49.000000000 -0400
@@ -112,7 +112,7 @@
 #endif /* I830_ONLY */
 
 
-_X_EXPORT DriverRec I810 = {
+_X_EXPORT DriverRec INTEL = {
    I810_VERSION,
    I810_DRIVER_NAME,
    I810Identify,
@@ -385,7 +385,7 @@
    {0, 0, 0, 0}
 };
 
-_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, 0 };
+_X_EXPORT XF86ModuleData intelModuleData = { &i810VersRec, i810Setup, 0 };
 
 static pointer
 i810Setup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -396,7 +396,7 @@
     */
    if (!setupDone) {
       setupDone = 1;
-      xf86AddDriver(&I810, module, 0);
+      xf86AddDriver(&INTEL, module, 0);
 
       /*
        * Tell the loader about symbols from other modules that this module
--- xf86-video-intel/src/Makefile.am.driver-rename	2006-08-08 11:14:35.000000000 -0400
+++ xf86-video-intel/src/Makefile.am	2006-08-09 10:03:40.000000000 -0400
@@ -26,11 +26,11 @@
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DI830_XV
 
-i810_drv_la_LTLIBRARIES = i810_drv.la
-i810_drv_la_LDFLAGS = -module -avoid-version
-i810_drv_ladir = @moduledir@/drivers
+intel_drv_la_LTLIBRARIES = intel_drv.la
+intel_drv_la_LDFLAGS = -module -avoid-version
+intel_drv_ladir = @moduledir@/drivers
 
-i810_drv_la_SOURCES = \
+intel_drv_la_SOURCES = \
          common.h \
          i810_accel.c \
          i810_common.h \
@@ -68,7 +68,7 @@
 	 i830_xf86Modes.h \
 	 i830_xf86Modes.c
 if DRI
-i810_drv_la_SOURCES += \
+intel_drv_la_SOURCES += \
          i810_dri.c \
          i810_dri.h \
          i830_dri.c \


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	8 Aug 2006 15:31:21 -0000	1.14
+++ .cvsignore	9 Aug 2006 22:49:11 -0000	1.15
@@ -1 +1,2 @@
 xf86-video-intel-1.6.0-git-modesetting-20060808.tar.bz2
+xf86-video-i810-1.6.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	8 Aug 2006 15:31:21 -0000	1.14
+++ sources	9 Aug 2006 22:49:11 -0000	1.15
@@ -1 +1,2 @@
 666c06eedbe560fce410ab2f198bae5d  xf86-video-intel-1.6.0-git-modesetting-20060808.tar.bz2
+56e24a79cccb1d3828de48cb9a7a61b6  xf86-video-i810-1.6.4.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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-x11-drv-i810.spec	8 Aug 2006 15:31:21 -0000	1.30
+++ xorg-x11-drv-i810.spec	9 Aug 2006 22:49:11 -0000	1.31
@@ -10,21 +10,22 @@
 
 %define gitdate 20060808
 
-# GIT SNAPSHOT.  EATS BABIES.
-Summary:   Xorg X11 i810 video driver
+Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
-Version:   1.6.0
-Release:   14.%{gitdate}modeset%{?dist}
+Version:   1.6.4
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:   xf86-video-intel-1.6.0-git-modesetting-%{gitdate}.tar.bz2
-Source1:   i810.xinf
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:   xf86-video-intel-1.6.0-git-modesetting-%{gitdate}.tar.bz2
+Source2:   i810.xinf
 
 Patch0: intel-prune-by-edid-pixclock.patch
+Patch1: intel-driver-rename.patch
+Patch2: intel-945gm-lfp-blacklist.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -51,31 +52,33 @@
 X.Org X11 i810 video driver XvMC development package.
 
 %prep
-#%setup -q -n %{tarball}-%{version}
-%setup -q -n xf86-video-intel
-%if 0
-%patch0 -p1 -b .edid-pixclock
-%endif
+%setup -q -c %{tarball}-%{version} -a0 -a1
+%patch0 -p0 -b .edid-pixclock
+%patch1 -p0 -b .driver-rename
+%patch2 -p0 -b .lfp-blacklist
 
 %build
-./autogen.sh --disable-static \
-           --libdir=%{_libdir} \
-           --mandir=%{_mandir} \
 %if %{with_dri}
-           --enable-dri
+DRI_OPT='--enable-dri'
 %else
-           --disable-dri
+DRI_OPT='--disable-dri'
 %endif
-
-make
+OPTS="--disable-static --libdir=%{_libdir} --mandir=%{_mandir} ${DRI_OPT}"
+cd xf86-video-i810-%{version} && ./configure ${OPTS} && make && cd .. || exit 1
+cd xf86-video-intel           && ./autogen.sh ${OPTS} && make && cd .. || exit 1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+cd xf86-video-intel           && make install DESTDIR=$RPM_BUILD_ROOT && cd .. \
+    || exit 1
+# cheesy manpage fixup
+mv ${RPM_BUILD_ROOT}/usr/share/man/man4/{i810,intel}.4
+cd xf86-video-i810-%{version} && make install DESTDIR=$RPM_BUILD_ROOT && cd .. \
+    || exit 1
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
@@ -89,6 +92,7 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/i810_drv.so
+%{driverdir}/intel_drv.so
 %{driverdir}/ch7xxx.so
 %{driverdir}/sil164.so
 %{_datadir}/hwdata/videoaliases/i810.xinf
@@ -96,7 +100,7 @@
 %{_libdir}/libI810XvMC.so.1
 %{_libdir}/libI810XvMC.so.1.0.0
 #%dir %{_mandir}/man4x
-%{_mandir}/man4/i810.4*
+%{_mandir}/man4/i*
 
 %files devel
 %defattr(-,root,root,-)
@@ -104,6 +108,13 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-1.fc6
+- Admit defeat, kinda.  Package both i810 stable and modesetting drivers.
+  The modesetting driver is installed as intel_drv.so instead of i810_drv.so,
+  and is selected with Driver "intel" in xorg.conf.  Individual devices will
+  whitelist over to "intel" until that branch gets merged into head.
+- Update the stable branch driver to 1.6.4 from upstream, adds i965 support.
+
 * Tue Aug  8 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-14.20060808modeset.fc6
 - Today's snapshot: I2C bus creation fix.
 



From fedora-cvs-commits at redhat.com  Wed Aug  9 22:51:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 18:51:08 -0400
Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.31,1.32
Message-ID: <200608092251.k79Mp85E012107@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-1.fc6
- Admit defeat, kinda.  Package both i810 stable and modesetting drivers.
  The modesetting driver is installed as intel_drv.so instead of i810_drv.so,
  and is selected with Driver "intel" in xorg.conf.  Individual devices will
  whitelist over to "intel" until that branch gets merged into head.
- Update the stable branch driver to 1.6.4 from upstream, adds i965 support.
- intel-945gm-lfp-blacklist.patch: Blacklist LFP detection on machines where
  the BIOS is known to lie.



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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xorg-x11-drv-i810.spec	9 Aug 2006 22:49:11 -0000	1.31
+++ xorg-x11-drv-i810.spec	9 Aug 2006 22:51:06 -0000	1.32
@@ -114,6 +114,8 @@
   and is selected with Driver "intel" in xorg.conf.  Individual devices will
   whitelist over to "intel" until that branch gets merged into head.
 - Update the stable branch driver to 1.6.4 from upstream, adds i965 support.
+- intel-945gm-lfp-blacklist.patch: Blacklist LFP detection on machines where
+  the BIOS is known to lie.
 
 * Tue Aug  8 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-14.20060808modeset.fc6
 - Today's snapshot: I2C bus creation fix.



From fedora-cvs-commits at redhat.com  Wed Aug  9 23:10:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 19:10:55 -0400
Subject: rpms/xorg-x11-drv-i810/devel intel-945gm-lfp-blacklist.patch, 1.1,
	1.2 xorg-x11-drv-i810.spec, 1.32, 1.33
Message-ID: <200608092310.k79NAt75012346@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	intel-945gm-lfp-blacklist.patch xorg-x11-drv-i810.spec 
Log Message:
* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-2.fc6
- intel-945gm-lfp-blacklist.patch: At anholt's suggestion, remove the other
  LFP special casing in favor of the blacklist.


intel-945gm-lfp-blacklist.patch:
 i830_driver.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

Index: intel-945gm-lfp-blacklist.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/intel-945gm-lfp-blacklist.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-945gm-lfp-blacklist.patch	9 Aug 2006 22:49:11 -0000	1.1
+++ intel-945gm-lfp-blacklist.patch	9 Aug 2006 23:10:50 -0000	1.2
@@ -1,9 +1,17 @@
 --- xf86-video-intel/src/i830_driver.c.lfp-blacklist	2006-08-08 11:14:35.000000000 -0400
-+++ xf86-video-intel/src/i830_driver.c	2006-08-09 18:40:14.000000000 -0400
-@@ -1684,6 +1684,18 @@
++++ xf86-video-intel/src/i830_driver.c	2006-08-09 19:03:41.000000000 -0400
+@@ -1672,16 +1672,16 @@
+    if (!i830GetLVDSInfoFromBIOS(pScrn))
        has_lvds = FALSE;
-    }
  
+-   /* If the panel sequencing, status, and control registers are all zero,
+-    * assume there's no panel attached.  This is the case on the Mac mini,
+-    * which is an i945GM but has no LVDS.  If we tried to power something on
+-    * with zeroed panel sequencing registers, it probably wouldn't be a good
+-    * thing anyway.
+-    */
+-   if (INREG(PP_STATUS) == 0 && INREG(PP_CONTROL) == 0 &&
+-       INREG(LVDSPP_ON) == 0 && INREG(LVDSPP_OFF) == 0)
 +   /* Blacklist machines with known broken BIOSes */
 +   if ((pI830->PciInfo->chipType == PCI_CHIP_I945_GM) &&
 +	   /* aopen mini-pc */
@@ -12,10 +20,9 @@
 +	   /* mac mini */
 +	 ((pI830->PciInfo->subsysVendor == 0x8086) &&
 +	  (pI830->PciInfo->subsysCard == 0x7270))))
-+   {
+    {
+-      has_lvds = FALSE;
 +       has_lvds = FALSE;
-+   }
-+
+    }
+ 
     if ((s = xf86GetOptValString(pI830->Options, OPTION_MONITOR_LAYOUT)) &&
-       I830IsPrimary(pScrn)) {
-       char *Mon1;


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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-i810.spec	9 Aug 2006 22:51:06 -0000	1.32
+++ xorg-x11-drv-i810.spec	9 Aug 2006 23:10:50 -0000	1.33
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   1.6.4
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -108,6 +108,10 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-2.fc6
+- intel-945gm-lfp-blacklist.patch: At anholt's suggestion, remove the other
+  LFP special casing in favor of the blacklist.
+
 * Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-1.fc6
 - Admit defeat, kinda.  Package both i810 stable and modesetting drivers.
   The modesetting driver is installed as intel_drv.so instead of i810_drv.so,



From fedora-cvs-commits at redhat.com  Wed Aug  9 23:28:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 19:28:05 -0400
Subject: rpms/xorg-x11-drv-i810/devel intel-driver-rename.patch, 1.1,
	1.2 xorg-x11-drv-i810.spec, 1.33, 1.34
Message-ID: <200608092328.k79NS5Pp009601@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	intel-driver-rename.patch xorg-x11-drv-i810.spec 
Log Message:
* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-3.fc6
- intel-driver-rename.patch: Fix the driver name in more places so it'll,
  you know, load.


intel-driver-rename.patch:
 Makefile.am   |   10 +++++-----
 i810.h        |    4 ++--
 i810_driver.c |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

Index: intel-driver-rename.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/intel-driver-rename.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-driver-rename.patch	9 Aug 2006 22:49:11 -0000	1.1
+++ intel-driver-rename.patch	9 Aug 2006 23:28:00 -0000	1.2
@@ -1,5 +1,5 @@
 --- xf86-video-intel/src/i810_driver.c.driver-rename	2006-08-08 11:14:35.000000000 -0400
-+++ xf86-video-intel/src/i810_driver.c	2006-08-09 10:04:49.000000000 -0400
++++ xf86-video-intel/src/i810_driver.c	2006-08-09 19:05:14.000000000 -0400
 @@ -112,7 +112,7 @@
  #endif /* I830_ONLY */
  
@@ -28,7 +28,7 @@
        /*
         * Tell the loader about symbols from other modules that this module
 --- xf86-video-intel/src/Makefile.am.driver-rename	2006-08-08 11:14:35.000000000 -0400
-+++ xf86-video-intel/src/Makefile.am	2006-08-09 10:03:40.000000000 -0400
++++ xf86-video-intel/src/Makefile.am	2006-08-09 19:05:14.000000000 -0400
 @@ -26,11 +26,11 @@
  # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
  AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DI830_XV
@@ -54,3 +54,16 @@
           i810_dri.c \
           i810_dri.h \
           i830_dri.c \
+--- xf86-video-intel/src/i810.h.driver-rename	2006-08-09 19:20:46.000000000 -0400
++++ xf86-video-intel/src/i810.h	2006-08-09 19:21:02.000000000 -0400
+@@ -62,8 +62,8 @@
+ #include "common.h"
+ 
+ #define I810_VERSION 4000
+-#define I810_NAME "I810"
+-#define I810_DRIVER_NAME "i810"
++#define I810_NAME "INTEL"
++#define I810_DRIVER_NAME "intel"
+ #define I810_MAJOR_VERSION 1
+ #define I810_MINOR_VERSION 6
+ #define I810_PATCHLEVEL 0


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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-drv-i810.spec	9 Aug 2006 23:10:50 -0000	1.33
+++ xorg-x11-drv-i810.spec	9 Aug 2006 23:28:01 -0000	1.34
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   1.6.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -108,6 +108,10 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-3.fc6
+- intel-driver-rename.patch: Fix the driver name in more places so it'll,
+  you know, load.
+
 * Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-2.fc6
 - intel-945gm-lfp-blacklist.patch: At anholt's suggestion, remove the other
   LFP special casing in favor of the blacklist.



From fedora-cvs-commits at redhat.com  Wed Aug  9 23:34:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 19:34:33 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-builderstring.patch, NONE,
	1.1 xorg-x11-server-1.1.1-defaultdepth-24.patch, NONE,
	1.1 xorg-x11-server-1.1.1-edid-quirks-list.patch, NONE,
	1.1 xorg-x11-server.spec, 1.144, 1.145
Message-ID: <200608092334.k79NYXhd011266@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-builderstring.patch 
	xorg-x11-server-1.1.1-defaultdepth-24.patch 
	xorg-x11-server-1.1.1-edid-quirks-list.patch 
Log Message:
* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-19.fc6
- xorg-x11-server-1.1.1-builderstring.patch: Enable the builder info
  string at configure time;
- ... and use it to print the package name and version.
- xorg-x11-server-1.1.1-defaultdepth-24.patch: Set default depth to 24.
- xorg-x11-server-1.1.1-edid-quirks-list.patch: Add EDID quirks list as
  an experiment; needs a better solution though. 


xorg-x11-server-1.1.1-builderstring.patch:
 configure.ac            |    5 +++++
 include/dix-config.h.in |    3 +++
 2 files changed, 8 insertions(+)

--- NEW FILE xorg-x11-server-1.1.1-builderstring.patch ---
--- xorg-server-1.1.1/include/dix-config.h.in.builderstring	2006-07-05 14:38:48.000000000 -0400
+++ xorg-server-1.1.1/include/dix-config.h.in	2006-08-09 16:59:05.000000000 -0400
@@ -15,6 +15,9 @@
 /* Operating System Vendor */
 #undef OSVENDOR
 
+/* Builder string */
+#undef BUILDERSTRING
+
 /* Default font path */
 #undef COMPILEDDEFAULTFONTPATH
 
--- xorg-server-1.1.1/configure.ac.builderstring	2006-08-09 14:04:19.000000000 -0400
+++ xorg-server-1.1.1/configure.ac	2006-08-09 16:58:25.000000000 -0400
@@ -358,6 +358,9 @@
 AC_ARG_WITH(os-vendor,       AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name of OS vendor]),
 				[ OSVENDOR="$withval" ],
 				[ OSVENDOR="" ])
+AC_ARG_WITH(builderstring,   AS_HELP_STRING([--with-builderstring=BUILDERSTRING], [Additional builder string]),
+				[ BUILDERSTRING="$withval" ]
+				[ ])
 AC_ARG_WITH(mesa-source,     AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source tree]),
                                 [ MESA_SOURCE="$withval" ],
                                 [ MESA_SOURCE="" ])
@@ -817,6 +820,8 @@
 AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])
 AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name])
 AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor])
+AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string])
+
 AC_SUBST([VENDOR_STRING])
 AC_SUBST([VENDOR_STRING_SHORT])
 AC_SUBST([VENDOR_RELEASE])

xorg-x11-server-1.1.1-defaultdepth-24.patch:
 xf86Helper.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-defaultdepth-24.patch ---
--- xorg-server-1.1.1/hw/xfree86/common/xf86Helper.c.defaultdepth	2006-07-05 14:31:40.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/common/xf86Helper.c	2006-08-09 14:06:03.000000000 -0400
@@ -445,11 +445,11 @@
 #define DO_PIX24FOR32(f) ((f & Support32bppFb) && (f & SupportConvert24to32))
 
 #ifndef GLOBAL_DEFAULT_DEPTH
-#define GLOBAL_DEFAULT_DEPTH 16
+#define GLOBAL_DEFAULT_DEPTH 24
 #endif
 
 #ifndef GLOBAL_DEFAULT_FBBPP
-#define GLOBAL_DEFAULT_FBBPP 16
+#define GLOBAL_DEFAULT_FBBPP 32
 #endif
 
 _X_EXPORT Bool

xorg-x11-server-1.1.1-edid-quirks-list.patch:
 interpret_edid.c |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.1-edid-quirks-list.patch ---
--- xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c.edid-quirks	2006-07-05 14:31:40.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c	2006-08-09 18:25:19.000000000 -0400
@@ -32,6 +32,24 @@
 static void get_detailed_timing_section(Uchar*, struct 	detailed_timings *);
 static Bool validate_version(int scrnIndex, struct edid_version *);
 
+/* XXX i'm so ashamed of myself */
+static void
+handle_edid_quirks(xf86MonPtr m)
+{
+    int i;
+
+    for (i = 0; i < 4; i++) {
+	if (m->det_mon[i].type == DS_NAME) {
+	    if (strstr(m->det_mon[i].section.name, "DELL 2000FP")) {
+		ErrorF("Dell 2000FP Fixup: Max pixclock = 165MHz\n");
+		for (i = 0; i < 4; i++)
+		    if (m->det_mon[i].type == DS_RANGES)
+			m->det_mon[i].section.ranges.max_clock = 165;
+		return;
+	    }
+	}
+    }
+}
 
 xf86MonPtr
 xf86InterpretEDID(int scrnIndex, Uchar *block)
@@ -54,7 +72,9 @@
 			   &m->ver);
     get_dt_md_section(SECTION(DET_TIMING_SECTION,block),&m->ver, m->det_mon);
     m->no_sections = (int)*(char *)SECTION(NO_EDID,block);
-    
+
+    handle_edid_quirks(m);
+
     return (m);
 
  error:


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- xorg-x11-server.spec	8 Aug 2006 16:33:11 -0000	1.144
+++ xorg-x11-server.spec	9 Aug 2006 23:34:29 -0000	1.145
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   18%{?dist}
+Release:   19%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -23,6 +23,7 @@
 Patch3:    xserver-1.0.0-parser-add-missing-headers-to-sdk.patch
 Patch4:    xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch
 Patch5:    xorg-x11-server-libxf86config-dont-write-empty-sections.patch
+Patch6:    xorg-x11-server-1.1.1-builderstring.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -58,6 +59,8 @@
 Patch3007:  xorg-x11-server-1.1.1-edid-root-window-properties.patch
 Patch3008:  xorg-x11-server-1.1.1-sanedefaultmode.patch
 Patch3009:  xorg-x11-server-1.1.1-module-list.patch
+Patch3010:  xorg-x11-server-1.1.1-edid-quirks-list.patch
+Patch3011:  xorg-x11-server-1.1.1-defaultdepth-24.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -322,6 +325,7 @@
 %patch0 -p0 -b .init-origins-fix
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
 %patch5 -p0 -b .libxf86config-dont-write-empty-sections
+%patch6 -p1 -b .builderstring
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -352,6 +356,8 @@
 %patch3007 -p1 -b .edid-on-root-window
 %patch3008 -p1 -b .sanedefaultmode
 %patch3009 -p1 -b .module-list
+%patch3010 -p1 -b .edid-quirks
+%patch3011 -p1 -b .defaultdepth
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -373,6 +379,7 @@
 	--with-module-dir=%{moduledir} \
 	--with-os-name="Fedora Core 5" \
 	--with-os-vendor="Red Hat, Inc." \
+	--with-builderstring="Build ID: %{name} %{version}-%{release}" \
 	--with-xkb-output=%{_localstatedir}/lib/xkb \
 	--with-rgb-path=%{_datadir}/X11/rgb \
 	--disable-xorgcfg \
@@ -680,6 +687,14 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-19.fc6
+- xorg-x11-server-1.1.1-builderstring.patch: Enable the builder info
+  string at configure time;
+- ... and use it to print the package name and version.
+- xorg-x11-server-1.1.1-defaultdepth-24.patch: Set default depth to 24.
+- xorg-x11-server-1.1.1-edid-quirks-list.patch: Add EDID quirks list as
+  an experiment; needs a better solution though. 
+
 * Tue Aug  8 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-18.fc6
 - Update offscreen-pixmaps patch to migrate pixmaps when the compiz
   selection is taken.



From fedora-cvs-commits at redhat.com  Wed Aug  9 23:40:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 19:40:11 -0400
Subject: rpms/kernel/devel linux-2.6-crash-driver.patch, 1.3,
	1.4 linux-2.6-filesystem-caching-for-afs-and-nfs.patch, 1.2,
	1.3 linux-2.6-modsign-core.patch, 1.4,
	1.5 linux-2.6-nfs-superblock-sharing.patch, 1.2,
	1.3 linux-2.6-s390-kprobes.patch, 1.2, 1.3 linux-2.6-tux.patch,
	1.23, 1.24 linux-2.6-x86-64-edac-support.patch, 1.1, 1.2
Message-ID: <200608092340.k79NeBRj012766@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-crash-driver.patch 
	linux-2.6-filesystem-caching-for-afs-and-nfs.patch 
	linux-2.6-modsign-core.patch 
	linux-2.6-nfs-superblock-sharing.patch 
	linux-2.6-s390-kprobes.patch linux-2.6-tux.patch 
	linux-2.6-x86-64-edac-support.patch 
Log Message:
nothing should #include <linux/config.h> any more

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

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crash-driver.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-crash-driver.patch	2 Jul 2006 03:23:40 -0000	1.3
+++ linux-2.6-crash-driver.patch	9 Aug 2006 23:40:06 -0000	1.4
@@ -45,7 +45,7 @@
 diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/crash.c linux-1060/drivers/char/crash.c
 --- linux-1050/drivers/char/crash.c
 +++ linux-1060/drivers/char/crash.c
-@@ -0,0 +1,129 @@
+@@ -0,0 +1,128 @@
 +/*
 + *  linux/drivers/char/crash.c
 + *
@@ -72,7 +72,6 @@
 + *****************************************************************************/
 +
 +#include <linux/module.h>
-+#include <linux/config.h>
 +#include <linux/types.h>
 +#include <linux/miscdevice.h>
 +#include <linux/init.h>

linux-2.6-filesystem-caching-for-afs-and-nfs.patch:
 b/Documentation/filesystems/caching/backend-api.txt |  357 ++++++
 b/Documentation/filesystems/caching/fscache.txt     |  151 ++
 b/Documentation/filesystems/caching/netfs-api.txt   |  752 ++++++++++++++
 b/fs/Kconfig                                        |   15 
 b/fs/Makefile                                       |    1 
 b/fs/afs/cell.c                                     |  109 +-
 b/fs/afs/cell.h                                     |   16 
 b/fs/afs/cmservice.c                                |    2 
 b/fs/afs/dir.c                                      |    5 
 b/fs/afs/file.c                                     |  246 +++-
 b/fs/afs/fsclient.c                                 |    4 
 b/fs/afs/inode.c                                    |   45 
 b/fs/afs/internal.h                                 |   25 
 b/fs/afs/main.c                                     |   24 
 b/fs/afs/mntpt.c                                    |   12 
 b/fs/afs/proc.c                                     |    1 
 b/fs/afs/server.c                                   |    3 
 b/fs/afs/vlocation.c                                |  179 ++-
 b/fs/afs/vnode.c                                    |  248 +++-
 b/fs/afs/vnode.h                                    |   10 
 b/fs/afs/volume.c                                   |   78 -
 b/fs/afs/volume.h                                   |   28 
 b/fs/ext2/dir.c                                     |    6 
 b/fs/ext3/inode.c                                   |   10 
 b/fs/freevxfs/vxfs_subr.c                           |    2 
 b/fs/fscache/Makefile                               |   11 
 b/fs/fscache/cookie.c                               | 1045 ++++++++++++++++++++
 b/fs/fscache/fscache-int.h                          |   93 +
 b/fs/fscache/fsdef.c                                |  110 ++
 b/fs/fscache/main.c                                 |  105 ++
 b/fs/fscache/page.c                                 |  537 ++++++++++
 b/fs/reiserfs/inode.c                               |   10 
 b/fs/ufs/dir.c                                      |    6 
 b/include/linux/fscache-cache.h                     |  243 ++++
 b/include/linux/fscache.h                           |  495 +++++++++
 b/include/linux/page-flags.h                        |   15 
 b/include/linux/pagemap.h                           |   11 
 b/mm/filemap.c                                      |   17 
 b/mm/migrate.c                                      |    4 
 b/mm/page_alloc.c                                   |    2 
 b/mm/readahead.c                                    |   25 
 fs/Kconfig                                          |    7 
 fs/afs/cache.h                                      |   27 
 fs/afs/dir.c                                        |   10 
 44 files changed, 4659 insertions(+), 443 deletions(-)

Index: linux-2.6-filesystem-caching-for-afs-and-nfs.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-filesystem-caching-for-afs-and-nfs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-filesystem-caching-for-afs-and-nfs.patch	28 Jul 2006 21:41:06 -0000	1.2
+++ linux-2.6-filesystem-caching-for-afs-and-nfs.patch	9 Aug 2006 23:40:06 -0000	1.3
@@ -4063,7 +4063,7 @@
 index 0000000..b9697f9
 --- /dev/null
 +++ b/include/linux/fscache.h
-@@ -0,0 +1,496 @@
+@@ -0,0 +1,495 @@
 +/* fscache.h: general filesystem caching interface
 + *
 + * Copyright (C) 2004-5 Red Hat, Inc. All Rights Reserved.
@@ -4084,7 +4084,6 @@
 +#ifndef _LINUX_FSCACHE_H
 +#define _LINUX_FSCACHE_H
 +
-+#include <linux/config.h>
 +#include <linux/fs.h>
 +#include <linux/list.h>
 +#include <linux/pagemap.h>

linux-2.6-modsign-core.patch:
 linux-2.6.12/kernel/module-verify.c  |    2 
 linux-2.6.17.noarch/kernel/Makefile  |    3 
 linux-900/include/linux/module.h     |    3 
 linux-900/init/Kconfig               |   16 +
 linux-900/kernel/module-verify-sig.c |  441 +++++++++++++++++++++++++++++++++++
 linux-900/kernel/module-verify.c     |  339 ++++++++++++++++++++++++++
 linux-900/kernel/module-verify.h     |   37 ++
 linux-900/kernel/module.c            |   19 +
 8 files changed, 855 insertions(+), 5 deletions(-)

Index: linux-2.6-modsign-core.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-modsign-core.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-modsign-core.patch	27 Jun 2006 00:39:13 -0000	1.4
+++ linux-2.6-modsign-core.patch	9 Aug 2006 23:40:07 -0000	1.5
@@ -110,7 +110,7 @@
 diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify.c linux-900/kernel/module-verify.c
 --- linux-811/kernel/module-verify.c
 +++ linux-900/kernel/module-verify.c
-@@ -0,0 +1,340 @@
+@@ -0,0 +1,339 @@
 +/* module-verify.c: module verifier
 + *
 + * Written by David Howells (dhowells at redhat.com)
@@ -121,7 +121,6 @@
 + * 2 of the License, or (at your option) any later version.
 + */
 +
-+#include <linux/config.h>
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/slab.h>
@@ -495,7 +494,7 @@
 diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify-sig.c linux-900/kernel/module-verify-sig.c
 --- linux-811/kernel/module-verify-sig.c
 +++ linux-900/kernel/module-verify-sig.c
-@@ -0,0 +1,442 @@
+@@ -0,0 +1,441 @@
 +/* module-verify-sig.c: module signature checker
 + *
 + * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
@@ -508,7 +507,6 @@
 + * 2 of the License, or (at your option) any later version.
 + */
 +
-+#include <linux/config.h>
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/slab.h>

linux-2.6-nfs-superblock-sharing.patch:
 b/fs/Kconfig                 |    7 
 b/fs/dcache.c                |  164 +++-
 b/fs/nfs/Makefile            |    6 
 b/fs/nfs/callback.c          |   15 
 b/fs/nfs/callback.h          |    7 
 b/fs/nfs/callback_proc.c     |    4 
 b/fs/nfs/client.c            |  311 ++++++++
 b/fs/nfs/delegation.c        |   24 
 b/fs/nfs/delegation.h        |   10 
 b/fs/nfs/dir.c               |    2 
 b/fs/nfs/file.c              |    2 
 b/fs/nfs/fscache.c           |  345 +++++++++
 b/fs/nfs/fscache.h           |  466 ++++++++++++
 b/fs/nfs/getroot.c           |  305 ++++++++
 b/fs/nfs/idmap.c             |   14 
 b/fs/nfs/inode.c             |    4 
 b/fs/nfs/internal.h          |   12 
 b/fs/nfs/namespace.c         |    3 
 b/fs/nfs/nfs3proc.c          |    2 
 b/fs/nfs/nfs4_fs.h           |   30 
 b/fs/nfs/nfs4namespace.c     |    8 
 b/fs/nfs/nfs4proc.c          |   32 
 b/fs/nfs/nfs4renewd.c        |    8 
 b/fs/nfs/nfs4state.c         |   50 -
 b/fs/nfs/nfs4xdr.c           |   14 
 b/fs/nfs/pagelist.c          |    3 
 b/fs/nfs/proc.c              |    2 
 b/fs/nfs/read.c              |    2 
 b/fs/nfs/super.c             |   40 -
 b/fs/nfs/sysctl.c            |   43 +
 b/fs/nfs/write.c             |    2 
 b/include/linux/dcache.h     |    1 
 b/include/linux/nfs4_mount.h |    1 
 b/include/linux/nfs_fs.h     |    1 
 b/include/linux/nfs_fs_sb.h  |    2 
 b/include/linux/nfs_idmap.h  |   14 
 b/include/linux/nfs_mount.h  |    1 
 b/include/linux/nfs_xdr.h    |    1 
 fs/nfs/Makefile              |    3 
 fs/nfs/callback.c            |   16 
 fs/nfs/callback_proc.c       |    9 
 fs/nfs/client.c              | 1152 ++++++++++++++++++++++++++++++
 fs/nfs/delegation.c          |   21 
 fs/nfs/dir.c                 |   16 
 fs/nfs/file.c                |   33 
 fs/nfs/getroot.c             |    5 
 fs/nfs/idmap.c               |   27 
 fs/nfs/inode.c               |   31 
 fs/nfs/internal.h            |  134 ++-
 fs/nfs/namespace.c           |   31 
 fs/nfs/nfs3proc.c            |    8 
 fs/nfs/nfs4_fs.h             |   58 -
 fs/nfs/nfs4namespace.c       |  110 ++
 fs/nfs/nfs4proc.c            |  149 +--
 fs/nfs/nfs4renewd.c          |   15 
 fs/nfs/nfs4state.c           |  156 ----
 fs/nfs/nfs4xdr.c             |   28 
 fs/nfs/proc.c                |    4 
 fs/nfs/read.c                |   30 
 fs/nfs/super.c               | 1630 +++++++++++++++----------------------------
 fs/nfs/write.c               |   11 
 include/linux/nfs_fs.h       |    7 
 include/linux/nfs_fs_sb.h    |   99 ++
 include/linux/nfs_idmap.h    |    2 
 include/linux/nfs_xdr.h      |    9 
 65 files changed, 4083 insertions(+), 1669 deletions(-)

Index: linux-2.6-nfs-superblock-sharing.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-nfs-superblock-sharing.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-nfs-superblock-sharing.patch	28 Jul 2006 21:41:06 -0000	1.2
+++ linux-2.6-nfs-superblock-sharing.patch	9 Aug 2006 23:40:07 -0000	1.3
@@ -2251,7 +2251,7 @@
 index 0000000..cb5e924
 --- /dev/null
 +++ b/fs/nfs/client.c
-@@ -0,0 +1,312 @@
+@@ -0,0 +1,311 @@
 +/* client.c: NFS client sharing and management code
 + *
 + * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
@@ -2264,7 +2264,6 @@
 + */
 +
 +
-+#include <linux/config.h>
 +#include <linux/module.h>
 +#include <linux/init.h>
 +
@@ -5517,7 +5516,7 @@
 index 0000000..977e590
 --- /dev/null
 +++ b/fs/nfs/getroot.c
-@@ -0,0 +1,306 @@
+@@ -0,0 +1,305 @@
 +/* getroot.c: get the root dentry for an NFS mount
 + *
 + * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
@@ -5529,7 +5528,6 @@
 + * 2 of the License, or (at your option) any later version.
 + */
 +
-+#include <linux/config.h>
 +#include <linux/module.h>
 +#include <linux/init.h>
 +
@@ -8629,7 +8627,7 @@
 index 0000000..50d223a
 --- /dev/null
 +++ b/fs/nfs/fscache.c
-@@ -0,0 +1,346 @@
+@@ -0,0 +1,345 @@
 +/* fscache.c: NFS filesystem cache interface
 + *
 + * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
@@ -8642,7 +8640,6 @@
 + */
 +
 +
-+#include <linux/config.h>
 +#include <linux/init.h>
 +#include <linux/kernel.h>
 +#include <linux/mm.h>

linux-2.6-s390-kprobes.patch:
 linux-2.6.17.noarch/include/asm-s390/kprobes.h             |    1 
 linux-2.6.18-rc1.s390-kprob/arch/s390/Kconfig              |   14 
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/Makefile      |    1 
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/entry.S       |   12 
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/entry64.S     |   12 
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/kprobes.c     |  682 +++++++++++++
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/traps.c       |   41 
 linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/vmlinux.lds.S |    1 
 linux-2.6.18-rc1.s390-kprob/arch/s390/mm/fault.c           |   40 
 linux-2.6.18-rc1.s390-kprob/include/asm-s390/kdebug.h      |   59 +
 linux-2.6.18-rc1.s390-kprob/include/asm-s390/kprobes.h     |  111 ++
 11 files changed, 968 insertions(+), 6 deletions(-)

Index: linux-2.6-s390-kprobes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-s390-kprobes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-s390-kprobes.patch	1 Aug 2006 23:44:59 -0000	1.2
+++ linux-2.6-s390-kprobes.patch	9 Aug 2006 23:40:07 -0000	1.3
@@ -88,7 +88,7 @@
 diff -Naur linux-2.6.18-rc1/arch/s390/kernel/kprobes.c linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/kprobes.c
 --- linux-2.6.18-rc1/arch/s390/kernel/kprobes.c	1969-12-31 16:00:00.000000000 -0800
 +++ linux-2.6.18-rc1.s390-kprob/arch/s390/kernel/kprobes.c	2006-07-11 15:16:24.000000000 -0700
-@@ -0,0 +1,683 @@
+@@ -0,0 +1,682 @@
 +/*
 + *  Kernel Probes (KProbes)
 + *
@@ -111,7 +111,6 @@
 + * s390 port, used ppc64 as template. Mike Grundy <grundym at us.ibm.com>
 + */
 +
-+#include <linux/config.h>
 +#include <linux/kprobes.h>
 +#include <linux/ptrace.h>
 +#include <linux/preempt.h>

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

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linux-2.6-tux.patch	6 Jul 2006 01:11:56 -0000	1.23
+++ linux-2.6-tux.patch	9 Aug 2006 23:40:07 -0000	1.24
@@ -772,7 +772,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-tux.q/include/net/tux.h
-@@ -0,0 +1,804 @@
+@@ -0,0 +1,803 @@
 +#ifndef _NET_TUX_H
 +#define _NET_TUX_H
 +
@@ -794,7 +794,6 @@
 +#include <linux/mman.h>
 +#include <linux/swap.h>
 +#include <linux/ctype.h>
-+#include <linux/config.h>
 +#include <linux/module.h>
 +#include <linux/kernel.h>
 +#include <linux/unistd.h>

linux-2.6-x86-64-edac-support.patch:
 MAINTAINERS            |    6 
 drivers/edac/Kconfig   |    7 
 drivers/edac/Makefile  |    1 
 drivers/edac/edac_mc.c |   28 
 drivers/edac/edac_mc.h |    1 
 drivers/edac/k8_edac.c | 1881 +++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 1924 insertions(+)

Index: linux-2.6-x86-64-edac-support.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86-64-edac-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-x86-64-edac-support.patch	9 Aug 2006 21:45:01 -0000	1.1
+++ linux-2.6-x86-64-edac-support.patch	9 Aug 2006 23:40:07 -0000	1.2
@@ -53,7 +53,7 @@
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.17.noarch/drivers/edac/k8_edac.c	2006-07-31 09:08:17.000000000 -0300
-@@ -0,0 +1,1882 @@
+@@ -0,0 +1,1881 @@
 +/*
 + * AMD K8 class Memory Controller kernel module
 + *
@@ -84,7 +84,6 @@
 + * refer to this document.
 + */
 +
-+#include <linux/config.h>
 +#include <linux/module.h>
 +#include <linux/init.h>
 +#include <linux/pci.h>



From fedora-cvs-commits at redhat.com  Wed Aug  9 23:46:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 19:46:00 -0400
Subject: rpms/kernel/devel linux-2.6-cell-mambo-drivers.patch,1.4,1.5
Message-ID: <200608092346.k79Nk0OB013974@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-cell-mambo-drivers.patch 
Log Message:
don't include version.h

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

Index: linux-2.6-cell-mambo-drivers.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-mambo-drivers.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-cell-mambo-drivers.patch	4 Jul 2006 23:17:00 -0000	1.4
+++ linux-2.6-cell-mambo-drivers.patch	9 Aug 2006 23:45:56 -0000	1.5
@@ -338,7 +338,7 @@
  obj-$(CONFIG_ZNET) += znet.o
 --- /dev/null
 +++ b/drivers/net/mambonet.c
-@@ -0,0 +1,392 @@
+@@ -0,0 +1,391 @@
 +/*
 + *  Bogus Network Driver for PowerPC Full System Simulator
 + *
@@ -398,7 +398,6 @@
 +#include <linux/if_arp.h>	/* For ARPHRD_ETHER */
 +#include <linux/workqueue.h>
 +#include <asm/prom.h>
-+#include <linux/version.h>
 +#include <asm/systemsim.h>
 +
 +#define MAMBO_BOGUS_NET_PROBE   119



From fedora-cvs-commits at redhat.com  Wed Aug  9 23:52:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 19:52:08 -0400
Subject: rpms/kernel/devel linux-2.6-build-deprecate-configh-include.patch,
	NONE, 1.1 kernel-2.6.spec, 1.2540, 1.2541
Message-ID: <200608092352.k79Nq7L0030202@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-build-deprecate-configh-include.patch 
Log Message:
add some build noise.



linux-2.6-build-deprecate-configh-include.patch:
 config.h |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-build-deprecate-configh-include.patch ---
--- linux-2.6.17.noarch/include/linux/config.h~	2006-08-09 19:46:50.000000000 -0400
+++ linux-2.6.17.noarch/include/linux/config.h	2006-08-09 19:47:16.000000000 -0400
@@ -3,6 +3,7 @@
 /* This file is no longer in use and kept only for backward compatibility.
  * autoconf.h is now included via -imacros on the commandline
  */
+#warning Including config.h is deprecated.
 #include <linux/autoconf.h>
 #if !defined (__KERNEL__) && !defined(__KERNGLUE__)
 #error including kernel header in userspace; use the glibc headers instead!


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2540
retrieving revision 1.2541
diff -u -r1.2540 -r1.2541
--- kernel-2.6.spec	9 Aug 2006 21:52:38 -0000	1.2540
+++ kernel-2.6.spec	9 Aug 2006 23:52:04 -0000	1.2541
@@ -300,6 +300,7 @@
 #
 Patch800: linux-2.6-build-nonintconfig.patch
 Patch801: linux-2.6-build-userspace-headers-warning.patch
+Patch802: linux-2.6-build-deprecate-configh-include.patch
 
 # Exec-shield.
 Patch810: linux-2.6-execshield.patch
@@ -774,6 +775,8 @@
 %patch800 -p1
 # Warn if someone tries to build userspace using kernel headers
 %patch801 -p1
+# Warn if someone #include's <linux/config.h>
+%patch802 -p1
 
 # Exec shield
 %patch810 -p1



From fedora-cvs-commits at redhat.com  Wed Aug  9 23:58:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 19:58:53 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2541,
	1.2542 linux-2.6-utrace.patch, 1.15, 1.16
Message-ID: <200608092358.k79Nwr7G032337@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
Fix utrace_regset nits breaking s390.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2541
retrieving revision 1.2542
diff -u -r1.2541 -r1.2542
--- kernel-2.6.spec	9 Aug 2006 23:52:04 -0000	1.2541
+++ kernel-2.6.spec	9 Aug 2006 23:58:50 -0000	1.2542
@@ -1707,6 +1707,9 @@
 %endif
 
 %changelog
+* Wed Aug  9 2006 Roland McGrath <roland at redhat.com>
+- Fix utrace_regset nits breaking s390.
+
 * Wed Aug  9 2006 Dave Jones <davej at redhat.com>
 - Another lockdep fix for networking.
 - Change some hotplug PCI options.

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  455 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  839 +++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/ia32_entry.S             |    2 
 arch/ia64/ia32/sys_ia32.c               |   23 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/ia64/kernel/signal.c               |    4 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  553 ++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  688 +++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |   14 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   74 +
 include/asm-ia64/tracehook.h            |   67 +
 include/asm-powerpc/tracehook.h         |  303 ++++++
 include/asm-s390/tracehook.h            |  105 ++
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  106 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   86 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  645 +++++++++++++
 include/linux/utrace.h                  |  481 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  259 +----
 kernel/fork.c                           |   62 -
 kernel/ptrace.c                         | 1563 +++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1526 +++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |   54 -
 security/selinux/include/objsec.h       |    1 
 93 files changed, 8301 insertions(+), 3325 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6-utrace.patch	8 Aug 2006 20:22:48 -0000	1.15
+++ linux-2.6-utrace.patch	9 Aug 2006 23:58:50 -0000	1.16
@@ -78,7 +78,7 @@
  include/linux/init_task.h               |    3 
  include/linux/ptrace.h                  |   86 +-
  include/linux/sched.h                   |   25 
- include/linux/tracehook.h               |  641 +++++++++++++
+ include/linux/tracehook.h               |  645 +++++++++++++
  include/linux/utrace.h                  |  481 ++++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
@@ -91,7 +91,7 @@
  kernel/utrace.c                         | 1526 ++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |   54 +
  security/selinux/include/objsec.h       |    1 
- 93 files changed, 8298 insertions(+), 3326 deletions(-)
+ 93 files changed, 8302 insertions(+), 3326 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -1604,7 +1604,7 @@
  	.sibling	= LIST_HEAD_INIT(tsk.sibling),			\
 --- linux-2.6/include/linux/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/tracehook.h
-@@ -0,0 +1,641 @@
+@@ -0,0 +1,645 @@
 +/*
 + * Tracing hooks
 + *
@@ -1796,8 +1796,10 @@
 +		      void **kbuf, void __user **ubuf,
 +		      const void *data, int start_pos, int end_pos)
 +{
++	if (*count == 0)
++		return 0;
 +	BUG_ON(*pos < start_pos);
-+	if (*count > 0 && (end_pos < 0 || *pos < end_pos)) {
++	if (end_pos < 0 || *pos < end_pos) {
 +		unsigned int copy = (end_pos < 0 ? *count
 +				     : min(*count, end_pos - *pos));
 +		data += *pos - start_pos;
@@ -1820,8 +1822,10 @@
 +		     const void **kbuf, const void __user **ubuf,
 +		     void *data, int start_pos, int end_pos)
 +{
++	if (*count == 0)
++		return 0;
 +	BUG_ON(*pos < start_pos);
-+	if (*count > 0 && (end_pos < 0 || *pos < end_pos)) {
++	if (end_pos < 0 || *pos < end_pos) {
 +		unsigned int copy = (end_pos < 0 ? *count
 +				     : min(*count, end_pos - *pos));
 +		data += *pos - start_pos;



From fedora-cvs-commits at redhat.com  Thu Aug 10 00:02:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 20:02:40 -0400
Subject: rpms/SysVinit/devel sysvinit-2.86-timeval.patch, NONE,
	1.1 SysVinit.spec, 1.48, 1.49
Message-ID: <200608100002.k7A02eIR001006@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv970

Modified Files:
	SysVinit.spec 
Added Files:
	sysvinit-2.86-timeval.patch 
Log Message:
fix utmp records on x86_64 (#176494)


sysvinit-2.86-timeval.patch:
 utmp.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE sysvinit-2.86-timeval.patch ---
--- sysvinit-2.86/src/utmp.c.timeval	1999-06-09 07:11:33.000000000 -0400
+++ sysvinit-2.86/src/utmp.c	2006-08-09 19:46:26.000000000 -0400
@@ -47,7 +47,8 @@
 	int fd;
 	struct utmp utmp;
 	struct utsname uname_buf;
-
+	struct timeval tv;
+	
 	/*
 	 *	Try to open the wtmp file. Note that we even try
 	 *	this if we have updwtmp() so we can see if the
@@ -76,7 +77,9 @@
 	 */
 	memset(&utmp, 0, sizeof(utmp));
 #if defined(__GLIBC__)
-	gettimeofday(&utmp.ut_tv, NULL);
+	gettimeofday(&tv, NULL);
+	utmp.ut_tv.tv_sec = tv.tv_sec;
+	utmp.ut_tv.tv_usec = tv.tv_usec;
 #else
 	time(&utmp.ut_time);
 #endif
@@ -113,6 +116,7 @@
 	struct utmp utmp;
 	struct utmp tmp;
 	struct utmp *utmptr;
+	struct timeval tv;
 
 	/*
 	 *	Can't do much if UTMP_FILE is not present.
@@ -144,7 +148,9 @@
 	utmp.ut_pid = pid;
 	strncpy(utmp.ut_id, id, sizeof(utmp.ut_id));
 #if defined(__GLIBC__)
-	gettimeofday(&utmp.ut_tv, NULL);
+	gettimeofday(&tv, NULL);
+	utmp.ut_tv.tv_sec = tv.tv_sec;
+	utmp.ut_tv.tv_usec = tv.tv_usec;
 #else
 	time(&utmp.ut_time);
 #endif


Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- SysVinit.spec	9 Aug 2006 19:11:52 -0000	1.48
+++ SysVinit.spec	10 Aug 2006 00:02:36 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 8
+Release: 9
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -22,6 +22,7 @@
 Patch15: sysvinit-2.86-ipv6.patch
 Patch16: sysvinit-2.86-quiet.patch
 Patch17: sysvinit-2.86-godot.patch
+Patch18: sysvinit-2.86-timeval.patch
 Patch20: sysvinit-selinux.patch
 Source1: change_console.c
 Source2: change_console.8
@@ -77,6 +78,8 @@
 %patch16 -p1 -b .quiet
 # Preserve 'waiting' across re-exec (#199305, #201146, #143289)
 %patch17 -p1 -b .godot
+# Don't overwrite ut_addr_v6 on 64-bit platforms (#176494)
+%patch18 -p1 -b .timeval
 # SELinux support for init - loading policy, etc.
 %patch20 -p1 -b .selinux
 
@@ -139,6 +142,7 @@
 * Wed Aug  9 2006 Bill Nottingham <notting at redhat.com> - 2.86-8
 - preserve 'WAITING' across re-exec (#143289, others)
 - actually apply quiet patch
+- don't write garbage to utmp on x86-64 (#176494)
 
 * Tue Aug  8 2006 Bill Nottingham <notting at redhat.com> - 2.86-7
 - be slightly less verbose when booted with 'quiet'



From fedora-cvs-commits at redhat.com  Thu Aug 10 00:50:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 20:50:13 -0400
Subject: rpms/logrotate/devel logrotate-selinux.patch, NONE,
	1.1 logrotate.spec, 1.49, 1.50
Message-ID: <200608100050.k7A0oDHw010670@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/logrotate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10637

Modified Files:
	logrotate.spec 
Added Files:
	logrotate-selinux.patch 
Log Message:
* Wed Aug 9 2006 Dan Walsh <dwalsh at redhat.com> 3.7.4-5
- Use selinux raw functions


logrotate-selinux.patch:
 logrotate.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE logrotate-selinux.patch ---
--- logrotate-3.7.4/logrotate.c~	2006-05-17 10:46:51.000000000 -0400
+++ logrotate-3.7.4/logrotate.c	2006-08-09 18:27:42.000000000 -0400
@@ -364,8 +364,8 @@
 #ifdef WITH_SELINUX
 	if (selinux_enabled) {
 	    security_context_t oldContext;
-	    if (fgetfilecon(fdcurr, &oldContext) >= 0) {
-		if (getfscreatecon(&prev_context) < 0) {
+	    if (fgetfilecon_raw(fdcurr, &oldContext) >= 0) {
+		if (getfscreatecon_raw(&prev_context) < 0) {
 		    message(MESS_ERROR,
 			    "error getting default context: %s\n",
 			    strerror(errno));
@@ -374,7 +374,7 @@
 			return 1;
 		    }
 		}
-		if (setfscreatecon(oldContext) < 0) {
+		if (setfscreatecon_raw(oldContext) < 0) {
 		    message(MESS_ERROR,
 			    "error setting file context %s to %s: %s\n",
 			    saveLog, oldContext, strerror(errno));
@@ -397,7 +397,7 @@
 	    createOutputFile(saveLog, O_WRONLY | O_CREAT | O_TRUNC, sb);
 #ifdef WITH_SELINUX
 	if (selinux_enabled) {
-	    setfscreatecon(prev_context);
+	    setfscreatecon_raw(prev_context);
 	    if (prev_context != NULL) {
 		freecon(prev_context);
 		prev_context = NULL;
@@ -753,8 +753,8 @@
 #ifdef WITH_SELINUX
 	if (selinux_enabled) {
 	    security_context_t oldContext = NULL;
-	    if (getfilecon(log->files[logNum], &oldContext) > 0) {
-		if (getfscreatecon(&prev_context) < 0) {
+	    if (getfilecon_raw(log->files[logNum], &oldContext) > 0) {
+		if (getfscreatecon_raw(&prev_context) < 0) {
 		    message(MESS_ERROR,
 			    "error getting default context: %s\n",
 			    strerror(errno));
@@ -763,7 +763,7 @@
 			return 1;
 		    }
 		}
-		if (setfscreatecon(oldContext) < 0) {
+		if (setfscreatecon_raw(oldContext) < 0) {
 		    message(MESS_ERROR,
 			    "error setting file context %s to %s: %s\n",
 			    log->files[logNum], oldContext,
@@ -951,7 +951,7 @@
 
 #ifdef WITH_SELINUX
     if (selinux_enabled) {
-	setfscreatecon(prev_context);
+	setfscreatecon_raw(prev_context);
 	if (prev_context != NULL) {
 	    freecon(prev_context);
 	    prev_context = NULL;


Index: logrotate.spec
===================================================================
RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- logrotate.spec	24 Jul 2006 12:18:42 -0000	1.49
+++ logrotate.spec	10 Aug 2006 00:50:09 -0000	1.50
@@ -1,15 +1,14 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-BuildRequires: libselinux-devel
-%endif
 Summary: Rotates, compresses, removes and mails system log files.
 Name: logrotate
 Version: 3.7.4
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: logrotate-%{PACKAGE_VERSION}.tar.gz
+Patch: logrotate-selinux.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}.root
+BuildRequires: libselinux-devel
 
 %description
 The logrotate utility is designed to simplify the administration of
@@ -24,12 +23,11 @@
 
 %prep
 %setup
+%patch -p1 -b .rhat
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" \
-%if %{WITH_SELINUX}
 	WITH_SELINUX=yes
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +54,9 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status
 
 %changelog
+* Wed Aug 9 2006 Dan Walsh <dwalsh at redhat.com> 3.7.4-5
+- Use selinux raw functions
+
 * Mon Jul 24 2006 Peter Vrabec <pvrabec at redhat.com> 3.7.4-4
 - make error message, about ignoring certain config files,
   a debug message instead (#196052)



From fedora-cvs-commits at redhat.com  Thu Aug 10 01:04:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 21:04:10 -0400
Subject: rpms/kernel/devel git-gregkh.patch, 1.2, 1.3 kernel-2.6.spec, 1.2542,
	1.2543 linux-2.6-compile-fixes.patch, 1.98,
	1.99 linux-2.6-ide-missing-bits.patch, 1.1,
	NONE linux-2.6-random-patches.patch, 1.19, NONE
Message-ID: <200608100104.k7A14AqD015057@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	git-gregkh.patch kernel-2.6.spec linux-2.6-compile-fixes.patch 
Removed Files:
	linux-2.6-ide-missing-bits.patch 
	linux-2.6-random-patches.patch 
Log Message:
buildfix, update & drop some bits

git-gregkh.patch:
 b/Makefile                                    |   23 +
 b/drivers/ide/pci/generic.c                   |   30 +
 b/drivers/media/dvb/bt8xx/dst.c               |   58 +--
 b/drivers/media/dvb/dvb-core/Makefile         |    6 
 b/drivers/media/radio/Kconfig                 |   12 
 b/drivers/media/radio/Makefile                |    1 
 b/drivers/media/radio/dsbr100.c               |  430 ++++++++++++++++++++++++++
 b/drivers/media/video/Kconfig                 |   12 
 b/drivers/media/video/Makefile                |    2 
 b/drivers/media/video/compat_ioctl32.c        |   32 +
 b/drivers/media/video/cx25840/cx25840-core.c  |    4 
 b/drivers/media/video/cx88/cx88-video.c       |    4 
 b/drivers/media/video/msp3400-kthreads.c      |    4 
 b/drivers/media/video/pwc/Kconfig             |    2 
 b/drivers/media/video/pwc/pwc-if.c            |    1 
 b/drivers/media/video/saa7134/saa7134-video.c |    2 
 b/drivers/media/video/tuner-types.c           |   14 
 b/drivers/media/video/v4l1-compat.c           |    4 
 b/drivers/media/video/v4l2-common.c           |    6 
 b/drivers/media/video/videodev.c              |    2 
 b/drivers/media/video/vivi.c                  |    4 
 b/drivers/net/myri10ge/myri10ge.c             |    2 
 b/drivers/net/tg3.c                           |   51 +--
 b/drivers/net/tg3.h                           |    8 
 b/drivers/s390/char/tape_class.c              |    2 
 b/drivers/s390/cio/device_fsm.c               |    1 
 b/drivers/s390/cio/device_ops.c               |    3 
 b/drivers/scsi/ata_piix.c                     |    5 
 b/drivers/scsi/libata-core.c                  |   34 --
 b/drivers/scsi/libata-scsi.c                  |   13 
 b/drivers/scsi/sata_sil24.c                   |    1 
 b/fs/jfs/inode.c                              |   16 
 b/fs/jfs/jfs_inode.h                          |    1 
 b/fs/jfs/super.c                              |  118 ++++++-
 b/include/linux/skbuff.h                      |    4 
 b/include/media/v4l2-dev.h                    |    2 
 b/net/core/dst.c                              |    3 
 b/net/core/pktgen.c                           |    4 
 b/net/core/rtnetlink.c                        |   15 
 b/net/core/skbuff.c                           |    4 
 b/net/core/wireless.c                         |   24 +
 b/net/ipv4/route.c                            |    2 
 b/net/ipv4/tcp_output.c                       |   12 
 b/net/ipx/af_ipx.c                            |   10 
 b/sound/oss/Kconfig                           |    6 
 b/sound/pci/Kconfig                           |   70 ++--
 b/usr/Makefile                                |    3 
 drivers/media/video/dsbr100.c                 |  430 --------------------------
 48 files changed, 864 insertions(+), 633 deletions(-)

Index: git-gregkh.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-gregkh.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git-gregkh.patch	9 Aug 2006 21:03:07 -0000	1.2
+++ git-gregkh.patch	10 Aug 2006 01:04:06 -0000	1.3
@@ -1,3 +1,16 @@
+commit 79860a9a79a17f1bed0713680a3995467405ba49
+Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
+Date:   Wed Aug 9 15:04:58 2006 +0100
+
+    [PATCH] PATCH: 2.6.18 oops on boot fix for IDE
+    
+    When the IDE fix for Jmicron went in one piece went walking somewhere
+    (send log shows my end somehow). Without this sometimes you get an oops
+    on boot.
+    
+    Signed-off-by: Alan Cox <alan at redhat.com>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
 commit a4657141091c2f975fa35ac1ad28fffdd756091e
 Merge: 54f58d6... 7c91767...
 Author: Greg Kroah-Hartman <gregkh at suse.de>
@@ -677,6 +690,7 @@
     Signed-off-by: Dave Kleikamp <shaggy at austin.ibm.com>
 
  b/Makefile                                    |   24 +
+ b/drivers/ide/pci/generic.c                   |   30 +
  b/drivers/media/dvb/bt8xx/dst.c               |   58 +--
  b/drivers/media/dvb/dvb-core/Makefile         |    6 
  b/drivers/media/radio/Kconfig                 |   12 
@@ -723,7 +737,7 @@
  b/sound/pci/Kconfig                           |   70 ++--
  b/usr/Makefile                                |    3 
  drivers/media/video/dsbr100.c                 |  430 --------------------------
- 47 files changed, 834 insertions(+), 634 deletions(-)
+ 48 files changed, 864 insertions(+), 634 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index c2f78a5..c53ed56 100644
@@ -777,6 +791,47 @@
  
  # The all: target is the default when no target is given on the
  # command line.
+diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
+index 2f962cf..78810ba 100644
+--- a/drivers/ide/pci/generic.c
++++ b/drivers/ide/pci/generic.c
+@@ -180,6 +180,36 @@ static ide_pci_device_t generic_chipsets
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.bootable	= OFF_BOARD,
++	},{	/* 15 */
++		.name		= "JMB361",
++		.init_hwif	= init_hwif_generic,
++		.channels	= 2,
++		.autodma	= AUTODMA,
++		.bootable	= OFF_BOARD,
++	},{	/* 16 */
++		.name		= "JMB363",
++		.init_hwif	= init_hwif_generic,
++		.channels	= 2,
++		.autodma	= AUTODMA,
++		.bootable	= OFF_BOARD,
++	},{	/* 17 */
++		.name		= "JMB365",
++		.init_hwif	= init_hwif_generic,
++		.channels	= 2,
++		.autodma	= AUTODMA,
++		.bootable	= OFF_BOARD,
++	},{	/* 18 */
++		.name		= "JMB366",
++		.init_hwif	= init_hwif_generic,
++		.channels	= 2,
++		.autodma	= AUTODMA,
++		.bootable	= OFF_BOARD,
++	},{	/* 19 */
++		.name		= "JMB368",
++		.init_hwif	= init_hwif_generic,
++		.channels	= 2,
++		.autodma	= AUTODMA,
++		.bootable	= OFF_BOARD,
+ 	}
+ };
+ 
 diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
 index d687a14..06ac899 100644
 --- a/drivers/media/dvb/bt8xx/dst.c


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2542
retrieving revision 1.2543
diff -u -r1.2542 -r1.2543
--- kernel-2.6.spec	9 Aug 2006 23:58:50 -0000	1.2542
+++ kernel-2.6.spec	10 Aug 2006 01:04:06 -0000	1.2543
@@ -404,7 +404,6 @@
 Patch1650: linux-2.6-serial-460800.patch
 Patch1660: linux-2.6-hotplug-cpu-workqueue.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
-Patch1680: linux-2.6-ide-missing-bits.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
@@ -448,10 +447,6 @@
 
 Patch10000: linux-2.6-compile-fixes.patch
 
-# Little obvious 1-2 liners that fix silly bugs.
-# Do not add anything non-trivial here.
-Patch10001: linux-2.6-random-patches.patch
-
 # Xen hypervisor patches
 
 # END OF PATCH DEFINITIONS
@@ -935,8 +930,6 @@
 %patch1660 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
-# Add some missing IDE fixes.
-%patch1680 -p1
 # Only print migration info on SMP
 %patch1710 -p1
 # setuid /proc/self/maps fix.
@@ -998,9 +991,6 @@
 #
 %patch10000 -p1
 
-# Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
-%patch10001 -p1
-
 # END OF PATCH APPLICATIONS
 
 cp %{SOURCE10} Documentation/
@@ -1716,7 +1706,6 @@
 - Daily update from GregKH's git tree.
 - Unbreak SMP locking in oprofile.
 - Fix hotplug CPU locking in workqueue creation.
-- Fix IDE oops on boot.
 - K8 EDAC support.
 - IPsec labelling enhancements for MLS
 - Netlabel: CIPSO labeled networking

linux-2.6-compile-fixes.patch:
 b/net/ipx/af_ipx.c                                |    2 +-
 linux-2.6.17.noarch/Makefile                      |    4 ----
 linux-2.6.17.noarch/arch/ia64/kernel/ia64_ksyms.c |    1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- linux-2.6-compile-fixes.patch	4 Aug 2006 20:48:12 -0000	1.98
+++ linux-2.6-compile-fixes.patch	10 Aug 2006 01:04:07 -0000	1.99
@@ -22,3 +22,29 @@
  
  #define __KERNEL_SYSCALLS__
  #include <asm/unistd.h>
+
+
+commit fff642570dc47ab76491fe81ee6599269c4eb13e
+Author: David S. Miller <davem at sunset.davemloft.net>
+Date:   Wed Aug 9 17:36:15 2006 -0700
+
+    [IPX]: Fix typo, ipxhdr() --> ipx_hdr()
+    
+    Noticed by Dave Jones.
+    
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
+index 4019642..bef3f61 100644
+--- a/net/ipx/af_ipx.c
++++ b/net/ipx/af_ipx.c
+@@ -1645,7 +1645,7 @@ static int ipx_rcv(struct sk_buff *skb, 
+ 	if (!pskb_may_pull(skb, sizeof(struct ipxhdr)))
+ 		goto drop;
+ 
+-	ipx_pktsize = ntohs(ipxhdr(skb)->ipx_pktsize);
++	ipx_pktsize = ntohs(ipx_hdr(skb)->ipx_pktsize);
+ 	
+ 	/* Too small or invalid header? */
+ 	if (ipx_pktsize < sizeof(struct ipxhdr) ||
+


--- linux-2.6-ide-missing-bits.patch DELETED ---


--- linux-2.6-random-patches.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 01:51:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 9 Aug 2006 21:51:16 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.51,1.52
Message-ID: <200608100151.k7A1pGq3014879@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10629

Modified Files:
	kexec-tools.spec 
Log Message:
misc spec cleanups and macro-ifications


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kexec-tools.spec	9 Aug 2006 17:45:32 -0000	1.51
+++ kexec-tools.spec	10 Aug 2006 01:51:08 -0000	1.52
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 42%{dist}
+Release: 43%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -76,15 +76,11 @@
 %patch602 -p1
 %patch603 -p1
 
-cp $RPM_SOURCE_DIR/kdump.init .
-cp $RPM_SOURCE_DIR/kdump.sysconfig .
-cp $RPM_SOURCE_DIR/kdump.conf .
-cp $RPM_SOURCE_DIR/mkdumprd .
 mkdir -p -m755 kcp
-cp $RPM_SOURCE_DIR/kcp.c kcp/kcp.c
-cp $RPM_SOURCE_DIR/Makefile.kcp kcp/Makefile
+cp %{SOURCE5} kcp/kcp.c
+cp %{SOURCE6} kcp/Makefile
 mkdir makedumpfile 
-tar -C makedumpfile -z -x -v -f $RPM_SOURCE_DIR/makedumpfile.tar.gz
+tar -C makedumpfile -z -x -v -f %{SOURCE7}
 
 %patch604 -p1
 %patch605 -p1
@@ -101,13 +97,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p -m755 $RPM_BUILD_ROOT/etc/sysconfig
-mkdir -p -m755 $RPM_BUILD_ROOT/var/crash
-install -m 644 kdump.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/kdump
-install -m 755 kdump.init $RPM_BUILD_ROOT/etc/rc.d/init.d/kdump
-install -m 755 mkdumprd $RPM_BUILD_ROOT/sbin/mkdumprd
-install -m 755 kdump.conf $RPM_BUILD_ROOT/etc/kdump.conf
+mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+mkdir -p -m755 $RPM_BUILD_ROOT%{_localstatedir}/crash
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/kdump
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
+install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/sbin/mkdumprd
+install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf
 %ifarch %{ix86} x86_64
 install -m 755 makedumpfile/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
 %endif
@@ -135,10 +131,10 @@
 %files
 %defattr(-,root,root,-)
 /sbin/*
-%config(noreplace,missingok) /etc/sysconfig/kdump
-%config(noreplace,missingok) /etc/kdump.conf
-%config /etc/rc.d/init.d/kdump
-%dir /var/crash
+%config(noreplace,missingok) %{_sysconfdir}/sysconfig/kdump
+%config(noreplace,missingok) %{_sysconfdir}/kdump.conf
+%config %{_sysconfdir}/rc.d/init.d/kdump
+%dir %{_localstatedir}/crash
 %ifarch %{ix86} x86_64
 %{_libdir}/kexec-tools/kexec_test
 %endif
@@ -147,6 +143,9 @@
 %doc TODO
 
 %changelog
+* Wed Aug 09 2006 Jarod Wilson <jwilson at redhat.com> - 1.101-43%{dist}
+- Misc spec cleanups and macro-ifications
+
 * Wed Aug 09 2006 Jarod Wilson <jwilson at redhat.com> - 1.101-42%{dist}
 - Add %dir /var/crash, so default kdump setup works
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 07:07:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 03:07:16 -0400
Subject: rpms/glibc/devel .cvsignore, 1.163, 1.164 glibc-fedora.patch, 1.167,
	1.168 glibc.spec, 1.254, 1.255 sources, 1.187, 1.188
Message-ID: <200608100707.k7A77GDB018187@cvs.devel.redhat.com>

Author: jakub

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- .cvsignore	7 Aug 2006 19:49:00 -0000	1.163
+++ .cvsignore	10 Aug 2006 07:07:13 -0000	1.164
@@ -1,2 +1,2 @@
-glibc-20060807T1859.tar.bz2
-glibc-fedora-20060807T1859.tar.bz2
+glibc-20060810T0627.tar.bz2
+glibc-fedora-20060810T0627.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 57 files changed, 1394 insertions(+), 631 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- glibc-fedora.patch	7 Aug 2006 19:49:00 -0000	1.167
+++ glibc-fedora.patch	10 Aug 2006 07:07:13 -0000	1.168
@@ -1,5 +1,5 @@
---- glibc-20060807T1859/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060807T1859-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060810T0627/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060810T0627-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060807T1859/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060807T1859-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060810T0627/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060810T0627-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060807T1859/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060807T1859-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060810T0627/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060810T0627-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060807T1859/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060807T1859-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060810T0627/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060810T0627-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060807T1859/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060807T1859-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060810T0627/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060810T0627-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060807T1859/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060807T1859-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060810T0627/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060810T0627-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060807T1859/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060807T1859-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060810T0627/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060810T0627-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060807T1859/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060807T1859-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060810T0627/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060810T0627-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060807T1859/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060807T1859-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060810T0627/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060810T0627-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060807T1859/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060807T1859-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060810T0627/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060810T0627-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060807T1859/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060807T1859-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060810T0627/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060810T0627-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-20060807T1859/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060807T1859-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060810T0627/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060810T0627-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-20060807T1859/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060807T1859-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060810T0627/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060810T0627-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060807T1859/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060807T1859-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060810T0627/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060810T0627-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060807T1859/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060807T1859-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060810T0627/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060810T0627-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060807T1859/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060807T1859-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060810T0627/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060810T0627-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060807T1859/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060807T1859-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060810T0627/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060810T0627-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060807T1859/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060807T1859-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060810T0627/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060810T0627-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060807T1859/localedata/SUPPORTED	3 Aug 2006 08:16:23 -0000	1.95
-+++ glibc-20060807T1859-fedora/localedata/SUPPORTED	7 Aug 2006 19:28:25 -0000	1.71.2.12
+--- glibc-20060810T0627/localedata/SUPPORTED	3 Aug 2006 08:16:23 -0000	1.95
++++ glibc-20060810T0627-fedora/localedata/SUPPORTED	7 Aug 2006 19:28:25 -0000	1.71.2.12
 @@ -77,6 +77,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060807T1859/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060807T1859-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060810T0627/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060810T0627-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060807T1859/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
-+++ glibc-20060807T1859-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
+--- glibc-20060810T0627/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
++++ glibc-20060810T0627-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20060807T1859/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060807T1859-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060810T0627/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060810T0627-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -950,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060807T1859/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060807T1859-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060810T0627/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060810T0627-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -979,8 +979,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060807T1859/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060807T1859-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060810T0627/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060810T0627-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1056,8 +1056,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060807T1859/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060807T1859-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060810T0627/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060810T0627-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -1113,16 +1113,16 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060807T1859/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060807T1859-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060810T0627/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060810T0627-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060807T1859/nptl/ChangeLog	3 Aug 2006 09:36:43 -0000	1.906
-+++ glibc-20060807T1859-fedora/nptl/ChangeLog	7 Aug 2006 19:28:26 -0000	1.706.2.95
+--- glibc-20060810T0627/nptl/ChangeLog	3 Aug 2006 09:36:43 -0000	1.906
++++ glibc-20060810T0627-fedora/nptl/ChangeLog	7 Aug 2006 19:28:26 -0000	1.706.2.95
 @@ -960,6 +960,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1163,8 +1163,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060807T1859/nptl/Makefile	1 Aug 2006 06:05:02 -0000	1.183
-+++ glibc-20060807T1859-fedora/nptl/Makefile	2 Aug 2006 16:57:41 -0000	1.157.2.23
+--- glibc-20060810T0627/nptl/Makefile	1 Aug 2006 06:05:02 -0000	1.183
++++ glibc-20060810T0627-fedora/nptl/Makefile	2 Aug 2006 16:57:41 -0000	1.157.2.23
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1187,8 +1187,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060807T1859/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060807T1859-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060810T0627/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060810T0627-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1213,8 +1213,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1222,8 +1222,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
-+++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
+--- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
++++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
 @@ -68,6 +68,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1559,8 +1559,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@@ -1706,8 +1706,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
 @@ -44,9 +44,16 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -1808,8 +1808,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1951,8 +1951,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
-+++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
+--- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
++++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
 @@ -49,6 +49,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2340,8 +2340,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060807T1859/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060807T1859-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
 @@ -46,8 +46,13 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -2436,8 +2436,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060807T1859/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060807T1859-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060810T0627/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060810T0627-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2460,8 +2460,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060807T1859/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060807T1859-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060810T0627/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060810T0627-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2480,8 +2480,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060807T1859/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060807T1859-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060810T0627/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060810T0627-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2493,8 +2493,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060807T1859/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060807T1859-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060810T0627/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060810T0627-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -2535,8 +2535,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060807T1859/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
-+++ glibc-20060807T1859-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
+--- glibc-20060810T0627/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
++++ glibc-20060810T0627-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2570,8 +2570,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060807T1859/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060807T1859-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060810T0627/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060810T0627-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -2588,8 +2588,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060807T1859/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060807T1859-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060810T0627/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060810T0627-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -2605,8 +2605,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060807T1859/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060807T1859-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060810T0627/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060810T0627-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2620,8 +2620,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060807T1859/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060807T1859-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060810T0627/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060810T0627-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -2633,8 +2633,8 @@
  endif
  endif
  
---- glibc-20060807T1859/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060807T1859-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060810T0627/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060810T0627-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -2986,8 +2986,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060807T1859/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060807T1859-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060810T0627/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060810T0627-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3073,8 +3073,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060807T1859/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060807T1859-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060810T0627/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060810T0627-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
 @@ -41,7 +41,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3089,8 +3089,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060807T1859/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
-+++ glibc-20060807T1859-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+--- glibc-20060810T0627/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20060810T0627-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
 @@ -18,11 +18,14 @@
     02111-1307 USA.  */
  
@@ -3138,8 +3138,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060807T1859/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060807T1859-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060810T0627/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060810T0627-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;
@@ -3182,8 +3182,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060807T1859/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060807T1859-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060810T0627/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060810T0627-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"
@@ -3193,8 +3193,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060807T1859/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060807T1859-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060810T0627/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060810T0627-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;
@@ -3240,8 +3240,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060807T1859/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060807T1859-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060810T0627/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060810T0627-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.
@@ -3302,8 +3302,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060807T1859/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060807T1859-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060810T0627/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060810T0627-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)
@@ -3336,24 +3336,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060807T1859/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060807T1859-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060810T0627/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060810T0627-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-20060807T1859/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060807T1859-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060810T0627/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060810T0627-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-20060807T1859/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060807T1859-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060810T0627/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060810T0627-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.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- glibc.spec	7 Aug 2006 19:49:00 -0000	1.254
+++ glibc.spec	10 Aug 2006 07:07:14 -0000	1.255
@@ -1,9 +1,9 @@
-%define glibcdate 20060807T1859
+%define glibcdate 20060810T0627
 %define glibcname glibc
-%define glibcsrcdir glibc-20060807T1859
+%define glibcsrcdir glibc-20060810T0627
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 18
+%define glibcrelease 19
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1443,6 +1443,12 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-19
+- adaptive malloc brk/mmap threshold
+- fix fchownat to use kernel syscall (if available) on many arches (#201870)
+- only define O_DIRECT with -D_GNU_SOURCE on ia64 to match all
+  other arches (#201748)
+
 * Mon Aug  7 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-18
 - NIS+ fixes
 - fix memusage and xtrace scripts (#200736)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- sources	7 Aug 2006 19:49:00 -0000	1.187
+++ sources	10 Aug 2006 07:07:14 -0000	1.188
@@ -1,2 +1,2 @@
-76063e957e7367695babc72713f6e0a0  glibc-20060807T1859.tar.bz2
-1bf45107806237657d4dc437aaa68286  glibc-fedora-20060807T1859.tar.bz2
+4029b7d296fb6fb706829570a94e793d  glibc-20060810T0627.tar.bz2
+734e74f6eb383ab5659dc880fbcc9f62  glibc-fedora-20060810T0627.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 10 09:05:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 05:05:25 -0400
Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec,
	1.34, 1.35
Message-ID: <200608100905.k7A95PCj010876@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-commons-logging/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10859

Modified Files:
	jakarta-commons-logging.spec 
Log Message:
- Require(post/postun): coreutils
>From a fresh install:
Installing jakarta-commons-logging-javadoc - 1.0.4-5jpp_2fc.x86_64
/var/tmp/rpm-tmp.82827: line 1: rm: command not found
/var/tmp/rpm-tmp.82827: line 2: ln: command not found
error: %post(jakarta-commons-logging-javadoc-1.0.4-5jpp_2fc.x86_64) scriptlet failed, exit status 127



Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jakarta-commons-logging.spec	22 Jul 2006 08:42:54 -0000	1.34
+++ jakarta-commons-logging.spec	10 Aug 2006 09:05:18 -0000	1.35
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0.4
-Release:        5jpp_2fc
+Release:        5jpp_3fc
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        Apache Software License
@@ -78,6 +78,8 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):   coreutils
+Requires(postun): coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -178,6 +180,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 0:1.0.4-5jpp_3fc
+- Require(post/postun): coreutils
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:1.0.4-5jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 09:09:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 05:09:14 -0400
Subject: rpms/junit/devel junit.spec,1.21,1.22
Message-ID: <200608100909.k7A99E9a010956@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	junit.spec 
Log Message:
- Require(post/postun): coreutils
Installing junit-javadoc - 3.8.2-2jpp_2fc.x86_64
/var/tmp/rpm-tmp.82827: line 1: rm: command not found
/var/tmp/rpm-tmp.82827: line 2: ln: command not found
error: %post(junit-javadoc-3.8.2-2jpp_2fc.x86_64) scriptlet failed, exit status 127



Index: junit.spec
===================================================================
RCS file: /cvs/dist/rpms/junit/devel/junit.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- junit.spec	24 Jul 2006 04:10:46 -0000	1.21
+++ junit.spec	10 Aug 2006 09:09:12 -0000	1.22
@@ -36,7 +36,7 @@
 
 Name:		junit
 Version:	3.8.2
-Release:	2jpp_2fc
+Release:	2jpp_3fc
 Epoch:		0
 Summary:	Java regression test package
 License:	Common Public License
@@ -74,6 +74,8 @@
 %package javadoc
 Group:		Development/Documentation
 Summary:	Javadoc for %{name}
+Requires(post):   coreutils
+Requires(postun): coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -192,6 +194,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 0:3.8.2-2jpp_3fc
+- Require(post/postun): coreutils
+
 * Sun Jun 23 2006 Deepak Bhole <dbhole at redhat.com> -  0:3.8.2-2jpp_2fc
 - Rebuilt.
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 09:15:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 05:15:07 -0400
Subject: rpms/kdeaccessibility/devel .cvsignore, 1.11,
	1.12 kdeaccessibility.spec, 1.22, 1.23 sources, 1.12,
	1.13 kdeaccessibility-3.5.3-3.5.4.patch, 1.1, NONE
Message-ID: <200608100915.k7A9F74K022239@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Removed Files:
	kdeaccessibility-3.5.3-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Jun 2006 21:47:50 -0000	1.11
+++ .cvsignore	10 Aug 2006 09:15:04 -0000	1.12
@@ -8,3 +8,4 @@
 kdeaccessibility-3.5.0.tar.bz2
 kdeaccessibility-3.5.1.tar.bz2
 kdeaccessibility-3.5.3.tar.bz2
+kdeaccessibility-3.5.4.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kdeaccessibility.spec	24 Jul 2006 15:29:19 -0000	1.22
+++ kdeaccessibility.spec	10 Aug 2006 09:15:05 -0000	1.23
@@ -5,19 +5,19 @@
 %define kdebase_epoch 6
 
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
-Prefix: /usr
 License: GPL
 Group: Amusements/Games
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
-Patch0: kdeaccessibility-3.5.3-3.5.4.patch
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -26,12 +26,9 @@
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: glibc-devel
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: libstdc++-devel
 BuildRequires: perl
 BuildRequires: libXtst-devel
+BuildRequires: gettext
 
 %description
 Included with this package are:
@@ -41,14 +38,11 @@
 to let their computer speak for them.
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0
+%setup -q
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-make -f admin/Makefile.common cvs
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -61,7 +55,7 @@
 %if %{final}
    --enable-final \
 %endif
-   --includedir=%{prefix}/include/kde \
+   --includedir=%{_includedir}/kde \
    --with-qt-libraries=$QTDIR/lib
 
 make %{?_smp_mflags}
@@ -86,6 +80,20 @@
 %clean
 rm -rf %{buildroot}
 
+%post
+/sbin/ldconfig
+for f in hicolor locolor mono ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+%postun
+/sbin/ldconfig
+for f in hicolor locolor mono ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/HTML/en/*
@@ -104,6 +112,9 @@
 
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 1:3.5.4-1
+- rebuild
+
 * Mon Jul 24 2006 Than Ngo <than at redhat.com> 1:3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	2 Jun 2006 21:47:50 -0000	1.12
+++ sources	10 Aug 2006 09:15:05 -0000	1.13
@@ -1 +1 @@
-99eadb3a73bc250e96cec370ee79caff  kdeaccessibility-3.5.3.tar.bz2
+bc64350a56a585e4d2c88fe3fc8b24f8  kdeaccessibility-3.5.4.tar.bz2


--- kdeaccessibility-3.5.3-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 09:24:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 05:24:05 -0400
Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.17,1.18
Message-ID: <200608100924.k7A9O5vu006900@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	compat-gcc-296.spec 
Log Message:
2.96-137


Index: compat-gcc-296.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- compat-gcc-296.spec	17 Jul 2006 16:53:49 -0000	1.17
+++ compat-gcc-296.spec	10 Aug 2006 09:24:03 -0000	1.18
@@ -1,6 +1,6 @@
 %define DATE 20000731
 %define gcc_version 2.96
-%define gcc_release 136
+%define gcc_release 137
 Summary: 2.96-RH compatibility libraries
 Name: compat-gcc-296
 Version: %{gcc_version}
@@ -15,7 +15,7 @@
 # Need -pie support
 # Need --as-needed/--no-as-needed support
 BuildRequires: binutils >= 2.15.90.0.1.1-2
-BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo, elfutils-libelf-devel
+BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo
 # Make sure pthread.h doesn't contain __thread tokens
 BuildRequires: glibc-devel >= 2.2.90-12
 # Need .eh_frame ld optimizations
@@ -451,8 +451,6 @@
 
 Patch1500: gcc-libg++-config.patch
 
-Source2000: egcs-libstdc++-compat.tar.bz2
-
 %define _gnu %{nil}
 
 %description
@@ -965,10 +963,6 @@
 touch gcc/c-parse.h gcc/cp/parse.h gcc/tradcif.c
 touch gcc/cstamp-h.in gcc/config.in
 
-mkdir compat
-tar xjf %{SOURCE2000} -C compat
-cd ..
-
 %build
 rm -fr obj-%{_target_platform}
 mkdir obj-%{_target_platform}
@@ -1022,22 +1016,6 @@
 make bootstrap-lean
 
 cd ..
-cd compat
-# Munge binary compatibility C++ libraries, so that they use
-# frame info registry and __frame_state_for from glibc
-# instead of defining their own (by changing those symbols
-# in .dynsym to SHN_UNDEF).
-# FIXME: Maybe it should munge .gnu.version section too
-# so that those symbols are @GLIBC_2.0, not non-versioned.
-gcc -D_FILE_OFFSET_BITS=64 -O2 -o symtabedit symtabedit.c -lelf
-for i in i386/libstdc++* sparc/libstdc++*; do
-  case "$i" in
-  *.dummy) ;; # These are just dummy libs with DT_NEEDED entry
-  sparc/*.2.8.0) ;; # This one used libc frame info stuff already
-  *) ./symtabedit $i || exit ;;
-  esac
-done
-cd ..
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -1060,7 +1038,6 @@
   $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libstdc++-libc6.2-2.so.3
 
 LIB_ARCH=`echo %{_target_cpu} | sed 's/i?86/i386/'`
-[ -d compat/$LIB_ARCH ] && install -m 755 compat/$LIB_ARCH/libstdc*libc*so* $RPM_BUILD_ROOT%{_prefix}/%{_lib}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1073,9 +1050,6 @@
 %defattr(-,root,root)
 %{_prefix}/%{_lib}/libstdc++-3-libc6.2-2-2.10.0.so
 %{_prefix}/%{_lib}/libstdc++-libc6.2-2.so.3
-%ifarch %{ix86} sparc alpha
-%{_prefix}/lib/libstdc++-2-libc*-2.9.0.so
-%endif
 
 %files -n compat-libgcc-296
 %defattr(-,root,root)
@@ -1090,6 +1064,10 @@
 %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o
 
 %changelog
+* Thu Aug 10 2006 Jakub Jelinek  <jakub at redhat.com> 2.96-137
+- remove egcs 1.1.2 compat libraries, there have been plenty
+  of warnings these will go away in the last 7 years
+
 * Mon Jul 17 2006 Jakub Jelinek  <jakub at redhat.com> 2.96-136
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 09:44:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 05:44:10 -0400
Subject: rpms/mono/devel mono-1.1.16-libdir.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 mono.spec, 1.40, 1.41 sources, 1.10, 1.11
Message-ID: <200608100944.k7A9iAoW011830@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11732

Modified Files:
	.cvsignore mono.spec sources 
Added Files:
	mono-1.1.16-libdir.patch 
Log Message:
* Mon Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16.1-1
- Update to 1.1.16.1
- Split out mono libs and devel headers to fix lib64 conflicts (#199790)



mono-1.1.16-libdir.patch:
 configure.in                          |    2 +-
 mcs/build/config-default.make         |    2 +-
 mcs/build/profiles/atomic.make        |    6 +++---
 mcs/class/Mono.Globalization/Makefile |    4 ++--
 mcs/tools/cilc/res-Makefile           |    2 +-
 mint.pc.in                            |    2 +-
 mono-cairo.pc.in                      |    2 +-
 mono/metadata/Makefile.am             |    2 +-
 scripts/Makefile.am                   |    2 +-
 scripts/mono-nunit.pc.in              |    2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

--- NEW FILE mono-1.1.16-libdir.patch ---
Index: mono-1.1.16/configure.in
===================================================================
--- mono-1.1.16.orig/configure.in
+++ mono-1.1.16/configure.in
@@ -2000,7 +2000,7 @@ fi
   if test x$cross_compiling = xno; then
     echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
     echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
-    echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
+    echo "mono_libdir=$libdir" >> $srcdir/$mcsdir/build/config.make
     echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
     echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
     echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
Index: mono-1.1.16/mono/metadata/Makefile.am
===================================================================
--- mono-1.1.16.orig/mono/metadata/Makefile.am
+++ mono-1.1.16/mono/metadata/Makefile.am
@@ -9,7 +9,7 @@ else
 # The mingw math.h has "extern inline" functions that dont appear in libs, so
 # optimisation is required to actually inline them
 AM_CFLAGS = -O
-assembliesdir = $(exec_prefix)/lib
+assembliesdir = $(libdir)
 confdir = $(sysconfdir)
 endif
 
Index: mono-1.1.16/scripts/Makefile.am
===================================================================
--- mono-1.1.16.orig/scripts/Makefile.am
+++ mono-1.1.16/scripts/Makefile.am
@@ -80,7 +80,7 @@ plat_bindir = $(shell cygpath -m $(libdi
 mono_instdir = $(shell cygpath -m $(libdir))/mono
 else
 plat_bindir = $(bindir)
-mono_instdir = $(prefix)/lib/mono
+mono_instdir = $(libdir)/mono
 endif
 
 REWRITE_COMMON = sed \
Index: mono-1.1.16/scripts/mono-nunit.pc.in
===================================================================
--- mono-1.1.16.orig/scripts/mono-nunit.pc.in
+++ mono-1.1.16/scripts/mono-nunit.pc.in
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@reloc_libdir@
 
 
 Name: Mono NUnit
Index: mono-1.1.16/mint.pc.in
===================================================================
--- mono-1.1.16.orig/mint.pc.in
+++ mono-1.1.16/mint.pc.in
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
+libdir=${prefix}/@reloc_libdir@
 includedir=${prefix}/include
 
 
Index: mono-1.1.16/mono-cairo.pc.in
===================================================================
--- mono-1.1.16.orig/mono-cairo.pc.in
+++ mono-1.1.16/mono-cairo.pc.in
@@ -6,4 +6,4 @@ includedir=${prefix}/include
 Name: Mono.Cairo
 Description: Cairo bindings for Mono
 Version: @VERSION@
-Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll
+Libs: -r:${libdir}/mono/1.0/Mono.Cairo.dll
Index: mono-1.1.16/mcs/build/config-default.make
===================================================================
--- mono-1.1.16.orig/mcs/build/config-default.make
+++ mono-1.1.16/mcs/build/config-default.make
@@ -17,7 +17,7 @@ LIBRARY_FLAGS = /noconfig
 CFLAGS = -g -O2
 prefix = /usr/local
 exec_prefix = $(prefix)
-mono_libdir = $(exec_prefix)/lib
+mono_libdir = $(libdir)
 #RUNTIME = mono
 RUNTIME = false
 TEST_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
Index: mono-1.1.16/mcs/build/profiles/atomic.make
===================================================================
--- mono-1.1.16.orig/mcs/build/profiles/atomic.make
+++ mono-1.1.16/mcs/build/profiles/atomic.make
@@ -15,14 +15,14 @@ MCS = $(BOOTSTRAP_MCS)
 
 # Get our installed libraries (an issue on windows)
 
-PROFILE_MCS_FLAGS = /lib:$(prefix)/lib
+PROFILE_MCS_FLAGS = /lib:$(libdir)
 
 # Check that installed libraries even exist.
 
 profile-check:
-	@if test '!' -f $(prefix)/lib/I18N.dll ; then \
+	@if test '!' -f $(libdir)/I18N.dll ; then \
 	    echo ; \
-	    echo "$(prefix)/lib/I18N.dll does not exist." ; \
+	    echo "$(libdir)/I18N.dll does not exist." ; \
 	    echo ; \
 	    echo "This probably means that you are building from a miniature" ; \
 	    echo "distribution of MCS or don't yet have an installed MCS at all." ; \
Index: mono-1.1.16/mcs/class/Mono.Globalization/Makefile
===================================================================
--- mono-1.1.16.orig/mcs/class/Mono.Globalization/Makefile
+++ mono-1.1.16/mcs/class/Mono.Globalization/Makefile
@@ -8,8 +8,8 @@ thelib = $(topdir)/class/lib/Mono.Global
 all-local: $(thelib)
 
 install-local:
-	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib
-	$(INSTALL_LIB) $(thelib) $(DESTDIR)$(prefix)/lib
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+	$(INSTALL_LIB) $(thelib) $(DESTDIR)$(libdir)
 
 clean-local:
 	rm -rf $(thelib) MonoCultures.cs write-source.exe
Index: mono-1.1.16/mcs/tools/cilc/res-Makefile
===================================================================
--- mono-1.1.16.orig/mcs/tools/cilc/res-Makefile
+++ mono-1.1.16/mcs/tools/cilc/res-Makefile
@@ -2,7 +2,7 @@ include defs.mk
 
 LIBNAME = $(shell echo $(basename $(SONAME)) | sed -e 's/^lib//')
 HTARGET = $(prefix)/include/$(LIBNAME)/
-LIBTARGET = $(prefix)/lib/
+LIBTARGET = $(libdir)
 
 CFLAGS += -static -fpic $(shell pkg-config --cflags glib-2.0 gobject-2.0 mono) $(EXTRAINCLUDES) -I.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	7 Jul 2006 11:12:45 -0000	1.10
+++ .cvsignore	10 Aug 2006 09:44:06 -0000	1.11
@@ -1 +1 @@
-mono-1.1.16.tar.gz
+mono-1.1.16.1.tar.gz


Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- mono.spec	12 Jul 2006 07:23:43 -0000	1.40
+++ mono.spec	10 Aug 2006 09:44:06 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           mono
-Version:        1.1.16
-Release:        1.1
+Version:        1.1.16.1
+Release:        1
 Summary:        a .NET runtime environment
 
 Group:          Development/Languages
@@ -33,10 +33,26 @@
 class loader, the garbage collector, threading system and
 metadata access libraries.
 
+%package lib
+Summary:        Mono library, used by applications embedding mono
+Group:          Development/Languages
+
+%description lib
+This pickage contains libraries required for embedding/hosting the
+mono runtime in other applications.
+
+%package lib-devel
+Summary:        Header files for Mono library
+Group:          Development/Languages
+
+%description lib-devel
+Contains headers and other files needed to use the library in mono-lib.
+
 %package core
 Summary:        The Mono CIL runtime, suitable for running .NET code
 Group:          Development/Languages
 Requires:	libgdiplus
+Requires:	mono-lib
 
 %description core
 This package contains the core of the Mono runtime including its
@@ -44,16 +60,19 @@
 tools and libraries (corlib, XML, System.Security, ZipLib,
 I18N, Cairo and Mono.*).
 
-%package devel
-Summary:        Development tools and headers for Mono
+%package devtools
+Summary:        Development tools for Mono
 Group:          Development/Languages
 Requires:       mono-core = %{version}-%{release}
 Requires:       glib2-devel
+# We changed the name of this from mono-devel to avoid multilib issues (#185690)
+Provides:	mono-devel
+Obsoletes: 	mono-devel
+
 
-%description devel
-This package includes all Mono library headers and completes the
-Mono developer toolchain (with the mono profiler, assembler and
-other various tools)
+%description devtools
+This package completes the Mono developer toolchain with the mono profiler,
+assembler and other various tools.
 
 %package nunit
 Summary:        NUnit Testing Framework
@@ -279,10 +298,21 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%files lib
+%defattr(-,root,root,-)
+%{_libdir}/libmono.so.*
+%{_libdir}/libMonoPosixHelper.so
+%{_libdir}/libMonoSupportW.so
+
+%files lib-devel
+%defattr(-,root,root,-)
+%{_libdir}/libmono.so
+%{_includedir}/mono
+%{_libdir}/pkgconfig/mono.pc
+
 %files core
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog NEWS README
-%{_libdir}/libmono.so*
 %{_bindir}/mono
 %mono_bin certmgr
 %mono_bin chktrust
@@ -305,6 +335,7 @@
 %dir %{monodir}/1.0
 %dir %{monodir}/2.0
 %dir %{monodir}/gac
+%dir %{monodir}/compat-*
 %gac_dll Commons.Xml.Relaxng
 %gac_dll I18N
 %gac_dll I18N.West
@@ -332,10 +363,8 @@
 %config /etc/mono/1.0/machine.config
 %config /etc/mono/2.0/machine.config
 %{_libdir}/libikvm-native.so
-%{_libdir}/libMonoPosixHelper.so*
-%{_libdir}/libMonoSupportW.so
 
-%files devel
+%files devtools
 %defattr(-,root,root,-)
 %{_bindir}/monodis
 %{_bindir}/pedump
@@ -388,11 +417,9 @@
 %gac_dll Microsoft.Build.Tasks
 %gac_dll Microsoft.Build.Utilities
 %{_bindir}/monograph
-%{_includedir}/mono
 %{_libdir}/libmono-profiler-aot.*
 %{_libdir}/libmono-profiler-cov.*
 %{_libdir}/pkgconfig/dotnet.pc
-%{_libdir}/pkgconfig/mono.pc
 %{_libdir}/pkgconfig/mono-cairo.pc
 %{_mandir}/man1/monoburg.*
 %{_datadir}/mono/cil/cil-opcodes.xml
@@ -510,7 +537,11 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16.1-1
+- Update to 1.1.16.1
+- Split out mono libs and devel headers to fix lib64 conflicts (#199790)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.16-1.1
 - rebuild
 
 * Fri Jul  7 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	7 Jul 2006 11:12:45 -0000	1.10
+++ sources	10 Aug 2006 09:44:06 -0000	1.11
@@ -1 +1 @@
-ecfac1ed8bed586b50d1a1820b74b16b  mono-1.1.16.tar.gz
+11556607ba74cae225d9c73aef09e5e3  mono-1.1.16.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 10 09:44:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 05:44:48 -0400
Subject: rpms/mono/devel mono-1.1.16-libdir.patch,1.1,NONE
Message-ID: <200608100944.k7A9imks012012@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11971

Removed Files:
	mono-1.1.16-libdir.patch 
Log Message:
remove old patch



--- mono-1.1.16-libdir.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 09:51:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 05:51:16 -0400
Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec, 1.23,
	1.24 libgcc_post_upgrade.c, 1.1, NONE
Message-ID: <200608100951.k7A9pGnZ028702@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	compat-gcc-32.spec 
Removed Files:
	libgcc_post_upgrade.c 
Log Message:
3.2.3-58


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- compat-gcc-32.spec	3 Aug 2006 14:36:15 -0000	1.23
+++ compat-gcc-32.spec	10 Aug 2006 09:51:13 -0000	1.24
@@ -1,8 +1,7 @@
-ExcludeArch: s390x
 %define LIBSTDCXXDATE 20040818
 %define DATE 20040701
 %define gcc_version 3.2.3
-%define gcc_release 57
+%define gcc_release 58
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define build_java 0
@@ -25,7 +24,6 @@
 License: GPL
 Group: Development/Languages
 Source0: gcc-%{gcc_version}-%{DATE}.tar.bz2
-Source1: libgcc_post_upgrade.c
 Source2: libstdc++-3.3.4-%{LIBSTDCXXDATE}.tar.bz2
 Source3: dummylib.sh
 URL: http://gcc.gnu.org
@@ -52,15 +50,6 @@
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
-Obsoletes: compat-egcs
-Obsoletes: compat-gcc
-Obsoletes: compat-gcc-objc
-Obsoletes: compat-egcs-objc
-Obsoletes: compat-gcc-g77
-Obsoletes: compat-egcs-g77
-Obsoletes: compat-gcc-java
-Obsoletes: compat-libgcj
-Obsoletes: compat-libgcj-devel
 
 Patch1: gcc32-multi32-hack.patch
 Patch2: gcc32-ice-hack.patch
@@ -136,52 +125,16 @@
 %description
 This package includes a GCC 3.2.3-RH compatibility compiler.
 
-%package c++
-Summary: C++ support for compatibility compiler
-Group: Development/Languages
-Requires: compat-gcc-32 = %{version}-%{release}
-Requires: compat-libstdc++-33 = %{version}
-Obsoletes: compat-egcs-c++
-Obsoletes: compat-gcc-c++
-Obsoletes: compat-libstdc++-devel
-AutoProv: false
-
-%description c++
-This package includes a GCC 3.2.3-RH compatibility C++ compiler.
-
 %package -n compat-libstdc++-33
 Summary: Compatibility standard C++ libraries
 Group: System Environment/Libraries
 Obsoletes: compat-libstdc++
+Obsoletes: compat-gcc-32, compat-gcc-32-c++, compat-gcc-32-g77
 
 %description -n compat-libstdc++-33
 The compat-libstdc++ package contains compatibility standard C++ library
 from GCC 3.3.4.
 
-%package g77
-Summary: Fortran 77 support for compatibility compiler
-Group: Development/Languages
-Requires: compat-gcc-32 = %{version}-%{release}
-Requires: compat-libf2c-32 = %{version}-%{release}
-Prereq: /sbin/install-info
-Obsoletes: gcc3-g77
-Obsoletes: gcc-g77
-Autoreq: true
-
-%description g77
-The compat-gcc-32-g77 package provides support for compiling Fortran 77
-programs with the GNU Compiler Collection.
-
-%package -n compat-libf2c-32
-Summary: Fortran 77 compatibility runtime
-Group: System Environment/Libraries
-Autoreq: true
-Obsoletes: libf2c
-
-%description -n compat-libf2c-32
-This package contains Fortran 77 shared library which is needed to run
-Fortran 77 dynamically linked programs.
-
 %prep
 %setup -q -n gcc-%{gcc_version}-%{DATE} -a2
 mv gcc-3.3.4-%{LIBSTDCXXDATE}/libstdc++-v3 libstdc++33-v3
@@ -306,7 +259,7 @@
 	../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
 	--enable-shared --enable-threads=posix --disable-checking \
 	--with-system-zlib --enable-__cxa_atexit \
-	--enable-languages=c,c++,f77 --disable-libgcj \
+	--enable-languages=c,c++ --disable-libgcj \
 %ifarch sparc
 	--host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7
 %endif
@@ -374,19 +327,6 @@
 FULLPATH=$RPM_BUILD_ROOT%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}
 FULLPATH33=$RPM_BUILD_ROOT%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4
 
-%ifarch sparc ppc
-ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
-  $RPM_BUILD_ROOT%{_prefix}/bin/%{_target_platform}-gcc
-%endif
-%ifarch sparc64
-ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
-  $RPM_BUILD_ROOT%{_prefix}/bin/sparc-%{_vendor}-%{_target_os}-gcc
-%endif
-%ifarch ppc64
-ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
-  $RPM_BUILD_ROOT%{_prefix}/bin/ppc-%{_vendor}-%{_target_os}-gcc
-%endif
-
 rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libstdc++.*a
 rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libsupc++.*a
 rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libstdc++.so*
@@ -413,24 +353,7 @@
   $RPM_BUILD_ROOT%{_prefix}/%{_lib}/
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_prefix}/%{_lib}/
 
-mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgcc_s.so.1 $RPM_BUILD_ROOT/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1
-chmod 755 $RPM_BUILD_ROOT/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1
-ln -sf libgcc_s-%{gcc_version}-%{DATE}.so.1 $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.1
-ln -sf /%{_lib}/libgcc_s.so.1 $FULLPATH/libgcc_s.so
-%ifarch sparc ppc
-ln -sf /lib64/libgcc_s.so.1 $FULLPATH/libgcc_s_64.so
-%endif
-%ifarch %{multilib_64_archs}
-ln -sf /lib/libgcc_s.so.1 $FULLPATH/libgcc_s_32.so
-%endif
-
-for h in `find $FULLPATH/include -name \*.h`; do
-  if grep -q 'It has been auto-edited by fixincludes from' $h; then
-    rh=`grep -A2 'It has been auto-edited by fixincludes from' $h | tail -1 | sed 's|^.*"\(.*\)".*$|\1|'`
-    diff -up $rh $h || :
-    rm -f $h
-  fi
-done
+rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgcc_s*
 
 cd ..
 
@@ -438,33 +361,6 @@
   mv -f $i ${i}32
 done
 
-ln -sf g77 $RPM_BUILD_ROOT%{_prefix}/bin/f77
-pushd $FULLPATH
-mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libg2c.*a .
-mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libfrtbegin.*a .
-if [ "%{_lib}" = "lib" ]; then
-ln -sf ../../../libg2c.so.0.* libg2c.so
-else
-ln -sf ../../../../%{_lib}/libg2c.so.0.* libg2c.so
-fi
-%ifarch sparc ppc
-mkdir -p 64
-ln -sf ../`echo ../../../../lib/libg2c.so.0.* | sed s~/lib/~/lib64/~` 64/libg2c.so
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libg2c.*a 64/
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libfrtbegin.*a 64/
-%endif
-%ifarch %{multilib_64_archs}
-mkdir -p 32
-ln -sf ../`echo ../../../../lib64/libg2c.so.0.* | sed s~/../lib64/~/~` 32/libg2c.so
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libg2c.*a 32/
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libfrtbegin.*a 32/
-%endif
-popd
-
-# Strip debug info from Fortran static libraries
-strip -g `find . \( -name libg2c.a -o -name libfrtbegin.a \) -a -type f`
-chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libg2c.so.0.*
-
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib*/libiberty.a
 rm -f $RPM_BUILD_ROOT/lib*/libgcc_s*
 
@@ -479,6 +375,8 @@
 %endif
 %endif
 
+rm -rf $RPM_BUILD_ROOT%{_prefix}/{lib/gcc,libexec/gcc,bin,include}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -486,167 +384,14 @@
 
 %postun -n compat-libstdc++-33 -p /sbin/ldconfig
 
-%post g77
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/g77.info.gz
-
-%preun g77
-if [ $1 = 0 ]; then
-  /sbin/install-info --delete \
-    --info-dir=%{_infodir} %{_infodir}/g77.info.gz
-fi
-
-%post -n compat-libf2c-32 -p /sbin/ldconfig
-
-%postun -n compat-libf2c-32 -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root)
-%{_prefix}/bin/gcc32
-%{_prefix}/bin/gcov32
-%ifarch sparc ppc
-%{_prefix}/bin/%{_target_platform}-gcc32
-%endif
-%ifarch sparc64
-%{_prefix}/bin/sparc-%{_vendor}-%{_target_os}-gcc32
-%endif
-%ifarch ppc64
-%{_prefix}/bin/ppc-%{_vendor}-%{_target_os}-gcc32
-%endif
-%{_prefix}/bin/%{gcc_target_platform}-gcc32
-%dir %{_prefix}/lib/gcc-lib
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/stddef.h
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/stdarg.h
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/varargs.h
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/float.h
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/limits.h
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/stdbool.h
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/iso646.h
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/syslimits.h
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/unwind.h
-%ifarch %{ix86} x86_64
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/mmintrin.h
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/xmmintrin.h
-#%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/emmintrin.h
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/pmmintrin.h
-%endif
-%ifarch ia64
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/ia64intrin.h
-%endif
-%ifarch ppc ppc64
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/ppc-asm.h
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/altivec.h
-%endif
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/README
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/collect2
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/cc1
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/cpp0
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/tradcpp0
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/crt*.o
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/libgcc.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/libgcc_eh.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/libgcc_s.so
-%ifarch sparc ppc
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64/crt*.o
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64/libgcc.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64/libgcc_eh.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/libgcc_s_64.so
-%endif
-%ifarch %{multilib_64_archs}
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32/crt*.o
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32/libgcc.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32/libgcc_eh.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/libgcc_s_32.so
-%endif
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/specs
-%doc gcc/README* gcc/*ChangeLog* gcc/COPYING*
-
-%files c++
-%defattr(-,root,root)
-%{_prefix}/bin/%{gcc_target_platform}-*++32
-%{_prefix}/bin/g++32
-%dir %{_prefix}/lib/gcc-lib
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/cc1plus
-%ifarch sparc ppc
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64/libstdc++.so
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64/libstdc++.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64/libsupc++.a
-%endif
-%ifarch %{multilib_64_archs}
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32/libstdc++.so
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32/libstdc++.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32/libsupc++.a
-%endif
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/libstdc++.so
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/libsupc++.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/libstdc++.a
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4
-%ifarch sparc ppc
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4/64
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4/64/libstdc++.so
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4/64/libstdc++.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4/64/libsupc++.a
-%endif
-%ifarch %{multilib_64_archs}
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4/32
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4/32/libstdc++.so
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4/32/libstdc++.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4/32/libsupc++.a
-%endif
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4/libstdc++.so
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4/libsupc++.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/3.3.4/libstdc++.a
-%{_prefix}/include/c++
-%doc gcc/cp/ChangeLog*
-%doc libstdc++-v3/ChangeLog* libstdc++-v3/README* libstdc++-v3/docs/html/
-
 %files -n compat-libstdc++-33
 %defattr(-,root,root)
 %{_prefix}/%{_lib}/libstdc++.so.5*
 
-%files g77
-%defattr(-,root,root)
-%{_prefix}/bin/g77
-%{_prefix}/bin/f77
-%{_mandir}/man1/g77.1*
-%{_infodir}/g77*
-%dir %{_prefix}/lib/gcc-lib
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/f771
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/libfrtbegin.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/libg2c.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/libg2c.so
-%ifarch sparc ppc
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64/libfrtbegin.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64/libg2c.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/64/libg2c.so
-%endif
-%ifarch %{multilib_64_archs}
-%dir %{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32/libfrtbegin.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32/libg2c.a
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/32/libg2c.so
-%endif
-%{_prefix}/lib/gcc-lib/%{gcc_target_platform}/%{gcc_version}/include/g2c.h
-%doc gcc/f/README gcc/f/ChangeLog*
-
-%files -n compat-libf2c-32
-%defattr(-,root,root)
-%{_prefix}/%{_lib}/libg2c.so.0*
-
 %changelog
+* Thu Aug 10 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-58
+- include only compat-libstdc++-33 subpackage
+
 * Thu Aug  3 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-57
 - in 64-bit builds remove 32-bit /usr/lib/lib* libraries from the
   buildroots (and similarly on 32-bit builds remove 64-bit /usr/lib64/lib*)


--- libgcc_post_upgrade.c DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 09:52:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 05:52:26 -0400
Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.18,
	1.19
Message-ID: <200608100952.k7A9qQKZ029120@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-commons-lang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28992

Modified Files:
	jakarta-commons-lang.spec 
Log Message:
- Requires(post): coreutils
Installing jakarta-commons-lang-javadoc - 2.1-4jpp_2fc.x86_64
/var/tmp/rpm-tmp.97553: line 1: rm: command not found
/var/tmp/rpm-tmp.97553: line 2: ln: command not found
error: %post(jakarta-commons-lang-javadoc-2.1-4jpp_2fc.x86_64) scriptlet failed, exit status 127



Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jakarta-commons-lang.spec	22 Jul 2006 08:42:39 -0000	1.18
+++ jakarta-commons-lang.spec	10 Aug 2006 09:52:24 -0000	1.19
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        2.1
-Release:        4jpp_2fc
+Release:        4jpp_3fc
 Epoch:          0
 Summary:        Jakarta Commons Lang Package
 License:        Apache Software License
@@ -76,6 +76,7 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
+Requires(post):   coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -162,6 +163,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 2.1-4jpp_3fc
+- Requires(post): coreutils
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.1-4jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 09:54:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 05:54:57 -0400
Subject: rpms/jakarta-commons-pool/devel jakarta-commons-pool.spec, 1.13,
	1.14
Message-ID: <200608100954.k7A9svJ9030039@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-commons-pool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29867

Modified Files:
	jakarta-commons-pool.spec 
Log Message:
- Requires(post/postun): coreutils
Installing jakarta-commons-pool-javadoc - 1.3-2jpp_2fc.x86_64
/var/tmp/rpm-tmp.92605: line 1: rm: command not found
/var/tmp/rpm-tmp.92605: line 2: ln: command not found
error: %post(jakarta-commons-pool-javadoc-1.3-2jpp_2fc.x86_64) scriptlet failed, exit status 127




Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jakarta-commons-pool.spec	22 Jul 2006 08:43:06 -0000	1.13
+++ jakarta-commons-pool.spec	10 Aug 2006 09:54:55 -0000	1.14
@@ -45,7 +45,7 @@
 
 Name:		jakarta-commons-pool
 Version:	1.3
-Release:	2jpp_2fc
+Release:	2jpp_3fc
 Epoch:		0
 Summary:	Jakarta Commons Pool Package
 License:	Apache Software License 2.0
@@ -90,6 +90,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Requires(post):		coreutils
+Requires(postun):	coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -216,6 +218,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.3-2jpp_3fc
+- Requires(post/postun): coreutils
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:1.3-2jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 09:58:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 05:58:44 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.20,
	1.21
Message-ID: <200608100958.k7A9wi77031340@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31237

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:
- Requires(post/postun): coreutils
Installing jakarta-commons-dbcp-javadoc - 1.2.1-5jpp_3fc.x86_64
/var/tmp/rpm-tmp.92605: line 1: rm: command not found
/var/tmp/rpm-tmp.92605: line 2: ln: command not found
error: %post(jakarta-commons-dbcp-javadoc-1.2.1-5jpp_3fc.x86_64) scriptlet failed, exit status 127



Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jakarta-commons-dbcp.spec	22 Jul 2006 08:41:20 -0000	1.20
+++ jakarta-commons-dbcp.spec	10 Aug 2006 09:58:41 -0000	1.21
@@ -45,7 +45,7 @@
 
 Name:		jakarta-commons-dbcp
 Version:	1.2.1
-Release:	5jpp_3fc
+Release:	5jpp_4fc
 Epoch:		0
 Summary:	Jakarta Commons DataBase Pooling Package
 License:	Apache Software License 2.0
@@ -114,6 +114,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Requires(post):		coreutils
+Requires(postun):	coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -283,6 +285,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.2.1-5jpp_4fc
+- Requires(post/postun): coreutils
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:1.2.1-5jpp_3fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:01:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:01:34 -0400
Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec,
	1.38, 1.39
Message-ID: <200608101001.k7AA1YdC032214@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32114

Modified Files:
	jakarta-commons-beanutils.spec 
Log Message:
- Requires(post/postun): coreutils
Installing jakarta-commons-beanutils-javadoc - 1.7.0-4jpp_2fc.x86_64
/var/tmp/rpm-tmp.23173: line 1: rm: command not found
/var/tmp/rpm-tmp.23173: line 2: ln: command not found
error: %post(jakarta-commons-beanutils-javadoc-1.7.0-4jpp_2fc.x86_64) scriptlet failed, exit status 127



Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jakarta-commons-beanutils.spec	22 Jul 2006 08:39:57 -0000	1.38
+++ jakarta-commons-beanutils.spec	10 Aug 2006 10:01:32 -0000	1.39
@@ -39,7 +39,7 @@
 
 Name:		jakarta-commons-beanutils
 Version:	1.7.0
-Release:	4jpp_2fc
+Release:	4jpp_3fc
 Epoch:		0
 Summary:	Jakarta Commons BeanUtils Package
 License:	Apache Software License
@@ -75,6 +75,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Requires(post):		coreutils
+Requires(postun):	coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -151,6 +153,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.7.0-4jpp_3fc
+- Requires(post/postun): coreutils
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.7.0-4jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:04:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:04:53 -0400
Subject: rpms/kdeaddons/devel .cvsignore, 1.30, 1.31 kdeaddons.spec, 1.54,
	1.55 sources, 1.32, 1.33 kdeaddons-3.5.3-3.5.4.patch, 1.1, NONE
Message-ID: <200608101004.k7AA4rIX000438@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaddons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv407

Modified Files:
	.cvsignore kdeaddons.spec sources 
Removed Files:
	kdeaddons-3.5.3-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	6 Jun 2006 15:42:18 -0000	1.30
+++ .cvsignore	10 Aug 2006 10:04:50 -0000	1.31
@@ -10,3 +10,4 @@
 kdeaddons-3.5.0.tar.bz2
 kdeaddons-3.5.1.tar.bz2
 kdeaddons-3.5.3.tar.bz2
+kdeaddons-3.5.4.tar.bz2


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdeaddons.spec	24 Jul 2006 14:31:57 -0000	1.54
+++ kdeaddons.spec	10 Aug 2006 10:04:51 -0000	1.55
@@ -13,16 +13,14 @@
 %define arts 1
 
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
-Patch0: kdeaddons-3.5.3-3.5.4.patch
-Patch1: kde-libtool.patch
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch2: kdeaddons-3.5.1-rgb.txt-path.patch
 Patch3: kdeaddons-3.5.3-sdl.patch
 
@@ -77,8 +75,7 @@
 
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0
+%setup -q
 %patch2 -p0 -b .rgb.txt-path
 %patch3 -p1 -b .sdl
 
@@ -125,9 +122,27 @@
 done
 popd
 
-%post -p /sbin/ldconfig
+%post
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2>/dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2>/dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%post atlantikdesigner
+touch --no-create %{_datadir}/icons/hicolor 2>/dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun atlantikdesigner
+touch --no-create %{_datadir}/icons/hicolor 2>/dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %clean
 rm -rf %{buildroot}
@@ -171,6 +186,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 3.5.4-1
+- rebuild
+
 * Mon Jul 24 2006 Than Ngo <than at redhat.com> 3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	6 Jun 2006 15:42:18 -0000	1.32
+++ sources	10 Aug 2006 10:04:51 -0000	1.33
@@ -1 +1 @@
-ea25326c6a775bbfa40d0efabed34c0d  kdeaddons-3.5.3.tar.bz2
+840d18fbcadec9f94bb70563876b4dcd  kdeaddons-3.5.4.tar.bz2


--- kdeaddons-3.5.3-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:11:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:11:39 -0400
Subject: rpms/jakarta-commons-pool/devel jakarta-commons-pool.spec, 1.14,
	1.15
Message-ID: <200608101011.k7AABdNn002069@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-commons-pool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2028

Modified Files:
	jakarta-commons-pool.spec 
Log Message:
- BuildRequires: xml-commons-apis


Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jakarta-commons-pool.spec	10 Aug 2006 09:54:55 -0000	1.14
+++ jakarta-commons-pool.spec	10 Aug 2006 10:11:36 -0000	1.15
@@ -62,6 +62,7 @@
 BuildRequires:	ant
 BuildRequires:	junit
 BuildRequires:  jpackage-utils > 0:1.6
+BuildRequires:  xml-commons-apis
 %if %{with_maven}
 BuildRequires:  maven >= 0:1.1
 BuildRequires:  saxon
@@ -220,6 +221,7 @@
 %changelog
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.3-2jpp_3fc
 - Requires(post/postun): coreutils
+- BuildRequires: xml-commons-apis
 
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:1.3-2jpp_2fc
 - Rebuilt



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:14:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:14:04 -0400
Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec,
	1.33, 1.34
Message-ID: <200608101014.k7AAE4sj002709@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2601

Modified Files:
	jakarta-commons-modeler.spec 
Log Message:
- Requires(post/postun): coreutils
Installing jakarta-commons-modeler-javadoc - 1.1-7jpp_2fc.x86_64
/var/tmp/rpm-tmp.23173: line 1: /bin/rm: No such file or directory
/var/tmp/rpm-tmp.23173: line 2: ln: command not found
error: %post(jakarta-commons-modeler-javadoc-1.1-7jpp_2fc.x86_64) scriptlet failed, exit status 127



Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jakarta-commons-modeler.spec	22 Jul 2006 08:43:00 -0000	1.33
+++ jakarta-commons-modeler.spec	10 Aug 2006 10:14:01 -0000	1.34
@@ -38,7 +38,7 @@
 
 Name:		jakarta-%{short_name}
 Version:	1.1
-Release:	7jpp_2fc
+Release:	7jpp_3fc
 Epoch:		0
 Summary:	Jakarta Commons Modeler Package
 License:	Apache Software License
@@ -86,6 +86,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Requires(post):		coreutils
+Requires(postun):	coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -159,6 +161,9 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.1-7jpp_3fc
+- Requires(post/postun): coreutils
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.1-7jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:16:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:16:11 -0400
Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec,
	1.32, 1.33
Message-ID: <200608101016.k7AAGBqT003273@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-commons-digester/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3233

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
- Requires(post/postun): coreutils
Installing jakarta-commons-digester-javadoc - 1.7-4jpp_2fc.x86_64
/var/tmp/rpm-tmp.23173: line 1: rm: command not found
/var/tmp/rpm-tmp.23173: line 2: ln: command not found
error: %post(jakarta-commons-digester-javadoc-1.7-4jpp_2fc.x86_64) scriptlet failed, exit status 127



Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jakarta-commons-digester.spec	22 Jul 2006 08:41:43 -0000	1.32
+++ jakarta-commons-digester.spec	10 Aug 2006 10:16:06 -0000	1.33
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.7
-Release:        4jpp_2fc
+Release:        4jpp_3fc
 Epoch:          0
 Summary:        Jakarta Commons Digester Package
 License:        Apache Software License
@@ -72,6 +72,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):		coreutils
+Requires(postun):	coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -152,6 +154,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.7-4jpp_3fc
+- Requires(post/postun): coreutils
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.7-4jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:20:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:20:57 -0400
Subject: rpms/util-linux/devel util-linux-2.13-login-timeval.patch, NONE,
	1.1 util-linux.spec, 1.135, 1.136
Message-ID: <200608101020.k7AAKvLY019386@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19299

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.13-login-timeval.patch 
Log Message:
add timeval patch

util-linux-2.13-login-timeval.patch:
 login.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE util-linux-2.13-login-timeval.patch ---

On 64-bit platforms such as x86_64, glibc is usally built with 32-bit
compatibilty for various structures. One of them is utmp.

What this means is that gettimeofday(&ut.ut_tv, NULL) on x86_64 will
end up overwriting the first parts of ut_addr_v6, leading to garbage
in the utmp file.


--- util-linux-2.13-pre6/login-utils/login.c.kzak	2006-08-10 11:38:33.000000000 +0200
+++ util-linux-2.13-pre6/login-utils/login.c	2006-08-10 11:38:49.000000000 +0200
@@ -257,6 +257,7 @@
 static void
 logbtmp(const char *line, const char *username, const char *hostname) {
 	struct utmp ut;
+	struct timeval tv;
 
 	memset(&ut, 0, sizeof(ut));
 
@@ -267,7 +268,9 @@
 	xstrncpy(ut.ut_line, line, sizeof(ut.ut_line));
 
 #if defined(_HAVE_UT_TV)	    /* in <utmpbits.h> included by <utmp.h> */
-	gettimeofday(&ut.ut_tv, NULL);
+	gettimeofday(&tv, NULL);
+	ut.ut_tv.tv_sec = tv.tv_sec;
+	ut.ut_tv.tv_usec = tv.tv_usec;
 #else
 	{
 		time_t t;
@@ -872,6 +875,7 @@
     {
 	struct utmp ut;
 	struct utmp *utp;
+	struct timeval tv;
 	
 	utmpname(_PATH_UTMP);
 	setutent();
@@ -911,7 +915,9 @@
 	strncpy(ut.ut_user, username, sizeof(ut.ut_user));
 	xstrncpy(ut.ut_line, tty_name, sizeof(ut.ut_line));
 #ifdef _HAVE_UT_TV		/* in <utmpbits.h> included by <utmp.h> */
-	gettimeofday(&ut.ut_tv, NULL);
+	gettimeofday(&tv, NULL);
+	ut.ut_tv.tv_sec = tv.tv_sec;
+	ut.ut_tv.tv_usec = tv.tv_usec;
 #else
 	{
 	    time_t t;


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- util-linux.spec	27 Jul 2006 22:31:19 -0000	1.135
+++ util-linux.spec	10 Aug 2006 10:20:54 -0000	1.136
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.36
+Release: 0.37
 License: distributable
 Group: System Environment/Base
 
@@ -222,6 +222,8 @@
 Patch245: util-linux-2.13-login-ipv6.patch
 # fscache bits for NFS mounts
 Patch246: util-linux-2.13-nfsmount-fsc.patch
+# 176494 - last -i returns strange IP addresses
+Patch247: util-linux-2.13-login-timeval.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -319,6 +321,7 @@
 %patch244 -p1
 %patch245 -p1
 %patch246 -p1
+%patch247 -p1
 
 %build
 unset LINGUAS || :
@@ -716,6 +719,9 @@
 /sbin/losetup
 
 %changelog
+* Thu Aug 10 2006 Karel Zak <kzak at redhat.com> 2.13-0.37
+- fix #176494 - last -i returns strange IP addresses (patch by Bill Nottingham)
+
 * Thu Jul 27 2006 Karel Zak <kzak at redhat.com> 2.13-0.36
 - fix #198300, #199557 - util-linux "post" scriptlet failure
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:21:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:21:49 -0400
Subject: rpms/kdeadmin/devel .cvsignore, 1.34, 1.35 kdeadmin.spec, 1.64,
	1.65 sources, 1.35, 1.36 kdeadmin-3.5.3-3.5.4.patch, 1.1, NONE
Message-ID: <200608101021.k7AALnV6019632@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeadmin.spec sources 
Removed Files:
	kdeadmin-3.5.3-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	2 Jun 2006 20:25:19 -0000	1.34
+++ .cvsignore	10 Aug 2006 10:21:46 -0000	1.35
@@ -10,3 +10,4 @@
 kdeadmin-3.5.0.tar.bz2
 kdeadmin-3.5.1.tar.bz2
 kdeadmin-3.5.3.tar.bz2
+kdeadmin-3.5.4.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kdeadmin.spec	24 Jul 2006 16:07:23 -0000	1.64
+++ kdeadmin.spec	10 Aug 2006 10:21:46 -0000	1.65
@@ -24,7 +24,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -32,22 +32,20 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kuser.pam
 Source2: kuser.pamd
 Source3: kpackage.pam
 Source4: kpackage.pamd
 Source5: kpackagerc
 
-Patch0: kdeadmin-3.5.3-3.5.4.patch
-Patch1: kde-libtool.patch
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: usermode
 
+BuildRequires: desktop-file-utils
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -58,7 +56,6 @@
 BuildRequires: rpm-devel
 BuildRequires: bzip2-devel
 BuildRequires: perl
-BuildRequires: /usr/bin/desktop-file-install
 
 %description
 The kdeadmin package includes administrative tools for the K Desktop
@@ -66,97 +63,10 @@
 
  kcron - Crontab editor
  kdat - Tape backup tool
-
-%package kcron
-Group: User Interface/Desktops
-Summary: Crontab editor for KDE
-Obsoletes: kdeadmin
-
-%description kcron
-KCron is a crontab editor for KDE - it helps you make your system run
-commands periodically.
-
-%package kdat
-Group: User Interface/Desktops
-Summary: Tape backup tool for KDE
-Obsoletes: kdeadmin
-
-%description kdat
-KDat is a KDE application for controlling tape backups.
-
-%package kpackage
-Group: User Interface/Desktops
-Summary: KDE package manager
-Obsoletes: kpackage kdeadmin
-Requires: usermode, pam
-
-%description kpackage
-KPackage is a graphical frontend for RPM and other package managers.
-
-%package ksysv
-Group: User Interface/Desktops
-Summary: System V startup editor
-Obsoletes: kdeadmin
-
-%description ksysv
-KSysV is a graphical frontend for configuring your runlevels (system
-startup/shutdown sequence).
-
-%package kuser
-Group: User Interface/Desktops
-Summary: Frontend for configuring users and user groups
-Requires: usermode, pam
-Obsoletes: kdeadmin
-
-%description kuser
-KUser is a graphical frontend for managing the users and user groups on
-your system.
-
-%package kwuftpd
-Group: User Interface/Desktops
-Summary: Graphical interface for configuring wu-ftpd
-Requires: usermode, pam
-Obsoletes: kdeadmin
-
-%description kwuftpd
-KWuftpd is a graphical frontend for configuring the wu-ftpd ftp server.
-
-%package kcmlinuz
-Group: User Interface/Desktops
-Summary: Linux kernel configurator for KDE
-Obsoletes: kdeadmin
-
-%description kcmlinuz
-kcmlinuz is a graphical frontend for creating configuration files for compiling
-kernels.
-
-%package lilo
-Group: User Interface/Desktops
-Summary: Graphical frontend for configuring the LILO bootloader
-Requires: lilo 
-Obsoletes: kdeadmin
-
-%description lilo
-kdeadmin-lilo is a KDE frontend for configuring the LILO bootloader.
-
-%package kisdndock
-Group: User Interface/Desktops
-Summary: KDE dock application for ISDN
-Requires: isdn4k-utils, redhat-config-network
-
-%description kisdndock
-kisdndock is a dock application for managing ISDN connections.
-
-%package -n kxconfig
-Group: User Interface/Desktops
-Summary: X Configuration tool
-
-%description -n kxconfig
-kxconfig is a tool that allows you to configure the X server.
+ kuser - Frontend for configuring users and user groups
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0
+%setup -q
 
 %if ! %{kpackage}
   echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
@@ -237,8 +147,14 @@
   done
 )
 
-# Put in some sane defaults
 %if %{kuser}
+  desktop-file-install \
+    --vendor "" \
+    --dir %{buildroot}%{appdir} \
+    --delete-original \
+    --add-only-show-in KDE \
+    %{buildroot}%{appdir}/kuser.desktop
+# Put in some sane defaults
   mkdir -p %{buildroot}%{_datadir}/config
   cat >%{buildroot}%{_datadir}/config/kuserrc <<EOF
 [template]
@@ -306,16 +222,19 @@
   rm -rf %{buildroot}%{_docdir}/HTML/en/lilo-config
 %endif
 
-desktop-file-install \
-   --vendor "" \
-   --dir %{buildroot}%{appdir} \
-   --delete-original \
-   --add-only-show-in KDE \
-   %{buildroot}%{appdir}/kuser.desktop
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+for icon_theme in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for icon_theme in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
 rm -rf %{buildroot}
@@ -396,6 +315,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 7:3.5.4-1
+- rebuild
+
 * Mon Jul 24 2006 Than Ngo <than at redhat.com> 7:3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 - drop kdeadmin-3.5.2-knetworkconf-fedora.patch, it's include in 3.5.4 upstream


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	2 Jun 2006 20:25:19 -0000	1.35
+++ sources	10 Aug 2006 10:21:46 -0000	1.36
@@ -1 +1 @@
-842e74881c89a719423bbd5cc1f4e226  kdeadmin-3.5.3.tar.bz2
+579a2e3e8e05cf0851a88def57fcc0a3  kdeadmin-3.5.4.tar.bz2


--- kdeadmin-3.5.3-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:23:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:23:22 -0400
Subject: rpms/bcel/devel bcel.spec,1.21,1.22
Message-ID: <200608101023.k7AANMn4020165@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/bcel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20062

Modified Files:
	bcel.spec 
Log Message:
- last release was 333 (typo), need to build 334 now
- Requires(post/postun): coreutils
Installing bcel-javadoc - 5.1-7jpp_333fc.x86_64
/var/tmp/rpm-tmp.22506: line 1: /bin/rm: No such file or directory
/var/tmp/rpm-tmp.22506: line 2: ln: command not found
error: %post(bcel-javadoc-5.1-7jpp_333fc.x86_64) scriptlet failed, exit status 127



Index: bcel.spec
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bcel.spec	24 Jul 2006 04:45:01 -0000	1.21
+++ bcel.spec	10 Aug 2006 10:23:19 -0000	1.22
@@ -45,7 +45,7 @@
 
 Name:           bcel
 Version:        5.1
-Release:        7jpp_333fc
+Release:        7jpp_334fc
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        Apache Software License
@@ -108,6 +108,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):		coreutils
+Requires(postun):	coreutils
 
 %description javadoc
 %{summary}.
@@ -277,6 +279,10 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 5.1-7jpp_334fc
+- last release was 333 (typo), need to build 334 now
+- Requires(post/postun): coreutils
+
 * Mon Jul 23 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp-3fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:27:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:27:27 -0400
Subject: rpms/jakarta-commons-fileupload/devel
	jakarta-commons-fileupload.spec, 1.20, 1.21
Message-ID: <200608101027.k7AARRlP021382@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-commons-fileupload/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21261

Modified Files:
	jakarta-commons-fileupload.spec 
Log Message:
- Requires(post/postun): coreutils
Installing jakarta-commons-fileupload-javadoc - 1:1.0-5jpp_2fc.x86_64
/var/tmp/rpm-tmp.53891: line 1: rm: command not found
/var/tmp/rpm-tmp.53891: line 2: ln: command not found
error: %post(jakarta-commons-fileupload-javadoc-1.0-5jpp_2fc.x86_64) scriptlet failed, exit status 127



Index: jakarta-commons-fileupload.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jakarta-commons-fileupload.spec	22 Jul 2006 08:42:25 -0000	1.20
+++ jakarta-commons-fileupload.spec	10 Aug 2006 10:27:24 -0000	1.21
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0
-Release:        5jpp_2fc
+Release:        5jpp_3fc
 Summary:        Jakarta Commons Fileupload Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -77,6 +77,8 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):		coreutils
+Requires(postun):	coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -169,6 +171,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.0-5jpp_3fc
+- Requires(post/postun): coreutils
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:1.0-5jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:30:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:30:15 -0400
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.49,1.50
Message-ID: <200608101030.k7AAUF70022335@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	xalan-j2.spec 
Log Message:
- Requires(post):     coreutils
Installing xalan-j2-javadoc - 2.7.0-4jpp_4fc.x86_64
/var/tmp/rpm-tmp.81166: line 1: rm: command not found
/var/tmp/rpm-tmp.81166: line 2: ln: command not found
error: %post(xalan-j2-javadoc-2.7.0-4jpp_4fc.x86_64) scriptlet failed, exit status 127



Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xalan-j2.spec	26 Jul 2006 17:14:26 -0000	1.49
+++ xalan-j2.spec	10 Aug 2006 10:30:12 -0000	1.50
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        4jpp_4fc
+Release:        4jpp_5fc
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -113,6 +113,7 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
+Requires(post):		coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -325,6 +326,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 2.7.0-4jpp_5fc
+- Requires(post):     coreutils
+
 * Wed Jul 26 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-4jpp_4fc
 - Extend patch to cover all applicable MANIFEST files in src directory.
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:32:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:32:13 -0400
Subject: rpms/jakarta-commons-launcher/devel jakarta-commons-launcher.spec,
	1.13, 1.14
Message-ID: <200608101032.k7AAWDGp022774@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-commons-launcher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22714

Modified Files:
	jakarta-commons-launcher.spec 
Log Message:
- Requires(post):     coreutils
Installing jakarta-commons-launcher-javadoc - 0.9-5jpp_2fc.x86_64
/var/tmp/rpm-tmp.81166: line 1: rm: command not found
/var/tmp/rpm-tmp.81166: line 2: ln: command not found
error: %post(jakarta-commons-launcher-javadoc-0.9-5jpp_2fc.x86_64) scriptlet failed, exit status 127



Index: jakarta-commons-launcher.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-launcher/devel/jakarta-commons-launcher.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jakarta-commons-launcher.spec	22 Jul 2006 08:42:49 -0000	1.13
+++ jakarta-commons-launcher.spec	10 Aug 2006 10:32:08 -0000	1.14
@@ -39,7 +39,7 @@
 
 Name:           %{name}
 Version:        0.9
-Release:        5jpp_2fc
+Release:        5jpp_3fc
 Epoch:          0
 Summary:        The Launcher Component is designed to be a cross platform Java application launcher.
 License:        Apache Software License
@@ -74,6 +74,7 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
+Requires(post):		coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -153,6 +154,9 @@
 
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 0.9-5jpp_3fc
+- Requires(post):     coreutils
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:0.9-5jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:36:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:36:10 -0400
Subject: rpms/puretls/devel puretls.spec,1.12,1.13
Message-ID: <200608101036.k7AAaA2X023700@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/puretls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23618

Modified Files:
	puretls.spec 
Log Message:
- Requires(post/postun): coreutils
Installing puretls-javadoc - 0.9-0.b5.3jpp_1fc.x86_64
/var/tmp/rpm-tmp.70187: line 1: rm: command not found
/var/tmp/rpm-tmp.70187: line 2: ln: command not found
error: %post(puretls-javadoc-0.9-0.b5.3jpp_1fc.x86_64) scriptlet failed, exit status 127



Index: puretls.spec
===================================================================
RCS file: /cvs/dist/rpms/puretls/devel/puretls.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- puretls.spec	24 Jul 2006 21:23:45 -0000	1.12
+++ puretls.spec	10 Aug 2006 10:36:07 -0000	1.13
@@ -38,7 +38,7 @@
 
 Name:		puretls
 Version:	0.9
-Release:	0.%{beta}.3jpp_1fc
+Release:	0.%{beta}.3jpp_2fc
 Summary:	Java implementation of SSLv3 and TLSv1
 License:	BSD style
 Group:		Development/Libraries/Java
@@ -71,6 +71,8 @@
 %package javadoc
 Group:	Development/Libraries/Java
 Summary:	Javadoc for %{name}
+Requires(post):     coreutils
+Requires(postun):     coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -215,6 +217,9 @@
 #%endif
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 0.9-0.b5.3jpp_2fc
+- Requires(post/postun): coreutils
+
 * Mon Jul 24 2006 Matt Wringe <mwringe at redhat.com> - 0.9-0.b5.3jpp_1fc
 - Merge with upstream version
 - Natively compile packages



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:36:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:36:53 -0400
Subject: rpms/compat-gcc-32/devel gcc32-s390x-compile.patch, NONE,
	1.1 compat-gcc-32.spec, 1.24, 1.25
Message-ID: <200608101036.k7AAarhi023902@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	compat-gcc-32.spec 
Added Files:
	gcc32-s390x-compile.patch 
Log Message:
3.2.3-58

gcc32-s390x-compile.patch:
 builtins.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gcc32-s390x-compile.patch ---
--- gcc/builtins.c.jj	2004-02-28 06:14:54.000000000 -0500
+++ gcc/builtins.c	2006-08-10 06:35:16.000000000 -0400
@@ -41,6 +41,7 @@ Software Foundation, 59 Temple Place - S
 #include "predict.h"
 #include "tm_p.h"
 #include "target.h"
+#include "integrate.h"
 
 #define CALLED_AS_BUILT_IN(NODE) \
    (!strncmp (IDENTIFIER_POINTER (DECL_NAME (NODE)), "__builtin_", 10))


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- compat-gcc-32.spec	10 Aug 2006 09:51:13 -0000	1.24
+++ compat-gcc-32.spec	10 Aug 2006 10:36:50 -0000	1.25
@@ -101,6 +101,7 @@
 
 Patch50: gcc32-obstack-lvalues.patch
 Patch51: gcc32-fc4-compile.patch
+Patch52: gcc32-s390x-compile.patch
 
 Patch100: compat-libstdc++33-incdir.patch
 Patch101: compat-libstdc++33-limits.patch
@@ -190,6 +191,7 @@
 
 %patch50 -p0 -b .obstack-lvalues~
 %patch51 -p0 -b .fc4-compile~
+%patch52 -p0 -b .s390x-compile~
 
 %patch100 -p0 -b .compat-libstdc++33-incdir~
 %patch101 -p0 -b .compat-libstdc++33-limits~



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:38:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:38:00 -0400
Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.11,
	1.12
Message-ID: <200608101038.k7AAc050024182@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-commons-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24098

Modified Files:
	jakarta-commons-daemon.spec 
Log Message:
- Requires(post):     coreutils
Installing jakarta-commons-daemon-javadoc - 1:1.0.1-4jpp_2fc.x86_64
/var/tmp/rpm-tmp.70187: line 1: rm: command not found
/var/tmp/rpm-tmp.70187: line 2: ln: command not found
error: %post(jakarta-commons-daemon-javadoc-1.0.1-4jpp_2fc.x86_64) scriptlet failed, exit status 127



Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jakarta-commons-daemon.spec	22 Jul 2006 08:40:56 -0000	1.11
+++ jakarta-commons-daemon.spec	10 Aug 2006 10:37:56 -0000	1.12
@@ -40,7 +40,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0.1
-Release:        4jpp_2fc
+Release:        4jpp_3fc
 Epoch:          1
 Summary:        Jakarta Commons Daemon Package
 License:        Apache Software License 2.0
@@ -93,6 +93,7 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):		coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -186,6 +187,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.0.1-4jpp_3fc
+- Requires(post):     coreutils
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:1.0.1-4jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:39:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:39:55 -0400
Subject: rpms/classpathx-jaf/devel classpathx-jaf.spec,1.18,1.19
Message-ID: <200608101039.k7AAdteB024729@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/classpathx-jaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24631

Modified Files:
	classpathx-jaf.spec 
Log Message:
- Requires(post):     coreutils
Installing classpathx-jaf-javadoc - 1.0-7jpp_4fc.x86_64
/var/tmp/rpm-tmp.70187: line 1: rm: command not found
/var/tmp/rpm-tmp.70187: line 2: ln: command not found
error: %post(classpathx-jaf-javadoc-1.0-7jpp_4fc.x86_64) scriptlet failed, exit status 127



Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- classpathx-jaf.spec	24 Jul 2006 02:39:11 -0000	1.18
+++ classpathx-jaf.spec	10 Aug 2006 10:39:52 -0000	1.19
@@ -37,7 +37,7 @@
 
 Name:           classpathx-jaf
 Version:        1.0
-Release:        7jpp_4fc
+Release:        7jpp_5fc
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 
@@ -78,6 +78,7 @@
 Provides:       jaf-javadoc = 0:%{jafver}
 Obsoletes:      gnujaf-javadoc <= 0:1.0-0.rc1.1jpp
 BuildRequires:  java-javadoc
+Requires(post):     coreutils
 
 %description    javadoc
 %{summary}.
@@ -169,6 +170,9 @@
 
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.0-7jpp_5fc
+- Requires(post):     coreutils
+
 * Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0-7jpp_4fc
 - Install versionless jaf.jar symlink.
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 10:42:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 06:42:22 -0400
Subject: rpms/jakarta-taglibs-standard/devel jakarta-taglibs-standard.spec,
	1.19, 1.20
Message-ID: <200608101042.k7AAgMOc025291@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/jakarta-taglibs-standard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25216

Modified Files:
	jakarta-taglibs-standard.spec 
Log Message:
- Requires(post): coreutils
Installing jakarta-taglibs-standard-javadoc - 1.1.1-6jpp_2fc.x86_64
/var/tmp/rpm-tmp.70187: line 1: rm: command not found
/var/tmp/rpm-tmp.70187: line 2: ln: command not found
error: %post(jakarta-taglibs-standard-javadoc-1.1.1-6jpp_2fc.x86_64) scriptlet failed, exit status 127



Index: jakarta-taglibs-standard.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jakarta-taglibs-standard.spec	22 Jul 2006 08:43:17 -0000	1.19
+++ jakarta-taglibs-standard.spec	10 Aug 2006 10:42:19 -0000	1.20
@@ -40,7 +40,7 @@
 
 Name:           jakarta-taglibs-standard
 Version:        1.1.1
-Release:        6jpp_2fc
+Release:        6jpp_3fc
 Epoch:          0
 Summary:        An open-source implementation of the JSP Standard Tag Library
 License:        Apache Software License
@@ -78,6 +78,7 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
+Requires(post): coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -165,6 +166,9 @@
 
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.1.1-6jpp_3fc
+- Requires(post): coreutils
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.1.1-6jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 11:07:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 07:07:41 -0400
Subject: rpms/squid/devel squid.spec,1.70,1.71
Message-ID: <200608101107.k7AB7fNw014756@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14648

Modified Files:
	squid.spec 
Log Message:
- added some requirements for pre/post install scripts
Installing squid - 7:2.6.STABLE2-2.fc6.x86_64
error: %pre(squid-2.6.STABLE2-2.fc6.x86_64) scriptlet failed, exit status 1
error:   install: %pre scriptlet failed (2), skipping squid-2.6.STABLE2-2.fc6



Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- squid.spec	4 Aug 2006 12:17:39 -0000	1.70
+++ squid.spec	10 Aug 2006 11:07:32 -0000	1.71
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.6.STABLE2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -36,6 +36,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
 Requires: bash >= 2.0
+Requires(pre): shadow-utils
+Requires(post): chkconfig
 BuildPrereq: openjade linuxdoc-tools openldap-devel pam-devel openssl-devel
 Obsoletes: squid-novm
 
@@ -323,6 +325,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 7:2.6.STABLE2-3
+- added some requirements for pre/post install scripts
+
 * Fri Aug 04 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE2-2
 - added patch for #198253 - squid: don't chgrp another pkg's
   files/directory



From fedora-cvs-commits at redhat.com  Thu Aug 10 12:04:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 08:04:20 -0400
Subject: rpms/kdeartwork/devel .cvsignore, 1.31, 1.32 kdeartwork.spec, 1.51,
	1.52 sources, 1.32, 1.33 kdeartwork-3.5.3-3.5.4.patch, 1.1, NONE
Message-ID: <200608101204.k7AC4KYi001508@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeartwork.spec sources 
Removed Files:
	kdeartwork-3.5.3-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	1 Jun 2006 17:21:24 -0000	1.31
+++ .cvsignore	10 Aug 2006 12:04:17 -0000	1.32
@@ -11,3 +11,4 @@
 kdeartwork-3.5.1.tar.bz2
 kdeartwork-3.5.2.tar.bz2
 kdeartwork-3.5.3.tar.bz2
+kdeartwork-3.5.4.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdeartwork.spec	24 Jul 2006 17:46:06 -0000	1.51
+++ kdeartwork.spec	10 Aug 2006 12:04:17 -0000	1.52
@@ -12,15 +12,13 @@
 
 Name: kdeartwork
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
-Patch0: kdeartwork-3.5.3-3.5.4.patch
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
 
 BuildRequires: perl
@@ -29,12 +27,6 @@
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: glibc-devel
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: libstdc++-devel
-
-Prereq: /sbin/ldconfig
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -53,8 +45,7 @@
 for KDE
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0
+%setup -q
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -89,34 +80,21 @@
 
 mv %{buildroot}%{_datadir}/icons/Locolor %{buildroot}%{_datadir}/icons/locolor
 
-# fix file conflict with other kde packages
-rm -f %{buildroot}%{_datadir}/icons/locolor/*/apps/kig.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspaceduel.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/lskat.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktux.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktimemon.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspreadcalc.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/gvim* \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/kbabel.png \
-      %{buildroot}%{_datadir}/wallpapers/gear-flowers* \
-      %{buildroot}%{_datadir}/wallpapers/fulmine.jpg*
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+# fix file conflict with kdesdk package
+rm -f %{buildroot}%{_datadir}/icons/locolor/*/apps/kbabel.png
 
 %post icons
 for i in locolor ikons kdeclassic kids slick ; do
   touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
-  if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null|| :
+  if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
   fi
 done
 
 %postun icons
 for i in locolor ikons kdeclassic kids slick ; do
   touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
-  if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
   fi
 done
@@ -147,6 +125,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 3.5.4-1
+- rebuild
+
 * Mon Jul 24 2006 Than Ngo <than at redhat.com> 3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	1 Jun 2006 17:21:28 -0000	1.32
+++ sources	10 Aug 2006 12:04:17 -0000	1.33
@@ -1 +1 @@
-e0fc78bee18d81b4595c98964227a06c  kdeartwork-3.5.3.tar.bz2
+c7ff9048b9b68c976de08ed418598e40  kdeartwork-3.5.4.tar.bz2


--- kdeartwork-3.5.3-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 12:08:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 08:08:41 -0400
Subject: rpms/udev/devel udev.spec,1.178,1.179
Message-ID: <200608101208.k7AC8f3k001605@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1591

Modified Files:
	udev.spec 
Log Message:
allow long comments


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- udev.spec	7 Aug 2006 12:59:00 -0000	1.178
+++ udev.spec	10 Aug 2006 12:08:39 -0000	1.179
@@ -23,6 +23,7 @@
 Patch7: udev-089-nopie.patch
 Patch8: udev-089-last_modalias.patch
 Patch9: udev-091-lib64.patch
+Patch10: udev-095-longcomment.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -67,6 +68,7 @@
 %patch7 -p1 -b .nopie
 %patch8 -p1 -b .last_modalias
 %patch9 -p1 -b .lib64
+%patch10 -p1 -b .longcomment
 
 %build
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 12:08:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 08:08:57 -0400
Subject: rpms/udev/devel udev.spec,1.179,1.180
Message-ID: <200608101208.k7AC8v9T001627@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1613

Modified Files:
	udev.spec 
Log Message:
allow long comments


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- udev.spec	10 Aug 2006 12:08:39 -0000	1.179
+++ udev.spec	10 Aug 2006 12:08:54 -0000	1.180
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}



From fedora-cvs-commits at redhat.com  Thu Aug 10 12:09:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 08:09:23 -0400
Subject: rpms/udev/devel udev.spec,1.180,1.181
Message-ID: <200608101209.k7AC9NmJ001677@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1661

Modified Files:
	udev.spec 
Log Message:
allow long comments


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- udev.spec	10 Aug 2006 12:08:54 -0000	1.180
+++ udev.spec	10 Aug 2006 12:09:21 -0000	1.181
@@ -327,6 +327,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Thu Aug 10 2006 Harald Hoyer <harald at redhat.com> - 095-5
+- allow long comments (bug #200244)
+
 * Mon Aug  7 2006 Harald Hoyer <harald at redhat.com> - 095-4
 - fixed CAPI device nodes (bug #139321)
 - fixed bug #201422



From fedora-cvs-commits at redhat.com  Thu Aug 10 12:13:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 08:13:38 -0400
Subject: rpms/udev/devel udev-095-longcomment.patch,NONE,1.1
Message-ID: <200608101213.k7ACDcaT012605@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12570

Added Files:
	udev-095-longcomment.patch 
Log Message:
allow long comments

udev-095-longcomment.patch:
 udev_rules_parse.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE udev-095-longcomment.patch ---
--- udev-095/udev_rules_parse.c.longcomment	2006-07-04 12:34:55.000000000 +0200
+++ udev-095/udev_rules_parse.c	2006-08-10 14:00:58.000000000 +0200
@@ -603,6 +603,10 @@
 		cur += count+1;
 		lineno++;
 
+		/* see if this is a comment */
+		if (bufline[0] == COMMENT_CHARACTER)
+			continue;
+
 		if (count >= sizeof(line)) {
 			err("line too long, rule skipped '%s:%u'", filename, lineno);
 			continue;
@@ -616,10 +620,6 @@
 		if (count == 0)
 			continue;
 
-		/* see if this is a comment */
-		if (bufline[0] == COMMENT_CHARACTER)
-			continue;
-
 		/* skip backslash and newline from multi line rules */
 		for (i = j = 0; i < count; i++) {
 			if (bufline[i] == '\\' && bufline[i+1] == '\n')



From fedora-cvs-commits at redhat.com  Thu Aug 10 12:17:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 08:17:21 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch,
	NONE, 1.1 openoffice.org.spec, 1.825, 1.826
Message-ID: <200608101217.k7ACHL7V024390@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch 
Log Message:
bad graphics mask in x86_64

openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch:
 source/gdi/bmpacc.cxx     |    0 
 vcl/source/gdi/bmpacc.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch ---
Index: source/gdi/bmpacc.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/bmpacc.cxx,v
retrieving revision 1.8
diff -u -r1.8 bmpacc.cxx
--- openoffice.org.orig/vcl/source/gdi/bmpacc.cxx	31 Jan 2006 18:27:25 -0000	1.8
+++ openoffice.org/vcl/source/gdi/bmpacc.cxx	10 Aug 2006 11:54:34 -0000
@@ -265,7 +265,7 @@
 			nMask = SWAPLONG( nMask );
 #endif
 			for( long i = 0; i < nHeight; i++, pLast4Bytes += nScanSize )
-				( *(long*) pLast4Bytes ) &= nMask;
+				( *(sal_uInt32*) pLast4Bytes ) &= nMask;
 		}
 	}
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.825
retrieving revision 1.826
diff -u -r1.825 -r1.826
--- openoffice.org.spec	8 Aug 2006 15:17:53 -0000	1.825
+++ openoffice.org.spec	10 Aug 2006 12:17:18 -0000	1.826
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 9
+%define rh_rpm_release 10
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -130,6 +130,7 @@
 Patch63: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
 Patch64: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
 Patch65: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch66: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -996,6 +997,7 @@
 %patch63 -p1 -b .ooo68018.svx.classpathdialog.patch
 %patch64 -p1 -b .ooo68047.vcl.zwj.patch
 %patch65 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch66 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
 
 tar xzf %{SOURCE1}
 
@@ -2516,6 +2518,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.10
+- rh#201447# -> openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
 - icu settext ownership of string data changed silently
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 12:23:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 08:23:56 -0400
Subject: rpms/kdebindings/devel .cvsignore, 1.30, 1.31 kdebindings.spec, 1.56,
	1.57 sources, 1.31, 1.32 kdebindings-3.5.3-gcc-4.1.1-8.patch,
	1.1, NONE kdebindings-3.5.3-to-3.5.4.patch, 1.1, NONE
Message-ID: <200608101223.k7ACNump030824@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdebindings.spec sources 
Removed Files:
	kdebindings-3.5.3-gcc-4.1.1-8.patch 
	kdebindings-3.5.3-to-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	2 Jun 2006 22:41:53 -0000	1.30
+++ .cvsignore	10 Aug 2006 12:23:53 -0000	1.31
@@ -10,3 +10,4 @@
 kdebindings-3.5.0.tar.bz2
 kdebindings-3.5.1.tar.bz2
 kdebindings-3.5.3.tar.bz2
+kdebindings-3.5.4.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdebindings.spec	26 Jul 2006 14:24:21 -0000	1.56
+++ kdebindings.spec	10 Aug 2006 12:23:53 -0000	1.57
@@ -3,16 +3,9 @@
 
 %define appdir %{_datadir}/applications/kde
 
-## stil need fix to build java -> disable java at the moment
-##define support_arch %{ix86} alpha ia64 ppc
-%define support_arch none
-
-%define mozilla_archs %{ix86} ppc s390 s390x x86_64
-
 %{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
-%define mozilla_version 1.7.10
 %define qt_version 3.3.6
-%define arts_version 1.5.3
+%define arts_version 1.5.4
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define perlver 5.8
@@ -26,24 +19,20 @@
 %define pyqt 0
 
 Version: 3.5.4
-Release: 0.pre2%{?dist}
+Release: 1%{?dist}
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
 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}-3.5.3.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
-Patch0: kdebindings-3.5.3-to-3.5.4.patch
 Patch4: kdebindings-3.1-ssl-krb5.patch
 Patch6: kdebindings-3.1-python2.4.patch
 Patch7: kde-libtool.patch
 Patch8: kdebindings-3.3.0-python.patch
 Patch9: kdebindings-3.3.92-xdg.patch
-Patch10: kdebindings-3.5.3-gcc-4.1.1-8.patch
 
 BuildRequires: zlib-devel
 BuildRequires: kdelibs-devel
@@ -53,7 +42,7 @@
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: libtool
-BuildRequires: /usr/bin/desktop-file-install
+BuildRequires: desktop-file-utils
 
 %if %{perl}
 BuildRequires: perl >= %{perlver}
@@ -72,7 +61,8 @@
 Requires: ruby >= %{rubyver}
 %endif
 
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 
@@ -91,22 +81,11 @@
 Install %{name}-devel if you want to develop non-KDE
 applications that talk to KDE.
 
-%ifarch %{mozilla_archs}
-%package kmozilla
-Summary: KDE bindings to mozilla
-Group: User Interface/Desktops
-Requires: mozilla
-Requires: kdebase >= %{kdebase_epoch}:%{version}
-
-%description kmozilla
-KDE bindings to mozilla - embed Mozilla in Konqueror
-%endif
-
 %package perl
 Summary: Perl bindings to DCOP
 Group: Development/Libraries
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: perl >= 5.6.0
+Requires: perl >= %{perlver}
 
 %description perl
 Perl bindings to the DCOP interprocess communication protocol used by KDE
@@ -120,60 +99,10 @@
 %description python
 Python bindings to the DCOP interprocess communication protocol used by KDE
 
-%ifarch %{support_arch}
-%package qtjava
-Summary: Java bindings to Qt
-Group: System Environment/Libraries
-Requires: qt >= %{qt_version}
-Requires: libgcj >= 3.1
-Requires: jdkgcj >= 0.2.2
-BuildRequires: gcc-java >= 3.1
-BuildRequires: libgcj >= 3.1
-BuildRequires: jdkgcj >= 0.2.2
-
-%description qtjava
-Java bindings to Qt.
-%endif
-
-%package qtc
-Summary: C bindings to Qt
-Group: System Environment/Libraries
-Requires: qt >= 1:%{qt_version}
-
-%description qtc
-C bindings to Qt.
-Install kdebindings-qtc if you wish to develop Qt applications
-in C (rather than C++).
-
-%package kdec
-Summary: C bindings to KDE
-Group: System Environment/Libraries
-Requires: qt >= 1:%{qt_version}
-Requires: %{name}-qtc >= 3.0.2
-
-%description kdec
-C bindings to KDE.
-Install kdebindings-kdec if you wish to develop Qt applications
-in C (rather than C++).
-
-%ifarch %{support_arch}
-%package kdejava
-Summary: Java bindings to KDE
-Group: Development/Libraries
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: kdebindings-qtjava = %{version}-%{release}
-Requires: libgcj
-
-%description kdejava
-Java bindings to KDE
-%endif
-
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0 -b .kde3.5.4
+%setup -q
 %patch4 -p1 -b .ssl-krb5
 %patch6 -p1 -b .python2
-%patch7 -p1 -b .libtool
 
 # don't build sip/pyqt, we have separates packages
 %if %{pyqt} == 0
@@ -181,21 +110,10 @@
 rm -rf python
 %endif
 %patch9 -p1 -b .xdg
-#%patch10 -p1 -b .gcc-4.1.1-8
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
 
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-
-%ifarch %{support_arch}
-export CFLAGS="$CFLAGS `mozilla-config --cflags`"
-export CXXFLAGS="$CXXFLAGS `mozilla-config --cflags`"
-export CPPFLAGS="$CPPFLAGS `mozilla-config --cflags`"
-export LDFLAGS="$LDFLAGS `mozilla-config --libs`"
-%endif
-
 make -f admin/Makefile.common cvs
 
 suffix=""
@@ -221,11 +139,7 @@
    --disable-debug \
    --disable-warnings \
 %endif
-%ifarch %{support_arch}
-   --with-java=%{prefix}
-%else
    --without-java
-%endif
 
 make #%{?_smp_mflags}
 
@@ -245,9 +159,17 @@
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
@@ -269,10 +191,6 @@
 %{_libdir}/python*
 %endif
 %{_libdir}/perl5
-%ifarch %{support_arch}
-%{_libdir}/java
-%doc %{_docdir}/javalib
-%endif
 
 %files devel
 %defattr(-,root,root)
@@ -280,6 +198,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 3.5.4-1
+- rebuild
+
 * Wed Jul 26 2006 Petr Rockai <prockai at redhat.com> - 3.5.4-0.pre2
 - drop the gcc/g++ workaround, fixed in gcc already
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	2 Jun 2006 22:41:53 -0000	1.31
+++ sources	10 Aug 2006 12:23:53 -0000	1.32
@@ -1 +1 @@
-5595b2de6593d1d535ba520abeab4580  kdebindings-3.5.3.tar.bz2
+097eb4311f5715f36fdc83dc5badb476  kdebindings-3.5.4.tar.bz2


--- kdebindings-3.5.3-gcc-4.1.1-8.patch DELETED ---


--- kdebindings-3.5.3-to-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 12:27:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 08:27:35 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.15, 1.16 setroubleshoot.init,
	1.4, 1.5 setroubleshoot.spec, 1.19, 1.20 sources, 1.17, 1.18
Message-ID: <200608101227.k7ACRZFC032033@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31996/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.20-1 on branch devel from setroubleshoot-0.20-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	8 Aug 2006 17:20:59 -0000	1.15
+++ .cvsignore	10 Aug 2006 12:27:33 -0000	1.16
@@ -1 +1 @@
-setroubleshoot-0.19.tar.gz
+setroubleshoot-0.20.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- setroubleshoot.init	6 Aug 2006 00:22:32 -0000	1.4
+++ setroubleshoot.init	10 Aug 2006 12:27:33 -0000	1.5
@@ -88,7 +88,7 @@
 	stop
 	;;
     status)
-	status $prog
+	status $exe
 	;;
     restart)
 	restart


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- setroubleshoot.spec	8 Aug 2006 17:20:59 -0000	1.19
+++ setroubleshoot.spec	10 Aug 2006 12:27:33 -0000	1.20
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.19
+Version: 0.20
 Release: 1
 License: GPL
 Group: Applications/System
@@ -22,9 +22,7 @@
 %define pkgrundir     %{_localstatedir}/run/%{name}
 %define pkgconfigdir  %{_sysconfdir}/%{name}
 %define pkglogdir     %{_localstatedir}/log/%{name}
-%define auditlibdir   %{_libdir}/audit
 
-Requires: audit-libs-python >= 1.2.5-6
 Requires: libselinux >= 1.30.15-1
 Requires: pygtk2 >= 2.9.2
 Requires: notify-python
@@ -80,7 +78,6 @@
 %doc %{pkgdocdir}
 %{_bindir}/*
 %{_sbindir}/*
-%{auditlibdir}/*
 %{pkgpythondir}
 %{pkgdatadir}
 %config(noreplace) %{pkgconfigdir}/%{name}.cfg
@@ -94,6 +91,9 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> - 0.20-1
+	* add html support
+	* remove setroubleshoot_dispatcher
 
 * Tue Aug 8 2006 Dan Walsh <dwalsh at redhat.com> - 0.19-1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	8 Aug 2006 17:20:59 -0000	1.17
+++ sources	10 Aug 2006 12:27:33 -0000	1.18
@@ -1 +1 @@
-85bf0e61214dac42eca4e86ab1360eec  setroubleshoot-0.19.tar.gz
+a1b811663282fcaf926dbbdfcb663cd8  setroubleshoot-0.20.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 10 12:29:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 08:29:07 -0400
Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec,1.25,1.26
Message-ID: <200608101229.k7ACT7AM032585@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	compat-gcc-32.spec 
Log Message:
3.2.3-59


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- compat-gcc-32.spec	10 Aug 2006 10:36:50 -0000	1.25
+++ compat-gcc-32.spec	10 Aug 2006 12:29:05 -0000	1.26
@@ -1,7 +1,7 @@
 %define LIBSTDCXXDATE 20040818
 %define DATE 20040701
 %define gcc_version 3.2.3
-%define gcc_release 58
+%define gcc_release 59
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define build_java 0
@@ -363,7 +363,7 @@
   mv -f $i ${i}32
 done
 
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib*/libiberty.a
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib*/{libiberty.a,*/libiberty.a}
 rm -f $RPM_BUILD_ROOT/lib*/libgcc_s*
 
 %ifarch %{multilib_64_archs}
@@ -377,7 +377,7 @@
 %endif
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/{lib/gcc,libexec/gcc,bin,include}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/{lib/gcc-lib,bin,include}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -391,6 +391,9 @@
 %{_prefix}/%{_lib}/libstdc++.so.5*
 
 %changelog
+* Thu Aug 10 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-59
+- fix cleaning up the buildroot before debuginfo generation
+
 * Thu Aug 10 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-58
 - include only compat-libstdc++-33 subpackage
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 12:36:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 08:36:19 -0400
Subject: rpms/kdeedu/devel .cvsignore, 1.28, 1.29 kdeedu.spec, 1.51,
	1.52 sources, 1.30, 1.31 kdeedu-3.5.3-3.5.4.patch, 1.1, NONE
Message-ID: <200608101236.k7ACaJof001819@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeedu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1768

Modified Files:
	.cvsignore kdeedu.spec sources 
Removed Files:
	kdeedu-3.5.3-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	2 Jun 2006 23:23:15 -0000	1.28
+++ .cvsignore	10 Aug 2006 12:36:15 -0000	1.29
@@ -12,3 +12,4 @@
 kdeedu-3.5.1.tar.bz2
 kdeedu-3.5.2.tar.bz2
 kdeedu-3.5.3.tar.bz2
+kdeedu-3.5.4.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdeedu.spec	24 Jul 2006 15:52:29 -0000	1.51
+++ kdeedu.spec	10 Aug 2006 12:36:16 -0000	1.52
@@ -11,27 +11,29 @@
 
 Name: kdeedu
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group: User Interface/Desktops
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
-Patch0: kdeedu-3.5.3-3.5.4.patch
 Patch1: kde-libtool.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: qt >= %{qt_epoch}:%{qt_version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 BuildRequires: kdebase-devel
 BuildRequires: perl
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: gettext
 
 Obsoletes: keduca
 Obsoletes: kig
@@ -61,8 +63,7 @@
 This package contains header files for kdeedu.
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0
+%setup -q
 
 %ifarch s390 s390x ppc ppc64
   rm -rf doc/kstars kstars
@@ -108,9 +109,22 @@
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -133,6 +147,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 3.5.4-1
+- rebuild
+
 * Mon Jul 24 2006 Than Ngo <than at redhat.com> 3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	2 Jun 2006 23:23:15 -0000	1.30
+++ sources	10 Aug 2006 12:36:16 -0000	1.31
@@ -1 +1 @@
-5c9cb7f25c8627772d6de5a3ed550691  kdeedu-3.5.3.tar.bz2
+81dfdea2ed6eaaa440ee868a69b8fc7e  kdeedu-3.5.4.tar.bz2


--- kdeedu-3.5.3-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 12:37:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 08:37:22 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.115,
	1.116 openoffice.org.spec, 1.826, 1.827 sources, 1.188, 1.189
Message-ID: <200608101237.k7ACbMnb002094@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
add pa-IN updates


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- .cvsignore	5 Aug 2006 12:21:30 -0000	1.115
+++ .cvsignore	10 Aug 2006 12:37:19 -0000	1.116
@@ -179,3 +179,4 @@
 OOC680_m6.tar.bz2
 OOC680_m7.tar.bz2
 openoffice.org.langpack.template.tar.gz
+pa-IN-179.sdf


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -r1.826 -r1.827
--- openoffice.org.spec	10 Aug 2006 12:17:18 -0000	1.826
+++ openoffice.org.spec	10 Aug 2006 12:37:19 -0000	1.827
@@ -47,6 +47,7 @@
 Source11:       AutoSaveCommon.xcu
 Source12:       ooo64726.sdf
 Source13:       openoffice.org.langpack.template.tar.gz
+Source14:       pa-IN-179.sdf
 BuildRequires:	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
 BuildRequires:	autoconf, make >= 3.79.1, flex, bison, perl-Compress-Zlib
 BuildRequires:	gcc, gcc-c++ >= 4.1.1, binutils, gcc-java >= 4.1.1 
@@ -1063,6 +1064,7 @@
 deliver -link
 localize -m -x -l ga -f %{SOURCE5}
 localize -m -x -l bn -f %{SOURCE12}
+localize -m -x -l pa-IN -f %{SOURCE14}
 cd ../..
 
 cd instsetoo_native/util


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- sources	5 Aug 2006 12:21:30 -0000	1.188
+++ sources	10 Aug 2006 12:37:19 -0000	1.189
@@ -12,3 +12,4 @@
 156fca901e2850226f16dd5034b6c941  openoffice.org-simple-crash_report.sh
 927a894d9bb8b8753c8e536ce8a671ab  OOC680_m7.tar.bz2
 0ee333127e54353d49bf30aa112faee4  openoffice.org.langpack.template.tar.gz
+3aabcb294c648747551d702316c88580  pa-IN-179.sdf



From fedora-cvs-commits at redhat.com  Thu Aug 10 13:02:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 09:02:32 -0400
Subject: rpms/s390utils/devel s390utils.spec,1.44,1.45
Message-ID: <200608101302.k7AD2W95024597@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24521

Modified Files:
	s390utils.spec 
Log Message:
- Added missing sysfsutils requirement for lszfcp (#201863)



Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- s390utils.spec	25 Jul 2006 12:42:09 -0000	1.44
+++ s390utils.spec	10 Aug 2006 13:02:30 -0000	1.45
@@ -3,7 +3,7 @@
 Summary: Linux/390 specific utilities.
 Name: s390utils
 Version: 1.5.3
-Release: 7
+Release: 8
 Epoch: 2
 License: GPL
 Group: System Environment/Base
@@ -25,8 +25,9 @@
 Patch20: cmsfs-1.1.8-kernel26.patch
 Patch40: src_vipa-2.0.3.-asm.patch
 BuildRoot: /var/tmp/%{name}-root
+Requires: sysfsutils
 BuildRequires: libsysfs-devel indent zlib-devel net-snmp-devel
-ExclusiveArch: s390 s390x
+#ExclusiveArch: s390 s390x
 %define _sbindir /sbin
 
 %description
@@ -153,6 +154,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Thu Aug 10 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-8
+- Added missing sysfsutils requirement for lszfcp (#201863)
+
 * Tue Jul 25 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-7
 - Included zfcpdbf, dbginfo.sh and the man1 manpages to package (#184812)
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 13:04:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 09:04:42 -0400
Subject: rpms/tar/devel tar-1.15.90-xattrSupport.patch, NONE, 1.1 tar.spec,
	1.41, 1.42
Message-ID: <200608101304.k7AD4g4j025052@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24997

Modified Files:
	tar.spec 
Added Files:
	tar-1.15.90-xattrSupport.patch 
Log Message:
add xattr support (#200925), patch from james.antill at redhat.com


tar-1.15.90-xattrSupport.patch:
 src/xattrs.c                |  240 +++++++++++++++++++++++++++++++++++
 src/xattrs.h                |   14 ++
 tar-1.15.90/configure.ac    |    7 +
 tar-1.15.90/doc/tar.texi    |   47 ++++++
 tar-1.15.90/src/Makefile.am |    7 -
 tar-1.15.90/src/Makefile.in |    2 
 tar-1.15.90/src/common.h    |   18 ++
 tar-1.15.90/src/create.c    |   24 +++
 tar-1.15.90/src/extract.c   |   47 ++++++
 tar-1.15.90/src/list.c      |    5 
 tar-1.15.90/src/tar.c       |   79 +++++++++++
 tar-1.15.90/src/tar.h       |   17 ++
 tar-1.15.90/src/xheader.c   |  299 ++++++++++++++++++++++++++++++++++----------
 13 files changed, 735 insertions(+), 71 deletions(-)

--- NEW FILE tar-1.15.90-xattrSupport.patch ---
diff -rup tar-1.15.90-orig/configure.ac tar-1.15.90/configure.ac
--- tar-1.15.90-orig/configure.ac	2006-02-19 14:29:18.000000000 -0500
+++ tar-1.15.90/configure.ac	2006-08-03 18:09:38.000000000 -0400
@@ -89,6 +89,11 @@ tar_GNULIB
 tar_PAXUTILS
 
 AC_CHECK_FUNCS(fsync lstat mkfifo readlink strerror symlink setlocale utimes)
+AC_CHECK_FUNCS(getxattr  fgetxattr  lgetxattr \
+               setxattr  fsetxattr  lsetxattr \
+               listxattr flistxattr llistxattr,
+               AC_DEFINE(HAVE_XATTRS,,[Define if we have a working extended attributes]),)
+AC_CHECK_LIB(selinux, getfilecon)
 AC_CHECK_DECLS([getgrgid],,, [#include <grp.h>])
 AC_CHECK_DECLS([getpwuid],,, [#include <pwd.h>])
 AC_CHECK_DECLS([time],,, [#include <time.h>])
@@ -204,6 +209,8 @@ AC_DEFINE_UNQUOTED(DEFAULT_QUOTING_STYLE
 # Iconv
 AM_ICONV
 AC_CHECK_HEADERS(iconv.h)
+AC_CHECK_HEADERS(selinux/selinux.h)
+AC_CHECK_HEADERS(attr/xattr.h)
 AC_CHECK_TYPE(iconv_t,:,
               AC_DEFINE(iconv_t, int,
                         [Conversion descriptor type]),
diff -rup tar-1.15.90-orig/doc/tar.texi tar-1.15.90/doc/tar.texi
--- tar-1.15.90-orig/doc/tar.texi	2006-02-19 14:29:18.000000000 -0500
+++ tar-1.15.90/doc/tar.texi	2006-08-03 18:09:38.000000000 -0400
@@ -6929,6 +6929,8 @@ implementation able to read @samp{ustar}
 most @samp{posix} archives as well, with the only exception that any
 additional information (such as long file names etc.) will in such
 case be extracted as plain text files along with the files it refers to.
+This is the only format that can store ACLs, SELinux context and extended
+attributes.
 
 This archive format will be the default format for future versions
 of @GNUTAR{}.
@@ -7620,6 +7622,51 @@ It is equivalent to @option{--same-permi
 
 @FIXME{I do not see the purpose of such an option.  (Neither I.  FP.)}
 
+ at opindex acls
+ at item --acls
+This option causes @command{tar} to store the current ACL in the archive.
+
+The @option{--acls} option has no equivalent short option name.
+
+ at opindex selinux
+ at item --selinux
+This option causes @command{tar} to store the current SELinux security context
+information in the archive.
+
+The @option{--selinux} option has no equivalent short option name.
+
+ at opindex xattrs
+ at item --xattrs
+This option causes @command{tar} to store the current extended attributes in
+the archive. This option also enables @option{--acls} and @option{--selinux} if
+they haven't been set already.
+
+The @option{--xattrs} option has no equivalent short option name.
+
+ at opindex no-acls
+ at item --no-acls
+This option causes @command{tar} not to store the current ACL in the archive
+and not to extract any ACL information in an archive.
+
+The @option{--acls} option has no equivalent short option name.
+
+ at opindex no-selinux
+ at item --no-selinux
+This option causes @command{tar} not to store the current SELinux security
+context information in the archive and not to extract any SELinux information in
+an archive.
+
+The @option{--selinux} option has no equivalent short option name.
+
+ at opindex xattrs
+ at item --xattrs
+This option causes @command{tar} not to store the current extended attributes in
+the archive and not to extract any extended attributes in an archive. This
+option also enables @option{--acls} and @option{--selinux} if
+they haven't been set already.
+
+The @option{--xattrs} option has no equivalent short option name.
+
 @end table
 
 @node Standard
diff -rup tar-1.15.90-orig/src/common.h tar-1.15.90/src/common.h
--- tar-1.15.90-orig/src/common.h	2006-02-19 14:29:18.000000000 -0500
+++ tar-1.15.90/src/common.h	2006-08-03 18:09:38.000000000 -0400
@@ -232,6 +232,15 @@ GLOBAL int same_owner_option;
 /* If positive, preserve permissions when extracting.  */
 GLOBAL int same_permissions_option;
 
+/* If positive, save the SELinux context.  */
+GLOBAL int selinux_context_option;
+
+/* If positive, save the ACLs.  */
+GLOBAL int acls_option;
+
+/* If positive, save the user and root xattrs.  */
+GLOBAL int xattrs_option;
+
 /* When set, strip the given number of file name components from the file name
    before extracting */
 GLOBAL size_t strip_name_components;
@@ -637,6 +646,9 @@ extern char *output_start;
 
 void update_archive (void);
 
+/* Module attrs.c.  */
+#include "xattrs.h"
+
 /* Module xheader.c.  */
 
 void xheader_decode (struct tar_stat_info *);
@@ -658,6 +670,12 @@ void xheader_string_end (char const *key
 bool xheader_keyword_deleted_p (const char *kw);
 char *xheader_format_name (struct tar_stat_info *st, const char *fmt,
 			   size_t n);
+void xheader_xattr_init(struct tar_stat_info *st);
+void xheader_xattr_free(struct xattr_array *vals, size_t sz);
+void xheader_xattr_copy(const struct tar_stat_info *st,
+                        struct xattr_array **vals, size_t *sz);
+void xheader_xattr_add(struct tar_stat_info *st,
+                       const char *key, const char *val, size_t len);
 
 /* Module system.c */
 
diff -rup tar-1.15.90-orig/src/create.c tar-1.15.90/src/create.c
--- tar-1.15.90-orig/src/create.c	2006-07-27 15:04:48.000000000 -0400
+++ tar-1.15.90/src/create.c	2006-08-03 18:09:38.000000000 -0400
@@ -24,6 +24,7 @@
 #include <quotearg.h>
 
 #include "common.h"
+
 #include <hash.h>
 
 struct link
@@ -833,6 +834,25 @@ start_header (struct tar_stat_info *st)
       GNAME_TO_CHARS (st->gname, header->header.gname);
     }
 
+  if (archive_format == POSIX_FORMAT)
+    {
+      if (acls_option > 0)
+        xheader_store ("SCHILY.xattr.system.posix_acl_access", st, NULL);
+      if (selinux_context_option > 0)
+        xheader_store ("SCHILY.xattr.security.selinux", st, NULL);
+      if (xattrs_option > 0)
+        {
+          size_t scan_xattr = 0;
+          struct xattr_array *xattr_map = st->xattr_map;
+          
+          while (scan_xattr < st->xattr_map_size)
+            {
+              xheader_store (xattr_map[scan_xattr].xkey, st, &scan_xattr);
+              ++scan_xattr;
+            }
+        }
+    }
+
   return header;
 }
 
@@ -1484,6 +1504,10 @@ dump_file0 (struct tar_stat_info *st, ch
 		open_diag (p);
 	      return;
 	    }
+
+          xattrs_acls_get(st, p, fd);
+          xattrs_selinux_get(st, p, fd);
+          xattrs_xattrs_get(st, p, fd);
 	}
 
       if (is_dir)
diff -rup tar-1.15.90-orig/src/extract.c tar-1.15.90/src/extract.c
--- tar-1.15.90-orig/src/extract.c	2006-07-27 15:04:48.000000000 -0400
+++ tar-1.15.90/src/extract.c	2006-08-03 18:11:15.000000000 -0400
@@ -68,6 +68,11 @@ struct delayed_set_stat
     mode_t invert_permissions;
     enum permstatus permstatus;
     bool after_links;
+    char *cntx_name;
+    char *acls_ptr;
+    size_t acls_len;
+    size_t xattr_map_size;   /* Size of the xattr map */
+    struct xattr_array *xattr_map;
     char file_name[1];
   };
 
@@ -95,6 +100,16 @@ struct delayed_link
        hard-linked together.  */
     struct string_list *sources;
 
+    /* SELinux context */
+    char *cntx_name;
+   
+    /* ACLs */
+    char *acls_ptr;
+    size_t acls_len;
+   
+    size_t xattr_map_size;   /* Size of the xattr map */
+    struct xattr_array *xattr_map;
+   
     /* The desired target of the desired link.  */
     char target[1];
   };
@@ -272,6 +287,10 @@ set_stat (char const *file_name,
 		invert_permissions, permstatus, typeflag);
     }
 
+  xattrs_acls_set(st, file_name, typeflag);
+  xattrs_selinux_set(st, file_name, typeflag);
+  xattrs_xattrs_set(st, file_name, typeflag);
+
   if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS)
     {
       /* When lchown exists, it should be used to change the attributes of
@@ -341,6 +360,16 @@ delay_set_stat (char const *file_name, s
   data->invert_permissions = invert_permissions;
   data->permstatus = permstatus;
   data->after_links = 0;
+  data->cntx_name = NULL;
+  assign_string (&data->cntx_name, st->cntx_name);
+  if (st->acls_ptr)
+    data->acls_ptr = xmemdup(st->acls_ptr, st->acls_len);
+  else
+    {
+      data->acls_ptr = NULL;
+      data->acls_len = 0;
+    }
+  xheader_xattr_copy (st, &data->xattr_map, &data->xattr_map_size);
   strcpy (data->file_name, file_name);
   delayed_set_stat_head = data;
 }
@@ -588,11 +617,19 @@ apply_nonancestor_delayed_set_stat (char
 	  st.stat.st_gid = data->gid;
 	  st.atime = data->atime;
 	  st.mtime = data->mtime;
+          st.cntx_name = data->cntx_name;
+          st.acls_ptr = data->acls_ptr;
+          st.acls_len = data->acls_len;
+          st.xattr_map = data->xattr_map;
+          st.xattr_map_size = data->xattr_map_size;
 	  set_stat (data->file_name, &st, cur_info,
 		    data->invert_permissions, data->permstatus, DIRTYPE);
 	}
 
       delayed_set_stat_head = data->next;
+      xheader_xattr_free (data->xattr_map, data->xattr_map_size);
+      free (data->cntx_name);
+      free (data->acls_ptr);
       free (data);
     }
 }
@@ -866,6 +903,11 @@ create_placeholder_file (char *file_name
 			    + strlen (file_name) + 1);
       p->sources->next = 0;
       strcpy (p->sources->string, file_name);
+      p->cntx_name = NULL;
+      p->acls_ptr = NULL;
+      p->acls_len = 0;
+      p->xattr_map = NULL;
+      p->xattr_map_size = 0;
       strcpy (p->target, current_stat_info.link_name);
 
       h = delayed_set_stat_head;
@@ -1284,6 +1326,11 @@ apply_delayed_links (void)
 		  struct tar_stat_info st1;
 		  st1.stat.st_uid = ds->uid;
 		  st1.stat.st_gid = ds->gid;
+                  st1.cntx_name = ds->cntx_name;
+                  st1.acls_ptr = ds->acls_ptr;
+                  st1.acls_len = ds->acls_len;
+                  st1.xattr_map = ds->xattr_map;
+                  st1.xattr_map_size = ds->xattr_map_size;
 		  set_stat (source, &st1, NULL, 0, 0, SYMTYPE);
 		  valid_source = source;
 		}
diff -rup tar-1.15.90-orig/src/list.c tar-1.15.90/src/list.c
--- tar-1.15.90-orig/src/list.c	2006-07-27 15:04:48.000000000 -0400
+++ tar-1.15.90/src/list.c	2006-08-03 18:09:38.000000000 -0400
@@ -519,6 +519,11 @@ decode_header (union block *header, stru
   assign_string (&stat_info->gname,
 		 header->header.gname[0] ? header->header.gname : NULL);
 
+  stat_info->acls_ptr = NULL;
+  stat_info->acls_len = 0;
+  stat_info->cntx_name = NULL;
+  xheader_xattr_init(stat_info);
+  
   if (format == OLDGNU_FORMAT && incremental_option)
     {
       stat_info->atime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.atime);
diff -rup tar-1.15.90-orig/src/Makefile.am tar-1.15.90/src/Makefile.am
--- tar-1.15.90-orig/src/Makefile.am	2005-05-18 08:23:49.000000000 -0400
+++ tar-1.15.90/src/Makefile.am	2006-08-03 18:09:38.000000000 -0400
@@ -20,7 +20,7 @@
 
 bin_PROGRAMS = tar
 
-noinst_HEADERS = arith.h common.h tar.h
+noinst_HEADERS = arith.h common.h tar.h xattrs.h
 tar_SOURCES = \
  buffer.c\
  compare.c\
@@ -37,7 +37,8 @@ tar_SOURCES = \
  system.c\
  tar.c\
  update.c\
- utf8.c
+ utf8.c\
+ xattrs.c
 
 INCLUDES = -I$(top_srcdir)/lib -I../ -I../lib 
 
@@ -45,4 +46,4 @@ tar.o: ../lib/localedir.h
 
 LDADD = ../lib/libtar.a $(LIBINTL) $(LIBICONV)
 
-tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME)
diff -rup tar-1.15.90-orig/src/Makefile.in tar-1.15.90/src/Makefile.in
--- tar-1.15.90-orig/src/Makefile.in	2006-02-19 15:44:43.000000000 -0500
+++ tar-1.15.90/src/Makefile.in	2006-08-03 18:09:38.000000000 -0400
@@ -285,7 +285,7 @@ tar_SOURCES = \
 
 INCLUDES = -I$(top_srcdir)/lib -I../ -I../lib 
 LDADD = ../lib/libtar.a $(LIBINTL) $(LIBICONV)
-tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) -lselinux
 all: all-am
 
 .SUFFIXES:
diff -rup tar-1.15.90-orig/src/tar.c tar-1.15.90/src/tar.c
--- tar-1.15.90-orig/src/tar.c	2006-02-19 14:29:18.000000000 -0500
+++ tar-1.15.90/src/tar.c	2006-08-03 18:09:38.000000000 -0400
@@ -244,7 +244,8 @@ tar_set_quoting_style (char *arg)
 
 enum
 {
-  ANCHORED_OPTION = CHAR_MAX + 1,
+  ACLS_OPTION = CHAR_MAX + 1,
+  ANCHORED_OPTION,
   ATIME_PRESERVE_OPTION,
   BACKUP_OPTION,
   CHECKPOINT_OPTION,
@@ -263,6 +264,7 @@ enum
   KEEP_NEWER_FILES_OPTION,
   MODE_OPTION,
   NEWER_MTIME_OPTION,
+  NO_ACLS_OPTION,
   NO_ANCHORED_OPTION,
   NO_DELAY_DIRECTORY_RESTORE_OPTION,
   NO_IGNORE_CASE_OPTION,
@@ -272,9 +274,11 @@ enum
   NO_RECURSION_OPTION,
   NO_SAME_OWNER_OPTION,
   NO_SAME_PERMISSIONS_OPTION,
+  NO_SELINUX_CONTEXT_OPTION,
   NO_UNQUOTE_OPTION,
   NO_WILDCARDS_MATCH_SLASH_OPTION,
   NO_WILDCARDS_OPTION,
+  NO_XATTR_OPTION,
   NULL_OPTION,
   NUMERIC_OWNER_OPTION,
   OCCURRENCE_OPTION,
@@ -295,6 +299,7 @@ enum
   RMT_COMMAND_OPTION,
   RSH_COMMAND_OPTION,
   SAME_OWNER_OPTION,
+  SELINUX_CONTEXT_OPTION,
   SHOW_DEFAULTS_OPTION,
   SHOW_OMITTED_DIRS_OPTION,
   SHOW_STORED_NAMES_OPTION,
@@ -310,7 +315,8 @@ enum
   VERSION_OPTION,
   VOLNO_FILE_OPTION,
   WILDCARDS_MATCH_SLASH_OPTION,
-  WILDCARDS_OPTION
+  WILDCARDS_OPTION,
+  XATTR_OPTION
 };
 
 const char *argp_program_version = "tar (" PACKAGE_NAME ") " VERSION;
@@ -430,6 +436,10 @@ static struct argp_option options[] = {
   {NULL, 0, NULL, 0,
    N_("Handling of file attributes:"), GRID },
 
+  {"acls", ACLS_OPTION, 0, 0, 
+   N_("Save the ACLs to the archive"), GRID+1 },
+  {"no-acls", NO_ACLS_OPTION, 0, 0, 
+   N_("Don't extract the ACLs from the archive"), GRID+1 },
   {"owner", OWNER_OPTION, N_("NAME"), 0,
    N_("force NAME as owner for added files"), GRID+1 },
   {"group", GROUP_OPTION, N_("NAME"), 0,
@@ -458,6 +468,14 @@ static struct argp_option options[] = {
   {"preserve-order", 's', 0, 0,
    N_("sort names to extract to match archive"), GRID+1 },
   {"same-order", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
+  {"selinux", SELINUX_CONTEXT_OPTION, 0, 0, 
+   N_("Save the SELinux context to the archive"), GRID+1 },
+  {"no-selinux", NO_SELINUX_CONTEXT_OPTION, 0, 0, 
+   N_("Don't extract the SELinux context from the archive"), GRID+1 },
+  {"xattrs", XATTR_OPTION, 0, 0, 
+   N_("Save the user/root xattrs to the archive"), GRID+1 },
+  {"no-xattrs", NO_XATTR_OPTION, 0, 0, 
+   N_("Don't extract the user/root xattrs from the archive"), GRID+1 },
   {"preserve", PRESERVE_OPTION, 0, 0,
    N_("same as both -p and -s"), GRID+1 },
   {"delay-directory-restore", DELAY_DIRECTORY_RESTORE_OPTION, 0, 0,
@@ -1513,6 +1531,37 @@ parse_opt (int key, char *arg, struct ar
       same_permissions_option = -1;
       break;
 
+    case ACLS_OPTION:
+      set_archive_format ("posix");
+      acls_option = 1;
+      break;
+
+    case NO_ACLS_OPTION:
+      acls_option = -1;
+      break;
+
+    case SELINUX_CONTEXT_OPTION:
+      set_archive_format ("posix");
+      selinux_context_option = 1;
+      break;
+
+    case NO_SELINUX_CONTEXT_OPTION:
+      selinux_context_option = -1;
+      break;
+
+    case XATTR_OPTION:
+      set_archive_format ("posix");
+      if (!acls_option) acls_option = 1;
+      if (!selinux_context_option) selinux_context_option = 1;
+      xattrs_option = 1;
+      break;
+
+    case NO_XATTR_OPTION:
+      if (!acls_option) acls_option = -1;
+      if (!selinux_context_option) selinux_context_option = -1;
+      xattrs_option = -1;
+      break;
+
     case RECURSION_OPTION:
       recursion_option = FNM_LEADING_DIR;
       break;
@@ -1921,6 +1970,29 @@ decode_options (int argc, char **argv)
 	  || subcommand_option != LIST_SUBCOMMAND))
     USAGE_ERROR ((0, 0, _("--pax-option can be used only on POSIX archives")));
 
+  /* star create's non-POSIX typed archives with xattr support, so allow the
+     extra headers */
+  if ((acls_option > 0)
+      && archive_format != POSIX_FORMAT
+      && (subcommand_option != EXTRACT_SUBCOMMAND
+	  || subcommand_option != DIFF_SUBCOMMAND
+	  || subcommand_option != LIST_SUBCOMMAND))
+    USAGE_ERROR ((0, 0, _("--acls can be used only on POSIX archives")));
+
+  if ((selinux_context_option > 0)
+      && archive_format != POSIX_FORMAT
+      && (subcommand_option != EXTRACT_SUBCOMMAND
+	  || subcommand_option != DIFF_SUBCOMMAND
+	  || subcommand_option != LIST_SUBCOMMAND))
+    USAGE_ERROR ((0, 0, _("--selinux can be used only on POSIX archives")));
+
+  if ((xattrs_option > 0)
+      && archive_format != POSIX_FORMAT
+      && (subcommand_option != EXTRACT_SUBCOMMAND
+	  || subcommand_option != DIFF_SUBCOMMAND
+	  || subcommand_option != LIST_SUBCOMMAND))
+    USAGE_ERROR ((0, 0, _("--xattrs can be used only on POSIX archives")));
+
   /* If ready to unlink hierarchies, so we are for simpler files.  */
   if (recursive_unlink_option)
     old_files_option = UNLINK_FIRST_OLD_FILES;
@@ -2116,11 +2188,14 @@ tar_stat_init (struct tar_stat_info *st)
 void
 tar_stat_destroy (struct tar_stat_info *st)
 {
+  xheader_xattr_free (st->xattr_map, st->xattr_map_size);
   free (st->orig_file_name);
   free (st->file_name);
   free (st->link_name);
   free (st->uname);
   free (st->gname);
+  free (st->cntx_name);
+  free (st->acls_ptr);
   free (st->sparse_map);
   free (st->dumpdir);
   memset (st, 0, sizeof (*st));
diff -rup tar-1.15.90-orig/src/tar.h tar-1.15.90/src/tar.h
--- tar-1.15.90-orig/src/tar.h	2006-02-19 14:29:18.000000000 -0500
+++ tar-1.15.90/src/tar.h	2006-08-03 18:09:38.000000000 -0400
@@ -268,6 +268,14 @@ struct sp_array
     size_t numbytes;
   };
 
+/* Information about xattrs for a file.  */
+struct xattr_array
+  {
+    char *xkey;
+    char *xval_ptr;
+    size_t xval_len;
+  };
+
 struct tar_stat_info
 {
   char *orig_file_name;     /* name of file read from the archive header */
@@ -279,6 +287,12 @@ struct tar_stat_info
 
   char          *uname;     /* user name of owner */
   char          *gname;     /* group name of owner */
+
+  char *cntx_name;          /* SELinux context for the current archive entry. */
+
+  char *acls_ptr;           /* ACLs for the current archive entry. */
+  size_t acls_len;          /* ACLs for the current archive entry. */
+
   struct stat   stat;       /* regular filesystem stat */
 
   /* STAT doesn't always have access, data modification, and status
@@ -299,6 +313,9 @@ struct tar_stat_info
   size_t sparse_map_size;   /* Size of the sparse map */
   struct sp_array *sparse_map;
 
+  size_t xattr_map_size;   /* Size of the xattr map */
+  struct xattr_array *xattr_map;
+ 
   /* For dumpdirs */
   bool is_dumpdir;          /* Is the member a dumpdir? */
   bool skipped;             /* The member contents is already read
diff -rup tar-1.15.90-orig/src/xheader.c tar-1.15.90/src/xheader.c
--- tar-1.15.90-orig/src/xheader.c	2006-02-19 14:29:18.000000000 -0500
+++ tar-1.15.90/src/xheader.c	2006-08-03 18:12:27.000000000 -0400
@@ -422,6 +422,74 @@ xheader_write_global (void)
   free (name);
 }
 
+void xheader_xattr_init(struct tar_stat_info *st)
+{
+  st->xattr_map = NULL;
+  st->xattr_map_size = 0;
+}
+
+void xheader_xattr_free(struct xattr_array *xattr_map, size_t xattr_map_size)
+{
+  size_t scan = 0;
+
+  while (scan < xattr_map_size)
+    {
+      free (xattr_map[scan].xkey);
+      free (xattr_map[scan].xval_ptr);
+
+      ++scan;
+    }
+  free (xattr_map);
+}
+
+static void xheader_xattr__add(struct xattr_array **xattr_map,
+                               size_t *xattr_map_size,
+                               const char *key, const char *val, size_t len)
+{
+  size_t pos = (*xattr_map_size)++;
+  
+  *xattr_map = xrealloc (*xattr_map,
+                         *xattr_map_size * sizeof(struct xattr_array));
+  (*xattr_map)[pos].xkey = xstrdup (key);
+  (*xattr_map)[pos].xval_ptr = xmemdup (val, len);
+  (*xattr_map)[pos].xval_len = len;
+}
+
+void xheader_xattr_add(struct tar_stat_info *st,
+                       const char *key, const char *val, size_t len)
+{
+  size_t klen = strlen (key);
+  char *xkey = xmalloc (strlen("SCHILY.xattr.") + klen + 1);
+  char *tmp = xkey;
+
+  tmp = stpcpy (tmp, "SCHILY.xattr.");
+  tmp = stpcpy (tmp, key);
+  
+  xheader_xattr__add (&st->xattr_map, &st->xattr_map_size, xkey, val, len);
+
+  free (xkey);
+}
+
+void xheader_xattr_copy(const struct tar_stat_info *st,
+                        struct xattr_array **xattr_map, size_t *xattr_map_size)
+{
+  size_t scan = 0;
+
+  *xattr_map = NULL;
+  *xattr_map_size = 0;
+  
+  while (scan < st->xattr_map_size)
+    {
+      char  *key = st->xattr_map[scan].xkey;
+      char  *val = st->xattr_map[scan].xval_ptr;
+      size_t len = st->xattr_map[scan].xval_len;
+      
+      xheader_xattr__add(xattr_map, xattr_map_size, key, val, len);
+
+      ++scan;
+    }
+}
+
 
 /* General Interface */
 
@@ -430,8 +498,9 @@ struct xhdr_tab
   char const *keyword;
   void (*coder) (struct tar_stat_info const *, char const *,
 		 struct xheader *, void const *data);
-  void (*decoder) (struct tar_stat_info *, char const *, size_t);
+  void (*decoder) (struct tar_stat_info *, char const *, char const *, size_t);
   bool protect;
+  bool prefix;
 };
 
 /* This declaration must be extern, because ISO C99 section 6.9.2
@@ -448,8 +517,17 @@ locate_handler (char const *keyword)
   struct xhdr_tab const *p;
 
   for (p = xhdr_tab; p->keyword; p++)
-    if (strcmp (p->keyword, keyword) == 0)
-      return p;
+    if (p->prefix)
+      {
+        if (strncmp (p->keyword, keyword, strlen(p->keyword)) == 0)
+          return p;
+      }
+  else
+      {
+        if (strcmp (p->keyword, keyword) == 0)
+          return p;
+      }
+  
   return NULL;
 }
 
@@ -459,7 +537,7 @@ xheader_protected_pattern_p (const char 
   struct xhdr_tab const *p;
 
   for (p = xhdr_tab; p->keyword; p++)
-    if (p->protect && fnmatch (pattern, p->keyword, 0) == 0)
+    if (!p->prefix && p->protect && fnmatch (pattern, p->keyword, 0) == 0)
       return true;
   return false;
 }
@@ -470,7 +548,7 @@ xheader_protected_keyword_p (const char 
   struct xhdr_tab const *p;
 
   for (p = xhdr_tab; p->keyword; p++)
-    if (p->protect && strcmp (p->keyword, keyword) == 0)
+    if (!p->prefix && p->protect && strcmp (p->keyword, keyword) == 0)
       return true;
   return false;
 }
@@ -551,7 +629,7 @@ run_override_list (struct keyword_list *
     {
       struct xhdr_tab const *t = locate_handler (kp->pattern);
       if (t)
-	t->decoder (st, kp->value, strlen (kp->value));
+	t->decoder (st, t->keyword, kp->value, strlen (kp->value));
     }
 }
 
@@ -567,7 +645,7 @@ decx (void *data, char const *keyword, c
 
   t = locate_handler (keyword);
   if (t)
-    t->decoder (st, value, size);
+    t->decoder (st, keyword, value, size);
   else
     ERROR((0, 0, _("Ignoring unknown extended header keyword `%s'"),
 	   keyword));
@@ -962,6 +1040,7 @@ dummy_coder (struct tar_stat_info const 
 
 static void
 dummy_decoder (struct tar_stat_info *st __attribute__ ((unused)),
+	       char const *keyword __attribute__ ((unused)),
 	       char const *arg __attribute__ ((unused)),
 	       size_t size __attribute__((unused)))
 {
@@ -975,11 +1054,13 @@ atime_coder (struct tar_stat_info const 
 }
 
 static void
-atime_decoder (struct tar_stat_info *st, char const *arg,
+atime_decoder (struct tar_stat_info *st,
+	       char const *keyword,
+               char const *arg,
 	       size_t size __attribute__((unused)))
 {
   struct timespec ts;
-  if (decode_time (&ts, arg, "atime"))
+  if (decode_time (&ts, arg, keyword))
     st->atime = ts;
 }
 
@@ -991,11 +1072,12 @@ gid_coder (struct tar_stat_info const *s
 }
 
 static void
-gid_decoder (struct tar_stat_info *st, char const *arg,
+gid_decoder (struct tar_stat_info *st,
+             char const *keyword, char const *arg,
 	     size_t size __attribute__((unused)))
 {
   uintmax_t u;
-  if (decode_num (&u, arg, TYPE_MAXIMUM (gid_t), "gid"))
+  if (decode_num (&u, arg, TYPE_MAXIMUM (gid_t), keyword))
     st->stat.st_gid = u;
 }
 
@@ -1007,7 +1089,9 @@ gname_coder (struct tar_stat_info const 
 }
 
 static void
-gname_decoder (struct tar_stat_info *st, char const *arg,
+gname_decoder (struct tar_stat_info *st,
+               char const *keyword __attribute__ ((unused)),
+               char const *arg,
 	       size_t size __attribute__((unused)))
 {
   decode_string (&st->gname, arg);
@@ -1021,7 +1105,9 @@ linkpath_coder (struct tar_stat_info con
 }
 
 static void
-linkpath_decoder (struct tar_stat_info *st, char const *arg,
+linkpath_decoder (struct tar_stat_info *st,
+                  char const *keyword __attribute__ ((unused)),
+                  char const *arg,
 		  size_t size __attribute__((unused)))
 {
   decode_string (&st->link_name, arg);
@@ -1035,11 +1121,12 @@ ctime_coder (struct tar_stat_info const 
 }
 
 static void
-ctime_decoder (struct tar_stat_info *st, char const *arg,
+ctime_decoder (struct tar_stat_info *st,
+               char const *keyword, char const *arg,
 	       size_t size __attribute__((unused)))
 {
   struct timespec ts;
-  if (decode_time (&ts, arg, "ctime"))
+  if (decode_time (&ts, arg, keyword))
     st->ctime = ts;
 }
 
@@ -1051,11 +1138,12 @@ mtime_coder (struct tar_stat_info const 
 }
 
 static void
-mtime_decoder (struct tar_stat_info *st, char const *arg,
+mtime_decoder (struct tar_stat_info *st,
+               char const *keyword, char const *arg,
 	       size_t size __attribute__((unused)))
 {
   struct timespec ts;
-  if (decode_time (&ts, arg, "mtime"))
+  if (decode_time (&ts, arg, keyword))
     st->mtime = ts;
 }
 
@@ -1067,7 +1155,9 @@ path_coder (struct tar_stat_info const *
 }
 
 static void
-path_decoder (struct tar_stat_info *st, char const *arg,
+path_decoder (struct tar_stat_info *st,
+              char const *keyword __attribute__ ((unused)),
+              char const *arg,
 	      size_t size __attribute__((unused)))
 {
   decode_string (&st->orig_file_name, arg);
@@ -1083,11 +1173,12 @@ size_coder (struct tar_stat_info const *
 }
 
 static void
-size_decoder (struct tar_stat_info *st, char const *arg,
+size_decoder (struct tar_stat_info *st,
+              char const *keyword, char const *arg,
 	      size_t size __attribute__((unused)))
 {
   uintmax_t u;
-  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "size"))
+  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), keyword))
     st->stat.st_size = u;
 }
 
@@ -1099,11 +1190,12 @@ uid_coder (struct tar_stat_info const *s
 }
 
 static void
-uid_decoder (struct tar_stat_info *st, char const *arg,
+uid_decoder (struct tar_stat_info *st,
+             char const *keyword, char const *arg,
 	     size_t size __attribute__((unused)))
 {
   uintmax_t u;
-  if (decode_num (&u, arg, TYPE_MAXIMUM (uid_t), "uid"))
+  if (decode_num (&u, arg, TYPE_MAXIMUM (uid_t), keyword))
     st->stat.st_uid = u;
 }
 
@@ -1115,7 +1207,9 @@ uname_coder (struct tar_stat_info const 
 }
 
 static void
-uname_decoder (struct tar_stat_info *st, char const *arg,
+uname_decoder (struct tar_stat_info *st,
+               char const *keyword __attribute__ ((unused)),
+               char const *arg,
 	       size_t size __attribute__((unused)))
 {
   decode_string (&st->uname, arg);
@@ -1129,11 +1223,12 @@ sparse_size_coder (struct tar_stat_info 
 }
 
 static void
-sparse_size_decoder (struct tar_stat_info *st, char const *arg,
+sparse_size_decoder (struct tar_stat_info *st,
+                     char const *keyword, char const *arg,
 		     size_t size __attribute__((unused)))
 {
   uintmax_t u;
-  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "GNU.sparse.size"))
+  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), keyword))
     st->stat.st_size = u;
 }
 
@@ -1146,11 +1241,12 @@ sparse_numblocks_coder (struct tar_stat_
 }
 
 static void
-sparse_numblocks_decoder (struct tar_stat_info *st, char const *arg,
+sparse_numblocks_decoder (struct tar_stat_info *st,
+                          char const *keyword, char const *arg,
 			  size_t size __attribute__((unused)))
 {
   uintmax_t u;
-  if (decode_num (&u, arg, SIZE_MAX, "GNU.sparse.numblocks"))
+  if (decode_num (&u, arg, SIZE_MAX, keyword))
     {
       st->sparse_map_size = u;
       st->sparse_map = xcalloc (u, sizeof st->sparse_map[0]);
@@ -1167,11 +1263,12 @@ sparse_offset_coder (struct tar_stat_inf
 }
 
 static void
-sparse_offset_decoder (struct tar_stat_info *st, char const *arg,
+sparse_offset_decoder (struct tar_stat_info *st,
+                       char const *keyword, char const *arg,
 		       size_t size __attribute__((unused)))
 {
   uintmax_t u;
-  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "GNU.sparse.offset"))
+  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), keyword))
     {
       if (st->sparse_map_avail < st->sparse_map_size)
 	st->sparse_map[st->sparse_map_avail].offset = u;
@@ -1190,11 +1287,12 @@ sparse_numbytes_coder (struct tar_stat_i
 }
 
 static void
-sparse_numbytes_decoder (struct tar_stat_info *st, char const *arg,
+sparse_numbytes_decoder (struct tar_stat_info *st,
+                         char const *keyword, char const *arg,
 			 size_t size __attribute__((unused)))
 {
   uintmax_t u;
-  if (decode_num (&u, arg, SIZE_MAX, "GNU.sparse.numbytes"))
+  if (decode_num (&u, arg, SIZE_MAX, keyword))
     {
       if (st->sparse_map_avail < st->sparse_map_size)
 	st->sparse_map[st->sparse_map_avail++].numbytes = u;
@@ -1205,11 +1303,11 @@ sparse_numbytes_decoder (struct tar_stat
 }
 
 static void
-sparse_map_decoder (struct tar_stat_info *st, char const *arg,
+sparse_map_decoder (struct tar_stat_info *st,
+                    char const *keyword, char const *arg,
 		    size_t size __attribute__((unused)))
 {
   int offset = 1;
-  static char *keyword = "GNU.sparse.map";
 
   st->sparse_map_avail = 0;
   while (1)
@@ -1283,8 +1381,9 @@ dumpdir_coder (struct tar_stat_info cons
 }
 
 static void
-dumpdir_decoder (struct tar_stat_info *st, char const *arg,
-		 size_t size)
+dumpdir_decoder (struct tar_stat_info *st,
+                 char const *keyword __attribute__ ((unused)),
+                 char const *arg, size_t size)
 {
   st->dumpdir = xmalloc (size);
   memcpy (st->dumpdir, arg, size);
@@ -1298,7 +1397,9 @@ volume_label_coder (struct tar_stat_info
 }
 
 static void
-volume_label_decoder (struct tar_stat_info *st, char const *arg, size_t size)
+volume_label_decoder (struct tar_stat_info *st,
+                      char const *keyword __attribute__ ((unused)),
+                      char const *arg, size_t size)
 {
   decode_string (&volume_label, arg);
 }
@@ -1312,10 +1413,11 @@ volume_size_coder (struct tar_stat_info 
 }
 
 static void
-volume_size_decoder (struct tar_stat_info *st, char const *arg, size_t size)
+volume_size_decoder (struct tar_stat_info *st,
+                     char const *keyword, char const *arg, size_t size)
 {
   uintmax_t u;
-  if (decode_num (&u, arg, TYPE_MAXIMUM (uintmax_t), "GNU.volume.size"))
+  if (decode_num (&u, arg, TYPE_MAXIMUM (uintmax_t), keyword))
     continued_file_size = u;
 }
 
@@ -1329,57 +1431,110 @@ volume_offset_coder (struct tar_stat_inf
 }
 
 static void
-volume_offset_decoder (struct tar_stat_info *st, char const *arg, size_t size)
+volume_offset_decoder (struct tar_stat_info *st,
+                       char const *keyword, char const *arg, size_t size)
 {
   uintmax_t u;
-  if (decode_num (&u, arg, TYPE_MAXIMUM (uintmax_t), "GNU.volume.offset"))
+  if (decode_num (&u, arg, TYPE_MAXIMUM (uintmax_t), keyword))
     continued_file_offset = u;
 }
 
 static void
-volume_filename_decoder (struct tar_stat_info *st, char const *arg,
-			 size_t size)
+volume_filename_decoder (struct tar_stat_info *st,
+                         char const *keyword __attribute__ ((unused)),
+                         char const *arg, size_t size)
 {
   decode_string (&continued_file_name, arg);
 }
+
+static void
+xattr_selinux_coder (struct tar_stat_info const *st, char const *keyword,
+                     struct xheader *xhdr, void const *data)
+{
+  code_string (st->cntx_name, keyword, xhdr);
+}
+
+static void
+xattr_selinux_decoder (struct tar_stat_info *st,
+                       char const *keyword, char const *arg, size_t size)
+{
+  decode_string (&st->cntx_name, arg);
+}
+
+static void
+xattr_acls_coder (struct tar_stat_info const *st , char const *keyword,
+                  struct xheader *xhdr, void const *data)
+{
+  xheader_print_n (xhdr, keyword, st->acls_ptr, st->acls_len);
+}
+
+static void
+xattr_acls_decoder (struct tar_stat_info *st,
+                    char const *keyword, char const *arg, size_t size)
+{
+  st->acls_ptr = xmemdup (arg, size);
+  st->acls_len = size;
+}
+
+static void
+xattr_coder (struct tar_stat_info const *st , char const *keyword,
+             struct xheader *xhdr, void const *data)
+{
+  struct xattr_array *xattr_map = st->xattr_map;
+  const size_t *off = data;
   
+  xheader_print_n (xhdr, keyword,
+                   xattr_map[*off].xval_ptr, xattr_map[*off].xval_len);
+}
+
+static void
+xattr_decoder (struct tar_stat_info *st,
+               char const *keyword, char const *arg, size_t size)
+{
+  char *xstr = NULL;
+  
+  xstr = xmemdup(arg, size + 1);
+  xheader_xattr_add(st, keyword + strlen("SCHILY.xattr."), xstr, size);
+  free(xstr);
+}
 
 struct xhdr_tab const xhdr_tab[] = {
-  { "atime",	atime_coder,	atime_decoder,	  false },
-  { "comment",	dummy_coder,	dummy_decoder,	  false },
-  { "charset",	dummy_coder,	dummy_decoder,	  false },
-  { "ctime",	ctime_coder,	ctime_decoder,	  false },
-  { "gid",	gid_coder,	gid_decoder,	  false },
-  { "gname",	gname_coder,	gname_decoder,	  false },
-  { "linkpath", linkpath_coder, linkpath_decoder, false },
-  { "mtime",	mtime_coder,	mtime_decoder,	  false },
-  { "path",	path_coder,	path_decoder,	  false },
-  { "size",	size_coder,	size_decoder,	  false },
-  { "uid",	uid_coder,	uid_decoder,	  false },
-  { "uname",	uname_coder,	uname_decoder,	  false },
+  { "atime",	atime_coder,	atime_decoder,	  false, false },
+  { "comment",	dummy_coder,	dummy_decoder,	  false, false },
+  { "charset",	dummy_coder,	dummy_decoder,	  false, false },
+  { "ctime",	ctime_coder,	ctime_decoder,	  false, false },
+  { "gid",	gid_coder,	gid_decoder,	  false, false },
+  { "gname",	gname_coder,	gname_decoder,	  false, false },
+  { "linkpath", linkpath_coder, linkpath_decoder, false, false },
+  { "mtime",	mtime_coder,	mtime_decoder,	  false, false },
+  { "path",	path_coder,	path_decoder,	  false, false },
+  { "size",	size_coder,	size_decoder,	  false, false },
+  { "uid",	uid_coder,	uid_decoder,	  false, false },
+  { "uname",	uname_coder,	uname_decoder,	  false, false },
 
   /* Sparse file handling */
-  { "GNU.sparse.size",       sparse_size_coder, sparse_size_decoder, true },
+  { "GNU.sparse.size",       sparse_size_coder, sparse_size_decoder,
+    true, false },
   { "GNU.sparse.numblocks",  sparse_numblocks_coder, sparse_numblocks_decoder,
-    true },
+    true, false },
   /* tar 1.14 - 1.15.1 keywords. Multiplse instances of these appeared in 'x'
      headers, and each of them was meaningful. It confilcted with POSIX specs,
      which requires that "when extended header records conflict, the last one
      given in the header shall take precedence." */
   { "GNU.sparse.offset",     sparse_offset_coder, sparse_offset_decoder,
-    true },
+    true, false },
   { "GNU.sparse.numbytes",   sparse_numbytes_coder, sparse_numbytes_decoder,
-    true },
+    true, false },
   /* tar >=1.16 keyword, introduced to remove the above-mentioned conflict. */
   { "GNU.sparse.map",        NULL /* Unused, see pax_dump_header() */,
-    sparse_map_decoder, false },
+    sparse_map_decoder, false, false },
 
   { "GNU.dumpdir",           dumpdir_coder, dumpdir_decoder,
-    true },
+    true, false },
 
   /* Keeps the tape/volume label. May be present only in the global headers.
      Equivalent to GNUTYPE_VOLHDR.  */
-  { "GNU.volume.label", volume_label_coder, volume_label_decoder, true },
+  { "GNU.volume.label", volume_label_coder, volume_label_decoder, true, false },
 
   /* These may be present in a first global header of the archive.
      They provide the same functionality as GNUTYPE_MULTIVOL header.
@@ -1388,9 +1543,23 @@ struct xhdr_tab const xhdr_tab[] = {
      GNU.volume.offset keeps the offset of the start of this volume,
      otherwise kept in oldgnu_header.offset.  */
   { "GNU.volume.filename", volume_label_coder, volume_filename_decoder,
-    true },
-  { "GNU.volume.size", volume_size_coder, volume_size_decoder, true },
-  { "GNU.volume.offset", volume_offset_coder, volume_offset_decoder, true },
-
+    true, false },
+  { "GNU.volume.size", volume_size_coder, volume_size_decoder, true, false },
+  { "GNU.volume.offset", volume_offset_coder, volume_offset_decoder,
+    true, false },
+
+  /* SELinux, use the star format... */
+  { "SCHILY.xattr.security.selinux",
+    xattr_selinux_coder, xattr_selinux_decoder, false, false },
+
+  /* ACLs, use the star format... */
+  { "SCHILY.xattr.system.posix_acl_access",
+    xattr_acls_coder, xattr_acls_decoder, false, false },
+
+  /* xattr's, use the star format note we only save the user/root varients... */
+  { "SCHILY.xattr.user",  xattr_coder, xattr_decoder, false, true },
+  { "SCHILY.xattr.root",  xattr_coder, xattr_decoder, false, true },
+  { "SCHILY.xattr",       dummy_coder, dummy_decoder, false, true },
+  
   { NULL, NULL, NULL, false }
 };
--- tar-1.15.90-orig/src/xattrs.c	1969-12-31 19:00:00.000000000 -0500
+++ tar-1.15.90/src/xattrs.c	2006-08-03 18:09:38.000000000 -0400
@@ -0,0 +1,240 @@
+/* Create a tar archive.
+
+   Copyright (C) 2006 Free Software Foundation, Inc.
+
+   Written by James Antill, on 2006-07-27.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any later
+   version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+   Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include <system.h>
+
+#include <quotearg.h>
+
+#include "common.h"
+
+
+#ifndef HAVE_SELINUX_SELINUX_H
+# undef HAVE_LIBSELINUX
+#endif
+
+#ifndef HAVE_ATTR_XATTR_H
+# undef HAVE_XATTRS
+#endif
+
+#ifdef HAVE_SELINUX_SELINUX_H
+# include <selinux/selinux.h>
+#endif
+
+#ifdef HAVE_ATTR_XATTR_H
+# include <attr/xattr.h>
+#endif
+
+
+void xattrs_acls_get(struct tar_stat_info *st, char const *file_name, int fd)
+{
+#ifdef HAVE_XATTRS
+  if (acls_option > 0)
+    {
+      const char *attr = "system.posix_acl_access";
+      static char *val = NULL;
+      static ssize_t asz = 1024;
+      ssize_t ret = 0;
+      
+      if (!val) val = xmalloc (asz);
+          
+      while (((ret = fgetxattr (fd, attr, val, asz)) == -1) &&
+             (errno == ERANGE))
+        {
+          asz <<= 1;
+          val = xrealloc (val, asz);
+        }
+              
+      if (ret != -1)
+        {
+          st->acls_ptr = xmemdup (val, ret);
+          st->acls_len = ret;
+        }
+      else if (errno != ENOATTR)
+        call_arg_warn ("fgetxattr", file_name);
+    }
+#endif
+}
+
+void xattrs_selinux_get(struct tar_stat_info *st, char const *file_name, int fd)
+{
+#ifdef HAVE_LIBSELINUX
+  if (selinux_context_option > 0)
+    if (fgetfilecon (fd, &st->cntx_name) == -1)
+      call_arg_warn ("fgetfilecon", file_name);
+#endif
+}
+
+void xattrs_xattrs_get(struct tar_stat_info *st, char const *file_name, int fd)
+{
+#ifdef HAVE_XATTRS
+  if (xattrs_option > 0)
+    { /* get all xattrs ... this include security.* and system.* if
+         available. We filter them here, but we have to filter them
+         in xattrs_xattrs_set() anyway.
+      */
+      static ssize_t xsz = 1024;
+      static char *xatrs = NULL;
+      ssize_t xret = -1;
+
+      if (!xatrs) xatrs = xmalloc (xsz);
+              
+      while (((xret = flistxattr (fd, xatrs, xsz)) == -1) &&
+             (errno == ERANGE))
+        {
+          xsz <<= 1;
+          xatrs = xrealloc (xatrs, xsz);
+        }
+
+      if (xret == -1)
+        call_arg_warn ("flistxattrs", file_name);
+      else
+        {
+          const char *attr = xatrs;
+          static ssize_t asz = 1024;
+          static char *val = NULL;
+          
+          if (!val) val = xmalloc (asz);
+          
+          while (xret > 0)
+            {
+              size_t len = strlen (attr);
+              ssize_t aret = 0;
+              
+              if (strncmp (attr, "user.", strlen("user.")) &&
+                  strncmp (attr, "root.", strlen("root.")))
+                goto next_attr; /* only store normal xattrs */
+              
+              while (((aret = fgetxattr (fd, attr, val, asz)) == -1) &&
+                     (errno == ERANGE))
+                {
+                  asz <<= 1;
+                  val = xrealloc (val, asz);
+                }
+              
+              if (aret != -1)
+                xheader_xattr_add (st, attr, val, aret);
+              else if (errno != ENOATTR)
+                call_arg_warn ("fgetxattr", file_name);
+              
+             next_attr:
+              attr += len + 1;
+              xret -= len + 1;
+            }
+        }
+    }
+#endif
+}
+
+void xattrs_acls_set(struct tar_stat_info const *st,
+                     char const *file_name, char typeflag)
+{
+#ifdef HAVE_XATTRS
+  if ((acls_option >= 0) && st->acls_ptr)
+    {
+      const char *sysname = "setxattr";
+      char *keyword = "system.posix_acl_access";
+      int ret = -1;
+
+      if (typeflag != SYMTYPE)
+        ret = setxattr (file_name, keyword, st->acls_ptr, st->acls_len, 0);
+      else
+        {
+          sysname = "lsetxattr";
+          ret = lsetxattr (file_name, keyword, st->acls_ptr, st->acls_len, 0);
+        }
+
+      if ((ret == -1) && (errno == EPERM))
+        call_arg_warn(sysname, file_name);
+      else if ((ret == -1) && (errno != EOPNOTSUPP))
+        call_arg_error(sysname, file_name);
+    }
+#endif
+}
+
+void xattrs_selinux_set(struct tar_stat_info const *st,
+                        char const *file_name, char typeflag)
+{
+#ifdef HAVE_LIBSELINUX
+  if ((selinux_context_option >= 0) && st->cntx_name)
+    {
+      const char *sysname = "setfilecon";
+      int ret = -1;
+      
+      if (typeflag != SYMTYPE)
+        ret = setfilecon (file_name, st->cntx_name);
+      else
+        {
+          sysname = "lsetfilecon";
+          ret = lsetfilecon (file_name, st->cntx_name);
+        }
+
+      if ((ret == -1) && (errno == EPERM))
+        call_arg_warn(sysname, file_name);
+      else if ((ret == -1) && (errno != EOPNOTSUPP))
+        call_arg_error(sysname, file_name);
+    }
+#endif
+}
+
+void xattrs_xattrs_set(struct tar_stat_info const *st,
+                       char const *file_name, char typeflag)
+{
+#ifdef HAVE_XATTRS
+  if ((xattrs_option >= 0) && st->xattr_map_size)
+    {
+      const char *sysname = "setxattr";
+      size_t scan = 0;
+      int ret = -1;
+      
+      while (scan < st->xattr_map_size)
+        {
+          char *keyword = st->xattr_map[scan].xkey;
+
+          // assert (!memcpy (keyword, "SCHILY.xattr.", strlen("SCHILY.xattr.")));
+          keyword += strlen("SCHILY.xattr.");
+
+          if (strncmp (keyword, "user.", strlen("user.")) &&
+              strncmp (keyword, "root.", strlen("root.")))
+            continue; /* don't try and set anything but normal xattrs */
+            
+          if (typeflag != SYMTYPE)
+            ret = setxattr (file_name, keyword,
+                            st->xattr_map[scan].xval_ptr,
+                            st->xattr_map[scan].xval_len, 0);
+          else
+            {
+              sysname = "lsetxattr";
+              ret = lsetxattr (file_name, keyword,
+                               st->xattr_map[scan].xval_ptr,
+                               st->xattr_map[scan].xval_len, 0);
+            }
+
+          /* should we ignore root.* xattrs when not root ? */
+          if ((ret == -1) && (errno == EPERM))
+            call_arg_warn(sysname, file_name);
+          else if ((ret == -1) && (errno != EOPNOTSUPP))
+            call_arg_error(sysname, file_name);
+      
+          ++scan;
+        }
+    }
+#endif
+}
+
--- tar-1.15.90-orig/src/xattrs.h	1969-12-31 19:00:00.000000000 -0500
+++ tar-1.15.90/src/xattrs.h	2006-08-03 18:09:38.000000000 -0400
@@ -0,0 +1,14 @@
+
+extern void xattrs_acls_get(struct tar_stat_info *st,
+                            char const *file_name, int fd);
+extern void xattrs_selinux_get(struct tar_stat_info *st,
+                               char const *file_name, int fd);
+extern void xattrs_xattrs_get(struct tar_stat_info *st,
+                              char const *file_name, int fd);
+
+extern void xattrs_acls_set(struct tar_stat_info const *st,
+                            char const *file_name, char typeflag);
+extern void xattrs_selinux_set(struct tar_stat_info const *st,
+                               char const *file_name, char typeflag);
+extern void xattrs_xattrs_set(struct tar_stat_info const *st,
+                              char const *file_name, char typeflag);


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- tar.spec	24 Jul 2006 10:56:14 -0000	1.41
+++ tar.spec	10 Aug 2006 13:04:40 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.90
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -14,6 +14,7 @@
 Patch4: tar-1.15.90-makeCheck.patch
 Patch5: tar-1.15.90-permissions.patch
 Patch6: tar-1.15.90-incompatibility.patch
+Patch7: tar-1.15.90-xattrSupport.patch
 Prereq: info
 BuildRequires: autoconf automake gzip
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -38,16 +39,11 @@
 %patch4 -p1 -b .makeCheck
 %patch5 -p1 -b .permissions
 %patch6 -p1 -b .incompatibility
+%patch7 -p1 -b .xattrSupport
 
 %build
-
-%ifos linux
 %configure --bindir=/bin --libexecdir=/sbin
-make LIBS=-lbsd
-%else
-%configure
 make
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -108,6 +104,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Thu Aug 10 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-6
+- add xattr support (#200925), patch from james.antill at redhat.com
+
 * Mon Jul 24 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-5
 - fix incompatibilities in appending files to the end 
   of an archive (#199515)



From fedora-cvs-commits at redhat.com  Thu Aug 10 13:12:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 09:12:54 -0400
Subject: rpms/kdegames/devel .cvsignore, 1.34, 1.35 kdegames.spec, 1.54,
	1.55 sources, 1.36, 1.37 kdegames-3.5.3-3.5.4.patch, 1.1, NONE
Message-ID: <200608101312.k7ADCsZc026804@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdegames.spec sources 
Removed Files:
	kdegames-3.5.3-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	2 Jun 2006 19:56:47 -0000	1.34
+++ .cvsignore	10 Aug 2006 13:12:41 -0000	1.35
@@ -12,3 +12,4 @@
 kdegames-3.5.0-patched.tar.bz2
 kdegames-3.5.1-patched.tar.bz2
 kdegames-3.5.3-patched.tar.bz2
+kdegames-3.5.4-patched.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdegames.spec	24 Jul 2006 15:26:38 -0000	1.54
+++ kdegames.spec	10 Aug 2006 13:12:42 -0000	1.55
@@ -17,7 +17,7 @@
 %define kdebase_epoch 6
 
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -25,27 +25,25 @@
 Group: Amusements/Games
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3%{patch_name}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
 
-Patch0: kdegames-3.5.3-3.5.4.patch
 Patch1: kde-libtool.patch
 Patch2: kdegames-3.1.1-konquest.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 BuildRequires: kdebase-devel
 BuildRequires: autoconf
-BuildRequires: automake >= 1.6
+BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: glibc-devel
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: libstdc++-devel
 BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
 BuildRequires: perl
 
@@ -67,8 +65,7 @@
 KDE desktop.
 
 %prep
-%setup -q -n %{name}-3.5.3%{patch_name}
-%patch0 -p0
+%setup -q -n %{name}-%{version}%{patch_name}
 %patch2 -p1 -b .konquest
 
 %if %{make_cvs}
@@ -116,13 +113,25 @@
 done
 popd
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %clean
 rm -rf %{buildroot}
 
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/HTML/en/*
@@ -146,7 +155,10 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
-* Mon Jul 24 2006 Than Ngo <than at redhat.com> 3.5.4-0.pre1
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
+- rebuild
+
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 
 * Thu Jul 13 2006 Dennis Gregorovic <dgregor at redhat.com> - 6:3.5.3-2.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	2 Jun 2006 19:56:47 -0000	1.36
+++ sources	10 Aug 2006 13:12:42 -0000	1.37
@@ -1 +1 @@
-2120de8516ee24e989a1f9b097d0c572  kdegames-3.5.3-patched.tar.bz2
+72cd6d61b3c0339639964840b335555a  kdegames-3.5.4-patched.tar.bz2


--- kdegames-3.5.3-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 13:19:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 09:19:19 -0400
Subject: rpms/kdegraphics/devel .cvsignore, 1.32, 1.33 kdegraphics.spec, 1.90,
	1.91 sources, 1.34, 1.35 kdegraphics-3.5.3-to-3.5.4.patch, 1.1, NONE
Message-ID: <200608101319.k7ADJJZa010828@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdegraphics.spec sources 
Removed Files:
	kdegraphics-3.5.3-to-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	2 Jun 2006 23:36:58 -0000	1.32
+++ .cvsignore	10 Aug 2006 13:19:15 -0000	1.33
@@ -11,3 +11,4 @@
 kdegraphics-3.5.0.tar.bz2
 kdegraphics-3.5.1.tar.bz2
 kdegraphics-3.5.3.tar.bz2
+kdegraphics-3.5.4.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- kdegraphics.spec	24 Jul 2006 16:10:55 -0000	1.90
+++ kdegraphics.spec	10 Aug 2006 13:19:15 -0000	1.91
@@ -16,17 +16,16 @@
 %define no_scanner_archs s390 s390x
 
 Version: 3.5.4
-Release: 0.pre2%{?dist}
+Release: 1%{?dist}
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
 Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
-Patch0: kdegraphics-3.5.3-to-3.5.4.patch
 Patch10: kde-libtool.patch
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
@@ -55,7 +54,10 @@
 %endif
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description
 Graphics applications for the K Desktop Environment.
@@ -82,9 +84,7 @@
 This package contains header files for developing applications using kdegraphics.
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0 -b .kde3.5.4
-%patch10 -p1 -b .libtool
+%setup -q
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
 %patch3 -p1 -b .gcc-warning
@@ -194,6 +194,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 7:3.5.4-1
+- rebuild
+
 * Mon Jul 24 2006 Tim Powers <timp at redhat.com> - 7:3.5.4-0.pre2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	2 Jun 2006 23:36:59 -0000	1.34
+++ sources	10 Aug 2006 13:19:15 -0000	1.35
@@ -1 +1 @@
-56bd5537521dc94633f8effaace523cb  kdegraphics-3.5.3.tar.bz2
+de1f6d0597235f52186aaeeaabe7dc08  kdegraphics-3.5.4.tar.bz2


--- kdegraphics-3.5.3-to-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 13:19:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 09:19:32 -0400
Subject: rpms/selinux-policy/FC-5 .cvsignore, 1.60,
	1.61 policy-20060802.patch, 1.1, 1.2 selinux-policy.spec,
	1.178, 1.179 sources, 1.64, 1.65
Message-ID: <200608101319.k7ADJWer011051@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policy-20060802.patch selinux-policy.spec sources 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-2.fc5
- Bump for FC5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	8 Aug 2006 13:00:32 -0000	1.60
+++ .cvsignore	10 Aug 2006 13:19:30 -0000	1.61
@@ -72,3 +72,4 @@
 serefpolicy-2.3.2.tgz
 serefpolicy-2.3.3.tgz
 serefpolicy-2.3.5.tgz
+serefpolicy-2.3.6.tgz

policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/usermanage.te        |    4 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.te          |    2 
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 +++++++++++
 modules/kernel/terminal.if         |   19 ++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cron.te           |    1 
 modules/services/cups.te           |    8 -
 modules/services/cyrus.te          |    1 
 modules/services/dbus.if           |    6 
 modules/services/ldap.te           |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    4 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  105 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   25 +++
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   68 ++++++++++
 modules/services/xserver.te        |   15 +-
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/init.te             |    2 
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/miscfiles.if        |   18 ++
 modules/system/mount.te            |    3 
 modules/system/selinuxutil.te      |   11 +
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  236 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   50 +++----
 modules/system/xen.if              |   38 +++++
 modules/system/xen.te              |   26 +++-
 65 files changed, 795 insertions(+), 167 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060802.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20060802.patch	8 Aug 2006 13:00:32 -0000	1.1
+++ policy-20060802.patch	10 Aug 2006 13:19:30 -0000	1.2
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.5/policy/mls
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.6/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.5/policy/mls	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/mls	2006-08-08 16:15:43.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -22,9 +22,9 @@
  mlsconstrain dir { add_name remove_name reparent rmdir }
  	((( l1 dom l2 ) and ( l1 domby h2 )) or
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.5/policy/modules/admin/anaconda.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.6/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/anaconda.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/anaconda.te	2006-08-08 16:15:43.000000000 -0400
 @@ -25,8 +25,12 @@
  
  modutils_domtrans_insmod(anaconda_t)
@@ -38,7 +38,15 @@
  ifdef(`distro_redhat',`
  	bootloader_create_runtime_file(anaconda_t)
  ')
-@@ -51,9 +55,7 @@
+@@ -41,6 +45,7 @@
+ 
+ optional_policy(`
+ 	rpm_domtrans(anaconda_t)
++	rpm_domtrans_script(anaconda_t)
+ ')
+ 
+ optional_policy(`
+@@ -51,9 +56,16 @@
  	usermanage_domtrans_admin_passwd(anaconda_t)
  ')
  
@@ -50,9 +58,18 @@
 +	ssh_domtrans_keygen(anaconda_t)
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.5/policy/modules/admin/consoletype.te
++
++# The following is just to quiet the anaconda complaining during the install
++type anaconda_exec_t;
++kernel_domtrans_to(anaconda_t,anaconda_exec_t)
++allow anaconda_t self:process execmem;
++dontaudit domain anaconda_t:fd use;
++dontaudit domain anaconda_t:fifo_file r_file_perms;
++dontaudit domain anaconda_t:unix_stream_socket connectto;
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.6/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/consoletype.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/consoletype.te	2006-08-08 16:15:43.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -75,9 +92,9 @@
 +optional_policy(`
 +	xen_dontaudit_use_fds(consoletype_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.5/policy/modules/admin/firstboot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.6/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/firstboot.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/firstboot.te	2006-08-08 16:15:43.000000000 -0400
 @@ -106,7 +106,7 @@
  ')
  
@@ -87,9 +104,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.5/policy/modules/admin/prelink.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.6/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/prelink.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/prelink.te	2006-08-08 16:15:43.000000000 -0400
 @@ -1,4 +1,3 @@
 -
  policy_module(prelink,1.1.5)
@@ -104,9 +121,9 @@
  optional_policy(`
  	cron_system_entry(prelink_t, prelink_exec_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.5/policy/modules/admin/rpm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.6/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/rpm.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/rpm.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -116,9 +133,9 @@
  ')
  
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.5/policy/modules/admin/usermanage.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.6/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/admin/usermanage.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/usermanage.te	2006-08-08 16:15:43.000000000 -0400
 @@ -260,7 +260,7 @@
  ')
  
@@ -137,9 +154,9 @@
  	nscd_socket_use(useradd_t)
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.5/policy/modules/apps/mozilla.if
---- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/apps/mozilla.if	2006-08-07 19:45:48.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.6/policy/modules/apps/mozilla.if
+--- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/apps/mozilla.if	2006-08-08 16:15:43.000000000 -0400
 @@ -63,6 +63,7 @@
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
@@ -148,7 +165,7 @@
  
  	# for bash - old mozilla binary
  	can_exec($1_mozilla_t, mozilla_exec_t)
-@@ -175,6 +176,7 @@
+@@ -170,6 +171,7 @@
  	logging_send_syslog_msg($1_mozilla_t)
  
  	miscfiles_read_fonts($1_mozilla_t)
@@ -156,9 +173,9 @@
  
  	# Browse the web, connect to printer
  	sysnet_dns_name_resolve($1_mozilla_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.5/policy/modules/kernel/corecommands.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/corecommands.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -167,9 +184,9 @@
  
  ifdef(`distro_debian',`
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.5/policy/modules/kernel/corenetwork.te.in
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/corenetwork.te.in	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in	2006-08-09 12:58:00.000000000 -0400
 @@ -73,6 +73,7 @@
  network_port(dhcpc, udp,68,s0)
  network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
@@ -187,9 +204,17 @@
  network_port(i18n_input, tcp,9010,s0)
  network_port(imaze, tcp,5323,s0, udp,5323,s0)
  network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.5/policy/modules/kernel/devices.te
+@@ -126,6 +127,7 @@
+ network_port(rsh, tcp,514,s0)
+ network_port(rsync, tcp,873,s0, udp,873,s0)
+ network_port(smbd, tcp,137-139,s0, tcp,445,s0)
++network_port(lmtp, tcp,24,s0, udp,24,s0)
+ network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
+ network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
+ network_port(spamd, tcp,783,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.6/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/devices.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/devices.te	2006-08-08 16:15:43.000000000 -0400
 @@ -166,7 +166,7 @@
  dev_node(vmware_device_t)
  
@@ -199,9 +224,9 @@
  
  type xen_device_t;
  dev_node(xen_device_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.5/policy/modules/kernel/files.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.6/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/files.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/files.if	2006-08-08 16:38:46.000000000 -0400
 @@ -2934,6 +2934,24 @@
  
  ########################################
@@ -227,9 +252,9 @@
  ##	Read the tmp directory (/tmp).
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.5/policy/modules/kernel/filesystem.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.6/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/filesystem.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/filesystem.te	2006-08-08 16:15:43.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -246,9 +271,9 @@
  
  ########################################
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.5/policy/modules/kernel/kernel.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.6/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/kernel.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/kernel.if	2006-08-08 16:15:43.000000000 -0400
 @@ -1456,6 +1456,42 @@
  
  ########################################
@@ -335,9 +360,9 @@
 +	dontaudit $1 proc_type:file getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.5/policy/modules/kernel/terminal.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.6/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/kernel/terminal.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/terminal.if	2006-08-08 16:15:43.000000000 -0400
 @@ -308,6 +308,7 @@
  		type devpts_t;
  	')
@@ -368,9 +393,9 @@
 +	allow $1 devpts_t:filesystem getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.5/policy/modules/services/amavis.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.6/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/amavis.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/amavis.te	2006-08-08 16:15:43.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -400,9 +425,9 @@
 +optional_policy(`
 +	postfix_read_config(amavis_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.5/policy/modules/services/apache.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.6/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/apache.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/apache.te	2006-08-08 16:15:43.000000000 -0400
 @@ -273,7 +273,6 @@
  sysnet_read_config(httpd_t)
  
@@ -411,9 +436,9 @@
  
  mta_send_mail(httpd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.5/policy/modules/services/avahi.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.6/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/avahi.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/avahi.te	2006-08-08 16:15:43.000000000 -0400
 @@ -79,6 +79,7 @@
  
  sysnet_read_config(avahi_t)
@@ -422,9 +447,9 @@
  
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.5/policy/modules/services/bind.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.6/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/bind.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/bind.te	2006-08-08 16:15:43.000000000 -0400
 @@ -226,6 +226,7 @@
  allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
  
@@ -433,9 +458,9 @@
  
  allow ndc_t named_t:tcp_socket { connectto recvfrom };
  allow ndc_t named_t:unix_stream_socket connectto;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.5/policy/modules/services/bluetooth.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.6/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/bluetooth.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/bluetooth.te	2006-08-08 16:15:43.000000000 -0400
 @@ -247,3 +247,8 @@
  optional_policy(`
         	xserver_stream_connect_xdm(bluetooth_helper_t)
@@ -445,17 +470,17 @@
 +	nis_use_ypbind(bluetooth_helper_t)
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.5/policy/modules/services/clamav.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.6/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/clamav.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/clamav.if	2006-08-08 16:15:43.000000000 -0400
 @@ -102,3 +102,4 @@
  	allow clamscan_t $1:fifo_file rw_file_perms;
  	allow clamscan_t $1:process sigchld;
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.5/policy/modules/services/cron.if
---- nsaserefpolicy/policy/modules/services/cron.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/cron.if	2006-08-07 19:45:48.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.6/policy/modules/services/cron.if
+--- nsaserefpolicy/policy/modules/services/cron.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cron.if	2006-08-08 16:15:43.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -464,7 +489,7 @@
  
  	# crontab shows up in user ps
  	allow $2 $1_crontab_t:dir { search getattr read };
-@@ -194,14 +195,19 @@
+@@ -193,14 +194,19 @@
  	# Allow crond to read those crontabs in cron spool.
  	allow crond_t $1_cron_spool_t:file create_file_perms;
  
@@ -487,7 +512,7 @@
  
  	# crontab signals crond by updating the mtime on the spooldir
  	allow $1_crontab_t cron_spool_t:dir setattr;
-@@ -239,6 +245,10 @@
+@@ -238,6 +244,10 @@
  	# Read user crontabs
  	userdom_read_user_home_content_files($1,$1_crontab_t)
  
@@ -498,10 +523,29 @@
  	tunable_policy(`fcron_crond', `
  		# fcron wants an instant update of a crontab change for the administrator
  		# also crontab does a security check for crontab -u
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.5/policy/modules/services/cups.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.6/policy/modules/services/cron.te
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cron.te	2006-08-09 09:15:00.000000000 -0400
+@@ -173,6 +173,7 @@
+ 	allow crond_t crond_tmp_t:dir create_dir_perms;
+ 	allow crond_t crond_tmp_t:file create_file_perms;
+ 	files_tmp_filetrans(crond_t, crond_tmp_t, { file dir })
++	files_pid_filetrans(system_crond_t,crond_var_run_t,file)
+ 
+ 	mta_send_mail(crond_t)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.6/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/cups.te	2006-08-07 19:45:48.000000000 -0400
-@@ -81,6 +81,7 @@
++++ serefpolicy-2.3.6/policy/modules/services/cups.te	2006-08-08 16:15:43.000000000 -0400
+@@ -74,13 +74,14 @@
+ #
+ 
+ # /usr/lib/cups/backend/serial needs sys_admin(?!)
+-allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_tty_config audit_write };
++allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_resource sys_tty_config audit_write };
+ dontaudit cupsd_t self:capability { sys_tty_config net_admin };
+ allow cupsd_t self:process { setsched signal_perms };
+ allow cupsd_t self:fifo_file rw_file_perms;
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
  allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
@@ -528,10 +572,29 @@
  
  sysnet_read_config(cupsd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.5/policy/modules/services/dbus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.6/policy/modules/services/cyrus.te
+--- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cyrus.te	2006-08-09 12:58:45.000000000 -0400
+@@ -69,6 +69,7 @@
+ corenet_udp_sendrecv_all_ports(cyrus_t)
+ corenet_tcp_bind_all_nodes(cyrus_t)
+ corenet_tcp_bind_mail_port(cyrus_t)
++corenet_tcp_bind_lmtp_port(cyrus_t)
+ corenet_tcp_bind_pop_port(cyrus_t)
+ corenet_tcp_connect_all_ports(cyrus_t)
+ corenet_sendrecv_mail_server_packets(cyrus_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.6/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/dbus.if	2006-08-07 19:45:48.000000000 -0400
-@@ -171,6 +171,11 @@
++++ serefpolicy-2.3.6/policy/modules/services/dbus.if	2006-08-09 11:12:25.000000000 -0400
+@@ -123,6 +123,7 @@
+ 	selinux_compute_relabel_context($1_dbusd_t)
+ 	selinux_compute_user_contexts($1_dbusd_t)
+ 
++	corecmd_bin_domtrans($1_dbusd_t, $1_t)
+ 	corecmd_list_bin($1_dbusd_t)
+ 	corecmd_read_bin_symlinks($1_dbusd_t)
+ 	corecmd_read_bin_files($1_dbusd_t)
+@@ -171,6 +172,11 @@
  		xserver_use_xdm_fds($1_dbusd_t)
  		xserver_rw_xdm_pipes($1_dbusd_t)
  	')
@@ -543,9 +606,9 @@
  ')
  
  #######################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.5/policy/modules/services/ldap.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.6/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/ldap.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ldap.te	2006-08-08 16:15:43.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -555,9 +618,9 @@
  
  kernel_read_system_state(slapd_t)
  kernel_read_kernel_sysctls(slapd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.5/policy/modules/services/nis.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.6/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/nis.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/nis.te	2006-08-08 16:15:43.000000000 -0400
 @@ -249,8 +249,6 @@
  allow ypserv_t self:unix_dgram_socket create_socket_perms;
  allow ypserv_t self:unix_stream_socket create_stream_socket_perms;
@@ -567,9 +630,9 @@
  
  allow ypserv_t var_yp_t:dir rw_dir_perms;
  allow ypserv_t var_yp_t:file create_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.5/policy/modules/services/ntp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.6/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/ntp.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ntp.te	2006-08-08 16:15:43.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -579,9 +642,21 @@
  dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
  allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
  allow ntpd_t self:fifo_file { read write getattr };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.5/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.6/policy/modules/services/openvpn.te
+--- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/openvpn.te	2006-08-10 09:10:52.000000000 -0400
+@@ -33,7 +33,7 @@
+ allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow openvpn_t self:udp_socket create_socket_perms;
+ allow openvpn_t self:tcp_socket create_socket_perms;
+-allow openvpn_t self:netlink_route_socket r_netlink_socket_perms;
++allow openvpn_t self:netlink_route_socket rw_netlink_socket_perms;
+ 
+ allow openvpn_t openvpn_etc_t:dir r_dir_perms;
+ allow openvpn_t openvpn_etc_t:file r_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.6/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/pegasus.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/pegasus.if	2006-08-08 16:15:43.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -615,9 +690,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.5/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.6/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/pegasus.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/pegasus.te	2006-08-08 16:15:43.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -634,9 +709,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.5/policy/modules/services/postfix.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.6/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/postfix.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/postfix.te	2006-08-08 16:15:43.000000000 -0400
 @@ -250,6 +250,7 @@
  allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
  
@@ -672,9 +747,9 @@
  
  optional_policy(`
  	postgrey_stream_connect(postfix_smtpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.5/policy/modules/services/procmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.6/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/procmail.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/procmail.te	2006-08-08 16:15:43.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -683,9 +758,9 @@
  corenet_tcp_sendrecv_all_if(procmail_t)
  corenet_udp_sendrecv_all_if(procmail_t)
  corenet_tcp_sendrecv_all_nodes(procmail_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.5/policy/modules/services/samba.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.6/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/samba.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/samba.te	2006-08-08 16:15:43.000000000 -0400
 @@ -191,7 +191,7 @@
  allow smbd_t samba_etc_t:dir rw_dir_perms;
  allow smbd_t samba_etc_t:file { rw_file_perms setattr };
@@ -704,9 +779,9 @@
  allow nmbd_t samba_log_t:file { create ra_file_perms };
  
  allow nmbd_t samba_var_t:dir rw_dir_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.5/policy/modules/services/setroubleshoot.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -717,16 +792,16 @@
 +/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
 +
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.5/policy/modules/services/setroubleshoot.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if	2006-08-08 16:15:43.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.5/policy/modules/services/setroubleshoot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.5/policy/modules/services/setroubleshoot.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te	2006-08-08 16:15:43.000000000 -0400
 @@ -0,0 +1,105 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -833,9 +908,9 @@
 +
 +files_dontaudit_search_tmp(setroubleshootd_t)
 +files_dontaudit_search_src(setroubleshootd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.5/policy/modules/services/spamassassin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.6/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/spamassassin.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/spamassassin.te	2006-08-08 16:15:43.000000000 -0400
 @@ -194,3 +194,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -844,9 +919,9 @@
 +optional_policy(`
 +	postfix_read_config(spamd_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.5/policy/modules/services/squid.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.6/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/squid.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/squid.te	2006-08-08 16:15:43.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -859,9 +934,9 @@
  allow squid_t self:fifo_file rw_file_perms;
  allow squid_t self:sock_file r_file_perms;
  allow squid_t self:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.5/policy/modules/services/ssh.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.6/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/ssh.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ssh.if	2006-08-08 16:15:43.000000000 -0400
 @@ -1,5 +1,4 @@
  ## <summary>Secure shell client and server policy.</summary>
 -
@@ -896,9 +971,9 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.5/policy/modules/services/stunnel.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.6/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/stunnel.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/stunnel.te	2006-08-08 16:15:43.000000000 -0400
 @@ -105,6 +105,10 @@
  	')
  
@@ -910,9 +985,9 @@
          	seutil_sigchld_newrole(stunnel_t)
  	')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.5/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/xserver.if	2006-08-07 19:45:48.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.6/policy/modules/services/xserver.if
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/xserver.if	2006-08-09 11:16:27.000000000 -0400
 @@ -120,7 +119,9 @@
  	dev_setattr_generic_dirs($1_xserver_t)
  	# raw memory access is needed if not using the frame buffer
@@ -935,7 +1010,32 @@
  		auth_search_pam_console_data($1_xserver_t)
  	')
  
-@@ -1125,7 +1130,47 @@
+@@ -1051,6 +1056,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Read xdm temporary files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit
++##	</summary>
++## </param>
++#
++interface(`xserver_read_xdm_tmp_files',`
++	gen_require(`
++		type xdm_tmp_t;
++	')
++
++	allow $1 xdm_tmp_t:file { getattr read };
++')
++
++########################################
++## <summary>
+ ##	Kill XDM X servers
+ ## </summary>
+ ## <param name="domain">
+@@ -1103,7 +1126,47 @@
  	')
  
  	files_search_tmp($1)
@@ -984,19 +1084,21 @@
 +	allow $1 ice_tmp_t:dir ra_dir_perms;
 +	allow $1 ice_tmp_t:sock_file create_file_perms;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.5/policy/modules/services/xserver.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.6/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/services/xserver.te	2006-08-07 19:45:48.000000000 -0400
-@@ -81,7 +81,7 @@
++++ serefpolicy-2.3.6/policy/modules/services/xserver.te	2006-08-09 11:18:55.000000000 -0400
+@@ -81,15 +81,19 @@
  #
  
  allow xdm_t self:capability { setgid setuid sys_resource kill sys_tty_config mknod chown dac_override dac_read_search fowner fsetid ipc_owner sys_nice sys_rawio net_bind_service };
 -allow xdm_t self:process { setexec setpgid setsched setrlimit signal_perms setkeycreate };
 +allow xdm_t self:process { setexec setpgid getsched setsched setrlimit signal_perms setkeycreate };
  allow xdm_t self:fifo_file rw_file_perms;
++allow xdm_t self:key link;
  allow xdm_t self:shm create_shm_perms;
  allow xdm_t self:sem create_sem_perms;
-@@ -89,7 +89,9 @@
+ allow xdm_t self:unix_stream_socket { connectto create_stream_socket_perms };
++allow xdm_t self:netlink_route_socket r_netlink_socket_perms;
  allow xdm_t self:unix_dgram_socket create_socket_perms;
  allow xdm_t self:tcp_socket create_stream_socket_perms;
  allow xdm_t self:udp_socket create_socket_perms;
@@ -1007,15 +1109,16 @@
  
  # Supress permission check on .ICE-unix
  dontaudit xdm_t ice_tmp_t:dir { getattr setattr };
-@@ -106,6 +108,7 @@
+@@ -106,6 +110,8 @@
  
  kernel_read_system_state(xdm_t)
  kernel_read_kernel_sysctls(xdm_t)
++kernel_read_net_sysctls(xdm_t)
 +kernel_read_network_state(xdm_t)
  
  corecmd_exec_shell(xdm_t)
  corecmd_exec_bin(xdm_t)
-@@ -154,6 +157,7 @@
+@@ -154,6 +160,7 @@
  domain_dontaudit_read_all_domains_state(xdm_t)
  
  files_read_etc_files(xdm_t)
@@ -1023,7 +1126,16 @@
  files_read_etc_runtime_files(xdm_t)
  files_exec_etc_files(xdm_t)
  files_list_mnt(xdm_t)
-@@ -257,7 +261,7 @@
+@@ -180,6 +187,8 @@
+ 
+ auth_manage_pam_pid(xdm_t)
+ auth_manage_pam_console_data(xdm_t)
++auth_rw_faillog(xdm_t)
++auth_write_login_records(xdm_t)
+ 
+ init_use_script_ptys(xdm_t)
+ # Run telinit->init to shutdown.
+@@ -257,7 +266,7 @@
  	allow xdm_t xdm_xserver_tmp_t:sock_file unlink;
  	allow xdm_t xdm_xserver_tmp_t:file unlink;
  
@@ -1032,9 +1144,9 @@
  	allow xdm_t xserver_log_t:file manage_file_perms;
  	allow xdm_t xserver_log_t:fifo_file manage_file_perms;
  	logging_log_filetrans(xdm_t,xserver_log_t,file)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.5/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.6/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/fstools.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/fstools.te	2006-08-08 16:15:43.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -1043,9 +1155,9 @@
  
  domain_use_interactive_fds(fsadm_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.5/policy/modules/system/hostname.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.6/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/hostname.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/hostname.te	2006-08-08 16:15:43.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -1068,9 +1180,9 @@
 +	xen_dontaudit_use_fds(hostname_t)
 +')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.5/policy/modules/system/init.if
---- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/init.if	2006-08-07 19:45:48.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.6/policy/modules/system/init.if
+--- nsaserefpolicy/policy/modules/system/init.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/init.if	2006-08-08 16:15:43.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -1085,21 +1197,35 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.5/policy/modules/system/libraries.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.6/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/init.te	2006-08-09 09:15:19.000000000 -0400
+@@ -361,6 +361,8 @@
+ logging_read_audit_config(initrc_t)
+ 
+ miscfiles_read_localization(initrc_t)
++miscfiles_write_localization(initrc_t)
++
+ # slapd needs to read cert files from its initscript
+ miscfiles_read_certs(initrc_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.6/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/libraries.fc	2006-08-07 19:45:48.000000000 -0400
-@@ -200,7 +200,7 @@
++++ serefpolicy-2.3.6/policy/modules/system/libraries.fc	2006-08-09 14:03:56.000000000 -0400
+@@ -199,8 +199,8 @@
+ /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/libavcodec-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/libavcodec-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 -/usr/lib(64)?/libavutil-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libavcodec.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libavutil.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.5/policy/modules/system/locallogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.6/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/locallogin.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/locallogin.te	2006-08-08 16:15:43.000000000 -0400
 @@ -47,7 +47,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -1118,9 +1244,9 @@
  
  dev_setattr_mouse_dev(local_login_t)
  dev_getattr_mouse_dev(local_login_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.5/policy/modules/system/logging.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.6/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/logging.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -1128,9 +1254,9 @@
 +
 +/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.5/policy/modules/system/logging.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.6/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/logging.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.if	2006-08-08 16:15:43.000000000 -0400
 @@ -553,3 +553,24 @@
  	allow $1 var_log_t:dir rw_dir_perms;
  	allow $1 var_log_t:file create_file_perms;
@@ -1156,9 +1282,9 @@
 +	allow $1 auditd_var_run_t:sock_file rw_file_perms;
 +	allow $1 auditd_t:unix_stream_socket connectto;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.5/policy/modules/system/logging.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.6/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/logging.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.te	2006-08-08 16:15:43.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -1171,9 +1297,9 @@
  
  kernel_read_kernel_sysctls(auditd_t)
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.5/policy/modules/system/miscfiles.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.6/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/miscfiles.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/miscfiles.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -9,6 +9,7 @@
  # /etc
  #
@@ -1182,10 +1308,46 @@
  /etc/pki(/.*)?			gen_context(system_u:object_r:cert_t,s0)
  
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.5/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.6/policy/modules/system/miscfiles.if
+--- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/miscfiles.if	2006-08-09 09:15:31.000000000 -0400
+@@ -116,6 +116,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Allow process to write localization info
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`miscfiles_write_localization',`
++	gen_require(`
++		type locale_t;
++	')
++
++	allow $1 locale_t:file rw_file_perms;
++')
++
++########################################
++## <summary>
+ ##	Allow process to read legacy time localization info
+ ## </summary>
+ ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.6/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/mount.te	2006-08-07 19:45:48.000000000 -0400
-@@ -97,6 +97,8 @@
++++ serefpolicy-2.3.6/policy/modules/system/mount.te	2006-08-08 16:38:58.000000000 -0400
+@@ -80,6 +80,7 @@
+ files_read_isid_type_files(mount_t)
+ # For reading cert files
+ files_read_usr_files(mount_t)
++files_list_mnt(mount_t)
+ 
+ init_use_fds(mount_t)
+ init_use_script_ptys(mount_t)
+@@ -97,6 +98,8 @@
  
  sysnet_use_portmap(mount_t)
  
@@ -1194,9 +1356,9 @@
  userdom_use_all_users_fds(mount_t)
  
  ifdef(`distro_redhat',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.5/policy/modules/system/selinuxutil.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.6/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/selinuxutil.te	2006-08-07 20:14:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/selinuxutil.te	2006-08-09 11:02:28.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -1216,20 +1378,22 @@
  seutil_search_default_contexts(semanage_t)
  seutil_manage_file_contexts(semanage_t)
  seutil_manage_selinux_config(semanage_t)
-@@ -613,6 +618,10 @@
+@@ -611,6 +616,12 @@
+ 	# Handle pp files created in homedir and /tmp
+ 	files_read_generic_tmp_files(semanage_t)
  	userdom_read_generic_user_home_content_files(semanage_t)
++',`
++	ifdef(`enable_mls',`
++		userdom_read_user_tmp_files(secadm, semanage_t)
++	',`
++		userdom_read_user_tmp_files(sysadm, semanage_t)
++	')
  ')
  
-+ifdef(`enable_mls',`
-+	userdom_read_user_tmp_files(secadm, semanage_t)
-+')
-+
  optional_policy(`
- 	nscd_socket_use(semanage_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.5/policy/modules/system/udev.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.6/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/udev.fc	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/udev.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -1,5 +1,6 @@
  # udev
  
@@ -1237,9 +1401,20 @@
  /dev/\.udevdb	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.5/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.6/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/udev.te	2006-08-09 09:15:39.000000000 -0400
+@@ -129,6 +129,7 @@
+ mls_file_upgrade(udev_t)
+ mls_file_downgrade(udev_t)
+ mls_process_write_down(udev_t)
++mcs_ptrace_all(udev_t)
+ 
+ modutils_domtrans_insmod(udev_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.6/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/unconfined.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/unconfined.if	2006-08-08 16:15:43.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -1256,9 +1431,9 @@
  	files_unconfined($1)
  	fs_unconfined($1)
  	selinux_unconfined($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.5/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.6/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/unconfined.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/unconfined.te	2006-08-08 16:15:43.000000000 -0400
 @@ -195,4 +195,9 @@
  ifdef(`targeted_policy',`
  	allow unconfined_execmem_t self:process { execstack execmem };
@@ -1269,9 +1444,9 @@
 +		unconfined_dbus_chat(unconfined_execmem_t)
 +	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.5/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.6/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/userdomain.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/userdomain.if	2006-08-09 14:04:54.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1521,15 +1696,18 @@
  		canna_stream_connect($1_t)
  	')
  
-@@ -472,6 +518,7 @@
+@@ -470,8 +516,10 @@
+ 		xserver_stream_connect_xdm($1_t)
+ 		# certain apps want to read xdm.pid file
  		xserver_read_xdm_pid($1_t)
++		xserver_read_xdm_tmp_files($1_t)
  		# gnome-session creates socket under /tmp/.ICE-unix/
  		xserver_create_xdm_tmp_sockets($1_t)
 +		xserver_create_ice_tmp_sockets($1_t)
  	')
  ')
  
-@@ -501,6 +548,7 @@
+@@ -501,6 +549,7 @@
  
  	# Inherit rules for ordinary users.
  	base_user_template($1)
@@ -1537,7 +1715,7 @@
  
  	typeattribute $1_t unpriv_userdomain;
  	domain_interactive_fd($1_t)
-@@ -521,9 +569,6 @@
+@@ -521,9 +570,6 @@
  	# Local policy
  	#
  
@@ -1547,7 +1725,7 @@
  	# Rules used to associate a homedir as a mountpoint
  	allow $1_home_t self:filesystem associate;
  	allow $1_file_type $1_home_t:filesystem associate;
-@@ -535,10 +580,6 @@
+@@ -535,10 +581,6 @@
  	allow privhome $1_home_t:sock_file create_file_perms;
  	allow privhome $1_home_t:fifo_file create_file_perms;
  	type_transition privhome $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
@@ -1558,7 +1736,7 @@
  	dev_read_sysfs($1_t)
  
  	corecmd_exec_all_executables($1_t)
-@@ -546,11 +587,8 @@
+@@ -546,11 +588,8 @@
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
  
@@ -1571,7 +1749,7 @@
  	# Read directories and files with the readable_t type.
  	# This type is a general type for "world"-readable files.
  	files_list_world_readable($1_t)
-@@ -558,8 +596,6 @@
+@@ -558,8 +597,6 @@
  	files_read_world_readable_symlinks($1_t)
  	files_read_world_readable_pipes($1_t)
  	files_read_world_readable_sockets($1_t)
@@ -1580,7 +1758,25 @@
  
  	init_read_utmp($1_t)
  	# The library functions always try to open read-write first,
-@@ -748,6 +784,7 @@
+@@ -665,6 +702,8 @@
+ 
+ 	# do not audit read on disk devices
+ 	dontaudit $1_t { removable_device_t fixed_disk_device_t }:blk_file read;
++	dontaudit $1_t sysadm_home_t:file { read append };
++	userdom_dontaudit_append_sysadm_home_content_files($1_t)
+ 
+ 	ifdef(`xdm.te', `
+ 		allow xdm_t $1_home_t:lnk_file read;
+@@ -701,8 +740,6 @@
+ 	# Do not audit write denials to /etc/ld.so.cache.
+ 	dontaudit $1_t ld_so_cache_t:file write;
+ 
+-	dontaudit $1_t sysadm_home_t:file { read append };
+-
+ 	allow $1_t initrc_t:fifo_file write;
+ 	') dnl end TODO
+ ')
+@@ -748,6 +785,7 @@
  
  	# Inherit rules for ordinary users.
  	base_user_template($1)
@@ -1588,7 +1784,7 @@
  
  	typeattribute $1_t privhome;
  	domain_obj_id_change_exemption($1_t)
-@@ -783,11 +820,6 @@
+@@ -783,11 +821,6 @@
  
  	allow $1_t self:netlink_audit_socket nlmsg_readpriv;
  
@@ -1600,7 +1796,7 @@
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -855,6 +887,7 @@
+@@ -855,6 +888,7 @@
  	domain_getattr_all_sockets($1_t)
  
  	files_exec_usr_src_files($1_t)
@@ -1608,7 +1804,7 @@
  
  	init_rw_initctl($1_t)
  
-@@ -3408,6 +3441,25 @@
+@@ -3408,6 +3442,25 @@
  
  ########################################
  ## <summary>
@@ -1626,7 +1822,7 @@
 +		type sysadm_home_t;
 +	')
 +
-+	dontaudit $1 sysadm_home_t:file append;
++	dontaudit $1 sysadm_home_t:file ra_file_perms;
 +')
 +
 +########################################
@@ -1634,7 +1830,7 @@
  ##	Read files in the staff users home directory.
  ## </summary>
  ## <param name="domain">
-@@ -4128,7 +4180,7 @@
+@@ -4128,7 +4181,7 @@
  	gen_require(`
  		type user_home_dir_t;
  	')
@@ -1643,7 +1839,7 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-@@ -4789,3 +4841,34 @@
+@@ -4789,3 +4842,34 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -1678,9 +1874,9 @@
 +        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.5/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.6/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/userdomain.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/userdomain.te	2006-08-08 16:15:43.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -1789,9 +1985,9 @@
  		', `
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.5/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.6/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/xen.if	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/xen.if	2006-08-08 16:15:43.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -1834,9 +2030,9 @@
 +
 +	dontaudit $1 xend_t:fd use;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.5/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.6/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.5/policy/modules/system/xen.te	2006-08-07 19:45:48.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/xen.te	2006-08-08 16:15:43.000000000 -0400
 @@ -69,7 +69,10 @@
  #
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- selinux-policy.spec	8 Aug 2006 13:00:32 -0000	1.178
+++ selinux-policy.spec	10 Aug 2006 13:19:30 -0000	1.179
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.5
+Version: 2.3.6
 Release: 1.fc5
 License: GPL
 Group: System Environment/Base
@@ -347,6 +347,15 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-2.fc5
+- Bump for FC5
+
+* Wed Aug 9 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-2
+- More fixes for strict policy
+
+* Tue Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-1
+- Quiet down anaconda audit messages
+
 * Tue Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 2.3.5-1.fc5
 - Bump for FC5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	8 Aug 2006 13:00:32 -0000	1.64
+++ sources	10 Aug 2006 13:19:30 -0000	1.65
@@ -1 +1 @@
-dd1d9d958535e36048d5470580d3f108  serefpolicy-2.3.5.tgz
+d374829a4b5a08e44d337dc5cbf77d21  serefpolicy-2.3.6.tgz



From fedora-cvs-commits at redhat.com  Thu Aug 10 13:28:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 09:28:55 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.36, 1.37 gnome-vfs2.spec, 1.126,
	1.127 sources, 1.37, 1.38
Message-ID: <200608101328.k7ADSsdv013565@cvs.devel.redhat.com>

Author: alexl

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

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-1
- update to 2.15.91




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	3 Aug 2006 19:41:57 -0000	1.36
+++ .cvsignore	10 Aug 2006 13:28:51 -0000	1.37
@@ -1 +1 @@
-gnome-vfs-2.15.90.tar.bz2
+gnome-vfs-2.15.91.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- gnome-vfs2.spec	4 Aug 2006 20:17:57 -0000	1.126
+++ gnome-vfs2.spec	10 Aug 2006 13:28:51 -0000	1.127
@@ -12,8 +12,8 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.15.90
-Release: 2%{?dist}
+Version: 2.15.91
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -195,6 +195,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-1
+- update to 2.15.91
+
 * Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> -2.15.90-2.fc6
 - Remove debug spew
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	3 Aug 2006 19:41:57 -0000	1.37
+++ sources	10 Aug 2006 13:28:51 -0000	1.38
@@ -1 +1 @@
-5922610d181ec7a8b35aeb826dbe107d  gnome-vfs-2.15.90.tar.bz2
+60a7a63b8ecdc04d13f9f9de0714205a  gnome-vfs-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 10 13:29:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 09:29:17 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060802.patch,1.2,1.3
Message-ID: <200608101329.k7ADTH9C013701@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060802.patch 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-2.fc5
- Bump for FC5


policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/usermanage.te        |    4 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.te          |    2 
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 +++++++++++
 modules/kernel/terminal.if         |   19 ++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cron.te           |    1 
 modules/services/cups.te           |    8 -
 modules/services/cyrus.te          |    1 
 modules/services/dbus.if           |    6 
 modules/services/ldap.te           |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    6 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  105 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   25 +++
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   68 ++++++++++
 modules/services/xserver.te        |   15 +-
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/init.te             |    2 
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/miscfiles.if        |   18 ++
 modules/system/mount.te            |    3 
 modules/system/selinuxutil.te      |   11 +
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  236 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   50 +++----
 modules/system/xen.if              |   38 +++++
 modules/system/xen.te              |   26 +++-
 65 files changed, 796 insertions(+), 168 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060802.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policy-20060802.patch	10 Aug 2006 13:19:30 -0000	1.2
+++ policy-20060802.patch	10 Aug 2006 13:29:13 -0000	1.3
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.6/policy/mls
---- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.6/policy/mls	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/mls	2006-08-08 16:00:22.000000000 -0400
++++ serefpolicy-2.3.6/policy/mls	2006-08-10 09:24:43.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -23,8 +23,8 @@
  	((( l1 dom l2 ) and ( l1 domby h2 )) or
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.6/policy/modules/admin/anaconda.te
---- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/anaconda.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-08-08 16:00:25.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/anaconda.te	2006-08-10 09:24:43.000000000 -0400
 @@ -25,8 +25,12 @@
  
  modutils_domtrans_insmod(anaconda_t)
@@ -68,8 +68,8 @@
 +dontaudit domain anaconda_t:unix_stream_socket connectto;
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.6/policy/modules/admin/consoletype.te
---- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/consoletype.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-08-08 16:00:25.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/consoletype.te	2006-08-10 09:24:43.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -93,8 +93,8 @@
 +	xen_dontaudit_use_fds(consoletype_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.6/policy/modules/admin/firstboot.te
---- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/firstboot.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-08 16:00:25.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/firstboot.te	2006-08-10 09:24:43.000000000 -0400
 @@ -106,7 +106,7 @@
  ')
  
@@ -105,8 +105,8 @@
  
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.6/policy/modules/admin/prelink.te
---- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/prelink.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-08 16:00:25.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/prelink.te	2006-08-10 09:24:43.000000000 -0400
 @@ -1,4 +1,3 @@
 -
  policy_module(prelink,1.1.5)
@@ -122,8 +122,8 @@
  	cron_system_entry(prelink_t, prelink_exec_t)
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.6/policy/modules/admin/rpm.fc
---- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/rpm.fc	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/rpm.fc	2006-08-10 09:24:43.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -134,8 +134,8 @@
  
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.6/policy/modules/admin/usermanage.te
---- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/usermanage.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-08 16:00:25.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/usermanage.te	2006-08-10 09:24:43.000000000 -0400
 @@ -260,7 +260,7 @@
  ')
  
@@ -155,8 +155,8 @@
  ')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.6/policy/modules/apps/mozilla.if
---- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-08 14:59:36.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/apps/mozilla.if	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-08 16:00:22.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/apps/mozilla.if	2006-08-10 09:24:43.000000000 -0400
 @@ -63,6 +63,7 @@
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
@@ -174,8 +174,8 @@
  	# Browse the web, connect to printer
  	sysnet_dns_name_resolve($1_mozilla_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc
---- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-08 16:00:25.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc	2006-08-10 09:24:43.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -185,8 +185,8 @@
  ifdef(`distro_debian',`
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in
---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in	2006-08-09 12:58:00.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in	2006-08-10 09:24:43.000000000 -0400
 @@ -73,6 +73,7 @@
  network_port(dhcpc, udp,68,s0)
  network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
@@ -213,8 +213,8 @@
  network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
  network_port(spamd, tcp,783,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.6/policy/modules/kernel/devices.te
---- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/devices.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-08 16:00:25.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/devices.te	2006-08-10 09:24:43.000000000 -0400
 @@ -166,7 +166,7 @@
  dev_node(vmware_device_t)
  
@@ -225,8 +225,8 @@
  type xen_device_t;
  dev_node(xen_device_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.6/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/files.if	2006-08-08 16:38:46.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-08 16:00:25.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/files.if	2006-08-10 09:24:43.000000000 -0400
 @@ -2934,6 +2934,24 @@
  
  ########################################
@@ -253,8 +253,8 @@
  ## </summary>
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.6/policy/modules/kernel/filesystem.te
---- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/filesystem.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/filesystem.te	2006-08-10 09:24:43.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -272,8 +272,8 @@
  ########################################
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.6/policy/modules/kernel/kernel.if
---- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/kernel.if	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-08-08 16:00:25.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/kernel.if	2006-08-10 09:24:43.000000000 -0400
 @@ -1456,6 +1456,42 @@
  
  ########################################
@@ -361,8 +361,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.6/policy/modules/kernel/terminal.if
---- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/terminal.if	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-08 16:00:25.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/terminal.if	2006-08-10 09:24:43.000000000 -0400
 @@ -308,6 +308,7 @@
  		type devpts_t;
  	')
@@ -394,8 +394,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.6/policy/modules/services/amavis.te
---- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/amavis.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/amavis.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/amavis.te	2006-08-10 09:24:43.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -426,8 +426,8 @@
 +	postfix_read_config(amavis_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.6/policy/modules/services/apache.te
---- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/apache.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/apache.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/apache.te	2006-08-10 09:24:43.000000000 -0400
 @@ -273,7 +273,6 @@
  sysnet_read_config(httpd_t)
  
@@ -437,8 +437,8 @@
  mta_send_mail(httpd_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.6/policy/modules/services/avahi.te
---- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/avahi.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/avahi.te	2006-08-10 09:24:43.000000000 -0400
 @@ -79,6 +79,7 @@
  
  sysnet_read_config(avahi_t)
@@ -448,8 +448,8 @@
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.6/policy/modules/services/bind.te
---- nsaserefpolicy/policy/modules/services/bind.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/bind.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/bind.te	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/bind.te	2006-08-10 09:24:43.000000000 -0400
 @@ -226,6 +226,7 @@
  allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
  
@@ -459,8 +459,8 @@
  allow ndc_t named_t:tcp_socket { connectto recvfrom };
  allow ndc_t named_t:unix_stream_socket connectto;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.6/policy/modules/services/bluetooth.te
---- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/bluetooth.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/bluetooth.te	2006-08-10 09:24:43.000000000 -0400
 @@ -247,3 +247,8 @@
  optional_policy(`
         	xserver_stream_connect_xdm(bluetooth_helper_t)
@@ -471,16 +471,16 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.6/policy/modules/services/clamav.if
---- nsaserefpolicy/policy/modules/services/clamav.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/clamav.if	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/clamav.if	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/clamav.if	2006-08-10 09:24:43.000000000 -0400
 @@ -102,3 +102,4 @@
  	allow clamscan_t $1:fifo_file rw_file_perms;
  	allow clamscan_t $1:process sigchld;
  ')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.6/policy/modules/services/cron.if
---- nsaserefpolicy/policy/modules/services/cron.if	2006-08-08 14:59:36.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cron.if	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/cron.if	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cron.if	2006-08-10 09:24:43.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -524,8 +524,8 @@
  		# fcron wants an instant update of a crontab change for the administrator
  		# also crontab does a security check for crontab -u
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.6/policy/modules/services/cron.te
---- nsaserefpolicy/policy/modules/services/cron.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cron.te	2006-08-09 09:15:00.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cron.te	2006-08-10 09:24:43.000000000 -0400
 @@ -173,6 +173,7 @@
  	allow crond_t crond_tmp_t:dir create_dir_perms;
  	allow crond_t crond_tmp_t:file create_file_perms;
@@ -535,8 +535,8 @@
  	mta_send_mail(crond_t)
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.6/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cups.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cups.te	2006-08-10 09:24:43.000000000 -0400
 @@ -74,13 +74,14 @@
  #
  
@@ -573,8 +573,8 @@
  sysnet_read_config(cupsd_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.6/policy/modules/services/cyrus.te
---- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cyrus.te	2006-08-09 12:58:45.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cyrus.te	2006-08-10 09:24:43.000000000 -0400
 @@ -69,6 +69,7 @@
  corenet_udp_sendrecv_all_ports(cyrus_t)
  corenet_tcp_bind_all_nodes(cyrus_t)
@@ -584,8 +584,8 @@
  corenet_tcp_connect_all_ports(cyrus_t)
  corenet_sendrecv_mail_server_packets(cyrus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.6/policy/modules/services/dbus.if
---- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/dbus.if	2006-08-09 11:12:25.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/dbus.if	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/dbus.if	2006-08-10 09:24:43.000000000 -0400
 @@ -123,6 +123,7 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
@@ -607,8 +607,8 @@
  
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.6/policy/modules/services/ldap.te
---- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ldap.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ldap.te	2006-08-10 09:24:43.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -619,8 +619,8 @@
  kernel_read_system_state(slapd_t)
  kernel_read_kernel_sysctls(slapd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.6/policy/modules/services/nis.te
---- nsaserefpolicy/policy/modules/services/nis.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/nis.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/nis.te	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/nis.te	2006-08-10 09:24:43.000000000 -0400
 @@ -249,8 +249,6 @@
  allow ypserv_t self:unix_dgram_socket create_socket_perms;
  allow ypserv_t self:unix_stream_socket create_stream_socket_perms;
@@ -631,8 +631,8 @@
  allow ypserv_t var_yp_t:dir rw_dir_perms;
  allow ypserv_t var_yp_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.6/policy/modules/services/ntp.te
---- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ntp.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ntp.te	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ntp.te	2006-08-10 09:24:43.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -643,8 +643,8 @@
  allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
  allow ntpd_t self:fifo_file { read write getattr };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.6/policy/modules/services/openvpn.te
---- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/openvpn.te	2006-08-10 09:10:52.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/openvpn.te	2006-08-10 09:24:43.000000000 -0400
 @@ -33,7 +33,7 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -655,8 +655,8 @@
  allow openvpn_t openvpn_etc_t:dir r_dir_perms;
  allow openvpn_t openvpn_etc_t:file r_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.6/policy/modules/services/pegasus.if
---- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/pegasus.if	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/pegasus.if	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/pegasus.if	2006-08-10 09:24:43.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -691,8 +691,8 @@
 +	allow pegasus_t $1:process sigchld;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.6/policy/modules/services/pegasus.te
---- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/pegasus.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/pegasus.te	2006-08-10 09:24:43.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -710,8 +710,8 @@
  
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.6/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/postfix.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/postfix.te	2006-08-10 09:24:43.000000000 -0400
 @@ -250,6 +250,7 @@
  allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
  
@@ -748,8 +748,8 @@
  optional_policy(`
  	postgrey_stream_connect(postfix_smtpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.6/policy/modules/services/procmail.te
---- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/procmail.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/procmail.te	2006-08-10 09:24:43.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -759,8 +759,17 @@
  corenet_udp_sendrecv_all_if(procmail_t)
  corenet_tcp_sendrecv_all_nodes(procmail_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.6/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/samba.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/samba.te	2006-08-10 09:28:00.000000000 -0400
+@@ -171,7 +171,7 @@
+ #
+ # smbd Local policy
+ #
+-allow smbd_t self:capability { setgid setuid sys_resource lease dac_override dac_read_search };
++allow smbd_t self:capability { fowner setgid setuid sys_resource lease dac_override dac_read_search };
+ dontaudit smbd_t self:capability sys_tty_config;
+ allow smbd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow smbd_t self:process setrlimit;
 @@ -191,7 +191,7 @@
  allow smbd_t samba_etc_t:dir rw_dir_perms;
  allow smbd_t samba_etc_t:file { rw_file_perms setattr };
@@ -781,7 +790,7 @@
  allow nmbd_t samba_var_t:dir rw_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc	2006-08-10 09:24:43.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -794,14 +803,14 @@
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if	2006-08-10 09:24:43.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te	2006-08-10 09:24:43.000000000 -0400
 @@ -0,0 +1,105 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -909,8 +918,8 @@
 +files_dontaudit_search_tmp(setroubleshootd_t)
 +files_dontaudit_search_src(setroubleshootd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.6/policy/modules/services/spamassassin.te
---- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/spamassassin.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-08-08 16:00:27.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/spamassassin.te	2006-08-10 09:24:43.000000000 -0400
 @@ -194,3 +194,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -920,8 +929,8 @@
 +	postfix_read_config(spamd_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.6/policy/modules/services/squid.te
---- nsaserefpolicy/policy/modules/services/squid.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/squid.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/squid.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/squid.te	2006-08-10 09:24:43.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -935,8 +944,8 @@
  allow squid_t self:sock_file r_file_perms;
  allow squid_t self:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.6/policy/modules/services/ssh.if
---- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ssh.if	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ssh.if	2006-08-10 09:24:43.000000000 -0400
 @@ -1,5 +1,4 @@
  ## <summary>Secure shell client and server policy.</summary>
 -
@@ -972,8 +981,8 @@
 +	allow ssh_keygen_t $1:process sigchld;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.6/policy/modules/services/stunnel.te
---- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/stunnel.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/stunnel.te	2006-08-10 09:24:43.000000000 -0400
 @@ -105,6 +105,10 @@
  	')
  
@@ -986,9 +995,9 @@
  	')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.6/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-08 14:59:36.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/xserver.if	2006-08-09 11:16:27.000000000 -0400
-@@ -120,7 +119,9 @@
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/xserver.if	2006-08-10 09:24:43.000000000 -0400
+@@ -120,7 +120,9 @@
  	dev_setattr_generic_dirs($1_xserver_t)
  	# raw memory access is needed if not using the frame buffer
  	dev_read_raw_memory($1_xserver_t)
@@ -999,7 +1008,7 @@
  	# for other device nodes such as the NVidia binary-only driver
  	dev_rw_xserver_misc($1_xserver_t)
  	# read events - the synaptics touchpad driver reads raw events
-@@ -160,6 +161,10 @@
+@@ -160,6 +162,10 @@
  	sysnet_read_config($1_xserver_t)
  
  	optional_policy(`
@@ -1010,7 +1019,7 @@
  		auth_search_pam_console_data($1_xserver_t)
  	')
  
-@@ -1051,6 +1056,24 @@
+@@ -1051,6 +1057,24 @@
  
  ########################################
  ## <summary>
@@ -1035,7 +1044,7 @@
  ##	Kill XDM X servers
  ## </summary>
  ## <param name="domain">
-@@ -1103,7 +1126,47 @@
+@@ -1103,7 +1127,47 @@
  	')
  
  	files_search_tmp($1)
@@ -1085,8 +1094,8 @@
 +	allow $1 ice_tmp_t:sock_file create_file_perms;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.6/policy/modules/services/xserver.te
---- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/xserver.te	2006-08-09 11:18:55.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-08 16:00:32.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/xserver.te	2006-08-10 09:24:43.000000000 -0400
 @@ -81,15 +81,19 @@
  #
  
@@ -1145,8 +1154,8 @@
  	allow xdm_t xserver_log_t:fifo_file manage_file_perms;
  	logging_log_filetrans(xdm_t,xserver_log_t,file)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.6/policy/modules/system/fstools.te
---- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/fstools.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/fstools.te	2006-08-10 09:24:43.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -1156,8 +1165,8 @@
  domain_use_interactive_fds(fsadm_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.6/policy/modules/system/hostname.te
---- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/hostname.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/hostname.te	2006-08-08 16:00:23.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/hostname.te	2006-08-10 09:24:43.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -1181,8 +1190,8 @@
 +')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.6/policy/modules/system/init.if
---- nsaserefpolicy/policy/modules/system/init.if	2006-08-08 14:59:36.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/init.if	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/init.if	2006-08-08 16:00:23.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/init.if	2006-08-10 09:24:43.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -1198,8 +1207,8 @@
  
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.6/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/init.te	2006-08-09 09:15:19.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/init.te	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/init.te	2006-08-10 09:24:43.000000000 -0400
 @@ -361,6 +361,8 @@
  logging_read_audit_config(initrc_t)
  
@@ -1210,8 +1219,8 @@
  miscfiles_read_certs(initrc_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.6/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/libraries.fc	2006-08-09 14:03:56.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/libraries.fc	2006-08-10 09:24:43.000000000 -0400
 @@ -199,8 +199,8 @@
  /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -1224,8 +1233,8 @@
  /usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.6/policy/modules/system/locallogin.te
---- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/locallogin.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/locallogin.te	2006-08-10 09:24:43.000000000 -0400
 @@ -47,7 +47,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -1245,8 +1254,8 @@
  dev_setattr_mouse_dev(local_login_t)
  dev_getattr_mouse_dev(local_login_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.6/policy/modules/system/logging.fc
---- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/logging.fc	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.fc	2006-08-10 09:24:43.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -1255,8 +1264,8 @@
 +/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.6/policy/modules/system/logging.if
---- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/logging.if	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/logging.if	2006-08-08 16:00:23.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.if	2006-08-10 09:24:43.000000000 -0400
 @@ -553,3 +553,24 @@
  	allow $1 var_log_t:dir rw_dir_perms;
  	allow $1 var_log_t:file create_file_perms;
@@ -1283,8 +1292,8 @@
 +	allow $1 auditd_t:unix_stream_socket connectto;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.6/policy/modules/system/logging.te
---- nsaserefpolicy/policy/modules/system/logging.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/logging.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/logging.te	2006-08-08 16:00:23.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.te	2006-08-10 09:24:43.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -1298,8 +1307,8 @@
  kernel_read_kernel_sysctls(auditd_t)
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.6/policy/modules/system/miscfiles.fc
---- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/miscfiles.fc	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/miscfiles.fc	2006-08-10 09:24:43.000000000 -0400
 @@ -9,6 +9,7 @@
  # /etc
  #
@@ -1309,8 +1318,8 @@
  
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.6/policy/modules/system/miscfiles.if
---- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/miscfiles.if	2006-08-09 09:15:31.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/miscfiles.if	2006-08-10 09:24:43.000000000 -0400
 @@ -116,6 +116,24 @@
  
  ########################################
@@ -1337,8 +1346,8 @@
  ## </summary>
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.6/policy/modules/system/mount.te
---- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/mount.te	2006-08-08 16:38:58.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/mount.te	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/mount.te	2006-08-10 09:24:43.000000000 -0400
 @@ -80,6 +80,7 @@
  files_read_isid_type_files(mount_t)
  # For reading cert files
@@ -1357,8 +1366,8 @@
  
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.6/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/selinuxutil.te	2006-08-09 11:02:28.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/selinuxutil.te	2006-08-10 09:24:43.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -1392,8 +1401,8 @@
  
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.6/policy/modules/system/udev.fc
---- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/udev.fc	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/udev.fc	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/udev.fc	2006-08-10 09:24:43.000000000 -0400
 @@ -1,5 +1,6 @@
  # udev
  
@@ -1402,8 +1411,8 @@
  /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.6/policy/modules/system/udev.te
---- nsaserefpolicy/policy/modules/system/udev.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/udev.te	2006-08-09 09:15:39.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/udev.te	2006-08-08 16:00:23.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/udev.te	2006-08-10 09:24:43.000000000 -0400
 @@ -129,6 +129,7 @@
  mls_file_upgrade(udev_t)
  mls_file_downgrade(udev_t)
@@ -1413,8 +1422,8 @@
  modutils_domtrans_insmod(udev_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.6/policy/modules/system/unconfined.if
---- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/unconfined.if	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/unconfined.if	2006-08-10 09:24:43.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -1432,8 +1441,8 @@
  	fs_unconfined($1)
  	selinux_unconfined($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.6/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/unconfined.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/unconfined.te	2006-08-10 09:24:43.000000000 -0400
 @@ -195,4 +195,9 @@
  ifdef(`targeted_policy',`
  	allow unconfined_execmem_t self:process { execstack execmem };
@@ -1445,8 +1454,8 @@
 +	')
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.6/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/userdomain.if	2006-08-09 14:04:54.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/userdomain.if	2006-08-10 09:24:43.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1875,8 +1884,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.6/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/userdomain.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-08-08 16:00:23.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/userdomain.te	2006-08-10 09:24:43.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -1986,8 +1995,8 @@
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.6/policy/modules/system/xen.if
---- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/xen.if	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/xen.if	2006-08-08 16:00:23.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/xen.if	2006-08-10 09:24:43.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -2031,8 +2040,8 @@
 +	dontaudit $1 xend_t:fd use;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.6/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/xen.te	2006-08-08 16:15:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-08-08 16:00:24.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/xen.te	2006-08-10 09:24:43.000000000 -0400
 @@ -69,7 +69,10 @@
  #
  



From fedora-cvs-commits at redhat.com  Thu Aug 10 13:34:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 09:34:29 -0400
Subject: rpms/pam/devel pam-0.99.5.0-keyinit-revoke-user.patch, NONE,
	1.1 pam-0.99.5.0-succif-unknown-user.patch, NONE, 1.1 pam.spec,
	1.128, 1.129
Message-ID: <200608101334.k7ADYSnK014992@cvs.devel.redhat.com>

Author: tmraz

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

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.5.0-keyinit-revoke-user.patch 
	pam-0.99.5.0-succif-unknown-user.patch 
Log Message:
* Thu Aug 10 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-7
- revoke keyrings properly when pam_keyinit called as root (#201048)
- pam_succeed_if should return PAM_USER_UNKNOWN when getpwnam fails (#197748)


pam-0.99.5.0-keyinit-revoke-user.patch:
 pam_keyinit.c |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

--- NEW FILE pam-0.99.5.0-keyinit-revoke-user.patch ---
diff -uNrp Linux-PAM-0.99.5.0/modules/pam_keyinit/pam_keyinit.c Linux-PAM-0.99.5.0.orig/modules/pam_keyinit/pam_keyinit.c
--- Linux-PAM-0.99.5.0.orig/modules/pam_keyinit/pam_keyinit.c	2006-08-09 14:00:04.000000000 +0100
+++ Linux-PAM-0.99.5.0/modules/pam_keyinit/pam_keyinit.c	2006-08-09 14:04:41.000000000 +0100
@@ -33,6 +33,8 @@
 static int my_session_keyring;
 static int session_counter;
 static int do_revoke;
+static int revoke_as_uid;
+static int revoke_as_gid;
 static int xdebug = 0;
 
 static void debug(pam_handle_t *pamh, const char *fmt, ...)
@@ -124,14 +126,38 @@
  */
 static void kill_keyrings(pam_handle_t *pamh)
 {
+	int old_uid, old_gid;
+
 	/* revoke the session keyring we created earlier */
 	if (my_session_keyring > 0) {
 		debug(pamh, "REVOKE %d", my_session_keyring);
 
+		old_uid = getuid();
+		old_gid = getgid();
+		debug(pamh, "UID:%d [%d]  GID:%d [%d]",
+		      revoke_as_uid, old_uid, revoke_as_gid, old_gid);
+
+		/* switch to the real UID and GID so that we have permission to
+		 * revoke the key */
+		if (revoke_as_uid != old_uid && setreuid(-1, revoke_as_uid) < 0)
+			error(pamh, "Unable to change UID to %d temporarily\n",
+			      revoke_as_uid);
+
+		if (revoke_as_gid != old_gid && setregid(-1, revoke_as_gid) < 0)
+			error(pamh, "Unable to change GID to %d temporarily\n",
+			      revoke_as_gid);
+
 		syscall(__NR_keyctl,
 			KEYCTL_REVOKE,
 			my_session_keyring);
 
+		/* return to the orignal UID and GID (probably root) */
+		if (revoke_as_uid != old_uid && setreuid(-1, old_uid) < 0)
+			error(pamh, "Unable to change UID back to %d\n", old_uid);
+
+		if (revoke_as_gid != old_gid && setregid(-1, old_gid) < 0)
+			error(pamh, "Unable to change GID back to %d\n", old_gid);
+
 		my_session_keyring = 0;
 	}
 }
@@ -177,9 +203,9 @@
 		return PAM_USER_UNKNOWN;
 	}
 
-	uid = pw->pw_uid;
+	revoke_as_uid = uid = pw->pw_uid;
 	old_uid = getuid();
-	gid = pw->pw_gid;
+	revoke_as_gid = gid = pw->pw_gid;
 	old_gid = getgid();
 	debug(pamh, "UID:%d [%d]  GID:%d [%d]", uid, old_uid, gid, old_gid);
 

pam-0.99.5.0-succif-unknown-user.patch:
 pam_succeed_if.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pam-0.99.5.0-succif-unknown-user.patch ---
--- Linux-PAM-0.99.5.0/modules/pam_succeed_if/pam_succeed_if.c.unknown-user	2006-06-30 12:05:15.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/pam_succeed_if/pam_succeed_if.c	2006-08-10 15:29:12.000000000 +0200
@@ -411,7 +411,7 @@
 			pam_syslog(pamh, LOG_CRIT,
 				   "error retrieving information about user %lu",
 				   (unsigned long)getuid());
-			return PAM_SERVICE_ERR;
+			return PAM_USER_UNKNOWN;
 		}
 		user = pwd->pw_name;
 	} else {
@@ -430,7 +430,7 @@
 			pam_syslog(pamh, LOG_CRIT,
 				   "error retrieving information about user %s",
 				   user);
-			return PAM_SERVICE_ERR;
+			return PAM_USER_UNKNOWN;
 		}
 	}
 


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- pam.spec	2 Aug 2006 18:08:23 -0000	1.128
+++ pam.spec	10 Aug 2006 13:34:26 -0000	1.129
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.5.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -38,7 +38,9 @@
 Patch86: pam-0.99.5.0-console-no-ainit.patch
 Patch87: pam-0.99.5.0-keyinit-no-debug.patch
 Patch88: pam-0.99.5.0-keyinit-multiinit.patch
+Patch89: pam-0.99.5.0-keyinit-revoke-user.patch
 Patch90: pam-0.99.5.0-namespace-init.patch
+Patch91: pam-0.99.5.0-succif-unknown-user.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -104,7 +106,9 @@
 %patch86 -p1 -b .no-ainit
 %patch87 -p1 -b .no-debug
 %patch88 -p1 -b .multiinit
+%patch89 -p1 -b .revoke-user
 %patch90 -p1 -b .namespace-init
+%patch91 -p1 -b .unknown-user
 
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -371,6 +375,10 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Thu Aug 10 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-7
+- revoke keyrings properly when pam_keyinit called as root (#201048)
+- pam_succeed_if should return PAM_USER_UNKNOWN when getpwnam fails (#197748)
+
 * Wed Aug  2 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-6
 - revoke keyrings properly when pam_keyinit called more than once (#201048)
   patch by David Howells



From fedora-cvs-commits at redhat.com  Thu Aug 10 13:43:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 09:43:19 -0400
Subject: rpms/kdemultimedia/devel .cvsignore, 1.35, 1.36 kdemultimedia.spec,
	1.74, 1.75 sources, 1.36, 1.37 kdemultimedia-3.5.3-3.5.4.patch,
	1.2, NONE kdemultimedia.diff, 1.1, NONE
Message-ID: <200608101343.k7ADhJ9k017308@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Removed Files:
	kdemultimedia-3.5.3-3.5.4.patch kdemultimedia.diff 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	2 Jun 2006 16:55:13 -0000	1.35
+++ .cvsignore	10 Aug 2006 13:43:16 -0000	1.36
@@ -12,3 +12,4 @@
 kdemultimedia-3.5.1-patched.tar.bz2
 kdemultimedia-3.5.2-patched.tar.bz2
 kdemultimedia-3.5.3-patched.tar.bz2
+kdemultimedia-3.5.4-patched.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- kdemultimedia.spec	24 Jul 2006 15:42:22 -0000	1.74
+++ kdemultimedia.spec	10 Aug 2006 13:43:16 -0000	1.75
@@ -12,39 +12,36 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Epoch: 6
 Name: kdemultimedia
-Prefix: /usr
 Summary: Multimedia applications for the K Desktop Environment (KDE).
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3-patched.tar.bz2
-Patch0: kdemultimedia-3.5.3-3.5.4.patch
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-patched.tar.bz2
 Patch1: kde-libtool.patch
 Patch2: kdemultimedia-3.5.3-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
 Patch4: kdemultimedia-3.5.3-examples.patch
 
 # upstream patches
-Patch100: kdemultimedia.diff
-Patch101: kdemultimedia-3.5.3-noatun.patch
+Patch100: kdemultimedia-3.5.3-noatun.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 Requires: kdebase >= 6:%{version}
 
 BuildRequires: zlib-devel
 BuildRequires: kdebase-devel
-BuildRequires: gcc-c++
-BuildRequires: glibc-devel
 BuildRequires: perl
 BuildRequires: libvorbis-devel
 BuildRequires: audiofile-devel
 BuildRequires: glib2-devel
-BuildRequires: /usr/bin/desktop-file-install
+BuildRequires: desktop-file-utils
 BuildRequires: libtheora-devel
 BuildRequires: flac-devel
 %if %{make_cvs}
@@ -82,15 +79,13 @@
 noatun plugins.
 
 %prep
-%setup -q -n %{name}-3.5.3-patched
-%patch0 -p0
+%setup -q -n %{name}-%{version}-patched
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 %patch4 -p1 -b .examples
 
 # upstream patches
-#%patch100 -p0 -b .setuid-check
-%patch101 -p1 -b .noatun
+%patch100 -p1 -b .noatun
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -152,9 +147,21 @@
    ln -sf ../common $i
 done
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
 rm -rf %{buildroot}
@@ -197,6 +204,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 3.5.4-1%{?dist}
+- rebuild
+
 * Mon Jul 24 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	2 Jun 2006 16:55:13 -0000	1.36
+++ sources	10 Aug 2006 13:43:16 -0000	1.37
@@ -1 +1 @@
-52bb137a4605a35e56ec9dc1070e0e28  kdemultimedia-3.5.3-patched.tar.bz2
+937bc95131093b86e4fb637446ec1532  kdemultimedia-3.5.4-patched.tar.bz2


--- kdemultimedia-3.5.3-3.5.4.patch DELETED ---


--- kdemultimedia.diff DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 13:58:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 09:58:09 -0400
Subject: rpms/setroubleshoot/devel sources,1.18,1.19
Message-ID: <200608101358.k7ADw9MS003996@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3972

Modified Files:
	sources 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> - 0.20-1
	* add html support
	* remove setroubleshoot_dispatcher



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	10 Aug 2006 12:27:33 -0000	1.18
+++ sources	10 Aug 2006 13:58:07 -0000	1.19
@@ -1 +1 @@
-a1b811663282fcaf926dbbdfcb663cd8  setroubleshoot-0.20.tar.gz
+f576736b6e4563029aeedccedc014580  setroubleshoot-0.20.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 10 13:59:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 09:59:42 -0400
Subject: rpms/selinux-policy/FC-5 selinux-policy.spec,1.179,1.180
Message-ID: <200608101359.k7ADxgIt004532@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-2.fc5
- Bump for FC5



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- selinux-policy.spec	10 Aug 2006 13:19:30 -0000	1.179
+++ selinux-policy.spec	10 Aug 2006 13:59:40 -0000	1.180
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.6
-Release: 1.fc5
+Release: 2.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz



From fedora-cvs-commits at redhat.com  Thu Aug 10 14:03:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 10:03:36 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.115.ooo51931.fixxmlsec.patch, NONE,
	1.1 openoffice.org.spec, 1.827,
	1.828 openoffice.org-1.9.115.ooo51931.systemxmlsec.patch, 1.4, NONE
Message-ID: <200608101403.k7AE3Z1e005488@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.115.ooo51931.fixxmlsec.patch 
Removed Files:
	openoffice.org-1.9.115.ooo51931.systemxmlsec.patch 
Log Message:
give up on systemxmlsec

openoffice.org-1.9.115.ooo51931.fixxmlsec.patch:
 inc/libs.mk                          |    0 
 libxmlsec/makefile.mk                |    4 
 libxmlsec/xmlsec1-1.2.6.patch        |  373 +++++++++++++++++++++++++++++++++++
 scp2/source/ooo/file_library_ooo.scp |    8 
 scp2/source/ooo/shortcut_ooo.scp     |   12 -
 solenv/inc/libs.mk                   |    4 
 source/ooo/file_library_ooo.scp      |    0 
 source/ooo/shortcut_ooo.scp          |    0 
 8 files changed, 387 insertions(+), 14 deletions(-)

--- NEW FILE openoffice.org-1.9.115.ooo51931.fixxmlsec.patch ---
Index: makefile.mk
===================================================================
RCS file: /cvs/external/libxmlsec/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- openoffice.org.orig/libxmlsec/makefile.mk	31 Jan 2006 18:27:29 -0000	1.8
+++ openoffice.org/libxmlsec/makefile.mk	10 Aug 2006 13:55:31 -0000
@@ -133,12 +133,12 @@
 OUTDIR2INC=include$/xmlsec 
 
 .IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libxmlsec1.*dylib src$/nss$/.libs$/libxmlsec1-nss.*dylib 
+OUT2LIB+=src$/.libs$/liboldxmlsec1.*dylib src$/nss$/.libs$/liboldxmlsec1-nss.*dylib 
 .ELIF "$(OS)"=="WNT"
 OUT2LIB+=win32$/binaries$/*.lib
 OUT2BIN+=win32$/binaries$/*.dll
 .ELSE
-OUT2LIB+=src$/.libs$/libxmlsec1.so* src$/nss$/.libs$/libxmlsec1-nss.so*
+OUT2LIB+=src$/.libs$/liboldxmlsec1.so* src$/nss$/.libs$/liboldxmlsec1-nss.so*
 .ENDIF
 
 # --- Targets ------------------------------------------------------
Index: xmlsec1-1.2.6.patch
===================================================================
RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
retrieving revision 1.13
diff -u -r1.13 xmlsec1-1.2.6.patch
--- openoffice.org.orig/libxmlsec/xmlsec1-1.2.6.patch	9 Mar 2006 10:18:52 -0000	1.13
+++ openoffice.org/libxmlsec/xmlsec1-1.2.6.patch	10 Aug 2006 13:55:49 -0000
@@ -14069,3 +14069,376 @@
   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
   
   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
+*** misc/xmlsec1-1.2.6/configure	2004-08-26 08:00:34.000000000 +0200
+--- misc/build/xmlsec1-1.2.6/configure	2006-02-24 17:41:54.812909000 +0100
+***************
+*** 25766,25788 ****
+    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-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" >&5
+! echo $ECHO_N "checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
+  
+!         if $PKG_CONFIG --exists "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" ; 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-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
+              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-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
+              echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
+  echo "${ECHO_T}$NSS_LIBS" >&6
+          else
+--- 25766,25788 ----
+    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 nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" >&5
+! echo $ECHO_N "checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
+  
+!         if $PKG_CONFIG --exists "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" ; 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 "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+              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 "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+              echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
+  echo "${ECHO_T}$NSS_LIBS" >&6
+          else
+***************
+*** 25790,25796 ****
+              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-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
+  
+          fi
+  
+--- 25790,25796 ----
+              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 "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+  
+          fi
+  
+*** misc/xmlsec1-1.2.6/src/Makefile.in	2006-08-10 14:25:07.000000000 +0100
+--- misc/build/xmlsec1-1.2.6/src/Makefile.in	2006-08-10 14:26:01.000000000 +0100
+***************
+*** 14,20 ****
+  
+  @SET_MAKE@
+  
+! SOURCES = $(libxmlsec1_la_SOURCES)
+  
+  srcdir = @srcdir@
+  top_srcdir = @top_srcdir@
+--- 14,20 ----
+  
+  @SET_MAKE@
+  
+! SOURCES = $(liboldxmlsec1_la_SOURCES)
+  
+  srcdir = @srcdir@
+  top_srcdir = @top_srcdir@
+***************
+*** 50,59 ****
+  libLTLIBRARIES_INSTALL = $(INSTALL)
+  LTLIBRARIES = $(lib_LTLIBRARIES)
+  am__DEPENDENCIES_1 =
+! libxmlsec1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+  	$(am__DEPENDENCIES_1)
+! am__libxmlsec1_la_SOURCES_DIST = xmlsec-ltdl.c app.c base64.c bn.c \
+  	buffer.c c14n.c dl.c enveloped.c errors.c io.c keyinfo.c \
+  	keys.c keysdata.c keysmngr.c list.c membuf.c nodeset.c \
+  	parser.c soap.c strings.c templates.c transforms.c x509.c \
+--- 50,59 ----
+  libLTLIBRARIES_INSTALL = $(INSTALL)
+  LTLIBRARIES = $(lib_LTLIBRARIES)
+  am__DEPENDENCIES_1 =
+! liboldxmlsec1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+  	$(am__DEPENDENCIES_1)
+! am__liboldxmlsec1_la_SOURCES_DIST = xmlsec-ltdl.c app.c base64.c bn.c \
+  	buffer.c c14n.c dl.c enveloped.c errors.c io.c keyinfo.c \
+  	keys.c keysdata.c keysmngr.c list.c membuf.c nodeset.c \
+  	parser.c soap.c strings.c templates.c transforms.c x509.c \
+***************
+*** 64,76 ****
+  @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE@	$(am__objects_1)
+  @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE at am__objects_2 =  \
+  @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE@	$(am__objects_1)
+! am_libxmlsec1_la_OBJECTS = $(am__objects_2) app.lo base64.lo bn.lo \
+  	buffer.lo c14n.lo dl.lo enveloped.lo errors.lo io.lo \
+  	keyinfo.lo keys.lo keysdata.lo keysmngr.lo list.lo membuf.lo \
+  	nodeset.lo parser.lo soap.lo strings.lo templates.lo \
+  	transforms.lo x509.lo xkms.lo xmldsig.lo xmlenc.lo xmlsec.lo \
+  	xmltree.lo xpath.lo xslt.lo $(am__objects_1)
+! libxmlsec1_la_OBJECTS = $(am_libxmlsec1_la_OBJECTS)
+  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+  depcomp = $(SHELL) $(top_srcdir)/depcomp
+  am__depfiles_maybe = depfiles
+--- 64,76 ----
+  @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE@	$(am__objects_1)
+  @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE at am__objects_2 =  \
+  @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE@	$(am__objects_1)
+! am_liboldxmlsec1_la_OBJECTS = $(am__objects_2) app.lo base64.lo bn.lo \
+  	buffer.lo c14n.lo dl.lo enveloped.lo errors.lo io.lo \
+  	keyinfo.lo keys.lo keysdata.lo keysmngr.lo list.lo membuf.lo \
+  	nodeset.lo parser.lo soap.lo strings.lo templates.lo \
+  	transforms.lo x509.lo xkms.lo xmldsig.lo xmlenc.lo xmlsec.lo \
+  	xmltree.lo xpath.lo xslt.lo $(am__objects_1)
+! liboldxmlsec1_la_OBJECTS = $(am_liboldxmlsec1_la_OBJECTS)
+  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+  depcomp = $(SHELL) $(top_srcdir)/depcomp
+  am__depfiles_maybe = depfiles
+***************
+*** 97,104 ****
+  CCLD = $(CC)
+  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(libxmlsec1_la_SOURCES)
+! DIST_SOURCES = $(am__libxmlsec1_la_SOURCES_DIST)
+  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+  	html-recursive info-recursive install-data-recursive \
+  	install-exec-recursive install-info-recursive \
+--- 97,104 ----
+  CCLD = $(CC)
+  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(liboldxmlsec1_la_SOURCES)
+! DIST_SOURCES = $(am__liboldxmlsec1_la_SOURCES_DIST)
+  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+  	html-recursive info-recursive install-data-recursive \
+  	install-exec-recursive install-info-recursive \
+***************
+*** 347,356 ****
+  	$(NULL)
+  
+  lib_LTLIBRARIES = \
+! 	libxmlsec1.la \
+  	$(NULL)
+  
+! libxmlsec1_la_SOURCES = \
+  	$(LTDL_SOURCE_FILES) \
+  	app.c \
+  	base64.c \
+--- 347,356 ----
+  	$(NULL)
+  
+  lib_LTLIBRARIES = \
+! 	liboldxmlsec1.la \
+  	$(NULL)
+  
+! liboldxmlsec1_la_SOURCES = \
+  	$(LTDL_SOURCE_FILES) \
+  	app.c \
+  	base64.c \
+***************
+*** 383,395 ****
+  	xslt.c \
+  	$(NULL)
+  
+! libxmlsec1_la_LIBADD = \
+  	$(LIBXSLT_LIBS) \
+  	$(LIBXML_LIBS) \
+  	$(XMLSEC_DL_LIBS) \
+  	$(NULL)
+  
+! libxmlsec1_la_LDFLAGS = \
+  	-version-info @XMLSEC_VERSION_INFO@ \
+  	$(NULL)
+  
+--- 383,395 ----
+  	xslt.c \
+  	$(NULL)
+  
+! liboldxmlsec1_la_LIBADD = \
+  	$(LIBXSLT_LIBS) \
+  	$(LIBXML_LIBS) \
+  	$(XMLSEC_DL_LIBS) \
+  	$(NULL)
+  
+! liboldxmlsec1_la_LDFLAGS = \
+  	-version-info @XMLSEC_VERSION_INFO@ \
+  	$(NULL)
+  
+***************
+*** 466,473 ****
+  	  echo "rm -f \"$${dir}/so_locations\""; \
+  	  rm -f "$${dir}/so_locations"; \
+  	done
+! libxmlsec1.la: $(libxmlsec1_la_OBJECTS) $(libxmlsec1_la_DEPENDENCIES) 
+! 	$(LINK) -rpath $(libdir) $(libxmlsec1_la_LDFLAGS) $(libxmlsec1_la_OBJECTS) $(libxmlsec1_la_LIBADD) $(LIBS)
+  
+  mostlyclean-compile:
+  	-rm -f *.$(OBJEXT)
+--- 466,473 ----
+  	  echo "rm -f \"$${dir}/so_locations\""; \
+  	  rm -f "$${dir}/so_locations"; \
+  	done
+! liboldxmlsec1.la: $(liboldxmlsec1_la_OBJECTS) $(liboldxmlsec1_la_DEPENDENCIES) 
+! 	$(LINK) -rpath $(libdir) $(liboldxmlsec1_la_LDFLAGS) $(liboldxmlsec1_la_OBJECTS) $(liboldxmlsec1_la_LIBADD) $(LIBS)
+  
+  mostlyclean-compile:
+  	-rm -f *.$(OBJEXT)
+*** misc/xmlsec1-1.2.6/src/nss/Makefile.in	2004-08-26 08:00:31.000000000 +0200
+--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in	2006-02-24 17:41:54.977876000 +0100
+***************
+*** 14,20 ****
+  
+  @SET_MAKE@
+  
+! SOURCES = $(libxmlsec1_nss_la_SOURCES)
+  
+  srcdir = @srcdir@
+  top_srcdir = @top_srcdir@
+--- 14,20 ----
+  
+  @SET_MAKE@
+  
+! SOURCES = $(liboldxmlsec1_nss_la_SOURCES)
+  
+  srcdir = @srcdir@
+  top_srcdir = @top_srcdir@
+***************
+*** 50,64 ****
+  libLTLIBRARIES_INSTALL = $(INSTALL)
+  LTLIBRARIES = $(lib_LTLIBRARIES)
+  am__DEPENDENCIES_1 =
+! libxmlsec1_nss_la_DEPENDENCIES = ../libxmlsec1.la \
+  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+  am__objects_1 =
+! am_libxmlsec1_nss_la_OBJECTS = akmngr.lo app.lo bignum.lo ciphers.lo crypto.lo \
+  	digests.lo hmac.lo pkikeys.lo signatures.lo symkeys.lo x509.lo \
+  	x509vfy.lo keysstore.lo tokens.lo keytrans.lo keywrapers.lo \
+  	$(am__objects_1)
+! libxmlsec1_nss_la_OBJECTS = $(am_libxmlsec1_nss_la_OBJECTS)
+  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+  depcomp = $(SHELL) $(top_srcdir)/depcomp
+  am__depfiles_maybe = depfiles
+--- 50,64 ----
+  libLTLIBRARIES_INSTALL = $(INSTALL)
+  LTLIBRARIES = $(lib_LTLIBRARIES)
+  am__DEPENDENCIES_1 =
+! liboldxmlsec1_nss_la_DEPENDENCIES = ../liboldxmlsec1.la \
+  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+  am__objects_1 =
+! am_liboldxmlsec1_nss_la_OBJECTS = akmngr.lo app.lo bignum.lo ciphers.lo crypto.lo \
+  	digests.lo hmac.lo pkikeys.lo signatures.lo symkeys.lo x509.lo \
+  	x509vfy.lo keysstore.lo tokens.lo keytrans.lo keywrapers.lo \
+  	$(am__objects_1)
+! liboldxmlsec1_nss_la_OBJECTS = $(am_liboldxmlsec1_nss_la_OBJECTS)
+  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+  depcomp = $(SHELL) $(top_srcdir)/depcomp
+  am__depfiles_maybe = depfiles
+***************
+*** 78,85 ****
+  CCLD = $(CC)
+  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(libxmlsec1_nss_la_SOURCES)
+! DIST_SOURCES = $(libxmlsec1_nss_la_SOURCES)
+  ETAGS = etags
+  CTAGS = ctags
+  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+--- 78,85 ----
+  CCLD = $(CC)
+  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(liboldxmlsec1_nss_la_SOURCES)
+! DIST_SOURCES = $(liboldxmlsec1_nss_la_SOURCES)
+  ETAGS = etags
+  CTAGS = ctags
+  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+***************
+*** 317,326 ****
+  	$(NULL)
+  
+  lib_LTLIBRARIES = \
+! 	libxmlsec1-nss.la \
+  	$(NULL)
+  
+! libxmlsec1_nss_la_SOURCES = \
+  	akmngr.c \
+  	app.c \
+  	bignum.c \
+--- 317,326 ----
+  	$(NULL)
+  
+  lib_LTLIBRARIES = \
+! 	liboldxmlsec1-nss.la \
+  	$(NULL)
+  
+! liboldxmlsec1_nss_la_SOURCES = \
+  	akmngr.c \
+  	app.c \
+  	bignum.c \
+***************
+*** 339,352 ****
+  	x509vfy.c \
+  	$(NULL)
+  
+! libxmlsec1_nss_la_LIBADD = \
+! 	../libxmlsec1.la \
+  	$(NSS_LIBS) \
+  	$(LIBXSLT_LIBS) \
+  	$(LIBXML_LIBS) \
+  	$(NULL)
+  
+! libxmlsec1_nss_la_LDFLAGS = \
+  	-version-info @XMLSEC_VERSION_INFO@ \
+  	$(NULL)
+  
+--- 339,352 ----
+  	x509vfy.c \
+  	$(NULL)
+  
+! liboldxmlsec1_nss_la_LIBADD = \
+! 	../liboldxmlsec1.la \
+  	$(NSS_LIBS) \
+  	$(LIBXSLT_LIBS) \
+  	$(LIBXML_LIBS) \
+  	$(NULL)
+  
+! liboldxmlsec1_nss_la_LDFLAGS = \
+  	-version-info @XMLSEC_VERSION_INFO@ \
+  	$(NULL)
+  
+***************
+*** 410,417 ****
+  	  echo "rm -f \"$${dir}/so_locations\""; \
+  	  rm -f "$${dir}/so_locations"; \
+  	done
+! libxmlsec1-nss.la: $(libxmlsec1_nss_la_OBJECTS) $(libxmlsec1_nss_la_DEPENDENCIES) 
+! 	$(LINK) -rpath $(libdir) $(libxmlsec1_nss_la_LDFLAGS) $(libxmlsec1_nss_la_OBJECTS) $(libxmlsec1_nss_la_LIBADD) $(LIBS)
+  
+  mostlyclean-compile:
+  	-rm -f *.$(OBJEXT)
+--- 410,417 ----
+  	  echo "rm -f \"$${dir}/so_locations\""; \
+  	  rm -f "$${dir}/so_locations"; \
+  	done
+! liboldxmlsec1-nss.la: $(liboldxmlsec1_nss_la_OBJECTS) $(liboldxmlsec1_nss_la_DEPENDENCIES) 
+! 	$(LINK) -rpath $(libdir) $(liboldxmlsec1_nss_la_LDFLAGS) $(liboldxmlsec1_nss_la_OBJECTS) $(liboldxmlsec1_nss_la_LIBADD) $(LIBS)
+  
+  mostlyclean-compile:
+  	-rm -f *.$(OBJEXT)
Index: source/ooo/file_library_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
retrieving revision 1.202.4.1
diff -u -r1.202.4.1 file_library_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp	27 Jun 2006 07:52:52 -0000	1.202.4.1
+++ openoffice.org/scp2/source/ooo/file_library_ooo.scp	10 Aug 2006 13:41:41 -0000
@@ -2392,9 +2392,9 @@
     TXT_FILE_BODY;
     #ifdef UNX
         #ifdef MACOSX
-            Name = STRING(CONCAT2(libxmlsec1.1.2.6,UNXSUFFIX));
+            Name = STRING(CONCAT2(liboldxmlsec1.1.2.6,UNXSUFFIX));
         #else
-            Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1.2.6));
+            Name = STRING(CONCAT3(liboldxmlsec1,UNXSUFFIX,.1.2.6));
         #endif
     #else
         Name = "libxmlsec.dll";
@@ -2416,9 +2416,9 @@
 File gid_File_Lib_LibXMLSec_xmlsecnss
     TXT_FILE_BODY;
     #ifdef MACOSX
-        Name = STRING(CONCAT2(libxmlsec1-nss.1.2.6,UNXSUFFIX));
+        Name = STRING(CONCAT2(liboldxmlsec1-nss.1.2.6,UNXSUFFIX));
     #else
-        Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1.2.6));
+        Name = STRING(CONCAT3(liboldxmlsec1-nss,UNXSUFFIX,.1.2.6));
     #endif
     Dir = gid_Dir_Program;
     Styles = (PACKED,PATCH);
Index: source/ooo/shortcut_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/shortcut_ooo.scp,v
retrieving revision 1.20
diff -u -r1.20 shortcut_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/shortcut_ooo.scp	9 Sep 2005 01:42:03 -0000	1.20
+++ openoffice.org/scp2/source/ooo/shortcut_ooo.scp	10 Aug 2006 13:41:41 -0000
@@ -430,9 +430,9 @@
     FileID = gid_File_Lib_LibXMLSec_xmlseccore;
     Dir = gid_Dir_Program;
 #ifdef MACOSX
-    Name = STRING(CONCAT2(libxmlsec1.1,UNXSUFFIX));
+    Name = STRING(CONCAT2(liboldxmlsec1.1,UNXSUFFIX));
 #else
-    Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1));
+    Name = STRING(CONCAT3(liboldxmlsec1,UNXSUFFIX,.1));
 #endif
     Styles = (NETWORK,RELATIVE);
 End
@@ -442,7 +442,7 @@
 Shortcut gid_Shortcut_Lib_LibXMLSec_xmlseccore_2
     ShortcutID = gid_Shortcut_Lib_LibXMLSec_xmlseccore;
     Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libxmlsec1,UNXSUFFIX));
+    Name = STRING(CONCAT2(liboldxmlsec1,UNXSUFFIX));
     Styles = (NETWORK,RELATIVE);
 End
 #endif
@@ -452,9 +452,9 @@
     FileID = gid_File_Lib_LibXMLSec_xmlsecnss;
     Dir = gid_Dir_Program;
 #ifdef MACOSX
-    Name = STRING(CONCAT2(libxmlsec1-nss.1,UNXSUFFIX));
+    Name = STRING(CONCAT2(liboldxmlsec1-nss.1,UNXSUFFIX));
 #else
-    Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1));
+    Name = STRING(CONCAT3(liboldxmlsec1-nss,UNXSUFFIX,.1));
 #endif
     Styles = (NETWORK,RELATIVE);
 End
@@ -464,7 +464,7 @@
 Shortcut gid_Shortcut_Lib_LibXMLSec_xmlsecnss_2
     ShortcutID = gid_Shortcut_Lib_LibXMLSec_xmlsecnss;
     Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libxmlsec1-nss,UNXSUFFIX));
+    Name = STRING(CONCAT2(liboldxmlsec1-nss,UNXSUFFIX));
     Styles = (NETWORK,RELATIVE);
 End
 #endif
Index: inc/libs.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/libs.mk,v
retrieving revision 1.98
diff -u -r1.98 libs.mk
--- openoffice.org.orig/solenv/inc/libs.mk	7 Apr 2006 14:23:23 -0000	1.98
+++ openoffice.org/solenv/inc/libs.mk	10 Aug 2006 13:42:25 -0000
@@ -131,8 +131,8 @@
 XPLIB=-l_xp
 TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX)
 SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX)
-XMLSECLIB=-lxmlsec1
-XMLSECLIB-NSS=-lxmlsec1-nss
+XMLSECLIB=-loldxmlsec1
+XMLSECLIB-NSS=-loldxmlsec1-nss
 LIBXML2LIB=-lxml2
 NSS3LIB=-lnss3
 NSPR4LIB=-lnspr4


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.827
retrieving revision 1.828
diff -u -r1.827 -r1.828
--- openoffice.org.spec	10 Aug 2006 12:37:19 -0000	1.827
+++ openoffice.org.spec	10 Aug 2006 14:03:32 -0000	1.828
@@ -59,7 +59,7 @@
 BuildRequires:	libICE-devel, evolution-data-server-devel, libxslt-devel,
 BuildRequires:	desktop-file-utils >= 0.9, libxslt-devel, unixODBC-devel
 BuildRequires:  db4-devel, db4-java >= 4.3.28-3, firefox-devel, agg-devel
-BuildRequires:  libwpd-devel >= 0.8.0, xmlsec1-nss-devel >= 1.2.8-2, icu >= 3.6
+BuildRequires:  libwpd-devel >= 0.8.0, icu >= 3.6
 BuildRequires:	hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
 BuildRequires:	libicu-devel >= 3.6, ant, perl-Archive-Zip
 
@@ -78,7 +78,7 @@
 Patch10: openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch
 Patch11: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
 Patch12: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch13: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch13: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
 Patch14: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
 Patch15: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
 Patch16: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
@@ -945,7 +945,7 @@
 %patch10 -p1 -b .rhXXXXXX.lingucomponent.contribdict.patch
 %patch11 -p1 -b .ooo48256.nolongname.sysui.patch
 %patch12 -p1 -b .ooo54603.fontconfig.patch
-%patch13 -p1 -b .ooo51931.systemxmlsec.patch
+%patch13 -p1 -b .ooo51931.fixxmlsec.patch
 %patch14 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
 %patch15 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
 %patch16 -p1 -b .ooo53723.bulletexport.vcl.patch
@@ -1016,7 +1016,7 @@
 fi
 cd config_office
 autoconf
-%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-agg --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-xmlsec --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
+%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-agg --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -2060,6 +2060,7 @@
 %dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*
 %{instdir}/program/libxmlsecurity.so
+%{instdir}/program/liboldxmlsec*
 %if %{stlvisibilityfcked}
 %{instdir}/program/libstlport*.so
 %endif
@@ -2522,6 +2523,7 @@
 %changelog
 * Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.10
 - rh#201447# -> openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+- rh#201305# -> openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
 - icu settext ownership of string data changed silently


--- openoffice.org-1.9.115.ooo51931.systemxmlsec.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 14:14:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 10:14:07 -0400
Subject: rpms/net-snmp/devel net-snmp-5.3.1-config_libdir.patch, NONE,
	1.1 net-snmp.spec, 1.82, 1.83
Message-ID: <200608101414.k7AEE7aL007694@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-snmp.spec 
Added Files:
	net-snmp-5.3.1-config_libdir.patch 
Log Message:
 - fix libdir in configure

net-snmp-5.3.1-config_libdir.patch:
 configure |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

--- NEW FILE net-snmp-5.3.1-config_libdir.patch ---
--- net-snmp-5.3.1/configure.libdir	2006-08-10 13:35:32.000000000 +0200
+++ net-snmp-5.3.1/configure	2006-08-10 14:01:09.000000000 +0200
@@ -4981,7 +4981,7 @@
     lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
     ;;
   *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+    lt_cv_file_magic_test_file='$LIBDIR/libSystem.dylib'
     ;;
   esac
   ;;
@@ -4994,7 +4994,7 @@
       # Let's accept both of them until this is cleared up.
       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      lt_cv_file_magic_test_file=`echo $LIBDIR/libc.so.*`
       ;;
     esac
   else
@@ -5009,7 +5009,7 @@
 hpux10.20*|hpux11*)
   lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+  lt_cv_file_magic_test_file=$LIBDIR/libc.sl
   ;;
 
 irix5* | irix6* | nonstopux*)
@@ -5056,12 +5056,12 @@
 newos6*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  lt_cv_file_magic_test_file=$LIBDIR/libnls.so
   ;;
 
 openbsd*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+  lt_cv_file_magic_test_file=`echo $LIBDIR/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
   else
@@ -5093,7 +5093,7 @@
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    lt_cv_file_magic_test_file=`echo $LIBDIR/libc.so*`
     ;;
   ncr)
     lt_cv_deplibs_check_method=pass_all
@@ -7154,15 +7154,15 @@
       # Warning - without using the other runtime loading flags (-brtl),
       # -berok will link without error, but may produce a broken library.
       allow_undefined_flag='-berok'
-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:$LIBDIR:/lib'
       archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
     else
       if test "$host_cpu" = ia64; then
-	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	hardcode_libdir_flag_spec='${wl}-R $libdir:$LIBDIR:/lib'
 	allow_undefined_flag="-z nodefs"
 	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
       else
-	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:$LIBDIR:/lib'
 	# Warning - without using the other run time loading flags,
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='${wl}-berok'
@@ -7229,7 +7229,7 @@
   # does not break anything, and helps significantly (at the cost of a little
   # extra space).
   freebsd2.2*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags $LIBDIR/c++rt0.o'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
@@ -7582,8 +7582,8 @@
 shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+sys_lib_dlsearch_path_spec="/lib $LIBDIR"
+sys_lib_search_path_spec="/lib $LIBDIR /usr/local/lib"
 
 case $host_os in
 aix3*)
@@ -7660,8 +7660,8 @@
   soname_spec='${libname}${release}.so$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  sys_lib_search_path_spec="/shlib $LIBDIR /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib $LIBDIR /usr/local/lib"
   export_dynamic_flag_spec=-rdynamic
   # the default ld.so.conf also contains /usr/contrib/lib and
   # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
@@ -7793,8 +7793,8 @@
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  sys_lib_search_path_spec="$LIBDIR${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="$LIBDIR${libsuff} /lib${libsuff}"
   ;;
 
 # No shared lib support for Linux oldld, aout, or coff.
@@ -7886,7 +7886,7 @@
   soname_spec='${libname}${release}.so$major'
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
   shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib $LIBDIR/cmplrs/cc $LIBDIR /usr/local/lib /var/shlib"
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   hardcode_into_libs=yes
   ;;
@@ -7942,7 +7942,7 @@
       need_lib_prefix=no
       need_version=no
       shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      sys_lib_search_path_spec='/lib $LIBDIR /usr/ccs/lib'
       ;;
   esac
   ;;


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- net-snmp.spec	3 Aug 2006 09:59:22 -0000	1.82
+++ net-snmp.spec	10 Aug 2006 14:14:03 -0000	1.83
@@ -7,7 +7,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: %{major_ver}.0
-Release: 2
+Release: 3
 
 License: BSDish
 Group: System Environment/Daemons
@@ -38,6 +38,7 @@
 Patch26: net-snmp-5.3_vendorperl.patch
 Patch27: net-snmp-5.3.1-multilib.patch
 Patch28: net-snmp-5.3.1-retrans_time.patch
+Patch29: net-snmp-5.3.1-config_libdir.patch
 
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -142,6 +143,7 @@
 %patch24 -p1 -b .size_t
 %patch27 -p1 -b .multilib
 %patch28 -p0 -b .retrans_ms
+%patch29 -p1 -b .libdir
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -150,6 +152,7 @@
 %ifarch ia64 x86_64 s390x ppc64
 export LDFLAGS="-L%{_libdir}"
 %endif
+export LIBDIR="%{_libdir}"
 %configure \
 	--enable-static --enable-shared			\
 	--with-cflags="$RPM_OPT_FLAGS -lcrypto"		\
@@ -343,6 +346,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Aug 10 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.0-3
+- fix lib dirs in configure (#197684)
+
 * Thu Aug  3 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.0-2
 - better patch for depreciated sysctl call
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 14:28:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 10:28:45 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.19,1.20
Message-ID: <200608101428.k7AESjpq026450@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26412

Modified Files:
	nautilus-sendto.spec 
Log Message:
* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 0.7-3
- Make nautilus-sendto-bluetooth require gnome-bluetooth (#201908)




Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nautilus-sendto.spec	5 Aug 2006 16:47:06 -0000	1.19
+++ nautilus-sendto.spec	10 Aug 2006 14:28:42 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.7
-Release: 	2
+Release: 	3%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -32,6 +32,7 @@
 Group:		User Interface/Desktops
 BuildRequires:	gnome-bluetooth-devel, bluez-libs-devel
 Requires:	%{name} = %{version}-%{release}
+Requires:	gnome-bluetooth
 
 %description bluetooth
 A nautilus-sendto plugin for sending files via Bluetooth.
@@ -81,6 +82,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 0.7-3
+- Make nautilus-sendto-bluetooth require gnome-bluetooth (#201908)
+
 * Sat Aug 05 2006 Caolan McNamara <caolanm at redhat.com> - 0.7-2
 - rebuild against new e-d-s
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 14:35:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 10:35:47 -0400
Subject: rpms/eel2/devel .cvsignore, 1.37, 1.38 eel2.spec, 1.53, 1.54 sources,
	1.37, 1.38
Message-ID: <200608101435.k7AEZlx3028340@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28284/devel

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-1
- update to 2.15.91
- Drop upstreamed patch




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	3 Aug 2006 18:23:44 -0000	1.37
+++ .cvsignore	10 Aug 2006 14:35:41 -0000	1.38
@@ -1 +1 @@
-eel-2.15.90.tar.bz2
+eel-2.15.91.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- eel2.spec	4 Aug 2006 17:07:01 -0000	1.53
+++ eel2.spec	10 Aug 2006 14:35:41 -0000	1.54
@@ -15,12 +15,11 @@
 
 Name:		eel2
 Summary:        Eazel Extensions Library
-Version: 	2.15.90
-Release: 	2%{?dist}
+Version: 	2.15.91
+Release: 	1%{?dist}
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
-Patch0:		eel-2.15.90-background-mtime.patch
 URL: 		http://www.gnome.org/projects/nautilus/
 BuildRoot:	/var/tmp/%{name}-%{version}-root
 
@@ -75,7 +74,6 @@
 
 %prep
 %setup -q -n eel-%{version}
-%patch0 -p1 -b .background-mtime
 
 %build
 %configure
@@ -111,6 +109,10 @@
 %{_includedir}/eel-2
 
 %changelog
+* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-1
+- update to 2.15.91
+- Drop upstreamed patch
+
 * Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-2.fc6
 - Compare mtimes of images when the uri has not changed
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	3 Aug 2006 18:23:44 -0000	1.37
+++ sources	10 Aug 2006 14:35:41 -0000	1.38
@@ -1 +1 @@
-52c521e0bbf017e3fad4f4270a747f1b  eel-2.15.90.tar.bz2
+b025e631dece16e84ff3698ca207d49f  eel-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 10 14:38:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 10:38:39 -0400
Subject: rpms/kdenetwork/devel kdenetwork-3.5.4-kde#63494.patch, NONE,
	1.1 kdenetwork-3.5.4-kde#73519.patch, NONE, 1.1 .cvsignore,
	1.37, 1.38 kdenetwork.spec, 1.87, 1.88 sources, 1.42,
	1.43 kdenetwork-3.5.3-to-3.5.4.patch, 1.1, NONE
Message-ID: <200608101438.k7AEcdgg029150@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdenetwork.spec sources 
Added Files:
	kdenetwork-3.5.4-kde#63494.patch 
	kdenetwork-3.5.4-kde#73519.patch 
Removed Files:
	kdenetwork-3.5.3-to-3.5.4.patch 
Log Message:
- apply upstream patches,
   - check the return value from XF86VidModeGetAllModeLines() to avoid crashing kde#73519
   - Fixed flickering when scrolling in newsticker kde#63494



kdenetwork-3.5.4-kde#63494.patch:
 newsscroller.cpp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdenetwork-3.5.4-kde#63494.patch ---
Index: knewsticker/newsscroller.cpp
===================================================================
--- knewsticker/newsscroller.cpp	(Revision 566105)
+++ knewsticker/newsscroller.cpp	(Revision 566106)
@@ -129,7 +129,7 @@
 };
 
 NewsScroller::NewsScroller(QWidget *parent, ConfigAccess *cfg, const char *name)
-	: QFrame(parent, name),
+	: QFrame(parent, name, WNoAutoErase),
 	m_cfg(cfg),
 	m_scrollTimer(new QTimer(this)),
 	m_activeHeadline(0),
@@ -258,8 +258,8 @@
 	
 	if (contentsRect().contains(pt))
 		updateActive(pt);
-	
-	repaint(false);
+
+	update();
 }
 
 void NewsScroller::enterEvent(QEvent *)
@@ -337,7 +337,7 @@
 	}
 
 	if (updateActive(e->pos()))
-		repaint(false);
+		update();
 }
 
 void NewsScroller::wheelEvent(QWheelEvent *e)
@@ -360,7 +360,7 @@
 
 	if (m_activeHeadline) {
 		m_activeHeadline = 0;
-		repaint(false);
+		update();
 	}
 }
 
@@ -488,7 +488,7 @@
 			m_offset = - scrollHeight();
 	}
 
-	repaint(false);
+	update();
 }
 
 int NewsScroller::scrollWidth() const

kdenetwork-3.5.4-kde#73519.patch:
 vidmode.cpp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE kdenetwork-3.5.4-kde#73519.patch ---
Index: krdc/vidmode.cpp
===================================================================
--- krdc/vidmode.cpp	(Revision 571506)
+++ krdc/vidmode.cpp	(Revision 571507)
@@ -38,7 +38,9 @@
 	if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
 		return;
 
-	XF86VidModeGetAllModeLines(dpy,oldResolution.screen,&modecount, &modes);
+	if (!XF86VidModeGetAllModeLines(dpy, oldResolution.screen, &modecount, &modes))
+		return;
+
 	for (int i = 0; i < modecount; i++) {
 		int w = (*modes[i]).hdisplay;
 		int h = (*modes[i]).vdisplay;
@@ -69,7 +71,9 @@
 	if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
 		return Resolution();
 
-	XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes);
+	if (!XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes))
+		return Resolution();
+
 	int cw = (*modes[0]).hdisplay;
 	int ch = (*modes[0]).vdisplay;
 	nx = cw;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	5 Jun 2006 14:42:08 -0000	1.37
+++ .cvsignore	10 Aug 2006 14:38:37 -0000	1.38
@@ -10,3 +10,4 @@
 kdenetwork-3.5.0.tar.bz2
 kdenetwork-3.5.1.tar.bz2
 kdenetwork-3.5.3.tar.bz2
+kdenetwork-3.5.4.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kdenetwork.spec	7 Aug 2006 13:55:07 -0000	1.87
+++ kdenetwork.spec	10 Aug 2006 14:38:37 -0000	1.88
@@ -13,7 +13,7 @@
 
 Name: kdenetwork
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -21,13 +21,12 @@
 License: GPL
 
 Url: http://www.kde.org
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kppp.pamd
 Source2: ktalk
 Source4: lisarc
 Source5: lisa.redhat
 
-Patch10: kdenetwork-3.5.3-to-3.5.4.patch
 Patch0: kdenetwork-3.1-desktop.patch
 Patch1: kdenetwork-3.1-buildroot.patch
 Patch2: kde-libtool.patch
@@ -37,6 +36,8 @@
 
 # upstream patches
 Patch100: kdenetwork-3.5.4-kde#130630.patch
+Patch101: kdenetwork-3.5.4-kde#73519.patch
+Patch102: kdenetwork-3.5.4-kde#63494.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -49,7 +50,7 @@
 BuildRequires: glibc-devel
 BuildRequires: gcc-c++
 BuildRequires: automake
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf
 %ifnarch s390 s390x
 BuildRequires: wireless-tools >= 25
 %endif
@@ -73,8 +74,7 @@
 to develop or compile KDE networking applications.
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch10 -p0 -b .kde3.5.4
+%setup -q
 %patch0 -p1 -b .dt
 %patch1 -p1 -b .buildroot
 %patch2 -p1 -b .libtool
@@ -84,6 +84,8 @@
 
 # upstream patches
 %patch100 -p0 -b .kde#130630
+%patch101 -p0 -b .kde#73519
+%patch102 -p0 -b .kde#63494
 
 echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
 
@@ -166,16 +168,16 @@
 /sbin/ldconfig
 /sbin/chkconfig --add lisa ||:
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -227,6 +229,11 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 7:3.5.4-2
+- apply upstream patches,
+   - check the return value from XF86VidModeGetAllModeLines() to avoid crashing kde#73519
+   - Fixed flickering when scrolling in newsticker kde#63494
+
 * Mon Aug 07 2006 Than Ngo <than at redhat.com> 7:3.5.4-1
 - apply upstream patch,
     no connection to icq-server kde#130630


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	5 Jun 2006 14:42:09 -0000	1.42
+++ sources	10 Aug 2006 14:38:37 -0000	1.43
@@ -1 +1 @@
-119af91a048c34d9a917a1898f215554  kdenetwork-3.5.3.tar.bz2
+81660b1a73e81b6c01a55861c154dd3b  kdenetwork-3.5.4.tar.bz2


--- kdenetwork-3.5.3-to-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 14:39:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 10:39:07 -0400
Subject: rpms/nautilus/devel .cvsignore, 1.42, 1.43 nautilus.spec, 1.114,
	1.115 sources, 1.45, 1.46
Message-ID: <200608101439.k7AEd7TK029296@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29258

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-1
- Update to 2.15.91
- Split package into devel and extensions (#201967)




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	3 Aug 2006 18:44:37 -0000	1.42
+++ .cvsignore	10 Aug 2006 14:39:05 -0000	1.43
@@ -1 +1 @@
-nautilus-2.15.90.tar.bz2
+nautilus-2.15.91.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- nautilus.spec	4 Aug 2006 18:50:03 -0000	1.114
+++ nautilus.spec	10 Aug 2006 14:39:05 -0000	1.115
@@ -7,7 +7,7 @@
 %define pango_version 1.1.3
 %define gtk2_version 2.6.0
 %define libgnomeui_version 2.6.0
-%define eel2_version 2.15.4
+%define eel2_version 2.15.91
 %define gnome_icon_theme_version 1.1.5
 %define libxml2_version 2.4.20
 %define gail_version 0.17-2
@@ -22,7 +22,7 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.15.90
+Version: 	2.15.91
 Release:	1%{?dist}
 License: 	GPL
 Group:          User Interface/Desktops
@@ -31,7 +31,7 @@
 URL: 		http://www.gnome.org/projects/nautilus/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Requires:	fam
+Requires:	gamin
 Requires:       filesystem >= 2.1.1-1
 Requires:       desktop-backgrounds-basic >= %{desktop_backgrounds_version}
 Requires:       redhat-menus >= %{redhat_menus_version}
@@ -55,7 +55,7 @@
 BuildRequires:  gail-devel >= %{gail_version}
 BuildRequires:  gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires:  gnome-vfs2-devel >= %{gnome_vfs2_version}
-BuildRequires:	fam-devel
+BuildRequires:	gamin-devel
 BuildRequires:  librsvg2
 BuildRequires:  intltool
 BuildRequires:  libX11-devel
@@ -85,7 +85,6 @@
 Patch1:         nautilus-2.5.7-rhconfig.patch
 Patch2:         nautilus-2.15.2-format.patch
 Patch3:		background-no-delay.patch
-Patch4:		nautilus-2.15.90-background.patch
 
 %description
 Nautilus integrates access to files, applications, media,
@@ -94,13 +93,28 @@
 under the GNU General Public License and is a core component of the
 GNOME desktop project.
 
+%package extensions
+Summary: Nautilus extensions library
+Group: Development/Libraries
+
+%description extensions
+This package provides the libraries used by nautilus extensions.
+
+%package devel
+Summary: Libraries and include files for developing nautilus extensions
+Group: Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description devel
+This package provides the necessary development libraries and headers
+for writing nautilus extensions.
+
 %prep
 %setup -q -n %{name}-%{version}
 
 %patch1 -p1 -b .rhconfig
 %patch2 -p1 -b .format
 %patch3 -p1 -b .no-delay
-%patch4 -p1 -b .background
 
 %build
 
@@ -163,8 +177,6 @@
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB ChangeLog NEWS README
 
-%{_libdir}/*.so.*
-%{_libdir}/*.so
 %{_libdir}/nautilus
 %{_libdir}/bonobo/servers
 %{_datadir}/nautilus
@@ -175,10 +187,22 @@
 #%{_datadir}/omf
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
-%{_libdir}/pkgconfig/*
+
+%files extensions
+%defattr(-, root, root)
+%{_libdir}/libnautilus-extension.so.*
+
+%files devel
+%defattr(-, root, root)
 %{_includedir}/nautilus
+%{_libdir}/pkgconfig/*
+%{_libdir}/*.so
 
 %changelog
+* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-1
+- Update to 2.15.91
+- Split package into devel and extensions (#201967)
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	3 Aug 2006 18:44:37 -0000	1.45
+++ sources	10 Aug 2006 14:39:05 -0000	1.46
@@ -1 +1 @@
-ade4e3580a9cb641b4ff51aced9124dc  nautilus-2.15.90.tar.bz2
+bce548ea8339339968e5d5da0679a51a  nautilus-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 10 14:47:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 10:47:25 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo68383.evo28support.patch, NONE,
	1.1 openoffice.org.spec, 1.828, 1.829
Message-ID: <200608101447.k7AElPTP031307@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo68383.evo28support.patch 
Log Message:
new evo support

openoffice.org-2.0.3.ooo68383.evo28support.patch:
 connectivity/source/drivers/evoab2/EApi.cxx |    5 +++--
 source/drivers/evoab2/EApi.cxx              |    0 
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.0.3.ooo68383.evo28support.patch ---
Index: source/drivers/evoab2/EApi.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/EApi.cxx,v
retrieving revision 1.4
diff -u -r1.4 EApi.cxx
--- openoffice.org.orig/connectivity/source/drivers/evoab2/EApi.cxx	28 Feb 2006 10:32:00 -0000	1.4
+++ openoffice.org/connectivity/source/drivers/evoab2/EApi.cxx	10 Aug 2006 14:45:21 -0000
@@ -41,9 +41,10 @@
 #include "EApi.h"
 #endif
 static char *eBookLibNames[] = {
-	"libebook.so.8",	 // evolution-2.0
+	"libebook-1.2.so.9", // evolution-2.8
+	"libebook-1.2.so.5", // evolution-2.4 and 2.6+
 	"libebook-1.2.so.3", // evolution-2.2
-	"libebook-1.2.so.5"	 // evolution-2.4 and 2.6+
+	"libebook.so.8"      // evolution-2.0
 };
 
 typedef void (*SymbolFunc) (void);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -r1.828 -r1.829
--- openoffice.org.spec	10 Aug 2006 14:03:32 -0000	1.828
+++ openoffice.org.spec	10 Aug 2006 14:47:14 -0000	1.829
@@ -132,6 +132,7 @@
 Patch64: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
 Patch65: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
 Patch66: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch67: openoffice.org-2.0.3.ooo68383.evo28support.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -999,6 +1000,7 @@
 %patch64 -p1 -b .ooo68047.vcl.zwj.patch
 %patch65 -p1 -b .ooo68048.vcl.imsurroundtext.patch
 %patch66 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch67 -p1 -b .ooo68383.evo28support.patch
 
 tar xzf %{SOURCE1}
 
@@ -2524,6 +2526,7 @@
 * Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.10
 - rh#201447# -> openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
 - rh#201305# -> openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
+- add openoffice.org-2.0.3.ooo68383.evo28support.patch for new evo
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
 - icu settext ownership of string data changed silently



From fedora-cvs-commits at redhat.com  Thu Aug 10 14:58:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 10:58:09 -0400
Subject: rpms/beagle/devel beagle.spec,1.64,1.65
Message-ID: <200608101458.k7AEw91Q025083@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25070/devel

Modified Files:
	beagle.spec 
Log Message:
* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-7
- pre-require shadow-utils (#201991)




Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- beagle.spec	25 Jul 2006 22:54:48 -0000	1.64
+++ beagle.spec	10 Aug 2006 14:58:07 -0000	1.65
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.7
-Release:       	6
+Release:       	7%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -28,6 +28,9 @@
 Requires: sqlite >= 3.3.1
 Requires: mono-core >= 1.1.13.5
 Requires: zip unzip sed grep poppler-utils
+
+Requires(pre):  shadow-utils
+
 Patch1: beagle-0.2.7-nodebug.patch
 Patch2: beagle-0.2.7-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
@@ -216,6 +219,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-7
+- pre-require shadow-utils (#201991)
+
 * Wed Jul 26 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-6
 - Pass --autostarted in autostart desktop file to make autostart switch work
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:10:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:10:57 -0400
Subject: rpms/yelp/devel .cvsignore, 1.29, 1.30 sources, 1.31, 1.32 yelp.spec,
	1.71, 1.72
Message-ID: <200608101510.k7AFAvdG025471@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25454

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
- Update to 2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	27 Jul 2006 16:20:55 -0000	1.29
+++ .cvsignore	10 Aug 2006 15:10:54 -0000	1.30
@@ -1 +1 @@
-yelp-2.15.5.tar.bz2
+yelp-2.15.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	27 Jul 2006 16:20:55 -0000	1.31
+++ sources	10 Aug 2006 15:10:54 -0000	1.32
@@ -1 +1 @@
-ae48d9f1c3ce8210b40b598bbb6ac064  yelp-2.15.5.tar.bz2
+4e80d89cf67360f7f2496cf87d0c83c4  yelp-2.15.91.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- yelp.spec	29 Jul 2006 03:50:46 -0000	1.71
+++ yelp.spec	10 Aug 2006 15:10:54 -0000	1.72
@@ -18,7 +18,7 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.15.5
+Version: 2.15.91
 Release: 1
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -130,6 +130,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Thu Aug 10 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.91-1
+- Update to 2.15.91
+
 * Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.5-1
 - Update to 2.15.5
 - Rebuild against firefox-devel



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:13:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:13:30 -0400
Subject: rpms/mesa/devel mesa.spec,1.81,1.82
Message-ID: <200608101513.k7AFDUFZ003905@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	mesa.spec 
Log Message:
First pass at mesa cvs update.


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- mesa.spec	27 Jul 2006 22:43:14 -0000	1.81
+++ mesa.spec	10 Aug 2006 15:13:28 -0000	1.82
@@ -62,21 +62,23 @@
 
 #-- END DRI Build Configuration ------------------------------------------
 
+%define snapshot 20060808
+
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 20%{?dist}
+Release: 20.%{snapshot}cvs%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
+Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-cvs%{snapshot}.tar.bz2
 # MesaDemos is included here just for glxinfo and glxgears, as they were
 # previously supplied in X.Org sources, whereas the rest of the demos were not.
 # It would be in it's own separate package if there was a way of sanely building
 # it outside of Mesa.
-Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
+Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-cvs%{snapshot}.tar.bz2
 Source10: redhat-mesa-target
 Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
@@ -311,7 +313,7 @@
 
 #-- prep -------------------------------------------------------------
 %prep
-%setup -q -n Mesa-%{version} -b1
+%setup -q -n Mesa-cvs%{snapshot} -b1
 # Copy Red Hat Mesa build/install simplificomplication scripts into build dir.
 install -m 755 %{SOURCE10} ./
 install -m 755 %{SOURCE11} ./
@@ -319,30 +321,29 @@
 
 %patch0 -p0 -b .build-config
 #%patch1 -p0 -b .glx-use-tls
-%patch2 -p1 -b .fix-opt-flags-bug197640
-%if %{with_motif}
-%patch3 -p0 -b .libGLw-enable-motif-support
-%endif
+#%patch2 -p1 -b .fix-opt-flags-bug197640
+#%if %{with_motif}
+#%patch3 -p0 -b .libGLw-enable-motif-support
+#%endif
 %patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
 %patch5 -p1 -b .linux-indirect
 %patch6 -p1 -b .glxinfo
 
-%patch10 -p0 -b .fix-installmesa
+#%patch10 -p0 -b .fix-installmesa
 %patch11 -p0 -b .multilib-fix
-%patch12 -p1 -b .modular
+#%patch12 -p1 -b .modular
 %patch14 -p0 -b .drop-static-inline
-%patch15 -p0 -b .noexecstack
+#%patch15 -p0 -b .noexecstack
 %patch16 -p0 -b .force-r300
-%patch17 -p0 -b .fix-pbuffer-dispatch
-%patch18 -p1 -b .selinux-awareness
-#%patch19 -p1 -b .r300-free-gart-mem
+#%patch17 -p0 -b .fix-pbuffer-dispatch
+#%patch18 -p1 -b .selinux-awareness
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
 # a change for post feature freeze.  Leaving off for now...
-%patch200 -p0 -b .texture-from-pixmap-fixes
+#%patch200 -p0 -b .texture-from-pixmap-fixes
 %patch201 -p1 -b .radeon-use-right-format
-%patch202 -p0 -b .tfp-fbconfig-attribs
+#%patch202 -p0 -b .tfp-fbconfig-attribs
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:14:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:14:22 -0400
Subject: rpms/beagle/devel beagle.spec,1.65,1.66
Message-ID: <200608101514.k7AFEMlU004148@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4096

Modified Files:
	beagle.spec 
Log Message:
mono-devtools, not mono-devel



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- beagle.spec	10 Aug 2006 14:58:07 -0000	1.65
+++ beagle.spec	10 Aug 2006 15:14:20 -0000	1.66
@@ -9,7 +9,7 @@
 Source1:	beagle-autostart.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  mono-devel >= 1.1.13.5
+BuildRequires:  mono-devtools
 BuildRequires:  mono-data mono-data-sqlite
 BuildRequires:  gtk-sharp2-gapi mono-web zip libexif-devel
 BuildRequires:  gsf-sharp >= 0.6



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:16:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:16:39 -0400
Subject: rpms/beagle/devel beagle.spec,1.66,1.67
Message-ID: <200608101516.k7AFGddl004967@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4844

Modified Files:
	beagle.spec 
Log Message:
mono-lib-devel i meant



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- beagle.spec	10 Aug 2006 15:14:20 -0000	1.66
+++ beagle.spec	10 Aug 2006 15:16:33 -0000	1.67
@@ -9,7 +9,7 @@
 Source1:	beagle-autostart.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  mono-devtools
+BuildRequires:  mono-lib-devel
 BuildRequires:  mono-data mono-data-sqlite
 BuildRequires:  gtk-sharp2-gapi mono-web zip libexif-devel
 BuildRequires:  gsf-sharp >= 0.6



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:16:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:16:53 -0400
Subject: rpms/devhelp/devel devhelp.spec,1.45,1.46
Message-ID: <200608101516.k7AFGrJK005128@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4993

Modified Files:
	devhelp.spec 
Log Message:
- Rebuild against firefox, again.



Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- devhelp.spec	29 Jul 2006 15:04:41 -0000	1.45
+++ devhelp.spec	10 Aug 2006 15:16:51 -0000	1.46
@@ -1,7 +1,7 @@
 Summary:             API document browser
 Name:                devhelp
 Version:             0.12
-Release:             1
+Release:             2
 License:             GPL
 Group:               Development/Tools
 Url:                 http://ftp.gnome.org/pub/gnome/sources/devhelp/
@@ -109,6 +109,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Aug 10 2006 Matthew Barnes <mbarnes at redhat.com> - 0.12-2
+- Rebuild against firefox, again.
+
 * Sat Jul 29 2006 Matthias Clasen <mclasen at redhat.com> - 0.12-1
 - Update to 0.12
 - Rebuild against firefox



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:17:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:17:51 -0400
Subject: rpms/tanukiwrapper/devel tanukiwrapper.spec,1.23,1.24
Message-ID: <200608101517.k7AFHpUD011866@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/tanukiwrapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10980

Modified Files:
	tanukiwrapper.spec 
Log Message:
- Resync with latest from JPP.




Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tanukiwrapper.spec	4 Aug 2006 23:13:25 -0000	1.23
+++ tanukiwrapper.spec	10 Aug 2006 15:17:49 -0000	1.24
@@ -35,7 +35,7 @@
 
 Name:		tanukiwrapper
 Version:	3.2.1
-Release:	2jpp.2
+Release:	2jpp.3
 Summary:	Java Service Wrapper
 Epoch:		0
 License:	BSD
@@ -44,9 +44,10 @@
 Patch1:		%{name}-build.patch
 Patch2:		%{name}-crosslink.patch
 Patch3:		%{name}-makefile-linux-x86-32.patch
-Patch4:		%{name}-nosun-jvm-64.patch
 #Add Makefiles so package builds for all FC architectures.
-Patch5:		%{name}-Makefile-s390-s390x-ppc.patch
+Patch4:		%{name}-Makefile-s390-s390x-ppc.patch
+# The following patch is only needed for GCJ.
+Patch5:		%{name}-nosun-jvm-64.patch
 Group:		Development/Java
 BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	glibc-devel
@@ -104,7 +105,10 @@
 %patch2
 %patch3
 %patch4
+# The following patch is only needed for GCJ.
+%if %{gcj_support}
 %patch5
+%endif
 find . -name "*.jar" -exec %__rm -f {} \;
 %__perl -p -i -e 's/\r//' doc/AUTHORS
 %__perl -p -i -e 's|-O3|%optflags|' src/c/Makefile*
@@ -164,16 +168,16 @@
   %__rm -f %{_javadocdir}/%{name}
 fi
 
-%post
 %if %{gcj_support}
+%post
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%postun
 %if %{gcj_support}
+%postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -201,6 +205,9 @@
 %doc doc/*
 
 %changelog
+* Wed Aug 09 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.2.1-2jpp.3
+- Resync with latest from JPP.
+
 * Fri Aug 4 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.2.1-2jpp.2
 - Rebuild.
 
@@ -208,9 +215,6 @@
 - Merge with latest from JPP.
 - Partially add new naming convention (.1 suffix).
 - Clean new source tar ball.
-- Add patch to add -lm in x86-32 Makefile.
-- Add patch to avoid use of obscure property not supported on GCJ.
-- Add missing makefiles for architectures pertinent to FC.
 
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:3.1.1-4jpp_9fc
 - Rebuilt



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:20:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:20:39 -0400
Subject: rpms/kdepim/devel kdepim-3.5.4-kde#117882.patch, NONE,
	1.1 kdepim-3.5.4-kde#132008.patch, NONE, 1.1 .cvsignore, 1.32,
	1.33 kdepim.spec, 1.98, 1.99 sources, 1.35,
	1.36 kdepim-3.5.3-3.5.4.patch, 1.1,
	NONE kdepim-3.5.3-kde#118112.patch, 1.1,
	NONE kdepim-3.5.3-kde#192416.patch, 1.1,
	NONE kdepim-3.5.3-kmail-127538.patch, 1.1,
	NONE kdepim-3.5.3-kmail-encryption.patch, 1.1,
	NONE kdepim-3.5.3-kmail-typo.patch, 1.1,
	NONE kdepim-3.5.3-korganizer.patch, 1.1, NONE
Message-ID: <200608101520.k7AFKdwt021279@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdepim.spec sources 
Added Files:
	kdepim-3.5.4-kde#117882.patch kdepim-3.5.4-kde#132008.patch 
Removed Files:
	kdepim-3.5.3-3.5.4.patch kdepim-3.5.3-kde#118112.patch 
	kdepim-3.5.3-kde#192416.patch kdepim-3.5.3-kmail-127538.patch 
	kdepim-3.5.3-kmail-encryption.patch 
	kdepim-3.5.3-kmail-typo.patch kdepim-3.5.3-korganizer.patch 
Log Message:
- apply upstream patches,
   - Kmail crashes on startup, kde#132008
   - Cannot send to addresses containing an ampersand (&), kde#117882



kdepim-3.5.4-kde#117882.patch:
 kmsender.cpp |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE kdepim-3.5.4-kde#117882.patch ---
Index: kmail/kmsender.cpp
===================================================================
--- kmail/kmsender.cpp	(Revision 571371)
+++ kmail/kmsender.cpp	(Revision 571372)
@@ -173,7 +173,7 @@
   }
 
   //Ensure the message is correctly and fully parsed
-  
+
   /* The above was added by Marc and seems to be necessary to ensure
    * the mail is in a sane state before sending. The unGet makes the
    * attached unencrypted version of the mail (if there is one ) disappear.
@@ -331,10 +331,10 @@
         imapSentFolder =
           kmkernel->imapFolderMgr()->findIdString( mCurrentMsg->fcc() );
     }
-    // No, or no usable sentFolder, and no, or no usable imapSentFolder, 
+    // No, or no usable sentFolder, and no, or no usable imapSentFolder,
     // let's try the on in the identity
     if ( ( sentFolder == 0 || sentFolder->isReadOnly() )
-      && ( imapSentFolder == 0 || imapSentFolder->isReadOnly() ) 
+      && ( imapSentFolder == 0 || imapSentFolder->isReadOnly() )
       && !id.fcc().isEmpty() )
     {
       sentFolder = kmkernel->folderMgr()->findIdString( id.fcc() );
@@ -600,7 +600,7 @@
   QStringList to, cc, bcc;
   QString sender;
   extractSenderToCCAndBcc( mCurrentMsg, &sender, &to, &cc, &bcc );
-  
+
   // MDNs are required to have an empty envelope from as per RFC2298.
   if ( messageIsDispositionNotificationReport( mCurrentMsg ) && GlobalSettings::self()->sendMDNsWithEmptySender() )
     sender = "<>";
@@ -1052,13 +1052,15 @@
   QString query = "headers=0&from=";
   query += KURL::encode_string( sender );
 
-  if ( !to.empty() )
-    query += "&to=" + to.join( "&to=" );
-  if ( !cc.empty() )
-    query += "&cc=" + cc.join( "&cc=" );
-  if ( !bcc.empty() )
-    query += "&bcc=" + bcc.join( "&bcc=" );
+  QStringList::ConstIterator it;
 
+  for ( it = to.begin(); it != to.end(); ++it )
+    query += "&to=" + KURL::encode_string(*it);
+  for ( it = cc.begin(); it != cc.end(); ++it )
+    query += "&cc=" + KURL::encode_string(*it);
+  for ( it = bcc.begin(); it != bcc.end(); ++it )
+    query += "&bcc=" + KURL::encode_string(*it);
+
   KMTransportInfo * ti = mSender->transportInfo();
 
   if ( ti->specifyHostname )

kdepim-3.5.4-kde#132008.patch:
 kmmessage.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE kdepim-3.5.4-kde#132008.patch ---
Index: kmail/kmmessage.cpp
===================================================================
--- kmail/kmmessage.cpp	(Revision 570893)
+++ kmail/kmmessage.cpp	(Revision 570894)
@@ -706,6 +706,8 @@
                                            const QTextCodec*& codec,
                                            bool& isHTML ) const
 {
+  if ( !root ) return;
+
   isHTML = false;
   // initialy parse the complete message to decrypt any encrypted parts
   {
@@ -3819,7 +3821,7 @@
 //-----------------------------------------------------------------------------
 QCString KMMessage::charset() const
 {
-  if ( mMsg->Headers().HasContentType() ) {  
+  if ( mMsg->Headers().HasContentType() ) {
     DwMediaType &mType=mMsg->Headers().ContentType();
     mType.Parse();
     DwParameter *param=mType.FirstParameter();
Index: kmail/kmmessage.cpp
===================================================================
--- kmail/kmmessage.cpp	(Revision 571072)
+++ kmail/kmmessage.cpp	(Revision 571073)
@@ -738,6 +738,7 @@
   const QTextCodec * codec = 0;
 
   partNode * root = partNode::fromMessage( this );
+  if ( !root ) return QString::null;
   parseTextStringFromDwPart( root, parsedString, codec, isHTML );
   delete root;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	2 Jun 2006 16:11:39 -0000	1.32
+++ .cvsignore	10 Aug 2006 15:20:37 -0000	1.33
@@ -11,3 +11,4 @@
 kdepim-3.5.1.tar.bz2
 kdepim-3.5.2.tar.bz2
 kdepim-3.5.3.tar.bz2
+kdepim-3.5.4.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- kdepim.spec	24 Jul 2006 16:30:02 -0000	1.98
+++ kdepim.spec	10 Aug 2006 15:20:37 -0000	1.99
@@ -4,14 +4,14 @@
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_version 1:3.3.6
-%define arts_version 8:1.5.3
+%define arts_version 8:1.5.4
 %define arts 1
 %define make_cvs 1
 
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -20,12 +20,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.kde.org
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: cr48-app-kandy.png
 Source2: cr32-app-kandy.png
 Source3: cr16-app-kandy.png
 
-Patch0: kdepim-3.5.3-3.5.4.patch 
 Patch1: kde-libtool.patch
 Patch2: kdepim-3.4.0-s390.patch
 Patch3: kdepim-3.4.0-kandy-icons.patch
@@ -33,15 +32,12 @@
 Patch5: kdepim-3.5.3-gcc-4.1.1-8.patch
 
 # upstream patches
-Patch100: kdepim-3.5.3-korganizer.patch
-Patch101: kdepim-3.5.3-kmail-typo.patch
-Patch102: kdepim-3.5.3-kmail-encryption.patch
-Patch103: kdepim-3.5.3-kmail-127538.patch
-Patch104: kdepim-3.5.3-kde#118112.patch
-Patch105: kdepim-3.5.3-kde#192416.patch
+Patch100: kdepim-3.5.4-kde#132008.patch
+Patch101: kdepim-3.5.4-kde#117882.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 BuildRequires: perl
 BuildRequires: bison
@@ -80,8 +76,7 @@
 Install %{name}-devel if you want to write or compile %{name} plugins.
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0
+%setup -q
 
 %ifarch s390 s390x
 %patch2 -p1 -b .s390
@@ -93,12 +88,8 @@
 %patch5 -p1 -b .gcc-4.1.1-8
 
 # upstream patches
-#%patch100 -p1 -b .korganizer-kogroupware
-#%patch101 -p1 -b .kmail-typo
-#%patch102 -p1 -b .kmail-encryption
-#%patch103 -p1 -b .kmail-127538.patch
-#%patch104 -p0 -b .kde#118112
-#%patch105 -p0 -b .kde#192416
+%patch100 -p0 -b .kde#132008
+%patch101 -p0 -b .kde#117882
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -154,16 +145,16 @@
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -196,6 +187,11 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
+- apply upstream patches,
+   - Kmail crashes on startup, kde#132008
+   - Cannot send to addresses containing an ampersand (&), kde#117882
+
 * Mon Jul 24 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	2 Jun 2006 16:11:44 -0000	1.35
+++ sources	10 Aug 2006 15:20:37 -0000	1.36
@@ -1 +1 @@
-2b83885854a5953bca59508d9a7cf5ef  kdepim-3.5.3.tar.bz2
+4a01ceaeb6067d03003edb77b104f559  kdepim-3.5.4.tar.bz2


--- kdepim-3.5.3-3.5.4.patch DELETED ---


--- kdepim-3.5.3-kde#118112.patch DELETED ---


--- kdepim-3.5.3-kde#192416.patch DELETED ---


--- kdepim-3.5.3-kmail-127538.patch DELETED ---


--- kdepim-3.5.3-kmail-encryption.patch DELETED ---


--- kdepim-3.5.3-kmail-typo.patch DELETED ---


--- kdepim-3.5.3-korganizer.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:27:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:27:38 -0400
Subject: rpms/acpid/devel acpid.spec,1.12,1.13
Message-ID: <200608101527.k7AFRcja023598@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/acpid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23494

Modified Files:
	acpid.spec 
Log Message:
- Disable the automatic shutdown -h via powerdown button by default due to
  conflicts with gnome-power-manager



Index: acpid.spec
===================================================================
RCS file: /cvs/dist/rpms/acpid/devel/acpid.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- acpid.spec	12 Jul 2006 05:06:58 -0000	1.12
+++ acpid.spec	10 Aug 2006 15:27:35 -0000	1.13
@@ -1,14 +1,13 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.4
-Release: 2.1
+Release: 3
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
 Source1: acpid.logrotate
 Source2: acpid.init
 Source3: acpid.video.conf
-Patch1: acpid-1.0.3-conf.patch
 Patch2: acpid-1.0.3-makefile.patch
 Patch3: acpid-1.0.4-warning.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -23,7 +22,6 @@
 
 %prep
 %setup
-%patch1 -p1 -b .conffile
 %patch2 -p1 -b .makefile
 %patch3 -p1 -b .warning
 
@@ -88,6 +86,10 @@
 fi
 
 %changelog
+* Thu Aug 10 2006 Phil Knirsch <pknirsch at redhat.com> - 1.0.4-3
+- Disable the automatic shutdown -h via powerdown button by default due to
+  conflicts with gnome-power-manager
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:28:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:28:39 -0400
Subject: rpms/jsch/devel jsch.spec,1.18,1.19
Message-ID: <200608101528.k7AFSdL8023983@cvs.devel.redhat.com>

Author: dbhole

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

Modified Files:
	jsch.spec 
Log Message:

Updated changelog entries in the spec.




Index: jsch.spec
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jsch.spec	4 Aug 2006 23:52:07 -0000	1.18
+++ jsch.spec	10 Aug 2006 15:28:36 -0000	1.19
@@ -36,7 +36,7 @@
 
 Name:           jsch
 Version:        0.1.28
-Release:        1jpp.4
+Release:        1jpp.5
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -163,8 +163,17 @@
 
 
 %changelog
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.1.28-1jpp.5
+- Updated changelog entries in spec.
+
 * Fri Aug 04 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.1.28-1jpp.4
+- Added conditional compiling support.
 - Added missing requirements.
+- Additionally, for synchronizaion between logs:
+- From r.apel at r-apel.de:
+  - 0.1.26
+- From fnasser at redhat.com:
+  - 0.1.20
 
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:0.1.28-1jpp_3fc
 - Rebuilt



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:34:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:34:51 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.90,
	1.91 libselinux.spec, 1.216, 1.217
Message-ID: <200608101534.k7AFYpRq025677@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Wed Aug  9 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.22-2
- Fix translation return codes to return size of buffer


libselinux-rhat.patch:
 fgetfilecon.c |    3 +++
 getfilecon.c  |    2 ++
 lgetfilecon.c |    2 ++
 3 files changed, 7 insertions(+)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- libselinux-rhat.patch	21 Jun 2006 19:58:52 -0000	1.90
+++ libselinux-rhat.patch	10 Aug 2006 15:34:46 -0000	1.91
@@ -1,291 +1,35 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.30.15/include/selinux/selinux.h
---- nsalibselinux/include/selinux/selinux.h	2006-06-16 15:08:24.000000000 -0400
-+++ libselinux-1.30.15/include/selinux/selinux.h	2006-06-21 15:26:36.000000000 -0400
-@@ -429,8 +429,19 @@
-    Caller must free the returned strings via free. */
- extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
- 
-+/* This function compares two file context, ignoring the user component */
-+int selinux_file_context_cmp(const security_context_t a, const security_context_t b);
-+
-+/* This function looks at the file context on disk and compares it to the 
-+system defaults, it returns 0 on match non 0 on failure */
-+int selinux_file_context_verify(const char *path, mode_t mode);
-+
-+/* This function sets the file context on to the system defaults returns 0 on success */
-+int selinux_lsetfilecon_default(const char *path);
-+
- #ifdef __cplusplus
- }
- #endif
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/fgetfilecon.c libselinux-1.30.22/src/fgetfilecon.c
+--- nsalibselinux/src/fgetfilecon.c	2006-07-03 07:52:49.000000000 -0400
++++ libselinux-1.30.22/src/fgetfilecon.c	2006-08-10 11:09:07.000000000 -0400
+@@ -58,5 +58,8 @@
+ 		freecon(rcontext);
+ 	}
  
- #endif
++	if (ret >= 0)
++		return strlen(*context);
 +
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-1.30.15/man/man8/matchpathcon.8
---- nsalibselinux/man/man8/matchpathcon.8	2006-05-15 09:43:24.000000000 -0400
-+++ libselinux-1.30.15/man/man8/matchpathcon.8	2006-06-21 15:26:36.000000000 -0400
-@@ -3,13 +3,25 @@
- matchpathcon \- get the default security context for the specified path from the file contexts configuration.
- 
- .SH "SYNOPSIS"
--.B matchpathcon [-n] filepath...
--
-+.B matchpathcon [-V] [-N] [-n] [-f file_contexts_file ] [-p prefix ] filepath...
- .SH "DESCRIPTION"
- .B matchpathcon
- Prints the file path and the default security context associated with it.
-+.SH OPTIONS
-+.B \-n
-+Do not display path.
-+.br
-+.B \-N
-+Do not use translations.
-+.br
-+.B \-f file_context_file
-+Use alternate file_context file
-+.br
-+.B \-p prefix
-+Use prefix to speed translations
- .br
--If the -n option is given, do not display path.
-+.B \-V
-+Verify file context on disk matches defaults
- 
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-1.30.15/src/matchpathcon.c
---- nsalibselinux/src/matchpathcon.c	2006-05-18 12:11:17.000000000 -0400
-+++ libselinux-1.30.15/src/matchpathcon.c	2006-06-21 15:37:18.000000000 -0400
-@@ -20,10 +20,12 @@
- #endif
- default_printf(const char *fmt, ...) 
- {
-+#ifdef DEBUG
- 	va_list ap;
- 	va_start(ap, fmt);
- 	vfprintf(stderr, fmt, ap);
- 	va_end(ap);
-+#endif
- }
- 
- static void 
-@@ -50,7 +52,7 @@
- static int default_canoncon(const char *path, unsigned lineno, char **context)
- {
- 	char *tmpcon;
--	if (security_canonicalize_context(*context, &tmpcon) < 0) {
-+	if (security_canonicalize_context_raw(*context, &tmpcon) < 0) {
- 		if (errno == ENOENT)
- 			return 0;
- 		if (lineno)
-@@ -74,7 +76,7 @@
- 		mycanoncon = &default_canoncon;
+ 	return ret;
  }
- 
--static unsigned int myflags;
-+static __thread unsigned int myflags;
- 
- void set_matchpathcon_flags(unsigned int flags)
- {
-@@ -552,21 +554,6 @@
- 		
- 	skip_type:
- 		if (strcmp(context, "<<none>>")) {
--			char *tmpcon = NULL;
--
--			if (myflags & MATCHPATHCON_NOTRANS)
--				goto skip_trans;
--
--			if (selinux_raw_to_trans_context(context, &tmpcon)) {
--				myprintf("%s: line %u has invalid "
--					 "context %s\n",
--					 path, lineno, context);
--				return 0;
--			}
--			free(context);
--			context = tmpcon;
--
--skip_trans:
- 			if (myflags & MATCHPATHCON_VALIDATE) {
- 				if (myinvalidcon) {
- 					/* Old-style validation of context. */
-@@ -831,7 +818,12 @@
- 		spec_arr[i].context_valid = 1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/getfilecon.c libselinux-1.30.22/src/getfilecon.c
+--- nsalibselinux/src/getfilecon.c	2006-07-03 07:52:49.000000000 -0400
++++ libselinux-1.30.22/src/getfilecon.c	2006-08-10 11:09:59.000000000 -0400
+@@ -57,6 +57,8 @@
+ 		ret = selinux_raw_to_trans_context(rcontext, context);
+ 		freecon(rcontext);
  	}
++	if (ret >= 0)
++		return strlen(*context);
  
--	*con = strdup(spec_arr[i].context);
-+	if (myflags & MATCHPATHCON_NOTRANS) {
-+		*con = strdup(spec_arr[i].context);
-+	} else {
-+		if (selinux_raw_to_trans_context(spec_arr[i].context, con)) 
-+			return -1;
-+	}
- 	if (!(*con))
- 		return -1;
- 
-@@ -877,3 +869,72 @@
- 		}
- 	}
+ 	return ret;
  }
-+
-+/* Compare two contexts to see if their differences are "significant",
-+ * or whether the only difference is in the user. */
-+int selinux_file_context_cmp(const security_context_t a, const security_context_t b)
-+{
-+	char *rest_a, *rest_b; /* Rest of the context after the user */
-+	if (!a && !b) return 0;
-+	if (!a && b) return -1;
-+	if (a && !b) return 1;
-+	rest_a = strchr((char *)a, ':');
-+	rest_b = strchr((char *)b, ':');
-+	if (!rest_a && !rest_b) return 0;
-+	if (!rest_a && rest_b) return -1;
-+	if (rest_a && !rest_b) return 1;
-+	return  strcmp(rest_a, rest_b);
-+}
-+
-+int selinux_file_context_verify(const char *path, mode_t mode)
-+{
-+ 	security_context_t con = NULL;
-+ 	security_context_t fcontext = NULL;
-+	unsigned int localflags=myflags;
-+	int rc=0;
-+
-+	rc = lgetfilecon_raw(path, &con);
-+	if (rc == -1) {
-+		if (errno != ENOTSUP)
-+			return 1;
-+	        else
-+			return 0;
-+	}
-+
-+	set_matchpathcon_flags(myflags | MATCHPATHCON_NOTRANS);
-+	if (matchpathcon(path,mode,&fcontext) != 0)  {
-+		if (errno != ENOENT) 
-+			rc = 1;
-+		else
-+			rc = 0;
-+	} 
-+	else 
-+		rc = (selinux_file_context_cmp(fcontext, con) == 0);
-+	set_matchpathcon_flags(localflags);
-+	freecon(con);
-+	freecon(fcontext); 
-+	return rc;
-+}
-+
-+
-+int selinux_lsetfilecon_default(const char *path) {
-+	struct stat st;
-+	int rc = -1;
-+	security_context_t scontext=NULL;
-+	unsigned int localflags=myflags;
-+	if (lstat(path, &st) != 0)
-+		return rc;
-+
-+	set_matchpathcon_flags(myflags | MATCHPATHCON_NOTRANS);
-+
-+	/* If there's an error determining the context, or it has none, 
-+	   return to allow default context */
-+	if (matchpathcon(path, st.st_mode, &scontext)) {
-+		if (errno == ENOENT) rc = 0;
-+	} else 	{
-+		rc = lsetfilecon_raw(path, scontext);
-+		freecon(scontext);
-+	}
-+	set_matchpathcon_flags(localflags);
-+	return rc;
-+}
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.30.15/utils/matchpathcon.c
---- nsalibselinux/utils/matchpathcon.c	2006-05-18 12:11:17.000000000 -0400
-+++ libselinux-1.30.15/utils/matchpathcon.c	2006-06-21 15:26:36.000000000 -0400
-@@ -12,19 +12,44 @@
- 	exit(1);
- }
- 
-+int printmatchpathcon(char *path, int header) {
-+	char *buf;
-+	int rc = matchpathcon(path, 0, &buf);
-+	if (rc < 0) {
-+		fprintf(stderr, "matchpathcon(%s) failed: %s\n", path, strerror(errno));
-+		return 1;
-+	}
-+	if (header)
-+		printf("%s\t%s\n", path, buf);
-+	else
-+		printf("%s\n", buf);
-+	
-+	freecon(buf);
-+	return 0;
-+}
-+
- int main(int argc, char **argv) 
- {
--	char *buf;
--	int rc, i, init = 0;
-+	int i, init = 0;
- 	int header=1, opt;
-+	int verify=0;
-+	int notrans=0;
-+	int error=0;
- 
- 	if (argc < 2) usage(argv[0]);
- 
--	while ((opt = getopt(argc, argv, "nf:p:")) > 0) {
-+	while ((opt = getopt(argc, argv, "Nnf:p:V")) > 0) {
- 		switch (opt) {
- 		case 'n':
- 			header=0;
- 			break;
-+		case 'V':
-+			verify=1;
-+			break;
-+		case 'N':
-+			notrans=1;
-+			set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
-+			break;
- 		case 'f':
- 			if (init) {
- 				fprintf(stderr, "%s:  -f and -p are exclusive\n", argv[0]);
-@@ -54,18 +79,30 @@
- 		}
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/lgetfilecon.c libselinux-1.30.22/src/lgetfilecon.c
+--- nsalibselinux/src/lgetfilecon.c	2006-07-03 07:52:49.000000000 -0400
++++ libselinux-1.30.22/src/lgetfilecon.c	2006-08-10 11:06:59.000000000 -0400
+@@ -58,5 +58,7 @@
+ 		freecon(rcontext);
  	}
- 	for (i = optind; i < argc; i++) {
--		rc = matchpathcon(argv[i], 0, &buf);
--		if (rc < 0) {
--			fprintf(stderr, "%s:  matchpathcon(%s) failed\n", argv[0], argv[i]);
--			return 2;
--		}
--		if (header)
--			printf("%s\t%s\n", argv[i], buf);
--		else
--			printf("%s\n", buf);
-+		if (verify) {
-+			if (selinux_file_context_verify(argv[i], 0)) {
-+				printf("%s verified.\n", argv[i]);
-+			} else {
-+				security_context_t con;
-+				int rc;
-+				if (notrans) 
-+					rc = lgetfilecon_raw(argv[i], &con);
-+				else
-+					rc = lgetfilecon(argv[i], &con);
  
--		freecon(buf);
-+				if (rc >= 0) {
-+					printf("%s has context %s, should be ", argv[i], con);
-+					error += printmatchpathcon(argv[i], 0);
-+					freecon(con);
-+				} else {
-+					printf("actual context unknown: %s, should be ", strerror(errno));
-+					error += printmatchpathcon(argv[i], 0);
-+				}
-+			}
-+		} else {
-+			error += printmatchpathcon(argv[i], header);
-+		}
- 	}
- 	matchpathcon_fini();
--	return 0;
-+	return error;
++	if (ret >= 0)
++		return strlen(*context);
+ 	return ret;
  }


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- libselinux.spec	4 Aug 2006 22:49:48 -0000	1.216
+++ libselinux.spec	10 Aug 2006 15:34:47 -0000	1.217
@@ -2,10 +2,12 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.22
-Release: 1
+Release: 2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
+
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver} setransd
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +48,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -115,6 +118,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Wed Aug  9 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.22-2
+- Fix translation return codes to return size of buffer
+
 * Tue Aug  1 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.22-1
 - Upgrade to latest from NSA
 	* Merged no-tls-direct-seg-refs patch from Jeremy Katz.



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:53:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:53:58 -0400
Subject: rpms/cairo/devel cairo.spec,1.56,1.57
Message-ID: <200608101553.k7AFrwh7013286@cvs.devel.redhat.com>

Author: besfahbo

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

Modified Files:
	cairo.spec 
Log Message:
- Remove unnecessary --disable-* arguments to configure, add --enable-*
  for those backends we really want to make sure are enabled.



Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- cairo.spec	9 Aug 2006 16:29:32 -0000	1.56
+++ cairo.spec	10 Aug 2006 15:53:55 -0000	1.57
@@ -52,9 +52,8 @@
 %setup -q
 
 %build
-%configure --enable-warnings --disable-glitz --disable-quartz \
-        --enable-xlib \
-	--disable-atsui --disable-xcb --disable-win32 \
+%configure --enable-warnings --enable-xlib --enable-freetype \
+	--enable-ps --enable-pdf --enable-svg \
 	--disable-gtk-doc
 make
 
@@ -85,6 +84,10 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Wed Aug  9 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.2.2-3
+- Remove unnecessary --disable-* arguments to configure, add --enable-*
+  for those backends we really want to make sure are enabled.
+
 * Wed Aug  9 2006 Ray Strode <rstrode at redhat.com> - 1.2.2-2
 - add lame libXt-devel BuildReq to get things building again.
 - small spec tweaks to follow conventions



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:54:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:54:55 -0400
Subject: rpms/cairo/devel cairo.spec,1.57,1.58
Message-ID: <200608101554.k7AFst4Z013710@cvs.devel.redhat.com>

Author: besfahbo

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

Modified Files:
	cairo.spec 
Log Message:
Bump release number.



Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- cairo.spec	10 Aug 2006 15:53:55 -0000	1.57
+++ cairo.spec	10 Aug 2006 15:54:53 -0000	1.58
@@ -4,7 +4,7 @@
 Summary:   A vector graphics library
 Name:      cairo
 Version:   1.2.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://cairographics.org
 Source0:   http://cairographics.org/releases/%{name}-%{version}.tar.gz
 License:   LGPL/MPL



From fedora-cvs-commits at redhat.com  Thu Aug 10 15:58:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 11:58:36 -0400
Subject: rpms/kdesdk/devel .cvsignore, 1.31, 1.32 kdesdk.spec, 1.58,
	1.59 sources, 1.32, 1.33 kdesdk-3.5.3-to-3.5.4.patch, 1.1, NONE
Message-ID: <200608101558.k7AFwaGm015151@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdesdk.spec sources 
Removed Files:
	kdesdk-3.5.3-to-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	2 Jun 2006 19:15:00 -0000	1.31
+++ .cvsignore	10 Aug 2006 15:58:34 -0000	1.32
@@ -10,3 +10,4 @@
 kdesdk-3.5.0.tar.bz2
 kdesdk-3.5.1.tar.bz2
 kdesdk-3.5.3.tar.bz2
+kdesdk-3.5.4.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdesdk.spec	24 Jul 2006 16:39:12 -0000	1.58
+++ kdesdk.spec	10 Aug 2006 15:58:34 -0000	1.59
@@ -13,14 +13,13 @@
 
 Name: kdesdk
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
-Patch0: kdesdk-3.5.3-to-3.5.4.patch
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
 Patch2: kdesdk-3.4.0-db4.patch
 Patch3: kdesdk-3.4.92-misc.patch
@@ -53,8 +52,7 @@
 to develop or compile KDE sdk applications.
 
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0 -b .kde3.5.4
+%setup -q
 %patch1 -p1 -b .libtool
 %patch2 -p1 -b .db4
 %patch3 -p1 -b .misc
@@ -123,16 +121,16 @@
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -158,6 +156,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 3.5.4-1
+- rebuild
+
 * Mon Jul 24 2006 Petr Rockai <prockai at redhat.com> - 3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	2 Jun 2006 19:15:00 -0000	1.32
+++ sources	10 Aug 2006 15:58:34 -0000	1.33
@@ -1 +1 @@
-75450d8905a2cc612df00927c7f81af9  kdesdk-3.5.3.tar.bz2
+2150e6a4ce5e42886a4afc6c0198c30c  kdesdk-3.5.4.tar.bz2


--- kdesdk-3.5.3-to-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 16:06:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 12:06:13 -0400
Subject: rpms/kdeutils/devel .cvsignore, 1.33, 1.34 kdeutils.spec, 1.60,
	1.61 sources, 1.34, 1.35 kdeutils-3.5.3-to-3.5.4.patch, 1.1, NONE
Message-ID: <200608101606.k7AG6D6P017135@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeutils.spec sources 
Removed Files:
	kdeutils-3.5.3-to-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	5 Jun 2006 15:03:46 -0000	1.33
+++ .cvsignore	10 Aug 2006 16:06:11 -0000	1.34
@@ -10,3 +10,4 @@
 kdeutils-3.5.0.tar.bz2
 kdeutils-3.5.1.tar.bz2
 kdeutils-3.5.3.tar.bz2
+kdeutils-3.5.4.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kdeutils.spec	24 Jul 2006 17:47:36 -0000	1.60
+++ kdeutils.spec	10 Aug 2006 16:06:11 -0000	1.61
@@ -10,27 +10,26 @@
 
 %define appdir %{_datadir}/applications/kde
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Name: kdeutils
-Prefix: /usr
 Summary: K Desktop Environment - Utilities
 Epoch: 6
 License: GPL
 Group: Applications/System
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
-Patch0: kdeutils-3.5.3-to-3.5.4.patch
 Patch1: kdf-3.0.2-label.patch
 Patch2: kde-libtool.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 BuildRequires: kdebase-devel
 BuildRequires: automake
@@ -79,197 +78,23 @@
 Development files for kdeutils. Install kdeutils-devel if you wish
 to develop or compile KDE utils applications.
 
-%package -n ark
-Summary: GUI frontend for handling archive files
-Group: Applications/Archiving
-Requires: zip unzip tar
-Obsoletes: kdeutils
-
-%description -n ark
-Ark is a KDE tool for handling archive files.
-It supports the following file formats:
-  zip
-  plain tar and tar with compressors lzop, gzip, bzip2, bzip, compress
-  lha
-  zoo
-  single files compressed with compressors lzop, gzip, bzip2, bzip, compress
-  rar
-  ar
-
-%package -n kcalc
-Summary: KDE pocket calculator
-Group: Applications/Engineering
-Obsoletes: kdeutils
-
-%description -n kcalc
-A KDE pocket calculator.
-
-%package -n kcharselect
-Summary: Character Selector
-Group: User Interface/Desktops
-Requires: kdebase >= %{version}
-Obsoletes: kdeutils
-
-%description -n kcharselect
-KDE Character Selector - allows you to enter characters not found on your
-keyboard.
-
-%package -n kdepasswd
-Summary: KDE frontend to changing your password
-Group: User Interface/Desktops
-Obsoletes: kdeutils
-
-%description -n kdepasswd
-KDE frontend to changing your password and other user data.
-
-%package -n kdessh
-Summary: KDE frontend to ssh
-Group: Applications/Internet
-Requires: openssh-clients
-Obsoletes: kdeutils
-
-%description -n kdessh
-KDE frontend to ssh (Secure Shell, an application to remotely control a
-different Linux or Linux-like system securely).
-
-%package -n kdf
-Summary: Application and KDE applet to monitor available diskspace
-Group: Applications/System
-Requires: kdebase >= %{version}
-Obsoletes: kdeutils
-
-%description -n kdf
-kdeutils-kdf contains the kdf, kwikdisk and kcmdf tools for monitoring
-available diskspace.
-
-%package -n kedit
-Summary: An easy to use text editor
-Group: Applications/Editors
-Requires: kdelibs >= %{version}
-Obsoletes: kdeutils
-
-%description -n kedit
-An easy to use text editor
-
-%package -n kfloppy
-Summary: Floppy disk formatter
-Group: Applications/System
-Requires: kdelibs >= %{version}
-Obsoletes: kdeutils
-
-%description -n kfloppy
-KFloppy formats floppy disks and creates ext2 or DOS filesystems on them.
-
-%package -n khexedit
-Summary: Hex editor
-Group: Applications/Editors
-Requires: kdelibs >= %{version}
-Obsoletes: kdeutils
-
-%description -n khexedit
-A KDE hex editor. It allows you to edit binary files.
-
-%package -n kjots
-Summary: Virtual notepad
-Group: User Interface/Desktops
-Obsoletes: kdeutils
-
-%description -n kjots
-KJots is a virtual notepad - you can put notes on your desktop.
-
-%package laptop
-Summary: Laptop utilities for KDE
-Group: User Interface/Desktops
-Requires: kdebase >= %{version}
-Obsoletes: kdeutils
-
-%description laptop
-Various laptop-related utilities for KDE.
-kdeutils-laptop adds battery monitoring to kicker (the KDE panel) and allows
-you to manage power management and PCMCIA cards from the KDE control center.
-
-%package -n kljettool
-Summary: Configuration tool for LaserJet and similar printers
-Group: Applications/Publishing
-Obsoletes: kdeutils
-
-%description -n kljettool
-A KDE Configuration tool for HP LaserJet and compatible printers.
-
-%package -n klpq
-Summary: KDE tool for managing your print spooler
-Group: Applications/System
-Requires: /usr/bin/lpq
-Obsoletes: kdeutils
-
-%description -n klpq
-A KDE tool for managing your print spooler.
-
-%package -n klprfax
-Summary: Fax sending support for KDE
-Group: Applications/System
-Requires: /usr/bin/lpq
-Requires: kdebase >= %{version}
-Obsoletes: kdeutils
-
-%description -n klprfax
-Fax sending support for KDE.
-kdeutils-klprfax allows any KDE application to treat a fax modem just like
-a printer. Any KDE application that can print will be able to send faxes.
-
-%package -n kregexpeditor
-Summary: Regular Expressions Editor
-Group: Applications/System
-Requires: kdelibs >= %{version}
-Obsoletes: kdeutils
-
-%description -n kregexpeditor
-A Regular Expressions Editor.
-
-%package -n kregexpeditor-devel
-Summary: Development files for kregexpeditor
-Group: Development/Libraries
-Obsoletes: kdeutils
-
-%description -n kregexpeditor-devel
-Development files for kregexpeditor
-
-%package -n ktimer
-Summary: A timer (stop watch).
-Group: User Interface/Desktops
-Requires: kdelibs >= %{version}
-Obsoletes: kdeutils
-
-%description -n ktimer
-A timer (stop watch).
-
 %prep
-%setup -q -n %{name}-3.5.3
-%patch0 -p0 -b .kde3.5.4
+%setup -q
 %patch1 -p1 -b .label
-%patch2 -p1 -b .libtool
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-export KDEDIR=%{prefix}
-export CXXFLAGS="%{optflags}"
-export CFLAGS="%{optflags}"
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
    --disable-rpath \
    --with-qt-libraries=$QTDIR/lib \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -308,9 +133,21 @@
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
@@ -335,6 +172,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
+- rebuild
+
 * Mon Jul 24 2006 Petr Rockai <prockai at redhat.com> - 6:3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	5 Jun 2006 15:03:46 -0000	1.34
+++ sources	10 Aug 2006 16:06:11 -0000	1.35
@@ -1 +1 @@
-b3d792c21e9a72bf8a82c5756fcd742d  kdeutils-3.5.3.tar.bz2
+e24cd91576db3d2414fb30cab47e44e5  kdeutils-3.5.4.tar.bz2


--- kdeutils-3.5.3-to-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 16:21:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 12:21:15 -0400
Subject: rpms/kdewebdev/devel .cvsignore, 1.13, 1.14 kdewebdev.spec, 1.34,
	1.35 sources, 1.14, 1.15 kdewebdev-3.5.3-3.5.4.patch, 1.1, NONE
Message-ID: <200608101621.k7AGLFO6002866@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2828

Modified Files:
	.cvsignore kdewebdev.spec sources 
Removed Files:
	kdewebdev-3.5.3-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Jun 2006 16:34:55 -0000	1.13
+++ .cvsignore	10 Aug 2006 16:21:11 -0000	1.14
@@ -16,3 +16,4 @@
 kdewebdev-3.5.0.tar.bz2
 kdewebdev-3.5.1.tar.bz2
 kdewebdev-3.5.3.tar.bz2
+kdewebdev-3.5.4.tar.bz2


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kdewebdev.spec	24 Jul 2006 18:29:57 -0000	1.34
+++ kdewebdev.spec	10 Aug 2006 16:21:12 -0000	1.35
@@ -10,7 +10,7 @@
 %define kdebase_epoch 6
 
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -19,18 +19,19 @@
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: http://download.sourceforge.net/quanta/css.tar.bz2
 Source2: http://download.sourceforge.net/quanta/html.tar.bz2
 Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
 Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
 
-Patch0: kdewebdev-3.5.3-3.5.4.patch
 Patch1: javascript.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 BuildRequires: qt-devel >= %{qt_version}
 BuildRequires: kdesdk-devel >= %{kde_version}
@@ -60,8 +61,7 @@
 
 
 %prep
-%setup -q -n %{name}-3.5.3 -a 1 -a 2 -a 3 -a 4
-%patch0 -p0
+%setup -q -a 1 -a 2 -a 3 -a 4
 %patch1 -p0 -b .javascript
 
 %build
@@ -117,9 +117,21 @@
 done
 popd
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
 rm -rf %{buildroot}
@@ -145,6 +157,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
+- rebuild
+
 * Mon Jul 24 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	5 Jun 2006 16:34:55 -0000	1.14
+++ sources	10 Aug 2006 16:21:12 -0000	1.15
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-0eeaac8992c4b473caefcc32d49b79a2  kdewebdev-3.5.3.tar.bz2
+310a40555c089e88cc5ff7620a89b444  kdewebdev-3.5.4.tar.bz2


--- kdewebdev-3.5.3-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 16:26:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 12:26:19 -0400
Subject: rpms/kdevelop/devel .cvsignore, 1.29, 1.30 kdevelop.spec, 1.53,
	1.54 sources, 1.31, 1.32 kdevelop-3.5.3-3.5.4.patch, 1.1, NONE
Message-ID: <200608101626.k7AGQJhY004388@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4344

Modified Files:
	.cvsignore kdevelop.spec sources 
Removed Files:
	kdevelop-3.5.3-3.5.4.patch 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	5 Jun 2006 16:24:38 -0000	1.29
+++ .cvsignore	10 Aug 2006 16:26:16 -0000	1.30
@@ -12,3 +12,4 @@
 kdevelop-3.3.1.tar.bz2
 kdevelop-3.3.2.tar.bz2
 kdevelop-3.3.3.tar.bz2
+kdevelop-3.3.4.tar.bz2


Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdevelop.spec	24 Jul 2006 16:52:40 -0000	1.53
+++ kdevelop.spec	10 Aug 2006 16:26:16 -0000	1.54
@@ -11,23 +11,24 @@
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
 Version: 3.3.4
-Release: 0.pre1%{?dist}
+Release: 1%{?dist}
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.3.3.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
 
-Patch0: kdevelop-3.5.3-3.5.4.patch
 Patch1: c_cpp_reference-2.0.2-config.patch
 Patch2: kde-libtool.patch
 Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 Requires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
 Requires: make
 Requires: perl
@@ -36,6 +37,7 @@
 Requires: autoconf
 Requires: flex >= 2.5.4
 Requires: qt-designer >= %{qt_epoch}:%{qt_version}
+Requires: gettext
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -72,8 +74,7 @@
 
 %prep
 
-%setup -q -n %{name}-3.3.3 -a1
-%patch0 -p0
+%setup -q -a1
 %patch1 -p0 -b .config
 %patch3 -p1 -b .doc
 
@@ -160,6 +161,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 9:3.3.4-1
+- rebuild
+
 * Mon Jul 24 2006 Than Ngo <than at redhat.com> 9:3.3.4-0.pre1
 - prerelease of 3.3.4 (from the first-cut tag)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	5 Jun 2006 16:24:39 -0000	1.31
+++ sources	10 Aug 2006 16:26:16 -0000	1.32
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-89f3ad2b3e97e92bd9421f0d9ae8e427  kdevelop-3.3.3.tar.bz2
+e5278e37468bda7fdf6d019f84aeed16  kdevelop-3.3.4.tar.bz2


--- kdevelop-3.5.3-3.5.4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 16:47:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 12:47:54 -0400
Subject: rpms/util-linux/devel util-linux-selinux.pamd, 1.6,
	1.7 util-linux.spec, 1.136, 1.137
Message-ID: <200608101647.k7AGlsYU015944@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15802

Modified Files:
	util-linux-selinux.pamd util-linux.spec 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.13-0.38
- Change keycreate line to happen after pam_selinux open call so it gets correct context



Index: util-linux-selinux.pamd
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-selinux.pamd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- util-linux-selinux.pamd	17 Jul 2006 09:09:59 -0000	1.6
+++ util-linux-selinux.pamd	10 Aug 2006 16:47:51 -0000	1.7
@@ -6,9 +6,9 @@
 password   include      system-auth
 # pam_selinux.so close should be the first session rule
 session    required     pam_selinux.so close
-session    optional     pam_keyinit.so force revoke
 session    include      system-auth
 session    required     pam_loginuid.so
 session    optional     pam_console.so
-# pam_selinux.so open should be the last session rule
+# pam_selinux.so open should only be followed by sessions to be executed in the user context
 session    required     pam_selinux.so open
+session    optional     pam_keyinit.so force revoke


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- util-linux.spec	10 Aug 2006 10:20:54 -0000	1.136
+++ util-linux.spec	10 Aug 2006 16:47:52 -0000	1.137
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.37
+Release: 0.38
 License: distributable
 Group: System Environment/Base
 
@@ -719,6 +719,9 @@
 /sbin/losetup
 
 %changelog
+* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.13-0.38
+- Change keycreate line to happen after pam_selinux open call so it gets correct context
+
 * Thu Aug 10 2006 Karel Zak <kzak at redhat.com> 2.13-0.37
 - fix #176494 - last -i returns strange IP addresses (patch by Bill Nottingham)
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 16:49:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 12:49:51 -0400
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.50,1.51
Message-ID: <200608101649.k7AGnpAU022964@cvs.devel.redhat.com>

Author: vivekl

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

Modified Files:
	xalan-j2.spec 
Log Message:
- Resync with latest from JPP.
- Partially adopt new naming convention (.1 suffix).
- Use ln and rm explicitly instead of core-utils in Requires(x).




Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xalan-j2.spec	10 Aug 2006 10:30:12 -0000	1.50
+++ xalan-j2.spec	10 Aug 2006 16:49:48 -0000	1.51
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        4jpp_5fc
+Release:        5jpp.1
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -58,6 +58,8 @@
 Provides:       jaxp_transform_impl
 Requires:       jaxp_parser_impl
 Requires:	/usr/sbin/update-alternatives
+Requires(post):		/usr/sbin/update-alternatives
+Requires(preun):	/usr/sbin/update-alternatives
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:	java-devel
 BuildRequires:  ant
@@ -113,7 +115,9 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Requires(post):		coreutils
+Requires(post):		%{__rm}
+Requires(post):		/bin/ln
+Requires(postun):	%{__rm}
 
 %description    javadoc
 Javadoc for %{name}.
@@ -251,6 +255,11 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %post xsltc
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -326,6 +335,11 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-5jpp.1
+- Resync with latest from JPP.
+- Partially adopt new naming convention (.1 suffix).
+- Use ln and rm explicitly instead of core-utils in Requires(x).
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 2.7.0-4jpp_5fc
 - Requires(post):     coreutils
 
@@ -556,4 +570,3 @@
 * Wed Aug 08 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.2.D6-1mdk
 - first Mandrake release
 
-



From fedora-cvs-commits at redhat.com  Thu Aug 10 17:10:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 13:10:52 -0400
Subject: rpms/cups/devel cups-str1881.patch,1.1,1.2 cups.spec,1.242,1.243
Message-ID: <200608101710.k7AHAqrZ030958@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-str1881.patch cups.spec 
Log Message:
* Thu Aug 10 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-9
- Try different fix for STR #1795/STR #1881 (bug #201167).


cups-str1881.patch:
 job.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

Index: cups-str1881.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-str1881.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-str1881.patch	6 Aug 2006 11:04:17 -0000	1.1
+++ cups-str1881.patch	10 Aug 2006 17:10:47 -0000	1.2
@@ -1,6 +1,6 @@
---- cups-1.2.2/scheduler/job.c.str1881	2006-08-06 11:56:07.000000000 +0100
-+++ cups-1.2.2/scheduler/job.c	2006-08-06 11:56:29.000000000 +0100
-@@ -3018,7 +3018,8 @@
+--- cups-1.2.2/scheduler/job.c	2006-08-06 11:56:29.000000000 +0100
++++ cups-1.2.2/scheduler/job.c	2006-08-10 17:34:27.000000000 +0100
+@@ -3018,11 +3018,17 @@
    envp[envc ++] = device_uri;
    envp[envc ++] = printer_name;
  
@@ -8,5 +8,17 @@
 +  if (!remote_job &&
 +      (filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
    {
-     snprintf(final_content_type, sizeof(final_content_type),
-              "FINAL_CONTENT_TYPE=%s/%s",
+-    snprintf(final_content_type, sizeof(final_content_type),
+-             "FINAL_CONTENT_TYPE=%s/%s",
+-	     filter->src->super, filter->src->type);
++    if (!strcmp (filter->dst->super, "printer"))
++      snprintf(final_content_type, sizeof(final_content_type),
++	       "FINAL_CONTENT_TYPE=application/octet-stream");
++    else
++      snprintf(final_content_type, sizeof(final_content_type),
++	       "FINAL_CONTENT_TYPE=%s/%s",
++	       filter->dst->super, filter->dst->type);
++
+     envp[envc ++] = final_content_type;
+   }
+ 


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- cups.spec	6 Aug 2006 11:04:17 -0000	1.242
+++ cups.spec	10 Aug 2006 17:10:47 -0000	1.243
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 8
+Release: 9
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -417,6 +417,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 10 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-9
+- Try different fix for STR #1795/STR #1881 (bug #201167).
+
 * Sun Aug  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-8
 - Apply patch from STR #1881 for remote IPP printing (bug #201167).
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 17:47:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 13:47:29 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2543,
	1.2544 linux-2.6-gfs2-dlm.patch, 1.12,
	1.13 linux-2.6-gfs2-locking-exports.patch, 1.1, 1.2
Message-ID: <200608101747.k7AHlSUm028246@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-gfs2-dlm.patch 
	linux-2.6-gfs2-locking-exports.patch 
Log Message:
gfs2/dlm update


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2543
retrieving revision 1.2544
diff -u -r1.2543 -r1.2544
--- kernel-2.6.spec	10 Aug 2006 01:04:06 -0000	1.2543
+++ kernel-2.6.spec	10 Aug 2006 17:47:24 -0000	1.2544
@@ -1697,6 +1697,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Dave Jones <davej at redhat.com>
+- GFS2/DLM update.
+
 * Wed Aug  9 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace_regset nits breaking s390.
 

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   21 
 fs/dlm/Makefile                    |   19 
 fs/dlm/ast.c                       |  172 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 +++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  387 +++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  541 +++++
 fs/dlm/lock.c                      | 3846 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   61 
 fs/dlm/lockspace.c                 |  716 ++++++
 fs/dlm/lockspace.h                 |   25 
 fs/dlm/lowcomms.c                  | 1238 +++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   97 
 fs/dlm/member.c                    |  327 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  116 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  471 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  776 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  286 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/user.c                      |  785 +++++++
 fs/dlm/user.h                      |   16 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1236 +++++++++++
 fs/gfs2/bmap.h                     |   27 
 fs/gfs2/daemon.c                   |  196 +
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1976 +++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++
 fs/gfs2/eattr.h                    |   97 
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2279 +++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  564 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  659 ++++++
 fs/gfs2/inode.c                    | 1344 ++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  290 ++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  302 ++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 +++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 +++++++
 fs/gfs2/lops.h                     |   96 
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  780 +++++++
 fs/gfs2/meta_io.h                  |   74 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  308 ++
 fs/gfs2/ops_address.c              |  797 +++++++
 fs/gfs2/ops_address.h              |   18 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  293 ++
 fs/gfs2/ops_export.h               |   19 
 fs/gfs2/ops_file.c                 |  812 +++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  836 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1165 +++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  471 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  188 +
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/quota.c                    | 1286 ++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  572 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1528 ++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  979 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 +++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/Kbuild               |   33 
 include/linux/dlm.h                |  302 ++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  443 ++++
 include/linux/iflags.h             |  102 
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   41 
 mm/filemap.c                       |    3 
 mm/readahead.c                     |    1 
 131 files changed, 40676 insertions(+), 21 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-gfs2-dlm.patch	2 Aug 2006 16:44:24 -0000	1.12
+++ linux-2.6-gfs2-dlm.patch	10 Aug 2006 17:47:25 -0000	1.13
@@ -67,10 +67,10 @@
 +  mount.gfs2	to help mount(8) mount a filesystem
 +  mkfs.gfs2	to make a filesystem
 diff --git a/MAINTAINERS b/MAINTAINERS
-index b2afc7a..e42e143 100644
+index e3e1515..a050d7c 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -862,6 +862,16 @@ M:	jack at suse.cz
+@@ -875,6 +875,16 @@ M:	jack at suse.cz
  L:	linux-kernel at vger.kernel.org
  S:	Maintained
  
@@ -87,7 +87,7 @@
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  P:	Tobias Ringstrom
  M:	tori at unhappy.mine.nu
-@@ -1112,6 +1122,14 @@ M:	khc at pm.waw.pl
+@@ -1129,6 +1139,14 @@ M:	khc at pm.waw.pl
  W:	http://www.kernel.org/pub/linux/utils/net/hdlc/
  S:	Maintained
  
@@ -1256,10 +1256,10 @@
 +
 diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
 new file mode 100644
-index 0000000..8f471d9
+index 0000000..9c3aedd
 --- /dev/null
 +++ b/fs/dlm/debug_fs.c
-@@ -0,0 +1,384 @@
+@@ -0,0 +1,387 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -1572,16 +1572,19 @@
 +{
 +	struct dlm_ls *ls = file->private_data;
 +	struct dlm_lkb *lkb;
-+	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, rv;
++	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, ret, rv;
 +
 +	mutex_lock(&debug_buf_lock);
 +	mutex_lock(&ls->ls_waiters_mutex);
 +	memset(debug_buf, 0, sizeof(debug_buf));
 +
 +	list_for_each_entry(lkb, &ls->ls_waiters, lkb_wait_reply) {
-+		pos += snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",
-+				lkb->lkb_id, lkb->lkb_wait_type,
-+				lkb->lkb_nodeid, lkb->lkb_resource->res_name);
++		ret = snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",
++			       lkb->lkb_id, lkb->lkb_wait_type,
++			       lkb->lkb_nodeid, lkb->lkb_resource->res_name);
++		if (ret >= len - pos)
++			break;
++		pos += ret;
 +	}
 +	mutex_unlock(&ls->ls_waiters_mutex);
 +
@@ -2111,10 +2114,10 @@
 +
 diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
 new file mode 100644
-index 0000000..7c3c2d2
+index 0000000..da75099
 --- /dev/null
 +++ b/fs/dlm/dlm_internal.h
-@@ -0,0 +1,539 @@
+@@ -0,0 +1,541 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -2584,6 +2587,8 @@
 +	struct list_head	ls_requestqueue;/* queue remote requests */
 +	struct mutex		ls_requestqueue_mutex;
 +	char			*ls_recover_buf;
++	int			ls_recover_nodeid; /* for debugging */
++	uint64_t		ls_rcom_seq;
 +	struct list_head	ls_recover_list;
 +	spinlock_t		ls_recover_list_lock;
 +	int			ls_recover_list_count;
@@ -2656,10 +2661,10 @@
 +
 diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
 new file mode 100644
-index 0000000..7d38f91
+index 0000000..bb2e351
 --- /dev/null
 +++ b/fs/dlm/lock.c
-@@ -0,0 +1,3845 @@
+@@ -0,0 +1,3846 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -6361,6 +6366,7 @@
 +	if (lvb_in && ua->lksb.sb_lvbptr)
 +		memcpy(ua->lksb.sb_lvbptr, lvb_in, DLM_USER_LVB_LEN);
 +	ua->castparam = ua_tmp->castparam;
++	ua->user_lksb = ua_tmp->user_lksb;
 +
 +	error = set_unlock_args(flags, ua, &args);
 +	if (error)
@@ -6574,10 +6580,10 @@
 +
 diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
 new file mode 100644
-index 0000000..31ed0fe
+index 0000000..7adaad5
 --- /dev/null
 +++ b/fs/dlm/lockspace.c
-@@ -0,0 +1,705 @@
+@@ -0,0 +1,716 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -6661,6 +6667,11 @@
 +	return sprintf(buf, "%x\n", status);
 +}
 +
++static ssize_t dlm_recover_nodeid_show(struct dlm_ls *ls, char *buf)
++{
++	return sprintf(buf, "%d\n", ls->ls_recover_nodeid);
++}
++
 +struct dlm_attr {
 +	struct attribute attr;
 +	ssize_t (*show)(struct dlm_ls *, char *);
@@ -6688,11 +6699,17 @@
 +	.show  = dlm_recover_status_show
 +};
 +
++static struct dlm_attr dlm_attr_recover_nodeid = {
++	.attr  = {.name = "recover_nodeid", .mode = S_IRUGO},
++	.show  = dlm_recover_nodeid_show
++};
++
 +static struct attribute *dlm_attrs[] = {
 +	&dlm_attr_control.attr,
 +	&dlm_attr_event.attr,
 +	&dlm_attr_id.attr,
 +	&dlm_attr_recover_status.attr,
++	&dlm_attr_recover_nodeid.attr,
 +	NULL,
 +};
 +
@@ -8719,10 +8736,10 @@
 +
 diff --git a/fs/dlm/member.c b/fs/dlm/member.c
 new file mode 100644
-index 0000000..cd0c51e
+index 0000000..a3f7de7
 --- /dev/null
 +++ b/fs/dlm/member.c
-@@ -0,0 +1,312 @@
+@@ -0,0 +1,327 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -8887,11 +8904,23 @@
 +
 +/* send a status request to all members just to establish comms connections */
 +
-+static void ping_members(struct dlm_ls *ls)
++static int ping_members(struct dlm_ls *ls)
 +{
 +	struct dlm_member *memb;
-+	list_for_each_entry(memb, &ls->ls_nodes, list)
-+		dlm_rcom_status(ls, memb->nodeid);
++	int error = 0;
++
++	list_for_each_entry(memb, &ls->ls_nodes, list) {
++		error = dlm_recovery_stopped(ls);
++		if (error)
++			break;
++		error = dlm_rcom_status(ls, memb->nodeid);
++		if (error)
++			break;
++	}
++	if (error)
++		log_debug(ls, "ping_members aborted %d last nodeid %d",
++			  error, ls->ls_recover_nodeid);
++	return error;
 +}
 +
 +int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv, int *neg_out)
@@ -8937,10 +8966,13 @@
 +	dlm_set_recover_status(ls, DLM_RS_NODES);
 +	*neg_out = neg;
 +
-+	ping_members(ls);
++	error = ping_members(ls);
++	if (error)
++		goto out;
 +
 +	error = dlm_recover_members_wait(ls);
-+	log_debug(ls, "total members %d", ls->ls_num_nodes);
++ out:
++	log_debug(ls, "total members %d error %d", ls->ls_num_nodes, error);
 +	return error;
 +}
 +
@@ -9067,10 +9099,10 @@
 +
 diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
 new file mode 100644
-index 0000000..48dfc27
+index 0000000..989b608
 --- /dev/null
 +++ b/fs/dlm/memory.c
-@@ -0,0 +1,115 @@
+@@ -0,0 +1,116 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -9173,7 +9205,8 @@
 +{
 +	struct dlm_direntry *de;
 +
-+	DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,);
++	DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,
++		   printk("namelen = %d\n", namelen););
 +
 +	de = kmalloc(sizeof(*de) + namelen, GFP_KERNEL);
 +	if (de)
@@ -9396,10 +9429,10 @@
 +
 diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
 new file mode 100644
-index 0000000..55fbe31
+index 0000000..64ba492
 --- /dev/null
 +++ b/fs/dlm/rcom.c
-@@ -0,0 +1,457 @@
+@@ -0,0 +1,471 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -9499,6 +9532,7 @@
 +	int error = 0;
 +
 +	memset(ls->ls_recover_buf, 0, dlm_config.buffer_size);
++	ls->ls_recover_nodeid = nodeid;
 +
 +	if (nodeid == dlm_our_nodeid()) {
 +		rc = (struct dlm_rcom *) ls->ls_recover_buf;
@@ -9509,6 +9543,7 @@
 +	error = create_rcom(ls, nodeid, DLM_RCOM_STATUS, 0, &rc, &mh);
 +	if (error)
 +		goto out;
++	rc->rc_id = ++ls->ls_rcom_seq;
 +
 +	send_rcom(ls, mh, rc);
 +
@@ -9541,19 +9576,30 @@
 +			    sizeof(struct rcom_config), &rc, &mh);
 +	if (error)
 +		return;
++	rc->rc_id = rc_in->rc_id;
 +	rc->rc_result = dlm_recover_status(ls);
 +	make_config(ls, (struct rcom_config *) rc->rc_buf);
 +
 +	send_rcom(ls, mh, rc);
 +}
 +
-+static void receive_rcom_status_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
++static void receive_sync_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
 +{
++	if (rc_in->rc_id != ls->ls_rcom_seq) {
++		log_debug(ls, "reject old reply %d got %llx wanted %llx",
++			  rc_in->rc_type, rc_in->rc_id, ls->ls_rcom_seq);
++		return;
++	}
 +	memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length);
 +	set_bit(LSFL_RCOM_READY, &ls->ls_flags);
 +	wake_up(&ls->ls_wait_general);
 +}
 +
++static void receive_rcom_status_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
++{
++	receive_sync_reply(ls, rc_in);
++}
++
 +int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len)
 +{
 +	struct dlm_rcom *rc;
@@ -9561,6 +9607,7 @@
 +	int error = 0, len = sizeof(struct dlm_rcom);
 +
 +	memset(ls->ls_recover_buf, 0, dlm_config.buffer_size);
++	ls->ls_recover_nodeid = nodeid;
 +
 +	if (nodeid == dlm_our_nodeid()) {
 +		dlm_copy_master_names(ls, last_name, last_len,
@@ -9573,6 +9620,7 @@
 +	if (error)
 +		goto out;
 +	memcpy(rc->rc_buf, last_name, last_len);
++	rc->rc_id = ++ls->ls_rcom_seq;
 +
 +	send_rcom(ls, mh, rc);
 +
@@ -9609,6 +9657,7 @@
 +	error = create_rcom(ls, nodeid, DLM_RCOM_NAMES_REPLY, outlen, &rc, &mh);
 +	if (error)
 +		return;
++	rc->rc_id = rc_in->rc_id;
 +
 +	dlm_copy_master_names(ls, rc_in->rc_buf, inlen, rc->rc_buf, outlen,
 +			      nodeid);
@@ -9617,9 +9666,7 @@
 +
 +static void receive_rcom_names_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
 +{
-+	memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length);
-+	set_bit(LSFL_RCOM_READY, &ls->ls_flags);
-+	wake_up(&ls->ls_wait_general);
++	receive_sync_reply(ls, rc_in);
 +}
 +
 +int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid)
@@ -10711,10 +10758,10 @@
 +
 diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
 new file mode 100644
-index 0000000..7010353
+index 0000000..eac8e9f
 --- /dev/null
 +++ b/fs/dlm/recoverd.c
-@@ -0,0 +1,285 @@
+@@ -0,0 +1,286 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -10992,6 +11039,7 @@
 +
 +void dlm_recoverd_suspend(struct dlm_ls *ls)
 +{
++	wake_up(&ls->ls_wait_general);
 +	mutex_lock(&ls->ls_recoverd_active);
 +}
 +
@@ -21283,10 +21331,10 @@
 +#endif /* __GLOPS_DOT_H__ */
 diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
 new file mode 100644
-index 0000000..90e0624
+index 0000000..e98c14f
 --- /dev/null
 +++ b/fs/gfs2/incore.h
-@@ -0,0 +1,658 @@
+@@ -0,0 +1,659 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -21568,6 +21616,7 @@
 +
 +enum {
 +	GFF_DID_DIRECT_ALLOC	= 0,
++	GFF_EXLOCK = 1,
 +};
 +
 +struct gfs2_file {
@@ -23656,10 +23705,10 @@
 +#endif /* __LM_DOT_H__ */
 diff --git a/fs/gfs2/lm_interface.h b/fs/gfs2/lm_interface.h
 new file mode 100644
-index 0000000..9d34bf3
+index 0000000..1da95a5
 --- /dev/null
 +++ b/fs/gfs2/lm_interface.h
-@@ -0,0 +1,295 @@
+@@ -0,0 +1,290 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -23927,16 +23976,11 @@
 +/*
 + * Lock module bottom interface.  A lock module makes itself available to GFS
 + * with these functions.
-+ *
-+ * For the time being, we copy the gfs1 lock module bottom interface so the
-+ * same lock modules can be used with both gfs1 and gfs2 (it won't be possible
-+ * to load both gfs1 and gfs2 at once.)  Eventually the lock modules will fork
-+ * for gfs1/gfs2 and this API can change to the gfs2_ prefix.
 + */
 +
-+int gfs_register_lockproto(struct lm_lockops *proto);
++int gfs2_register_lockproto(struct lm_lockops *proto);
 +
-+void gfs_unregister_lockproto(struct lm_lockops *proto);
++void gfs2_unregister_lockproto(struct lm_lockops *proto);
 +
 +/*
 + * Lock module top interface.  GFS calls these functions when mounting or
@@ -23957,7 +24001,7 @@
 +
 diff --git a/fs/gfs2/locking.c b/fs/gfs2/locking.c
 new file mode 100644
-index 0000000..1831928
+index 0000000..ded1ef6
 --- /dev/null
 +++ b/fs/gfs2/locking.c
 @@ -0,0 +1,191 @@
@@ -23994,13 +24038,13 @@
 +static struct mutex lmh_lock;
 +
 +/**
-+ * gfs_register_lockproto - Register a low-level locking protocol
++ * gfs2_register_lockproto - Register a low-level locking protocol
 + * @proto: the protocol definition
 + *
 + * Returns: 0 on success, -EXXX on failure
 + */
 +
-+int gfs_register_lockproto(struct lm_lockops *proto)
++int gfs2_register_lockproto(struct lm_lockops *proto)
 +{
 +	struct lmh_wrapper *lw;
 +
@@ -24030,12 +24074,12 @@
 +}
 +
 +/**
-+ * gfs_unregister_lockproto - Unregister a low-level locking protocol
++ * gfs2_unregister_lockproto - Unregister a low-level locking protocol
 + * @proto: the protocol definition
 + *
 + */
 +
-+void gfs_unregister_lockproto(struct lm_lockops *proto)
++void gfs2_unregister_lockproto(struct lm_lockops *proto)
 +{
 +	struct lmh_wrapper *lw;
 +
@@ -24080,7 +24124,7 @@
 +	int try = 0;
 +	int error, found;
 +
-+ retry:
++retry:
 +	mutex_lock(&lmh_lock);
 +
 +	found = 0;
@@ -24114,7 +24158,7 @@
 +				     min_lvb_size, flags, lockstruct, fskobj);
 +	if (error)
 +		module_put(lw->lw_ops->lm_owner);
-+ out:
++out:
 +	mutex_unlock(&lmh_lock);
 +	return error;
 +}
@@ -24149,8 +24193,8 @@
 +	INIT_LIST_HEAD(&lmh_list);
 +}
 +
-+EXPORT_SYMBOL_GPL(gfs_register_lockproto);
-+EXPORT_SYMBOL_GPL(gfs_unregister_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_register_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_unregister_lockproto);
 +
 diff --git a/fs/gfs2/locking/dlm/Makefile b/fs/gfs2/locking/dlm/Makefile
 new file mode 100644
@@ -24904,7 +24948,7 @@
 +
 diff --git a/fs/gfs2/locking/dlm/main.c b/fs/gfs2/locking/dlm/main.c
 new file mode 100644
-index 0000000..89728c9
+index 0000000..870a1cd
 --- /dev/null
 +++ b/fs/gfs2/locking/dlm/main.c
 @@ -0,0 +1,64 @@
@@ -24930,7 +24974,7 @@
 +{
 +	int error;
 +
-+	error = gfs_register_lockproto(&gdlm_ops);
++	error = gfs2_register_lockproto(&gdlm_ops);
 +	if (error) {
 +		printk(KERN_WARNING "lock_dlm:  can't register protocol: %d\n",
 +		       error);
@@ -24939,14 +24983,14 @@
 +
 +	error = gdlm_sysfs_init();
 +	if (error) {
-+		gfs_unregister_lockproto(&gdlm_ops);
++		gfs2_unregister_lockproto(&gdlm_ops);
 +		return error;
 +	}
 +
 +	error = gdlm_plock_init();
 +	if (error) {
 +		gdlm_sysfs_exit();
-+		gfs_unregister_lockproto(&gdlm_ops);
++		gfs2_unregister_lockproto(&gdlm_ops);
 +		return error;
 +	}
 +
@@ -24962,7 +25006,7 @@
 +{
 +	gdlm_plock_exit();
 +	gdlm_sysfs_exit();
-+	gfs_unregister_lockproto(&gdlm_ops);
++	gfs2_unregister_lockproto(&gdlm_ops);
 +}
 +
 +module_init(init_lock_dlm);
@@ -25236,10 +25280,10 @@
 +
 diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
 new file mode 100644
-index 0000000..e5b11f0
+index 0000000..1acb251
 --- /dev/null
 +++ b/fs/gfs2/locking/dlm/plock.c
-@@ -0,0 +1,301 @@
+@@ -0,0 +1,302 @@
 +/*
 + * Copyright (C) 2005 Red Hat, Inc.  All rights reserved.
 + *
@@ -25474,7 +25518,8 @@
 +	spin_lock(&ops_lock);
 +	list_for_each_entry(op, &recv_list, list) {
 +		if (op->info.fsid == info.fsid &&
-+		    op->info.number == info.number) {
++		    op->info.number == info.number &&
++		    op->info.owner == info.owner) {
 +			list_del_init(&op->list);
 +			found = 1;
 +			op->done = 1;
@@ -26148,7 +26193,7 @@
 +
 diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c
 new file mode 100644
-index 0000000..97ffac5
+index 0000000..748aa5d
 --- /dev/null
 +++ b/fs/gfs2/locking/nolock/main.c
 @@ -0,0 +1,259 @@
@@ -26387,7 +26432,7 @@
 +{
 +	int error;
 +
-+	error = gfs_register_lockproto(&nolock_ops);
++	error = gfs2_register_lockproto(&nolock_ops);
 +	if (error) {
 +		printk(KERN_WARNING
 +		       "lock_nolock: can't register protocol: %d\n", error);
@@ -26401,7 +26446,7 @@
 +
 +static void __exit exit_nolock(void)
 +{
-+	gfs_unregister_lockproto(&nolock_ops);
++	gfs2_unregister_lockproto(&nolock_ops);
 +}
 +
 +module_init(init_nolock);
@@ -26413,7 +26458,7 @@
 +
 diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
 new file mode 100644
-index 0000000..60fdc94
+index 0000000..a591fb8
 --- /dev/null
 +++ b/fs/gfs2/log.c
 @@ -0,0 +1,601 @@
@@ -26675,8 +26720,8 @@
 +	if (list_empty(&sdp->sd_ail1_list))
 +		tail = sdp->sd_log_head;
 +	else {
-+		ai = list_entry(sdp->sd_ail1_list.prev,
-+				struct gfs2_ail, ai_list);
++		ai = list_entry(sdp->sd_ail1_list.prev, struct gfs2_ail,
++				ai_list);
 +		tail = ai->ai_first;
 +	}
 +
@@ -29625,10 +29670,10 @@
 +
 diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
 new file mode 100644
-index 0000000..fca69f1
+index 0000000..45afd05
 --- /dev/null
 +++ b/fs/gfs2/ops_address.c
-@@ -0,0 +1,778 @@
+@@ -0,0 +1,797 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -29762,8 +29807,8 @@
 +static int gfs2_writepage(struct page *page, struct writeback_control *wbc)
 +{
 +	struct inode *inode = page->mapping->host;
-+	struct gfs2_inode *ip = GFS2_I(page->mapping->host);
-+	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
++	struct gfs2_inode *ip = GFS2_I(inode);
++	struct gfs2_sbd *sdp = GFS2_SB(inode);
 +	loff_t i_size = i_size_read(inode);
 +	pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;
 +	unsigned offset;
@@ -29789,6 +29834,10 @@
 +		error = gfs2_trans_begin(sdp, RES_DINODE + 1, 0);
 +		if (error)
 +			goto out_ignore;
++		if (!page_has_buffers(page)) {
++			create_empty_buffers(page, inode->i_sb->s_blocksize,
++					     (1 << BH_Dirty)|(1 << BH_Uptodate));
++		}
 +		gfs2_page_add_databufs(ip, page, 0, sdp->sd_vfs->s_blocksize-1);
 +		done_trans = 1;
 +	}
@@ -29868,14 +29917,22 @@
 +	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
 +	struct gfs2_holder gh;
 +	int error;
++	int do_unlock = 0;
 +
 +	if (likely(file != &gfs2_internal_file_sentinal)) {
++		if (file) {
++			struct gfs2_file *gf = file->private_data;
++			if (test_bit(GFF_EXLOCK, &gf->f_flags))
++				goto skip_lock;
++		}
 +		gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|GL_AOP, &gh);
++		do_unlock = 1;
 +		error = gfs2_glock_nq_m_atime(1, &gh);
 +		if (unlikely(error))
 +			goto out_unlock;
 +	}
 +
++skip_lock:
 +	if (gfs2_is_stuffed(ip)) {
 +		error = stuffed_readpage(ip, page);
 +		unlock_page(page);
@@ -29893,7 +29950,7 @@
 +	return error;
 +out_unlock:
 +	unlock_page(page);
-+	if (file != &gfs2_internal_file_sentinal)
++	if (do_unlock)
 +		gfs2_holder_uninit(&gh);
 +	goto out;
 +}
@@ -29922,17 +29979,24 @@
 +	struct gfs2_holder gh;
 +	unsigned page_idx;
 +	int ret;
++	int do_unlock = 0;
 +
 +	if (likely(file != &gfs2_internal_file_sentinal)) {
++		if (file) {
++			struct gfs2_file *gf = file->private_data;
++			if (test_bit(GFF_EXLOCK, &gf->f_flags))
++				goto skip_lock;
++		}
 +		gfs2_holder_init(ip->i_gl, LM_ST_SHARED,
 +				 LM_FLAG_TRY_1CB|GL_ATIME|GL_AOP, &gh);
++		do_unlock = 1;
 +		ret = gfs2_glock_nq_m_atime(1, &gh);
 +		if (ret == GLR_TRYFAILED) 
 +			goto out_noerror;
 +		if (unlikely(ret))
 +			goto out_unlock;
 +	}
-+
++skip_lock:
 +	if (gfs2_is_stuffed(ip)) {
 +		struct pagevec lru_pvec;
 +		pagevec_init(&lru_pvec, 0);
@@ -29957,7 +30021,7 @@
 +		ret = mpage_readpages(mapping, pages, nr_pages, gfs2_get_block);
 +	}
 +
-+	if (likely(file != &gfs2_internal_file_sentinal)) {
++	if (do_unlock) {
 +		gfs2_glock_dq_m(1, &gh);
 +		gfs2_holder_uninit(&gh);
 +	}
@@ -29975,7 +30039,7 @@
 +		unlock_page(page);
 +		page_cache_release(page);
 +	}
-+	if (likely(file != &gfs2_internal_file_sentinal))
++	if (do_unlock)
 +		gfs2_holder_uninit(&gh);
 +	goto out;
 +}
@@ -34308,10 +34372,10 @@
 +#endif /* __OPS_SUPER_DOT_H__ */
 diff --git a/fs/gfs2/ops_vm.c b/fs/gfs2/ops_vm.c
 new file mode 100644
-index 0000000..aff6637
+index 0000000..875a769
 --- /dev/null
 +++ b/fs/gfs2/ops_vm.c
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,188 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -34360,13 +34424,7 @@
 +					unsigned long address, int *type)
 +{
 +	struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
-+	struct gfs2_holder i_gh;
 +	struct page *result;
-+	int error;
-+
-+	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, 0, &i_gh);
-+	if (error)
-+		return NULL;
 +
 +	set_bit(GIF_PAGED, &ip->i_flags);
 +
@@ -34375,8 +34433,6 @@
 +	if (result && result != NOPAGE_OOM)
 +		pfault_be_greedy(ip);
 +
-+	gfs2_glock_dq_uninit(&i_gh);
-+
 +	return result;
 +}
 +
@@ -34455,7 +34511,9 @@
 +static struct page *gfs2_sharewrite_nopage(struct vm_area_struct *area,
 +					   unsigned long address, int *type)
 +{
-+	struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
++	struct file *file = area->vm_file;
++	struct gfs2_file *gf = file->private_data;
++	struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);
 +	struct gfs2_holder i_gh;
 +	struct page *result = NULL;
 +	unsigned long index = ((address - area->vm_start) >> PAGE_CACHE_SHIFT) +
@@ -34470,13 +34528,14 @@
 +	set_bit(GIF_PAGED, &ip->i_flags);
 +	set_bit(GIF_SW_PAGED, &ip->i_flags);
 +
-+	error = gfs2_write_alloc_required(ip,
-+					  (uint64_t)index << PAGE_CACHE_SHIFT,
++	error = gfs2_write_alloc_required(ip, (u64)index << PAGE_CACHE_SHIFT,
 +					  PAGE_CACHE_SIZE, &alloc_required);
 +	if (error)
 +		goto out;
 +
++	set_bit(GFF_EXLOCK, &gf->f_flags);
 +	result = filemap_nopage(area, address, type);
++	clear_bit(GFF_EXLOCK, &gf->f_flags);
 +	if (!result || result == NOPAGE_OOM)
 +		goto out;
 +
@@ -34491,8 +34550,7 @@
 +	}
 +
 +	pfault_be_greedy(ip);
-+
-+ out:
++out:
 +	gfs2_glock_dq_uninit(&i_gh);
 +
 +	return result;
@@ -35860,10 +35918,10 @@
 +#endif /* __QUOTA_DOT_H__ */
 diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
 new file mode 100644
-index 0000000..7aabc03
+index 0000000..bbd44a4
 --- /dev/null
 +++ b/fs/gfs2/recovery.c
-@@ -0,0 +1,575 @@
+@@ -0,0 +1,572 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -36019,8 +36077,7 @@
 +
 +	if (lh.lh_header.mh_magic != GFS2_MAGIC ||
 +	    lh.lh_header.mh_type != GFS2_METATYPE_LH ||
-+	    lh.lh_blkno != blk ||
-+	    lh.lh_hash != hash)
++	    lh.lh_blkno != blk || lh.lh_hash != hash)
 +		return 1;
 +
 +	*head = lh;
@@ -36348,11 +36405,9 @@
 +
 +		/* Acquire a shared hold on the transaction lock */
 +
-+		error = gfs2_glock_nq_init(sdp->sd_trans_gl,
-+					   LM_ST_SHARED,
++		error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED,
 +					   LM_FLAG_NOEXP | LM_FLAG_PRIORITY |
-+					   GL_NOCANCEL | GL_NOCACHE,
-+					   &t_gh);
++					   GL_NOCANCEL | GL_NOCACHE, &t_gh);
 +		if (error)
 +			goto fail_gunlock_ji;
 +

linux-2.6-gfs2-locking-exports.patch:
 locking.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6-gfs2-locking-exports.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-locking-exports.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-gfs2-locking-exports.patch	21 Jul 2006 20:27:00 -0000	1.1
+++ linux-2.6-gfs2-locking-exports.patch	10 Aug 2006 17:47:25 -0000	1.2
@@ -1,12 +1,10 @@
-*** gfs2-2.6-18-rc2/fs/gfs2/locking.c	2006-07-20 10:44:33.000000000 -0500
---- gfs2-devel/fs/gfs2/locking.c	2006-07-20 12:27:53.000000000 -0500
-*************** void __init gfs2_init_lmh(void)
-*** 188,191 ****
---- 188,194 ----
-  
-  EXPORT_SYMBOL_GPL(gfs_register_lockproto);
-  EXPORT_SYMBOL_GPL(gfs_unregister_lockproto);
-+ EXPORT_SYMBOL_GPL(gfs2_withdraw_lockproto);
-+ EXPORT_SYMBOL_GPL(gfs2_mount_lockproto);
-+ EXPORT_SYMBOL_GPL(gfs2_unmount_lockproto);
-  
+--- linux-2.6.17.noarch/fs/gfs2/locking.c~	2006-08-10 13:33:09.000000000 -0400
++++ linux-2.6.17.noarch/fs/gfs2/locking.c	2006-08-10 13:33:23.000000000 -0400
+@@ -188,4 +188,6 @@ void __init gfs2_init_lmh(void)
+ 
+ EXPORT_SYMBOL_GPL(gfs2_register_lockproto);
+ EXPORT_SYMBOL_GPL(gfs2_unregister_lockproto);
+-
++EXPORT_SYMBOL_GPL(gfs2_withdraw_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_mount_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_unmount_lockproto);



From fedora-cvs-commits at redhat.com  Thu Aug 10 17:51:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 13:51:36 -0400
Subject: rpms/SysVinit/devel SysVinit.spec, 1.49, 1.50 sysvinit-selinux.patch,
	1.14, 1.15
Message-ID: <200608101751.k7AHpZ6w006273@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6101

Modified Files:
	SysVinit.spec sysvinit-selinux.patch 
Log Message:
At the stage where we fail to load policy, initlog's console is not
set up. Just printf, it should do more or less the right thing.
(#185603)



Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- SysVinit.spec	10 Aug 2006 00:02:36 -0000	1.49
+++ SysVinit.spec	10 Aug 2006 17:51:33 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 9
+Release: 10
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -139,7 +139,10 @@
 /dev/initctl
 
 %changelog
-* Wed Aug  9 2006 Bill Nottingham <notting at redhat.com> - 2.86-8
+* Thu Aug 10 2006 Bill Nottingham <notting at redhat.com> - 2.86-10
+- fix warning on SELinux policy load failure (#185603)
+
+* Wed Aug  9 2006 Bill Nottingham <notting at redhat.com> - 2.86-9
 - preserve 'WAITING' across re-exec (#143289, others)
 - actually apply quiet patch
 - don't write garbage to utmp on x86-64 (#176494)

sysvinit-selinux.patch:
 Makefile  |    4 ++--
 init.c    |   17 +++++++++++++++++
 sulogin.c |   15 +++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

Index: sysvinit-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/sysvinit-selinux.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sysvinit-selinux.patch	19 Dec 2005 21:37:58 -0000	1.14
+++ sysvinit-selinux.patch	10 Aug 2006 17:51:33 -0000	1.15
@@ -29,7 +29,7 @@
 +	    if (enforce > 0) {
 +	      /* SELinux in enforcing mode but load_policy failed */
 +	      /* At this point, we probably can't open /dev/console, so log() won't work */
-+		    initlog(L_VB,"Unable to load SELinux Policy. Machine is in enforcing mode. Halting now.");
++		    printf("Unable to load SELinux Policy. Machine is in enforcing mode. Halting now.\n");
 +	      exit(1);
 +	    }
 +	  }



From fedora-cvs-commits at redhat.com  Thu Aug 10 18:10:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 14:10:16 -0400
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.51,1.52
Message-ID: <200608101810.k7AIAGgh017797@cvs.devel.redhat.com>

Author: vivekl

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

Modified Files:
	xalan-j2.spec 
Log Message:
Rebuild.




Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xalan-j2.spec	10 Aug 2006 16:49:48 -0000	1.51
+++ xalan-j2.spec	10 Aug 2006 18:10:12 -0000	1.52
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        5jpp.1
+Release:        5jpp.2
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -57,7 +57,6 @@
 %endif
 Provides:       jaxp_transform_impl
 Requires:       jaxp_parser_impl
-Requires:	/usr/sbin/update-alternatives
 Requires(post):		/usr/sbin/update-alternatives
 Requires(preun):	/usr/sbin/update-alternatives
 BuildRequires:  jpackage-utils >= 0:1.6
@@ -335,6 +334,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-5jpp.2
+- Rebuild.
+
 * Thu Aug 10 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-5jpp.1
 - Resync with latest from JPP.
 - Partially adopt new naming convention (.1 suffix).



From fedora-cvs-commits at redhat.com  Thu Aug 10 18:25:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 14:25:13 -0400
Subject: rpms/rgmanager/devel .cvsignore, 1.7, 1.8 rgmanager.spec, 1.31,
	1.32 sources, 1.14, 1.15
Message-ID: <200608101825.k7AIPDT3000676@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv662

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
Updated Sources (automated).


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Jul 2006 21:08:29 -0000	1.7
+++ .cvsignore	10 Aug 2006 18:25:11 -0000	1.8
@@ -1,3 +1,4 @@
 rgmanager-2.0.0.tar.gz
 rgmanager-2.0.2.tar.gz
 rgmanager-2.0.3.tar.gz
+rgmanager-2.0.4.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rgmanager.spec	19 Jul 2006 21:08:34 -0000	1.31
+++ rgmanager.spec	10 Aug 2006 18:25:11 -0000	1.32
@@ -11,7 +11,7 @@
 ###############################################################################
 
 Name: rgmanager
-Version: 2.0.3
+Version: 2.0.4
 Release: 0
 License: GPL,LGPL
 Group: System Environment/Base


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Jul 2006 21:08:34 -0000	1.14
+++ sources	10 Aug 2006 18:25:11 -0000	1.15
@@ -1 +1 @@
-6001ba57c6fcfe5c37e89880823183cf  rgmanager-2.0.3.tar.gz
+d113d81316e1a9f347b9a333bc2e4b08  rgmanager-2.0.4.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 10 18:32:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 14:32:47 -0400
Subject: rpms/jakarta-taglibs-standard/devel jakarta-taglibs-standard.spec,
	1.20, 1.21
Message-ID: <200608101832.k7AIWlO0001037@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-taglibs-standard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1011

Modified Files:
	jakarta-taglibs-standard.spec 
Log Message:
- Merge with upstream version
- Add missing postun javadoc
- Add missing javadoc requires



Index: jakarta-taglibs-standard.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jakarta-taglibs-standard.spec	10 Aug 2006 10:42:19 -0000	1.20
+++ jakarta-taglibs-standard.spec	10 Aug 2006 18:32:43 -0000	1.21
@@ -40,7 +40,7 @@
 
 Name:           jakarta-taglibs-standard
 Version:        1.1.1
-Release:        6jpp_3fc
+Release:        7jpp.1
 Epoch:          0
 Summary:        An open-source implementation of the JSP Standard Tag Library
 License:        Apache Software License
@@ -78,7 +78,8 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Requires(post): coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -132,6 +133,10 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}
+fi
 
 %post
 %if %{gcj_support}
@@ -166,6 +171,11 @@
 
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:1.1.1-7jpp.1
+- Merge with upstream version
+ - Add missing javadoc postun
+ - Add missing javadoc requires
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.1.1-6jpp_3fc
 - Requires(post): coreutils
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 18:34:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 14:34:37 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.21,
	1.22
Message-ID: <200608101834.k7AIYbDN001131@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1112

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:

Added missing requirements.





Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jakarta-commons-dbcp.spec	10 Aug 2006 09:58:41 -0000	1.21
+++ jakarta-commons-dbcp.spec	10 Aug 2006 18:34:34 -0000	1.22
@@ -45,7 +45,7 @@
 
 Name:		jakarta-commons-dbcp
 Version:	1.2.1
-Release:	5jpp_4fc
+Release:	6jpp.1
 Epoch:		0
 Summary:	Jakarta Commons DataBase Pooling Package
 License:	Apache Software License 2.0
@@ -78,7 +78,8 @@
 BuildRequires:  saxon-scripts
 %endif
 
-Requires:  /usr/sbin/update-alternatives
+Requires(post):  /usr/sbin/update-alternatives
+Requires(preun):  /usr/sbin/update-alternatives
 Requires:	jakarta-commons-collections >= 2.0
 Requires:	jakarta-commons-pool >= 1.1
 %if ! %{gcj_support}
@@ -114,8 +115,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Requires(post):		coreutils
-Requires(postun):	coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -285,6 +286,9 @@
 %endif
 
 %changelog
+* Tue Aug 08 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-6jpp.1
+- Added missing requirements.
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.2.1-5jpp_4fc
 - Requires(post/postun): coreutils
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 18:35:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 14:35:29 -0400
Subject: rpms/cman/devel .cvsignore, 1.12, 1.13 cman.spec, 1.62, 1.63 sources,
	1.21, 1.22
Message-ID: <200608101835.k7AIZM1C001287@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1245

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
Updated to latest upstream sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	4 Aug 2006 16:55:58 -0000	1.12
+++ .cvsignore	10 Aug 2006 18:35:19 -0000	1.13
@@ -1 +1 @@
-cman-2.0.6.tar.gz
+cman-2.0.7.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- cman.spec	4 Aug 2006 16:55:58 -0000	1.62
+++ cman.spec	10 Aug 2006 18:35:19 -0000	1.63
@@ -10,7 +10,7 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.6
+%define cman_minor 0.7
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
@@ -114,6 +114,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Jul 06 2006 Chris Feist <cfeist at redhat.com> - 2.0.7-0
+- Rebuild w/ new upstream sources
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Aug 2006 16:55:58 -0000	1.21
+++ sources	10 Aug 2006 18:35:19 -0000	1.22
@@ -1 +1 @@
-15d92c47deae098b73623feab2fbecb2  cman-2.0.6.tar.gz
+f76bb410d080f265eaa3019d15324279  cman-2.0.7.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 10 18:36:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 14:36:29 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.22,
	1.23
Message-ID: <200608101836.k7AIaTHE001391@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1374

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:

Bumped date in changelog.




Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jakarta-commons-dbcp.spec	10 Aug 2006 18:34:34 -0000	1.22
+++ jakarta-commons-dbcp.spec	10 Aug 2006 18:36:27 -0000	1.23
@@ -286,7 +286,7 @@
 %endif
 
 %changelog
-* Tue Aug 08 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-6jpp.1
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-6jpp.1
 - Added missing requirements.
 
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.2.1-5jpp_4fc



From fedora-cvs-commits at redhat.com  Thu Aug 10 18:38:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 14:38:16 -0400
Subject: rpms/cman/devel cman.spec,1.63,1.64
Message-ID: <200608101838.k7AIcGBJ001525@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1512

Modified Files:
	cman.spec 
Log Message:
Fixed dist tag.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- cman.spec	10 Aug 2006 18:35:19 -0000	1.63
+++ cman.spec	10 Aug 2006 18:38:14 -0000	1.64
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.0
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -114,10 +114,10 @@
 %{_libdir}/*.a
 
 %changelog
-* Thu Jul 06 2006 Chris Feist <cfeist at redhat.com> - 2.0.7-0
+* Thu Aug 10 2006 Chris Feist <cfeist at redhat.com> - 2.0.7-0
 - Rebuild w/ new upstream sources
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com>
 - rebuild
 
 * Thu Jul 06 2006 Chris Feist <cfeist at redhat.com> - 2.0.1-0.fc6.0



From fedora-cvs-commits at redhat.com  Thu Aug 10 18:39:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 14:39:49 -0400
Subject: rpms/jakarta-commons-launcher/devel jakarta-commons-launcher.spec,
	1.14, 1.15
Message-ID: <200608101839.k7AIdnK6001638@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-launcher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1594

Modified Files:
	jakarta-commons-launcher.spec 
Log Message:
- Merge with upstream version
- Add missing javadoc postun
- Add missing javadoc requires



Index: jakarta-commons-launcher.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-launcher/devel/jakarta-commons-launcher.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jakarta-commons-launcher.spec	10 Aug 2006 10:32:08 -0000	1.14
+++ jakarta-commons-launcher.spec	10 Aug 2006 18:39:46 -0000	1.15
@@ -39,7 +39,7 @@
 
 Name:           %{name}
 Version:        0.9
-Release:        5jpp_3fc
+Release:        6jpp.1
 Epoch:          0
 Summary:        The Launcher Component is designed to be a cross platform Java application launcher.
 License:        Apache Software License
@@ -74,7 +74,8 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Requires(post):		coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -121,6 +122,10 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+   rm -f %{_javadocdir}/%{name}
+fi
 
 %post
 %if %{gcj_support}
@@ -154,6 +159,11 @@
 
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:0.9-6jpp.1
+- Merge with upstream version
+- Add missing javadoc postun
+- Add missing javadoc requires
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 0.9-5jpp_3fc
 - Requires(post):     coreutils
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 18:56:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 14:56:04 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.44,1.45
Message-ID: <200608101856.k7AIu3px030953@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	gnome-pilot.spec 
Log Message:
- Add patches for RH bug #189294.



Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-pilot.spec	12 Jul 2006 06:04:23 -0000	1.44
+++ gnome-pilot.spec	10 Aug 2006 18:56:00 -0000	1.45
@@ -1,76 +1,98 @@
-%define pilot_link_version 2:0.11.8
-Summary: GNOME pilot programs
+#%define pilot_link_version 2:0.11.8
+%define pilot_link_version 0.11.8
+
+### Abstract ###
+
 Name: gnome-pilot
 Version: 2.0.13
-Release: 13.1
+Release: 15
 License: LGPL
 Group: Applications/Communications
-Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
-Patch1: gnome-pilot-2.0.10-fix_64bit.patch
-Patch5: gnome-pilot-2.0.12-fix_icon.patch
-Patch7: gnome-pilot-2.0.12-move-conduits-code.patch
-Patch8: gnome-pilot-2.0.12-move-conduits-autotools.patch
-Patch9: gnome-pilot-2.0.12-defines.patch
+Summary: GNOME pilot programs
+Source: %{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+ExcludeArch: s390 s390x
+
+### Patches ###
+
+Patch10: gnome-pilot-2.0.10-fix_64bit.patch
+Patch11: gnome-pilot-2.0.12-fix_icon.patch
+Patch12: gnome-pilot-2.0.12-move-conduits-code.patch
+Patch13: gnome-pilot-2.0.12-move-conduits-autotools.patch
+Patch14: 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
+Patch15: gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch
+Patch16: gnome-pilot-2.0.13-include-pi-error.patch
+Patch17: 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
-Patch19: rh-161799-attach-116014-conduits_64bit.diff
+Patch18: gb-309077-attach-48373-fix-xml-properties-leak.patch
+Patch19: gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
+Patch20: rh-161799-attach-116014-conduits_64bit.diff
+
+# RH bug #189294 (2 patches)
+Patch21: gnome-pilot-2.0.13-sleep-after-sync.patch
+Patch22: gnome-pilot-2.0.13-slist-remove.patch
+
+### Dependencies ###
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pilot-link >= %{pilot_link_version}
-Prereq: scrollkeeper
 Prereq: GConf2
-BuildRequires: libgnome-devel >= 2.0.0
-BuildRequires: libgnomeui-devel >= 2.0.0
-BuildRequires: libglade2-devel >= 2.0.0
+Prereq: scrollkeeper
+Requires: pilot-link >= %{pilot_link_version}
+
+### Build Dependencies ###
+
+BuildRequires: GConf2-devel >= 2.0
 BuildRequires: ORBit2-devel >= 2.0.0
-BuildRequires: libbonobo-devel >= 2.0.0
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: bonobo-activation-devel >= 1.0.3
+BuildRequires: gettext
 BuildRequires: gnome-panel-devel >= 2.0.6
-BuildRequires: GConf2-devel >= 2.0
 BuildRequires: gob2 >= 2.0.3
+BuildRequires: libbonobo-devel >= 2.0.0
+BuildRequires: libglade2-devel >= 2.0.0
+BuildRequires: libgnome-devel >= 2.0.0
+BuildRequires: libgnomeui-devel >= 2.0.0
+BuildRequires: libtool
 BuildRequires: pilot-link-devel >= %{pilot_link_version}
-BuildRequires: gettext autoconf automake libtool
-ExcludeArch: s390 s390x
 
 %description
 gnome-pilot is a collection of programs and daemon for integrating
 GNOME and the PalmPilot<tm> or other PalmOS<tm> devices.
 
 %package devel
-Summary: GNOME pilot libraries, includes, etc
 Group: Development/Libraries
-Requires: ORBit2-devel
-Requires: pilot-link-devel >= %{pilot_link_version}
+Summary: GNOME pilot libraries, includes, etc
 Requires: %name = %{version}
+Requires: ORBit2-devel
 Requires: libgnomeui-devel
+Requires: pilot-link-devel >= %{pilot_link_version}
 
 %description devel
 gpilotd libraries and includes.
 
 %prep
 %setup -q
-%patch1 -p1 -b .fix_64bit
-%patch5 -p1 -b .fix_icon
-%patch7 -p1 -b .move-conduits-code
-%patch8 -p1 -b .move-conduits-autotools
-%patch9 -p1 -b .defines
+%patch10 -p1 -b .fix_64bit
+%patch11 -p1 -b .fix_icon
+%patch12 -p1 -b .move-conduits-code
+%patch13 -p1 -b .move-conduits-autotools
+%patch14 -p1 -b .defines
 
 # patches for pilot-link-0.12
-#%patch11 -p0 -b .port-to-pilot-link-0.12
-#%patch12 -p1 -b .include-pi-error
-#%patch13 -p0 -b .backup_conduit_update
-
-%patch16 -p0 -b .fix-xml-properties-leak
-%patch17 -p0 -b .backup-conduit-valgrind-fixes
-%patch19 -p0 -b .conduits_64bit
+#%patch15 -p0 -b .port-to-pilot-link-0.12
+#%patch16 -p1 -b .include-pi-error
+#%patch17 -p0 -b .backup_conduit_update
+
+%patch18 -p0 -b .fix-xml-properties-leak
+%patch19 -p0 -b .backup-conduit-valgrind-fixes
+%patch20 -p0 -b .conduits_64bit
+
+%patch21 -p1 -b .sleep-after-sync
+%patch22 -p1 -b .slist-remove
 
 %build
 autoreconf -i
@@ -88,11 +110,13 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # fixup location of conduits
-mv $RPM_BUILD_ROOT/%{_datadir}/gnome-pilot/conduits/*.conduit $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/
+mv $RPM_BUILD_ROOT/%{_datadir}/gnome-pilot/conduits/*.conduit \
+  $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/
 
 # fixup location of desktop file:
 mkdir $RPM_BUILD_ROOT/%{_datadir}/applications/
-mv $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gpilotd-control-applet.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
+mv $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gpilotd-control-applet.desktop \
+  $RPM_BUILD_ROOT/%{_datadir}/applications/
 
 # remove unwanted files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
@@ -151,6 +175,12 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Aug 10 2006 Matthew Barnes <mbarnes at redhat.com> - 2.0.13-15
+- Add patches for RH bug #189294.
+
+* Mon Jul 31 2006 Matthew Barnes <mbarnes at redhat.com> 2.0.13-14
+- Cleanup spec file, renumber patches.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-13.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 18:59:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 14:59:50 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot-2.0.13-sleep-after-sync.patch,
	NONE, 1.1 gnome-pilot-2.0.13-slist-remove.patch, NONE,
	1.1 gnome-pilot.spec, 1.45, 1.46
Message-ID: <200608101859.k7AIxoJC032215@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	gnome-pilot.spec 
Added Files:
	gnome-pilot-2.0.13-sleep-after-sync.patch 
	gnome-pilot-2.0.13-slist-remove.patch 
Log Message:
- Forgot to commit the new patches.


gnome-pilot-2.0.13-sleep-after-sync.patch:
 gpilotd.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-pilot-2.0.13-sleep-after-sync.patch ---
--- gnome-pilot-2.0.13/gpilotd/gpilotd.c.sleep-after-sync	2006-08-10 13:53:07.000000000 -0400
+++ gnome-pilot-2.0.13/gpilotd/gpilotd.c	2006-08-10 13:53:16.000000000 -0400
@@ -910,7 +910,7 @@
 				 * the kernel guys this is the best way to 
                                  * go. */
 				sync_device (device, context);
-
+				sleep(1); /* allow device to disconnect */
 				if (!visor_net)
 					device->type = PILOT_DEVICE_USB_VISOR;
 			}

gnome-pilot-2.0.13-slist-remove.patch:
 orbit_daemon_glue.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE gnome-pilot-2.0.13-slist-remove.patch ---
--- gnome-pilot-2.0.13/gpilotd/orbit_daemon_glue.c.slist-remove	2006-08-10 13:54:11.000000000 -0400
+++ gnome-pilot-2.0.13/gpilotd/orbit_daemon_glue.c	2006-08-10 13:54:21.000000000 -0400
@@ -674,8 +674,9 @@
 
 	element = g_slist_find_custom(*list,(gpointer)client_id,(GCompareFunc)strcmp);
 	if(element) {
-		*list = g_slist_remove(*list,element->data); 
-		g_free(element->data);
+		void *data = element->data;
+		*list = g_slist_remove(*list, data); 
+		g_free(data);
 	}
 
 	if(g_slist_length(*list)==0) {
@@ -756,6 +757,7 @@
 	GSList **pilots;
 	if((pilots = g_hash_table_lookup(orb_context->monitors,client_id))!=NULL) {
 		GSList *element;
+		void *data;
 		if((element = g_slist_find_custom(*pilots,
 						  (gpointer)pilot,
 						  (GCompareFunc)strcmp))!=NULL) {
@@ -763,8 +765,9 @@
 			monitor_off_helper_2(pilot,client_id);
 
 			/* nuke pilot from list */
-			*pilots = g_slist_remove(*pilots,element->data);
-			g_free(element->data);
+			data = element->data;
+			*pilots = g_slist_remove(*pilots,data);
+			g_free(data);
 			
 			/* if pilots is empty now, nuke fom orb_context->monitors */
 			if(g_slist_length(*pilots)==0) {


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-pilot.spec	10 Aug 2006 18:56:00 -0000	1.45
+++ gnome-pilot.spec	10 Aug 2006 18:59:47 -0000	1.46
@@ -5,7 +5,7 @@
 
 Name: gnome-pilot
 Version: 2.0.13
-Release: 15
+Release: 16
 License: LGPL
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -175,6 +175,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Aug 10 2006 Matthew Barnes <mbarnes at redhat.com> - 2.0.13-16
+- Forgot to commit the new patches.
+
 * Thu Aug 10 2006 Matthew Barnes <mbarnes at redhat.com> - 2.0.13-15
 - Add patches for RH bug #189294.
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:12:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:12:13 -0400
Subject: rpms/kernel/devel git-gregkh.patch, 1.3, 1.4 kernel-2.6.spec, 1.2544,
	1.2545 linux-2.6-compile-fixes.patch, 1.99,
	1.100 linux-2.6-lockdep-fixes.patch, 1.17, 1.18
Message-ID: <200608101912.k7AJCDKh002619@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	git-gregkh.patch kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-lockdep-fixes.patch 
Log Message:
update from gregs bits

git-gregkh.patch:
 b/Makefile                                    |   23 +
 b/drivers/ide/pci/generic.c                   |   30 +
 b/drivers/media/dvb/bt8xx/dst.c               |   58 +--
 b/drivers/media/dvb/dvb-core/Makefile         |    6 
 b/drivers/media/radio/Kconfig                 |   12 
 b/drivers/media/radio/Makefile                |    1 
 b/drivers/media/radio/dsbr100.c               |  430 ++++++++++++++++++++++++++
 b/drivers/media/video/Kconfig                 |   12 
 b/drivers/media/video/Makefile                |    2 
 b/drivers/media/video/compat_ioctl32.c        |   32 +
 b/drivers/media/video/cx25840/cx25840-core.c  |    4 
 b/drivers/media/video/cx88/cx88-video.c       |    4 
 b/drivers/media/video/msp3400-kthreads.c      |    4 
 b/drivers/media/video/pwc/Kconfig             |    2 
 b/drivers/media/video/pwc/pwc-if.c            |    1 
 b/drivers/media/video/saa7134/saa7134-video.c |    2 
 b/drivers/media/video/tuner-types.c           |   14 
 b/drivers/media/video/v4l1-compat.c           |    4 
 b/drivers/media/video/v4l2-common.c           |    6 
 b/drivers/media/video/videodev.c              |    2 
 b/drivers/media/video/vivi.c                  |    4 
 b/drivers/net/myri10ge/myri10ge.c             |    2 
 b/drivers/net/tg3.c                           |   51 +--
 b/drivers/net/tg3.h                           |    8 
 b/drivers/s390/char/tape_class.c              |    2 
 b/drivers/s390/cio/device_fsm.c               |    1 
 b/drivers/s390/cio/device_ops.c               |    3 
 b/drivers/scsi/ata_piix.c                     |    5 
 b/drivers/scsi/libata-core.c                  |   34 --
 b/drivers/scsi/libata-scsi.c                  |   13 
 b/drivers/scsi/sata_sil24.c                   |    1 
 b/fs/jfs/inode.c                              |   16 
 b/fs/jfs/jfs_inode.h                          |    1 
 b/fs/jfs/super.c                              |  118 ++++++-
 b/fs/xfs/xfs_alloc.c                          |  103 +++---
 b/include/linux/skbuff.h                      |    4 
 b/include/media/v4l2-dev.h                    |    2 
 b/net/core/dst.c                              |    3 
 b/net/core/pktgen.c                           |    4 
 b/net/core/rtnetlink.c                        |   15 
 b/net/core/skbuff.c                           |    4 
 b/net/core/wireless.c                         |   24 +
 b/net/ipv4/route.c                            |    2 
 b/net/ipv4/tcp_output.c                       |   12 
 b/net/ipv6/addrconf.c                         |    4 
 b/net/ipx/af_ipx.c                            |   10 
 b/sound/oss/Kconfig                           |    6 
 b/sound/pci/Kconfig                           |   70 ++--
 b/usr/Makefile                                |    3 
 drivers/media/video/dsbr100.c                 |  430 --------------------------
 50 files changed, 920 insertions(+), 684 deletions(-)

Index: git-gregkh.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-gregkh.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git-gregkh.patch	10 Aug 2006 01:04:06 -0000	1.3
+++ git-gregkh.patch	10 Aug 2006 19:12:08 -0000	1.4
@@ -1,3 +1,55 @@
+commit 99baa75231e35aca41b9718adfb07f45ce40e84c
+Merge: fff6425... 0e1edbd...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date:   Wed Aug 9 23:57:52 2006 -0700
+
+    Merge git://oss.sgi.com:8090/nathans/xfs-rc-2.6
+
+commit 0e1edbd99994270023cea5afe593f972eb09a778
+Author: Nathan Scott <nathans at sgi.com>
+Date:   Thu Aug 10 14:40:41 2006 +1000
+
+    [XFS] Fix xfs_free_extent related NULL pointer dereference.
+    
+    We recently fixed an out-of-space deadlock in XFS, and part of that fix
+    involved the addition of the XFS_ALLOC_FLAG_FREEING flag to some of the
+    space allocator calls to indicate they're freeing space, not allocating
+    it. There was a missed xfs_alloc_fix_freelist condition test that did not
+    correctly test "flags". The same test would also test an uninitialised
+    structure field (args->userdata) and depending on its value either would
+    or would not return early with a critical buffer pointer set to NULL.
+    
+    This fixes that up, adds asserts to several places to catch future botches
+    of this nature, and skips sections of xfs_alloc_fix_freelist that are
+    irrelevent for the space-freeing case.
+    
+    SGI-PV: 955303
+    SGI-Modid: xfs-linux-melb:xfs-kern:26743a
+    
+    Signed-off-by: Nathan Scott <nathans at sgi.com>
+
+commit fff642570dc47ab76491fe81ee6599269c4eb13e
+Author: David S. Miller <davem at sunset.davemloft.net>
+Date:   Wed Aug 9 17:36:15 2006 -0700
+
+    [IPX]: Fix typo, ipxhdr() --> ipx_hdr()
+    
+    Noticed by Dave Jones.
+    
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit 06aebfb7faa13258af5230ff3d1587ece6c0250e
+Author: Herbert Xu <herbert at gondor.apana.org.au>
+Date:   Wed Aug 9 16:52:04 2006 -0700
+
+    [IPV6]: The ifa lock is a BH lock
+    
+    The ifa lock is expected to be taken in BH context (by addrconf timers)
+    so we must disable BH when accessing it from user context.
+    
+    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
 commit 79860a9a79a17f1bed0713680a3995467405ba49
 Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
 Date:   Wed Aug 9 15:04:58 2006 +0100
@@ -723,6 +775,7 @@
  b/fs/jfs/inode.c                              |   16 
  b/fs/jfs/jfs_inode.h                          |    1 
  b/fs/jfs/super.c                              |  118 ++++++-
+ b/fs/xfs/xfs_alloc.c                          |  103 +++---
  b/include/linux/skbuff.h                      |    4 
  b/include/media/v4l2-dev.h                    |    2 
  b/net/core/dst.c                              |    3 
@@ -732,12 +785,13 @@
  b/net/core/wireless.c                         |   24 +
  b/net/ipv4/route.c                            |    2 
  b/net/ipv4/tcp_output.c                       |   12 
+ b/net/ipv6/addrconf.c                         |    4 
  b/net/ipx/af_ipx.c                            |   10 
  b/sound/oss/Kconfig                           |    6 
  b/sound/pci/Kconfig                           |   70 ++--
  b/usr/Makefile                                |    3 
  drivers/media/video/dsbr100.c                 |  430 --------------------------
- 48 files changed, 864 insertions(+), 634 deletions(-)
+ 50 files changed, 920 insertions(+), 685 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index c2f78a5..c53ed56 100644
@@ -2964,6 +3018,180 @@
  };
  
  static struct export_operations jfs_export_operations = {
+diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
+index eef6763..d2bbcd8 100644
+--- a/fs/xfs/xfs_alloc.c
++++ b/fs/xfs/xfs_alloc.c
+@@ -1835,40 +1835,47 @@ xfs_alloc_fix_freelist(
+ 				&agbp)))
+ 			return error;
+ 		if (!pag->pagf_init) {
++			ASSERT(flags & XFS_ALLOC_FLAG_TRYLOCK);
++			ASSERT(!(flags & XFS_ALLOC_FLAG_FREEING));
+ 			args->agbp = NULL;
+ 			return 0;
+ 		}
+ 	} else
+ 		agbp = NULL;
+ 
+-	/* If this is a metadata preferred pag and we are user data
++	/*
++	 * If this is a metadata preferred pag and we are user data
+ 	 * then try somewhere else if we are not being asked to
+ 	 * try harder at this point
+ 	 */
+-	if (pag->pagf_metadata && args->userdata && flags) {
++	if (pag->pagf_metadata && args->userdata &&
++	    (flags & XFS_ALLOC_FLAG_TRYLOCK)) {
++		ASSERT(!(flags & XFS_ALLOC_FLAG_FREEING));
+ 		args->agbp = NULL;
+ 		return 0;
+ 	}
+ 
+-	need = XFS_MIN_FREELIST_PAG(pag, mp);
+-	delta = need > pag->pagf_flcount ? need - pag->pagf_flcount : 0;
+-	/*
+-	 * If it looks like there isn't a long enough extent, or enough
+-	 * total blocks, reject it.
+-	 */
+-	longest = (pag->pagf_longest > delta) ?
+-		(pag->pagf_longest - delta) :
+-		(pag->pagf_flcount > 0 || pag->pagf_longest > 0);
+-	if (args->minlen + args->alignment + args->minalignslop - 1 > longest ||
+-	    (!(flags & XFS_ALLOC_FLAG_FREEING) &&
+-	     (int)(pag->pagf_freeblks + pag->pagf_flcount -
+-		   need - args->total) <
+-	     (int)args->minleft)) {
+-		if (agbp)
+-			xfs_trans_brelse(tp, agbp);
+-		args->agbp = NULL;
+-		return 0;
++	if (!(flags & XFS_ALLOC_FLAG_FREEING)) {
++		need = XFS_MIN_FREELIST_PAG(pag, mp);
++		delta = need > pag->pagf_flcount ? need - pag->pagf_flcount : 0;
++		/*
++		 * If it looks like there isn't a long enough extent, or enough
++		 * total blocks, reject it.
++		 */
++		longest = (pag->pagf_longest > delta) ?
++			(pag->pagf_longest - delta) :
++			(pag->pagf_flcount > 0 || pag->pagf_longest > 0);
++		if ((args->minlen + args->alignment + args->minalignslop - 1) >
++				longest ||
++		    ((int)(pag->pagf_freeblks + pag->pagf_flcount -
++			   need - args->total) < (int)args->minleft)) {
++			if (agbp)
++				xfs_trans_brelse(tp, agbp);
++			args->agbp = NULL;
++			return 0;
++		}
+ 	}
++
+ 	/*
+ 	 * Get the a.g. freespace buffer.
+ 	 * Can fail if we're not blocking on locks, and it's held.
+@@ -1878,6 +1885,8 @@ xfs_alloc_fix_freelist(
+ 				&agbp)))
+ 			return error;
+ 		if (agbp == NULL) {
++			ASSERT(flags & XFS_ALLOC_FLAG_TRYLOCK);
++			ASSERT(!(flags & XFS_ALLOC_FLAG_FREEING));
+ 			args->agbp = NULL;
+ 			return 0;
+ 		}
+@@ -1887,22 +1896,24 @@ xfs_alloc_fix_freelist(
+ 	 */
+ 	agf = XFS_BUF_TO_AGF(agbp);
+ 	need = XFS_MIN_FREELIST(agf, mp);
+-	delta = need > be32_to_cpu(agf->agf_flcount) ?
+-		(need - be32_to_cpu(agf->agf_flcount)) : 0;
+ 	/*
+ 	 * If there isn't enough total or single-extent, reject it.
+ 	 */
+-	longest = be32_to_cpu(agf->agf_longest);
+-	longest = (longest > delta) ? (longest - delta) :
+-		(be32_to_cpu(agf->agf_flcount) > 0 || longest > 0);
+-	if (args->minlen + args->alignment + args->minalignslop - 1 > longest ||
+-	     (!(flags & XFS_ALLOC_FLAG_FREEING) &&
+-		(int)(be32_to_cpu(agf->agf_freeblks) +
+-		   be32_to_cpu(agf->agf_flcount) - need - args->total) <
+-	     (int)args->minleft)) {
+-		xfs_trans_brelse(tp, agbp);
+-		args->agbp = NULL;
+-		return 0;
++	if (!(flags & XFS_ALLOC_FLAG_FREEING)) {
++		delta = need > be32_to_cpu(agf->agf_flcount) ?
++			(need - be32_to_cpu(agf->agf_flcount)) : 0;
++		longest = be32_to_cpu(agf->agf_longest);
++		longest = (longest > delta) ? (longest - delta) :
++			(be32_to_cpu(agf->agf_flcount) > 0 || longest > 0);
++		if ((args->minlen + args->alignment + args->minalignslop - 1) >
++				longest ||
++		    ((int)(be32_to_cpu(agf->agf_freeblks) +
++		     be32_to_cpu(agf->agf_flcount) - need - args->total) <
++				(int)args->minleft)) {
++			xfs_trans_brelse(tp, agbp);
++			args->agbp = NULL;
++			return 0;
++		}
+ 	}
+ 	/*
+ 	 * Make the freelist shorter if it's too long.
+@@ -1950,12 +1961,11 @@ xfs_alloc_fix_freelist(
+ 		 * on a completely full ag.
+ 		 */
+ 		if (targs.agbno == NULLAGBLOCK) {
+-			if (!(flags & XFS_ALLOC_FLAG_FREEING)) {
+-				xfs_trans_brelse(tp, agflbp);
+-				args->agbp = NULL;
+-				return 0;
+-			}
+-			break;
++			if (flags & XFS_ALLOC_FLAG_FREEING)
++				break;
++			xfs_trans_brelse(tp, agflbp);
++			args->agbp = NULL;
++			return 0;
+ 		}
+ 		/*
+ 		 * Put each allocated block on the list.
+@@ -2442,31 +2452,26 @@ xfs_free_extent(
+ 	xfs_fsblock_t	bno,	/* starting block number of extent */
+ 	xfs_extlen_t	len)	/* length of extent */
+ {
+-#ifdef DEBUG
+-	xfs_agf_t	*agf;	/* a.g. freespace header */
+-#endif
+-	xfs_alloc_arg_t	args;	/* allocation argument structure */
++	xfs_alloc_arg_t	args;
+ 	int		error;
+ 
+ 	ASSERT(len != 0);
++	memset(&args, 0, sizeof(xfs_alloc_arg_t));
+ 	args.tp = tp;
+ 	args.mp = tp->t_mountp;
+ 	args.agno = XFS_FSB_TO_AGNO(args.mp, bno);
+ 	ASSERT(args.agno < args.mp->m_sb.sb_agcount);
+ 	args.agbno = XFS_FSB_TO_AGBNO(args.mp, bno);
+-	args.alignment = 1;
+-	args.minlen = args.minleft = args.minalignslop = 0;
+ 	down_read(&args.mp->m_peraglock);
+ 	args.pag = &args.mp->m_perag[args.agno];
+ 	if ((error = xfs_alloc_fix_freelist(&args, XFS_ALLOC_FLAG_FREEING)))
+ 		goto error0;
+ #ifdef DEBUG
+ 	ASSERT(args.agbp != NULL);
+-	agf = XFS_BUF_TO_AGF(args.agbp);
+-	ASSERT(args.agbno + len <= be32_to_cpu(agf->agf_length));
++	ASSERT((args.agbno + len) <=
++		be32_to_cpu(XFS_BUF_TO_AGF(args.agbp)->agf_length));
+ #endif
+-	error = xfs_free_ag_extent(tp, args.agbp, args.agno, args.agbno,
+-		len, 0);
++	error = xfs_free_ag_extent(tp, args.agbp, args.agno, args.agbno, len, 0);
+ error0:
+ 	up_read(&args.mp->m_peraglock);
+ 	return error;
 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
 index 19c96d4..3573ba9 100644
 --- a/include/linux/skbuff.h
@@ -3190,8 +3418,26 @@
  	TCP_INC_STATS(TCP_MIB_ACTIVEOPENS);
  
  	/* Timer for repeating the SYN until an answer. */
+diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
+index 8ea1e36..0c5042e 100644
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -1909,11 +1909,11 @@ static int inet6_addr_add(int ifindex, s
+ 	ifp = ipv6_add_addr(idev, pfx, plen, scope, ifa_flags);
+ 
+ 	if (!IS_ERR(ifp)) {
+-		spin_lock(&ifp->lock);
++		spin_lock_bh(&ifp->lock);
+ 		ifp->valid_lft = valid_lft;
+ 		ifp->prefered_lft = prefered_lft;
+ 		ifp->tstamp = jiffies;
+-		spin_unlock(&ifp->lock);
++		spin_unlock_bh(&ifp->lock);
+ 
+ 		addrconf_dad_start(ifp, 0);
+ 		in6_ifa_put(ifp);
 diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
-index aa34ff4..4019642 100644
+index aa34ff4..bef3f61 100644
 --- a/net/ipx/af_ipx.c
 +++ b/net/ipx/af_ipx.c
 @@ -1642,13 +1642,17 @@ static int ipx_rcv(struct sk_buff *skb, 
@@ -3203,7 +3449,7 @@
 +	if (!pskb_may_pull(skb, sizeof(struct ipxhdr)))
 +		goto drop;
 +
-+	ipx_pktsize = ntohs(ipxhdr(skb)->ipx_pktsize);
++	ipx_pktsize = ntohs(ipx_hdr(skb)->ipx_pktsize);
  	
  	/* Too small or invalid header? */
 -	if (ipx_pktsize < sizeof(struct ipxhdr) || ipx_pktsize > skb->len)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2544
retrieving revision 1.2545
diff -u -r1.2544 -r1.2545
--- kernel-2.6.spec	10 Aug 2006 17:47:24 -0000	1.2544
+++ kernel-2.6.spec	10 Aug 2006 19:12:09 -0000	1.2545
@@ -1699,6 +1699,7 @@
 %changelog
 * Thu Aug 10 2006 Dave Jones <davej at redhat.com>
 - GFS2/DLM update.
+- Daily GregKH updates.
 
 * Wed Aug  9 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace_regset nits breaking s390.

linux-2.6-compile-fixes.patch:
 Makefile                      |    4 ----
 arch/ia64/kernel/ia64_ksyms.c |    1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- linux-2.6-compile-fixes.patch	10 Aug 2006 01:04:07 -0000	1.99
+++ linux-2.6-compile-fixes.patch	10 Aug 2006 19:12:10 -0000	1.100
@@ -23,28 +23,3 @@
  #define __KERNEL_SYSCALLS__
  #include <asm/unistd.h>
 
-
-commit fff642570dc47ab76491fe81ee6599269c4eb13e
-Author: David S. Miller <davem at sunset.davemloft.net>
-Date:   Wed Aug 9 17:36:15 2006 -0700
-
-    [IPX]: Fix typo, ipxhdr() --> ipx_hdr()
-    
-    Noticed by Dave Jones.
-    
-    Signed-off-by: David S. Miller <davem at davemloft.net>
-
-diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
-index 4019642..bef3f61 100644
---- a/net/ipx/af_ipx.c
-+++ b/net/ipx/af_ipx.c
-@@ -1645,7 +1645,7 @@ static int ipx_rcv(struct sk_buff *skb, 
- 	if (!pskb_may_pull(skb, sizeof(struct ipxhdr)))
- 		goto drop;
- 
--	ipx_pktsize = ntohs(ipxhdr(skb)->ipx_pktsize);
-+	ipx_pktsize = ntohs(ipx_hdr(skb)->ipx_pktsize);
- 	
- 	/* Too small or invalid header? */
- 	if (ipx_pktsize < sizeof(struct ipxhdr) ||
-

linux-2.6-lockdep-fixes.patch:
 a/net/ipv6/icmp.c                             |   13 ++++++++++
 linux-2.6.17-mm6/include/net/sock.h           |   33 +++++++++++++++++++++++---
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++++++++-
 linux-2.6.18-rc1/net/socket.c                 |    8 +++++-
 5 files changed, 64 insertions(+), 8 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-2.6-lockdep-fixes.patch	9 Aug 2006 18:42:54 -0000	1.17
+++ linux-2.6-lockdep-fixes.patch	10 Aug 2006 19:12:10 -0000	1.18
@@ -387,61 +387,3 @@
  
  		/* Enough space for 2 64K ICMP packets, including
  		 * sk_buff struct overhead.
-_
-From: Herbert Xu <herbert at gondor.apana.org.au>
-To: davem at davemloft.net, davej at redhat.com (Dave Jones)
-Subject: Re: another networking lockdep trace.
-Cc: netdev at vger.kernel.org, yoshfuji at linux-ipv6.org, mingo at elte.hu,
-        arjan at linux.intel.com
-In-Reply-To: <20060808184157.GB4880 at redhat.com>
-Message-Id: <E1GAmbn-0006Ts-00 at gondolin.me.apana.org.au>
-Date: Wed, 09 Aug 2006 21:52:23 +1000
-
-Dave Jones <davej at redhat.com> wrote:
->
-> Aug  7 06:47:44 localhost kernel: inconsistent {in-softirq-W} -> {softirq-on-W}
-> usage.
-> Aug  7 06:47:44 localhost kernel: ip/2617 [HC0[0]:SC0[0]:HE1:SE1] takes:
-> Aug  7 06:47:44 localhost kernel:  (&ifa->lock){-+..}, at: [<f90a3836>]
-> inet6_addr_add+0xf8/0x13e [ipv6]
-> Aug  7 06:47:44 localhost kernel: {in-softirq-W} state was registered at:
-> Aug  7 06:47:44 localhost kernel:   [<c043bfb9>] lock_acquire+0x4b/0x6a
-> Aug  7 06:47:44 localhost kernel:   [<c060f428>] _spin_lock_bh+0x1e/0x2d
-> Aug  7 06:47:44 localhost kernel:   [<f90a4757>] addrconf_dad_timer+0x3a/0xe2 [ipv6]
-
-Nice.  This is a bug introduced less than 2 weeks ago.  We're finally
-getting some dividends from the lock validator :) Thanks guys!
-
-[IPV6]: The ifa lock is a BH lock
-
-The ifa lock is expected to be taken in BH context (by addrconf timers)
-so we must disable BH when accessing it from user context.
-
-Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
-
-Cheers,
--- 
-Visit Openswan at http://www.openswan.org/
-Email: Herbert Xu ~{PmV>HI~} <herbert at gondor.apana.org.au>
-Home Page: http://gondor.apana.org.au/~herbert/
-PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
---
-diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index 8ea1e36..0c5042e 100644
---- a/net/ipv6/addrconf.c
-+++ b/net/ipv6/addrconf.c
-@@ -1909,11 +1909,11 @@ static int inet6_addr_add(int ifindex, s
- 	ifp = ipv6_add_addr(idev, pfx, plen, scope, ifa_flags);
- 
- 	if (!IS_ERR(ifp)) {
--		spin_lock(&ifp->lock);
-+		spin_lock_bh(&ifp->lock);
- 		ifp->valid_lft = valid_lft;
- 		ifp->prefered_lft = prefered_lft;
- 		ifp->tstamp = jiffies;
--		spin_unlock(&ifp->lock);
-+		spin_unlock_bh(&ifp->lock);
- 
- 		addrconf_dad_start(ifp, 0);
- 		in6_ifa_put(ifp);
-



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:24:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:24:54 -0400
Subject: rpms/eclipse/devel eclipse-tomcat55-build.patch, 1.10,
	1.11 eclipse-tomcat55.patch, 1.6, 1.7 eclipse.spec, 1.308,
	1.309 rebuild-sdk-features, 1.3, 1.4
Message-ID: <200608101924.k7AJOs34021316@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse-tomcat55-build.patch eclipse-tomcat55.patch 
	eclipse.spec rebuild-sdk-features 
Log Message:
* Thu Aug 10 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1rh
- Fix eclipse-tomcat55.patch and eclipse-tomcat55-build.patch to not reference
  jars that don't exist.
- Fix rebuild-sdk-features to work with 3.2.x feature versions.


eclipse-tomcat55-build.patch:
 build.xml |   94 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 50 insertions(+), 44 deletions(-)

Index: eclipse-tomcat55-build.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eclipse-tomcat55-build.patch	26 Jul 2006 04:35:40 -0000	1.10
+++ eclipse-tomcat55-build.patch	10 Aug 2006 19:24:51 -0000	1.11
@@ -78,8 +78,8 @@
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-impl.jar"/>
 +			<pathelement path="lib/mx4j-jmx.jar"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-jmx.jar"/>
-+			<pathelement path="lib/jsp-api.jar"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jsp-api.jar"/>
++			<pathelement path="lib/jspapi.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jspapi.jar"/>
 +			<pathelement path="lib/naming-factory.jar"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-factory.jar"/>
 +			<pathelement path="lib/naming-resources.jar"/>

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

Index: eclipse-tomcat55.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-tomcat55.patch	6 Jul 2006 18:22:19 -0000	1.6
+++ eclipse-tomcat55.patch	10 Aug 2006 19:24:51 -0000	1.7
@@ -5,7 +5,7 @@
 diff -u -r1.21 .classpath
 --- .classpath	9 May 2006 18:51:41 -0000	1.21
 +++ .classpath	4 Jul 2006 18:42:40 -0000
-@@ -1,28 +1,27 @@
+@@ -1,28 +1,29 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
  	<classpathentry kind="src" path="src"/>
@@ -35,11 +35,13 @@
 +	<classpathentry exported="true" kind="lib" path="lib/catalina-optional.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-el.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-modeler.jar"/>
-+	<classpathentry exported="true" kind="lib" path="lib/jmx.jar"/>
-+	<classpathentry exported="true" kind="lib" path="lib/jsp-api.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/mx4j.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/mx4j-jmx.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/mx4j-impl.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/jspapi.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/naming-factory.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/naming-resources.jar"/>
-+	<classpathentry exported="true" kind="lib" path="lib/servlet-api.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/servletapi5.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/servlets-default.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/tomcat-coyote.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/tomcat-http.jar"/>
@@ -1466,7 +1468,7 @@
 diff -u -r1.21 MANIFEST.MF
 --- META-INF/MANIFEST.MF	9 May 2006 20:26:52 -0000	1.21
 +++ META-INF/MANIFEST.MF	4 Jul 2006 18:42:40 -0000
-@@ -2,30 +2,30 @@
+@@ -2,30 +2,32 @@
  Bundle-ManifestVersion: 2
  Bundle-Name: %pluginName
  Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
@@ -1506,12 +1508,14 @@
 + lib/commons-modeler.jar,
 + lib/jasper-compiler.jar,
 + lib/jasper-runtime.jar,
-+ lib/jmx.jar,
-+ lib/jsp-api.jar,
++ lib/mx4j.jar,
++ lib/mx4j-jmx.jar,
++ lib/mx4j-impl.jar,
++ lib/jspapi.jar,
 + lib/naming-factory.jar,
 + lib/naming-resources.jar,
 + lib/regexp.jar,
-+ lib/servlet-api.jar,
++ lib/servletapi5.jar,
 + lib/servlets-default.jar,
 + lib/tomcat-coyote.jar,
 + lib/tomcat-http.jar,
@@ -1520,7 +1524,7 @@
  Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin
  Bundle-Vendor: %providerName
  Bundle-Localization: plugin
-@@ -33,6 +33,74 @@
+@@ -33,6 +35,74 @@
   org.apache.ant;bundle-version="[1.6.5,1.7.0)";resolution:=optional,
   org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
  Eclipse-LazyStart: true


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- eclipse.spec	1 Aug 2006 18:49:47 -0000	1.308
+++ eclipse.spec	10 Aug 2006 19:24:51 -0000	1.309
@@ -1641,6 +1641,11 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1rh
+- Fix eclipse-tomcat55.patch and eclipse-tomcat55-build.patch to not reference
+  jars that don't exist.
+- Fix rebuild-sdk-features to work with 3.2.x feature versions.
+
 * Tue Aug 01 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_10fc
 - Use firefox-devel instead of mozilla-devel.
 - Add patch for rh#200929 (include embed_base in xpcom's pkgconfig -I flags).


Index: rebuild-sdk-features
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/rebuild-sdk-features,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rebuild-sdk-features	10 Feb 2006 14:52:02 -0000	1.3
+++ rebuild-sdk-features	10 Aug 2006 19:24:52 -0000	1.4
@@ -62,7 +62,7 @@
 for feature in $features
 do
   featureId=""
-  version=${feature: -5}
+  # version computed below
   case $feature in
   org.eclipse.rcp_*)
     featureId="org.eclipse.rcp"
@@ -89,6 +89,7 @@
     featureId="org.eclipse.pde.source"
     ;;
   esac
+  version=`echo $feature | sed "s/${featureId}_//"`
   if [ "xx${featureId}xx" != "xxxx" ]
   then
       if [ "xx${version}xx" != "xxxx" ]



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:25:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:25:37 -0400
Subject: rpms/arts/FC-5 .cvsignore, 1.25, 1.26 arts.spec, 1.58, 1.59 sources,
	1.28, 1.29
Message-ID: <200608101925.k7AJPbUA021603@cvs.devel.redhat.com>

Author: than

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	1 Jun 2006 14:27:21 -0000	1.25
+++ .cvsignore	10 Aug 2006 19:25:34 -0000	1.26
@@ -9,3 +9,4 @@
 arts-1.5.0.tar.bz2
 arts-1.5.1.tar.bz2
 arts-1.5.3.tar.bz2
+arts-1.5.4.tar.bz2


Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-5/arts.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- arts.spec	1 Jun 2006 14:27:21 -0000	1.58
+++ arts.spec	10 Aug 2006 19:25:34 -0000	1.59
@@ -1,15 +1,11 @@
-%define _prefix /usr
-
 %define debug 0
 %define final 0
 
-%define alsa 1
 %define qt_version 3.3.5
 
 %define make_cvs 1
-%define disable_gcc_check_and_hidden_visibility 1
 
-Version: 1.5.3
+Version: 1.5.4
 Release: 0.1.fc5
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
@@ -17,7 +13,7 @@
 License: LGPL
 Epoch: 8
 Url: http://www.kde.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch0: kde-libtool.patch
@@ -27,14 +23,14 @@
 Patch6: arts-1.4.0-glibc.patch
 Patch7: arts-1.5.0-check_tmp_dir.patch
 
-Prereq: /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: audiofile
+
 Obsoletes: kdelibs-sound
 Provides: kdelibs-sound
 
-%if %{alsa}
 BuildRequires: alsa-lib-devel >= 1.0.2
-%endif
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 BuildRequires: qt-devel >= 1:%{qt_version}
@@ -65,9 +61,7 @@
 Requires: glib2-devel
 Requires: libvorbis-devel
 Requires: audiofile-devel
-%if %{alsa}
 Requires: alsa-lib-devel
-%endif
 Obsoletes: kdelibs-sound-devel
 Provides: kdelibs-sound-devel
 
@@ -97,10 +91,6 @@
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$FLAGS"
-export CFLAGS="$FLAGS"
-export PATH=`pwd`:$PATH
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -109,12 +99,8 @@
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{alsa}
    --with-alsa \
-%endif
 %if %{final}
    --enable-final \
 %endif
@@ -171,6 +157,9 @@
 %{_bindir}/artsc-config
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 8:1.5.4-0.1.fc5
+- 1.5.4
+
 * Thu Jun 01 2006 Than Ngo <than at redhat.com> 8:1.5.3-0.1.fc5
 - update to 1.5.3
 - own /ust/include/kde #193460


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	1 Jun 2006 14:27:21 -0000	1.28
+++ sources	10 Aug 2006 19:25:34 -0000	1.29
@@ -1 +1 @@
-1707ce44708a70acecd7a50ef05d365e  arts-1.5.3.tar.bz2
+886ba4a13dc0da312d94c09f50c3ffe6  arts-1.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:26:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:26:54 -0400
Subject: rpms/jakarta-commons-discovery/devel jakarta-commons-discovery.spec,
	1.10, 1.11
Message-ID: <200608101926.k7AJQsLs022173@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-discovery/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21997

Modified Files:
	jakarta-commons-discovery.spec 
Log Message:
- Merge with upstream version
 - Add missing javadoc post and postun
 - Add missing javadoc requires



Index: jakarta-commons-discovery.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-discovery/devel/jakarta-commons-discovery.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jakarta-commons-discovery.spec	22 Jul 2006 08:41:57 -0000	1.10
+++ jakarta-commons-discovery.spec	10 Aug 2006 19:26:52 -0000	1.11
@@ -38,7 +38,7 @@
 Summary:        Jakarta Commons Discovery
 Name:           jakarta-commons-discovery
 Version:        0.3
-Release:        3jpp_2fc
+Release:        4jpp.1
 Epoch:          1
 Group:          Development/Libraries/Java
 License:        Apache Software License
@@ -72,6 +72,8 @@
 %package javadoc
 Group:          Development/Documentation
 Summary:        Javadoc for %{name}
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -106,6 +108,7 @@
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 # -----------------------------------------------------------------------------
 
@@ -117,6 +120,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 # -----------------------------------------------------------------------------
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}
+fi
 
 %post
 %if %{gcj_support}
@@ -146,10 +157,16 @@
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 1:0:3-4jpp.1
+- Merge with upstream version
+ - Add missing javadoc post and postun
+ - Add missing javadoc requires
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:0.3-3jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:27:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:27:18 -0400
Subject: rpms/eclipse/devel eclipse-tomcat55-build.patch,1.11,1.12
Message-ID: <200608101927.k7AJRI9u022400@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse-tomcat55-build.patch 
Log Message:
Update tomcat55 patch to change version in all build files to 5.5.17.

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

Index: eclipse-tomcat55-build.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-tomcat55-build.patch	10 Aug 2006 19:24:51 -0000	1.11
+++ eclipse-tomcat55-build.patch	10 Aug 2006 19:27:15 -0000	1.12
@@ -1,5 +1,14 @@
 --- build.xml.orig	2006-07-05 12:47:26.000000000 -0400
 +++ build.xml	2006-07-05 12:50:49.000000000 -0400
+@@ -58,7 +58,7 @@
+ 		<antcall target="gather.bin.parts">
+ 			<param name="destination.temp.folder" value="${temp.folder}/"/>
+ 		</antcall>
+-		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" filesonly="false" whenempty="skip" update="false"/>
++		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" filesonly="false" whenempty="skip" update="false"/>
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
 @@ -144,50 +144,56 @@
  			<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
  			<pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
@@ -101,3 +110,61 @@
  		</path>
  		<!-- compile the source code -->
  		<javac destdir="${temp.folder}/tomcatwrapper.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"		>
+@@ -224,37 +230,37 @@
+ 	</target>
+ 
+ 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
+-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
++		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
++		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="true" overwrite="false">
+ 			<fileset dir="${build.result.folder}" includes="tomcatwrapper.jar"			/>
+ 		</copy>
+-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
++		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="true" overwrite="false">
+ 			<fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,META-INF/,about_files/"			/>
+ 		</copy>
+-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" version="4.1.130.v20060601"/>
++		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" version="5.5.17.v20060601"/>
+ 	</target>
+ 
+ 	<target name="build.zips" depends="init">
+ 	</target>
+ 
+ 	<target name="gather.sources" depends="init" if="destination.temp.folder">
+-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
+-		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
+-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false">
++		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
++		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="false" overwrite="false"/>
++		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="false" overwrite="false">
+ 			<fileset dir="${basedir}" includes="about.html,*.license"			/>
+ 		</copy>
+ 	</target>
+ 
+ 	<target name="gather.logs" depends="init" if="destination.temp.folder">
+-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
+-		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
++		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
++		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="false" overwrite="false"/>
+ 	</target>
+ 
+ 	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.tomcat of all the zips, jars and logs created.">
+ 		<delete file="${build.result.folder}/tomcatwrapper.jar"/>
+ 		<delete file="${build.result.folder}/tomcatwrappersrc.zip"/>
+-		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar"/>
+-		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip"/>
++		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.jar"/>
++		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.zip"/>
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+@@ -277,7 +283,7 @@
+ 		<delete>
+ 			<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}"			/>
+ 		</delete>
+-		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
++		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:31:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:31:00 -0400
Subject: rpms/SysVinit/devel SysVinit.spec,1.50,1.51
Message-ID: <200608101931.k7AJV0Z5023836@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23758

Modified Files:
	SysVinit.spec 
Log Message:
don't package /dev/initctl (#174652, #199939)



Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- SysVinit.spec	10 Aug 2006 17:51:33 -0000	1.50
+++ SysVinit.spec	10 Aug 2006 19:30:58 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 10
+Release: 11
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -96,8 +96,6 @@
 make -C src ROOT=$RPM_BUILD_ROOT MANDIR=%{_mandir} \
 	BIN_OWNER=`id -nu` BIN_GROUP=`id -ng` install
 
-# If this already exists, just do nothing (the ||: part)
-mknod --mode=0600 $RPM_BUILD_ROOT/dev/initctl p ||:
 ln -snf killall5 $RPM_BUILD_ROOT/sbin/pidof
 
 chmod 755 $RPM_BUILD_ROOT/usr/bin/utmpdump
@@ -136,11 +134,11 @@
 %attr(2555,root,tty)  /usr/bin/wall
 %{_includedir}/initreq.h
 %{_mandir}/*/*
-/dev/initctl
 
 %changelog
-* Thu Aug 10 2006 Bill Nottingham <notting at redhat.com> - 2.86-10
+* Thu Aug 10 2006 Bill Nottingham <notting at redhat.com> - 2.86-11
 - fix warning on SELinux policy load failure (#185603)
+- don't package /dev/initctl (#174652, #199939)
 
 * Wed Aug  9 2006 Bill Nottingham <notting at redhat.com> - 2.86-9
 - preserve 'WAITING' across re-exec (#143289, others)



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:31:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:31:37 -0400
Subject: rpms/jakarta-commons-codec/devel jakarta-commons-codec.spec, 1.12,
	1.13
Message-ID: <200608101931.k7AJVbq6024021@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-codec/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23964

Modified Files:
	jakarta-commons-codec.spec 
Log Message:
- Merge with upstream version
 - Add missing javadoc requires



Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jakarta-commons-codec.spec	22 Jul 2006 08:40:13 -0000	1.12
+++ jakarta-commons-codec.spec	10 Aug 2006 19:31:34 -0000	1.13
@@ -38,7 +38,7 @@
 
 Name:           jakarta-commons-codec
 Version:        1.3
-Release:        4jpp_2fc
+Release:        5jpp.1
 Summary:        Jakarta Commons Codec Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -70,6 +70,8 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -115,6 +117,7 @@
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 # -----------------------------------------------------------------------------
 
@@ -165,10 +168,14 @@
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
-
+%ghost %doc %{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:1.3-5jpp.1
+- Merge with upstream version
+ - Add missing javadoc requires
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.3-4jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:39:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:39:10 -0400
Subject: rpms/SysVinit/devel sysvinit-2.86-console-open.patch, NONE,
	1.1 SysVinit.spec, 1.51, 1.52
Message-ID: <200608101939.k7AJdATW025803@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25722

Modified Files:
	SysVinit.spec 
Added Files:
	sysvinit-2.86-console-open.patch 
Log Message:
allow failed opens some time to resolve themselves (#181546)


sysvinit-2.86-console-open.patch:
 init.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE sysvinit-2.86-console-open.patch ---
--- sysvinit-2.86/src/init.c.eieio	2006-08-10 15:34:23.000000000 -0400
+++ sysvinit-2.86/src/init.c	2006-08-10 15:34:50.000000000 -0400
@@ -531,8 +531,10 @@
 	/*
 	 *	Retry the open five times.
 	 */
-	for(f = 0; f < 5; f++)
+	for(f = 0; f < 5; f++) {
 		if ((fd = open(console_dev, m)) >= 0) break;
+		usleep(100);
+	}
 
 	if (fd < 0) return fd;
 


Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- SysVinit.spec	10 Aug 2006 19:30:58 -0000	1.51
+++ SysVinit.spec	10 Aug 2006 19:39:08 -0000	1.52
@@ -23,6 +23,7 @@
 Patch16: sysvinit-2.86-quiet.patch
 Patch17: sysvinit-2.86-godot.patch
 Patch18: sysvinit-2.86-timeval.patch
+Patch19: sysvinit-2.86-console-open.patch
 Patch20: sysvinit-selinux.patch
 Source1: change_console.c
 Source2: change_console.8
@@ -80,6 +81,8 @@
 %patch17 -p1 -b .godot
 # Don't overwrite ut_addr_v6 on 64-bit platforms (#176494)
 %patch18 -p1 -b .timeval
+# Allow some time for failed opens to resolve themselves (#181546)
+%patch19 -p1 -b .console-open
 # SELinux support for init - loading policy, etc.
 %patch20 -p1 -b .selinux
 
@@ -139,6 +142,7 @@
 * Thu Aug 10 2006 Bill Nottingham <notting at redhat.com> - 2.86-11
 - fix warning on SELinux policy load failure (#185603)
 - don't package /dev/initctl (#174652, #199939)
+- allow some time for failed console opens to resolve themselves (#181546)
 
 * Wed Aug  9 2006 Bill Nottingham <notting at redhat.com> - 2.86-9
 - preserve 'WAITING' across re-exec (#143289, others)



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:40:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:40:07 -0400
Subject: rpms/jakarta-commons-modeler/devel
	jakarta-commons-modeler.build.properties.default.patch, NONE,
	1.1 jakarta-commons-modeler.build.xml.patch, NONE,
	1.1 jakarta-commons-modeler.spec, 1.34, 1.35
Message-ID: <200608101940.k7AJe7Xn026069@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26006

Modified Files:
	jakarta-commons-modeler.spec 
Added Files:
	jakarta-commons-modeler.build.properties.default.patch 
	jakarta-commons-modeler.build.xml.patch 
Log Message:
- Merge with upstream version:
 - Add missing javadoc requires
 - Add patches to properly set the classpath in build.xml and
   build.properties.default


jakarta-commons-modeler.build.properties.default.patch:
 build.properties.default |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE jakarta-commons-modeler.build.properties.default.patch ---
--- build.properties.default.original	2006-08-10 11:13:12.000000000 -0400
+++ build.properties.default	2006-08-10 11:31:26.000000000 -0400
@@ -15,7 +15,7 @@
 # --------------------------------------------------
 
 # ----- Commons Digester, version 1.4 or later -----
-commons-digester.home=${base.path}/commons-digester-1.4.1
+commons-digester.home=${base.path}
 commons-digester.lib=${commons-digester.home}
 commons-digester.jar=${commons-digester.lib}/commons-digester.jar
 commons-digester.loc=http://www.apache.org/dist/jakarta/commons/digester/binaries/commons-digester-1.4.1.tar.gz
@@ -25,7 +25,7 @@
 # --------------------------------------------------
 
 # ----- Commons Logging, version 1.0.1 or later -----
-commons-logging.home=${base.path}/commons-logging-1.0.3
+commons-logging.home=${base.path}
 commons-logging.lib=${commons-logging.home}
 commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
 commons-logging.jar=${commons-logging.lib}/commons-logging.jar
@@ -33,15 +33,15 @@
 
 
 # ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1 or later -----
-jmx.home=${base.path}/mx4j-1.1.1
-jmx.lib=${jmx.home}/lib
+jmx.home=${base.path}
+jmx.lib=${jmx.home}/mx4j
 jmx.jar=${jmx.lib}/mx4j-jmx.jar
 jmx-tools.jar=${jmx.lib}/mx4j-tools.jar
 jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.1.tar.gz
 
 
 # ----- JUnit Unit Test Suite, version 3.7 or later -----
-junit.home=${base.path}/junit3.7
+junit.home=${base.path}
 junit.lib=${junit.home}
 junit.jar=${junit.lib}/junit.jar
 junit.loc=http://telia.dl.sourceforge.net/sourceforge/junit/junit3.7.zip

jakarta-commons-modeler.build.xml.patch:
 build.xml |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE jakarta-commons-modeler.build.xml.patch ---
--- build.xml.original	2006-08-10 11:35:09.000000000 -0400
+++ build.xml	2006-08-10 11:49:22.000000000 -0400
@@ -20,24 +20,23 @@
 
 
   <!-- The directories corresponding to your necessary dependencies -->
-  <property name="base.path"               value="/usr/local" />
-  <property name="jaxp.home"               value="${base.path}/jaxp-1.1"/>
-  <property name="junit.home"              value="${base.path}/junit3.7"/>
+  <property name="jaxp.home"               value="${base.path}"/>
+  <property name="junit.home"              value="${base.path}"/>
   <property name="commons.home"            location="../../jakarta-commons"/>
   <property name="sandbox.home"            location="../../jakarta-commons-sandbox"/>
   <property name="digester.home"           value="${commons.home}/digester"/>
-  <property name="jmx.home"                value="${base.path}/jmx-ri_1.0.1/jmx"/>
+  <property name="jmx.home"                value="${base.path}"/>
   <property name="logging.home"            value="${commons.home}/logging"/>
 
 <!-- ========== Derived Values ============================================ -->
 
 
   <!-- The locations of necessary jar files -->
-  <property name="ant.jar"                 value="${ant.home}/lib/ant.jar"/>
+  <property name="ant.jar"                 value="${base.path}/ant.jar"/>
   <property name="jaxp.jaxp.jar"           value="${jaxp.home}/jaxp.jar"/>
   <property name="jaxp.parser.jar"         value="${jaxp.home}/crimson.jar"/>
   <property name="jaxp.xalan.jar"          value="${jaxp.home}/xalan.jar"/>
-  <property name="jmx.jar"                 value="${jmx.home}/lib/jmxri.jar"/>
+  <property name="jmx.jar"                 value="${jmx.home}/jmxri.jar"/>
   <property name="junit.jar"               value="${junit.home}/junit.jar"/>
   <property name="commons-digester.jar"    value="${digester.home}/dist/commons-digester.jar"/>
   <property name="commons-logging.jar"     value="${logging.home}/target/commons-logging.jar"/>


Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jakarta-commons-modeler.spec	10 Aug 2006 10:14:01 -0000	1.34
+++ jakarta-commons-modeler.spec	10 Aug 2006 19:40:02 -0000	1.35
@@ -38,13 +38,15 @@
 
 Name:		jakarta-%{short_name}
 Version:	1.1
-Release:	7jpp_3fc
+Release:	8jpp.1
 Epoch:		0
 Summary:	Jakarta Commons Modeler Package
 License:	Apache Software License
 Group:		Development/Libraries/Java
 Source0:	%{base_name}-%{version}-src.tar.gz
 #Patch:		%{name}.no-licence.build.patch
+Patch0:		%{name}.build.properties.default.patch
+Patch1:         %{name}.build.xml.patch
 Url:		http://jakarta.apache.org/commons/%{base_name}
 BuildRequires:	ant
 BuildRequires:	jaxp_parser_impl
@@ -86,8 +88,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Requires(post):		coreutils
-Requires(postun):	coreutils
+Requires(post): /bin/rm /bin/ln 
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -95,6 +97,8 @@
 %prep
 %setup -n %{short_name}-%{version}-src
 #%%patch
+%patch0
+%patch1  
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -161,6 +165,12 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-8jpp.1
+- Merge with upstream version:
+ - Add missing javadoc requires
+ - Add patches to properly set the classpath in build.xml and
+   build.properties.default
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.1-7jpp_3fc
 - Requires(post/postun): coreutils
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:42:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:42:13 -0400
Subject: rpms/kdelibs/FC-5 .cvsignore, 1.35, 1.36 kdelibs.spec, 1.139,
	1.140 sources, 1.47, 1.48 kdelibs-3.5.3-kde#106795.patch, 1.1,
	NONE kdelibs-3.5.3-kde#118277.patch, 1.1,
	NONE kdelibs-3.5.3-kde#123307.patch, 1.1,
	NONE kdelibs-3.5.3-kde#123315.patch, 1.1,
	NONE kdelibs-3.5.3-kde#128760.patch, 1.1,
	NONE kdelibs-3.5.3-kde#128842.patch, 1.1,
	NONE kdelibs-3.5.3-kde#128902.patch, 1.1,
	NONE kdelibs-3.5.3-kde#129187.patch, 1.1,
	NONE kdelibs-3.5.3-kde#130605.patch, 1.1,
	NONE kdelibs-3.5.3-kde#57159.patch, 1.1,
	NONE kdelibs-3.5.3-kde#65546.patch, 1.1,
	NONE kdelibs-3.5.3-kde#67849.patch, 1.1,
	NONE kdelibs-3.5.3-kde#81806.patch, 1.1,
	NONE kdelibs-3.5.3-khtml-regression.patch, 1.1,
	NONE kdelibs-3.5.3-konqueror-khtml.patch, 1.1,
	NONE kdelibs-3.5.3.diff, 1.1, NONE
Message-ID: <200608101942.k7AJgD4L026519@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-3.5.3-kde#106795.patch kdelibs-3.5.3-kde#118277.patch 
	kdelibs-3.5.3-kde#123307.patch kdelibs-3.5.3-kde#123315.patch 
	kdelibs-3.5.3-kde#128760.patch kdelibs-3.5.3-kde#128842.patch 
	kdelibs-3.5.3-kde#128902.patch kdelibs-3.5.3-kde#129187.patch 
	kdelibs-3.5.3-kde#130605.patch kdelibs-3.5.3-kde#57159.patch 
	kdelibs-3.5.3-kde#65546.patch kdelibs-3.5.3-kde#67849.patch 
	kdelibs-3.5.3-kde#81806.patch 
	kdelibs-3.5.3-khtml-regression.patch 
	kdelibs-3.5.3-konqueror-khtml.patch kdelibs-3.5.3.diff 
Log Message:
3.5.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	1 Jun 2006 17:33:09 -0000	1.35
+++ .cvsignore	10 Aug 2006 19:42:11 -0000	1.36
@@ -10,3 +10,4 @@
 kdelibs-3.5.0.tar.bz2
 kdelibs-3.5.1.tar.bz2
 kdelibs-3.5.3.tar.bz2
+kdelibs-3.5.4.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- kdelibs.spec	11 Jul 2006 22:35:36 -0000	1.139
+++ kdelibs.spec	10 Aug 2006 19:42:11 -0000	1.140
@@ -8,7 +8,7 @@
 %define cups_epoch 1
 
 %define qt_version 3.3.6
-%define arts_version 1.5.3
+%define arts_version 1.5.4
 %define kde_major_version 3
 
 %define qtdocdir %{_docdir}/qt-devel-%{qt_version}
@@ -16,10 +16,9 @@
 %define make_cvs 0
 %define fam 1
 %define dnotify 1
-%define arts 1
 
-Version: 3.5.3
-Release: 0.4.fc5
+Version: 3.5.4
+Release: 0.1.fc5
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -49,27 +48,7 @@
 Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
 Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
 
-# upstream patches
-Patch100: kdelibs-3.5.3-konqueror-khtml.patch
-Patch101: kdelibs-3.5.3-khtml-regression.patch
-Patch102: kdelibs-3.5.3.diff
-Patch103: kdelibs-3.5.3-kde#57159.patch
-Patch104: kdelibs-3.5.3-kde#118277.patch
-Patch105: kdelibs-3.5.3-kde#123315.patch
-Patch106: kdelibs-3.5.3-kde#65546.patch
-Patch107: kdelibs-3.5.3-kde#128842.patch
-Patch108: kdelibs-3.5.3-kde#128902.patch
-Patch109: kdelibs-3.5.3-kde#67849.patch
-Patch110: kdelibs-3.5.3-kde#81806.patch
-Patch111: kdelibs-3.5.3-kde#128760.patch
-Patch112: kdelibs-3.5.3-kde#123307.patch
-Patch113: kdelibs-3.5.3-kde#106795.patch
-Patch114: kdelibs-3.5.3-kde#130605.patch
-Patch115: kdelibs-3.5.3-kde#129187.patch
-
-%if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
-%endif
 Requires: qt >= %{qt_epoch}:%{qt_version}
 Requires: cups-libs >= %{cups_epoch}:1.1.12
 Requires: iceauth
@@ -88,8 +67,10 @@
 BuildRequires: fam-devel
 %endif
 
+BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel >= %{cups_epoch}:1.1.20
+BuildRequires: cups >= %{cups_epoch}:1.1.20
 BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
@@ -103,9 +84,7 @@
 BuildRequires: docbook-utils
 BuildRequires: zlib-devel
 BuildRequires: libidn-devel
-%if %{arts}
 BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}
-%endif
 BuildRequires: audiofile-devel
 BuildRequires: openssl-devel
 BuildRequires: perl
@@ -141,9 +120,7 @@
 Summary: Header files and documentation for compiling KDE applications.
 Requires: qt-devel >= %{qt_epoch}:%{qt_version}
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%if %{arts}
 Requires: arts-devel
-%endif
 Requires: libart_lgpl-devel
 Requires: libxslt-devel
 Requires: libjpeg-devel
@@ -195,24 +172,6 @@
 %patch37 -p1 -b .kdebug-kmail-quiet
 %patch38 -p1 -b .cupsdconf2-group
 
-# upstream patches
-%patch100 -p1 -b .konqueror-khtml
-%patch101 -p1 -b .khtml-regression
-%patch102 -p0 -b .return-check
-%patch103 -p0 -b .kde#57159
-%patch104 -p0 -b .kde#118277
-%patch105 -p0 -b .kde#123315
-%patch106 -p0 -b .kde#65546
-%patch107 -p0 -b .kde#128842
-%patch108 -p0 -b .kde#128902
-%patch109 -p0 -b .kde#67849
-%patch110 -p0 -b .kde#81806
-%patch111 -p0 -b .kde#128760
-%patch112 -p0 -b .kde#130252
-%patch113 -p0 -b .kde#106795
-%patch114 -p0 -b .kde#130605
-%patch115 -p0 -b .kde#129187
-
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
 %build
@@ -222,12 +181,6 @@
 export libltdl_cv_shlibext=".so"
 export PATH=/usr/kerberos/bin:${PATH}
 
-# workaround for gcc
-%ifarch s390 s390x
-export CXXFLAGS="%{optflags} -O0"
-export CFLAGS="%{optflags} -O0"
-%endif
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -249,9 +202,6 @@
    --with-xinerama \
    --disable-gcc-hidden-visibility \
    --enable-pie \
-%if %{arts} == 0
-   --without-arts \
-%endif
    --with-distribution="$VERSION" \
    --with-alsa \
    --includedir=%{_includedir}/kde \
@@ -278,7 +228,7 @@
 %endif
 
 make %{?_smp_mflags}
-make apidox
+make %{?_smp_mflags} apidox
 
 %install
 rm -rf %{buildroot}
@@ -327,7 +277,7 @@
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
 fi
@@ -335,7 +285,7 @@
 
 %postun
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
 fi
@@ -439,6 +389,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.1.fc5
+- 3.5.4
+
 * Tue Jul 11 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.4.fc5
 - fix #198333 ??? KDE update loses Control Centre
 - upstream patches:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	1 Jun 2006 17:33:12 -0000	1.47
+++ sources	10 Aug 2006 19:42:11 -0000	1.48
@@ -1 +1 @@
-972c2c6855f912179bd7830bf2ed91d8  kdelibs-3.5.3.tar.bz2
+979d056ca0e21c12caed270126e60e3e  kdelibs-3.5.4.tar.bz2


--- kdelibs-3.5.3-kde#106795.patch DELETED ---


--- kdelibs-3.5.3-kde#118277.patch DELETED ---


--- kdelibs-3.5.3-kde#123307.patch DELETED ---


--- kdelibs-3.5.3-kde#123315.patch DELETED ---


--- kdelibs-3.5.3-kde#128760.patch DELETED ---


--- kdelibs-3.5.3-kde#128842.patch DELETED ---


--- kdelibs-3.5.3-kde#128902.patch DELETED ---


--- kdelibs-3.5.3-kde#129187.patch DELETED ---


--- kdelibs-3.5.3-kde#130605.patch DELETED ---


--- kdelibs-3.5.3-kde#57159.patch DELETED ---


--- kdelibs-3.5.3-kde#65546.patch DELETED ---


--- kdelibs-3.5.3-kde#67849.patch DELETED ---


--- kdelibs-3.5.3-kde#81806.patch DELETED ---


--- kdelibs-3.5.3-khtml-regression.patch DELETED ---


--- kdelibs-3.5.3-konqueror-khtml.patch DELETED ---


--- kdelibs-3.5.3.diff DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:43:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:43:57 -0400
Subject: rpms/SysVinit/devel SysVinit.spec, 1.52,
	1.53 sysvinit-2.78-man.patch, 1.2, 1.3
Message-ID: <200608101943.k7AJhvVI027203@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27135

Modified Files:
	SysVinit.spec sysvinit-2.78-man.patch 
Log Message:
document -f in last(1)



Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- SysVinit.spec	10 Aug 2006 19:39:08 -0000	1.52
+++ SysVinit.spec	10 Aug 2006 19:43:53 -0000	1.53
@@ -42,7 +42,7 @@
 
 %prep
 %setup -q -n sysvinit-%{version}
-# We use a shell, not sulogin.
+# We use a shell, not sulogin. Other random man fixes go here (such as #192804)
 %patch1 -p1 -b .manpatch
 # Handle bigendian MD5
 %patch2 -p1 -b .be
@@ -143,6 +143,7 @@
 - fix warning on SELinux policy load failure (#185603)
 - don't package /dev/initctl (#174652, #199939)
 - allow some time for failed console opens to resolve themselves (#181546)
+- add documentation of -f to last(1) (#192804)
 
 * Wed Aug  9 2006 Bill Nottingham <notting at redhat.com> - 2.86-9
 - preserve 'WAITING' across re-exec (#143289, others)

sysvinit-2.78-man.patch:
 init.8    |    2 +-
 last.1    |    2 ++
 sulogin.8 |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

Index: sysvinit-2.78-man.patch
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/sysvinit-2.78-man.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sysvinit-2.78-man.patch	9 Sep 2004 02:44:46 -0000	1.2
+++ sysvinit-2.78-man.patch	10 Aug 2006 19:43:53 -0000	1.3
@@ -1,17 +1,6 @@
---- sysvinit-2.78/man/init.8.manpatch	Fri Feb 11 06:15:07 2000
-+++ sysvinit-2.78/man/init.8	Wed Apr  4 01:43:58 2001
-@@ -64,7 +64,7 @@
- .PP
- Runlevel \fBS\fP or \fBs\fP bring the system to single user mode
- and do not require an \fB/etc/inittab\fP file.  In single user mode,
--\fB/sbin/sulogin\fP is invoked on \fB/dev/console\fP.
-+a root shell is opened on \fB/dev/console\fP.
- .PP
- When entering single user mode, \fBinit\fP reads the console's \fIioctl\fP(2)
- states from \fB/etc/ioctl.save\fP. If this file does not exist, \fBinit\fP
---- sysvinit-2.78/man/sulogin.8.manpatch	Fri Nov 20 09:42:15 1998
-+++ sysvinit-2.78/man/sulogin.8	Wed Apr  4 01:43:58 2001
-@@ -8,7 +8,7 @@
+--- sysvinit-2.86/man/sulogin.8.manpatch	2004-06-09 08:47:45.000000000 -0400
++++ sysvinit-2.86/man/sulogin.8	2006-08-10 15:33:59.000000000 -0400
+@@ -9,7 +9,7 @@
  .RB [ " tty-device " ]
  .SH DESCRIPTION
  .I sulogin
@@ -20,3 +9,25 @@
  (this is done through an entry in \fIinittab(5)\fP). \fBInit\fP also
  tries to execute \fIsulogin\fP when it is passed the \fB-b\fP flag
  from the bootmonitor (eg, LILO).
+--- sysvinit-2.86/man/last.1.manpatch	2006-08-10 15:40:01.000000000 -0400
++++ sysvinit-2.86/man/last.1	2006-08-10 15:42:17.000000000 -0400
+@@ -60,6 +60,8 @@
+ useful, e.g., to determine easily who was logged in at a particular
+ time -- specify that time with \fB\-t\fP and look for "still logged
+ in".
++.IP "\fB\-f\fP \fIfile\fP"
++Specifies a file to search other than \fB/var/log/wtmp\fP.
+ .IP \fB\-R\fP
+ Suppresses the display of the hostname field.
+ .IP \fB\-a\fP
+--- sysvinit-2.86/man/init.8.manpatch	2004-07-29 07:21:31.000000000 -0400
++++ sysvinit-2.86/man/init.8	2006-08-10 15:33:59.000000000 -0400
+@@ -64,7 +64,7 @@
+ .PP
+ Runlevel \fBS\fP or \fBs\fP bring the system to single user mode
+ and do not require an \fB/etc/inittab\fP file.  In single user mode,
+-\fB/sbin/sulogin\fP is invoked on \fB/dev/console\fP.
++a root shell is opened on \fB/dev/console\fP.
+ .PP
+ When entering single user mode, \fBinit\fP initializes the consoles
+ \fBstty\fP settings to sane values. Clocal mode is set. Hardware



From fedora-cvs-commits at redhat.com  Thu Aug 10 19:45:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 15:45:33 -0400
Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec,
	1.33, 1.34
Message-ID: <200608101945.k7AJjXuM027770@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-digester/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27711

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
- Merge with upstream version:
 - Add missing requires for javadoc



Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jakarta-commons-digester.spec	10 Aug 2006 10:16:06 -0000	1.33
+++ jakarta-commons-digester.spec	10 Aug 2006 19:45:31 -0000	1.34
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.7
-Release:        4jpp_3fc
+Release:        5jpp.1
 Epoch:          0
 Summary:        Jakarta Commons Digester Package
 License:        Apache Software License
@@ -72,8 +72,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):		coreutils
-Requires(postun):	coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -106,6 +106,7 @@
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -152,8 +153,13 @@
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:1.7-5jpp.1
+- Merge with upstream version:
+ - Add missing requires for javadoc
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.7-4jpp_3fc
 - Requires(post/postun): coreutils
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 20:03:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 16:03:40 -0400
Subject: rpms/gedit/devel gedit-2.15.5-copy-xattrs.patch, NONE,
	1.1 gedit.spec, 1.91, 1.92
Message-ID: <200608102003.k7AK3e9X016400@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16341

Modified Files:
	gedit.spec 
Added Files:
	gedit-2.15.5-copy-xattrs.patch 
Log Message:
- Apply patch from James Antill to copy extended attributes over
  when saving files (bug 202099)


gedit-2.15.5-copy-xattrs.patch:
 configure.ac                        |    6 +++++
 configure.ac.xattrs                 |only
 gedit/gedit-document-saver.c        |   43 ++++++++++++++++++++++++++++++++++++
 gedit/gedit-document-saver.c.xattrs |only
 4 files changed, 49 insertions(+)

--- NEW FILE gedit-2.15.5-copy-xattrs.patch ---
diff -rup gedit-2.15.5-orig/configure.ac gedit-2.15.5/configure.ac
--- gedit-2.15.5-orig/configure.ac	2006-08-10 12:25:58.000000000 -0400
+++ gedit-2.15.5/configure.ac	2006-08-10 15:16:02.000000000 -0400
@@ -87,6 +87,12 @@ AC_SUBST(PSPELL_LIBS)
 
 
 dnl ================================================================
+dnl libattr checks
+dnl ================================================================
+
+AC_CHECK_LIB(attr, attr_copy_fd)
+
+dnl ================================================================
 dnl Start of pkg-config checks
 dnl ================================================================
 
Only in gedit-2.15.5: configure.ac.xattrs
diff -rup gedit-2.15.5-orig/gedit/gedit-document-saver.c gedit-2.15.5/gedit/gedit-document-saver.c
--- gedit-2.15.5-orig/gedit/gedit-document-saver.c	2006-05-18 18:55:16.000000000 -0400
+++ gedit-2.15.5/gedit/gedit-document-saver.c	2006-08-10 15:16:08.000000000 -0400
@@ -42,6 +42,12 @@
 #include <glib/gfileutils.h>
 #include <libgnomevfs/gnome-vfs.h>
 
+#ifdef HAVE_LIBATTR
+# include <attr/libattr.h>
+#else
+# define attr_copy_fd(x1, x2, x3, x4, x5, x6) (errno = ENOSYS, -1)
+#endif
+
 #include "gedit-document-saver.h"
 #include "gedit-debug.h"
 #include "gedit-convert.h"
@@ -457,6 +463,15 @@ get_slow_mime_type (const char *text_uri
 
 /* ----------- local files ----------- */
 
+#ifdef HAVE_LIBATTR
+static int all_xattrs(const char *xattr, struct error_context *err)
+{ /* Save everything: user/root xattrs, SELinux, ACLs. */
+  (void)xattr;
+  (void)err;
+  return 1;
+}
+#endif
+
 static gboolean
 save_existing_local_file (GeditDocumentSaver *saver)
 {
@@ -597,6 +612,22 @@ save_existing_local_file (GeditDocumentS
 			goto fallback_strategy;
 		}
 
+                /* copy the xattrs, like user.mime_type, over. Also ACLs and
+                   SELinux context. */
+                if ((attr_copy_fd (saver->priv->local_path, saver->priv->fd,
+                                   tmp_filename, tmpfd,
+                                   all_xattrs, NULL) == -1) &&
+                    (errno != EOPNOTSUPP) && (errno != ENOSYS))
+                {
+			gedit_debug_message (DEBUG_SAVER, "could not set xattrs");
+
+			close (tmpfd);
+			unlink (tmp_filename);
+			g_free (tmp_filename);
+
+			goto fallback_strategy;
+                }
+
 		if (!write_document_contents (tmpfd,
 					      GTK_TEXT_BUFFER (saver->priv->document),
 			 	 	      saver->priv->encoding,
@@ -751,6 +782,18 @@ save_existing_local_file (GeditDocumentS
 			}
 		}
 
+                /* copy the xattrs, like user.mime_type, over. Also ACLs and
+                   SELinux context. */
+                if ((attr_copy_fd (saver->priv->local_path, saver->priv->fd,
+                                   backup_filename, bfd,
+                                   all_xattrs, NULL) == -1) &&
+                    (errno != EOPNOTSUPP) && (errno != ENOSYS))
+                {
+			gedit_debug_message (DEBUG_SAVER, "could not set xattrs");
+
+			goto out; /* is it better to save or not save? */
+                }
+
 		if (!copy_file_data (saver->priv->fd, bfd, NULL))
 		{
 				gedit_debug_message (DEBUG_SAVER, "could not copy data into the backup");
Only in gedit-2.15.5/gedit: gedit-document-saver.c.xattrs


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gedit.spec	4 Aug 2006 03:26:48 -0000	1.91
+++ gedit.spec	10 Aug 2006 20:03:37 -0000	1.92
@@ -17,7 +17,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
 Version: 	2.15.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -49,6 +49,9 @@
 # gtk_widget_show()
 Patch3: gedit-2.15.1-bgo-341055-workaround.patch
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=202099
+Patch4: gedit-2.15.5-copy-xattrs.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -110,6 +113,7 @@
 
 %patch2 -p1 -b .python
 %patch3 -p1 -b .bgo-341055-workaround
+%patch4 -p1 -b .copy-xattrs
 
 %build
 %configure --disable-scrollkeeper --disable-gtk-doc --enable-python
@@ -119,7 +123,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-install --vendor gnome --delete-original       \
@@ -186,8 +190,12 @@
 %{_datadir}/gtk-doc/html/gedit/
 
 %changelog
+* Thu Aug 10 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.5-2.fc6
+- Apply patch from James Antill to copy extended attributes over
+  when saving files (bug 202099)
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.5-1.fc6
-- Update to 2.15.6
+- Update to 2.15.5
 
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.4-1
 - Update to 2.15.4



From fedora-cvs-commits at redhat.com  Thu Aug 10 20:06:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 16:06:14 -0400
Subject: rpms/gedit/devel gedit.spec,1.92,1.93
Message-ID: <200608102006.k7AK6EdI016938@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16893

Modified Files:
	gedit.spec 
Log Message:
- add autoreconf before configure



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gedit.spec	10 Aug 2006 20:03:37 -0000	1.92
+++ gedit.spec	10 Aug 2006 20:06:11 -0000	1.93
@@ -70,6 +70,7 @@
 BuildRequires: gnome-python2-gtksourceview >= %{gnome_python_desktop_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: which
+BuildRequires: autoconf, automake, libtool
 
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: libgnomeprintui22 >= %{libgnomeprintui_version}
@@ -116,6 +117,7 @@
 %patch4 -p1 -b .copy-xattrs
 
 %build
+autoreconf
 %configure --disable-scrollkeeper --disable-gtk-doc --enable-python
 make
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 20:15:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 16:15:45 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.3-khelpcenter-sort.patch, NONE,
	1.1 kdebase-3.5.4-1-redhat.patch, NONE,
	1.1 kdebase-3.5.4-halbackend-dbus.patch, NONE,
	1.1 kdebase-3.5.4-kde#128552.patch, NONE, 1.1 kdebase.spec,
	1.176, 1.177 sources, 1.68,
	1.69 kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff,
	1.1, NONE kdebase-3.5.2-krdb-xresource.patch, 1.1,
	NONE kdebase-3.5.3-1-redhat.patch, 1.1,
	NONE kdebase-3.5.3-kioslave_media_dbus-fuser.patch, 1.1,
	NONE kdebase-3.5.3-kioslave_media_dbus.patch, 1.1, NONE
Message-ID: <200608102015.k7AKFiAl019559@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec sources 
Added Files:
	kdebase-3.5.3-khelpcenter-sort.patch 
	kdebase-3.5.4-1-redhat.patch 
	kdebase-3.5.4-halbackend-dbus.patch 
	kdebase-3.5.4-kde#128552.patch 
Removed Files:
	kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff 
	kdebase-3.5.2-krdb-xresource.patch 
	kdebase-3.5.3-1-redhat.patch 
	kdebase-3.5.3-kioslave_media_dbus-fuser.patch 
	kdebase-3.5.3-kioslave_media_dbus.patch 
Log Message:
3.5.4


kdebase-3.5.3-khelpcenter-sort.patch:
 infotree.cpp |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE kdebase-3.5.3-khelpcenter-sort.patch ---
--- kdebase-3.5.3/khelpcenter/infotree.cpp.tn	2006-07-16 22:39:40.000000000 +0200
+++ kdebase-3.5.3/khelpcenter/infotree.cpp	2006-07-16 22:57:50.000000000 +0200
@@ -123,6 +123,7 @@
   }
 
   m_alphabItem->sortChildItems( 0, true /* ascending */ );
+  m_categoryItem->sortChildItems( 0, true /* ascending */ );
 }
 
 void InfoTree::parseInfoDirFile( const QString &infoDirFileName )
@@ -174,8 +175,10 @@
 
         item = new InfoNodeItem( alphabSection, appName );
         item->entry()->setUrl( url );
+        alphabSection->sortChildItems( 0, true /* ascending */ );
       }
     }
+    catItem->sortChildItems( 0, true /* ascending */ );
   }
   infoDirFile.close();
 }

kdebase-3.5.4-1-redhat.patch:
 kde.pamd |   16 +++++++++------
 startkde |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 68 insertions(+), 14 deletions(-)

--- NEW FILE kdebase-3.5.4-1-redhat.patch ---
--- kdebase-3.5.3/kde.pamd.redhat	2005-09-10 10:26:16.000000000 +0200
+++ kdebase-3.5.3/kde.pamd	2006-07-24 11:52:53.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.3/startkde.redhat	2006-07-24 11:52:53.000000000 +0200
+++ kdebase-3.5.3/startkde	2006-07-24 11:55:19.000000000 +0200
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.4 )
+#  Modified for Red Hat Linux
 #
 
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`LANG=C df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`LANG=C df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
+
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
 trap 'echo GOT SIGHUP' HUP
@@ -14,12 +62,12 @@
 	exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default blue
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -61,7 +109,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]
@@ -132,8 +180,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`
@@ -145,9 +193,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
@@ -337,7 +386,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.4-halbackend-dbus.patch:
 halbackend.cpp |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE kdebase-3.5.4-halbackend-dbus.patch ---
Index: kioslave/media/mediamanager/halbackend.cpp
===================================================================
--- kioslave/media/mediamanager/halbackend.cpp	(Revision 566465)
+++ kioslave/media/mediamanager/halbackend.cpp	(Revision 566466)
@@ -112,6 +112,14 @@
     DBusError error;
     dbus_error_init(&error);
     dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error);
+
+    if (!dbus_connection || dbus_error_is_set(&error)) {
+        dbus_error_free(&error);
+        libhal_ctx_free(m_halContext);
+        m_halContext = NULL;
+        return false;
+    }
+
     dbus_bus_register(dbus_connection, &error);
 
     if (dbus_error_is_set(&error)) {

kdebase-3.5.4-kde#128552.patch:
 taskbar.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.4-kde#128552.patch ---
Index: kicker/taskbar/taskbar.cpp
===================================================================
--- kicker/taskbar/taskbar.cpp	(Revision 570839)
+++ kicker/taskbar/taskbar.cpp	(Revision 570840)
@@ -177,14 +177,14 @@
 
         if (containerCount() == 0)
         {
-            actualMax = maxSize.height();
+            actualMax = minButtonHeight;
         }
 
         if (actualMax > maxSize.height())
         {
             return maxSize;
         }
-        return QSize( maxSize.width(), maxSize.height() );
+        return QSize( maxSize.width(), actualMax );
     }
     else
     {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- kdebase.spec	6 Jul 2006 17:07:51 -0000	1.176
+++ kdebase.spec	10 Aug 2006 20:15:41 -0000	1.177
@@ -3,11 +3,10 @@
 %define debug 0
 %define final 0
 
-%define redhatify 1
 %define include_kappfinder 0
 
 %define qt_version 3.3.6
-%define arts_version 1.5.3
+%define arts_version 1.5.4
 %define kdelibs_epoch 6
 %define arts_epoch 8
 %define make_cvs 1
@@ -16,8 +15,8 @@
 
 Summary: K Desktop Environment - core files
 Name: kdebase
-Version: 3.5.3
-Release: 0.4.fc5
+Version: 3.5.4
+Release: 0.1.fc5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -34,8 +33,7 @@
 Source7: mailsettings.cc
 Source8: env.sh
 
-Patch0: kde-libtool.patch
-Patch1: kdebase-3.5.3-1-redhat.patch
+Patch1: kdebase-3.5.4-1-redhat.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -43,33 +41,25 @@
 Patch6: kdebase-3.1.3-konsole-double-esc.patch
 Patch7: kdebase-3.3.92-kpersonalizer.patch
 Patch8: kdebase-3.2.92-logo.patch 
-Patch9: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
 Patch10: kdebase-3.4.2-kdesktop-konsole.patch
 Patch11: kdebase-3.5.1-xdg.patch
-Patch12: kdebase-3.5.3-kioslave_media_dbus.patch
 Patch13: kdebase-3.5.2-dbus.patch
 Patch14: kdebase-3.5.1-kdm-readme.patch
 Patch15: kdebase-3.5.1-konsole-fonts.patch
-Patch16: kdebase-3.5.2-krdb-xresource.patch
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
-Patch19: kdebase-3.5.3-kioslave_media_dbus-fuser.patch
+Patch21: kdebase-3.5.3-khelpcenter-sort.patch
 
 # upstream patches
-Patch100: kdebase-3.5.3-kfind-largefile.patch
-Patch101: kdebase-3.5.3-kicker-panel.patch
-Patch102: kdebase-3.5.3-kscreensaver.patch
-Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
-Patch104: kdebase-3.5.3.diff
-
-# security fixes
-# Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
-Patch300: post-3.5.0-kdebase-kdm.diff
-
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): desktop-file-utils
-Requires(pre,post): fileutils sh-utils
-Requires(post): xfs
+Patch100: kdebase-3.5.4-halbackend-dbus.patch
+Patch101: kdebase-3.5.4-kde#128552.patch
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+Requires(post): fileutils sh-utils
+Requires(postun): fileutils sh-utils
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}-0.3.fc5
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -82,12 +72,9 @@
 Requires: htdig
 Requires: psmisc
 Requires: coreutils
-
-%if %{redhatify}
 Requires: desktop-backgrounds-basic
 Requires: redhat-menus => 1.2
 Requires: redhat-artwork >= 0.92
-%endif
 
 BuildRequires: kdelibs-devel >= %{version}
 BuildRequires: samba >= 2.2.3a-5
@@ -153,7 +140,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .libtool
 %patch1 -p1 -b .redhat
 %patch2 -p1 -b .vroot
 %patch3 -p1 -b .shortcuts
@@ -162,38 +148,27 @@
 %patch6 -p1 -b .konsole
 %patch7 -p1 -b .kper
 %patch8 -p1 -b .logo
-%patch9 -p1 -b .im
 %patch10 -p1 -b .kdestop-konsole
 %patch11 -p1 -b .xdg
-%patch12 -p1 -b .kioslave_media_dbus
 %patch13 -p1 -b .dbus
 %patch14 -p1 -b .kdm-readme
 %patch15 -p1 -b .konsole-fonts
-%patch16 -p1 -b .krdb-xresource
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
-%patch19 -p1 -b .fuser
+%patch21 -p1 -b .khelpcenter-sort
 
 # upstream patches
-%patch100 -p1 -b .kfind-largefile
-%patch101 -p1 -b .kicker-panel
-%patch102 -p1 -b .kscreensaver
-%patch103 -p1 -b .kxkb-kcmlayout
-%patch104 -p0 -b .setuid-check
-
-# security fixes
-%patch300 -p0 -b .CVE-2006-2449
+%patch100 -p0 -b .halbackend-dbus
+%patch101 -p0 -b .kde#128552
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
 %endif
 
-%if %redhatify
-   cp %{SOURCE1} konsole
-   # set Konqueror version
-   perl -pi -e "s,^#define.*KONQUEROR_VERSION.*,#define KONQUEROR_VERSION \"%{version}-%{release} Fedore Core\"," konqueror/version.h
-%endif
+cp %{SOURCE1} konsole
+# set Konqueror version
+perl -pi -e "s,^#define.*KONQUEROR_VERSION.*,#define KONQUEROR_VERSION \"%{version}-%{release} Fedore Core\"," konqueror/version.h
 
 %build
 # set some default enviroments
@@ -355,24 +330,22 @@
    fi
 done
 
-%if %{redhatify}
-   rm -f %{buildroot}%{_datadir}/locale/l10n/*/flag.png
-   # mark KDE-Only
-   pushd %{buildroot}%{_datadir}/applications/kde
-      for f in *.desktop ; do
-         if [ "$f" == "konqbrowser.desktop" ] ; then
-            cat $f | grep -v Categories >$f.o
-            echo "Categories=Qt;KDE;Network;" >>$f.o
-            mv $f.o $f
-         else
-            echo "OnlyShowIn=KDE;" >> $f
-         fi
-      done
-   popd
-   for f in $(find %{buildroot}%{_datadir}/applnk -name "*.desktop") ; do
-      echo "OnlyShowIn=KDE;" >> $f
+rm -f %{buildroot}%{_datadir}/locale/l10n/*/flag.png
+# mark KDE-Only
+pushd %{buildroot}%{_datadir}/applications/kde
+   for f in *.desktop ; do
+      if [ "$f" == "konqbrowser.desktop" ] ; then
+         cat $f | grep -v Categories >$f.o
+         echo "Categories=Qt;KDE;Network;" >>$f.o
+         mv $f.o $f
+      else
+         echo "OnlyShowIn=KDE;" >> $f
+      fi
    done
-%endif
+popd
+for f in $(find %{buildroot}%{_datadir}/applnk -name "*.desktop") ; do
+   echo "OnlyShowIn=KDE;" >> $f
+done
 
 mkdir -p %{buildroot}/etc/kde/env
 install -m 755 %{SOURCE8} %{buildroot}/etc/kde/env/
@@ -518,9 +491,7 @@
 %config %{_datadir}/config/*
 %{_datadir}/config.kcfg/
 %{_datadir}/desktop-directories
-%if ! %{redhatify}
-%{_datadir}/fonts/bitmap-fonts/*
-%endif
+%exclude %{_datadir}/fonts/bitmap-fonts/*
 %{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/icons/*color/*/*/*
 %{_datadir}/locale/*/entry.desktop
@@ -552,6 +523,9 @@
 
 
 %changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.1.fc5
+- 3.5.4
+
 * Thu Jul 06 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.4.fc5
 - fix #187228, kio_media_mounthelper fails with fuser
 - fix #197778, add missing env.sh script


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	8 Jun 2006 13:05:45 -0000	1.68
+++ sources	10 Aug 2006 20:15:41 -0000	1.69
@@ -1,2 +1,2 @@
 a53556b00f950797b9b32848cace66c9  kde-redhat-config-3.5-fc5-0.2.tar.bz2
-9cb6b8291c4f3f986e16f72129e8fcd0  kdebase-3.5.3.tar.bz2
+882a9729c08b197caef2c8712c980d9c  kdebase-3.5.4.tar.bz2


--- kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff DELETED ---


--- kdebase-3.5.2-krdb-xresource.patch DELETED ---


--- kdebase-3.5.3-1-redhat.patch DELETED ---


--- kdebase-3.5.3-kioslave_media_dbus-fuser.patch DELETED ---


--- kdebase-3.5.3-kioslave_media_dbus.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 10 20:20:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 16:20:58 -0400
Subject: rpms/kernel/devel linux-2.6-build-deprecate-configh-include.patch,
	1.1, 1.2 linux-2.6-lockdep-fixes.patch, 1.18, 1.19
Message-ID: <200608102020.k7AKKwlc003638@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-build-deprecate-configh-include.patch 
	linux-2.6-lockdep-fixes.patch 
Log Message:
reduce some build noise, and print version number in lockdep reports

linux-2.6-build-deprecate-configh-include.patch:
 linux-2.6.17.noarch/include/asm-i386/dwarf2.h    |    2 --
 linux-2.6.17.noarch/include/asm-i386/tsc.h       |    1 -
 linux-2.6.17.noarch/include/asm-x86_64/calgary.h |    1 -
 linux-2.6.17.noarch/include/linux/config.h       |    1 +
 linux-2.6/net/atm/atm_sysfs.c                    |    1 -
 linux-2.6/net/core/dev_mcast.c                   |    3 +--
 linux-2.6/net/core/wireless.c                    |    1 -
 linux-2.6/net/ipv4/af_inet.c                     |    1 -
 linux-2.6/net/ipv4/ipconfig.c                    |    1 -
 linux-2.6/net/ipv4/netfilter/ip_conntrack_sip.c  |    1 -
 linux-2.6/net/ipv4/raw.c                         |    3 +--
 linux-2.6/net/ipv4/tcp_lp.c                      |    1 -
 linux-2.6/net/ipv4/tcp_veno.c                    |    1 -
 13 files changed, 3 insertions(+), 15 deletions(-)

Index: linux-2.6-build-deprecate-configh-include.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-deprecate-configh-include.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-build-deprecate-configh-include.patch	9 Aug 2006 23:52:05 -0000	1.1
+++ linux-2.6-build-deprecate-configh-include.patch	10 Aug 2006 20:20:55 -0000	1.2
@@ -8,3 +8,128 @@
  #include <linux/autoconf.h>
  #if !defined (__KERNEL__) && !defined(__KERNGLUE__)
  #error including kernel header in userspace; use the glibc headers instead!
+--- linux-2.6.17.noarch/include/asm-i386/tsc.h~	2006-08-10 16:10:24.000000000 -0400
++++ linux-2.6.17.noarch/include/asm-i386/tsc.h	2006-08-10 16:10:28.000000000 -0400
+@@ -6,7 +6,6 @@
+ #ifndef _ASM_i386_TSC_H
+ #define _ASM_i386_TSC_H
+ 
+-#include <linux/config.h>
+ #include <asm/processor.h>
+ 
+ /*
+--- linux-2.6.17.noarch/include/asm-i386/dwarf2.h~	2006-08-10 16:10:52.000000000 -0400
++++ linux-2.6.17.noarch/include/asm-i386/dwarf2.h	2006-08-10 16:10:56.000000000 -0400
+@@ -1,8 +1,6 @@
+ #ifndef _DWARF2_H
+ #define _DWARF2_H
+ 
+-#include <linux/config.h>
+-
+ #ifndef __ASSEMBLY__
+ #warning "asm/dwarf2.h should be only included in pure assembly files"
+ #endif
+--- linux-2.6.17.noarch/include/asm-x86_64/calgary.h~	2006-08-10 16:11:27.000000000 -0400
++++ linux-2.6.17.noarch/include/asm-x86_64/calgary.h	2006-08-10 16:11:31.000000000 -0400
+@@ -24,7 +24,6 @@
+ #ifndef _ASM_X86_64_CALGARY_H
+ #define _ASM_X86_64_CALGARY_H
+ 
+-#include <linux/config.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+ #include <linux/dma-mapping.h>
+
+--- linux-2.6/net/ipv4/netfilter/ip_conntrack_sip.c~	2006-08-09 22:18:48.000000000 -0400
++++ linux-2.6/net/ipv4/netfilter/ip_conntrack_sip.c	2006-08-09 22:18:53.000000000 -0400
+@@ -8,7 +8,6 @@
+  * published by the Free Software Foundation.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/ctype.h>
+ #include <linux/skbuff.h>
+--- linux-2.6/net/ipv4/af_inet.c~	2006-08-09 22:18:58.000000000 -0400
++++ linux-2.6/net/ipv4/af_inet.c	2006-08-09 22:19:03.000000000 -0400
+@@ -67,7 +67,6 @@
+  *		2 of the License, or (at your option) any later version.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/err.h>
+ #include <linux/errno.h>
+ #include <linux/types.h>
+--- linux-2.6/net/ipv4/ipconfig.c~	2006-08-09 22:19:07.000000000 -0400
++++ linux-2.6/net/ipv4/ipconfig.c	2006-08-09 22:19:10.000000000 -0400
+@@ -31,7 +31,6 @@
+  *              --  Josef Siemes <jsiemes at web.de>, Aug 2002
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/types.h>
+ #include <linux/string.h>
+ #include <linux/kernel.h>
+--- linux-2.6/net/ipv4/raw.c~	2006-08-09 22:19:14.000000000 -0400
++++ linux-2.6/net/ipv4/raw.c	2006-08-09 22:19:18.000000000 -0400
+@@ -38,8 +38,7 @@
+  *		as published by the Free Software Foundation; either version
+  *		2 of the License, or (at your option) any later version.
+  */
+- 
+-#include <linux/config.h> 
++
+ #include <linux/types.h>
+ #include <asm/atomic.h>
+ #include <asm/byteorder.h>
+--- linux-2.6/net/ipv4/tcp_veno.c~	2006-08-09 22:19:23.000000000 -0400
++++ linux-2.6/net/ipv4/tcp_veno.c	2006-08-09 22:19:26.000000000 -0400
+@@ -9,7 +9,6 @@
+  * 	See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/mm.h>
+ #include <linux/module.h>
+ #include <linux/skbuff.h>
+--- linux-2.6/net/ipv4/tcp_lp.c~	2006-08-09 22:19:31.000000000 -0400
++++ linux-2.6/net/ipv4/tcp_lp.c	2006-08-09 22:19:34.000000000 -0400
+@@ -31,7 +31,6 @@
+  * Version: $Id$
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <net/tcp.h>
+ 
+--- linux-2.6/net/atm/atm_sysfs.c~	2006-08-09 22:19:38.000000000 -0400
++++ linux-2.6/net/atm/atm_sysfs.c	2006-08-09 22:19:40.000000000 -0400
+@@ -1,6 +1,5 @@
+ /* ATM driver model support. */
+ 
+-#include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/init.h>
+ #include <linux/kobject.h>
+--- linux-2.6/net/core/wireless.c~	2006-08-09 22:19:44.000000000 -0400
++++ linux-2.6/net/core/wireless.c	2006-08-09 22:19:47.000000000 -0400
+@@ -72,7 +72,6 @@
+ 
+ /***************************** INCLUDES *****************************/
+ 
+-#include <linux/config.h>		/* Not needed ??? */
+ #include <linux/module.h>
+ #include <linux/types.h>		/* off_t */
+ #include <linux/netdevice.h>		/* struct ifreq, dev_get_by_name() */
+--- linux-2.6/net/core/dev_mcast.c~	2006-08-09 22:19:52.000000000 -0400
++++ linux-2.6/net/core/dev_mcast.c	2006-08-09 22:19:59.000000000 -0400
+@@ -21,8 +21,7 @@
+  *	2 of the License, or (at your option) any later version.
+  */
+ 
+-#include <linux/config.h> 
+-#include <linux/module.h> 
++#include <linux/module.h>
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+ #include <linux/bitops.h>

linux-2.6-lockdep-fixes.patch:
 a/kernel/lockdep.c                            |   13 ++++++++++
 a/net/ipv6/icmp.c                             |   13 ++++++++++
 linux-2.6.17-mm6/include/net/sock.h           |   33 +++++++++++++++++++++++---
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++++++++-
 linux-2.6.18-rc1/net/socket.c                 |    8 +++++-
 6 files changed, 77 insertions(+), 8 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-lockdep-fixes.patch	10 Aug 2006 19:12:10 -0000	1.18
+++ linux-2.6-lockdep-fixes.patch	10 Aug 2006 20:20:55 -0000	1.19
@@ -387,3 +387,70 @@
  
  		/* Enough space for 2 64K ICMP packets, including
  		 * sk_buff struct overhead.
+
+--- a/kernel/lockdep.c~lockdep-print-kernel-version
++++ a/kernel/lockdep.c
+@@ -36,6 +36,7 @@
+ #include <linux/stacktrace.h>
+ #include <linux/debug_locks.h>
+ #include <linux/irqflags.h>
++#include <linux/utsname.h>
+ 
+ #include <asm/sections.h>
+ 
+@@ -508,6 +509,13 @@ print_circular_bug_entry(struct lock_lis
+ 	return 0;
+ }
+ 
++static void print_kernel_version(void)
++{
++	printk("%s %.*s\n", system_utsname.release,
++		(int)strcspn(system_utsname.version, " "),
++		system_utsname.version);
++}
++
+ /*
+  * When a circular dependency is detected, print the
+  * header first:
+@@ -524,6 +532,7 @@ print_circular_bug_header(struct lock_li
+ 
+ 	printk("\n=======================================================\n");
+ 	printk(  "[ INFO: possible circular locking dependency detected ]\n");
++	print_kernel_version();
+ 	printk(  "-------------------------------------------------------\n");
+ 	printk("%s/%d is trying to acquire lock:\n",
+ 		curr->comm, curr->pid);
+@@ -705,6 +714,7 @@ print_bad_irq_dependency(struct task_str
+ 	printk("\n======================================================\n");
+ 	printk(  "[ INFO: %s-safe -> %s-unsafe lock order detected ]\n",
+ 		irqclass, irqclass);
++	print_kernel_version();
+ 	printk(  "------------------------------------------------------\n");
+ 	printk("%s/%d [HC%u[%lu]:SC%u[%lu]:HE%u:SE%u] is trying to acquire:\n",
+ 		curr->comm, curr->pid,
+@@ -786,6 +796,7 @@ print_deadlock_bug(struct task_struct *c
+ 
+ 	printk("\n=============================================\n");
+ 	printk(  "[ INFO: possible recursive locking detected ]\n");
++	print_kernel_version();
+ 	printk(  "---------------------------------------------\n");
+ 	printk("%s/%d is trying to acquire lock:\n",
+ 		curr->comm, curr->pid);
+@@ -1368,6 +1379,7 @@ print_irq_inversion_bug(struct task_stru
+ 
+ 	printk("\n=========================================================\n");
+ 	printk(  "[ INFO: possible irq lock inversion dependency detected ]\n");
++	print_kernel_version();
+ 	printk(  "---------------------------------------------------------\n");
+ 	printk("%s/%d just changed the state of lock:\n",
+ 		curr->comm, curr->pid);
+@@ -1462,6 +1474,7 @@ print_usage_bug(struct task_struct *curr
+ 
+ 	printk("\n=================================\n");
+ 	printk(  "[ INFO: inconsistent lock state ]\n");
++	print_kernel_version();
+ 	printk(  "---------------------------------\n");
+ 
+ 	printk("inconsistent {%s} -> {%s} usage.\n",
+_
+



From fedora-cvs-commits at redhat.com  Thu Aug 10 20:26:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 16:26:56 -0400
Subject: rpms/pam/devel pam-0.99.5.0-selinux-keycreate.patch, NONE,
	1.1 pam.spec, 1.129, 1.130
Message-ID: <200608102026.k7AKQuNT005734@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.5.0-selinux-keycreate.patch 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 0.99.5.0-8
- Add new setkeycreatecon call to pam_selinux to make sure keyring has correct context


pam-0.99.5.0-selinux-keycreate.patch:
 pam_selinux.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+)

--- NEW FILE pam-0.99.5.0-selinux-keycreate.patch ---
diff -uprN Linux-PAM-0.99.4.0.orig/modules/pam_selinux/pam_selinux.c Linux-PAM-0.99.4.0.keycreate/modules/pam_selinux/pam_selinux.c
--- Linux-PAM-0.99.4.0.orig/modules/pam_selinux/pam_selinux.c	2006-06-22 10:11:05.000000000 -0400
+++ Linux-PAM-0.99.4.0.keycreate/modules/pam_selinux/pam_selinux.c	2006-06-22 10:17:55.000000000 -0400
@@ -390,6 +390,26 @@ pam_sm_open_session(pam_handle_t *pamh, 
       pam_syslog(pamh, LOG_NOTICE, "set %s security context to %s",
 		 (const char *)username, user_context);
   }
+  ret = setkeycreatecon(user_context);
+  if (ret==0 && verbose) {
+    char msg[PATH_MAX];
+    snprintf(msg, sizeof(msg),
+	     _("Key Creation Context %s Assigned"), user_context);
+    verbose_message(pamh, msg, debug);
+  }
+  if (ret) {
+    pam_syslog(pamh, LOG_ERR,
+	       "Error!  Unable to set %s key creation context %s.",
+	       (const char *)username, user_context);
+    if (security_getenforce() == 1) {
+       freecon(user_context);
+       return PAM_AUTH_ERR;
+    }
+  } else {
+    if (debug)
+      pam_syslog(pamh, LOG_NOTICE, "set %s key creation context to %s",
+		 (const char *)username, user_context);
+  }
   freecon(user_context);
 
   return PAM_SUCCESS;


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- pam.spec	10 Aug 2006 13:34:26 -0000	1.129
+++ pam.spec	10 Aug 2006 20:26:54 -0000	1.130
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.5.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -41,6 +41,7 @@
 Patch89: pam-0.99.5.0-keyinit-revoke-user.patch
 Patch90: pam-0.99.5.0-namespace-init.patch
 Patch91: pam-0.99.5.0-succif-unknown-user.patch
+Patch92: pam-0.99.5.0-selinux-keycreate.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -109,6 +110,7 @@
 %patch89 -p1 -b .revoke-user
 %patch90 -p1 -b .namespace-init
 %patch91 -p1 -b .unknown-user
+%patch92 -p1 -b .keycreate
 
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -375,6 +377,9 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 0.99.5.0-8
+- Add new setkeycreatecon call to pam_selinux to make sure keyring has correct context
+
 * Thu Aug 10 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-7
 - revoke keyrings properly when pam_keyinit called as root (#201048)
 - pam_succeed_if should return PAM_USER_UNKNOWN when getpwnam fails (#197748)



From fedora-cvs-commits at redhat.com  Thu Aug 10 21:02:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 17:02:30 -0400
Subject: rpms/puretls/devel puretls.spec,1.13,1.14
Message-ID: <200608102102.k7AL2UOj031810@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/puretls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31716

Modified Files:
	puretls.spec 
Log Message:
- Merge with upstream version:
 - Add missing requires for javadoc



Index: puretls.spec
===================================================================
RCS file: /cvs/dist/rpms/puretls/devel/puretls.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- puretls.spec	10 Aug 2006 10:36:07 -0000	1.13
+++ puretls.spec	10 Aug 2006 21:02:27 -0000	1.14
@@ -38,7 +38,7 @@
 
 Name:		puretls
 Version:	0.9
-Release:	0.%{beta}.3jpp_2fc
+Release:	0.%{beta}.4jpp.1
 Summary:	Java implementation of SSLv3 and TLSv1
 License:	BSD style
 Group:		Development/Libraries/Java
@@ -71,8 +71,8 @@
 %package javadoc
 Group:	Development/Libraries/Java
 Summary:	Javadoc for %{name}
-Requires(post):     coreutils
-Requires(postun):     coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -137,6 +137,7 @@
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r build/doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 # data
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -206,6 +207,7 @@
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 %files demo
 %defattr(-,root,root)
@@ -217,6 +219,10 @@
 #%endif
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0.9-0.b5.4jpp.1
+- Merge with upstream version
+ - Add missing requires for javadoc
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 0.9-0.b5.3jpp_2fc
 - Requires(post/postun): coreutils
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 21:09:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 17:09:31 -0400
Subject: rpms/jakarta-commons-fileupload/devel
	jakarta-commons-fileupload.spec, 1.21, 1.22
Message-ID: <200608102109.k7AL9VxV000847@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-fileupload/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv803

Modified Files:
	jakarta-commons-fileupload.spec 
Log Message:

Added missing requirements.




Index: jakarta-commons-fileupload.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jakarta-commons-fileupload.spec	10 Aug 2006 10:27:24 -0000	1.21
+++ jakarta-commons-fileupload.spec	10 Aug 2006 21:09:28 -0000	1.22
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0
-Release:        5jpp_3fc
+Release:        6jpp.1
 Summary:        Jakarta Commons Fileupload Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -77,8 +77,8 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):		coreutils
-Requires(postun):	coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -171,6 +171,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0-6jpp.1
+- Added missing requirements.
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.0-5jpp_3fc
 - Requires(post/postun): coreutils
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 21:12:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 17:12:52 -0400
Subject: rpms/concurrent/devel concurrent.spec,1.12,1.13
Message-ID: <200608102112.k7ALCqj7001584@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/concurrent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1194

Modified Files:
	concurrent.spec 
Log Message:
- Merge with upstream version:
 - Add missing requires for javadoc task
 - Add missing postun for javadoc task



Index: concurrent.spec
===================================================================
RCS file: /cvs/dist/rpms/concurrent/devel/concurrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- concurrent.spec	24 Jul 2006 04:55:46 -0000	1.12
+++ concurrent.spec	10 Aug 2006 21:12:50 -0000	1.13
@@ -36,7 +36,7 @@
 
 Name:           concurrent
 Version:        1.3.4
-Release:        3jpp_55555fc
+Release:        4jpp.1
 Epoch:          0
 Summary:        Utility classes for concurrent Java programming
 License:        Public domain
@@ -67,6 +67,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -104,6 +106,10 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
 
 %post
 %if %{gcj_support}
@@ -135,6 +141,11 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 03 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-4jpp.1
+- Merge with upstream version:
+ - Add missing requires for javadoc task
+ - Add missing postun for javadoc task
+
 * Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-3jpp-5fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 21:27:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 17:27:06 -0400
Subject: rpms/openais/devel cpg-hash-collision.patch, NONE,
	1.1 makefile-install-clm.patch, NONE, 1.1 openais.spec, 1.10, 1.11
Message-ID: <200608102127.k7ALR6UR028334@cvs.devel.redhat.com>

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28306/devel

Modified Files:
	openais.spec 
Added Files:
	cpg-hash-collision.patch makefile-install-clm.patch 
Log Message:
auto-import openais-0.80-1.2 on branch devel from openais-0.80-1.2.src.rpm

cpg-hash-collision.patch:
 cpg.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE cpg-hash-collision.patch ---
>From openais-bounces at lists.osdl.org Thu Aug 10 09:40:01 2006
Return-Path: <openais-bounces at lists.osdl.org>
Received: from localhost.localdomain ([unix socket]) by
	pobox.corp.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with
	LMTPA; Thu, 10 Aug 2006 09:40:01 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254]) by localhost.localdomain (8.13.1/8.12.8) with ESMTP id
	k7ADe1G9028844; Thu, 10 Aug 2006 09:40:01 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32]) by
	int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k7ADe0TG021303; Thu, 10 Aug 2006 09:40:00 -0400
Received: from smtp.osdl.org (smtp.osdl.org [65.172.181.4]) by
	mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k7ADdloZ004053; Thu, 10 Aug
	2006 09:39:53 -0400
Received: from fire-2.osdl.org (localhost [127.0.0.1]) by smtp.osdl.org
	(8.12.8/8.12.8) with ESMTP id k7ADSpnX013631; Thu, 10 Aug 2006 06:28:56
	-0700
Received: from mx1.redhat.com (mx1.redhat.com [66.187.233.31]) by
	smtp.osdl.org (8.12.8/8.12.8) with ESMTP id k7ADSlnV013627 for
	<openais at lists.osdl.org>; Thu, 10 Aug 2006 06:28:48 -0700
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254]) by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k7ADSkMt010120 for <openais at lists.osdl.org>; Thu, 10 Aug 2006 09:28:46 -0400
Received: from pobox.surrey.redhat.com (pobox.surrey.redhat.com
	[172.16.10.17]) by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with
	ESMTP id k7ADSjIC015325 for <openais at lists.osdl.org>; Thu, 10 Aug 2006
	09:28:46 -0400
Received: from [192.168.1.2] (vpn-68-1.surrey.redhat.com [10.32.68.1]) by
	pobox.surrey.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k7ADSjZC024256 for <openais at lists.osdl.org>; Thu, 10 Aug 2006 14:28:45 +0100
Message-ID: <44DB348C.4040206 at redhat.com>
Date: Thu, 10 Aug 2006 14:28:44 +0100
From: Patrick Caulfield <pcaulfie at redhat.com>
Organization: Red Hat
User-Agent: Thunderbird 1.5 (X11/20051201)
MIME-Version: 1.0
To: openais at lists.osdl.org
X-Enigmail-Version: 0.94.0.0
Received-SPF: pass (localhost is always allowed.)
X-Spam-Status: No, hits=-10.637 required=5
	tests=AWL,OSDL_HEADER_LISTID_KNOWN,OSDL_HEADER_SPF_PASS,OSDL_HEADER_SUBJECT_BRACKETED,PATCH_SUBJECT_OSDL,PATCH_UNIFIED_DIFF_OSDL
X-Spam-Checker-Version: SpamAssassin 2.63-osdl_revision__1.94__
X-MIMEDefang-Filter: osdl$Revision: 1.142 $
Subject: [Openais] [PATCH] CPG: Fix lookup bug when hashes collide
X-BeenThere: openais at lists.osdl.org
X-Mailman-Version: 2.1.8
Precedence: list
List-Id: Open SA Forum AIS Services mailing list <openais.lists.osdl.org>
List-Unsubscribe: <https://lists.osdl.org/mailman/listinfo/openais>,
	<mailto:openais-request at lists.osdl.org?subject=unsubscribe>
List-Archive: <http://lists.osdl.org/pipermail/openais>
List-Post: <mailto:openais at lists.osdl.org>
List-Help: <mailto:openais-request at lists.osdl.org?subject=help>
List-Subscribe: <https://lists.osdl.org/mailman/listinfo/openais>,
	<mailto:openais-request at lists.osdl.org?subject=subscribe>
Content-Type: text/plain; charset="iso-8859-1"
Sender: openais-bounces at lists.osdl.org
Errors-To: openais-bounces at lists.osdl.org
X-RedHat-Spam-Score: 0 
X-Evolution-Source: imap://sdake at pobox.corp.redhat.com/
Content-Transfer-Encoding: 8bit

This patch fixes a bug in cpg where get_group() will return the wrong group
info structure if there is a hash collision.

This is a bad bug that needs fixing in whitetank as well as trunk IMHO.

-- 

patrick


Index: exec/cpg.c
===================================================================
--- exec/cpg.c	(revision 1198)
+++ exec/cpg.c	(working copy)
@@ -464,12 +464,15 @@
 {
 	struct list_head *iter;
 	struct group_info *gi = NULL;
+	struct group_info *itergi;
 	uint32_t hash = jhash(name->value, name->length, 0) % GROUP_HASH_SIZE;

 	for (iter = group_lists[hash].next; iter != &group_lists[hash]; iter = iter->next) {
-		gi = list_entry(iter, struct group_info, list);
-		if (memcmp(gi->group_name.value, name->value, name->length) == 0)
+		itergi = list_entry(iter, struct group_info, list);
+		if (memcmp(itergi->group_name.value, name->value, name->length) == 0) {
+			gi = itergi;
 			break;
+		}
 	}

 	if (!gi) {
_______________________________________________
Openais mailing list
Openais at lists.osdl.org
https://lists.osdl.org/mailman/listinfo/openais

makefile-install-clm.patch:
 Makefile |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE makefile-install-clm.patch ---
diff -uNr openais-0.80/Makefile openais-0.80-new/Makefile
--- openais-0.80/Makefile	2006-07-21 13:30:29.000000000 -0700
+++ openais-0.80-new/Makefile	2006-08-10 14:01:27.000000000 -0700
@@ -108,6 +108,7 @@
 
 	cp -a lib/libais.so $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaAmf.so $(DESTDIR)$(LIBDIR)
+	cp -a lib/libSaClm.so $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaCkpt.so $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaEvt.so $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaLck.so $(DESTDIR)$(LIBDIR)
@@ -119,6 +120,7 @@
 
 	cp -a lib/libais.so.2 $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaAmf.so.2 $(DESTDIR)$(LIBDIR)
+	cp -a lib/libSaClm.so.2 $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaCkpt.so.2 $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaEvt.so.2 $(DESTDIR)$(LIBDIR)
 	cp -a lib/libSaLck.so.2 $(DESTDIR)$(LIBDIR)


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openais.spec	8 Aug 2006 16:19:31 -0000	1.10
+++ openais.spec	10 Aug 2006 21:27:04 -0000	1.11
@@ -1,7 +1,7 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
 Version: 0.80
-Release: 1.1
+Release: 1.2
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
@@ -23,6 +23,8 @@
 Patch14: revision-1191.patch
 Patch15: revision-1192.patch
 Patch16: revision-1193.patch
+Patch17: cpg-hash-collision.patch
+Patch18: makefile-install-clm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x
 Requires(pre): /usr/sbin/useradd
@@ -63,6 +65,8 @@
 %patch14 -p0
 %patch15 -p0
 %patch16 -p0
+%patch17 -p0
+%patch18 -p1
 
 %build
 # -O3 required for performance reasons
@@ -114,6 +118,7 @@
 %dir /etc/ais
 %config(noreplace) /etc/ais/openais.conf
 %config(noreplace) /etc/ais/amf.conf
+%config /etc/ld.so.conf.d/openais-*.conf
 %{_initrddir}/openais
 %dir %{_libexecdir}/lcrso
 %{_libexecdir}/lcrso/aisparser.lcrso
@@ -128,16 +133,6 @@
 %{_libexecdir}/lcrso/service_lck.lcrso
 %{_libexecdir}/lcrso/service_msg.lcrso
 %{_libexecdir}/lcrso/vsf_ykd.lcrso
-%{_mandir}/man8/openais_overview.8*
-%{_mandir}/man8/cpg_overview.8*
-%{_mandir}/man8/evs_overview.8*
-
-%files devel
-%defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/CHANGELOG
-%doc %{_docdir}/%{name}-%{version}/README.devmap
-%config /etc/ld.so.conf.d/openais-*.conf
 %dir %{_libdir}/openais
 %{_libdir}/openais/libais.so*
 %{_libdir}/openais/libcpg.so*
@@ -150,6 +145,16 @@
 %{_libdir}/openais/libSaLck.so*
 %{_libdir}/openais/libSaMsg.so*
 %{_libdir}/openais/libtotem_pg.so*
+%{_mandir}/man8/openais_overview.8*
+%{_mandir}/man8/cpg_overview.8*
+%{_mandir}/man8/evs_overview.8*
+%{_mandir}/man5/openais.conf.5*
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/CHANGELOG
+%doc %{_docdir}/%{name}-%{version}/README.devmap
 %dir %{_includedir}/openais/
 %{_includedir}/openais/cpg.h
 %{_includedir}/openais/cfg.h
@@ -176,7 +181,6 @@
 %{_includedir}/openais/service/print.h
 %{_includedir}/openais/service/swab.h
 %{_includedir}/openais/service/service.h
-%{_mandir}/man5/openais.conf.5*
 %{_mandir}/man3/cpg_dispatch.3*
 %{_mandir}/man3/cpg_fd_get.3*
 %{_mandir}/man3/cpg_finalize.3*
@@ -196,7 +200,12 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
-* Tue Aug 8 2006 Steven Dake <sdake at redhat.com>  - 0.80-1.1
+* Thu Aug 10 2006 Steven Dake <sdake at redhat.com> - 0.80-1.2
+- Move libraries to openais package.
+- Add cpg hash collision patch.
+- Add makefile install clm patch.
+
+* Tue Aug 8 2006 Steven Dake <sdake at redhat.com> - 0.80-1.1
 - New process of tracking any revisions in the upstream stable branch.
 
 * Sun Jul 23 2006 Steven Dake <sdake at redhat.com> - 0.80-1.0



From fedora-cvs-commits at redhat.com  Thu Aug 10 21:37:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 17:37:16 -0400
Subject: rpms/jakarta-commons-httpclient/devel
	jakarta-commons-httpclient.spec, 1.15, 1.16
Message-ID: <200608102137.k7ALbGRM028609@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-httpclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28596

Modified Files:
	jakarta-commons-httpclient.spec 
Log Message:

- Added missing requirements.
- Added missing postun section for javadoc.




Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jakarta-commons-httpclient.spec	22 Jul 2006 08:42:32 -0000	1.15
+++ jakarta-commons-httpclient.spec	10 Aug 2006 21:37:13 -0000	1.16
@@ -37,7 +37,7 @@
 
 Name:           jakarta-commons-httpclient
 Version:        3.0
-Release:        6jpp_2fc
+Release:        7jpp.1
 Epoch:          1
 Summary:        Jakarta Commons HTTPClient Package
 License:        Apache Software License
@@ -96,6 +96,8 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 %{summary}.
@@ -138,7 +140,7 @@
 rm -f src/test/org/apache/commons/httpclient/params/TestSSLTunnelParams.java
 
 %build
-export CLASSPATH=%(build-classpath jsse jce junit jakarta-commons-codec jakarta-commons-logging junit)
+export CLASSPATH=%(build-classpath jsse jce jakarta-commons-codec jakarta-commons-logging junit)
 ant \
   -Dbuild.sysclasspath=first \
   -Djavadoc.j2sdk.link=%{_javadocdir}/java \
@@ -182,11 +184,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}
+fi
 
 %post
 %if %{gcj_support}
@@ -228,6 +233,10 @@
 
 
 %changelog
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 1:3.0-7jpp.1
+- Added missing requirements.
+- Added missing postun section for javadoc.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:3.0-6jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 21:38:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 17:38:50 -0400
Subject: rpms/bcel/devel bcel.spec,1.22,1.23
Message-ID: <200608102138.k7ALcoTV028682@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/bcel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28667

Modified Files:
	bcel.spec 
Log Message:
- Merge with upstream version:
 - Add missing javadoc requires



Index: bcel.spec
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bcel.spec	10 Aug 2006 10:23:19 -0000	1.22
+++ bcel.spec	10 Aug 2006 21:38:47 -0000	1.23
@@ -45,7 +45,7 @@
 
 Name:           bcel
 Version:        5.1
-Release:        7jpp_334fc
+Release:        8jpp.1
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        Apache Software License
@@ -108,8 +108,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):		coreutils
-Requires(postun):	coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 %{summary}.
@@ -212,6 +212,8 @@
 %__cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 %__rm -rf docs/api
 %endif
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
+
 # samples
 %__mkdir_p %{buildroot}%{_datadir}/%{name}-%{version}
 %__cp -pr examples/* %{buildroot}%{_datadir}/%{name}-%{version}
@@ -267,6 +269,7 @@
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -279,6 +282,10 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-8jpp.1
+- Merge with upstream version:
+ - Add missing javadoc requires
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 5.1-7jpp_334fc
 - last release was 333 (typo), need to build 334 now
 - Requires(post/postun): coreutils



From fedora-cvs-commits at redhat.com  Thu Aug 10 21:45:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 17:45:47 -0400
Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.19,
	1.20
Message-ID: <200608102145.k7ALjlP0007667@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-lang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7636

Modified Files:
	jakarta-commons-lang.spec 
Log Message:

- Added missing requirements.
- Added missing postun section for javadoc.




Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jakarta-commons-lang.spec	10 Aug 2006 09:52:24 -0000	1.19
+++ jakarta-commons-lang.spec	10 Aug 2006 21:45:44 -0000	1.20
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        2.1
-Release:        4jpp_3fc
+Release:        5jpp.1
 Epoch:          0
 Summary:        Jakarta Commons Lang Package
 License:        Apache Software License
@@ -76,7 +76,8 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Requires(post):   coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -126,11 +127,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}
+fi
 
 %post
 %if %{gcj_support}
@@ -163,7 +167,11 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
-* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 2.1-4jpp_3fc
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.1-5jpp.1
+- Added missing requirements.
+- Added missing postun section for javadoc.
+
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> - 0:2.1-4jpp_3fc
 - Requires(post): coreutils
 
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.1-4jpp_2fc



From fedora-cvs-commits at redhat.com  Thu Aug 10 21:48:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 17:48:36 -0400
Subject: rpms/mockobjects/devel mockobjects.spec,1.12,1.13
Message-ID: <200608102148.k7ALmaDM015365@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/mockobjects/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13551

Modified Files:
	mockobjects.spec 
Log Message:
Rebuilt with new naming convention



Index: mockobjects.spec
===================================================================
RCS file: /cvs/dist/rpms/mockobjects/devel/mockobjects.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mockobjects.spec	22 Jul 2006 08:44:46 -0000	1.12
+++ mockobjects.spec	10 Aug 2006 21:48:34 -0000	1.13
@@ -38,7 +38,7 @@
 
 Name:		mockobjects
 Version:	0.09
-Release:	14jpp_2fc
+Release:	14jpp.3
 Epoch:		0
 Summary:	Java MockObjects package
 License:	BSD Style
@@ -457,6 +457,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0.09-14jpp.3
+- Rebuilt with new naming convention
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0.09-14jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 21:51:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 17:51:01 -0400
Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec,
	1.35, 1.36
Message-ID: <200608102151.k7ALp1kj023976@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-logging/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23822

Modified Files:
	jakarta-commons-logging.spec 
Log Message:

Added missing requirements.




Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jakarta-commons-logging.spec	10 Aug 2006 09:05:18 -0000	1.35
+++ jakarta-commons-logging.spec	10 Aug 2006 21:50:58 -0000	1.36
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0.4
-Release:        5jpp_3fc
+Release:        6jpp.1
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        Apache Software License
@@ -78,8 +78,8 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):   coreutils
-Requires(postun): coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -180,6 +180,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 0:1.0.4-6jpp.1
+- Added missing requirements.
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 0:1.0.4-5jpp_3fc
 - Require(post/postun): coreutils
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 21:58:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 17:58:44 -0400
Subject: rpms/jdepend/devel jdepend.spec,1.17,1.18
Message-ID: <200608102158.k7ALwiZk026415@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jdepend/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26358

Modified Files:
	jdepend.spec 
Log Message:
- Merge with upstream version
 - Add missing javadoc post and postun
 - Add missing javadoc requires



Index: jdepend.spec
===================================================================
RCS file: /cvs/dist/rpms/jdepend/devel/jdepend.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jdepend.spec	22 Jul 2006 08:43:34 -0000	1.17
+++ jdepend.spec	10 Aug 2006 21:58:42 -0000	1.18
@@ -36,7 +36,7 @@
 
 Name:		jdepend
 Version:	2.6
-Release:	5jpp_2fc
+Release:	6jpp.1
 Epoch:		0
 Summary:        Java Design Quality Metrics
 License:        Clarkware License
@@ -96,6 +96,7 @@
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 rm -rf docs/api
 # demo
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -124,6 +125,16 @@
 fi
 %endif
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}
+fi
+
+
 %files
 %defattr(-,root,root)
 %doc README LICENSE docs
@@ -136,12 +147,18 @@
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 %files demo
 %defattr(-,root,root)
 %{_datadir}/%{name}
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:2.6-6jpp.1
+- Merge with upstream version
+ - Add missing javadoc post and postun
+ - Add missing javadoc requires
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.6-5jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 22:01:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 18:01:32 -0400
Subject: rpms/jrefactory/devel jrefactory.spec,1.11,1.12
Message-ID: <200608102201.k7AM1WcT027273@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jrefactory/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27166

Modified Files:
	jrefactory.spec 
Log Message:

Changed release to match new spec.




Index: jrefactory.spec
===================================================================
RCS file: /cvs/dist/rpms/jrefactory/devel/jrefactory.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jrefactory.spec	22 Jul 2006 08:44:03 -0000	1.11
+++ jrefactory.spec	10 Aug 2006 22:01:29 -0000	1.12
@@ -36,7 +36,7 @@
 
 Name:		jrefactory
 Version:	2.8.9
-Release:	6jpp_2fc
+Release:	6jpp.3
 Epoch:		0
 Summary:	JRefactory and Pretty Print
 License:	Apache Software License
@@ -119,6 +119,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.8.9-6jpp.3
+- Changed release to match new spec.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.8.9-6jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 22:06:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 18:06:13 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.309,1.310
Message-ID: <200608102206.k7AM6DKk028292@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
Bump release.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- eclipse.spec	10 Aug 2006 19:24:51 -0000	1.309
+++ eclipse.spec	10 Aug 2006 22:06:10 -0000	1.310
@@ -41,7 +41,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_10fc
+Release:        1jpp_11fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1641,7 +1641,7 @@
 %endif
 
 %changelog
-* Thu Aug 10 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1rh
+* Thu Aug 10 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_11fc
 - Fix eclipse-tomcat55.patch and eclipse-tomcat55-build.patch to not reference
   jars that don't exist.
 - Fix rebuild-sdk-features to work with 3.2.x feature versions.



From fedora-cvs-commits at redhat.com  Thu Aug 10 22:30:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 18:30:27 -0400
Subject: rpms/libwnck/devel libwnck.spec,1.52,1.53
Message-ID: <200608102230.k7AMURXZ016794@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16710

Modified Files:
	libwnck.spec 
Log Message:
* Thu Aug 10 2006 Kristian H??gsberg <krh at redhat.com> - 2.15.90-1.fc5.aiglx
- Build for fc5 aiglx repo.



Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- libwnck.spec	3 Aug 2006 12:56:37 -0000	1.52
+++ libwnck.spec	10 Aug 2006 22:30:24 -0000	1.53
@@ -6,7 +6,7 @@
 Summary: Window Navigator Construction Kit
 Name: libwnck
 Version: 2.15.90
-Release: 1%{?dist}
+Release: 1.fc5.aiglx
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -26,6 +26,8 @@
 BuildRequires:  perl-XML-Parser
 BuildRequires:  gettext
 
+Patch100: libwnck-2.14.0-window-move.patch
+
 %description
 
 libwnck (pronounced "libwink") is used to implement pagers, tasklists, 
@@ -53,6 +55,8 @@
 %prep
 %setup -q
 
+%patch100 -p1 -b .window-move
+
 %build
 
 %configure
@@ -90,6 +94,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Thu Aug 10 2006 Kristian H??gsberg <krh at redhat.com> - 2.15.90-1.fc5.aiglx
+- Build for fc5 aiglx repo.
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 22:35:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 18:35:46 -0400
Subject: rpms/junit/devel junit.spec,1.22,1.23
Message-ID: <200608102235.k7AMZkaS018033@cvs.devel.redhat.com>

Author: dbhole

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

Modified Files:
	junit.spec 
Log Message:

Added missing requirements.




Index: junit.spec
===================================================================
RCS file: /cvs/dist/rpms/junit/devel/junit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- junit.spec	10 Aug 2006 09:09:12 -0000	1.22
+++ junit.spec	10 Aug 2006 22:35:41 -0000	1.23
@@ -36,7 +36,7 @@
 
 Name:		junit
 Version:	3.8.2
-Release:	2jpp_3fc
+Release:	3jpp.1
 Epoch:		0
 Summary:	Java regression test package
 License:	Common Public License
@@ -74,8 +74,8 @@
 %package javadoc
 Group:		Development/Documentation
 Summary:	Javadoc for %{name}
-Requires(post):   coreutils
-Requires(postun): coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -194,6 +194,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> -  0:3.8.2-3jpp.1
+- Added missing requirements.
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 0:3.8.2-2jpp_3fc
 - Require(post/postun): coreutils
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 22:36:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 18:36:07 -0400
Subject: rpms/libwnck/devel libwnck.spec,1.53,1.54
Message-ID: <200608102236.k7AMa724018162@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18136

Modified Files:
	libwnck.spec 
Log Message:
Back out unintended patch.


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- libwnck.spec	10 Aug 2006 22:30:24 -0000	1.53
+++ libwnck.spec	10 Aug 2006 22:36:04 -0000	1.54
@@ -26,8 +26,6 @@
 BuildRequires:  perl-XML-Parser
 BuildRequires:  gettext
 
-Patch100: libwnck-2.14.0-window-move.patch
-
 %description
 
 libwnck (pronounced "libwink") is used to implement pagers, tasklists, 
@@ -55,8 +53,6 @@
 %prep
 %setup -q
 
-%patch100 -p1 -b .window-move
-
 %build
 
 %configure



From fedora-cvs-commits at redhat.com  Thu Aug 10 23:05:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 19:05:22 -0400
Subject: rpms/cryptix/devel cryptix.spec,1.9,1.10
Message-ID: <200608102305.k7AN5LTE008235@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/cryptix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8128

Modified Files:
	cryptix.spec 
Log Message:
- Merge with upstream version
 - Add missing javadoc post and postun
 - Add missing javadoc requires



Index: cryptix.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptix/devel/cryptix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cryptix.spec	22 Jul 2006 08:37:36 -0000	1.9
+++ cryptix.spec	10 Aug 2006 23:05:04 -0000	1.10
@@ -38,7 +38,7 @@
 
 Name:		cryptix
 Version:	3.2.0
-Release:	8jpp_2fc
+Release:	9jpp.1
 Epoch:		0
 Summary:	Java crypto package
 License:	BSD style
@@ -67,6 +67,8 @@
 %package javadoc
 Group:		Development/Documentation
 Summary:	Javadoc for %{name}
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -93,6 +95,7 @@
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -101,6 +104,15 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}
+fi
+
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -129,12 +141,18 @@
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 3.2.0-9jpp.1
+- Merge with upstream version:
+ - Add missing javadoc post and unpost
+ - Add missing javadoc requires
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-8jpp_2fc
 - Rebuilt
 
-* Wed Jul 19 2006 Matt Weinge <mwringe at redhat.com> 3.2.0-8jpp_1rh
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> 3.2.0-8jpp_1rh
 - Merged with upstream verison.
 
 * Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> 3.2.0-8jpp



From fedora-cvs-commits at redhat.com  Thu Aug 10 23:06:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 19:06:36 -0400
Subject: rpms/struts/devel struts.spec,1.39,1.40
Message-ID: <200608102306.k7AN6afT008541@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8500

Modified Files:
	struts.spec 
Log Message:

Added post/postun for javadoc.




Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- struts.spec	26 Jul 2006 20:55:16 -0000	1.39
+++ struts.spec	10 Aug 2006 23:06:33 -0000	1.40
@@ -7,7 +7,7 @@
 
 Name:		struts
 Version:	1.2.8
-Release: 	2jpp_16fc
+Release: 	2jpp.17
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -83,6 +83,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Java
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -159,6 +161,15 @@
 
 aot-compile-rpm
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %post
 %{_bindir}/rebuild-gcj-db
 
@@ -210,6 +221,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 1.2.8-2jpp.17
+- Added post/postun for javadoc.
+
 * Wed Jul 26 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_16fc
 - Remove xalan-j2-serializer from classpath.
 - Added missing BR for xhtml1-dtds.



From fedora-cvs-commits at redhat.com  Thu Aug 10 23:20:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 19:20:23 -0400
Subject: rpms/avalon-framework/devel avalon-framework.spec,1.19,1.20
Message-ID: <200608102320.k7ANKNcb026476@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/avalon-framework/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26389

Modified Files:
	avalon-framework.spec 
Log Message:
- Add missing javadoc requires



Index: avalon-framework.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-framework/devel/avalon-framework.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- avalon-framework.spec	22 Jul 2006 08:35:25 -0000	1.19
+++ avalon-framework.spec	10 Aug 2006 23:20:15 -0000	1.20
@@ -7,7 +7,7 @@
 
 Name:		avalon-%{short_name}
 Version:	4.1.4
-Release:	2jpp_12fc
+Release:	2jpp.13
 Epoch:		0
 Summary:	Java components interfaces
 License:	Apache Software License
@@ -52,7 +52,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Prereq: coreutils
+Requires(post):  /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -128,6 +129,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:4.1.4-2jpp.13
+- Add missing javadoc requires
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:4.1.4-2jpp_12fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 23:21:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 19:21:46 -0400
Subject: rpms/wsdl4j/devel wsdl4j.spec,1.13,1.14
Message-ID: <200608102321.k7ANLkxt026873@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/wsdl4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26829

Modified Files:
	wsdl4j.spec 
Log Message:

Added missing requirements.




Index: wsdl4j.spec
===================================================================
RCS file: /cvs/dist/rpms/wsdl4j/devel/wsdl4j.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wsdl4j.spec	22 Jul 2006 08:46:09 -0000	1.13
+++ wsdl4j.spec	10 Aug 2006 23:21:44 -0000	1.14
@@ -39,7 +39,7 @@
 Summary:        Web Services Description Language Toolkit for Java
 Name:           wsdl4j
 Version:        1.5.2
-Release:        3jpp_2jpp
+Release:        4jpp.1
 Epoch:          0
 Group:          Text Processing/Markup/XML
 License:        IBM Common Public License
@@ -71,6 +71,8 @@
 %package javadoc
 Group:          Development/Documentation
 Summary:        Javadoc for %{name}
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -150,6 +152,9 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 1.5.2-4jpp.1
+- Added missing requirements.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.5.2-3jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 23:31:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 19:31:33 -0400
Subject: rpms/xjavadoc/devel xjavadoc.spec,1.14,1.15
Message-ID: <200608102331.k7ANVWl7029881@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/xjavadoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29829

Modified Files:
	xjavadoc.spec 
Log Message:

- Added missing postun section for javadoc.
- Added missing requirements.




Index: xjavadoc.spec
===================================================================
RCS file: /cvs/dist/rpms/xjavadoc/devel/xjavadoc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xjavadoc.spec	24 Jul 2006 05:26:39 -0000	1.14
+++ xjavadoc.spec	10 Aug 2006 23:31:29 -0000	1.15
@@ -36,7 +36,7 @@
 
 Name:		xjavadoc
 Version:	1.1
-Release:	3jpp_1fc
+Release:	4jpp.1
 Epoch:		0
 Summary:	The XJavaDoc engine
 License:	BSD Style
@@ -91,6 +91,8 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 %{summary}.
@@ -150,6 +152,11 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -181,6 +188,10 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 1.1-4jpp.1
+- Added missing postun section for javadoc.
+- Added missing requirements.
+
 * Mon Jul 24 2006 Deepak Bhole <dbhole at redhat.com> 1.1-3jpp_1fc
 - Added conditional native compilation.
 - BR fixes.



From fedora-cvs-commits at redhat.com  Thu Aug 10 23:36:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 19:36:13 -0400
Subject: rpms/javacc/devel javacc.spec,1.19,1.20
Message-ID: <200608102336.k7ANaD7W030966@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/javacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30900

Modified Files:
	javacc.spec 
Log Message:
- Rebuilt with new naming convention



Index: javacc.spec
===================================================================
RCS file: /cvs/dist/rpms/javacc/devel/javacc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- javacc.spec	22 Jul 2006 08:43:22 -0000	1.19
+++ javacc.spec	10 Aug 2006 23:36:09 -0000	1.20
@@ -36,7 +36,7 @@
 
 Name:           javacc
 Version:        4.0
-Release:        3jpp_2fc
+Release:        3jpp.3
 Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
@@ -146,6 +146,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:4.0-3jpp.3
+- Rebuilt with new naming convention
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:4.0-3jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 23:45:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 19:45:35 -0400
Subject: rpms/kernel/devel linux-2.6-build-deprecate-configh-include.patch,
	1.2, 1.3
Message-ID: <200608102345.k7ANjZED000753@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-build-deprecate-configh-include.patch 
Log Message:
another common source of noise

linux-2.6-build-deprecate-configh-include.patch:
 linux-2.6.17.noarch/include/asm-i386/dwarf2.h    |    2 --
 linux-2.6.17.noarch/include/asm-i386/tsc.h       |    1 -
 linux-2.6.17.noarch/include/asm-x86_64/calgary.h |    1 -
 linux-2.6.17.noarch/include/linux/config.h       |    1 +
 linux-2.6.17.noarch/include/linux/vmstat.h       |    1 -
 linux-2.6/net/atm/atm_sysfs.c                    |    1 -
 linux-2.6/net/core/dev_mcast.c                   |    3 +--
 linux-2.6/net/core/wireless.c                    |    1 -
 linux-2.6/net/ipv4/af_inet.c                     |    1 -
 linux-2.6/net/ipv4/ipconfig.c                    |    1 -
 linux-2.6/net/ipv4/netfilter/ip_conntrack_sip.c  |    1 -
 linux-2.6/net/ipv4/raw.c                         |    3 +--
 linux-2.6/net/ipv4/tcp_lp.c                      |    1 -
 linux-2.6/net/ipv4/tcp_veno.c                    |    1 -
 14 files changed, 3 insertions(+), 16 deletions(-)

Index: linux-2.6-build-deprecate-configh-include.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-deprecate-configh-include.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-build-deprecate-configh-include.patch	10 Aug 2006 20:20:55 -0000	1.2
+++ linux-2.6-build-deprecate-configh-include.patch	10 Aug 2006 23:45:32 -0000	1.3
@@ -133,3 +133,13 @@
  #include <asm/uaccess.h>
  #include <asm/system.h>
  #include <linux/bitops.h>
+--- linux-2.6.17.noarch/include/linux/vmstat.h~	2006-08-10 19:43:49.000000000 -0400
++++ linux-2.6.17.noarch/include/linux/vmstat.h	2006-08-10 19:43:54.000000000 -0400
+@@ -3,7 +3,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/percpu.h>
+-#include <linux/config.h>
+ #include <linux/mmzone.h>
+ #include <asm/atomic.h>
+ 



From fedora-cvs-commits at redhat.com  Thu Aug 10 23:51:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 19:51:39 -0400
Subject: rpms/kernel/devel git-gregkh.patch,1.4,1.5
Message-ID: <200608102351.k7ANpd6r017942@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	git-gregkh.patch 
Log Message:
another update

git-gregkh.patch:
 b/Makefile                                    |   23 +
 b/arch/arm/common/rtctime.c                   |    1 
 b/arch/arm/mach-ixp4xx/common-pci.c           |    2 
 b/arch/arm/mach-ixp4xx/gtwx5715-setup.c       |    7 
 b/drivers/ide/pci/generic.c                   |   30 +
 b/drivers/media/dvb/bt8xx/dst.c               |   58 +--
 b/drivers/media/dvb/dvb-core/Makefile         |    6 
 b/drivers/media/radio/Kconfig                 |   12 
 b/drivers/media/radio/Makefile                |    1 
 b/drivers/media/radio/dsbr100.c               |  430 ++++++++++++++++++++++++++
 b/drivers/media/video/Kconfig                 |   12 
 b/drivers/media/video/Makefile                |    2 
 b/drivers/media/video/compat_ioctl32.c        |   32 +
 b/drivers/media/video/cx25840/cx25840-core.c  |    4 
 b/drivers/media/video/cx88/cx88-video.c       |    4 
 b/drivers/media/video/msp3400-kthreads.c      |    4 
 b/drivers/media/video/pwc/Kconfig             |    2 
 b/drivers/media/video/pwc/pwc-if.c            |    1 
 b/drivers/media/video/saa7134/saa7134-video.c |    2 
 b/drivers/media/video/tuner-types.c           |   14 
 b/drivers/media/video/v4l1-compat.c           |    4 
 b/drivers/media/video/v4l2-common.c           |    6 
 b/drivers/media/video/videodev.c              |    2 
 b/drivers/media/video/vivi.c                  |    4 
 b/drivers/mmc/mmc_queue.c                     |    3 
 b/drivers/mmc/wbsd.c                          |    9 
 b/drivers/net/myri10ge/myri10ge.c             |    2 
 b/drivers/net/tg3.c                           |   51 +--
 b/drivers/net/tg3.h                           |    8 
 b/drivers/s390/char/tape_class.c              |    2 
 b/drivers/s390/cio/device_fsm.c               |    1 
 b/drivers/s390/cio/device_ops.c               |    3 
 b/drivers/scsi/arm/Kconfig                    |    3 
 b/drivers/scsi/arm/scsi.h                     |    2 
 b/drivers/scsi/ata_piix.c                     |    5 
 b/drivers/scsi/libata-core.c                  |   34 --
 b/drivers/scsi/libata-scsi.c                  |   13 
 b/drivers/scsi/sata_sil24.c                   |    1 
 b/fs/jfs/inode.c                              |   16 
 b/fs/jfs/jfs_inode.h                          |    1 
 b/fs/jfs/super.c                              |  118 ++++++-
 b/fs/xfs/xfs_alloc.c                          |  103 +++---
 b/include/linux/skbuff.h                      |    4 
 b/include/media/v4l2-dev.h                    |    2 
 b/net/core/dst.c                              |    3 
 b/net/core/pktgen.c                           |    4 
 b/net/core/rtnetlink.c                        |   15 
 b/net/core/skbuff.c                           |    4 
 b/net/core/wireless.c                         |   24 +
 b/net/ipv4/route.c                            |    2 
 b/net/ipv4/tcp_output.c                       |   12 
 b/net/ipv6/addrconf.c                         |    4 
 b/net/ipx/af_ipx.c                            |   10 
 b/sound/oss/Kconfig                           |    6 
 b/sound/pci/Kconfig                           |   70 ++--
 b/usr/Makefile                                |    3 
 drivers/media/video/dsbr100.c                 |  430 --------------------------
 57 files changed, 934 insertions(+), 697 deletions(-)

Index: git-gregkh.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-gregkh.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- git-gregkh.patch	10 Aug 2006 19:12:08 -0000	1.4
+++ git-gregkh.patch	10 Aug 2006 23:51:36 -0000	1.5
@@ -1,3 +1,17 @@
+commit c4e321b85a89d7cd392d3105b2c033a6c58ed337
+Merge: f8872f4... dd2c609...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date:   Thu Aug 10 15:10:01 2006 -0700
+
+    Merge gregkh at master.kernel.org:/home/rmk/linux-2.6-mmc
+
+commit f8872f4cb4b58f06a27d0443668d12d49f3b5d31
+Merge: 99baa75... 574dc0a...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date:   Thu Aug 10 15:07:17 2006 -0700
+
+    Merge gregkh at master.kernel.org:/home/rmk/linux-2.6-arm
+
 commit 99baa75231e35aca41b9718adfb07f45ce40e84c
 Merge: fff6425... 0e1edbd...
 Author: Greg Kroah-Hartman <gregkh at suse.de>
@@ -597,6 +611,17 @@
     Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
     Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
 
+commit dd2c609c59cd9daeb90d58f3d1bc3813e8987df1
+Author: Pierre Ossman <drzeus at drzeus.cx>
+Date:   Mon Aug 7 01:40:04 2006 +0200
+
+    [MMC] Another stray 'io' reference
+    
+    Another misuse of the global 'io' variable instead of the local 'base'.
+    
+    Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
+    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+
 commit dbd43d08642c037beb937c2670976c076120507b
 Merge: c34c07d... 9f73763...
 Author: Greg Kroah-Hartman <gregkh at suse.de>
@@ -604,6 +629,105 @@
 
     Merge branch 'master' of /home/greg/linux/git/torvalds-2.6/
 
+commit 916f3ac680fcc4c142e9acd46161f55533b11760
+Author: Pierre Ossman <drzeus at drzeus.cx>
+Date:   Sun Aug 6 22:22:23 2006 +0200
+
+    [MMC] Fix base address configuration in wbsd
+    
+    There were some confusion about base I/O variables in the wbsd driver.
+    Seems like things have been working on shear luck so far. The global 'io'
+    variable (used when manually configuring the resources) was used instead of
+    the local 'base' variable.
+    
+    Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
+    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+
+commit 574dc0abab6650c5371df15ac708e48fa25bed89
+Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
+Date:   Sun Aug 6 20:55:33 2006 +0100
+
+    [ARM] Fix Acorn platform SCSI driver build failures
+    
+    SCSI folk forgot to fix up all the uses of 'buffer' before deleting
+    this struct member.  Do it for them to rescue the resulting build
+    failures.
+    
+    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+
+commit ca8c100a00e91cf93782008441a2e159c4b49a25
+Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
+Date:   Sun Aug 6 20:53:40 2006 +0100
+
+    [ARM] Fix NCR5380-based SCSI card build
+    
+    The NCR5380-based SCSI cards need the SCSI SPI transport selected
+    to build correctly.
+    
+    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+
+commit 8832157bff28e6559fd38fc18433f8bd8803340a
+Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
+Date:   Sun Aug 6 11:00:45 2006 +0100
+
+    [ARM] Fix pci export warnings
+    
+    Remove duplicate PCI exports from ixp4xx machine class.
+    
+    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+
+commit 4c756f4e954186630f6ee91a4da9a4b39fe3618d
+Author: Martin Michlmayr <tbm at cyrius.com>
+Date:   Sun Aug 6 09:59:26 2006 +0100
+
+    [ARM] 3747/1: Fix compilation error in mach-ixp4xx/gtwx5715-setup.c
+    
+    Patch from Martin Michlmayr
+    
+    Fix the following compilation error in arm/mach-ixp4xx/gtwx5715-setup:
+    
+      CC      arch/arm/mach-ixp4xx/gtwx5715-setup.o
+    arch/arm/mach-ixp4xx/gtwx5715-setup.c:110: error: expected identifier or '(' before ?=? token
+    arch/arm/mach-ixp4xx/gtwx5715-setup.c:121: error: 'gtwx5715_flash_resource' undeclared here (not in a function)
+    arch/arm/mach-ixp4xx/gtwx5715-setup.c: In function 'gtwx5715_init':
+    arch/arm/mach-ixp4xx/gtwx5715-setup.c:133: error: 'flash_resource' undeclared (first use in this function)
+    arch/arm/mach-ixp4xx/gtwx5715-setup.c:133: error: (Each undeclared identifier is reported only once
+    arch/arm/mach-ixp4xx/gtwx5715-setup.c:133: error: for each function it appears in.)
+    make[1]: *** [arch/arm/mach-ixp4xx/gtwx5715-setup.o] Error 1
+    
+    Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+
+commit b39239330858bc99b4d529923ec58e95ff6103f8
+Author: George G. Davis <davis_g at mvista.com>
+Date:   Sun Aug 6 09:59:25 2006 +0100
+
+    [ARM] 3745/1: Add EXPORT_SYMBOL(rtc_next_alarm_time) to ARM rtctime.c
+    
+    Patch from George G. Davis
+    
+    Fix "WARNING: "rtc_next_alarm_time" [drivers/rtc/rtc-sa1100.ko]
+    undefined!"
+    
+    Signed-off-by: George G. Davis <gdavis at mvista.com>
+    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+
+commit c723e08af18e60cda3bbc90e0d6fb688587aeb9f
+Author: Juha [??l? <juha.yrjola at solidboot.com>
+Date:   Sun Aug 6 09:58:22 2006 +0100
+
+    [ARM] 3744/1: MMC: mmcqd gets stuck when block queue is plugged
+    
+    Patch from Juha [??l?
+    
+    When the block queue is plugged, mq->req must be set to NULL.
+    Otherwise mq->req might be left non-NULL, even though mmcqd is
+    not processing a request, thus preventing the MMC queue thread from
+    being woken up when new requests do arrive.
+    
+    Signed-off-by: Juha Yrjola <juha.yrjola at solidboot.com>
+    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+
 commit c34c07d6946ec8969fa71ba03dbb95091f4eb9d3
 Merge: bce8969... 558e10a...
 Author: Greg Kroah-Hartman <gregkh at suse.de>
@@ -742,6 +866,9 @@
     Signed-off-by: Dave Kleikamp <shaggy at austin.ibm.com>
 
  b/Makefile                                    |   24 +
+ b/arch/arm/common/rtctime.c                   |    1 
+ b/arch/arm/mach-ixp4xx/common-pci.c           |    2 
+ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c       |    7 
  b/drivers/ide/pci/generic.c                   |   30 +
  b/drivers/media/dvb/bt8xx/dst.c               |   58 +--
  b/drivers/media/dvb/dvb-core/Makefile         |    6 
@@ -762,12 +889,16 @@
  b/drivers/media/video/v4l2-common.c           |    6 
  b/drivers/media/video/videodev.c              |    2 
  b/drivers/media/video/vivi.c                  |    4 
+ b/drivers/mmc/mmc_queue.c                     |    3 
+ b/drivers/mmc/wbsd.c                          |    9 
  b/drivers/net/myri10ge/myri10ge.c             |    2 
  b/drivers/net/tg3.c                           |   51 +--
  b/drivers/net/tg3.h                           |    8 
  b/drivers/s390/char/tape_class.c              |    2 
  b/drivers/s390/cio/device_fsm.c               |    1 
  b/drivers/s390/cio/device_ops.c               |    3 
+ b/drivers/scsi/arm/Kconfig                    |    3 
+ b/drivers/scsi/arm/scsi.h                     |    2 
  b/drivers/scsi/ata_piix.c                     |    5 
  b/drivers/scsi/libata-core.c                  |   34 --
  b/drivers/scsi/libata-scsi.c                  |   13 
@@ -791,7 +922,7 @@
  b/sound/pci/Kconfig                           |   70 ++--
  b/usr/Makefile                                |    3 
  drivers/media/video/dsbr100.c                 |  430 --------------------------
- 50 files changed, 920 insertions(+), 685 deletions(-)
+ 57 files changed, 934 insertions(+), 698 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index c2f78a5..c53ed56 100644
@@ -845,6 +976,57 @@
  
  # The all: target is the default when no target is given on the
  # command line.
+diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c
+index 35c9a64..4e5445c 100644
+--- a/arch/arm/common/rtctime.c
++++ b/arch/arm/common/rtctime.c
+@@ -68,6 +68,7 @@ void rtc_next_alarm_time(struct rtc_time
+ 		rtc_time_to_tm(next_time, next);
+ 	}
+ }
++EXPORT_SYMBOL(rtc_next_alarm_time);
+ 
+ static inline int rtc_arm_read_time(struct rtc_ops *ops, struct rtc_time *tm)
+ {
+diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
+index 2d40fe1..9562177 100644
+--- a/arch/arm/mach-ixp4xx/common-pci.c
++++ b/arch/arm/mach-ixp4xx/common-pci.c
+@@ -532,8 +532,6 @@ pci_set_consistent_dma_mask(struct pci_d
+ 	return -EIO;
+ }
+ 
+-EXPORT_SYMBOL(pci_set_dma_mask);
+-EXPORT_SYMBOL(pci_set_consistent_dma_mask);
+ EXPORT_SYMBOL(ixp4xx_pci_read);
+ EXPORT_SYMBOL(ixp4xx_pci_write);
+ 
+diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+index 654e2ee..30f1300 100644
+--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
++++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+@@ -107,9 +107,9 @@ static struct flash_platform_data gtwx57
+ 	.width		= 2,
+ };
+ 
+-static struct gtw5715_flash_resource = {
++static struct resource gtwx5715_flash_resource = {
+ 	.flags		= IORESOURCE_MEM,
+-}
++};
+ 
+ static struct platform_device gtwx5715_flash = {
+ 	.name		= "IXP4XX-Flash",
+@@ -130,9 +130,6 @@ static void __init gtwx5715_init(void)
+ {
+ 	ixp4xx_sys_init();
+ 
+-	if (!flash_resource)
+-		printk(KERN_ERR "Could not allocate flash resource\n");
+-
+ 	gtwx5715_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
+ 	gtwx5715_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_8M - 1;
+ 
 diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
 index 2f962cf..78810ba 100644
 --- a/drivers/ide/pci/generic.c
@@ -2447,6 +2629,66 @@
  	.vidiocgmbuf          = vidiocgmbuf,
  #endif
  	.tvnorms              = tvnorms,
+diff --git a/drivers/mmc/mmc_queue.c b/drivers/mmc/mmc_queue.c
+index 0b9682e..74f8cde 100644
+--- a/drivers/mmc/mmc_queue.c
++++ b/drivers/mmc/mmc_queue.c
+@@ -79,7 +79,8 @@ static int mmc_queue_thread(void *d)
+ 		spin_lock_irq(q->queue_lock);
+ 		set_current_state(TASK_INTERRUPTIBLE);
+ 		if (!blk_queue_plugged(q))
+-			mq->req = req = elv_next_request(q);
++			req = elv_next_request(q);
++		mq->req = req;
+ 		spin_unlock_irq(q->queue_lock);
+ 
+ 		if (!req) {
+diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
+index 8a30ef3..c351c6d 100644
+--- a/drivers/mmc/wbsd.c
++++ b/drivers/mmc/wbsd.c
+@@ -41,7 +41,7 @@ #include <asm/scatterlist.h>
+ #include "wbsd.h"
+ 
+ #define DRIVER_NAME "wbsd"
+-#define DRIVER_VERSION "1.5"
++#define DRIVER_VERSION "1.6"
+ 
+ #define DBG(x...) \
+ 	pr_debug(DRIVER_NAME ": " x)
+@@ -1439,13 +1439,13 @@ static int __devinit wbsd_scan(struct wb
+ 
+ static int __devinit wbsd_request_region(struct wbsd_host *host, int base)
+ {
+-	if (io & 0x7)
++	if (base & 0x7)
+ 		return -EINVAL;
+ 
+ 	if (!request_region(base, 8, DRIVER_NAME))
+ 		return -EIO;
+ 
+-	host->base = io;
++	host->base = base;
+ 
+ 	return 0;
+ }
+@@ -1773,7 +1773,7 @@ static int __devinit wbsd_init(struct de
+ 	/*
+ 	 * Request resources.
+ 	 */
+-	ret = wbsd_request_resources(host, io, irq, dma);
++	ret = wbsd_request_resources(host, base, irq, dma);
+ 	if (ret) {
+ 		wbsd_release_resources(host);
+ 		wbsd_free_mmc(dev);
+@@ -1861,6 +1861,7 @@ static void __devexit wbsd_shutdown(stru
+ 
+ static int __devinit wbsd_probe(struct platform_device *dev)
+ {
++	/* Use the module parameters for resources */
+ 	return wbsd_init(&dev->dev, io, irq, dma, 0);
+ }
+ 
 diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
 index 06440a8..9bdd43a 100644
 --- a/drivers/net/myri10ge/myri10ge.c
@@ -2670,6 +2912,47 @@
  	else if ((irb->scsw.dstat !=
  		  (DEV_STAT_CHN_END|DEV_STAT_DEV_END)) ||
  		 (irb->scsw.cstat != 0)) {
+diff --git a/drivers/scsi/arm/Kconfig b/drivers/scsi/arm/Kconfig
+index 06d7601..d006a8c 100644
+--- a/drivers/scsi/arm/Kconfig
++++ b/drivers/scsi/arm/Kconfig
+@@ -69,6 +69,7 @@ comment "The following drivers are not f
+ config SCSI_CUMANA_1
+ 	tristate "CumanaSCSI I support (EXPERIMENTAL)"
+ 	depends on ARCH_ACORN && EXPERIMENTAL && SCSI
++	select SCSI_SPI_ATTRS
+ 	help
+ 	  This enables support for the Cumana SCSI I card. If you have an
+ 	  Acorn system with one of these, say Y. If unsure, say N.
+@@ -76,6 +77,7 @@ config SCSI_CUMANA_1
+ config SCSI_ECOSCSI
+ 	tristate "EcoScsi support (EXPERIMENTAL)"
+ 	depends on ARCH_ACORN && EXPERIMENTAL && (ARCH_ARC || ARCH_A5K) && SCSI
++	select SCSI_SPI_ATTRS
+ 	help
+ 	  This enables support for the EcoSCSI card -- a small card that sits
+ 	  in the Econet socket. If you have an Acorn system with one of these,
+@@ -84,6 +86,7 @@ config SCSI_ECOSCSI
+ config SCSI_OAK1
+ 	tristate "Oak SCSI support (EXPERIMENTAL)"
+ 	depends on ARCH_ACORN && EXPERIMENTAL && SCSI
++	select SCSI_SPI_ATTRS
+ 	help
+ 	  This enables support for the Oak SCSI card. If you have an Acorn
+ 	  system with one of these, say Y. If unsure, say N.
+diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h
+index 6dd544a..8c2600f 100644
+--- a/drivers/scsi/arm/scsi.h
++++ b/drivers/scsi/arm/scsi.h
+@@ -74,7 +74,7 @@ static inline void init_SCp(Scsi_Cmnd *S
+ 		unsigned long len = 0;
+ 		int buf;
+ 
+-		SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->buffer;
++		SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->request_buffer;
+ 		SCpnt->SCp.buffers_residual = SCpnt->use_sg - 1;
+ 		SCpnt->SCp.ptr = (char *)
+ 			 (page_address(SCpnt->SCp.buffer->page) +
 diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
 index 19745a3..5e8afc8 100644
 --- a/drivers/scsi/ata_piix.c



From fedora-cvs-commits at redhat.com  Thu Aug 10 23:52:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 19:52:12 -0400
Subject: rpms/xml-commons-resolver/devel xml-commons-resolver.spec, 1.14,
	1.15
Message-ID: <200608102352.k7ANqCRp018151@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/xml-commons-resolver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18099

Modified Files:
	xml-commons-resolver.spec 
Log Message:

Added missing dependencies.




Index: xml-commons-resolver.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons-resolver/devel/xml-commons-resolver.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xml-commons-resolver.spec	22 Jul 2006 08:46:51 -0000	1.14
+++ xml-commons-resolver.spec	10 Aug 2006 23:52:09 -0000	1.15
@@ -7,7 +7,7 @@
 
 Name:           xml-commons-resolver
 Version:        1.1
-Release: 	    1jpp_11fc
+Release: 	    1jpp.12
 Epoch:          0
 Summary:        Resolver subproject of xml-commons.
 License:        Apache Software License
@@ -40,7 +40,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -133,6 +134,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 1.1-1jpp.12
+- Added missing dependencies.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.1-1jpp_11fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Aug 10 23:52:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 19:52:26 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2545,1.2546
Message-ID: <200608102352.k7ANqQ2w018289@cvs.devel.redhat.com>

Author: davej

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

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


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2545
retrieving revision 1.2546
diff -u -r1.2545 -r1.2546
--- kernel-2.6.spec	10 Aug 2006 19:12:09 -0000	1.2545
+++ kernel-2.6.spec	10 Aug 2006 23:52:23 -0000	1.2546
@@ -1699,7 +1699,7 @@
 %changelog
 * Thu Aug 10 2006 Dave Jones <davej at redhat.com>
 - GFS2/DLM update.
-- Daily GregKH updates.
+- Daily GregKH updates
 
 * Wed Aug  9 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace_regset nits breaking s390.



From fedora-cvs-commits at redhat.com  Fri Aug 11 00:01:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 20:01:57 -0400
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.6.1-xpress-200.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.37, 1.38
Message-ID: <200608110001.k7B01vG4021350@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.6.1-xpress-200.patch 
Log Message:
* Thu Aug 10 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-8.fc6
- radeon-6.6.1-xpress-200.patch: Also disable DRI on xpress200, known broken.


radeon-6.6.1-xpress-200.patch:
 radeon_driver.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE radeon-6.6.1-xpress-200.patch ---
--- xf86-video-ati-6.6.1/src/radeon_driver.c.xpress-200	2006-08-10 19:51:35.000000000 -0400
+++ xf86-video-ati-6.6.1/src/radeon_driver.c	2006-08-10 19:55:27.000000000 -0400
@@ -4523,6 +4523,19 @@
 	return FALSE;
     }
 
+    if (info->Chipset == PCI_CHIP_RS400_5A41 ||
+	info->Chipset == PCI_CHIP_RS400_5A42 ||
+	info->Chipset == PCI_CHIP_RC410_5A61 ||
+	info->Chipset == PCI_CHIP_RC410_5A62 ||
+	info->Chipset == PCI_CHIP_RS480_5954 ||
+	info->Chipset == PCI_CHIP_RS480_5955 ||
+	info->Chipset == PCI_CHIP_RS482_5974 ||
+	info->Chipset == PCI_CHIP_RS482_5975) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		   "Direct rendering broken on XPRESS 200 and 200M\n");
+	return FALSE;
+    }
+
     if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 		   "[dri] Acceleration disabled, not initializing the DRI\n");


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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xorg-x11-drv-ati.spec	2 Aug 2006 20:32:55 -0000	1.37
+++ xorg-x11-drv-ati.spec	11 Aug 2006 00:01:47 -0000	1.38
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -27,6 +27,7 @@
 # Radeon patches (0-99)
 Patch0:    radeon-6.6.1-dotclock-filter.patch
 Patch1:    radeon-6.6.1-no-dri-on-rn50.patch
+Patch2:    radeon-6.6.1-xpress-200.patch
 
 # Rage 128 patches (100-199)
 Patch100:  r128-missing-xf86ForceHWCursor-symbol-bug168753.patch
@@ -50,6 +51,7 @@
 
 %patch0 -p1 -b .dotclock-filter
 %patch1 -p1 -b .rn50-dri
+%patch2 -p1 -b .xpress-200
 %patch100 -p0 -b .r128-missing-xf86ForceHWCursor-symbol-bug168753
 
 %build
@@ -94,6 +96,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Aug 10 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-8.fc6
+- radeon-6.6.1-xpress-200.patch: Also disable DRI on xpress200, known broken.
+
 * Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-7.fc6
 - Make sure DRI and Render accel are disabled on RN50.
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 00:16:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 20:16:02 -0400
Subject: rpms/gnome-session/devel gnome-session-2.15.90-window-manager.patch,
	NONE, 1.1 gnome-session.spec, 1.78,
	1.79 gnome-session-2.13.5-critical.patch, 1.1,
	NONE gnome-session-2.13.92-make-config-dir.patch, 1.2,
	NONE gnome-session-2.15.4-window-manager.patch, 1.1, NONE
Message-ID: <200608110016.k7B0G2ro024486@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-session.spec 
Added Files:
	gnome-session-2.15.90-window-manager.patch 
Removed Files:
	gnome-session-2.13.5-critical.patch 
	gnome-session-2.13.92-make-config-dir.patch 
	gnome-session-2.15.4-window-manager.patch 
Log Message:
- update patch from 2.15.4-3 to be more session friendly (bug 201473)


gnome-session-2.15.90-window-manager.patch:
 gnome-session.schemas.in |   13 ++++++++++++-
 gnome-wm                 |    8 +++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

--- NEW FILE gnome-session-2.15.90-window-manager.patch ---
--- gnome-session-2.15.90/gnome-session/gnome-session.schemas.in.window-manager	2005-04-26 06:56:50.000000000 -0400
+++ gnome-session-2.15.90/gnome-session/gnome-session.schemas.in	2006-08-10 19:09:05.000000000 -0400
@@ -2,11 +2,22 @@
 <gconfschemafile>
    <schemalist>
       <schema>
+         <key>/schemas/apps/gnome-session/rh/window_manager</key>
+         <applyto>/apps/gnome-session/rh/window_manager</applyto>
+         <owner>gnome</owner>
+         <type>string</type>
+         <default>metacity</default>
+         <locale name="C">
+	    <short>Window Manager to start</short>
+	    <long>The Window manager that gnome-session will start. Valid values are "metacity" and "compiz".</long>
+         </locale>
+      </schema>
+      <schema>
          <key>/schemas/apps/gnome-session/options/show_splash_screen</key>
          <applyto>/apps/gnome-session/options/show_splash_screen</applyto>
          <owner>gnome</owner>
          <type>bool</type>
-         <default>true</default>
+         <default>false</default>
          <locale name="C">
             <short>Show the splash screen</short>
             <long>Show the splash screen when the session starts up</long>
--- gnome-session-2.15.90/gnome-session/gnome-wm.window-manager	2006-08-10 19:09:44.000000000 -0400
+++ gnome-session-2.15.90/gnome-session/gnome-wm	2006-08-10 19:18:04.000000000 -0400
@@ -3,7 +3,9 @@
 # The user can specify his prefered WM by setting the WINDOW_MANAGER
 # environment variable.
 #
-# If this is not set, we search a list of known windowmanagers and use
+# If this is not set, we check the /apps/gnome-session/rh/window_manager key
+# and go off that.  finally, if all else fails we search a list of known 
+# windowmanagers and use
 # the first one that is found in the users's PATH
 #
 
@@ -39,6 +41,10 @@
 
 # WINDOW_MANAGER overrides all
 
+if [ -z "$WINDOW_MANAGER" ] ; then
+	WINDOW_MANAGER=$(gconftool-2 --get /apps/gnome-session/rh/window_manager)
+fi
+
 OLDIFS=$IFS
 IFS=":"
 if [ -z "$WINDOW_MANAGER" ] ; then


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gnome-session.spec	4 Aug 2006 05:24:01 -0000	1.78
+++ gnome-session.spec	11 Aug 2006 00:15:58 -0000	1.79
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.15.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -49,7 +49,7 @@
 # too much crashing
 Patch9: gnome-session-2.13.4-no-crashes.patch
 Patch12: gnome-session-2.13.92-desensitize-invalid-buttons.patch
-Patch13: gnome-session-2.15.4-window-manager.patch
+Patch13: gnome-session-2.15.90-window-manager.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -89,7 +89,7 @@
 %patch8 -p1 -b .shaped
 %patch9 -p1 -b .no-crashes
 %patch12 -p1 -b .desensitize-invalid-buttons
-%patch13 -p0 -b .window-manager
+%patch13 -p1 -b .window-manager
 
 %build
 
@@ -167,10 +167,13 @@
 %{_datadir}/gnome/autostart
 
 %changelog
-* Thu Aug 4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+* Thu Aug 10 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-2.fc6
+- update patch from 2.15.4-3 to be more session friendly (bug 201473)
+
+* Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 
-* Thu Aug 3 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.4-3
+* Thu Aug  3 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.4-3
 - Add patch to (a) add configuration option for window manager, (b) start the window
   manager, and (c) disable splash screen by default.
 


--- gnome-session-2.13.5-critical.patch DELETED ---


--- gnome-session-2.13.92-make-config-dir.patch DELETED ---


--- gnome-session-2.15.4-window-manager.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 11 00:17:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 20:17:39 -0400
Subject: rpms/compiz/devel desktop-effects-0.6.1-delete-session.patch, NONE,
	1.1 compiz.spec, 1.17, 1.18
Message-ID: <200608110017.k7B0Hd9T000852@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31583

Modified Files:
	compiz.spec 
Added Files:
	desktop-effects-0.6.1-delete-session.patch 
Log Message:
- Add Requires: gnome-session 2.15.90-2.fc6 (bug 201473)
- unlink session file on changing wms (bug 201473)


desktop-effects-0.6.1-delete-session.patch:
 desktop-effects.c |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE desktop-effects-0.6.1-delete-session.patch ---
--- desktop-effects-0.6.1/desktop-effects.c.delete-session	2006-08-10 19:33:52.000000000 -0400
+++ desktop-effects-0.6.1/desktop-effects.c	2006-08-10 19:35:25.000000000 -0400
@@ -327,10 +327,16 @@
 	    if (apply_setting)
 	    {
 		const char *str = settings.enabled? "compiz" : "metacity";
+		char *session_file;
 		
 		gconf_client_set_string (app->gconf,
 					 WINDOW_MANAGER_KEY,
 					 str, NULL);
+
+		session_file = g_build_filename (g_get_home_dir (),
+						 ".gnome2", "session", NULL);
+		g_unlink (session_file);
+		g_free (session_file);
 	    }
 	}
     }


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- compiz.spec	3 Aug 2006 22:08:31 -0000	1.17
+++ compiz.spec	11 Aug 2006 00:17:36 -0000	1.18
@@ -10,7 +10,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.14.%{snapshot}git.fc5.aiglx
+Release:        0.15.%{snapshot}git.fc5.aiglx
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +22,7 @@
 Requires:	mesa-libGL >= 6.5-9
 Requires:	libwnck >= 2.15.4
 Requires:       system-logos
-Requires:	gnome-session >= 2.15.4-3
+Requires:	gnome-session >= 2.15.90-2.fc6
 
 BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
@@ -41,6 +41,7 @@
 Patch104: fbconfig-depth-fix.patch
 Patch105: fedora-logo.patch
 Patch106: glfinish.patch
+Patch107: desktop-effects-0.6.1-delete-session.patch
 
 
 %description
@@ -76,6 +77,10 @@
 %patch105 -p1 -b .fedora-logo
 %patch106 -p1 -b .glfinish
 
+pushd ../desktop-effects-%{dialogversion} >& /dev/null
+%patch107 -p1 -b .delete-session
+popd
+
 %build
 %configure --disable-libsvg-cairo
 
@@ -136,6 +141,10 @@
 %{_includedir}/compiz
 
 %changelog
+* Thu Aug 10 2006 Ray Strode <rstrode at redhat.com> 0.0.13-0.15.20060721git.fc5.aiglx
+- Add Requires: gnome-session 2.15.90-2.fc6 (bug 201473)
+- unlink session file on changing wms (bug 201473)
+
 * Thu Aug  3 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.14.20060721git.fc5.aiglx
 - Add Requires: gnome-session 2.15.4-3
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 00:43:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 20:43:55 -0400
Subject: rpms/gnome-volume-manager/devel
	gnome-volume-manager-2.15.0.add-console-user-check.patch, NONE,
	1.1 gnome-volume-manager.spec, 1.48, 1.49
Message-ID: <200608110043.k7B0htUd019511@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19495

Modified Files:
	gnome-volume-manager.spec 
Added Files:
	gnome-volume-manager-2.15.0.add-console-user-check.patch 
Log Message:
- Add patch to use the console user files to check for local users
  instead of using utmp which is unreliable


gnome-volume-manager-2.15.0.add-console-user-check.patch:
 manager.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE gnome-volume-manager-2.15.0.add-console-user-check.patch ---
--- gnome-volume-manager-2.15.0/src/manager.c.fix_exit	2006-08-10 19:41:01.000000000 -0400
+++ gnome-volume-manager-2.15.0/src/manager.c	2006-08-10 20:15:02.000000000 -0400
@@ -3088,10 +3088,19 @@
 	struct utmp *utmp;
 	const char *user;
 	size_t ulen;
-	
+	gchar *console_path;
+
 	user = g_get_user_name ();
 	ulen = strlen (user);
-	
+
+        console_path = g_build_filename (GVM_CONSOLE_AUTH_DIR, user, NULL);
+	if (g_file_test (console_path, G_FILE_TEST_EXISTS))
+	  {
+            g_free (console_path);
+	    return TRUE;
+	  }
+
+        g_free (console_path);
 	setutent ();
 	
 	while (!local && (utmp = getutent ())) {


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-volume-manager.spec	3 Aug 2006 19:32:06 -0000	1.48
+++ gnome-volume-manager.spec	11 Aug 2006 00:43:50 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 2.15.0
-Release: 1%{?dist} 
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -11,8 +11,7 @@
 Source4: cdda-url-handler.schemas
 Patch0: gnome-volume-manager-0.9.10.add-to-base.patch
 Patch1: gnome-volume-manager-1.5.11-rh-defaults.patch
-Patch2: gvm-no-mount-ui-on-startup.patch 
-Patch3: gnome-volume-manager-1.5.9-goption.patch 
+Patch2: gnome-volume-manager-2.15.0.add-console-user-check.patch 
 BuildRoot: /var/tmp/%{name}-root
 BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.90, dbus-glib-devel >= 0.70
 BuildPrereq: hal-devel >= 0.5.0
@@ -44,9 +43,9 @@
 %setup -q
 %patch0 -p1 -b .add-to-base
 %patch1 -p1 -b .rh-defaults
-
+%patch2 -p1 -b .add-console-user-check
 %build
-%configure
+%configure CFLAGS="-ggdb3 -O0"
 make
 
 %install
@@ -84,6 +83,10 @@
 %{_datadir}/gnome/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Thu Aug 10 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.0-2
+- Add patch to use the console user files to check for local users
+  instead of using utmp which is unreliable
+
 * Thu Aug 03 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.0-1
 - Update to 2.15.0
 - Add dist tag to release



From fedora-cvs-commits at redhat.com  Fri Aug 11 00:47:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 20:47:56 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2546,
	1.2547 linux-2.6-utrace.patch, 1.16, 1.17
Message-ID: <200608110047.k7B0luar019656@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
New utrace patch: fix ptrace synchronization issues.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2546
retrieving revision 1.2547
diff -u -r1.2546 -r1.2547
--- kernel-2.6.spec	10 Aug 2006 23:52:23 -0000	1.2546
+++ kernel-2.6.spec	11 Aug 2006 00:47:52 -0000	1.2547
@@ -1697,6 +1697,9 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Roland McGrath <roland at redhat.com>
+- New utrace patch: fix ptrace synchronization issues.
+
 * Thu Aug 10 2006 Dave Jones <davej at redhat.com>
 - GFS2/DLM update.
 - Daily GregKH updates

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  455 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  839 ++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/ia32_entry.S             |    2 
 arch/ia64/ia32/sys_ia32.c               |   23 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/ia64/kernel/signal.c               |    4 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  785 +++++++--------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  553 +++++++++--
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  688 ++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |   14 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   74 +
 include/asm-ia64/tracehook.h            |   67 +
 include/asm-powerpc/tracehook.h         |  303 ++++++
 include/asm-s390/tracehook.h            |  105 ++
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  106 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   88 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  645 ++++++++++++
 include/linux/utrace.h                  |  481 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  253 +----
 kernel/fork.c                           |   62 -
 kernel/ptrace.c                         | 1592 +++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1526 ++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |   54 -
 security/selinux/include/objsec.h       |    1 
 93 files changed, 8331 insertions(+), 3320 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-utrace.patch	9 Aug 2006 23:58:50 -0000	1.16
+++ linux-2.6-utrace.patch	11 Aug 2006 00:47:52 -0000	1.17
@@ -7,7 +7,7 @@
  arch/i386/kernel/entry.S                |    7 
  arch/i386/kernel/i387.c                 |  143 +--
  arch/i386/kernel/process.c              |    3 
- arch/i386/kernel/ptrace.c               |  839 +++++++++--------
+ arch/i386/kernel/ptrace.c               |  839 +++++++++-------
  arch/i386/kernel/signal.c               |   39 -
  arch/i386/kernel/vm86.c                 |    7 
  arch/ia64/ia32/ia32_entry.S             |    2 
@@ -23,8 +23,8 @@
  arch/powerpc/kernel/asm-offsets.c       |    2 
  arch/powerpc/kernel/process.c           |    5 
  arch/powerpc/kernel/ptrace-common.h     |  161 ---
- arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
- arch/powerpc/kernel/ptrace32.c          |  436 ---------
+ arch/powerpc/kernel/ptrace.c            |  785 +++++++--------
+ arch/powerpc/kernel/ptrace32.c          |  436 --------
  arch/powerpc/kernel/signal_32.c         |   56 +
  arch/powerpc/kernel/signal_64.c         |    4 
  arch/powerpc/kernel/sys_ppc32.c         |    5 
@@ -48,7 +48,7 @@
  arch/x86_64/ia32/ia32_aout.c            |    6 
  arch/x86_64/ia32/ia32_signal.c          |    8 
  arch/x86_64/ia32/ia32entry.S            |    2 
- arch/x86_64/ia32/ptrace32.c             |  690 +++++++++-----
+ arch/x86_64/ia32/ptrace32.c             |  690 +++++++++----
  arch/x86_64/ia32/sys_ia32.c             |    5 
  arch/x86_64/kernel/process.c            |    5 
  arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
@@ -76,22 +76,22 @@
  include/asm-x86_64/thread_info.h        |    2 
  include/asm-x86_64/tracehook.h          |  106 ++
  include/linux/init_task.h               |    3 
- include/linux/ptrace.h                  |   86 +-
+ include/linux/ptrace.h                  |   88 +-
  include/linux/sched.h                   |   25 
  include/linux/tracehook.h               |  645 +++++++++++++
- include/linux/utrace.h                  |  481 ++++++++++
+ include/linux/utrace.h                  |  481 +++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
- kernel/exit.c                           |  259 +----
+ kernel/exit.c                           |  253 +----
  kernel/fork.c                           |   62 -
- kernel/ptrace.c                         | 1563 ++++++++++++++++++++++++-------
+ kernel/ptrace.c                         | 1592 ++++++++++++++++++++++++-------
  kernel/signal.c                         |  211 +---
  kernel/sys.c                            |    2 
  kernel/timer.c                          |    6 
  kernel/utrace.c                         | 1526 ++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |   54 +
  security/selinux/include/objsec.h       |    1 
- 93 files changed, 8302 insertions(+), 3326 deletions(-)
+ 93 files changed, 8332 insertions(+), 3321 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -1492,7 +1492,7 @@
 +#endif	/* linux/utrace.h */
 --- linux-2.6/include/linux/ptrace.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/ptrace.h
-@@ -49,66 +49,42 @@
+@@ -49,66 +49,44 @@
  #include <asm/ptrace.h>
  
  #ifdef __KERNEL__
@@ -1570,6 +1570,8 @@
 + * This reports any ptrace-child that is ready as do_wait would a normal child.
 + * If there are no ptrace children, returns -ECHILD.
 + * If there are some ptrace children but none reporting now, returns 0.
++ * In those cases the tasklist_lock is still held so next_thread(tsk) works.
++ * For any other return value, tasklist_lock is released before return.
 + */
 +int ptrace_do_wait(struct task_struct *tsk,
 +		   pid_t pid, int options, struct siginfo __user *infop,
@@ -5252,23 +5254,7 @@
  static long do_wait(pid_t pid, int options, struct siginfo __user *infop,
  		    int __user *stat_addr, struct rusage __user *ru)
  {
-@@ -1449,13 +1316,14 @@ repeat:
- 	 */
- 	flag = 0;
- 	current->state = TASK_INTERRUPTIBLE;
--	read_lock(&tasklist_lock);
- 	tsk = current;
-+	rcu_read_lock();
- 	do {
- 		struct task_struct *p;
- 		struct list_head *_p;
- 		int ret;
- 
-+		read_lock(&tasklist_lock);
- 		list_for_each(_p,&tsk->children) {
- 			p = list_entry(_p, struct task_struct, sibling);
- 
-@@ -1465,26 +1333,17 @@ repeat:
+@@ -1465,26 +1332,17 @@ repeat:
  
  			switch (p->state) {
  			case TASK_TRACED:
@@ -5299,7 +5285,7 @@
  					continue;
  				retval = wait_task_stopped(p, ret == 2,
  							   (options & WNOWAIT),
-@@ -1509,6 +1368,10 @@ repeat:
+@@ -1509,6 +1367,10 @@ repeat:
  						goto check_continued;
  					if (!likely(options & WEXITED))
  						continue;
@@ -5310,7 +5296,7 @@
  					retval = wait_task_zombie(
  						p, (options & WNOWAIT),
  						infop, stat_addr, ru);
-@@ -1525,6 +1388,8 @@ check_continued:
+@@ -1525,6 +1387,8 @@ check_continued:
  				flag = 1;
  				if (!unlikely(options & WCONTINUED))
  					continue;
@@ -5319,7 +5305,7 @@
  				retval = wait_task_continued(
  					p, (options & WNOWAIT),
  					infop, stat_addr, ru);
-@@ -1533,23 +1398,25 @@ check_continued:
+@@ -1533,16 +1397,15 @@ check_continued:
  				break;
  			}
  		}
@@ -5331,30 +5317,20 @@
 -					continue;
 -				flag = 1;
 -				break;
-+		read_unlock(&tasklist_lock);
+-			}
 +
 +		retval = ptrace_do_wait(tsk, pid, options,
 +					infop, stat_addr, ru);
 +		if (retval != -ECHILD) {
 +			flag = 1;
-+			if (retval) {
-+				rcu_read_unlock();
++			if (retval != 0) /* He released the lock.  */
 +				goto end;
- 			}
  		}
 +
  		if (options & __WNOTHREAD)
  			break;
  		tsk = next_thread(tsk);
- 		BUG_ON(tsk->signal != current->signal);
- 	} while (tsk != current);
-+	rcu_read_unlock();
- 
--	read_unlock(&tasklist_lock);
- 	if (flag) {
- 		retval = 0;
- 		if (options & WNOHANG)
-@@ -1566,7 +1433,7 @@ end:
+@@ -1566,7 +1429,7 @@ end:
  	remove_wait_queue(&current->signal->wait_chldexit,&wait);
  	if (infop) {
  		if (retval > 0)
@@ -5605,7 +5581,7 @@
  /*
   * Access another process' address space.
   * Source/target buffer must be kernel space, 
-@@ -295,249 +125,1304 @@ int access_process_vm(struct task_struct
+@@ -295,249 +125,1341 @@ int access_process_vm(struct task_struct
  	return buf - old_buf;
  }
  
@@ -5918,8 +5894,7 @@
 +		list_for_each_entry_rcu(state, &tsk->ptracees, entry) {
 +			rcu_assign_pointer(state->engine->data, 0UL);
 +			utrace_detach(state->task, state->engine);
- 		}
--		spin_unlock_irq(&child->sighand->siglock);
++		}
 +
 +		/*
 +		 * Now clear out our list and clean up our data structures.
@@ -5929,7 +5904,8 @@
 +		list_for_each_entry_safe(state, next, &tsk->ptracees, entry) {
 +			list_del_rcu(&state->entry);
 +			ptrace_done(state);
-+		}
+ 		}
+-		spin_unlock_irq(&child->sighand->siglock);
 +		task_unlock(tsk);
  	}
 -	read_unlock(&tasklist_lock);
@@ -5991,7 +5967,7 @@
 +
 +		return utrace_inject_signal(target, engine,
 +					    UTRACE_ACTION_RESUME, info, NULL);
- 	}
++	}
 +
 +	return 0;
 +}
@@ -6020,7 +5996,7 @@
 +			return -EINVAL;
 +		pos = (addr - regset->bias) * regset->size;
 +		n = 1;
-+	}
+ 	}
 +	else
 +		n = nregs == 0 ? regset->n : nregs;
 +
@@ -6179,6 +6155,21 @@
 +		utrace_set_flags(child, engine,
 +				 engine->flags | UTRACE_ACTION_QUIESCE);
 +	}
++
++	/*
++	 * We do this for all requests to match traditional ptrace behavior.
++	 * If the machine state synchronization done at context switch time
++	 * includes e.g. writing back to user memory, we want to make sure
++	 * that has finished before a PTRACE_PEEKDATA can fetch the results.
++	 * On most machines, only regset data is affected by context switch
++	 * and calling utrace_regset later on will take care of that, so
++	 * this is superfluous.
++	 *
++	 * To do this purely in utrace terms, we could do:
++	 *  (void) utrace_regset(child, engine, utrace_native_view(child), 0);
++	 */
++	wait_task_inactive(child);
++
 +	if (child->exit_state)
 +		goto out_tsk;
 +
@@ -6545,15 +6536,20 @@
  	return ret;
  }
 +#endif
++
  
 -/**
 - * ptrace_traceme  --  helper for PTRACE_TRACEME
 - *
 - * Performs checks and sets PT_PTRACED.
 - * Should be used by all ptrace implementations for PTRACE_TRACEME.
-- */
++/*
++ * We're called with tasklist_lock held for reading.
++ * If we return -ECHILD or zero, next_thread(tsk) must still be valid to use.
++ * If we return another error code, or a successful PID value, we
++ * release tasklist_lock first.
+  */
 -int ptrace_traceme(void)
-+
 +int
 +ptrace_do_wait(struct task_struct *tsk,
 +	       pid_t pid, int options, struct siginfo __user *infop,
@@ -6630,6 +6626,16 @@
 +		why = CLD_TRAPPED;
 +		status = (p->exit_code << 8) | 0x7f;
 +	}
+ 
+ 	/*
+-	 * Are we already being traced?
++	 * At this point we are committed to a successful return
++	 * or a user error return.  Release the tasklist_lock.
+ 	 */
+-	task_lock(current);
+-	if (!(current->ptrace & PT_PTRACED)) {
+-		ret = security_ptrace(current->parent, current);
++	read_unlock(&tasklist_lock);
 +
 +	if (rusagep)
 +		err = getrusage(p, RUSAGE_BOTH, rusagep);
@@ -6654,13 +6660,7 @@
 +		struct utrace *utrace;
 +
 +		err = p->pid;
- 
--	/*
--	 * Are we already being traced?
--	 */
--	task_lock(current);
--	if (!(current->ptrace & PT_PTRACED)) {
--		ret = security_ptrace(current->parent, current);
++
  		/*
 -		 * Set the ptrace bit in the process ptrace flags.
 +		 * If this was a non-death report, the child might now be
@@ -6746,10 +6746,7 @@
  	 */
 -	if (pid == 1)
 -		return ERR_PTR(-EPERM);
-+	wake_up_interruptible_sync(&parent->signal->wait_chldexit);
-+	spin_unlock_irqrestore(&sighand->siglock, flags);
-+}
- 
+-
 -	read_lock(&tasklist_lock);
 -	child = find_task_by_pid(pid);
 -	if (child)
@@ -6758,10 +6755,18 @@
 -	if (!child)
 -		return ERR_PTR(-ESRCH);
 -	return child;
++	wake_up_interruptible_sync(&parent->signal->wait_chldexit);
++	spin_unlock_irqrestore(&sighand->siglock, flags);
+ }
+ 
+-#ifndef __ARCH_SYS_PTRACE
+-asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
 +static u32
 +ptrace_report(struct utrace_attached_engine *engine, struct task_struct *tsk,
 +	      int code)
-+{
+ {
+-	struct task_struct *child;
+-	long ret;
 +	struct ptrace_state *state = (struct ptrace_state *) engine->data;
 +
 +#ifdef PTRACE_DEBUG
@@ -6776,6 +6781,21 @@
 +	}
 +#endif
 +
++	BUG_ON(state->u.live.stopped);
+ 
+ 	/*
+-	 * This lock_kernel fixes a subtle race with suid exec
++	 * Set our QUIESCE flag right now, before notifying the tracer.
++	 * We do this before setting state->u.live.stopped rather than
++	 * by using UTRACE_ACTION_NEWSTATE in our return value, to
++	 * ensure that the tracer can't get the notification and then
++	 * try to resume us with PTRACE_CONT before we set the flag.
+ 	 */
+-	lock_kernel();
+-	if (request == PTRACE_TRACEME) {
+-		ret = ptrace_traceme();
++	utrace_set_flags(tsk, engine, engine->flags | UTRACE_ACTION_QUIESCE);
++
 +	state->u.live.stopped = 1;
 +	state->u.live.reported = 0;
 +	tsk->exit_code = code;
@@ -6786,29 +6806,18 @@
 +	       current->pid, current->exit_code);
 +#endif
 +
-+	return (UTRACE_ACTION_NEWSTATE
-+		| UTRACE_ACTION_QUIESCE | UTRACE_ACTION_NOREAP);
- }
- 
--#ifndef __ARCH_SYS_PTRACE
--asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
++	return UTRACE_ACTION_RESUME;
++}
++
 +static inline u32
 +ptrace_event(struct utrace_attached_engine *engine, struct task_struct *tsk,
 +	     int event)
- {
--	struct task_struct *child;
--	long ret;
++{
 +	struct ptrace_state *state = (struct ptrace_state *) engine->data;
 +	state->u.live.syscall = 0;
 +	return ptrace_report(engine, tsk, (event << 8) | SIGTRAP);
 +}
- 
--	/*
--	 * This lock_kernel fixes a subtle race with suid exec
--	 */
--	lock_kernel();
--	if (request == PTRACE_TRACEME) {
--		ret = ptrace_traceme();
++
 +
 +static u32
 +ptrace_report_death(struct utrace_attached_engine *engine,
@@ -6947,7 +6956,8 @@
 +		   struct task_struct *tsk, int type)
 +{
 +	return UTRACE_ACTION_RESUME; /* XXX */
-+}
+ }
+-#endif /* __ARCH_SYS_PTRACE */
 +
 +static u32
 +ptrace_report_exec(struct utrace_attached_engine *engine,
@@ -6990,8 +7000,7 @@
 +			    struct task_struct *tsk, struct pt_regs *regs)
 +{
 +	return ptrace_report_syscall(engine, tsk, regs, 0);
- }
--#endif /* __ARCH_SYS_PTRACE */
++}
 +
 +static u32
 +ptrace_report_exit(struct utrace_attached_engine *engine,



From fedora-cvs-commits at redhat.com  Fri Aug 11 01:24:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 21:24:11 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-always-mouse-thyself.patch, NONE,
	1.1 xorg-x11-server-1.1.1-edid-quirks-list.patch, 1.1,
	1.2 xorg-x11-server.spec, 1.145, 1.146
Message-ID: <200608110124.k7B1OBqi031686@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server-1.1.1-edid-quirks-list.patch 
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-always-mouse-thyself.patch 
Log Message:
* Thu Aug 10 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-20.fc6
- xorg-x11-server-1.1.1-always-mouse-thyself.patch: If we lack a mouse
  device in the config, and the user hasn't asked for any void devices,
  synthesize a mouse section.  (#200347)
- xorg-x11-server-1.1.1-edid-quirks-list.patch: Better formatting.


xorg-x11-server-1.1.1-always-mouse-thyself.patch:
 xf86Config.c |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+)

--- NEW FILE xorg-x11-server-1.1.1-always-mouse-thyself.patch ---
--- xorg-server-1.1.1/hw/xfree86/common/xf86Config.c.mouse-thyself	2006-08-10 14:00:15.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/common/xf86Config.c	2006-08-10 14:19:13.000000000 -0400
@@ -1625,6 +1625,31 @@
 	return FALSE;
     }
 
+    /*
+     * hack: always synthesize a 'mouse' section configured to send core
+     * events, unless a 'void' section is found, in which case the user
+     * probably wants to run footless.
+     */
+    if (!xf86findInputByDriver("void", xf86configptr->conf_input_lst) &&
+	    !xf86findInputByDriver("mouse", xf86configptr->conf_input_lst)) {
+	xf86Msg(X_INFO, "No default mouse found, adding one\n");
+	bzero(&defPtr, sizeof(defPtr));
+	defPtr.inp_identifier = "<default pointer>";
+	defPtr.inp_driver = "mouse";
+	confInput = &defPtr;
+	foundPointer = configInput(&Pointer, confInput, from);
+        if (foundPointer) {
+	    count++;
+	    indp = xnfrealloc(servlayoutp->inputs,
+			      (count + 1) * sizeof(IDevRec));
+	    indp[count - 1] = Pointer;
+	    indp[count - 1].extraOptions =
+				xf86addNewOption(NULL, "AlwaysCore", NULL);
+	    indp[count].identifier = NULL;
+	    servlayoutp->inputs = indp;
+	}
+    }
+
     confInput = NULL;
 
     /* 1. Check for the -keyboard command line option. */

xorg-x11-server-1.1.1-edid-quirks-list.patch:
 interpret_edid.c |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletion(-)

Index: xorg-x11-server-1.1.1-edid-quirks-list.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-edid-quirks-list.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.1-edid-quirks-list.patch	9 Aug 2006 23:34:29 -0000	1.1
+++ xorg-x11-server-1.1.1-edid-quirks-list.patch	11 Aug 2006 01:24:06 -0000	1.2
@@ -1,6 +1,6 @@
 --- xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c.edid-quirks	2006-07-05 14:31:40.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c	2006-08-09 18:25:19.000000000 -0400
-@@ -32,6 +32,24 @@
++++ xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c	2006-08-10 15:16:41.000000000 -0400
+@@ -32,6 +32,28 @@
  static void get_detailed_timing_section(Uchar*, struct 	detailed_timings *);
  static Bool validate_version(int scrnIndex, struct edid_version *);
  
@@ -13,10 +13,14 @@
 +    for (i = 0; i < 4; i++) {
 +	if (m->det_mon[i].type == DS_NAME) {
 +	    if (strstr(m->det_mon[i].section.name, "DELL 2000FP")) {
-+		ErrorF("Dell 2000FP Fixup: Max pixclock = 165MHz\n");
-+		for (i = 0; i < 4; i++)
-+		    if (m->det_mon[i].type == DS_RANGES)
++		for (i = 0; i < 4; i++) {
++		    if (m->det_mon[i].type == DS_RANGES) {
++			xf86Msg(X_INFO, "EDID fixup: Dell 2000FP: "
++				"Max pixclock %d -> 165MHz\n",
++				m->det_mon[i].section.ranges.max_clock);
 +			m->det_mon[i].section.ranges.max_clock = 165;
++		    }
++		}
 +		return;
 +	    }
 +	}
@@ -25,7 +29,7 @@
  
  xf86MonPtr
  xf86InterpretEDID(int scrnIndex, Uchar *block)
-@@ -54,7 +72,9 @@
+@@ -54,7 +76,9 @@
  			   &m->ver);
      get_dt_md_section(SECTION(DET_TIMING_SECTION,block),&m->ver, m->det_mon);
      m->no_sections = (int)*(char *)SECTION(NO_EDID,block);


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- xorg-x11-server.spec	9 Aug 2006 23:34:29 -0000	1.145
+++ xorg-x11-server.spec	11 Aug 2006 01:24:06 -0000	1.146
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   19%{?dist}
+Release:   20%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -61,6 +61,7 @@
 Patch3009:  xorg-x11-server-1.1.1-module-list.patch
 Patch3010:  xorg-x11-server-1.1.1-edid-quirks-list.patch
 Patch3011:  xorg-x11-server-1.1.1-defaultdepth-24.patch
+Patch3012:  xorg-x11-server-1.1.1-always-mouse-thyself.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -358,6 +359,7 @@
 %patch3009 -p1 -b .module-list
 %patch3010 -p1 -b .edid-quirks
 %patch3011 -p1 -b .defaultdepth
+%patch3012 -p1 -b .mouse-thyself
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -687,6 +689,12 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-20.fc6
+- xorg-x11-server-1.1.1-always-mouse-thyself.patch: If we lack a mouse
+  device in the config, and the user hasn't asked for any void devices,
+  synthesize a mouse section.  (#200347)
+- xorg-x11-server-1.1.1-edid-quirks-list.patch: Better formatting.
+
 * Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-19.fc6
 - xorg-x11-server-1.1.1-builderstring.patch: Enable the builder info
   string at configure time;



From fedora-cvs-commits at redhat.com  Fri Aug 11 01:32:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 21:32:25 -0400
Subject: rpms/kernel/devel linux-2.6-build-deprecate-configh-include.patch,
	1.3, 1.4
Message-ID: <200608110132.k7B1WPtJ002012@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-build-deprecate-configh-include.patch 
Log Message:
more configh removals

linux-2.6-build-deprecate-configh-include.patch:
 linux-2.6.17.noarch/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h |    1 -
 linux-2.6.17.noarch/drivers/scsi/scsi.h                                |    2 --
 linux-2.6.17.noarch/include/asm-i386/dwarf2.h                          |    2 --
 linux-2.6.17.noarch/include/asm-i386/tsc.h                             |    1 -
 linux-2.6.17.noarch/include/asm-x86_64/calgary.h                       |    1 -
 linux-2.6.17.noarch/include/linux/config.h                             |    1 +
 linux-2.6.17.noarch/include/linux/unwind.h                             |    2 --
 linux-2.6.17.noarch/include/linux/vmstat.h                             |    1 -
 linux-2.6.17.noarch/include/net/netdma.h                               |    1 -
 linux-2.6/net/atm/atm_sysfs.c                                          |    1 -
 linux-2.6/net/core/dev_mcast.c                                         |    3 +--
 linux-2.6/net/core/wireless.c                                          |    1 -
 linux-2.6/net/ipv4/af_inet.c                                           |    1 -
 linux-2.6/net/ipv4/ipconfig.c                                          |    1 -
 linux-2.6/net/ipv4/netfilter/ip_conntrack_sip.c                        |    1 -
 linux-2.6/net/ipv4/raw.c                                               |    3 +--
 linux-2.6/net/ipv4/tcp_lp.c                                            |    1 -
 linux-2.6/net/ipv4/tcp_veno.c                                          |    1 -
 18 files changed, 3 insertions(+), 22 deletions(-)

Index: linux-2.6-build-deprecate-configh-include.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-deprecate-configh-include.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-build-deprecate-configh-include.patch	10 Aug 2006 23:45:32 -0000	1.3
+++ linux-2.6-build-deprecate-configh-include.patch	11 Aug 2006 01:32:23 -0000	1.4
@@ -143,3 +143,45 @@
  #include <linux/mmzone.h>
  #include <asm/atomic.h>
  
+--- linux-2.6.17.noarch/include/linux/unwind.h~	2006-08-10 21:26:29.000000000 -0400
++++ linux-2.6.17.noarch/include/linux/unwind.h	2006-08-10 21:26:35.000000000 -0400
+@@ -12,8 +12,6 @@
+  * is not much point in implementing the full Dwarf2 unwind API.
+  */
+ 
+-#include <linux/config.h>
+-
+ struct module;
+ 
+ #ifdef CONFIG_STACK_UNWIND
+--- linux-2.6.17.noarch/include/net/netdma.h~	2006-08-10 21:27:41.000000000 -0400
++++ linux-2.6.17.noarch/include/net/netdma.h	2006-08-10 21:27:47.000000000 -0400
+@@ -20,7 +20,6 @@
+  */
+ #ifndef NETDMA_H
+ #define NETDMA_H
+-#include <linux/config.h>
+ #ifdef CONFIG_NET_DMA
+ #include <linux/dmaengine.h>
+ #include <linux/skbuff.h>
+--- linux-2.6.17.noarch/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h~	2006-08-10 21:28:38.000000000 -0400
++++ linux-2.6.17.noarch/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h	2006-08-10 21:28:40.000000000 -0400
+@@ -33,7 +33,6 @@
+ 
+ */
+ 
+-#include <linux/config.h>
+ #include <linux/videodev2.h>
+ #include <linux/i2c.h>
+ #include <linux/mutex.h>
+--- linux-2.6.17.noarch/drivers/scsi/scsi.h~	2006-08-10 21:29:08.000000000 -0400
++++ linux-2.6.17.noarch/drivers/scsi/scsi.h	2006-08-10 21:29:10.000000000 -0400
+@@ -20,8 +20,6 @@
+ #ifndef _SCSI_H
+ #define _SCSI_H
+ 
+-#include <linux/config.h>	    /* for CONFIG_SCSI_LOGGING */
+-
+ #include <scsi/scsi_cmnd.h>
+ #include <scsi/scsi_device.h>
+ #include <scsi/scsi_eh.h>



From fedora-cvs-commits at redhat.com  Fri Aug 11 01:54:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 21:54:15 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2547,
	1.2548 linux-2.6-build-deprecate-configh-include.patch, 1.4,
	1.5 linux-2.6-lockdep-fixes.patch, 1.19, 1.20
Message-ID: <200608110154.k7B1sFq0023361@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
	linux-2.6-build-deprecate-configh-include.patch 
	linux-2.6-lockdep-fixes.patch 
Log Message:
more lockdep fixing


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2547
retrieving revision 1.2548
diff -u -r1.2547 -r1.2548
--- kernel-2.6.spec	11 Aug 2006 00:47:52 -0000	1.2547
+++ kernel-2.6.spec	11 Aug 2006 01:54:11 -0000	1.2548
@@ -1703,6 +1703,7 @@
 * Thu Aug 10 2006 Dave Jones <davej at redhat.com>
 - GFS2/DLM update.
 - Daily GregKH updates
+- More lockdep fixes.
 
 * Wed Aug  9 2006 Roland McGrath <roland at redhat.com>
 - Fix utrace_regset nits breaking s390.

linux-2.6-build-deprecate-configh-include.patch:
 linux-2.6.17.noarch/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h |    1 -
 linux-2.6.17.noarch/drivers/net/3c501.c                                |    1 -
 linux-2.6.17.noarch/drivers/net/hp100.c                                |    1 -
 linux-2.6.17.noarch/drivers/net/irda/mcs7780.c                         |    1 -
 linux-2.6.17.noarch/drivers/net/irda/w83977af_ir.c                     |    1 -
 linux-2.6.17.noarch/drivers/net/netx-eth.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/phy/smsc.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/phy/vitesse.c                          |    1 -
 linux-2.6.17.noarch/drivers/net/smc911x.c                              |    2 --
 linux-2.6.17.noarch/drivers/net/wan/cycx_main.c                        |    1 -
 linux-2.6.17.noarch/drivers/net/wan/dlci.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/wan/sdla.c                             |    1 -
 linux-2.6.17.noarch/drivers/scsi/aic7xxx_old.c                         |    2 --
 linux-2.6.17.noarch/drivers/scsi/dpt_i2o.c                             |    1 -
 linux-2.6.17.noarch/drivers/scsi/hptiop.c                              |    1 -
 linux-2.6.17.noarch/drivers/scsi/libata-eh.c                           |    1 -
 linux-2.6.17.noarch/drivers/scsi/scsi.h                                |    2 --
 linux-2.6.17.noarch/include/asm-i386/dwarf2.h                          |    2 --
 linux-2.6.17.noarch/include/asm-i386/tsc.h                             |    1 -
 linux-2.6.17.noarch/include/asm-x86_64/calgary.h                       |    1 -
 linux-2.6.17.noarch/include/linux/config.h                             |    1 +
 linux-2.6.17.noarch/include/linux/unwind.h                             |    2 --
 linux-2.6.17.noarch/include/linux/vmstat.h                             |    1 -
 linux-2.6.17.noarch/include/net/netdma.h                               |    1 -
 linux-2.6/net/atm/atm_sysfs.c                                          |    1 -
 linux-2.6/net/core/dev_mcast.c                                         |    3 +--
 linux-2.6/net/core/wireless.c                                          |    1 -
 linux-2.6/net/ipv4/af_inet.c                                           |    1 -
 linux-2.6/net/ipv4/ipconfig.c                                          |    1 -
 linux-2.6/net/ipv4/netfilter/ip_conntrack_sip.c                        |    1 -
 linux-2.6/net/ipv4/raw.c                                               |    3 +--
 linux-2.6/net/ipv4/tcp_lp.c                                            |    1 -
 linux-2.6/net/ipv4/tcp_veno.c                                          |    1 -
 33 files changed, 3 insertions(+), 39 deletions(-)

Index: linux-2.6-build-deprecate-configh-include.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-deprecate-configh-include.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-build-deprecate-configh-include.patch	11 Aug 2006 01:32:23 -0000	1.4
+++ linux-2.6-build-deprecate-configh-include.patch	11 Aug 2006 01:54:11 -0000	1.5
@@ -185,3 +185,155 @@
  #include <scsi/scsi_cmnd.h>
  #include <scsi/scsi_device.h>
  #include <scsi/scsi_eh.h>
+--- linux-2.6.17.noarch/drivers/net/irda/mcs7780.c~	2006-08-10 21:35:23.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/irda/mcs7780.c	2006-08-10 21:35:25.000000000 -0400
+@@ -45,7 +45,6 @@
+ 
+ #include <linux/module.h>
+ #include <linux/moduleparam.h>
+-#include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/types.h>
+ #include <linux/errno.h>
+--- linux-2.6.17.noarch/drivers/net/irda/w83977af_ir.c~	2006-08-10 21:35:28.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/irda/w83977af_ir.c	2006-08-10 21:35:30.000000000 -0400
+@@ -40,7 +40,6 @@
+  ********************************************************************/
+ 
+ #include <linux/module.h>
+-#include <linux/config.h> 
+ #include <linux/kernel.h>
+ #include <linux/types.h>
+ #include <linux/skbuff.h>
+--- linux-2.6.17.noarch/drivers/net/smc911x.c~	2006-08-10 21:35:34.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/smc911x.c	2006-08-10 21:35:37.000000000 -0400
+@@ -55,8 +55,6 @@ static const char version[] =
+ 			 )
+ #endif
+ 
+-
+-#include <linux/config.h>
+ #include <linux/init.h>
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+--- linux-2.6.17.noarch/drivers/net/netx-eth.c~	2006-08-10 21:35:41.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/netx-eth.c	2006-08-10 21:35:42.000000000 -0400
+@@ -17,7 +17,6 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/init.h>
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+--- linux-2.6.17.noarch/drivers/net/wan/cycx_main.c~	2006-08-10 21:35:45.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/wan/cycx_main.c	2006-08-10 21:35:48.000000000 -0400
+@@ -40,7 +40,6 @@
+ * 1998/08/08	acme		Initial version.
+ */
+ 
+-#include <linux/config.h>	/* OS configuration options */
+ #include <linux/stddef.h>	/* offsetof(), etc. */
+ #include <linux/errno.h>	/* return codes */
+ #include <linux/string.h>	/* inline memset(), etc. */
+--- linux-2.6.17.noarch/drivers/net/wan/sdla.c~	2006-08-10 21:35:51.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/wan/sdla.c	2006-08-10 21:35:53.000000000 -0400
+@@ -32,7 +32,6 @@
+  *		2 of the License, or (at your option) any later version.
+  */
+ 
+-#include <linux/config.h> /* for CONFIG_DLCI_MAX */
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/types.h>
+--- linux-2.6.17.noarch/drivers/net/wan/dlci.c~	2006-08-10 21:35:57.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/wan/dlci.c	2006-08-10 21:35:59.000000000 -0400
+@@ -28,7 +28,6 @@
+  *		2 of the License, or (at your option) any later version.
+  */
+ 
+-#include <linux/config.h> /* for CONFIG_DLCI_COUNT */
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/types.h>
+--- linux-2.6.17.noarch/drivers/net/phy/vitesse.c~	2006-08-10 21:36:02.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/phy/vitesse.c	2006-08-10 21:36:04.000000000 -0400
+@@ -12,7 +12,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/mii.h>
+--- linux-2.6.17.noarch/drivers/net/phy/smsc.c~	2006-08-10 21:36:07.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/phy/smsc.c	2006-08-10 21:36:08.000000000 -0400
+@@ -14,7 +14,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/mii.h>
+--- linux-2.6.17.noarch/drivers/net/hp100.c~	2006-08-10 21:36:12.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/hp100.c	2006-08-10 21:36:14.000000000 -0400
+@@ -111,7 +111,6 @@
+ #include <linux/etherdevice.h>
+ #include <linux/skbuff.h>
+ #include <linux/types.h>
+-#include <linux/config.h>	/* for CONFIG_PCI */
+ #include <linux/delay.h>
+ #include <linux/init.h>
+ #include <linux/bitops.h>
+--- linux-2.6.17.noarch/drivers/net/3c501.c~	2006-08-10 21:36:18.000000000 -0400
++++ linux-2.6.17.noarch/drivers/net/3c501.c	2006-08-10 21:36:20.000000000 -0400
+@@ -120,7 +120,6 @@ static const char version[] =
+ #include <linux/slab.h>
+ #include <linux/string.h>
+ #include <linux/errno.h>
+-#include <linux/config.h>	/* for CONFIG_IP_MULTICAST */
+ #include <linux/spinlock.h>
+ #include <linux/ethtool.h>
+ #include <linux/delay.h>
+--- linux-2.6.17.noarch/drivers/scsi/aic7xxx_old.c~	2006-08-10 21:37:46.000000000 -0400
++++ linux-2.6.17.noarch/drivers/scsi/aic7xxx_old.c	2006-08-10 21:37:49.000000000 -0400
+@@ -249,8 +249,6 @@
+ #include <linux/stat.h>
+ #include <linux/slab.h>        /* for kmalloc() */
+ 
+-#include <linux/config.h>        /* for CONFIG_PCI */
+-
+ #define AIC7XXX_C_VERSION  "5.2.6"
+ 
+ #define ALL_TARGETS -1
+--- linux-2.6.17.noarch/drivers/scsi/hptiop.c~	2006-08-10 21:37:53.000000000 -0400
++++ linux-2.6.17.noarch/drivers/scsi/hptiop.c	2006-08-10 21:37:54.000000000 -0400
+@@ -15,7 +15,6 @@
+  *
+  * For more information, visit http://www.highpoint-tech.com
+  */
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/string.h>
+--- linux-2.6.17.noarch/drivers/scsi/dpt_i2o.c~	2006-08-10 21:37:58.000000000 -0400
++++ linux-2.6.17.noarch/drivers/scsi/dpt_i2o.c	2006-08-10 21:38:00.000000000 -0400
+@@ -46,7 +46,6 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Dri
+ 
+ #include <linux/stat.h>
+ #include <linux/slab.h>		/* for kmalloc() */
+-#include <linux/config.h>	/* for CONFIG_PCI */
+ #include <linux/pci.h>		/* for PCI support */
+ #include <linux/proc_fs.h>
+ #include <linux/blkdev.h>
+--- linux-2.6.17.noarch/drivers/scsi/libata-eh.c~	2006-08-10 21:38:05.000000000 -0400
++++ linux-2.6.17.noarch/drivers/scsi/libata-eh.c	2006-08-10 21:38:07.000000000 -0400
+@@ -32,7 +32,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <scsi/scsi.h>
+ #include <scsi/scsi_host.h>

linux-2.6-lockdep-fixes.patch:
 a/kernel/lockdep.c                            |   13 ++++++++++
 a/net/ipv6/icmp.c                             |   13 ++++++++++
 linux-2.6.17-mm6/include/net/sock.h           |   33 +++++++++++++++++++++++---
 linux-2.6.17.noarch/fs/exec.c                 |    2 -
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++++++++-
 linux-2.6.18-rc1/net/socket.c                 |    8 +++++-
 7 files changed, 78 insertions(+), 9 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-lockdep-fixes.patch	10 Aug 2006 20:20:55 -0000	1.19
+++ linux-2.6-lockdep-fixes.patch	11 Aug 2006 01:54:11 -0000	1.20
@@ -454,3 +454,14 @@
  	printk("inconsistent {%s} -> {%s} usage.\n",
 _
 
+--- linux-2.6.17.noarch/fs/exec.c~	2006-08-10 21:49:38.000000000 -0400
++++ linux-2.6.17.noarch/fs/exec.c	2006-08-10 21:50:36.000000000 -0400
+@@ -753,7 +753,7 @@ no_thread_group:
+ 
+ 		write_lock_irq(&tasklist_lock);
+ 		spin_lock(&oldsighand->siglock);
+-		spin_lock(&newsighand->siglock);
++		spin_lock_nested(&newsighand->siglock, SINGLE_DEPTH_NESTING);
+ 
+ 		rcu_assign_pointer(current->sighand, newsighand);
+ 		recalc_sigpending();



From fedora-cvs-commits at redhat.com  Fri Aug 11 02:18:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 22:18:42 -0400
Subject: rpms/desktop-printing/devel
	desktop-printing-0.19-more-hal-lpadmin.patch, NONE,
	1.1 desktop-printing.spec, 1.61, 1.62
Message-ID: <200608110218.k7B2Ig0b012155@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12094

Modified Files:
	desktop-printing.spec 
Added Files:
	desktop-printing-0.19-more-hal-lpadmin.patch 
Log Message:
- Apply patch from Tim Waugh to make things work better
  with hal-lpadmin (bug 200393)


desktop-printing-0.19-more-hal-lpadmin.patch:
 ec-driver-prompt.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE desktop-printing-0.19-more-hal-lpadmin.patch ---
--- desktop-printing-0.19/eggcups-0.19/ec-driver-prompt.c.test	2006-07-27 13:08:08.000000000 +0100
+++ desktop-printing-0.19/eggcups-0.19/ec-driver-prompt.c	2006-07-27 13:08:11.000000000 +0100
@@ -503,7 +503,6 @@
 		return FALSE;
 	}
 
-	ec_driver_prompt_config_user_printers (self);
 
 	return TRUE;
 }


Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- desktop-printing.spec	19 Jul 2006 18:11:43 -0000	1.61
+++ desktop-printing.spec	11 Aug 2006 02:18:39 -0000	1.62
@@ -6,7 +6,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 11
+Release: 12
 License: GPL
 Group: Applications/File
 # total lie
@@ -16,6 +16,7 @@
 Patch1: eggcups-dbus-send-null-crash.patch
 Patch2: desktop-printing-0.19-hal_lpadmin.patch
 Patch3: desktop-printing-0.19-dbus-deprecated.patch
+Patch4: desktop-printing-0.19-more-hal-lpadmin.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: redhat-menus
@@ -46,6 +47,7 @@
 %patch1 -p0 -b .dbus-null-crash
 %patch2 -p2 -b .hal-lpadmin
 %patch3 -p2 -b .desktop-printing-0.19-dbus-deprecated.patch
+%patch4 -p1 -b .more-hal-lpadmin.patch
 popd
 
 %build
@@ -64,7 +66,7 @@
 
 pushd eggcups-%{version}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 popd
 
@@ -99,6 +101,10 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Thu Aug 10 2006 Ray Strode <rstrode at redhat.com> - 0.19-12
+- Apply patch from Tim Waugh to make things work better
+  with hal-lpadmin (bug 200393)
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.19-11
 - Add BR for dbus-glib-devel
 - Add patch to fix deprecated dbus functions



From fedora-cvs-commits at redhat.com  Fri Aug 11 02:19:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 22:19:33 -0400
Subject: rpms/desktop-printing/devel desktop-printing.spec,1.62,1.63
Message-ID: <200608110219.k7B2JXEX012506@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12449

Modified Files:
	desktop-printing.spec 
Log Message:
s/patch -p1/patch -p2/



Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- desktop-printing.spec	11 Aug 2006 02:18:39 -0000	1.62
+++ desktop-printing.spec	11 Aug 2006 02:19:30 -0000	1.63
@@ -47,7 +47,7 @@
 %patch1 -p0 -b .dbus-null-crash
 %patch2 -p2 -b .hal-lpadmin
 %patch3 -p2 -b .desktop-printing-0.19-dbus-deprecated.patch
-%patch4 -p1 -b .more-hal-lpadmin.patch
+%patch4 -p2 -b .more-hal-lpadmin.patch
 popd
 
 %build



From fedora-cvs-commits at redhat.com  Fri Aug 11 03:12:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 23:12:11 -0400
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.31,
	1.32 policy-20060802.patch, 1.5, 1.6 selinux-policy.spec,
	1.248, 1.249
Message-ID: <200608110312.k7B3CBqC009064@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	modules-targeted.conf policy-20060802.patch 
	selinux-policy.spec 
Log Message:
* Th Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3
- Misc fixes



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- modules-targeted.conf	28 Jul 2006 17:44:17 -0000	1.31
+++ modules-targeted.conf	11 Aug 2006 03:11:59 -0000	1.32
@@ -1109,3 +1109,16 @@
 nagios = module
 
 
+# Layer: apps
+# Module: evolution
+#
+# Evolution email client
+# 
+evolution = module
+
+# Layer: apps
+# Module: mozilla
+#
+# Policy for Mozilla and related web browsers
+# 
+mozilla = module

policy-20060802.patch:
 Makefile                                  |   59 +++----
 policy/mls                                |    9 -
 policy/modules/admin/anaconda.te          |   20 ++
 policy/modules/admin/bootloader.te        |    4 
 policy/modules/admin/consoletype.te       |   11 +
 policy/modules/admin/firstboot.te         |    2 
 policy/modules/admin/prelink.te           |    3 
 policy/modules/admin/rpm.fc               |    2 
 policy/modules/admin/rpm.if               |   13 -
 policy/modules/admin/usermanage.te        |    4 
 policy/modules/apps/java.fc               |    1 
 policy/modules/apps/mozilla.if            |    2 
 policy/modules/kernel/corecommands.fc     |    1 
 policy/modules/kernel/corenetwork.te.in   |    4 
 policy/modules/kernel/devices.fc          |    2 
 policy/modules/kernel/devices.if          |   37 ++++
 policy/modules/kernel/devices.te          |    8 -
 policy/modules/kernel/files.if            |   18 ++
 policy/modules/kernel/filesystem.te       |    2 
 policy/modules/kernel/kernel.if           |   75 +++++++++
 policy/modules/kernel/terminal.if         |   19 ++
 policy/modules/services/amavis.te         |    7 
 policy/modules/services/apache.te         |    1 
 policy/modules/services/avahi.te          |    1 
 policy/modules/services/bind.te           |    1 
 policy/modules/services/bluetooth.te      |    5 
 policy/modules/services/clamav.if         |    1 
 policy/modules/services/cron.if           |   16 +-
 policy/modules/services/cron.te           |    1 
 policy/modules/services/cups.te           |   18 ++
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |    6 
 policy/modules/services/ldap.te           |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/nis.te            |    2 
 policy/modules/services/ntp.te            |    2 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pegasus.if        |   31 +++
 policy/modules/services/pegasus.te        |    5 
 policy/modules/services/postfix.te        |    7 
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/samba.te          |    6 
 policy/modules/services/setroubleshoot.fc |    9 +
 policy/modules/services/setroubleshoot.if |    3 
 policy/modules/services/setroubleshoot.te |  105 +++++++++++++
 policy/modules/services/spamassassin.te   |    4 
 policy/modules/services/squid.te          |    4 
 policy/modules/services/ssh.if            |   26 +++
 policy/modules/services/ssh.te            |    9 +
 policy/modules/services/stunnel.te        |    4 
 policy/modules/services/xserver.if        |   69 ++++++++
 policy/modules/services/xserver.te        |   19 +-
 policy/modules/system/authlogin.te        |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/hostname.te         |   10 -
 policy/modules/system/init.if             |    7 
 policy/modules/system/init.te             |    2 
 policy/modules/system/libraries.fc        |    4 
 policy/modules/system/locallogin.te       |    4 
 policy/modules/system/logging.fc          |    3 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    3 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   18 ++
 policy/modules/system/modutils.te         |    1 
 policy/modules/system/mount.te            |    3 
 policy/modules/system/selinuxutil.te      |   11 +
 policy/modules/system/udev.fc             |    1 
 policy/modules/system/udev.te             |    1 
 policy/modules/system/unconfined.if       |    2 
 policy/modules/system/unconfined.te       |    5 
 policy/modules/system/userdomain.if       |  236 ++++++++++++++++++++----------
 policy/modules/system/userdomain.te       |   48 ++----
 policy/modules/system/xen.if              |   38 ++++
 policy/modules/system/xen.te              |   26 ++-
 75 files changed, 904 insertions(+), 209 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- policy-20060802.patch	9 Aug 2006 19:14:24 -0000	1.5
+++ policy-20060802.patch	11 Aug 2006 03:11:59 -0000	1.6
@@ -1,3 +1,163 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.3.6/Makefile
+--- nsaserefpolicy/Makefile	2006-08-10 09:14:45.000000000 -0400
++++ serefpolicy-2.3.6/Makefile	2006-08-08 16:00:22.000000000 -0400
+@@ -67,7 +67,6 @@
+ # interpreters and aux tools
+ AWK ?= gawk
+ GREP ?= egrep
+-INSTALL ?= install
+ M4 ?= m4
+ PYTHON ?= python
+ SED ?= sed
+@@ -305,8 +304,8 @@
+ 
+ # parse-rolemap modulename,outputfile
+ define parse-rolemap
+-	$(verbose) $(M4) $(M4PARAM) $(ROLEMAP) | \
+-		$(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
++	$(verbose) m4 $(M4PARAM) $(ROLEMAP) | \
++		awk '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
+ endef
+ 
+ # peruser-expansion modulename,outputfile
+@@ -341,17 +340,17 @@
+ 	@echo "# $(notdir $@).in or $(notdir $@).m4 file should be modified." >> $@
+ 	@echo "#" >> $@
+ 	$(verbose) cat $(MODDIR)/kernel/corenetwork.if.in >> $@
+-	$(verbose) $(GREP) "^[[:blank:]]*network_(interface|node|port|packet)\(.*\)" $(@:.if=.te).in \
+-		| $(M4) -D self_contained_policy $(M4PARAM) $(MODDIR)/kernel/corenetwork.if.m4 - \
+-		| $(SED) -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
++	$(verbose) egrep "^[[:blank:]]*network_(interface|node|port|packet)\(.*\)" $(@:.if=.te).in \
++		| m4 -D self_contained_policy $(M4PARAM) $(MODDIR)/kernel/corenetwork.if.m4 - \
++		| sed -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
+ 
+ $(MODDIR)/kernel/corenetwork.te: $(MODDIR)/kernel/corenetwork.te.m4 $(MODDIR)/kernel/corenetwork.te.in
+ 	@echo "#" > $@
+ 	@echo "# This is a generated file!  Instead of modifying this file, the" >> $@
+ 	@echo "# $(notdir $@).in or $(notdir $@).m4 file should be modified." >> $@
+ 	@echo "#" >> $@
+-	$(verbose) $(M4) -D self_contained_policy $(M4PARAM) $^ \
+-		| $(SED) -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
++	$(verbose) m4 -D self_contained_policy $(M4PARAM) $^ \
++		| sed -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
+ 
+ ########################################
+ #
+@@ -422,14 +421,14 @@
+ 	@echo "# This file is replaced on reinstalls of this policy." >> $(TMPDIR)/system.users
+ 	@echo "# Please edit local.users to make local changes." >> $(TMPDIR)/system.users
+ 	@echo "#" >> $(TMPDIR)/system.users
+-	$(verbose) $(M4) -D self_contained_policy $(M4PARAM) $^ | $(SED) -r -e 's/^[[:blank:]]+//' \
++	$(verbose) m4 -D self_contained_policy $(M4PARAM) $^ | sed -r -e 's/^[[:blank:]]+//' \
+ 		-e '/^[[:blank:]]*($$|#)/d' >> $(TMPDIR)/system.users
+-	$(verbose) $(INSTALL) -m 644 $(TMPDIR)/system.users $@
++	$(verbose) install -m 644 $(TMPDIR)/system.users $@
+ 
+ $(USERPATH)/local.users: config/local.users
+ 	@mkdir -p $(USERPATH)
+ 	@echo "Installing local.users"
+-	$(verbose) $(INSTALL) -b -m 644 $< $@
++	$(verbose) install -b -m 644 $< $@
+ 
+ ########################################
+ #
+@@ -440,45 +439,45 @@
+ $(INSTALLDIR)/booleans: $(BOOLEANS)
+ 	@mkdir -p $(TMPDIR)
+ 	@mkdir -p $(INSTALLDIR)
+-	$(verbose) $(SED) -r -e 's/false/0/g' -e 's/true/1/g' \
+-		-e '/^[[:blank:]]*($$|#)/d' $(BOOLEANS) | $(SORT) > $(TMPDIR)/booleans
+-	$(verbose) $(INSTALL) -m 644 $(TMPDIR)/booleans $@
++	$(verbose) sed -r -e 's/false/0/g' -e 's/true/1/g' \
++		-e '/^[[:blank:]]*($$|#)/d' $(BOOLEANS) | sort > $(TMPDIR)/booleans
++	$(verbose) install -m 644 $(TMPDIR)/booleans $@
+ 
+ $(CONTEXTPATH)/files/media: $(APPCONF)/media
+ 	@mkdir -p $(CONTEXTPATH)/files/
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/default_contexts: $(APPCONF)/default_contexts
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/removable_context: $(APPCONF)/removable_context
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/default_type: $(APPCONF)/default_type
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/userhelper_context: $(APPCONF)/userhelper_context
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/initrc_context: $(APPCONF)/initrc_context
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/failsafe_context: $(APPCONF)/failsafe_context
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/dbus_contexts: $(APPCONF)/dbus_contexts
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/users/root: $(APPCONF)/root_default_contexts
+ 	@mkdir -p $(APPDIR)/users
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ ########################################
+ #
+@@ -487,14 +486,14 @@
+ install-headers: $(TUNXML) $(BOOLXML)
+ 	@mkdir -p $(HEADERDIR)
+ 	@echo "Installing $(TYPE) policy headers."
+-	$(verbose) $(INSTALL) -m 644 $(TUNXML) $(BOOLXML) $(HEADERDIR)
+-	$(verbose) $(M4) $(M4PARAM) $(ROLEMAP) > $(HEADERDIR)/$(notdir $(ROLEMAP))
++	$(verbose) install -m 644 $(TUNXML) $(BOOLXML) $(HEADERDIR)
++	$(verbose) m4 $(M4PARAM) $(ROLEMAP) > $(HEADERDIR)/$(notdir $(ROLEMAP))
+ 	$(verbose) mkdir -p $(HEADERDIR)/support
+-	$(verbose) $(INSTALL) -m 644 $(M4SUPPORT) $(word $(words $(GENXML)),$(GENXML)) $(XMLDTD) $(HEADERDIR)/support
++	$(verbose) install -m 644 $(M4SUPPORT) $(word $(words $(GENXML)),$(GENXML)) $(XMLDTD) $(HEADERDIR)/support
+ 	$(verbose) $(GENPERM) $(AVS) $(SECCLASS) > $(HEADERDIR)/support/all_perms.spt
+ 	$(verbose) for i in $(notdir $(ALL_LAYERS)); do \
+ 		mkdir -p $(HEADERDIR)/$$i ;\
+-		$(INSTALL) -m 644 $(MODDIR)/$$i/*.if \
++		install -m 644 $(MODDIR)/$$i/*.if \
+ 			$(MODDIR)/$$i/metadata.xml \
+ 			$(HEADERDIR)/$$i ;\
+ 	done
+@@ -506,7 +505,7 @@
+ 	$(verbose) echo "MONOLITHIC ?= n" >> $(HEADERDIR)/build.conf
+ 	$(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> $(HEADERDIR)/build.conf
+ 	$(verbose) echo "POLY ?= $(POLY)" >> $(HEADERDIR)/build.conf
+-	$(verbose) $(INSTALL) -m 644 $(SUPPORT)/Makefile.devel $(HEADERDIR)/Makefile
++	$(verbose) install -m 644 $(SUPPORT)/Makefile.devel $(HEADERDIR)/Makefile
+ 
+ ########################################
+ #
+@@ -515,8 +514,8 @@
+ install-docs: $(TMPDIR)/html
+ 	@mkdir -p $(DOCSDIR)/html
+ 	@echo "Installing policy documentation"
+-	$(verbose) $(INSTALL) -m 644 $(DOCFILES) $(DOCSDIR)
+-	$(verbose) $(INSTALL) -m 644 $(wildcard $(HTMLDIR)/*) $(DOCSDIR)/html
++	$(verbose) install -m 644 $(DOCFILES) $(DOCSDIR)
++	$(verbose) install -m 644 $(wildcard $(HTMLDIR)/*) $(DOCSDIR)/html
+ 
+ ########################################
+ #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.6/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.6/policy/mls	2006-08-08 16:15:43.000000000 -0400
@@ -67,6 +227,21 @@
 +dontaudit domain anaconda_t:fifo_file r_file_perms;
 +dontaudit domain anaconda_t:unix_stream_socket connectto;
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.6/policy/modules/admin/bootloader.te
+--- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/bootloader.te	2006-08-10 14:25:32.000000000 -0400
+@@ -83,8 +83,10 @@
+ dev_read_rand(bootloader_t)
+ dev_read_urand(bootloader_t)
+ dev_read_sysfs(bootloader_t)
+-# for reading BIOS data
++# for reading/Writing BIOS data
+ dev_read_raw_memory(bootloader_t)
++dev_read_bios_memory(bootloader_t)
++dev_write_bios_memory(bootloader_t)
+ 
+ fs_getattr_xattr_fs(bootloader_t)
+ fs_getattr_tmpfs(bootloader_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.6/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/admin/consoletype.te	2006-08-08 16:15:43.000000000 -0400
@@ -133,6 +308,29 @@
  ')
  
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.6/policy/modules/admin/rpm.if
+--- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/rpm.if	2006-08-10 13:47:39.000000000 -0400
+@@ -75,12 +75,13 @@
+ 	')
+ 
+ 	rpm_domtrans($1)
+-	role $2 types rpm_t;
+-	role $2 types rpm_script_t;
+-	seutil_run_loadpolicy(rpm_script_t,$2,$3)
+-	seutil_run_semanage(rpm_script_t,$2,$3)
+-	seutil_run_setfiles(rpm_script_t,$2,$3)
+-	seutil_run_restorecon(rpm_script_t,$2,$3)
++	#role $2 types rpm_t;
++	#role $2 types rpm_script_t;
++	role_transition $2 rpm_exec_t system_r;
++	seutil_run_loadpolicy(rpm_script_t,system_r,$3)
++	seutil_run_semanage(rpm_script_t,system_r,$3)
++	seutil_run_setfiles(rpm_script_t,system_r,$3)
++	seutil_run_restorecon(rpm_script_t,system_r,$3)
+ 	allow rpm_t $3:chr_file rw_term_perms;
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.6/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/admin/usermanage.te	2006-08-08 16:15:43.000000000 -0400
@@ -154,6 +352,14 @@
  	nscd_socket_use(useradd_t)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.6/policy/modules/apps/java.fc
+--- nsaserefpolicy/policy/modules/apps/java.fc	2006-07-14 17:04:31.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/apps/java.fc	2006-08-10 15:37:22.000000000 -0400
+@@ -10,3 +10,4 @@
+ /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)
++/usr/bin/frysk		--	gen_context(system_u:object_r:java_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.6/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-08 14:59:36.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/apps/mozilla.if	2006-08-08 16:15:43.000000000 -0400
@@ -212,10 +418,79 @@
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
  network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
  network_port(spamd, tcp,783,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.6/policy/modules/kernel/devices.fc
+--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-02 10:34:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/devices.fc	2006-08-10 14:22:57.000000000 -0400
+@@ -37,7 +37,7 @@
+ /dev/mpu401.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/null		-c	gen_context(system_u:object_r:null_device_t,s0)
+ /dev/nvidia.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
+-/dev/nvram		-c	gen_context(system_u:object_r:memory_device_t,s15:c0.c255)
++/dev/nvram		-c	gen_context(system_u:object_r:bios_device_t,s15:c0.c255)
+ /dev/par.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
+ /dev/patmgr[01]		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/pmu		-c	gen_context(system_u:object_r:power_device_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.3.6/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-08-02 10:34:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/devices.if	2006-08-10 14:25:22.000000000 -0400
+@@ -2992,3 +2992,40 @@
+ 
+ 	typeattribute $1 devices_unconfined_type;
+ ')
++
++########################################
++## <summary>
++##	read bios memory devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_read_bios',`
++	gen_require(`
++		type bios_device_t;
++	')
++
++	allow $1 bios_device_t:chr_file r_file_perms;
++')
++
++########################################
++## <summary>
++##	write bios memory devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_write_bios',`
++	gen_require(`
++		type bios_device_t;
++	')
++
++	allow $1 bios_device_t:chr_file write;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.6/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/devices.te	2006-08-08 16:15:43.000000000 -0400
-@@ -166,7 +166,7 @@
++++ serefpolicy-2.3.6/policy/modules/kernel/devices.te	2006-08-10 14:22:36.000000000 -0400
+@@ -72,6 +72,12 @@
+ dev_node(lvm_control_t)
+ 
+ #
++# bios_device_t is the type of /dev/nvram 
++#
++type bios_device_t;
++dev_node(bios_device_t)
++
++#
+ # memory_device_t is the type of /dev/kmem,
+ # /dev/mem and /dev/port.
+ #
+@@ -166,7 +172,7 @@
  dev_node(vmware_device_t)
  
  type watchdog_device_t;
@@ -536,7 +811,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.6/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cups.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cups.te	2006-08-10 15:07:59.000000000 -0400
 @@ -74,13 +74,14 @@
  #
  
@@ -572,6 +847,30 @@
  
  sysnet_read_config(cupsd_t)
  
+@@ -232,6 +236,15 @@
+ ')
+ 
+ optional_policy(`
++	apm_domtrans_client(cupsd_t)
++')
++
++optional_policy(`
++	logrotate_domtrans(cupsd_t)
++')
++
++
++optional_policy(`
+ 	cron_system_entry(cupsd_t, cupsd_exec_t)
+ ')
+ 
+@@ -419,6 +432,7 @@
+ 	term_use_generic_ptys(cupsd_config_t)
+ 
+ 	unconfined_rw_pipes(cupsd_config_t)
++	unconfined_rw_pipes(cupsd_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.6/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/services/cyrus.te	2006-08-09 12:58:45.000000000 -0400
@@ -618,6 +917,18 @@
  
  kernel_read_system_state(slapd_t)
  kernel_read_kernel_sysctls(slapd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-2.3.6/policy/modules/services/mta.fc
+--- nsaserefpolicy/policy/modules/services/mta.fc	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/mta.fc	2006-08-10 10:10:26.000000000 -0400
+@@ -2,6 +2,8 @@
+ /etc/aliases		--	gen_context(system_u:object_r:etc_aliases_t,s0)
+ /etc/aliases\.db	--	gen_context(system_u:object_r:etc_aliases_t,s0)
+ /etc/mail(/.*)?			gen_context(system_u:object_r:etc_mail_t,s0)
++/etc/mail/aliases 	-- gen_context(system_u:object_r:etc_aliases_t,s0)
++/etc/mail/aliases\.db 	-- gen_context(system_u:object_r:etc_aliases_t,s0) 
+ ifdef(`distro_redhat',`
+ /etc/postfix/aliases.*		gen_context(system_u:object_r:etc_aliases_t,s0)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.6/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/services/nis.te	2006-08-08 16:15:43.000000000 -0400
@@ -642,6 +953,18 @@
  dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
  allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
  allow ntpd_t self:fifo_file { read write getattr };
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.6/policy/modules/services/openvpn.te
+--- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/openvpn.te	2006-08-10 09:10:52.000000000 -0400
+@@ -33,7 +33,7 @@
+ allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow openvpn_t self:udp_socket create_socket_perms;
+ allow openvpn_t self:tcp_socket create_socket_perms;
+-allow openvpn_t self:netlink_route_socket r_netlink_socket_perms;
++allow openvpn_t self:netlink_route_socket rw_netlink_socket_perms;
+ 
+ allow openvpn_t openvpn_etc_t:dir r_dir_perms;
+ allow openvpn_t openvpn_etc_t:file r_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.6/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/services/pegasus.if	2006-08-08 16:15:43.000000000 -0400
@@ -748,7 +1071,16 @@
  corenet_tcp_sendrecv_all_nodes(procmail_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.6/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/samba.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/samba.te	2006-08-10 09:22:27.000000000 -0400
+@@ -171,7 +171,7 @@
+ #
+ # smbd Local policy
+ #
+-allow smbd_t self:capability { setgid setuid sys_resource lease dac_override dac_read_search };
++allow smbd_t self:capability { fowner setgid setuid sys_resource lease dac_override dac_read_search };
+ dontaudit smbd_t self:capability sys_tty_config;
+ allow smbd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow smbd_t self:process setrlimit;
 @@ -191,7 +191,7 @@
  allow smbd_t samba_etc_t:dir rw_dir_perms;
  allow smbd_t samba_etc_t:file { rw_file_perms setattr };
@@ -924,14 +1256,22 @@
  allow squid_t self:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.6/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ssh.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ssh.if	2006-08-10 12:38:16.000000000 -0400
 @@ -1,5 +1,4 @@
  ## <summary>Secure shell client and server policy.</summary>
 -
  #######################################
  ## <summary>
  ##	Basic SSH client template.
-@@ -717,3 +716,27 @@
+@@ -330,7 +329,6 @@
+ 	allow $1_ssh_agent_t $1_ssh_agent_tmp_t:dir manage_dir_perms;
+ 	allow $1_ssh_agent_t $1_ssh_agent_tmp_t:sock_file manage_file_perms;
+ 	files_tmp_filetrans($1_ssh_agent_t,$1_ssh_agent_tmp_t,{ dir sock_file })
+-
+ 	# for ssh-add
+ 	allow $2 $1_ssh_agent_t:unix_stream_socket connectto;
+ 	allow $2 $1_ssh_agent_tmp_t:sock_file write;
+@@ -717,3 +715,27 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')
@@ -959,6 +1299,32 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.3.6/policy/modules/services/ssh.te
+--- nsaserefpolicy/policy/modules/services/ssh.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ssh.te	2006-08-10 11:38:43.000000000 -0400
+@@ -39,6 +39,9 @@
+ 	type ssh_agent_exec_t;
+ 	files_type(ssh_agent_exec_t)
+ 
++	type ssh_agent_tmp_t;
++	files_tmp_file(ssh_agent_tmp_t)
++
+ 	type ssh_keygen_t;
+ 	init_system_domain(ssh_keygen_t,ssh_keygen_exec_t)
+ 	role system_r types ssh_keygen_t;
+@@ -61,6 +64,12 @@
+ 
+ 	type sshd_tmp_t;
+ 	files_tmp_file(sshd_tmp_t)
++
++	allow ssh_agent_t ssh_agent_tmp_t:dir create_dir_perms;
++	allow ssh_agent_t ssh_agent_tmp_t:file create_file_perms;
++	allow ssh_agent_t ssh_agent_tmp_t:sock_file create_file_perms;
++	files_tmp_filetrans(ssh_agent_t, tmp_t, { dir file sock_file })
++
+ ')
+ 
+ #################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.6/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/services/stunnel.te	2006-08-08 16:15:43.000000000 -0400
@@ -1158,6 +1524,17 @@
  
  	unconfined_domain_noaudit(xdm_xserver_t)
  	unconfined_domtrans(xdm_xserver_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.6/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/authlogin.te	2006-08-10 13:18:13.000000000 -0400
+@@ -273,6 +273,7 @@
+ 
+ term_dontaudit_use_unallocated_ttys(system_chkpwd_t)
+ term_dontaudit_use_generic_ptys(system_chkpwd_t)
++term_dontaudit_use_all_user_ttys(system_chkpwd_t)
+ 
+ userdom_dontaudit_use_unpriv_users_ttys(system_chkpwd_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.6/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/system/fstools.te	2006-08-08 16:15:43.000000000 -0400
@@ -1350,6 +1727,17 @@
  ##	Allow process to read legacy time localization info
  ## </summary>
  ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.6/policy/modules/system/modutils.te
+--- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/modutils.te	2006-08-10 13:13:14.000000000 -0400
+@@ -183,6 +183,7 @@
+ fs_getattr_xattr_fs(depmod_t)
+ 
+ term_use_console(depmod_t)
++term_use_all_terms(depmod_t)
+ 
+ corecmd_search_bin(depmod_t)
+ corecmd_search_sbin(depmod_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.6/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/system/mount.te	2006-08-08 16:38:58.000000000 -0400
@@ -1890,7 +2278,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.6/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/userdomain.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/userdomain.te	2006-08-10 13:44:38.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -1906,15 +2294,6 @@
  ifdef(`targeted_policy',`
  	# Define some type aliases to help with compatibility with
  	# macros and domains from the "strict" policy.
-@@ -85,7 +77,7 @@
- 	# compatibility for switching from strict
- #	dominance { role secadm_r { role system_r; }}
- #	dominance { role auditadm_r { role system_r; }}
--#	dominance { role sysadm_r { role system_r; }}
-+	dominance { role sysadm_r { role system_r; }}
- #	dominance { role user_r { role system_r; }}
- #	dominance { role staff_r { role system_r; }}
- 
 @@ -124,34 +116,34 @@
  
  	# user role change rules:


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- selinux-policy.spec	9 Aug 2006 19:14:24 -0000	1.248
+++ selinux-policy.spec	11 Aug 2006 03:11:59 -0000	1.249
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.6
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Th Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3
+- Misc fixes
+
 * Wed Aug 9 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-2
 - More fixes for strict policy
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 03:14:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 23:14:57 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060802.patch, 1.3,
	1.4 selinux-policy.spec, 1.180, 1.181
Message-ID: <200608110314.k7B3EvFv010082@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060802.patch selinux-policy.spec 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3.fc5
- Bump for FC5


policy-20060802.patch:
 Makefile                                  |   59 +++----
 policy/mls                                |    9 -
 policy/modules/admin/anaconda.te          |   20 ++
 policy/modules/admin/bootloader.te        |    4 
 policy/modules/admin/consoletype.te       |   11 +
 policy/modules/admin/firstboot.te         |    2 
 policy/modules/admin/prelink.te           |    3 
 policy/modules/admin/rpm.fc               |    2 
 policy/modules/admin/rpm.if               |   13 -
 policy/modules/admin/usermanage.te        |    4 
 policy/modules/apps/java.fc               |    1 
 policy/modules/apps/mozilla.if            |    2 
 policy/modules/kernel/corecommands.fc     |    1 
 policy/modules/kernel/corenetwork.te.in   |    4 
 policy/modules/kernel/devices.fc          |    2 
 policy/modules/kernel/devices.if          |   37 ++++
 policy/modules/kernel/devices.te          |    8 -
 policy/modules/kernel/files.if            |   18 ++
 policy/modules/kernel/filesystem.te       |    2 
 policy/modules/kernel/kernel.if           |   75 +++++++++
 policy/modules/kernel/terminal.if         |   19 ++
 policy/modules/services/amavis.te         |    7 
 policy/modules/services/apache.te         |    1 
 policy/modules/services/avahi.te          |    1 
 policy/modules/services/bind.te           |    1 
 policy/modules/services/bluetooth.te      |    5 
 policy/modules/services/clamav.if         |    1 
 policy/modules/services/cron.if           |   16 +-
 policy/modules/services/cron.te           |    1 
 policy/modules/services/cups.te           |   18 ++
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |    6 
 policy/modules/services/ldap.te           |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/nis.te            |    2 
 policy/modules/services/ntp.te            |    2 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pegasus.if        |   31 +++
 policy/modules/services/pegasus.te        |    5 
 policy/modules/services/postfix.te        |    7 
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/samba.te          |    6 
 policy/modules/services/setroubleshoot.fc |    9 +
 policy/modules/services/setroubleshoot.if |    3 
 policy/modules/services/setroubleshoot.te |  105 +++++++++++++
 policy/modules/services/spamassassin.te   |    4 
 policy/modules/services/squid.te          |    4 
 policy/modules/services/ssh.if            |   26 +++
 policy/modules/services/ssh.te            |    9 +
 policy/modules/services/stunnel.te        |    4 
 policy/modules/services/xserver.if        |   68 ++++++++
 policy/modules/services/xserver.te        |   15 +
 policy/modules/system/authlogin.te        |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/hostname.te         |   10 -
 policy/modules/system/init.if             |    7 
 policy/modules/system/init.te             |    2 
 policy/modules/system/libraries.fc        |    4 
 policy/modules/system/locallogin.te       |    4 
 policy/modules/system/logging.fc          |    3 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    3 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   18 ++
 policy/modules/system/modutils.te         |    1 
 policy/modules/system/mount.te            |    3 
 policy/modules/system/selinuxutil.te      |   11 +
 policy/modules/system/udev.fc             |    1 
 policy/modules/system/udev.te             |    1 
 policy/modules/system/unconfined.if       |    2 
 policy/modules/system/unconfined.te       |    5 
 policy/modules/system/userdomain.if       |  236 ++++++++++++++++++++----------
 policy/modules/system/userdomain.te       |   48 ++----
 policy/modules/system/xen.if              |   38 ++++
 policy/modules/system/xen.te              |   26 ++-
 75 files changed, 902 insertions(+), 206 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060802.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- policy-20060802.patch	10 Aug 2006 13:29:13 -0000	1.3
+++ policy-20060802.patch	11 Aug 2006 03:14:53 -0000	1.4
@@ -1,6 +1,166 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.3.6/Makefile
+--- nsaserefpolicy/Makefile	2006-08-10 09:14:45.000000000 -0400
++++ serefpolicy-2.3.6/Makefile	2006-08-08 16:00:22.000000000 -0400
+@@ -67,7 +67,6 @@
+ # interpreters and aux tools
+ AWK ?= gawk
+ GREP ?= egrep
+-INSTALL ?= install
+ M4 ?= m4
+ PYTHON ?= python
+ SED ?= sed
+@@ -305,8 +304,8 @@
+ 
+ # parse-rolemap modulename,outputfile
+ define parse-rolemap
+-	$(verbose) $(M4) $(M4PARAM) $(ROLEMAP) | \
+-		$(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
++	$(verbose) m4 $(M4PARAM) $(ROLEMAP) | \
++		awk '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
+ endef
+ 
+ # peruser-expansion modulename,outputfile
+@@ -341,17 +340,17 @@
+ 	@echo "# $(notdir $@).in or $(notdir $@).m4 file should be modified." >> $@
+ 	@echo "#" >> $@
+ 	$(verbose) cat $(MODDIR)/kernel/corenetwork.if.in >> $@
+-	$(verbose) $(GREP) "^[[:blank:]]*network_(interface|node|port|packet)\(.*\)" $(@:.if=.te).in \
+-		| $(M4) -D self_contained_policy $(M4PARAM) $(MODDIR)/kernel/corenetwork.if.m4 - \
+-		| $(SED) -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
++	$(verbose) egrep "^[[:blank:]]*network_(interface|node|port|packet)\(.*\)" $(@:.if=.te).in \
++		| m4 -D self_contained_policy $(M4PARAM) $(MODDIR)/kernel/corenetwork.if.m4 - \
++		| sed -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
+ 
+ $(MODDIR)/kernel/corenetwork.te: $(MODDIR)/kernel/corenetwork.te.m4 $(MODDIR)/kernel/corenetwork.te.in
+ 	@echo "#" > $@
+ 	@echo "# This is a generated file!  Instead of modifying this file, the" >> $@
+ 	@echo "# $(notdir $@).in or $(notdir $@).m4 file should be modified." >> $@
+ 	@echo "#" >> $@
+-	$(verbose) $(M4) -D self_contained_policy $(M4PARAM) $^ \
+-		| $(SED) -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
++	$(verbose) m4 -D self_contained_policy $(M4PARAM) $^ \
++		| sed -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
+ 
+ ########################################
+ #
+@@ -422,14 +421,14 @@
+ 	@echo "# This file is replaced on reinstalls of this policy." >> $(TMPDIR)/system.users
+ 	@echo "# Please edit local.users to make local changes." >> $(TMPDIR)/system.users
+ 	@echo "#" >> $(TMPDIR)/system.users
+-	$(verbose) $(M4) -D self_contained_policy $(M4PARAM) $^ | $(SED) -r -e 's/^[[:blank:]]+//' \
++	$(verbose) m4 -D self_contained_policy $(M4PARAM) $^ | sed -r -e 's/^[[:blank:]]+//' \
+ 		-e '/^[[:blank:]]*($$|#)/d' >> $(TMPDIR)/system.users
+-	$(verbose) $(INSTALL) -m 644 $(TMPDIR)/system.users $@
++	$(verbose) install -m 644 $(TMPDIR)/system.users $@
+ 
+ $(USERPATH)/local.users: config/local.users
+ 	@mkdir -p $(USERPATH)
+ 	@echo "Installing local.users"
+-	$(verbose) $(INSTALL) -b -m 644 $< $@
++	$(verbose) install -b -m 644 $< $@
+ 
+ ########################################
+ #
+@@ -440,45 +439,45 @@
+ $(INSTALLDIR)/booleans: $(BOOLEANS)
+ 	@mkdir -p $(TMPDIR)
+ 	@mkdir -p $(INSTALLDIR)
+-	$(verbose) $(SED) -r -e 's/false/0/g' -e 's/true/1/g' \
+-		-e '/^[[:blank:]]*($$|#)/d' $(BOOLEANS) | $(SORT) > $(TMPDIR)/booleans
+-	$(verbose) $(INSTALL) -m 644 $(TMPDIR)/booleans $@
++	$(verbose) sed -r -e 's/false/0/g' -e 's/true/1/g' \
++		-e '/^[[:blank:]]*($$|#)/d' $(BOOLEANS) | sort > $(TMPDIR)/booleans
++	$(verbose) install -m 644 $(TMPDIR)/booleans $@
+ 
+ $(CONTEXTPATH)/files/media: $(APPCONF)/media
+ 	@mkdir -p $(CONTEXTPATH)/files/
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/default_contexts: $(APPCONF)/default_contexts
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/removable_context: $(APPCONF)/removable_context
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/default_type: $(APPCONF)/default_type
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/userhelper_context: $(APPCONF)/userhelper_context
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/initrc_context: $(APPCONF)/initrc_context
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/failsafe_context: $(APPCONF)/failsafe_context
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/dbus_contexts: $(APPCONF)/dbus_contexts
+ 	@mkdir -p $(APPDIR)
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ $(APPDIR)/users/root: $(APPCONF)/root_default_contexts
+ 	@mkdir -p $(APPDIR)/users
+-	$(verbose) $(INSTALL) -m 644 $< $@
++	$(verbose) install -m 644 $< $@
+ 
+ ########################################
+ #
+@@ -487,14 +486,14 @@
+ install-headers: $(TUNXML) $(BOOLXML)
+ 	@mkdir -p $(HEADERDIR)
+ 	@echo "Installing $(TYPE) policy headers."
+-	$(verbose) $(INSTALL) -m 644 $(TUNXML) $(BOOLXML) $(HEADERDIR)
+-	$(verbose) $(M4) $(M4PARAM) $(ROLEMAP) > $(HEADERDIR)/$(notdir $(ROLEMAP))
++	$(verbose) install -m 644 $(TUNXML) $(BOOLXML) $(HEADERDIR)
++	$(verbose) m4 $(M4PARAM) $(ROLEMAP) > $(HEADERDIR)/$(notdir $(ROLEMAP))
+ 	$(verbose) mkdir -p $(HEADERDIR)/support
+-	$(verbose) $(INSTALL) -m 644 $(M4SUPPORT) $(word $(words $(GENXML)),$(GENXML)) $(XMLDTD) $(HEADERDIR)/support
++	$(verbose) install -m 644 $(M4SUPPORT) $(word $(words $(GENXML)),$(GENXML)) $(XMLDTD) $(HEADERDIR)/support
+ 	$(verbose) $(GENPERM) $(AVS) $(SECCLASS) > $(HEADERDIR)/support/all_perms.spt
+ 	$(verbose) for i in $(notdir $(ALL_LAYERS)); do \
+ 		mkdir -p $(HEADERDIR)/$$i ;\
+-		$(INSTALL) -m 644 $(MODDIR)/$$i/*.if \
++		install -m 644 $(MODDIR)/$$i/*.if \
+ 			$(MODDIR)/$$i/metadata.xml \
+ 			$(HEADERDIR)/$$i ;\
+ 	done
+@@ -506,7 +505,7 @@
+ 	$(verbose) echo "MONOLITHIC ?= n" >> $(HEADERDIR)/build.conf
+ 	$(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> $(HEADERDIR)/build.conf
+ 	$(verbose) echo "POLY ?= $(POLY)" >> $(HEADERDIR)/build.conf
+-	$(verbose) $(INSTALL) -m 644 $(SUPPORT)/Makefile.devel $(HEADERDIR)/Makefile
++	$(verbose) install -m 644 $(SUPPORT)/Makefile.devel $(HEADERDIR)/Makefile
+ 
+ ########################################
+ #
+@@ -515,8 +514,8 @@
+ install-docs: $(TMPDIR)/html
+ 	@mkdir -p $(DOCSDIR)/html
+ 	@echo "Installing policy documentation"
+-	$(verbose) $(INSTALL) -m 644 $(DOCFILES) $(DOCSDIR)
+-	$(verbose) $(INSTALL) -m 644 $(wildcard $(HTMLDIR)/*) $(DOCSDIR)/html
++	$(verbose) install -m 644 $(DOCFILES) $(DOCSDIR)
++	$(verbose) install -m 644 $(wildcard $(HTMLDIR)/*) $(DOCSDIR)/html
+ 
+ ########################################
+ #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.6/policy/mls
---- nsaserefpolicy/policy/mls	2006-08-08 16:00:22.000000000 -0400
-+++ serefpolicy-2.3.6/policy/mls	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.6/policy/mls	2006-08-08 16:15:43.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -23,8 +183,8 @@
  	((( l1 dom l2 ) and ( l1 domby h2 )) or
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.6/policy/modules/admin/anaconda.te
---- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-08-08 16:00:25.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/anaconda.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/anaconda.te	2006-08-08 16:15:43.000000000 -0400
 @@ -25,8 +25,12 @@
  
  modutils_domtrans_insmod(anaconda_t)
@@ -67,9 +227,24 @@
 +dontaudit domain anaconda_t:fifo_file r_file_perms;
 +dontaudit domain anaconda_t:unix_stream_socket connectto;
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.6/policy/modules/admin/bootloader.te
+--- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/bootloader.te	2006-08-10 14:25:32.000000000 -0400
+@@ -83,8 +83,10 @@
+ dev_read_rand(bootloader_t)
+ dev_read_urand(bootloader_t)
+ dev_read_sysfs(bootloader_t)
+-# for reading BIOS data
++# for reading/Writing BIOS data
+ dev_read_raw_memory(bootloader_t)
++dev_read_bios_memory(bootloader_t)
++dev_write_bios_memory(bootloader_t)
+ 
+ fs_getattr_xattr_fs(bootloader_t)
+ fs_getattr_tmpfs(bootloader_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.6/policy/modules/admin/consoletype.te
---- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-08-08 16:00:25.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/consoletype.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/consoletype.te	2006-08-08 16:15:43.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -93,8 +268,8 @@
 +	xen_dontaudit_use_fds(consoletype_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.6/policy/modules/admin/firstboot.te
---- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-08 16:00:25.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/firstboot.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/firstboot.te	2006-08-08 16:15:43.000000000 -0400
 @@ -106,7 +106,7 @@
  ')
  
@@ -105,8 +280,8 @@
  
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.6/policy/modules/admin/prelink.te
---- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-08 16:00:25.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/prelink.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/prelink.te	2006-08-08 16:15:43.000000000 -0400
 @@ -1,4 +1,3 @@
 -
  policy_module(prelink,1.1.5)
@@ -122,8 +297,8 @@
  	cron_system_entry(prelink_t, prelink_exec_t)
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.6/policy/modules/admin/rpm.fc
---- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/rpm.fc	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/rpm.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -133,9 +308,32 @@
  ')
  
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.6/policy/modules/admin/rpm.if
+--- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/rpm.if	2006-08-10 13:47:39.000000000 -0400
+@@ -75,12 +75,13 @@
+ 	')
+ 
+ 	rpm_domtrans($1)
+-	role $2 types rpm_t;
+-	role $2 types rpm_script_t;
+-	seutil_run_loadpolicy(rpm_script_t,$2,$3)
+-	seutil_run_semanage(rpm_script_t,$2,$3)
+-	seutil_run_setfiles(rpm_script_t,$2,$3)
+-	seutil_run_restorecon(rpm_script_t,$2,$3)
++	#role $2 types rpm_t;
++	#role $2 types rpm_script_t;
++	role_transition $2 rpm_exec_t system_r;
++	seutil_run_loadpolicy(rpm_script_t,system_r,$3)
++	seutil_run_semanage(rpm_script_t,system_r,$3)
++	seutil_run_setfiles(rpm_script_t,system_r,$3)
++	seutil_run_restorecon(rpm_script_t,system_r,$3)
+ 	allow rpm_t $3:chr_file rw_term_perms;
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.6/policy/modules/admin/usermanage.te
---- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-08 16:00:25.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/usermanage.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/admin/usermanage.te	2006-08-08 16:15:43.000000000 -0400
 @@ -260,7 +260,7 @@
  ')
  
@@ -154,9 +352,17 @@
  	nscd_socket_use(useradd_t)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.6/policy/modules/apps/java.fc
+--- nsaserefpolicy/policy/modules/apps/java.fc	2006-07-14 17:04:31.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/apps/java.fc	2006-08-10 15:37:22.000000000 -0400
+@@ -10,3 +10,4 @@
+ /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)
++/usr/bin/frysk		--	gen_context(system_u:object_r:java_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.6/policy/modules/apps/mozilla.if
---- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-08 16:00:22.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/apps/mozilla.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/apps/mozilla.if	2006-08-08 16:15:43.000000000 -0400
 @@ -63,6 +63,7 @@
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
@@ -174,8 +380,8 @@
  	# Browse the web, connect to printer
  	sysnet_dns_name_resolve($1_mozilla_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc
---- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-08 16:00:25.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-02 10:34:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -185,8 +391,8 @@
  ifdef(`distro_debian',`
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in
---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in	2006-08-09 12:58:00.000000000 -0400
 @@ -73,6 +73,7 @@
  network_port(dhcpc, udp,68,s0)
  network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
@@ -212,10 +418,79 @@
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
  network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
  network_port(spamd, tcp,783,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.6/policy/modules/kernel/devices.fc
+--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-02 10:34:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/devices.fc	2006-08-10 14:22:57.000000000 -0400
+@@ -37,7 +37,7 @@
+ /dev/mpu401.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/null		-c	gen_context(system_u:object_r:null_device_t,s0)
+ /dev/nvidia.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
+-/dev/nvram		-c	gen_context(system_u:object_r:memory_device_t,s15:c0.c255)
++/dev/nvram		-c	gen_context(system_u:object_r:bios_device_t,s15:c0.c255)
+ /dev/par.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
+ /dev/patmgr[01]		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/pmu		-c	gen_context(system_u:object_r:power_device_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.3.6/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-08-02 10:34:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/devices.if	2006-08-10 14:25:22.000000000 -0400
+@@ -2992,3 +2992,40 @@
+ 
+ 	typeattribute $1 devices_unconfined_type;
+ ')
++
++########################################
++## <summary>
++##	read bios memory devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_read_bios',`
++	gen_require(`
++		type bios_device_t;
++	')
++
++	allow $1 bios_device_t:chr_file r_file_perms;
++')
++
++########################################
++## <summary>
++##	write bios memory devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_write_bios',`
++	gen_require(`
++		type bios_device_t;
++	')
++
++	allow $1 bios_device_t:chr_file write;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.6/policy/modules/kernel/devices.te
---- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-08 16:00:25.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/devices.te	2006-08-10 09:24:43.000000000 -0400
-@@ -166,7 +166,7 @@
+--- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/devices.te	2006-08-10 14:22:36.000000000 -0400
+@@ -72,6 +72,12 @@
+ dev_node(lvm_control_t)
+ 
+ #
++# bios_device_t is the type of /dev/nvram 
++#
++type bios_device_t;
++dev_node(bios_device_t)
++
++#
+ # memory_device_t is the type of /dev/kmem,
+ # /dev/mem and /dev/port.
+ #
+@@ -166,7 +172,7 @@
  dev_node(vmware_device_t)
  
  type watchdog_device_t;
@@ -225,8 +500,8 @@
  type xen_device_t;
  dev_node(xen_device_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.6/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-08 16:00:25.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/files.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/files.if	2006-08-08 16:38:46.000000000 -0400
 @@ -2934,6 +2934,24 @@
  
  ########################################
@@ -253,8 +528,8 @@
  ## </summary>
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.6/policy/modules/kernel/filesystem.te
---- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/filesystem.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/filesystem.te	2006-08-08 16:15:43.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -272,8 +547,8 @@
  ########################################
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.6/policy/modules/kernel/kernel.if
---- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-08-08 16:00:25.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/kernel.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/kernel.if	2006-08-08 16:15:43.000000000 -0400
 @@ -1456,6 +1456,42 @@
  
  ########################################
@@ -361,8 +636,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.6/policy/modules/kernel/terminal.if
---- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-08 16:00:25.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/terminal.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-02 10:34:05.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/terminal.if	2006-08-08 16:15:43.000000000 -0400
 @@ -308,6 +308,7 @@
  		type devpts_t;
  	')
@@ -394,8 +669,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.6/policy/modules/services/amavis.te
---- nsaserefpolicy/policy/modules/services/amavis.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/amavis.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/amavis.te	2006-08-08 16:15:43.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -426,8 +701,8 @@
 +	postfix_read_config(amavis_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.6/policy/modules/services/apache.te
---- nsaserefpolicy/policy/modules/services/apache.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/apache.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/apache.te	2006-08-08 16:15:43.000000000 -0400
 @@ -273,7 +273,6 @@
  sysnet_read_config(httpd_t)
  
@@ -437,8 +712,8 @@
  mta_send_mail(httpd_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.6/policy/modules/services/avahi.te
---- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/avahi.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/avahi.te	2006-08-08 16:15:43.000000000 -0400
 @@ -79,6 +79,7 @@
  
  sysnet_read_config(avahi_t)
@@ -448,8 +723,8 @@
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.6/policy/modules/services/bind.te
---- nsaserefpolicy/policy/modules/services/bind.te	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/bind.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/bind.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/bind.te	2006-08-08 16:15:43.000000000 -0400
 @@ -226,6 +226,7 @@
  allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
  
@@ -459,8 +734,8 @@
  allow ndc_t named_t:tcp_socket { connectto recvfrom };
  allow ndc_t named_t:unix_stream_socket connectto;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.6/policy/modules/services/bluetooth.te
---- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/bluetooth.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/bluetooth.te	2006-08-08 16:15:43.000000000 -0400
 @@ -247,3 +247,8 @@
  optional_policy(`
         	xserver_stream_connect_xdm(bluetooth_helper_t)
@@ -471,16 +746,16 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.6/policy/modules/services/clamav.if
---- nsaserefpolicy/policy/modules/services/clamav.if	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/clamav.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/clamav.if	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/clamav.if	2006-08-08 16:15:43.000000000 -0400
 @@ -102,3 +102,4 @@
  	allow clamscan_t $1:fifo_file rw_file_perms;
  	allow clamscan_t $1:process sigchld;
  ')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.6/policy/modules/services/cron.if
---- nsaserefpolicy/policy/modules/services/cron.if	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cron.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/cron.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cron.if	2006-08-08 16:15:43.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -524,8 +799,8 @@
  		# fcron wants an instant update of a crontab change for the administrator
  		# also crontab does a security check for crontab -u
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.6/policy/modules/services/cron.te
---- nsaserefpolicy/policy/modules/services/cron.te	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cron.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cron.te	2006-08-09 09:15:00.000000000 -0400
 @@ -173,6 +173,7 @@
  	allow crond_t crond_tmp_t:dir create_dir_perms;
  	allow crond_t crond_tmp_t:file create_file_perms;
@@ -535,8 +810,8 @@
  	mta_send_mail(crond_t)
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.6/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cups.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cups.te	2006-08-10 15:07:59.000000000 -0400
 @@ -74,13 +74,14 @@
  #
  
@@ -572,9 +847,33 @@
  
  sysnet_read_config(cupsd_t)
  
+@@ -232,6 +236,15 @@
+ ')
+ 
+ optional_policy(`
++	apm_domtrans_client(cupsd_t)
++')
++
++optional_policy(`
++	logrotate_domtrans(cupsd_t)
++')
++
++
++optional_policy(`
+ 	cron_system_entry(cupsd_t, cupsd_exec_t)
+ ')
+ 
+@@ -419,6 +432,7 @@
+ 	term_use_generic_ptys(cupsd_config_t)
+ 
+ 	unconfined_rw_pipes(cupsd_config_t)
++	unconfined_rw_pipes(cupsd_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.6/policy/modules/services/cyrus.te
---- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cyrus.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/cyrus.te	2006-08-09 12:58:45.000000000 -0400
 @@ -69,6 +69,7 @@
  corenet_udp_sendrecv_all_ports(cyrus_t)
  corenet_tcp_bind_all_nodes(cyrus_t)
@@ -584,8 +883,8 @@
  corenet_tcp_connect_all_ports(cyrus_t)
  corenet_sendrecv_mail_server_packets(cyrus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.6/policy/modules/services/dbus.if
---- nsaserefpolicy/policy/modules/services/dbus.if	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/dbus.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/dbus.if	2006-08-09 11:12:25.000000000 -0400
 @@ -123,6 +123,7 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
@@ -607,8 +906,8 @@
  
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.6/policy/modules/services/ldap.te
---- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ldap.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ldap.te	2006-08-08 16:15:43.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -618,9 +917,21 @@
  
  kernel_read_system_state(slapd_t)
  kernel_read_kernel_sysctls(slapd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-2.3.6/policy/modules/services/mta.fc
+--- nsaserefpolicy/policy/modules/services/mta.fc	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/mta.fc	2006-08-10 10:10:26.000000000 -0400
+@@ -2,6 +2,8 @@
+ /etc/aliases		--	gen_context(system_u:object_r:etc_aliases_t,s0)
+ /etc/aliases\.db	--	gen_context(system_u:object_r:etc_aliases_t,s0)
+ /etc/mail(/.*)?			gen_context(system_u:object_r:etc_mail_t,s0)
++/etc/mail/aliases 	-- gen_context(system_u:object_r:etc_aliases_t,s0)
++/etc/mail/aliases\.db 	-- gen_context(system_u:object_r:etc_aliases_t,s0) 
+ ifdef(`distro_redhat',`
+ /etc/postfix/aliases.*		gen_context(system_u:object_r:etc_aliases_t,s0)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.6/policy/modules/services/nis.te
---- nsaserefpolicy/policy/modules/services/nis.te	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/nis.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/nis.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/nis.te	2006-08-08 16:15:43.000000000 -0400
 @@ -249,8 +249,6 @@
  allow ypserv_t self:unix_dgram_socket create_socket_perms;
  allow ypserv_t self:unix_stream_socket create_stream_socket_perms;
@@ -631,8 +942,8 @@
  allow ypserv_t var_yp_t:dir rw_dir_perms;
  allow ypserv_t var_yp_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.6/policy/modules/services/ntp.te
---- nsaserefpolicy/policy/modules/services/ntp.te	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ntp.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ntp.te	2006-08-08 16:15:43.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -643,8 +954,8 @@
  allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
  allow ntpd_t self:fifo_file { read write getattr };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.6/policy/modules/services/openvpn.te
---- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/openvpn.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/openvpn.te	2006-08-10 09:10:52.000000000 -0400
 @@ -33,7 +33,7 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -655,8 +966,8 @@
  allow openvpn_t openvpn_etc_t:dir r_dir_perms;
  allow openvpn_t openvpn_etc_t:file r_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.6/policy/modules/services/pegasus.if
---- nsaserefpolicy/policy/modules/services/pegasus.if	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/pegasus.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/pegasus.if	2006-08-08 16:15:43.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -691,8 +1002,8 @@
 +	allow pegasus_t $1:process sigchld;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.6/policy/modules/services/pegasus.te
---- nsaserefpolicy/policy/modules/services/pegasus.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/pegasus.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/pegasus.te	2006-08-08 16:15:43.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -710,8 +1021,8 @@
  
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.6/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/postfix.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/postfix.te	2006-08-08 16:15:43.000000000 -0400
 @@ -250,6 +250,7 @@
  allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
  
@@ -748,8 +1059,8 @@
  optional_policy(`
  	postgrey_stream_connect(postfix_smtpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.6/policy/modules/services/procmail.te
---- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/procmail.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/procmail.te	2006-08-08 16:15:43.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -759,8 +1070,8 @@
  corenet_udp_sendrecv_all_if(procmail_t)
  corenet_tcp_sendrecv_all_nodes(procmail_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.6/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/samba.te	2006-08-10 09:28:00.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/samba.te	2006-08-10 09:22:27.000000000 -0400
 @@ -171,7 +171,7 @@
  #
  # smbd Local policy
@@ -790,7 +1101,7 @@
  allow nmbd_t samba_var_t:dir rw_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc	2006-08-10 09:24:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -803,14 +1114,14 @@
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if	2006-08-10 09:24:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if	2006-08-08 16:15:43.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te	2006-08-10 09:24:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te	2006-08-08 16:15:43.000000000 -0400
 @@ -0,0 +1,105 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -918,8 +1229,8 @@
 +files_dontaudit_search_tmp(setroubleshootd_t)
 +files_dontaudit_search_src(setroubleshootd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.6/policy/modules/services/spamassassin.te
---- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-08-08 16:00:27.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/spamassassin.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/spamassassin.te	2006-08-08 16:15:43.000000000 -0400
 @@ -194,3 +194,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -929,8 +1240,8 @@
 +	postfix_read_config(spamd_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.6/policy/modules/services/squid.te
---- nsaserefpolicy/policy/modules/services/squid.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/squid.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/squid.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/squid.te	2006-08-08 16:15:43.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -944,15 +1255,23 @@
  allow squid_t self:sock_file r_file_perms;
  allow squid_t self:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.6/policy/modules/services/ssh.if
---- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ssh.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ssh.if	2006-08-10 12:38:16.000000000 -0400
 @@ -1,5 +1,4 @@
  ## <summary>Secure shell client and server policy.</summary>
 -
  #######################################
  ## <summary>
  ##	Basic SSH client template.
-@@ -717,3 +716,27 @@
+@@ -330,7 +329,6 @@
+ 	allow $1_ssh_agent_t $1_ssh_agent_tmp_t:dir manage_dir_perms;
+ 	allow $1_ssh_agent_t $1_ssh_agent_tmp_t:sock_file manage_file_perms;
+ 	files_tmp_filetrans($1_ssh_agent_t,$1_ssh_agent_tmp_t,{ dir sock_file })
+-
+ 	# for ssh-add
+ 	allow $2 $1_ssh_agent_t:unix_stream_socket connectto;
+ 	allow $2 $1_ssh_agent_tmp_t:sock_file write;
+@@ -717,3 +715,27 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')
@@ -980,9 +1299,35 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.3.6/policy/modules/services/ssh.te
+--- nsaserefpolicy/policy/modules/services/ssh.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ssh.te	2006-08-10 11:38:43.000000000 -0400
+@@ -39,6 +39,9 @@
+ 	type ssh_agent_exec_t;
+ 	files_type(ssh_agent_exec_t)
+ 
++	type ssh_agent_tmp_t;
++	files_tmp_file(ssh_agent_tmp_t)
++
+ 	type ssh_keygen_t;
+ 	init_system_domain(ssh_keygen_t,ssh_keygen_exec_t)
+ 	role system_r types ssh_keygen_t;
+@@ -61,6 +64,12 @@
+ 
+ 	type sshd_tmp_t;
+ 	files_tmp_file(sshd_tmp_t)
++
++	allow ssh_agent_t ssh_agent_tmp_t:dir create_dir_perms;
++	allow ssh_agent_t ssh_agent_tmp_t:file create_file_perms;
++	allow ssh_agent_t ssh_agent_tmp_t:sock_file create_file_perms;
++	files_tmp_filetrans(ssh_agent_t, tmp_t, { dir file sock_file })
++
+ ')
+ 
+ #################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.6/policy/modules/services/stunnel.te
---- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/stunnel.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/stunnel.te	2006-08-08 16:15:43.000000000 -0400
 @@ -105,6 +105,10 @@
  	')
  
@@ -995,9 +1340,9 @@
  	')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.6/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/xserver.if	2006-08-10 09:24:43.000000000 -0400
-@@ -120,7 +120,9 @@
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/xserver.if	2006-08-09 11:16:27.000000000 -0400
+@@ -120,7 +119,9 @@
  	dev_setattr_generic_dirs($1_xserver_t)
  	# raw memory access is needed if not using the frame buffer
  	dev_read_raw_memory($1_xserver_t)
@@ -1008,7 +1353,7 @@
  	# for other device nodes such as the NVidia binary-only driver
  	dev_rw_xserver_misc($1_xserver_t)
  	# read events - the synaptics touchpad driver reads raw events
-@@ -160,6 +162,10 @@
+@@ -160,6 +161,10 @@
  	sysnet_read_config($1_xserver_t)
  
  	optional_policy(`
@@ -1019,7 +1364,7 @@
  		auth_search_pam_console_data($1_xserver_t)
  	')
  
-@@ -1051,6 +1057,24 @@
+@@ -1051,6 +1056,24 @@
  
  ########################################
  ## <summary>
@@ -1044,7 +1389,7 @@
  ##	Kill XDM X servers
  ## </summary>
  ## <param name="domain">
-@@ -1103,7 +1127,47 @@
+@@ -1103,7 +1126,47 @@
  	')
  
  	files_search_tmp($1)
@@ -1094,8 +1439,8 @@
 +	allow $1 ice_tmp_t:sock_file create_file_perms;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.6/policy/modules/services/xserver.te
---- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-08 16:00:32.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/xserver.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/xserver.te	2006-08-09 11:18:55.000000000 -0400
 @@ -81,15 +81,19 @@
  #
  
@@ -1153,9 +1498,20 @@
  	allow xdm_t xserver_log_t:file manage_file_perms;
  	allow xdm_t xserver_log_t:fifo_file manage_file_perms;
  	logging_log_filetrans(xdm_t,xserver_log_t,file)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.6/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/authlogin.te	2006-08-10 13:18:13.000000000 -0400
+@@ -273,6 +273,7 @@
+ 
+ term_dontaudit_use_unallocated_ttys(system_chkpwd_t)
+ term_dontaudit_use_generic_ptys(system_chkpwd_t)
++term_dontaudit_use_all_user_ttys(system_chkpwd_t)
+ 
+ userdom_dontaudit_use_unpriv_users_ttys(system_chkpwd_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.6/policy/modules/system/fstools.te
---- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/fstools.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/fstools.te	2006-08-08 16:15:43.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -1165,8 +1521,8 @@
  domain_use_interactive_fds(fsadm_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.6/policy/modules/system/hostname.te
---- nsaserefpolicy/policy/modules/system/hostname.te	2006-08-08 16:00:23.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/hostname.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/hostname.te	2006-08-08 16:15:43.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -1190,8 +1546,8 @@
 +')
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.6/policy/modules/system/init.if
---- nsaserefpolicy/policy/modules/system/init.if	2006-08-08 16:00:23.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/init.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/init.if	2006-08-08 14:59:36.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/init.if	2006-08-08 16:15:43.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -1207,8 +1563,8 @@
  
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.6/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/init.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/init.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/init.te	2006-08-09 09:15:19.000000000 -0400
 @@ -361,6 +361,8 @@
  logging_read_audit_config(initrc_t)
  
@@ -1219,8 +1575,8 @@
  miscfiles_read_certs(initrc_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.6/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/libraries.fc	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/libraries.fc	2006-08-09 14:03:56.000000000 -0400
 @@ -199,8 +199,8 @@
  /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -1233,8 +1589,8 @@
  /usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.6/policy/modules/system/locallogin.te
---- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/locallogin.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/locallogin.te	2006-08-08 16:15:43.000000000 -0400
 @@ -47,7 +47,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -1254,8 +1610,8 @@
  dev_setattr_mouse_dev(local_login_t)
  dev_getattr_mouse_dev(local_login_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.6/policy/modules/system/logging.fc
---- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/logging.fc	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -1264,8 +1620,8 @@
 +/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.6/policy/modules/system/logging.if
---- nsaserefpolicy/policy/modules/system/logging.if	2006-08-08 16:00:23.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/logging.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.if	2006-08-08 16:15:43.000000000 -0400
 @@ -553,3 +553,24 @@
  	allow $1 var_log_t:dir rw_dir_perms;
  	allow $1 var_log_t:file create_file_perms;
@@ -1292,8 +1648,8 @@
 +	allow $1 auditd_t:unix_stream_socket connectto;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.6/policy/modules/system/logging.te
---- nsaserefpolicy/policy/modules/system/logging.te	2006-08-08 16:00:23.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/logging.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/logging.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/logging.te	2006-08-08 16:15:43.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -1307,8 +1663,8 @@
  kernel_read_kernel_sysctls(auditd_t)
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.6/policy/modules/system/miscfiles.fc
---- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/miscfiles.fc	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/miscfiles.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -9,6 +9,7 @@
  # /etc
  #
@@ -1318,8 +1674,8 @@
  
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.6/policy/modules/system/miscfiles.if
---- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/miscfiles.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/miscfiles.if	2006-08-09 09:15:31.000000000 -0400
 @@ -116,6 +116,24 @@
  
  ########################################
@@ -1345,9 +1701,20 @@
  ##	Allow process to read legacy time localization info
  ## </summary>
  ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.6/policy/modules/system/modutils.te
+--- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/modutils.te	2006-08-10 13:13:14.000000000 -0400
+@@ -183,6 +183,7 @@
+ fs_getattr_xattr_fs(depmod_t)
+ 
+ term_use_console(depmod_t)
++term_use_all_terms(depmod_t)
+ 
+ corecmd_search_bin(depmod_t)
+ corecmd_search_sbin(depmod_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.6/policy/modules/system/mount.te
---- nsaserefpolicy/policy/modules/system/mount.te	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/mount.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/mount.te	2006-08-08 16:38:58.000000000 -0400
 @@ -80,6 +80,7 @@
  files_read_isid_type_files(mount_t)
  # For reading cert files
@@ -1366,8 +1733,8 @@
  
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.6/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/selinuxutil.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/selinuxutil.te	2006-08-09 11:02:28.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -1401,8 +1768,8 @@
  
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.6/policy/modules/system/udev.fc
---- nsaserefpolicy/policy/modules/system/udev.fc	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/udev.fc	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/udev.fc	2006-08-08 16:15:43.000000000 -0400
 @@ -1,5 +1,6 @@
  # udev
  
@@ -1411,8 +1778,8 @@
  /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.6/policy/modules/system/udev.te
---- nsaserefpolicy/policy/modules/system/udev.te	2006-08-08 16:00:23.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/udev.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/udev.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/udev.te	2006-08-09 09:15:39.000000000 -0400
 @@ -129,6 +129,7 @@
  mls_file_upgrade(udev_t)
  mls_file_downgrade(udev_t)
@@ -1422,8 +1789,8 @@
  modutils_domtrans_insmod(udev_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.6/policy/modules/system/unconfined.if
---- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/unconfined.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/unconfined.if	2006-08-08 16:15:43.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -1441,8 +1808,8 @@
  	fs_unconfined($1)
  	selinux_unconfined($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.6/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/unconfined.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/unconfined.te	2006-08-08 16:15:43.000000000 -0400
 @@ -195,4 +195,9 @@
  ifdef(`targeted_policy',`
  	allow unconfined_execmem_t self:process { execstack execmem };
@@ -1454,8 +1821,8 @@
 +	')
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.6/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/userdomain.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/userdomain.if	2006-08-09 14:04:54.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1884,8 +2251,8 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.6/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-08-08 16:00:23.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/userdomain.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/userdomain.te	2006-08-10 13:44:38.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -1901,15 +2268,6 @@
  ifdef(`targeted_policy',`
  	# Define some type aliases to help with compatibility with
  	# macros and domains from the "strict" policy.
-@@ -85,7 +77,7 @@
- 	# compatibility for switching from strict
- #	dominance { role secadm_r { role system_r; }}
- #	dominance { role auditadm_r { role system_r; }}
--#	dominance { role sysadm_r { role system_r; }}
-+	dominance { role sysadm_r { role system_r; }}
- #	dominance { role user_r { role system_r; }}
- #	dominance { role staff_r { role system_r; }}
- 
 @@ -124,34 +116,34 @@
  
  	# user role change rules:
@@ -1995,8 +2353,8 @@
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.6/policy/modules/system/xen.if
---- nsaserefpolicy/policy/modules/system/xen.if	2006-08-08 16:00:23.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/xen.if	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/xen.if	2006-08-08 16:15:43.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -2040,8 +2398,8 @@
 +	dontaudit $1 xend_t:fd use;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.6/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2006-08-08 16:00:24.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/xen.te	2006-08-10 09:24:43.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/xen.te	2006-08-08 16:15:43.000000000 -0400
 @@ -69,7 +69,10 @@
  #
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- selinux-policy.spec	10 Aug 2006 13:59:40 -0000	1.180
+++ selinux-policy.spec	11 Aug 2006 03:14:53 -0000	1.181
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.6
-Release: 2.fc5
+Release: 3.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,7 +347,7 @@
 %endif
 
 %changelog
-* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-2.fc5
+* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3.fc5
 - Bump for FC5
 
 * Wed Aug 9 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-2



From fedora-cvs-commits at redhat.com  Fri Aug 11 03:16:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 23:16:16 -0400
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.249,1.250
Message-ID: <200608110316.k7B3GGdB012624@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3
- Misc fixes



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- selinux-policy.spec	11 Aug 2006 03:11:59 -0000	1.249
+++ selinux-policy.spec	11 Aug 2006 03:16:13 -0000	1.250
@@ -347,7 +347,7 @@
 %endif
 
 %changelog
-* Th Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3
+* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3
 - Misc fixes
 
 * Wed Aug 9 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-2



From fedora-cvs-commits at redhat.com  Fri Aug 11 03:20:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 23:20:15 -0400
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.15,
	1.16 libsemanage.spec, 1.101, 1.102
Message-ID: <200608110320.k7B3KFNF027091@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.13-3
- Change other updates to be non-fatal


libsemanage-rhat.patch:
 semanage_store.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libsemanage-rhat.patch	9 Aug 2006 19:08:44 -0000	1.15
+++ libsemanage-rhat.patch	11 Aug 2006 03:20:12 -0000	1.16
@@ -1,17 +1,35 @@
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.6.13/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2006-08-03 11:22:25.000000000 -0400
-+++ libsemanage-1.6.13/src/semanage_store.c	2006-08-09 15:03:06.000000000 -0400
-@@ -1072,8 +1072,11 @@
++++ libsemanage-1.6.13/src/semanage_store.c	2006-08-10 14:30:56.000000000 -0400
+@@ -1052,14 +1052,16 @@
+ 
+ 	snprintf(store_hd, PATH_MAX, "%s%s", storepath, running_hd);
+ 	if (semanage_copy_file(active_hd, store_hd, sh->conf->file_mode) == -1) {
+-		ERR(sh, "Could not copy %s to %s.", active_hd, store_hd);
+-		goto cleanup;
++		INFO(sh, "Non-fatal error:  Could not copy %s to %s.",
++		     active_hd, store_hd);
++		/* Non-fatal; fall through */
+ 	}
+ 
+ 	snprintf(store_fc, PATH_MAX, "%s%s", storepath, running_fc);
+ 	if (semanage_copy_file(active_fc, store_fc, sh->conf->file_mode) == -1) {
+-		ERR(sh, "Could not copy %s to %s.", active_fc, store_fc);
+-		goto cleanup;
++		INFO(sh, "Non-fatal error:  Could not copy %s to %s.",
++		     active_fc, store_fc);
++		/* Non-fatal; fall through */
+ 	}
+ 
+ 	snprintf(store_seusers, PATH_MAX, "%s%s", storepath, running_seusers);
+@@ -1072,8 +1074,8 @@
  
  	snprintf(store_nc, PATH_MAX, "%s%s", storepath, running_nc);
  	if (semanage_copy_file(active_nc, store_nc, sh->conf->file_mode) == -1) {
 -		ERR(sh, "Could not copy %s to %s.", active_nc, store_nc);
 -		goto cleanup;
 +		INFO(sh, "Could not copy %s to %s.", active_nc, store_nc);
-+		/* 
-+		   ERR(sh, "Could not copy %s to %s.", active_nc, store_nc);
-+		  goto cleanup;
-+		*/
++		/* Non-fatal; fall through */
  	}
  
  	if (!sh->do_reload)


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- libsemanage.spec	9 Aug 2006 19:08:44 -0000	1.101
+++ libsemanage.spec	11 Aug 2006 03:20:13 -0000	1.102
@@ -77,6 +77,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.13-3
+- Change other updates to be non-fatal
+
 * Wed Aug 9 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.13-2
 - Change netfilter stuff to be non-fatal so update can proceed.
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 03:22:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 23:22:57 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060802.patch,1.4,1.5
Message-ID: <200608110322.k7B3Mvsp028178@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060802.patch 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3.fc5
- Bump for FC5


policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |   13 +-
 modules/admin/usermanage.te        |    4 
 modules/apps/java.fc               |    1 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |   37 +++++
 modules/kernel/devices.te          |    8 +
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 +++++++++++
 modules/kernel/terminal.if         |   19 ++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cron.te           |    1 
 modules/services/cups.te           |   18 ++
 modules/services/cyrus.te          |    1 
 modules/services/dbus.if           |    6 
 modules/services/ldap.te           |    2 
 modules/services/mta.fc            |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    6 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  105 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   26 +++-
 modules/services/ssh.te            |    9 +
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   68 ++++++++++
 modules/services/xserver.te        |   15 +-
 modules/system/authlogin.te        |    1 
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/init.te             |    2 
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/miscfiles.if        |   18 ++
 modules/system/modutils.te         |    1 
 modules/system/mount.te            |    3 
 modules/system/selinuxutil.te      |   11 +
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  236 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   48 +++----
 modules/system/xen.if              |   38 +++++
 modules/system/xen.te              |   26 +++-
 74 files changed, 873 insertions(+), 176 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060802.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- policy-20060802.patch	11 Aug 2006 03:14:53 -0000	1.4
+++ policy-20060802.patch	11 Aug 2006 03:22:54 -0000	1.5
@@ -1,163 +1,3 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.3.6/Makefile
---- nsaserefpolicy/Makefile	2006-08-10 09:14:45.000000000 -0400
-+++ serefpolicy-2.3.6/Makefile	2006-08-08 16:00:22.000000000 -0400
-@@ -67,7 +67,6 @@
- # interpreters and aux tools
- AWK ?= gawk
- GREP ?= egrep
--INSTALL ?= install
- M4 ?= m4
- PYTHON ?= python
- SED ?= sed
-@@ -305,8 +304,8 @@
- 
- # parse-rolemap modulename,outputfile
- define parse-rolemap
--	$(verbose) $(M4) $(M4PARAM) $(ROLEMAP) | \
--		$(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
-+	$(verbose) m4 $(M4PARAM) $(ROLEMAP) | \
-+		awk '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
- endef
- 
- # peruser-expansion modulename,outputfile
-@@ -341,17 +340,17 @@
- 	@echo "# $(notdir $@).in or $(notdir $@).m4 file should be modified." >> $@
- 	@echo "#" >> $@
- 	$(verbose) cat $(MODDIR)/kernel/corenetwork.if.in >> $@
--	$(verbose) $(GREP) "^[[:blank:]]*network_(interface|node|port|packet)\(.*\)" $(@:.if=.te).in \
--		| $(M4) -D self_contained_policy $(M4PARAM) $(MODDIR)/kernel/corenetwork.if.m4 - \
--		| $(SED) -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
-+	$(verbose) egrep "^[[:blank:]]*network_(interface|node|port|packet)\(.*\)" $(@:.if=.te).in \
-+		| m4 -D self_contained_policy $(M4PARAM) $(MODDIR)/kernel/corenetwork.if.m4 - \
-+		| sed -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
- 
- $(MODDIR)/kernel/corenetwork.te: $(MODDIR)/kernel/corenetwork.te.m4 $(MODDIR)/kernel/corenetwork.te.in
- 	@echo "#" > $@
- 	@echo "# This is a generated file!  Instead of modifying this file, the" >> $@
- 	@echo "# $(notdir $@).in or $(notdir $@).m4 file should be modified." >> $@
- 	@echo "#" >> $@
--	$(verbose) $(M4) -D self_contained_policy $(M4PARAM) $^ \
--		| $(SED) -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
-+	$(verbose) m4 -D self_contained_policy $(M4PARAM) $^ \
-+		| sed -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
- 
- ########################################
- #
-@@ -422,14 +421,14 @@
- 	@echo "# This file is replaced on reinstalls of this policy." >> $(TMPDIR)/system.users
- 	@echo "# Please edit local.users to make local changes." >> $(TMPDIR)/system.users
- 	@echo "#" >> $(TMPDIR)/system.users
--	$(verbose) $(M4) -D self_contained_policy $(M4PARAM) $^ | $(SED) -r -e 's/^[[:blank:]]+//' \
-+	$(verbose) m4 -D self_contained_policy $(M4PARAM) $^ | sed -r -e 's/^[[:blank:]]+//' \
- 		-e '/^[[:blank:]]*($$|#)/d' >> $(TMPDIR)/system.users
--	$(verbose) $(INSTALL) -m 644 $(TMPDIR)/system.users $@
-+	$(verbose) install -m 644 $(TMPDIR)/system.users $@
- 
- $(USERPATH)/local.users: config/local.users
- 	@mkdir -p $(USERPATH)
- 	@echo "Installing local.users"
--	$(verbose) $(INSTALL) -b -m 644 $< $@
-+	$(verbose) install -b -m 644 $< $@
- 
- ########################################
- #
-@@ -440,45 +439,45 @@
- $(INSTALLDIR)/booleans: $(BOOLEANS)
- 	@mkdir -p $(TMPDIR)
- 	@mkdir -p $(INSTALLDIR)
--	$(verbose) $(SED) -r -e 's/false/0/g' -e 's/true/1/g' \
--		-e '/^[[:blank:]]*($$|#)/d' $(BOOLEANS) | $(SORT) > $(TMPDIR)/booleans
--	$(verbose) $(INSTALL) -m 644 $(TMPDIR)/booleans $@
-+	$(verbose) sed -r -e 's/false/0/g' -e 's/true/1/g' \
-+		-e '/^[[:blank:]]*($$|#)/d' $(BOOLEANS) | sort > $(TMPDIR)/booleans
-+	$(verbose) install -m 644 $(TMPDIR)/booleans $@
- 
- $(CONTEXTPATH)/files/media: $(APPCONF)/media
- 	@mkdir -p $(CONTEXTPATH)/files/
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/default_contexts: $(APPCONF)/default_contexts
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/removable_context: $(APPCONF)/removable_context
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/default_type: $(APPCONF)/default_type
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/userhelper_context: $(APPCONF)/userhelper_context
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/initrc_context: $(APPCONF)/initrc_context
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/failsafe_context: $(APPCONF)/failsafe_context
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/dbus_contexts: $(APPCONF)/dbus_contexts
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/users/root: $(APPCONF)/root_default_contexts
- 	@mkdir -p $(APPDIR)/users
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- ########################################
- #
-@@ -487,14 +486,14 @@
- install-headers: $(TUNXML) $(BOOLXML)
- 	@mkdir -p $(HEADERDIR)
- 	@echo "Installing $(TYPE) policy headers."
--	$(verbose) $(INSTALL) -m 644 $(TUNXML) $(BOOLXML) $(HEADERDIR)
--	$(verbose) $(M4) $(M4PARAM) $(ROLEMAP) > $(HEADERDIR)/$(notdir $(ROLEMAP))
-+	$(verbose) install -m 644 $(TUNXML) $(BOOLXML) $(HEADERDIR)
-+	$(verbose) m4 $(M4PARAM) $(ROLEMAP) > $(HEADERDIR)/$(notdir $(ROLEMAP))
- 	$(verbose) mkdir -p $(HEADERDIR)/support
--	$(verbose) $(INSTALL) -m 644 $(M4SUPPORT) $(word $(words $(GENXML)),$(GENXML)) $(XMLDTD) $(HEADERDIR)/support
-+	$(verbose) install -m 644 $(M4SUPPORT) $(word $(words $(GENXML)),$(GENXML)) $(XMLDTD) $(HEADERDIR)/support
- 	$(verbose) $(GENPERM) $(AVS) $(SECCLASS) > $(HEADERDIR)/support/all_perms.spt
- 	$(verbose) for i in $(notdir $(ALL_LAYERS)); do \
- 		mkdir -p $(HEADERDIR)/$$i ;\
--		$(INSTALL) -m 644 $(MODDIR)/$$i/*.if \
-+		install -m 644 $(MODDIR)/$$i/*.if \
- 			$(MODDIR)/$$i/metadata.xml \
- 			$(HEADERDIR)/$$i ;\
- 	done
-@@ -506,7 +505,7 @@
- 	$(verbose) echo "MONOLITHIC ?= n" >> $(HEADERDIR)/build.conf
- 	$(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> $(HEADERDIR)/build.conf
- 	$(verbose) echo "POLY ?= $(POLY)" >> $(HEADERDIR)/build.conf
--	$(verbose) $(INSTALL) -m 644 $(SUPPORT)/Makefile.devel $(HEADERDIR)/Makefile
-+	$(verbose) install -m 644 $(SUPPORT)/Makefile.devel $(HEADERDIR)/Makefile
- 
- ########################################
- #
-@@ -515,8 +514,8 @@
- install-docs: $(TMPDIR)/html
- 	@mkdir -p $(DOCSDIR)/html
- 	@echo "Installing policy documentation"
--	$(verbose) $(INSTALL) -m 644 $(DOCFILES) $(DOCSDIR)
--	$(verbose) $(INSTALL) -m 644 $(wildcard $(HTMLDIR)/*) $(DOCSDIR)/html
-+	$(verbose) install -m 644 $(DOCFILES) $(DOCSDIR)
-+	$(verbose) install -m 644 $(wildcard $(HTMLDIR)/*) $(DOCSDIR)/html
- 
- ########################################
- #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.6/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.6/policy/mls	2006-08-08 16:15:43.000000000 -0400



From fedora-cvs-commits at redhat.com  Fri Aug 11 03:23:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 23:23:37 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch,1.6,1.7
Message-ID: <200608110323.k7B3Nb2H028506@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060802.patch 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3
- Misc fixes


policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |   13 +-
 modules/admin/usermanage.te        |    4 
 modules/apps/java.fc               |    1 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |   37 +++++
 modules/kernel/devices.te          |    8 +
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 +++++++++++
 modules/kernel/terminal.if         |   19 ++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cron.te           |    1 
 modules/services/cups.te           |   18 ++
 modules/services/cyrus.te          |    1 
 modules/services/dbus.if           |    6 
 modules/services/ldap.te           |    2 
 modules/services/mta.fc            |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    6 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  105 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   26 +++-
 modules/services/ssh.te            |    9 +
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   69 ++++++++++
 modules/services/xserver.te        |   19 ++
 modules/system/authlogin.te        |    1 
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/init.te             |    2 
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/miscfiles.if        |   18 ++
 modules/system/modutils.te         |    1 
 modules/system/mount.te            |    3 
 modules/system/selinuxutil.te      |   11 +
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  236 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   48 +++----
 modules/system/xen.if              |   38 +++++
 modules/system/xen.te              |   26 +++-
 74 files changed, 875 insertions(+), 179 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- policy-20060802.patch	11 Aug 2006 03:11:59 -0000	1.6
+++ policy-20060802.patch	11 Aug 2006 03:23:35 -0000	1.7
@@ -1,163 +1,3 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.3.6/Makefile
---- nsaserefpolicy/Makefile	2006-08-10 09:14:45.000000000 -0400
-+++ serefpolicy-2.3.6/Makefile	2006-08-08 16:00:22.000000000 -0400
-@@ -67,7 +67,6 @@
- # interpreters and aux tools
- AWK ?= gawk
- GREP ?= egrep
--INSTALL ?= install
- M4 ?= m4
- PYTHON ?= python
- SED ?= sed
-@@ -305,8 +304,8 @@
- 
- # parse-rolemap modulename,outputfile
- define parse-rolemap
--	$(verbose) $(M4) $(M4PARAM) $(ROLEMAP) | \
--		$(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
-+	$(verbose) m4 $(M4PARAM) $(ROLEMAP) | \
-+		awk '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
- endef
- 
- # peruser-expansion modulename,outputfile
-@@ -341,17 +340,17 @@
- 	@echo "# $(notdir $@).in or $(notdir $@).m4 file should be modified." >> $@
- 	@echo "#" >> $@
- 	$(verbose) cat $(MODDIR)/kernel/corenetwork.if.in >> $@
--	$(verbose) $(GREP) "^[[:blank:]]*network_(interface|node|port|packet)\(.*\)" $(@:.if=.te).in \
--		| $(M4) -D self_contained_policy $(M4PARAM) $(MODDIR)/kernel/corenetwork.if.m4 - \
--		| $(SED) -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
-+	$(verbose) egrep "^[[:blank:]]*network_(interface|node|port|packet)\(.*\)" $(@:.if=.te).in \
-+		| m4 -D self_contained_policy $(M4PARAM) $(MODDIR)/kernel/corenetwork.if.m4 - \
-+		| sed -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
- 
- $(MODDIR)/kernel/corenetwork.te: $(MODDIR)/kernel/corenetwork.te.m4 $(MODDIR)/kernel/corenetwork.te.in
- 	@echo "#" > $@
- 	@echo "# This is a generated file!  Instead of modifying this file, the" >> $@
- 	@echo "# $(notdir $@).in or $(notdir $@).m4 file should be modified." >> $@
- 	@echo "#" >> $@
--	$(verbose) $(M4) -D self_contained_policy $(M4PARAM) $^ \
--		| $(SED) -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
-+	$(verbose) m4 -D self_contained_policy $(M4PARAM) $^ \
-+		| sed -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
- 
- ########################################
- #
-@@ -422,14 +421,14 @@
- 	@echo "# This file is replaced on reinstalls of this policy." >> $(TMPDIR)/system.users
- 	@echo "# Please edit local.users to make local changes." >> $(TMPDIR)/system.users
- 	@echo "#" >> $(TMPDIR)/system.users
--	$(verbose) $(M4) -D self_contained_policy $(M4PARAM) $^ | $(SED) -r -e 's/^[[:blank:]]+//' \
-+	$(verbose) m4 -D self_contained_policy $(M4PARAM) $^ | sed -r -e 's/^[[:blank:]]+//' \
- 		-e '/^[[:blank:]]*($$|#)/d' >> $(TMPDIR)/system.users
--	$(verbose) $(INSTALL) -m 644 $(TMPDIR)/system.users $@
-+	$(verbose) install -m 644 $(TMPDIR)/system.users $@
- 
- $(USERPATH)/local.users: config/local.users
- 	@mkdir -p $(USERPATH)
- 	@echo "Installing local.users"
--	$(verbose) $(INSTALL) -b -m 644 $< $@
-+	$(verbose) install -b -m 644 $< $@
- 
- ########################################
- #
-@@ -440,45 +439,45 @@
- $(INSTALLDIR)/booleans: $(BOOLEANS)
- 	@mkdir -p $(TMPDIR)
- 	@mkdir -p $(INSTALLDIR)
--	$(verbose) $(SED) -r -e 's/false/0/g' -e 's/true/1/g' \
--		-e '/^[[:blank:]]*($$|#)/d' $(BOOLEANS) | $(SORT) > $(TMPDIR)/booleans
--	$(verbose) $(INSTALL) -m 644 $(TMPDIR)/booleans $@
-+	$(verbose) sed -r -e 's/false/0/g' -e 's/true/1/g' \
-+		-e '/^[[:blank:]]*($$|#)/d' $(BOOLEANS) | sort > $(TMPDIR)/booleans
-+	$(verbose) install -m 644 $(TMPDIR)/booleans $@
- 
- $(CONTEXTPATH)/files/media: $(APPCONF)/media
- 	@mkdir -p $(CONTEXTPATH)/files/
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/default_contexts: $(APPCONF)/default_contexts
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/removable_context: $(APPCONF)/removable_context
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/default_type: $(APPCONF)/default_type
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/userhelper_context: $(APPCONF)/userhelper_context
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/initrc_context: $(APPCONF)/initrc_context
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/failsafe_context: $(APPCONF)/failsafe_context
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/dbus_contexts: $(APPCONF)/dbus_contexts
- 	@mkdir -p $(APPDIR)
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- $(APPDIR)/users/root: $(APPCONF)/root_default_contexts
- 	@mkdir -p $(APPDIR)/users
--	$(verbose) $(INSTALL) -m 644 $< $@
-+	$(verbose) install -m 644 $< $@
- 
- ########################################
- #
-@@ -487,14 +486,14 @@
- install-headers: $(TUNXML) $(BOOLXML)
- 	@mkdir -p $(HEADERDIR)
- 	@echo "Installing $(TYPE) policy headers."
--	$(verbose) $(INSTALL) -m 644 $(TUNXML) $(BOOLXML) $(HEADERDIR)
--	$(verbose) $(M4) $(M4PARAM) $(ROLEMAP) > $(HEADERDIR)/$(notdir $(ROLEMAP))
-+	$(verbose) install -m 644 $(TUNXML) $(BOOLXML) $(HEADERDIR)
-+	$(verbose) m4 $(M4PARAM) $(ROLEMAP) > $(HEADERDIR)/$(notdir $(ROLEMAP))
- 	$(verbose) mkdir -p $(HEADERDIR)/support
--	$(verbose) $(INSTALL) -m 644 $(M4SUPPORT) $(word $(words $(GENXML)),$(GENXML)) $(XMLDTD) $(HEADERDIR)/support
-+	$(verbose) install -m 644 $(M4SUPPORT) $(word $(words $(GENXML)),$(GENXML)) $(XMLDTD) $(HEADERDIR)/support
- 	$(verbose) $(GENPERM) $(AVS) $(SECCLASS) > $(HEADERDIR)/support/all_perms.spt
- 	$(verbose) for i in $(notdir $(ALL_LAYERS)); do \
- 		mkdir -p $(HEADERDIR)/$$i ;\
--		$(INSTALL) -m 644 $(MODDIR)/$$i/*.if \
-+		install -m 644 $(MODDIR)/$$i/*.if \
- 			$(MODDIR)/$$i/metadata.xml \
- 			$(HEADERDIR)/$$i ;\
- 	done
-@@ -506,7 +505,7 @@
- 	$(verbose) echo "MONOLITHIC ?= n" >> $(HEADERDIR)/build.conf
- 	$(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> $(HEADERDIR)/build.conf
- 	$(verbose) echo "POLY ?= $(POLY)" >> $(HEADERDIR)/build.conf
--	$(verbose) $(INSTALL) -m 644 $(SUPPORT)/Makefile.devel $(HEADERDIR)/Makefile
-+	$(verbose) install -m 644 $(SUPPORT)/Makefile.devel $(HEADERDIR)/Makefile
- 
- ########################################
- #
-@@ -515,8 +514,8 @@
- install-docs: $(TMPDIR)/html
- 	@mkdir -p $(DOCSDIR)/html
- 	@echo "Installing policy documentation"
--	$(verbose) $(INSTALL) -m 644 $(DOCFILES) $(DOCSDIR)
--	$(verbose) $(INSTALL) -m 644 $(wildcard $(HTMLDIR)/*) $(DOCSDIR)/html
-+	$(verbose) install -m 644 $(DOCFILES) $(DOCSDIR)
-+	$(verbose) install -m 644 $(wildcard $(HTMLDIR)/*) $(DOCSDIR)/html
- 
- ########################################
- #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.6/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.6/policy/mls	2006-08-08 16:15:43.000000000 -0400



From fedora-cvs-commits at redhat.com  Fri Aug 11 03:45:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 23:45:14 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060802.patch,1.5,1.6
Message-ID: <200608110345.k7B3jE8f009431@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060802.patch 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3.fc5
- Bump for FC5


policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |   13 +-
 modules/admin/usermanage.te        |    4 
 modules/apps/java.fc               |    1 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |   37 +++++
 modules/kernel/devices.te          |    8 +
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 +++++++++++
 modules/kernel/terminal.if         |   19 ++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cron.te           |    1 
 modules/services/cups.te           |   18 ++
 modules/services/cyrus.te          |    1 
 modules/services/dbus.if           |    6 
 modules/services/ldap.te           |    2 
 modules/services/mta.fc            |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    6 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  105 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   26 +++-
 modules/services/ssh.te            |    9 +
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   68 ++++++++++
 modules/services/xserver.te        |   15 +-
 modules/system/authlogin.te        |    1 
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/init.te             |    2 
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/miscfiles.if        |   18 ++
 modules/system/modutils.te         |    1 
 modules/system/mount.te            |    3 
 modules/system/selinuxutil.te      |   11 +
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  236 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   48 +++----
 modules/system/xen.if              |   38 +++++
 modules/system/xen.te              |   26 +++-
 74 files changed, 873 insertions(+), 176 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060802.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- policy-20060802.patch	11 Aug 2006 03:22:54 -0000	1.5
+++ policy-20060802.patch	11 Aug 2006 03:45:11 -0000	1.6
@@ -288,7 +288,7 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`dev_read_bios',`
++interface(`dev_read_bios_memory',`
 +	gen_require(`
 +		type bios_device_t;
 +	')
@@ -306,7 +306,7 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`dev_write_bios',`
++interface(`dev_write_bios_memory',`
 +	gen_require(`
 +		type bios_device_t;
 +	')



From fedora-cvs-commits at redhat.com  Fri Aug 11 03:53:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 10 Aug 2006 23:53:55 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060802.patch,1.6,1.7
Message-ID: <200608110353.k7B3rtOn024526@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060802.patch 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3.fc5
- Bump for FC5


policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |   13 +-
 modules/admin/usermanage.te        |    4 
 modules/apps/java.fc               |    1 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |   37 +++++
 modules/kernel/devices.te          |    8 +
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 +++++++++++
 modules/kernel/terminal.if         |   19 ++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cron.te           |    1 
 modules/services/cups.te           |   18 ++
 modules/services/cyrus.te          |    1 
 modules/services/dbus.if           |    6 
 modules/services/ldap.te           |    2 
 modules/services/mta.fc            |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    6 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  105 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   24 +++
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   68 ++++++++++
 modules/services/xserver.te        |   15 +-
 modules/system/authlogin.te        |    1 
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/init.te             |    2 
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/miscfiles.if        |   18 ++
 modules/system/modutils.te         |    1 
 modules/system/mount.te            |    3 
 modules/system/selinuxutil.te      |   11 +
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  236 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   48 +++----
 modules/system/xen.if              |   38 +++++
 modules/system/xen.te              |   26 +++-
 73 files changed, 864 insertions(+), 174 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060802.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- policy-20060802.patch	11 Aug 2006 03:45:11 -0000	1.6
+++ policy-20060802.patch	11 Aug 2006 03:53:53 -0000	1.7
@@ -1097,20 +1097,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.6/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/services/ssh.if	2006-08-10 12:38:16.000000000 -0400
-@@ -1,5 +1,4 @@
- ## <summary>Secure shell client and server policy.</summary>
--
- #######################################
- ## <summary>
- ##	Basic SSH client template.
-@@ -330,7 +329,6 @@
- 	allow $1_ssh_agent_t $1_ssh_agent_tmp_t:dir manage_dir_perms;
- 	allow $1_ssh_agent_t $1_ssh_agent_tmp_t:sock_file manage_file_perms;
- 	files_tmp_filetrans($1_ssh_agent_t,$1_ssh_agent_tmp_t,{ dir sock_file })
--
- 	# for ssh-add
- 	allow $2 $1_ssh_agent_t:unix_stream_socket connectto;
- 	allow $2 $1_ssh_agent_tmp_t:sock_file write;
 @@ -717,3 +715,27 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
@@ -1139,32 +1125,6 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.3.6/policy/modules/services/ssh.te
---- nsaserefpolicy/policy/modules/services/ssh.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ssh.te	2006-08-10 11:38:43.000000000 -0400
-@@ -39,6 +39,9 @@
- 	type ssh_agent_exec_t;
- 	files_type(ssh_agent_exec_t)
- 
-+	type ssh_agent_tmp_t;
-+	files_tmp_file(ssh_agent_tmp_t)
-+
- 	type ssh_keygen_t;
- 	init_system_domain(ssh_keygen_t,ssh_keygen_exec_t)
- 	role system_r types ssh_keygen_t;
-@@ -61,6 +64,12 @@
- 
- 	type sshd_tmp_t;
- 	files_tmp_file(sshd_tmp_t)
-+
-+	allow ssh_agent_t ssh_agent_tmp_t:dir create_dir_perms;
-+	allow ssh_agent_t ssh_agent_tmp_t:file create_file_perms;
-+	allow ssh_agent_t ssh_agent_tmp_t:sock_file create_file_perms;
-+	files_tmp_filetrans(ssh_agent_t, tmp_t, { dir file sock_file })
-+
- ')
- 
- #################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.6/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/services/stunnel.te	2006-08-08 16:15:43.000000000 -0400



From fedora-cvs-commits at redhat.com  Fri Aug 11 04:09:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 00:09:31 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch,1.7,1.8
Message-ID: <200608110409.k7B49VBI003837@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060802.patch 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3
- Misc fixes


policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |   13 +-
 modules/admin/usermanage.te        |    4 
 modules/apps/java.fc               |    1 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |   37 +++++
 modules/kernel/devices.te          |    8 +
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 +++++++++++
 modules/kernel/terminal.if         |   19 ++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cron.te           |    1 
 modules/services/cups.te           |   18 ++
 modules/services/cyrus.te          |    1 
 modules/services/dbus.if           |    6 
 modules/services/ldap.te           |    2 
 modules/services/mta.fc            |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    6 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  105 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   26 +++-
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   69 ++++++++++
 modules/services/xserver.te        |   19 ++
 modules/system/authlogin.te        |    1 
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/init.te             |    2 
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/miscfiles.if        |   18 ++
 modules/system/modutils.te         |    1 
 modules/system/mount.te            |    3 
 modules/system/selinuxutil.te      |   11 +
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  236 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   48 +++----
 modules/system/xen.if              |   38 +++++
 modules/system/xen.te              |   26 +++-
 73 files changed, 866 insertions(+), 179 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- policy-20060802.patch	11 Aug 2006 03:23:35 -0000	1.7
+++ policy-20060802.patch	11 Aug 2006 04:09:21 -0000	1.8
@@ -288,7 +288,7 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`dev_read_bios',`
++interface(`dev_read_bios_memory',`
 +	gen_require(`
 +		type bios_device_t;
 +	')
@@ -306,7 +306,7 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`dev_write_bios',`
++interface(`dev_write_bios_memory',`
 +	gen_require(`
 +		type bios_device_t;
 +	')
@@ -1139,32 +1139,6 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.3.6/policy/modules/services/ssh.te
---- nsaserefpolicy/policy/modules/services/ssh.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ssh.te	2006-08-10 11:38:43.000000000 -0400
-@@ -39,6 +39,9 @@
- 	type ssh_agent_exec_t;
- 	files_type(ssh_agent_exec_t)
- 
-+	type ssh_agent_tmp_t;
-+	files_tmp_file(ssh_agent_tmp_t)
-+
- 	type ssh_keygen_t;
- 	init_system_domain(ssh_keygen_t,ssh_keygen_exec_t)
- 	role system_r types ssh_keygen_t;
-@@ -61,6 +64,12 @@
- 
- 	type sshd_tmp_t;
- 	files_tmp_file(sshd_tmp_t)
-+
-+	allow ssh_agent_t ssh_agent_tmp_t:dir create_dir_perms;
-+	allow ssh_agent_t ssh_agent_tmp_t:file create_file_perms;
-+	allow ssh_agent_t ssh_agent_tmp_t:sock_file create_file_perms;
-+	files_tmp_filetrans(ssh_agent_t, tmp_t, { dir file sock_file })
-+
- ')
- 
- #################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.6/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/services/stunnel.te	2006-08-08 16:15:43.000000000 -0400



From fedora-cvs-commits at redhat.com  Fri Aug 11 06:41:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 02:41:30 -0400
Subject: rpms/util-linux/devel util-linux-2.13-ctrlaltdel-man.patch, NONE,
	1.1 util-linux.spec, 1.137, 1.138
Message-ID: <200608110641.k7B6fUAA017209@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17138

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.13-ctrlaltdel-man.patch 
Log Message:
add ctrlaltdel-man.patch

util-linux-2.13-ctrlaltdel-man.patch:
 ctrlaltdel.8 |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE util-linux-2.13-ctrlaltdel-man.patch ---
--- util-linux-2.13-pre6/sys-utils/ctrlaltdel.8.kzak	2006-08-10 12:23:53.000000000 +0200
+++ util-linux-2.13-pre6/sys-utils/ctrlaltdel.8	2006-08-10 12:24:08.000000000 +0200
@@ -32,7 +32,6 @@
 .SH FILES
 .I /etc/rc.local
 .SH "SEE ALSO"
-.BR simpleinit (8),
 .BR init (8)
 .SH AUTHOR
 Peter Orbaek (poe at daimi.aau.dk)


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- util-linux.spec	10 Aug 2006 16:47:52 -0000	1.137
+++ util-linux.spec	11 Aug 2006 06:41:23 -0000	1.138
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.38
+Release: 0.39
 License: distributable
 Group: System Environment/Base
 
@@ -224,6 +224,8 @@
 Patch246: util-linux-2.13-nfsmount-fsc.patch
 # 176494 - last -i returns strange IP addresses
 Patch247: util-linux-2.13-login-timeval.patch
+# 199745 - Non-existant simpleinit(8) mentioned in ctrlaltdel(8)
+Patch248: util-linux-2.13-ctrlaltdel-man.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -322,6 +324,7 @@
 %patch245 -p1
 %patch246 -p1
 %patch247 -p1
+%patch248 -p1
 
 %build
 unset LINGUAS || :
@@ -719,6 +722,9 @@
 /sbin/losetup
 
 %changelog
+* Fri Aug 11 2006 Karel Zak <kzak at redhat.com> 2.13-0.39
+- fix #199745 - non-existant simpleinit(8) mentioned in ctrlaltdel(8)
+
 * Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.13-0.38
 - Change keycreate line to happen after pam_selinux open call so it gets correct context
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 06:57:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 02:57:08 -0400
Subject: rpms/man-pages-cs/devel man-pages-cs.spec,1.13,1.14
Message-ID: <200608110657.k7B6v8Sh014142@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man-pages-cs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14129

Modified Files:
	man-pages-cs.spec 
Log Message:
- remove at.1 man page to right directory (#202049)



Index: man-pages-cs.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-cs/devel/man-pages-cs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- man-pages-cs.spec	12 Jul 2006 07:18:25 -0000	1.13
+++ man-pages-cs.spec	11 Aug 2006 06:57:05 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Czech man pages from the Linux Documentation Project.
 Name: man-pages-cs
 Version: 0.16
-Release: 5.1.1
+Release: 6
 Patch0: man-pages-cs-0.14-hyphen.patch
 License: Distributable
 Group: Documentation
@@ -21,6 +21,7 @@
 
 # Part of shadow-utils
 rm -fv man8/lastlog.8
+mv -fv man8/at.1 man1
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -40,6 +41,9 @@
 %{_mandir}/cs/*
 
 %changelog
+* Fri Aug 11 2006 Ivana Varekova <varekova at redhat.com> - 0.16-6
+- remove at.1 man page to right directory (#202049)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.16-5.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 09:51:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 05:51:05 -0400
Subject: rpms/shadow-utils/devel shadow-4.0.17-UID_GID.patch, 1.1,
	1.2 shadow-utils.spec, 1.82, 1.83
Message-ID: <200608110951.k7B9p5QS024206@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	shadow-4.0.17-UID_GID.patch shadow-utils.spec 
Log Message:
fix bug introduced with UIG_GID.patch (#201991)


shadow-4.0.17-UID_GID.patch:
 groupadd.c |   29 ++++++++++++++++++----------
 groupmod.c |   35 ++++++++++++++++++++++------------
 useradd.c  |   57 ++++++++++++++++++++++++++++++++------------------------
 usermod.c  |   62 ++++++++++++++++++++++++++++++++++---------------------------
 4 files changed, 110 insertions(+), 73 deletions(-)

Index: shadow-4.0.17-UID_GID.patch
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-4.0.17-UID_GID.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shadow-4.0.17-UID_GID.patch	4 Aug 2006 13:57:58 -0000	1.1
+++ shadow-4.0.17-UID_GID.patch	11 Aug 2006 09:50:58 -0000	1.2
@@ -1,5 +1,5 @@
---- shadow-4.0.17/src/groupadd.c.UID_GID	2006-07-27 13:35:46.000000000 +0200
-+++ shadow-4.0.17/src/groupadd.c	2006-07-27 13:40:19.000000000 +0200
+--- shadow-4.0.17/src/groupadd.c.UID_GID	2006-08-11 11:24:21.000000000 +0200
++++ shadow-4.0.17/src/groupadd.c	2006-08-11 11:24:21.000000000 +0200
 @@ -89,6 +89,7 @@
  static void close_files (void);
  static void open_files (void);
@@ -50,8 +50,8 @@
  				break;
  			case 'h':
  				usage ();
---- shadow-4.0.17/src/groupmod.c.UID_GID	2006-07-27 13:35:46.000000000 +0200
-+++ shadow-4.0.17/src/groupmod.c	2006-07-27 13:46:50.000000000 +0200
+--- shadow-4.0.17/src/groupmod.c.UID_GID	2006-08-11 11:24:21.000000000 +0200
++++ shadow-4.0.17/src/groupmod.c	2006-08-11 11:24:21.000000000 +0200
 @@ -89,6 +89,7 @@
  static void process_flags (int, char **);
  static void close_files (void);
@@ -115,9 +115,9 @@
  			break;
  		case 'n':
  			nflg++;
---- shadow-4.0.17/src/useradd.c.UID_GID	2006-07-27 13:35:46.000000000 +0200
-+++ shadow-4.0.17/src/useradd.c	2006-07-27 13:40:19.000000000 +0200
-@@ -201,42 +201,47 @@
+--- shadow-4.0.17/src/useradd.c.UID_GID	2006-08-11 11:24:21.000000000 +0200
++++ shadow-4.0.17/src/useradd.c	2006-08-11 11:27:25.000000000 +0200
+@@ -201,42 +201,51 @@
  	exit (code);
  }
  
@@ -126,12 +126,15 @@
  {
 -	gid_t gid;
 -	char *ep;
--
++	long gid;
++	char *errptr;
+ 
 -	gid = strtoul (name, &ep, 10);
 -	if (*name != '\0' && *ep == '\0')	/* valid numeric GID */
 -		return getgrgid (gid);
-+	long gid;
-+	char *errptr;
++	struct group* grp = getgrnam(grname);
++	if (grp)
++		return grp;
  
 -	return getgrnam (name);
 +	gid = strtol (grname, &errptr, 10);
@@ -140,7 +143,7 @@
 +			 _("%s: invalid numeric argument '%s'\n"), Prog, grname);
 +		exit (E_BAD_ARG);
 +	}
-+	return getgrnam (grname);
++	return getgrgid (gid);
  }
  
 -static long get_number (const char *cp)
@@ -148,12 +151,12 @@
  {
  	long val;
 -	char *ep;
--
++	char *errptr;
+ 
 -	val = strtol (cp, &ep, 10);
 -	if (*cp != '\0' && *ep == '\0')	/* valid number */
 -		return val;
-+	char *errptr;
- 
+-
 -	fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog, cp);
 -	exit (E_BAD_ARG);
 +	val = strtol (numstr, &errptr, 10);
@@ -190,8 +193,8 @@
  }
  
  #define MATCH(x,y) (strncmp((x),(y),strlen(y)) == 0)
---- shadow-4.0.17/src/usermod.c.UID_GID	2006-07-27 13:35:46.000000000 +0200
-+++ shadow-4.0.17/src/usermod.c	2006-07-27 13:40:19.000000000 +0200
+--- shadow-4.0.17/src/usermod.c.UID_GID	2006-08-11 11:24:21.000000000 +0200
++++ shadow-4.0.17/src/usermod.c	2006-08-11 11:29:03.000000000 +0200
 @@ -68,12 +68,12 @@
  #define E_USAGE		2	/* invalid command syntax */
  #define E_BAD_ARG	3	/* invalid argument to option */
@@ -207,7 +210,7 @@
  #define E_HOMEDIR	12	/* unable to complete home dir move */
  #define	VALID(s)	(strcspn (s, ":\n") == strlen (s))
  /*
-@@ -160,16 +160,18 @@
+@@ -160,16 +160,22 @@
   * "56k-family"... ergh.
   * --Pac.
   */
@@ -224,17 +227,21 @@
 +	char *errptr;
  
 -	return getgrnam (name);
++	struct group* grp = getgrnam(grname);
++	if (grp)
++		return grp;
++
 +	val = strtol (grname, &errptr, 10);
 +	if (*errptr || errno == ERANGE || val < 0) {
 +		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
 +			 grname);
 +		exit (E_BAD_ARG);
 +	}
-+	return getgrnam (grname);
++	return getgrgid (val);
  }
  
  /*
-@@ -803,30 +805,32 @@
+@@ -803,30 +809,32 @@
  	return ret;
  }
  


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- shadow-utils.spec	5 Aug 2006 15:28:45 -0000	1.82
+++ shadow-utils.spec	11 Aug 2006 09:50:58 -0000	1.83
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.17
-Release: 4
+Release: 5
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -210,13 +210,16 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
-* Sat Aug 09 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-4
+* Fri Aug 11 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-5
+- fix bug introduced with UIG_GID.patch (#201991)
+
+* Sat Aug 05 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-4
 - fix userdel, it didn't delete user's group (#201379)
 
-* Fri Aug 08 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-3
+* Fri Aug 04 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-3
 - fix UID/GID overflow in user* group* (#198920)
 
-* Fri Aug 08 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-2
+* Fri Aug 04 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-2
 - do not inherit file desc. in execve(nscd)
 
 * Mon Jul 17 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-1



From fedora-cvs-commits at redhat.com  Fri Aug 11 09:53:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 05:53:22 -0400
Subject: rpms/bind/devel bind.spec,1.118,1.119
Message-ID: <200608110953.k7B9rMRk004001@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	bind.spec 
Log Message:
fix bug 197493: renaming subpackage bind-config to caching-nameserver


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- bind.spec	24 Jul 2006 15:52:39 -0000	1.118
+++ bind.spec	11 Aug 2006 09:53:19 -0000	1.119
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	34%{?dist}
+Release: 	35%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -174,11 +174,10 @@
 required for DNS (Domain Name System) development with ISC BIND 9.x.x.
 
 
-%package   config
+%package -n caching-nameserver
 Summary:   Default BIND configuration files for a caching nameserver
 Group: 	   System Environment/Daemons
-Obsoletes: caching-nameserver
-Provides:  caching-nameserver
+Obsoletes: bind-config
 Requires:  bind = %{epoch}:%{version}-%{release}
 Requires(post):   bash, coreutils, sed, grep
 Requires(postun): bash, coreutils, sed, grep
@@ -186,8 +185,8 @@
 Requires(post): policycoreutils
 %endif
 
-%description config
-The bind-config package includes the configuration files which will make
+%description -n caching-nameserver
+The  caching-nameserver package includes the configuration files which will make
 the ISC BIND named DNS name server act as a simple caching nameserver.
 A caching nameserver is a DNS Resolver, as defined in RFC 1035, section 7.
 ISC BIND named(8) provides a very efficient, flexible and robust resolver as
@@ -195,7 +194,6 @@
 along with BIND to implement their primary system DNS resolver service.
 If you would like to set up a caching name server, you'll need to install
 bind, bind-libs, and bind-utils along with this package.
-This package replaces the caching-nameserver package.
 
 
 %package   chroot
@@ -625,7 +623,7 @@
 %{_bindir}/isc-config.sh
 %doc doc/draft doc/rfc
 
-%files config
+%files -n caching-nameserver
 %defattr(0640,root,named,0750)
 %config %verify(not link) /etc/named.caching-nameserver.conf
 %ghost %config %{chroot_prefix}/etc/named.caching-nameserver.conf
@@ -769,7 +767,7 @@
 %postun libs -p /sbin/ldconfig
 
 
-%post config
+%post -n caching-nameserver
 if [ "$1" -gt 0 ]; then
    /usr/bin/chcon system_u:object_r:named_conf_t  /etc/named.caching-nameserver.conf >/dev/null 2>&1 || :;
    /usr/bin/chcon system_u:object_r:named_conf_t  /etc/named.rfc1912.zones >/dev/null 2>&1 || :;
@@ -847,6 +845,9 @@
 :;
 
 %changelog
+* Fri Aug 11 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.2-35
+- fix bug 197493: renaming subpackage bind-config to caching-nameserver
+
 * Mon Jul 24 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-34
 - fix bug 199876: make '%exclude libbbind.*' conditional on %{LIBBIND}
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 10:09:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 06:09:25 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch,
	NONE, 1.1 openoffice.org.spec, 1.829, 1.830
Message-ID: <200608111009.k7BA9Ps3004213@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch 
Log Message:
rh#202165# print to ps png x86_64 fix

openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch:
 unx/source/gdi/pspgraphics.cxx     |    0 
 vcl/unx/source/gdi/pspgraphics.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch ---
Index: unx/source/gdi/pspgraphics.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/pspgraphics.cxx,v
retrieving revision 1.18
diff -u -r1.18 pspgraphics.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/pspgraphics.cxx	19 Apr 2006 13:56:59 -0000	1.18
+++ openoffice.org/vcl/unx/source/gdi/pspgraphics.cxx	11 Aug 2006 10:03:36 -0000
@@ -63,7 +63,7 @@
 
     FncGetPixel			mpFncGetPixel;
     Scanline			mpScanAccess;
-    sal_Int32			mnScanOffset;
+    sal_PtrDiff			mnScanOffset;
 
     sal_uInt32			ColorOf (BitmapColor& rColor) const;
     sal_uInt8			GrayOf  (BitmapColor& rColor) const;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.829
retrieving revision 1.830
diff -u -r1.829 -r1.830
--- openoffice.org.spec	10 Aug 2006 14:47:14 -0000	1.829
+++ openoffice.org.spec	11 Aug 2006 10:09:08 -0000	1.830
@@ -133,6 +133,7 @@
 Patch65: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
 Patch66: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
 Patch67: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch68: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1001,6 +1002,7 @@
 %patch65 -p1 -b .ooo68048.vcl.imsurroundtext.patch
 %patch66 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
 %patch67 -p1 -b .ooo68383.evo28support.patch
+%patch68 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 10:27:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 06:27:47 -0400
Subject: rpms/anthy/devel anthy-7900-fix-undef-non-weak-symbol.patch, 1.1,
	1.2 anthy.spec, 1.32, 1.33
Message-ID: <200608111027.k7BARlEf019325@cvs.devel.redhat.com>

Author: tagoh

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

Modified Files:
	anthy-7900-fix-undef-non-weak-symbol.patch anthy.spec 
Log Message:
* Fri Aug 11 2006 Akira TAGOH <tagoh at redhat.com> - 7900-2
- anthy-7900-fix-undef-non-weak-symbol.patch: removed the unnecessary library
  chain.

anthy-7900-fix-undef-non-weak-symbol.patch:
 src-main/Makefile.am |    2 +-
 src-util/Makefile.am |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Index: anthy-7900-fix-undef-non-weak-symbol.patch
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy-7900-fix-undef-non-weak-symbol.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anthy-7900-fix-undef-non-weak-symbol.patch	12 Jul 2006 01:04:03 -0000	1.1
+++ anthy-7900-fix-undef-non-weak-symbol.patch	11 Aug 2006 10:27:30 -0000	1.2
@@ -6,7 +6,7 @@
  lib_LTLIBRARIES = libanthy.la
  
 -libanthy_la_LIBADD = ../src-splitter/libsplit.la ../src-ordering/libordering.la -lm
-+libanthy_la_LIBADD = ../src-splitter/libsplit.la ../src-ordering/libordering.la -lm ../src-diclib/libdiclib.la ../src-worddic/libanthydic.la
++libanthy_la_LIBADD = ../src-splitter/libsplit.la ../src-ordering/libordering.la -lm ../src-worddic/libanthydic.la
  libanthy_la_LDFLAGS = -version-info 1:0:1
  
  libanthy_la_SOURCES = \


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- anthy.spec	12 Jul 2006 05:09:55 -0000	1.32
+++ anthy.spec	11 Aug 2006 10:27:31 -0000	1.33
@@ -3,7 +3,7 @@
 
 Name:		anthy
 Version:	7900
-Release:	1.1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -132,7 +132,11 @@
 %endif
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Fri Aug 11 2006 Akira TAGOH <tagoh at redhat.com> - 7900-2
+- anthy-7900-fix-undef-non-weak-symbol.patch: removed the unnecessary library
+  chain.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7900-1.1
 - rebuild
 
 * Tue Jul 11 2006 Akira TAGOH <tagoh at redhat.com> - 7900-1



From fedora-cvs-commits at redhat.com  Fri Aug 11 10:28:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 06:28:49 -0400
Subject: rpms/system-config-printer/FC-5 printconf-cups1.1.x.patch, NONE,
	1.1 printconf.spec, 1.69, 1.70
Message-ID: <200608111028.k7BASncd019407@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	printconf.spec 
Added Files:
	printconf-cups1.1.x.patch 
Log Message:
* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.7-1.1
- pycups: Avoid cupsDoRequest and use cupsDoFileRequest instead, since
  cupsDoRequest is a macro in CUPS 1.1 but a real symbol in CUPS 1.2.


printconf-cups1.1.x.patch:
 pycupsmodule.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE printconf-cups1.1.x.patch ---
--- printconf-0.6.151.6/pycups/pycupsmodule.c.cups1.1.x	2006-08-11 11:25:53.000000000 +0100
+++ printconf-0.6.151.6/pycups/pycupsmodule.c	2006-08-11 11:26:07.000000000 +0100
@@ -58,7 +58,7 @@
 
 	request->request.op.operation_id = IPP_GET_JOBS;
 	request->request.op.request_id = 1;
-	answer = cupsDoRequest (http, request, "/");
+	answer = cupsDoFileRequest (http, request, "/", NULL);
 	httpClose(http);
 	if (!answer || answer->request.status.status_code > IPP_OK_CONFLICT)
 		return NULL;
@@ -145,7 +145,7 @@
 		       NULL, attributes);
 	request->request.op.operation_id = CUPS_GET_PRINTERS;
 	request->request.op.request_id = 1;
-	answer = cupsDoRequest (http, request, "/");
+	answer = cupsDoFileRequest (http, request, "/", NULL);
 	httpClose(http);
 	if (!answer || answer->request.status.status_code > IPP_OK_CONFLICT)
 		return NULL;


Index: printconf.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/FC-5/printconf.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- printconf.spec	19 May 2006 12:14:00 -0000	1.69
+++ printconf.spec	11 Aug 2006 10:28:46 -0000	1.70
@@ -1,10 +1,11 @@
 Summary: A printer configuration backend/frontend combination.
 Name: system-config-printer
 Version: 0.6.151.7
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 Source0: printconf-%{version}.tar.bz2
+Patch0: printconf-cups1.1.x.patch
 
 %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
 
@@ -55,6 +56,7 @@
 
 %prep
 %setup -q -n printconf-%{version}
+%patch0 -p1 -b .cups1.1.x
 
 %build
 
@@ -174,6 +176,10 @@
 
 
 %changelog
+* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.7-1.1
+- pycups: Avoid cupsDoRequest and use cupsDoFileRequest instead, since
+  cupsDoRequest is a macro in CUPS 1.1 but a real symbol in CUPS 1.2.
+
 * Fri May 19 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.7-1
 - 0.6.151.7:
   - Another network address fix.



From fedora-cvs-commits at redhat.com  Fri Aug 11 10:35:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 06:35:12 -0400
Subject: rpms/system-config-printer/FC-5 .cvsignore, 1.64,
	1.65 printconf.spec, 1.70, 1.71 sources, 1.66, 1.67
Message-ID: <200608111035.k7BAZCNK019507@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore printconf.spec sources 
Log Message:
* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.8-1
- 0.6.151.8:
  - pycups: Avoid cupsDoRequest and use cupsDoFileRequest instead, since
    cupsDoRequest is a macro in CUPS 1.1 but a real symbol in CUPS 1.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/FC-5/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	19 May 2006 12:14:00 -0000	1.64
+++ .cvsignore	11 Aug 2006 10:35:08 -0000	1.65
@@ -44,3 +44,4 @@
 printconf-0.6.151.5.tar.bz2
 printconf-0.6.151.6.tar.bz2
 printconf-0.6.151.7.tar.bz2
+printconf-0.6.151.8.tar.bz2


Index: printconf.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/FC-5/printconf.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- printconf.spec	11 Aug 2006 10:28:46 -0000	1.70
+++ printconf.spec	11 Aug 2006 10:35:08 -0000	1.71
@@ -1,11 +1,10 @@
 Summary: A printer configuration backend/frontend combination.
 Name: system-config-printer
-Version: 0.6.151.7
-Release: 1.1
+Version: 0.6.151.8
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 Source0: printconf-%{version}.tar.bz2
-Patch0: printconf-cups1.1.x.patch
 
 %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
 
@@ -56,7 +55,6 @@
 
 %prep
 %setup -q -n printconf-%{version}
-%patch0 -p1 -b .cups1.1.x
 
 %build
 
@@ -79,6 +77,13 @@
   --add-category Application                           \
   $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig/printconf-gui.desktop
 
+# Use /usr/lib/cups as well as /usr/lib64/cups, in preparation for CUPS 1.2.
+if [ ! -d %{buildroot}/usr/lib/cups ]
+then
+  mkdir -p %{buildroot}/usr/lib/cups/filter
+  cp -a %{buildroot}/usr/lib64/cups/filter/* %{buildroot}/usr/lib/cups/filter
+fi
+
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/printconf*
 
 # Hack to make sure SELinux puts the right security labels on.
@@ -147,7 +152,10 @@
 %config(noreplace) /etc/security/console.apps/*-tui
 %config(noreplace) /etc/security/console.apps/printconf
 %config(noreplace) /etc/security/console.apps/system-config-printer
+%if "%_libdir" == "/usr/lib64"
 %{_libdir}/cups/filter/*
+%endif
+/usr/lib/cups/filter/*
 %{_datadir}/cups/model/*
 
 %files gui
@@ -176,9 +184,14 @@
 
 
 %changelog
-* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.7-1.1
-- pycups: Avoid cupsDoRequest and use cupsDoFileRequest instead, since
-  cupsDoRequest is a macro in CUPS 1.1 but a real symbol in CUPS 1.2.
+* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.8-1
+- 0.6.151.8:
+  - pycups: Avoid cupsDoRequest and use cupsDoFileRequest instead, since
+    cupsDoRequest is a macro in CUPS 1.1 but a real symbol in CUPS 1.2.
+
+* Wed May 31 2006 Tim Waugh <twaugh at redhat.com>
+- The cjktexttops filter should always be in /usr/lib/cups/filter, even
+  on x86_64.
 
 * Fri May 19 2006 Tim Waugh <twaugh at redhat.com> 0.6.151.7-1
 - 0.6.151.7:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/FC-5/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	19 May 2006 12:14:00 -0000	1.66
+++ sources	11 Aug 2006 10:35:08 -0000	1.67
@@ -1 +1 @@
-be68e048cd80d0a7a6a5524d40bce4bd  printconf-0.6.151.7.tar.bz2
+58836af090d34e6f0e00e350fa60d434  printconf-0.6.151.8.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 11 10:45:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 06:45:39 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.115, 1.116 libselinux.spec,
	1.217, 1.218 sources, 1.117, 1.118
Message-ID: <200608111045.k7BAjdOV031270@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Fri Aug  11 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.24-1
- Upgrade to latest from NSA
	* Merged return value fix for *getfilecon() from Dan Walsh.
	* Merged sockcreate interfaces from Eric Paris.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- .cvsignore	4 Aug 2006 22:49:48 -0000	1.115
+++ .cvsignore	11 Aug 2006 10:45:34 -0000	1.116
@@ -90,3 +90,4 @@
 libselinux-1.30.19.tgz
 libselinux-1.30.20.tgz
 libselinux-1.30.22.tgz
+libselinux-1.30.24.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- libselinux.spec	10 Aug 2006 15:34:47 -0000	1.217
+++ libselinux.spec	11 Aug 2006 10:45:34 -0000	1.218
@@ -1,12 +1,11 @@
 %define libsepolver 1.12.21-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.22
-Release: 2
+Version: 1.30.24
+Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
-Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver} setransd
@@ -48,7 +47,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -118,6 +116,11 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Fri Aug  11 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.24-1
+- Upgrade to latest from NSA
+	* Merged return value fix for *getfilecon() from Dan Walsh.
+	* Merged sockcreate interfaces from Eric Paris.
+
 * Wed Aug  9 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.22-2
 - Fix translation return codes to return size of buffer
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- sources	4 Aug 2006 22:49:48 -0000	1.117
+++ sources	11 Aug 2006 10:45:34 -0000	1.118
@@ -1 +1 @@
-0c64015c84796361265c30add29d1566  libselinux-1.30.22.tgz
+3e9fcc3659c788b393d2742b5b780e5a  libselinux-1.30.24.tgz



From fedora-cvs-commits at redhat.com  Fri Aug 11 11:44:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 07:44:47 -0400
Subject: rpms/ncompress/devel ncompress-4.2.4-bssUnderflow.patch, NONE,
	1.1 ncompress.spec, 1.20, 1.21
Message-ID: <200608111144.k7BBijSx010134@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/ncompress/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10074

Modified Files:
	ncompress.spec 
Added Files:
	ncompress-4.2.4-bssUnderflow.patch 
Log Message:
fix bss buffer underflow CVE-2006-1168 (#201919)


ncompress-4.2.4-bssUnderflow.patch:
 compress42.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE ncompress-4.2.4-bssUnderflow.patch ---
--- ncompress-4.2.4/compress42.c.bssUnderflow	2006-08-10 11:40:03.000000000 +0200
+++ ncompress-4.2.4/compress42.c	2006-08-10 11:40:31.000000000 +0200
@@ -1689,6 +1689,10 @@
 
 				if (oldcode == -1)
 				{
+		                        if (code >= 256) {
+                	                        fprintf(stderr, "uncompress: corrupt input\n");
+                        	                abort_compress();
+                                	}
 					outbuf[outpos++] = (char_type)(finchar = (int)(oldcode = code));
 					continue;
 				}


Index: ncompress.spec
===================================================================
RCS file: /cvs/dist/rpms/ncompress/devel/ncompress.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ncompress.spec	12 Jul 2006 07:26:26 -0000	1.20
+++ ncompress.spec	11 Aug 2006 11:44:41 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Fast compression and decompression utilities.
 Name: ncompress
 Version: 4.2.4
-Release: 44.1
+Release: 45
 License: distributable
 Group: Applications/File
 Source: ftp://metalab.unc.edu/pub/Linux/utils/compress/ncompress-4.2.4.tar.Z
@@ -10,6 +10,7 @@
 Patch2: ncompress-4.2.4-filenamelen.patch
 Patch3: ncompress-2GB.patch
 Patch4: ncompress-4.2.4-zerobyteforce.patch
+Patch5: ncompress-4.2.4-bssUnderflow.patch
 BuildRequires: gcc glibc-devel fileutils
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -24,13 +25,13 @@
 which are compatible with the original UNIX compress utility.
 
 %prep
-
 %setup -q
 %patch0 -p1
 %patch1 -p1 -b .lfs
 %patch2 -p1 -b .filenamelen
 %patch3 -p1 -b .2GB
 %patch4 -p1 -b .zerobyteforce
+%patch5 -p1 -b .bssUnderflow
 
 %build
 
@@ -69,6 +70,9 @@
 %doc LZW.INFO README
 
 %changelog
+* Thu Aug 10 2006 Peter Vrabec <pvrabec at redhat.com> 4.2.4-45
+- fix bss buffer underflow CVE-2006-1168 (#201919)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.2.4-44.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 12:19:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 08:19:45 -0400
Subject: rpms/beagle/devel beagle.spec,1.67,1.68
Message-ID: <200608111219.k7BCJjPR016804@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16755

Modified Files:
	beagle.spec 
Log Message:
* Fri Aug 11 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-8
- Split out gui and evolution
- Pre-require shadow-utils that fixes the group bug




Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- beagle.spec	10 Aug 2006 15:16:33 -0000	1.67
+++ beagle.spec	11 Aug 2006 12:19:39 -0000	1.68
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.7
-Release:       	7%{?dist}
+Release:       	8%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -29,7 +29,8 @@
 Requires: mono-core >= 1.1.13.5
 Requires: zip unzip sed grep poppler-utils
 
-Requires(pre):  shadow-utils
+# 4.0.17-5 fixes bug #201991
+Requires(pre):  shadow-utils >= 4.0.17-5
 
 Patch1: beagle-0.2.7-nodebug.patch
 Patch2: beagle-0.2.7-crawl.patch
@@ -46,6 +47,22 @@
 %description
 A general infrastructure for making your data easy to find. 
 
+%package gui
+Summary:      Beagle search system user interface
+Group:        User Interface/Desktops
+Requires:     beagle = %{version}
+
+%description gui
+User interface for doing beagle searches
+
+%package evolution
+Summary:      Beagle backend for evolution
+Group:        User Interface/Desktops
+Requires:     beagle-gui = %{version}
+
+%description evolution
+Beagle indexing backend for evolution
+
 %package -n libbeagle
 Summary:      Beagle C interface
 Group:        Development/Libraries
@@ -193,18 +210,66 @@
 %doc COPYING README
 %{_sysconfdir}/cron.daily/*
 %{_sysconfdir}/beagle
-%{_bindir}/*
+%{_bindir}/beagle-config
+%{_bindir}/beagled
+%{_bindir}/beagle-exercise-file-system
+%{_bindir}/beagle-extract-content
+%{_bindir}/beagle-index-info
+%{_bindir}/beagle-index-url
+%{_bindir}/beagle-info
+%{_bindir}/beagle-ping
+%{_bindir}/beagle-query
+%{_bindir}/beagle-shutdown
+%{_bindir}/beagle-status
 %{_sbindir}/*
 %{_libdir}/pkgconfig/beagle*.pc
-%{_libdir}/beagle
+%dir %{_libdir}/beagle
+%dir %{_libdir}/beagle/Filters
+%dir %{_libdir}/beagle/Backends
+%{_libdir}/beagle/BeagleDaemonLib.dll*
+%{_libdir}/beagle/BeagleDaemonPlugins.dll*
+%{_libdir}/beagle/Beagle.dll*
+%{_libdir}/beagle/Util.dll*
+%{_libdir}/beagle/BeagleDaemon.exe*
+%{_libdir}/beagle/BuildIndex.exe*
+%{_libdir}/beagle/Config.exe*
+%{_libdir}/beagle/ExerciseFileSystem.exe*
+%{_libdir}/beagle/ExtractContent.exe*
+%{_libdir}/beagle/IndexHelper.exe*
+%{_libdir}/beagle/IndexWebContent.exe*
+%{_libdir}/beagle/Info.exe*
+%{_libdir}/beagle/ManageIndex.exe*
+%{_libdir}/beagle/Query.exe*
+%{_libdir}/beagle/Shutdown.exe*
+%{_libdir}/beagle/beagled-index-helper
+%{_libdir}/beagle/libbeagleglue*
+%{_libdir}/beagle/Filters/*
+# firefox plugin:
+%{_libdir}/beagle/beagle.xpi
 %{_datadir}/beagle
 %{_datadir}/pixmaps/*
-%{_datadir}/applications/*
 %{_mandir}/*/*
 %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
 %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle/indexes
 %{_sysconfdir}/xdg/autostart/beagle.desktop
 
+%files gui
+%defattr(-, root, root)
+%{_bindir}/beagle-imlogviewer
+%{_bindir}/beagle-search
+%{_bindir}/beagle-settings
+%{_libdir}/beagle/Images.dll*
+%{_libdir}/beagle/UiUtil.dll*
+%{_libdir}/beagle/ImLogViewer.exe*
+%{_libdir}/beagle/Search.exe*
+%{_libdir}/beagle/Settings.exe*
+%{_libdir}/beagle/libbeagleuiglue*
+%{_datadir}/applications/*
+
+%files evolution
+%defattr(-, root, root)
+%{_libdir}/beagle/Backends/EvolutionBackends.dll*
+
 %files -n libbeagle
 %defattr(-, root, root)
 %{_libdir}/libbeagle.so.*
@@ -219,6 +284,10 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Fri Aug 11 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-8
+- Split out gui and evolution
+- Pre-require shadow-utils that fixes the group bug
+
 * Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-7
 - pre-require shadow-utils (#201991)
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 12:39:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 08:39:59 -0400
Subject: rpms/bind/devel bind.spec,1.119,1.120
Message-ID: <200608111239.k7BCdxkH022379@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	bind.spec 
Log Message:
added Provides: bind-config


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- bind.spec	11 Aug 2006 09:53:19 -0000	1.119
+++ bind.spec	11 Aug 2006 12:39:51 -0000	1.120
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	35%{?dist}
+Release: 	36%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -178,6 +178,7 @@
 Summary:   Default BIND configuration files for a caching nameserver
 Group: 	   System Environment/Daemons
 Obsoletes: bind-config
+Provides:  bind-config
 Requires:  bind = %{epoch}:%{version}-%{release}
 Requires(post):   bash, coreutils, sed, grep
 Requires(postun): bash, coreutils, sed, grep
@@ -845,6 +846,9 @@
 :;
 
 %changelog
+* Fri Aug 11 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.2-36
+- added Provides: bind-config
+
 * Fri Aug 11 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.2-35
 - fix bug 197493: renaming subpackage bind-config to caching-nameserver
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 13:22:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 09:22:49 -0400
Subject: rpms/system-config-network/devel .cvsignore, 1.16, 1.17 sources,
	1.18, 1.19 system-config-network.spec, 1.21, 1.22
Message-ID: <200608111322.k7BDMnvf029756@cvs.devel.redhat.com>

Author: harald

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

Modified Files:
	.cvsignore sources system-config-network.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	25 Jul 2006 10:10:26 -0000	1.16
+++ .cvsignore	11 Aug 2006 13:22:38 -0000	1.17
@@ -1 +1 @@
-system-config-network-1.3.91.tar.gz
+system-config-network-1.3.92.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	25 Jul 2006 10:10:26 -0000	1.18
+++ sources	11 Aug 2006 13:22:38 -0000	1.19
@@ -1 +1 @@
-8fc499795b9f90ad41c156576eddb57a  system-config-network-1.3.91.tar.gz
+b43c5e3a95910d2393f1893cbcf98162  system-config-network-1.3.92.tar.gz


Index: system-config-network.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- system-config-network.spec	25 Jul 2006 10:10:26 -0000	1.21
+++ system-config-network.spec	11 Aug 2006 13:22:38 -0000	1.22
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: The GUI of the NEtwork Adminstration Tool
 Name: system-config-network
-Version: 1.3.91
+Version: 1.3.92
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html
 Source0: %{name}-%{version}.tar.gz
@@ -89,6 +89,10 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
+* Fri Aug 11 2006 Harald Hoyer <harald at redhat.com> - 1.3.92
+- fixed #201659 
+- translation update
+
 * Tue Jul 25 2006 Harald Hoyer <harald at redhat.com> - 1.3.91
 - fixed "New Device" in text-mode
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 13:24:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 09:24:47 -0400
Subject: rpms/sqlite/devel sqlite.spec,1.18,1.19
Message-ID: <200608111324.k7BDOlGV030299@cvs.devel.redhat.com>

Author: pnasrat

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

Modified Files:
	sqlite.spec 
Log Message:
Fix conditional typo


Index: sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sqlite.spec	12 Jul 2006 08:17:12 -0000	1.18
+++ sqlite.spec	11 Aug 2006 13:24:42 -0000	1.19
@@ -6,7 +6,7 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.3.6
-Release: 1.1
+Release: 2
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -52,7 +52,7 @@
 %setup -q
 
 %build
-%configure %{!?with_tcl:--disable-tcl} \
+%configure %{!?_with_tcl:--disable-tcl} \
            --enable-threadsafe \
            --enable-threads-override-locks
 make %{?_smp_mflags}
@@ -105,6 +105,9 @@
 %endif
 
 %changelog
+* Fri Aug 11 2006 Paul Nasrat <pnasrat at redhat.com> - 3.3.6-2
+- Fix conditional typo (patch from Gareth Armstrong)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.3.6-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 14:24:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 10:24:57 -0400
Subject: rpms/libbonobo/devel libbonobo.spec,1.44,1.45
Message-ID: <200608111424.k7BEOvtQ020779@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20734

Modified Files:
	libbonobo.spec 
Log Message:
* Fri Aug 11 2006 Alexander Larsson <alexl at redhat.com> - 2.15.0-3
- Add patch to close fds when activating component (#200477)




Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libbonobo.spec	27 Jul 2006 22:46:24 -0000	1.44
+++ libbonobo.spec	11 Aug 2006 14:24:51 -0000	1.45
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.15.0
-Release: 2
+Release: 3
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -24,6 +24,7 @@
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-2.13.1-multishlib.patch
+Patch1: libbonobo-2.15.0-close-fds.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -53,6 +54,8 @@
 %patch0 -p1 -b .multishlib
 %endif
 
+%patch1 -p1 -b .close-fds
+
 %build
 intltoolize -f
 aclocal
@@ -117,6 +120,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Fri Aug 11 2006 Alexander Larsson <alexl at redhat.com> - 2.15.0-3
+- Add patch to close fds when activating component (#200477)
+
 * Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.0-2
 - disable gtk-doc to fix multilib conflicts
 - Don't ship static libraries



From fedora-cvs-commits at redhat.com  Fri Aug 11 14:27:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 10:27:26 -0400
Subject: rpms/libbonobo/devel libbonobo-2.15.0-close-fds.patch,NONE,1.1
Message-ID: <200608111427.k7BERQPo021641@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21590

Added Files:
	libbonobo-2.15.0-close-fds.patch 
Log Message:
forgot file


libbonobo-2.15.0-close-fds.patch:
 bonobo-activation-fork-server.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE libbonobo-2.15.0-close-fds.patch ---
Index: bonobo-activation/bonobo-activation-fork-server.c
===================================================================
RCS file: /cvs/gnome/libbonobo/bonobo-activation/bonobo-activation-fork-server.c,v
retrieving revision 1.31
diff -u -p -r1.31 bonobo-activation-fork-server.c
--- bonobo-activation/bonobo-activation-fork-server.c	14 Jun 2006 14:21:29 -0000	1.31
+++ bonobo-activation/bonobo-activation-fork-server.c	28 Jul 2006 22:43:53 -0000
@@ -276,6 +276,18 @@ bonobo_activation_server_fork_init (gboo
         }
 }
 
+static void
+child_setup (gpointer user_data)
+{
+#ifndef G_OS_WIN32
+        int pipe_fd = GPOINTER_TO_INT (user_data);
+
+        /* unset close on exec */
+        fcntl (pipe_fd, F_SETFD, 0);
+#endif
+}
+
+
 CORBA_Object
 bonobo_activation_server_by_forking (
 	const char                         **cmd_const,
@@ -402,10 +414,12 @@ bonobo_activation_server_by_forking (
 
 	/* Spawn */
         if (!g_spawn_async (NULL, (gchar **) cmd, newenv,
+#ifdef G_OS_WIN32
                             G_SPAWN_LEAVE_DESCRIPTORS_OPEN |
+#endif
                             G_SPAWN_SEARCH_PATH |
                             G_SPAWN_CHILD_INHERITS_STDIN,
-                            NULL, NULL,
+                            child_setup, GINT_TO_POINTER (iopipes[1]),
                             NULL,
                             &error)) {
                 Bonobo_GeneralError *errval;



From fedora-cvs-commits at redhat.com  Fri Aug 11 14:31:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 10:31:44 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.49,
	1.50
Message-ID: <200608111431.k7BEViOS022985@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Log Message:
* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
- Fixed description (bug #202189).



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- system-config-printer.spec	3 Aug 2006 12:40:54 -0000	1.49
+++ system-config-printer.spec	11 Aug 2006 14:31:40 -0000	1.50
@@ -27,7 +27,7 @@
 Obsoletes: system-config-printer-gui <= 0.6.152
 
 %description
-system-config-mouse is a graphical user interface that allows
+system-config-printer is a graphical user interface that allows
 the user to configure a CUPS print server.
 
 %package libs
@@ -114,6 +114,9 @@
 exit 0
 
 %changelog
+* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed description (bug #202189).
+
 * Thu Aug  3 2006 Tim Waugh <twaugh at redhat.com> 0.7.24-1
 - 0.7.24.
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 14:35:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 10:35:15 -0400
Subject: rpms/libbonobo/devel libbonobo.spec,1.45,1.46
Message-ID: <200608111435.k7BEZFbi023778@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23700

Modified Files:
	libbonobo.spec 
Log Message:
-p0, not -p1



Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- libbonobo.spec	11 Aug 2006 14:24:51 -0000	1.45
+++ libbonobo.spec	11 Aug 2006 14:35:10 -0000	1.46
@@ -54,7 +54,7 @@
 %patch0 -p1 -b .multishlib
 %endif
 
-%patch1 -p1 -b .close-fds
+%patch1 -p0 -b .close-fds
 
 %build
 intltoolize -f



From fedora-cvs-commits at redhat.com  Fri Aug 11 14:47:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 10:47:52 -0400
Subject: rpms/cachefilesd/devel .cvsignore, 1.5, 1.6 cachefilesd.spec, 1.14,
	1.15 sources, 1.5, 1.6 cachefilesd-0.4-initscript.patch, 1.1, NONE
Message-ID: <200608111447.k7BElquK031768@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/cachefilesd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29987

Modified Files:
	.cvsignore cachefilesd.spec sources 
Removed Files:
	cachefilesd-0.4-initscript.patch 
Log Message:
Upgraded to 0.5 which fixed initial scan problem when
started on an empty cache (bz 202184)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cachefilesd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Aug 2006 13:47:33 -0000	1.5
+++ .cvsignore	11 Aug 2006 14:47:49 -0000	1.6
@@ -2,3 +2,4 @@
 cachefilesd-0.2.tar.bz2
 cachefilesd-0.3.tar.bz2
 cachefilesd-0.4.tar.bz2
+cachefilesd-0.5.tar.bz2


Index: cachefilesd.spec
===================================================================
RCS file: /cvs/dist/rpms/cachefilesd/devel/cachefilesd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cachefilesd.spec	8 Aug 2006 21:44:29 -0000	1.14
+++ cachefilesd.spec	11 Aug 2006 14:47:49 -0000	1.15
@@ -1,19 +1,17 @@
 Name:           cachefilesd
-Version:        0.4
-Release:        3%{?dist}
+Version:        0.5
+Release:        1%{?dist}
 Summary:        CacheFiles userspace management daemon
 Group:          System Environment/Daemons
 License:        GPL
 URL:  			http://people.redhat.com/~dhowells/fscache/
-Source0:        http://people.redhat.com/dhowells/fscache/cachefilesd-0.4.tar.bz2
+Source0:        http://people.redhat.com/dhowells/fscache/cachefilesd-0.5.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: automake, autoconf
 Requires(post): /sbin/chkconfig, /sbin/service
 Requires(preun): /sbin/chkconfig, /sbin/service
 
-Patch1: cachefilesd-0.4-initscript.patch
-
 %description
 The cachefilesd daemon manages the caching files and directory that are
 that are used by network filesystems such a AFS and NFS to  
@@ -22,8 +20,6 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
 %build
 %ifarch s390 s390x
 PIE="-fPIE"
@@ -73,6 +69,10 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Aug 11 2006 Steve Dickson <steved at redhat.com> 0.5-1
+- Upgraded to 0.5 which fixed initial scan problem when 
+  started on an empty cache (bz 202184)
+
 * Tue Aug  8 2006 Steve Dickson <steved at redhat.com> 0.4-3
 - Updated init.d script to look for cachefilesd in /sbin
 - Added postun and preun rules so cachefilesd is stopped


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cachefilesd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Aug 2006 13:47:33 -0000	1.5
+++ sources	11 Aug 2006 14:47:49 -0000	1.6
@@ -1 +1 @@
-8c94eac2ff9f2317f1fe14dae6670420  cachefilesd-0.4.tar.bz2
+4d12166dbfb0aff79476c1123ed9aef8  cachefilesd-0.5.tar.bz2


--- cachefilesd-0.4-initscript.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 11 15:03:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 11:03:57 -0400
Subject: rpms/fontconfig/devel fontconfig-2.3.95-defaultconfig.patch, 1.3,
	1.4 fontconfig.spec, 1.82,
	1.83 fontconfig-2.3.93.cvs20060131-move-user-cache.patch, 1.3, NONE
Message-ID: <200608111503.k7BF3v80013361@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	fontconfig-2.3.95-defaultconfig.patch fontconfig.spec 
Removed Files:
	fontconfig-2.3.93.cvs20060131-move-user-cache.patch 
Log Message:
- Update configs to provide better openoffice/staroffice
  compatibility (bug 200723)


fontconfig-2.3.95-defaultconfig.patch:
 fonts.conf.in |  148 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 122 insertions(+), 26 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fontconfig-2.3.95-defaultconfig.patch	27 Jul 2006 22:36:43 -0000	1.3
+++ fontconfig-2.3.95-defaultconfig.patch	11 Aug 2006 15:03:49 -0000	1.4
@@ -1,5 +1,5 @@
 --- fontconfig-2.3.95/fonts.conf.in.defaultconfig	2006-04-14 20:24:26.000000000 -0400
-+++ fontconfig-2.3.95/fonts.conf.in	2006-07-27 18:32:47.000000000 -0400
++++ fontconfig-2.3.95/fonts.conf.in	2006-08-11 11:01:08.000000000 -0400
 @@ -80,6 +80,8 @@
  		<family>Nimbus Roman No9 L</family>
  		<family>Luxi Serif</family>
@@ -19,7 +19,15 @@
  		<family>AR PL KaitiM GB</family>
  		<family>AR PL KaitiM Big5</family>
  		<family>?????? ????????????</family>
-@@ -138,7 +142,7 @@
+@@ -120,6 +124,7 @@
+ 		<family>Andale Mono</family>
+ 		<family>Luxi Mono</family>
+ 		<family>Cumberland AMT</family>
++		<family>Cumberland</family>
+ 		<family>Nimbus Mono L</family>
+ 		<family>NSimSun</family>
+ 		<family>FreeMono</family>
+@@ -138,7 +143,7 @@
  		<test qual="all" name="family" compare="not_eq">
  			<string>monospace</string>
  		</test>
@@ -28,7 +36,7 @@
  			<string>sans-serif</string>
  		</edit>
  	</match>
-@@ -156,11 +160,19 @@
+@@ -156,11 +161,19 @@
          </alias>
          <alias>
  	  <family>Courier</family>
@@ -50,7 +58,7 @@
  	</alias>
          <alias>
            <family>New Century Schoolbook</family>
-@@ -172,7 +184,11 @@
+@@ -172,7 +185,11 @@
          </alias>
          <alias>
  	  <family>Times</family>
@@ -63,7 +71,7 @@
  	</alias>
          <alias>
  	  <family>Zapf Chancery</family>
-@@ -182,6 +198,10 @@
+@@ -182,6 +199,10 @@
  	  <family>Zapf Dingbats</family>
  	  <accept><family>Dingbats</family></accept>
  	</alias>
@@ -74,7 +82,7 @@
  	<match target="pattern">
  	  <test name="family">
  	    <string>Symbol</string>
-@@ -196,11 +216,18 @@
+@@ -196,17 +217,52 @@
   -->
   	<alias>
  		<family>Times New Roman</family>
@@ -95,7 +103,42 @@
  	</alias>
   	<alias>
  		<family>Courier New</family>
-@@ -293,17 +320,30 @@
+ 		<accept><family>Cumberland AMT</family></accept>
+ 	</alias>
+- 
++ 	<alias>
++		<family>Thorndale AMT</family>
++		<accept>
++			<family>Nimbus Roman No9 L</family>
++                </accept>
++	</alias>
++	<alias>
++		<family>Thorndale</family>
++		<accept>
++			<family>Thorndale AMT</family>
++                        <family>Nimbus Roman No9 L</family>
++                </accept>
++
++	</alias>
++	<alias>
++		<family>Albany</family>
++		<accept>
++			<family>Albany AMT</family>
++			<family>Nimbus Sans L</family>
++			<family>Arial</family>
++                </accept>
++
++	</alias>
++	<alias>
++		<family>Cumberland</family>
++		<accept>
++			<family>Cumberland AMT</family>
++                </accept>
++	</alias>
+ <!--
+   Some Asian fonts misadvertise themselves as monospaced when
+   in fact they are dual-spaced (half and full).  This makes
+@@ -293,17 +349,30 @@
  	<alias>
  		<family>serif</family>
  		<prefer>
@@ -131,7 +174,7 @@
  			<family>AR PL SungtiL GB</family>
  			<family>AR PL Mingti2L Big5</family>
  			<family>?????? ??????</family>
-@@ -313,41 +353,68 @@
+@@ -313,41 +382,68 @@
  	<alias>
  		<family>sans-serif</family>
  		<prefer>


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- fontconfig.spec	27 Jul 2006 22:36:43 -0000	1.82
+++ fontconfig.spec	11 Aug 2006 15:03:49 -0000	1.83
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.95
-Release: 6
+Release: 7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -143,6 +143,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 2.3.95-7
+- Update configs to provide better openoffice/staroffice
+  compatibility (bug 200723)
+
 * Thu Jul 27 2006 Behdad Esfahbod <besfahbo at redhat.com> - 2.3.95-6
 - Do umask 0022 in post
 - Update configs to reflect addition of new Indic fonts (#200381, #200397)


--- fontconfig-2.3.93.cvs20060131-move-user-cache.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 11 15:06:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 11:06:16 -0400
Subject: rpms/evolution/devel evolution-2.7.91-default-mailer.patch, NONE,
	1.1 evolution.spec, 1.177, 1.178
Message-ID: <200608111506.k7BF6GTC013832@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.91-default-mailer.patch 
Log Message:
- Add patch for RH bug #197868.


evolution-2.7.91-default-mailer.patch:
 apps-evolution-mail-prompts-checkdefault.schemas.in.in |    2 
 default-mailer.c                                       |   35 ++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

--- NEW FILE evolution-2.7.91-default-mailer.patch ---
--- evolution-2.7.91/plugins/default-mailer/default-mailer.c.fix-mailto-command	2006-02-27 04:22:15.000000000 -0500
+++ evolution-2.7.91/plugins/default-mailer/default-mailer.c	2006-08-10 17:33:16.000000000 -0400
@@ -31,9 +31,40 @@
 #define GCONF_KEY_CHECKDEFAULT   "/apps/evolution/mail/prompts/checkdefault"
 #define GCONF_KEY_MAILTO_ENABLED "/desktop/gnome/url-handlers/mailto/enabled"
 #define GCONF_KEY_MAILTO_COMMAND "/desktop/gnome/url-handlers/mailto/command"
+#define EVOLUTION_MAILTO_COMMAND "evolution --component=mail %s"
 
 void org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target);
 
+static gboolean
+evolution_is_default_mailer (const gchar *mailto_command)
+{
+        gint argc;
+        gchar **argv;
+        gchar *basename;
+        gboolean is_default;
+
+        if (mailto_command == NULL)
+                return FALSE;
+
+        g_debug ("mailto URL command: %s", mailto_command);
+
+        /* tokenize the mailto command */
+        if (!g_shell_parse_argv (mailto_command, &argc, &argv, NULL))
+                return FALSE;
+
+        g_assert (argc > 0);
+
+        /* check the basename of the first token */
+        basename = g_path_get_basename (argv[0]);
+        g_debug ("mailto URL program: %s", basename);
+        is_default = g_str_has_prefix (basename, "evolution");
+        g_free (basename);
+
+        g_strfreev (argv);
+
+        return is_default;
+}
+
 void
 org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target)
 {
@@ -54,11 +85,11 @@
 		mailer  = gconf_client_get_string(client, GCONF_KEY_MAILTO_COMMAND, NULL);
 
 		/* Check whether we are the default mailer */
-		if(mailer == NULL || (strcmp(mailer, "@evolution %s") != 0 && strcmp(mailer, "evolution %s") != 0)) { 
+		if (!evolution_is_default_mailer (mailer)) {
 			/* Ask whether we should be the default mailer */
 			if(em_utils_prompt_user(NULL, GCONF_KEY_CHECKDEFAULT, "org.gnome.default.mailer:check-default", NULL)) {
 				gconf_client_set_bool(client, GCONF_KEY_MAILTO_ENABLED, TRUE, NULL);
-				gconf_client_set_string(client, GCONF_KEY_MAILTO_COMMAND, "evolution %s", NULL);
+				gconf_client_set_string(client, GCONF_KEY_MAILTO_COMMAND, EVOLUTION_MAILTO_COMMAND, NULL);
 			}
 		}
 		
--- evolution-2.7.91/plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.no-checkdefault	2006-08-10 16:29:51.000000000 -0400
+++ evolution-2.7.91/plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in	2006-08-10 16:29:58.000000000 -0400
@@ -5,7 +5,7 @@
       <applyto>/apps/evolution/mail/prompts/checkdefault</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
-      <default>true</default>
+      <default>false</default>
       <locale name="C">
         <short>Check whether Evolution is the default mailer</short>
         <long>Every time Evolution starts, check whether or not it is the default mailer.</long>


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- evolution.spec	7 Aug 2006 20:37:08 -0000	1.177
+++ evolution.spec	11 Aug 2006 15:06:04 -0000	1.178
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.91
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -113,6 +113,9 @@
 # RH bug #178295 / Gnome.org bug #348638
 Patch29: evolution-2.7.4-deleting-preedit-buffer.patch
 
+# RH bug #197868 / Gnome.org bug #350823
+Patch30: evolution-2.7.91-default-mailer.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -245,6 +248,7 @@
 %patch27 -p1 -b .replicated-cjk-input
 %patch28 -p1 -b .submit-bug-report
 %patch29 -p1 -b .deleting-preedit-buffer
+%patch30 -p1 -b .default-mailer
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -635,6 +639,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Fri Aug 11 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-2
+- Add patch for RH bug #197868.
+
 * Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-1
 - Update to 2.7.91
 - Update patch for RH bug #197834 for use with bug-buddy 2.15.90.



From fedora-cvs-commits at redhat.com  Fri Aug 11 15:14:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 11:14:39 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs-2.15.91-mailto-command.patch, NONE,
	1.1 gnome-vfs2.spec, 1.127, 1.128
Message-ID: <200608111514.k7BFEdKd015860@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.15.91-mailto-command.patch 
Log Message:
- Add patch for RH bug #197868.


gnome-vfs-2.15.91-mailto-command.patch:
 desktop_gnome_url_handlers.schemas.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-vfs-2.15.91-mailto-command.patch ---
--- gnome-vfs-2.15.91/schemas/desktop_gnome_url_handlers.schemas.in.mailto-command	2006-08-10 16:23:54.000000000 -0400
+++ gnome-vfs-2.15.91/schemas/desktop_gnome_url_handlers.schemas.in	2006-08-10 16:24:14.000000000 -0400
@@ -255,7 +255,7 @@
       <applyto>/desktop/gnome/url-handlers/mailto/command</applyto>
       <owner>gnome</owner>
       <type>string</type>
-      <default>evolution %s</default>
+      <default>evolution --component=mail %s</default>
       <locale name="C">
         <short>The handler for "mailto" URLs</short>
         <long>The command used to handle "mailto" URLs, if enabled.</long>


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- gnome-vfs2.spec	10 Aug 2006 13:28:51 -0000	1.127
+++ gnome-vfs2.spec	11 Aug 2006 15:14:30 -0000	1.128
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -62,6 +62,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=349979
 Patch5: gnome-vfs-2.15.90-dbus-spew.patch
 
+# RH bug #197868
+Patch6: gnome-vfs-2.15.91-mailto-command.patch
+
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -105,6 +108,8 @@
 
 %patch5 -p1 -b .dbus-spew
 
+%patch6 -p1 -b .mailto-command
+
 # send to upstream
 %patch101 -p1 -b .schema_about
 
@@ -195,6 +200,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Fri Aug 11 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.91-2.fc6
+- Add patch for RH bug #197868.
+
 * Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-1
 - update to 2.15.91
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 15:34:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 11:34:41 -0400
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.52,1.53
Message-ID: <200608111534.k7BFYegU003606@cvs.devel.redhat.com>

Author: vivekl

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

Modified Files:
	xalan-j2.spec 
Log Message:
- Rebuild.




Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xalan-j2.spec	10 Aug 2006 18:10:12 -0000	1.52
+++ xalan-j2.spec	11 Aug 2006 15:34:38 -0000	1.53
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        5jpp.2
+Release:        5jpp.3
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -114,9 +114,9 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Requires(post):		%{__rm}
+Requires(post):		/bin/rm
 Requires(post):		/bin/ln
-Requires(postun):	%{__rm}
+Requires(postun):	/bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -334,6 +334,9 @@
 %endif
 
 %changelog
+* Fri Aug 11 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-5jpp.3
+- Rebuild.
+
 * Thu Aug 10 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-5jpp.2
 - Rebuild.
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 15:39:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 11:39:52 -0400
Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.16,
	1.17 policy-20060802.patch, 1.8, 1.9 selinux-policy.spec,
	1.250, 1.251
Message-ID: <200608111539.k7BFdqHC005663@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	booleans-targeted.conf policy-20060802.patch 
	selinux-policy.spec 
Log Message:
* Fri Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-4
- Change allow_execstack to default to on, for RHEL5 Beta.  
  This is required because of a Java compiler problem.
  Hope to turn off for next beta



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- booleans-targeted.conf	19 Jul 2006 20:06:35 -0000	1.16
+++ booleans-targeted.conf	11 Aug 2006 15:39:50 -0000	1.17
@@ -8,7 +8,7 @@
 
 # Allow making the stack executable via mprotect.Also requires allow_execmem.
 # 
-allow_execstack = false
+allow_execstack = true
 
 # Allow ftpd to read cifs directories.
 # 

policy-20060802.patch:
 mls                                |    9 -
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |   13 +-
 modules/admin/usermanage.te        |    4 
 modules/apps/java.fc               |    1 
 modules/apps/mozilla.if            |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |   37 +++++
 modules/kernel/devices.te          |    8 +
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 +++++++++++
 modules/kernel/terminal.if         |   19 ++
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/avahi.te          |    1 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cron.if           |   16 ++
 modules/services/cron.te           |    1 
 modules/services/cups.te           |   18 ++
 modules/services/cyrus.te          |    1 
 modules/services/dbus.if           |    6 
 modules/services/ldap.te           |    2 
 modules/services/mta.fc            |    2 
 modules/services/nis.te            |    2 
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/procmail.te       |    1 
 modules/services/samba.te          |    6 
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  109 +++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   26 +++-
 modules/services/ssh.te            |    1 
 modules/services/stunnel.te        |    4 
 modules/services/xserver.if        |   69 ++++++++++
 modules/services/xserver.te        |   19 ++
 modules/system/authlogin.te        |    1 
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/init.te             |    2 
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |    3 
 modules/system/miscfiles.fc        |    1 
 modules/system/miscfiles.if        |   18 ++
 modules/system/modutils.te         |    1 
 modules/system/mount.te            |    3 
 modules/system/selinuxutil.te      |   15 ++
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    5 
 modules/system/userdomain.if       |  236 +++++++++++++++++++++++++------------
 modules/system/userdomain.te       |   48 +++----
 modules/system/xen.if              |   38 +++++
 modules/system/xen.te              |   26 +++-
 74 files changed, 875 insertions(+), 179 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- policy-20060802.patch	11 Aug 2006 04:09:21 -0000	1.8
+++ policy-20060802.patch	11 Aug 2006 15:39:50 -0000	1.9
@@ -272,7 +272,7 @@
  /dev/pmu		-c	gen_context(system_u:object_r:power_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.3.6/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/devices.if	2006-08-10 14:25:22.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/devices.if	2006-08-10 23:43:22.000000000 -0400
 @@ -2992,3 +2992,40 @@
  
  	typeattribute $1 devices_unconfined_type;
@@ -477,7 +477,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.6/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/terminal.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/kernel/terminal.if	2006-08-11 11:29:01.000000000 -0400
 @@ -308,6 +308,7 @@
  		type devpts_t;
  	')
@@ -961,8 +961,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te	2006-08-08 16:15:43.000000000 -0400
-@@ -0,0 +1,105 @@
++++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te	2006-08-11 11:30:54.000000000 -0400
+@@ -0,0 +1,109 @@
 +policy_module(setroubleshoot,1.0.0)
 +
 +########################################
@@ -1011,6 +1011,8 @@
 +logging_send_syslog_msg(setroubleshootd_t)
 +logging_audit_stream_connect(setroubleshootd_t)
 +
++locallogin_dontaudit_use_fds(setroubleshootd_t)
++
 +# pid file
 +files_search_pids(setroubleshootd_t)
 +allow setroubleshootd_t setroubleshoot_var_run_t:file manage_file_perms;
@@ -1060,6 +1062,8 @@
 +
 +term_dontaudit_use_console(setroubleshootd_t)
 +term_dontaudit_use_generic_ptys(setroubleshootd_t)
++term_dontaudit_use_all_user_ptys(setroubleshootd_t)
++term_dontaudit_use_all_user_ttys(setroubleshootd_t)
 +
 +optional_policy(`
 +	rpm_read_db(setroubleshootd_t)
@@ -1139,6 +1143,17 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.3.6/policy/modules/services/ssh.te
+--- nsaserefpolicy/policy/modules/services/ssh.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/services/ssh.te	2006-08-10 23:58:18.000000000 -0400
+@@ -61,6 +61,7 @@
+ 
+ 	type sshd_tmp_t;
+ 	files_tmp_file(sshd_tmp_t)
++
+ ')
+ 
+ #################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.6/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.6/policy/modules/services/stunnel.te	2006-08-08 16:15:43.000000000 -0400
@@ -1574,7 +1589,7 @@
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.6/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/selinuxutil.te	2006-08-09 11:02:28.000000000 -0400
++++ serefpolicy-2.3.6/policy/modules/system/selinuxutil.te	2006-08-11 09:47:12.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -1584,7 +1599,18 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-@@ -593,6 +595,9 @@
+@@ -463,6 +465,10 @@
+ miscfiles_read_localization(restorecond_t)
+ 
+ optional_policy(`
++	rpm_use_script_fds(restorecond_t)
++')
++
++optional_policy(`
+ 	# restorecond watches for users logging in, 
+ 	# so it getspwnam when a user logs in to find his homedir
+ 	nis_use_ypbind(restorecond_t)
+@@ -593,6 +599,9 @@
  
  miscfiles_read_localization(semanage_t)
  
@@ -1594,7 +1620,7 @@
  seutil_search_default_contexts(semanage_t)
  seutil_manage_file_contexts(semanage_t)
  seutil_manage_selinux_config(semanage_t)
-@@ -611,6 +616,12 @@
+@@ -611,6 +620,12 @@
  	# Handle pp files created in homedir and /tmp
  	files_read_generic_tmp_files(semanage_t)
  	userdom_read_generic_user_home_content_files(semanage_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- selinux-policy.spec	11 Aug 2006 03:16:13 -0000	1.250
+++ selinux-policy.spec	11 Aug 2006 15:39:50 -0000	1.251
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.6
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,6 +347,11 @@
 %endif
 
 %changelog
+* Fri Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-4
+- Change allow_execstack to default to on, for RHEL5 Beta.  
+  This is required because of a Java compiler problem.
+  Hope to turn off for next beta
+
 * Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3
 - Misc fixes
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 16:04:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 12:04:36 -0400
Subject: rpms/fontconfig/devel fontconfig-2.3.95-maybe-fix-overflow.patch,
	NONE, 1.1 fontconfig.spec, 1.83, 1.84
Message-ID: <200608111604.k7BG4alZ028641@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	fontconfig.spec 
Added Files:
	fontconfig-2.3.95-maybe-fix-overflow.patch 
Log Message:
- maybe fix buffer overflow (bug 202152).


fontconfig-2.3.95-maybe-fix-overflow.patch:
 fccache.c |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

--- NEW FILE fontconfig-2.3.95-maybe-fix-overflow.patch ---
--- fontconfig-2.3.95/src/fccache.c.maybe-fix-overflow	2006-08-11 11:56:06.000000000 -0400
+++ fontconfig-2.3.95/src/fccache.c	2006-08-11 11:59:30.000000000 -0400
@@ -1536,8 +1536,22 @@
     static char buf[MACHINE_SIGNATURE_SIZE];
     int32_t magic = ENDIAN_TEST;
     char * m = (char *)&magic;
+    int page_size;
 
-    sprintf (buf, "%2x%2x%2x%2x "
+#if defined (HAVE_SYSCONF)
+    page_size = sysconf(_SC_PAGESIZE);
+#else
+    page_size = -1;
+#endif
+
+    if (page_size < 0)
+	    page_size = FC_HARDCODED_PAGESIZE;
+
+    page_size = 0xffff & ((unsigned int) page_size);
+
+    snprintf (buf, 
+	      sizeof (buf),
+	     "%2x%2x%2x%2x "
 	     "%4x %4x %4x %4x %4x %4x %4x %4x %4x %4x %4x %4x "
 	     "%4x %4x %4x %4x %4x %4x %4x %4x\n", 
 	     m[0], m[1], m[2], m[3],
@@ -1560,11 +1574,7 @@
 	     (unsigned int)sizeof (FcCharLeaf),
 	     (unsigned int)sizeof (FcChar32),
 	     (unsigned int)sizeof (FcCache),
-#if defined (HAVE_SYSCONF)
-	     (unsigned int)sysconf(_SC_PAGESIZE));
-#else
-	     (unsigned int)FC_HARDCODED_PAGESIZE);
-#endif
+	     page_size);
 
     return buf;
 }


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- fontconfig.spec	11 Aug 2006 15:03:49 -0000	1.83
+++ fontconfig.spec	11 Aug 2006 16:04:33 -0000	1.84
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.95
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -17,6 +17,7 @@
 Patch3: fontconfig-2.4-cmap-parsing.patch
 Patch4: fontconfig-2.3.95-ttf-collections.patch
 Patch5: fontconfig-2.3.95-fd-leak.patch
+Patch6: fontconfig-2.3.95-maybe-fix-overflow.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -57,6 +58,7 @@
 %patch3 -p1 -b .cmap-parsing
 %patch4 -p1 -b .ttf-collections
 %patch5 -p1 -b .fd-leak
+%patch6 -p1 -b .maybe-fix-overflow
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -143,6 +145,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 2.3.95-8
+- maybe fix buffer overflow (bug 202152).
+
 * Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 2.3.95-7
 - Update configs to provide better openoffice/staroffice
   compatibility (bug 200723)



From fedora-cvs-commits at redhat.com  Fri Aug 11 16:17:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 12:17:50 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.16, 1.17 setroubleshoot.spec,
	1.20, 1.21 sources, 1.19, 1.20
Message-ID: <200608111617.k7BGHoDR005113@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4994/devel

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	10 Aug 2006 12:27:33 -0000	1.16
+++ .cvsignore	11 Aug 2006 16:17:47 -0000	1.17
@@ -1 +1 @@
-setroubleshoot-0.20.tar.gz
+setroubleshoot-0.21.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- setroubleshoot.spec	10 Aug 2006 12:27:33 -0000	1.20
+++ setroubleshoot.spec	11 Aug 2006 16:17:47 -0000	1.21
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.20
+Version: 0.21
 Release: 1
 License: GPL
 Group: Applications/System
@@ -11,6 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: perl-XML-Parser
+Requires: gnome-python2-gtkhtml2
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -87,7 +88,7 @@
 %dir %{pkgvardatadir}
 /etc/rc.d/init.d/%{name}
 %{_sysconfdir}/xdg/autostart/*
-%{_datadir}/applications/*.desktop
+#%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*png
 
 %changelog


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	10 Aug 2006 13:58:07 -0000	1.19
+++ sources	11 Aug 2006 16:17:47 -0000	1.20
@@ -1 +1 @@
-f576736b6e4563029aeedccedc014580  setroubleshoot-0.20.tar.gz
+c3373dbc83f2fc46d78a5777ae672ace  setroubleshoot-0.21.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 11 16:31:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 12:31:34 -0400
Subject: rpms/rgmanager/devel .cvsignore, 1.8, 1.9 rgmanager.spec, 1.32,
	1.33 sources, 1.15, 1.16
Message-ID: <200608111631.k7BGVYrY017874@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17847

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
Updated Sources (automated).


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Aug 2006 18:25:11 -0000	1.8
+++ .cvsignore	11 Aug 2006 16:31:31 -0000	1.9
@@ -2,3 +2,4 @@
 rgmanager-2.0.2.tar.gz
 rgmanager-2.0.3.tar.gz
 rgmanager-2.0.4.tar.gz
+rgmanager-2.0.5.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rgmanager.spec	10 Aug 2006 18:25:11 -0000	1.32
+++ rgmanager.spec	11 Aug 2006 16:31:31 -0000	1.33
@@ -11,7 +11,7 @@
 ###############################################################################
 
 Name: rgmanager
-Version: 2.0.4
+Version: 2.0.5
 Release: 0
 License: GPL,LGPL
 Group: System Environment/Base


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	10 Aug 2006 18:25:11 -0000	1.15
+++ sources	11 Aug 2006 16:31:31 -0000	1.16
@@ -1 +1 @@
-d113d81316e1a9f347b9a333bc2e4b08  rgmanager-2.0.4.tar.gz
+e3307a9c27a83de7570d116bf403ac02  rgmanager-2.0.5.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 11 16:39:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 12:39:01 -0400
Subject: rpms/fontconfig/devel fontconfig-2.3.95-maybe-fix-overflow.patch,
	1.1, 1.2 fontconfig.spec, 1.84, 1.85
Message-ID: <200608111639.k7BGd1uv019807@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	fontconfig-2.3.95-maybe-fix-overflow.patch fontconfig.spec 
Log Message:
- tweak last patch to give a more reasonable page size
  value if 64k page size is in effect.


fontconfig-2.3.95-maybe-fix-overflow.patch:
 fccache.c |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

Index: fontconfig-2.3.95-maybe-fix-overflow.patch
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig-2.3.95-maybe-fix-overflow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontconfig-2.3.95-maybe-fix-overflow.patch	11 Aug 2006 16:04:33 -0000	1.1
+++ fontconfig-2.3.95-maybe-fix-overflow.patch	11 Aug 2006 16:38:57 -0000	1.2
@@ -1,6 +1,6 @@
---- fontconfig-2.3.95/src/fccache.c.maybe-fix-overflow	2006-08-11 11:56:06.000000000 -0400
-+++ fontconfig-2.3.95/src/fccache.c	2006-08-11 11:59:30.000000000 -0400
-@@ -1536,8 +1536,22 @@
+--- fontconfig-2.3.95/src/fccache.c.maybe-fix-overflow	2006-08-11 12:04:21.000000000 -0400
++++ fontconfig-2.3.95/src/fccache.c	2006-08-11 12:37:56.000000000 -0400
+@@ -1536,8 +1536,26 @@
      static char buf[MACHINE_SIGNATURE_SIZE];
      int32_t magic = ENDIAN_TEST;
      char * m = (char *)&magic;
@@ -16,7 +16,11 @@
 +    if (page_size < 0)
 +	    page_size = FC_HARDCODED_PAGESIZE;
 +
-+    page_size = 0xffff & ((unsigned int) page_size);
++    if (page_size > 0xffff)
++    {
++	    page_size = 0xffff;
++	    fprintf (stderr, "system page size is bigger than expected\n");
++    }
 +
 +    snprintf (buf, 
 +	      sizeof (buf),
@@ -24,7 +28,7 @@
  	     "%4x %4x %4x %4x %4x %4x %4x %4x %4x %4x %4x %4x "
  	     "%4x %4x %4x %4x %4x %4x %4x %4x\n", 
  	     m[0], m[1], m[2], m[3],
-@@ -1560,11 +1574,7 @@
+@@ -1560,11 +1578,7 @@
  	     (unsigned int)sizeof (FcCharLeaf),
  	     (unsigned int)sizeof (FcChar32),
  	     (unsigned int)sizeof (FcCache),


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- fontconfig.spec	11 Aug 2006 16:04:33 -0000	1.84
+++ fontconfig.spec	11 Aug 2006 16:38:58 -0000	1.85
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.95
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -145,6 +145,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 2.3.95-9
+- tweak last patch to give a more reasonable page size
+  value if 64k page size is in effect.
+
 * Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 2.3.95-8
 - maybe fix buffer overflow (bug 202152).
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 16:40:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 12:40:00 -0400
Subject: rpms/fontconfig/devel fontconfig-2.3.95-maybe-fix-overflow.patch,
	1.2, 1.3
Message-ID: <200608111640.k7BGe0Jg020094@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	fontconfig-2.3.95-maybe-fix-overflow.patch 
Log Message:
small fixup


fontconfig-2.3.95-maybe-fix-overflow.patch:
 fccache.c |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

Index: fontconfig-2.3.95-maybe-fix-overflow.patch
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig-2.3.95-maybe-fix-overflow.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fontconfig-2.3.95-maybe-fix-overflow.patch	11 Aug 2006 16:38:57 -0000	1.2
+++ fontconfig-2.3.95-maybe-fix-overflow.patch	11 Aug 2006 16:39:56 -0000	1.3
@@ -4,7 +4,7 @@
      static char buf[MACHINE_SIGNATURE_SIZE];
      int32_t magic = ENDIAN_TEST;
      char * m = (char *)&magic;
-+    int page_size;
++    long page_size;
  
 -    sprintf (buf, "%2x%2x%2x%2x "
 +#if defined (HAVE_SYSCONF)
@@ -37,7 +37,7 @@
 -#else
 -	     (unsigned int)FC_HARDCODED_PAGESIZE);
 -#endif
-+	     page_size);
++	     (unsigned int) page_size);
  
      return buf;
  }



From fedora-cvs-commits at redhat.com  Fri Aug 11 16:46:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 12:46:23 -0400
Subject: rpms/dogtail/devel desktop-file-categories.patch, NONE,
	1.1 headless-gconf.patch, NONE, 1.1 dogtail.spec, 1.1, 1.2
Message-ID: <200608111646.k7BGkNJI021381@cvs.devel.redhat.com>

Author: zcerza

Update of /cvs/dist/rpms/dogtail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21280

Modified Files:
	dogtail.spec 
Added Files:
	desktop-file-categories.patch headless-gconf.patch 
Log Message:
- Added headless-gconf.patch to use the python gconf bindings.
- Added desktop-file-categories.patch to put sniff and dogtail-recorder under
  the 'Programming' menu.


desktop-file-categories.patch:
 recorder/dogtail-recorder.desktop |    2 +-
 sniff/sniff.desktop               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE desktop-file-categories.patch ---
Index: sniff/sniff.desktop
===================================================================
RCS file: /cvs/gnome/dogtail/sniff/sniff.desktop,v
retrieving revision 1.3
diff -u -r1.3 sniff.desktop
--- sniff/sniff.desktop	4 Apr 2006 22:42:35 -0000	1.3
+++ sniff/sniff.desktop	11 Aug 2006 16:43:16 -0000
@@ -11,4 +11,4 @@
 Type=Application
 Icon=dogtail-head.svg
 StartupNotify=true
-Categories=GNOME;Application;Utility;
+Categories=Application;Development;
Index: recorder/dogtail-recorder.desktop
===================================================================
RCS file: /cvs/gnome/dogtail/recorder/dogtail-recorder.desktop,v
retrieving revision 1.1
diff -u -r1.1 dogtail-recorder.desktop
--- recorder/dogtail-recorder.desktop	4 Apr 2006 22:38:17 -0000	1.1
+++ recorder/dogtail-recorder.desktop	11 Aug 2006 16:43:16 -0000
@@ -11,4 +11,4 @@
 Type=Application
 Icon=dogtail-head.svg
 StartupNotify=true
-Categories=GNOME;Application;Utility;
+Categories=Application;Development;

headless-gconf.patch:
 dogtail-run-headless |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)

--- NEW FILE headless-gconf.patch ---
Index: scripts/dogtail-run-headless
===================================================================
RCS file: /cvs/gnome/dogtail/scripts/dogtail-run-headless,v
retrieving revision 1.7
diff -u -r1.7 dogtail-run-headless
--- scripts/dogtail-run-headless	13 Jul 2006 18:20:57 -0000	1.7
+++ scripts/dogtail-run-headless	11 Aug 2006 16:11:33 -0000
@@ -31,24 +31,12 @@
 
 import os
 import sys
+import gconf
+gconfClient = gconf.client_get_default()
 
 TRUE='true'
 FALSE='false'
 
-def getGConfBool(key):
-    cmd = 'gconftool-2 --get ' + key
-    answer = os.popen(cmd).readlines()[0].strip()
-    if answer == TRUE: return True
-    elif answer == FALSE: return False
-    else: raise RuntimeError, answer
-
-def setGConfBool(key, value):
-    if value == True: value = TRUE
-    elif value == False: value = FALSE
-    else: raise TypeError, value
-    cmd = 'gconftool-2 --type bool --set %s %s' % (key, value)
-    os.popen(cmd)
-
 a11yGConfKey = '/desktop/gnome/interface/accessibility'
 
 global a11yIsEnabled
@@ -57,13 +45,15 @@
 
 def makeSureGNOMEIsAccessible():
     global a11yIsEnabled, a11yWasEnabled
-    a11yIsEnabled = getGConfBool(a11yGConfKey)
+    a11yIsEnabled = gconfClient.get_bool(a11yGConfKey)
     a11yWasEnabled = a11yIsEnabled
 
     if not a11yIsEnabled:
         print "Temporarily enabling accessibility support for GNOME"
-        setGConfBool(a11yGConfKey, True)
-        a11yIsEnabled = True
+        gconfClient.set_bool(a11yGConfKey, True)
+        a11yIsEnabled = gconfClient.get_bool(a11yGConfKey)
+
+    return a11yIsEnabled
 
 global xinitrc
 xinitrc = None
@@ -89,8 +79,6 @@
 
     client = xinitrc.name
     resolution = '1024x768x16'
-    'xinit /usr/ucb/rsh fasthost cpupig -display ws:1 --  :1 -a 2 -t 5'
-    'xinit -- /usr/bin/Xvfb :1 -screen 0 1024x768x24 -ac -noreset -shmem'
     cmd = 'xinit %s -- %s %s -screen 0 %s -ac -noreset -shmem' % \
             (client, server, findFreeDisplay(), resolution)
     print cmd
@@ -187,7 +175,7 @@
             return exitCode
 
 def cleanup():
-    if not a11yWasEnabled: setGConfBool(a11yGConfKey, False)
+    if not a11yWasEnabled: gconfClient.set_bool(a11yGConfKey, False)
     if exitCodeFile:
         os.remove(exitCodeFile)
     if xinitrc:


Index: dogtail.spec
===================================================================
RCS file: /cvs/dist/rpms/dogtail/devel/dogtail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dogtail.spec	1 Aug 2006 21:43:24 -0000	1.1
+++ dogtail.spec	11 Aug 2006 16:46:20 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: GUI test tool and automation framework
 Name: dogtail
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: User Interface/X
 URL: http://people.redhat.com/zcerza/dogtail/
@@ -14,6 +14,8 @@
 Requires: pygtk2
 Requires: rpm-python
 Requires: xorg-x11-server-Xvfb
+patch0: headless-gconf.patch
+patch1: desktop-file-categories.patch
 
 %description
 GUI test tool and automation framework that uses assistive technologies to 
@@ -22,6 +24,8 @@
 %prep
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %setup -q
+%patch0 -p0
+%patch1 -p0
 
 %build
 python ./setup.py build
@@ -60,6 +64,11 @@
 %doc examples/
 
 %changelog
+* Fri Aug 11 2006 Zack Cerza <zcerza at redhat.com> - 0.5.2-2
+- Added headless-gconf.patch to use the python gconf bindings.
+- Added desktop-file-categories.patch to put sniff and dogtail-recorder under
+  the 'Programming' menu.
+
 * Tue Aug 01 2006 Zack Cerza <zcerza at redhat.com> - 0.5.2-1
 - New upstream release.
 - Update Requires from Xvfb to xorg-x11-server-Xvfb.



From fedora-cvs-commits at redhat.com  Fri Aug 11 16:56:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 12:56:35 -0400
Subject: rpms/kdebase/FC-5 kdebase.spec,1.177,1.178
Message-ID: <200608111656.k7BGuZUO015409@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Log Message:
3.5.4



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- kdebase.spec	10 Aug 2006 20:15:41 -0000	1.177
+++ kdebase.spec	11 Aug 2006 16:56:32 -0000	1.178
@@ -354,7 +354,7 @@
 mkdir -p %{buildroot}%{_libdir}/mozilla/plugins
 
 # exclude fonts.dir
-rm -f %{buildroot}%{_datadir}/fonts/override/fonts.dir
+rm -rf %{buildroot}%{_datadir}/fonts
 
 %clean
 rm -rf %{buildroot}
@@ -491,7 +491,6 @@
 %config %{_datadir}/config/*
 %{_datadir}/config.kcfg/
 %{_datadir}/desktop-directories
-%exclude %{_datadir}/fonts/bitmap-fonts/*
 %{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/icons/*color/*/*/*
 %{_datadir}/locale/*/entry.desktop



From fedora-cvs-commits at redhat.com  Fri Aug 11 17:11:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 13:11:35 -0400
Subject: rpms/cups/devel cups-str1893.patch,NONE,1.1 cups.spec,1.243,1.244
Message-ID: <200608111711.k7BHBZts026358@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1893.patch 
Log Message:
* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
- Applied patch to fix STR #1893 (bug #201800).


cups-str1893.patch:
 dirsvc.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE cups-str1893.patch ---
--- cups-1.2.x/scheduler/dirsvc.c.str1893	2006-08-11 16:59:00.000000000 +0100
+++ cups-1.2.x/scheduler/dirsvc.c	2006-08-11 17:55:12.000000000 +0100
@@ -1923,6 +1923,10 @@
     else
       return;
 
+    /* Restore full host name. */
+    if (hptr && *hptr == '\0')
+      *hptr = '.';
+
     if ((p = cupsdFindClass(name)) == NULL && BrowseShortNames)
     {
       if ((p = cupsdFindClass(resource + 9)) != NULL)
@@ -2026,6 +2030,10 @@
     else
       return;
 
+    /* Restore full host name. */
+    if (hptr && *hptr == '\0')
+      *hptr = '.';
+
     if ((p = cupsdFindPrinter(name)) == NULL && BrowseShortNames)
     {
       if ((p = cupsdFindPrinter(resource + 10)) != NULL)


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- cups.spec	10 Aug 2006 17:10:47 -0000	1.243
+++ cups.spec	11 Aug 2006 17:11:31 -0000	1.244
@@ -41,6 +41,7 @@
 Patch16: cups-pid.patch
 Patch17: cups-relro.patch
 Patch18: cups-str1881.patch
+Patch19: cups-str1893.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -141,6 +142,7 @@
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .relro
 %patch18 -p1 -b .str1881
+%patch19 -p1 -b .str1893
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -417,6 +419,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
+- Applied patch to fix STR #1893 (bug #201800).
+
 * Thu Aug 10 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-9
 - Try different fix for STR #1795/STR #1881 (bug #201167).
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 17:12:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 13:12:42 -0400
Subject: rpms/cups/devel cups.spec,1.244,1.245
Message-ID: <200608111712.k7BHCgnh026562@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
- Remove 'Provides: LPRng = 3.8.15-3' (bug #148757).


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- cups.spec	11 Aug 2006 17:11:31 -0000	1.244
+++ cups.spec	11 Aug 2006 17:12:39 -0000	1.245
@@ -55,7 +55,7 @@
 
 # Unconditionally obsolete LPRng so that upgrades work properly.
 Obsoletes: lpd lpr LPRng <= 3.8.15-3
-Provides: lpd lpr LPRng = 3.8.15-3
+Provides: lpd lpr
 
 # kdelibs conflict for bug #192585.
 Conflicts: kdelibs < 6:3.5.2-6
@@ -420,6 +420,7 @@
 
 %changelog
 * Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
+- Remove 'Provides: LPRng = 3.8.15-3' (bug #148757).
 - Applied patch to fix STR #1893 (bug #201800).
 
 * Thu Aug 10 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-9



From fedora-cvs-commits at redhat.com  Fri Aug 11 17:13:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 13:13:37 -0400
Subject: rpms/cups/devel cups.spec,1.245,1.246
Message-ID: <200608111713.k7BHDbQE026720@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
1:1.2.2-10


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- cups.spec	11 Aug 2006 17:12:39 -0000	1.245
+++ cups.spec	11 Aug 2006 17:13:35 -0000	1.246
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 9
+Release: 10
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -419,7 +419,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
+* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-10
 - Remove 'Provides: LPRng = 3.8.15-3' (bug #148757).
 - Applied patch to fix STR #1893 (bug #201800).
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 17:14:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 13:14:48 -0400
Subject: rpms/cups/FC-5 cups-str1893.patch,NONE,1.1 cups.spec,1.203,1.204
Message-ID: <200608111714.k7BHEmDr027076@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1893.patch 
Log Message:
* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
- Apply patch to fix STR #1893 (bug #201800).


cups-str1893.patch:
 dirsvc.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE cups-str1893.patch ---
--- cups-1.2.x/scheduler/dirsvc.c.str1893	2006-08-11 16:59:00.000000000 +0100
+++ cups-1.2.x/scheduler/dirsvc.c	2006-08-11 17:55:12.000000000 +0100
@@ -1923,6 +1923,10 @@
     else
       return;
 
+    /* Restore full host name. */
+    if (hptr && *hptr == '\0')
+      *hptr = '.';
+
     if ((p = cupsdFindClass(name)) == NULL && BrowseShortNames)
     {
       if ((p = cupsdFindClass(resource + 9)) != NULL)
@@ -2026,6 +2030,10 @@
     else
       return;
 
+    /* Restore full host name. */
+    if (hptr && *hptr == '\0')
+      *hptr = '.';
+
     if ((p = cupsdFindPrinter(name)) == NULL && BrowseShortNames)
     {
       if ((p = cupsdFindPrinter(resource + 10)) != NULL)


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- cups.spec	6 Aug 2006 10:58:30 -0000	1.203
+++ cups.spec	11 Aug 2006 17:14:46 -0000	1.204
@@ -31,6 +31,7 @@
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
+Patch11: cups-str1893.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
 Patch17: cups-serverbin-compat.patch
@@ -127,6 +128,7 @@
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
+%patch11 -p1 -b .str1893
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
 %patch17 -p1 -b .serverbin-compat
@@ -404,6 +406,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
+- Apply patch to fix STR #1893 (bug #201800).
+
 * Sun Aug  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.5
 - Apply patch from STR #1881 for remote IPP printing (bug #201167).
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 17:17:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 13:17:35 -0400
Subject: rpms/glib-java/devel .cvsignore, 1.11, 1.12 glib-java.spec, 1.40,
	1.41 sources, 1.11, 1.12
Message-ID: <200608111717.k7BHHZ6p030614@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29003

Modified Files:
	.cvsignore glib-java.spec sources 
Log Message:
- New upstream version.
- Do use %{?dist} after all.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel package.
- The -devel package now requires glib2-devel.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Jun 2006 16:58:54 -0000	1.11
+++ .cvsignore	11 Aug 2006 17:17:32 -0000	1.12
@@ -1 +1 @@
-glib-java-0.2.5.tar.bz2
+glib-java-0.2.6.tar.bz2


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- glib-java.spec	23 Jul 2006 00:58:22 -0000	1.40
+++ glib-java.spec	11 Aug 2006 17:17:32 -0000	1.41
@@ -14,8 +14,8 @@
 %define name_base glib-java
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
-Version:   0.2.5
-Release:   3
+Version:   0.2.6
+Release:   1%{?dist}
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 License:   LGPL
@@ -36,11 +36,10 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
-
+Development part of %{name}.
 
 
 %prep
@@ -62,7 +61,7 @@
 sed -i 's/^pic_flag=\"\"/pic_flag=\"\ \-fPIC\"/' libtool
 sed -i 's/^compiler_c_o=\"no\"/compiler_c_o=\"yes\"/' libtool
 
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -77,7 +76,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make  DESTDIR=$RPM_BUILD_ROOT  install 
+make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name}' ] ; then
@@ -106,24 +105,31 @@
 %{_includedir}/%{name_base}/*
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 %dir %{_datadir}/%{name_base}
 %{_datadir}/%{name_base}/*
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Aug 11 2006 Stepan Kasal <skasal at redhat.com> - 0.2.6-1
+- New upstream version.
+- Do use %%{?dist} after all.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel package.
+- The -devel package now requires glib2-devel.
+
 * Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.2.5-3
 - Bump release number. (dist-fc6-java)
 
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-2
-- Do not use macro {?dist}.
+- Do not use %%{?dist}.
 
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-1
-- Release 0 is not allowed; use macro {?dist}.
+- Release 0 is not allowed; use %%{?dist}.
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.5-0.1
 - rebuild


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Jun 2006 16:58:54 -0000	1.11
+++ sources	11 Aug 2006 17:17:33 -0000	1.12
@@ -1 +1 @@
-83d49e96f6bc806aead66b83be542ef0  glib-java-0.2.5.tar.bz2
+80aa32ba4901ed92a1ef8a53fd9157e5  glib-java-0.2.6.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 11 17:17:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 13:17:47 -0400
Subject: rpms/cups/FC-5 cups.spec,1.204,1.205
Message-ID: <200608111717.k7BHHg6N030849@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
1:1.2.2-1.6


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- cups.spec	11 Aug 2006 17:14:46 -0000	1.204
+++ cups.spec	11 Aug 2006 17:17:38 -0000	1.205
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 1.5
+Release: 1.6
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -406,7 +406,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
+* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.6
 - Apply patch to fix STR #1893 (bug #201800).
 
 * Sun Aug  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.5



From fedora-cvs-commits at redhat.com  Fri Aug 11 17:35:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 13:35:46 -0400
Subject: rpms/fontconfig/devel
	fontconfig-2.3.95-fix-page-size-overflow.patch, NONE,
	1.1 fontconfig.spec, 1.85,
	1.86 fontconfig-2.3.95-maybe-fix-overflow.patch, 1.3, NONE
Message-ID: <200608111735.k7BHZk1J015247@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	fontconfig.spec 
Added Files:
	fontconfig-2.3.95-fix-page-size-overflow.patch 
Removed Files:
	fontconfig-2.3.95-maybe-fix-overflow.patch 
Log Message:
- use "%5x" instead of " %4x" to support 64k instead of
  clamping.  Idea from Behdad.


fontconfig-2.3.95-fix-page-size-overflow.patch:
 fccache.c |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

--- NEW FILE fontconfig-2.3.95-fix-page-size-overflow.patch ---
--- fontconfig-2.3.95/src/fccache.c.fix-page-size-overflow	2006-08-11 13:34:08.000000000 -0400
+++ fontconfig-2.3.95/src/fccache.c	2006-08-11 13:34:08.000000000 -0400
@@ -39,6 +39,7 @@
 #define MACHINE_SIGNATURE_SIZE (9 + 5*20 + 1)
 /* for when we don't have sysconf: */
 #define FC_HARDCODED_PAGESIZE 8192 
+#define FC_MAX_PAGESIZE 0xfffff
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -1536,10 +1537,28 @@
     static char buf[MACHINE_SIGNATURE_SIZE];
     int32_t magic = ENDIAN_TEST;
     char * m = (char *)&magic;
+    long page_size;
 
-    sprintf (buf, "%2x%2x%2x%2x "
+#if defined (HAVE_SYSCONF)
+    page_size = sysconf(_SC_PAGESIZE);
+#else
+    page_size = -1;
+#endif
+
+    if (page_size < 0)
+	    page_size = FC_HARDCODED_PAGESIZE;
+
+    if (page_size > FC_MAX_PAGESIZE)
+    {
+	    page_size = FC_MAX_PAGESIZE;
+	    fprintf (stderr, "system page size is bigger than expected\n");
+    }
+
+    snprintf (buf, 
+	      sizeof (buf),
+	     "%2x%2x%2x%2x "
 	     "%4x %4x %4x %4x %4x %4x %4x %4x %4x %4x %4x %4x "
-	     "%4x %4x %4x %4x %4x %4x %4x %4x\n", 
+	     "%4x %4x %4x %4x %4x %4x %4x%5x\n", 
 	     m[0], m[1], m[2], m[3],
 	     (unsigned int)sizeof (char),
 	     (unsigned int)sizeof (char *),
@@ -1560,11 +1579,7 @@
 	     (unsigned int)sizeof (FcCharLeaf),
 	     (unsigned int)sizeof (FcChar32),
 	     (unsigned int)sizeof (FcCache),
-#if defined (HAVE_SYSCONF)
-	     (unsigned int)sysconf(_SC_PAGESIZE));
-#else
-	     (unsigned int)FC_HARDCODED_PAGESIZE);
-#endif
+	     (unsigned int)page_size);
 
     return buf;
 }


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- fontconfig.spec	11 Aug 2006 16:38:58 -0000	1.85
+++ fontconfig.spec	11 Aug 2006 17:35:44 -0000	1.86
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.95
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -17,7 +17,7 @@
 Patch3: fontconfig-2.4-cmap-parsing.patch
 Patch4: fontconfig-2.3.95-ttf-collections.patch
 Patch5: fontconfig-2.3.95-fd-leak.patch
-Patch6: fontconfig-2.3.95-maybe-fix-overflow.patch
+Patch6: fontconfig-2.3.95-fix-page-size-overflow.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -58,7 +58,7 @@
 %patch3 -p1 -b .cmap-parsing
 %patch4 -p1 -b .ttf-collections
 %patch5 -p1 -b .fd-leak
-%patch6 -p1 -b .maybe-fix-overflow
+%patch6 -p1 -b .fix-page-size-overflow
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -145,6 +145,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 2.3.95-10
+- use "%5x" instead of " %4x" to support 64k instead of
+  clamping.  Idea from Behdad.
+
 * Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 2.3.95-9
 - tweak last patch to give a more reasonable page size
   value if 64k page size is in effect.


--- fontconfig-2.3.95-maybe-fix-overflow.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 11 18:09:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 14:09:44 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2548,
	1.2549 linux-2.6-lockdep-fixes.patch, 1.20, 1.21
Message-ID: <200608111809.k7BI9ihY007152@cvs.devel.redhat.com>

Author: davej

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

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


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2548
retrieving revision 1.2549
diff -u -r1.2548 -r1.2549
--- kernel-2.6.spec	11 Aug 2006 01:54:11 -0000	1.2548
+++ kernel-2.6.spec	11 Aug 2006 18:09:31 -0000	1.2549
@@ -1697,6 +1697,9 @@
 %endif
 
 %changelog
+* Fri Aug 11 2006 Dave Jones <davej at redhat.com>
+- Yet more lockdep fixes.
+
 * Thu Aug 10 2006 Roland McGrath <roland at redhat.com>
 - New utrace patch: fix ptrace synchronization issues.
 

linux-2.6-lockdep-fixes.patch:
 a/kernel/lockdep.c                             |   13 +++++++
 a/net/ipv6/icmp.c                              |   13 +++++++
 b/drivers/infiniband/hw/mthca/mthca_provider.h |    4 +-
 b/drivers/infiniband/hw/mthca/mthca_qp.c       |   43 +++++++++++++++++--------
 linux-2.6.17-mm6/include/net/sock.h            |   33 +++++++++++++++++--
 linux-2.6.17.noarch/fs/exec.c                  |    2 -
 linux-2.6.18-rc1/drivers/input/serio/libps2.c  |    6 +--
 linux-2.6.18-rc1/include/linux/libps2.h        |   12 ++++++
 linux-2.6.18-rc1/net/socket.c                  |    8 ++++
 9 files changed, 110 insertions(+), 24 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-lockdep-fixes.patch	11 Aug 2006 01:54:11 -0000	1.20
+++ linux-2.6-lockdep-fixes.patch	11 Aug 2006 18:09:39 -0000	1.21
@@ -465,3 +465,148 @@
  
  		rcu_assign_pointer(current->sighand, newsighand);
  		recalc_sigpending();
+To:	openib-general at openib.org, mingo at redhat.com, arjan at linux.intel.com
+Cc:	linux-kernel at vger.kernel.org
+Subject: [PATCH] Fix potential deadlock in mthca
+From:	Roland Dreier <rdreier at cisco.com>
+Date:	Fri, 11 Aug 2006 09:00:22 -0700
+Message-ID: <adad5b7ntyh.fsf at cisco.com>
+
+Here's a long-standing bug that lockdep found very nicely.
+
+Ingo/Arjan, can you confirm that the fix looks OK and I am using
+spin_lock_nested() properly?  I couldn't find much documentation or
+many examples of it, so I'm not positive this is the right way to
+handle this fix.
+
+I'm inclined to put this fix in 2.6.18, since this is a kernel
+deadlock that is triggerable from userspace via uverbs.  Comments?
+
+Thanks,
+  Roland
+
+commit a19aa5c5fdda8b556ab238177ee27c5ef7873c94
+Author: Roland Dreier <rolandd at cisco.com>
+Date:   Fri Aug 11 08:56:57 2006 -0700
+
+    IB/mthca: Fix potential AB-BA deadlock with CQ locks
+    
+    When destroying a QP, mthca locks both the QP's send CQ and receive
+    CQ.  However, the following scenario is perfectly valid:
+    
+        QP_a: send_cq == CQ_x, recv_cq == CQ_y
+        QP_b: send_cq == CQ_y, recv_cq == CQ_x
+    
+    The old mthca code simply locked send_cq and then recv_cq, which in
+    this case could lead to an AB-BA deadlock if QP_a and QP_b were
+    destroyed simultaneously.
+    
+    We can fix this by changing the locking code to lock the CQ with the
+    lower CQ number first, which will create a consistent lock ordering.
+    Also, the second CQ is locked with spin_lock_nested() to tell lockdep
+    that we know what we're doing with the lock nesting.
+    
+    This bug was found by lockdep.
+    
+    Signed-off-by: Roland Dreier <rolandd at cisco.com>
+
+diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infiniband/hw/mthca/mthca_provider.h
+index 8de2887..9a5bece 100644
+--- a/drivers/infiniband/hw/mthca/mthca_provider.h
++++ b/drivers/infiniband/hw/mthca/mthca_provider.h
+@@ -136,8 +136,8 @@ struct mthca_ah {
+  * We have one global lock that protects dev->cq/qp_table.  Each
+  * struct mthca_cq/qp also has its own lock.  An individual qp lock
+  * may be taken inside of an individual cq lock.  Both cqs attached to
+- * a qp may be locked, with the send cq locked first.  No other
+- * nesting should be done.
++ * a qp may be locked, with the cq with the lower cqn locked first.
++ * No other nesting should be done.
+  *
+  * Each struct mthca_cq/qp also has an ref count, protected by the
+  * corresponding table lock.  The pointer from the cq/qp_table to the
+diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
+index 157b4f8..2e8f6f3 100644
+--- a/drivers/infiniband/hw/mthca/mthca_qp.c
++++ b/drivers/infiniband/hw/mthca/mthca_qp.c
+@@ -1263,6 +1263,32 @@ int mthca_alloc_qp(struct mthca_dev *dev
+ 	return 0;
+ }
+ 
++static void mthca_lock_cqs(struct mthca_cq *send_cq, struct mthca_cq *recv_cq)
++{
++	if (send_cq == recv_cq)
++		spin_lock_irq(&send_cq->lock);
++	else if (send_cq->cqn < recv_cq->cqn) {
++		spin_lock_irq(&send_cq->lock);
++		spin_lock_nested(&recv_cq->lock, SINGLE_DEPTH_NESTING);
++	} else {
++		spin_lock_irq(&recv_cq->lock);
++		spin_lock_nested(&send_cq->lock, SINGLE_DEPTH_NESTING);
++	}
++}
++
++static void mthca_unlock_cqs(struct mthca_cq *send_cq, struct mthca_cq *recv_cq)
++{
++	if (send_cq == recv_cq)
++		spin_unlock_irq(&send_cq->lock);
++	else if (send_cq->cqn < recv_cq->cqn) {
++		spin_unlock(&recv_cq->lock);
++		spin_unlock_irq(&send_cq->lock);
++	} else {
++		spin_unlock(&send_cq->lock);
++		spin_unlock_irq(&recv_cq->lock);
++	}
++}
++
+ int mthca_alloc_sqp(struct mthca_dev *dev,
+ 		    struct mthca_pd *pd,
+ 		    struct mthca_cq *send_cq,
+@@ -1315,17 +1341,13 @@ int mthca_alloc_sqp(struct mthca_dev *de
+ 	 * Lock CQs here, so that CQ polling code can do QP lookup
+ 	 * without taking a lock.
+ 	 */
+-	spin_lock_irq(&send_cq->lock);
+-	if (send_cq != recv_cq)
+-		spin_lock(&recv_cq->lock);
++	mthca_lock_cqs(send_cq, recv_cq);
+ 
+ 	spin_lock(&dev->qp_table.lock);
+ 	mthca_array_clear(&dev->qp_table.qp, mqpn);
+ 	spin_unlock(&dev->qp_table.lock);
+ 
+-	if (send_cq != recv_cq)
+-		spin_unlock(&recv_cq->lock);
+-	spin_unlock_irq(&send_cq->lock);
++	mthca_unlock_cqs(send_cq, recv_cq);
+ 
+  err_out:
+ 	dma_free_coherent(&dev->pdev->dev, sqp->header_buf_size,
+@@ -1359,9 +1381,7 @@ void mthca_free_qp(struct mthca_dev *dev
+ 	 * Lock CQs here, so that CQ polling code can do QP lookup
+ 	 * without taking a lock.
+ 	 */
+-	spin_lock_irq(&send_cq->lock);
+-	if (send_cq != recv_cq)
+-		spin_lock(&recv_cq->lock);
++	mthca_lock_cqs(send_cq, recv_cq);
+ 
+ 	spin_lock(&dev->qp_table.lock);
+ 	mthca_array_clear(&dev->qp_table.qp,
+@@ -1369,9 +1389,7 @@ void mthca_free_qp(struct mthca_dev *dev
+ 	--qp->refcount;
+ 	spin_unlock(&dev->qp_table.lock);
+ 
+-	if (send_cq != recv_cq)
+-		spin_unlock(&recv_cq->lock);
+-	spin_unlock_irq(&send_cq->lock);
++	mthca_unlock_cqs(send_cq, recv_cq);
+ 
+ 	wait_event(qp->wait, !get_qp_refcount(dev, qp));
+ 
+-
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
+



From fedora-cvs-commits at redhat.com  Fri Aug 11 18:34:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 14:34:23 -0400
Subject: rpms/kdemultimedia/FC-5 kdemultimedia-3.5.3-noatun.patch, NONE,
	1.1 kdemultimedia.spec, 1.61, 1.62 sources, 1.36,
	1.37 kdemultimedia.diff, 1.1, NONE
Message-ID: <200608111834.k7BIYN2j028721@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdemultimedia.spec sources 
Added Files:
	kdemultimedia-3.5.3-noatun.patch 
Removed Files:
	kdemultimedia.diff 
Log Message:
3.5.4


kdemultimedia-3.5.3-noatun.patch:
 Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdemultimedia-3.5.3-noatun.patch ---
--- kdemultimedia-3.5.3/noatun/Makefile.am.tn	2006-07-11 22:46:50.000000000 +0200
+++ kdemultimedia-3.5.3/noatun/Makefile.am	2006-07-11 23:12:32.000000000 +0200
@@ -9,9 +9,11 @@
 presetsdir = $(kde_datadir)/noatun/eq.preset
 presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero
 
+kconf_PROGRAMS = noatun20update
+kconfdir = $(libdir)/kconf_update_bin
+
 updatedir = $(kde_datadir)/kconf_update
 update_DATA = noatun.upd
-update_PROGRAMS = noatun20update
 
 noatun20update_SOURCES  = noatun20update.cpp
 noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-5/kdemultimedia.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kdemultimedia.spec	26 Jun 2006 14:44:43 -0000	1.61
+++ kdemultimedia.spec	11 Aug 2006 18:34:20 -0000	1.62
@@ -13,11 +13,10 @@
 
 %define patch_name -patched
 
-Version: 3.5.3
-Release: 0.2.fc5
+Version: 3.5.4
+Release: 0.1.fc5
 Epoch: 6
 Name: kdemultimedia
-Prefix: /usr
 Summary: Multimedia applications for the K Desktop Environment (KDE).
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,21 +29,21 @@
 Patch4: kdemultimedia-3.5.3-examples.patch
 
 # upstream patches
-Patch100: kdemultimedia.diff
+Patch100: kdemultimedia-3.5.3-noatun.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 Requires: kdebase >= 6:%{version}
 
 BuildRequires: zlib-devel
 BuildRequires: kdebase-devel >= %{version}
-BuildRequires: gcc-c++
-BuildRequires: glibc-devel
 BuildRequires: perl
 BuildRequires: libvorbis-devel
 BuildRequires: audiofile-devel
 BuildRequires: glib2-devel
-BuildRequires: /usr/bin/desktop-file-install
+BuildRequires: desktop-file-utils
 BuildRequires: libtheora-devel
 BuildRequires: flac-devel
 %if %{make_cvs}
@@ -89,7 +88,7 @@
 %patch4 -p1 -b .examples
 
 # upstream patches
-%patch100 -p0 -b .setuid-check
+%patch100 -p1 -b .noatun
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -101,7 +100,7 @@
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-   --with-extra-includes=/usr/include/cdda \
+   --with-extra-includes=%{_includedir}/cdda \
    --includedir=%{_includedir}/kde \
    --disable-gcc-hidden-visibility \
    --with-cdparanoia \
@@ -124,10 +123,8 @@
 %endif
    --disable-rpath
 
-SMP_MFLAGS=%{?_smp_mflags}
-
-make $SMP_MFLAGS
-make $SMP_MFLAGS -C kaudiocreator
+make %{?_smp_mflags}
+make %{?_smp_mflags} -C kaudiocreator
 
 %install
 rm -rf %{buildroot}
@@ -152,9 +149,21 @@
    ln -sf ../common $i
 done
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
 rm -rf %{buildroot}
@@ -193,6 +202,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Aug 11 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.1.fc5
+- 3.5.4
+
 * Mon Jun 26 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
 - fix #196231, Unknown protocol audiocd when kaudiocreator started
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-5/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	9 Jun 2006 16:32:04 -0000	1.36
+++ sources	11 Aug 2006 18:34:20 -0000	1.37
@@ -1 +1 @@
-52bb137a4605a35e56ec9dc1070e0e28  kdemultimedia-3.5.3-patched.tar.bz2
+937bc95131093b86e4fb637446ec1532  kdemultimedia-3.5.4-patched.tar.bz2


--- kdemultimedia.diff DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 11 18:43:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 14:43:24 -0400
Subject: rpms/squirrelmail/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 squirrelmail.spec, 1.43, 1.44
Message-ID: <200608111843.k7BIhOal030605@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30580

Modified Files:
	.cvsignore sources squirrelmail.spec 
Log Message:
1.4.8 release with CVE-2006-4019 and upstream bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Jul 2006 20:50:24 -0000	1.15
+++ .cvsignore	11 Aug 2006 18:43:17 -0000	1.16
@@ -1,2 +1 @@
-squirrelmail-1.4.7.tar.bz2
-all_locales-1.4.7-20060702.tar.bz2
+squirrelmail-1.4.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Jul 2006 20:50:24 -0000	1.15
+++ sources	11 Aug 2006 18:43:18 -0000	1.16
@@ -1,2 +1 @@
-08301f14d71e4452e93f21b5e6747a4a  squirrelmail-1.4.7.tar.bz2
-4b78f4612ef0a68e5a81a818a113497c  all_locales-1.4.7-20060702.tar.bz2
+ba3306e4790bbdb10eaccb00195f5107  squirrelmail-1.4.8.tar.bz2


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- squirrelmail.spec	19 Jul 2006 02:40:18 -0000	1.43
+++ squirrelmail.spec	11 Aug 2006 18:43:18 -0000	1.44
@@ -5,12 +5,11 @@
 
 Summary: SquirrelMail webmail client
 Name: squirrelmail
-Version: 1.4.7
-Release: 5.fc6
+Version: 1.4.8
+Release: 1.fc6
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
-#Source: %{name}-%{version}.tar.bz2
 Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}.tar.bz2
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
@@ -225,7 +224,6 @@
 %config %dir %{_sysconfdir}/squirrelmail
 %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/*.php
 %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/default_pref
-%attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/sqspell_config.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 %doc doc/*
 %dir %{_datadir}/squirrelmail
@@ -248,6 +246,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Fri Aug 11 2006 Warren Togami <wtogami at redhat.com> 1.4.8-1
+- 1.4.8 release with CVE-2006-4019 and upstream bug fixes
+
 * Tue Jul 18 2006 Warren Togami <wtogami at redhat.com> 1.4.7-5
 - More JP translation updates (#194598)
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 18:43:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 14:43:26 -0400
Subject: rpms/kdepim/FC-5 kdepim-3.5.4-kde#117882.patch, NONE,
	1.1 kdepim-3.5.4-kde#132008.patch, NONE, 1.1 kdepim.spec, 1.90,
	1.91 sources, 1.35, 1.36 kdepim-3.5.3-kmail-127538.patch, 1.1,
	NONE kdepim-3.5.3-kmail-encryption.patch, 1.1,
	NONE kdepim-3.5.3-kmail-typo.patch, 1.2,
	NONE kdepim-3.5.3-korganizer.patch, 1.1, NONE
Message-ID: <200608111843.k7BIhQN0030630@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdepim.spec sources 
Added Files:
	kdepim-3.5.4-kde#117882.patch kdepim-3.5.4-kde#132008.patch 
Removed Files:
	kdepim-3.5.3-kmail-127538.patch 
	kdepim-3.5.3-kmail-encryption.patch 
	kdepim-3.5.3-kmail-typo.patch kdepim-3.5.3-korganizer.patch 
Log Message:
3.5.4


kdepim-3.5.4-kde#117882.patch:
 kmsender.cpp |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE kdepim-3.5.4-kde#117882.patch ---
Index: kmail/kmsender.cpp
===================================================================
--- kmail/kmsender.cpp	(Revision 571371)
+++ kmail/kmsender.cpp	(Revision 571372)
@@ -173,7 +173,7 @@
   }
 
   //Ensure the message is correctly and fully parsed
-  
+
   /* The above was added by Marc and seems to be necessary to ensure
    * the mail is in a sane state before sending. The unGet makes the
    * attached unencrypted version of the mail (if there is one ) disappear.
@@ -331,10 +331,10 @@
         imapSentFolder =
           kmkernel->imapFolderMgr()->findIdString( mCurrentMsg->fcc() );
     }
-    // No, or no usable sentFolder, and no, or no usable imapSentFolder, 
+    // No, or no usable sentFolder, and no, or no usable imapSentFolder,
     // let's try the on in the identity
     if ( ( sentFolder == 0 || sentFolder->isReadOnly() )
-      && ( imapSentFolder == 0 || imapSentFolder->isReadOnly() ) 
+      && ( imapSentFolder == 0 || imapSentFolder->isReadOnly() )
       && !id.fcc().isEmpty() )
     {
       sentFolder = kmkernel->folderMgr()->findIdString( id.fcc() );
@@ -600,7 +600,7 @@
   QStringList to, cc, bcc;
   QString sender;
   extractSenderToCCAndBcc( mCurrentMsg, &sender, &to, &cc, &bcc );
-  
+
   // MDNs are required to have an empty envelope from as per RFC2298.
   if ( messageIsDispositionNotificationReport( mCurrentMsg ) && GlobalSettings::self()->sendMDNsWithEmptySender() )
     sender = "<>";
@@ -1052,13 +1052,15 @@
   QString query = "headers=0&from=";
   query += KURL::encode_string( sender );
 
-  if ( !to.empty() )
-    query += "&to=" + to.join( "&to=" );
-  if ( !cc.empty() )
-    query += "&cc=" + cc.join( "&cc=" );
-  if ( !bcc.empty() )
-    query += "&bcc=" + bcc.join( "&bcc=" );
+  QStringList::ConstIterator it;
 
+  for ( it = to.begin(); it != to.end(); ++it )
+    query += "&to=" + KURL::encode_string(*it);
+  for ( it = cc.begin(); it != cc.end(); ++it )
+    query += "&cc=" + KURL::encode_string(*it);
+  for ( it = bcc.begin(); it != bcc.end(); ++it )
+    query += "&bcc=" + KURL::encode_string(*it);
+
   KMTransportInfo * ti = mSender->transportInfo();
 
   if ( ti->specifyHostname )

kdepim-3.5.4-kde#132008.patch:
 kmmessage.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE kdepim-3.5.4-kde#132008.patch ---
Index: kmail/kmmessage.cpp
===================================================================
--- kmail/kmmessage.cpp	(Revision 570893)
+++ kmail/kmmessage.cpp	(Revision 570894)
@@ -706,6 +706,8 @@
                                            const QTextCodec*& codec,
                                            bool& isHTML ) const
 {
+  if ( !root ) return;
+
   isHTML = false;
   // initialy parse the complete message to decrypt any encrypted parts
   {
@@ -3819,7 +3821,7 @@
 //-----------------------------------------------------------------------------
 QCString KMMessage::charset() const
 {
-  if ( mMsg->Headers().HasContentType() ) {  
+  if ( mMsg->Headers().HasContentType() ) {
     DwMediaType &mType=mMsg->Headers().ContentType();
     mType.Parse();
     DwParameter *param=mType.FirstParameter();
Index: kmail/kmmessage.cpp
===================================================================
--- kmail/kmmessage.cpp	(Revision 571072)
+++ kmail/kmmessage.cpp	(Revision 571073)
@@ -738,6 +738,7 @@
   const QTextCodec * codec = 0;
 
   partNode * root = partNode::fromMessage( this );
+  if ( !root ) return QString::null;
   parseTextStringFromDwPart( root, parsedString, codec, isHTML );
   delete root;
 


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- kdepim.spec	27 Jun 2006 15:16:58 -0000	1.90
+++ kdepim.spec	11 Aug 2006 18:43:22 -0000	1.91
@@ -3,15 +3,12 @@
 
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
-%define qt_version 1:3.3.5
-%define arts_version 8:1.5.3
-%define arts 1
+%define qt_version 1:3.3.6
+%define arts_version 8:1.5.4
 %define make_cvs 1
 
-%define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.3
-Release: 0.3.fc5
+Version: 3.5.4
+Release: 0.1.fc5
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -31,13 +28,12 @@
 Patch4: kdepim-3.4.92-libz.patch
 
 # upstream patches
-Patch100: kdepim-3.5.3-korganizer.patch
-Patch101: kdepim-3.5.3-kmail-typo.patch
-Patch102: kdepim-3.5.3-kmail-encryption.patch
-Patch103: kdepim-3.5.3-kmail-127538.patch
+Patch100: kdepim-3.5.4-kde#132008.patch
+Patch101: kdepim-3.5.4-kde#117882.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 BuildRequires: perl
 BuildRequires: bison
@@ -52,9 +48,7 @@
 BuildRequires: libXpm-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: python-devel
-%if %{arts}
 BuildRequires: arts-devel >= %{arts_version}
-%endif
 %ifnarch s390 s390x
 BuildRequires: pilot-link-devel >= 0.11
 BuildRequires: bluez-libs-devel
@@ -89,10 +83,8 @@
 %patch4 -p1 -b .libz
 
 # upstream patches
-%patch100 -p1 -b .korganizer-kogroupware
-%patch101 -p1 -b .kmail-typo
-%patch102 -p1 -b .kmail-encryption
-%patch103 -p1 -b .kmail-127538.patch
+%patch100 -p0 -b .kde#132008
+%patch101 -p0 -b .kde#117882
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -107,12 +99,7 @@
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -122,7 +109,8 @@
 %endif
    --includedir=%{_includedir}/kde \
    --with-sasl \
-   --with-gpg=%{_bindir}/gpg
+   --with-gpg=%{_bindir}/gpg \
+   --with-gpgsm=%{_bindir}/gpgsm \
 
 make %{?_smp_mflags}
 
@@ -149,16 +137,16 @@
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -191,7 +179,10 @@
 %{_includedir}/kde/*
 
 %changelog
-* Tue Jun 27 2006 Than Ngo <than at redhat.com> 3.5.3-0.3.fc5
+* Fri Aug 11 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.1.fc5
+- 3.5.4
+
+* Tue Jun 27 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.3.fc5
 - fix #196741, BR: libXpm-devel libXScrnSaver-devel
 
 * Mon Jun 19 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	9 Jun 2006 14:43:45 -0000	1.35
+++ sources	11 Aug 2006 18:43:23 -0000	1.36
@@ -1 +1 @@
-2b83885854a5953bca59508d9a7cf5ef  kdepim-3.5.3.tar.bz2
+4a01ceaeb6067d03003edb77b104f559  kdepim-3.5.4.tar.bz2


--- kdepim-3.5.3-kmail-127538.patch DELETED ---


--- kdepim-3.5.3-kmail-encryption.patch DELETED ---


--- kdepim-3.5.3-kmail-typo.patch DELETED ---


--- kdepim-3.5.3-korganizer.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 11 18:44:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 14:44:14 -0400
Subject: rpms/squirrelmail/devel squirrelmail.spec,1.44,1.45
Message-ID: <200608111844.k7BIiEKj030740@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30727

Modified Files:
	squirrelmail.spec 
Log Message:
disttag



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- squirrelmail.spec	11 Aug 2006 18:43:18 -0000	1.44
+++ squirrelmail.spec	11 Aug 2006 18:44:11 -0000	1.45
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.8
-Release: 1.fc6
+Release: 1%{?dist}
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet



From fedora-cvs-commits at redhat.com  Fri Aug 11 18:48:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 14:48:34 -0400
Subject: rpms/kdebase/FC-5 kdebase.spec,1.178,1.179
Message-ID: <200608111848.k7BImYrM009721@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Log Message:
fix BR



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- kdebase.spec	11 Aug 2006 16:56:32 -0000	1.178
+++ kdebase.spec	11 Aug 2006 18:48:31 -0000	1.179
@@ -16,7 +16,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 0.1.fc5
+Release: 0.2.fc5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -60,7 +60,7 @@
 Requires(postun): desktop-file-utils
 Requires(post): fileutils sh-utils
 Requires(postun): fileutils sh-utils
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}-0.3.fc5
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
 Requires: /etc/X11/xdm/Xservers
@@ -522,6 +522,9 @@
 
 
 %changelog
+* Fri Aug 11 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.2.fc5
+- fix BR
+
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.1.fc5
 - 3.5.4
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:02:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:02:05 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2519,1.2519.4.1
Message-ID: <200608111902.k7BJ25Z4018675@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Log Message:
Beta1 fixes



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519
retrieving revision 1.2519.4.1
diff -u -r1.2519 -r1.2519.4.1
--- kernel-2.6.spec	3 Aug 2006 17:51:29 -0000	1.2519
+++ kernel-2.6.spec	11 Aug 2006 19:01:59 -0000	1.2519.4.1
@@ -33,7 +33,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_hv_cset 10730
+%define xen_hv_cset 10924
 %define make_target bzImage
 %define kernel_image x86
 %define xen_flags debug=y verbose=y crash_debug=y
@@ -275,6 +275,7 @@
 
 Patch200: linux-2.6-x86-tune-generic.patch
 Patch201: linux-2.6-x86-vga-vidfail.patch
+Patch202: linux-2.6-x86-64-edac-support.patch
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
@@ -322,7 +323,7 @@
 Patch954: linux-2.6-xen-execshield.patch
 Patch955: linux-2.6-xen-tux.patch
 Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
-
+Patch957: linux-2.6-xen-unbreak-oprofile.patch
 
 Patch990: linux-2.6-xen-compile-fixes.patch
 
@@ -447,8 +448,6 @@
 Patch10001: linux-2.6-random-patches.patch
 
 # Xen hypervisor patches
-Patch20000: xen-build-with-O2.patch
-Patch20001: xen-ia64-hv.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -703,8 +702,6 @@
 
 cd xen
 # Any necessary hypervisor patches go here
-%patch20000 -p1
-%patch20001 -p1
 
 cd ..
 
@@ -734,6 +731,8 @@
 # for the installer cd that wants to automatically fall back to textmode
 # in that case
 %patch201 -p1
+# EDAC support for K8
+%patch202 -p1
 # Suppress APIC errors on UP x86-64.
 %patch203 -p1
 # Support TIF_RESTORE_SIGMASK on x86_64
@@ -814,6 +813,7 @@
 %patch954 -p1
 %patch955 -p1
 %patch956 -p1
+%patch957 -p1
 
 #%patch990 -p1
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:06:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:06:01 -0400
Subject: rpms/ypbind/devel ypbind.spec,1.27,1.28
Message-ID: <200608111906.k7BJ61Bb019539@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19453

Modified Files:
	ypbind.spec 
Log Message:
corrected Release number



Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ypbind.spec	25 Jul 2006 15:01:05 -0000	1.27
+++ ypbind.spec	11 Aug 2006 19:05:56 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.19
-Release: 0.3
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -80,6 +80,9 @@
 %doc README NEWS
 
 %changelog
+* Fri Aug 11 2006 Steve Dickson <steved at redhat.com> - 3:1.19-2
+- rebuild
+
 * Tue Jul 25 2006 Steve Dickson <steved at redhat.com> - 3:1.19-0.3
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:11:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:11:11 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.237,
	1.237.8.1 config-ia64-generic, 1.39,
	1.39.6.1 config-s390-generic, 1.20,
	1.20.6.1 config-x86-generic, 1.63,
	1.63.12.1 config-x86_64-generic, 1.50, 1.50.12.1
Message-ID: <200608111911.k7BJBBsb020789@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-generic config-ia64-generic config-s390-generic 
	config-x86-generic config-x86_64-generic 
Log Message:
Beta1 fixes




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237
retrieving revision 1.237.8.1
diff -u -r1.237 -r1.237.8.1
--- config-generic	26 Jul 2006 03:00:34 -0000	1.237
+++ config-generic	11 Aug 2006 19:11:07 -0000	1.237.8.1
@@ -2432,7 +2432,6 @@
 CONFIG_CONFIGFS_FS=m
 
 CONFIG_DLM=m
-CONFIG_DLM_DEVICE=m
 CONFIG_DLM_DEBUG=y
 CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_NOLOCK=m


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.39
retrieving revision 1.39.6.1
diff -u -r1.39 -r1.39.6.1
--- config-ia64-generic	27 Jul 2006 00:18:27 -0000	1.39
+++ config-ia64-generic	11 Aug 2006 19:11:08 -0000	1.39.6.1
@@ -176,5 +176,4 @@
 CONFIG_HW_RANDOM_INTEL=m
 
 # FIXME
-# CONFIG_UTRACE is not set
-
+# CONFIG_PTRACE is not set


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.20
retrieving revision 1.20.6.1
diff -u -r1.20 -r1.20.6.1
--- config-s390-generic	26 Jul 2006 22:32:29 -0000	1.20
+++ config-s390-generic	11 Aug 2006 19:11:08 -0000	1.20.6.1
@@ -63,7 +63,7 @@
 CONFIG_SCLP_CONSOLE=y
 CONFIG_SCLP_VT220_TTY=y
 CONFIG_SCLP_VT220_CONSOLE=y
-CONFIG_SCLP_CPI=y
+CONFIG_SCLP_CPI=m
 CONFIG_S390_TAPE=m
 CONFIG_S390_TAPE_3590=m
 


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.63
retrieving revision 1.63.12.1
diff -u -r1.63 -r1.63.12.1
--- config-x86-generic	15 Jul 2006 06:49:38 -0000	1.63
+++ config-x86-generic	11 Aug 2006 19:11:08 -0000	1.63.12.1
@@ -143,7 +143,7 @@
 CONFIG_ACPI_IBM=m
 CONFIG_PNPACPI=y
 CONFIG_ACPI_DOCK=m
-CONFIG_ACPI_IBM_DOCK=y
+# CONFIG_ACPI_IBM_DOCK is not set
 CONFIG_ACPI_SBS=m
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
 # CONFIG_ACPI_HOTKEY is not set
@@ -284,6 +284,7 @@
 CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
+CONFIG_EDAC_K8=m
 
 CONFIG_SCHED_MC=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.50
retrieving revision 1.50.12.1
diff -u -r1.50 -r1.50.12.1
--- config-x86_64-generic	15 Jul 2006 06:49:38 -0000	1.50
+++ config-x86_64-generic	11 Aug 2006 19:11:08 -0000	1.50.12.1
@@ -76,7 +76,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
-CONFIG_ACPI_IBM_DOCK=y
+# CONFIG_ACPI_IBM_DOCK is not set
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_SBS=m
@@ -92,7 +92,7 @@
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
-# CONFIG_HOTPLUG_PCI_SHPC is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
 CONFIG_HPET=y
@@ -154,6 +154,7 @@
 CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
+CONFIG_EDAC_K8=m
 
 CONFIG_REORDER=y
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:11:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:11:10 -0400
Subject: rpms/kernel/devel linux-2.6-x86-64-edac-support.patch, NONE,
	1.2.2.1 linux-2.6-xen-unbreak-oprofile.patch, NONE,
	1.1.2.1 Config.mk, 1.3,
	1.3.8.1 linux-2.6-cell-mambo-drivers.patch, 1.4,
	1.4.16.1 linux-2.6-compile-fixes.patch, 1.97,
	1.97.6.1 linux-2.6-gfs2-dlm.patch, 1.12,
	1.12.4.1 linux-2.6-gfs2-locking-exports.patch, 1.1,
	1.1.10.1 linux-2.6-lockdep-fixes.patch, 1.16,
	1.16.4.1 linux-2.6-modsign-ksign.patch, 1.2,
	1.2.96.1 linux-2.6-utrace.patch, 1.12,
	1.12.4.1 linux-2.6-xen.patch, 1.49, 1.49.4.1 sources, 1.468,
	1.468.4.1 xen-build-with-O2.patch, 1.1,
	NONE xen-fix_huge_timeouts.patch, 1.1, NONE xen-ia64-hv.patch,
	1.1, NONE
Message-ID: <200608111911.k7BJBA2W020782@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	Config.mk linux-2.6-cell-mambo-drivers.patch 
	linux-2.6-compile-fixes.patch linux-2.6-gfs2-dlm.patch 
	linux-2.6-gfs2-locking-exports.patch 
	linux-2.6-lockdep-fixes.patch linux-2.6-modsign-ksign.patch 
	linux-2.6-utrace.patch linux-2.6-xen.patch sources 
Added Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	linux-2.6-x86-64-edac-support.patch 
	linux-2.6-xen-unbreak-oprofile.patch 
Removed Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	xen-build-with-O2.patch xen-fix_huge_timeouts.patch 
	xen-ia64-hv.patch 
Log Message:
Beta1 fixes



linux-2.6-x86-64-edac-support.patch:
 MAINTAINERS            |    6 
 drivers/edac/Kconfig   |    7 
 drivers/edac/Makefile  |    1 
 drivers/edac/edac_mc.c |   28 
 drivers/edac/edac_mc.h |    1 
 drivers/edac/k8_edac.c | 1881 +++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 1924 insertions(+)

--- NEW FILE linux-2.6-x86-64-edac-support.patch ---
Index: linux-2.6.17.noarch/drivers/edac/edac_mc.c
===================================================================
--- linux-2.6.17.noarch.orig/drivers/edac/edac_mc.c	2006-07-31 09:00:32.000000000 -0300
+++ linux-2.6.17.noarch/drivers/edac/edac_mc.c	2006-07-31 09:05:27.000000000 -0300
@@ -1392,6 +1392,34 @@
 }
 
 /**
+ * edac_mc_find: Search for a mem_ctl_info structure whose index is 'idx'.
+ *
+ * If found, return a pointer to the structure.
+ * Else return NULL.
+ *
+ * Caller must hold mem_ctls_mutex.
+ */
+struct mem_ctl_info * edac_mc_find(int idx)
+{
+	struct list_head *item;
+	struct mem_ctl_info *mci;
+
+	list_for_each(item, &mc_devices) {
+		mci = list_entry(item, struct mem_ctl_info, link);
+
+		if (mci->mc_idx >= idx) {
+			if (mci->mc_idx == idx)
+				return mci;
+
+			break;
+		}
+	}
+
+	return NULL;
+}
+EXPORT_SYMBOL(edac_mc_find);
+
+/**
  * edac_mc_add_mc: Insert the 'mci' structure into the mci global list and
  *                 create sysfs entries associated with mci structure
  * @mci: pointer to the mci structure to be added to the list
Index: linux-2.6.17.noarch/drivers/edac/edac_mc.h
===================================================================
--- linux-2.6.17.noarch.orig/drivers/edac/edac_mc.h	2006-07-31 09:00:32.000000000 -0300
+++ linux-2.6.17.noarch/drivers/edac/edac_mc.h	2006-07-31 09:05:27.000000000 -0300
@@ -412,6 +412,7 @@
 void edac_mc_dump_csrow(struct csrow_info *csrow);
 #endif  /* CONFIG_EDAC_DEBUG */
 
+extern struct mem_ctl_info * edac_mc_find(int idx);
 extern int edac_mc_add_mc(struct mem_ctl_info *mci,int mc_idx);
 extern struct mem_ctl_info * edac_mc_del_mc(struct device *dev);
 extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
Index: linux-2.6.17.noarch/drivers/edac/k8_edac.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.17.noarch/drivers/edac/k8_edac.c	2006-07-31 09:08:17.000000000 -0300
@@ -0,0 +1,1881 @@
+/*
+ * AMD K8 class Memory Controller kernel module
+ *
+ * This file may be distributed under the terms of the
+ * GNU General Public License.
+ *
+ * Written by Thayne Harbaugh Linux Networx (http://lnxi.com)
+ *
+ *      Changes by Douglas "norsk" Thompson  <norsk5 at xmission.com>:
+ *          - K8 CPU Revision D and greater support
+ *
+ *      Changes by Dave Peterson <dsp at llnl.gov> <dave_peterson at pobox.com>:
+ *          - Module largely rewritten, with new (and hopefully correct)
+ *            code for dealing with node and chip select interleaving, various
+ *            code cleanup, and bug fixes
+ *          - Added support for memory hoisting using DRAM hole address
+ *            register
+ *
+ * This module is based on the following document (available from
+ * http://www.amd.com/):
+ *
+ *     Title: BIOS and Kernel Developer's Guide for AMD Athlon 64 and AMD
+ *            Opteron Processors
+ *     AMD publication #: 26094
+ *     Revision: 3.26
+ *
+ * Unless otherwise stated, section numbers mentioned in the comments below
+ * refer to this document.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/slab.h>
+#include <asm/mmzone.h>
+#include "edac_mc.h"
+
+#define k8_printk(level, fmt, arg...) \
+	edac_printk(level, "k8", fmt, ##arg)
+
+#define k8_mc_printk(mci, level, fmt, arg...) \
+	edac_mc_chipset_printk(mci, level, "k8", fmt, ##arg)
+
+/* Throughout the comments in this code, the terms SysAddr, DramAddr, and
+ * InputAddr are used.  These terms come directly from the k8 documentation
+ * (AMD publication #26094).  They are defined as follows:
+ *
+ *     SysAddr:
+ *         This is a physical address generated by a CPU core or a device
+ *         doing DMA.  If generated by a CPU core, a SysAddr is the result of
+ *         a virtual to physical address translation by the CPU core's address
+ *         translation mechanism (MMU).
+ *
+ *     DramAddr:
+ *         A DramAddr is derived from a SysAddr by subtracting an offset that
+ *         depends on which node the SysAddr maps to and whether the SysAddr
+ *         is within a range affected by memory hoisting.  The DRAM Base
+ *         (section 3.4.4.1) and DRAM Limit (section 3.4.4.2) registers
+ *         determine which node a SysAddr maps to.
+ *
+ *         If the DRAM Hole Address Register (DHAR) is enabled and the SysAddr
+ *         is within the range of addresses specified by this register, then
+ *         a value x from the DHAR is subtracted from the SysAddr to produce a
+ *         DramAddr.  Here, x represents the base address for the node that
+ *         the SysAddr maps to plus an offset due to memory hoisting.  See
+ *         section 3.4.8 and the comments in get_dram_hole_info() and
+ *         sys_addr_to_dram_addr() below for more information.
+ *
+ *         If the SysAddr is not affected by the DHAR then a value y is
+ *         subtracted from the SysAddr to produce a DramAddr.  Here, y is the
+ *         base address for the node that the SysAddr maps to.  See section
+ *         3.4.4 and the comments in sys_addr_to_dram_addr() below for more
+ *         information.
+ *
+ *     InputAddr:
+ *         A DramAddr is translated to an InputAddr before being passed to the
+ *         memory controller for the node that the DramAddr is associated
+ *         with.  The memory controller then maps the InputAddr to a csrow.
+ *         If node interleaving is not in use, then the InputAddr has the same
+ *         value as the DramAddr.  Otherwise, the InputAddr is produced by
+ *         discarding the bits used for node interleaving from the DramAddr.
+ *         See section 3.4.4 for more information.
+ *
+ *         The memory controller for a given node uses its DRAM CS Base and
+ *         DRAM CS Mask registers to map an InputAddr to a csrow.  See
+ *         sections 3.5.4 and 3.5.5 for more information.
+ */
+
+/*
+ * Alter this version for the K8 module when modifications are made
+ */
+#define EDAC_K8_VERSION    " Ver: 2.0.0 " __DATE__
+#define EDAC_MOD_STR	"k8_edac"
+
+#ifndef PCI_DEVICE_ID_AMD_OPT_0_HT
+#define PCI_DEVICE_ID_AMD_OPT_0_HT	0x1100
+#endif				/* PCI_DEVICE_ID_AMD_OPT_0_HT */
+
+#ifndef PCI_DEVICE_ID_AMD_OPT_1_ADDRMAP
+#define PCI_DEVICE_ID_AMD_OPT_1_ADDRMAP	0x1101
+#endif				/* PCI_DEVICE_ID_AMD_OPT_1_ADDRMAP */
+
+#ifndef PCI_DEVICE_ID_AMD_OPT_2_MEMCTL
+#define PCI_DEVICE_ID_AMD_OPT_2_MEMCTL	0x1102
+#endif				/* PCI_DEVICE_ID_AMD_OPT_2_MEMCTL */
+
+#ifndef PCI_DEVICE_ID_AMD_OPT_3_MISCCTL
+#define PCI_DEVICE_ID_AMD_OPT_3_MISCCTL	0x1103
+#endif				/* PCI_DEVICE_ID_AMD_OPT_3_MISCCTL */
+
+/* Extended Model from CPUID, for CPU Revision numbers */
+#define OPTERON_CPU_LE_REV_C    0
+#define OPTERON_CPU_REV_D       1
+#define OPTERON_CPU_REV_E       2
+
+#define K8_NR_CSROWS 8
+#define MAX_K8_NODES 8
+
+/* K8 register addresses - device 0 function 1 - Address Map */
+#define K8_DBR		0x40	/* DRAM Base Register (8 x 32b
+				 * interlaced with K8_DLR)
+				 *
+				 * 31:16 DRAM Base addr 39:24
+				 * 15:11 reserved
+				 * 10:8  interleave enable
+				 *  7:2  reserved
+				 *  1    write enable
+				 *  0    read enable
+				 */
+
+#define K8_DLR		0x44	/* DRAM Limit Register (8 x 32b
+				 * interlaced with K8_DBR)
+				 *
+				 * 31:16 DRAM Limit addr 32:24
+				 * 15:11 reserved
+				 * 10:8  interleave select
+				 *  7:3  reserved
+				 *  2:0  destination node ID
+				 */
+
+#define K8_DHAR         0xf0    /* DRAM Hole Address Register
+				 *
+				 * 31:24 DramHoleBase
+				 * 23:16 reserved
+				 * 15:8  DramHoleOffset
+				 *  7:1  reserved
+				 *    0  DramHoleValid
+				 */
+
+/* K8 register addresses - device 0 function 2 - DRAM controller */
+#define K8_DCSB		0x40	/* DRAM Chip-Select Base (8 x 32b)
+				 *
+				 * 31:21 Base addr high 35:25
+				 * 20:16 reserved
+				 * 15:9  Base addr low 19:13 (interlvd)
+				 *  8:1  reserved
+				 *  0    chip-select bank enable
+				 */
+
+#define K8_DCSM		0x60	/* DRAM Chip-Select Mask (8 x 32b)
+				 *
+				 * 31:30 reserved
+				 * 29:21 addr mask high 33:25
+				 * 20:16 reserved
+				 * 15:9  addr mask low  19:13
+				 *  8:0  reserved
+				 */
+
+/* selects bits 29-21 and 15-9 from DCSM */
+#define DCSM_MASK_BITS 0x3fe0fe00
+
+#define K8_DBAM		0x80	/* DRAM Base Addr Mapping (32b) */
+
+#define K8_DCL		0x90	/* DRAM configuration low reg (32b)
+				 *
+				 * 31:28 reserved
+				 * 27:25 Bypass Max: 000b=respect
+				 * 24    Dissable receivers - no sockets
+				 * 23:20 x4 DIMMS
+				 * 19    32byte chunks
+				 * 18    Unbuffered
+				 * 17    ECC enabled
+				 * 16    128/64 bit (dual/single chan)
+				 * 15:14 R/W Queue bypass count
+				 * 13    Self refresh
+				 * 12    exit self refresh
+				 * 11    mem clear status
+				 * 10    DRAM enable
+				 *  9    reserved
+				 *  8    DRAM init
+				 *  7:4  reserved
+				 *  3    dis DQS hysteresis
+				 *  2    QFC enabled
+				 *  1    DRAM drive strength
+				 *  0    Digital Locked Loop disable
+				 */
+
+/* K8 register addresses - device 0 function 3 - Misc Control */
+#define K8_NBCTL	0x40	/* MCA NB Control (32b)
+				 *
+				 *  1    MCA UE Reporting
+				 *  0    MCA CE Reporting
+				 */
+
+#define K8_NBCFG	0x44	/* MCA NB Config (32b)
+				 *
+				 * 23    Chip-kill x4 ECC enable
+				 * 22    ECC enable
+				 *  1    CPU ECC enable
+				 */
+
+#define K8_NBSL		0x48	/* MCA NB Status Low (32b)
+				 *
+				 * 31:24 Syndrome 15:8 chip-kill x4
+				 * 23:20 reserved
+				 * 19:16 Extended err code
+				 * 15:0  Err code
+				 */
+
+#define K8_NBSH		0x4C	/* MCA NB Status High (32b)
+				 *
+				 * 31    Err valid
+				 * 30    Err overflow
+				 * 29    Uncorrected err
+				 * 28    Err enable
+				 * 27    Misc err reg valid
+				 * 26    Err addr valid
+				 * 25    proc context corrupt
+				 * 24:23 reserved
+				 * 22:15 Syndrome 7:0
+				 * 14    CE
+				 * 13    UE
+				 * 12:9  reserved
+				 *  8    err found by scrubber
+				 *  7    reserved
+				 *  6:4  Hyper-transport link number
+				 *  3:2  reserved
+				 *  1    Err CPU 1
+				 *  0    Err CPU 0
+				 */
+
+#define K8_NBSH_VALID_BIT BIT(31)
+
+#define K8_NBEAL	0x50	/* MCA NB err addr low (32b)
+				 *
+				 * 31:3  Err addr low 31:3
+				 *  2:0  reserved
+				 */
+
+#define K8_NBEAH	0x54	/* MCA NB err addr high (32b)
+				 *
+				 * 31:8  reserved
+				 *  7:0  Err addr high 39:32
+				 */
+
+#define K8_NBCAP	0xE8	/* MCA NB capabilities (32b)
+				 *
+				 * 31:9  reserved
+				 *  4    S4ECD4ED capable
+				 *  3    SECDED capable
+				 */
+
+				/* MSR's */
+
+				/*
+				 * K8_MSR_MCxCTL (64b)
+				 * (0x400,404,408,40C,410)
+				 * 63    Enable reporting source 63
+				 *  .
+				 *  .
+				 *  .
+				 *  2    Enable error source 2
+				 *  1    Enable error source 1
+				 *  0    Enable error source 0
+				 */
+
+				/*
+				 * K8_MSR_MCxSTAT (64b)
+				 * (0x401,405,409,40D,411)
+				 * 63    Error valid
+				 * 62    Status overflow
+				 * 61    UE
+				 * 60    Enabled error condition
+				 * 59    Misc register valid (not used)
+				 * 58    Err addr register valid
+				 * 57    Processor context corrupt
+				 * 56:32 Other information
+				 * 31:16 Model specific error code
+				 * 15:0  MCA err code
+				 */
+
+				/*
+				 * K8_MSR_MCxADDR (64b)
+				 * (0x402,406,40A,40E,412)
+				 * 63:48 reserved
+				 * 47:0  Address
+				 */
+
+				/*
+				 * K8_MSR_MCxMISC (64b)
+				 * (0x403,407,40B,40F,413)
+				 * Unused on Athlon64 and K8
+				 */
+
+#define K8_MSR_MCGCTL	0x017b	/* Machine Chk Global report ctl (64b)
+				 *
+				 * 31:5  reserved
+				 *  4    North Bridge
+				 *  3    Load/Store
+				 *  2    Bus Unit
+				 *  1    Instruction Cache
+				 *  0    Data Cache
+				 */
+
+#define K8_MSR_MC4CTL	0x0410	/* North Bridge Check report ctl (64b) */
+#define K8_MSR_MC4STAT	0x0411	/* North Bridge status (64b) */
+#define K8_MSR_MC4ADDR	0x0412	/* North Bridge Address (64b) */
+
+static inline int MCI_TO_NODE_ID(struct mem_ctl_info *mci)
+{
+	return PCI_SLOT(to_pci_dev(mci->dev)->devfn) - 0x18;
+}
+
+/* Ugly hack that allows module to compile when built as part of a 32-bit
+ * kernel.  Just in case anyone wants to run a 32-bit kernel on their Opteron.
+ */
+#ifndef MAXNODE
+#define MAXNODE 8
+#endif
+
+/* Each entry holds the CPU revision of all CPU cores for the given node. */
+static int k8_node_revision_table[MAXNODE] = { 0 };
+
+static inline int node_rev(int node_id)
+{
+	return k8_node_revision_table[node_id];
+}
+
+static void store_node_revision(void *param)
+{
+	int node_id, revision;
+
+	/* Multiple CPU cores on the same node will all write their revision
+	 * number to the same array entry.  This is ok.  For a given node, all
+	 * CPU cores are on the same piece of silicon and share the same
+	 * revision number.
+	 */
+	node_id = (cpuid_ebx(1) >> 24) & 0x07;
+	revision = (cpuid_eax(1) >> 16) & 0x0f;
+	k8_node_revision_table[node_id] = revision;
+}
+
+/* Initialize k8_node_revision_table. */
+static void build_node_revision_table(void)
+{
+	static int initialized = 0;
+
+	if (initialized)
+		return;
+
+	on_each_cpu(store_node_revision, NULL, 1, 1);
+	initialized = 1;
+}
+
+enum k8_chips {
+	OPTERON = 0,
+};
+
+struct k8_pvt {
+	struct pci_dev *addr_map;
+	struct pci_dev *misc_ctl;
+
+	int node_id;  /* ID of this node */
+
+	/* The values of these registers will remain constant so we might as
+	 * well cache them here.
+	 */
+	u32 dcl;
+	u32 dbr[MAX_K8_NODES];
+	u32 dlr[MAX_K8_NODES];
+	u32 nbcap;
+	u32 dcsb[K8_NR_CSROWS];
+	u32 dcsm[K8_NR_CSROWS];
+	u32 dhar;
+	u32 dbam;
+};
+
+struct k8_error_info_regs {
+	u32 nbsh;
+	u32 nbsl;
+	u32 nbeah;
+	u32 nbeal;
+};
+
+struct k8_error_info {
+	struct k8_error_info_regs error_info;
+	u32 nbcfg;
+	int race_condition_detected;
+};
+
+struct k8_dev_info {
+	const char *ctl_name;
+	u16 addr_map;
+	u16 misc_ctl;
+};
+
+static const struct k8_dev_info k8_devs[] = {
+	[OPTERON] = {
+		     .ctl_name = "Athlon64/Opteron",
+		     .addr_map = PCI_DEVICE_ID_AMD_OPT_1_ADDRMAP,
+		     .misc_ctl = PCI_DEVICE_ID_AMD_OPT_3_MISCCTL},
+};
+
+static struct pci_dev * pci_get_related_function(unsigned int vendor,
+		unsigned int device, struct pci_dev *related)
+{
+	struct pci_dev *dev;
+
+	dev = NULL;
+
+	while ((dev = pci_get_device(vendor, device, dev)) != NULL) {
+		if ((dev->bus->number == related->bus->number) &&
+		    (PCI_SLOT(dev->devfn) == PCI_SLOT(related->devfn)))
+			break;
+	}
+
+	return dev;
+}
+
+/* FIXME - stolen from msr.c - the calls in msr.c could be exported */
+struct msr_command {
+	int cpu;
+	int err;
+	u32 reg;
+	u32 data[2];
+};
+
+static void smp_wrmsr(void *cmd_block)
+{
+	struct msr_command *cmd = cmd_block;
+	wrmsr(cmd->reg, cmd->data[0], cmd->data[1]);
+}
+
+static void smp_rdmsr(void *cmd_block)
+{
+	struct msr_command *cmd = cmd_block;
+	rdmsr(cmd->reg, cmd->data[0], cmd->data[1]);
+}
+
+static void do_wrmsr(int cpu, u32 reg, u32 eax, u32 edx)
+{
+	struct msr_command cmd;
+
+	cmd.cpu = raw_smp_processor_id();
+	cmd.reg = reg;
+	cmd.data[0] = eax;
+	cmd.data[1] = edx;
+	on_each_cpu(smp_wrmsr, &cmd, 1, 1);
+}
+
+static void do_rdmsr(int cpu, u32 reg, u32 *eax, u32 *edx)
+{
+	struct msr_command cmd;
+
+	cmd.cpu = raw_smp_processor_id();
+	cmd.reg = reg;
+	on_each_cpu(smp_rdmsr, &cmd, 1, 1);
+	*eax = cmd.data[0];
+	*edx = cmd.data[1];
+}
+
+/*
+ * FIXME - This is a large chunk of memory to suck up just to decode the
+ * syndrome.  It would be nice to discover a pattern in the syndromes that
+ * could be used to quickly identify the channel.  The big problems with
+ * this table is memory usage, lookup speed (could sort and binary search),
+ * correctness (there could be a transcription error).  A zero in any nibble
+ * for a syndrom is always channel 0, but that only decodes some of the
+ * syndromes.  Can anyone find any other patterns?
+ *
+ * The comment in the left column is the nibble that is in error.  The least
+ * significant nibble of the syndrome is the mask for the bits that are
+ * in error (need to be toggled) for the particular nibble.
+ */
+#define SYNDROME_TABLE_SIZE 270
+static const unsigned long syndromes_chan0[SYNDROME_TABLE_SIZE] = {
+	/*0 */ 0xe821, 0x7c32, 0x9413, 0xbb44, 0x5365, 0xc776, 0x2f57,
+	0xdd88, 0x35a9, 0xa1ba, 0x499b, 0x66cc, 0x8eed, 0x1afe, 0xf2df,
+	/*1 */ 0x5d31, 0xa612, 0xfb23, 0x9584, 0xc8b5, 0x3396, 0x6ea7,
+	0xeac8, 0xb7f9, 0x4cda, 0x11eb, 0x7f4c, 0x227d, 0xd95e, 0x846f,
+	/*2 */ 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+	0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+	/*3 */ 0x2021, 0x3032, 0x1013, 0x4044, 0x6065, 0x7076, 0x5057,
+	0x8088, 0xa0a9, 0xb0ba, 0x909b, 0xc0cc, 0xe0ed, 0xf0fe, 0xd0df,
+	/*4 */ 0x5041, 0xa082, 0xf0c3, 0x9054, 0xc015, 0x30d6, 0x6097,
+	0xe0a8, 0xb0e9, 0x402a, 0x106b, 0x70fc, 0x20bd, 0xd07e, 0x803f,
+	/*5 */ 0xbe21, 0xd732, 0x6913, 0x2144, 0x9f65, 0xf676, 0x4857,
+	0x3288, 0x8ca9, 0xe5ba, 0x5b9b, 0x13cc, 0xaded, 0xc4fe, 0x7adf,
+	/*6 */ 0x4951, 0x8ea2, 0xc7f3, 0x5394, 0x1ac5, 0xdd36, 0x9467,
+	0xa1e8, 0xe8b9, 0x2f4a, 0x661b, 0xf27c, 0xbb2d, 0x7cde, 0x358f,
+	/*7 */ 0x74e1, 0x9872, 0xec93, 0xd6b4, 0xa255, 0x4ec6, 0x3a27,
+	0x6bd8, 0x1f39, 0xf3aa, 0x874b, 0xbd6c, 0xc98d, 0x251e, 0x51ff,
+	/*8 */ 0x15c1, 0x2a42, 0x3f83, 0xcef4, 0xdb35, 0xe4b6, 0xf177,
+	0x4758, 0x5299, 0x6d1a, 0x78db, 0x89ac, 0x9c6d, 0xa3ee, 0xb62f,
+	/*9 */ 0x3d01, 0x1602, 0x2b03, 0x8504, 0xb805, 0x9306, 0xae07,
+	0xca08, 0xf709, 0xdc0a, 0xe10b, 0x4f0c, 0x720d, 0x590e, 0x640f,
+	/*a */ 0x9801, 0xec02, 0x7403, 0x6b04, 0xf305, 0x8706, 0x1f07,
+	0xbd08, 0x2509, 0x510a, 0xc90b, 0xd60c, 0x4e0d, 0x3a0e, 0xa20f,
+	/*b */ 0xd131, 0x6212, 0xb323, 0x3884, 0xe9b5, 0x5a96, 0x8ba7,
+	0x1cc8, 0xcdf9, 0x7eda, 0xafeb, 0x244c, 0xf57d, 0x465e, 0x976f,
+	/*c */ 0xe1d1, 0x7262, 0x93b3, 0xb834, 0x59e5, 0xca56, 0x2b87,
+	0xdc18, 0x3dc9, 0xae7a, 0x4fab, 0x542c, 0x85fd, 0x164e, 0xf79f,
+	/*d */ 0x6051, 0xb0a2, 0xd0f3, 0x1094, 0x70c5, 0xa036, 0xc067,
+	0x20e8, 0x40b9, 0x904a, 0x601b, 0x307c, 0x502d, 0x80de, 0xe08f,
+	/*e */ 0xa4c1, 0xf842, 0x5c83, 0xe6f4, 0x4235, 0x1eb6, 0xba77,
+	0x7b58, 0xdf99, 0x831a, 0x27db, 0x9dac, 0x396d, 0x65ee, 0xc12f,
+	/*f */ 0x11c1, 0x2242, 0x3383, 0xc8f4, 0xd935, 0xeab6, 0xfb77,
+	0x4c58, 0x5d99, 0x6e1a, 0x7fdb, 0x84ac, 0x9562, 0xa6ee, 0xb72f,
+
+	/*20 */ 0xbe01, 0xd702, 0x6903, 0x2104, 0x9f05, 0xf606, 0x4807,
+	0x3208, 0x8c09, 0xe50a, 0x5b0b, 0x130c, 0xad0d, 0xc40e, 0x7a0f,
+	/*21 */ 0x4101, 0x8202, 0xc303, 0x5804, 0x1905, 0xda06, 0x9b07,
+	0xac08, 0xed09, 0x2e0a, 0x6f0b, 0x640c, 0xb50d, 0x760e, 0x370f
+};
+
+static const unsigned long syndromes_chan1[SYNDROME_TABLE_SIZE] = {
+	/*10 */ 0x45d1, 0x8a62, 0xcfb3, 0x5e34, 0x1be5, 0xd456, 0x9187,
+	0xa718, 0xe2c9, 0x2d7a, 0x68ab, 0xf92c, 0xbcfd, 0x734e, 0x369f,
+	/*11 */ 0x63e1, 0xb172, 0xd293, 0x14b4, 0x7755, 0xa5c6, 0xc627,
+	0x28d8, 0x4b39, 0x99aa, 0xfa4b, 0x3c6c, 0x5f8d, 0x8d1e, 0xeeff,
+	/*12 */ 0xb741, 0xd982, 0x6ec3, 0x2254, 0x9515, 0xfbd6, 0x4c97,
+	0x33a8, 0x84e9, 0xea2a, 0x5d6b, 0x11fc, 0xa6bd, 0xc87e, 0x7f3f,
+	/*13 */ 0xdd41, 0x6682, 0xbbc3, 0x3554, 0xe815, 0x53d6, 0xce97,
+	0x1aa8, 0xc7e9, 0x7c2a, 0xa1fb, 0x2ffc, 0xf2bd, 0x497e, 0x943f,
+	/*14 */ 0x2bd1, 0x3d62, 0x16b3, 0x4f34, 0x64e5, 0x7256, 0x5987,
+	0x8518, 0xaec9, 0xb87a, 0x93ab, 0xca2c, 0xe1fd, 0xf74e, 0xdc9f,
+	/*15 */ 0x83c1, 0xc142, 0x4283, 0xa4f4, 0x2735, 0x65b6, 0xe677,
+	0xf858, 0x7b99, 0x391a, 0xbadb, 0x5cac, 0xdf6d, 0x9dee, 0x1e2f,
+	/*16 */ 0x8fd1, 0xc562, 0x4ab3, 0xa934, 0x26e5, 0x6c56, 0xe387,
+	0xfe18, 0x71c9, 0x3b7a, 0xb4ab, 0x572c, 0xd8fd, 0x924e, 0x1d9f,
+	/*17 */ 0x4791, 0x89e2, 0xce73, 0x5264, 0x15f5, 0xdb86, 0x9c17,
+	0xa3b8, 0xe429, 0x2a5a, 0x6dcb, 0xf1dc, 0xb64d, 0x783e, 0x3faf,
+	/*18 */ 0x5781, 0xa9c2, 0xfe43, 0x92a4, 0xc525, 0x3b66, 0x6ce7,
+	0xe3f8, 0xb479, 0x4a3a, 0x1dbb, 0x715c, 0x26dd, 0xd89e, 0x8f1f,
+	/*19 */ 0xbf41, 0xd582, 0x6ac3, 0x2954, 0x9615, 0xfcd6, 0x4397,
+	0x3ea8, 0x81e9, 0xeb2a, 0x546b, 0x17fc, 0xa8bd, 0xc27e, 0x7d3f,
+	/*1a */ 0x9891, 0xe1e2, 0x7273, 0x6464, 0xf7f5, 0x8586, 0x1617,
+	0xb8b8, 0x2b29, 0x595a, 0xcacb, 0xdcdc, 0x4f4d, 0x3d3e, 0xaeaf,
+	/*1b */ 0xcce1, 0x4472, 0x8893, 0xfdb4, 0x3f55, 0xb9c6, 0x7527,
+	0x56d8, 0x9a39, 0x12aa, 0xde4b, 0xab6c, 0x678d, 0xef1e, 0x23ff,
+	/*1c */ 0xa761, 0xf9b2, 0x5ed3, 0xe214, 0x4575, 0x1ba6, 0xbcc7,
+	0x7328, 0xd449, 0x8a9a, 0x2dfb, 0x913c, 0x365d, 0x688e, 0xcfef,
+	/*1d */ 0xff61, 0x55b2, 0xaad3, 0x7914, 0x8675, 0x2ca6, 0xd3c7,
+	0x9e28, 0x6149, 0xcb9a, 0x34fb, 0xe73c, 0x185d, 0xb28e, 0x4def,
+	/*1e */ 0x5451, 0xa8a2, 0xfcf3, 0x9694, 0xc2c5, 0x3e36, 0x6a67,
+	0xebe8, 0xbfb9, 0x434a, 0x171b, 0x7d7c, 0x292d, 0xd5de, 0x818f,
+	/*1f */ 0x6fc1, 0xb542, 0xda83, 0x19f4, 0x7635, 0xacb6, 0xc377,
+	0x2e58, 0x4199, 0x9b1a, 0xf4db, 0x37ac, 0x586d, 0x82ee, 0xed2f,
+
+	/*22 */ 0xc441, 0x4882, 0x8cc3, 0xf654, 0x3215, 0xbed6, 0x7a97,
+	0x5ba8, 0x9fe9, 0x132a, 0xd76b, 0xadfc, 0x69bd, 0xe57e, 0x213f,
+	/*23 */ 0x7621, 0x9b32, 0xed13, 0xda44, 0xac65, 0x4176, 0x3757,
+	0x6f88, 0x19a9, 0xf4ba, 0x829b, 0xb5cc, 0xc3ed, 0x2efe, 0x58df
+};
+
+static int chan_from_chipkill_syndrome(unsigned long syndrome)
+{
+	int i;
+
+	debugf0("%s()\n", __func__);
+
+	for (i = 0; i < SYNDROME_TABLE_SIZE; i++) {
+		if (syndromes_chan0[i] == syndrome)
+			return 0;
+		if (syndromes_chan1[i] == syndrome)
+			return 1;
+	}
+
+	debugf0("%s(): syndrome(%lx) not found\n", __func__, syndrome);
+	return -1;
+}
+
+static const char *tt_msgs[] = {	/* transaction type */
+	"inst",
+	"data",
+	"generic",
+	"reserved"
+};
+
+static const char *ll_msgs[] = {	/* cache level */
+	"0",
+	"1",
+	"2",
+	"generic"
+};
+
+static const char *memtt_msgs[] = {
+	"generic",
+	"generic read",
+	"generic write",
+	"data read",
+	"data write",
+	"inst fetch",
+	"prefetch",
+	"evict",
+	"snoop",
+	"unknown error 9",
+	"unknown error 10",
+	"unknown error 11",
+	"unknown error 12",
+	"unknown error 13",
+	"unknown error 14",
+	"unknown error 15"
+};
+
+static const char *pp_msgs[] = {	/* participating processor */
+	"local node origin",
+	"local node response",
+	"local node observed",
+	"generic"
+};
+
+static const char *to_msgs[] = {
+	"no timeout",
+	"timed out"
+};
+
+static const char *ii_msgs[] = {	/* memory or i/o */
+	"mem access",
+	"reserved",
+	"i/o access",
+	"generic"
+};
+
+static const char *ext_msgs[] = {	/* extended error */
+	"ECC error",
+	"CRC error",
+	"sync error",
+	"mst abort",
+	"tgt abort",
+	"GART error",
+	"RMW error",
+	"watchdog error",
+	"ECC chipkill x4 error",
+	"unknown error 9",
+	"unknown error 10",
+	"unknown error 11",
+	"unknown error 12",
+	"unknown error 13",
+	"unknown error 14",
+	"unknown error 15"
+};
+
+static const char *htlink_msgs[] = {
+	"none",
+	"1",
+	"2",
+	"1 2",
+	"3",
+	"1 3",
+	"2 3",
+	"1 2 3"
+};
+
+static inline u64 base_from_dcsb(u32 dcsb)
+{
+	/* 0xffe0fe00 selects bits 31-21 and 15-9 of a DRAM CS Base Address
+	 * Register (section 3.5.4).  Shifting the bits left 4 puts them in
+	 * their proper bit positions of 35-25 and 19-13.
+	 */
+	return ((u64) (dcsb & 0xffe0fe00)) << 4;
+}
+
+static u64 mask_from_dcsm(u32 dcsm)
+{
+	u64 dcsm_bits, other_bits;
+
+	/* Extract bits bits 29-21 and 15-9 from DCSM (section 3.5.5). */
+	dcsm_bits = dcsm & DCSM_MASK_BITS;
+
+	/* Set all bits except bits 33-25 and 19-13. */
+	other_bits = DCSM_MASK_BITS;
+	other_bits = ~(other_bits << 4);
+
+	/* The extracted bits from DCSM belong in the spaces represented by
+	 * the cleared bits in other_bits.
+	 */
+	return (dcsm_bits << 4) | other_bits;
+}
+
+/* In *base and *limit, pass back the full 40-bit base and limit physical
+ * addresses for the node given by node_id.  This information is obtained from
+ * DRAM Base (section 3.4.4.1) and DRAM Limit (section 3.4.4.2) registers. The
+ * base and limit addresses are of type SysAddr, as defined at the start of
+ * section 3.4.4 (p. 70).  They are the lowest and highest physical addresses
+ * in the address range they represent.
+ */
+static void get_base_and_limit(struct k8_pvt *pvt, int node_id,
+		u64 *base, u64 *limit)
+{
+	*base = ((u64) (pvt->dbr[node_id] & 0xffff0000)) << 8;
+
+	/* Since the limit represents the highest address in the range, we
+	 * must set its lowest 24 bits to 1.
+	 */
+	*limit = (((u64) (pvt->dlr[node_id] & 0xffff0000)) << 8) | 0xffffff;
+}
+
+/* Return 1 if the SysAddr given by sys_addr matches the base/limit associated
+ * with node_id
+ */
+static int base_limit_match(struct k8_pvt *pvt, u64 sys_addr, int node_id)
+{
+	u64 base, limit, addr;
+
+	get_base_and_limit(pvt, node_id, &base, &limit);
+
+	/* The k8 treats this as a 40-bit value.  However, bits 63-40 will be
+	 * all ones if the most significant implemented address bit is 1.
+	 * Here we discard bits 63-40.  See section 3.4.2 of AMD publication
+	 * 24592: AMD x86-64 Architecture Programmer's Manual Volume 1
+	 * Application Programming.
+	 */
+	addr = sys_addr & 0x000000ffffffffffull;
+
+	return (addr >= base) && (addr <= limit);
+}
+
+/* Attempt to map a SysAddr to a node.  On success, return a pointer to the
+ * mem_ctl_info structure for the node that the SysAddr maps to.  On failure,
+ * return NULL.
+ */
+static struct mem_ctl_info * find_mc_by_sys_addr(struct mem_ctl_info *mci,
+						u64 sys_addr)
+{
+	struct k8_pvt *pvt;
+	int node_id;
+	u32 intlv_en, bits;
+
+	/* Here we use the DRAM Base (section 3.4.4.1) and DRAM Limit (section
+	 * 3.4.4.2) registers to map the SysAddr to a node ID.
+	 */
+
+	pvt = mci->pvt_info;
+
+	/* The value of this field should be the same for all DRAM Base
+	 * registers.  Therefore we arbitrarily choose to read it from the
+	 * register for node 0.
+	 */
+	intlv_en = pvt->dbr[0] & (0x07 << 8);
+
+	if (intlv_en == 0) {  /* node interleaving is disabled */
+		debugf2("%s(): node interleaving disabled\n", __func__);
+		for (node_id = 0; ; ) {
+			if (base_limit_match(pvt, sys_addr, node_id))
+				break;
+
+			if (++node_id == MAX_K8_NODES) {
+				debugf2("%s(): sys_addr 0x%lx "
+					"does not match any node\n", __func__,
+					(unsigned long) sys_addr);
+				return NULL;
+			}
+		}
+
+		goto found;
+	}
+
+	if (unlikely((intlv_en != (0x01 << 8)) &&
+		     (intlv_en != (0x03 << 8)) &&
+		     (intlv_en != (0x07 << 8)))) {
+		k8_printk(KERN_WARNING,
+			  "%s(): junk value of 0x%x extracted from IntlvEn "
+			  "field of DRAM Base Register for node 0: This "
+			  "probably indicates a BIOS bug.\n", __func__,
+			  intlv_en);
+		return NULL;
+	}
+
+	/* If we get this far, node interleaving is enabled. */
+	debugf2("%s(): node interleaving enabled\n", __func__);
+	bits = (((u32) sys_addr) >> 12) & intlv_en;
+
+	for (node_id = 0; ; ) {
+		if ((pvt->dlr[node_id] & intlv_en) == bits)
+			break;  /* intlv_sel field matches */
+
+		if (++node_id == MAX_K8_NODES) {
+			debugf2("%s(): sys_addr 0x%lx does not match any "
+				"node\n", __func__, (unsigned long) sys_addr);
+			return NULL;
+		}
+	}
+
+	/* sanity test for sys_addr */
+	if (unlikely(!base_limit_match(pvt, sys_addr, node_id))) {
+		k8_printk(KERN_WARNING,
+			  "%s(): sys_addr 0x%lx falls outside base/limit "
+			  "address range for node %d with node interleaving "
+			  "enabled.\n", __func__, (unsigned long) sys_addr,
+			  node_id);
+		return NULL;
+	}
+
+found:
+	debugf2("%s(): sys_addr 0x%lx matches node %d\n", __func__,
+		(unsigned long) sys_addr, node_id);
+	return edac_mc_find(node_id);
+}
+
+/* Return the base value defined by the DRAM Base register for the node
+ * represented by mci.  This function returns the full 40-bit value despite
+ * the fact that the register only stores bits 39-24 of the value.  See
+ * section 3.4.4.1.
+ */
+static inline u64 get_dram_base(struct mem_ctl_info *mci)
+{
+	struct k8_pvt *pvt;
+
+	pvt = mci->pvt_info;
+	return ((u64) (pvt->dbr[pvt->node_id] & 0xffff0000)) << 8;
+}
+
+/* Obtain info from the DRAM Hole Address Register (section 3.4.8) for the
+ * node represented by mci.  Info is passed back in *hole_base, *hole_offset,
+ * and *hole_size.  Function returns 0 if info is valid or 1 if info is
+ * invalid.  Info may be invalid for either of the following reasons:
+ *
+ *     - The revision of the node is not E or greater.  In this case, the DRAM
+ *       Hole Address Register does not exist.
+ *     - The DramHoleValid bit is cleared in the DRAM Hole Address Register,
+ *       indicating that its contents are not valid.
+ *
+ * The values passed back in *hole_base, *hole_offset, and *hole_size are
+ * complete 32-bit values despite the fact that the bitfields in the DHAR
+ * only represent bits 31-24 of the base and offset values.
+ */
+static int get_dram_hole_info(struct mem_ctl_info *mci, u64 *hole_base,
+		u64 *hole_offset, u64 *hole_size)
+{
+	struct k8_pvt *pvt;
+	u64 base;
+
+	pvt = mci->pvt_info;
+
+	if (node_rev(pvt->node_id) < OPTERON_CPU_REV_E) {
+		debugf2("revision %d for node %d does not support DHAR\n",
+			node_rev(pvt->node_id), pvt->node_id);
+		return 1;
+	}
+
+	if ((pvt->dhar & 0x01) == 0) {
+		debugf2("DramHoleValid bit cleared in DHAR for node %d\n",
+			pvt->node_id);
+		return 1;  /* DramHoleValid bit is cleared */
+	}
+
+	/* +------------------+--------------------+--------------------+-----
+	 * | memory           | DRAM hole          | relocated          |
+	 * | [0, (x - 1)]     | [x, 0xffffffff]    | addresses from     |
+	 * |                  |                    | DRAM hole          |
+	 * |                  |                    | [0x100000000,      |
+	 * |                  |                    |  (0x100000000+     |
+	 * |                  |                    |   (0xffffffff-x))] |
+	 * +------------------+--------------------+--------------------+-----
+	 *
+	 * Above is a diagram of physical memory showing the DRAM hole and the
+	 * relocated addresses from the DRAM hole.  As shown, the DRAM hole
+	 * starts at address x (the base address) and extends through address
+	 * 0xffffffff.  The DRAM Hole Address Register (DHAR) relocates the
+	 * addresses in the hole so that they start at 0x100000000.
+	 */
+
+	base = pvt->dhar & 0xff000000;
+	*hole_base = base;
+	*hole_offset = (pvt->dhar & 0x0000ff00) << 16;
+	*hole_size = (0x1ull << 32) - base;
+	debugf2("DHAR info for node %d: base 0x%lx offset 0x%lx size 0x%lx\n",
+		pvt->node_id, (unsigned long) *hole_base,
+		(unsigned long) *hole_offset, (unsigned long) *hole_size);
+	return 0;
+}
+
+/* Return the DramAddr that the SysAddr given by sys_addr maps to.  It is
+ * assumed that sys_addr maps to the node given by mci.
+ */
+static u64 sys_addr_to_dram_addr(struct mem_ctl_info *mci, u64 sys_addr)
+{
+	u64 dram_base, hole_base, hole_offset, hole_size, dram_addr;
+
+	/* The first part of section 3.4.4 (p. 70) shows how the DRAM Base
+	 * (section 3.4.4.1) and DRAM Limit (section 3.4.4.2) registers are
+	 * used to translate a SysAddr to a DramAddr.  If the DRAM Hole
+	 * Address Register (DHAR) is enabled, then it is also involved in
+	 * translating a SysAddr to a DramAddr.  Sections 3.4.8 and 3.5.8.2
+	 * describe the DHAR and how it is used for memory hoisting.  These
+	 * parts of the documentation are unclear.  I interpret them as
+	 * follows:
+	 *
+	 *     When node n receives a SysAddr, it processes the SysAddr as
+	 *     follows:
+	 *
+	 *         1.  It extracts the DRAMBase and DRAMLimit values from the
+	 *             DRAM Base and DRAM Limit registers for node n.  If the
+	 *             SysAddr is not within the range specified by the base
+	 *             and limit values, then node n ignores the Sysaddr
+	 *             (since it does not map to node n).  Otherwise continue
+	 *             to step 2 below.
+	 *
+	 *         2.  If the DramHoleValid bit of the DHAR for node n is
+	 *             clear, the DHAR is disabled so skip to step 3 below.
+	 *             Otherwise see if the SysAddr is within the range of
+	 *             relocated addresses (starting at 0x100000000) from the
+	 *             DRAM hole.  If not, skip to step 3 below.  Else get the
+	 *             value of the DramHoleOffset field from the DHAR.  To
+	 *             obtain the DramAddr, subtract the offset defined by
+	 *             this value from the SysAddr.
+	 *
+	 *         3.  Obtain the base address for node n from the DRAMBase
+	 *             field of the DRAM Base register for node n.  To obtain
+	 *             the DramAddr, subtract the base address from the
+	 *             SysAddr, as shown near the start of section 3.4.4
+	 *             (p. 70).
+	 */
+
+	dram_base = get_dram_base(mci);
+
+	if (!get_dram_hole_info(mci, &hole_base, &hole_offset, &hole_size)) {
+		if ((sys_addr >= (1ull << 32)) &&
+		    (sys_addr < ((1ull << 32) + hole_size))) {
+			/* use DHAR to translate SysAddr to DramAddr */
+			dram_addr = sys_addr - hole_offset;
+			debugf2("using DHAR to translate SysAddr 0x%lx to "
+				"DramAddr 0x%lx\n",
+				(unsigned long) sys_addr,
+				(unsigned long) dram_addr);
+			return dram_addr;
+		}
+	}
+
+	/* Translate the SysAddr to a DramAddr as shown near the start of
+	 * section 3.4.4 (p. 70).  Although sys_addr is a 64-bit value, the k8
+	 * only deals with 40-bit values.  Therefore we discard bits 63-40 of
+	 * sys_addr below.  If bit 39 of sys_addr is 1 then the bits we
+	 * discard are all 1s.  Otherwise the bits we discard are all 0s.  See
+	 * section 3.4.2 of AMD publication 24592: AMD x86-64 Architecture
+	 * Programmer's Manual Volume 1 Application Programming.
+	 */
+	dram_addr = (sys_addr & 0xffffffffffull) - dram_base;
+
+	debugf2("using DRAM Base register to translate SysAddr 0x%lx to "
+		"DramAddr 0x%lx\n", (unsigned long) sys_addr,
+		(unsigned long) dram_addr);
+	return dram_addr;
+}
+
+/* Parameter intlv_en is the value of the IntlvEn field from a DRAM Base
+ * register (section 3.4.4.1).  Return the number of bits from a SysAddr that
+ * are used for node interleaving.
+ */
+static int num_node_interleave_bits(unsigned intlv_en)
+{
+	static const int intlv_shift_table[] = { 0, 1, 0, 2, 0, 0, 0, 3 };
+	int n;
+
+	BUG_ON(intlv_en > 7);
+	n = intlv_shift_table[intlv_en];
+	debugf2("using %d bits for node interleave\n", n);
+	return n;
+}
+
+/* Translate the DramAddr given by dram_addr to an InputAddr and return the
+ * result.
+ */
+static u64 dram_addr_to_input_addr(struct mem_ctl_info *mci, u64 dram_addr)
+{
+	struct k8_pvt *pvt;
+	int intlv_shift;
+	u64 input_addr;
+
+	pvt = mci->pvt_info;
+
+	/* Near the start of section 3.4.4 (p. 70), the k8 documentation gives
+	 * instructions for translating a DramAddr to an InputAddr.  Here we
+	 * are following these instructions.
+	 */
+	intlv_shift = num_node_interleave_bits((pvt->dbr[0] >> 8) & 0x07);
+	input_addr = ((dram_addr >> intlv_shift) & 0xffffff000ull) +
+	    (dram_addr & 0xfff);
+
+	debugf2("DramAddr 0x%lx translates to InputAddr 0x%lx\n",
+		(unsigned long) dram_addr, (unsigned long) input_addr);
+	return input_addr;
+}
+
+/* Translate the SysAddr represented by sys_addr to an InputAddr and return
+ * the result.  It is assumed that sys_addr maps to the node given by mci.
+ */
+static u64 sys_addr_to_input_addr(struct mem_ctl_info *mci, u64 sys_addr)
+{
+	u64 input_addr;
+
+	input_addr = dram_addr_to_input_addr(
+				mci, sys_addr_to_dram_addr(mci, sys_addr));
+	debugf2("%s(): SysAdddr 0x%lx translates to InputAddr 0x%lx\n",
+		__func__, (unsigned long) sys_addr,
+		(unsigned long) input_addr);
+	return input_addr;
+}
+
+/* input_addr is an InputAddr associated with the node given by mci.  Return
+ * the csrow that input_addr maps to, or -1 on failure (no csrow claims
+ * input_addr).
+ */
+static int input_addr_to_csrow(struct mem_ctl_info *mci, u64 input_addr)
+{
+	struct k8_pvt *pvt;
+	int i;
+	u32 dcsb, dcsm;
+	u64 base, mask;
+
+	pvt = mci->pvt_info;
+
+	/* Here we use the DRAM CS Base (section 3.5.4) and DRAM CS Mask
+	 * (section 3.5.5) registers.  For each CS base/mask register pair,
+	 * test the condition shown near the start of section 3.5.4 (p. 84).
+	 */
+
+	for (i = 0; i < K8_NR_CSROWS; i++) {
+		dcsb = pvt->dcsb[i];
+		dcsm = pvt->dcsm[i];
+
+		if ((dcsb & 0x01) == 0) {
+			debugf2("input_addr_to_csrow: CSBE bit is cleared "
+				"for csrow %d (node %d)\n", i,
+				pvt->node_id);
+			continue;  /* CSBE bit is cleared */
+		}
+
+		base = base_from_dcsb(dcsb);
+		mask = ~mask_from_dcsm(dcsm);
+
+		if ((input_addr & mask) == (base & mask)) {
+			debugf2("InputAddr 0x%lx matches csrow %d "
+				"(node %d)\n", (unsigned long) input_addr, i,
+				pvt->node_id);
+			return i;  /* success: csrow i matches */
+		}
+	}
+
+	debugf2("no matching csrow for InputAddr 0x%lx (node %d)\n",
+		(unsigned long) input_addr, pvt->node_id);
+	return -1;  /* failed to find matching csrow */
+}
+
+/* input_addr is an InputAddr associated with the node represented by mci.
+ * Translate input_addr to a DramAddr and return the result.
+ */
+static u64 input_addr_to_dram_addr(struct mem_ctl_info *mci, u64 input_addr)
+{
+	struct k8_pvt *pvt;
+	int node_id, intlv_shift;
+	u64 bits, dram_addr;
+	u32 intlv_sel;
+
+	/* Near the start of section 3.4.4 (p. 70), the k8 documentation shows
+	 * how to translate a DramAddr to an InputAddr.  Here we reverse this
+	 * procedure.  When translating from a DramAddr to an InputAddr, the
+	 * bits used for node interleaving are discarded.  Here we recover
+	 * these bits from the IntlvSel field of the DRAM Limit register
+	 * (section 3.4.4.2) for the node that input_addr is associated with.
+	 */
+
+	pvt = mci->pvt_info;
+	node_id = pvt->node_id;
+	BUG_ON((node_id < 0) || (node_id > 7));
+	intlv_shift = num_node_interleave_bits((pvt->dbr[0] >> 8) & 0x07);
+
+	if (intlv_shift == 0) {
+		debugf1("node interleaving disabled: InputAddr 0x%lx "
+			"translates to DramAddr of same value\n",
+			(unsigned long) input_addr);
+		return input_addr;
+	}
+
+	bits = ((input_addr & 0xffffff000ull) << intlv_shift) +
+	       (input_addr & 0xfff);
+	intlv_sel = pvt->dlr[node_id] & (((1 << intlv_shift) - 1) << 8);
+	dram_addr = bits + (intlv_sel << 4);
+	debugf1("InputAddr 0x%lx translates to DramAddr 0x%lx "
+		"(%d node interleave bits)\n", (unsigned long) input_addr,
+		(unsigned long) dram_addr, intlv_shift);
+	return dram_addr;
+}
+
+/* dram_addr is a DramAddr that maps to the node represented by mci.  Convert
+ * dram_addr to a SysAddr and return the result.
+ */
+static u64 dram_addr_to_sys_addr(struct mem_ctl_info *mci, u64 dram_addr)
+{
+	struct k8_pvt *pvt;
+	u64 hole_base, hole_offset, hole_size, base, limit, sys_addr;
+
+	pvt = mci->pvt_info;
+
+	if (!get_dram_hole_info(mci, &hole_base, &hole_offset, &hole_size)) {
+		if ((dram_addr >= hole_base) &&
+		    (dram_addr < (hole_base + hole_size))) {
+			/* use DHAR to translate DramAddr to SysAddr */
+			sys_addr = dram_addr + hole_offset;
+			debugf1("using DHAR to translate DramAddr 0x%lx to "
+				"SysAddr 0x%lx\n", (unsigned long) dram_addr,
+				(unsigned long) sys_addr);
+			return sys_addr;
+		}
+	}
+
+	get_base_and_limit(pvt, pvt->node_id, &base, &limit);
+	sys_addr = dram_addr + base;
+
+	/* The sys_addr we have computed up to this point is a 40-bit value
+	 * because the k8 deals with 40-bit values.  However, the value we are
+	 * supposed to return is a full 64-bit physical address.  The AMD
+	 * x86-64 architecture specifies that the most significant implemented
+	 * address bit through bit 63 of a physical address must be either all
+	 * 0s or all 1s.  Therefore we sign-extend the 40-bit sys_addr to a
+	 * 64-bit value below.  See section 3.4.2 of AMD publication 24592:
+	 * AMD x86-64 Architecture Programmer's Manual Volume 1 Application
+	 * Programming.
+	 */
+	sys_addr |= ~((sys_addr & (1ull << 39)) - 1);
+
+	debugf1("Using DRAM Base register for node %d to translate "
+		"DramAddr 0x%lx to SysAddr 0x%lx\n", pvt->node_id,
+		(unsigned long) dram_addr, (unsigned long) sys_addr);
+	return sys_addr;
+}
+
+/* input_addr is an InputAddr associated with the node given by mci.
+ * Translate input_addr to a SysAddr and return the result.
+ */
+static inline u64 input_addr_to_sys_addr(struct mem_ctl_info *mci,
+		u64 input_addr)
+{
+	return dram_addr_to_sys_addr(
+			mci, input_addr_to_dram_addr(mci, input_addr));
+}
+
+/* Find the minimum and maximum InputAddr values that map to the given csrow.
+ * Pass back these values in *input_addr_min and *input_addr_max.
+ */
+static void find_csrow_limits(struct mem_ctl_info *mci, int csrow,
+		u64 *input_addr_min, u64 *input_addr_max)
+{
+	struct k8_pvt *pvt;
+	u64 base, mask;
+
+	pvt = mci->pvt_info;
+	BUG_ON((csrow < 0) || (csrow >= K8_NR_CSROWS));
+	base = base_from_dcsb(pvt->dcsb[csrow]);
+	mask = mask_from_dcsm(pvt->dcsm[csrow]);
+	*input_addr_min = base & ~mask;
+
+	/* To find the max InputAddr for the csrow, start with the base
+	 * address and set all bits that are "don't care" bits in the test at
+	 * the start of section 3.5.4 (p. 84).  The "don't care" bits are all
+	 * set bits in the mask and all bits in the gaps between bit ranges
+	 * [35-25] and [19-13].  The value 0x1f01fff represents bits [24-20]
+	 * and [12-0], which are all bits in the above-mentioned gaps.
+	 */
+	*input_addr_max = base | mask | 0x1f01fff;
+}
+
+/* Extract error address from MCA NB Address Low (section 3.6.4.5) and
+ * MCA NB Address High (section 3.6.4.6) register values and return the
+ * result.
+ */
+static inline u64 error_address_from_k8_error_info(
+		struct k8_error_info *info)
+{
+	return (((u64) (info->error_info.nbeah & 0xff)) << 32) +
+	       (info->error_info.nbeal & ~0x03);
+}
+
+static inline void error_address_to_page_and_offset(u64 error_address,
+		u32 *page, u32 *offset)
+{
+	*page = (u32) (error_address >> PAGE_SHIFT);
+	*offset = ((u32) error_address) & ~PAGE_MASK;
+}
+
+/* Return 1 if registers contain valid error information.  Else return 0. */
+static inline int k8_error_info_valid(struct k8_error_info_regs *regs)
+{
+	return ((regs->nbsh & K8_NBSH_VALID_BIT) != 0);
+}
+
+/* return 0 if regs contains valid error info; else return 1 */
+static int k8_get_error_info_regs(struct mem_ctl_info *mci,
+		struct k8_error_info_regs *regs)
+{
+	struct k8_pvt *pvt;
+
+	pvt = mci->pvt_info;
+	pci_read_config_dword(pvt->misc_ctl, K8_NBSH, &regs->nbsh);
+
+	if (!k8_error_info_valid(regs))
+		return 1;
+
+	pci_read_config_dword(pvt->misc_ctl, K8_NBSL, &regs->nbsl);
+	pci_read_config_dword(pvt->misc_ctl, K8_NBEAH, &regs->nbeah);
+	pci_read_config_dword(pvt->misc_ctl, K8_NBEAL, &regs->nbeal);
+	return 0;
+}
+
+static void k8_get_error_info(struct mem_ctl_info *mci,
+		struct k8_error_info *info)
+{
+	struct k8_pvt *pvt;
+	struct k8_error_info_regs regs;
+
+	pvt = mci->pvt_info;
+	info->race_condition_detected = 0;
+
+	if (k8_get_error_info_regs(mci, &info->error_info))
+		return;
+
+	/*
+	 * Here's the problem with the K8's EDAC reporting:
+	 * There are four registers which report pieces of error
+	 * information.  These four registers are shared between
+	 * CEs and UEs.  Furthermore, contrary to what is stated in
+	 * the OBKG, the overflow bit is never used!  Every error
+	 * always updates the reporting registers.
+	 *
+	 * Can you see the race condition?  All four error reporting
+	 * registers must be read before a new error updates them!
+	 * There is no way to read all four registers atomically.  The
+	 * best than can be done is to detect that a race has occured
+	 * and then report the error without any kind of precision.
+	 *
+	 * What is still positive is that errors are
+	 * still reported and thus problems can still be detected -
+	 * just not localized because the syndrome and address are
+	 * spread out across registers.
+	 *
+	 * Grrrrr!!!!!  Here's hoping that AMD fixes this in some
+	 * future K8 rev. UEs and CEs should have separate
+	 * register sets with proper overflow bits that are used!
+	 * At very least the problem can be fixed by honoring the
+	 * ErrValid bit in nbsh and not updating registers - just
+	 * set the overflow bit - unless the current error is CE
+	 * and the new error is UE which would be the only situation
+	 * for overwriting the current values.
+	 */
+
+	regs = info->error_info;
+
+	/* Use info from the second read - most current */
+	if (unlikely(k8_get_error_info_regs(mci, &info->error_info)))
+		return;
+
+	/* clear the error */
+	pci_write_bits32(pvt->misc_ctl, K8_NBSH, 0, K8_NBSH_VALID_BIT);
+
+	pci_read_config_dword(pvt->misc_ctl, K8_NBCFG, &info->nbcfg);
+	info->race_condition_detected =
+	    ((regs.nbsh != info->error_info.nbsh) ||
+	     (regs.nbsl != info->error_info.nbsl) ||
+	     (regs.nbeah != info->error_info.nbeah) ||
+	     (regs.nbeal != info->error_info.nbeal));
+}
+
+static inline void decode_gart_tlb_error(struct mem_ctl_info *mci,
+					 struct k8_error_info *info)
+{
+	u32 err_code;
+	u32 ec_tt;		/* error code transaction type (2b) */
+	u32 ec_ll;		/* error code cache level (2b) */
+
+	err_code = info->error_info.nbsl & 0xffffUL;
+	ec_tt = (err_code >> 2) & 0x03UL;
+	ec_ll = (err_code >> 0) & 0x03UL;
+	k8_mc_printk(mci, KERN_ERR,
+		     "GART TLB errorr: transaction type(%s), "
+		     "cache level(%s)\n", tt_msgs[ec_tt], ll_msgs[ec_ll]);
+}
+
+static inline void decode_cache_error(struct mem_ctl_info *mci,
+				      struct k8_error_info *info)
+{
+	u32 err_code;
+	u32 ec_rrrr;		/* error code memory transaction (4b) */
+	u32 ec_tt;		/* error code transaction type (2b) */
+	u32 ec_ll;		/* error code cache level (2b) */
+
+	err_code = info->error_info.nbsl & 0xffffUL;
+	ec_rrrr = (err_code >> 4) & 0x0fUL;
+	ec_tt = (err_code >> 2) & 0x03UL;
+	ec_ll = (err_code >> 0) & 0x03UL;
+	k8_mc_printk(mci, KERN_ERR,
+		     "cache heirarchy error: memory transaction type(%s), "
+		     "transaction type(%s), cache level(%s)\n",
+		     memtt_msgs[ec_rrrr], tt_msgs[ec_tt], ll_msgs[ec_ll]);
+}
+
+/* sys_addr is an error address (a SysAddr) extracted from the MCA NB Address
+ * Low (section 3.6.4.5) and MCA NB Address High (section 3.6.4.6) registers
+ * of a node that detected an ECC memory error.  mci represents the node that
+ * the error address maps to (possibly different from the node that detected
+ * the error).  Return the number of the csrow that sys_addr maps to, or -1 on
+ * error.
+ */
+static int sys_addr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr)
+{
+	int csrow;
+
+	csrow = input_addr_to_csrow(mci,
+				    sys_addr_to_input_addr(mci, sys_addr));
+
+	if (csrow == -1)
+		k8_mc_printk(mci, KERN_ERR,
+			     "Failed to translate InputAddr to csrow for "
+			     "address 0x%lx\n", (unsigned long) sys_addr);
+
+	return csrow;
+}
+
+static void k8_handle_ce(struct mem_ctl_info *mci, struct k8_error_info *info)
+{
+	struct k8_pvt *pvt;
+	unsigned syndrome;
+	u64 error_address;
+	u32 page, offset;
+	int channel, csrow;
+	struct mem_ctl_info *log_mci, *src_mci;
+
+	log_mci = mci;
+	pvt = mci->pvt_info;
+
+	if ((info->error_info.nbsh & BIT(26)) == 0)
+		goto no_info;  /* error address not valid */
+
+	error_address = error_address_from_k8_error_info(info);
+	syndrome = ((info->error_info.nbsh >> 15) & 0xff);
+
+	if (info->nbcfg & BIT(23)) {
+		/* chipkill ecc mode */
+		syndrome += (info->error_info.nbsl >> 16) & 0xff00;
+		channel = chan_from_chipkill_syndrome(syndrome);
+
+		if (channel < 0) {
+			/* If the syndrome couldn't be found then the race
+			 * condition for error reporting registers likely
+			 * occurred.  There's alot more in doubt than just the
+			 * channel.  Might as well just log the error without
+			 * any info.
+			 */
+			k8_mc_printk(mci, KERN_WARNING,
+				     "unknown syndrome 0x%x - possible error "
+				     "reporting race\n", syndrome);
+			goto no_info;
+		}
+	} else
+		/* non-chipkill ecc mode
+		 *
+		 * The k8 documentation is unclear about how to determine the
+		 * channel number when using non-chipkill memory.  This method
+		 * was obtained from email communication with someone at AMD.
+		 */
+		channel = ((error_address & BIT(3)) != 0);
+
+	/* Find out which node the error address belongs to.  This may be
+	 * different from the node that detected the error.
+	 */
+	if ((src_mci = find_mc_by_sys_addr(mci, error_address)) == NULL) {
+		k8_mc_printk(mci, KERN_ERR,
+			     "failed to map error address 0x%lx to a node\n",
+			     (unsigned long) error_address);
+		goto no_info;
+	}
+
+	log_mci = src_mci;
+
+	if ((csrow = sys_addr_to_csrow(log_mci, error_address)) < 0)
+		goto no_info;
+
+	error_address_to_page_and_offset(error_address, &page, &offset);
+	edac_mc_handle_ce(log_mci, page, offset, syndrome, csrow, channel,
+			  EDAC_MOD_STR);
+	return;
+
+no_info:
+	edac_mc_handle_ce_no_info(log_mci,EDAC_MOD_STR);
+}
+
+static void k8_handle_ue(struct mem_ctl_info *mci, struct k8_error_info *info)
+{
+	int csrow;
+	u64 error_address;
+	u32 page, offset;
+	struct mem_ctl_info *log_mci, *src_mci;
+
+	log_mci = mci;
+
+	if ((info->error_info.nbsh & BIT(26)) == 0)
+		goto no_info;  /* error address not valid */
+
+	error_address = error_address_from_k8_error_info(info);
+
+	/* Find out which node the error address belongs to.  This may be
+	 * different from the node that detected the error.
+	 */
+	if ((src_mci = find_mc_by_sys_addr(mci, error_address)) == NULL) {
+		k8_mc_printk(mci, KERN_ERR,
+			     "failed to map error address 0x%lx to a node\n",
+			     (unsigned long) error_address);
+		goto no_info;
+	}
+
+	log_mci = src_mci;
+
+	if ((csrow = sys_addr_to_csrow(log_mci, error_address)) < 0)
+		goto no_info;
+
+	error_address_to_page_and_offset(error_address, &page, &offset);
+	edac_mc_handle_ue(log_mci, page, offset, csrow, EDAC_MOD_STR);
+	return;
+
+no_info:
+	edac_mc_handle_ue_no_info(log_mci, EDAC_MOD_STR);
+}
+
+static void decode_bus_error(struct mem_ctl_info *mci,
+		struct k8_error_info *info)
+{
+	u32 err_code, ext_ec;
+	u32 ec_pp;    /* error code participating processor (2p) */
+	u32 ec_to;    /* error code timed out (1b) */
+	u32 ec_rrrr;  /* error code memory transaction (4b) */
+	u32 ec_ii;    /* error code memory or I/O (2b) */
+	u32 ec_ll;    /* error code cache level (2b) */
+
+	debugf0("MC%d: %s()\n", mci->mc_idx, __func__);
+	err_code = info->error_info.nbsl & 0xffffUL;
+	ec_pp = (err_code >> 9) & 0x03UL;
+	ec_to = (err_code >> 8) & 0x01UL;
+	ec_rrrr = (err_code >> 4) & 0x0fUL;
+	ec_ii = (err_code >> 2) & 0x03UL;
+	ec_ll = (err_code >> 0) & 0x03UL;
+	ext_ec = (info->error_info.nbsl >> 16) & 0xfUL;
+
+	/* FIXME - these should report through EDAC channels */
+	k8_mc_printk(mci, KERN_ERR, "general bus error: participating "
+		     "processor(%s), time-out(%s) memory transaction "
+		     "type(%s), mem or i/o(%s), cache level(%s)\n",
+		     pp_msgs[ec_pp], to_msgs[ec_to], memtt_msgs[ec_rrrr],
+		     ii_msgs[ec_ii], ll_msgs[ec_ll]);
+
+	if (ec_pp & 0x02)
+		return;  /* We aren't the node involved */
+
+	/* FIXME - other errors should have other error handling mechanisms */
+	if (ext_ec && (ext_ec != 0x8)) {
+		k8_mc_printk(mci, KERN_ERR,
+			     "no special error handling for this error\n");
+		return;
+	}
+
+	if (info->error_info.nbsh & BIT(14))
+		k8_handle_ce(mci, info);
+	else if (info->error_info.nbsh & BIT(13))
+		k8_handle_ue(mci, info);
+
+	/* If main error is CE then overflow must be CE.  If main error is UE
+	 * then overflow is unknown.  We'll call the overflow a CE - if
+	 * panic_on_ue is set then we're already panic'ed and won't arrive
+	 * here.  If panic_on_ue is not set then apparently someone doesn't
+	 * think that UE's are catastrophic.
+	 */
+	if (info->error_info.nbsh & BIT(30))
+		edac_mc_handle_ce_no_info(mci,
+		    EDAC_MOD_STR " Error Overflow set");
+}
+
+/* return 1 if error found or 0 if error not found */
+static int k8_process_error_info(struct mem_ctl_info *mci,
+		struct k8_error_info *info, int handle_errors)
+{
+	struct k8_pvt *pvt;
+	struct k8_error_info_regs *regs;
+	u32 err_code, ext_ec;
+	int gart_tlb_error;
+
+	pvt = mci->pvt_info;
+
+	/* check for an error */
+	if (!k8_error_info_valid(&info->error_info))
+		return 0;
+
+	if (!handle_errors)
+		return 1;
+
+	if (info->race_condition_detected)
+		k8_mc_printk(mci, KERN_WARNING, "race condition detected!\n");
+
+	gart_tlb_error = 0;
+	regs = &info->error_info;
+	err_code = info->error_info.nbsl & 0xffffUL;
+	ext_ec = (info->error_info.nbsl >> 16) & 0x0fUL;
+	debugf1("NorthBridge ERROR: mci(0x%p) node(%d) ErrAddr(0x%.8x-%.8x) "
+		"nbsh(0x%.8x) nbsl(0x%.8x)\n", mci, pvt->node_id, regs->nbeah,
+		regs->nbeal, regs->nbsh, regs->nbsl);
+
+	if ((err_code & 0xfff0UL) == 0x0010UL) {
+		debugf1("GART TLB error\n");
+		gart_tlb_error = 1;
+		decode_gart_tlb_error(mci, info);
+	} else if ((err_code & 0xff00UL) == 0x0100UL) {
+		debugf1("Cache error\n");
+		decode_cache_error(mci, info);
+	} else if ((err_code & 0xf800UL) == 0x0800UL) {
+		debugf1("Bus error\n");
+		decode_bus_error(mci, info);
+	} else
+		/* shouldn't reach here! */
+		k8_mc_printk(mci, KERN_WARNING,
+			     "%s(): unknown MCE error 0x%x\n", __func__,
+			     err_code);
+
+	k8_mc_printk(mci, KERN_ERR, "extended error code: %s\n",
+		     ext_msgs[ext_ec]);
+
+	if (((ext_ec >= 1 && ext_ec <= 4) || (ext_ec == 6)) &&
+	    ((info->error_info.nbsh >> 4) & 0x07UL))
+		k8_mc_printk(mci, KERN_ERR,
+		    "Error on hypertransport link: %s\n",
+		    htlink_msgs[(info->error_info.nbsh >> 4) & 0x07UL]);
+
+	/* GART errors are benign as per AMD, do not panic on them */
+	if (!gart_tlb_error && (regs->nbsh & BIT(29))) {
+		k8_mc_printk(mci, KERN_CRIT, "uncorrected error\n");
+		edac_mc_handle_ue_no_info(mci, "UE bit is set\n");
+	}
+
+	if (regs->nbsh & BIT(25))
+		panic("MC%d: processor context corrupt", mci->mc_idx);
+
+	return 1;
+}
+
+static void k8_check(struct mem_ctl_info *mci)
+{
+	struct k8_error_info info;
+
+	debugf3("%s()\n", __func__);
+	k8_get_error_info(mci, &info);
+	k8_process_error_info(mci, &info, 1);
+}
+
+static int k8_get_devs(struct mem_ctl_info *mci, int dev_idx)
+{
+	const struct k8_dev_info *k8_dev = &k8_devs[dev_idx];
+	struct k8_pvt *pvt;
+	struct pci_dev *pdev;
+
+	pdev = to_pci_dev(mci->dev);
+	pvt = mci->pvt_info;
+
+	/* The address mapping device provides a table that indicates which
+	 * physical address ranges are owned by which node.  Each node's
+	 * memory controller has memory controller addresses that begin at
+	 * 0x0.
+	 */
+	pvt->addr_map = pci_get_related_function(PCI_VENDOR_ID_AMD,
+						 k8_dev->addr_map, pdev);
+
+	if (pvt->addr_map == NULL) {
+		k8_printk(KERN_ERR, "error address map device not found: "
+			  "vendor %x device 0x%x (broken BIOS?)\n",
+			  PCI_VENDOR_ID_AMD, k8_dev->addr_map);
+		return 1;
+	}
+
+	debugf1("Addr Map device PCI Bus ID:\t%s\n",
+		pci_name(pvt->addr_map));
+
+	pvt->misc_ctl = pci_get_related_function(PCI_VENDOR_ID_AMD,
+						 k8_dev->misc_ctl, pdev);
+
+	if (pvt->misc_ctl == NULL) {
+		pci_dev_put(pvt->addr_map);
+		pvt->addr_map = NULL;
+		k8_printk(KERN_ERR, "error miscellaneous device not found: "
+			  "vendor %x device 0x%x (broken BIOS?)\n",
+			  PCI_VENDOR_ID_AMD, k8_dev->misc_ctl);
+		return 1;
+	}
+
+	debugf1("Misc device PCI Bus ID:\t\t%s\n",
+		pci_name(pvt->misc_ctl));
+
+	return 0;
+}
+
+static void k8_get_mc_regs(struct mem_ctl_info *mci)
+{
+	struct k8_pvt *pvt;
+	struct pci_dev *pdev;
+	int i;
+
+	pdev = to_pci_dev(mci->dev);
+	pvt = mci->pvt_info;
+	debugf1("k8 regs:\n");
+
+	for (i = 0; i < MAX_K8_NODES; i++) {
+		pci_read_config_dword(pvt->addr_map, K8_DBR + (i * 8),
+				      &pvt->dbr[i]);
+		pci_read_config_dword(pvt->addr_map, K8_DLR + (i * 8),
+				      &pvt->dlr[i]);
+		debugf1("    dbr[%d]: 0x%x\n", i, pvt->dbr[i]);
+		debugf1("    dlr[%d]: 0x%x\n", i, pvt->dlr[i]);
+	}
+
+	pci_read_config_dword(pvt->misc_ctl, K8_NBCAP, &pvt->nbcap);
+	debugf1("    nbcap: %u\n", pvt->nbcap);
+
+	for (i = 0; i < K8_NR_CSROWS; i++) {
+		pci_read_config_dword(pdev, K8_DCSB + (i * 4), &pvt->dcsb[i]);
+		pci_read_config_dword(pdev, K8_DCSM + (i * 4), &pvt->dcsm[i]);
+		debugf1("    dcsb[%d]: 0x%x\n", i, pvt->dcsb[i]);
+		debugf1("    dcsm[%d]: 0x%x\n", i, pvt->dcsm[i]);
+	}
+
+	pci_read_config_dword(pvt->addr_map, K8_DHAR, &pvt->dhar);
+	pci_read_config_dword(pdev, K8_DBAM, &pvt->dbam);
+	debugf1("    dhar: 0x%x\n", pvt->dhar);
+	debugf1("    dbam: 0x%x\n", pvt->dbam);
+}
+
+/* Return 1 if dual channel mode is active.  Else return 0. */
+static inline int dual_channel_active(u32 dcl)
+{
+	return (dcl >> 16) & 0x1;
+}
+
+static u32 csrow_nr_pages(int csrow_nr, struct k8_pvt *pvt)
+{
+	u32 cs;
+
+	/* The math on this doesn't look right on the surface because x/2*4
+	 * can be simplified to x*2 but this expression makes use of the fact
+	 * that it is integral math where 1/2=0
+	 */
+	cs = (pvt->dbam >> ((csrow_nr / 2) * 4)) & 0xF;  /* PG88 */
+
+	/* This line is tricky. It collapses the table used by revision D and
+	 * later to one that matches revision CG and earlier
+	 */
+	cs -= (node_rev(pvt->node_id) >= OPTERON_CPU_REV_D) ?
+	      (cs > 8 ? 4 : (cs > 5 ? 3 : (cs > 2 ? 1 : 0))) : 0;
+
+	/* 25 is 32MiB minimum DIMM size */
+	return 1 << (cs + 25 - PAGE_SHIFT + dual_channel_active(pvt->dcl));
+}
+
+static int k8_init_csrows(struct mem_ctl_info *mci)
+{
+	struct csrow_info *csrow;
+	struct k8_pvt *pvt;
+	int i, empty;
+	u64 input_addr_min, input_addr_max, sys_addr;
+	u32 nbcfg;
+
+	pvt = mci->pvt_info;
+	pci_read_config_dword(pvt->misc_ctl, K8_NBCFG, &nbcfg);
+	empty = 1;
+
+	for (i = 0; i < K8_NR_CSROWS; i++) {
+		csrow = &mci->csrows[i];
+
+		if ((pvt->dcsb[i] & 0x01) == 0) {
+			debugf1("csrow %d empty for node %d\n", i,
+				pvt->node_id);
+			continue;  /* empty */
+		}
+
+		debugf1("revision for this node (%d) is %d\n",
+			pvt->node_id, node_rev(pvt->node_id));
+		empty = 0;
+		csrow->nr_pages = csrow_nr_pages(i, pvt);
+		find_csrow_limits(mci, i, &input_addr_min, &input_addr_max);
+		sys_addr = input_addr_to_sys_addr(mci, input_addr_min);
+		csrow->first_page = (u32) (sys_addr >> PAGE_SHIFT);
+		sys_addr = input_addr_to_sys_addr(mci, input_addr_max);
+		csrow->last_page = (u32) (sys_addr >> PAGE_SHIFT);
+		csrow->page_mask = ~mask_from_dcsm(pvt->dcsm[i]);
+		csrow->grain = 8;  /* 8 bytes of resolution */
+		csrow->mtype = ((pvt->dcl >> 18) & 0x1) ? MEM_DDR : MEM_RDDR;
+		csrow->dtype = ((pvt->dcl >> (20 + (i / 2))) & 0x01) ?
+			       DEV_X4 : DEV_UNKNOWN;
+		debugf1("for node %d csrow %d:\n    nr_pages: %u "
+			"input_addr_min: 0x%lx input_addr_max: 0x%lx "
+			"sys_addr: 0x%lx first_page: 0x%lx last_page: 0x%lx "
+			"page_mask: 0x%lx\n", pvt->node_id, i,
+			(unsigned) csrow->nr_pages,
+			(unsigned long) input_addr_min,
+			(unsigned long) input_addr_max,
+			(unsigned long) sys_addr,
+			csrow->first_page, csrow->last_page,
+			csrow->page_mask);
+
+		if (nbcfg & BIT(22))
+			csrow->edac_mode = (nbcfg & BIT(23)) ?
+					   EDAC_S4ECD4ED : EDAC_SECDED;
+		else
+			csrow->edac_mode = EDAC_NONE;
+	}
+
+	return empty;
+}
+
+static void k8_enable_error_reporting(struct mem_ctl_info *mci)
+{
+	struct k8_pvt *pvt;
+	u32 mc4ctl_l=0, mc4ctl_h=0, mcgctl_l=0, mcgctl_h=0;
+
+	pvt = mci->pvt_info;
+	pci_write_bits32(pvt->misc_ctl, K8_NBCTL, 0x3UL, 0x3UL);
+	do_rdmsr(pvt->node_id, K8_MSR_MC4CTL, &mc4ctl_l, &mc4ctl_h);
+	mc4ctl_l |= BIT(0) | BIT(1);
+	do_wrmsr(pvt->node_id, K8_MSR_MC4CTL, mc4ctl_l, mc4ctl_h);
+	do_rdmsr(pvt->node_id, K8_MSR_MC4CTL, &mc4ctl_l, &mc4ctl_h);
+	do_rdmsr(pvt->node_id, K8_MSR_MCGCTL, &mcgctl_l, &mcgctl_h);
+	mcgctl_l |= BIT(4);
+	do_wrmsr(pvt->node_id, K8_MSR_MCGCTL, mcgctl_l, mcgctl_h);
+	do_rdmsr(pvt->node_id, K8_MSR_MCGCTL, &mcgctl_l, &mcgctl_h);
+}
+
+static int k8_probe1(struct pci_dev *pdev, int dev_idx)
+{
+	struct mem_ctl_info *mci;
+	struct k8_pvt *pvt;
+	u32 dcl, dual_channel;
+
+	debugf0("%s()\n", __func__);
+	build_node_revision_table();
+	debugf1("pdev bus %u devfn %u\n", pdev->bus->number, pdev->devfn);
+	pci_read_config_dword(pdev, K8_DCL, &dcl);
+	dual_channel = dual_channel_active(dcl);
+	debugf1("dual_channel is %u (dcl is 0x%x)\n", dual_channel, dcl);
+	mci = edac_mc_alloc(sizeof(*pvt), K8_NR_CSROWS, dual_channel + 1);
+
+	if (mci == NULL)
+		return -ENOMEM;
+
+	debugf0("%s(): mci = %p\n", __func__, mci);
+	pvt = mci->pvt_info;
+	pvt->dcl = dcl;
+	mci->dev = &pdev->dev;
+	pvt->node_id = MCI_TO_NODE_ID(mci);
+
+	if (k8_get_devs(mci, dev_idx))
+		goto fail0;
+
+	k8_get_mc_regs(mci);
+	mci->mtype_cap = MEM_FLAG_DDR | MEM_FLAG_RDDR;
+	mci->edac_ctl_cap = EDAC_FLAG_NONE;
+	debugf1("Initializing mci->edac_cap to EDAC_FLAG_NONE\n");
+	mci->edac_cap = EDAC_FLAG_NONE;
+
+	if ((pvt->nbcap >> 3) & 0x1)
+		mci->edac_ctl_cap |= EDAC_FLAG_SECDED;
+
+	if ((pvt->nbcap >> 4) & 0x1)
+		mci->edac_ctl_cap |= EDAC_FLAG_S4ECD4ED;
+
+	if ((pvt->dcl >> 17) & 0x1) {
+		debugf1("setting EDAC_FLAG_SECDED in mci->edac_cap\n");
+		mci->edac_cap |= EDAC_FLAG_SECDED;
+
+		if (dual_channel) {
+			debugf1("setting EDAC_FLAG_S4ECD4ED in "
+				"mci->edac_cap\n");
+			mci->edac_cap |= EDAC_FLAG_S4ECD4ED;
+		}
+	}
+
+	mci->mod_name = EDAC_MOD_STR;
+	mci->mod_ver = EDAC_K8_VERSION;
+	mci->ctl_name = k8_devs[dev_idx].ctl_name;
+	mci->edac_check = k8_check;
+	mci->ctl_page_to_phys = NULL;
+
+	if (k8_init_csrows(mci)) {
+		debugf1("Setting mci->edac_cap to EDAC_FLAG_NONE "
+			"because k8_init_csrows() returned nonzero "
+			"value\n");
+		mci->edac_cap = EDAC_FLAG_NONE;  /* no csrows found */
+	} else
+		k8_enable_error_reporting(mci);
+
+	if (edac_mc_add_mc(mci, pvt->node_id)) {
+		debugf1("%s(): failed edac_mc_add_mc()\n", __func__);
+		/* FIXME: perhaps some code should go here that disables error
+		 * reporting if we just enabled it
+		 */
+		goto fail1;
+	}
+
+	debugf1("%s(): success\n", __func__);
+	return 0;
+
+fail1:
+	pci_dev_put(pvt->addr_map);
+	pci_dev_put(pvt->misc_ctl);
+
+fail0:
+	edac_mc_free(mci);
+	return -ENODEV;
+}
+
+/* returns count (>= 0), or negative on error */
+static int __devinit k8_init_one(struct pci_dev *pdev,
+				 const struct pci_device_id *ent)
+{
+	debugf0("%s()\n", __func__);
+
+	/* wake up and enable device */
+	return pci_enable_device(pdev) ?
+	    -EIO : k8_probe1(pdev, ent->driver_data);
+}
+
+static void __devexit k8_remove_one(struct pci_dev *pdev)
+{
+	struct mem_ctl_info *mci;
+	struct k8_pvt *pvt;
+
+	debugf0("%s()\n", __func__);
+
+	if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
+		return;
+
+	pvt = mci->pvt_info;
+	pci_dev_put(pvt->addr_map);
+	pci_dev_put(pvt->misc_ctl);
+	edac_mc_free(mci);
+}
+
+static const struct pci_device_id k8_pci_tbl[] __devinitdata = {
+	{PCI_VEND_DEV(AMD, OPT_2_MEMCTL), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	 OPTERON},
+	{0,}			/* 0 terminated list. */
+};
+
+MODULE_DEVICE_TABLE(pci, k8_pci_tbl);
+
+static struct pci_driver k8_driver = {
+	.name = EDAC_MOD_STR,
+	.probe = k8_init_one,
+	.remove = __devexit_p(k8_remove_one),
+	.id_table = k8_pci_tbl,
+};
+
+int __init k8_init(void)
+{
+	return pci_module_init(&k8_driver);
+}
+
+static void __exit k8_exit(void)
+{
+	pci_unregister_driver(&k8_driver);
+}
+
+module_init(k8_init);
+module_exit(k8_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh");
+MODULE_DESCRIPTION("MC support for AMD K8 memory controllers - " EDAC_K8_VERSION );
Index: linux-2.6.17.noarch/drivers/edac/Kconfig
===================================================================
--- linux-2.6.17.noarch.orig/drivers/edac/Kconfig	2006-06-17 22:49:35.000000000 -0300
+++ linux-2.6.17.noarch/drivers/edac/Kconfig	2006-07-31 09:05:27.000000000 -0300
@@ -90,6 +90,13 @@
 	  Support for error detection and correction on the Intel
 	  82860 chipset.
 
+config EDAC_K8
+	tristate "AMD K8 (Opteron, Athlon64)"
+	depends on EDAC_MM_EDAC && X86 && PCI
+	help
+	  Support for error detection and correction on the AMD
+	  K8 Memory Controller
+
 config EDAC_R82600
 	tristate "Radisys 82600 embedded chipset"
 	depends on EDAC_MM_EDAC && PCI && X86_32
Index: linux-2.6.17.noarch/drivers/edac/Makefile
===================================================================
--- linux-2.6.17.noarch.orig/drivers/edac/Makefile	2006-06-17 22:49:35.000000000 -0300
+++ linux-2.6.17.noarch/drivers/edac/Makefile	2006-07-31 09:05:27.000000000 -0300
@@ -14,5 +14,6 @@
 obj-$(CONFIG_EDAC_E752X)		+= e752x_edac.o
 obj-$(CONFIG_EDAC_I82875P)		+= i82875p_edac.o
 obj-$(CONFIG_EDAC_I82860)		+= i82860_edac.o
+obj-$(CONFIG_EDAC_K8)			+= k8_edac.o
 obj-$(CONFIG_EDAC_R82600)		+= r82600_edac.o
 
Index: linux-2.6.17.noarch/MAINTAINERS
===================================================================
--- linux-2.6.17.noarch.orig/MAINTAINERS	2006-07-31 09:01:14.000000000 -0300
+++ linux-2.6.17.noarch/MAINTAINERS	2006-07-31 09:05:27.000000000 -0300
@@ -952,6 +952,12 @@
 W:	bluesmoke.sourceforge.net
 S:	Supported
 
+EDAC-K8
+P:	Doug Thompson
+M:	norsk5 at xmission.com
+L:	bluesmoke-devel at lists.sourceforge.net
+W:	bluesmoke.sourceforge.net
+
 EDAC-E752X
 P:	Mark Gross
 M:	mark.gross at intel.com

linux-2.6-xen-unbreak-oprofile.patch:
 oprof.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-xen-unbreak-oprofile.patch ---
From: Markus Armbruster <armbru at redhat.com>

Dave Jones <davej at redhat.com> writes:

[...]
> This is caused by linux-2.6-xen.patch
> It's calling spin_lock/spin_unlock() on a mutex.

I have no idea how this crept in.  It's correct in my archive of
patches...  Anyway, here's the obvious fix:

diff -r a3fda906fb82 drivers/oprofile/oprof.c
--- a/drivers/oprofile/oprof.c	Fri Aug 04 00:04:12 2006 +0200
+++ b/drivers/oprofile/oprof.c	Wed Aug 09 09:26:43 2006 +0200
@@ -44,9 +44,9 @@ int oprofile_set_active(int active_domai
 	if (!oprofile_ops.set_active)
 		return -EINVAL;
 
-	spin_lock(&start_mutex);
+	mutex_lock(&start_mutex);
 	err = oprofile_ops.set_active(active_domains, adomains);
-	spin_unlock(&start_mutex);
+	mutex_unlock(&start_mutex);
 	return err;
 }
 
@@ -57,9 +57,9 @@ int oprofile_set_passive(int passive_dom
 	if (!oprofile_ops.set_passive)
 		return -EINVAL;
 
-	spin_lock(&start_mutex);
+	mutex_lock(&start_mutex);
 	err = oprofile_ops.set_passive(passive_domains, pdomains);
-	spin_unlock(&start_mutex);
+	mutex_unlock(&start_mutex);
 	return err;
 }
 



Index: Config.mk
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Config.mk,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -u -r1.3 -r1.3.8.1
--- Config.mk	26 Jul 2006 03:17:21 -0000	1.3
+++ Config.mk	11 Aug 2006 19:11:00 -0000	1.3.8.1
@@ -36,7 +36,7 @@
 CFLAGS    ?= -O2 -fomit-frame-pointer
 CFLAGS    += -DNDEBUG
 else
-CFLAGS    += -g
+CFLAGS    += -O2 -g
 endif
 
 

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

Index: linux-2.6-cell-mambo-drivers.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-mambo-drivers.patch,v
retrieving revision 1.4
retrieving revision 1.4.16.1
diff -u -r1.4 -r1.4.16.1
--- linux-2.6-cell-mambo-drivers.patch	4 Jul 2006 23:17:00 -0000	1.4
+++ linux-2.6-cell-mambo-drivers.patch	11 Aug 2006 19:11:00 -0000	1.4.16.1
@@ -338,7 +338,7 @@
  obj-$(CONFIG_ZNET) += znet.o
 --- /dev/null
 +++ b/drivers/net/mambonet.c
-@@ -0,0 +1,392 @@
+@@ -0,0 +1,391 @@
 +/*
 + *  Bogus Network Driver for PowerPC Full System Simulator
 + *
@@ -398,7 +398,6 @@
 +#include <linux/if_arp.h>	/* For ARPHRD_ETHER */
 +#include <linux/workqueue.h>
 +#include <asm/prom.h>
-+#include <linux/version.h>
 +#include <asm/systemsim.h>
 +
 +#define MAMBO_BOGUS_NET_PROBE   119

linux-2.6-compile-fixes.patch:
 Makefile                      |    4 ----
 arch/ia64/kernel/ia64_ksyms.c |    1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.97
retrieving revision 1.97.6.1
diff -u -r1.97 -r1.97.6.1
--- linux-2.6-compile-fixes.patch	31 Jul 2006 21:31:31 -0000	1.97
+++ linux-2.6-compile-fixes.patch	11 Aug 2006 19:11:00 -0000	1.97.6.1
@@ -22,45 +22,4 @@
  
  #define __KERNEL_SYSCALLS__
  #include <asm/unistd.h>
-Date: Mon, 31 Jul 2006 09:17:01 -0400
-From: Prarit Bhargava <prarit at redhat.com>
-Subject: [RHEL5/Fedora]: BZ 196903 Fix ia64 compile
-
-CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the 
-same
-change in arch/ia64
-
-Signed-off-by: Prarit Bhargava <prarit at redhat.com>
-Signed-off-by: Aron Griffis <aron at hp.com>
-
-
-
-CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the same
-change in arch/ia64
-
-Signed-off-by: Prarit Bhargava <prarit at redhat.com>
-Signed-off-by: Aron Griffis <aron at hp.com>
-
---- linux-2.6.17.ia64.orig/arch/ia64/kernel/ia64_ksyms.c	2006-07-27 15:21:47.000000000 -0400
-+++ linux-2.6.17.ia64/arch/ia64/kernel/ia64_ksyms.c	2006-07-31 09:02:06.000000000 -0400
-@@ -68,7 +68,7 @@ EXPORT_SYMBOL(__udivdi3);
- EXPORT_SYMBOL(__moddi3);
- EXPORT_SYMBOL(__umoddi3);
- 
--#if defined(CONFIG_MD_RAID5) || defined(CONFIG_MD_RAID5_MODULE)
-+#if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)
- extern void xor_ia64_2(void);
- extern void xor_ia64_3(void);
- extern void xor_ia64_4(void);
---- linux-2.6.17.ia64.orig/arch/ia64/lib/Makefile	2006-07-27 09:20:01.000000000 -0400
-+++ linux-2.6.17.ia64/arch/ia64/lib/Makefile	2006-07-31 09:02:41.000000000 -0400
-@@ -14,7 +14,7 @@ lib-y := __divsi3.o __udivsi3.o __modsi3
- lib-$(CONFIG_ITANIUM)	+= copy_page.o copy_user.o memcpy.o
- lib-$(CONFIG_MCKINLEY)	+= copy_page_mck.o memcpy_mck.o
- lib-$(CONFIG_PERFMON)	+= carta_random.o
--lib-$(CONFIG_MD_RAID5)	+= xor.o
-+lib-$(CONFIG_MD_RAID456)	+= xor.o
- 
- AFLAGS___divdi3.o	=
- AFLAGS___udivdi3.o	= -DUNSIGNED
 

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   21 
 fs/dlm/Makefile                    |   19 
 fs/dlm/ast.c                       |  172 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 +++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  387 +++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  541 +++++
 fs/dlm/lock.c                      | 3846 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   61 
 fs/dlm/lockspace.c                 |  716 ++++++
 fs/dlm/lockspace.h                 |   25 
 fs/dlm/lowcomms.c                  | 1238 +++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   97 
 fs/dlm/member.c                    |  327 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  116 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  471 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  776 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  286 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/user.c                      |  785 +++++++
 fs/dlm/user.h                      |   16 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1236 +++++++++++
 fs/gfs2/bmap.h                     |   27 
 fs/gfs2/daemon.c                   |  196 +
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1976 +++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++
 fs/gfs2/eattr.h                    |   97 
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2279 +++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  564 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  659 ++++++
 fs/gfs2/inode.c                    | 1344 ++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  290 ++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  302 ++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 +++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 +++++++
 fs/gfs2/lops.h                     |   96 
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  780 +++++++
 fs/gfs2/meta_io.h                  |   74 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  308 ++
 fs/gfs2/ops_address.c              |  797 +++++++
 fs/gfs2/ops_address.h              |   18 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  293 ++
 fs/gfs2/ops_export.h               |   19 
 fs/gfs2/ops_file.c                 |  812 +++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  836 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1165 +++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  471 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  188 +
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/quota.c                    | 1286 ++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  572 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1528 ++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  979 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 +++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/Kbuild               |   33 
 include/linux/dlm.h                |  302 ++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  443 ++++
 include/linux/iflags.h             |  102 
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   41 
 mm/filemap.c                       |    3 
 mm/readahead.c                     |    1 
 131 files changed, 40676 insertions(+), 21 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -u -r1.12 -r1.12.4.1
--- linux-2.6-gfs2-dlm.patch	2 Aug 2006 16:44:24 -0000	1.12
+++ linux-2.6-gfs2-dlm.patch	11 Aug 2006 19:11:00 -0000	1.12.4.1
@@ -67,10 +67,10 @@
 +  mount.gfs2	to help mount(8) mount a filesystem
 +  mkfs.gfs2	to make a filesystem
 diff --git a/MAINTAINERS b/MAINTAINERS
-index b2afc7a..e42e143 100644
+index e3e1515..a050d7c 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -862,6 +862,16 @@ M:	jack at suse.cz
+@@ -875,6 +875,16 @@ M:	jack at suse.cz
  L:	linux-kernel at vger.kernel.org
  S:	Maintained
  
@@ -87,7 +87,7 @@
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  P:	Tobias Ringstrom
  M:	tori at unhappy.mine.nu
-@@ -1112,6 +1122,14 @@ M:	khc at pm.waw.pl
+@@ -1129,6 +1139,14 @@ M:	khc at pm.waw.pl
  W:	http://www.kernel.org/pub/linux/utils/net/hdlc/
  S:	Maintained
  
@@ -1256,10 +1256,10 @@
 +
 diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
 new file mode 100644
-index 0000000..8f471d9
+index 0000000..9c3aedd
 --- /dev/null
 +++ b/fs/dlm/debug_fs.c
-@@ -0,0 +1,384 @@
+@@ -0,0 +1,387 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -1572,16 +1572,19 @@
 +{
 +	struct dlm_ls *ls = file->private_data;
 +	struct dlm_lkb *lkb;
-+	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, rv;
++	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, ret, rv;
 +
 +	mutex_lock(&debug_buf_lock);
 +	mutex_lock(&ls->ls_waiters_mutex);
 +	memset(debug_buf, 0, sizeof(debug_buf));
 +
 +	list_for_each_entry(lkb, &ls->ls_waiters, lkb_wait_reply) {
-+		pos += snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",
-+				lkb->lkb_id, lkb->lkb_wait_type,
-+				lkb->lkb_nodeid, lkb->lkb_resource->res_name);
++		ret = snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",
++			       lkb->lkb_id, lkb->lkb_wait_type,
++			       lkb->lkb_nodeid, lkb->lkb_resource->res_name);
++		if (ret >= len - pos)
++			break;
++		pos += ret;
 +	}
 +	mutex_unlock(&ls->ls_waiters_mutex);
 +
@@ -2111,10 +2114,10 @@
 +
 diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
 new file mode 100644
-index 0000000..7c3c2d2
+index 0000000..da75099
 --- /dev/null
 +++ b/fs/dlm/dlm_internal.h
-@@ -0,0 +1,539 @@
+@@ -0,0 +1,541 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -2584,6 +2587,8 @@
 +	struct list_head	ls_requestqueue;/* queue remote requests */
 +	struct mutex		ls_requestqueue_mutex;
 +	char			*ls_recover_buf;
++	int			ls_recover_nodeid; /* for debugging */
++	uint64_t		ls_rcom_seq;
 +	struct list_head	ls_recover_list;
 +	spinlock_t		ls_recover_list_lock;
 +	int			ls_recover_list_count;
@@ -2656,10 +2661,10 @@
 +
 diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
 new file mode 100644
-index 0000000..7d38f91
+index 0000000..bb2e351
 --- /dev/null
 +++ b/fs/dlm/lock.c
-@@ -0,0 +1,3845 @@
+@@ -0,0 +1,3846 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -6361,6 +6366,7 @@
 +	if (lvb_in && ua->lksb.sb_lvbptr)
 +		memcpy(ua->lksb.sb_lvbptr, lvb_in, DLM_USER_LVB_LEN);
 +	ua->castparam = ua_tmp->castparam;
++	ua->user_lksb = ua_tmp->user_lksb;
 +
 +	error = set_unlock_args(flags, ua, &args);
 +	if (error)
@@ -6574,10 +6580,10 @@
 +
 diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
 new file mode 100644
-index 0000000..31ed0fe
+index 0000000..7adaad5
 --- /dev/null
 +++ b/fs/dlm/lockspace.c
-@@ -0,0 +1,705 @@
+@@ -0,0 +1,716 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -6661,6 +6667,11 @@
 +	return sprintf(buf, "%x\n", status);
 +}
 +
++static ssize_t dlm_recover_nodeid_show(struct dlm_ls *ls, char *buf)
++{
++	return sprintf(buf, "%d\n", ls->ls_recover_nodeid);
++}
++
 +struct dlm_attr {
 +	struct attribute attr;
 +	ssize_t (*show)(struct dlm_ls *, char *);
@@ -6688,11 +6699,17 @@
 +	.show  = dlm_recover_status_show
 +};
 +
++static struct dlm_attr dlm_attr_recover_nodeid = {
++	.attr  = {.name = "recover_nodeid", .mode = S_IRUGO},
++	.show  = dlm_recover_nodeid_show
++};
++
 +static struct attribute *dlm_attrs[] = {
 +	&dlm_attr_control.attr,
 +	&dlm_attr_event.attr,
 +	&dlm_attr_id.attr,
 +	&dlm_attr_recover_status.attr,
++	&dlm_attr_recover_nodeid.attr,
 +	NULL,
 +};
 +
@@ -8719,10 +8736,10 @@
 +
 diff --git a/fs/dlm/member.c b/fs/dlm/member.c
 new file mode 100644
-index 0000000..cd0c51e
+index 0000000..a3f7de7
 --- /dev/null
 +++ b/fs/dlm/member.c
-@@ -0,0 +1,312 @@
+@@ -0,0 +1,327 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -8887,11 +8904,23 @@
 +
 +/* send a status request to all members just to establish comms connections */
 +
-+static void ping_members(struct dlm_ls *ls)
++static int ping_members(struct dlm_ls *ls)
 +{
 +	struct dlm_member *memb;
-+	list_for_each_entry(memb, &ls->ls_nodes, list)
-+		dlm_rcom_status(ls, memb->nodeid);
++	int error = 0;
++
++	list_for_each_entry(memb, &ls->ls_nodes, list) {
++		error = dlm_recovery_stopped(ls);
++		if (error)
++			break;
++		error = dlm_rcom_status(ls, memb->nodeid);
++		if (error)
++			break;
++	}
++	if (error)
++		log_debug(ls, "ping_members aborted %d last nodeid %d",
++			  error, ls->ls_recover_nodeid);
++	return error;
 +}
 +
 +int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv, int *neg_out)
@@ -8937,10 +8966,13 @@
 +	dlm_set_recover_status(ls, DLM_RS_NODES);
 +	*neg_out = neg;
 +
-+	ping_members(ls);
++	error = ping_members(ls);
++	if (error)
++		goto out;
 +
 +	error = dlm_recover_members_wait(ls);
-+	log_debug(ls, "total members %d", ls->ls_num_nodes);
++ out:
++	log_debug(ls, "total members %d error %d", ls->ls_num_nodes, error);
 +	return error;
 +}
 +
@@ -9067,10 +9099,10 @@
 +
 diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
 new file mode 100644
-index 0000000..48dfc27
+index 0000000..989b608
 --- /dev/null
 +++ b/fs/dlm/memory.c
-@@ -0,0 +1,115 @@
+@@ -0,0 +1,116 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -9173,7 +9205,8 @@
 +{
 +	struct dlm_direntry *de;
 +
-+	DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,);
++	DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,
++		   printk("namelen = %d\n", namelen););
 +
 +	de = kmalloc(sizeof(*de) + namelen, GFP_KERNEL);
 +	if (de)
@@ -9396,10 +9429,10 @@
 +
 diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
 new file mode 100644
-index 0000000..55fbe31
+index 0000000..64ba492
 --- /dev/null
 +++ b/fs/dlm/rcom.c
-@@ -0,0 +1,457 @@
+@@ -0,0 +1,471 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -9499,6 +9532,7 @@
 +	int error = 0;
 +
 +	memset(ls->ls_recover_buf, 0, dlm_config.buffer_size);
++	ls->ls_recover_nodeid = nodeid;
 +
 +	if (nodeid == dlm_our_nodeid()) {
 +		rc = (struct dlm_rcom *) ls->ls_recover_buf;
@@ -9509,6 +9543,7 @@
 +	error = create_rcom(ls, nodeid, DLM_RCOM_STATUS, 0, &rc, &mh);
 +	if (error)
 +		goto out;
++	rc->rc_id = ++ls->ls_rcom_seq;
 +
 +	send_rcom(ls, mh, rc);
 +
@@ -9541,19 +9576,30 @@
 +			    sizeof(struct rcom_config), &rc, &mh);
 +	if (error)
 +		return;
++	rc->rc_id = rc_in->rc_id;
 +	rc->rc_result = dlm_recover_status(ls);
 +	make_config(ls, (struct rcom_config *) rc->rc_buf);
 +
 +	send_rcom(ls, mh, rc);
 +}
 +
-+static void receive_rcom_status_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
++static void receive_sync_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
 +{
++	if (rc_in->rc_id != ls->ls_rcom_seq) {
++		log_debug(ls, "reject old reply %d got %llx wanted %llx",
++			  rc_in->rc_type, rc_in->rc_id, ls->ls_rcom_seq);
++		return;
++	}
 +	memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length);
 +	set_bit(LSFL_RCOM_READY, &ls->ls_flags);
 +	wake_up(&ls->ls_wait_general);
 +}
 +
++static void receive_rcom_status_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
++{
++	receive_sync_reply(ls, rc_in);
++}
++
 +int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len)
 +{
 +	struct dlm_rcom *rc;
@@ -9561,6 +9607,7 @@
 +	int error = 0, len = sizeof(struct dlm_rcom);
 +
 +	memset(ls->ls_recover_buf, 0, dlm_config.buffer_size);
++	ls->ls_recover_nodeid = nodeid;
 +
 +	if (nodeid == dlm_our_nodeid()) {
 +		dlm_copy_master_names(ls, last_name, last_len,
@@ -9573,6 +9620,7 @@
 +	if (error)
 +		goto out;
 +	memcpy(rc->rc_buf, last_name, last_len);
++	rc->rc_id = ++ls->ls_rcom_seq;
 +
 +	send_rcom(ls, mh, rc);
 +
@@ -9609,6 +9657,7 @@
 +	error = create_rcom(ls, nodeid, DLM_RCOM_NAMES_REPLY, outlen, &rc, &mh);
 +	if (error)
 +		return;
++	rc->rc_id = rc_in->rc_id;
 +
 +	dlm_copy_master_names(ls, rc_in->rc_buf, inlen, rc->rc_buf, outlen,
 +			      nodeid);
@@ -9617,9 +9666,7 @@
 +
 +static void receive_rcom_names_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
 +{
-+	memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length);
-+	set_bit(LSFL_RCOM_READY, &ls->ls_flags);
-+	wake_up(&ls->ls_wait_general);
++	receive_sync_reply(ls, rc_in);
 +}
 +
 +int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid)
@@ -10711,10 +10758,10 @@
 +
 diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
 new file mode 100644
-index 0000000..7010353
+index 0000000..eac8e9f
 --- /dev/null
 +++ b/fs/dlm/recoverd.c
-@@ -0,0 +1,285 @@
+@@ -0,0 +1,286 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -10992,6 +11039,7 @@
 +
 +void dlm_recoverd_suspend(struct dlm_ls *ls)
 +{
++	wake_up(&ls->ls_wait_general);
 +	mutex_lock(&ls->ls_recoverd_active);
 +}
 +
@@ -21283,10 +21331,10 @@
 +#endif /* __GLOPS_DOT_H__ */
 diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
 new file mode 100644
-index 0000000..90e0624
+index 0000000..e98c14f
 --- /dev/null
 +++ b/fs/gfs2/incore.h
-@@ -0,0 +1,658 @@
+@@ -0,0 +1,659 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -21568,6 +21616,7 @@
 +
 +enum {
 +	GFF_DID_DIRECT_ALLOC	= 0,
++	GFF_EXLOCK = 1,
 +};
 +
 +struct gfs2_file {
@@ -23656,10 +23705,10 @@
 +#endif /* __LM_DOT_H__ */
 diff --git a/fs/gfs2/lm_interface.h b/fs/gfs2/lm_interface.h
 new file mode 100644
-index 0000000..9d34bf3
+index 0000000..1da95a5
 --- /dev/null
 +++ b/fs/gfs2/lm_interface.h
-@@ -0,0 +1,295 @@
+@@ -0,0 +1,290 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -23927,16 +23976,11 @@
 +/*
 + * Lock module bottom interface.  A lock module makes itself available to GFS
 + * with these functions.
-+ *
-+ * For the time being, we copy the gfs1 lock module bottom interface so the
-+ * same lock modules can be used with both gfs1 and gfs2 (it won't be possible
-+ * to load both gfs1 and gfs2 at once.)  Eventually the lock modules will fork
-+ * for gfs1/gfs2 and this API can change to the gfs2_ prefix.
 + */
 +
-+int gfs_register_lockproto(struct lm_lockops *proto);
++int gfs2_register_lockproto(struct lm_lockops *proto);
 +
-+void gfs_unregister_lockproto(struct lm_lockops *proto);
++void gfs2_unregister_lockproto(struct lm_lockops *proto);
 +
 +/*
 + * Lock module top interface.  GFS calls these functions when mounting or
@@ -23957,7 +24001,7 @@
 +
 diff --git a/fs/gfs2/locking.c b/fs/gfs2/locking.c
 new file mode 100644
-index 0000000..1831928
+index 0000000..ded1ef6
 --- /dev/null
 +++ b/fs/gfs2/locking.c
 @@ -0,0 +1,191 @@
@@ -23994,13 +24038,13 @@
 +static struct mutex lmh_lock;
 +
 +/**
-+ * gfs_register_lockproto - Register a low-level locking protocol
++ * gfs2_register_lockproto - Register a low-level locking protocol
 + * @proto: the protocol definition
 + *
 + * Returns: 0 on success, -EXXX on failure
 + */
 +
-+int gfs_register_lockproto(struct lm_lockops *proto)
++int gfs2_register_lockproto(struct lm_lockops *proto)
 +{
 +	struct lmh_wrapper *lw;
 +
@@ -24030,12 +24074,12 @@
 +}
 +
 +/**
-+ * gfs_unregister_lockproto - Unregister a low-level locking protocol
++ * gfs2_unregister_lockproto - Unregister a low-level locking protocol
 + * @proto: the protocol definition
 + *
 + */
 +
-+void gfs_unregister_lockproto(struct lm_lockops *proto)
++void gfs2_unregister_lockproto(struct lm_lockops *proto)
 +{
 +	struct lmh_wrapper *lw;
 +
@@ -24080,7 +24124,7 @@
 +	int try = 0;
 +	int error, found;
 +
-+ retry:
++retry:
 +	mutex_lock(&lmh_lock);
 +
 +	found = 0;
@@ -24114,7 +24158,7 @@
 +				     min_lvb_size, flags, lockstruct, fskobj);
 +	if (error)
 +		module_put(lw->lw_ops->lm_owner);
-+ out:
++out:
 +	mutex_unlock(&lmh_lock);
 +	return error;
 +}
@@ -24149,8 +24193,8 @@
 +	INIT_LIST_HEAD(&lmh_list);
 +}
 +
-+EXPORT_SYMBOL_GPL(gfs_register_lockproto);
-+EXPORT_SYMBOL_GPL(gfs_unregister_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_register_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_unregister_lockproto);
 +
 diff --git a/fs/gfs2/locking/dlm/Makefile b/fs/gfs2/locking/dlm/Makefile
 new file mode 100644
@@ -24904,7 +24948,7 @@
 +
 diff --git a/fs/gfs2/locking/dlm/main.c b/fs/gfs2/locking/dlm/main.c
 new file mode 100644
-index 0000000..89728c9
+index 0000000..870a1cd
 --- /dev/null
 +++ b/fs/gfs2/locking/dlm/main.c
 @@ -0,0 +1,64 @@
@@ -24930,7 +24974,7 @@
 +{
 +	int error;
 +
-+	error = gfs_register_lockproto(&gdlm_ops);
++	error = gfs2_register_lockproto(&gdlm_ops);
 +	if (error) {
 +		printk(KERN_WARNING "lock_dlm:  can't register protocol: %d\n",
 +		       error);
@@ -24939,14 +24983,14 @@
 +
 +	error = gdlm_sysfs_init();
 +	if (error) {
-+		gfs_unregister_lockproto(&gdlm_ops);
++		gfs2_unregister_lockproto(&gdlm_ops);
 +		return error;
 +	}
 +
 +	error = gdlm_plock_init();
 +	if (error) {
 +		gdlm_sysfs_exit();
-+		gfs_unregister_lockproto(&gdlm_ops);
++		gfs2_unregister_lockproto(&gdlm_ops);
 +		return error;
 +	}
 +
@@ -24962,7 +25006,7 @@
 +{
 +	gdlm_plock_exit();
 +	gdlm_sysfs_exit();
-+	gfs_unregister_lockproto(&gdlm_ops);
++	gfs2_unregister_lockproto(&gdlm_ops);
 +}
 +
 +module_init(init_lock_dlm);
@@ -25236,10 +25280,10 @@
 +
 diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
 new file mode 100644
-index 0000000..e5b11f0
+index 0000000..1acb251
 --- /dev/null
 +++ b/fs/gfs2/locking/dlm/plock.c
-@@ -0,0 +1,301 @@
+@@ -0,0 +1,302 @@
 +/*
 + * Copyright (C) 2005 Red Hat, Inc.  All rights reserved.
 + *
@@ -25474,7 +25518,8 @@
 +	spin_lock(&ops_lock);
 +	list_for_each_entry(op, &recv_list, list) {
 +		if (op->info.fsid == info.fsid &&
-+		    op->info.number == info.number) {
++		    op->info.number == info.number &&
++		    op->info.owner == info.owner) {
 +			list_del_init(&op->list);
 +			found = 1;
 +			op->done = 1;
@@ -26148,7 +26193,7 @@
 +
 diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c
 new file mode 100644
-index 0000000..97ffac5
+index 0000000..748aa5d
 --- /dev/null
 +++ b/fs/gfs2/locking/nolock/main.c
 @@ -0,0 +1,259 @@
@@ -26387,7 +26432,7 @@
 +{
 +	int error;
 +
-+	error = gfs_register_lockproto(&nolock_ops);
++	error = gfs2_register_lockproto(&nolock_ops);
 +	if (error) {
 +		printk(KERN_WARNING
 +		       "lock_nolock: can't register protocol: %d\n", error);
@@ -26401,7 +26446,7 @@
 +
 +static void __exit exit_nolock(void)
 +{
-+	gfs_unregister_lockproto(&nolock_ops);
++	gfs2_unregister_lockproto(&nolock_ops);
 +}
 +
 +module_init(init_nolock);
@@ -26413,7 +26458,7 @@
 +
 diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
 new file mode 100644
-index 0000000..60fdc94
+index 0000000..a591fb8
 --- /dev/null
 +++ b/fs/gfs2/log.c
 @@ -0,0 +1,601 @@
@@ -26675,8 +26720,8 @@
 +	if (list_empty(&sdp->sd_ail1_list))
 +		tail = sdp->sd_log_head;
 +	else {
-+		ai = list_entry(sdp->sd_ail1_list.prev,
-+				struct gfs2_ail, ai_list);
++		ai = list_entry(sdp->sd_ail1_list.prev, struct gfs2_ail,
++				ai_list);
 +		tail = ai->ai_first;
 +	}
 +
@@ -29625,10 +29670,10 @@
 +
 diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
 new file mode 100644
-index 0000000..fca69f1
+index 0000000..45afd05
 --- /dev/null
 +++ b/fs/gfs2/ops_address.c
-@@ -0,0 +1,778 @@
+@@ -0,0 +1,797 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -29762,8 +29807,8 @@
 +static int gfs2_writepage(struct page *page, struct writeback_control *wbc)
 +{
 +	struct inode *inode = page->mapping->host;
-+	struct gfs2_inode *ip = GFS2_I(page->mapping->host);
-+	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
++	struct gfs2_inode *ip = GFS2_I(inode);
++	struct gfs2_sbd *sdp = GFS2_SB(inode);
 +	loff_t i_size = i_size_read(inode);
 +	pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;
 +	unsigned offset;
@@ -29789,6 +29834,10 @@
 +		error = gfs2_trans_begin(sdp, RES_DINODE + 1, 0);
 +		if (error)
 +			goto out_ignore;
++		if (!page_has_buffers(page)) {
++			create_empty_buffers(page, inode->i_sb->s_blocksize,
++					     (1 << BH_Dirty)|(1 << BH_Uptodate));
++		}
 +		gfs2_page_add_databufs(ip, page, 0, sdp->sd_vfs->s_blocksize-1);
 +		done_trans = 1;
 +	}
@@ -29868,14 +29917,22 @@
 +	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
 +	struct gfs2_holder gh;
 +	int error;
++	int do_unlock = 0;
 +
 +	if (likely(file != &gfs2_internal_file_sentinal)) {
++		if (file) {
++			struct gfs2_file *gf = file->private_data;
++			if (test_bit(GFF_EXLOCK, &gf->f_flags))
++				goto skip_lock;
++		}
 +		gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|GL_AOP, &gh);
++		do_unlock = 1;
 +		error = gfs2_glock_nq_m_atime(1, &gh);
 +		if (unlikely(error))
 +			goto out_unlock;
 +	}
 +
++skip_lock:
 +	if (gfs2_is_stuffed(ip)) {
 +		error = stuffed_readpage(ip, page);
 +		unlock_page(page);
@@ -29893,7 +29950,7 @@
 +	return error;
 +out_unlock:
 +	unlock_page(page);
-+	if (file != &gfs2_internal_file_sentinal)
++	if (do_unlock)
 +		gfs2_holder_uninit(&gh);
 +	goto out;
 +}
@@ -29922,17 +29979,24 @@
 +	struct gfs2_holder gh;
 +	unsigned page_idx;
 +	int ret;
++	int do_unlock = 0;
 +
 +	if (likely(file != &gfs2_internal_file_sentinal)) {
++		if (file) {
++			struct gfs2_file *gf = file->private_data;
++			if (test_bit(GFF_EXLOCK, &gf->f_flags))
++				goto skip_lock;
++		}
 +		gfs2_holder_init(ip->i_gl, LM_ST_SHARED,
 +				 LM_FLAG_TRY_1CB|GL_ATIME|GL_AOP, &gh);
++		do_unlock = 1;
 +		ret = gfs2_glock_nq_m_atime(1, &gh);
 +		if (ret == GLR_TRYFAILED) 
 +			goto out_noerror;
 +		if (unlikely(ret))
 +			goto out_unlock;
 +	}
-+
++skip_lock:
 +	if (gfs2_is_stuffed(ip)) {
 +		struct pagevec lru_pvec;
 +		pagevec_init(&lru_pvec, 0);
@@ -29957,7 +30021,7 @@
 +		ret = mpage_readpages(mapping, pages, nr_pages, gfs2_get_block);
 +	}
 +
-+	if (likely(file != &gfs2_internal_file_sentinal)) {
++	if (do_unlock) {
 +		gfs2_glock_dq_m(1, &gh);
 +		gfs2_holder_uninit(&gh);
 +	}
@@ -29975,7 +30039,7 @@
 +		unlock_page(page);
 +		page_cache_release(page);
 +	}
-+	if (likely(file != &gfs2_internal_file_sentinal))
++	if (do_unlock)
 +		gfs2_holder_uninit(&gh);
 +	goto out;
 +}
@@ -34308,10 +34372,10 @@
 +#endif /* __OPS_SUPER_DOT_H__ */
 diff --git a/fs/gfs2/ops_vm.c b/fs/gfs2/ops_vm.c
 new file mode 100644
-index 0000000..aff6637
+index 0000000..875a769
 --- /dev/null
 +++ b/fs/gfs2/ops_vm.c
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,188 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -34360,13 +34424,7 @@
 +					unsigned long address, int *type)
 +{
 +	struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
-+	struct gfs2_holder i_gh;
 +	struct page *result;
-+	int error;
-+
-+	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, 0, &i_gh);
-+	if (error)
-+		return NULL;
 +
 +	set_bit(GIF_PAGED, &ip->i_flags);
 +
@@ -34375,8 +34433,6 @@
 +	if (result && result != NOPAGE_OOM)
 +		pfault_be_greedy(ip);
 +
-+	gfs2_glock_dq_uninit(&i_gh);
-+
 +	return result;
 +}
 +
@@ -34455,7 +34511,9 @@
 +static struct page *gfs2_sharewrite_nopage(struct vm_area_struct *area,
 +					   unsigned long address, int *type)
 +{
-+	struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
++	struct file *file = area->vm_file;
++	struct gfs2_file *gf = file->private_data;
++	struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);
 +	struct gfs2_holder i_gh;
 +	struct page *result = NULL;
 +	unsigned long index = ((address - area->vm_start) >> PAGE_CACHE_SHIFT) +
@@ -34470,13 +34528,14 @@
 +	set_bit(GIF_PAGED, &ip->i_flags);
 +	set_bit(GIF_SW_PAGED, &ip->i_flags);
 +
-+	error = gfs2_write_alloc_required(ip,
-+					  (uint64_t)index << PAGE_CACHE_SHIFT,
++	error = gfs2_write_alloc_required(ip, (u64)index << PAGE_CACHE_SHIFT,
 +					  PAGE_CACHE_SIZE, &alloc_required);
 +	if (error)
 +		goto out;
 +
++	set_bit(GFF_EXLOCK, &gf->f_flags);
 +	result = filemap_nopage(area, address, type);
++	clear_bit(GFF_EXLOCK, &gf->f_flags);
 +	if (!result || result == NOPAGE_OOM)
 +		goto out;
 +
@@ -34491,8 +34550,7 @@
 +	}
 +
 +	pfault_be_greedy(ip);
-+
-+ out:
++out:
 +	gfs2_glock_dq_uninit(&i_gh);
 +
 +	return result;
@@ -35860,10 +35918,10 @@
 +#endif /* __QUOTA_DOT_H__ */
 diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
 new file mode 100644
-index 0000000..7aabc03
+index 0000000..bbd44a4
 --- /dev/null
 +++ b/fs/gfs2/recovery.c
-@@ -0,0 +1,575 @@
+@@ -0,0 +1,572 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -36019,8 +36077,7 @@
 +
 +	if (lh.lh_header.mh_magic != GFS2_MAGIC ||
 +	    lh.lh_header.mh_type != GFS2_METATYPE_LH ||
-+	    lh.lh_blkno != blk ||
-+	    lh.lh_hash != hash)
++	    lh.lh_blkno != blk || lh.lh_hash != hash)
 +		return 1;
 +
 +	*head = lh;
@@ -36348,11 +36405,9 @@
 +
 +		/* Acquire a shared hold on the transaction lock */
 +
-+		error = gfs2_glock_nq_init(sdp->sd_trans_gl,
-+					   LM_ST_SHARED,
++		error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED,
 +					   LM_FLAG_NOEXP | LM_FLAG_PRIORITY |
-+					   GL_NOCANCEL | GL_NOCACHE,
-+					   &t_gh);
++					   GL_NOCANCEL | GL_NOCACHE, &t_gh);
 +		if (error)
 +			goto fail_gunlock_ji;
 +

linux-2.6-gfs2-locking-exports.patch:
 locking.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6-gfs2-locking-exports.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-locking-exports.patch,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -r1.1 -r1.1.10.1
--- linux-2.6-gfs2-locking-exports.patch	21 Jul 2006 20:27:00 -0000	1.1
+++ linux-2.6-gfs2-locking-exports.patch	11 Aug 2006 19:11:01 -0000	1.1.10.1
@@ -1,12 +1,10 @@
-*** gfs2-2.6-18-rc2/fs/gfs2/locking.c	2006-07-20 10:44:33.000000000 -0500
---- gfs2-devel/fs/gfs2/locking.c	2006-07-20 12:27:53.000000000 -0500
-*************** void __init gfs2_init_lmh(void)
-*** 188,191 ****
---- 188,194 ----
-  
-  EXPORT_SYMBOL_GPL(gfs_register_lockproto);
-  EXPORT_SYMBOL_GPL(gfs_unregister_lockproto);
-+ EXPORT_SYMBOL_GPL(gfs2_withdraw_lockproto);
-+ EXPORT_SYMBOL_GPL(gfs2_mount_lockproto);
-+ EXPORT_SYMBOL_GPL(gfs2_unmount_lockproto);
-  
+--- linux-2.6.17.noarch/fs/gfs2/locking.c~	2006-08-10 13:33:09.000000000 -0400
++++ linux-2.6.17.noarch/fs/gfs2/locking.c	2006-08-10 13:33:23.000000000 -0400
+@@ -188,4 +188,6 @@ void __init gfs2_init_lmh(void)
+ 
+ EXPORT_SYMBOL_GPL(gfs2_register_lockproto);
+ EXPORT_SYMBOL_GPL(gfs2_unregister_lockproto);
+-
++EXPORT_SYMBOL_GPL(gfs2_withdraw_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_mount_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_unmount_lockproto);

linux-2.6-lockdep-fixes.patch:
 a/kernel/lockdep.c                            |   13 ++++++++++
 a/net/ipv6/icmp.c                             |   13 ++++++++++
 linux-2.6.17-mm6/include/net/sock.h           |   33 +++++++++++++++++++++++---
 linux-2.6.17.noarch/fs/exec.c                 |    2 -
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++++++++-
 linux-2.6.18-rc1/net/socket.c                 |    8 +++++-
 7 files changed, 78 insertions(+), 9 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -u -r1.16 -r1.16.4.1
--- linux-2.6-lockdep-fixes.patch	3 Aug 2006 17:28:17 -0000	1.16
+++ linux-2.6-lockdep-fixes.patch	11 Aug 2006 19:11:01 -0000	1.16.4.1
@@ -387,4 +387,81 @@
  
  		/* Enough space for 2 64K ICMP packets, including
  		 * sk_buff struct overhead.
+
+--- a/kernel/lockdep.c~lockdep-print-kernel-version
++++ a/kernel/lockdep.c
+@@ -36,6 +36,7 @@
+ #include <linux/stacktrace.h>
+ #include <linux/debug_locks.h>
+ #include <linux/irqflags.h>
++#include <linux/utsname.h>
+ 
+ #include <asm/sections.h>
+ 
+@@ -508,6 +509,13 @@ print_circular_bug_entry(struct lock_lis
+ 	return 0;
+ }
+ 
++static void print_kernel_version(void)
++{
++	printk("%s %.*s\n", system_utsname.release,
++		(int)strcspn(system_utsname.version, " "),
++		system_utsname.version);
++}
++
+ /*
+  * When a circular dependency is detected, print the
+  * header first:
+@@ -524,6 +532,7 @@ print_circular_bug_header(struct lock_li
+ 
+ 	printk("\n=======================================================\n");
+ 	printk(  "[ INFO: possible circular locking dependency detected ]\n");
++	print_kernel_version();
+ 	printk(  "-------------------------------------------------------\n");
+ 	printk("%s/%d is trying to acquire lock:\n",
+ 		curr->comm, curr->pid);
+@@ -705,6 +714,7 @@ print_bad_irq_dependency(struct task_str
+ 	printk("\n======================================================\n");
+ 	printk(  "[ INFO: %s-safe -> %s-unsafe lock order detected ]\n",
+ 		irqclass, irqclass);
++	print_kernel_version();
+ 	printk(  "------------------------------------------------------\n");
+ 	printk("%s/%d [HC%u[%lu]:SC%u[%lu]:HE%u:SE%u] is trying to acquire:\n",
+ 		curr->comm, curr->pid,
+@@ -786,6 +796,7 @@ print_deadlock_bug(struct task_struct *c
+ 
+ 	printk("\n=============================================\n");
+ 	printk(  "[ INFO: possible recursive locking detected ]\n");
++	print_kernel_version();
+ 	printk(  "---------------------------------------------\n");
+ 	printk("%s/%d is trying to acquire lock:\n",
+ 		curr->comm, curr->pid);
+@@ -1368,6 +1379,7 @@ print_irq_inversion_bug(struct task_stru
+ 
+ 	printk("\n=========================================================\n");
+ 	printk(  "[ INFO: possible irq lock inversion dependency detected ]\n");
++	print_kernel_version();
+ 	printk(  "---------------------------------------------------------\n");
+ 	printk("%s/%d just changed the state of lock:\n",
+ 		curr->comm, curr->pid);
+@@ -1462,6 +1474,7 @@ print_usage_bug(struct task_struct *curr
+ 
+ 	printk("\n=================================\n");
+ 	printk(  "[ INFO: inconsistent lock state ]\n");
++	print_kernel_version();
+ 	printk(  "---------------------------------\n");
+ 
+ 	printk("inconsistent {%s} -> {%s} usage.\n",
 _
+
+--- linux-2.6.17.noarch/fs/exec.c~	2006-08-10 21:49:38.000000000 -0400
++++ linux-2.6.17.noarch/fs/exec.c	2006-08-10 21:50:36.000000000 -0400
+@@ -753,7 +753,7 @@ no_thread_group:
+ 
+ 		write_lock_irq(&tasklist_lock);
+ 		spin_lock(&oldsighand->siglock);
+-		spin_lock(&newsighand->siglock);
++		spin_lock_nested(&newsighand->siglock, SINGLE_DEPTH_NESTING);
+ 
+ 		rcu_assign_pointer(current->sighand, newsighand);
+ 		recalc_sigpending();

linux-2.6-modsign-ksign.patch:
 linux-2.6.14/crypto/signature/ksign-keyring.c |    2 
 linux-902/crypto/digest.c                     |    8 
 linux-902/crypto/signature/Makefile           |   10 
 linux-902/crypto/signature/dsa.c              |   98 ++++
 linux-902/crypto/signature/key.h              |    7 
 linux-902/crypto/signature/ksign-keyring.c    |  112 ++++
 linux-902/crypto/signature/ksign-parse.c      |  609 ++++++++++++++++++++++++++
 linux-902/crypto/signature/ksign-publickey.c  |   19 
 linux-902/crypto/signature/ksign.c            |  179 +++++++
 linux-902/crypto/signature/local.h            |  163 ++++++
 linux-902/include/linux/crypto.h              |   10 
 linux-902/include/linux/crypto/ksign.h        |   22 
 12 files changed, 1239 insertions(+)

Index: linux-2.6-modsign-ksign.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-modsign-ksign.patch,v
retrieving revision 1.2
retrieving revision 1.2.96.1
diff -u -r1.2 -r1.2.96.1
--- linux-2.6-modsign-ksign.patch	22 Nov 2005 19:12:58 -0000	1.2
+++ linux-2.6-modsign-ksign.patch	11 Aug 2006 19:11:01 -0000	1.2.96.1
@@ -8,7 +8,7 @@
 +static void update_kernel(struct crypto_tfm *tfm,
 +			  const void *data, size_t count)
 +{
-+	tfm->__crt_alg->cra_digest.dia_update(crypto_tfm_ctx(tfm), data, count);
++	tfm->__crt_alg->cra_digest.dia_update(tfm, data, count);
 +	crypto_yield(tfm);
 +}
 +

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  455 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  839 ++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/ia32_entry.S             |    2 
 arch/ia64/ia32/sys_ia32.c               |   23 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/ia64/kernel/signal.c               |    4 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  785 +++++++--------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  553 +++++++++--
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  688 ++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |   14 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   74 +
 include/asm-ia64/tracehook.h            |   67 +
 include/asm-powerpc/tracehook.h         |  303 ++++++
 include/asm-s390/tracehook.h            |  105 ++
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  106 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   88 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  645 ++++++++++++
 include/linux/utrace.h                  |  481 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  253 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1592 +++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1526 ++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |   54 -
 security/selinux/include/objsec.h       |    1 
 93 files changed, 8331 insertions(+), 3318 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -u -r1.12 -r1.12.4.1
--- linux-2.6-utrace.patch	1 Aug 2006 19:44:14 -0000	1.12
+++ linux-2.6-utrace.patch	11 Aug 2006 19:11:01 -0000	1.12.4.1
@@ -7,22 +7,24 @@
  arch/i386/kernel/entry.S                |    7 
  arch/i386/kernel/i387.c                 |  143 +--
  arch/i386/kernel/process.c              |    3 
- arch/i386/kernel/ptrace.c               |  839 +++++++++--------
+ arch/i386/kernel/ptrace.c               |  839 +++++++++-------
  arch/i386/kernel/signal.c               |   39 -
  arch/i386/kernel/vm86.c                 |    7 
- arch/ia64/ia32/sys_ia32.c               |    2 
+ arch/ia64/ia32/ia32_entry.S             |    2 
+ arch/ia64/ia32/sys_ia32.c               |   23 
  arch/ia64/kernel/asm-offsets.c          |    2 
  arch/ia64/kernel/fsys.S                 |   16 
  arch/ia64/kernel/mca.c                  |    2 
  arch/ia64/kernel/ptrace.c               |   41 -
+ arch/ia64/kernel/signal.c               |    4 
  arch/mips/kernel/ptrace.c               |   21 
  arch/mips/kernel/sysirix.c              |    2 
  arch/powerpc/kernel/Makefile            |    4 
  arch/powerpc/kernel/asm-offsets.c       |    2 
  arch/powerpc/kernel/process.c           |    5 
  arch/powerpc/kernel/ptrace-common.h     |  161 ---
- arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
- arch/powerpc/kernel/ptrace32.c          |  436 ---------
+ arch/powerpc/kernel/ptrace.c            |  785 +++++++--------
+ arch/powerpc/kernel/ptrace32.c          |  436 --------
  arch/powerpc/kernel/signal_32.c         |   56 +
  arch/powerpc/kernel/signal_64.c         |    4 
  arch/powerpc/kernel/sys_ppc32.c         |    5 
@@ -32,12 +34,12 @@
  arch/s390/kernel/compat_linux.c         |    3 
  arch/s390/kernel/compat_signal.c        |    5 
  arch/s390/kernel/process.c              |    3 
- arch/s390/kernel/ptrace.c               |  551 ++++++++++-
+ arch/s390/kernel/ptrace.c               |  553 ++++++++++-
  arch/s390/kernel/signal.c               |    4 
  arch/s390/kernel/traps.c                |    6 
  arch/sparc64/kernel/entry.S             |    6 
  arch/sparc64/kernel/process.c           |    3 
- arch/sparc64/kernel/ptrace.c            |  650 +++++++++++--
+ arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
  arch/sparc64/kernel/signal.c            |    2 
  arch/sparc64/kernel/signal32.c          |    2 
  arch/sparc64/kernel/sys_sparc32.c       |    3 
@@ -46,7 +48,7 @@
  arch/x86_64/ia32/ia32_aout.c            |    6 
  arch/x86_64/ia32/ia32_signal.c          |    8 
  arch/x86_64/ia32/ia32entry.S            |    2 
- arch/x86_64/ia32/ptrace32.c             |  690 +++++++++-----
+ arch/x86_64/ia32/ptrace32.c             |  690 +++++++++----
  arch/x86_64/ia32/sys_ia32.c             |    5 
  arch/x86_64/kernel/process.c            |    5 
  arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
@@ -60,12 +62,13 @@
  fs/binfmt_flat.c                        |    3 
  fs/binfmt_som.c                         |    2 
  fs/exec.c                               |   11 
- fs/proc/array.c                         |    7 
+ fs/proc/array.c                         |   14 
  fs/proc/base.c                          |   17 
  include/asm-i386/i387.h                 |   13 
  include/asm-i386/signal.h               |    4 
  include/asm-i386/thread_info.h          |    7 
  include/asm-i386/tracehook.h            |   74 +
+ include/asm-ia64/tracehook.h            |   67 +
  include/asm-powerpc/tracehook.h         |  303 ++++++
  include/asm-s390/tracehook.h            |  105 ++
  include/asm-sparc64/tracehook.h         |   44 +
@@ -73,25 +76,27 @@
  include/asm-x86_64/thread_info.h        |    2 
  include/asm-x86_64/tracehook.h          |  106 ++
  include/linux/init_task.h               |    3 
- include/linux/ptrace.h                  |   86 +-
+ include/linux/ptrace.h                  |   88 +-
  include/linux/sched.h                   |   25 
- include/linux/tracehook.h               |  641 +++++++++++++
- include/linux/utrace.h                  |  471 +++++++++
+ include/linux/tracehook.h               |  645 +++++++++++++
+ include/linux/utrace.h                  |  481 +++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
- kernel/exit.c                           |  259 +----
- kernel/fork.c                           |   60 -
- kernel/ptrace.c                         | 1562 ++++++++++++++++++++++++-------
+ kernel/exit.c                           |  253 +----
+ kernel/fork.c                           |   62 -
+ kernel/ptrace.c                         | 1592 ++++++++++++++++++++++++-------
  kernel/signal.c                         |  211 +---
  kernel/sys.c                            |    2 
  kernel/timer.c                          |    6 
- kernel/utrace.c                         | 1520 ++++++++++++++++++++++++++++++
- security/selinux/hooks.c                |    6 
- 89 files changed, 8168 insertions(+), 3282 deletions(-)
+ kernel/utrace.c                         | 1526 ++++++++++++++++++++++++++++++
+ security/selinux/hooks.c                |   54 +
+ security/selinux/include/objsec.h       |    1 
+ 93 files changed, 8332 insertions(+), 3321 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
  create mode 100644 include/asm-i386/tracehook.h
+ create mode 100644 include/asm-ia64/tracehook.h
  create mode 100644 include/asm-powerpc/tracehook.h
  create mode 100644 include/asm-s390/tracehook.h
  create mode 100644 include/asm-sparc64/tracehook.h
@@ -406,6 +411,76 @@
 +
 +
 +#endif
+--- linux-2.6/include/asm-ia64/tracehook.h.utrace-ptrace-compat
++++ linux-2.6/include/asm-ia64/tracehook.h
+@@ -0,0 +1,67 @@
++/*
++ * Copyright (C)2006 Intel Co
++ *	Anil S Keshavamurthy <anil.s.keshavamurthy at intel.com>
++ *	and Bibo Mao <bibo.mao at intel.com> adapted from i386.
++ *
++ * 	Tracing hooks, ia64 CPU support
++ */
++
++#ifndef _ASM_TRACEHOOK_H
++#define _ASM_TRACEHOOK_H	1
++
++#include <linux/sched.h>
++#include <asm/ptrace.h>
++
++/*
++ * See linux/tracehook.h for the descriptions of what these need to do.
++ */
++
++#define ARCH_HAS_SINGLE_STEP	(1)
++#define ARCH_HAS_BLOCK_STEP	(1)
++
++static inline void tracehook_enable_single_step(struct task_struct *tsk)
++{
++	struct pt_regs *pt = task_pt_regs(tsk);
++	ia64_psr(pt)->ss = 1;
++}
++
++static inline void tracehook_disable_single_step(struct task_struct *tsk)
++{
++	struct pt_regs *pt = task_pt_regs(tsk);
++	ia64_psr(pt)->ss = 0;
++}
++
++static inline void tracehook_enable_block_step(struct task_struct *tsk)
++{
++	struct pt_regs *pt = task_pt_regs(tsk);
++	ia64_psr(pt)->tb = 1;
++}
++
++static inline void tracehook_disable_block_step(struct task_struct *tsk)
++{
++	struct pt_regs *pt = task_pt_regs(tsk);
++	ia64_psr(pt)->tb = 0;
++}
++
++static inline void tracehook_enable_syscall_trace(struct task_struct *tsk)
++{
++	set_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE);
++}
++
++static inline void tracehook_disable_syscall_trace(struct task_struct *tsk)
++{
++	clear_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE);
++}
++
++static inline int tracehook_single_step_enabled(struct task_struct *tsk)
++{
++	struct pt_regs *pt = task_pt_regs(tsk);
++	return ia64_psr(pt)->ss;
++}
++
++static inline void tracehook_abort_syscall(struct pt_regs *regs)
++{
++	regs->r15 = -1L;
++}
++
++#endif
 --- linux-2.6/include/asm-i386/i387.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-i386/i387.h
 @@ -126,17 +126,12 @@ extern int save_i387( struct _fpstate __
@@ -933,7 +1008,7 @@
  extern int send_sig(int, struct task_struct *, int);
 --- linux-2.6/include/linux/utrace.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/utrace.h
-@@ -0,0 +1,471 @@
+@@ -0,0 +1,481 @@
 +/*
 + * User Debugging Data & Event Rendezvous
 + *
@@ -1187,11 +1262,10 @@
 +	/*
 +	 * Event reported for parent using CLONE_VFORK or vfork system call.
 +	 * The child has died or exec'd, so the vfork parent has unblocked
-+	 * and is about to return child->pid.
++	 * and is about to return child_pid.
 +	 */
 +	u32 (*report_vfork_done)(struct utrace_attached_engine *engine,
-+				 struct task_struct *parent,
-+				 struct task_struct *child);
++				 struct task_struct *parent, pid_t child_pid);
 +
 +	/*
 +	 * Event reported after UTRACE_ACTION_QUIESCE is set, when the target
@@ -1309,11 +1383,22 @@
 +			   struct task_struct *target);
 +
 +	/*
-+	 * Return the value to display after "TracerPid:" in /proc/PID/status.
-+	 * If this engine returns zero, another engine may supply the value.
++	 * Return the task_struct for the task using ptrace on this one, or
++	 * NULL.  Always called with rcu_read_lock held to keep the
++	 * returned struct alive.
++	 *
++	 * At exec time, this may be called with task_lock(target) still
++	 * held from when unsafe_exec was just called.  In that case it
++	 * must give results consistent with those unsafe_exec results,
++	 * i.e. non-NULL if any LSM_UNSAFE_PTRACE_* bits were set.
++	 *
++	 * The value is also used to display after "TracerPid:" in
++	 * /proc/PID/status, where it is called with only rcu_read_lock held.
++	 *
++	 * If this engine returns NULL, another engine may supply the result.
 +	 */
-+	pid_t (*tracer_pid)(struct utrace_attached_engine *engine,
-+			    struct task_struct *target);
++	struct task_struct *(*tracer_task)(struct utrace_attached_engine *,
++					   struct task_struct *target);
 +};
 +
 +
@@ -1392,13 +1477,13 @@
 +int utrace_get_signal(struct task_struct *, struct pt_regs *,
 +		      siginfo_t *, struct k_sigaction *);
 +void utrace_report_clone(unsigned long clone_flags, struct task_struct *child);
-+void utrace_report_vfork_done(struct task_struct *child);
++void utrace_report_vfork_done(pid_t child_pid);
 +void utrace_report_exit(long *exit_code);
 +void utrace_report_death(struct task_struct *);
 +int utrace_report_jctl(int type);
 +void utrace_report_exec(struct linux_binprm *bprm, struct pt_regs *regs);
 +void utrace_report_syscall(struct pt_regs *regs, int is_exit);
-+pid_t utrace_tracer_pid(struct task_struct *);
++struct task_struct *utrace_tracer_task(struct task_struct *);
 +int utrace_allow_access_process_vm(struct task_struct *);
 +int utrace_unsafe_exec(struct task_struct *);
 +void utrace_signal_handler_singlestep(struct task_struct *, struct pt_regs *);
@@ -1407,7 +1492,7 @@
 +#endif	/* linux/utrace.h */
 --- linux-2.6/include/linux/ptrace.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/ptrace.h
-@@ -49,66 +49,42 @@
+@@ -49,66 +49,44 @@
  #include <asm/ptrace.h>
  
  #ifdef __KERNEL__
@@ -1485,6 +1570,8 @@
 + * This reports any ptrace-child that is ready as do_wait would a normal child.
 + * If there are no ptrace children, returns -ECHILD.
 + * If there are some ptrace children but none reporting now, returns 0.
++ * In those cases the tasklist_lock is still held so next_thread(tsk) works.
++ * For any other return value, tasklist_lock is released before return.
 + */
 +int ptrace_do_wait(struct task_struct *tsk,
 +		   pid_t pid, int options, struct siginfo __user *infop,
@@ -1519,7 +1606,7 @@
  	.sibling	= LIST_HEAD_INIT(tsk.sibling),			\
 --- linux-2.6/include/linux/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/tracehook.h
-@@ -0,0 +1,641 @@
+@@ -0,0 +1,645 @@
 +/*
 + * Tracing hooks
 + *
@@ -1711,8 +1798,10 @@
 +		      void **kbuf, void __user **ubuf,
 +		      const void *data, int start_pos, int end_pos)
 +{
++	if (*count == 0)
++		return 0;
 +	BUG_ON(*pos < start_pos);
-+	if (*count > 0 && (end_pos < 0 || *pos < end_pos)) {
++	if (end_pos < 0 || *pos < end_pos) {
 +		unsigned int copy = (end_pos < 0 ? *count
 +				     : min(*count, end_pos - *pos));
 +		data += *pos - start_pos;
@@ -1735,8 +1824,10 @@
 +		     const void **kbuf, const void __user **ubuf,
 +		     void *data, int start_pos, int end_pos)
 +{
++	if (*count == 0)
++		return 0;
 +	BUG_ON(*pos < start_pos);
-+	if (*count > 0 && (end_pos < 0 || *pos < end_pos)) {
++	if (end_pos < 0 || *pos < end_pos) {
 +		unsigned int copy = (end_pos < 0 ? *count
 +				     : min(*count, end_pos - *pos));
 +		data += *pos - start_pos;
@@ -1769,18 +1860,6 @@
 +#include <linux/utrace.h>
 +#endif
 +
-+/*
-+ * Return the value to display after "TracerPid:" in /proc/PID/status.
-+ * Called without locks.
-+ */
-+static inline pid_t tracehook_tracer_pid(struct task_struct *p)
-+{
-+#ifdef CONFIG_UTRACE
-+	if (p->utrace_flags)
-+		return utrace_tracer_pid(p);
-+#endif
-+	return 0;
-+}
 +
 +/*
 + * Called in copy_process when setting up the copied task_struct,
@@ -2000,13 +2079,22 @@
 +}
 +
 +/*
-+ * Return nonzero if the task is being traced so security checks should apply.
-+ * Called with task_lock(tsk) held.
++ * Return the task_struct for the task using ptrace on this one, or NULL.
++ * Must be called with rcu_read_lock held to keep the returned struct alive.
++ *
++ * At exec time, this may be called with task_lock(p) still held from when
++ * tracehook_unsafe_exec was just called.
++ *
++ * The value is also used to display after "TracerPid:" in /proc/PID/status,
++ * where it is called with only rcu_read_lock held.
 + */
-+static inline int tracehook_security_ptrace(struct task_struct *tsk)
++static inline struct task_struct *tracehook_tracer_task(struct task_struct *p)
 +{
-+	return 0;
-+	// return (p->ptrace & PT_PTRACED);
++#ifdef CONFIG_UTRACE
++	if (p->utrace_flags)
++		return utrace_tracer_task(p);
++#endif
++	return NULL;
 +}
 +
 +/*
@@ -2112,12 +2200,15 @@
 +/*
 + * Called after a CLONE_VFORK parent has waited for the child to complete.
 + * The clone/vfork system call will return immediately after this.
++ * The child pointer may be invalid if a self-reaping child died and
++ * tracehook_report_clone took no action to prevent it from self-reaping.
 + */
-+static inline void tracehook_report_vfork_done(struct task_struct *child)
++static inline void tracehook_report_vfork_done(struct task_struct *child,
++					       pid_t child_pid)
 +{
 +#ifdef CONFIG_UTRACE
 +	if (current->utrace_flags & UTRACE_EVENT(VFORK_DONE))
-+		utrace_report_vfork_done(child);
++		utrace_report_vfork_done(child_pid);
 +#endif
 +}
 +
@@ -2619,6 +2710,16 @@
 +value.  It says to push the signal back on the thread's queue, with
 +the signal number and details possibly changed in info.  When the
 +thread is allowed to resume, it will dequeue and report it again.
+--- linux-2.6/security/selinux/include/objsec.h.utrace-ptrace-compat
++++ linux-2.6/security/selinux/include/objsec.h
+@@ -34,7 +34,6 @@ struct task_security_struct {
+ 	u32 create_sid;      /* fscreate SID */
+ 	u32 keycreate_sid;   /* keycreate SID */
+ 	u32 sockcreate_sid;  /* fscreate SID */
+-	u32 ptrace_sid;      /* SID of ptrace parent */
+ };
+ 
+ struct inode_security_struct {
 --- linux-2.6/security/selinux/hooks.c.utrace-ptrace-compat
 +++ linux-2.6/security/selinux/hooks.c
 @@ -21,7 +21,7 @@
@@ -2630,24 +2731,115 @@
  #include <linux/errno.h>
  #include <linux/sched.h>
  #include <linux/security.h>
-@@ -1397,7 +1397,7 @@ static int selinux_ptrace(struct task_st
+@@ -159,7 +159,7 @@ static int task_alloc_security(struct ta
+ 		return -ENOMEM;
+ 
+ 	tsec->task = task;
+-	tsec->osid = tsec->sid = tsec->ptrace_sid = SECINITSID_UNLABELED;
++	tsec->osid = tsec->sid = SECINITSID_UNLABELED;
+ 	task->security = tsec;
  
- 	rc = task_has_perm(parent, child, PROCESS__PTRACE);
- 	/* Save the SID of the tracing process for later use in apply_creds. */
+ 	return 0;
+@@ -1387,19 +1387,13 @@ static int inode_security_set_sid(struct
+ 
+ static int selinux_ptrace(struct task_struct *parent, struct task_struct *child)
+ {
+-	struct task_security_struct *psec = parent->security;
+-	struct task_security_struct *csec = child->security;
+ 	int rc;
+ 
+ 	rc = secondary_ops->ptrace(parent,child);
+ 	if (rc)
+ 		return rc;
+ 
+-	rc = task_has_perm(parent, child, PROCESS__PTRACE);
+-	/* Save the SID of the tracing process for later use in apply_creds. */
 -	if (!(child->ptrace & PT_PTRACED) && !rc)
-+	if (/* XXX !(child->ptrace & PT_PTRACED) && */ !rc)
- 		csec->ptrace_sid = psec->sid;
- 	return rc;
+-		csec->ptrace_sid = psec->sid;
+-	return rc;
++	return task_has_perm(parent, child, PROCESS__PTRACE);
+ }
+ 
+ static int selinux_capget(struct task_struct *target, kernel_cap_t *effective,
+@@ -1821,12 +1815,24 @@ static void selinux_bprm_apply_creds(str
+ 		/* Check for ptracing, and update the task SID if ok.
+ 		   Otherwise, leave SID unchanged and kill. */
+ 		if (unsafe & (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) {
+-			rc = avc_has_perm(tsec->ptrace_sid, sid,
+-					  SECCLASS_PROCESS, PROCESS__PTRACE,
+-					  NULL);
+-			if (rc) {
+-				bsec->unsafe = 1;
+-				return;
++			struct task_struct *t;
++
++			rcu_read_lock();
++			t = tracehook_tracer_task(current);
++			if (unlikely(t == NULL))
++				rcu_read_unlock();
++			else {
++				struct task_security_struct *sec = t->security;
++				u32 ptsid = sec->sid;
++				rcu_read_unlock();
++
++				rc = avc_has_perm(ptsid, sid,
++						  SECCLASS_PROCESS,
++						  PROCESS__PTRACE, NULL);
++				if (rc) {
++					bsec->unsafe = 1;
++					return;
++				}
+ 			}
+ 		}
+ 		tsec->sid = sid;
+@@ -2684,11 +2690,6 @@ static int selinux_task_alloc_security(s
+ 	tsec2->keycreate_sid = tsec1->keycreate_sid;
+ 	tsec2->sockcreate_sid = tsec1->sockcreate_sid;
+ 
+-	/* Retain ptracer SID across fork, if any.
+-	   This will be reset by the ptrace hook upon any
+-	   subsequent ptrace_attach operations. */
+-	tsec2->ptrace_sid = tsec1->ptrace_sid;
+-
+ 	return 0;
  }
-@@ -4385,7 +4385,7 @@ static int selinux_setprocattr(struct ta
+ 
+@@ -4293,6 +4294,7 @@ static int selinux_setprocattr(struct ta
+ 			       char *name, void *value, size_t size)
+ {
+ 	struct task_security_struct *tsec;
++	struct task_struct *tracer;
+ 	u32 sid = 0;
+ 	int error;
+ 	char *str = value;
+@@ -4381,18 +4383,24 @@ static int selinux_setprocattr(struct ta
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and fail. */
  		task_lock(p);
 -		if (p->ptrace & PT_PTRACED) {
-+		if (tracehook_security_ptrace(p)) {
- 			error = avc_has_perm_noaudit(tsec->ptrace_sid, sid,
+-			error = avc_has_perm_noaudit(tsec->ptrace_sid, sid,
++		rcu_read_lock();
++		tracer = tracehook_tracer_task(p);
++		if (tracer != NULL) {
++			struct task_security_struct *ptsec = tracer->security;
++			u32 ptsid = ptsec->sid;
++			rcu_read_unlock();
++			error = avc_has_perm_noaudit(ptsid, sid,
  						     SECCLASS_PROCESS,
  						     PROCESS__PTRACE, &avd);
+ 			if (!error)
+ 				tsec->sid = sid;
+ 			task_unlock(p);
+-			avc_audit(tsec->ptrace_sid, sid, SECCLASS_PROCESS,
++			avc_audit(ptsid, sid, SECCLASS_PROCESS,
+ 				  PROCESS__PTRACE, &avd, error, NULL);
+ 			if (error)
+ 				return error;
+ 		} else {
++			rcu_read_unlock();
+ 			tsec->sid = sid;
+ 			task_unlock(p);
+ 		}
 --- linux-2.6/kernel/fork.c.utrace-ptrace-compat
 +++ linux-2.6/kernel/fork.c
 @@ -36,7 +36,7 @@
@@ -2787,7 +2979,7 @@
  			wait_for_completion(&vfork);
 -			if (unlikely (current->ptrace & PT_TRACE_VFORK_DONE))
 -				ptrace_notify ((PTRACE_EVENT_VFORK_DONE << 8) | SIGTRAP);
-+			tracehook_report_vfork_done(p);
++			tracehook_report_vfork_done(p, nr);
  		}
  	} else {
  		free_pid(pid);
@@ -2849,7 +3041,7 @@
  
  /*
   * Handle magic process-wide effects of stop/continue signals.
-@@ -887,7 +884,7 @@ __group_complete_signal(int sig, struct 
+@@ -896,7 +893,7 @@ __group_complete_signal(int sig, struct 
  	 */
  	if (sig_fatal(p, sig) && !(p->signal->flags & SIGNAL_GROUP_EXIT) &&
  	    !sigismember(&t->real_blocked, sig) &&
@@ -2858,7 +3050,7 @@
  		/*
  		 * This signal will be fatal to the whole group.
  		 */
-@@ -1429,8 +1426,7 @@ void do_notify_parent(struct task_struct
+@@ -1438,8 +1435,7 @@ void do_notify_parent(struct task_struct
   	/* do_notify_parent_cldstop should have been called instead.  */
   	BUG_ON(tsk->state & (TASK_STOPPED|TASK_TRACED));
  
@@ -2868,7 +3060,7 @@
  
  	info.si_signo = sig;
  	info.si_errno = 0;
-@@ -1455,7 +1451,7 @@ void do_notify_parent(struct task_struct
+@@ -1464,7 +1460,7 @@ void do_notify_parent(struct task_struct
  
  	psig = tsk->parent->sighand;
  	spin_lock_irqsave(&psig->siglock, flags);
@@ -2877,7 +3069,7 @@
  	    (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN ||
  	     (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) {
  		/*
-@@ -1483,20 +1479,13 @@ void do_notify_parent(struct task_struct
+@@ -1492,20 +1488,13 @@ void do_notify_parent(struct task_struct
  	spin_unlock_irqrestore(&psig->siglock, flags);
  }
  
@@ -2899,7 +3091,7 @@
  	info.si_signo = SIGCHLD;
  	info.si_errno = 0;
  	info.si_pid = tsk->pid;
-@@ -1521,6 +1510,15 @@ static void do_notify_parent_cldstop(str
+@@ -1530,6 +1519,15 @@ static void do_notify_parent_cldstop(str
   		BUG();
   	}
  
@@ -2915,7 +3107,7 @@
  	sighand = parent->sighand;
  	spin_lock_irqsave(&sighand->siglock, flags);
  	if (sighand->action[SIGCHLD-1].sa.sa_handler != SIG_IGN &&
-@@ -1533,110 +1531,6 @@ static void do_notify_parent_cldstop(str
+@@ -1542,110 +1540,6 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -3026,7 +3218,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1645,7 +1539,7 @@ finish_stop(int stop_count)
+@@ -1654,7 +1548,7 @@ finish_stop(int stop_count)
  	 * a group stop in progress and we are the last to stop,
  	 * report to the parent.  When ptraced, every thread reports itself.
  	 */
@@ -3035,7 +3227,7 @@
  		read_lock(&tasklist_lock);
  		do_notify_parent_cldstop(current, CLD_STOPPED);
  		read_unlock(&tasklist_lock);
-@@ -1770,44 +1664,24 @@ relock:
+@@ -1779,44 +1673,24 @@ relock:
  		    handle_group_stop())
  			goto relock;
  
@@ -3096,7 +3288,7 @@
  		if (ka->sa.sa_handler == SIG_IGN) /* Do nothing.  */
  			continue;
  		if (ka->sa.sa_handler != SIG_DFL) {
-@@ -1852,7 +1726,7 @@ relock:
+@@ -1861,7 +1735,7 @@ relock:
  				spin_lock_irq(&current->sighand->siglock);
  			}
  
@@ -3105,7 +3297,7 @@
  				/* It released the siglock.  */
  				goto relock;
  			}
-@@ -1879,13 +1753,13 @@ relock:
+@@ -1888,13 +1762,13 @@ relock:
  			 * first and our do_group_exit call below will use
  			 * that value and ignore the one we pass it.
  			 */
@@ -3121,7 +3313,7 @@
  		/* NOTREACHED */
  	}
  	spin_unlock_irq(&current->sighand->siglock);
-@@ -1898,7 +1772,6 @@ EXPORT_SYMBOL(flush_signals);
+@@ -1907,7 +1781,6 @@ EXPORT_SYMBOL(flush_signals);
  EXPORT_SYMBOL(force_sig);
  EXPORT_SYMBOL(kill_pg);
  EXPORT_SYMBOL(kill_proc);
@@ -3131,7 +3323,7 @@
  EXPORT_SYMBOL(sigprocmask);
 --- linux-2.6/kernel/utrace.c.utrace-ptrace-compat
 +++ linux-2.6/kernel/utrace.c
-@@ -0,0 +1,1520 @@
+@@ -0,0 +1,1526 @@
 +#include <linux/utrace.h>
 +#include <linux/tracehook.h>
 +#include <linux/err.h>
@@ -4070,7 +4262,7 @@
 + * Called iff UTRACE_EVENT(VFORK_DONE) flag is set.
 + */
 +void
-+utrace_report_vfork_done(struct task_struct *child)
++utrace_report_vfork_done(pid_t child_pid)
 +{
 +	struct task_struct *tsk = current;
 +	struct utrace *utrace = tsk->utrace;
@@ -4083,7 +4275,7 @@
 +	list_for_each_safe_rcu(pos, next, &utrace->engines) {
 +		engine = list_entry(pos, struct utrace_attached_engine, entry);
 +		if (engine->flags & UTRACE_EVENT(VFORK_DONE))
-+			REPORT(report_vfork_done, child);
++			REPORT(report_vfork_done, child_pid);
 +		if (action & UTRACE_ACTION_HIDE)
 +			break;
 +	}
@@ -4568,16 +4760,23 @@
 +
 +
 +/*
-+ * Return the value to display after "TracerPid:" in /proc/PID/status.
-+ * Called without locks.
++ * Return the task_struct for the task using ptrace on this one, or NULL.
++ * Must be called with rcu_read_lock held to keep the returned struct alive.
++ *
++ * At exec time, this may be called with task_lock(p) still held from when
++ * tracehook_unsafe_exec was just called.  In that case it must give
++ * results consistent with those unsafe_exec results, i.e. non-NULL if
++ * any LSM_UNSAFE_PTRACE_* bits were set.
++ *
++ * The value is also used to display after "TracerPid:" in /proc/PID/status,
++ * where it is called with only rcu_read_lock held.
 + */
-+pid_t
-+utrace_tracer_pid(struct task_struct *target)
++struct task_struct *
++utrace_tracer_task(struct task_struct *target)
 +{
 +	struct utrace *utrace;
-+	pid_t pid = 0;
++	struct task_struct *tracer = NULL;
 +
-+	rcu_read_lock();
 +	utrace = rcu_dereference(target->utrace);
 +	if (utrace != NULL) {
 +		struct list_head *pos, *next;
@@ -4587,16 +4786,15 @@
 +			engine = list_entry(pos, struct utrace_attached_engine,
 +					    entry);
 +			ops = rcu_dereference(engine->ops);
-+			if (ops->tracer_pid) {
-+				pid = (*ops->tracer_pid)(engine, target);
-+				if (pid)
++			if (ops->tracer_task) {
++				tracer = (*ops->tracer_task)(engine, target);
++				if (tracer != NULL)
 +					break;
 +			}
 +		}
 +	}
-+	rcu_read_unlock();
 +
-+	return pid;
++	return tracer;
 +}
 +
 +int
@@ -5054,23 +5252,7 @@
  static long do_wait(pid_t pid, int options, struct siginfo __user *infop,
  		    int __user *stat_addr, struct rusage __user *ru)
  {
-@@ -1449,13 +1316,14 @@ repeat:
- 	 */
- 	flag = 0;
- 	current->state = TASK_INTERRUPTIBLE;
--	read_lock(&tasklist_lock);
- 	tsk = current;
-+	rcu_read_lock();
- 	do {
- 		struct task_struct *p;
- 		struct list_head *_p;
- 		int ret;
- 
-+		read_lock(&tasklist_lock);
- 		list_for_each(_p,&tsk->children) {
- 			p = list_entry(_p, struct task_struct, sibling);
- 
-@@ -1465,26 +1333,17 @@ repeat:
+@@ -1465,26 +1332,17 @@ repeat:
  
  			switch (p->state) {
  			case TASK_TRACED:
@@ -5101,7 +5283,7 @@
  					continue;
  				retval = wait_task_stopped(p, ret == 2,
  							   (options & WNOWAIT),
-@@ -1509,6 +1368,10 @@ repeat:
+@@ -1509,6 +1367,10 @@ repeat:
  						goto check_continued;
  					if (!likely(options & WEXITED))
  						continue;
@@ -5112,7 +5294,7 @@
  					retval = wait_task_zombie(
  						p, (options & WNOWAIT),
  						infop, stat_addr, ru);
-@@ -1525,6 +1388,8 @@ check_continued:
+@@ -1525,6 +1387,8 @@ check_continued:
  				flag = 1;
  				if (!unlikely(options & WCONTINUED))
  					continue;
@@ -5121,7 +5303,7 @@
  				retval = wait_task_continued(
  					p, (options & WNOWAIT),
  					infop, stat_addr, ru);
-@@ -1533,23 +1398,25 @@ check_continued:
+@@ -1533,16 +1397,15 @@ check_continued:
  				break;
  			}
  		}
@@ -5133,30 +5315,20 @@
 -					continue;
 -				flag = 1;
 -				break;
-+		read_unlock(&tasklist_lock);
+-			}
 +
 +		retval = ptrace_do_wait(tsk, pid, options,
 +					infop, stat_addr, ru);
 +		if (retval != -ECHILD) {
 +			flag = 1;
-+			if (retval) {
-+				rcu_read_unlock();
++			if (retval != 0) /* He released the lock.  */
 +				goto end;
- 			}
  		}
 +
  		if (options & __WNOTHREAD)
  			break;
  		tsk = next_thread(tsk);
- 		BUG_ON(tsk->signal != current->signal);
- 	} while (tsk != current);
-+	rcu_read_unlock();
- 
--	read_unlock(&tasklist_lock);
- 	if (flag) {
- 		retval = 0;
- 		if (options & WNOHANG)
-@@ -1566,7 +1433,7 @@ end:
+@@ -1566,7 +1429,7 @@ end:
  	remove_wait_queue(&current->signal->wait_chldexit,&wait);
  	if (infop) {
  		if (retval > 0)
@@ -5407,7 +5579,7 @@
  /*
   * Access another process' address space.
   * Source/target buffer must be kernel space, 
-@@ -295,249 +125,1303 @@ int access_process_vm(struct task_struct
+@@ -295,249 +125,1341 @@ int access_process_vm(struct task_struct
  	return buf - old_buf;
  }
  
@@ -5612,7 +5784,9 @@
 +			retval = -EPERM;
 +	}
 +	else {
++		task_lock(current);
 +		retval = security_ptrace(current->parent, current);
++		task_unlock(current);
 +		if (!retval)
 +			retval = ptrace_setup(current, engine,
 +					      current->parent, 0, 0);
@@ -5681,7 +5855,7 @@
 +	struct ptrace_state *state = (struct ptrace_state *) engine->data;
 +	/*
 +	 * Clearing ->data before detach makes sure an unrelated task
-+	 * calling into ptrace_tracer_pid won't try to touch stale state.
++	 * calling into ptrace_tracer_task won't try to touch stale state.
 +	 */
 +	rcu_assign_pointer(engine->data, 0UL);
 +	utrace_detach(task, engine);
@@ -5718,8 +5892,7 @@
 +		list_for_each_entry_rcu(state, &tsk->ptracees, entry) {
 +			rcu_assign_pointer(state->engine->data, 0UL);
 +			utrace_detach(state->task, state->engine);
- 		}
--		spin_unlock_irq(&child->sighand->siglock);
++		}
 +
 +		/*
 +		 * Now clear out our list and clean up our data structures.
@@ -5729,7 +5902,8 @@
 +		list_for_each_entry_safe(state, next, &tsk->ptracees, entry) {
 +			list_del_rcu(&state->entry);
 +			ptrace_done(state);
-+		}
+ 		}
+-		spin_unlock_irq(&child->sighand->siglock);
 +		task_unlock(tsk);
  	}
 -	read_unlock(&tasklist_lock);
@@ -5791,7 +5965,7 @@
 +
 +		return utrace_inject_signal(target, engine,
 +					    UTRACE_ACTION_RESUME, info, NULL);
- 	}
++	}
 +
 +	return 0;
 +}
@@ -5820,7 +5994,7 @@
 +			return -EINVAL;
 +		pos = (addr - regset->bias) * regset->size;
 +		n = 1;
-+	}
+ 	}
 +	else
 +		n = nregs == 0 ? regset->n : nregs;
 +
@@ -5979,6 +6153,21 @@
 +		utrace_set_flags(child, engine,
 +				 engine->flags | UTRACE_ACTION_QUIESCE);
 +	}
++
++	/*
++	 * We do this for all requests to match traditional ptrace behavior.
++	 * If the machine state synchronization done at context switch time
++	 * includes e.g. writing back to user memory, we want to make sure
++	 * that has finished before a PTRACE_PEEKDATA can fetch the results.
++	 * On most machines, only regset data is affected by context switch
++	 * and calling utrace_regset later on will take care of that, so
++	 * this is superfluous.
++	 *
++	 * To do this purely in utrace terms, we could do:
++	 *  (void) utrace_regset(child, engine, utrace_native_view(child), 0);
++	 */
++	wait_task_inactive(child);
++
 +	if (child->exit_state)
 +		goto out_tsk;
 +
@@ -6345,15 +6534,20 @@
  	return ret;
  }
 +#endif
++
  
 -/**
 - * ptrace_traceme  --  helper for PTRACE_TRACEME
 - *
 - * Performs checks and sets PT_PTRACED.
 - * Should be used by all ptrace implementations for PTRACE_TRACEME.
-- */
++/*
++ * We're called with tasklist_lock held for reading.
++ * If we return -ECHILD or zero, next_thread(tsk) must still be valid to use.
++ * If we return another error code, or a successful PID value, we
++ * release tasklist_lock first.
+  */
 -int ptrace_traceme(void)
-+
 +int
 +ptrace_do_wait(struct task_struct *tsk,
 +	       pid_t pid, int options, struct siginfo __user *infop,
@@ -6430,6 +6624,16 @@
 +		why = CLD_TRAPPED;
 +		status = (p->exit_code << 8) | 0x7f;
 +	}
+ 
+ 	/*
+-	 * Are we already being traced?
++	 * At this point we are committed to a successful return
++	 * or a user error return.  Release the tasklist_lock.
+ 	 */
+-	task_lock(current);
+-	if (!(current->ptrace & PT_PTRACED)) {
+-		ret = security_ptrace(current->parent, current);
++	read_unlock(&tasklist_lock);
 +
 +	if (rusagep)
 +		err = getrusage(p, RUSAGE_BOTH, rusagep);
@@ -6454,13 +6658,7 @@
 +		struct utrace *utrace;
 +
 +		err = p->pid;
- 
--	/*
--	 * Are we already being traced?
--	 */
--	task_lock(current);
--	if (!(current->ptrace & PT_PTRACED)) {
--		ret = security_ptrace(current->parent, current);
++
  		/*
 -		 * Set the ptrace bit in the process ptrace flags.
 +		 * If this was a non-death report, the child might now be
@@ -6546,10 +6744,7 @@
  	 */
 -	if (pid == 1)
 -		return ERR_PTR(-EPERM);
-+	wake_up_interruptible_sync(&parent->signal->wait_chldexit);
-+	spin_unlock_irqrestore(&sighand->siglock, flags);
-+}
- 
+-
 -	read_lock(&tasklist_lock);
 -	child = find_task_by_pid(pid);
 -	if (child)
@@ -6558,10 +6753,18 @@
 -	if (!child)
 -		return ERR_PTR(-ESRCH);
 -	return child;
++	wake_up_interruptible_sync(&parent->signal->wait_chldexit);
++	spin_unlock_irqrestore(&sighand->siglock, flags);
+ }
+ 
+-#ifndef __ARCH_SYS_PTRACE
+-asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
 +static u32
 +ptrace_report(struct utrace_attached_engine *engine, struct task_struct *tsk,
 +	      int code)
-+{
+ {
+-	struct task_struct *child;
+-	long ret;
 +	struct ptrace_state *state = (struct ptrace_state *) engine->data;
 +
 +#ifdef PTRACE_DEBUG
@@ -6576,6 +6779,21 @@
 +	}
 +#endif
 +
++	BUG_ON(state->u.live.stopped);
+ 
+ 	/*
+-	 * This lock_kernel fixes a subtle race with suid exec
++	 * Set our QUIESCE flag right now, before notifying the tracer.
++	 * We do this before setting state->u.live.stopped rather than
++	 * by using UTRACE_ACTION_NEWSTATE in our return value, to
++	 * ensure that the tracer can't get the notification and then
++	 * try to resume us with PTRACE_CONT before we set the flag.
+ 	 */
+-	lock_kernel();
+-	if (request == PTRACE_TRACEME) {
+-		ret = ptrace_traceme();
++	utrace_set_flags(tsk, engine, engine->flags | UTRACE_ACTION_QUIESCE);
++
 +	state->u.live.stopped = 1;
 +	state->u.live.reported = 0;
 +	tsk->exit_code = code;
@@ -6586,29 +6804,18 @@
 +	       current->pid, current->exit_code);
 +#endif
 +
-+	return (UTRACE_ACTION_NEWSTATE
-+		| UTRACE_ACTION_QUIESCE | UTRACE_ACTION_NOREAP);
- }
- 
--#ifndef __ARCH_SYS_PTRACE
--asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
++	return UTRACE_ACTION_RESUME;
++}
++
 +static inline u32
 +ptrace_event(struct utrace_attached_engine *engine, struct task_struct *tsk,
 +	     int event)
- {
--	struct task_struct *child;
--	long ret;
++{
 +	struct ptrace_state *state = (struct ptrace_state *) engine->data;
 +	state->u.live.syscall = 0;
 +	return ptrace_report(engine, tsk, (event << 8) | SIGTRAP);
 +}
- 
--	/*
--	 * This lock_kernel fixes a subtle race with suid exec
--	 */
--	lock_kernel();
--	if (request == PTRACE_TRACEME) {
--		ret = ptrace_traceme();
++
 +
 +static u32
 +ptrace_report_death(struct utrace_attached_engine *engine,
@@ -6718,8 +6925,11 @@
 -	return ret;
 +static u32
 +ptrace_report_vfork_done(struct utrace_attached_engine *engine,
-+			 struct task_struct *parent, struct task_struct *child)
++			 struct task_struct *parent, pid_t child_pid)
 +{
++	struct ptrace_state *state = (struct ptrace_state *) engine->data;
++	state->u.live.have_eventmsg = 1;
++	state->u.live.u.eventmsg = child_pid;
 +	return ptrace_event(engine, parent, PTRACE_EVENT_VFORK_DONE);
 +}
 +
@@ -6744,7 +6954,8 @@
 +		   struct task_struct *tsk, int type)
 +{
 +	return UTRACE_ACTION_RESUME; /* XXX */
-+}
+ }
+-#endif /* __ARCH_SYS_PTRACE */
 +
 +static u32
 +ptrace_report_exec(struct utrace_attached_engine *engine,
@@ -6787,8 +6998,7 @@
 +			    struct task_struct *tsk, struct pt_regs *regs)
 +{
 +	return ptrace_report_syscall(engine, tsk, regs, 0);
- }
--#endif /* __ARCH_SYS_PTRACE */
++}
 +
 +static u32
 +ptrace_report_exit(struct utrace_attached_engine *engine,
@@ -6811,24 +7021,20 @@
 +	return unsafe;
 +}
 +
-+static pid_t
-+ptrace_tracer_pid(struct utrace_attached_engine *engine,
-+		  struct task_struct *target)
++static struct task_struct *
++ptrace_tracer_task(struct utrace_attached_engine *engine,
++		   struct task_struct *target)
 +{
 +	struct ptrace_state *state;
-+	pid_t pid;
 +
 +	/*
 +	 * This call is not necessarily made by the target task,
 +	 * so ptrace might be getting detached while we run here.
 +	 * The state pointer will be NULL if that happens.
 +	 */
-+	rcu_read_lock();
 +	state = rcu_dereference((struct ptrace_state *) engine->data);
-+	pid = state == NULL ? 0 : state->parent->pid;
-+	rcu_read_unlock();
 +
-+	return pid;
++	return state == NULL ? NULL : state->parent;
 +}
 +
 +static int
@@ -6868,7 +7074,7 @@
 +	.report_exit = ptrace_report_exit,
 +	.report_death = ptrace_report_death,
 +	.unsafe_exec = ptrace_unsafe_exec,
-+	.tracer_pid = ptrace_tracer_pid,
++	.tracer_task = ptrace_tracer_task,
 +	.allow_access_process_vm = ptrace_allow_access_process_vm,
 +};
 +
@@ -6974,18 +7180,36 @@
  #include <linux/rcupdate.h>
  #include <linux/delayacct.h>
  
-@@ -175,8 +176,8 @@ static inline char * task_state(struct t
+@@ -158,10 +159,17 @@ static inline const char * get_task_stat
+ 
+ static inline char * task_state(struct task_struct *p, char *buffer)
+ {
++	struct task_struct *tracer;
++	pid_t tracer_pid;
+ 	struct group_info *group_info;
+ 	int g;
+ 	struct fdtable *fdt = NULL;
+ 
++	rcu_read_lock();
++	tracer = tracehook_tracer_task(p);
++	tracer_pid = tracer == NULL ? 0 : tracer->pid;
++	rcu_read_unlock();
++
+ 	read_lock(&tasklist_lock);
+ 	buffer += sprintf(buffer,
+ 		"State:\t%s\n"
+@@ -175,8 +183,8 @@ static inline char * task_state(struct t
  		get_task_state(p),
  		(p->sleep_avg/1024)*100/(1020000000/1024),
  	       	p->tgid,
 -		p->pid, pid_alive(p) ? p->group_leader->real_parent->tgid : 0,
 -		pid_alive(p) && p->ptrace ? p->parent->pid : 0,
 +		p->pid, pid_alive(p) ? p->group_leader->parent->tgid : 0,
-+		tracehook_tracer_pid(p),
++		tracer_pid,
  		p->uid, p->euid, p->suid, p->fsuid,
  		p->gid, p->egid, p->sgid, p->fsgid);
  	read_unlock(&tasklist_lock);
-@@ -386,7 +387,7 @@ static int do_task_stat(struct task_stru
+@@ -386,7 +394,7 @@ static int do_task_stat(struct task_stru
  			stime = cputime_add(stime, task->signal->stime);
  		}
  	}
@@ -10353,7 +10577,7 @@
   * Copyright (C) 1997 Jakub Jelinek (jj at sunsite.mff.cuni.cz)
   *
   * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson,
-@@ -11,103 +11,597 @@
+@@ -11,103 +11,598 @@
   */
  
  #include <linux/kernel.h>
@@ -10383,7 +10607,13 @@
  #include <asm/page.h>
  #include <asm/cpudata.h>
 +#include <asm/psrcompat.h>
-+
+ 
+-/* Returning from ptrace is a bit tricky because the syscall return
+- * low level code assumes any value returned which is negative and
+- * is a valid errno will mean setting the condition codes to indicate
+- * an error return.  This doesn't work, so we have this hook.
+- */
+-static inline void pt_error_return(struct pt_regs *regs, unsigned long error)
 +#define GENREG_G0	0
 +#define GENREG_O0	8
 +#define GENREG_L0	16
@@ -10399,7 +10629,11 @@
 +		       const struct utrace_regset *regset,
 +		       unsigned int pos, unsigned int count,
 +		       void *kbuf, void __user *ubuf)
-+{
+ {
+-	regs->u_regs[UREG_I0] = error;
+-	regs->tstate |= (TSTATE_ICARRY | TSTATE_XCARRY);
+-	regs->tpc = regs->tnpc;
+-	regs->tnpc += 4;
 +	struct pt_regs *regs = task_pt_regs(target);
 +	int err;
 +
@@ -10449,16 +10683,12 @@
 +	}
 +
 +	return err;
-+}
+ }
  
--/* Returning from ptrace is a bit tricky because the syscall return
-- * low level code assumes any value returned which is negative and
-- * is a valid errno will mean setting the condition codes to indicate
-- * an error return.  This doesn't work, so we have this hook.
+-static inline void pt_succ_return(struct pt_regs *regs, unsigned long value)
 +/* Consistent with signal handling, we only allow userspace to
 + * modify the %asi, %icc, and %xcc fields of the %tstate register.
-  */
--static inline void pt_error_return(struct pt_regs *regs, unsigned long error)
++ */
 +#define TSTATE_DEBUGCHANGE	(TSTATE_ASI | TSTATE_ICC | TSTATE_XCC)
 +
 +static int genregs_set(struct task_struct *target,
@@ -10466,8 +10696,8 @@
 +		       unsigned int pos, unsigned int count,
 +		       const void *kbuf, const void __user *ubuf)
  {
--	regs->u_regs[UREG_I0] = error;
--	regs->tstate |= (TSTATE_ICARRY | TSTATE_XCARRY);
+-	regs->u_regs[UREG_I0] = value;
+-	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
 -	regs->tpc = regs->tnpc;
 -	regs->tnpc += 4;
 +	struct pt_regs *regs = task_pt_regs(target);
@@ -10532,7 +10762,8 @@
 +	return err;
  }
  
--static inline void pt_succ_return(struct pt_regs *regs, unsigned long value)
+-static inline void
+-pt_succ_return_linux(struct pt_regs *regs, unsigned long value, void __user *addr)
 +#define FPREG_F0	0
 +#define FPREG_FSR	32
 +#define FPREG_GSR	33
@@ -10545,10 +10776,16 @@
 +		      unsigned int pos, unsigned int count,
 +		      void *kbuf, void __user *ubuf)
  {
--	regs->u_regs[UREG_I0] = value;
--	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
--	regs->tpc = regs->tnpc;
--	regs->tnpc += 4;
+-	if (test_thread_flag(TIF_32BIT)) {
+-		if (put_user(value, (unsigned int __user *) addr)) {
+-			pt_error_return(regs, EFAULT);
+-			return;
+-		}
+-	} else {
+-		if (put_user(value, (long __user *) addr)) {
+-			pt_error_return(regs, EFAULT);
+-			return;
+-		}
 +	struct thread_info *t = task_thread_info(target);
 +	int err;
 +
@@ -10572,27 +10809,26 @@
 +			*(unsigned long *) kbuf = regs->fprs;
 +		else if (put_user(regs->fprs, (unsigned long __user *) ubuf))
 +			return -EFAULT;
-+	}
+ 	}
+-	regs->u_regs[UREG_I0] = 0;
+-	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
+-	regs->tpc = regs->tnpc;
+-	regs->tnpc += 4;
 +
 +	return err;
  }
  
--static inline void
--pt_succ_return_linux(struct pt_regs *regs, unsigned long value, void __user *addr)
+-static void
+-pt_os_succ_return (struct pt_regs *regs, unsigned long val, void __user *addr)
 +static int fpregs_set(struct task_struct *target,
 +		      const struct utrace_regset *regset,
 +		      unsigned int pos, unsigned int count,
 +		      const void *kbuf, const void __user *ubuf)
  {
--	if (test_thread_flag(TIF_32BIT)) {
--		if (put_user(value, (unsigned int __user *) addr)) {
--			pt_error_return(regs, EFAULT);
--			return;
--		}
--	} else {
--		if (put_user(value, (long __user *) addr)) {
--			pt_error_return(regs, EFAULT);
--			return;
+-	if (current->personality == PER_SUNOS)
+-		pt_succ_return (regs, val);
+-	else
+-		pt_succ_return_linux (regs, val, addr);
 +	struct thread_info *t = task_thread_info(target);
 +	int err;
 +
@@ -10619,8 +10855,10 @@
 +	}
 +
 +	return err;
-+}
-+
+ }
+ 
+-/* #define ALLOW_INIT_TRACING */
+-/* #define DEBUG_PTRACE */
 +static const struct utrace_regset native_regsets[] = {
 +	{
 +		.n = SPARC64_NGREGS,
@@ -10633,12 +10871,21 @@
 +		.get = fpregs_get, .set = fpregs_set
 +	},
 +};
-+
+ 
+-#ifdef DEBUG_PTRACE
+-char *pt_rq [] = {
+-	/* 0  */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
+-	/* 4  */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
+-	/* 8  */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
+-	/* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
+-	/* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
+-	/* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
+-	/* 24 */ "SYSCALL", ""
 +const struct utrace_regset_view utrace_sparc64_native_view = {
 +	.name = UTS_MACHINE, .e_machine = ELF_ARCH,
 +	.regsets = native_regsets,
 +	.n = sizeof native_regsets / sizeof native_regsets[0],
-+};
+ };
 +EXPORT_SYMBOL_GPL(utrace_sparc64_native_view);
 +
 +#ifdef CONFIG_COMPAT
@@ -10722,12 +10969,8 @@
 +				ubuf += sizeof(u32);
 +			pos += sizeof(u32);
 +			count -= sizeof(u32);
- 		}
- 	}
--	regs->u_regs[UREG_I0] = 0;
--	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
--	regs->tpc = regs->tnpc;
--	regs->tnpc += 4;
++		}
++	}
 +
 +	if (count > 0 && pos == (GENREG32_PSR * 4)) {
 +		u32 psr = tstate_to_psr(regs->tstate);
@@ -10791,19 +11034,13 @@
 +	}
 +
 +	return 0;
- }
- 
--static void
--pt_os_succ_return (struct pt_regs *regs, unsigned long val, void __user *addr)
++}
++
 +static int genregs32_set(struct task_struct *target,
 +			 const struct utrace_regset *regset,
 +			 unsigned int pos, unsigned int count,
 +			 const void *kbuf, const void __user *ubuf)
- {
--	if (current->personality == PER_SUNOS)
--		pt_succ_return (regs, val);
--	else
--		pt_succ_return_linux (regs, val, addr);
++{
 +	struct pt_regs *regs = task_pt_regs(target);
 +
 +	while (count > 0 && pos < (GENREG32_L0 * 4)) {
@@ -10917,25 +11154,8 @@
 +	/* Ignore WIM and TBR */
 +
 +	return 0;
- }
- 
--/* #define ALLOW_INIT_TRACING */
--/* #define DEBUG_PTRACE */
-+#define FPREG32_F0	0
-+#define FPREG32_FSR	32
- 
--#ifdef DEBUG_PTRACE
--char *pt_rq [] = {
--	/* 0  */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
--	/* 4  */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
--	/* 8  */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
--	/* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
--	/* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
--	/* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
--	/* 24 */ "SYSCALL", ""
--};
--#endif
-+#define SPARC32_NFPREGS	33
++}
+ #endif
  
 -/*
 - * Called by kernel/ptrace.c when detaching..
@@ -10943,6 +11163,11 @@
 - * Make sure single step bits etc are not set.
 - */
 -void ptrace_disable(struct task_struct *child)
++#define FPREG32_F0	0
++#define FPREG32_FSR	32
++
++#define SPARC32_NFPREGS	33
++
 +static int fpregs32_get(struct task_struct *target,
 +			const struct utrace_regset *regset,
 +			unsigned int pos, unsigned int count,
@@ -11015,7 +11240,20 @@
  /* To get the necessary page struct, access_process_vm() first calls
   * get_user_pages().  This has done a flush_dcache_page() on the
   * accessed page.  Then our caller (copy_{to,from}_user_page()) did
-@@ -644,7 +1138,8 @@ out:
+@@ -167,6 +662,7 @@ void flush_ptrace_access(struct vm_area_
+ 	}
+ }
+ 
++#if 0				/* XXX */
+ asmlinkage void do_ptrace(struct pt_regs *regs)
+ {
+ 	int request = regs->u_regs[UREG_I0];
+@@ -640,11 +1136,13 @@ out_tsk:
+ out:
+ 	unlock_kernel();
+ }
++#endif
+ 
  asmlinkage void syscall_trace(struct pt_regs *regs, int syscall_exit_p)
  {
  	/* do the secure computing check first */
@@ -11025,21 +11263,21 @@
  
  	if (unlikely(current->audit_context) && syscall_exit_p) {
  		unsigned long tstate = regs->tstate;
-@@ -656,26 +1151,9 @@ asmlinkage void syscall_trace(struct pt_
+@@ -656,26 +1154,9 @@ asmlinkage void syscall_trace(struct pt_
  		audit_syscall_exit(result, regs->u_regs[UREG_I0]);
  	}
  
 -	if (!(current->ptrace & PT_PTRACED))
 -		goto out;
-+	if (test_thread_flag(TIF_SYSCALL_TRACE))
-+		tracehook_report_syscall(regs, syscall_exit_p);
- 
+-
 -	if (!test_thread_flag(TIF_SYSCALL_TRACE))
 -		goto out;
 -
 -	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
 -				 ? 0x80 : 0));
--
++	if (test_thread_flag(TIF_SYSCALL_TRACE))
++		tracehook_report_syscall(regs, syscall_exit_p);
+ 
 -	/*
 -	 * this isn't the same as continuing with a signal, but it will do
 -	 * for normal use.  strace only continues with a signal if the
@@ -11134,6 +11372,26 @@
  	INIT_LIST_HEAD(&p->children);
  	INIT_LIST_HEAD(&p->sibling);
  	strncpy(p->comm, type, sizeof(p->comm)-1);
+--- linux-2.6/arch/ia64/kernel/signal.c.utrace-ptrace-compat
++++ linux-2.6/arch/ia64/kernel/signal.c
+@@ -10,7 +10,7 @@
+ #include <linux/errno.h>
+ #include <linux/kernel.h>
+ #include <linux/mm.h>
+-#include <linux/ptrace.h>
++#include <linux/tracehook.h>
+ #include <linux/sched.h>
+ #include <linux/signal.h>
+ #include <linux/smp.h>
+@@ -471,6 +471,8 @@ handle_signal (unsigned long sig, struct
+ 		sigaddset(&current->blocked, sig);
+ 	recalc_sigpending();
+ 	spin_unlock_irq(&current->sighand->siglock);
++
++	tracehook_report_handle_signal(sig, ka, oldset, &scr->pt);
+ 	return 1;
+ }
+ 
 --- linux-2.6/arch/ia64/kernel/fsys.S.utrace-ptrace-compat
 +++ linux-2.6/arch/ia64/kernel/fsys.S
 @@ -83,29 +83,29 @@ ENTRY(fsys_getppid)
@@ -11275,9 +11533,54 @@
  	DEFINE(IA64_TASK_SIGHAND_OFFSET,offsetof (struct task_struct, sighand));
  	DEFINE(IA64_TASK_SIGNAL_OFFSET,offsetof (struct task_struct, signal));
  	DEFINE(IA64_TASK_TGID_OFFSET, offsetof (struct task_struct, tgid));
+--- linux-2.6/arch/ia64/ia32/ia32_entry.S.utrace-ptrace-compat
++++ linux-2.6/arch/ia64/ia32/ia32_entry.S
+@@ -236,7 +236,7 @@ ia32_syscall_table:
+ 	data8 sys_setuid	/* 16-bit version */
+ 	data8 sys_getuid	/* 16-bit version */
+ 	data8 compat_sys_stime    /* 25 */
+-	data8 sys32_ptrace
++	data8 compat_sys_ptrace
+ 	data8 sys32_alarm
+ 	data8 sys_ni_syscall
+ 	data8 sys32_pause
 --- linux-2.6/arch/ia64/ia32/sys_ia32.c.utrace-ptrace-compat
 +++ linux-2.6/arch/ia64/ia32/sys_ia32.c
-@@ -1842,9 +1842,11 @@ sys32_ptrace (int request, pid_t pid, un
+@@ -1419,25 +1419,6 @@ sys32_waitpid (int pid, unsigned int *st
+ 	return compat_sys_wait4(pid, stat_addr, options, NULL);
+ }
+ 
+-static unsigned int
+-ia32_peek (struct task_struct *child, unsigned long addr, unsigned int *val)
+-{
+-	size_t copied;
+-	unsigned int ret;
+-
+-	copied = access_process_vm(child, addr, val, sizeof(*val), 0);
+-	return (copied != sizeof(ret)) ? -EIO : 0;
+-}
+-
+-static unsigned int
+-ia32_poke (struct task_struct *child, unsigned long addr, unsigned int val)
+-{
+-
+-	if (access_process_vm(child, addr, &val, sizeof(val), 1) != sizeof(val))
+-		return -EIO;
+-	return 0;
+-}
+-
+ /*
+  *  The order in which registers are stored in the ptrace regs structure
+  */
+@@ -1735,6 +1716,7 @@ restore_ia32_fpxstate (struct task_struc
+ 	return 0;
+ }
+ 
++#if 0				/* XXX */
+ asmlinkage long
+ sys32_ptrace (int request, pid_t pid, unsigned int addr, unsigned int data)
+ {
+@@ -1842,9 +1824,11 @@ sys32_ptrace (int request, pid_t pid, un
  					    compat_ptr(data));
  		break;
  
@@ -11289,6 +11592,14 @@
  
  	      case PTRACE_SYSCALL:	/* continue, stop after next syscall */
  	      case PTRACE_CONT:		/* restart after signal. */
+@@ -1865,6 +1849,7 @@ sys32_ptrace (int request, pid_t pid, un
+ 	unlock_kernel();
+ 	return ret;
+ }
++#endif
+ 
+ typedef struct {
+ 	unsigned int	ss_sp;
 --- linux-2.6/arch/ppc/kernel/asm-offsets.c.utrace-ptrace-compat
 +++ linux-2.6/arch/ppc/kernel/asm-offsets.c
 @@ -37,7 +37,6 @@ main(void)
@@ -11421,7 +11732,7 @@
  
  #ifdef CONFIG_COMPAT
  #include "compat_ptrace.h"
-@@ -87,31 +91,497 @@ FixPerRegisters(struct task_struct *task
+@@ -87,31 +91,499 @@ FixPerRegisters(struct task_struct *task
  }
  
  void
@@ -11430,6 +11741,7 @@
  {
  	task->thread.per_info.single_step = 1;
  	FixPerRegisters(task);
++	set_tsk_thread_flag(task, TIF_SINGLE_STEP);
  }
  
  void
@@ -11438,6 +11750,7 @@
  {
  	task->thread.per_info.single_step = 0;
  	FixPerRegisters(task);
++	clear_tsk_thread_flag(task, TIF_SINGLE_STEP);
  }
  
 +int
@@ -11928,7 +12241,7 @@
  #ifndef CONFIG_64BIT
  # define __ADDR_MASK 3
  #else
-@@ -593,6 +1063,7 @@ do_ptrace_emu31(struct task_struct *chil
+@@ -593,6 +1065,7 @@ do_ptrace_emu31(struct task_struct *chil
  			copied += sizeof(unsigned int);
  		}
  		return 0;
@@ -11936,7 +12249,7 @@
  	case PTRACE_GETEVENTMSG:
  		return put_user((__u32) child->ptrace_message,
  				(unsigned int __user *) data);
-@@ -606,6 +1077,7 @@ do_ptrace_emu31(struct task_struct *chil
+@@ -606,6 +1079,7 @@ do_ptrace_emu31(struct task_struct *chil
  			return -EINVAL;
  		return copy_siginfo_from_user32(child->last_siginfo,
  						(compat_siginfo_t __user *) data);
@@ -11944,7 +12257,7 @@
  	}
  	return ptrace_request(child, request, addr, data);
  }
-@@ -656,7 +1128,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -656,7 +1130,7 @@ do_ptrace(struct task_struct *child, lon
  			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
  		child->exit_code = data;
  		/* make sure the single step bit is not set. */
@@ -11953,7 +12266,7 @@
  		wake_up_process(child);
  		return 0;
  
-@@ -670,7 +1142,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -670,7 +1144,7 @@ do_ptrace(struct task_struct *child, lon
  			return 0;
  		child->exit_code = SIGKILL;
  		/* make sure the single step bit is not set. */
@@ -11962,7 +12275,7 @@
  		wake_up_process(child);
  		return 0;
  
-@@ -683,7 +1155,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -683,7 +1157,7 @@ do_ptrace(struct task_struct *child, lon
  		if (data)
  			set_tsk_thread_flag(child, TIF_SINGLE_STEP);
  		else
@@ -11971,7 +12284,7 @@
  		/* give it a chance to run. */
  		wake_up_process(child);
  		return 0;
-@@ -704,31 +1176,9 @@ do_ptrace(struct task_struct *child, lon
+@@ -704,31 +1178,9 @@ do_ptrace(struct task_struct *child, lon
  	/* Not reached.  */
  	return -EIO;
  }
@@ -12004,7 +12317,7 @@
  
  asmlinkage void
  syscall_trace(struct pt_regs *regs, int entryexit)
-@@ -736,30 +1186,17 @@ syscall_trace(struct pt_regs *regs, int 
+@@ -736,30 +1188,17 @@ syscall_trace(struct pt_regs *regs, int 
  	if (unlikely(current->audit_context) && entryexit)
  		audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
  

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  698 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   80 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  260 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  134 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  409 ++
 arch/ia64/xen/hypervisor.c                          |  811 +++++
 arch/ia64/xen/util.c                                |  133 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   55 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  251 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  569 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  383 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  123 
 drivers/xen/netback/interface.c                     |  299 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1125 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1655 +++++++++++
 drivers/xen/pciback/Makefile                        |   14 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  912 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  295 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  220 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  517 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  440 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  602 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  158 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   77 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 410 files changed, 86101 insertions(+), 202 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.49 -r 1.49.4.1 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.49
retrieving revision 1.49.4.1
diff -u -r1.49 -r1.49.4.1
--- linux-2.6-xen.patch	1 Aug 2006 17:20:03 -0000	1.49
+++ linux-2.6-xen.patch	11 Aug 2006 19:11:01 -0000	1.49.4.1
@@ -1,6 +1,6 @@
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
 --- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -24,8 +24,8 @@
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
---- linux-2.6/arch/i386/Kconfig	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-07-26 17:11:03.000000000 +0200
+--- linux-2.6/arch/i386/Kconfig	2006-08-01 06:44:38.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-08-02 18:15:29.000000000 +0200
 @@ -16,10 +16,12 @@ config X86_32
  
  config GENERIC_TIME
@@ -149,7 +149,7 @@
  	---help---
  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
  	  the Memory Type Range Registers (MTRRs) may be used to control
-@@ -694,7 +694,7 @@ config MTRR
+@@ -673,7 +694,7 @@ config MTRR
  
  config EFI
  	bool "Boot from EFI support"
@@ -313,7 +313,7 @@
  	default y
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.cpu linux-2.6-xen-fedora/arch/i386/Kconfig.cpu
 --- linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-08-01 02:30:59.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -332,7 +332,7 @@
  	default y
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.debug linux-2.6-xen-fedora/arch/i386/Kconfig.debug
 --- linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-07-22 20:37:34.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-08-01 02:30:59.000000000 +0200
 @@ -2,6 +2,7 @@ menu "Kernel hacking"
  
  config TRACE_IRQFLAGS_SUPPORT
@@ -351,7 +351,7 @@
            would otherwise cause a system to silently reboot. Disabling this
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/boot-xen.c linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c
 --- linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-07-22 20:37:34.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-08-01 02:30:59.000000000 +0200
 @@ -0,0 +1,1168 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1523,7 +1523,7 @@
 +}
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/Makefile linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile
 --- linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1534,7 +1534,7 @@
 +endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
 --- linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-07-22 20:37:34.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-01 02:30:59.000000000 +0200
 @@ -4,7 +4,11 @@
  #include <asm/alternative.h>
  #include <asm/sections.h>
@@ -1549,7 +1549,7 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/apic-xen.c linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c
 --- linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-07-22 20:37:34.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-08-01 02:30:59.000000000 +0200
 @@ -0,0 +1,160 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1713,7 +1713,7 @@
 +}
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/asm-offsets.c linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c
 --- linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-07-22 21:45:45.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-08-01 02:30:59.000000000 +0200
 @@ -66,9 +66,14 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
@@ -1732,7 +1732,7 @@
  	DEFINE(VDSO_PRELINK, VDSO_PRELINK);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/common-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c
 --- linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-08-03 22:52:02.000000000 +0200
 @@ -0,0 +1,740 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
@@ -2476,7 +2476,7 @@
 +#endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile
 --- linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2488,7 +2488,7 @@
 +endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c
 --- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-08-01 02:31:00.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2689,7 +2689,7 @@
 +subsys_initcall(mtrr_init);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile
 --- linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -3,3 +3,10 @@ obj-y		+= amd.o
  obj-y		+= cyrix.o
  obj-y		+= centaur.o
@@ -2703,13 +2703,13 @@
 +endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/early_printk-xen.c linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c
 --- linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-08-01 02:31:00.000000000 +0200
 @@ -0,0 +1,2 @@
 +
 +#include "../../x86_64/kernel/early_printk-xen.c"
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/entry.S linux-2.6-xen-fedora/arch/i386/kernel/entry.S
---- linux-2.6/arch/i386/kernel/entry.S	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-07-22 21:45:45.000000000 +0200
+--- linux-2.6/arch/i386/kernel/entry.S	2006-08-01 06:44:38.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-08-02 18:15:29.000000000 +0200
 @@ -265,7 +265,7 @@ ENTRY(sysenter_entry)
  	CFI_STARTPROC simple
  	CFI_DEF_CFA esp, 0
@@ -2739,13 +2739,13 @@
  	pushl $sysenter_past_esp
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/entry-xen.S linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S
 --- linux-2.6/arch/i386/kernel/entry-xen.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S	2006-07-22 21:45:45.000000000 +0200
-@@ -0,0 +1,1188 @@
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S	2006-08-02 18:15:29.000000000 +0200
+@@ -0,0 +1,1209 @@
 +/*
 + *  linux/arch/i386/entry.S
 + *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds 
-+*/
++ *  Copyright (C) 1991, 1992  Linus Torvalds
++ */
 +
 +/*
 + * entry.S contains the system-call and fault low-level handling routines.
@@ -2977,7 +2977,7 @@
 +ENTRY(ret_from_fork)
 +	CFI_STARTPROC
 +	pushl %eax
-+	CFI_ADJUST_CFA_OFFSET -4
++	CFI_ADJUST_CFA_OFFSET 4
 +	call schedule_tail
 +	GET_THREAD_INFO(%ebp)
 +	popl %eax
@@ -3109,8 +3109,10 @@
 +14:	__DISABLE_INTERRUPTS
 +sysexit_ecrit:	/**** END OF SYSEXIT CRITICAL REGION ****/
 +	push %esp
++	CFI_ADJUST_CFA_OFFSET 4
 +	call evtchn_do_upcall
 +	add  $4,%esp
++	CFI_ADJUST_CFA_OFFSET -4
 +	jmp  ret_from_intr
 +#else
 +	sti
@@ -3158,7 +3160,6 @@
 +	movb CS(%esp), %al
 +	andl $(VM_MASK | (4 << 8) | 3), %eax
 +	cmpl $((4 << 8) | 3), %eax
-+	CFI_REMEMBER_STATE
 +	je ldt_ss			# returning to user-space with LDT SS
 +restore_nocheck:
 +#else
@@ -3173,6 +3174,7 @@
 +	jnz restore_all_enable_events	#        != 0 => enable event delivery
[...6130 lines suppressed...]
@@ -88467,7 +89510,7 @@
 +#endif /* _XEN_XENBUS_H */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/xen/xencons.h linux-2.6-xen-fedora/include/xen/xencons.h
 --- linux-2.6/include/xen/xencons.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/xencons.h	2006-07-18 03:28:32.000000000 +0200
++++ linux-2.6-xen-fedora/include/xen/xencons.h	2006-08-01 02:31:26.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef __ASM_XENCONS_H__
 +#define __ASM_XENCONS_H__
@@ -88485,7 +89528,7 @@
 +#endif /* __ASM_XENCONS_H__ */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/xen/xen_proc.h linux-2.6-xen-fedora/include/xen/xen_proc.h
 --- linux-2.6/include/xen/xen_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/xen_proc.h	2006-07-18 03:28:32.000000000 +0200
++++ linux-2.6-xen-fedora/include/xen/xen_proc.h	2006-08-01 02:31:26.000000000 +0200
 @@ -0,0 +1,13 @@
 +
 +#ifndef __ASM_XEN_PROC_H__
@@ -88502,7 +89545,7 @@
 +#endif /* __ASM_XEN_PROC_H__ */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/fork.c linux-2.6-xen-fedora/kernel/fork.c
 --- linux-2.6/kernel/fork.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/fork.c	2006-07-22 20:37:56.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/fork.c	2006-08-01 02:31:26.000000000 +0200
 @@ -275,6 +275,9 @@ static inline int dup_mmap(struct mm_str
  		if (retval)
  			goto out;
@@ -88514,9 +89557,9 @@
  out:
  	up_write(&mm->mmap_sem);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/irq/manage.c linux-2.6-xen-fedora/kernel/irq/manage.c
---- linux-2.6/kernel/irq/manage.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/irq/manage.c	2006-07-22 20:37:56.000000000 +0200
-@@ -326,7 +326,6 @@ void free_irq(unsigned int irq, void *de
+--- linux-2.6/kernel/irq/manage.c	2006-08-01 06:44:39.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/irq/manage.c	2006-08-02 18:15:29.000000000 +0200
+@@ -350,7 +350,6 @@ void free_irq(unsigned int irq, void *de
  	struct irqaction **p;
  	unsigned long flags;
  
@@ -88526,7 +89569,7 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/Kconfig.preempt linux-2.6-xen-fedora/kernel/Kconfig.preempt
 --- linux-2.6/kernel/Kconfig.preempt	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/Kconfig.preempt	2006-07-18 03:28:32.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/Kconfig.preempt	2006-08-01 02:31:26.000000000 +0200
 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
  
  config PREEMPT
@@ -88536,8 +89579,8 @@
  	  This option reduces the latency of the kernel by making
  	  all kernel code (that is not executing in a critical section)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/timer.c linux-2.6-xen-fedora/kernel/timer.c
---- linux-2.6/kernel/timer.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/timer.c	2006-07-22 20:37:56.000000000 +0200
+--- linux-2.6/kernel/timer.c	2006-08-01 06:44:39.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/timer.c	2006-08-02 18:15:30.000000000 +0200
 @@ -554,6 +554,22 @@ found:
  	if (time_before(expires, jiffies))
  		return jiffies;
@@ -88563,19 +89606,19 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/lib/Kconfig.debug linux-2.6-xen-fedora/lib/Kconfig.debug
 --- linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-07-22 20:37:56.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-08-02 18:15:30.000000000 +0200
 @@ -325,7 +325,7 @@ config FRAME_POINTER
  
  config UNWIND_INFO
  	bool "Compile the kernel with frame unwind information"
 -	depends on !IA64 && !PARISC
-+	depends on !IA64 && !PARISC && !XEN
++	depends on !IA64 && !PARISC && !X86_64_XEN
  	depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
  	help
  	  If you say Y here the resulting kernel image will be slightly larger
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/lib/Makefile linux-2.6-xen-fedora/lib/Makefile
 --- linux-2.6/lib/Makefile	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/lib/Makefile	2006-07-22 20:37:56.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Makefile	2006-08-01 02:31:26.000000000 +0200
 @@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
  obj-$(CONFIG_SMP) += percpu_counter.o
  
@@ -88588,7 +89631,7 @@
  clean-files	:= crc32table.h
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/highmem.c linux-2.6-xen-fedora/mm/highmem.c
 --- linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/highmem.c	2006-07-22 20:37:56.000000000 +0200
++++ linux-2.6-xen-fedora/mm/highmem.c	2006-08-01 02:31:27.000000000 +0200
 @@ -142,6 +142,17 @@ start:
  	return vaddr;
  }
@@ -88609,7 +89652,7 @@
  	unsigned long vaddr;
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/Kconfig linux-2.6-xen-fedora/mm/Kconfig
 --- linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/Kconfig	2006-07-22 20:37:56.000000000 +0200
++++ linux-2.6-xen-fedora/mm/Kconfig	2006-08-01 02:31:27.000000000 +0200
 @@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
  # Default to 4 for wider testing, though 8 might be more appropriate.
  # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -88627,7 +89670,7 @@
  #
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
 --- linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/memory.c	2006-07-22 20:37:57.000000000 +0200
++++ linux-2.6-xen-fedora/mm/memory.c	2006-08-01 02:31:27.000000000 +0200
 @@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
  	 * and that the resulting page looks ok.
  	 */
@@ -88770,7 +89813,7 @@
   * which was read non-atomically.  Before making any commitment, on
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/mmap.c linux-2.6-xen-fedora/mm/mmap.c
 --- linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/mmap.c	2006-07-22 20:37:57.000000000 +0200
++++ linux-2.6-xen-fedora/mm/mmap.c	2006-08-01 02:31:27.000000000 +0200
 @@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
  	unsigned long nr_accounted = 0;
  	unsigned long end;
@@ -88784,7 +89827,7 @@
  	tlb = tlb_gather_mmu(mm, 1);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/page_alloc.c linux-2.6-xen-fedora/mm/page_alloc.c
 --- linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-07-22 20:37:57.000000000 +0200
++++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-08-01 02:31:27.000000000 +0200
 @@ -443,7 +443,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -88807,7 +89850,7 @@
  		page->mapping = NULL;
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
 --- linux-2.6/net/core/dev.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/dev.c	2006-07-23 03:42:00.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/dev.c	2006-08-01 02:31:27.000000000 +0200
 @@ -117,6 +117,12 @@
  #include <linux/dmaengine.h>
  #include <linux/err.h>
@@ -88908,7 +89951,7 @@
  EXPORT_SYMBOL(br_handle_frame_hook);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/pktgen.c linux-2.6-xen-fedora/net/core/pktgen.c
 --- linux-2.6/net/core/pktgen.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/pktgen.c	2006-07-22 20:37:57.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/pktgen.c	2006-08-01 02:31:27.000000000 +0200
 @@ -6,7 +6,7 @@
   *
   * Alexey Kuznetsov  <kuznet at ms2.inr.ac.ru>
@@ -88920,7 +89963,7 @@
   * modify it under the terms of the GNU General Public License
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
 --- linux-2.6/net/core/skbuff.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-07-22 20:37:57.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-01 02:31:27.000000000 +0200
 @@ -146,6 +146,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -89009,7 +90052,7 @@
  	C(priority);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c
 --- linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-18 03:28:34.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-08-01 02:31:27.000000000 +0200
 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -89026,7 +90069,7 @@
  							   hdr->check));
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c
 --- linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-22 20:37:58.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-08-01 02:31:27.000000000 +0200
 @@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
@@ -89043,7 +90086,7 @@
  							   hdr->check));
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/xfrm4_output.c linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c
 --- linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-07-22 20:37:58.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-08-01 02:31:28.000000000 +0200
 @@ -18,6 +18,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
@@ -89066,7 +90109,7 @@
  		if (err)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
 --- linux-2.6/net/ipv6/addrconf.c	2006-07-16 19:14:10.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-07-22 20:37:58.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-08-01 02:31:28.000000000 +0200
 @@ -2488,6 +2488,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  
@@ -89085,7 +90128,7 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/scripts/Makefile.xen linux-2.6-xen-fedora/scripts/Makefile.xen
 --- linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-07-18 03:28:35.000000000 +0200
++++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-08-01 02:31:28.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.468
retrieving revision 1.468.4.1
diff -u -r1.468 -r1.468.4.1
--- sources	3 Aug 2006 17:28:17 -0000	1.468
+++ sources	11 Aug 2006 19:11:07 -0000	1.468.4.1
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-4ae2c95631b54820475437c206c3a4c2  xen-10730.tar.bz2
+32a856cececcc35cb834cfaccc3c2523  xen-10924.tar.bz2
 ba31b754aaf80aa388858f86c34c4d01  patch-2.6.18-rc3.bz2
 2b8d22d3832b97c2bbd87e75755b36c9  patch-2.6.18-rc3-git3.bz2


--- xen-build-with-O2.patch DELETED ---


--- xen-fix_huge_timeouts.patch DELETED ---


--- xen-ia64-hv.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:25:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:25:14 -0400
Subject: rpms/squirrelmail/devel sources,1.16,1.17
Message-ID: <200608111925.k7BJPE54008158@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8102

Modified Files:
	sources 
Log Message:
re-add language packs



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Aug 2006 18:43:18 -0000	1.16
+++ sources	11 Aug 2006 19:25:12 -0000	1.17
@@ -1 +1,2 @@
 ba3306e4790bbdb10eaccb00195f5107  squirrelmail-1.4.8.tar.bz2
+4b78f4612ef0a68e5a81a818a113497c  all_locales-1.4.7-20060702.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:27:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:27:54 -0400
Subject: rpms/cman/devel .cvsignore, 1.13, 1.14 cman.spec, 1.64, 1.65 sources,
	1.22, 1.23
Message-ID: <200608111927.k7BJRs9E009219@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9194

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
New upstream sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Aug 2006 18:35:19 -0000	1.13
+++ .cvsignore	11 Aug 2006 19:27:52 -0000	1.14
@@ -1 +1 @@
-cman-2.0.7.tar.gz
+cman-2.0.8.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- cman.spec	10 Aug 2006 18:38:14 -0000	1.64
+++ cman.spec	11 Aug 2006 19:27:52 -0000	1.65
@@ -10,11 +10,11 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.7
+%define cman_minor 0.8
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 1%{?dist}
+Release: 0%{?dist}
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -114,6 +114,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Aug 11 2006 Chris Feist <cfeist at redhat.com> - 2.0.8-0
+- Rebuild w/ new upstream sources
+
 * Thu Aug 10 2006 Chris Feist <cfeist at redhat.com> - 2.0.7-0
 - Rebuild w/ new upstream sources
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	10 Aug 2006 18:35:19 -0000	1.22
+++ sources	11 Aug 2006 19:27:52 -0000	1.23
@@ -1 +1 @@
-f76bb410d080f265eaa3019d15324279  cman-2.0.7.tar.gz
+035ce49c2ab5e50d164a52a95f8bc828  cman-2.0.8.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:45:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:45:39 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec, 1.140, 1.141 sources,
	1.78, 1.79 redhat-artwork-0.121-clearlooks.patch, 1.1,
	NONE redhat-artwork-0.122-padding-fix.patch, 1.1,
	NONE redhat-artwork-0.124-throbbers.patch, 1.1,
	NONE redhat-artwork-0.129-remove-throbber.patch, 1.1,
	NONE redhat-artwork-0.243-remove-gtk1.patch, 1.1, NONE
Message-ID: <200608111945.k7BJjdCt024545@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	redhat-artwork.spec sources 
Removed Files:
	redhat-artwork-0.121-clearlooks.patch 
	redhat-artwork-0.122-padding-fix.patch 
	redhat-artwork-0.124-throbbers.patch 
	redhat-artwork-0.129-remove-throbber.patch 
	redhat-artwork-0.243-remove-gtk1.patch 
Log Message:
* Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 0.5.0-1
- update to 0.5.0
- add requires on gtk-engines (bug 202245)



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- redhat-artwork.spec	26 Jul 2006 19:35:56 -0000	1.140
+++ redhat-artwork.spec	11 Aug 2006 19:45:37 -0000	1.141
@@ -3,18 +3,12 @@
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
-Version: 0.245
+Version: 0.5.0
 Release: 1%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
 Source2: post-install-sources.tar.gz
-Source3: throbbers.tar.bz2
-Patch0: redhat-artwork-0.121-clearlooks.patch
-Patch2: redhat-artwork-0.122-padding-fix.patch
-patch3: redhat-artwork-0.124-throbbers.patch
-Patch4: redhat-artwork-0.129-remove-throbber.patch
-Patch5: redhat-artwork-0.243-remove-gtk1.patch 
 Group: User Interface/Desktops
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-root
@@ -41,6 +35,7 @@
 BuildRequires: libtool
 BuildRequires: intltool
 # for splash screens, and a logo in gdm theme
+Requires: gtk2-engines
 Requires: redhat-logos >= 1.1.22
 Prereq: gtk2 >= 2.9.0
 
@@ -53,11 +48,6 @@
 
 %prep
 %setup -q
-tar xjf %{SOURCE3}
-%patch0 -p1 -b .clearlooks
-%patch2 -p1 -b .padding-fix
-%patch4 -p1 -b .remove-throbber
-%patch5 -p1 -b .remove-gtk1
 mkdir post-install
 (cd post-install; tar xzvf %{SOURCE2})
 
@@ -81,7 +71,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 export LANG=en_US.ISO-8859-1 ## workaround for intltool sucking in UTF-8
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # Run post-install fixup script
 DATADIR=$RPM_BUILD_ROOT%{_datadir} %{SOURCE1}
@@ -179,6 +169,10 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 0.5.0-1
+- update to 0.5.0
+- add requires on gtk-engines (bug 202245)
+
 * Wed Jul 26 2006 Matthias Clasen <mclasen at redhat.com> - 0.245-1
 - Use default Sans font in gdm login screens
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- sources	26 Jul 2006 19:35:56 -0000	1.78
+++ sources	11 Aug 2006 19:45:37 -0000	1.79
@@ -1,4 +1,8 @@
-d30a30110d8a040f7fd584d7430cf019  post-install-sources.tar.gz
+3e5e67518c668aa515ee739ab2816933  redhat-artwork-0.5.0.tar.gz
 cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
+<<<<<<< sources
+5db8b218b202eb1cf870801858c78733  post-install-sources.tar.gz
+=======
 395452caaf476a7145ffccea356a8966  throbbers.tar.bz2
 93f4248f1308cea83f5901c26a138ee7  redhat-artwork-0.245.tar.gz
+>>>>>>> 1.78


--- redhat-artwork-0.121-clearlooks.patch DELETED ---


--- redhat-artwork-0.122-padding-fix.patch DELETED ---


--- redhat-artwork-0.124-throbbers.patch DELETED ---


--- redhat-artwork-0.129-remove-throbber.patch DELETED ---


--- redhat-artwork-0.243-remove-gtk1.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:48:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:48:24 -0400
Subject: rpms/redhat-artwork/devel sources,1.79,1.80
Message-ID: <200608111948.k7BJmOX3007175@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	sources 
Log Message:
unfoobar sources file



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	11 Aug 2006 19:45:37 -0000	1.79
+++ sources	11 Aug 2006 19:48:21 -0000	1.80
@@ -1,8 +1,3 @@
 3e5e67518c668aa515ee739ab2816933  redhat-artwork-0.5.0.tar.gz
 cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
-<<<<<<< sources
 5db8b218b202eb1cf870801858c78733  post-install-sources.tar.gz
-=======
-395452caaf476a7145ffccea356a8966  throbbers.tar.bz2
-93f4248f1308cea83f5901c26a138ee7  redhat-artwork-0.245.tar.gz
->>>>>>> 1.78



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:55:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:55:10 -0400
Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.173,1.174
Message-ID: <200608111955.k7BJtAXd007285@cvs.devel.redhat.com>

Author: cfeist

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

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.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- cman-kernel.spec	17 Jul 2006 18:44:04 -0000	1.173
+++ cman-kernel.spec	11 Aug 2006 19:55:08 -0000	1.174
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2157_FC5
+%define kernel_version 2.6.16-1.2122_FC5
 %define subversion 0
 %define tempversion 2.6.15
  
@@ -26,7 +26,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.28
+Release: 0.FC5.29
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:55:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:55:20 -0400
Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.167,1.168
Message-ID: <200608111955.k7BJtKi6007340@cvs.devel.redhat.com>

Author: cfeist

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

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.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gnbd-kernel.spec	17 Jul 2006 18:44:14 -0000	1.167
+++ gnbd-kernel.spec	11 Aug 2006 19:55:18 -0000	1.168
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2157_FC5
+%define kernel_version 2.6.16-1.2122_FC5
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.36
+Release: 5.FC5.37
 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  Fri Aug 11 19:55:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:55:28 -0400
Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.144,1.145
Message-ID: <200608111955.k7BJtSvl007396@cvs.devel.redhat.com>

Author: cfeist

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

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.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- dlm-kernel.spec	17 Jul 2006 18:44:22 -0000	1.144
+++ dlm-kernel.spec	11 Aug 2006 19:55:26 -0000	1.145
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2157_FC5
+%define kernel_version 2.6.16-1.2122_FC5
 %define tempversion 2.6.15
 %define subversion 0
 
@@ -26,7 +26,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.1
-Release: 0.FC5.26
+Release: 0.FC5.27
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:55:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:55:36 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec,1.165,1.166
Message-ID: <200608111955.k7BJtaF0007453@cvs.devel.redhat.com>

Author: cfeist

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

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.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- GFS-kernel.spec	17 Jul 2006 18:44:30 -0000	1.165
+++ GFS-kernel.spec	11 Aug 2006 19:55:34 -0000	1.166
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2157_FC5
+%define kernel_version 2.6.16-1.2122_FC5
 %define tempversion 2.6.15
 %define subversion 2
 
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.33
+Release: 5.FC5.34
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Fri Aug 11 19:56:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 15:56:48 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.141,1.142
Message-ID: <200608111956.k7BJum3Z007526@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	redhat-artwork.spec 
Log Message:
use %%makeinstall again



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- redhat-artwork.spec	11 Aug 2006 19:45:37 -0000	1.141
+++ redhat-artwork.spec	11 Aug 2006 19:56:46 -0000	1.142
@@ -71,7 +71,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 export LANG=en_US.ISO-8859-1 ## workaround for intltool sucking in UTF-8
-make install DESTDIR=$RPM_BUILD_ROOT
+%makeinstall
 
 # Run post-install fixup script
 DATADIR=$RPM_BUILD_ROOT%{_datadir} %{SOURCE1}



From fedora-cvs-commits at redhat.com  Fri Aug 11 20:04:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 16:04:14 -0400
Subject: rpms/squirrelmail/FC-5 squirrelmail-1.4.7-ja-translate.patch, NONE,
	1.1 .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 squirrelmail.spec, 1.38, 1.39
Message-ID: <200608112004.k7BK4Eh4007681@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	.cvsignore sources squirrelmail.spec 
Added Files:
	squirrelmail-1.4.7-ja-translate.patch 
Log Message:
- 1.4.8 release with CVE-2006-4019 and upstream bug fixes
- More JP translation updates (#194598)


squirrelmail-1.4.7-ja-translate.patch:
 squirrelmail.po |   64 +++++++++++++++++++++-----------------------------------
 1 files changed, 24 insertions(+), 40 deletions(-)

--- NEW FILE squirrelmail-1.4.7-ja-translate.patch ---
--- squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po.orig	2006-07-18 22:21:11.000000000 -0400
+++ squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po	2006-07-18 21:49:48.000000000 -0400
@@ -1,16 +1,17 @@
 # Japanese (ja_JP) SquirrelMail Translation
 # Copyright (c) 1999-2006 The SquirrelMail Project Team
 # This file is distributed under the same license as the SquirrelMail package.
-# HIGASHIYAMA Masato <masato at yamaai-tech.com>, 2002, 2003.
 # Andre Nicholson <andre at neo-anime.org> 2005-2006.
 # $Id: squirrelmail.po,v 1.7 2006/03/03 22:02:20 jervfors Exp $
+# HIGASHIYAMA Masato <masato at yamaai-tech.com>, 2002, 2003.
+# Noriko Mizumoto <noriko at redhat.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: SquirrelMail HEAD\n"
+"Project-Id-Version: squirrelmail\n"
 "POT-Creation-Date: 2006-02-21 06:50+0100\n"
-"PO-Revision-Date: 2006-03-03 22:42+0100\n"
-"Last-Translator: Andre Nicholson <andre at neo-anime.org>\n"
-"Language-Team: Japanese <squirrelmail-i18n at lists.sourceforge.net>\n"
+"PO-Revision-Date: 2006-07-18 13:27+1000\n"
+"Last-Translator: Noriko Mizumoto <noriko at redhat.com>\n"
+"Language-Team: Japanese <doc-i18n-list at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -398,7 +399,7 @@
 msgstr "??????????????"
 
 msgid "Check mail"
-msgstr "????????????????????"
+msgstr "????????????"
 
 msgid "Login"
 msgstr "????????"
@@ -610,17 +611,13 @@
 "you, such as the colors, the language, and other settings."
 msgstr "SquirrelMail ??????????????????????????????????????????????"
 
-#, fuzzy
 msgid ""
 "Based upon given criteria, incoming messages can have different background "
 "colors in the message list. This helps to easily distinguish who the "
 "messages are from, especially for mailing lists."
-msgstr ""
-"????????????????????????????????????????????????????????????????????????????"
-"??????????????????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-msgid ""
-"These settings change the way your folders are displayed and manipulated."
+msgid "These settings change the way your folders are displayed and manipulated."
 msgstr "??????????????????????????????"
 
 msgid ""
@@ -833,8 +830,7 @@
 msgid "Viewing a text attachment"
 msgstr "????????????????????????????"
 
-msgid ""
-"Could not include PEAR database functions required for the database backend."
+msgid "Could not include PEAR database functions required for the database backend."
 msgstr ""
 
 #, php-format
@@ -2431,8 +2427,7 @@
 "??????"
 
 msgid "FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in."
-msgstr ""
-"??????Five-Ten-sg.com????????????????????????????????????????????????????"
+msgstr "??????Five-Ten-sg.com????????????????????????????????????????????????????"
 
 msgid "FREE - Five-Ten-sg.com - Other misc. servers."
 msgstr "??????Five-Ten-sg.com????????????????????????"
@@ -2536,8 +2531,7 @@
 "??????????????????????????????"
 
 msgid "FREE, for now - Not Just Another Blacklist - Dial-up IPs."
-msgstr ""
-"?????????????????????????????????????????????????????????????????????????? IP"
+msgstr "?????????????????????????????????????????????????????????????????????????? IP"
 
 msgid "FREE - Distributed Sender Boycott List - Confirmed Relays"
 msgstr ""
@@ -2551,8 +2545,7 @@
 msgid "WARNING! You must enter something to search for."
 msgstr ""
 
-msgid ""
-"WARNING! Header filters should be of the format &quot;Header: value&quot;"
+msgid "WARNING! Header filters should be of the format &quot;Header: value&quot;"
 msgstr ""
 
 msgid "Saved Scan type"
@@ -3418,8 +3411,7 @@
 msgid "You must make a choice"
 msgstr "????????????????????????"
 
-msgid ""
-"You can either delete your dictionary or type in the old password. Not both."
+msgid "You can either delete your dictionary or type in the old password. Not both."
 msgstr ""
 "????????????????????????????????????????????????????????????????????????????"
 "????????"
@@ -3581,8 +3573,7 @@
 "strong>????????????????????"
 
 #, fuzzy
-msgid ""
-"Your personal dictionary has been decrypted and is now stored as plain text."
+msgid "Your personal dictionary has been decrypted and is now stored as plain text."
 msgstr ""
 "??????????????????<strong>????</strong>????????????<strong>????</strong>????"
 "????????????????????"
@@ -3645,8 +3636,7 @@
 "old password in order to re-encrypt the dictionary with a new key."
 msgstr ""
 
-msgid ""
-"Please decrypt my personal dictionary and store it in a clear-text format."
+msgid "Please decrypt my personal dictionary and store it in a clear-text format."
 msgstr "????????????????????????????????????????????????????"
 
 msgid "Change crypto settings"
@@ -3685,8 +3675,7 @@
 "????????????????????????????????????????????????????????????????????????????"
 "????????????????????????????????????</p>"
 
-msgid ""
-"Please encrypt my personal dictionary and store it in an encrypted format."
+msgid "Please encrypt my personal dictionary and store it in an encrypted format."
 msgstr "??????????????????????????????????????"
 
 #, fuzzy, php-format
@@ -3715,13 +3704,11 @@
 
 #, fuzzy, php-format
 msgid "Settings adjusted to: %s with %s as default dictionary."
-msgstr ""
-"????????????????<strong>%s</strong> ?? <strong>%s</strong> ??????????????????"
+msgstr "????????????????<strong>%s</strong> ?? <strong>%s</strong> ??????????????????"
 
 #, fuzzy, php-format
 msgid "Using %s dictionary (system default) for spellcheck."
-msgstr ""
-"???????????????? <strong>%s</strong> ????????????????????????????????????????"
+msgstr "???????????????? <strong>%s</strong> ????????????????????????????????????????"
 
 msgid "International Dictionaries Preferences Updated"
 msgstr "??????????????????????"
@@ -4611,8 +4598,7 @@
 msgid "Incorrect LDAP connection option: %s"
 msgstr ""
 
-msgid ""
-"Current PHP LDAP extension does not allow use of ldap_set_option() function."
+msgid "Current PHP LDAP extension does not allow use of ldap_set_option() function."
 msgstr ""
 
 #, fuzzy
@@ -4691,12 +4677,10 @@
 msgid "MD5 is not supported by webserver's system crypt library."
 msgstr ""
 
-msgid ""
-"Extended DES crypt is not supported by webserver's system crypt library."
+msgid "Extended DES crypt is not supported by webserver's system crypt library."
 msgstr ""
 
-msgid ""
-"Standard DES crypt is not supported by webserver's system crypt library."
+msgid "Standard DES crypt is not supported by webserver's system crypt library."
 msgstr ""
 
 msgid "PHP Curl extension is NOT available! Unable to change password!"
@@ -4970,8 +4954,7 @@
 
 #, fuzzy, php-format
 msgid "Using %s dictionary for spellcheck."
-msgstr ""
-"???????????????? <strong>%s</strong> ????????????????????????????????????????"
+msgstr "???????????????? <strong>%s</strong> ????????????????????????????????????????"
 
 #, fuzzy
 msgid "Translation Theme:"
@@ -5043,3 +5026,4 @@
 
 msgid "This image has been removed for security reasons"
 msgstr ""
+


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	10 Jul 2006 15:18:19 -0000	1.15
+++ .cvsignore	11 Aug 2006 20:04:12 -0000	1.16
@@ -1,2 +1,2 @@
+squirrelmail-1.4.8.tar.bz2
 all_locales-1.4.7-20060702.tar.bz2
-squirrelmail-1.4.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	10 Jul 2006 15:18:19 -0000	1.15
+++ sources	11 Aug 2006 20:04:12 -0000	1.16
@@ -1,2 +1,2 @@
+ba3306e4790bbdb10eaccb00195f5107  squirrelmail-1.4.8.tar.bz2
 4b78f4612ef0a68e5a81a818a113497c  all_locales-1.4.7-20060702.tar.bz2
-08301f14d71e4452e93f21b5e6747a4a  squirrelmail-1.4.7.tar.bz2


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-5/squirrelmail.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- squirrelmail.spec	11 Jul 2006 03:58:49 -0000	1.38
+++ squirrelmail.spec	11 Aug 2006 20:04:12 -0000	1.39
@@ -5,12 +5,11 @@
 
 Summary: SquirrelMail webmail client
 Name: squirrelmail
-Version: 1.4.7
-Release: 4.fc5
+Version: 1.4.8
+Release: 1%{?dist}
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
-#Source: %{name}-%{version}.tar.bz2
 Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}.tar.bz2
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
@@ -21,7 +20,7 @@
 Patch2:  squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch
 Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
 Patch4:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
-Patch5:  squirrelmail-1.4.7-check-mail.ja.patch
+Patch5:  squirrelmail-1.4.7-ja-translate.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -225,7 +224,6 @@
 %config %dir %{_sysconfdir}/squirrelmail
 %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/*.php
 %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/default_pref
-%attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/sqspell_config.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 %doc doc/*
 %dir %{_datadir}/squirrelmail
@@ -248,6 +246,12 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Fri Aug 11 2006 Warren Togami <wtogami at redhat.com> 1.4.8-1
+- 1.4.8 release with CVE-2006-4019 and upstream bug fixes
+
+* Tue Jul 18 2006 Warren Togami <wtogami at redhat.com> 1.4.7-5
+- More JP translation updates (#194598)
+
 * Mon Jul 10 2006 Warren Togami <wtogami at redhat.com> 1.4.7-4
 - Fix fatal typo in config_local.php (#198306)
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 20:06:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 16:06:28 -0400
Subject: rpms/gnome-session/devel gnome-session-2.15.90-window-manager.patch,
	1.1, 1.2 gnome-session.spec, 1.79, 1.80
Message-ID: <200608112006.k7BK6SYX007771@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-session-2.15.90-window-manager.patch gnome-session.spec 
Log Message:
- start gnome-window-decorator and pass "gconf" when invoking
  compiz


gnome-session-2.15.90-window-manager.patch:
 gnome-session.schemas.in |   13 ++++++++++++-
 gnome-wm                 |   16 ++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

Index: gnome-session-2.15.90-window-manager.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session-2.15.90-window-manager.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-session-2.15.90-window-manager.patch	11 Aug 2006 00:15:58 -0000	1.1
+++ gnome-session-2.15.90-window-manager.patch	11 Aug 2006 20:06:25 -0000	1.2
@@ -1,5 +1,5 @@
 --- gnome-session-2.15.90/gnome-session/gnome-session.schemas.in.window-manager	2005-04-26 06:56:50.000000000 -0400
-+++ gnome-session-2.15.90/gnome-session/gnome-session.schemas.in	2006-08-10 19:09:05.000000000 -0400
++++ gnome-session-2.15.90/gnome-session/gnome-session.schemas.in	2006-08-10 19:19:11.000000000 -0400
 @@ -2,11 +2,22 @@
  <gconfschemafile>
     <schemalist>
@@ -24,8 +24,8 @@
           <locale name="C">
              <short>Show the splash screen</short>
              <long>Show the splash screen when the session starts up</long>
---- gnome-session-2.15.90/gnome-session/gnome-wm.window-manager	2006-08-10 19:09:44.000000000 -0400
-+++ gnome-session-2.15.90/gnome-session/gnome-wm	2006-08-10 19:18:04.000000000 -0400
+--- gnome-session-2.15.90/gnome-session/gnome-wm.window-manager	2005-07-19 08:44:48.000000000 -0400
++++ gnome-session-2.15.90/gnome-session/gnome-wm	2006-08-11 16:04:59.000000000 -0400
 @@ -3,7 +3,9 @@
  # The user can specify his prefered WM by setting the WINDOW_MANAGER
  # environment variable.
@@ -37,7 +37,7 @@
  # the first one that is found in the users's PATH
  #
  
-@@ -39,6 +41,10 @@
+@@ -39,6 +41,10 @@ done
  
  # WINDOW_MANAGER overrides all
  
@@ -48,3 +48,29 @@
  OLDIFS=$IFS
  IFS=":"
  if [ -z "$WINDOW_MANAGER" ] ; then
+@@ -67,11 +73,17 @@ fi
+ # Now create options OPT1 and OPT2 based on the windowmanager used
+ OPT1=
+ OPT2=
++OPT3=
+ if [ ! -z "$SMID" ] ; then
+   case `basename $WINDOW_MANAGER` in
+     sawfish|sawmill|metacity)
+       OPT1=--sm-client-id=$SMID
+       ;;
++    compiz)
++      gnome-window-decorator &
++      OPT1=--sm-client-id
++      OPT2=$SMID
++      OPT3=gconf
+     openbox)
+       OPT1=--sm-client-id
+       OPT2=$SMID
+@@ -88,6 +100,6 @@ if [ ! -z "$SMID" ] ; then
+   esac
+ fi
+ 
+-exec $WINDOW_MANAGER $OPT1 $OPT2
++exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3
+ 
+ echo "ERROR: No window manager could run!"


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gnome-session.spec	11 Aug 2006 00:15:58 -0000	1.79
+++ gnome-session.spec	11 Aug 2006 20:06:25 -0000	1.80
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.15.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -167,6 +167,10 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-3.fc6
+- start gnome-window-decorator and pass "gconf" when invoking
+  compiz
+
 * Thu Aug 10 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-2.fc6
 - update patch from 2.15.4-3 to be more session friendly (bug 201473)
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 20:19:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 16:19:46 -0400
Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.174,1.175
Message-ID: <200608112019.k7BKJkc3003335@cvs.devel.redhat.com>

Author: cfeist

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

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.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- cman-kernel.spec	11 Aug 2006 19:55:08 -0000	1.174
+++ cman-kernel.spec	11 Aug 2006 20:19:43 -0000	1.175
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2122_FC5
+%define kernel_version 2.6.17-1.2174_FC5
 %define subversion 0
 %define tempversion 2.6.15
  
@@ -26,7 +26,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.29
+Release: 0.FC5.30
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Fri Aug 11 20:20:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 16:20:25 -0400
Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.168,1.169
Message-ID: <200608112020.k7BKKPBG003552@cvs.devel.redhat.com>

Author: cfeist

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

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.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gnbd-kernel.spec	11 Aug 2006 19:55:18 -0000	1.168
+++ gnbd-kernel.spec	11 Aug 2006 20:20:22 -0000	1.169
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2122_FC5
+%define kernel_version 2.6.17-1.2174_FC5
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.37
+Release: 5.FC5.38
 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  Fri Aug 11 20:20:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 16:20:49 -0400
Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.145,1.146
Message-ID: <200608112020.k7BKKnXo003723@cvs.devel.redhat.com>

Author: cfeist

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

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.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- dlm-kernel.spec	11 Aug 2006 19:55:26 -0000	1.145
+++ dlm-kernel.spec	11 Aug 2006 20:20:46 -0000	1.146
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2122_FC5
+%define kernel_version 2.6.17-1.2174_FC5
 %define tempversion 2.6.15
 %define subversion 0
 
@@ -26,7 +26,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.1
-Release: 0.FC5.27
+Release: 0.FC5.28
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Fri Aug 11 20:21:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 16:21:02 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec,1.166,1.167
Message-ID: <200608112021.k7BKL2ln003852@cvs.devel.redhat.com>

Author: cfeist

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

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.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- GFS-kernel.spec	11 Aug 2006 19:55:34 -0000	1.166
+++ GFS-kernel.spec	11 Aug 2006 20:21:00 -0000	1.167
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2122_FC5
+%define kernel_version 2.6.17-1.2174_FC5
 %define tempversion 2.6.15
 %define subversion 2
 
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.34
+Release: 5.FC5.35
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Fri Aug 11 20:23:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 16:23:13 -0400
Subject: rpms/redhat-artwork/devel .cvsignore, 1.76, 1.77 redhat-artwork.spec,
	1.142, 1.143 sources, 1.80, 1.81
Message-ID: <200608112023.k7BKNDff004674@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	.cvsignore redhat-artwork.spec sources 
Log Message:
- woops 5 is less than 245.
- update to 5.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	26 Jul 2006 19:35:56 -0000	1.76
+++ .cvsignore	11 Aug 2006 20:23:10 -0000	1.77
@@ -1,15 +1,3 @@
-redhat-artwork-0.234.tar.gz
-post-install-sources.tar.gz
+redhat-artwork-5.0.0.tar.gz
 RHEL-gdm-theme-0.2.tar.gz
-throbbers.tar.bz2
-redhat-artwork-0.235.tar.gz
-redhat-artwork-0.236.tar.gz
-redhat-artwork-0.237.tar.gz
-redhat-artwork-0.238.tar.gz
-redhat-artwork-0.239.tar.gz
-redhat-artwork-0.240.tar.gz
-redhat-artwork-0.241.tar.gz
-redhat-artwork-0.242.tar.gz
-redhat-artwork-0.243.tar.gz
-redhat-artwork-0.244.tar.gz
-redhat-artwork-0.245.tar.gz
+post-install-sources.tar.gz


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- redhat-artwork.spec	11 Aug 2006 19:56:46 -0000	1.142
+++ redhat-artwork.spec	11 Aug 2006 20:23:10 -0000	1.143
@@ -3,7 +3,7 @@
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
-Version: 0.5.0
+Version: 5.0.0
 Release: 1%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
@@ -169,6 +169,10 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 5.0.0-1
+- woops 5 is less than 245.
+- update to 5.0.0
+
 * Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 0.5.0-1
 - update to 0.5.0
 - add requires on gtk-engines (bug 202245)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	11 Aug 2006 19:48:21 -0000	1.80
+++ sources	11 Aug 2006 20:23:10 -0000	1.81
@@ -1,3 +1,3 @@
-3e5e67518c668aa515ee739ab2816933  redhat-artwork-0.5.0.tar.gz
+729b56925ad2365d2a239261956a892b  redhat-artwork-5.0.0.tar.gz
 cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
-5db8b218b202eb1cf870801858c78733  post-install-sources.tar.gz
+f0a23d501ba5d5fef7338decd0b3608c  post-install-sources.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 11 20:29:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 16:29:30 -0400
Subject: rpms/classpathx-jaf/devel classpathx-jaf.spec,1.19,1.20
Message-ID: <200608112029.k7BKTU02006969@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/classpathx-jaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6840

Modified Files:
	classpathx-jaf.spec 
Log Message:
- Replace explicit Requires(post) on coreutils with 
  Requires-post/postun on rm and ln since more portable with JPP.
- Revert explicit install of versionless jaf.jar install since   alternatives handles this.
- Extend triggerpostun to trigger on <= 0:1.0-7jpp_5fc so jaf.jar
  exists when upgrading from -7jpp_5fc.




Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- classpathx-jaf.spec	10 Aug 2006 10:39:52 -0000	1.19
+++ classpathx-jaf.spec	11 Aug 2006 20:29:27 -0000	1.20
@@ -37,7 +37,7 @@
 
 Name:           classpathx-jaf
 Version:        1.0
-Release:        7jpp_5fc
+Release:        8jpp.1
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 
@@ -60,7 +60,6 @@
 Provides:       jaf = 0:%{jafver}
 Obsoletes:      gnujaf <= 0:1.0-0.rc1.1jpp
 
-
 %if %{gcj_support}
 BuildRequires:		java-gcj-compat-devel
 Requires(post):		java-gcj-compat
@@ -78,7 +77,9 @@
 Provides:       jaf-javadoc = 0:%{jafver}
 Obsoletes:      gnujaf-javadoc <= 0:1.0-0.rc1.1jpp
 BuildRequires:  java-javadoc
-Requires(post):     coreutils
+Requires(post):		/bin/ln
+Requires(post): 	/bin/rm
+Requires(postun):	/bin/rm
 
 %description    javadoc
 %{summary}.
@@ -107,7 +108,6 @@
 mv activation.jar %{name}-%{version}.jar
 ln -s %{name}-%{version}.jar %{name}.jar
 ln -s %{name}-%{version}.jar jaf-%{jafver}.jar
-ln -s %{name}-%{version}.jar jaf.jar
 ln -s %{name}-%{version}.jar activation.jar
 #touch jaf.jar
 cd -
@@ -123,7 +123,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerpostun -- classpathx-jaf <= 0:1.0-2jpp
+%triggerpostun -- classpathx-jaf <= 0:1.0-7jpp_5fc
 # Remove file from old non-free packages
 rm -f %{_javadir}/jaf.jar
 # Recreate the link as update-alternatives could not do it
@@ -149,13 +149,16 @@
 rm -f %{_javadocdir}/jaf
 ln -s jaf-%{jafver} %{_javadocdir}/jaf
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/jaf
+fi
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING
 %{_javadir}/activation.jar
 %{_javadir}/jaf-%{jafver}.jar
-%{_javadir}/jaf.jar
 #%ghost %{_javadir}/jaf*.jar
 %{_javadir}/%{name}*.jar
 
@@ -170,6 +173,14 @@
 
 
 %changelog
+* Fri Aug 11 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0-8jpp.1
+- Replace explicit Requires(post) on coreutils with 
+  Requires-post/postun on rm and ln since more portable with JPP.
+- Revert explicit install of versionless jaf.jar install since
+  alternatives handles this.
+- Extend triggerpostun to trigger on <= 0:1.0-7jpp_5fc so jaf.jar
+  exists when upgrading from -7jpp_5fc.
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.0-7jpp_5fc
 - Requires(post):     coreutils
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 20:58:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 16:58:31 -0400
Subject: rpms/gcc/devel gcc41-power6-2.patch, NONE, 1.1 gcc41-pr28600.patch,
	NONE, 1.1 gcc41-rh200887.patch, NONE, 1.1 .cvsignore, 1.163,
	1.164 gcc41.spec, 1.90, 1.91 sources, 1.165,
	1.166 gcc41-CVE-2006-3619.patch, 1.1, NONE
Message-ID: <200608112058.k7BKwVGk029689@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-power6-2.patch gcc41-pr28600.patch gcc41-rh200887.patch 
Removed Files:
	gcc41-CVE-2006-3619.patch 
Log Message:
4.1.1-15

gcc41-power6-2.patch:
 rs6000.c  |    3 +--
 rs6000.h  |    6 ++++--
 rs6000.md |    3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE gcc41-power6-2.patch ---
2006-08-08  Pete Steinmetz <steinmtz at us.ibm.com>

	* config/rs6000/rs6000.h (SECONDARY_MEMORY_NEEDED): Added mode!=DFmode
	and mode!=DImode conditions.
	* config/rs6000/rs6000.c (rs6000_register_move_cost): Revert
	rs6000_memory_move_cost if mf{t,f}gpr are available change.
	* config/rs6000/rs6000.md (fix_truncdfsi2): Use gpc_reg_operand
	constraint.

--- gcc/config/rs6000/rs6000.h.orig	2006-08-08 12:48:57.972143448 -0500
+++ gcc/config/rs6000/rs6000.h	2006-08-08 13:05:00.667303659 -0500
@@ -1209,9 +1209,11 @@ enum reg_class
 
 #define SECONDARY_MEMORY_NEEDED(CLASS1,CLASS2,MODE)			\
  ((CLASS1) != (CLASS2) && (((CLASS1) == FLOAT_REGS			\
-                            && (!TARGET_MFPGPR || !TARGET_POWERPC64))	\
+                            && (!TARGET_MFPGPR || !TARGET_POWERPC64	\
+				|| ((MODE != DFmode) && (MODE != DImode)))) \
 			   || ((CLASS2) == FLOAT_REGS			\
-                               && (!TARGET_MFPGPR || !TARGET_POWERPC64))\
+                               && (!TARGET_MFPGPR || !TARGET_POWERPC64	\
+				|| ((MODE != DFmode) && (MODE != DImode)))) \
 			   || (CLASS1) == ALTIVEC_REGS			\
 			   || (CLASS2) == ALTIVEC_REGS))
 
--- gcc/config/rs6000/rs6000.c.orig	2006-08-08 12:48:54.257184227 -0500
+++ gcc/config/rs6000/rs6000.c	2006-08-08 12:49:18.841128070 -0500
@@ -19403,8 +19403,7 @@ rs6000_register_move_cost (enum machine_
       if (! reg_classes_intersect_p (to, GENERAL_REGS))
 	from = to;
 
-      if ((from == FLOAT_REGS && (!TARGET_MFPGPR || !TARGET_POWERPC64))
-          || from == ALTIVEC_REGS)
+      if (from == FLOAT_REGS || from == ALTIVEC_REGS)
 	return (rs6000_memory_move_cost (mode, from, 0)
 		+ rs6000_memory_move_cost (mode, GENERAL_REGS, 0));
 
--- gcc/config/rs6000/rs6000.md.orig	2006-08-08 12:48:50.255134210 -0500
+++ gcc/config/rs6000/rs6000.md	2006-08-08 12:49:18.851126531 -0500
@@ -5323,7 +5323,8 @@
      DONE;
     }
   operands[2] = gen_reg_rtx (DImode);
-  if (TARGET_POWERPC64 && TARGET_MFPGPR && TARGET_HARD_FLOAT && TARGET_FPRS)
+  if (TARGET_POWERPC64 && TARGET_MFPGPR && TARGET_HARD_FLOAT && TARGET_FPRS
+      && gpc_reg_operand(operands[0], GET_MODE (operands[0])))
     {
       operands[3] = gen_reg_rtx (DImode);
       emit_insn (gen_fix_truncdfsi2_internal_mfpgpr (operands[0], operands[1],

gcc41-pr28600.patch:
 fortran/trans-decl.c                                 |   10 +++++++++-
 testsuite/gfortran.dg/assumed_charlen_function_4.f90 |   17 +++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

--- NEW FILE gcc41-pr28600.patch ---
2006-08-09 Paul Thomas <pault at gcc.gnu.org>

	PR fortran/28600
	* trans-decl.c (gfc_get_symbol_decl): Ensure that the
	DECL_CONTEXT of the length of a character dummy is the
	same as that of the symbol declaration.

2006-08-09 Paul Thomas <pault at gcc.gnu.org>

	PR fortran/28600
	* gfortran.dg/assumed_charlen_function_4.f90: New test.

--- gcc/fortran/trans-decl.c
+++ gcc/fortran/trans-decl.c
@@ -884,7 +884,15 @@
 	  if (TREE_CODE (length) == VAR_DECL
 	      && DECL_CONTEXT (length) == NULL_TREE)
 	    {
-	      gfc_add_decl_to_function (length);
+	      /* Add the string length to the same context as the symbol.  */
+	      if (DECL_CONTEXT (sym->backend_decl) == current_function_decl)
+	        gfc_add_decl_to_function (length);
+	      else
+		gfc_add_decl_to_parent_function (length);
+
+	      gcc_assert (DECL_CONTEXT (sym->backend_decl) ==
+			    DECL_CONTEXT (length));
+
 	      gfc_defer_symbol_init (sym);
 	    }
 	}
--- gcc/testsuite/gfortran.dg/assumed_charlen_function_4.f90
+++ gcc/testsuite/gfortran.dg/assumed_charlen_function_4.f90
@@ -0,0 +1,17 @@
+! { dg-do compile }
+! Tests the fix for PR28600 in which the declaration for the
+! character length n, would be given the DECL_CONTEXT of 'gee'
+! thus causing an ICE.
+!
+! Contributed by Francois-Xavier Coudert  <fxcoudert at gcc.gnu.org>
+!
+subroutine bar(s, n)
+ integer n
+ character s*(n)
+ character*3, dimension(:), pointer :: m
+ s = ""
+contains
+ subroutine gee
+    m(1) = s(1:3)
+ end subroutine gee
+end subroutine bar

gcc41-rh200887.patch:
 0 files changed

--- NEW FILE gcc41-rh200887.patch ---
--- libjava/Makefile.am	(revision 115995)
+++ libjava/Makefile.am	(working copy)
@@ -340,7 +340,21 @@ libgcj-$(gcc_version).jar: classpath/lib
 	rm -rf $$JARDIR $$JARDIR.stamp
 
 libgcj-tools-$(gcc_version).jar: classpath/tools/tools.jar
-	cp $< $@
+	javasrcdir=`cd $(srcdir) && pwd`; \
+	JARDIR=`mktemp -d $@.XXXXXX` || exit 1; \
+	touch -r $$javasrcdir/../gcc/ChangeLog $$JARDIR.stamp; \
+	[ $$javasrcdir/../gcc/java/ChangeLog -nt $$JARDIR.stamp ] \
+	    && touch -r $$javasrcdir/../gcc/java/ChangeLog $$JARDIR.stamp; \
+	[ $$javasrcdir/ChangeLog -nt $$JARDIR.stamp ] \
+	    && touch -r $$javasrcdir/ChangeLog $$JARDIR.stamp; \
+	cd $$JARDIR || exit 1; \
+	$(JAR) -xf ../$<; \
+	rm -rf META-INF; \
+	find -type f | xargs touch -r ../$$JARDIR.stamp; \
+	find -type d | xargs touch -r ../$$JARDIR.stamp; \
+	$(JAR) -cf at E ../$@ || exit 1; \
+	cd ..; \
+	rm -rf $$JARDIR $$JARDIR.stamp
 
 CLEANFILES = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
 DISTCLEANFILES = native.dirs
--- libjava/Makefile.in	(revision 115995)
+++ libjava/Makefile.in	(working copy)
@@ -8902,7 +8902,21 @@ libgcj-$(gcc_version).jar: classpath/lib
 	rm -rf $$JARDIR $$JARDIR.stamp
 
 libgcj-tools-$(gcc_version).jar: classpath/tools/tools.jar
-	cp $< $@
+	javasrcdir=`cd $(srcdir) && pwd`; \
+	JARDIR=`mktemp -d $@.XXXXXX` || exit 1; \
+	touch -r $$javasrcdir/../gcc/ChangeLog $$JARDIR.stamp; \
+	[ $$javasrcdir/../gcc/java/ChangeLog -nt $$JARDIR.stamp ] \
+	    && touch -r $$javasrcdir/../gcc/java/ChangeLog $$JARDIR.stamp; \
+	[ $$javasrcdir/ChangeLog -nt $$JARDIR.stamp ] \
+	    && touch -r $$javasrcdir/ChangeLog $$JARDIR.stamp; \
+	cd $$JARDIR || exit 1; \
+	$(JAR) -xf ../$<; \
+	rm -rf META-INF; \
+	find -type f | xargs touch -r ../$$JARDIR.stamp; \
+	find -type d | xargs touch -r ../$$JARDIR.stamp; \
+	$(JAR) -cf at E ../$@ || exit 1; \
+	cd ..; \
+	rm -rf $$JARDIR $$JARDIR.stamp
 
 mostlyclean-local:
 	find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- .cvsignore	2 Aug 2006 21:18:16 -0000	1.163
+++ .cvsignore	11 Aug 2006 20:58:28 -0000	1.164
@@ -1 +1 @@
-gcc-4.1.1-20060802.tar.bz2
+gcc-4.1.1-20060811.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- gcc41.spec	2 Aug 2006 21:29:50 -0000	1.90
+++ gcc41.spec	11 Aug 2006 20:58:28 -0000	1.91
@@ -1,6 +1,6 @@
-%define DATE 20060802
+%define DATE 20060811
 %define gcc_version 4.1.1
-%define gcc_release 14
+%define gcc_release 15
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -134,8 +134,10 @@
 Patch27: gcc41-pr28370.patch
 Patch28: gcc41-pr28407.patch
 Patch29: gcc41-power6.patch
-Patch30: gcc41-CVE-2006-3619.patch
+Patch30: gcc41-power6-2.patch
 Patch31: gcc41-java-libdotdotlib.patch
+Patch32: gcc41-pr28600.patch
+Patch33: gcc41-rh200887.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -446,8 +448,10 @@
 %patch27 -p0 -b .pr28370~
 %patch28 -p0 -b .pr28407~
 %patch29 -p0 -b .power6~
-%patch30 -p0 -b .CVE-2006-3619~
+%patch30 -p0 -b .power6-2~
 %patch31 -p0 -b .java-libdotdotlib~
+%patch32 -p0 -b .pr28600~
+%patch33 -p0 -b .rh200887~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1508,6 +1512,18 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Aug 11 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-15
+- update from gcc-4_1-branch (-r115877:116082)
+  - PRs c++/27508, c++/28148, c++/28250, c++/28256, c++/28257, c++/28259,
+	c++/28267, c++/28274, c++/28347, c++/28432, c++/28557, c++/28594,
+	c++/28637, c++/28638, c++/28639, c++/28640, c++/28641, c/27721,
+	c/28136, fortran/27981, fortran/28548, fortran/28590,
+	middle-end/28651, rtl-optimization/27291, rtl-optimization/28221,
+	target/27566, target/27827
+- fix Fortran ICE with nested function (Paul Thomas, #200618,
+  PR fortran/28600)
+- fix multilib conflict in libgcj-tools-4.1.1.jar (#200887)
+
 * Wed Aug  2 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-14
 - update from gcc-4_1-branch (-r115644:115877)
   - PRs c++/27572, c++/27668, c++/27962, c++/28025, c++/28258, c++/28523,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- sources	2 Aug 2006 21:18:18 -0000	1.165
+++ sources	11 Aug 2006 20:58:28 -0000	1.166
@@ -1 +1 @@
-bea3fb5e55d9510ad89e03d521fe5744  gcc-4.1.1-20060802.tar.bz2
+5ef7a43629890be560c67e4354701824  gcc-4.1.1-20060811.tar.bz2


--- gcc41-CVE-2006-3619.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 11 21:09:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 17:09:14 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.121, 1.122 mkinitrd.spec, 1.145,
	1.146 sources, 1.146, 1.147
Message-ID: <200608112109.k7BL9E2s032093@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31983

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- .cvsignore	26 Jul 2006 17:52:56 -0000	1.121
+++ .cvsignore	11 Aug 2006 21:09:11 -0000	1.122
@@ -1,2 +1 @@
-bdevid-0.3.tar.bz2
-mkinitrd-5.1.2.tar.bz2
+mkinitrd-5.1.3.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- mkinitrd.spec	26 Jul 2006 17:52:56 -0000	1.145
+++ mkinitrd.spec	11 Aug 2006 21:09:11 -0000	1.146
@@ -3,7 +3,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.1.2
+Version: 5.1.3
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -16,7 +16,7 @@
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
 Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
-Requires: e2fsprogs >= 1.38-12
+Requires: e2fsprogs >= 1.38-12, glib2, libselinux, libsepol
 BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-9, pkgconfig, glib2-devel
 BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.9
 BuildRequires: device-mapper libselinux-devel libsepol-devel, python-devel >= %{pyver}
@@ -49,23 +49,15 @@
 Requires: glibc-devel, pkgconfig, e2fsprogs-devel, mkinitrd-devel, glib2-devel
 Requires: libbdevid
 
-%package -n libbdevid
-Summary: Library for probing block devices for their unique hardware IDs.
-Group: System Environment/Libraries
-Requires: glib2, e2fsprogs, libselinux, libsepol, device-mapper
-
 %package -n libbdevid-python
 Summary: Python bindings for libbdevid
 Group: System Environment/Libraries
-Requires: mkinitrd-devel, glib2, e2fsprogs, libselinux, libsepol, device-mapper
-Requires: libbdevid, python >= %{pyver}
+Requires: glib2, e2fsprogs, libselinux, libsepol, device-mapper, libbdevid,
+Requires: python >= %{pyver}
 
 %description devel
 C header files and library for functionality exported by libnash.
 
-%description -n libbdevid
-Library for probing block devices for their unique hardware IDs.
-
 %description -n libbdevid-python
 Python bindings for libbdevid.
 
@@ -105,6 +97,8 @@
 %attr(755,root,root) /sbin/new-kernel-pkg
 %attr(755,root,root) /sbin/grubby
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
+/%{_lib}/bdevid
+%{_libdir}/libbdevid.so.*
 
 %files devel
 %defattr(-,root,root)
@@ -118,14 +112,16 @@
 %{_includedir}/bdevid.h
 %{_includedir}/bdevid
 
-%files -n libbdevid
-/%{_lib}/bdevid
-%{_libdir}/libbdevid.so.*
-
 %files -n libbdevid-python
 /%{python_sitelib}/bdevid.so
 
 %changelog
+* Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 5.1.3-1
+- replace various sed/grep/cut/head calls with bash & awk equivalents
+- fix a typo
+- nfs loop fixes
+- silence xen errors when sysfs layout is different
+
 * Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 5.1.2-1
 - pull in new libbdevid for scsi probing fix
 - restructure package so things can include libbdevid (and its modules)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- sources	26 Jul 2006 18:40:03 -0000	1.146
+++ sources	11 Aug 2006 21:09:11 -0000	1.147
@@ -1,2 +1 @@
-5fb48a0a1d1c641c96194e429742d53c  bdevid-0.3.tar.bz2
-7979cdacfbbb428e996469752e63e69c  mkinitrd-5.1.2.tar.bz2
+c5739a169cbc21261fdafef60844ecb6  mkinitrd-5.1.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 11 21:15:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 17:15:05 -0400
Subject: rpms/mkinitrd/devel sources,1.147,1.148
Message-ID: <200608112115.k7BLF5bE000693@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv658

Modified Files:
	sources 
Log Message:
oops


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- sources	11 Aug 2006 21:09:11 -0000	1.147
+++ sources	11 Aug 2006 21:15:00 -0000	1.148
@@ -1 +1,2 @@
 c5739a169cbc21261fdafef60844ecb6  mkinitrd-5.1.3.tar.bz2
+5fb48a0a1d1c641c96194e429742d53c  bdevid-0.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 11 21:53:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 17:53:46 -0400
Subject: rpms/kernel/devel/configs config-xen-generic,1.24,1.25
Message-ID: <200608112153.k7BLrkZt008007@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-xen-generic 
Log Message:
  * linux-2.6-xen-fedora cset 
  * linux-2.6-xen cset 22809:d4b3aba8876df169ffd9fac1d17bd88d87eb67c5.
  * xen-unstable 11060:323eb29083e6d596800875cafe6f843b5627d77b
  * Integrate xen virtual frame buffer patch.
  * Enable CONFIG_CRASH on xen.




Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- config-xen-generic	1 Aug 2006 00:56:01 -0000	1.24
+++ config-xen-generic	11 Aug 2006 21:53:42 -0000	1.25
@@ -26,6 +26,8 @@
 # CONFIG_XEN_TPMDEV_BACKEND is not set
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_FRAMEBUFFER=m
+CONFIG_XEN_KEYBOARD=m
 CONFIG_XEN_SCRUB_PAGES=y
 # CONFIG_XEN_DISABLE_SERIAL is not set
 CONFIG_XEN_SYSFS=y
@@ -90,7 +92,6 @@
 # kexec does not work with Xen right now.
 #
 # CONFIG_KEXEC is not set
-# CONFIG_CRASH is not set
 # CONFIG_TCG_TPM is not set
 
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 21:53:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 17:53:45 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2549,
	1.2550 linux-2.6-xen.patch, 1.50, 1.51
Message-ID: <200608112153.k7BLrjn5007989@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
  * linux-2.6-xen-fedora cset 
  * linux-2.6-xen cset 22809:d4b3aba8876df169ffd9fac1d17bd88d87eb67c5.
  * xen-unstable 11060:323eb29083e6d596800875cafe6f843b5627d77b
  * Integrate xen virtual frame buffer patch.
  * Enable CONFIG_CRASH on xen.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2549
retrieving revision 1.2550
diff -u -r1.2549 -r1.2550
--- kernel-2.6.spec	11 Aug 2006 18:09:31 -0000	1.2549
+++ kernel-2.6.spec	11 Aug 2006 21:53:37 -0000	1.2550
@@ -325,7 +325,6 @@
 Patch954: linux-2.6-xen-execshield.patch
 Patch955: linux-2.6-xen-tux.patch
 Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
-Patch957: linux-2.6-xen-unbreak-oprofile.patch
 
 Patch990: linux-2.6-xen-compile-fixes.patch
 
@@ -817,7 +816,6 @@
 %patch954 -p1
 %patch955 -p1
 %patch956 -p1
-%patch957 -p1
 
 #%patch990 -p1
 
@@ -1697,6 +1695,14 @@
 %endif
 
 %changelog
+* Fri Aug 11 2006 Juan Quintela <quintela at redhat.com>
+- xen kernel update
+  * linux-2.6-xen-fedora cset 
+  * linux-2.6-xen cset 22809:d4b3aba8876df169ffd9fac1d17bd88d87eb67c5.
+  * xen-unstable 11060:323eb29083e6d596800875cafe6f843b5627d77b
+  * Integrate xen virtual frame buffer patch.
+  * Enable CONFIG_CRASH on xen.
+
 * Fri Aug 11 2006 Dave Jones <davej at redhat.com>
 - Yet more lockdep fixes.
 

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   92 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1185 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1831 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  153 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  457 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  478 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  699 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.S~                            |  488 +++
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  259 +
 arch/ia64/kernel/irq_ia64.c~                        |  553 +++
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  128 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  413 ++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  867 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2169 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   54 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1211 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1011 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/mm/pageattr-xen.c~                      |  397 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  283 ++
 drivers/xen/Makefile                                |   19 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  616 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  567 ++++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  848 ++++++
 drivers/xen/blkfront/block.h                        |  154 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1444 ++++++++++
 drivers/xen/blktap/common.h                         |  119 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  180 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  869 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  441 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/reboot.c                           |  383 ++
 drivers/xen/core/skbuff.c                           |  140 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  138 
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1346 +++++++++
 drivers/xen/netback/xenbus.c                        |  428 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1842 +++++++++++++
 drivers/xen/netfront/netfront.c.orig                | 1835 +++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  457 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   84 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  358 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1089 +++++++
 drivers/xen/xenbus/xenbus_probe.c.orig              | 1088 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 drivers/xen/xenfb/Makefile                          |    1 
 drivers/xen/xenfb/xenfb.c                           |  568 ++++
 drivers/xen/xenkbd/Makefile                         |    1 
 drivers/xen/xenkbd/xenkbd.c                         |  205 +
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  219 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  508 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   41 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   76 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  190 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   32 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   13 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  114 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  326 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/linux/xenfb.h                               |   97 
 include/linux/xenkbd.h                              |   82 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  440 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  605 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  508 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  300 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  120 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 420 files changed, 92152 insertions(+), 223 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.50 -r 1.51 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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- linux-2.6-xen.patch	4 Aug 2006 00:46:44 -0000	1.50
+++ linux-2.6-xen.patch	11 Aug 2006 21:53:38 -0000	1.51
@@ -1,6 +1,6 @@
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
---- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-08-01 02:30:59.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/boot-xen/Makefile	2006-08-04 16:33:25.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +23,9 @@
 +	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
---- linux-2.6/arch/i386/Kconfig	2006-08-01 06:44:38.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-08-02 18:15:29.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig compiling/arch/i386/Kconfig
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig	2006-08-02 02:30:18.000000000 +0200
++++ compiling/arch/i386/Kconfig	2006-08-04 16:33:25.000000000 +0200
 @@ -16,10 +16,12 @@ config X86_32
  
  config GENERIC_TIME
@@ -311,9 +311,9 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.cpu linux-2.6-xen-fedora/arch/i386/Kconfig.cpu
---- linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-08-01 02:30:59.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu compiling/arch/i386/Kconfig.cpu
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/Kconfig.cpu	2006-08-04 16:33:25.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -330,9 +330,9 @@
 -	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ
 +	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ && !X86_XEN
  	default y
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.debug linux-2.6-xen-fedora/arch/i386/Kconfig.debug
---- linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-08-01 02:30:59.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug compiling/arch/i386/Kconfig.debug
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/Kconfig.debug	2006-08-04 16:33:25.000000000 +0200
 @@ -2,6 +2,7 @@ menu "Kernel hacking"
  
  config TRACE_IRQFLAGS_SUPPORT
@@ -349,9 +349,9 @@
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/boot-xen.c linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c
---- linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-08-01 02:30:59.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c compiling/arch/i386/kernel/acpi/boot-xen.c
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/kernel/acpi/boot-xen.c	2006-08-04 16:33:25.000000000 +0200
 @@ -0,0 +1,1168 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1521,9 +1521,9 @@
 +
 +	return 0;
 +}
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/Makefile linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile
---- linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-08-01 02:30:59.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/Makefile compiling/arch/i386/kernel/acpi/Makefile
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/kernel/acpi/Makefile	2006-08-04 16:33:25.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1532,9 +1532,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
---- linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-01 02:30:59.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/alternative.c compiling/arch/i386/kernel/alternative.c
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/kernel/alternative.c	2006-08-04 16:33:25.000000000 +0200
 @@ -4,7 +4,11 @@
  #include <asm/alternative.h>
  #include <asm/sections.h>
@@ -1547,9 +1547,9 @@
  static int smp_alt_once      = 0;
  static int debug_alternative = 0;
  
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/apic-xen.c linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c
---- linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-08-01 02:30:59.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/apic-xen.c compiling/arch/i386/kernel/apic-xen.c
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/kernel/apic-xen.c	2006-08-04 16:33:25.000000000 +0200
 @@ -0,0 +1,160 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1711,9 +1711,9 @@
 +
 +	return 0;
 +}
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/asm-offsets.c linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c
---- linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-08-01 02:30:59.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/asm-offsets.c compiling/arch/i386/kernel/asm-offsets.c
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/kernel/asm-offsets.c	2006-08-04 16:33:25.000000000 +0200
 @@ -66,9 +66,14 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
@@ -1730,9 +1730,9 @@
  
  	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
  	DEFINE(VDSO_PRELINK, VDSO_PRELINK);
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/common-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c
---- linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-08-03 22:52:02.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c compiling/arch/i386/kernel/cpu/common-xen.c
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/kernel/cpu/common-xen.c	2006-08-04 16:33:25.000000000 +0200
 @@ -0,0 +1,740 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
@@ -2474,9 +2474,9 @@
 +	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
 +}
 +#endif
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile
---- linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-08-01 02:30:59.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/Makefile compiling/arch/i386/kernel/cpu/Makefile
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/kernel/cpu/Makefile	2006-08-04 16:33:25.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2486,9 +2486,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c
---- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-08-01 02:31:00.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c compiling/arch/i386/kernel/cpu/mtrr/main-xen.c
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-08-04 16:33:25.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2687,9 +2687,9 @@
 +}
 +
 +subsys_initcall(mtrr_init);
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile
---- linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-08-01 02:30:59.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile compiling/arch/i386/kernel/cpu/mtrr/Makefile
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/kernel/cpu/mtrr/Makefile	2006-08-04 16:33:25.000000000 +0200
 @@ -3,3 +3,10 @@ obj-y		+= amd.o
  obj-y		+= cyrix.o
  obj-y		+= centaur.o
@@ -2701,15 +2701,15 @@
 +obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/early_printk-xen.c linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c
---- linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-08-01 02:31:00.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c compiling/arch/i386/kernel/early_printk-xen.c
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/kernel/early_printk-xen.c	2006-08-04 16:33:25.000000000 +0200
 @@ -0,0 +1,2 @@
 +
 +#include "../../x86_64/kernel/early_printk-xen.c"
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/entry.S linux-2.6-xen-fedora/arch/i386/kernel/entry.S
---- linux-2.6/arch/i386/kernel/entry.S	2006-08-01 06:44:38.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-08-02 18:15:29.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/entry.S compiling/arch/i386/kernel/entry.S
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/entry.S	2006-08-02 02:30:18.000000000 +0200
++++ compiling/arch/i386/kernel/entry.S	2006-08-04 16:33:25.000000000 +0200
 @@ -265,7 +265,7 @@ ENTRY(sysenter_entry)
  	CFI_STARTPROC simple
  	CFI_DEF_CFA esp, 0
@@ -2737,9 +2737,9 @@
  	pushfl;					\
  	pushl $__KERNEL_CS;			\
  	pushl $sysenter_past_esp
[...90627 lines suppressed...]
  	lru_add_drain();
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/page_alloc.c linux-2.6-xen-fedora/mm/page_alloc.c
---- linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-08-01 02:31:27.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c compiling/mm/page_alloc.c
+--- /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
++++ compiling/mm/page_alloc.c	2006-08-04 16:33:50.000000000 +0200
 @@ -443,7 +443,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -89848,9 +95937,9 @@
  
  	if (PageAnon(page))
  		page->mapping = NULL;
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
---- linux-2.6/net/core/dev.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/dev.c	2006-08-01 02:31:27.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/dev.c compiling/net/core/dev.c
+--- /mnt/ro/repos/hg/linux-2.6/net/core/dev.c	2006-08-04 13:45:06.000000000 +0200
++++ compiling/net/core/dev.c	2006-08-04 16:36:22.000000000 +0200
 @@ -117,6 +117,12 @@
  #include <linux/dmaengine.h>
  #include <linux/err.h>
@@ -89864,7 +95953,7 @@
  /*
   *	The list of packet types we will receive (as opposed to discard)
   *	and the routines to invoke.
-@@ -1392,6 +1398,43 @@ out_kfree_skb:
+@@ -1382,6 +1388,43 @@ out_kfree_skb:
  	}						\
  }
  
@@ -89908,7 +95997,7 @@
  /**
   *	dev_queue_xmit - transmit a buffer
   *	@skb: buffer to transmit
-@@ -1424,6 +1467,12 @@ int dev_queue_xmit(struct sk_buff *skb)
+@@ -1414,6 +1457,12 @@ int dev_queue_xmit(struct sk_buff *skb)
  	struct Qdisc *q;
  	int rc = -ENOMEM;
  
@@ -89921,7 +96010,7 @@
  	/* GSO will handle the following emulations directly. */
  	if (netif_needs_gso(dev, skb))
  		goto gso;
-@@ -1813,6 +1862,19 @@ int netif_receive_skb(struct sk_buff *sk
+@@ -1803,6 +1852,19 @@ int netif_receive_skb(struct sk_buff *sk
  	}
  #endif
  
@@ -89941,7 +96030,7 @@
  	list_for_each_entry_rcu(ptype, &ptype_all, list) {
  		if (!ptype->dev || ptype->dev == skb->dev) {
  			if (pt_prev) 
-@@ -3604,6 +3666,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
+@@ -3589,6 +3651,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
  EXPORT_SYMBOL(net_enable_timestamp);
  EXPORT_SYMBOL(net_disable_timestamp);
  EXPORT_SYMBOL(dev_get_flags);
@@ -89949,22 +96038,10 @@
  
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/pktgen.c linux-2.6-xen-fedora/net/core/pktgen.c
---- linux-2.6/net/core/pktgen.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/pktgen.c	2006-08-01 02:31:27.000000000 +0200
-@@ -6,7 +6,7 @@
-  *
-  * Alexey Kuznetsov  <kuznet at ms2.inr.ac.ru>
-  * Ben Greear <greearb at candelatech.com>
-- * Jens L??s <jens.laas at data.slu.se>
-+ * Jens L????????s <jens.laas at data.slu.se>
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
---- linux-2.6/net/core/skbuff.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-01 02:31:27.000000000 +0200
-@@ -146,6 +146,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c compiling/net/core/skbuff.c
+--- /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c	2006-08-04 13:45:06.000000000 +0200
++++ compiling/net/core/skbuff.c	2006-08-04 16:36:22.000000000 +0200
+@@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
   */
@@ -89972,7 +96049,7 @@
  struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
  			    int fclone)
  {
-@@ -200,6 +201,7 @@ nodata:
+@@ -193,6 +194,7 @@ nodata:
  	skb = NULL;
  	goto out;
  }
@@ -89980,7 +96057,7 @@
  
  /**
   *	alloc_skb_from_cache	-	allocate a network buffer
-@@ -217,14 +219,18 @@ nodata:
+@@ -210,14 +212,18 @@ nodata:
   */
  struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp,
  				     unsigned int size,
@@ -90002,7 +96079,7 @@
  	if (!skb)
  		goto out;
  
-@@ -241,17 +247,29 @@ struct sk_buff *alloc_skb_from_cache(kme
+@@ -234,17 +240,29 @@ struct sk_buff *alloc_skb_from_cache(kme
  	skb->data = data;
  	skb->tail = data;
  	skb->end  = data + size;
@@ -90039,7 +96116,7 @@
  	skb = NULL;
  	goto out;
  }
-@@ -446,6 +464,10 @@ struct sk_buff *skb_clone(struct sk_buff
+@@ -462,6 +480,10 @@ struct sk_buff *skb_clone(struct sk_buff
  	C(local_df);
  	n->cloned = 1;
  	n->nohdr = 0;
@@ -90050,9 +96127,9 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-08-01 02:31:27.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
++++ compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-08-04 16:33:51.000000000 +0200
 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -90067,9 +96144,9 @@
  					ip_nat_cheat_check(oldport ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c
---- linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-08-01 02:31:27.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c compiling/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
++++ compiling/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-08-04 16:33:51.000000000 +0200
 @@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
@@ -90084,9 +96161,9 @@
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/xfrm4_output.c linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c
---- linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-08-01 02:31:28.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
+--- /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
++++ compiling/net/ipv4/xfrm4_output.c	2006-08-04 16:33:51.000000000 +0200
 @@ -18,6 +18,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
@@ -90107,10 +96184,10 @@
  	if (skb->ip_summed == CHECKSUM_HW) {
  		err = skb_checksum_help(skb, 0);
  		if (err)
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
---- linux-2.6/net/ipv6/addrconf.c	2006-07-16 19:14:10.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-08-01 02:31:28.000000000 +0200
-@@ -2488,6 +2488,7 @@ static void addrconf_dad_start(struct in
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
+--- /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c	2006-08-04 13:45:06.000000000 +0200
++++ compiling/net/ipv6/addrconf.c	2006-08-04 16:36:23.000000000 +0200
+@@ -2514,6 +2514,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  
  	if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
@@ -90118,7 +96195,7 @@
  	    !(ifp->flags&IFA_F_TENTATIVE)) {
  		ifp->flags &= ~IFA_F_TENTATIVE;
  		spin_unlock_bh(&ifp->lock);
-@@ -2572,6 +2573,7 @@ static void addrconf_dad_completed(struc
+@@ -2598,6 +2599,7 @@ static void addrconf_dad_completed(struc
  	if (ifp->idev->cnf.forwarding == 0 &&
  	    ifp->idev->cnf.rtr_solicits > 0 &&
  	    (dev->flags&IFF_LOOPBACK) == 0 &&
@@ -90126,9 +96203,9 @@
  	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
  		struct in6_addr all_routers;
  
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/scripts/Makefile.xen linux-2.6-xen-fedora/scripts/Makefile.xen
---- linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-08-01 02:31:28.000000000 +0200
+diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen compiling/scripts/Makefile.xen
+--- /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ compiling/scripts/Makefile.xen	2006-08-04 16:33:52.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)



From fedora-cvs-commits at redhat.com  Fri Aug 11 21:59:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 17:59:33 -0400
Subject: rpms/kernel/devel .cvsignore, 1.510, 1.511 kernel-2.6.spec, 1.2550,
	1.2551 sources, 1.473, 1.474
Message-ID: <200608112159.k7BLxXrs009670@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore kernel-2.6.spec sources 
Log Message:
- xen HV update cset 11061:80f364a5662f.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -r1.510 -r1.511
--- .cvsignore	7 Aug 2006 19:07:44 -0000	1.510
+++ .cvsignore	11 Aug 2006 21:59:30 -0000	1.511
@@ -3,5 +3,5 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-xen-10924.tar.bz2
 patch-2.6.18-rc4.bz2
+xen-11061.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2550
retrieving revision 1.2551
diff -u -r1.2550 -r1.2551
--- kernel-2.6.spec	11 Aug 2006 21:53:37 -0000	1.2550
+++ kernel-2.6.spec	11 Aug 2006 21:59:30 -0000	1.2551
@@ -33,7 +33,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_hv_cset 10924
+%define xen_hv_cset 11061
 %define make_target bzImage
 %define kernel_image x86
 %define xen_flags debug=y verbose=y crash_debug=y
@@ -1696,6 +1696,7 @@
 
 %changelog
 * Fri Aug 11 2006 Juan Quintela <quintela at redhat.com>
+- xen HV update cset 11061:80f364a5662f.
 - xen kernel update
   * linux-2.6-xen-fedora cset 
   * linux-2.6-xen cset 22809:d4b3aba8876df169ffd9fac1d17bd88d87eb67c5.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -r1.473 -r1.474
--- sources	7 Aug 2006 19:07:44 -0000	1.473
+++ sources	11 Aug 2006 21:59:31 -0000	1.474
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-32a856cececcc35cb834cfaccc3c2523  xen-10924.tar.bz2
 780289cba0d4529ff80956e145ce567a  patch-2.6.18-rc4.bz2
+71780125173fe1359fec8dabfbd0bc45  xen-11061.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 11 22:05:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 18:05:00 -0400
Subject: rpms/kdemultimedia/FC-5 kdemultimedia.spec,1.62,1.63
Message-ID: <200608112205.k7BM50lD010944@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdemultimedia.spec 
Log Message:
3.5.4



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-5/kdemultimedia.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kdemultimedia.spec	11 Aug 2006 18:34:20 -0000	1.62
+++ kdemultimedia.spec	11 Aug 2006 22:04:57 -0000	1.63
@@ -186,6 +186,7 @@
 %{_libdir}/*.so*
 %{_libdir}/*.la
 %{_libdir}/kde3/*
+%{_libdir}/kconf_update_bin/*
 %{_bindir}/*
 %{_datadir}/applications/*
 %{_datadir}/apps/*



From fedora-cvs-commits at redhat.com  Fri Aug 11 22:21:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 18:21:40 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2551, 1.2552 git-gregkh.patch,
	1.5, 1.6
Message-ID: <200608112221.k7BMLefM029651@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec git-gregkh.patch 
Log Message:
update to daily greg bits


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2551
retrieving revision 1.2552
diff -u -r1.2551 -r1.2552
--- kernel-2.6.spec	11 Aug 2006 21:59:30 -0000	1.2551
+++ kernel-2.6.spec	11 Aug 2006 22:21:35 -0000	1.2552
@@ -1706,6 +1706,7 @@
 
 * Fri Aug 11 2006 Dave Jones <davej at redhat.com>
 - Yet more lockdep fixes.
+- Update to GregKH's daily tree.
 
 * Thu Aug 10 2006 Roland McGrath <roland at redhat.com>
 - New utrace patch: fix ptrace synchronization issues.

git-gregkh.patch:
 b/Documentation/kobject.txt                   |    2 
 b/MAINTAINERS                                 |    8 
 b/Makefile                                    |   23 +
 b/arch/arm/common/rtctime.c                   |    1 
 b/arch/arm/mach-ixp4xx/common-pci.c           |    2 
 b/arch/arm/mach-ixp4xx/gtwx5715-setup.c       |    7 
 b/drivers/ide/pci/generic.c                   |   30 +
 b/drivers/media/dvb/bt8xx/dst.c               |   58 +--
 b/drivers/media/dvb/dvb-core/Makefile         |    6 
 b/drivers/media/radio/Kconfig                 |   12 
 b/drivers/media/radio/Makefile                |    1 
 b/drivers/media/radio/dsbr100.c               |  430 ++++++++++++++++++++++++++
 b/drivers/media/video/Kconfig                 |   12 
 b/drivers/media/video/Makefile                |    2 
 b/drivers/media/video/compat_ioctl32.c        |   32 +
 b/drivers/media/video/cx25840/cx25840-core.c  |    4 
 b/drivers/media/video/cx88/cx88-video.c       |    4 
 b/drivers/media/video/msp3400-kthreads.c      |    4 
 b/drivers/media/video/pwc/Kconfig             |    2 
 b/drivers/media/video/pwc/pwc-if.c            |    1 
 b/drivers/media/video/saa7134/saa7134-video.c |    2 
 b/drivers/media/video/tuner-types.c           |   14 
 b/drivers/media/video/v4l1-compat.c           |    4 
 b/drivers/media/video/v4l2-common.c           |    6 
 b/drivers/media/video/videodev.c              |    2 
 b/drivers/media/video/vivi.c                  |    4 
 b/drivers/mmc/mmc_queue.c                     |    3 
 b/drivers/mmc/wbsd.c                          |    9 
 b/drivers/net/myri10ge/myri10ge.c             |    2 
 b/drivers/net/tg3.c                           |   51 +--
 b/drivers/net/tg3.h                           |    8 
 b/drivers/pci/hotplug/Kconfig                 |    7 
 b/drivers/pci/hotplug/pciehp.h                |    5 
 b/drivers/pci/hotplug/pciehp_hpc.c            |    4 
 b/drivers/s390/char/tape_class.c              |    2 
 b/drivers/s390/cio/device_fsm.c               |    1 
 b/drivers/s390/cio/device_ops.c               |    3 
 b/drivers/scsi/arm/Kconfig                    |    3 
 b/drivers/scsi/arm/scsi.h                     |    2 
 b/drivers/scsi/ata_piix.c                     |    5 
 b/drivers/scsi/libata-core.c                  |   34 --
 b/drivers/scsi/libata-scsi.c                  |   13 
 b/drivers/scsi/sata_sil24.c                   |    1 
 b/drivers/usb/host/ohci-au1xxx.c              |    1 
 b/drivers/usb/input/appletouch.c              |    2 
 b/drivers/usb/misc/usbtest.c                  |    5 
 b/drivers/usb/serial/ftdi_sio.c               |    2 
 b/drivers/usb/serial/ftdi_sio.h               |    6 
 b/drivers/usb/serial/ipaq.c                   |    2 
 b/drivers/usb/storage/unusual_devs.h          |   10 
 b/fs/jfs/inode.c                              |   16 
 b/fs/jfs/jfs_inode.h                          |    1 
 b/fs/jfs/super.c                              |  118 ++++++-
 b/fs/xfs/xfs_alloc.c                          |  103 +++---
 b/include/linux/kernel.h                      |    1 
 b/include/linux/skbuff.h                      |    4 
 b/include/media/v4l2-dev.h                    |    2 
 b/net/core/dst.c                              |    3 
 b/net/core/pktgen.c                           |    4 
 b/net/core/rtnetlink.c                        |   15 
 b/net/core/skbuff.c                           |    4 
 b/net/core/wireless.c                         |   24 +
 b/net/ipv4/route.c                            |    2 
 b/net/ipv4/tcp_output.c                       |   12 
 b/net/ipv6/addrconf.c                         |    4 
 b/net/ipx/af_ipx.c                            |   10 
 b/sound/oss/Kconfig                           |    6 
 b/sound/pci/Kconfig                           |   70 ++--
 b/usr/Makefile                                |    3 
 drivers/media/video/dsbr100.c                 |  430 --------------------------
 70 files changed, 973 insertions(+), 713 deletions(-)

Index: git-gregkh.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-gregkh.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- git-gregkh.patch	10 Aug 2006 23:51:36 -0000	1.5
+++ git-gregkh.patch	11 Aug 2006 22:21:35 -0000	1.6
@@ -1,3 +1,145 @@
+commit f54fa84dda211f68f65002efa44142207c886c79
+Author: Orjan Friberg <orjan.friberg at axis.com>
+Date:   Tue Aug 8 23:31:40 2006 -0700
+
+    USB: usbtest.c: unsigned retval makes ctrl_out return 0 in case of error
+    
+    In my quest to try and figure out why test 14 (control write) doesn't
+    work with my EZ-USB board, I noticed that sometimes testusb reported
+    no error even though the kernel log complained "byte 0 is 0 not 2" etc.
+    
+    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit 2011e9249a252e0655807fbe6841f6cfe6b6c197
+Author: Jonathan Davies <jjd27 at cam.ac.uk>
+Date:   Wed Aug 9 10:48:03 2006 +0100
+
+    USB: ftdi_sio driver - new PIDs
+    
+    Signed-off-by: Jonathan Davies <jjd27 at cam.ac.uk>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit 922fdaa692e23bf57a10c16047d993c181991579
+Author: Norihiko Tomiyama <norihiko.tomiyama at ctc-g.co.jp>
+Date:   Tue Aug 8 14:31:25 2006 +0900
+
+    USB: Additional PID for SHARP W-ZERO3
+    
+    I write a patch for ipaq.c.
+    Would you like to add upstream tree ?
+    
+    This patch enables a support of "SHARP W-ZERO3(WS004SH)" and "SHARP W-ZERO3[es](WS007SH)".
+    
+    From: Norihiko Tomiyama <norihiko.tomiyama at ctc-g.co.jp>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit 7af569abc33ce09d3cb93e9b2160efff2531c59f
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date:   Wed Jul 19 15:39:46 2006 +0200
+
+    USB: appletouch: fix atp_disconnect
+    
+    appletouch uses urb->transfer_dma after having freed the urb, this shows
+    up only if the system is compiled with slab debugging. This patch fixes
+    it by reordering the free calls.
+    
+    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+    Signed-off-by: Vojtech Pavlik <vojtech at suse.cz>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit 919aeadcfa8e72ec2d6bf7bd405a16c40b8d8ecf
+Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
+Date:   Thu Aug 3 09:54:24 2006 +0900
+
+    USB: removed a unbalanced #endif from ohci-au1xxx.c
+    
+    This patch has removed a unbalanced #endif from ohci-au1xxx.c .
+    Please apply before 2.6.18 release.
+    
+    Error message was:
+    In file included from drivers/usb/host/ohci-hcd.c:909:
+    drivers/usb/host/ohci-au1xxx.c:113:2: #endif without #if
+    
+    Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit b41ee5d62211825cbe5e583cafc2255c91385aee
+Author: David Kuehling <dvdkhlng at gmx.de>
+Date:   Mon Aug 7 10:18:48 2006 -0400
+
+    USB: unusual_devs entry for A-VOX WSX-300ER MP3 player
+    
+    This patch (as763) adds an unusual_devs entry for the A-VOX WSX-300ER MP3
+    player.
+    
+    From: David Kuehling <dvdkhlng at gmx.de>
+    Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit f0c1dc07309f0fe3409b92eb170b648a487b1e81
+Author: Dave Jones <davej at redhat.com>
+Date:   Wed Aug 9 15:25:09 2006 -0400
+
+    PCI: remove dead HOTPLUG_PCI_SHPC_PHPRM_LEGACY option.
+    
+    Nothing in the tree references this config option.
+    
+    Signed-off-by: Dave Jones <davej at redhat.com>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit e50d1088bf2e5a68068c5f602be1dcc3e52dc873
+Author: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
+Date:   Tue Aug 8 09:44:26 2006 -0400
+
+    pciehp: make pciehp build for powerpc
+    
+    Make pciehp build on powerpc
+    
+    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
+    Acked-by: Randy Dunlap <rdunlap at xenotime.net>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit 1cc6daf2349ea07830906e05164256ab36d82697
+Author: Pavel Machek <pavel at suse.cz>
+Date:   Tue Aug 8 01:37:15 2006 +0200
+
+    pr_debug() should not be used in drivers
+    
+    pr_debug() should not be used from drivers, add comment saying that.
+    
+    Signed-off-by: Pavel Machek <pavel at suse.cz>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit e9539ee73a9b85bdc6eab9e15dd1ee639a815406
+Author: Brandon Philips <brandon at ifup.org>
+Date:   Tue Aug 1 14:04:17 2006 -0500
+
+    genhd.c reference in Documentation/kobjects.txt
+    
+    block/genhd.c no longer in drivers/.  Update Documentation/kobjects.txt
+    
+    Signed-off-by: Brandon Philips <brandon at ifup.org>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit 4ca8a3c1b17cde8241eb9157484519427fa5bf91
+Author: Steven Rostedt <rostedt at goodmis.org>
+Date:   Thu Aug 3 12:28:11 2006 -0400
+
+    Add stable branch to maintainers file
+    
+    While helping someone to submit a patch to the stable branch, I noticed
+    that the stable branch is not listed in the MAINTAINERS file.  This was
+    after I went there to look for the email addresses for the stable branch
+    list (stable at kernel.org).
+    
+    This patch adds the stable branch to the maintainers file so that people
+    can find where to send patches when they have a fix for the stable team.
+    
+    Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
+    Signed-off-by: Chris Wright <chrisw at sous-sol.org>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
 commit c4e321b85a89d7cd392d3105b2c033a6c58ed337
 Merge: f8872f4... dd2c609...
 Author: Greg Kroah-Hartman <gregkh at suse.de>
@@ -865,6 +1007,8 @@
     
     Signed-off-by: Dave Kleikamp <shaggy at austin.ibm.com>
 
+ b/Documentation/kobject.txt                   |    2 
+ b/MAINTAINERS                                 |    8 
  b/Makefile                                    |   24 +
  b/arch/arm/common/rtctime.c                   |    1 
  b/arch/arm/mach-ixp4xx/common-pci.c           |    2 
@@ -894,6 +1038,9 @@
  b/drivers/net/myri10ge/myri10ge.c             |    2 
  b/drivers/net/tg3.c                           |   51 +--
  b/drivers/net/tg3.h                           |    8 
+ b/drivers/pci/hotplug/Kconfig                 |    7 
+ b/drivers/pci/hotplug/pciehp.h                |    5 
+ b/drivers/pci/hotplug/pciehp_hpc.c            |    4 
  b/drivers/s390/char/tape_class.c              |    2 
  b/drivers/s390/cio/device_fsm.c               |    1 
  b/drivers/s390/cio/device_ops.c               |    3 
@@ -903,10 +1050,18 @@
  b/drivers/scsi/libata-core.c                  |   34 --
  b/drivers/scsi/libata-scsi.c                  |   13 
  b/drivers/scsi/sata_sil24.c                   |    1 
+ b/drivers/usb/host/ohci-au1xxx.c              |    1 
+ b/drivers/usb/input/appletouch.c              |    2 
+ b/drivers/usb/misc/usbtest.c                  |    5 
+ b/drivers/usb/serial/ftdi_sio.c               |    2 
+ b/drivers/usb/serial/ftdi_sio.h               |    6 
+ b/drivers/usb/serial/ipaq.c                   |    2 
+ b/drivers/usb/storage/unusual_devs.h          |   10 
  b/fs/jfs/inode.c                              |   16 
  b/fs/jfs/jfs_inode.h                          |    1 
  b/fs/jfs/super.c                              |  118 ++++++-
  b/fs/xfs/xfs_alloc.c                          |  103 +++---
+ b/include/linux/kernel.h                      |    1 
  b/include/linux/skbuff.h                      |    4 
  b/include/media/v4l2-dev.h                    |    2 
  b/net/core/dst.c                              |    3 
@@ -922,8 +1077,40 @@
  b/sound/pci/Kconfig                           |   70 ++--
  b/usr/Makefile                                |    3 
  drivers/media/video/dsbr100.c                 |  430 --------------------------
- 57 files changed, 934 insertions(+), 698 deletions(-)
+ 70 files changed, 973 insertions(+), 714 deletions(-)
 
+diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt
+index 8d9bffb..949f7b5 100644
+--- a/Documentation/kobject.txt
++++ b/Documentation/kobject.txt
+@@ -247,7 +247,7 @@ the object-specific fields, which includ
+ - default_attrs: Default attributes to be exported via sysfs when the
+   object is registered.Note that the last attribute has to be
+   initialized to NULL ! You can find a complete implementation
+-  in drivers/block/genhd.c
++  in block/genhd.c
+ 
+ 
+ Instances of struct kobj_type are not registered; only referenced by
+diff --git a/MAINTAINERS b/MAINTAINERS
+index e3e1515..21116cc 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -2656,6 +2656,14 @@ M:	chrisw at sous-sol.org
+ L:	stable at kernel.org
+ S:	Maintained
+ 
++STABLE BRANCH:
++P:	Greg Kroah-Hartman
++M:	greg at kroah.com
++P:	Chris Wright
++M:	chrisw at sous-sol.org
++L:	stable at kernel.org
++S:	Maintained
++
+ TPM DEVICE DRIVER
+ P:	Kylene Hall
+ M:	kjhall at us.ibm.com
 diff --git a/Makefile b/Makefile
 index c2f78a5..c53ed56 100644
 --- a/Makefile
@@ -2873,6 +3060,55 @@
  	struct tg3_tx_buffer_desc	*tx_ring;
  	struct tx_ring_info		*tx_buffers;
  	dma_addr_t			tx_desc_mapping;
+diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
+index 3fae77f..3c148ea 100644
+--- a/drivers/pci/hotplug/Kconfig
++++ b/drivers/pci/hotplug/Kconfig
+@@ -153,13 +153,6 @@ config HOTPLUG_PCI_SHPC_POLL_EVENT_MODE
+ 
+ 	  When in doubt, say N.
+ 
+-config HOTPLUG_PCI_SHPC_PHPRM_LEGACY
+-	bool "For AMD SHPC only: Use $HRT for resource/configuration"
+-	depends on HOTPLUG_PCI_SHPC && !ACPI 
+-	help
+-	  Say Y here for AMD SHPC. You have to select this option if you are 
+-	  using this driver on platform with AMD SHPC.
+-
+ config HOTPLUG_PCI_RPA
+ 	tristate "RPA PCI Hotplug driver"
+ 	depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE
+diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
+index ce89f58..eaea9d3 100644
+--- a/drivers/pci/hotplug/pciehp.h
++++ b/drivers/pci/hotplug/pciehp.h
+@@ -279,6 +279,11 @@ struct hpc_ops {
+ 
+ 
+ #ifdef CONFIG_ACPI
++#include <acpi/acpi.h>
++#include <acpi/acpi_bus.h>
++#include <acpi/actypes.h>
++#include <linux/pci-acpi.h>
++
+ #define pciehp_get_hp_hw_control_from_firmware(dev) \
+ 	pciehp_acpi_get_hp_hw_control_from_firmware(dev)
+ static inline int pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
+diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
+index 0d8fb6e..6ab3b6c 100644
+--- a/drivers/pci/hotplug/pciehp_hpc.c
++++ b/drivers/pci/hotplug/pciehp_hpc.c
+@@ -38,10 +38,6 @@ #include <linux/interrupt.h>
+ 
+ #include "../pci.h"
+ #include "pciehp.h"
+-#include <acpi/acpi.h>
+-#include <acpi/acpi_bus.h>
+-#include <acpi/actypes.h>
+-#include <linux/pci-acpi.h>
+ #ifdef DEBUG
+ #define DBG_K_TRACE_ENTRY      ((unsigned int)0x00000001)	/* On function entry */
+ #define DBG_K_TRACE_EXIT       ((unsigned int)0x00000002)	/* On function exit */
 diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
 index 643b6d0..56b8761 100644
 --- a/drivers/s390/char/tape_class.c
@@ -3085,6 +3321,116 @@
  	probe_ent->private_data = hpriv;
  
  	hpriv->host_base = host_base;
+diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
+index 822914e..f7a975d 100644
+--- a/drivers/usb/host/ohci-au1xxx.c
++++ b/drivers/usb/host/ohci-au1xxx.c
+@@ -110,7 +110,6 @@ #endif
+ 
+ 	printk(KERN_DEBUG __FILE__
+ 	": Clock to USB host has been enabled \n");
+-#endif
+ }
+ 
+ static void au1xxx_stop_ohc(struct platform_device *dev)
+diff --git a/drivers/usb/input/appletouch.c b/drivers/usb/input/appletouch.c
+index 9e3f139..044faa0 100644
+--- a/drivers/usb/input/appletouch.c
++++ b/drivers/usb/input/appletouch.c
+@@ -597,9 +597,9 @@ static void atp_disconnect(struct usb_in
+ 	if (dev) {
+ 		usb_kill_urb(dev->urb);
+ 		input_unregister_device(dev->input);
+-		usb_free_urb(dev->urb);
+ 		usb_buffer_free(dev->udev, dev->datalen,
+ 				dev->data, dev->urb->transfer_dma);
++		usb_free_urb(dev->urb);
+ 		kfree(dev);
+ 	}
+ 	printk(KERN_INFO "input: appletouch disconnected\n");
+diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
+index 786e1db..983e104 100644
+--- a/drivers/usb/misc/usbtest.c
++++ b/drivers/usb/misc/usbtest.c
+@@ -1242,11 +1242,12 @@ done:
+ static int ctrl_out (struct usbtest_dev *dev,
+ 		unsigned count, unsigned length, unsigned vary)
+ {
+-	unsigned		i, j, len, retval;
++	unsigned		i, j, len;
++	int			retval;
+ 	u8			*buf;
+ 	char			*what = "?";
+ 	struct usb_device	*udev;
+-	
++
+ 	if (length < 1 || length > 0xffff || vary >= length)
+ 		return -EINVAL;
+ 
+diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
+index a20da85..15945e8 100644
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -306,6 +306,8 @@ static struct ftdi_sio_quirk ftdi_HE_TIR
+ 
+ 
+ static struct usb_device_id id_table_combined [] = {
++	{ USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_ACTZWAVE_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) },
+diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
+index 9f7343a..8888cd8 100644
+--- a/drivers/usb/serial/ftdi_sio.h
++++ b/drivers/usb/serial/ftdi_sio.h
+@@ -32,6 +32,12 @@ #define FTDI_NF_RIC_VID	0x0DCD	/* Vendor
+ #define FTDI_NF_RIC_PID	0x0001	/* Product Id */
+ 
+ 
++/* www.canusb.com Lawicel CANUSB device */
++#define FTDI_CANUSB_PID 0xFFA8 /* Product Id */
++
++/* AlphaMicro Components AMC-232USB01 device */
++#define FTDI_AMC232_PID 0xFF00 /* Product Id */
++
+ /* ACT Solutions HomePro ZWave interface (http://www.act-solutions.com/HomePro.htm) */
+ #define FTDI_ACTZWAVE_PID	0xF2D0
+ 
+diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
+index 7e1bd5d..9840bad 100644
+--- a/drivers/usb/serial/ipaq.c
++++ b/drivers/usb/serial/ipaq.c
+@@ -251,6 +251,8 @@ static struct usb_device_id ipaq_id_tabl
+ 	{ USB_DEVICE(0x04C5, 0x1079) }, /* FUJITSU USB Sync */
+ 	{ USB_DEVICE(0x04DA, 0x2500) }, /* Panasonic USB Sync */
+ 	{ USB_DEVICE(0x04DD, 0x9102) }, /* SHARP WS003SH USB Modem */
++	{ USB_DEVICE(0x04DD, 0x9121) }, /* SHARP WS004SH USB Modem */
++	{ USB_DEVICE(0x04DD, 0x9123) }, /* SHARP WS007SH USB Modem */
+ 	{ USB_DEVICE(0x04E8, 0x5F00) }, /* Samsung NEXiO USB Sync */
+ 	{ USB_DEVICE(0x04E8, 0x5F01) }, /* Samsung NEXiO USB Sync */
+ 	{ USB_DEVICE(0x04E8, 0x5F02) }, /* Samsung NEXiO USB Sync */
+diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
+index 2793f9a..fd158e0 100644
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1240,6 +1240,16 @@ UNUSUAL_DEV(  0x0ed1, 0x7636, 0x0103, 0x
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+ 		US_FL_IGNORE_RESIDUE | US_FL_GO_SLOW | US_FL_MAX_SECTORS_64),
+ 
++/* David Kuehling <dvdkhlng at gmx.de>:
++ * for MP3-Player AVOX WSX-300ER (bought in Japan).  Reports lots of SCSI
++ * errors when trying to write.
++ */
++UNUSUAL_DEV(  0x0f19, 0x0105, 0x0100, 0x0100,
++		"C-MEX",
++		"A-VOX",
++		US_SC_DEVICE, US_PR_DEVICE, NULL,
++		US_FL_IGNORE_RESIDUE ),
++
+ /* Reported by Michael Stattmann <michael at stattmann.com> */
+ UNUSUAL_DEV(  0x0fce, 0xd008, 0x0000, 0x0000,
+ 		"Sony Ericsson",
 diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
 index 43e3f56..a223cf4 100644
 --- a/fs/jfs/inode.c
@@ -3475,6 +3821,18 @@
  error0:
  	up_read(&args.mp->m_peraglock);
  	return error;
+diff --git a/include/linux/kernel.h b/include/linux/kernel.h
+index 181c69c..851aa1b 100644
+--- a/include/linux/kernel.h
++++ b/include/linux/kernel.h
+@@ -210,6 +210,7 @@ #define TAINT_BAD_PAGE			(1<<5)
+ extern void dump_stack(void);
+ 
+ #ifdef DEBUG
++/* If you are writing a driver, please use dev_dbg instead */
+ #define pr_debug(fmt,arg...) \
+ 	printk(KERN_DEBUG fmt,##arg)
+ #else
 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
 index 19c96d4..3573ba9 100644
 --- a/include/linux/skbuff.h



From fedora-cvs-commits at redhat.com  Fri Aug 11 22:22:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 18:22:58 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2552,
	1.2553 linux-2.6-gfs2-dlm.patch, 1.13, 1.14
Message-ID: <200608112222.k7BMMwao029957@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-gfs2-dlm.patch 
Log Message:
gfs2 locking bugfix


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2552
retrieving revision 1.2553
diff -u -r1.2552 -r1.2553
--- kernel-2.6.spec	11 Aug 2006 22:21:35 -0000	1.2552
+++ kernel-2.6.spec	11 Aug 2006 22:22:53 -0000	1.2553
@@ -1707,6 +1707,7 @@
 * Fri Aug 11 2006 Dave Jones <davej at redhat.com>
 - Yet more lockdep fixes.
 - Update to GregKH's daily tree.
+- GFS2/DLM locking bugfix
 
 * Thu Aug 10 2006 Roland McGrath <roland at redhat.com>
 - New utrace patch: fix ptrace synchronization issues.

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   21 
 fs/dlm/Makefile                    |   19 
 fs/dlm/ast.c                       |  172 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 +++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  387 +++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  541 +++++
 fs/dlm/lock.c                      | 3846 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   61 
 fs/dlm/lockspace.c                 |  716 ++++++
 fs/dlm/lockspace.h                 |   25 
 fs/dlm/lowcomms.c                  | 1238 +++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   97 
 fs/dlm/member.c                    |  327 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  116 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  471 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  776 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  286 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/user.c                      |  785 +++++++
 fs/dlm/user.h                      |   16 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1236 +++++++++++
 fs/gfs2/bmap.h                     |   27 
 fs/gfs2/daemon.c                   |  196 +
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1976 +++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++
 fs/gfs2/eattr.h                    |   97 
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2282 +++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  564 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  659 ++++++
 fs/gfs2/inode.c                    | 1344 ++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  290 ++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  302 ++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 +++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 +++++++
 fs/gfs2/lops.h                     |   96 
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  780 +++++++
 fs/gfs2/meta_io.h                  |   74 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  308 ++
 fs/gfs2/ops_address.c              |  797 +++++++
 fs/gfs2/ops_address.h              |   18 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  293 ++
 fs/gfs2/ops_export.h               |   19 
 fs/gfs2/ops_file.c                 |  812 +++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  840 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1165 +++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  471 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  188 +
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/quota.c                    | 1286 ++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  573 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1528 ++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  979 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 +++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/Kbuild               |   33 
 include/linux/dlm.h                |  302 ++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  443 ++++
 include/linux/iflags.h             |  102 
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   41 
 mm/filemap.c                       |    3 
 mm/readahead.c                     |    1 
 131 files changed, 40684 insertions(+), 21 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-gfs2-dlm.patch	10 Aug 2006 17:47:25 -0000	1.13
+++ linux-2.6-gfs2-dlm.patch	11 Aug 2006 22:22:53 -0000	1.14
@@ -7333,7 +7333,7 @@
 +
 diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
 new file mode 100644
-index 0000000..7ab4042
+index 0000000..23f5ce1
 --- /dev/null
 +++ b/fs/dlm/lowcomms.c
 @@ -0,0 +1,1238 @@
@@ -8273,11 +8273,11 @@
 +			break;
 +		e = list_entry(ni->writequeue.next, struct writequeue_entry,
 +			       list);
-+		kmap(e->page);
 +		len = e->len;
 +		offset = e->offset;
 +		BUG_ON(len == 0 && e->users == 0);
 +		spin_unlock(&ni->writequeue_lock);
++		kmap(e->page);
 +
 +		ret = 0;
 +		if (len) {
@@ -18289,10 +18289,10 @@
 +
 diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
 new file mode 100644
-index 0000000..b6edf7c
+index 0000000..a5e16e5
 --- /dev/null
 +++ b/fs/gfs2/glock.c
-@@ -0,0 +1,2279 @@
+@@ -0,0 +1,2282 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -20462,7 +20462,9 @@
 +
 +	spin_lock(&gl->gl_spin);
 +
-+	printk(KERN_INFO "Glock (%u, %llu)\n", gl->gl_name.ln_type,
++	printk(KERN_INFO "Glock 0x%p (%u, %llu)\n",
++	       gl,
++	       gl->gl_name.ln_type,
 +	       (unsigned long long)gl->gl_name.ln_number);
 +	printk(KERN_INFO "  gl_flags =");
 +	for (x = 0; x < 32; x++)
@@ -20482,8 +20484,9 @@
 +	printk(KERN_INFO "  reclaim = %s\n",
 +		    (list_empty(&gl->gl_reclaim)) ? "no" : "yes");
 +	if (gl->gl_aspace)
-+		printk(KERN_INFO "  aspace = %lu\n",
-+			    gl->gl_aspace->i_mapping->nrpages);
++		printk(KERN_INFO "  aspace = 0x%p nrpages = %lu\n",
++		       gl->gl_aspace,
++		       gl->gl_aspace->i_mapping->nrpages);
 +	else
 +		printk(KERN_INFO "  aspace = no\n");
 +	printk(KERN_INFO "  ail = %d\n", atomic_read(&gl->gl_ail_count));
@@ -31815,10 +31818,10 @@
 +#endif /* __OPS_FILE_DOT_H__ */
 diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
 new file mode 100644
-index 0000000..de18923
+index 0000000..4440009
 --- /dev/null
 +++ b/fs/gfs2/ops_fstype.c
-@@ -0,0 +1,836 @@
+@@ -0,0 +1,840 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -32100,6 +32103,10 @@
 +	int error = 0;
 +
 +	if (undo) {
++		if (sb->s_root) {
++			dput(sb->s_root);
++			sb->s_root = NULL;
++		}
 +		return 0;
 +	}
 +	
@@ -35918,10 +35925,10 @@
 +#endif /* __QUOTA_DOT_H__ */
 diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
 new file mode 100644
-index 0000000..bbd44a4
+index 0000000..8fe518c
 --- /dev/null
 +++ b/fs/gfs2/recovery.c
-@@ -0,0 +1,572 @@
+@@ -0,0 +1,573 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -36249,6 +36256,7 @@
 +			error = get_log_header(jd, start, &lh);
 +			if (!error) {
 +				gfs2_replay_incr_blk(sdp, &start);
++				brelse(bh);
 +				continue;
 +			}
 +			if (error == 1) {
@@ -36320,7 +36328,7 @@
 +	lh = (struct gfs2_log_header *)bh->b_data;
 +	memset(lh, 0, sizeof(struct gfs2_log_header));
 +	lh->lh_header.mh_magic = cpu_to_be32(GFS2_MAGIC);
-+	lh->lh_header.mh_type = cpu_to_be16(GFS2_METATYPE_LH);
++	lh->lh_header.mh_type = cpu_to_be32(GFS2_METATYPE_LH);
 +	lh->lh_header.mh_format = cpu_to_be32(GFS2_FORMAT_LH);
 +	lh->lh_sequence = cpu_to_be64(head->lh_sequence + 1);
 +	lh->lh_flags = cpu_to_be32(GFS2_LOG_HEAD_UNMOUNT);



From fedora-cvs-commits at redhat.com  Fri Aug 11 22:51:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 18:51:44 -0400
Subject: rpms/jgroups/devel jgroups.spec,1.14,1.15
Message-ID: <200608112251.k7BMpiV6019176@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jgroups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19109

Modified Files:
	jgroups.spec 
Log Message:
- Resync with latest from JPP.
- Re-enable bouncycastle dependencies.




Index: jgroups.spec
===================================================================
RCS file: /cvs/dist/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jgroups.spec	24 Jul 2006 04:52:41 -0000	1.14
+++ jgroups.spec	11 Aug 2006 22:51:42 -0000	1.15
@@ -43,7 +43,7 @@
 
 Name:		jgroups
 Version:	2.2.9.2
-Release:	2jpp_2fc
+Release:	3jpp.1
 Epoch:		0
 Summary:	Toolkit for reliable multicast communication.
 License:	LGPL
@@ -59,8 +59,7 @@
 Requires:	log4j
 Requires:	mx4j
 Requires:	xalan-j2
-#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
-#Requires:	bouncycastle
+Requires:	bouncycastle
 BuildRequires:	ant >= 0:1.6
 BuildRequires:	bsh
 BuildRequires:	concurrent
@@ -73,8 +72,7 @@
 BuildRequires:	log4j
 BuildRequires:	mx4j
 BuildRequires:	xalan-j2
-#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
-#BuildRequires:	bouncycastle
+BuildRequires:	bouncycastle
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
@@ -103,6 +101,9 @@
 %package	javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Requires(post):   /bin/ln
+Requires(post):   /bin/rm
+Requires(postun): /bin/rm
 
 %description	javadoc
 %{summary}.
@@ -121,7 +122,6 @@
 done
 
 # this test requires bouncycastle
-#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
 rm tests/junit/org/jgroups/protocols/ENCRYPTAsymmetricTest.java
 
 %patch0 -b .sav
@@ -137,8 +137,6 @@
 ln -sf $(build-classpath log4j) .
 ln -sf $(build-classpath mx4j/mx4j-jmx) .
 popd
-#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
-#ln -sf $(build-classpath build-classpath gcj-endorsed/bcprov) .
 %if %{without_tests}
 ant jar javadoc jboss-service jgroups-service
 %else
@@ -227,6 +225,10 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Fri Aug 11 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-3jpp.1
+- Resync with latest from JPP.
+- Re-enable bouncycastle dependencies.
+
 * Mon Jul 24 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-2jpp_2fc
 - Rebuild.
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 23:01:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 19:01:54 -0400
Subject: rpms/ant/devel ant.spec,1.75,1.76
Message-ID: <200608112301.k7BN1shx031161@cvs.devel.redhat.com>

Author: dbhole

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

Modified Files:
	ant.spec 
Log Message:

- Added conditional native compilation
- Add missing requirements
- Synch with JPackage spec




Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ant.spec	22 Jul 2006 08:34:54 -0000	1.75
+++ ant.spec	11 Aug 2006 23:01:45 -0000	1.76
@@ -1,11 +1,45 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define ant_home %{_datadir}/ant
 %define section  free
 
-%define jpprelease 1jpp
+%define major_version 1.6
+%define jpprelease 2jpp
 
 Name:           ant
 Version:        1.6.5
-Release: 	%{jpprelease}_11fc
+Release:        %{jpprelease}.1
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -21,16 +55,22 @@
 # https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008785.html
 # Message-ID: <432A8E37.8050101 at zarb.org>
 Patch2:         apache-ant-1.6.5-javah.patch
+# Fix some places where copies of classes are included in the wrong jarfiles
 Patch4:         apache-ant-jars.patch
 Patch5:         apache-ant-bz163689.patch
 Patch6:         apache-ant-1.6.5-jvm1.5-detect.patch
 Requires:       jaxp_parser_impl
 Requires:       jpackage-utils >= 0:1.5
 Requires:       java-devel
+Requires:       xml-commons-apis
 BuildRequires:  jaxp_parser_impl
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  java-devel
 BuildRequires:	coreutils
+BuildRequires:	xml-commons-apis
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Obsoletes:	ant-optional ant-optional-full
 # Allow subpackages not in Fedora to be installed from JPackage
@@ -39,10 +79,12 @@
 Obsoletes:	%{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2
 # FC4
 Obsoletes:	%{name}-jmf <= 1.6.2-3jpp_12fc
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 Ant is a platform-independent build tool for java. It's used by apache
@@ -58,6 +100,28 @@
 Allo stato attuale viene utilizzato dai progetti apache jakarta ed
 apache xml.
 
+%package manifest-only
+Summary:        Manifest-only jars for %{name}
+Group:          Development/Build Tools
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Provides:       %{name}-icontract = %{epoch}:%{version}-%{release}
+Provides:       %{name}-netrexx = %{epoch}:%{version}-%{release}
+Provides:       %{name}-starteam = %{epoch}:%{version}-%{release}
+Provides:       %{name}-stylebook = %{epoch}:%{version}-%{release}
+Provides:       %{name}-vaj = %{epoch}:%{version}-%{release}
+Provides:       %{name}-weblogic = %{epoch}:%{version}-%{release}
+Provides:       %{name}-xalan1 = %{epoch}:%{version}-%{release}
+Provides:       %{name}-xslp = %{epoch}:%{version}-%{release}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description  manifest-only
+Manifest-only jars for %{name}.
+
 %package antlr
 Summary:        Optional antlr tasks for %{name}
 Group:          Development/Build Tools
@@ -66,8 +130,12 @@
 BuildRequires:  antlr
 Provides:       ant-antlr = %{epoch}:%{version}-%{release}
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description antlr
 Optional antlr tasks for %{name}.
@@ -83,8 +151,12 @@
 BuildRequires:  bsf
 Provides:       ant-apache-bsf = %{epoch}:%{version}-%{release}
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description apache-bsf
 Optional apache bsf tasks for %{name}.
@@ -100,8 +172,12 @@
 BuildRequires:  xml-commons-resolver
 Provides:       ant-apache-resolver = %{epoch}:%{version}-%{release}
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description apache-resolver
 Optional apache resolver tasks for %{name}.
@@ -117,8 +193,12 @@
 BuildRequires:  jakarta-commons-logging
 Provides:       ant-commons-logging = %{epoch}:%{version}-%{release}
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description commons-logging
 Optional commons logging tasks for %{name}.
@@ -126,6 +206,51 @@
 %description commons-logging -l fr
 Taches commons logging optionelles pour %{name}.
 
+# Disable because we don't ship the dependencies
+%if 0
+%package commons-net
+Summary:        Optional commons net tasks for %{name}
+Group:          Development/Build Tools
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       jakarta-commons-net
+BuildRequires:  jakarta-commons-net
+Provides:       ant-commons-net = %{epoch}:%{version}-%{release}
+Conflicts:      ant-optional-clean, ant-optional-full
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description commons-net
+Optional commons net tasks for %{name}.
+
+%description commons-net -l fr
+Taches commons net optionelles pour %{name}.
+
+%package jai
+Summary:        Optional jai tasks for %{name}
+Group:          Development/Build Tools
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       jai
+BuildRequires:  jai
+Provides:       ant-jai = %{epoch}:%{version}-%{release}
+Conflicts:      ant-optional-clean, ant-optional-full
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description jai
+Optional jai tasks for %{name}.
+
+%description jai -l fr
+Taches jai optionelles pour %{name}.
+%endif
+
 %package apache-bcel
 Summary:        Optional apache bcel tasks for %{name}
 Group:          Development/Build Tools
@@ -136,8 +261,12 @@
 Provides:       ant-jakarta-bcel = %{epoch}:%{version}-%{release}
 Obsoletes:	ant-jakarta-bcel
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description apache-bcel
 Optional apache bcel tasks for %{name}.
@@ -155,8 +284,12 @@
 Provides:       ant-jakarta-log4j = %{epoch}:%{version}-%{release}
 Obsoletes:	ant-jakarta-log4j
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description apache-log4j
 Optional apache log4j tasks for %{name}.
@@ -174,8 +307,12 @@
 Provides:       ant-jakarta-oro = %{epoch}:%{version}-%{release}
 Obsoletes:	ant-jakarta-oro
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description apache-oro
 Optional apache oro tasks for %{name}.
@@ -193,8 +330,12 @@
 Provides:       ant-jakarta-regexp = %{epoch}:%{version}-%{release}
 Obsoletes:	ant-jakarta-regexp
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description apache-regexp
 Optional apache regexp tasks for %{name}.
@@ -212,8 +353,12 @@
 BuildRequires:  jaf >= 0:1.0.1-5jpp
 Provides:       ant-javamail = %{epoch}:%{version}-%{release}
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description javamail
 Optional javamail tasks for %{name}.
@@ -229,8 +374,12 @@
 BuildRequires:  jdepend
 Provides:       ant-jdepend = %{epoch}:%{version}-%{release}
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description jdepend
 Optional jdepend tasks for %{name}.
@@ -238,6 +387,25 @@
 %description jdepend -l fr
 Taches jdepend optionelles pour %{name}.
 
+%package jmf
+Summary:        Optional jmf tasks for %{name}
+Group:          Development/Build Tools
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Provides:       ant-jmf = %{epoch}:%{version}-%{release}
+Conflicts:      ant-optional-clean, ant-optional-full
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description jmf
+Optional jmf tasks for %{name}.
+
+%description jmf -l fr
+Taches jmf optionelles pour %{name}.
+
 %package jsch
 Summary:        Optional jsch tasks for %{name}
 Group:          Development/Build Tools
@@ -246,8 +414,12 @@
 BuildRequires:  jsch
 Provides:       ant-jsch = %{epoch}:%{version}-%{release}
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description jsch
 Optional jsch tasks for %{name}.
@@ -263,8 +435,12 @@
 BuildRequires:  junit
 Provides:       ant-junit = %{epoch}:%{version}-%{release}
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description junit
 Optional junit tasks for %{name}.
@@ -278,8 +454,12 @@
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Provides:       ant-nodeps = %{epoch}:%{version}-%{release}
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description nodeps
 Optional tasks for %{name}.
@@ -293,8 +473,12 @@
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Provides:       ant-swing = %{epoch}:%{version}-%{release}
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description swing
 Optional swing tasks for %{name}.
@@ -311,8 +495,12 @@
 # The ant-xalan jar has been merged into the ant-trax one
 Obsoletes:	ant-xalan2
 Conflicts:      ant-optional-clean, ant-optional-full
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description trax
 Optional trax tasks for %{name}.
@@ -350,7 +538,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -386,7 +575,8 @@
 
 %build
 # classpath selects optional components to build
-export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jai/jai_codec jai/jai_core jsch bsf xml-commons-resolver)
+#export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jai/jai_codec jai/jai_core jsch bsf xml-commons-resolver)
+export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging jsch bsf xml-commons-resolver)
 
 # perform bootstrap and build without jjp or user configs,
 # (except JAVA_HOME as required by build script)
@@ -413,10 +603,20 @@
 
 # optional jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
+cp -p build/lib/%{name}-icontract.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-icontract-%{version}.jar
+cp -p build/lib/%{name}-netrexx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-netrexx-%{version}.jar
+cp -p build/lib/%{name}-starteam.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-starteam-%{version}.jar
+cp -p build/lib/%{name}-stylebook.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-stylebook-%{version}.jar
+cp -p build/lib/%{name}-vaj.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-vaj-%{version}.jar
+cp -p build/lib/%{name}-weblogic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-weblogic-%{version}.jar
+cp -p build/lib/%{name}-xalan1.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xalan1-%{version}.jar
+cp -p build/lib/%{name}-xslp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xslp-%{version}.jar
 cp -p build/lib/%{name}-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
 cp -p build/lib/%{name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
 cp -p build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
 cp -p build/lib/%{name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
+#cp -p build/lib/%{name}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
+#cp -p build/lib/%{name}-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jai-%{version}.jar
 cp -p build/lib/%{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
 cp -p build/lib/%{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
 cp -p build/lib/%{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
@@ -427,6 +627,7 @@
 ln -sf %{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-regexp.jar
 cp -p build/lib/%{name}-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
 cp -p build/lib/%{name}-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
+cp -p build/lib/%{name}-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
 cp -p build/lib/%{name}-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
 cp -p build/lib/%{name}-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-junit-%{version}.jar
 cp -p build/lib/%{name}-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
@@ -458,12 +659,15 @@
 echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf
 echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
 echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging
+#echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
+#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jai
 echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel
 echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j
 echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro
 echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp
 echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail
 echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
+echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf
 echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
 echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
 echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps
@@ -477,127 +681,334 @@
 # fix link between manual and javadoc
 (cd docs/manual; ln -sf %{_javadocdir}/%{name}-%{version} api)
 
-aot-compile-rpm
-
 # -----------------------------------------------------------------------------
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 # -----------------------------------------------------------------------------
 
-%pre
-rm -f %{_javadir}/ant.jar
-rm -f %{_javadir}/ant-optional.jar
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}
+fi
 
 # -----------------------------------------------------------------------------
 
+%if %{gcj_support}
 %post
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
+%if %{gcj_support}
 %postun
-%{_bindir}/rebuild-gcj-db
-
-%post antlr
-%{_bindir}/rebuild-gcj-db
-
-%postun antlr
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%post apache-bsf
-%{_bindir}/rebuild-gcj-db
+# We do not ship dependencies for these, so they are disabled.
+%if 0
+%if %{gcj_support}
+%post commons-net
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun apache-bsf
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%postun commons-net
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%post apache-resolver
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%post jai
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun apache-resolver
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%postun jai
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+%endif
 
-%post commons-logging
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%post antlr
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun commons-logging
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%postun antlr
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
+%if %{gcj_support}
 %post apache-bcel
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
+%if %{gcj_support}
 %postun apache-bcel
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%post jmf
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%postun jmf
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%post trax
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%postun trax
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
+%if %{gcj_support}
 %post apache-log4j
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
+%if %{gcj_support}
 %postun apache-log4j
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%post apache-oro
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%post swing
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun apache-oro
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%postun swing
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%post nodeps
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
+%if %{gcj_support}
+%postun nodeps
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
 %post apache-regexp
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
+%if %{gcj_support}
 %postun apache-regexp
-%{_bindir}/rebuild-gcj-db
-
-%post javamail
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun javamail
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%post apache-resolver
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%post jdepend
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%postun apache-resolver
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun jdepend
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%post junit
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%post jsch
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%postun junit
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun jsch
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%post apache-oro
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%post junit
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%postun apache-oro
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun junit
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%post javamail
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%post nodeps
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%postun javamail
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun nodeps
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%post commons-logging
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%post swing
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%postun commons-logging
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun swing
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%post jdepend
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%post trax
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%postun jdepend
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun trax
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%post jsch
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
+%if %{gcj_support}
+%postun jsch
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun javadoc
-if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/%{name}
+%if %{gcj_support}
+%post apache-bsf
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
 fi
+%endif
 
-# -----------------------------------------------------------------------------
+%if %{gcj_support}
+%postun apache-bsf
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %files
 %defattr(0644,root,root,0755)
@@ -619,37 +1030,100 @@
 %{ant_home}/etc/junit-frames-xalan1.xsl
 %dir %{ant_home}/lib
 %dir %{_sysconfdir}/%{name}.d
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-launcher-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-1.6.5.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-launcher-1.6.5.jar.*
+%endif
+
+%files manifest-only
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/ant-icontract-%{version}.jar
+%{_javadir}/%{name}/ant-icontract.jar
+%{_javadir}/%{name}/ant-netrexx-%{version}.jar
+%{_javadir}/%{name}/ant-netrexx.jar
+%{_javadir}/%{name}/ant-starteam-%{version}.jar
+%{_javadir}/%{name}/ant-starteam.jar
+%{_javadir}/%{name}/ant-stylebook-%{version}.jar
+%{_javadir}/%{name}/ant-stylebook.jar
+%{_javadir}/%{name}/ant-vaj-%{version}.jar
+%{_javadir}/%{name}/ant-vaj.jar
+%{_javadir}/%{name}/ant-weblogic-%{version}.jar
+%{_javadir}/%{name}/ant-weblogic.jar
+%{_javadir}/%{name}/ant-xalan1-%{version}.jar
+%{_javadir}/%{name}/ant-xalan1.jar
+%{_javadir}/%{name}/ant-xslp-%{version}.jar
+%{_javadir}/%{name}/ant-xslp.jar
 
 %files antlr
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-antlr.jar
 %{_javadir}/%{name}/%{name}-antlr-%{version}.jar
 %{_sysconfdir}/%{name}.d/antlr
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-antlr-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-antlr-1.6.5.jar.*
+%endif
 
 %files apache-bsf
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-bsf.jar
 %{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
 %{_sysconfdir}/%{name}.d/apache-bsf
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-apache-bsf-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bsf-1.6.5.jar.*
+%endif
 
 %files apache-resolver
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-resolver.jar
 %{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
 %{_sysconfdir}/%{name}.d/apache-resolver
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*-resolver-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-resolver-1.6.5.jar.*
+%endif
 
 %files commons-logging
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-commons-logging.jar
 %{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
 %{_sysconfdir}/%{name}.d/commons-logging
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*-logging-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-logging-1.6.5.jar.*
+%endif
+
+# Disable as we dont ship the dependencies
+%if 0
+%files commons-net
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-commons-net.jar
+%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
+%{_sysconfdir}/%{name}.d/commons-net
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-net-1.6.5.jar.*
+%endif
+
+%files jai
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-jai.jar
+%{_javadir}/%{name}/%{name}-jai-%{version}.jar
+%{_sysconfdir}/%{name}.d/jai
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jai-1.6.5.jar.*
+%endif
+%endif
 
 %files apache-bcel
 %defattr(0644,root,root,0755)
@@ -657,7 +1131,11 @@
 %{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-bcel.jar
 %{_sysconfdir}/%{name}.d/apache-bcel
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-apache-bcel-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bcel-1.6.5.jar.*
+%endif
 
 %files apache-log4j
 %defattr(0644,root,root,0755)
@@ -665,7 +1143,11 @@
 %{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-log4j.jar
 %{_sysconfdir}/%{name}.d/apache-log4j
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-apache-log4j-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-log4j-1.6.5.jar.*
+%endif
 
 %files apache-oro
 %defattr(0644,root,root,0755)
@@ -674,7 +1156,11 @@
 %{_javadir}/%{name}/%{name}-jakarta-oro.jar
 %{_sysconfdir}/%{name}.d/apache-oro
 %{ant_home}/etc/maudit-frames.xsl
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-apache-oro-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-oro-1.6.5.jar.*
+%endif
 
 %files apache-regexp
 %defattr(0644,root,root,0755)
@@ -682,14 +1168,22 @@
 %{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-regexp.jar
 %{_sysconfdir}/%{name}.d/apache-regexp
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*-regexp-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-1.6.5.jar.*
+%endif
 
 %files javamail
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-javamail.jar
 %{_javadir}/%{name}/%{name}-javamail-%{version}.jar
 %{_sysconfdir}/%{name}.d/javamail
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-javamail-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-javamail-1.6.5.jar.*
+%endif
 
 %files jdepend
 %defattr(0644,root,root,0755)
@@ -698,14 +1192,33 @@
 %{_sysconfdir}/%{name}.d/jdepend
 %{ant_home}/etc/jdepend.xsl
 %{ant_home}/etc/jdepend-frames.xsl
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jdepend-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jdepend-1.6.5.jar.*
+%endif
+
+%files jmf
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-jmf.jar
+%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
+%{_sysconfdir}/%{name}.d/jmf
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jmf-1.6.5.jar.*
+%endif
 
 %files jsch
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jsch.jar
 %{_javadir}/%{name}/%{name}-jsch-%{version}.jar
 %{_sysconfdir}/%{name}.d/jsch
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jsch-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jsch-1.6.5.jar.*
+%endif
 
 %files junit
 %defattr(0644,root,root,0755)
@@ -714,21 +1227,33 @@
 %{_sysconfdir}/%{name}.d/junit
 %{ant_home}/etc/junit-frames.xsl
 %{ant_home}/etc/junit-noframes.xsl
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-junit-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-junit-1.6.5.jar.*
+%endif
 
 %files nodeps
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-nodeps.jar
 %{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
 %{_sysconfdir}/%{name}.d/nodeps
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-nodeps-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-nodeps-1.6.5.jar.*
+%endif
 
 %files swing
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-swing.jar
 %{_javadir}/%{name}/%{name}-swing-%{version}.jar
 %{_sysconfdir}/%{name}.d/swing
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-swing-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-swing-1.6.5.jar.*
+%endif
 
 %files trax
 %defattr(0644,root,root,0755)
@@ -737,7 +1262,11 @@
 %{_sysconfdir}/%{name}.d/trax
 %{ant_home}/etc/mmetrics-frames.xsl
 %{ant_home}/etc/coverage-frames.xsl
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-trax-%{version}.jar.*
+
+%if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-trax-1.6.5.jar.*
+%endif
 
 %files scripts
 %defattr(0755,root,root,0755)
@@ -755,6 +1284,11 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Aug 11 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-2jpp.1
+- Added conditional native compilation
+- Add missing requirements
+- Synch with JPackage spec
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.6.5-1jpp_11fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Fri Aug 11 23:12:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 19:12:55 -0400
Subject: rpms/jakarta-commons-pool/devel jakarta-commons-pool.spec, 1.15,
	1.16
Message-ID: <200608112312.k7BNCtKL031264@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-pool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31252

Modified Files:
	jakarta-commons-pool.spec 
Log Message:

Added missing requirements.




Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jakarta-commons-pool.spec	10 Aug 2006 10:11:36 -0000	1.15
+++ jakarta-commons-pool.spec	11 Aug 2006 23:12:49 -0000	1.16
@@ -45,7 +45,7 @@
 
 Name:		jakarta-commons-pool
 Version:	1.3
-Release:	2jpp_3fc
+Release:	3jpp.1
 Epoch:		0
 Summary:	Jakarta Commons Pool Package
 License:	Apache Software License 2.0
@@ -62,7 +62,6 @@
 BuildRequires:	ant
 BuildRequires:	junit
 BuildRequires:  jpackage-utils > 0:1.6
-BuildRequires:  xml-commons-apis
 %if %{with_maven}
 BuildRequires:  maven >= 0:1.1
 BuildRequires:  saxon
@@ -91,8 +90,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Requires(post):		coreutils
-Requires(postun):	coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -219,7 +218,10 @@
 %endif
 
 %changelog
-* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.3-2jpp_3fc
+* Fri Aug 11 2006 Deepak Bhole <dbhole at redhat.com> 1:1.3-3jpp.1
+- Added missing requirements.
+
+* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> - 1:1.3-2jpp_3fc
 - Requires(post/postun): coreutils
 - BuildRequires: xml-commons-apis
 



From fedora-cvs-commits at redhat.com  Sat Aug 12 00:16:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 20:16:39 -0400
Subject: rpms/ldapjdk/devel ldapjdk.spec,1.11,1.12
Message-ID: <200608120016.k7C0GdCZ020105@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/ldapjdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17098

Modified Files:
	ldapjdk.spec 
Log Message:
- Rebuild with new naming convention.




Index: ldapjdk.spec
===================================================================
RCS file: /cvs/dist/rpms/ldapjdk/devel/ldapjdk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ldapjdk.spec	24 Jul 2006 19:29:52 -0000	1.11
+++ ldapjdk.spec	12 Aug 2006 00:16:36 -0000	1.12
@@ -10,7 +10,7 @@
 
 Name:		ldapjdk
 Version:	4.17
-Release:	1jpp_6fc
+Release:	1jpp.7
 Epoch:		0
 Summary: 	The Mozilla LDAP Java SDK
 License:	MPL
@@ -171,6 +171,9 @@
 %{_javadocdir}/%{name}-%{version}/*
 
 %changelog
+* Fri Aug 11 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:4.17-1jpp.7
+- Rebuild with new naming convention.
+
 * Mon Jul 24 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:4.17-1jpp_6fc
 - Add conditional native compilation.
 



From fedora-cvs-commits at redhat.com  Sat Aug 12 00:22:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 20:22:03 -0400
Subject: rpms/cryptix-asn1/devel cryptix-asn1.spec,1.7,1.8
Message-ID: <200608120022.k7C0M3E9001391@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/cryptix-asn1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1333

Modified Files:
	cryptix-asn1.spec 
Log Message:
- Rebuild with new naming convention.




Index: cryptix-asn1.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptix-asn1/devel/cryptix-asn1.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cryptix-asn1.spec	25 Jul 2006 15:37:08 -0000	1.7
+++ cryptix-asn1.spec	12 Aug 2006 00:22:00 -0000	1.8
@@ -41,7 +41,7 @@
 #FIXME: We will have to tackle this obscene version number soon.
 #Perhaps this package will just die before then.
 Version:	20011119
-Release:	7jpp_1fc
+Release:	7jpp.2
 Epoch:		0
 Summary:	Cryptix ASN1 implementation
 License:	BSD style
@@ -127,6 +127,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Aug 11 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:20011119-7jpp.2
+- Rebuild with new naming convention.
+
 * Mon Jul 24 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:20011119-7jpp_1fc
 - Remove duplicate NVR defines.
 - Conditional native compilation for GCJ.



From fedora-cvs-commits at redhat.com  Sat Aug 12 00:39:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 20:39:15 -0400
Subject: rpms/kernel/devel .cvsignore, 1.511, 1.512 kernel-2.6.spec, 1.2553,
	1.2554 sources, 1.474, 1.475
Message-ID: <200608120039.k7C0dFms006261@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore kernel-2.6.spec sources 
Log Message:
downgrade xen HV to 11057, last working version on ia64


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -r1.511 -r1.512
--- .cvsignore	11 Aug 2006 21:59:30 -0000	1.511
+++ .cvsignore	12 Aug 2006 00:39:12 -0000	1.512
@@ -4,4 +4,4 @@
 kernel-2.6.17
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc4.bz2
-xen-11061.tar.bz2
+xen-11057.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2553
retrieving revision 1.2554
diff -u -r1.2553 -r1.2554
--- kernel-2.6.spec	11 Aug 2006 22:22:53 -0000	1.2553
+++ kernel-2.6.spec	12 Aug 2006 00:39:12 -0000	1.2554
@@ -33,7 +33,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_hv_cset 11061
+%define xen_hv_cset 11057
 %define make_target bzImage
 %define kernel_image x86
 %define xen_flags debug=y verbose=y crash_debug=y
@@ -446,7 +446,9 @@
 
 Patch10000: linux-2.6-compile-fixes.patch
 
-# Xen hypervisor patches
+# Xen hypervisor patches (20000+)
+
+Patch20000: xen-missing-includes.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -701,7 +703,7 @@
 
 cd xen
 # Any necessary hypervisor patches go here
-
+%patch20000 -p1
 cd ..
 
 %endif
@@ -1695,6 +1697,10 @@
 %endif
 
 %changelog
+* Sat Aug 12 2006 Juan Quintela <quintela at redhat.com>
+- xen HV update cset 11057:4ee64035c0a3
+  (newer than that don't compile on ia64).
+
 * Fri Aug 11 2006 Juan Quintela <quintela at redhat.com>
 - xen HV update cset 11061:80f364a5662f.
 - xen kernel update


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -r1.474 -r1.475
--- sources	11 Aug 2006 21:59:31 -0000	1.474
+++ sources	12 Aug 2006 00:39:12 -0000	1.475
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 780289cba0d4529ff80956e145ce567a  patch-2.6.18-rc4.bz2
-71780125173fe1359fec8dabfbd0bc45  xen-11061.tar.bz2
+64a8783435b7628c39829984ba2e551f  xen-11057.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 00:40:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 20:40:57 -0400
Subject: rpms/gnucash/devel gnucash.spec,1.52,1.53
Message-ID: <200608120040.k7C0evq1006576@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	gnucash.spec 
Log Message:
require yelp (#202266)



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnucash.spec	8 Aug 2006 16:56:05 -0000	1.52
+++ gnucash.spec	12 Aug 2006 00:40:55 -0000	1.53
@@ -7,9 +7,9 @@
 Summary: GnuCash is an application to keep track of your finances.
 Version: 2.0.1
 %if %{buildsvn}
-Release: 2.%{svnrev}svn.1
+Release: 3.%{svnrev}svn.1
 %else
-Release: 2
+Release: 3
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -32,7 +32,7 @@
 BuildRequires: libofx-devel, aqbanking-devel, docbook-style-xsl
 BuildRequires: desktop-file-utils, scrollkeeper, texinfo, libtool-ltdl-devel
 BuildRequires: gettext, slib >= 3a1-5, libtool
-Requires: slib >= 3a1-5
+Requires: slib >= 3a1-5, yelp
 # hack
 Requires: perl(Date::Manip)
 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4
@@ -150,6 +150,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-3
+- require yelp (#202266)
+
 * Tue Aug  8 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-2
 - fix schema list
 



From fedora-cvs-commits at redhat.com  Sat Aug 12 00:42:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 20:42:36 -0400
Subject: rpms/kernel/devel xen-missing-includes.patch,NONE,1.1
Message-ID: <200608120042.k7C0garu006954@cvs.devel.redhat.com>

Author: quintela

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

Added Files:
	xen-missing-includes.patch 
Log Message:
downgrade xen HV to 11057, last working version on ia64

xen-missing-includes.patch:
 kallsyms.h  |    1 +
 workqueue.h |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE xen-missing-includes.patch ---
diff -urNp xen-11057/include/xen/kallsyms.h xen/include/xen/kallsyms.h
--- xen-11057/include/xen/kallsyms.h	1970-01-01 01:00:00.000000000 +0100
+++ xen/include/xen/kallsyms.h	2006-08-12 02:20:16.000000000 +0200
@@ -0,0 +1 @@
+
diff -urNp xen-11057/include/xen/workqueue.h xen/include/xen/workqueue.h
--- xen-11057/include/xen/workqueue.h	1970-01-01 01:00:00.000000000 +0100
+++ xen/include/xen/workqueue.h	2006-08-12 02:20:37.000000000 +0200
@@ -0,0 +1 @@
+



From fedora-cvs-commits at redhat.com  Sat Aug 12 00:43:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 20:43:41 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2554,
	1.2555 linux-2.6-xen.patch, 1.51, 1.52
Message-ID: <200608120043.k7C0hf8O007121@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
update linux-2.6-xen patch to fix sort_regions on ia64.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2554
retrieving revision 1.2555
diff -u -r1.2554 -r1.2555
--- kernel-2.6.spec	12 Aug 2006 00:39:12 -0000	1.2554
+++ kernel-2.6.spec	12 Aug 2006 00:43:34 -0000	1.2555
@@ -1700,6 +1700,7 @@
 * Sat Aug 12 2006 Juan Quintela <quintela at redhat.com>
 - xen HV update cset 11057:4ee64035c0a3
   (newer than that don't compile on ia64).
+- update linux-2.6-xen patch to fix sort_regions on ia64.
 
 * Fri Aug 11 2006 Juan Quintela <quintela at redhat.com>
 - xen HV update cset 11061:80f364a5662f.

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   92 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1185 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1831 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  153 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  457 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  478 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  699 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  259 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  128 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  413 ++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  867 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2169 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   54 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1211 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1011 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  283 ++
 drivers/xen/Makefile                                |   19 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  616 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  567 ++++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  848 ++++++
 drivers/xen/blkfront/block.h                        |  154 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1444 ++++++++++
 drivers/xen/blktap/common.h                         |  119 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  180 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  869 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  441 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/reboot.c                           |  383 ++
 drivers/xen/core/skbuff.c                           |  140 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  138 
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1346 +++++++++
 drivers/xen/netback/xenbus.c                        |  428 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1842 +++++++++++++
 drivers/xen/netfront/netfront.c.orig                | 1835 +++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  457 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   84 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  358 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1089 +++++++
 drivers/xen/xenbus/xenbus_probe.c.orig              | 1088 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 drivers/xen/xenfb/Makefile                          |    1 
 drivers/xen/xenfb/xenfb.c                           |  568 ++++
 drivers/xen/xenkbd/Makefile                         |    1 
 drivers/xen/xenkbd/xenkbd.c                         |  205 +
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  219 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  508 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   41 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   76 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  190 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   32 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   13 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  114 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  326 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/linux/xenfb.h                               |   97 
 include/linux/xenkbd.h                              |   82 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  440 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  605 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  508 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  300 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  120 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 417 files changed, 90714 insertions(+), 223 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- linux-2.6-xen.patch	11 Aug 2006 21:53:38 -0000	1.51
+++ linux-2.6-xen.patch	12 Aug 2006 00:43:35 -0000	1.52
@@ -22102,498 +22102,6 @@
  (p9)	mov r8=ENOSYS
  	FSYS_RETURN
  END(__kernel_syscall_via_epc)
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/ia64/kernel/gate.S~ compiling/arch/ia64/kernel/gate.S~
---- /mnt/ro/repos/hg/linux-2.6/arch/ia64/kernel/gate.S~	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/ia64/kernel/gate.S~	2006-08-11 15:34:45.000000000 +0200
-@@ -0,0 +1,488 @@
-+/*
-+ * This file contains the code that gets mapped at the upper end of each task's text
-+ * region.  For now, it contains the signal trampoline code only.
-+ *
-+ * Copyright (C) 1999-2003 Hewlett-Packard Co
-+ * 	David Mosberger-Tang <davidm at hpl.hp.com>
-+ */
-+
-+#include <linux/config.h>
-+
-+#include <asm/asmmacro.h>
-+#include <asm/errno.h>
-+#include <asm/asm-offsets.h>
-+#include <asm/sigcontext.h>
-+#include <asm/system.h>
-+#include <asm/unistd.h>
-+#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
-+# include <asm/privop.h>
-+#endif
-+
-+/*
-+ * We can't easily refer to symbols inside the kernel.  To avoid full runtime relocation,
-+ * complications with the linker (which likes to create PLT stubs for branches
-+ * to targets outside the shared object) and to avoid multi-phase kernel builds, we
-+ * simply create minimalistic "patch lists" in special ELF sections.
-+ */
-+	.section ".data.patch.fsyscall_table", "a"
-+	.previous
-+#define LOAD_FSYSCALL_TABLE(reg)			\
-+[1:]	movl reg=0;					\
-+	.xdata4 ".data.patch.fsyscall_table", 1b-.
-+
-+	.section ".data.patch.brl_fsys_bubble_down", "a"
-+	.previous
-+#define BRL_COND_FSYS_BUBBLE_DOWN(pr)			\
-+[1:](pr)brl.cond.sptk 0;				\
-+	.xdata4 ".data.patch.brl_fsys_bubble_down", 1b-.
-+
-+#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
-+	// The page in which hyperprivop lives must be pinned by ITR.
-+	// However vDSO area isn't pinned. So issuing hyperprivop
-+	// from vDSO page causes trouble that Kevin pointed out.
-+	// After clearing vpsr.ic, the vcpu is pre-empted and the itlb
-+	// is flushed. Then vcpu get cpu again, tlb miss fault occures.
-+	// However it results in nested dtlb fault because vpsr.ic is off.
-+	// To avoid such a situation, we jump into the kernel text area
-+	// which is pinned, and then issue hyperprivop and return back
-+	// to vDSO page.
-+	// This is Dan Magenheimer's idea.
-+
-+	// Currently is_running_on_xen() is defined as running_on_xen.
-+	// If is_running_on_xen() is a real function, we must update
-+	// according to it.
-+	.section ".data.patch.running_on_xen", "a"
-+	.previous
-+#define LOAD_RUNNING_ON_XEN(reg)			\
-+[1:]	movl reg=0;					\
-+	.xdata4 ".data.patch.running_on_xen", 1b-.
-+
-+	.section ".data.patch.brl_xen_rsm_be_i", "a"
-+	.previous
-+#define BRL_COND_XEN_RSM_BE_I(pr)			\
-+[1:](pr)brl.cond.sptk 0;				\
-+	.xdata4 ".data.patch.brl_xen_rsm_be_i", 1b-.
-+
-+	.section ".data.patch.brl_xen_get_psr", "a"
-+	.previous
-+#define BRL_COND_XEN_GET_PSR(pr)			\
-+[1:](pr)brl.cond.sptk 0;				\
-+	.xdata4 ".data.patch.brl_xen_get_psr", 1b-.
-+
-+	.section ".data.patch.brl_xen_ssm_i_0", "a"
-+	.previous
-+#define BRL_COND_XEN_SSM_I_0(pr)			\
-+[1:](pr)brl.cond.sptk 0;				\
-+	.xdata4 ".data.patch.brl_xen_ssm_i_0", 1b-.
-+
-+	.section ".data.patch.brl_xen_ssm_i_1", "a"
-+	.previous
-+#define BRL_COND_XEN_SSM_I_1(pr)			\
-+[1:](pr)brl.cond.sptk 0;				\
-+	.xdata4 ".data.patch.brl_xen_ssm_i_1", 1b-.
-+#endif
-+
-+GLOBAL_ENTRY(__kernel_syscall_via_break)
-+	.prologue
-+	.altrp b6
-+	.body
-+	/*
-+	 * Note: for (fast) syscall restart to work, the break instruction must be
-+	 *	 the first one in the bundle addressed by syscall_via_break.
-+	 */
-+{ .mib
-+	break 0x100000
-+	nop.i 0
-+	br.ret.sptk.many b6
-+}
-+END(__kernel_syscall_via_break)
-+
-+/*
-+ * On entry:
-+ *	r11 = saved ar.pfs
-+ *	r15 = system call #
-+ *	b0  = saved return address
-+ *	b6  = return address
-+ * On exit:
-+ *	r11 = saved ar.pfs
-+ *	r15 = system call #
-+ *	b0  = saved return address
-+ *	all other "scratch" registers:	undefined
-+ *	all "preserved" registers:	same as on entry
-+ */
-+
-+GLOBAL_ENTRY(__kernel_syscall_via_epc)
-+	.prologue
-+	.altrp b6
-+	.body
-+{
-+	/*
-+	 * Note: the kernel cannot assume that the first two instructions in this
-+	 * bundle get executed.  The remaining code must be safe even if
-+	 * they do not get executed.
-+	 */
-+	adds r17=-1024,r15			// A
-+	mov r10=0				// A    default to successful syscall execution
-+	epc					// B	causes split-issue
-+}
-+	;;
-+#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
-+	// r20 = 1
-+	// r22 = &vcpu->evtchn_mask
-+	// r23 = &vpsr.ic
-+	// r24 = &vcpu->pending_interruption
-+	// r25 = tmp
-+	// r28 = &running_on_xen
-+	// r30 = running_on_xen
-+	// r31 = tmp
-+	// p11 = tmp
-+	// p12 = running_on_xen
-+	// p13 = !running_on_xen
-+	// p14 = tmp
-+	// p15 = tmp
-+#define isXen	p12
-+#define isRaw	p13
-+	LOAD_RUNNING_ON_XEN(r28)
-+	movl r22=XSI_PSR_I_ADDR
-+	movl r23=XSI_PSR_IC
-+	movl r24=XSI_PSR_I_ADDR+(XSI_PEND_OFS-XSI_PSR_I_ADDR_OFS)
-+	mov r20=1
-+	;;
-+	ld4 r30=[r28]
-+	;;
-+	cmp.ne isXen,isRaw=r0,r30
-+	;;
-+(isRaw)	rsm psr.be | psr.i
-+	BRL_COND_XEN_RSM_BE_I(isXen)
-+	.global .vdso_rsm_be_i_ret
-+.vdso_rsm_be_i_ret:
-+#else
-+	rsm psr.be | psr.i			// M2 (5 cyc to srlz.d)
-+#endif
-+	LOAD_FSYSCALL_TABLE(r14)		// X
-+	;;
-+	mov r16=IA64_KR(CURRENT)		// M2 (12 cyc)
-+	shladd r18=r17,3,r14			// A
-+	mov r19=NR_syscalls-1			// A
-+	;;
-+	lfetch [r18]				// M0|1
-+#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
-+(isRaw)	mov r29=psr
-+	BRL_COND_XEN_GET_PSR(isXen)
-+	.global .vdso_get_psr_ret
-+.vdso_get_psr_ret:
-+#else
-+	mov r29=psr				// M2 (12 cyc)
-+#endif
-+	// If r17 is a NaT, p6 will be zero
-+	cmp.geu p6,p7=r19,r17			// A    (sysnr > 0 && sysnr < 1024+NR_syscalls)?
-+	;;
-+	mov r21=ar.fpsr				// M2 (12 cyc)
-+	tnat.nz p10,p9=r15			// I0
-+	mov.i r26=ar.pfs			// I0 (would stall anyhow due to srlz.d...)
-+	;;
-+	srlz.d					// M0 (forces split-issue) ensure PSR.BE==0
-+(p6)	ld8 r18=[r18]				// M0|1
-+	nop.i 0
-+	;;
-+	nop.m 0
-+(p6)	tbit.z.unc p8,p0=r18,0			// I0 (dual-issues with "mov b7=r18"!)
-+#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
-+	;;
-+	// p14 = running_on_xen && p8
-+	// p15 = !running_on_xen && p8
-+(p8)	cmp.ne.unc p14,p15=r0,r30
-+	;;
-+(p15)	ssm psr.i
-+	BRL_COND_XEN_SSM_I_0(p14)
-+	.global .vdso_ssm_i_0_ret
-+.vdso_ssm_i_0_ret:
-+#else
-+	nop.i 0
-+	;;
-+(p8)	ssm psr.i
-+#endif
-+(p6)	mov b7=r18				// I0
-+(p8)	br.dptk.many b7				// B
-+
-+	mov r27=ar.rsc				// M2 (12 cyc)
-+/*
-+ * brl.cond doesn't work as intended because the linker would convert this branch
-+ * into a branch to a PLT.  Perhaps there will be a way to avoid this with some
-+ * future version of the linker.  In the meantime, we just use an indirect branch
-+ * instead.
-+ */
-+#ifdef CONFIG_ITANIUM
-+(p6)	add r14=-8,r14				// r14 <- addr of fsys_bubble_down entry
-+	;;
-+(p6)	ld8 r14=[r14]				// r14 <- fsys_bubble_down
-+	;;
-+(p6)	mov b7=r14
-+(p6)	br.sptk.many b7
-+#else
-+	BRL_COND_FSYS_BUBBLE_DOWN(p6)
-+#endif
-+#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
-+(isRaw)	ssm psr.i
-+	BRL_COND_XEN_SSM_I_1(isXen)
-+	.global .vdso_ssm_i_1_ret
-+.vdso_ssm_i_1_ret:
-+#else
-+	ssm psr.i
-+#endif
-+	mov r10=-1
-+(p10)	mov r8=EINVAL
-+#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
-+	dv_serialize_data // shut up gas warning.
-+		          // we know xen_hyper_ssm_i_0 or xen_hyper_ssm_i_1
-+		          // doesn't change p9 and p10
-+#endif
-+(p9)	mov r8=ENOSYS
-+	FSYS_RETURN
-+END(__kernel_syscall_via_epc)
-+
-+#	define ARG0_OFF		(16 + IA64_SIGFRAME_ARG0_OFFSET)
-+#	define ARG1_OFF		(16 + IA64_SIGFRAME_ARG1_OFFSET)
-+#	define ARG2_OFF		(16 + IA64_SIGFRAME_ARG2_OFFSET)
-+#	define SIGHANDLER_OFF	(16 + IA64_SIGFRAME_HANDLER_OFFSET)
-+#	define SIGCONTEXT_OFF	(16 + IA64_SIGFRAME_SIGCONTEXT_OFFSET)
-+
-+#	define FLAGS_OFF	IA64_SIGCONTEXT_FLAGS_OFFSET
-+#	define CFM_OFF		IA64_SIGCONTEXT_CFM_OFFSET
-+#	define FR6_OFF		IA64_SIGCONTEXT_FR6_OFFSET
-+#	define BSP_OFF		IA64_SIGCONTEXT_AR_BSP_OFFSET
-+#	define RNAT_OFF		IA64_SIGCONTEXT_AR_RNAT_OFFSET
-+#	define UNAT_OFF		IA64_SIGCONTEXT_AR_UNAT_OFFSET
-+#	define FPSR_OFF		IA64_SIGCONTEXT_AR_FPSR_OFFSET
-+#	define PR_OFF		IA64_SIGCONTEXT_PR_OFFSET
-+#	define RP_OFF		IA64_SIGCONTEXT_IP_OFFSET
-+#	define SP_OFF		IA64_SIGCONTEXT_R12_OFFSET
-+#	define RBS_BASE_OFF	IA64_SIGCONTEXT_RBS_BASE_OFFSET
-+#	define LOADRS_OFF	IA64_SIGCONTEXT_LOADRS_OFFSET
-+#	define base0		r2
-+#	define base1		r3
-+	/*
-+	 * When we get here, the memory stack looks like this:
-+	 *
-+	 *   +===============================+
-+       	 *   |				     |
-+       	 *   //	    struct sigframe          //
-+       	 *   |				     |
-+	 *   +-------------------------------+ <-- sp+16
-+	 *   |      16 byte of scratch       |
-+	 *   |            space              |
-+	 *   +-------------------------------+ <-- sp
-+	 *
-+	 * The register stack looks _exactly_ the way it looked at the time the signal
-+	 * occurred.  In other words, we're treading on a potential mine-field: each
-+	 * incoming general register may be a NaT value (including sp, in which case the
-+	 * process ends up dying with a SIGSEGV).
-+	 *
-+	 * The first thing need to do is a cover to get the registers onto the backing
-+	 * store.  Once that is done, we invoke the signal handler which may modify some
-+	 * of the machine state.  After returning from the signal handler, we return
-+	 * control to the previous context by executing a sigreturn system call.  A signal
-+	 * handler may call the rt_sigreturn() function to directly return to a given
-+	 * sigcontext.  However, the user-level sigreturn() needs to do much more than
-+	 * calling the rt_sigreturn() system call as it needs to unwind the stack to
-+	 * restore preserved registers that may have been saved on the signal handler's
-+	 * call stack.
-+	 */
-+
-+#define SIGTRAMP_SAVES										\
-+	.unwabi 3, 's';		/* mark this as a sigtramp handler (saves scratch regs) */	\
-+	.unwabi @svr4, 's'; /* backwards compatibility with old unwinders (remove in v2.7) */	\
-+	.savesp ar.unat, UNAT_OFF+SIGCONTEXT_OFF;						\
-+	.savesp ar.fpsr, FPSR_OFF+SIGCONTEXT_OFF;						\
-+	.savesp pr, PR_OFF+SIGCONTEXT_OFF;     							\
-+	.savesp rp, RP_OFF+SIGCONTEXT_OFF;							\
-+	.savesp ar.pfs, CFM_OFF+SIGCONTEXT_OFF;							\
-+	.vframesp SP_OFF+SIGCONTEXT_OFF
-+
-+GLOBAL_ENTRY(__kernel_sigtramp)
-+	// describe the state that is active when we get here:
-+	.prologue
-+	SIGTRAMP_SAVES
-+	.body
-+
-+	.label_state 1
-+
-+	adds base0=SIGHANDLER_OFF,sp
-+	adds base1=RBS_BASE_OFF+SIGCONTEXT_OFF,sp
-+	br.call.sptk.many rp=1f
-+1:
-+	ld8 r17=[base0],(ARG0_OFF-SIGHANDLER_OFF)	// get pointer to signal handler's plabel
-+	ld8 r15=[base1]					// get address of new RBS base (or NULL)
-+	cover				// push args in interrupted frame onto backing store
-+	;;
-+	cmp.ne p1,p0=r15,r0		// do we need to switch rbs? (note: pr is saved by kernel)
-+	mov.m r9=ar.bsp			// fetch ar.bsp
-+	.spillsp.p p1, ar.rnat, RNAT_OFF+SIGCONTEXT_OFF
-+(p1)	br.cond.spnt setup_rbs		// yup -> (clobbers p8, r14-r16, and r18-r20)
-+back_from_setup_rbs:
-+	alloc r8=ar.pfs,0,0,3,0
-+	ld8 out0=[base0],16		// load arg0 (signum)
-+	adds base1=(ARG1_OFF-(RBS_BASE_OFF+SIGCONTEXT_OFF)),base1
-+	;;
-+	ld8 out1=[base1]		// load arg1 (siginfop)
-+	ld8 r10=[r17],8			// get signal handler entry point
-+	;;
-+	ld8 out2=[base0]		// load arg2 (sigcontextp)
-+	ld8 gp=[r17]			// get signal handler's global pointer
-+	adds base0=(BSP_OFF+SIGCONTEXT_OFF),sp
-+	;;
-+	.spillsp ar.bsp, BSP_OFF+SIGCONTEXT_OFF
-+	st8 [base0]=r9			// save sc_ar_bsp
-+	adds base0=(FR6_OFF+SIGCONTEXT_OFF),sp
-+	adds base1=(FR6_OFF+16+SIGCONTEXT_OFF),sp
-+	;;
-+	stf.spill [base0]=f6,32
-+	stf.spill [base1]=f7,32
-+	;;
-+	stf.spill [base0]=f8,32
-+	stf.spill [base1]=f9,32
-+	mov b6=r10
-+	;;
-+	stf.spill [base0]=f10,32
-+	stf.spill [base1]=f11,32
-+	;;
-+	stf.spill [base0]=f12,32
-+	stf.spill [base1]=f13,32
-+	;;
-+	stf.spill [base0]=f14,32
-+	stf.spill [base1]=f15,32
-+	br.call.sptk.many rp=b6			// call the signal handler
-+.ret0:	adds base0=(BSP_OFF+SIGCONTEXT_OFF),sp
-+	;;
-+	ld8 r15=[base0]				// fetch sc_ar_bsp
-+	mov r14=ar.bsp
-+	;;
-+	cmp.ne p1,p0=r14,r15			// do we need to restore the rbs?
-+(p1)	br.cond.spnt restore_rbs		// yup -> (clobbers r14-r18, f6 & f7)
-+	;;
-+back_from_restore_rbs:
-+	adds base0=(FR6_OFF+SIGCONTEXT_OFF),sp
-+	adds base1=(FR6_OFF+16+SIGCONTEXT_OFF),sp
-+	;;
-+	ldf.fill f6=[base0],32
-+	ldf.fill f7=[base1],32
-+	;;
-+	ldf.fill f8=[base0],32
-+	ldf.fill f9=[base1],32
-+	;;
-+	ldf.fill f10=[base0],32
-+	ldf.fill f11=[base1],32
-+	;;
-+	ldf.fill f12=[base0],32
-+	ldf.fill f13=[base1],32
-+	;;
-+	ldf.fill f14=[base0],32
-+	ldf.fill f15=[base1],32
-+	mov r15=__NR_rt_sigreturn
-+	.restore sp				// pop .prologue
-+	break __BREAK_SYSCALL
-+
-+	.prologue
-+	SIGTRAMP_SAVES
-+setup_rbs:
-+	mov ar.rsc=0				// put RSE into enforced lazy mode
-+	;;
-+	.save ar.rnat, r19
-+	mov r19=ar.rnat				// save RNaT before switching backing store area
-+	adds r14=(RNAT_OFF+SIGCONTEXT_OFF),sp
-+
-+	mov r18=ar.bspstore
-+	mov ar.bspstore=r15			// switch over to new register backing store area
-+	;;
-+
-+	.spillsp ar.rnat, RNAT_OFF+SIGCONTEXT_OFF
-+	st8 [r14]=r19				// save sc_ar_rnat
-+	.body
-+	mov.m r16=ar.bsp			// sc_loadrs <- (new bsp - new bspstore) << 16
-+	adds r14=(LOADRS_OFF+SIGCONTEXT_OFF),sp
-+	;;
-+	invala
-+	sub r15=r16,r15
-+	extr.u r20=r18,3,6
-+	;;
-+	mov ar.rsc=0xf				// set RSE into eager mode, pl 3
-+	cmp.eq p8,p0=63,r20
-+	shl r15=r15,16
-+	;;
-+	st8 [r14]=r15				// save sc_loadrs
-+(p8)	st8 [r18]=r19		// if bspstore points at RNaT slot, store RNaT there now
-+	.restore sp				// pop .prologue
-+	br.cond.sptk back_from_setup_rbs
-+
-+	.prologue
-+	SIGTRAMP_SAVES
-+	.spillsp ar.rnat, RNAT_OFF+SIGCONTEXT_OFF
-+	.body
-+restore_rbs:
-+	// On input:
-+	//	r14 = bsp1 (bsp at the time of return from signal handler)
-+	//	r15 = bsp0 (bsp at the time the signal occurred)
-+	//
-+	// Here, we need to calculate bspstore0, the value that ar.bspstore needs
-+	// to be set to, based on bsp0 and the size of the dirty partition on
-+	// the alternate stack (sc_loadrs >> 16).  This can be done with the
-+	// following algorithm:
-+	//
-+	//  bspstore0 = rse_skip_regs(bsp0, -rse_num_regs(bsp1 - (loadrs >> 19), bsp1));
-+	//
-+	// This is what the code below does.
-+	//
-+	alloc r2=ar.pfs,0,0,0,0			// alloc null frame
-+	adds r16=(LOADRS_OFF+SIGCONTEXT_OFF),sp
-+	adds r18=(RNAT_OFF+SIGCONTEXT_OFF),sp
-+	;;
-+	ld8 r17=[r16]
-+	ld8 r16=[r18]			// get new rnat
-+	extr.u r18=r15,3,6	// r18 <- rse_slot_num(bsp0)
-+	;;
-+	mov ar.rsc=r17			// put RSE into enforced lazy mode
-+	shr.u r17=r17,16
-+	;;
-+	sub r14=r14,r17		// r14 (bspstore1) <- bsp1 - (sc_loadrs >> 16)
-+	shr.u r17=r17,3		// r17 <- (sc_loadrs >> 19)
-+	;;
-+	loadrs			// restore dirty partition
-+	extr.u r14=r14,3,6	// r14 <- rse_slot_num(bspstore1)
-+	;;
-+	add r14=r14,r17		// r14 <- rse_slot_num(bspstore1) + (sc_loadrs >> 19)
-+	;;
-+	shr.u r14=r14,6		// r14 <- (rse_slot_num(bspstore1) + (sc_loadrs >> 19))/0x40
-+	;;
-+	sub r14=r14,r17		// r14 <- -rse_num_regs(bspstore1, bsp1)
-+	movl r17=0x8208208208208209
-+	;;
-+	add r18=r18,r14		// r18 (delta) <- rse_slot_num(bsp0) - rse_num_regs(bspstore1,bsp1)
-+	setf.sig f7=r17
-+	cmp.lt p7,p0=r14,r0	// p7 <- (r14 < 0)?
-+	;;
-+(p7)	adds r18=-62,r18	// delta -= 62
-+	;;
-+	setf.sig f6=r18
-+	;;
-+	xmpy.h f6=f6,f7
-+	;;
-+	getf.sig r17=f6
-+	;;
-+	add r17=r17,r18
-+	shr r18=r18,63
-+	;;
-+	shr r17=r17,5
-+	;;
-+	sub r17=r17,r18		// r17 = delta/63
-+	;;
-+	add r17=r14,r17		// r17 <- delta/63 - rse_num_regs(bspstore1, bsp1)
-+	;;
-+	shladd r15=r17,3,r15	// r15 <- bsp0 + 8*(delta/63 - rse_num_regs(bspstore1, bsp1))
-+	;;
-+	mov ar.bspstore=r15			// switch back to old register backing store area
-+	;;
-+	mov ar.rnat=r16				// restore RNaT
-+	mov ar.rsc=0xf				// (will be restored later on from sc_ar_rsc)
-+	// invala not necessary as that will happen when returning to user-mode
-+	br.cond.sptk back_from_restore_rbs
-+END(__kernel_sigtramp)
 diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/ia64/kernel/head.S compiling/arch/ia64/kernel/head.S
 --- /mnt/ro/repos/hg/linux-2.6/arch/ia64/kernel/head.S	2006-08-04 13:45:04.000000000 +0200
 +++ compiling/arch/ia64/kernel/head.S	2006-08-04 16:36:20.000000000 +0200
@@ -23004,563 +22512,6 @@
  #ifdef CONFIG_SMP
  	phys_cpu_id = cpu_physical_id(cpu);
  #else
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/ia64/kernel/irq_ia64.c~ compiling/arch/ia64/kernel/irq_ia64.c~
---- /mnt/ro/repos/hg/linux-2.6/arch/ia64/kernel/irq_ia64.c~	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/ia64/kernel/irq_ia64.c~	2006-08-04 16:33:26.000000000 +0200
-@@ -0,0 +1,553 @@
-+/*
-+ * linux/arch/ia64/kernel/irq.c
-+ *
-+ * Copyright (C) 1998-2001 Hewlett-Packard Co
-+ *	Stephane Eranian <eranian at hpl.hp.com>
-+ *	David Mosberger-Tang <davidm at hpl.hp.com>
-+ *
-+ *  6/10/99: Updated to bring in sync with x86 version to facilitate
-+ *	     support for SMP and different interrupt controllers.
-+ *
-+ * 09/15/00 Goutham Rao <goutham.rao at intel.com> Implemented pci_irq_to_vector
-+ *                      PCI to vector allocation routine.
-+ * 04/14/2004 Ashok Raj <ashok.raj at intel.com>
-+ *						Added CPU Hotplug handling for IPF.
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/module.h>
-+
-+#include <linux/jiffies.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/ioport.h>
-+#include <linux/kernel_stat.h>
-+#include <linux/slab.h>
-+#include <linux/ptrace.h>
-+#include <linux/random.h>	/* for rand_initialize_irq() */
-+#include <linux/signal.h>
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/threads.h>
-+#include <linux/bitops.h>
-+#ifdef CONFIG_XEN
-+#include <linux/cpu.h>
-+#endif
-+
-+#include <asm/delay.h>
-+#include <asm/intrinsics.h>
-+#include <asm/io.h>
-+#include <asm/hw_irq.h>
-+#include <asm/machvec.h>
-+#include <asm/pgtable.h>
-+#include <asm/system.h>
-+
-+#ifdef CONFIG_PERFMON
-+# include <asm/perfmon.h>
-+#endif
-+
-+#define IRQ_DEBUG	0
-+
-+/* These can be overridden in platform_irq_init */
-+int ia64_first_device_vector = IA64_DEF_FIRST_DEVICE_VECTOR;
-+int ia64_last_device_vector = IA64_DEF_LAST_DEVICE_VECTOR;
-+
-+/* default base addr of IPI table */
-+void __iomem *ipi_base_addr = ((void __iomem *)
-+			       (__IA64_UNCACHED_OFFSET | IA64_IPI_DEFAULT_BASE_ADDR));
-+
-+/*
-+ * Legacy IRQ to IA-64 vector translation table.
-+ */
-+__u8 isa_irq_to_vector_map[16] = {
-+	/* 8259 IRQ translation, first 16 entries */
-+	0x2f, 0x20, 0x2e, 0x2d, 0x2c, 0x2b, 0x2a, 0x29,
-+	0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21
-+};
-+EXPORT_SYMBOL(isa_irq_to_vector_map);
-+
-+static unsigned long ia64_vector_mask[BITS_TO_LONGS(IA64_MAX_DEVICE_VECTORS)];
-+
-+int
-+assign_irq_vector (int irq)
-+{
-+	int pos, vector;
-+
-+#ifdef CONFIG_XEN
-+	if (is_running_on_xen()) {
-+		extern int xen_assign_irq_vector(int);
-+		return xen_assign_irq_vector(irq);
-+	}
-+#endif
-+ again:
-+	pos = find_first_zero_bit(ia64_vector_mask, IA64_NUM_DEVICE_VECTORS);
-+	vector = IA64_FIRST_DEVICE_VECTOR + pos;
-+	if (vector > IA64_LAST_DEVICE_VECTOR)
-+		return -ENOSPC;
-+	if (test_and_set_bit(pos, ia64_vector_mask))
-+		goto again;
-+	return vector;
-+}
-+
-+void
-+free_irq_vector (int vector)
-+{
-+	int pos;
-+
-+	if (vector < IA64_FIRST_DEVICE_VECTOR || vector > IA64_LAST_DEVICE_VECTOR)
-+		return;
-+
-+	pos = vector - IA64_FIRST_DEVICE_VECTOR;
-+	if (!test_and_clear_bit(pos, ia64_vector_mask))
-+		printk(KERN_WARNING "%s: double free!\n", __FUNCTION__);
-+}
-+
-+int
-+reserve_irq_vector (int vector)
-+{
-+	int pos;
-+
-+	if (vector < IA64_FIRST_DEVICE_VECTOR ||
-+	    vector > IA64_LAST_DEVICE_VECTOR)
-+		return -EINVAL;
-+
-+	pos = vector - IA64_FIRST_DEVICE_VECTOR;
-+	return test_and_set_bit(pos, ia64_vector_mask);
-+}
-+
-+#ifdef CONFIG_SMP
-+#	define IS_RESCHEDULE(vec)	(vec == IA64_IPI_RESCHEDULE)
-+#else
-+#	define IS_RESCHEDULE(vec)	(0)
-+#endif
-+/*
-+ * That's where the IVT branches when we get an external
-+ * interrupt. This branches to the correct hardware IRQ handler via
-+ * function ptr.
-+ */
-+void
-+ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
-+{
-+	unsigned long saved_tpr;
-+
-+#if IRQ_DEBUG
-+	{
-+		unsigned long bsp, sp;
-+
-+		/*
-+		 * Note: if the interrupt happened while executing in
-+		 * the context switch routine (ia64_switch_to), we may
-+		 * get a spurious stack overflow here.  This is
-+		 * because the register and the memory stack are not
-+		 * switched atomically.
-+		 */
-+		bsp = ia64_getreg(_IA64_REG_AR_BSP);
-+		sp = ia64_getreg(_IA64_REG_SP);
-+
-+		if ((sp - bsp) < 1024) {
-+			static unsigned char count;
-+			static long last_time;
-+
-+			if (jiffies - last_time > 5*HZ)
-+				count = 0;
-+			if (++count < 5) {
-+				last_time = jiffies;
-+				printk("ia64_handle_irq: DANGER: less than "
-+				       "1KB of free stack space!!\n"
-+				       "(bsp=0x%lx, sp=%lx)\n", bsp, sp);
-+			}
-+		}
-+	}
-+#endif /* IRQ_DEBUG */
-+
-+	/*
-+	 * Always set TPR to limit maximum interrupt nesting depth to
-+	 * 16 (without this, it would be ~240, which could easily lead
-+	 * to kernel stack overflows).
-+	 */
-+	irq_enter();
-+	saved_tpr = ia64_getreg(_IA64_REG_CR_TPR);
-+	ia64_srlz_d();
-+	while (vector != IA64_SPURIOUS_INT_VECTOR) {
-+		if (!IS_RESCHEDULE(vector)) {
-+			ia64_setreg(_IA64_REG_CR_TPR, vector);
-+			ia64_srlz_d();
-+
-+			__do_IRQ(local_vector_to_irq(vector), regs);
-+
-+			/*
-+			 * Disable interrupts and send EOI:
-+			 */
-+			local_irq_disable();
-+			ia64_setreg(_IA64_REG_CR_TPR, saved_tpr);
-+		}
-+		ia64_eoi();
-+		vector = ia64_get_ivr();
-+	}
-+	/*
-+	 * This must be done *after* the ia64_eoi().  For example, the keyboard softirq
-+	 * handler needs to be able to wait for further keyboard interrupts, which can't
-+	 * come through until ia64_eoi() has been done.
-+	 */
-+	irq_exit();
-+}
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+/*
-+ * This function emulates a interrupt processing when a cpu is about to be
-+ * brought down.
-+ */
-+void ia64_process_pending_intr(void)
-+{
-+	ia64_vector vector;
-+	unsigned long saved_tpr;
-+	extern unsigned int vectors_in_migration[NR_IRQS];
-+
-+	vector = ia64_get_ivr();
-+
-+	 irq_enter();
-+	 saved_tpr = ia64_getreg(_IA64_REG_CR_TPR);
-+	 ia64_srlz_d();
-+
-+	 /*
-+	  * Perform normal interrupt style processing
-+	  */
-+	while (vector != IA64_SPURIOUS_INT_VECTOR) {
-+		if (!IS_RESCHEDULE(vector)) {
-+			ia64_setreg(_IA64_REG_CR_TPR, vector);
-+			ia64_srlz_d();
-+
-+			/*
-+			 * Now try calling normal ia64_handle_irq as it would have got called
-+			 * from a real intr handler. Try passing null for pt_regs, hopefully
-+			 * it will work. I hope it works!.
-+			 * Probably could shared code.
-+			 */
-+			vectors_in_migration[local_vector_to_irq(vector)]=0;
-+			__do_IRQ(local_vector_to_irq(vector), NULL);
-+
-+			/*
-+			 * Disable interrupts and send EOI
-+			 */
-+			local_irq_disable();
-+			ia64_setreg(_IA64_REG_CR_TPR, saved_tpr);
-+		}
-+		ia64_eoi();
-+		vector = ia64_get_ivr();
-+	}
-+	irq_exit();
-+}
-+#endif
-+
-+
-+#ifdef CONFIG_SMP
-+extern irqreturn_t handle_IPI (int irq, void *dev_id, struct pt_regs *regs);
-+
-+static struct irqaction ipi_irqaction = {
-+	.handler =	handle_IPI,
-+	.flags =	IRQF_DISABLED,
-+	.name =		"IPI"
-+};
-+#endif
-+
-+#ifdef CONFIG_XEN
-+#include <xen/evtchn.h>
-+#include <xen/interface/callback.h>
-+
-+static DEFINE_PER_CPU(int, timer_irq) = -1;
-+static DEFINE_PER_CPU(int, ipi_irq) = -1;
-+static DEFINE_PER_CPU(int, resched_irq) = -1;
-+static char timer_name[NR_CPUS][15];
-+static char ipi_name[NR_CPUS][15];
-+static char resched_name[NR_CPUS][15];
-+
-+struct saved_irq {
-+	unsigned int irq;
-+	struct irqaction *action;
-+};
-+/* 16 should be far optimistic value, since only several percpu irqs
-+ * are registered early.
-+ */
-+#define MAX_LATE_IRQ	16
-+static struct saved_irq saved_percpu_irqs[MAX_LATE_IRQ];
-+static unsigned short late_irq_cnt = 0;
-+static unsigned short saved_irq_cnt = 0;
-+static int xen_slab_ready = 0;
-+
-+#ifdef CONFIG_SMP
-+/* Dummy stub. Though we may check RESCHEDULE_VECTOR before __do_IRQ,
-+ * it ends up to issue several memory accesses upon percpu data and
-+ * thus adds unnecessary traffic to other paths.
-+ */
-+static irqreturn_t
-+handle_reschedule(int irq, void *dev_id, struct pt_regs *regs)
-+{
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static struct irqaction resched_irqaction = {
-+	.handler =	handle_reschedule,
-+	.flags =	SA_INTERRUPT,
-+	.name =		"RESCHED"
-+};
-+#endif
-+
-+/*
-+ * This is xen version percpu irq registration, which needs bind
-+ * to xen specific evtchn sub-system. One trick here is that xen
-+ * evtchn binding interface depends on kmalloc because related
-+ * port needs to be freed at device/cpu down. So we cache the
-+ * registration on BSP before slab is ready and then deal them
-+ * at later point. For rest instances happening after slab ready,
-+ * we hook them to xen evtchn immediately.
-+ *
-+ * FIXME: MCA is not supported by far, and thus "nomca" boot param is
-+ * required.
-+ */
-+static void
-+xen_register_percpu_irq (unsigned int irq, struct irqaction *action, int save)
-+{
-+	unsigned int cpu = smp_processor_id();
-+	int ret = 0;
-+
-+	if (xen_slab_ready) {
-+		switch (irq) {
-+		case IA64_TIMER_VECTOR:
-+			sprintf(timer_name[cpu], "%s%d", action->name, cpu);
-+			ret = bind_virq_to_irqhandler(VIRQ_ITC, cpu,
-+				action->handler, action->flags,
-+				timer_name[cpu], action->dev_id);
-+			per_cpu(timer_irq,cpu) = ret;
-+			printk(KERN_INFO "register VIRQ_ITC (%s) to xen irq (%d)\n", timer_name[cpu], ret);
-+			break;
-+		case IA64_IPI_RESCHEDULE:
-+			sprintf(resched_name[cpu], "%s%d", action->name, cpu);
-+			ret = bind_ipi_to_irqhandler(RESCHEDULE_VECTOR, cpu,
-+				action->handler, action->flags,
-+				resched_name[cpu], action->dev_id);
-+			per_cpu(resched_irq,cpu) = ret;
-+			printk(KERN_INFO "register RESCHEDULE_VECTOR (%s) to xen irq (%d)\n", resched_name[cpu], ret);
-+			break;
-+		case IA64_IPI_VECTOR:
-+			sprintf(ipi_name[cpu], "%s%d", action->name, cpu);
-+			ret = bind_ipi_to_irqhandler(IPI_VECTOR, cpu,
-+				action->handler, action->flags,
-+				ipi_name[cpu], action->dev_id);
-+			per_cpu(ipi_irq,cpu) = ret;
-+			printk(KERN_INFO "register IPI_VECTOR (%s) to xen irq (%d)\n", ipi_name[cpu], ret);
-+			break;
-+		case IA64_SPURIOUS_INT_VECTOR:
-+			break;
-+		default:
-+			printk(KERN_WARNING "Percpu irq %d is unsupported by xen!\n", irq);
-+			break;
-+		}
-+		BUG_ON(ret < 0);
-+	} 
-+
-+	/* For BSP, we cache registered percpu irqs, and then re-walk
-+	 * them when initializing APs
-+	 */
-+	if (!cpu && save) {
-+		BUG_ON(saved_irq_cnt == MAX_LATE_IRQ);
-+		saved_percpu_irqs[saved_irq_cnt].irq = irq;
-+		saved_percpu_irqs[saved_irq_cnt].action = action;
-+		saved_irq_cnt++;
-+		if (!xen_slab_ready)
-+			late_irq_cnt++;
-+	}
-+}
-+
-+static void
-+xen_bind_early_percpu_irq (void)
-+{
-+	int i;
-+
-+	xen_slab_ready = 1;
-+	/* There's no race when accessing this cached array, since only
-+	 * BSP will face with such step shortly
-+	 */
-+	for (i = 0; i < late_irq_cnt; i++)
-+		xen_register_percpu_irq(saved_percpu_irqs[i].irq,
-+		                        saved_percpu_irqs[i].action, 0);
-+}
-+
-+/* FIXME: There's no obvious point to check whether slab is ready. So
-+ * a hack is used here by utilizing a late time hook.
-+ */
-+extern void (*late_time_init)(void);
-+extern char xen_event_callback;
-+extern void xen_init_IRQ(void);
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+static int __devinit
-+unbind_evtchn_callback(struct notifier_block *nfb,
-+                       unsigned long action, void *hcpu)
-+{
-+	unsigned int cpu = (unsigned long)hcpu;
-+
-+	if (action == CPU_DEAD) {
-+		/* Unregister evtchn.  */
-+		if (per_cpu(ipi_irq,cpu) >= 0) {
-+			unbind_from_irqhandler (per_cpu(ipi_irq, cpu), NULL);
-+			per_cpu(ipi_irq, cpu) = -1;
-+		}
-+		if (per_cpu(resched_irq,cpu) >= 0) {
-+			unbind_from_irqhandler (per_cpu(resched_irq, cpu),
-+						NULL);
-+			per_cpu(resched_irq, cpu) = -1;
-+		}
-+		if (per_cpu(timer_irq,cpu) >= 0) {
-+			unbind_from_irqhandler (per_cpu(timer_irq, cpu), NULL);
-+			per_cpu(timer_irq, cpu) = -1;
-+		}
-+	}
-+	return NOTIFY_OK;
-+}
-+
-+static struct notifier_block unbind_evtchn_notifier = {
-+	.notifier_call = unbind_evtchn_callback,
-+	.priority = 0
-+};
-+#endif
-+
-+DECLARE_PER_CPU(int, ipi_to_irq[NR_IPIS]);
-+void xen_smp_intr_init(void)
-+{
-+#ifdef CONFIG_SMP
-+	unsigned int cpu = smp_processor_id();
-+	unsigned int i = 0;
-+	struct callback_register event = {
-+		.type = CALLBACKTYPE_event,
-+		.address = (unsigned long)&xen_event_callback,
-+	};
-+
-+	if (cpu == 0) {
-+		/* Initialization was already done for boot cpu.  */
-+#ifdef CONFIG_HOTPLUG_CPU
-+		/* Register the notifier only once.  */
-+		register_cpu_notifier(&unbind_evtchn_notifier);
-+#endif
-+		return;
-+	}
-+
-+	/* This should be piggyback when setup vcpu guest context */
-+	BUG_ON(HYPERVISOR_callback_op(CALLBACKOP_register, &event));
-+
-+	for (i = 0; i < saved_irq_cnt; i++)
-+		xen_register_percpu_irq(saved_percpu_irqs[i].irq,
-+		                        saved_percpu_irqs[i].action, 0);
-+#endif /* CONFIG_SMP */
-+}
-+#endif /* CONFIG_XEN */
-+
-+void
-+register_percpu_irq (ia64_vector vec, struct irqaction *action)
-+{
-+	irq_desc_t *desc;
-+	unsigned int irq;
-+
-+#ifdef CONFIG_XEN
-+	if (is_running_on_xen())
-+		return xen_register_percpu_irq(vec, action, 1);
-+#endif
-+
-+	for (irq = 0; irq < NR_IRQS; ++irq)
-+		if (irq_to_vector(irq) == vec) {
-+#ifdef CONFIG_XEN
-+			if (is_running_on_xen())
-+				return xen_register_percpu_irq(vec, action, 1);
-+#endif
-+			desc = irq_desc + irq;
-+			desc->status |= IRQ_PER_CPU;
-+			desc->chip = &irq_type_ia64_lsapic;
-+			if (action)
-+				setup_irq(irq, action);
-+		}
-+}
-+
-+void __init
-+init_IRQ (void)
-+{
-+#ifdef CONFIG_XEN
-+	/* Maybe put into platform_irq_init later */
-+	if (is_running_on_xen()) {
-+		struct callback_register event = {
-+			.type = CALLBACKTYPE_event,
-+			.address = (unsigned long)&xen_event_callback,
-+		};
-+		xen_init_IRQ();
-+		BUG_ON(HYPERVISOR_callback_op(CALLBACKOP_register, &event));
-+		late_time_init = xen_bind_early_percpu_irq;
-+#ifdef CONFIG_SMP
-+		register_percpu_irq(IA64_IPI_RESCHEDULE, &resched_irqaction);
-+#endif /* CONFIG_SMP */
-+	}
-+#endif /* CONFIG_XEN */
-+	register_percpu_irq(IA64_SPURIOUS_INT_VECTOR, NULL);
-+#ifdef CONFIG_SMP
-+	register_percpu_irq(IA64_IPI_VECTOR, &ipi_irqaction);
-+#endif
-+#ifdef CONFIG_PERFMON
-+	pfm_init_percpu();
-+#endif
-+	platform_irq_init();
-+}
-+
-+void
-+ia64_send_ipi (int cpu, int vector, int delivery_mode, int redirect)
-+{
-+	void __iomem *ipi_addr;
-+	unsigned long ipi_data;
-+	unsigned long phys_cpu_id;
-+
-+#ifdef CONFIG_XEN
-+        if (is_running_on_xen()) {
-+		int irq = -1;
-+
-+#ifdef CONFIG_SMP
-+		/* TODO: we need to call vcpu_up here */
-+		if (unlikely(vector == ap_wakeup_vector)) {
-+			extern void xen_send_ipi (int cpu, int vec);
-+			xen_send_ipi (cpu, vector);
-+			//vcpu_prepare_and_up(cpu);
-+			return;
-+		}
-+#endif
-+
-+		switch(vector) {
-+		case IA64_IPI_VECTOR:
-+			irq = per_cpu(ipi_to_irq, cpu)[IPI_VECTOR];
-+			break;
-+		case IA64_IPI_RESCHEDULE:
-+			irq = per_cpu(ipi_to_irq, cpu)[RESCHEDULE_VECTOR];
-+			break;
-+		default:
-+			printk(KERN_WARNING"Unsupported IPI type 0x%x\n", vector);
-+			irq = 0;
-+			break;
-+		}		
-+	
-+		BUG_ON(irq < 0);
-+		notify_remote_via_irq(irq);
-+		return;
-+        }
-+#endif /* CONFIG_XEN */
-+
-+#ifdef CONFIG_SMP
-+	phys_cpu_id = cpu_physical_id(cpu);
-+#else
-+	phys_cpu_id = (ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff;
-+#endif
-+
-+	/*
-+	 * cpu number is in 8bit ID and 8bit EID
-+	 */
-+
-+	ipi_data = (delivery_mode << 8) | (vector & 0xff);
-+	ipi_addr = ipi_base_addr + ((phys_cpu_id << 4) | ((redirect & 1) << 3));
-+
-+	writeq(ipi_data, ipi_addr);
-+}
 diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/ia64/kernel/pal.S compiling/arch/ia64/kernel/pal.S
 --- /mnt/ro/repos/hg/linux-2.6/arch/ia64/kernel/pal.S	2006-08-04 13:45:04.000000000 +0200
 +++ compiling/arch/ia64/kernel/pal.S	2006-08-04 16:36:20.000000000 +0200
@@ -23680,7 +22631,7 @@
  }
 diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/ia64/kernel/setup.c compiling/arch/ia64/kernel/setup.c
 --- /mnt/ro/repos/hg/linux-2.6/arch/ia64/kernel/setup.c	2006-07-13 00:51:20.000000000 +0200
-+++ compiling/arch/ia64/kernel/setup.c	2006-08-11 17:09:18.000000000 +0200
++++ compiling/arch/ia64/kernel/setup.c	2006-08-12 02:33:58.000000000 +0200
 @@ -60,6 +60,10 @@
  #include <asm/system.h>
  #include <asm/unistd.h>
@@ -23774,7 +22725,7 @@
 +		rsvd_region[j].end = end;
 +		collapsed = k - j;
 +		num -= collapsed;
-+		for (k = j + 1; k < j + 1 + collapsed; k++) {
++		for (k = j + 1; k < num; k++) {
 +			rsvd_region[k] = rsvd_region[k + collapsed];
 +		}
 +	}
@@ -44546,407 +43497,6 @@
 +
 +EXPORT_SYMBOL(change_page_attr);
 +EXPORT_SYMBOL(global_flush_tlb);
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/x86_64/mm/pageattr-xen.c~ compiling/arch/x86_64/mm/pageattr-xen.c~
---- /mnt/ro/repos/hg/linux-2.6/arch/x86_64/mm/pageattr-xen.c~	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/x86_64/mm/pageattr-xen.c~	2006-08-11 15:35:45.000000000 +0200
-@@ -0,0 +1,397 @@
-+/* 
-+ * Copyright 2002 Andi Kleen, SuSE Labs. 
-+ * Thanks to Ben LaHaise for precious feedback.
-+ */ 
-+
-+#include <linux/config.h>
-+#include <linux/mm.h>
-+#include <linux/sched.h>
-+#include <linux/highmem.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <asm/uaccess.h>
-+#include <asm/processor.h>
-+#include <asm/tlbflush.h>
-+#include <asm/io.h>
-+
-+#ifdef CONFIG_XEN
-+#include <asm/pgalloc.h>
-+#include <asm/mmu_context.h>
-+
-+LIST_HEAD(mm_unpinned);
-+DEFINE_SPINLOCK(mm_unpinned_lock);
-+
-+static inline void mm_walk_set_prot(void *pt, pgprot_t flags)
-+{
-+	struct page *page = virt_to_page(pt);
-+	unsigned long pfn = page_to_pfn(page);
-+
-+	BUG_ON(HYPERVISOR_update_va_mapping(
-+		       (unsigned long)__va(pfn << PAGE_SHIFT),
-+		       pfn_pte(pfn, flags), 0));
-+}
-+
-+static void mm_walk(struct mm_struct *mm, pgprot_t flags)
-+{
-+	pgd_t       *pgd;
-+	pud_t       *pud;
-+	pmd_t       *pmd;
-+	pte_t       *pte;
-+	int          g,u,m;
-+
-+	pgd = mm->pgd;
-+	/*
-+	 * Cannot iterate up to USER_PTRS_PER_PGD as these pagetables may not
-+	 * be the 'current' task's pagetables (e.g., current may be 32-bit,
-+	 * but the pagetables may be for a 64-bit task).
-+	 * Subtracting 1 from TASK_SIZE64 means the loop limit is correct
-+	 * regardless of whether TASK_SIZE64 is a multiple of PGDIR_SIZE.
-+	 */
-+	for (g = 0; g <= ((TASK_SIZE64-1) / PGDIR_SIZE); g++, pgd++) {
-+		if (pgd_none(*pgd))
-+			continue;
-+		pud = pud_offset(pgd, 0);
-+		if (PTRS_PER_PUD > 1) /* not folded */ 
-+			mm_walk_set_prot(pud,flags);
-+		for (u = 0; u < PTRS_PER_PUD; u++, pud++) {
-+			if (pud_none(*pud))
-+				continue;
-+			pmd = pmd_offset(pud, 0);
-+			if (PTRS_PER_PMD > 1) /* not folded */ 
-+				mm_walk_set_prot(pmd,flags);
-+			for (m = 0; m < PTRS_PER_PMD; m++, pmd++) {
-+				if (pmd_none(*pmd))
-+					continue;
-+				pte = pte_offset_kernel(pmd,0);
-+				mm_walk_set_prot(pte,flags);
-+			}
-+		}
-+	}
-+}
-+
-+void mm_pin(struct mm_struct *mm)
-+{
-+	if (xen_feature(XENFEAT_writable_page_tables))
-+		return;
-+
-+	spin_lock(&mm->page_table_lock);
-+
-+	mm_walk(mm, PAGE_KERNEL_RO);
-+	BUG_ON(HYPERVISOR_update_va_mapping(
-+		       (unsigned long)mm->pgd,
-+		       pfn_pte(virt_to_phys(mm->pgd)>>PAGE_SHIFT, PAGE_KERNEL_RO),
-+		       UVMF_TLB_FLUSH));
-+	BUG_ON(HYPERVISOR_update_va_mapping(
-+		       (unsigned long)__user_pgd(mm->pgd),
-+		       pfn_pte(virt_to_phys(__user_pgd(mm->pgd))>>PAGE_SHIFT, PAGE_KERNEL_RO),
-+		       UVMF_TLB_FLUSH));
-+	xen_pgd_pin(__pa(mm->pgd)); /* kernel */
-+	xen_pgd_pin(__pa(__user_pgd(mm->pgd))); /* user */
-+	mm->context.pinned = 1;
-+	spin_lock(&mm_unpinned_lock);
-+	list_del(&mm->context.unpinned);
-+	spin_unlock(&mm_unpinned_lock);
-+
-+	spin_unlock(&mm->page_table_lock);
-+}
-+
-+void mm_unpin(struct mm_struct *mm)
-+{
-+	if (xen_feature(XENFEAT_writable_page_tables))
-+		return;
-+
-+	spin_lock(&mm->page_table_lock);
-+
-+	xen_pgd_unpin(__pa(mm->pgd));
-+	xen_pgd_unpin(__pa(__user_pgd(mm->pgd)));
-+	BUG_ON(HYPERVISOR_update_va_mapping(
-+		       (unsigned long)mm->pgd,
-+		       pfn_pte(virt_to_phys(mm->pgd)>>PAGE_SHIFT, PAGE_KERNEL), 0));
-+	BUG_ON(HYPERVISOR_update_va_mapping(
-+		       (unsigned long)__user_pgd(mm->pgd),
-+		       pfn_pte(virt_to_phys(__user_pgd(mm->pgd))>>PAGE_SHIFT, PAGE_KERNEL), 0));
-+	mm_walk(mm, PAGE_KERNEL);
-+	xen_tlb_flush();
-+	mm->context.pinned = 0;
-+	spin_lock(&mm_unpinned_lock);
-+	list_add(&mm->context.unpinned, &mm_unpinned);
-+	spin_unlock(&mm_unpinned_lock);
-+
-+	spin_unlock(&mm->page_table_lock);
-+}
-+
-+void mm_pin_all(void)
-+{
-+	if (xen_feature(XENFEAT_writable_page_tables))
-+		return;
-+
-+	while (!list_empty(&mm_unpinned))	
-+		mm_pin(list_entry(mm_unpinned.next, struct mm_struct,
-+				  context.unpinned));
-+}
-+
-+void _arch_dup_mmap(struct mm_struct *mm)
-+{
-+    if (!mm->context.pinned)
-+        mm_pin(mm);
-+}
-+
-+void _arch_exit_mmap(struct mm_struct *mm)
-+{
-+    struct task_struct *tsk = current;
-+
-+    task_lock(tsk);
-+
-+    /*
-+     * We aggressively remove defunct pgd from cr3. We execute unmap_vmas()
-+     * *much* faster this way, as no tlb flushes means bigger wrpt batches.
-+     */
-+    if ( tsk->active_mm == mm )
-+    {
-+        tsk->active_mm = &init_mm;
-+        atomic_inc(&init_mm.mm_count);
-+
-+        switch_mm(mm, &init_mm, tsk);
-+
-+        atomic_dec(&mm->mm_count);
-+        BUG_ON(atomic_read(&mm->mm_count) == 0);
-+    }
-+
-+    task_unlock(tsk);
-+
-+    if ( mm->context.pinned && (atomic_read(&mm->mm_count) == 1) &&
-+         !mm->context.has_foreign_mappings )
-+        mm_unpin(mm);
-+}
-+
-+void pte_free(struct page *pte)
-+{
-+	unsigned long va = (unsigned long)__va(page_to_pfn(pte)<<PAGE_SHIFT);
-+
-+	if (!pte_write(*virt_to_ptep(va)))
-+		BUG_ON(HYPERVISOR_update_va_mapping(
-+			va, pfn_pte(page_to_pfn(pte), PAGE_KERNEL), 0));
-+	__free_page(pte);
-+}
-+#endif	/* CONFIG_XEN */
-+
-+static inline pte_t *lookup_address(unsigned long address) 
-+{ 
-+	pgd_t *pgd = pgd_offset_k(address);
-+	pud_t *pud;
-+	pmd_t *pmd;
-+	pte_t *pte;
-+	if (pgd_none(*pgd))
-+		return NULL;
-+	pud = pud_offset(pgd, address);
-+	if (!pud_present(*pud))
-+		return NULL; 
-+	pmd = pmd_offset(pud, address);
-+	if (!pmd_present(*pmd))
-+		return NULL; 
-+	if (pmd_large(*pmd))
-+		return (pte_t *)pmd;
-+	pte = pte_offset_kernel(pmd, address);
-+	if (pte && !pte_present(*pte))
-+		pte = NULL; 
-+	return pte;
-+} 
-+
-+static struct page *split_large_page(unsigned long address, pgprot_t prot,
-+				     pgprot_t ref_prot)
-+{ 
-+	int i; 
-+	unsigned long addr;
-+	struct page *base = alloc_pages(GFP_KERNEL, 0);
-+	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);
-+	for (i = 0; i < PTRS_PER_PTE; i++, addr += PAGE_SIZE) {
-+		pbase[i] = pfn_pte(addr >> PAGE_SHIFT, 
-+				   addr == address ? prot : ref_prot);
-+	}
-+	return base;
-+} 
-+
-+
-+static void flush_kernel_map(void *address) 
-+{
-+	if (0 && address && cpu_has_clflush) {
-+		/* is this worth it? */ 
-+		int i;
-+		for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size) 
-+			asm volatile("clflush (%0)" :: "r" (address + i)); 
-+	} else
-+		asm volatile("wbinvd":::"memory"); 
-+	if (address)
-+		__flush_tlb_one(address);
-+	else
-+		__flush_tlb_all();
-+}
-+
-+
-+static inline void flush_map(unsigned long address)
-+{	
-+	on_each_cpu(flush_kernel_map, (void *)address, 1, 1);
-+}
-+
-+static struct page *deferred_pages; /* protected by init_mm.mmap_sem */
-+
-+static inline void save_page(struct page *fpage)
-+{
-+	fpage->lru.next = (struct list_head *)deferred_pages;
-+	deferred_pages = fpage;
-+}
-+
-+/* 
-+ * No more special protections in this 2/4MB area - revert to a
-+ * large page again. 
-+ */
-+static void revert_page(unsigned long address, pgprot_t ref_prot)
-+{
-+	pgd_t *pgd;
-+	pud_t *pud;
-+	pmd_t *pmd;
-+	pte_t large_pte;
-+
-+	pgd = pgd_offset_k(address);
-+	BUG_ON(pgd_none(*pgd));
-+	pud = pud_offset(pgd,address);
-+	BUG_ON(pud_none(*pud));
-+	pmd = pmd_offset(pud, address);
-+	BUG_ON(pmd_val(*pmd) & _PAGE_PSE);
-+	pgprot_val(ref_prot) |= _PAGE_PSE;
-+	large_pte = mk_pte_phys(__pa(address) & LARGE_PAGE_MASK, ref_prot);
-+	set_pte((pte_t *)pmd, large_pte);
-+}      
-+
-+static int
-+__change_page_attr(unsigned long address, unsigned long pfn, pgprot_t prot,
-+				   pgprot_t ref_prot)
-+{ 
-+	pte_t *kpte; 
-+	struct page *kpte_page;
-+	unsigned kpte_flags;
-+	pgprot_t ref_prot2;
-+	kpte = lookup_address(address);
-+	if (!kpte) return 0;
-+	kpte_page = virt_to_page(((unsigned long)kpte) & PAGE_MASK);
-+	kpte_flags = pte_val(*kpte); 
-+	if (pgprot_val(prot) != pgprot_val(ref_prot)) { 
-+		if ((kpte_flags & _PAGE_PSE) == 0) { 
-+			set_pte(kpte, pfn_pte(pfn, prot));
-+		} else {
-+ 			/*
-+			 * split_large_page will take the reference for this
-+			 * change_page_attr on the split page.
-+ 			 */
-+
-+			struct page *split;
-+			ref_prot2 = __pgprot(pgprot_val(pte_pgprot(*lookup_address(address))) & ~(1<<_PAGE_BIT_PSE));
-+
-+			split = split_large_page(address, prot, ref_prot2);
-+			if (!split)
-+				return -ENOMEM;
-+			set_pte(kpte,mk_pte(split, ref_prot2));
-+			kpte_page = split;
-+		}	
-+		page_private(kpte_page)++;
-+	} else if ((kpte_flags & _PAGE_PSE) == 0) { 
-+		set_pte(kpte, pfn_pte(pfn, ref_prot));
-+		BUG_ON(page_private(kpte_page) == 0);
-+		page_private(kpte_page)--;
-+	} else
-+		BUG();
-+
-+	/* on x86-64 the direct mapping set at boot is not using 4k pages */
-+	/*
-+	 * ..., but the XEN guest kernels (currently) do:
-+	 * If the pte was reserved, it means it was created at boot
-+	 * time (not via split_large_page) and in turn we must not
-+	 * replace it with a large page.
-+	 */
-+#ifndef CONFIG_XEN
-+ 	BUG_ON(PageReserved(kpte_page));
-+#endif
-+	if (page_private(kpte_page) == 0) {
-+		save_page(kpte_page);
-+		revert_page(address, ref_prot);
-+	}
-+	return 0;
-+} 
-+
-+/*
-+ * Change the page attributes of an page in the linear mapping.
-+ *
-+ * This should be used when a page is mapped with a different caching policy
-+ * than write-back somewhere - some CPUs do not like it when mappings with
-+ * different caching policies exist. This changes the page attributes of the
-+ * in kernel linear mapping too.
-+ * 
-+ * The caller needs to ensure that there are no conflicting mappings elsewhere.
-+ * This function only deals with the kernel linear map.
-+ * 
-+ * Caller must call global_flush_tlb() after this.
-+ */
-+int change_page_attr_addr(unsigned long address, int numpages, pgprot_t prot)
-+{
-+	int err = 0; 
-+	int i; 
-+
-+	down_write(&init_mm.mmap_sem);
-+	for (i = 0; i < numpages; i++, address += PAGE_SIZE) {
-+		unsigned long pfn = __pa(address) >> PAGE_SHIFT;
-+
-+		err = __change_page_attr(address, pfn, prot, PAGE_KERNEL);
-+		if (err) 
-+			break; 
-+		/* Handle kernel mapping too which aliases part of the
-+		 * lowmem */
-+		if (__pa(address) < KERNEL_TEXT_SIZE) {
-+			unsigned long addr2;
-+			pgprot_t prot2 = prot;
-+			addr2 = __START_KERNEL_map + __pa(address);
-+ 			pgprot_val(prot2) &= ~_PAGE_NX;
-+			err = __change_page_attr(addr2, pfn, prot2, PAGE_KERNEL_EXEC);
-+		} 
-+	} 	
-+	up_write(&init_mm.mmap_sem); 
-+	return err;
-+}
-+
-+/* Don't call this for MMIO areas that may not have a mem_map entry */
-+int change_page_attr(struct page *page, int numpages, pgprot_t prot)
-+{
-+	unsigned long addr = (unsigned long)page_address(page);
-+	return change_page_attr_addr(addr, numpages, prot);
-+}
-+
-+void global_flush_tlb(void)
-+{ 
-+	struct page *dpage;
-+
-+	down_read(&init_mm.mmap_sem);
-+	dpage = xchg(&deferred_pages, NULL);
-+	up_read(&init_mm.mmap_sem);
-+
-+	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);
-+	} 
-+} 
-+
-+EXPORT_SYMBOL(change_page_attr);
-+EXPORT_SYMBOL(global_flush_tlb);
 diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/x86_64/oprofile/Makefile compiling/arch/x86_64/oprofile/Makefile
 --- /mnt/ro/repos/hg/linux-2.6/arch/x86_64/oprofile/Makefile	2006-07-13 00:51:24.000000000 +0200
 +++ compiling/arch/x86_64/oprofile/Makefile	2006-08-04 16:33:31.000000000 +0200



From fedora-cvs-commits at redhat.com  Sat Aug 12 00:48:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 20:48:50 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2555,1.2556
Message-ID: <200608120048.k7C0moMh023384@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
- fix %%setup for xen HV to work at xen HV upgrades.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2555
retrieving revision 1.2556
diff -u -r1.2555 -r1.2556
--- kernel-2.6.spec	12 Aug 2006 00:43:34 -0000	1.2555
+++ kernel-2.6.spec	12 Aug 2006 00:48:48 -0000	1.2556
@@ -694,6 +694,9 @@
 fi
 
 if [ ! -d xen-%{xen_hv_cset} ]; then
+  # %setup does chmod <blah> . what is bad if you are remoing things
+  # in the background
+  rm -rf deleteme deleteme2
   # Ok, first time we do a make prep
 %setup -D -T -q -n %{name}-%{version} -a1
   cp %{SOURCE2} .
@@ -1701,6 +1704,7 @@
 - xen HV update cset 11057:4ee64035c0a3
   (newer than that don't compile on ia64).
 - update linux-2.6-xen patch to fix sort_regions on ia64.
+- fix %%setup for xen HV to work at xen HV upgrades.
 
 * Fri Aug 11 2006 Juan Quintela <quintela at redhat.com>
 - xen HV update cset 11061:80f364a5662f.



From fedora-cvs-commits at redhat.com  Sat Aug 12 02:47:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 11 Aug 2006 22:47:23 -0400
Subject: rpms/evince/devel .cvsignore, 1.25, 1.26 evince.spec, 1.56,
	1.57 sources, 1.24, 1.25
Message-ID: <200608120247.k7C2lNDv025868@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24585

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
0.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	12 Jul 2006 04:14:10 -0000	1.25
+++ .cvsignore	12 Aug 2006 02:47:20 -0000	1.26
@@ -1 +1 @@
-evince-0.5.4.tar.bz2
+evince-0.5.5.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- evince.spec	26 Jul 2006 03:44:27 -0000	1.56
+++ evince.spec	12 Aug 2006 02:47:20 -0000	1.57
@@ -3,8 +3,8 @@
 %define dbus_version 0.60
 
 Name:		evince
-Version:	0.5.4
-Release:	3
+Version:	0.5.5
+Release:	1%{?dist}
 Summary:	Document viewer
 
 License: 	GPL
@@ -16,7 +16,7 @@
 BuildRequires:	gtk2-devel >= %{gtk2_version}
 BuildRequires:	poppler-devel >= %{poppler_version}
 BuildRequires:	libXt-devel
-BuildRequires:	nautilus
+BuildRequires:	nautilus-devel
 BuildRequires:	libgnomeprintui22-devel
 BuildRequires:	libgnomeui-devel
 BuildRequires:	gnome-vfs2-devel
@@ -51,7 +51,7 @@
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall
-%find_lang %name
+%find_lang Evince
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -120,7 +120,7 @@
 fi
 
 
-%files -f %{name}.lang
+%files -f Evince.lang
 %defattr(-,root,root,-)
 %doc README ChangeLog
 %{_bindir}/*
@@ -134,6 +134,9 @@
 
 
 %changelog
+* Fri Aug 11 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.5-1.fc6
+- Update to 0.5.5
+
 * Tue Jul 25 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.4-3
 - Don't ship an icon cache file
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	12 Jul 2006 04:14:10 -0000	1.24
+++ sources	12 Aug 2006 02:47:20 -0000	1.25
@@ -1 +1 @@
-82ea2cc4ae080aa5cbc2b1c7739ccb96  evince-0.5.4.tar.bz2
+d32d7ee1b84be2c18ad3249aea79d966  evince-0.5.5.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 04:11:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 00:11:31 -0400
Subject: rpms/gtksourceview/devel .cvsignore, 1.22, 1.23 gtksourceview.spec,
	1.33, 1.34 sources, 1.21, 1.22
Message-ID: <200608120411.k7C4BVGu019146@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtksourceview/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19093

Modified Files:
	.cvsignore gtksourceview.spec sources 
Log Message:
1.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	3 Aug 2006 20:04:51 -0000	1.22
+++ .cvsignore	12 Aug 2006 04:11:26 -0000	1.23
@@ -1 +1 @@
-gtksourceview-1.7.1.tar.bz2
+gtksourceview-1.7.2.tar.bz2


Index: gtksourceview.spec
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gtksourceview.spec	3 Aug 2006 20:04:51 -0000	1.33
+++ gtksourceview.spec	12 Aug 2006 04:11:27 -0000	1.34
@@ -3,7 +3,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview
-Version: 1.7.1
+Version: 1.7.2
 Release: 1%{?dist} 
 License: LGPL
 Group: System Environment/Libraries
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.2-1.fc6
+- Update to 1.7.2
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.1-1.fc6
 - Update to 1.7.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	3 Aug 2006 20:04:51 -0000	1.21
+++ sources	12 Aug 2006 04:11:27 -0000	1.22
@@ -1 +1 @@
-1aa0806f5433724357c91910fdd2a8e6  gtksourceview-1.7.1.tar.bz2
+a56ea78c74fe93a604357d7c555af0e5  gtksourceview-1.7.2.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 04:44:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 00:44:16 -0400
Subject: rpms/libwnck/devel .cvsignore, 1.36, 1.37 libwnck.spec, 1.54,
	1.55 sources, 1.36, 1.37
Message-ID: <200608120444.k7C4iG2j006968@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6893

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	3 Aug 2006 12:56:37 -0000	1.36
+++ .cvsignore	12 Aug 2006 04:44:11 -0000	1.37
@@ -1 +1 @@
-libwnck-2.15.90.tar.bz2
+libwnck-2.15.91.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- libwnck.spec	10 Aug 2006 22:36:04 -0000	1.54
+++ libwnck.spec	12 Aug 2006 04:44:12 -0000	1.55
@@ -5,8 +5,8 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.15.90
-Release: 1.fc5.aiglx
+Version: 2.15.91
+Release: 1%{?dist}
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -63,6 +63,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %find_lang %{name}
 
@@ -83,13 +84,16 @@
 %files devel
 %defattr(-,root,root)
 
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+- Don't ship static libraries
+
 * Thu Aug 10 2006 Kristian H??gsberg <krh at redhat.com> - 2.15.90-1.fc5.aiglx
 - Build for fc5 aiglx repo.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	3 Aug 2006 12:56:37 -0000	1.36
+++ sources	12 Aug 2006 04:44:12 -0000	1.37
@@ -1 +1 @@
-04b124fd057b73414a5f9b8904f1a68b  libwnck-2.15.90.tar.bz2
+d1dbe01de445b88359332061aa4cff0e  libwnck-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 04:48:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 00:48:27 -0400
Subject: rpms/gedit/devel .cvsignore, 1.45, 1.46 gedit.spec, 1.93,
	1.94 sources, 1.47, 1.48
Message-ID: <200608120448.k7C4mRGr011520@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11071

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.15.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	4 Aug 2006 03:26:48 -0000	1.45
+++ .cvsignore	12 Aug 2006 04:48:22 -0000	1.46
@@ -1,2 +1 @@
-gedit-2.15.5.tar.bz2
-docs.tar.gz
+gedit-2.15.6.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gedit.spec	10 Aug 2006 20:06:11 -0000	1.93
+++ gedit.spec	12 Aug 2006 04:48:22 -0000	1.94
@@ -16,13 +16,12 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.15.5
-Release: 	2%{?dist}
+Version: 	2.15.6
+Release: 	1%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/2.8/gedit-%{version}.tar.bz2
-Source1:	docs.tar.gz
 
 URL:		http://gedit.sourceforge.net/
 BuildRoot:	%{_tmppath}/gedit-%{version}-root
@@ -105,8 +104,6 @@
 %prep
 %setup -n gedit-%{version} -q
 
-tar xzf %{SOURCE1}
-
 %patch0 -p1 -b .filesel
 %ifarch ppc64,x86_64,ia64,s390x
 %patch1 -p1 -b .libdir
@@ -192,6 +189,9 @@
 %{_datadir}/gtk-doc/html/gedit/
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.6-1.fc6
+- Update to 2.15.6
+
 * Thu Aug 10 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.5-2.fc6
 - Apply patch from James Antill to copy extended attributes over
   when saving files (bug 202099)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	4 Aug 2006 03:26:48 -0000	1.47
+++ sources	12 Aug 2006 04:48:22 -0000	1.48
@@ -1,2 +1 @@
-252a105dfdf6488e21fa7cc9eb080418  gedit-2.15.5.tar.bz2
-f7e6256ae092d7db3590b16cf3508a9b  docs.tar.gz
+0b815c5ade3afcaf28b5c268f91a34f2  gedit-2.15.6.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 04:53:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 00:53:00 -0400
Subject: rpms/gedit/devel gedit.spec,1.94,1.95
Message-ID: <200608120453.k7C4r0wP023540@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23488

Modified Files:
	gedit.spec 
Log Message:
bump req



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gedit.spec	12 Aug 2006 04:48:22 -0000	1.94
+++ gedit.spec	12 Aug 2006 04:52:58 -0000	1.95
@@ -7,7 +7,7 @@
 %define libgnomeprintui_version 2.7.1
 %define desktop_file_utils_version 0.9
 %define gail_version 1.2.0
-%define gtksourceview_version 1.1.91
+%define gtksourceview_version 1.7.2
 %define pygtk_version 2.7.1
 %define gnome_python_desktop_version 2.13.3
 %define gnome_doc_utils_version 0.3.2
@@ -17,7 +17,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
 Version: 	2.15.6
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -189,6 +189,9 @@
 %{_datadir}/gtk-doc/html/gedit/
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.6-2.fc6
+- Bump gtksourceview requirement
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.6-1.fc6
 - Update to 2.15.6
 



From fedora-cvs-commits at redhat.com  Sat Aug 12 04:59:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 00:59:58 -0400
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.18,
	1.19 gnome-doc-utils.spec, 1.23, 1.24 sources, 1.18, 1.19
Message-ID: <200608120459.k7C4xw59024754@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-doc-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24691

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	13 Jun 2006 04:28:04 -0000	1.18
+++ .cvsignore	12 Aug 2006 04:59:52 -0000	1.19
@@ -1 +1 @@
-gnome-doc-utils-0.7.1.tar.bz2
+gnome-doc-utils-0.7.2.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-doc-utils.spec	13 Jun 2006 04:28:04 -0000	1.23
+++ gnome-doc-utils.spec	12 Aug 2006 04:59:52 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Documentation utilities for the GNOME project
 Name: gnome-doc-utils
-Version: 0.7.1
-Release: 1
+Version: 0.7.2
+Release: 1%{?dist}
 License: LGPL
 Group: Development/Tools
 URL: http://www.gnome.org/
@@ -55,6 +55,9 @@
 %{_datadir}/gnome-doc-utils
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.2-1.fc6
+- Update to 0.7.2
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.1-1
 - Update to 0.7.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	13 Jun 2006 04:28:04 -0000	1.18
+++ sources	12 Aug 2006 04:59:52 -0000	1.19
@@ -1 +1 @@
-21fe881ab473fdc9246c36bd8ef929b0  gnome-doc-utils-0.7.1.tar.bz2
+3f3903e5a3e3b05261498d907f2471a9  gnome-doc-utils-0.7.2.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 05:18:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 01:18:00 -0400
Subject: rpms/gtk2-engines/devel .cvsignore, 1.20, 1.21 gtk2-engines.spec,
	1.44, 1.45 sources, 1.21, 1.22
Message-ID: <200608120518.k7C5Hx8d011551@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gtk2-engines.spec sources 
Log Message:
2.7.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	2 Aug 2006 19:14:23 -0000	1.20
+++ .cvsignore	12 Aug 2006 05:17:55 -0000	1.21
@@ -1 +1 @@
-gtk-engines-2.7.6.tar.bz2
+gtk-engines-2.7.7.tar.bz2


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gtk2-engines.spec	2 Aug 2006 19:14:23 -0000	1.44
+++ gtk2-engines.spec	12 Aug 2006 05:17:55 -0000	1.45
@@ -1,6 +1,6 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.7.6
+Version:        2.7.7
 Release:	1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_datadir}/themes
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.7-1.fc6
+- Update to 2.7.7
+
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.6-1.fc6
 - Update to 2.7.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	2 Aug 2006 19:14:23 -0000	1.21
+++ sources	12 Aug 2006 05:17:55 -0000	1.22
@@ -1 +1 @@
-82f069f0fe3dc343df112a9a0e6098ae  gtk-engines-2.7.6.tar.bz2
+9019e3c0770e1ece497c9395a02444fd  gtk-engines-2.7.7.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 05:18:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 01:18:48 -0400
Subject: rpms/gnome-doc-utils/devel gnome-doc-utils.spec,1.24,1.25
Message-ID: <200608120518.k7C5ImFY011928@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-doc-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11867

Modified Files:
	gnome-doc-utils.spec 
Log Message:
fix file lists



Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-doc-utils.spec	12 Aug 2006 04:59:52 -0000	1.24
+++ gnome-doc-utils.spec	12 Aug 2006 05:18:46 -0000	1.25
@@ -37,11 +37,13 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig/
 mv $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc $RPM_BUILD_ROOT%{_datadir}/pkgconfig
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS README NEWS
 %{_bindir}/*



From fedora-cvs-commits at redhat.com  Sat Aug 12 05:31:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 01:31:42 -0400
Subject: rpms/gcc/devel gcc41-pr27827-test.patch, NONE,
	1.1 gcc41-rh200887.patch, 1.1, 1.2 gcc41.spec, 1.91, 1.92
Message-ID: <200608120531.k7C5Vgjj024616@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41-rh200887.patch gcc41.spec 
Added Files:
	gcc41-pr27827-test.patch 
Log Message:
4.1.1-16

gcc41-pr27827-test.patch:
 pr27827.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gcc41-pr27827-test.patch ---
2006-08-12  Jakub Jelinek  <jakub at redhat.com>

	* gcc.target/i386/pr27827.c: Only compile on ilp32 target.

--- gcc/testsuite/gcc.target/i386/pr27827.c	2006-08-11 17:30:24.000000000 +0200
+++ gcc/testsuite/gcc.target/i386/pr27827.c	2006-08-12 07:26:17.000000000 +0200
@@ -1,4 +1,4 @@
-/* { dg-do compile } */
+/* { dg-do compile { target ilp32 } } */
 /* { dg-options "-O2" } */
 
 double a, b;

gcc41-rh200887.patch:
 0 files changed

Index: gcc41-rh200887.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-rh200887.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-rh200887.patch	11 Aug 2006 20:58:28 -0000	1.1
+++ gcc41-rh200887.patch	12 Aug 2006 05:31:39 -0000	1.2
@@ -17,7 +17,7 @@
 +	rm -rf META-INF; \
 +	find -type f | xargs touch -r ../$$JARDIR.stamp; \
 +	find -type d | xargs touch -r ../$$JARDIR.stamp; \
-+	$(JAR) -cf at E ../$@ || exit 1; \
++	find * | LC_ALL=C sort | $(JAR) -cf at E ../$@ || exit 1; \
 +	cd ..; \
 +	rm -rf $$JARDIR $$JARDIR.stamp
  
@@ -42,7 +42,7 @@
 +	rm -rf META-INF; \
 +	find -type f | xargs touch -r ../$$JARDIR.stamp; \
 +	find -type d | xargs touch -r ../$$JARDIR.stamp; \
-+	$(JAR) -cf at E ../$@ || exit 1; \
++	find * | LC_ALL=C sort | $(JAR) -cf at E ../$@ || exit 1; \
 +	cd ..; \
 +	rm -rf $$JARDIR $$JARDIR.stamp
  


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gcc41.spec	11 Aug 2006 20:58:28 -0000	1.91
+++ gcc41.spec	12 Aug 2006 05:31:39 -0000	1.92
@@ -1,6 +1,6 @@
 %define DATE 20060811
 %define gcc_version 4.1.1
-%define gcc_release 15
+%define gcc_release 16
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -138,6 +138,7 @@
 Patch31: gcc41-java-libdotdotlib.patch
 Patch32: gcc41-pr28600.patch
 Patch33: gcc41-rh200887.patch
+Patch34: gcc41-pr27827-test.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -452,6 +453,7 @@
 %patch31 -p0 -b .java-libdotdotlib~
 %patch32 -p0 -b .pr28600~
 %patch33 -p0 -b .rh200887~
+%patch34 -p0 -b .pr27827-test~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1512,6 +1514,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Aug 12 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-16
+- fix multilib conflict in libgcj-tools-4.1.1.jar (#200887)
+
 * Fri Aug 11 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-15
 - update from gcc-4_1-branch (-r115877:116082)
   - PRs c++/27508, c++/28148, c++/28250, c++/28256, c++/28257, c++/28259,
@@ -1522,7 +1527,6 @@
 	target/27566, target/27827
 - fix Fortran ICE with nested function (Paul Thomas, #200618,
   PR fortran/28600)
-- fix multilib conflict in libgcj-tools-4.1.1.jar (#200887)
 
 * Wed Aug  2 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-14
 - update from gcc-4_1-branch (-r115644:115877)



From fedora-cvs-commits at redhat.com  Sat Aug 12 05:54:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 01:54:58 -0400
Subject: rpms/gnome-doc-utils/devel gnome-doc-utils.spec,1.25,1.26
Message-ID: <200608120554.k7C5sw1Q022278@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-doc-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22216

Modified Files:
	gnome-doc-utils.spec 
Log Message:
fix build reqs



Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-doc-utils.spec	12 Aug 2006 05:18:46 -0000	1.25
+++ gnome-doc-utils.spec	12 Aug 2006 05:54:55 -0000	1.26
@@ -11,6 +11,7 @@
 BuildPrereq: libxml2-devel >= 2.6.12
 BuildPrereq: libxslt-devel >= 1.1.8
 BuildRequires: perl-XML-Parser
+BuildRequires: gettext
 Requires: libxml2 >= 2.6.12
 Requires: libxslt >= 1.1.8
 Requires: libxml2-python



From fedora-cvs-commits at redhat.com  Sat Aug 12 06:43:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 02:43:53 -0400
Subject: rpms/gcalctool/devel .cvsignore, 1.8, 1.9 gcalctool.spec, 1.20,
	1.21 sources, 1.9, 1.10
Message-ID: <200608120643.k7C6hrGa017738@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17690

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.8.20



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Aug 2006 23:54:11 -0000	1.8
+++ .cvsignore	12 Aug 2006 06:43:50 -0000	1.9
@@ -1 +1 @@
-gcalctool-5.8.19.tar.bz2
+gcalctool-5.8.20.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gcalctool.spec	2 Aug 2006 23:54:11 -0000	1.20
+++ gcalctool.spec	12 Aug 2006 06:43:50 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.8.19
+Version:        5.8.20
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 5.8.20-1.fc6
+- Update to 5.8.20
+
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 5.8.19-1.fc6
 - Update to 5.8.19
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Aug 2006 23:54:11 -0000	1.9
+++ sources	12 Aug 2006 06:43:50 -0000	1.10
@@ -1 +1 @@
-9fbf0f2552f6fd1a0fadf54a2125fef2  gcalctool-5.8.19.tar.bz2
+c6324ba4d3a50f9605229c0ba601e6b3  gcalctool-5.8.20.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 07:05:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 03:05:28 -0400
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.31,
	1.32 gnome-icon-theme.spec, 1.52, 1.53 sources, 1.34, 1.35
Message-ID: <200608120705.k7C75SSG006461@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6408

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	3 Aug 2006 05:03:55 -0000	1.31
+++ .cvsignore	12 Aug 2006 07:05:25 -0000	1.32
@@ -1 +1 @@
-gnome-icon-theme-2.15.90.tar.bz2
+gnome-icon-theme-2.15.91.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-icon-theme.spec	3 Aug 2006 05:03:55 -0000	1.52
+++ gnome-icon-theme.spec	12 Aug 2006 07:05:25 -0000	1.53
@@ -1,6 +1,6 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.15.90
+Version: 2.15.91
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -69,6 +69,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Thu Aug  2 2006 Matthias Clasen <mclasen at redhat.com> 2.15.90-1.fc6
 - Update to 2.15.90
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	3 Aug 2006 05:03:55 -0000	1.34
+++ sources	12 Aug 2006 07:05:25 -0000	1.35
@@ -1 +1 @@
-e2d9221450d2f4ac3d77d353b5e0df7a  gnome-icon-theme-2.15.90.tar.bz2
+a62c3b31da1df233ba735444be621ddb  gnome-icon-theme-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 07:49:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 03:49:00 -0400
Subject: rpms/gnome-themes/devel gnome-themes-2.15.91.1-clearlooks.patch,
	NONE, 1.1 .cvsignore, 1.32, 1.33 gnome-themes.spec, 1.64,
	1.65 sources, 1.33, 1.34
Message-ID: <200608120749.k7C7n03f017022@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-themes.spec sources 
Added Files:
	gnome-themes-2.15.91.1-clearlooks.patch 
Log Message:
2.15.91.1


gnome-themes-2.15.91.1-clearlooks.patch:
 configure.in                             |   11 +++++++++++
 desktop-themes/Clearlooks/index.theme.in |    2 +-
 gtk-themes/Makefile.am                   |    2 +-
 icon-themes/Makefile.am                  |    2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE gnome-themes-2.15.91.1-clearlooks.patch ---
--- gnome-themes-2.15.91.1/configure.in.clearlooks	2006-08-12 03:38:09.000000000 -0400
+++ gnome-themes-2.15.91.1/configure.in	2006-08-12 03:39:11.000000000 -0400
@@ -111,6 +111,12 @@
 gtk-themes/Makefile
 gtk-themes/Glider/Makefile
 gtk-themes/Clarius/Makefile
+gtk-themes/Clearlooks-DeepSky/Makefile
+gtk-themes/Clearlooks-DeepSky/gtk-2.0/Makefile
+gtk-themes/Clearlooks-Olive/Makefile
+gtk-themes/Clearlooks-Olive/gtk-2.0/Makefile
+gtk-themes/Clearlooks-Quicksilver/Makefile
+gtk-themes/Clearlooks-Quicksilver/gtk-2.0/Makefile
 icon-themes/Makefile
 icon-themes/Crux/Makefile
 icon-themes/HighContrast-SVG/Makefile
@@ -136,6 +142,11 @@
 icon-themes/Mist/scalable/actions/Makefile
 icon-themes/Mist/scalable/status/Makefile
 icon-themes/Mist/scalable/places/Makefile
+icon-themes/Clearlooks/Makefile
+icon-themes/Clearlooks/16x16/Makefile
+icon-themes/Clearlooks/24x24/Makefile
+icon-themes/Clearlooks/16x16/gtk/Makefile
+icon-themes/Clearlooks/24x24/gtk/Makefile
 common/Makefile
 HighContrast/Makefile
 HighContrast/gtk-2.0/Makefile
--- gnome-themes-2.15.91.1/gtk-themes/Makefile.am.clearlooks	2006-08-12 03:39:28.000000000 -0400
+++ gnome-themes-2.15.91.1/gtk-themes/Makefile.am	2006-08-12 03:40:01.000000000 -0400
@@ -1 +1 @@
-SUBDIRS=Glider Clarius
+SUBDIRS=Glider Clarius Clearlooks-DeepSky Clearlooks-Olive Clearlooks-Quicksilver
--- gnome-themes-2.15.91.1/icon-themes/Makefile.am.clearlooks	2006-08-12 03:40:11.000000000 -0400
+++ gnome-themes-2.15.91.1/icon-themes/Makefile.am	2006-08-12 03:40:22.000000000 -0400
@@ -1 +1 @@
-SUBDIRS=Crux HighContrast-SVG Mist 
+SUBDIRS=Crux HighContrast-SVG Mist Clearlooks 
--- gnome-themes-2.15.91.1/desktop-themes/Clearlooks/index.theme.in.clearlooks	2006-08-12 03:36:23.000000000 -0400
+++ gnome-themes-2.15.91.1/desktop-themes/Clearlooks/index.theme.in	2006-08-12 03:40:32.000000000 -0400
@@ -5,4 +5,4 @@
 Encoding=UTF-8
 GtkTheme=Clarius
 MetacityTheme=Clearlooks
-IconTheme=gnome
+IconTheme=Clearlooks


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	2 Aug 2006 19:56:20 -0000	1.32
+++ .cvsignore	12 Aug 2006 07:48:58 -0000	1.33
@@ -6,3 +6,4 @@
 gnome-themes-2.15.3.tar.bz2
 gnome-themes-2.15.4.tar.bz2
 gnome-themes-2.15.90.tar.bz2
+gnome-themes-2.15.91.1.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gnome-themes.spec	2 Aug 2006 19:56:20 -0000	1.64
+++ gnome-themes.spec	12 Aug 2006 07:48:58 -0000	1.65
@@ -2,12 +2,12 @@
 
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.15.90
+Version: 2.15.91.1
 Release: 1%{?dist}
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 Source: %{name}-%{version}.tar.bz2
 Source1: clearlooks-%{clearlooks_version}.tar.bz2
-Patch2: gnome-themes-2.15.4-clearlooks.patch
+Patch2: gnome-themes-2.15.91.1-clearlooks.patch
 Patch3: clearlooks-0.5-inherit-bluecurve.patch
 License: LGPL
 Group: User Interface/Desktops
@@ -82,7 +82,10 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %changelog
-* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc5
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91.1-1.fc6
+- Update to 2.15.91.1
+
+* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	2 Aug 2006 19:56:20 -0000	1.33
+++ sources	12 Aug 2006 07:48:58 -0000	1.34
@@ -1,2 +1,2 @@
 451ef33d1bffa261c5cbe01182199f97  clearlooks-0.6.2.tar.bz2
-9ee69574d10a81215448f38a02e262e3  gnome-themes-2.15.90.tar.bz2
+9bbd4dfd2d1e44fa0d1ee3fcadff8f4c  gnome-themes-2.15.91.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 08:51:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 04:51:55 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2556,1.2557
Message-ID: <200608120851.k7C8ptt5009878@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
disable ia64 xen


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2556
retrieving revision 1.2557
diff -u -r1.2556 -r1.2557
--- kernel-2.6.spec	12 Aug 2006 00:48:48 -0000	1.2556
+++ kernel-2.6.spec	12 Aug 2006 08:51:52 -0000	1.2557
@@ -65,7 +65,8 @@
 %endif
 
 # Xen only builds on i686, x86_64 and ia64 ...
-%ifnarch i686 x86_64 ia64
+#%ifnarch i686 x86_64 ia64
+%ifnarch i686 x86_64
 %define buildxen 0
 %endif
 
@@ -1701,6 +1702,7 @@
 
 %changelog
 * Sat Aug 12 2006 Juan Quintela <quintela at redhat.com>
+- disable ia64 xen, it does'nt compile.
 - xen HV update cset 11057:4ee64035c0a3
   (newer than that don't compile on ia64).
 - update linux-2.6-xen patch to fix sort_regions on ia64.



From fedora-cvs-commits at redhat.com  Sat Aug 12 10:59:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 06:59:38 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.64, 1.65 libsemanage.spec,
	1.102, 1.103 sources, 1.66, 1.67
Message-ID: <200608121059.k7CAxcs7009072@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	4 Aug 2006 22:56:25 -0000	1.64
+++ .cvsignore	12 Aug 2006 10:59:35 -0000	1.65
@@ -70,3 +70,4 @@
 libsemanage-1.6.11.tgz
 libsemanage-1.6.12.tgz
 libsemanage-1.6.13.tgz
+libsemanage-1.6.15.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- libsemanage.spec	11 Aug 2006 03:20:13 -0000	1.102
+++ libsemanage.spec	12 Aug 2006 10:59:35 -0000	1.103
@@ -2,12 +2,11 @@
 %define libselinuxver 1.30.22-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.6.13
-Release: 2
+Version: 1.6.15
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
-Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: libselinux-devel >= %{libselinuxver} 
@@ -41,7 +40,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -77,6 +75,12 @@
 %{_mandir}/man3/*
 
 %changelog
+
+* Sat Aug 12 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.15-1
+- Upgrade to latest from NSA
+	* Merged separate local file contexts patch from Chris PeBenito.
+	* Merged patch to make most copy errors non-fatal from Dan Walsh.
+
 * Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.13-3
 - Change other updates to be non-fatal
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	4 Aug 2006 22:56:25 -0000	1.66
+++ sources	12 Aug 2006 10:59:35 -0000	1.67
@@ -1 +1 @@
-b1224e4891618d62c21bcb69068e5379  libsemanage-1.6.13.tgz
+7946dfe59e42af1a67ad60f6e069e1a3  libsemanage-1.6.15.tgz



From fedora-cvs-commits at redhat.com  Sat Aug 12 11:21:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 07:21:13 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.116, 1.117 libselinux.spec,
	1.218, 1.219 sources, 1.118, 1.119
Message-ID: <200608121121.k7CBLDZR003120@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Sat Aug  12 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.25-1
- Upgrade to latest from NSA
	* Merged file context homedir and local path functions from
	  Chris PeBenito.
	* Rework functions that access /proc/pid/attr to access the
	  per-thread nodes, and unify the code to simplify maintenance.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- .cvsignore	11 Aug 2006 10:45:34 -0000	1.116
+++ .cvsignore	12 Aug 2006 11:21:11 -0000	1.117
@@ -91,3 +91,4 @@
 libselinux-1.30.20.tgz
 libselinux-1.30.22.tgz
 libselinux-1.30.24.tgz
+libselinux-1.30.26.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- libselinux.spec	11 Aug 2006 10:45:34 -0000	1.218
+++ libselinux.spec	12 Aug 2006 11:21:11 -0000	1.219
@@ -1,7 +1,7 @@
 %define libsepolver 1.12.21-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.24
+Version: 1.30.26
 Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -116,6 +116,13 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Sat Aug  12 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.25-1
+- Upgrade to latest from NSA
+	* Merged file context homedir and local path functions from
+	  Chris PeBenito.
+	* Rework functions that access /proc/pid/attr to access the
+	  per-thread nodes, and unify the code to simplify maintenance.
+
 * Fri Aug  11 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.24-1
 - Upgrade to latest from NSA
 	* Merged return value fix for *getfilecon() from Dan Walsh.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- sources	11 Aug 2006 10:45:34 -0000	1.118
+++ sources	12 Aug 2006 11:21:11 -0000	1.119
@@ -1 +1 @@
-3e9fcc3659c788b393d2742b5b780e5a  libselinux-1.30.24.tgz
+ebee2528a1faa81597eea074c167ce04  libselinux-1.30.26.tgz



From fedora-cvs-commits at redhat.com  Sat Aug 12 11:54:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 07:54:53 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.79,
	1.80 policy-20060802.patch, 1.9, 1.10 selinux-policy.spec,
	1.251, 1.252 sources, 1.83, 1.84
Message-ID: <200608121154.k7CBsrdc001226@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policy-20060802.patch selinux-policy.spec sources 
Log Message:
* Sat Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-1
- Update from upstream
- More java fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	8 Aug 2006 20:40:36 -0000	1.79
+++ .cvsignore	12 Aug 2006 11:54:51 -0000	1.80
@@ -80,3 +80,4 @@
 serefpolicy-2.3.4.tgz
 serefpolicy-2.3.5.tgz
 serefpolicy-2.3.6.tgz
+serefpolicy-2.3.7.tgz

policy-20060802.patch:
 mls                                  |    9 -
 modules/admin/anaconda.te            |   20 +-
 modules/admin/bootloader.te          |    4 
 modules/admin/consoletype.te         |   11 +
 modules/admin/firstboot.te           |    2 
 modules/admin/prelink.te             |    3 
 modules/admin/rpm.fc                 |    2 
 modules/admin/rpm.if                 |   13 -
 modules/admin/usermanage.te          |    4 
 modules/apps/java.fc                 |    9 -
 modules/apps/mozilla.if              |    2 
 modules/kernel/corecommands.fc       |    1 
 modules/kernel/corenetwork.te.in     |    7 
 modules/kernel/devices.fc            |    2 
 modules/kernel/devices.if            |   37 ++++
 modules/kernel/devices.te            |    8 
 modules/kernel/files.if              |   18 ++
 modules/kernel/filesystem.te         |    2 
 modules/kernel/kernel.if             |   75 +++++++++
 modules/kernel/terminal.if           |   19 ++
 modules/services/amavis.te           |    7 
 modules/services/apache.te           |    1 
 modules/services/avahi.te            |    2 
 modules/services/bind.te             |    1 
 modules/services/bluetooth.te        |    5 
 modules/services/ccs.fc              |    8 
 modules/services/ccs.if              |   45 +++++
 modules/services/ccs.te              |   84 ++++++++++
 modules/services/clamav.if           |    1 
 modules/services/cron.if             |   16 +
 modules/services/cron.te             |    1 
 modules/services/cups.te             |   18 +-
 modules/services/cyrus.te            |    1 
 modules/services/dbus.if             |    6 
 modules/services/ldap.te             |    2 
 modules/services/mta.fc              |    2 
 modules/services/nis.te              |    2 
 modules/services/ntp.te              |    2 
 modules/services/oddjob.fc           |    8 
 modules/services/oddjob.if           |   76 +++++++++
 modules/services/oddjob.te           |   70 ++++++++
 modules/services/oddjob_mkhomedir.fc |    6 
 modules/services/oddjob_mkhomedir.if |   24 ++
 modules/services/oddjob_mkhomedir.te |   26 +++
 modules/services/openvpn.te          |    2 
 modules/services/pegasus.if          |   31 +++
 modules/services/pegasus.te          |    5 
 modules/services/postfix.te          |    7 
 modules/services/procmail.te         |    1 
 modules/services/ricci.fc            |   20 ++
 modules/services/ricci.if            |  184 ++++++++++++++++++++++
 modules/services/ricci.te            |  286 +++++++++++++++++++++++++++++++++++
 modules/services/rpc.if              |    2 
 modules/services/rpc.te              |    5 
 modules/services/samba.te            |    6 
 modules/services/setroubleshoot.fc   |    9 +
 modules/services/setroubleshoot.if   |    3 
 modules/services/setroubleshoot.te   |  109 +++++++++++++
 modules/services/spamassassin.te     |    4 
 modules/services/squid.te            |    4 
 modules/services/ssh.if              |   26 ++-
 modules/services/ssh.te              |    1 
 modules/services/stunnel.te          |    4 
 modules/services/xserver.if          |   69 ++++++++
 modules/services/xserver.te          |   19 +-
 modules/system/authlogin.te          |    1 
 modules/system/fstools.te            |    1 
 modules/system/hostname.te           |   10 -
 modules/system/init.if               |    7 
 modules/system/init.te               |    2 
 modules/system/libraries.fc          |    6 
 modules/system/locallogin.te         |    4 
 modules/system/logging.fc            |    3 
 modules/system/logging.if            |   21 ++
 modules/system/logging.te            |    3 
 modules/system/miscfiles.fc          |    1 
 modules/system/miscfiles.if          |   18 ++
 modules/system/modutils.te           |    1 
 modules/system/mount.te              |    3 
 modules/system/selinuxutil.te        |   15 +
 modules/system/udev.fc               |    1 
 modules/system/udev.te               |    1 
 modules/system/unconfined.if         |    2 
 modules/system/unconfined.te         |    5 
 modules/system/userdomain.if         |  236 +++++++++++++++++++---------
 modules/system/userdomain.te         |   48 ++---
 modules/system/xen.if                |   38 ++++
 modules/system/xen.te                |   26 ++-
 88 files changed, 1727 insertions(+), 185 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- policy-20060802.patch	11 Aug 2006 15:39:50 -0000	1.9
+++ policy-20060802.patch	12 Aug 2006 11:54:51 -0000	1.10
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.6/policy/mls
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.7/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.6/policy/mls	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/mls	2006-08-12 07:18:46.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -22,9 +22,9 @@
  mlsconstrain dir { add_name remove_name reparent rmdir }
  	((( l1 dom l2 ) and ( l1 domby h2 )) or
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.6/policy/modules/admin/anaconda.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.7/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/anaconda.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/anaconda.te	2006-08-12 07:18:46.000000000 -0400
 @@ -25,8 +25,12 @@
  
  modutils_domtrans_insmod(anaconda_t)
@@ -67,9 +67,9 @@
 +dontaudit domain anaconda_t:fifo_file r_file_perms;
 +dontaudit domain anaconda_t:unix_stream_socket connectto;
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.6/policy/modules/admin/bootloader.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.7/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/bootloader.te	2006-08-10 14:25:32.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/bootloader.te	2006-08-12 07:18:46.000000000 -0400
 @@ -83,8 +83,10 @@
  dev_read_rand(bootloader_t)
  dev_read_urand(bootloader_t)
@@ -82,9 +82,9 @@
  
  fs_getattr_xattr_fs(bootloader_t)
  fs_getattr_tmpfs(bootloader_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.6/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.7/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/consoletype.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/consoletype.te	2006-08-12 07:18:46.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -107,9 +107,9 @@
 +optional_policy(`
 +	xen_dontaudit_use_fds(consoletype_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.6/policy/modules/admin/firstboot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.7/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/firstboot.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/firstboot.te	2006-08-12 07:18:46.000000000 -0400
 @@ -106,7 +106,7 @@
  ')
  
@@ -119,9 +119,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.6/policy/modules/admin/prelink.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.7/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/prelink.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/prelink.te	2006-08-12 07:18:46.000000000 -0400
 @@ -1,4 +1,3 @@
 -
  policy_module(prelink,1.1.5)
@@ -136,9 +136,9 @@
  optional_policy(`
  	cron_system_entry(prelink_t, prelink_exec_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.6/policy/modules/admin/rpm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.7/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/rpm.fc	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/rpm.fc	2006-08-12 07:18:46.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -148,9 +148,9 @@
  ')
  
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.6/policy/modules/admin/rpm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.7/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/rpm.if	2006-08-10 13:47:39.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/rpm.if	2006-08-12 07:18:46.000000000 -0400
 @@ -75,12 +75,13 @@
  	')
  
@@ -171,9 +171,9 @@
  	allow rpm_t $3:chr_file rw_term_perms;
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.6/policy/modules/admin/usermanage.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.7/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/admin/usermanage.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/usermanage.te	2006-08-12 07:18:46.000000000 -0400
 @@ -260,7 +260,7 @@
  ')
  
@@ -192,17 +192,32 @@
  	nscd_socket_use(useradd_t)
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.6/policy/modules/apps/java.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.7/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/apps/java.fc	2006-08-10 15:37:22.000000000 -0400
-@@ -10,3 +10,4 @@
++++ serefpolicy-2.3.7/policy/modules/apps/java.fc	2006-08-12 07:24:11.000000000 -0400
+@@ -1,7 +1,7 @@
+ #
+ # /opt
+ #
+-/opt/(.*/)?bin/java([^/]*)? --	gen_context(system_u:object_r:java_exec_t,s0)
++/opt/(.*/)?java([^/]*)? --	gen_context(system_u:object_r:java_exec_t,s0)
+ 
+ #
+ # /usr
+@@ -10,3 +10,10 @@
  /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)
 +/usr/bin/frysk		--	gen_context(system_u:object_r:java_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.6/policy/modules/apps/mozilla.if
++/usr/bin/gappletviewer  --	gen_context(system_u:object_r:java_exec_t,s0)
++/usr/bin/gjarsigner  	--	gen_context(system_u:object_r:java_exec_t,s0)
++/usr/bin/gkeytool  	--	gen_context(system_u:object_r:java_exec_t,s0)
++/usr/bin/grmic  	--	gen_context(system_u:object_r:java_exec_t,s0)
++/usr/bin/grmiregistry  	--	gen_context(system_u:object_r:java_exec_t,s0)
++/usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.7/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-08 14:59:36.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/apps/mozilla.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/apps/mozilla.if	2006-08-12 07:18:46.000000000 -0400
 @@ -63,6 +63,7 @@
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
@@ -219,9 +234,9 @@
  
  	# Browse the web, connect to printer
  	sysnet_dns_name_resolve($1_mozilla_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.7/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/corecommands.fc	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/kernel/corecommands.fc	2006-08-12 07:18:46.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -230,10 +245,17 @@
  
  ifdef(`distro_debian',`
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.7/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/corenetwork.te.in	2006-08-09 12:58:00.000000000 -0400
-@@ -73,6 +73,7 @@
++++ serefpolicy-2.3.7/policy/modules/kernel/corenetwork.te.in	2006-08-12 07:18:46.000000000 -0400
+@@ -67,12 +67,14 @@
+ network_port(clamd, tcp,3310,s0)
+ network_port(clockspeed, udp,4041,s0)
+ network_port(comsat, udp,512,s0)
++network_port(cluster, tcp,40040,s0)
+ network_port(cvs, tcp,2401,s0, udp,2401,s0)
+ network_port(dcc, udp,6276,s0, udp,6277,s0)
+ network_port(dbskkd, tcp,1178,s0)
  network_port(dhcpc, udp,68,s0)
  network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
  network_port(dict, tcp,2628,s0)
@@ -241,7 +263,7 @@
  network_port(distccd, tcp,3632,s0)
  network_port(dns, udp,53,s0, tcp,53,s0)
  network_port(fingerd, tcp,79,s0)
-@@ -84,7 +85,7 @@
+@@ -84,7 +86,7 @@
  network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy
  network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp,8009,s0)
  network_port(howl, tcp,5335,s0, udp,5353,s0)
@@ -250,7 +272,15 @@
  network_port(i18n_input, tcp,9010,s0)
  network_port(imaze, tcp,5323,s0, udp,5323,s0)
  network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
-@@ -126,6 +127,7 @@
+@@ -120,12 +122,15 @@
+ network_port(radacct, udp,1646,s0, udp,1813,s0)
+ network_port(radius, udp,1645,s0, udp,1812,s0)
+ network_port(razor, tcp,2703,s0)
++network_port(ricci, tcp,11111,s0, udp,11111,s0)
++network_port(ricci_modcluster, tcp,16851,s0, udp,16851,s0)
+ network_port(rlogind, tcp,513,s0)
+ network_port(rndc, tcp,953,s0)
+ network_port(router, udp,520,s0)
  network_port(rsh, tcp,514,s0)
  network_port(rsync, tcp,873,s0, udp,873,s0)
  network_port(smbd, tcp,137-139,s0, tcp,445,s0)
@@ -258,9 +288,9 @@
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
  network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
  network_port(spamd, tcp,783,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.6/policy/modules/kernel/devices.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.7/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/devices.fc	2006-08-10 14:22:57.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/kernel/devices.fc	2006-08-12 07:18:46.000000000 -0400
 @@ -37,7 +37,7 @@
  /dev/mpu401.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/null		-c	gen_context(system_u:object_r:null_device_t,s0)
@@ -270,9 +300,9 @@
  /dev/par.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
  /dev/patmgr[01]		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/pmu		-c	gen_context(system_u:object_r:power_device_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.3.6/policy/modules/kernel/devices.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.3.7/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/devices.if	2006-08-10 23:43:22.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/kernel/devices.if	2006-08-12 07:18:46.000000000 -0400
 @@ -2992,3 +2992,40 @@
  
  	typeattribute $1 devices_unconfined_type;
@@ -314,9 +344,9 @@
 +	allow $1 bios_device_t:chr_file write;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.6/policy/modules/kernel/devices.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.7/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/devices.te	2006-08-10 14:22:36.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/kernel/devices.te	2006-08-12 07:18:46.000000000 -0400
 @@ -72,6 +72,12 @@
  dev_node(lvm_control_t)
  
@@ -339,9 +369,9 @@
  
  type xen_device_t;
  dev_node(xen_device_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.6/policy/modules/kernel/files.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.7/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/files.if	2006-08-08 16:38:46.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/kernel/files.if	2006-08-12 07:18:46.000000000 -0400
 @@ -2934,6 +2934,24 @@
  
  ########################################
@@ -367,9 +397,9 @@
  ##	Read the tmp directory (/tmp).
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.6/policy/modules/kernel/filesystem.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.7/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/filesystem.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/kernel/filesystem.te	2006-08-12 07:18:46.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -386,9 +416,9 @@
  
  ########################################
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.6/policy/modules/kernel/kernel.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.7/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/kernel.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/kernel/kernel.if	2006-08-12 07:18:46.000000000 -0400
 @@ -1456,6 +1456,42 @@
  
  ########################################
@@ -475,9 +505,9 @@
 +	dontaudit $1 proc_type:file getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.6/policy/modules/kernel/terminal.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.7/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/kernel/terminal.if	2006-08-11 11:29:01.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/kernel/terminal.if	2006-08-12 07:18:46.000000000 -0400
 @@ -308,6 +308,7 @@
  		type devpts_t;
  	')
@@ -508,9 +538,9 @@
 +	allow $1 devpts_t:filesystem getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.6/policy/modules/services/amavis.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.7/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/amavis.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/amavis.te	2006-08-12 07:18:46.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -540,9 +570,9 @@
 +optional_policy(`
 +	postfix_read_config(amavis_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.6/policy/modules/services/apache.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.7/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/apache.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/apache.te	2006-08-12 07:18:46.000000000 -0400
 @@ -273,7 +273,6 @@
  sysnet_read_config(httpd_t)
  
@@ -551,10 +581,18 @@
  
  mta_send_mail(httpd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.6/policy/modules/services/avahi.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.7/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/avahi.te	2006-08-08 16:15:43.000000000 -0400
-@@ -79,6 +79,7 @@
++++ serefpolicy-2.3.7/policy/modules/services/avahi.te	2006-08-12 07:18:46.000000000 -0400
+@@ -63,6 +63,7 @@
+ domain_use_interactive_fds(avahi_t)
+ 
+ files_read_etc_files(avahi_t)
++files_read_usr_files(avahi_t)
+ files_read_etc_runtime_files(avahi_t)
+ 
+ init_use_fds(avahi_t)
+@@ -79,6 +80,7 @@
  
  sysnet_read_config(avahi_t)
  sysnet_use_ldap(avahi_t)
@@ -562,9 +600,9 @@
  
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.6/policy/modules/services/bind.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.7/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/bind.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/bind.te	2006-08-12 07:18:46.000000000 -0400
 @@ -226,6 +226,7 @@
  allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
  
@@ -573,9 +611,9 @@
  
  allow ndc_t named_t:tcp_socket { connectto recvfrom };
  allow ndc_t named_t:unix_stream_socket connectto;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.6/policy/modules/services/bluetooth.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.7/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/bluetooth.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/bluetooth.te	2006-08-12 07:18:46.000000000 -0400
 @@ -247,3 +247,8 @@
  optional_policy(`
         	xserver_stream_connect_xdm(bluetooth_helper_t)
@@ -585,17 +623,166 @@
 +	nis_use_ypbind(bluetooth_helper_t)
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.6/policy/modules/services/clamav.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-2.3.7/policy/modules/services/ccs.fc
+--- nsaserefpolicy/policy/modules/services/ccs.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/ccs.fc	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,8 @@
++# ccs executable will have:
++# label: system_u:object_r:ccs_exec_t
++# MLS sensitivity: s0
++# MCS categories: <none>
++
++/sbin/ccsd		--	gen_context(system_u:object_r:ccs_exec_t,s0)
++/var/run/cluster(/.*)?		gen_context(system_u:object_r:ccs_var_run_t,s0)
++/etc/cluster(/.*)?		gen_context(system_u:object_r:cluster_conf_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.if serefpolicy-2.3.7/policy/modules/services/ccs.if
+--- nsaserefpolicy/policy/modules/services/ccs.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/ccs.if	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,45 @@
++## <summary>policy for ccs</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run ccs.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ccs_domtrans',`
++	gen_require(`
++		type ccs_t, ccs_exec_t;
++	')
++
++	domain_auto_trans($1,ccs_exec_t,ccs_t)
++
++	allow $1 ccs_t:fd use;
++	allow ccs_t $1:fd use;
++	allow ccs_t $1:fifo_file rw_file_perms;
++	allow ccs_t $1:process sigchld;
++')
++
++########################################
++## <summary>
++##	Connect to ccs over an unix stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`ccs_stream_connect',`
++	gen_require(`
++		type ccs_t, ccs_var_run_t;
++	')
++
++	files_search_pids($1)
++	allow $1 ccs_var_run_t:dir r_dir_perms;
++	allow $1 ccs_var_run_t:sock_file write;
++	allow $1 ccs_t:unix_stream_socket connectto;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.3.7/policy/modules/services/ccs.te
+--- nsaserefpolicy/policy/modules/services/ccs.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/ccs.te	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,84 @@
++policy_module(ccs,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type ccs_t;
++type ccs_exec_t;
++domain_type(ccs_t)
++init_daemon_domain(ccs_t, ccs_exec_t)
++
++# pid files
++type ccs_var_run_t;
++files_pid_file(ccs_var_run_t)
++
++# pid files
++type cluster_conf_t;
++files_type(cluster_conf_t)
++
++# log files
++type ccs_var_log_t;
++logging_log_file(ccs_var_log_t)
++
++########################################
++#
++# ccs local policy
++#
++# Check in /etc/selinux/refpolicy/include for macros to use instead of allow rules.
++
++allow ccs_t self:process signal;
++
++allow ccs_t self:socket create_socket_perms;
++allow ccs_t self:tcp_socket create_stream_socket_perms;
++allow ccs_t self:udp_socket { create_socket_perms listen recv_msg send_msg };
++allow ccs_t self:unix_dgram_socket create_socket_perms;
++allow ccs_t self:netlink_route_socket r_netlink_socket_perms;
++## Networking basics (adjust to your needs!)
++sysnet_dns_name_resolve(ccs_t)
++corenet_tcp_sendrecv_all_if(ccs_t)
++corenet_tcp_sendrecv_all_nodes(ccs_t)
++corenet_tcp_sendrecv_all_ports(ccs_t)
++corenet_udp_sendrecv_all_ports(ccs_t)
++corenet_non_ipsec_sendrecv(ccs_t)
++corenet_tcp_bind_all_nodes(ccs_t)
++corenet_udp_bind_all_nodes(ccs_t)
++# Wants to connect to 40040
++corenet_tcp_connect_all_ports(ccs_t)
++
++# Some common macros (you might be able to remove some)
++files_read_etc_files(ccs_t)
++libs_use_ld_so(ccs_t)
++libs_use_shared_libs(ccs_t)
++miscfiles_read_localization(ccs_t)
++## internal communication is often done using fifo and unix sockets.
++allow ccs_t self:fifo_file { read write };
++allow ccs_t self:unix_stream_socket create_stream_socket_perms;
++
++# pid file
++allow ccs_t ccs_var_run_t:file manage_file_perms;
++allow ccs_t ccs_var_run_t:sock_file manage_file_perms;
++allow ccs_t ccs_var_run_t:dir rw_dir_perms;
++files_pid_filetrans(ccs_t,ccs_var_run_t, { file sock_file })
++
++# log files
++allow ccs_t ccs_var_log_t:file create_file_perms;
++allow ccs_t ccs_var_log_t:sock_file create_file_perms;
++allow ccs_t ccs_var_log_t:dir { rw_dir_perms setattr };
++logging_log_filetrans(ccs_t,ccs_var_log_t,{ sock_file file dir })
++
++logging_send_syslog_msg(ccs_t)
++
++files_read_etc_runtime_files(ccs_t)
++
++kernel_read_kernel_sysctls(ccs_t)
++
++sysnet_dns_name_resolve(ccs_t)
++
++unconfined_use_fds(ccs_t)
++
++term_dontaudit_use_generic_ptys(ccs_t)
++
++allow ccs_t cluster_conf_t:dir r_dir_perms;
++allow ccs_t cluster_conf_t:file rw_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.7/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/clamav.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/clamav.if	2006-08-12 07:18:46.000000000 -0400
 @@ -102,3 +102,4 @@
  	allow clamscan_t $1:fifo_file rw_file_perms;
  	allow clamscan_t $1:process sigchld;
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.6/policy/modules/services/cron.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.7/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-08-08 14:59:36.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cron.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/cron.if	2006-08-12 07:18:46.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -638,9 +825,9 @@
  	tunable_policy(`fcron_crond', `
  		# fcron wants an instant update of a crontab change for the administrator
  		# also crontab does a security check for crontab -u
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.6/policy/modules/services/cron.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.7/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cron.te	2006-08-09 09:15:00.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/cron.te	2006-08-12 07:18:46.000000000 -0400
 @@ -173,6 +173,7 @@
  	allow crond_t crond_tmp_t:dir create_dir_perms;
  	allow crond_t crond_tmp_t:file create_file_perms;
@@ -649,9 +836,9 @@
  
  	mta_send_mail(crond_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.6/policy/modules/services/cups.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.7/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cups.te	2006-08-10 15:07:59.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/cups.te	2006-08-12 07:18:46.000000000 -0400
 @@ -74,13 +74,14 @@
  #
  
@@ -711,9 +898,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.6/policy/modules/services/cyrus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.7/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/cyrus.te	2006-08-09 12:58:45.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/cyrus.te	2006-08-12 07:18:46.000000000 -0400
 @@ -69,6 +69,7 @@
  corenet_udp_sendrecv_all_ports(cyrus_t)
  corenet_tcp_bind_all_nodes(cyrus_t)
@@ -722,9 +909,9 @@
  corenet_tcp_bind_pop_port(cyrus_t)
  corenet_tcp_connect_all_ports(cyrus_t)
  corenet_sendrecv_mail_server_packets(cyrus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.6/policy/modules/services/dbus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.7/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/dbus.if	2006-08-09 11:12:25.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/dbus.if	2006-08-12 07:18:46.000000000 -0400
 @@ -123,6 +123,7 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
@@ -745,9 +932,9 @@
  ')
  
  #######################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.6/policy/modules/services/ldap.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.7/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ldap.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/ldap.te	2006-08-12 07:18:46.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -757,9 +944,9 @@
  
  kernel_read_system_state(slapd_t)
  kernel_read_kernel_sysctls(slapd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-2.3.6/policy/modules/services/mta.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-2.3.7/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/mta.fc	2006-08-10 10:10:26.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/mta.fc	2006-08-12 07:18:46.000000000 -0400
 @@ -2,6 +2,8 @@
  /etc/aliases		--	gen_context(system_u:object_r:etc_aliases_t,s0)
  /etc/aliases\.db	--	gen_context(system_u:object_r:etc_aliases_t,s0)
@@ -769,9 +956,9 @@
  ifdef(`distro_redhat',`
  /etc/postfix/aliases.*		gen_context(system_u:object_r:etc_aliases_t,s0)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.6/policy/modules/services/nis.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.7/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/nis.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/nis.te	2006-08-12 07:18:46.000000000 -0400
 @@ -249,8 +249,6 @@
  allow ypserv_t self:unix_dgram_socket create_socket_perms;
  allow ypserv_t self:unix_stream_socket create_stream_socket_perms;
@@ -781,9 +968,9 @@
  
  allow ypserv_t var_yp_t:dir rw_dir_perms;
  allow ypserv_t var_yp_t:file create_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.6/policy/modules/services/ntp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.7/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ntp.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/ntp.te	2006-08-12 07:18:46.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -793,9 +980,243 @@
  dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
  allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
  allow ntpd_t self:fifo_file { read write getattr };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.6/policy/modules/services/openvpn.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-2.3.7/policy/modules/services/oddjob.fc
+--- nsaserefpolicy/policy/modules/services/oddjob.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/oddjob.fc	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,8 @@
++# oddjob executable will have:
++# label: system_u:object_r:oddjob_exec_t
++# MLS sensitivity: s0
++# MCS categories: <none>
++
++/usr/sbin/oddjobd		--	gen_context(system_u:object_r:oddjob_exec_t,s0)
++/var/run/oddjobd.pid			gen_context(system_u:object_r:oddjob_var_run_t,s0)
++/usr/lib/oddjobd			gen_context(system_u:object_r:oddjob_var_lib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-2.3.7/policy/modules/services/oddjob.if
+--- nsaserefpolicy/policy/modules/services/oddjob.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/oddjob.if	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,76 @@
++## <summary>policy for oddjob</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run oddjob.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`oddjob_domtrans',`
++	gen_require(`
++		type oddjob_t, oddjob_exec_t;
++	')
++
++	domain_auto_trans($1,oddjob_exec_t,oddjob_t)
++
++	allow $1 oddjob_t:fd use;
++	allow oddjob_t $1:fd use;
++	allow oddjob_t $1:fifo_file rw_file_perms;
++	allow oddjob_t $1:process sigchld;
++')
++
++########################################
++## <summary>
++##	Make the specified program domain accessable
++##	from the oddjob.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process to transition to.
++##	</summary>
++## </param>
++## <param name="entrypoint">
++##	<summary>
++##	The type of the file used as an entrypoint to this domain.
++##	</summary>
++## </param>
++#
++interface(`oddjob_system_entry',`
++	gen_require(`
++		type oddjob_t;
++	')
++
++	domain_auto_trans(oddjob_t, $2, $1)
++
++	allow oddjob_t $1:fd use;
++	allow $1 oddjob_t:fd use;
++	allow $1 oddjob_t:fifo_file rw_file_perms;
++	allow $1 oddjob_t:process sigchld;
++
++')
++
++
++########################################
++## <summary>
++##	Send and receive messages from
++##	oddjob over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`oddjob_dbus_chat',`
++	gen_require(`
++		type oddjob_t;
++		class dbus send_msg;
++	')
++
++	allow $1 oddjob_t:dbus send_msg;
++	allow oddjob_t $1:dbus send_msg;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc serefpolicy-2.3.7/policy/modules/services/oddjob_mkhomedir.fc
+--- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/oddjob_mkhomedir.fc	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,6 @@
++# oddjob_mkhomedir executable will have:
++# label: system_u:object_r:oddjob_mkhomedir_exec_t
++# MLS sensitivity: s0
++# MCS categories: <none>
++
++/usr/lib/oddjob/mkhomedir		--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if serefpolicy-2.3.7/policy/modules/services/oddjob_mkhomedir.if
+--- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/oddjob_mkhomedir.if	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,24 @@
++## <summary>policy for oddjob_mkhomedir</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run oddjob_mkhomedir.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`oddjob_mkhomedir_domtrans',`
++	gen_require(`
++		type oddjob_mkhomedir_t, oddjob_mkhomedir_exec_t;
++	')
++
++	domain_auto_trans($1,oddjob_mkhomedir_exec_t,oddjob_mkhomedir_t)
++
++	allow $1 oddjob_mkhomedir_t:fd use;
++	allow oddjob_mkhomedir_t $1:fd use;
++	allow oddjob_mkhomedir_t $1:fifo_file rw_file_perms;
++	allow oddjob_mkhomedir_t $1:process sigchld;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te serefpolicy-2.3.7/policy/modules/services/oddjob_mkhomedir.te
+--- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/oddjob_mkhomedir.te	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,26 @@
++policy_module(oddjob_mkhomedir,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type oddjob_mkhomedir_t;
++type oddjob_mkhomedir_exec_t;
++domain_type(oddjob_mkhomedir_t)
++init_daemon_domain(oddjob_mkhomedir_t, oddjob_mkhomedir_exec_t)
++
++########################################
++#
++# oddjob_mkhomedir 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(oddjob_mkhomedir_t)
++libs_use_ld_so(oddjob_mkhomedir_t)
++libs_use_shared_libs(oddjob_mkhomedir_t)
++miscfiles_read_localization(oddjob_mkhomedir_t)
++## internal communication is often done using fifo and unix sockets.
++allow oddjob_mkhomedir_t self:fifo_file { read write };
++allow oddjob_mkhomedir_t self:unix_stream_socket create_stream_socket_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-2.3.7/policy/modules/services/oddjob.te
+--- nsaserefpolicy/policy/modules/services/oddjob.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/oddjob.te	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,70 @@
++policy_module(oddjob,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type oddjob_t;
++type oddjob_exec_t;
++domain_type(oddjob_t)
++init_daemon_domain(oddjob_t, oddjob_exec_t)
++
++# pid files
++type oddjob_var_run_t;
++files_pid_file(oddjob_var_run_t)
++
++# var/lib files
++type oddjob_var_lib_t;
++files_type(oddjob_var_lib_t)
++
++########################################
++#
++# oddjob 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(oddjob_t)
++libs_use_ld_so(oddjob_t)
++libs_use_shared_libs(oddjob_t)
++miscfiles_read_localization(oddjob_t)
++## internal communication is often done using fifo and unix sockets.
++allow oddjob_t self:fifo_file { read write };
++allow oddjob_t self:unix_stream_socket create_stream_socket_perms;
++
++# pid file
++allow oddjob_t oddjob_var_run_t:file manage_file_perms;
++allow oddjob_t oddjob_var_run_t:sock_file manage_file_perms;
++allow oddjob_t oddjob_var_run_t:dir rw_dir_perms;
++files_pid_filetrans(oddjob_t,oddjob_var_run_t, { file sock_file })
++
++# var/lib files for oddjob
++allow oddjob_t oddjob_var_lib_t:file create_file_perms;
++allow oddjob_t oddjob_var_lib_t:sock_file create_file_perms;
++allow oddjob_t oddjob_var_lib_t:dir create_dir_perms;
++files_var_lib_filetrans(oddjob_t,oddjob_var_lib_t, { file dir sock_file })
++
++init_dontaudit_use_fds(oddjob_t)
++allow oddjob_t self:capability { audit_write setgid } ;
++allow oddjob_t self:process setexec;
++
++optional_policy(`
++	dbus_system_bus_client_template(oddjob,oddjob_t)
++	dbus_send_system_bus(oddjob_t)
++	dbus_connect_system_bus(oddjob_t)
++')
++
++corecmd_search_sbin(oddjob_t)
++corecmd_exec_shell(oddjob_t)
++
++selinux_compute_create_context(oddjob_t)
++
++kernel_read_system_state(oddjob_t)
++
++oddjob_mkhomedir_domtrans(oddjob_t)
++
++unconfined_domtrans(oddjob_t)
++
++term_dontaudit_use_generic_ptys(oddjob_t)
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.7/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/openvpn.te	2006-08-10 09:10:52.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/openvpn.te	2006-08-12 07:18:46.000000000 -0400
 @@ -33,7 +33,7 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -805,9 +1226,9 @@
  
  allow openvpn_t openvpn_etc_t:dir r_dir_perms;
  allow openvpn_t openvpn_etc_t:file r_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.6/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.7/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/pegasus.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/pegasus.if	2006-08-12 07:18:46.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -841,9 +1262,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.6/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.7/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/pegasus.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/pegasus.te	2006-08-12 07:18:46.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -860,9 +1281,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.6/policy/modules/services/postfix.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.7/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/postfix.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/postfix.te	2006-08-12 07:18:46.000000000 -0400
 @@ -250,6 +250,7 @@
  allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
  
@@ -898,9 +1319,9 @@
  
  optional_policy(`
  	postgrey_stream_connect(postfix_smtpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.6/policy/modules/services/procmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.7/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/procmail.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/procmail.te	2006-08-12 07:18:46.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -909,9 +1330,546 @@
  corenet_tcp_sendrecv_all_if(procmail_t)
  corenet_udp_sendrecv_all_if(procmail_t)
  corenet_tcp_sendrecv_all_nodes(procmail_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.6/policy/modules/services/samba.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.fc serefpolicy-2.3.7/policy/modules/services/ricci.fc
+--- nsaserefpolicy/policy/modules/services/ricci.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/ricci.fc	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,20 @@
++# ricci executable will have:
++# label: system_u:object_r:ricci_exec_t
++# MLS sensitivity: s0
++# MCS categories: <none>
++
++/usr/sbin/ricci		--	gen_context(system_u:object_r:ricci_exec_t,s0)
++/var/lib/ricci(/.*)?		gen_context(system_u:object_r:ricci_var_lib_t,s0)
++
++/usr/sbin/ricci-modclusterd	--	gen_context(system_u:object_r:ricci_modclusterd_exec_t,s0)
++/var/run/ricci-modclusterd.pid  --	gen_context(system_u:object_r:ricci_modcluster_var_run_t,s0)
++/var/log/clumond.log 		--	gen_context(system_u:object_r:ricci_modcluster_var_log_t,s0)
++
++/usr/sbin/ricci-modlog		--	gen_context(system_u:object_r:ricci_modlog_exec_t,s0)
++/usr/sbin/ricci-modlog_ro	--	gen_context(system_u:object_r:ricci_modlog_ro_exec_t,s0)
++
++/usr/sbin/ricci-modrpm		--	gen_context(system_u:object_r:ricci_modrpm_exec_t,s0)
++/usr/sbin/ricci-modcluster	--	gen_context(system_u:object_r:ricci_modcluster_exec_t,s0)
++/usr/sbin/ricci-modservice	--	gen_context(system_u:object_r:ricci_modservice_exec_t,s0)
++/usr/sbin/ricci-modstorage	--	gen_context(system_u:object_r:ricci_modstorage_exec_t,s0)
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.if serefpolicy-2.3.7/policy/modules/services/ricci.if
+--- nsaserefpolicy/policy/modules/services/ricci.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/ricci.if	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,184 @@
++## <summary>policy for ricci</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run ricci.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ricci_domtrans',`
++	gen_require(`
++		type ricci_t, ricci_exec_t;
++	')
++
++	domain_auto_trans($1,ricci_exec_t,ricci_t)
++
++	allow $1 ricci_t:fd use;
++	allow ricci_t $1:fd use;
++	allow ricci_t $1:fifo_file rw_file_perms;
++	allow ricci_t $1:process sigchld;
++')
++
++########################################
++## <summary>
++##	Execute a domain transition to run ricci_modlog.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ricci_modlog_domtrans',`
++	gen_require(`
++		type ricci_modlog_t, ricci_modlog_exec_t;
++	')
++
++	domain_auto_trans($1,ricci_modlog_exec_t,ricci_modlog_t)
++
++	allow $1 ricci_modlog_t:fd use;
++	allow ricci_modlog_t $1:fd use;
++	allow ricci_modlog_t $1:fifo_file rw_file_perms;
++	allow ricci_modlog_t $1:process sigchld;
++')
++
++########################################
++## <summary>
++##	Execute a domain transition to run ricci_modlog_ro.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ricci_modlog_ro_domtrans',`
++	gen_require(`
++		type ricci_modlog_ro_t, ricci_modlog_ro_exec_t;
++	')
++
++	domain_auto_trans($1,ricci_modlog_ro_exec_t,ricci_modlog_ro_t)
++
++	allow $1 ricci_modlog_ro_t:fd use;
++	allow ricci_modlog_ro_t $1:fd use;
++	allow ricci_modlog_ro_t $1:fifo_file rw_file_perms;
++	allow ricci_modlog_ro_t $1:process sigchld;
++')
++
++########################################
++## <summary>
++##	Execute a domain transition to run ricci_modrpm.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ricci_modrpm_domtrans',`
++	gen_require(`
++		type ricci_modrpm_t, ricci_modrpm_exec_t;
++	')
++
++	domain_auto_trans($1,ricci_modrpm_exec_t,ricci_modrpm_t)
++
++	allow $1 ricci_modrpm_t:fd use;
++	allow ricci_modrpm_t $1:fd use;
++	allow ricci_modrpm_t $1:fifo_file rw_file_perms;
++	allow ricci_modrpm_t $1:process sigchld;
++')
++
++########################################
++## <summary>
++##	Execute a domain transition to run ricci_modservice.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ricci_modservice_domtrans',`
++	gen_require(`
++		type ricci_modservice_t, ricci_modservice_exec_t;
++	')
++
++	domain_auto_trans($1,ricci_modservice_exec_t,ricci_modservice_t)
++
++	allow $1 ricci_modservice_t:fd use;
++	allow ricci_modservice_t $1:fd use;
++	allow ricci_modservice_t $1:fifo_file rw_file_perms;
++	allow ricci_modservice_t $1:process sigchld;
++')
++
++########################################
++## <summary>
++##	Execute a domain transition to run ricci_modcluster.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ricci_modcluster_domtrans',`
++	gen_require(`
++		type ricci_modcluster_t, ricci_modcluster_exec_t;
++	')
++
++	domain_auto_trans($1,ricci_modcluster_exec_t,ricci_modcluster_t)
++
++	allow $1 ricci_modcluster_t:fd use;
++	allow ricci_modcluster_t $1:fd use;
++	allow ricci_modcluster_t $1:fifo_file rw_file_perms;
++	allow ricci_modcluster_t $1:process sigchld;
++')
++
++########################################
++## <summary>
++##	Execute a domain transition to run ricci_modstorage.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ricci_modstorage_domtrans',`
++	gen_require(`
++		type ricci_modstorage_t, ricci_modstorage_exec_t;
++	')
++
++	domain_auto_trans($1,ricci_modstorage_exec_t,ricci_modstorage_t)
++
++	allow $1 ricci_modstorage_t:fd use;
++	allow ricci_modstorage_t $1:fd use;
++	allow ricci_modstorage_t $1:fifo_file rw_file_perms;
++	allow ricci_modstorage_t $1:process sigchld;
++')
++
++
++
++########################################
++## <summary>
++##	Connect to ricci_modclusterd over an unix stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`ricci_modclusterd_stream_connect',`
++	gen_require(`
++		type ricci_modclusterd_t, ricci_modcluster_var_run_t;
++	')
++
++	files_search_pids($1)
++	allow $1 ricci_modcluster_var_run_t:sock_file write;
++	allow $1 ricci_modclusterd_t:unix_stream_socket connectto;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.3.7/policy/modules/services/ricci.te
+--- nsaserefpolicy/policy/modules/services/ricci.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.7/policy/modules/services/ricci.te	2006-08-12 07:18:46.000000000 -0400
+@@ -0,0 +1,286 @@
++policy_module(ricci,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type ricci_t;
++type ricci_exec_t;
++domain_type(ricci_t)
++init_daemon_domain(ricci_t, ricci_exec_t)
++
++# pid files
++type ricci_var_run_t;
++files_pid_file(ricci_var_run_t)
++
++# tmp files
++type ricci_tmp_t;
++files_tmp_file(ricci_tmp_t)
++
++# var/lib files
++type ricci_var_lib_t;
++files_type(ricci_var_lib_t)
++
++# log files
++type ricci_var_log_t;
++logging_log_file(ricci_var_log_t)
++
++type ricci_modclusterd_t;
++type ricci_modclusterd_exec_t;
++domain_type(ricci_modclusterd_t)
++init_daemon_domain(ricci_modclusterd_t, ricci_modclusterd_exec_t)
++
++type ricci_modlog_t;
++type ricci_modlog_exec_t;
++domain_type(ricci_modlog_t)
++domain_entry_file(ricci_modlog_t, ricci_modlog_exec_t)
++role system_r types ricci_modlog_t;
++
++type ricci_modlog_ro_t;
++type ricci_modlog_ro_exec_t;
++domain_type(ricci_modlog_ro_t)
++domain_entry_file(ricci_modlog_ro_t, ricci_modlog_ro_exec_t)
++role system_r types ricci_modlog_ro_t;
++
++type ricci_modrpm_t;
++type ricci_modrpm_exec_t;
++domain_type(ricci_modrpm_t)
++domain_entry_file(ricci_modrpm_t, ricci_modrpm_exec_t)
++role system_r types ricci_modrpm_t;
++
++type ricci_modservice_t;
++type ricci_modservice_exec_t;
++domain_type(ricci_modservice_t)
++domain_entry_file(ricci_modservice_t, ricci_modservice_exec_t)
++role system_r types ricci_modservice_t;
++
++type ricci_modstorage_t;
++type ricci_modstorage_exec_t;
++domain_type(ricci_modstorage_t)
++domain_entry_file(ricci_modstorage_t, ricci_modstorage_exec_t)
++role system_r types ricci_modstorage_t;
++
++type ricci_modcluster_t;
++type ricci_modcluster_exec_t;
++domain_type(ricci_modcluster_t)
++domain_entry_file(ricci_modcluster_t, ricci_modcluster_exec_t)
++role system_r types ricci_modcluster_t;
++
++# pid files
++type ricci_modcluster_var_run_t;
++files_pid_file(ricci_modcluster_var_run_t)
++
++# var/lib files
++type ricci_modcluster_var_lib_t;
++files_type(ricci_modcluster_var_lib_t)
++
++# log files
++type ricci_modcluster_var_log_t;
++logging_log_file(ricci_modcluster_var_log_t)
++
++########################################
++#
++# ricci local policy
++#
++allow ricci_t self:capability { setuid sys_nice };
++allow ricci_t self:process setsched;
++
++# Some common macros (you might be able to remove some)
++files_read_etc_files(ricci_t)
++files_read_etc_runtime_files(ricci_t)
++
++libs_use_ld_so(ricci_t)
++libs_use_shared_libs(ricci_t)
++miscfiles_read_localization(ricci_t)
++## internal communication is often done using fifo and unix sockets.
++allow ricci_t self:fifo_file { read write };
++allow ricci_t self:unix_stream_socket create_stream_socket_perms;
++
++# pid file
++allow ricci_t ricci_var_run_t:file manage_file_perms;
++allow ricci_t ricci_var_run_t:sock_file manage_file_perms;
++allow ricci_t ricci_var_run_t:dir rw_dir_perms;
++files_pid_filetrans(ricci_t,ricci_var_run_t, { file sock_file })
++
++# tmp file
++allow ricci_t ricci_tmp_t:dir create_dir_perms;
++allow ricci_t ricci_tmp_t:file create_file_perms;
++files_tmp_filetrans(ricci_t, ricci_tmp_t, { file dir })
++
++# log files
++allow ricci_t ricci_var_log_t:file create_file_perms;
++allow ricci_t ricci_var_log_t:sock_file create_file_perms;
++allow ricci_t ricci_var_log_t:dir { rw_dir_perms setattr };
++logging_log_filetrans(ricci_t,ricci_var_log_t,{ sock_file file dir })
++
++init_dontaudit_use_fds(ricci_t)
++
++kernel_read_kernel_sysctls(ricci_t)
++
++optional_policy(`
++	dbus_system_bus_client_template(ricci,ricci_t)
++	dbus_send_system_bus(ricci_t)
++	oddjob_dbus_chat(ricci_t)
++')
++
++# var/lib files for ricci
++allow ricci_t ricci_var_lib_t:file create_file_perms;
++allow ricci_t ricci_var_lib_t:sock_file create_file_perms;
++allow ricci_t ricci_var_lib_t:dir create_dir_perms;
++files_var_lib_filetrans(ricci_t,ricci_var_lib_t, { file dir sock_file })
++
++term_dontaudit_use_generic_ptys(ricci_t)
++
++## Networking basics (adjust to your needs!)
++sysnet_dns_name_resolve(ricci_t)
++corenet_tcp_sendrecv_all_if(ricci_t)
++corenet_tcp_sendrecv_all_nodes(ricci_t)
++corenet_tcp_sendrecv_all_ports(ricci_t)
++corenet_non_ipsec_sendrecv(ricci_t)
++corenet_tcp_connect_http_port(ricci_t)
++#corenet_tcp_connect_all_ports(ricci_t)
++## if it is a network daemon, consider these:
++#corenet_tcp_bind_all_ports(ricci_t)
++#corenet_tcp_bind_all_nodes(ricci_t)
++allow ricci_t self:tcp_socket { listen accept };
++
++# ricci wants to bind to 11111
++corenet_tcp_bind_generic_port(ricci_t)
++corenet_tcp_bind_inaddr_any_node(ricci_t)
++
++corecmd_exec_sbin(ricci_t)
++
++dev_read_urand(ricci_t)
++
++unconfined_use_fds(ricci_t)
++
++########################################
++#
++# ricci_modclusterd local policy
++#
++allow ricci_modclusterd_t self:capability sys_nice;
++allow ricci_modclusterd_t self:process { signal sigkill setsched };
++
++# Some common macros (you might be able to remove some)
++files_read_etc_files(ricci_modclusterd_t)
++libs_use_ld_so(ricci_modclusterd_t)
++libs_use_shared_libs(ricci_modclusterd_t)
++miscfiles_read_localization(ricci_modclusterd_t)
++## internal communication is often done using fifo and unix sockets.
++allow ricci_modclusterd_t self:fifo_file rw_file_perms;
++allow ricci_modclusterd_t self:unix_stream_socket create_stream_socket_perms;
++allow ricci_modclusterd_t self:tcp_socket create_stream_socket_perms;
++allow ricci_modclusterd_t self:netlink_route_socket r_netlink_socket_perms;
++
++# Wants to connect 40040
++corenet_tcp_connect_all_ports(ricci_modclusterd_t)
++corenet_tcp_sendrecv_all_ports(ricci_modclusterd_t)
++corenet_tcp_bind_generic_port(ricci_modclusterd_t)
++corenet_tcp_bind_inaddr_any_node(ricci_modclusterd_t)
++corenet_tcp_bind_all_nodes(ricci_modclusterd_t)
++allow ricci_modclusterd_t self:tcp_socket create_socket_perms;
++allow ricci_modclusterd_t self:socket create_socket_perms;
++files_read_etc_runtime_files(ricci_modclusterd_t)
++
++corecmd_exec_bin(ricci_modclusterd_t)
++corecmd_exec_sbin(ricci_modclusterd_t)
++
++# pid file
++allow ricci_modclusterd_t ricci_modcluster_var_run_t:file manage_file_perms;
++allow ricci_modclusterd_t ricci_modcluster_var_run_t:sock_file manage_file_perms;
++allow ricci_modclusterd_t ricci_modcluster_var_run_t:dir rw_dir_perms;
++files_pid_filetrans(ricci_modclusterd_t,ricci_modcluster_var_run_t, { file sock_file })
++
++# log files
++allow ricci_modclusterd_t ricci_modcluster_var_log_t:file create_file_perms;
++allow ricci_modclusterd_t ricci_modcluster_var_log_t:sock_file create_file_perms;
++allow ricci_modclusterd_t ricci_modcluster_var_log_t:dir { rw_dir_perms setattr };
++logging_log_filetrans(ricci_modclusterd_t,ricci_modcluster_var_log_t,{ sock_file file dir })
++
++init_dontaudit_use_fds(ricci_modclusterd_t)
++
++term_dontaudit_use_generic_ptys(ricci_modclusterd_t)
++
++kernel_read_kernel_sysctls(ricci_modclusterd_t)
++kernel_read_system_state(ricci_modclusterd_t)
++
++sysnet_domtrans_ifconfig(ricci_modclusterd_t)
++sysnet_dns_name_resolve(ricci_modclusterd_t)
++
++unconfined_use_fds(ricci_modclusterd_t)
++
++optional_policy(`
++	ccs_stream_connect(ricci_modclusterd_t)
++')
++
++########################################
++#
++# ricci_modlog local policy
++#
++
++oddjob_system_entry(ricci_modlog_t, ricci_modlog_exec_t)
++domain_auto_trans(ricci_t,ricci_modlog_exec_t,ricci_modlog_t)
++
++########################################
++#
++# ricci_modlog_ro local policy
++#
++
++oddjob_system_entry(ricci_modlog_ro_t, ricci_modlog_ro_exec_t)
++domain_auto_trans(ricci_t,ricci_modlog_ro_exec_t,ricci_modlog_ro_t)
++
++########################################
++#
++# ricci_modrpm local policy
++#
++
++oddjob_system_entry(ricci_modrpm_t, ricci_modrpm_exec_t)
++domain_auto_trans(ricci_t,ricci_modrpm_exec_t,ricci_modrpm_t)
++
++########################################
++#
++# ricci_modservice local policy
++#
++
++oddjob_system_entry(ricci_modservice_t, ricci_modservice_exec_t)
++domain_auto_trans(ricci_t,ricci_modservice_exec_t,ricci_modservice_t)
++
++########################################
++#
++# ricci_modstorage local policy
++#
++
++oddjob_system_entry(ricci_modstorage_t, ricci_modstorage_exec_t)
++domain_auto_trans(ricci_t,ricci_modstorage_exec_t,ricci_modstorage_t)
++
++########################################
++#
++# ricci_modcluster local policy
++#
++
++oddjob_system_entry(ricci_modcluster_t, ricci_modcluster_exec_t)
++domain_auto_trans(ricci_t,ricci_modcluster_exec_t,ricci_modcluster_t)
++
++files_read_etc_runtime_files(ricci_modcluster_t)
++files_read_etc_files(ricci_modcluster_t)
++
++libs_use_ld_so(ricci_modcluster_t)
++libs_use_shared_libs(ricci_modcluster_t)
++
++miscfiles_read_localization(ricci_modcluster_t)
++
++nscd_socket_use(ricci_modcluster_t)
++
++allow ricci_modcluster_t self:capability sys_nice;
++allow ricci_modcluster_t self:process setsched;
++
++corecmd_exec_sbin(ricci_modcluster_t)
++corecmd_exec_bin(ricci_modcluster_t)
++
++kernel_read_kernel_sysctls(ricci_modcluster_t)
++kernel_read_system_state(ricci_modcluster_t)
++
++files_search_usr(ricci_modcluster_t)
++
++ricci_modclusterd_stream_connect(ricci_modcluster_t)
+\ No newline at end of file
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-2.3.7/policy/modules/services/rpc.if
+--- nsaserefpolicy/policy/modules/services/rpc.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/rpc.if	2006-08-12 07:18:46.000000000 -0400
+@@ -51,6 +51,8 @@
+ 	kernel_rw_rpc_sysctls($1_t)
+ 
+ 	dev_read_sysfs($1_t)
++	dev_read_urand($1_t)
++	dev_read_rand($1_t)
+ 
+ 	corenet_non_ipsec_sendrecv($1_t)
+ 	corenet_tcp_sendrecv_all_if($1_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.3.7/policy/modules/services/rpc.te
+--- nsaserefpolicy/policy/modules/services/rpc.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/rpc.te	2006-08-12 07:18:46.000000000 -0400
+@@ -48,9 +48,6 @@
+ # for rpc.rquotad
+ kernel_read_sysctl(rpcd_t)  
+ 
+-dev_read_urand(rpcd_t)
+-dev_read_rand(rpcd_t)
+-
+ fs_list_rpc(rpcd_t)
+ fs_read_rpc_files(rpcd_t)
+ fs_read_rpc_symlinks(rpcd_t)
+@@ -140,8 +137,6 @@
+ kernel_read_network_state(gssd_t)
+ kernel_read_network_state_symlinks(gssd_t)	
+ 
+-dev_read_urand(gssd_t)
+-
+ fs_list_rpc(gssd_t) 
+ fs_read_rpc_sockets(gssd_t) 
+ fs_read_rpc_files(gssd_t) 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.7/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/samba.te	2006-08-10 09:22:27.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/samba.te	2006-08-12 07:18:46.000000000 -0400
 @@ -171,7 +171,7 @@
  #
  # smbd Local policy
@@ -939,9 +1897,9 @@
  allow nmbd_t samba_log_t:file { create ra_file_perms };
  
  allow nmbd_t samba_var_t:dir rw_dir_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.7/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.fc	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/setroubleshoot.fc	2006-08-12 07:18:46.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -952,16 +1910,16 @@
 +/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
 +
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.7/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/setroubleshoot.if	2006-08-12 07:18:46.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.7/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.6/policy/modules/services/setroubleshoot.te	2006-08-11 11:30:54.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/setroubleshoot.te	2006-08-12 07:18:46.000000000 -0400
 @@ -0,0 +1,109 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -1072,9 +2030,9 @@
 +
 +files_dontaudit_search_tmp(setroubleshootd_t)
 +files_dontaudit_search_src(setroubleshootd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.6/policy/modules/services/spamassassin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.7/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/spamassassin.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/spamassassin.te	2006-08-12 07:18:46.000000000 -0400
 @@ -194,3 +194,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -1083,9 +2041,9 @@
 +optional_policy(`
 +	postfix_read_config(spamd_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.6/policy/modules/services/squid.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.7/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/squid.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/squid.te	2006-08-12 07:18:46.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -1098,9 +2056,9 @@
  allow squid_t self:fifo_file rw_file_perms;
  allow squid_t self:sock_file r_file_perms;
  allow squid_t self:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.6/policy/modules/services/ssh.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.7/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ssh.if	2006-08-10 12:38:16.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/ssh.if	2006-08-12 07:18:46.000000000 -0400
 @@ -1,5 +1,4 @@
  ## <summary>Secure shell client and server policy.</summary>
 -
@@ -1143,9 +2101,9 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.3.6/policy/modules/services/ssh.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.3.7/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/ssh.te	2006-08-10 23:58:18.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/ssh.te	2006-08-12 07:18:46.000000000 -0400
 @@ -61,6 +61,7 @@
  
  	type sshd_tmp_t;
@@ -1154,9 +2112,9 @@
  ')
  
  #################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.6/policy/modules/services/stunnel.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.7/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/stunnel.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/stunnel.te	2006-08-12 07:18:46.000000000 -0400
 @@ -105,6 +105,10 @@
  	')
  
@@ -1168,9 +2126,9 @@
          	seutil_sigchld_newrole(stunnel_t)
  	')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.6/policy/modules/services/xserver.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.7/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-08 14:59:36.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/xserver.if	2006-08-09 11:16:27.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/xserver.if	2006-08-12 07:18:46.000000000 -0400
 @@ -45,7 +45,6 @@
  	allow $1_xserver_t self:capability { dac_override fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
  	dontaudit $1_xserver_t self:capability chown;
@@ -1275,9 +2233,9 @@
 +	allow $1 ice_tmp_t:dir ra_dir_perms;
 +	allow $1 ice_tmp_t:sock_file create_file_perms;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.6/policy/modules/services/xserver.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.7/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/services/xserver.te	2006-08-09 11:18:55.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/xserver.te	2006-08-12 07:18:46.000000000 -0400
 @@ -81,15 +81,19 @@
  #
  
@@ -1353,9 +2311,9 @@
  
  	unconfined_domain_noaudit(xdm_xserver_t)
  	unconfined_domtrans(xdm_xserver_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.6/policy/modules/system/authlogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.7/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/authlogin.te	2006-08-10 13:18:13.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/authlogin.te	2006-08-12 07:18:46.000000000 -0400
 @@ -273,6 +273,7 @@
  
  term_dontaudit_use_unallocated_ttys(system_chkpwd_t)
@@ -1364,9 +2322,9 @@
  
  userdom_dontaudit_use_unpriv_users_ttys(system_chkpwd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.6/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.7/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/fstools.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/fstools.te	2006-08-12 07:18:46.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -1375,9 +2333,9 @@
  
  domain_use_interactive_fds(fsadm_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.6/policy/modules/system/hostname.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.7/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/hostname.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/hostname.te	2006-08-12 07:18:46.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -1400,9 +2358,9 @@
 +	xen_dontaudit_use_fds(hostname_t)
 +')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.6/policy/modules/system/init.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.7/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-08-08 14:59:36.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/init.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/init.if	2006-08-12 07:18:46.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -1417,9 +2375,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.6/policy/modules/system/init.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.7/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/init.te	2006-08-09 09:15:19.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/init.te	2006-08-12 07:18:46.000000000 -0400
 @@ -361,6 +361,8 @@
  logging_read_audit_config(initrc_t)
  
@@ -1429,10 +2387,19 @@
  # slapd needs to read cert files from its initscript
  miscfiles_read_certs(initrc_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.6/policy/modules/system/libraries.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.7/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/libraries.fc	2006-08-09 14:03:56.000000000 -0400
-@@ -199,8 +199,8 @@
++++ serefpolicy-2.3.7/policy/modules/system/libraries.fc	2006-08-12 07:18:46.000000000 -0400
+@@ -97,6 +97,8 @@
+ /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+ /usr/lib(64)?/xulrunner-[^/]*/libxul\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/xulrunner-[^/]*/libgtkembedmoz\.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:textrel_shlib_t,s0)
+ /usr/lib(64)?/ati-fglrx/.+\.so(\..*)?	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -199,8 +201,8 @@
  /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -1443,9 +2410,9 @@
  /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.6/policy/modules/system/locallogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.7/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/locallogin.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/locallogin.te	2006-08-12 07:18:46.000000000 -0400
 @@ -47,7 +47,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -1464,9 +2431,9 @@
  
  dev_setattr_mouse_dev(local_login_t)
  dev_getattr_mouse_dev(local_login_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.6/policy/modules/system/logging.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.7/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/logging.fc	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/logging.fc	2006-08-12 07:18:46.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -1474,9 +2441,9 @@
 +
 +/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.6/policy/modules/system/logging.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.7/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/logging.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/logging.if	2006-08-12 07:18:46.000000000 -0400
 @@ -553,3 +553,24 @@
  	allow $1 var_log_t:dir rw_dir_perms;
  	allow $1 var_log_t:file create_file_perms;
@@ -1502,9 +2469,9 @@
 +	allow $1 auditd_var_run_t:sock_file rw_file_perms;
 +	allow $1 auditd_t:unix_stream_socket connectto;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.6/policy/modules/system/logging.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.7/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/logging.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/logging.te	2006-08-12 07:18:46.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -1517,9 +2484,9 @@
  
  kernel_read_kernel_sysctls(auditd_t)
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.6/policy/modules/system/miscfiles.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.7/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/miscfiles.fc	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/miscfiles.fc	2006-08-12 07:18:46.000000000 -0400
 @@ -9,6 +9,7 @@
  # /etc
  #
@@ -1528,9 +2495,9 @@
  /etc/pki(/.*)?			gen_context(system_u:object_r:cert_t,s0)
  
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.6/policy/modules/system/miscfiles.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.7/policy/modules/system/miscfiles.if
 --- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/miscfiles.if	2006-08-09 09:15:31.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/miscfiles.if	2006-08-12 07:18:46.000000000 -0400
 @@ -116,6 +116,24 @@
  
  ########################################
@@ -1556,9 +2523,9 @@
  ##	Allow process to read legacy time localization info
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.6/policy/modules/system/modutils.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.7/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/modutils.te	2006-08-10 13:13:14.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/modutils.te	2006-08-12 07:18:46.000000000 -0400
 @@ -183,6 +183,7 @@
  fs_getattr_xattr_fs(depmod_t)
  
@@ -1567,9 +2534,9 @@
  
  corecmd_search_bin(depmod_t)
  corecmd_search_sbin(depmod_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.6/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.7/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/mount.te	2006-08-08 16:38:58.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/mount.te	2006-08-12 07:18:46.000000000 -0400
 @@ -80,6 +80,7 @@
  files_read_isid_type_files(mount_t)
  # For reading cert files
@@ -1587,9 +2554,9 @@
  userdom_use_all_users_fds(mount_t)
  
  ifdef(`distro_redhat',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.6/policy/modules/system/selinuxutil.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.7/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/selinuxutil.te	2006-08-11 09:47:12.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/selinuxutil.te	2006-08-12 07:18:46.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -1633,9 +2600,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.6/policy/modules/system/udev.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.7/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/udev.fc	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/udev.fc	2006-08-12 07:18:46.000000000 -0400
 @@ -1,5 +1,6 @@
  # udev
  
@@ -1643,9 +2610,9 @@
  /dev/\.udevdb	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.6/policy/modules/system/udev.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.7/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/udev.te	2006-08-09 09:15:39.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/udev.te	2006-08-12 07:18:46.000000000 -0400
 @@ -129,6 +129,7 @@
  mls_file_upgrade(udev_t)
  mls_file_downgrade(udev_t)
@@ -1654,9 +2621,9 @@
  
  modutils_domtrans_insmod(udev_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.6/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.7/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/unconfined.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/unconfined.if	2006-08-12 07:18:46.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -1673,9 +2640,9 @@
  	files_unconfined($1)
  	fs_unconfined($1)
  	selinux_unconfined($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.6/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.7/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/unconfined.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/unconfined.te	2006-08-12 07:18:46.000000000 -0400
 @@ -195,4 +195,9 @@
  ifdef(`targeted_policy',`
  	allow unconfined_execmem_t self:process { execstack execmem };
@@ -1686,9 +2653,9 @@
 +		unconfined_dbus_chat(unconfined_execmem_t)
 +	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.6/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.7/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/userdomain.if	2006-08-09 14:04:54.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/userdomain.if	2006-08-12 07:18:46.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -2116,9 +3083,9 @@
 +        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.6/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.7/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/userdomain.te	2006-08-10 13:44:38.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/userdomain.te	2006-08-12 07:18:46.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -2218,9 +3185,9 @@
  		', `
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.6/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.7/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/xen.if	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/xen.if	2006-08-12 07:18:46.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -2263,9 +3230,9 @@
 +
 +	dontaudit $1 xend_t:fd use;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.6/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.7/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.6/policy/modules/system/xen.te	2006-08-08 16:15:43.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/xen.te	2006-08-12 07:18:46.000000000 -0400
 @@ -69,7 +69,10 @@
  #
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- selinux-policy.spec	11 Aug 2006 15:39:50 -0000	1.251
+++ selinux-policy.spec	12 Aug 2006 11:54:51 -0000	1.252
@@ -15,8 +15,8 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.6
-Release: 4
+Version: 2.3.7
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,6 +347,10 @@
 %endif
 
 %changelog
+* Sat Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-1
+- Update from upstream
+- More java fixes
+
 * Fri Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-4
 - Change allow_execstack to default to on, for RHEL5 Beta.  
   This is required because of a Java compiler problem.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	8 Aug 2006 20:40:36 -0000	1.83
+++ sources	12 Aug 2006 11:54:51 -0000	1.84
@@ -1 +1 @@
-d374829a4b5a08e44d337dc5cbf77d21  serefpolicy-2.3.6.tgz
+db77e32295f642a88c7e89673361b15d  serefpolicy-2.3.7.tgz



From fedora-cvs-commits at redhat.com  Sat Aug 12 11:56:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 07:56:15 -0400
Subject: rpms/libsemanage/devel libsemanage.spec,1.103,1.104
Message-ID: <200608121156.k7CBuF5Q001793@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libsemanage.spec 
Log Message:



Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- libsemanage.spec	12 Aug 2006 10:59:35 -0000	1.103
+++ libsemanage.spec	12 Aug 2006 11:56:13 -0000	1.104
@@ -1,5 +1,5 @@
-%define libsepolver 1.12.23-1
-%define libselinuxver 1.30.22-1
+	%define libsepolver 1.12.23-1
+%define libselinuxver 1.30.26-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.6.15



From fedora-cvs-commits at redhat.com  Sat Aug 12 12:26:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 08:26:57 -0400
Subject: rpms/libsemanage/devel libsemanage.spec,1.104,1.105
Message-ID: <200608121226.k7CCQvF9025396@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libsemanage.spec 
Log Message:



Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- libsemanage.spec	12 Aug 2006 11:56:13 -0000	1.104
+++ libsemanage.spec	12 Aug 2006 12:26:53 -0000	1.105
@@ -9,7 +9,7 @@
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
-BuildRequires: libselinux-devel >= %{libselinuxver} 
+BuildRequires: libselinux-devel >= %{libselinuxver} swig
 BuildRequires: libsepol-devel >= %{libsepolver} 
 BuildRequires: python-devel bison flex
 



From fedora-cvs-commits at redhat.com  Sat Aug 12 17:16:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 13:16:48 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.117,
	1.118 policycoreutils-rhat.patch, 1.218,
	1.219 policycoreutils.spec, 1.300, 1.301 sources, 1.121, 1.122
Message-ID: <200608121716.k7CHGmGk030412@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30226

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Sat Aug 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.26-1
- Update to upstream
	* Merged semanage local file contexts patch from Chris PeBenito.
- Fix fixfiles log creation
- More translations



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- .cvsignore	6 Aug 2006 00:18:19 -0000	1.117
+++ .cvsignore	12 Aug 2006 17:16:43 -0000	1.118
@@ -109,3 +109,4 @@
 policycoreutils-1.30.17.tgz
 policycoreutils-1.30.22.tgz
 policycoreutils-1.30.25.tgz
+policycoreutils-1.30.26.tgz

policycoreutils-rhat.patch:
 po/ms.po         |   93 +++++++++++++++++++++++++++----------------------------
 po/sv.po         |    2 -
 po/zh_TW.po      |   16 ++++-----
 scripts/fixfiles |    2 -
 4 files changed, 56 insertions(+), 57 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- policycoreutils-rhat.patch	6 Aug 2006 00:18:19 -0000	1.218
+++ policycoreutils-rhat.patch	12 Aug 2006 17:16:44 -0000	1.219
@@ -1,1026 +1,415 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fr.po policycoreutils-1.30.22/po/fr.po
---- nsapolicycoreutils/po/fr.po	2006-08-01 09:47:27.000000000 -0400
-+++ policycoreutils-1.30.22/po/fr.po	2006-08-02 14:22:10.000000000 -0400
-@@ -8,14 +8,14 @@
- msgstr ""
- "Project-Id-Version: Policy Core Utils 1.0\n"
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils-1.30.26/po/ms.po
+--- nsapolicycoreutils/po/ms.po	2006-08-01 09:47:27.000000000 -0400
++++ policycoreutils-1.30.26/po/ms.po	2006-08-12 13:15:21.000000000 -0400
+@@ -8,7 +8,7 @@
+ "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-07-07 23:15+0200\n"
-+"POT-Creation-Date: 2006-05-26 13:48-0400\n"
- "PO-Revision-Date: 2006-07-08 13:34+0200\n"
- "Last-Translator: Guillaume CHARDIN <guillaume.chardin at gmail.com>\n"
- "Language-Team: French\n"
+ "POT-Creation-Date: 2006-05-26 13:48-0400\n"
+-"PO-Revision-Date: 2006-07-05 23:46+0800\n"
++"PO-Revision-Date: 2006-08-08 01:09+0800\n"
+ "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman at myrealbox.com>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: "
-+"Plural-Forms: \n"
- 
- #: ../load_policy/load_policy.c:22
- #, c-format
-@@ -189,12 +189,16 @@
- #: ../newrole/newrole.c:717
- #, c-format
- msgid "%s!  Could not get current context for %s, not relabeling tty.\n"
--msgstr "%s! Ne peut r?cup?rer le contexte actuel pour %s, le tty ne sera pas renom?.\n"
-+msgstr ""
-+"%s! Ne peut r?cup?rer le contexte actuel pour %s, le tty ne sera pas "
-+"renom?.\n"
- 
- #: ../newrole/newrole.c:728
- #, c-format
- msgid "%s!  Could not get new context for %s, not relabeling tty.\n"
--msgstr "%s! Ne peut r?cup?rer le nouveau contexte pour %s, le tty ne sera pas renom?.\n"
-+msgstr ""
-+"%s! Ne peut r?cup?rer le nouveau contexte pour %s, le tty ne sera pas "
-+"renom?.\n"
- 
- #: ../newrole/newrole.c:740
- #, c-format
-@@ -250,7 +254,8 @@
- "USAGE: run_init <script> <args ...>\n"
- "  where: <script> is the name of the init script to run,\n"
- "         <args ...> are the arguments to that script."
--msgstr "SYNTAXE: run_init <script> <arg ...>\n"
-+msgstr ""
-+"SYNTAXE: run_init <script> <arg ...>\n"
- "  o?: <script> est le nom du script d'initialisation ? ex?cuter,\n"
- "         <args ...> sont les arguments ? passer au script."
- 
-@@ -286,7 +291,8 @@
- #: ../scripts/chcat:84 ../scripts/chcat:154
- #, c-format
- msgid "Can not modify sensitivity levels using '+' on %s"
--msgstr "Impossible de modifier le niveau de sensibilit? en utilisant '+' sur %s"
-+msgstr ""
-+"Impossible de modifier le niveau de sensibilit? en utilisant '+' sur %s"
- 
- #: ../scripts/chcat:88
- #, c-format
-@@ -401,7 +407,8 @@
- #: ../semanage/seobject.py:131
- #, python-format
- msgid "Unable to open %s: translations not supported on non-MLS machines"
--msgstr "Impossible d'ouvrir %s: traduction non support?e sur une machine non MLS"
-+msgstr ""
-+"Impossible d'ouvrir %s: traduction non support?e sur une machine non MLS"
- 
- #: ../semanage/seobject.py:171 ../semanage/seobject.py:185
- #, python-format
-@@ -519,7 +526,8 @@
- #: ../semanage/seobject.py:355
- #, python-format
- msgid "Login mapping for %s is defined in policy, cannot be deleted"
--msgstr "Le mappage pour %s est d?fini dans une strat?gie, il ne peut ?tre supprim?"
-+msgstr ""
-+"Le mappage pour %s est d?fini dans une strat?gie, il ne peut ?tre supprim?"
- 
- #: ../semanage/seobject.py:364 ../semanage/seobject.py:368
- #, python-format
-@@ -597,7 +605,9 @@
- #: ../semanage/seobject.py:561
- #, python-format
- msgid "SELinux user %s is defined in policy, cannot be deleted"
--msgstr "L'utilisateur SELinux %s est d?fini dans une strat?gie, il ne peut ?tre supprim?"
-+msgstr ""
-+"L'utilisateur SELinux %s est d?fini dans une strat?gie, il ne peut ?tre "
-+"supprim?"
- 
- #: ../semanage/seobject.py:569 ../semanage/seobject.py:573
- #, python-format
-@@ -654,7 +664,8 @@
- #: ../semanage/seobject.py:671
- #, python-format
- msgid "Could not set user in port context for %s/%s"
--msgstr "Impossible de d?finir l'utilisateur dans le contexte du port pour %s/%s"
-+msgstr ""
-+"Impossible de d?finir l'utilisateur dans le contexte du port pour %s/%s"
- 
- #: ../semanage/seobject.py:675
- #, python-format
-@@ -669,7 +680,8 @@
- #: ../semanage/seobject.py:684
- #, python-format
- msgid "Could not set mls fields in port context for %s/%s"
--msgstr "Impossible de d?finir les champs mls dans le contexte de port pour %s/%s"
-+msgstr ""
-+"Impossible de d?finir les champs mls dans le contexte de port pour %s/%s"
- 
- #: ../semanage/seobject.py:688
- #, python-format
-@@ -752,7 +764,8 @@
- #: ../semanage/seobject.py:865
- #, python-format
- msgid "Could not set user in interface context for %s"
--msgstr "Impossible de d?finir l'utilisateur dans le contexte d'interface pour %s"
-+msgstr ""
-+"Impossible de d?finir l'utilisateur dans le contexte d'interface pour %s"
- 
- #: ../semanage/seobject.py:869
- #, python-format
-@@ -767,7 +780,8 @@
- #: ../semanage/seobject.py:878
- #, python-format
- msgid "Could not set mls fields in interface context for %s"
--msgstr "Impossible de d?finir les champs mls dans le contexte d'interface pour %s"
-+msgstr ""
-+"Impossible de d?finir les champs mls dans le contexte d'interface pour %s"
- 
- #: ../semanage/seobject.py:882
- #, python-format
-@@ -802,7 +816,8 @@
- #: ../semanage/seobject.py:959
- #, python-format
- msgid "Interface %s is defined in policy, cannot be deleted"
--msgstr "L'interface %s est d?finie dans les strat?gies, elle ne peut ?tre supprim?e "
-+msgstr ""
-+"L'interface %s est d?finie dans les strat?gies, elle ne peut ?tre supprim?e "
- 
- #: ../semanage/seobject.py:967 ../semanage/seobject.py:971
- #, python-format
-@@ -832,7 +847,8 @@
- #: ../semanage/seobject.py:1037
- #, python-format
- msgid "Could not set user in file context for %s"
--msgstr "Impossible de d?finir l'utilisateur dans le contexte de fichier pour %s"
-+msgstr ""
-+"Impossible de d?finir l'utilisateur dans le contexte de fichier pour %s"
- 
- #: ../semanage/seobject.py:1041
- #, python-format
-@@ -847,7 +863,8 @@
- #: ../semanage/seobject.py:1050
- #, python-format
- msgid "Could not set mls fields in file context for %s"
--msgstr "Impossible de d?finir les champs mls dans le contexte du fichier pour %s"
-+msgstr ""
-+"Impossible de d?finir les champs mls dans le contexte du fichier pour %s"
- 
- #: ../semanage/seobject.py:1056
- #, python-format
-@@ -881,7 +898,9 @@
- #: ../semanage/seobject.py:1131
- #, python-format
- msgid "File context for %s is defined in policy, cannot be deleted"
--msgstr "Le contexte de fichier pour %s est d?fini dans les strat?gie, il ne peu ?tre supprim?"
-+msgstr ""
-+"Le contexte de fichier pour %s est d?fini dans les strat?gie, il ne peu ?tre "
-+"supprim?"
- 
- #: ../semanage/seobject.py:1139 ../semanage/seobject.py:1143
- #, python-format
-@@ -967,4 +986,3 @@
- #, c-format
- msgid "Options Error: %s "
- msgstr "Options invalides: %s "
--
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.30.22/po/sv.po
---- nsapolicycoreutils/po/sv.po	2006-08-01 09:47:27.000000000 -0400
-+++ policycoreutils-1.30.22/po/sv.po	2006-08-02 14:22:10.000000000 -0400
-@@ -1,46 +1,64 @@
-+# Swedish messages for policycoreutils.
-+# Copyright (C) 2006 Christian Rose.
-+# Christian Rose <menthos at menthos.com>, 2006.
-+#
-+# $Id$
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: policycoreutils\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2006-05-26 13:48-0400\n"
-+"PO-Revision-Date: 2006-07-22 00:28+0200\n"
-+"Last-Translator: Christian Rose <menthos at menthos.com>\n"
-+"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
- #: ../load_policy/load_policy.c:22
- #, c-format
- msgid "usage:  %s [-bq]\n"
--msgstr ""
-+msgstr "anv??ndning: %s [-bq]\n"
- 
- #: ../load_policy/load_policy.c:62
- #, c-format
- msgid "%s:  Can't load policy:  %s\n"
--msgstr ""
-+msgstr "%s: Kan inte l??sa in policy: %s\n"
- 
- #: ../newrole/newrole.c:97
- #, c-format
- msgid "Out of memory!\n"
--msgstr ""
-+msgstr "Slut p?? minne!\n"
- 
- #: ../newrole/newrole.c:201 ../run_init/run_init.c:126
- #, c-format
+@@ -34,12 +34,12 @@
+ #: ../run_init/run_init.c:126
+ #, fuzzy, c-format
  msgid "failed to initialize PAM\n"
--msgstr ""
-+msgstr "misslyckades med att initiera PAM\n"
+-msgstr "Gagal untuk melekapkan partisyen."
++msgstr "PAM: gagal untuk melepaskan pengesah."
  
  #: ../newrole/newrole.c:212
- #, c-format
+ #, fuzzy, c-format
  msgid "failed to set PAM_TTY\n"
--msgstr ""
-+msgstr "misslyckades med att s??tta PAM_TTY\n"
- 
- #: ../newrole/newrole.c:250 ../run_init/run_init.c:155
- msgid "Password:"
--msgstr "Password:"
-+msgstr "L??senord:"
+-msgstr "Gagal untuk menetapkan katalaluan bagi kumpulan %s: %s\n"
++msgstr "PAM: gagal untuk melepaskan pengesah."
  
- #: ../newrole/newrole.c:282 ../run_init/run_init.c:187
- #, c-format
- msgid "Cannot find your entry in the shadow passwd file.\n"
--msgstr ""
-+msgstr "Kan inte hitta din post i skuggl??senordsfilen.\n"
- 
- #: ../newrole/newrole.c:288 ../run_init/run_init.c:193
- #, c-format
- msgid "getpass cannot open /dev/tty\n"
--msgstr ""
-+msgstr "getpass kan inte ??ppna /dev/tty\n"
- 
- #: ../newrole/newrole.c:354
- #, c-format
- msgid "Error initing capabilities, aborting.\n"
--msgstr ""
-+msgstr "Fel vid initiering av kapabiliteter, avbryter.\n"
- 
- #: ../newrole/newrole.c:367
- #, c-format
-@@ -50,12 +68,12 @@
- #: ../newrole/newrole.c:374
- #, c-format
- msgid "Error changing uid, aborting.\n"
--msgstr ""
-+msgstr "Fel vid byte av uid, avbryter.\n"
- 
- #: ../newrole/newrole.c:380
- #, c-format
- msgid "Error resetting KEEPCAPS, aborting\n"
--msgstr ""
-+msgstr "Fel vid ??terst??llning av KEEPCAPS, avbryter\n"
+ #: ../newrole/newrole.c:250
+ #: ../run_init/run_init.c:155
+@@ -94,14 +94,14 @@
+ msgstr ""
  
- #: ../newrole/newrole.c:386
- #, c-format
-@@ -65,7 +83,7 @@
- #: ../newrole/newrole.c:459
- #, c-format
- msgid "Sorry, newrole may be used only on a SELinux kernel.\n"
+ #: ../newrole/newrole.c:481
+-#, c-format
++#, fuzzy, c-format
+ msgid "Error: multiple roles specified\n"
 -msgstr ""
-+msgstr "Tyv??rr, newrole kan endast anv??ndas p?? en SELinux-k??rna.\n"
++msgstr "banyak opsyen -l or -t dinyatakan"
  
- #: ../newrole/newrole.c:464
- #, c-format
-@@ -80,7 +98,7 @@
  #: ../newrole/newrole.c:490
- #, c-format
+-#, c-format
++#, fuzzy, c-format
  msgid "Error: multiple types specified\n"
 -msgstr ""
-+msgstr "Fel: flera typer angivna\n"
++msgstr "banyak opsyen -l or -t dinyatakan"
  
  #: ../newrole/newrole.c:498
  #, c-format
-@@ -90,82 +108,82 @@
+@@ -109,9 +109,9 @@
+ msgstr ""
+ 
  #: ../newrole/newrole.c:503
- #, c-format
+-#, c-format
++#, fuzzy, c-format
  msgid "Error: multiple levels specified\n"
 -msgstr ""
-+msgstr "Fel: flera niv??er angivna\n"
++msgstr "banyak opsyen -l or -t dinyatakan"
  
  #: ../newrole/newrole.c:527
- #, c-format
- msgid "Couldn't get default type.\n"
--msgstr ""
-+msgstr "Kunde inte f?? tag i standardtyp.\n"
- 
- #: ../newrole/newrole.c:549
- #, c-format
- msgid "failed to get old_context.\n"
--msgstr ""
-+msgstr "kunde inte f?? tag i old_context.\n"
- 
- #: ../newrole/newrole.c:563
- #, c-format
- msgid "failed to get new context.\n"
--msgstr ""
-+msgstr "misslyckades med att f?? tag i nytt sammanhang.\n"
- 
- #: ../newrole/newrole.c:586
- #, c-format
- msgid "cannot find your entry in the passwd file.\n"
--msgstr ""
-+msgstr "kan inte hitta din post i passwd-filen.\n"
- 
- #: ../newrole/newrole.c:596
- #, c-format
- msgid "Error!  Shell is not valid.\n"
--msgstr ""
-+msgstr "Fel! Skalet ??r inte giltigt.\n"
- 
- #: ../newrole/newrole.c:603
- #, c-format
- msgid "Error!  Could not retrieve tty information.\n"
--msgstr ""
-+msgstr "Fel! Kunde inte f?? tag i tty-information.\n"
- 
- #: ../newrole/newrole.c:607
- #, c-format
- msgid "Authenticating %s.\n"
--msgstr ""
-+msgstr "Autentiserar %s.\n"
- 
- #: ../newrole/newrole.c:621
- #, c-format
- msgid "newrole: incorrect password for %s\n"
--msgstr ""
-+msgstr "newrole: felaktigt l??senord f??r %s\n"
- 
- #: ../newrole/newrole.c:645
- #, c-format
- msgid "failed to set new role %s\n"
--msgstr ""
-+msgstr "misslyckades med att st??lla in ny roll %s\n"
- 
- #: ../newrole/newrole.c:657
- #, c-format
- msgid "failed to set new type %s\n"
--msgstr ""
-+msgstr "misslyckades med att st??lla in ny typ %s\n"
- 
- #: ../newrole/newrole.c:670
- #, c-format
- msgid "failed to build new range with level %s\n"
--msgstr ""
-+msgstr "misslyckades med att bygga nytt intervall med niv?? %s\n"
- 
- #: ../newrole/newrole.c:674
- #, c-format
- msgid "failed to set new range %s\n"
--msgstr ""
-+msgstr "misslyckades med att s??tta nytt intervall %s\n"
- 
- #: ../newrole/newrole.c:688
- #, c-format
- msgid "failed to convert new context to string\n"
--msgstr ""
-+msgstr "misslyckades med att konvertera nytt sammanhang till str??ng\n"
- 
- #: ../newrole/newrole.c:698
- #, c-format
- msgid "%s is not a valid context\n"
--msgstr ""
-+msgstr "%s ??r inte ett giltigt sammanhang\n"
- 
- #: ../newrole/newrole.c:711
- #, c-format
- msgid "Error!  Could not open %s.\n"
--msgstr ""
-+msgstr "Fel! Kunde inte ??ppna %s.\n"
- 
- #: ../newrole/newrole.c:717
- #, c-format
-@@ -205,7 +223,7 @@
- #: ../newrole/newrole.c:832 ../run_init/run_init.c:390
- #, c-format
- msgid "Could not set exec context to %s.\n"
--msgstr ""
-+msgstr "Kunde inte st??lla in k??rningssammanhang till %s.\n"
- 
- #: ../newrole/newrole.c:842
- #, c-format
-@@ -241,12 +259,12 @@
- #: ../run_init/run_init.c:295
- #, c-format
- msgid "Could not open file %s\n"
--msgstr ""
-+msgstr "Kunde inte ??ppna filen %s\n"
- 
- #: ../run_init/run_init.c:322
- #, c-format
- msgid "No context in file %s\n"
--msgstr ""
-+msgstr "Inget sammanhang i filen %s\n"
- 
- #: ../run_init/run_init.c:345
- #, c-format
-@@ -256,11 +274,11 @@
- #: ../run_init/run_init.c:364
- #, c-format
- msgid "authentication failed.\n"
--msgstr ""
-+msgstr "autentisering misslyckades.\n"
- 
- #: ../scripts/chcat:70 ../scripts/chcat:140
- msgid "Requires at least one category"
--msgstr ""
-+msgstr "Kr??ver minst en kategori"
- 
- #: ../scripts/chcat:84 ../scripts/chcat:154
- #, c-format
-@@ -270,12 +288,12 @@
- #: ../scripts/chcat:88
- #, c-format
- msgid "%s is already in %s"
--msgstr ""
-+msgstr "%s ??r redan i %s"
- 
- #: ../scripts/chcat:159 ../scripts/chcat:169
- #, c-format
- msgid "%s is not in %s"
--msgstr ""
-+msgstr "%s finns inte i %s"
- 
- #: ../scripts/chcat:232 ../scripts/chcat:237
- msgid "Can not combine +/- with other types of categories"
-@@ -283,47 +301,80 @@
- 
- #: ../scripts/chcat:282
- msgid "Can not have multiple sensitivities"
--msgstr ""
-+msgstr "Kan inte ha flera k??nsligheter"
- 
+ #, fuzzy, c-format
+@@ -215,7 +215,7 @@
+ #: ../newrole/newrole.c:754
+ #, fuzzy, c-format
+ msgid "Warning!  Could not restore context for %s\n"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat menyoal konteks fail untuk %s"
+ 
+ #: ../newrole/newrole.c:774
+ #, fuzzy, c-format
+@@ -321,7 +321,7 @@
  #: ../scripts/chcat:288
- #, c-format
+ #, fuzzy, c-format
  msgid "Usage %s CATEGORY File ..."
--msgstr ""
-+msgstr "Anv??ndning %s KATEGORI fil ..."
-+
-+msgid "Usage: %s CATEGORY File ..."
-+msgstr "Anv??ndning: %s KATEGORI fil ..."
+-msgstr "Pemindahan Fail (FTP)"
++msgstr "Penggunaan: %s [PILIHAN]... FAIL\n"
  
  #: ../scripts/chcat:289
- #, c-format
- msgid "Usage %s -l CATEGORY user ..."
--msgstr ""
-+msgstr "Anv??ndning %s -l KATEGORI anv??ndare ..."
-+
-+msgid "Usage: %s -l CATEGORY user ..."
-+msgstr "Anv??ndning: %s -l KATEGORI anv??ndare ..."
- 
+ #, fuzzy, c-format
+@@ -331,7 +331,7 @@
  #: ../scripts/chcat:290
--#, c-format
-+#, c-forma
+ #, fuzzy, c-format
  msgid "Usage %s [[+|-]CATEGORY],...]q File ..."
--msgstr ""
-+msgstr "Anv??ndning %s [[+|-]KATEGORI],...]q fil ..."
-+
-+msgid "Usage: %s [[+|-]CATEGORY],...]q File ..."
-+msgstr "Anv??ndning: %s [[+|-]KATEGORI],...]q fil ..."
+-msgstr "Pemindahan Fail (FTP)"
++msgstr "Penggunaan: %s [PILIHAN]... FAIL\n"
  
  #: ../scripts/chcat:291
- #, c-format
- msgid "Usage %s -l [[+|-]CATEGORY],...]q user ..."
--msgstr ""
-+msgstr "Anv??ndning %s -l [[+|-]KATEGORI],...]q anv??ndare ..."
-+
-+msgid "Usage: %s -l [[+|-]CATEGORY],...]q user ..."
-+msgstr "Anv??ndning: %s -l [[+|-]KATEGORI],...]q anv??ndare ..."
- 
+ #, fuzzy, c-format
+@@ -341,7 +341,7 @@
  #: ../scripts/chcat:292
- #, c-format
+ #, fuzzy, c-format
  msgid "Usage %s -d File ..."
--msgstr ""
-+msgstr "Anv??ndning %s -d fil ..."
-+
-+msgid "Usage: %s -d File ..."
-+msgstr "Anv??ndning: %s -d fil ..."
+-msgstr "Menyalin Fail"
++msgstr "Penggunaan: %s [PILIHAN]... FAIL\n"
  
  #: ../scripts/chcat:293
- #, c-format
- msgid "Usage %s -l -d user ..."
--msgstr ""
-+msgstr "Anv??ndning %s -l -d anv??ndare ..."
-+
-+msgid "Usage: %s -l -d user ..."
-+msgstr "Anv??ndning: %s -l -d anv??ndare ..."
- 
- #: ../scripts/chcat:294
- #, c-format
- msgid "Usage %s -L"
--msgstr ""
-+msgstr "Anv??ndning %s -L"
-+
-+msgid "Usage: %s -L"
-+msgstr "Anv??ndning: %s -L"
-+
-+msgid "Usage: %s"
-+msgstr "Anv??ndning: %s"
-+
-+msgid "Usage:  %s"
-+msgstr "Anv??ndning: %s"
-+
-+msgid "Usage:"
-+msgstr "Anv??ndning:"
- 
- #: ../scripts/chcat:295
- #, c-format
- msgid "Usage %s -L -l user"
--msgstr ""
-+msgstr "Anv??ndning %s -L -l anv??ndare"
-+
-+msgid "Usage: %s -L -l user"
-+msgstr "Anv??ndning: %s -L -l anv??ndare"
- 
- #: ../scripts/chcat:296
- msgid "Use -- to end option list.  For example"
-@@ -344,7 +395,7 @@
+ #, fuzzy, c-format
+@@ -378,7 +378,7 @@
  #: ../semanage/semanage:127
- #, c-format
+ #, fuzzy, c-format
  msgid "%s not defined"
--msgstr ""
-+msgstr "%s ??r inte definierad"
+-msgstr "Boolean %s tidak dinyatakan"
++msgstr "tidak ditakrif"
  
  #: ../semanage/semanage:151
- #, c-format
-@@ -357,50 +408,60 @@
- 
- #: ../semanage/semanage:244
- msgid "You must specify a role"
--msgstr ""
-+msgstr "Du m??ste ange en roll"
- 
- #: ../semanage/semanage:246
- msgid "You must specify a prefix"
--msgstr ""
-+msgstr "Du m??ste ange ett prefix"
- 
- #: ../semanage/semanage:295
- #, c-format
- msgid "Options Error %s "
--msgstr ""
-+msgstr "Flaggfel %s "
-+
-+msgid "Options Error %s"
-+msgstr "Flaggfel %s"
- 
- #: ../semanage/semanage:299
- #, c-format
- msgid "Invalid value %s"
--msgstr ""
-+msgstr "Ogiltigt v??rde %s"
- 
- #: ../semanage/seobject.py:124
- msgid "translations not supported on non-MLS machines"
--msgstr ""
-+msgstr "??vers??ttningar st??ds inte p?? maskiner som inte har MLS"
- 
- #: ../semanage/seobject.py:131
- #, python-format
- msgid "Unable to open %s: translations not supported on non-MLS machines"
- msgstr ""
-+"Kan inte ??ppna %s: ??vers??ttningar st??ds inte p?? maskiner som inte har MLS"
- 
- #: ../semanage/seobject.py:171 ../semanage/seobject.py:185
- #, python-format
- msgid "Translations can not contain spaces '%s' "
--msgstr ""
-+msgstr "??vers??ttningar kan inte inneh??lla blanksteg \"%s\" "
-+
-+msgid "Translations can not contain spaces '%s'"
-+msgstr "??vers??ttningar kan inte inneh??lla blanksteg \"%s\""
- 
- #: ../semanage/seobject.py:174
- #, python-format
- msgid "Invalid Level '%s' "
--msgstr ""
-+msgstr "Ogiltig niv?? \"%s\" "
-+
-+msgid "Invalid Level '%s'"
-+msgstr "Ogiltig niv?? \"%s\""
- 
- #: ../semanage/seobject.py:177
- #, python-format
- msgid "%s already defined in translations"
--msgstr ""
-+msgstr "%s ??r redan definierad i ??vers??ttningar"
- 
+ #, fuzzy, c-format
+@@ -438,7 +438,7 @@
  #: ../semanage/seobject.py:189
- #, python-format
+ #, fuzzy, python-format
  msgid "%s not defined in translations"
--msgstr ""
-+msgstr "%s ??r inte definierad i ??vers??ttningar"
+-msgstr "Boolean %s tidak dinyatakan"
++msgstr "%s: %s: bukan dalam format a.out\n"
  
  #: ../semanage/seobject.py:209
  msgid "SELinux policy is not managed or store cannot be accessed."
-@@ -408,7 +469,7 @@
- 
- #: ../semanage/seobject.py:214
- msgid "Cannot read policy store."
--msgstr ""
-+msgstr "Kan inte l??sa policylager."
- 
- #: ../semanage/seobject.py:219
- msgid "Could not establish semanage connection"
-@@ -421,38 +482,41 @@
- #: ../semanage/seobject.py:1188 ../semanage/seobject.py:1222
- #, python-format
+@@ -466,7 +466,7 @@
+ #: ../semanage/seobject.py:1222
+ #, fuzzy, python-format
  msgid "Could not create a key for %s"
--msgstr ""
-+msgstr "Kunde inte skapa en nyckel f??r %s"
- 
- #: ../semanage/seobject.py:242 ../semanage/seobject.py:300
- #: ../semanage/seobject.py:347 ../semanage/seobject.py:353
- #, python-format
- msgid "Could not check if login mapping for %s is defined"
--msgstr ""
-+msgstr "Kunde inte kontrollera om inloggningsmappningen f??r %s ??r definierad"
- 
- #: ../semanage/seobject.py:244
- #, python-format
- msgid "Login mapping for %s is already defined"
--msgstr ""
-+msgstr "Inloggningsmappningen f??r %s ??r redan definierad"
- 
- #: ../semanage/seobject.py:248
- #, python-format
- msgid "Linux User %s does not exist"
--msgstr ""
-+msgstr "Linuxanv??ndaren %s finns inte"
-+
-+msgid "User %s does not exist"
-+msgstr "Anv??ndaren %s finns inte"
- 
- #: ../semanage/seobject.py:252
- #, python-format
- msgid "Could not create login mapping for %s"
--msgstr ""
-+msgstr "Kunde inte skapa inloggningsmappning f??r %s"
- 
- #: ../semanage/seobject.py:256 ../semanage/seobject.py:438
- #, python-format
- msgid "Could not set name for %s"
--msgstr ""
-+msgstr "Kunde inte s??tta namn f??r %s"
- 
- #: ../semanage/seobject.py:261 ../semanage/seobject.py:448
- #, python-format
- msgid "Could not set MLS range for %s"
--msgstr ""
-+msgstr "Kunde inte s??tta MLS-intervall f??r %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat membuka %s untuk salinan: %s"
  
- #: ../semanage/seobject.py:265
- #, python-format
-@@ -469,16 +533,16 @@
- #: ../semanage/seobject.py:1135 ../semanage/seobject.py:1206
- #: ../semanage/seobject.py:1238
- msgid "Could not start semanage transaction"
--msgstr ""
-+msgstr "Kunde inte starta semanage-transaktion"
- 
- #: ../semanage/seobject.py:273 ../semanage/seobject.py:277
- #, python-format
- msgid "Could not add login mapping for %s"
--msgstr ""
-+msgstr "Kunde inte l??gga till inloggningsmappning f??r %s"
+ #: ../semanage/seobject.py:242
+ #: ../semanage/seobject.py:300
+@@ -543,18 +543,18 @@
+ #: ../semanage/seobject.py:349
+ #, fuzzy, python-format
+ msgid "Login mapping for %s is not defined"
+-msgstr "$file bukan milik \"$user\""
++msgstr "Konteks fail %s tidak dinyatakan"
+ 
+ #: ../semanage/seobject.py:306
+ #, fuzzy, python-format
+ msgid "Could not query seuser for %s"
+-msgstr "Tidak dapat menyoal fail konteks %s"
++msgstr "Tidak dapat menyoal konteks fail untuk %s"
+ 
+ #: ../semanage/seobject.py:325
+ #: ../semanage/seobject.py:329
+ #, fuzzy, python-format
+ msgid "Could not modify login mapping for %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat mengubahsuai konteks fail untuk %s"
  
- #: ../semanage/seobject.py:292
- msgid "Requires seuser or serange"
--msgstr ""
-+msgstr "Kr??ver seuser eller serange"
- 
- #: ../semanage/seobject.py:302 ../semanage/seobject.py:349
+ #: ../semanage/seobject.py:355
  #, python-format
-@@ -507,7 +571,7 @@
+@@ -565,12 +565,12 @@
+ #: ../semanage/seobject.py:368
+ #, fuzzy, python-format
+ msgid "Could not delete login mapping for %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat memadam konteks fail untuk %s"
  
  #: ../semanage/seobject.py:382
+ #, fuzzy
  msgid "Could not list login mappings"
--msgstr ""
-+msgstr "Kunde inte lista inloggningsmappningar"
- 
- #: ../semanage/seobject.py:428 ../semanage/seobject.py:497
- #: ../semanage/seobject.py:553 ../semanage/seobject.py:559
-@@ -556,7 +620,7 @@
- 
- #: ../semanage/seobject.py:489
- msgid "Requires prefix or roles"
--msgstr ""
-+msgstr "Kr??ver prefix eller roller"
- 
- #: ../semanage/seobject.py:499 ../semanage/seobject.py:555
- #, python-format
-@@ -598,16 +662,16 @@
- 
- #: ../semanage/seobject.py:627
- msgid "Port is required"
--msgstr ""
-+msgstr "Port kr??vs"
+-msgstr "Senarai Pengepala tidak dijumpai"
++msgstr "Tidak dapat menyenaraikan konteks fail"
  
+ #: ../semanage/seobject.py:428
+ #: ../semanage/seobject.py:497
+@@ -593,7 +593,7 @@
+ #: ../semanage/seobject.py:443
+ #, fuzzy, python-format
+ msgid "Could not add role %s for %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat membuka %s untuk salinan: %s"
+ 
+ #: ../semanage/seobject.py:452
+ #, fuzzy, python-format
+@@ -603,12 +603,12 @@
+ #: ../semanage/seobject.py:456
+ #, fuzzy, python-format
+ msgid "Could not add prefix %s for %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat membuka %s untuk salinan: %s"
+ 
+ #: ../semanage/seobject.py:459
+ #, fuzzy, python-format
+ msgid "Could not extract key for %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat membuka %s untuk salinan: %s"
+ 
+ #: ../semanage/seobject.py:467
+ #: ../semanage/seobject.py:471
+@@ -628,12 +628,12 @@
+ #: ../semanage/seobject.py:555
+ #, fuzzy, python-format
+ msgid "SELinux user %s is not defined"
+-msgstr "$file bukan milik \"$user\""
++msgstr "Jenis terminal `%s' tidak ditakrifkan."
+ 
+ #: ../semanage/seobject.py:503
+ #, fuzzy, python-format
+ msgid "Could not query user for %s"
+-msgstr "Pengguna %s tidak dapat dipadam: %s.\n"
++msgstr "Tidak dapat menyoal konteks fail untuk %s"
+ 
+ #: ../semanage/seobject.py:530
+ #: ../semanage/seobject.py:534
+@@ -655,7 +655,7 @@
+ #: ../semanage/seobject.py:585
+ #, fuzzy
+ msgid "Could not list SELinux users"
+-msgstr "Pengguna %s tidak dapat dipadam: %s.\n"
++msgstr "Tidak dapat menyenaraikan konteks fail"
+ 
+ #: ../semanage/seobject.py:591
+ #, fuzzy, python-format
+@@ -675,7 +675,7 @@
  #: ../semanage/seobject.py:638
- #, python-format
+ #, fuzzy, python-format
  msgid "Could not create a key for %s/%s"
--msgstr ""
-+msgstr "Kunde inte skapa en nyckel f??r %s/%s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat membuka %s untuk salinan: %s"
  
  #: ../semanage/seobject.py:649
- msgid "Type is required"
--msgstr ""
-+msgstr "Typ kr??vs"
+ #, fuzzy
+@@ -693,17 +693,17 @@
+ #: ../semanage/seobject.py:657
+ #, fuzzy, python-format
+ msgid "Port %s/%s already defined"
+-msgstr "Tiada 'Mountpoints' dikenalpasti"
++msgstr "Seksyen %s telah ditakrif"
  
- #: ../semanage/seobject.py:655 ../semanage/seobject.py:717
- #: ../semanage/seobject.py:751 ../semanage/seobject.py:757
-@@ -623,12 +687,12 @@
  #: ../semanage/seobject.py:661
- #, python-format
+ #, fuzzy, python-format
  msgid "Could not create port for %s/%s"
--msgstr ""
-+msgstr "Kunde inte skapa port f??r %s/%s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat membuka %s untuk salinan: %s"
  
  #: ../semanage/seobject.py:667
- #, python-format
+ #, fuzzy, python-format
  msgid "Could not create context for %s/%s"
--msgstr ""
-+msgstr "Kunde inte skapa sammanhang f??r %s/%s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat menyoal konteks fail untuk %s"
  
  #: ../semanage/seobject.py:671
- #, python-format
-@@ -666,7 +730,7 @@
- 
- #: ../semanage/seobject.py:711
- msgid "Requires setype"
--msgstr ""
-+msgstr "Kr??ver setype"
- 
- #: ../semanage/seobject.py:719 ../semanage/seobject.py:753
- #, python-format
-@@ -695,7 +759,7 @@
- 
- #: ../semanage/seobject.py:779 ../semanage/seobject.py:798
- msgid "Could not list ports"
--msgstr ""
-+msgstr "Kunde inte lista portar"
- 
- #: ../semanage/seobject.py:842 ../semanage/seobject.py:1014
- msgid "SELinux Type is required"
-@@ -705,28 +769,28 @@
- #: ../semanage/seobject.py:947 ../semanage/seobject.py:1018
- #, python-format
+ #, fuzzy, python-format
+@@ -793,7 +793,7 @@
+ #: ../semanage/seobject.py:1018
+ #, fuzzy, python-format
  msgid "Could not create key for %s"
--msgstr ""
-+msgstr "Kunde inte skapa nyckel f??r %s"
- 
- #: ../semanage/seobject.py:850 ../semanage/seobject.py:914
- #: ../semanage/seobject.py:951 ../semanage/seobject.py:957
- #, python-format
- msgid "Could not check if interface %s is defined"
--msgstr ""
-+msgstr "Kunde inte kontrollera om gr??nssnittet %s ??r definierat"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat membuka %s untuk salinan: %s"
  
+ #: ../semanage/seobject.py:850
+ #: ../semanage/seobject.py:914
+@@ -806,18 +806,18 @@
  #: ../semanage/seobject.py:852
- #, python-format
+ #, fuzzy, python-format
  msgid "Interface %s already defined"
--msgstr ""
-+msgstr "Gr??nssnittet %s ??r redan definierat"
+-msgstr "Tiada 'Mountpoints' dikenalpasti"
++msgstr "Seksyen %s telah ditakrif"
  
  #: ../semanage/seobject.py:856
- #, python-format
+ #, fuzzy, python-format
  msgid "Could not create interface for %s"
--msgstr ""
-+msgstr "Kunde inte skapa gr??nssnitt f??r %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat membuka %s untuk salinan: %s"
  
- #: ../semanage/seobject.py:861 ../semanage/seobject.py:1033
- #, python-format
+ #: ../semanage/seobject.py:861
+ #: ../semanage/seobject.py:1033
+ #, fuzzy, python-format
  msgid "Could not create context for %s"
--msgstr ""
-+msgstr "Kunde inte skapa sammanhang f??r %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat menyoal konteks fail untuk %s"
  
  #: ../semanage/seobject.py:865
- #, python-format
-@@ -761,22 +825,22 @@
- #: ../semanage/seobject.py:894 ../semanage/seobject.py:898
- #, python-format
- msgid "Could not add interface %s"
--msgstr ""
-+msgstr "Kunde inte l??gga till gr??nssnittet %s"
+ #, fuzzy, python-format
+@@ -899,12 +899,12 @@
+ #: ../semanage/seobject.py:1024
+ #, fuzzy, python-format
+ msgid "File context for %s already defined"
+-msgstr "Tiada 'Mountpoints' dikenalpasti"
++msgstr "Konteks fail %s tidak dinyatakan"
+ 
+ #: ../semanage/seobject.py:1028
+ #, fuzzy, python-format
+ msgid "Could not create file context for %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat menyoal konteks fail untuk %s"
  
- #: ../semanage/seobject.py:916 ../semanage/seobject.py:953
- #, python-format
- msgid "Interface %s is not defined"
--msgstr ""
-+msgstr "Gr??nssnittet %s ??r inte definierat"
- 
- #: ../semanage/seobject.py:920
- #, python-format
- msgid "Could not query interface %s"
--msgstr ""
-+msgstr "Kunde inte fr??ga gr??nssnittet %s"
- 
- #: ../semanage/seobject.py:935 ../semanage/seobject.py:939
- #, python-format
- msgid "Could not modify interface %s"
--msgstr ""
-+msgstr "Kunde inte ??ndra gr??nssnittet %s"
- 
- #: ../semanage/seobject.py:959
- #, python-format
-@@ -786,11 +850,11 @@
- #: ../semanage/seobject.py:967 ../semanage/seobject.py:971
- #, python-format
- msgid "Could not delete interface %s"
--msgstr ""
-+msgstr "Kunde inte ta bort gr??nssnittet %s"
- 
- #: ../semanage/seobject.py:979
- msgid "Could not list interfaces"
--msgstr ""
-+msgstr "Kunde inte lista gr??nssnitt"
- 
- #: ../semanage/seobject.py:1022 ../semanage/seobject.py:1084
- #: ../semanage/seobject.py:1123 ../semanage/seobject.py:1129
-@@ -873,7 +937,7 @@
- 
- #: ../semanage/seobject.py:1184
- msgid "Requires value"
--msgstr ""
-+msgstr "Kr??ver v??rde"
+ #: ../semanage/seobject.py:1037
+ #, fuzzy, python-format
+@@ -917,30 +917,29 @@
+ msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
+ 
+ #: ../semanage/seobject.py:1045
+-#, fuzzy, python-format
++#, python-format
+ msgid "Could not set type in file context for %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat menetapkan jenis dalam konteks fail untuk %s"
  
- #: ../semanage/seobject.py:1192 ../semanage/seobject.py:1226
- #: ../semanage/seobject.py:1232
-@@ -917,13 +981,18 @@
+ #: ../semanage/seobject.py:1050
+-#, fuzzy, python-format
++#, python-format
+ msgid "Could not set mls fields in file context for %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat menetapkan medan mls dalam konteks fail untuk %s"
  
- #: ../audit2allow/audit2allow:184
- msgid "Compiling policy"
--msgstr ""
-+msgstr "Kompilerar policy"
+ #: ../semanage/seobject.py:1056
+-#, fuzzy, python-format
++#, python-format
+ msgid "Could not set file context for %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat menetapkan konteks fail untuk %s"
+ 
+ #: ../semanage/seobject.py:1064
+ #: ../semanage/seobject.py:1068
+-#, fuzzy, python-format
++#, python-format
+ msgid "Could not add file context for %s"
+-msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
++msgstr "Tidak dapat menambah konteks fail untuk %s"
  
- #: ../audit2allow/audit2allow:195
+ #: ../semanage/seobject.py:1076
+-#, fuzzy
+ msgid "Requires setype, serange or seuser"
+-msgstr "Ralat Pilihan s s"
++msgstr "Memerlukan setype, serange atau seuser"
+ 
+ #: ../semanage/seobject.py:1086
+ #: ../semanage/seobject.py:1125
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.30.26/po/sv.po
+--- nsapolicycoreutils/po/sv.po	2006-08-03 11:22:26.000000000 -0400
++++ policycoreutils-1.30.26/po/sv.po	2006-08-12 13:15:21.000000000 -0400
+@@ -2,7 +2,7 @@
+ # Copyright (C) 2006 Christian Rose.
+ # Christian Rose <menthos at menthos.com>, 2006.
+ #
+-# $Id$
++# $Id$
+ #
  msgid ""
- "\n"
- "******************** IMPORTANT ***********************\n"
  msgstr ""
-+"\n"
-+"********************* VIKTIGT ************************\n"
-+
-+msgid "******************** IMPORTANT ***********************\n"
-+msgstr "********************* VIKTIGT ************************\n"
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.30.26/po/zh_TW.po
+--- nsapolicycoreutils/po/zh_TW.po	2006-08-01 09:47:27.000000000 -0400
++++ policycoreutils-1.30.26/po/zh_TW.po	2006-08-12 13:15:21.000000000 -0400
+@@ -34,7 +34,7 @@
+ #: ../newrole/newrole.c:201 ../run_init/run_init.c:126
+ #, c-format
+ msgid "failed to initialize PAM\n"
+-msgstr "????????? PAM ??????\n"
++msgstr "????????? PAM ??????\n"
  
- #: ../audit2allow/audit2allow:196
+ #: ../newrole/newrole.c:212
  #, c-format
-@@ -938,4 +1007,7 @@
- #: ../audit2allow/audit2allow:203
+@@ -113,7 +113,7 @@
+ #: ../newrole/newrole.c:527
  #, c-format
- msgid "Options Error: %s "
+ msgid "Couldn't get default type.\n"
 -msgstr ""
-+msgstr "Flaggfel: %s "
-+
-+msgid "Options Error: %s"
-+msgstr "Flaggfel: %s"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-1.30.22/po/ta.po
---- nsapolicycoreutils/po/ta.po	2006-08-01 09:47:27.000000000 -0400
-+++ policycoreutils-1.30.22/po/ta.po	2006-08-02 14:25:00.000000000 -0400
-@@ -8,14 +8,14 @@
- "Project-Id-Version: ta\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-05-26 13:48-0400\n"
--"PO-Revision-Date: 2006-05-10 18:00+0530\n"
-+"PO-Revision-Date: 2006-08-02 10:19+0530\n"
- "Last-Translator: Felix <ifelix at redhat.com>\n"
- "Language-Team: Tamil <ta at li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "X-Generator: KBabel 1.9.1\n"
--"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-+"Plural-Forms: nplurals=2; plural=(n != 1);\n\n"
- "\n"
- 
- #: ../load_policy/load_policy.c:22
-@@ -361,42 +361,40 @@
- msgstr "chcat -l +CompanyConfidential juser"
++msgstr "???????????????????????????\n"
  
- #: ../semanage/semanage:122
--#, fuzzy
- msgid "Requires 2 or more arguments"
--msgstr "?????????????????????????????? ?????????????????? ??????????????????????????? ??????????????????????????????????????????"
-+msgstr "2 ?????????????????? ?????????????????? ???????????? ?????????????????????????????????????????? ??????????????????????????????????????????"
- 
- #: ../semanage/semanage:127
--#, fuzzy, c-format
-+#, c-format
- msgid "%s not defined"
--msgstr "???????????? %s/%s ?????????????????????????????????????????????????????????"
-+msgstr "%s ?????????????????????????????????????????????????????????"
+ #: ../newrole/newrole.c:549
+ #, c-format
+@@ -128,7 +128,7 @@
+ #: ../newrole/newrole.c:586
+ #, c-format
+ msgid "cannot find your entry in the passwd file.\n"
+-msgstr ""
++msgstr "??? passwd ?????????????????????????????????\n"
  
- #: ../semanage/semanage:151
--#, fuzzy, c-format
-+#, c-format
- msgid "%s not valid for %s objects\n"
--msgstr "%s ?????????????????? ??????????????? ???????????????\n"
-+msgstr "%s ?????????????????? %s ??????????????????????????????????????? ??????????????????????????????\n"
+ #: ../newrole/newrole.c:596
+ #, c-format
+@@ -259,7 +259,7 @@
+ #: ../run_init/run_init.c:295
+ #, c-format
+ msgid "Could not open file %s\n"
+-msgstr ""
++msgstr "???????????? %s ??????\n"
  
- #: ../semanage/semanage:178 ../semanage/semanage:186
--#, fuzzy
- msgid "range not supported on Non MLS machines"
--msgstr "non-MLS ?????????????????????????????? ???????????????????????????????????? ????????????????????????"
-+msgstr "Non MLS ?????????????????????????????? ?????????????????????????????? ??????????????????????????????"
+ #: ../run_init/run_init.c:322
+ #, c-format
+@@ -278,7 +278,7 @@
  
- #: ../semanage/semanage:244
- msgid "You must specify a role"
+ #: ../scripts/chcat:70 ../scripts/chcat:140
+ msgid "Requires at least one category"
 -msgstr ""
-+msgstr "????????????????????? ????????? ????????????????????? ??????????????????????????? ????????????????????????"
++msgstr "????????????????????????"
  
- #: ../semanage/semanage:246
- msgid "You must specify a prefix"
+ #: ../scripts/chcat:84 ../scripts/chcat:154
+ #, c-format
+@@ -465,17 +465,17 @@
+ #: ../semanage/seobject.py:256 ../semanage/seobject.py:438
+ #, python-format
+ msgid "Could not set name for %s"
 -msgstr ""
-+msgstr "????????????????????? ????????? ???????????????????????????????????? ??????????????????????????? ????????????????????????"
++msgstr "????????? %s ????????????"
  
- #: ../semanage/semanage:295
--#, fuzzy, c-format
-+#, c-format
- msgid "Options Error %s "
--msgstr "???????????????????????????????????? ????????????: %s "
-+msgstr "???????????????????????????????????? ???????????? %s "
- 
- #: ../semanage/semanage:299
--#, fuzzy, c-format
-+#, c-format
- msgid "Invalid value %s"
--msgstr "??????????????? ???????????? '%s' "
-+msgstr "??????????????? ????????????????????? %s"
- 
- #: ../semanage/seobject.py:124
- msgid "translations not supported on non-MLS machines"
-@@ -405,8 +403,7 @@
- #: ../semanage/seobject.py:131
+ #: ../semanage/seobject.py:261 ../semanage/seobject.py:448
  #, python-format
- msgid "Unable to open %s: translations not supported on non-MLS machines"
+ msgid "Could not set MLS range for %s"
 -msgstr ""
--"%s??? ?????????????????? ?????????????????????????????????: MLS ??????????????? ?????????????????????????????? ??????????????????????????????????????????????????? ???????????? ?????????????????????????????????"
-+msgstr "%s??? ?????????????????? ?????????????????????????????????: MLS ??????????????? ?????????????????????????????? ??????????????????????????????????????????????????? ???????????? ?????????????????????????????????"
++msgstr "????????? %s ?????? MLS ??????"
  
- #: ../semanage/seobject.py:171 ../semanage/seobject.py:185
+ #: ../semanage/seobject.py:265
  #, python-format
-@@ -972,3 +969,4 @@
- #, c-format
- msgid "Options Error: %s "
- msgstr "???????????????????????????????????? ????????????: %s "
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.22/restorecond/restorecond.c
---- nsapolicycoreutils/restorecond/restorecond.c	2006-08-01 09:47:23.000000000 -0400
-+++ policycoreutils-1.30.22/restorecond/restorecond.c	2006-08-02 14:22:10.000000000 -0400
-@@ -436,9 +436,14 @@
- 	/* Make sure we are root */
- 	if (getuid() != 0) {
- 		fprintf(stderr, "You must be root to run this program.\n");
--		return 4;
-+		return 1;
- 	}
- #endif
-+	/* Make sure we are root */
-+	if (is_selinux_enabled() != 1) {
-+		fprintf(stderr, "Daemon requires SELinux be enabled to run.\n");
-+		return 1;
-+	}
- 
- 	/* Register sighandlers */
- 	sa.sa_flags = 0;
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30.22/restorecond/restorecond.init
---- nsapolicycoreutils/restorecond/restorecond.init	2006-05-15 09:42:57.000000000 -0400
-+++ policycoreutils-1.30.22/restorecond/restorecond.init	2006-08-02 14:23:49.000000000 -0400
-@@ -11,6 +11,8 @@
- # Source function library.
- . /etc/rc.d/init.d/functions
- 
-+[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 0
-+
- start() 
- {
-         echo -n $"Starting restorecond: "
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.22/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2006-07-03 07:52:42.000000000 -0400
-+++ policycoreutils-1.30.22/scripts/fixfiles	2006-08-02 14:22:10.000000000 -0400
-@@ -234,7 +234,7 @@
- # Make sure they specified one of the three valid commands
- #
- case "$command" in
--    restore) restore -p -q ;;
-+    restore) restore -p ;;
-     check) restore -n -v ;;
-     relabel) relabel;;
-     *)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.22/scripts/genhomedircon
---- nsapolicycoreutils/scripts/genhomedircon	2006-08-01 09:47:23.000000000 -0400
-+++ policycoreutils-1.30.22/scripts/genhomedircon	2006-08-02 14:43:21.000000000 -0400
-@@ -346,7 +346,7 @@
- 
- if os.getuid() > 0 or os.geteuid() > 0:
- 	print _("You must be root to run %s.") % sys.argv[0]
--	sys.exit(0)
-+	sys.exit(1)
+ msgid "Could not set SELinux user for %s"
+-msgstr ""
++msgstr "????????? %s ?????? SELinux ?????????"
  
+ #: ../semanage/seobject.py:269 ../semanage/seobject.py:321
+ #: ../semanage/seobject.py:359 ../semanage/seobject.py:463
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.26/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2006-08-03 11:22:26.000000000 -0400
++++ policycoreutils-1.30.26/scripts/fixfiles	2006-08-12 13:13:55.000000000 -0400
+@@ -48,7 +48,7 @@
+ # Log to either syslog or a LOGFILE
  #
- # This script will generate home dir file context
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule_deps/Makefile policycoreutils-1.30.22/semodule_deps/Makefile
---- nsapolicycoreutils/semodule_deps/Makefile	2006-08-01 09:47:23.000000000 -0400
-+++ policycoreutils-1.30.22/semodule_deps/Makefile	2006-08-02 14:33:29.000000000 -0400
-@@ -17,6 +17,7 @@
- 	-mkdir -p $(BINDIR)
- 	install -m 755 semodule_deps $(BINDIR)
- 	test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8
-+	install -m 644 semodule_deps.8 $(MANDIR)/man8/
- 
- relabel:
- 
+ logit () {
+-if [ -z $LOGFILE ]; then
++if [ ! -z $LOGFILE ]; then
+     echo $1 >> $LOGFILE
+ fi
+ }


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- policycoreutils.spec	6 Aug 2006 00:18:20 -0000	1.300
+++ policycoreutils.spec	12 Aug 2006 17:16:45 -0000	1.301
@@ -1,14 +1,15 @@
 %define libauditver 1.1.4-3
 %define libsepolver 1.12.23-1
-%define libsemanagever 1.6.13-1
-%define libselinuxver 1.30.22-1
+%define libsemanagever 1.6.15-1
+%define libselinuxver 1.30.26-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.30.25
+Version: 1.30.26
 Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
+Patch: policycoreutils-rhat.patch
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel gettext
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -117,6 +119,12 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Sat Aug 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.26-1
+- Update to upstream
+	* Merged semanage local file contexts patch from Chris PeBenito.
+- Fix fixfiles log creation
+- More translations
+
 * Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 1.30.25-1
 - Update to upstream
 	* Merged patch from Dan Walsh with:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- sources	6 Aug 2006 00:18:20 -0000	1.121
+++ sources	12 Aug 2006 17:16:45 -0000	1.122
@@ -1 +1 @@
-963bc94e0c1bbe0008e509135ec4fdf5  policycoreutils-1.30.25.tgz
+d403659413ccab1ae91eba2dc3d847e2  policycoreutils-1.30.26.tgz



From fedora-cvs-commits at redhat.com  Sat Aug 12 17:25:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 13:25:02 -0400
Subject: rpms/cairo-java/devel .cvsignore, 1.9, 1.10 cairo-java.spec, 1.36,
	1.37 sources, 1.11,
	1.12 cairo-java-1.0.0-autogen-aclocal.patch, 1.1, NONE
Message-ID: <200608121725.k7CHP2Bu012913@cvs.devel.redhat.com>

Author: skasal

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

Modified Files:
	.cvsignore cairo-java.spec sources 
Removed Files:
	cairo-java-1.0.0-autogen-aclocal.patch 
Log Message:
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel subpackage.
- The -devel subpackage now requires several -devel packages.
- Do not require gtk2; cairo+fontconfig is enough.  The same for BuildReqs.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	17 Jun 2006 16:54:12 -0000	1.9
+++ .cvsignore	12 Aug 2006 17:25:00 -0000	1.10
@@ -1 +1 @@
-cairo-java-1.0.4.tar.bz2
+cairo-java-1.0.5.tar.bz2


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cairo-java.spec	23 Jul 2006 01:14:57 -0000	1.36
+++ cairo-java.spec	12 Aug 2006 17:25:00 -0000	1.37
@@ -14,21 +14,22 @@
 
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	1.0.4
-Release: 	2
+Version:	1.0.5
+Release: 	1%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
 Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/1.0/%{name_base}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Requires:	%{java_pkg_prefix}gtk2 >= 2.8.0
+Requires:	fontconfig >= 2.3.1
 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
+Requires: 	%{java_pkg_prefix}glib-java >= 0.2.6
+BuildRequires:	%{java_pkg_prefix}glib-java-devel >= 0.2.6
+BuildRequires:	fontconfig-devel >= 2.3.1
+BuildRequires:	cairo-devel >= 1.0.0
+BuildRequires:	gcc-java >= 3.3.3
 BuildRequires:	docbook-utils
-BuildRequires:	java-1.4.2-gcj-compat >= 1.4.2
 BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2
 
 %description
@@ -39,6 +40,9 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	cairo-devel
+Requires:	fontconfig-devel
+Requires:	glib-java-devel
 
 %description    devel
 Compressed Java source for %{name}. This is useful if you are developing
@@ -56,7 +60,7 @@
 fi
 
 %configure
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -71,7 +75,7 @@
 %install
 rm -rf %{buildroot}
 
-make  DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # rename doc dir to reflect package rename, if the names differ
@@ -102,15 +106,23 @@
 %doc doc/api AUTHORS ChangeLog COPYING INSTALL README NEWS 
 %{_libdir}/*so* 
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 
 %changelog
+* Sat Aug 12 2006 Stepan Kasal <skasal at redhat.com> - 1.0.5-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel subpackage.
+- The -devel subpackage now requires several -devel packages.
+- Do not require gtk2; cairo+fontconfig is enough.  The same for BuildReqs.
+
 * Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.0.4-2
 - Bump release number. (dist-fc6-java)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Jun 2006 16:54:12 -0000	1.11
+++ sources	12 Aug 2006 17:25:00 -0000	1.12
@@ -1 +1 @@
-a10528654e52b5f22d7e80d74029be98  cairo-java-1.0.4.tar.bz2
+2e532ab7d4afe681cfec3b70132d7a80  cairo-java-1.0.5.tar.bz2


--- cairo-java-1.0.0-autogen-aclocal.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Aug 12 17:31:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 13:31:25 -0400
Subject: rpms/glib-java/FC-5 .cvsignore, 1.10, 1.11 glib-java.spec, 1.33,
	1.34 sources, 1.10, 1.11
Message-ID: <200608121731.k7CHVP8i013024@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13010

Modified Files:
	.cvsignore glib-java.spec sources 
Log Message:
- New upstream version.
- Do use %{?dist} after all.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel package.
- The -devel package now requires glib2-devel.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Jul 2006 14:42:12 -0000	1.10
+++ .cvsignore	12 Aug 2006 17:31:22 -0000	1.11
@@ -1 +1 @@
-glib-java-0.2.5.tar.bz2
+glib-java-0.2.6.tar.bz2


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/glib-java.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- glib-java.spec	12 Jul 2006 14:30:50 -0000	1.33
+++ glib-java.spec	12 Aug 2006 17:31:22 -0000	1.34
@@ -14,8 +14,8 @@
 %define name_base glib-java
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
-Version:   0.2.5
-Release:   0.fc5.2
+Version:   0.2.6
+Release:   1%{?dist}
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 License:   LGPL
@@ -36,11 +36,10 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
-
+Development part of %{name}.
 
 
 %prep
@@ -62,7 +61,7 @@
 sed -i 's/^pic_flag=\"\"/pic_flag=\"\ \-fPIC\"/' libtool
 sed -i 's/^compiler_c_o=\"no\"/compiler_c_o=\"yes\"/' libtool
 
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -77,7 +76,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make  DESTDIR=$RPM_BUILD_ROOT  install 
+make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name}' ] ; then
@@ -106,21 +105,31 @@
 %{_includedir}/%{name_base}/*
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 %dir %{_datadir}/%{name_base}
 %{_datadir}/%{name_base}/*
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Aug 11 2006 Stepan Kasal <skasal at redhat.com> - 0.2.6-1
+- New upstream version.
+- Do use %%{?dist} after all.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel package.
+- The -devel package now requires glib2-devel.
+
+* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.2.5-3
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-2
-- Do not use macro {?dist}.
+- Do not use %%{?dist}.
 
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-1
-- Release 0 is not allowed; use macro {?dist}.
+- Release 0 is not allowed; use %%{?dist}.
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.5-0.1
 - rebuild


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Jul 2006 14:42:12 -0000	1.10
+++ sources	12 Aug 2006 17:31:22 -0000	1.11
@@ -1 +1 @@
-83d49e96f6bc806aead66b83be542ef0  glib-java-0.2.5.tar.bz2
+80aa32ba4901ed92a1ef8a53fd9157e5  glib-java-0.2.6.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 21:53:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 17:53:59 -0400
Subject: rpms/gnome-menus/devel .cvsignore, 1.14, 1.15 gnome-menus.spec, 1.35,
	1.36 sources, 1.14, 1.15
Message-ID: <200608122153.k7CLrxVC013967@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.15.91




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	3 Aug 2006 14:13:07 -0000	1.14
+++ .cvsignore	12 Aug 2006 21:53:56 -0000	1.15
@@ -1 +1 @@
-gnome-menus-2.15.90.tar.bz2
+gnome-menus-2.15.91.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-menus.spec	3 Aug 2006 14:13:07 -0000	1.35
+++ gnome-menus.spec	12 Aug 2006 21:53:56 -0000	1.36
@@ -6,7 +6,7 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.15.90
+Version: 2.15.91
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -91,6 +91,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Thu Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Aug 2006 14:13:07 -0000	1.14
+++ sources	12 Aug 2006 21:53:56 -0000	1.15
@@ -1 +1 @@
-e3c0e6bb376ad250aae6fb99b06f94be  gnome-menus-2.15.90.tar.bz2
+73d412a2fe3fac9a10eb10753ea0b6ac  gnome-menus-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 22:02:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 18:02:05 -0400
Subject: rpms/nautilus/devel nautilus.spec,1.115,1.116
Message-ID: <200608122202.k7CM25fB016439@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16402

Modified Files:
	nautilus.spec 
Log Message:
fix #202322



Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- nautilus.spec	10 Aug 2006 14:39:05 -0000	1.115
+++ nautilus.spec	12 Aug 2006 22:02:00 -0000	1.116
@@ -23,7 +23,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
 Version: 	2.15.91
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -76,8 +76,6 @@
 
 Obsoletes:      nautilus-extras
 Obsoletes:      nautilus-suggested
-Obsoletes:      nautilus-devel
-Provides:       nautilus-devel
 Obsoletes:      nautilus-mozilla < 2.0
 Obsoletes:      nautilus-media
 
@@ -199,7 +197,10 @@
 %{_libdir}/*.so
 
 %changelog
-* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-1
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-2.fc6
+- Don't Provide/Obsolete nautilus-devel from the main package (#202322)
+
+* Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 - Split package into devel and extensions (#201967)
 



From fedora-cvs-commits at redhat.com  Sat Aug 12 22:08:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 18:08:30 -0400
Subject: rpms/cvs/FC-5 cvs-1.11.21-sort.patch, NONE,
	1.1 cvs-1.11.22-free.patch, NONE, 1.1 cvs.sh, 1.1,
	1.2 cvs.spec, 1.43, 1.44
Message-ID: <200608122208.k7CM8Uoc017732@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	cvs.sh cvs.spec 
Added Files:
	cvs-1.11.21-sort.patch cvs-1.11.22-free.patch 
Log Message:
- added fixes from devel:
  fix for #196848 - double free coruption
  fix for #189858 - /etc/profile.d/cvs.sh overwrite personal settings
  fix for #190009 - rcs2log uses obsolete sort option
  fix for #196259 - added LFS support


cvs-1.11.21-sort.patch:
 rcs2log.sh |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE cvs-1.11.21-sort.patch ---
--- cvs-1.11.21/contrib/rcs2log.sh.old	2005-08-02 22:46:43.000000000 +0200
+++ cvs-1.11.21/contrib/rcs2log.sh	2006-05-09 11:49:10.000000000 +0200
@@ -68,6 +68,9 @@
 For more information about these matters, see the files named COPYING.
 Author: Paul Eggert <eggert at twinsun.com>'
 
+# set old environment for sort (bug #190009)
+export _POSIX2_VERSION=199209
+
 # functions
 @MKTEMP_SH_FUNCTION@
 

cvs-1.11.22-free.patch:
 login.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cvs-1.11.22-free.patch ---
--- cvs-1.11.22/src/login.c.old	2006-06-28 13:41:14.000000000 +0200
+++ cvs-1.11.22/src/login.c	2006-06-28 13:35:40.000000000 +0200
@@ -600,7 +600,7 @@
        context, then assume they have supplied the correct, scrambled
        password. */
     if (cvs_password)
-	return cvs_password;
+	return xstrdup(cvs_password);
 
     if (getenv ("CVS_PASSWORD") != NULL)
     {


Index: cvs.sh
===================================================================
RCS file: /cvs/dist/rpms/cvs/FC-5/cvs.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvs.sh	14 Dec 2005 15:45:08 -0000	1.1
+++ cvs.sh	12 Aug 2006 22:08:28 -0000	1.2
@@ -1,2 +1,2 @@
 # change default from rsh to ssh for cvs command
-export CVS_RSH=ssh
\ No newline at end of file
+export CVS_RSH=${CVS_RSH-ssh}
\ No newline at end of file


Index: cvs.spec
===================================================================
RCS file: /cvs/dist/rpms/cvs/FC-5/cvs.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cvs.spec	12 Jun 2006 08:14:23 -0000	1.43
+++ cvs.spec	12 Aug 2006 22:08:28 -0000	1.44
@@ -4,7 +4,7 @@
 Summary: A version control system.
 Name: cvs
 Version: 1.11.22
-Release: 1.FC5
+Release: 2.FC5
 License: GPL
 Group: Development/Tools
 Source0: https://ccvs.cvshome.org/files/documents/19/192/cvs-%{version}.tar.bz2
@@ -26,6 +26,8 @@
 Patch12: cvs-1.11.21-pam.patch
 Patch13: cvs-1.11.21-diff.patch
 Patch14: cvs-1.11.21-diff-kk.patch
+Patch15: cvs-1.11.21-sort.patch
+Patch16: cvs-1.11.22-free.patch
 Prereq: /sbin/install-info
 Requires: vim-minimal
 Prefix: %{_prefix}
@@ -71,6 +73,9 @@
 
 %patch13 -p1 -b .diff
 %patch14 -p1 -b .diff-kk
+%patch15 -p1 -b .env
+%patch16 -p1 -b .free
+
 
 # Apply a patch to the generated files, OR
 # run autoreconf and require autoconf >= 2.58, automake >= 1.7.9
@@ -88,7 +93,7 @@
 %{!?nokerberos:CPPFLAGS=-I${k5prefix}/include/kerberosIV; export CPPFLAGS}
 %{!?nokerberos:CFLAGS=-I${k5prefix}/include/kerberosIV; export CFLAGS}
 %{!?nokerberos:LIBS="-lkrb4 -ldes425 -lk5crypto"; export LIBS}
-%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS" $PAM_CONFIG \
+%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" $PAM_CONFIG \
 %{!?nokerberos: --with-gssapi --with-krb4 --enable-encryption}
 
 make
@@ -139,6 +144,13 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Sat Aug 13 2006 Martin Stransky <stransky at redhat.com> 1.11.22-2.FC5
+- added fixes from devel:
+  fix for #196848 - double free coruption
+  fix for #189858 - /etc/profile.d/cvs.sh overwrite personal settings
+  fix for #190009 - rcs2log uses obsolete sort option  
+  fix for #196259 - added LFS support
+
 * Mon Jun 12 2006 Martin Stransky <stransky at redhat.com> 1.11.22-1.FC5
 - new upstream
 



From fedora-cvs-commits at redhat.com  Sat Aug 12 22:31:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 18:31:19 -0400
Subject: rpms/libgnomeui/devel .cvsignore, 1.29, 1.30 libgnomeui.spec, 1.53,
	1.54 sources, 1.29, 1.30
Message-ID: <200608122231.k7CMVJoo007229@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7122

Modified Files:
	.cvsignore libgnomeui.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	3 Aug 2006 18:10:17 -0000	1.29
+++ .cvsignore	12 Aug 2006 22:31:15 -0000	1.30
@@ -1,2 +1,3 @@
 libgnomeui-2.15.90.tar.bz2
 doc.tar.gz
+libgnomeui-2.15.91.tar.bz2


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- libgnomeui.spec	3 Aug 2006 18:10:17 -0000	1.53
+++ libgnomeui.spec	12 Aug 2006 22:31:15 -0000	1.54
@@ -17,13 +17,12 @@
 
 Summary: GNOME base GUI library
 Name: libgnomeui
-Version: 2.15.90
+Version: 2.15.91
 Release: 1%{?dist}
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
-# 2.15.90 shipped without docs
+# 2.15.91 shipped without docs
 Source1: doc.tar.gz
-Patch0: libgnomeui-2.15.2-undead-code.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -123,8 +122,6 @@
 
 tar xzf %{SOURCE1}
 
-%patch0 -p1 -b .undead-code
-
 %build
 %configure --disable-gtk-doc
 export tagname=CC
@@ -170,6 +167,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	3 Aug 2006 18:10:17 -0000	1.29
+++ sources	12 Aug 2006 22:31:15 -0000	1.30
@@ -1,2 +1,2 @@
-8da68a3e49d2af4ab61518f79420cc3b  libgnomeui-2.15.90.tar.bz2
 823754e5a363dd4831f4d3b443c78451  doc.tar.gz
+3996d0fda40e4f2f22d6dd4751a84ccd  libgnomeui-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 22:38:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 18:38:08 -0400
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.33,
	1.34 gnome-system-monitor.spec, 1.56, 1.57 sources, 1.33, 1.34
Message-ID: <200608122238.k7CMc8du008932@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8888

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	4 Aug 2006 05:43:28 -0000	1.33
+++ .cvsignore	12 Aug 2006 22:38:05 -0000	1.34
@@ -1 +1 @@
-gnome-system-monitor-2.15.90.tar.bz2
+gnome-system-monitor-2.15.91.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-system-monitor.spec	4 Aug 2006 05:51:02 -0000	1.56
+++ gnome-system-monitor.spec	12 Aug 2006 22:38:06 -0000	1.57
@@ -10,7 +10,7 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.15.90
+Version: 2.15.91
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -95,6 +95,9 @@
 %{_datadir}/omf
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	4 Aug 2006 05:43:28 -0000	1.33
+++ sources	12 Aug 2006 22:38:06 -0000	1.34
@@ -1 +1 @@
-5db589b63f0d08fff52920bd0a27473e  gnome-system-monitor-2.15.90.tar.bz2
+370b64f3b543390592058e39a64c91e7  gnome-system-monitor-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 22:43:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 18:43:33 -0400
Subject: rpms/kernel/devel/scripts rebase-xen-kernel.sh,NONE,1.1
Message-ID: <200608122243.k7CMhX7m010034@cvs.devel.redhat.com>

Author: quintela

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

Added Files:
	rebase-xen-kernel.sh 
Log Message:
this should prevent getting wrong xen patches (famous last words)


--- NEW FILE rebase-xen-kernel.sh ---
#!/bin/bash

# you are supposed to have both linux-2.6 "upstream tree"
# and linux-2.6-xen-fedora mercurial updated against that tree

set -x

if [ ! -d linux-2.6 ]; then
    echo "linux-2.6 directory don't exist";
    exit 1
fi

if [ ! -d linux-2.6-xen-fedora/ ]; then
    echo "linux-2.6-xen-fedora directory don't exist";
    exit 1
fi

/usr/bin/diff -urNp --exclude=".hg*" --exclude="*.orig" --exclude="*~" \
    linux-2.6/ linux-2.6-xen-fedora/ > linux-2.6-xen.patch


set +x

ls -lh linux-2.6-xen.patch



From fedora-cvs-commits at redhat.com  Sat Aug 12 22:51:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 18:51:49 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2557,
	1.2558 linux-2.6-xen.patch, 1.52, 1.53
Message-ID: <200608122251.k7CMpnKG027119@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
fix ia64 xen (and not xen)  compilation


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2557
retrieving revision 1.2558
diff -u -r1.2557 -r1.2558
--- kernel-2.6.spec	12 Aug 2006 08:51:52 -0000	1.2557
+++ kernel-2.6.spec	12 Aug 2006 22:51:45 -0000	1.2558
@@ -65,8 +65,7 @@
 %endif
 
 # Xen only builds on i686, x86_64 and ia64 ...
-#%ifnarch i686 x86_64 ia64
-%ifnarch i686 x86_64
+%ifnarch i686 x86_64 ia64
 %define buildxen 0
 %endif
 
@@ -1701,8 +1700,13 @@
 %endif
 
 %changelog
+* Sun Aug 13 2006 Juan Quintela <quintela at redhat.com>
+- enable ia64 xen again.
+- xen kernel-update linux-2.6-xen-fedora cset 35236:70890e6e4a72.
+  * fix ia64 compilation problems.
+
 * Sat Aug 12 2006 Juan Quintela <quintela at redhat.com>
-- disable ia64 xen, it does'nt compile.
+- disable ia64 xen, it doesn't compile.
 - xen HV update cset 11057:4ee64035c0a3
   (newer than that don't compile on ia64).
 - update linux-2.6-xen patch to fix sort_regions on ia64.

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   92 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1185 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1831 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  153 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  457 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  478 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  699 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  259 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  128 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  413 ++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  867 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2169 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   54 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1211 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1011 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  283 ++
 drivers/xen/Makefile                                |   19 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  616 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  567 ++++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  848 ++++++
 drivers/xen/blkfront/block.h                        |  154 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1444 ++++++++++
 drivers/xen/blktap/common.h                         |  119 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  180 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  869 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  441 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/reboot.c                           |  383 ++
 drivers/xen/core/skbuff.c                           |  140 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  138 
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1346 +++++++++
 drivers/xen/netback/xenbus.c                        |  428 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1842 +++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  457 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   84 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  358 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1089 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 drivers/xen/xenfb/Makefile                          |    1 
 drivers/xen/xenfb/xenfb.c                           |  568 ++++
 drivers/xen/xenkbd/Makefile                         |    1 
 drivers/xen/xenkbd/xenkbd.c                         |  205 +
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  219 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  508 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   41 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   39 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  190 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  114 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  326 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/linux/xenfb.h                               |   97 
 include/linux/xenkbd.h                              |   82 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  440 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  605 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  508 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  300 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  120 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 415 files changed, 87831 insertions(+), 217 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.52 -r 1.53 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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- linux-2.6-xen.patch	12 Aug 2006 00:43:35 -0000	1.52
+++ linux-2.6-xen.patch	12 Aug 2006 22:51:46 -0000	1.53
@@ -1,6 +1,6 @@
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/boot-xen/Makefile	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
+--- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +23,9 @@
 +	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig compiling/arch/i386/Kconfig
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig	2006-08-02 02:30:18.000000000 +0200
-+++ compiling/arch/i386/Kconfig	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
+--- linux-2.6/arch/i386/Kconfig	2006-08-01 06:44:38.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-08-02 18:15:29.000000000 +0200
 @@ -16,10 +16,12 @@ config X86_32
  
  config GENERIC_TIME
@@ -311,9 +311,9 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu compiling/arch/i386/Kconfig.cpu
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/Kconfig.cpu	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/Kconfig.cpu linux-2.6-xen-fedora/arch/i386/Kconfig.cpu
+--- linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-08-01 02:30:59.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -330,9 +330,9 @@
 -	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ
 +	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ && !X86_XEN
  	default y
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug compiling/arch/i386/Kconfig.debug
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/Kconfig.debug	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/Kconfig.debug linux-2.6-xen-fedora/arch/i386/Kconfig.debug
+--- linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-08-01 02:30:59.000000000 +0200
 @@ -2,6 +2,7 @@ menu "Kernel hacking"
  
  config TRACE_IRQFLAGS_SUPPORT
@@ -349,9 +349,9 @@
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c compiling/arch/i386/kernel/acpi/boot-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/acpi/boot-xen.c	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/acpi/boot-xen.c linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c
+--- linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-08-01 02:30:59.000000000 +0200
 @@ -0,0 +1,1168 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1521,9 +1521,9 @@
 +
 +	return 0;
 +}
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/Makefile compiling/arch/i386/kernel/acpi/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/acpi/Makefile	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/acpi/Makefile linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile
+--- linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1532,9 +1532,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/alternative.c compiling/arch/i386/kernel/alternative.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/alternative.c	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
+--- linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-01 02:30:59.000000000 +0200
 @@ -4,7 +4,11 @@
  #include <asm/alternative.h>
  #include <asm/sections.h>
@@ -1547,9 +1547,9 @@
  static int smp_alt_once      = 0;
  static int debug_alternative = 0;
  
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/apic-xen.c compiling/arch/i386/kernel/apic-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/apic-xen.c	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/apic-xen.c linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c
+--- linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-08-01 02:30:59.000000000 +0200
 @@ -0,0 +1,160 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1711,9 +1711,9 @@
 +
 +	return 0;
 +}
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/asm-offsets.c compiling/arch/i386/kernel/asm-offsets.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/asm-offsets.c	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/asm-offsets.c linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c
+--- linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-08-01 02:30:59.000000000 +0200
 @@ -66,9 +66,14 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
@@ -1730,9 +1730,9 @@
  
  	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
  	DEFINE(VDSO_PRELINK, VDSO_PRELINK);
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c compiling/arch/i386/kernel/cpu/common-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/cpu/common-xen.c	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/cpu/common-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c
+--- linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-08-03 22:52:02.000000000 +0200
 @@ -0,0 +1,740 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
@@ -2474,9 +2474,9 @@
 +	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
 +}
 +#endif
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/Makefile compiling/arch/i386/kernel/cpu/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/cpu/Makefile	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/cpu/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile
+--- linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2486,9 +2486,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c compiling/arch/i386/kernel/cpu/mtrr/main-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c
+--- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-08-01 02:31:00.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2687,9 +2687,9 @@
 +}
 +
 +subsys_initcall(mtrr_init);
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile compiling/arch/i386/kernel/cpu/mtrr/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/cpu/mtrr/Makefile	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile
+--- linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-08-01 02:30:59.000000000 +0200
 @@ -3,3 +3,10 @@ obj-y		+= amd.o
  obj-y		+= cyrix.o
  obj-y		+= centaur.o
@@ -2701,15 +2701,15 @@
 +obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c compiling/arch/i386/kernel/early_printk-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/early_printk-xen.c	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/early_printk-xen.c linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c
+--- linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-08-01 02:31:00.000000000 +0200
 @@ -0,0 +1,2 @@
 +
 +#include "../../x86_64/kernel/early_printk-xen.c"
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/entry.S compiling/arch/i386/kernel/entry.S
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/entry.S	2006-08-02 02:30:18.000000000 +0200
-+++ compiling/arch/i386/kernel/entry.S	2006-08-04 16:33:25.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/entry.S linux-2.6-xen-fedora/arch/i386/kernel/entry.S
+--- linux-2.6/arch/i386/kernel/entry.S	2006-08-01 06:44:38.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-08-02 18:15:29.000000000 +0200
 @@ -265,7 +265,7 @@ ENTRY(sysenter_entry)
  	CFI_STARTPROC simple
  	CFI_DEF_CFA esp, 0
@@ -2737,9 +2737,9 @@
  	pushfl;					\
  	pushl $__KERNEL_CS;			\
  	pushl $sysenter_past_esp
[...20090 lines suppressed...]
+--- linux-2.6/kernel/fork.c	2006-08-09 18:25:42.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/fork.c	2006-08-11 15:29:47.000000000 +0200
 @@ -275,6 +275,9 @@ static inline int dup_mmap(struct mm_str
  		if (retval)
  			goto out;
@@ -94224,9 +91332,9 @@
  	retval = 0;
  out:
  	up_write(&mm->mmap_sem);
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/kernel/Kconfig.preempt compiling/kernel/Kconfig.preempt
---- /mnt/ro/repos/hg/linux-2.6/kernel/Kconfig.preempt	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/kernel/Kconfig.preempt	2006-08-04 16:33:50.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/kernel/Kconfig.preempt linux-2.6-xen-fedora/kernel/Kconfig.preempt
+--- linux-2.6/kernel/Kconfig.preempt	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/Kconfig.preempt	2006-08-01 02:31:26.000000000 +0200
 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
  
  config PREEMPT
@@ -94235,9 +91343,9 @@
  	help
  	  This option reduces the latency of the kernel by making
  	  all kernel code (that is not executing in a critical section)
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug compiling/lib/Kconfig.debug
---- /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
-+++ compiling/lib/Kconfig.debug	2006-08-04 16:33:50.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/lib/Kconfig.debug linux-2.6-xen-fedora/lib/Kconfig.debug
+--- linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-08-02 18:15:30.000000000 +0200
 @@ -325,7 +325,7 @@ config FRAME_POINTER
  
  config UNWIND_INFO
@@ -94247,9 +91355,9 @@
  	depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
  	help
  	  If you say Y here the resulting kernel image will be slightly larger
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/lib/Makefile compiling/lib/Makefile
---- /mnt/ro/repos/hg/linux-2.6/lib/Makefile	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/lib/Makefile	2006-08-04 16:33:50.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/lib/Makefile linux-2.6-xen-fedora/lib/Makefile
+--- linux-2.6/lib/Makefile	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Makefile	2006-08-01 02:31:26.000000000 +0200
 @@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
  obj-$(CONFIG_SMP) += percpu_counter.o
  
@@ -94260,9 +91368,9 @@
  
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/highmem.c compiling/mm/highmem.c
---- /mnt/ro/repos/hg/linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/highmem.c	2006-08-04 16:33:50.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/highmem.c linux-2.6-xen-fedora/mm/highmem.c
+--- linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/highmem.c	2006-08-01 02:31:27.000000000 +0200
 @@ -142,6 +142,17 @@ start:
  	return vaddr;
  }
@@ -94281,9 +91389,9 @@
  void fastcall *kmap_high(struct page *page)
  {
  	unsigned long vaddr;
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/Kconfig compiling/mm/Kconfig
---- /mnt/ro/repos/hg/linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/Kconfig	2006-08-04 16:33:50.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/Kconfig linux-2.6-xen-fedora/mm/Kconfig
+--- linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/Kconfig	2006-08-01 02:31:27.000000000 +0200
 @@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
  # Default to 4 for wider testing, though 8 might be more appropriate.
  # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -94299,9 +91407,9 @@
  	default "4"
  
  #
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/memory.c compiling/mm/memory.c
---- /mnt/ro/repos/hg/linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
-+++ compiling/mm/memory.c	2006-08-11 21:39:06.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
+--- linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
++++ linux-2.6-xen-fedora/mm/memory.c	2006-08-12 00:05:06.000000000 +0200
 @@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
  	 * and that the resulting page looks ok.
  	 */
@@ -94450,9 +91558,9 @@
  /*
   * handle_pte_fault chooses page fault handler according to an entry
   * which was read non-atomically.  Before making any commitment, on
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/mmap.c compiling/mm/mmap.c
---- /mnt/ro/repos/hg/linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/mmap.c	2006-08-04 16:33:50.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/mmap.c linux-2.6-xen-fedora/mm/mmap.c
+--- linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/mmap.c	2006-08-01 02:31:27.000000000 +0200
 @@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
  	unsigned long nr_accounted = 0;
  	unsigned long end;
@@ -94464,9 +91572,9 @@
  	lru_add_drain();
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c compiling/mm/page_alloc.c
---- /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/page_alloc.c	2006-08-04 16:33:50.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/page_alloc.c linux-2.6-xen-fedora/mm/page_alloc.c
+--- linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-08-01 02:31:27.000000000 +0200
 @@ -443,7 +443,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -94487,9 +91595,9 @@
  
  	if (PageAnon(page))
  		page->mapping = NULL;
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/dev.c compiling/net/core/dev.c
---- /mnt/ro/repos/hg/linux-2.6/net/core/dev.c	2006-08-04 13:45:06.000000000 +0200
-+++ compiling/net/core/dev.c	2006-08-04 16:36:22.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
+--- linux-2.6/net/core/dev.c	2006-08-09 18:25:43.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/dev.c	2006-08-04 19:17:51.000000000 +0200
 @@ -117,6 +117,12 @@
  #include <linux/dmaengine.h>
  #include <linux/err.h>
@@ -94588,9 +91696,9 @@
  
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c compiling/net/core/skbuff.c
---- /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c	2006-08-04 13:45:06.000000000 +0200
-+++ compiling/net/core/skbuff.c	2006-08-04 16:36:22.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
+--- linux-2.6/net/core/skbuff.c	2006-08-09 18:25:43.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-04 19:17:51.000000000 +0200
 @@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -94677,9 +91785,9 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-08-04 16:33:51.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-08-01 02:31:27.000000000 +0200
 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -94694,9 +91802,9 @@
  					ip_nat_cheat_check(oldport ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c compiling/net/ipv4/netfilter/ip_nat_proto_udp.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-08-04 16:33:51.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-08-01 02:31:27.000000000 +0200
 @@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
@@ -94711,9 +91819,9 @@
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/xfrm4_output.c	2006-08-04 16:33:51.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/ipv4/xfrm4_output.c linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c
+--- linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-08-01 02:31:28.000000000 +0200
 @@ -18,6 +18,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
@@ -94734,9 +91842,9 @@
  	if (skb->ip_summed == CHECKSUM_HW) {
  		err = skb_checksum_help(skb, 0);
  		if (err)
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c	2006-08-04 13:45:06.000000000 +0200
-+++ compiling/net/ipv6/addrconf.c	2006-08-04 16:36:23.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
+--- linux-2.6/net/ipv6/addrconf.c	2006-08-09 18:25:43.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-08-04 19:17:51.000000000 +0200
 @@ -2514,6 +2514,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  
@@ -94753,9 +91861,9 @@
  	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
  		struct in6_addr all_routers;
  
-diff -urNp --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen compiling/scripts/Makefile.xen
---- /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/scripts/Makefile.xen	2006-08-04 16:33:52.000000000 +0200
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/scripts/Makefile.xen linux-2.6-xen-fedora/scripts/Makefile.xen
+--- linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-08-01 02:31:28.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)



From fedora-cvs-commits at redhat.com  Sat Aug 12 22:55:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 18:55:36 -0400
Subject: rpms/zenity/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 zenity.spec,
	1.13, 1.14
Message-ID: <200608122255.k7CMtanL028553@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/zenity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28489

Modified Files:
	.cvsignore sources zenity.spec 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Aug 2006 18:55:48 -0000	1.6
+++ .cvsignore	12 Aug 2006 22:55:33 -0000	1.7
@@ -1 +1 @@
-zenity-2.15.90.tar.bz2
+zenity-2.15.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Aug 2006 18:55:49 -0000	1.6
+++ sources	12 Aug 2006 22:55:33 -0000	1.7
@@ -1 +1 @@
-01ba5b78e7b9c09de1d7a391f3c62fa0  zenity-2.15.90.tar.bz2
+51f3d70e72c25c8c77275362e2fa45e9  zenity-2.15.91.tar.bz2


Index: zenity.spec
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zenity.spec	3 Aug 2006 18:55:49 -0000	1.13
+++ zenity.spec	12 Aug 2006 22:55:33 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           zenity
-Version:        2.15.90
+Version:        2.15.91
 Release:        1%{?dist}
 Summary: 	Display dialog boxes from shell scripts
 Group:  	Applications/System 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 



From fedora-cvs-commits at redhat.com  Sat Aug 12 23:26:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 19:26:02 -0400
Subject: rpms/eog/devel .cvsignore, 1.34, 1.35 eog.spec, 1.56, 1.57 sources,
	1.34, 1.35
Message-ID: <200608122326.k7CNQ20M023920@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23908

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	3 Aug 2006 02:18:00 -0000	1.34
+++ .cvsignore	12 Aug 2006 23:25:59 -0000	1.35
@@ -1 +1 @@
-eog-2.15.90.tar.bz2
+eog-2.15.91.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- eog.spec	3 Aug 2006 02:18:00 -0000	1.56
+++ eog.spec	12 Aug 2006 23:25:59 -0000	1.57
@@ -12,7 +12,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.15.90
+Version: 2.15.91
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
@@ -106,6 +106,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	3 Aug 2006 02:18:00 -0000	1.34
+++ sources	12 Aug 2006 23:25:59 -0000	1.35
@@ -1 +1 @@
-dbf8b439f84f5e326bb0ad110c3073a8  eog-2.15.90.tar.bz2
+fd6860e07df2f3ec50fec052c999a121  eog-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 12 23:46:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 19:46:05 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.39, 1.40 file-roller.spec, 1.67,
	1.68 sources, 1.40, 1.41
Message-ID: <200608122346.k7CNk5JH003948@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3528

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	3 Aug 2006 17:51:24 -0000	1.39
+++ .cvsignore	12 Aug 2006 23:46:02 -0000	1.40
@@ -1 +1 @@
-file-roller-2.15.90.tar.bz2
+file-roller-2.15.92.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- file-roller.spec	3 Aug 2006 17:51:24 -0000	1.67
+++ file-roller.spec	12 Aug 2006 23:46:02 -0000	1.68
@@ -10,17 +10,13 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.15.90
+Version:	2.15.92
 Release: 	1%{?dist}
 
 License:	GPL
 Group:		Applications/Archiving
 URL:		http://ftp.gnome.org/pub/gnome/sources/file-roller/
 Source:		file-roller-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=349333
-Patch0:		file-roller-2.15.1-recent.patch
-# already fixed in upstream
-Patch1:		file-roller-2.15.1-recent2.patch
 BuildRoot:	%{_tmppath}/file-roller-%{version}-root
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -54,8 +50,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .recent
-%patch1 -p1 -b .recent2
 
 %build
 autoconf
@@ -126,6 +120,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	3 Aug 2006 17:51:24 -0000	1.40
+++ sources	12 Aug 2006 23:46:02 -0000	1.41
@@ -1 +1 @@
-f51b05db9761532682ae3af4223e8a22  file-roller-2.15.90.tar.bz2
+3cedfcb791913bc090737783047759ce  file-roller-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 00:11:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 20:11:30 -0400
Subject: rpms/libgnome/devel .cvsignore, 1.25, 1.26 libgnome.spec, 1.63,
	1.64 sources, 1.25, 1.26
Message-ID: <200608130011.k7D0BUYx026016@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25953

Modified Files:
	.cvsignore libgnome.spec sources 
Log Message:
2.15.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	12 Jul 2006 19:17:27 -0000	1.25
+++ .cvsignore	13 Aug 2006 00:11:27 -0000	1.26
@@ -1 +1 @@
-libgnome-2.15.1.tar.bz2
+libgnome-2.15.2.tar.bz2


Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- libgnome.spec	28 Jul 2006 04:37:19 -0000	1.63
+++ libgnome.spec	13 Aug 2006 00:11:27 -0000	1.64
@@ -11,8 +11,8 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.15.1
-Release: 3%{?dist}
+Version: 2.15.2
+Release: 1%{?dist}
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -120,7 +120,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
 
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la}
 
 for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
@@ -154,13 +154,16 @@
 %files devel
 %defattr(-,root,root)
 
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 %{_datadir}/gtk-doc
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-1.fc6
+- Update to 2.15.2
+- Don't ship static libraries
+
 * Thu Jul 27 2006 Mike A. Harris <mharris at redhat.com> 2.15.1-3.fc6
 - Update utempter dependency and rebuild to ensure new libutempter is used.
 - Change BuildRoot to comply with Fedora packaging guidelines.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	12 Jul 2006 19:17:27 -0000	1.25
+++ sources	13 Aug 2006 00:11:27 -0000	1.26
@@ -1 +1 @@
-0f7c63d3cff2832758bd27339c1a9e5e  libgnome-2.15.1.tar.bz2
+d5c1ddddb347fc9de8d6cb3de185fa6a  libgnome-2.15.2.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 00:48:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 20:48:45 -0400
Subject: rpms/xerces-j2/devel xerces-j2-build.patch, 1.7, 1.8 xerces-j2.spec,
	1.45, 1.46
Message-ID: <200608130048.k7D0mjt9030993@cvs.devel.redhat.com>

Author: mwringe

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

Modified Files:
	xerces-j2-build.patch xerces-j2.spec 
Log Message:
- Merge with upstream version


xerces-j2-build.patch:
 build.xml |   46 ++++++----------------------------------------
 1 files changed, 6 insertions(+), 40 deletions(-)

Index: xerces-j2-build.patch
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2-build.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xerces-j2-build.patch	22 Feb 2006 23:24:57 -0000	1.7
+++ xerces-j2-build.patch	13 Aug 2006 00:48:41 -0000	1.8
@@ -1,5 +1,5 @@
---- build.xml.orig	2005-06-25 16:25:27.000000000 -0400
-+++ build.xml	2005-07-26 19:46:47.000000000 -0400
+--- build.xml.orig	2005-07-26 16:09:07.000000000 -0400
++++ build.xml	2006-08-11 17:57:09.000000000 -0400
 @@ -19,7 +19,8 @@
  <project default="usage" basedir=".">
  
@@ -64,7 +64,7 @@
             debug="${debug}"
             includeAntRuntime="false"
             includeJavaRuntime="true"/>
-@@ -354,7 +333,7 @@
+@@ -354,9 +333,10 @@
    <target name="docs" depends="prepare, prepare-docs">
      <echo message="Building docs for ${parser.Name} ${parser.Version} ..." />
      <java fork="yes"
@@ -72,8 +72,11 @@
 +          classpath="${java.class.path}:${doc.generator.package}:${tools.dir}/xalan.jar"
            classname="${doc.generator}"
            failOnError="yes">
++      <jvmarg value="-Djava.awt.headless=true"/>
        <arg value="targetDirectory=${build.docs}"/>
-@@ -997,20 +976,6 @@
+       <arg value="${build.dir}/xdocs/docs-book.xml"/>
+       <arg value="${build.dir}/xdocs/style"/>
+@@ -997,20 +977,6 @@
      <replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"
               token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>
   


Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xerces-j2.spec	22 Jul 2006 08:46:28 -0000	1.45
+++ xerces-j2.spec	13 Aug 2006 00:48:41 -0000	1.46
@@ -1,16 +1,47 @@
-%define name		xerces-j2
-%define version		2.7.1
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define cvs_version	2_7_1
-%define release 	6jpp_9fc
 %define section		free
 
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
+Name:		xerces-j2
+Version:	2.7.1
+Release:	7jpp.1
 Epoch:		0
 Summary:	Java XML parser
 License:	Apache Software License
-URL:		http://xml.apache.org/xerces2-j/
+URL:		http://xerces.apache.org/
 Group:		Text Processing/Markup/XML
 Source0:	http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.%{version}.tar.gz
 Source1:        %{name}-version.sh
@@ -18,24 +49,32 @@
 Source3:	XJavac.java
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-libgcj.patch
+Obsoletes:	xerces-j2-dom3
 Provides:	jaxp_parser_impl
-Requires:	xml-commons-apis
+Provides:	xerces-j2-dom3
+Requires:	xml-commons-apis >= 0:1.3
 Requires:	xml-commons-resolver >= 1.1
-Requires:	/usr/sbin/update-alternatives
 BuildRequires:	java-devel
-BuildRequires:	ant >= 0:1.5
-BuildRequires:	jpackage-utils >= 0:1.5
+BuildRequires:	ant >= 0:1.6
+BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	xml-commons-resolver >= 0:1.1
-BuildRequires:	xml-commons-apis
-BuildRequires:  coreutils
+BuildRequires:	xml-commons-apis >= 0:1.3
+# xml-stylbook is not yet in FC
+#BuildRequires:	xml-stylebook
+Requires(post): /usr/sbin/update-alternatives jaxp_parser_impl
+Requires(preun): /usr/sbin/update-alternatices jaxp_parser_impl
+
+%if ! %{gcj_support}
+BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-# RHEL3 and FC2
-Obsoletes:	xerces-j <= 0:2.2
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel >= 1.0.31
+Requires(post):		java-gcj-compat >= 1.0.31
+Requires(postun):	java-gcj-compat >= 1.0.31
+%endif
 
 %description
 Welcome to the future! Xerces2 is the next generation of high
@@ -60,7 +99,7 @@
 %package        javadoc-impl
 Summary:	Javadoc for %{name} implementation
 Group:		Development/Documentation
-Prereq: coreutils
+Requires(post): /bin/rm /bin/ln
 
 %description    javadoc-impl
 Javadoc for %{name} implementation.
@@ -68,7 +107,8 @@
 %package        javadoc-apis
 Summary:	Javadoc for %{name} apis
 Group:		Development/Documentation
-Prereq: coreutils
+Obsoletes:	xerces-j2-dom3-javadoc
+Requires(post): /bin/rm /bin/ln
 
 %description    javadoc-apis
 Javadoc for %{name} apis.
@@ -76,7 +116,7 @@
 %package        javadoc-xni
 Summary:	Javadoc for %{name} xni
 Group:		Development/Documentation
-Prereq: coreutils
+Requires(post): /bin/rm /bin/ln
 
 %description    javadoc-xni
 Javadoc for %{name} xni.
@@ -84,7 +124,7 @@
 %package        javadoc-other
 Summary:	Javadoc for other %{name} components
 Group:		Development/Documentation
-Prereq: coreutils
+Requires(post): /bin/rm /bin/ln
 
 %description    javadoc-other
 Javadoc for other %{name} components.
@@ -93,8 +133,12 @@
 Summary:	Demo for %{name}
 Group:		Development/Testing
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel >= 1.0.31
+Requires(post):		java-gcj-compat >= 1.0.31
+Requires(postun):	java-gcj-compat >= 1.0.31
+%endif
 
 %description    demo
 Demonstrations and samples for %{name}.
@@ -103,15 +147,14 @@
 Summary:        Additional utility scripts for %{name}
 Group:          Text Processing/Markup/XML
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:	jpackage-utils >= 0:1.5
+Requires:	jpackage-utils >= 0:1.6
 
 %description    scripts
 Additional utility scripts for %{name}.
 
-
 %prep
 %setup -q -n xerces-%{cvs_version}
-%patch0 -p0 -b .build
+%patch0 -b .build
 
 mkdir -p tools/org/apache/xerces/util
 cp -a %{SOURCE3} tools/org/apache/xerces/util
@@ -120,19 +163,23 @@
 
 %build
 pushd tools
-export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=/tmp"
 javac -classpath $(build-classpath ant) org/apache/xerces/util/XJavac.java
 mkdir bin && jar cf bin/xjavac.jar org/apache/xerces/util/XJavac.class
+ln -sf $(build-classpath xml-commons-apis) .
+ln -sf $(build-classpath xml-commons-resolver) .
 popd
 
-unset CLASSPATH
+%if ! %{gcj_support}
+export CLASSPATH=$(build-classpath xml-stylebook):tools/bin/xjavac.jar
+export ANT_OPTS="-Xmx256m -Djava.endorsed.dirs=$(pwd)/tools -Djava.awt.headless=true -Dbuild.sysclasspath=first -Ddisconnected=true"
+%endif
 ant \
 	-Dbuild.compiler=modern \
 	-Dtools.dir=%{_javadir} \
 	-Djar.apis=xml-commons-apis.jar \
 	-Djar.resolver=xml-commons-resolver.jar \
-	clean jars javadocs
-unset GCJ_PROPERTIES
+	clean jars javadocs sampjar
+	#docs cannot be built due missing xml-stylebook in FC
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -140,6 +187,7 @@
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p build/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *.jar; do ln -sf ${jar} dom3-${jar}; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
 # javadoc
@@ -180,14 +228,14 @@
 ln -s %{_sysconfdir}/alternatives \
   $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar
 
-aot-compile-rpm
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-rm -f %{_javadir}/xerces.jar
 
 %post javadoc-apis
 rm -f %{_javadocdir}/%{name}-apis
@@ -208,7 +256,13 @@
 %post
 update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
   jaxp_parser_impl %{_javadir}/%{name}.jar 40
-%{_bindir}/rebuild-gcj-db
+
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %preun
 {
@@ -217,21 +271,39 @@
 } >/dev/null 2>&1 || :
 
 %postun
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %post demo
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %postun demo
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE README ISSUES STATUS TODO
 %{_javadir}/%{name}*.jar
+%{_javadir}/dom3-%{name}*.jar
 %ghost %{_javadir}/jaxp_parser_impl.jar
-%dir %{_libdir}/gcj/%{name}
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+%endif
 
 %files javadoc-impl
 %defattr(0644,root,root,0755)
@@ -256,7 +328,10 @@
 %files demo
 %defattr(0644,root,root,0755)
 %{_datadir}/%{name}
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-samples.jar.*
+%endif
 
 %files scripts
 %defattr(0755,root,root,0755)
@@ -264,12 +339,28 @@
 
 
 %changelog
+* Sat Aug 12 2006 Matt Wringe <mwringe at redhat.com> 0:2.7.1-7jpp.1
+- Merge with upstream version
+
+* Sat Aug 12 2006 Matt Wringe <mwringe at redhat.com> 0:2.7.1-7jpp
+- Add conditional native compiling
+- Add missing requires for javadocs
+- Add missing requires for post and preun
+- Update version to 7jpp at Fedora's request
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.7.1-6jpp_9fc
 - Rebuilt
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.7.1-6jpp_8fc
 - rebuild
 
+* Thu Mar 30 2006 Fernando Nasser <fnasser at redhat.com> 0:2.7.1-3jpp
+- Add missing BR for xml-stylebook
+
+* Wed Mar 22 2006 Ralph Apel <r.apel at r-apel.de> 0:2.7.1-2jpp
+- First JPP-1.7 release
+- use tools subdir and give it as java.endorsed.dirs (for java-1.4.2-bea e.g.)
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:2.7.1-6jpp_7fc
 - stop scriptlet spew
 
@@ -294,6 +385,13 @@
 * Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 
+* Fri Oct 07 2005 Ralph Apel <r.apel at r-apel.de> 0:2.7.1-1jpp
+- Upgrade to 2.7.1
+
+* Thu Jul 21 2005 Ralph Apel <r.apel at r-apel.de> 0:2.6.2-7jpp
+- Include target jars-dom3
+- Create new subpackage dom3
+
 * Mon Jul 18 2005 Gary Benson <gbenson at redhat.com> 0:2.6.2-5jpp_2fc
 - Build on ia64, ppc64, s390 and s390x.
 - Switch to aot-compile-rpm (also BC-compiles samples).



From fedora-cvs-commits at redhat.com  Sun Aug 13 01:31:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 21:31:33 -0400
Subject: rpms/file-roller/devel file-roller.spec,1.68,1.69
Message-ID: <200608130131.k7D1VX5g028384@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28323

Modified Files:
	file-roller.spec 
Log Message:
fix build reqs



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- file-roller.spec	12 Aug 2006 23:46:02 -0000	1.68
+++ file-roller.spec	13 Aug 2006 01:31:28 -0000	1.69
@@ -25,7 +25,7 @@
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui_version}
 BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
-BuildRequires: nautilus >= %{nautilus_version}
+BuildRequires: nautilus-devel >= %{nautilus_version}
 BuildRequires: libtool
 BuildRequires: autoconf
 BuildRequires: gettext
@@ -122,6 +122,7 @@
 %changelog
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92
+- BR nautilus-devel
 
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90



From fedora-cvs-commits at redhat.com  Sun Aug 13 01:41:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 21:41:33 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.47, 1.48 gnome-utils.spec,
	1.125, 1.126 sources, 1.51, 1.52
Message-ID: <200608130141.k7D1fUx3030800@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	4 Aug 2006 03:36:04 -0000	1.47
+++ .cvsignore	13 Aug 2006 01:41:27 -0000	1.48
@@ -1 +1 @@
-gnome-utils-2.15.90.tar.bz2
+gnome-utils-2.15.92.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gnome-utils.spec	4 Aug 2006 04:45:20 -0000	1.125
+++ gnome-utils.spec	13 Aug 2006 01:41:27 -0000	1.126
@@ -9,7 +9,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.15.90
+Version:        2.15.92
 Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
@@ -122,9 +122,6 @@
   --copy-generic-name-to-name				    \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-baobab.desktop
 
-sed -i -e "s/Icon=logviewer/Icon=system-logviewer/" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-log.desktop
-  
 %find_lang gnome-utils-2.0
 
 
@@ -229,6 +226,9 @@
 
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	4 Aug 2006 03:36:04 -0000	1.51
+++ sources	13 Aug 2006 01:41:27 -0000	1.52
@@ -1 +1 @@
-357c86a994503f9ba74d2c96345555d9  gnome-utils-2.15.90.tar.bz2
+44b7f544e88dd48d8a6d51b61969ac67  gnome-utils-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 01:47:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 21:47:09 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.143,1.144
Message-ID: <200608130147.k7D1l9en010056@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	redhat-artwork.spec 
Log Message:
fix gnome-system-log icon



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- redhat-artwork.spec	11 Aug 2006 20:23:10 -0000	1.143
+++ redhat-artwork.spec	13 Aug 2006 01:47:06 -0000	1.144
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 5.0.0
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -133,6 +133,7 @@
       ln -sf redhat-filemanager.png kfm.png
       ln -sf redhat-home.png kfm_home.png
       ln -sf redhat-logviewer.png kviewshell.png
+      ln -sf system-logviewer.png logviewer.png
       # system settings
       ln -sf system-config-soundcard.png multimedia.png
     popd
@@ -169,6 +170,9 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 5.0.0-2.fc6
+- Link system-logviewer.png to logviewer.png
+
 * Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 5.0.0-1
 - woops 5 is less than 245.
 - update to 5.0.0



From fedora-cvs-commits at redhat.com  Sun Aug 13 02:29:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 22:29:41 -0400
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.36,
	1.37 nautilus-cd-burner.spec, 1.69, 1.70 sources, 1.36, 1.37
Message-ID: <200608130229.k7D2TfJv013092@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13077

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.15.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	4 Aug 2006 17:28:56 -0000	1.36
+++ .cvsignore	13 Aug 2006 02:29:39 -0000	1.37
@@ -1 +1 @@
-nautilus-cd-burner-2.15.5.tar.bz2
+nautilus-cd-burner-2.15.6.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- nautilus-cd-burner.spec	4 Aug 2006 17:28:56 -0000	1.69
+++ nautilus-cd-burner.spec	13 Aug 2006 02:29:39 -0000	1.70
@@ -1,9 +1,8 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.15.5
+Version: 2.15.6
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
-Patch0: nautilus-cd-burner-2.15.4-dbus-disconnect.patch
 License: LGPL/GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -25,8 +24,7 @@
 BuildRequires: gnome-mount-devel
 # Fix hal-devel not requiring dbus-devel for the moment
 BuildRequires: dbus-devel >= 0.60
-# need nautilus-extensions
-BuildRequires: nautilus >= 2.5.4
+BuildRequires: nautilus-devel >= 2.5.4
 BuildRequires: gnome-mount >= 0.4
 
 %description
@@ -46,7 +44,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dbus-disconnect
 
 %build
 %configure --enable-hal --enable-gnome-mount
@@ -102,6 +99,7 @@
 %{_libexecdir}/mapping-daemon
 %{_datadir}/nautilus-cd-burner
 %{_datadir}/applications/nautilus-cd-burner.desktop
+%{_datadir}/applications/nautilus-cd-burner-open-iso.desktop
 %{_datadir}/icons/hicolor
 
 %files devel
@@ -112,6 +110,9 @@
 
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.6-1.fc6
+- Update to 2.15.6
+
 * Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.5-1.fc6
 - Update to 2.15.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	4 Aug 2006 17:28:56 -0000	1.36
+++ sources	13 Aug 2006 02:29:39 -0000	1.37
@@ -1 +1 @@
-ed2887cef0675e8b3ef7b9cdeb1bc9e8  nautilus-cd-burner-2.15.5.tar.bz2
+63494c0547d70b3397f8f52f08956c78  nautilus-cd-burner-2.15.6.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 03:04:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 23:04:39 -0400
Subject: rpms/libbonobo/devel .cvsignore, 1.17, 1.18 libbonobo.spec, 1.46,
	1.47 sources, 1.17, 1.18
Message-ID: <200608130304.k7D34dXT013279@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13234

Modified Files:
	.cvsignore libbonobo.spec sources 
Log Message:
2.15.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	12 Jul 2006 21:44:06 -0000	1.17
+++ .cvsignore	13 Aug 2006 03:04:24 -0000	1.18
@@ -1 +1 @@
-libbonobo-2.15.0.tar.bz2
+libbonobo-2.15.2.tar.bz2


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libbonobo.spec	11 Aug 2006 14:35:10 -0000	1.46
+++ libbonobo.spec	13 Aug 2006 03:04:24 -0000	1.47
@@ -5,8 +5,8 @@
 
 Summary: Bonobo component system
 Name: libbonobo
-Version: 2.15.0
-Release: 3
+Version: 2.15.2
+Release: 1%{?dist}
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -120,6 +120,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1.fc6
+- Update to 2.15.2
+
 * Fri Aug 11 2006 Alexander Larsson <alexl at redhat.com> - 2.15.0-3
 - Add patch to close fds when activating component (#200477)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	12 Jul 2006 21:44:06 -0000	1.17
+++ sources	13 Aug 2006 03:04:24 -0000	1.18
@@ -1 +1 @@
-efa3d7697e2cb4b529059dde720d62b3  libbonobo-2.15.0.tar.bz2
+814c615847dcef1f823f1070295575c0  libbonobo-2.15.2.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 03:13:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 23:13:00 -0400
Subject: rpms/gnome-nettool/devel .cvsignore, 1.5, 1.6 gnome-nettool.spec,
	1.18, 1.19 sources, 1.5, 1.6
Message-ID: <200608130313.k7D3D0p8015110@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-nettool.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jun 2006 22:21:00 -0000	1.5
+++ .cvsignore	13 Aug 2006 03:12:57 -0000	1.6
@@ -1 +1 @@
-gnome-nettool-2.15.0.tar.bz2
+gnome-nettool-2.15.91.tar.bz2


Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-nettool.spec	12 Jul 2006 06:00:58 -0000	1.18
+++ gnome-nettool.spec	13 Aug 2006 03:12:57 -0000	1.19
@@ -5,8 +5,8 @@
 
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
-Version: 2.15.0 
-Release: 1.1
+Version: 2.15.91
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -70,6 +70,10 @@
 %postun
 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +89,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.0-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jun 2006 22:21:00 -0000	1.5
+++ sources	13 Aug 2006 03:12:57 -0000	1.6
@@ -1 +1 @@
-ef2769bec8b0462c94b6a0ba39e6f0d4  gnome-nettool-2.15.0.tar.bz2
+17b9a9dc7cf7c3a2748a09d341c19265  gnome-nettool-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 03:44:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 12 Aug 2006 23:44:02 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.42, 1.43 gnome-games.spec, 1.86,
	1.87 sources, 1.45, 1.46
Message-ID: <200608130344.k7D3i2nd007397@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.15.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	3 Aug 2006 14:24:30 -0000	1.42
+++ .cvsignore	13 Aug 2006 03:44:00 -0000	1.43
@@ -12,3 +12,4 @@
 gnome-games-2.15.3.tar.bz2
 gnome-games-2.15.4.tar.bz2
 gnome-games-2.15.5.tar.bz2
+gnome-games-2.15.6.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- gnome-games.spec	3 Aug 2006 14:41:36 -0000	1.86
+++ gnome-games.spec	13 Aug 2006 03:44:00 -0000	1.87
@@ -3,6 +3,20 @@
 %define build_card 1
 %define build_tali 1
 
+%if %{build_card}
+%define sol_schemas aisleriot.schemas
+%define bj_schemas blackjack.schemas
+%else
+%define sol_schemas %{nil}
+%define bj_schemas %{nil}
+%endif
+
+%if %{build_tali}
+%define gtali_schemas gtali.schemas
+%else
+%define gtali_schemas %{nil}
+%endif
+
 %define glib2_version 2.12.0
 %define pango_version 1.8.0
 %define gtk2_version 2.6.0
@@ -13,7 +27,7 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.15.5
+Version: 2.15.6
 Release: 1%{?dist}
 Epoch: 1
 License: LGPL
@@ -168,20 +182,6 @@
 %post
 scrollkeeper-update -q
 
-%if %{build_card}
-%define sol_schemas aisleriot.schemas
-%define bj_schemas blackjack.schemas
-%else
-%define sol_schemas %{nil}
-%define bj_schemas %{nil}
-%endif
-
-%if %{build_tali}
-%define gtali_schemas gtali.schemas
-%else
-%define gtali_schemas %{nil}
-%endif
-
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 (cd %{_sysconfdir}/gconf/schemas;   \
 gconftool-2 --makefile-install-rule \
@@ -208,6 +208,30 @@
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  (cd %{_sysconfdir}/gconf/schemas;   \
+  gconftool-2 --makefile-uninstall-rule \
+	%{sol_schemas}              \
+	%{bj_schemas}               \
+	gataxx.schemas              \
+	glines.schemas              \
+	gnect.schemas               \
+	gnibbles.schemas            \
+	gnobots2.schemas            \
+	gnometris.schemas           \
+	gnomine.schemas             \
+	gnotravex.schemas           \
+	gnotski.schemas             \
+	gtali.schemas               \
+	iagno.schemas               \
+	libgnomegames.schemas       \
+	mahjongg.schemas            \
+	same-gnome.schemas          \
+> /dev/null)
+fi
+
 %postun
 scrollkeeper-update -q
 touch %{_datadir}/icons/hicolor
@@ -284,6 +308,9 @@
 
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.6-1.fc6
+- Update to 2.15.6
+
 * Thu Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.5-1.fc6
 - Update to 2.15.5
 - Bump glib requirement (#197566)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	3 Aug 2006 14:24:30 -0000	1.45
+++ sources	13 Aug 2006 03:44:00 -0000	1.46
@@ -1,2 +1,2 @@
 01464739e83449288c6a58685604f86e  gnome-games-extra-data-2.14.0.tar.bz2
-a8dae17f465b280610a22896877d8037  gnome-games-2.15.5.tar.bz2
+358aab0ae7d4e92a21a1cd18eddb6523  gnome-games-2.15.6.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 04:06:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 00:06:09 -0400
Subject: rpms/gnome-session/devel gnome-session-2.15.90-window-manager.patch,
	1.2, 1.3 gnome-session.spec, 1.80, 1.81
Message-ID: <200608130406.k7D469tN029257@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-session-2.15.90-window-manager.patch gnome-session.spec 
Log Message:
- fix window manager launching script. Patch from 
  Tim Vismor <tvismor at acm.org> (bug 202312)


gnome-session-2.15.90-window-manager.patch:
 gnome-session.schemas.in |   13 ++++++++++++-
 gnome-wm                 |   17 +++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

Index: gnome-session-2.15.90-window-manager.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session-2.15.90-window-manager.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-session-2.15.90-window-manager.patch	11 Aug 2006 20:06:25 -0000	1.2
+++ gnome-session-2.15.90-window-manager.patch	13 Aug 2006 04:06:03 -0000	1.3
@@ -48,7 +48,7 @@
  OLDIFS=$IFS
  IFS=":"
  if [ -z "$WINDOW_MANAGER" ] ; then
-@@ -67,11 +73,17 @@ fi
+@@ -67,11 +73,18 @@ fi
  # Now create options OPT1 and OPT2 based on the windowmanager used
  OPT1=
  OPT2=
@@ -63,6 +63,7 @@
 +      OPT1=--sm-client-id
 +      OPT2=$SMID
 +      OPT3=gconf
++      ;;
      openbox)
        OPT1=--sm-client-id
        OPT2=$SMID


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gnome-session.spec	11 Aug 2006 20:06:25 -0000	1.80
+++ gnome-session.spec	13 Aug 2006 04:06:03 -0000	1.81
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.15.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -167,6 +167,10 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Sun Aug 13 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-4.fc6
+- fix window manager launching script. Patch from 
+  Tim Vismor <tvismor at acm.org> (bug 202312)
+
 * Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-3.fc6
 - start gnome-window-decorator and pass "gconf" when invoking
   compiz



From fedora-cvs-commits at redhat.com  Sun Aug 13 04:13:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 00:13:37 -0400
Subject: rpms/libbonoboui/devel libbonoboui-2.15.0-about.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 libbonoboui.spec, 1.41,
	1.42 sources, 1.21, 1.22
Message-ID: <200608130413.k7D4DbTC030607@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbonoboui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30544

Modified Files:
	.cvsignore libbonoboui.spec sources 
Added Files:
	libbonoboui-2.15.0-about.patch 
Log Message:
2.15.0


libbonoboui-2.15.0-about.patch:
 window.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE libbonoboui-2.15.0-about.patch ---
--- libbonoboui-2.15.0/tools/browser/window.c.about	2006-04-03 09:43:39.000000000 -0400
+++ libbonoboui-2.15.0/tools/browser/window.c	2006-08-13 00:05:47.000000000 -0400
@@ -195,26 +195,25 @@
 static void
 verb_HelpAbout (BonoboUIComponent *uic, void *data, const char *path)
 {
-#if 0
+	BonoboWindow *window = (BonoboWindow *) data;
+
 	static const gchar *authors[] = {
 		"Dan Siemon <dan at coverfire.com>",
 		"Rodrigo Moya <rodrigo at gnome-db.org>",
 		"Patanjali Somayaji <patanjali at morelinux.com>",
 		NULL
 	};
-	GtkWidget *about;
 
-	gtk_show_about_dialog (GTK_WINDOW (about),
+	gtk_show_about_dialog (GTK_WINDOW (window),
 		      "name", _("Bonobo Browser"),
 		      "version", VERSION,
 		      "copyright", _("Copyright 2001, The GNOME Foundation"),
 		      "comments", _("Bonobo component browser"),
 		      "authors", authors,
 		      "documenters", NULL,
-		      "translation-credits", _("translation-credits"),
+		      "translator-credits", _("translator-credits"),
 		      "logo-icon-name", "gtk-about",
 		      NULL);
-#endif
 }
 
 /*


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libbonoboui/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Mar 2006 20:50:13 -0000	1.20
+++ .cvsignore	13 Aug 2006 04:13:32 -0000	1.21
@@ -1 +1 @@
-libbonoboui-2.14.0.tar.bz2
+libbonoboui-2.15.0.tar.bz2


Index: libbonoboui.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libbonoboui.spec	12 Jul 2006 06:46:21 -0000	1.41
+++ libbonoboui.spec	13 Aug 2006 04:13:32 -0000	1.42
@@ -13,10 +13,11 @@
 
 Summary: Bonobo user interface components
 Name: libbonoboui
-Version: 2.14.0
-Release: 3.1
+Version: 2.15.0
+Release: 1%{?dist}
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
+Patch0: libbonoboui-2.15.0-about.patch
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -76,6 +77,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .about
 
 %build
 
@@ -88,8 +90,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT ## LIBTOOL=/usr/bin/libtool
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/bonobo-browser.desktop
 
 for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
@@ -113,14 +115,12 @@
 
 %{_libdir}/lib*.so.*
 %{_libdir}/libglade/2.0/*.so
-%{_libdir}/libglade/2.0/*.la
 %{_libdir}/bonobo
 %{_datadir}/gnome-2.0
 
 %files devel
 %defattr(-,root,root)
 
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
@@ -129,6 +129,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.0-1.fc6
+- Update to 2.15.0
+- Don't ship static libraries and .la files
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libbonoboui/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	14 Mar 2006 20:50:13 -0000	1.21
+++ sources	13 Aug 2006 04:13:32 -0000	1.22
@@ -1 +1 @@
-dc26dc17cddc625cac37ecfab263a51a  libbonoboui-2.14.0.tar.bz2
+ba8adebbbb6136bc1dbb0e9b4d70395b  libbonoboui-2.15.0.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 04:41:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 00:41:21 -0400
Subject: rpms/gnome-applets/devel .cvsignore, 1.41, 1.42 gnome-applets.spec,
	1.163, 1.164 sources, 1.42, 1.43
Message-ID: <200608130441.k7D4fLr7017925@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	4 Aug 2006 02:17:51 -0000	1.41
+++ .cvsignore	13 Aug 2006 04:41:12 -0000	1.42
@@ -4,3 +4,4 @@
 gnome-applets-2.14.2.tar.bz2
 gnome-applets-2.15.1.1.tar.bz2
 gnome-applets-2.15.2.tar.bz2
+gnome-applets-2.15.3.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gnome-applets.spec	8 Aug 2006 21:24:24 -0000	1.163
+++ gnome-applets.spec	13 Aug 2006 04:41:14 -0000	1.164
@@ -29,8 +29,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
-Version: 	2.15.2
-Release:  	4%{?dist}
+Version: 	2.15.3
+Release:  	1%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -43,7 +43,6 @@
 Patch10:	gnome-applets-2.15.1.1-invest.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
-Patch12:	gnome-applets-2.15.2-multiload.patch
 Patch13:        gnome-applets-2.15.1.1-destroy-on-close.patch
 
 URL:		http://www.gnome.org/
@@ -122,7 +121,6 @@
 %patch4 -p1 -b .cpufreq
 %patch10 -p1 -b .invest
 %patch11 -p1 -b .dont-require-display
-%patch12 -p1 -b .multiload
 %patch13 -p1 -b .destroy-on-close
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
@@ -257,6 +255,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.3-1.fc6
+- Update to 2.15.3
+
 * Tue Aug  8 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.2-4.fc6
 - destroy about dialog on close (bug 197975)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	4 Aug 2006 02:17:51 -0000	1.42
+++ sources	13 Aug 2006 04:41:16 -0000	1.43
@@ -1,2 +1,3 @@
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
 f7693a0780fe4b288c62c25d410395a9  gnome-applets-2.15.2.tar.bz2
+88814125b056b32d7d34b8ac75cfbf7e  gnome-applets-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 05:49:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 01:49:59 -0400
Subject: rpms/control-center/devel .cvsignore, 1.44, 1.45 control-center.spec,
	1.164, 1.165 sources, 1.47, 1.48
Message-ID: <200608130549.k7D5nx3j030758@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30647

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	4 Aug 2006 17:20:16 -0000	1.44
+++ .cvsignore	13 Aug 2006 05:49:56 -0000	1.45
@@ -1 +1 @@
-control-center-2.15.90.tar.bz2
+control-center-2.15.91.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- control-center.spec	7 Aug 2006 12:18:22 -0000	1.164
+++ control-center.spec	13 Aug 2006 05:49:56 -0000	1.165
@@ -20,8 +20,8 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.15.90
-Release: 4%{?dist}
+Version: 2.15.91
+Release: 1%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -37,7 +37,6 @@
 Patch9: control-center-2.15.4-add-dbus-flags.patch
 # Dobey being unreasonable again
 Patch10: control-center-2.15.4-finish.patch
-Patch11: control-center-2.15.90-newapi.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -132,7 +131,6 @@
 %patch7 -p1 -b .gecos
 %patch9 -p1 -b .add-dbus-flags
 %patch10 -p1 -b .finish
-%patch11 -p1 -b .newapi
 
 %build
 
@@ -201,16 +199,33 @@
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps_gnome_settings_daemon_default_editor.schemas apps_gnome_settings_daemon_keybindings.schemas apps_gnome_settings_daemon_screensaver.schemas apps_gnome_settings_daemon_power_manager.schemas desktop_gnome_font_rendering.schemas desktop_gnome_peripherals_keyboard_xkb.schemas fontilus.schemas themus.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/apps_gnome_settings_daemon_default_editor.schemas  \
+   %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
+   %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
+   %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_power_manager.schemas \ 
+   %{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
+   %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas \
+   %{_sysconfdir}/gconf/schemas/fontilus.schemas themus.schemas >& /dev/null
 update-desktop-database --quiet %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas  \
+     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
+     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
+     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_power_manager.schemas \ 
+     %{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
+     %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas \
+     %{_sysconfdir}/gconf/schemas/fontilus.schemas themus.schemas >& /dev/null
+fi
+
 %postun
 /sbin/ldconfig
 update-desktop-database --quiet %{_datadir}/applications
@@ -251,6 +266,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+- Update to 2.15.91
+
 * Mon Aug 07 2006 Karsten Hopp <karsten at redhat.com> 2.15.90-4
 - add fix for new libebook api
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	4 Aug 2006 17:20:16 -0000	1.47
+++ sources	13 Aug 2006 05:49:56 -0000	1.48
@@ -1 +1 @@
-e0864dc5e354064599a9ea50e155c0b8  control-center-2.15.90.tar.bz2
+693c4462a39a1d95530be75fc6813a31  control-center-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 06:02:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 02:02:52 -0400
Subject: rpms/fedora-logos/devel fedora-logos.spec,1.35,1.36
Message-ID: <200608130602.k7D62qaq002973@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2606

Modified Files:
	fedora-logos.spec 
Log Message:
fix panel menubar links



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- fedora-logos.spec	28 Jul 2006 18:16:35 -0000	1.35
+++ fedora-logos.spec	13 Aug 2006 06:02:49 -0000	1.36
@@ -1,7 +1,7 @@
 Name: fedora-logos
-Summary: Red Hat-related icons and pictures.
+Summary: Red Hat-related icons and pictures
 Version: 1.1.47
-Release: 1
+Release: 2
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 License: Copyright ? 1999-2006 Red Hat, Inc.  All rights reserved.
@@ -95,6 +95,7 @@
     ln -s ../../../hicolor/$size/apps/fedora-logo-icon.png gnome-main-menu.png
     ln -s ../../../hicolor/$size/apps/fedora-logo-icon.png kmenu.png
     ln -s ../../../hicolor/$size/apps/fedora-logo-icon.png gnome-logo-icon-transparent.png
+    ln -s ../../../hicolor/$size/apps/fedora-logo-icon.png start-here.png
     popd
   done
 done
@@ -147,6 +148,9 @@
 # end i386 bits
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.1.47-2.fc6
+- Add links for new icon name used in the gnome-panel menubar
+
 * Fri Jul 28 2006 John (J5) Palmieri <johnp at redhat.com> - 1.1.47-1
 - Add a 4:3 aspect ratio background 
 - Fix extention to be .jpg on backgrounds 



From fedora-cvs-commits at redhat.com  Sun Aug 13 06:06:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 02:06:37 -0400
Subject: rpms/gnome-panel/devel
	gnome-panel-2.15.91-transparent-systray.patch, NONE,
	1.1 .cvsignore, 1.43, 1.44 gnome-panel.spec, 1.141,
	1.142 sources, 1.43, 1.44 transparent-systray.patch, 1.1, 1.2
Message-ID: <200608130606.k7D66b0i004307@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-panel.spec sources transparent-systray.patch 
Added Files:
	gnome-panel-2.15.91-transparent-systray.patch 
Log Message:
2.15.91


gnome-panel-2.15.91-transparent-systray.patch:
 main.c            |   38 ++++++++++++++++++++++++++++++++++++++
 na-tray-manager.c |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

--- NEW FILE gnome-panel-2.15.91-transparent-systray.patch ---
--- gnome-panel-2.15.91/applets/notification_area/na-tray-manager.c.transparent-systray	2006-07-28 17:52:02.000000000 -0400
+++ gnome-panel-2.15.91/applets/notification_area/na-tray-manager.c	2006-08-13 01:13:43.000000000 -0400
@@ -293,6 +293,37 @@
   return FALSE;
 }
 
+static gboolean
+transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
+{
+  gdk_window_clear_area (widget->window, event->area.x, event->area.y,
+			 event->area.width, event->area.height);
+  return FALSE;
+}
+
+static void
+make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
+			gpointer user_data)
+{
+  g_print("make transparent again\n");
+  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+}
+
+static void
+make_transparent (GtkWidget *widget, gpointer user_data)
+{
+  if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
+    return;
+
+  gtk_widget_set_app_paintable (widget, TRUE);
+  gtk_widget_set_double_buffered (widget, FALSE);
+  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+  g_signal_connect (widget, "expose_event",
+		    G_CALLBACK (transparent_expose_event), NULL);
+  g_signal_connect_after (widget, "style_set",
+			  G_CALLBACK (make_transparent_again), NULL);
+}
+
 static void
 na_tray_manager_handle_dock_request (NaTrayManager       *manager,
 				     XClientMessageEvent *xevent)
@@ -308,6 +339,8 @@
     }
   
   socket = gtk_socket_new ();
+  g_signal_connect (socket, "realize",
+		    G_CALLBACK (make_transparent), NULL);
   
   /* We need to set the child window here
    * so that the client can call _get functions
--- gnome-panel-2.15.91/applets/notification_area/main.c.transparent-systray	2006-08-07 19:49:57.000000000 -0400
+++ gnome-panel-2.15.91/applets/notification_area/main.c	2006-08-13 01:16:09.000000000 -0400
@@ -164,13 +164,23 @@
 
   gtk_box_pack_end (GTK_BOX (tray->box), icon, FALSE, FALSE, 0);
   
+  gtk_widget_hide (tray->box);
   gtk_widget_show (icon);
+  gtk_widget_show (tray->box);
 }
 
 static void
 tray_removed (NaTrayManager *manager, GtkWidget *icon, void *data)
 {
+  SystemTray *tray;
 
+  if (all_trays == NULL)
+    return;
+  
+  tray = all_trays->data;
+
+  gtk_widget_hide (tray->box);
+  gtk_widget_show (tray->box);
 }
 
 static void
@@ -211,9 +221,32 @@
       gtk_widget_set_size_request (tray->box, -1, MIN_BOX_SIZE);
       break;
     }
+
+  /* Force the icons to redraw their backgrounds.
+   * gtk_widget_queue_draw() doesn't work across process boundaries,
+   * so we do this instead.
+   */
+  gtk_widget_hide (tray->box);
+  gtk_widget_show (tray->box);
 }
 
 static void
+applet_change_background (PanelApplet               *applet,
+                          PanelAppletBackgroundType  type,
+                          GdkColor                  *color,
+                          GdkPixmap                 *pixmap,
+			  SystemTray                *tray)
+{
+  /* Force the icons to redraw their backgrounds.
+   * gtk_widget_queue_draw() doesn't work across process boundaries,
+   * so we do this instead.
+   */
+  gtk_widget_hide (tray->box);
+  gtk_widget_show (tray->box);
+}
+
+
+static void
 applet_change_orientation (PanelApplet       *applet,
                            PanelAppletOrient  orient,
                            SystemTray        *tray)
@@ -338,6 +371,11 @@
                     G_CALLBACK (applet_change_orientation),
                     tray);
 
+  g_signal_connect (G_OBJECT (tray->applet),
+                    "change_background",
+                    G_CALLBACK (applet_change_background),
+                    tray);
+
   g_signal_connect (tray->applet,
                     "destroy",
                     G_CALLBACK (applet_destroy),


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	4 Aug 2006 17:44:48 -0000	1.43
+++ .cvsignore	13 Aug 2006 06:06:32 -0000	1.44
@@ -1 +1 @@
-gnome-panel-2.15.90.tar.bz2
+gnome-panel-2.15.91.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- gnome-panel.spec	9 Aug 2006 06:27:19 -0000	1.141
+++ gnome-panel.spec	13 Aug 2006 06:06:34 -0000	1.142
@@ -19,8 +19,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.15.90
-Release: 5%{?dist} 
+Version: 2.15.91
+Release: 1%{?dist} 
 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
@@ -71,14 +71,13 @@
 
 Patch0: gnome-panel-2.12.1-vendor.patch
 Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch4: gnome-panel-2.13.2-rename-system-menu.patch
 Patch5: gnome-panel-2.12.1-about-fedora.patch
 Patch6: gnome-panel-2.13.5-switch-user.patch
 Patch8: gnome-panel-2.13.90-use-beagle.patch
 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
 Patch10: gnome-panel-2.14.1-remove-duplicate-entry.patch
 # support transparent background in the notification area
-Patch11: transparent-systray.patch
+Patch11: gnome-panel-2.15.91-transparent-systray.patch
 Patch12: gnome-panel-2.14.2-xio-error.patch
 Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch
 Patch14: gnome-panel-2.15.90-fix-double-free.patch
@@ -106,7 +105,6 @@
 
 %patch0 -p1 -b .vendor
 %patch2 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch4 -p1 -b .rename-system-menu
 %patch5 -p1 -b .about-fedora
 %patch6 -p1 -b .switch-user
 %patch8 -p1 -b .use-beagle
@@ -231,6 +229,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Wed Aug  9 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-5
 - remove suspend from logout dialog
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	4 Aug 2006 17:44:48 -0000	1.43
+++ sources	13 Aug 2006 06:06:34 -0000	1.44
@@ -1 +1 @@
-e3e7d3924fdfea18131b26fd3b321cbd  gnome-panel-2.15.90.tar.bz2
+c65487c43ed633ceb026f9b98115114d  gnome-panel-2.15.91.tar.bz2

transparent-systray.patch:
 main.c            |   40 +++++++++++++++++++++++++++++++++++++++-
 na-tray-manager.c |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 1 deletion(-)

Index: transparent-systray.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/transparent-systray.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- transparent-systray.patch	20 Jun 2006 00:04:31 -0000	1.1
+++ transparent-systray.patch	13 Aug 2006 06:06:34 -0000	1.2
@@ -1,5 +1,5 @@
---- gnome-panel-2.14.2/applets/notification_area/eggtraymanager.c.transparent-systray	2006-06-19 19:13:52.000000000 -0400
-+++ gnome-panel-2.14.2/applets/notification_area/eggtraymanager.c	2006-06-19 19:14:10.000000000 -0400
+--- gnome-panel-2.14.2/applets/notification_area/na-tray-manager.c.transparent-systray	2006-06-19 19:13:52.000000000 -0400
++++ gnome-panel-2.14.2/applets/notification_area/na-tray-manager.c	2006-06-19 19:14:10.000000000 -0400
 @@ -291,6 +291,37 @@
    return FALSE;
  }
@@ -36,7 +36,7 @@
 +}
 +
  static void
- egg_tray_manager_handle_dock_request (EggTrayManager       *manager,
+ na_tray_manager_handle_dock_request (EggTrayManager       *manager,
  				      XClientMessageEvent  *xevent)
 @@ -306,6 +337,8 @@
      }



From fedora-cvs-commits at redhat.com  Sun Aug 13 06:25:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 02:25:58 -0400
Subject: rpms/control-center/devel control-center.spec,1.165,1.166
Message-ID: <200608130625.k7D6PwCE025258@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25171

Modified Files:
	control-center.spec 
Log Message:
fix build reqs



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- control-center.spec	13 Aug 2006 05:49:56 -0000	1.165
+++ control-center.spec	13 Aug 2006 06:25:53 -0000	1.166
@@ -75,7 +75,7 @@
 BuildRequires: libxklavier-devel >= %{libxklavier_version}
 BuildRequires: libXcursor-devel
 BuildRequires: alsa-lib-devel
-BuildRequires: nautilus
+BuildRequires: nautilus-devel
 BuildRequires: eel2-devel
 BuildRequires: gettext
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
@@ -138,7 +138,7 @@
 
 # work around a gstreamer problem where it doesn't find
 # plugins the first time around
-/usr/bin/gst-inspect-0.10 --print-all
+/usr/bin/gst-inspect-0.10 --print-all >& /dev/null
 
 # Add -Wno-error to silence gswitchit
 %configure --disable-gstreamer --enable-alsa CFLAGS="$RPM_OPT_FLAGS -Wno-error" --enable-aboutme --disable-scrollkeeper



From fedora-cvs-commits at redhat.com  Sun Aug 13 06:31:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 02:31:35 -0400
Subject: rpms/gnome-desktop/devel .cvsignore, 1.34, 1.35 gnome-desktop.spec,
	1.62, 1.63 sources, 1.34, 1.35
Message-ID: <200608130631.k7D6VYhe027039@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	4 Aug 2006 01:56:32 -0000	1.34
+++ .cvsignore	13 Aug 2006 06:31:29 -0000	1.35
@@ -1 +1 @@
-gnome-desktop-2.15.90.tar.bz2
+gnome-desktop-2.15.91.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gnome-desktop.spec	4 Aug 2006 01:59:47 -0000	1.62
+++ gnome-desktop.spec	13 Aug 2006 06:31:29 -0000	1.63
@@ -11,7 +11,7 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
-Version: 2.15.90
+Version: 2.15.91
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
@@ -132,6 +132,9 @@
 %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15-90-1.fc6
 - Update to 2.15.90
 - Don't ship static libraries


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	4 Aug 2006 01:56:32 -0000	1.34
+++ sources	13 Aug 2006 06:31:29 -0000	1.35
@@ -1 +1 @@
-73296a341779037ca62a82a736bcabe7  gnome-desktop-2.15.90.tar.bz2
+a8bc45533d775ffce3b3760a185703d2  gnome-desktop-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 06:55:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 02:55:43 -0400
Subject: rpms/epiphany/devel .cvsignore, 1.43, 1.44 epiphany.spec, 1.112,
	1.113 sources, 1.44, 1.45
Message-ID: <200608130655.k7D6thQm015853@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15765

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	29 Jul 2006 04:02:46 -0000	1.43
+++ .cvsignore	13 Aug 2006 06:55:40 -0000	1.44
@@ -1 +1 @@
-epiphany-2.15.4.tar.bz2
+epiphany-2.15.91.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- epiphany.spec	9 Aug 2006 15:41:32 -0000	1.112
+++ epiphany.spec	13 Aug 2006 06:55:40 -0000	1.113
@@ -1,15 +1,15 @@
 %define firefox_ver 1.5.0.5
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.10.1
-%define gtk2_devel_ver 2.9.0
+%define gtk2_devel_ver 2.10.0
 %define libbonoboui_devel_ver 2.1.1
 %define scrollkeeper_ver 0.1.4
 %define gnome_doc_utils_ver 0.3.2
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.15.4
-Release: 2
+Version: 2.15.91
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -22,7 +22,7 @@
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
-Requires: firefox = %{firefox_ver}
+Requires: firefox >= %{firefox_ver}
 Requires: gnome-icon-theme >= 1.0.6-1
 Requires: iso-codes >= 0.45
 BuildRequires: glib2-devel >= %{glib2_devel_ver}
@@ -31,7 +31,6 @@
 BuildRequires: scrollkeeper >= %{scrollkeeper_ver}
 BuildRequires: libxml2-devel, libxslt-devel
 BuildRequires: libgnomeui-devel, libglade2-devel
-BuildRequires: libgnomeprint22-devel, libgnomeprintui22-devel
 BuildRequires: gnome-vfs2-devel, GConf2-devel
 BuildRequires: iso-codes-devel
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_ver}
@@ -60,7 +59,6 @@
 Requires: scrollkeeper >= %{scrollkeeper_ver}
 Requires: libxml2-devel, libxslt-devel
 Requires: libgnomeui-devel, libglade2-devel
-Requires: libgnomeprint22-devel, libgnomeprintui22-devel
 Requires: gnome-vfs2-devel, GConf2-devel
 Requires: iso-codes-devel
 Requires: gnome-doc-utils >= %{gnome_doc_utils_ver}
@@ -106,10 +104,9 @@
 %post
 update-desktop-database -q %{_datadir}/applications
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="epiphany.schemas epiphany-lockdown.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
-done
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/epiphany.schemas \
+  %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas >& /dev/null
 scrollkeeper-update -q
 touch %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -119,10 +116,9 @@
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    SCHEMAS="epiphany.schemas epiphany-lockdown.schemas"
-    for S in $SCHEMAS; do
-      gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$S > /dev/null || :
-    done
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/epiphany.schemas \
+      %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas >& /dev/null
 fi
 
 %postun
@@ -159,6 +155,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Tue Aug  9 2006 Jesse Keating <jkeating at redhat.com> - 2.15.4-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	29 Jul 2006 04:02:46 -0000	1.44
+++ sources	13 Aug 2006 06:55:40 -0000	1.45
@@ -1 +1 @@
-1c0afcfed0340158b65ad720cc2b65e4  epiphany-2.15.4.tar.bz2
+d71e3b524327678a55a74a3e6ebccbc4  epiphany-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 12:55:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 08:55:30 -0400
Subject: rpms/openoffice.org/devel sources,1.189,1.190
Message-ID: <200608131255.k7DCtUX9004809@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	sources 
Log Message:
2.0.4 sources


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- sources	10 Aug 2006 12:37:19 -0000	1.189
+++ sources	13 Aug 2006 12:55:26 -0000	1.190
@@ -10,6 +10,6 @@
 d57f21d70ba34ddb20f40a4d08427722  AutoSaveRecovery.xcu
 2618cff7bfdf0a9ca30233e349df73c6  openoffice.org-myspell-contrib.tar.gz
 156fca901e2850226f16dd5034b6c941  openoffice.org-simple-crash_report.sh
-927a894d9bb8b8753c8e536ce8a671ab  OOC680_m7.tar.bz2
 0ee333127e54353d49bf30aa112faee4  openoffice.org.langpack.template.tar.gz
 3aabcb294c648747551d702316c88580  pa-IN-179.sdf
+df35ffca7ab9277c77562ccd0bba6a6e  OOD680_m1.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 12:57:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 08:57:37 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.830,1.831
Message-ID: <200608131257.k7DCvbvn005622@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
start of 2.0.4


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.830
retrieving revision 1.831
diff -u -r1.830 -r1.831
--- openoffice.org.spec	11 Aug 2006 10:09:08 -0000	1.830
+++ openoffice.org.spec	13 Aug 2006 12:57:34 -0000	1.831
@@ -1,6 +1,6 @@
-%define oootag OOC680
-%define ooomilestone 7
-%define rh_rpm_release 10
+%define oootag OOD680
+%define ooomilestone 1
+%define rh_rpm_release 1
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -26,7 +26,7 @@
 ExclusiveArch:  ppc %{ix86} x86_64
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
-Version:        2.0.3
+Version:        2.0.4
 Release: 	%{ooomilestone}.%{rh_rpm_release}
 Epoch:		1
 License:	LGPL
@@ -1148,11 +1148,6 @@
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE10}
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE11}
 
-# rh#163147# convert non AMT to AMT fonts
-sed -i -e "s/Thorndale/Times New Roman;Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
-sed -i -e "s/Albany /Albany AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu 
-sed -i -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu 
-
 #rh#158977# clear execstack requirement
 execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so
 
@@ -1258,10 +1253,6 @@
 #remove pagein stuff
 rm -f $RPM_BUILD_ROOT/%{instdir}/program/pagein*
 
-#ooo#65361# remove gengal extras
-rm -f $RPM_BUILD_ROOT/%{instdir}/program/gengal.rdb
-mv -f $RPM_BUILD_ROOT/%{instdir}/program/gengal.bin $RPM_BUILD_ROOT/%{instdir}/program/gengal
-
 #ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs 
 #have snuck through
 pic=0
@@ -2525,10 +2516,12 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.10
+* Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.1
 - rh#201447# -> openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
 - rh#201305# -> openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
 - add openoffice.org-2.0.3.ooo68383.evo28support.patch for new evo
+- clear font customization as fontconfig now has it's defaults the way we need
+- clear gengal rdb removal, ooo#65361# fixed
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
 - icu settext ownership of string data changed silently



From fedora-cvs-commits at redhat.com  Sun Aug 13 13:43:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 09:43:20 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,
	1.3, 1.4
Message-ID: <200608131343.k7DDhKBp006162@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
Log Message:
adjust prelink patch

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
 SRC680_m123/desktop/scripts/soffice.sh |   12 ++++--------
 osl/unx/signal.c                       |    0 
 sal/osl/unx/signal.c                   |    8 ++++++++
 3 files changed, 12 insertions(+), 8 deletions(-)

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	21 Mar 2006 11:19:40 -0000	1.3
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	13 Aug 2006 13:43:16 -0000	1.4
@@ -45,19 +45,18 @@
 diff -u -p -u -r1.28 signal.c
 --- openoffice.org.orig/sal/osl/unx/signal.c	8 Sep 2005 15:00:57 -0000	1.28
 +++ openoffice.org/sal/osl/unx/signal.c	3 Nov 2005 11:42:52 -0000
-@@ -184,6 +184,15 @@ static sal_Bool is_soffice_Impl (void)
+@@ -185,6 +185,14 @@
  	if (strProgName)
  	{
- 		index = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "soffice");
-+	
-+		if (index == -1)
-+			index = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "swriter");
-+		if (index == -1)
-+			index = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "simpress");
-+		if (index == -1)
-+			index = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "scalc");
-+		if (index == -1)
-+			index = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "sdraw");
+ 		idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "soffice");
++                if (idx == -1)
++                	idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "swriter");
++                if (idx == -1)
++                        idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "simpress");
++                if (idx == -1)
++                        idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "scalc");
++                if (idx == -1)
++                        idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "sdraw");
  		rtl_string_release (strProgName);
  	}
- 	return (index != -1);
+ 	return (idx != -1);



From fedora-cvs-commits at redhat.com  Sun Aug 13 14:09:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 10:09:26 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch, 1.5, 1.6
Message-ID: <200608131409.k7DE9QKf030908@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 
Log Message:
adjust xslt patch

openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch:
 config_office/configure.in                       |   20 ++
 config_office/set_soenv.in                       |    1 
 source/cxxhelp/provider/makefile.mk              |    0 
 source/cxxhelp/provider/urlparameter.cxx         |    0 
 util/makefile.mk                                 |    0 
 xmlhelp/source/cxxhelp/provider/makefile.mk      |    6 
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx |  219 +++++++++++++++++++----
 xmlhelp/util/makefile.mk                         |   12 +
 8 files changed, 221 insertions(+), 37 deletions(-)

Index: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch	15 Feb 2006 08:30:43 -0000	1.5
+++ openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch	13 Aug 2006 14:09:22 -0000	1.6
@@ -79,7 +79,7 @@
 diff -u -p -u -r1.36 urlparameter.cxx
 --- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/urlparameter.cxx	30 Mar 2005 08:38:37 -0000	1.36
 +++ openoffice.org/xmlhelp/source/cxxhelp/provider/urlparameter.cxx	30 Aug 2005 15:09:59 -0000
-@@ -87,6 +87,11 @@
+@@ -61,6 +61,11 @@
  #ifndef _RTL_URI_HXX_
  #include <rtl/uri.hxx>
  #endif
@@ -91,7 +91,7 @@
  #ifdef SYSTEM_SABLOT
  #include <sablot.h>
  #include <shandler.h>
-@@ -98,6 +103,7 @@
+@@ -72,6 +77,7 @@
  #include <sablot/shandler.h>
  #endif
  #endif
@@ -99,7 +99,7 @@
  #ifndef BERKELEYDBPROXY_DB_HXX_
  #include "db.hxx"
  #endif
-@@ -749,8 +755,7 @@ bool URLParameter::query()
+@@ -736,8 +742,7 @@
  	return ret;
  }
  
@@ -109,7 +109,7 @@
  
  ////////////////////////////////////////////////////////////////////////////////
  //                           InutStreamTransformerImpl                        //
-@@ -784,6 +789,7 @@ int schemehandlerclose( void *userData,
+@@ -771,6 +776,7 @@
  						SablotHandle processor_,
  						int handle );
  
@@ -117,7 +117,7 @@
  
  struct UserData {
  	
-@@ -801,7 +807,124 @@ struct UserData {
+@@ -788,7 +794,124 @@
  	URLParameter*                       m_pInitial;
  };
  
@@ -242,7 +242,7 @@
  
  InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
  												Databases*    pDatabases,
-@@ -828,6 +951,7 @@ InputStreamTransformer::InputStreamTrans
+@@ -815,6 +938,7 @@
  	}
  	else
  	{
@@ -250,7 +250,7 @@
  		SchemeHandler schemeHandler;
  		schemeHandler.getAll = schemehandlergetall;
  		schemeHandler.freeMemory = schemehandlerfreememory;
-@@ -835,6 +959,7 @@ InputStreamTransformer::InputStreamTrans
+@@ -822,6 +946,7 @@
  		schemeHandler.get = schemehandlerget;
  		schemeHandler.put = schemehandlerput;
  		schemeHandler.close = schemehandlerclose;
@@ -258,7 +258,7 @@
  	
  		UserData userData( this,urlParam,pDatabases );
  	
-@@ -845,77 +970,78 @@ InputStreamTransformer::InputStreamTrans
+@@ -832,77 +957,78 @@
          int last = 0;
          
  		parString[last++] = "Program";
@@ -365,39 +365,39 @@
  		rtl::OUString xslURL = pDatabases->getInstallPathAsURL/*WithOutEncoding*/();
  		
  		rtl::OString xslURLascii( 
-@@ -924,6 +1050,31 @@ InputStreamTransformer::InputStreamTrans
+@@ -910,7 +1036,31 @@
+ 			xslURL.getLength(),
  			RTL_TEXTENCODING_ASCII_US/*osl_getThreadTextEncoding()*/);
  		xslURLascii += "main_transform.xsl";
- 
 +#ifdef SYSTEM_LIBXSLT
-+		ugblData = &userData;
-+
-+		xmlRegisterInputCallbacks(pkgMatch, pkgOpen, pkgRead, uriClose);
-+		xmlRegisterInputCallbacks(helpMatch, helpOpen, helpRead, uriClose);
++                ugblData = &userData;
 +
-+		xsltStylesheetPtr cur = 
-+			xsltParseStylesheetFile((const xmlChar *)xslURLascii.getStr());
++                xmlRegisterInputCallbacks(pkgMatch, pkgOpen, pkgRead, uriClose);
++                xmlRegisterInputCallbacks(helpMatch, helpOpen, helpRead, uriClose);
 +
-+		xmlDocPtr doc = xmlParseFile("vnd.sun.star.pkg:/");
-+
-+		xmlDocPtr res = xsltApplyStylesheet(cur, doc, parameter);
-+ 		if (res) {
-+		xmlChar *doc_txt_ptr=0;
-+		int doc_txt_len;
-+		int nResult = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len, res, cur);
-+		addToBuffer((const char*)doc_txt_ptr, doc_txt_len);
-+		xmlFree(doc_txt_ptr);
-+ 		}
-+		xmlPopInputCallbacks();
-+		xmlPopInputCallbacks();
-+		xmlFreeDoc(res);
-+		xmlFreeDoc(doc);
-+		xsltFreeStylesheet(cur);
++                xsltStylesheetPtr cur = 
++                        xsltParseStylesheetFile((const xmlChar *)xslURLascii.getStr());
+ 
++                xmlDocPtr doc = xmlParseFile("vnd.sun.star.pkg:/");
++
++                xmlDocPtr res = xsltApplyStylesheet(cur, doc, parameter);
++                if (res) {
++                xmlChar *doc_txt_ptr=0;
++                int doc_txt_len;
++                int nResult = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len, res, cur);
++                addToBuffer((const char*)doc_txt_ptr, doc_txt_len);
++                xmlFree(doc_txt_ptr);
++                }
++                xmlPopInputCallbacks();
++                xmlPopInputCallbacks();
++                xmlFreeDoc(res);
++                xmlFreeDoc(doc);
++                xsltFreeStylesheet(cur);
 +#else
- #ifdef SYSTEM_SABLOT
- 		SablotRunProcessor( p,
- 							xslURLascii.getStr(),
-@@ -941,6 +1092,7 @@ InputStreamTransformer::InputStreamTrans
+ 		const char aVndPkgConstStr[] = "vnd.sun.star.pkg:/";
+ 		const char aVndResConstStr[] = "vnd.sun.star.resultat:/";
+ 		char aVndPkgStr[ sizeof( aVndPkgConstStr ) ];
+@@ -934,6 +1084,7 @@
  #endif
  		 
  		SablotDestroyProcessor( p );
@@ -405,7 +405,7 @@
  	}
  }
  	
-@@ -1086,8 +1238,7 @@ void InputStreamTransformer::addToBuffer
+@@ -1079,8 +1230,7 @@
  }
  
  
@@ -415,7 +415,7 @@
  
  /**
   *    getAll: open the URI and return the whole string
-@@ -1260,7 +1411,4 @@ int schemehandlerclose( void *userData,
+@@ -1275,7 +1425,4 @@
  	return 0;
  }
  



From fedora-cvs-commits at redhat.com  Sun Aug 13 14:46:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 10:46:52 -0400
Subject: rpms/metacity/devel .cvsignore, 1.45, 1.46 metacity.spec, 1.89,
	1.90 sources, 1.45, 1.46
Message-ID: <200608131446.k7DEkqCe030769@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.15.21



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	7 Aug 2006 22:06:18 -0000	1.45
+++ .cvsignore	13 Aug 2006 14:46:48 -0000	1.46
@@ -1,13 +1 @@
-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
-metacity-2.14.3.tar.bz2
-metacity-2.15.2.tar.bz2
-libcm-0.0.21.tar.gz
-metacity-2.15.3.tar.bz2
-libcm-0.0.22.tar.gz
-metacity-2.15.5-jun1-2006.tar.gz
-metacity-2.15.5-jun6-2006.tar.gz
-metacity-2.15.13.tar.gz
+metacity-2.15.21.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- metacity.spec	7 Aug 2006 22:14:39 -0000	1.89
+++ metacity.spec	13 Aug 2006 14:46:48 -0000	1.90
@@ -1,15 +1,15 @@
 %define gettext_package metacity
 
-%define metacity_version 2.15.13
+%define metacity_version 2.15.21
 
 %define metacity_filename metacity-%{metacity_version}
 
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 2
+Release: 1%{?dist}
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
-Source0: %{metacity_filename}.tar.gz
+Source0: %{metacity_filename}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -18,8 +18,7 @@
 BuildRequires: fontconfig-devel
 BuildRequires: GConf2-devel >= 2.2.0
 BuildRequires: desktop-file-utils >= 0.3
-BuildRequires: libglade2-devel >= 2.0.0
-BuildRequires: intltool >= 0.35
+BuildRequires: libglade2-devel >= 2.0.0BuildRequires: intltool >= 0.35
 BuildRequires: startup-notification-devel >= 0.7
 BuildRequires: libtool automake autoconf gettext
 BuildRequires: xorg-x11-proto-devel >= 7.0-13
@@ -91,6 +90,15 @@
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
 
+%preun 
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  SCHEMAS="metacity.schemas"
+  for S in $SCHEMAS; do
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+  done
+fi
+
 %postun -p /sbin/ldconfig
 
 %files -f %{gettext_package}.lang
@@ -109,6 +117,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.21-1.fc6
+- Update to 2.15.21
+- Uninstall gconf schemas in %%preun
+
 * Mon Aug 7 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.13-2
 - Remove leftover snapshot string.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	7 Aug 2006 22:06:18 -0000	1.45
+++ sources	13 Aug 2006 14:46:48 -0000	1.46
@@ -1,3 +1 @@
-9675b782627ef9fdbbaaec30ee9f1b77  libcm-0.0.22.tar.gz
-6b09abf0f66bc7a6f595b6f6be180a69  metacity-2.15.5-jun6-2006.tar.gz
-dd4c19b5332102166735c1482252ac5e  metacity-2.15.13.tar.gz
+31fbcba45bc370300db7aa08de54b1c7  metacity-2.15.21.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 14:54:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 10:54:33 -0400
Subject: rpms/dasher/devel .cvsignore, 1.16, 1.17 dasher.spec, 1.50,
	1.51 sources, 1.16, 1.17
Message-ID: <200608131454.k7DEsXcr009852@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9785

Modified Files:
	.cvsignore dasher.spec sources 
Log Message:
4.1.9



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	3 Aug 2006 16:58:43 -0000	1.16
+++ .cvsignore	13 Aug 2006 14:54:30 -0000	1.17
@@ -1 +1 @@
-dasher-4.1.8.tar.bz2
+dasher-4.1.9.tar.bz2


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- dasher.spec	3 Aug 2006 16:58:43 -0000	1.50
+++ dasher.spec	13 Aug 2006 14:54:30 -0000	1.51
@@ -1,6 +1,6 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 4.1.8
+Version: 4.1.9
 Release: 1%{?dist} 
 License: GPL
 Group: Desktop/Accessibility
@@ -99,6 +99,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.9-1.fc6
+- Update to 4.1.9
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.8-1.fc6
 - Update to 4.1.8
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	3 Aug 2006 16:58:43 -0000	1.16
+++ sources	13 Aug 2006 14:54:30 -0000	1.17
@@ -1 +1 @@
-7247d8741257cd59bb02b0dc267e13ce  dasher-4.1.8.tar.bz2
+626ae8da69c4b326cb6b06e572f9186b  dasher-4.1.9.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 15:48:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 11:48:05 -0400
Subject: rpms/tomboy/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tomboy.spec,
	1.20, 1.21
Message-ID: <200608131548.k7DFm5hv023502@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.3.9



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Feb 2006 20:27:53 -0000	1.4
+++ .cvsignore	13 Aug 2006 15:48:03 -0000	1.5
@@ -1,2 +1 @@
-tomboy-0.3.4.tar.gz
-tomboy-0.3.5.tar.gz
+tomboy-0.3.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Feb 2006 20:27:53 -0000	1.4
+++ sources	13 Aug 2006 15:48:03 -0000	1.5
@@ -1 +1 @@
-57e9829d80d8452f002e0a3856bd2c48  tomboy-0.3.5.tar.gz
+c3d4f9bf76a1e202b9cf1670667ee5eb  tomboy-0.3.9.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tomboy.spec	13 Jul 2006 21:51:24 -0000	1.20
+++ tomboy.spec	13 Aug 2006 15:48:03 -0000	1.21
@@ -1,16 +1,12 @@
 Name:           tomboy
-Version:        0.3.5
-Release:        7
-Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 
+Version:        0.3.9
+Release:        1%{?dist}
+Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://www.beatniksoftware.com/tomboy/
-Source0:        %{name}-%{version}.tar.gz
-Source1:      	tomboy.png
-Source2:      	tomboy-32.png
-Source3:      	tomboy-24.png
-Source4:      	tomboy-16.png
+Source0:        %{name}-%{version}.tar.bz2
 Patch1:         tomboy-0.3.5-wrapper.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,7 +25,7 @@
 
 Requires:	gtkspell
 
-# Mono only availible on these: (s390x disabled for now)
+# Mono only available on these: (s390x disabled for now)
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
 
 %description
@@ -44,11 +40,10 @@
 %prep
 %setup -q
 %patch1 -p1 -b .wrapper
-cp %SOURCE3 data/images/tintin.png
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-%configure --enable-dbus=yes
+%configure --enable-dbus=yes --disable-scrollkeeper
 make %{?_smp_mflags}
 
 %install
@@ -62,15 +57,8 @@
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.exe
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/Plugins/*.dll
 
-cp %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/pixmaps/tintin.png
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
-cp %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/tintin.png
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/
-cp %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/tintin.png
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/
-cp %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/tintin.png
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/
-cp %SOURCE4 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/tintin.png
+# don't need these
+rm $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 %find_lang %name
 
@@ -84,28 +72,37 @@
 
 
 %preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule \
-    %{_sysconfdir}/gconf/schemas/tomboy.schemas >/dev/null;
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/tomboy.schemas >/dev/null;
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/Plugins
 %{_bindir}/%{name}
 %{_libdir}/%{name}/*
 %{_libdir}/bonobo/servers/GNOME_TomboyApplet.server
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/dbus-1.0/services/com.beatniksoftware.Tomboy.service
 %{_mandir}/man1/%{name}.1.gz
-%{_datadir}/gnome-2.0/ui/GNOME_TomboyApplet.xml
-%{_datadir}/pixmaps/tintin.png
-%{_datadir}/icons/hicolor/*/apps/tintin.png
+%{_datadir}/icons/hicolor/*/apps/tomboy.png
+%{_datadir}/icons/hicolor/scalable/apps/tomboy.svg
+%{_datadir}/pixmaps/tomboy.png
+%{_datadir}/gnome/help/tomboy
+%{_datadir}/omf/tomboy
 
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
+
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.3.9-1.fc6
+- Update to 0.3.9
+- Fix %%preun script
+- Use upstream icons
+
 * Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5-7
 - rebuild
 - Add missing br gettext



From fedora-cvs-commits at redhat.com  Sun Aug 13 15:52:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 11:52:05 -0400
Subject: rpms/xerces-j2/devel xerces-j2.spec,1.46,1.47
Message-ID: <200608131552.k7DFq5Zo025023@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	xerces-j2.spec 
Log Message:
fix typo in preun req
s/alternatices/alternatives/



Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xerces-j2.spec	13 Aug 2006 00:48:41 -0000	1.46
+++ xerces-j2.spec	13 Aug 2006 15:52:03 -0000	1.47
@@ -37,7 +37,7 @@
 
 Name:		xerces-j2
 Version:	2.7.1
-Release:	7jpp.1
+Release:	7jpp.2
 Epoch:		0
 Summary:	Java XML parser
 License:	Apache Software License
@@ -63,7 +63,7 @@
 # xml-stylbook is not yet in FC
 #BuildRequires:	xml-stylebook
 Requires(post): /usr/sbin/update-alternatives jaxp_parser_impl
-Requires(preun): /usr/sbin/update-alternatices jaxp_parser_impl
+Requires(preun): /usr/sbin/update-alternatives jaxp_parser_impl
 
 %if ! %{gcj_support}
 BuildArch:	noarch
@@ -339,6 +339,9 @@
 
 
 %changelog
+* Sun Aug 13 2006 Warren Togami <wtogami at redhat.com> 0:2.7.1-7jpp.2
+- fix typo in preun req
+
 * Sat Aug 12 2006 Matt Wringe <mwringe at redhat.com> 0:2.7.1-7jpp.1
 - Merge with upstream version
 



From fedora-cvs-commits at redhat.com  Sun Aug 13 16:16:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 12:16:25 -0400
Subject: rpms/tomboy/devel tomboy.spec,1.21,1.22
Message-ID: <200608131616.k7DGGPCa000446@cvs.devel.redhat.com>

Author: mclasen

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

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



Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tomboy.spec	13 Aug 2006 15:48:03 -0000	1.21
+++ tomboy.spec	13 Aug 2006 16:16:22 -0000	1.22
@@ -21,6 +21,7 @@
 BuildRequires:  gmime-sharp
 BuildRequires:	mono-devel
 BuildRequires:	gettext
+BuildRequires:	gnome-doc-utils
 
 
 Requires:	gtkspell



From fedora-cvs-commits at redhat.com  Sun Aug 13 16:29:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 12:29:06 -0400
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.15,
	1.16 gnome-user-docs.spec, 1.24, 1.25 sources, 1.15, 1.16
Message-ID: <200608131629.k7DGT6M6027512@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27498

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	11 Apr 2006 05:03:29 -0000	1.15
+++ .cvsignore	13 Aug 2006 16:29:04 -0000	1.16
@@ -1,8 +1 @@
-gnome2-user-docs-2.6.0.1.tar.bz2
-gnome2-user-docs-2.8.0-1.tar.bz2
-gnome2-user-docs-2.8.1.tar.bz2
-gnome-user-docs-2.13.1.tar.bz2
-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
+gnome-user-docs-2.15.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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-user-docs.spec	10 Jun 2006 03:58:25 -0000	1.24
+++ gnome-user-docs.spec	13 Aug 2006 16:29:04 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.14.2
-Release:	4
+Version:        2.15.1
+Release:	1%{?dist}
 License:        FDL
 Source:         gnome-user-docs-%{version}.tar.bz2
 Group:          Documentation
@@ -49,6 +49,9 @@
 %{_datadir}/omf
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-1.fc6
+- Update to 2.15.1
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.14.2-4
 - Add more BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 Apr 2006 05:03:30 -0000	1.15
+++ sources	13 Aug 2006 16:29:04 -0000	1.16
@@ -1 +1 @@
-4f5a7114ccf9e4e31137da50b7333570  gnome-user-docs-2.14.2.tar.bz2
+cfe8a798760fafa138ac318bbd411319  gnome-user-docs-2.15.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 16:34:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 12:34:37 -0400
Subject: rpms/control-center/devel control-center.spec,1.166,1.167
Message-ID: <200608131634.k7DGYbIR027561@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27549

Modified Files:
	control-center.spec 
Log Message:
fix spec



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- control-center.spec	13 Aug 2006 06:25:53 -0000	1.166
+++ control-center.spec	13 Aug 2006 16:34:35 -0000	1.167
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -203,10 +203,11 @@
    %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas  \
    %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
    %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
-   %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_power_manager.schemas \ 
+   %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_power_manager.schemas \
    %{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
    %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas \
-   %{_sysconfdir}/gconf/schemas/fontilus.schemas themus.schemas >& /dev/null
+   %{_sysconfdir}/gconf/schemas/fontilus.schemas \
+   %{_sysconfdir}/gconf/schemas/themus.schemas >& /dev/null
 update-desktop-database --quiet %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -220,10 +221,11 @@
      %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas  \
      %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
      %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
-     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_power_manager.schemas \ 
+     %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_power_manager.schemas \
      %{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
      %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas \
-     %{_sysconfdir}/gconf/schemas/fontilus.schemas themus.schemas >& /dev/null
+     %{_sysconfdir}/gconf/schemas/fontilus.schemas \
+     %{_sysconfdir}/gconf/schemas/themus.schemas >& /dev/null
 fi
 
 %postun
@@ -266,6 +268,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.01-2.fc6
+- fix spec file (pointed out by Yanko Kaneti)
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.91
 



From fedora-cvs-commits at redhat.com  Sun Aug 13 17:09:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 13:09:06 -0400
Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.4,
	1.5 perl-IO-Socket-SSL.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200608131709.k7DH96kx010455@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/perl-IO-Socket-SSL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10415

Modified Files:
	.cvsignore perl-IO-Socket-SSL.spec sources 
Log Message:
0.998 with more important fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2006 06:35:32 -0000	1.4
+++ .cvsignore	13 Aug 2006 17:09:03 -0000	1.5
@@ -1 +1 @@
-IO-Socket-SSL-0.994.tar.gz
+IO-Socket-SSL-0.998.tar.gz


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-IO-Socket-SSL.spec	1 Aug 2006 06:35:32 -0000	1.3
+++ perl-IO-Socket-SSL.spec	13 Aug 2006 17:09:03 -0000	1.4
@@ -4,7 +4,7 @@
 #
 
 Name:           perl-IO-Socket-SSL
-Version:        0.994
+Version:        0.998
 Release:        1%{?dist}
 Summary:        Perl library for transparent SSL
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sun Aug 13 2006 Warren Togami <wtogami at redhat.com> - 0.998-1
+- 0.998 with more important fixes
+
 * Tue Aug 01 2006 Warren Togami <wtogami at redhat.com> - 0.994-1
 - 0.994 important bugfixes (#200860)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-Socket-SSL/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2006 06:35:32 -0000	1.4
+++ sources	13 Aug 2006 17:09:03 -0000	1.5
@@ -1 +1 @@
-e26fe37f2a305a5d408beb94e0be9c64  IO-Socket-SSL-0.994.tar.gz
+8df4d8060f9ebdab6d3c72b5595aaa60  IO-Socket-SSL-0.998.tar.gz



From fedora-cvs-commits at redhat.com  Sun Aug 13 18:34:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 14:34:52 -0400
Subject: rpms/libgtk-java/devel .cvsignore, 1.20, 1.21 libgtk-java.spec, 1.60,
	1.61 sources, 1.20, 1.21
Message-ID: <200608131834.k7DIYqlM026143@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26093

Modified Files:
	.cvsignore libgtk-java.spec sources 
Log Message:
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel subpackage.
- The -devel subpackage now requires several -devel packages.
- Update requires and buildrequirs



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	17 Jun 2006 17:04:49 -0000	1.20
+++ .cvsignore	13 Aug 2006 18:34:48 -0000	1.21
@@ -1 +1 @@
-libgtk-java-2.8.5.tar.bz2
+libgtk-java-2.8.6.tar.bz2


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- libgtk-java.spec	23 Jul 2006 06:47:13 -0000	1.60
+++ libgtk-java.spec	13 Aug 2006 18:34:48 -0000	1.61
@@ -14,8 +14,8 @@
 
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	2.8.5
-Release: 	2
+Version:	2.8.6
+Release: 	1%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -24,10 +24,10 @@
 BuildRoot:	%{_tmppath}/%{name_base}-%{version}-root
 
 Requires:	%{c_pkg_prefix}gtk2 >= 2.8.0
-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
+Requires:	%{java_pkg_prefix}cairo-java >= 1.0.5
+Requires:       %{java_pkg_prefix}glib-java >= 0.2.6
+BuildRequires:  %{java_pkg_prefix}cairo-java-devel >= 1.0.5
+BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.6
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0
 BuildRequires:  java-devel >= 1.4.2, gcc-java >= 4.1.1, docbook-utils
 
@@ -41,10 +41,12 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	gtk2-devel
+Requires:	cairo-java-devel
+Requires:	glib-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
+Development part of %{name}.
 
 %prep
 
@@ -60,7 +62,7 @@
 
 %configure
 
-make 
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -78,7 +80,7 @@
 %install
 rm -rf %{buildroot}
 
-make  DESTDIR=$RPM_BUILD_ROOT  install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT  install
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name}' ] ; then
@@ -110,17 +112,25 @@
 %{_includedir}/%{name_base}/*
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 %dir %{_datadir}/%{name_base}
 %{_datadir}/%{name_base}/*
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.8.6-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel subpackage.
+- The -devel subpackage now requires several -devel packages.
+- Update requires and buildrequirs
+
 * Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.8.5-2
 - Bump release number. (dist-fc6-java)
 
@@ -163,7 +173,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.
+- 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


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	17 Jun 2006 17:05:02 -0000	1.20
+++ sources	13 Aug 2006 18:34:48 -0000	1.21
@@ -1 +1 @@
-5d363e03e22000b89a8facb9d6042da3  libgtk-java-2.8.5.tar.bz2
+230b62c4b69667245214788b43ea79af  libgtk-java-2.8.6.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 18:37:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 14:37:07 -0400
Subject: rpms/cairo-java/FC-5 .cvsignore, 1.8, 1.9 cairo-java.spec, 1.29,
	1.30 sources, 1.10, 1.11
Message-ID: <200608131837.k7DIb7Ze026716@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26664

Modified Files:
	.cvsignore cairo-java.spec sources 
Log Message:
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel subpackage.
- The -devel subpackage now requires several -devel packages.
- Do not require gtk2; cairo+fontconfig is enough.  The same for BuildReqs.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Jun 2006 16:54:58 -0000	1.8
+++ .cvsignore	13 Aug 2006 18:37:04 -0000	1.9
@@ -1 +1 @@
-cairo-java-1.0.4.tar.bz2
+cairo-java-1.0.5.tar.bz2


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/FC-5/cairo-java.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cairo-java.spec	12 Jul 2006 15:06:39 -0000	1.29
+++ cairo-java.spec	13 Aug 2006 18:37:05 -0000	1.30
@@ -14,21 +14,22 @@
 
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	1.0.4
-Release: 	0.fc5.1
+Version:	1.0.5
+Release: 	1%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
 Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/1.0/%{name_base}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Requires:	%{java_pkg_prefix}gtk2 >= 2.8.0
+Requires:	fontconfig >= 2.3.1
 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
+Requires: 	%{java_pkg_prefix}glib-java >= 0.2.6
+BuildRequires:	%{java_pkg_prefix}glib-java-devel >= 0.2.6
+BuildRequires:	fontconfig-devel >= 2.3.1
+BuildRequires:	cairo-devel >= 1.0.0
+BuildRequires:	gcc-java >= 3.3.3
 BuildRequires:	docbook-utils
-BuildRequires:	java-1.4.2-gcj-compat >= 1.4.2
 BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2
 
 %description
@@ -39,10 +40,12 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	cairo-devel
+Requires:	fontconfig-devel
+Requires:	glib-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
+Development part of %{name}.
 
 %prep
 
@@ -56,7 +59,7 @@
 fi
 
 %configure
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -71,7 +74,7 @@
 %install
 rm -rf %{buildroot}
 
-make  DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # rename doc dir to reflect package rename, if the names differ
@@ -102,15 +105,26 @@
 %doc doc/api AUTHORS ChangeLog COPYING INSTALL README NEWS 
 %{_libdir}/*so* 
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 
 %changelog
+* Sat Aug 12 2006 Stepan Kasal <skasal at redhat.com> - 1.0.5-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel subpackage.
+- The -devel subpackage now requires several -devel packages.
+- Do not require gtk2; cairo+fontconfig is enough.  The same for BuildReqs.
+
+* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.0.4-2
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-1
 - Release 0 is not allowed.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Jun 2006 16:54:58 -0000	1.10
+++ sources	13 Aug 2006 18:37:05 -0000	1.11
@@ -1 +1 @@
-a10528654e52b5f22d7e80d74029be98  cairo-java-1.0.4.tar.bz2
+2e532ab7d4afe681cfec3b70132d7a80  cairo-java-1.0.5.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 18:46:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 14:46:37 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.128.ooo54479.systemicu.patch, 1.14, 1.15
Message-ID: <200608131846.k7DIkbid028936@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.128.ooo54479.systemicu.patch 
Log Message:
readjust

openoffice.org-1.9.128.ooo54479.systemicu.patch:
 config_office/configure.in                              |   52 ++++++++--------
 config_office/set_soenv.in                              |    6 -
 i18npool/inc/breakiterator_unicode.hxx                  |    1 
 i18npool/prj/build.lst                                  |    2 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   24 +++++--
 i18npool/source/breakiterator/makefile.mk               |   20 ++----
 i18npool/source/collator/collator_unicode.cxx           |   32 ++++-----
 i18npool/source/collator/gencoll_rule.cxx               |    4 -
 inc/breakiterator_unicode.hxx                           |    0 
 linguistic/source/hhconvdic.cxx                         |    2 
 prj/build.lst                                           |    0 
 scp2/prj/build.lst                                      |    2 
 scp2/source/ooo/file_library_ooo.scp                    |    4 +
 scp2/source/ooo/makefile.mk                             |   11 ++-
 scp2/source/ooo/shortcut_ooo.scp                        |   30 ---------
 source/breakiterator/breakiterator_unicode.cxx          |    0 
 source/breakiterator/makefile.mk                        |    0 
 source/collator/collator_unicode.cxx                    |    0 
 source/collator/gencoll_rule.cxx                        |    0 
 source/hhconvdic.cxx                                    |    0 
 vcl/prj/build.lst                                       |    2 
 21 files changed, 87 insertions(+), 105 deletions(-)

Index: openoffice.org-1.9.128.ooo54479.systemicu.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.128.ooo54479.systemicu.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openoffice.org-1.9.128.ooo54479.systemicu.patch	8 Aug 2006 11:32:53 -0000	1.14
+++ openoffice.org-1.9.128.ooo54479.systemicu.patch	13 Aug 2006 18:46:33 -0000	1.15
@@ -262,11 +262,11 @@
 --- openoffice.org.orig/vcl/prj/build.lst	2005-09-13 08:51:51.000000000 +0100
 +++ openoffice.org/vcl/prj/build.lst	2005-09-09 08:37:54.000000000 +0100
 @@ -1,4 +1,4 @@
--vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools rvpapi icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx SNDFILE:sndfile PORTAUDIO:portaudio transex3 NULL
-+vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools rvpapi ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx SNDFILE:sndfile PORTAUDIO:portaudio transex3 NULL
+-vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx SNDFILE:sndfile PORTAUDIO:portaudio transex3 SO:officenames NULL
++vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx SNDFILE:sndfile PORTAUDIO:portaudio transex3 SO:officenames NULL
  vc	vcl										usr1	-	all	vc_mkout NULL
- vc	vcl\source\unotypes						nmake	-	all	vc_unot NULL
- vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_unot NULL
+ vc	vcl\source\glyphs						nmake	-	all	vc_glyphs NULL
+ vc	vcl\source\app							nmake	-	all	vc_app NULL
 Index: inc/breakiterator_unicode.hxx
 ===================================================================
 RCS file: /cvs/l10n/i18npool/inc/breakiterator_unicode.hxx,v
@@ -376,12 +376,16 @@
          $(MY_BRK_BRKFILES:s/.brk/_brk.c/)
  
  SLOFILES=   \
-@@ -79,9 +79,9 @@
- .INCLUDE :	target.mk
- 
- # 'gencmn', 'genbrk' and 'genccode' are tools generated and delivered by icu project to process icu breakiterator rules.
+@@ -82,13 +82,9 @@
+ # The output of gencmn generates warnings under Windows. We want to minimize the patches to external tools,
+ # so the output (OpenOffice_icu_dat.c) is changed here to include a pragma to disable the warnings.
+ # Output of gencmn is redirected to OpenOffice_icu_tmp.c with the -t switch.
 -$(MISC)$/OpenOffice_icu_dat.c :  $(MY_BRK_BRKFILES)
--    +$(WRAPCMD) $(SOLARBINDIR)$/gencmn -e OpenOffice_icu -n OpenOffice_icu -S -d $(MISC) O $(mktmp $(MY_BRK_BRKFILES:t"\n"))
+-    +$(WRAPCMD) $(SOLARBINDIR)$/gencmn -e OpenOffice_icu -n OpenOffice_icu -t tmp -S -d $(MISC) O $(mktmp $(MY_BRK_BRKFILES:t"\n"))
+-    +echo $(USQ)#ifdef _MSC_VER$(USQ) > $@
+-    +echo $(USQ)#pragma warning( disable : 4229 4668 )$(USQ) >> $@
+-    +echo $(USQ)#endif$(USQ) >> $@
+-    +$(TYPE) $(@:s/_dat/_tmp/) >> $@
 -$(MISC)$/OpenOffice_%.brk : data/%.txt
 -    +$(WRAPCMD) $(SOLARBINDIR)$/genbrk -r $< -o $(MISC)$/OpenOffice_$*.brk
 +$(MISC)$/OpenOffice_dat.c :  $(MY_BRK_BRKFILES) makefile.mk



From fedora-cvs-commits at redhat.com  Sun Aug 13 18:56:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 14:56:37 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.831,
	1.832 workspace.targetedaot.patch, 1.12, NONE
Message-ID: <200608131856.k7DIubKQ015118@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.targetedaot.patch 
Log Message:
drop integrated workspace.targetedaot


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.831
retrieving revision 1.832
diff -u -r1.831 -r1.832
--- openoffice.org.spec	13 Aug 2006 12:57:34 -0000	1.831
+++ openoffice.org.spec	13 Aug 2006 18:56:34 -0000	1.832
@@ -84,56 +84,55 @@
 Patch16: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
 Patch17: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
 Patch18: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch19: workspace.targetedaot.patch
-Patch20: workspace.icuupgrade.patch
-Patch21: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch22: workspace.opensymbol01.patch
-Patch23: workspace.inplaceobjects.patch
-Patch24: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch25: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
-Patch26: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch27: workspace.bfsixtyfour.patch
-Patch28: workspace.thbpp4.patch
-Patch29: workspace.impress96.patch
-Patch30: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
-Patch31: workspace.fpicker6.patch
-Patch32: workspace.vcl59.patch
-Patch33: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
-Patch34: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch35: workspace.vcl60.patch
-Patch36: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
-Patch37: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
-Patch38: workspace.fwk40.patch
-Patch39: workspace.sixtyfour06.patch
-Patch40: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch41: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch42: workspace.kendy10.patch
-Patch43: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch44: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch45: ooobuild.VBAObjects.patch
-Patch46: workspace.gcjsix.patch
-Patch47: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch48: workspace.vcl63.patch
-Patch49: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch50: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch51: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch52: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch53: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch54: workspace.pb17.patch
-Patch55: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch56: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch57: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch58: workspace.os84.patch
-Patch59: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch60: workspace.configure18.patch
-Patch61: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch62: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch63: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch64: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch65: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch66: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch67: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch68: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch19: workspace.icuupgrade.patch
+Patch20: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch21: workspace.opensymbol01.patch
+Patch22: workspace.inplaceobjects.patch
+Patch23: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch24: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
+Patch25: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch26: workspace.bfsixtyfour.patch
+Patch27: workspace.thbpp4.patch
+Patch28: workspace.impress96.patch
+Patch29: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
+Patch30: workspace.fpicker6.patch
+Patch31: workspace.vcl59.patch
+Patch32: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
+Patch33: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch34: workspace.vcl60.patch
+Patch35: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+Patch36: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
+Patch37: workspace.fwk40.patch
+Patch38: workspace.sixtyfour06.patch
+Patch39: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch40: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch41: workspace.kendy10.patch
+Patch42: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch43: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch44: ooobuild.VBAObjects.patch
+Patch45: workspace.gcjsix.patch
+Patch46: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch47: workspace.vcl63.patch
+Patch48: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch49: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch50: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch51: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch52: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch53: workspace.pb17.patch
+Patch54: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch55: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch56: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch57: workspace.os84.patch
+Patch58: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch59: workspace.configure18.patch
+Patch60: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch61: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch62: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch63: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch64: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch65: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch66: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch67: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -953,55 +952,54 @@
 %patch16 -p1 -b .ooo53723.bulletexport.vcl.patch
 %patch17 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
 %patch18 -p1 -b .ooo54479.systemicu.patch
-%patch19 -p1 -b .workspace.targetedaot.patch
-%patch20 -p1 -b .workspace.icuupgrade.patch
-%patch21 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch22 -p1 -b .workspace.opensymbol01.patch
-%patch23 -p1 -b .workspace.inplaceobjects.patch
-%patch24 -p1
-%patch25 -p1 -b .ooo64463.extensions.noxaw.patch
-%patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch27 -p1 -b .workspace.bfsixtyfour.patch
-%patch28 -p1 -b .workspace.thbpp4.patch
-%patch29 -p1 -b .workspace.impress96.patch
-%patch30 -p1 -b .ooo65327.builddep.writerperfect.patch
-%patch31 -p1 -b .workspace.fpicker6.patch
-%patch32 -p1 -b .workspace.vcl59.patch
-%patch33 -p1 -b .oooXXXXX.atkbroken.vcl.patch
-%patch34 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch35 -p1 -b .workspace.vcl60.patch
-%patch36 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
-%patch37 -p1 -b .rh192588.officecfg.defaultcairooff.patch
-%patch38 -p1 -b .workspace.fwk40.patch
-%patch39 -p1 -b .workspace.sixtyfour06.patch
-%patch40 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch41 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch42 -p1 -b .workspace.kendy10.patch
-%patch43 -p1 -b .rh187919.gtkunderkde.patch
-%patch44 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch45 -p0 -b .ooobuild.VBAObjects.patch
-%patch46 -p1 -b .workspace.gcjsix.patch
-%patch47 -p1 -b .ooo67644.sw.spacing.patch
-%patch48 -p1 -b .workspace.vcl63.patch
-%patch49 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch50 -p1 -b .ooo67716.svx.overflow.patch
-%patch51 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch52 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch53 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch54 -p1 -b .workspace.pb17.patch
-%patch55 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch56 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch57 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch58 -p1 -b .workspace.os84.patch
-%patch59 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch60 -p1 -b .workspace.configure18.patch
-%patch61 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch62 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch63 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch64 -p1 -b .ooo68047.vcl.zwj.patch
-%patch65 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch66 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch67 -p1 -b .ooo68383.evo28support.patch
+%patch19 -p1 -b .workspace.icuupgrade.patch
+%patch20 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch21 -p1 -b .workspace.opensymbol01.patch
+%patch22 -p1 -b .workspace.inplaceobjects.patch
+%patch23 -p1
+%patch24 -p1 -b .ooo64463.extensions.noxaw.patch
+%patch25 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch26 -p1 -b .workspace.bfsixtyfour.patch
+%patch27 -p1 -b .workspace.thbpp4.patch
+%patch28 -p1 -b .workspace.impress96.patch
+%patch29 -p1 -b .ooo65327.builddep.writerperfect.patch
+%patch30 -p1 -b .workspace.fpicker6.patch
+%patch31 -p1 -b .workspace.vcl59.patch
+%patch32 -p1 -b .oooXXXXX.atkbroken.vcl.patch
+%patch33 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch34 -p1 -b .workspace.vcl60.patch
+%patch35 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
+%patch36 -p1 -b .rh192588.officecfg.defaultcairooff.patch
+%patch37 -p1 -b .workspace.fwk40.patch
+%patch38 -p1 -b .workspace.sixtyfour06.patch
+%patch39 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch40 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch41 -p1 -b .workspace.kendy10.patch
+%patch42 -p1 -b .rh187919.gtkunderkde.patch
+%patch43 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch44 -p0 -b .ooobuild.VBAObjects.patch
+%patch45 -p1 -b .workspace.gcjsix.patch
+%patch46 -p1 -b .ooo67644.sw.spacing.patch
+%patch47 -p1 -b .workspace.vcl63.patch
+%patch48 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch49 -p1 -b .ooo67716.svx.overflow.patch
+%patch50 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch51 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch52 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch53 -p1 -b .workspace.pb17.patch
+%patch54 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch55 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch56 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch57 -p1 -b .workspace.os84.patch
+%patch58 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch59 -p1 -b .workspace.configure18.patch
+%patch60 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch61 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch62 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch63 -p1 -b .ooo68047.vcl.zwj.patch
+%patch64 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch65 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch66 -p1 -b .ooo68383.evo28support.patch
 %patch68 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
@@ -2522,6 +2520,7 @@
 - add openoffice.org-2.0.3.ooo68383.evo28support.patch for new evo
 - clear font customization as fontconfig now has it's defaults the way we need
 - clear gengal rdb removal, ooo#65361# fixed
+- drop integrated workspace.targetedaot.patch
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
 - icu settext ownership of string data changed silently


--- workspace.targetedaot.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Aug 13 18:57:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 14:57:07 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.832,1.833
Message-ID: <200608131857.k7DIv7fs015327@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
drop integrated workspace.targetedaot


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -r1.832 -r1.833
--- openoffice.org.spec	13 Aug 2006 18:56:34 -0000	1.832
+++ openoffice.org.spec	13 Aug 2006 18:57:05 -0000	1.833
@@ -1000,7 +1000,7 @@
 %patch64 -p1 -b .ooo68048.vcl.imsurroundtext.patch
 %patch65 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
 %patch66 -p1 -b .ooo68383.evo28support.patch
-%patch68 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch67 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 



From fedora-cvs-commits at redhat.com  Sun Aug 13 19:54:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 15:54:16 -0400
Subject: rpms/libgnome-java/devel .cvsignore, 1.14, 1.15 libgnome-java.spec,
	1.38, 1.39 sources, 1.15, 1.16
Message-ID: <200608131954.k7DJsGiN031577@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31562

Modified Files:
	.cvsignore libgnome-java.spec sources 
Log Message:
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel subpackage.
- The -devel subpackage now requires several -devel packages.
- Update requires and buildrequires.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Jun 2006 22:27:49 -0000	1.14
+++ .cvsignore	13 Aug 2006 19:54:13 -0000	1.15
@@ -1 +1 @@
-libgnome-java-2.12.3.tar.bz2
+libgnome-java-2.12.4.tar.bz2


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libgnome-java.spec	23 Jul 2006 07:41:30 -0000	1.38
+++ libgnome-java.spec	13 Aug 2006 19:54:13 -0000	1.39
@@ -14,8 +14,8 @@
 
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
-Version:	2.12.3
-Release: 	2
+Version:	2.12.4
+Release: 	1%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -24,13 +24,13 @@
 
 Requires:	libgnomeui >= 2.11.0
 Requires:	libgnomecanvas >= 2.11.0
-Requires:	libgtk-java >= 2.8.4
+Requires:	libgtk-java >= 2.8.6
 Requires: 	glib-java >= 0.2.4
 BuildRequires:	libgnomeui-devel >= 2.11.0
 BuildRequires:	libgnomecanvas-devel >= 2.11.0
 BuildRequires:	gcc-java >= 4.1.1, docbook-utils
-BuildRequires:	libgtk-java-devel >= 2.8.4, java-devel >= 1.4.2
-BuildRequires:	glib-java-devel >= 0.2.4
+BuildRequires:	libgtk-java-devel >= 2.8.6, java-devel >= 1.4.2
+BuildRequires:	glib-java-devel >= 0.2.6
 
 %description
 libgnome-java is a language binding that allows developers to write
@@ -40,10 +40,14 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	libgnomeui-devel
+Requires:	libgnomecanvas-devel
+Requires:	libgtk-java-devel
+Requires:	glib-java-devel
+
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
+Development part of %{name}.
 
 %prep
 %setup -q -n %{name_base}-%{version}
@@ -56,7 +60,7 @@
 fi
 
 %configure
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -70,7 +74,7 @@
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name}' ] ; then
@@ -99,14 +103,22 @@
 %doc doc/api AUTHORS COPYING NEWS README
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel subpackage.
+- The -devel subpackage now requires several -devel packages.
+- Update requires and buildrequires.
+
 * Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.3-2
 - Bump release number. (dist-fc6-java)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Jun 2006 22:27:49 -0000	1.15
+++ sources	13 Aug 2006 19:54:13 -0000	1.16
@@ -1 +1 @@
-38cf6c95d7882ffcaffd3ec7c05ff10a  libgnome-java-2.12.3.tar.bz2
+88ce5ef83c81e385aec8fc28bfba31ca  libgnome-java-2.12.4.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 20:08:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 16:08:30 -0400
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.61,1.62
Message-ID: <200608132008.k7DK8UA9031740@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31727

Modified Files:
	libgtk-java.spec 
Log Message:
- Implement a temporary workaround for #197460.


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- libgtk-java.spec	13 Aug 2006 18:34:48 -0000	1.61
+++ libgtk-java.spec	13 Aug 2006 20:08:27 -0000	1.62
@@ -10,12 +10,15 @@
 %{!?c_pkg_prefix: %define c_pkg_prefix %{nil}}
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
+# FIXME: temporary workaround to fix bug #197460:
+%define __perl_provides %{nil}
+
 %define	name_base 	libgtk-java
 
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.8.6
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -107,7 +110,7 @@
 
 %files
 %defattr(-,root,root)
-%doc doc/api AUTHORS COPYING INSTALL README NEWS  THANKS FAQ.html doc/examples
+%doc doc/api AUTHORS COPYING INSTALL README NEWS THANKS FAQ.html doc/examples
 %dir %{_includedir}/%{name_base}
 %{_includedir}/%{name_base}/*
 %{_libdir}/*so*
@@ -123,13 +126,16 @@
 
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.8.6-2
+- Implement a temporary workaround for #197460.
+
 * Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.8.6-1
 - New upstream version.
 - Use the %%{?dist} tag.
 - Use `make %%{?_smp_mflags}'.
 - Move pkgconfig description to -devel subpackage.
 - The -devel subpackage now requires several -devel packages.
-- Update requires and buildrequirs
+- Update requires and buildrequires.
 
 * Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.8.5-2
 - Bump release number. (dist-fc6-java)



From fedora-cvs-commits at redhat.com  Sun Aug 13 20:14:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 16:14:01 -0400
Subject: rpms/libgnome-java/devel libgnome-java.spec,1.39,1.40
Message-ID: <200608132014.k7DKE1VD010714@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10688

Modified Files:
	libgnome-java.spec 
Log Message:
Fix a typo.


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libgnome-java.spec	13 Aug 2006 19:54:13 -0000	1.39
+++ libgnome-java.spec	13 Aug 2006 20:13:58 -0000	1.40
@@ -107,7 +107,7 @@
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/pkgconfig/*/*.pc
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog



From fedora-cvs-commits at redhat.com  Sun Aug 13 20:26:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 16:26:00 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.113,1.114
Message-ID: <200608132026.k7DKQ0sJ029493@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29439

Modified Files:
	epiphany.spec 
Log Message:
rebuild



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- epiphany.spec	13 Aug 2006 06:55:40 -0000	1.113
+++ epiphany.spec	13 Aug 2006 20:25:57 -0000	1.114
@@ -9,7 +9,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.15.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -155,6 +155,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-2.fc6
+- Rebuild
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 



From fedora-cvs-commits at redhat.com  Sun Aug 13 20:41:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 16:41:18 -0400
Subject: rpms/libgconf-java/devel .cvsignore, 1.12, 1.13 libgconf-java.spec,
	1.33, 1.34 sources, 1.13, 1.14
Message-ID: <200608132041.k7DKfIL7001154@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1063

Modified Files:
	.cvsignore libgconf-java.spec sources 
Log Message:
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- The -devel subpackage now requires several -devel packages.
- Update requires and buildrequires.
- Remove macros c_pkg_prefix and java_pkg_prefix and the code for optional
  instalation under /opt/frysk prefix.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	12 Jul 2006 15:52:58 -0000	1.12
+++ .cvsignore	13 Aug 2006 20:41:15 -0000	1.13
@@ -1 +1 @@
-libgconf-java-2.12.3.tar.bz2
+libgconf-java-2.12.4.tar.bz2


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libgconf-java.spec	23 Jul 2006 07:21:34 -0000	1.33
+++ libgconf-java.spec	13 Aug 2006 20:41:15 -0000	1.34
@@ -1,21 +1,9 @@
-# install these packages into /opt if we have a prefix defined for the
-# java packages
-%{?java_pkg_prefix: %define _prefix /opt/frysk }
-%{?java_pkg_prefix: %define _sysconfdir %{_prefix}/etc }
-%{?java_pkg_prefix: %define _localstatedir %{_prefix}/var }
-%{?java_pkg_prefix: %define _infodir %{_prefix}/share/info }
-%{?java_pkg_prefix: %define _mandir %{_prefix}/share/man }
-%{?java_pkg_prefix: %define _defaultdocdir %{_prefix}/share/doc }
-
-%{!?c_pkg_prefix: %define c_pkg_prefix %{nil}}
-%{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
-
 %define	name_base	libgconf-java
 
 Summary:	Java bindings for GConf
-Name:		%{java_pkg_prefix}%{name_base}
-Version:	2.12.3
-Release: 	3
+Name:		%{name_base}
+Version:	2.12.4
+Release: 	1%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -23,14 +11,16 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	GConf2 >= 2.11.2
-Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
-BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
+Requires:	glib-java >= 0.2.6
+BuildRequires:	glib-java-devel >= 0.2.6
 BuildRequires:  GConf2-devel >= 2.11.2, gcc-java >= 4.1.1
 BuildRequires:  docbook-utils
 # We need javadoc:
 BuildRequires:  java-1.4.2-gcj-compat-devel
-# A temporary hack, should be required by libgtk-java-devel:
-BuildRequires:  gtk2-devel
+
+# Currently, the configure script checks for libgtk-java.
+# See gnome bugs #347254, #350931
+BuildRequires:	libgtk-java-devel >= 2.8.4
 
 %description
 libgconf-java is a language binding that allows developers to use the
@@ -40,6 +30,8 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	GConf2-devel
+Requires:	glib-java-devel
 
 %description    devel
 Compressed Java source for %{name}. This is useful if you are developing
@@ -49,14 +41,8 @@
 %setup -q -n %{name_base}-%{version}
 
 %build
-# if either the C or Java packages has a prefix declared, then we will
-# add /opt/frysk/lib/pkgconfig to the pkgconfig path
-if  [  'x%{java_pkg_prefix}' != 'x' ] || [ 'x%{c_pkg_prefix}' != 'x' ]; then
-        export PKG_CONFIG_PATH=/opt/frysk/lib/pkgconfig
-fi
-
 %configure
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -70,7 +56,7 @@
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name_base}' ] ; then
@@ -103,10 +89,19 @@
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/pkgconfig/*
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- The -devel subpackage now requires several -devel packages.
+- Update requires and buildrequires.
+- Remove macros c_pkg_prefix and java_pkg_prefix and the code for optional
+  instalation under /opt/frysk prefix.
+
 * Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.3-3
 - Bump release number. (dist-fc6-java)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Jul 2006 15:52:58 -0000	1.13
+++ sources	13 Aug 2006 20:41:15 -0000	1.14
@@ -1 +1 @@
-0498ac34333ddfc24b0b1b2e33ac8315  libgconf-java-2.12.3.tar.bz2
+ac9f8e35999cedcb2e9009032f0fe256  libgconf-java-2.12.4.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 20:49:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 16:49:48 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.34,1.35
Message-ID: <200608132049.k7DKnlkc018448@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18425

Modified Files:
	libgconf-java.spec 
Log Message:
- Fix the description of the -devel package.


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libgconf-java.spec	13 Aug 2006 20:41:15 -0000	1.34
+++ libgconf-java.spec	13 Aug 2006 20:49:45 -0000	1.35
@@ -34,8 +34,7 @@
 Requires:	glib-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
+Development part of %{name}.
 
 %prep
 %setup -q -n %{name_base}-%{version}
@@ -93,6 +92,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-2
+- Fix the description of the -devel package.
+
 * Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-1
 - New upstream version.
 - Use the %%{?dist} tag.



From fedora-cvs-commits at redhat.com  Sun Aug 13 20:50:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 16:50:34 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.35,1.36
Message-ID: <200608132050.k7DKoYnh018787@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18626

Modified Files:
	libgconf-java.spec 
Log Message:
- Fix the description of the -devel package.


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libgconf-java.spec	13 Aug 2006 20:49:45 -0000	1.35
+++ libgconf-java.spec	13 Aug 2006 20:50:31 -0000	1.36
@@ -3,7 +3,7 @@
 Summary:	Java bindings for GConf
 Name:		%{name_base}
 Version:	2.12.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net



From fedora-cvs-commits at redhat.com  Sun Aug 13 20:55:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 16:55:59 -0400
Subject: rpms/libvte-java/devel .cvsignore, 1.4, 1.5 libvte-java.spec, 1.23,
	1.24 sources, 1.4, 1.5
Message-ID: <200608132055.k7DKtxim020895@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20819

Modified Files:
	.cvsignore libvte-java.spec sources 
Log Message:
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel subpackage.
- The -devel subpackage now requires several -devel packages.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Jun 2006 21:28:28 -0000	1.4
+++ .cvsignore	13 Aug 2006 20:55:57 -0000	1.5
@@ -1 +1 @@
-libvte-java-0.12.0.tar.bz2
+libvte-java-0.12.1.tar.bz2


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libvte-java.spec	23 Jul 2006 07:31:25 -0000	1.23
+++ libvte-java.spec	13 Aug 2006 20:55:57 -0000	1.24
@@ -1,15 +1,13 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
-Version:   0.12.0
-Release:   2
+Version:   0.12.1
+Release:   1%{?dist}
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
 License:   LGPL
 Group:     Development/Libraries
 BuildRoot: %{_tmppath}/libvte-java
 
-
-Requires: 	/sbin/ldconfig
 Requires: 	glib-java >= 0.2.4
 Requires:	libgtk-java >= 2.8.4
 Requires:	vte >= 0.12.1
@@ -26,11 +24,10 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	vte-devel, libgtk-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
-
+Development part of %{name}.
 
 
 %prep
@@ -46,7 +43,7 @@
 sed -i 's/^pic_flag=\"\"/pic_flag=\"\ \-fPIC\"/' libtool
 sed -i 's/^compiler_c_o=\"no\"/compiler_c_o=\"yes\"/' libtool
 
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -61,7 +58,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make  DESTDIR=$RPM_BUILD_ROOT  install 
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install 
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name}' != 'x%{name}' ] ; then
@@ -88,14 +85,21 @@
 %doc doc/api AUTHORS ChangeLog COPYING INSTALL NEWS README 
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 0.12.1-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel subpackage.
+- The -devel subpackage now requires several -devel packages.
+
 * Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.12.0-2
 - Bump release number. (dist-fc6-java)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Jun 2006 21:28:28 -0000	1.4
+++ sources	13 Aug 2006 20:55:57 -0000	1.5
@@ -1 +1 @@
-e5e5e63bb2615a3df3fa38d80616b005  libvte-java-0.12.0.tar.bz2
+9d1d28710614910c80486b3bcdf08ae6  libvte-java-0.12.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 21:09:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 17:09:03 -0400
Subject: rpms/freetype/devel freetype-multilib.patch, 1.1, 1.2 freetype.spec,
	1.37, 1.38
Message-ID: <200608132109.k7DL93tP024471@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24407

Modified Files:
	freetype-multilib.patch freetype.spec 
Log Message:
fix multilib patch


freetype-multilib.patch:
 freetype-config.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Index: freetype-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freetype-multilib.patch	27 Jul 2006 23:11:03 -0000	1.1
+++ freetype-multilib.patch	13 Aug 2006 21:09:00 -0000	1.2
@@ -12,7 +12,7 @@
 -includedir=@includedir@
 -libdir=@libdir@
 +includedir=`pkg-config --variable includedir freetype2`
-+libdir=`pkg-config --variable includedir freetype2`
++libdir=`pkg-config --variable libdir freetype2`
  enable_shared=@enable_shared@
  wl=@wl@
  hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- freetype.spec	27 Jul 2006 23:12:17 -0000	1.37
+++ freetype.spec	13 Aug 2006 21:09:00 -0000	1.38
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.2.1
-Release: 3
+Release: 4%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -192,6 +192,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.1-4.fc6
+- fix a problem with the multilib patch (#202366)
+
 * Thu Jul 27 2006 Matthias Clasen  <mclasen at redhat.com> - 2.2.1-3
 - fix multilib issues
 



From fedora-cvs-commits at redhat.com  Sun Aug 13 21:13:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 17:13:40 -0400
Subject: rpms/libglade-java/devel .cvsignore, 1.15, 1.16 libglade-java.spec,
	1.43, 1.44 sources, 1.16, 1.17
Message-ID: <200608132113.k7DLDenc025629@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25425

Modified Files:
	.cvsignore libglade-java.spec sources 
Log Message:
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel subpackage.
- The -devel subpackage now requires several -devel packages.
- Update requires and buildrequires.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	17 Jun 2006 22:37:41 -0000	1.15
+++ .cvsignore	13 Aug 2006 21:13:38 -0000	1.16
@@ -1 +1 @@
-libglade-java-2.12.4.tar.bz2
+libglade-java-2.12.5.tar.bz2


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libglade-java.spec	27 Jul 2006 15:50:49 -0000	1.43
+++ libglade-java.spec	13 Aug 2006 21:13:38 -0000	1.44
@@ -14,8 +14,8 @@
 
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	2.12.4
-Release: 	3
+Version:	2.12.5
+Release: 	1%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -23,16 +23,12 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	libglade2 >= 2.5.1
-Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
-Requires:	%{java_pkg_prefix}libgnome-java >= 2.12.2
-Requires:       libgnomeui >= 2.11.0
-Requires:       libgnomecanvas >= 2.11.0
-BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
-BuildRequires:	%{java_pkg_prefix}libgnome-java-devel >= 2.12.2
+Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.6
+Requires:	%{java_pkg_prefix}libgnome-java >= 2.12.4
+BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.6
+BuildRequires:	%{java_pkg_prefix}libgnome-java-devel >= 2.12.4
 BuildRequires:  libglade2-devel >= 2.5.1, gcc-java >= 4.1.1
 BuildRequires:	java-devel >= 1.4.2
-BuildRequires:  libgnomeui-devel >= 2.11.0
-BuildRequires:  libgnomecanvas-devel >= 2.11.0 
 BuildRequires:  docbook-utils
 
 %description
@@ -43,11 +39,11 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	libglade2-devel
+Requires:	libgnome-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
-
+Development part of %{name}.
 
 %prep
 %setup -q -n %{name_base}-%{version}
@@ -62,7 +58,7 @@
 %configure %{configure_args}
 
 mkdir -p doc/api/
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -76,7 +72,7 @@
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name}' ] ; then
@@ -92,11 +88,8 @@
 popd
 
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
@@ -106,14 +99,22 @@
 %doc doc/api AUTHORS COPYING NEWS README
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.5-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel subpackage.
+- The -devel subpackage now requires several -devel packages.
+- Update requires and buildrequires.
+
 * Thu Jul 27 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.4-3
 - Remove javadoc date string hack.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	17 Jun 2006 22:37:42 -0000	1.16
+++ sources	13 Aug 2006 21:13:38 -0000	1.17
@@ -1 +1 @@
-2427ad75063ea45a8b580615b7553bde  libglade-java-2.12.4.tar.bz2
+c0dc4ca493a2978e04a055d838610a63  libglade-java-2.12.5.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 21:18:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 17:18:45 -0400
Subject: rpms/control-center/devel control-center.spec,1.167,1.168
Message-ID: <200608132118.k7DLIj4D009992@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9909

Modified Files:
	control-center.spec 
Log Message:
fix version numbers in changelog



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- control-center.spec	13 Aug 2006 16:34:35 -0000	1.167
+++ control-center.spec	13 Aug 2006 21:18:42 -0000	1.168
@@ -268,10 +268,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.01-2.fc6
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-2.fc6
 - fix spec file (pointed out by Yanko Kaneti)
 
-* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 
 * Mon Aug 07 2006 Karsten Hopp <karsten at redhat.com> 2.15.90-4



From fedora-cvs-commits at redhat.com  Sun Aug 13 21:21:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 17:21:44 -0400
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.20,
	1.21 gnome-power-manager.spec, 1.53, 1.54 sources, 1.20, 1.21
Message-ID: <200608132121.k7DLLiH2011121@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11014

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	12 Jul 2006 03:05:50 -0000	1.20
+++ .cvsignore	13 Aug 2006 21:21:41 -0000	1.21
@@ -1 +1 @@
-gnome-power-manager-2.15.4.tar.bz2
+gnome-power-manager-2.15.91.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-power-manager.spec	8 Aug 2006 15:33:43 -0000	1.53
+++ gnome-power-manager.spec	13 Aug 2006 21:21:41 -0000	1.54
@@ -4,8 +4,8 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.15.4
-Release: 3
+Version: 2.15.91
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -44,7 +44,11 @@
 %patch0 -p1 -b .nodefaultbeep
 
 %build
-%configure --disable-scrollkeeper --disable-actions-menu --disable-policykit
+%configure \
+	--disable-scrollkeeper \
+	--disable-actions-menu \
+	--disable-icon-framing \
+        --disable-policykit
 make
 
 %install
@@ -105,6 +109,12 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
+* Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Tue Aug  8 2006 Peter Jones <pjones at redhat.com> - 2.15.4-3
 - Don't beep by default, since there's no UI to turn it off.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	12 Jul 2006 03:05:50 -0000	1.20
+++ sources	13 Aug 2006 21:21:41 -0000	1.21
@@ -1 +1 @@
-0fa269fc8c91b5ff6152b6753b3fa61d  gnome-power-manager-2.15.4.tar.bz2
+1096d20879e5180912885acf22ff5741  gnome-power-manager-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 21:23:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 17:23:09 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.54,1.55
Message-ID: <200608132123.k7DLN9U6011695@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11635

Modified Files:
	gnome-power-manager.spec 
Log Message:
fix changelog



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-power-manager.spec	13 Aug 2006 21:21:41 -0000	1.54
+++ gnome-power-manager.spec	13 Aug 2006 21:23:07 -0000	1.55
@@ -112,12 +112,12 @@
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 
-* Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
-- Update to 2.15.4
-
 * Tue Aug  8 2006 Peter Jones <pjones at redhat.com> - 2.15.4-3
 - Don't beep by default, since there's no UI to turn it off.
 
+* Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Tue Jul 18 2006 Ray Strode <rstrode at redhat.com> - 2.15.3-2
 - explicitly disable policykit since we don't ship it
 



From fedora-cvs-commits at redhat.com  Sun Aug 13 21:26:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 17:26:56 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.55,1.56
Message-ID: <200608132126.k7DLQuMp013151@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13091

Modified Files:
	gnome-power-manager.spec 
Log Message:
more changelog fixage



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-power-manager.spec	13 Aug 2006 21:23:07 -0000	1.55
+++ gnome-power-manager.spec	13 Aug 2006 21:26:53 -0000	1.56
@@ -115,9 +115,6 @@
 * Tue Aug  8 2006 Peter Jones <pjones at redhat.com> - 2.15.4-3
 - Don't beep by default, since there's no UI to turn it off.
 
-* Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
-- Update to 2.15.4
-
 * Tue Jul 18 2006 Ray Strode <rstrode at redhat.com> - 2.15.3-2
 - explicitly disable policykit since we don't ship it
 



From fedora-cvs-commits at redhat.com  Sun Aug 13 21:29:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 17:29:33 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.56,1.57
Message-ID: <200608132129.k7DLTXuc014219@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14166

Modified Files:
	gnome-power-manager.spec 
Log Message:
fixety fix



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-power-manager.spec	13 Aug 2006 21:26:53 -0000	1.56
+++ gnome-power-manager.spec	13 Aug 2006 21:29:30 -0000	1.57
@@ -9,7 +9,7 @@
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
-Patch0: gnome-power-manager-2.5.14-nodefaultbeep.patch
+Patch0: gnome-power-manager-2.5.4-nodefaultbeep.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel



From fedora-cvs-commits at redhat.com  Sun Aug 13 22:11:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 18:11:18 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.57,1.58
Message-ID: <200608132211.k7DMBI1f008569@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8522

Modified Files:
	gnome-power-manager.spec 
Log Message:
arrg



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnome-power-manager.spec	13 Aug 2006 21:29:30 -0000	1.57
+++ gnome-power-manager.spec	13 Aug 2006 22:11:14 -0000	1.58
@@ -9,7 +9,7 @@
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
-Patch0: gnome-power-manager-2.5.4-nodefaultbeep.patch
+Patch0: gnome-power-manager-2.15.4-nodefaultbeep.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel



From fedora-cvs-commits at redhat.com  Sun Aug 13 22:20:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 18:20:52 -0400
Subject: rpms/pygobject2/devel .cvsignore, 1.3, 1.4 pygobject2.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200608132220.k7DMKqGU026483@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygobject2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26435

Modified Files:
	.cvsignore pygobject2.spec sources 
Log Message:
2.11.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jul 2006 03:19:10 -0000	1.3
+++ .cvsignore	13 Aug 2006 22:20:50 -0000	1.4
@@ -1 +1 @@
-pygobject-2.11.0.tar.bz2
+pygobject-2.11.2.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pygobject2.spec	19 Jul 2006 13:22:28 -0000	1.6
+++ pygobject2.spec	13 Aug 2006 22:20:50 -0000	1.7
@@ -3,8 +3,8 @@
 
 Summary: Python bindings for gobjects
 Name: pygobject2
-Version: 2.11.0
-Release: 2
+Version: 2.11.2
+Release: 1%{?dist}
 License: LGPL
 Group: Development/Languages
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.10/
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/pygobject-2.0.pc
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.2-1.fc6
+- Update to 2.11.2
+
 * Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 2.11.0-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jul 2006 03:19:10 -0000	1.3
+++ sources	13 Aug 2006 22:20:50 -0000	1.4
@@ -1 +1 @@
-5a437150bdffdcdb5c7de7f3f6906449  pygobject-2.11.0.tar.bz2
+ca5d9a6336f6b82fca90481683f5acef  pygobject-2.11.2.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 22:29:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 18:29:27 -0400
Subject: rpms/pygtk2/devel .cvsignore, 1.29, 1.30 pygtk.spec, 1.60,
	1.61 sources, 1.29, 1.30
Message-ID: <200608132229.k7DMTRq2006287@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6273

Modified Files:
	.cvsignore pygtk.spec sources 
Log Message:
2.9.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	13 Jul 2006 02:47:58 -0000	1.29
+++ .cvsignore	13 Aug 2006 22:29:25 -0000	1.30
@@ -1 +1 @@
-pygtk-2.9.3.tar.bz2
+pygtk-2.9.6.tar.bz2


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- pygtk.spec	28 Jul 2006 01:56:55 -0000	1.60
+++ pygtk.spec	13 Aug 2006 22:29:25 -0000	1.61
@@ -2,8 +2,8 @@
 
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
-Version: 2.9.3
-Release: 3
+Version: 2.9.6
+Release: 1%{?dist}
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -119,6 +119,9 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.6-1.fc6
+- Update to 2.9.6
+
 * Fri Jul 28 2006 Alexander Larsson <alexl at redhat.com> - 2.9.3-3
 - Make sure reloading the gtk module works
 - Fixes system-config-display (#199629)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	13 Jul 2006 02:47:58 -0000	1.29
+++ sources	13 Aug 2006 22:29:25 -0000	1.30
@@ -1 +1 @@
-7dce749a2bac4b9c8ba4ca7f44c1162f  pygtk-2.9.3.tar.bz2
+7146d0adcb81368e69296a9c4f25aa09  pygtk-2.9.6.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 13 22:50:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 18:50:59 -0400
Subject: rpms/pygtk2/devel pygtk.spec,1.61,1.62
Message-ID: <200608132250.k7DMoxRG021520@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21507

Modified Files:
	pygtk.spec 
Log Message:
drop patch`



Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- pygtk.spec	13 Aug 2006 22:29:25 -0000	1.61
+++ pygtk.spec	13 Aug 2006 22:50:57 -0000	1.62
@@ -26,7 +26,6 @@
 BuildRequires: pygobject2-devel >= 2.10.1 
 BuildRequires: libtool
 
-Patch0: pygtk-2.9.2-use-complete-include-path.patch
 Patch1: pygtk-2.9.3-init.patch
 Patch2: pygtk-2.9.3-crazy-reload-hack.patch
 
@@ -58,8 +57,7 @@
 
 %prep
 %setup -q -n pygtk-%{version}
-%patch0 -p1 -b .use-complete-include-path
-%patch1 -p1
+%patch1 -p1 -b .init
 %patch2 -p1 -b .crazy-reload-hack
 
 %build



From fedora-cvs-commits at redhat.com  Sun Aug 13 23:25:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 19:25:52 -0400
Subject: rpms/totem/devel .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 totem.spec, 1.70, 1.71
Message-ID: <200608132325.k7DNPqu5018561@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32145

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
1.5.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	3 Aug 2006 23:07:03 -0000	1.25
+++ .cvsignore	13 Aug 2006 23:25:48 -0000	1.26
@@ -1 +1 @@
-totem-1.5.90.tar.bz2
+totem-1.5.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	3 Aug 2006 23:07:03 -0000	1.25
+++ sources	13 Aug 2006 23:25:49 -0000	1.26
@@ -1 +1 @@
-f4d03b463cfb08299b5bce75e3ed3ec1  totem-1.5.90.tar.bz2
+2195f9a36c5328c3ee10f1dfda206865  totem-1.5.91.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- totem.spec	3 Aug 2006 23:07:03 -0000	1.70
+++ totem.spec	13 Aug 2006 23:25:49 -0000	1.71
@@ -4,7 +4,7 @@
 
 Summary: Movie player for GNOME 2
 Name: totem
-Version: 1.5.90
+Version: 1.5.91
 Release: 1%{?dist} 
 License: GPL
 Group: Applications/Multimedia
@@ -12,7 +12,6 @@
 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
-Patch3: totem-1.5.4-firefox.patch
 
 Requires(post): GConf2
 Requires(post): desktop-file-utils
@@ -75,7 +74,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .feature-help-removal
-%patch3 -p1 -b .firefox
 
 %build
 # try to work around a problem where gst-inspect does 
@@ -162,7 +160,8 @@
 %{_libdir}/libtotem-plparser.*
 %{_libdir}/nautilus/extensions-1.0/*.so*
 %{_bindir}/%{name}-video-thumbnailer
-%{_datadir}/icons/hicolor/48x48/apps/media-player-48.png
+%{_datadir}/icons/hicolor/*/apps/totem.png
+%{_datadir}/icons/hicolor/scalable/apps/totem.svg
 %exclude %{_datadir}/%{name}/vanity.*
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man1/totem-video-thumbnailer.1.gz
@@ -179,6 +178,9 @@
 %{_libdir}/*so
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.91-1.fc6
+- Update to 1.5.91
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.90-1.fc6
 - Update to 1.5.90
 



From fedora-cvs-commits at redhat.com  Sun Aug 13 23:51:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 19:51:57 -0400
Subject: rpms/totem/devel totem.spec,1.71,1.72
Message-ID: <200608132351.k7DNpvN7008561@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8420

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



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- totem.spec	13 Aug 2006 23:25:49 -0000	1.71
+++ totem.spec	13 Aug 2006 23:51:54 -0000	1.72
@@ -32,7 +32,7 @@
 BuildRequires: iso-codes-devel
 BuildRequires: firefox-devel
 BuildRequires: gnome-icon-theme
-BuildRequires: nautilus
+BuildRequires: nautilus-devel
 BuildRequires: libXtst-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXt-devel



From fedora-cvs-commits at redhat.com  Mon Aug 14 01:07:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 21:07:56 -0400
Subject: rpms/gconf-editor/devel .cvsignore, 1.18, 1.19 gconf-editor.spec,
	1.35, 1.36 sources, 1.18, 1.19
Message-ID: <200608140107.k7E17uPn026804@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gconf-editor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26744

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	13 Mar 2006 05:20:10 -0000	1.18
+++ .cvsignore	14 Aug 2006 01:07:53 -0000	1.19
@@ -1,9 +1,2 @@
-gconf-editor-2.7.91.tar.bz2
-gconf-editor-2.8.0.tar.bz2
-gconf-editor-2.9.3.tar.bz2
-gconf-editor-2.9.91.tar.bz2
-gconf-editor-2.10.0.tar.bz2
-gconf-editor-2.12.0.tar.bz2
-gconf-editor-2.12.1.tar.bz2
-gconf-editor-2.13.90.tar.bz2
-gconf-editor-2.14.0.tar.bz2
+gconf-editor-2.15.91.tar.bz2
+gconf-editor.omf.in


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/dist/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gconf-editor.spec	12 Jul 2006 05:53:32 -0000	1.35
+++ gconf-editor.spec	14 Aug 2006 01:07:53 -0000	1.36
@@ -1,16 +1,18 @@
 %define pango_version 1.2.0
 %define gtk2_version 2.6.0
 %define gconf2_version 2.9.2
+%define libgnome_version 2.14.0
 %define libgnomeui_version 2.6.0
 %define desktop_file_utils_version 0.2.90
 %define perl_XML_Parser_version 2.31-16
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.14.0
-Release: 4.1
+Version: 2.15.91
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
+Source1: gconf-editor.omf.in
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-root
@@ -21,12 +23,12 @@
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
+BuildRequires: libgnome-devel >= %{libgnome_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: scrollkeeper
 BuildRequires: gettext
-
-Patch0: gconf-editor-2.14.0-use-correct-free.patch
+BuildRequires: gnome-doc-utils
 
 %description
 gconf-editor allows you to browse and modify GConf configuration 
@@ -34,10 +36,11 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .use-correct-free
+
+cp %{SOURCE1} docs/
 
 %build
-%configure
+%configure --disable-scrollkeeper
 make
 
 %install
@@ -61,11 +64,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gconf-editor.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/gconf-editor.schemas > /dev/null
 
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -73,13 +74,13 @@
 fi
 
 %preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gconf-editor.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gconf-editor.schemas > /dev/null
+fi
 
 %postun
+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
@@ -98,6 +99,9 @@
 %{_datadir}/omf/gconf-editor
 
 %changelog
+* Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-4.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gconf-editor/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	13 Mar 2006 05:20:10 -0000	1.18
+++ sources	14 Aug 2006 01:07:53 -0000	1.19
@@ -1 +1,2 @@
-eb8b979464f6e383e5a27b57ee4e8382  gconf-editor-2.14.0.tar.bz2
+5b46ca0f177428b6c84c53cebd81831e  gconf-editor-2.15.91.tar.bz2
+bc2f3a0761a909ec0c31aa4e33350a08  gconf-editor.omf.in



From fedora-cvs-commits at redhat.com  Mon Aug 14 01:39:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 21:39:03 -0400
Subject: rpms/pygobject2/devel pygobject2.spec,1.7,1.8
Message-ID: <200608140139.k7E1d3Ww027870@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygobject2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27850

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



Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pygobject2.spec	13 Aug 2006 22:20:50 -0000	1.7
+++ pygobject2.spec	14 Aug 2006 01:38:57 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: Python bindings for gobjects
 Name: pygobject2
 Version: 2.11.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Languages
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.10/
@@ -17,6 +17,7 @@
 # needed for automake/autoconf to work right with multilib python
 Buildrequires: automake >= 1.6.3-5
 Buildrequires: libtool
+Buildrequires: libxslt
 
 %description
 Pygobjects is an extension module for python that gives you access to GLib's 
@@ -69,6 +70,9 @@
 %{_libdir}/pkgconfig/pygobject-2.0.pc
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.2-2.fc6
+- BR libxslt
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.2-1.fc6
 - Update to 2.11.2
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 01:50:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 21:50:46 -0400
Subject: rpms/pygobject2/devel pygobject2.spec,1.8,1.9
Message-ID: <200608140150.k7E1oknL010599@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygobject2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10586

Modified Files:
	pygobject2.spec 
Log Message:
more build reqs



Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pygobject2.spec	14 Aug 2006 01:38:57 -0000	1.8
+++ pygobject2.spec	14 Aug 2006 01:50:44 -0000	1.9
@@ -18,6 +18,7 @@
 Buildrequires: automake >= 1.6.3-5
 Buildrequires: libtool
 Buildrequires: libxslt
+Buildrequires: docbook-style-xsl
 
 %description
 Pygobjects is an extension module for python that gives you access to GLib's 



From fedora-cvs-commits at redhat.com  Mon Aug 14 02:13:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 22:13:08 -0400
Subject: rpms/pygobject2/devel pygobject2.spec,1.9,1.10
Message-ID: <200608140213.k7E2D8jv021876@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygobject2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21807

Modified Files:
	pygobject2.spec 
Log Message:
include docs



Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pygobject2.spec	14 Aug 2006 01:50:44 -0000	1.9
+++ pygobject2.spec	14 Aug 2006 02:13:04 -0000	1.10
@@ -69,6 +69,8 @@
 %dir %{_prefix}/include/pygtk-2.0
 %{_prefix}/include/pygtk-2.0/*.h
 %{_libdir}/pkgconfig/pygobject-2.0.pc
+%{_datadir}/gtk-doc/html/pygobject
+%{_datadir}/pygobject
 
 %changelog
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.2-2.fc6



From fedora-cvs-commits at redhat.com  Mon Aug 14 02:24:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 22:24:14 -0400
Subject: rpms/pygtk2/devel pygtk.spec,1.62,1.63
Message-ID: <200608140224.k7E2OEbU007864@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7760

Modified Files:
	pygtk.spec 
Log Message:
require newer pygobject



Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- pygtk.spec	13 Aug 2006 22:50:57 -0000	1.62
+++ pygtk.spec	14 Aug 2006 02:24:09 -0000	1.63
@@ -23,7 +23,7 @@
 Buildrequires: automake >= 1.6.3-5
 BuildRequires: python-numeric
 BuildRequires: pycairo-devel >= 0.5.0
-BuildRequires: pygobject2-devel >= 2.10.1 
+BuildRequires: pygobject2-devel >= 2.11.2 
 BuildRequires: libtool
 
 Patch1: pygtk-2.9.3-init.patch



From fedora-cvs-commits at redhat.com  Mon Aug 14 02:24:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 22:24:37 -0400
Subject: rpms/kernel/devel Makefile.config, 1.46, 1.47 kernel-2.6.spec,
	1.2558, 1.2559
Message-ID: <200608140224.k7E2ObJc008023@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
Initial OLPC bits.




Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile.config	22 Jul 2006 14:52:52 -0000	1.46
+++ Makefile.config	14 Aug 2006 02:24:34 -0000	1.47
@@ -13,7 +13,8 @@
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
 	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \
-	$(CFG)-ia64-xen.config
+	$(CFG)-ia64-xen.config \
+	$(CFG)-olpc.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
@@ -24,7 +25,8 @@
 	@rm -f temp-generic temp-xen-generic \
 		temp-x86-xen-generic \
 		temp-x86_64-xen-generic temp-x86_64-xen-generic-tmp \
-		temp-ia64-xen-generic temp-ia64-xen-generic-tmp
+		temp-ia64-xen-generic temp-ia64-xen-generic-tmp \
+		temp-olpc-config
 
 # Augment the clean target to clean up our own cruft
 clean ::
@@ -87,6 +89,9 @@
 kernel-$(VERSION)-i686-kdump.config: configs/config-i686-kdump temp-x86-generic
 	perl merge.pl $^ i386 > $@
 
+kernel-$(VERSION)-olpc.config: configs/config-olpc temp-x86-generic
+	perl merge.pl $^ i386 > $@
+
 kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic
 	perl merge.pl $^ i386 > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2558
retrieving revision 1.2559
diff -u -r1.2558 -r1.2559
--- kernel-2.6.spec	12 Aug 2006 22:51:45 -0000	1.2558
+++ kernel-2.6.spec	14 Aug 2006 02:24:34 -0000	1.2559
@@ -1277,6 +1277,9 @@
 BuildKernel %make_target %kernel_image kdump
 %endif
 
+%if %{buildolpc}
+BuildKernel %make_target %kernel_image olpc
+$endif
 
 ###
 ### Special hacks for debuginfo subpackages.



From fedora-cvs-commits at redhat.com  Mon Aug 14 02:44:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 22:44:48 -0400
Subject: rpms/pygtk2/devel pygtk.spec,1.63,1.64
Message-ID: <200608140244.k7E2imqs013250@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13176

Modified Files:
	pygtk.spec 
Log Message:
fix file lists



Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- pygtk.spec	14 Aug 2006 02:24:09 -0000	1.63
+++ pygtk.spec	14 Aug 2006 02:44:44 -0000	1.64
@@ -88,7 +88,7 @@
 %{_libdir}/python?.?/site-packages/gtk-2.0/atk.so
 %{_libdir}/python?.?/site-packages/gtk-2.0/pango.so
 %{_libdir}/python?.?/site-packages/gtk-2.0/gtk/_gtk.so
-%{_libdir}/python?.?/site-packages/gtk-2.0/gtk/unixprint.so
+%{_libdir}/python?.?/site-packages/gtk-2.0/gtkunixprint.so
 %{_libdir}/python?.?/site-packages/gtk-2.0/pangocairo.so
 
 %doc AUTHORS NEWS README MAPPING ChangeLog



From fedora-cvs-commits at redhat.com  Mon Aug 14 02:53:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 22:53:37 -0400
Subject: rpms/kernel/devel/configs config-olpc,NONE,1.1
Message-ID: <200608140253.k7E2rbkr030838@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	config-olpc 
Log Message:
initial olpc config


--- NEW FILE config-olpc ---
# CONFIG_M686 is not set
CONFIG_MGEODE_LX=y

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

# CONFIG_HPET_TIMER is not set
# CONFIG_MICROCODE is not set

# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set

# CONFIG_MODULE_SIG is not set
# CONFIG_UTRACE is not set
# CONFIG_PTRACE is not set

CONFIG_EMBEDDED=y
# CONFIG_BASE_FULL is not set
CONFIG_BASE_SMALL=1
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_SHMEM=y
CONFIG_SLAB=y
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_DNOTIFY=y
CONFIG_SYSFS=y
CONFIG_EARLY_PRINTK=y
CONFIG_DOUBLEFAULT=y

# CONFIG_DVB is not set
# CONFIG_USB_DABUSB is not set

# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
# CONFIG_LSF is not set

# CONFIG_IOSCHED_AS is not set
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_SMP is not set
# CONFIG_X86_GENERICARCH is not set
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set

# CONFIG_X86_UP_APIC is not set
# CONFIG_X86_MCE is not set

# CONFIG_EDD is not set
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set

CONFIG_SPARSEMEM_STATIC=y
# CONFIG_RESOURCES_64BIT is not set
# CONFIG_EFI is not set

CONFIG_VGA_NOPROBE=y
CONFIG_HZ_100=y
# CONFIG_HZ_250 is not set
CONFIG_HZ=100

# CONFIG_ACPI_AC is not set
# CONFIG_ACPI_BATTERY is not set
# CONFIG_ACPI_BUTTON is not set
# CONFIG_ACPI_VIDEO is not set
# CONFIG_ACPI_FAN is not set
# CONFIG_ACPI_DOCK is not set
# CONFIG_ACPI_PROCESSOR is not set
# CONFIG_ACPI_ASUS is not set
# CONFIG_ACPI_IBM is not set
# CONFIG_ACPI_TOSHIBA is not set
# CONFIG_ACPI_CONTAINER is not set
# CONFIG_ACPI_SBS is not set

# FIXME: Doesn't the geode have powernow?
# CONFIG_CPU_FREQ is not set

# CONFIG_PCIEPORTBUS is not set
# CONFIG_ISA is not set
# CONFIG_PCCARD is not set
# CONFIG_HOTPLUG_PCI is not set

CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_NR_UARTS=1
CONFIG_SERIAL_8250_RUNTIME_UARTS=1

# CONFIG_DTLK is not set
# CONFIG_R3964 is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y
CONFIG_INET_XFRM_MODE_TUNNEL=y

# CONFIG_NETWORK_SECMARK is not set

# CONFIG_TIPC is not set
# CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
# CONFIG_NET_PKTGEN is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_IP_VS is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_IP_MROUTE is not set
# CONFIG_INET_DIAG is not set

# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_WISTRON_BTNS is not set
# CONFIG_GAMEPORT is not set

# CONFIG_IP_NF_SIP is not set
# CONFIG_IRPORT_SIR is not set
# CONFIG_MCS_FIR is not set

CONFIG_MTD=y
CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
CONFIG_MTD_NAND_CS553X=y

# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_PARPORT is not set
# CONFIG_PNP is not set
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_SX8 is not set
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_IDE is not set

CONFIG_SCSI=y
# CONFIG_RAID_ATTRS is not set
# CONFIG_CHR_DEV_ST is not set
# CONFIG_CHR_DEV_OSST is not set
# CONFIG_SCSI_SPI_ATTRS is not set
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
# CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_ISCSI_TCP is not set

# CONFIG_MD is not set
# CONFIG_DM_CRYPT=m
# CONFIG_DM_SNAPSHOT is not set
# CONFIG_DM_MIRROR is not set
# CONFIG_DM_ZERO is not set
# CONFIG_DM_MULTIPATH is not set
# CONFIG_DM_MULTIPATH_EMC is not set

CONFIG_BLK_DEV_SD=y
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_AIC79XX is not set
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_GDTH is not set
# CONFIG_SCSI_IPS is not set
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
# CONFIG_SCSI_QLA_FC is not set
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_MD_RAID456 is not set
# CONFIG_FUSION is not set
# CONFIG_FUSION_SPI is not set
# CONFIG_FUSION_FC is not set
# CONFIG_FUSION_SAS is not set
# CONFIG_IEEE1394 is not set
# CONFIG_I2O is not set
# CONFIG_PHYLIB is not set
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NET_TULIP is not set
# CONFIG_NET_PCI is not set
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
# CONFIG_E1000 is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
# CONFIG_CHELSIO_T1 is not set
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set
# CONFIG_MYRI10GE is not set
# CONFIG_TR is not set
# CONFIG_NET_WIRELESS_RTNETLINK is not set
# CONFIG_IPW2100 is not set
# CONFIG_IPW2200 is not set
# CONFIG_AIRO is not set
# CONFIG_HERMES is not set
# CONFIG_ATMEL is not set
# CONFIG_PRISM54 is not set
# CONFIG_USB_ZD1201 is not set
# CONFIG_HOSTAP is not set
# CONFIG_BCM43XX is not set
# CONFIG_ZD1211RW is not set
# CONFIG_ATM_LANAI is not set
# CONFIG_ATM_ENI is not set
# CONFIG_ATM_FIRESTREAM is not set
# CONFIG_ATM_NICSTAR is not set
# CONFIG_ATM_IDT77252 is not set
# CONFIG_ATM_AMBASSADOR is not set
# CONFIG_ATM_HORIZON is not set
# CONFIG_ATM_FORE200E_MAYBE is not set
# CONFIG_ATM_HE is not set
# CONFIG_FDDI is not set
# CONFIG_NET_FC is not set
# CONFIG_ISDN is not set
# CONFIG_SERIO_RAW is not set
# CONFIG_VT_HW_CONSOLE_BINDING is not set
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_N_HDLC is not set
# CONFIG_CYCLADES is not set
# CONFIG_SYNCLINK is not set
# CONFIG_SYNCLINKMP is not set
# CONFIG_SYNCLINK_GT is not set
# CONFIG_RISCOM8 is not set
# CONFIG_SERIAL_JSM is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_IBMASR is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_I8XX_TCO is not set
# CONFIG_W83627HF_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
# CONFIG_USBPCWATCHDOG is not set
# CONFIG_HW_RANDOM_INTEL is not set
# CONFIG_HW_RANDOM_AMD is not set
CONFIG_HW_RANDOM_GEODE=y
# CONFIG_HW_RANDOM_VIA is not set
# CONFIG_SONYPI is not set
# CONFIG_FTAPE is not set
# CONFIG_AGP is not set
# CONFIG_DRM is not set
# CONFIG_MWAVE is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_NSC_GPIO is not set
# CONFIG_TCG_TPM is not set

CONFIG_I2C=y
# CONFIG_I2C_ALI1535 is not set
# CONFIG_I2C_ALI1563 is not set
# CONFIG_I2C_ALI15X3 is not set
# CONFIG_I2C_AMD756 is not set
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_I801 is not set
# CONFIG_I2C_I810 is not set
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PROSAVAGE is not set
# CONFIG_I2C_SAVAGE4 is not set
CONFIG_SCx200_ACB=y
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
# CONFIG_I2C_STUB is not set
# CONFIG_I2C_VIA is not set
# CONFIG_I2C_VIAPRO is not set
# CONFIG_I2C_VOODOO3 is not set
# CONFIG_I2C_PCA_ISA is not set
CONFIG_I2C_DEBUG_CHIP=y
# CONFIG_W1 is not set
# CONFIG_HWMON is not set
# CONFIG_HWMON_VID is not set
# CONFIG_IBM_ASM is not set
# CONFIG_VIDEO_V4L1 is not set
CONFIG_VIDEO_V4L2=y
# CONFIG_VIDEO_BT848 is not set
# CONFIG_VIDEO_SAA5249 is not set
# CONFIG_TUNER_3036 is not set
# CONFIG_VIDEO_SAA7134 is not set
# CONFIG_VIDEO_CX88 is not set
# CONFIG_VIDEO_MSP3400 is not set
# CONFIG_VIDEO_CS53L32A is not set
# CONFIG_VIDEO_TLV320AIC23B is not set
# CONFIG_VIDEO_WM8775 is not set
# CONFIG_VIDEO_WM8739 is not set
# CONFIG_VIDEO_CX2341X is not set
# CONFIG_VIDEO_CX25840 is not set
# CONFIG_VIDEO_SAA711X is not set
# CONFIG_VIDEO_SAA7127 is not set
# CONFIG_VIDEO_UPD64031A is not set
# CONFIG_VIDEO_UPD64083 is not set
# CONFIG_VIDEO_PVRUSB2 is not set
# CONFIG_USB_QUICKCAM_MESSENGER is not set
CONFIG_FIRMWARE_EDID=y

CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_VESA is not set
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_NVIDIA is not set
# CONFIG_FB_RIVA is not set
# CONFIG_FB_I810 is not set
# CONFIG_FB_INTEL is not set
# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_CYBLA is not set
# CONFIG_FB_TRIDENT is not set
CONFIG_FB_GEODE=y
CONFIG_FB_GEODE_GX=y
# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set
CONFIG_FB_GEODE_GX_DCON=m
# CONFIG_FB_GEODE_GX1 is not set

CONFIG_FONTS=y
# CONFIG_FONT_8x8 is not set
# CONFIG_FONT_8x16 is not set
# CONFIG_FONT_6x11 is not set
# CONFIG_FONT_7x14 is not set
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_ACORN_8x8 is not set
# CONFIG_FONT_MINI_4x6 is not set
# CONFIG_FONT_SUN8x16 is not set
CONFIG_FONT_SUN12x22=y
# CONFIG_FONT_10x18 is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_LCD_CLASS_DEVICE=y
# CONFIG_SND_AD1889 is not set
# CONFIG_SND_ALS300 is not set
# CONFIG_SND_ALS4000 is not set
# CONFIG_SND_ALI5451 is not set
# CONFIG_SND_ATIIXP is not set
# CONFIG_SND_ATIIXP_MODEM is not set
# CONFIG_SND_AU8810 is not set
# CONFIG_SND_AU8820 is not set
# CONFIG_SND_AU8830 is not set
# CONFIG_SND_AZT3328 is not set
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_GINA20 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_DARLA24 is not set
# CONFIG_SND_GINA24 is not set
# CONFIG_SND_LAYLA24 is not set
# CONFIG_SND_MONA is not set
# CONFIG_SND_MIA is not set
# CONFIG_SND_ECHO3G is not set
# CONFIG_SND_INDIGO is not set
# CONFIG_SND_INDIGOIO is not set
# CONFIG_SND_INDIGODJ is not set
# CONFIG_SND_EMU10K1 is not set
# CONFIG_SND_EMU10K1X is not set
# CONFIG_SND_ENS1370 is not set
# CONFIG_SND_ENS1371 is not set
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
# CONFIG_SND_HDA_INTEL is not set
# CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIXART is not set
# CONFIG_SND_NM256 is not set
# CONFIG_SND_PCXHR is not set
# CONFIG_SND_RIPTIDE is not set
# CONFIG_SND_RME32 is not set
# CONFIG_SND_RME96 is not set
# CONFIG_SND_RME9652 is not set
# CONFIG_SND_SONICVIBES is not set
# CONFIG_SND_TRIDENT is not set
# CONFIG_SND_VIA82XX is not set
# CONFIG_SND_VIA82XX_MODEM is not set
# CONFIG_SND_VX222 is not set
# CONFIG_SND_YMFPCI is not set
CONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_SERIAL_ANYDATA=m
# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
# CONFIG_USB_SERIAL_OPTION is not set
# CONFIG_USB_APPLEDISPLAY is not set

CONFIG_USB_TOUCHSCREEN_EGALAX=y
CONFIG_USB_TOUCHSCREEN_PANJIT=y
CONFIG_USB_TOUCHSCREEN_3M=y
CONFIG_USB_TOUCHSCREEN_ITM=y

# CONFIG_MMC_WBSD is not set
# CONFIG_NEW_LEDS is not set
# CONFIG_INFINIBAND is not set
# CONFIG_EDAC is not set
# CONFIG_RTC_DRV_DS1307 is not set
# CONFIG_RTC_DRV_DS1553 is not set
# CONFIG_RTC_DRV_ISL1208 is not set
# CONFIG_RTC_DRV_DS1742 is not set
# CONFIG_RTC_DRV_PCF8583 is not set
# CONFIG_RTC_DRV_V3020 is not set
# CONFIG_DMA_ENGINE is not set
CONFIG_EXT3_FS=y
CONFIG_JBD=y
CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS_XATTR=y
CONFIG_JFFS2_FS_POSIX_ACL=y
CONFIG_JFFS2_FS_SECURITY=y
# CONFIG_CIFS_WEAK_PW_HASH is not set
CONFIG_UNUSED_SYMBOLS=y
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
# CONFIG_PROVE_LOCKING is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_FRAME_POINTER is not set
# CONFIG_STACK_UNWIND is not set
CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_DEV_PADLOCK is not set
CONFIG_CRYPTO_DEV_GEODE=m
CONFIG_ZLIB_DEFLATE=y

# CONFIG_TUX is not set
# CONFIG_NETLABEL is not set

# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_FSCACHE is not set
# CONFIG_CACHEFILES is not set
# CONFIG_NFS_FSCACHE is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_XFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
# CONFIG_DLM is not set
# CONFIG_FUSE_FS is not set
# CONFIG_CONFIGFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_9P_FS is not set

# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
# CONFIG_LDM_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_KARMA_PARTITION is not set
# CONFIG_EFI_PARTITION is not set

# CONFIG_OPROFILE is not set
# CONFIG_KPROBES is not set

# CONFIG_USB_HIDINPUT_POWERBOOK is not set
# CONFIG_HID_FF is not set
# CONFIG_HID_PID is not set
# CONFIG_LOGITECH_FF is not set
# CONFIG_THRUSTMASTER_FF is not set
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
# CONFIG_USB_ACECAD is not set
# CONFIG_USB_KBTAB is not set
# CONFIG_USB_POWERMATE is not set
# CONFIG_USB_XPAD is not set
# CONFIG_USB_ATI_REMOTE is not set
# CONFIG_USB_ATI_REMOTE2 is not set
# CONFIG_USB_KEYSPAN_REMOTE is not set
# CONFIG_USB_APPLETOUCH is not set
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set

# CONFIG_USB_SERIAL is not set
# CONFIG_USB_EMI62 is not set
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_AUERSWALD is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_PHIDGETKIT is not set
# CONFIG_USB_PHIDGETSERVO is not set
# CONFIG_USB_IDMOUSE is not set
# CONFIG_USB_SISUSBVGA is not set
# CONFIG_USB_SISUSBVGA_CON is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TEST is not set

# CONFIG_MMC is not set


# FIXME: Oddball choices. Please explain.
# Why not builtin as in other kernels?
CONFIG_LLC=m
# Why modular ?
CONFIG_CONNECTOR=m
# Do we intend to ship anything that actually needs VM86 ?
CONFIG_VM86=y
# Why are these singled out to be unset?
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set




From fedora-cvs-commits at redhat.com  Mon Aug 14 03:00:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 23:00:21 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2559,
	1.2560 linux-2.6-build-deprecate-configh-include.patch, 1.5, 1.6
Message-ID: <200608140300.k7E30L2e000886@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
	linux-2.6-build-deprecate-configh-include.patch 
Log Message:
kernel-2.6.spec


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2559
retrieving revision 1.2560
diff -u -r1.2559 -r1.2560
--- kernel-2.6.spec	14 Aug 2006 02:24:34 -0000	1.2559
+++ kernel-2.6.spec	14 Aug 2006 03:00:18 -0000	1.2560
@@ -696,7 +696,7 @@
 if [ ! -d xen-%{xen_hv_cset} ]; then
   # %setup does chmod <blah> . what is bad if you are remoing things
   # in the background
-  rm -rf deleteme deleteme2
+  rm -rf deleteme2
   # Ok, first time we do a make prep
 %setup -D -T -q -n %{name}-%{version} -a1
   cp %{SOURCE2} .

linux-2.6-build-deprecate-configh-include.patch:
 a/arch/alpha/kernel/setup.c                                            |    1 -
 a/arch/alpha/kernel/systbls.S                                          |    1 -
 a/arch/arm/kernel/crunch.c                                             |    1 -
 a/arch/arm/kernel/iwmmxt-notifier.c                                    |    1 -
 a/arch/arm/mach-at91rm9200/board-1arm.c                                |    1 -
 a/arch/arm/mach-at91rm9200/board-carmeva.c                             |    1 -
 a/arch/arm/mach-at91rm9200/board-eb9200.c                              |    1 -
 a/arch/arm/mach-at91rm9200/board-kafa.c                                |    1 -
 a/arch/arm/mach-at91rm9200/board-kb9202.c                              |    1 -
 a/arch/arm/mach-ep93xx/edb9302.c                                       |    1 -
 a/arch/arm/mach-ep93xx/edb9315.c                                       |    1 -
 a/arch/arm/mach-ep93xx/edb9315a.c                                      |    1 -
 a/arch/arm/mach-lh7a40x/clcd.c                                         |    2 +-
 a/arch/arm/mach-lh7a40x/clocks.c                                       |    1 -
 a/arch/arm/mach-omap2/pm-domain.c                                      |    1 -
 a/arch/arm/mach-pnx4008/gpio.c                                         |    1 -
 a/arch/arm/mach-pnx4008/sleep.S                                        |    1 -
 a/arch/arm/mach-pnx4008/time.c                                         |    1 -
 a/arch/arm/mach-pxa/leds-trizeps4.c                                    |    1 -
 a/arch/arm26/lib/ecard.S                                               |    1 -
 a/arch/arm26/lib/io-acorn.S                                            |    1 -
 a/arch/frv/kernel/time.c                                               |    1 -
 a/arch/h8300/kernel/time.c                                             |    1 -
 a/arch/i386/lib/semaphore.S                                            |    1 -
 a/arch/ia64/kernel/machine_kexec.c                                     |    1 -
 a/arch/ia64/kernel/relocate_kernel.S                                   |    1 -
 a/arch/m32r/mm/mmu.S                                                   |    1 -
 a/arch/m68k/kernel/time.c                                              |    1 -
 a/arch/m68knommu/platform/532x/config.c                                |    1 -
 a/arch/m68knommu/platform/68328/romvec.S                               |    2 --
 a/arch/parisc/kernel/head.S                                            |    2 --
 a/arch/parisc/kernel/syscall.S                                         |    1 -
 a/arch/powerpc/platforms/83xx/mpc834x_itx.c                            |    1 -
 a/arch/powerpc/platforms/85xx/mpc85xx_cds.c                            |    1 -
 a/arch/powerpc/platforms/cell/cbe_regs.c                               |    2 --
 a/arch/powerpc/platforms/cell/ras.c                                    |    1 -
 a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c                    |    1 -
 a/arch/powerpc/sysdev/tsi108_dev.c                                     |    1 -
 a/arch/ppc/amiga/time.c                                                |    1 -
 a/arch/ppc/platforms/4xx/cpci405.h                                     |    1 -
 a/arch/s390/kernel/kprobes.c                                           |    1 -
 a/arch/sparc/kernel/ioport.c                                           |    1 -
 a/arch/sparc/kernel/of_device.c                                        |    1 -
 a/arch/sparc64/kernel/auxio.c                                          |    1 -
 a/arch/sparc64/kernel/of_device.c                                      |    1 -
 a/arch/sparc64/kernel/prom.c                                           |    1 -
 a/arch/um/drivers/hostaudio_kern.c                                     |    1 -
 a/arch/um/drivers/net_kern.c                                           |    1 -
 a/arch/um/drivers/slip_kern.c                                          |    1 -
 a/arch/um/drivers/ssl.c                                                |    1 -
 a/arch/um/drivers/stdio_console.c                                      |    1 -
 a/arch/um/drivers/ubd_kern.c                                           |    1 -
 a/arch/um/include/mconsole_kern.h                                      |    1 -
 a/arch/um/include/mode_kern.h                                          |    2 --
 a/arch/um/include/skas/mmu-skas.h                                      |    1 -
 a/arch/um/include/sysdep-ppc/ptrace.h                                  |    1 -
 a/arch/um/include/um_uaccess.h                                         |    1 -
 a/arch/um/kernel/init_task.c                                           |    1 -
 a/arch/um/kernel/irq.c                                                 |    1 -
 a/arch/um/kernel/ksyms.c                                               |    1 -
 a/arch/um/kernel/process_kern.c                                        |    1 -
 a/arch/um/kernel/signal.c                                              |    1 -
 a/arch/um/kernel/skas/mem.c                                            |    1 -
 a/arch/um/kernel/skas/mmu.c                                            |    1 -
 a/arch/um/kernel/skas/tlb.c                                            |    1 -
 a/arch/um/kernel/smp.c                                                 |    1 -
 a/arch/um/kernel/sysrq.c                                               |    1 -
 a/arch/um/kernel/trap.c                                                |    1 -
 a/arch/um/kernel/tt/gdb_kern.c                                         |    1 -
 a/arch/um/kernel/tt/mem.c                                              |    1 -
 a/arch/um/kernel/um_arch.c                                             |    1 -
 a/arch/um/sys-i386/ldt.c                                               |    1 -
 a/arch/um/sys-i386/sysrq.c                                             |    1 -
 a/arch/um/sys-i386/tls.c                                               |    1 -
 a/arch/v850/kernel/time.c                                              |    1 -
 a/arch/x86_64/boot/video.S                                             |    2 --
 a/arch/x86_64/ia32/ia32_binfmt.c                                       |    1 -
 a/arch/x86_64/kernel/pci-calgary.c                                     |    1 -
 a/arch/x86_64/kernel/tce.c                                             |    1 -
 a/arch/x86_64/kernel/x8664_ksyms.c                                     |    1 -
 a/arch/x86_64/lib/copy_page.S                                          |    1 -
 a/arch/x86_64/lib/delay.c                                              |    1 -
 a/arch/x86_64/lib/memcpy.S                                             |    1 -
 a/arch/x86_64/lib/memset.S                                             |    1 -
 a/arch/x86_64/lib/thunk.S                                              |    1 -
 a/drivers/block/cciss.c                                                |    1 -
 a/drivers/block/cpqarray.c                                             |    1 -
 a/drivers/char/briq_panel.c                                            |    1 -
 a/drivers/char/ftape/lowlevel/fdc-io.c                                 |    1 -
 a/drivers/char/ftape/zftape/zftape-rw.c                                |    1 -
 a/drivers/char/ftape/zftape/zftape-rw.h                                |    1 -
 a/drivers/char/hw_random/ixp4xx-rng.c                                  |    1 -
 a/drivers/char/nsc_gpio.c                                              |    1 -
 a/drivers/char/pcmcia/synclink_cs.c                                    |    1 -
 a/drivers/char/sx.c                                                    |    2 --
 a/drivers/char/synclink.c                                              |    1 -
 a/drivers/char/watchdog/iTCO_wdt.c                                     |    1 -
 a/drivers/char/watchdog/omap_wdt.c                                     |    1 -
 a/drivers/char/watchdog/pcwd.c                                         |    1 -
 a/drivers/char/watchdog/pcwd_pci.c                                     |    1 -
 a/drivers/char/watchdog/pnx4008_wdt.c                                  |    1 -
 a/drivers/edac/k8_edac.c                                               |    1 -
 a/drivers/hwmon/w83791d.c                                              |    1 -
 a/drivers/i2c/busses/i2c-ocores.c                                      |    1 -
 a/drivers/ide/pci/generic.c                                            |    1 -
 a/drivers/ide/pci/jmicron.c                                            |    1 -
 a/drivers/ide/pci/rz1000.c                                             |    1 -
 a/drivers/input/mouse/touchkit_ps2.c                                   |    1 -
 a/drivers/leds/leds-ams-delta.c                                        |    1 -
 a/drivers/net/3c501.c                                                  |    1 -
 a/drivers/net/hp100.c                                                  |    1 -
 a/drivers/net/irda/mcs7780.c                                           |    1 -
 a/drivers/net/irda/w83977af_ir.c                                       |    1 -
 a/drivers/net/netx-eth.c                                               |    1 -
 a/drivers/net/phy/smsc.c                                               |    1 -
 a/drivers/net/phy/vitesse.c                                            |    1 -
 a/drivers/net/smc911x.c                                                |    2 --
 a/drivers/net/ucc_geth_phy.c                                           |    1 -
 a/drivers/net/wan/cycx_main.c                                          |    1 -
 a/drivers/net/wan/dlci.c                                               |    1 -
 a/drivers/net/wan/sdla.c                                               |    1 -
 a/drivers/net/wireless/tiacx/common.c                                  |    1 -
 a/drivers/net/wireless/tiacx/conv.c                                    |    1 -
 a/drivers/net/wireless/tiacx/ioctl.c                                   |    1 -
 a/drivers/net/wireless/tiacx/pci.c                                     |    1 -
 a/drivers/net/wireless/tiacx/usb.c                                     |    1 -
 a/drivers/net/wireless/tiacx/wlan.c                                    |    1 -
 a/drivers/rtc/rtc-max6902.c                                            |    1 -
 a/drivers/scsi/aic7xxx_old.c                                           |    2 --
 a/drivers/scsi/aic94xx/aic94xx_init.c                                  |    1 -
 a/drivers/scsi/dpt_i2o.c                                               |    1 -
 a/drivers/scsi/hptiop.c                                                |    2 +-
 a/drivers/scsi/imm.h                                                   |    1 -
 a/drivers/scsi/libata-eh.c                                             |    1 -
 a/drivers/scsi/ppa.h                                                   |    1 -
 a/drivers/scsi/scsi.h                                                  |    2 --
 a/drivers/serial/cpm_uart/cpm_uart.h                                   |    1 -
 a/drivers/serial/netx-serial.c                                         |    2 --
 a/drivers/spi/spi_s3c24xx.c                                            |    1 -
 a/drivers/spi/spi_s3c24xx_gpio.c                                       |    1 -
 a/drivers/usb/core/generic.c                                           |    1 -
 a/drivers/usb/gadget/gmidi.c                                           |    1 -
 a/drivers/usb/input/usbtouchscreen.c                                   |    1 -
 a/drivers/usb/misc/appledisplay.c                                      |    1 -
 a/drivers/usb/misc/sisusbvga/sisusb.c                                  |    1 -
 a/drivers/usb/misc/sisusbvga/sisusb_con.c                              |    1 -
 a/drivers/video/intelfb/intelfb_i2c.c                                  |    1 -
 a/fs/isofs/namei.c                                                     |    1 -
 a/fs/nfs/client.c                                                      |    2 --
 a/fs/nfs/fscache.c                                                     |    2 --
 a/fs/nfs/getroot.c                                                     |    1 -
 a/fs/nfs/namespace.c                                                   |    2 --
 a/fs/nfs/nfs4namespace.c                                               |    2 --
 a/fs/nfs/nfsroot.c                                                     |    1 -
 a/fs/nfs/super.c                                                       |    1 -
 a/fs/reiser4/plugin/compress/compress.c                                |    1 -
 a/fs/reiser4/reiser4.h                                                 |    1 -
 a/include/asm-arm/arch-lh7a40x/clocks.h                                |    2 --
 a/include/asm-arm/pgtable-nommu.h                                      |    1 -
 a/include/asm-i386/alternative-asm.i                                   |    2 --
 a/include/asm-i386/frame.i                                             |    1 -
 a/include/asm-powerpc/irq.h                                            |    1 -
 a/include/asm-powerpc/pci-bridge.h                                     |    1 -
 a/include/asm-x86_64/alternative-asm.i                                 |    1 -
 a/include/asm-x86_64/calgary.h                                         |    1 -
 a/include/linux/fscache.h                                              |    1 -
 a/include/net/netdma.h                                                 |    1 -
 a/init/do_mounts.h                                                     |    1 -
 a/kernel/rtmutex-debug.c                                               |    1 -
 a/kernel/rtmutex-tester.c                                              |    1 -
 a/mm/filemap.h                                                         |    1 -
 a/mm/slab.c                                                            |    1 -
 a/mm/vmstat.c                                                          |    1 -
 a/net/atm/atm_sysfs.c                                                  |    1 -
 a/net/core/dev_mcast.c                                                 |    1 -
 a/net/core/fib_rules.c                                                 |    1 -
 a/net/core/wireless.c                                                  |    1 -
 a/net/ipv4/af_inet.c                                                   |    1 -
 a/net/ipv4/ipconfig.c                                                  |    1 -
 a/net/ipv4/netfilter/ip_conntrack_sip.c                                |    1 -
 a/net/ipv4/raw.c                                                       |    1 -
 a/net/ipv4/tcp_lp.c                                                    |    1 -
 a/net/ipv4/tcp_veno.c                                                  |    1 -
 a/net/ipv6/fib6_rules.c                                                |    1 -
 a/sound/aoa/soundbus/sysfs.c                                           |    1 -
 a/sound/core/memory.c                                                  |    2 --
 linux-2.6.17.noarch/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h |    1 -
 linux-2.6.17.noarch/drivers/net/3c501.c                                |    1 -
 linux-2.6.17.noarch/drivers/net/hp100.c                                |    1 -
 linux-2.6.17.noarch/drivers/net/irda/mcs7780.c                         |    1 -
 linux-2.6.17.noarch/drivers/net/irda/w83977af_ir.c                     |    1 -
 linux-2.6.17.noarch/drivers/net/netx-eth.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/phy/smsc.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/phy/vitesse.c                          |    1 -
 linux-2.6.17.noarch/drivers/net/smc911x.c                              |    2 --
 linux-2.6.17.noarch/drivers/net/wan/cycx_main.c                        |    1 -
 linux-2.6.17.noarch/drivers/net/wan/dlci.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/wan/sdla.c                             |    1 -
 linux-2.6.17.noarch/drivers/scsi/aic7xxx_old.c                         |    2 --
 linux-2.6.17.noarch/drivers/scsi/dpt_i2o.c                             |    1 -
 linux-2.6.17.noarch/drivers/scsi/hptiop.c                              |    1 -
 linux-2.6.17.noarch/drivers/scsi/libata-eh.c                           |    1 -
 linux-2.6.17.noarch/drivers/scsi/scsi.h                                |    2 --
 linux-2.6.17.noarch/include/asm-i386/dwarf2.h                          |    2 --
 linux-2.6.17.noarch/include/asm-i386/tsc.h                             |    1 -
 linux-2.6.17.noarch/include/asm-x86_64/calgary.h                       |    1 -
 linux-2.6.17.noarch/include/linux/config.h                             |    1 +
 linux-2.6.17.noarch/include/linux/unwind.h                             |    2 --
 linux-2.6.17.noarch/include/linux/vmstat.h                             |    1 -
 linux-2.6.17.noarch/include/net/netdma.h                               |    1 -
 linux-2.6/net/atm/atm_sysfs.c                                          |    1 -
 linux-2.6/net/core/dev_mcast.c                                         |    3 +--
 linux-2.6/net/core/wireless.c                                          |    1 -
 linux-2.6/net/ipv4/af_inet.c                                           |    1 -
 linux-2.6/net/ipv4/ipconfig.c                                          |    1 -
 linux-2.6/net/ipv4/netfilter/ip_conntrack_sip.c                        |    1 -
 linux-2.6/net/ipv4/raw.c                                               |    3 +--
 linux-2.6/net/ipv4/tcp_lp.c                                            |    1 -
 linux-2.6/net/ipv4/tcp_veno.c                                          |    1 -
 219 files changed, 5 insertions(+), 242 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 linux-2.6-build-deprecate-configh-include.patch
Index: linux-2.6-build-deprecate-configh-include.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-deprecate-configh-include.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-build-deprecate-configh-include.patch	11 Aug 2006 01:54:11 -0000	1.5
+++ linux-2.6-build-deprecate-configh-include.patch	14 Aug 2006 03:00:19 -0000	1.6
@@ -337,3 +337,2247 @@
  #include <linux/kernel.h>
  #include <scsi/scsi.h>
  #include <scsi/scsi_host.h>
+
+Subject: kill #include "linux/config.h"
+From: Michal Piotrowski <michal.k.k.piotrowski at gmail.com>
+
+config.h is obsolete. This patch removes all #include "linux/config.h".
+
+Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski at gmail.com>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ arch/alpha/kernel/setup.c                         |    1 -
+ arch/alpha/kernel/systbls.S                       |    1 -
+ arch/arm/kernel/crunch.c                          |    1 -
+ arch/arm/kernel/iwmmxt-notifier.c                 |    1 -
+ arch/arm/mach-at91rm9200/board-1arm.c             |    1 -
+ arch/arm/mach-at91rm9200/board-carmeva.c          |    1 -
+ arch/arm/mach-at91rm9200/board-eb9200.c           |    1 -
+ arch/arm/mach-at91rm9200/board-kafa.c             |    1 -
+ arch/arm/mach-at91rm9200/board-kb9202.c           |    1 -
+ arch/arm/mach-ep93xx/edb9302.c                    |    1 -
+ arch/arm/mach-ep93xx/edb9315.c                    |    1 -
+ arch/arm/mach-ep93xx/edb9315a.c                   |    1 -
+ arch/arm/mach-lh7a40x/clcd.c                      |    2 +-
+ arch/arm/mach-lh7a40x/clocks.c                    |    1 -
+ arch/arm/mach-omap2/pm-domain.c                   |    1 -
+ arch/arm/mach-pnx4008/gpio.c                      |    1 -
+ arch/arm/mach-pnx4008/sleep.S                     |    1 -
+ arch/arm/mach-pnx4008/time.c                      |    1 -
+ arch/arm/mach-pxa/leds-trizeps4.c                 |    1 -
+ arch/arm26/lib/ecard.S                            |    1 -
+ arch/arm26/lib/io-acorn.S                         |    1 -
+ arch/frv/kernel/time.c                            |    1 -
+ arch/h8300/kernel/time.c                          |    1 -
+ arch/i386/lib/semaphore.S                         |    1 -
+ arch/ia64/kernel/machine_kexec.c                  |    1 -
+ arch/ia64/kernel/relocate_kernel.S                |    1 -
+ arch/m32r/mm/mmu.S                                |    1 -
+ arch/m68k/kernel/time.c                           |    1 -
+ arch/m68knommu/platform/532x/config.c             |    1 -
+ arch/m68knommu/platform/68328/romvec.S            |    2 --
+ arch/parisc/kernel/head.S                         |    2 --
+ arch/parisc/kernel/syscall.S                      |    1 -
+ arch/powerpc/platforms/83xx/mpc834x_itx.c         |    1 -
+ arch/powerpc/platforms/85xx/mpc85xx_cds.c         |    1 -
+ arch/powerpc/platforms/cell/cbe_regs.c            |    2 --
+ arch/powerpc/platforms/cell/ras.c                 |    1 -
+ arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c |    1 -
+ arch/powerpc/sysdev/tsi108_dev.c                  |    1 -
+ arch/ppc/amiga/time.c                             |    1 -
+ arch/ppc/platforms/4xx/cpci405.h                  |    1 -
+ arch/s390/kernel/kprobes.c                        |    1 -
+ arch/sparc/kernel/ioport.c                        |    1 -
+ arch/sparc/kernel/of_device.c                     |    1 -
+ arch/sparc64/kernel/auxio.c                       |    1 -
+ arch/sparc64/kernel/of_device.c                   |    1 -
+ arch/sparc64/kernel/prom.c                        |    1 -
+ arch/um/drivers/hostaudio_kern.c                  |    1 -
+ arch/um/drivers/net_kern.c                        |    1 -
+ arch/um/drivers/slip_kern.c                       |    1 -
+ arch/um/drivers/ssl.c                             |    1 -
+ arch/um/drivers/stdio_console.c                   |    1 -
+ arch/um/drivers/ubd_kern.c                        |    1 -
+ arch/um/include/mconsole_kern.h                   |    1 -
+ arch/um/include/mode_kern.h                       |    2 --
+ arch/um/include/skas/mmu-skas.h                   |    1 -
+ arch/um/include/sysdep-ppc/ptrace.h               |    1 -
+ arch/um/include/um_uaccess.h                      |    1 -
+ arch/um/kernel/init_task.c                        |    1 -
+ arch/um/kernel/irq.c                              |    1 -
+ arch/um/kernel/ksyms.c                            |    1 -
+ arch/um/kernel/process_kern.c                     |    1 -
+ arch/um/kernel/signal.c                           |    1 -
+ arch/um/kernel/skas/mem.c                         |    1 -
+ arch/um/kernel/skas/mmu.c                         |    1 -
+ arch/um/kernel/skas/tlb.c                         |    1 -
+ arch/um/kernel/smp.c                              |    1 -
+ arch/um/kernel/sysrq.c                            |    1 -
+ arch/um/kernel/trap.c                             |    1 -
+ arch/um/kernel/tt/gdb_kern.c                      |    1 -
+ arch/um/kernel/tt/mem.c                           |    1 -
+ arch/um/kernel/um_arch.c                          |    1 -
+ arch/um/sys-i386/ldt.c                            |    1 -
+ arch/um/sys-i386/sysrq.c                          |    1 -
+ arch/um/sys-i386/tls.c                            |    1 -
+ arch/v850/kernel/time.c                           |    1 -
+ arch/x86_64/boot/video.S                          |    2 --
+ arch/x86_64/ia32/ia32_binfmt.c                    |    1 -
+ arch/x86_64/kernel/pci-calgary.c                  |    1 -
+ arch/x86_64/kernel/tce.c                          |    1 -
+ arch/x86_64/kernel/x8664_ksyms.c                  |    1 -
+ arch/x86_64/lib/copy_page.S                       |    1 -
+ arch/x86_64/lib/delay.c                           |    1 -
+ arch/x86_64/lib/memcpy.S                          |    1 -
+ arch/x86_64/lib/memset.S                          |    1 -
+ arch/x86_64/lib/thunk.S                           |    1 -
+ drivers/block/cciss.c                             |    1 -
+ drivers/block/cpqarray.c                          |    1 -
+ drivers/char/briq_panel.c                         |    1 -
+ drivers/char/ftape/lowlevel/fdc-io.c              |    1 -
+ drivers/char/ftape/zftape/zftape-rw.c             |    1 -
+ drivers/char/ftape/zftape/zftape-rw.h             |    1 -
+ drivers/char/hw_random/ixp4xx-rng.c               |    1 -
+ drivers/char/nsc_gpio.c                           |    1 -
+ drivers/char/pcmcia/synclink_cs.c                 |    1 -
+ drivers/char/sx.c                                 |    2 --
+ drivers/char/synclink.c                           |    1 -
+ drivers/char/watchdog/iTCO_wdt.c                  |    1 -
+ drivers/char/watchdog/omap_wdt.c                  |    1 -
+ drivers/char/watchdog/pcwd.c                      |    1 -
+ drivers/char/watchdog/pcwd_pci.c                  |    1 -
+ drivers/char/watchdog/pnx4008_wdt.c               |    1 -
+ drivers/edac/k8_edac.c                            |    1 -
+ drivers/hwmon/w83791d.c                           |    1 -
+ drivers/i2c/busses/i2c-ocores.c                   |    1 -
+ drivers/ide/pci/generic.c                         |    1 -
+ drivers/ide/pci/jmicron.c                         |    1 -
+ drivers/ide/pci/rz1000.c                          |    1 -
+ drivers/input/mouse/touchkit_ps2.c                |    1 -
+ drivers/leds/leds-ams-delta.c                     |    1 -
+ drivers/net/3c501.c                               |    1 -
+ drivers/net/hp100.c                               |    1 -
+ drivers/net/irda/mcs7780.c                        |    1 -
+ drivers/net/irda/w83977af_ir.c                    |    1 -
+ drivers/net/netx-eth.c                            |    1 -
+ drivers/net/phy/smsc.c                            |    1 -
+ drivers/net/phy/vitesse.c                         |    1 -
+ drivers/net/smc911x.c                             |    2 --
+ drivers/net/ucc_geth_phy.c                        |    1 -
+ drivers/net/wan/cycx_main.c                       |    1 -
+ drivers/net/wan/dlci.c                            |    1 -
+ drivers/net/wan/sdla.c                            |    1 -
+ drivers/net/wireless/tiacx/common.c               |    1 -
+ drivers/net/wireless/tiacx/conv.c                 |    1 -
+ drivers/net/wireless/tiacx/ioctl.c                |    1 -
+ drivers/net/wireless/tiacx/pci.c                  |    1 -
+ drivers/net/wireless/tiacx/usb.c                  |    1 -
+ drivers/net/wireless/tiacx/wlan.c                 |    1 -
+ drivers/rtc/rtc-max6902.c                         |    1 -
+ drivers/scsi/aic7xxx_old.c                        |    2 --
+ drivers/scsi/aic94xx/aic94xx_init.c               |    1 -
+ drivers/scsi/dpt_i2o.c                            |    1 -
+ drivers/scsi/hptiop.c                             |    2 +-
+ drivers/scsi/imm.h                                |    1 -
+ drivers/scsi/libata-eh.c                          |    1 -
+ drivers/scsi/ppa.h                                |    1 -
+ drivers/scsi/scsi.h                               |    2 --
+ drivers/serial/cpm_uart/cpm_uart.h                |    1 -
+ drivers/serial/netx-serial.c                      |    2 --
+ drivers/spi/spi_s3c24xx.c                         |    1 -
+ drivers/spi/spi_s3c24xx_gpio.c                    |    1 -
+ drivers/usb/core/generic.c                        |    1 -
+ drivers/usb/gadget/gmidi.c                        |    1 -
+ drivers/usb/input/usbtouchscreen.c                |    1 -
+ drivers/usb/misc/appledisplay.c                   |    1 -
+ drivers/usb/misc/sisusbvga/sisusb.c               |    1 -
+ drivers/usb/misc/sisusbvga/sisusb_con.c           |    1 -
+ drivers/video/intelfb/intelfb_i2c.c               |    1 -
+ fs/isofs/namei.c                                  |    1 -
+ fs/nfs/client.c                                   |    2 --
+ fs/nfs/fscache.c                                  |    2 --
+ fs/nfs/getroot.c                                  |    1 -
+ fs/nfs/namespace.c                                |    2 --
+ fs/nfs/nfs4namespace.c                            |    2 --
+ fs/nfs/nfsroot.c                                  |    1 -
+ fs/nfs/super.c                                    |    1 -
+ fs/reiser4/plugin/compress/compress.c             |    1 -
+ fs/reiser4/reiser4.h                              |    1 -
+ include/asm-arm/arch-lh7a40x/clocks.h             |    2 --
+ include/asm-arm/pgtable-nommu.h                   |    1 -
+ include/asm-i386/alternative-asm.i                |    2 --
+ include/asm-i386/frame.i                          |    1 -
+ include/asm-powerpc/irq.h                         |    1 -
+ include/asm-powerpc/pci-bridge.h                  |    1 -
+ include/asm-x86_64/alternative-asm.i              |    1 -
+ include/asm-x86_64/calgary.h                      |    1 -
+ include/linux/fscache.h                           |    1 -
+ include/net/netdma.h                              |    1 -
+ init/do_mounts.h                                  |    1 -
+ kernel/rtmutex-debug.c                            |    1 -
+ kernel/rtmutex-tester.c                           |    1 -
+ mm/filemap.h                                      |    1 -
+ mm/slab.c                                         |    1 -
+ mm/vmstat.c                                       |    1 -
+ net/atm/atm_sysfs.c                               |    1 -
+ net/core/dev_mcast.c                              |    1 -
+ net/core/fib_rules.c                              |    1 -
+ net/core/wireless.c                               |    1 -
+ net/ipv4/af_inet.c                                |    1 -
[...1856 lines suppressed...]
+-#include <linux/config.h>
+ #include <linux/sched.h>
+ #include <linux/delay.h>
+ #include <linux/module.h>
+diff -puN kernel/rtmutex-tester.c~kill-include-linux-configh kernel/rtmutex-tester.c
+--- a/kernel/rtmutex-tester.c~kill-include-linux-configh
++++ a/kernel/rtmutex-tester.c
+@@ -6,7 +6,6 @@
+  *  Copyright (C) 2006, Timesys Corp., Thomas Gleixner <tglx at timesys.com>
+  *
+  */
+-#include <linux/config.h>
+ #include <linux/kthread.h>
+ #include <linux/module.h>
+ #include <linux/sched.h>
+diff -puN mm/filemap.h~kill-include-linux-configh mm/filemap.h
+--- a/mm/filemap.h~kill-include-linux-configh
++++ a/mm/filemap.h
+@@ -12,7 +12,6 @@
+ #include <linux/mm.h>
+ #include <linux/highmem.h>
+ #include <linux/uio.h>
+-#include <linux/config.h>
+ #include <linux/uaccess.h>
+ 
+ size_t
+diff -puN mm/slab.c~kill-include-linux-configh mm/slab.c
+--- a/mm/slab.c~kill-include-linux-configh
++++ a/mm/slab.c
+@@ -86,7 +86,6 @@
+  *	All object allocations for a node occur from node specific slab lists.
+  */
+ 
+-#include	<linux/config.h>
+ #include	<linux/slab.h>
+ #include	<linux/mm.h>
+ #include	<linux/poison.h>
+diff -puN mm/vmstat.c~kill-include-linux-configh mm/vmstat.c
+--- a/mm/vmstat.c~kill-include-linux-configh
++++ a/mm/vmstat.c
+@@ -9,7 +9,6 @@
+  *		Christoph Lameter <christoph at lameter.com>
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/mm.h>
+ #include <linux/module.h>
+ 
+diff -puN net/atm/atm_sysfs.c~kill-include-linux-configh net/atm/atm_sysfs.c
+--- a/net/atm/atm_sysfs.c~kill-include-linux-configh
++++ a/net/atm/atm_sysfs.c
+@@ -1,6 +1,5 @@
+ /* ATM driver model support. */
+ 
+-#include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/init.h>
+ #include <linux/kobject.h>
+diff -puN net/core/dev_mcast.c~kill-include-linux-configh net/core/dev_mcast.c
+--- a/net/core/dev_mcast.c~kill-include-linux-configh
++++ a/net/core/dev_mcast.c
+@@ -21,7 +21,6 @@
+  *	2 of the License, or (at your option) any later version.
+  */
+ 
+-#include <linux/config.h> 
+ #include <linux/module.h> 
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+diff -puN net/core/fib_rules.c~kill-include-linux-configh net/core/fib_rules.c
+--- a/net/core/fib_rules.c~kill-include-linux-configh
++++ a/net/core/fib_rules.c
+@@ -8,7 +8,6 @@
+  * Authors:	Thomas Graf <tgraf at suug.ch>
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/list.h>
+diff -puN net/core/wireless.c~kill-include-linux-configh net/core/wireless.c
+--- a/net/core/wireless.c~kill-include-linux-configh
++++ a/net/core/wireless.c
+@@ -72,7 +72,6 @@
+ 
+ /***************************** INCLUDES *****************************/
+ 
+-#include <linux/config.h>		/* Not needed ??? */
+ #include <linux/module.h>
+ #include <linux/types.h>		/* off_t */
+ #include <linux/netdevice.h>		/* struct ifreq, dev_get_by_name() */
+diff -puN net/ipv4/af_inet.c~kill-include-linux-configh net/ipv4/af_inet.c
+--- a/net/ipv4/af_inet.c~kill-include-linux-configh
++++ a/net/ipv4/af_inet.c
+@@ -67,7 +67,6 @@
+  *		2 of the License, or (at your option) any later version.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/err.h>
+ #include <linux/errno.h>
+ #include <linux/types.h>
+diff -puN net/ipv4/ipconfig.c~kill-include-linux-configh net/ipv4/ipconfig.c
+--- a/net/ipv4/ipconfig.c~kill-include-linux-configh
++++ a/net/ipv4/ipconfig.c
+@@ -31,7 +31,6 @@
+  *              --  Josef Siemes <jsiemes at web.de>, Aug 2002
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/types.h>
+ #include <linux/string.h>
+ #include <linux/kernel.h>
+diff -puN net/ipv4/netfilter/ip_conntrack_sip.c~kill-include-linux-configh net/ipv4/netfilter/ip_conntrack_sip.c
+--- a/net/ipv4/netfilter/ip_conntrack_sip.c~kill-include-linux-configh
++++ a/net/ipv4/netfilter/ip_conntrack_sip.c
+@@ -8,7 +8,6 @@
+  * published by the Free Software Foundation.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/ctype.h>
+ #include <linux/skbuff.h>
+diff -puN net/ipv4/raw.c~kill-include-linux-configh net/ipv4/raw.c
+--- a/net/ipv4/raw.c~kill-include-linux-configh
++++ a/net/ipv4/raw.c
+@@ -39,7 +39,6 @@
+  *		2 of the License, or (at your option) any later version.
+  */
+  
+-#include <linux/config.h> 
+ #include <linux/types.h>
+ #include <asm/atomic.h>
+ #include <asm/byteorder.h>
+diff -puN net/ipv4/tcp_lp.c~kill-include-linux-configh net/ipv4/tcp_lp.c
+--- a/net/ipv4/tcp_lp.c~kill-include-linux-configh
++++ a/net/ipv4/tcp_lp.c
+@@ -31,7 +31,6 @@
+  * Version: $Id$
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <net/tcp.h>
+ 
+diff -puN net/ipv4/tcp_veno.c~kill-include-linux-configh net/ipv4/tcp_veno.c
+--- a/net/ipv4/tcp_veno.c~kill-include-linux-configh
++++ a/net/ipv4/tcp_veno.c
+@@ -9,7 +9,6 @@
+  * 	See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/mm.h>
+ #include <linux/module.h>
+ #include <linux/skbuff.h>
+diff -puN net/ipv6/fib6_rules.c~kill-include-linux-configh net/ipv6/fib6_rules.c
+--- a/net/ipv6/fib6_rules.c~kill-include-linux-configh
++++ a/net/ipv6/fib6_rules.c
+@@ -13,7 +13,6 @@
+  *	Ville Nuorvala		<vnuorval at tcs.hut.fi>
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/netdevice.h>
+ 
+ #include <net/fib_rules.h>
+diff -puN sound/aoa/soundbus/sysfs.c~kill-include-linux-configh sound/aoa/soundbus/sysfs.c
+--- a/sound/aoa/soundbus/sysfs.c~kill-include-linux-configh
++++ a/sound/aoa/soundbus/sysfs.c
+@@ -1,4 +1,3 @@
+-#include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/stat.h>
+ /* FIX UP */
+diff -puN sound/core/memory.c~kill-include-linux-configh sound/core/memory.c
+--- a/sound/core/memory.c~kill-include-linux-configh
++++ a/sound/core/memory.c
+@@ -20,7 +20,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <asm/io.h>
+ #include <asm/uaccess.h>
+_
+
+Patches currently in -mm which might be from michal.k.k.piotrowski at gmail.com are
+
+csa-basic-accounting-over-taskstats-fix.patch
+the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
+kill-include-linux-configh.patch
+
+-
+To unsubscribe from this list: send the line "unsubscribe mm-commits" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+



From fedora-cvs-commits at redhat.com  Mon Aug 14 03:21:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 23:21:20 -0400
Subject: rpms/kernel/devel linux-2.6-build-deprecate-configh-include.patch,
	1.6, 1.7
Message-ID: <200608140321.k7E3LKXB021513@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-build-deprecate-configh-include.patch 
Log Message:
fix rejects

linux-2.6-build-deprecate-configh-include.patch:
 a/arch/alpha/kernel/setup.c                                            |    1 -
 a/arch/alpha/kernel/systbls.S                                          |    1 -
 a/arch/arm/kernel/crunch.c                                             |    1 -
 a/arch/arm/kernel/iwmmxt-notifier.c                                    |    1 -
 a/arch/arm/mach-at91rm9200/board-1arm.c                                |    1 -
 a/arch/arm/mach-at91rm9200/board-carmeva.c                             |    1 -
 a/arch/arm/mach-at91rm9200/board-eb9200.c                              |    1 -
 a/arch/arm/mach-at91rm9200/board-kafa.c                                |    1 -
 a/arch/arm/mach-at91rm9200/board-kb9202.c                              |    1 -
 a/arch/arm/mach-ep93xx/edb9302.c                                       |    1 -
 a/arch/arm/mach-ep93xx/edb9315.c                                       |    1 -
 a/arch/arm/mach-ep93xx/edb9315a.c                                      |    1 -
 a/arch/arm/mach-lh7a40x/clcd.c                                         |    2 +-
 a/arch/arm/mach-lh7a40x/clocks.c                                       |    1 -
 a/arch/arm/mach-omap2/pm-domain.c                                      |    1 -
 a/arch/arm/mach-pnx4008/gpio.c                                         |    1 -
 a/arch/arm/mach-pnx4008/sleep.S                                        |    1 -
 a/arch/arm/mach-pnx4008/time.c                                         |    1 -
 a/arch/arm/mach-pxa/leds-trizeps4.c                                    |    1 -
 a/arch/arm26/lib/ecard.S                                               |    1 -
 a/arch/arm26/lib/io-acorn.S                                            |    1 -
 a/arch/frv/kernel/time.c                                               |    1 -
 a/arch/h8300/kernel/time.c                                             |    1 -
 a/arch/m32r/mm/mmu.S                                                   |    1 -
 a/arch/m68k/kernel/time.c                                              |    1 -
 a/arch/m68knommu/platform/532x/config.c                                |    1 -
 a/arch/m68knommu/platform/68328/romvec.S                               |    2 --
 a/arch/parisc/kernel/head.S                                            |    2 --
 a/arch/parisc/kernel/syscall.S                                         |    1 -
 a/arch/powerpc/platforms/83xx/mpc834x_itx.c                            |    1 -
 a/arch/powerpc/platforms/85xx/mpc85xx_cds.c                            |    1 -
 a/arch/powerpc/platforms/cell/cbe_regs.c                               |    2 --
 a/arch/powerpc/platforms/cell/ras.c                                    |    1 -
 a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c                    |    1 -
 a/arch/powerpc/sysdev/tsi108_dev.c                                     |    1 -
 a/arch/ppc/amiga/time.c                                                |    1 -
 a/arch/ppc/platforms/4xx/cpci405.h                                     |    1 -
 a/arch/sparc/kernel/ioport.c                                           |    1 -
 a/arch/sparc/kernel/of_device.c                                        |    1 -
 a/arch/sparc64/kernel/auxio.c                                          |    1 -
 a/arch/sparc64/kernel/of_device.c                                      |    1 -
 a/arch/sparc64/kernel/prom.c                                           |    1 -
 a/arch/um/drivers/hostaudio_kern.c                                     |    1 -
 a/arch/um/drivers/net_kern.c                                           |    1 -
 a/arch/um/drivers/slip_kern.c                                          |    1 -
 a/arch/um/drivers/ssl.c                                                |    1 -
 a/arch/um/drivers/stdio_console.c                                      |    1 -
 a/arch/um/drivers/ubd_kern.c                                           |    1 -
 a/arch/um/include/mconsole_kern.h                                      |    1 -
 a/arch/um/include/mode_kern.h                                          |    2 --
 a/arch/um/include/skas/mmu-skas.h                                      |    1 -
 a/arch/um/include/sysdep-ppc/ptrace.h                                  |    1 -
 a/arch/um/include/um_uaccess.h                                         |    1 -
 a/arch/um/kernel/init_task.c                                           |    1 -
 a/arch/um/kernel/irq.c                                                 |    1 -
 a/arch/um/kernel/ksyms.c                                               |    1 -
 a/arch/um/kernel/process_kern.c                                        |    1 -
 a/arch/um/kernel/signal.c                                              |    1 -
 a/arch/um/kernel/skas/mem.c                                            |    1 -
 a/arch/um/kernel/skas/mmu.c                                            |    1 -
 a/arch/um/kernel/skas/tlb.c                                            |    1 -
 a/arch/um/kernel/smp.c                                                 |    1 -
 a/arch/um/kernel/sysrq.c                                               |    1 -
 a/arch/um/kernel/trap.c                                                |    1 -
 a/arch/um/kernel/tt/gdb_kern.c                                         |    1 -
 a/arch/um/kernel/tt/mem.c                                              |    1 -
 a/arch/um/kernel/um_arch.c                                             |    1 -
 a/arch/um/sys-i386/ldt.c                                               |    1 -
 a/arch/um/sys-i386/sysrq.c                                             |    1 -
 a/arch/um/sys-i386/tls.c                                               |    1 -
 a/arch/v850/kernel/time.c                                              |    1 -
 a/arch/x86_64/boot/video.S                                             |    2 --
 a/arch/x86_64/ia32/ia32_binfmt.c                                       |    1 -
 a/arch/x86_64/kernel/pci-calgary.c                                     |    1 -
 a/arch/x86_64/kernel/tce.c                                             |    1 -
 a/arch/x86_64/kernel/x8664_ksyms.c                                     |    1 -
 a/arch/x86_64/lib/delay.c                                              |    1 -
 a/arch/x86_64/lib/thunk.S                                              |    1 -
 a/drivers/block/cciss.c                                                |    1 -
 a/drivers/block/cpqarray.c                                             |    1 -
 a/drivers/char/ftape/lowlevel/fdc-io.c                                 |    1 -
 a/drivers/char/ftape/zftape/zftape-rw.c                                |    1 -
 a/drivers/char/ftape/zftape/zftape-rw.h                                |    1 -
 a/drivers/char/hw_random/ixp4xx-rng.c                                  |    1 -
 a/drivers/char/nsc_gpio.c                                              |    1 -
 a/drivers/char/pcmcia/synclink_cs.c                                    |    1 -
 a/drivers/char/sx.c                                                    |    2 --
 a/drivers/char/synclink.c                                              |    1 -
 a/drivers/char/watchdog/pcwd.c                                         |    1 -
 a/drivers/char/watchdog/pcwd_pci.c                                     |    1 -
 a/drivers/hwmon/w83791d.c                                              |    1 -
 a/drivers/i2c/busses/i2c-ocores.c                                      |    1 -
 a/drivers/ide/pci/generic.c                                            |    1 -
 a/drivers/ide/pci/rz1000.c                                             |    1 -
 a/drivers/leds/leds-ams-delta.c                                        |    1 -
 a/drivers/rtc/rtc-max6902.c                                            |    1 -
 a/drivers/scsi/imm.h                                                   |    1 -
 a/drivers/scsi/ppa.h                                                   |    1 -
 a/drivers/serial/cpm_uart/cpm_uart.h                                   |    1 -
 a/drivers/serial/netx-serial.c                                         |    2 --
 a/drivers/spi/spi_s3c24xx.c                                            |    1 -
 a/drivers/spi/spi_s3c24xx_gpio.c                                       |    1 -
 a/drivers/usb/input/usbtouchscreen.c                                   |    1 -
 a/drivers/usb/misc/appledisplay.c                                      |    1 -
 a/drivers/usb/misc/sisusbvga/sisusb.c                                  |    1 -
 a/drivers/usb/misc/sisusbvga/sisusb_con.c                              |    1 -
 a/fs/isofs/namei.c                                                     |    1 -
 a/fs/nfs/namespace.c                                                   |    2 --
 a/fs/nfs/nfs4namespace.c                                               |    2 --
 a/fs/nfs/nfsroot.c                                                     |    1 -
 a/fs/nfs/super.c                                                       |    1 -
 a/include/asm-arm/arch-lh7a40x/clocks.h                                |    2 --
 a/include/asm-arm/pgtable-nommu.h                                      |    1 -
 a/include/asm-powerpc/irq.h                                            |    1 -
 a/include/asm-powerpc/pci-bridge.h                                     |    1 -
 a/include/asm-x86_64/calgary.h                                         |    1 -
 a/init/do_mounts.h                                                     |    1 -
 a/kernel/rtmutex-debug.c                                               |    1 -
 a/kernel/rtmutex-tester.c                                              |    1 -
 a/mm/filemap.h                                                         |    1 -
 a/mm/slab.c                                                            |    1 -
 a/mm/vmstat.c                                                          |    1 -
 a/net/atm/atm_sysfs.c                                                  |    1 -
 a/net/core/dev_mcast.c                                                 |    1 -
 a/sound/aoa/soundbus/sysfs.c                                           |    1 -
 a/sound/core/memory.c                                                  |    1 -
 linux-2.6.17.noarch/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h |    1 -
 linux-2.6.17.noarch/drivers/net/3c501.c                                |    1 -
 linux-2.6.17.noarch/drivers/net/hp100.c                                |    1 -
 linux-2.6.17.noarch/drivers/net/irda/mcs7780.c                         |    1 -
 linux-2.6.17.noarch/drivers/net/irda/w83977af_ir.c                     |    1 -
 linux-2.6.17.noarch/drivers/net/netx-eth.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/phy/smsc.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/phy/vitesse.c                          |    1 -
 linux-2.6.17.noarch/drivers/net/smc911x.c                              |    2 --
 linux-2.6.17.noarch/drivers/net/wan/cycx_main.c                        |    1 -
 linux-2.6.17.noarch/drivers/net/wan/dlci.c                             |    1 -
 linux-2.6.17.noarch/drivers/net/wan/sdla.c                             |    1 -
 linux-2.6.17.noarch/drivers/scsi/aic7xxx_old.c                         |    2 --
 linux-2.6.17.noarch/drivers/scsi/dpt_i2o.c                             |    1 -
 linux-2.6.17.noarch/drivers/scsi/hptiop.c                              |    1 -
 linux-2.6.17.noarch/drivers/scsi/libata-eh.c                           |    1 -
 linux-2.6.17.noarch/drivers/scsi/scsi.h                                |    2 --
 linux-2.6.17.noarch/include/asm-i386/dwarf2.h                          |    2 --
 linux-2.6.17.noarch/include/asm-i386/tsc.h                             |    1 -
 linux-2.6.17.noarch/include/linux/config.h                             |    1 +
 linux-2.6.17.noarch/include/linux/unwind.h                             |    2 --
 linux-2.6.17.noarch/include/linux/vmstat.h                             |    1 -
 linux-2.6.17.noarch/include/net/netdma.h                               |    1 -
 linux-2.6/net/core/wireless.c                                          |    1 -
 linux-2.6/net/ipv4/af_inet.c                                           |    1 -
 linux-2.6/net/ipv4/ipconfig.c                                          |    1 -
 linux-2.6/net/ipv4/netfilter/ip_conntrack_sip.c                        |    1 -
 linux-2.6/net/ipv4/raw.c                                               |    3 +--
 linux-2.6/net/ipv4/tcp_lp.c                                            |    1 -
 linux-2.6/net/ipv4/tcp_veno.c                                          |    1 -
 156 files changed, 3 insertions(+), 171 deletions(-)

Index: linux-2.6-build-deprecate-configh-include.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-deprecate-configh-include.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-build-deprecate-configh-include.patch	14 Aug 2006 03:00:19 -0000	1.6
+++ linux-2.6-build-deprecate-configh-include.patch	14 Aug 2006 03:21:17 -0000	1.7
@@ -29,17 +29,6 @@
  #ifndef __ASSEMBLY__
  #warning "asm/dwarf2.h should be only included in pure assembly files"
  #endif
---- linux-2.6.17.noarch/include/asm-x86_64/calgary.h~	2006-08-10 16:11:27.000000000 -0400
-+++ linux-2.6.17.noarch/include/asm-x86_64/calgary.h	2006-08-10 16:11:31.000000000 -0400
-@@ -24,7 +24,6 @@
- #ifndef _ASM_X86_64_CALGARY_H
- #define _ASM_X86_64_CALGARY_H
- 
--#include <linux/config.h>
- #include <linux/spinlock.h>
- #include <linux/device.h>
- #include <linux/dma-mapping.h>
-
 --- linux-2.6/net/ipv4/netfilter/ip_conntrack_sip.c~	2006-08-09 22:18:48.000000000 -0400
 +++ linux-2.6/net/ipv4/netfilter/ip_conntrack_sip.c	2006-08-09 22:18:53.000000000 -0400
 @@ -8,7 +8,6 @@
@@ -102,15 +91,6 @@
  #include <linux/module.h>
  #include <net/tcp.h>
  
---- linux-2.6/net/atm/atm_sysfs.c~	2006-08-09 22:19:38.000000000 -0400
-+++ linux-2.6/net/atm/atm_sysfs.c	2006-08-09 22:19:40.000000000 -0400
-@@ -1,6 +1,5 @@
- /* ATM driver model support. */
- 
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/kobject.h>
 --- linux-2.6/net/core/wireless.c~	2006-08-09 22:19:44.000000000 -0400
 +++ linux-2.6/net/core/wireless.c	2006-08-09 22:19:47.000000000 -0400
 @@ -72,7 +72,6 @@
@@ -121,18 +101,6 @@
  #include <linux/module.h>
  #include <linux/types.h>		/* off_t */
  #include <linux/netdevice.h>		/* struct ifreq, dev_get_by_name() */
---- linux-2.6/net/core/dev_mcast.c~	2006-08-09 22:19:52.000000000 -0400
-+++ linux-2.6/net/core/dev_mcast.c	2006-08-09 22:19:59.000000000 -0400
-@@ -21,8 +21,7 @@
-  *	2 of the License, or (at your option) any later version.
-  */
- 
--#include <linux/config.h> 
--#include <linux/module.h> 
-+#include <linux/module.h>
- #include <asm/uaccess.h>
- #include <asm/system.h>
- #include <linux/bitops.h>
 --- linux-2.6.17.noarch/include/linux/vmstat.h~	2006-08-10 19:43:49.000000000 -0400
 +++ linux-2.6.17.noarch/include/linux/vmstat.h	2006-08-10 19:43:54.000000000 -0400
 @@ -3,7 +3,6 @@
@@ -338,203 +306,6 @@
  #include <scsi/scsi.h>
  #include <scsi/scsi_host.h>
 
-Subject: kill #include "linux/config.h"
-From: Michal Piotrowski <michal.k.k.piotrowski at gmail.com>
-
-config.h is obsolete. This patch removes all #include "linux/config.h".
-
-Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski at gmail.com>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- arch/alpha/kernel/setup.c                         |    1 -
- arch/alpha/kernel/systbls.S                       |    1 -
- arch/arm/kernel/crunch.c                          |    1 -
- arch/arm/kernel/iwmmxt-notifier.c                 |    1 -
- arch/arm/mach-at91rm9200/board-1arm.c             |    1 -
- arch/arm/mach-at91rm9200/board-carmeva.c          |    1 -
- arch/arm/mach-at91rm9200/board-eb9200.c           |    1 -
- arch/arm/mach-at91rm9200/board-kafa.c             |    1 -
- arch/arm/mach-at91rm9200/board-kb9202.c           |    1 -
- arch/arm/mach-ep93xx/edb9302.c                    |    1 -
- arch/arm/mach-ep93xx/edb9315.c                    |    1 -
- arch/arm/mach-ep93xx/edb9315a.c                   |    1 -
- arch/arm/mach-lh7a40x/clcd.c                      |    2 +-
- arch/arm/mach-lh7a40x/clocks.c                    |    1 -
- arch/arm/mach-omap2/pm-domain.c                   |    1 -
- arch/arm/mach-pnx4008/gpio.c                      |    1 -
- arch/arm/mach-pnx4008/sleep.S                     |    1 -
- arch/arm/mach-pnx4008/time.c                      |    1 -
- arch/arm/mach-pxa/leds-trizeps4.c                 |    1 -
- arch/arm26/lib/ecard.S                            |    1 -
- arch/arm26/lib/io-acorn.S                         |    1 -
- arch/frv/kernel/time.c                            |    1 -
- arch/h8300/kernel/time.c                          |    1 -
- arch/i386/lib/semaphore.S                         |    1 -
- arch/ia64/kernel/machine_kexec.c                  |    1 -
- arch/ia64/kernel/relocate_kernel.S                |    1 -
- arch/m32r/mm/mmu.S                                |    1 -
- arch/m68k/kernel/time.c                           |    1 -
- arch/m68knommu/platform/532x/config.c             |    1 -
- arch/m68knommu/platform/68328/romvec.S            |    2 --
- arch/parisc/kernel/head.S                         |    2 --
- arch/parisc/kernel/syscall.S                      |    1 -
- arch/powerpc/platforms/83xx/mpc834x_itx.c         |    1 -
- arch/powerpc/platforms/85xx/mpc85xx_cds.c         |    1 -
- arch/powerpc/platforms/cell/cbe_regs.c            |    2 --
- arch/powerpc/platforms/cell/ras.c                 |    1 -
- arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c |    1 -
- arch/powerpc/sysdev/tsi108_dev.c                  |    1 -
- arch/ppc/amiga/time.c                             |    1 -
- arch/ppc/platforms/4xx/cpci405.h                  |    1 -
- arch/s390/kernel/kprobes.c                        |    1 -
- arch/sparc/kernel/ioport.c                        |    1 -
- arch/sparc/kernel/of_device.c                     |    1 -
- arch/sparc64/kernel/auxio.c                       |    1 -
- arch/sparc64/kernel/of_device.c                   |    1 -
- arch/sparc64/kernel/prom.c                        |    1 -
- arch/um/drivers/hostaudio_kern.c                  |    1 -
- arch/um/drivers/net_kern.c                        |    1 -
- arch/um/drivers/slip_kern.c                       |    1 -
- arch/um/drivers/ssl.c                             |    1 -
- arch/um/drivers/stdio_console.c                   |    1 -
- arch/um/drivers/ubd_kern.c                        |    1 -
- arch/um/include/mconsole_kern.h                   |    1 -
- arch/um/include/mode_kern.h                       |    2 --
- arch/um/include/skas/mmu-skas.h                   |    1 -
- arch/um/include/sysdep-ppc/ptrace.h               |    1 -
- arch/um/include/um_uaccess.h                      |    1 -
- arch/um/kernel/init_task.c                        |    1 -
- arch/um/kernel/irq.c                              |    1 -
- arch/um/kernel/ksyms.c                            |    1 -
- arch/um/kernel/process_kern.c                     |    1 -
- arch/um/kernel/signal.c                           |    1 -
- arch/um/kernel/skas/mem.c                         |    1 -
- arch/um/kernel/skas/mmu.c                         |    1 -
- arch/um/kernel/skas/tlb.c                         |    1 -
- arch/um/kernel/smp.c                              |    1 -
- arch/um/kernel/sysrq.c                            |    1 -
- arch/um/kernel/trap.c                             |    1 -
- arch/um/kernel/tt/gdb_kern.c                      |    1 -
- arch/um/kernel/tt/mem.c                           |    1 -
- arch/um/kernel/um_arch.c                          |    1 -
- arch/um/sys-i386/ldt.c                            |    1 -
- arch/um/sys-i386/sysrq.c                          |    1 -
- arch/um/sys-i386/tls.c                            |    1 -
- arch/v850/kernel/time.c                           |    1 -
- arch/x86_64/boot/video.S                          |    2 --
- arch/x86_64/ia32/ia32_binfmt.c                    |    1 -
- arch/x86_64/kernel/pci-calgary.c                  |    1 -
- arch/x86_64/kernel/tce.c                          |    1 -
- arch/x86_64/kernel/x8664_ksyms.c                  |    1 -
- arch/x86_64/lib/copy_page.S                       |    1 -
- arch/x86_64/lib/delay.c                           |    1 -
- arch/x86_64/lib/memcpy.S                          |    1 -
- arch/x86_64/lib/memset.S                          |    1 -
- arch/x86_64/lib/thunk.S                           |    1 -
- drivers/block/cciss.c                             |    1 -
- drivers/block/cpqarray.c                          |    1 -
- drivers/char/briq_panel.c                         |    1 -
- drivers/char/ftape/lowlevel/fdc-io.c              |    1 -
- drivers/char/ftape/zftape/zftape-rw.c             |    1 -
- drivers/char/ftape/zftape/zftape-rw.h             |    1 -
- drivers/char/hw_random/ixp4xx-rng.c               |    1 -
- drivers/char/nsc_gpio.c                           |    1 -
- drivers/char/pcmcia/synclink_cs.c                 |    1 -
- drivers/char/sx.c                                 |    2 --
- drivers/char/synclink.c                           |    1 -
- drivers/char/watchdog/iTCO_wdt.c                  |    1 -
- drivers/char/watchdog/omap_wdt.c                  |    1 -
- drivers/char/watchdog/pcwd.c                      |    1 -
- drivers/char/watchdog/pcwd_pci.c                  |    1 -
- drivers/char/watchdog/pnx4008_wdt.c               |    1 -
- drivers/edac/k8_edac.c                            |    1 -
- drivers/hwmon/w83791d.c                           |    1 -
- drivers/i2c/busses/i2c-ocores.c                   |    1 -
- drivers/ide/pci/generic.c                         |    1 -
- drivers/ide/pci/jmicron.c                         |    1 -
- drivers/ide/pci/rz1000.c                          |    1 -
- drivers/input/mouse/touchkit_ps2.c                |    1 -
- drivers/leds/leds-ams-delta.c                     |    1 -
- drivers/net/3c501.c                               |    1 -
- drivers/net/hp100.c                               |    1 -
- drivers/net/irda/mcs7780.c                        |    1 -
- drivers/net/irda/w83977af_ir.c                    |    1 -
- drivers/net/netx-eth.c                            |    1 -
- drivers/net/phy/smsc.c                            |    1 -
- drivers/net/phy/vitesse.c                         |    1 -
- drivers/net/smc911x.c                             |    2 --
- drivers/net/ucc_geth_phy.c                        |    1 -
- drivers/net/wan/cycx_main.c                       |    1 -
- drivers/net/wan/dlci.c                            |    1 -
- drivers/net/wan/sdla.c                            |    1 -
- drivers/net/wireless/tiacx/common.c               |    1 -
- drivers/net/wireless/tiacx/conv.c                 |    1 -
- drivers/net/wireless/tiacx/ioctl.c                |    1 -
- drivers/net/wireless/tiacx/pci.c                  |    1 -
- drivers/net/wireless/tiacx/usb.c                  |    1 -
- drivers/net/wireless/tiacx/wlan.c                 |    1 -
- drivers/rtc/rtc-max6902.c                         |    1 -
- drivers/scsi/aic7xxx_old.c                        |    2 --
- drivers/scsi/aic94xx/aic94xx_init.c               |    1 -
- drivers/scsi/dpt_i2o.c                            |    1 -
- drivers/scsi/hptiop.c                             |    2 +-
- drivers/scsi/imm.h                                |    1 -
- drivers/scsi/libata-eh.c                          |    1 -
- drivers/scsi/ppa.h                                |    1 -
- drivers/scsi/scsi.h                               |    2 --
- drivers/serial/cpm_uart/cpm_uart.h                |    1 -
- drivers/serial/netx-serial.c                      |    2 --
- drivers/spi/spi_s3c24xx.c                         |    1 -
- drivers/spi/spi_s3c24xx_gpio.c                    |    1 -
- drivers/usb/core/generic.c                        |    1 -
- drivers/usb/gadget/gmidi.c                        |    1 -
- drivers/usb/input/usbtouchscreen.c                |    1 -
- drivers/usb/misc/appledisplay.c                   |    1 -
- drivers/usb/misc/sisusbvga/sisusb.c               |    1 -
- drivers/usb/misc/sisusbvga/sisusb_con.c           |    1 -
- drivers/video/intelfb/intelfb_i2c.c               |    1 -
- fs/isofs/namei.c                                  |    1 -
- fs/nfs/client.c                                   |    2 --
- fs/nfs/fscache.c                                  |    2 --
- fs/nfs/getroot.c                                  |    1 -
- fs/nfs/namespace.c                                |    2 --
- fs/nfs/nfs4namespace.c                            |    2 --
- fs/nfs/nfsroot.c                                  |    1 -
- fs/nfs/super.c                                    |    1 -
- fs/reiser4/plugin/compress/compress.c             |    1 -
- fs/reiser4/reiser4.h                              |    1 -
- include/asm-arm/arch-lh7a40x/clocks.h             |    2 --
- include/asm-arm/pgtable-nommu.h                   |    1 -
- include/asm-i386/alternative-asm.i                |    2 --
- include/asm-i386/frame.i                          |    1 -
- include/asm-powerpc/irq.h                         |    1 -
- include/asm-powerpc/pci-bridge.h                  |    1 -
- include/asm-x86_64/alternative-asm.i              |    1 -
- include/asm-x86_64/calgary.h                      |    1 -
- include/linux/fscache.h                           |    1 -
- include/net/netdma.h                              |    1 -
- init/do_mounts.h                                  |    1 -
- kernel/rtmutex-debug.c                            |    1 -
- kernel/rtmutex-tester.c                           |    1 -
- mm/filemap.h                                      |    1 -
- mm/slab.c                                         |    1 -
- mm/vmstat.c                                       |    1 -
- net/atm/atm_sysfs.c                               |    1 -
- net/core/dev_mcast.c                              |    1 -
- net/core/fib_rules.c                              |    1 -
- net/core/wireless.c                               |    1 -
- net/ipv4/af_inet.c                                |    1 -
- net/ipv4/ipconfig.c                               |    1 -
- net/ipv4/netfilter/ip_conntrack_sip.c             |    1 -
- net/ipv4/raw.c                                    |    1 -
- net/ipv4/tcp_lp.c                                 |    1 -
- net/ipv4/tcp_veno.c                               |    1 -
- net/ipv6/fib6_rules.c                             |    1 -
- sound/aoa/soundbus/sysfs.c                        |    1 -
- sound/core/memory.c                               |    1 -
- 186 files changed, 2 insertions(+), 202 deletions(-)
-
 diff -puN arch/alpha/kernel/setup.c~kill-include-linux-configh arch/alpha/kernel/setup.c
 --- a/arch/alpha/kernel/setup.c~kill-include-linux-configh
 +++ a/arch/alpha/kernel/setup.c
@@ -789,39 +560,6 @@
  #include <linux/errno.h>
  #include <linux/module.h>
  #include <linux/sched.h>
-diff -puN arch/i386/lib/semaphore.S~kill-include-linux-configh arch/i386/lib/semaphore.S
---- a/arch/i386/lib/semaphore.S~kill-include-linux-configh
-+++ a/arch/i386/lib/semaphore.S
-@@ -13,7 +13,6 @@
-  * rw semaphores implemented November 1999 by Benjamin LaHaise <bcrl at kvack.org>
-  */
- 
--#include <linux/config.h>
- #include <linux/linkage.h>
- #include <asm/rwlock.h>
- #include <asm/alternative-asm.i>
-diff -puN arch/ia64/kernel/machine_kexec.c~kill-include-linux-configh arch/ia64/kernel/machine_kexec.c
---- a/arch/ia64/kernel/machine_kexec.c~kill-include-linux-configh
-+++ a/arch/ia64/kernel/machine_kexec.c
-@@ -11,7 +11,6 @@
-  */
- 
- #include <linux/kernel.h>
--#include <linux/config.h>
- #include <linux/mm.h>
- #include <linux/kexec.h>
- #include <linux/pci.h>
-diff -puN arch/ia64/kernel/relocate_kernel.S~kill-include-linux-configh arch/ia64/kernel/relocate_kernel.S
---- a/arch/ia64/kernel/relocate_kernel.S~kill-include-linux-configh
-+++ a/arch/ia64/kernel/relocate_kernel.S
-@@ -10,7 +10,6 @@
-  * This source code is licensed under the GNU General Public License,
-  * Version 2.  See the file COPYING for more details.
-  */
--#include <linux/config.h>
- #include <asm/asmmacro.h>
- #include <asm/kregs.h>
- #include <asm/page.h>
 diff -puN arch/m32r/mm/mmu.S~kill-include-linux-configh arch/m32r/mm/mmu.S
 --- a/arch/m32r/mm/mmu.S~kill-include-linux-configh
 +++ a/arch/m32r/mm/mmu.S
@@ -975,17 +713,6 @@
  #include <platforms/4xx/ibm405gp.h>
  #include <asm/ppcboot.h>
  
-diff -puN arch/s390/kernel/kprobes.c~kill-include-linux-configh arch/s390/kernel/kprobes.c
---- a/arch/s390/kernel/kprobes.c~kill-include-linux-configh
-+++ a/arch/s390/kernel/kprobes.c
-@@ -20,7 +20,6 @@
-  * s390 port, used ppc64 as template. Mike Grundy <grundym at us.ibm.com>
-  */
- 
--#include <linux/config.h>
- #include <linux/kprobes.h>
- #include <linux/ptrace.h>
- #include <linux/preempt.h>
 diff -puN arch/sparc/kernel/ioport.c~kill-include-linux-configh arch/sparc/kernel/ioport.c
 --- a/arch/sparc/kernel/ioport.c~kill-include-linux-configh
 +++ a/arch/sparc/kernel/ioport.c
@@ -1408,16 +1135,6 @@
  #include <linux/module.h>
  #include <linux/smp.h>
  
-diff -puN arch/x86_64/lib/copy_page.S~kill-include-linux-configh arch/x86_64/lib/copy_page.S
---- a/arch/x86_64/lib/copy_page.S~kill-include-linux-configh
-+++ a/arch/x86_64/lib/copy_page.S
-@@ -1,6 +1,5 @@
- /* Written 2003 by Andi Kleen, based on a kernel by Evandro Menezes */
- 	
--#include <linux/config.h>
- #include <linux/linkage.h>
- #include <asm/dwarf2.h>
- 
 diff -puN arch/x86_64/lib/delay.c~kill-include-linux-configh arch/x86_64/lib/delay.c
 --- a/arch/x86_64/lib/delay.c~kill-include-linux-configh
 +++ a/arch/x86_64/lib/delay.c
@@ -1429,26 +1146,6 @@
  #include <linux/module.h>
  #include <linux/sched.h>
  #include <linux/delay.h>
-diff -puN arch/x86_64/lib/memcpy.S~kill-include-linux-configh arch/x86_64/lib/memcpy.S
---- a/arch/x86_64/lib/memcpy.S~kill-include-linux-configh
-+++ a/arch/x86_64/lib/memcpy.S
-@@ -1,6 +1,5 @@
- /* Copyright 2002 Andi Kleen */
- 	
--#include <linux/config.h>
- #include <linux/linkage.h>
- #include <asm/dwarf2.h>
- #include <asm/cpufeature.h>
-diff -puN arch/x86_64/lib/memset.S~kill-include-linux-configh arch/x86_64/lib/memset.S
---- a/arch/x86_64/lib/memset.S~kill-include-linux-configh
-+++ a/arch/x86_64/lib/memset.S
-@@ -1,6 +1,5 @@
- /* Copyright 2002 Andi Kleen, SuSE Labs */
- 
--#include <linux/config.h>
- #include <linux/linkage.h>
- #include <asm/dwarf2.h>
- 
 diff -puN arch/x86_64/lib/thunk.S~kill-include-linux-configh arch/x86_64/lib/thunk.S
 --- a/arch/x86_64/lib/thunk.S~kill-include-linux-configh
 +++ a/arch/x86_64/lib/thunk.S
@@ -1482,17 +1179,6 @@
  #include <linux/module.h>
  #include <linux/types.h>
  #include <linux/pci.h>
-diff -puN drivers/char/briq_panel.c~kill-include-linux-configh drivers/char/briq_panel.c
---- a/drivers/char/briq_panel.c~kill-include-linux-configh
-+++ a/drivers/char/briq_panel.c
-@@ -11,7 +11,6 @@
- #include <linux/sched.h>
- #include <linux/tty.h>
- #include <linux/timer.h>
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/wait.h>
- #include <linux/string.h>
 diff -puN drivers/char/ftape/lowlevel/fdc-io.c~kill-include-linux-configh drivers/char/ftape/lowlevel/fdc-io.c
 --- a/drivers/char/ftape/lowlevel/fdc-io.c~kill-include-linux-configh
 +++ a/drivers/char/ftape/lowlevel/fdc-io.c
@@ -1583,28 +1269,6 @@
  #include <linux/module.h>
  #include <linux/errno.h>
  #include <linux/signal.h>
-diff -puN drivers/char/watchdog/iTCO_wdt.c~kill-include-linux-configh drivers/char/watchdog/iTCO_wdt.c
---- a/drivers/char/watchdog/iTCO_wdt.c~kill-include-linux-configh
-+++ a/drivers/char/watchdog/iTCO_wdt.c
-@@ -49,7 +49,6 @@
- #define PFX		DRV_NAME ": "
- 
- /* Includes */
--#include <linux/config.h>		/* For CONFIG_WATCHDOG_NOWAYOUT/... */
- #include <linux/module.h>		/* For module specific items */
- #include <linux/moduleparam.h>		/* For new moduleparam's */
- #include <linux/types.h>		/* For standard types (like size_t) */
-diff -puN drivers/char/watchdog/omap_wdt.c~kill-include-linux-configh drivers/char/watchdog/omap_wdt.c
---- a/drivers/char/watchdog/omap_wdt.c~kill-include-linux-configh
-+++ a/drivers/char/watchdog/omap_wdt.c
-@@ -27,7 +27,6 @@
-  */
- 
- #include <linux/module.h>
--#include <linux/config.h>
- #include <linux/types.h>
- #include <linux/kernel.h>
- #include <linux/fs.h>
 diff -puN drivers/char/watchdog/pcwd.c~kill-include-linux-configh drivers/char/watchdog/pcwd.c
 --- a/drivers/char/watchdog/pcwd.c~kill-include-linux-configh
 +++ a/drivers/char/watchdog/pcwd.c
@@ -1627,28 +1291,6 @@
  #include <linux/module.h>	/* For module specific items */
  #include <linux/moduleparam.h>	/* For new moduleparam's */
  #include <linux/types.h>	/* For standard types (like size_t) */
-diff -puN drivers/char/watchdog/pnx4008_wdt.c~kill-include-linux-configh drivers/char/watchdog/pnx4008_wdt.c
---- a/drivers/char/watchdog/pnx4008_wdt.c~kill-include-linux-configh
-+++ a/drivers/char/watchdog/pnx4008_wdt.c
-@@ -14,7 +14,6 @@
-  * or implied.
-  */
- 
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/moduleparam.h>
- #include <linux/types.h>
-diff -puN drivers/edac/k8_edac.c~kill-include-linux-configh drivers/edac/k8_edac.c
---- a/drivers/edac/k8_edac.c~kill-include-linux-configh
-+++ a/drivers/edac/k8_edac.c
-@@ -28,7 +28,6 @@
-  * refer to this document.
-  */
- 
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/init.h>
- #include <linux/pci.h>
 diff -puN drivers/hwmon/w83791d.c~kill-include-linux-configh drivers/hwmon/w83791d.c
 --- a/drivers/hwmon/w83791d.c~kill-include-linux-configh
 +++ a/drivers/hwmon/w83791d.c
@@ -1682,17 +1324,6 @@
  #include <linux/types.h>
  #include <linux/module.h>
  #include <linux/kernel.h>
-diff -puN drivers/ide/pci/jmicron.c~kill-include-linux-configh drivers/ide/pci/jmicron.c
---- a/drivers/ide/pci/jmicron.c~kill-include-linux-configh
-+++ a/drivers/ide/pci/jmicron.c
-@@ -5,7 +5,6 @@
-  *  May be copied or modified under the terms of the GNU General Public License
-  */
- 
--#include <linux/config.h>
- #include <linux/types.h>
- #include <linux/module.h>
- #include <linux/pci.h>
 diff -puN drivers/ide/pci/rz1000.c~kill-include-linux-configh drivers/ide/pci/rz1000.c
 --- a/drivers/ide/pci/rz1000.c~kill-include-linux-configh
 +++ a/drivers/ide/pci/rz1000.c
@@ -1704,17 +1335,6 @@
  #include <linux/types.h>
  #include <linux/module.h>
  #include <linux/kernel.h>
-diff -puN drivers/input/mouse/touchkit_ps2.c~kill-include-linux-configh drivers/input/mouse/touchkit_ps2.c
---- a/drivers/input/mouse/touchkit_ps2.c~kill-include-linux-configh
-+++ a/drivers/input/mouse/touchkit_ps2.c
-@@ -34,7 +34,6 @@
-  * initial version 0.1
-  */
- 
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/slab.h>
- 
 diff -puN drivers/leds/leds-ams-delta.c~kill-include-linux-configh drivers/leds/leds-ams-delta.c
 --- a/drivers/leds/leds-ams-delta.c~kill-include-linux-configh
 +++ a/drivers/leds/leds-ams-delta.c
@@ -1726,205 +1346,6 @@
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/platform_device.h>
-diff -puN drivers/net/3c501.c~kill-include-linux-configh drivers/net/3c501.c
---- a/drivers/net/3c501.c~kill-include-linux-configh
-+++ a/drivers/net/3c501.c
-@@ -120,7 +120,6 @@ static const char version[] =
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/errno.h>
--#include <linux/config.h>	/* for CONFIG_IP_MULTICAST */
- #include <linux/spinlock.h>
- #include <linux/ethtool.h>
- #include <linux/delay.h>
-diff -puN drivers/net/hp100.c~kill-include-linux-configh drivers/net/hp100.c
---- a/drivers/net/hp100.c~kill-include-linux-configh
-+++ a/drivers/net/hp100.c
-@@ -111,7 +111,6 @@
- #include <linux/etherdevice.h>
- #include <linux/skbuff.h>
- #include <linux/types.h>
--#include <linux/config.h>	/* for CONFIG_PCI */
- #include <linux/delay.h>
- #include <linux/init.h>
- #include <linux/bitops.h>
-diff -puN drivers/net/irda/mcs7780.c~kill-include-linux-configh drivers/net/irda/mcs7780.c
---- a/drivers/net/irda/mcs7780.c~kill-include-linux-configh
-+++ a/drivers/net/irda/mcs7780.c
-@@ -45,7 +45,6 @@
- 
- #include <linux/module.h>
- #include <linux/moduleparam.h>
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/types.h>
- #include <linux/errno.h>
-diff -puN drivers/net/irda/w83977af_ir.c~kill-include-linux-configh drivers/net/irda/w83977af_ir.c
---- a/drivers/net/irda/w83977af_ir.c~kill-include-linux-configh
-+++ a/drivers/net/irda/w83977af_ir.c
-@@ -40,7 +40,6 @@
-  ********************************************************************/
- 
- #include <linux/module.h>
--#include <linux/config.h> 
- #include <linux/kernel.h>
- #include <linux/types.h>
- #include <linux/skbuff.h>
-diff -puN drivers/net/netx-eth.c~kill-include-linux-configh drivers/net/netx-eth.c
---- a/drivers/net/netx-eth.c~kill-include-linux-configh
-+++ a/drivers/net/netx-eth.c
-@@ -17,7 +17,6 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
--#include <linux/config.h>
- #include <linux/init.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-diff -puN drivers/net/phy/smsc.c~kill-include-linux-configh drivers/net/phy/smsc.c
---- a/drivers/net/phy/smsc.c~kill-include-linux-configh
-+++ a/drivers/net/phy/smsc.c
-@@ -14,7 +14,6 @@
-  *
-  */
- 
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/mii.h>
-diff -puN drivers/net/phy/vitesse.c~kill-include-linux-configh drivers/net/phy/vitesse.c
---- a/drivers/net/phy/vitesse.c~kill-include-linux-configh
-+++ a/drivers/net/phy/vitesse.c
-@@ -12,7 +12,6 @@
-  *
-  */
- 
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/mii.h>
-diff -puN drivers/net/smc911x.c~kill-include-linux-configh drivers/net/smc911x.c
---- a/drivers/net/smc911x.c~kill-include-linux-configh
-+++ a/drivers/net/smc911x.c
-@@ -55,8 +55,6 @@ static const char version[] =
- 			 )
- #endif
- 
--
--#include <linux/config.h>
- #include <linux/init.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-diff -puN drivers/net/ucc_geth_phy.c~kill-include-linux-configh drivers/net/ucc_geth_phy.c
---- a/drivers/net/ucc_geth_phy.c~kill-include-linux-configh
-+++ a/drivers/net/ucc_geth_phy.c
-@@ -17,7 +17,6 @@
-  *
-  */
- 
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/sched.h>
- #include <linux/string.h>
-diff -puN drivers/net/wan/cycx_main.c~kill-include-linux-configh drivers/net/wan/cycx_main.c
---- a/drivers/net/wan/cycx_main.c~kill-include-linux-configh
-+++ a/drivers/net/wan/cycx_main.c
-@@ -40,7 +40,6 @@
- * 1998/08/08	acme		Initial version.
- */
- 
--#include <linux/config.h>	/* OS configuration options */
- #include <linux/stddef.h>	/* offsetof(), etc. */
- #include <linux/errno.h>	/* return codes */
- #include <linux/string.h>	/* inline memset(), etc. */
-diff -puN drivers/net/wan/dlci.c~kill-include-linux-configh drivers/net/wan/dlci.c
---- a/drivers/net/wan/dlci.c~kill-include-linux-configh
-+++ a/drivers/net/wan/dlci.c
-@@ -28,7 +28,6 @@
-  *		2 of the License, or (at your option) any later version.
-  */
- 
--#include <linux/config.h> /* for CONFIG_DLCI_COUNT */
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/types.h>
-diff -puN drivers/net/wan/sdla.c~kill-include-linux-configh drivers/net/wan/sdla.c
---- a/drivers/net/wan/sdla.c~kill-include-linux-configh
-+++ a/drivers/net/wan/sdla.c
-@@ -32,7 +32,6 @@
-  *		2 of the License, or (at your option) any later version.
-  */
- 
--#include <linux/config.h> /* for CONFIG_DLCI_MAX */
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/types.h>
-diff -puN drivers/net/wireless/tiacx/common.c~kill-include-linux-configh drivers/net/wireless/tiacx/common.c
---- a/drivers/net/wireless/tiacx/common.c~kill-include-linux-configh
-+++ a/drivers/net/wireless/tiacx/common.c
-@@ -30,7 +30,6 @@
- ** ---------------------------------------------------------------------
- */
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-diff -puN drivers/net/wireless/tiacx/conv.c~kill-include-linux-configh drivers/net/wireless/tiacx/conv.c
---- a/drivers/net/wireless/tiacx/conv.c~kill-include-linux-configh
-+++ a/drivers/net/wireless/tiacx/conv.c
-@@ -30,7 +30,6 @@
- ** ---------------------------------------------------------------------
- */
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/skbuff.h>
- #include <linux/if_arp.h>
-diff -puN drivers/net/wireless/tiacx/ioctl.c~kill-include-linux-configh drivers/net/wireless/tiacx/ioctl.c
---- a/drivers/net/wireless/tiacx/ioctl.c~kill-include-linux-configh
-+++ a/drivers/net/wireless/tiacx/ioctl.c
-@@ -30,7 +30,6 @@
- ** ---------------------------------------------------------------------
- */
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/types.h>
-diff -puN drivers/net/wireless/tiacx/pci.c~kill-include-linux-configh drivers/net/wireless/tiacx/pci.c
---- a/drivers/net/wireless/tiacx/pci.c~kill-include-linux-configh
-+++ a/drivers/net/wireless/tiacx/pci.c
-@@ -31,7 +31,6 @@
- */
- #define ACX_PCI 1
- 
--#include <linux/config.h>
- #include <linux/utsrelease.h>
- #include <linux/version.h>
- #include <linux/compiler.h> /* required for Lx 2.6.8 ?? */
-diff -puN drivers/net/wireless/tiacx/usb.c~kill-include-linux-configh drivers/net/wireless/tiacx/usb.c
---- a/drivers/net/wireless/tiacx/usb.c~kill-include-linux-configh
-+++ a/drivers/net/wireless/tiacx/usb.c
-@@ -45,7 +45,6 @@
- #define ACX_USB 1
- 
- #include <linux/version.h>
--#include <linux/config.h>
- #include <linux/types.h>
- #include <linux/module.h>
- #include <linux/moduleparam.h>
-diff -puN drivers/net/wireless/tiacx/wlan.c~kill-include-linux-configh drivers/net/wireless/tiacx/wlan.c
---- a/drivers/net/wireless/tiacx/wlan.c~kill-include-linux-configh
-+++ a/drivers/net/wireless/tiacx/wlan.c
-@@ -37,7 +37,6 @@
- ** http://www.linux-wlan.com
- */
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/types.h>
- #include <linux/if_arp.h>
 diff -puN drivers/rtc/rtc-max6902.c~kill-include-linux-configh drivers/rtc/rtc-max6902.c
 --- a/drivers/rtc/rtc-max6902.c~kill-include-linux-configh
 +++ a/drivers/rtc/rtc-max6902.c
@@ -1936,52 +1357,6 @@
  #include <linux/module.h>
  #include <linux/version.h>
  
-diff -puN drivers/scsi/aic7xxx_old.c~kill-include-linux-configh drivers/scsi/aic7xxx_old.c
---- a/drivers/scsi/aic7xxx_old.c~kill-include-linux-configh
-+++ a/drivers/scsi/aic7xxx_old.c
-@@ -249,8 +249,6 @@
- #include <linux/stat.h>
- #include <linux/slab.h>        /* for kmalloc() */
- 
--#include <linux/config.h>        /* for CONFIG_PCI */
--
- #define AIC7XXX_C_VERSION  "5.2.6"
- 
- #define ALL_TARGETS -1
-diff -puN drivers/scsi/aic94xx/aic94xx_init.c~kill-include-linux-configh drivers/scsi/aic94xx/aic94xx_init.c
---- a/drivers/scsi/aic94xx/aic94xx_init.c~kill-include-linux-configh
-+++ a/drivers/scsi/aic94xx/aic94xx_init.c
-@@ -24,7 +24,6 @@
-  *
-  */
- 
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/init.h>
- #include <linux/kernel.h>
-diff -puN drivers/scsi/dpt_i2o.c~kill-include-linux-configh drivers/scsi/dpt_i2o.c
---- a/drivers/scsi/dpt_i2o.c~kill-include-linux-configh
-+++ a/drivers/scsi/dpt_i2o.c
-@@ -46,7 +46,6 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Dri
- 
- #include <linux/stat.h>
- #include <linux/slab.h>		/* for kmalloc() */
--#include <linux/config.h>	/* for CONFIG_PCI */
- #include <linux/pci.h>		/* for PCI support */
- #include <linux/proc_fs.h>
- #include <linux/blkdev.h>
-diff -puN drivers/scsi/hptiop.c~kill-include-linux-configh drivers/scsi/hptiop.c
---- a/drivers/scsi/hptiop.c~kill-include-linux-configh
-+++ a/drivers/scsi/hptiop.c
-@@ -15,7 +15,7 @@
-  *
-  * For more information, visit http://www.highpoint-tech.com
-  */
--#include <linux/config.h>
-+
- #include <linux/module.h>
- #include <linux/types.h>
- #include <linux/string.h>
 diff -puN drivers/scsi/imm.h~kill-include-linux-configh drivers/scsi/imm.h
 --- a/drivers/scsi/imm.h~kill-include-linux-configh
 +++ a/drivers/scsi/imm.h
@@ -1993,17 +1368,6 @@
  #include  <linux/stddef.h>
  #include  <linux/module.h>
  #include  <linux/kernel.h>
-diff -puN drivers/scsi/libata-eh.c~kill-include-linux-configh drivers/scsi/libata-eh.c
---- a/drivers/scsi/libata-eh.c~kill-include-linux-configh
-+++ a/drivers/scsi/libata-eh.c
-@@ -32,7 +32,6 @@
-  *
-  */
- 
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <scsi/scsi.h>
- #include <scsi/scsi_host.h>
 diff -puN drivers/scsi/ppa.h~kill-include-linux-configh drivers/scsi/ppa.h
 --- a/drivers/scsi/ppa.h~kill-include-linux-configh
 +++ a/drivers/scsi/ppa.h
@@ -2015,18 +1379,6 @@
  #include  <linux/stddef.h>
  #include  <linux/module.h>
  #include  <linux/kernel.h>
-diff -puN drivers/scsi/scsi.h~kill-include-linux-configh drivers/scsi/scsi.h
---- a/drivers/scsi/scsi.h~kill-include-linux-configh
-+++ a/drivers/scsi/scsi.h
-@@ -20,8 +20,6 @@
- #ifndef _SCSI_H
- #define _SCSI_H
- 
--#include <linux/config.h>	    /* for CONFIG_SCSI_LOGGING */
--
- #include <scsi/scsi_cmnd.h>
- #include <scsi/scsi_device.h>
- #include <scsi/scsi_eh.h>
 diff -puN drivers/serial/cpm_uart/cpm_uart.h~kill-include-linux-configh drivers/serial/cpm_uart/cpm_uart.h
 --- a/drivers/serial/cpm_uart/cpm_uart.h~kill-include-linux-configh
 +++ a/drivers/serial/cpm_uart/cpm_uart.h
@@ -2072,28 +1424,6 @@
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/delay.h>
-diff -puN drivers/usb/core/generic.c~kill-include-linux-configh drivers/usb/core/generic.c
---- a/drivers/usb/core/generic.c~kill-include-linux-configh
-+++ a/drivers/usb/core/generic.c
-@@ -17,7 +17,6 @@
-  *
-  */
- 
--#include <linux/config.h>
- #include <linux/usb.h>
- #include "usb.h"
- 
-diff -puN drivers/usb/gadget/gmidi.c~kill-include-linux-configh drivers/usb/gadget/gmidi.c
---- a/drivers/usb/gadget/gmidi.c~kill-include-linux-configh
-+++ a/drivers/usb/gadget/gmidi.c
-@@ -21,7 +21,6 @@
- #define DEBUG 1
- // #define VERBOSE
- 
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/delay.h>
 diff -puN drivers/usb/input/usbtouchscreen.c~kill-include-linux-configh drivers/usb/input/usbtouchscreen.c
 --- a/drivers/usb/input/usbtouchscreen.c~kill-include-linux-configh
 +++ a/drivers/usb/input/usbtouchscreen.c
@@ -2138,17 +1468,6 @@
  #include <linux/mutex.h>
  #include <linux/module.h>
  #include <linux/kernel.h>
-diff -puN drivers/video/intelfb/intelfb_i2c.c~kill-include-linux-configh drivers/video/intelfb/intelfb_i2c.c
---- a/drivers/video/intelfb/intelfb_i2c.c~kill-include-linux-configh
-+++ a/drivers/video/intelfb/intelfb_i2c.c
-@@ -25,7 +25,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
- **************************************************************************/
- 
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/sched.h>
 diff -puN fs/isofs/namei.c~kill-include-linux-configh fs/isofs/namei.c
 --- a/fs/isofs/namei.c~kill-include-linux-configh
 +++ a/fs/isofs/namei.c
@@ -2160,41 +1479,6 @@
  #include <linux/smp_lock.h>
  #include "isofs.h"
  
-diff -puN fs/nfs/client.c~kill-include-linux-configh fs/nfs/client.c
---- a/fs/nfs/client.c~kill-include-linux-configh
-+++ a/fs/nfs/client.c
-@@ -9,8 +9,6 @@
-  * 2 of the License, or (at your option) any later version.
-  */
- 
--
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/init.h>
- 
-diff -puN fs/nfs/fscache.c~kill-include-linux-configh fs/nfs/fscache.c
---- a/fs/nfs/fscache.c~kill-include-linux-configh
-+++ a/fs/nfs/fscache.c
-@@ -9,8 +9,6 @@
-  * 2 of the License, or (at your option) any later version.
-  */
- 
--
--#include <linux/config.h>
- #include <linux/init.h>
- #include <linux/kernel.h>
- #include <linux/mm.h>
-diff -puN fs/nfs/getroot.c~kill-include-linux-configh fs/nfs/getroot.c
---- a/fs/nfs/getroot.c~kill-include-linux-configh
-+++ a/fs/nfs/getroot.c
-@@ -9,7 +9,6 @@
-  * 2 of the License, or (at your option) any later version.
-  */
- 
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/init.h>
- 
 diff -puN fs/nfs/namespace.c~kill-include-linux-configh fs/nfs/namespace.c
 --- a/fs/nfs/namespace.c~kill-include-linux-configh
 +++ a/fs/nfs/namespace.c
@@ -2241,28 +1525,6 @@
  #include <linux/module.h>
  #include <linux/init.h>
  
-diff -puN fs/reiser4/plugin/compress/compress.c~kill-include-linux-configh fs/reiser4/plugin/compress/compress.c
---- a/fs/reiser4/plugin/compress/compress.c~kill-include-linux-configh
-+++ a/fs/reiser4/plugin/compress/compress.c
-@@ -6,7 +6,6 @@
- #include "../plugin.h"
- #include "minilzo.h"
- 
--#include <linux/config.h>
- #include <linux/zlib.h>
- #include <linux/types.h>
- #include <linux/hardirq.h>
-diff -puN fs/reiser4/reiser4.h~kill-include-linux-configh fs/reiser4/reiser4.h
---- a/fs/reiser4/reiser4.h~kill-include-linux-configh
-+++ a/fs/reiser4/reiser4.h
-@@ -6,7 +6,6 @@
- #if !defined( __REISER4_H__ )
- #define __REISER4_H__
- 
--#include <linux/config.h>
- #include <asm/param.h>		/* for HZ */
- #include <linux/errno.h>
- #include <linux/types.h>
 diff -puN include/asm-arm/arch-lh7a40x/clocks.h~kill-include-linux-configh include/asm-arm/arch-lh7a40x/clocks.h
 --- a/include/asm-arm/arch-lh7a40x/clocks.h~kill-include-linux-configh
 +++ a/include/asm-arm/arch-lh7a40x/clocks.h
@@ -2286,23 +1548,6 @@
  #include <linux/slab.h>
  #include <asm/processor.h>
  #include <asm/page.h>
-diff -puN include/asm-i386/alternative-asm.i~kill-include-linux-configh include/asm-i386/alternative-asm.i
---- a/include/asm-i386/alternative-asm.i~kill-include-linux-configh
-+++ a/include/asm-i386/alternative-asm.i
-@@ -1,5 +1,3 @@
--#include <linux/config.h>
--
- #ifdef CONFIG_SMP
- 	.macro LOCK_PREFIX
- 1:	lock
-diff -puN include/asm-i386/frame.i~kill-include-linux-configh include/asm-i386/frame.i
---- a/include/asm-i386/frame.i~kill-include-linux-configh
-+++ a/include/asm-i386/frame.i
-@@ -1,4 +1,3 @@
--#include <linux/config.h>
- #include <asm/dwarf2.h>
- 
- #ifdef CONFIG_FRAME_POINTER
 diff -puN include/asm-powerpc/irq.h~kill-include-linux-configh include/asm-powerpc/irq.h
 --- a/include/asm-powerpc/irq.h~kill-include-linux-configh
 +++ a/include/asm-powerpc/irq.h
@@ -2325,14 +1570,6 @@
  #include <linux/pci.h>
  #include <linux/list.h>
  
-diff -puN include/asm-x86_64/alternative-asm.i~kill-include-linux-configh include/asm-x86_64/alternative-asm.i
---- a/include/asm-x86_64/alternative-asm.i~kill-include-linux-configh
-+++ a/include/asm-x86_64/alternative-asm.i
-@@ -1,4 +1,3 @@
--#include <linux/config.h>
- 
- #ifdef CONFIG_SMP
- 	.macro LOCK_PREFIX
 diff -puN include/asm-x86_64/calgary.h~kill-include-linux-configh include/asm-x86_64/calgary.h
 --- a/include/asm-x86_64/calgary.h~kill-include-linux-configh
 +++ a/include/asm-x86_64/calgary.h
@@ -2344,28 +1581,6 @@
  #include <linux/spinlock.h>
  #include <linux/device.h>
  #include <linux/dma-mapping.h>
-diff -puN include/linux/fscache.h~kill-include-linux-configh include/linux/fscache.h
---- a/include/linux/fscache.h~kill-include-linux-configh
-+++ a/include/linux/fscache.h
-@@ -18,7 +18,6 @@
- #ifndef _LINUX_FSCACHE_H
- #define _LINUX_FSCACHE_H
- 
--#include <linux/config.h>
- #include <linux/fs.h>
- #include <linux/list.h>
- #include <linux/pagemap.h>
-diff -puN include/net/netdma.h~kill-include-linux-configh include/net/netdma.h
---- a/include/net/netdma.h~kill-include-linux-configh
-+++ a/include/net/netdma.h
-@@ -20,7 +20,6 @@
-  */
- #ifndef NETDMA_H
- #define NETDMA_H
--#include <linux/config.h>
- #ifdef CONFIG_NET_DMA
- #include <linux/dmaengine.h>
- #include <linux/skbuff.h>
 diff -puN init/do_mounts.h~kill-include-linux-configh init/do_mounts.h
 --- a/init/do_mounts.h~kill-include-linux-configh
 +++ a/init/do_mounts.h
@@ -2450,105 +1665,6 @@
  #include <linux/module.h> 
  #include <asm/uaccess.h>
  #include <asm/system.h>
-diff -puN net/core/fib_rules.c~kill-include-linux-configh net/core/fib_rules.c
---- a/net/core/fib_rules.c~kill-include-linux-configh
-+++ a/net/core/fib_rules.c
-@@ -8,7 +8,6 @@
-  * Authors:	Thomas Graf <tgraf at suug.ch>
-  */
- 
--#include <linux/config.h>
- #include <linux/types.h>
- #include <linux/kernel.h>
- #include <linux/list.h>
-diff -puN net/core/wireless.c~kill-include-linux-configh net/core/wireless.c
---- a/net/core/wireless.c~kill-include-linux-configh
-+++ a/net/core/wireless.c
-@@ -72,7 +72,6 @@
- 
- /***************************** INCLUDES *****************************/
- 
--#include <linux/config.h>		/* Not needed ??? */
- #include <linux/module.h>
- #include <linux/types.h>		/* off_t */
- #include <linux/netdevice.h>		/* struct ifreq, dev_get_by_name() */
-diff -puN net/ipv4/af_inet.c~kill-include-linux-configh net/ipv4/af_inet.c
---- a/net/ipv4/af_inet.c~kill-include-linux-configh
-+++ a/net/ipv4/af_inet.c
-@@ -67,7 +67,6 @@
-  *		2 of the License, or (at your option) any later version.
-  */
- 
--#include <linux/config.h>
- #include <linux/err.h>
- #include <linux/errno.h>
- #include <linux/types.h>
-diff -puN net/ipv4/ipconfig.c~kill-include-linux-configh net/ipv4/ipconfig.c
---- a/net/ipv4/ipconfig.c~kill-include-linux-configh
-+++ a/net/ipv4/ipconfig.c
-@@ -31,7 +31,6 @@
-  *              --  Josef Siemes <jsiemes at web.de>, Aug 2002
-  */
- 
--#include <linux/config.h>
- #include <linux/types.h>
- #include <linux/string.h>
- #include <linux/kernel.h>
-diff -puN net/ipv4/netfilter/ip_conntrack_sip.c~kill-include-linux-configh net/ipv4/netfilter/ip_conntrack_sip.c
---- a/net/ipv4/netfilter/ip_conntrack_sip.c~kill-include-linux-configh
-+++ a/net/ipv4/netfilter/ip_conntrack_sip.c
-@@ -8,7 +8,6 @@
-  * published by the Free Software Foundation.
-  */
- 
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/ctype.h>
- #include <linux/skbuff.h>
-diff -puN net/ipv4/raw.c~kill-include-linux-configh net/ipv4/raw.c
---- a/net/ipv4/raw.c~kill-include-linux-configh
-+++ a/net/ipv4/raw.c
-@@ -39,7 +39,6 @@
-  *		2 of the License, or (at your option) any later version.
-  */
-  
--#include <linux/config.h> 
- #include <linux/types.h>
- #include <asm/atomic.h>
- #include <asm/byteorder.h>
-diff -puN net/ipv4/tcp_lp.c~kill-include-linux-configh net/ipv4/tcp_lp.c
---- a/net/ipv4/tcp_lp.c~kill-include-linux-configh
-+++ a/net/ipv4/tcp_lp.c
-@@ -31,7 +31,6 @@
-  * Version: $Id$
-  */
- 
--#include <linux/config.h>
- #include <linux/module.h>
- #include <net/tcp.h>
- 
-diff -puN net/ipv4/tcp_veno.c~kill-include-linux-configh net/ipv4/tcp_veno.c
---- a/net/ipv4/tcp_veno.c~kill-include-linux-configh
-+++ a/net/ipv4/tcp_veno.c
-@@ -9,7 +9,6 @@
-  * 	See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf
-  */
- 
--#include <linux/config.h>
- #include <linux/mm.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -puN net/ipv6/fib6_rules.c~kill-include-linux-configh net/ipv6/fib6_rules.c
---- a/net/ipv6/fib6_rules.c~kill-include-linux-configh
-+++ a/net/ipv6/fib6_rules.c
-@@ -13,7 +13,6 @@
-  *	Ville Nuorvala		<vnuorval at tcs.hut.fi>
-  */
- 
--#include <linux/config.h>
- #include <linux/netdevice.h>
- 
- #include <net/fib_rules.h>
 diff -puN sound/aoa/soundbus/sysfs.c~kill-include-linux-configh sound/aoa/soundbus/sysfs.c
 --- a/sound/aoa/soundbus/sysfs.c~kill-include-linux-configh
 +++ a/sound/aoa/soundbus/sysfs.c
@@ -2568,16 +1684,3 @@
  #include <linux/module.h>
  #include <asm/io.h>
  #include <asm/uaccess.h>
-_
-
-Patches currently in -mm which might be from michal.k.k.piotrowski at gmail.com are
-
-csa-basic-accounting-over-taskstats-fix.patch
-the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
-kill-include-linux-configh.patch
-
--
-To unsubscribe from this list: send the line "unsubscribe mm-commits" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-



From fedora-cvs-commits at redhat.com  Mon Aug 14 03:33:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 23:33:41 -0400
Subject: rpms/gdm/devel .cvsignore, 1.31, 1.32 gdm.spec, 1.189, 1.190 sources,
	1.33, 1.34 gdm-2.13.0.4-modularx.patch, 1.1,
	NONE gdm-2.15.6-fix-face-browser.patch, 1.1,
	NONE gdm-2.8.0.2-dont-malloc-in-signal-handlers.patch, 1.1, NONE
Message-ID: <200608140333.k7E3XfOh025217@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25172

Modified Files:
	.cvsignore gdm.spec sources 
Removed Files:
	gdm-2.13.0.4-modularx.patch gdm-2.15.6-fix-face-browser.patch 
	gdm-2.8.0.2-dont-malloc-in-signal-handlers.patch 
Log Message:
- update to 2.15.9



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	3 Aug 2006 22:59:47 -0000	1.31
+++ .cvsignore	14 Aug 2006 03:33:37 -0000	1.32
@@ -1 +1 @@
-gdm-2.15.7.tar.bz2
+gdm-2.15.9.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- gdm.spec	4 Aug 2006 04:47:35 -0000	1.189
+++ gdm.spec	14 Aug 2006 03:33:38 -0000	1.190
@@ -15,8 +15,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.15.7
-Release: 2%{?dist}
+Version: 2.15.9
+Release: 1%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -35,15 +35,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=301826
 Patch7: gdm-2.8.0.2-merge-resources.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=349829
-Patch9: gdm-2.8.0.2-dont-malloc-in-signal-handlers.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=349835
 Patch12: gdm-2.13.0.4-audit-login.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=349836
-Patch13: gdm-2.13.0.4-modularx.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=347798
 Patch19: gdm-2.15.5-move-default-message.patch
 Patch20: gdm-2.15.5-reset-pam.patch
@@ -55,9 +49,6 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=327530
 Patch25: gdm-2.15.6-center-cursor.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=349640
-Patch26: gdm-2.15.6-fix-face-browser.patch
-
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
 Prereq: /usr/sbin/useradd
@@ -120,15 +111,12 @@
 %patch4 -p1 -b .update-switchdesk-location
 %patch6 -p1 -b .clean-up-xsession-errors
 %patch7 -p1 -b .merge-resources
-%patch9 -p1 -b .dont-malloc-in-signal-handlers
 %patch12 -p1 -b .audit-login
-%patch13 -p1 -b .modularx
 %patch19 -p1 -b .move-default-message
 %patch20 -p1 -b .reset-pam
 %patch21 -p1 -b .security-tokens
 %patch24 -p1 -b .wtmp
 %patch25 -p1 -b .center-cursor
-%patch26 -p1 -b .fix-face-browser
 
 %build
 cp -f %{SOURCE1} config/gdm
@@ -316,6 +304,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Fri Aug 4 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.9-1
+- update to 2.15.9
+
 * Fri Aug 4 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.7-2
 - update gdmsetup pam file to use config-util stacks
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	3 Aug 2006 22:59:47 -0000	1.33
+++ sources	14 Aug 2006 03:33:38 -0000	1.34
@@ -1 +1 @@
-23197330573ff1610c4b642e5c1df422  gdm-2.15.7.tar.bz2
+91efa2f43374b5f3f7ff7e0a8a696421  gdm-2.15.9.tar.bz2


--- gdm-2.13.0.4-modularx.patch DELETED ---


--- gdm-2.15.6-fix-face-browser.patch DELETED ---


--- gdm-2.8.0.2-dont-malloc-in-signal-handlers.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 03:50:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 13 Aug 2006 23:50:37 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2560,1.2561
Message-ID: <200608140350.k7E3obVP013239@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
hugely simplify the xen setup


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2560
retrieving revision 1.2561
diff -u -r1.2560 -r1.2561
--- kernel-2.6.spec	14 Aug 2006 03:00:18 -0000	1.2560
+++ kernel-2.6.spec	14 Aug 2006 03:50:35 -0000	1.2561
@@ -683,34 +683,6 @@
 fi
 cp -rl vanilla linux-%{kversion}.%{_target_cpu}
 
-# Now do the same procedure with the Xen tarball.
-%if %{includexen}
-if [ -d xen ]; then
-  # Just in case we ctrl-c'd a prep already
-  rm -rf deleteme2
-  # Move away the stale away, and delete in background.
-  mv xen deleteme2
-  rm -rf deleteme2 &
-fi
-
-if [ ! -d xen-%{xen_hv_cset} ]; then
-  # %setup does chmod <blah> . what is bad if you are remoing things
-  # in the background
-  rm -rf deleteme2
-  # Ok, first time we do a make prep
-%setup -D -T -q -n %{name}-%{version} -a1
-  cp %{SOURCE2} .
-  mv xen xen-%{xen_hv_cset}
-fi
-cp -rl xen-%{xen_hv_cset} xen
-
-cd xen
-# Any necessary hypervisor patches go here
-%patch20000 -p1
-cd ..
-
-%endif
-
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
@@ -1024,6 +996,19 @@
 find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
 
 
+# Unpack the Xen tarball.
+%if %{includexen}
+if [ -d xen ]; then
+  mv xen xen-old
+  rm -rf xen-old &
+fi
+%setup -D -T -q -n %{name}-%{version} -a1
+cd xen
+# Any necessary hypervisor patches go here
+%patch20000 -p1
+%endif
+
+
 ###
 ### build
 ###



From fedora-cvs-commits at redhat.com  Mon Aug 14 04:14:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 00:14:07 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2561,1.2562
Message-ID: <200608140414.k7E4E74D019005@cvs.devel.redhat.com>

Author: davej

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

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


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2561
retrieving revision 1.2562
diff -u -r1.2561 -r1.2562
--- kernel-2.6.spec	14 Aug 2006 03:50:35 -0000	1.2561
+++ kernel-2.6.spec	14 Aug 2006 04:14:00 -0000	1.2562
@@ -1227,6 +1227,7 @@
 
 %if %{includexen}
 %if %{buildxen}
+  cp %{SOURCE2} .
   cd xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot
   make %{?_smp_mflags} %{xen_flags}



From fedora-cvs-commits at redhat.com  Mon Aug 14 04:37:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 00:37:46 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2562,1.2563
Message-ID: <200608140437.k7E4bkOl006173@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
silly typo


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2562
retrieving revision 1.2563
diff -u -r1.2562 -r1.2563
--- kernel-2.6.spec	14 Aug 2006 04:14:00 -0000	1.2562
+++ kernel-2.6.spec	14 Aug 2006 04:37:40 -0000	1.2563
@@ -1265,7 +1265,7 @@
 
 %if %{buildolpc}
 BuildKernel %make_target %kernel_image olpc
-$endif
+%endif
 
 ###
 ### Special hacks for debuginfo subpackages.



From fedora-cvs-commits at redhat.com  Mon Aug 14 05:08:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 01:08:08 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2563,1.2564
Message-ID: <200608140508.k7E587JM032426@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
add switch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2563
retrieving revision 1.2564
diff -u -r1.2563 -r1.2564
--- kernel-2.6.spec	14 Aug 2006 04:37:40 -0000	1.2563
+++ kernel-2.6.spec	14 Aug 2006 05:07:57 -0000	1.2564
@@ -14,6 +14,8 @@
 %define buildkdump 1
 %define buildheaders 0
 
+%define buildolpc 0
+
 # Versions of various parts
 
 # After branching, please hardcode these values as the



From fedora-cvs-commits at redhat.com  Mon Aug 14 08:00:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 04:00:29 -0400
Subject: rpms/openoffice.org/devel workspace.opensymbol01.patch,1.1,1.2
Message-ID: <200608140800.k7E80TWU007809@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	workspace.opensymbol01.patch 
Log Message:
resync opensymbol01 workspace

workspace.opensymbol01.patch:
 source/core/doc/number.cxx    |    0 
 sw/source/core/doc/number.cxx |    6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: workspace.opensymbol01.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.opensymbol01.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.opensymbol01.patch	2 Aug 2006 19:27:28 -0000	1.1
+++ workspace.opensymbol01.patch	14 Aug 2006 08:00:25 -0000	1.2
@@ -5,14 +5,20 @@
 diff -u -p -u -r1.32 number.cxx
 --- openoffice.org.orig/sw/source/core/doc/number.cxx	8 Nov 2005 17:17:38 -0000	1.32
 +++ openoffice.org/sw/source/core/doc/number.cxx	3 Jan 2006 17:19:09 -0000
-@@ -986,8 +986,8 @@ void SwNumRule::Indent(short nAmount, in
- sal_Unicode GetBulletChar(BYTE nLevel)
- {
-     static sal_Unicode nLevelChars[MAXLEVEL] =
--        { 0x25cf, 0x25cb, 0x25a0, 0x25cf, 0x25cb,
--          0x25a0, 0x25cf, 0x25cb, 0x25a0, 0x25cf };
-+        { 0x25cf, 0xe572, 0x25a0, 0x25cf, 0xe572,
-+          0x25a0, 0x25cf, 0xe572, 0x25a0, 0x25cf };
+@@ -1210,13 +1210,13 @@
+         meFontItalic = ITALIC_NONE;
  
-     if (nLevel > MAXLEVEL)
-         nLevel = MAXLEVEL;
+         mnLevelChars[0] = 0x25cf;
+-        mnLevelChars[1] = 0x25cb;
++        mnLevelChars[1] = 0xe572;
+         mnLevelChars[2] = 0x25a0;
+         mnLevelChars[3] = 0x25cf;
+-        mnLevelChars[4] = 0x25cb;
++        mnLevelChars[4] = 0xe572;
+         mnLevelChars[5] = 0x25a0;
+         mnLevelChars[6] = 0x25cf;
+-        mnLevelChars[7] = 0x25cb;
++        mnLevelChars[7] = 0xe572;
+         mnLevelChars[8] = 0x25a0;
+         mnLevelChars[9] = 0x25cf;
+     }



From fedora-cvs-commits at redhat.com  Mon Aug 14 08:21:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 04:21:29 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,
	1.11, 1.12
Message-ID: <200608140821.k7E8LTAX004794@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
Log Message:
resync fontconfig hinting patch

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 psprint/inc/psprint/fontmanager.hxx        |   37 +++++-
 psprint/source/fontmanager/fontcache.cxx   |   13 --
 psprint/source/fontmanager/fontconfig.cxx  |   96 +++++++++++++---
 psprint/source/fontmanager/fontmanager.cxx |    6 -
 vcl/inc/impfont.hxx                        |   36 ++++++
 vcl/inc/outdev.hxx                         |    3 
 vcl/inc/outfont.hxx                        |    4 
 vcl/inc/salgdi.hxx                         |    2 
 vcl/inc/vclenum.hxx                        |   21 +++
 vcl/source/gdi/outdev3.cxx                 |    8 +
 vcl/source/glyphs/gcach_ftyp.cxx           |   80 ++++++++-----
 vcl/source/glyphs/gcach_ftyp.hxx           |    5 
 vcl/unx/inc/pspgraphics.h                  |    1 
 vcl/unx/inc/salgdi.h                       |    1 
 vcl/unx/source/gdi/pspgraphics.cxx         |   30 -----
 vcl/unx/source/gdi/salgdi3.cxx             |  168 +++++++++++++++++++++++++++++
 vcl/unx/source/gdi/xlfd_extd.cxx           |    3 
 vcl/win/inc/salgdi.h                       |    1 
 vcl/win/source/gdi/salgdi3.cxx             |    6 +
 19 files changed, 416 insertions(+), 105 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	2 Jun 2006 21:04:58 -0000	1.11
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	14 Aug 2006 08:21:22 -0000	1.12
@@ -149,7 +149,7 @@
 diff -ru vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
 --- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	2006-05-04 08:55:40.000000000 +0100
 +++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	2006-05-05 10:26:37.000000000 +0100
-@@ -45,6 +45,7 @@
+@@ -41,6 +41,7 @@
  #include <impfont.hxx>
  #include <bitmap.hxx>
  #include <bmpacc.hxx>
@@ -157,7 +157,7 @@
  
  #include <tools/poly.hxx>
  #include <basegfx/matrix/b2dhommatrix.hxx>
-@@ -595,9 +596,6 @@
+@@ -594,9 +595,6 @@
              aDFA.mbSubsettable= false;
              aDFA.mbEmbeddable = false;
  
@@ -167,32 +167,32 @@
              FT_Done_Face( aFaceFT );
              AddFontFile( aCFileName, nFaceNum, ++mnNextFontId, aDFA, NULL );
              ++nCount;
-@@ -686,6 +684,7 @@
- FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontInfo* pFI )
+@@ -676,6 +674,7 @@
  :   ServerFont( rFSD ),
-     mnPrioEmbedded(nDefaultPrioEmbedded), mnPrioAntiAlias(nDefaultPrioAntiAlias),
+     mnPrioEmbedded(nDefaultPrioEmbedded),
+     mnPrioAntiAlias(nDefaultPrioAntiAlias),
 +    mnPrioAutoHint(nDefaultPrioAutoHint),
      mpFontInfo( pFI ),
      maFaceFT( NULL ),
      maSizeFT( NULL ),
-@@ -808,42 +807,67 @@
+@@ -805,42 +804,67 @@
  
      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;
++	    //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;
 +    }
 +
 +    ImplFontHints aHints;
@@ -203,23 +203,23 @@
 +    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_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;
+-        && rFSD.mnHeight < 20)
+-        mbUseGamma = true;
 -    else
--	mbUseGamma = false;
+-        mbUseGamma = false;
 -
 -    if (mbUseGamma)
 +    if (eHint == AUTOHINT_TRUE)
- 	mnLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
+         mnLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
  
      if( (mnSin != 0) && (mnCos != 0) ) // hinting for 0/90/180/270 degrees only
          mnLoadFlags |= FT_LOAD_NO_HINTING;
@@ -228,12 +228,13 @@
 -    if (mpFontInfo->DontUseAntiAlias())
 -        mnPrioAntiAlias = 0;
 -    if (mpFontInfo->DontUseEmbeddedBitmaps())
+-        mnPrioEmbedded = 0;
 +    if (aHints.DontUseAntiAlias())
-+	mnPrioAntiAlias = 0;
++      mnPrioAntiAlias = 0;
 +    if (aHints.DontUseEmbeddedBitmaps())
-         mnPrioEmbedded = 0;
++      mnPrioEmbedded = 0;
 +    if (aHints.DontUseHinting())
-+    	mnPrioAutoHint = 0;
++      mnPrioAutoHint = 0;
  
  #if (FTVERSION >= 2005) || defined(TT_CONFIG_OPTION_BYTECODE_INTERPRETER)
 -    if( nDefaultPrioAutoHint <= 0 )
@@ -264,7 +265,7 @@
  #endif
  
      if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
-@@ -1302,11 +1326,11 @@
+@@ -1297,11 +1321,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
@@ -278,7 +279,7 @@
          nLoadFlags |= FT_LOAD_NO_BITMAP;
  
      FT_Error rc = -1;
-@@ -1453,7 +1477,7 @@
+@@ -1446,7 +1470,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  Mon Aug 14 08:50:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 04:50:51 -0400
Subject: rpms/kdegames/FC-5 kdegames.spec,1.50,1.51 sources,1.36,1.37
Message-ID: <200608140850.k7E8opEW020623@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegames.spec sources 
Log Message:
3.5.4



Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-5/kdegames.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdegames.spec	9 Jun 2006 19:44:20 -0000	1.50
+++ kdegames.spec	14 Aug 2006 08:50:48 -0000	1.51
@@ -2,7 +2,6 @@
 %define final 0
 %define make_cvs 1
 
-%define arts 1
 %define redhatify 1
 
 %if %{redhatify}
@@ -11,22 +10,19 @@
 %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.3
+Version: 3.5.4
 Release: 0.1.fc5
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
-Prefix: /usr
 License: GPL
 Group: Amusements/Games
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
 
@@ -35,19 +31,18 @@
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 BuildRequires: kdebase-devel
 BuildRequires: autoconf
-BuildRequires: automake >= 1.6
+BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: glibc-devel
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: libstdc++-devel
 BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
 BuildRequires: perl
 
@@ -80,22 +75,11 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-export KDEDIR=%{prefix}
-
-FLAGS="$RPM_OPT_FLAGS"
-
-CFLAGS="$FLAGS" \
-CXXFLAGS="$FLAGS -fno-check-new" \
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %ifarch s390 s390x
    --disable-pie \
 %endif
@@ -106,32 +90,44 @@
    --disable-debug \
    --disable-warnings \
 %endif
-   --includedir=%{prefix}/include/kde \
+   --includedir=%{_includedir}/kde \
    --with-qt-libraries=$QTDIR/lib
 
 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/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
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -153,7 +149,10 @@
 %{_includedir}/kde/*
 
 %changelog
-* Fri Jun 09 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.1.fc5
+- 3-5-4
+
+* Fri Jun 09 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc5
 - update to 3.5.3
 
 * Tue Apr 04 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-5/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	9 Jun 2006 19:44:20 -0000	1.36
+++ sources	14 Aug 2006 08:50:48 -0000	1.37
@@ -1 +1 @@
-2120de8516ee24e989a1f9b097d0c572  kdegames-3.5.3-patched.tar.bz2
+72cd6d61b3c0339639964840b335555a  kdegames-3.5.4-patched.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 08:50:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 04:50:57 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.833,
	1.834 workspace.bfsixtyfour.patch, 1.1, NONE
Message-ID: <200608140850.k7E8ovwr020678@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.bfsixtyfour.patch 
Log Message:
drop integrated workspace.bfsixtyfour


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.833
retrieving revision 1.834
diff -u -r1.833 -r1.834
--- openoffice.org.spec	13 Aug 2006 18:57:05 -0000	1.833
+++ openoffice.org.spec	14 Aug 2006 08:50:54 -0000	1.834
@@ -91,48 +91,47 @@
 Patch23: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch24: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch25: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch26: workspace.bfsixtyfour.patch
-Patch27: workspace.thbpp4.patch
-Patch28: workspace.impress96.patch
-Patch29: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
-Patch30: workspace.fpicker6.patch
-Patch31: workspace.vcl59.patch
-Patch32: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
-Patch33: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch34: workspace.vcl60.patch
-Patch35: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
-Patch36: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
-Patch37: workspace.fwk40.patch
-Patch38: workspace.sixtyfour06.patch
-Patch39: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch40: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch41: workspace.kendy10.patch
-Patch42: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch43: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch44: ooobuild.VBAObjects.patch
-Patch45: workspace.gcjsix.patch
-Patch46: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch47: workspace.vcl63.patch
-Patch48: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch49: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch50: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch51: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch52: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch53: workspace.pb17.patch
-Patch54: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch55: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch56: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch57: workspace.os84.patch
-Patch58: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch59: workspace.configure18.patch
-Patch60: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch61: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch62: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch63: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch64: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch65: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch66: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch67: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch26: workspace.thbpp4.patch
+Patch27: workspace.impress96.patch
+Patch28: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
+Patch29: workspace.fpicker6.patch
+Patch30: workspace.vcl59.patch
+Patch31: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
+Patch32: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch33: workspace.vcl60.patch
+Patch34: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+Patch35: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
+Patch36: workspace.fwk40.patch
+Patch37: workspace.sixtyfour06.patch
+Patch38: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch39: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch40: workspace.kendy10.patch
+Patch41: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch42: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch43: ooobuild.VBAObjects.patch
+Patch44: workspace.gcjsix.patch
+Patch45: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch46: workspace.vcl63.patch
+Patch47: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch48: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch49: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch50: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch51: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch52: workspace.pb17.patch
+Patch53: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch54: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch55: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch56: workspace.os84.patch
+Patch57: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch58: workspace.configure18.patch
+Patch59: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch60: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch61: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch62: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch63: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch64: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch65: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch66: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -959,48 +958,47 @@
 %patch23 -p1
 %patch24 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch25 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch26 -p1 -b .workspace.bfsixtyfour.patch
-%patch27 -p1 -b .workspace.thbpp4.patch
-%patch28 -p1 -b .workspace.impress96.patch
-%patch29 -p1 -b .ooo65327.builddep.writerperfect.patch
-%patch30 -p1 -b .workspace.fpicker6.patch
-%patch31 -p1 -b .workspace.vcl59.patch
-%patch32 -p1 -b .oooXXXXX.atkbroken.vcl.patch
-%patch33 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch34 -p1 -b .workspace.vcl60.patch
-%patch35 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
-%patch36 -p1 -b .rh192588.officecfg.defaultcairooff.patch
-%patch37 -p1 -b .workspace.fwk40.patch
-%patch38 -p1 -b .workspace.sixtyfour06.patch
-%patch39 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch40 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch41 -p1 -b .workspace.kendy10.patch
-%patch42 -p1 -b .rh187919.gtkunderkde.patch
-%patch43 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch44 -p0 -b .ooobuild.VBAObjects.patch
-%patch45 -p1 -b .workspace.gcjsix.patch
-%patch46 -p1 -b .ooo67644.sw.spacing.patch
-%patch47 -p1 -b .workspace.vcl63.patch
-%patch48 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch49 -p1 -b .ooo67716.svx.overflow.patch
-%patch50 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch51 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch52 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch53 -p1 -b .workspace.pb17.patch
-%patch54 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch55 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch56 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch57 -p1 -b .workspace.os84.patch
-%patch58 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch59 -p1 -b .workspace.configure18.patch
-%patch60 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch61 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch62 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch63 -p1 -b .ooo68047.vcl.zwj.patch
-%patch64 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch65 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch66 -p1 -b .ooo68383.evo28support.patch
-%patch67 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch26 -p1 -b .workspace.thbpp4.patch
+%patch27 -p1 -b .workspace.impress96.patch
+%patch28 -p1 -b .ooo65327.builddep.writerperfect.patch
+%patch29 -p1 -b .workspace.fpicker6.patch
+%patch30 -p1 -b .workspace.vcl59.patch
+%patch31 -p1 -b .oooXXXXX.atkbroken.vcl.patch
+%patch32 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch33 -p1 -b .workspace.vcl60.patch
+%patch34 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
+%patch35 -p1 -b .rh192588.officecfg.defaultcairooff.patch
+%patch36 -p1 -b .workspace.fwk40.patch
+%patch37 -p1 -b .workspace.sixtyfour06.patch
+%patch38 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch39 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch40 -p1 -b .workspace.kendy10.patch
+%patch41 -p1 -b .rh187919.gtkunderkde.patch
+%patch42 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch43 -p0 -b .ooobuild.VBAObjects.patch
+%patch44 -p1 -b .workspace.gcjsix.patch
+%patch45 -p1 -b .ooo67644.sw.spacing.patch
+%patch46 -p1 -b .workspace.vcl63.patch
+%patch47 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch48 -p1 -b .ooo67716.svx.overflow.patch
+%patch49 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch50 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch51 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch52 -p1 -b .workspace.pb17.patch
+%patch53 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch54 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch55 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch56 -p1 -b .workspace.os84.patch
+%patch57 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch58 -p1 -b .workspace.configure18.patch
+%patch59 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch60 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch61 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch62 -p1 -b .ooo68047.vcl.zwj.patch
+%patch63 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch64 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch65 -p1 -b .ooo68383.evo28support.patch
+%patch66 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 
@@ -2521,6 +2519,7 @@
 - clear font customization as fontconfig now has it's defaults the way we need
 - clear gengal rdb removal, ooo#65361# fixed
 - drop integrated workspace.targetedaot.patch
+- drop integrated workspace.bfsixtyfour.patch
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
 - icu settext ownership of string data changed silently


--- workspace.bfsixtyfour.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 09:08:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 05:08:21 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.834,
	1.835 workspace.thbpp4.patch, 1.1, NONE
Message-ID: <200608140908.k7E98LxH020862@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.thbpp4.patch 
Log Message:
integrated workspace.thbpp4


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -r1.834 -r1.835
--- openoffice.org.spec	14 Aug 2006 08:50:54 -0000	1.834
+++ openoffice.org.spec	14 Aug 2006 09:08:14 -0000	1.835
@@ -91,47 +91,46 @@
 Patch23: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch24: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch25: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch26: workspace.thbpp4.patch
-Patch27: workspace.impress96.patch
-Patch28: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
-Patch29: workspace.fpicker6.patch
-Patch30: workspace.vcl59.patch
-Patch31: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
-Patch32: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch33: workspace.vcl60.patch
-Patch34: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
-Patch35: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
-Patch36: workspace.fwk40.patch
-Patch37: workspace.sixtyfour06.patch
-Patch38: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch39: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch40: workspace.kendy10.patch
-Patch41: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch42: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch43: ooobuild.VBAObjects.patch
-Patch44: workspace.gcjsix.patch
-Patch45: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch46: workspace.vcl63.patch
-Patch47: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch48: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch49: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch50: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch51: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch52: workspace.pb17.patch
-Patch53: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch54: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch55: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch56: workspace.os84.patch
-Patch57: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch58: workspace.configure18.patch
-Patch59: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch60: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch61: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch62: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch63: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch64: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch65: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch66: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch26: workspace.impress96.patch
+Patch27: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
+Patch28: workspace.fpicker6.patch
+Patch29: workspace.vcl59.patch
+Patch30: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
+Patch31: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch32: workspace.vcl60.patch
+Patch33: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+Patch34: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
+Patch35: workspace.fwk40.patch
+Patch36: workspace.sixtyfour06.patch
+Patch37: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch38: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch39: workspace.kendy10.patch
+Patch40: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch41: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch42: ooobuild.VBAObjects.patch
+Patch43: workspace.gcjsix.patch
+Patch44: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch45: workspace.vcl63.patch
+Patch46: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch47: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch48: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch49: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch50: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch51: workspace.pb17.patch
+Patch52: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch53: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch54: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch55: workspace.os84.patch
+Patch56: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch57: workspace.configure18.patch
+Patch58: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch59: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch60: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch61: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch62: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch63: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch64: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch65: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -958,47 +957,46 @@
 %patch23 -p1
 %patch24 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch25 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch26 -p1 -b .workspace.thbpp4.patch
-%patch27 -p1 -b .workspace.impress96.patch
-%patch28 -p1 -b .ooo65327.builddep.writerperfect.patch
-%patch29 -p1 -b .workspace.fpicker6.patch
-%patch30 -p1 -b .workspace.vcl59.patch
-%patch31 -p1 -b .oooXXXXX.atkbroken.vcl.patch
-%patch32 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch33 -p1 -b .workspace.vcl60.patch
-%patch34 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
-%patch35 -p1 -b .rh192588.officecfg.defaultcairooff.patch
-%patch36 -p1 -b .workspace.fwk40.patch
-%patch37 -p1 -b .workspace.sixtyfour06.patch
-%patch38 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch39 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch40 -p1 -b .workspace.kendy10.patch
-%patch41 -p1 -b .rh187919.gtkunderkde.patch
-%patch42 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch43 -p0 -b .ooobuild.VBAObjects.patch
-%patch44 -p1 -b .workspace.gcjsix.patch
-%patch45 -p1 -b .ooo67644.sw.spacing.patch
-%patch46 -p1 -b .workspace.vcl63.patch
-%patch47 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch48 -p1 -b .ooo67716.svx.overflow.patch
-%patch49 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch50 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch51 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch52 -p1 -b .workspace.pb17.patch
-%patch53 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch54 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch55 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch56 -p1 -b .workspace.os84.patch
-%patch57 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch58 -p1 -b .workspace.configure18.patch
-%patch59 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch60 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch61 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch62 -p1 -b .ooo68047.vcl.zwj.patch
-%patch63 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch64 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch65 -p1 -b .ooo68383.evo28support.patch
-%patch66 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch26 -p1 -b .workspace.impress96.patch
+%patch27 -p1 -b .ooo65327.builddep.writerperfect.patch
+%patch28 -p1 -b .workspace.fpicker6.patch
+%patch29 -p1 -b .workspace.vcl59.patch
+%patch30 -p1 -b .oooXXXXX.atkbroken.vcl.patch
+%patch31 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch32 -p1 -b .workspace.vcl60.patch
+%patch33 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
+%patch34 -p1 -b .rh192588.officecfg.defaultcairooff.patch
+%patch35 -p1 -b .workspace.fwk40.patch
+%patch36 -p1 -b .workspace.sixtyfour06.patch
+%patch37 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch38 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch39 -p1 -b .workspace.kendy10.patch
+%patch40 -p1 -b .rh187919.gtkunderkde.patch
+%patch41 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch42 -p0 -b .ooobuild.VBAObjects.patch
+%patch43 -p1 -b .workspace.gcjsix.patch
+%patch44 -p1 -b .ooo67644.sw.spacing.patch
+%patch45 -p1 -b .workspace.vcl63.patch
+%patch46 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch47 -p1 -b .ooo67716.svx.overflow.patch
+%patch48 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch49 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch50 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch51 -p1 -b .workspace.pb17.patch
+%patch52 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch53 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch54 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch55 -p1 -b .workspace.os84.patch
+%patch56 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch57 -p1 -b .workspace.configure18.patch
+%patch58 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch59 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch60 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch61 -p1 -b .ooo68047.vcl.zwj.patch
+%patch62 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch63 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch64 -p1 -b .ooo68383.evo28support.patch
+%patch65 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 
@@ -2518,8 +2516,9 @@
 - add openoffice.org-2.0.3.ooo68383.evo28support.patch for new evo
 - clear font customization as fontconfig now has it's defaults the way we need
 - clear gengal rdb removal, ooo#65361# fixed
-- drop integrated workspace.targetedaot.patch
-- drop integrated workspace.bfsixtyfour.patch
+- drop integrated workspace.targetedaot
+- drop integrated workspace.bfsixtyfour
+- drop integrated workspace.thbpp4
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
 - icu settext ownership of string data changed silently


--- workspace.thbpp4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 09:11:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 05:11:44 -0400
Subject: rpms/kdeaccessibility/FC-5 kdeaccessibility.spec, 1.18, 1.19 sources,
	1.12, 1.13
Message-ID: <200608140911.k7E9Bip8031321@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeaccessibility.spec sources 
Log Message:
3.5.4



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-5/kdeaccessibility.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kdeaccessibility.spec	10 Jun 2006 09:10:11 -0000	1.18
+++ kdeaccessibility.spec	14 Aug 2006 09:11:40 -0000	1.19
@@ -3,19 +3,17 @@
 
 %define make_cvs 0
 
-%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.3
+Version: 3.5.4
 Release: 0.1.fc5
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
 License: GPL
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch: kde-libtool.patch
@@ -24,8 +22,16 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: zlib-devel
+BuildRequires: kdebase-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: perl
 BuildRequires: libXtst-devel
+BuildRequires: gettext
 
 %description
 Included with this package are:
@@ -61,9 +67,7 @@
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -97,15 +101,15 @@
 %post
 /sbin/ldconfig
 for f in hicolor locolor mono ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 
 %postun
 /sbin/ldconfig
 for f in hicolor locolor mono ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 
 %files
@@ -130,6 +134,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 1:3.5.4-0.1.fc5
+- 3.5.4
+
 * Sat Jun 10 2006 Than Ngo <than at redhat.com> 1:3.5.3-0.1.fc5
 - update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	10 Jun 2006 08:41:51 -0000	1.12
+++ sources	14 Aug 2006 09:11:40 -0000	1.13
@@ -1 +1 @@
-99eadb3a73bc250e96cec370ee79caff  kdeaccessibility-3.5.3.tar.bz2
+bc64350a56a585e4d2c88fe3fc8b24f8  kdeaccessibility-3.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 09:17:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 05:17:10 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.835,
	1.836 openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch,
	1.2, NONE
Message-ID: <200608140917.k7E9HA10001509@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch 
Log Message:
integrated openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.835
retrieving revision 1.836
diff -u -r1.835 -r1.836
--- openoffice.org.spec	14 Aug 2006 09:08:14 -0000	1.835
+++ openoffice.org.spec	14 Aug 2006 09:17:07 -0000	1.836
@@ -92,45 +92,44 @@
 Patch24: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch25: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch26: workspace.impress96.patch
-Patch27: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
-Patch28: workspace.fpicker6.patch
-Patch29: workspace.vcl59.patch
-Patch30: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
-Patch31: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch32: workspace.vcl60.patch
-Patch33: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
-Patch34: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
-Patch35: workspace.fwk40.patch
-Patch36: workspace.sixtyfour06.patch
-Patch37: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch38: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch39: workspace.kendy10.patch
-Patch40: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch41: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch42: ooobuild.VBAObjects.patch
-Patch43: workspace.gcjsix.patch
-Patch44: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch45: workspace.vcl63.patch
-Patch46: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch47: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch48: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch49: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch50: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch51: workspace.pb17.patch
-Patch52: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch53: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch54: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch55: workspace.os84.patch
-Patch56: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch57: workspace.configure18.patch
-Patch58: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch59: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch60: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch61: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch62: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch63: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch64: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch65: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch27: workspace.fpicker6.patch
+Patch28: workspace.vcl59.patch
+Patch29: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
+Patch30: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch31: workspace.vcl60.patch
+Patch32: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+Patch33: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
+Patch34: workspace.fwk40.patch
+Patch35: workspace.sixtyfour06.patch
+Patch36: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch37: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch38: workspace.kendy10.patch
+Patch39: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch40: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch41: ooobuild.VBAObjects.patch
+Patch42: workspace.gcjsix.patch
+Patch43: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch44: workspace.vcl63.patch
+Patch45: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch46: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch47: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch48: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch49: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch50: workspace.pb17.patch
+Patch51: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch52: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch53: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch54: workspace.os84.patch
+Patch55: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch56: workspace.configure18.patch
+Patch57: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch58: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch59: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch60: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch61: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch62: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch63: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch64: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -958,45 +957,44 @@
 %patch24 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch25 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch26 -p1 -b .workspace.impress96.patch
-%patch27 -p1 -b .ooo65327.builddep.writerperfect.patch
-%patch28 -p1 -b .workspace.fpicker6.patch
-%patch29 -p1 -b .workspace.vcl59.patch
-%patch30 -p1 -b .oooXXXXX.atkbroken.vcl.patch
-%patch31 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch32 -p1 -b .workspace.vcl60.patch
-%patch33 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
-%patch34 -p1 -b .rh192588.officecfg.defaultcairooff.patch
-%patch35 -p1 -b .workspace.fwk40.patch
-%patch36 -p1 -b .workspace.sixtyfour06.patch
-%patch37 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch38 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch39 -p1 -b .workspace.kendy10.patch
-%patch40 -p1 -b .rh187919.gtkunderkde.patch
-%patch41 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch42 -p0 -b .ooobuild.VBAObjects.patch
-%patch43 -p1 -b .workspace.gcjsix.patch
-%patch44 -p1 -b .ooo67644.sw.spacing.patch
-%patch45 -p1 -b .workspace.vcl63.patch
-%patch46 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch47 -p1 -b .ooo67716.svx.overflow.patch
-%patch48 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch49 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch50 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch51 -p1 -b .workspace.pb17.patch
-%patch52 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch53 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch54 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch55 -p1 -b .workspace.os84.patch
-%patch56 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch57 -p1 -b .workspace.configure18.patch
-%patch58 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch59 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch60 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch61 -p1 -b .ooo68047.vcl.zwj.patch
-%patch62 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch63 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch64 -p1 -b .ooo68383.evo28support.patch
-%patch65 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch27 -p1 -b .workspace.fpicker6.patch
+%patch28 -p1 -b .workspace.vcl59.patch
+%patch29 -p1 -b .oooXXXXX.atkbroken.vcl.patch
+%patch30 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch31 -p1 -b .workspace.vcl60.patch
+%patch32 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
+%patch33 -p1 -b .rh192588.officecfg.defaultcairooff.patch
+%patch34 -p1 -b .workspace.fwk40.patch
+%patch35 -p1 -b .workspace.sixtyfour06.patch
+%patch36 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch37 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch38 -p1 -b .workspace.kendy10.patch
+%patch39 -p1 -b .rh187919.gtkunderkde.patch
+%patch40 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch41 -p0 -b .ooobuild.VBAObjects.patch
+%patch42 -p1 -b .workspace.gcjsix.patch
+%patch43 -p1 -b .ooo67644.sw.spacing.patch
+%patch44 -p1 -b .workspace.vcl63.patch
+%patch45 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch46 -p1 -b .ooo67716.svx.overflow.patch
+%patch47 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch48 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch49 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch50 -p1 -b .workspace.pb17.patch
+%patch51 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch52 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch53 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch54 -p1 -b .workspace.os84.patch
+%patch55 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch56 -p1 -b .workspace.configure18.patch
+%patch57 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch58 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch59 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch60 -p1 -b .ooo68047.vcl.zwj.patch
+%patch61 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch62 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch63 -p1 -b .ooo68383.evo28support.patch
+%patch64 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 
@@ -2519,6 +2517,7 @@
 - drop integrated workspace.targetedaot
 - drop integrated workspace.bfsixtyfour
 - drop integrated workspace.thbpp4
+- drop integrated ooo65327.builddep.writerperfect.patch
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
 - icu settext ownership of string data changed silently


--- openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 09:24:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 05:24:30 -0400
Subject: rpms/mkinitrd/devel mkinitrd-5.1.3-compile-fix.patch, NONE,
	1.1 mkinitrd.spec, 1.146, 1.147
Message-ID: <200608140924.k7E9OU5r016593@cvs.devel.redhat.com>

Author: markmc

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16514

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-5.1.3-compile-fix.patch 
Log Message:
* Mon Aug 14 2006 Mark McLoughlin <markmc at redhat.com> - 5.1.3-2
- Fix compile error


mkinitrd-5.1.3-compile-fix.patch:
 util.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mkinitrd-5.1.3-compile-fix.patch ---
--- mkinitrd-5.1.3/nash/util.c.compile-fix	2006-08-07 15:04:14.000000000 -0400
+++ mkinitrd-5.1.3/nash/util.c	2006-08-14 05:21:46.538383000 -0400
@@ -49,7 +49,7 @@
     start = buf;
     end = strchr(start, '\n');
     while (start && end) {
-        size_t off;
+        int off;
         *end++ = '\0';
         if (sscanf(start, "%d %n", &num, &off) &&
                 strncmp(device, start + off, strlen(device)) == 0)


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- mkinitrd.spec	11 Aug 2006 21:09:11 -0000	1.146
+++ mkinitrd.spec	14 Aug 2006 09:24:25 -0000	1.147
@@ -4,12 +4,13 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 5.1.3
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
 %define BDEVID_VERSION 0.3
 Source1: bdevid-%{BDEVID_VERSION}.tar.bz2
+Patch0: mkinitrd-5.1.3-compile-fix.patch
 
 ExclusiveOs: Linux
 Prereq: dev
@@ -65,6 +66,8 @@
 %setup -q -c -a 0
 %setup -q -c -a 1
 
+%patch0 -p1 -b .compile-fix
+
 %build
 cd mkinitrd-%{version}
 make LIB=%{_lib}
@@ -116,6 +119,9 @@
 /%{python_sitelib}/bdevid.so
 
 %changelog
+* Mon Aug 14 2006 Mark McLoughlin <markmc at redhat.com> - 5.1.3-2
+- Fix compile error
+
 * Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 5.1.3-1
 - replace various sed/grep/cut/head calls with bash & awk equivalents
 - fix a typo



From fedora-cvs-commits at redhat.com  Mon Aug 14 09:35:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 05:35:01 -0400
Subject: rpms/kdeaddons/FC-5 kdeaddons.spec,1.48,1.49 sources,1.32,1.33
Message-ID: <200608140935.k7E9Z1bF018754@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeaddons.spec sources 
Log Message:
3.5.4



Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-5/kdeaddons.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdeaddons.spec	9 Jun 2006 22:01:50 -0000	1.48
+++ kdeaddons.spec	14 Aug 2006 09:34:55 -0000	1.49
@@ -3,23 +3,20 @@
 %define final 1
 %define make_cvs 0
 
-%define qt_version 3.3.5
-%define arts_version 1.5.3
+%define qt_version 3.3.6
+%define arts_version 1.5.4
 %define sdl_version 1.2.0
 
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define arts_epoch 8
-%define arts 1
 
-%define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.3
+Version: 3.5.4
 Release: 0.1.fc5
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -29,7 +26,8 @@
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires(post,postun): desktop-file-utils
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -38,9 +36,7 @@
 BuildPrereq: autoconf
 BuildPrereq: libtool
 BuildPrereq: automake
-%if %{arts}
 BuildPrereq: arts-devel >= 8:%{arts_version}
-%endif
 BuildPrereq: kdegames-devel >= 6:%{version}
 BuildPrereq: kdepim-devel >= 6:%{version}
 BuildPrereq: kdemultimedia-devel >= 6:%{version}
@@ -93,18 +89,12 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-export KDEDIR=%{prefix}
-export CXXFLAGS="%{optflags}"
-export CFLAGS="%{optflags}"
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --includedir=%{_includedir}/kde \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
 %if %{final}
    --enable-final \
 %endif
@@ -137,24 +127,24 @@
 
 %post
 for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %post atlantikdesigner 
-touch --no-create %{_datadir}/icons/hicolor ||:
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %postun atlantikdesigner
-touch --no-create %{_datadir}/icons/hicolor ||:
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %clean
@@ -199,6 +189,9 @@
 %endif
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 3.5.4-0.1.fc5
+- 3.5.4
+
 * Fri Jun 09 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
 - update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	9 Jun 2006 19:38:29 -0000	1.32
+++ sources	14 Aug 2006 09:34:55 -0000	1.33
@@ -1 +1 @@
-ea25326c6a775bbfa40d0efabed34c0d  kdeaddons-3.5.3.tar.bz2
+840d18fbcadec9f94bb70563876b4dcd  kdeaddons-3.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 09:39:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 05:39:47 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.836,
	1.837 workspace.vcl59.patch, 1.7, NONE
Message-ID: <200608140939.k7E9dl2A019878@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.vcl59.patch 
Log Message:
integrated workspace.vcl59


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.836
retrieving revision 1.837
diff -u -r1.836 -r1.837
--- openoffice.org.spec	14 Aug 2006 09:17:07 -0000	1.836
+++ openoffice.org.spec	14 Aug 2006 09:39:43 -0000	1.837
@@ -93,43 +93,42 @@
 Patch25: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch26: workspace.impress96.patch
 Patch27: workspace.fpicker6.patch
-Patch28: workspace.vcl59.patch
-Patch29: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
-Patch30: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch31: workspace.vcl60.patch
-Patch32: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
-Patch33: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
-Patch34: workspace.fwk40.patch
-Patch35: workspace.sixtyfour06.patch
-Patch36: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch37: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch38: workspace.kendy10.patch
-Patch39: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch40: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch41: ooobuild.VBAObjects.patch
-Patch42: workspace.gcjsix.patch
-Patch43: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch44: workspace.vcl63.patch
-Patch45: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch46: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch47: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch48: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch49: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch50: workspace.pb17.patch
-Patch51: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch52: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch53: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch54: workspace.os84.patch
-Patch55: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch56: workspace.configure18.patch
-Patch57: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch58: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch59: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch60: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch61: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch62: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch63: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch64: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch28: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
+Patch29: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch30: workspace.vcl60.patch
+Patch31: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+Patch32: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
+Patch33: workspace.fwk40.patch
+Patch34: workspace.sixtyfour06.patch
+Patch35: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch36: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch37: workspace.kendy10.patch
+Patch38: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch39: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch40: ooobuild.VBAObjects.patch
+Patch41: workspace.gcjsix.patch
+Patch42: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch43: workspace.vcl63.patch
+Patch44: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch45: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch46: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch47: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch48: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch49: workspace.pb17.patch
+Patch50: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch51: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch52: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch53: workspace.os84.patch
+Patch54: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch55: workspace.configure18.patch
+Patch56: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch57: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch58: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch59: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch60: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch61: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch62: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch63: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -958,43 +957,42 @@
 %patch25 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch26 -p1 -b .workspace.impress96.patch
 %patch27 -p1 -b .workspace.fpicker6.patch
-%patch28 -p1 -b .workspace.vcl59.patch
-%patch29 -p1 -b .oooXXXXX.atkbroken.vcl.patch
-%patch30 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch31 -p1 -b .workspace.vcl60.patch
-%patch32 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
-%patch33 -p1 -b .rh192588.officecfg.defaultcairooff.patch
-%patch34 -p1 -b .workspace.fwk40.patch
-%patch35 -p1 -b .workspace.sixtyfour06.patch
-%patch36 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch37 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch38 -p1 -b .workspace.kendy10.patch
-%patch39 -p1 -b .rh187919.gtkunderkde.patch
-%patch40 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch41 -p0 -b .ooobuild.VBAObjects.patch
-%patch42 -p1 -b .workspace.gcjsix.patch
-%patch43 -p1 -b .ooo67644.sw.spacing.patch
-%patch44 -p1 -b .workspace.vcl63.patch
-%patch45 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch46 -p1 -b .ooo67716.svx.overflow.patch
-%patch47 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch48 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch49 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch50 -p1 -b .workspace.pb17.patch
-%patch51 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch52 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch53 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch54 -p1 -b .workspace.os84.patch
-%patch55 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch56 -p1 -b .workspace.configure18.patch
-%patch57 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch58 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch59 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch60 -p1 -b .ooo68047.vcl.zwj.patch
-%patch61 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch62 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch63 -p1 -b .ooo68383.evo28support.patch
-%patch64 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch28 -p1 -b .oooXXXXX.atkbroken.vcl.patch
+%patch29 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch30 -p1 -b .workspace.vcl60.patch
+%patch31 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
+%patch32 -p1 -b .rh192588.officecfg.defaultcairooff.patch
+%patch33 -p1 -b .workspace.fwk40.patch
+%patch34 -p1 -b .workspace.sixtyfour06.patch
+%patch35 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch36 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch37 -p1 -b .workspace.kendy10.patch
+%patch38 -p1 -b .rh187919.gtkunderkde.patch
+%patch39 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch40 -p0 -b .ooobuild.VBAObjects.patch
+%patch41 -p1 -b .workspace.gcjsix.patch
+%patch42 -p1 -b .ooo67644.sw.spacing.patch
+%patch43 -p1 -b .workspace.vcl63.patch
+%patch44 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch45 -p1 -b .ooo67716.svx.overflow.patch
+%patch46 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch47 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch48 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch49 -p1 -b .workspace.pb17.patch
+%patch50 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch51 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch52 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch53 -p1 -b .workspace.os84.patch
+%patch54 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch55 -p1 -b .workspace.configure18.patch
+%patch56 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch57 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch58 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch59 -p1 -b .ooo68047.vcl.zwj.patch
+%patch60 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch61 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch62 -p1 -b .ooo68383.evo28support.patch
+%patch63 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 
@@ -2517,6 +2515,7 @@
 - drop integrated workspace.targetedaot
 - drop integrated workspace.bfsixtyfour
 - drop integrated workspace.thbpp4
+- drop integrated workspace.vcl59
 - drop integrated ooo65327.builddep.writerperfect.patch
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9


--- workspace.vcl59.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 09:43:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 05:43:33 -0400
Subject: rpms/kdeadmin/FC-5 kdeadmin.spec, 1.59, 1.60 sources, 1.35,
	1.36 kdeadmin-3.5.2-knetworkconf-fedora.patch, 1.1, NONE
Message-ID: <200608140943.k7E9hXas020479@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeadmin.spec sources 
Removed Files:
	kdeadmin-3.5.2-knetworkconf-fedora.patch 
Log Message:
3.5.4



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-5/kdeadmin.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdeadmin.spec	10 Jun 2006 10:32:00 -0000	1.59
+++ kdeadmin.spec	14 Aug 2006 09:43:30 -0000	1.60
@@ -16,24 +16,22 @@
 %define lilo 0
 %define kdat 1
 %define kcron 1
-%define arts 1
 %define knetworkconf 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.3
+Version: 3.5.4
 Release: 0.1.fc5
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -44,14 +42,24 @@
 Source5: kpackagerc
 
 Patch1: kde-libtool.patch
-Patch2: kdeadmin-3.5.2-knetworkconf-fedora.patch
 
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: usermode
 
-BuildPrereq: kdebase-devel >= %{kdebase_epoch}:%{version}
-BuildPrereq: rpm-devel
-BuildPrereq: /usr/bin/desktop-file-install
+BuildRequires: desktop-file-utils
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: zlib-devel
+BuildRequires: kdelibs-devel >= %{version}
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: rpm-devel
+BuildRequires: bzip2-devel
+BuildRequires: perl
 
 %description
 The kdeadmin package includes administrative tools for the K Desktop
@@ -59,98 +67,11 @@
 
  kcron - Crontab editor
  kdat - Tape backup tool
-
-%package kcron
-Group: User Interface/Desktops
-Summary: Crontab editor for KDE
-Obsoletes: kdeadmin
-
-%description kcron
-KCron is a crontab editor for KDE - it helps you make your system run
-commands periodically.
-
-%package kdat
-Group: User Interface/Desktops
-Summary: Tape backup tool for KDE
-Obsoletes: kdeadmin
-
-%description kdat
-KDat is a KDE application for controlling tape backups.
-
-%package kpackage
-Group: User Interface/Desktops
-Summary: KDE package manager
-Obsoletes: kpackage kdeadmin
-Requires: usermode, pam
-
-%description kpackage
-KPackage is a graphical frontend for RPM and other package managers.
-
-%package ksysv
-Group: User Interface/Desktops
-Summary: System V startup editor
-Obsoletes: kdeadmin
-
-%description ksysv
-KSysV is a graphical frontend for configuring your runlevels (system
-startup/shutdown sequence).
-
-%package kuser
-Group: User Interface/Desktops
-Summary: Frontend for configuring users and user groups
-Requires: usermode, pam
-Obsoletes: kdeadmin
-
-%description kuser
-KUser is a graphical frontend for managing the users and user groups on
-your system.
-
-%package kwuftpd
-Group: User Interface/Desktops
-Summary: Graphical interface for configuring wu-ftpd
-Requires: usermode, pam
-Obsoletes: kdeadmin
-
-%description kwuftpd
-KWuftpd is a graphical frontend for configuring the wu-ftpd ftp server.
-
-%package kcmlinuz
-Group: User Interface/Desktops
-Summary: Linux kernel configurator for KDE
-Obsoletes: kdeadmin
-
-%description kcmlinuz
-kcmlinuz is a graphical frontend for creating configuration files for compiling
-kernels.
-
-%package lilo
-Group: User Interface/Desktops
-Summary: Graphical frontend for configuring the LILO bootloader
-Requires: lilo 
-Obsoletes: kdeadmin
-
-%description lilo
-kdeadmin-lilo is a KDE frontend for configuring the LILO bootloader.
-
-%package kisdndock
-Group: User Interface/Desktops
-Summary: KDE dock application for ISDN
-Requires: isdn4k-utils, redhat-config-network
-
-%description kisdndock
-kisdndock is a dock application for managing ISDN connections.
-
-%package -n kxconfig
-Group: User Interface/Desktops
-Summary: X Configuration tool
-
-%description -n kxconfig
-kxconfig is a tool that allows you to configure the X server.
+ kuser - Frontend for configuring users and user groups
 
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
-%patch2 -p1 -b .knetworkconf-fc5
 
 %if ! %{kpackage}
   echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
@@ -186,25 +107,13 @@
 unset QTDIR && . /etc/profile.d/qt.sh
 FLAGS="%{optflags} -DNDEBUG -DNO_DEBUG"
 
-%if %{debug}
-  FLAGS="-O0"
-%endif
-
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS"
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
    --with-rpm \
    --with-qt-libraries=$QTDIR/lib \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{final}
    --enable-final \
 %endif
@@ -241,8 +150,14 @@
   done
 )
 
-# Put in some sane defaults
 %if %{kuser}
+  desktop-file-install \
+    --vendor "" \
+    --dir %{buildroot}%{appdir} \
+    --delete-original \
+    --add-only-show-in KDE \
+    %{buildroot}%{appdir}/kuser.desktop
+# Put in some sane defaults
   mkdir -p %{buildroot}%{_datadir}/config
   cat >%{buildroot}%{_datadir}/config/kuserrc <<EOF
 [template]
@@ -310,24 +225,17 @@
   rm -rf %{buildroot}%{_docdir}/HTML/en/lilo-config
 %endif
 
-desktop-file-install \
-   --vendor "" \
-   --dir %{buildroot}%{appdir} \
-   --delete-original \
-   --add-only-show-in KDE \
-   %{buildroot}%{appdir}/kuser.desktop
-
 %post
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -411,6 +319,9 @@
 %endif
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 7:3.5.4-0.1.fc5
+- 3.5.4
+
 * Sat Jun 10 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.1.fc5
 - update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	10 Jun 2006 10:25:55 -0000	1.35
+++ sources	14 Aug 2006 09:43:30 -0000	1.36
@@ -1 +1 @@
-842e74881c89a719423bbd5cc1f4e226  kdeadmin-3.5.3.tar.bz2
+579a2e3e8e05cf0851a88def57fcc0a3  kdeadmin-3.5.4.tar.bz2


--- kdeadmin-3.5.2-knetworkconf-fedora.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 09:43:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 05:43:43 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.147,1.148
Message-ID: <200608140943.k7E9herQ020536@cvs.devel.redhat.com>

Author: markmc

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20469

Modified Files:
	mkinitrd.spec 
Log Message:
fix patchlevel



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- mkinitrd.spec	14 Aug 2006 09:24:25 -0000	1.147
+++ mkinitrd.spec	14 Aug 2006 09:43:37 -0000	1.148
@@ -66,7 +66,7 @@
 %setup -q -c -a 0
 %setup -q -c -a 1
 
-%patch0 -p1 -b .compile-fix
+%patch0 -p0 -b .compile-fix
 
 %build
 cd mkinitrd-%{version}



From fedora-cvs-commits at redhat.com  Mon Aug 14 09:53:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 05:53:59 -0400
Subject: rpms/sysreport/devel .cvsignore, 1.28, 1.29 sources, 1.31,
	1.32 sysreport.spec, 1.39, 1.40
Message-ID: <200608140953.k7E9rxgp005452@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/sysreport/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5415

Modified Files:
	.cvsignore sources sysreport.spec 
Log Message:
fix #195352, sysreport's is returning a return code of 255 vice 0




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sysreport/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	17 Jul 2006 17:52:53 -0000	1.28
+++ .cvsignore	14 Aug 2006 09:53:53 -0000	1.29
@@ -14,3 +14,4 @@
 sysreport-1.4.3-5.tar.bz2
 sysreport-1.4.3-6.tar.bz2
 sysreport-1.4.3-8.tar.bz2
+sysreport-1.4.3-9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sysreport/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	17 Jul 2006 17:52:53 -0000	1.31
+++ sources	14 Aug 2006 09:53:53 -0000	1.32
@@ -1 +1 @@
-961cc0ab755a452a5197af0bc99b1031  sysreport-1.4.3-8.tar.bz2
+5d7db2140b3dfe1e8fb7198e53fb1ded  sysreport-1.4.3-9.tar.bz2


Index: sysreport.spec
===================================================================
RCS file: /cvs/dist/rpms/sysreport/devel/sysreport.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sysreport.spec	17 Jul 2006 17:52:53 -0000	1.39
+++ sysreport.spec	14 Aug 2006 09:53:53 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: Gathers system hardware and configuration information.
 Name: sysreport
 Version: 1.4.3
-Release: 8
+Release: 9
 URL: http://www.redhat.com/support
 Group: Development/Debuggers
 Source0: %{name}-%{version}-%{release}.tar.bz2
@@ -42,6 +42,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 1.4.3-9
+- fix #195352, sysreport's is returning a return code of 255 vice 0
+
 * Mon Jul 17 2006 Than Ngo <than at redhat.com> 1.4.3-8
 - fix #195352, sysreport's is returning a return code of 255 vice 0
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 09:56:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 05:56:42 -0400
Subject: rpms/mkinitrd/devel mkinitrd-5.1.3-compile-fix.patch,1.1,1.2
Message-ID: <200608140956.k7E9ug4C006252@cvs.devel.redhat.com>

Author: markmc

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6069

Modified Files:
	mkinitrd-5.1.3-compile-fix.patch 
Log Message:
add bdevid compile fix


mkinitrd-5.1.3-compile-fix.patch:
 bdevid-0.3/bdevid/sysfs.c  |    2 +-
 mkinitrd-5.1.3/nash/util.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: mkinitrd-5.1.3-compile-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd-5.1.3-compile-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mkinitrd-5.1.3-compile-fix.patch	14 Aug 2006 09:24:25 -0000	1.1
+++ mkinitrd-5.1.3-compile-fix.patch	14 Aug 2006 09:56:39 -0000	1.2
@@ -1,5 +1,5 @@
---- mkinitrd-5.1.3/nash/util.c.compile-fix	2006-08-07 15:04:14.000000000 -0400
-+++ mkinitrd-5.1.3/nash/util.c	2006-08-14 05:21:46.538383000 -0400
+--- ./mkinitrd-5.1.3/nash/util.c.compile-fix	2006-08-07 15:04:14.000000000 -0400
++++ ./mkinitrd-5.1.3/nash/util.c	2006-08-14 05:21:46.538383000 -0400
 @@ -49,7 +49,7 @@
      start = buf;
      end = strchr(start, '\n');
@@ -9,3 +9,14 @@
          *end++ = '\0';
          if (sscanf(start, "%d %n", &num, &off) &&
                  strncmp(device, start + off, strlen(device)) == 0)
+--- ./bdevid-0.3/bdevid/sysfs.c.compile-fix	2006-07-12 18:39:40.000000000 -0400
++++ ./bdevid-0.3/bdevid/sysfs.c	2006-08-14 05:54:48.326613000 -0400
+@@ -41,7 +41,7 @@
+     if (stat(file, &sb) < 0)
+         return NULL;
+ 
+-    if (!(sysfs_dir = nashFindDeviceByDevno(sb.st_rdev)))
++    if (!(sysfs_dir = nashFindDeviceByDevno(NULL, sb.st_rdev)))
+         return NULL;
+ 
+     if (!(node = calloc(1, sizeof(*node)))) {



From fedora-cvs-commits at redhat.com  Mon Aug 14 09:57:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 05:57:34 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch, 1.8, 1.9
Message-ID: <200608140957.k7E9vYPr006551@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch 
Log Message:
adjust selinux patch

openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch:
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx  |   18 +-
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx   |   18 +-
 bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx |    8 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx  |    8 -
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx   |    2 
 bridges/source/cpp_uno/shared/vtablefactory.cxx       |  134 +++++++++++-------
 inc/bridges/cpp_uno/shared/vtablefactory.hxx          |    0 
 source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx           |    0 
 source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx         |    0 
 source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx          |    0 
 source/cpp_uno/shared/cppinterfaceproxy.cxx           |    0 
 source/cpp_uno/shared/vtablefactory.cxx               |    0 
 12 files changed, 115 insertions(+), 73 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch	25 Jul 2006 08:19:17 -0000	1.8
+++ openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch	14 Aug 2006 09:57:31 -0000	1.9
@@ -246,8 +246,8 @@
 +#include <stdio.h>
  #elif defined SAL_W32
  #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-@@ -62,9 +66,12 @@
+ #pragma warning(push,1) // disable warnings within system headers
+@@ -64,9 +68,12 @@
  
  using bridges::cpp_uno::shared::VtableFactory;
  
@@ -262,7 +262,7 @@
      sal_Size pagesize;
  #if defined SAL_UNX
  #if defined FREEBSD || defined NETBSD
-@@ -77,39 +84,89 @@
+@@ -79,40 +86,90 @@
      GetSystemInfo(&info);
      pagesize = info.dwPageSize;
  #endif
@@ -291,7 +291,7 @@
 +    char *tmpfname = new char[aTmpName.getLength()+1];
 +    strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
 +    if ((fd = mkstemp(tmpfname)) == -1)
-+	perror("creation of executable memory area failed");
++      perror("creation of executable memory area failed");
 +    if (fd == -1)
 +    {
 +        delete[] tmpfname;
@@ -309,16 +309,15 @@
 +        execp = 0;
 +    }
  #elif defined SAL_W32
--    p = VirtualAlloc(0, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-+    start = VirtualAlloc(0, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+     p = VirtualAlloc(0, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
  #endif
 -    if (p != 0) {
 -        *size = n;
 +    if (writep || execp || fd != -1) {
 +        size = n;
-+	ref = new int(1);
++      ref = new int(1);
      }
--    return p;
+     return p;
  }
  
 -extern "C" void SAL_CALL freeExec(
@@ -336,10 +335,11 @@
 +            if (execp) munmap(execp, size);
 +            if (fd != -1) close(fd);
  #elif defined SAL_W32
+-    (void) size; // unused
 -    VirtualFree(address, 0, MEM_RELEASE);
 +            VirtualFree(start, 0, MEM_RELEASE);
  #endif
-+	    delete ref;
++          delete ref;
 +        }
 +    }
 +}
@@ -372,7 +372,7 @@
  }
  
  class VtableFactory::GuardedBlocks: public std::vector< Block > {
-@@ -130,11 +184,6 @@
+@@ -133,11 +190,6 @@
  };
  
  VtableFactory::GuardedBlocks::~GuardedBlocks() {
@@ -384,7 +384,7 @@
  }
  
  class VtableFactory::BaseOffset {
-@@ -169,28 +218,17 @@
+@@ -172,28 +224,17 @@
      return offset;
  }
  
@@ -414,7 +414,7 @@
  }
  
  VtableFactory::Vtables VtableFactory::getVtables(
-@@ -218,10 +256,6 @@
+@@ -221,10 +262,6 @@
      return i->second;
  }
  
@@ -425,7 +425,7 @@
  void VtableFactory::createVtables(
      GuardedBlocks & blocks, BaseOffset const & baseOffset,
      typelib_InterfaceTypeDescription * type, bool includePrimary) const
-@@ -229,17 +263,16 @@
+@@ -232,17 +269,16 @@
      if (includePrimary) {
          sal_Int32 slotCount
              = bridges::cpp_uno::shared::getPrimaryFunctions(type);
@@ -447,7 +447,7 @@
              sal_Int32 vtableOffset = blocks.size() * sizeof (void **);
              for (typelib_InterfaceTypeDescription const * type2 = type;
                   type2 != 0; type2 = type2->pBaseTypeDescription)
-@@ -248,14 +281,14 @@
+@@ -251,14 +287,14 @@
                      = bridges::cpp_uno::shared::getLocalFunctions(type2);
                  slots -= functionCount;
                  code = addLocalFunctions(



From fedora-cvs-commits at redhat.com  Mon Aug 14 10:00:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 06:00:45 -0400
Subject: rpms/kdeartwork/FC-5 kdeartwork.spec, 1.50, 1.51 sources, 1.32,
	1.33 kdeartwork-3.5.3-kdeclassic.patch, 1.1, NONE
Message-ID: <200608141000.k7EA0jBQ007567@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeartwork.spec sources 
Removed Files:
	kdeartwork-3.5.3-kdeclassic.patch 
Log Message:
3.5.4



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-5/kdeartwork.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdeartwork.spec	20 Jun 2006 13:39:53 -0000	1.50
+++ kdeartwork.spec	14 Aug 2006 10:00:43 -0000	1.51
@@ -3,26 +3,22 @@
 
 %define make_cvs 1
 
-%define qt_version 3.3.5
-%define arts_version 1.5.3
+%define qt_version 3.3.6
+%define arts_version 1.5.4
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
-%define arts 1
-
-%define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeartwork
-Version: 3.5.3
-Release: 0.2.fc5
+Version: 3.5.4
+Release: 0.1.fc5
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0: kde-libtool.patch
-Patch1: kdeartwork-3.5.3-kdeclassic.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: xscreensaver-extras
@@ -31,10 +27,16 @@
 
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
+BuildRequires: perl
 BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
 BuildRequires: xscreensaver-extras
 BuildRequires: xscreensaver-gl-extras
 BuildRequires: xscreensaver-base
+BuildRequires: arts-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: gettext
 
 %description
 Additional artwork (themes, sound themes, screensavers ...) for KDE
@@ -63,12 +65,7 @@
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
-%if %{disable_gcc_check_and_hidden_visibility}
    --enable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -83,40 +80,31 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot}
+make install DESTDIR="%{buildroot}"
 
 mv %{buildroot}%{_datadir}/icons/Locolor %{buildroot}%{_datadir}/icons/locolor
 
-# fix file conflict with other kde packages
-rm -f %{buildroot}%{_datadir}/icons/locolor/*/apps/kig.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspaceduel.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/lskat.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktux.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktimemon.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspreadcalc.png \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/gvim* \
-      %{buildroot}%{_datadir}/icons/locolor/*/apps/kbabel.png \
-      %{buildroot}%{_datadir}/wallpapers/gear-flowers* \
-      %{buildroot}%{_datadir}/wallpapers/fulmine.jpg*
+# fix file conflict with kdesdk package
+rm -f %{buildroot}%{_datadir}/icons/locolor/*/apps/kbabel.png
 
 %post icons
 for i in locolor ikons kdeclassic kids slick ; do
-  touch --no-create %{_datadir}/icons/$i || :
+  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
   if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
   fi
 done
 
 %postun icons
 for i in locolor ikons kdeclassic kids slick ; do
-  touch --no-create %{_datadir}/icons/$i || :
+  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
   if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
   fi
 done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -141,6 +129,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 3.5.4-0.1.fc5
+- 3.5.4
+
 * Tue Jun 20 2006 Than Ngo <than at redhat.com> 3.5.3-0.2.fc5
 - add Inherits=hicolor in kdeclassic icon theme #195991
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	10 Jun 2006 13:37:59 -0000	1.32
+++ sources	14 Aug 2006 10:00:43 -0000	1.33
@@ -1 +1 @@
-e0fc78bee18d81b4595c98964227a06c  kdeartwork-3.5.3.tar.bz2
+c7ff9048b9b68c976de08ed418598e40  kdeartwork-3.5.4.tar.bz2


--- kdeartwork-3.5.3-kdeclassic.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 10:08:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 06:08:17 -0400
Subject: rpms/openoffice.org/devel workspace.vcl60.patch,1.1,NONE
Message-ID: <200608141008.k7EA8HUv009232@cvs.devel.redhat.com>

Author: caolanm

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

Removed Files:
	workspace.vcl60.patch 
Log Message:
integrated workspace.vcl60


--- workspace.vcl60.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 10:20:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 06:20:38 -0400
Subject: rpms/openoffice.org/devel workspace.fwk40.patch,1.2,NONE
Message-ID: <200608141020.k7EAKcMs026915@cvs.devel.redhat.com>

Author: caolanm

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

Removed Files:
	workspace.fwk40.patch 
Log Message:
integrated workspace.fwk40


--- workspace.fwk40.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 10:27:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 06:27:41 -0400
Subject: rpms/openoffice.org/devel workspace.sixtyfour06.patch,1.2,NONE
Message-ID: <200608141027.k7EARe3e029021@cvs.devel.redhat.com>

Author: caolanm

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

Removed Files:
	workspace.sixtyfour06.patch 
Log Message:
drop integrated workspace.sixtyfour06


--- workspace.sixtyfour06.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 10:35:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 06:35:22 -0400
Subject: rpms/openoffice.org/devel workspace.kendy10.patch,1.1,NONE
Message-ID: <200608141035.k7EAZMju030900@cvs.devel.redhat.com>

Author: caolanm

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

Removed Files:
	workspace.kendy10.patch 
Log Message:
integrated workspace.kendy10


--- workspace.kendy10.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 10:43:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 06:43:38 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.837,
	1.838 workspace.impress96.patch, 1.1, NONE
Message-ID: <200608141043.k7EAhcO9032692@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.impress96.patch 
Log Message:
integrated workspace.impress96


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -r1.837 -r1.838
--- openoffice.org.spec	14 Aug 2006 09:39:43 -0000	1.837
+++ openoffice.org.spec	14 Aug 2006 10:43:34 -0000	1.838
@@ -91,44 +91,39 @@
 Patch23: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch24: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch25: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch26: workspace.impress96.patch
-Patch27: workspace.fpicker6.patch
-Patch28: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
-Patch29: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch30: workspace.vcl60.patch
-Patch31: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
-Patch32: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
-Patch33: workspace.fwk40.patch
-Patch34: workspace.sixtyfour06.patch
-Patch35: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch36: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch37: workspace.kendy10.patch
-Patch38: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch39: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch40: ooobuild.VBAObjects.patch
-Patch41: workspace.gcjsix.patch
-Patch42: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch43: workspace.vcl63.patch
-Patch44: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch45: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch46: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch47: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch48: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch49: workspace.pb17.patch
-Patch50: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch51: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch52: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch53: workspace.os84.patch
-Patch54: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch55: workspace.configure18.patch
-Patch56: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch57: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch58: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch59: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch60: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch61: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch62: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch63: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch26: workspace.fpicker6.patch
+Patch27: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
+Patch28: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch29: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+Patch30: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
+Patch31: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch32: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch33: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch34: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch35: ooobuild.VBAObjects.patch
+Patch36: workspace.gcjsix.patch
+Patch37: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch38: workspace.vcl63.patch
+Patch39: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch40: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch41: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch42: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch43: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch44: workspace.pb17.patch
+Patch45: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch46: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch47: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch48: workspace.os84.patch
+Patch49: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch50: workspace.configure18.patch
+Patch51: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch52: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch53: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch54: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch55: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch56: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch57: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch58: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -955,44 +950,39 @@
 %patch23 -p1
 %patch24 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch25 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch26 -p1 -b .workspace.impress96.patch
-%patch27 -p1 -b .workspace.fpicker6.patch
-%patch28 -p1 -b .oooXXXXX.atkbroken.vcl.patch
-%patch29 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch30 -p1 -b .workspace.vcl60.patch
-%patch31 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
-%patch32 -p1 -b .rh192588.officecfg.defaultcairooff.patch
-%patch33 -p1 -b .workspace.fwk40.patch
-%patch34 -p1 -b .workspace.sixtyfour06.patch
-%patch35 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch36 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch37 -p1 -b .workspace.kendy10.patch
-%patch38 -p1 -b .rh187919.gtkunderkde.patch
-%patch39 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch40 -p0 -b .ooobuild.VBAObjects.patch
-%patch41 -p1 -b .workspace.gcjsix.patch
-%patch42 -p1 -b .ooo67644.sw.spacing.patch
-%patch43 -p1 -b .workspace.vcl63.patch
-%patch44 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch45 -p1 -b .ooo67716.svx.overflow.patch
-%patch46 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch47 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch48 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch49 -p1 -b .workspace.pb17.patch
-%patch50 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch51 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch52 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch53 -p1 -b .workspace.os84.patch
-%patch54 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch55 -p1 -b .workspace.configure18.patch
-%patch56 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch57 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch58 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch59 -p1 -b .ooo68047.vcl.zwj.patch
-%patch60 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch61 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch62 -p1 -b .ooo68383.evo28support.patch
-%patch63 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch26 -p1 -b .workspace.fpicker6.patch
+%patch27 -p1 -b .oooXXXXX.atkbroken.vcl.patch
+%patch28 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch29 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
+%patch30 -p1 -b .rh192588.officecfg.defaultcairooff.patch
+%patch31 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch32 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch33 -p1 -b .rh187919.gtkunderkde.patch
+%patch34 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch35 -p0 -b .ooobuild.VBAObjects.patch
+%patch36 -p1 -b .workspace.gcjsix.patch
+%patch37 -p1 -b .ooo67644.sw.spacing.patch
+%patch38 -p1 -b .workspace.vcl63.patch
+%patch39 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch40 -p1 -b .ooo67716.svx.overflow.patch
+%patch41 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch42 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch43 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch44 -p1 -b .workspace.pb17.patch
+%patch45 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch46 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch47 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch48 -p1 -b .workspace.os84.patch
+%patch49 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch50 -p1 -b .workspace.configure18.patch
+%patch51 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch52 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch53 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch54 -p1 -b .ooo68047.vcl.zwj.patch
+%patch55 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch56 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch57 -p1 -b .ooo68383.evo28support.patch
+%patch58 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 
@@ -2516,6 +2506,11 @@
 - drop integrated workspace.bfsixtyfour
 - drop integrated workspace.thbpp4
 - drop integrated workspace.vcl59
+- drop integrated workspace.vcl60
+- drop integrated workspace.fwk40
+- drop integrated workspace.sixtyfour06
+- drop integrated workspace.kendy10
+- drop integrated workspace.impress96
 - drop integrated ooo65327.builddep.writerperfect.patch
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9


--- workspace.impress96.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 10:59:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 06:59:08 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.838,
	1.839 workspace.gcjsix.patch, 1.1, NONE workspace.vcl63.patch,
	1.1, NONE
Message-ID: <200608141059.k7EAx87R019560@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.gcjsix.patch workspace.vcl63.patch 
Log Message:
drop integrated worksapces


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.838
retrieving revision 1.839
diff -u -r1.838 -r1.839
--- openoffice.org.spec	14 Aug 2006 10:43:34 -0000	1.838
+++ openoffice.org.spec	14 Aug 2006 10:59:05 -0000	1.839
@@ -101,29 +101,27 @@
 Patch33: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch34: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch35: ooobuild.VBAObjects.patch
-Patch36: workspace.gcjsix.patch
-Patch37: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch38: workspace.vcl63.patch
-Patch39: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch40: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch41: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch42: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch43: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch44: workspace.pb17.patch
-Patch45: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch46: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch47: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch48: workspace.os84.patch
-Patch49: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch50: workspace.configure18.patch
-Patch51: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch52: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch53: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch54: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch55: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch56: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch57: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch58: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch36: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch37: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch38: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch39: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch40: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch41: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch42: workspace.pb17.patch
+Patch43: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch44: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch45: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch46: workspace.os84.patch
+Patch47: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch48: workspace.configure18.patch
+Patch49: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch50: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch51: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch52: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch53: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch54: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch55: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch56: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -960,29 +958,27 @@
 %patch33 -p1 -b .rh187919.gtkunderkde.patch
 %patch34 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch35 -p0 -b .ooobuild.VBAObjects.patch
-%patch36 -p1 -b .workspace.gcjsix.patch
-%patch37 -p1 -b .ooo67644.sw.spacing.patch
-%patch38 -p1 -b .workspace.vcl63.patch
-%patch39 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch40 -p1 -b .ooo67716.svx.overflow.patch
-%patch41 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch42 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch43 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch44 -p1 -b .workspace.pb17.patch
-%patch45 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch46 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch47 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch48 -p1 -b .workspace.os84.patch
-%patch49 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch50 -p1 -b .workspace.configure18.patch
-%patch51 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch52 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch53 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch54 -p1 -b .ooo68047.vcl.zwj.patch
-%patch55 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch56 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch57 -p1 -b .ooo68383.evo28support.patch
-%patch58 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch36 -p1 -b .ooo67644.sw.spacing.patch
+%patch37 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch38 -p1 -b .ooo67716.svx.overflow.patch
+%patch39 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch40 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch41 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch42 -p1 -b .workspace.pb17.patch
+%patch43 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch44 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch45 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch46 -p1 -b .workspace.os84.patch
+%patch47 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch48 -p1 -b .workspace.configure18.patch
+%patch49 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch50 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch51 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch52 -p1 -b .ooo68047.vcl.zwj.patch
+%patch53 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch54 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch55 -p1 -b .ooo68383.evo28support.patch
+%patch56 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 
@@ -2511,6 +2507,8 @@
 - drop integrated workspace.sixtyfour06
 - drop integrated workspace.kendy10
 - drop integrated workspace.impress96
+- drop integrated workspace.gcjsix
+- drop integrated workspace.vcl63
 - drop integrated ooo65327.builddep.writerperfect.patch
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9


--- workspace.gcjsix.patch DELETED ---


--- workspace.vcl63.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 11:13:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 07:13:41 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.20,1.21
Message-ID: <200608141113.k7EBDfCi023031@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23011

Modified Files:
	nautilus-sendto.spec 
Log Message:
* Mon Aug 14 2006 Alexander Larsson <alexl at redhat.com> - 0.7-4
- Buildrequire nautilus-devel




Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nautilus-sendto.spec	10 Aug 2006 14:28:42 -0000	1.20
+++ nautilus-sendto.spec	14 Aug 2006 11:13:38 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.7
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, libglade2-devel, evolution-data-server-devel, libgnomeui-devel
-BuildRequires:	nautilus >= 2.5.4, gaim-devel >= 1.0
+BuildRequires:	nautilus-devel >= 2.5.4, gaim-devel >= 1.0
 BuildRequires:  gettext
 
 Patch0:		nautilus-sendto-0.7-gaim.patch
@@ -82,6 +82,9 @@
 %endif
 
 %changelog
+* Mon Aug 14 2006 Alexander Larsson <alexl at redhat.com> - 0.7-4
+- Buildrequire nautilus-devel
+
 * Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 0.7-3
 - Make nautilus-sendto-bluetooth require gnome-bluetooth (#201908)
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 11:14:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 07:14:19 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch, 1.1, 1.2
Message-ID: <200608141114.k7EBEJck023177@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch 
Log Message:
readjust doublefree patch

openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch:
 source/cxxhelp/qe/Search.cxx         |    0 
 xmlhelp/source/cxxhelp/qe/Search.cxx |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

Index: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch	25 Jul 2006 08:19:17 -0000	1.1
+++ openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch	14 Aug 2006 11:14:16 -0000	1.2
@@ -5,12 +5,13 @@
 diff -u -r1.7 Search.cxx
 --- openoffice.org.orig/xmlhelp/source/cxxhelp/qe/Search.cxx	9 Sep 2005 12:23:53 -0000	1.7
 +++ openoffice.org/xmlhelp/source/cxxhelp/qe/Search.cxx	25 Jul 2006 07:47:28 -0000
-@@ -468,9 +468,11 @@
+@@ -473,10 +473,11 @@
+ 		genHeap_.reset();
      }
  	while( nextDocGenHeap_.isNonEmpty() );
- 
+-
 +#if 0
- 	for( sal_Int32 i = 0; i < start.size(); ++i )
+ 	for( sal_uInt32 i = 0; i < start.size(); ++i )
  		if( start[i] != RoleFiller::STOP() )
  			delete start[i];
 +#endif



From fedora-cvs-commits at redhat.com  Mon Aug 14 11:17:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 07:17:19 -0400
Subject: rpms/kdebindings/FC-5 kdebindings.spec,1.45,1.46 sources,1.31,1.32
Message-ID: <200608141117.k7EBHJ49024898@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebindings.spec sources 
Log Message:
3.5.4



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-5/kdebindings.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdebindings.spec	12 Jun 2006 16:38:40 -0000	1.45
+++ kdebindings.spec	14 Aug 2006 11:17:16 -0000	1.46
@@ -4,31 +4,27 @@
 %define appdir %{_datadir}/applications/kde
 
 %{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
-%define qt_version 3.3.5
-%define arts_version 1.5.3
+%define qt_version 3.3.6
+%define arts_version 1.5.4
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define perlver 5.8
 %define perlepoch 3
 %define rubyver 1.8
 
-%define arts 1
 %define perl 1
 %define python 1
 %define ruby 1
 %define pyqt 0
 
-%define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.3
+Version: 3.5.4
 Release: 0.1.fc5
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
@@ -39,7 +35,15 @@
 Patch9: kdebindings-3.3.92-xdg.patch
 
 BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
-BuildRequires: /usr/bin/desktop-file-install
+BuildRequires: zlib-devel
+BuildRequires: kdelibs-devel
+BuildRequires: arts-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: libtool
+BuildRequires: desktop-file-utils
 
 %if %{perl}
 BuildRequires: perl >= %{perlver}
@@ -58,7 +62,8 @@
 Requires: ruby >= %{rubyver}
 %endif
 
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 
@@ -125,12 +130,7 @@
    --enable-libsuffix="$suffix" \
    --includedir=%{_includedir}/kde \
    --with-qt-libraries=$QTDIR/lib \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{final}
    --enable-final \
 %endif
@@ -162,13 +162,13 @@
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -200,6 +200,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 3.5.4-0.1.fc5
+- 3.5.4
+
 * Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
 - update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	10 Jun 2006 14:43:08 -0000	1.31
+++ sources	14 Aug 2006 11:17:17 -0000	1.32
@@ -1 +1 @@
-5595b2de6593d1d535ba520abeab4580  kdebindings-3.5.3.tar.bz2
+097eb4311f5715f36fdc83dc5badb476  kdebindings-3.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 11:24:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 07:24:31 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.839,
	1.840 openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch,
	1.1, NONE
Message-ID: <200608141124.k7EBOVYt008349@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch 
Log Message:
integrated openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.839
retrieving revision 1.840
diff -u -r1.839 -r1.840
--- openoffice.org.spec	14 Aug 2006 10:59:05 -0000	1.839
+++ openoffice.org.spec	14 Aug 2006 11:24:29 -0000	1.840
@@ -106,22 +106,21 @@
 Patch38: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
 Patch39: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
 Patch40: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch41: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch42: workspace.pb17.patch
-Patch43: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch44: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch45: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch46: workspace.os84.patch
-Patch47: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch48: workspace.configure18.patch
-Patch49: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch50: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch51: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch52: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch53: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch54: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch55: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch56: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch41: workspace.pb17.patch
+Patch42: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch43: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch44: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch45: workspace.os84.patch
+Patch46: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch47: workspace.configure18.patch
+Patch48: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch49: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch50: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch51: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch52: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch53: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch54: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch55: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -963,22 +962,21 @@
 %patch38 -p1 -b .ooo67716.svx.overflow.patch
 %patch39 -p1 -b .gccXXXXX.basegfx.crash.patch
 %patch40 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch41 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch42 -p1 -b .workspace.pb17.patch
-%patch43 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch44 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch45 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch46 -p1 -b .workspace.os84.patch
-%patch47 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch48 -p1 -b .workspace.configure18.patch
-%patch49 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch50 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch51 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch52 -p1 -b .ooo68047.vcl.zwj.patch
-%patch53 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch54 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch55 -p1 -b .ooo68383.evo28support.patch
-%patch56 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch41 -p1 -b .workspace.pb17.patch
+%patch42 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch43 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch44 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch45 -p1 -b .workspace.os84.patch
+%patch46 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch47 -p1 -b .workspace.configure18.patch
+%patch48 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch49 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch50 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch51 -p1 -b .ooo68047.vcl.zwj.patch
+%patch52 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch53 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch54 -p1 -b .ooo68383.evo28support.patch
+%patch55 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 
@@ -2510,6 +2508,7 @@
 - drop integrated workspace.gcjsix
 - drop integrated workspace.vcl63
 - drop integrated ooo65327.builddep.writerperfect.patch
+- drop integrated ooo67337.sfx2.dontshowbuttons.patch
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
 - icu settext ownership of string data changed silently


--- openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 11:26:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 07:26:38 -0400
Subject: rpms/kdeedu/FC-5 kdeedu.spec,1.46,1.47 sources,1.30,1.31
Message-ID: <200608141126.k7EBQcQT009138@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeedu.spec sources 
Log Message:
3.5.4



Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-5/kdeedu.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdeedu.spec	10 Jun 2006 12:59:25 -0000	1.46
+++ kdeedu.spec	14 Aug 2006 11:26:35 -0000	1.47
@@ -2,31 +2,36 @@
 %define final 0
 %define make_cvs 1
 
-%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
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Name: kdeedu
-Version: 3.5.3
+Version: 3.5.4
 Release: 0.1.fc5
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch1: kde-libtool.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: qt >= %{qt_epoch}:%{qt_version}
-Requires(post,postun): /sbin/ldconfig
-
-BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
+BuildRequires: kdebase-devel
+BuildRequires: perl
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: gettext
 BuildRequires: python-devel
 BuildRequires: boost-devel
 
@@ -46,8 +51,6 @@
 Provides: ktouch
 Provides: kvoctrain
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 %description
 Educational/Edutainment applications for KDE
 
@@ -59,55 +62,6 @@
 %description devel
 This package contains header files for kdeedu.
 
-%package -n keduca
-Summary: Tests and Exams
-Group: User Interface/Desktops
-
-%description -n keduca
-Tests and Exams
-
-%package -n kig
-Summary: Interactive Geometry
-Group: User Interface/Desktops
-
-%description -n kig
-Interactive Geometry
-
-%package -n klettres
-Summary: French alphabet tutor
-Group: User Interface/Desktops
-
-%description -n klettres
-French alphabet tutor
-
-%package -n kmessedwords
-Summary: Letter Order Game
-Group: User Interface/Desktops
-
-%description -n kmessedwords
-Letter Order Game
-
-%package -n kstars
-Summary: Desktop Planetarium
-Group: User Interface/Desktops
-
-%description -n kstars
-Desktop Planetarium
-
-%package -n ktouch
-Summary: Touch Typing Tutor
-Group: User Interface/Desktops
-
-%description -n ktouch
-Touch Typing Tutor
-
-%package -n kvoctrain
-Summary: Vocabulary Trainer
-Group: User Interface/Desktops
-
-%description -n kvoctrain
-Vocabulary Trainer
-
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
@@ -129,12 +83,7 @@
    --disable-dependency-tracking \
    --disable-rpath \
    --enable-kig-python-scripting \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -158,16 +107,16 @@
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -196,6 +145,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 3.5.4-0.1.fc5
+- 3.5.4
+
 * Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
 - update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	10 Jun 2006 12:59:25 -0000	1.30
+++ sources	14 Aug 2006 11:26:35 -0000	1.31
@@ -1 +1 @@
-5c9cb7f25c8627772d6de5a3ed550691  kdeedu-3.5.3.tar.bz2
+81dfdea2ed6eaaa440ee868a69b8fc7e  kdeedu-3.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 11:36:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 07:36:40 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.840,
	1.841 workspace.pb17.patch, 1.1, NONE
Message-ID: <200608141136.k7EBaeSN011757@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.pb17.patch 
Log Message:
workspace.pb17 integrated


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.840
retrieving revision 1.841
diff -u -r1.840 -r1.841
--- openoffice.org.spec	14 Aug 2006 11:24:29 -0000	1.840
+++ openoffice.org.spec	14 Aug 2006 11:36:37 -0000	1.841
@@ -106,21 +106,20 @@
 Patch38: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
 Patch39: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
 Patch40: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch41: workspace.pb17.patch
-Patch42: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch43: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch44: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch45: workspace.os84.patch
-Patch46: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch47: workspace.configure18.patch
-Patch48: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch49: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch50: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch51: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch52: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch53: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch54: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch55: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch41: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch42: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch43: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch44: workspace.os84.patch
+Patch45: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch46: workspace.configure18.patch
+Patch47: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch48: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch49: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch50: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch51: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch52: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch53: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch54: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -962,21 +961,20 @@
 %patch38 -p1 -b .ooo67716.svx.overflow.patch
 %patch39 -p1 -b .gccXXXXX.basegfx.crash.patch
 %patch40 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch41 -p1 -b .workspace.pb17.patch
-%patch42 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch43 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch44 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch45 -p1 -b .workspace.os84.patch
-%patch46 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch47 -p1 -b .workspace.configure18.patch
-%patch48 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch49 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch50 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch51 -p1 -b .ooo68047.vcl.zwj.patch
-%patch52 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch53 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch54 -p1 -b .ooo68383.evo28support.patch
-%patch55 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch41 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch42 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch43 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch44 -p1 -b .workspace.os84.patch
+%patch45 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch46 -p1 -b .workspace.configure18.patch
+%patch47 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch48 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch49 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch50 -p1 -b .ooo68047.vcl.zwj.patch
+%patch51 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch52 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch53 -p1 -b .ooo68383.evo28support.patch
+%patch54 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 


--- workspace.pb17.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 11:39:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 07:39:32 -0400
Subject: rpms/kdegraphics/FC-5 kdegraphics.spec,1.87,1.88 sources,1.35,1.36
Message-ID: <200608141139.k7EBdWuV012811@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec sources 
Log Message:
3.5.4



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/kdegraphics.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kdegraphics.spec	22 Jun 2006 22:50:52 -0000	1.87
+++ kdegraphics.spec	14 Aug 2006 11:39:30 -0000	1.88
@@ -8,22 +8,19 @@
 
 %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.3
-Release: 0.2.fc5
+Version: 3.5.4
+Release: 0.1.fc5
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
 Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -53,9 +50,14 @@
 BuildRequires: lcms-devel
 BuildRequires: libart_lgpl-devel 
 BuildRequires: imlib-devel
+BuildRequires: autoconf
+BuildRequires: automake
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description
 Graphics applications for the K Desktop Environment.
@@ -83,186 +85,6 @@
 Graphic applications for the K Desktop Environment.
 This package contains header files for developing applications using kdegraphics.
 
-%package -n kamera
-Summary: Digital camera support for KDE
-Group: Applications/Multimedia
-Requires: gphoto2
-
-%description -n kamera
-Kamera adds support for digital cameras to KDE.
-After installing kamera, you can access your digital camera just like
-a filesystem from KDE applications.
-
-%package -n kcoloredit
-Summary: KDE palette editor and color chooser
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kcoloredit
-KDE palette editor and color chooser.
-kcoloredit can be used by other programs (and scripts) to pick a color or
-edit a palette.
-
-%package -n kdvi
-Summary: KDE DVI (TeX output) file viewer
-Group: Applications/Publishing
-Obsoletes: kdegraphics
-
-%description -n kdvi
-A DVI (TeX output) file viewer for KDE.
-
-%package -n kfax
-Summary: KDE Fax viewer
-Group: Applications/Communications
-Obsoletes: kdegraphics
-
-%description -n kfax
-A KDE viewer for incoming faxes
-
-%package -n kfile
-Summary: KFile module for reading image file
-Group: Applications/File
-Obsoletes: kfile-png
-Obsoletes: kfile-pdf
-
-%description -n kfile
-The KFile plugin allows all applications using KFile (e.g. Konqueror) to
-view information on image files.
-
-%package -n kfract
-Summary: KDE Fractal Generator
-Group: Applications/Engineering
-Obsoletes: kdegraphics
-
-%description -n kfract
-A Fractal generator for KDE
-
-%package -n kghostview
-Summary: PostScript viewer for KDE
-Group: Applications/Publishing
-Obsoletes: kdegraphics
-
-%description -n kghostview
-A PostScript and PDF file viewer for KDE.
-In addition to being a standalone viewer application, kghostview acts as
-a Konqueror plugin.
-
-%package -n kiconedit
-Summary: An icon editor for creating KDE icons
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kiconedit
-An icon editor for creating KDE icons
-
-%package -n kooka
-Summary: KDE scanner application
-Group: Applications/Multimedia
-Requires: libkscan = %{version}-%{release}, sane-backends
-
-%description -n kooka
-Kooka is a KDE application for previewing, cutting and receiving images
-from a scanner.
-
-%package -n kpaint
-Summary: A simple paint program for KDE
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kpaint
-A simple bitmap paint program for KDE.
-
-%package -n kruler
-Summary: A screen ruler and color measurement tool
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kruler
-A screen ruler and color measurement tool
-
-%package -n ksnapshot
-Summary: A KDE applet for taking snapshots of the desktop
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n ksnapshot
-A KDE applet for taking screenshots.
-ksnapshot allows both capturing the whole desktop and capturing just
-the active window.
-
-%package -n kuickshow
-Summary: Quick picture viewer for KDE
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kuickshow
-Kuickshow is a picture viewer for KDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size.
-
-%package -n kview
-Summary: KDE Image Viewer
-Group: Applications/Multimedia
-Obsoletes: kdegraphics
-
-%description -n kview
-KView is a KDE image viewer, supporting a wide range of graphics file formats.
-
-%package -n kviewshell
-Summary: Plugin integration for KView
-Group: Applications/Multimedia
-Requires: kview
-Obsoletes: kdegraphics
-
-%description -n kviewshell
-KViewShell allows the kview image viewer to be embedded into other KDE
-applications.
-
-%package -n kviewshell-devel
-Summary: Development files for kviewshell
-Group: Development/Libraries
-Requires: kviewshell
-Obsoletes: kdegraphics-devel
-
-%description -n kviewshell-devel
-Development files for KViewShell.
-Install kdegraphics-kviewshell-devel if you wish to develop or compile
-applications using kviewshell.
-
-%package -n libkscan
-Summary: KDE library for scanner support.
-Group: Applications/Multimedia
-Requires: sane-backends
-Obsoletes: kdegraphics
-
-%description -n libkscan
-KDE library for scanner support.
-
-%package -n libkscan-devel
-Summary: Development files for libkscan
-Group: Applications/Multimedia
-Requires: libkscan = %{version}-%{release}
-Obsoletes: kdegraphics-devel
-
-%description -n libkscan-devel
-Development files for libkscan - install kdegraphics-libkscan-devel if
-you wish to develop or compile applications using libkscan.
-
-%package -n kmrml
-Summary: MRML (Multimedia Retrieval Markup Language) client
-Group: Applications/Multimedia
-
-%description -n kmrml
-This package contains an MRML (Multimedia Retrieval Markup Language, http://www.mrml.net/) client
-for Konqueror.
-
-%package -n kpovmodeler
-Summary: Model editor for the PovRay raytracer
-Group: Applications/Multimedia
-
-%description -n kpovmodeler
-This package contains a model editor for the PovRay raytracer.
-
 %prep
 %setup -q
 %patch0 -p1 -b .libtool
@@ -293,12 +115,7 @@
    --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -340,16 +157,16 @@
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -377,6 +194,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 7:3.5.4-0.1.fc5
+- 3.5.4
+
 * Thu Jun 22 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.2.fc5
 - add missing kuickshow, printnodetest, svgdisplay, xf86gammacfg #196067
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	12 Jun 2006 14:37:49 -0000	1.35
+++ sources	14 Aug 2006 11:39:30 -0000	1.36
@@ -1 +1 @@
-56bd5537521dc94633f8effaace523cb  kdegraphics-3.5.3.tar.bz2
+de1f6d0597235f52186aaeeaabe7dc08  kdegraphics-3.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 11:44:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 07:44:58 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch, 1.1, 1.2
Message-ID: <200608141144.k7EBiwgI014342@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch 
Log Message:
readjust patch

openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch:
 langfilter.xsl |   22 +++++++++++++++++++---
 makefile.mk    |   11 ++++++++++-
 2 files changed, 29 insertions(+), 4 deletions(-)

Index: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch	25 Jul 2006 16:20:56 -0000	1.1
+++ openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch	14 Aug 2006 11:44:56 -0000	1.2
@@ -41,17 +41,10 @@
  </xsl:stylesheet>
 --- openoffice.org.orig/filter/source/config/fragments/makefile.mk	2006-07-25 16:55:21.000000000 +0100
 +++ openoffice.org/filter/source/config/fragments/makefile.mk	2006-07-25 17:09:10.000000000 +0100
-@@ -155,15 +155,26 @@
- #cmc, hack to workaround the java build requirement
+@@ -156,8 +156,17 @@
  MERGE:=python ../tools/merge/pyAltFCFGMerge
  .ELSE
--.IF "$(JAVAAOTCOMPILER)" != ""
-+.IF "$(JAVAAOTCOMPILER)" == ""
- MERGE    := $(BIN)$/FCFGMerge
- .ELSE
  MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
- .ENDIF
-+.ENDIF
 +.IF "$(XSLTPROC)"=="NO_XSLTPROC"
  XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
  PACKLANG := $(JAVAI) $(JAVACPS) $(XALAN_JAR) org.apache.xalan.xslt.Process -XSL langfilter.xsl
@@ -65,11 +58,8 @@
 +PACKLANG_XSL :=
  .ENDIF
  
-+
- # -----------------------------------------------------------------------------
- # build every module seperated
  # -----------------------------------------------------------------------------
-@@ -190,7 +201,7 @@
+@@ -186,7 +195,7 @@
       + at echo Building language packages $(@:b:s/Filter_//) for filters
       + at echo ===================================================================
       +-$(MKDIRHIER) $(@:d)



From fedora-cvs-commits at redhat.com  Mon Aug 14 11:52:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 07:52:28 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.841,
	1.842 workspace.os84.patch, 1.1, NONE
Message-ID: <200608141152.k7EBqSTs032045@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.os84.patch 
Log Message:
integrated workspace.os84


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -r1.841 -r1.842
--- openoffice.org.spec	14 Aug 2006 11:36:37 -0000	1.841
+++ openoffice.org.spec	14 Aug 2006 11:52:25 -0000	1.842
@@ -109,17 +109,16 @@
 Patch41: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
 Patch42: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
 Patch43: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch44: workspace.os84.patch
-Patch45: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch46: workspace.configure18.patch
-Patch47: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch48: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch49: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch50: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch51: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch52: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch53: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch54: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch44: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch45: workspace.configure18.patch
+Patch46: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch47: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch48: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch49: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch50: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch51: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch52: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch53: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -964,17 +963,16 @@
 %patch41 -p1 -b .rh200118.filter.xalanbroken.patch
 %patch42 -p1 -b .ooo67793.sw.stickymenu.patch
 %patch43 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch44 -p1 -b .workspace.os84.patch
-%patch45 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch46 -p1 -b .workspace.configure18.patch
-%patch47 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch48 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch49 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch50 -p1 -b .ooo68047.vcl.zwj.patch
-%patch51 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch52 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch53 -p1 -b .ooo68383.evo28support.patch
-%patch54 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch44 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch45 -p1 -b .workspace.configure18.patch
+%patch46 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch47 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch48 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch49 -p1 -b .ooo68047.vcl.zwj.patch
+%patch50 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch51 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch52 -p1 -b .ooo68383.evo28support.patch
+%patch53 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 
@@ -2505,6 +2503,7 @@
 - drop integrated workspace.impress96
 - drop integrated workspace.gcjsix
 - drop integrated workspace.vcl63
+- drop integrated workspace.os84
 - drop integrated ooo65327.builddep.writerperfect.patch
 - drop integrated ooo67337.sfx2.dontshowbuttons.patch
 


--- workspace.os84.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 11:59:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 07:59:01 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.842,
	1.843 workspace.configure18.patch, 1.1, NONE
Message-ID: <200608141159.k7EBx1MR011102@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.configure18.patch 
Log Message:
workspace.configure18 integrated


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.842
retrieving revision 1.843
diff -u -r1.842 -r1.843
--- openoffice.org.spec	14 Aug 2006 11:52:25 -0000	1.842
+++ openoffice.org.spec	14 Aug 2006 11:58:59 -0000	1.843
@@ -110,15 +110,14 @@
 Patch42: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
 Patch43: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
 Patch44: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch45: workspace.configure18.patch
-Patch46: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch47: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch48: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch49: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch50: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch51: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch52: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch53: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch45: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch46: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch47: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch48: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch49: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch50: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch51: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch52: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -964,15 +963,14 @@
 %patch42 -p1 -b .ooo67793.sw.stickymenu.patch
 %patch43 -p1 -b .ooo67829.dtrans.64bitpaste.patch
 %patch44 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch45 -p1 -b .workspace.configure18.patch
-%patch46 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch47 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch48 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch49 -p1 -b .ooo68047.vcl.zwj.patch
-%patch50 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch51 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch52 -p1 -b .ooo68383.evo28support.patch
-%patch53 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch45 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch46 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch47 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch48 -p1 -b .ooo68047.vcl.zwj.patch
+%patch49 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch50 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch51 -p1 -b .ooo68383.evo28support.patch
+%patch52 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 
 tar xzf %{SOURCE1}
 
@@ -2504,6 +2502,7 @@
 - drop integrated workspace.gcjsix
 - drop integrated workspace.vcl63
 - drop integrated workspace.os84
+- drop integrated workspace.configure18
 - drop integrated ooo65327.builddep.writerperfect.patch
 - drop integrated ooo67337.sfx2.dontshowbuttons.patch
 


--- workspace.configure18.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 12:09:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 08:09:14 -0400
Subject: rpms/kde-i18n/FC-5 kde-i18n.spec,1.57,1.58 sources,1.36,1.37
Message-ID: <200608141209.k7EC9EGN011301@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kde-i18n.spec sources 
Log Message:
3.5.4



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-5/kde-i18n.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kde-i18n.spec	9 Jun 2006 17:51:50 -0000	1.57
+++ kde-i18n.spec	14 Aug 2006 12:09:11 -0000	1.58
@@ -3,7 +3,7 @@
 %define redhatify 1
 
 Name: kde-i18n
-Version: 3.5.3
+Version: 3.5.4
 Release: 0.1.fc5
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
@@ -57,7 +57,7 @@
 
 BuildPrereq: kdelibs-devel
 BuildPrereq: findutils
-BuildPrereq: gettext-devel
+BuildPrereq: gettext
 
 %description
 Internationalization support for KDE
@@ -769,6 +769,7 @@
 %defattr(-,root,root)
 %lang(de) %{_datadir}/locale/de/*
 %lang(de) %doc %{_docdir}/HTML/de
+%lang(de) %{_datadir}/apps/klettres/de
 %lang(de) %{_datadir}/apps/ktuberling/sounds/de/*
 %lang(de) %{_datadir}/apps/khangman/data/de
 %lang(de) %{_datadir}/apps/khangman/de.txt
@@ -810,6 +811,7 @@
 %defattr(-,root,root)
 %lang(et) %{_datadir}/locale/et/*
 %lang(et) %doc %{_docdir}/HTML/et
+%lang(et) %{_datadir}/apps/kanagram/data/et
 %lang(et) %{_datadir}/apps/khangman/data/et
 %lang(et) %{_datadir}/apps/khangman/et.txt
 
@@ -1145,6 +1147,9 @@
 %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 1:3.5.4-0.1.fc5
+- 3.5.4
+
 * Fri Jun 09 2006 Than Ngo <than at redhat.com> 1:3.5.3-0.1.fc5
 - update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-5/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	9 Jun 2006 17:51:50 -0000	1.36
+++ sources	14 Aug 2006 12:09:12 -0000	1.37
@@ -1,39 +1,39 @@
-66358501eade79f2600f65767826268a  kde-i18n-ar-3.5.3.tar.bz2
-5ee352d11d976d133343575c0267e7df  kde-i18n-bg-3.5.3.tar.bz2
-a2764d9391d71125ebba255dcde003f7  kde-i18n-bn-3.5.3.tar.bz2
-c9519abf1f62bf69a7288f4144d680c9  kde-i18n-ca-3.5.3.tar.bz2
-e7a350afd2914188449749f10ad6d0bf  kde-i18n-cs-3.5.3.tar.bz2
-0e347230250eb65f8f6722ecacbaface  kde-i18n-da-3.5.3.tar.bz2
-e449fb462911191447210b8e2c8ccb8d  kde-i18n-de-3.5.3.tar.bz2
-aeeea7a9079ff5fd8f0bcfd34452ee4e  kde-i18n-el-3.5.3.tar.bz2
-1029cfba62fdd93fa2dc900111df2a4c  kde-i18n-en_GB-3.5.3.tar.bz2
-a84067e863f9c4eb6fdc1f64d03010b9  kde-i18n-es-3.5.3.tar.bz2
-e6b667f07e4426c2bdb1cda59b081272  kde-i18n-et-3.5.3.tar.bz2
-def712679b92b831b04ae704157f0c4f  kde-i18n-fi-3.5.3.tar.bz2
-02cd975bb784378b443855b8827b9607  kde-i18n-fr-3.5.3.tar.bz2
-2800fd107ca1879abec14d0600704a5d  kde-i18n-he-3.5.3.tar.bz2
-cde643d8b8760d092a16b475fdef3e89  kde-i18n-hi-3.5.3.tar.bz2
-18faeab413d89d3c9bde9fe1a6fb17a6  kde-i18n-hu-3.5.3.tar.bz2
-ecfd4dcb121a15fc69af80354d48d0f1  kde-i18n-is-3.5.3.tar.bz2
-ad8e550f7a2656fa6c5210881fd09bc7  kde-i18n-it-3.5.3.tar.bz2
-0bd28615477ec56978dcf5e700c1e5c3  kde-i18n-ja-3.5.3.tar.bz2
-e36ddd66007a7a405369731bea56ae83  kde-i18n-lt-3.5.3.tar.bz2
-b8698e7aa889cc25a65c948fb4228b9c  kde-i18n-nb-3.5.3.tar.bz2
-ebc1507bf23421c07e0e1bce2bcb216e  kde-i18n-nl-3.5.3.tar.bz2
-eed3d9cd4271df35b78fdb7aaf9c11e4  kde-i18n-nn-3.5.3.tar.bz2
-1bf7fb2adbf61536be4872d8be1dd5cd  kde-i18n-pa-3.5.3.tar.bz2
-7a57d7bf02a2700c71cb495894e08f81  kde-i18n-pl-3.5.3.tar.bz2
-31017190b2d125f4b072b84e6f8752f4  kde-i18n-pt-3.5.3.tar.bz2
-d76371a7a63cd728bfc6ff26c8f059bc  kde-i18n-pt_BR-3.5.3.tar.bz2
-e1a7a05994927ab9ac76174430d76991  kde-i18n-ro-3.5.3.tar.bz2
-a30e44b4dcaf0ff2937eb870903f3a47  kde-i18n-ru-3.5.3.tar.bz2
-6d74e2e2d58e0c10c177d9852e283f14  kde-i18n-sk-3.5.3.tar.bz2
-49f0579ca96ecbe65cee0ad13e2fd144  kde-i18n-sl-3.5.3.tar.bz2
-d8823f8b5765a61b290346257c660c61  kde-i18n-sr-3.5.3.tar.bz2
-dad7a462acf4dc90790aaeb63320e839  kde-i18n-sv-3.5.3.tar.bz2
-987f75a1f89abaa6f3562ef94d75d84d  kde-i18n-ta-3.5.3.tar.bz2
-598d5f55f9e4512757ee40f802968097  kde-i18n-tr-3.5.3.tar.bz2
-a852a8e6f9ee1c807e16f511ba4981a3  kde-i18n-uk-3.5.3.tar.bz2
-b57a6684ef11d1b0ac6d18824ac42799  kde-i18n-zh_CN-3.5.3.tar.bz2
-957f858c53efa4c62ed4bfa3dd06ddfe  kde-i18n-zh_TW-3.5.3.tar.bz2
-6076f24c27ad2a52eb3675e10e6b2af9  kde-i18n-ko-3.5.3.tar.bz2
+d537027991c11417e4d3ede0ced3c142  kde-i18n-ar-3.5.4.tar.bz2
+2340d20511d54856883c53536138da41  kde-i18n-bg-3.5.4.tar.bz2
+a68c7180e9229db5c308892d89a626d5  kde-i18n-bn-3.5.4.tar.bz2
+3666508969cbe2ce8a52f0a6f67bf3f4  kde-i18n-ca-3.5.4.tar.bz2
+639887411d07ea92f0c733e66eb01b47  kde-i18n-cs-3.5.4.tar.bz2
+ef845c89fac91948ea9784593cd1b3fb  kde-i18n-da-3.5.4.tar.bz2
+45b90d7e08391836108ca3db19c0febf  kde-i18n-de-3.5.4.tar.bz2
+00d834a86e31d9d03a583c6c40565094  kde-i18n-el-3.5.4.tar.bz2
+244175fa2be8023a4a6246c795972b5e  kde-i18n-en_GB-3.5.4.tar.bz2
+2c4e049753425d9405e86fed98f3c958  kde-i18n-es-3.5.4.tar.bz2
+7209f997e7c418d2884bc278ff6d642c  kde-i18n-et-3.5.4.tar.bz2
+c2ef5fad94bcb04ee7e1a363593ff685  kde-i18n-fi-3.5.4.tar.bz2
+1fdeb2af12a6096258d08ff339000e8c  kde-i18n-fr-3.5.4.tar.bz2
+b861796702141e198873614b1428cc3a  kde-i18n-he-3.5.4.tar.bz2
+9b07d10f948803f6fca49666934517c3  kde-i18n-hi-3.5.4.tar.bz2
+cc25aebee25f07bfe6510cdcf39e743d  kde-i18n-hu-3.5.4.tar.bz2
+ff1e7b4b500a2032530c101a1473895a  kde-i18n-is-3.5.4.tar.bz2
+b050d738e3e7386134e4a657a38b5c24  kde-i18n-it-3.5.4.tar.bz2
+48f1c83d7a1b08429ec4ac003a85293f  kde-i18n-ja-3.5.4.tar.bz2
+af106fb9c73f61b08eb5441b0c15871f  kde-i18n-ko-3.5.4.tar.bz2
+5c8bf80d151685785cf16d0d60912441  kde-i18n-lt-3.5.4.tar.bz2
+c322d1d4a04e327a76effd78d36b407d  kde-i18n-nb-3.5.4.tar.bz2
+c97771e5c1398182a99d50926fa58eb3  kde-i18n-nl-3.5.4.tar.bz2
+97b12a156442c4da083423789f8d1506  kde-i18n-nn-3.5.4.tar.bz2
+c513951282dc7918acde5e29220f7103  kde-i18n-pa-3.5.4.tar.bz2
+47787ef2ad8516f4e0ca21b5daec64cc  kde-i18n-pl-3.5.4.tar.bz2
+7ccc83aacaaa1609a66378661ee0b10b  kde-i18n-pt-3.5.4.tar.bz2
+42e5ed51573df1415f245d201a13095d  kde-i18n-pt_BR-3.5.4.tar.bz2
+40f3c27e4aa33d80fe4d7d97ae761d74  kde-i18n-ro-3.5.4.tar.bz2
+b916c3eb4af74da0a620fa006defcd8a  kde-i18n-ru-3.5.4.tar.bz2
+2c4d939f395894b14c976235b81ae81e  kde-i18n-sk-3.5.4.tar.bz2
+7f253c3e29e1fed72014b2101a9c2ce9  kde-i18n-sl-3.5.4.tar.bz2
+6736f6480dcdffab6bd25883495fb661  kde-i18n-sr-3.5.4.tar.bz2
+5097306cb3d02d45366471cfa4dbe7b2  kde-i18n-sv-3.5.4.tar.bz2
+e5e11f4e3b1b3e4a40079ad963efbfe3  kde-i18n-ta-3.5.4.tar.bz2
+01453f054f5595660c8bc0aa5d589520  kde-i18n-tr-3.5.4.tar.bz2
+5ee00967f1e91474f1aa462e1bf0fac3  kde-i18n-uk-3.5.4.tar.bz2
+c1f8e26b1129513ef83357c65ab2db94  kde-i18n-zh_CN-3.5.4.tar.bz2
+8893190922de3905ebd909ad58e45dc9  kde-i18n-zh_TW-3.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 12:11:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 08:11:28 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch, 1.1, 1.2
Message-ID: <200608141211.k7ECBS8w011416@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch 
Log Message:
adjust patch

openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch:
 source/dialog/optjava.cxx     |    0 
 source/dialog/optjava.hxx     |    0 
 svx/source/dialog/optjava.cxx |   10 +++++++++-
 svx/source/dialog/optjava.hxx |    5 +++++
 4 files changed, 14 insertions(+), 1 deletion(-)

Index: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch	1 Aug 2006 08:40:31 -0000	1.1
+++ openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch	14 Aug 2006 12:11:26 -0000	1.2
@@ -24,7 +24,7 @@
 diff -u -r1.11 optjava.cxx
 --- openoffice.org.orig/svx/source/dialog/optjava.cxx	8 May 2006 14:56:15 -0000	1.11
 +++ openoffice.org/svx/source/dialog/optjava.cxx	1 Aug 2006 08:30:46 -0000
-@@ -943,6 +943,7 @@
+@@ -920,6 +920,7 @@
  
  	// set initial focus to path list
  	m_aPathList.GrabFocus();
@@ -32,7 +32,7 @@
  }
  
  // -----------------------------------------------------------------------
-@@ -984,6 +985,7 @@
+@@ -961,6 +962,7 @@
  			ErrorBox( this, WB_OK, sMsg ).Execute();
  		}
  	}
@@ -40,19 +40,19 @@
  	return 0;
  }
  
-@@ -1010,7 +1012,10 @@
+@@ -987,7 +989,10 @@
  		INetURLObject aURL( sFolderURL );
- 		String sFolder = aURL.getFSysPath( INetURLObject::FSYS_DETECT );
+         String _sFolder = aURL.getFSysPath( INetURLObject::FSYS_DETECT );
  		if ( !IsPathDuplicate( sFolderURL ) )
--			m_aPathList.InsertEntry( sFolder, SvFileInformationManager::GetImage( aURL ) );
-+		{
-+			USHORT nPos = m_aPathList.InsertEntry( sFolder, SvFileInformationManager::GetImage(aURL) );
-+        	m_aPathList.SelectEntryPos( nPos );
-+		}
+-            m_aPathList.InsertEntry( _sFolder, SvFileInformationManager::GetImage( aURL ) );
++        {
++			USHORT nPos = m_aPathList.InsertEntry( _sFolder, SvFileInformationManager::GetImage( aURL ) );
++			m_aPathList.SelectEntryPos( nPos );
++        }
  		else
  		{
  			String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
-@@ -1018,6 +1023,7 @@
+@@ -995,6 +1000,7 @@
  			ErrorBox( this, WB_OK, sMsg ).Execute();
  		}
  	}
@@ -60,7 +60,7 @@
  	return 0;
  }
  
-@@ -1038,6 +1044,7 @@
+@@ -1015,6 +1021,7 @@
  		}
  	}
  
@@ -68,7 +68,7 @@
  	return 0;
  }
  
-@@ -1098,5 +1105,6 @@
+@@ -1075,5 +1082,6 @@
  	}
  	// select first entry
  	m_aPathList.SelectEntryPos(0);



From fedora-cvs-commits at redhat.com  Mon Aug 14 12:21:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 08:21:22 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch, 1.1, 1.2
Message-ID: <200608141221.k7ECLMww026522@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch 
Log Message:
readjust patch

openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch:
 gtkframe.cxx |   74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 71 insertions(+), 3 deletions(-)

Index: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch	1 Aug 2006 15:50:56 -0000	1.1
+++ openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch	14 Aug 2006 12:21:19 -0000	1.2
@@ -5,7 +5,7 @@
 diff -u -r1.47 gtkframe.cxx
 --- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	5 May 2006 11:01:02 -0000	1.47
 +++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	1 Aug 2006 15:13:58 -0000
-@@ -63,6 +63,9 @@
+@@ -65,6 +65,9 @@
  
  #include <com/sun/star/accessibility/XAccessibleContext.hpp>
  #include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -15,13 +15,15 @@
  
  using namespace com::sun::star;
  
-@@ -2914,13 +2960,79 @@
+@@ -2955,13 +2958,78 @@
          pThis->updateIMSpotLocation();
  }
  
+-gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext*, gpointer /*im_handler*/ )
 +uno::Reference<accessibility::XAccessibleEditableText> 
 +	FindFocus(uno::Reference< accessibility::XAccessibleContext > xContext)
-+{
+ {
+-    return FALSE;
 +    if (!xContext.is())
 +        uno::Reference< accessibility::XAccessibleEditableText >();
 +
@@ -45,10 +47,11 @@
 +			return xText;
 +	}
 +	return uno::Reference< accessibility::XAccessibleEditableText >();
-+}
-+
+ }
+ 
+-gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint, gint, gpointer /*im_handler*/ )
 +uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText()
-+{
+ {
 +    uno::Reference<accessibility::XAccessibleEditableText> xText;
 +    Window* pFocusWin = ImplGetSVData()->maWinData.mpFocusWin;
 +    if (!pFocusWin)
@@ -60,8 +63,8 @@
 +    return xText;
 +}
 +
- gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pContext, gpointer im_handler )
- {
++gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pContext, gpointer im_handler )
++{
 +    uno::Reference<accessibility::XAccessibleEditableText> xText = lcl_GetxText();
 +
 +    if (xText.is())
@@ -80,10 +83,9 @@
      return FALSE;
  }
  
--gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext* pContext, gint arg1, gint arg2, gpointer im_handler )
 +gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext* pContext, gint offset, gint nchars, 
 +    gpointer im_handler )
- {
++{
 +    uno::Reference<accessibility::XAccessibleEditableText> xText = lcl_GetxText();
 +
 +    if (xText.is())
@@ -93,6 +95,5 @@
 +	return TRUE;
 +    }
 +
-     return FALSE;
- }
- 
++    return FALSE;
++}



From fedora-cvs-commits at redhat.com  Mon Aug 14 12:26:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 08:26:48 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch,
	1.1, 1.2
Message-ID: <200608141226.k7ECQmbO026550@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch 
Log Message:
readjust patch

openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch:
 source/gdi/bmpacc.cxx     |    0 
 vcl/source/gdi/bmpacc.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch	10 Aug 2006 12:17:18 -0000	1.1
+++ openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch	14 Aug 2006 12:26:45 -0000	1.2
@@ -5,10 +5,10 @@
 diff -u -r1.8 bmpacc.cxx
 --- openoffice.org.orig/vcl/source/gdi/bmpacc.cxx	31 Jan 2006 18:27:25 -0000	1.8
 +++ openoffice.org/vcl/source/gdi/bmpacc.cxx	10 Aug 2006 11:54:34 -0000
-@@ -265,7 +265,7 @@
+@@ -299,7 +299,7 @@
  			nMask = SWAPLONG( nMask );
  #endif
- 			for( long i = 0; i < nHeight; i++, pLast4Bytes += nScanSize )
+ 			for( sal_uInt32 i = 0; i < nHeight; i++, pLast4Bytes += nScanSize )
 -				( *(long*) pLast4Bytes ) &= nMask;
 +				( *(sal_uInt32*) pLast4Bytes ) &= nMask;
  		}



From fedora-cvs-commits at redhat.com  Mon Aug 14 13:19:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 09:19:33 -0400
Subject: rpms/libbonobo/devel .cvsignore, 1.18, 1.19 libbonobo.spec, 1.47,
	1.48 sources, 1.18, 1.19
Message-ID: <200608141319.k7EDJXbP011874@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10918

Modified Files:
	.cvsignore libbonobo.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	13 Aug 2006 03:04:24 -0000	1.18
+++ .cvsignore	14 Aug 2006 13:19:30 -0000	1.19
@@ -1 +1 @@
-libbonobo-2.15.2.tar.bz2
+libbonobo-2.15.3.tar.bz2


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libbonobo.spec	13 Aug 2006 03:04:24 -0000	1.47
+++ libbonobo.spec	14 Aug 2006 13:19:30 -0000	1.48
@@ -5,7 +5,7 @@
 
 Summary: Bonobo component system
 Name: libbonobo
-Version: 2.15.2
+Version: 2.15.3
 Release: 1%{?dist}
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
@@ -24,7 +24,6 @@
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-2.13.1-multishlib.patch
-Patch1: libbonobo-2.15.0-close-fds.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -54,7 +53,6 @@
 %patch0 -p1 -b .multishlib
 %endif
 
-%patch1 -p0 -b .close-fds
 
 %build
 intltoolize -f
@@ -120,6 +118,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1.fc6
+- Update to 2.15.3
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1.fc6
 - Update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	13 Aug 2006 03:04:24 -0000	1.18
+++ sources	14 Aug 2006 13:19:30 -0000	1.19
@@ -1 +1 @@
-814c615847dcef1f823f1070295575c0  libbonobo-2.15.2.tar.bz2
+ceadce5e7d70b586d9f5648b3218676b  libbonobo-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 13:39:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 09:39:03 -0400
Subject: rpms/kdenetwork/FC-5 kdenetwork-3.5.4-kde#130630.patch, NONE,
	1.1 kdenetwork-3.5.4-kde#63494.patch, NONE,
	1.1 kdenetwork-3.5.4-kde#73519.patch, NONE,
	1.1 kdenetwork.spec, 1.74, 1.75 sources, 1.42, 1.43
Message-ID: <200608141339.k7EDd3AT019234@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdenetwork.spec sources 
Added Files:
	kdenetwork-3.5.4-kde#130630.patch 
	kdenetwork-3.5.4-kde#63494.patch 
	kdenetwork-3.5.4-kde#73519.patch 
Log Message:
3.5.4


kdenetwork-3.5.4-kde#130630.patch:
 oscartypes.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdenetwork-3.5.4-kde#130630.patch ---
Index: kopete/protocols/oscar/liboscar/oscartypes.h
===================================================================
--- kopete/protocols/oscar/liboscar/oscartypes.h	(Revision 568262)
+++ kopete/protocols/oscar/liboscar/oscartypes.h	(Revision 568263)
@@ -237,7 +237,7 @@
 	const WORD ICQ_MAJOR 			= 0x0014;
 	const WORD ICQ_MINOR 			= 0x0034;
 	const WORD ICQ_POINT 			= 0x0000;
-	const WORD ICQ_BUILD 			= 0x0A0F;
+	const WORD ICQ_BUILD 			= 0x0BB8;
 	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
 	const char ICQ_COUNTRY[] 		= "us";
 	const char ICQ_LANG[] 			= "en";

kdenetwork-3.5.4-kde#63494.patch:
 newsscroller.cpp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdenetwork-3.5.4-kde#63494.patch ---
Index: knewsticker/newsscroller.cpp
===================================================================
--- knewsticker/newsscroller.cpp	(Revision 566105)
+++ knewsticker/newsscroller.cpp	(Revision 566106)
@@ -129,7 +129,7 @@
 };
 
 NewsScroller::NewsScroller(QWidget *parent, ConfigAccess *cfg, const char *name)
-	: QFrame(parent, name),
+	: QFrame(parent, name, WNoAutoErase),
 	m_cfg(cfg),
 	m_scrollTimer(new QTimer(this)),
 	m_activeHeadline(0),
@@ -258,8 +258,8 @@
 	
 	if (contentsRect().contains(pt))
 		updateActive(pt);
-	
-	repaint(false);
+
+	update();
 }
 
 void NewsScroller::enterEvent(QEvent *)
@@ -337,7 +337,7 @@
 	}
 
 	if (updateActive(e->pos()))
-		repaint(false);
+		update();
 }
 
 void NewsScroller::wheelEvent(QWheelEvent *e)
@@ -360,7 +360,7 @@
 
 	if (m_activeHeadline) {
 		m_activeHeadline = 0;
-		repaint(false);
+		update();
 	}
 }
 
@@ -488,7 +488,7 @@
 			m_offset = - scrollHeight();
 	}
 
-	repaint(false);
+	update();
 }
 
 int NewsScroller::scrollWidth() const

kdenetwork-3.5.4-kde#73519.patch:
 vidmode.cpp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE kdenetwork-3.5.4-kde#73519.patch ---
Index: krdc/vidmode.cpp
===================================================================
--- krdc/vidmode.cpp	(Revision 571506)
+++ krdc/vidmode.cpp	(Revision 571507)
@@ -38,7 +38,9 @@
 	if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
 		return;
 
-	XF86VidModeGetAllModeLines(dpy,oldResolution.screen,&modecount, &modes);
+	if (!XF86VidModeGetAllModeLines(dpy, oldResolution.screen, &modecount, &modes))
+		return;
+
 	for (int i = 0; i < modecount; i++) {
 		int w = (*modes[i]).hdisplay;
 		int h = (*modes[i]).vdisplay;
@@ -69,7 +71,9 @@
 	if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
 		return Resolution();
 
-	XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes);
+	if (!XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes))
+		return Resolution();
+
 	int cw = (*modes[0]).hdisplay;
 	int ch = (*modes[0]).vdisplay;
 	nx = cw;


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-5/kdenetwork.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- kdenetwork.spec	8 Jun 2006 22:40:18 -0000	1.74
+++ kdenetwork.spec	14 Aug 2006 13:38:55 -0000	1.75
@@ -1,30 +1,26 @@
 %define debug 0
 %define final 0
-%define arts 1
 %define libidn 1
 %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.3
+Version: 3.5.4
 Release: 0.1.fc5
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kppp.pamd
 Source2: ktalk
 Source4: lisarc
@@ -37,6 +33,11 @@
 Patch4: kdenetwork-3.2.3-resolv.patch
 Patch5: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
 
+# upstream patches
+Patch100: kdenetwork-3.5.4-kde#130630.patch
+Patch101: kdenetwork-3.5.4-kde#73519.patch
+Patch102: kdenetwork-3.5.4-kde#63494.patch
+
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
@@ -45,10 +46,8 @@
 BuildRequires: qt-devel >= %{qt_version}
 BuildRequires: kdebase-devel
 BuildRequires: libtool
-BuildRequires: glibc-devel
-BuildRequires: gcc-c++
 BuildRequires: automake
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf
 %ifnarch s390 s390x
 BuildRequires: wireless-tools >= 25
 %endif
@@ -56,11 +55,7 @@
 BuildRequires: libXmu-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXtst-devel
-%if %{xmms}
-BuildRequires: xmms-devel
-%else
-Obsoletes: kdenetwork-nowlistening
-%endif
+BuildRequires: openssl-devel
 
 %description
 Networking applications for the K Desktop Environment.
@@ -75,16 +70,6 @@
 Development files for kdenetwork. Install kdenetwork-devel if you wish
 to develop or compile KDE networking applications.
 
-%if %{xmms}
-%package nowlistening
-Summary: Xmms plugin for Kopete
-Group: Applications/Multimedia
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description nowlistening
-Xmms plugin for Kopete
-%endif
-
 %prep
 %setup -q
 %patch0 -p1 -b .dt
@@ -94,11 +79,12 @@
 %patch4 -p1 -b .ppp
 %patch5 -p1 -b .libgadu-va_copy
 
-find -name CVS | xargs rm -rf 
+# upstream patches
+%patch100 -p0 -b .kde#130630
+%patch101 -p0 -b .kde#73519
+%patch102 -p0 -b .kde#63494
 
-%if !%{xmms}
-  echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
-%endif
+echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -107,22 +93,11 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-FLAGS="%{optflags}"
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
-export KDEDIR=%{_prefix}
-export LDFLAGS="$LDFLAGS `krb5-config --libs`"
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --enable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -186,14 +161,25 @@
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add lisa
-exit 0
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
 
 %postun
 /sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %preun
 if [ "$1" = "0" ]; then
-    /sbin/chkconfig --del lisa
+    /sbin/chkconfig --del lisa ||:
+    /sbin/service lisa stop > /dev/null 2>&1 ||:
 fi
 exit 0
 
@@ -202,11 +188,12 @@
 
 %files
 %defattr(-,root,root)
-%config %{_sysconfdir}/security/console.apps/kppp
-%config %{_sysconfdir}/pam.d/kppp
-%config %{_sysconfdir}/lisarc
-%config %{_sysconfdir}/rc.d/init.d/lisa
-%config %{_sysconfdir}/xinetd.d/ktalk
+%doc AUTHORS COPYING README
+%config(noreplace) %{_sysconfdir}/security/console.apps/kppp
+%config(noreplace) %{_sysconfdir}/pam.d/kppp
+%config(noreplace) %{_sysconfdir}/lisarc
+%config(noreplace) %{_sysconfdir}/rc.d/init.d/lisa
+%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
 %doc %{_docdir}/HTML/en/*
 %{_libdir}/*.so*
 %{_libdir}/*.la
@@ -234,17 +221,10 @@
 %defattr(-,root,root)
 %{_includedir}/kde/*
 
-%if %{xmms}
-%files nowlistening
-%defattr(-,root,root)
-%{_datadir}/apps/kopete/*nowlisteningchatui*
-%{_datadir}/apps/kopete/*nowlisteningui*
-%{_datadir}/services/kconfiguredialog/*nowlistening*
-%{_datadir}/services/*nowlistening*
-%{_libdir}/kde3/*nowlistening*
-%endif
-
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 7:3.5.4-0.1.fc5
+- 3.5.4
+
 * Fri Jun 09 2006 Than Ngo <than at redhat.com> 7:3.5.3-0.1.fc5
 - update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-5/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	8 Jun 2006 22:40:18 -0000	1.42
+++ sources	14 Aug 2006 13:38:55 -0000	1.43
@@ -1 +1 @@
-119af91a048c34d9a917a1898f215554  kdenetwork-3.5.3.tar.bz2
+81660b1a73e81b6c01a55861c154dd3b  kdenetwork-3.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 13:39:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 09:39:03 -0400
Subject: rpms/control-center/devel control-center-2.15.91-search.patch, NONE,
	1.1 control-center.spec, 1.168, 1.169
Message-ID: <200608141339.k7EDd32H019240@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19141

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.15.91-search.patch 
Log Message:
make search keybinding work with beagle


control-center-2.15.91-search.patch:
 gnome-settings-multimedia-keys.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE control-center-2.15.91-search.patch ---
--- control-center-2.15.91/gnome-settings-daemon/gnome-settings-multimedia-keys.c.search	2006-08-14 09:35:22.000000000 -0400
+++ control-center-2.15.91/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2006-08-14 09:36:04.000000000 -0400
@@ -758,7 +758,12 @@
 		execute ("nautilus", FALSE);
 		break;
 	case SEARCH_KEY:
-		execute ("gnome-search-tool", FALSE);
+		if ((cmd = g_find_program_in_path ("beagle-search")))
+			execute ("beagle-search", FALSE);
+		else
+			execute ("gnome-search-tool", FALSE);
+
+		g_free (cmd);
 		break;
 	case EMAIL_KEY:
 		do_mail_action (acme);


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- control-center.spec	13 Aug 2006 21:18:42 -0000	1.168
+++ control-center.spec	14 Aug 2006 13:39:00 -0000	1.169
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -37,6 +37,7 @@
 Patch9: control-center-2.15.4-add-dbus-flags.patch
 # Dobey being unreasonable again
 Patch10: control-center-2.15.4-finish.patch
+Patch11: control-center-2.15.91-search.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -131,6 +132,7 @@
 %patch7 -p1 -b .gecos
 %patch9 -p1 -b .add-dbus-flags
 %patch10 -p1 -b .finish
+%patch11 -p1 -b .search
 
 %build
 
@@ -268,6 +270,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-3.fc6
+- Make the search keybinding work with beagle
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-2.fc6
 - fix spec file (pointed out by Yanko Kaneti)
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 13:49:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 09:49:30 -0400
Subject: rpms/kdesdk/FC-5 kdesdk.spec,1.54,1.55 sources,1.32,1.33
Message-ID: <200608141349.k7EDnURR005073@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdesdk.spec sources 
Log Message:
3.5.4



Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/kdesdk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdesdk.spec	9 Jun 2006 17:15:10 -0000	1.54
+++ kdesdk.spec	14 Aug 2006 13:49:27 -0000	1.55
@@ -1,38 +1,41 @@
 %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
-%define arts 1
 
 %define make_cvs 0
 
 %define appdir %{_datadir}/applications/kde
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Name: kdesdk
-Version: 3.5.3
+Version: 3.5.4
 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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
 Patch2: kdesdk-3.4.0-db4.patch
 Patch3: kdesdk-3.4.92-misc.patch
 
-Requires(post,postun): /sbin/ldconfig
-
-BuildPrereq: qt-devel >= %{qt_epoch}:%{qt_version}
-BuildPrereq: kdelibs-devel >= %{kdelibs_epoch}:%{version}
-BuildPrereq: db4-devel
-BuildPrereq: /usr/bin/desktop-file-install
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
+BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: db4-devel
+BuildRequires: desktop-file-utils
+BuildRequires: flex
 
 %description
 A collection of applications and tools used by KDE developers.
@@ -49,86 +52,6 @@
 Development files for kdesdk. Install kdesdk-devel if you wish
 to develop or compile KDE sdk applications.
 
-%package -n cervisia
-Summary: Graphical CVS client
-Group: Development/Tools
-Epoch: 2
-License: QPL
-
-%description -n cervisia
-Cervisia is a KDE graphical frontend for the the CVS client. It
-features checking out a module from a repository, updating or
-retrieving the status of a working directory or single files, common
-operations like add, remove and commit, diff against the repository
-and between different revisions, annotated view of a file, view of the
-log messages in tree and list form as well as resolving of conflicts
-in a file.
-
-%package kbabel
-Summary: Translator tools
-Group: Development/Tools
-Obsoletes: kbabel ktranslator
-
-%description kbabel
-Translator tools.
-kbabel includes a .po file editor, a catalog manager, message extraction
-tools, and po file thumbnail views for Konqueror (the KDE file manager).
-
-%package kbugbuster
-Summary: KBugBuster - debugging tools
-Group: Development/Tools
-
-%description kbugbuster
-Debugging tools
-
-%package gimp
-Summary: KDE palette for GIMP
-Requires: gimp >= 1.2
-Group: Applications/Multimedia
-
-%description gimp
-The standard KDE palette in GIMP format. This allows you to create/edit
-low-color KDE icons using the GIMP.
-
-%package kapptemplate
-Summary: Tool for creating a skeleton KDE application
-Group: Development/Tools
-
-%description kapptemplate
-kapptemplate creates a skeleton KDE application (configure stuff, automake
-stuff, etc.), allowing you to start writing the relevant code instead of
-bothering with things that have already been done.
-
-kapptemplate supports both standalone applications and plugins utilizing
-KParts technology.
-
-%package kmtrace
-Summary: Malloc debugger for KDE
-Group: Development/Tools
-
-%description kmtrace
-KMtrace is a malloc (memory allocation) debugger for KDE.
-
-%package kompare
-Summary: File comparison tool for KDE
-Group: Applications/File
-
-%description kompare
-A file comparison tool for KDE
-
-%package kspy
-Summary: Qt/KDE application state examination tool
-Group: Development/Tools
-
-%description kspy
-KSpy is a utility intended to help developers examine the internal
-state of a Qt/KDE application. KSpy graphically displays all the
-QObjects in use, and allows you to browse their properties. Using KSpy
-is very simple, include kspy.h and call KSpy::invoke() when you want
-to looks inside your app. The KSpy function is inline and the main
-part of KSpy is dynamically loaded, so you may even want to leave this
-in the release build of an application.
-
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
@@ -137,9 +60,6 @@
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS"
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -149,12 +69,7 @@
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -168,19 +83,19 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor "" --delete-original \
-  --dir $RPM_BUILD_ROOT%{appdir} \
+  --dir %{buildroot}%{appdir} \
   --add-only-show-in KDE \
-  $RPM_BUILD_ROOT%{appdir}/kbugbuster.desktop \
-  $RPM_BUILD_ROOT%{appdir}/kuiviewer.desktop
+  %{buildroot}%{appdir}/kbugbuster.desktop \
+  %{buildroot}%{appdir}/kuiviewer.desktop
 
 # 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
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -190,20 +105,32 @@
 popd
 
 # workaround, rpm cannot replace a directory with a symlink
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/cervisia/common
-mkdir $RPM_BUILD_ROOT%{_docdir}/HTML/en/cervisia/common
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/cervisia/common
+rm -f %{buildroot}%{_docdir}/HTML/en/cervisia/common
+mkdir %{buildroot}%{_docdir}/HTML/en/cervisia/common
+pushd %{buildroot}%{_docdir}/HTML/en/cervisia/common
 for i in %{_docdir}/HTML/en/common/* ; do
    ln -s ../../common/$(basename $i) .
 done
 popd
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
@@ -227,6 +154,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 3.5.4-0.1.fc5
+- 3.5.4
+
 * Fri Jun 09 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
 - update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	9 Jun 2006 17:15:10 -0000	1.32
+++ sources	14 Aug 2006 13:49:27 -0000	1.33
@@ -1 +1 @@
-75450d8905a2cc612df00927c7f81af9  kdesdk-3.5.3.tar.bz2
+2150e6a4ce5e42886a4afc6c0198c30c  kdesdk-3.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 13:53:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 09:53:28 -0400
Subject: rpms/openoffice.org/devel ooobuild.VBAObjects.patch,1.1,1.2
Message-ID: <200608141353.k7EDrST7006592@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	ooobuild.VBAObjects.patch 
Log Message:
update VBA patch

ooobuild.VBAObjects.patch:
 basic/inc/sbmeth.hxx                                              |    4 
 basic/source/classes/image.cxx                                    |   79 
 basic/source/classes/makefile.mk                                  |    5 
 basic/source/classes/sb.cxx                                       |   90 
 basic/source/classes/sbunoobj.cxx                                 |  246 
 basic/source/classes/sbxmod.cxx                                   |   81 
 basic/source/comp/buffer.cxx                                      |   58 
 basic/source/comp/codegen.cxx                                     |  202 
 basic/source/comp/dim.cxx                                         |   18 
 basic/source/comp/loops.cxx                                       |   40 
 basic/source/comp/makefile.mk                                     |    4 
 basic/source/comp/parser.cxx                                      |    9 
 basic/source/comp/scanner.cxx                                     |   14 
 basic/source/comp/symtbl.cxx                                      |    8 
 basic/source/comp/token.cxx                                       |    1 
 basic/source/inc/buffer.hxx                                       |   15 
 basic/source/inc/codegen.hxx                                      |   38 
 basic/source/inc/disas.hxx                                        |   10 
 basic/source/inc/filefmt.hxx                                      |    4 
 basic/source/inc/image.hxx                                        |   17 
 basic/source/inc/opcodes.hxx                                      |    1 
 basic/source/inc/parser.hxx                                       |    2 
 basic/source/inc/runtime.hxx                                      |    4 
 basic/source/inc/scanner.hxx                                      |    5 
 basic/source/inc/symtbl.hxx                                       |    8 
 basic/source/inc/token.hxx                                        |    2 
 basic/source/runtime/makefile.mk                                  |    3 
 basic/source/runtime/methods.cxx                                  |   19 
 basic/source/runtime/methods1.cxx                                 |    9 
 basic/source/runtime/rtlproto.hxx                                 |    1 
 basic/source/runtime/runtime.cxx                                  |   13 
 basic/source/runtime/step0.cxx                                    |  178 
 basic/source/runtime/step1.cxx                                    |    2 
 basic/source/runtime/step2.cxx                                    |   20 
 config_office/configure.in                                        |   13 
 config_office/set_soenv.in                                        |    1 
 offapi/org/openoffice/vba/Excel/Constants.idl                     |   20 
 offapi/org/openoffice/vba/Excel/XlApplicationInternational.idl    |   54 
 offapi/org/openoffice/vba/Excel/XlApplyNamesOrder.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlArabicModes.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlArrangeStyle.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlArrowHeadLength.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlArrowHeadStyle.idl              |   14 
 offapi/org/openoffice/vba/Excel/XlArrowHeadWidth.idl              |   12 
 offapi/org/openoffice/vba/Excel/XlAutoFillType.idl                |   20 
 offapi/org/openoffice/vba/Excel/XlAutoFilterOperator.idl          |   15 
 offapi/org/openoffice/vba/Excel/XlAxisCrosses.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlAxisGroup.idl                   |   11 
 offapi/org/openoffice/vba/Excel/XlAxisType.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlBackground.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlBarShape.idl                    |   15 
 offapi/org/openoffice/vba/Excel/XlBorderWeight.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlBordersIndex.idl                |   17 
 offapi/org/openoffice/vba/Excel/XlBuildInDialog.idl               |  251 
 offapi/org/openoffice/vba/Excel/XlCVError.idl                     |   16 
 offapi/org/openoffice/vba/Excel/XlCalculatedMemberType.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlCalculation.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlCalculationInterruptKey.idl     |   12 
 offapi/org/openoffice/vba/Excel/XlCalculationState.idl            |   12 
 offapi/org/openoffice/vba/Excel/XlCategoryType.idl                |   12 
 offapi/org/openoffice/vba/Excel/XlCellInsertionMode.idl           |   12 
 offapi/org/openoffice/vba/Excel/XlCellType.idl                    |   19 
 offapi/org/openoffice/vba/Excel/XlChartGallery.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlChartItem.idl                   |   40 
 offapi/org/openoffice/vba/Excel/XlChartLocation.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlChartPicturePlacement.idl       |   16 
 offapi/org/openoffice/vba/Excel/XlChartPictureType.idl            |   13 
 offapi/org/openoffice/vba/Excel/XlChartSplitType.idl              |   13 
 offapi/org/openoffice/vba/Excel/XlChartType.idl                   |   82 
 offapi/org/openoffice/vba/Excel/XlClipboardFormat.idl             |   42 
 offapi/org/openoffice/vba/Excel/XlCmdType.idl                     |   14 
 offapi/org/openoffice/vba/Excel/XlColorIndex.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlColumnDataType.idl              |   20 
 offapi/org/openoffice/vba/Excel/XlCommandUnderlines.idl           |   12 
 offapi/org/openoffice/vba/Excel/XlCommentDisplayMode.idl          |   13 
 offapi/org/openoffice/vba/Excel/XlConsolidationFunction.idl       |   21 
 offapi/org/openoffice/vba/Excel/XlCopyPictureFormat.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlCorruptLoad.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlCreator.idl                     |   10 
 offapi/org/openoffice/vba/Excel/XlCubeFieldType.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlCutCopyMode.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlDVAlterStyle.idl                |   12 
 offapi/org/openoffice/vba/Excel/XlDVType.idl                      |   17 
 offapi/org/openoffice/vba/Excel/XlDataLabelPosition.idl           |   21 
 offapi/org/openoffice/vba/Excel/XlDataLabelSeparator.idl          |   10 
 offapi/org/openoffice/vba/Excel/XlDataLabelsType.idl              |   15 
 offapi/org/openoffice/vba/Excel/XlDataSeriesDate.idl              |   13 
 offapi/org/openoffice/vba/Excel/XlDataSeriesType.idl              |   13 
 offapi/org/openoffice/vba/Excel/XlDeleteShiftDirection.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlDirection.idl                   |   13 
 offapi/org/openoffice/vba/Excel/XlDisplayBlanksAs.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlDisplayDrawingObjects.idl       |   12 
 offapi/org/openoffice/vba/Excel/XlDisplayUnit.idl                 |   18 
 offapi/org/openoffice/vba/Excel/XlEditionFormat.idl               |   10 
 offapi/org/openoffice/vba/Excel/XlEditionOptionsOption.idl        |   17 
 offapi/org/openoffice/vba/Excel/XlEditionType.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlEnableCancelKey.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlEnableSelection.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlEndStyleCap.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlErrorBarDirection.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlErrorBarInclude.idl             |   13 
 offapi/org/openoffice/vba/Excel/XlErrorBarType.idl                |   14 
 offapi/org/openoffice/vba/Excel/XlErrorChecks.idl                 |   17 
 offapi/org/openoffice/vba/Excel/XlFileAccess.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlFileFormat.idl                  |   52 
 offapi/org/openoffice/vba/Excel/XlFillWith.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlFilterAction.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlFindLookIn.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlFormControl.idl                 |   19 
 offapi/org/openoffice/vba/Excel/XlFormatConditionOperator.idl     |   17 
 offapi/org/openoffice/vba/Excel/XlFormatConditionType.idl         |   11 
 offapi/org/openoffice/vba/Excel/XlFormulaLabel.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlHAlign.idl                      |   17 
 offapi/org/openoffice/vba/Excel/XlHebrewModes.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlHighlightChangesTime.idl        |   12 
 offapi/org/openoffice/vba/Excel/XlHtmlType.idl                    |   13 
 offapi/org/openoffice/vba/Excel/XlIMEMode.idl                     |   20 
 offapi/org/openoffice/vba/Excel/XlImportDataAs.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlInsertFormatOrigin.idl          |   11 
 offapi/org/openoffice/vba/Excel/XlInsertShiftDirection.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlLayoutFormType.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlLegendPosition.idl              |   14 
 offapi/org/openoffice/vba/Excel/XlLineStyle.idl                   |   17 
 offapi/org/openoffice/vba/Excel/XlLink.idl                        |   13 
 offapi/org/openoffice/vba/Excel/XlLinkInfo.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlLinkInfoType.idl                |   12 
 offapi/org/openoffice/vba/Excel/XlLinkStatus.idl                  |   20 
 offapi/org/openoffice/vba/Excel/XlLinkType.idl                    |   11 
 offapi/org/openoffice/vba/Excel/XlListConflict.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlListDataType.idl                |   22 
 offapi/org/openoffice/vba/Excel/XlListObjectSourceType.idl        |   12 
 offapi/org/openoffice/vba/Excel/XlLocationInTable.idl             |   22 
 offapi/org/openoffice/vba/Excel/XlLookAt.idl                      |   11 
 offapi/org/openoffice/vba/Excel/XlMSApplication.idl               |   16 
 offapi/org/openoffice/vba/Excel/XlMailSystem.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlMarkerStyle.idl                 |   21 
 offapi/org/openoffice/vba/Excel/XlMouseButton.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlMousePointer.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlOLEType.idl                     |   12 
 offapi/org/openoffice/vba/Excel/XlOLEVerb.idl                     |   11 
 offapi/org/openoffice/vba/Excel/XlObjectSize.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlOrder.idl                       |   11 
 offapi/org/openoffice/vba/Excel/XlOrientation.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlPTSelectionMode.idl             |   16 
 offapi/org/openoffice/vba/Excel/XlPageBreak.idl                   |   12 
 offapi/org/openoffice/vba/Excel/XlPageBreakExtent.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlPageOrientation.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlPaperSize.idl                   |   50 
 offapi/org/openoffice/vba/Excel/XlParameterDataType.idl           |   30 
 offapi/org/openoffice/vba/Excel/XlParameterType.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlPasteSpecialOperation.idl       |   14 
 offapi/org/openoffice/vba/Excel/XlPasteType.idl                   |   19 
 offapi/org/openoffice/vba/Excel/XlPattern.idl                     |   29 
 offapi/org/openoffice/vba/Excel/XlPhoneticAlignment.idl           |   13 
 offapi/org/openoffice/vba/Excel/XlPictureAppearance.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlPictureConvertorType.idl        |   22 
 offapi/org/openoffice/vba/Excel/XlPivotCellType.idl               |   19 
 offapi/org/openoffice/vba/Excel/XlPivotFieldCalculation.idl       |   18 
 offapi/org/openoffice/vba/Excel/XlPivotFieldDataType.idl          |   12 
 offapi/org/openoffice/vba/Excel/XlPivotFieldOrientation.idl       |   14 
 offapi/org/openoffice/vba/Excel/XlPivotFormatType.idl             |   31 
 offapi/org/openoffice/vba/Excel/XlPivotTableMissingItems.idl      |   12 
 offapi/org/openoffice/vba/Excel/XlPivotTableSourceType.idl        |   14 
 offapi/org/openoffice/vba/Excel/XlPivotTableVersionList.idl       |   12 
 offapi/org/openoffice/vba/Excel/XlPlacement.idl                   |   12 
 offapi/org/openoffice/vba/Excel/XlPlatform.idl                    |   11 
 offapi/org/openoffice/vba/Excel/XlPrintErrors.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlPrintLocation.idl               |   13 
 offapi/org/openoffice/vba/Excel/XlPriority.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlQueryType.idl                   |   15 
 offapi/org/openoffice/vba/Excel/XlRangeAutoFormat.idl             |   53 
 offapi/org/openoffice/vba/Excel/XlRangeValueDataType.idl          |   12 
 offapi/org/openoffice/vba/Excel/XlReferenceStyle.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlReferenceType.idl               |   13 
 offapi/org/openoffice/vba/Excel/XlRobustConnect.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlRoutingSlipDelivery.idl         |   11 
 offapi/org/openoffice/vba/Excel/XlRoutingSlipStatus.idl           |   12 
 offapi/org/openoffice/vba/Excel/XlRowCol.idl                      |   11 
 offapi/org/openoffice/vba/Excel/XlRunAutoMacro.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlSaveAction.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlSaveAsAccessMode.idl            |   12 
 offapi/org/openoffice/vba/Excel/XlSaveConflictResolution.idl      |   12 
 offapi/org/openoffice/vba/Excel/XlScaleType.idl                   |   11 
 offapi/org/openoffice/vba/Excel/XlSearchDirection.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlSearchOrder.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlSearchWithin.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlSheetType.idl                   |   14 
 offapi/org/openoffice/vba/Excel/XlSheetVisibility.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlSizeRepresents.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlSmartTagControlType.idl         |   23 
 offapi/org/openoffice/vba/Excel/XlSmartTagDisplayMode.idl         |   12 
 offapi/org/openoffice/vba/Excel/XlSortDataOption.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlSortMethod.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlSortMethodOld.idl               |   11 
 offapi/org/openoffice/vba/Excel/XlSortOrder.idl                   |   11 
 offapi/org/openoffice/vba/Excel/XlSortOrientation.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlSortType.idl                    |   11 
 offapi/org/openoffice/vba/Excel/XlSourceType.idl                  |   17 
 offapi/org/openoffice/vba/Excel/XlSpeakDirection.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlSpecialCellsValue.idl           |   13 
 offapi/org/openoffice/vba/Excel/XlSubscribeToFormat.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlSubtototalLocationType.idl      |   11 
 offapi/org/openoffice/vba/Excel/XlSummaryColumn.idl               |   11 
 offapi/org/openoffice/vba/Excel/XlSummaryReportType.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlSummaryRow.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlTabPosition.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlTextParsingType.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlTextQualifier.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlTextVisualLayoutType.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlTickLabelOrientation.idl        |   14 
 offapi/org/openoffice/vba/Excel/XlTickLabelPosition.idl           |   13 
 offapi/org/openoffice/vba/Excel/XlTimeMark.idl                    |   13 
 offapi/org/openoffice/vba/Excel/XlTimeUnit.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlToolbarProtection.idl           |   15 
 offapi/org/openoffice/vba/Excel/XlTotalsCalculation.idl           |   18 
 offapi/org/openoffice/vba/Excel/XlTrendlineType.idl               |   15 
 offapi/org/openoffice/vba/Excel/XlUnderlineStyle.idl              |   14 
 offapi/org/openoffice/vba/Excel/XlUpdateLinks.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlVAlign.idl                      |   14 
 offapi/org/openoffice/vba/Excel/XlWBATemplate.idl                 |   14 
 offapi/org/openoffice/vba/Excel/XlWebFormatting.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlWebSectionType.idl              |   12 
 offapi/org/openoffice/vba/Excel/XlWindowState.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlWindowType.idl                  |   13 
 offapi/org/openoffice/vba/Excel/XlWindowView.idl                  |   10 
 offapi/org/openoffice/vba/Excel/XlXLMMacroType.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlXmlExportResult.idl             |   10 
 offapi/org/openoffice/vba/Excel/XlXmlImportResult.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlXmlLoadOption.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlYesNoGuess.idl                  |   12 
 offapi/org/openoffice/vba/Excel/makefile.mk                       |  217 
 offapi/org/openoffice/vba/MSFormReturnTypes.idl                   |   25 
 offapi/org/openoffice/vba/XApplication.idl                        |   49 
 offapi/org/openoffice/vba/XArrayWrapper.idl                       |   26 
 offapi/org/openoffice/vba/XBorder.idl                             |   29 
 offapi/org/openoffice/vba/XBorders.idl                            |   27 
 offapi/org/openoffice/vba/XCharacters.idl                         |   32 
 offapi/org/openoffice/vba/XChart.idl                              |   26 
 offapi/org/openoffice/vba/XChartObject.idl                        |   27 
 offapi/org/openoffice/vba/XChartObjects.idl                       |   30 
 offapi/org/openoffice/vba/XCollection.idl                         |   28 
 offapi/org/openoffice/vba/XComment.idl                            |   38 
 offapi/org/openoffice/vba/XComments.idl                           |   24 
 offapi/org/openoffice/vba/XDialog.idl                             |   28 
 offapi/org/openoffice/vba/XDialogs.idl                            |   26 
 offapi/org/openoffice/vba/XFont.idl                               |   39 
 offapi/org/openoffice/vba/XGlobals.idl                            |   34 
 offapi/org/openoffice/vba/XInterior.idl                           |   27 
 offapi/org/openoffice/vba/XOutline.idl                            |   28 
 offapi/org/openoffice/vba/XPivotCache.idl                         |   25 
 offapi/org/openoffice/vba/XPivotTable.idl                         |   28 
 offapi/org/openoffice/vba/XPivotTables.idl                        |   27 
 offapi/org/openoffice/vba/XRange.idl                              |  104 
 offapi/org/openoffice/vba/XSeries.idl                             |   28 
 offapi/org/openoffice/vba/XSeriesCollection.idl                   |   30 
 offapi/org/openoffice/vba/XVBAToOOEventDescGen.idl                |   20 
 offapi/org/openoffice/vba/XWindow.idl                             |   32 
 offapi/org/openoffice/vba/XWindows.idl                            |   24 
 offapi/org/openoffice/vba/XWorkbook.idl                           |   36 
 offapi/org/openoffice/vba/XWorkbooks.idl                          |   24 
 offapi/org/openoffice/vba/XWorksheet.idl                          |   61 
 offapi/org/openoffice/vba/XWorksheetFunction.idl                  |   26 
 offapi/org/openoffice/vba/XWorksheets.idl                         |   29 
 offapi/org/openoffice/vba/XlBuiltInDialog.idl                     |   35 
 offapi/org/openoffice/vba/XlPasteSpecialOperation.idl             |   29 
 offapi/org/openoffice/vba/XlPasteType.idl                         |   34 
 offapi/org/openoffice/vba/makefile.mk                             |   55 
 offapi/prj/build.lst                                              |    4 
 offapi/prj/d.lst                                                  |    8 
 offapi/util/makefile.mk                                           |    5 
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   13 
 offuh/prj/d.lst                                                   |   15 
 sc/inc/address.hxx                                                |   62 
 sc/inc/cell.hxx                                                   |   25 
 sc/inc/cellsuno.hxx                                               |    3 
 sc/inc/column.hxx                                                 |    3 
 sc/inc/compiler.hrc                                               |    6 
 sc/inc/compiler.hxx                                               |   64 
 sc/inc/document.hxx                                               |   17 
 sc/inc/docuno.hxx                                                 |    1 
 sc/inc/drwlayer.hxx                                               |    4 
 sc/inc/global.hxx                                                 |    1 
 sc/inc/globstr.hrc                                                |    4 
 sc/inc/opcode.hxx                                                 |    2 
 sc/inc/rangelst.hxx                                               |    6 
 sc/inc/rangeutl.hxx                                               |   19 
 sc/inc/reffind.hxx                                                |    8 
 sc/inc/sc.hrc                                                     |    9 
 sc/inc/scfuncs.hrc                                                |    2 
 sc/inc/shapeuno.hxx                                               |    9 
 sc/inc/sortparam.hxx                                              |    1 
 sc/inc/table.hxx                                                  |    0 
 sc/inc/userdat.hxx                                                |   16 
 sc/prj/build.lst                                                  |    3 
 sc/sdi/docsh.sdi                                                  |    1 
 sc/sdi/drawsh.sdi                                                 |    6 
 sc/sdi/scalc.sdi                                                  |  128 
 sc/source/core/data/attrib.cxx                                    |    1 
 sc/source/core/data/cell.cxx                                      |   21 
 sc/source/core/data/cell2.cxx                                     |   16 
 sc/source/core/data/column3.cxx                                   |   17 
 sc/source/core/data/conditio.cxx                                  |    2 
 sc/source/core/data/documen2.cxx                                  |    1 
 sc/source/core/data/documen3.cxx                                  |   10 
 sc/source/core/data/documen4.cxx                                  |    4 
 sc/source/core/data/drwlayer.cxx                                  |   19 
 sc/source/core/data/sortparam.cxx                                 |    1 
 sc/source/core/data/table1.cxx                                    |    0 
 sc/source/core/data/table6.cxx                                    |    4 
 sc/source/core/data/userdat.cxx                                   |   16 
 sc/source/core/data/validat.cxx                                   |    0 
 sc/source/core/inc/interpre.hxx                                   |    2 
 sc/source/core/src/compiler.src                                   |   14 
 sc/source/core/tool/address.cxx                                   |  668 ++
 sc/source/core/tool/chgtrack.cxx                                  |    2 
 sc/source/core/tool/compiler.cxx                                  |  657 ++
 sc/source/core/tool/interpr1.cxx                                  |  103 
 sc/source/core/tool/interpr4.cxx                                  |    2 
 sc/source/core/tool/rangelst.cxx                                  |   18 
 sc/source/core/tool/rangenam.cxx                                  |   30 
 sc/source/core/tool/rangeutl.cxx                                  |   51 
 sc/source/core/tool/reffind.cxx                                   |    6 
 sc/source/filter/excel/excdoc.cxx                                 |    2 
 sc/source/filter/excel/excform.cxx                                |    6 
 sc/source/filter/excel/excimp8.cxx                                |    6 
 sc/source/filter/excel/impop.cxx                                  |    8 
 sc/source/filter/excel/makefile.mk                                |    4 
 sc/source/filter/excel/read.cxx                                   |    1 
 sc/source/filter/excel/xicontent.cxx                              |   18 
 sc/source/filter/excel/xiescher.cxx                               |  159 
 sc/source/filter/excel/xistyle.cxx                                |   64 
 sc/source/filter/excel/xlformula.cxx                              |    6 
 sc/source/filter/excel/xlocx.cxx                                  |  145 
 sc/source/filter/inc/excimp8.hxx                                  |    1 
 sc/source/filter/inc/xcl97dum.hxx                                 |   11 
 sc/source/filter/inc/xcl97rec.hxx                                 |   14 
 sc/source/filter/inc/xicontent.hxx                                |    1 
 sc/source/filter/inc/xiescher.hxx                                 |   10 
 sc/source/filter/inc/xistyle.hxx                                  |    2 
 sc/source/filter/inc/xlocx.hxx                                    |   11 
 sc/source/filter/lotus/lotform.cxx                                |    4 
 sc/source/filter/xcl97/xcl97dum.cxx                               |   20 
 sc/source/filter/xcl97/xcl97rec.cxx                               |   22 
 sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx            |    6 
 sc/source/filter/xml/XMLConverter.cxx                             |    6 
 sc/source/ui/Accessibility/AccessibleCellBase.cxx                 |    1 
 sc/source/ui/app/inputhdl.cxx                                     |   39 
 sc/source/ui/attrdlg/condfrmt.cxx                                 |    2 
 sc/source/ui/docshell/docfunc.cxx                                 |   36 
 sc/source/ui/drawfunc/drawsh.cxx                                  |  130 
 sc/source/ui/drawfunc/drawsh2.cxx                                 |   14 
 sc/source/ui/drawfunc/drawsh5.cxx                                 |   18 
 sc/source/ui/drawfunc/fudraw.cxx                                  |   19 
 sc/source/ui/drawfunc/fusel.cxx                                   |   81 
 sc/source/ui/drawfunc/objdraw.src                                 |   56 
 sc/source/ui/inc/colrowba.hxx                                     |    2 
 sc/source/ui/inc/docfunc.hxx                                      |    2 
 sc/source/ui/inc/drawsh.hxx                                       |    2 
 sc/source/ui/inc/transobj.hxx                                     |    0 
 sc/source/ui/inc/undoblk.hxx                                      |    1 
 sc/source/ui/inc/undotab.hxx                                      |   20 
 sc/source/ui/src/globstr.src                                      |   12 
 sc/source/ui/src/sc.src                                           |    6 
 sc/source/ui/src/scfuncs.src                                      |  136 
 sc/source/ui/undo/undotab.cxx                                     |   57 
 sc/source/ui/unoobj/appluno.cxx                                   |   36 
 sc/source/ui/unoobj/cellsuno.cxx                                  |    9 
 sc/source/ui/unoobj/docuno.cxx                                    |   42 
 sc/source/ui/unoobj/makefile.mk                                   |    4 
 sc/source/ui/unoobj/shapeuno.cxx                                  |  162 
 sc/source/ui/vba/makefile.mk                                      |   60 
 sc/source/ui/vba/vbaapplication.cxx                               |  321 +
 sc/source/ui/vba/vbaapplication.hxx                               |   48 
 sc/source/ui/vba/vbaarraywrapper.cxx                              |   22 
 sc/source/ui/vba/vbaarraywrapper.hxx                              |   20 
 sc/source/ui/vba/vbaborders.cxx                                   |  366 +
 sc/source/ui/vba/vbaborders.hxx                                   |   49 
 sc/source/ui/vba/vbacharacters.cxx                                |   87 
 sc/source/ui/vba/vbacharacters.hxx                                |   45 
 sc/source/ui/vba/vbachart.cxx                                     |   29 
 sc/source/ui/vba/vbachart.hxx                                     |   23 
 sc/source/ui/vba/vbachartobject.cxx                               |   74 
 sc/source/ui/vba/vbachartobject.hxx                               |   24 
 sc/source/ui/vba/vbachartobjects.cxx                              |   52 
 sc/source/ui/vba/vbachartobjects.hxx                              |   29 
 sc/source/ui/vba/vbacollectionimpl.cxx                            |  106 
 sc/source/ui/vba/vbacollectionimpl.hxx                            |   72 
 sc/source/ui/vba/vbacomment.cxx                                   |  198 
 sc/source/ui/vba/vbacomment.hxx                                   |   49 
 sc/source/ui/vba/vbacomments.cxx                                  |   58 
 sc/source/ui/vba/vbacomments.hxx                                  |   31 
 sc/source/ui/vba/vbadialog.cxx                                    |  104 
 sc/source/ui/vba/vbadialog.hxx                                    |   35 
 sc/source/ui/vba/vbadialogs.cxx                                   |   69 
 sc/source/ui/vba/vbadialogs.hxx                                   |   34 
 sc/source/ui/vba/vbafont.cxx                                      |  323 +
 sc/source/ui/vba/vbafont.hxx                                      |   56 
 sc/source/ui/vba/vbaglobals.cxx                                   |  203 
 sc/source/ui/vba/vbaglobals.hxx                                   |   54 
 sc/source/ui/vba/vbahelper.cxx                                    |  371 +
 sc/source/ui/vba/vbahelper.hxx                                    |   41 
 sc/source/ui/vba/vbainterior.cxx                                  |   98 
 sc/source/ui/vba/vbainterior.hxx                                  |   37 
 sc/source/ui/vba/vbaobj.xml                                       |   26 
 sc/source/ui/vba/vbaoutline.cxx                                   |   20 
 sc/source/ui/vba/vbaoutline.hxx                                   |   24 
 sc/source/ui/vba/vbapalette.cxx                                   |   72 
 sc/source/ui/vba/vbapalette.hxx                                   |   20 
 sc/source/ui/vba/vbapivotcache.cxx                                |   16 
 sc/source/ui/vba/vbapivotcache.hxx                                |   22 
 sc/source/ui/vba/vbapivottable.cxx                                |   16 
 sc/source/ui/vba/vbapivottable.hxx                                |   20 
 sc/source/ui/vba/vbapivottables.cxx                               |   49 
 sc/source/ui/vba/vbapivottables.hxx                               |   35 
 sc/source/ui/vba/vbarange.cxx                                     | 2566 ++++++++++
 sc/source/ui/vba/vbarange.hxx                                     |  204 
 sc/source/ui/vba/vbaseriescollection.cxx                          |   73 
 sc/source/ui/vba/vbaseriescollection.hxx                          |   33 
 sc/source/ui/vba/vbawindow.cxx                                    |  308 +
 sc/source/ui/vba/vbawindow.hxx                                    |   33 
 sc/source/ui/vba/vbawindows.cxx                                   |  209 
 sc/source/ui/vba/vbawindows.hxx                                   |   37 
 sc/source/ui/vba/vbaworkbook.cxx                                  |  220 
 sc/source/ui/vba/vbaworkbook.hxx                                  |   47 
 sc/source/ui/vba/vbaworkbooks.cxx                                 |  377 +
 sc/source/ui/vba/vbaworkbooks.hxx                                 |   39 
 sc/source/ui/vba/vbaworksheet.cxx                                 |  537 ++
 sc/source/ui/vba/vbaworksheet.hxx                                 |   84 
 sc/source/ui/vba/vbaworksheets.cxx                                |  275 +
 sc/source/ui/vba/vbaworksheets.hxx                                |   51 
 sc/source/ui/vba/vbawsfunction.cxx                                |  104 
 sc/source/ui/vba/vbawsfunction.hxx                                |   33 
 sc/source/ui/view/colrowba.cxx                                    |    9 
 sc/source/ui/view/gridwin5.cxx                                    |   22 
 sc/source/ui/view/tabvwshf.cxx                                    |   18 
 sc/source/ui/view/viewfunc.cxx                                    |    2 
 sc/uiconfig/scalc/menubar/menubar.xml                             |    1 
 sc/util/makefile.mk                                               |    4 
 sc/util/vbaobj.map                                                |   10 
 scp2/source/ooo/file_library_ooo.scp                              |   18 
 scp2/source/ooo/makefile.mk                                       |    4 
 scripting/prj/build.lst                                           |    3 
 scripting/source/vbaevents/eventhelper.cxx                        |  998 +++
 scripting/source/vbaevents/makefile.mk                            |   50 
 scripting/source/vbaevents/service.cxx                            |   99 
 scripting/source/vbaevents/vbaevents.map                          |   10 
 scripting/source/vbaevents/vbaevents.xml                          |   26 
 source/classes/sbunoobj.cxx                                       |   60 
 source/comp/dim.cxx                                               |    2 
 source/comp/parser.cxx                                            |    2 
 source/inc/parser.hxx                                             |    2 
 source/inc/runtime.hxx                                            |   51 
 source/runtime/step1.cxx                                          |   72 
 source/runtime/step2.cxx                                          |   72 
 stoc/source/registry_tdprovider/makefile.mk                       |    4 
 stoc/source/registry_tdprovider/rdbtdp.xml                        |    1 
 stoc/source/registry_tdprovider/tdprovider.cxx                    |  167 
 stoc/source/tdmanager/makefile.mk                                 |    4 
 stoc/source/tdmanager/tdmgr.cxx                                   |   48 
 stoc/source/tdmanager/tdmgr.xml                                   |    1 
 svx/source/form/fmundo.cxx                                        |  110 
 svx/source/form/makefile.mk                                       |    4 
 svx/source/inc/fmundo.hxx                                         |    4 
 svx/source/msfilter/svxmsbas.cxx                                  |    1 
 unoil/util/makefile.mk                                            |    4 
 xmloff/inc/shapeexport.hxx                                        |    5 
 xmloff/source/draw/eventimp.cxx                                   |  416 -
 xmloff/source/draw/shapeexport.cxx                                |    3 
 xmloff/source/draw/shapeexport2.cxx                               |  450 -
 469 files changed, 19654 insertions(+), 1124 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 ooobuild.VBAObjects.patch
Index: ooobuild.VBAObjects.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/ooobuild.VBAObjects.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ooobuild.VBAObjects.patch	12 Jul 2006 10:45:28 -0000	1.1
+++ ooobuild.VBAObjects.patch	14 Aug 2006 13:53:25 -0000	1.2
@@ -1,32 +1,3 @@
-Index: basic/source/comp/exprtree.cxx
-===================================================================
-RCS file: /cvs/script/basic/source/comp/exprtree.cxx,v
-retrieving revision 1.13
-diff -u -p -r1.13 exprtree.cxx
---- basic/source/comp/exprtree.cxx	7 Apr 2006 14:01:45 -0000	1.13
-+++ basic/source/comp/exprtree.cxx	9 May 2006 16:37:18 -0000
-@@ -117,9 +117,19 @@ static BOOL DoParametersFollow( SbiParse
- 	// Aber nur, wenn CALL-aehnlich!
- 	if( !p->WhiteSpace() || eCurExpr != SbSYMBOL )
- 		return FALSE;
--	return BOOL(
-+	if (
- 		   eTok == NUMBER || eTok == FIXSTRING
--		|| eTok == SYMBOL || eTok == COMMA  || eTok == DOT );
-+		|| eTok == SYMBOL || eTok == COMMA  || eTok == DOT )
-+		return TRUE;
-+	else // check for default params with reserved names ( e.g. names of tokens )
-+	{
-+		SbiTokenizer tokens( *(SbiTokenizer*)p );
-+		// Urk the Next() / Peek() symantics are... weird
-+		tokens.Next();
-+		if ( tokens.Peek() == ASSIGN )
-+			return TRUE;
-+	}
-+	return FALSE;
- }
- 
- // Definition eines neuen Symbols
 diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
 --- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/core/data/drwlayer.cxx	2006-06-14 17:46:55.000000000 +0100
 +++ sc/source/core/data/drwlayer.cxx	2006-06-19 10:54:51.000000000 +0100
@@ -89,13 +60,12 @@
 diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx
 --- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/excel/xiescher.cxx	2006-06-14 17:46:55.000000000 +0100
 +++ sc/source/filter/excel/xiescher.cxx	2006-06-19 11:07:24.000000000 +0100
-@@ -187,8 +187,9 @@
- #ifndef SC_XICHART_HXX
- #include "xichart.hxx"
+@@ -195,6 +195,9 @@
+ #ifndef _SCH_MEMCHRT_HXX
+ #include <sch/memchrt.hxx>
  #endif
--
++
 +#include "xicontent.hxx"
- #include "excform.hxx"
 +#include "userdat.hxx"
  
  using ::rtl::OUString;
@@ -757,7 +727,7 @@
 +	ULONG nMarkCount = rMarkList.GetMarkCount();
 +	SdrObject* pSingleSelectedObj = NULL;
 +	if ( nMarkCount > 0 )
-+		pSingleSelectedObj = rMarkList.GetMark( 0 )->GetObj();
++		pSingleSelectedObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
 +	
 +
  	switch ( nSlot )
@@ -1000,7 +970,7 @@
  			}
  			else if( IsXMLToken( aAttrLocalName, XML_LANGUAGE ) )
  			{
-@@ -314,17 +326,20 @@ SdXMLEventContext::SdXMLEventContext( Sv
+@@ -314,16 +326,19 @@ SdXMLEventContext::SdXMLEventContext( Sv
  			if( IsXMLToken( aAttrLocalName, XML_HREF ) )
  			{
  				if ( mbScript )
@@ -1012,7 +982,6 @@
 -					const rtl::OUString &rTmp = 
 -						rImp.GetAbsoluteReference(sValue);
 -					INetURLObject::translateToInternal( rTmp, msBookmark, 
--						INetURLObject::WAS_ENCODED, 
 -						INetURLObject::DECODE_UNAMBIGUOUS, 
 -						RTL_TEXTENCODING_UTF8 );
 +					if ( !mbShapeAction )
@@ -1020,7 +989,6 @@
 +						const rtl::OUString &rTmp = 
 +							rImp.GetAbsoluteReference(sValue);
 +						INetURLObject::translateToInternal( rTmp, msBookmark, 
-+							INetURLObject::WAS_ENCODED, 
 +							INetURLObject::DECODE_UNAMBIGUOUS, 
 +							RTL_TEXTENCODING_UTF8 );
 +					}
@@ -1029,7 +997,7 @@
  				}
  			}
  			break;
-@@ -344,31 +359,164 @@ SvXMLImportContext * SdXMLEventContext::
+@@ -344,31 +359,166 @@ SvXMLImportContext * SdXMLEventContext::
  	return new XMLEventSoundContext( GetImport(), nPrefix, rLocalName, xAttrList, this );
  }
  
@@ -1135,6 +1103,8 @@
 +	case ClickAction_VANISH:
 +		nPropertyCount += 4;
 +		break;
++	default:
++		break;
 +	}
  
 -		if( mbScript )
@@ -1210,7 +1180,7 @@
  		switch( meClickAction )
  		{
  		case ClickAction_NONE:
-@@ -379,172 +527,91 @@ void SdXMLEventContext::EndElement()
+@@ -379,179 +527,91 @@ void SdXMLEventContext::EndElement()
  		case ClickAction_INVISIBLE:
  		case ClickAction_STOPPRESENTATION:
  			break;
@@ -1242,6 +1212,8 @@
  		case ClickAction_VANISH:
 -			nPropertyCount += 4;
 -			break;
+-		default:
+-			break;
 -		}
 +			pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Effect") );
 +			pProperties->Handle = -1;
@@ -1432,7 +1404,11 @@
 -				pProperties->Handle = -1;
 -				pProperties->Value <<= mnVerb;
 -				pProperties->State = beans::PropertyState_DIRECT_VALUE;
-+			default:
+-				break;
+-			case ClickAction_MACRO:
+-				DBG_ERROR("xmloff::SdXMLEventContext::EndElement(), ClickAction_MACRO must be handled in different if case");
+-				break;
+ 			default:
  				break;
 -			}
  		}
@@ -1447,7 +1423,7 @@
 diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/shapeexport2.cxx xmloff/source/draw/shapeexport2.cxx
 --- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/shapeexport2.cxx	2006-04-26 15:10:26.000000000 +0100
 +++ xmloff/source/draw/shapeexport2.cxx	2006-06-19 12:19:23.000000000 +0100
-@@ -352,274 +352,304 @@ void XMLShapeExport::ImpExportText( cons
+@@ -352,272 +352,302 @@ void XMLShapeExport::ImpExportText( cons
  #define FOUND_EVENTTYPE		0x0080
  #define FOUND_MACRO			0x0100
  #define FOUND_LIBRARY		0x0200
@@ -1463,7 +1439,7 @@
 +	presentation::AnimationEffect eEffect;
 +	presentation::AnimationSpeed eSpeed;
 +	OUString aStrSoundURL;
-+	sal_Bool bPlayFull;
++	sal_Bool bPlayFull = false;
 +	sal_Int32 nVerb;
 +	OUString aStrMacro;
 +	OUString aStrLibrary;
@@ -1554,14 +1530,14 @@
  
 -		sal_Int32 nFound = 0;
 -		const beans::PropertyValue* pProperties = aProperties.getConstArray();
-+		SvXMLElementExport aEventsElemt(rExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
++		SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
  
 -		OUString aStrEventType;
 -		presentation::ClickAction eClickAction;
 -		presentation::AnimationEffect eEffect;
 -		presentation::AnimationSpeed eSpeed;
 -		OUString aStrSoundURL;
--		sal_Bool bPlayFull;
+-		sal_Bool bPlayFull = false;
 -		sal_Int32 nVerb;
 -		OUString aStrMacro;
 -		OUString aStrLibrary;
@@ -1644,10 +1620,10 @@
 -		if( ( nFound & FOUND_EVENTTYPE ) == 0 )
 -			break;
 +		OUString aEventQName(
-+			rExport.GetNamespaceMap().GetQNameByKey(
++			mrExport.GetNamespaceMap().GetQNameByKey(
 +					XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) );
-+		rExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
-+		rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_ACTION, eStrAction );
++		mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
++		mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_ACTION, eStrAction );
  
 -		if( aStrEventType == msPresentation )
 +		if( eClickAction == presentation::ClickAction_VANISH )
@@ -1665,18 +1641,18 @@
 -				break;
 +				SdXMLImplSetEffect( eEffect, eKind, eDirection, nStartScale, bIn );
  
--			SvXMLElementExport aEventsElemt(rExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
-+				if( eEffect != EK_none )
+-			SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
++				if( eKind != EK_none )
 +				{
[...20460 lines suppressed...]
++++ sc/inc/cellsuno.hxx	2006-07-11 18:59:55.000000000 +0100
+@@ -871,6 +871,9 @@ public:
+ 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL
+ 							getCellRangeByName( const ::rtl::OUString& aRange )
+ 								throw(::com::sun::star::uno::RuntimeException);
++	::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > 
++							getCellRangeByName( const ::rtl::OUString& aRange,  const ScAddress::Details& rDetails )
++								throw(::com::sun::star::uno::RuntimeException);
+ 
+ 							// XPropertySet ueberladen wegen Range-Properties
+ 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
+--- /data4/sles/ooo-build-m6/ooo-build/build/ooc680-m6/sc/source/ui/unoobj/cellsuno.cxx	2006-05-05 10:47:19.000000000 +0100
++++ sc/source/ui/unoobj/cellsuno.cxx	2006-07-11 16:52:13.000000000 +0100
+@@ -4908,9 +4908,16 @@ uno::Reference<table::XCellRange> SAL_CA
+ 	return NULL;
+ }
+ 
++
+ uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByName(
+ 						const rtl::OUString& aName ) throw(uno::RuntimeException)
+ {
++	return getCellRangeByName( aName, ScAddress::detailsOOOa1 ); 
++}
++
++uno::Reference<table::XCellRange>  ScCellRangeObj::getCellRangeByName(
++						const rtl::OUString& aName, const ScAddress::Details& rDetails  ) throw(uno::RuntimeException)
++{
+ 	//	name refers to the whole document (with the range's table as default),
+ 	//	valid only if the range is within this range
+ 
+@@ -4924,7 +4931,7 @@ uno::Reference<table::XCellRange> SAL_CA
+ 		ScRange aCellRange;
+ 		BOOL bFound = FALSE;
+ 		String aString(aName);
+-		USHORT nParse = aCellRange.ParseAny( aString, pDoc );
++		USHORT nParse = aCellRange.ParseAny( aString, pDoc, rDetails );
+ 		if ( nParse & SCA_VALID )
+ 		{
+ 			if ( !(nParse & SCA_TAB_3D) )	// keine Tabelle angegeben -> auf dieser Tabelle
+--- /data4/sles/ooo-build-HEAD/ooo-build/build/src680-m175/sc/source/core/tool/rangelst.cxx	2006-07-17 10:44:27.000000000 +0100
++++ sc/source/core/tool/rangelst.cxx	2006-07-24 16:21:52.000000000 +0100
+@@ -84,10 +84,13 @@ USHORT ScRangeList::Parse( const String&
+ 		}
+ 		else
+ 			nTab = 0;
+-		USHORT nTCount = rStr.GetTokenCount();
++		sal_Unicode cTok = ';';
++		if ( eConv == ScAddress::CONV_XL_A1 )
++			cTok = ',';
++		USHORT nTCount = rStr.GetTokenCount( cTok );
+ 		for ( USHORT i=0; i<nTCount; i++ )
+ 		{
+-			aOne = rStr.GetToken(i);
++			aOne = rStr.GetToken(i, cTok );
+ 			if ( aOne.Search( ':' ) == STRING_NOTFOUND )
+ 			{	// Range muss es sein
+ 				String aStrTmp( aOne );
 Index: sc/source/ui/unoobj/docuno.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/unoobj/docuno.cxx,v
@@ -25419,7 +26598,7 @@
 diff -u -r1.50 docuno.cxx
 --- sc/source/ui/unoobj/docuno.cxx	23 Mar 2005 13:08:32 -0000	1.50
 +++ sc/source/ui/unoobj/docuno.cxx	28 Jul 2005 16:07:27 -0000
-@@ -89,6 +89,9 @@
+@@ -63,6 +63,9 @@
  #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
  #include <com/sun/star/script/XLibraryContainer.hpp>
  #include <com/sun/star/lang/XInitialization.hpp>
@@ -25429,31 +26608,51 @@
  #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
  #include <comphelper/processfactory.hxx>
  #endif
-@@ -126,6 +129,9 @@
+@@ -100,6 +103,10 @@
  #endif
  
  using namespace com::sun::star;
 +#ifdef ENABLE_VBA
 +#define SC_VBA_GLOBALS_PROP "VBAGlobals"
++#define SC_VBA_COLORPALETTE_PROP "ColorPalette"
 +#endif //ENABLE_VBA
  
  //------------------------------------------------------------------------
  
-@@ -164,6 +170,9 @@
+@@ -140,6 +147,10 @@
          {MAP_CHAR_LEN(SC_UNO_RUNTIMEUID),        0, &getCppuType(static_cast< const rtl::OUString * >(0)),    beans::PropertyAttribute::READONLY},
          {MAP_CHAR_LEN(SC_UNO_HASVALIDSIGNATURES),0, &getBooleanCppuType(),                                    beans::PropertyAttribute::READONLY},
  		{MAP_CHAR_LEN("BuildId"),			     0,	&::getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0},
 +#ifdef ENABLE_VBA
 +        {MAP_CHAR_LEN(SC_VBA_GLOBALS_PROP),      0, &getCppuType((uno::Sequence< uno::Any >*)0),              beans::PropertyAttribute::READONLY},
++        {MAP_CHAR_LEN(SC_VBA_COLORPALETTE_PROP),      0, &getCppuType((uno::Reference< container::XIndexAccess >*)0),              beans::PropertyAttribute::READONLY},
 +#endif //ENABLE_VBA
  
  		{0,0,0,0}
  	};
-@@ -1476,6 +1484,26 @@
+@@ -1347,7 +1313,12 @@
+ 		{
+ 			aValue >>= maBuildId;
+ 		}
+-
++#ifdef ENABLE_VBA
++                else if ( aString.EqualsAscii( SC_VBA_COLORPALETTE_PROP  ) )
++                { 
++                        aValue >>= xColorPalette;
++                }
++#endif
+ 		if ( aNewOpt != rOldOpt )
+ 		{
+ 			pDoc->SetDocOptions( aNewOpt );
+@@ -1471,6 +1442,30 @@
  		{
  			aRet <<= maBuildId;
  		}
 +#ifdef ENABLE_VBA
++               else if ( aString.EqualsAscii( SC_VBA_COLORPALETTE_PROP  ) )
++               {
++                       aRet <<= xColorPalette;
++               }
 +		else if ( aString.EqualsAscii( SC_VBA_GLOBALS_PROP ) )
 +		{
 +			uno::Reference < uno::XComponentContext > xCtx;
@@ -25476,6 +26675,16 @@
  	}
  
  	return aRet;
+--- sc/inc/docuno.hxx   2005-11-10 16:36:27.000000000 +0000
++++ sc/inc/docuno.hxx  2006-07-26 17:12:22.000000000 +0100
+@@ -169,6 +169,7 @@ private:
+        com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawMarkerTab;
+        com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawDashTab;
+     com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xChartDataProv;
++    com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> xColorPalette;
+
+        BOOL                                    FillRenderMarkData( const com::sun::star::uno::Any& aSelection,
+                                                                               ScMarkData& rMark, ScPrintSelectionStatus& rStatus ) const;
 Index: sc/source/ui/unoobj/makefile.mk
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/unoobj/makefile.mk,v
@@ -25627,28 +26836,28 @@
  mkdir: %_DEST%\inc%_EXT%\com\sun\star\xml\wrapper
  #i20156 - end
  
-+mkdir: %_DEST%\inc%_EXT%\MSForms
++mkdir: %_DEST%\inc%_EXT%\offuh\MSForms
 +
-+mkdir: %_DEST%\inc%_EXT%\org
-+mkdir: %_DEST%\inc%_EXT%\org\openoffice
-+mkdir: %_DEST%\inc%_EXT%\org\openoffice\vba
-+mkdir: %_DEST%\inc%_EXT%\org\openoffice\vba\Excel
-+
- ..\%__SRC%\inc\com\sun\star\auth\*.hdl %_DEST%\inc%_EXT%\com\sun\star\auth\*.hdl
- ..\%__SRC%\inc\com\sun\star\auth\*.hpp %_DEST%\inc%_EXT%\com\sun\star\auth\*.hpp
- ..\%__SRC%\inc\com\sun\star\accessibility\*.hpp %_DEST%\inc%_EXT%\com\sun\star\accessibility\*.hpp
++mkdir: %_DEST%\inc%_EXT%\offuh\org
++mkdir: %_DEST%\inc%_EXT%\offuh\org\openoffice
++mkdir: %_DEST%\inc%_EXT%\offuh\org\openoffice\vba
++mkdir: %_DEST%\inc%_EXT%\offuh\org\openoffice\vba\Excel
++
+ ..\%__SRC%\inc\offuh\com\sun\star\auth\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\auth\*.hdl
+ ..\%__SRC%\inc\offuh\com\sun\star\auth\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\auth\*.hpp
+ ..\%__SRC%\inc\offuh\com\sun\star\accessibility\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\accessibility\*.hpp
 @@ -319,3 +326,11 @@
- ..\%__SRC%\inc\com\sun\star\xml\wrapper\*.hdl %_DEST%\inc%_EXT%\com\sun\star\xml\wrapper\*.hdl
+ ..\%__SRC%\inc\offuh\com\sun\star\xml\wrapper\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\wrapper\*.hdl
  #i20156 - end
- dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
+ dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib%_EXT%\offuh\*.dylib; fi"
 +
-+..\%__SRC%\inc\MSForms\*.hpp %_DEST%\inc%_EXT%\MSForms\*.hpp
-+..\%__SRC%\inc\MSForms\*.hdl %_DEST%\inc%_EXT%\MSForms\*.hdl
++..\%__SRC%\inc\offuh\MSForms\*.hpp %_DEST%\inc%_EXT%\offuh\MSForms\*.hpp
++..\%__SRC%\inc\offuh\MSForms\*.hdl %_DEST%\inc%_EXT%\offuh\MSForms\*.hdl
 +
-+..\%__SRC%\inc\org\openoffice\vba\*.hpp %_DEST%\inc%_EXT%\org\openoffice\vba\*.hpp
-+..\%__SRC%\inc\org\openoffice\vba\*.hdl %_DEST%\inc%_EXT%\org\openoffice\vba\*.hdl
-+..\%__SRC%\inc\org\openoffice\vba\Excel\*.hpp %_DEST%\inc%_EXT%\org\openoffice\vba\Excel\*.hpp
-+..\%__SRC%\inc\org\openoffice\vba\Excel\*.hdl %_DEST%\inc%_EXT%\org\openoffice\vba\Excel\*.hdl
++..\%__SRC%\inc\offuh\org\openoffice\vba\*.hpp %_DEST%\inc%_EXT%\offuh\org\openoffice\vba\*.hpp
++..\%__SRC%\inc\offuh\org\openoffice\vba\*.hdl %_DEST%\inc%_EXT%\offuh\org\openoffice\vba\*.hdl
++..\%__SRC%\inc\offuh\org\openoffice\vba\Excel\*.hpp %_DEST%\inc%_EXT%\offuh\org\openoffice\vba\Excel\*.hpp
++..\%__SRC%\inc\offuh\org\openoffice\vba\Excel\*.hdl %_DEST%\inc%_EXT%\offuh\org\openoffice\vba\Excel\*.hdl
 Index: offapi/prj/build.lst
 ===================================================================
 RCS file: /cvs/api/offapi/prj/build.lst,v
@@ -25660,10 +26869,10 @@
  oa	offapi\com\sun\star\geometry		    nmake	-	all	oa_geometry NULL
  oa	offapi\com\sun\star\rendering	        nmake	-	all oa_rendering oa_geometry NULL
  oa	offapi\drafts\com\sun\star\form         nmake	-	all	oa_drafts_form NULL
--oa     offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_chart oa_chart2 oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypt!
 o_sax oa_crypto oa_csax oa_wrapper oa_script NULL
+-oa     offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_chart oa_chart2 oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_secur!
 ity oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script NULL
 +oa	offapi\org\openoffice\vba         nmake	-	all	oa_vba NULL
 +oa	offapi\org\openoffice\vba\Excel         nmake	-	all	oa_excel NULL
-+oa     offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_chart oa_chart2 oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypt!
 o_sax oa_crypto oa_csax oa_wrapper oa_script oa_vba oa_excel NULL
++oa     offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_chart oa_chart2 oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbtools oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_secur!
 ity oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script oa_vba oa_excel NULL
 Index: offapi/prj/d.lst
 ===================================================================
 RCS file: /cvs/api/offapi/prj/d.lst,v



From fedora-cvs-commits at redhat.com  Mon Aug 14 14:02:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 10:02:50 -0400
Subject: rpms/kdeutils/FC-5 kdeutils.spec,1.58,1.59 sources,1.34,1.35
Message-ID: <200608141402.k7EE2oHi010065@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeutils.spec sources 
Log Message:
3.5.4



Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-5/kdeutils.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdeutils.spec	21 Jun 2006 09:35:03 -0000	1.58
+++ kdeutils.spec	14 Aug 2006 14:02:46 -0000	1.59
@@ -1,19 +1,16 @@
 %define debug 0
 %define final 0
 %define make_cvs 1
-%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.3
-Release: 0.2.fc5
+Version: 3.5.4
+Release: 0.1.fc5
 Name: kdeutils
 Summary: K Desktop Environment - Utilities
 Epoch: 6
@@ -26,11 +23,18 @@
 Patch1: kdf-3.0.2-label.patch
 Patch2: kde-libtool.patch
 
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: libtool
+BuildRequires: gettext
 BuildRequires: net-snmp-devel
 BuildRequires: libXtst-devel
 BuildRequires: python-devel
@@ -76,170 +80,6 @@
 Development files for kdeutils. Install kdeutils-devel if you wish
 to develop or compile KDE utils applications.
 
-%package -n ark
-Summary: GUI frontend for handling archive files
-Group: Applications/Archiving
-Requires: zip unzip tar
-Obsoletes: kdeutils
-
-%description -n ark
-Ark is a KDE tool for handling archive files.
-It supports the following file formats:
-  zip
-  plain tar and tar with compressors lzop, gzip, bzip2, bzip, compress
-  lha
-  zoo
-  single files compressed with compressors lzop, gzip, bzip2, bzip, compress
-  rar
-  ar
-
-%package -n kcalc
-Summary: KDE pocket calculator
-Group: Applications/Engineering
-Obsoletes: kdeutils
-
-%description -n kcalc
-A KDE pocket calculator.
-
-%package -n kcharselect
-Summary: Character Selector
-Group: User Interface/Desktops
-Requires: kdebase >= %{version}
-Obsoletes: kdeutils
-
-%description -n kcharselect
-KDE Character Selector - allows you to enter characters not found on your
-keyboard.
-
-%package -n kdepasswd
-Summary: KDE frontend to changing your password
-Group: User Interface/Desktops
-Obsoletes: kdeutils
-
-%description -n kdepasswd
-KDE frontend to changing your password and other user data.
-
-%package -n kdessh
-Summary: KDE frontend to ssh
-Group: Applications/Internet
-Requires: openssh-clients
-Obsoletes: kdeutils
-
-%description -n kdessh
-KDE frontend to ssh (Secure Shell, an application to remotely control a
-different Linux or Linux-like system securely).
-
-%package -n kdf
-Summary: Application and KDE applet to monitor available diskspace
-Group: Applications/System
-Requires: kdebase >= %{version}
-Obsoletes: kdeutils
-
-%description -n kdf
-kdeutils-kdf contains the kdf, kwikdisk and kcmdf tools for monitoring
-available diskspace.
-
-%package -n kedit
-Summary: An easy to use text editor
-Group: Applications/Editors
-Requires: kdelibs >= %{version}
-Obsoletes: kdeutils
-
-%description -n kedit
-An easy to use text editor
-
-%package -n kfloppy
-Summary: Floppy disk formatter
-Group: Applications/System
-Requires: kdelibs >= %{version}
-Obsoletes: kdeutils
-
-%description -n kfloppy
-KFloppy formats floppy disks and creates ext2 or DOS filesystems on them.
-
-%package -n khexedit
-Summary: Hex editor
-Group: Applications/Editors
-Requires: kdelibs >= %{version}
-Obsoletes: kdeutils
-
-%description -n khexedit
-A KDE hex editor. It allows you to edit binary files.
-
-%package -n kjots
-Summary: Virtual notepad
-Group: User Interface/Desktops
-Obsoletes: kdeutils
-
-%description -n kjots
-KJots is a virtual notepad - you can put notes on your desktop.
-
-%package laptop
-Summary: Laptop utilities for KDE
-Group: User Interface/Desktops
-Requires: kdebase >= %{version}
-Obsoletes: kdeutils
-
-%description laptop
-Various laptop-related utilities for KDE.
-kdeutils-laptop adds battery monitoring to kicker (the KDE panel) and allows
-you to manage power management and PCMCIA cards from the KDE control center.
-
-%package -n kljettool
-Summary: Configuration tool for LaserJet and similar printers
-Group: Applications/Publishing
-Obsoletes: kdeutils
-
-%description -n kljettool
-A KDE Configuration tool for HP LaserJet and compatible printers.
-
-%package -n klpq
-Summary: KDE tool for managing your print spooler
-Group: Applications/System
-Requires: /usr/bin/lpq
-Obsoletes: kdeutils
-
-%description -n klpq
-A KDE tool for managing your print spooler.
-
-%package -n klprfax
-Summary: Fax sending support for KDE
-Group: Applications/System
-Requires: /usr/bin/lpq
-Requires: kdebase >= %{version}
-Obsoletes: kdeutils
-
-%description -n klprfax
-Fax sending support for KDE.
-kdeutils-klprfax allows any KDE application to treat a fax modem just like
-a printer. Any KDE application that can print will be able to send faxes.
-
-%package -n kregexpeditor
-Summary: Regular Expressions Editor
-Group: Applications/System
-Requires: kdelibs >= %{version}
-Obsoletes: kdeutils
-
-%description -n kregexpeditor
-A Regular Expressions Editor.
-
-%package -n kregexpeditor-devel
-Summary: Development files for kregexpeditor
-Group: Development/Libraries
-Obsoletes: kdeutils
-
-%description -n kregexpeditor-devel
-Development files for kregexpeditor
-
-%package -n ktimer
-Summary: A timer (stop watch).
-Group: User Interface/Desktops
-Requires: kdelibs >= %{version}
-Obsoletes: kdeutils
-
-%description -n ktimer
-A timer (stop watch).
-
 %prep
 %setup -q
 %patch1 -p1 -b .label
@@ -257,9 +97,7 @@
    --disable-dependency-tracking \
    --disable-rpath \
    --with-qt-libraries=$QTDIR/lib \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -267,9 +105,6 @@
 %if %{final}
    --enable-final \
 %endif
-%if %{arts} == 0
-   --without-arts \
-%endif
    --includedir=%{_includedir}/kde \
    --with-snmp
 
@@ -302,16 +137,16 @@
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -339,6 +174,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.1.fc5
+- 3.5.4
+
 * Wed Jun 21 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
 - add BR: gmp-devel #196051
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	12 Jun 2006 21:26:45 -0000	1.34
+++ sources	14 Aug 2006 14:02:47 -0000	1.35
@@ -1 +1 @@
-b3d792c21e9a72bf8a82c5756fcd742d  kdeutils-3.5.3.tar.bz2
+e24cd91576db3d2414fb30cab47e44e5  kdeutils-3.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 14:08:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 10:08:14 -0400
Subject: rpms/libgtk-java/FC-5 .cvsignore, 1.18, 1.19 libgtk-java.spec, 1.49,
	1.50 sources, 1.18, 1.19
Message-ID: <200608141408.k7EE8EDe012170@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11914

Modified Files:
	.cvsignore libgtk-java.spec sources 
Log Message:
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel subpackage.
- The -devel subpackage now requires several -devel packages.
- Update requires and buildrequires.
- Implement a temporary workaround for #197460.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/FC-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Jun 2006 21:12:08 -0000	1.18
+++ .cvsignore	14 Aug 2006 14:08:11 -0000	1.19
@@ -1 +1 @@
-libgtk-java-2.8.5.tar.bz2
+libgtk-java-2.8.6.tar.bz2


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/FC-5/libgtk-java.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libgtk-java.spec	12 Jul 2006 15:41:12 -0000	1.49
+++ libgtk-java.spec	14 Aug 2006 14:08:11 -0000	1.50
@@ -10,12 +10,15 @@
 %{!?c_pkg_prefix: %define c_pkg_prefix %{nil}}
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
+# FIXME: temporary workaround to fix bug #197460:
+%define __perl_provides %{nil}
+
 %define	name_base 	libgtk-java
 
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	2.8.5
-Release: 	0.fc5.1
+Version:	2.8.6
+Release: 	2%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -24,10 +27,10 @@
 BuildRoot:	%{_tmppath}/%{name_base}-%{version}-root
 
 Requires:	%{c_pkg_prefix}gtk2 >= 2.8.0
-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
+Requires:	%{java_pkg_prefix}cairo-java >= 1.0.5
+Requires:       %{java_pkg_prefix}glib-java >= 0.2.6
+BuildRequires:  %{java_pkg_prefix}cairo-java-devel >= 1.0.5
+BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.6
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0
 BuildRequires:  java-devel >= 1.4.2, gcc-java >= 4.1.1, docbook-utils
 
@@ -41,10 +44,12 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	gtk2-devel
+Requires:	cairo-java-devel
+Requires:	glib-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
+Development part of %{name}.
 
 %prep
 
@@ -60,7 +65,7 @@
 
 %configure
 
-make 
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -78,7 +83,7 @@
 %install
 rm -rf %{buildroot}
 
-make  DESTDIR=$RPM_BUILD_ROOT  install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT  install
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name}' ] ; then
@@ -105,22 +110,36 @@
 
 %files
 %defattr(-,root,root)
-%doc doc/api AUTHORS COPYING INSTALL README NEWS  THANKS FAQ.html doc/examples
+%doc doc/api AUTHORS COPYING INSTALL README NEWS THANKS FAQ.html doc/examples
 %dir %{_includedir}/%{name_base}
 %{_includedir}/%{name_base}/*
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 %dir %{_datadir}/%{name_base}
 %{_datadir}/%{name_base}/*
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.8.6-2
+- Implement a temporary workaround for #197460.
+
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.8.6-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel subpackage.
+- The -devel subpackage now requires several -devel packages.
+- Update requires and buildrequires.
+
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.8.5-2
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.8.5-1
 - Release 0 is not allowed.
 
@@ -160,7 +179,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.
+- 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


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	17 Jun 2006 21:12:08 -0000	1.18
+++ sources	14 Aug 2006 14:08:11 -0000	1.19
@@ -1 +1 @@
-5d363e03e22000b89a8facb9d6042da3  libgtk-java-2.8.5.tar.bz2
+230b62c4b69667245214788b43ea79af  libgtk-java-2.8.6.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 14:18:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 10:18:00 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch, NONE,
	1.1 openoffice.org.spec, 1.843, 1.844
Message-ID: <200608141418.k7EEI03t026572@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch 
Log Message:
need openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch

openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch:
 inc/settings.mk        |    0 
 solenv/inc/settings.mk |    4 ----
 2 files changed, 4 deletions(-)

--- NEW FILE openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch ---
Index: inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.199
diff -u -r1.199 settings.mk
--- openoffice.org.orig/solenv/inc/settings.mk	21 Jul 2006 10:38:35 -0000	1.199
+++ openoffice.org/solenv/inc/settings.mk	14 Aug 2006 14:16:11 -0000
@@ -1242,10 +1242,6 @@
 CFLAGSCC+=$(CFLAGSWALLCC)
 CFLAGSCXX+=$(CFLAGSWALLCXX)
 .ENDIF
-.IF "$(COMPILER_WARN_ERRORS)"!="" && "$(EXTERNAL_WARNINGS_NOT_ERRORS)"==""
-CFLAGSCC+=$(CFLAGSWERRCC)
-CFLAGSCXX+=$(CFLAGSWERRCXX)
-.ENDIF
 .ELSE			# "$(ENVWARNFLAGS)"==""
 CFLAGSAPPEND+=$(ENVWARNFLAGS)
 .ENDIF			# "$(ENVWARNFLAGS)"==""


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.843
retrieving revision 1.844
diff -u -r1.843 -r1.844
--- openoffice.org.spec	14 Aug 2006 11:58:59 -0000	1.843
+++ openoffice.org.spec	14 Aug 2006 14:17:57 -0000	1.844
@@ -118,6 +118,7 @@
 Patch50: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
 Patch51: openoffice.org-2.0.3.ooo68383.evo28support.patch
 Patch52: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch53: openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -971,6 +972,7 @@
 %patch50 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
 %patch51 -p1 -b .ooo68383.evo28support.patch
 %patch52 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch53 -p1 -b .oooXXXXX.solenv.warnnoterror.patch
 
 tar xzf %{SOURCE1}
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 14:18:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 10:18:24 -0400
Subject: rpms/kdevelop/FC-5 kdevelop.spec,1.48,1.49 sources,1.33,1.34
Message-ID: <200608141418.k7EEIOrM030268@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdevelop.spec sources 
Log Message:
3.3.4



Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-5/kdevelop.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdevelop.spec	12 Jun 2006 22:26:14 -0000	1.48
+++ kdevelop.spec	14 Aug 2006 14:18:21 -0000	1.49
@@ -1,23 +1,21 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.5.3
-%define qt_version 3.3.5
+%define kde_version 3.5.4
+%define qt_version 3.3.6
 %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.3
+Version: 3.3.4
 Release: 0.1.fc5
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -27,19 +25,29 @@
 Patch2: kde-libtool.patch
 Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch
 
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 Requires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
 Requires: make
-Requires: perl >= 0:5.004
+Requires: perl
 Requires: libtool
+Requires: automake
+Requires: autoconf
 Requires: flex >= 2.5.4
 Requires: qt-designer
 Requires: ctags
 Requires: kdelibs-apidocs
+Requires: gettext
 
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
 BuildRequires: db4-devel
 BuildRequires: kdesdk-devel >= 0:%{kde_version}
+BuildRequires: flex
 
 Obsoletes: kdevelop-c_c++_ref
 
@@ -77,15 +85,11 @@
 %build
 QTDIR="" && source /etc/profile.d/qt.sh
 
-# Workaround for legacy auto* tools
 %if %{make_cvs}
-  [ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf
-  [ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5? autoheader
-  [ -x /usr/bin/aclocal-1.5 ] && ln -s /usr/bin/aclocal-1.5 aclocal
-  [ -x /usr/bin/automake-1.5 ] && ln -s /usr/bin/automake-1.5 automake
-  export PATH=`pwd`:$PATH
-  make -f admin/Makefile.common cvs
-  make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
+	rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
+	cp -a admin c_cpp_reference-2.0.2_for_KDE_3.0/
+	make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
+	make -f admin/Makefile.common cvs
 %endif
 
 # c references
@@ -99,9 +103,7 @@
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
    --disable-rpath \
 %if %{debug} == 0
    --disable-debug \
@@ -115,8 +117,8 @@
   --with-qt-libraries=$QTDIR/lib \
   --with-extra-libs=%{_libdir}
 
-make %{?_smp_mflags} -C lib/util
 make %{?_smp_mflags}
+make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
 
 %install
 rm -rf %{buildroot}
@@ -125,21 +127,21 @@
 make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=%{buildroot} install
 
 # remove useless files
-rm -rf  %{buildroot}%{_prefix}/kdevbdb
+rm -rf %{buildroot}%{_prefix}/kdevbdb
 
 %post
 /sbin/ldconfig
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
 for f in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -166,6 +168,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 9:3.3.4-0.1.fc5
+- 3.3.4
+
 * Mon Jun 12 2006 Than Ngo <than at redhat.com> 9:3.3.3-0.1.fc5
 - update to 3.3.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	12 Jun 2006 22:36:09 -0000	1.33
+++ sources	14 Aug 2006 14:18:21 -0000	1.34
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-89f3ad2b3e97e92bd9421f0d9ae8e427  kdevelop-3.3.3.tar.bz2
+e5278e37468bda7fdf6d019f84aeed16  kdevelop-3.3.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 14:46:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 10:46:08 -0400
Subject: rpms/kdewebdev/FC-5 kdewebdev.spec,1.32,1.33 sources,1.14,1.15
Message-ID: <200608141446.k7EEk8GQ005664@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdewebdev.spec sources 
Log Message:
3.5.4



Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/kdewebdev.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- kdewebdev.spec	14 Jun 2006 09:35:23 -0000	1.32
+++ kdewebdev.spec	14 Aug 2006 14:46:05 -0000	1.33
@@ -2,27 +2,22 @@
 %define final 0
 %define make_cvs 1
 
-%define arts 1
-
-%define qt_version 3.3.5
-%define kde_version 3.5.3
+%define qt_version 3.3.6
+%define kde_version 3.5.4
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
-%define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.3
-Release: 0.2.fc5
+Version: 3.5.4
+Release: 0.1.fc5
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
 Epoch: 6
 Group: Applications/Editors
 License: GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: http://download.sourceforge.net/quanta/css.tar.bz2
 Source2: http://download.sourceforge.net/quanta/html.tar.bz2
 Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
@@ -30,12 +25,18 @@
 
 Patch0: javascript.patch
 
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
 
-BuildPrereq: qt-devel >= %{qt_version}
-BuildPrereq: kdesdk-devel >= %{kde_version}
-BuildPrereq: perl
+BuildRequires: qt-devel >= %{qt_version}
+BuildRequires: kdesdk-devel >= %{kde_version}
+BuildRequires: perl
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 
 Obsoletes: WebMaker
 Obsoletes: quanta
@@ -68,21 +69,11 @@
   make -f admin/Makefile.common cvs
 %endif
 
-%ifarch s390x s390
-export CXXFLAGS="%{optflags} -O0"
-export CFLAGS="%{optflags} -O0"
-%endif
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -124,16 +115,16 @@
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
@@ -163,6 +154,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.1.fc5
+- 3.5.4
+
 * Wed Jun 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
 - build -O0 on s390(x) (gcc workaround)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	12 Jun 2006 22:44:57 -0000	1.14
+++ sources	14 Aug 2006 14:46:05 -0000	1.15
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-0eeaac8992c4b473caefcc32d49b79a2  kdewebdev-3.5.3.tar.bz2
+310a40555c089e88cc5ff7620a89b444  kdewebdev-3.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 14:55:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 10:55:13 -0400
Subject: rpms/devhelp/devel devhelp.spec,1.46,1.47
Message-ID: <200608141455.k7EEtDTW022616@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22559

Modified Files:
	devhelp.spec 
Log Message:

* Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 0.12-3
- Add missing Requires to devel package.



Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- devhelp.spec	10 Aug 2006 15:16:51 -0000	1.46
+++ devhelp.spec	14 Aug 2006 14:55:10 -0000	1.47
@@ -1,7 +1,7 @@
 Summary:             API document browser
 Name:                devhelp
 Version:             0.12
-Release:             2
+Release:             3
 License:             GPL
 Group:               Development/Tools
 Url:                 http://ftp.gnome.org/pub/gnome/sources/devhelp/
@@ -36,6 +36,7 @@
 Requires:            %name = %{PACKAGE_VERSION}
 Requires:            gtk2-devel >= 2.2.0
 Requires:            libgnomeui-devel >= 2.2.0
+Requires:            libwnck-devel >= 2.10.0
 Requires:            gnome-vfs2-devel >= 2.2.0
 
 %description devel
@@ -109,6 +110,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 0.12-3
+- Add missing Requires to devel package.
+
 * Thu Aug 10 2006 Matthew Barnes <mbarnes at redhat.com> - 0.12-2
 - Rebuild against firefox, again.
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 14:55:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 10:55:34 -0400
Subject: rpms/icu/devel .cvsignore, 1.4, 1.5 icu.spec, 1.22, 1.23 sources,
	1.4, 1.5
Message-ID: <200608141455.k7EEtYXl022779@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22746

Modified Files:
	.cvsignore icu.spec sources 
Log Message:
next rev


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Aug 2006 10:44:47 -0000	1.4
+++ .cvsignore	14 Aug 2006 14:55:32 -0000	1.5
@@ -1,3 +1,4 @@
 icu-2.6.2.tar.gz
 icu-3.4.tgz
 icu4c-3_6_d01-src.tgz
+icu4c-3_6_d02-src.tgz


Index: icu.spec
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- icu.spec	8 Aug 2006 15:09:52 -0000	1.22
+++ icu.spec	14 Aug 2006 14:55:32 -0000	1.23
@@ -1,12 +1,12 @@
 Name:           icu
 Version:        3.6
-Release: 	0.2.d01
+Release: 	0.2.d02
 Summary:        International Components for Unicode
 
 Group:          System Environment/Libraries
 License:        X License
 URL:            http://www.ibm.com/software/globalization/icu/
-Source0:        ftp://ftp.software.ibm.com/software/globalization/icu/icu4c-3_6_d01-src.tgz
+Source0:        ftp://ftp.software.ibm.com/software/globalization/icu/icu4c-3_6_d02-src.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  doxygen, autoconf
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Mon Aug 14 2006 Caolan McNamara <caolanm at redhat.com> - 3.6-0.1.d02
+- bump
+
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 3.6-0.2.d01
 - c++ code not alias correct
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Aug 2006 10:44:47 -0000	1.4
+++ sources	14 Aug 2006 14:55:32 -0000	1.5
@@ -1 +1 @@
-982db0ab875be8d5941cfc5c78cfaf25  icu4c-3_6_d01-src.tgz
+a192d06c3a97d8fe41e15929e09dbce6  icu4c-3_6_d02-src.tgz



From fedora-cvs-commits at redhat.com  Mon Aug 14 15:07:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 11:07:30 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.115.ooo51931.fixxmlsec.patch, 1.1, 1.2
Message-ID: <200608141507.k7EF7UHh002616@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.115.ooo51931.fixxmlsec.patch 
Log Message:
adjust patch

openoffice.org-1.9.115.ooo51931.fixxmlsec.patch:
 inc/libs.mk                          |    0 
 libxmlsec/makefile.mk                |    4 
 libxmlsec/xmlsec1-1.2.6.patch        |  338 +++++++++++++++++++++++++++++++++++
 scp2/source/ooo/file_library_ooo.scp |    8 
 scp2/source/ooo/shortcut_ooo.scp     |   12 -
 solenv/inc/libs.mk                   |    4 
 source/ooo/file_library_ooo.scp      |    0 
 source/ooo/shortcut_ooo.scp          |    0 
 8 files changed, 352 insertions(+), 14 deletions(-)

Index: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.115.ooo51931.fixxmlsec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.115.ooo51931.fixxmlsec.patch	10 Aug 2006 14:03:32 -0000	1.1
+++ openoffice.org-1.9.115.ooo51931.fixxmlsec.patch	14 Aug 2006 15:07:27 -0000	1.2
@@ -27,78 +27,10 @@
 diff -u -r1.13 xmlsec1-1.2.6.patch
 --- openoffice.org.orig/libxmlsec/xmlsec1-1.2.6.patch	9 Mar 2006 10:18:52 -0000	1.13
 +++ openoffice.org/libxmlsec/xmlsec1-1.2.6.patch	10 Aug 2006 13:55:49 -0000
-@@ -14069,3 +14069,376 @@
+@@ -14178,3 +14178,348 @@
    XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
    
    XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
-+*** misc/xmlsec1-1.2.6/configure	2004-08-26 08:00:34.000000000 +0200
-+--- misc/build/xmlsec1-1.2.6/configure	2006-02-24 17:41:54.812909000 +0100
-+***************
-+*** 25766,25788 ****
-+    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-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" >&5
-+! echo $ECHO_N "checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
-+  
-+!         if $PKG_CONFIG --exists "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" ; 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-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
-+              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-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
-+              echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
-+  echo "${ECHO_T}$NSS_LIBS" >&6
-+          else
-+--- 25766,25788 ----
-+    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 nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" >&5
-+! echo $ECHO_N "checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
-+  
-+!         if $PKG_CONFIG --exists "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" ; 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 "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
-+              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 "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
-+              echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
-+  echo "${ECHO_T}$NSS_LIBS" >&6
-+          else
-+***************
-+*** 25790,25796 ****
-+              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-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
-+  
-+          fi
-+  
-+--- 25790,25796 ----
-+              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 "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
-+  
-+          fi
-+  
 +*** misc/xmlsec1-1.2.6/src/Makefile.in	2006-08-10 14:25:07.000000000 +0100
 +--- misc/build/xmlsec1-1.2.6/src/Makefile.in	2006-08-10 14:26:01.000000000 +0100
 +***************
@@ -404,6 +336,46 @@
 +  
 +  mostlyclean-compile:
 +  	-rm -f *.$(OBJEXT)
++--- build/xmlsec1-1.2.6/configure	2006-08-14 15:55:25.000000000 +0100
+++++ misc/build/xmlsec1-1.2.6/configure	2006-08-14 15:56:46.000000000 +0100
++@@ -25769,23 +25769,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 $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION" >&5
++-echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
+++        echo "$as_me:$LINENO: checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" >&5
+++echo $ECHO_N "checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
++ 
++-        if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION" ; then
+++        if $PKG_CONFIG --exists "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" ; 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 "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
+++            NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
++             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 "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
+++            NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
++             echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
++ echo "${ECHO_T}$NSS_LIBS" >&6
++         else
++@@ -25793,7 +25793,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 "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
+++            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
++ 
++         fi
++ 
 Index: source/ooo/file_library_ooo.scp
 ===================================================================
 RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v



From fedora-cvs-commits at redhat.com  Mon Aug 14 15:24:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 11:24:48 -0400
Subject: rpms/openoffice.org/devel sources,1.190,1.191
Message-ID: <200608141524.k7EFOmAl017977@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	sources 
Log Message:
missing part of source


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- sources	13 Aug 2006 12:55:26 -0000	1.190
+++ sources	14 Aug 2006 15:24:44 -0000	1.191
@@ -12,4 +12,4 @@
 156fca901e2850226f16dd5034b6c941  openoffice.org-simple-crash_report.sh
 0ee333127e54353d49bf30aa112faee4  openoffice.org.langpack.template.tar.gz
 3aabcb294c648747551d702316c88580  pa-IN-179.sdf
-df35ffca7ab9277c77562ccd0bba6a6e  OOD680_m1.tar.bz2
+7a78b4b7151f8f71fe336245b19e68fa  OOD680_m1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 15:29:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 11:29:36 -0400
Subject: rpms/xorg-x11-drv-i810/devel i810.xinf, 1.4,
	1.5 xorg-x11-drv-i810.spec, 1.34, 1.35
Message-ID: <200608141529.k7EFTamK018151@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	i810.xinf xorg-x11-drv-i810.spec 
Log Message:
* Fri Aug 10 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-1.fc6
- Update i810 to 1.6.5, should fix DRI.
- Add kuzdu requires.
- i810.xinf: Start whitelisting devices over to intel.



Index: i810.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/i810.xinf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- i810.xinf	7 Jul 2006 23:55:50 -0000	1.4
+++ i810.xinf	14 Aug 2006 15:29:34 -0000	1.5
@@ -1,9 +1,27 @@
+# kudzu effectively does latest match scanning; the list of aliases is built
+# via head insertion, but then scanned from head to tail, so later lines in
+# this file will win.
+#
+# Therefore, we whitelist devices over to the modesetting driver by listing
+# subdevice matches _after_ the general match.
+
 alias pcivideo:v00008086d00001132sv*sd*bc*sc*i* i810	# i815
 alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* i810	# 845G
+
 alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* i810	# 865G
+# katzj's laptop
+alias pcivideo:v00008086d00002572sv0000103csd000030a0bc*sc*i* intel
+
 alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* i810	# 915G
+# ajax's desktop
+alias pcivideo:v00008086d00002582sv00008086sd00004556bc*sc*i* intel
+
 alias pcivideo:v00008086d0000258Asv*sd*bc*sc*i* i810	# E7221G
+
 alias pcivideo:v00008086d00002592sv*sd*bc*sc*i* i810	# 915GM
+# Toshiba Satellite M45 S351 (#202365)
+alias pcivideo:v00008086d00002592sv00001179sd0000ff10bc*sc*i* intel
+
 alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* i810	# 945G
 alias pcivideo:v00008086d000027A2sv*sd*bc*sc*i* i810	# 945GM
 alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* i810	# i830


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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-x11-drv-i810.spec	9 Aug 2006 23:28:01 -0000	1.34
+++ xorg-x11-drv-i810.spec	14 Aug 2006 15:29:34 -0000	1.35
@@ -12,8 +12,8 @@
 
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
-Version:   1.6.4
-Release:   3%{?dist}
+Version:   1.6.5
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -39,6 +39,7 @@
 %endif
 
 Requires:  xorg-x11-server-Xorg >= 1.1.0-1
+Requires:  kudzu >= 1.2.42-1
 
 %description 
 X.Org X11 i810 video driver.
@@ -108,6 +109,11 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Fri Aug 10 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-1.fc6
+- Update i810 to 1.6.5, should fix DRI.
+- Add kuzdu requires.
+- i810.xinf: Start whitelisting devices over to intel.
+
 * Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-3.fc6
 - intel-driver-rename.patch: Fix the driver name in more places so it'll,
   you know, load.



From fedora-cvs-commits at redhat.com  Mon Aug 14 15:39:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 11:39:10 -0400
Subject: rpms/kernel/devel/configs config-olpc,1.1,1.2
Message-ID: <200608141539.k7EFdAgS018308@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-olpc 
Log Message:
olpc tweaks


Index: config-olpc
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-olpc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-olpc	14 Aug 2006 02:53:35 -0000	1.1
+++ config-olpc	14 Aug 2006 15:39:07 -0000	1.2
@@ -5,6 +5,8 @@
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 
+# CONFIG_VM86 is not set
+
 # CONFIG_HPET_TIMER is not set
 # CONFIG_MICROCODE is not set
 
@@ -36,6 +38,7 @@
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
 
+# CONFIG_IOSCHED_NOOP is not set
 # CONFIG_IOSCHED_AS is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_SMP is not set
@@ -100,8 +103,6 @@
 # CONFIG_BT is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
@@ -114,6 +115,7 @@
 # CONFIG_NET_IPGRE is not set
 # CONFIG_IP_MROUTE is not set
 # CONFIG_INET_DIAG is not set
+# CONFIG_LLC is not set
 
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_WISTRON_BTNS is not set
@@ -298,7 +300,14 @@
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
 # CONFIG_I2C_PCA_ISA is not set
-CONFIG_I2C_DEBUG_CHIP=y
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_W1 is not set
 # CONFIG_HWMON is not set
 # CONFIG_HWMON_VID is not set
@@ -428,11 +437,9 @@
 # CONFIG_USB_SERIAL_OPTION is not set
 # CONFIG_USB_APPLEDISPLAY is not set
 
-CONFIG_USB_TOUCHSCREEN_EGALAX=y
-CONFIG_USB_TOUCHSCREEN_PANJIT=y
-CONFIG_USB_TOUCHSCREEN_3M=y
-CONFIG_USB_TOUCHSCREEN_ITM=y
+# CONFIG_INPUT_TOUCHSCREEN is not set
 
+# CONFIG_MMC is not set
 # CONFIG_MMC_WBSD is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_INFINIBAND is not set
@@ -547,17 +554,4 @@
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TEST is not set
 
-# CONFIG_MMC is not set
-
-
-# FIXME: Oddball choices. Please explain.
-# Why not builtin as in other kernels?
-CONFIG_LLC=m
-# Why modular ?
-CONFIG_CONNECTOR=m
-# Do we intend to ship anything that actually needs VM86 ?
-CONFIG_VM86=y
-# Why are these singled out to be unset?
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-
+# CONFIG_CONNECTOR is not set



From fedora-cvs-commits at redhat.com  Mon Aug 14 15:44:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 11:44:14 -0400
Subject: rpms/libgnome-java/FC-5 .cvsignore, 1.12, 1.13 libgnome-java.spec,
	1.33, 1.34 sources, 1.13, 1.14
Message-ID: <200608141544.k7EFiER3029962@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29788

Modified Files:
	.cvsignore libgnome-java.spec sources 
Log Message:
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel subpackage.
- The -devel subpackage now requires several -devel packages.
- Update requires and buildrequires.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Jun 2006 22:28:42 -0000	1.12
+++ .cvsignore	14 Aug 2006 15:44:11 -0000	1.13
@@ -1 +1 @@
-libgnome-java-2.12.3.tar.bz2
+libgnome-java-2.12.4.tar.bz2


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/FC-5/libgnome-java.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libgnome-java.spec	12 Jul 2006 15:46:58 -0000	1.33
+++ libgnome-java.spec	14 Aug 2006 15:44:11 -0000	1.34
@@ -14,8 +14,8 @@
 
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
-Version:	2.12.3
-Release: 	0.fc5.1
+Version:	2.12.4
+Release: 	1%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -24,13 +24,13 @@
 
 Requires:	libgnomeui >= 2.11.0
 Requires:	libgnomecanvas >= 2.11.0
-Requires:	libgtk-java >= 2.8.4
+Requires:	libgtk-java >= 2.8.6
 Requires: 	glib-java >= 0.2.4
 BuildRequires:	libgnomeui-devel >= 2.11.0
 BuildRequires:	libgnomecanvas-devel >= 2.11.0
 BuildRequires:	gcc-java >= 4.1.1, docbook-utils
-BuildRequires:	libgtk-java-devel >= 2.8.4, java-devel >= 1.4.2
-BuildRequires:	glib-java-devel >= 0.2.4
+BuildRequires:	libgtk-java-devel >= 2.8.6, java-devel >= 1.4.2
+BuildRequires:	glib-java-devel >= 0.2.6
 
 %description
 libgnome-java is a language binding that allows developers to write
@@ -40,10 +40,14 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	libgnomeui-devel
+Requires:	libgnomecanvas-devel
+Requires:	libgtk-java-devel
+Requires:	glib-java-devel
+
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
+Development part of %{name}.
 
 %prep
 %setup -q -n %{name_base}-%{version}
@@ -56,7 +60,7 @@
 fi
 
 %configure
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -70,7 +74,7 @@
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name}' ] ; then
@@ -99,14 +103,25 @@
 %doc doc/api AUTHORS COPYING NEWS README
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel subpackage.
+- The -devel subpackage now requires several -devel packages.
+- Update requires and buildrequires.
+
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.3-2
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1
 - Release 0 is not allowed.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Jun 2006 22:28:42 -0000	1.13
+++ sources	14 Aug 2006 15:44:11 -0000	1.14
@@ -1 +1 @@
-38cf6c95d7882ffcaffd3ec7c05ff10a  libgnome-java-2.12.3.tar.bz2
+88ce5ef83c81e385aec8fc28bfba31ca  libgnome-java-2.12.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 15:59:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 11:59:00 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.31, 1.32 rhpxl.spec, 1.36,
	1.37 sources, 1.34, 1.35
Message-ID: <200608141559.k7EFx0nO018012@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	7 Aug 2006 14:50:51 -0000	1.31
+++ .cvsignore	14 Aug 2006 15:58:58 -0000	1.32
@@ -1,11 +1 @@
-rhpxl-0.18.tar.gz
-rhpxl-0.19.tar.gz
-rhpxl-0.20.tar.gz
-rhpxl-0.21.tar.gz
-rhpxl-0.22.tar.gz
-rhpxl-0.23.tar.gz
-rhpxl-0.24.tar.gz
-rhpxl-0.25.tar.gz
-rhpxl-0.26.tar.gz
-rhpxl-0.27.tar.gz
-rhpxl-0.28.tar.gz
+rhpxl-0.30.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rhpxl.spec	7 Aug 2006 14:50:51 -0000	1.36
+++ rhpxl.spec	14 Aug 2006 15:58:58 -0000	1.37
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.28
+Version: 0.30
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,9 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Mon Aug 14 2006 Adam Jackson <ajackson at redhat.com> 0.30-1
+- Don't emit a Load "synaptics" directive, it's wrong.
+
 * Mon Aug 07 2006 Chris Lumens <clumens at redhat.com> 0.28-1
 - Fixes to init_from_xconfig for system-config-display.
 - Close X server stdout and stderr as having two log files is confusing.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	7 Aug 2006 14:50:51 -0000	1.34
+++ sources	14 Aug 2006 15:58:58 -0000	1.35
@@ -1 +1 @@
-fbfeb85a10bd91c9fd1b6087be689857  rhpxl-0.28.tar.gz
+d2858d9c824469eda93322ca99603225  rhpxl-0.30.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 14 16:09:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 12:09:09 -0400
Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 xorg-x11-drv-i810.spec, 1.35, 1.36
Message-ID: <200608141609.k7EG99Nn021496@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Log Message:
auto-import xorg-x11-drv-i810-1.6.5-2.fc6 on branch devel from xorg-x11-drv-i810-1.6.5-2.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Aug 2006 22:49:11 -0000	1.15
+++ .cvsignore	14 Aug 2006 16:09:07 -0000	1.16
@@ -1,2 +1,2 @@
 xf86-video-intel-1.6.0-git-modesetting-20060808.tar.bz2
-xf86-video-i810-1.6.4.tar.bz2
+xf86-video-i810-1.6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Aug 2006 22:49:11 -0000	1.15
+++ sources	14 Aug 2006 16:09:07 -0000	1.16
@@ -1,2 +1,2 @@
 666c06eedbe560fce410ab2f198bae5d  xf86-video-intel-1.6.0-git-modesetting-20060808.tar.bz2
-56e24a79cccb1d3828de48cb9a7a61b6  xf86-video-i810-1.6.4.tar.bz2
+fc1e0da3430551bf25a7babf7ccfd3bf  xf86-video-i810-1.6.5.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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-drv-i810.spec	14 Aug 2006 15:29:34 -0000	1.35
+++ xorg-x11-drv-i810.spec	14 Aug 2006 16:09:07 -0000	1.36
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   1.6.5
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -109,7 +109,7 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
-* Fri Aug 10 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-1.fc6
+* Fri Aug 10 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-2.fc6
 - Update i810 to 1.6.5, should fix DRI.
 - Add kuzdu requires.
 - i810.xinf: Start whitelisting devices over to intel.



From fedora-cvs-commits at redhat.com  Mon Aug 14 16:11:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 12:11:13 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch, 1.9, 1.10
Message-ID: <200608141611.k7EGBD1S022132@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch 
Log Message:
adjust patch

openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch:
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx  |   18 +-
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx   |   18 +-
 bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx |    8 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx  |    8 -
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx   |    2 
 bridges/source/cpp_uno/shared/vtablefactory.cxx       |  135 +++++++++++-------
 inc/bridges/cpp_uno/shared/vtablefactory.hxx          |    0 
 source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx           |    0 
 source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx         |    0 
 source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx          |    0 
 source/cpp_uno/shared/cppinterfaceproxy.cxx           |    0 
 source/cpp_uno/shared/vtablefactory.cxx               |    0 
 12 files changed, 115 insertions(+), 74 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch	14 Aug 2006 09:57:31 -0000	1.9
+++ openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch	14 Aug 2006 16:11:09 -0000	1.10
@@ -262,7 +262,7 @@
      sal_Size pagesize;
  #if defined SAL_UNX
  #if defined FREEBSD || defined NETBSD
-@@ -79,40 +86,90 @@
+@@ -79,40 +86,89 @@
      GetSystemInfo(&info);
      pagesize = info.dwPageSize;
  #endif
@@ -317,7 +317,7 @@
 +        size = n;
 +      ref = new int(1);
      }
-     return p;
+-    return p;
  }
  
 -extern "C" void SAL_CALL freeExec(
@@ -372,7 +372,7 @@
  }
  
  class VtableFactory::GuardedBlocks: public std::vector< Block > {
-@@ -133,11 +190,6 @@
+@@ -133,11 +189,6 @@
  };
  
  VtableFactory::GuardedBlocks::~GuardedBlocks() {
@@ -384,7 +384,7 @@
  }
  
  class VtableFactory::BaseOffset {
-@@ -172,28 +224,17 @@
+@@ -172,28 +223,17 @@
      return offset;
  }
  
@@ -414,7 +414,7 @@
  }
  
  VtableFactory::Vtables VtableFactory::getVtables(
-@@ -221,10 +262,6 @@
+@@ -221,10 +261,6 @@
      return i->second;
  }
  
@@ -425,7 +425,7 @@
  void VtableFactory::createVtables(
      GuardedBlocks & blocks, BaseOffset const & baseOffset,
      typelib_InterfaceTypeDescription * type, bool includePrimary) const
-@@ -232,17 +269,16 @@
+@@ -232,17 +268,16 @@
      if (includePrimary) {
          sal_Int32 slotCount
              = bridges::cpp_uno::shared::getPrimaryFunctions(type);
@@ -447,7 +447,7 @@
              sal_Int32 vtableOffset = blocks.size() * sizeof (void **);
              for (typelib_InterfaceTypeDescription const * type2 = type;
                   type2 != 0; type2 = type2->pBaseTypeDescription)
-@@ -251,14 +287,14 @@
+@@ -251,14 +286,14 @@
                      = bridges::cpp_uno::shared::getLocalFunctions(type2);
                  slots -= functionCount;
                  code = addLocalFunctions(



From fedora-cvs-commits at redhat.com  Mon Aug 14 16:12:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 12:12:45 -0400
Subject: rpms/icu/devel icu.spec,1.23,1.24
Message-ID: <200608141612.k7EGCjHq022446@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22416

Modified Files:
	icu.spec 
Log Message:
no longer needed apparently


Index: icu.spec
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- icu.spec	14 Aug 2006 14:55:32 -0000	1.23
+++ icu.spec	14 Aug 2006 16:12:32 -0000	1.24
@@ -11,9 +11,8 @@
 
 BuildRequires:  doxygen, autoconf
 Patch0: icu-3.4-gnustack.patch
-Patch1: icu-gcc41.patch
-Patch2: icu-config
-Patch3: icu-3.4-multiarchdevel.patch
+Patch1: icu-config
+Patch2: icu-3.4-multiarchdevel.patch
 
 %description
 The International Components for Unicode (ICU) libraries provide
@@ -53,8 +52,7 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .gnustack
-%patch1 -p1 -b .gcc41
-%patch3 -p1 -b .multiarchdevel
+%patch1 -p1 -b .multiarchdevel
 
 %build
 cd source



From fedora-cvs-commits at redhat.com  Mon Aug 14 16:18:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 12:18:49 -0400
Subject: rpms/kernel/devel/configs config-olpc,1.2,1.3
Message-ID: <200608141618.k7EGIniL006769@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-olpc 
Log Message:
unset


Index: config-olpc
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-olpc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-olpc	14 Aug 2006 15:39:07 -0000	1.2
+++ config-olpc	14 Aug 2006 16:18:46 -0000	1.3
@@ -438,6 +438,10 @@
 # CONFIG_USB_APPLEDISPLAY is not set
 
 # CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_USB_TOUCHSCREEN_EGALAX is not set
+# CONFIG_USB_TOUCHSCREEN_PANJIT is not set
+# CONFIG_USB_TOUCHSCREEN_3M is not set
+# CONFIG_USB_TOUCHSCREEN_ITM is not set
 
 # CONFIG_MMC is not set
 # CONFIG_MMC_WBSD is not set



From fedora-cvs-commits at redhat.com  Mon Aug 14 16:19:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 12:19:24 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.84, 1.85 sources,
	1.87, 1.88 system-config-printer.spec, 1.50, 1.51
Message-ID: <200608141619.k7EGJOdc006969@cvs.devel.redhat.com>

Author: ffesti

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
[ffesti] bump to 0.7.25-1 (bug #202060)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- .cvsignore	3 Aug 2006 12:40:54 -0000	1.84
+++ .cvsignore	14 Aug 2006 16:19:22 -0000	1.85
@@ -64,3 +64,4 @@
 system-config-printer-0.7.22.tar.bz2
 system-config-printer-0.7.23.tar.bz2
 system-config-printer-0.7.24.tar.bz2
+system-config-printer-0.7.25.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sources	3 Aug 2006 12:40:54 -0000	1.87
+++ sources	14 Aug 2006 16:19:22 -0000	1.88
@@ -1,2 +1,2 @@
 c853b55286216568f14dde8a5ae21a21  pycups-1.9.12.tar.bz2
-fae7d89ee41274afd39ca1cc63c6af05  system-config-printer-0.7.24.tar.bz2
+64400f94fe57afc35d45819d83f6724e  system-config-printer-0.7.25.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- system-config-printer.spec	11 Aug 2006 14:31:40 -0000	1.50
+++ system-config-printer.spec	14 Aug 2006 16:19:22 -0000	1.51
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.24
+Version: 0.7.25
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -114,6 +114,9 @@
 exit 0
 
 %changelog
+* Mon Aug 14 2006 Florian Festi <ffesti at redhat.com>
+- 0.7.25. (bug #202060)
+
 * Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
 - Fixed description (bug #202189).
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 16:38:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 12:38:03 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2564,
	1.2565 linux-2.6-squashfs.patch, 1.8, 1.9
Message-ID: <200608141638.k7EGc3Og012575@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-squashfs.patch 
Log Message:
- Update to squashfs 3.1 which should fix stack overflows seen
  during installation.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2564
retrieving revision 1.2565
diff -u -r1.2564 -r1.2565
--- kernel-2.6.spec	14 Aug 2006 05:07:57 -0000	1.2564
+++ kernel-2.6.spec	14 Aug 2006 16:37:57 -0000	1.2565
@@ -1691,6 +1691,10 @@
 %endif
 
 %changelog
+* Mon Aug 14 2006 Dave Jones <davej at redhat.com>
+- Update to squashfs 3.1 which should fix stack overflows seen
+  during installation.
+
 * Sun Aug 13 2006 Juan Quintela <quintela at redhat.com>
 - enable ia64 xen again.
 - xen kernel-update linux-2.6-xen-fedora cset 35236:70890e6e4a72.

linux-2.6-squashfs.patch:
 fs/Makefile                                             |    1 
 fs/squashfs/inode.c                                     | 2127 ++++++++++++++++
 fs/squashfs/squashfs.h                                  |   86 
 fs/squashfs/squashfs2_0.c                               |  758 +++++
 include/linux/squashfs_fs.h                             |  911 ++++++
 include/linux/squashfs_fs_i.h                           |   45 
 include/linux/squashfs_fs_sb.h                          |   74 
 linux-2.6.15-squashfs3.0/fs/Kconfig                     |   65 
 linux-2.6.15-squashfs3.0/fs/squashfs/Makefile           |    7 
 linux-2.6.17-squashfs3.1/fs/Kconfig                     |    6 
 linux-2.6.17-squashfs3.1/fs/squashfs/inode.c            |  101 
 linux-2.6.17-squashfs3.1/fs/squashfs/squashfs2_0.c      |    1 
 linux-2.6.17-squashfs3.1/include/linux/squashfs_fs_sb.h |    1 
 13 files changed, 4143 insertions(+), 40 deletions(-)

Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-squashfs.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-squashfs.patch	30 Jun 2006 04:31:13 -0000	1.8
+++ linux-2.6-squashfs.patch	14 Aug 2006 16:37:58 -0000	1.9
@@ -4113,3 +4113,336 @@
 +	int			(*read_fragment_index_table)(struct super_block *s);
 +};
 +#endif
+diff --new-file -urp linux-2.6.17-squashfs3.0-only/fs/Kconfig linux-2.6.17-squashfs3.1/fs/Kconfig
+--- linux-2.6.17-squashfs3.0-only/fs/Kconfig	2006-07-30 14:21:46.000000000 +0100
++++ linux-2.6.17-squashfs3.1/fs/Kconfig	2006-08-09 23:56:15.000000000 +0100
+@@ -1189,15 +1189,15 @@ config CRAMFS
+ 	  If unsure, say N.
+ 
+ config SQUASHFS
+-	tristate "SquashFS 3.0 - Squashed file system support"
++	tristate "SquashFS 3.1 - Squashed file system support"
+ 	select ZLIB_INFLATE
+ 	help
+-	  Saying Y here includes support for SquashFS 3.0 (a Compressed Read-Only File
++	  Saying Y here includes support for SquashFS 3.1 (a Compressed Read-Only File
+ 	  System).  Squashfs is a highly compressed read-only filesystem for Linux.
+ 	  It uses zlib compression to compress both files, inodes and directories.
+ 	  Inodes in the system are very small and all blocks are packed to minimise
+ 	  data overhead. Block sizes greater than 4K are supported up to a maximum of 64K.
+-	  SquashFS 3.0 supports 64 bit filesystems and files (larger than 4GB), full
++	  SquashFS 3.1 supports 64 bit filesystems and files (larger than 4GB), full
+ 	  uid/gid information, hard links and timestamps.
+ 
+ 	  Squashfs is intended for general read-only filesystem use, for archival
+diff --new-file -urp linux-2.6.17-squashfs3.0-only/fs/squashfs/inode.c linux-2.6.17-squashfs3.1/fs/squashfs/inode.c
+--- linux-2.6.17-squashfs3.0-only/fs/squashfs/inode.c	2006-07-30 14:21:46.000000000 +0100
++++ linux-2.6.17-squashfs3.1/fs/squashfs/inode.c	2006-08-10 08:20:12.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include <linux/module.h>
+ #include <linux/errno.h>
+ #include <linux/slab.h>
++#include <linux/zlib.h>
+ #include <linux/fs.h>
+ #include <linux/smp_lock.h>
+ #include <linux/slab.h>
+@@ -36,7 +37,6 @@
+ #include <linux/init.h>
+ #include <linux/dcache.h>
+ #include <linux/wait.h>
+-#include <linux/zlib.h>
+ #include <linux/blkdev.h>
+ #include <linux/vmalloc.h>
+ #include <asm/uaccess.h>
+@@ -63,9 +63,6 @@ static long long read_blocklist(struct i
+ static struct super_block *squashfs_get_sb(struct file_system_type *, int,
+ 				const char *, void *);
+ 
+-
+-static z_stream stream;
+-
+ static struct file_system_type squashfs_fs_type = {
+ 	.owner = THIS_MODULE,
+ 	.name = "squashfs",
+@@ -249,20 +246,20 @@ SQSH_EXTERN unsigned int squashfs_read_d
+ 	if (compressed) {
+ 		int zlib_err;
+ 
+-		stream.next_in = c_buffer;
+-		stream.avail_in = c_byte;
+-		stream.next_out = buffer;
+-		stream.avail_out = msblk->read_size;
++		msblk->stream.next_in = c_buffer;
++		msblk->stream.avail_in = c_byte;
++		msblk->stream.next_out = buffer;
++		msblk->stream.avail_out = msblk->read_size;
+ 
+-		if (((zlib_err = zlib_inflateInit(&stream)) != Z_OK) ||
+-				((zlib_err = zlib_inflate(&stream, Z_FINISH))
++		if (((zlib_err = zlib_inflateInit(&msblk->stream)) != Z_OK) ||
++				((zlib_err = zlib_inflate(&msblk->stream, Z_FINISH))
+ 				 != Z_STREAM_END) || ((zlib_err =
+-				zlib_inflateEnd(&stream)) != Z_OK)) {
++				zlib_inflateEnd(&msblk->stream)) != Z_OK)) {
+ 			ERROR("zlib_fs returned unexpected result 0x%x\n",
+ 				zlib_err);
+ 			bytes = 0;
+ 		} else
+-			bytes = stream.total_out;
++			bytes = msblk->stream.total_out;
+ 		
+ 		up(&msblk->read_data_mutex);
+ 	}
+@@ -967,6 +964,10 @@ static int squashfs_fill_super(struct su
+ 	}
+ 	memset(s->s_fs_info, 0, sizeof(struct squashfs_sb_info));
+ 	msblk = s->s_fs_info;
++	if (!(msblk->stream.workspace = vmalloc(zlib_inflate_workspacesize()))) {
++		ERROR("Failed to allocate zlib workspace\n");
++		goto failure;
++	}
+ 	sblk = &msblk->sblk;
+ 	
+ 	msblk->devblksize = sb_min_blocksize(s, BLOCK_SIZE);
+@@ -1139,6 +1140,7 @@ failed_mount:
+ 	kfree(msblk->read_data);
+ 	kfree(msblk->block_cache);
+ 	kfree(msblk->fragment_index_2);
++	vfree(msblk->stream.workspace);
+ 	kfree(s->s_fs_info);
+ 	s->s_fs_info = NULL;
+ 	return -EINVAL;
+@@ -1481,7 +1483,7 @@ static int squashfs_readpage(struct file
+ 	struct inode *inode = page->mapping->host;
+ 	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
+ 	struct squashfs_super_block *sblk = &msblk->sblk;
+-	unsigned char block_list[SIZE];
++	unsigned char *block_list;
+ 	long long block;
+ 	unsigned int bsize, i = 0, bytes = 0, byte_offset = 0;
+ 	int index = page->index >> (sblk->block_log - PAGE_CACHE_SHIFT);
+@@ -1497,6 +1499,11 @@ static int squashfs_readpage(struct file
+ 					page->index,
+ 					SQUASHFS_I(inode)->start_block);
+ 
++	if (!(block_list = kmalloc(SIZE, GFP_KERNEL))) {
++		ERROR("Failed to allocate block_list\n");
++		goto skip_read;
++	}
++
+ 	if (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >>
+ 					PAGE_CACHE_SHIFT))
+ 		goto skip_read;
+@@ -1579,6 +1586,7 @@ static int squashfs_readpage(struct file
+ 	else
+ 		release_cached_fragment(msblk, fragment);
+ 
++	kfree(block_list);
+ 	return 0;
+ 
+ skip_read:
+@@ -1589,6 +1597,7 @@ skip_read:
+ 	SetPageUptodate(page);
+ 	unlock_page(page);
+ 
++	kfree(block_list);
+ 	return 0;
+ }
+ 
+@@ -1598,7 +1607,7 @@ static int squashfs_readpage4K(struct fi
+ 	struct inode *inode = page->mapping->host;
+ 	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
+ 	struct squashfs_super_block *sblk = &msblk->sblk;
+-	unsigned char block_list[SIZE];
++	unsigned char *block_list;
+ 	long long block;
+ 	unsigned int bsize, bytes = 0;
+  	void *pageaddr;
+@@ -1610,6 +1619,14 @@ static int squashfs_readpage4K(struct fi
+ 	if (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >>
+ 					PAGE_CACHE_SHIFT)) {
+ 		pageaddr = kmap_atomic(page, KM_USER0);
++		block_list = NULL;
++		goto skip_read;
++	}
++
++	if (!(block_list = kmalloc(SIZE, GFP_KERNEL))) {
++		ERROR("Failed to allocate block_list\n");
++		pageaddr = kmap_atomic(page, KM_USER0);
++		block_list = NULL;
+ 		goto skip_read;
+ 	}
+ 
+@@ -1655,6 +1672,7 @@ skip_read:
+ 	SetPageUptodate(page);
+ 	unlock_page(page);
+ 
++	kfree(block_list);
+ 	return 0;
+ }
+ 
+@@ -1718,12 +1736,18 @@ static int get_dir_index_using_name(stru
+ 	struct squashfs_sb_info *msblk = s->s_fs_info;
+ 	struct squashfs_super_block *sblk = &msblk->sblk;
+ 	int i, length = 0;
+-	char buffer[sizeof(struct squashfs_dir_index) + SQUASHFS_NAME_LEN + 1];
+-	struct squashfs_dir_index *index = (struct squashfs_dir_index *) buffer;
+-	char str[SQUASHFS_NAME_LEN + 1];
++	struct squashfs_dir_index *index;
++	char *str;
+ 
+ 	TRACE("Entered get_dir_index_using_name, i_count %d\n", i_count);
+ 
++	if (!(str = kmalloc(sizeof(struct squashfs_dir_index) +
++		(SQUASHFS_NAME_LEN + 1) * 2, GFP_KERNEL))) {
++		ERROR("Failed to allocate squashfs_dir_index\n");
++		goto failure;
++	}
++
++	index = (struct squashfs_dir_index *) (str + SQUASHFS_NAME_LEN + 1);
+ 	strncpy(str, name, size);
+ 	str[size] = '\0';
+ 
+@@ -1755,6 +1779,8 @@ static int get_dir_index_using_name(stru
+ 	}
+ 
+ 	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
++	kfree(str);
++failure:
+ 	return length + 3;
+ }
+ 
+@@ -1766,14 +1792,19 @@ static int squashfs_readdir(struct file 
+ 	struct squashfs_super_block *sblk = &msblk->sblk;
+ 	long long next_block = SQUASHFS_I(i)->start_block +
+ 		sblk->directory_table_start;
+-	int next_offset = SQUASHFS_I(i)->offset, length = 0, dirs_read = 0,
++	int next_offset = SQUASHFS_I(i)->offset, length = 0,
+ 		dir_count;
+ 	struct squashfs_dir_header dirh;
+-	char buffer[sizeof(struct squashfs_dir_entry) + SQUASHFS_NAME_LEN + 1];
+-	struct squashfs_dir_entry *dire = (struct squashfs_dir_entry *) buffer;
++	struct squashfs_dir_entry *dire;
+ 
+ 	TRACE("Entered squashfs_readdir [%llx:%x]\n", next_block, next_offset);
+ 
++	if (!(dire = kmalloc(sizeof(struct squashfs_dir_entry) +
++		SQUASHFS_NAME_LEN + 1, GFP_KERNEL))) {
++		ERROR("Failed to allocate squashfs_dir_entry\n");
++		goto finish;
++	}
++
+ 	while(file->f_pos < 3) {
+ 		char *name;
+ 		int size, i_ino;
+@@ -1799,7 +1830,6 @@ static int squashfs_readdir(struct file 
+ 				goto finish;
+ 		}
+ 		file->f_pos += size;
+-		dirs_read++;
+ 	}
+ 
+ 	length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset,
+@@ -1880,12 +1910,12 @@ static int squashfs_readdir(struct file 
+ 				goto finish;
+ 			}
+ 			file->f_pos = length;
+-			dirs_read++;
+ 		}
+ 	}
+ 
+ finish:
+-	return dirs_read;
++	kfree(dire);
++	return 0;
+ 
+ failed_read:
+ 	ERROR("Unable to read directory block [%llx:%x]\n", next_block,
+@@ -1907,11 +1937,16 @@ static struct dentry *squashfs_lookup(st
+ 	int next_offset = SQUASHFS_I(i)->offset, length = 0,
+ 				dir_count;
+ 	struct squashfs_dir_header dirh;
+-	char buffer[sizeof(struct squashfs_dir_entry) + SQUASHFS_NAME_LEN];
+-	struct squashfs_dir_entry *dire = (struct squashfs_dir_entry *) buffer;
++	struct squashfs_dir_entry *dire;
+ 
+ 	TRACE("Entered squashfs_lookup [%llx:%x]\n", next_block, next_offset);
+ 
++	if (!(dire = kmalloc(sizeof(struct squashfs_dir_entry) +
++		SQUASHFS_NAME_LEN + 1, GFP_KERNEL))) {
++		ERROR("Failed to allocate squashfs_dir_entry\n");
++		goto exit_loop;
++	}
++
+ 	if (len > SQUASHFS_NAME_LEN)
+ 		goto exit_loop;
+ 
+@@ -1992,6 +2027,7 @@ static struct dentry *squashfs_lookup(st
+ 	}
+ 
+ exit_loop:
++	kfree(dire);
+ 	d_add(dentry, inode);
+ 	return ERR_PTR(0);
+ 
+@@ -2024,6 +2060,7 @@ static void squashfs_put_super(struct su
+ 		kfree(sbi->fragment_index);
+ 		kfree(sbi->fragment_index_2);
+ 		kfree(sbi->meta_index);
++		vfree(sbi->stream.workspace);
+ 		kfree(s->s_fs_info);
+ 		s->s_fs_info = NULL;
+ 	}
+@@ -2043,20 +2080,11 @@ static int __init init_squashfs_fs(void)
+ 	if (err)
+ 		goto out;
+ 
+-	printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
++	printk(KERN_INFO "squashfs: version 3.1 (2006/08/09) "
+ 		"Phillip Lougher\n");
+ 
+-	if (!(stream.workspace = vmalloc(zlib_inflate_workspacesize()))) {
+-		ERROR("Failed to allocate zlib workspace\n");
+-		destroy_inodecache();
+-		err = -ENOMEM;
+-		goto out;
+-	}
+-
+-	if ((err = register_filesystem(&squashfs_fs_type))) {
+-		vfree(stream.workspace);
++	if ((err = register_filesystem(&squashfs_fs_type)))
+ 		destroy_inodecache();
+-	}
+ 
+ out:
+ 	return err;
+@@ -2065,7 +2093,6 @@ out:
+ 
+ static void __exit exit_squashfs_fs(void)
+ {
+-	vfree(stream.workspace);
+ 	unregister_filesystem(&squashfs_fs_type);
+ 	destroy_inodecache();
+ }
+diff --new-file -urp linux-2.6.17-squashfs3.0-only/fs/squashfs/squashfs2_0.c linux-2.6.17-squashfs3.1/fs/squashfs/squashfs2_0.c
+--- linux-2.6.17-squashfs3.0-only/fs/squashfs/squashfs2_0.c	2006-07-30 14:21:46.000000000 +0100
++++ linux-2.6.17-squashfs3.1/fs/squashfs/squashfs2_0.c	2006-07-30 03:23:21.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include <linux/module.h>
+ #include <linux/errno.h>
+ #include <linux/slab.h>
++#include <linux/zlib.h>
+ #include <linux/fs.h>
+ #include <linux/smp_lock.h>
+ #include <linux/slab.h>
+diff --new-file -urp linux-2.6.17-squashfs3.0-only/include/linux/squashfs_fs_sb.h linux-2.6.17-squashfs3.1/include/linux/squashfs_fs_sb.h
+--- linux-2.6.17-squashfs3.0-only/include/linux/squashfs_fs_sb.h	2006-07-30 14:21:46.000000000 +0100
++++ linux-2.6.17-squashfs3.1/include/linux/squashfs_fs_sb.h	2006-07-30 03:23:21.000000000 +0100
+@@ -64,6 +64,7 @@ struct squashfs_sb_info {
+ 	wait_queue_head_t	waitq;
+ 	wait_queue_head_t	fragment_wait_queue;
+ 	struct meta_index	*meta_index;
++	z_stream		stream;
+ 	struct inode		*(*iget)(struct super_block *s,  squashfs_inode_t \
+ 				inode);
+ 	long long		(*read_blocklist)(struct inode *inode, int \



From fedora-cvs-commits at redhat.com  Mon Aug 14 16:39:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 12:39:56 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.7.91-fix-edataserverui-libs.patch,
	NONE, 1.1 evolution-data-server.spec, 1.112, 1.113
Message-ID: <200608141639.k7EGduDB013170@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.7.91-fix-edataserverui-libs.patch 
Log Message:

* Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.91-2
- Add patch for RH bug #202329.


evolution-data-server-1.7.91-fix-edataserverui-libs.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE evolution-data-server-1.7.91-fix-edataserverui-libs.patch ---
--- evolution-data-server-1.7.91/libedataserverui/Makefile.am.fix-edataserverui-libs	2006-08-14 12:08:28.000000000 -0400
+++ evolution-data-server-1.7.91/libedataserverui/Makefile.am	2006-08-14 12:08:39.000000000 -0400
@@ -42,7 +42,7 @@
 else
 libedataserverui_1_2_la_LIBADD = 				\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(E_DATA_SERVER_LIBS)
+	$(E_DATA_SERVER_UI_LIBS)
 endif
 
 libedataserverui_1_2_la_LDFLAGS = 										\


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- evolution-data-server.spec	7 Aug 2006 20:17:14 -0000	1.112
+++ evolution-data-server.spec	14 Aug 2006 16:39:54 -0000	1.113
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.91
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -38,6 +38,9 @@
 Patch13: evolution-data-server-1.3.8-fix-implicit-function-declarations
 Patch14: evolution-data-server-1.5.4-make_imap4_optional.patch
 
+# RH bug #202329 / Gnome.org bug #351317
+Patch15: evolution-data-server-1.7.91-fix-edataserverui-libs.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -119,6 +122,7 @@
 %patch12 -p1 -b .fix_open_calendar_declaration
 %patch13 -p1 -b .fix-implicit-function-declarations
 %patch14 -p1 -b .make_imap4_optional
+%patch15 -p1 -b .fix-edataserverui-libs
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -321,6 +325,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.91-2
+- Add patch for RH bug #202329.
+
 * Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.91-1
 - Update to 1.7.91
 - Remove patch for Gnome.org bug #348725 (fixed upstream).



From fedora-cvs-commits at redhat.com  Mon Aug 14 16:48:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 12:48:30 -0400
Subject: rpms/man-pages/devel man-pages-2.39-puned.patch, NONE,
	1.1 man-pages.spec, 1.50, 1.51
Message-ID: <200608141648.k7EGmUZu023037@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19993

Modified Files:
	man-pages.spec 
Added Files:
	man-pages-2.39-puned.patch 
Log Message:
--- man-pages-2.39/man3/dlopen.3.puned  2006-08-11 10:24:33.000000000 +0200
+++ man-pages-2.39/man3/dlopen.3        2006-08-14 18:37:19.000000000 +0200
@@ -370,7 +370,7 @@
     dlerror();    /* Clear any existing error */
 .\" This is the (somewhat ugly) POSIX.1-2003 (TC1) fix for
 .\" the dlsym() casting problem
-    *(void **) (&cosine) = dlsym(handle, "cos");
+    cosine = dlsym(handle, "cos");
     if ((error = dlerror()) != NULL)  {
         fprintf (stderr, "%s\en", error);
         exit(1);


man-pages-2.39-puned.patch:
 dlopen.3 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-2.39-puned.patch ---
--- man-pages-2.39/man3/dlopen.3.puned	2006-08-11 10:24:33.000000000 +0200
+++ man-pages-2.39/man3/dlopen.3	2006-08-14 18:37:19.000000000 +0200
@@ -370,7 +370,7 @@
     dlerror();    /* Clear any existing error */
 .\" This is the (somewhat ugly) POSIX.1-2003 (TC1) fix for
 .\" the dlsym() casting problem
-    *(void **) (&cosine) = dlsym(handle, "cos");
+    cosine = dlsym(handle, "cos");
     if ((error = dlerror()) != NULL)  {
         fprintf (stderr, "%s\en", error);
         exit(1);


Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- man-pages.spec	9 Aug 2006 13:13:31 -0000	1.50
+++ man-pages.spec	14 Aug 2006 16:48:18 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
 Version: 2.39
-Release: 2
+Release: 3
 License: distributable
 Group: Documentation
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
@@ -34,6 +34,7 @@
 Patch31: man-pages-2.34-write.patch
 Patch32: man-pages-2.34-wait16.patch
 Patch33: man-pages-2.39-typo.patch
+Patch34: man-pages-2.39-puned.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Autoreq: false
@@ -75,6 +76,7 @@
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 
 %build
 
@@ -174,6 +176,9 @@
 %{_mandir}/en/man*
 
 %changelog
+* Mon Aug 14 2006 Marcela Maslanova <mmaslano at redhat.com> 2.39-3
+- fix same bug better
+
 * Wed Aug 09 2006 Marcela Maslanova <mmaslano at redhat.com> 2.39-2
 - fix(#200681) typo
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 16:58:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 12:58:50 -0400
Subject: rpms/openoffice.org/devel ooobuild.VBAObjects.patch,1.2,1.3
Message-ID: <200608141658.k7EGwnrY000451@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	ooobuild.VBAObjects.patch 
Log Message:
bad translations for R1-C1

ooobuild.VBAObjects.patch:
 basic/inc/sbmeth.hxx                                              |    4 
 basic/source/classes/image.cxx                                    |   79 
 basic/source/classes/makefile.mk                                  |    5 
 basic/source/classes/sb.cxx                                       |   90 
 basic/source/classes/sbunoobj.cxx                                 |  246 
 basic/source/classes/sbxmod.cxx                                   |   81 
 basic/source/comp/buffer.cxx                                      |   58 
 basic/source/comp/codegen.cxx                                     |  202 
 basic/source/comp/dim.cxx                                         |   18 
 basic/source/comp/loops.cxx                                       |   40 
 basic/source/comp/makefile.mk                                     |    4 
 basic/source/comp/parser.cxx                                      |    9 
 basic/source/comp/scanner.cxx                                     |   14 
 basic/source/comp/symtbl.cxx                                      |    8 
 basic/source/comp/token.cxx                                       |    1 
 basic/source/inc/buffer.hxx                                       |   15 
 basic/source/inc/codegen.hxx                                      |   38 
 basic/source/inc/disas.hxx                                        |   10 
 basic/source/inc/filefmt.hxx                                      |    4 
 basic/source/inc/image.hxx                                        |   17 
 basic/source/inc/opcodes.hxx                                      |    1 
 basic/source/inc/parser.hxx                                       |    2 
 basic/source/inc/runtime.hxx                                      |    4 
 basic/source/inc/scanner.hxx                                      |    5 
 basic/source/inc/symtbl.hxx                                       |    8 
 basic/source/inc/token.hxx                                        |    2 
 basic/source/runtime/makefile.mk                                  |    3 
 basic/source/runtime/methods.cxx                                  |   19 
 basic/source/runtime/methods1.cxx                                 |    9 
 basic/source/runtime/rtlproto.hxx                                 |    1 
 basic/source/runtime/runtime.cxx                                  |   13 
 basic/source/runtime/step0.cxx                                    |  178 
 basic/source/runtime/step1.cxx                                    |    2 
 basic/source/runtime/step2.cxx                                    |   20 
 config_office/configure.in                                        |   13 
 config_office/set_soenv.in                                        |    1 
 offapi/org/openoffice/vba/Excel/Constants.idl                     |   20 
 offapi/org/openoffice/vba/Excel/XlApplicationInternational.idl    |   54 
 offapi/org/openoffice/vba/Excel/XlApplyNamesOrder.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlArabicModes.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlArrangeStyle.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlArrowHeadLength.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlArrowHeadStyle.idl              |   14 
 offapi/org/openoffice/vba/Excel/XlArrowHeadWidth.idl              |   12 
 offapi/org/openoffice/vba/Excel/XlAutoFillType.idl                |   20 
 offapi/org/openoffice/vba/Excel/XlAutoFilterOperator.idl          |   15 
 offapi/org/openoffice/vba/Excel/XlAxisCrosses.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlAxisGroup.idl                   |   11 
 offapi/org/openoffice/vba/Excel/XlAxisType.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlBackground.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlBarShape.idl                    |   15 
 offapi/org/openoffice/vba/Excel/XlBorderWeight.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlBordersIndex.idl                |   17 
 offapi/org/openoffice/vba/Excel/XlBuildInDialog.idl               |  251 
 offapi/org/openoffice/vba/Excel/XlCVError.idl                     |   16 
 offapi/org/openoffice/vba/Excel/XlCalculatedMemberType.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlCalculation.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlCalculationInterruptKey.idl     |   12 
 offapi/org/openoffice/vba/Excel/XlCalculationState.idl            |   12 
 offapi/org/openoffice/vba/Excel/XlCategoryType.idl                |   12 
 offapi/org/openoffice/vba/Excel/XlCellInsertionMode.idl           |   12 
 offapi/org/openoffice/vba/Excel/XlCellType.idl                    |   19 
 offapi/org/openoffice/vba/Excel/XlChartGallery.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlChartItem.idl                   |   40 
 offapi/org/openoffice/vba/Excel/XlChartLocation.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlChartPicturePlacement.idl       |   16 
 offapi/org/openoffice/vba/Excel/XlChartPictureType.idl            |   13 
 offapi/org/openoffice/vba/Excel/XlChartSplitType.idl              |   13 
 offapi/org/openoffice/vba/Excel/XlChartType.idl                   |   82 
 offapi/org/openoffice/vba/Excel/XlClipboardFormat.idl             |   42 
 offapi/org/openoffice/vba/Excel/XlCmdType.idl                     |   14 
 offapi/org/openoffice/vba/Excel/XlColorIndex.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlColumnDataType.idl              |   20 
 offapi/org/openoffice/vba/Excel/XlCommandUnderlines.idl           |   12 
 offapi/org/openoffice/vba/Excel/XlCommentDisplayMode.idl          |   13 
 offapi/org/openoffice/vba/Excel/XlConsolidationFunction.idl       |   21 
 offapi/org/openoffice/vba/Excel/XlCopyPictureFormat.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlCorruptLoad.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlCreator.idl                     |   10 
 offapi/org/openoffice/vba/Excel/XlCubeFieldType.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlCutCopyMode.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlDVAlterStyle.idl                |   12 
 offapi/org/openoffice/vba/Excel/XlDVType.idl                      |   17 
 offapi/org/openoffice/vba/Excel/XlDataLabelPosition.idl           |   21 
 offapi/org/openoffice/vba/Excel/XlDataLabelSeparator.idl          |   10 
 offapi/org/openoffice/vba/Excel/XlDataLabelsType.idl              |   15 
 offapi/org/openoffice/vba/Excel/XlDataSeriesDate.idl              |   13 
 offapi/org/openoffice/vba/Excel/XlDataSeriesType.idl              |   13 
 offapi/org/openoffice/vba/Excel/XlDeleteShiftDirection.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlDirection.idl                   |   13 
 offapi/org/openoffice/vba/Excel/XlDisplayBlanksAs.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlDisplayDrawingObjects.idl       |   12 
 offapi/org/openoffice/vba/Excel/XlDisplayUnit.idl                 |   18 
 offapi/org/openoffice/vba/Excel/XlEditionFormat.idl               |   10 
 offapi/org/openoffice/vba/Excel/XlEditionOptionsOption.idl        |   17 
 offapi/org/openoffice/vba/Excel/XlEditionType.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlEnableCancelKey.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlEnableSelection.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlEndStyleCap.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlErrorBarDirection.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlErrorBarInclude.idl             |   13 
 offapi/org/openoffice/vba/Excel/XlErrorBarType.idl                |   14 
 offapi/org/openoffice/vba/Excel/XlErrorChecks.idl                 |   17 
 offapi/org/openoffice/vba/Excel/XlFileAccess.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlFileFormat.idl                  |   52 
 offapi/org/openoffice/vba/Excel/XlFillWith.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlFilterAction.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlFindLookIn.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlFormControl.idl                 |   19 
 offapi/org/openoffice/vba/Excel/XlFormatConditionOperator.idl     |   17 
 offapi/org/openoffice/vba/Excel/XlFormatConditionType.idl         |   11 
 offapi/org/openoffice/vba/Excel/XlFormulaLabel.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlHAlign.idl                      |   17 
 offapi/org/openoffice/vba/Excel/XlHebrewModes.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlHighlightChangesTime.idl        |   12 
 offapi/org/openoffice/vba/Excel/XlHtmlType.idl                    |   13 
 offapi/org/openoffice/vba/Excel/XlIMEMode.idl                     |   20 
 offapi/org/openoffice/vba/Excel/XlImportDataAs.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlInsertFormatOrigin.idl          |   11 
 offapi/org/openoffice/vba/Excel/XlInsertShiftDirection.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlLayoutFormType.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlLegendPosition.idl              |   14 
 offapi/org/openoffice/vba/Excel/XlLineStyle.idl                   |   17 
 offapi/org/openoffice/vba/Excel/XlLink.idl                        |   13 
 offapi/org/openoffice/vba/Excel/XlLinkInfo.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlLinkInfoType.idl                |   12 
 offapi/org/openoffice/vba/Excel/XlLinkStatus.idl                  |   20 
 offapi/org/openoffice/vba/Excel/XlLinkType.idl                    |   11 
 offapi/org/openoffice/vba/Excel/XlListConflict.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlListDataType.idl                |   22 
 offapi/org/openoffice/vba/Excel/XlListObjectSourceType.idl        |   12 
 offapi/org/openoffice/vba/Excel/XlLocationInTable.idl             |   22 
 offapi/org/openoffice/vba/Excel/XlLookAt.idl                      |   11 
 offapi/org/openoffice/vba/Excel/XlMSApplication.idl               |   16 
 offapi/org/openoffice/vba/Excel/XlMailSystem.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlMarkerStyle.idl                 |   21 
 offapi/org/openoffice/vba/Excel/XlMouseButton.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlMousePointer.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlOLEType.idl                     |   12 
 offapi/org/openoffice/vba/Excel/XlOLEVerb.idl                     |   11 
 offapi/org/openoffice/vba/Excel/XlObjectSize.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlOrder.idl                       |   11 
 offapi/org/openoffice/vba/Excel/XlOrientation.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlPTSelectionMode.idl             |   16 
 offapi/org/openoffice/vba/Excel/XlPageBreak.idl                   |   12 
 offapi/org/openoffice/vba/Excel/XlPageBreakExtent.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlPageOrientation.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlPaperSize.idl                   |   50 
 offapi/org/openoffice/vba/Excel/XlParameterDataType.idl           |   30 
 offapi/org/openoffice/vba/Excel/XlParameterType.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlPasteSpecialOperation.idl       |   14 
 offapi/org/openoffice/vba/Excel/XlPasteType.idl                   |   19 
 offapi/org/openoffice/vba/Excel/XlPattern.idl                     |   29 
 offapi/org/openoffice/vba/Excel/XlPhoneticAlignment.idl           |   13 
 offapi/org/openoffice/vba/Excel/XlPictureAppearance.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlPictureConvertorType.idl        |   22 
 offapi/org/openoffice/vba/Excel/XlPivotCellType.idl               |   19 
 offapi/org/openoffice/vba/Excel/XlPivotFieldCalculation.idl       |   18 
 offapi/org/openoffice/vba/Excel/XlPivotFieldDataType.idl          |   12 
 offapi/org/openoffice/vba/Excel/XlPivotFieldOrientation.idl       |   14 
 offapi/org/openoffice/vba/Excel/XlPivotFormatType.idl             |   31 
 offapi/org/openoffice/vba/Excel/XlPivotTableMissingItems.idl      |   12 
 offapi/org/openoffice/vba/Excel/XlPivotTableSourceType.idl        |   14 
 offapi/org/openoffice/vba/Excel/XlPivotTableVersionList.idl       |   12 
 offapi/org/openoffice/vba/Excel/XlPlacement.idl                   |   12 
 offapi/org/openoffice/vba/Excel/XlPlatform.idl                    |   11 
 offapi/org/openoffice/vba/Excel/XlPrintErrors.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlPrintLocation.idl               |   13 
 offapi/org/openoffice/vba/Excel/XlPriority.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlQueryType.idl                   |   15 
 offapi/org/openoffice/vba/Excel/XlRangeAutoFormat.idl             |   53 
 offapi/org/openoffice/vba/Excel/XlRangeValueDataType.idl          |   12 
 offapi/org/openoffice/vba/Excel/XlReferenceStyle.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlReferenceType.idl               |   13 
 offapi/org/openoffice/vba/Excel/XlRobustConnect.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlRoutingSlipDelivery.idl         |   11 
 offapi/org/openoffice/vba/Excel/XlRoutingSlipStatus.idl           |   12 
 offapi/org/openoffice/vba/Excel/XlRowCol.idl                      |   11 
 offapi/org/openoffice/vba/Excel/XlRunAutoMacro.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlSaveAction.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlSaveAsAccessMode.idl            |   12 
 offapi/org/openoffice/vba/Excel/XlSaveConflictResolution.idl      |   12 
 offapi/org/openoffice/vba/Excel/XlScaleType.idl                   |   11 
 offapi/org/openoffice/vba/Excel/XlSearchDirection.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlSearchOrder.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlSearchWithin.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlSheetType.idl                   |   14 
 offapi/org/openoffice/vba/Excel/XlSheetVisibility.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlSizeRepresents.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlSmartTagControlType.idl         |   23 
 offapi/org/openoffice/vba/Excel/XlSmartTagDisplayMode.idl         |   12 
 offapi/org/openoffice/vba/Excel/XlSortDataOption.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlSortMethod.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlSortMethodOld.idl               |   11 
 offapi/org/openoffice/vba/Excel/XlSortOrder.idl                   |   11 
 offapi/org/openoffice/vba/Excel/XlSortOrientation.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlSortType.idl                    |   11 
 offapi/org/openoffice/vba/Excel/XlSourceType.idl                  |   17 
 offapi/org/openoffice/vba/Excel/XlSpeakDirection.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlSpecialCellsValue.idl           |   13 
 offapi/org/openoffice/vba/Excel/XlSubscribeToFormat.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlSubtototalLocationType.idl      |   11 
 offapi/org/openoffice/vba/Excel/XlSummaryColumn.idl               |   11 
 offapi/org/openoffice/vba/Excel/XlSummaryReportType.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlSummaryRow.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlTabPosition.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlTextParsingType.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlTextQualifier.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlTextVisualLayoutType.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlTickLabelOrientation.idl        |   14 
 offapi/org/openoffice/vba/Excel/XlTickLabelPosition.idl           |   13 
 offapi/org/openoffice/vba/Excel/XlTimeMark.idl                    |   13 
 offapi/org/openoffice/vba/Excel/XlTimeUnit.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlToolbarProtection.idl           |   15 
 offapi/org/openoffice/vba/Excel/XlTotalsCalculation.idl           |   18 
 offapi/org/openoffice/vba/Excel/XlTrendlineType.idl               |   15 
 offapi/org/openoffice/vba/Excel/XlUnderlineStyle.idl              |   14 
 offapi/org/openoffice/vba/Excel/XlUpdateLinks.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlVAlign.idl                      |   14 
 offapi/org/openoffice/vba/Excel/XlWBATemplate.idl                 |   14 
 offapi/org/openoffice/vba/Excel/XlWebFormatting.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlWebSectionType.idl              |   12 
 offapi/org/openoffice/vba/Excel/XlWindowState.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlWindowType.idl                  |   13 
 offapi/org/openoffice/vba/Excel/XlWindowView.idl                  |   10 
 offapi/org/openoffice/vba/Excel/XlXLMMacroType.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlXmlExportResult.idl             |   10 
 offapi/org/openoffice/vba/Excel/XlXmlImportResult.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlXmlLoadOption.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlYesNoGuess.idl                  |   12 
 offapi/org/openoffice/vba/Excel/makefile.mk                       |  217 
 offapi/org/openoffice/vba/MSFormReturnTypes.idl                   |   25 
 offapi/org/openoffice/vba/XApplication.idl                        |   49 
 offapi/org/openoffice/vba/XArrayWrapper.idl                       |   26 
 offapi/org/openoffice/vba/XBorder.idl                             |   29 
 offapi/org/openoffice/vba/XBorders.idl                            |   27 
 offapi/org/openoffice/vba/XCharacters.idl                         |   32 
 offapi/org/openoffice/vba/XChart.idl                              |   26 
 offapi/org/openoffice/vba/XChartObject.idl                        |   27 
 offapi/org/openoffice/vba/XChartObjects.idl                       |   30 
 offapi/org/openoffice/vba/XCollection.idl                         |   28 
 offapi/org/openoffice/vba/XComment.idl                            |   38 
 offapi/org/openoffice/vba/XComments.idl                           |   24 
 offapi/org/openoffice/vba/XDialog.idl                             |   28 
 offapi/org/openoffice/vba/XDialogs.idl                            |   26 
 offapi/org/openoffice/vba/XFont.idl                               |   39 
 offapi/org/openoffice/vba/XGlobals.idl                            |   34 
 offapi/org/openoffice/vba/XInterior.idl                           |   27 
 offapi/org/openoffice/vba/XOutline.idl                            |   28 
 offapi/org/openoffice/vba/XPivotCache.idl                         |   25 
 offapi/org/openoffice/vba/XPivotTable.idl                         |   28 
 offapi/org/openoffice/vba/XPivotTables.idl                        |   27 
 offapi/org/openoffice/vba/XRange.idl                              |  104 
 offapi/org/openoffice/vba/XSeries.idl                             |   28 
 offapi/org/openoffice/vba/XSeriesCollection.idl                   |   30 
 offapi/org/openoffice/vba/XVBAToOOEventDescGen.idl                |   20 
 offapi/org/openoffice/vba/XWindow.idl                             |   32 
 offapi/org/openoffice/vba/XWindows.idl                            |   24 
 offapi/org/openoffice/vba/XWorkbook.idl                           |   36 
 offapi/org/openoffice/vba/XWorkbooks.idl                          |   24 
 offapi/org/openoffice/vba/XWorksheet.idl                          |   61 
 offapi/org/openoffice/vba/XWorksheetFunction.idl                  |   26 
 offapi/org/openoffice/vba/XWorksheets.idl                         |   29 
 offapi/org/openoffice/vba/XlBuiltInDialog.idl                     |   35 
 offapi/org/openoffice/vba/XlPasteSpecialOperation.idl             |   29 
 offapi/org/openoffice/vba/XlPasteType.idl                         |   34 
 offapi/org/openoffice/vba/makefile.mk                             |   55 
 offapi/prj/build.lst                                              |    4 
 offapi/prj/d.lst                                                  |    8 
 offapi/util/makefile.mk                                           |    5 
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   13 
 offuh/prj/d.lst                                                   |   15 
 sc/inc/address.hxx                                                |   62 
 sc/inc/cell.hxx                                                   |   25 
 sc/inc/cellsuno.hxx                                               |    3 
 sc/inc/column.hxx                                                 |    3 
 sc/inc/compiler.hrc                                               |    6 
 sc/inc/compiler.hxx                                               |   64 
 sc/inc/document.hxx                                               |   17 
 sc/inc/docuno.hxx                                                 |    1 
 sc/inc/drwlayer.hxx                                               |    4 
 sc/inc/global.hxx                                                 |    1 
 sc/inc/globstr.hrc                                                |    4 
 sc/inc/opcode.hxx                                                 |    2 
 sc/inc/rangelst.hxx                                               |    6 
 sc/inc/rangeutl.hxx                                               |   19 
 sc/inc/reffind.hxx                                                |    8 
 sc/inc/sc.hrc                                                     |    9 
 sc/inc/scfuncs.hrc                                                |    2 
 sc/inc/shapeuno.hxx                                               |    9 
 sc/inc/sortparam.hxx                                              |    1 
 sc/inc/table.hxx                                                  |    0 
 sc/inc/userdat.hxx                                                |   16 
 sc/prj/build.lst                                                  |    3 
 sc/sdi/docsh.sdi                                                  |    1 
 sc/sdi/drawsh.sdi                                                 |    6 
 sc/sdi/scalc.sdi                                                  |  128 
 sc/source/core/data/attrib.cxx                                    |    1 
 sc/source/core/data/cell.cxx                                      |   21 
 sc/source/core/data/cell2.cxx                                     |   16 
 sc/source/core/data/column3.cxx                                   |   17 
 sc/source/core/data/conditio.cxx                                  |    2 
 sc/source/core/data/documen2.cxx                                  |    1 
 sc/source/core/data/documen3.cxx                                  |   10 
 sc/source/core/data/documen4.cxx                                  |    4 
 sc/source/core/data/drwlayer.cxx                                  |   19 
 sc/source/core/data/sortparam.cxx                                 |    1 
 sc/source/core/data/table1.cxx                                    |    0 
 sc/source/core/data/table6.cxx                                    |    4 
 sc/source/core/data/userdat.cxx                                   |   16 
 sc/source/core/data/validat.cxx                                   |    0 
 sc/source/core/inc/interpre.hxx                                   |    2 
 sc/source/core/src/compiler.src                                   |   14 
 sc/source/core/tool/address.cxx                                   |  668 ++
 sc/source/core/tool/chgtrack.cxx                                  |    2 
 sc/source/core/tool/compiler.cxx                                  |  657 ++
 sc/source/core/tool/interpr1.cxx                                  |  103 
 sc/source/core/tool/interpr4.cxx                                  |    2 
 sc/source/core/tool/rangelst.cxx                                  |   18 
 sc/source/core/tool/rangenam.cxx                                  |   30 
 sc/source/core/tool/rangeutl.cxx                                  |   51 
 sc/source/core/tool/reffind.cxx                                   |    6 
 sc/source/filter/excel/excdoc.cxx                                 |    2 
 sc/source/filter/excel/excform.cxx                                |    6 
 sc/source/filter/excel/excimp8.cxx                                |    6 
 sc/source/filter/excel/impop.cxx                                  |    8 
 sc/source/filter/excel/makefile.mk                                |    4 
 sc/source/filter/excel/read.cxx                                   |    1 
 sc/source/filter/excel/xicontent.cxx                              |   18 
 sc/source/filter/excel/xiescher.cxx                               |  159 
 sc/source/filter/excel/xistyle.cxx                                |   64 
 sc/source/filter/excel/xlformula.cxx                              |    6 
 sc/source/filter/excel/xlocx.cxx                                  |  145 
 sc/source/filter/inc/excimp8.hxx                                  |    1 
 sc/source/filter/inc/xcl97dum.hxx                                 |   11 
 sc/source/filter/inc/xcl97rec.hxx                                 |   14 
 sc/source/filter/inc/xicontent.hxx                                |    1 
 sc/source/filter/inc/xiescher.hxx                                 |   10 
 sc/source/filter/inc/xistyle.hxx                                  |    2 
 sc/source/filter/inc/xlocx.hxx                                    |   11 
 sc/source/filter/lotus/lotform.cxx                                |    4 
 sc/source/filter/xcl97/xcl97dum.cxx                               |   20 
 sc/source/filter/xcl97/xcl97rec.cxx                               |   22 
 sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx            |    6 
 sc/source/filter/xml/XMLConverter.cxx                             |    6 
 sc/source/ui/Accessibility/AccessibleCellBase.cxx                 |    1 
 sc/source/ui/app/inputhdl.cxx                                     |   39 
 sc/source/ui/attrdlg/condfrmt.cxx                                 |    2 
 sc/source/ui/docshell/docfunc.cxx                                 |   36 
 sc/source/ui/drawfunc/drawsh.cxx                                  |  130 
 sc/source/ui/drawfunc/drawsh2.cxx                                 |   14 
 sc/source/ui/drawfunc/drawsh5.cxx                                 |   18 
 sc/source/ui/drawfunc/fudraw.cxx                                  |   19 
 sc/source/ui/drawfunc/fusel.cxx                                   |   81 
 sc/source/ui/drawfunc/objdraw.src                                 |   56 
 sc/source/ui/inc/colrowba.hxx                                     |    2 
 sc/source/ui/inc/docfunc.hxx                                      |    2 
 sc/source/ui/inc/drawsh.hxx                                       |    2 
 sc/source/ui/inc/transobj.hxx                                     |    0 
 sc/source/ui/inc/undoblk.hxx                                      |    1 
 sc/source/ui/inc/undotab.hxx                                      |   20 
 sc/source/ui/src/globstr.src                                      |   12 
 sc/source/ui/src/sc.src                                           |    6 
 sc/source/ui/src/scfuncs.src                                      |  136 
 sc/source/ui/undo/undotab.cxx                                     |   57 
 sc/source/ui/unoobj/appluno.cxx                                   |   36 
 sc/source/ui/unoobj/cellsuno.cxx                                  |    9 
 sc/source/ui/unoobj/docuno.cxx                                    |   42 
 sc/source/ui/unoobj/makefile.mk                                   |    4 
 sc/source/ui/unoobj/shapeuno.cxx                                  |  162 
 sc/source/ui/vba/makefile.mk                                      |   60 
 sc/source/ui/vba/vbaapplication.cxx                               |  321 +
 sc/source/ui/vba/vbaapplication.hxx                               |   48 
 sc/source/ui/vba/vbaarraywrapper.cxx                              |   22 
 sc/source/ui/vba/vbaarraywrapper.hxx                              |   20 
 sc/source/ui/vba/vbaborders.cxx                                   |  366 +
 sc/source/ui/vba/vbaborders.hxx                                   |   49 
 sc/source/ui/vba/vbacharacters.cxx                                |   87 
 sc/source/ui/vba/vbacharacters.hxx                                |   45 
 sc/source/ui/vba/vbachart.cxx                                     |   29 
 sc/source/ui/vba/vbachart.hxx                                     |   23 
 sc/source/ui/vba/vbachartobject.cxx                               |   74 
 sc/source/ui/vba/vbachartobject.hxx                               |   24 
 sc/source/ui/vba/vbachartobjects.cxx                              |   52 
 sc/source/ui/vba/vbachartobjects.hxx                              |   29 
 sc/source/ui/vba/vbacollectionimpl.cxx                            |  106 
 sc/source/ui/vba/vbacollectionimpl.hxx                            |   72 
 sc/source/ui/vba/vbacomment.cxx                                   |  198 
 sc/source/ui/vba/vbacomment.hxx                                   |   49 
 sc/source/ui/vba/vbacomments.cxx                                  |   58 
 sc/source/ui/vba/vbacomments.hxx                                  |   31 
 sc/source/ui/vba/vbadialog.cxx                                    |  104 
 sc/source/ui/vba/vbadialog.hxx                                    |   35 
 sc/source/ui/vba/vbadialogs.cxx                                   |   69 
 sc/source/ui/vba/vbadialogs.hxx                                   |   34 
 sc/source/ui/vba/vbafont.cxx                                      |  323 +
 sc/source/ui/vba/vbafont.hxx                                      |   56 
 sc/source/ui/vba/vbaglobals.cxx                                   |  203 
 sc/source/ui/vba/vbaglobals.hxx                                   |   54 
 sc/source/ui/vba/vbahelper.cxx                                    |  371 +
 sc/source/ui/vba/vbahelper.hxx                                    |   41 
 sc/source/ui/vba/vbainterior.cxx                                  |   98 
 sc/source/ui/vba/vbainterior.hxx                                  |   37 
 sc/source/ui/vba/vbaobj.xml                                       |   26 
 sc/source/ui/vba/vbaoutline.cxx                                   |   20 
 sc/source/ui/vba/vbaoutline.hxx                                   |   24 
 sc/source/ui/vba/vbapalette.cxx                                   |   72 
 sc/source/ui/vba/vbapalette.hxx                                   |   20 
 sc/source/ui/vba/vbapivotcache.cxx                                |   16 
 sc/source/ui/vba/vbapivotcache.hxx                                |   22 
 sc/source/ui/vba/vbapivottable.cxx                                |   16 
 sc/source/ui/vba/vbapivottable.hxx                                |   20 
 sc/source/ui/vba/vbapivottables.cxx                               |   49 
 sc/source/ui/vba/vbapivottables.hxx                               |   35 
 sc/source/ui/vba/vbarange.cxx                                     | 2566 ++++++++++
 sc/source/ui/vba/vbarange.hxx                                     |  204 
 sc/source/ui/vba/vbaseriescollection.cxx                          |   73 
 sc/source/ui/vba/vbaseriescollection.hxx                          |   33 
 sc/source/ui/vba/vbawindow.cxx                                    |  308 +
 sc/source/ui/vba/vbawindow.hxx                                    |   33 
 sc/source/ui/vba/vbawindows.cxx                                   |  209 
 sc/source/ui/vba/vbawindows.hxx                                   |   37 
 sc/source/ui/vba/vbaworkbook.cxx                                  |  220 
 sc/source/ui/vba/vbaworkbook.hxx                                  |   47 
 sc/source/ui/vba/vbaworkbooks.cxx                                 |  377 +
 sc/source/ui/vba/vbaworkbooks.hxx                                 |   39 
 sc/source/ui/vba/vbaworksheet.cxx                                 |  537 ++
 sc/source/ui/vba/vbaworksheet.hxx                                 |   84 
 sc/source/ui/vba/vbaworksheets.cxx                                |  275 +
 sc/source/ui/vba/vbaworksheets.hxx                                |   51 
 sc/source/ui/vba/vbawsfunction.cxx                                |  104 
 sc/source/ui/vba/vbawsfunction.hxx                                |   33 
 sc/source/ui/view/colrowba.cxx                                    |    9 
 sc/source/ui/view/gridwin5.cxx                                    |   22 
 sc/source/ui/view/tabvwshf.cxx                                    |   18 
 sc/source/ui/view/viewfunc.cxx                                    |    2 
 sc/uiconfig/scalc/menubar/menubar.xml                             |    1 
 sc/util/makefile.mk                                               |    4 
 sc/util/vbaobj.map                                                |   10 
 scp2/source/ooo/file_library_ooo.scp                              |   18 
 scp2/source/ooo/makefile.mk                                       |    4 
 scripting/prj/build.lst                                           |    3 
 scripting/source/vbaevents/eventhelper.cxx                        |  998 +++
 scripting/source/vbaevents/makefile.mk                            |   50 
 scripting/source/vbaevents/service.cxx                            |   99 
 scripting/source/vbaevents/vbaevents.map                          |   10 
 scripting/source/vbaevents/vbaevents.xml                          |   26 
 source/classes/sbunoobj.cxx                                       |   60 
 source/comp/dim.cxx                                               |    2 
 source/comp/parser.cxx                                            |    2 
 source/inc/parser.hxx                                             |    2 
 source/inc/runtime.hxx                                            |   51 
 source/runtime/step1.cxx                                          |   72 
 source/runtime/step2.cxx                                          |   72 
 stoc/source/registry_tdprovider/makefile.mk                       |    4 
 stoc/source/registry_tdprovider/rdbtdp.xml                        |    1 
 stoc/source/registry_tdprovider/tdprovider.cxx                    |  167 
 stoc/source/tdmanager/makefile.mk                                 |    4 
 stoc/source/tdmanager/tdmgr.cxx                                   |   48 
 stoc/source/tdmanager/tdmgr.xml                                   |    1 
 svx/source/form/fmundo.cxx                                        |  110 
 svx/source/form/makefile.mk                                       |    4 
 svx/source/inc/fmundo.hxx                                         |    4 
 svx/source/msfilter/svxmsbas.cxx                                  |    1 
 unoil/util/makefile.mk                                            |    4 
 xmloff/inc/shapeexport.hxx                                        |    5 
 xmloff/source/draw/eventimp.cxx                                   |  416 -
 xmloff/source/draw/shapeexport.cxx                                |    3 
 xmloff/source/draw/shapeexport2.cxx                               |  450 -
 469 files changed, 19654 insertions(+), 1124 deletions(-)

Index: ooobuild.VBAObjects.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/ooobuild.VBAObjects.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ooobuild.VBAObjects.patch	14 Aug 2006 13:53:25 -0000	1.2
+++ ooobuild.VBAObjects.patch	14 Aug 2006 16:58:46 -0000	1.3
@@ -11700,10 +11700,10 @@
 +		Text[ es ] = "Alternar el uso de la notaci?n R1C1";
 +		Text[ fr ] = "Activer/D?sactiver l'usage de la notation R1C1";
 +		Text[ it ] = "Alterna l'utilizzo della notazione R1C1";
-+		Text[ ja ] = "R1C1???????????";
++		Text[ ja ] = "R1C1";
 +		Text[ pt-BR ] = "Alterna o uso da nota??o R1C1";
-+		Text[ zh-CN ] = "???? R1C1 ???";
-+		Text[ zh-TW ] = "???? R1C1 ??";
++		Text[ zh-CN ] = "R1C1";
++		Text[ zh-TW ] = "R1C1";
  	};
  	String STR_CHART_MAINTITLE
  	{
@@ -12066,10 +12066,10 @@
 +					<value xml:lang="es">Usar R1~C1</value>
 +					<value xml:lang="fr">Utiliser R1~C1</value>
 +					<value xml:lang="it">Utilizza R1~C1</value>
-+					<value xml:lang="ja">R1~C1?????</value>
++					<value xml:lang="ja">R1~C1</value>
 +					<value xml:lang="pt-BR">Usar R1~C1</value>
-+					<value xml:lang="zh-CN">?? R1C1(~C)</value>
-+					<value xml:lang="zh-TW">?? R1C1(~C)</value>
++					<value xml:lang="zh-CN">R1C1(~C)</value>
++					<value xml:lang="zh-TW">R1C1(~C)</value>
 +				</prop>
 +			</node>
              <node oor:name=".uno:SetAnchorToPage" oor:op="replace">



From fedora-cvs-commits at redhat.com  Mon Aug 14 17:16:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 13:16:51 -0400
Subject: rpms/libdhcp/devel .cvsignore, 1.12, 1.13 libdhcp.spec, 1.31,
	1.32 sources, 1.24, 1.25
Message-ID: <200608141716.k7EHGpNa012649@cvs.devel.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore libdhcp.spec sources 
Log Message:
- If interface is already configured, down it before reconfig (#202208)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	2 Aug 2006 20:59:51 -0000	1.12
+++ .cvsignore	14 Aug 2006 17:16:48 -0000	1.13
@@ -1 +1 @@
-libdhcp-1.10.tar.gz
+libdhcp-1.11.tar.gz


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libdhcp.spec	2 Aug 2006 20:59:51 -0000	1.31
+++ libdhcp.spec	14 Aug 2006 17:16:48 -0000	1.32
@@ -1,6 +1,6 @@
 Summary:    A library for network interface configuration with DHCP
 Name:       libdhcp
-Version:    1.10
+Version:    1.11
 Release:    1
 License:    GPL
 Group:      Development/Libraries
@@ -66,7 +66,7 @@
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libdhcp.so.*
-%doc README LICENSE html/ examples/
+%doc README COPYING html/ examples/
 
 %files  devel
 %defattr(-,root,root,-)
@@ -76,6 +76,9 @@
 %{pkgcfgdir}/libdhcp.pc
 
 %changelog
+* Fri Aug 11 2006 David Cantrell <dcantrell at redhat.com> - 1.11-1
+- If interface is already configured, down it before reconfig (#202208)
+
 * Wed Aug 02 2006 David Cantrell <dcantrell at redhat.com> - 1.10-1
 - Make the README file a little more readable
 - Set char pointers to NULL after free() in dhcpv4_control_free()


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	2 Aug 2006 20:59:51 -0000	1.24
+++ sources	14 Aug 2006 17:16:48 -0000	1.25
@@ -1 +1 @@
-65180634359358b39964a796960ff993  libdhcp-1.10.tar.gz
+ada5cfba359fe6f191b0ba92ffc9602f  libdhcp-1.11.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 14 17:21:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 13:21:19 -0400
Subject: rpms/jgroups/devel jgroups.spec,1.15,1.16
Message-ID: <200608141721.k7EHLJqW021585@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jgroups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21350

Modified Files:
	jgroups.spec 
Log Message:
- Keep ENCRYPTAsymmetricTest since BC now available.




Index: jgroups.spec
===================================================================
RCS file: /cvs/dist/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jgroups.spec	11 Aug 2006 22:51:42 -0000	1.15
+++ jgroups.spec	14 Aug 2006 17:21:17 -0000	1.16
@@ -43,7 +43,7 @@
 
 Name:		jgroups
 Version:	2.2.9.2
-Release:	3jpp.1
+Release:	3jpp.2
 Epoch:		0
 Summary:	Toolkit for reliable multicast communication.
 License:	LGPL
@@ -122,7 +122,7 @@
 done
 
 # this test requires bouncycastle
-rm tests/junit/org/jgroups/protocols/ENCRYPTAsymmetricTest.java
+#rm tests/junit/org/jgroups/protocols/ENCRYPTAsymmetricTest.java
 
 %patch0 -b .sav
 
@@ -141,7 +141,8 @@
 ant jar javadoc jboss-service jgroups-service
 %else
 export ANT_OPTS="-Djava.net.preferIPv4Stack=true"
-export CLASSPATH=$CLASSPATH:`build-classpath xalan-j2 xalan-j2-serializer`
+# Added gcj-endorsed/bc-prov to build the encrypt test
+export CLASSPATH=$CLASSPATH:`build-classpath xalan-j2 xalan-j2-serializer gcj-endorsed/bc-prov`
 ant jar javadoc jboss-service jgroups-service unittests testreport
 %endif
 
@@ -225,6 +226,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Fri Aug 14 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-3jpp.2
+- Keep ENCRYPTAsymmetricTest since BC now available.
+
 * Fri Aug 11 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-3jpp.1
 - Resync with latest from JPP.
 - Re-enable bouncycastle dependencies.



From fedora-cvs-commits at redhat.com  Mon Aug 14 17:21:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 13:21:25 -0400
Subject: rpms/createrepo/FC-5 createrepo-0.4.4-dirfix.patch, NONE,
	1.1 createrepo.spec, 1.18, 1.19
Message-ID: <200608141721.k7EHLOwe021626@cvs.devel.redhat.com>

Author: pnasrat

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

Modified Files:
	createrepo.spec 
Added Files:
	createrepo-0.4.4-dirfix.patch 
Log Message:
Fix for directory must exist error (#199228)


createrepo-0.4.4-dirfix.patch:
 genpkgmetadata.py |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE createrepo-0.4.4-dirfix.patch ---
--- createrepo-0.4.4/genpkgmetadata.py.dirfix	2006-08-14 13:18:01.000000000 -0400
+++ createrepo-0.4.4/genpkgmetadata.py	2006-08-14 13:18:58.000000000 -0400
@@ -490,6 +490,8 @@
     cmds['olddir'] = '.olddata'
     cmds['update-info-dir'] = 'update-info'
 
+    # Fixup first directories
+    directories[0] = directory
     return cmds, directories
 
 def main(args):


Index: createrepo.spec
===================================================================
RCS file: /cvs/dist/rpms/createrepo/FC-5/createrepo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- createrepo.spec	5 May 2006 20:38:58 -0000	1.18
+++ createrepo.spec	14 Aug 2006 17:21:21 -0000	1.19
@@ -1,10 +1,11 @@
 Summary: Creates a common metadata repository
 Name: createrepo
 Version: 0.4.4
-Release: 0.1
+Release: 0.2
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
+Patch0: createrepo-0.4.4-dirfix.patch
 URL: http://linux.duke.edu/projects/metadata/
 BuildRoot: %{_tmppath}/%{name}-%{version}root
 BuildArchitectures: noarch
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -34,6 +36,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Aug 14 2006 Paul Nasrat <pnasrat at redhat.com> - 0.4.4-0.2
+- Fix for directory must exist error (#199228)
+
 * Fri May 05 2006 Jesse Keating <jkeating at redhat.com> - 0.4.4-0.1
 - Fiddle revision to build for FC-5
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 17:44:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 13:44:27 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.122, 1.123 mkinitrd.spec, 1.148,
	1.149 sources, 1.148, 1.149 mkinitrd-5.1.3-compile-fix.patch,
	1.2, NONE
Message-ID: <200608141744.k7EHiRdA028390@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28283

Modified Files:
	.cvsignore mkinitrd.spec sources 
Removed Files:
	mkinitrd-5.1.3-compile-fix.patch 
Log Message:
- update to mkinitrd-5.1.4
- update to bdevid-0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- .cvsignore	11 Aug 2006 21:09:11 -0000	1.122
+++ .cvsignore	14 Aug 2006 17:44:24 -0000	1.123
@@ -1 +1,2 @@
-mkinitrd-5.1.3.tar.bz2
+bdevid-0.4.tar.bz2
+mkinitrd-5.1.4.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- mkinitrd.spec	14 Aug 2006 09:43:37 -0000	1.148
+++ mkinitrd.spec	14 Aug 2006 17:44:24 -0000	1.149
@@ -3,14 +3,13 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.1.3
-Release: 2
+Version: 5.1.4
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
-%define BDEVID_VERSION 0.3
+%define BDEVID_VERSION 0.4
 Source1: bdevid-%{BDEVID_VERSION}.tar.bz2
-Patch0: mkinitrd-5.1.3-compile-fix.patch
 
 ExclusiveOs: Linux
 Prereq: dev
@@ -47,13 +46,12 @@
 %package devel
 Summary: C header files and library for functionality exported by libnash.
 Group: Development/Libraries
-Requires: glibc-devel, pkgconfig, e2fsprogs-devel, mkinitrd-devel, glib2-devel
-Requires: libbdevid
+Requires: glibc-devel, pkgconfig, e2fsprogs-devel, mkinitrd, glib2-devel
 
 %package -n libbdevid-python
 Summary: Python bindings for libbdevid
 Group: System Environment/Libraries
-Requires: glib2, e2fsprogs, libselinux, libsepol, device-mapper, libbdevid,
+Requires: glib2, e2fsprogs, libselinux, libsepol, device-mapper, mkinitrd
 Requires: python >= %{pyver}
 
 %description devel
@@ -66,8 +64,6 @@
 %setup -q -c -a 0
 %setup -q -c -a 1
 
-%patch0 -p0 -b .compile-fix
-
 %build
 cd mkinitrd-%{version}
 make LIB=%{_lib}
@@ -119,6 +115,10 @@
 /%{python_sitelib}/bdevid.so
 
 %changelog
+* Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 5.1.4-1
+- Fix requires for libbdevid
+- Make it safe to call nashLogger and nashLoggerV with no context.
+
 * Mon Aug 14 2006 Mark McLoughlin <markmc at redhat.com> - 5.1.3-2
 - Fix compile error
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- sources	11 Aug 2006 21:15:00 -0000	1.148
+++ sources	14 Aug 2006 17:44:24 -0000	1.149
@@ -1,2 +1,2 @@
-c5739a169cbc21261fdafef60844ecb6  mkinitrd-5.1.3.tar.bz2
-5fb48a0a1d1c641c96194e429742d53c  bdevid-0.3.tar.bz2
+d963851dff275f0af392cb25d3ad45fd  bdevid-0.4.tar.bz2
+f8802489c68e202481a1dff90c116d18  mkinitrd-5.1.4.tar.bz2


--- mkinitrd-5.1.3-compile-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 17:58:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 13:58:07 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.149,1.150 sources,1.149,1.150
Message-ID: <200608141758.k7EHw7LX025094@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6819

Modified Files:
	mkinitrd.spec sources 
Log Message:
- oops, don't need /sbin/bdevid yet



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- mkinitrd.spec	14 Aug 2006 17:44:24 -0000	1.149
+++ mkinitrd.spec	14 Aug 2006 17:58:05 -0000	1.150
@@ -82,6 +82,7 @@
 make LIB=%{_lib} BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
 cd ../bdevid-%{BDEVID_VERSION}
 make LIB=%{_lib} DESTDIR=$RPM_BUILD_ROOT install
+rm -f /sbin/bdevid
 
 %clean
 rm -rf $RPM_BUILD_ROOT


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- sources	14 Aug 2006 17:44:24 -0000	1.149
+++ sources	14 Aug 2006 17:58:05 -0000	1.150
@@ -1,2 +1,2 @@
 d963851dff275f0af392cb25d3ad45fd  bdevid-0.4.tar.bz2
-f8802489c68e202481a1dff90c116d18  mkinitrd-5.1.4.tar.bz2
+c11a1bd66e5d59ebc865092f127eae30  mkinitrd-5.1.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 17:59:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 13:59:16 -0400
Subject: rpms/gtk2/devel gtk+-2.10.1-search.patch, 1.1, 1.2 gtk2.spec, 1.168,
	1.169
Message-ID: <200608141759.k7EHxGjV026983@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk+-2.10.1-search.patch gtk2.spec 
Log Message:
fix a search bug


gtk+-2.10.1-search.patch:
 gtkfilechooserdefault.c | 1443 +++++++++++++++++++++++++++++++++++++++---------
 gtkfilechooserprivate.h |   42 +
 2 files changed, 1238 insertions(+), 247 deletions(-)

Index: gtk+-2.10.1-search.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk+-2.10.1-search.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk+-2.10.1-search.patch	24 Jul 2006 03:44:08 -0000	1.1
+++ gtk+-2.10.1-search.patch	14 Aug 2006 17:59:13 -0000	1.2
@@ -1,5 +1,5 @@
 --- gtk+-2.10.1/gtk/gtkfilechooserprivate.h.search	2006-07-18 12:36:18.000000000 -0400
-+++ gtk+-2.10.1/gtk/gtkfilechooserprivate.h	2006-07-23 23:29:10.000000000 -0400
++++ gtk+-2.10.1/gtk/gtkfilechooserprivate.h	2006-08-14 13:55:18.000000000 -0400
 @@ -147,6 +147,20 @@
    LOCATION_MODE_FILENAME_ENTRY
  } LocationMode;
@@ -97,7 +97,7 @@
  #if 0
    guint shortcuts_drag_outside : 1;
 --- gtk+-2.10.1/gtk/gtkfilechooserdefault.c.search	2006-07-18 12:36:16.000000000 -0400
-+++ gtk+-2.10.1/gtk/gtkfilechooserdefault.c	2006-07-23 23:42:57.000000000 -0400
++++ gtk+-2.10.1/gtk/gtkfilechooserdefault.c	2006-08-14 13:56:54.000000000 -0400
 @@ -78,6 +78,8 @@
  #include <errno.h>
  #include <string.h>
@@ -1994,7 +1994,7 @@
      {
        int filter_index;
  
-@@ -7766,28 +8621,43 @@
+@@ -7766,28 +8621,44 @@
  {
    GtkTreePath *cursor_path;
    const GtkFilePath *new_path;
@@ -2029,7 +2029,8 @@
 +
 +	      new_path = _gtk_file_system_model_get_path (impl->browse_files_model, &child_iter);
 +	      new_info = _gtk_file_system_model_get_info (impl->browse_files_model, &child_iter);
-+	      new_display_name = gtk_file_info_get_display_name (new_info);
++              if (new_info)
++	        new_display_name = gtk_file_info_get_display_name (new_info);
 +	    }
 +	}
 +      else
@@ -2055,7 +2056,7 @@
      }
  
    if (new_path != impl->preview_path &&
-@@ -7803,7 +8673,7 @@
+@@ -7803,7 +8674,7 @@
        if (new_path)
  	{
  	  impl->preview_path = gtk_file_path_copy (new_path);
@@ -2064,7 +2065,7 @@
  	}
        else
  	{
-@@ -7872,6 +8742,8 @@
+@@ -7872,6 +8743,8 @@
  {
    GtkFilePath *path;
  
@@ -2073,7 +2074,7 @@
    /* We ref the file chooser since volume_mount() may run a main loop, and the
     * user could close the file chooser window in the meantime.
     */
-@@ -7892,6 +8764,8 @@
+@@ -7892,6 +8765,8 @@
        if (path != NULL)
          {
            change_folder_and_display_error (impl, path);
@@ -2082,7 +2083,7 @@
            gtk_file_path_free (path);
          }
      }
-@@ -7924,7 +8798,10 @@
+@@ -7924,7 +8799,10 @@
      goto out;
  
    if (!error && gtk_file_info_get_is_folder (info))
@@ -2094,7 +2095,7 @@
    else
      gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (data->impl), data->path, NULL);
  
-@@ -7941,26 +8818,25 @@
+@@ -7941,26 +8819,25 @@
  			 GtkTreeIter           *iter)
  {
    gpointer col_data;
@@ -2126,7 +2127,7 @@
      {
        GtkFileSystemVolume *volume;
  
-@@ -7968,7 +8844,7 @@
+@@ -7968,7 +8845,7 @@
  
        shortcuts_activate_volume (impl, volume);
      }
@@ -2135,7 +2136,7 @@
      {
        struct ShortcutsActivateData *data;
  
-@@ -7981,6 +8857,10 @@
+@@ -7981,6 +8858,10 @@
  				  GTK_FILE_INFO_IS_FOLDER,
  				  shortcuts_activate_get_info_cb, data);
      }
@@ -2146,7 +2147,7 @@
  }
  
  /* Callback used when a row in the shortcuts list is activated */
-@@ -7993,15 +8873,13 @@
+@@ -7993,15 +8874,13 @@
    GtkTreeIter iter;
    GtkTreeIter child_iter;
  
@@ -2164,7 +2165,7 @@
  }
  
  /* Handler for GtkWidget::key-press-event on the shortcuts list */
-@@ -8041,8 +8919,15 @@
+@@ -8041,8 +8920,15 @@
  			gpointer           data)
  {
    GtkFileChooserDefault *impl = data;
@@ -2181,7 +2182,7 @@
  }
  
  static gboolean
-@@ -8054,6 +8939,9 @@
+@@ -8054,6 +8940,9 @@
  {
    GtkFileChooserDefault *impl = data;
  
@@ -2191,7 +2192,7 @@
    if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
        impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
      {
-@@ -8079,7 +8967,7 @@
+@@ -8079,7 +8968,7 @@
  			GtkFileChooserDefault *impl)
  {
    /* See if we are in the new folder editable row for Save mode */
@@ -2200,7 +2201,7 @@
      {
        const GtkFileInfo *info;
        gboolean had_selection;
-@@ -8094,6 +8982,8 @@
+@@ -8094,6 +8983,8 @@
  
   out:
  
@@ -2209,7 +2210,7 @@
    update_chooser_entry (impl);
    check_preview_change (impl);
    bookmarks_check_add_sensitivity (impl);
-@@ -8111,6 +9001,12 @@
+@@ -8111,6 +9002,12 @@
    GtkTreeIter iter, child_iter;
    const GtkFileInfo *info;
  
@@ -2222,7 +2223,7 @@
    if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->sort_model), &iter, path))
      return;
  
-@@ -8181,6 +9077,15 @@
+@@ -8181,6 +9078,15 @@
    const GtkFileInfo *info; 
    gboolean sensitive = TRUE;
  
@@ -2238,7 +2239,7 @@
    profile_start ("start", NULL);
    
    info = get_list_file_info (impl, iter);
-@@ -8230,13 +9135,33 @@
+@@ -8230,13 +9136,33 @@
  		     gpointer           data)
  {
    GtkFileChooserDefault *impl = data;
@@ -2274,7 +2275,7 @@
  		    NULL);
  
        return;
-@@ -8252,6 +9177,7 @@
+@@ -8252,6 +9178,7 @@
    g_object_set (cell,
  		"text", gtk_file_info_get_display_name (info),
  		"sensitive", sensitive,
@@ -2282,7 +2283,7 @@
  		NULL);
  }
  
-@@ -8313,7 +9239,6 @@
+@@ -8313,7 +9240,6 @@
  		      gpointer           data)
  {
    GtkFileChooserDefault *impl;
@@ -2290,7 +2291,7 @@
    GtkFileTime time_mtime;
    GDate mtime, now;
    int days_diff;
-@@ -8322,17 +9247,35 @@
+@@ -8322,17 +9248,35 @@
  
    impl = data;
  
@@ -2334,7 +2335,7 @@
  
    if (time_mtime == 0)
      strcpy (buf, _("Unknown"));
-@@ -8363,10 +9306,6 @@
+@@ -8363,10 +9307,6 @@
  	}
      }
  
@@ -2345,7 +2346,7 @@
    g_object_set (cell,
  		"text", buf,
  		"sensitive", sensitive,
-@@ -8384,7 +9323,23 @@
+@@ -8384,7 +9324,23 @@
  static void
  location_popup_handler (GtkFileChooserDefault *impl,
  			const gchar           *path)
@@ -2370,7 +2371,7 @@
    if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
        || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
      {
-@@ -8439,6 +9394,7 @@
+@@ -8439,6 +9395,7 @@
      g_assert_not_reached ();
  
    shortcuts_activate_iter (impl, &iter);
@@ -2378,7 +2379,7 @@
  }
  
  /* Handler for the "home-folder" keybinding signal */
-@@ -8483,26 +9439,26 @@
+@@ -8483,26 +9440,26 @@
  /* Drag and drop interfaces */
  
  static void
@@ -2411,7 +2412,7 @@
  
    pos = *gtk_tree_path_get_indices (path);
    bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS);
-@@ -8512,13 +9468,13 @@
+@@ -8512,13 +9469,13 @@
  
  /* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
  static gboolean
@@ -2430,7 +2431,7 @@
  
    /* FIXME */
  
-@@ -8527,30 +9483,30 @@
+@@ -8527,30 +9484,30 @@
  
  /* Fill the GtkTreeDragSourceIface vtable */
  static void


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gtk2.spec	9 Aug 2006 21:25:49 -0000	1.168
+++ gtk2.spec	14 Aug 2006 17:59:13 -0000	1.169
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -282,6 +282,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.1-3.fc6
+- Fix a problem with the search patch
+
 * Wed Aug  9 2006 Ray Strode <rstrode at redhat.com> - 2.10.1-2
 - patch from Jonathan Matthew <jontahn at kaolin.wh9.net> to fix
   crash in GtkTreeModelFilter (upstream bug 346800)



From fedora-cvs-commits at redhat.com  Mon Aug 14 18:04:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 14:04:26 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.150,1.151
Message-ID: <200608141804.k7EI4Q3U027271@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27252

Modified Files:
	mkinitrd.spec 
Log Message:
- duh, I'm stoopid



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- mkinitrd.spec	14 Aug 2006 17:58:05 -0000	1.150
+++ mkinitrd.spec	14 Aug 2006 18:04:23 -0000	1.151
@@ -82,7 +82,7 @@
 make LIB=%{_lib} BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
 cd ../bdevid-%{BDEVID_VERSION}
 make LIB=%{_lib} DESTDIR=$RPM_BUILD_ROOT install
-rm -f /sbin/bdevid
+rm -f $RPM_BUILD_ROOT/sbin/bdevid
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Mon Aug 14 18:04:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 14:04:56 -0400
Subject: rpms/dhcdbd/devel .cvsignore, 1.18, 1.19 dhcdbd.spec, 1.33,
	1.34 sources, 1.28, 1.29 dhcdbd-1.15-dbus-deprecated.patch,
	1.1, NONE dhcdbd.init, 1.6, NONE
Message-ID: <200608141804.k7EI4uvC027302@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27287

Modified Files:
	.cvsignore dhcdbd.spec sources 
Removed Files:
	dhcdbd-1.15-dbus-deprecated.patch dhcdbd.init 
Log Message:
- Rolled in dbus-deprecated patch changes to upstream source
- Corrected init script problems (#202219)
- Install the init script from the source archive, not SOURCES



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	30 May 2006 21:24:14 -0000	1.18
+++ .cvsignore	14 Aug 2006 18:04:53 -0000	1.19
@@ -1,17 +1 @@
-dhcdbd-1.tar.gz
-dhcdbd-1.0.tar.gz
-dhcdbd-1.1.tar.gz
-dhcdbd-1.2.tar.gz
-dhcdbd-1.3.tar.gz
-dhcdbd-1.4.tar.gz
-dhcdbd-1.5.tar.gz
-dhcdbd-1.6.tar.gz
-dhcdbd-1.7.tar.gz
-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
-dhcdbd-1.15.tar.gz
+dhcdbd-1.16.tar.gz


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dhcdbd.spec	19 Jul 2006 13:55:49 -0000	1.33
+++ dhcdbd.spec	14 Aug 2006 18:04:53 -0000	1.34
@@ -8,15 +8,13 @@
 #  initscript and be run as root during boot .
 #
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options.
-Name: 	   dhcdbd
-Version:   1.15
-Release:   1.FC6.3
+Name:      dhcdbd
+Version:   1.16
+Release:   1%{?dist}
 License:   GPL
 Group:     System Environment/Daemons
-URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz
+URL:       http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.gz
 Source0:   %{name}-%{version}.tar.gz
-Source1:   dhcdbd.init
-Patch0: dhcdbd-1.15-dbus-deprecated.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:  dhclient >= 3.0.2-12, dbus >= 0.6
 BuildRequires: dbus-devel >= 0.90
@@ -25,9 +23,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dbus-deprecated
 
-cp -fp %SOURCE1 RedHat/
 # Copy latest .spec file to RedHat source dir so that up-to-date %doc/CHANGES can be generated
 if [ -e %{_specdir}/%{name}.spec ]; then
 # looks like beehive build. dhcdbd.spec is in %{_specdir}, not %{_srcdir} 
@@ -57,7 +53,7 @@
 DESTDIR=$RPM_BUILD_ROOT make install
 %if ! %{DHCDBD_SETUID}
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -c -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcdbd
+install -c -m 755 RedHat/dhcdbd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcdbd
 %endif
 %if %{NODEBUGINFO}
 /usr/lib/rpm/brp-compress
@@ -95,6 +91,11 @@
 %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h
 
 %changelog
+* Mon Aug 14 2006 David Cantrell <dcantrell at redhat.com> - 1.16-1
+- Rolled in dbus-deprecated patch changes to upstream source
+- Corrected init script problems (#202219)
+- Install the init script from the source archive, not SOURCES
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 1.15-1.FC6.3
 - Rebuild against new dbus
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	30 May 2006 21:24:14 -0000	1.28
+++ sources	14 Aug 2006 18:04:53 -0000	1.29
@@ -1 +1 @@
-113497d34630ea9fc15a10cb730d4fe1  dhcdbd-1.15.tar.gz
+002e9d7d85a2f0e6261b6bf501c53a3e  dhcdbd-1.16.tar.gz


--- dhcdbd-1.15-dbus-deprecated.patch DELETED ---


--- dhcdbd.init DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 18:16:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 14:16:11 -0400
Subject: rpms/kernel/devel git-geode.patch, NONE, 1.1 kernel-2.6.spec, 1.2565,
	1.2566
Message-ID: <200608141816.k7EIGBow027646@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	git-geode.patch 
Log Message:
merge framebuffer driver for OLPC

git-geode.patch:
 arch/i386/Kconfig                |    9 +++
 arch/i386/boot/setup.S           |    5 +
 drivers/video/Kconfig            |    6 +-
 drivers/video/console/Kconfig    |    4 -
 drivers/video/geode/Kconfig      |   20 +++++++
 drivers/video/geode/display_gx.c |   22 ++++++--
 drivers/video/geode/display_gx.h |    7 ++
 drivers/video/geode/gxfb_core.c  |   57 ++++++++++++++++++--
 drivers/video/geode/video_gx.c   |  107 ++++++++++++++++++++++++++++++++++-----
 drivers/video/geode/video_gx.h   |   25 +++++++++
 include/linux/pci_ids.h          |    5 -
 11 files changed, 237 insertions(+), 30 deletions(-)

--- NEW FILE git-geode.patch ---
This patch aggregates changesets from Jordan Crouse's AMD Geode GIT tree.

It contains the necessary changes to support the framebuffer driver (gxfb) on 
OLPC's boards without VGA support.

http://git.infradead.org/?p=users/jcrouse/geode.git;a=summary

 arch/i386/Kconfig                |    9 +++
 arch/i386/boot/setup.S           |    5 +
 drivers/video/Kconfig            |    6 +-
 drivers/video/console/Kconfig    |    4 -
 drivers/video/geode/Kconfig      |   20 +++++++
 drivers/video/geode/display_gx.c |   22 ++++++--
 drivers/video/geode/display_gx.h |    7 ++
 drivers/video/geode/gxfb_core.c  |   57 ++++++++++++++++++--
 drivers/video/geode/video_gx.c   |  107 ++++++++++++++++++++++++++++++++++----- drivers/video/geode/video_gx.h   |   25 +++++++++
 include/linux/pci_ids.h          |    5 -
 11 files changed, 237 insertions(+), 30 deletions(-)

diff -Nur linux-2.6-linus/arch/i386/boot/setup.S linux-2.6-geode/arch/i386/boot/setup.S
--- linux-2.6-linus/arch/i386/boot/setup.S	2006-07-23 21:03:05.000000000 +0100
+++ linux-2.6-geode/arch/i386/boot/setup.S	2006-08-08 16:48:27.000000000 +0100
@@ -394,10 +394,13 @@
 	xorw	%bx, %bx
 	int	$0x16
 
+#ifndef CONFIG_VGA_NOPROBE
+
 # Check for video adapter and its parameters and allow the
 # user to browse video modes.
 	call	video				# NOTE: we need %ds pointing
 						# to bootsector
+#endif
 
 # Get hd0 data...
 	xorw	%ax, %ax
@@ -1006,9 +1009,11 @@
 	.word	gdt_end - gdt - 1		# gdt limit
 	.word	0, 0				# gdt base (filled in later)
 
+#ifndef CONFIG_VGA_NOPROBE
 # Include video setup & detection code
 
 #include "video.S"
+#endif
 
 # Setup signature -- must be last
 setup_sig1:	.word	SIG1
diff -Nur linux-2.6-linus/arch/i386/Kconfig linux-2.6-geode/arch/i386/Kconfig
--- linux-2.6-linus/arch/i386/Kconfig	2006-07-23 21:03:05.000000000 +0100
+++ linux-2.6-geode/arch/i386/Kconfig	2006-08-08 16:48:27.000000000 +0100
@@ -735,6 +735,15 @@
 
 	  If unsure, say Y. Only embedded should say N here.
 
+config VGA_NOPROBE
+       bool "Don't probe VGA at boot" if EMBEDDED
+       default n
+       help
+         Saying Y here will cause the kernel to not probe VGA at boot time.
+         This will break everything that depends on the probed screen
+         data.  Say N here unless you are absolutely sure this is what you
+         want.
+
 source kernel/Kconfig.hz
 
 config KEXEC
diff -Nur linux-2.6-linus/drivers/video/console/Kconfig linux-2.6-geode/drivers/video/console/Kconfig
--- linux-2.6-linus/drivers/video/console/Kconfig	2006-07-23 21:03:05.000000000 +0100
+++ linux-2.6-geode/drivers/video/console/Kconfig	2006-08-08 16:48:27.000000000 +0100
@@ -5,8 +5,8 @@
 menu "Console display driver support"
 
 config VGA_CONSOLE
-	bool "VGA text console" if EMBEDDED || !X86
-	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE
+	bool "VGA text console" if (EMBEDDED || !X86)
+	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !VGA_NOPROBE
 	default y
 	help
 	  Saying Y here will allow you to use Linux in text mode through a
diff -Nur linux-2.6-linus/drivers/video/geode/display_gx.c linux-2.6-geode/drivers/video/geode/display_gx.c
--- linux-2.6-linus/drivers/video/geode/display_gx.c	2006-07-23 21:03:05.000000000 +0100
+++ linux-2.6-geode/drivers/video/geode/display_gx.c	2006-08-08 16:48:27.000000000 +0100
@@ -21,11 +21,26 @@
 #include "geodefb.h"
 #include "display_gx.h"
 
-int gx_frame_buffer_size(void)
+#ifdef CONFIG_FB_GEODE_GX_SET_FBSIZE
+unsigned int gx_frame_buffer_size(void) {
+	return CONFIG_FB_GEODE_GX_FBSIZE;
+}
+#else
+unsigned int gx_frame_buffer_size(void)
 {
-	/* Assuming 16 MiB. */
-	return 16*1024*1024;
+	unsigned int val;
+
+	/* FB size is reported by a virtual register */
+	/* Virtual register class = 0x02 */
+	/* VG_MEM_SIZE(512Kb units) = 0x00 */
+
+	outw(0xFC53, 0xAC1C);
+	outw(0x0200, 0xAC1C);
+
+	val = (unsigned int)(inw(0xAC1E)) & 0xFFl;
+	return (val << 19);
 }
+#endif
 
 int gx_line_delta(int xres, int bpp)
 {
@@ -81,6 +96,7 @@
 	writel(((info->var.xres * info->var.bits_per_pixel/8) >> 3) + 2,
 	       par->dc_regs + DC_LINE_SIZE);
 
+
 	/* Enable graphics and video data and unmask address lines. */
 	dcfg |= DC_DCFG_GDEN | DC_DCFG_VDEN | DC_DCFG_A20M | DC_DCFG_A18M;
 
diff -Nur linux-2.6-linus/drivers/video/geode/display_gx.h linux-2.6-geode/drivers/video/geode/display_gx.h
--- linux-2.6-linus/drivers/video/geode/display_gx.h	2006-07-23 21:03:05.000000000 +0100
+++ linux-2.6-geode/drivers/video/geode/display_gx.h	2006-08-08 16:48:27.000000000 +0100
@@ -11,11 +11,15 @@
 #ifndef __DISPLAY_GX_H__
 #define __DISPLAY_GX_H__
 
-int gx_frame_buffer_size(void);
+unsigned int gx_frame_buffer_size(void);
 int gx_line_delta(int xres, int bpp);
 
 extern struct geode_dc_ops gx_dc_ops;
 
+/* MSR that tells us if a TFT or CRT is attached */
+#define GLD_MSR_CONFIG   0xC0002001
+#define GLD_MSR_CONFIG_DM_FP 0x40
+
 /* Display controller registers */
 
 #define DC_UNLOCK 0x00
@@ -93,4 +97,5 @@
 #define DC_PAL_ADDRESS 0x70
 #define DC_PAL_DATA    0x74
 
+#define DC_GLIU0_MEM_OFFSET 0x84
 #endif /* !__DISPLAY_GX1_H__ */
diff -Nur linux-2.6-linus/drivers/video/geode/gxfb_core.c linux-2.6-geode/drivers/video/geode/gxfb_core.c
--- linux-2.6-linus/drivers/video/geode/gxfb_core.c	2006-07-23 21:03:05.000000000 +0100
+++ linux-2.6-geode/drivers/video/geode/gxfb_core.c	2006-08-08 16:48:27.000000000 +0100
@@ -35,10 +35,10 @@
 #include "display_gx.h"
 #include "video_gx.h"
 
-static char mode_option[32] = "640x480-16 at 60";
+static char *mode_option;
 
 /* Modes relevant to the GX (taken from modedb.c) */
-static const struct fb_videomode __initdata gx_modedb[] = {
+static const struct fb_videomode gx_modedb[] __initdata = {
 	/* 640x480-60 VESA */
 	{ NULL, 60, 640, 480, 39682,  48, 16, 33, 10, 96, 2,
 	  0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@@ -103,6 +103,9 @@
 	{ NULL, 85, 1600, 1200, 4357, 304, 64, 46, 1, 192, 3,
 	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
 	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+	{ "OLPC-1", 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3,
+	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+	  FB_VMODE_NONINTERLACED, 0 }
 };
 
 static int gxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
@@ -240,6 +243,12 @@
 	if (!info->screen_base)
 		return -ENOMEM;
 
+	/* Set the 16MB aligned base address of the graphics memory region
+	 * in the display controller */
+
+	writel(info->fix.smem_start & 0xFF000000,
+			par->dc_regs + DC_GLIU0_MEM_OFFSET);
+
 	dev_info(&dev->dev, "%d Kibyte of video memory at 0x%lx\n",
 		 info->fix.smem_len / 1024, info->fix.smem_start);
 
@@ -302,6 +311,7 @@
 	struct geodefb_par *par;
 	struct fb_info *info;
 	int ret;
+	unsigned long val;
 
 	info = gxfb_init_fbinfo(&pdev->dev);
 	if (!info)
@@ -317,6 +327,15 @@
 		goto err;
 	}
 
+	/* Figure out if this is a TFT or CRT part */
+
+	rdmsrl(GLD_MSR_CONFIG, val);
+
+	if ((val & GLD_MSR_CONFIG_DM_FP) == GLD_MSR_CONFIG_DM_FP)
+		par->enable_crt = 0;
+	else
+		par->enable_crt = 1;
+
 	ret = fb_find_mode(&info->var, info, mode_option,
 			   gx_modedb, ARRAY_SIZE(gx_modedb), NULL, 16);
 	if (ret == 0 || ret == 4) {
@@ -325,7 +344,8 @@
 		goto err;
 	}
 
-        /* Clear the frame buffer of garbage. */
+       
+	/* Clear the frame buffer of garbage. */
         memset_io(info->screen_base, 0, info->fix.smem_len);
 
 	gxfb_check_var(&info->var, info);
@@ -380,7 +400,7 @@
 }
 
 static struct pci_device_id gxfb_id_table[] = {
-	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_VIDEO,
+	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_GX_VIDEO,
 	  PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
 	  0xff0000, 0 },
 	{ 0, }
@@ -395,11 +415,34 @@
 	.remove		= gxfb_remove,
 };
 
+#ifndef MODULE
+static int __init gxfb_setup(char *options) {
+
+	char *opt;
+
+	if (!options || !*options)
+		return 0;
+
+	while((opt = strsep(&options, ",")) != NULL) {
+		if (!*opt)
+			continue;
+
+		mode_option = opt;
+	}
+
+	return 0;
+}
+#endif
+
 static int __init gxfb_init(void)
 {
 #ifndef MODULE
-	if (fb_get_options("gxfb", NULL))
+	char *option = NULL;
+
+	if (fb_get_options("gxfb", &option))
 		return -ENODEV;
+
+	gxfb_setup(option);
 #endif
 	return pci_register_driver(&gxfb_driver);
 }
@@ -412,8 +455,8 @@
 module_init(gxfb_init);
 module_exit(gxfb_cleanup);
 
-module_param_string(mode, mode_option, sizeof(mode_option), 0444);
-MODULE_PARM_DESC(mode, "video mode (<x>x<y>[-<bpp>][@<refr>])");
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])");
 
 MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode GX");
 MODULE_LICENSE("GPL");
diff -Nur linux-2.6-linus/drivers/video/geode/Kconfig linux-2.6-geode/drivers/video/geode/Kconfig
--- linux-2.6-linus/drivers/video/geode/Kconfig	2006-07-23 21:03:05.000000000 +0100
+++ linux-2.6-geode/drivers/video/geode/Kconfig	2006-08-08 16:48:27.000000000 +0100
@@ -23,6 +23,26 @@
 
 	  If unsure, say N.
 
+config FB_GEODE_GX_SET_FBSIZE
+	bool "Manually specify the Geode GX framebuffer size"
+	depends on FB_GEODE_GX
+	default n
+	---help---
+	  If you want to manually specify the size of your GX framebuffer,
+	  say Y here, otherwise say N to dynamically probe it.
+	  
+	  Say N unless you know what you are doing.
+
+config FB_GEODE_GX_FBSIZE
+	hex "Size of the GX framebuffer, in bytes"
+	depends on FB_GEODE_GX_SET_FBSIZE
+	default "0x1600000"
+	---help---
+	  Specify the size of the GX framebuffer.  Normally, you will
+	  want this to be MB aligned.  Common values are 0x80000 (8MB)
+	  and 0x1600000 (16MB).  Don't change this unless you know what
+	  you are doing
+
 config FB_GEODE_GX1
 	tristate "AMD Geode GX1 framebuffer support (EXPERIMENTAL)"
 	depends on FB && FB_GEODE && EXPERIMENTAL
diff -Nur linux-2.6-linus/drivers/video/geode/video_gx.c linux-2.6-geode/drivers/video/geode/video_gx.c
--- linux-2.6-linus/drivers/video/geode/video_gx.c	2006-07-23 21:03:05.000000000 +0100
+++ linux-2.6-geode/drivers/video/geode/video_gx.c	2006-08-08 16:48:27.000000000 +0100
@@ -175,13 +175,88 @@
 	} while (timeout-- && !(dotpll & MSR_GLCP_DOTPLL_LOCK));
 }
 
+static void
+gx_configure_tft(struct fb_info *info) {
+
+	struct geodefb_par *par = info->par;
+	unsigned long val;
+	unsigned long fp;
+
+	/* Set up the DF pad select MSR */
+
+	rdmsrl(GX_VP_MSR_PAD_SELECT, val);
+	val &= ~GX_VP_PAD_SELECT_MASK;
+	val |= GX_VP_PAD_SELECT_TFT;
+	wrmsrl(GX_VP_MSR_PAD_SELECT, val);
+
+	/* Turn off the panel */
+
+	fp = readl(par->vid_regs + GX_FP_PM);
+	fp &= ~GX_FP_PM_P;
+	writel(fp, par->vid_regs + GX_FP_PM);
+
+	/* Set timing 1 */
+
+	fp = readl(par->vid_regs + GX_FP_PT1);
+	fp &= GX_FP_PT1_VSIZE_MASK;
+	fp |= info->var.yres << GX_FP_PT1_VSIZE_SHIFT;
+	writel(fp, par->vid_regs + GX_FP_PT1);
+
+	/* Timing 2 */
+	/* Set bits that are always on for TFT */
+
+	fp = 0x0F100000;
+
+	/* Add sync polarity */
+
+	if (!(info->var.sync & FB_SYNC_VERT_HIGH_ACT))
+		fp |= GX_FP_PT2_VSP;
+
+	if (!(info->var.sync & FB_SYNC_HOR_HIGH_ACT))
+		fp |= GX_FP_PT2_HSP;
+
+	writel(fp, par->vid_regs + GX_FP_PT2);
+
+	/*  Set the dither control */
+	writel(0x70, par->vid_regs + GX_FP_DFC);
+
+	/* Enable the FP data and power (in case the BIOS didn't) */
+
+	fp = readl(par->vid_regs + GX_DCFG);
+	fp |= GX_DCFG_FP_PWR_EN | GX_DCFG_FP_DATA_EN;
+	writel(fp, par->vid_regs + GX_DCFG);
+
+	/* Unblank the panel */
+
+	fp = readl(par->vid_regs + GX_FP_PM);
+	fp |= GX_FP_PM_P;
+	writel(fp, par->vid_regs + GX_FP_PM);
+}
+
 static void gx_configure_display(struct fb_info *info)
 {
 	struct geodefb_par *par = info->par;
-	u32 dcfg, fp_pm;
+	u32 dcfg, misc;
+
+	/* Set up the MISC register */
+
+	misc = readl(par->vid_regs + GX_MISC);
+
+	/* Power up the DAC */
+	misc &= ~(GX_MISC_A_PWRDN | GX_MISC_DAC_PWRDN);
+
+	/* Disable gamma correction */
+	misc |= GX_MISC_GAM_EN;
+
+	writel(misc, par->vid_regs + GX_MISC);
 
+	/* Write the display configuration */
 	dcfg = readl(par->vid_regs + GX_DCFG);
 
+	/* Disable hsync and vsync */
+	dcfg &= ~(GX_DCFG_VSYNC_EN | GX_DCFG_HSYNC_EN);
+	writel(dcfg, par->vid_regs + GX_DCFG);
+
 	/* Clear bits from existing mode. */
 	dcfg &= ~(GX_DCFG_CRT_SYNC_SKW_MASK
 		  | GX_DCFG_CRT_HSYNC_POL   | GX_DCFG_CRT_VSYNC_POL
@@ -199,12 +274,19 @@
 	if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
 		dcfg |= GX_DCFG_CRT_VSYNC_POL;
 
+	/* Enable the display logic */
+	/* Set up the DACS to blank normally */
+
+	dcfg |= GX_DCFG_CRT_EN | GX_DCFG_DAC_BL_EN;
+
+	/* Enable the external DAC VREF? */
+
 	writel(dcfg, par->vid_regs + GX_DCFG);
 
-	/* Power on flat panel. */
-	fp_pm = readl(par->vid_regs + GX_FP_PM);
-	fp_pm |= GX_FP_PM_P;
-	writel(fp_pm, par->vid_regs + GX_FP_PM);
+	/* Set up the flat panel (if it is enabled) */
+
+	if (par->enable_crt == 0)
+		gx_configure_tft(info);
 }
 
 static int gx_blank_display(struct fb_info *info, int blank_mode)
@@ -245,12 +327,15 @@
 	writel(dcfg, par->vid_regs + GX_DCFG);
 
 	/* Power on/off flat panel. */
-	fp_pm = readl(par->vid_regs + GX_FP_PM);
-	if (blank_mode == FB_BLANK_POWERDOWN)
-		fp_pm &= ~GX_FP_PM_P;
-	else
-		fp_pm |= GX_FP_PM_P;
-	writel(fp_pm, par->vid_regs + GX_FP_PM);
+
+	if (par->enable_crt == 0) {
+		fp_pm = readl(par->vid_regs + GX_FP_PM);
+		if (blank_mode == FB_BLANK_POWERDOWN)
+			fp_pm &= ~GX_FP_PM_P;
+		else
+			fp_pm |= GX_FP_PM_P;
+		writel(fp_pm, par->vid_regs + GX_FP_PM);
+	}
 
 	return 0;
 }
diff -Nur linux-2.6-linus/drivers/video/geode/video_gx.h linux-2.6-geode/drivers/video/geode/video_gx.h
--- linux-2.6-linus/drivers/video/geode/video_gx.h	2006-07-23 21:03:05.000000000 +0100
+++ linux-2.6-geode/drivers/video/geode/video_gx.h	2006-08-08 16:48:27.000000000 +0100
@@ -13,6 +13,11 @@
 
 extern struct geode_vid_ops gx_vid_ops;
 
+/* GX Flatpanel control MSR */
+#define GX_VP_MSR_PAD_SELECT           0xC0002011
+#define GX_VP_PAD_SELECT_MASK          0x3FFFFFFF
+#define GX_VP_PAD_SELECT_TFT           0x1FFFFFFF
+
 /* Geode GX video processor registers */
 
 #define GX_DCFG		0x0008
@@ -20,6 +25,8 @@
 #  define GX_DCFG_HSYNC_EN		0x00000002
 #  define GX_DCFG_VSYNC_EN		0x00000004
 #  define GX_DCFG_DAC_BL_EN		0x00000008
+#  define GX_DCFG_FP_PWR_EN		0x00000040
+#  define GX_DCFG_FP_DATA_EN		0x00000080
 #  define GX_DCFG_CRT_HSYNC_POL		0x00000100
 #  define GX_DCFG_CRT_VSYNC_POL		0x00000200
 #  define GX_DCFG_CRT_SYNC_SKW_MASK	0x0001C000
@@ -28,10 +35,28 @@
 #  define GX_DCFG_GV_GAM		0x00200000
 #  define GX_DCFG_DAC_VREF		0x04000000
 
+/* Geode GX MISC video configuration */
+
+#define GX_MISC 0x50
+#define GX_MISC_GAM_EN     0x00000001
+#define GX_MISC_DAC_PWRDN  0x00000400
+#define GX_MISC_A_PWRDN    0x00000800
+
 /* Geode GX flat panel display control registers */
+
+#define GX_FP_PT1 0x0400
+#define GX_FP_PT1_VSIZE_MASK 0x7FF0000
+#define GX_FP_PT1_VSIZE_SHIFT 16
+
+#define GX_FP_PT2 0x408
+#define GX_FP_PT2_VSP (1 << 23)
+#define GX_FP_PT2_HSP (1 << 22)
+
 #define GX_FP_PM 0x410
 #  define GX_FP_PM_P 0x01000000
 
+#define GX_FP_DFC 0x418
+
 /* Geode GX clock control MSRs */
 
 #define MSR_GLCP_SYS_RSTPLL	0x4c000014
diff -Nur linux-2.6-linus/drivers/video/Kconfig linux-2.6-geode/drivers/video/Kconfig
--- linux-2.6-linus/drivers/video/Kconfig	2006-07-23 21:03:05.000000000 +0100
+++ linux-2.6-geode/drivers/video/Kconfig	2006-08-08 16:48:27.000000000 +0100
@@ -540,7 +540,7 @@
 
 config FB_VESA
 	bool "VESA VGA graphics support"
-	depends on (FB = y) && X86
+	depends on (FB = y) && X86 && !VGA_NOPROBE
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -828,7 +828,7 @@
 
 config FB_INTEL
 	tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
-	depends on FB && EXPERIMENTAL && PCI && X86
+	depends on FB && EXPERIMENTAL && PCI && X86 && !VGA_NOPROBE
 	select AGP
 	select AGP_INTEL
 	select FB_MODE_HELPERS
@@ -1166,7 +1166,7 @@
 
 config FB_SIS
 	tristate "SiS/XGI display support"
-	depends on FB && PCI
+	depends on FB && PCI && !VGA_NOPROBE
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
diff -Nur linux-2.6-linus/include/linux/pci_ids.h linux-2.6-geode/include/linux/pci_ids.h
--- linux-2.6-linus/include/linux/pci_ids.h	2006-07-23 21:03:05.000000000 +0100
+++ linux-2.6-geode/include/linux/pci_ids.h	2006-08-08 16:48:27.000000000 +0100
@@ -390,7 +390,7 @@
 #define PCI_DEVICE_ID_NS_CS5535_IDE	0x002d
 #define PCI_DEVICE_ID_NS_CS5535_AUDIO	0x002e
 #define PCI_DEVICE_ID_NS_CS5535_USB	0x002f
-#define PCI_DEVICE_ID_NS_CS5535_VIDEO	0x0030
+#define PCI_DEVICE_ID_NS_GX_VIDEO	0x0030
 #define PCI_DEVICE_ID_NS_SATURN		0x0035
 #define PCI_DEVICE_ID_NS_SCx200_BRIDGE	0x0500
 #define PCI_DEVICE_ID_NS_SCx200_SMI	0x0501
@@ -403,8 +403,7 @@
 #define PCI_DEVICE_ID_NS_SC1100_XBUS	0x0515
 #define PCI_DEVICE_ID_NS_87410		0xd001
 
-#define PCI_DEVICE_ID_NS_CS5535_HOST_BRIDGE  0x0028
-#define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE   0x002b
+#define PCI_DEVICE_ID_NS_GX_HOST_BRIDGE  0x0028
 
 #define PCI_VENDOR_ID_TSENG		0x100c
 #define PCI_DEVICE_ID_TSENG_W32P_2	0x3202


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2565
retrieving revision 1.2566
diff -u -r1.2565 -r1.2566
--- kernel-2.6.spec	14 Aug 2006 16:37:57 -0000	1.2565
+++ kernel-2.6.spec	14 Aug 2006 18:16:07 -0000	1.2566
@@ -267,6 +267,7 @@
 #
 Patch1: patch-2.6.18-rc4.bz2
 Patch2: git-gregkh.patch
+Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -690,6 +691,7 @@
 # Update to latest upstream.
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1694,6 +1696,7 @@
 * Mon Aug 14 2006 Dave Jones <davej at redhat.com>
 - Update to squashfs 3.1 which should fix stack overflows seen
   during installation.
+- Merge framebuffer driver for OLPC.
 
 * Sun Aug 13 2006 Juan Quintela <quintela at redhat.com>
 - enable ia64 xen again.



From fedora-cvs-commits at redhat.com  Mon Aug 14 18:24:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 14:24:55 -0400
Subject: rpms/gnome-session/devel
	gnome-session-2.15.91-desensitize-invalid-buttons.patch, NONE,
	1.1 gnome-session.spec, 1.81,
	1.82 gnome-session-2.13.92-desensitize-invalid-buttons.patch,
	1.1, NONE
Message-ID: <200608141824.k7EIOt8S010344@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-session.spec 
Added Files:
	gnome-session-2.15.91-desensitize-invalid-buttons.patch 
Removed Files:
	gnome-session-2.13.92-desensitize-invalid-buttons.patch 
Log Message:
- Update to 2.15.91


gnome-session-2.15.91-desensitize-invalid-buttons.patch:
 session-properties-capplet.c |   71 +++++++++++++++++++++++++++++--------------
 session-properties-capplet.h |    2 +
 startup-programs.c           |   43 ++++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 23 deletions(-)

--- NEW FILE gnome-session-2.15.91-desensitize-invalid-buttons.patch ---
--- gnome-session-2.15.91/gnome-session/startup-programs.c.desensitize-invalid-buttons	2006-08-14 13:59:45.000000000 -0400
+++ gnome-session-2.15.91/gnome-session/startup-programs.c	2006-08-14 14:01:23.000000000 -0400
@@ -22,6 +22,7 @@
 #include <config.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <glib/gstdio.h>
 #include <gnome.h>
 #include <libgnome/gnome-desktop-item.h>
@@ -541,6 +542,48 @@ startup_list_delete (GSList **sl, GtkTre
   spc_write_state ();
 }
 
+gboolean
+startup_list_can_edit (GSList **sl, GtkTreeModel *model, GtkTreeSelection *sel)
+{
+  ManualClient *client;
+  GtkTreeIter iter;
+  char *path, *basename;
+  const char * const * system_dirs;
+  int i;
+  gboolean can_edit = TRUE;
+
+  if (!gtk_tree_selection_get_selected (sel, NULL, &iter)) return FALSE;
+
+  gtk_tree_model_get (model, &iter, 0, &client, -1);
+
+  if (g_file_test (client->desktop_file, G_FILE_TEST_EXISTS) && 
+      access (client->desktop_file, W_OK) != 0)
+    return FALSE;
+
+  basename = g_path_get_basename (client->desktop_file);
+
+  system_dirs = g_get_system_data_dirs ();
+  for (i = 0; system_dirs[i] != NULL && can_edit; i++)
+    {
+      path = g_build_filename (system_dirs[i], "gnome", "autostart", basename, NULL);
+      if (g_file_test (path, G_FILE_TEST_EXISTS) && access (path, W_OK) != 0)
+        can_edit = FALSE;
+      g_free (path);
+    }
+
+  system_dirs = g_get_system_config_dirs ();
+  for (i = 0; system_dirs[i] != NULL && can_edit; i++)
+    {
+      path = g_build_filename (system_dirs[i], "autostart", basename, NULL);
+      if (g_file_test (path, G_FILE_TEST_EXISTS) && access (path, W_OK) != 0)
+        can_edit = FALSE;
+      g_free (path);
+    }
+
+  g_free (basename);
+  return can_edit;
+}
+
 /* Check if the selected client can be enabled */
 gboolean
 startup_list_can_enable (GSList **sl, GtkTreeModel *model, GtkTreeSelection *sel)
--- gnome-session-2.15.91/gnome-session/session-properties-capplet.c.desensitize-invalid-buttons	2006-08-14 14:02:21.000000000 -0400
+++ gnome-session-2.15.91/gnome-session/session-properties-capplet.c	2006-08-14 14:15:57.000000000 -0400
@@ -91,16 +91,14 @@ static void saved_sessions (GtkWidget *w
 #define SESSION_STOCK_EDIT "session-stock-edit"
 
 static void
-selection_changed_cb (GtkTreeSelection *selection, GtkTreeView *view)
+session_selection_changed_cb (GtkTreeSelection *selection, GtkTreeView *view)
 {
   gboolean sel;
   GtkWidget *edit_button;
   GtkWidget *delete_button;
-  GtkWidget *enable_button;
 
   edit_button = g_object_get_data (G_OBJECT (view), "edit");
   delete_button = g_object_get_data (G_OBJECT (view), "delete");
-  enable_button = g_object_get_data (G_OBJECT (view), "enable");
 
   sel = gtk_tree_selection_get_selected (selection, NULL, NULL);
 
@@ -109,29 +107,56 @@ selection_changed_cb (GtkTreeSelection *
 
   if (delete_button)
     gtk_widget_set_sensitive (delete_button, sel);
+}
+
+static void
+startup_selection_changed_cb (GtkTreeSelection *selection, GtkTreeView *view)
+{
+  gboolean sel, can_edit;
+  GtkWidget *edit_button;
+  GtkWidget *delete_button;
+  GtkWidget *enable_button;
 
-  if (enable_button)
+  edit_button = g_object_get_data (G_OBJECT (view), "edit");
+  delete_button = g_object_get_data (G_OBJECT (view), "delete");
+  enable_button = g_object_get_data (G_OBJECT (view), "enable");
+
+  if (!edit_button || !delete_button || !enable_button)
+    return;
+
+  sel = gtk_tree_selection_get_selected (selection, NULL, NULL);
+  can_edit = startup_list_can_edit (&startup_list, startup_store, startup_sel);
+
+  if (sel && can_edit) 
+    {
+      gtk_widget_set_sensitive (edit_button, TRUE);
+      gtk_widget_set_sensitive (delete_button, TRUE);
+    } 
+  else 
     {
-      if (sel)
+      gtk_widget_set_sensitive (edit_button, FALSE);
+      gtk_widget_set_sensitive (delete_button, FALSE);
+    }
+
+  if (sel)
+    {
+      if (startup_list_can_enable (&startup_list, startup_store, startup_sel))
         {
-          if (startup_list_can_enable (&startup_list, startup_store, startup_sel))
-            {
-              gtk_button_set_label (GTK_BUTTON (enable_button), _("Enable"));
-              gtk_button_set_image (GTK_BUTTON (enable_button),
-                                    gtk_image_new_from_stock (GTK_STOCK_YES, GTK_ICON_SIZE_BUTTON));
-            }
-          else
-            {
-              gtk_button_set_label (GTK_BUTTON (enable_button), _("Disable"));
-              gtk_button_set_image (GTK_BUTTON (enable_button),
-                                    gtk_image_new_from_stock (GTK_STOCK_NO, GTK_ICON_SIZE_BUTTON));
-            }
-          
-          gtk_widget_set_sensitive (enable_button, TRUE);
+          gtk_button_set_label (GTK_BUTTON (enable_button), _("Enable"));
+          gtk_button_set_image (GTK_BUTTON (enable_button),
+                                gtk_image_new_from_stock (GTK_STOCK_YES, GTK_ICON_SIZE_BUTTON));
         }
       else
-        gtk_widget_set_sensitive (enable_button, FALSE);
+        {
+          gtk_button_set_label (GTK_BUTTON (enable_button), _("Disable"));
+          gtk_button_set_image (GTK_BUTTON (enable_button),
+                                gtk_image_new_from_stock (GTK_STOCK_NO, GTK_ICON_SIZE_BUTTON));
+        }
+      
+      gtk_widget_set_sensitive (enable_button, TRUE);
     }
+  else
+    gtk_widget_set_sensitive (enable_button, FALSE);
 }
 
 static void
@@ -345,7 +370,7 @@ capplet_build (void)
 		  		 GTK_WIDGET (sessions_view));
   sessions_sel = gtk_tree_view_get_selection (sessions_view);
   gtk_tree_selection_set_mode (sessions_sel, GTK_SELECTION_SINGLE);
-  g_signal_connect (G_OBJECT (sessions_sel), "changed", (GCallback) selection_changed_cb, sessions_view);
+  g_signal_connect (G_OBJECT (sessions_sel), "changed", (GCallback) session_selection_changed_cb, sessions_view);
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes (_("Session Name"), renderer, "text", 0, NULL);
   gtk_tree_view_append_column (sessions_view, column);
@@ -433,7 +458,7 @@ capplet_build (void)
 		  		 GTK_WIDGET (startup_view));
   startup_sel = gtk_tree_view_get_selection (startup_view);
   gtk_tree_selection_set_mode (startup_sel, GTK_SELECTION_SINGLE);
-  g_signal_connect (G_OBJECT (startup_sel), "changed", (GCallback) selection_changed_cb, startup_view);
+  g_signal_connect (G_OBJECT (startup_sel), "changed", (GCallback) startup_selection_changed_cb, startup_view);
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes (_("Command"), renderer, "text", 2, NULL);
   gtk_tree_view_append_column (startup_view, column);
@@ -604,7 +629,7 @@ enable_startup_cb (void)
   else
     startup_list_disable (&startup_list, startup_store, startup_sel);
 
-  selection_changed_cb (startup_sel, startup_view);
+  startup_selection_changed_cb (startup_sel, startup_view);
 }
 
 static void 
--- gnome-session-2.15.91/gnome-session/session-properties-capplet.h.desensitize-invalid-buttons	2006-08-14 14:01:51.000000000 -0400
+++ gnome-session-2.15.91/gnome-session/session-properties-capplet.h	2006-08-14 14:02:09.000000000 -0400
@@ -34,6 +34,8 @@ void	startup_list_edit_dialog (GSList **
 void	startup_list_delete (GSList **sl, 
 			     GtkTreeModel *model, GtkTreeSelection *sel);
 
+gboolean startup_list_can_edit (GSList **sl, GtkTreeModel *model, GtkTreeSelection *sel);
+
 gboolean startup_list_can_enable (GSList **sl, GtkTreeModel *model, GtkTreeSelection *sel);
 void     startup_list_enable (GSList **sl, GtkTreeModel *model, GtkTreeSelection *sel);
 void     startup_list_disable (GSList **sl, GtkTreeModel *model, GtkTreeSelection *sel);


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gnome-session.spec	13 Aug 2006 04:06:03 -0000	1.81
+++ gnome-session.spec	14 Aug 2006 18:24:52 -0000	1.82
@@ -13,8 +13,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.15.90
-Release: 4%{?dist}
+Version: 2.15.91
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -40,16 +40,24 @@
 Patch1: gnome-session-2.2.2-icons.patch
 Patch2: gnome-session-2.0.5-login.patch
 Patch3: gnome-session-2.0.5-dithering.patch
+
 ## http://bugzilla.gnome.org/show_bug.cgi?id=106450
 Patch6: gnome-session-2.9.4-gnome-common.patch
+
 # Launch gnome-user-share on login if enabled
 Patch7: gnome-session-2.13.92-user-share.patch
+
 # do shaped window for splash screen
 Patch8: gnome-session-2.12.0-shaped.patch
+
 # too much crashing
 Patch9: gnome-session-2.13.4-no-crashes.patch
-Patch12: gnome-session-2.13.92-desensitize-invalid-buttons.patch
-Patch13: gnome-session-2.15.90-window-manager.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=333670
+Patch12: gnome-session-2.15.91-desensitize-invalid-buttons.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=350848
+Patch13: gnome-session-2.15.91-window-manager.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -167,6 +175,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Mon Aug 14 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Sun Aug 13 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-4.fc6
 - fix window manager launching script. Patch from 
   Tim Vismor <tvismor at acm.org> (bug 202312)


--- gnome-session-2.13.92-desensitize-invalid-buttons.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 18:27:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 14:27:11 -0400
Subject: rpms/gnome-session/devel .cvsignore,1.25,1.26 sources,1.25,1.26
Message-ID: <200608141827.k7EIRBxD010442@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	.cvsignore sources 
Log Message:
update sources file



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	4 Aug 2006 05:24:01 -0000	1.25
+++ .cvsignore	14 Aug 2006 18:27:09 -0000	1.26
@@ -1 +1 @@
-gnome-session-2.15.90.tar.bz2
+gnome-session-2.15.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	4 Aug 2006 05:24:01 -0000	1.25
+++ sources	14 Aug 2006 18:27:09 -0000	1.26
@@ -1 +1 @@
-0f2a6d75c8ec82e54ac1531fb2297a27  gnome-session-2.15.90.tar.bz2
+61739d816df371a079730fb6db4bd4a5  gnome-session-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 18:27:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 14:27:18 -0400
Subject: rpms/parted/devel parted.spec, 1.79, 1.80 parted-1.7.0-headers.patch,
	1.1, NONE
Message-ID: <200608141827.k7EIRIWA010496@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10453

Modified Files:
	parted.spec 
Removed Files:
	parted-1.7.0-headers.patch 
Log Message:
Removed bad header file patch (#200577)



Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- parted.spec	12 Jul 2006 07:38:51 -0000	1.79
+++ parted.spec	14 Aug 2006 18:27:16 -0000	1.80
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.7.1
-Release: 9.1
+Release: 10%{?dist}
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0: parted-1.7.0-fat.c.patch
 Patch1: parted-1.7.0-sx8.patch
@@ -12,7 +12,6 @@
 Patch4: parted-1.7.0-iseries.patch
 Patch5: parted-1.7.1-dm.patch
 Patch6: parted-1.7.0-aix.patch
-Patch7: parted-1.7.0-headers.patch
 Patch8: parted-1.7.1-O_DIRECT.patch
 Patch9: parted-1.7.1-get_exception.patch
 
@@ -50,7 +49,6 @@
 %patch4 -p1 -b .iseries
 %patch5 -p1 -b .dm
 %patch6 -p1 -b .aix
-%patch7 -p1 -b .headers
 %patch8 -p1 -b .o_direct
 %patch9 -p1 -b .get_exception
 
@@ -106,6 +104,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Aug 14 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-10
+- Removed bad header file patch (#200577)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.1-9.1
 - rebuild
 


--- parted-1.7.0-headers.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 18:29:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 14:29:38 -0400
Subject: rpms/gnome-session/devel gnome-session-2.15.91-window-manager.patch,
	NONE, 1.1
Message-ID: <200608141829.k7EITcwB010614@cvs.devel.redhat.com>

Author: rstrode

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

Added Files:
	gnome-session-2.15.91-window-manager.patch 
Log Message:
add window manager patch


gnome-session-2.15.91-window-manager.patch:
 gnome-session.schemas.in |   13 ++++++++++++-
 gnome-wm                 |   17 +++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

--- NEW FILE gnome-session-2.15.91-window-manager.patch ---
--- gnome-session-2.15.90/gnome-session/gnome-session.schemas.in.window-manager	2005-04-26 06:56:50.000000000 -0400
+++ gnome-session-2.15.90/gnome-session/gnome-session.schemas.in	2006-08-10 19:19:11.000000000 -0400
@@ -2,11 +2,22 @@
 <gconfschemafile>
    <schemalist>
       <schema>
+         <key>/schemas/apps/gnome-session/rh/window_manager</key>
+         <applyto>/apps/gnome-session/rh/window_manager</applyto>
+         <owner>gnome</owner>
+         <type>string</type>
+         <default>metacity</default>
+         <locale name="C">
+	    <short>Window Manager to start</short>
+	    <long>The Window manager that gnome-session will start. Valid values are "metacity" and "compiz".</long>
+         </locale>
+      </schema>
+      <schema>
          <key>/schemas/apps/gnome-session/options/show_splash_screen</key>
          <applyto>/apps/gnome-session/options/show_splash_screen</applyto>
          <owner>gnome</owner>
          <type>bool</type>
-         <default>true</default>
+         <default>false</default>
          <locale name="C">
             <short>Show the splash screen</short>
             <long>Show the splash screen when the session starts up</long>
--- gnome-session-2.15.90/gnome-session/gnome-wm.window-manager	2005-07-19 08:44:48.000000000 -0400
+++ gnome-session-2.15.90/gnome-session/gnome-wm	2006-08-11 16:04:59.000000000 -0400
@@ -3,7 +3,9 @@
 # The user can specify his prefered WM by setting the WINDOW_MANAGER
 # environment variable.
 #
-# If this is not set, we search a list of known windowmanagers and use
+# If this is not set, we check the /apps/gnome-session/rh/window_manager key
+# and go off that.  finally, if all else fails we search a list of known 
+# windowmanagers and use
 # the first one that is found in the users's PATH
 #
 
@@ -39,6 +41,10 @@ done
 
 # WINDOW_MANAGER overrides all
 
+if [ -z "$WINDOW_MANAGER" ] ; then
+	WINDOW_MANAGER=$(gconftool-2 --get /apps/gnome-session/rh/window_manager)
+fi
+
 OLDIFS=$IFS
 IFS=":"
 if [ -z "$WINDOW_MANAGER" ] ; then
@@ -67,11 +73,18 @@ fi
 # Now create options OPT1 and OPT2 based on the windowmanager used
 OPT1=
 OPT2=
+OPT3=
 if [ ! -z "$SMID" ] ; then
   case `basename $WINDOW_MANAGER` in
     sawfish|sawmill|metacity)
       OPT1=--sm-client-id=$SMID
       ;;
+    compiz)
+      gnome-window-decorator &
+      OPT1=--sm-client-id
+      OPT2=$SMID
+      OPT3=gconf
+      ;;
     openbox|enlightenment|e16)
       OPT1=--sm-client-id
       OPT2=$SMID
@@ -88,6 +100,6 @@ if [ ! -z "$SMID" ] ; then
   esac
 fi
 
-exec $WINDOW_MANAGER $OPT1 $OPT2
+exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3
 
 echo "ERROR: No window manager could run!"



From fedora-cvs-commits at redhat.com  Mon Aug 14 18:34:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 14:34:54 -0400
Subject: rpms/pwlib/devel pwlib.spec,1.38,1.39
Message-ID: <200608141834.k7EIYsOa010734@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	pwlib.spec 
Log Message:
own some directories



Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- pwlib.spec	19 Jul 2006 15:55:51 -0000	1.38
+++ pwlib.spec	14 Aug 2006 18:34:48 -0000	1.39
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
 Version:	1.10.1
-Release:        5
+Release:        6%{?dist}
 URL:		http://www.openh323.org/
 Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
 #We still need this for ppc64 it was not updated in 1.8.4
@@ -77,6 +77,10 @@
 %doc History.txt ReadMe.txt mpl-1.0.htm
 %defattr(-,root,root)
 %{_libdir}/libpt*.so.*
+%dir %{_libdir}/pwlib
+%dir %{_libdir}/pwlib/devices
+%dir %{_libdir}/pwlib/devices/sound
+%dir %{_libdir}/pwlib/devices/videoinput
 # List these explicitly so we don't get any surprises
 %{_libdir}/pwlib/devices/sound/alsa_pwplugin.so
 %{_libdir}/pwlib/devices/videoinput/v4l_pwplugin.so
@@ -93,6 +97,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 1.10.1-6.fc6
+- Own some directories
+
 * Wed Jul 19 2006 Ray Strode <rstrode at redhat.com> - 1.10.1-5
 - add executable bit to dsos (bug 197318)
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 18:59:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 14:59:46 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.165,
	1.166
Message-ID: <200608141859.k7EIxkph009923@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9839

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Mon Aug 14 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_101rh
- Add libgcj-devel to devel and src post and postun
  requirements. (202007)
- Require libgcj in plugin package. (202268)




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- java-1.4.2-gcj-compat.spec	4 Aug 2006 10:24:21 -0000	1.165
+++ java-1.4.2-gcj-compat.spec	14 Aug 2006 18:59:44 -0000	1.166
@@ -15,7 +15,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_100rh
+%define release 	40jpp_101rh
 %define cname           java-%{javaver}-%{origin}
 
 %define	sdklnk		java-%{javaver}-%{origin}
@@ -90,6 +90,9 @@
 Requires:	gcc%{gccsuffix}-java >= %{gccver}
 Requires(post): gcc%{gccsuffix}-java >= %{gccver}
 Requires(postun): gcc%{gccsuffix}-java >= %{gccver}
+# workaround for 202007
+Requires(post): libgcj%{gccsuffix}-devel >= %{gccver}
+Requires(postun): libgcj%{gccsuffix}-devel >= %{gccver}
 Obsoletes:	java-1.4.2-gcj4-compat-devel <= 1.4.2.0-4jpp_2rh
 
 %description devel
@@ -104,6 +107,9 @@
 Requires:	libgcj%{gccsuffix}-src >= %{gccver}
 Requires(post): gcc%{gccsuffix}-java >= %{gccver}
 Requires(postun): gcc%{gccsuffix}-java >= %{gccver}
+# workaround for 202007
+Requires(post): libgcj%{gccsuffix}-devel >= %{gccver}
+Requires(postun): libgcj%{gccsuffix}-devel >= %{gccver}
 
 %description src
 This package installs a versionless src.zip symlink that points to a
@@ -125,6 +131,7 @@
 Provides:       java-plugin = %{javaver}, java-%{javaver}-plugin = %{version}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:       %{_sbindir}/update-alternatives
+Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires(post):       %{_sbindir}/update-alternatives
 Requires(postun):     %{_sbindir}/update-alternatives
 Requires(post): libgcj%{gccsuffix} >= %{gccver}
@@ -642,6 +649,11 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Aug 14 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_101rh
+- Add libgcj-devel to devel and src post and postun
+  requirements. (202007)
+- Require libgcj in plugin package. (202268)
+
 * Fri Aug  4 2006 Gary Benson <gbenson at redhat.com>
 - Move aot-compile and its libraries to the devel subpackage.
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 18:59:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 14:59:57 -0400
Subject: rpms/evolution/devel evolution-2.7.91-fix-duplicate-alarm.patch,
	NONE, 1.1 evolution-2.7.91-fix-missing-declarations.patch,
	NONE, 1.1 evolution.spec, 1.178, 1.179
Message-ID: <200608141859.k7EIxvPH010013@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.91-fix-duplicate-alarm.patch 
	evolution-2.7.91-fix-missing-declarations.patch 
Log Message:

* Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-3
- Consolidate "missing declarations" patches.
- Add patch for RH bug #202383.


evolution-2.7.91-fix-duplicate-alarm.patch:
 event-page.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE evolution-2.7.91-fix-duplicate-alarm.patch ---
--- evolution-2.7.91/calendar/gui/dialogs/event-page.c.fix-duplicate-alarm	2006-08-14 03:32:52.000000000 -0400
+++ evolution-2.7.91/calendar/gui/dialogs/event-page.c	2006-08-14 03:39:04.000000000 -0400
@@ -2925,7 +2925,8 @@
 	
 	switch (priv->alarm_units) {
 	case CAL_DAYS:
-		if (priv->alarm_interval != -1) {
+                /* Note: "1 day before appointment" is already in menu */
+		if (priv->alarm_interval != -1 && priv->alarm_interval != 1) {
 			menu_label = g_strdup_printf (ngettext("%d day before appointment", "%d days before appointment", priv->alarm_interval), priv->alarm_interval);
 		} else {
 			priv->alarm_interval = -1;
@@ -2933,7 +2934,8 @@
 		break;
 		
 	case CAL_HOURS:
-		if (priv->alarm_interval != -1) {
+                /* Note: "1 hour before appointment" is already in menu */
+		if (priv->alarm_interval != -1 && priv->alarm_interval != 1) {
 			menu_label = g_strdup_printf (ngettext("%d hour before appointment", "%d hours before appointment", priv->alarm_interval), priv->alarm_interval);
 		} else {
 			priv->alarm_interval = -1;
@@ -2941,7 +2943,8 @@
 		break;
 		
 	case CAL_MINUTES:
-		if (priv->alarm_interval != -1) {
+                /* Note: "15 minutes before appointment" is already in menu */
+		if (priv->alarm_interval != -1 && priv->alarm_interval != 15) {
 			menu_label = g_strdup_printf (ngettext("%d minute before appointement", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval);
 		} else {
 			priv->alarm_interval = -1;

evolution-2.7.91-fix-missing-declarations.patch:
 a11y/calendar/ea-gnome-calendar.c        |    1 +
 addressbook/gui/widgets/e-minicard.c     |    1 +
 calendar/gui/alarm-notify/alarm-notify.c |    1 +
 calendar/gui/dialogs/alarm-dialog.c      |    1 +
 calendar/gui/dialogs/memo-page.h         |    2 ++
 calendar/gui/e-cal-model-tasks.h         |    1 +
 calendar/gui/e-calendar-view.h           |   12 ++++++++++++
 calendar/gui/gnome-cal.h                 |    2 ++
 composer/e-msg-composer.c                |    1 +
 e-util/e-util.h                          |    5 +++++
 mail/em-folder-view.c                    |    2 ++
 mail/em-format-html-display.c            |   22 +---------------------
 shell/e-shell-window.c                   |    7 +++++++
 widgets/misc/e-attachment-bar.h          |    1 +
 widgets/misc/e-icon-entry.c              |    5 +----
 widgets/table/e-cell-text.c              |    1 +
 widgets/table/e-table-utils.c            |    1 +
 17 files changed, 41 insertions(+), 25 deletions(-)

--- NEW FILE evolution-2.7.91-fix-missing-declarations.patch ---
--- evolution-2.7.91/mail/em-folder-view.c.fix-missing-declarations	2006-07-22 07:14:53.000000000 -0400
+++ evolution-2.7.91/mail/em-folder-view.c	2006-08-13 23:05:44.000000000 -0400
@@ -69,6 +69,8 @@
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
 
+#include <libedataserver/e-data-server-util.h>
+
 #include "menus/gal-view-etable.h"
 #include "menus/gal-view-factory-etable.h"
 #include "menus/gal-view-instance.h"
--- evolution-2.7.91/mail/em-format-html-display.c.fix-missing-declarations	2006-08-07 00:47:44.000000000 -0400
+++ evolution-2.7.91/mail/em-format-html-display.c	2006-08-13 23:05:44.000000000 -0400
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
 
 #ifdef G_OS_WIN32
 /* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
@@ -42,27 +43,6 @@
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <gtkhtml/gtkhtml-search.h>
 
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkcheckbutton.h>
-
 #include <glade/glade.h>
 
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
--- evolution-2.7.91/a11y/calendar/ea-gnome-calendar.c.fix-missing-declarations	2004-10-29 05:56:35.000000000 -0400
+++ evolution-2.7.91/a11y/calendar/ea-gnome-calendar.c	2006-08-13 23:05:44.000000000 -0400
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <gtk/gtknotebook.h>
 #include <libecal/e-cal-time-util.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libgnome/gnome-i18n.h>
 
 static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
--- evolution-2.7.91/widgets/misc/e-attachment-bar.h.fix-missing-declarations	2006-08-14 04:01:39.000000000 -0400
+++ evolution-2.7.91/widgets/misc/e-attachment-bar.h	2006-08-14 04:02:46.000000000 -0400
@@ -82,6 +82,7 @@
 GSList *e_attachment_bar_get_selected (EAttachmentBar *bar);
 void e_attachment_bar_set_width(EAttachmentBar *bar, int bar_width);
 GSList * e_attachment_bar_get_all_attachments (EAttachmentBar *bar);
+void e_attachment_bar_create_attachment_cache (EAttachment *attachment);
 
 #ifdef __cplusplus
 }
--- evolution-2.7.91/widgets/misc/e-icon-entry.c.fix-missing-declarations	2006-08-07 00:47:55.000000000 -0400
+++ evolution-2.7.91/widgets/misc/e-icon-entry.c	2006-08-13 23:05:44.000000000 -0400
@@ -34,12 +34,9 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
 #include "e-icon-entry.h"
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-
 #define E_ICON_ENTRY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), E_TYPE_ICON_ENTRY, EIconEntryPrivate))
 
 struct _EIconEntryPrivate
--- evolution-2.7.91/widgets/table/e-cell-text.c.fix-missing-declarations	2006-08-13 23:05:44.000000000 -0400
+++ evolution-2.7.91/widgets/table/e-cell-text.c	2006-08-13 23:05:44.000000000 -0400
@@ -45,6 +45,7 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+#include <libgnomeprint/gnome-print-pango.h>
 
 #include "a11y/e-table/gal-a11y-e-cell-registry.h"
 #include "a11y/e-table/gal-a11y-e-cell-text.h"
--- evolution-2.7.91/widgets/table/e-table-utils.c.fix-missing-declarations	2006-06-12 06:26:47.000000000 -0400
+++ evolution-2.7.91/widgets/table/e-table-utils.c	2006-08-13 23:05:44.000000000 -0400
@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include <libintl.h>		/* This file uses dgettext() but no _() */
+#include <string.h>
 
 #include "e-util/e-util.h"
 #include "misc/e-unicode.h"
--- evolution-2.7.91/e-util/e-util.h.fix-missing-declarations	2006-07-22 07:14:52.000000000 -0400
+++ evolution-2.7.91/e-util/e-util.h	2006-08-13 23:05:44.000000000 -0400
@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <glib-object.h>
 #include <limits.h>
+#include <cairo/cairo.h>
 #include <gconf/gconf-client.h>
 
 #ifdef __cplusplus
@@ -215,6 +216,10 @@
 gchar    *e_strdup_append_strings                                          (gchar             *first_string,
 									    ...);
 
+char * e_gettext (const char *msgid);
+
+cairo_font_options_t * get_font_options ();
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- evolution-2.7.91/addressbook/gui/widgets/e-minicard.c.fix-missing-declarations	2006-07-22 07:14:49.000000000 -0400
+++ evolution-2.7.91/addressbook/gui/widgets/e-minicard.c	2006-08-13 23:05:44.000000000 -0400
@@ -39,6 +39,7 @@
 #include "e-minicard-label.h"
 #include "e-minicard-view.h"
 #include "e-contact-editor.h"
+#include <e-util/e-html-utils.h>
 #include <e-util/e-icon-factory.h>
 #include <libebook/e-destination.h>
 #include "a11y/addressbook/ea-addressbook.h"
--- evolution-2.7.91/composer/e-msg-composer.c.fix-missing-declarations	2006-08-13 23:05:44.000000000 -0400
+++ evolution-2.7.91/composer/e-msg-composer.c	2006-08-13 23:05:44.000000000 -0400
@@ -61,6 +61,7 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
+#include <libgnome/libgnome.h>
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
--- evolution-2.7.91/shell/e-shell-window.c.fix-missing-declarations	2006-08-14 03:52:07.000000000 -0400
+++ evolution-2.7.91/shell/e-shell-window.c	2006-08-14 03:54:10.000000000 -0400
@@ -58,6 +58,13 @@
 
 #include <string.h>
 
+#ifdef NM_SUPPORT_GLIB
+void e_shell_nm_glib_initialise (EShellWindow *window);
+void e_shell_nm_glib_dispose (EShellWindow *window);
+#elif NM_SUPPORT
+void e_shell_dbus_initialise (EShellWindow *window);
+void e_shell_dbus_dispose (EShellWindow *window);
+#endif
 
 /* A view for each component.  These are all created when EShellWindow is
    instantiated, but with the widget pointers to NULL and the page number set
--- evolution-2.7.91/calendar/gui/alarm-notify/alarm-notify.c.fix-missing-declarations	2006-04-22 00:39:20.000000000 -0400
+++ evolution-2.7.91/calendar/gui/alarm-notify/alarm-notify.c	2006-08-13 23:05:44.000000000 -0400
@@ -25,6 +25,7 @@
 
 #include <string.h>
 #include <bonobo/bonobo-main.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-url.h>
 #include <libedataserverui/e-passwords.h>
 #include <libecal/e-cal.h>
--- evolution-2.7.91/calendar/gui/e-calendar-view.h.fix-missing-declarations	2006-08-07 00:47:42.000000000 -0400
+++ evolution-2.7.91/calendar/gui/e-calendar-view.h	2006-08-14 03:59:30.000000000 -0400
@@ -166,6 +166,18 @@
 					       gboolean new);
 
 gboolean	e_calendar_view_get_tooltips (ECalendarViewEventData *data);
+
+void           e_calendar_view_move_tip (GtkWidget *widget, int x, int y);
+
+#ifdef ENABLE_CAIRO
+void           draw_curved_rectangle (cairo_t *cr,
+                                      double x0,
+                                      double y0,
+                                      double rect_width,
+                                      double rect_height,
+                                      double radius);
+#endif
+
 G_END_DECLS
 
 #endif
--- evolution-2.7.91/calendar/gui/gnome-cal.h.fix-missing-declarations	2006-07-22 07:14:51.000000000 -0400
+++ evolution-2.7.91/calendar/gui/gnome-cal.h	2006-08-13 23:05:44.000000000 -0400
@@ -198,6 +198,8 @@
 						 const char* comp_uid,
 						 const char* comp_rid);
 
+GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
+
 G_END_DECLS
 
 #endif
--- evolution-2.7.91/calendar/gui/dialogs/alarm-dialog.c.fix-missing-declarations	2006-07-09 23:54:00.000000000 -0400
+++ evolution-2.7.91/calendar/gui/dialogs/alarm-dialog.c	2006-08-13 23:05:44.000000000 -0400
@@ -41,6 +41,7 @@
 #include <gtk/gtktextview.h>
 #include <gtk/gtktogglebutton.h>
 #include <libgnome/gnome-i18n.h>
+#include <libgnomeui/libgnomeui.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-widget.h>
--- evolution-2.7.91/calendar/gui/dialogs/memo-page.h.fix-missing-declarations	2006-07-22 07:14:51.000000000 -0400
+++ evolution-2.7.91/calendar/gui/dialogs/memo-page.h	2006-08-13 23:05:44.000000000 -0400
@@ -53,6 +53,8 @@
 GtkType   memo_page_get_type  (void);
 MemoPage *memo_page_construct (MemoPage *epage);
 MemoPage *memo_page_new       (BonoboUIComponent *uic, CompEditorPageFlags flags);
+void      memo_page_set_classification (MemoPage *page, ECalComponentClassification class);
+void      memo_page_set_show_categories (MemoPage *page, gboolean state);
 
 G_END_DECLS
 
--- evolution-2.7.91/calendar/gui/e-cal-model-tasks.h.fix-missing-declarations	2005-10-03 02:16:51.000000000 -0400
+++ evolution-2.7.91/calendar/gui/e-cal-model-tasks.h	2006-08-13 23:05:44.000000000 -0400
@@ -62,6 +62,7 @@
 ECalModelTasks *e_cal_model_tasks_new (void);
 
 void            e_cal_model_tasks_mark_task_complete (ECalModelTasks *model, gint model_row);
+void            e_cal_model_tasks_mark_task_incomplete (ECalModelTasks *model, gint model_row);
 void e_cal_model_tasks_update_due_tasks (ECalModelTasks *model);
 
 G_END_DECLS


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- evolution.spec	11 Aug 2006 15:06:04 -0000	1.178
+++ evolution.spec	14 Aug 2006 18:59:55 -0000	1.179
@@ -37,7 +37,7 @@
 # Upstream tarballs often contain instances of undeclared functions; these tend
 # to work on i386 but fail on 64-bit architectures.  Leave this on to trap the
 # warnings as errors (and ideally get the flag into the upstream build):
-%define require_function_declarations 0
+%define require_function_declarations 1
 
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.91
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -85,9 +85,9 @@
 Patch17: evolution-2.7.1-no-gnome-common.patch
 
 # XXX Make sure these are still needed and push them upstream.
-Patch18: evolution-2.4.1-fix-missing-declarations.patch
-Patch19: evolution-2.5.4-fix-missing-declarations.patch
-Patch20: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
+#Patch18: evolution-2.4.1-fix-missing-declarations.patch
+#Patch19: evolution-2.5.4-fix-missing-declarations.patch
+#Patch20: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 
 Patch21: evolution-2.7.1-notification-cleanups.patch
 Patch22: evolution-2.6.0-prototypes.patch
@@ -116,6 +116,11 @@
 # RH bug #197868 / Gnome.org bug #350823
 Patch30: evolution-2.7.91-default-mailer.patch
 
+Patch31: evolution-2.7.91-fix-missing-declarations.patch
+
+# RH bug #202383
+Patch32: evolution-2.7.91-fix-duplicate-alarm.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -236,9 +241,9 @@
 #patch15 -p1 -b .fix-conduits  # leave commented
 %patch16 -p1 -b .fix-conduit-dir
 %patch17 -p1 -b .no-gnome-common
-%patch18 -p1 -b .fix-missing-declarations
-%patch19 -p1 -b .fix-missing-declarations-2-5-4
-%patch20 -p1 -b .fix-missing-declarations-2.5.5.1
+#patch18 -p1 -b .fix-missing-declarations
+#patch19 -p1 -b .fix-missing-declarations-2-5-4
+#patch20 -p1 -b .fix-missing-declarations-2.5.5.1
 %patch21 -p1 -b .notification-cleanups
 %patch22 -p1 -b .prototypes
 %patch23 -p1 -b .quit-resize-crash
@@ -249,6 +254,8 @@
 %patch28 -p1 -b .submit-bug-report
 %patch29 -p1 -b .deleting-preedit-buffer
 %patch30 -p1 -b .default-mailer
+%patch31 -p1 -b .fix-missing-declarations
+%patch32 -p1 -b .fix-duplicate-alarm
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -639,6 +646,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-3
+- Consolidate "missing declarations" patches.
+- Add patch for RH bug #202383.
+
 * Fri Aug 11 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-2
 - Add patch for RH bug #197868.
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 19:07:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 15:07:46 -0400
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.25,
	1.26 gnome-screensaver.spec, 1.97, 1.98 sources, 1.28,
	1.29 gnome-screensaver-2.15.4-shrink-em.patch, 1.1, NONE
Message-ID: <200608141907.k7EJ7k3T011628@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Removed Files:
	gnome-screensaver-2.15.4-shrink-em.patch 
Log Message:
- Update to 2.15.6
- fix up rpm group (bug 202372)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	4 Aug 2006 05:53:20 -0000	1.25
+++ .cvsignore	14 Aug 2006 19:07:44 -0000	1.26
@@ -1 +1 @@
-gnome-screensaver-2.15.5.tar.bz2
+gnome-session-2.15.91.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- gnome-screensaver.spec	4 Aug 2006 05:53:20 -0000	1.97
+++ gnome-screensaver.spec	14 Aug 2006 19:07:44 -0000	1.98
@@ -12,16 +12,14 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.15.5
+Version: 2.15.6
 Release: 1%{?dist} 
 License: GPL
-Group: Amusement/Graphics
+Group: Amusements/Graphics
 Source0: %{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
 Patch1: gnome-screensaver-2.15.4-default-theme.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=331145
-Patch2: gnome-screensaver-2.15.4-shrink-em.patch
 Patch3: gnome-screensaver-2.15.1-invisible-char.patch
 Patch4: gnome-screensaver-2.15.4-securitytoken.patch
 Patch6: gnome-screensaver-2.15.4-compile-warnings.patch
@@ -64,7 +62,6 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .use-floaters-by-default
-%patch2 -p1 -b .shrink-em
 %patch3 -p1 -b .invisible-char
 %patch4 -p1 -b .securitytoken
 %patch6 -p1 -b .compile-warnings
@@ -102,7 +99,6 @@
 install -D -m755 data/migrate-xscreensaver-config.sh $RPM_BUILD_ROOT%{_libexecdir}/gnome-screensaver
 install -D -m644 data/xscreensaver-config.xsl $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -157,6 +153,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Sun Aug 13 2006 Ray Strode <rstrode at redhat.com> - 2.15.6-1.fc6
+- Update to 2.15.6
+- fix up rpm group (bug 202372)
+
 * Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.5-1.fc6
 - Update to 2.15.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	4 Aug 2006 05:53:20 -0000	1.28
+++ sources	14 Aug 2006 19:07:44 -0000	1.29
@@ -1 +1 @@
-a756ad73fce75f213b754786e0c75853  gnome-screensaver-2.15.5.tar.bz2
+61739d816df371a079730fb6db4bd4a5  gnome-session-2.15.91.tar.bz2


--- gnome-screensaver-2.15.4-shrink-em.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 19:13:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 15:13:20 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.844,1.845
Message-ID: <200608141913.k7EJDK0J013098@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
rather strange foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.844
retrieving revision 1.845
diff -u -r1.844 -r1.845
--- openoffice.org.spec	14 Aug 2006 14:17:57 -0000	1.844
+++ openoffice.org.spec	14 Aug 2006 19:13:18 -0000	1.845
@@ -990,6 +990,7 @@
 fi
 cd config_office
 autoconf
+export GREP="/bin/grep"
 %configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-agg --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
 cd ..
 ./bootstrap



From fedora-cvs-commits at redhat.com  Mon Aug 14 19:17:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 15:17:11 -0400
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.26, 1.27 sources, 1.29,
	1.30
Message-ID: <200608141917.k7EJHBET022187@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	.cvsignore sources 
Log Message:
fix up sources, file (woops)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Aug 2006 19:07:44 -0000	1.26
+++ .cvsignore	14 Aug 2006 19:17:09 -0000	1.27
@@ -1 +1 @@
-gnome-session-2.15.91.tar.bz2
+gnome-screensaver-2.15.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	14 Aug 2006 19:07:44 -0000	1.29
+++ sources	14 Aug 2006 19:17:09 -0000	1.30
@@ -1 +1 @@
-61739d816df371a079730fb6db4bd4a5  gnome-session-2.15.91.tar.bz2
+fad605326dc2e922264bdea96bfa981f  gnome-screensaver-2.15.6.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 19:25:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 15:25:48 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.15.6-securitytoken.patch, NONE,
	1.1 gnome-screensaver.spec, 1.98,
	1.99 gnome-screensaver-2.15.4-securitytoken.patch, 1.7, NONE
Message-ID: <200608141925.k7EJPmpF032732@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.15.6-securitytoken.patch 
Removed Files:
	gnome-screensaver-2.15.4-securitytoken.patch 
Log Message:
update sc patch to 2.15.6 


gnome-screensaver-2.15.6-securitytoken.patch:
 configure.ac                           |   16 
 src/Makefile.am                        |    1 
 src/cut-n-paste/Makefile.am            |   13 
 src/cut-n-paste/securitytoken.c        |  602 ++++++++++++++++++++++
 src/cut-n-paste/securitytoken.h        |  101 +++
 src/cut-n-paste/securitytokenmonitor.c |  868 +++++++++++++++++++++++++++++++++
 src/cut-n-paste/securitytokenmonitor.h |   82 +++
 src/gs-auth-pam.c                      |    7 
 src/gs-monitor.c                       |  128 +++-
 src/gs-window-x11.c                    |    1 
 10 files changed, 1784 insertions(+), 35 deletions(-)

--- NEW FILE gnome-screensaver-2.15.6-securitytoken.patch ---
--- gnome-screensaver-2.15.6/src/gs-monitor.c.securitytoken	2006-08-04 15:24:21.000000000 -0400
+++ gnome-screensaver-2.15.6/src/gs-monitor.c	2006-08-14 15:24:45.000000000 -0400
@@ -41,10 +41,15 @@
 #include "gs-prefs.h"
 #include "gs-debug.h"
 
+#include "securitytokenmonitor.h"
+
 static void     gs_monitor_class_init (GSMonitorClass *klass);
 static void     gs_monitor_init       (GSMonitor      *monitor);
 static void     gs_monitor_finalize   (GObject        *object);
 
+static void     gs_monitor_simulate_user_activity (GSMonitor *monitor);
+static void     gs_monitor_lock_screen (GSMonitor *monitor);
+
 #define GS_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_MONITOR, GSMonitorPrivate))
 
 struct GSMonitorPrivate
@@ -56,6 +61,8 @@ struct GSMonitorPrivate
         GSFade         *fade;
         GSGrab         *grab;
 
+	ScSecurityTokenMonitor *security_token_monitor;
+
         guint           release_grab_id;
 };
 
@@ -100,6 +107,29 @@ manager_auth_request_end_cb (GSManager *
         gs_listener_emit_auth_request_end (monitor->priv->listener);
 }
 
+static void
+security_token_inserted_cb (ScSecurityTokenMonitor *token_monitor,
+			    ScSecurityToken        *token,
+			    GSMonitor              *monitor)
+{
+	gs_monitor_simulate_user_activity (monitor);
+}
+
+static void
+security_token_removed_cb (ScSecurityTokenMonitor *token_monitor,
+			   ScSecurityToken        *token,
+			   GSMonitor              *monitor)
+{
+	gboolean locking_is_enabled;
+
+	/* FIXME: lame hack
+	 */
+	locking_is_enabled = system ("pkcs11_setup rm_action | grep -q lock") == 0;
+	if (locking_is_enabled &&
+	    sc_security_token_is_login_token (token))
+		gs_monitor_lock_screen (monitor);
+}
+
 static gboolean
 watcher_idle_cb (GSWatcher *watcher,
                  gboolean   is_idle,
@@ -180,37 +210,6 @@ watcher_idle_notice_cb (GSWatcher *watch
 }
 
 static void
-gs_monitor_lock_screen (GSMonitor *monitor)
-{
-        gboolean res;
-        gboolean locked;
-
-        /* set lock flag before trying to activate screensaver
-           in case something tries to react to the ActiveChanged signal */
-
-        gs_manager_get_lock_active (monitor->priv->manager, &locked);
-        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
-        res = gs_listener_set_active (monitor->priv->listener, TRUE);
-        if (! res) {
-                /* If we've failed then restore lock status */
-                gs_manager_set_lock_active (monitor->priv->manager, locked);
-                gs_debug ("Unable to lock the screen");
-        }
-}
-
-static void
-gs_monitor_simulate_user_activity (GSMonitor *monitor)
-{
-        /* in case the screen isn't blanked reset the
-           idle watcher */
-        gs_watcher_reset (monitor->priv->watcher);
-
-        /* request that the manager unlock -
-           will pop up a dialog if necessary */
-        gs_manager_request_unlock (monitor->priv->manager);
-}
-
-static void
 listener_lock_cb (GSListener *listener,
                   GSMonitor  *monitor)
 {
@@ -390,6 +389,27 @@ connect_manager_signals (GSMonitor *moni
 }
 
 static void
+disconnect_security_token_monitor_signals (GSMonitor *monitor)
+{
+        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
+					      security_token_removed_cb, monitor);
+
+        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
+					      security_token_inserted_cb, monitor);
+}
+
+static void
+connect_security_token_monitor_signals (GSMonitor *monitor)
+{
+	g_signal_connect (monitor->priv->security_token_monitor, 
+			  "security-token-removed",
+			  G_CALLBACK (security_token_removed_cb), monitor);
+	g_signal_connect (monitor->priv->security_token_monitor, 
+			  "security-token-inserted",
+			  G_CALLBACK (security_token_inserted_cb), monitor);
+}
+
+static void
 disconnect_prefs_signals (GSMonitor *monitor)
 {
         g_signal_handlers_disconnect_by_func (monitor->priv->prefs, _gs_monitor_update_from_prefs, monitor);
@@ -423,6 +443,15 @@ gs_monitor_init (GSMonitor *monitor)
         monitor->priv->manager = gs_manager_new ();
         connect_manager_signals (monitor);
 
+	if (g_getenv ("PKCS11_LOGIN_TOKEN_NAME") != NULL) {
+		monitor->priv->security_token_monitor = sc_security_token_monitor_new (NULL);
+		sc_security_token_monitor_start (monitor->priv->security_token_monitor,
+						 NULL);
+		connect_security_token_monitor_signals (monitor);
+	} else {
+		monitor->priv->security_token_monitor = NULL;
+	}
+
         _gs_monitor_update_from_prefs (monitor, monitor->priv->prefs);
 }
 
@@ -438,6 +467,12 @@ gs_monitor_finalize (GObject *object)
 
         g_return_if_fail (monitor->priv != NULL);
 
+	if (monitor->priv->security_token_monitor != NULL) {
+		sc_security_token_monitor_stop (monitor->priv->security_token_monitor);
+		disconnect_security_token_monitor_signals (monitor);
+		g_object_unref (monitor->priv->security_token_monitor);
+	}
+
         disconnect_watcher_signals (monitor);
         disconnect_listener_signals (monitor);
         disconnect_manager_signals (monitor);
@@ -475,3 +510,34 @@ gs_monitor_start (GSMonitor *monitor,
 
         return TRUE;
 }
+
+static void     
+gs_monitor_simulate_user_activity (GSMonitor *monitor)
+{
+        /* in case the screen isn't blanked reset the
+           idle watcher */
+        gs_watcher_reset (monitor->priv->watcher);
+
+        /* request that the manager unlock -
+           will pop up a dialog if necessary */
+        gs_manager_request_unlock (monitor->priv->manager);
+}
+
+static void     
+gs_monitor_lock_screen (GSMonitor *monitor)
+{
+        gboolean res;
+        gboolean locked;
+
+        /* set lock flag before trying to activate screensaver
+           in case something tries to react to the ActiveChanged signal */
+
+        gs_manager_get_lock_active (monitor->priv->manager, &locked);
+        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
+        res = gs_listener_set_active (monitor->priv->listener, TRUE);
+        if (! res) {
+                /* If we've failed then restore lock status */
+                gs_manager_set_lock_active (monitor->priv->manager, locked);
+                gs_debug ("Unable to lock the screen");
+        }
+}
--- gnome-screensaver-2.15.6/src/Makefile.am.securitytoken	2006-08-03 09:49:24.000000000 -0400
+++ gnome-screensaver-2.15.6/src/Makefile.am	2006-08-14 15:08:04.000000000 -0400
@@ -211,6 +211,7 @@ gnome_screensaver_gl_helper_SOURCES =	\
 gnome_screensaver_LDADD =		\
 	$(SAVER_LIBS)			\
 	$(GNOME_SCREENSAVER_LIBS)	\
+	$(top_builddir)/src/cut-n-paste/libsecuritytoken.a \
 	$(NULL)
 
 gnome_screensaver_LDFLAGS = -export-dynamic
--- /dev/null	2006-08-14 10:23:47.354838496 -0400
+++ gnome-screensaver-2.15.6/src/cut-n-paste/securitytokenmonitor.c	2006-08-14 15:08:04.000000000 -0400
@@ -0,0 +1,868 @@
+/* securitytokenmonitor.c - monitor for security token insertion and
+ *                          removal events
+ * 
+ * Copyright (C) 2006 Ray Strode <rstrode at redhat.com>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ *
+ * TODO:     - doing this per project is a bad idea i think.
+ *             We should probably make this a system service 
+ *             and use dbus.
+ */
+#include "securitytokenmonitor.h"
+
+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
+#include "securitytoken.h"
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
+#include <prerror.h>
+#include <nss.h>
+#include <pk11func.h>
+#include <secmod.h>
+#include <secerr.h>
+
+#ifndef SC_SECURITY_TOKEN_MONITOR_DRIVER
+#define SC_SECURITY_TOKEN_MONITOR_DRIVER LIBDIR"/pkcs11/libcoolkeypk11.so"
+#endif
+
+#ifndef SC_SECURITY_TOKEN_MONITOR_NSS_DB
+#define SC_SECURITY_TOKEN_MONITOR_NSS_DB SYSCONFDIR"/pki/nssdb"
+#endif 
+
+#ifndef SC_SECURITY_TOKEN_MONITOR_POLL_INTERVAL
+#define SC_SECURITY_TOKEN_MONITOR_POLL_INTERVAL 100	/* ms */
+#endif
+
+#ifndef sc_debug
+#if defined (SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST)
+#define sc_debug(fmt, args...) g_printerr(fmt "\n", ##args)
+#else
+#define sc_debug(fmt, args...) 
+#endif
+#endif
+
+typedef enum _ScSecurityTokenMonitorState ScSecurityTokenMonitorState;
+
+enum _ScSecurityTokenMonitorState {
+	SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED = 0,
+	SC_SECURITY_TOKEN_MONITOR_STATE_STARTING,
+	SC_SECURITY_TOKEN_MONITOR_STATE_STARTED,
+	SC_SECURITY_TOKEN_MONITOR_STATE_STOPPING,
+};
+
+struct _ScSecurityTokenMonitorPrivate {
+	ScSecurityTokenMonitorState state;
+
+	gchar        *module_path;
+	SECMODModule *module;
+	GHashTable *security_tokens;
+
+	guint32 nss_is_loaded : 1;
+	guint32 is_unstoppable : 1;
+
+	guint poll_timeout_id;
+};
+
+static void sc_security_token_monitor_finalize (GObject *object);
+static void sc_security_token_monitor_class_install_signals (ScSecurityTokenMonitorClass *service_class);
+static void sc_security_token_monitor_class_install_properties (ScSecurityTokenMonitorClass *service_class);
+static void sc_security_token_monitor_set_property (GObject       *object,
+						    guint          prop_id,
+						    const GValue  *value,
+						    GParamSpec    *pspec);
+static void sc_security_token_monitor_get_property (GObject    *object,
+						    guint       prop_id,
+						    GValue     *value,
+						    GParamSpec *pspec);
+
+static void
+sc_security_token_monitor_set_module_path (ScSecurityTokenMonitor *monitor,
+					   const gchar            *module_path);
+
+
+static void sc_security_token_monitor_token_removed_handler (ScSecurityTokenMonitor *monitor,
+							     ScSecurityToken        *token);
+static void sc_security_token_monitor_token_inserted_handler (ScSecurityTokenMonitor *monitor_class,
+							      ScSecurityToken        *token);
+static gboolean sc_security_token_monitor_stop_now (ScSecurityTokenMonitor *monitor);
+
+static void sc_security_token_monitor_queue_stop (ScSecurityTokenMonitor *monitor);
+
+enum {
+	PROP_0 = 0,
+	PROP_MODULE_PATH,
+	NUMBER_OF_PROPERTIES
+};
+
+enum {
+	SECURITY_TOKEN_INSERTED = 0,
+	SECURITY_TOKEN_REMOVED,
+	ERROR,
+	NUMBER_OF_SIGNALS
+};
+
+static guint sc_security_token_monitor_signals[NUMBER_OF_SIGNALS];
+
+G_DEFINE_TYPE (ScSecurityTokenMonitor, 
+	       sc_security_token_monitor, 
+	       G_TYPE_OBJECT);
+
+static void
+sc_security_token_monitor_class_init (ScSecurityTokenMonitorClass *monitor_class)
+{
+    GObjectClass *gobject_class;
+
+    gobject_class = G_OBJECT_CLASS (monitor_class);
+
+    gobject_class->finalize = sc_security_token_monitor_finalize;
+
+    sc_security_token_monitor_class_install_signals (monitor_class);
+    sc_security_token_monitor_class_install_properties (monitor_class);
+
+    g_type_class_add_private (monitor_class,
+			      sizeof (ScSecurityTokenMonitorPrivate));
+}
+
+static void
+sc_security_token_monitor_class_install_properties (ScSecurityTokenMonitorClass *token_class)
+{
+    GObjectClass *object_class;
+    GParamSpec *param_spec;
+
+    object_class = G_OBJECT_CLASS (token_class);
+    object_class->set_property = sc_security_token_monitor_set_property;
+    object_class->get_property = sc_security_token_monitor_get_property;
+
+    param_spec = g_param_spec_string ("module-path", _("Module Path"),
+				      _("path to security token PKCS #11 driver"),
+				      NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+    g_object_class_install_property (object_class, PROP_MODULE_PATH, param_spec);
+}
+
+static void 
+sc_security_token_monitor_set_property (GObject       *object,
+					guint          prop_id,
+					const GValue  *value,
+					GParamSpec    *pspec)
+{
+    ScSecurityTokenMonitor *monitor = SC_SECURITY_TOKEN_MONITOR (object);
+
+    switch (prop_id)
+    {
+	    case PROP_MODULE_PATH:
+		    sc_security_token_monitor_set_module_path (monitor, 
+							       g_value_get_string (value));
+		    break;
+
+	    default:
+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void 
+sc_security_token_monitor_get_property (GObject    *object,
+					guint       prop_id,
+					GValue     *value,
+					GParamSpec *pspec)
+{
+    ScSecurityTokenMonitor *monitor = SC_SECURITY_TOKEN_MONITOR (object);
+    gchar *module_path;
+
+    switch (prop_id)
+    {
+	    case PROP_MODULE_PATH:
+		    module_path = sc_security_token_monitor_get_module_path (monitor);
+		    g_value_set_string (value, module_path);
+		    g_free (module_path);
+		    break;
+
+	    default:
+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+gchar *
+sc_security_token_monitor_get_module_path (ScSecurityTokenMonitor *monitor)
+{
+    return monitor->priv->module_path;
+}
+
+static void
+sc_security_token_monitor_set_module_path (ScSecurityTokenMonitor *monitor,
+					   const gchar            *module_path)
+{
+    /* For now we hardcode coolkey. Later we'll remove these lines
+     */
+    if (module_path == NULL) {
+	    if (g_file_test (SC_SECURITY_TOKEN_MONITOR_DRIVER,
+			     G_FILE_TEST_IS_REGULAR))
+		    module_path = SC_SECURITY_TOKEN_MONITOR_DRIVER;
+    }
+
+    if ((monitor->priv->module_path == NULL) && (module_path == NULL))
+	    return;
+
+    if (((monitor->priv->module_path == NULL) ||
+	 (module_path == NULL) ||
+	 (strcmp (monitor->priv->module_path, module_path) != 0))) {
+	    g_free (monitor->priv->module_path);
+	    monitor->priv->module_path = g_strdup (module_path);
+	    g_object_notify (G_OBJECT (monitor), "module-path");
+    }
+}
+
+static void
+sc_security_token_monitor_token_removed_handler (ScSecurityTokenMonitor *monitor,
+						 ScSecurityToken        *token)
+{
+    sc_debug ("informing security token of its removal");
+    _sc_security_token_set_state (token, SC_SECURITY_TOKEN_STATE_REMOVED);
+}
+
+static void
+sc_security_token_monitor_token_inserted_handler (ScSecurityTokenMonitor *monitor,
+						  ScSecurityToken        *token)
+{
+    sc_debug ("informing security token of its insertion");
+    _sc_security_token_set_state (token, SC_SECURITY_TOKEN_STATE_INSERTED);
+}
+
+static void
+sc_security_token_monitor_class_install_signals (ScSecurityTokenMonitorClass *monitor_class)
+{
+    GObjectClass *object_class;
+
+    object_class = G_OBJECT_CLASS (monitor_class);
+
+    sc_security_token_monitor_signals[SECURITY_TOKEN_INSERTED] =
+	    g_signal_new ("security-token-inserted",
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_FIRST,
+			  G_STRUCT_OFFSET (ScSecurityTokenMonitorClass,
+					   security_token_inserted), 
+			  NULL, NULL, g_cclosure_marshal_VOID__POINTER, 
+			  G_TYPE_NONE, 1, G_TYPE_POINTER);
+    monitor_class->security_token_inserted = sc_security_token_monitor_token_inserted_handler;
+
+    sc_security_token_monitor_signals[SECURITY_TOKEN_REMOVED] =
+	    g_signal_new ("security-token-removed",
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_FIRST,
+			  G_STRUCT_OFFSET (ScSecurityTokenMonitorClass,
+					   security_token_removed), 
+			  NULL, NULL, g_cclosure_marshal_VOID__POINTER, 
+			  G_TYPE_NONE, 1, G_TYPE_POINTER);
+    monitor_class->security_token_removed = sc_security_token_monitor_token_removed_handler;
+
+    sc_security_token_monitor_signals[ERROR] =
+	    g_signal_new ("error",
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_LAST,
+			  G_STRUCT_OFFSET (ScSecurityTokenMonitorClass, error),
+			  NULL, NULL, g_cclosure_marshal_VOID__POINTER,
+			  G_TYPE_NONE, 1, G_TYPE_POINTER);
+    monitor_class->error = NULL;
+}
+
+static gboolean
+sc_slot_id_equal (CK_SLOT_ID *slot_id_1, 
+		  CK_SLOT_ID *slot_id_2)
+{
+    g_assert (slot_id_1 != NULL);
+    g_assert (slot_id_2 != NULL);
+
+    return *slot_id_1 == *slot_id_2;
+}
+
+static gboolean
+sc_slot_id_hash (CK_SLOT_ID *slot_id) 
+{
+    guint32 upper_bits, lower_bits;
+    gint temp;
+
+    if (sizeof (CK_SLOT_ID) == sizeof (gint))
+	    return g_int_hash (slot_id);
+
+    upper_bits = ((*slot_id) >> 31) - 1;
+    lower_bits = (*slot_id) & 0xffffffff;
+
+    /* The upper bits are almost certainly always zero,
+     * so let's degenerate to g_int_hash for the 
+     * (very) common case
+     */
+    temp = lower_bits + upper_bits;
+    return upper_bits + g_int_hash (&temp);
+}
+
+static void
+sc_security_token_monitor_init (ScSecurityTokenMonitor *monitor)
+{
+    sc_debug ("initializing security token monitor");
+
+    monitor->priv = G_TYPE_INSTANCE_GET_PRIVATE (monitor,
+						 SC_TYPE_SECURITY_TOKEN_MONITOR,
+						 ScSecurityTokenMonitorPrivate);
+    monitor->priv->poll_timeout_id = 0;
+    monitor->priv->security_tokens = NULL;
+    monitor->priv->is_unstoppable = FALSE;
+}
+
+static void 
+sc_security_token_monitor_finalize (GObject *object)
+{
+    ScSecurityTokenMonitor *monitor;
+    GObjectClass *gobject_class;
+
+    monitor = SC_SECURITY_TOKEN_MONITOR (object);
+    gobject_class =
+	    G_OBJECT_CLASS (sc_security_token_monitor_parent_class);
+
+    sc_security_token_monitor_stop_now (monitor);
+
+    gobject_class->finalize (object);
+}
+
+GQuark 
+sc_security_token_monitor_error_quark (void)
+{
+    static GQuark error_quark = 0;
+
+    if (error_quark == 0)
+	    error_quark = g_quark_from_static_string ("sc-security-token-monitor-error-quark");
+
+    return error_quark;
+}
+
+ScSecurityTokenMonitor *
+sc_security_token_monitor_new (const gchar *module_path)
+{
+    ScSecurityTokenMonitor *instance;
+
+    instance = SC_SECURITY_TOKEN_MONITOR (g_object_new (SC_TYPE_SECURITY_TOKEN_MONITOR, 
+							"module-path", module_path,
+							NULL));
+
+    return instance;
+}
+
+static void 
+sc_security_token_monitor_emit_error (ScSecurityTokenMonitor *monitor,
+				      GError                 *error)
+{
+    monitor->priv->is_unstoppable = TRUE;
+    g_signal_emit (monitor, sc_security_token_monitor_signals[ERROR], 0,
+		   error);
+    monitor->priv->is_unstoppable = FALSE;
+}
+
+static void 
+sc_security_token_monitor_emit_security_token_inserted (ScSecurityTokenMonitor *monitor,
+							ScSecurityToken        *token)
+{
+    monitor->priv->is_unstoppable = TRUE;
+    g_signal_emit (monitor, sc_security_token_monitor_signals[SECURITY_TOKEN_INSERTED], 0,
+		   token);
+    monitor->priv->is_unstoppable = FALSE;
+}
+
+static void 
+sc_security_token_monitor_emit_security_token_removed (ScSecurityTokenMonitor *monitor,
+							ScSecurityToken        *token)
+{
+    ScSecurityTokenMonitorState old_state;
+
+    old_state = monitor->priv->state;
+    monitor->priv->is_unstoppable = TRUE;
+    g_signal_emit (monitor, sc_security_token_monitor_signals[SECURITY_TOKEN_REMOVED], 0,
+		   token);
+    monitor->priv->is_unstoppable = FALSE;
+}
+
+static gboolean
+sc_security_token_monitor_check_for_and_process_events (ScSecurityTokenMonitor *monitor)
+{
+    PK11SlotInfo *slot;
+    CK_SLOT_ID slot_id, *key;
+    gint slot_series, token_slot_series;
+    ScSecurityToken *token;
+
+    slot = SECMOD_WaitForAnyTokenEvent (monitor->priv->module, CKF_DONT_BLOCK,
+					PR_INTERVAL_NO_WAIT);
+
+    if (slot == NULL) {
+	    GError *error;
+	    int error_code;
+
+	    error_code = PORT_GetError ();
+	    if ((error_code == 0) || (error_code == SEC_ERROR_NO_EVENT))
+		    return TRUE;
+
+	    /* FIXME: is there a function to convert from a PORT error
+	     * code to a translated string?
+	     */
+	    error = g_error_new (SC_SECURITY_TOKEN_MONITOR_ERROR,
+				 SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
+				 _("encountered unexpected error while "
+				   "waiting for security token events"));
+	    g_error_free (error);
+
+	    return FALSE;
+    }
+
+    /* the slot id and series together uniquely identify a token.
+     * You can never have two tokens with the same slot id at the
+     * same time, however (I think), so we can key off of it.
+     */
+    slot_id = PK11_GetSlotID (slot);
+    slot_series = PK11_GetSlotSeries (slot);
+
+    /* First check to see if there is a token that we're currently
+     * tracking in the slot.
+     */
+    key = g_new (CK_SLOT_ID, 1);
+    *key = slot_id;
+    token = g_hash_table_lookup (monitor->priv->security_tokens, key);
+
+    if (token != NULL)
+	    token_slot_series = sc_security_token_get_slot_series (token);
+
+    if (PK11_IsPresent (slot)) {
+	    /* Now, check to see if their is a new token in the slot.
+	     * If there was a different token in the slot now than
+	     * there was before, then we need to emit a removed signal
+	     * for the old token.
+	     * 
+	     * FIXME: So, I *think* the reason we need to do this is
+	     * for the case where a token is removed and another
+	     * inserted faster than the internal poll granualarity of
+	     * NSS. In that case we won't get a separate removed event
+	     * so we need to handle it ourselves.  But what happens if
+	     * a token is removed, another inserted, then removed, and
+	     * another inserted really fast?  Shouldn't we emit
+	     * several removed/inserted events?  If so, can we depend
+	     * on the difference of the series numbers to determine
+	     * how many events to emit? It's all hard to trigger
+	     * corner cases that probably don't matter anyhow, though.
+	     */
+	    if ((token != NULL) && 
+		token_slot_series != slot_series) {
+		    sc_security_token_monitor_emit_security_token_removed (monitor, token);
+	    }
+
+	    token = _sc_security_token_new (monitor->priv->module, 
+					    slot_id, slot_series);
+
+	    g_hash_table_replace (monitor->priv->security_tokens,
+				  key, token);
+	    key = NULL;
+
+	    sc_security_token_monitor_emit_security_token_inserted (monitor, token);
+    } else {
+	    /* if we aren't tracking the token, just discard the event.
+	     * We don't want unpaired remove events.  Note on startup
+	     * NSS will generate an "insertion" event if a token is
+	     * already inserted in the slot.
+	     */
+	    if ((token != NULL)) {
+		    /* FIXME: i'm not sure about this code.  Maybe we
+		     * shouldn't do this at all, or maybe we should do it
+		     * n times (where n = slot_series - token_slot_series + 1)
+		     * (see the comment in the if part of this if/else
+		     * clause for more information)
+		     * 
+		     * Right now, i'm just doing it once.  
+		     */
+		    if ((slot_series - token_slot_series) > 1) {
+
+			    sc_security_token_monitor_emit_security_token_removed (monitor, token);
+			    g_hash_table_remove (monitor->priv->security_tokens, key);
+
+			    token = _sc_security_token_new (monitor->priv->module, 
+							    slot_id, slot_series);
+			    g_hash_table_replace (monitor->priv->security_tokens,
+						  key, token);
+			    key = NULL;
+			    sc_security_token_monitor_emit_security_token_inserted (monitor, token);
+		    }
+
+		    sc_security_token_monitor_emit_security_token_removed (monitor, token);
+
+		    g_hash_table_remove (monitor->priv->security_tokens, key);
+		    token = NULL;
+	    }
+    }
+
+    g_free (key);
+    PK11_FreeSlot (slot);
+
+    return TRUE;
+}
+
+static void
+sc_security_token_monitor_polling_stopped_handler (ScSecurityTokenMonitor *monitor)
+{
+    monitor->priv->poll_timeout_id = 0;
+    sc_security_token_monitor_stop_now (monitor);
+}
+
+gboolean
+sc_security_token_monitor_start (ScSecurityTokenMonitor  *monitor,
+				 GError                 **error)
+{
+    SECStatus status = SECSuccess;
+    gchar *module_spec;
+    gboolean module_explicitly_specified;
+
+    if (monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STARTED) {
+	    sc_debug ("security token monitor already started");
+	    return TRUE;
+    }
+
+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STARTING;
+
+    if (!monitor->priv->nss_is_loaded) {
+	    sc_debug ("attempting to load NSS database '%s'",
+		       SC_SECURITY_TOKEN_MONITOR_NSS_DB);
+	    status = NSS_NoDB_Init (SC_SECURITY_TOKEN_MONITOR_NSS_DB);
+    }
+
+    if (status != SECSuccess) {
+	    gsize error_message_size;
+	    gchar *error_message;
+
+	    error_message_size = PR_GetErrorTextLength ();
+
+	    if (error_message_size == 0) {
+		    sc_debug ("NSS security system could not be initialized");
+		    g_set_error (error,
+				 SC_SECURITY_TOKEN_MONITOR_ERROR,
+				 SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
+				 _("NSS security system could not be initialized"));
+		    goto out;
+	    }
+
+	    error_message = g_slice_alloc0 (error_message_size);
+	    PR_GetErrorText (error_message);
+
+	    g_set_error (error,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
+			 "%s", error_message);
+	    sc_debug ("NSS security system could not be initialized - %s",
+		     error_message);
+
+	    g_slice_free1 (error_message_size, error_message);
+
+	    goto out;
+    }
+    sc_debug ("NSS database sucessfully loaded");
+    monitor->priv->nss_is_loaded = TRUE;
+
+    module_explicitly_specified = monitor->priv->module_path != NULL;
+    if (monitor->priv->module == NULL) {
+	    if (module_explicitly_specified) {
+		    module_spec = g_strdup_printf ("library=\"%s\" "
+						   "name=\"SecurityToken\"",
+						   monitor->priv->module_path);
+		    sc_debug ("loading security token driver using spec '%s'",
+			      module_spec);
+
+		    /* FIXME: this API is apparently deprecated, find out what 
+		     * is replacing it
+		     */
+		    monitor->priv->module = 
+			    SECMOD_LoadUserModule (module_spec, 
+						   NULL /* parent */, 
+						   FALSE /* recurse */);
+		    g_free (module_spec);
+	    } else {
+		    SECMODModuleList *modules, *tmp;
+		
+		    modules = SECMOD_GetDefaultModuleList ();
+
+		    for (tmp = modules; tmp != NULL; tmp = tmp->next) {
+			    if (!SECMOD_HasRemovableSlots (tmp->module) ||
+				!tmp->module->loaded)
+				    continue;
+
+			    monitor->priv->module = 
+				    SECMOD_ReferenceModule (tmp->module);
+			    break;
+		    }
+	    }
+    }
+
+    if (!module_explicitly_specified && (monitor->priv->module == NULL)) {
+	    g_set_error (error,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
+			 _("no suitable security token driver could be found"));
+	    goto out;
+    } else if ((monitor->priv->module == NULL) || 
+	       !monitor->priv->module->loaded) {
+
+	    gsize error_message_size;
+	    gchar *error_message;
+
+	    error_message_size = PR_GetErrorTextLength ();
+
+	    if (error_message_size == 0) {
+		    sc_debug ("security token driver '%s' could not be loaded",
+			     monitor->priv->module_path);
+		    g_set_error (error,
+				 SC_SECURITY_TOKEN_MONITOR_ERROR,
+				 SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
+				 _ ("security token driver '%s' could not be "
+				    "loaded"),
+				 monitor->priv->module_path);
+		    goto out;
+	    }
+
+	    error_message = g_slice_alloc0 (error_message_size);
+	    PR_GetErrorText (error_message);
+
+	    g_set_error (error,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
+			 "%s", error_message);
+
+	    sc_debug ("security token driver '%s' could not be loaded - %s",
+		     monitor->priv->module_path, error_message);
+	    g_slice_free1 (error_message_size, error_message);
+
+	    goto out;
+    }
+
+    /* FIXME: so it sort of sucks that we have to poll here.  NSS
+     * does offer a non-blocking API (that we use), but there is
+     * no way to wake up the event loop when new events arrive, so
+     * we just have to poll periodically.  An alternative would be
+     * to fork (or bring in threads, ick) and use the blocking api
+     * plus a message pipe, but that's significantly more
+     * complicated to implement.  Maybe a better solution is to
+     * move all this off to Yet Another Daemon Process and have it
+     * emit dbus signals that we watch for.
+     */
+    monitor->priv->poll_timeout_id =
+	    g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
+				SC_SECURITY_TOKEN_MONITOR_POLL_INTERVAL,
+				(GSourceFunc)
+				sc_security_token_monitor_check_for_and_process_events,
+				monitor, (GDestroyNotify)
+				sc_security_token_monitor_polling_stopped_handler);
+
+    monitor->priv->security_tokens =
+	    g_hash_table_new_full ((GHashFunc) sc_slot_id_hash, 
+				   (GEqualFunc) sc_slot_id_equal, 
+				   (GDestroyNotify) g_free, 
+				   (GDestroyNotify) g_object_unref);
+
+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STARTED;
+
+out:
+    /* don't leave it in a half started state
+     */
+    if (monitor->priv->state != SC_SECURITY_TOKEN_MONITOR_STATE_STARTED) {
+	    sc_debug ("security token monitor could not be completely started");
+	    sc_security_token_monitor_stop (monitor);
+    } else
+	    sc_debug ("security token monitor started");
+
+    return monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STARTED;
+}
+
+static gboolean
+sc_security_token_monitor_stop_now (ScSecurityTokenMonitor *monitor)
+{
+    if (monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED)
+	    return FALSE;
+
+    sc_debug ("stopping security token monitor");
+
+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED;
+    if (monitor->priv->security_tokens != NULL) {
+	    g_hash_table_destroy (monitor->priv->security_tokens);
+	    monitor->priv->security_tokens = NULL;
+    }
+
+    if (monitor->priv->poll_timeout_id != 0) {
+	    g_source_remove (monitor->priv->poll_timeout_id);
+	    monitor->priv->poll_timeout_id = 0;
+    }
+
+#ifdef SC_SECURITY_TOKEN_MONITOR_DRIVER_CAN_BE_RELOADED_AFTER_BEING_DESTROYED
+    if (monitor->priv->module != NULL) {
+	    SECMOD_DestroyModule (monitor->priv->module);
+	    monitor->priv->module = NULL;
+    }
+
+    if (monitor->priv->nss_is_loaded) {
+	    NSS_Shutdown ();
+	    monitor->priv->nss_is_loaded = FALSE;
+    }
+#endif
+    sc_debug ("security token monitor stopped");
+    
+    return FALSE;
+}
+
+static void
+sc_security_token_monitor_queue_stop (ScSecurityTokenMonitor *monitor)
+{
+
+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STOPPING;
+
+    g_idle_add ((GSourceFunc) sc_security_token_monitor_stop_now, monitor);
+}
+
+void 
+sc_security_token_monitor_stop (ScSecurityTokenMonitor *monitor)
+{
+    if (monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED)
+	    return;
+
+    if (monitor->priv->is_unstoppable) {
+	    sc_security_token_monitor_queue_stop (monitor);
+	    return;
+    } 
+
+    sc_security_token_monitor_stop_now (monitor);
+}
+
+static void
+sc_security_token_monitor_check_for_login_token (CK_SLOT_ID       slot_id,
+						 ScSecurityToken *token,
+						 gboolean        *is_inserted)
+{
+    g_assert (is_inserted != NULL);
+
+    if (sc_security_token_is_login_token (token))
+	    *is_inserted = TRUE;
+
+}
+
+gboolean 
+sc_security_token_monitor_login_token_is_inserted (ScSecurityTokenMonitor *monitor) 
+
+{
+    gboolean is_inserted;
+
+    is_inserted = FALSE;
+    g_hash_table_foreach (monitor->priv->security_tokens, 
+			  (GHFunc)
+			  sc_security_token_monitor_check_for_login_token,
+			  &is_inserted);
+    return is_inserted;
+}
+
+#ifdef SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST
+#include <glib.h>
+
+static GMainLoop *event_loop;
+static gboolean should_exit_on_next_remove = FALSE;
+
+static gboolean on_timeout (ScSecurityTokenMonitor *monitor)
+{
+    GError *error;
+    g_print ("Re-enabling monitor.\n");
+
+    if (!sc_security_token_monitor_start (monitor, &error)) {
+	    g_warning ("could not start security token monitor - %s",
+		       error->message);
+	    g_error_free (error);
+	    return 1;
+    }
+    g_print ("Please re-insert security token\n");
+
+    should_exit_on_next_remove = TRUE;
+
+    return FALSE;
+}
+
+static void
+on_device_inserted (ScSecurityTokenMonitor * monitor,
+		    ScSecurityToken *token)
+{
+    g_print ("security token inserted!\n");
+    g_print ("Please remove it.\n");
+}
+
+static void
+on_device_removed (ScSecurityTokenMonitor * monitor,
+		   ScSecurityToken *token)
+{
+    g_print ("security token removed!\n");
+
+    if (should_exit_on_next_remove)
+	    g_main_loop_quit (event_loop);
+    else {
+	    g_print ("disabling monitor for 2 seconds\n");
+	    sc_security_token_monitor_stop (monitor);
+	    g_timeout_add (2000, (GSourceFunc) on_timeout, monitor);
+    }
+}
+
+int 
+main (int   argc, 
+      char *argv[])
+{
+    ScSecurityTokenMonitor *monitor;
+    GError *error;
+
+    g_log_set_always_fatal (G_LOG_LEVEL_ERROR
+			    | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
+    g_type_init ();
+
+    g_message ("creating instance of 'security token monitor' object...");
+    monitor = sc_security_token_monitor_new (NULL);
+    g_message ("'security token monitor' object created successfully");
+
+    g_signal_connect (monitor, "security-token-inserted",
+		      G_CALLBACK (on_device_inserted), NULL);
+
+    g_signal_connect (monitor, "security-token-removed",
+		      G_CALLBACK (on_device_removed), NULL);
+
+    g_message ("starting listener...");
+
+    error = NULL;
+    if (!sc_security_token_monitor_start (monitor, &error)) {
+	    g_warning ("could not start security token monitor - %s",
+		       error->message);
+	    g_error_free (error);
+	    return 1;
+    }
+
+    event_loop = g_main_loop_new (NULL, FALSE);
+    g_main_loop_run (event_loop);
+    g_main_loop_unref (event_loop);
+    event_loop = NULL;
+
+    g_message ("destroying previously created 'security token monitor' object...");
+    g_object_unref (monitor);
+    monitor = NULL;
+    g_message ("'security token monitor' object destroyed successfully");
+
+    return 0;
+}
+#endif
--- /dev/null	2006-08-14 10:23:47.354838496 -0400
+++ gnome-screensaver-2.15.6/src/cut-n-paste/securitytoken.c	2006-08-14 15:08:04.000000000 -0400
@@ -0,0 +1,602 @@
+/* securitytoken.c - security token
+ * 
+ * Copyright (C) 2006 Ray Strode <rstrode at redhat.com>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ *
+ * TODO:     - doing this per project is a bad idea i think.
+ *             We should probably make this a system service 
+ *             and use dbus.
+ *
+ *           - We hardcode a driver right now.  We should probably
+ *             look up the default list and go from there. 
+ */
+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
+#include "securitytoken.h"
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
+#include <cert.h>
+#include <nss.h>
+#include <pk11func.h>
+#include <prerror.h>
+#include <secmod.h>
+#include <secerr.h>
+
+#if defined (SC_SECURITY_TOKEN_ENABLE_TEST) || defined (SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST)
+#define sc_debug(format, args...) g_printerr (format "\n", ##args)
+#define sc_warning(format, args...) g_printerr (format "\n", ##args)
+#else
+#define sc_debug(format, args...) 
+#define sc_warning(format, args...) 
+#endif
+
+struct _ScSecurityTokenPrivate {
+	SECMODModule *module;
+	ScSecurityTokenState state;
+
+	CK_SLOT_ID slot_id;
+	gint slot_series;
+
+	PK11SlotInfo *slot;
+	gchar *name;
+
+	CERTCertificate *signing_certificate;
+	CERTCertificate *encryption_certificate;
+};
+
+static void sc_security_token_finalize (GObject *object);
+static void sc_security_token_class_install_signals (ScSecurityTokenClass *token_class);
+static void sc_security_token_class_install_properties (ScSecurityTokenClass *token_class);
+static void sc_security_token_set_property (GObject       *object,
+					    guint          prop_id,
+					    const GValue  *value,
+					    GParamSpec    *pspec);
+static void sc_security_token_get_property (GObject     *object,
+					    guint        prop_id,
+					    GValue      *value,
+					    GParamSpec  *pspec);
+
+static void sc_security_token_set_slot_id (ScSecurityToken *token, 
+					   gint             slot_id);
+static void sc_security_token_set_slot_series (ScSecurityToken *token, 
+					       gint             slot_series);
+static void sc_security_token_set_module (ScSecurityToken *token,
+					  SECMODModule    *module);
+
+static PK11SlotInfo *sc_security_token_find_slot_from_id (ScSecurityToken *token,
+							  gint slot_id);
+static gboolean sc_security_token_fetch_certificates (ScSecurityToken *token);
+
+
+#ifndef SC_SECURITY_TOKEN_DEFAULT_SLOT_ID 
+#define SC_SECURITY_TOKEN_DEFAULT_SLOT_ID ((gulong) -1)
+#endif
+
+#ifndef SC_SECURITY_TOKEN_DEFAULT_SLOT_SERIES
+#define SC_SECURITY_TOKEN_DEFAULT_SLOT_SERIES -1
+#endif
+
+enum {
+	PROP_0 = 0,
+	PROP_SLOT_ID,
+	PROP_SLOT_SERIES,
+	PROP_MODULE,
+	NUMBER_OF_PROPERTIES
+};
+
+enum {
+	INSERTED,
+	REMOVED,
+	NUMBER_OF_SIGNALS
+};
+
+static guint sc_security_token_signals[NUMBER_OF_SIGNALS];
+
+G_DEFINE_TYPE (ScSecurityToken, sc_security_token, G_TYPE_OBJECT);
+
+static void
+sc_security_token_class_init (ScSecurityTokenClass *token_class)
+{
+    GObjectClass *gobject_class;
+
+    gobject_class = G_OBJECT_CLASS (token_class);
+
+    gobject_class->finalize = sc_security_token_finalize;
+
+    sc_security_token_class_install_signals (token_class);
+    sc_security_token_class_install_properties (token_class);
+
+    g_type_class_add_private (token_class,
+			      sizeof (ScSecurityTokenPrivate));
+}
+
+static void
+sc_security_token_class_install_signals (ScSecurityTokenClass *token_class)
+{
+    GObjectClass *object_class;
+
+    object_class = G_OBJECT_CLASS (token_class);
+
+    sc_security_token_signals[INSERTED] =
+	    g_signal_new ("inserted",
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_LAST,
+			  G_STRUCT_OFFSET (ScSecurityTokenClass,
+					   inserted), 
+			  NULL, NULL, g_cclosure_marshal_VOID__VOID, 
+			  G_TYPE_NONE, 0);
+    token_class->inserted = NULL;
+
+    sc_security_token_signals[REMOVED] =
+	    g_signal_new ("removed",
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_LAST,
+			  G_STRUCT_OFFSET (ScSecurityTokenClass,
+					   removed), 
+			  NULL, NULL, g_cclosure_marshal_VOID__VOID, 
+			  G_TYPE_NONE, 0);
+    token_class->removed = NULL;
+}
+
+static void
+sc_security_token_class_install_properties (ScSecurityTokenClass *token_class)
+{
+    GObjectClass *object_class;
+    GParamSpec *param_spec;
+
+    object_class = G_OBJECT_CLASS (token_class);
+    object_class->set_property = sc_security_token_set_property;
+    object_class->get_property = sc_security_token_get_property;
+
+    param_spec = g_param_spec_ulong ("slot-id", _("Slot ID"),
+				   _("The slot the token is in"),
+				   1, G_MAXULONG,
+				   SC_SECURITY_TOKEN_DEFAULT_SLOT_ID,
+				   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+    g_object_class_install_property (object_class, PROP_SLOT_ID, param_spec);
+
+    param_spec = g_param_spec_int ("slot-series", _("Slot Series"),
+				   _("per-slot token identifier"),
+				   -1, G_MAXINT,
+				   SC_SECURITY_TOKEN_DEFAULT_SLOT_SERIES,
+				   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+    g_object_class_install_property (object_class, PROP_SLOT_SERIES, param_spec);
+
+    /* FIXME: maybe make this a boxed type?
+     */
+    param_spec = g_param_spec_pointer ("module", _("Module"),
+				       _("security token driver"),
+				       G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
+    g_object_class_install_property (object_class, PROP_MODULE, param_spec);
+}
+
+static void 
+sc_security_token_set_property (GObject       *object,
+				guint          prop_id,
+				const GValue  *value,
+				GParamSpec    *pspec)
+{
+    ScSecurityToken *token = SC_SECURITY_TOKEN (object);
+
+    switch (prop_id)
+    {
+	    case PROP_SLOT_ID:
+		    sc_security_token_set_slot_id (token, 
+						   g_value_get_ulong (value));
+		    break;
+
+	    case PROP_SLOT_SERIES:
+		    sc_security_token_set_slot_series (token, 
+						       g_value_get_int (value));
+		    break;
+
+	    case PROP_MODULE:
+		    sc_security_token_set_module (token, 
+						  (SECMODModule *)
+						  g_value_get_pointer (value));
+		    break;
+
+	    default:
+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+CK_SLOT_ID
+sc_security_token_get_slot_id (ScSecurityToken *token)
+{
+    return token->priv->slot_id;
+}
+
+ScSecurityTokenState 
+sc_security_token_get_state (ScSecurityToken *token)
+{
+    return token->priv->state;
+}
+
+gchar *
+sc_security_token_get_name (ScSecurityToken *token)
+{
+    return g_strdup (token->priv->name);
+}
+
+gboolean
+sc_security_token_is_login_token (ScSecurityToken *token)
+{
+    const gchar *login_token_name;
+    login_token_name = g_getenv ("PKCS11_LOGIN_TOKEN_NAME");
+
+    if ((login_token_name == NULL) || (token->priv->name == NULL))
+	    return FALSE;
+
+    if (strcmp (token->priv->name, login_token_name) == 0)
+	    return TRUE;
+
+    return FALSE;
+}
+
+static void 
+sc_security_token_get_property (GObject    *object,
+				guint        prop_id,
+				GValue      *value,
+				GParamSpec  *pspec)
+{
+    ScSecurityToken *token = SC_SECURITY_TOKEN (object);
+
+    switch (prop_id)
+    {
+	    case PROP_SLOT_ID:
+		    g_value_set_ulong (value, 
+				       (gulong) sc_security_token_get_slot_id (token));
+		    break;
+
+	    case PROP_SLOT_SERIES:
+		    g_value_set_int (value, 
+				     sc_security_token_get_slot_series (token));
+		    break;
+
+	    default:
+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+sc_security_token_set_slot_id (ScSecurityToken *token,
+			       gint             slot_id)
+{
+    if (token->priv->slot_id != slot_id)
+    {
+	    token->priv->slot_id = slot_id;
+
+	    token->priv->slot = sc_security_token_find_slot_from_id (token,
+								     token->priv->slot_id);
+
+	    if (token->priv->slot != NULL) {
+		    g_free (token->priv->name);
+		    token->priv->name = g_strdup (PK11_GetTokenName (token->priv->slot));
+	    }
+
+	    g_object_notify (G_OBJECT (token), "slot-id");
+    }
+}
+
+static void
+sc_security_token_set_slot_series (ScSecurityToken *token,
+				   gint             slot_series)
+{
+    if (token->priv->slot_series != slot_series)
+    {
+	    token->priv->slot_series = slot_series;
+	    g_object_notify (G_OBJECT (token), "slot-series");
+    }
+}
+
+static void
+sc_security_token_set_module (ScSecurityToken *token,
+			      SECMODModule    *module)
+{
+    gboolean should_notify;
+
+    if (token->priv->module != module)
+	    should_notify = TRUE;
+    else
+	    should_notify = FALSE;
+
+    if (token->priv->module != NULL) {
+	    SECMOD_DestroyModule (token->priv->module);
+	    token->priv->module = NULL;
+    }
+
+    if (module != NULL)
+	    token->priv->module = SECMOD_ReferenceModule (module);
+
+    if (should_notify)
+	    g_object_notify (G_OBJECT (token), "module");
+}
+
+gint 
+sc_security_token_get_slot_series (ScSecurityToken *token)
+{
+    return token->priv->slot_series;
+}
+
+static void
+sc_security_token_init (ScSecurityToken *token)
+{
+
+    sc_debug ("initializing security token ");
+
+    token->priv = G_TYPE_INSTANCE_GET_PRIVATE (token,
+					       SC_TYPE_SECURITY_TOKEN,
+					       ScSecurityTokenPrivate);
+
+    if (token->priv->slot != NULL)
+	    token->priv->name = g_strdup (PK11_GetTokenName (token->priv->slot));
+}
+
+static void sc_security_token_finalize (GObject *object)
+{
+    ScSecurityToken *token;
+    GObjectClass *gobject_class;
+
+    token = SC_SECURITY_TOKEN (object);
+
+    g_free (token->priv->name);
+
+    sc_security_token_set_module (token, NULL);
+
+    gobject_class =
+	    G_OBJECT_CLASS (sc_security_token_parent_class);
+
+    gobject_class->finalize (object);
+}
+
+GQuark sc_security_token_error_quark (void)
+{
+    static GQuark error_quark = 0;
+
+    if (error_quark == 0)
+	    error_quark = g_quark_from_static_string ("sc-security-token-error-quark");
+
+    return error_quark;
+}
+
+ScSecurityToken *
+_sc_security_token_new (SECMODModule *module,
+			CK_SLOT_ID    slot_id,
+			gint          slot_series)
+{
+    ScSecurityToken *token;
+
+    g_return_val_if_fail (module != NULL, NULL);
+    g_return_val_if_fail (slot_id >= 1, NULL);
+    g_return_val_if_fail (slot_series > 0, NULL);
+    g_return_val_if_fail (sizeof (gulong) == sizeof (slot_id), NULL);
+
+    token = SC_SECURITY_TOKEN (g_object_new (SC_TYPE_SECURITY_TOKEN,
+					     "module", module,
+					     "slot-id", (gulong) slot_id,
+					     "slot-series", slot_series,
+					     NULL));
+    return token;
+}
+
+void 
+_sc_security_token_set_state (ScSecurityToken      *token,
+			      ScSecurityTokenState  state)
+{
+    sc_security_token_fetch_certificates (token);
+    if (token->priv->state != state)
+    {
+	    token->priv->state = state;
+
+	    if (state == SC_SECURITY_TOKEN_STATE_INSERTED) {
+		    g_signal_emit (token, sc_security_token_signals[INSERTED], 0);
+	    } else if (state == SC_SECURITY_TOKEN_STATE_REMOVED)
+		    g_signal_emit (token, sc_security_token_signals[REMOVED], 0);
+	    else
+		    g_assert_not_reached ();
+    }
+}
+
+/* So we could conceivably make the closure data a pointer to the token
+ * or something similiar and then emit signals when we want passwords,
+ * but it's probably easier to just get the password up front and use
+ * it.  So we just take the passed in g_malloc'd (well probably, who knows)
+ * and strdup it using NSPR's memory allocation routines.
+ */
+static char *
+sc_security_token_password_handler (PK11SlotInfo *slot, 
+				    PRBool        is_retrying, 
+				    const gchar  *password)
+{
+    if (is_retrying)
+	    return NULL;
+
+    return password != NULL? PL_strdup (password): NULL;
+}
+
+gboolean
+sc_security_token_unlock (ScSecurityToken *token,
+			  const gchar     *password)
+{   
+    SECStatus status;
+
+    PK11_SetPasswordFunc ((PK11PasswordFunc) sc_security_token_password_handler);
+
+    /* we pass PR_TRUE to load certificates
+     */
+    status = PK11_Authenticate (token->priv->slot, PR_TRUE, (gpointer) password);
+
+    if (status != SECSuccess) {
+	    sc_debug ("could not unlock token - %d", status);
+	    return FALSE;
+    }
+    return TRUE;
+}
+
+static PK11SlotInfo *
+sc_security_token_find_slot_from_id (ScSecurityToken *token,
+                                     gint slot_id)
+{
+    int i;
+
+    for (i = 0; i < token->priv->module->slotCount; i++)
+	    if (PK11_GetSlotID (token->priv->module->slots[i]) == slot_id)
+		    return token->priv->module->slots[i];
+
+    return NULL;
+}
+
+static gboolean
+sc_security_token_fetch_certificates (ScSecurityToken *token)
+{
+    PK11SlotInfo *slot;
+    CERTCertList *certificates;
+    CERTCertListNode *node;
+    SECStatus status;
+    int i;
+
+    sc_security_token_unlock (token, "0000");
+
+    sc_debug ("fetching certificates for token in slot %lu",
+	      token->priv->slot_id);
+
+    slot = sc_security_token_find_slot_from_id (token,
+						token->priv->slot_id);
+
+    g_assert (PK11_GetSlotID (slot) == token->priv->slot_id);
+
+    if (i == token->priv->module->slotCount) {
+	    sc_debug ("could not find slot %lu", token->priv->slot_id);
+	    return FALSE;
+    }
+
+    certificates = PK11_ListCertsInSlot (slot);
+
+    sc_debug ("filtering out non-user certificates");
+    if (CERT_FilterCertListForUserCerts (certificates) != SECSuccess) {
+	    CERT_DestroyCertList (certificates);
+	    sc_debug ("could not filter out non-user certificates");
+	    return FALSE;
+    }
+
+    for (node = CERT_LIST_HEAD (certificates); 
+	 !CERT_LIST_END (node, certificates);
+	 node = CERT_LIST_NEXT(node)) {
+
+	    SECCertificateUsage cert_usages;
+
+	    sc_debug ("verifying certificate for use");
+	    status = CERT_VerifyCertificateNow (NULL, node->cert, TRUE, 
+						0, NULL, &cert_usages);
+
+	    if (status != SECSuccess) {
+		    sc_debug ("could not be verified, skipping...");
+		    continue;
+	    }
+
+	    sc_debug ("got cert with usages 0x%x", cert_usages);
+
+	    if (token->priv->encryption_certificate == NULL) {
+
+		    sc_debug ("checking if certificate can be used for data "
+			      "encryption");
+		    status = CERT_CheckCertUsage (node->cert, 
+						  KU_DATA_ENCIPHERMENT);
+
+		    if (status == SECSuccess) {
+			    token->priv->encryption_certificate = 
+				    CERT_DupCertificate (node->cert);
+		    } else {
+			    sc_debug ("certificate can not be used for encryption");
+		    }
+	    }
+
+	    if (token->priv->signing_certificate == NULL) {
+
+		    sc_debug ("checking if certificate can be used for data "
+			      "signing");
+		    status = CERT_CheckCertUsage (node->cert, 
+						  KU_DIGITAL_SIGNATURE);
+
+		    if (status == SECSuccess) {
+			    token->priv->signing_certificate = 
+				    CERT_DupCertificate (node->cert);
+		    } else {
+			    sc_debug ("certificate can not be used for signing things");
+		    }
+	    }
+    }
+    return TRUE;
+}
+
+ScSecurityTokenRequest *
+sc_security_token_upload_data (ScSecurityToken *token,
+			       const gchar     *key,
+			       const gchar     *data)
+{
+    return NULL;
+}
+
+ScSecurityTokenRequest *
+sc_security_token_download_data (ScSecurityToken *token,
+				 const gchar     *key)
+{
+    return NULL;
+}
+
+ScSecurityTokenRequest *
+sc_security_token_delete_data (ScSecurityToken *token,
+			       const gchar     *key)
+{
+    return NULL;
+}
+
+#ifdef SC_SECURITY_TOKEN_ENABLE_TEST
+#include <glib.h>
+
+static GMainLoop *event_loop;
+
+int 
+main (int   argc, 
+      char *argv[])
+{
+    ScSecurityToken *token;
+    GError *error;
+
+    g_log_set_always_fatal (G_LOG_LEVEL_ERROR
+			    | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
+    g_type_init ();
+
+    g_message ("creating instance of 'security token' object...");
+    token = _sc_security_token_new (NULL, 1, 1);
+    g_message ("'security token' object created successfully");
+
+    g_message ("destroying previously created 'security token' object...");
+    g_object_unref (token);
+    token = NULL;
+    g_message ("'security token' object destroyed successfully");
+
+    return 0;
+}
+#endif
--- /dev/null	2006-08-14 10:23:47.354838496 -0400
+++ gnome-screensaver-2.15.6/src/cut-n-paste/securitytoken.h	2006-08-14 15:08:04.000000000 -0400
@@ -0,0 +1,101 @@
+/* securitytoken.h - api for reading and writing data to a security token 
+ *
+ * Copyright (C) 2006 Ray Strode
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
+#ifndef SC_SECURITY_TOKEN_H
+#define SC_SECURITY_TOKEN_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <secmod.h>
+
+G_BEGIN_DECLS
+#define SC_TYPE_SECURITY_TOKEN            (sc_security_token_get_type ())
+#define SC_SECURITY_TOKEN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_SECURITY_TOKEN, ScSecurityToken))
+#define SC_SECURITY_TOKEN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_SECURITY_TOKEN, ScSecurityTokenClass))
+#define SC_IS_SECURITY_TOKEN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_SECURITY_TOKEN))
+#define SC_IS_SECURITY_TOKEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_SECURITY_TOKEN))
+#define SC_SECURITY_TOKEN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), SC_TYPE_SECURITY_TOKEN, ScSecurityTokenClass))
+#define SC_SECURITY_TOKEN_ERROR           (sc_security_token_error_quark ())
+typedef struct _ScSecurityTokenClass ScSecurityTokenClass;
+typedef struct _ScSecurityToken ScSecurityToken;
+typedef struct _ScSecurityTokenPrivate ScSecurityTokenPrivate;
+typedef enum _ScSecurityTokenError ScSecurityTokenError;
+typedef enum _ScSecurityTokenState ScSecurityTokenState;
+
+typedef struct _ScSecurityTokenRequest ScSecurityTokenRequest;
+
+struct _ScSecurityToken {
+    GObject parent;
+
+    /*< private > */
+    ScSecurityTokenPrivate *priv;
+};
+
+struct _ScSecurityTokenClass {
+    GObjectClass parent_class;
+
+    void (* inserted) (ScSecurityToken *token);
+    void (* removed) (ScSecurityToken *token);
+};
+
+enum _ScSecurityTokenError {
+    SC_SECURITY_TOKEN_ERROR_GENERIC = 0,
+};
+
+enum _ScSecurityTokenState {
+    SC_SECURITY_TOKEN_STATE_INSERTED = 0,
+    SC_SECURITY_TOKEN_STATE_REMOVED,
+};
+
+GType sc_security_token_get_type (void) G_GNUC_CONST;
+GQuark sc_security_token_error_quark (void) G_GNUC_CONST;
+
+CK_SLOT_ID sc_security_token_get_slot_id (ScSecurityToken *token);
+gint sc_security_token_get_slot_series (ScSecurityToken *token);
+ScSecurityTokenState sc_security_token_get_state (ScSecurityToken *token);
+
+gchar *sc_security_token_get_name (ScSecurityToken *token);
+gboolean sc_security_token_is_login_token (ScSecurityToken *token);
+
+gboolean sc_security_token_unlock (ScSecurityToken *token,
+				   const gchar     *password);
+
+ScSecurityTokenRequest *sc_security_token_upload_data (ScSecurityToken *token,
+						       const gchar     *key,
+						       const gchar     *data);
+
+ScSecurityTokenRequest *sc_security_token_download_data (ScSecurityToken *token,
+							 const gchar     *key);
+
+ScSecurityTokenRequest *sc_security_token_delete_data (ScSecurityToken *token,
+						       const gchar     *key);
+
+/* don't under any circumstances call these functions */
+#ifdef SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
+
+ScSecurityToken *_sc_security_token_new (SECMODModule *module,
+					 CK_SLOT_ID slot_id, 
+					 gint slot_series);
+void _sc_security_token_set_state (ScSecurityToken      *token,
+				   ScSecurityTokenState  state);
+#endif 
+
+G_END_DECLS
+#endif				/* SC_SECURITY_TOKEN_H */
--- /dev/null	2006-08-14 10:23:47.354838496 -0400
+++ gnome-screensaver-2.15.6/src/cut-n-paste/securitytokenmonitor.h	2006-08-14 15:08:04.000000000 -0400
@@ -0,0 +1,82 @@
+/* securitytokenmonitor.h - monitor for security token insertion and
+ *                          removal events
+ *
+ * Copyright (C) 2006 Ray Strode
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
+#ifndef SC_SECURITY_TOKEN_MONITOR_H
+#define SC_SECURITY_TOKEN_MONITOR_H
+
+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
+#include "securitytoken.h"
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+#define SC_TYPE_SECURITY_TOKEN_MONITOR            (sc_security_token_monitor_get_type ())
+#define SC_SECURITY_TOKEN_MONITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitor))
+#define SC_SECURITY_TOKEN_MONITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass))
+#define SC_IS_SECURITY_TOKEN_MONITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR))
+#define SC_IS_SECURITY_TOKEN_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR))
+#define SC_SECURITY_TOKEN_MONITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass))
+#define SC_SECURITY_TOKEN_MONITOR_ERROR           (sc_security_token_monitor_error_quark ())
+typedef struct _ScSecurityTokenMonitor ScSecurityTokenMonitor;
+typedef struct _ScSecurityTokenMonitorClass ScSecurityTokenMonitorClass;
+typedef struct _ScSecurityTokenMonitorPrivate ScSecurityTokenMonitorPrivate;
+typedef enum _ScSecurityTokenMonitorError ScSecurityTokenMonitorError;
+
+struct _ScSecurityTokenMonitor {
+    GObject parent;
+
+    /*< private > */
+    ScSecurityTokenMonitorPrivate *priv;
+};
+
+struct _ScSecurityTokenMonitorClass {
+    GObjectClass parent_class;
+
+    /* Signals */
+    void (*security_token_inserted) (ScSecurityTokenMonitor *monitor,
+				     ScSecurityToken *token);
+    void (*security_token_removed) (ScSecurityTokenMonitor *monitor,
+				    ScSecurityToken *token);
+    void (*error) (ScSecurityTokenMonitor *monitor, 
+		   GError                 *error);
+};
+
+enum _ScSecurityTokenMonitorError {
+    SC_SECURITY_TOKEN_MONITOR_ERROR_GENERIC = 0,
+    SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
+    SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
+};
+
+GType sc_security_token_monitor_get_type (void) G_GNUC_CONST;
+GQuark sc_security_token_monitor_error_quark (void) G_GNUC_CONST;
+
+ScSecurityTokenMonitor *sc_security_token_monitor_new (const gchar *module);
+
+gboolean sc_security_token_monitor_start (ScSecurityTokenMonitor  *monitor, 
+				 	  GError                 **error);
+
+void sc_security_token_monitor_stop (ScSecurityTokenMonitor *monitor);
+
+gchar *sc_security_token_monitor_get_module_path (ScSecurityTokenMonitor *monitor);
+gboolean sc_security_token_monitor_login_token_is_inserted (ScSecurityTokenMonitor *monitor);
+
+G_END_DECLS
+#endif				/* SC_SECURITY_TOKEN_MONITOR_H */
--- gnome-screensaver-2.15.6/src/cut-n-paste/Makefile.am.securitytoken	2005-04-14 15:59:44.000000000 -0400
+++ gnome-screensaver-2.15.6/src/cut-n-paste/Makefile.am	2006-08-14 15:08:04.000000000 -0400
@@ -10,7 +10,18 @@ MAINTAINERCLEANFILES =                  
         Makefile.in
 
 noinst_LIBRARIES =			\
-	libfast-user-switch.a
+	libfast-user-switch.a           \
+	libsecuritytoken.a
+
+libsecuritytoken_a_SOURCES = \
+	securitytoken.h \
+	securitytoken.c \
+	securitytokenmonitor.h \
+	securitytokenmonitor.c
+
+libsecuritytoken_a_CFLAGS = $(SECURITY_TOKEN_CFLAGS) \
+			    -DLIBDIR=\""$(libdir)"\"  \
+			    -DSYSCONFDIR=\""$(sysconfdir)"\"
 
 libfast_user_switch_a_CPPFLAGS =				\
 	-DDATADIR=\""$(datadir)"\"				\
--- gnome-screensaver-2.15.6/src/gs-auth-pam.c.securitytoken	2006-06-08 16:03:55.000000000 -0400
+++ gnome-screensaver-2.15.6/src/gs-auth-pam.c	2006-08-14 15:08:04.000000000 -0400
@@ -207,6 +207,13 @@ pam_conversation (int                   
                                 reply [replies].resp_retcode = PAM_INCOMPLETE;
                         }
                 }
+
+		/* iterate the glib event loop inbetween processing pam
+		 * messages so that the user interface can be updated
+		 * to reflect changes that are a result of the pam
+		 * messages
+		 */
+		while (g_main_context_iteration (NULL, FALSE));
         }
 
         *resp = reply;
--- gnome-screensaver-2.15.6/src/gs-window-x11.c.securitytoken	2006-08-04 15:15:22.000000000 -0400
+++ gnome-screensaver-2.15.6/src/gs-window-x11.c	2006-08-14 15:08:04.000000000 -0400
@@ -680,6 +680,7 @@ get_env_vars (GtkWidget *widget)
                 "XAUTHLOCALHOSTNAME",
                 "KRB5CCNAME",
                 "KRBTKFILE",
+                "PKCS11_LOGIN_TOKEN_NAME",
                 "LANG",
                 "LANGUAGE",
                 "RUNNING_UNDER_GDM",
--- gnome-screensaver-2.15.6/configure.ac.securitytoken	2006-07-31 16:07:33.000000000 -0400
+++ gnome-screensaver-2.15.6/configure.ac	2006-08-14 15:08:04.000000000 -0400
@@ -43,6 +43,7 @@ GLADE_REQUIRED_VERSION=2.5.0
 LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
 LIBEXIF_REQUIRED_VERSION=0.6.12
 GLIB_REQUIRED_VERSION=2.7.0
+NSS_REQUIRED_VERSION=3.11.2
 
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(crypt.h sys/select.h)
@@ -56,7 +57,8 @@ PKG_CHECK_MODULES(GNOME_SCREENSAVER,
         gtk+-2.0 >= $GTK_REQUIRED_VERSION
         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
-        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
+        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION
+	nss >= $NSS_REQUIRED_VERSION)
 AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
 AC_SUBST(GNOME_SCREENSAVER_LIBS)
 
@@ -90,8 +92,6 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
 
 AM_GCONF_SOURCE_2
 
-GNOME_COMPILE_WARNINGS(yes)
-
 # Solaris requires libresolv for daemon()
 case "$host" in
 	*-*-solaris*)
@@ -234,6 +234,16 @@ fi
 AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
 AC_SUBST(HAVE_USER_SWITCHING)
 
+
+# security token support
+PKG_CHECK_MODULES(SECURITY_TOKEN,
+        gobject-2.0 >= $GLIB_REQUIRED_VERSION
+	nss >= $NSS_REQUIRED_VERSION)
+AC_SUBST(SECURITY_TOKEN_CFLAGS)
+AC_SUBST(SECURITY_TOKEN_LIBS)
+
+
+
 dnl ---------------------------------------------------------------------------
 dnl - Where should we put documentation ?
 dnl ---------------------------------------------------------------------------


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gnome-screensaver.spec	14 Aug 2006 19:07:44 -0000	1.98
+++ gnome-screensaver.spec	14 Aug 2006 19:25:45 -0000	1.99
@@ -21,7 +21,7 @@
 
 Patch1: gnome-screensaver-2.15.4-default-theme.patch
 Patch3: gnome-screensaver-2.15.1-invisible-char.patch
-Patch4: gnome-screensaver-2.15.4-securitytoken.patch
+Patch4: gnome-screensaver-2.15.6-securitytoken.patch
 Patch6: gnome-screensaver-2.15.4-compile-warnings.patch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org


--- gnome-screensaver-2.15.4-securitytoken.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 19:34:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 15:34:21 -0400
Subject: rpms/gfs2-utils/devel .cvsignore, 1.4, 1.5 gfs2-utils.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200608141934.k7EJYLtY002756@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	.cvsignore gfs2-utils.spec sources 
Log Message:
New upstream sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Jul 2006 21:48:50 -0000	1.4
+++ .cvsignore	14 Aug 2006 19:34:19 -0000	1.5
@@ -1 +1 @@
-gfs2-utils-0.1.2.tar.gz
+gfs2-0.1.3.tar.gz


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gfs2-utils.spec	24 Jul 2006 21:48:50 -0000	1.6
+++ gfs2-utils.spec	14 Aug 2006 19:34:19 -0000	1.7
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: gfs2-utils
-Version: 0.1.2
-Release: 0.fc6.0
+Version: 0.1.3
+Release: 0%{?dist}
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)
@@ -72,6 +72,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Aug 14 2006 Chris Feist <cfeist at redhat.com> 0.1.3-0
+- New Upstream sources, use dist tag.
+
 * Fri Jul 14 2006 Chris Feist <cfeist at redhat.com>
 - Rebuild with updated sources
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Jul 2006 21:48:50 -0000	1.4
+++ sources	14 Aug 2006 19:34:19 -0000	1.5
@@ -1 +1 @@
-bfcd7fc17d5330b45e2d7196ef2d9404  gfs2-utils-0.1.2.tar.gz
+8988aa754a321402bdf441a824f57a6b  gfs2-0.1.3.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 14 19:36:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 15:36:20 -0400
Subject: rpms/gfs2-utils/devel gfs2-utils.spec,1.7,1.8
Message-ID: <200608141936.k7EJaKYb003155@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	gfs2-utils.spec 
Log Message:
Different source location.


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gfs2-utils.spec	14 Aug 2006 19:34:19 -0000	1.7
+++ gfs2-utils.spec	14 Aug 2006 19:36:17 -0000	1.8
@@ -12,7 +12,7 @@
 
 Name: gfs2-utils
 Version: 0.1.3
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)
@@ -24,7 +24,7 @@
 BuildRequires: glibc-kernheaders
 BuildRequires: libvolume_id-devel
 URL: http://sources.redhat.com/cluster/
-Source0: gfs2-utils-%{version}.tar.gz
+Source0: gfs2-%{version}.tar.gz
 Patch1: gfs2-utils-norun.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 19:40:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 15:40:06 -0400
Subject: rpms/gfs2-utils/devel gfs2-utils.spec,1.8,1.9
Message-ID: <200608141940.k7EJe6FQ004573@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	gfs2-utils.spec 
Log Message:
More source tarball name change issues.


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gfs2-utils.spec	14 Aug 2006 19:36:17 -0000	1.8
+++ gfs2-utils.spec	14 Aug 2006 19:40:04 -0000	1.9
@@ -12,7 +12,7 @@
 
 Name: gfs2-utils
 Version: 0.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)
@@ -35,7 +35,7 @@
 filesystems.
 
 %prep
-%setup -q -n gfs2-utils-%{version}
+%setup -q -n gfs2-%{version}
 %patch1 -p1 -b .norun
 
 %build



From fedora-cvs-commits at redhat.com  Mon Aug 14 19:46:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 15:46:36 -0400
Subject: rpms/gfs2-utils/devel gfs2-utils.spec,1.9,1.10
Message-ID: <200608141946.k7EJkaDG011662@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	gfs2-utils.spec 
Log Message:
Fixed patching.


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gfs2-utils.spec	14 Aug 2006 19:40:04 -0000	1.9
+++ gfs2-utils.spec	14 Aug 2006 19:46:34 -0000	1.10
@@ -12,7 +12,7 @@
 
 Name: gfs2-utils
 Version: 0.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)
@@ -36,7 +36,7 @@
 
 %prep
 %setup -q -n gfs2-%{version}
-%patch1 -p1 -b .norun
+%patch1 -p2 -b .norun
 
 %build
 cd gfs2



From fedora-cvs-commits at redhat.com  Mon Aug 14 19:50:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 15:50:53 -0400
Subject: rpms/gfs2-utils/devel gfs2-utils.spec,1.10,1.11
Message-ID: <200608141950.k7EJorhD023293@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	gfs2-utils.spec 
Log Message:
More build fixes.


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gfs2-utils.spec	14 Aug 2006 19:46:34 -0000	1.10
+++ gfs2-utils.spec	14 Aug 2006 19:50:51 -0000	1.11
@@ -12,7 +12,7 @@
 
 Name: gfs2-utils
 Version: 0.1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)
@@ -39,7 +39,6 @@
 %patch1 -p2 -b .norun
 
 %build
-cd gfs2
 ./configure --kernel_src=/usr --libdir=%{_libdir}
 sed -i '/RELEASE_MAJOR/s/= .*/= 0/' make/defines.mk
 sed -i '/RELEASE_MINOR/s/= .*/= 1.0/' make/defines.mk



From fedora-cvs-commits at redhat.com  Mon Aug 14 20:17:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 16:17:30 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec, 1.99,
	1.100 gnome-screensaver-2.15.4-compile-warnings.patch, 1.1, NONE
Message-ID: <200608142017.k7EKHUp1007588@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-screensaver.spec 
Removed Files:
	gnome-screensaver-2.15.4-compile-warnings.patch 
Log Message:
drop patch



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gnome-screensaver.spec	14 Aug 2006 19:25:45 -0000	1.99
+++ gnome-screensaver.spec	14 Aug 2006 20:17:28 -0000	1.100
@@ -22,7 +22,6 @@
 Patch1: gnome-screensaver-2.15.4-default-theme.patch
 Patch3: gnome-screensaver-2.15.1-invisible-char.patch
 Patch4: gnome-screensaver-2.15.6-securitytoken.patch
-Patch6: gnome-screensaver-2.15.4-compile-warnings.patch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
 BuildRequires: gtk2-devel => %{gtk2_version}
@@ -64,7 +63,6 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch3 -p1 -b .invisible-char
 %patch4 -p1 -b .securitytoken
-%patch6 -p1 -b .compile-warnings
 
 %build
 autoreconf


--- gnome-screensaver-2.15.4-compile-warnings.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 14 20:35:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 16:35:21 -0400
Subject: rpms/libnl/devel libnl-1.0-pre5-nl_recv.patch, NONE, 1.1 libnl.spec,
	1.17, 1.18
Message-ID: <200608142035.k7EKZLlo019944@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/libnl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19875

Modified Files:
	libnl.spec 
Added Files:
	libnl-1.0-pre5-nl_recv.patch 
Log Message:
- fix for ppc64


libnl-1.0-pre5-nl_recv.patch:
 include/netlink/attr.h |    3 -
 lib/attr.c             |    2 -
 lib/nl.c               |   93 ++++++++++++++++++++++++++++---------------------
 lib/utils.c            |   12 +++---
 4 files changed, 63 insertions(+), 47 deletions(-)

--- NEW FILE libnl-1.0-pre5-nl_recv.patch ---
--- libnl-1.0-pre5/lib/attr.c.nl_recv	2006-08-14 05:36:27.000000000 -0400
+++ libnl-1.0-pre5/lib/attr.c	2006-08-14 05:36:43.000000000 -0400
@@ -504,7 +504,7 @@
 
 	nla = nla_reserve(n, attrtype, attrlen);
 	if (!nla)
-		return nl_errno(ENOMEM);
+		return -nl_get_errno();
 
 	memcpy(nla_data(nla), data, attrlen);
 
--- libnl-1.0-pre5/lib/nl.c.nl_recv	2006-08-14 05:36:27.000000000 -0400
+++ libnl-1.0-pre5/lib/nl.c	2006-08-14 05:40:48.000000000 -0400
@@ -569,14 +569,16 @@
  *
  * @return Number of octets read, 0 on EOF or a negative error code.
  */
+
+
 int nl_recv(struct nl_handle *handle, struct sockaddr_nl *nla,
 	    unsigned char **buf)
 {
-	int n;
-	int flags = MSG_PEEK;
+	int n = -1;
+	int flags = MSG_PEEK | MSG_WAITALL;
 
 	struct iovec iov = {
-		.iov_len = 4096,
+		.iov_len = 256,
 	};
 
 	struct msghdr msg = {
@@ -589,47 +591,61 @@
 		.msg_flags = 0,
 	};
 
-	iov.iov_base = *buf = calloc(1, iov.iov_len);
+	iov.iov_base = calloc(1, iov.iov_len);
+	if (iov.iov_base == NULL)
+		return nl_error(errno, "calloc failed");
+
+	do {
+		if (!(n = recvmsg(handle->h_fd, &msg, flags)))
+			break;
+		if (n < 0) {
+			if (errno == EINTR || errno == EAGAIN) {
+				n = -1;
+				continue;
+			} else if (errno == ENOBUFS) {
+				n = -1;
+				continue;
+			} else {
+				n = nl_error(errno, "recvmsg failed");
+				break;
+			}
+		}
 
-retry:
+		if (msg.msg_flags & MSG_TRUNC) {
+			unsigned char *tbuf = iov.iov_base;
 
-	if ((n = recvmsg(handle->h_fd, &msg, flags)) <= 0) {
-		if (!n)
-			goto abort;
-		else if (n < 0) {
-			if (errno == EINTR)
-				goto retry;
-			else if (errno == EAGAIN)
-				goto abort;
-			else {
-				free(*buf);
-				return nl_error(errno, "recvmsg failed");
+			/* Provided buffer is not long enough, enlarge it
+			 * and try again. */
+			iov.iov_len += 256;
+			iov.iov_base = realloc(tbuf, iov.iov_len);
+			if (!iov.iov_base) {
+				n = nl_error(errno, "realloc failed");
+				iov.iov_base = NULL;
+                                memset(tbuf, '\0', sizeof (*tbuf));
+				free(tbuf);
+				break;
 			}
+			n = -1;
+			continue;
 		}
-	}
-	
-	if (iov.iov_len < n) {
-		/* Provided buffer is not long enough, enlarge it
-		 * and try again. */
-		iov.iov_len *= 2;
-		iov.iov_base = *buf = realloc(*buf, iov.iov_len);
-		goto retry;
-	} else if (flags != 0) {
-		/* Buffer is big enough, do the actual reading */
-		flags = 0;
-		goto retry;
-	}
 
-	if (msg.msg_namelen != sizeof(struct sockaddr_nl)) {
-		free(*buf);
-		return nl_error(EADDRNOTAVAIL, "socket address size mismatch");
-	}
+		if (msg.msg_namelen != sizeof(struct sockaddr_nl)) {
+			n = nl_error(EADDRNOTAVAIL, "socket address size mismatch");
+                        memset(iov.iov_base, '\0', iov.iov_len);
+			free(iov.iov_base);
+			iov.iov_base = NULL;
+			break;
+		}
 
-	return n;
+		if (n > 0 && (flags & MSG_PEEK)) {
+		    flags &= ~MSG_PEEK;
+		    n = -1;
+		}
+	} while (n < 0);
 
-abort:
-	free(*buf);
-	return 0;
+	if (iov.iov_base)
+		*buf = iov.iov_base;
+	return n;
 }
 
 
@@ -652,7 +668,7 @@
 	int n, err = 0;
 	unsigned char *buf = NULL;
 	struct nlmsghdr *hdr;
-	struct sockaddr_nl nla = {0};
+	struct sockaddr_nl nla = { 16, 0, 0, 0 };
 
 continue_reading:
 	if (cb->cb_recv_ow)
@@ -665,7 +681,6 @@
 
 	hdr = (struct nlmsghdr *) buf;
 	while (nlmsg_ok(hdr, n)) {
-
 		/* Raw callback is the first, it gives the most control
 		 * to the user and he can do his very own parsing. */
 		if (cb->cb_set[NL_CB_MSG_IN]) {
--- libnl-1.0-pre5/lib/utils.c.nl_recv	2006-08-14 05:36:27.000000000 -0400
+++ libnl-1.0-pre5/lib/utils.c	2006-08-14 05:42:00.000000000 -0400
@@ -36,7 +36,7 @@
 int __nl_error(int err, const char *file, unsigned int line, const char *func,
 	       const char *fmt, ...)
 {
-	char *user_err;
+	char *user_err = NULL;
 	va_list args;
 
 	if (errbuf) {
@@ -54,13 +54,13 @@
 
 #ifdef VERBOSE_ERRORS
 	asprintf(&errbuf, "%s:%u:%s: %s (errno = %s)",
-		 file, line, func, fmt ? user_err : "", strerror(err));
+		 file, line, func, user_err ? user_err : "", strerror(err));
 #else
 	asprintf(&errbuf, "%s (errno = %s)",
-		 fmt ? user_err : "", strerror(err));
+		 user_err ? user_err : "", strerror(err));
 #endif
 
-	if (fmt)
+	if (user_err)
 		free(user_err);
 
 	return -err;
@@ -79,7 +79,9 @@
  */
 char *nl_geterror(void)
 {
-	return errbuf ? : "Success\n";
+	if (!errbuf)
+		return strerror(nlerrno);
+	return errbuf;
 }
 
 /** @} */
--- libnl-1.0-pre5/include/netlink/attr.h.nl_recv	2006-08-14 05:36:28.000000000 -0400
+++ libnl-1.0-pre5/include/netlink/attr.h	2006-08-14 05:36:44.000000000 -0400
@@ -164,8 +164,7 @@
  */
 #define NLA_PUT_TYPE(n, type, attrtype, value) \
 	do { \
-		type __tmp = value; \
-		NLA_PUT(n, attrtype, sizeof(type), &__tmp); \
+		NLA_PUT(n, attrtype, sizeof(type), &(value)); \
 	} while(0)
 
 /**


Index: libnl.spec
===================================================================
RCS file: /cvs/dist/rpms/libnl/devel/libnl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libnl.spec	1 Aug 2006 02:10:50 -0000	1.17
+++ libnl.spec	14 Aug 2006 20:35:18 -0000	1.18
@@ -5,7 +5,7 @@
 License: LGPL
 Name: libnl
 Version: 1.0
-Release: 0.10.%{preversion}.3
+Release: 0.10.%{preversion}.4
 URL: http://people.suug.ch/~tgr/libnl/
 Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}-%{preversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -15,6 +15,7 @@
 Patch3: libnl-1.0-pre5-static.patch
 Patch4: libnl-1.0-pre5-__u64_x86_64.patch
 Patch5: libnl-1.0-pre5-debuginfo.patch
+Patch6: libnl-1.0-pre5-nl_recv.patch
 
 %description
 This package contains a convenience library to simplify
@@ -37,6 +38,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure
@@ -82,6 +84,9 @@
 %{_libdir}/pkgconfig/%{name}-1.pc
 
 %changelog
+* Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 1.0-0.10.pre5.4
+- Fix nl_recv() for ppc64
+
 * Mon Jul 31 2006 Jeremy Katz <katzj at redhat.com> - 1.0-0.10.pre5.3
 - unbreak the pkgconfig file
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 21:23:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 17:23:55 -0400
Subject: rpms/libdhcp/devel .cvsignore, 1.13, 1.14 libdhcp.spec, 1.32,
	1.33 sources, 1.25, 1.26
Message-ID: <200608142123.k7ELNt44004018@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4003

Modified Files:
	.cvsignore libdhcp.spec sources 
Log Message:
- update to 1.12-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	14 Aug 2006 17:16:48 -0000	1.13
+++ .cvsignore	14 Aug 2006 21:23:52 -0000	1.14
@@ -1 +1 @@
-libdhcp-1.11.tar.gz
+libdhcp-1.12.tar.gz


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libdhcp.spec	14 Aug 2006 17:16:48 -0000	1.32
+++ libdhcp.spec	14 Aug 2006 21:23:52 -0000	1.33
@@ -1,6 +1,6 @@
 Summary:    A library for network interface configuration with DHCP
 Name:       libdhcp
-Version:    1.11
+Version:    1.12
 Release:    1
 License:    GPL
 Group:      Development/Libraries
@@ -8,7 +8,8 @@
 Source0:    %{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: dhcp-devel, libdhcp4client-devel >= 12:3.0.4-17
-BuildRequires:	libdhcp6client-devel, libnl-devel, pkgconfig, doxygen
+BuildRequires: libdhcp6client-devel, libnl-devel >= 1.0-0.10.pre5.4
+BuildRequires: pkgconfig, doxygen
 
 %description
 libdhcp enables programs to invoke and control the
@@ -76,6 +77,9 @@
 %{pkgcfgdir}/libdhcp.pc
 
 %changelog
+* Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 1.12-1
+- Fixes for ppc and ppc64 (#201920)
+
 * Fri Aug 11 2006 David Cantrell <dcantrell at redhat.com> - 1.11-1
 - If interface is already configured, down it before reconfig (#202208)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Aug 2006 17:16:48 -0000	1.25
+++ sources	14 Aug 2006 21:23:52 -0000	1.26
@@ -1 +1 @@
-ada5cfba359fe6f191b0ba92ffc9602f  libdhcp-1.11.tar.gz
+b1fd963eeae58c79183a5843e68738e5  libdhcp-1.12.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 14 22:20:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 18:20:49 -0400
Subject: rpms/kernel/devel/configs config-olpc,1.3,1.4
Message-ID: <200608142220.k7EMKnWt022349@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-olpc 
Log Message:
enable mmc for olpc


Index: config-olpc
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-olpc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-olpc	14 Aug 2006 16:18:46 -0000	1.3
+++ config-olpc	14 Aug 2006 22:20:46 -0000	1.4
@@ -443,7 +443,7 @@
 # CONFIG_USB_TOUCHSCREEN_3M is not set
 # CONFIG_USB_TOUCHSCREEN_ITM is not set
 
-# CONFIG_MMC is not set
+CONFIG_MMC=y
 # CONFIG_MMC_WBSD is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_INFINIBAND is not set



From fedora-cvs-commits at redhat.com  Mon Aug 14 22:22:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 18:22:48 -0400
Subject: rpms/libXfont/devel fdo-7535.patch, NONE, 1.1 libXfont.spec, 1.21,
	1.22
Message-ID: <200608142222.k7EMMmnI022785@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	libXfont.spec 
Added Files:
	fdo-7535.patch 
Log Message:
* Mon Aug 14 2006 Soren Sandmann <sandmann at redhat.com> - 1.2.0-2.fc6
- fdo-7535.patch
  Fix for FDO bug 7535, CVE-2006-3467, RH bug 202472




fdo-7535.patch:
 pcfread.c |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletion(-)

--- NEW FILE fdo-7535.patch ---
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index dd76868..6210f18 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -45,6 +45,7 @@ #define   MAX(a,b)    (((a)>(b)) ? a : b
 #endif
 
 #include <stdarg.h>
+#include <stdint.h>
 
 void
 pcfError(const char* message, ...)
@@ -133,6 +134,10 @@ pcfReadTOC(FontFilePtr file, int *countp
 	return (PCFTablePtr) NULL;
     count = pcfGetLSB32(file);
     if (IS_EOF(file)) return (PCFTablePtr) NULL;
+    if (count < 0 || count > INT32_MAX / sizeof(PCFTableRec)) {
+	pcfError("pcfReadTOC(): invalid file format\n");
+	return NULL;
+    }
     tables = (PCFTablePtr) xalloc(count * sizeof(PCFTableRec));
     if (!tables) {
       pcfError("pcfReadTOC(): Couldn't allocate tables (%d*%d)\n", count, sizeof(PCFTableRec));
@@ -252,6 +257,10 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
     if (!PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT))
 	goto Bail;
     nprops = pcfGetINT32(file, format);
+    if (nprops <= 0 || nprops > INT32_MAX / sizeof(FontPropRec)) {
+	pcfError("pcfGetProperties(): invalid nprops value (%d)\n", nprops);
+	goto Bail;
+    }
     if (IS_EOF(file)) goto Bail;
     props = (FontPropPtr) xalloc(nprops * sizeof(FontPropRec));
     if (!props) {
@@ -267,6 +276,13 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
 	props[i].name = pcfGetINT32(file, format);
 	isStringProp[i] = pcfGetINT8(file, format);
 	props[i].value = pcfGetINT32(file, format);
+	if (props[i].name < 0 
+	    || (isStringProp[i] != 0 && isStringProp[i] != 1)
+	    || (isStringProp[i] && props[i].value < 0)) {
+	    pcfError("pcfGetProperties(): invalid file format %d %d %d\n",
+		     props[i].name, isStringProp[i], props[i].value);
+	    goto Bail;
+	}
 	if (IS_EOF(file)) goto Bail;
     }
     /* pad the property array */
@@ -282,6 +298,7 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
     }
     if (IS_EOF(file)) goto Bail;
     string_size = pcfGetINT32(file, format);
+    if (string_size < 0) goto Bail;
     if (IS_EOF(file)) goto Bail;
     strings = (char *) xalloc(string_size);
     if (!strings) {
@@ -422,6 +439,10 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
     else
 	nmetrics = pcfGetINT16(file, format);
     if (IS_EOF(file)) goto Bail;
+    if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
+	pcfError("pcfReadFont(): invalid file format\n");
+	goto Bail;
+    }
     metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
     if (!metrics) {
       pcfError("pcfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
@@ -447,7 +468,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
     nbitmaps = pcfGetINT32(file, format);
     if (nbitmaps != nmetrics || IS_EOF(file))
 	goto Bail;
-
+    /* nmetrics is alreadt ok, so nbitmap also is */
     offsets = (CARD32 *) xalloc(nbitmaps * sizeof(CARD32));
     if (!offsets) {
       pcfError("pcfReadFont(): Couldn't allocate offsets (%d*%d)\n", nbitmaps, sizeof(CARD32));
@@ -461,6 +482,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
     for (i = 0; i < GLYPHPADOPTIONS; i++) {
 	bitmapSizes[i] = pcfGetINT32(file, format);
 	if (IS_EOF(file)) goto Bail;
+	if (bitmapSizes[i] < 0) goto Bail;
     }
     
     sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX(format)];
@@ -536,6 +558,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
 	if (IS_EOF(file)) goto Bail;
 	if (nink_metrics != nmetrics)
 	    goto Bail;
+	/* nmetrics already checked */
 	ink_metrics = (xCharInfo *) xalloc(nink_metrics * sizeof(xCharInfo));
       if (!ink_metrics) {
           pcfError("pcfReadFont(): Couldn't allocate ink_metrics (%d*%d)\n", nink_metrics, sizeof(xCharInfo));       
@@ -809,6 +832,10 @@ pmfReadFont(FontPtr pFont, FontFilePtr f
     else
 	nmetrics = pcfGetINT16(file, format);
     if (IS_EOF(file)) goto Bail;
+    if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
+	pcfError("pmfReadFont(): invalid file format\n");
+	goto Bail;
+    }
     metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
     if (!metrics) {
       pcfError("pmfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libXfont.spec	12 Jul 2006 07:05:15 -0000	1.21
+++ libXfont.spec	14 Aug 2006 22:22:45 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.2.0
-Release: 1.1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -33,12 +33,16 @@
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
+Patch0: fdo-7535.patch
+
 %description devel
 X.Org X11 libXfont development package
 
 %prep
 %setup -q
 
+%patch0 -p1 -b .fdo-7535
+
 # Disable static library creation by default.
 %define with_static 0
 
@@ -98,6 +102,10 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Mon Aug 14 2006 Soren Sandmann <sandmann at redhat.com> - 1.2.0-2.fc6
+- fdo-7535.patch
+  Fix for FDO bug 7535, CVE-2006-3467, RH bug 202472
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Aug 14 22:23:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 18:23:46 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic, 1.40,
	1.41 config-powerpc64, 1.16, 1.17 config-powerpc64-iseries,
	1.13, 1.14 config-x86-generic, 1.65,
	1.66 config-x86_64-generic, 1.52, 1.53
Message-ID: <200608142223.k7EMNkgF023078@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-ia64-generic config-powerpc64 config-powerpc64-iseries 
	config-x86-generic config-x86_64-generic 
Log Message:
remove dead config option


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- config-ia64-generic	4 Aug 2006 04:54:58 -0000	1.40
+++ config-ia64-generic	14 Aug 2006 22:23:43 -0000	1.41
@@ -133,7 +133,6 @@
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
-# CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
 CONFIG_HOTPLUG_PCI_SGI=m
 
 CONFIG_ACPI_VIDEO=m


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config-powerpc64	1 Aug 2006 17:20:04 -0000	1.16
+++ config-powerpc64	14 Aug 2006 22:23:43 -0000	1.17
@@ -29,7 +29,6 @@
 CONFIG_PMAC_SMU=y
 CONFIG_CPU_FREQ_PMAC64=y
 CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
-# CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y


Index: config-powerpc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-powerpc64-iseries	19 Jul 2006 19:25:13 -0000	1.13
+++ config-powerpc64-iseries	14 Aug 2006 22:23:43 -0000	1.14
@@ -53,7 +53,6 @@
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
-# CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
 CONFIG_SCSI_IBMVSCSI=m
 CONFIG_SERIAL_ICOM=m
 # CONFIG_ISDN is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- config-x86-generic	9 Aug 2006 21:45:01 -0000	1.65
+++ config-x86-generic	14 Aug 2006 22:23:43 -0000	1.66
@@ -228,7 +228,6 @@
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
-# CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
 CONFIG_PM=y
 
 CONFIG_IEEE80211=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- config-x86_64-generic	9 Aug 2006 21:45:01 -0000	1.52
+++ config-x86_64-generic	14 Aug 2006 22:23:43 -0000	1.53
@@ -94,7 +94,6 @@
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
 CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
-# CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
 CONFIG_HPET=y
 # CONFIG_HPET_MMAP is not set
 # CONFIG_HPET_RTC_IRQ is not set



From fedora-cvs-commits at redhat.com  Mon Aug 14 22:33:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 18:33:22 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.123, 1.124 mkinitrd.spec, 1.151,
	1.152 sources, 1.150, 1.151
Message-ID: <200608142233.k7EMXMeN025846@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25755

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.1.5-1 



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- .cvsignore	14 Aug 2006 17:44:24 -0000	1.123
+++ .cvsignore	14 Aug 2006 22:33:17 -0000	1.124
@@ -1,2 +1,2 @@
 bdevid-0.4.tar.bz2
-mkinitrd-5.1.4.tar.bz2
+mkinitrd-5.1.5.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- mkinitrd.spec	14 Aug 2006 18:04:23 -0000	1.151
+++ mkinitrd.spec	14 Aug 2006 22:33:17 -0000	1.152
@@ -3,7 +3,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.1.4
+Version: 5.1.5
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -27,6 +27,7 @@
 Requires: ppc64-utils >= 0.3-1
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
+Provides: libbdevid = %{version}-%{release}
 
 %description
 Mkinitrd creates filesystem images for use as initial ramdisk (initrd)
@@ -116,6 +117,9 @@
 /%{python_sitelib}/bdevid.so
 
 %changelog
+* Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 5.1.5-1
+- Provide libbdevid.
+
 * Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 5.1.4-1
 - Fix requires for libbdevid
 - Make it safe to call nashLogger and nashLoggerV with no context.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- sources	14 Aug 2006 17:58:05 -0000	1.150
+++ sources	14 Aug 2006 22:33:17 -0000	1.151
@@ -1,2 +1,2 @@
 d963851dff275f0af392cb25d3ad45fd  bdevid-0.4.tar.bz2
-c11a1bd66e5d59ebc865092f127eae30  mkinitrd-5.1.4.tar.bz2
+a2cf338513ca92b7b8241cc6fe136a61  mkinitrd-5.1.5.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 14 22:35:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 18:35:01 -0400
Subject: rpms/libXfont/FC-5 fdo-7535.patch,NONE,1.1 libXfont.spec,1.13,1.14
Message-ID: <200608142235.k7EMZ1wP026240@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	libXfont.spec 
Added Files:
	fdo-7535.patch 
Log Message:
* Mon Aug 14 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-3
- fdo-7535.patch
  Fix for FDO bug 7535, CVE-2006-3467, RH bug 202475



fdo-7535.patch:
 pcfread.c |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletion(-)

--- NEW FILE fdo-7535.patch ---
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index dd76868..6210f18 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -45,6 +45,7 @@ #define   MAX(a,b)    (((a)>(b)) ? a : b
 #endif
 
 #include <stdarg.h>
+#include <stdint.h>
 
 void
 pcfError(const char* message, ...)
@@ -133,6 +134,10 @@ pcfReadTOC(FontFilePtr file, int *countp
 	return (PCFTablePtr) NULL;
     count = pcfGetLSB32(file);
     if (IS_EOF(file)) return (PCFTablePtr) NULL;
+    if (count < 0 || count > INT32_MAX / sizeof(PCFTableRec)) {
+	pcfError("pcfReadTOC(): invalid file format\n");
+	return NULL;
+    }
     tables = (PCFTablePtr) xalloc(count * sizeof(PCFTableRec));
     if (!tables) {
       pcfError("pcfReadTOC(): Couldn't allocate tables (%d*%d)\n", count, sizeof(PCFTableRec));
@@ -252,6 +257,10 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
     if (!PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT))
 	goto Bail;
     nprops = pcfGetINT32(file, format);
+    if (nprops <= 0 || nprops > INT32_MAX / sizeof(FontPropRec)) {
+	pcfError("pcfGetProperties(): invalid nprops value (%d)\n", nprops);
+	goto Bail;
+    }
     if (IS_EOF(file)) goto Bail;
     props = (FontPropPtr) xalloc(nprops * sizeof(FontPropRec));
     if (!props) {
@@ -267,6 +276,13 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
 	props[i].name = pcfGetINT32(file, format);
 	isStringProp[i] = pcfGetINT8(file, format);
 	props[i].value = pcfGetINT32(file, format);
+	if (props[i].name < 0 
+	    || (isStringProp[i] != 0 && isStringProp[i] != 1)
+	    || (isStringProp[i] && props[i].value < 0)) {
+	    pcfError("pcfGetProperties(): invalid file format %d %d %d\n",
+		     props[i].name, isStringProp[i], props[i].value);
+	    goto Bail;
+	}
 	if (IS_EOF(file)) goto Bail;
     }
     /* pad the property array */
@@ -282,6 +298,7 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
     }
     if (IS_EOF(file)) goto Bail;
     string_size = pcfGetINT32(file, format);
+    if (string_size < 0) goto Bail;
     if (IS_EOF(file)) goto Bail;
     strings = (char *) xalloc(string_size);
     if (!strings) {
@@ -422,6 +439,10 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
     else
 	nmetrics = pcfGetINT16(file, format);
     if (IS_EOF(file)) goto Bail;
+    if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
+	pcfError("pcfReadFont(): invalid file format\n");
+	goto Bail;
+    }
     metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
     if (!metrics) {
       pcfError("pcfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
@@ -447,7 +468,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
     nbitmaps = pcfGetINT32(file, format);
     if (nbitmaps != nmetrics || IS_EOF(file))
 	goto Bail;
-
+    /* nmetrics is alreadt ok, so nbitmap also is */
     offsets = (CARD32 *) xalloc(nbitmaps * sizeof(CARD32));
     if (!offsets) {
       pcfError("pcfReadFont(): Couldn't allocate offsets (%d*%d)\n", nbitmaps, sizeof(CARD32));
@@ -461,6 +482,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
     for (i = 0; i < GLYPHPADOPTIONS; i++) {
 	bitmapSizes[i] = pcfGetINT32(file, format);
 	if (IS_EOF(file)) goto Bail;
+	if (bitmapSizes[i] < 0) goto Bail;
     }
     
     sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX(format)];
@@ -536,6 +558,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
 	if (IS_EOF(file)) goto Bail;
 	if (nink_metrics != nmetrics)
 	    goto Bail;
+	/* nmetrics already checked */
 	ink_metrics = (xCharInfo *) xalloc(nink_metrics * sizeof(xCharInfo));
       if (!ink_metrics) {
           pcfError("pcfReadFont(): Couldn't allocate ink_metrics (%d*%d)\n", nink_metrics, sizeof(xCharInfo));       
@@ -809,6 +832,10 @@ pmfReadFont(FontPtr pFont, FontFilePtr f
     else
 	nmetrics = pcfGetINT16(file, format);
     if (IS_EOF(file)) goto Bail;
+    if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
+	pcfError("pmfReadFont(): invalid file format\n");
+	goto Bail;
+    }
     metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
     if (!metrics) {
       pcfError("pmfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/FC-5/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	14 Aug 2006 22:34:59 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.0.0
-Release: 2.2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -30,12 +30,16 @@
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
+Patch0: fdo-7535.patch
+
 %description devel
 X.Org X11 libXfont development package
 
 %prep
 %setup -q
 
+%patch -p1 -b .fdo-7535
+
 # Disable static library creation by default.
 %define with_static 0
 
@@ -94,6 +98,10 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Mon Aug 14 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-3
+- fdo-7535.patch
+  Fix for FDO bug 7535, CVE-2006-3467, RH bug 202475
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 00:49:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 20:49:08 -0400
Subject: rpms/evolution/devel evolution-2.7.91-mail-account-disable.patch,
	NONE, 1.1 evolution.spec, 1.179, 1.180
Message-ID: <200608150049.k7F0n8Xv008279@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.91-mail-account-disable.patch 
Log Message:

* Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-4
- Add patch for RH bug #201831.


evolution-2.7.91-mail-account-disable.patch:
 mail-account-disable.c |   38 +++++++++++++++++---------------------
 1 files changed, 17 insertions(+), 21 deletions(-)

--- NEW FILE evolution-2.7.91-mail-account-disable.patch ---
--- evolution-2.7.91/plugins/mail-account-disable/mail-account-disable.c.fix-account-disable	2006-08-14 14:43:55.000000000 -0400
+++ evolution-2.7.91/plugins/mail-account-disable/mail-account-disable.c	2006-08-14 15:09:20.000000000 -0400
@@ -56,28 +56,24 @@
 void
 mail_account_disable (EPopup *ep, EPopupItem *p, void *data)
 {
-	char *uri = data;
-	EAccount *account;
+	MailComponent *component;
+	EAccount *account = data;
 
-	account = mail_config_get_account_by_source_url (uri);
+	g_assert (account != NULL);
 
-	if (account) {
-		MailComponent *component = mail_component_peek ();
-		
-		if (mail_config_has_proxies(account))
-			mail_config_remove_account_proxies (account);
-		
-		account->enabled = !account->enabled;
-		e_account_list_change(mail_config_get_accounts(), account);
-		mail_component_remove_store_by_uri (component, account->source->url);		
+	component = mail_component_peek ();
 
-		if (account->parent_uid)
-			mail_config_remove_account (account);
+	if (mail_config_has_proxies (account))
+		mail_config_remove_account_proxies (account);
+		
+	account->enabled = !account->enabled;
+	e_account_list_change (mail_config_get_accounts (), account);
+	mail_component_remove_store_by_uri (component, account->source->url);
 
-		mail_config_save_accounts();	
-	}	
+	if (account->parent_uid)
+		mail_config_remove_account (account);
 
-	return ;
+	mail_config_save_accounts();
 }
 
 void
@@ -88,6 +84,9 @@
 
 	account = mail_config_get_account_by_source_url (t->uri);
 
+	if (account == NULL)
+		return;
+
 	if (g_strrstr (t->uri,"groupwise://") && account->parent_uid) {
 		popup_items[PROXY_LOGOUT].label =  _(popup_items [PROXY_LOGOUT].label);
 		menus = g_slist_prepend (menus, &popup_items [PROXY_LOGOUT]);
@@ -97,8 +96,5 @@
 		menus = g_slist_prepend (menus, &popup_items [ACCOUNT_DISABLE]);
 	}
 
-	e_popup_add_items (t->target.popup, menus, NULL, popup_free, t->uri);	
-
-	return;
+	e_popup_add_items (t->target.popup, menus, NULL, popup_free, account);	
 }
-


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- evolution.spec	14 Aug 2006 18:59:55 -0000	1.179
+++ evolution.spec	15 Aug 2006 00:49:04 -0000	1.180
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.91
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -116,11 +116,15 @@
 # RH bug #197868 / Gnome.org bug #350823
 Patch30: evolution-2.7.91-default-mailer.patch
 
+# Gnome.org bug #351332
 Patch31: evolution-2.7.91-fix-missing-declarations.patch
 
-# RH bug #202383
+# RH bug #202383 / Gnome.org bug #351263
 Patch32: evolution-2.7.91-fix-duplicate-alarm.patch
 
+# RH bug #201831 / Gnome.org bug #350901
+Patch33: evolution-2.7.91-mail-account-disable.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -256,6 +260,7 @@
 %patch30 -p1 -b .default-mailer
 %patch31 -p1 -b .fix-missing-declarations
 %patch32 -p1 -b .fix-duplicate-alarm
+%patch33 -p1 -b .mail-account-disable
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -646,6 +651,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-4
+- Add patch for RH bug #201831.
+
 * Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-3
 - Consolidate "missing declarations" patches.
 - Add patch for RH bug #202383.



From fedora-cvs-commits at redhat.com  Tue Aug 15 01:14:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 21:14:19 -0400
Subject: rpms/totem/devel totem-1.5.91-totem.patch, NONE, 1.1 totem.spec,
	1.72, 1.73
Message-ID: <200608150114.k7F1EJlN022730@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22673

Modified Files:
	totem.spec 
Added Files:
	totem-1.5.91-totem.patch 
Log Message:
fix translations


totem-1.5.91-totem.patch:
 configure |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE totem-1.5.91-totem.patch ---
--- totem-1.5.91/configure.gettext	2006-08-14 21:15:57.000000000 -0400
+++ totem-1.5.91/configure	2006-08-14 21:16:14.000000000 -0400
@@ -2133,7 +2133,7 @@
 GETTEXT_PACKAGE=totem
 
 cat >>confdefs.h <<\_ACEOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+#define GETTEXT_PACKAGE "totem"
 _ACEOF
 
 


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- totem.spec	13 Aug 2006 23:51:54 -0000	1.72
+++ totem.spec	15 Aug 2006 01:14:17 -0000	1.73
@@ -5,13 +5,15 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 1.5.91
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 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
+# fixed in cv
+Patch2: totem-1.5.91-gettext.patch
 
 Requires(post): GConf2
 Requires(post): desktop-file-utils
@@ -74,6 +76,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .feature-help-removal
+%patch2 -p1 -b .gettext
 
 %build
 # try to work around a problem where gst-inspect does 
@@ -178,6 +181,9 @@
 %{_libdir}/*so
 
 %changelog
+8 Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.91-2.fc6
+- Make translations work again
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.91-1.fc6
 - Update to 1.5.91
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 01:15:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 21:15:01 -0400
Subject: rpms/totem/devel totem.spec,1.73,1.74
Message-ID: <200608150115.k7F1F1tw023022@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22940

Modified Files:
	totem.spec 
Log Message:
fix spec



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- totem.spec	15 Aug 2006 01:14:17 -0000	1.73
+++ totem.spec	15 Aug 2006 01:14:58 -0000	1.74
@@ -181,7 +181,7 @@
 %{_libdir}/*so
 
 %changelog
-8 Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.91-2.fc6
+* Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.91-2.fc6
 - Make translations work again
 
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.91-1.fc6



From fedora-cvs-commits at redhat.com  Tue Aug 15 01:18:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 21:18:18 -0400
Subject: rpms/totem/devel totem-1.5.91-gettext.patch, NONE,
	1.1 totem-1.5.91-totem.patch, 1.1, NONE
Message-ID: <200608150118.k7F1IIx2032094@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31722

Added Files:
	totem-1.5.91-gettext.patch 
Removed Files:
	totem-1.5.91-totem.patch 
Log Message:
fix patch name


totem-1.5.91-gettext.patch:
 configure |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE totem-1.5.91-gettext.patch ---
--- totem-1.5.91/configure.gettext	2006-08-14 21:15:57.000000000 -0400
+++ totem-1.5.91/configure	2006-08-14 21:16:14.000000000 -0400
@@ -2133,7 +2133,7 @@
 GETTEXT_PACKAGE=totem
 
 cat >>confdefs.h <<\_ACEOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+#define GETTEXT_PACKAGE "totem"
 _ACEOF
 
 


--- totem-1.5.91-totem.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 15 01:31:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 21:31:14 -0400
Subject: rpms/gedit/devel .cvsignore, 1.46, 1.47 gedit.spec, 1.95,
	1.96 sources, 1.48, 1.49
Message-ID: <200608150131.k7F1VEND010716@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10613

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.15.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	12 Aug 2006 04:48:22 -0000	1.46
+++ .cvsignore	15 Aug 2006 01:31:08 -0000	1.47
@@ -1 +1 @@
-gedit-2.15.6.tar.bz2
+gedit-2.15.7.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gedit.spec	12 Aug 2006 04:52:58 -0000	1.95
+++ gedit.spec	15 Aug 2006 01:31:08 -0000	1.96
@@ -16,8 +16,8 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.15.6
-Release: 	2%{?dist}
+Version: 	2.15.7
+Release: 	1%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -48,9 +48,6 @@
 # gtk_widget_show()
 Patch3: gedit-2.15.1-bgo-341055-workaround.patch
 
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=202099
-Patch4: gedit-2.15.5-copy-xattrs.patch
-
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -111,7 +108,6 @@
 
 %patch2 -p1 -b .python
 %patch3 -p1 -b .bgo-341055-workaround
-%patch4 -p1 -b .copy-xattrs
 
 %build
 autoreconf
@@ -189,6 +185,9 @@
 %{_datadir}/gtk-doc/html/gedit/
 
 %changelog
+* Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.7-1.fc6
+- Update to 2.15.7
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.6-2.fc6
 - Bump gtksourceview requirement
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	12 Aug 2006 04:48:22 -0000	1.48
+++ sources	15 Aug 2006 01:31:08 -0000	1.49
@@ -1 +1 @@
-0b815c5ade3afcaf28b5c268f91a34f2  gedit-2.15.6.tar.bz2
+f18729d9a0cf2c02e59435e094f27d13  gedit-2.15.7.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 02:17:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 22:17:58 -0400
Subject: rpms/tomboy/devel tomboy-0.3.9-about.patch, NONE, 1.1 tomboy.spec,
	1.22, 1.23
Message-ID: <200608150217.k7F2Hwii020987@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	tomboy.spec 
Added Files:
	tomboy-0.3.9-about.patch 
Log Message:
fix about dialog close


tomboy-0.3.9-about.patch:
 Tray.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE tomboy-0.3.9-about.patch ---
--- tomboy-0.3.9/Tomboy/Tray.cs.about	2006-08-14 22:17:42.000000000 -0400
+++ tomboy-0.3.9/Tomboy/Tray.cs	2006-08-14 22:19:21.000000000 -0400
@@ -334,7 +334,8 @@
 			about.Documenters = documenters;
 			about.TranslatorCredits = translators;
 			about.IconName = "tomboy";
-			about.Show ();
+			about.Run ();
+ 			about.Destroy ();
 		}
 
 		// Support dropping text/uri-lists and _NETSCAPE_URLs currently.


Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tomboy.spec	13 Aug 2006 16:16:22 -0000	1.22
+++ tomboy.spec	15 Aug 2006 02:17:54 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.3.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
 Group:          User Interface/Desktops
@@ -8,6 +8,8 @@
 URL:            http://www.beatniksoftware.com/tomboy/
 Source0:        %{name}-%{version}.tar.bz2
 Patch1:         tomboy-0.3.5-wrapper.patch
+# fixed in cvs
+Patch2:		tomboy-0.3.9-about.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +43,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .wrapper
+%patch2 -p1 -b .about
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -99,6 +102,9 @@
 
 
 %changelog
+* Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 0.3.9-2.fc6
+- Make the about dialog close (#202355)
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.3.9-1.fc6
 - Update to 0.3.9
 - Fix %%preun script



From fedora-cvs-commits at redhat.com  Tue Aug 15 03:08:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 23:08:19 -0400
Subject: rpms/poppler/devel poppler-0.5.3-libs.patch, NONE, 1.1 poppler.spec,
	1.28, 1.29
Message-ID: <200608150308.k7F38JU1017294@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/poppler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17244

Modified Files:
	poppler.spec 
Added Files:
	poppler-0.5.3-libs.patch 
Log Message:
link against more libs


poppler-0.5.3-libs.patch:
 Makefile.am |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE poppler-0.5.3-libs.patch ---
--- poppler-0.5.3/poppler/Makefile.am.libs	2006-08-14 23:01:18.000000000 -0400
+++ poppler-0.5.3/poppler/Makefile.am	2006-08-14 23:03:26.000000000 -0400
@@ -39,6 +39,9 @@
 cairo_includes =				\
 	$(CAIRO_CFLAGS)
 
+cairo_libs =					\
+	$(CAIRO_LIBS)
+	
 libpoppler_cairo_la_SOURCES =			\
 	CairoFontEngine.cc			\
 	CairoFontEngine.h			\
@@ -86,6 +89,7 @@
 	$(top_builddir)/goo/libgoo.la		\
 	$(top_builddir)/fofi/libfofi.la		\
 	$(splash_libs)				\
+	$(cairo_libs)				\
 	$(libjpeg_libs)				\
 	$(zlib_libs)				\
 	$(FREETYPE_LIBS)


Index: poppler.spec
===================================================================
RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- poppler.spec	12 Jul 2006 07:51:18 -0000	1.28
+++ poppler.spec	15 Aug 2006 03:08:16 -0000	1.29
@@ -1,10 +1,11 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.5.3
-Release: 1.1
+Release: 2%{?dist}
 License: GPL
 Group: Development/Libraries
 Source0: %{name}-%{version}.tar.gz
+Patch0: poppler-0.5.3-libs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel
 BuildRequires: cairo-devel
@@ -41,6 +42,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .libs
 
 %build
 %configure --enable-cairo-output --disable-splash-output
@@ -72,6 +74,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.3-2.fc6
+- link against fontconfig (see bug 202256)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 03:12:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 23:12:25 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.124, 1.125 mkinitrd.spec, 1.152,
	1.153 sources, 1.151, 1.152
Message-ID: <200608150312.k7F3CPum018372@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18321

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- .cvsignore	14 Aug 2006 22:33:17 -0000	1.124
+++ .cvsignore	15 Aug 2006 03:12:22 -0000	1.125
@@ -1,2 +1 @@
-bdevid-0.4.tar.bz2
-mkinitrd-5.1.5.tar.bz2
+mkinitrd-5.1.6.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- mkinitrd.spec	14 Aug 2006 22:33:17 -0000	1.152
+++ mkinitrd.spec	15 Aug 2006 03:12:22 -0000	1.153
@@ -3,7 +3,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.1.5
+Version: 5.1.6
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -117,6 +117,9 @@
 /%{python_sitelib}/bdevid.so
 
 %changelog
+* Mon Aug 14 2006 Bill Nottingham <notting at redhat.com> - 5.1.6-1
+- don't make every loop device /dev/loop0. Eep.
+
 * Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 5.1.5-1
 - Provide libbdevid.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- sources	14 Aug 2006 22:33:17 -0000	1.151
+++ sources	15 Aug 2006 03:12:22 -0000	1.152
@@ -1,2 +1,2 @@
 d963851dff275f0af392cb25d3ad45fd  bdevid-0.4.tar.bz2
-a2cf338513ca92b7b8241cc6fe136a61  mkinitrd-5.1.5.tar.bz2
+dc69d9c492ce98d3630bc8ceeb13bb10  mkinitrd-5.1.6.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 03:30:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 23:30:48 -0400
Subject: rpms/kernel/devel/configs config-generic,1.241,1.242
Message-ID: <200608150330.k7F3UmV4007448@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
disable debug for test


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- config-generic	9 Aug 2006 21:52:38 -0000	1.241
+++ config-generic	15 Aug 2006 03:30:36 -0000	1.242
@@ -2521,12 +2521,12 @@
 # CONFIG_RCU_TORTURE_TEST is not set
 
 # Turn off these debug options for production kernels.
-CONFIG_DEBUG_SLAB=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_RT_MUTEXES=y
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
-CONFIG_DEBUG_RWSEMS=y
-CONFIG_DEBUG_LOCK_ALLOC=y
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
 CONFIG_PROVE_LOCKING=y
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set



From fedora-cvs-commits at redhat.com  Tue Aug 15 03:30:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 23:30:39 -0400
Subject: rpms/kernel/devel Makefile,1.28,1.29
Message-ID: <200608150330.k7F3UdvA007442@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	Makefile 
Log Message:
disable debug for test


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile	15 Jul 2006 08:12:30 -0000	1.28
+++ Makefile	15 Aug 2006 03:30:36 -0000	1.29
@@ -21,20 +21,20 @@
 
 debug:
 	@perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' configs/config-generic
-	@perl -pi -e 's/# CONFIG_DEBUG_MUTEXES is not set/CONFIG_DEBUG_MUTEXES=y/' configs/config-x86-generic
-	@perl -pi -e 's/# CONFIG_DEBUG_RT_MUTEXES is not set/CONFIG_DEBUG_RT_MUTEXES=y/' configs/config-x86-generic
-	@perl -pi -e 's/# CONFIG_DEBUG_RWSEMS is not set/CONFIG_DEBUG_RWSEMS=y/' configs/config-x86-generic
-	@perl -pi -e 's/# CONFIG_DEBUG_LOCK_ALLOC is not set/CONFIG_DEBUG_LOCK_ALLOC=y/' configs/config-x86-generic
-	@perl -pi -e 's/# CONFIG_DEBUG_PROVE_LOCKING is not set/CONFIG_DEBUG_PROVE_LOCKING=y/' configs/config-x86-generic
+	@perl -pi -e 's/# CONFIG_DEBUG_MUTEXES is not set/CONFIG_DEBUG_MUTEXES=y/' configs/config-generic
+	@perl -pi -e 's/# CONFIG_DEBUG_RT_MUTEXES is not set/CONFIG_DEBUG_RT_MUTEXES=y/' configs/config-generic
+	@perl -pi -e 's/# CONFIG_DEBUG_RWSEMS is not set/CONFIG_DEBUG_RWSEMS=y/' configs/config-generic
+	@perl -pi -e 's/# CONFIG_DEBUG_LOCK_ALLOC is not set/CONFIG_DEBUG_LOCK_ALLOC=y/' configs/config-generic
+	@perl -pi -e 's/# CONFIG_DEBUG_PROVE_LOCKING is not set/CONFIG_DEBUG_PROVE_LOCKING=y/' configs/config-generic
 
 release:
 	@perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' configs/config-generic
-	@perl -pi -e 's/CONFIG_DEBUG_MUTEXES=y/# CONFIG_DEBUG_MUTEXES is not set/' configs/config-x86-generic
-	@perl -pi -e 's/CONFIG_DEBUG_RT_MUTEXES=y/# CONFIG_DEBUG_RT_MUTEXES is not set/' configs/config-x86-generic
-	@perl -pi -e 's/CONFIG_DEBUG_RWSEMS=y/# CONFIG_DEBUG_RWSEMS is not set/' configs/config-x86-generic
-	@perl -pi -e 's/CONFIG_DEBUG_LOCK_ALLOC=y/# CONFIG_DEBUG_LOCK_ALLOC is not set/' configs/config-x86-generic
-	@perl -pi -e 's/CONFIG_DEBUG_PROVE_LOCKING=y/# CONFIG_DEBUG_PROVE_LOCKING is not set/' configs/config-x86-generic
-	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' configs/config-x86-generic
+	@perl -pi -e 's/CONFIG_DEBUG_MUTEXES=y/# CONFIG_DEBUG_MUTEXES is not set/' configs/config-generic
+	@perl -pi -e 's/CONFIG_DEBUG_RT_MUTEXES=y/# CONFIG_DEBUG_RT_MUTEXES is not set/' configs/config-generic
+	@perl -pi -e 's/CONFIG_DEBUG_RWSEMS=y/# CONFIG_DEBUG_RWSEMS is not set/' configs/config-generic
+	@perl -pi -e 's/CONFIG_DEBUG_LOCK_ALLOC=y/# CONFIG_DEBUG_LOCK_ALLOC is not set/' configs/config-generic
+	@perl -pi -e 's/CONFIG_DEBUG_PROVE_LOCKING=y/# CONFIG_DEBUG_PROVE_LOCKING is not set/' configs/config-generic
+	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' configs/config-generic
 
 reconfig:
 	@rm -f kernel-*-config



From fedora-cvs-commits at redhat.com  Tue Aug 15 03:35:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 23:35:07 -0400
Subject: rpms/devhelp/devel devhelp-0.12-transparent.patch, NONE,
	1.1 devhelp.spec, 1.47, 1.48
Message-ID: <200608150335.k7F3Z786008050@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8022

Modified Files:
	devhelp.spec 
Added Files:
	devhelp-0.12-transparent.patch 
Log Message:
fix transparent headers


devhelp-0.12-transparent.patch:
 default-prefs-gecko-1-8.js |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE devhelp-0.12-transparent.patch ---
--- devhelp-0.12/src/default-prefs-gecko-1-8.js.transparent	2006-08-14 23:32:41.000000000 -0400
+++ devhelp-0.12/src/default-prefs-gecko-1-8.js	2006-08-14 23:32:58.000000000 -0400
@@ -1,4 +1,4 @@
 // use system colours
 pref("browser.display.use_system_colors", true);
-pref("browser.display.use_document_colors", false);
+//pref("browser.display.use_document_colors", false);
 


Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- devhelp.spec	14 Aug 2006 14:55:10 -0000	1.47
+++ devhelp.spec	15 Aug 2006 03:35:04 -0000	1.48
@@ -1,11 +1,13 @@
 Summary:             API document browser
 Name:                devhelp
 Version:             0.12
-Release:             3
+Release:             4%{?dist}
 License:             GPL
 Group:               Development/Tools
 Url:                 http://ftp.gnome.org/pub/gnome/sources/devhelp/
 Source:              %{name}-%{version}.tar.bz2
+# fixed in cvs
+Patch0:		     devhelp-0.12-transparent.patch
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root
 
 Requires:            gtk2 >= 2.2.0
@@ -44,6 +46,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .transparent
 
 %build
 %configure
@@ -110,6 +113,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 0.12-4.fc6
+- Fix transparent headers
+
 * Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 0.12-3
 - Add missing Requires to devel package.
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 03:45:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 23:45:15 -0400
Subject: rpms/gaim/devel gaim-2.0.0-beta3-threadsafe-dbus.patch, NONE,
	1.1 gaim.spec, 1.134, 1.135
Message-ID: <200608150345.k7F3jFJI019476@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19461

Modified Files:
	gaim.spec 
Added Files:
	gaim-2.0.0-beta3-threadsafe-dbus.patch 
Log Message:
GNOME-VFS dbus crash (#201791)


gaim-2.0.0-beta3-threadsafe-dbus.patch:
 configure.ac      |    2 +-
 src/Makefile.am   |    1 +
 src/dbus-server.c |    2 ++
 src/gtkmain.c     |    9 +++++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE gaim-2.0.0-beta3-threadsafe-dbus.patch ---
diff -urN gaim-2.0.0beta3.orig/configure.ac gaim-2.0.0beta3/configure.ac
--- gaim-2.0.0beta3.orig/configure.ac	2006-03-26 02:45:35.000000000 -0500
+++ gaim-2.0.0beta3/configure.ac	2006-08-14 23:16:22.000000000 -0400
@@ -587,7 +587,7 @@
 AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR([
 *** GLib 2.0 is required to build Gaim; please make sure you have the GLib
 *** development headers installed. The latest version of GLib is
-*** always available at http://www.gtk.org/.]))
+*** always available at http://www.gtk.org/.]),gthread)
 AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR([
 *** GTK+ 2.0 is required to build Gaim; please make sure you have the GTK+
 *** development headers installed. The latest version of GTK+ is
diff -urN gaim-2.0.0beta3.orig/src/dbus-server.c gaim-2.0.0beta3/src/dbus-server.c
--- gaim-2.0.0beta3.orig/src/dbus-server.c	2006-02-11 00:25:47.000000000 -0500
+++ gaim-2.0.0beta3/src/dbus-server.c	2006-08-14 21:57:09.000000000 -0400
@@ -710,6 +710,8 @@
 
 gboolean gaim_dbus_init(void) 
 {
+    if (g_thread_supported())
+        dbus_g_thread_init();
     gaim_dbus_init_ids();
     return gaim_dbus_dispatch_init() ;
 }
diff -urN gaim-2.0.0beta3.orig/src/gtkmain.c gaim-2.0.0beta3/src/gtkmain.c
--- gaim-2.0.0beta3.orig/src/gtkmain.c	2006-03-06 23:45:22.000000000 -0500
+++ gaim-2.0.0beta3/src/gtkmain.c	2006-08-14 23:07:45.000000000 -0400
@@ -643,6 +643,15 @@
 	gtk_rc_add_default_file(search_path);
 	g_free(search_path);
 
+#if (defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE))
+       /* Since threads can be yanked in all unawares by other libraries,
+        * and some libraries aren't smart enough to initialize the thread
+        * subsystem when they need it, we need to do this here.  We also
+        * threadify dbus when that gets initialized.  Ugh. */
+       if (!g_thread_supported())
+               g_thread_init(NULL);
+       gdk_threads_init();
+#endif /* Glib has threads */
 
 	gui_check = gtk_init_check(&argc, &argv);
 	if (!gui_check) {
diff -urN gaim-2.0.0beta3.orig/src/Makefile.am gaim-2.0.0beta3/src/Makefile.am
--- gaim-2.0.0beta3.orig/src/Makefile.am	2006-03-25 10:45:49.000000000 -0500
+++ gaim-2.0.0beta3/src/Makefile.am	2006-08-14 22:05:14.000000000 -0400
@@ -334,6 +334,7 @@
 gaim_LDFLAGS = -export-dynamic
 gaim_LDADD = \
 	@LIBOBJS@ \
+	$(GLIB_LIBS) \
 	$(GTK_LIBS) \
 	$(DBUS_LIBS) \
 	$(SOUND_LIBS) \


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- gaim.spec	5 Aug 2006 17:49:27 -0000	1.134
+++ gaim.spec	15 Aug 2006 03:45:13 -0000	1.135
@@ -29,7 +29,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.11.%{betaver}%{?dist}
+Release:	0.12.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -57,6 +57,7 @@
 ## Patches 100+: To be Included in Future Upstream
 Patch181: gaim-2.0.0-beta3-silc-realname.patch
 Patch182: gaim-2.0.0-beta3-utf8-name-crash.patch
+Patch183: gaim-2.0.0-beta3-threadsafe-dbus.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -160,6 +161,7 @@
 ## Patches 100+: To be Included in Future Upstream
 %patch181 -p2
 %patch182 -p0
+%patch183 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -297,6 +299,9 @@
 %{_libdir}/pkgconfig/gaim.pc
 
 %changelog
+* Mon Aug 14 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.12.beta3
+- GNOME-VFS dbus crash (#201791)
+
 * Mon Jul 31 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.11.beta3
 - rebuild for new libebook
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 03:59:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 14 Aug 2006 23:59:19 -0400
Subject: rpms/im-chooser/devel .cvsignore, 1.4, 1.5 im-chooser.spec, 1.6,
	1.7 sources, 1.3, 1.4 im-chooser-suffix-r40.patch, 1.1, NONE
Message-ID: <200608150359.k7F3xJpA002416@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/im-chooser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2402

Modified Files:
	.cvsignore im-chooser.spec sources 
Removed Files:
	im-chooser-suffix-r40.patch 
Log Message:
* Tue Aug 15 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.1-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Jul 2006 13:20:14 -0000	1.4
+++ .cvsignore	15 Aug 2006 03:59:17 -0000	1.5
@@ -3,3 +3,4 @@
 *.rpm
 im-chooser-0.2.2.tar.gz
 im-chooser-0.3.0.tar.gz
+im-chooser-0.3.1.tar.gz


Index: im-chooser.spec
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- im-chooser.spec	24 Jul 2006 13:54:42 -0000	1.6
+++ im-chooser.spec	15 Aug 2006 03:59:17 -0000	1.7
@@ -1,13 +1,12 @@
 Name:		im-chooser
-Version:	0.3.0
-Release:	2%{?dist}
+Version:	0.3.1
+Release:	1%{?dist}
 License:	GPL
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gtk2-devel intltool gettext libgnomeui-devel automake autoconf
+BuildRequires:	gtk2-devel intltool gettext libgnomeui-devel
 
 Source0:	http://trac.tagoh.net/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:		im-chooser-suffix-r40.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -21,9 +20,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .0-suffix
-automake
-autoconf
 
 %build
 %configure --with-xinput-suffix=.conf
@@ -33,9 +29,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-# rename the xinput files with .conf suffix
-mv $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/none{,.conf}
-mv $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/xim{,.conf}
 
 %find_lang %{name}
 
@@ -58,6 +51,9 @@
 %{_datadir}/applications/im-chooser.desktop
 
 %changelog
+* Tue Aug 15 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.1-1
+- New upstream release.
+
 * Mon Jul 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.0-2
 - New upstream release.
 - add libgnomeui-devel to BR.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Jul 2006 07:45:40 -0000	1.3
+++ sources	15 Aug 2006 03:59:17 -0000	1.4
@@ -1 +1 @@
-8b70fdc7dee7899fc08edbd259e47772  im-chooser-0.3.0.tar.gz
+8770979e4c46b0d6f71aa8c74c362d8f  im-chooser-0.3.1.tar.gz


--- im-chooser-suffix-r40.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 15 05:21:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 01:21:01 -0400
Subject: rpms/gnome-power-manager/devel
	gnome-power-manager-2.15.91-double-free.patch, NONE,
	1.1 gnome-power-manager.spec, 1.58, 1.59
Message-ID: <200608150521.k7F5L1fK007570@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7512

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.15.91-double-free.patch 
Log Message:
fix a double free


gnome-power-manager-2.15.91-double-free.patch:
 gpm-manager.c |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

--- NEW FILE gnome-power-manager-2.15.91-double-free.patch ---
Index: src/gpm-manager.c
===================================================================
RCS file: /cvs/gnome/gnome-power-manager/src/gpm-manager.c,v
retrieving revision 1.170
diff -p -u -r1.170 gpm-manager.c
--- src/gpm-manager.c	7 Aug 2006 19:55:15 -0000	1.170
+++ src/gpm-manager.c	8 Aug 2006 14:35:35 -0000
@@ -2584,24 +2584,29 @@ screensaver_auth_request_cb (GpmScreensa
 			     gboolean        auth,
 			     GpmManager     *manager)
 {
-	GError *error;
+	GError  *error;
+	gboolean res;
+
+	/* Only act on the begin authentication request */
+	if (! auth) {
+		return;
+	}
 
 	/* TODO: This may be a bid of a bodge, as we will have multiple
 		 resume requests -- maybe this need a logic cleanup */
-	if (auth) {
-		if (gpm_brightness_has_hardware (manager->priv->brightness)) {
-			gpm_debug ("undimming lcd due to auth begin");
-			gpm_brightness_undim (manager->priv->brightness);
-		}
+	if (gpm_brightness_has_hardware (manager->priv->brightness)) {
+		gpm_debug ("undimming lcd due to auth begin");
+		gpm_brightness_undim (manager->priv->brightness);
+	}
 
-		/* We turn on the monitor unconditionally, as we may be using
-		 * a smartcard to authenticate and DPMS might still be on.
-		 * See #350291 for more details */
-		gpm_dpms_set_mode (manager->priv->dpms, GPM_DPMS_MODE_ON, &error);
-		if (error) {
-			gpm_warning ("Failed to turn on DPMS: %s", error->message);
-			g_error_free (error);
-		}
+	/* We turn on the monitor unconditionally, as we may be using
+	 * a smartcard to authenticate and DPMS might still be on.
+	 * See #350291 for more details */
+	error = NULL;
+	res = gpm_dpms_set_mode (manager->priv->dpms, GPM_DPMS_MODE_ON, &error);
+	if (! res) {
+		gpm_warning ("Failed to turn on DPMS: %s", error->message);
+		g_error_free (error);
 	}
 }
 


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnome-power-manager.spec	13 Aug 2006 22:11:14 -0000	1.58
+++ gnome-power-manager.spec	15 Aug 2006 05:20:58 -0000	1.59
@@ -10,6 +10,8 @@
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
 Patch0: gnome-power-manager-2.15.4-nodefaultbeep.patch
+# fixed in cvs
+Patch1: gnome-power-manager-2.15.91-double-free.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -42,6 +44,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nodefaultbeep
+%patch1 -p0 -b .double-free
 
 %build
 %configure \
@@ -109,6 +112,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Aug 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-2.fc6
+- Fix a double free in the smartcart code
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 05:21:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 01:21:47 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.59,1.60
Message-ID: <200608150521.k7F5LluA007851@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7789

Modified Files:
	gnome-power-manager.spec 
Log Message:
bump rev



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gnome-power-manager.spec	15 Aug 2006 05:20:58 -0000	1.59
+++ gnome-power-manager.spec	15 Aug 2006 05:21:44 -0000	1.60
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.15.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 05:53:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 01:53:33 -0400
Subject: rpms/elfutils/devel .cvsignore,1.29,1.30 sources,1.30,1.31
Message-ID: <200608150553.k7F5rXRX032584@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32553

Modified Files:
	.cvsignore sources 
Log Message:
New upstream tarball 0.123


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	12 Jul 2006 21:18:27 -0000	1.29
+++ .cvsignore	15 Aug 2006 05:53:31 -0000	1.30
@@ -1 +1 @@
-elfutils-0.122.tar.gz
+elfutils-0.123.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	12 Jul 2006 21:18:27 -0000	1.30
+++ sources	15 Aug 2006 05:53:31 -0000	1.31
@@ -1 +1 @@
-d83e9022eb342eede549dd6d6a537b59  elfutils-0.122.tar.gz
+dd2bf7bc0f63adc82def4ca0e6c2519e  elfutils-0.123.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 15 06:02:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 02:02:44 -0400
Subject: rpms/elfutils/devel elfutils-portability.patch, 1.23,
	1.24 elfutils.spec, 1.74, 1.75
Message-ID: <200608150602.k7F62i62002975@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2965

Modified Files:
	elfutils-portability.patch elfutils.spec 
Log Message:
New upstream version 0.123

elfutils-portability.patch:
 ChangeLog            |   15 ++++++++
 Makefile.in          |    2 +
 backends/ChangeLog   |    8 ++++
 backends/Makefile.am |    6 ++-
 backends/Makefile.in |    8 ++--
 config/Makefile.in   |    2 +
 configure            |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   28 +++++++++++++++
 lib/ChangeLog        |    5 ++
 lib/Makefile.am      |    3 +
 lib/Makefile.in      |    6 ++-
 libasm/ChangeLog     |    5 ++
 libasm/Makefile.am   |    3 +
 libasm/Makefile.in   |    6 ++-
 libcpu/ChangeLog     |    5 ++
 libcpu/Makefile.am   |    3 +
 libcpu/Makefile.in   |    4 +-
 libdw/ChangeLog      |    5 ++
 libdw/Makefile.am    |    3 +
 libdw/Makefile.in    |    7 ++-
 libdwfl/ChangeLog    |    5 ++
 libdwfl/Makefile.am  |    3 +
 libdwfl/Makefile.in  |    6 ++-
 libebl/ChangeLog     |    5 ++
 libebl/Makefile.am   |    3 +
 libebl/Makefile.in   |    6 ++-
 libelf/ChangeLog     |    5 ++
 libelf/Makefile.am   |    6 ++-
 libelf/Makefile.in   |    8 ++--
 libelf/common.h      |    4 +-
 m4/Makefile.in       |    2 +
 src/ChangeLog        |    9 +++++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strings.c        |    4 ++
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 40 files changed, 292 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils-portability.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- elfutils-portability.patch	12 Jul 2006 21:32:34 -0000	1.23
+++ elfutils-portability.patch	15 Aug 2006 06:02:29 -0000	1.24
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -67,6 +67,11 @@
+@@ -96,6 +96,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.
-@@ -89,6 +94,9 @@
+@@ -118,6 +123,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -40,7 +40,7 @@
  	     -std=gnu99
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
-@@ -63,7 +65,7 @@ textrel_check = if readelf -d $@ | fgrep
+@@ -62,7 +64,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,$^) \
@@ -51,7 +51,7 @@
  libebl_%.map: Makefile
 --- elfutils/backends/Makefile.in
 +++ elfutils/backends/Makefile.in
-@@ -158,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -159,6 +159,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -59,7 +59,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -196,6 +197,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -67,7 +67,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@
+@@ -238,9 +240,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -79,7 +79,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
-@@ -597,7 +599,7 @@ uninstall-am: uninstall-info-am
+@@ -600,7 +602,7 @@ uninstall-am: uninstall-info-am
  libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
  	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
  		-Wl,--version-script,$(word 2,$^) \
@@ -139,7 +139,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.122'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.123'
  PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
  
  ac_unique_file="libelf/libelf.h"
@@ -525,7 +525,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -337,6 +337,11 @@
+@@ -353,6 +353,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -647,7 +647,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -165,6 +165,11 @@
+@@ -170,6 +170,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.
  
@@ -779,7 +779,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -53,6 +53,10 @@
+@@ -74,6 +74,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -790,7 +790,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -401,6 +405,11 @@
+@@ -422,6 +426,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -936,7 +936,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -373,6 +373,11 @@
+@@ -385,6 +385,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- elfutils.spec	17 Jul 2006 08:46:38 -0000	1.74
+++ elfutils.spec	15 Aug 2006 06:02:29 -0000	1.75
@@ -1,5 +1,5 @@
-%define eu_version 0.122
-%define eu_release 4
+%define eu_version 0.123
+%define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -20,7 +20,6 @@
 Source: elfutils-%{version}.tar.gz
 Patch1: elfutils-portability.patch
 Patch2: elfutils-robustify.patch
-Patch3: elfutils-0.122-cast.patch
 Obsoletes: libelf libelf-devel
 Requires: elfutils-libelf = %{version}-%{release}
 Requires: elfutils-libs = %{version}-%{release}
@@ -111,8 +110,6 @@
 %prep
 %setup -q
 
-%patch3 -p0
-
 %if %{compat}
 %patch1 -p1
 sleep 1
@@ -217,6 +214,14 @@
 %{_libdir}/libelf.so
 
 %changelog
+* Mon Aug 14 2006 Roland McGrath <roland at redhat.com> 0.123-1
+- Update to 0.123
+  - libebl: Backend build fixes, thanks to Stepan Kasal.
+  - libebl: ia64 backend support for register names, return value location
+  - libdwfl: Handle truncated linux kernel module section names.
+  - libdwfl: Look for linux kernel vmlinux files with .debug suffix.
+  - elflint: Fix checks to permit --hash-style=gnu format.
+
 * Mon Jul 17 2006 Roland McGrath <roland at redhat.com> - 0.122-4
 - Fix warnings in elflint compilation.
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 06:07:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 02:07:47 -0400
Subject: rpms/glibc/devel .cvsignore, 1.164, 1.165 glibc-fedora.patch, 1.168,
	1.169 glibc.spec, 1.255, 1.256 sources, 1.188, 1.189
Message-ID: <200608150607.k7F67lW8004066@cvs.devel.redhat.com>

Author: jakub

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- .cvsignore	10 Aug 2006 07:07:13 -0000	1.164
+++ .cvsignore	15 Aug 2006 06:07:32 -0000	1.165
@@ -1,2 +1,2 @@
-glibc-20060810T0627.tar.bz2
-glibc-fedora-20060810T0627.tar.bz2
+glibc-20060815T0533.tar.bz2
+glibc-fedora-20060815T0533.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/ml_IN                                    |   38 -
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 58 files changed, 1413 insertions(+), 650 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- glibc-fedora.patch	10 Aug 2006 07:07:13 -0000	1.168
+++ glibc-fedora.patch	15 Aug 2006 06:07:32 -0000	1.169
@@ -1,5 +1,5 @@
---- glibc-20060810T0627/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060810T0627-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060815T0533/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060815T0533-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060810T0627/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060810T0627-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060815T0533/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060815T0533-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060810T0627/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060810T0627-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060815T0533/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060815T0533-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060810T0627/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060810T0627-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060815T0533/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060815T0533-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060810T0627/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060810T0627-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060815T0533/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060815T0533-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060810T0627/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060810T0627-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060815T0533/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060815T0533-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060810T0627/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060810T0627-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060815T0533/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060815T0533-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060810T0627/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060810T0627-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060815T0533/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060815T0533-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060810T0627/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060810T0627-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060815T0533/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060815T0533-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060810T0627/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060810T0627-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060815T0533/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060815T0533-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060810T0627/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060810T0627-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060815T0533/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T0533-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-20060810T0627/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060810T0627-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060815T0533/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T0533-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-20060810T0627/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060810T0627-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060815T0533/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060815T0533-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060810T0627/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060810T0627-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060815T0533/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060815T0533-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060810T0627/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060810T0627-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060815T0533/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060815T0533-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060810T0627/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060810T0627-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060815T0533/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060815T0533-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060810T0627/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060810T0627-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060815T0533/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060815T0533-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060810T0627/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060810T0627-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060815T0533/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060815T0533-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060810T0627/localedata/SUPPORTED	3 Aug 2006 08:16:23 -0000	1.95
-+++ glibc-20060810T0627-fedora/localedata/SUPPORTED	7 Aug 2006 19:28:25 -0000	1.71.2.12
+--- glibc-20060815T0533/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
++++ glibc-20060815T0533-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
 @@ -77,6 +77,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -832,7 +832,7 @@
  en_ZA.UTF-8/UTF-8 \
  en_ZA/ISO-8859-1 \
  en_ZW.UTF-8/UTF-8 \
-@@ -275,6 +278,8 @@ nl_NL/ISO-8859-1 \
+@@ -276,6 +279,8 @@ nl_NL/ISO-8859-1 \
  nl_NL at euro/ISO-8859-15 \
  nn_NO.UTF-8/UTF-8 \
  nn_NO/ISO-8859-1 \
@@ -841,7 +841,7 @@
  nr_ZA/UTF-8 \
  nso_ZA/UTF-8 \
  oc_FR.UTF-8/UTF-8 \
-@@ -326,6 +331,7 @@ sv_FI/ISO-8859-1 \
+@@ -327,6 +332,7 @@ sv_FI/ISO-8859-1 \
  sv_FI at euro/ISO-8859-15 \
  sv_SE.UTF-8/UTF-8 \
  sv_SE/ISO-8859-1 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060810T0627/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060810T0627-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060815T0533/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060815T0533-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060810T0627/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
-+++ glibc-20060810T0627-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
+--- glibc-20060815T0533/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
++++ glibc-20060815T0533-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,71 @@
  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-20060810T0627/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060810T0627-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060815T0533/localedata/locales/ml_IN	13 Aug 2006 05:51:50 -0000	1.8
++++ glibc-20060815T0533-fedora/localedata/locales/ml_IN	20 Oct 2005 06:59:51 -0000	1.3.2.2
+@@ -90,10 +90,10 @@ abday     "<U0D1E><U0D3E>";"<U0D24><U0D3
+ "<U0D36>"
+ %
+ % Full weekday names (%A)
+-day     "<U0D1E><U0D3E><U0D2F><U0D30><U0D4D><U200D>";/
+-"<U0D24><U0D3F><U0D19><U0D4D><U0D15><U0D33><U0D4D><U200D>";/
++day     "<U0D1E><U0D3E><U0D2F><U0D31><U0D41><U0D4D>";/
++"<U0D24><U0D3F><U0D19><U0D4D><U0D15><U0D33><U0D41><U0D4D>";/
+ "<U0D1A><U0D4A><U0D35><U0D4D><U0D35>";/
+-"<U0D2C><U0D41><U0D27><U0D28><U0D4D><U200D>";/
++"<U0D2C><U0D41><U0D27><U0D28><U0D41><U0D4D>";/
+ "<U0D35><U0D4D><U0D2F><U0D3E><U0D34><U0D02>";/
+ "<U0D35><U0D46><U0D33><U0D4D><U0D33><U0D3F>";/
+ "<U0D36><U0D28><U0D3F>"
+@@ -101,30 +101,30 @@ day     "<U0D1E><U0D3E><U0D2F><U0D30><U0
+ % Abbreviated month names (%b)
+ abmon     "<U0D1C><U0D28><U0D41>";/
+ "<U0D2B><U0D46><U0D2C><U0D4D>";/
+-"<U0D2E><U0D3E><U0D30><U0D4D><U200D>";/
+-"<U0D0F><U0D2A><U0D4D><U0D30>";/
+-"<U0D2E><U0D46>";/
+-"<U0D1C><U0D42><U0D7B><U0D23><U0D4D><U200D>";/
+-"<U0D1C><U0D42><U0D32><U0D48>";/
+-"<U0D06><U0D17><U0D4D>";/
+-"<U0D38><U0D46><U0D2A><U0D4D>";/
+-"<U0D12><U0D15><U0D4D><U0D1F><U0D4B>";/
++"<U0D2E><U0D3E><U0D31><U0D4D>";/
++"<U0D0F><U0D2A><U0D4D><U0D31><U0D3F><U0D32><U0D4D>";/
++"<U0D46><U0D2E><U0D2F><U0D4D>";/
++"<U0D1C><U0D42><U0D23><U0D4D>";/
++"<U0D1C><U0D42><U0D48><U0D32>";/
++"<U0D06><U0D17>";/
++"<U0D46><U0D38><U0D2A><U0D4D><U0D24><U0D02>";/
++"<U0D12><U0D15><U0D4D><U0D48><U0D1F>";/
+ "<U0D28><U0D35><U0D02>";/
+ "<U0D21><U0D3F><U0D38><U0D02>"
+ %
+ % FULL month names (%B)
+ mon     "<U0D1C><U0D28><U0D41><U0D35><U0D30><U0D3F>";/
+ "<U0D2B><U0D46><U0D2C><U0D4D><U0D30><U0D41><U0D35><U0D30><U0D3F>";/
+-"<U0D2E><U0D3E><U0D30><U0D4D><U200D><U0D1A><U0D4D><U0D1A><U0D4D>";/
+-"<U0D0F><U0D2A><U0D4D><U0D30><U0D3F><U0D32><U0D4D><U200D><U0020>";/
++"<U0D2E><U0D3E><U0D31><U0D41><U0D4D><U0D1A><U0D4D><U0D1A><U0D4D>";/
++"<U0D0F><U0D2A><U0D4D><U0D31><U0D3F><U0D32><U0D41><U0D4D>";/
+ "<U0D2E><U0D46><U0D2F><U0D4D>";/
+-"<U0D1C><U0D42><U0D23><U0D4D><U200D>";/
++"<U0D1C><U0D42><U0D23><U0D41><U0D4D>";/
+ "<U0D1C><U0D42><U0D32><U0D48>";/
+-"<U0D06><U0D17><U0D38><U0D4D><U0D31><U0D4D><U0D31><U0D4D>";/
+-"<U0D38><U0D46><U0D2A><U0D4D><U0D31><U0D4D><U0D31><U0D02><U0D2C><U0D30><U0D4D><U200D>";/
+-"<U0D12><U0D15><U0D4D><U0D1F><U0D4B><U0D2C><U0D30><U0D4D><U200D>";/
+-"<U0D28><U0D35><U0D02><U0D2C><U0D30><U0D4D><U200D>";/
+-"<U0D21><U0D3F><U0D38><U0D02><U0D2C><U0D30><U0D4D><U200D>"
++"<U0D06><U0D17><U0D38><U0D4D><U0D24><U0D4D>";/
++"<U0D38><U0D46><U0D2A><U0D4D><U0D24><U0D02><U0D2C><U0D31><U0D41><U0D4D>";/
++"<U0D12><U0D15><U0D4D><U0D1F><U0D4B><U0D2C><U0D31><U0D41><U0D4D>";/
++"<U0D28><U0D35><U0D02><U0D2C><U0D31><U0D41><U0D4D>";/
++"<U0D21><U0D3F><U0D38><U0D02><U0D2C><U0D31><U0D41><U0D4D>"
+ %
+ %
+ % Equivalent of AM PM
+--- glibc-20060815T0533/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T0533-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -950,8 +1013,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060810T0627/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060810T0627-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060815T0533/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060815T0533-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -979,8 +1042,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060810T0627/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060810T0627-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060815T0533/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060815T0533-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1056,8 +1119,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060810T0627/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060810T0627-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060815T0533/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060815T0533-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -1113,17 +1176,17 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060810T0627/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060810T0627-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060815T0533/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060815T0533-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060810T0627/nptl/ChangeLog	3 Aug 2006 09:36:43 -0000	1.906
-+++ glibc-20060810T0627-fedora/nptl/ChangeLog	7 Aug 2006 19:28:26 -0000	1.706.2.95
-@@ -960,6 +960,15 @@
+--- glibc-20060815T0533/nptl/ChangeLog	14 Aug 2006 23:11:18 -0000	1.908
++++ glibc-20060815T0533-fedora/nptl/ChangeLog	15 Aug 2006 05:53:48 -0000	1.706.2.96
+@@ -1011,6 +1011,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1139,7 +1202,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1696,6 +1705,11 @@
+@@ -1747,6 +1756,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1151,7 +1214,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3770,6 +3784,11 @@
+@@ -3821,6 +3835,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1163,8 +1226,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060810T0627/nptl/Makefile	1 Aug 2006 06:05:02 -0000	1.183
-+++ glibc-20060810T0627-fedora/nptl/Makefile	2 Aug 2006 16:57:41 -0000	1.157.2.23
+--- glibc-20060815T0533/nptl/Makefile	13 Aug 2006 01:53:28 -0000	1.184
++++ glibc-20060815T0533-fedora/nptl/Makefile	15 Aug 2006 05:53:48 -0000	1.157.2.24
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1187,8 +1250,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060810T0627/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060810T0627-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060815T0533/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060815T0533-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1213,8 +1276,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1222,8 +1285,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
-+++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
+--- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
++++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
 @@ -68,6 +68,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1559,8 +1622,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@@ -1706,8 +1769,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
 @@ -44,9 +44,16 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -1808,8 +1871,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1951,8 +2014,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
-+++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
+--- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
++++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
 @@ -49,6 +49,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2340,8 +2403,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060810T0627/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060810T0627-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
 @@ -46,8 +46,13 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -2436,8 +2499,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060810T0627/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060810T0627-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060815T0533/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060815T0533-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2460,8 +2523,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060810T0627/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060810T0627-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060815T0533/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060815T0533-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2480,8 +2543,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060810T0627/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060810T0627-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060815T0533/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060815T0533-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2493,8 +2556,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060810T0627/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060810T0627-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060815T0533/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060815T0533-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -2535,8 +2598,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060810T0627/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
-+++ glibc-20060810T0627-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
+--- glibc-20060815T0533/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
++++ glibc-20060815T0533-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2570,8 +2633,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060810T0627/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060810T0627-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060815T0533/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T0533-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -2588,8 +2651,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060810T0627/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060810T0627-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060815T0533/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060815T0533-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -2605,8 +2668,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-20060810T0627/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060810T0627-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060815T0533/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060815T0533-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2620,8 +2683,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060810T0627/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060810T0627-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060815T0533/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060815T0533-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -2633,8 +2696,8 @@
  endif
  endif
  
---- glibc-20060810T0627/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060810T0627-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060815T0533/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060815T0533-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -2986,8 +3049,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060810T0627/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060810T0627-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060815T0533/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T0533-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3073,9 +3136,9 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060810T0627/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060810T0627-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
-@@ -41,7 +41,12 @@ nice (int incr)
+--- glibc-20060815T0533/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20060815T0533-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+@@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
  
@@ -3086,11 +3149,11 @@
 +  else if (prio >= PRIO_MAX)
 +    prio = PRIO_MAX - 1;
 +  result = setpriority (PRIO_PROCESS, 0, prio);
-   if (result != -1)
-     return getpriority (PRIO_PROCESS, 0);
-   else
---- glibc-20060810T0627/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
-+++ glibc-20060810T0627-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+   if (result == -1)
+     {
+       if (errno == EACCES)
+--- glibc-20060815T0533/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20060815T0533-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
 @@ -18,11 +18,14 @@
     02111-1307 USA.  */
  
@@ -3138,8 +3201,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060810T0627/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060810T0627-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060815T0533/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060815T0533-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;
@@ -3182,8 +3245,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060810T0627/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060810T0627-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060815T0533/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060815T0533-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"
@@ -3193,8 +3256,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060810T0627/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060810T0627-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060815T0533/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060815T0533-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;
@@ -3240,8 +3303,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060810T0627/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060810T0627-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060815T0533/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T0533-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.
@@ -3302,8 +3365,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060810T0627/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060810T0627-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060815T0533/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060815T0533-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)
@@ -3336,24 +3399,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060810T0627/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060810T0627-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060815T0533/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T0533-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-20060810T0627/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060810T0627-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060815T0533/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T0533-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-20060810T0627/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060810T0627-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060815T0533/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060815T0533-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.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- glibc.spec	10 Aug 2006 07:07:14 -0000	1.255
+++ glibc.spec	15 Aug 2006 06:07:33 -0000	1.256
@@ -1,9 +1,9 @@
-%define glibcdate 20060810T0627
+%define glibcdate 20060815T0533
 %define glibcname glibc
-%define glibcsrcdir glibc-20060810T0627
+%define glibcsrcdir glibc-20060815T0533
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 19
+%define glibcrelease 20
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1443,6 +1443,10 @@
 %endif
 
 %changelog
+* Tue Aug 15 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-20
+- PTHREAD_PRIO_PROTECT support
+- fix errno if nice() fails (#201826)
+
 * Thu Aug 10 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-19
 - adaptive malloc brk/mmap threshold
 - fix fchownat to use kernel syscall (if available) on many arches (#201870)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- sources	10 Aug 2006 07:07:14 -0000	1.188
+++ sources	15 Aug 2006 06:07:33 -0000	1.189
@@ -1,2 +1,2 @@
-4029b7d296fb6fb706829570a94e793d  glibc-20060810T0627.tar.bz2
-734e74f6eb383ab5659dc880fbcc9f62  glibc-fedora-20060810T0627.tar.bz2
+60860331ff9ef46584d9439cd34a0c17  glibc-20060815T0533.tar.bz2
+f8260c46a66ee9b9357885a3c92c8f73  glibc-fedora-20060815T0533.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 06:41:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 02:41:49 -0400
Subject: rpms/beagle/devel beagle-0.2.7-key.patch, NONE, 1.1 beagle.spec,
	1.68, 1.69
Message-ID: <200608150641.k7F6fnlx027704@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	beagle.spec 
Added Files:
	beagle-0.2.7-key.patch 
Log Message:
hide keybiding


beagle-0.2.7-key.patch:
 search/Search.cs     |    5 -----
 tools/Settings.cs    |    2 ++
 tools/settings.glade |    2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

--- NEW FILE beagle-0.2.7-key.patch ---
--- beagle-0.2.7/tools/settings.glade.key	2006-08-15 02:18:04.000000000 -0400
+++ beagle-0.2.7/tools/settings.glade	2006-08-15 02:27:48.000000000 -0400
@@ -253,7 +253,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkTable" id="table1">
+			    <widget class="GtkTable" id="key_binding_table">
 			      <property name="visible">True</property>
 			      <property name="n_rows">2</property>
 			      <property name="n_columns">2</property>
--- beagle-0.2.7/tools/Settings.cs.key	2006-08-15 02:28:54.000000000 -0400
+++ beagle-0.2.7/tools/Settings.cs	2006-04-07 12:16:02.000000000 -0400
@@ -53,6 +53,7 @@
 
 	[Widget] CheckButton autostart_toggle;
 
+	[Widget] Table key_binding_table;
 	[Widget] CheckButton press_ctrl_toggle;
  	[Widget] CheckButton press_alt_toggle;
 	[Widget] Entry show_search_window_entry;
@@ -109,6 +110,7 @@
 		glade.Autoconnect (this);
 
 		administration_frame.Visible = (Environment.UserName == "root");
+		key_binding_table.Visible = false;
 
 #if false
 		display_view = new DisplayView ();
--- beagle-0.2.7/search/Search.cs.key	2006-08-15 02:20:28.000000000 -0400
+++ beagle-0.2.7/search/Search.cs	2006-08-15 02:20:54.000000000 -0400
@@ -34,8 +34,6 @@
 		Search.SortType sort = SortType.Modified;
 		Search.TypeFilter filter = null;
 
-		XKeybinder keybinder = new XKeybinder ();
-
 		public static bool IconEnabled = false;
 
 		public static void Main (string [] args)
@@ -221,9 +219,6 @@
 				tray = new TrayIcon ();
 				tray.Clicked += OnTrayActivated;
 				tray.Search += OnTraySearch;
-
-				// Attach the hide/show keybinding
-				keybinder.Bind (Conf.Searching.ShowSearchWindowBinding.ToString (), OnTrayActivated);
 			} else {
 				ShowAll ();
 			}


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- beagle.spec	11 Aug 2006 12:19:39 -0000	1.68
+++ beagle.spec	15 Aug 2006 06:41:40 -0000	1.69
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.7
-Release:       	8%{?dist}
+Release:       	9%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -38,7 +38,8 @@
 Patch4: beagle-0.2.7-beagle-index-username.patch
 Patch5: beagle-0.2.7-runuser.patch
 # fixed in upstream cvs
-Patch6:		beagle-0.2.7-socket-path.patch
+Patch6:	beagle-0.2.7-socket-path.patch
+Patch7: beagle-0.2.7-key.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
@@ -95,6 +96,7 @@
 %patch4 -p1 -b .beagleidx
 %patch5 -p1 -b .runuser
 %patch6 -p1 -b .socket-path
+%patch7 -p1 -b .key
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -284,6 +286,10 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Tue Aug 15 2006 Matthias Clasen <mclasen at redhat.com> - 0.2.7-9.fc6
+- Hide keybinding in beagle-settings, since the global
+  search keybinding works.  (#201424)
+
 * Fri Aug 11 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-8
 - Split out gui and evolution
 - Pre-require shadow-utils that fixes the group bug



From fedora-cvs-commits at redhat.com  Tue Aug 15 06:42:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 02:42:23 -0400
Subject: rpms/glibc/devel glibc-fedora.patch,1.169,1.170
Message-ID: <200608150642.k7F6gNbY027792@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc-fedora.patch 
Log Message:
2.4.90-20

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/ml_IN                                    |   38 -
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |   12 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 58 files changed, 1415 insertions(+), 652 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- glibc-fedora.patch	15 Aug 2006 06:07:32 -0000	1.169
+++ glibc-fedora.patch	15 Aug 2006 06:42:11 -0000	1.170
@@ -1228,6 +1228,24 @@
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
 --- glibc-20060815T0533/nptl/Makefile	13 Aug 2006 01:53:28 -0000	1.184
 +++ glibc-20060815T0533-fedora/nptl/Makefile	15 Aug 2006 05:53:48 -0000	1.157.2.24
+@@ -122,7 +122,7 @@ libpthread-routines = init vars events v
+ 		      pthread_mutexattr_getprotocol \
+ 		      pthread_mutexattr_setprotocol \
+ 		      pthread_mutexattr_getprioceiling \
+-		      pthread_mutexattr_setprioceiling \
++		      pthread_mutexattr_setprioceiling tpp \
+ 		      pthread_mutex_getprioceiling pthread_mutex_setprioceiling
+ #		      pthread_setuid pthread_seteuid pthread_setreuid \
+ #		      pthread_setresuid \
+@@ -258,7 +258,7 @@ tests = tst-typesizes \
+ 	tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \
+ 	tst-getpid1 tst-getpid2 tst-getpid3 \
+ 	tst-initializers1 $(patsubst %,tst-initializers1-%,c89 gnu89 c99 gnu99)
+-xtests = tst-setuid1 tst-setuid1-static
++xtests = tst-setuid1 tst-setuid1-static tst-mutexpp1 tst-mutexpp6 tst-mutexpp10
+ 
+ # Files which must not be linked with libpthread.
+ tests-nolibpthread = tst-unload
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a



From fedora-cvs-commits at redhat.com  Tue Aug 15 06:50:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 02:50:40 -0400
Subject: rpms/elfutils/devel Makefile,1.15,1.16
Message-ID: <200608150650.k7F6oewg012377@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12333

Modified Files:
	Makefile 
Log Message:
(systemtap-dist-createrepo): Use absolute directory



Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile	17 Jul 2006 08:26:47 -0000	1.15
+++ Makefile	15 Aug 2006 06:50:37 -0000	1.16
@@ -59,7 +59,7 @@
 
 systemtap-dist-createrepo: systemtap-dist
 ifneq ($(wildcard /usr/bin/createrepo),)
-	createrepo -q $<
+	createrepo -q `cd $<; /bin/pwd`
 endif
 
 systemtap-sync: systemtap-dist-createrepo



From fedora-cvs-commits at redhat.com  Tue Aug 15 07:01:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 03:01:34 -0400
Subject: rpms/dovecot/devel dovecot.spec,1.56,1.57
Message-ID: <200608150701.k7F71Wab026001@cvs.devel.redhat.com>

Author: prockai

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

Modified Files:
	dovecot.spec 
Log Message:
* Tue Aug 15 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.rc2.2
- include /var/lib/dovecot in the package, prevents startup failure
  on new installs



Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- dovecot.spec	17 Jul 2006 13:22:47 -0000	1.56
+++ dovecot.spec	15 Aug 2006 07:01:29 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Version: 1.0
-Release: 0.rc2.1%{?dist}
+Release: 0.rc2.2%{?dist}
 License: LGPL
 Group: System Environment/Daemons
 
@@ -137,6 +137,7 @@
 done
 
 mv $RPM_BUILD_ROOT%{docdir} $RPM_BUILD_ROOT%{docdir}-%{version}
+mkdir -p $RPM_BUILD_ROOT/var/lib/dovecot
 
 %pre
 /usr/sbin/useradd -c "dovecot" -u %{dovecot_uid} -s /sbin/nologin -r -d /usr/libexec/dovecot dovecot 2>/dev/null || :
@@ -209,9 +210,14 @@
 %attr(0755,root,dovecot) %dir /var/run/dovecot
 %attr(0750,root,dovecot) %dir /var/run/dovecot/login
 %attr(0750,root,dovecot) %{docdir}-%{version}/examples/mkcert.sh
+%attr(0750,dovecot,dovecot) %dir /var/lib/dovecot
 
 
 %changelog
+* Tue Aug 15 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.rc2.2
+- include /var/lib/dovecot in the package, prevents startup failure
+  on new installs
+
 * Mon Jul 17 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.rc2.1
 - reenable inotify and see what happens
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 07:41:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 03:41:10 -0400
Subject: rpms/openoffice.org/devel sources,1.191,1.192
Message-ID: <200608150741.k7F7fAMa019936@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	sources 
Log Message:
undefined macro used in pa-IN translations


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- sources	14 Aug 2006 15:24:44 -0000	1.191
+++ sources	15 Aug 2006 07:41:07 -0000	1.192
@@ -11,5 +11,5 @@
 2618cff7bfdf0a9ca30233e349df73c6  openoffice.org-myspell-contrib.tar.gz
 156fca901e2850226f16dd5034b6c941  openoffice.org-simple-crash_report.sh
 0ee333127e54353d49bf30aa112faee4  openoffice.org.langpack.template.tar.gz
-3aabcb294c648747551d702316c88580  pa-IN-179.sdf
 7a78b4b7151f8f71fe336245b19e68fa  OOD680_m1.tar.bz2
+cba51824724ada973394d8feecdd0213  pa-IN-179.sdf



From fedora-cvs-commits at redhat.com  Tue Aug 15 08:45:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 04:45:12 -0400
Subject: rpms/glibc/devel glibc-fedora.patch,1.170,1.171
Message-ID: <200608150845.k7F8jBA2003209@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc-fedora.patch 
Log Message:
2.4.90-20

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libc/sysdeps/unix/sysv/linux/clock_settime.c                |    4 
 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/ml_IN                                    |   38 -
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |   12 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 59 files changed, 1417 insertions(+), 654 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- glibc-fedora.patch	15 Aug 2006 06:42:11 -0000	1.170
+++ glibc-fedora.patch	15 Aug 2006 08:45:05 -0000	1.171
@@ -3438,3 +3438,23 @@
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
+--- libc/sysdeps/unix/sysv/linux/clock_settime.c	2006-08-15 07:35:15.000000000 +0200
++++ libc/sysdeps/unix/sysv/linux/clock_settime.c	2006-08-15 10:41:50.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include "kernel-posix-cpu-timers.h"
+ #include <kernel-features.h>
+ 
+-#ifndef HAVE_CLOCK_GETTIME_VSYSCALL
++#ifndef HAVE_CLOCK_GETRES_VSYSCALL
+ # undef INTERNAL_VSYSCALL
+ # define INTERNAL_VSYSCALL INTERNAL_SYSCALL
+ # undef INLINE_VSYSCALL
+@@ -43,7 +43,7 @@ maybe_syscall_settime_cpu (clockid_t clo
+   if (!__libc_missing_posix_cpu_timers)
+     {
+       INTERNAL_SYSCALL_DECL (err);
+-      int r = INTERNAL_VSYSCALL (clock_settime, err, 2, clock_id, tp);
++      int r = INTERNAL_SYSCALL (clock_settime, err, 2, clock_id, tp);
+       if (!INTERNAL_SYSCALL_ERROR_P (r, err))
+         return 0;
+ 



From fedora-cvs-commits at redhat.com  Tue Aug 15 09:45:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 05:45:44 -0400
Subject: rpms/vsftpd/devel vsftpd.spec,1.48,1.49
Message-ID: <200608150945.k7F9jiuc016485@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16379

Modified Files:
	vsftpd.spec 
Log Message:
Correct comments



Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- vsftpd.spec	8 Aug 2006 08:09:10 -0000	1.48
+++ vsftpd.spec	15 Aug 2006 09:45:41 -0000	1.49
@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.5
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -33,6 +33,7 @@
 Patch18: vsftpd-close-std-fds.patch
 Patch19: vsftpd-2.0.5-default_ipv6.patch
 Patch20: vsftpd-2.0.5-add_ipv6_option.patch
+Patch21: vsftpd-2.0.5-correct_comments.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -80,6 +81,7 @@
 %patch18 -p1 -b .close-fds
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %build
 %ifarch s390x
@@ -138,6 +140,9 @@
 /var/ftp
 
 %changelog
+* Tue Aug 15 2006 Maros Barabas	<mbarabas at redhat.com> - 2.0.5-6
+- correct comments
+
 * Tue Aug 08 2006 Maros Barabas	<mbarabas at redhat.com> - 2.0.5-5
 - option to change listening to IPv6 protocol
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 09:51:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 05:51:36 -0400
Subject: rpms/kdebase/devel kdebase-3.5.4-kde#124116.patch, NONE,
	1.1 kdebase.spec, 1.211, 1.212
Message-ID: <200608150951.k7F9paX6001068@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-kde#124116.patch 
Log Message:
apply upstream patch to fix argument quoting


kdebase-3.5.4-kde#124116.patch:
 main.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.4-kde#124116.patch ---
Index: ksystraycmd/main.cpp
===================================================================
--- ksystraycmd/main.cpp	(Revision 572102)
+++ ksystraycmd/main.cpp	(Revision 572103)
@@ -5,6 +5,7 @@
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
+#include <kprocess.h>
 
 #include "ksystraycmd.h"
 
@@ -94,7 +95,7 @@
   // Read the command
   QString command;
   for ( int i = 0; i < args->count(); i++ )
-    command += QCString( args->arg(i) ) + " ";
+    command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " ";
   if ( !command.isEmpty() )
       cmd.setCommand( command );
 


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- kdebase.spec	8 Aug 2006 11:47:38 -0000	1.211
+++ kdebase.spec	15 Aug 2006 09:51:34 -0000	1.212
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -56,6 +56,7 @@
 # upstream patches
 Patch100: kdebase-3.5.4-halbackend-dbus.patch
 Patch101: kdebase-3.5.4-kde#128552.patch
+Patch102: kdebase-3.5.4-kde#124116.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -163,6 +164,7 @@
 # upstream patches
 %patch100 -p0 -b .halbackend-dbus
 %patch101 -p0 -b .kde#128552
+%patch102 -p0 -b .kde#124116
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -532,6 +534,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Tue Aug 15 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
+- apply upstream patch to fix argument quoting
+
 * Tue Aug 08 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
 - apply upstream patch to fix KDED crashing on startup when D-BUS is unavailable.
 - apply upstream patch to fix kde#128552, kicker regression



From fedora-cvs-commits at redhat.com  Tue Aug 15 09:52:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 05:52:49 -0400
Subject: rpms/logwatch/devel logwatch-7.3-audit.patch, NONE,
	1.1 logwatch-7.3-iptables.patch, NONE,
	1.1 logwatch-7.3-sshd.patch, NONE, 1.1 logwatch.spec, 1.39, 1.40
Message-ID: <200608150952.k7F9qnQ3001599@cvs.devel.redhat.com>

Author: mmaslano

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3-audit.patch logwatch-7.3-iptables.patch 
	logwatch-7.3-sshd.patch 
Log Message:
Added three new patches for audit, iptables, sshd.


logwatch-7.3-audit.patch:
 audit |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3-audit.patch ---
--- logwatch-7.3/scripts/services/audit.old	2006-03-20 21:42:57.000000000 +0100
+++ logwatch-7.3/scripts/services/audit	2006-08-15 11:43:58.000000000 +0200
@@ -67,7 +67,11 @@
 	( $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]+/) or
-	( $ThisLine =~ /^audit\([0-9.]+:[0-9]+\): ( ?(path|cwd|item|name|flags)=["\/A-Za-z0-9]*)*$/) 
+	( $ThisLine =~ /^audit\([0-9.]+:[0-9]+\): ( ?(path|cwd|item|name|flags)=["\/A-Za-z0-9]*)*$/) or
+	( $ThisLine =~ /: enforcing=[0-9]+ old_enforcing=[0-9]+ auid=[0-9]+/) or
+	( $ThisLine =~ /: policy loaded auid=[0-9]+/) or
+	( $ThisLine =~ /: user pid=[0-9]+ uid=[0-9]+ auid=[0-9]+ subj=system_u:system_r:system_dbusd_t:[0-9a-z]+ msg=/) or
+	( $ThisLine =~ /^kernel: audit\([0-9.]+:[0-9]+\): selinux=[0-9]+ auid=[0-9]+/)
     ) { 
 	# Ignore these entries
     } elsif ( $ThisLine =~ /audit\([0-9]{10}.[0-9]{3}:[0-9]\): initialized$/) {

logwatch-7.3-iptables.patch:
 iptables |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE logwatch-7.3-iptables.patch ---
--- logwatch-7.3/scripts/services/iptables.ipt	2006-01-16 19:40:31.000000000 +0100
+++ logwatch-7.3/scripts/services/iptables	2006-08-14 18:06:02.000000000 +0200
@@ -107,8 +107,8 @@
    elsif (($chain,$ifin,$ifout,$fromip,$toip,$proto,$rest) = ($ThisLine =~ /^(.*?)\s*IN=(\w*).*?OUT=(\w*).*?SRC=([\w\.:]+).*?DST=([\w\.:]+).*?PROTO=(\w+)(.*)/ )) {
 
       # get a destination port number  (or icmp type) if there is one
-      if (! ( ($toport) = ( $rest =~ /DPT=(\w+)/ ) ) ) {
-         if (! ( ($toport) = ( $rest =~ /TYPE=(\w+)/ ) ) ) {
+      if (! ( ($toport) = ( $rest =~ /TYPE=(\w+)/ ) ) ) {
+         if (! ( ($toport) = ( $rest =~ /DPT=(\w+)/ ) ) ) {
             $toport = 0;
          }
       }

logwatch-7.3-sshd.patch:
 sshd |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE logwatch-7.3-sshd.patch ---
--- logwatch-7.3/scripts/services/sshd.sshd	2006-03-20 21:42:57.000000000 +0100
+++ logwatch-7.3/scripts/services/sshd	2006-08-14 17:15:19.000000000 +0200
@@ -313,9 +313,9 @@
       $TTYModesFail{$Reason}++;
    } elsif ( my ($User,undef) = ($ThisLine =~ /^User ([^ ]*) not allowed because ([^ ]*) exists$/)) {
       $LoginLock{$User}++;
-   } elsif ( my ($Method,$User,$Host) = ($ThisLine =~ /^Postponed ([^ ]*) for (invalid user [^ ]*|illegal user [^ ]*|[^ ]*) from ([^ ]*) port \d+ ssh/)) {
+   } elsif ( my ($Method,$InvaUser,$IlegUser,$EmptyUser,$User,$Host) = ($ThisLine =~ /^Postponed ([^ ]*) for ((invalid user) [^ ]*|(illegal user) [^ ]*|([^ ]*)) from ([^ ]*) port \d+ ssh/)) {
       $PostPonedAuth{"$User/$Method"}{$Host}++;
-      $IllegalUsers{$Host}{"$User/$Method"}++;
+      if ($IlegUser =~ /illegal user/) {$IllegalUsers{$Host}{"$User/$Method"}++;}
    } elsif ( my ($User) = ($ThisLine =~ /^User ([^ ]*) not allowed because account is locked/)) {
       $LockedAccount{$User}++;
    } elsif ( my ($User) = ($ThisLine =~ /^User ([^ ]*) not allowed because not listed in AllowUsers/)) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- logwatch.spec	26 Jun 2006 08:19:02 -0000	1.39
+++ logwatch.spec	15 Aug 2006 09:52:46 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 7.3
-Release: 3
+Release: 4
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -11,7 +11,9 @@
 Patch4: logwatch-7.3-samba.patch
 Patch5: logwatch-7.3-temp_dir.patch
 Patch6: logwatch-7.3-secure.patch
-
+Patch7: logwatch-7.3-audit.patch
+Patch8: logwatch-7.3-sshd.patch
+Patch9: logwatch-7.3-iptables.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -30,7 +32,9 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %install
 
@@ -132,6 +136,9 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Mon Aug 14 2006 Marcela Maslanova <mmaslano at redhat.com> 7.3-4
+- added another audit patch for SElinux (#200116)
+
 * Fri Jun 23 2006 Ivana Varekova <varekova at redhat.com> 7.3-3
 - added secure-service patch
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 09:54:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 05:54:54 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch, NONE,
	1.1 openoffice.org.spec, 1.845,
	1.846 openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch,
	1.4, NONE
Message-ID: <200608150954.k7F9ss9f002469@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch 
Removed Files:
	openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch 
Log Message:
add an issue number

openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch:
 psprint/inc/psprint/fontmanager.hxx       |   17 ++++++++++++-
 psprint/source/fontmanager/fontconfig.cxx |   38 ++++++++++++++++++++++++++++--
 psprint/source/fontmanager/makefile.mk    |    3 ++
 psprint/util/makefile.mk                  |    5 +++
 vcl/inc/impfont.hxx                       |   11 ++++++--
 vcl/inc/vclenum.hxx                       |    8 ++++++
 vcl/source/glyphs/gcach_ftyp.cxx          |   20 +++++++++++++++
 vcl/unx/source/gdi/salgdi3.cxx            |   23 ++++++++++++++++++
 8 files changed, 118 insertions(+), 7 deletions(-)

--- NEW FILE openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch ---
diff -ru vcl/inc/impfont.hxx vcl/inc/impfont.hxx
--- openoffice.org.orig/vcl/inc/impfont.hxx	2006-05-22 13:59:55.000000000 +0100
+++ openoffice.org/vcl/inc/impfont.hxx	2006-05-23 12:26:20.000000000 +0100
@@ -167,24 +167,29 @@
     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
+    FontSubPixel       meSubPixel;       // type of subpixel font hinting to be used
 public:
     ImplFontHints() :
         meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW), 
         meAntiAlias(ANTIALIAS_DONTKNOW), 
         meAutoHint(AUTOHINT_DONTKNOW), 
         meHinting(HINTING_DONTKNOW), 
-        meHintStyle(HINT_FULL)
+        meHintStyle(HINT_FULL),
+        meSubPixel(SUBPIXEL_UNKNOWN)
     {}
     ImplFontHints(FontEmbeddedBitmap eEmbeddedBitmap, FontAntiAlias eAntiAlias, 
-        FontAutoHint eAutoHint, FontHinting eHinting, FontHintStyle eHintStyle) :
+        FontAutoHint eAutoHint, FontHinting eHinting, FontHintStyle eHintStyle,
+	FontSubPixel eSubPixel) :
         meEmbeddedBitmap(eEmbeddedBitmap), 
         meAntiAlias(eAntiAlias), 
         meAutoHint(eAutoHint), 
         meHinting(eHinting), 
-        meHintStyle(eHintStyle)
+        meHintStyle(eHintStyle),
+        meSubPixel(eSubPixel)
     {}
     FontAutoHint GetUseAutoHint() const { return meAutoHint; }
     FontHintStyle GetHintStyle() const { return meHintStyle; }
+    FontSubPixel GetSubPixel() const { return meSubPixel; }
     bool DontUseEmbeddedBitmaps() const { return meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; }
     bool DontUseAntiAlias() const { return meAntiAlias == ANTIALIAS_FALSE; }
     bool DontUseHinting() const { return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); }
diff -ru vcl/inc/vclenum.hxx vcl/inc/vclenum.hxx
--- openoffice.org.orig/vcl/inc/vclenum.hxx	2006-05-22 13:59:55.000000000 +0100
+++ openoffice.org/vcl/inc/vclenum.hxx	2006-05-22 14:14:49.000000000 +0100
@@ -310,6 +310,14 @@
 
 #endif
 
+#ifndef ENUM_FONTSUBPIXEL_DECLARED
+#define ENUM_FONTSUBPIXEL_DECLARED
+
+enum FontSubPixel { SUBPIXEL_UNKNOWN, SUBPIXEL_RGB, SUBPIXEL_BGR, SUBPIXEL_VRGB, SUBPIXEL_VBGR, SUBPIXEL_NONE};
+
+#endif
+
+
 // ------------------------------------------------------------
 
 #ifndef ENUM_KEYFUNCTYPE_DECLARED
diff -ru vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	2006-05-23 12:35:49.000000000 +0100
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	2006-05-23 12:46:15.000000000 +0100
@@ -870,6 +870,22 @@
     }
 #endif
 
+    switch (aHints.GetSubPixel())
+    {
+        default:
+        case SUBPIXEL_UNKNOWN:
+        case SUBPIXEL_NONE:
+            break;
+        case SUBPIXEL_RGB:
+        case SUBPIXEL_BGR:
+            mnLoadFlags |= FT_LOAD_TARGET_LCD;
+            break;
+        case SUBPIXEL_VRGB:
+        case SUBPIXEL_VBGR:
+            mnLoadFlags |= FT_LOAD_TARGET_LCD_V;
+            break;
+    }
+
     if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
         mnLoadFlags |= FT_LOAD_NO_BITMAP;
 }
@@ -1176,13 +1216,15 @@
         }
     }
 
-#if !defined(TT_CONFIG_OPTION_BYTECODE_INTERPRETER)
+#if 0
     // #95556# autohinting not yet optimized for non-western glyph styles
     if( !(mnLoadFlags & (FT_LOAD_NO_HINTING | FT_LOAD_FORCE_AUTOHINT) )
     &&  ( (aChar >= 0x0600 && aChar < 0x1E00)   // south-east asian + arabic
         ||(aChar >= 0x2900 && aChar < 0xD800)   // CJKV
         ||(aChar >= 0xF800) ) )                 // presentation + symbols
+    {
         nGlyphFlags |= GF_UNHINTED;
+    }
 #endif
 
     if( nGlyphIndex != 0 )
diff -ru vcl/unx/source/gdi/salgdi3.cxx vcl/unx/source/gdi/salgdi3.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/salgdi3.cxx	2006-05-22 13:59:52.000000000 +0100
+++ openoffice.org/vcl/unx/source/gdi/salgdi3.cxx	2006-05-23 12:29:33.000000000 +0100
@@ -1531,6 +1531,29 @@
             rFontHints.meHintStyle = HINT_FULL;
             break;
     }
+
+    switch (aHints.m_eSubPixel)
+    {
+        default:
+        case psp::fcsubpixel::Unknown:
+            rFontHints.meSubPixel = SUBPIXEL_UNKNOWN;
+            break;
+        case psp::fcsubpixel::RGB:
+            rFontHints.meSubPixel = SUBPIXEL_RGB;
+            break;
+        case psp::fcsubpixel::BGR:
+            rFontHints.meSubPixel = SUBPIXEL_BGR;
+            break;
+        case psp::fcsubpixel::VRGB:
+            rFontHints.meSubPixel = SUBPIXEL_VRGB;
+            break;
+        case psp::fcsubpixel::VBGR:
+            rFontHints.meSubPixel = SUBPIXEL_VBGR;
+            break;
+        case psp::fcsubpixel::NONE:
+            rFontHints.meSubPixel = SUBPIXEL_NONE;
+            break;
+    }
 }
 
 // ----------------------------------------------------------------------------
diff -ru psprint/inc/psprint/fontmanager.hxx psprint/inc/psprint/fontmanager.hxx
--- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx	2006-05-22 13:59:50.000000000 +0100
+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx	2006-05-22 15:28:40.000000000 +0100
@@ -165,6 +165,19 @@
 };
 }
 
+namespace fcsubpixel
+{
+enum type {
+    Unknown = 0,
+    RGB = 1,
+    BGR = 2,
+    VRGB = 3,
+    VBGR = 4,
+    NONE = 5
+};
+}
+
+
 struct FontConfigHints
 {
     fcstatus::type m_eEmbeddedbitmap;
@@ -172,13 +185,15 @@
     fcstatus::type m_eAutoHint;
     fcstatus::type m_eHinting;
     fchint::type m_eHintStyle;
+    fcsubpixel::type m_eSubPixel;
 
     FontConfigHints() :
         m_eEmbeddedbitmap( fcstatus::isunset ),
         m_eAntialias( fcstatus::isunset ),
         m_eAutoHint( fcstatus::isunset ),
         m_eHinting( fcstatus::isunset ),
-        m_eHintStyle( fchint::Full )
+        m_eHintStyle( fchint::Medium ),
+        m_eSubPixel( fcsubpixel::Unknown )
         {}
 };
 
diff -ru psprint/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	2006-05-22 13:59:49.000000000 +0100
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	2006-05-23 12:23:55.000000000 +0100
@@ -36,6 +36,8 @@
 #ifdef ENABLE_FONTCONFIG
 #include <fontconfig/fontconfig.h>
 // be compatible with fontconfig 2.2.0 release
+#include <cairo-ft.h>
+#include <gdk/gdkscreen.h>
 #ifndef FC_WEIGHT_BOOK
 #define FC_WEIGHT_BOOK 75
 #endif
@@ -151,7 +153,7 @@
 
     void FcPatternDestroy( FcPattern* pPattern )
     { m_pFcPatternDestroy( pPattern ); }
-    
+
     FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
     { return m_pFcFontList( pConfig, pPattern, pSet ); }
 
@@ -187,6 +189,7 @@
 
     FcResult FcPatternGetBool( const FcPattern* pPattern, const char* object, int n, FcBool* s )
     { return m_pFcPatternGetBool( pPattern, object, n, s ); }
+
     void FcDefaultSubstitute( FcPattern* pPattern )
     { m_pFcDefaultSubstitute( pPattern ); }
     FcPattern* FcFontSetMatch( FcConfig* pConfig, FcFontSet **ppFontSet, int nset, FcPattern* pPattern, FcResult* pResult )
@@ -774,14 +777,18 @@
     rWrapper.FcPatternAddDouble( pPattern, FC_PIXEL_SIZE, nSize);
 
     FcBool embitmap = true, antialias = true, autohint = true, hinting = true;
-    int hintstyle = FC_HINT_FULL;
+    int hintstyle = FC_HINT_FULL, rgba = FC_RGBA_UNKNOWN;
 
     rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchFont );
+    if (const cairo_font_options_t *pOptions = gdk_screen_get_font_options(gdk_screen_get_default()))
+	cairo_ft_font_options_substitute(pOptions, pPattern);
     rWrapper.FcDefaultSubstitute( pPattern );
     FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pPattern, FC_EMBEDDED_BITMAP, 0, &embitmap );
     FcResult eAntialias = rWrapper.FcPatternGetBool( pPattern, FC_ANTIALIAS, 0, &antialias );
     FcResult eAutoHint = rWrapper.FcPatternGetBool( pPattern, FC_AUTOHINT, 0, &autohint );
+    FcResult eSubPixel = rWrapper.FcPatternGetInteger( pPattern, FC_RGBA, 0, &rgba);
     FcResult eHinting = rWrapper.FcPatternGetBool( pPattern, FC_HINTING, 0, &hinting );
+
     FcResult eHintStyle = rWrapper.FcPatternGetInteger( pPattern, FC_HINT_STYLE, 0, &hintstyle );
 
     if( eEmbeddedBitmap == FcResultMatch )
@@ -813,6 +820,33 @@
                 break;
         }
     }
+    if (eSubPixel != FcResultMatch)
+        aHints.m_eSubPixel = fcsubpixel::Unknown;
+    else 
+    {
+        switch (rgba)
+        {
+	    default:
+	    case FC_RGBA_UNKNOWN:
+	        break;
+                aHints.m_eSubPixel = fcsubpixel::Unknown;
+	    case FC_RGBA_RGB:
+                aHints.m_eSubPixel = fcsubpixel::RGB;
+	        break;
+	    case FC_RGBA_BGR:
+                aHints.m_eSubPixel = fcsubpixel::BGR;
+	        break;
+	    case FC_RGBA_VRGB:
+                aHints.m_eSubPixel = fcsubpixel::VRGB;
+	        break;
+	    case FC_RGBA_VBGR:
+                aHints.m_eSubPixel = fcsubpixel::VBGR;
+	        break;
+            case FC_RGBA_NONE:
+                aHints.m_eSubPixel = fcsubpixel::NONE;
+	        break;
+        }
+    }
 #endif
     return aHints;
 }
diff -ru psprint/source/fontmanager/makefile.mk psprint/source/fontmanager/makefile.mk
--- openoffice.org.orig/psprint/source/fontmanager/makefile.mk	2006-05-22 13:59:49.000000000 +0100
+++ openoffice.org/psprint/source/fontmanager/makefile.mk	2006-05-23 09:59:14.000000000 +0100
@@ -49,6 +49,9 @@
 CDEFS += -DENABLE_FONTCONFIG
 .ENDIF
 
+PKGCONFIG_MODULES=gdk-2.0 freetype2
+.INCLUDE: pkg_config.mk
+
 # --- Files --------------------------------------------------------
 
 SLOFILES=\
diff -ru psprint/util/makefile.mk psprint/util/makefile.mk
--- openoffice.org.orig/psprint/util/makefile.mk	2006-05-22 13:59:49.000000000 +0100
+++ openoffice.org/psprint/util/makefile.mk	2006-05-23 10:00:18.000000000 +0100
@@ -90,5 +90,10 @@
 
 # --- Targets ------------------------------------------------------------
 
+PKGCONFIG_MODULES=gdk-2.0 freetype2
+.INCLUDE: pkg_config.mk
+SHL1STDLIBS+=$(PKGCONFIG_LIBS)
+
+
 
 .INCLUDE :	target.mk


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.845
retrieving revision 1.846
diff -u -r1.845 -r1.846
--- openoffice.org.spec	14 Aug 2006 19:13:18 -0000	1.845
+++ openoffice.org.spec	15 Aug 2006 09:54:51 -0000	1.846
@@ -94,7 +94,7 @@
 Patch26: workspace.fpicker6.patch
 Patch27: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
 Patch28: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch29: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+Patch29: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
 Patch30: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
 Patch31: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
 Patch32: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
@@ -948,7 +948,7 @@
 %patch26 -p1 -b .workspace.fpicker6.patch
 %patch27 -p1 -b .oooXXXXX.atkbroken.vcl.patch
 %patch28 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch29 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
+%patch29 -p1 -b .ooo59127.vcl.honourcairofont.patch
 %patch30 -p1 -b .rh192588.officecfg.defaultcairooff.patch
 %patch31 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
 %patch32 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch


--- openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 15 10:06:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 06:06:55 -0400
Subject: rpms/freeradius/devel freeradius-1.1.2-no_sql_inc.patch, NONE,
	1.1 freeradius.spec, 1.33, 1.34
Message-ID: <200608151006.k7FA6tDj005513@cvs.devel.redhat.com>

Author: twoerner

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

Modified Files:
	freeradius.spec 
Added Files:
	freeradius-1.1.2-no_sql_inc.patch 
Log Message:
[tw]
- commented out include for sql.conf in radiusd.conf (#202561)



freeradius-1.1.2-no_sql_inc.patch:
 radiusd.conf.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE freeradius-1.1.2-no_sql_inc.patch ---
--- freeradius-1.1.2/raddb/radiusd.conf.in.no_sql_inc	2006-08-15 11:38:23.000000000 +0200
+++ freeradius-1.1.2/raddb/radiusd.conf.in	2006-08-15 11:38:25.000000000 +0200
@@ -1245,7 +1245,7 @@
 	#  For MS-SQL, use:	 	${confdir}/mssql.conf
 	#  For Oracle, use:	 	${confdir}/oraclesql.conf
 	#
-	$INCLUDE  ${confdir}/sql.conf
+#	$INCLUDE  ${confdir}/sql.conf
 
 
 	#  For Cisco VoIP specific accounting with Postgresql,


Index: freeradius.spec
===================================================================
RCS file: /cvs/dist/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- freeradius.spec	12 Jul 2006 05:51:44 -0000	1.33
+++ freeradius.spec	15 Aug 2006 10:06:52 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server.
 Name: freeradius
 Version: 1.1.2
-Release: 1.1
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -20,6 +20,7 @@
 Patch5: freeradius-1.1.1-pie.patch
 Patch8: freeradius-1.0.0-samba3.patch
 Patch10: freeradius-1.1.2-build.patch
+Patch11: freeradius-1.1.2-no_sql_inc.patch
 
 %description
 The FreeRADIUS Server Project is a high performance and highly configurable 
@@ -75,6 +76,7 @@
 %patch5 -p1 -b .pie
 %patch8 -p1 -b .samba3
 %patch10 -p1 -b .build
+%patch11 -p1 -b .no_sql_inc
 
 
 %build
@@ -277,6 +279,9 @@
 
 
 %changelog
+* Tue Aug 15 2006 Thomas Woerner <twoerner at redhat.com> 1.1.2-2
+- commented out include for sql.conf in radiusd.conf (#202561)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.2-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 11:05:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 07:05:19 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2174, 1.2175 sources, 1.354,
	1.355 .cvsignore, 1.414, 1.415
Message-ID: <200608151105.k7FB5JmG000432@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec sources .cvsignore 
Log Message:
update xen HV xen-unstable cset 11061


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2174
retrieving revision 1.2175
diff -u -r1.2174 -r1.2175
--- kernel-2.6.spec	8 Aug 2006 03:57:17 -0000	1.2174
+++ kernel-2.6.spec	15 Aug 2006 11:05:16 -0000	1.2175
@@ -25,7 +25,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
 %define signmodules 0
-%define xen_version 20060708
+%define xen_hv_cset 11061
 %define make_target bzImage
 %define kernel_image x86
 
@@ -191,7 +191,7 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-%{xen_version}.tar.bz2
+Source1: xen-%{xen_hv_cset}.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules
@@ -658,13 +658,13 @@
   rm -rf deleteme2 &
 fi
 
-if [ ! -d xen-%{xen_version} ]; then
+if [ ! -d xen-%{xen_hv_cset} ]; then
   # Ok, first time we do a make prep
 %setup -D -T -q -n %{name}-%{version} -a1
   cp %{SOURCE2} .
-  mv xen xen-%{xen_version}
+  mv xen xen-%{xen_hv_cset}
 fi
-cp -rl xen-%{xen_version} xen
+cp -rl xen-%{xen_hv_cset} xen
 
 # Any necessary hypervisor patches go here
 %patch20000 -p0
@@ -1537,6 +1537,10 @@
 %endif
 
 %changelog
+* Tue Aug 15 2006 Juan Quintela <quintela at redhat.com>
+- s/xen_version/xen_hv_cset/ as Fedora.
+- update xen hv to cset 11061.
+
 * Mon Aug  7 2006 Mike Christie <mchristi at redhat.com>
 - Drop iscsi update patch.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- sources	7 Aug 2006 18:44:16 -0000	1.354
+++ sources	15 Aug 2006 11:05:16 -0000	1.355
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-5f0d888de4286f08e5661e81b95c69a8  xen-20060708.tar.bz2
 791940106e40ff60fa1756e29f7b0488  patch-2.6.17.8.bz2
+71780125173fe1359fec8dabfbd0bc45  xen-11061.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- .cvsignore	7 Aug 2006 18:44:45 -0000	1.414
+++ .cvsignore	15 Aug 2006 11:05:16 -0000	1.415
@@ -2,6 +2,6 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-xen-20060708.tar.bz2
 patch-2.6.17.8.bz2
 clog
+xen-11061.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 11:07:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 07:07:46 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2175,
	1.2176 linux-2.6-xen-compile-fixes.patch, 1.6,
	1.7 linux-2.6-xen.patch, 1.18, 1.19
Message-ID: <200608151107.k7FB7kOj001049@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec linux-2.6-xen-compile-fixes.patch 
	linux-2.6-xen.patch 
Log Message:
- linux-2.6-xen update
  * linux-2.6.17-xen cset 29030:888231795371
  * linux-2.6-xen cset 22813:80c2ccf5c330




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2175
retrieving revision 1.2176
diff -u -r1.2175 -r1.2176
--- kernel-2.6.spec	15 Aug 2006 11:05:16 -0000	1.2175
+++ kernel-2.6.spec	15 Aug 2006 11:07:39 -0000	1.2176
@@ -1538,6 +1538,9 @@
 
 %changelog
 * Tue Aug 15 2006 Juan Quintela <quintela at redhat.com>
+- linux-2.6-xen update
+  * linux-2.6.17-xen cset 29030:888231795371
+  * linux-2.6-xen cset 22813:80c2ccf5c330
 - s/xen_version/xen_hv_cset/ as Fedora.
 - update xen hv to cset 11061.
 

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +-
 drivers/block/aoe/aoenet.c                                   |    3 --
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 +
 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c            |    6 ----
 linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c                  |    2 -
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h        |   14 +++++++++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/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.17.noarch/include/asm-i386/mach-xen/asm/mmu.h      |    6 ++++
 14 files changed, 45 insertions(+), 12 deletions(-)

Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-xen-compile-fixes.patch	10 Jul 2006 12:25:28 -0000	1.6
+++ linux-2.6-xen-compile-fixes.patch	15 Aug 2006 11:07:39 -0000	1.7
@@ -26,6 +26,26 @@
  		return 0;
  
  	while (scan_more && instr < max_instr) { 
+--- linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/mmu.h.orig	2006-08-15 12:49:54.000000000 +0200
++++ linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/mmu.h	2006-08-15 12:54:33.000000000 +0200
+@@ -7,11 +7,17 @@
+  * we put the segment information here.
+  *
+  * cpu_vm_mask is used to optimize ldt flushing.
++ +
++ * exec_limit is used to track the range PROT_EXEC
++ * mappings span.
+  */
+ typedef struct { 
+ 	int size;
+ 	struct semaphore sem;
+ 	void *ldt;
++ 	struct desc_struct user_cs;
++ 	unsigned long exec_limit;
++ 	void *vdso;
+ #ifdef CONFIG_XEN
+ 	int has_foreign_mappings;
+ #endif
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/desc.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h
 --- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/desc.h	2006-02-22 15:56:20.000000000 +0100
 +++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h	2006-02-22 18:46:35.000000000 +0100
@@ -50,28 +70,6 @@
  #endif /* !__ASSEMBLY__ */
  
  #endif
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/mmu.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h
---- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/mmu.h	2006-02-22 15:56:20.000000000 +0100
-+++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h	2006-02-22 18:17:34.000000000 +0100
-@@ -7,11 +7,18 @@
-  * we put the segment information here.
-  *
-  * cpu_vm_mask is used to optimize ldt flushing.
-+ +
-+ * exec_limit is used to track the range PROT_EXEC
-+ * mappings span.
-  */
- typedef struct { 
- 	int size;
- 	struct semaphore sem;
- 	void *ldt;
-+	struct desc_struct user_cs;
-+	unsigned long exec_limit;
-+	void *vdso;
-+
- } mm_context_t;
- 
- /* mm/memory.c:exit_mmap hook */
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/pgalloc.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h
 --- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/pgalloc.h	2006-02-22 15:56:20.000000000 +0100
 +++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h	2006-02-22 18:17:59.000000000 +0100
@@ -197,36 +195,6 @@
  	return 0;
  }
  
-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 */
---- linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/e820.h.orig	2006-07-08 12:35:36.000000000 +0200
-+++ linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/e820.h	2006-07-08 12:36:25.000000000 +0200
-@@ -47,7 +47,8 @@
- extern unsigned long e820_end_of_ram(void);
- extern void e820_reserve_resources(struct e820entry *e820, int nr_map);
- extern void e820_print_map(char *who);
--extern int e820_mapped(unsigned long start, unsigned long end, unsigned type);
-+extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
-+extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);
- 
- extern void e820_bootmem_free(pg_data_t *pgdat, unsigned long start,unsigned long end);
- extern void e820_setup_gap(struct e820entry *e820, int nr_map);
 --- linux-2.6.17.work/drivers/block/aoe/aoenet.c	2006-06-18 03:49:35.000000000 +0200
 +++ linux-2.6.17.noarch/drivers/block/aoe/aoenet.c	2006-07-10 14:23:12.000000000 +0200
 @@ -116,8 +116,7 @@

linux-2.6-xen.patch:
 Documentation/networking/netdevices.txt             |    8 
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  614 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1116 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  734 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  478 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  700 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  542 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  112 
 arch/ia64/kernel/gate.lds.S                         |   23 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  255 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   79 
 arch/ia64/kernel/setup.c                            |   77 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  414 +++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  116 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   55 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   62 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  753 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  159 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1710 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  690 +++++
 arch/x86_64/mm/init-xen.c                           | 1202 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  397 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/infiniband/ulp/ipoib/ipoib_multicast.c      |    6 
 drivers/media/dvb/dvb-core/dvb_net.c                |    4 
 drivers/net/8139cp.c                                |    2 
 drivers/net/bnx2.c                                  |    8 
 drivers/net/bonding/bond_main.c                     |    9 
 drivers/net/chelsio/sge.c                           |    4 
 drivers/net/e1000/e1000_main.c                      |   11 
 drivers/net/forcedeth.c                             |   26 
 drivers/net/hamradio/6pack.c                        |    8 
 drivers/net/hamradio/mkiss.c                        |    8 
 drivers/net/ifb.c                                   |   10 
 drivers/net/irda/vlsi_ir.c                          |    2 
 drivers/net/ixgb/ixgb_main.c                        |    4 
 drivers/net/loopback.c                              |    4 
 drivers/net/mv643xx_eth.c                           |    2 
 drivers/net/natsemi.c                               |    4 
 drivers/net/r8169.c                                 |    2 
 drivers/net/s2io.c                                  |   16 
 drivers/net/sky2.c                                  |    4 
 drivers/net/tg3.c                                   |    4 
 drivers/net/tulip/winbond-840.c                     |    9 
 drivers/net/typhoon.c                               |    6 
 drivers/net/via-velocity.c                          |   10 
 drivers/net/wireless/orinoco.c                      |    4 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  201 +
 drivers/pci/Kconfig                                 |    1 
 drivers/s390/net/qeth_eddp.c                        |   12 
 drivers/s390/net/qeth_main.c                        |    8 
 drivers/s390/net/qeth_tso.h                         |    2 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  617 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  566 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1450 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  853 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  383 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  138 +
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1345 +++++++++
 drivers/xen/netback/xenbus.c                        |  428 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1841 +++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  457 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  286 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  359 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1142 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   77 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  220 +
 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                 |   28 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  109 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |  101 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-i386/spinlock.h                         |    2 
 include/asm-ia64/agp.h                              |   39 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  191 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  114 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  145 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  136 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/ethtool.h                             |    2 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/netdevice.h                           |   74 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   58 
 include/net/pkt_sched.h                             |    7 
 include/net/protocol.h                              |    3 
 include/net/sock.h                                  |    4 
 include/net/tcp.h                                   |    7 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  442 +++
 include/xen/interface/arch-powerpc.h                |  120 
 include/xen/interface/arch-x86_32.h                 |  234 +
 include/xen/interface/arch-x86_64.h                 |  300 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  605 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  512 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   77 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |   26 
 kernel/irq/spurious.c                               |    3 
 kernel/timer.c                                      |   16 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/atm/clip.c                                      |    8 
 net/bridge/br_device.c                              |    8 
 net/bridge/br_forward.c                             |    2 
 net/bridge/br_if.c                                  |   23 
 net/bridge/br_netfilter.c                           |    7 
 net/core/dev.c                                      |  284 +-
 net/core/dev_mcast.c                                |   28 
 net/core/ethtool.c                                  |   37 
 net/core/netpoll.c                                  |    9 
 net/core/pktgen.c                                   |    8 
 net/core/skbuff.c                                   |  181 +
 net/decnet/dn_nsp_in.c                              |    3 
 net/decnet/dn_route.c                               |    3 
 net/ipv4/af_inet.c                                  |   87 
 net/ipv4/ip_output.c                                |   18 
 net/ipv4/ipcomp.c                                   |   11 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   10 
 net/ipv4/tcp.c                                      |   86 
 net/ipv4/tcp_input.c                                |    2 
 net/ipv4/tcp_ipv4.c                                 |   18 
 net/ipv4/tcp_output.c                               |   47 
 net/ipv4/xfrm4_output.c                             |   60 
 net/ipv6/addrconf.c                                 |    2 
 net/ipv6/ip6_output.c                               |    7 
 net/ipv6/ipcomp6.c                                  |   11 
 net/ipv6/xfrm6_output.c                             |   39 
 net/sched/sch_generic.c                             |   66 
 net/sched/sch_teql.c                                |    9 
 scripts/Makefile.xen                                |   14 
 472 files changed, 87455 insertions(+), 622 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.18 -r 1.19 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-xen.patch	29 Jul 2006 18:20:08 -0000	1.18
+++ linux-2.6-xen.patch	15 Aug 2006 11:07:40 -0000	1.19
@@ -1,6 +1,6 @@
-diff --exclude=.hg -urNp linux-2.6/arch/i386/boot-xen/Makefile new/arch/i386/boot-xen/Makefile
---- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ new/arch/i386/boot-xen/Makefile	2006-05-09 12:32:33.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
+--- linux-2.6.17.8/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/boot-xen/Makefile	2006-08-13 14:43:06.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +23,9 @@
 +	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff --exclude=.hg -urNp linux-2.6/arch/i386/Kconfig new/arch/i386/Kconfig
---- linux-2.6/arch/i386/Kconfig	2006-07-03 14:14:14.000000000 +0200
-+++ new/arch/i386/Kconfig	2006-05-23 18:37:09.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/Kconfig compiling/arch/i386/Kconfig
+--- linux-2.6.17.8/arch/i386/Kconfig	2006-08-14 17:09:58.000000000 +0200
++++ compiling/arch/i386/Kconfig	2006-08-14 17:20:23.000000000 +0200
 @@ -91,6 +91,15 @@ config X86_PC
  	help
  	  Choose this option if your computer is a standard PC or compatible.
@@ -188,8 +188,8 @@
  	help
  	  kexec is a system call that implements the ability to shutdown your
  	  current kernel, and to start another kernel.  It is like a reboot
-@@ -767,18 +791,20 @@ endmenu
- 
+@@ -770,18 +794,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
+ 	depends on HIGHMEM
  
  menu "Power management options (ACPI, APM)"
 -	depends on !X86_VOYAGER
@@ -212,7 +212,7 @@
  	---help---
  	  APM is a BIOS specification for saving power using several different
  	  techniques. This is mostly useful for battery powered laptops with
-@@ -963,6 +989,7 @@ choice
+@@ -966,6 +992,7 @@ choice
  
  config PCI_GOBIOS
  	bool "BIOS"
@@ -220,7 +220,7 @@
  
  config PCI_GOMMCONFIG
  	bool "MMConfig"
-@@ -970,6 +997,13 @@ config PCI_GOMMCONFIG
+@@ -973,6 +1000,13 @@ config PCI_GOMMCONFIG
  config PCI_GODIRECT
  	bool "Direct"
  
@@ -234,7 +234,7 @@
  config PCI_GOANY
  	bool "Any"
  
-@@ -977,7 +1011,7 @@ endchoice
+@@ -980,7 +1014,7 @@ endchoice
  
  config PCI_BIOS
  	bool
@@ -243,7 +243,7 @@
  	default y
  
  config PCI_DIRECT
-@@ -990,6 +1024,18 @@ config PCI_MMCONFIG
+@@ -993,6 +1027,18 @@ config PCI_MMCONFIG
  	depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
  	default y
  
@@ -262,7 +262,7 @@
  source "drivers/pci/pcie/Kconfig"
  
  source "drivers/pci/Kconfig"
-@@ -1000,7 +1046,7 @@ config ISA_DMA_API
+@@ -1003,7 +1049,7 @@ config ISA_DMA_API
  
  config ISA
  	bool "ISA support"
@@ -271,7 +271,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
-@@ -1027,7 +1073,7 @@ config EISA
+@@ -1030,7 +1076,7 @@ config EISA
  source "drivers/eisa/Kconfig"
  
  config MCA
@@ -280,7 +280,7 @@
  	default y if X86_VOYAGER
  	help
  	  MicroChannel Architecture is found in some IBM PS/2 machines and
-@@ -1089,6 +1135,8 @@ source "security/Kconfig"
+@@ -1092,6 +1138,8 @@ source "security/Kconfig"
  
  source "crypto/Kconfig"
  
@@ -289,7 +289,7 @@
  source "lib/Kconfig"
  
  #
-@@ -1114,7 +1162,7 @@ config X86_SMP
+@@ -1117,7 +1165,7 @@ config X86_SMP
  
  config X86_HT
  	bool
@@ -298,7 +298,7 @@
  	default y
  
  config X86_BIOS_REBOOT
-@@ -1127,6 +1175,16 @@ config X86_TRAMPOLINE
+@@ -1130,6 +1178,16 @@ config X86_TRAMPOLINE
  	depends on X86_SMP || (X86_VOYAGER && SMP)
  	default y
  
@@ -315,9 +315,9 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff --exclude=.hg -urNp linux-2.6/arch/i386/Kconfig.cpu new/arch/i386/Kconfig.cpu
---- linux-2.6/arch/i386/Kconfig.cpu	2006-07-03 14:14:14.000000000 +0200
-+++ new/arch/i386/Kconfig.cpu	2006-05-09 12:32:33.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/Kconfig.cpu compiling/arch/i386/Kconfig.cpu
+--- linux-2.6.17.8/arch/i386/Kconfig.cpu	2006-06-18 03:49:35.000000000 +0200
++++ compiling/arch/i386/Kconfig.cpu	2006-08-13 14:43:06.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -327,9 +327,9 @@
  	default y
  
  config X86_WP_WORKS_OK
-diff --exclude=.hg -urNp linux-2.6/arch/i386/Kconfig.debug new/arch/i386/Kconfig.debug
---- linux-2.6/arch/i386/Kconfig.debug	2006-07-03 14:14:14.000000000 +0200
-+++ new/arch/i386/Kconfig.debug	2006-05-09 12:32:33.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/Kconfig.debug compiling/arch/i386/Kconfig.debug
+--- linux-2.6.17.8/arch/i386/Kconfig.debug	2006-06-18 03:49:35.000000000 +0200
++++ compiling/arch/i386/Kconfig.debug	2006-08-13 14:43:06.000000000 +0200
 @@ -84,6 +84,7 @@ config X86_MPPARSE
  config DOUBLEFAULT
  	default y
@@ -338,9 +338,9 @@
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/acpi/boot-xen.c new/arch/i386/kernel/acpi/boot-xen.c
---- linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/arch/i386/kernel/acpi/boot-xen.c	2006-05-23 18:37:09.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/kernel/acpi/boot-xen.c compiling/arch/i386/kernel/acpi/boot-xen.c
+--- linux-2.6.17.8/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/kernel/acpi/boot-xen.c	2006-08-13 14:43:06.000000000 +0200
 @@ -0,0 +1,1167 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1509,9 +1509,9 @@
 +
 +	return 0;
 +}
-diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/acpi/Makefile new/arch/i386/kernel/acpi/Makefile
---- linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-03 14:14:14.000000000 +0200
-+++ new/arch/i386/kernel/acpi/Makefile	2006-05-09 12:32:33.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/kernel/acpi/Makefile compiling/arch/i386/kernel/acpi/Makefile
+--- linux-2.6.17.8/arch/i386/kernel/acpi/Makefile	2006-06-18 03:49:35.000000000 +0200
++++ compiling/arch/i386/kernel/acpi/Makefile	2006-08-13 14:43:06.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1520,9 +1520,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/apic-xen.c new/arch/i386/kernel/apic-xen.c
---- linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ new/arch/i386/kernel/apic-xen.c	2006-05-09 12:32:33.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/kernel/apic-xen.c compiling/arch/i386/kernel/apic-xen.c
+--- linux-2.6.17.8/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/kernel/apic-xen.c	2006-08-13 14:43:06.000000000 +0200
 @@ -0,0 +1,160 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1684,9 +1684,9 @@
 +
 +	return 0;
 +}
-diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/asm-offsets.c new/arch/i386/kernel/asm-offsets.c
---- linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-03 14:14:14.000000000 +0200
-+++ new/arch/i386/kernel/asm-offsets.c	2006-05-09 12:32:34.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/kernel/asm-offsets.c compiling/arch/i386/kernel/asm-offsets.c
+--- linux-2.6.17.8/arch/i386/kernel/asm-offsets.c	2006-06-18 03:49:35.000000000 +0200
++++ compiling/arch/i386/kernel/asm-offsets.c	2006-08-13 14:43:06.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <asm/fixmap.h>
[...16155 lines suppressed...]
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv4/tcp.c compiling/net/ipv4/tcp.c
+--- linux-2.6.17.8/net/ipv4/tcp.c	2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/ipv4/tcp.c	2006-08-13 14:43:29.000000000 +0200
 @@ -258,6 +258,7 @@
  #include <linux/random.h>
  #include <linux/bootmem.h>
@@ -89267,9 +92984,9 @@
  extern void __skb_cb_too_small_for_tcp(int, int);
  extern struct tcp_congestion_ops tcp_reno;
  
-diff --exclude=.hg -urNp linux-2.6/net/ipv4/tcp_input.c new/net/ipv4/tcp_input.c
---- linux-2.6/net/ipv4/tcp_input.c	2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv4/tcp_input.c	2006-07-07 16:21:07.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv4/tcp_input.c compiling/net/ipv4/tcp_input.c
+--- linux-2.6.17.8/net/ipv4/tcp_input.c	2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/ipv4/tcp_input.c	2006-08-13 14:43:29.000000000 +0200
 @@ -1072,7 +1072,7 @@ tcp_sacktag_write_queue(struct sock *sk,
  				else
  					pkt_len = (end_seq -
@@ -89279,9 +92996,37 @@
  					break;
  				pcount = tcp_skb_pcount(skb);
  			}
-diff --exclude=.hg -urNp linux-2.6/net/ipv4/tcp_output.c new/net/ipv4/tcp_output.c
---- linux-2.6/net/ipv4/tcp_output.c	2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv4/tcp_output.c	2006-07-07 16:21:08.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv4/tcp_ipv4.c compiling/net/ipv4/tcp_ipv4.c
+--- linux-2.6.17.8/net/ipv4/tcp_ipv4.c	2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/ipv4/tcp_ipv4.c	2006-08-15 11:12:41.000000000 +0200
+@@ -495,6 +495,24 @@ void tcp_v4_send_check(struct sock *sk, 
+ 	}
+ }
+ 
++int tcp_v4_gso_send_check(struct sk_buff *skb)
++{
++	struct iphdr *iph;
++	struct tcphdr *th;
++
++	if (!pskb_may_pull(skb, sizeof(*th)))
++		return -EINVAL;
++
++	iph = skb->nh.iph;
++	th = skb->h.th;
++
++	th->check = 0;
++	th->check = ~tcp_v4_check(th, skb->len, iph->saddr, iph->daddr, 0);
++	skb->csum = offsetof(struct tcphdr, check);
++	skb->ip_summed = CHECKSUM_HW;
++	return 0;
++}
++
+ /*
+  *	This routine will send an RST to the other tcp.
+  *
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv4/tcp_output.c compiling/net/ipv4/tcp_output.c
+--- linux-2.6.17.8/net/ipv4/tcp_output.c	2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/ipv4/tcp_output.c	2006-08-13 14:43:29.000000000 +0200
 @@ -511,15 +511,17 @@ static void tcp_set_skb_tso_segs(struct 
  		/* Avoid the costly divide in the normal
  		 * non-TSO case.
@@ -89397,9 +93142,9 @@
  
  	/* Use a previous sequence.  This should cause the other
  	 * end to send an ack.  Don't queue or clone SKB, just
-diff --exclude=.hg -urNp linux-2.6/net/ipv4/xfrm4_output.c new/net/ipv4/xfrm4_output.c
---- linux-2.6/net/ipv4/xfrm4_output.c	2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv4/xfrm4_output.c	2006-07-07 16:21:08.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
+--- linux-2.6.17.8/net/ipv4/xfrm4_output.c	2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/ipv4/xfrm4_output.c	2006-08-15 11:12:41.000000000 +0200
 @@ -9,6 +9,8 @@
   */
  
@@ -89471,7 +93216,7 @@
 +	}
 +#endif
 +
-+	if (!skb_shinfo(skb)->gso_size)
++	if (!skb_is_gso(skb))
 +		return xfrm4_output_finish2(skb);
 +
 +	skb->protocol = htons(ETH_P_IP);
@@ -89505,10 +93250,10 @@
  int xfrm4_output(struct sk_buff *skb)
  {
  	return NF_HOOK_COND(PF_INET, NF_IP_POST_ROUTING, skb, NULL, skb->dst->dev,
-diff --exclude=.hg -urNp linux-2.6/net/ipv6/addrconf.c new/net/ipv6/addrconf.c
---- linux-2.6/net/ipv6/addrconf.c	2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv6/addrconf.c	2006-06-28 14:32:14.000000000 +0200
-@@ -2461,6 +2461,7 @@ static void addrconf_dad_start(struct in
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
+--- linux-2.6.17.8/net/ipv6/addrconf.c	2006-08-14 17:09:58.000000000 +0200
++++ compiling/net/ipv6/addrconf.c	2006-08-14 17:20:23.000000000 +0200
+@@ -2470,6 +2470,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  
  	if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
@@ -89516,7 +93261,7 @@
  	    !(ifp->flags&IFA_F_TENTATIVE)) {
  		ifp->flags &= ~IFA_F_TENTATIVE;
  		spin_unlock_bh(&ifp->lock);
-@@ -2545,6 +2546,7 @@ static void addrconf_dad_completed(struc
+@@ -2554,6 +2555,7 @@ static void addrconf_dad_completed(struc
  	if (ifp->idev->cnf.forwarding == 0 &&
  	    ifp->idev->cnf.rtr_solicits > 0 &&
  	    (dev->flags&IFF_LOOPBACK) == 0 &&
@@ -89524,15 +93269,15 @@
  	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
  		struct in6_addr all_routers;
  
-diff --exclude=.hg -urNp linux-2.6/net/ipv6/ip6_output.c new/net/ipv6/ip6_output.c
---- linux-2.6/net/ipv6/ip6_output.c	2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv6/ip6_output.c	2006-07-07 16:21:08.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv6/ip6_output.c compiling/net/ipv6/ip6_output.c
+--- linux-2.6.17.8/net/ipv6/ip6_output.c	2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/ipv6/ip6_output.c	2006-08-15 11:12:41.000000000 +0200
 @@ -147,7 +147,7 @@ static int ip6_output2(struct sk_buff *s
  
  int ip6_output(struct sk_buff *skb)
  {
 -	if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->ufo_size) ||
-+	if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->gso_size) ||
++	if ((skb->len > dst_mtu(skb->dst) && !skb_is_gso(skb)) ||
  				dst_allfrag(skb->dst))
  		return ip6_fragment(skb, ip6_output2);
  	else
@@ -89548,9 +93293,9 @@
  		ipv6_select_ident(skb, &fhdr);
  		skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
  		__skb_queue_tail(&sk->sk_write_queue, skb);
-diff --exclude=.hg -urNp linux-2.6/net/ipv6/ipcomp6.c new/net/ipv6/ipcomp6.c
---- linux-2.6/net/ipv6/ipcomp6.c	2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv6/ipcomp6.c	2006-07-07 16:21:08.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv6/ipcomp6.c compiling/net/ipv6/ipcomp6.c
+--- linux-2.6.17.8/net/ipv6/ipcomp6.c	2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/ipv6/ipcomp6.c	2006-08-13 14:43:29.000000000 +0200
 @@ -65,7 +65,7 @@ static LIST_HEAD(ipcomp6_tfms_list);
  
  static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb)
@@ -89585,9 +93330,9 @@
  
  	/* compression */
  	plen = skb->len - hdr_len;
-diff --exclude=.hg -urNp linux-2.6/net/ipv6/xfrm6_output.c new/net/ipv6/xfrm6_output.c
---- linux-2.6/net/ipv6/xfrm6_output.c	2006-07-03 14:15:22.000000000 +0200
-+++ new/net/ipv6/xfrm6_output.c	2006-07-07 15:10:03.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/ipv6/xfrm6_output.c compiling/net/ipv6/xfrm6_output.c
+--- linux-2.6.17.8/net/ipv6/xfrm6_output.c	2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/ipv6/xfrm6_output.c	2006-08-15 11:08:12.000000000 +0200
 @@ -151,7 +151,7 @@ error_nolock:
  	goto out_exit;
  }
@@ -89614,7 +93359,7 @@
 +{
 +	struct sk_buff *segs;
 +
-+	if (!skb_shinfo(skb)->gso_size)
++	if (!skb_is_gso(skb))
 +		return xfrm6_output_finish2(skb);
 +
 +	skb->protocol = htons(ETH_P_IP);
@@ -89648,9 +93393,9 @@
  int xfrm6_output(struct sk_buff *skb)
  {
  	return NF_HOOK(PF_INET6, NF_IP6_POST_ROUTING, skb, NULL, skb->dst->dev,
-diff --exclude=.hg -urNp linux-2.6/net/sched/sch_generic.c new/net/sched/sch_generic.c
---- linux-2.6/net/sched/sch_generic.c	2006-07-03 14:15:23.000000000 +0200
-+++ new/net/sched/sch_generic.c	2006-07-07 17:21:02.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/sched/sch_generic.c compiling/net/sched/sch_generic.c
+--- linux-2.6.17.8/net/sched/sch_generic.c	2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/sched/sch_generic.c	2006-08-13 14:43:30.000000000 +0200
 @@ -72,9 +72,9 @@ void qdisc_unlock_tree(struct net_device
     dev->queue_lock serializes queue accesses for this device
     AND dev->qdisc pointer itself.
@@ -89823,9 +93568,9 @@
 -EXPORT_SYMBOL(qdisc_restart);
  EXPORT_SYMBOL(qdisc_lock_tree);
  EXPORT_SYMBOL(qdisc_unlock_tree);
-diff --exclude=.hg -urNp linux-2.6/net/sched/sch_teql.c new/net/sched/sch_teql.c
---- linux-2.6/net/sched/sch_teql.c	2006-07-03 14:15:23.000000000 +0200
-+++ new/net/sched/sch_teql.c	2006-07-07 15:10:03.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/net/sched/sch_teql.c compiling/net/sched/sch_teql.c
+--- linux-2.6.17.8/net/sched/sch_teql.c	2006-06-18 03:49:35.000000000 +0200
++++ compiling/net/sched/sch_teql.c	2006-08-13 14:43:30.000000000 +0200
 @@ -302,20 +302,17 @@ restart:
  
  		switch (teql_resolve(skb, skb_res, slave)) {
@@ -89850,9 +93595,9 @@
  			}
  			if (netif_queue_stopped(dev))
  				busy = 1;
-diff --exclude=.hg -urNp linux-2.6/scripts/Makefile.xen new/scripts/Makefile.xen
---- linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ new/scripts/Makefile.xen	2006-05-09 12:40:15.000000000 +0200
+diff -urNp --exclude='.hg*' linux-2.6.17.8/scripts/Makefile.xen compiling/scripts/Makefile.xen
+--- linux-2.6.17.8/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ compiling/scripts/Makefile.xen	2006-08-13 14:43:30.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)



From fedora-cvs-commits at redhat.com  Tue Aug 15 11:20:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 07:20:30 -0400
Subject: rpms/logwatch/devel logwatch.spec,1.40,1.41
Message-ID: <200608151120.k7FBKUAw019852@cvs.devel.redhat.com>

Author: mmaslano

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

Modified Files:
	logwatch.spec 
Log Message:
Changes in spec file.



Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- logwatch.spec	15 Aug 2006 09:52:46 -0000	1.40
+++ logwatch.spec	15 Aug 2006 11:20:27 -0000	1.41
@@ -137,7 +137,9 @@
 
 %changelog
 * Mon Aug 14 2006 Marcela Maslanova <mmaslano at redhat.com> 7.3-4
-- added another audit patch for SElinux (#200116)
+- add audit patch for SElinux (#200116)
+- add patch for sshd (#200105)
+- add patch from bugzilla, made by Allen Kistler (#200147)
 
 * Fri Jun 23 2006 Ivana Varekova <varekova at redhat.com> 7.3-3
 - added secure-service patch



From fedora-cvs-commits at redhat.com  Tue Aug 15 12:23:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 08:23:42 -0400
Subject: rpms/rwho/devel netkit-rwho-0.17-waitchild.patch, NONE,
	1.1 rwho.spec, 1.17, 1.18
Message-ID: <200608151223.k7FCNgx7003466@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/rwho/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3418

Modified Files:
	rwho.spec 
Added Files:
	netkit-rwho-0.17-waitchild.patch 
Log Message:
- exit daemon, if child process dies (bug #202493)


netkit-rwho-0.17-waitchild.patch:
 rwhod.c |   10 ++++++++++
 1 files changed, 10 insertions(+)

--- NEW FILE netkit-rwho-0.17-waitchild.patch ---
--- netkit-rwho-0.17/rwhod/rwhod.c.waitchild	2006-08-15 14:20:01.000000000 +0200
+++ netkit-rwho-0.17/rwhod/rwhod.c	2006-08-15 14:20:28.000000000 +0200
@@ -125,6 +125,7 @@
 
 static void huphandler(int);
 static void termhandler(int);
+static void childhandler(int);
 static void sendpacket(struct whod *);
 static void getboottime(struct whod *);
 
@@ -213,6 +214,7 @@
 	(void) umask(022);
 
 	signal(SIGTERM, termhandler);
+	signal(SIGCHLD, childhandler);
 	child_pid = fork();
 	if (child_pid < 0) {
 		syslog(LOG_ERR, "fork: %m");
@@ -332,6 +334,14 @@
 	exit(0);
 }
 
+static void
+childhandler(int dummy)
+{
+        (void) dummy;
+        exit(0);
+}
+
+
 /*
  * Obtain boot time again
  */


Index: rwho.spec
===================================================================
RCS file: /cvs/dist/rpms/rwho/devel/rwho.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rwho.spec	12 Jul 2006 08:05:15 -0000	1.17
+++ rwho.spec	15 Aug 2006 12:23:38 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Displays who is logged in to local network machines.
 Name: rwho
 Version: 0.17
-Release: 25.2.2
+Release: 26
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rwho-%{version}.tar.gz
@@ -15,6 +15,7 @@
 Patch6: netkit-rwho-0.17-wd_we.patch
 Patch7: netkit-rwho-0.17-time.patch
 Patch8: netkit-rwho-0.17-gcc4.patch
+Patch9: netkit-rwho-0.17-waitchild.patch
 Requires: /sbin/chkconfig /etc/init.d
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -37,6 +38,7 @@
 %patch6 -p1 -b .wd_we
 %patch7 -p1 -b .time
 %patch8 -p1 -b .gcc4
+%patch9 -p1 -b .waitchild
 
 %build
 sh configure --with-c-compiler=gcc
@@ -98,6 +100,9 @@
 %config /etc/rc.d/init.d/rwhod
 
 %changelog
+* Tue Aug 15 2006 Harald Hoyer <harald at redhat.com> - 0.17-26
+- exit daemon, if child process dies (bug #202493)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 13:17:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 09:17:18 -0400
Subject: rpms/libvte-java/devel libvte-java-alias.patch, NONE,
	1.1 libvte-java.spec, 1.24, 1.25
Message-ID: <200608151317.k7FDHIwI016329@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15813

Modified Files:
	libvte-java.spec 
Added Files:
	libvte-java-alias.patch 
Log Message:
- Add libvte-java-alias.patch, which reimplements the old methods,
  with a typo in their name.


libvte-java-alias.patch:
 Terminal.java |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE libvte-java-alias.patch ---
? libvte-java-alias-patch.diff
Index: src/java/org/gnu/gnomevte/Terminal.java
===================================================================
RCS file: /cvs/gnome/libvte-java/src/java/org/gnu/gnomevte/Terminal.java,v
retrieving revision 1.13
diff -u -r1.13 Terminal.java
--- src/java/org/gnu/gnomevte/Terminal.java	19 Jul 2006 15:37:54 -0000	1.13
+++ src/java/org/gnu/gnomevte/Terminal.java	14 Aug 2006 17:27:32 -0000
@@ -263,6 +263,10 @@
 			throw new FileNotFoundException();
 	}
 		
+    public void setBackgroudImage(String file) throws FileNotFoundException{
+	setBackgroundImage(file);
+    }
+
 	/**
 	 * Sets the background image for the widget.  Text which would otherwise 
 	 * be drawn using the default background color will instead be drawn 
@@ -320,6 +324,10 @@
 	public void setBackgroundColor(Color color) {
 		vte_terminal_set_color_background(getHandle(), color.getHandle());
 	}	
+
+    public void setBackgroudColor(Color color) {
+	setBackgroundColor(color);
+    }
 
 	/**
 	 * Sets the foreground color used to draw normal text


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libvte-java.spec	13 Aug 2006 20:55:57 -0000	1.24
+++ libvte-java.spec	15 Aug 2006 13:17:15 -0000	1.25
@@ -1,13 +1,15 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
 Version:   0.12.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
 License:   LGPL
 Group:     Development/Libraries
 BuildRoot: %{_tmppath}/libvte-java
 
+Patch:	libvte-java-alias.patch
+
 Requires: 	glib-java >= 0.2.4
 Requires:	libgtk-java >= 2.8.4
 Requires:	vte >= 0.12.1
@@ -34,7 +36,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q -n %{name}-%{version}
-
+%patch
 
 %build
 %configure 
@@ -93,6 +95,10 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Aug 15 2006 Stepan Kasal <skasal at redhat.com> - 0.12.1-2
+- Add libvte-java-alias.patch, which reimplements the old methods,
+  with a typo in their name.
+
 * Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 0.12.1-1
 - New upstream version.
 - Use the %%{?dist} tag.



From fedora-cvs-commits at redhat.com  Tue Aug 15 13:25:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 09:25:12 -0400
Subject: rpms/gnome-panel/devel gnome-panel-2.15.91-use-beagle.patch, NONE,
	1.1 gnome-panel.spec, 1.142, 1.143
Message-ID: <200608151325.k7FDPCC9023750@cvs.devel.redhat.com>

Author: alexl

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.15.91-use-beagle.patch 
Log Message:
* Fri Aug 15 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-2.fc6
- Also use beagle for search actions (#201424)



gnome-panel-2.15.91-use-beagle.patch:
 panel-action-button.c |   15 +++++++++++----
 panel-menu-items.c    |   12 +++++++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

--- NEW FILE gnome-panel-2.15.91-use-beagle.patch ---
--- gnome-panel-2.15.91/gnome-panel/panel-menu-items.c.use-beagle	2006-08-15 14:43:43.000000000 +0200
+++ gnome-panel-2.15.91/gnome-panel/panel-menu-items.c	2006-08-15 14:43:43.000000000 +0200
@@ -615,9 +615,15 @@
 
 	add_menu_separator (places_menu);
 
-	panel_menu_items_append_from_desktop (places_menu,
-					      "gnome-search-tool.desktop",
-					      NULL);
+        if (panel_is_program_in_path ("beagle-search")) {
+              panel_menu_items_append_from_desktop (places_menu,
+                                                    "gnome-beagle-search.desktop",
+                                                    NULL);
+        } else {
+              panel_menu_items_append_from_desktop (places_menu,
+                                                    "gnome-search-tool.desktop",
+                                                    NULL);
+        }
 
 	panel_recent_append_documents_menu (places_menu,
 					    place_item->priv->recent_manager);
--- gnome-panel-2.15.91/gnome-panel/panel-action-button.c.use-beagle	2006-08-07 23:07:46.000000000 +0200
+++ gnome-panel-2.15.91/gnome-panel/panel-action-button.c	2006-08-15 14:46:11.000000000 +0200
@@ -191,10 +191,17 @@
 	GError    *error = NULL;
 
 	screen = gtk_widget_get_screen (widget);
-	panel_launch_desktop_file ("gnome-search-tool.desktop",
-				   "gnome-search-tool",
-				   screen,
-				   &error);
+        if (panel_is_program_in_path ("beagle-search")) {
+		panel_launch_desktop_file ("gnome-beagle-search.desktop",
+					   "beagle-search",
+					   screen,
+					   &error);
+	} else {
+		panel_launch_desktop_file ("gnome-search-tool.desktop",
+					   "gnome-search-tool",
+					   screen,
+					   &error);
+	}
 	if (error) {
 		char *primary;
 		primary = g_strdup_printf (_("Could not execute '%s'"),


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- gnome-panel.spec	13 Aug 2006 06:06:34 -0000	1.142
+++ gnome-panel.spec	15 Aug 2006 13:25:08 -0000	1.143
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.15.91
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 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
@@ -73,7 +73,7 @@
 Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
 Patch5: gnome-panel-2.12.1-about-fedora.patch
 Patch6: gnome-panel-2.13.5-switch-user.patch
-Patch8: gnome-panel-2.13.90-use-beagle.patch
+Patch8: gnome-panel-2.15.91-use-beagle.patch
 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
 Patch10: gnome-panel-2.14.1-remove-duplicate-entry.patch
 # support transparent background in the notification area
@@ -229,6 +229,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Aug 15 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-2.fc6
+- Also use beagle for search actions (#201424)
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 13:25:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 09:25:38 -0400
Subject: rpms/libvte-java/FC-5 libvte-java-alias.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 libvte-java.spec, 1.14, 1.15 sources, 1.4, 1.5
Message-ID: <200608151325.k7FDPch1023809@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23763

Modified Files:
	.cvsignore libvte-java.spec sources 
Added Files:
	libvte-java-alias.patch 
Log Message:
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel subpackage.
- The -devel subpackage now requires several -devel packages.
- Add libvte-java-alias.patch, which reimplements the old methods,
  with a typo in their name.


libvte-java-alias.patch:
 Terminal.java |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE libvte-java-alias.patch ---
? libvte-java-alias-patch.diff
Index: src/java/org/gnu/gnomevte/Terminal.java
===================================================================
RCS file: /cvs/gnome/libvte-java/src/java/org/gnu/gnomevte/Terminal.java,v
retrieving revision 1.13
diff -u -r1.13 Terminal.java
--- src/java/org/gnu/gnomevte/Terminal.java	19 Jul 2006 15:37:54 -0000	1.13
+++ src/java/org/gnu/gnomevte/Terminal.java	14 Aug 2006 17:27:32 -0000
@@ -263,6 +263,10 @@
 			throw new FileNotFoundException();
 	}
 		
+    public void setBackgroudImage(String file) throws FileNotFoundException{
+	setBackgroundImage(file);
+    }
+
 	/**
 	 * Sets the background image for the widget.  Text which would otherwise 
 	 * be drawn using the default background color will instead be drawn 
@@ -320,6 +324,10 @@
 	public void setBackgroundColor(Color color) {
 		vte_terminal_set_color_background(getHandle(), color.getHandle());
 	}	
+
+    public void setBackgroudColor(Color color) {
+	setBackgroundColor(color);
+    }
 
 	/**
 	 * Sets the foreground color used to draw normal text


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jun 2006 22:25:00 -0000	1.4
+++ .cvsignore	15 Aug 2006 13:25:32 -0000	1.5
@@ -1 +1 @@
-libvte-java-0.12.0.tar.bz2
+libvte-java-0.12.1.tar.bz2


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/FC-5/libvte-java.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libvte-java.spec	12 Jul 2006 15:49:56 -0000	1.14
+++ libvte-java.spec	15 Aug 2006 13:25:35 -0000	1.15
@@ -1,15 +1,15 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
-Version:   0.12.0
-Release:   0.fc5.1
+Version:   0.12.1
+Release:   2%{?dist}
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
 License:   LGPL
 Group:     Development/Libraries
 BuildRoot: %{_tmppath}/libvte-java
 
+Patch:	libvte-java-alias.patch
 
-Requires: 	/sbin/ldconfig
 Requires: 	glib-java >= 0.2.4
 Requires:	libgtk-java >= 2.8.4
 Requires:	vte >= 0.12.1
@@ -26,18 +26,17 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	vte-devel, libgtk-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
-
+Development part of %{name}.
 
 
 %prep
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q -n %{name}-%{version}
-
+%patch
 
 %build
 %configure 
@@ -46,7 +45,7 @@
 sed -i 's/^pic_flag=\"\"/pic_flag=\"\ \-fPIC\"/' libtool
 sed -i 's/^compiler_c_o=\"no\"/compiler_c_o=\"yes\"/' libtool
 
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -61,7 +60,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make  DESTDIR=$RPM_BUILD_ROOT  install 
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install 
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name}' != 'x%{name}' ] ; then
@@ -88,14 +87,28 @@
 %doc doc/api AUTHORS ChangeLog COPYING INSTALL NEWS README 
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Aug 15 2006 Stepan Kasal <skasal at redhat.com> - 0.12.1-2
+- Add libvte-java-alias.patch, which reimplements the old methods,
+  with a typo in their name.
+
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 0.12.1-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel subpackage.
+- The -devel subpackage now requires several -devel packages.
+
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.12.0-2
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.12.0-1
 - Release 0 is not allowed.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jun 2006 22:25:00 -0000	1.4
+++ sources	15 Aug 2006 13:25:35 -0000	1.5
@@ -1 +1 @@
-e5e5e63bb2615a3df3fa38d80616b005  libvte-java-0.12.0.tar.bz2
+9d1d28710614910c80486b3bcdf08ae6  libvte-java-0.12.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 13:29:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 09:29:10 -0400
Subject: rpms/libgconf-java/FC-5 .cvsignore, 1.12, 1.13 libgconf-java.spec,
	1.24, 1.25 sources, 1.13, 1.14
Message-ID: <200608151329.k7FDTAjE023937@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23905

Modified Files:
	.cvsignore libgconf-java.spec sources 
Log Message:
- BuildRequire docbook-utils and java-1.4.2-gcj-compat-devel
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move the pkgconfig file to the devel package.
- The -devel subpackage now requires several -devel packages.
- Update requires and buildrequires.
- Remove macros c_pkg_prefix and java_pkg_prefix and the code for optional
  instalation under /opt/frysk prefix.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	12 Jul 2006 15:56:24 -0000	1.12
+++ .cvsignore	15 Aug 2006 13:29:08 -0000	1.13
@@ -1 +1 @@
-libgconf-java-2.12.3.tar.bz2
+libgconf-java-2.12.4.tar.bz2


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/FC-5/libgconf-java.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libgconf-java.spec	12 Jul 2006 15:56:24 -0000	1.24
+++ libgconf-java.spec	15 Aug 2006 13:29:08 -0000	1.25
@@ -1,21 +1,9 @@
-# install these packages into /opt if we have a prefix defined for the
-# java packages
-%{?java_pkg_prefix: %define _prefix /opt/frysk }
-%{?java_pkg_prefix: %define _sysconfdir %{_prefix}/etc }
-%{?java_pkg_prefix: %define _localstatedir %{_prefix}/var }
-%{?java_pkg_prefix: %define _infodir %{_prefix}/share/info }
-%{?java_pkg_prefix: %define _mandir %{_prefix}/share/man }
-%{?java_pkg_prefix: %define _defaultdocdir %{_prefix}/share/doc }
-
-%{!?c_pkg_prefix: %define c_pkg_prefix %{nil}}
-%{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
-
 %define	name_base	libgconf-java
 
 Summary:	Java bindings for GConf
-Name:		%{java_pkg_prefix}%{name_base}
-Version:	2.12.3
-Release: 	1
+Name:		%{name_base}
+Version:	2.12.4
+Release: 	2%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -23,9 +11,16 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	GConf2 >= 2.11.2
-Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
-BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
+Requires:	glib-java >= 0.2.6
+BuildRequires:	glib-java-devel >= 0.2.6
 BuildRequires:  GConf2-devel >= 2.11.2, gcc-java >= 4.1.1
+BuildRequires:  docbook-utils
+# We need javadoc:
+BuildRequires:  java-1.4.2-gcj-compat-devel
+
+# Currently, the configure script checks for libgtk-java.
+# See gnome bugs #347254, #350931
+BuildRequires:	libgtk-java-devel >= 2.8.4
 
 %description
 libgconf-java is a language binding that allows developers to use the
@@ -35,23 +30,18 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	GConf2-devel
+Requires:	glib-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
+Development part of %{name}.
 
 %prep
 %setup -q -n %{name_base}-%{version}
 
 %build
-# if either the C or Java packages has a prefix declared, then we will
-# add /opt/frysk/lib/pkgconfig to the pkgconfig path
-if  [  'x%{java_pkg_prefix}' != 'x' ] || [ 'x%{c_pkg_prefix}' != 'x' ]; then
-        export PKG_CONFIG_PATH=/opt/frysk/lib/pkgconfig
-fi
-
 %configure
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -65,7 +55,7 @@
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name_base}' ] ; then
@@ -94,14 +84,34 @@
 %doc doc/api AUTHORS COPYING doc/examples NEWS README
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-2
+- Fix the description of the -devel package.
+
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- The -devel subpackage now requires several -devel packages.
+- Update requires and buildrequires.
+- Remove macros c_pkg_prefix and java_pkg_prefix and the code for optional
+  instalation under /opt/frysk prefix.
+
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.3-3
+- Bump release number. (dist-fc6-java)
+
+* Sun Jul 16 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-2
+- Move the pkgconfig file to the devel package.
+- BuildRequire docbook-utils and java-1.4.2-gcj-compat-devel
+- BuildReq gtk2-devel (a temporary workaround).
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1
 - New upstream version.
 - Build on s390x again.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Jul 2006 15:56:24 -0000	1.13
+++ sources	15 Aug 2006 13:29:08 -0000	1.14
@@ -1 +1 @@
-0498ac34333ddfc24b0b1b2e33ac8315  libgconf-java-2.12.3.tar.bz2
+ac9f8e35999cedcb2e9009032f0fe256  libgconf-java-2.12.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 14:06:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 10:06:25 -0400
Subject: rpms/system-config-network/devel .cvsignore, 1.17, 1.18 sources,
	1.19, 1.20 system-config-network.spec, 1.22, 1.23
Message-ID: <200608151406.k7FE6P6R024468@cvs.devel.redhat.com>

Author: harald

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

Modified Files:
	.cvsignore sources system-config-network.spec 
Log Message:
- translation update (bug #182650)
- added tui subdir (bug #202560)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	11 Aug 2006 13:22:38 -0000	1.17
+++ .cvsignore	15 Aug 2006 14:06:22 -0000	1.18
@@ -1 +1 @@
-system-config-network-1.3.92.tar.gz
+system-config-network-1.3.94.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	11 Aug 2006 13:22:38 -0000	1.19
+++ sources	15 Aug 2006 14:06:22 -0000	1.20
@@ -1 +1 @@
-b43c5e3a95910d2393f1893cbcf98162  system-config-network-1.3.92.tar.gz
+9f3c6d282af8f1a502bef011e93d5652  system-config-network-1.3.94.tar.gz


Index: system-config-network.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- system-config-network.spec	11 Aug 2006 13:22:38 -0000	1.22
+++ system-config-network.spec	15 Aug 2006 14:06:22 -0000	1.23
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: The GUI of the NEtwork Adminstration Tool
 Name: system-config-network
-Version: 1.3.92
+Version: 1.3.94
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html
 Source0: %{name}-%{version}.tar.gz
@@ -72,6 +72,7 @@
 %{_datadir}/system-config-network/*.py*
 %dir %{_datadir}/system-config-network
 %dir %{_datadir}/system-config-network/netconfpkg
+%{_datadir}/system-config-network/netconfpkg/tui
 %{_datadir}/system-config-network/netconfpkg/plugins
 %{_datadir}/system-config-network/netconfpkg/*.py*
 %{_datadir}/system-config-network/netconfpkg/*.idl
@@ -89,6 +90,12 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
+* Tue Aug 15 2006 Harald Hoyer <harald at redhat.com> - 1.3.94
+- translation update (bug #182650)
+
+* Tue Aug 15 2006 Harald Hoyer <harald at redhat.com> - 1.3.93
+- added tui subdir (bug #202560)
+
 * Fri Aug 11 2006 Harald Hoyer <harald at redhat.com> - 1.3.92
 - fixed #201659 
 - translation update



From fedora-cvs-commits at redhat.com  Tue Aug 15 14:18:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 10:18:50 -0400
Subject: rpms/numactl/devel numactl-node-cpubind.patch, NONE,
	1.1 numactl.spec, 1.32, 1.33 sources, 1.3,
	1.4 numactl-0.6.4-commonalias.patch, 1.1,
	NONE numactl-0.6.4-ppc.patch, 1.1,
	NONE numactl-64bit-cpu-mask.patch, 1.1,
	NONE numactl-64bit-overruns.patch, 1.1, NONE numactl-lib.patch,
	1.1, NONE
Message-ID: <200608151418.k7FEIocT010271@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/numactl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10243

Modified Files:
	numactl.spec sources 
Added Files:
	numactl-node-cpubind.patch 
Removed Files:
	numactl-0.6.4-commonalias.patch numactl-0.6.4-ppc.patch 
	numactl-64bit-cpu-mask.patch numactl-64bit-overruns.patch 
	numactl-lib.patch 
Log Message:
cleaning up/fixing bz 201906

numactl-node-cpubind.patch:
 libnuma.c |  196 +++++++++++++++++++++++++++-----------------------------------
 1 files changed, 87 insertions(+), 109 deletions(-)

--- NEW FILE numactl-node-cpubind.patch ---
--- numactl-0.9.8/libnuma.c.orig	2006-08-14 14:14:31.000000000 -0400
+++ numactl-0.9.8/libnuma.c	2006-08-14 14:14:37.000000000 -0400
@@ -118,58 +118,28 @@
 static int maxnode = -1; 
 static int maxcpus = -1; 
 
-static int number_of_cpus(void)
+static int number_of_configured_cpus(void)
 { 
-	char *line = NULL;
-	size_t len = 0;
-	char *s;
-	FILE *f;
-	int cpu;
-	
+	int len = 16; 
+	int n;
+	int olde = errno;
+
 	if (maxcpus >= 0) 
 		return maxcpus + 1;
 
-	f = fopen("/proc/cpuinfo","r"); 
-	if (!f) {
-		int n;
-		int len = 8192; 
-		for (;;) { 
-			unsigned long buffer[CPU_LONGS(len)];
-			memset(buffer, 0, sizeof(buffer));
-			n = numa_sched_getaffinity_int(0, CPU_BYTES(len), 
-						       buffer);
-			if (n < 0 && errno == EINVAL && len < 1024*1024) {
-				len *= 2;
-				continue;
-			}
-			if (n >= 0) { 
-				int i, k;
-				for (i = 0; i < n / sizeof(long); i++) {
-					if (!buffer[i])
-						continue;
-					for (k = 0; k< 8; k++) 
-						if (buffer[i] & (1<<k))
-							maxcpus = i*sizeof(long)+k;
-				}
-				return maxcpus;
-			}
-			break;
-		}
-		numa_warn(W_noproc, "/proc not mounted. Assuming zero nodes: %s", 
-			  strerror(errno)); 
-		return 0;
-	}
-	maxcpus = 0;
-	while (getdelim(&line, &len, '\n', f) > 0) { 
-		if (strncmp(line,"processor",9))
+	do { 
+		unsigned long buffer[CPU_LONGS(len)];
+		memset(buffer, 0, sizeof(buffer));
+		n = numa_sched_getaffinity_int(0, CPU_BYTES(len), buffer);
+		if (n < 0 && errno == EINVAL) {
+			if (len >= 1024*1024) 
+				break;
+			len *= 2;
 			continue;
-		s = line + strcspn(line, "0123456789"); 
-		if (sscanf(s, "%d", &cpu) == 1 && cpu > maxcpus) 
-			maxcpus = cpu;
-	} 
-	free(line);
-	fclose(f); 
-	return maxcpus + 1;
+		}
+	} while (n < 0);
+	errno = olde;
+	return len;
 } 
 
 static int fallback_max_node(void)
@@ -428,32 +398,67 @@
 
 static unsigned long *node_cpu_mask[NUMA_NUM_NODES];  
 
+static void bad_cpumap(int ncpus, unsigned long *mask)
+{
+	int n;
+	for (n = 0; n < ncpus; n++)
+		set_bit(n, mask);
+}
+
+int numa_parse_bitmap(char *line, unsigned long *mask, int ncpus)
+{
+	int i;
+	char *p = strchr(line, '\n'); 
+	if (!p)
+		return -1;
+
+	for (i = 0; p > line;i++) {
+		char *oldp, *endp; 
+		oldp = p;
+		if (*p == ',') 
+			--p;
+		while (p > line && *p != ',')
+			--p;
+		/* Eat two 32bit fields at a time to get longs */
+		if (sizeof(unsigned long) == 8) {
+			oldp--;
+			memmove(p, p+1, oldp-p+1);
+			while (p > line && *p != ',')
+				--p;
+		}
+		if (*p == ',')
+			p++;
+		if (i >= CPU_LONGS(ncpus))
+			return -1;
+		mask[i] = strtoul(p, &endp, 16);
+		if (endp != oldp)
+			return -1;
+		p--;
+	}
+	return 0;
+}
+
 /* This would be better with some locking, but I don't want to make libnuma
    dependent on pthreads right now. The races are relatively harmless. */
 int numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen) 
 {
+	int err = 0;
 	char fn[64];
 	FILE *f; 
 	char *line = NULL; 
 	size_t len = 0; 
-	char *s;
-	int n;
 	int buflen_needed;
-	unsigned long *mask, prev;
-	int ncpus = number_of_cpus();
-	int i;
-	int mask_words;
-	int bits_in_mask_0;
+	unsigned long *mask;
+	int ncpus = number_of_configured_cpus();
 
 	buflen_needed = CPU_BYTES(ncpus);
 	if ((unsigned)node > maxnode || bufferlen < buflen_needed) { 
 		errno = ERANGE;
 		return -1;
 	}
-
+	if (bufferlen > buflen_needed)
+		memset(buffer, 0, bufferlen); 
 	if (node_cpu_mask[node]) { 
-		if (bufferlen > buflen_needed)
-			memset(buffer, 0, bufferlen); 
 		memcpy(buffer, node_cpu_mask[node], buflen_needed);
 		return 0;
 	}
@@ -462,73 +467,43 @@
 	if (!mask) 
 		mask = (unsigned long *)buffer; 
 	memset(mask, 0, buflen_needed); 
-			
+
 	sprintf(fn, "/sys/devices/system/node/node%d/cpumap", node); 
 	f = fopen(fn, "r"); 
 	if (!f || getdelim(&line, &len, '\n', f) < 1) { 
 		numa_warn(W_nosysfs2,
 		   "/sys not mounted or invalid. Assuming one node: %s",
 			  strerror(errno)); 
-		for (n = 0; n < ncpus; n++)
-			set_bit(n, (unsigned long *)mask);
-		goto out;
+		bad_cpumap(ncpus, mask);
+		err = -1;
 	} 
-        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(W_cpumap,
-                                  "Unexpected character `%c' in sysfs cpumap", 
-					s[i]);
-                        set_bit(node, mask);
-                        goto out;
-		}
+	if (f)
+		fclose(f);
 
-		/* 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 */
+	if (line && numa_parse_bitmap(line, mask, ncpus) < 0) {
+		numa_warn(W_cpumap, "Cannot parse cpumap. Assuming one node");
+		bad_cpumap(ncpus, mask);
+		err = -1;
 	}
- out:
- 	free(line);
-	if (f) 
-		fclose(f);
+
+	free(line);
 	memcpy(buffer, mask, buflen_needed);
 
 	/* slightly racy, see above */ 
 	if (node_cpu_mask[node]) {
-		if (mask != (unsigned long *)buffer)
+		if (mask != buffer)
 			free(mask); 	       
 	} else {
-		node_cpu_mask[node] = (unsigned long *)mask; 
+		node_cpu_mask[node] = mask; 
 	} 
-	return 0; 
+	return err; 
 } 
 
 make_internal_alias(numa_node_to_cpus);
 
 int numa_run_on_node_mask(const nodemask_t *mask)
 { 	
-	int ncpus = number_of_cpus();
+	int ncpus = number_of_configured_cpus();
 	int i, k, err;
 	unsigned long cpus[CPU_LONGS(ncpus)], nodecpus[CPU_LONGS(ncpus)];
 	memset(cpus, 0, CPU_BYTES(ncpus));
@@ -582,7 +557,7 @@
 
 nodemask_t numa_get_run_node_mask(void)
 { 
-	int ncpus = number_of_cpus();
+	int ncpus = number_of_configured_cpus();
 	nodemask_t mask;
 	int i, k;
 	int max = numa_max_node_int();
@@ -594,7 +569,7 @@
 		return numa_no_nodes; 
 	for (i = 0; i <= max; i++) {
 		if (numa_node_to_cpus_int(i, nodecpus, CPU_BYTES(ncpus)) < 0) {
-			numa_warn(W_noderunmask, "Cannot read node cpumask from sysfs");
+			/* It's possible for the node to not exist */
 			continue;
 		}
 		for (k = 0; k < CPU_LONGS(ncpus); k++) {
@@ -612,12 +587,15 @@
 
 int numa_run_on_node(int node)
 { 
-	int ncpus = number_of_cpus();
+	int ncpus = number_of_configured_cpus();
 	unsigned long cpus[CPU_LONGS(ncpus)];
 
-	if (node == -1)
-		memset(cpus, 0xff, CPU_BYTES(ncpus));
-	else if (node < NUMA_NUM_NODES) {
+	if (node == -1) {
+		int i;
+		memset(cpus, 0, CPU_BYTES(ncpus));
+		for (i = 0; i < ncpus; i++) 
+			cpus[i / BITS_PER_LONG] |= 1UL << (i%BITS_PER_LONG);
+	} else if (node < NUMA_NUM_NODES) {
 		if (numa_node_to_cpus_int(node, cpus, CPU_BYTES(ncpus)) < 0) {
 			numa_warn(W_noderunmask, "Cannot read node cpumask from sysfs");
 			return -1; 
@@ -649,7 +627,7 @@
 void numa_set_preferred(int node)
 { 
 	nodemask_t n;
-	if (node == -1) {
+	if (node < 0) {
 		nodemask_t empty;
 		nodemask_zero(&empty);
 		setpol(MPOL_DEFAULT, empty);


Index: numactl.spec
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- numactl.spec	12 Jul 2006 07:29:48 -0000	1.32
+++ numactl.spec	15 Aug 2006 14:18:47 -0000	1.33
@@ -10,11 +10,7 @@
 
 ExcludeArch: s390 s390x
 
-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
+Patch1: numactl-node-cpubind.patch
 
 %description
 Simple NUMA policy support. It consists of a numactl program to run
@@ -23,6 +19,7 @@
 
 %prep
 %setup -q -c -a 0
+%patch1
 
 %build
 cd numactl-%{version}
@@ -63,6 +60,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Aug 15 2006 Neil Horman <nhorman at redhat.com> - 0.9.8-1.32
+- add patch for broken cpu/nodebind output (bz 201906)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8-1.31
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jun 2006 14:58:47 -0000	1.3
+++ sources	15 Aug 2006 14:18:47 -0000	1.4
@@ -1,2 +1 @@
-4d79d74c69637e1d2a5d64dfc2662fab  numactl-0.6.4.tar.gz
 ebc1ed785733f5af9d4139cef32e1192  numactl-0.9.8.tar.gz


--- numactl-0.6.4-commonalias.patch DELETED ---


--- numactl-0.6.4-ppc.patch DELETED ---


--- numactl-64bit-cpu-mask.patch DELETED ---


--- numactl-64bit-overruns.patch DELETED ---


--- numactl-lib.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 15 14:44:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 10:44:18 -0400
Subject: rpms/redhat-artwork/devel .cvsignore, 1.77, 1.78 redhat-artwork.spec,
	1.144, 1.145 sources, 1.81, 1.82
Message-ID: <200608151444.k7FEiIU6017341@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore redhat-artwork.spec sources 
Log Message:
fix spinner icon size



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	11 Aug 2006 20:23:10 -0000	1.77
+++ .cvsignore	15 Aug 2006 14:44:15 -0000	1.78
@@ -1,3 +1,4 @@
 redhat-artwork-5.0.0.tar.gz
 RHEL-gdm-theme-0.2.tar.gz
 post-install-sources.tar.gz
+redhat-artwork-5.0.1.tar.gz


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- redhat-artwork.spec	13 Aug 2006 01:47:06 -0000	1.144
+++ redhat-artwork.spec	15 Aug 2006 14:44:15 -0000	1.145
@@ -3,8 +3,8 @@
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
-Version: 5.0.0
-Release: 2%{?dist} 
+Version: 5.0.1
+Release: 1%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -170,6 +170,9 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Tue Aug 15 2006 Matthias Clasen <mclasen at redhat.com> - 5.0.1-1.fc5
+- Fix gnome-spinner-rest.png size
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 5.0.0-2.fc6
 - Link system-logviewer.png to logviewer.png
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	11 Aug 2006 20:23:10 -0000	1.81
+++ sources	15 Aug 2006 14:44:15 -0000	1.82
@@ -1,3 +1,3 @@
-729b56925ad2365d2a239261956a892b  redhat-artwork-5.0.0.tar.gz
 cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
 f0a23d501ba5d5fef7338decd0b3608c  post-install-sources.tar.gz
+d3cc9b8faa145c2281b43722f10d0574  redhat-artwork-5.0.1.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 15 14:55:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 10:55:53 -0400
Subject: rpms/evolution/devel evolution.spec,1.180,1.181
Message-ID: <200608151455.k7FEtr80003090@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Log Message:

* Tue Aug 15 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-5.fc6
- Drop the bug-buddy dependency since it's not required for Evolution to run.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- evolution.spec	15 Aug 2006 00:49:04 -0000	1.180
+++ evolution.spec	15 Aug 2006 14:55:51 -0000	1.181
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.91
-Release: 4
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -128,7 +128,6 @@
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
-Requires: bug-buddy >= %{bug_buddy_version}
 Requires: dbus >= %{dbus_version}
 Requires: evolution-data-server >= %{eds_version}
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -651,6 +650,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Aug 15 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-5.fc6
+- Drop the bug-buddy dependency since it's not required for Evolution to run.
+
 * Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-4
 - Add patch for RH bug #201831.
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 15:15:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 11:15:31 -0400
Subject: rpms/libglade-java/FC-5 .cvsignore, 1.13, 1.14 libglade-java.spec,
	1.33, 1.34 sources, 1.14, 1.15
Message-ID: <200608151515.k7FFFVg6008315@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libglade-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7437

Modified Files:
	.cvsignore libglade-java.spec sources 
Log Message:
* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.5-1
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move pkgconfig description to -devel subpackage.
- The -devel subpackage now requires several -devel packages.
- Update requires and buildrequires.

* Thu Jul 27 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.4-3
- Remove javadoc date string hack.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	17 Jun 2006 22:38:50 -0000	1.13
+++ .cvsignore	15 Aug 2006 15:15:29 -0000	1.14
@@ -1 +1 @@
-libglade-java-2.12.4.tar.bz2
+libglade-java-2.12.5.tar.bz2


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/FC-5/libglade-java.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libglade-java.spec	12 Jul 2006 15:48:35 -0000	1.33
+++ libglade-java.spec	15 Aug 2006 15:15:29 -0000	1.34
@@ -14,8 +14,8 @@
 
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	2.12.4
-Release: 	0.fc5.1
+Version:	2.12.5
+Release: 	1%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -23,16 +23,12 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	libglade2 >= 2.5.1
-Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
-Requires:	%{java_pkg_prefix}libgnome-java >= 2.12.2
-Requires:       libgnomeui >= 2.11.0
-Requires:       libgnomecanvas >= 2.11.0
-BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
-BuildRequires:	%{java_pkg_prefix}libgnome-java-devel >= 2.12.2
+Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.6
+Requires:	%{java_pkg_prefix}libgnome-java >= 2.12.4
+BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.6
+BuildRequires:	%{java_pkg_prefix}libgnome-java-devel >= 2.12.4
 BuildRequires:  libglade2-devel >= 2.5.1, gcc-java >= 4.1.1
 BuildRequires:	java-devel >= 1.4.2
-BuildRequires:  libgnomeui-devel >= 2.11.0
-BuildRequires:  libgnomecanvas-devel >= 2.11.0 
 BuildRequires:  docbook-utils
 
 %description
@@ -43,11 +39,11 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	libglade2-devel
+Requires:	libgnome-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
-
+Development part of %{name}.
 
 %prep
 %setup -q -n %{name_base}-%{version}
@@ -62,11 +58,7 @@
 %configure %{configure_args}
 
 mkdir -p doc/api/
-make
-
-# need to remove date string for multilib
-rm doc/api/gjdoc.properties
-sed --in-place "s/, on.*GMT\./\./" doc/api/about.html
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -80,7 +72,7 @@
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name}' ] ; then
@@ -96,11 +88,8 @@
 popd
 
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
@@ -110,14 +99,28 @@
 %doc doc/api AUTHORS COPYING NEWS README
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.5-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- Move pkgconfig description to -devel subpackage.
+- The -devel subpackage now requires several -devel packages.
+- Update requires and buildrequires.
+
+* Thu Jul 27 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.4-3
+- Remove javadoc date string hack.
+
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.4-2
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-1
 - Release 0 is not allowed.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	17 Jun 2006 22:38:50 -0000	1.14
+++ sources	15 Aug 2006 15:15:29 -0000	1.15
@@ -1 +1 @@
-2427ad75063ea45a8b580615b7553bde  libglade-java-2.12.4.tar.bz2
+c0dc4ca493a2978e04a055d838610a63  libglade-java-2.12.5.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 15:16:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 11:16:09 -0400
Subject: rpms/kexec-tools/devel kdump.init, 1.9, 1.10 kexec-tools.spec, 1.52,
	1.53
Message-ID: <200608151516.k7FFG95n008669@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8540

Modified Files:
	kdump.init kexec-tools.spec 
Log Message:
fixing bz 202598


Index: kdump.init
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdump.init	27 Jul 2006 13:08:21 -0000	1.9
+++ kdump.init	15 Aug 2006 15:16:07 -0000	1.10
@@ -58,12 +58,12 @@
 
 	if [ ! -f $kdump_kernel ]; then
 		echo -n "No kdump kernel image found."; warning; echo
-		echo -n "Tried to locate ${kdump_kernel}"
+		echo "Tried to locate ${kdump_kernel}"
 		exit 0
 	fi
 
 	if [ ! -f $kdump_initrd ]; then
-		echo "No kdump initial ramdisk found."
+		echo  -n "No kdump initial ramdisk found."; warning; echo
 		echo "Tried to locate ${kdump_initrd}"
 		return 1
 	fi
@@ -109,6 +109,11 @@
 	$KEXEC $KEXEC_ARGS $standard_kexec_args \
 		--command-line="$KDUMP_COMMANDLINE" \
 		--initrd=$kdump_initrd $kdump_kernel
+
+	if [ $? == 0 ]; then
+		touch /var/run/kdump.status
+	fi
+
 }
 
 case "$1" in
@@ -124,12 +129,18 @@
 	;;
   stop)
 	$KEXEC -p -u
+	rm -f /var/run/kdump.status
 	;;
   status)
-	echo "not implemented"
+	if [ -a /var/run/kdump.status ]; then
+		echo "Kdump is operational"
+	else
+		echo "Kdump is not operational"
+	fi 
 	;;
   restart)
 	$KEXEC -p -u
+	rm -f /var/run/kdump.status
 	check_config
 	load_kdump
 	;;


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kexec-tools.spec	10 Aug 2006 01:51:08 -0000	1.52
+++ kexec-tools.spec	15 Aug 2006 15:16:07 -0000	1.53
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 43%{dist}
+Release: 44%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -143,6 +143,9 @@
 %doc TODO
 
 %changelog
+* Tue Aug 15 2006 Neil Horman <nhorman at redhat.com> - 1.101-44%{dist}
+- updated init script to implement status function/scrub err messages
+ 
 * Wed Aug 09 2006 Jarod Wilson <jwilson at redhat.com> - 1.101-43%{dist}
 - Misc spec cleanups and macro-ifications
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 15:23:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 11:23:40 -0400
Subject: rpms/kdepim/devel kdepim-3.5.4-kde#131067.patch, NONE,
	1.1 kdepim.spec, 1.99, 1.100
Message-ID: <200608151523.k7FFNeqf026569@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.4-kde#131067.patch 
Log Message:
apply patch to fix crash when right clicking in an encapsulated email message, kde#131067



kdepim-3.5.4-kde#131067.patch:
 kmmessage.cpp       |    3 ++-
 kmreadermainwin.cpp |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE kdepim-3.5.4-kde#131067.patch ---
Index: kmail/kmreadermainwin.cpp
===================================================================
--- kmail/kmreadermainwin.cpp	(Revision 571844)
+++ kmail/kmreadermainwin.cpp	(Revision 571845)
@@ -355,7 +355,9 @@
       return;
     }
 
-    if( !aMsg.parent()->isSent() && !aMsg.parent()->isDrafts() ) {
+    if ( ! ( aMsg.parent() && ( aMsg.parent()->isSent() || aMsg.parent()->isDrafts() ) ) ) {
+      // add the reply and forward actions only if we are not in a sent-mail or drafts
+      // folder
       mReplyActionMenu->plug( menu );
       mForwardActionMenu->plug( menu );
       menu->insertSeparator();
Index: kmail/kmmessage.cpp
===================================================================
--- kmail/kmmessage.cpp	(Revision 571844)
+++ kmail/kmmessage.cpp	(Revision 571845)
@@ -86,7 +86,8 @@
 
 //-----------------------------------------------------------------------------
 KMMessage::KMMessage(DwMessage* aMsg)
-  : mMsg(aMsg),
+  : KMMsgBase(),
+    mMsg(aMsg),
     mNeedsAssembly(true),
     mDecodeHTML(false),
     mOverrideCodec(0),


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- kdepim.spec	10 Aug 2006 15:20:37 -0000	1.99
+++ kdepim.spec	15 Aug 2006 15:23:38 -0000	1.100
@@ -11,7 +11,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -34,6 +34,7 @@
 # upstream patches
 Patch100: kdepim-3.5.4-kde#132008.patch
 Patch101: kdepim-3.5.4-kde#117882.patch
+Patch102: kdepim-3.5.4-kde#131067.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post): /sbin/ldconfig
@@ -90,6 +91,7 @@
 # upstream patches
 %patch100 -p0 -b .kde#132008
 %patch101 -p0 -b .kde#117882
+%patch102 -p0 -b .kde#131067
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -187,6 +189,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Aug 15 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
+- apply patch to fix crash when right clicking in an encapsulated email message, kde#131067
+
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
 - apply upstream patches,
    - Kmail crashes on startup, kde#132008



From fedora-cvs-commits at redhat.com  Tue Aug 15 16:37:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 12:37:49 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch, 1.2, 1.3
Message-ID: <200608151637.k7FGbnAR016092@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch 
Log Message:
missing endif

openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch:
 langfilter.xsl |   22 +++++++++++++++++++---
 makefile.mk    |   12 +++++++++++-
 2 files changed, 30 insertions(+), 4 deletions(-)

Index: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch	14 Aug 2006 11:44:56 -0000	1.2
+++ openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch	15 Aug 2006 16:37:46 -0000	1.3
@@ -41,10 +41,11 @@
  </xsl:stylesheet>
 --- openoffice.org.orig/filter/source/config/fragments/makefile.mk	2006-07-25 16:55:21.000000000 +0100
 +++ openoffice.org/filter/source/config/fragments/makefile.mk	2006-07-25 17:09:10.000000000 +0100
-@@ -156,8 +156,17 @@
+@@ -156,8 +156,18 @@
  MERGE:=python ../tools/merge/pyAltFCFGMerge
  .ELSE
  MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
++.ENDIF
 +.IF "$(XSLTPROC)"=="NO_XSLTPROC"
  XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
  PACKLANG := $(JAVAI) $(JAVACPS) $(XALAN_JAR) org.apache.xalan.xslt.Process -XSL langfilter.xsl
@@ -59,7 +60,7 @@
  .ENDIF
  
  # -----------------------------------------------------------------------------
-@@ -186,7 +195,7 @@
+@@ -186,7 +196,7 @@
       + at echo Building language packages $(@:b:s/Filter_//) for filters
       + at echo ===================================================================
       +-$(MKDIRHIER) $(@:d)



From fedora-cvs-commits at redhat.com  Tue Aug 15 16:50:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 12:50:51 -0400
Subject: rpms/coreutils/devel coreutils-i18n.patch, 1.17, 1.18 coreutils.spec,
	1.132, 1.133
Message-ID: <200608151650.k7FGop9j011180@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Log Message:
* Tue Aug 15 2006 Tim Waugh <twaugh at redhat.com> 5.97-7
- Fixed 'sort -b' multibyte problem (bug #199986).


coreutils-i18n.patch:
 coreutils-5.95/lib/linebuffer.h         |    8 
 coreutils-5.95/src/cut.c                |  420 +++++++++++++++++++-
 coreutils-5.95/src/expand.c             |  161 +++++++
 coreutils-5.95/src/fold.c               |  317 +++++++++++++--
 coreutils-5.95/src/join.c               |  348 ++++++++++++++--
 coreutils-5.95/src/pr.c                 |  431 ++++++++++++++++++--
 coreutils-5.95/src/unexpand.c           |  226 ++++++++++
 coreutils-5.95/src/uniq.c               |  259 ++++++++++++
 coreutils-5.95/tests/sort/Makefile.am   |    8 
 coreutils-5.95/tests/sort/Makefile.in   |   99 ++--
 coreutils-5.95/tests/sort/mb1.I         |    4 
 coreutils-5.95/tests/sort/mb1.X         |    4 
 coreutils-5.95/tests/sort/mb2.I         |    4 
 coreutils-5.95/tests/sort/mb2.X         |    4 
 coreutils-5.95/tests/sort/sort-mb-tests |   58 ++
 src/sort.c                              |  665 ++++++++++++++++++++++++++++++--
 16 files changed, 2781 insertions(+), 235 deletions(-)

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- coreutils-i18n.patch	19 May 2006 14:55:28 -0000	1.17
+++ coreutils-i18n.patch	15 Aug 2006 16:50:47 -0000	1.18
@@ -1415,8 +1415,8 @@
  	  }
  	  break;
  
---- coreutils-5.95/src/sort.c.i18n	2005-10-07 19:48:28.000000000 +0100
-+++ coreutils-5.95/src/sort.c	2006-05-15 15:08:57.000000000 +0100
+--- coreutils-5.95/src/sort.c	2006-05-15 15:08:57.000000000 +0100
++++ coreutils-5.97/src/sort.c	2006-08-15 17:43:38.000000000 +0100
 @@ -23,9 +23,18 @@
  
  #include <config.h>
@@ -1858,7 +1858,34 @@
  /* Fill BUF reading from FP, moving buf->left bytes from the end
     of buf->buf to the beginning first.  If EOF is reached and the
     file wasn't terminated by a newline, supply one.  Set up BUF's line
-@@ -1067,7 +1354,7 @@
+@@ -1033,8 +1320,24 @@
+ 		  else
+ 		    {
+ 		      if (key->skipsblanks)
+-			while (blanks[to_uchar (*line_start)])
+-			  line_start++;
++			{
++#if HAVE_MBRTOWC
++			  if (MB_CUR_MAX > 1)
++			    {
++			      size_t mblength;
++			      mbstate_t state;
++			      memset (&state, '\0', sizeof(mbstate_t));
++			      while (line_start < line->keylim &&
++				     ismbblank (line_start,
++						line->keylim - line_start,
++						&mblength))
++				line_start += mblength;
++			    }
++			  else
++#endif
++			  while (blanks[to_uchar (*line_start)])
++			    line_start++;
++			}
+ 		      line->keybeg = line_start;
+ 		    }
+ 		}
+@@ -1067,7 +1370,7 @@
     hideously fast. */
  
  static int
@@ -1867,7 +1894,7 @@
  {
    while (blanks[to_uchar (*a)])
      a++;
-@@ -1077,6 +1364,25 @@
+@@ -1077,6 +1380,25 @@
    return strnumcmp (a, b, decimal_point, thousands_sep);
  }
  
@@ -1893,7 +1920,7 @@
  static int
  general_numcompare (const char *sa, const char *sb)
  {
-@@ -1110,7 +1416,7 @@
+@@ -1110,7 +1432,7 @@
     Return 0 if the name in S is not recognized.  */
  
  static int
@@ -1902,7 +1929,7 @@
  {
    size_t lo = 0;
    size_t hi = MONTHS_PER_YEAR;
-@@ -1152,11 +1458,79 @@
+@@ -1152,11 +1474,79 @@
    return 0;
  }
  
@@ -1983,7 +2010,7 @@
  {
    struct keyfield const *key = keylist;
  
-@@ -1326,6 +1700,177 @@
+@@ -1326,6 +1716,177 @@
    return key->reverse ? -diff : diff;
  }
  
@@ -2161,7 +2188,7 @@
  /* Compare two lines A and B, returning negative, zero, or positive
     depending on whether A compares less than, equal to, or greater than B. */
  
-@@ -2127,7 +2672,7 @@
+@@ -2127,7 +2688,7 @@
    atexit (close_stdout);
  
    hard_LC_COLLATE = hard_locale (LC_COLLATE);
@@ -2170,7 +2197,7 @@
    hard_LC_TIME = hard_locale (LC_TIME);
  #endif
  
-@@ -2148,6 +2693,27 @@
+@@ -2148,6 +2709,27 @@
        thousands_sep = -1;
    }
  
@@ -2198,7 +2225,7 @@
    have_read_stdin = false;
    inittables ();
  
-@@ -2349,13 +2915,35 @@
+@@ -2349,13 +2931,35 @@
  
  	case 't':
  	  {
@@ -2238,7 +2265,7 @@
  		else
  		  {
  		    /* Provoke with `sort -txx'.  Complain about
-@@ -2366,9 +2954,12 @@
+@@ -2366,9 +2970,12 @@
  			   quote (optarg));
  		  }
  	      }


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- coreutils.spec	21 Jul 2006 14:55:05 -0000	1.132
+++ coreutils.spec	15 Aug 2006 16:50:48 -0000	1.133
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 6
+Release: 7
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -280,6 +280,9 @@
 /sbin/runuser
 
 %changelog
+* Tue Aug 15 2006 Tim Waugh <twaugh at redhat.com> 5.97-7
+- Fixed 'sort -b' multibyte problem (bug #199986).
+
 * Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com> 5.97-6
 - Added runuser '-g' and '-G' options (bug #199344).
 - Added su '--session-command' option (bug #199066).



From fedora-cvs-commits at redhat.com  Tue Aug 15 17:24:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 13:24:05 -0400
Subject: rpms/grub/devel grub.spec,1.46,1.47
Message-ID: <200608151724.k7FHO5rI003785@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3718

Modified Files:
	grub.spec 
Log Message:
- disable patch 505



Index: grub.spec
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- grub.spec	2 Aug 2006 21:26:22 -0000	1.46
+++ grub.spec	15 Aug 2006 17:24:03 -0000	1.47
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 10
+Release: 11
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPL
@@ -147,7 +147,8 @@
 %patch501 -p1 -b .i2o
 %patch502 -p1 -b .moreraid
 
-%patch505 -p1 -b .initrdmax
+# Nobody actually knows what case this patch fixes.
+#%patch505 -p1 -b .initrdmax
 
 %patch800 -p1 -b .odirect
 
@@ -237,6 +238,9 @@
 %{_datadir}/grub
 
 %changelog
+* Tue Aug 15 2006 Peter Jones <pjones at redhat.com> - 0.97-11
+- Disable patch 505 (#164497)
+
 * Wed Aug  2 2006 Peter Jones <pjones at redhat.com> - 0.97-10
 - Fix grub-install for multipath
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 17:36:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 13:36:28 -0400
Subject: rpms/rgmanager/devel .cvsignore,1.9,1.10 sources,1.16,1.17
Message-ID: <200608151736.k7FHaSqF007291@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7264

Modified Files:
	.cvsignore sources 
Log Message:
Updated sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Aug 2006 16:31:31 -0000	1.9
+++ .cvsignore	15 Aug 2006 17:36:26 -0000	1.10
@@ -1,5 +1 @@
-rgmanager-2.0.0.tar.gz
-rgmanager-2.0.2.tar.gz
-rgmanager-2.0.3.tar.gz
-rgmanager-2.0.4.tar.gz
-rgmanager-2.0.5.tar.gz
+cman-2.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Aug 2006 16:31:31 -0000	1.16
+++ sources	15 Aug 2006 17:36:26 -0000	1.17
@@ -1 +1 @@
-e3307a9c27a83de7570d116bf403ac02  rgmanager-2.0.5.tar.gz
+f6c816433e783b49d9a9a2c81212067c  cman-2.0.9.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 15 17:37:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 13:37:55 -0400
Subject: rpms/rgmanager/devel sources,1.17,1.18
Message-ID: <200608151737.k7FHbteK007881@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7852

Modified Files:
	sources 
Log Message:
Reset sources.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	15 Aug 2006 17:36:26 -0000	1.17
+++ sources	15 Aug 2006 17:37:52 -0000	1.18
@@ -1 +1 @@
-f6c816433e783b49d9a9a2c81212067c  cman-2.0.9.tar.gz
+e3307a9c27a83de7570d116bf403ac02  rgmanager-2.0.5.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 15 17:38:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 13:38:35 -0400
Subject: rpms/cman/devel .cvsignore, 1.14, 1.15 cman.spec, 1.65, 1.66 sources,
	1.23, 1.24
Message-ID: <200608151738.k7FHcZaY008177@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8150

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
New upstream sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	11 Aug 2006 19:27:52 -0000	1.14
+++ .cvsignore	15 Aug 2006 17:38:33 -0000	1.15
@@ -1 +1 @@
-cman-2.0.8.tar.gz
+cman-2.0.9.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- cman.spec	11 Aug 2006 19:27:52 -0000	1.65
+++ cman.spec	15 Aug 2006 17:38:33 -0000	1.66
@@ -10,7 +10,7 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.8
+%define cman_minor 0.9
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
@@ -114,6 +114,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Aug 15 2006 Chris Feist <cfeist at redhat.com> - 2.0.9-0
+- Rebuild w/ new upstream sources
+
 * Fri Aug 11 2006 Chris Feist <cfeist at redhat.com> - 2.0.8-0
 - Rebuild w/ new upstream sources
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	11 Aug 2006 19:27:52 -0000	1.23
+++ sources	15 Aug 2006 17:38:33 -0000	1.24
@@ -1 +1 @@
-035ce49c2ab5e50d164a52a95f8bc828  cman-2.0.8.tar.gz
+f6c816433e783b49d9a9a2c81212067c  cman-2.0.9.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 15 17:59:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 13:59:58 -0400
Subject: rpms/libsoup/devel libsoup.spec,1.39,1.40
Message-ID: <200608151759.k7FHxwvw030861@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30734

Modified Files:
	libsoup.spec 
Log Message:

* Tue Aug 15 2006 Matthew Barnes <mbarnes at redhat.com> - 2.2.96-2.fc6
- Rebuild



Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libsoup.spec	25 Jul 2006 10:09:56 -0000	1.39
+++ libsoup.spec	15 Aug 2006 17:59:55 -0000	1.40
@@ -2,7 +2,7 @@
 
 Name: libsoup
 Version: 2.2.96
-Release: 1
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Libraries
 Summary: Soup, an HTTP library implementation
@@ -20,8 +20,8 @@
 
 BuildRequires: glib2-devel
 BuildRequires: gnutls-devel
-BuildRequires: pkgconfig
 BuildRequires: libxml2-devel
+BuildRequires: pkgconfig
 
 %description
 Libsoup is an HTTP library implementation in C. It was originally part
@@ -80,6 +80,9 @@
 %{_datadir}/gtk-doc/html/libsoup
 
 %changelog
+* Tue Aug 15 2006 Matthew Barnes <mbarnes at redhat.com> - 2.2.96-2.fc6
+- Rebuild
+
 * Tue Jul 25 2006 Matthew Barnes <mbarnes at redhat.com> - 2.2.96
 - Update to 2.2.96
 - Bump glib2 requirement to >= 2.6.



From fedora-cvs-commits at redhat.com  Tue Aug 15 18:13:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 14:13:38 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2566,1.2567
Message-ID: <200608151813.k7FIDcca001033@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
	kernel-2.6.spec 
Log Message:
small spec cleanups
mainly a stub to work around a bad tag




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2566
retrieving revision 1.2567
diff -u -r1.2566 -r1.2567
--- kernel-2.6.spec	14 Aug 2006 18:16:07 -0000	1.2566
+++ kernel-2.6.spec	15 Aug 2006 18:13:35 -0000	1.2567
@@ -62,7 +62,7 @@
 %endif
 
 # kdump only builds on i686 and x86_64 ...
-%ifnarch i686 x86_64
+%ifnarch i686 x86_64 ppc64 ppc64iseries
 %define buildkdump 0
 %endif
 
@@ -71,11 +71,6 @@
 %define buildxen 0
 %endif
 
-
-%ifarch ppc64 ppc64iseries
-%define buildkdump 1
-%endif
-
 # Second, per-architecture exclusions (ifarch)
 
 %ifarch ppc64iseries i686
@@ -1693,6 +1688,9 @@
 %endif
 
 %changelog
+* Tue Aug 15 2006 Don Zickus <dzickus at redhat.com>
+- ppc64 spec cleanups
+
 * Mon Aug 14 2006 Dave Jones <davej at redhat.com>
 - Update to squashfs 3.1 which should fix stack overflows seen
   during installation.



From fedora-cvs-commits at redhat.com  Tue Aug 15 18:28:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 14:28:15 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.319, 1.320 anaconda.spec, 1.445,
	1.446 sources, 1.442, 1.443
Message-ID: <200608151828.k7FISFla020889@cvs.devel.redhat.com>

Author: clumens

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- .cvsignore	8 Aug 2006 21:55:42 -0000	1.319
+++ .cvsignore	15 Aug 2006 18:28:12 -0000	1.320
@@ -1 +1,2 @@
 anaconda-11.1.0.80.tar.bz2
+anaconda-11.1.0.81.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- anaconda.spec	8 Aug 2006 21:55:42 -0000	1.445
+++ anaconda.spec	15 Aug 2006 18:28:12 -0000	1.446
@@ -1,11 +1,11 @@
 Name: anaconda
-Version: 11.1.0.80
+Version: 11.1.0.81
 Release: 1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
 Source: anaconda-%{PACKAGE_VERSION}.tar.bz2
-BuildPreReq: kudzu-devel >= 1.2.37, pciutils-devel
+BuildPreReq: kudzu-devel >= 1.2.42, pciutils-devel
 BuildPreReq: bzip2-devel, e2fsprogs-devel, python-devel, gtk2-devel
 BuildPreReq: rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11
 BuildPreReq: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel
@@ -15,10 +15,10 @@
 BuildPreReq: libsepol-devel
 BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
 BuildPreReq: glib2-devel >= 2.11.1-5
-BuildPreReq: libdhcp-devel >= 1.10, mkinitrd-devel >= 5.1.2-1
+BuildPreReq: libdhcp-devel >= 1.12, mkinitrd-devel >= 5.1.2-1
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, booty
 Requires: parted >= 1.7.1, pyparted >= 1.7.2
-Requires: kudzu > 1.2.0, yum >= 2.9.2, pirut >= 1.1.0
+Requires: kudzu >= 1.2.42, yum >= 2.9.2, pirut >= 1.1.0
 Requires: libxml2-python, python-urlgrabber
 Requires: system-logos, pykickstart, system-config-date
 Requires: device-mapper >= 1.01.05-3
@@ -103,6 +103,29 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Aug 15 2006 Chris Lumens <clumens at redhat.com> 11.1.0.81-1
+- Fix serial console shell IO (#201479).
+- Don't traceback if URL install path is just "/" (#202368).
+- Fix font typo (katzj, #202167).
+- SELinux fixups (pjones).
+- Handle virtpconsole option again (katzj, #201749, #202450).
+- Kickstart install fixes (#202471, #202483).
+- Mark strings for translation (#199022).
+- Fix ISO install method traceback (#201775).
+- Don't enable the back button if there's no screen to show (#197766).
+- Don't clobber a working /etc/resolv.conf on VNC installs (#201874).
+- Remember user choices on network config (dcantrel, #200986, #200797).
+- More greek fixing (katzj, #196980).
+- Sync pkgorder with what distill is expecting (katzj, #201923).
+- RHEL upgrade tweaks (katzj, #201741).
+- Install class detection (katzj, #201745).
+- Fix text upgrade traceback (katzj, #201960).
+- Add more libraries for s390 (katzj, #200985).
+- Add SATA probing (pjones).
+- Add registration key options (katzj, #201738).
+- Don't automatically set UTC check box on kickstart installs (#181737).
+- Patch from Paul Schroder <pschroeder at uplogix.com> for nogr mode.
+
 * Tue Aug 08 2006 Paul Nasrat <pnasrat at redhat.com> 11.1.0.80-1
 - Blacklist e2fsprogs.ppc64 on upgrades (#200233)
 - Set self.currentMedia to [] (dcantrel, #201722).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- sources	8 Aug 2006 21:55:42 -0000	1.442
+++ sources	15 Aug 2006 18:28:12 -0000	1.443
@@ -1 +1 @@
-c2e0dc8aa99bf0de8814b3c9eedb6049  anaconda-11.1.0.80.tar.bz2
+a7253aa5527480d5746dcd9ba2d2b2b3  anaconda-11.1.0.81.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 18:48:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 14:48:58 -0400
Subject: rpms/jakarta-commons-validator/devel jakarta-commons-validator.spec,
	1.13, 1.14
Message-ID: <200608151848.k7FImwvP031223@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-validator/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31101

Modified Files:
	jakarta-commons-validator.spec 
Log Message:

Added missing post/postun for javadoc.




Index: jakarta-commons-validator.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-validator/devel/jakarta-commons-validator.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jakarta-commons-validator.spec	25 Jul 2006 18:52:07 -0000	1.13
+++ jakarta-commons-validator.spec	15 Aug 2006 18:48:54 -0000	1.14
@@ -41,7 +41,7 @@
 Summary:        Jakarta Commons Validator
 Name:           jakarta-%{short_name}
 Version:        1.1.4
-Release:        3jpp_1fc
+Release:        4jpp.1
 Epoch:          0
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -93,6 +93,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -183,6 +185,15 @@
     %{_datadir}/sgml/%{name}/catalog > /dev/null || :
 fi
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 # -----------------------------------------------------------------------------
 
 %if %{gcj_support}
@@ -209,6 +220,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Aug 15 2006 Deepak Bhole <dbhole at redhat.com> -  0:1.1.4-4jpp.1
+- Added missing post/postun for javadoc.
+
 * Tue Jul 25 2006 Deepak Bhole <dbhole at redhat.com> -  0:1.1.4-3jpp_1fc
 - Added conditional native compilation.
 - Converted spec file to UTF8.



From fedora-cvs-commits at redhat.com  Tue Aug 15 18:51:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 14:51:34 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.146, 1.147
Message-ID: <200608151851.k7FIpYDI008790@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch 
Log Message:
* Tue Aug 15 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-21.fc6
- xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch: Added.


xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch:
 xf86Configure.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch ---
--- xorg-server-1.1.1/hw/xfree86/common/xf86Configure.c.jx	2006-07-05 14:38:47.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/common/xf86Configure.c	2006-08-15 14:20:55.000000000 -0400
@@ -90,6 +90,9 @@
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 static char *DFLT_MOUSE_DEV = "/dev/sysmouse";
 static char *DFLT_MOUSE_PROTO = "auto";
+#elif defined(linux)
+static char DFLT_MOUSE_DEV[] = "/dev/input/mice";
+static char DFLT_MOUSE_PROTO[] = "auto";
 #else
 static char *DFLT_MOUSE_DEV = "/dev/mouse";
 static char *DFLT_MOUSE_PROTO = "auto";


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- xorg-x11-server.spec	11 Aug 2006 01:24:06 -0000	1.146
+++ xorg-x11-server.spec	15 Aug 2006 18:51:32 -0000	1.147
@@ -62,6 +62,8 @@
 Patch3010:  xorg-x11-server-1.1.1-edid-quirks-list.patch
 Patch3011:  xorg-x11-server-1.1.1-defaultdepth-24.patch
 Patch3012:  xorg-x11-server-1.1.1-always-mouse-thyself.patch
+Patch3013:  xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch
+#Patch3013:  xorg-x11-server-1.1.1-infer-virtual.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -360,6 +362,7 @@
 %patch3010 -p1 -b .edid-quirks
 %patch3011 -p1 -b .defaultdepth
 %patch3012 -p1 -b .mouse-thyself
+%patch3013 -p1 -b .mouse-device
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -689,6 +692,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Aug 15 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-21.fc6
+- xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch: Added.
+
 * Thu Aug 10 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-20.fc6
 - xorg-x11-server-1.1.1-always-mouse-thyself.patch: If we lack a mouse
   device in the config, and the user hasn't asked for any void devices,



From fedora-cvs-commits at redhat.com  Tue Aug 15 18:52:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 14:52:05 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.147,1.148
Message-ID: <200608151852.k7FIq5bJ009044@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Tue Aug 15 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-21.fc6
- xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch: Added.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- xorg-x11-server.spec	15 Aug 2006 18:51:32 -0000	1.147
+++ xorg-x11-server.spec	15 Aug 2006 18:52:02 -0000	1.148
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   20%{?dist}
+Release:   21%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X



From fedora-cvs-commits at redhat.com  Tue Aug 15 18:55:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 14:55:22 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.320, 1.321 anaconda.spec, 1.446,
	1.447 sources, 1.443, 1.444
Message-ID: <200608151855.k7FItMbZ010309@cvs.devel.redhat.com>

Author: clumens

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
Another new version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- .cvsignore	15 Aug 2006 18:28:12 -0000	1.320
+++ .cvsignore	15 Aug 2006 18:55:20 -0000	1.321
@@ -1,2 +1,3 @@
 anaconda-11.1.0.80.tar.bz2
 anaconda-11.1.0.81.tar.bz2
+anaconda-11.1.0.82.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- anaconda.spec	15 Aug 2006 18:28:12 -0000	1.446
+++ anaconda.spec	15 Aug 2006 18:55:20 -0000	1.447
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.81
+Version: 11.1.0.82
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Aug 15 2006 Chris Lumens <clumens at redhat.com> 11.1.0.82-1
+- Make Turkish translation build again.
+
 * Tue Aug 15 2006 Chris Lumens <clumens at redhat.com> 11.1.0.81-1
 - Fix serial console shell IO (#201479).
 - Don't traceback if URL install path is just "/" (#202368).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- sources	15 Aug 2006 18:28:12 -0000	1.443
+++ sources	15 Aug 2006 18:55:20 -0000	1.444
@@ -1 +1 @@
-a7253aa5527480d5746dcd9ba2d2b2b3  anaconda-11.1.0.81.tar.bz2
+9bf3a1d28de81eddb0e7c6d0d5d561d1  anaconda-11.1.0.82.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 19:28:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 15:28:34 -0400
Subject: rpms/eclipse-changelog/devel eclipse-changelog-removePydev.patch,
	NONE, 1.1 eclipse-changelog.spec, 1.42, 1.43 sources, 1.12, 1.13
Message-ID: <200608151928.k7FJSYdC008628@cvs.devel.redhat.com>

Author: klee

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

Modified Files:
	eclipse-changelog.spec sources 
Added Files:
	eclipse-changelog-removePydev.patch 
Log Message:
Synchronize with RHEL-4 build

eclipse-changelog-removePydev.patch:
 plugin.xml                                                      |    6 ------
 src/com/redhat/eclipse/changelog/core/parsers/PythonParser.java |    8 ++++----
 2 files changed, 4 insertions(+), 10 deletions(-)

--- NEW FILE eclipse-changelog-removePydev.patch ---
### Eclipse Workspace Patch 1.0
#P rhel4
Index: src/com/redhat/eclipse/changelog/core/parsers/PythonParser.java
===================================================================
RCS file: /cvs/eclipse/changelog/com.redhat.eclipse.changelog.core/src/com/redhat/eclipse/changelog/core/parsers/PythonParser.java,v
retrieving revision 1.4
diff -u -r1.4 PythonParser.java
--- src/com/redhat/eclipse/changelog/core/parsers/PythonParser.java	25 Jul 2006 19:53:49 -0000	1.4
+++ src/com/redhat/eclipse/changelog/core/parsers/PythonParser.java	14 Aug 2006 16:37:09 -0000
@@ -8,14 +8,14 @@
 package com.redhat.eclipse.changelog.core.parsers;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
+//import org.eclipse.jface.text.IDocument;
+//import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import com.redhat.eclipse.changelog.core.IParserChangeLogContrib;
-import org.python.pydev.editor.PyEdit;
+//import org.python.pydev.editor.PyEdit;
 //import org.python.pydev.editor.model.AbstractNode;
-import org.python.pydev.editor.model.Location;
+//import org.python.pydev.editor.model.Location;
 //import org.python.pydev.editor.model.ModelUtils;
 
 /**
Index: plugin.xml
===================================================================
RCS file: /cvs/eclipse/changelog/com.redhat.eclipse.changelog.core/plugin.xml,v
retrieving revision 1.18
diff -u -r1.18 plugin.xml
--- plugin.xml	1 Aug 2006 14:02:13 -0000	1.18
+++ plugin.xml	14 Aug 2006 16:37:09 -0000
@@ -24,7 +24,6 @@
    	  	<import plugin="org.eclipse.core.resources"/>
       	<import plugin="org.eclipse.core.runtime"/>
       	<import plugin="org.eclipse.ui"/>
-        <import plugin="org.python.pydev" optional = "true" />
         <import plugin="org.eclipse.ui.editors"/>
         <import plugin="org.eclipse.team.cvs.ui"/>
         <import plugin="org.eclipse.team.cvs.core"/>
@@ -101,11 +100,6 @@
 			class="com.redhat.eclipse.changelog.core.parsers.CompareParser"
 			editor="CompareEditor">
  		</parser>
- 		<parser
-			name="%pyParser"
-			class="com.redhat.eclipse.changelog.core.parsers.PythonParser"
-			editor="PyEdit">
- 		</parser>
 	</extension>
 
     <extension


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- eclipse-changelog.spec	1 Aug 2006 14:48:53 -0000	1.42
+++ eclipse-changelog.spec	15 Aug 2006 19:28:32 -0000	1.43
@@ -1,6 +1,6 @@
 Epoch: 1
 
-%define gcj_support 		1
+%define gcj_support 		0
 %define pkg_summary		Eclipse ChangeLog plug-in
 %define section			free
 %define eclipse_name 		eclipse
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:	EPL (Eclipse Public License)  <http://www.eclipse.org/legal/epl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 URL:		http://sources.redhat.com/eclipse
@@ -40,10 +40,10 @@
 Source0: eclipse-changelog-fetched-%{changelog_majmin}.%{changelog_micro}.tar.gz
 Patch0:  eclipse-changelog-build.properties.patch
 Patch1:  eclipse-changelog-customTargets.xml.patch
+Patch2:  eclipse-changelog-removePydev.patch
 
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-cdt
-BuildRequires: eclipse-pydev
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.0-1
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
@@ -70,12 +70,14 @@
 %patch0
 %patch1
 popd
+pushd com.redhat.eclipse.changelog.releng/results/plugins/com.redhat.eclipse.changelog.core
+%patch2
+popd
 
 %build
 
 # See comments in the script to understand this.
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} cdt
-ln -s %{eclipse_base}/plugins/org.python.pydev_* SDK/plugins
 
 SDK=$(cd SDK && pwd)
 
@@ -138,9 +140,15 @@
 %endif
 
 %changelog
+* Mon Aug 14 2006 Kyu Lee <klee at redhat.com> 2.2.2-2
+- Add patch that removes Pydev dependency.
+
+* Sun Aug 13 2006 Ben Konrath <bkonrath at redhat.com> 2.2.2-2
+- Rebuild for RHDS.
+
 * Tue Aug 01 2006 Kyu Lee <klee at redhat.com> 2.2.2-1
 - Import version 2.2.2 that fixed the bug which was causing prepare-changelog
-menu button to not appear on 3.2.
+  menu button to not appear on 3.2.
  
 * Tue Jul 25 2006 Kyu Lee <klee at redhat.com> 2.2.1-1
 - Import version 2.2.1 that has prepare-changelog functionality for 3.2.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Aug 2006 14:48:53 -0000	1.12
+++ sources	15 Aug 2006 19:28:32 -0000	1.13
@@ -1 +1 @@
-62605bb8908d93f933b2ecbbb0f0e1e2  eclipse-changelog-fetched-2.2.2.tar.gz
+bd3cfdec6b475495d16b88a606890351  eclipse-changelog-fetched-2.2.2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 15 19:50:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 15:50:05 -0400
Subject: rpms/frysk/devel frysk-xfail-2130.patch, NONE, 1.1 .cvsignore, 1.24,
	1.25 frysk.spec, 1.83, 1.84 sources, 1.24, 1.25
Message-ID: <200608151950.k7FJo5gv005017@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4957

Modified Files:
	.cvsignore frysk.spec sources 
Added Files:
	frysk-xfail-2130.patch 
Log Message:
- New upstream version.
- Require latest java-gnome.
- frysk-xfail-2130.patch: fails if building on an old kernel.


frysk-xfail-2130.patch:
 Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE frysk-xfail-2130.patch ---
Disable frysk-imports/tests: frysk2130/strace-clone-exec.sh
The kerbel on the build host may be old.

--- frysk-imports/tests/Makefile.in.orig	2006-07-25 12:26:41.000000000 +0200
+++ frysk-imports/tests/Makefile.in	2006-08-02 15:58:00.657944000 +0200
@@ -372,7 +372,7 @@
 	frysk2492/java.sh frysk1840/gcj.sh \
 	frysk2595/ptrace_peek_wrong_thread \
 	frysk2595/ptrace_before_forked_thread_exits frysk2670/gcj.sh \
-	frysk2630/noerror.sh frysk2631/ice.sh frysk2760/barriertest
+	frysk2630/noerror.sh frysk2631/ice.sh frysk2760/barriertest frysk2130/strace-clone-exec.sh
 
 # Frysk, when creating test processes uses the sequence vfork -> fork
 # -> exec to create a process of known pid that has process 1 as its
@@ -385,7 +385,7 @@
 	frysk2595/ptrace_after_exec \
 	frysk2595/ptrace_after_exec_of_thread $(process_TESTS) \
 	frysk1929/gcj.sh cdtparserversion/cdttest.sh cmdline/print \
-	frysk2130/strace-clone-exec.sh frysk2299/GCTest \
+	frysk2299/GCTest \
 	vfork-exec/vfork-exec
 CLEANFILES = $(TESTS) $(noinst_SCRIPTS) *.gcno frysk2490/Child.h \
 	frysk2490/Parent.h frysk2137/*.gcno frysk2137/*.gcda \


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	9 Aug 2006 19:38:32 -0000	1.24
+++ .cvsignore	15 Aug 2006 19:50:03 -0000	1.25
@@ -1 +1 @@
-frysk-0.0.1.2006.08.09.rh1.tar.bz2
+frysk-0.0.1.2006.08.15.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- frysk.spec	9 Aug 2006 19:38:32 -0000	1.83
+++ frysk.spec	15 Aug 2006 19:50:03 -0000	1.84
@@ -1,16 +1,17 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.08.09.rh1
+Version:	0.0.1.2006.08.15.rh1
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
 
+Patch:		frysk-xfail-2130.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Requires:	libgtk-java >= 2.8.4
-Requires:   	libglade-java >= 2.12.3
+Requires:   	libglade-java >= 2.12.5
 Requires: 	libvte-java >= 0.12.0
 BuildRequires:  gcc-java >= 4.1.1
 BuildRequires:	junit >= 3.8.1
@@ -49,6 +50,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch
 
 %build 
 
@@ -108,6 +110,11 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Tue Aug 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.15.rh1-1
+- New upstream version.
+- Require latest java-gnome.
+- frysk-xfail-2130.patch: fails if building on an old kernel.
+
 * Wed Aug  9 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.09.rh1-1
 - New upstream version, incorporates both the patches.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	9 Aug 2006 19:38:32 -0000	1.24
+++ sources	15 Aug 2006 19:50:03 -0000	1.25
@@ -1 +1 @@
-c126b0790be2c8b95fede5d26b0b4cbb  frysk-0.0.1.2006.08.09.rh1.tar.bz2
+ce87477d82ecac96ac3b3e8b6b4373a4  frysk-0.0.1.2006.08.15.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 20:04:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 16:04:18 -0400
Subject: rpms/parted/devel parted-1.7.1-vtoc-errbuf.patch, NONE,
	1.1 parted.spec, 1.80, 1.81
Message-ID: <200608152004.k7FK4Im7009471@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9410

Modified Files:
	parted.spec 
Added Files:
	parted-1.7.1-vtoc-errbuf.patch 
Log Message:
- Expand error buffer to 8192 bytes in vtoc_error()
- Do not apply O_DIRECT patch on S/390 or S/390x platforms


parted-1.7.1-vtoc-errbuf.patch:
 vtoc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE parted-1.7.1-vtoc-errbuf.patch ---
--- parted-1.7.1/libparted/labels/vtoc.c.errbuf	2006-08-15 11:38:40.000000000 -0400
+++ parted-1.7.1/libparted/labels/vtoc.c	2006-08-15 11:39:41.000000000 -0400
@@ -156,7 +156,7 @@
 vtoc_error(enum failure why, char *s1, char *s2) 
 {
 	PDEBUG
-        char    error[LINE_LENGTH];
+        char    error[8192];
 
 	switch (why) 
 	{


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- parted.spec	14 Aug 2006 18:27:16 -0000	1.80
+++ parted.spec	15 Aug 2006 20:04:16 -0000	1.81
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.7.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0: parted-1.7.0-fat.c.patch
 Patch1: parted-1.7.0-sx8.patch
@@ -12,6 +12,7 @@
 Patch4: parted-1.7.0-iseries.patch
 Patch5: parted-1.7.1-dm.patch
 Patch6: parted-1.7.0-aix.patch
+Patch7: parted-1.7.1-vtoc-errbuf.patch
 Patch8: parted-1.7.1-O_DIRECT.patch
 Patch9: parted-1.7.1-get_exception.patch
 
@@ -49,7 +50,10 @@
 %patch4 -p1 -b .iseries
 %patch5 -p1 -b .dm
 %patch6 -p1 -b .aix
+%patch7 -p1 -b .vtoc_errbuf
+%ifnarch s390 s390x
 %patch8 -p1 -b .o_direct
+%endif
 %patch9 -p1 -b .get_exception
 
 iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_
@@ -104,6 +108,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Aug 15 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-11
+- Expand error buffer to 8192 bytes in vtoc_error()
+- Do not apply O_DIRECT patch on S/390 or S/390x platforms
+
 * Mon Aug 14 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-10
 - Removed bad header file patch (#200577)
 



From fedora-cvs-commits at redhat.com  Tue Aug 15 20:13:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 16:13:08 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-infer-virtual.patch, NONE, 1.1
Message-ID: <200608152013.k7FKD88G011611@cvs.devel.redhat.com>

Author: ajackson

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

Added Files:
	xorg-x11-server-1.1.1-infer-virtual.patch 
Log Message:
Start the logic to infer a sensible virtual size from the mode list and the
EDID block.


xorg-x11-server-1.1.1-infer-virtual.patch:
 common/xf86Mode.c |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/xf86str.h  |    2 ++
 ddc/ddcProperty.c |   16 +++++++++++-----
 3 files changed, 67 insertions(+), 5 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-infer-virtual.patch ---
--- xorg-server-1.1.1/hw/xfree86/common/xf86str.h.infer-virtual	2006-08-11 17:16:12.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-11 17:16:12.000000000 -0400
@@ -125,8 +125,10 @@
 # define M_T_CRTC_C  (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC  */
 # define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)
                                /* built-in mode - configure CRTC and clock */
+# define M_T_PREFERRED 0x08
 # define M_T_DEFAULT 0x10	/* (VESA) default modes */
 # define M_T_USERDEF 0x20	/* One of the modes from the config file */
+# define M_T_DRIVER 0x40
 
 /* Video mode */
 typedef struct _DisplayModeRec {
--- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.infer-virtual	2006-08-11 17:16:12.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-11 17:24:47.000000000 -0400
@@ -47,6 +47,7 @@
 #include "globals.h"
 #include "xf86.h"
 #include "xf86Priv.h"
+#include "edid.h"
 
 /*
  * xf86GetNearestClock --
@@ -1163,6 +1164,56 @@
     return MODE_OK;
 }
 
+static void
+inferVirtualSize(ScrnInfoPtr scrp, DisplayModePtr modes, int *vx, int *vy)
+{
+    float aspect = 0.0;
+    MonPtr mon = scrp->monitor;
+    int x = 0, y = 0;
+    DisplayModePtr mode;
+
+    if (!mon) return;
+
+    /*
+     * technically this triggers if _either_ is zero, which is not what EDID
+     * says, but if only one is zero this is best effort.  also we don't
+     * know that all projectors are 4:3, but we certainly suspect it.
+     */
+    if (!mon->widthmm || !mon->heightmm)
+	aspect = 4.0/3.0;
+    else
+	aspect = (float)mon->widthmm / (float)mon->heightmm;
+
+    /* find the largest M_T_DRIVER mode with that aspect ratio */
+    for (mode = modes; mode; mode = mode->next) {
+	float mode_aspect, metaspect;
+	if (!(mode->type & M_T_DRIVER))
+	    continue;
+	mode_aspect = (float)mode->HDisplay / (float)mode->VDisplay;
+	metaspect = aspect / mode_aspect;
+	/* 5% slop or so, since we only get size in centimeters */
+	if (fabs(1.0 - metaspect) < 0.05) {
+	    if ((mode->HDisplay > x) && (mode->VDisplay > y)) {
+		x = mode->HDisplay;
+		y = mode->VDisplay;
+	    }
+	}
+    }
+
+    if (!x || !y) {
+	xf86DrvMsg(scrp->scrnIndex, X_WARNING,
+		   "No driver-provided modes found\n");
+	return;
+    }
+
+    *vx = x;
+    *vy = y;
+
+    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+	       "Estimated virtual size for aspect ratio %.4f is %dx%d\n",
+	       aspect, *vx, *vy);
+}
+
 /*
  * xf86ValidateModes
  *
@@ -1426,6 +1477,9 @@
 	virtX = virtualX;
 	virtY = virtualY;
 	scrp->virtualFrom = X_CONFIG;
+    } else if (!modeNames || !*modeNames) {
+	/* No virtual size given in the config, try to infer */
+	inferVirtualSize(scrp, availModes, &virtualX, &virtualY);
     }
 
     /* Print clock ranges and scaled clocks */
--- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.infer-virtual	2006-08-11 17:16:12.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-11 17:16:12.000000000 -0400
@@ -127,9 +127,8 @@
 /*
  * TODO:
  *  - for those with access to the VESA DMT standard; review please.
- *  - swap M_T_DEFAULT for M_T_EDID_...
  */
-#define MODEPREFIX(name) NULL, NULL, name, 0,M_T_DEFAULT
+#define MODEPREFIX(name) NULL, NULL, name, 0,M_T_DRIVER
 #define MODESUFFIX   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0
 
 DisplayModeRec DDCEstablishedModes[17] = {
@@ -182,6 +181,7 @@
         if (timing[i].hsize && timing[i].vsize && timing[i].refresh) {
             Mode =  xf86CVTMode(timing[i].hsize, timing[i].vsize,
                                 timing[i].refresh, FALSE, FALSE);
+	    Mode->type = M_T_DRIVER;
             Modes = xf86ModesAdd(Modes, Mode);
         }
 
@@ -192,7 +192,8 @@
  *
  */
 static DisplayModePtr
-DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing)
+DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
+			  int preferred)
 {
     DisplayModePtr Mode;
 
@@ -217,7 +218,9 @@
     xf86snprintf(Mode->name, 20, "%dx%d", timing->h_active,
                  timing->v_active);
     
-    Mode->type = M_T_DEFAULT; /* get ourselves a nice type of our own */
+    Mode->type = M_T_DRIVER;
+    if (preferred)
+	Mode->type |= M_T_PREFERRED;
     
     Mode->Clock = timing->clock / 1000.0;
     
@@ -302,6 +305,7 @@
     DisplayModePtr Modes = NULL, Mode;
     int i, clock;
     Bool have_hsync = FALSE, have_vrefresh = FALSE;
+    int preferred = 1;
     
     if (!Monitor || !DDC)
         return;
@@ -382,7 +386,9 @@
             break;
         case DT:
             Mode = DDCModeFromDetailedTiming(scrnIndex, 
-                                             &DDC->det_mon[i].section.d_timings);
+                                             &DDC->det_mon[i].section.d_timings,
+					     preferred);
+	    preferred = 0;
             Modes = xf86ModesAdd(Modes, Mode);
             break;
         case DS_STD_TIMINGS:



From fedora-cvs-commits at redhat.com  Tue Aug 15 21:03:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 17:03:17 -0400
Subject: rpms/glibc/devel .cvsignore, 1.165, 1.166 glibc-fedora.patch, 1.171,
	1.172 glibc.spec, 1.256, 1.257 sources, 1.189, 1.190
Message-ID: <200608152103.k7FL3HM4023450@cvs.devel.redhat.com>

Author: jakub

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- .cvsignore	15 Aug 2006 06:07:32 -0000	1.165
+++ .cvsignore	15 Aug 2006 21:03:13 -0000	1.166
@@ -1,2 +1,2 @@
-glibc-20060815T0533.tar.bz2
-glibc-fedora-20060815T0533.tar.bz2
+glibc-20060815T2033.tar.bz2
+glibc-fedora-20060815T2033.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/ml_IN                                    |   38 -
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 58 files changed, 1413 insertions(+), 650 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- glibc-fedora.patch	15 Aug 2006 08:45:05 -0000	1.171
+++ glibc-fedora.patch	15 Aug 2006 21:03:13 -0000	1.172
@@ -1,5 +1,5 @@
---- glibc-20060815T0533/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060815T0533-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060815T2033/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060815T2033-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060815T0533/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060815T0533-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060815T2033/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060815T2033-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060815T0533/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060815T0533-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060815T2033/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060815T2033-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060815T0533/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060815T0533-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060815T2033/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060815T2033-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060815T0533/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060815T0533-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060815T2033/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060815T2033-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060815T0533/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060815T0533-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060815T2033/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060815T2033-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060815T0533/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060815T0533-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060815T2033/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060815T2033-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060815T0533/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060815T0533-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060815T2033/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060815T2033-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060815T0533/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060815T0533-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060815T2033/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060815T2033-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060815T0533/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060815T0533-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060815T2033/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060815T2033-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060815T0533/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T0533-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060815T2033/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T2033-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-20060815T0533/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T0533-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060815T2033/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T2033-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-20060815T0533/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060815T0533-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060815T2033/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060815T2033-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060815T0533/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060815T0533-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060815T2033/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060815T2033-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060815T0533/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060815T0533-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060815T2033/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060815T2033-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060815T0533/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060815T0533-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060815T2033/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060815T2033-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060815T0533/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060815T0533-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060815T2033/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060815T2033-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060815T0533/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060815T0533-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060815T2033/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060815T2033-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060815T0533/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
-+++ glibc-20060815T0533-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
+--- glibc-20060815T2033/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
++++ glibc-20060815T2033-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
 @@ -77,6 +77,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060815T0533/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060815T0533-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060815T2033/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060815T2033-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060815T0533/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
-+++ glibc-20060815T0533-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
+--- glibc-20060815T2033/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
++++ glibc-20060815T2033-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20060815T0533/localedata/locales/ml_IN	13 Aug 2006 05:51:50 -0000	1.8
-+++ glibc-20060815T0533-fedora/localedata/locales/ml_IN	20 Oct 2005 06:59:51 -0000	1.3.2.2
+--- glibc-20060815T2033/localedata/locales/ml_IN	13 Aug 2006 05:51:50 -0000	1.8
++++ glibc-20060815T2033-fedora/localedata/locales/ml_IN	20 Oct 2005 06:59:51 -0000	1.3.2.2
 @@ -90,10 +90,10 @@ abday     "<U0D1E><U0D3E>";"<U0D24><U0D3
  "<U0D36>"
  %
@@ -941,8 +941,8 @@
  %
  %
  % Equivalent of AM PM
---- glibc-20060815T0533/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T0533-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060815T2033/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T2033-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -1013,8 +1013,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060815T0533/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060815T0533-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060815T2033/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060815T2033-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -1042,8 +1042,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060815T0533/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060815T0533-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060815T2033/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060815T2033-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>
@@ -1119,8 +1119,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060815T0533/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060815T0533-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060815T2033/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060815T2033-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)
@@ -1176,17 +1176,17 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060815T0533/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060815T0533-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060815T2033/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060815T2033-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060815T0533/nptl/ChangeLog	14 Aug 2006 23:11:18 -0000	1.908
-+++ glibc-20060815T0533-fedora/nptl/ChangeLog	15 Aug 2006 05:53:48 -0000	1.706.2.96
-@@ -1011,6 +1011,15 @@
+--- glibc-20060815T2033/nptl/ChangeLog	15 Aug 2006 13:41:04 -0000	1.909
++++ glibc-20060815T2033-fedora/nptl/ChangeLog	15 Aug 2006 20:43:51 -0000	1.706.2.97
+@@ -1018,6 +1018,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1202,7 +1202,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1747,6 +1756,11 @@
+@@ -1754,6 +1763,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1214,7 +1214,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3821,6 +3835,11 @@
+@@ -3828,6 +3842,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1226,26 +1226,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060815T0533/nptl/Makefile	13 Aug 2006 01:53:28 -0000	1.184
-+++ glibc-20060815T0533-fedora/nptl/Makefile	15 Aug 2006 05:53:48 -0000	1.157.2.24
-@@ -122,7 +122,7 @@ libpthread-routines = init vars events v
- 		      pthread_mutexattr_getprotocol \
- 		      pthread_mutexattr_setprotocol \
- 		      pthread_mutexattr_getprioceiling \
--		      pthread_mutexattr_setprioceiling \
-+		      pthread_mutexattr_setprioceiling tpp \
- 		      pthread_mutex_getprioceiling pthread_mutex_setprioceiling
- #		      pthread_setuid pthread_seteuid pthread_setreuid \
- #		      pthread_setresuid \
-@@ -258,7 +258,7 @@ tests = tst-typesizes \
- 	tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \
- 	tst-getpid1 tst-getpid2 tst-getpid3 \
- 	tst-initializers1 $(patsubst %,tst-initializers1-%,c89 gnu89 c99 gnu99)
--xtests = tst-setuid1 tst-setuid1-static
-+xtests = tst-setuid1 tst-setuid1-static tst-mutexpp1 tst-mutexpp6 tst-mutexpp10
- 
- # Files which must not be linked with libpthread.
- tests-nolibpthread = tst-unload
+--- glibc-20060815T2033/nptl/Makefile	15 Aug 2006 06:53:01 -0000	1.185
++++ glibc-20060815T2033-fedora/nptl/Makefile	15 Aug 2006 20:43:52 -0000	1.157.2.25
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1268,8 +1250,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060815T0533/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060815T0533-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060815T2033/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060815T2033-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;
@@ -1294,8 +1276,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T2033-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>
 +
@@ -1303,8 +1285,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
-+++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
+--- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
++++ glibc-20060815T2033-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
 @@ -68,6 +68,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1640,8 +1622,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060815T2033-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.
@@ -1787,8 +1769,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060815T2033-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
@@ -1889,8 +1871,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060815T2033-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.
@@ -2032,8 +2014,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
-+++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
+--- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
++++ glibc-20060815T2033-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
 @@ -49,6 +49,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2421,8 +2403,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060815T0533/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060815T0533-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060815T2033-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
@@ -2517,8 +2499,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060815T0533/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060815T0533-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060815T2033/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060815T2033-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2541,8 +2523,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060815T0533/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060815T0533-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060815T2033/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060815T2033-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2561,8 +2543,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060815T0533/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060815T0533-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060815T2033/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060815T2033-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
@@ -2574,8 +2556,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060815T0533/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060815T0533-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060815T2033/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060815T2033-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
@@ -2616,8 +2598,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060815T0533/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
-+++ glibc-20060815T0533-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
+--- glibc-20060815T2033/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
++++ glibc-20060815T2033-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2651,8 +2633,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060815T0533/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T0533-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060815T2033/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T2033-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 =
@@ -2669,8 +2651,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060815T0533/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060815T0533-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060815T2033/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060815T2033-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
@@ -2686,8 +2668,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-20060815T0533/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060815T0533-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060815T2033/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060815T2033-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2701,8 +2683,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060815T0533/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060815T0533-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060815T2033/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060815T2033-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))
@@ -2714,8 +2696,8 @@
  endif
  endif
  
---- glibc-20060815T0533/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060815T0533-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060815T2033/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060815T2033-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.  */
@@ -3067,8 +3049,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060815T0533/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T0533-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060815T2033/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T2033-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.
@@ -3154,8 +3136,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060815T0533/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20060815T0533-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20060815T2033/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20060815T2033-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3170,8 +3152,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20060815T0533/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
-+++ glibc-20060815T0533-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+--- glibc-20060815T2033/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20060815T2033-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
 @@ -18,11 +18,14 @@
     02111-1307 USA.  */
  
@@ -3219,8 +3201,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060815T0533/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060815T0533-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060815T2033/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060815T2033-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;
@@ -3263,8 +3245,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060815T0533/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060815T0533-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060815T2033/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060815T2033-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"
@@ -3274,8 +3256,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060815T0533/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060815T0533-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060815T2033/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060815T2033-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;
@@ -3321,8 +3303,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060815T0533/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T0533-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060815T2033/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T2033-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.
@@ -3383,8 +3365,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060815T0533/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060815T0533-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060815T2033/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060815T2033-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)
@@ -3417,44 +3399,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060815T0533/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T0533-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060815T2033/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T2033-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-20060815T0533/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T0533-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060815T2033/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060815T2033-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-20060815T0533/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060815T0533-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060815T2033/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060815T2033-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- libc/sysdeps/unix/sysv/linux/clock_settime.c	2006-08-15 07:35:15.000000000 +0200
-+++ libc/sysdeps/unix/sysv/linux/clock_settime.c	2006-08-15 10:41:50.000000000 +0200
-@@ -22,7 +22,7 @@
- #include "kernel-posix-cpu-timers.h"
- #include <kernel-features.h>
- 
--#ifndef HAVE_CLOCK_GETTIME_VSYSCALL
-+#ifndef HAVE_CLOCK_GETRES_VSYSCALL
- # undef INTERNAL_VSYSCALL
- # define INTERNAL_VSYSCALL INTERNAL_SYSCALL
- # undef INLINE_VSYSCALL
-@@ -43,7 +43,7 @@ maybe_syscall_settime_cpu (clockid_t clo
-   if (!__libc_missing_posix_cpu_timers)
-     {
-       INTERNAL_SYSCALL_DECL (err);
--      int r = INTERNAL_VSYSCALL (clock_settime, err, 2, clock_id, tp);
-+      int r = INTERNAL_SYSCALL (clock_settime, err, 2, clock_id, tp);
-       if (!INTERNAL_SYSCALL_ERROR_P (r, err))
-         return 0;
- 


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- glibc.spec	15 Aug 2006 06:07:33 -0000	1.256
+++ glibc.spec	15 Aug 2006 21:03:14 -0000	1.257
@@ -1,9 +1,9 @@
-%define glibcdate 20060815T0533
+%define glibcdate 20060815T2033
 %define glibcname glibc
-%define glibcsrcdir glibc-20060815T0533
+%define glibcsrcdir glibc-20060815T2033
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 20
+%define glibcrelease 21
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -48,6 +48,7 @@
 # For initial glibc bootstraps it can be commented out
 BuildPreReq: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.17.10-1
 BuildPreReq: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext
+BuildPreReq: /bin/ps, /bin/kill
 # This is to ensure that __frame_state_for is exported by glibc
 # will be compatible with egcs 1.x.y
 BuildPreReq: gcc >= 3.2
@@ -790,13 +791,13 @@
 BuildFlags="-march=%{_target_cpu} -DUSE_CFA_VAL_EXPRESSION"
 %endif
 %ifarch i686
-BuildFlags="-march=i686 -mtune=pentium4 -DUSE_CFA_VAL_EXPRESSION"
+BuildFlags="-march=i686 -mtune=generic -DUSE_CFA_VAL_EXPRESSION"
 %endif
 %ifarch i386
 BuildFlags="$BuildFlags -mno-tls-direct-seg-refs"
 %endif
 %ifarch x86_64
-BuildFlags="-DUSE_CFA_VAL_EXPRESSION"
+BuildFlags="-mtune=generic -DUSE_CFA_VAL_EXPRESSION"
 %endif
 %ifarch alphaev6
 BuildFlags="-mcpu=ev6"
@@ -1141,14 +1142,23 @@
 
 # Increase timeouts
 export TIMEOUTFACTOR=16
+parent=$$
 echo ====================TESTING=========================
 cd build-%{nptl_target_cpu}-linuxnptl
-make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || :
+( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
+  sleep 10s
+  teepid="`ps -eo ppid,pid,command | grep ^${parent}' [0-9]\+ tee' | cut -d' ' -f2`"
+  [ -n "$teepid" ] && kill $teepid
+) | tee check.log || :
 cd ..
 %if %{buildxen}
 echo ====================TESTING -mno-tls-direct-seg-refs=============
 cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
-make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || :
+( make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1
+  sleep 10s
+  teepid="`ps -eo ppid,pid,command | grep ^${parent}' [0-9]\+ tee' | cut -d' ' -f2`"
+  [ -n "$teepid" ] && kill $teepid
+) | tee check.log || :
 cd ..
 %endif
 echo ====================TESTING DETAILS=================
@@ -1443,6 +1453,11 @@
 %endif
 
 %changelog
+* Tue Aug 15 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-21
+- if some test gets stuck, kill the tee process after make check
+  finishes
+- build with -mtune=generic on i686 and x86_64
+
 * Tue Aug 15 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-20
 - PTHREAD_PRIO_PROTECT support
 - fix errno if nice() fails (#201826)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- sources	15 Aug 2006 06:07:33 -0000	1.189
+++ sources	15 Aug 2006 21:03:14 -0000	1.190
@@ -1,2 +1,2 @@
-60860331ff9ef46584d9439cd34a0c17  glibc-20060815T0533.tar.bz2
-f8260c46a66ee9b9357885a3c92c8f73  glibc-fedora-20060815T0533.tar.bz2
+b8442d6999a506e200b6236788365811  glibc-20060815T2033.tar.bz2
+ad4ce00bad0bd6dec3e3efa7f83313be  glibc-fedora-20060815T2033.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 15 21:56:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 17:56:11 -0400
Subject: rpms/kernel/devel config-rhel-generic, 1.8, 1.9 kernel-2.6.spec,
	1.2567, 1.2568
Message-ID: <200608152156.k7FLuB7P003142@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
	config-rhel-generic kernel-2.6.spec 
Log Message:
enabled CONFIG_VIDEO_DEV to allow x86_64 to compile again.
removed a couple of useless config options in config-rhel-generic




Index: config-rhel-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/config-rhel-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-rhel-generic	19 Jul 2006 19:25:13 -0000	1.8
+++ config-rhel-generic	15 Aug 2006 21:56:07 -0000	1.9
@@ -62,7 +62,6 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_GAMMA is not set
 # CONFIG_DRM_SIS is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_MWAVE is not set
@@ -88,7 +87,6 @@
 # CONFIG_JOYSTICK_SPACEORB is not set
 # CONFIG_JOYSTICK_SPACEBALL is not set
 # CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDDLER is not set
 # CONFIG_JOYSTICK_DB9 is not set
 # CONFIG_JOYSTICK_GAMECON is not set
 # CONFIG_JOYSTICK_TURBOGRAFX is not set
@@ -109,7 +107,6 @@
 # CONFIG_RADIO_TYPHOON is not set
 # CONFIG_RADIO_TYPHOON_PROC_FS=y
 # CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_VIDEO_DEV is not set
 # CONFIG_PLIP is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_3DFX is not set


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2567
retrieving revision 1.2568
diff -u -r1.2567 -r1.2568
--- kernel-2.6.spec	15 Aug 2006 18:13:35 -0000	1.2567
+++ kernel-2.6.spec	15 Aug 2006 21:56:07 -0000	1.2568
@@ -1689,6 +1689,10 @@
 
 %changelog
 * Tue Aug 15 2006 Don Zickus <dzickus at redhat.com>
+- cleanup config-rhel-generic to compile again
+- removed useless options in config-rhel-generic
+
+* Tue Aug 15 2006 Don Zickus <dzickus at redhat.com>
 - ppc64 spec cleanups
 
 * Mon Aug 14 2006 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Aug 16 01:38:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 21:38:09 -0400
Subject: rpms/rgmanager/devel rgmanager.spec,1.33,1.34
Message-ID: <200608160138.k7G1c8qF008489@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8429

Modified Files:
	rgmanager.spec 
Log Message:
Bumped release.


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rgmanager.spec	11 Aug 2006 16:31:31 -0000	1.33
+++ rgmanager.spec	16 Aug 2006 01:38:01 -0000	1.34
@@ -12,7 +12,7 @@
 
 Name: rgmanager
 Version: 2.0.5
-Release: 0
+Release: 1
 License: GPL,LGPL
 Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux



From fedora-cvs-commits at redhat.com  Wed Aug 16 01:39:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 21:39:08 -0400
Subject: rpms/rgmanager/devel rgmanager.spec,1.34,1.35
Message-ID: <200608160139.k7G1d8g6008805@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8774

Modified Files:
	rgmanager.spec 
Log Message:
Added dist tag to release.


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rgmanager.spec	16 Aug 2006 01:38:01 -0000	1.34
+++ rgmanager.spec	16 Aug 2006 01:39:06 -0000	1.35
@@ -12,7 +12,7 @@
 
 Name: rgmanager
 Version: 2.0.5
-Release: 1
+Release: 1%{?dist}
 License: GPL,LGPL
 Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux



From fedora-cvs-commits at redhat.com  Wed Aug 16 01:41:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 21:41:15 -0400
Subject: rpms/cman/devel cman.spec,1.66,1.67
Message-ID: <200608160141.k7G1fFoW009289@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9200

Modified Files:
	cman.spec 
Log Message:
Bumped Release.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- cman.spec	15 Aug 2006 17:38:33 -0000	1.66
+++ cman.spec	16 Aug 2006 01:41:11 -0000	1.67
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager



From fedora-cvs-commits at redhat.com  Wed Aug 16 02:07:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 22:07:30 -0400
Subject: rpms/squirrelmail/devel
	squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch, NONE,
	1.1 squirrelmail.spec, 1.45,
	1.46 squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch,
	1.1, NONE
Message-ID: <200608160207.k7G27UAW008266@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8252

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch 
Removed Files:
	squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch 
Log Message:
more Japanese filename fixes (#195639)


squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch:
 mime.php |   49 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 13 deletions(-)

--- NEW FILE squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch ---
diff -ruNp squirrelmail-1.4.6.org/functions/mime.php squirrelmail-1.4.6/functions/mime.php
--- squirrelmail-1.4.6.org/functions/mime.php	2006-08-15 13:10:40.000000000 +0900
+++ squirrelmail-1.4.6/functions/mime.php	2006-08-15 15:39:53.000000000 +0900
@@ -249,6 +249,7 @@ function translateText(&$body, $wrap_at,
 
     require_once(SM_PATH . 'functions/url_parser.php');
 
+    $charset = strtolower($charset);
     $body_ary = explode("\n", $body);
     for ($i=0; $i < count($body_ary); $i++) {
         $line = $body_ary[$i];
@@ -312,6 +313,14 @@ function formatBody($imap_stream, $messa
     }
 
     $body = '';
+    if (!$charset_converted) {
+        if ($charset == 'iso-2022-jp' || $charset == 'shift_jis' || $charset == 'euc-jp' ||
+           ($squirrelmail_language == 'ja_JP' &&
+           ($charset == 'utf-8' || $charset == '' || $charset == 'us-ascii'))) {
+           $body = $languages['ja_JP']['XTRA_CODE']('decode', $body);
+           $charset_converted = true;
+        }
+    }
     $urlmailbox = urlencode($mailbox);
     $body_message = getEntity($message, $ent_num);
     if (($body_message->header->type0 == 'text') ||
@@ -319,12 +328,15 @@ function formatBody($imap_stream, $messa
         $body = mime_fetch_body ($imap_stream, $id, $ent_num);
         $body = decodeBody($body, $body_message->header->encoding);
 
-        if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
-                function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
-            if (mb_detect_encoding($body) != 'ASCII') {
-                $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body);
-            }
+        $charset_converted = false;
+        if (strtolower($body_message->header->getParameter('charset')) == 'iso-2022-jp' &&
+           isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+           function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+           if (mb_detect_encoding($body) != 'ASCII') {
+               $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body);
+           }
         }
+	
         $hookResults = do_hook("message_body", $body);
         $body = $hookResults[1];
 
@@ -584,6 +596,13 @@ function decodeBody($body, $encoding) {
          * str_replace("\r\n", "\n", $body); call.
          */
         $body = quoted_printable_decode($body);
+
+        if ($squirrelmail_language != 'ja_JP') {
+            while (ereg("=n", $body)) {
+                $body = ereg_replace ("=n", '', $body);
+            }
+        }
+
     } elseif ($encoding == 'base64') {
         $body = base64_decode($body);
     }
@@ -2142,13 +2161,14 @@ function SendDownloadHeaders($type0, $ty
         $isIE6plus = true;
     }
 
-    if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
-            function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
-        $filename =
-            $languages[$squirrelmail_language]['XTRA_CODE']('downloadfilename', $filename, $HTTP_USER_AGENT);
-    } else {
-        $filename = ereg_replace('[\\/:\*\?"<>\|;]', '_', str_replace('&#32;', ' ', $filename));
-    }
+    if($squirrelmail_language != 'ja_JP')
+        if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+                function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+            $filename =
+                $languages[$squirrelmail_language]['XTRA_CODE']('downloadfilename', $filename, $HTTP_USER_AGENT);
+        } else {
+            $filename = ereg_replace('[\\/:\*\?"<>\|;]', '_', str_replace('&#32;', ' ', $filename));
+        }
 
     // A Pox on Microsoft and it's Internet Explorer!
     //
@@ -2163,7 +2183,10 @@ function SendDownloadHeaders($type0, $ty
     // version
     //set all the Cache Control Headers for IE
     if ($isIE) {
-        $filename=rawurlencode($filename);
+        if($squirrelmail_language != 'ja_JP')
+               $filename=rawurlencode($filename);
+	else 
+	       $filename = mb_convert_encoding($filename,"SJIS");
         header ("Pragma: public");
         header ("Cache-Control: no-store, max-age=0, no-cache, must-revalidate"); // HTTP/1.1
         header ("Cache-Control: post-check=0, pre-check=0", false);


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- squirrelmail.spec	11 Aug 2006 18:44:11 -0000	1.45
+++ squirrelmail.spec	16 Aug 2006 02:07:24 -0000	1.46
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -17,7 +17,7 @@
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.7-20060702.tar.bz2
 Source5: config_local.php
 Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
-Patch2:  squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch
+Patch2:  squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch
 Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
 Patch4:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
 Patch5:  squirrelmail-1.4.7-ja-translate.patch
@@ -41,7 +41,7 @@
 %prep
 %setup -q -n squirrelmail-%{version}
 %patch1 -p1
-%patch2 -p0
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
@@ -246,6 +246,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Tue Aug 15 2006 Warren Togami <wtogami at redhat.com> 1.4.8-2
+- more Japanese filename fixes (#195639)
+
 * Fri Aug 11 2006 Warren Togami <wtogami at redhat.com> 1.4.8-1
 - 1.4.8 release with CVE-2006-4019 and upstream bug fixes
 


--- squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 16 02:32:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 15 Aug 2006 22:32:26 -0400
Subject: rpms/glib2/devel .cvsignore, 1.56, 1.57 glib2.spec, 1.104,
	1.105 sources, 1.56, 1.57
Message-ID: <200608160232.k7G2WQAb023690@cvs.devel.redhat.com>

Author: mclasen

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	22 Jul 2006 19:26:48 -0000	1.56
+++ .cvsignore	16 Aug 2006 02:32:23 -0000	1.57
@@ -1 +1 @@
-glib-2.12.1.tar.bz2
+glib-2.12.2.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- glib2.spec	22 Jul 2006 19:26:48 -0000	1.104
+++ glib2.spec	16 Aug 2006 02:32:23 -0000	1.105
@@ -2,8 +2,8 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.12.1
-Release: 1
+Version: 2.12.2
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
@@ -88,6 +88,7 @@
 %defattr(-, root, root)
 
 %{libdir}/lib*.so
+# we need the static library here
 %{libdir}/lib*.a
 %{_libdir}/glib-2.0
 %{_includedir}/*
@@ -99,6 +100,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.2-1.fc6
+- Update to 2.12.2
+
 * Sat Jul 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-1
 - Update to 2.12.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	22 Jul 2006 19:26:48 -0000	1.56
+++ sources	16 Aug 2006 02:32:23 -0000	1.57
@@ -1 +1 @@
-97786d2a03f0f190bd782749139dc10c  glib-2.12.1.tar.bz2
+45471ca86af288b7a48116ab2b498d0c  glib-2.12.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 16 04:18:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 00:18:40 -0400
Subject: rpms/kernel/devel/configs config-generic,1.242,1.243
Message-ID: <200608160418.k7G4Ie4S003898@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
another experiment


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- config-generic	15 Aug 2006 03:30:36 -0000	1.242
+++ config-generic	16 Aug 2006 04:18:31 -0000	1.243
@@ -2535,8 +2535,8 @@
 # They aren't that much of a performance impact, and the value
 # from getting out-of-tree modules fixed is worth the trade-off.
 CONFIG_DEBUG_HIGHMEM=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_VM=y



From fedora-cvs-commits at redhat.com  Wed Aug 16 04:36:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 00:36:40 -0400
Subject: rpms/screen/devel screen.spec,1.32,1.33
Message-ID: <200608160436.k7G4ae5a016001@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/screen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15921

Modified Files:
	screen.spec 
Log Message:
- Don't use %makeinstall, instead make install.
- Change DDESTDIR to DESTDIR to do the right thing.
- Comment out utf patch as it is no longer necessary.
- Add dist tag
- Change PreReq to correct Requires(pre), Requires(post), Requires(preun) 
- Don't use RPM_SOURCE_DIR, reference the source file directly
- Do the compiling (make) in %build, not %install
- Don't replace /etc/screenrc if the user has modified it
- Ditto /etc/pam.d/screen
- Change the buildroot to follow guidelines



Index: screen.spec
===================================================================
RCS file: /cvs/dist/rpms/screen/devel/screen.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- screen.spec	13 Jul 2006 18:42:06 -0000	1.32
+++ screen.spec	16 Aug 2006 04:36:34 -0000	1.33
@@ -1,12 +1,14 @@
 Summary: A screen manager that supports multiple logins on one terminal
 Name: screen
 Version: 4.0.2
-Release: 15.1
+Release: 16%{?dist}
 License: GPL2
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
-Prereq: /sbin/install-info, /usr/sbin/groupadd
-BuildRoot: %{_tmppath}/%{name}-root
+Requires(pre): /usr/sbin/groupadd
+Requires(preun): /sbin/install-info
+Requires(post): /sbin/install-info
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel texinfo pam-devel libtool
 
 #
@@ -31,7 +33,8 @@
 # Due to the way the build system creates rpms in a buildroot
 # we need this tweak for utf8encodings
 #
-Patch4: screen-3.9.11-utf8-install.patch
+# This is not needed anymore
+#Patch4: screen-3.9.11-utf8-install.patch
 
 # We need to allow rpm to strip the binary and we don't have a
 # libelf dependancy
@@ -54,6 +57,7 @@
 Patch10: screen-4.0.2-lib64.patch
 Patch11: screen-4.0.2-maxstr.patch
 
+
 %description
 The screen utility allows you to have multiple logins on just one
 terminal. Screen is useful for users who telnet into a machine or are
@@ -71,7 +75,7 @@
 %patch1 -p1 -b .ia64
 %patch2 -p1 -b .screenrc
 #%patch3 -p1 -b .etcscreenrc
-%patch4 -p1 -b .utf8-install
+#%patch4 -p1 -b .utf8-install
 %patch5 -p1 -b .no-stripping-or-elf
 #%patch8 -p1 -b .logname
 
@@ -122,13 +126,14 @@
 make clean
 
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" make $BUILD_MAKE_FLAGS
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/etc
-%makeinstall DDESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 ( cd $RPM_BUILD_ROOT
   rm -f .%{_bindir}/screen.old .%{_bindir}/screen
@@ -141,7 +146,7 @@
 # Better not forget to copy the pam file around
 #
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-install -m 0644 $RPM_SOURCE_DIR/screen.pam $RPM_BUILD_ROOT/etc/pam.d/screen
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/screen
 
 # Create the socket dir
 mkdir -p $RPM_BUILD_ROOT/var/run/screen
@@ -175,10 +180,22 @@
 %{_infodir}/screen.info*
 %{_datadir}/screen
 %attr(775,root,screen) %{_localstatedir}/run/screen
-%config /etc/screenrc
-%config /etc/pam.d/screen
+%config(noreplace) /etc/screenrc
+%config(noreplace) /etc/pam.d/screen
 
 %changelog
+* Wed Aug 16 2006 Jesse Keating <jkeating at redhat.com> - 4.0.2-16
+- Don't use %%makeinstall, instead make install.
+- Change DDESTDIR to DESTDIR to do the right thing.
+- Comment out utf patch as it is no longer necessary.
+- Add dist tag
+- Change PreReq to correct Requires(pre), Requires(post), Requires(preun) 
+- Don't use RPM_SOURCE_DIR, reference the source file directly
+- Do the compiling (make) in %%build, not %%install
+- Don't replace /etc/screenrc if the user has modified it
+- Ditto /etc/pam.d/screen
+- Change the buildroot to follow guidelines
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.0.2-15.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 04:46:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 00:46:08 -0400
Subject: rpms/openais/devel .cvsignore, 1.6, 1.7 openais.spec, 1.11,
	1.12 sources, 1.6, 1.7 cpg-hash-collision.patch, 1.1,
	NONE makefile-install-clm.patch, 1.1, NONE revision-1173.patch,
	1.1, NONE revision-1179.patch, 1.1, NONE revision-1180.patch,
	1.1, NONE revision-1181.patch, 1.1, NONE revision-1182.patch,
	1.1, NONE revision-1183.patch, 1.1, NONE revision-1184.patch,
	1.1, NONE revision-1185.patch, 1.1, NONE revision-1186.patch,
	1.1, NONE revision-1187.patch, 1.1, NONE revision-1188.patch,
	1.1, NONE revision-1189.patch, 1.1, NONE revision-1190.patch,
	1.1, NONE revision-1191.patch, 1.1, NONE revision-1192.patch,
	1.1, NONE revision-1193.patch, 1.1, NONE
Message-ID: <200608160446.k7G4k8Hb017614@cvs.devel.redhat.com>

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17570/devel

Modified Files:
	.cvsignore openais.spec sources 
Removed Files:
	cpg-hash-collision.patch makefile-install-clm.patch 
	revision-1173.patch revision-1179.patch revision-1180.patch 
	revision-1181.patch revision-1182.patch revision-1183.patch 
	revision-1184.patch revision-1185.patch revision-1186.patch 
	revision-1187.patch revision-1188.patch revision-1189.patch 
	revision-1190.patch revision-1191.patch revision-1192.patch 
	revision-1193.patch 
Log Message:
auto-import openais-0.80.1-1.0 on branch devel from openais-0.80.1-1.0.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Jul 2006 01:45:46 -0000	1.6
+++ .cvsignore	16 Aug 2006 04:45:44 -0000	1.7
@@ -1 +1 @@
-openais-0.80.tar.gz
+openais-0.80.1.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openais.spec	10 Aug 2006 21:27:04 -0000	1.11
+++ openais.spec	16 Aug 2006 04:45:44 -0000	1.12
@@ -1,30 +1,12 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 0.80
-Release: 1.2
+Version: 0.80.1
+Release: 1.0
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz
 Patch0: openais-0.76-defaultconfig.patch
-Patch1: revision-1173.patch
-Patch2: revision-1179.patch
-Patch3: revision-1180.patch
-Patch4: revision-1181.patch
-Patch5: revision-1182.patch
-Patch6: revision-1183.patch
-Patch7: revision-1184.patch
-Patch8: revision-1185.patch
-Patch9: revision-1186.patch
-Patch10: revision-1187.patch
-Patch11: revision-1188.patch
-Patch12: revision-1189.patch
-Patch13: revision-1190.patch
-Patch14: revision-1191.patch
-Patch15: revision-1192.patch
-Patch16: revision-1193.patch
-Patch17: cpg-hash-collision.patch
-Patch18: makefile-install-clm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x
 Requires(pre): /usr/sbin/useradd
@@ -48,25 +30,6 @@
 
 %prep
 %setup -q -n openais-%{version}
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
-%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
-%patch15 -p0
-%patch16 -p0
-%patch17 -p0
-%patch18 -p1
 
 %build
 # -O3 required for performance reasons
@@ -200,6 +163,9 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
+* Tue Aug 15 2006 Steven Dake <sdake at redhat.com> - 0.80.1-1.0
+- New stable upstream release
+
 * Thu Aug 10 2006 Steven Dake <sdake at redhat.com> - 0.80-1.2
 - Move libraries to openais package.
 - Add cpg hash collision patch.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Jul 2006 01:45:46 -0000	1.6
+++ sources	16 Aug 2006 04:45:44 -0000	1.7
@@ -1 +1 @@
-4e26b613d64a1e43968ef955258da153  openais-0.80.tar.gz
+7414d683d51cb00c46456125c7e1b2b0  openais-0.80.1.tar.gz


--- cpg-hash-collision.patch DELETED ---


--- makefile-install-clm.patch DELETED ---


--- revision-1173.patch DELETED ---


--- revision-1179.patch DELETED ---


--- revision-1180.patch DELETED ---


--- revision-1181.patch DELETED ---


--- revision-1182.patch DELETED ---


--- revision-1183.patch DELETED ---


--- revision-1184.patch DELETED ---


--- revision-1185.patch DELETED ---


--- revision-1186.patch DELETED ---


--- revision-1187.patch DELETED ---


--- revision-1188.patch DELETED ---


--- revision-1189.patch DELETED ---


--- revision-1190.patch DELETED ---


--- revision-1191.patch DELETED ---


--- revision-1192.patch DELETED ---


--- revision-1193.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 16 05:57:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 01:57:55 -0400
Subject: rpms/kernel/devel git-gregkh.patch, 1.6, 1.7 kernel-2.6.spec, 1.2568,
	1.2569 linux-2.6-utrace.patch, 1.17,
	1.18 linux-2.6-hotplug-cpu-workqueue.patch, 1.1, NONE
Message-ID: <200608160557.k7G5vsdE011028@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	git-gregkh.patch kernel-2.6.spec linux-2.6-utrace.patch 
Removed Files:
	linux-2.6-hotplug-cpu-workqueue.patch 
Log Message:
update to new gregkh tree

git-gregkh.patch:
 b/Documentation/fb/imacfb.txt                 |   31 +
 b/Documentation/kobject.txt                   |    2 
 b/MAINTAINERS                                 |    8 
 b/Makefile                                    |   23 +
 b/arch/arm/common/rtctime.c                   |    1 
 b/arch/arm/kernel/traps.c                     |    2 
 b/arch/arm/mach-ixp4xx/common-pci.c           |    2 
 b/arch/arm/mach-ixp4xx/gtwx5715-setup.c       |    7 
 b/arch/i386/kernel/traps.c                    |    2 
 b/arch/ia64/kernel/traps.c                    |    2 
 b/arch/powerpc/kernel/traps.c                 |    2 
 b/arch/x86_64/kernel/traps.c                  |    2 
 b/arch/xtensa/kernel/traps.c                  |    2 
 b/drivers/ide/pci/generic.c                   |   30 +
 b/drivers/md/dm-mpath.c                       |    3 
 b/drivers/media/dvb/bt8xx/dst.c               |   58 +--
 b/drivers/media/dvb/dvb-core/Makefile         |    6 
 b/drivers/media/radio/Kconfig                 |   12 
 b/drivers/media/radio/Makefile                |    1 
 b/drivers/media/radio/dsbr100.c               |  430 ++++++++++++++++++++++++++
 b/drivers/media/video/Kconfig                 |   12 
 b/drivers/media/video/Makefile                |    2 
 b/drivers/media/video/compat_ioctl32.c        |   32 +
 b/drivers/media/video/cx25840/cx25840-core.c  |    4 
 b/drivers/media/video/cx88/cx88-video.c       |    4 
 b/drivers/media/video/msp3400-kthreads.c      |    4 
 b/drivers/media/video/pwc/Kconfig             |    2 
 b/drivers/media/video/pwc/pwc-if.c            |    1 
 b/drivers/media/video/saa7134/saa7134-video.c |    2 
 b/drivers/media/video/tuner-types.c           |   14 
 b/drivers/media/video/v4l1-compat.c           |    4 
 b/drivers/media/video/v4l2-common.c           |    6 
 b/drivers/media/video/videodev.c              |    2 
 b/drivers/media/video/vivi.c                  |    4 
 b/drivers/mmc/mmc_queue.c                     |    3 
 b/drivers/mmc/wbsd.c                          |    9 
 b/drivers/net/myri10ge/myri10ge.c             |    2 
 b/drivers/net/tg3.c                           |   51 +--
 b/drivers/net/tg3.h                           |    8 
 b/drivers/pci/hotplug/Kconfig                 |    7 
 b/drivers/pci/hotplug/pciehp.h                |    5 
 b/drivers/pci/hotplug/pciehp_hpc.c            |    4 
 b/drivers/s390/char/tape_class.c              |    2 
 b/drivers/s390/cio/device_fsm.c               |    1 
 b/drivers/s390/cio/device_ops.c               |    3 
 b/drivers/scsi/arm/Kconfig                    |    3 
 b/drivers/scsi/arm/scsi.h                     |    2 
 b/drivers/scsi/ata_piix.c                     |    5 
 b/drivers/scsi/libata-core.c                  |   34 --
 b/drivers/scsi/libata-scsi.c                  |   13 
 b/drivers/scsi/sata_sil24.c                   |    1 
 b/drivers/usb/host/ohci-au1xxx.c              |    1 
 b/drivers/usb/input/appletouch.c              |    2 
 b/drivers/usb/misc/usbtest.c                  |    5 
 b/drivers/usb/serial/ftdi_sio.c               |    2 
 b/drivers/usb/serial/ftdi_sio.h               |    6 
 b/drivers/usb/serial/ipaq.c                   |    2 
 b/drivers/usb/storage/unusual_devs.h          |   10 
 b/drivers/video/Kconfig                       |    2 
 b/drivers/video/imacfb.c                      |   49 ++
 b/fs/adfs/super.c                             |    2 
 b/fs/fuse/file.c                              |   10 
 b/fs/jfs/inode.c                              |   16 
 b/fs/jfs/jfs_inode.h                          |    1 
 b/fs/jfs/super.c                              |  118 ++++++-
 b/fs/locks.c                                  |    6 
 b/fs/ocfs2/dlm/dlmmaster.c                    |    1 
 b/fs/ocfs2/dlm/dlmunlock.c                    |   43 +-
 b/fs/ocfs2/localalloc.c                       |    8 
 b/fs/ocfs2/ocfs2.h                            |    2 
 b/fs/ocfs2/suballoc.c                         |  261 +++++++++++++--
 b/fs/ocfs2/suballoc.h                         |    2 
 b/fs/ocfs2/super.c                            |    8 
 b/fs/udf/super.c                              |    7 
 b/fs/xfs/xfs_alloc.c                          |  103 +++---
 b/include/linux/fb.h                          |    2 
 b/include/linux/kernel.h                      |    1 
 b/include/linux/mm.h                          |    1 
 b/include/linux/skbuff.h                      |   19 +
 b/include/media/v4l2-dev.h                    |    2 
 b/kernel/futex.c                              |   16 
 b/kernel/hrtimer.c                            |    2 
 b/kernel/panic.c                              |    1 
 b/kernel/timer.c                              |   41 --
 b/kernel/workqueue.c                          |   33 +
 b/mm/swap.c                                   |   20 +
 b/net/bridge/netfilter/ebt_ulog.c             |    3 
 b/net/core/dst.c                              |    3 
 b/net/core/pktgen.c                           |    4 
 b/net/core/rtnetlink.c                        |   15 
 b/net/core/skbuff.c                           |    4 
 b/net/core/wireless.c                         |   24 +
 b/net/ipv4/ip_output.c                        |    4 
 b/net/ipv4/netfilter/arp_tables.c             |   27 +
 b/net/ipv4/netfilter/ip_tables.c              |   33 +
 b/net/ipv4/netfilter/ipt_ULOG.c               |    5 
 b/net/ipv4/netfilter/ipt_hashlimit.c          |   11 
 b/net/ipv4/route.c                            |    2 
 b/net/ipv4/tcp_output.c                       |   12 
 b/net/ipv4/tcp_probe.c                        |    3 
 b/net/ipv6/addrconf.c                         |    4 
 b/net/ipv6/ip6_output.c                       |    2 
 b/net/ipv6/netfilter/ip6_tables.c             |   34 +-
 b/net/ipx/af_ipx.c                            |   10 
 b/net/llc/llc_sap.c                           |    3 
 b/net/netfilter/nfnetlink_log.c               |    3 
 b/net/netfilter/xt_string.c                   |    2 
 b/net/xfrm/xfrm_policy.c                      |   27 +
 b/scripts/mod/file2alias.c                    |    2 
 b/sound/oss/Kconfig                           |    6 
 b/sound/pci/Kconfig                           |   70 ++--
 b/usr/Makefile                                |    3 
 drivers/media/video/dsbr100.c                 |  430 --------------------------
 113 files changed, 1536 insertions(+), 887 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 git-gregkh.patch
Index: git-gregkh.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-gregkh.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- git-gregkh.patch	11 Aug 2006 22:21:35 -0000	1.6
+++ git-gregkh.patch	16 Aug 2006 05:57:43 -0000	1.7
@@ -1,3 +1,509 @@
+commit e0e92632715f08dddeddb72b76e04c20126e1f67
+Author: Hans de Goede <j.w.r.degoede at hhs.nl>
+Date:   Tue Aug 15 12:09:27 2006 +0200
+
+    [PATCH] PATCH: 1 line 2.6.18 bugfix: modpost-64bit-fix.patch
+    
+    There is a small but annoying bug in scripts/mod/file2alias.c which causes
+    it to generate invalid aliases for input devices on 64 bit archs. This causes
+    joydev.ko to not be automaticly loaded when inserting a joystick, resulting in
+    a non working joystick (for the average user).
+    
+    In scripts/mod/file2alias.c is the following code for generating the input
+    aliases:
+    static void do_input(char *alias,
+                         kernel_ulong_t *arr, unsigned int min, unsigned int max)
+    {
+            unsigned int i;
+    
+            for (i = min; i < max; i++)
+                    if (arr[i / BITS_PER_LONG] & (1 << (i%BITS_PER_LONG)))
+                            sprintf(alias + strlen(alias), "%X,*", i);
+    }
+    
+    On 32 bits systems, this correctly generates "0,*" for the first alias, "8,*"
+    for the second etc.
+    
+    However on 64 bits it generates: "0,*20,*" resp "8,*28,*" Notice how it adds 20
+    + first entry (hex) ! to the list of hex codes, which is 32 more then the first
+    entry, thus is because the bit test above wraps at 32 bits instead of 64.
+    
+    scripts/mod/file2alias.c, line 379 reads:
+                    if (arr[i / BITS_PER_LONG] & (1 << (i%BITS_PER_LONG)))
+    That should be:
+                    if (arr[i / BITS_PER_LONG] & (1L << (i%BITS_PER_LONG)))
+    
+    Notice the added 'L' after the 1, otherwise that is an 32 bit int instead of a
+    64 bit long, and when that int gets shifted >= 32 times, appearantly the number
+    by which to shift is wrapped at 5 bits ( % 32) causing it to test a bit 32 bits
+    too low.
+    
+    The patch below makes the nescesarry 1 char change :)
+    
+    Signed-off-by: Hans de Goede <j.w.r.degoede at hhs.nl>
+    Acked-by: Rusty Russell <rusty at rustcorp.com.au>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit 80914d97aa0c61fbfd8eadd120c863b6229f0809
+Merge: 74361cb... 883d4ca...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date:   Tue Aug 15 12:31:36 2006 -0700
+
+    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
+
+commit 74361cb6828398a96167b3234e186fbd731e5f30
+Author: Trond Myklebust <trond.myklebust at fys.uio.no>
+Date:   Mon Aug 14 08:54:48 2006 -0700
+
+    [PATCH] fcntl(F_SETSIG) fix
+    
+    fcntl(F_SETSIG) no longer works on leases because
+    lease_release_private_callback() gets called as the lease is copied in
+    order to initialise it.
+    
+    The problem is that lease_alloc() performs an unnecessary initialisation,
+    which sets the lease_manager_ops.  Avoid the problem by allocating the
+    target lease structure using locks_alloc_lock().
+    
+    Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
+    Signed-off-by: Andrew Morton <akpm at osdl.org>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit 1d7ea7324ae7a59f8e17e4ba76a2707c1e6f24d2
+Author: Alexander Zarochentsev <zam at namesys.com>
+Date:   Sun Aug 13 23:24:27 2006 -0700
+
+    [PATCH] fuse: fix error case in fuse_readpages
+    
+    Don't let fuse_readpages leave the @pages list not empty when exiting
+    on error.
+    
+    [akpm at osdl.org: kernel-doc fixes]
+    Signed-off-by: Alexander Zarochentsev <zam at namesys.com>
+    Signed-off-by: Miklos Szeredi <miklos at szeredi.hu>
+    Signed-off-by: Andrew Morton <akpm at osdl.org>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit 9b41ea7289a589993d3daabc61f999b4147872c4
+Author: Andrew Morton <akpm at osdl.org>
+Date:   Sun Aug 13 23:24:26 2006 -0700
+
+    [PATCH] workqueue: remove lock_cpu_hotplug()
+    
+    Use a private lock instead.  It protects all per-cpu data structures in
+    workqueue.c, including the workqueues list.
+    
+    Fix a bug in schedule_on_each_cpu(): it was forgetting to lock down the
+    per-cpu resources.
+    
+    Unfixed long-standing bug: if someone unplugs the CPU identified by
+    `singlethread_cpu' the kernel will get very sick.
+    
+    Cc: Dave Jones <davej at codemonkey.org.uk>
+    Signed-off-by: Andrew Morton <akpm at osdl.org>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit 2b25742556b1a351ce4821f6feddcba23bdd930b
+Author: Michal Januszewski <spock at gentoo.org>
+Date:   Sun Aug 13 23:24:26 2006 -0700
+
+    [PATCH] fbdev: include backlight.h only when __KERNEL__ is defined
+    
+    linux/backlight.h pulls in header files (eg.  ioport.h) that break
+    compilation of userspace programs.  To solve the problem, only include
+    backlight.h in fb.h if compiling kernel stuff.
+    
+    Signed-off-by: Michal Januszewski <spock at gentoo.org>
+    Cc: "Antonino A. Daplas" <adaplas at pol.net>
+    Signed-off-by: Andrew Morton <akpm at osdl.org>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit e579dcbf23604cb33c08b5c3c3ac06ca36e7c683
+Author: john stultz <johnstul at us.ibm.com>
+Date:   Sun Aug 13 23:24:24 2006 -0700
+
+    [PATCH] futex_handle_fault always fails
+    
+    We found this issue last week w/ the -RT kernel, but it seems the same
+    issue is in mainline as well.
+    
+    Basically it is possible for futex_unlock_pi to return without actually
+    freeing the lock.  This is due to buggy logic in the use of
+    futex_handle_fault() and its attempt argument in a failure case.
+    
+    Looking at futex.c the logic is as follows:
+    
+    1) In futex_unlock_pi() we start w/ ret=0 and we go down to the first
+       futex_atomic_cmpxchg_inatomic(), where we find uval==-EFAULT.  We then
+       jump to the pi_faulted label.
+    
+    2) From pi_faulted: We increment attempt, unlock the sem and hit the
+       retry label.
+    
+    3) From the retry label, with ret still zero, we again hit EFAULT on the
+       first futex_atomic_cmpxchg_inatomic(), and again goto the pi_faulted
+       label.
+    
+    4) Again from pi_faulted: we increment attempt and enter the
+       conditional, where we call futex_handle_fault.
+    
+    5) futex_handle_fault fails, and we goto the out_unlock_release_sem
+       label.
+    
+    6) From out_unlock_release_sem we return, and since ret is still zero,
+       we return without error, while never actually unlocking the lock.
+    
+    Issue #1: at the first futex_atomic_cmpxchg_inatomic() we should probably
+    be setting ret=-EFAULT before jumping to pi_faulted: However in our case
+    this doesn't really affect anything, as the glibc we're using ignores the
+    error value from futex_unlock_pi().
+    
+    Issue #2: Look at futex_handle_fault(), its first conditional will return
+    -EFAULT if attempt is >= 2.  However, from the "if(attempt++)
+    futex_handle_fault(attempt)" logic above, we'll *never* call
+    futex_handle_fault when attempt is less then two.  So we never get a chance
+    to even try to fault the page in.
+    
+    The following patch addresses these two issues by 1) Always setting ret to
+    -EFAULT if futex_handle_fault fails, and 2) Removing the = in
+    futex_handle_fault's (attempt >= 2) check.
+    
+    I'm really not sure this is the right fix, but wanted to bring it up so
+    folks knew the issue is alive and well in the current -git tree.  From
+    looking at the git logs the logic was first introduced (then later copied
+    to other places) in the following commit almost a year ago:
+    
+    http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=4732efbeb997189d9f9b04708dc26bf8613ed721;hp=5b039e681b8c5f30aac9cc04385cc94be45d0823
+    
+    Cc: Rusty Russell <rusty at rustcorp.com.au>
+    Cc: Ingo Molnar <mingo at elte.hu>
+    Acked-by: Thomas Gleixner <tglx at linutronix.de>
+    Signed-off-by: Andrew Morton <akpm at osdl.org>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit 6997a6faaa129a1c91775f7344c8d371a05178ea
+Author: Kirill Korotaev <dev at sw.ru>
+Date:   Sun Aug 13 23:24:23 2006 -0700
+
+    [PATCH] sys_getppid oopses on debug kernel
+    
+    sys_getppid() optimization can access a freed memory.  On kernels with
+    DEBUG_SLAB turned ON, this results in Oops.  As Dave Hansen noted, this
[...2082 lines suppressed...]
@@ -4059,6 +6198,24 @@
  	TCP_INC_STATS(TCP_MIB_ACTIVEOPENS);
  
  	/* Timer for repeating the SYN until an answer. */
+diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
+index b343532..dab37d2 100644
+--- a/net/ipv4/tcp_probe.c
++++ b/net/ipv4/tcp_probe.c
+@@ -130,11 +130,12 @@ static ssize_t tcpprobe_read(struct file
+ 	error = wait_event_interruptible(tcpw.wait,
+ 					 __kfifo_len(tcpw.fifo) != 0);
+ 	if (error)
+-		return error;
++		goto out_free;
+ 
+ 	cnt = kfifo_get(tcpw.fifo, tbuf, len);
+ 	error = copy_to_user(buf, tbuf, cnt);
+ 
++out_free:
+ 	vfree(tbuf);
+ 
+ 	return error ? error : cnt;
 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
 index 8ea1e36..0c5042e 100644
 --- a/net/ipv6/addrconf.c
@@ -4077,6 +6234,72 @@
  
  		addrconf_dad_start(ifp, 0);
  		in6_ifa_put(ifp);
+diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
+index 69451af..4fb47a2 100644
+--- a/net/ipv6/ip6_output.c
++++ b/net/ipv6/ip6_output.c
+@@ -1095,7 +1095,7 @@ alloc_new_skb:
+ 				skb_prev->csum = csum_sub(skb_prev->csum,
+ 							  skb->csum);
+ 				data += fraggap;
+-				skb_trim(skb_prev, maxfraglen);
++				pskb_trim_unique(skb_prev, maxfraglen);
+ 			}
+ 			copy = datalen - transhdrlen - fraggap;
+ 			if (copy < 0) {
+diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
+index f26898b..c9d6b23 100644
+--- a/net/ipv6/netfilter/ip6_tables.c
++++ b/net/ipv6/netfilter/ip6_tables.c
+@@ -1398,23 +1398,39 @@ static int __init ip6_tables_init(void)
+ {
+ 	int ret;
+ 
+-	xt_proto_init(AF_INET6);
++	ret = xt_proto_init(AF_INET6);
++	if (ret < 0)
++		goto err1;
+ 
+ 	/* Noone else will be downing sem now, so we won't sleep */
+-	xt_register_target(&ip6t_standard_target);
+-	xt_register_target(&ip6t_error_target);
+-	xt_register_match(&icmp6_matchstruct);
++	ret = xt_register_target(&ip6t_standard_target);
++	if (ret < 0)
++		goto err2;
++	ret = xt_register_target(&ip6t_error_target);
++	if (ret < 0)
++		goto err3;
++	ret = xt_register_match(&icmp6_matchstruct);
++	if (ret < 0)
++		goto err4;
+ 
+ 	/* Register setsockopt */
+ 	ret = nf_register_sockopt(&ip6t_sockopts);
+-	if (ret < 0) {
+-		duprintf("Unable to register sockopts.\n");
+-		xt_proto_fini(AF_INET6);
+-		return ret;
+-	}
++	if (ret < 0)
++		goto err5;
+ 
+ 	printk("ip6_tables: (C) 2000-2006 Netfilter Core Team\n");
+ 	return 0;
++
++err5:
++	xt_unregister_match(&icmp6_matchstruct);
++err4:
++	xt_unregister_target(&ip6t_error_target);
++err3:
++	xt_unregister_target(&ip6t_standard_target);
++err2:
++	xt_proto_fini(AF_INET6);
++err1:
++	return ret;
+ }
+ 
+ static void __exit ip6_tables_fini(void)
 diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
 index aa34ff4..bef3f61 100644
 --- a/net/ipx/af_ipx.c
@@ -4102,6 +6325,101 @@
  	if (ipx->ipx_checksum != IPX_NO_CHECKSUM &&
  	   ipx->ipx_checksum != ipx_cksum(ipx, ipx_pktsize))
  		goto drop;
+diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
+index 42eb0c3..61cb8cf 100644
+--- a/net/llc/llc_sap.c
++++ b/net/llc/llc_sap.c
+@@ -330,6 +330,9 @@ static void llc_sap_mcast(struct llc_sap
+ 		if (llc->laddr.lsap != laddr->lsap)
+ 			continue;
+ 
++		if (llc->dev != skb->dev)
++			continue;
++
+ 		skb1 = skb_clone(skb, GFP_ATOMIC);
+ 		if (!skb1)
+ 			break;
+diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
+index 61cdda4..b59d3b2 100644
+--- a/net/netfilter/nfnetlink_log.c
++++ b/net/netfilter/nfnetlink_log.c
+@@ -366,6 +366,9 @@ __nfulnl_send(struct nfulnl_instance *in
+ 	if (timer_pending(&inst->timer))
+ 		del_timer(&inst->timer);
+ 
++	if (!inst->skb)
++		return 0;
++
+ 	if (inst->qlen > 1)
+ 		inst->lastnlh->nlmsg_type = NLMSG_DONE;
+ 
+diff --git a/net/netfilter/xt_string.c b/net/netfilter/xt_string.c
+index d8e3891..275330f 100644
+--- a/net/netfilter/xt_string.c
++++ b/net/netfilter/xt_string.c
+@@ -37,7 +37,7 @@ static int match(const struct sk_buff *s
+ 
+ 	return (skb_find_text((struct sk_buff *)skb, conf->from_offset, 
+ 			     conf->to_offset, conf->config, &state) 
+-			     != UINT_MAX) && !conf->invert;
++			     != UINT_MAX) ^ conf->invert;
+ }
+ 
+ #define STRING_TEXT_PRIV(m) ((struct xt_string_info *) m)
+diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
+index f35bc67..3da67ca 100644
+--- a/net/xfrm/xfrm_policy.c
++++ b/net/xfrm/xfrm_policy.c
+@@ -1134,12 +1134,33 @@ int __xfrm_route_forward(struct sk_buff 
+ }
+ EXPORT_SYMBOL(__xfrm_route_forward);
+ 
++/* Optimize later using cookies and generation ids. */
++
+ static struct dst_entry *xfrm_dst_check(struct dst_entry *dst, u32 cookie)
+ {
+-	/* If it is marked obsolete, which is how we even get here,
+-	 * then we have purged it from the policy bundle list and we
+-	 * did that for a good reason.
++	/* Code (such as __xfrm4_bundle_create()) sets dst->obsolete
++	 * to "-1" to force all XFRM destinations to get validated by
++	 * dst_ops->check on every use.  We do this because when a
++	 * normal route referenced by an XFRM dst is obsoleted we do
++	 * not go looking around for all parent referencing XFRM dsts
++	 * so that we can invalidate them.  It is just too much work.
++	 * Instead we make the checks here on every use.  For example:
++	 *
++	 *	XFRM dst A --> IPv4 dst X
++	 *
++	 * X is the "xdst->route" of A (X is also the "dst->path" of A
++	 * in this example).  If X is marked obsolete, "A" will not
++	 * notice.  That's what we are validating here via the
++	 * stale_bundle() check.
++	 *
++	 * When a policy's bundle is pruned, we dst_free() the XFRM
++	 * dst which causes it's ->obsolete field to be set to a
++	 * positive non-zero integer.  If an XFRM dst has been pruned
++	 * like this, we want to force a new route lookup.
+ 	 */
++	if (dst->obsolete < 0 && !stale_bundle(dst))
++		return dst;
++
+ 	return NULL;
+ }
+ 
+diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
+index 4431292..e2de650 100644
+--- a/scripts/mod/file2alias.c
++++ b/scripts/mod/file2alias.c
+@@ -391,7 +391,7 @@ static void do_input(char *alias,
+ 	unsigned int i;
+ 
+ 	for (i = min; i < max; i++)
+-		if (arr[i / BITS_PER_LONG] & (1 << (i%BITS_PER_LONG)))
++		if (arr[i / BITS_PER_LONG] & (1L << (i%BITS_PER_LONG)))
+ 			sprintf(alias + strlen(alias), "%X,*", i);
+ }
+ 
 diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
 index f4980ca..1b7c3df 100644
 --- a/sound/oss/Kconfig


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2568
retrieving revision 1.2569
diff -u -r1.2568 -r1.2569
--- kernel-2.6.spec	15 Aug 2006 21:56:07 -0000	1.2568
+++ kernel-2.6.spec	16 Aug 2006 05:57:44 -0000	1.2569
@@ -399,7 +399,6 @@
 Patch1630: linux-2.6-mm-suspend-improvements.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
 Patch1650: linux-2.6-serial-460800.patch
-Patch1660: linux-2.6-hotplug-cpu-workqueue.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
@@ -900,8 +899,6 @@
 %patch1640 -p1
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
-# Fix hotplug CPU locking in workqueue creation.
-%patch1660 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
 # Only print migration info on SMP
@@ -1688,6 +1685,9 @@
 %endif
 
 %changelog
+* Wed Aug 16 2006 Dave Jones <davej at redhat.com>
+- Update to latest GregKH tree.
+
 * Tue Aug 15 2006 Don Zickus <dzickus at redhat.com>
 - cleanup config-rhel-generic to compile again
 - removed useless options in config-rhel-generic

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  455 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  839 ++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/ia32_entry.S             |    2 
 arch/ia64/ia32/sys_ia32.c               |   23 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/ia64/kernel/signal.c               |    4 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  785 +++++++--------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  553 +++++++++--
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  688 ++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |   14 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   74 +
 include/asm-ia64/tracehook.h            |   67 +
 include/asm-powerpc/tracehook.h         |  303 ++++++
 include/asm-s390/tracehook.h            |  105 ++
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  106 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   88 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  645 ++++++++++++
 include/linux/utrace.h                  |  481 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  253 +----
 kernel/fork.c                           |   62 -
 kernel/ptrace.c                         | 1592 +++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    4 
 kernel/utrace.c                         | 1526 ++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |   54 -
 security/selinux/include/objsec.h       |    1 
 93 files changed, 8330 insertions(+), 3319 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-2.6-utrace.patch	11 Aug 2006 00:47:52 -0000	1.17
+++ linux-2.6-utrace.patch	16 Aug 2006 05:57:45 -0000	1.18
@@ -5356,29 +5356,20 @@
  }
  
  /*
-- * Accessing ->group_leader->real_parent is not SMP-safe, it could
-+ * Accessing ->group_leader->parent is not SMP-safe, it could
-  * change from under us. However, rather than getting any lock
-  * we can use an optimistic algorithm: get the parent
-  * pid, and go back and check that the parent is still
-@@ -1345,7 +1345,7 @@ asmlinkage long sys_getppid(void)
- 	struct task_struct *me = current;
- 	struct task_struct *parent;
- 
--	parent = me->group_leader->real_parent;
-+	parent = me->group_leader->parent;
- 	for (;;) {
- 		pid = parent->tgid;
- #if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
-@@ -1357,7 +1357,7 @@ asmlinkage long sys_getppid(void)
- 		 * parent pointer:
- 		 */
- 		smp_rmb();
--		parent = me->group_leader->real_parent;
-+		parent = me->group_leader->parent;
- 		if (old != parent)
- 			continue;
- }
+- * Accessing ->real_parent is not SMP-safe, it could
++ * Accessing ->parent is not SMP-safe, it could
+  * change from under us. However, we can use a stale
+  * value of ->real_parent under rcu_read_lock(), see
+  * release_task()->call_rcu(delayed_put_task_struct).
+@@ -1334,7 +1334,7 @@ asmlinkage long sys_getppid(void)
+ 	int pid;
+ 
+ 	rcu_read_lock();
+-	pid = rcu_dereference(current->real_parent)->tgid;
++	pid = rcu_dereference(current->parent)->tgid;
+ 	rcu_read_unlock();
+ 
+ 	return pid;
 --- linux-2.6/kernel/ptrace.c.utrace-ptrace-compat
 +++ linux-2.6/kernel/ptrace.c
 @@ -22,101 +22,15 @@


--- linux-2.6-hotplug-cpu-workqueue.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 16 07:27:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 03:27:54 -0400
Subject: rpms/autofs/devel
	autofs-5.0.1-rc1-allow-initial-numeric-in-hostname.patch, NONE,
	1.1 autofs-5.0.1-rc1-check-offset-mounts-before-umount.patch,
	NONE, 1.1 autofs-5.0.1-rc1-expire-individual-submounts.patch,
	NONE, 1.1 autofs-5.0.1-rc1-ino_index-locking.patch, NONE,
	1.1 autofs-5.0.1-rc1-more-expire-rework.patch, NONE,
	1.1 autofs-5.0.1-rc1-premature-submount-expire.patch, NONE,
	1.1 autofs.spec, 1.140, 1.141
Message-ID: <200608160727.k7G7Rsno010893@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-allow-initial-numeric-in-hostname.patch 
	autofs-5.0.1-rc1-check-offset-mounts-before-umount.patch 
	autofs-5.0.1-rc1-expire-individual-submounts.patch 
	autofs-5.0.1-rc1-ino_index-locking.patch 
	autofs-5.0.1-rc1-more-expire-rework.patch 
	autofs-5.0.1-rc1-premature-submount-expire.patch 
Log Message:
* Thu Aug 16 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.15
- expire individual submounts.
- add ino_index locking.
- fix nested submount expiring away when pwd is base of submount.
- more expire re-work to cope better with shutdown following cthon tests.
- allow hostname to start with numeric when validating.


autofs-5.0.1-rc1-allow-initial-numeric-in-hostname.patch:
 CHANGELOG           |    1 +
 modules/parse_sun.c |    3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-allow-initial-numeric-in-hostname.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 1969912..559f087 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@
 - add ino_index locking.
 - fix nested submount expiring away when pwd is base of submount.
 - more expire re-work to cope better with shutdown following cthon tests.
+- allow hostname to start with numeric when validating.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 08fd34d..1f1bc3c 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -666,9 +666,6 @@ static int validate_location(char *loc)
 
 	/* If a ':' is present now it must be a host name */
 	if (check_colon(ptr)) {
-		if (!isalpha(*ptr++))
-			return 0;
-
 		while (*ptr && *ptr != ':') {
 			if (!(isalnum(*ptr) ||
 			    *ptr == '-' || *ptr == '.' ||

autofs-5.0.1-rc1-check-offset-mounts-before-umount.patch:
 parse_subs.c |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-check-offset-mounts-before-umount.patch ---
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index 68bdf8d..a782146 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -417,9 +417,9 @@ cont:
 int umount_multi_triggers(struct autofs_point *ap, char *root, struct mapent *me, const char *base)
 {
 	char path[PATH_MAX + 1];
-	char *offset = path;
+	char *offset;
 	struct mapent *oe;
-	struct list_head *mm_root, *pos = NULL;
+	struct list_head *mm_root, *pos;
 	const char o_root[] = "/";
 	const char *mm_base;
 	int left, start;
@@ -434,12 +434,32 @@ int umount_multi_triggers(struct autofs_
 	else
 		mm_base = base;
 
-	offset = cache_get_offset(mm_base, offset, start, mm_root, &pos);
-	while (offset) {
+	pos = NULL;
+	offset = path;
+
+	/* Make sure "none" of the offsets have an active mount. */
+	while ((offset = cache_get_offset(mm_base, offset, start, mm_root, &pos))) {
 		oe = cache_lookup_offset(mm_base, offset, start, &me->multi_list);
 		/* root offset is a special case */
 		if (!oe || (strlen(oe->key) - start) == 1)
-			goto cont;
+			continue;
+
+		if (oe->ioctlfd != -1)
+			left++;
+	}
+
+	if (left)
+		return left;
+
+	pos = NULL;
+	offset = path;
+
+	/* Make sure "none" of the offsets have an active mount. */
+	while ((offset = cache_get_offset(mm_base, offset, start, mm_root, &pos))) {
+		oe = cache_lookup_offset(mm_base, offset, start, &me->multi_list);
+		/* root offset is a special case */
+		if (!oe || (strlen(oe->key) - start) == 1)
+			continue;
 
 		debug(ap->logopt, "umount offset %s", oe->key);
 
@@ -447,9 +467,6 @@ int umount_multi_triggers(struct autofs_
 			warn(ap->logopt, "failed to umount offset");
 			left++;
 		}
-cont:
-		offset = cache_get_offset(mm_base,
-				offset, start, &me->multi_list, &pos);
 	}
 
 	if (!left && me->multi == me) {

autofs-5.0.1-rc1-expire-individual-submounts.patch:
 CHANGELOG           |    1 
 daemon/direct.c     |   31 ++++++++++++-------
 daemon/indirect.c   |   14 ++++++--
 include/automount.h |    1 
 include/master.h    |    3 +
 lib/master.c        |   81 +++++++++++++++++++++++++++++++++++++---------------
 lib/mounts.c        |    2 -
 7 files changed, 92 insertions(+), 41 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-expire-individual-submounts.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 6fe9697..fe73ab8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@
 - review verbose message feedback and update.
 - correction for expire of multi-mounts.
 - spelling corrections to release notes (Jeff Moyer).
+- expire individual submounts.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/direct.c b/daemon/direct.c
index 4b6162b..b9c0f04 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -786,18 +786,23 @@ void *expire_proc_direct(void *arg)
 	if (status)
 		fatal(status);
 
-	master_notify_submounts(ap, ap->state);
-
 	/* Get a list of real mounts and expire them if possible */
 	mnts = get_mnt_list(_PROC_MOUNTS, "/", 0);
 	for (next = mnts; next; next = next->next) {
-		/* Skip submounts */
-		if (strstr(next->fs_type, "indirect"))
-			continue;
+		if (!strcmp(next->fs_type, "autofs")) {
+			/*
+			 * If we have submounts check if this path lives below
+			 * one of them and pass on state change.
+			 */
+			if (strstr(next->opts, "indirect")) {
+				master_notify_submount(ap, next->path, ap->state);
+				continue;
+			}
 
-		/* Skip offsets */
-		if (strstr(next->opts, "offset"))
-			continue;
+			/* Skip offsets */
+			if (strstr(next->opts, "offset"))
+				continue;
+		}
 
 		/*
 		 * All direct mounts must be present in the map
@@ -896,9 +901,10 @@ static void *do_expire_direct(void *arg)
 		send_fail(mt->ioctlfd, mt->wait_queue_token);
 	else {
 		struct mapent *me;
-		me = lookup_source_mapent(ap, mt->name, LKP_DISTINCT);
+		cache_readlock(mt->mc);
+		me = cache_lookup_distinct(mt->mc, mt->name);
 		me->ioctlfd = -1;
-		cache_unlock(me->source->mc);
+		cache_unlock(mt->mc);
 		send_ready(mt->ioctlfd, mt->wait_queue_token);
 		close(mt->ioctlfd);
 	}
@@ -1195,9 +1201,10 @@ cont:
 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);
 	if (status) {
 		struct mapent *me;
-		me = lookup_source_mapent(ap, mt->name, LKP_DISTINCT);
+		cache_readlock(mt->mc);
+		me = cache_lookup_distinct(mt->mc, mt->name);
 		me->ioctlfd = mt->ioctlfd;
-		cache_unlock(me->source->mc);
+		cache_unlock(mt->mc);
 		send_ready(mt->ioctlfd, mt->wait_queue_token);
 		msg("mounted %s", mt->name);
 	} else {
diff --git a/daemon/indirect.c b/daemon/indirect.c
index 8748413..dadb9ee 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -430,16 +430,22 @@ void *expire_proc_indirect(void *arg)
 	if (status)
 		fatal(status);
 
-	master_notify_submounts(ap, ap->state);
-
 	/* Get a list of real mounts and expire them if possible */
 	mnts = get_mnt_list(_PROC_MOUNTS, ap->path, 0);
 	for (next = mnts; next; next = next->next) {
 		char *ind_key;
 		int ret;
 
-		if (!strcmp(next->fs_type, "autofs"))
+		if (!strcmp(next->fs_type, "autofs")) {
+			/*
+			 * If we have submounts check if this path lives below
+			 * one of them and pass on the state change.
+			 */
+			if (strstr(next->opts, "indirect"))
+				master_notify_submount(ap, next->path, ap->state);
+
 			continue;
+		}
 
 		/*
 		 * If the mount corresponds to an offset trigger then
@@ -458,7 +464,7 @@ void *expire_proc_indirect(void *arg)
 		 */
 		me = lookup_source_mapent(ap, next->path, LKP_DISTINCT);
 		if (!me && ind_key)
-			lookup_source_mapent(ap, ind_key, LKP_NORMAL);
+			me = lookup_source_mapent(ap, ind_key, LKP_NORMAL);
 		if (!me)
 			continue;
 
diff --git a/include/automount.h b/include/automount.h
index 90a9c7a..267c7d1 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -437,7 +437,6 @@ struct autofs_point {
 	pthread_t exp_thread;		/* Thread that is expiring */
 	pthread_t readmap_thread;	/* Thread that is reading maps */
 	pthread_mutex_t state_mutex;	/* Protect state changes */
-	struct list_head state_queue;	/* Pending state transitions */
 	enum states state;		/* Current state */
 	int state_pipe[2];		/* State change router pipe */
 	unsigned dir_created;		/* Directory created for this mount? */
diff --git a/include/master.h b/include/master.h
index ada18d4..e25626d 100644
--- a/include/master.h
+++ b/include/master.h
@@ -97,7 +97,8 @@ void master_free_mapent_sources(struct m
 void master_free_mapent(struct master_mapent *);
 struct master *master_new(const char *, unsigned int, unsigned int);
 int master_read_master(struct master *, time_t, int);
-void master_notify_submounts(struct autofs_point *, enum states);
+int master_submount_list_empty(struct autofs_point *ap);
+int master_notify_submount(struct autofs_point *, const char *path, enum states);
 void master_signal_submount(struct autofs_point *, unsigned int);
 void master_notify_state_change(struct master *, int);
 int master_mount_mounts(struct master *, time_t, int);
diff --git a/lib/master.c b/lib/master.c
index d76ffac..1d66542 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -95,7 +95,6 @@ int master_add_autofs_point(struct maste
 		free(ap);
 		return 0;
 	}
-	INIT_LIST_HEAD(&ap->state_queue);
 
 	status = pthread_mutex_init(&ap->mounts_mutex, NULL);
 	if (status) {
@@ -735,34 +734,68 @@ int master_read_master(struct master *ma
 	return 1;
 }
 
-void master_notify_submounts(struct autofs_point *ap, enum states state)
+int master_submount_list_empty(struct autofs_point *ap)
+{
+	int res = 0;
+
+	mounts_mutex_lock(ap);
+	if (list_empty(&ap->submounts))
+		res = 1;
+	mounts_mutex_unlock(ap);
+
+	return res;
+}
+
+int master_notify_submount(struct autofs_point *ap, const char *path, enum states state)
 {
 	struct list_head *head, *p;
 	struct autofs_point *this;
 	pthread_t thid;
-	int status;
-
-	/* Initiate from master entries only */
-	if (ap->submount || list_empty(&ap->submounts))
-		return;
+	size_t plen = strlen(path);
+	int status, ret = 1;
 
 	mounts_mutex_lock(ap);
 
 	head = &ap->submounts;
-	p = head->next;
+	p = head->prev;
 	while (p != head) {
+		size_t len;
+
 		this = list_entry(p, struct autofs_point, mounts);
+		p = p->prev;
 
-		p = p->next;
+		if (!master_submount_list_empty(this)) {
+			if (!master_notify_submount(this, path, state)) {
+				ret = 0;
+				break;
+			}
+		}
+
+		len = strlen(this->path);
 
-		if (!list_empty(&this->submounts))
-			master_notify_submounts(this, state);
+		/* Initial path not the same */
+		if (strncmp(this->path, path, len))
+			continue;
+
+		/*
+		 * Part of submount tree?
+		 * We must wait till we get to submount itself.
+		 * If it is tell caller by returning true.
+		 */
+		if (plen > len) {
+			/* Not part of this directory tree */
+			if (path[len] != '/')
+				continue;
+			break;
+		}
+
+		/* Now we have a submount to expire */
 
 		state_mutex_lock(this);
 
 		if (this->state == ST_SHUTDOWN) {
 			state_mutex_unlock(this);
-			continue;
+			break;
 		}
 
 		nextstate(this->state_pipe[1], state);
@@ -775,17 +808,21 @@ void master_notify_submounts(struct auto
 			status = pthread_cond_wait(&ap->mounts_cond, &ap->mounts_mutex);
 			if (status)
 				fatal(status);
-			if (ap->mounts_signaled == MASTER_SUBMNT_JOIN) {
-				status = pthread_join(thid, NULL);
-				if (status)
-					fatal(status);
-			}
 		}
+
+		if (ap->mounts_signaled == MASTER_SUBMNT_JOIN) {
+			status = pthread_join(thid, NULL);
+			if (status)
+				fatal(status);
+		} else
+			ret = 0;
+
+		break;
 	}
 
 	mounts_mutex_unlock(ap);
 
-	return;
+	return ret;
 }
 
 void master_signal_submount(struct autofs_point *ap, unsigned int join)
@@ -797,13 +834,13 @@ void master_signal_submount(struct autof
 
 	mounts_mutex_lock(ap->parent);
 
-	if (join) {
+	ap->parent->mounts_signaled = join;
+
+	if (join == MASTER_SUBMNT_JOIN) {
 		/* We are finishing up */
 		ap->parent->submnt_count--;
 		list_del(&ap->mounts);
-		ap->parent->mounts_signaled = 1;
-	} else
-		ap->parent->mounts_signaled = 2;
+	}
 
 	status = pthread_cond_signal(&ap->parent->mounts_cond);
 	if (status)
diff --git a/lib/mounts.c b/lib/mounts.c
index f446a6a..46131cd 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -149,7 +149,7 @@ struct mnt_list *get_mnt_list(const char
 		mptr = list;
 		last = NULL;
 		while (mptr) {
-			if (len > strlen(mptr->path))
+			if (len >= strlen(mptr->path))
 				break;
 			last = mptr;
 			mptr = mptr->next;

autofs-5.0.1-rc1-ino_index-locking.patch:
 CHANGELOG           |    1 +
 include/automount.h |    1 +
 lib/cache.c         |   49 ++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 46 insertions(+), 5 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-ino_index-locking.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index fe73ab8..b469121 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,7 @@
 - correction for expire of multi-mounts.
 - spelling corrections to release notes (Jeff Moyer).
 - expire individual submounts.
+- add ino_index locking.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/include/automount.h b/include/automount.h
index 267c7d1..3192c92 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -129,6 +129,7 @@ #define EXPIRE_RETRIES		25
 struct mapent_cache {
 	pthread_rwlock_t rwlock;
 	unsigned int size;
+	pthread_mutex_t ino_index_mutex;
 	struct list_head *ino_index;
 	struct mapent **hash;
 };
diff --git a/lib/cache.c b/lib/cache.c
index 432270b..35dfa5a 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -96,6 +96,7 @@ void cache_lock_cleanup(void *arg)
 	struct mapent_cache *mc = (struct mapent_cache *) arg;
 
 	cache_unlock(mc);
+	return;
 }
 
 void cache_multi_lock(struct mapent *me)
@@ -128,6 +129,29 @@ void cache_multi_unlock(struct mapent *m
 	return;
 }
 
+void cache_multi_lock_cleanup(void *arg)
+{
+	struct mapent *me = (struct mapent *) arg;
+	cache_multi_unlock(me);
+	return;
+}
+
+static inline void ino_index_lock(struct mapent_cache *mc)
+{
+	int status = pthread_mutex_lock(&mc->ino_index_mutex);
+	if (status)
+		fatal(status);
+	return;
+}
+
+static inline void ino_index_unlock(struct mapent_cache *mc)
+{
+	int status = pthread_mutex_unlock(&mc->ino_index_mutex);
+	if (status)
+		fatal(status);
+	return;
+}
+
 struct mapent_cache *cache_init(struct map_source *map)
 {
 	struct mapent_cache *mc;
@@ -156,6 +180,10 @@ struct mapent_cache *cache_init(struct m
 		return NULL;
 	}
 
+	status = pthread_mutex_init(&mc->ino_index_mutex, NULL);
+	if (status)
+		fatal(status);
+
 	status = pthread_rwlock_init(&mc->rwlock, NULL);
 	if (status)
 		fatal(status);
@@ -201,10 +229,12 @@ int cache_set_ino_index(struct mapent_ca
 	if (!me)
 		return 0;
 
+	ino_index_lock(mc);
+	list_del_init(&me->ino_index);
 	list_add(&me->ino_index, &mc->ino_index[ino_index]);
-
 	me->dev = dev;
 	me->ino = ino;
+	ino_index_unlock(mc);
 
 	return 1;
 }
@@ -216,6 +246,7 @@ struct mapent *cache_lookup_ino(struct m
 	struct list_head *head, *p;
 	unsigned int ino_index;
 
+	ino_index_lock(mc);
 	ino_index = ino_hash(dev, ino);
 	head = &mc->ino_index[ino_index];
 
@@ -225,8 +256,10 @@ struct mapent *cache_lookup_ino(struct m
 		if (me->dev != dev || me->ino != ino)
 			continue;
 
+		ino_index_unlock(mc);
 		return me;
 	}
+	ino_index_unlock(mc);
 	return NULL;
 }
 
@@ -647,8 +680,9 @@ int cache_delete(struct mapent_cache *mc
 			status = pthread_mutex_destroy(&me->multi_mutex);
 			if (status)
 				fatal(status);
-			if (!list_empty(&me->ino_index))
-				list_del(&me->ino_index);
+			ino_index_lock(mc);
+			list_del(&me->ino_index);
+			ino_index_unlock(mc);
 			free(me->key);
 			if (me->mapent)
 				free(me->mapent);
@@ -670,8 +704,9 @@ int cache_delete(struct mapent_cache *mc
 		status = pthread_mutex_destroy(&me->multi_mutex);
 		if (status)
 			fatal(status);
-		if (!list_empty(&me->ino_index))
-			list_del(&me->ino_index);
+		ino_index_lock(mc);
+		list_del(&me->ino_index);
+		ino_index_unlock(mc);
 		free(me->key);
 		if (me->mapent)
 			free(me->mapent);
@@ -774,6 +809,10 @@ void cache_release(struct map_source *ma
 
 	cache_unlock(mc);
 
+	status = pthread_mutex_destroy(&mc->ino_index_mutex);
+	if (status)
+		fatal(status);
+
 	status = pthread_rwlock_destroy(&mc->rwlock);
 	if (status)
 		fatal(status);

autofs-5.0.1-rc1-more-expire-rework.patch:
 CHANGELOG           |    1 
 daemon/automount.c  |  104 ++++++++++++++++++++++++++++++----------------------
 daemon/direct.c     |   25 ++++++++----
 daemon/indirect.c   |   41 +++++++++++---------
 daemon/lookup.c     |   45 +++++++++++++++++++++-
 include/automount.h |    7 ++-
 lib/alarm.c         |    6 +--
 modules/parse_sun.c |  104 ++++++++++++++++++++++++++--------------------------
 8 files changed, 203 insertions(+), 130 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-more-expire-rework.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index fc939ad..1969912 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@
 - expire individual submounts.
 - add ino_index locking.
 - fix nested submount expiring away when pwd is base of submount.
+- more expire re-work to cope better with shutdown following cthon tests.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index cc6e9e0..446c184 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -304,12 +304,12 @@ static int counter_fn(const char *file, 
 }
 
 /* Count mounted filesystems and symlinks */
-int count_mounts(struct autofs_point *ap, const char *path)
+int count_mounts(const char *path, dev_t dev)
 {
 	struct counter_args counter;
 
 	counter.count = 0;
-	counter.dev = ap->dev;
+	counter.dev = dev;
 	
 	if (walk_tree(path, counter_fn, 0, &counter) == -1)
 		return -1;
@@ -366,26 +366,12 @@ static void update_map_cache(struct auto
 	return;
 }
 
-/* umount all filesystems mounted under path.  If incl is true, then
-   it also tries to umount path itself */
-int umount_multi(struct autofs_point *ap, const char *path, int incl)
+static int umount_subtree_mounts(struct autofs_point *ap, const char *path, unsigned int is_autofs_fs)
 {
 	struct mapent_cache *mc;
 	struct mapent *me;
-	struct statfs fs;
-	int is_autofs_fs;
-	int ret, left;
 	unsigned int is_mm_root;
-
-	debug(ap->logopt, "path %s incl %d", path, incl);
-
-	ret = statfs(path, &fs);
-	if (ret == -1) {
-		error(ap->logopt, "could not stat fs of %s", path);
-		return 1;
-	}
-
-	is_autofs_fs = fs.f_type == AUTOFS_SUPER_MAGIC ? 1 : 0;
+	int left;
 
 	me = lookup_source_mapent(ap, path, LKP_DISTINCT);
 	if (!me) {
@@ -395,74 +381,104 @@ int umount_multi(struct autofs_point *ap
 		if (ind_key)
 			ind_key++;
 
-		me = lookup_source_mapent(ap, ind_key, LKP_DISTINCT);
-		if (!me) {
-			warn(ap->logopt, "map entry not found for %s", path);
+		me = lookup_source_mapent(ap, ind_key, LKP_NORMAL);
+		if (!me)
 			return 0;
-		}
 	}
 
-	cache_multi_lock(me->parent);
-
 	mc = me->source->mc;
 	is_mm_root = (me->multi == me);
 
 	left = 0;
 
 	if (me->multi) {
-		struct autofs_point *oap = ap;
 		char *root, *base;
+		size_t ap_len;
 
-		if (ap->submount)
-			oap = ap->parent;
+		ap_len = strlen(ap->path);
 
-		if (is_mm_root && !strchr(me->key, '/')) {
+		if (!strchr(me->multi->key, '/')) {
 			/* Indirect multi-mount root */
-			root = alloca(strlen(ap->path) + strlen(me->key) + 2);
+			root = alloca(ap_len + strlen(me->multi->key) + 2);
 			strcpy(root, ap->path);
 			strcat(root, "/");
-			strcat(root, me->key);
-			base = NULL;
-		} else {
+			strcat(root, me->multi->key);
+		} else
 			root = me->multi->key;
+
+		if (is_mm_root)
+			base = NULL;
+		else
 			base = me->key + strlen(root);
-		}
 
-		if (umount_multi_triggers(oap, root, me, base)) {
+		/* Lock the closest parent nesting point for umount */
+		cache_multi_lock(me->parent);
+		if (umount_multi_triggers(ap, root, me, base)) {
 			warn(ap->logopt,
 			     "could not umount some offsets under %s", path);
 			left++;
 		}
+		cache_multi_unlock(me->parent);
 	}
 
-	if (left || is_autofs_fs) {
-		cache_multi_unlock(me->parent);
-		cache_unlock(mc);
+	cache_unlock(mc);
+
+	if (left || is_autofs_fs)
 		return left;
-	}
 
 	/*
 	 * If this is the root of a multi-mount we've had to umount
-	 * it already to ensure it's ok to remove any offset triggers
+	 * it already to ensure it's ok to remove any offset triggers.
 	 */
-	if (!is_mm_root) {
+	if (!is_mm_root && is_mounted(_PATH_MOUNTED, path, MNTS_REAL)) {
 		msg("unmounting dir = %s", path);
-
 		if (umount_ent(ap, path)) {
 			warn(ap->logopt, "could not umount dir %s", path);
 			left++;
 		}
 	}
 
+	return left;
+}
+
+/* umount all filesystems mounted under path.  If incl is true, then
+   it also tries to umount path itself */
+int umount_multi(struct autofs_point *ap, const char *path, int incl)
+{
+	struct statfs fs;
+	int is_autofs_fs;
+	int ret, left;
+
+	debug(ap->logopt, "path %s incl %d", path, incl);
+
+	ret = statfs(path, &fs);
+	if (ret == -1) {
+		error(ap->logopt, "could not stat fs of %s", path);
+		return 1;
+	}
+
+	is_autofs_fs = fs.f_type == AUTOFS_SUPER_MAGIC ? 1 : 0;
+
+	left = 0;
+
+	/*
+	 * If we are a submount we need to umount any offsets our
+	 * parent may have mounted over top of us.
+	 */
+	/*if (ap->submount)
+		left += umount_subtree_mounts(ap->parent, path, is_autofs_fs);*/
+
+	left += umount_subtree_mounts(ap, path, is_autofs_fs);
+
+	if (left || is_autofs_fs)
+		return left;
+
 	/* Delete detritus like unwanted mountpoints and symlinks */
 	if (left == 0) {
 		update_map_cache(ap, path);
 		check_rm_dirs(ap, path, incl);
 	}
 
-	cache_multi_unlock(me->parent);
-	cache_unlock(mc);
-
 	return left;
 }
 
diff --git a/daemon/direct.c b/daemon/direct.c
index b9c0f04..18b56fe 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -33,6 +33,7 @@ #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/poll.h>
 #include <sys/mount.h>
+#include <sys/vfs.h>
 #include <sched.h>
 #include <pwd.h>
 #include <grp.h>
@@ -114,7 +115,7 @@ int do_umount_autofs_direct(struct autof
 	char buf[MAX_ERR_BUF];
 	int ioctlfd, rv, left, retries;
 
-	left = umount_multi(ap, me->key, 1);
+	left = umount_multi(ap, me->key, 0);
 	if (left) {
 		warn(ap->logopt, "could not unmount %d dirs under %s",
 		     left, me->key);
@@ -258,9 +259,9 @@ static int unlink_mount_tree(struct auto
 	struct list_head *p;
 	int rv, ret;
 	pid_t pgrp = getpgrp();
-	char spgrp[10];
+	char spgrp[20];
 
-	sprintf(spgrp, "%d", pgrp);
+	sprintf(spgrp, "pgrp=%d", pgrp);
 
 	ret = 1;
 	list_for_each(p, list) {
@@ -727,7 +728,17 @@ out_err:
 
 static int expire_direct(int ioctlfd, const char *path, unsigned int when, unsigned int logopt)
 {
-	int ret, retries = EXPIRE_RETRIES;
+	char buf[MAX_ERR_BUF];
+	int ret, retries;
+	struct stat st;
+
+	if (fstat(ioctlfd, &st) == -1) {
+		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+		error(logopt, "fstat failed: %s", estr);
+		return 0;
+	}
+
+	retries = (count_mounts(path, st.st_dev) + 1) * EXPIRE_RETRIES;
 
 	while (retries--) {
 		struct timespec tm = {0, 100000000};
@@ -747,7 +758,7 @@ static int expire_direct(int ioctlfd, co
 		nanosleep(&tm, NULL);
 	}
 
-	return 1;
+	return (retries >= 0);
 }
 
 void *expire_proc_direct(void *arg)
@@ -824,10 +835,8 @@ void *expire_proc_direct(void *arg)
 		debug(ap->logopt, "send expire to trigger %s", next->path);
 
 		ret = expire_direct(ioctlfd, next->path, now, ap->logopt);
-		if (!ret) {
-			msg("mount apparently busy %s", next->path);
+		if (!ret)
 			ea->status++;
-		}
 	}
 	free_mnt_list(mnts);
 
diff --git a/daemon/indirect.c b/daemon/indirect.c
index dadb9ee..e04f164 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -82,9 +82,9 @@ static int unlink_mount_tree(struct auto
 	struct mnt_list *this;
 	int rv, ret;
 	pid_t pgrp = getpgrp();
-	char spgrp[10];
+	char spgrp[20];
 
-	sprintf(spgrp, "%d", pgrp);
+	sprintf(spgrp, "pgrp=%d", pgrp);
 
 	ret = 1;
 	this = mnts;
@@ -367,9 +367,19 @@ force_umount:
 	return rv;
 }
 
-static int expire_indirect(int ioctlfd, const char *path, unsigned int when, unsigned int count, unsigned int logopt)
+static int expire_indirect(struct autofs_point *ap, int ioctlfd, const char *path, unsigned int when)
 {
-	int ret, retries = count;
+	char buf[MAX_ERR_BUF];
+	int ret, retries;
+	struct stat st;
+
+	if (fstat(ioctlfd, &st) == -1) {
+		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+		error(ap->logopt, "fstat failed: %s", estr);
+		return 0;
+	}
+
+	retries = (count_mounts(path, st.st_dev) + 1) * EXPIRE_RETRIES;
 
 	while (retries--) {
 		struct timespec tm = {0, 100000000};
@@ -389,7 +399,7 @@ static int expire_indirect(int ioctlfd, 
 		nanosleep(&tm, NULL);
 	}
 
-	return 1;
+	return (retries >= 0);
 }
 
 void *expire_proc_indirect(void *arg)
@@ -400,9 +410,8 @@ void *expire_proc_indirect(void *arg)
 	struct expire_args *ea;
 	unsigned int now;
 	int offsets, submnts, count;
-	int ioctlfd, limit;
+	int ioctlfd;
 	int status, ret;
-	unsigned int retries = EXPIRE_RETRIES;
 
 	ea = (struct expire_args *) arg;
 
@@ -477,11 +486,9 @@ void *expire_proc_indirect(void *arg)
 
 		debug(ap->logopt, "expire %s", next->path);
 
-		ret = expire_indirect(ioctlfd, next->path, now, retries, ap->logopt);
-		if (!ret) {
-			msg("mount apparently busy %s", next->path);
+		ret = expire_indirect(ap, ioctlfd, next->path, now);
+		if (!ret)
 			ea->status++;
-		}
 	}
 	free_mnt_list(mnts);
 
@@ -490,12 +497,10 @@ void *expire_proc_indirect(void *arg)
 	 * have some offset mounts with no '/' offset so we need to
 	 * umount them here.
 	 */
-	limit = count_mounts(ap, ap->path) * 2;
-	ret = expire_indirect(ap->ioctlfd, ap->path, now, limit, ap->logopt);
-	if (!ret) {
-		debug(ap->logopt,
-		      "failed to expire offsets under %s", ap->path);
-		ea->status++;
+	if (mnts) {
+		ret = expire_indirect(ap, ap->ioctlfd, ap->path, now);
+		if (!ret)
+			ea->status++;
 	}
 
 	count = offsets = submnts = 0;
@@ -527,7 +532,7 @@ void *expire_proc_indirect(void *arg)
 	/* If we are trying to shutdown make sure we can umount */
 	if (!ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {
 		if (!ret) {
-			warn(ap->logopt, "mount still busy %s", ap->path);
+			msg("mount still busy %s", ap->path);
 			ea->status++;
 		}
 	}
diff --git a/daemon/lookup.c b/daemon/lookup.c
index aeda909..dd620cf 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -969,7 +969,7 @@ next:
 }
 
 /* Return with cache readlock held */
-struct mapent *lookup_source_mapent(struct autofs_point *ap, const char *key, unsigned int type)
+struct mapent *lookup_source_valid_mapent(struct autofs_point *ap, const char *key, unsigned int type)
 {
 	struct master_mapent *entry = ap->entry;
 	struct map_source *map;
@@ -980,12 +980,49 @@ struct mapent *lookup_source_mapent(stru
 	master_source_readlock(entry);
 	map = entry->first;
 	while (map) {
+		/*
+		 * Only consider map sources that have been read since
+		 * the map entry was last updated.
+		 */
+		if (ap->entry->age > map->age) {
+			map = map->next;
+			continue;
+		}
+
 		mc = map->mc;
 		cache_readlock(mc);
 		if (type == LKP_DISTINCT)
 			me = cache_lookup_distinct(mc, key);
 		else
+			me = cache_lookup(mc, key);
+		if (me)
+			break;
+		cache_unlock(mc);
+		map = map->next;
+	}
+	pthread_cleanup_pop(1);
+
+	return me;
+}
+
+/* Return with cache readlock held */
+struct mapent *lookup_source_mapent(struct autofs_point *ap, const char *key, unsigned int type)
+{
+	struct master_mapent *entry = ap->entry;
+	struct map_source *map;
+	struct mapent_cache *mc;
+	struct mapent *me = NULL;
+
+	pthread_cleanup_push(master_source_lock_cleanup, entry);
+	master_source_readlock(entry);
+	map = entry->first;
+	while (map) {
+		mc = map->mc;
+		cache_readlock(mc);
+		if (type == LKP_DISTINCT)
 			me = cache_lookup_distinct(mc, key);
+		else
+			me = cache_lookup(mc, key);
 		if (me)
 			break;
 		cache_unlock(mc);
@@ -1012,8 +1049,10 @@ int lookup_source_close_ioctlfd(struct a
 		cache_readlock(mc);
 		me = cache_lookup_distinct(mc, key);
 		if (me) {
-			close(me->ioctlfd);
-			me->ioctlfd = -1;
+			if (me->ioctlfd != -1) {
+				close(me->ioctlfd);
+				me->ioctlfd = -1;
+			}
 			cache_unlock(mc);
 			ret = 1;
 			break;
diff --git a/include/automount.h b/include/automount.h
index 3192c92..e3ecc75 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -123,8 +123,8 @@ #define CHE_DUPLICATE	0x0020
 
 #define HASHSIZE		77
 #define NEGATIVE_TIMEOUT	10
-#define UMOUNT_RETRIES		50
-#define EXPIRE_RETRIES		25
+#define UMOUNT_RETRIES		6
+#define EXPIRE_RETRIES		3
 
 struct mapent_cache {
 	pthread_rwlock_t rwlock;
@@ -229,6 +229,7 @@ int lookup_ghost(struct autofs_point *ap
 int lookup_nss_mount(struct autofs_point *ap, const char *name, int name_len);
 void lookup_close_lookup(struct autofs_point *ap);
 int lookup_prune_cache(struct autofs_point *ap, time_t age);
+struct mapent *lookup_source_valid_mapent(struct autofs_point *ap, const char *key, unsigned int type);
 struct mapent *lookup_source_mapent(struct autofs_point *ap, const char *key, unsigned int type);
 int lookup_source_close_ioctlfd(struct autofs_point *ap, const char *key);
 
@@ -475,7 +476,7 @@ int handle_packet_expire_direct(struct a
 int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missing_indirect_t *pkt);
 int handle_packet_missing_direct(struct autofs_point *ap, autofs_packet_missing_direct_t *pkt);
 void rm_unwanted(const char *path, int incl, dev_t dev);
-int count_mounts(struct autofs_point *ap, const char *path);
+int count_mounts(const char *path, dev_t dev);
 
 #define state_mutex_lock(ap) \
 do { \
diff --git a/lib/alarm.c b/lib/alarm.c
index 8124796..89c9bc8 100755
--- a/lib/alarm.c
+++ b/lib/alarm.c
@@ -236,9 +236,9 @@ static void *alarm_handler(void *arg)
 			list_del(&current->list);
 			free(current);
 
-			alarm_unlock();
-			st_add_task(ap, ST_EXPIRE);
-			alarm_lock();
+			state_mutex_lock(ap);
+			nextstate(ap->state_pipe[1], ST_EXPIRE);
+			state_mutex_unlock(ap);
 
 			break;
 		}
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 3f489ed..08fd34d 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -810,6 +810,54 @@ static int parse_mapent(const char *ent,
 	return (p - ent);
 }
 
+static int mount_subtree_offsets(struct autofs_point *ap, struct mapent_cache *mc, struct mapent *me)
+{
+	struct mapent *mm;
+	char *m_key;
+	int start;
+	char *base, *m_root;
+	char buf[MAX_ERR_BUF];
+
+	mm = me->multi;
+
+	if (!mm)
+		return 1;
+
+	cache_multi_lock(me->parent);
+
+	m_key = mm->key;
+
+	if (*m_key == '/') {
+		m_root = m_key;
+		start = strlen(m_key);
+	} else {
+		start = strlen(ap->path) + strlen(m_key) + 1;
+		m_root = alloca(start + 1);
+		if (!m_root) {
+			char *estr;
+			cache_multi_unlock(me->parent);
+			estr = strerror_r(errno, buf, MAX_ERR_BUF);
+			error(ap->logopt, MODPREFIX "alloca: %s", estr);
+			return 0;
+		}
+		strcpy(m_root, ap->path);
+		strcat(m_root, "/");
+		strcat(m_root, m_key);
+	}
+
+	base = &me->key[start];
+
+	if (!mount_multi_triggers(ap, m_root, me->multi, base)) {
+		cache_multi_unlock(me->parent);
+		error(ap->logopt, MODPREFIX "failed to mount offset triggers");
+		return 0;
+	}
+
+	cache_multi_unlock(me->parent);
+
+	return 1;
+}
+
 /*
  * syntax is:
  *	[-options] location [location] ...
@@ -1085,6 +1133,7 @@ int parse_mount(struct autofs_point *ap,
 			free(options);
 			return 1;
 		}
+
 		cache_multi_unlock(me);
 		cache_unlock(mc);
 
@@ -1093,7 +1142,6 @@ int parse_mount(struct autofs_point *ap,
 		return rv;
 	} else {
 		/* Normal (and non-root multi-mount) entries */
-		struct autofs_point *oap = ap;
 		char *loc;
 		int loclen;
 		int l;
@@ -1197,58 +1245,12 @@ int parse_mount(struct autofs_point *ap,
 		 * If it's a multi-mount insert the triggers
 		 * These are always direct mount triggers so root = ""
 		 */
-		if (ap->submount)
-			oap = ap->parent;
-
-		me = lookup_source_mapent(oap, name, LKP_DISTINCT);
+		cache_readlock(mc);
+		me = cache_lookup_distinct(mc, name);
 		if (me) {
-			struct mapent *mm;
-			char *m_key;
-			int start;
-			char *base, *m_root;
-
-			mc = me->source->mc;
-			mm = me->multi;
-
-			if (!me->multi) {
-				cache_unlock(mc);
-				return rv;
-			}
-
-			m_key = me->multi->key;
-
-			if (*m_key == '/') {
-				m_root = m_key;
-				start = strlen(m_key);
-			} else {
-				start = strlen(ap->path) + strlen(m_key) + 1;
-				pthread_cleanup_push(cache_lock_cleanup, mc);
-				m_root = alloca(start + 1);
-				pthread_cleanup_pop(0);
-				if (!m_root) {
-					char *estr;
-					cache_unlock(mc);
-					estr = strerror_r(errno, buf, MAX_ERR_BUF);
-					error(ap->logopt,
-					      MODPREFIX "alloca: %s", estr);
-					return 1;
-				}
-				strcpy(m_root, ap->path);
-				strcat(m_root, "/");
-				strcat(m_root, m_key);
-			}
-
-			base = &me->key[start];
-
-			cache_multi_lock(mm);
-			if (!mount_multi_triggers(oap, m_root, me->multi, base)) {
-				error(ap->logopt,
-				      MODPREFIX "failed to mount offset triggers");
-				rv = 1;
-			}
-			cache_multi_unlock(mm);
-			cache_unlock(mc);
+			mount_subtree_offsets(ap, mc, me);
 		}
+		cache_unlock(mc);
 	}
 	return rv;
 }

autofs-5.0.1-rc1-premature-submount-expire.patch:
 CHANGELOG       |    1 
 daemon/state.c  |  104 ++++++++++++++++++++++++++++++++++++--------------------
 include/state.h |   14 -------
 3 files changed, 68 insertions(+), 51 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-premature-submount-expire.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index b469121..fc939ad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@
 - spelling corrections to release notes (Jeff Moyer).
 - expire individual submounts.
 - add ino_index locking.
+- fix nested submount expiring away when pwd is base of submount.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/state.c b/daemon/state.c
index 67d8031..d38a64f 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -12,6 +12,8 @@
  *
  * ----------------------------------------------------------------------- */
 
+#include <sys/ioctl.h>
+
 #include "automount.h"
 
 extern pthread_attr_t thread_attr;
@@ -37,6 +39,34 @@ static pthread_mutex_t task_mutex = PTHR
 static pthread_cond_t task_cond = PTHREAD_COND_INITIALIZER;
 static unsigned int task_signaled;
 
+#define st_mutex_lock() \
+do { \
+	int status = pthread_mutex_lock(&mutex); \
+	if (status) \
+		fatal(status); \
+} while (0)
+
+#define st_mutex_unlock() \
+do { \
+	int status = pthread_mutex_unlock(&mutex); \
+	if (status) \
+		fatal(status); \
+} while (0)
+
+#define task_mutex_lock() \
+do { \
+	int status = pthread_mutex_lock(&task_mutex); \
+	if (status) \
+		fatal(status); \
+} while (0)
+
+#define task_mutex_unlock() \
+do { \
+	int status = pthread_mutex_unlock(&task_mutex); \
+	if (status) \
+		fatal(status); \
+} while (0)
+
 int do_mount_autofs_direct(struct autofs_point *, struct mnt_list *, struct mapent *);
 
 void dump_state_queue(void)
@@ -86,7 +116,7 @@ void expire_cleanup(void *arg)
 	struct autofs_point *ap;
 	int statefd;
 	enum states next = ST_INVAL;
-	int success;
+	int success, ret;
 
 	ea = (struct expire_args *) arg;
 	ap = ea->ap;
@@ -112,7 +142,10 @@ void expire_cleanup(void *arg)
 			   pruned or expired everything away,
 			   try to shut down */
 			if (ap->submount && !success) {
-				next = ST_SHUTDOWN_PENDING;
+				if (!ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {
+					if (ret)
+						next = ST_SHUTDOWN_PENDING;
+				}
 				break;
 			}
 
@@ -415,11 +448,14 @@ static unsigned int st_readmap(struct au
 	debug(ap->logopt, "state %d path %s", ap->state, ap->path);
 
 	assert(ap->state == ST_READY);
+	assert(ap->readmap_thread == 0);
+
 	ap->state = ST_READMAP;
 
 	ra = malloc(sizeof(struct readmap_args));
 	if (!ra) {
 		error(ap->logopt, "failed to malloc reamap cond struct");
+		nextstate(ap->state_pipe[1], ST_READY);
 		return 0;
 	}
 
@@ -448,6 +484,8 @@ static unsigned int st_readmap(struct au
 	ap->readmap_thread = thid;
 	st_set_thid(ap, thid);
 
+	pthread_cleanup_push(st_readmap_cleanup, ra);
+
 	ra->signaled = 0;
 	while (!ra->signaled) {
 		status = pthread_cond_wait(&ra->cond, &ra->mutex);
@@ -455,6 +493,8 @@ static unsigned int st_readmap(struct au
 			fatal(status);
 	}
 
+	pthread_cleanup_pop(1);
+
 	return 1;
 }
 
@@ -653,16 +693,12 @@ void st_remove_tasks(struct autofs_point
 	struct state_queue *task, *waiting;
 	int status;
 
-	status = pthread_mutex_lock(&mutex);
-	if (status)
-		fatal(status);
+	st_mutex_lock();
 
 	head = &state_queue;
 
 	if (list_empty(head)) {
-		status = pthread_mutex_unlock(&mutex);
-		if (status)
-			fatal(status);
+		st_mutex_unlock();
 		return;
 	}
 
@@ -692,9 +728,10 @@ void st_remove_tasks(struct autofs_point
 	if (status)
 		fatal(status);
 
-	status = pthread_mutex_unlock(&mutex);
-	if (status)
-		fatal(status);
+	st_mutex_unlock();
+
+	return;
+
 }
 
 static void *do_run_task(void *arg)
@@ -705,9 +742,7 @@ static void *do_run_task(void *arg)
 	unsigned long ret = 1;
 	int status;
  
-	status = pthread_mutex_lock(&task_mutex);
-	if (status)
-		fatal(status);
+	task_mutex_lock();
 
 	task = (struct state_queue *) arg;
 	ap = task->ap;
@@ -718,9 +753,7 @@ static void *do_run_task(void *arg)
 	if (status)
 		fatal(status);
 
-	status = pthread_mutex_unlock(&task_mutex);
-	if (status)
-		fatal(status);
+	task_mutex_unlock();
 
 	state_mutex_lock(ap);
 
@@ -764,16 +797,12 @@ static int run_state_task(struct state_q
 	pthread_t thid;
 	int status;
 
-	status = pthread_mutex_lock(&task_mutex);
-	if (status)
-		fatal(status);
+	task_mutex_lock();
 
 	status = pthread_create(&thid, &thread_attr, do_run_task, task);
 	if (status) {
 		error(task->ap->logopt, "error running task");
-		status = pthread_mutex_unlock(&task_mutex);
-		if (status)
-			fatal(status);
+		task_mutex_unlock();
 		return 0;
 	}
 
@@ -784,9 +813,7 @@ static int run_state_task(struct state_q
 			fatal(status);
 	}
 
-	status = pthread_mutex_unlock(&task_mutex);
-	if (status)
-		fatal(status);
+	task_mutex_unlock();
 
 	return 1;
 }
@@ -810,11 +837,10 @@ static void *st_queue_handler(void *arg)
 {
 	struct list_head *head;
 	struct list_head *p;
+	struct timespec wait;
 	int status;
 
-	status = pthread_mutex_lock(&mutex);
-	if (status)
-		fatal(status);
+	st_mutex_lock();
 
 	head = &state_queue;
 
@@ -823,10 +849,17 @@ static void *st_queue_handler(void *arg)
 		 * If the state queue list is empty, wait until an
 		 * entry is added.
 		 */
+		head = &state_queue;
+		wait.tv_sec = time(NULL) + 1;
+		wait.tv_nsec = 0;
+
 		while (list_empty(head)) {
-			status = pthread_cond_wait(&cond, &mutex);
-			if (status)
+			status = pthread_cond_timedwait(&cond, &mutex, &wait);
+			if (status) {
+				if (status == ETIMEDOUT)
+					break;
 				fatal(status);
+			}
 		}
 
 		list_for_each(p, head) {
@@ -850,11 +883,10 @@ static void *st_queue_handler(void *arg)
 		}
 
 		while (1) {
-			struct timespec wait;
-
 			wait.tv_sec = time(NULL) + 1;
 			wait.tv_nsec = 0;
 
+			signaled = 0;
 			while (!signaled) {
 				status = pthread_cond_timedwait(&cond, &mutex, &wait);
 				if (status) {
@@ -863,8 +895,8 @@ static void *st_queue_handler(void *arg)
 					fatal(status);
 				}
 			}
-			signaled = 0;
 
+			head = &state_queue;
 			p = head->next;
 			while (p != head) {
 				struct state_queue *task, *next;
@@ -901,7 +933,6 @@ static void *st_queue_handler(void *arg)
 				/* No more tasks for this queue */
 				if (list_empty(&task->pending)) {
 					list_del(&task->list);
-					/* debug("task complete %p", task); */
 					free(task);
 					continue;
 				}
@@ -911,10 +942,9 @@ static void *st_queue_handler(void *arg)
 							struct state_queue, pending);
 
 				list_del_init(&next->pending);
-				list_add_tail(&next->list, head);
+				list_add_tail(&next->list, p);
 
 				list_del(&task->list);
-				/* debug("task complete %p", task); */
 				free(task);
 			}
 
diff --git a/include/state.h b/include/state.h
index ea4c62a..c756338 100644
--- a/include/state.h
+++ b/include/state.h
@@ -89,18 +89,4 @@ int st_add_task(struct autofs_point *, e
 void st_remove_tasks(struct autofs_point *);
 int st_start_handler(void);
 
-#define st_mutex_lock() \
-do { \
-	int status = pthread_mutex_lock(&mutex); \
-	if (status) \
-		fatal(status); \
-} while (0)
-
-#define st_mutex_unlock() \
-do { \
-	int status = pthread_mutex_unlock(&mutex); \
-	if (status) \
-		fatal(status); \
-} while (0)
-
 #endif


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- autofs.spec	7 Aug 2006 04:59:41 -0000	1.140
+++ autofs.spec	16 Aug 2006 07:27:49 -0000	1.141
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.14
+%define release 0.rc1.15
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -35,6 +35,12 @@
 Patch22: autofs-5.0.1-rc1-expire-multi-correction.patch
 Patch23: autofs-5.0.1-rc1-sloppyopt-nfs.patch
 Patch24: autofs-5.0.1-rc1-release-notes-spelling.patch
+Patch25: autofs-5.0.1-rc1-expire-individual-submounts.patch
+Patch26: autofs-5.0.1-rc1-ino_index-locking.patch
+Patch27: autofs-5.0.1-rc1-check-offset-mounts-before-umount.patch
+Patch28: autofs-5.0.1-rc1-premature-submount-expire.patch
+Patch29: autofs-5.0.1-rc1-more-expire-rework.patch
+Patch30: autofs-5.0.1-rc1-allow-initial-numeric-in-hostname.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -98,6 +104,12 @@
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -154,6 +166,13 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Aug 16 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.15
+- expire individual submounts.
+- add ino_index locking.
+- fix nested submount expiring away when pwd is base of submount.
+- more expire re-work to cope better with shutdown following cthon tests.
+- allow hostname to start with numeric when validating.
+
 * Thu Aug 7 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.14
 - remove SIGCHLD handler because it is no longer needed and was
   causing expire problems.



From fedora-cvs-commits at redhat.com  Wed Aug 16 08:02:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 04:02:48 -0400
Subject: rpms/cdrtools/devel cdrtools-2.01-dbg.patch, 1.2,
	1.3 cdrtools-2.01-xconfig.patch, 1.8,
	1.9 cdrtools-2.01.1-gcc4.patch, 1.2,
	1.3 cdrtools-2.01a27-silly-warnings.patch, 1.8,
	1.9 cdrtools-2.01a27-type.patch, 1.4, 1.5 cdrtools.spec, 1.51,
	1.52 sources, 1.16, 1.17 cdrtools-2.01.01-O_EXCL.patch, 1.2,
	NONE cdrtools-2.01.01a03-nozero.patch, 1.1,
	NONE cdrtools-2.01.01a03-ossdvd.patch, 1.1,
	NONE cdrtools-2.01.01a05-ossdvd.patch, 1.1,
	NONE cdrtools-2.01a33-dma.patch, 1.1,
	NONE mkisofs-iconv-14.patch, 1.1, NONE
Message-ID: <200608160802.k7G82mhQ009974@cvs.devel.redhat.com>

Author: harald

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

Modified Files:
	cdrtools-2.01-dbg.patch cdrtools-2.01-xconfig.patch 
	cdrtools-2.01.1-gcc4.patch 
	cdrtools-2.01a27-silly-warnings.patch 
	cdrtools-2.01a27-type.patch cdrtools.spec sources 
Removed Files:
	cdrtools-2.01.01-O_EXCL.patch cdrtools-2.01.01a03-nozero.patch 
	cdrtools-2.01.01a03-ossdvd.patch 
	cdrtools-2.01.01a05-ossdvd.patch cdrtools-2.01a33-dma.patch 
	mkisofs-iconv-14.patch 
Log Message:
move back to the last GPL version

cdrtools-2.01-dbg.patch:
 rscsi.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

Index: cdrtools-2.01-dbg.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools-2.01-dbg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cdrtools-2.01-dbg.patch	5 Dec 2005 14:23:17 -0000	1.2
+++ cdrtools-2.01-dbg.patch	16 Aug 2006 08:02:36 -0000	1.3
@@ -1,9 +1,9 @@
---- cdrtools-2.01.01/rscsi/rscsi.c.dbgsafe	2005-05-16 14:59:33.000000000 +0200
-+++ cdrtools-2.01.01/rscsi/rscsi.c	2005-12-05 11:53:57.000000000 +0100
-@@ -169,8 +169,19 @@
- 	 * XXX and for this reason a possible security risk would have been
- 	 * XXX introduced by the administrator.
- 	 */
+--- cdrtools-2.01/rscsi/rscsi.c.dbgsafe	2003-11-26 01:28:27.000000000 +0100
++++ cdrtools-2.01/rscsi/rscsi.c	2006-08-16 09:24:38.000000000 +0200
+@@ -163,8 +163,19 @@
+ 		debug_name = *argv;
+ #endif
+ 
 -	if (debug_name != NULL)
 -		debug_file = fopen(debug_name, "w");
 +	if (debug_name != NULL) {

cdrtools-2.01-xconfig.patch:
 conf/xconfig.h.in |   39 --------------------------------
 include/mconfig.h |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 39 deletions(-)

Index: cdrtools-2.01-xconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools-2.01-xconfig.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cdrtools-2.01-xconfig.patch	2 Jun 2006 15:24:34 -0000	1.8
+++ cdrtools-2.01-xconfig.patch	16 Aug 2006 08:02:36 -0000	1.9
@@ -1,5 +1,5 @@
---- cdrtools-2.01.01/include/mconfig.h.xc	2004-07-11 00:46:53.000000000 +0200
-+++ cdrtools-2.01.01/include/mconfig.h	2006-06-02 17:21:55.000000000 +0200
+--- cdrtools/include/mconfig.h.xc	2004-07-11 00:46:53.000000000 +0200
++++ cdrtools/include/mconfig.h	2006-06-02 17:21:55.000000000 +0200
 @@ -49,6 +49,70 @@
  extern "C" {
  #endif
@@ -71,24 +71,8 @@
  /*
   * The NetBSD people want to bother us.
   * They removed the definition for 'unix' and are bleating for every test
---- cdrtools-2.01.01/conf/xconfig.h.in.xc	2006-02-07 17:23:13.000000000 +0100
-+++ cdrtools-2.01.01/conf/xconfig.h.in	2006-06-02 17:22:06.000000000 +0200
-@@ -105,7 +105,6 @@
- #undef HAVE_BSD_DEV_SCSIREG_H	/* if we have a NeXT Step compatible sg driver */
- #undef HAVE_SYS_BSDTTY_H	/* if we have sys/bsdtty.h on HP-UX for TIOCGPGRP */
- #undef HAVE_OS_H		/* if we have the BeOS kernel definitions in OS.h */
--#undef HAVE_EXT2FS_EXT2_FS_H	/* if we have the Linux moving target ext2fs/ext2_fs.h */
- #undef HAVE_ATTR_XATTR_H	/* if we have the Linux Extended File Attr definitions in attr/xattr.h */
- #undef HAVE_FNMATCH_H		/* if we may include fnmatch.h */
- 
-@@ -310,7 +309,6 @@
-  * OS madness
-  */
- #undef HAVE_BROKEN_LINUX_EXT2_FS_H	/* whether <linux/ext2_fs.h> is broken */
--#undef HAVE_BROKEN_SRC_LINUX_EXT2_FS_H	/* whether /usr/src/linux/include/linux/ext2_fs.h is broken */
- #undef HAVE_BROKEN_SCSI_SCSI_H		/* whether <scsi/scsi.h> is broken */
- #undef HAVE_BROKEN_SRC_SCSI_SCSI_H	/* whether /usr/src/linux/include/scsi/scsi.h is broken */
- #undef HAVE_BROKEN_SCSI_SG_H		/* whether <scsi/sg.h> is broken */
+--- cdrtools/conf/xconfig.h.in.xc	2006-02-07 17:23:13.000000000 +0100
++++ cdrtools/conf/xconfig.h.in	2006-06-02 17:22:06.000000000 +0200
 @@ -408,38 +406,11 @@
  #undef HAVE_ST_FLAGS		/* if struct stat contains st_flags */
  #undef STAT_MACROS_BROKEN	/* if the macros S_ISDIR, S_ISREG .. don't work */

cdrtools-2.01.1-gcc4.patch:
 cdda2wav/toc.c     |   14 ++++++++++++--
 mkisofs/eltorito.c |    2 +-
 mkisofs/write.c    |    4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

Index: cdrtools-2.01.1-gcc4.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools-2.01.1-gcc4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cdrtools-2.01.1-gcc4.patch	16 May 2006 12:09:49 -0000	1.2
+++ cdrtools-2.01.1-gcc4.patch	16 Aug 2006 08:02:37 -0000	1.3
@@ -1,6 +1,6 @@
---- cdrtools-2.01.01/mkisofs/write.c.gcc4	2006-05-16 12:48:04.000000000 +0200
-+++ cdrtools-2.01.01/mkisofs/write.c	2006-05-16 12:48:04.000000000 +0200
-@@ -1934,7 +1934,7 @@
+--- cdrtools-2.01/mkisofs/write.c.gcc4	2006-08-16 09:25:28.000000000 +0200
++++ cdrtools-2.01/mkisofs/write.c	2006-08-16 09:25:28.000000000 +0200
+@@ -1907,7 +1907,7 @@
  	/* Next we write out the primary descriptor for the disc */
  	memset(&vol_desc, 0, sizeof (vol_desc));
  	vol_desc.type[0] = ISO_VD_PRIMARY;
@@ -9,7 +9,7 @@
  	vol_desc.version[0] = 1;
  
  	memset(vol_desc.system_id, ' ', sizeof (vol_desc.system_id));
-@@ -2057,7 +2057,7 @@
+@@ -2030,7 +2030,7 @@
  	 */
  	memset(&evol_desc, 0, sizeof (evol_desc));
  	evol_desc.type[0] = (unsigned char) ISO_VD_END;
@@ -18,9 +18,9 @@
  	evol_desc.version[0] = 1;
  	xfwrite(&evol_desc, SECTOR_SIZE, 1, outfile, 0, TRUE);
  	last_extent_written += 1;
---- cdrtools-2.01.01/mkisofs/eltorito.c.gcc4	2005-02-27 13:31:28.000000000 +0100
-+++ cdrtools-2.01.01/mkisofs/eltorito.c	2006-05-16 12:48:04.000000000 +0200
-@@ -272,7 +272,7 @@
+--- cdrtools-2.01/mkisofs/eltorito.c.gcc4	2004-05-23 22:46:05.000000000 +0200
++++ cdrtools-2.01/mkisofs/eltorito.c	2006-08-16 09:25:28.000000000 +0200
+@@ -270,7 +270,7 @@
  
  	memset(boot_desc, 0, sizeof (*boot_desc));
  	boot_desc->type[0] = 0;
@@ -29,37 +29,33 @@
  	boot_desc->version[0] = 1;
  
  	memcpy(boot_desc->system_id, EL_TORITO_ID, sizeof (EL_TORITO_ID));
---- cdrtools-2.01.01/cdda2wav/toc.c.gcc4	2006-05-13 22:31:29.000000000 +0200
-+++ cdrtools-2.01.01/cdda2wav/toc.c	2006-05-16 12:50:22.000000000 +0200
-@@ -1053,8 +1053,12 @@
+--- cdrtools-2.01/cdda2wav/toc.c.gcc4	2004-05-21 22:56:44.000000000 +0200
++++ cdrtools-2.01/cdda2wav/toc.c	2006-08-16 09:27:16.000000000 +0200
+@@ -959,7 +959,12 @@
  					if (*target != NULL)
  						**target = '\0';
  				} else {
--					*target = realloc(*target,
--						strlen(*target) + clen - 1);
-+					char *newp = realloc(*target, strlen(*target) + clen - 1);
-+					if (newp == NULL) {
-+						free (*target);
-+						*target = NULL;
-+					} else
-+						*target = newp;
+-					realloc(*target, strlen(*target) + clen - 1);
++ 					char *newp = realloc(*target, strlen(*target) + clen - 1);
++ 					if (newp == NULL) {
++ 						free (*target);
++ 						*target = NULL;
++ 					} else
++ 						*target = newp;
  				}
  				if (*target != NULL) {
  					strcat((char *)*target, inbuff+ind+7);
-@@ -1093,10 +1097,12 @@
+@@ -994,7 +999,12 @@
  							if (global.tracktitle[tno] != NULL)
  								*(global.tracktitle[tno]) = '\0';
  						} else {
--							global.tracktitle[tno] =
--								realloc(global.tracktitle[tno],
--								strlen((char *)global.tracktitle[tno]) +
--								p - q + 1);
-+							char *newp = realloc(global.tracktitle[tno], strlen((char *)global.tracktitle[tno]) + p - q + 1 );
-+							if (newp == NULL) {
-+								free (global.tracktitle[tno]);
-+								global.tracktitle[tno] = NULL;
-+							} else
-+								global.tracktitle[tno] = newp;
+-							realloc(global.tracktitle[tno], strlen((char *)global.tracktitle[tno]) + p - q + 1 );
++ 							char *newp = realloc(global.tracktitle[tno], strlen((char *)global.tracktitle[tno]) + p - q + 1 );
++ 							if (newp == NULL) {
++ 								free (global.tracktitle[tno]);
++ 								global.tracktitle[tno] = NULL;
++ 							} else
++ 								global.tracktitle[tno] = newp;
  						}
  						if (global.tracktitle[tno] != NULL) {
  							strcat((char *)global.tracktitle[tno], q+1);

cdrtools-2.01a27-silly-warnings.patch:
 cdrecord/cdrecord.c    |    2 +-
 libscg/scsi-linux-sg.c |   31 +++++--------------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

Index: cdrtools-2.01a27-silly-warnings.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools-2.01a27-silly-warnings.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cdrtools-2.01a27-silly-warnings.patch	6 Jun 2006 14:22:56 -0000	1.8
+++ cdrtools-2.01a27-silly-warnings.patch	16 Aug 2006 08:02:37 -0000	1.9
@@ -1,26 +1,48 @@
---- cdrtools-2.01.01/cdrecord/cdrecord.c.silly	2006-05-14 13:27:06.000000000 +0200
-+++ cdrtools-2.01.01/cdrecord/cdrecord.c	2006-05-29 15:14:39.000000000 +0200
-@@ -390,7 +390,7 @@
- 	 * prefer a model with many proprietary differing programs
+--- cdrtools-2.01/cdrecord/cdrecord.c.silly	2004-09-08 11:37:47.652041558 +0200
++++ cdrtools-2.01/cdrecord/cdrecord.c	2004-09-08 11:38:06.933079736 +0200
+@@ -410,8 +410,8 @@
+ 	 * companies prefer a model with many proprietary differing programs
  	 * instead of cooperating with the program authors.
  	 */
--	linuxcheck();	/* For version 1.315 of cdrecord.c */
-+	/* linuxcheck(); */	/* For version 1.315 of cdrecord.c */
+-	linuxcheck();	/* For version 1.297 of cdrecord.c */
  
++	/* linuxcheck(); */	/* For version 1.297 of cdrecord.c */
  	if (flags & F_VERSION)
  		exit(0);
---- cdrtools-2.01.01/libscg/scsi-linux-sg.c.silly	2006-01-29 20:45:29.000000000 +0100
-+++ cdrtools-2.01.01/libscg/scsi-linux-sg.c	2006-05-29 15:17:26.000000000 +0200
-@@ -377,7 +377,7 @@
- 				 * own belly button.
- 				 */
- 				js_fprintf((FILE *)scgp->errfile,
--				"Warning: Using badly designed ATAPI via /dev/hd* interface.\n");
+ 	/*
+--- cdrtools-2.01/libscg/scsi-linux-sg.c.silly	2004-05-20 15:42:12.000000000 +0200
++++ cdrtools-2.01/libscg/scsi-linux-sg.c	2004-09-08 11:37:47.670038792 +0200
+@@ -315,6 +315,10 @@
+ 	if (device != NULL && *device != '\0') {
+ #ifdef	USE_ATA
+ 		if (strncmp(device, "ATAPI", 5) == 0) {
++			if (scgp->overbose) {
++				js_fprintf((FILE *)scgp->errfile,
 +				"Use of ATA is preferred over ATAPI.\n");
- 			}
++			}
+ 			scgp->ops = &ata_ops;
+ 			return (SCGO_OPEN(scgp, device));
+ 		}
+@@ -336,18 +340,6 @@
+ 			 */
+ 			use_ata = TRUE;
+ 			device = NULL;
+-			if (scgp->overbose) {
+-				/*
+-				 * I strongly encourage people who believe that
+-				 * they need to patch this message away to read
+-				 * the messages in the Solaris USCSI libscg
+-				 * layer instead of wetting their tissues while
+-				 * being unwilling to look besides their
+-				 * own belly button.
+-				 */
+-				js_fprintf((FILE *)scgp->errfile,
+-				"Warning: Using badly designed ATAPI via /dev/hd* interface.\n");
+-			}
  		}
  	}
-@@ -528,20 +528,7 @@
+ 
+@@ -497,20 +489,7 @@
  			if (b < 0 || b > 25)
  				b = -1;
  		}

cdrtools-2.01a27-type.patch:
 cdda2wav.c |    2 +-
 semshm.c   |    5 +++--
 semshm.h   |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

Index: cdrtools-2.01a27-type.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools-2.01a27-type.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdrtools-2.01a27-type.patch	16 May 2006 12:09:49 -0000	1.4
+++ cdrtools-2.01a27-type.patch	16 Aug 2006 08:02:37 -0000	1.5
@@ -1,37 +1,36 @@
---- cdrtools-2.01.01/cdda2wav/semshm.h.type	2006-05-13 23:02:13.000000000 +0200
-+++ cdrtools-2.01.01/cdda2wav/semshm.h	2006-05-16 12:45:15.000000000 +0200
-@@ -47,6 +47,6 @@
- extern	int	semrequest	__PR((int semid, int semnum));
- extern	int	semrelease	__PR((int semid, int semnum, int amount));
- extern	int	flush_buffers	__PR((void));
--extern	void	* request_shm_sem __PR((unsigned amount_of_sh_mem, unsigned char **pointer));
-+extern	void	* request_shm_sem __PR((unsigned amount_of_sh_mem, void *pointer));
+--- cdrtools-2.01/cdda2wav/cdda2wav.c.type	2004-08-24 17:06:14.000000000 +0200
++++ cdrtools-2.01/cdda2wav/cdda2wav.c	2004-09-03 12:07:03.069681949 +0200
+@@ -2530,7 +2530,7 @@
+ 	 * which does not apply to this code. (void *) introduces a compatible
+ 	 * intermediate type in the cast list.
+ 	 */
+-    he_fill_buffer = request_shm_sem(global.shmsize, (unsigned char **)(void *)&he_fill_buffer);
++    he_fill_buffer = request_shm_sem(global.shmsize, &he_fill_buffer);
+     if (he_fill_buffer == NULL) {
+ 	fprintf( stderr, "no shared memory available!\n");
+ 	exit(SHMMEM_ERROR);
+--- cdrtools-2.01/cdda2wav/semshm.h.type	2003-08-29 23:23:16.000000000 +0200
++++ cdrtools-2.01/cdda2wav/semshm.h	2004-09-03 12:06:05.584117250 +0200
+@@ -27,5 +27,5 @@
+ int semrequest __PR((int semid, int semnum));
+ int semrelease __PR((int semid, int semnum, int amount));
+ int flush_buffers __PR((void));
+-void * request_shm_sem __PR((unsigned amount_of_sh_mem, unsigned char **pointer));
++void * request_shm_sem __PR((unsigned amount_of_sh_mem, void *pointer_ref));
  
- #endif	/* _SEMSHM_H */
---- cdrtools-2.01.01/cdda2wav/semshm.c.type	2006-05-13 22:43:41.000000000 +0200
-+++ cdrtools-2.01.01/cdda2wav/semshm.c	2006-05-16 12:46:00.000000000 +0200
-@@ -528,10 +528,11 @@
+--- cdrtools-2.01/cdda2wav/semshm.c.type	2003-08-29 23:23:16.000000000 +0200
++++ cdrtools-2.01/cdda2wav/semshm.c	2004-09-03 12:06:05.583117401 +0200
+@@ -459,10 +459,11 @@
+ }
  #endif
  
- void *
--request_shm_sem(amount_of_sh_mem, pointer)
-+request_shm_sem(amount_of_sh_mem, pointer_ref)
- 	unsigned	amount_of_sh_mem;
--	unsigned char	**pointer;
+-void *request_shm_sem(amount_of_sh_mem, pointer)
++void *request_shm_sem(amount_of_sh_mem, pointer_ref)
+ 	unsigned amount_of_sh_mem;
+-	unsigned char **pointer;
 +	void *pointer_ref;
  {
-+        unsigned char **pointer = pointer_ref;
++    unsigned char **pointer = pointer_ref;
  #if defined(HAVE_SEMGET) && defined(USE_SEMAPHORES)
- 	/*
- 	 * install semaphores for double buffer usage
---- cdrtools-2.01.01/cdda2wav/cdda2wav.c.type	2006-05-13 22:31:29.000000000 +0200
-+++ cdrtools-2.01.01/cdda2wav/cdda2wav.c	2006-05-16 12:44:31.000000000 +0200
-@@ -2788,7 +2788,7 @@
- 	 * intermediate type in the cast list.
- 	 */
- 	he_fill_buffer = request_shm_sem(global.shmsize,
--				(unsigned char **)(void *)&he_fill_buffer);
-+				&he_fill_buffer);
- 	if (he_fill_buffer == NULL) {
- 		errmsgno(EX_BAD, "No shared memory available!\n");
- 		exit(SHMMEM_ERROR);
+     /* install semaphores for double buffer usage */
+     sem_id = seminstall(IPC_PRIVATE,2);


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cdrtools.spec	12 Jul 2006 04:46:55 -0000	1.51
+++ cdrtools.spec	16 Aug 2006 08:02:37 -0000	1.52
@@ -1,9 +1,9 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
-Version: 2.01.01.0.a10
-Release: 1.1
-%define tarversion 2.01.01a10
-License: CDDL
+Version: 2.01
+Release: 10
+%define tarversion 2.01
+License: GPL
 Group: Applications/System
 URL: http://cdrecord.berlios.de/old/private/cdrecord.html
 Source: ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-%{tarversion}.tar.bz2
@@ -12,24 +12,26 @@
 Source3: dvdrecord.1
 Patch1: mkisofs-changelog.patch 
 Patch5: cdrtools-2.0-silo.patch
-Patch8: mkisofs-iconv-14.patch
+Patch8: mkisofs-iconv-10.patch
 Patch9: cdrdao-1.1.7-endianness.patch
 # http://crashrecovery.org/oss-dvd.html
-#Patch10: cdrtools-2.01.01a05-ossdvd.patch
+Patch10: cdrtools-2.01a32-ossdvd.patch
 Patch11: cdrtools-2.01a27-manpatch.patch
 Patch12: cdrtools-2.01-nodebug.patch
 
+Patch20: cdrtools-2.01a27-dvd-fix.patch
 Patch21: cdrtools-2.01a27-privacy.patch
 Patch22: cdrtools-2.01a27-type.patch
 Patch23: cdrtools-2.01a27-silly-warnings.patch
 Patch24: cdrtools-2.01a27-UTF8.patch
 Patch25: cdrtools-2.01a32-scan.patch
-Patch30: cdrtools-2.01.01-O_EXCL.patch
+Patch30: cdrtools-2.0-O_EXCL.patch
 Patch31: mkisofs-padsize-123548.patch
 Patch33: cdrtools-2.01-dbg.patch
-Patch34: cdrtools-2.01.01a03-nozero.patch
+Patch34: cdrtools-nozero.patch
 Patch41: cdrtools-2.01.1-gcc4.patch
 Patch42: cdrtools-2.01-xconfig.patch
+Patch43: cdrtools-rootstat.patch
 
 BuildRequires: perl, groff
 
@@ -37,7 +39,7 @@
 # REMOVE epoch if the package NAME ever changes.  When package names change,
 # the Epoch information is no longer needed.  However, if someone makes an
 # official release by accident with an Epoch, then Epoch is again permanent.
-Epoch: 8
+Epoch: 9
 
 %description
 cdrtools is a collection of CD/DVD utilities.
@@ -95,7 +97,7 @@
 rates.  Cdda2wav can also be used as a CD player.
 
 %prep
-%setup -q -n %{name}-2.01.01
+%setup -q -n %{name}-2.01
 chmod a+rX -R .
 %patch1 -p1 -b .changelog
 %ifarch sparc sparc64
@@ -103,8 +105,9 @@
 %endif
 %patch8 -p1 -b .utf8
 %patch9 -p2 -b .endian
-#%patch10 -p1 -b .dvd
+%patch10 -p1 -b .dvd
 %patch11 -p1 -b .manpatch
+%patch20 -p1 -b .dvdfix
 %patch21 -p0 -b .priv
 %patch22 -p1 -b .type
 %patch23 -p1 -b .silly
@@ -116,6 +119,7 @@
 %patch34 -p1 -b .nozero
 %patch41 -p1 -b .gcc4
 %patch42 -p1 -b .xc
+%patch43 -p1 -b .rootstat
 
 # Turn off buggy CD_EXTRA code.
 #sed -e 's/define CD_EXTRA/undef CD_EXTRA/' < cdda2wav/toc.c > cdda2wav/toc.c.tmp
@@ -196,14 +200,12 @@
 %{_bindir}/cdrecord
 %{_bindir}/readcd
 %{_bindir}/devdump
-%{_mandir}/man8/devdump.8*
+#%{_mandir}/man8/devdump.8*
 %{_bindir}/skel
 %{_mandir}/man1/cdrecord.1*
 %{_mandir}/man1/readcd.1*
 %{_bindir}/dvdrecord
 %{_mandir}/man1/dvdrecord.1*
-%{_bindir}/btcflash
-%{_mandir}/man1/btcflash.1*
 
 %files -n cdrecord-devel
 %defattr(-,root,root)
@@ -211,7 +213,6 @@
 %{_libdir}/libscg.a
 %{_libdir}/libschily.a
 %{_libdir}/libedc_ecc.a
-%{_libdir}/libedc_ecc_dec.a
 %{_libdir}/libparanoia.a
 /usr/include/schily
 
@@ -226,20 +227,24 @@
 %{_bindir}/isovfy
 %{_bindir}/isodebug
 %{_mandir}/man8/isoinfo.8*
-%{_mandir}/man8/isodebug.8*
-%{_mandir}/man8/isodump.8*
-%{_mandir}/man8/isovfy.8*
+#%{_mandir}/man8/isodebug.8*
+#%{_mandir}/man8/isodump.8*
+#%{_mandir}/man8/isovfy.8*
 %{_mandir}/man8/mkisofs.8*
 %{_mandir}/man8/mkhybrid.8*
 
 %files -n cdda2wav
 %defattr(-,root,root)
-%doc AN-*  cdda2wav/FAQ cdda2wav/OtherProgs
+%doc AN-* cdda2wav/GPL cdda2wav/FAQ cdda2wav/OtherProgs
 %doc cdda2wav/README* cdda2wav/Frontends cdda2wav/HOWTOUSE
 /usr/bin/cdda2wav
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
+* Wed Aug 16 2006 Harald Hoyer <harald at redhat.com> - 9:2.01-10
+- moved back to version 2.01 (last GPL version), 
+  due to incompatible license issues
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8:2.01.01.0.a10-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Jun 2006 14:22:57 -0000	1.16
+++ sources	16 Aug 2006 08:02:37 -0000	1.17
@@ -1 +1 @@
-dc189f1e34d484cb73639fe3b1067845  cdrtools-2.01.01a10.tar.bz2
+d44a81460e97ae02931c31188fe8d3fd  cdrtools-2.01.tar.bz2


--- cdrtools-2.01.01-O_EXCL.patch DELETED ---


--- cdrtools-2.01.01a03-nozero.patch DELETED ---


--- cdrtools-2.01.01a03-ossdvd.patch DELETED ---


--- cdrtools-2.01.01a05-ossdvd.patch DELETED ---


--- cdrtools-2.01a33-dma.patch DELETED ---


--- mkisofs-iconv-14.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 16 08:05:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 04:05:29 -0400
Subject: rpms/cdrtools/devel mkisofs-iconv-10.patch,1.2,1.3
Message-ID: <200608160805.k7G85Ti9010687@cvs.devel.redhat.com>

Author: harald

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

Added Files:
	mkisofs-iconv-10.patch 
Log Message:
move back to the last GPL version

mkisofs-iconv-10.patch:
 include/unls.h      |   10 ++
 libunls/Targets     |    3 
 libunls/libunls.mk  |    1 
 libunls/nls.h       |    3 
 libunls/nls_iconv.c |   96 ++++++++++++++++++++++++++
 mkisofs/Makefile    |    1 
 mkisofs/joliet.c    |  189 +++++++++++++++++++++++++++++++++++++++++++++++-----
 mkisofs/mkisofs.c   |   46 ++++++++++++
 mkisofs/mkisofs.h   |    7 +
 mkisofs/udf.c       |    2 
 10 files changed, 340 insertions(+), 18 deletions(-)

Index: mkisofs-iconv-10.patch
===================================================================
RCS file: mkisofs-iconv-10.patch
diff -N mkisofs-iconv-10.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mkisofs-iconv-10.patch	16 Aug 2006 08:05:26 -0000	1.3
@@ -0,0 +1,619 @@
+diff -urN --exclude-from=- cdrtools-2.01/include/unls.h cdrtools-2.01-jh/include/unls.h
+--- cdrtools-2.01/include/unls.h	2003-06-16 00:41:23.000000000 +0300
++++ cdrtools-2.01-jh/include/unls.h	2004-02-02 18:31:22.000000000 +0200
+@@ -30,6 +30,10 @@
+ #include <prototyp.h>
+ #endif
+ 
++#ifdef USE_ICONV
++#include <iconv.h>
++#endif
++
+ #ifdef	__cplusplus
+ extern "C" {
+ #endif
+@@ -43,6 +47,9 @@
+ 	char *charset;
+ 	unsigned char **page_uni2charset;
+ 	struct nls_unicode *charset2uni;
++#ifdef USE_ICONV
++	iconv_t iconv_d;
++#endif
+ 
+ 	void (*inc_use_count) 	__PR((void));
+ 	void (*dec_use_count) 	__PR((void));
+@@ -58,6 +65,9 @@
+ extern void 		unload_nls		__PR((struct nls_table *));
+ extern struct nls_table *load_nls_default	__PR((void));
+ extern int		init_nls_file		__PR((char * name));
++#ifdef USE_ICONV
++extern int		init_nls_iconv		__PR((char * name));
++#endif
+ 
+ #ifdef	__cplusplus
+ }
+diff -urN --exclude-from=- cdrtools-2.01/libunls/libunls.mk cdrtools-2.01-jh/libunls/libunls.mk
+--- cdrtools-2.01/libunls/libunls.mk	2000-03-25 14:51:56.000000000 +0200
++++ cdrtools-2.01-jh/libunls/libunls.mk	2004-02-02 18:31:22.000000000 +0200
+@@ -8,6 +8,7 @@
+ INSDIR=		lib
+ TARGETLIB=	unls
+ #CPPOPTS +=	-Istdio
++CPPOPTS +=	-DUSE_ICONV
+ include		Targets
+ LIBS=		
+ 
+diff -urN --exclude-from=- cdrtools-2.01/libunls/nls.h cdrtools-2.01-jh/libunls/nls.h
+--- cdrtools-2.01/libunls/nls.h	2002-12-03 02:34:27.000000000 +0200
++++ cdrtools-2.01-jh/libunls/nls.h	2004-02-02 18:31:22.000000000 +0200
+@@ -111,5 +111,8 @@
+ extern int init_nls_cp10079	__PR((void));
+ extern int init_nls_cp10081	__PR((void));
+ extern int init_nls_file	__PR((char * name));
++#ifdef USE_ICONV
++extern int init_nls_iconv	__PR((char * name));
++#endif
+ 
+ #endif	/* _NLS_H */
+diff -urN --exclude-from=- cdrtools-2.01/libunls/nls_iconv.c cdrtools-2.01-jh/libunls/nls_iconv.c
+--- cdrtools-2.01/libunls/nls_iconv.c	1970-01-01 02:00:00.000000000 +0200
++++ cdrtools-2.01-jh/libunls/nls_iconv.c	2004-02-02 18:31:22.000000000 +0200
+@@ -0,0 +1,96 @@
++/* @(#)nls_iconv.c	1.0 02/04/20 2002 J. Schilling  */
++#ifndef lint
++static	char sccsid[] =
++	"@(#)nls_iconv.c	1.0 02/01/20 2002 J. Schilling";
++#endif
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; see the file COPYING.  If not, write to
++ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++/*
++ *	Modifications to make the code portable Copyright (c) 2000 J. Schilling
++ *
++ * nls_iconv: create a pseudo-charset table to use iconv() provided by C
++ * library or libiconv by Bruno Haible
++ * The Unicode to charset table has only exact mappings.
++ *
++ *
++ * Jungshik Shin (jshin at mailaps.org) 04-Feb-2002
++ */
++
++#ifdef USE_ICONV
++#include <mconfig.h>
++#include <stdio.h>
++#include <stdxlib.h>
++#include <strdefs.h>
++#include "nls.h"
++#include <iconv.h>
++
++static void	inc_use_count	__PR((void));
++static void	dec_use_count	__PR((void));
++
++
++static void
++inc_use_count()
++{
++	MOD_INC_USE_COUNT;
++}
++
++static void
++dec_use_count()
++{
++	MOD_DEC_USE_COUNT;
++}
++
++int
++init_nls_iconv(charset)
++	char	*charset;
++{
++	iconv_t iconv_d;  /* iconv conversion descriptor */
++	struct nls_table *table;
++
++	/* give up if no charset is given */
++	if (charset == NULL)
++		return -1;
++
++	/* see if we already have a table with this name - built in tables
++	   have precedence over iconv() - i.e. can't have the name of an
++	   existing table. Also, we may have already registered this file
++	   table */
++	if (find_nls(charset) != NULL)
++		return -1;
++
++	if ((iconv_d = iconv_open("UCS-2BE", charset)) == (iconv_t) -1)
++		return -1;
++
++
++	/* set up the table */
++	if ((table = (struct nls_table *)malloc(sizeof (struct nls_table)))
++							== NULL) {
++		return -1;
++	}
++
++	/* give the table the file name, so we can find it again if needed */
++	table->charset = strdup(charset);
++	table->iconv_d = iconv_d;
++	table->page_uni2charset = NULL;
++	table->charset2uni = NULL;
++	table->inc_use_count = inc_use_count;
++	table->dec_use_count = dec_use_count;
++	table->next = NULL;
++
++	/* register the table */
++	return register_nls(table);
++}
++#endif
+diff -urN --exclude-from=- cdrtools-2.01/libunls/Targets cdrtools-2.01-jh/libunls/Targets
+--- cdrtools-2.01/libunls/Targets	2002-12-03 02:34:27.000000000 +0200
++++ cdrtools-2.01-jh/libunls/Targets	2004-02-02 18:31:22.000000000 +0200
+@@ -39,4 +39,5 @@
+ 	nls_cp10029.c \
+ 	nls_cp10079.c \
+ 	nls_cp10081.c \
+-	nls_file.c
++	nls_file.c \
++	nls_iconv.c
+diff -urN --exclude-from=- cdrtools-2.01/mkisofs/joliet.c cdrtools-2.01-jh/mkisofs/joliet.c
+--- cdrtools-2.01/mkisofs/joliet.c	2003-04-28 01:36:08.000000000 +0300
++++ cdrtools-2.01-jh/mkisofs/joliet.c	2004-02-03 14:15:17.000000000 +0200
+@@ -90,6 +90,11 @@
+ #include <unls.h>	/* For UNICODE translation */
+ #include <schily.h>
+ 
++#ifdef USE_ICONV
++#include <iconv.h>
++#include <errno.h>
++#endif
++
+ static Uint	jpath_table_index;
+ static struct directory **jpathlist;
+ static int	next_jpath_index = 1;
+@@ -103,13 +108,23 @@
+ };
+ 
+ #ifdef	UDF
+-	void	convert_to_unicode	__PR((unsigned char *buffer,
++#	ifdef USE_ICONV
++	size_t
++#	else
++	void
++#	endif
++		convert_to_unicode	__PR((unsigned char *buffer,
+ 		int size, char *source, struct nls_table *inls));
+-	int	joliet_strlen		__PR((const char *string));
++	int	joliet_strlen		__PR((const char *string, struct nls_table *inls));
+ #else
+-static void	convert_to_unicode	__PR((unsigned char *buffer,
++#	ifdef USE_ICONV
++	static size_t
++#	else
++	static void
++#endif
++		convert_to_unicode	__PR((unsigned char *buffer,
+ 		int size, char *source, struct nls_table *inls));
+-static int	joliet_strlen		__PR((const char *string));
++static int	joliet_strlen		__PR((const char *string, struct nls_table *inls));
+ #endif
+ static void	get_joliet_vol_desc	__PR((struct iso_primary_descriptor *jvol_desc));
+ static void	assign_joliet_directory_addresses __PR((struct directory *node));
+@@ -161,6 +176,20 @@
+ 	if (inls == onls)
+ 		return (c);
+ 
++#ifdef USE_ICONV
++	if(inls->charset2uni == NULL || onls->page_uni2charset == NULL) {
++		/*
++		 * This shouldn't be reached
++		 */
++		static BOOL iconv_warned = FALSE;
++		if(!iconv_warned) {
++			error("Warning: Iconv conversion not supported in conv_charset.\n");
++			iconv_warned = TRUE;
++		}
++		return (c);
++	}
++#endif
++
+ 	/* get high and low UNICODE bytes */
+ 	uh = inls->charset2uni[c].uni2;
+ 	ul = inls->charset2uni[c].uni1;
+@@ -186,10 +215,18 @@
+  *
+  * Notes:
+  */
+-#ifdef	UDF
+-void
++#ifdef USE_ICONV
++#	if	UDF
++size_t
++#	else
++static size_t
++#	endif
+ #else
++#	if	UDF
++void
++#	else
+ static void
++#	endif
+ #endif
+ convert_to_unicode(buffer, size, source, inls)
+ 	unsigned char	*buffer;
+@@ -216,6 +253,51 @@
+ 		tmpbuf = (Uchar *) source;
+ 	}
+ 
++#ifdef USE_ICONV
++	if (inls->iconv_d && inls->charset2uni==NULL &&
++			inls->page_uni2charset==NULL) {
++		char *inptr = tmpbuf;
++		char *outptr = buffer;
++		size_t inleft = strlen(tmpbuf);
++		size_t inlen = inleft;
++		size_t outleft = size;
++
++		iconv(inls->iconv_d, NULL, NULL, NULL, NULL);
++		if(iconv(inls->iconv_d, &inptr, &inleft, &outptr, &outleft) ==
++				(size_t)-1 && errno == EILSEQ) {
++			fprintf(stderr, "Incorrectly encoded string (%s) "
++				"encountered.\nPossibly creating an invalid "
++				"Joliet extension. Aborting.\n", source);
++			exit(1);
++		}
++
++	  	for (i = 0; (i + 1) < size - outleft; i += 2) {	/* Size may be odd!!!*/
++			if (buffer[i]=='\0') {
++				switch (buffer[i+1]) {   /* Invalid characters for Joliet */
++					case '*':
++					case '/':
++					case ':':
++					case ';':
++					case '?':
++					case '\\':
++						buffer[i+1]='_';
++					default:
++						if (buffer[i+1] == 0x7f ||
++							    buffer[i+1] < 0x20)
++							buffer[i+1]='_';
++				}
++			}
++		}
++		if (size & 1) {	/* beautification */
++	  		buffer[size - 1] = 0;
++		}
++		if (source == NULL) {
++			free(tmpbuf);
++		}
++		return (inlen - inleft);
++	}
++#endif
++
+ 	/*
+ 	 * Now start copying characters.  If the size was specified to be 0,
+ 	 * then assume the input was 0 terminated.
+@@ -271,6 +353,9 @@
+ 	if (source == NULL) {
+ 		free(tmpbuf);
+ 	}
++#ifdef USE_ICONV
++	return j;
++#endif
+ }
+ 
+ /*
+@@ -287,12 +372,50 @@
+ #else
+ static int
+ #endif
+-joliet_strlen(string)
++joliet_strlen(string, inls)
+ 	const char	*string;
++	struct nls_table *inls;
+ {
+ 	int		rtn;
+ 
++#ifdef USE_ICONV
++	if (inls->iconv_d && inls->charset2uni==NULL &&
++			inls->page_uni2charset==NULL) {
++		/*
++		 * we const-cast since we're sure iconv won't change
++		 * the string itself
++		 */
++		char *string_ptr = (char *)string;
++		size_t string_len = strlen(string);
++
++		/*
++		 * iconv has no way of finding out the required size
++		 * in the target
++		 */
++
++		char *tmp, *tmp_ptr;
++		/* we assume that the maximum length is 2 * jlen */
++		size_t tmp_len = (size_t)jlen * 2 + 1;
++		tmp = e_malloc(tmp_len);
++		tmp_ptr = tmp;
++
++		iconv(inls->iconv_d, NULL, NULL, NULL, NULL);
++		iconv(inls->iconv_d, &string_ptr, &string_len, &tmp_ptr,
++			&tmp_len);
++
++		/*
++		 * iconv advanced the tmp pointer with as many chars
++		 * as it has written to it, so we add up the delta
++		 */
++		rtn = (tmp_ptr - tmp);
++
++		free(tmp);
++	} else {
++		rtn = strlen(string) << 1;
++	}
++#else
+ 	rtn = strlen(string) << 1;
++#endif
+ 
+ 	/*
+ 	 * We do clamp the maximum length of a Joliet string to be the
+@@ -480,16 +603,33 @@
+ 	/* compare the Unicode names */
+ 
+ 	while (*rpnt && *lpnt) {
++#ifdef USE_ICONV
++		size_t ri, li;
++
++		ri = convert_to_unicode(rtmp, 2, rpnt, rinls);
++		li = convert_to_unicode(ltmp, 2, lpnt, linls);
++		rpnt += ri;
++		lpnt += li;
++		if(!ri && !li)
++			return (0);
++		else if(ri && !li)
++			return (1);
++		else if(!ri && li)
++			return (-1);
++#else
+ 		convert_to_unicode(rtmp, 2, rpnt, rinls);
+ 		convert_to_unicode(ltmp, 2, lpnt, linls);
++#endif
+ 
+ 		if (a_to_u_2_byte(rtmp) < a_to_u_2_byte(ltmp))
+ 			return (-1);
+ 		if (a_to_u_2_byte(rtmp) > a_to_u_2_byte(ltmp))
+ 			return (1);
+ 
++#ifndef USE_ICONV
+ 		rpnt++;
+ 		lpnt++;
++#endif
+ 	}
+ 
+ 	if (*rpnt)
+@@ -574,10 +714,10 @@
+ 		}
+ #ifdef APPLE_HYB
+ 		if (USE_MAC_NAME(de))
+-			namelen = joliet_strlen(de->hfs_ent->name);
++			namelen = joliet_strlen(de->hfs_ent->name, hfs_inls);
+ 		else
+ #endif	/* APPLE_HYB */
+-			namelen = joliet_strlen(de->name);
++			namelen = joliet_strlen(de->name, in_nls);
+ 
+ 		if (dpnt == root) {
+ 			jpath_table_l[jpath_table_index] = 1;
+@@ -742,10 +882,10 @@
+ #ifdef APPLE_HYB
+ 		/* Use the HFS name if it exists */
+ 		if (USE_MAC_NAME(s_entry1))
+-			cvt_len = joliet_strlen(s_entry1->hfs_ent->name);
++			cvt_len = joliet_strlen(s_entry1->hfs_ent->name, hfs_inls);
+ 		else
+ #endif	/* APPLE_HYB */
+-			cvt_len = joliet_strlen(s_entry1->name);
++			cvt_len = joliet_strlen(s_entry1->name, in_nls);
+ 
+ 		/*
+ 		 * Fix the record length
+@@ -891,12 +1031,12 @@
+ 				if (USE_MAC_NAME(s_entry))
+ 					/* Use the HFS name if it exists */
+ 					jpath_table_size +=
+-						joliet_strlen(s_entry->hfs_ent->name) +
++						joliet_strlen(s_entry->hfs_ent->name, hfs_inls) +
+ 						offsetof(struct iso_path_table, name[0]);
+ 				else
+ #endif	/* APPLE_HYB */
+ 					jpath_table_size +=
+-						joliet_strlen(s_entry->name) +
++						joliet_strlen(s_entry->name, in_nls) +
+ 						offsetof(struct iso_path_table, name[0]);
+ 				if (jpath_table_size & 1) {
+ 					jpath_table_size++;
+@@ -918,13 +1058,13 @@
+ 				/* Use the HFS name if it exists */
+ 				s_entry->jreclen =
+ 				offsetof(struct iso_directory_record, name[0])
+-					+ joliet_strlen(s_entry->hfs_ent->name)
++					+ joliet_strlen(s_entry->hfs_ent->name, hfs_inls)
+ 					+ 1;
+ 			else
+ #endif	/* APPLE_HYB */
+ 				s_entry->jreclen =
+ 				offsetof(struct iso_directory_record, name[0])
+-					+ joliet_strlen(s_entry->name)
++					+ joliet_strlen(s_entry->name, in_nls)
+ 					+ 1;
+ 		} else {
+ 			/*
+@@ -1072,6 +1212,9 @@
+ #endif
+ 
+ 	while (*rpnt && *lpnt) {
++#ifdef USE_ICONV
++		size_t ri, li;
++#endif
+ 		if (*rpnt == ';' && *lpnt != ';')
+ 			return (-1);
+ 		if (*rpnt != ';' && *lpnt == ';')
+@@ -1092,16 +1235,32 @@
+ 			return (1);
+ #endif
+ 
++#ifdef USE_ICONV
++
++		ri = convert_to_unicode(rtmp, 2, rpnt, rinls);
++		li = convert_to_unicode(ltmp, 2, lpnt, linls);
++		rpnt += ri;
++		lpnt += li;
++		if(!ri && !li)
++			return (0);
++		else if(ri && !li)
++			return (1);
++		else if(!ri && li)
++			return (-1);
++#else
+ 		convert_to_unicode(rtmp, 2, rpnt, rinls);
+ 		convert_to_unicode(ltmp, 2, lpnt, linls);
++#endif
+ 
+ 		if (a_to_u_2_byte(rtmp) < a_to_u_2_byte(ltmp))
+ 			return (-1);
+ 		if (a_to_u_2_byte(rtmp) > a_to_u_2_byte(ltmp))
+ 			return (1);
+ 
++#ifndef USE_ICONV
+ 		rpnt++;
+ 		lpnt++;
++#endif
+ 	}
+ 	if (*rpnt)
+ 		return (1);
+diff -urN --exclude-from=- cdrtools-2.01/mkisofs/Makefile cdrtools-2.01-jh/mkisofs/Makefile
+--- cdrtools-2.01/mkisofs/Makefile	2004-01-02 17:23:32.000000000 +0200
++++ cdrtools-2.01-jh/mkisofs/Makefile	2004-02-02 18:31:22.000000000 +0200
+@@ -32,6 +32,7 @@
+ CPPOPTS +=	-DUDF
+ CPPOPTS +=	-DDVD_VIDEO
+ CPPOPTS +=	-DSORTING
++CPPOPTS +=	-DUSE_ICONV
+ CPPOPTS +=	-I../libhfs_iso/
+ CPPOPTS	+=	-DHAVE_CONFIG_H -DUSE_LIBSCHILY -DUSE_SCG \
+ 		'-DAPPID_DEFAULT="MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING"' \
+diff -urN --exclude-from=- cdrtools-2.01/mkisofs/mkisofs.c cdrtools-2.01-jh/mkisofs/mkisofs.c
+--- cdrtools-2.01/mkisofs/mkisofs.c	2004-01-07 01:23:46.000000000 +0200
++++ cdrtools-2.01-jh/mkisofs/mkisofs.c	2004-02-02 18:31:22.000000000 +0200
+@@ -59,6 +59,11 @@
+ #endif
+ #endif	/* no_more_needed */
+ 
++#ifdef USE_ICONV
++#include <locale.h>
++#include <langinfo.h>
++#endif
++
+ struct directory *root = NULL;
+ int		path_ind;
+ 
+@@ -223,6 +228,10 @@
+ int	do_sort = 0;		/* sort file data */
+ #endif /* SORTING */
+ 
++#ifdef USE_ICONV
++int	iconv_possible;
++#endif
++
+ struct nls_table *in_nls = NULL;  /* input UNICODE conversion table */
+ struct nls_table *out_nls = NULL; /* output UNICODE conversion table */
+ #ifdef APPLE_HYB
+@@ -2235,6 +2244,37 @@
+ 	init_nls_file(hfs_ocharset);
+ #endif /* APPLE_HYB */
+ 
++#ifdef USE_ICONV
++	iconv_possible = !(iso9660_level >= 4 || ((ocharset &&
++		strcmp(ocharset, icharset ? icharset : "")) &&
++		use_RockRidge) || apple_ext || apple_hyb);
++
++	setlocale(LC_CTYPE, "");
++	
++  	if (icharset == NULL && iconv_possible) {
++		char *charset = nl_langinfo(CODESET);
++		/* set to detected value but only if it is not pure US-ASCII */
++		if(strcmp(charset, "ANSI_X3.4-1968") != 0)
++			icharset = charset;
++
++		if(icharset && verbose > 0)
++			fprintf(stderr, "INFO:\t"
++			"%s character encoding detected by locale settings."
++			"\n\tAssuming %s encoded filenames on source "
++			"filesystem,\n"
++			"\tuse -input-charset to override.\n",
++			icharset, icharset);
++	}
++
++	if(iconv_possible) {
++		/*
++		 * don't care if initialization fails
++		 */
++		init_nls_iconv(icharset);
++		init_nls_iconv(ocharset);
++	}
++#endif
++
+ 	if (icharset == NULL) {
+ #if	(defined(__CYGWIN32__) || defined(__CYGWIN__)) && !defined(IS_CYGWIN_1)
+ 		in_nls = load_nls("cp437");
+@@ -2262,6 +2302,12 @@
+ 	if (in_nls == NULL || out_nls == NULL) { /* Unknown charset specified */
+ 		fprintf(stderr, "Unknown charset\nKnown charsets are:\n");
+ 		list_nls();	/* List all known charset names */
++#ifdef USE_ICONV
++		if(!iconv_possible)
++			fprintf(stderr, "Iconv charsets cannot be used with "
++				"Apple extension, HFS, ISO9660 version 2 or\n"
++				"Rock Ridge.\n");
++#endif
+ 		exit(1);
+ 	}
+ 
+diff -urN --exclude-from=- cdrtools-2.01/mkisofs/mkisofs.h cdrtools-2.01-jh/mkisofs/mkisofs.h
+--- cdrtools-2.01/mkisofs/mkisofs.h	2003-12-28 15:38:51.000000000 +0200
++++ cdrtools-2.01-jh/mkisofs/mkisofs.h	2004-02-02 18:31:22.000000000 +0200
+@@ -501,9 +501,14 @@
+ 
+ /* joliet.c */
+ #ifdef	UDF
++#	ifdef USE_ICONV
++extern	size_t	convert_to_unicode	__PR((unsigned char *buffer,
++			int size, char *source, struct nls_table *inls));
++#	else
+ extern	void	convert_to_unicode	__PR((unsigned char *buffer,
+ 			int size, char *source, struct nls_table *inls));
+-extern	int	joliet_strlen		__PR((const char *string));
++#	endif
++extern	int	joliet_strlen		__PR((const char *string, struct nls_table *inls));
+ #endif
+ extern unsigned char conv_charset __PR((unsigned char, struct nls_table *,
+ 				struct nls_table *));
+diff -urN --exclude-from=- cdrtools-2.01/mkisofs/udf.c cdrtools-2.01-jh/mkisofs/udf.c
+--- cdrtools-2.01/mkisofs/udf.c	2003-04-28 01:34:52.000000000 +0300
++++ cdrtools-2.01-jh/mkisofs/udf.c	2004-02-02 18:31:22.000000000 +0200
+@@ -442,7 +442,7 @@
+ 	int i;
+ 	int expanded_length;
+ 
+-	expanded_length = joliet_strlen(src);
++	expanded_length = joliet_strlen(src, in_nls);
+ 	if (expanded_length > 1024)
+ 		expanded_length = 1024;
+ 	if (expanded_length > (dst_size-1)*2)



From fedora-cvs-commits at redhat.com  Wed Aug 16 08:06:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 04:06:51 -0400
Subject: rpms/cdrtools/devel cdrtools-2.0-O_EXCL.patch, 1.8,
	1.9 cdrtools-2.01a27-dvd-fix.patch, 1.2,
	1.3 cdrtools-2.01a32-ossdvd.patch, NONE,
	1.1 cdrtools-nozero.patch, NONE, 1.1 cdrtools-rootstat.patch,
	NONE, 1.1
Message-ID: <200608160806.k7G86pJS010968@cvs.devel.redhat.com>

Author: harald

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

Added Files:
	cdrtools-2.0-O_EXCL.patch cdrtools-2.01a27-dvd-fix.patch 
	cdrtools-2.01a32-ossdvd.patch cdrtools-nozero.patch 
	cdrtools-rootstat.patch 
Log Message:
move back to the last GPL version

cdrtools-2.0-O_EXCL.patch:
 Targets          |    3 ++-
 oexcl.c          |   29 +++++++++++++++++++++++++++++
 oexcl.h          |    5 +++++
 scsi-linux-ata.c |    3 ++-
 scsi-linux-sg.c  |    7 ++++---
 5 files changed, 42 insertions(+), 5 deletions(-)

Index: cdrtools-2.0-O_EXCL.patch
===================================================================
RCS file: cdrtools-2.0-O_EXCL.patch
diff -N cdrtools-2.0-O_EXCL.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cdrtools-2.0-O_EXCL.patch	16 Aug 2006 08:06:48 -0000	1.9
@@ -0,0 +1,111 @@
+--- cdrtools-2.01/libscg/oexcl.c.excl	2004-09-22 12:03:23.426676328 +0200
++++ cdrtools-2.01/libscg/oexcl.c	2004-09-22 12:03:23.426676328 +0200
+@@ -0,0 +1,29 @@
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <stdio.h>
++
++int openexcl(const char *device, int mode)
++{
++  int f, i;
++
++  f = open(device, mode | O_EXCL);
++
++  if (f < 0) {
++    f = open(device, mode);
++
++    if (f >= 0) {
++      close(f);
++      f = -1;
++      for (i = 0; (i < 10) && (f == -1); i++) {
++	fprintf(stderr, "Error trying to open %s exclusively ... retrying in 1 second.\n", device);
++	usleep(1000000 + 100000.0 * rand()/(RAND_MAX+1.0));
++	f = open(device, O_RDONLY | O_NONBLOCK | O_EXCL);
++      }
++    }
++  }
++
++  return f;
++}
+--- cdrtools-2.01/libscg/scsi-linux-ata.c.excl	2004-09-22 12:03:23.423676784 +0200
++++ cdrtools-2.01/libscg/scsi-linux-ata.c	2004-09-22 12:03:23.427676176 +0200
+@@ -112,6 +112,7 @@
+ LOCAL	void	sglog		__PR((const char *fmt, ...));
+ 
+ #include <vadefs.h>
++#include "oexcl.h"
+ 
+ /* VARARGS1 */
+ #ifdef	PROTOTYPES
+@@ -267,7 +268,7 @@
+ 			starget,
+ 			slun;
+ 
+-		f = open(device, O_RDWR | O_NONBLOCK);
++		f = openexcl(device, O_RDWR | O_NONBLOCK);
+ 
+ 		if (f < 0) {
+ 			if (scgp->errstr)
+--- cdrtools-2.01/libscg/oexcl.h.excl	2004-09-22 12:03:23.428676024 +0200
++++ cdrtools-2.01/libscg/oexcl.h	2004-09-22 12:03:23.428676024 +0200
+@@ -0,0 +1,5 @@
++#ifndef OEXCL_H
++
++extern int openexcl(const char *device, int mode);
++
++#endif
+--- cdrtools-2.01/libscg/Targets.excl	2002-10-19 20:33:37.000000000 +0200
++++ cdrtools-2.01/libscg/Targets	2004-09-22 12:03:23.428676024 +0200
+@@ -1,3 +1,3 @@
+ CFILES=		scsitransp.c scsihack.c scsiopen.c scgsettarget.c \
+-		scsierrs.c scgtimes.c scsihelp.c \
++		scsierrs.c scgtimes.c scsihelp.c oexcl.c \
+ 		rdummy.c
+--- cdrtools-2.01/@@ -610,6 +719,7 @@
+ 	int	Target;
+ 	int	Lun;
+ 	BOOL	onetarget = FALSE;
++	const char *cdname;
+ 
+ #ifdef	SG_GET_VERSION_NUM
+ 	if (scglocal(scgp)->drvers < 0) {
+libscg/scsi-linux-sg.c.excl	2004-09-22 12:03:23.422676936 +0200
++++ cdrtools-2.01/libscg/scsi-linux-sg.c	2004-09-22 12:12:49.271654816 +0200
+@@ -79,6 +79,7 @@
+ #endif
+ 
+ #include "scsi/sg.h"
++#include "oexcl.h"
+ 
+ #undef sense			/* conflict in struct cdrom_generic_command */
+ #include <linux/cdrom.h>
+@@ -94,7 +95,7 @@
+  *	Choose your name instead of "schily" and make clear that the version
+  *	string is related to a modified source.
+  */
+-LOCAL	char	_scg_trans_version[] = "scsi-linux-sg.c-1.83";	/* The version for this transport*/
++LOCAL	char	_scg_trans_version[] = "scsi-linux-sg.c-1.83-RH";	/* The version for this transport*/
+ 
+ #ifndef	SCSI_IOCTL_GET_BUS_NUMBER
+ #define	SCSI_IOCTL_GET_BUS_NUMBER 0x5386
+@@ -247,7 +249,7 @@
+ 		 * return "schily" for the SCG_AUTHOR request.
+ 		 */
+ 		case SCG_AUTHOR:
+-			return (_scg_auth_schily);
++			return ("schily - Red Hat");
+ 		case SCG_SCCS_ID:
+ 			return (__sccsid);
+ 		case SCG_KVERSION:
+@@ -479,7 +483,7 @@
+ 				b = -1;
+ 		}
+ 		/* O_NONBLOCK is dangerous */
+-		f = open(device, O_RDWR | O_NONBLOCK);
++		f = openexcl(device, O_RDWR | O_NONBLOCK);
+ /*		if (f < 0 && errno == ENOENT)*/
+ /*			goto openpg;*/
+ 

cdrtools-2.01a27-dvd-fix.patch:
 cdrecord.c |    8 ++++----
 drv_mmc.c  |    7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

Index: cdrtools-2.01a27-dvd-fix.patch
===================================================================
RCS file: cdrtools-2.01a27-dvd-fix.patch
diff -N cdrtools-2.01a27-dvd-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cdrtools-2.01a27-dvd-fix.patch	16 Aug 2006 08:06:48 -0000	1.3
@@ -0,0 +1,45 @@
+--- cdrtools-2.01/cdrecord/drv_mmc.c.dvdfix	2006-08-16 09:20:50.000000000 +0200
++++ cdrtools-2.01/cdrecord/drv_mmc.c	2006-08-16 09:20:50.000000000 +0200
+@@ -1488,7 +1488,7 @@
+        dsp->ds_disktype&= ~DT_CD;
+        dsp->ds_disktype|= DT_DVD;
+ 	
+-       return (ret);
++       return (0);
+   
+ }
+ 
+@@ -2700,13 +2700,14 @@
+ 	 The BIG timeout is needed in case there was a very short rzone to write at the 
+ 	 beginning of the disk, because lead-out needs to be at some distance.
+       */
++      int ret;
+       scg_settimeout(scgp, 1000);
+       if(is_packet(trackp)){
+ 	  scsi_close_tr_session(scgp, 2, 0, FALSE);
+       }
+-      fixate_mmc(scgp, dp, trackp);
++      ret = fixate_mmc(scgp, dp, trackp);
+       scg_settimeout(scgp, 200);
+-      
++      return ret;
+ }
+ 
+ char	*blank_types[] = {
+--- cdrtools-2.01/cdrecord/cdrecord.c.dvdfix	2006-08-16 09:20:50.000000000 +0200
++++ cdrtools-2.01/cdrecord/cdrecord.c	2006-08-16 09:21:28.000000000 +0200
+@@ -355,10 +355,10 @@
+ 								CLONE_TITLE,
+ 								cdr_version,
+ 								HOST_CPU, HOST_VENDOR, HOST_OS);
+-		 printf("NOTE: this is OSS DVD extensions for cdrtools and thus may have bugs\n");
+-		 printf("   related to DVD issues that are not present in the original cdrtools. For\n");
+-		 printf("   more information see http://crashrecovery.org/oss-dvd.html. The original\n");
+-		 printf("   cdrtools author should not be bothered with problems in this version.\n");
++   		 printf("Note: This version is an unofficial (modified) version with DVD support\n");
++                 printf("Note: and therefore may have bugs that are not present in the original.\n");
++                 printf("Note: Please send bug reports or support requests to http://bugzilla.redhat.com/bugzilla\n");           
++                 printf("Note: The author of cdrecord should not be bothered with problems in this version.\n");
+ 
+ #if	defined(SOURCE_MODIFIED) || !defined(IS_SCHILY_XCONFIG)
+ #define	INSERT_YOUR_EMAIL_ADDRESS_HERE

cdrtools-2.01a32-ossdvd.patch:
 cdda2wav/interface.c |    2 
 cdda2wav/ioctl.c     |    2 
 cdrecord/cdr_drv.c   |    2 
 cdrecord/cdrecord.c  |   56 ++++-
 cdrecord/cdrecord.h  |    6 
 cdrecord/drv_mmc.c   |  550 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 cdrecord/scsi_cdr.c  |   53 ++++
 include/utypes.h     |   19 +
 8 files changed, 667 insertions(+), 23 deletions(-)

--- NEW FILE cdrtools-2.01a32-ossdvd.patch ---
diff -u -r -3 cdrtools-2.01/cdrecord/cdr_drv.c cdrtools-2.01.ossdvd/cdrecord/cdr_drv.c
--- cdrtools-2.01/cdrecord/cdr_drv.c	2004-03-02 02:06:26.000000000 +0100
+++ cdrtools-2.01.ossdvd/cdrecord/cdr_drv.c	2004-08-27 05:22:37.000000000 +0200
@@ -42,6 +42,7 @@
 extern	cdr_t	cdr_oldcd;
 extern	cdr_t	cdr_cd;
 extern	cdr_t	cdr_mmc;
+extern  cdr_t   cdr_mdvd;
 extern	cdr_t	cdr_mmc_sony;
 extern	cdr_t	cdr_cd_dvd;
 extern	cdr_t	cdr_philips_cdd521O;
@@ -80,6 +81,7 @@
 cdr_t	*drivers[] = {
 	&cdr_cd_dvd,
 	&cdr_mmc,
+        &cdr_mdvd,
 	&cdr_mmc_sony,
 	&cdr_cd,
 	&cdr_oldcd,
diff -u -r -3 cdrtools-2.01/cdrecord/cdrecord.c cdrtools-2.01.ossdvd/cdrecord/cdrecord.c
--- cdrtools-2.01/cdrecord/cdrecord.c	2004-06-17 11:24:50.000000000 +0200
+++ cdrtools-2.01.ossdvd/cdrecord/cdrecord.c	2004-08-27 05:22:37.000000000 +0200
@@ -215,7 +215,7 @@
 LOCAL	BOOL	checkdsize	__PR((SCSI *scgp, cdr_t *dp,
 					long tsize, int flags));
 LOCAL	void	raise_fdlim	__PR((void));
-LOCAL	void	gargs		__PR((int, char **, int *, track_t *, char **,
+LOCAL	int	gargs		__PR((int, char **, int *, track_t *, char **,
 					int *, cdr_t **,
 					int *, long *, int *));
 LOCAL	void	set_trsizes	__PR((cdr_t *, int, track_t *));
@@ -270,6 +270,7 @@
 	SCSI	*scgp = NULL;
 	char	errstr[80];
 	BOOL	gracedone = FALSE;
+	int     ispacket;
 
 #ifdef __EMX__
 	/* This gives wildcard expansion with Non-Posix shells with EMX */
@@ -284,7 +285,7 @@
 		track[i].track = track[i].trackno = i;
 	track[0].tracktype = TOC_MASK;
 	raise_fdlim();
-	gargs(ac, av, &tracks, track, &dev, &timeout, &dp, &speed, &flags,
+	ispacket = gargs(ac, av, &tracks, track, &dev, &timeout, &dp, &speed, &flags,
 							&blanktype);
 	if ((track[0].tracktype & TOC_MASK) == TOC_MASK)
 		comerrno(EX_BAD, "Internal error: Bad TOC type.\n");
@@ -351,6 +352,10 @@
 								CLONE_TITLE,
 								cdr_version,
 								HOST_CPU, HOST_VENDOR, HOST_OS);
+		 printf("NOTE: this is OSS DVD extensions for cdrtools and thus may have bugs\n");
+		 printf("   related to DVD issues that are not present in the original cdrtools. For\n");
+		 printf("   more information see http://crashrecovery.org/oss-dvd.html. The original\n");
+		 printf("   cdrtools author should not be bothered with problems in this version.\n");
 
 #if	defined(SOURCE_MODIFIED) || !defined(IS_SCHILY_XCONFIG)
 #define	INSERT_YOUR_EMAIL_ADDRESS_HERE
@@ -591,6 +596,19 @@
 	} else if (!is_unknown_dev(scgp) && dp != get_cdrcmds(scgp)) {
 		errmsgno(EX_BAD, "WARNING: Trying to use other driver on known device.\n");
 	}
+        if (ispacket) {
+	    BOOL	is_cdwr = FALSE;
+	    BOOL	is_dvdwr = FALSE;
+	    is_mmc(scgp, &is_cdwr, &is_dvdwr);
+	    if (is_dvdwr) {
+		track[0].flags |= TI_PACKET; 
+		/*XXX put here to only affect DVD writing, should be in gargs.
+		 * however if set in args for all mode, packet writing is then
+		 * broken for all disc as cdrecord assume that PACKET imply TAO which  
+		 * is not true at all???? */ 
+		track[0].flags &= ~TI_TAO;
+	    }
+	}
 
 	if (!is_cddrive(scgp))
 		comerrno(EX_BAD, "Sorry, no CD/DVD-Drive found on this target.\n");
@@ -632,7 +650,7 @@
 		if (!is_mmc(scgp, &is_cdwr, &is_dvdwr))
 			is_cdwr = TRUE;			/* If it is not MMC, it must be a CD writer */
 
-		if (is_dvdwr && !set_cdrcmds("mmc_dvd", (cdr_t **)NULL)) {
+		if (is_dvdwr && !set_cdrcmds("mmc_mdvd", (cdr_t **)NULL)) {
 			errmsgno(EX_BAD,
 			"This version of cdrecord does not include DVD-R/DVD-RW support code.\n");
 			errmsgno(EX_BAD,
@@ -1180,6 +1198,14 @@
 		trackno = 0;
 	}
 	scgp->silent--;
+	
+	/* If it is DVD, the information in TOC is fabricated :)
+	 The real information is from read disk info command*/
+	if((dp->cdr_dstat->ds_disktype&DT_DVD) && (dp->cdr_dstat->ds_trlast>0)){
+	    trackno=dp->cdr_dstat->ds_trlast-1;
+	    printf("trackno=%d\n",trackno);
+	}
+
 	if ((tracks + trackno) > MAX_TRACK) {
 		/*
 		 * XXX How many tracks are allowed on a DVD?
@@ -2911,10 +2937,13 @@
 		/*
 		 * dsp->ds_maxblocks == 0 (disk capacity is unknown).
 		 */
-		if (endsec >= (405000-300)) {			/*<90 min disk*/
-			errmsgno(EX_BAD,
-				"Data will not fit on any disk.\n");
-			goto toolarge;
+	        if (endsec >= (2300000)) {
+		        errmsgno(EX_BAD,
+			"ERROR: Could not manage to find medium size, and more than 4.3 GB of data.\n");
+  		        goto toolarge;  
+	        } else if (endsec >= (405000-300)) {            /*<90 min disk or DVD*/
+		        errmsgno(EX_BAD,
+			"WARNING: Could not manage to find medium size, and more than 90 mins of data.\n");
 		} else if (endsec >= (333000-150)) {		/* 74 min disk*/
 			errmsgno(EX_BAD,
 			"WARNING: Data may not fit on standard 74min disk.\n");
@@ -2998,7 +3027,7 @@
 #define	M_RAW		4	/* Raw mode */
 #define	M_PACKET	8	/* Packed mode */
 
-LOCAL void
+LOCAL int
 gargs(ac, av, tracksp, trackp, devp, timeoutp, dpp, speedp, flagsp, blankp)
 	int	ac;
 	char	**av;
@@ -3666,14 +3695,14 @@
 	    ((strncmp(*devp, "HELP", 4) == 0) ||
 	    (strncmp(*devp, "help", 4) == 0))) {
 		*flagsp |= F_CHECKDRIVE; /* Set this for not calling mlockall() */
-		return;
+		return ispacket;
 	}
 	if (*flagsp & (F_LOAD|F_DLCK|F_SETDROPTS|F_MSINFO|F_TOC|F_PRATIP|F_FIX|F_VERSION|F_CHECKDRIVE|F_PRCAP|F_INQUIRY|F_SCANBUS|F_RESET|F_ABORT)) {
 		if (tracks != 0) {
 			errmsgno(EX_BAD, "No tracks allowed with this option\n");
 			susage(EX_BAD);
 		}
-		return;
+		return ispacket;
 	}
 	*tracksp = tracks;
 	if (*flagsp & F_SAO) {
@@ -3702,12 +3731,13 @@
 			susage(EX_BAD);
 		}
 		cuefilename = cuefile;
-		return;
+		return ispacket;
 	}
 	if (tracks == 0 && (*flagsp & (F_LOAD|F_DLCK|F_EJECT|F_BLANK|F_FORMAT)) == 0) {
 		errmsgno(EX_BAD, "No tracks specified. Need at least one.\n");
 		susage(EX_BAD);
 	}
+	return ispacket;
 }
 
 LOCAL void
@@ -4131,9 +4161,11 @@
 	/*
 	 * Verify that scheduling is available
 	 */
+	seteuid ( 0 );
 #ifdef	_SC_PRIORITY_SCHEDULING
 	if (sysconf(_SC_PRIORITY_SCHEDULING) == -1) {
 		errmsg("WARNING: RR-scheduler not available, disabling.\n");
+		seteuid ( getuid() );
 		return (-1);
 	}
 #endif
@@ -4141,8 +4173,10 @@
 	scp.sched_priority = sched_get_priority_max(SCHED_RR) - pri;
 	if (sched_setscheduler(0, SCHED_RR, &scp) < 0) {
 		errmsg("WARNING: Cannot set RR-scheduler\n");
+		seteuid ( getuid() );
 		return (-1);
 	}
+	seteuid ( getuid() );
 	return (0);
 }
 
diff -u -r -3 cdrtools-2.01/cdrecord/cdrecord.h cdrtools-2.01.ossdvd/cdrecord/cdrecord.h
--- cdrtools-2.01/cdrecord/cdrecord.h	2004-05-25 00:36:01.000000000 +0200
+++ cdrtools-2.01.ossdvd/cdrecord/cdrecord.h	2004-08-27 05:22:37.000000000 +0200
@@ -570,6 +570,12 @@
 #define	DSF_NEED_FORMAT	0x0800	/* Disk needs to be formatted		*/
 
 /*
+ * Definitions for disktype flags
+ */
+#define DT_CD           0x001  /*is a CD                                */
+#define DT_DVD          0x002  /*is a DVD                               */
+
+/*
  * Definitions for disk_status disk type
  * used in "ds_type".
  */
diff -u -r -3 cdrtools-2.01/cdrecord/drv_mmc.c cdrtools-2.01.ossdvd/cdrecord/drv_mmc.c
--- cdrtools-2.01/cdrecord/drv_mmc.c	2004-05-25 00:36:01.000000000 +0200
+++ cdrtools-2.01.ossdvd/cdrecord/drv_mmc.c	2004-08-27 05:23:18.000000000 +0200
@@ -84,8 +84,11 @@
 EXPORT	char	*hasdrvopt		__PR((char *optstr, char *optname));
 LOCAL	cdr_t	*identify_mmc		__PR((SCSI *scgp, cdr_t *, struct scsi_inquiry *));
 LOCAL	int	attach_mmc		__PR((SCSI *scgp, cdr_t *));
+LOCAL   int     attach_mdvd             __PR((SCSI *scgp, cdr_t *));
 EXPORT	int	check_writemodes_mmc	__PR((SCSI *scgp, cdr_t *dp));
+LOCAL  int     check_writemodes_mdvd   __PR((SCSI *scgp, cdr_t *dp));
 LOCAL	int	deflt_writemodes_mmc	__PR((SCSI *scgp, BOOL reset_dummy));
+LOCAL   int     deflt_writemodes_mdvd   __PR((SCSI *scgp, BOOL reset_dummy));
 LOCAL	int	get_diskinfo		__PR((SCSI *scgp, struct disk_info *dip));
 LOCAL	void	di_to_dstat		__PR((struct disk_info *dip, dstat_t *dsp));
 LOCAL	int	get_atip		__PR((SCSI *scgp, struct atipinfo *atp));
@@ -94,18 +97,26 @@
 #endif
 LOCAL	int	init_mmc		__PR((SCSI *scgp, cdr_t *dp));
 LOCAL	int	getdisktype_mmc		__PR((SCSI *scgp, cdr_t *dp));
+LOCAL   int     getdisktype_mdvd        __PR((SCSI *scgp, cdr_t *dp));
 LOCAL	int	speed_select_mmc	__PR((SCSI *scgp, cdr_t *dp, int *speedp));
+LOCAL   int     speed_select_mdvd       __PR((SCSI *scgp, cdr_t *dp, int *speedp));
 LOCAL	int	mmc_set_speed		__PR((SCSI *scgp, int readspeed, int writespeed, int rotctl));
 LOCAL	int	next_wr_addr_mmc	__PR((SCSI *scgp, track_t *trackp, long *ap));
+LOCAL   int     next_wr_addr_mdvd       __PR((SCSI *scgp, track_t *trackp, long *ap));
 LOCAL	int	write_leadin_mmc	__PR((SCSI *scgp, cdr_t *dp, track_t *trackp));
 LOCAL	int	open_track_mmc		__PR((SCSI *scgp, cdr_t *dp, track_t *trackp));
+LOCAL   int     open_track_mdvd         __PR((SCSI *scgp, cdr_t *dp, track_t *trackp));
 LOCAL	int	close_track_mmc		__PR((SCSI *scgp, cdr_t *dp, track_t *trackp));
+LOCAL   int     close_track_mdvd        __PR((SCSI *scgp, cdr_t *dp, track_t *trackp)); 
 LOCAL	int	open_session_mmc	__PR((SCSI *scgp, cdr_t *dp, track_t *trackp));
+LOCAL   int     open_session_mdvd       __PR((SCSI *scgp, cdr_t *dp, track_t *trackp));
 LOCAL	int	waitfix_mmc		__PR((SCSI *scgp, int secs));
 LOCAL	int	fixate_mmc		__PR((SCSI *scgp, cdr_t *dp, track_t *trackp));
+LOCAL   int     fixate_mdvd             __PR((SCSI *scgp, cdr_t *dp, track_t *trackp));
 LOCAL	int	blank_mmc		__PR((SCSI *scgp, cdr_t *dp, long addr, int blanktype));
 LOCAL	int	send_opc_mmc		__PR((SCSI *scgp, caddr_t, int cnt, int doopc));
 LOCAL	int	opt1_mmc		__PR((SCSI *scgp, cdr_t *dp));
+LOCAL	int	opt1_mdvd		__PR((SCSI *scgp, cdr_t *dp));
 LOCAL	int	opt2_mmc		__PR((SCSI *scgp, cdr_t *dp));
 LOCAL	int	scsi_sony_write		__PR((SCSI *scgp, caddr_t bp, long sectaddr, long size, int blocks, BOOL islast));
 LOCAL	int	gen_cue_mmc		__PR((track_t *trackp, void *vcuep, BOOL needgap));
@@ -197,6 +208,46 @@
 	opt2_mmc,
 };
 
+cdr_t   cdr_mdvd = {
+         0, 0,
+         CDR_SWABAUDIO,
+ 	 370,370,
+         "mmc_mdvd",
+         "generic SCSI-3/mmc DVD-R(W) driver",
+         0,
+ 	 (dstat_t *)0,
+         identify_mmc,
+         attach_mdvd,
+	 init_mmc,
+         getdisktype_mdvd,
+         scsi_load,
+         scsi_unload,
+         read_buff_cap,
+         cmd_dummy,                              /* recovery_needed      */
+         (int(*)__PR((SCSI *, int)))cmd_dummy,   /* recover              */
+         speed_select_mdvd,
+         select_secsize,
+         next_wr_addr_mdvd,
+         (int(*)__PR((SCSI *, Ulong)))cmd_ill,   /* reserve_track        */
+         scsi_cdr_write,
+         (int(*)__PR((SCSI *scgp, int, track_t *)))cmd_dummy, /* gen_cue */
+	 (int(*)__PR((SCSI *scgp, cdr_t *, track_t *)))cmd_dummy, /* send_cue */
+ 	 write_leadin_mmc,
+         open_track_mdvd,
+         close_track_mdvd,
+         open_session_mdvd,
+         cmd_dummy,
+	 cmd_dummy,					/* abort	*/
+         read_session_offset,
+         fixate_mdvd,
+ 	 stats_mmc,
+         blank_mmc,
+	 format_dummy,
+         send_opc_mmc,
+ 	 opt1_mdvd,
+ 	 opt2_mmc,
+};
+
 /*
  * Sony MMC CD-writer
  */
@@ -589,11 +640,8 @@
 			}
 		} else if (profile >= 0x10 && profile < 0x18) {
 			errmsgno(EX_BAD,
-			"Found DVD media but DVD-R/DVD-RW support code is missing.\n");
-			errmsgno(EX_BAD,
-			"If you need DVD-R/DVD-RW support, ask the Author for cdrecord-ProDVD.\n");
-			errmsgno(EX_BAD,
-			"Free test versions and free keys for personal use are at ftp://ftp.berlios.de/pub/cdrecord/ProDVD/\n");
+			"Found DVD media: using cdr_mdvd.\n");
+			dp = &cdr_mdvd;
 			return (dp);
 		}
 	} else {
@@ -662,11 +710,8 @@
 	}
 	if (is_dvd) {
 		errmsgno(EX_BAD,
-		"Found DVD media but DVD-R/DVD-RW support code is missing.\n");
-		errmsgno(EX_BAD,
-		"If you need DVD-R/DVD-RW support, ask the Author for cdrecord-ProDVD.\n");
-		errmsgno(EX_BAD,
-		"Free test versions and free keys for personal use are at ftp://ftp.berlios.de/pub/cdrecord/ProDVD/\n");
+		"Found DVD media: using cdr_mdvd.\n");
+		dp = &cdr_mdvd;
 	}
 	return (dp);
 }
@@ -856,6 +901,42 @@
 	return (0);
 }
 
+LOCAL int
+attach_mdvd(scgp, dp)
+        SCSI    *scgp;
+        cdr_t                   *dp;
+{
+        struct  cd_mode_page_2A *mp;
+	
+
+        allow_atapi(scgp, TRUE);/* Try to switch to 10 byte mode cmds */
+
+        scgp->silent++;
+        mp = mmc_cap(scgp, NULL);/* Get MMC capabilities in allocated mp */
+        scgp->silent--;
+        if (mp == NULL)
+                return (-1);    /* Pre SCSI-3/mmc drive         */
+
+        dp->cdr_cdcap = mp;     /* Store MMC cap pointer        */
+
+        if (mp->loading_type == LT_TRAY)
+                dp->cdr_flags |= CDR_TRAYLOAD;
+        else if (mp->loading_type == LT_CADDY)
+                dp->cdr_flags |= CDR_CADDYLOAD;
+
+        if (mp->BUF != 0)
+                dp->cdr_flags |= CDR_BURNFREE;
+
+        check_writemodes_mdvd(scgp, dp);
+
+        if (driveropts != NULL) {
+                if (strcmp(driveropts, "help") == 0) {
+                        mmc_opthelp(dp, 0);
+                }
+        }
+
+        return (0);
+}
 
 EXPORT int
 check_writemodes_mmc(scgp, dp)
@@ -1007,6 +1088,77 @@
 }
 
 LOCAL int
+check_writemodes_mdvd(scgp, dp)
+	SCSI	*scgp;
+	cdr_t	*dp;
+{
+	Uchar	mode[0x100];
+	int	len;
+	struct	cd_mode_page_05 *mp;
+
+	if (xdebug)
+		printf("Checking possible write modes: ");
+
+	deflt_writemodes_mdvd(scgp, FALSE);
+
+	fillbytes((caddr_t)mode, sizeof(mode), '\0');
+
+	scgp->silent++;
+	if (!get_mode_params(scgp, 0x05, "CD write parameter",
+			mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
+		scgp->silent--;
+		return (-1);
+	}
+	if (len == 0) {
+		scgp->silent--;
+		return (-1);
+	}
+
+	mp = (struct cd_mode_page_05 *)
+		(mode + sizeof(struct scsi_mode_header) +
+		((struct scsi_mode_header *)mode)->blockdesc_len);
+
+	mp->test_write = 0;
+
+	/*We only check for PACKET and SAO since these are the only supported modes for DVD */
+	/*XXX these checks are irrelevant because they are not medium sensitive. ie the device returns 
+	  error only when it does not support a given mode for ALL mediums. It should check using 
+	  GET CONFIGURATION command.*/
+
+	mp->write_type = WT_PACKET;
+	mp->fp = 0;
+	i_to_4_byte(mp->packet_size, 0);
+
+	if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+		dp->cdr_flags |= CDR_PACKET;
+		if (xdebug)
+		  printf("PACKET ");
+	} else
+	  dp->cdr_flags &= ~CDR_PACKET;
+	mp->fp = 0;
+	i_to_4_byte(mp->packet_size, 0);
+	mp->track_mode = TM_DATA; 
+
+
+	mp->write_type = WT_SAO;
+
+	if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+		dp->cdr_flags |= CDR_SAO;
+		if (xdebug)
+			printf("SAO ");
+	} else
+		dp->cdr_flags &= ~CDR_SAO;
+
+
+	if (xdebug)
+		printf("\n");
+
+	deflt_writemodes_mdvd(scgp, TRUE);
+	scgp->silent--;
+	return (0);
+}
+
+LOCAL int
 deflt_writemodes_mmc(scgp, reset_dummy)
 	SCSI	*scgp;
 	BOOL	reset_dummy;
@@ -1080,6 +1232,61 @@
 	return (0);
 }
 
+LOCAL int
+deflt_writemodes_mdvd(scgp, reset_dummy)
+	SCSI	*scgp;
+	BOOL	reset_dummy;
+{
+	Uchar	mode[0x100];
+	int	len;
+	struct	cd_mode_page_05 *mp;
+
+	fillbytes((caddr_t)mode, sizeof(mode), '\0');
+
+	scgp->silent++;
+	if (!get_mode_params(scgp, 0x05, "DVD write parameter",
+			mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
+		scgp->silent--;
+		return (-1);
+	}
+	if (len == 0) {
+		scgp->silent--;
+		return (-1);
+	}
+
+	mp = (struct cd_mode_page_05 *)
+		(mode + sizeof(struct scsi_mode_header) +
+		((struct scsi_mode_header *)mode)->blockdesc_len);
+
+	mp->test_write = 0;
+	/*
+	 * This is the only place where we reset mp->test_write (-dummy)
+	 */
+	if (reset_dummy)
+		mp->test_write = 0;
+
+
+	/*
+	 * Set default values:
+	 * Write type = 02 (session at once)
+	 *
+	 * XXX Note:	the same code appears in check_writemodes_mmc() and
+	 * XXX		in speed_select_mmc().
+	 */
+	mp->write_type = WT_SAO;
+	mp->track_mode = TM_DATA; 
+	mp->dbtype = DB_ROM_MODE1;
+	mp->session_format = SES_DA_ROM;
+
+
+	if (set_mode_params(scgp, "DVD write parameter", mode, len, 0, -1) < 0) {
+		scgp->silent--;
+		return (-1);
+	}
+	scgp->silent--;
+	return (0);
+}
+
 #ifdef	PRINT_ATIP
 LOCAL	void	print_di		__PR((struct disk_info *dip));
 LOCAL	void	atip_printspeed		__PR((char *fmt, int speedindex, char speedtab[]));
@@ -1149,6 +1356,9 @@
 
 	if (dsp->ds_last_leadout == 0 && dsp->ds_maxblocks >= 0)
 		dsp->ds_last_leadout = dsp->ds_maxblocks;
+	dsp->ds_trfirst=dip->first_track; 
+	dsp->ds_trlast=dip->last_track_ls;
+	dsp->ds_trfirst_ls=dip->first_track_ls;
 }
 
 LOCAL int
@@ -1259,6 +1469,30 @@
 }
 
 LOCAL int
+getdisktype_mdvd(scgp, dp)
+	SCSI	*scgp;
+	cdr_t	*dp;
+{
+       int ret;
+       dstat_t	*dsp = dp->cdr_dstat;
+
+       struct track_info track_info;
+       if(getdisktype_mmc(scgp, dp)<0)
+	 return -1;
+
+       /* read rzone info to get the space left on disk */
+       /*ds_trlast is the last rzone on disk, can be invisible */
+       if(read_rzone_info(scgp, (caddr_t)&track_info, sizeof(track_info))>=0)
+	  dsp->ds_maxblocks=a_to_u_4_byte(track_info.free_blocks)+a_to_4_byte(track_info.next_writable_addr);
+       
+       dsp->ds_disktype&= ~DT_CD;
+       dsp->ds_disktype|= DT_DVD;
+	
+       return (ret);
+  
+}
+
+LOCAL int
 getdisktype_mmc(scgp, dp)
 	SCSI	*scgp;
 	cdr_t	*dp;
@@ -1762,6 +1996,68 @@
 }
 
 LOCAL int
+speed_select_mdvd(scgp, dp, speedp)
+	SCSI	*scgp;
+	cdr_t   *dp;
+	int	*speedp;
+{
+	int retcode;
+	unsigned char perf_desc[28];
+	int write_speed = *speedp * 1385;
+	int val = 0, val2 = 0;
+	int i;
+ 
+/* For the moment we just divide the CD speed by 7*/
+
+	if(speedp!=NULL)
+		(*speedp)=(*speedp)*8;
+
+	memset(perf_desc, 0, sizeof(perf_desc));
+
+	/* Write Rotation Control = ROTCTL_CLV 
+	 * | Restore Logical Unit Defaults = 0 
+	 * | Exact = 0 
+	 * | Random Access = 0) 
+	 */
+	perf_desc[0]= ROTCTL_CLV << 3 | 0 << 2 | 0 << 1 | 0; 
+	/* Start LBA to 0 */
+	perf_desc[4] = 0;
+	perf_desc[5] = 0;
+	perf_desc[6] = 0;
+	perf_desc[7] = 0;
+	/* End LBA set to 0 (setting to 0xffffffff failed on my LG burner
+ 	*/
+	perf_desc[8] = 0;
+	perf_desc[9] = 0;
+	perf_desc[10] = 0;
+	perf_desc[11] = 0;
+	/* Read Speed = 0xFFFF */
+	perf_desc[12] = 0;
+	perf_desc[13] = 0;
+	perf_desc[14] = 0xFF;
+	perf_desc[15] = 0xFF;
+	/* Read Time = 1s */
+	perf_desc[18] = 1000 >> 8;
+	perf_desc[19] = 1000 & 0xFF;   
+	/* Write Speed */
+	perf_desc[20] = write_speed >> 24;
+	perf_desc[21] = write_speed >> 16 & 0xFF;
+	perf_desc[22] = write_speed >> 8 & 0xFF;
+	perf_desc[23] = write_speed & 0xFF;
+	/* Write Time = 1s */
+	perf_desc[26] = 1000 >> 8;
+	perf_desc[27] = 1000 & 0xFF;  
+
+	//retcode = scsi_set_streaming(scgp, NULL, 0);
+	retcode = scsi_set_streaming(scgp, &perf_desc, sizeof(perf_desc));
+	if (retcode == -1) return retcode;
+		retcode = speed_select_mmc(scgp, dp, speedp);
+	if(speedp!=NULL)
+   		(*speedp)=(*speedp)/7;
+	return retcode;
+}
+
+LOCAL int
 next_wr_addr_mmc(scgp, trackp, ap)
 	SCSI	*scgp;
 	track_t	*trackp;
@@ -1898,6 +2194,48 @@
 };
 
 LOCAL int
+next_wr_addr_mdvd(scgp, trackp, ap)
+	SCSI	*scgp;
+	track_t	*trackp;
+	long	*ap;
+{
+	int     track;
+	struct	track_info	track_info;
+	long	next_addr;
+	int	result = -1;
+	struct  disk_info disk_info;
+	if (trackp){
+	    track = trackp->trackno;
+	}
+
+	if (trackp != 0 && track > 0 && is_packet(trackp)) {
+		scgp->silent++;
+		result = read_rzone_info(scgp, (caddr_t)&track_info, sizeof(track_info));
+		scgp->silent--;
+		if (scsi_in_progress(scgp)){
+		  return -1;
+		}
+		
+	}
+
+	if (result < 0) {
+	  /* Get the last rzone*/
+	        if(read_disk_info(scgp,(caddr_t)&disk_info,8)<0)
+		  return (-1);
+	     
+		if (read_rzone_info(scgp, (caddr_t)&track_info, sizeof(track_info)) < 0)
+		return (-1);
+	}
+	if (scgp->verbose)
+		scg_prbytes("track info:", (Uchar *)&track_info,
+				sizeof(track_info)-scg_getresid(scgp));
+	next_addr = a_to_4_byte(track_info.next_writable_addr);
+	if (ap)
+		*ap = next_addr;
+	return (0);
+}
+
+LOCAL int
 open_track_mmc(scgp, dp, trackp)
 	SCSI	*scgp;
 	cdr_t	*dp;
@@ -1978,6 +2316,45 @@
 }
 
 LOCAL int
+open_track_mdvd(scgp, dp, trackp)
+	SCSI	*scgp;
+	cdr_t	*dp;
+	track_t *trackp;
+{
+	Uchar	mode[0x100];
+	int	len;
+	struct	cd_mode_page_05 *mp;
+
+	if (is_packet(trackp)) {
+	       fillbytes((caddr_t)mode, sizeof(mode), '\0');
+	  
+	       if (!get_mode_params(scgp, 0x05, "DVD write parameter",
+			mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len))
+	              return (-1);
+	       if (len == 0)
+		      return (-1);
+
+	        mp = (struct cd_mode_page_05 *)
+	              (mode + sizeof(struct scsi_mode_header) +
+		      ((struct scsi_mode_header *)mode)->blockdesc_len);
+
+		mp->write_type = WT_PACKET;
+		mp->LS_V = 1;
+		/*For now we set the link size to 0x10(32k) because Pioneer-A03 only support this */
+		mp->link_size=0x10;
+		mp->fp = 1;
+		i_to_4_byte(mp->packet_size, trackp->pktsize);
+	} else {
+	     return 0;
+	}
+ 
+	if (!set_mode_params(scgp, "CD write parameter", mode, len, 0, trackp->secsize))
+		return (-1);
+
+	return (0);
+}
+
+LOCAL int
 close_track_mmc(scgp, dp, trackp)
 	SCSI	*scgp;
 	cdr_t	*dp;
@@ -2003,6 +2380,30 @@
 	return (0);
 }
 
+LOCAL int
+close_track_mdvd(scgp, dp, trackp)
+	SCSI	*scgp;
+	cdr_t	*dp;
+	track_t	*trackp;
+{
+	int	ret;
+	if (!is_packet(trackp))
+	     return (0);
+
+	if (scsi_flush_cache(scgp, (dp->cdr_cmdflags&F_IMMED) != 0) < 0) {
+		printf("Trouble flushing the cache\n");
+		return -1;
+	}
+	wait_unit_ready(scgp, 300);		/* XXX Wait for ATAPI */
+	if (is_packet(trackp) && !is_noclose(trackp)) {
+			/* close the incomplete track */
+		ret = scsi_close_tr_session(scgp, 1, 0xFF, (dp->cdr_cmdflags&F_IMMED) != 0);
+		wait_unit_ready(scgp, 300);	/* XXX Wait for ATAPI */
+		return (ret);
+	}
+	return (0);
+}
+
 int	toc2sess[] = {
 	SES_DA_ROM,	/* CD-DA		 */
 	SES_DA_ROM,	/* CD-ROM		 */
@@ -2086,6 +2487,80 @@
 }
 
 LOCAL int
+open_session_mdvd(scgp, dp, trackp)
+	SCSI	*scgp;
+	cdr_t	*dp;
+	track_t	*trackp;
+{
+	Uchar	mode[0x100];
+	int	tracks = trackp->tracks;
+
+	int	len;
+	struct	cd_mode_page_05 *mp;
+	Ulong totalsize;
+	int i;
+	struct	track_info	track_info;
+
+	fillbytes((caddr_t)mode, sizeof(mode), '\0');
+
+	if (!get_mode_params(scgp, 0x05, "DVD write parameter",
+			mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len))
+		return (-1);
+	if (len == 0)
+		return (-1);
+
+	mp = (struct cd_mode_page_05 *)
+		(mode + sizeof(struct scsi_mode_header) +
+		((struct scsi_mode_header *)mode)->blockdesc_len);
+	if(is_packet(trackp)){
+	  mp->write_type=WT_PACKET;
+	  mp->multi_session = (track_base(trackp)->tracktype & TOCF_MULTI) ? MS_MULTI : MS_NONE;
+	  mp->fp=0;
+	  mp->BUFE=1;
+	  mp->track_mode=1;
+	}else{
+	  mp->write_type = WT_SAO; 
+	}
+
+	
+	if (lverbose && dp->cdr_cdcap->BUF != 0)
+		printf("BURN-Free is %s.\n", mp->BUFE?"ON":"OFF");
+	if (driveropts != NULL) {
+		if ((strcmp(driveropts, "burnproof") == 0 ||
+		    strcmp(driveropts, "burnfree") == 0) && dp->cdr_cdcap->BUF != 0) {
+			errmsgno(EX_BAD, "Turning BURN-Free on\n");
+			mp->BUFE = 1;
+		} else if ((strcmp(driveropts, "noburnproof") == 0 ||
+			   strcmp(driveropts, "noburnfree") == 0)) {
+			errmsgno(EX_BAD, "Turning BURN-Free off\n");
+			mp->BUFE = 0;
+		} else if (strcmp(driveropts, "help") == 0) {
+			mmc_opthelp(dp, 0);
+		} else {
+			errmsgno(EX_BAD, "Bad driver opts '%s'.\n", driveropts);
+			mmc_opthelp(dp, EX_BAD);
+		}
+	}
+
+
+	if (!set_mode_params(scgp, "DVD write parameter", mode, len, 0, -1))
+		return (-1);
+
+		
+	totalsize=0;
+	for(i=1;i<=tracks;i++) {
+	  totalsize+=trackp[i].tracksecs;
+	}
+       
+	if(!is_packet(trackp)){
+	  /* in DAO mode we need to reserve space for the track*/
+	  if(reserve_track(scgp, totalsize)<0)
+	    return (-1);
+	  }
+	return (0);
+}
+
+LOCAL int
 waitfix_mmc(scgp, secs)
 	SCSI	*scgp;
 	int	secs;
@@ -2215,6 +2690,25 @@
 	return (ret);
 }
 
+LOCAL int
+fixate_mdvd(scgp, dp, trackp)
+	SCSI	*scgp;
+	cdr_t   *dp;
+	track_t	*trackp;
+{
+      /*set a really BIG timeout and call fixate_mmc
+	 The BIG timeout is needed in case there was a very short rzone to write at the 
+	 beginning of the disk, because lead-out needs to be at some distance.
+      */
+      scg_settimeout(scgp, 1000);
+      if(is_packet(trackp)){
+	  scsi_close_tr_session(scgp, 2, 0, FALSE);
+      }
+      fixate_mmc(scgp, dp, trackp);
+      scg_settimeout(scgp, 200);
+      
+}
+
 char	*blank_types[] = {
 	"entire disk",
 	"PMA, TOC, pregap",
@@ -2453,6 +2947,42 @@
 }
 
 LOCAL int
+opt1_mdvd(scgp, dp)
+	SCSI	*scgp;
+	cdr_t	*dp;
+{
+	int	oflags = dp->cdr_dstat->ds_cdrflags;
+
+	if ((dp->cdr_dstat->ds_cdrflags & RF_AUDIOMASTER) != 0) {
+		printf("Turning Audio Master Q. R. on\n");
+		if (set_audiomaster_yamaha(scgp, dp, TRUE) < 0)
+			return (-1);
+		if (!debug && lverbose <= 1)
+			dp->cdr_dstat->ds_cdrflags &= ~RF_PRATIP;
+		if (getdisktype_mdvd(scgp, dp) < 0) {
+			dp->cdr_dstat->ds_cdrflags = oflags;
+			return (-1);
+		}
+		dp->cdr_dstat->ds_cdrflags = oflags;
+		if (oflags & RF_PRATIP) {
+			msf_t   msf;
+			lba_to_msf(dp->cdr_dstat->ds_first_leadin, &msf);
+			printf("New start of lead in: %ld (%02d:%02d/%02d)\n",
+				(long)dp->cdr_dstat->ds_first_leadin,
+		                msf.msf_min,
+        		        msf.msf_sec,
+                		msf.msf_frame);
+			lba_to_msf(dp->cdr_dstat->ds_maxblocks, &msf);
+			printf("New start of lead out: %ld (%02d:%02d/%02d)\n",
+				(long)dp->cdr_dstat->ds_maxblocks,
+		                msf.msf_min,
+        		        msf.msf_sec,
+                		msf.msf_frame);
+		}
+	}
+	return (0);
+}
+LOCAL int
 scsi_sony_write(scgp, bp, sectaddr, size, blocks, islast)
 	SCSI	*scgp;
 	caddr_t	bp;		/* address of buffer */
diff -u -r -3 cdrtools-2.01/cdrecord/scsi_cdr.c cdrtools-2.01.ossdvd/cdrecord/scsi_cdr.c
--- cdrtools-2.01/cdrecord/scsi_cdr.c	2004-05-25 00:36:01.000000000 +0200
+++ cdrtools-2.01.ossdvd/cdrecord/scsi_cdr.c	2004-08-27 05:46:33.000000000 +0200
@@ -107,6 +107,7 @@
 EXPORT	int	send_cue_sheet	__PR((SCSI *scgp, caddr_t bp, long size));
 EXPORT	int	read_buff_cap	__PR((SCSI *scgp, long *, long *));
 EXPORT	int	scsi_blank	__PR((SCSI *scgp, long addr, int blanktype, BOOL immed));
+EXPORT int     scsi_set_streaming      __PR((SCSI *scgp, caddr_t addr, int size));
 EXPORT	BOOL	allow_atapi	__PR((SCSI *scgp, BOOL new));
 EXPORT	int	mode_select	__PR((SCSI *scgp, Uchar *, int, int, int));
 EXPORT	int	mode_sense	__PR((SCSI *scgp, Uchar *dp, int cnt, int page, int pcf));
@@ -519,6 +520,32 @@
 }
 
 EXPORT int
+scsi_set_streaming(scgp, perf_desc, size)
+	SCSI    *scgp;
+	caddr_t perf_desc;
+	int     size;
+{
+	register struct scg_cmd *scmd = scgp->scmd;
+
+	fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
+	scmd->addr = perf_desc;
+	scmd->size = size;
+	scmd->flags = SCG_DISRE_ENA;
+	scmd->cdb_len = SC_G5_CDBLEN;
+	scmd->sense_len = CCS_SENSE_LEN;
+	scmd->cdb.g5_cdb.cmd = 0xB6;
+	scmd->cdb.cmd_cdb[11] = 0;
+	scmd->cdb.cmd_cdb[10] = size;
+
+	scgp->cmdname = "set streaming";
+
+	printf("scsi_set_streaming\n");
+	if (scg_cmd(scgp) < 0)
+		return (-1);
+	return (0);
+}
+
+EXPORT int
 scsi_set_speed(scgp, readspeed, writespeed, rotctl)
 	SCSI	*scgp;
 	int	readspeed;
@@ -1042,6 +1069,32 @@
 	return (0);
 }
 
+
+EXPORT int
+reserve_track(scgp, size)
+	SCSI	*scgp;
+	Ulong	size;
+
+{
+	register struct	scg_cmd	*scmd = scgp->scmd;
+
+	fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
+	scmd->flags = SCG_DISRE_ENA;
+	scmd->cdb_len = SC_G1_CDBLEN;
+	scmd->sense_len = CCS_SENSE_LEN;
+	scmd->cdb.g1_cdb.cmd = 0x53;
+	scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+	i_to_4_byte(&scmd->cdb.g1_cdb.addr[3], size);
+
+	scgp->cmdname = "reserve track";
+
+	if (scg_cmd(scgp) < 0) 
+		return (-1);
+
+	return (0);
+
+}
+
 EXPORT int
 read_rzone_info(scgp, bp, cnt)
 	SCSI	*scgp;
diff -u -r -3 cdrtools-2.01/include/utypes.h cdrtools-2.01.ossdvd/include/utypes.h
--- cdrtools-2.01/include/utypes.h	2003-06-15 23:41:23.000000000 +0200
+++ cdrtools-2.01.ossdvd/include/utypes.h	2004-08-27 07:13:09.076574488 +0200
@@ -75,6 +75,25 @@
 typedef	unsigned char	Uchar;
 
 /*
+ * Added these cause Linux distro's using kernel 2.6.x seems 
+ * to want them.
+ */
+typedef	unsigned char	u8;
+typedef	unsigned short	u16;
+typedef	unsigned int	u32;
+#if defined(__GNUC__)		/* this is defined gcc-3.x */
+typedef	unsigned long long u64;
+#endif
+
+/*
+ * Dodge the __attribute_const__ out of sneaky kernel includes.
+ * cdrtools is a userland program, so no kernel attribute's
+ */
+#ifndef __attribute_const__
+# define __attribute_const__    /* unimplemented */
+#endif
+
+/*
  * This is a definition for a compiler dependant 64 bit type.
  * It currently is silently a long if the compiler does not
  * support it. Check if this is the right way.
diff -u -r -3 cdrtools-2.01/cdda2wav/interface.c cdrtools-2.01.ossdvd/cdda2wav/interface.c
--- cdrtools-2.01/cdda2wav/interface.c	2004-06-07 11:49:18.000000000 +0200
+++ cdrtools-2.01.ossdvd/cdda2wav/interface.c	2004-08-27 05:35:20.000000000 +0200
@@ -44,6 +44,7 @@
 #include <assert.h>
 #include <schily.h>
 #include <device.h>
+#include <utypes.h>
 
 #include <sys/ioctl.h>
 #include <statdefs.h>
@@ -79,7 +80,6 @@
 #include "exitcodes.h"
 #include "scsi_cmds.h"
 
-#include <utypes.h>
 #include <cdrecord.h>
 #include "scsi_scan.h"
 
diff -u -r -3 cdrtools-2.01/cdda2wav/ioctl.c cdrtools-2.01.ossdvd/cdda2wav/ioctl.c
--- cdrtools-2.01/cdda2wav/ioctl.c	2003-12-27 17:29:28.000000000 +0100
+++ cdrtools-2.01.ossdvd/cdda2wav/ioctl.c	2004-08-27 05:37:59.000000000 +0200
@@ -28,6 +28,7 @@
 #include <statdefs.h>
 #include <schily.h>
 #include <device.h>
+#include <utypes.h>
 
 #include <scg/scsitransp.h>
 
@@ -55,7 +56,6 @@
 #include "global.h"
 #include "exitcodes.h"
 
-#include <utypes.h>
 #include <cdrecord.h>
 
 #if defined (HAVE_IOCTL_INTERFACE)

cdrtools-nozero.patch:
 cdrecord.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cdrtools-nozero.patch ---
--- cdrtools/cdrecord/cdrecord.c.nozero	2006-01-17 13:26:45.000000000 +0100
+++ cdrtools/cdrecord/cdrecord.c	2006-01-17 13:37:56.000000000 +0100
@@ -4053,7 +4053,7 @@
 	scsi_start_stop_unit(scgp, 1, 0, immed);
 	wait_unit_ready(scgp, 120);
 	scgp->silent++;
-	rezero_unit(scgp);	/* Is this needed? Not supported by some drvives */
+	/*rezero_unit(scgp);*/	/* Is this needed? Not supported by some drvives */
 	scgp->silent--;
 	test_unit_ready(scgp);
 	scsi_start_stop_unit(scgp, 1, 0, immed);

cdrtools-rootstat.patch:
 tree.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE cdrtools-rootstat.patch ---
--- cdrtools/mkisofs/tree.c.readdir	2006-06-14 13:47:17.000000000 +0200
+++ cdrtools/mkisofs/tree.c	2006-06-14 13:47:21.000000000 +0200
@@ -1443,6 +1443,8 @@
 
 	/* We do this to make sure that the root entries are consistent */
 	if (this_dir == root && strcmp(short_name, "..") == 0) {
+	        /* for the case .. comes before . */
+	        stat_filter(root, &root_statbuf);
 		statbuf = root_statbuf;
 		lstatbuf = root_statbuf;
 	}



From fedora-cvs-commits at redhat.com  Wed Aug 16 08:38:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 04:38:09 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2569,
	1.2570 linux-2.6-utrace.patch, 1.18, 1.19
Message-ID: <200608160838.k7G8c9FH001404@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
New utrace patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2569
retrieving revision 1.2570
diff -u -r1.2569 -r1.2570
--- kernel-2.6.spec	16 Aug 2006 05:57:44 -0000	1.2569
+++ kernel-2.6.spec	16 Aug 2006 08:38:00 -0000	1.2570
@@ -1685,6 +1685,11 @@
 %endif
 
 %changelog
+* Wed Aug 16 2006 Roland McGrath <roland at redhat.com>
+- New utrace patch:
+  - Fix s390 single-step for real this time.
+  - Revamp how arch code defines ptrace compatibility.
+
 * Wed Aug 16 2006 Dave Jones <davej at redhat.com>
 - Update to latest GregKH tree.
 
@@ -1715,7 +1720,7 @@
 * Fri Aug 11 2006 Juan Quintela <quintela at redhat.com>
 - xen HV update cset 11061:80f364a5662f.
 - xen kernel update
-  * linux-2.6-xen-fedora cset 
+  * linux-2.6-xen-fedora cset
   * linux-2.6-xen cset 22809:d4b3aba8876df169ffd9fac1d17bd88d87eb67c5.
   * xen-unstable 11060:323eb29083e6d596800875cafe6f843b5627d77b
   * Integrate xen virtual frame buffer patch.

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  454 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  863 +++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/ia32_entry.S             |    2 
 arch/ia64/ia32/sys_ia32.c               |   23 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/ia64/kernel/signal.c               |    4 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  953 +++++++++++--------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  637 +++++++++++--
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  714 +++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  648 ++++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |   14 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   49 +
 include/asm-ia64/tracehook.h            |   67 +
 include/asm-powerpc/tracehook.h         |   80 +
 include/asm-s390/tracehook.h            |   53 +
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |   54 +
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |  214 +++-
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  649 +++++++++++++
 include/linux/utrace.h                  |  481 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  253 +----
 kernel/fork.c                           |   62 -
 kernel/ptrace.c                         | 1547 ++++++++++++++++++++++++--------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    4 
 kernel/utrace.c                         | 1526 +++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |   54 -
 security/selinux/include/objsec.h       |    1 
 93 files changed, 8430 insertions(+), 3282 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.18 -r 1.19 linux-2.6-utrace.patch
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-utrace.patch	16 Aug 2006 05:57:45 -0000	1.18
+++ linux-2.6-utrace.patch	16 Aug 2006 08:38:01 -0000	1.19
@@ -1,13 +1,13 @@
- Documentation/utrace.txt                |  455 +++++++++
+ Documentation/utrace.txt                |  454 +++++++++
  arch/alpha/kernel/asm-offsets.c         |    2 
  arch/alpha/kernel/entry.S               |    4 
  arch/arm/kernel/ptrace.c                |   36 -
  arch/arm26/kernel/ptrace.c              |   32 -
  arch/frv/kernel/ptrace.c                |   15 
  arch/i386/kernel/entry.S                |    7 
- arch/i386/kernel/i387.c                 |  143 +--
+ arch/i386/kernel/i387.c                 |  143 ++-
  arch/i386/kernel/process.c              |    3 
- arch/i386/kernel/ptrace.c               |  839 +++++++++-------
+ arch/i386/kernel/ptrace.c               |  863 +++++++++--------
  arch/i386/kernel/signal.c               |   39 -
  arch/i386/kernel/vm86.c                 |    7 
  arch/ia64/ia32/ia32_entry.S             |    2 
@@ -23,8 +23,8 @@
  arch/powerpc/kernel/asm-offsets.c       |    2 
  arch/powerpc/kernel/process.c           |    5 
  arch/powerpc/kernel/ptrace-common.h     |  161 ---
- arch/powerpc/kernel/ptrace.c            |  785 +++++++--------
- arch/powerpc/kernel/ptrace32.c          |  436 --------
+ arch/powerpc/kernel/ptrace.c            |  953 +++++++++++--------
+ arch/powerpc/kernel/ptrace32.c          |  436 ---------
  arch/powerpc/kernel/signal_32.c         |   56 +
  arch/powerpc/kernel/signal_64.c         |    4 
  arch/powerpc/kernel/sys_ppc32.c         |    5 
@@ -34,7 +34,7 @@
  arch/s390/kernel/compat_linux.c         |    3 
  arch/s390/kernel/compat_signal.c        |    5 
  arch/s390/kernel/process.c              |    3 
- arch/s390/kernel/ptrace.c               |  553 ++++++++++-
+ arch/s390/kernel/ptrace.c               |  637 ++++++++++++-
  arch/s390/kernel/signal.c               |    4 
  arch/s390/kernel/traps.c                |    6 
  arch/sparc64/kernel/entry.S             |    6 
@@ -48,10 +48,10 @@
  arch/x86_64/ia32/ia32_aout.c            |    6 
  arch/x86_64/ia32/ia32_signal.c          |    8 
  arch/x86_64/ia32/ia32entry.S            |    2 
- arch/x86_64/ia32/ptrace32.c             |  690 +++++++++----
+ arch/x86_64/ia32/ptrace32.c             |  714 ++++++++++----
  arch/x86_64/ia32/sys_ia32.c             |    5 
  arch/x86_64/kernel/process.c            |    5 
- arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
+ arch/x86_64/kernel/ptrace.c             |  648 ++++++++-----
  arch/x86_64/kernel/signal.c             |   30 -
  arch/x86_64/kernel/traps.c              |    8 
  arch/x86_64/mm/fault.c                  |    4 
@@ -67,31 +67,31 @@
  include/asm-i386/i387.h                 |   13 
  include/asm-i386/signal.h               |    4 
  include/asm-i386/thread_info.h          |    7 
- include/asm-i386/tracehook.h            |   74 +
+ include/asm-i386/tracehook.h            |   49 +
  include/asm-ia64/tracehook.h            |   67 +
- include/asm-powerpc/tracehook.h         |  303 ++++++
- include/asm-s390/tracehook.h            |  105 ++
+ include/asm-powerpc/tracehook.h         |   80 ++
+ include/asm-s390/tracehook.h            |   53 +
  include/asm-sparc64/tracehook.h         |   44 +
  include/asm-x86_64/fpu32.h              |    3 
  include/asm-x86_64/thread_info.h        |    2 
- include/asm-x86_64/tracehook.h          |  106 ++
+ include/asm-x86_64/tracehook.h          |   54 +
  include/linux/init_task.h               |    3 
- include/linux/ptrace.h                  |   88 +-
- include/linux/sched.h                   |   25 
- include/linux/tracehook.h               |  645 +++++++++++++
- include/linux/utrace.h                  |  481 +++++++++
+ include/linux/ptrace.h                  |  214 +++-
+ include/linux/sched.h                   |   25 -
+ include/linux/tracehook.h               |  649 +++++++++++++
+ include/linux/utrace.h                  |  481 ++++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
  kernel/exit.c                           |  253 +----
  kernel/fork.c                           |   62 -
- kernel/ptrace.c                         | 1592 ++++++++++++++++++++++++-------
+ kernel/ptrace.c                         | 1547 ++++++++++++++++++++++++-------
  kernel/signal.c                         |  211 +---
  kernel/sys.c                            |    2 
- kernel/timer.c                          |    6 
- kernel/utrace.c                         | 1526 ++++++++++++++++++++++++++++++
+ kernel/timer.c                          |    4 
+ kernel/utrace.c                         | 1526 +++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |   54 +
  security/selinux/include/objsec.h       |    1 
- 93 files changed, 8332 insertions(+), 3321 deletions(-)
+ 93 files changed, 8430 insertions(+), 3282 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -107,7 +107,7 @@
 
 --- linux-2.6/include/asm-powerpc/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-powerpc/tracehook.h
-@@ -0,0 +1,303 @@
+@@ -0,0 +1,80 @@
 +/*
 + * Tracing hooks, PowerPC CPU support
 + */
@@ -187,229 +187,6 @@
 +}
 +
 +
-+#ifdef CONFIG_PTRACE
-+#include <linux/mm.h>
-+#include <asm/uaccess.h>
-+
-+static inline int arch_ptrace(long request, struct task_struct *child,
-+			      unsigned long addr, long data,
-+			      const struct utrace_regset_view **view,
-+			      int *regset, int *rw,
-+			      void __user **uaddr, int *nregs)
-+{
-+	switch (request) {
-+	case PPC_PTRACE_GETREGS: /* Get GPRs 0 - 31. */
-+	case PPC_PTRACE_SETREGS: /* Set GPRs 0 - 31. */
-+		*regset = 0;
-+		*rw = request == PPC_PTRACE_SETREGS;
-+		*nregs = 32;
-+		*uaddr = (void __user *)addr;
-+		break;
-+	case PPC_PTRACE_GETFPREGS: /* Get FPRs 0 - 31. */
-+	case PPC_PTRACE_SETFPREGS: /* Get FPRs 0 - 31. */
-+		*regset = 1;
-+		*rw = request == PPC_PTRACE_SETFPREGS;
-+		*uaddr = (void __user *)addr;
-+		*nregs = 32;
-+		break;
-+#ifdef CONFIG_PPC64
-+	case PTRACE_GET_DEBUGREG:
-+	case PTRACE_SET_DEBUGREG:
-+		*regset = 3;
-+		*nregs = -1;
-+		*rw = request == PTRACE_SET_DEBUGREG;
-+		break;
-+#endif /* CONFIG_PPC64 */
-+#ifdef CONFIG_ALTIVEC
-+	case PTRACE_GETVRREGS:
-+	case PTRACE_SETVRREGS:
-+		*regset = 2;
-+		*rw = request == PTRACE_SETVRREGS;
-+		break;
-+#endif
-+#ifdef CONFIG_SPE
-+	case PTRACE_GETEVRREGS:
-+	case PTRACE_SETEVRREGS:
-+#ifdef CONFIG_ALTIVEC
-+		*regset = 3;
-+#else
-+		*regset = 2;
-+#endif
-+		*rw = request == PTRACE_SETEVRREGS;
-+		break;
-+#endif
-+
-+	}
-+	return -ENOSYS;
-+}
-+
-+static inline int arch_compat_ptrace(long request, struct task_struct *child,
-+				     unsigned long addr, long data,
-+				     const struct utrace_regset_view **view,
-+				     int *regset, int *rw,
-+				     void __user **uaddr, int *nregs)
-+{
-+	int ret = -ENOSYS;
-+
-+	switch (request) {
-+#ifdef CONFIG_PPC64
-+	case PPC_PTRACE_GETREGS: /* Get GPRs 0 - 31. */
-+	case PPC_PTRACE_SETREGS: /* Set GPRs 0 - 31. */
-+		*regset = 0;
-+		*rw = request == PPC_PTRACE_SETREGS;
-+		*nregs = 32;
-+		*uaddr = (void __user *)addr;
-+		break;
-+	case PPC_PTRACE_GETFPREGS: /* Get FPRs 0 - 31. */
-+	case PPC_PTRACE_SETFPREGS: /* Get FPRs 0 - 31. */
-+		*regset = 1;
-+		*rw = request == PPC_PTRACE_SETFPREGS;
-+		*uaddr = (void __user *)addr;
-+		*nregs = 32;
-+		break;
-+	case PTRACE_GET_DEBUGREG:
-+	case PTRACE_SET_DEBUGREG:
-+		*regset = 3;
-+		*nregs = -1;
-+		*rw = request == PTRACE_SET_DEBUGREG;
[...3587 lines suppressed...]
--	case PTRACE_SETREGS: { /* Set all gp regs in the child. */
--		unsigned long tmp;
+-	case PTRACE_GETREGS: { /* Get all gp regs from the child. */
 -		int i;
--	  	if (!access_ok(VERIFY_READ, datap, 16*4)) {
+-	  	if (!access_ok(VERIFY_WRITE, datap, 16*4)) {
 -			ret = -EIO;
 -			break;
 +		if (kbuf) {
 +			*(u32 *) kbuf = val;
 +			kbuf += sizeof(u32);
  		}
--		ret = 0; 
--		for ( i = 0; i <= 16*4; i += sizeof(u32) ) {
--			ret |= __get_user(tmp, (u32 __user *)datap);
--			putreg32(child, i, tmp);
+-		ret = 0;
+-		for ( i = 0; i <= 16*4 ; i += sizeof(__u32) ) {
+-			getreg32(child, i, &val);
+-			ret |= __put_user(val,(u32 __user *)datap);
 -			datap += sizeof(u32);
 +		else {
 +			if (__put_user(val, (u32 __user *) ubuf))
@@ -13720,26 +13764,15 @@
 -		break;
  	}
  
--	case PTRACE_GETFPREGS:
--		ret = -EIO; 
--		if (!access_ok(VERIFY_READ, compat_ptr(data), 
--			       sizeof(struct user_i387_struct)))
--			break;
--		save_i387_ia32(child, datap, childregs, 1);
--		ret = 0; 
+-	case PTRACE_SETREGS: { /* Set all gp regs in the child. */
+-		unsigned long tmp;
+-		int i;
+-	  	if (!access_ok(VERIFY_READ, datap, 16*4)) {
+-			ret = -EIO;
 -			break;
 +	return 0;
 +}
- 
--	case PTRACE_SETFPREGS:
--		ret = -EIO;
--		if (!access_ok(VERIFY_WRITE, datap, 
--			       sizeof(struct user_i387_struct)))
--			break;
--		ret = 0;
--		/* don't check EFAULT to be bug-to-bug compatible to i386 */
--		restore_i387_ia32(child, datap, 1);
--		break;
++
 +static int
 +ia32_dbregs_set(struct task_struct *target,
 +		const struct utrace_regset *regset,
@@ -13759,12 +13792,44 @@
 +		if (kbuf) {
 +			val = *(const u32 *) kbuf;
 +			kbuf += sizeof(u32);
-+		}
+ 		}
+-		ret = 0; 
+-		for ( i = 0; i <= 16*4; i += sizeof(u32) ) {
+-			ret |= __get_user(tmp, (u32 __user *)datap);
+-			putreg32(child, i, tmp);
+-			datap += sizeof(u32);
 +		else {
 +			if (__get_user(val, (u32 __user *) ubuf))
 +				return -EFAULT;
 +			ubuf += sizeof(u32);
-+		}
+ 		}
+-		break;
+-	}
+ 
+-	case PTRACE_GETFPREGS:
+-		ret = -EIO; 
+-		if (!access_ok(VERIFY_READ, compat_ptr(data), 
+-			       sizeof(struct user_i387_struct)))
+-			break;
+-		save_i387_ia32(child, datap, childregs, 1);
+-		ret = 0; 
++		ret = (*dbregset->set)(target, dbregset, pos * sizeof(long),
++				       sizeof(val), &val, NULL);
++		if (ret)
+ 			break;
++	}
+ 
+-	case PTRACE_SETFPREGS:
+-		ret = -EIO;
+-		if (!access_ok(VERIFY_WRITE, datap, 
+-			       sizeof(struct user_i387_struct)))
+-			break;
+-		ret = 0;
+-		/* don't check EFAULT to be bug-to-bug compatible to i386 */
+-		restore_i387_ia32(child, datap, 1);
+-		break;
++	return ret;
++}
  
 -	case PTRACE_GETFPXREGS: { 
 -		struct user32_fxsr_struct __user *u = datap;
@@ -13774,14 +13839,11 @@
 -			break;
 -			ret = -EFAULT;
 -		if (__copy_to_user(u, &child->thread.i387.fxsave, sizeof(*u)))
-+		ret = (*dbregset->set)(target, dbregset, pos * sizeof(long),
-+				       sizeof(val), &val, NULL);
-+		if (ret)
- 			break;
+-			break;
 -		ret = __put_user(childregs->cs, &u->fcs);
 -		ret |= __put_user(child->thread.ds, &u->fos); 
 -		break; 
- 	} 
+-	} 
 -	case PTRACE_SETFPXREGS: { 
 -		struct user32_fxsr_struct __user *u = datap;
 -		unlazy_fpu(child);
@@ -13795,10 +13857,6 @@
 -		ret = 0; 
 -		break;
 +
-+	return ret;
-+}
-+
-+
 +/*
 + * Perform get_thread_area on behalf of the traced child.
 + */
@@ -13975,21 +14033,60 @@
 +	},
 +};
 +
++const struct utrace_regset_view utrace_ia32_view = {
++	.name = "i386", .e_machine = EM_386,
++	.regsets = ia32_regsets,
++	.n = sizeof ia32_regsets / sizeof ia32_regsets[0],
++};
++EXPORT_SYMBOL_GPL(utrace_ia32_view);
++
++
++#ifdef CONFIG_PTRACE
++/*
++ * This matches the arch/i386/kernel/ptrace.c definitions.
++ */
 +
-+static const struct ptrace_uarea_segment ia32_uarea[] = {
++static const struct ptrace_layout_segment ia32_uarea[] = {
 +	{0, sizeof(struct user_regs_struct32), 0, 0},
 +	{offsetof(struct user32, u_debugreg[0]),
 +	 offsetof(struct user32, u_debugreg[8]), 4, 0},
 +	{0, 0, -1, 0}
 +};
 +
-+const struct utrace_regset_view utrace_ia32_view = {
-+	.name = "i386", .e_machine = EM_386,
-+	.regsets = ia32_regsets,
-+	.n = sizeof ia32_regsets / sizeof ia32_regsets[0],
-+	.uarea_segments = ia32_uarea
-+};
-+EXPORT_SYMBOL_GPL(utrace_ia32_view);
++fastcall int arch_compat_ptrace(long request, struct task_struct *child,
++				struct utrace_attached_engine *engine,
++				compat_ulong_t addr, compat_ulong_t data)
++{
++	switch (request) {
++	case PTRACE_PEEKUSR:
++		return ptrace_compat_peekusr(child, engine, ia32_uarea,
++					     addr, data);
++	case PTRACE_POKEUSR:
++		return ptrace_compat_pokeusr(child, engine, ia32_uarea,
++					     addr, data);
++	case PTRACE_GETREGS:
++		return ptrace_whole_regset(child, engine, data, 0, 0);
++	case PTRACE_SETREGS:
++		return ptrace_whole_regset(child, engine, data, 0, 1);
++	case PTRACE_GETFPREGS:
++		return ptrace_whole_regset(child, engine, data, 1, 0);
++	case PTRACE_SETFPREGS:
++		return ptrace_whole_regset(child, engine, data, 1, 1);
++	case PTRACE_GETFPXREGS:
++		return ptrace_whole_regset(child, engine, data, 2, 0);
++	case PTRACE_SETFPXREGS:
++		return ptrace_whole_regset(child, engine, data, 2, 1);
++	case PTRACE_GET_THREAD_AREA:
++	case PTRACE_SET_THREAD_AREA:
++		return ptrace_onereg_access(child, engine,
++					    &utrace_ia32_view, 3,
++					    addr,
++					    (void __user *)(unsigned long)data,
++					    request == PTRACE_SET_THREAD_AREA);
++	}
++	return -ENOSYS;
++}
++#endif	/* CONFIG_PTRACE */
 --- linux-2.6/arch/x86_64/ia32/ia32_signal.c.utrace-ptrace-compat
 +++ linux-2.6/arch/x86_64/ia32/ia32_signal.c
 @@ -497,11 +497,7 @@ int ia32_setup_frame(int sig, struct k_s



From fedora-cvs-commits at redhat.com  Wed Aug 16 09:08:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 05:08:29 -0400
Subject: rpms/cups/devel cups-str1881.patch,1.2,1.3 cups.spec,1.246,1.247
Message-ID: <200608160908.k7G98TqV024189@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-str1881.patch cups.spec 
Log Message:
* Wed Aug 16 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-11
- Use upstream patch to fix STR #1881.


cups-str1881.patch:
 backend/ipp.c        |    3 +++
 scheduler/job.c      |   23 ++++++++---------------
 scheduler/printers.c |   12 ++++++++----
 scheduler/printers.h |    1 +
 4 files changed, 20 insertions(+), 19 deletions(-)

Index: cups-str1881.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-str1881.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-str1881.patch	10 Aug 2006 17:10:47 -0000	1.2
+++ cups-str1881.patch	16 Aug 2006 09:08:21 -0000	1.3
@@ -1,24 +1,148 @@
---- cups-1.2.2/scheduler/job.c	2006-08-06 11:56:29.000000000 +0100
-+++ cups-1.2.2/scheduler/job.c	2006-08-10 17:34:27.000000000 +0100
-@@ -3018,11 +3018,17 @@
+--- cups-1.2.2/scheduler/job.c.str1881	2006-08-16 09:42:32.000000000 +0100
++++ cups-1.2.2/scheduler/job.c	2006-08-16 09:43:26.000000000 +0100
+@@ -2425,7 +2425,6 @@
+ 					/* PRINTER env variable */
+ 			rip_max_cache[255];
+ 					/* RIP_MAX_CACHE env variable */
+-  int			remote_job;	/* Remote print job? */
+   static char		*options = NULL;/* Full list of options */
+   static int		optlength = 0;	/* Length of option buffer */
+ 
+@@ -2567,17 +2566,10 @@
+   FilterLevel += job->cost;
+ 
+  /*
+-  * Determine if we are printing to a remote printer...
+-  */
+-
+-  remote_job = printer->raw && job->num_files > 1 &&
+-               !strncmp(printer->device_uri, "ipp://", 6);
+-
+- /*
+   * Add decompression filters, if any...
+   */
+ 
+-  if (!remote_job && job->compressions[job->current_file])
++  if (!printer->raw && job->compressions[job->current_file])
+   {
+    /*
+     * Add gziptoany filter to the front of the list...
+@@ -2911,7 +2903,7 @@
+   * For remote jobs, we send all of the files in the argument list.
+   */
+ 
+-  if (remote_job)
++  if (printer->remote && job->num_files > 1)
+     argv = calloc(7 + job->num_files, sizeof(char *));
+   else
+     argv = calloc(8, sizeof(char *));
+@@ -2925,7 +2917,7 @@
+   argv[4] = copies;
+   argv[5] = options;
+ 
+-  if (remote_job)
++  if (printer->remote && job->num_files > 1)
+   {
+     for (i = 0; i < job->num_files; i ++)
+     {
+@@ -3018,7 +3010,8 @@
    envp[envc ++] = device_uri;
    envp[envc ++] = printer_name;
  
 -  if ((filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
-+  if (!remote_job &&
++  if (!printer->remote &&
 +      (filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
    {
--    snprintf(final_content_type, sizeof(final_content_type),
--             "FINAL_CONTENT_TYPE=%s/%s",
--	     filter->src->super, filter->src->type);
-+    if (!strcmp (filter->dst->super, "printer"))
-+      snprintf(final_content_type, sizeof(final_content_type),
-+	       "FINAL_CONTENT_TYPE=application/octet-stream");
-+    else
-+      snprintf(final_content_type, sizeof(final_content_type),
-+	       "FINAL_CONTENT_TYPE=%s/%s",
-+	       filter->dst->super, filter->dst->type);
-+
-     envp[envc ++] = final_content_type;
+     snprintf(final_content_type, sizeof(final_content_type),
+              "FINAL_CONTENT_TYPE=%s/%s",
+@@ -3059,7 +3052,7 @@
+       cupsdLogMessage(CUPSD_LOG_DEBUG, "[Job %d] envp[%d]=\"DEVICE_URI=%s\"",
+                       job->id, i, sani_uri);
+ 
+-  if (remote_job)
++  if (printer->remote)
+     job->current_file = job->num_files;
+   else
+     job->current_file ++;
+@@ -3401,7 +3394,7 @@
+ 		  slot, filterfds[slot][0], filterfds[slot][1]);
+   cupsdClosePipe(filterfds[slot]);
+ 
+-  if (remote_job)
++  if (printer->remote && job->num_files > 1)
+   {
+     for (i = 0; i < job->num_files; i ++)
+       free(argv[i + 6]);
+@@ -3445,7 +3438,7 @@
+ 
+   cupsArrayDelete(filters);
+ 
+-  if (remote_job)
++  if (printer->remote && job->num_files > 1)
+   {
+     for (i = 0; i < job->num_files; i ++)
+       free(argv[i + 6]);
+--- cups-1.2.2/scheduler/printers.h.str1881	2006-03-23 21:07:20.000000000 +0000
++++ cups-1.2.2/scheduler/printers.h	2006-08-16 09:42:48.000000000 +0100
+@@ -66,6 +66,7 @@
+   char		*device_uri;		/* Device URI */
+   char		*port_monitor;		/* Port monitor */
+   int		raw;			/* Raw queue? */
++  int		remote;			/* Remote queue? */
+   mime_type_t	*filetype;		/* Pseudo-filetype for printer */
+   cups_array_t	*filetypes;		/* Supported file types */
+   void		*job;			/* Current job in queue */
+--- cups-1.2.2/scheduler/printers.c.str1881	2006-08-16 09:42:32.000000000 +0100
++++ cups-1.2.2/scheduler/printers.c	2006-08-16 09:42:48.000000000 +0100
+@@ -1502,7 +1502,8 @@
+     else
+       snprintf(resource, sizeof(resource), "/printers/%s", p->name);
+ 
+-    if ((auth = cupsdFindBest(resource, HTTP_POST)) == NULL)
++    if ((auth = cupsdFindBest(resource, HTTP_POST)) == NULL ||
++        auth->type == AUTH_NONE)
+       auth = cupsdFindPolicyOp(p->op_policy_ptr, IPP_PRINT_JOB);
+ 
+     if (auth)
+@@ -1582,7 +1583,8 @@
+ 
+   printer_type = p->type;
+ 
+-  p->raw = 0;
++  p->raw    = 0;
++  p->remote = 0;
+ 
+   if (p->type & CUPS_PRINTER_REMOTE)
+   {
+@@ -1600,7 +1602,8 @@
+     ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_URI, "device-uri", NULL,
+         	 p->uri);
+ 
+-    p->raw = 1;
++    p->raw    = 1;
++    p->remote = 1;
    }
+   else
+   {
+@@ -2040,7 +2043,8 @@
+ 	  * Print all files directly...
+ 	  */
+ 
+-	  p->raw = 1;
++	  p->raw    = 1;
++	  p->remote = 1;
+ 	}
+ 	else
+ 	{
+--- cups-1.2.2/backend/ipp.c.str1881	2006-07-12 20:42:35.000000000 +0100
++++ cups-1.2.2/backend/ipp.c	2006-08-16 09:42:48.000000000 +0100
+@@ -214,6 +214,9 @@
+     if ((content_type = getenv("CONTENT_TYPE")) == NULL)
+       content_type = "application/octet-stream";
  
++  if (!strncmp(content_type, "printer/", 8))
++    content_type = "application/vnd.cups-raw";
++
+  /*
+   * Extract the hostname and printer name from the URI...
+   */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- cups.spec	11 Aug 2006 17:13:35 -0000	1.246
+++ cups.spec	16 Aug 2006 09:08:22 -0000	1.247
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 10
+Release: 11
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -419,6 +419,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Aug 16 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-11
+- Use upstream patch to fix STR #1881.
+
 * Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-10
 - Remove 'Provides: LPRng = 3.8.15-3' (bug #148757).
 - Applied patch to fix STR #1893 (bug #201800).



From fedora-cvs-commits at redhat.com  Wed Aug 16 09:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 05:14:49 -0400
Subject: rpms/cups/FC-5 cups-str1881.patch,1.1,1.2 cups.spec,1.205,1.206
Message-ID: <200608160914.k7G9Ensk025488@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-str1881.patch cups.spec 
Log Message:
* Wed Aug 16 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.7
- Use upstream patch to fix STR #1881.


cups-str1881.patch:
 backend/ipp.c        |    3 +++
 scheduler/job.c      |   23 ++++++++---------------
 scheduler/printers.c |   12 ++++++++----
 scheduler/printers.h |    1 +
 4 files changed, 20 insertions(+), 19 deletions(-)

Index: cups-str1881.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-str1881.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-str1881.patch	6 Aug 2006 10:58:30 -0000	1.1
+++ cups-str1881.patch	16 Aug 2006 09:14:46 -0000	1.2
@@ -1,12 +1,148 @@
---- cups-1.2.2/scheduler/job.c.str1881	2006-08-06 11:56:07.000000000 +0100
-+++ cups-1.2.2/scheduler/job.c	2006-08-06 11:56:29.000000000 +0100
-@@ -3018,7 +3018,8 @@
+--- cups-1.2.2/scheduler/job.c.str1881	2006-08-16 09:42:32.000000000 +0100
++++ cups-1.2.2/scheduler/job.c	2006-08-16 09:43:26.000000000 +0100
+@@ -2425,7 +2425,6 @@
+ 					/* PRINTER env variable */
+ 			rip_max_cache[255];
+ 					/* RIP_MAX_CACHE env variable */
+-  int			remote_job;	/* Remote print job? */
+   static char		*options = NULL;/* Full list of options */
+   static int		optlength = 0;	/* Length of option buffer */
+ 
+@@ -2567,17 +2566,10 @@
+   FilterLevel += job->cost;
+ 
+  /*
+-  * Determine if we are printing to a remote printer...
+-  */
+-
+-  remote_job = printer->raw && job->num_files > 1 &&
+-               !strncmp(printer->device_uri, "ipp://", 6);
+-
+- /*
+   * Add decompression filters, if any...
+   */
+ 
+-  if (!remote_job && job->compressions[job->current_file])
++  if (!printer->raw && job->compressions[job->current_file])
+   {
+    /*
+     * Add gziptoany filter to the front of the list...
+@@ -2911,7 +2903,7 @@
+   * For remote jobs, we send all of the files in the argument list.
+   */
+ 
+-  if (remote_job)
++  if (printer->remote && job->num_files > 1)
+     argv = calloc(7 + job->num_files, sizeof(char *));
+   else
+     argv = calloc(8, sizeof(char *));
+@@ -2925,7 +2917,7 @@
+   argv[4] = copies;
+   argv[5] = options;
+ 
+-  if (remote_job)
++  if (printer->remote && job->num_files > 1)
+   {
+     for (i = 0; i < job->num_files; i ++)
+     {
+@@ -3018,7 +3010,8 @@
    envp[envc ++] = device_uri;
    envp[envc ++] = printer_name;
  
 -  if ((filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
-+  if (!remote_job &&
++  if (!printer->remote &&
 +      (filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
    {
      snprintf(final_content_type, sizeof(final_content_type),
               "FINAL_CONTENT_TYPE=%s/%s",
+@@ -3059,7 +3052,7 @@
+       cupsdLogMessage(CUPSD_LOG_DEBUG, "[Job %d] envp[%d]=\"DEVICE_URI=%s\"",
+                       job->id, i, sani_uri);
+ 
+-  if (remote_job)
++  if (printer->remote)
+     job->current_file = job->num_files;
+   else
+     job->current_file ++;
+@@ -3401,7 +3394,7 @@
+ 		  slot, filterfds[slot][0], filterfds[slot][1]);
+   cupsdClosePipe(filterfds[slot]);
+ 
+-  if (remote_job)
++  if (printer->remote && job->num_files > 1)
+   {
+     for (i = 0; i < job->num_files; i ++)
+       free(argv[i + 6]);
+@@ -3445,7 +3438,7 @@
+ 
+   cupsArrayDelete(filters);
+ 
+-  if (remote_job)
++  if (printer->remote && job->num_files > 1)
+   {
+     for (i = 0; i < job->num_files; i ++)
+       free(argv[i + 6]);
+--- cups-1.2.2/scheduler/printers.h.str1881	2006-03-23 21:07:20.000000000 +0000
++++ cups-1.2.2/scheduler/printers.h	2006-08-16 09:42:48.000000000 +0100
+@@ -66,6 +66,7 @@
+   char		*device_uri;		/* Device URI */
+   char		*port_monitor;		/* Port monitor */
+   int		raw;			/* Raw queue? */
++  int		remote;			/* Remote queue? */
+   mime_type_t	*filetype;		/* Pseudo-filetype for printer */
+   cups_array_t	*filetypes;		/* Supported file types */
+   void		*job;			/* Current job in queue */
+--- cups-1.2.2/scheduler/printers.c.str1881	2006-08-16 09:42:32.000000000 +0100
++++ cups-1.2.2/scheduler/printers.c	2006-08-16 09:42:48.000000000 +0100
+@@ -1502,7 +1502,8 @@
+     else
+       snprintf(resource, sizeof(resource), "/printers/%s", p->name);
+ 
+-    if ((auth = cupsdFindBest(resource, HTTP_POST)) == NULL)
++    if ((auth = cupsdFindBest(resource, HTTP_POST)) == NULL ||
++        auth->type == AUTH_NONE)
+       auth = cupsdFindPolicyOp(p->op_policy_ptr, IPP_PRINT_JOB);
+ 
+     if (auth)
+@@ -1582,7 +1583,8 @@
+ 
+   printer_type = p->type;
+ 
+-  p->raw = 0;
++  p->raw    = 0;
++  p->remote = 0;
+ 
+   if (p->type & CUPS_PRINTER_REMOTE)
+   {
+@@ -1600,7 +1602,8 @@
+     ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_URI, "device-uri", NULL,
+         	 p->uri);
+ 
+-    p->raw = 1;
++    p->raw    = 1;
++    p->remote = 1;
+   }
+   else
+   {
+@@ -2040,7 +2043,8 @@
+ 	  * Print all files directly...
+ 	  */
+ 
+-	  p->raw = 1;
++	  p->raw    = 1;
++	  p->remote = 1;
+ 	}
+ 	else
+ 	{
+--- cups-1.2.2/backend/ipp.c.str1881	2006-07-12 20:42:35.000000000 +0100
++++ cups-1.2.2/backend/ipp.c	2006-08-16 09:42:48.000000000 +0100
+@@ -214,6 +214,9 @@
+     if ((content_type = getenv("CONTENT_TYPE")) == NULL)
+       content_type = "application/octet-stream";
+ 
++  if (!strncmp(content_type, "printer/", 8))
++    content_type = "application/vnd.cups-raw";
++
+  /*
+   * Extract the hostname and printer name from the URI...
+   */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- cups.spec	11 Aug 2006 17:17:38 -0000	1.205
+++ cups.spec	16 Aug 2006 09:14:46 -0000	1.206
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 1.6
+Release: 1.7
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -406,6 +406,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Aug 16 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.7
+- Use upstream patch to fix STR #1881.
+
 * Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.6
 - Apply patch to fix STR #1893 (bug #201800).
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 09:15:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 05:15:43 -0400
Subject: rpms/cups/FC-5 cups.spec,1.206,1.207
Message-ID: <200608160915.k7G9FhRB025709@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
- Remove 'Provides: LPRng = 3.8.15-3' (bug #148757).


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- cups.spec	16 Aug 2006 09:14:46 -0000	1.206
+++ cups.spec	16 Aug 2006 09:15:41 -0000	1.207
@@ -55,7 +55,7 @@
 
 # Unconditionally obsolete LPRng so that upgrades work properly.
 Obsoletes: lpd lpr LPRng <= 3.8.15-3
-Provides: lpd lpr LPRng = 3.8.15-3
+Provides: lpd lpr
 
 BuildPrereq: pam-devel pkgconfig
 BuildPrereq: gnutls-devel libacl-devel
@@ -408,6 +408,7 @@
 %changelog
 * Wed Aug 16 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.7
 - Use upstream patch to fix STR #1881.
+- Remove 'Provides: LPRng = 3.8.15-3' (bug #148757).
 
 * Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.6
 - Apply patch to fix STR #1893 (bug #201800).



From fedora-cvs-commits at redhat.com  Wed Aug 16 09:32:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 05:32:38 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch, NONE,
	1.1 openoffice.org.spec, 1.846, 1.847
Message-ID: <200608160932.k7G9WbC5012613@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch 
Log Message:
didn't find x86_64 jvm at build time

openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch:
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |   30 +++++++++++++++++++++++----
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx |    2 +
 plugins/sunmajor/pluginlib/gnujre.cxx        |    0 
 plugins/sunmajor/pluginlib/gnujre.hxx        |    0 
 4 files changed, 28 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch ---
Index: plugins/sunmajor/pluginlib/gnujre.hxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx,v
retrieving revision 1.4
diff -u -r1.4 gnujre.hxx
--- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx	28 Feb 2006 10:31:12 -0000	1.4
+++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx	16 Aug 2006 09:24:29 -0000
@@ -44,6 +44,8 @@
 
 class GnuInfo: public VendorBase
 {
+private:
+    rtl::OUString m_sJavaHome;
 public:
     static char const* const* getJavaExePaths(int * size);
 
Index: plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.9.14.1
diff -u -r1.9.14.1 gnujre.cxx
--- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	11 Aug 2006 10:44:52 -0000	1.9.14.1
+++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	16 Aug 2006 09:24:35 -0000
@@ -83,7 +83,9 @@
         RTL_CONSTASCII_USTRINGPARAM("java.vendor"));
     OUString sVersionProperty(
         RTL_CONSTASCII_USTRINGPARAM("java.version"));
-    OUString sHomeProperty(
+    OUString sJavaHomeProperty(
+        RTL_CONSTASCII_USTRINGPARAM("java.home"));
+    OUString sGNUHomeProperty(
         RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
     OUString sAccessProperty(
         RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
@@ -91,6 +93,7 @@
     bool bVersion = false;
     bool bVendor = false;
     bool bHome = false;
+    bool bJavaHome = false;
     bool bAccess = false;
     
     typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
@@ -106,11 +109,27 @@
             m_sVersion = i->second;
             bVersion = true;
         }
-        else if (!bHome && sHomeProperty.equals(i->first))
+        else if (!bHome && sGNUHomeProperty.equals(i->first))
         {
             m_sHome = i->second;
             bHome = true;
         }
+        else if (!bJavaHome && sJavaHomeProperty.equals(i->first))
+        {
+           OUString fileURL;
+           if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
+               osl_File_E_None)
+           {
+               //make sure that the drive letter have all the same case
+               //otherwise file:///c:/jre and file:///C:/jre produce two
+               //different objects!!!
+               if (makeDriveLetterSame( & fileURL))
+               {
+                   m_sJavaHome = fileURL;
+                   bJavaHome = true;
+               }
+           }
+        }
         else if (!bAccess && sAccessProperty.equals(i->first))
         {
             if (i->second.getLength() > 0)
@@ -125,7 +144,10 @@
     }
     if (!bVersion || !bVendor || !bHome)
         return false;
-    
+
+    if (!m_sJavaHome.getLength())
+        m_sJavaHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"));
+
     // init m_sRuntimeLibrary
     OSL_ASSERT(m_sHome.getLength());
     //call virtual function to get the possible paths to the runtime library.
@@ -152,7 +174,7 @@
 
     if (!bRt)
     {
-        m_sHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"));
+        m_sHome = m_sJavaHome;
         for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
         {
             //Construct an absolute path to the possible runtime


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.846
retrieving revision 1.847
diff -u -r1.846 -r1.847
--- openoffice.org.spec	15 Aug 2006 09:54:51 -0000	1.846
+++ openoffice.org.spec	16 Aug 2006 09:32:34 -0000	1.847
@@ -119,6 +119,7 @@
 Patch51: openoffice.org-2.0.3.ooo68383.evo28support.patch
 Patch52: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 Patch53: openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch
+Patch54: openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -973,6 +974,7 @@
 %patch51 -p1 -b .ooo68383.evo28support.patch
 %patch52 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 %patch53 -p1 -b .oooXXXXX.solenv.warnnoterror.patch
+%patch54 -p1 -b .ooo68665.x86_64gcj.jvm.patch
 
 tar xzf %{SOURCE1}
 
@@ -2508,6 +2510,7 @@
 - drop integrated workspace.configure18
 - drop integrated ooo65327.builddep.writerperfect.patch
 - drop integrated ooo67337.sfx2.dontshowbuttons.patch
+- add openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch
 
 * Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.9
 - icu settext ownership of string data changed silently



From fedora-cvs-commits at redhat.com  Wed Aug 16 11:11:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 07:11:38 -0400
Subject: rpms/gimp/devel gimp-plugin-mgr.in,NONE,1.1 gimp.spec,1.106,1.107
Message-ID: <200608161111.k7GBBcvr028792@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28713

Modified Files:
	gimp.spec 
Added Files:
	gimp-plugin-mgr.in 
Log Message:
revamp scheme for integrating external plugins (#202545)



--- NEW FILE gimp-plugin-mgr.in ---
#!/bin/bash

shopt -s nullglob

GIMPTOOL="@GIMPTOOL@"
GIMPPLUGINDIR="`"$GIMPTOOL" --gimpplugindir`"
EXITVAL=0

showhelp () {
	cat << EOF
Usage: gimp-plugin-mgr <mode> [<pluginname> [<pluginname> [...]]
Mode can be:
--install|-i:	install plugin(s)
--uninstall|-u:	uninstall plugin(s)
--help|-h:	show this message
EOF
}

install_uninstall () {
    local action="$1"
    shift
    local plugins="$@"
    pushd "$GIMPPLUGINDIR/plug-ins" >&/dev/null
    if [ "$plugins" == "*" ]; then
        pushd "/etc/gimp/plugins.d" >&/dev/null
        shopt -u nullglob
        plugins=""
        for file in *; do
            plugins="$plugins ${file%.conf}"
        done
        shopt -s nullglob
        popd >&/dev/null
    fi

	for plugin in $plugins; do
        PLUGINFILE=
        if [ ! -r "/etc/gimp/plugins.d/${plugin}.conf" ]; then
            echo "gimp-plugin-mgr: can't read /etc/gimp/plugins.d/${plugin}.conf" >&2
            EXITVAL=$(( $EXITVAL + 1 ))
            continue
        fi
        . "/etc/gimp/plugins.d/${plugin}.conf"
        case "$action" in
        install)
            if [ ! "$PLUGINFILE" ]; then
                echo "gimp-plugin-mgr: PLUGINFILE not defined for $plugin" >&2
                EXITVAL=$(( $EXITVAL + 1 ))
                continue
            fi
            ln -snf "$PLUGINFILE" "$GIMPPLUGINDIR/plug-ins/$plugin"
            ;;
        uninstall)
            if [ ! -L "$GIMPPLUGINDIR/plug-ins/$plugin" ]; then
                echo "gimp-plugin-mgr: $GIMPPLUGINDIR/plug-ins/$plugin not a symbolic link" >&2
                EXITVAL=$(( $EXITVAL + 1 ))
                continue
            fi
            rm -f "$plugin"
            ;;
        esac
	done
    popd >&/dev/null
}

case "$1" in
--install|-i)
    shift
	install_uninstall install "$@"
	;;
--uninstall|-u)
    shift
	install_uninstall uninstall "$@"
	;;
*)
	if [ "$1" != "--help" -a "$1" != "-h" ]; then
		EXITVAL=1
	fi
	showhelp
	;;
esac

exit $EXITVAL


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- gimp.spec	2 Aug 2006 14:52:50 -0000	1.106
+++ gimp.spec	16 Aug 2006 11:11:31 -0000	1.107
@@ -36,7 +36,7 @@
 %define age 0
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -71,7 +71,7 @@
 BuildRequires:	automake >= 1.7
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	libtool >= 1.5
-BuildRequires:	perl
+BuildRequires:	sed
 BuildRequires:	libwmf-devel >= 0.2.8
 BuildRequires:  intltool
 BuildRequires:  gettext
@@ -90,6 +90,7 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): hicolor-icon-theme
 Source0: 	ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
+Source1:    gimp-plugin-mgr.in
 Patch0:		gimp-2.0pre3-buildroot.patch
 Patch1:		gimp-2.0.1-gimphelpmissing.patch
 Patch2:		gimp-2.2.3-icontheme.patch
@@ -196,6 +197,9 @@
 
 make %{?_smp_mflags}
 
+# convenience stuff for external plugins (e.g. xsane)
+sed -e 's|@GIMPTOOL@|%{_bindir}/gimptool-%{interfacever}|g' < %{SOURCE1} > gimp-plugin-mgr
+
 %install
 export PATH="$PATH:$PWD/bin"
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -252,24 +256,24 @@
 ln -snf gimptool-%{interfacever}.1 %{buildroot}/%{_mandir}/man1/gimptool.1
 %endif
 
+# convenience stuff for external plugins (e.g. xsane)
+mkdir -p %{buildroot}%{_sysconfdir}/gimp/plugins.d
+mkdir -p %{_sbindir}
+install -m 0755 gimp-plugin-mgr %{_sbindir}/gimp-plugin-mgr
+
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %post
 /usr/bin/update-desktop-database %{_datadir}/applications
-if [ -x %{_sbindir}/xsane-install-gimp-plugin ]; then
-    %{_sbindir}/xsane-install-gimp-plugin --install %{interfacever}
-fi
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+%{_sbindir}/gimp-plugin-mgr --install '*'
 
 %preun
-# Do this always, because interfacever could be different
-if [ -x %{_sbindir}/xsane-install-gimp-plugin ]; then
-    %{_sbindir}/xsane-install-gimp-plugin --uninstall %{interfacever}
-fi
+%{_sbindir}/gimp-plugin-mgr --uninstall '*'
 
 %postun
 if [ "$1" = "0" ]; then
@@ -321,6 +325,7 @@
 %{_datadir}/gimp/%{interfacever}/themes/
 
 %dir %{_sysconfdir}/gimp
+%dir %{_sysconfdir}/gimp/plugins.d
 %dir %{_sysconfdir}/gimp/%{interfacever}
 %config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/controllerrc
 %config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gimprc
@@ -337,6 +342,7 @@
 %{_bindir}/gimp-%{binver}
 %{_bindir}/gimp-remote-%{binver}
 %{_bindir}/gimptool-%{interfacever}
+%{_sbindir}/gimp-plugin-mgr
 #%{_bindir}/embedxpm
 #%{_bindir}/escputil-%{interfacever}
 
@@ -396,6 +402,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Aug 16 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-4
+- revamp scheme for integrating external plugins (#202545)
+
 * Wed Aug 02 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-3
 - allow spaces in filenames when saving (#200888, patch by Michael Natterer)
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 11:12:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 07:12:28 -0400
Subject: rpms/xsane/devel xsane.conf.in, NONE, 1.1 xsane.spec, 1.36,
	1.37 xsane-install-gimp-plugin, 1.1, NONE
Message-ID: <200608161112.k7GBCSXo028983@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	xsane.spec 
Added Files:
	xsane.conf.in 
Removed Files:
	xsane-install-gimp-plugin 
Log Message:
revamp scheme for integrating external GIMP plugins (#202545)
use disttag



--- NEW FILE xsane.conf.in ---
PLUGINFILE=@BINDIR@/xsane-gimp


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xsane.spec	12 Jul 2006 09:23:56 -0000	1.36
+++ xsane.spec	16 Aug 2006 11:12:26 -0000	1.37
@@ -3,10 +3,10 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
-Release: 5.1
+Release: 6%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
-Source1: xsane-install-gimp-plugin
-Source2: xsane.desktop
+Source1: xsane.desktop
+Source2: xsane.conf.in
 Patch0: xsane-0.90-htmlview.patch
 Patch1: xsane-0.99-medium-definitions.patch
 Patch2: xsane-0.92_gimp2.0.patch
@@ -21,6 +21,7 @@
 BuildRequires: gettext-devel
 BuildRequires: automake
 BuildRequires: autoconf
+BuildRequires: sed
 ExcludeArch: s390 s390x
 
 %description
@@ -32,7 +33,8 @@
 %package gimp
 Summary: A GIMP plug-in which provides the SANE scanner interface.
 Group: Applications/Multimedia
-Prereq: /usr/bin/awk sh-utils fileutils
+Requires(post): gimp >= 2:2.2.12-4
+Requires(preun): gimp >= 2:2.2.12-4
 
 %description gimp
 This package provides the regular XSane frontend for the SANE scanner
@@ -56,6 +58,8 @@
 
 mv src/xsane src/xsane-gimp
 
+sed -e 's|@BINDIR@|%{_bindir}|g' < "%{SOURCE2} > xsane.conf
+
 make clean
 %configure --with-install-root=%{buildroot} --disable-gimp
 make LDFLAGS=
@@ -66,9 +70,6 @@
 
 install src/xsane-gimp %{buildroot}%{_bindir}
 
-mkdir -p %{buildroot}%{_sbindir}
-install -m 0755 %SOURCE1 %{buildroot}%{_sbindir}/xsane-install-gimp-plugin
-
 mkdir %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor %{desktop_vendor}         \
     --dir %{buildroot}%{_datadir}/applications          \
@@ -76,10 +77,12 @@
     --add-category X-Fedora                             \
     --add-category Graphics                             \
     --add-category Application                          \
-    %{SOURCE2}
+    %{SOURCE1}
 
 %find_lang %{name} XSANE.lang
 
+mkdir -p %{buildroot}%{_sysconfdir}/gimp/plugins.d
+install -m 0644 xsane.conf %{buildroot}%{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %clean
 rm -rf %{buildroot}
@@ -96,22 +99,26 @@
 %files gimp
 %defattr(-,root,root)
 %{_bindir}/xsane-gimp
-%{_sbindir}/xsane-install-gimp-plugin
 %dir %{_datadir}/sane
 %dir %{_datadir}/sane/xsane
 %{_datadir}/sane/xsane/*eula*
+%{_sysconfdir}/gimp
+%{_sysconfdir}/gimp/plugins.d
+%config %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %post gimp
-%{_sbindir}/xsane-install-gimp-plugin --install
-exit 0
+%{_sbindir}/gimp-plugin-mgr --install xsane
 
 %preun gimp
 if [ $1 = 0 ]; then
-        %{_sbindir}/xsane-install-gimp-plugin --uninstall
+        %{_sbindir}/gimp-plugin-mgr --uninstall xsane
 fi
-exit 0
 
 %changelog
+* Wed Aug 16 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-6
+- revamp scheme for integrating external GIMP plugins (#202545)
+- use disttag
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.99-5.1
 - rebuild
 


--- xsane-install-gimp-plugin DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 16 11:24:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 07:24:07 -0400
Subject: rpms/xsane/devel xsane.spec,1.37,1.38
Message-ID: <200608161124.k7GBO7Zp015752@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	xsane.spec 
Log Message:
add missing quote



Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xsane.spec	16 Aug 2006 11:12:26 -0000	1.37
+++ xsane.spec	16 Aug 2006 11:24:05 -0000	1.38
@@ -58,7 +58,7 @@
 
 mv src/xsane src/xsane-gimp
 
-sed -e 's|@BINDIR@|%{_bindir}|g' < "%{SOURCE2} > xsane.conf
+sed -e 's|@BINDIR@|%{_bindir}|g' < "%{SOURCE2}" > xsane.conf
 
 make clean
 %configure --with-install-root=%{buildroot} --disable-gimp



From fedora-cvs-commits at redhat.com  Wed Aug 16 11:25:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 07:25:45 -0400
Subject: rpms/gimp/devel gimp.spec,1.107,1.108
Message-ID: <200608161125.k7GBPjJS016390@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16269

Modified Files:
	gimp.spec 
Log Message:
add missing %{buildroot} tags



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- gimp.spec	16 Aug 2006 11:11:31 -0000	1.107
+++ gimp.spec	16 Aug 2006 11:25:42 -0000	1.108
@@ -258,8 +258,8 @@
 
 # convenience stuff for external plugins (e.g. xsane)
 mkdir -p %{buildroot}%{_sysconfdir}/gimp/plugins.d
-mkdir -p %{_sbindir}
-install -m 0755 gimp-plugin-mgr %{_sbindir}/gimp-plugin-mgr
+mkdir -p %{buildroot}%{_sbindir}
+install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Wed Aug 16 12:11:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 08:11:18 -0400
Subject: rpms/udev/devel udev-095-selinux.patch, NONE, 1.1 udev.spec, 1.181,
	1.182
Message-ID: <200608161211.k7GCBIsb011811@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11752

Modified Files:
	udev.spec 
Added Files:
	udev-095-selinux.patch 
Log Message:
- new speedup patch for selinux (bug #202673)

udev-095-selinux.patch:
 udev.c      |    2 ++
 udev_node.c |    2 --
 udevd.c     |    2 ++
 udevstart.c |    2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE udev-095-selinux.patch ---
--- udev-095/udevstart.c.selinux	2006-07-04 12:34:55.000000000 +0200
+++ udev-095/udevstart.c	2006-08-16 13:59:52.000000000 +0200
@@ -40,6 +40,7 @@
 
 #include "udev.h"
 #include "udev_rules.h"
+#include "udev_selinux.h"
 
 static const char *udev_run_str;
 static const char *udev_log_str;
@@ -339,6 +340,7 @@
 
 	logging_init("udevstart");
 	udev_config_init();
+	selinux_init();
 	dbg("version %s", UDEV_VERSION);
 
 	udev_run_str = getenv("UDEV_RUN");
--- udev-095/udevd.c.selinux	2006-07-04 12:34:55.000000000 +0200
+++ udev-095/udevd.c	2006-08-16 13:59:28.000000000 +0200
@@ -45,6 +45,7 @@
 #include "udev.h"
 #include "udev_rules.h"
 #include "udevd.h"
+#include "udev_selinux.h"
 
 static struct udev_rules rules;
 static int udevd_sock;
@@ -868,6 +869,7 @@
 		err("fatal, could not open /dev/null: %s", strerror(errno));
 
 	udev_config_init();
+	selinux_init();
 	dbg("version %s", UDEV_VERSION);
 
 	if (getuid() != 0) {
--- udev-095/udev_node.c.selinux	2006-07-04 12:34:55.000000000 +0200
+++ udev-095/udev_node.c	2006-08-16 13:59:13.000000000 +0200
@@ -130,8 +129,6 @@
 	int i;
 	int retval = 0;
 
-	selinux_init();
-
 	snprintf(filename, sizeof(filename), "%s/%s", udev_root, udev->name);
 	filename[sizeof(filename)-1] = '\0';
 
--- udev-095/udev.c.selinux	2006-07-04 12:34:55.000000000 +0200
+++ udev-095/udev.c	2006-08-16 13:59:19.000000000 +0200
@@ -32,6 +32,7 @@
 
 #include "udev.h"
 #include "udev_rules.h"
+#include "udev_selinux.h"
 
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
@@ -93,6 +94,7 @@
 	if (devnull < 0)
 		err("fatal, could not open /dev/null: %s", strerror(errno));
 	udev_config_init();
+	selinux_init();
 	dbg("version %s", UDEV_VERSION);
 
 	/* set signal handlers */


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- udev.spec	10 Aug 2006 12:09:21 -0000	1.181
+++ udev.spec	16 Aug 2006 12:10:56 -0000	1.182
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -24,6 +24,7 @@
 Patch8: udev-089-last_modalias.patch
 Patch9: udev-091-lib64.patch
 Patch10: udev-095-longcomment.patch
+Patch11: udev-095-selinux.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -69,6 +70,7 @@
 %patch8 -p1 -b .last_modalias
 %patch9 -p1 -b .lib64
 %patch10 -p1 -b .longcomment
+%patch11 -p1 -b .selinux
 
 %build
 
@@ -327,6 +329,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Wed Aug 16 2006 Harald Hoyer <harald at redhat.com> - 095-6
+- new speedup patch for selinux (bug #202673)
+
 * Thu Aug 10 2006 Harald Hoyer <harald at redhat.com> - 095-5
 - allow long comments (bug #200244)
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 12:44:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 08:44:07 -0400
Subject: rpms/vim/devel 7.0.051,NONE,1.1
Message-ID: <200608161244.k7GCi7dJ003238@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	7.0.051 
Log Message:
- Patchlevel 51


--- NEW FILE 7.0.051 ---
To: vim-dev at vim.org
Subject: Patch 7.0.051
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.051 (after 7.0.44)
Problem:    The Perl interface doesn't compile or doesn't work properly.
Solution:   Remove the spaces before #ifdef and avoid an empty line above it.
Files:	    src/if_perl.xs


*** ../vim-7.0.050/src/if_perl.xs	Tue Aug  8 16:47:38 2006
--- src/if_perl.xs	Fri Aug 11 22:51:01 2006
***************
*** 1068,1098 ****
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
!     #ifdef FEAT_AUTOCMD
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
!     #else
  		buf_T	*save_curbuf = curbuf;
  
  		curbuf = vimbuf;
  		curwin->w_buffer = vimbuf;
!     #endif
  		if (u_savesub(lnum) == OK)
  		{
  		    ml_replace(lnum, (char_u *)line, TRUE);
  		    changed_bytes(lnum, 0);
  		}
! 
!     #ifdef FEAT_AUTOCMD
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
!     #else
  		curwin->w_buffer = save_curbuf;
  		curbuf = save_curbuf;
!     #endif
  	    }
  	}
      }
--- 1068,1097 ----
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
! #ifdef FEAT_AUTOCMD
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
! #else
  		buf_T	*save_curbuf = curbuf;
  
  		curbuf = vimbuf;
  		curwin->w_buffer = vimbuf;
! #endif
  		if (u_savesub(lnum) == OK)
  		{
  		    ml_replace(lnum, (char_u *)line, TRUE);
  		    changed_bytes(lnum, 0);
  		}
! #ifdef FEAT_AUTOCMD
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
! #else
  		curwin->w_buffer = save_curbuf;
  		curbuf = save_curbuf;
! #endif
  	    }
  	}
      }
***************
*** 1130,1144 ****
  		if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
  		{
  		    buf_T	*save_curbuf = curbuf;
!     #ifdef FEAT_AUTOCMD
  		    aco_save_T	aco;
  
  		    /* set curwin/curbuf for "vimbuf" and save some things */
  		    aucmd_prepbuf(&aco, vimbuf);
!     #else
  		    curbuf = vimbuf;
  		    curwin->w_buffer = vimbuf;
!     #endif
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
--- 1129,1143 ----
  		if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
  		{
  		    buf_T	*save_curbuf = curbuf;
! #ifdef FEAT_AUTOCMD
  		    aco_save_T	aco;
  
  		    /* set curwin/curbuf for "vimbuf" and save some things */
  		    aucmd_prepbuf(&aco, vimbuf);
! #else
  		    curbuf = vimbuf;
  		    curwin->w_buffer = vimbuf;
! #endif
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
***************
*** 1146,1159 ****
  			if (save_curbuf == curbuf)
  			    check_cursor();
  		    }
!     #ifdef FEAT_AUTOCMD
  		    /* restore curwin/curbuf and a few other things */
  		    aucmd_restbuf(&aco);
  		    /* Careful: autocommands may have made "vimbuf" invalid! */
!     #else
  		    curwin->w_buffer = save_curbuf;
  		    curbuf = save_curbuf;
!     #endif
  		    update_curbuf(VALID);
  		}
  	    }
--- 1145,1158 ----
  			if (save_curbuf == curbuf)
  			    check_cursor();
  		    }
! #ifdef FEAT_AUTOCMD
  		    /* restore curwin/curbuf and a few other things */
  		    aucmd_restbuf(&aco);
  		    /* Careful: autocommands may have made "vimbuf" invalid! */
! #else
  		    curwin->w_buffer = save_curbuf;
  		    curbuf = save_curbuf;
! #endif
  		    update_curbuf(VALID);
  		}
  	    }
***************
*** 1180,1210 ****
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
!     #ifdef FEAT_AUTOCMD
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
!     #else
  		buf_T	*save_curbuf = curbuf;
  
  		curbuf = vimbuf;
  		curwin->w_buffer = vimbuf;
!     #endif
  		if (u_inssub(lnum + 1) == OK)
  		{
  		    ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
  		    appended_lines_mark(lnum, 1L);
  		}
! 
!     #ifdef FEAT_AUTOCMD
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
!     #else
  		curwin->w_buffer = save_curbuf;
  		curbuf = save_curbuf;
!     #endif
  		update_curbuf(VALID);
  	    }
  	}
--- 1179,1208 ----
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
! #ifdef FEAT_AUTOCMD
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
! #else
  		buf_T	*save_curbuf = curbuf;
  
  		curbuf = vimbuf;
  		curwin->w_buffer = vimbuf;
! #endif
  		if (u_inssub(lnum + 1) == OK)
  		{
  		    ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
  		    appended_lines_mark(lnum, 1L);
  		}
! #ifdef FEAT_AUTOCMD
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
! #else
  		curwin->w_buffer = save_curbuf;
  		curbuf = save_curbuf;
! #endif
  		update_curbuf(VALID);
  	    }
  	}
*** ../vim-7.0.050/src/version.c	Tue Aug  8 21:36:15 2006
--- src/version.c	Fri Aug 11 22:55:25 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     51,
  /**/

-- 
"A clear conscience is usually the sign of a bad memory."
                             -- Steven Wright

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 16 12:44:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 08:44:28 -0400
Subject: rpms/vim/devel 7.0.052,NONE,1.1
Message-ID: <200608161244.k7GCiSLC003305@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	7.0.052 
Log Message:
- Patchlevel 52


--- NEW FILE 7.0.052 ---
To: vim-dev at vim.org
Subject: Patch 7.0.052
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.052
Problem:    The user may not be aware that the Vim server allows others more
	    functionality than desired.
Solution:   When running Vim as root don't become a Vim server without an
	    explicit --servername argument.
Files:	    src/main.c


*** ../vim-7.0.051/src/main.c	Mon Jun 19 10:56:20 2006
--- src/main.c	Tue Aug  8 11:02:44 2006
***************
*** 3212,3221 ****
       * Register for remote command execution with :serversend and --remote
       * unless there was a -X or a --servername '' on the command line.
       * Only register nongui-vim's with an explicit --servername argument.
       */
      if (X_DISPLAY != NULL && parmp->servername != NULL && (
  #  ifdef FEAT_GUI
! 		gui.in_use ||
  #  endif
  		parmp->serverName_arg != NULL))
      {
--- 3212,3226 ----
       * Register for remote command execution with :serversend and --remote
       * unless there was a -X or a --servername '' on the command line.
       * Only register nongui-vim's with an explicit --servername argument.
+      * When running as root --servername is also required.
       */
      if (X_DISPLAY != NULL && parmp->servername != NULL && (
  #  ifdef FEAT_GUI
! 		(gui.in_use
! #   ifdef UNIX
! 		 && getuid() != 0
! #   endif
! 		) ||
  #  endif
  		parmp->serverName_arg != NULL))
      {
*** ../vim-7.0.051/src/version.c	Fri Aug 11 22:56:44 2006
--- src/version.c	Tue Aug 15 21:41:24 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     52,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
148. You find it easier to dial-up the National Weather Service
     Weather/your_town/now.html than to simply look out the window.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 16 12:44:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 08:44:39 -0400
Subject: rpms/vim/devel 7.0.053,NONE,1.1
Message-ID: <200608161244.k7GCidrR003383@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	7.0.053 
Log Message:
- Patchlevel 53


--- NEW FILE 7.0.053 ---
To: vim-dev at vim.org
Subject: Patch 7.0.053
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.053
Problem:    Shortening a directory name may fail when there are multi-byte
	    characters.
Solution:   Copy the correct bytes. (Titov Anatoly)
Files:	    src/misc1.c


*** ../vim-7.0.052/src/misc1.c	Sun Apr 30 20:49:14 2006
--- src/misc1.c	Tue Aug  8 11:23:45 2006
***************
*** 4492,4498 ****
  		int l = mb_ptr2len(s);
  
  		while (--l > 0)
! 		    *d++ = *s++;
  	    }
  # endif
  	}
--- 4492,4498 ----
  		int l = mb_ptr2len(s);
  
  		while (--l > 0)
! 		    *d++ = *++s;
  	    }
  # endif
  	}
*** ../vim-7.0.052/src/version.c	Tue Aug 15 21:42:18 2006
--- src/version.c	Tue Aug 15 22:23:44 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     53,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
150. You find yourself counting emoticons to get to sleep.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 16 12:45:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 08:45:17 -0400
Subject: rpms/vim/devel README.patches,1.53,1.54 vim.spec,1.131,1.132
Message-ID: <200608161245.k7GCjHA1003488@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	README.patches vim.spec 
Log Message:
- patchlevel 53


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- README.patches	9 Aug 2006 12:30:46 -0000	1.53
+++ README.patches	16 Aug 2006 12:45:14 -0000	1.54
@@ -75,3 +75,6 @@
   2173  7.0.048  the gzip plugin can't handle file names that have a paren
   2221  7.0.049  some Tcl scripts are not recognized
   1437  7.0.050  can't properly close a buffer through the NetBeans interface
+  6097  7.0.051  (after 7.0.44) compile and/or run problem with Perl interface
+  2237  7.0.052  the Vim server may expose more functionality than expected
+  1379  7.0.053  shortening multi-byte directory name may fail


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- vim.spec	9 Aug 2006 12:30:46 -0000	1.131
+++ vim.spec	16 Aug 2006 12:45:14 -0000	1.132
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 050
+%define patchlevel 053
 
 Summary: The VIM editor.
 Name: vim
@@ -95,6 +95,9 @@
 Patch048: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.048
 Patch049: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.049
 Patch050: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.050
+Patch051: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.051
+Patch052: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.052
+Patch053: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.053
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -188,7 +191,7 @@
 Summary: The VIM version of the vi editor for the X Window System.
 Group: Applications/Editors
 Requires: vim-common = %{epoch}:%{version}-%{release} libattr
-BuildRequires: gtk2-devel libSM-devel libXt-devel
+BuildRequires: gtk2-devel libSM-devel libXt-devel libXpm-devel
 Prereq: gtk2 >= 2.6
 Obsoletes: vim7-X11
 
@@ -275,6 +278,9 @@
 %patch048 -p0
 %patch049 -p0
 %patch050 -p0
+%patch051 -p0
+%patch052 -p0
+%patch053 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -598,6 +604,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Aug 09 2006 Karsten Hopp <karsten at redhat.de> 7.0.053-1
+- Patchlevel 53
+- Buildrequires libXpm-devel
+
 * Wed Aug 09 2006 Karsten Hopp <karsten at redhat.de> 7.0.050-1
 - Patchlevel 50
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 13:15:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 09:15:42 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-infer-virtual.patch, 1.1, 1.2
Message-ID: <200608161315.k7GDFgkA026920@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server-1.1.1-infer-virtual.patch 
Log Message:
It helps to also fill in the framebuffer pitch when inferring the virtual.


xorg-x11-server-1.1.1-infer-virtual.patch:
 common/xf86Mode.c |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/xf86str.h  |    2 +
 ddc/ddcProperty.c |   16 ++++++++++-----
 3 files changed, 70 insertions(+), 5 deletions(-)

Index: xorg-x11-server-1.1.1-infer-virtual.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-infer-virtual.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.1-infer-virtual.patch	15 Aug 2006 20:13:06 -0000	1.1
+++ xorg-x11-server-1.1.1-infer-virtual.patch	16 Aug 2006 13:15:37 -0000	1.2
@@ -1,18 +1,5 @@
---- xorg-server-1.1.1/hw/xfree86/common/xf86str.h.infer-virtual	2006-08-11 17:16:12.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-11 17:16:12.000000000 -0400
-@@ -125,8 +125,10 @@
- # define M_T_CRTC_C  (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC  */
- # define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)
-                                /* built-in mode - configure CRTC and clock */
-+# define M_T_PREFERRED 0x08
- # define M_T_DEFAULT 0x10	/* (VESA) default modes */
- # define M_T_USERDEF 0x20	/* One of the modes from the config file */
-+# define M_T_DRIVER 0x40
- 
- /* Video mode */
- typedef struct _DisplayModeRec {
---- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.infer-virtual	2006-08-11 17:16:12.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-11 17:24:47.000000000 -0400
+--- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.infer-virtual	2006-08-15 16:24:23.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-15 18:30:27.000000000 -0400
 @@ -47,6 +47,7 @@
  #include "globals.h"
  #include "xf86.h"
@@ -78,18 +65,34 @@
  /*
   * xf86ValidateModes
   *
-@@ -1426,6 +1477,9 @@
+@@ -1426,6 +1477,12 @@
  	virtX = virtualX;
  	virtY = virtualY;
  	scrp->virtualFrom = X_CONFIG;
 +    } else if (!modeNames || !*modeNames) {
 +	/* No virtual size given in the config, try to infer */
-+	inferVirtualSize(scrp, availModes, &virtualX, &virtualY);
++	/* XXX this doesn't take m{in,ax}Pitch into account; oh well */
++	inferVirtualSize(scrp, availModes, &virtX, &virtY);
++	linePitch = miScanLineWidth(virtX, virtY, minPitch, apertureSize,
++				    BankFormat, pitchInc);
      }
  
      /* Print clock ranges and scaled clocks */
---- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.infer-virtual	2006-08-11 17:16:12.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-11 17:16:12.000000000 -0400
+--- xorg-server-1.1.1/hw/xfree86/common/xf86str.h.infer-virtual	2006-08-15 16:24:23.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-15 16:24:23.000000000 -0400
+@@ -125,8 +125,10 @@
+ # define M_T_CRTC_C  (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC  */
+ # define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)
+                                /* built-in mode - configure CRTC and clock */
++# define M_T_PREFERRED 0x08
+ # define M_T_DEFAULT 0x10	/* (VESA) default modes */
+ # define M_T_USERDEF 0x20	/* One of the modes from the config file */
++# define M_T_DRIVER 0x40
+ 
+ /* Video mode */
+ typedef struct _DisplayModeRec {
+--- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.infer-virtual	2006-08-15 16:24:23.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-15 16:24:23.000000000 -0400
 @@ -127,9 +127,8 @@
  /*
   * TODO:



From fedora-cvs-commits at redhat.com  Wed Aug 16 13:55:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 09:55:51 -0400
Subject: rpms/udev/FC-5 udev-084-selinux.patch, NONE, 1.1 udev-rules.patch,
	1.11, 1.12 udev.spec, 1.162, 1.163
Message-ID: <200608161355.k7GDtpJX008538@cvs.devel.redhat.com>

Author: harald

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

Modified Files:
	udev-rules.patch udev.spec 
Added Files:
	udev-084-selinux.patch 
Log Message:
- fixed capi20 device node
- minor rule updates
- speedup udev in selinux environments


udev-084-selinux.patch:
 udev.c      |    2 ++
 udev_add.c  |    1 -
 udevd.c     |    2 ++
 udevstart.c |    2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE udev-084-selinux.patch ---
--- udev-084/udevstart.c.selinux	2006-08-16 15:33:07.000000000 +0200
+++ udev-084/udevstart.c	2006-08-16 15:33:07.000000000 +0200
@@ -42,6 +42,7 @@
 
 #include "udev.h"
 #include "udev_rules.h"
+#include "udev_selinux.h"
 
 static const char *udev_log_str;
 
@@ -372,6 +373,7 @@
 
 	logging_init("udevstart");
 	udev_config_init();
+	selinux_init();
 	dbg("version %s", UDEV_VERSION);
 
 	udev_log_str = getenv("UDEV_LOG");
--- udev-084/udev_add.c.selinux	2006-08-16 15:33:44.000000000 +0200
+++ udev-084/udev_add.c	2006-08-16 15:34:08.000000000 +0200
@@ -261,7 +261,6 @@
 	int retval = 0;
 
 	dbg("adding name='%s'", udev->name);
-	selinux_init();
 
 	if (major(udev->devt)) {
 		retval = create_node(udev);
--- udev-084/udevd.c.selinux	2006-01-30 08:51:38.000000000 +0100
+++ udev-084/udevd.c	2006-08-16 15:33:07.000000000 +0200
@@ -45,6 +45,7 @@
 #include "udev.h"
 #include "udev_rules.h"
 #include "udevd.h"
+#include "udev_selinux.h"
 
 static struct udev_rules rules;
 static int udevd_sock;
@@ -825,6 +826,7 @@
 		err("fatal, could not open /dev/null: %s", strerror(errno));
 
 	udev_config_init();
+	selinux_init();
 	dbg("version %s", UDEV_VERSION);
 
 	if (getuid() != 0) {
--- udev-084/udev.c.selinux	2006-01-30 08:51:38.000000000 +0100
+++ udev-084/udev.c	2006-08-16 15:33:10.000000000 +0200
@@ -32,6 +32,7 @@
 
 #include "udev.h"
 #include "udev_rules.h"
+#include "udev_selinux.h"
 
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
@@ -93,6 +94,7 @@
 	if (devnull < 0)
 		err("fatal, could not open /dev/null: %s", strerror(errno));
 	udev_config_init();
+	selinux_init();
 	dbg("version %s", UDEV_VERSION);
 
 	/* set signal handlers */

udev-rules.patch:
 05-udev-early.rules  |   10 ++
 95-pam-console.rules |    1 
 hotplug.rules        |   13 ++-
 udev.rules           |  186 ++++++++++++++++++++++++++++-----------------------
 4 files changed, 125 insertions(+), 85 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-5/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	16 Aug 2006 13:55:48 -0000	1.12
@@ -1,5 +1,5 @@
 --- udev-084/etc/udev/redhat/hotplug.rules.rhrules	2006-01-30 08:51:38.000000000 +0100
-+++ udev-084/etc/udev/redhat/hotplug.rules	2006-03-06 13:55:18.000000000 +0100
++++ udev-084/etc/udev/redhat/hotplug.rules	2006-08-16 15:37:12.000000000 +0200
 @@ -1,8 +1,15 @@
  # do not call hotplug.d and dev.d for "drivers" and "module" events
 -SUBSYSTEM=="drivers",	OPTIONS="last_rule"
@@ -19,16 +19,17 @@
  
 +
 +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
+--- /dev/null	2006-08-01 07:37:02.000357750 +0200
++++ udev-084/etc/udev/redhat/95-pam-console.rules	2006-08-16 15:37:12.000000000 +0200
 @@ -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 @@
+--- /dev/null	2006-08-01 07:37:02.000357750 +0200
++++ udev-084/etc/udev/redhat/05-udev-early.rules	2006-08-16 15:39:03.000000000 +0200
+@@ -0,0 +1,10 @@
 +# sysfs is populated after the event is sent
 +ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
 +ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
++ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"                    
 +
 +# ignore these events until someone needs them
 +SUBSYSTEM=="drivers",		OPTIONS="ignore_device"
@@ -36,8 +37,8 @@
 +
 +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 @@
++++ udev-084/etc/udev/redhat/udev.rules	2006-08-16 15:46:04.000000000 +0200
+@@ -3,47 +3,55 @@
  #
  # default is OWNER="root" GROUP="root", MODE="0600"
  #
@@ -88,7 +89,8 @@
 +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=="capi",                 NAME="capi20", GROUP="uucp", MODE="0660"
++KERNEL=="capi*",                NAME="capi/%n", GROUP="uucp", 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"
@@ -100,8 +102,10 @@
 +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",			OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
@@ -117,7 +121,7 @@
  
  # memory devices
  KERNEL=="random",		MODE="0666", OPTIONS="last_rule"
-@@ -54,6 +59,8 @@
+@@ -54,6 +62,8 @@
  KERNEL=="full",			MODE="0666", OPTIONS="last_rule"
  KERNEL=="null",			MODE="0666", OPTIONS="last_rule"
  KERNEL=="zero",			MODE="0666", OPTIONS="last_rule"
@@ -126,7 +130,7 @@
  
  # misc devices
  KERNEL=="nvram",		MODE="0660"
-@@ -61,6 +68,10 @@
+@@ -61,6 +71,10 @@
  
  # floppy devices
  KERNEL=="fd[01]*",		GROUP="floppy", MODE="0660"
@@ -137,6 +141,16 @@
  
  # audio devices
  KERNEL=="dsp*",			MODE="0660"
+@@ -79,9 +93,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"
 @@ -131,7 +142,7 @@
  # dri devices
  KERNEL=="nvidia*",		MODE="0660"
@@ -176,7 +190,7 @@
  
  KERNEL=="ram1",			SYMLINK+="ram"
  KERNEL=="video0",		SYMLINK+="video"
-@@ -203,13 +212,12 @@
+@@ -203,16 +212,19 @@
  KERNEL=="device-mapper",	NAME="mapper/control"
  
  # old compat symlinks with enumeration
@@ -193,39 +207,48 @@
 +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=="umad*",               NAME="infiniband/%k", MODE="0660"
++KERNEL=="issm*",               NAME="infiniband/%k", MODE="0660"
++KERNEL=="uverbs*",              NAME="infiniband/%k", MODE="0660"
++KERNEL=="ucm*",                 NAME="infiniband/%k", MODE="0660"
++KERNEL=="rdma_cm",              NAME="infiniband/%k", MODE="0660"
+ 
+-KERNEL=="umad*", 		NAME="infiniband/%k"
+-KERNEL=="issm*", 		NAME="infiniband/%k"
+ 
+ # Section for zaptel device
+ KERNEL=="zapctl",     		NAME="zap/ctl"
+@@ -221,27 +233,30 @@
  KERNEL=="zappseudo",  		NAME="zap/pseudo"
  KERNEL=="zap[0-9]*",  		NAME="zap/%n"
  
 -BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
 +KERNEL=="pktcdvd", NAME="%k/control"
-+
-+
  
 -# 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", \
++	SYSFS{device/media}=="floppy", \
++	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
  
 -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", 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-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", 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=="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="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"
  
@@ -239,7 +262,7 @@
  
  #######################################
  # Persistent block device stuff - begin
-@@ -256,7 +267,8 @@
+@@ -256,7 +271,8 @@
  KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_end"
  
  # never access removable ide devices, the drivers are causing event loops on open()
@@ -249,19 +272,19 @@
  
  # by-id (hardware serial number)
  KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode"
-@@ -297,37 +309,43 @@
+@@ -297,37 +313,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"
  
+-# Perhaps this should just be for all subsystems?
 +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=="*", \


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-5/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	16 Aug 2006 13:55:48 -0000	1.163
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 084
-Release: 13
+Release: 13.fc5.1
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -23,6 +23,7 @@
 Patch4: udev-084-floppy.patch
 Patch5: udev-extras.patch
 Patch6: udev-084-pg.patch
+Patch7: udev-084-selinux.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -48,6 +49,7 @@
 %patch4 -p1 -b .rhfloppy
 %patch5 -p1 -b .rhextras
 %patch6 -p1 -b .pg
+%patch7 -p1 -b .selinux
 
 %build
 
@@ -285,6 +287,11 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Wed Aug 16 2006 Harald Hoyer <harald at redhat.com> - 084-13.fc5.1
+- fixed capi20 device node
+- minor rule updates
+- speedup udev in selinux environments
+
 * Wed Mar 08 2006 Harald Hoyer <harald at redhat.com> - 084-13
 - fixed pam_console rules (#182600)
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 14:36:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 10:36:25 -0400
Subject: rpms/libbonobo/FC-5 libbonobo-2.14.0-bas-forking-bugs.patch, NONE,
	1.1 libbonobo.spec, 1.38, 1.39
Message-ID: <200608161436.k7GEaOuf009631@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	libbonobo.spec 
Added Files:
	libbonobo-2.14.0-bas-forking-bugs.patch 
Log Message:
* Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> 2.14.0-2
- Backport patches form Michael Meeks and Alex Larsson for
  bugs in bonobo-activation-server's forking functions
  (may fix 202335, 189610).


libbonobo-2.14.0-bas-forking-bugs.patch:
 bonobo-activation-fork-server.c |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

--- NEW FILE libbonobo-2.14.0-bas-forking-bugs.patch ---
--- libbonobo-2.14.0/bonobo-activation/bonobo-activation-fork-server.c.bas-forking-bugs	2006-03-14 09:28:07.000000000 -0500
+++ libbonobo-2.14.0/bonobo-activation/bonobo-activation-fork-server.c	2006-08-16 10:34:33.000000000 -0400
@@ -206,6 +206,18 @@ handle_exepipe (GIOChannel * source,
 	return retval;
 }
 
+static void
+child_setup (gpointer user_data)
+{
+#ifndef G_OS_WIN32
+        int pipe_fd = GPOINTER_TO_INT (user_data);
+
+        /* unset close on exec */
+        fcntl (pipe_fd, F_SETFD, 0);
+#endif
+}
+
+
 CORBA_Object
 bonobo_activation_server_by_forking (
 	const char                         **cmd_const,
@@ -338,10 +350,14 @@ bonobo_activation_server_by_forking (
 
 	/* Spawn */
         if (!g_spawn_async (NULL, (gchar **) cmd, newenv,
+#ifdef G_OS_WIN32
+                            /* win32 g_spawn doesn't handle child_setup, so
+                               leave all fds open */
                             G_SPAWN_LEAVE_DESCRIPTORS_OPEN |
+#endif
                             G_SPAWN_SEARCH_PATH |
                             G_SPAWN_CHILD_INHERITS_STDIN,
-                            NULL, NULL,
+                            child_setup, GINT_TO_POINTER (iopipes[1]),
                             NULL,
                             &error)) {
                 Bonobo_GeneralError *errval;
@@ -361,30 +377,28 @@ bonobo_activation_server_by_forking (
 
                 running_activations = g_slist_remove (running_activations, &ai);
 
+		close (iopipes[1]);
+
                 g_source_destroy (source);
                 g_source_unref (source);
                 
+		g_io_channel_shutdown (ai.ioc, FALSE, NULL);
                 g_io_channel_unref (ai.ioc);
                 
                 if (use_new_loop)
                         g_main_context_unref (context);
 
+                g_strfreev (newenv);
                 g_strfreev (cmd);
 
+		close (iopipes[0]);
+
 		return CORBA_OBJECT_NIL;
 	}
 
         close (iopipes[1]);
 
-        if (newenv) {
-                char **ep = newenv;
-
-                while (*ep) {
-                        g_free (*ep);
-                        ep++;
-                }
-                g_free (newenv);
-        }
+	g_strfreev (newenv);
         g_strfreev (cmd);
 
         /* Get the IOR from the pipe */


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/FC-5/libbonobo.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libbonobo.spec	14 Mar 2006 20:09:58 -0000	1.38
+++ libbonobo.spec	16 Aug 2006 14:36:21 -0000	1.39
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.14.0
-Release: 1
+Release: 2
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -23,6 +23,7 @@
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-2.13.1-multishlib.patch
+Patch1: libbonobo-2.14.0-bas-forking-bugs.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -52,6 +53,8 @@
 %patch0 -p1 -b .multishlib
 %endif
 
+%patch1 -p1 -b .bas-forking-bugs
+
 %build
 intltoolize -f
 aclocal
@@ -116,6 +119,11 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> 2.14.0-2
+- Backport patches form Michael Meeks and Alex Larsson for
+  bugs in bonobo-activation-server's forking functions
+  (may fix 202335, 189610).
+
 * Tue Mar 14 2006 Ray Strode <rstrode at redhat.com> 2.14.0-1
 - Update to 2.14.0
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 14:40:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 10:40:09 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec, 1.101, 1.102 nfslock.init, 1.13,
	1.14
Message-ID: <200608161440.k7GEe9FN010519@cvs.devel.redhat.com>

Author: steved

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

Modified Files:
	nfs-utils.spec nfslock.init 
Log Message:
- Allow variable for HA callout program in /etc/init.d/nfslock
  (bz 201897)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- nfs-utils.spec	3 Aug 2006 01:29:53 -0000	1.101
+++ nfs-utils.spec	16 Aug 2006 14:39:56 -0000	1.102
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -249,6 +249,10 @@
 %endif
 
 %changelog
+* Wed Aug 16 2006 <SteveD at RedHat.com> 1.0.9-2
+- Allow variable for HA callout program in /etc/init.d/nfslock
+  (bz 201897)
+
 * Wed Aug 02 2006 <wtogami at redhatcom> 1.0.9-3
 - add epoch (#196359)
 


Index: nfslock.init
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfslock.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nfslock.init	30 Jun 2006 14:17:52 -0000	1.13
+++ nfslock.init	16 Aug 2006 14:39:56 -0000	1.14
@@ -74,6 +74,9 @@
 	[ -n "$STATD_PORT" ] && STATDARG="$STATDARG -p $STATD_PORT"
 	[ -n "$STATD_OUTGOING_PORT" ] \
 		&& STATDARG="$STATDARG -o $STATD_OUTGOING_PORT"
+	# See if we have an HA-callout program specified
+	[ -n "$STATD_HA_CALLOUT" ] \
+		&& STATDARG="$STATDARG -H $STATD_HA_CALLOUT"
 	daemon rpc.statd "$STATDARG"
 	RETVAL=$?
 	echo



From fedora-cvs-commits at redhat.com  Wed Aug 16 14:41:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 10:41:32 -0400
Subject: rpms/libbonobo/FC-5 libbonobo.spec,1.39,1.40
Message-ID: <200608161441.k7GEfWfH010907@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	libbonobo.spec 
Log Message:
change version to not conflict



Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/FC-5/libbonobo.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libbonobo.spec	16 Aug 2006 14:36:21 -0000	1.39
+++ libbonobo.spec	16 Aug 2006 14:41:29 -0000	1.40
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.14.0
-Release: 2
+Release: 1.fc5.1
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -119,7 +119,7 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
-* Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> 2.14.0-2
+* Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> 2.14.0-1.fc5.1
 - Backport patches form Michael Meeks and Alex Larsson for
   bugs in bonobo-activation-server's forking functions
   (may fix 202335, 189610).



From fedora-cvs-commits at redhat.com  Wed Aug 16 14:44:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 10:44:59 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.102,1.103
Message-ID: <200608161444.k7GEiwW3011523@cvs.devel.redhat.com>

Author: steved

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

Modified Files:
	nfs-utils.spec 
Log Message:
updated bz number in changelog



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- nfs-utils.spec	16 Aug 2006 14:39:56 -0000	1.102
+++ nfs-utils.spec	16 Aug 2006 14:44:55 -0000	1.103
@@ -251,7 +251,7 @@
 %changelog
 * Wed Aug 16 2006 <SteveD at RedHat.com> 1.0.9-2
 - Allow variable for HA callout program in /etc/init.d/nfslock
-  (bz 201897)
+  (bz 202790)
 
 * Wed Aug 02 2006 <wtogami at redhatcom> 1.0.9-3
 - add epoch (#196359)



From fedora-cvs-commits at redhat.com  Wed Aug 16 15:15:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 11:15:50 -0400
Subject: rpms/udev/FC-5 start_udev,1.51,1.52 udev.spec,1.163,1.164
Message-ID: <200608161515.k7GFFoBw001887@cvs.devel.redhat.com>

Author: harald

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

Modified Files:
	start_udev udev.spec 
Log Message:
- added udevtimeout=<timeout in seconds> and udevdebug
  kernel command line parameters for start_udev



Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-5/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	16 Aug 2006 15:15:48 -0000	1.52
@@ -109,6 +109,7 @@
 
 
 wait_for_queue() {
+        timeout=$((${1:-0} * 10))
 	loop=20
 	while test ! -d /dev/.udev/queue; do
                 usleep 100000;
@@ -116,10 +117,10 @@
                 loop=$(($loop - 1))
         done
 
-	loop=200
+	loop=$timeout
 	while test -d /dev/.udev/queue; do
 		usleep 100000;
-		if [ "$loop" -le 0 ]; then
+		if [ $timeout -gt 0 -a $loop -le 0 ]; then
 			echo -n "Wait timeout. Will continue in the background."
 			return 1
 		fi
@@ -159,6 +160,27 @@
 	
 	ret=$[$ret + $?]
 }
+
+cmdline=$(cat /proc/cmdline)
+# returns OK if $1 contains $2
+strstr() {
+  [ "${1#*$2*}" = "$1" ] && return 1
+  return 0
+}
+
+getval() {
+    what=$1
+    shift
+    for arg; do 
+	if strstr "$arg" "$what="; then
+	    val=${arg#${what}=*}
+	    echo $val
+	    return 0
+	fi
+    done
+    return 1
+}
+
 make_extra_nodes
 kill_udevd > "$udev_root/null" 2>&1
 if [ -f "/sys/class/tty/console/uevent" ]; then
@@ -166,9 +188,12 @@
 	echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
 	/sbin/udevd -d
 	ret=$[$ret + $?]
+	if strstr "$cmdline" udevdebug; then
+		/sbin/udevcontrol log_priority=debug
+	fi
 	/sbin/udevstart
 	ret=$[$ret + $?]
-	wait_for_queue
+	wait_for_queue $(getval udevtimeout $cmdline)
 	ret=$[$ret + $?]
 else
 	echo -n " kernel too old for this udev version "


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-5/udev.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- udev.spec	16 Aug 2006 13:55:48 -0000	1.163
+++ udev.spec	16 Aug 2006 15:15:48 -0000	1.164
@@ -287,6 +287,10 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Wed Aug 16 2006 Harald Hoyer <harald at redhat.com> - 084-13.fc5.2
+- added udevtimeout=<timeout in seconds> and udevdebug
+  kernel command line parameters for start_udev
+
 * Wed Aug 16 2006 Harald Hoyer <harald at redhat.com> - 084-13.fc5.1
 - fixed capi20 device node
 - minor rule updates



From fedora-cvs-commits at redhat.com  Wed Aug 16 15:16:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 11:16:45 -0400
Subject: rpms/udev/FC-5 udev.spec,1.164,1.165
Message-ID: <200608161516.k7GFGjxW007118@cvs.devel.redhat.com>

Author: harald

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

Modified Files:
	udev.spec 
Log Message:



Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-5/udev.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- udev.spec	16 Aug 2006 15:15:48 -0000	1.164
+++ udev.spec	16 Aug 2006 15:16:42 -0000	1.165
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 084
-Release: 13.fc5.1
+Release: 13.fc5.2
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}



From fedora-cvs-commits at redhat.com  Wed Aug 16 15:17:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 11:17:47 -0400
Subject: rpms/gamin/devel gamin-dont-close-fd.patch, NONE, 1.1 gamin.spec,
	1.46, 1.47
Message-ID: <200608161517.k7GFHlCd016170@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gamin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15520

Modified Files:
	gamin.spec 
Added Files:
	gamin-dont-close-fd.patch 
Log Message:
* Wed Aug 16 2006 Alexander Larsson <alexl at redhat.com> - 0.1.7-2
- Add patch that avoids closing the fd after FAMOpen, fixes some 100% cpu bugs



gamin-dont-close-fd.patch:
 gam_api.c |   36 +++++++++++++++++-------------------
 1 files changed, 17 insertions(+), 19 deletions(-)

--- NEW FILE gamin-dont-close-fd.patch ---
Index: libgamin/gam_api.c
===================================================================
RCS file: /cvs/gnome/gamin/libgamin/gam_api.c,v
retrieving revision 1.39
diff -u -p -r1.39 gam_api.c
--- libgamin/gam_api.c	5 Aug 2005 14:06:49 -0000	1.39
+++ libgamin/gam_api.c	16 Aug 2006 14:59:27 -0000
@@ -744,7 +744,6 @@ retry:
     return(0);
 
 failed:
-    close(fd);
     return (-1);
 }
 
@@ -891,39 +890,38 @@ gamin_try_reconnect(GAMDataPtr conn, int
     /*
      * try to reopen a connection to the server
      */
-    close(fd);
     newfd = gamin_connect_unix_socket(socket_name);
-
     free(socket_name);
     if (newfd < 0) {
         return (-1);
     }
 
-    if (newfd != fd) {
-	/*
-	 * reuse the same descriptor
-	 */
-	ret = dup2(newfd, fd);
-	if (ret < 0) {
-	    gam_error(DEBUG_INFO,
-	              "Failed to reuse descriptor %d on reconnect\n",
-		      fd);
-	    close(newfd);
-	    return (-1);
-	}
-    }
-
     /*
      * seems we managed to rebuild a connection to the server.
      * start the authentication again and resubscribe all existing
      * monitoring commands.
      */
-    ret = gamin_write_credential_byte(fd);
+    ret = gamin_write_credential_byte(newfd);
     if (ret != 0) {
-        close(fd);
+        close(newfd);
         return (-1);
     }
 
+    /*
+     * reuse the same descriptor. We never close the original fd, dup2
+     * atomically overwrites it and closes the original. This way we
+     * never leave the original fd closed, since that can cause trouble
+     * if the app keeps the fd around.
+     */
+    ret = dup2(newfd, fd);
+    close(newfd);
+    if (ret < 0) {
+	gam_error(DEBUG_INFO,
+		  "Failed to reuse descriptor %d on reconnect\n",
+		  fd);
+	return (-1);
+    }
+    
     nb_req = gamin_data_reset(conn, &reqs);
     if (reqs != NULL) {
 	for (i = 0; i < nb_req;i++) {


Index: gamin.spec
===================================================================
RCS file: /cvs/dist/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gamin.spec	12 Jul 2006 05:52:52 -0000	1.46
+++ gamin.spec	16 Aug 2006 15:17:45 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.7
-Release: 1.2.2
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -11,6 +11,8 @@
 Provides: fam
 BuildRequires: glib2-devel python python-devel
 
+Patch1:         gamin-dont-close-fd.patch
+
 %description
 This C library provides an API and ABI compatible file alteration
 monitor mechanism compatible with FAM but not dependent on a system wide
@@ -42,6 +44,8 @@
 %prep
 %setup -q
 
+%patch1 -p0 -b .dont-close-fd
+
 %build
 %configure
 make
@@ -88,6 +92,9 @@
 %doc doc/python.html
 
 %changelog
+* Wed Aug 16 2006 Alexander Larsson <alexl at redhat.com> - 0.1.7-2
+- Add patch that avoids closing the fd after FAMOpen, fixes some 100% cpu bugs
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.1.7-1.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 15:27:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 11:27:57 -0400
Subject: rpms/udev/devel start_udev,1.55,1.56 udev.spec,1.182,1.183
Message-ID: <200608161527.k7GFRvhS021659@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21584

Modified Files:
	start_udev udev.spec 
Log Message:
- added udevtimeout=<timeout in seconds>
  kernel command line parameters for start_udev
  (default is to wait forever)



Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- start_udev	6 Jul 2006 07:18:04 -0000	1.55
+++ start_udev	16 Aug 2006 15:27:55 -0000	1.56
@@ -109,8 +109,13 @@
 
 
 wait_for_queue() {
+        local timeout=${1:-0}
 	local ret=0
-	/sbin/udevsettle --timeout=100
+	if [ $timeout -gt 0 ]; then
+	    /sbin/udevsettle --timeout=$timeout
+        else
+	    /sbin/udevsettle
+	fi
 	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo -n "Wait timeout. Will continue in the background."
@@ -156,6 +161,19 @@
   return 0
 }
 
+getval() {
+    what=$1
+    shift
+    for arg; do 
+	if strstr "$arg" "$what="; then
+	    val=${arg#${what}=*}
+	    echo $val
+	    return 0
+	fi
+    done
+    return 1
+}
+
 make_extra_nodes
 cmdline=$(cat /proc/cmdline)
 kill_udevd > "$udev_root/null" 2>&1
@@ -169,7 +187,7 @@
 	fi
 	/sbin/udevtrigger
 	ret=$[$ret + $?]
-	wait_for_queue
+	wait_for_queue $(getval udevtimeout $cmdline)
 	ret=$[$ret + $?]
 else
 	echo -n " kernel too old for this udev version "


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- udev.spec	16 Aug 2006 12:10:56 -0000	1.182
+++ udev.spec	16 Aug 2006 15:27:55 -0000	1.183
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -329,6 +329,11 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Wed Aug 16 2006 Harald Hoyer <harald at redhat.com> - 095-7
+- added udevtimeout=<timeout in seconds>
+  kernel command line parameters for start_udev 
+  (default is to wait forever)
+
 * Wed Aug 16 2006 Harald Hoyer <harald at redhat.com> - 095-6
 - new speedup patch for selinux (bug #202673)
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 15:51:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 11:51:09 -0400
Subject: rpms/frysk/devel .cvsignore, 1.25, 1.26 frysk.spec, 1.84,
	1.85 sources, 1.25, 1.26
Message-ID: <200608161551.k7GFp9Zr010959@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10860

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
- New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	15 Aug 2006 19:50:03 -0000	1.25
+++ .cvsignore	16 Aug 2006 15:51:07 -0000	1.26
@@ -1 +1 @@
-frysk-0.0.1.2006.08.15.rh1.tar.bz2
+frysk-0.0.1.2006.08.16.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- frysk.spec	15 Aug 2006 19:50:03 -0000	1.84
+++ frysk.spec	16 Aug 2006 15:51:07 -0000	1.85
@@ -1,6 +1,6 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.08.15.rh1
+Version:	0.0.1.2006.08.16.rh1
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
@@ -110,6 +110,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Aug 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.16.rh1-1
+- New upstream version.
+
 * Tue Aug 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.15.rh1-1
 - New upstream version.
 - Require latest java-gnome.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	15 Aug 2006 19:50:03 -0000	1.25
+++ sources	16 Aug 2006 15:51:07 -0000	1.26
@@ -1 +1 @@
-ce87477d82ecac96ac3b3e8b6b4373a4  frysk-0.0.1.2006.08.15.rh1.tar.bz2
+99977243d4a8a2e3d659b3c48b29ec48  frysk-0.0.1.2006.08.16.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 16 16:10:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 12:10:20 -0400
Subject: rpms/xorg-x11-drv-amd/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xorg-x11-drv-amd.spec, 1.7, 1.8
Message-ID: <200608161610.k7GGAKfM015948@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-drv-amd.spec 
Log Message:
auto-import xorg-x11-drv-amd-0.0-1.20060816git.fc6 on branch devel from xorg-x11-drv-amd-0.0-1.20060816git.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Aug 2006 19:24:45 -0000	1.3
+++ .cvsignore	16 Aug 2006 16:10:18 -0000	1.4
@@ -1 +1 @@
-xf86-video-amd-0.0-git20060809.tar.bz2
+xf86-video-amd-0.0-git20060816.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Aug 2006 19:24:45 -0000	1.3
+++ sources	16 Aug 2006 16:10:18 -0000	1.4
@@ -1 +1 @@
-7c50fa68151a5f6f081f99df1b4b3ebf  xf86-video-amd-0.0-git20060809.tar.bz2
+abdfa09937b4b0833e6786e09002aebd  xf86-video-amd-0.0-git20060816.tar.bz2


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-amd.spec	9 Aug 2006 20:48:51 -0000	1.7
+++ xorg-x11-drv-amd.spec	16 Aug 2006 16:10:18 -0000	1.8
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20060809
+%define gitdate 20060816
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   3.%{gitdate}git%{?dist}
+Release:   1.%{gitdate}git%{?dist}
 URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
@@ -70,6 +70,9 @@
 %{_mandir}/man4/amd.4*
 
 %changelog
+* Wed Aug 16 2006 Adam Jackson <ajackson at redhat.com> 0.0-1.20060816git.fc6
+- git update: more Xv fixes.
+
 * Wed Aug  9 2006 Adam Jackson <ajackson at redhat.com> 0.0-3.20060809git.fc6
 - Fix FC5 Requires too.
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 16:16:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 12:16:21 -0400
Subject: rpms/cups/FC-5 cups.spec,1.207,1.208
Message-ID: <200608161616.k7GGGLPg017465@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
* Wed Aug 16 2006 Tim Waugh <twaugh at redhat.com>
- Added a clause in the %post scriptlet to remove bad remote.cache
  files (bug #201800).



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- cups.spec	16 Aug 2006 09:15:41 -0000	1.207
+++ cups.spec	16 Aug 2006 16:16:18 -0000	1.208
@@ -281,6 +281,14 @@
 if [ $1 -eq 1 ]; then
   # First install.  Build ppds.dat.
   /sbin/service cups reload >/dev/null 2>&1 || :
+else
+  # Work around STR #1893.
+  if [ -f /var/lock/subsys/cups ]
+  then
+    /sbin/service cups stop > /dev/null 2>&1
+    /bin/rm -f /var/cache/cups/remote.cache
+    /sbin/service cups start > /dev/null 2>&1
+  fi
 fi
 exit 0
 
@@ -406,6 +414,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Aug 16 2006 Tim Waugh <twaugh at redhat.com>
+- Added a clause in the %%post scriptlet to remove bad remote.cache
+  files (bug #201800).
+
 * Wed Aug 16 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.7
 - Use upstream patch to fix STR #1881.
 - Remove 'Provides: LPRng = 3.8.15-3' (bug #148757).



From fedora-cvs-commits at redhat.com  Wed Aug 16 16:57:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 12:57:09 -0400
Subject: rpms/postgresql-jdbc/devel postgresql-jdbc.spec,1.5,1.6
Message-ID: <200608161657.k7GGv9fA003477@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/postgresql-jdbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3461

Modified Files:
	postgresql-jdbc.spec 
Log Message:
Merge with upstream




Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- postgresql-jdbc.spec	22 Jul 2006 08:45:07 -0000	1.5
+++ postgresql-jdbc.spec	16 Aug 2006 16:57:06 -0000	1.6
@@ -1,3 +1,35 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section		devel
 %define upstreamver	8.1-407
 %define gcj_support	1
@@ -14,8 +46,7 @@
 Source0:	http://jdbc.postgresql.org/download/%{name}-%{upstreamver}.src.tar.gz
 Patch1:		postgresql-jdbc-unspec-string.patch
 
-%if %{gcj_support}
-%else
+%if ! %{gcj_support}
 BuildArch:	noarch
 %endif
 BuildRequires:  jpackage-utils >= 0:1.5
@@ -99,6 +130,9 @@
 %endif
 
 %changelog
+* Wed Aug 16 2006 Fernando Nasser <fnasser at redhat.com> 8.1.407-1jpp.3
+- Merge with upstream
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 8.1.407-1jpp.2
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 16:59:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 12:59:45 -0400
Subject: rpms/postgresql-jdbc/devel postgresql-jdbc.spec,1.6,1.7
Message-ID: <200608161659.k7GGxjI7003666@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/postgresql-jdbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3652

Modified Files:
	postgresql-jdbc.spec 
Log Message:
Bump release number




Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- postgresql-jdbc.spec	16 Aug 2006 16:57:06 -0000	1.6
+++ postgresql-jdbc.spec	16 Aug 2006 16:59:42 -0000	1.7
@@ -37,7 +37,7 @@
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
 Version:	8.1.407
-Release:	1jpp.2
+Release:	1jpp.3
 Epoch:		0
 License:	BSD
 Group:		Applications/Databases



From fedora-cvs-commits at redhat.com  Wed Aug 16 17:15:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 13:15:23 -0400
Subject: rpms/libvirt/devel .cvsignore, 1.9, 1.10 libvirt.spec, 1.21,
	1.22 sources, 1.9, 1.10 libvirt-uuid.patch, 1.1, NONE
Message-ID: <200608161715.k7GHFNU4015512@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	.cvsignore libvirt.spec sources 
Removed Files:
	libvirt-uuid.patch 
Log Message:
Release of 0.1.4, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Jul 2006 16:08:41 -0000	1.9
+++ .cvsignore	16 Aug 2006 17:15:20 -0000	1.10
@@ -6,3 +6,4 @@
 libvirt-0.1.2.tar.gz
 libvirt-0.1.1.tar.gz
 libvirt-0.1.3.tar.gz
+libvirt-0.1.4.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libvirt.spec	2 Aug 2006 21:46:27 -0000	1.21
+++ libvirt.spec	16 Aug 2006 17:15:20 -0000	1.22
@@ -1,11 +1,10 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
-Version: 0.1.3
-Release: 6
+Version: 0.1.4
+Release: 1
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch0: libvirt-uuid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvir.org/
 BuildRequires: python python-devel
@@ -48,7 +47,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure
@@ -109,6 +107,13 @@
 %doc docs/examples/python
 
 %changelog
+* Wed Aug 16 2006 Daniel Veillard <veillard at redhat.com> 0.1.4-1
+- vCPUs and affinity support
+- more complete XML, console and boot options
+- specific features support
+- enforced read-only connections
+- various improvements, bug fixes
+
 * Wed Aug  2 2006 Jeremy Katz <katzj at redhat.com> - 0.1.3-6
 - add patch from pvetere to allow getting uuid from libvirt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Jul 2006 16:08:41 -0000	1.9
+++ sources	16 Aug 2006 17:15:20 -0000	1.10
@@ -1 +1 @@
-e820776aec5c51aa527aca1a848a1dc9  libvirt-0.1.3.tar.gz
+d8479551ac2b7ff19341961b8ef9acc4  libvirt-0.1.4.tar.gz


--- libvirt-uuid.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 16 17:32:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 13:32:38 -0400
Subject: rpms/tcsh/devel tcsh-6.14.00-spell-crash.patch, NONE, 1.1 tcsh.spec,
	1.40, 1.41
Message-ID: <200608161732.k7GHWchd003876@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/tcsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3794

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.14.00-spell-crash.patch 
Log Message:
* Wed Aug 16 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-10
- Fix an uninitialized variable causing stack corruption (#197968)


tcsh-6.14.00-spell-crash.patch:
 tw.parse.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE tcsh-6.14.00-spell-crash.patch ---
--- tcsh-6.14.00/tw.parse.c.spell-crash	2006-08-16 19:10:16.000000000 +0200
+++ tcsh-6.14.00/tw.parse.c	2006-08-16 19:11:51.000000000 +0200
@@ -1668,7 +1668,8 @@
 	return (-1);
     }
 
-    numitems = tw_collect(command, looking, exp_dir, exp_name, 
+    exp_name[0] = '\0';
+    numitems = tw_collect(command, looking, exp_dir, exp_name,
 			  &target, pat, flags, dir_fd);
     if (numitems == -1)
 	return -1;


Index: tcsh.spec
===================================================================
RCS file: /cvs/dist/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- tcsh.spec	12 Jul 2006 08:27:11 -0000	1.40
+++ tcsh.spec	16 Aug 2006 17:32:34 -0000	1.41
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell.
 Name: tcsh
 Version: 6.14
-Release: 9.1
+Release: 10
 License: distributable
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -17,6 +17,7 @@
 Patch7: tcsh-6.14.00-wide-crash.patch
 Patch8: tcsh-6.14.00-colors.patch
 Patch9: tcsh-6.14.00-wide-seeks.patch
+Patch10: tcsh-6.14.00-spell-crash.patch
 Provides: csh = %{version}
 Prereq: fileutils, grep
 URL: http://www.tcsh.org/
@@ -43,6 +44,7 @@
 %patch7 -p1 -b .wide-crash
 %patch8 -p1 -b .colors
 %patch9 -p1 -b .wide-seeks
+%patch10 -p1 -b .spell-crash
 
 %build
 %configure --without-hesiod
@@ -108,6 +110,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Aug 16 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-10
+- Fix an uninitialized variable causing stack corruption (#197968)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.14-9.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 17:47:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 13:47:41 -0400
Subject: rpms/xorg-x11-drv-amd/devel xorg-x11-drv-amd.spec,1.8,1.9
Message-ID: <200608161747.k7GHlfJF023434@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-amd.spec 
Log Message:
* Wed Aug 16 2006 Adam Jackson <ajackson at redhat.com> 0.0-4.20060816git.fc6
- Un-reset the Release: number.



Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-amd.spec	16 Aug 2006 16:10:18 -0000	1.8
+++ xorg-x11-drv-amd.spec	16 Aug 2006 17:47:39 -0000	1.9
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   1.%{gitdate}git%{?dist}
+Release:   4.%{gitdate}git%{?dist}
 URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
@@ -70,6 +70,9 @@
 %{_mandir}/man4/amd.4*
 
 %changelog
+* Wed Aug 16 2006 Adam Jackson <ajackson at redhat.com> 0.0-4.20060816git.fc6
+- Un-reset the Release: number.
+
 * Wed Aug 16 2006 Adam Jackson <ajackson at redhat.com> 0.0-1.20060816git.fc6
 - git update: more Xv fixes.
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 17:51:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 13:51:37 -0400
Subject: rpms/transfig/devel transfig.spec,1.24,1.25
Message-ID: <200608161751.k7GHpbh1024964@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/transfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24933

Modified Files:
	transfig.spec 
Log Message:
- Require ghostscript; fig2dev calls it.


Index: transfig.spec
===================================================================
RCS file: /cvs/dist/rpms/transfig/devel/transfig.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- transfig.spec	12 Jul 2006 08:32:33 -0000	1.24
+++ transfig.spec	16 Aug 2006 17:51:35 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.4
-Release: 15.1
+Release: 16
 Epoch: 1
 License: distributable
 Group: Applications/Multimedia
@@ -15,6 +15,8 @@
 Patch5: transfig-3.2.4-modularX.patch
 Patch6: transfig.3.2.4-pstex.patch
 
+Requires:	ghostscript
+
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
 BuildRequires: imake
@@ -73,6 +75,9 @@
 %{_datadir}/fig2dev
 
 %changelog
+* Wed Aug 16 2006 Stepan Kasal <skasal at redhat.com> - 1:3.2.4-16
+- Require ghostscript; fig2dev calls it.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.4-15.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 18:08:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 14:08:45 -0400
Subject: rpms/gcc/devel gcc41-i386-tune-geode.patch, NONE,
	1.1 gcc41-pr25795.patch, NONE, 1.1 gcc41-pr28706.patch, NONE,
	1.1 gcc41-pr28709.patch, NONE, 1.1 gcc41-pr28725.patch, NONE,
	1.1 gcc41-pr28744.patch, NONE, 1.1 .cvsignore, 1.164,
	1.165 gcc41-rh200887.patch, 1.2, 1.3 gcc41.spec, 1.92,
	1.93 sources, 1.166, 1.167 gcc41-pr27793.patch, 1.1, NONE
Message-ID: <200608161808.k7GI8joo029239@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc41-rh200887.patch gcc41.spec sources 
Added Files:
	gcc41-i386-tune-geode.patch gcc41-pr25795.patch 
	gcc41-pr28706.patch gcc41-pr28709.patch gcc41-pr28725.patch 
	gcc41-pr28744.patch 
Removed Files:
	gcc41-pr27793.patch 
Log Message:
4.1.1-17

gcc41-i386-tune-geode.patch:
 geode.md |  153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 i386.c   |   87 ++++++++++++++++++++++++++++++-----
 i386.h   |   34 +++++++++-----
 i386.md  |    3 -
 4 files changed, 251 insertions(+), 26 deletions(-)

--- NEW FILE gcc41-i386-tune-geode.patch ---
2006-08-14  Vladimir Makarov  <vmakarov at redhat.com>

	* config/i386/i386.h (TARGET_GEODE):
	(TARGET_CPU_CPP_BUILTINS): Add code for geode.
	(TARGET_CPU_DEFAULT_geode): New macro.
	(TARGET_CPU_DEFAULT_k6, TARGET_CPU_DEFAULT_k6_2,
	TARGET_CPU_DEFAULT_k6_3, TARGET_CPU_DEFAULT_athlon,
	TARGET_CPU_DEFAULT_athlon_sse, TARGET_CPU_DEFAULT_k8,
	TARGET_CPU_DEFAULT_pentium_m, TARGET_CPU_DEFAULT_prescott,
	TARGET_CPU_DEFAULT_nocona, TARGET_CPU_DEFAULT_generic): Increase
	the macro values.
	(TARGET_CPU_DEFAULT_NAMES): Add geode.
	(processor_type): Add PROCESSOR_GEODE.

	* config/i386/i386.md: Include geode.md.
	(cpu): Add geode.

	* config/i386/i386.c (geode_cost): New initialized global
	variable.
	(m_GEODE, m_K6_GEODE): New macros.
	(x86_use_leave, x86_push_memory, x86_deep_branch, x86_use_sahf,
	x86_use_himode_fiop, x86_promote_QImode, x86_add_esp_4,
	x86_add_esp_8, x86_rep_movl_optimal, x86_ext_80387_constants,
	x86_schedule): Use m_K6_GEODE instead of m_K6.
	(x86_movx, x86_cmove): Set up m_GEODE.
	(x86_integer_DFmode_moves): Clear m_GEODE.
	(processor_target_table): Add entry for geode.
	(processor_alias_table): Ditto.

	* config/i386/geode.md: New file.

--- gcc/config/i386/i386.h.jj	2006-08-09 17:53:56.000000000 +0200
+++ gcc/config/i386/i386.h	2006-08-15 11:03:45.000000000 +0200
@@ -130,6 +130,7 @@ extern const struct processor_costs *ix8
 #define TARGET_486 (ix86_tune == PROCESSOR_I486)
 #define TARGET_PENTIUM (ix86_tune == PROCESSOR_PENTIUM)
 #define TARGET_PENTIUMPRO (ix86_tune == PROCESSOR_PENTIUMPRO)
+#define TARGET_GEODE (ix86_tune == PROCESSOR_GEODE)
 #define TARGET_K6 (ix86_tune == PROCESSOR_K6)
 #define TARGET_ATHLON (ix86_tune == PROCESSOR_ATHLON)
 #define TARGET_PENTIUM4 (ix86_tune == PROCESSOR_PENTIUM4)
@@ -351,6 +352,10 @@ extern int x86_prefetch_sse;
 	      break;						\
 	    }							\
 	}							\
+      else if (TARGET_GEODE)					\
+	{							\
+	  builtin_define ("__tune_geode__");			\
+	}							\
       else if (TARGET_K6)					\
 	{							\
 	  builtin_define ("__tune_k6__");			\
@@ -412,6 +417,11 @@ extern int x86_prefetch_sse;
 	  builtin_define ("__pentiumpro");			\
 	  builtin_define ("__pentiumpro__");			\
 	}							\
+      else if (ix86_arch == PROCESSOR_GEODE)			\
+	{							\
+	  builtin_define ("__geode");				\
+	  builtin_define ("__geode__");				\
+	}							\
       else if (ix86_arch == PROCESSOR_K6)			\
 	{							\
 								\
@@ -456,20 +466,21 @@ extern int x86_prefetch_sse;
 #define TARGET_CPU_DEFAULT_pentium2 5
 #define TARGET_CPU_DEFAULT_pentium3 6
 #define TARGET_CPU_DEFAULT_pentium4 7
-#define TARGET_CPU_DEFAULT_k6 8
-#define TARGET_CPU_DEFAULT_k6_2 9
-#define TARGET_CPU_DEFAULT_k6_3 10
-#define TARGET_CPU_DEFAULT_athlon 11
-#define TARGET_CPU_DEFAULT_athlon_sse 12
-#define TARGET_CPU_DEFAULT_k8 13
-#define TARGET_CPU_DEFAULT_pentium_m 14
-#define TARGET_CPU_DEFAULT_prescott 15
-#define TARGET_CPU_DEFAULT_nocona 16
-#define TARGET_CPU_DEFAULT_generic 17
+#define TARGET_CPU_DEFAULT_geode 8
+#define TARGET_CPU_DEFAULT_k6 9
+#define TARGET_CPU_DEFAULT_k6_2 10
+#define TARGET_CPU_DEFAULT_k6_3 11
+#define TARGET_CPU_DEFAULT_athlon 12
+#define TARGET_CPU_DEFAULT_athlon_sse 13
+#define TARGET_CPU_DEFAULT_k8 14
+#define TARGET_CPU_DEFAULT_pentium_m 15
+#define TARGET_CPU_DEFAULT_prescott 16
+#define TARGET_CPU_DEFAULT_nocona 17
+#define TARGET_CPU_DEFAULT_generic 18
 
 #define TARGET_CPU_DEFAULT_NAMES {"i386", "i486", "pentium", "pentium-mmx",\
 				  "pentiumpro", "pentium2", "pentium3", \
-				  "pentium4", "k6", "k6-2", "k6-3",\
+				  "pentium4", "geode", "k6", "k6-2", "k6-3", \
 				  "athlon", "athlon-4", "k8", \
 				  "pentium-m", "prescott", "nocona", \
 				  "generic"}
@@ -2117,6 +2128,7 @@ enum processor_type
   PROCESSOR_I486,			/* 80486DX, 80486SX, 80486DX[24] */
   PROCESSOR_PENTIUM,
   PROCESSOR_PENTIUMPRO,
+  PROCESSOR_GEODE,
   PROCESSOR_K6,
   PROCESSOR_ATHLON,
   PROCESSOR_PENTIUM4,
--- gcc/config/i386/i386.md.jj	2006-08-09 17:53:56.000000000 +0200
+++ gcc/config/i386/i386.md	2006-08-15 11:03:45.000000000 +0200
@@ -185,7 +185,7 @@
 
 ;; Processor type.  This attribute must exactly match the processor_type
 ;; enumeration in i386.h.
-(define_attr "cpu" "i386,i486,pentium,pentiumpro,k6,athlon,pentium4,k8,nocona,generic32,generic64"
+(define_attr "cpu" "i386,i486,pentium,pentiumpro,geode,k6,athlon,pentium4,k8,nocona,generic32,generic64"
   (const (symbol_ref "ix86_tune")))
 
 ;; A basic instruction type.  Refinements due to arguments to be
@@ -467,6 +467,7 @@
 (include "ppro.md")
 (include "k6.md")
 (include "athlon.md")
+(include "geode.md")
 
 
 ;; Operand and operator predicates
--- gcc/config/i386/i386.c.jj	2006-08-09 17:53:58.000000000 +0200
+++ gcc/config/i386/i386.c	2006-08-15 11:06:09.000000000 +0200
@@ -325,6 +325,60 @@ struct processor_costs pentiumpro_cost =
 };
 
 static const
+struct processor_costs geode_cost = {
+  COSTS_N_INSNS (1),			/* cost of an add instruction */
+  COSTS_N_INSNS (1),			/* cost of a lea instruction */
+  COSTS_N_INSNS (2),			/* variable shift costs */
+  COSTS_N_INSNS (1),			/* constant shift costs */
+  {COSTS_N_INSNS (3),			/* cost of starting multiply for QI */
+   COSTS_N_INSNS (4),			/*                               HI */
+   COSTS_N_INSNS (7),			/*                               SI */
+   COSTS_N_INSNS (7),			/*                               DI */
+   COSTS_N_INSNS (7)},			/*                               other */
+  0,					/* cost of multiply per each bit set */
+  {COSTS_N_INSNS (15),			/* cost of a divide/mod for QI */
+   COSTS_N_INSNS (23),			/*                          HI */
+   COSTS_N_INSNS (39),			/*                          SI */
+   COSTS_N_INSNS (39),			/*                          DI */
+   COSTS_N_INSNS (39)},			/*                          other */
+  COSTS_N_INSNS (1),			/* cost of movsx */
+  COSTS_N_INSNS (1),			/* cost of movzx */
+  8,					/* "large" insn */
+  4,					/* MOVE_RATIO */
+  1,					/* cost for loading QImode using movzbl */
+  {1, 1, 1},				/* cost of loading integer registers
+					   in QImode, HImode and SImode.
+					   Relative to reg-reg move (2).  */
+  {1, 1, 1},				/* cost of storing integer registers */
+  1,					/* cost of reg,reg fld/fst */
+  {1, 1, 1},				/* cost of loading fp registers
+					   in SFmode, DFmode and XFmode */
+  {4, 6, 6},				/* cost of storing fp registers
+					   in SFmode, DFmode and XFmode */
+
+  1,					/* cost of moving MMX register */
+  {1, 1},				/* cost of loading MMX registers
+					   in SImode and DImode */
+  {1, 1},				/* cost of storing MMX registers
+					   in SImode and DImode */
+  1,					/* cost of moving SSE register */
+  {1, 1, 1},				/* cost of loading SSE registers
+					   in SImode, DImode and TImode */
+  {1, 1, 1},				/* cost of storing SSE registers
+					   in SImode, DImode and TImode */
+  1,					/* MMX or SSE register to integer */
+  32,					/* size of prefetch block */
+  1,					/* number of parallel prefetches */
+  1,					/* Branch cost */
+  COSTS_N_INSNS (6),			/* cost of FADD and FSUB insns.  */
+  COSTS_N_INSNS (11),			/* cost of FMUL instruction.  */
+  COSTS_N_INSNS (47),			/* cost of FDIV instruction.  */
+  COSTS_N_INSNS (1),			/* cost of FABS instruction.  */
+  COSTS_N_INSNS (1),			/* cost of FCHS instruction.  */
+  COSTS_N_INSNS (54),			/* cost of FSQRT instruction.  */
+};
+
+static const
 struct processor_costs k6_cost = {
   COSTS_N_INSNS (1),			/* cost of an add instruction */
   COSTS_N_INSNS (2),			/* cost of a lea instruction */
@@ -703,6 +757,8 @@ const struct processor_costs *ix86_cost 
 #define m_486 (1<<PROCESSOR_I486)
 #define m_PENT (1<<PROCESSOR_PENTIUM)
 #define m_PPRO (1<<PROCESSOR_PENTIUMPRO)
+#define m_GEODE  (1<<PROCESSOR_GEODE)
+#define m_K6_GEODE  (m_K6 | m_GEODE)
 #define m_K6  (1<<PROCESSOR_K6)
 #define m_ATHLON  (1<<PROCESSOR_ATHLON)
 #define m_PENT4  (1<<PROCESSOR_PENTIUM4)
@@ -719,23 +775,23 @@ const struct processor_costs *ix86_cost 
 /* Leave is not affecting Nocona SPEC2000 results negatively, so enabling for
    Generic64 seems like good code size tradeoff.  We can't enable it for 32bit
    generic because it is not working well with PPro base chips.  */
-const int x86_use_leave = m_386 | m_K6 | m_ATHLON_K8 | m_GENERIC64;
-const int x86_push_memory = m_386 | m_K6 | m_ATHLON_K8 | m_PENT4 | m_NOCONA | m_GENERIC;
+const int x86_use_leave = m_386 | m_K6_GEODE | m_ATHLON_K8 | m_GENERIC64;
+const int x86_push_memory = m_386 | m_K6_GEODE | m_ATHLON_K8 | m_PENT4 | m_NOCONA | m_GENERIC;
 const int x86_zero_extend_with_and = m_486 | m_PENT;
-const int x86_movx = m_ATHLON_K8 | m_PPRO | m_PENT4 | m_NOCONA | m_GENERIC /* m_386 | m_K6 */;
+const int x86_movx = m_ATHLON_K8 | m_PPRO | m_PENT4 | m_NOCONA | m_GENERIC | m_GEODE /* m_386 | m_K6 */;
 const int x86_double_with_add = ~m_386;
 const int x86_use_bit_test = m_386;
 const int x86_unroll_strlen = m_486 | m_PENT | m_PPRO | m_ATHLON_K8 | m_K6 | m_GENERIC;
-const int x86_cmove = m_PPRO | m_ATHLON_K8 | m_PENT4 | m_NOCONA; 
+const int x86_cmove = m_PPRO | m_GEODE | m_ATHLON_K8 | m_PENT4 | m_NOCONA; 
 const int x86_fisttp = m_NOCONA;
 const int x86_3dnow_a = m_ATHLON_K8;
-const int x86_deep_branch = m_PPRO | m_K6 | m_ATHLON_K8 | m_PENT4 | m_NOCONA | m_GENERIC;
+const int x86_deep_branch = m_PPRO | m_K6_GEODE | m_ATHLON_K8 | m_PENT4 | m_NOCONA | m_GENERIC;
 /* Branch hints were put in P4 based on simulation result. But
    after P4 was made, no performance benefit was observed with
    branch hints. It also increases the code size. As the result,
    icc never generates branch hints.  */
 const int x86_branch_hints = 0;
-const int x86_use_sahf = m_PPRO | m_K6 | m_PENT4 | m_NOCONA | m_GENERIC32; /*m_GENERIC | m_ATHLON_K8 ? */
+const int x86_use_sahf = m_PPRO | m_K6_GEODE | m_PENT4 | m_NOCONA | m_GENERIC32; /*m_GENERIC | m_ATHLON_K8 ? */
 /* We probably ought to watch for partial register stalls on Generic32
    compilation setting as well.  However in current implementation the
    partial register stalls are not eliminated very well - they can
@@ -745,14 +801,14 @@ const int x86_use_sahf = m_PPRO | m_K6 |
    with partial reg. dependencies used by Athlon/P4 based chips, it is better
    to leave it off for generic32 for now.  */
 const int x86_partial_reg_stall = m_PPRO;
-const int x86_use_himode_fiop = m_386 | m_486 | m_K6;
+const int x86_use_himode_fiop = m_386 | m_486 | m_K6_GEODE;
 const int x86_use_simode_fiop = ~(m_PPRO | m_ATHLON_K8 | m_PENT | m_GENERIC);
 const int x86_use_mov0 = m_K6;
 const int x86_use_cltd = ~(m_PENT | m_K6 | m_GENERIC);
 const int x86_read_modify_write = ~m_PENT;
 const int x86_read_modify = ~(m_PENT | m_PPRO);
 const int x86_split_long_moves = m_PPRO;
-const int x86_promote_QImode = m_K6 | m_PENT | m_386 | m_486 | m_ATHLON_K8 | m_GENERIC; /* m_PENT4 ? */
+const int x86_promote_QImode = m_K6_GEODE | m_PENT | m_386 | m_486 | m_ATHLON_K8 | m_GENERIC; /* m_PENT4 ? */
 const int x86_fast_prefix = ~(m_PENT | m_486 | m_386);
 const int x86_single_stringop = m_386 | m_PENT4 | m_NOCONA;
 const int x86_qimode_math = ~(0);
@@ -764,9 +820,9 @@ const int x86_himode_math = ~(m_PPRO);
 const int x86_promote_hi_regs = m_PPRO;
 const int x86_sub_esp_4 = m_ATHLON_K8 | m_PPRO | m_PENT4 | m_NOCONA | m_GENERIC;
 const int x86_sub_esp_8 = m_ATHLON_K8 | m_PPRO | m_386 | m_486 | m_PENT4 | m_NOCONA | m_GENERIC;
-const int x86_add_esp_4 = m_ATHLON_K8 | m_K6 | m_PENT4 | m_NOCONA | m_GENERIC;
-const int x86_add_esp_8 = m_ATHLON_K8 | m_PPRO | m_K6 | m_386 | m_486 | m_PENT4 | m_NOCONA | m_GENERIC;
-const int x86_integer_DFmode_moves = ~(m_ATHLON_K8 | m_PENT4 | m_NOCONA | m_PPRO | m_GENERIC);
+const int x86_add_esp_4 = m_ATHLON_K8 | m_K6_GEODE | m_PENT4 | m_NOCONA | m_GENERIC;
+const int x86_add_esp_8 = m_ATHLON_K8 | m_PPRO | m_K6_GEODE | m_386 | m_486 | m_PENT4 | m_NOCONA | m_GENERIC;
+const int x86_integer_DFmode_moves = ~(m_ATHLON_K8 | m_PENT4 | m_NOCONA | m_PPRO | m_GENERIC | m_GEODE);
 const int x86_partial_reg_dependency = m_ATHLON_K8 | m_PENT4 | m_NOCONA | m_GENERIC;
 const int x86_memory_mismatch_stall = m_ATHLON_K8 | m_PENT4 | m_NOCONA | m_GENERIC;
 const int x86_accumulate_outgoing_args = m_ATHLON_K8 | m_PENT4 | m_NOCONA | m_PPRO | m_GENERIC;
@@ -792,18 +848,18 @@ const int x86_sse_split_regs = m_ATHLON_
 const int x86_sse_typeless_stores = m_ATHLON_K8;
 const int x86_sse_load0_by_pxor = m_PPRO | m_PENT4 | m_NOCONA;
 const int x86_use_ffreep = m_ATHLON_K8;
-const int x86_rep_movl_optimal = m_386 | m_PENT | m_PPRO | m_K6;
+const int x86_rep_movl_optimal = m_386 | m_PENT | m_PPRO | m_K6_GEODE;
 const int x86_use_incdec = ~(m_PENT4 | m_NOCONA | m_GENERIC);
 
 /* ??? Allowing interunit moves makes it all too easy for the compiler to put
    integer data in xmm registers.  Which results in pretty abysmal code.  */
 const int x86_inter_unit_moves = 0 /* ~(m_ATHLON_K8) */;
 
-const int x86_ext_80387_constants = m_K6 | m_ATHLON | m_PENT4 | m_NOCONA | m_PPRO | m_GENERIC32;
+const int x86_ext_80387_constants = m_K6_GEODE | m_ATHLON | m_PENT4 | m_NOCONA | m_PPRO | m_GENERIC32;
 /* Some CPU cores are not able to predict more than 4 branch instructions in
    the 16 byte window.  */
 const int x86_four_jump_limit = m_PPRO | m_ATHLON_K8 | m_PENT4 | m_NOCONA | m_GENERIC;
-const int x86_schedule = m_PPRO | m_ATHLON_K8 | m_K6 | m_PENT | m_GENERIC;
+const int x86_schedule = m_PPRO | m_ATHLON_K8 | m_K6_GEODE | m_PENT | m_GENERIC;
 const int x86_use_bt = m_ATHLON_K8;
 /* Compare and exchange was added for 80486.  */
 const int x86_cmpxchg = ~m_386;
@@ -1427,6 +1483,7 @@ override_options (void)
       {&i486_cost, 0, 0, 16, 15, 16, 15, 16},
       {&pentium_cost, 0, 0, 16, 7, 16, 7, 16},
       {&pentiumpro_cost, 0, 0, 16, 15, 16, 7, 16},
+      {&geode_cost, 0, 0, 0, 0, 0, 0, 0},
       {&k6_cost, 0, 0, 32, 7, 32, 7, 32},
       {&athlon_cost, 0, 0, 16, 7, 16, 7, 16},
       {&pentium4_cost, 0, 0, 0, 0, 0, 0, 0},
@@ -1478,6 +1535,8 @@ override_options (void)
 				        | PTA_MMX | PTA_PREFETCH_SSE},
       {"nocona", PROCESSOR_NOCONA, PTA_SSE | PTA_SSE2 | PTA_SSE3 | PTA_64BIT
 				        | PTA_MMX | PTA_PREFETCH_SSE},
+      {"geode", PROCESSOR_GEODE, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW
+				   | PTA_3DNOW_A},
       {"k6", PROCESSOR_K6, PTA_MMX},
       {"k6-2", PROCESSOR_K6, PTA_MMX | PTA_3DNOW},
       {"k6-3", PROCESSOR_K6, PTA_MMX | PTA_3DNOW},
--- gcc/config/i386/geode.md.jj	2006-08-15 11:03:55.000000000 +0200
+++ gcc/config/i386/geode.md	2006-08-15 11:03:18.000000000 +0200
@@ -0,0 +1,153 @@
+;; Geode Scheduling
+;; Copyright (C) 2006
+;; Free Software Foundation, Inc.
+;;
+;; This file is part of GCC.
+;;
+;; GCC is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; GCC is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GCC; see the file COPYING.  If not, write to
+;; the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+;;
+;; The Geode architecture is one insn issue processor.
+;;
+;; This description is based on data from the following documents:
+;;
+;;    "AMD Geode GX Processor Data Book"
+;;    Advanced Micro Devices, Inc., Aug 2005.
+;;
+;;    "AMD Geode LX Processor Data Book"
+;;    Advanced Micro Devices, Inc., Jan 2006.
+;;
+;;
+;; CPU execution units of the Geode:
+;;
+;; issue	describes the issue pipeline.
+;; alu		describes the Integer unit
+;; fpu		describes the FP unit
+;;
+;; The fp unit is out of order execution unit with register renaming.
+;; There is also memory management unit and execution pipeline for
+;; load/store operations.  We ignore it and difference between insns
+;; using memory and registers.
+
+(define_automaton "geode")
+
+(define_cpu_unit "geode_issue,geode_alu,geode_fpu" "geode")
+
+(define_insn_reservation "alu" 1
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "alu,alu1,negnot,icmp,lea,test,imov,imovx,icmov,incdec,setcc"))
+			 "geode_issue,geode_alu")
+
+(define_insn_reservation "shift" 2
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "ishift,ishift1,rotate,rotate1,cld"))
+			 "geode_issue,geode_alu*2")
+
+(define_insn_reservation "imul" 7
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "imul"))
+			 "geode_issue,geode_alu*7")
+
+(define_insn_reservation "idiv" 40
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "idiv"))
+			 "geode_issue,geode_alu*40")
+
+;; The branch unit.
+(define_insn_reservation "call" 2
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "call,callv"))
+			 "geode_issue,geode_alu*2")
+
+(define_insn_reservation "geode_branch" 1
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "ibr"))
+			 "geode_issue,geode_alu")
+
+(define_insn_reservation "geode_pop_push" 1
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "pop,push"))
+			 "geode_issue,geode_alu")
+
+(define_insn_reservation "geode_leave" 2
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "leave"))
+			 "geode_issue,geode_alu*2")
+
+(define_insn_reservation "geode_load_str" 4
+			 (and (eq_attr "cpu" "geode")
+			      (and (eq_attr "type" "str")
+				   (eq_attr "memory" "load,both")))
+			 "geode_issue,geode_alu*4")
+
+(define_insn_reservation "geode_store_str" 2
+			 (and (eq_attr "cpu" "geode")
+			      (and (eq_attr "type" "str")
+				   (eq_attr "memory" "store")))
+			 "geode_issue,geode_alu*2")
+
+;; Be optimistic
+(define_insn_reservation "geode_unknown" 1
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "multi,other"))
+			 "geode_issue,geode_alu")
+
+;; FPU
+
+(define_insn_reservation "geode_fop" 6
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "fop,fcmp"))
+			 "geode_issue,geode_fpu*6")
+
+(define_insn_reservation "geode_fsimple" 1
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "fmov,fcmov,fsgn,fxch"))
+			 "geode_issue,geode_fpu")
+
+(define_insn_reservation "geode_fist" 4
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "fistp,fisttp"))
+			 "geode_issue,geode_fpu*4")
+
+(define_insn_reservation "geode_fmul" 10
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "fmul"))
+			 "geode_issue,geode_fpu*10")
+
+(define_insn_reservation "geode_fdiv" 47
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "fdiv"))
+			 "geode_issue,geode_fpu*47")
+
+;; We use minimal latency (fsin) here
+(define_insn_reservation "geode_fpspc" 54
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "fpspc"))
+			 "geode_issue,geode_fpu*54")
+
+(define_insn_reservation "geode_frndint" 12
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "frndint"))
+			 "geode_issue,geode_fpu*12")
+
+(define_insn_reservation "geode_mmxmov" 1
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "mmxmov"))
+			 "geode_issue,geode_fpu")
+
+(define_insn_reservation "geode_mmx" 2
+			 (and (eq_attr "cpu" "geode")
+			      (eq_attr "type" "mmx,mmxadd,mmxmul,mmxcmp,mmxcvt,mmxshft"))
+			 "geode_issue,geode_fpu*2")

gcc41-pr25795.patch:
 0 files changed

--- NEW FILE gcc41-pr25795.patch ---
2006-07-23  Jan Hubicka  <jh at suse.cz>

	PR c/25795
	PR c++/27369
	* cgraph.c (cgraph_varpool_nodes): Export.
	(decide_is_variable_needed): Ignored "used" attribute in
	unit-at-a-time mode.
	* cgraph.h (cgraph_varpool_nodes): Declare.
	* cgraphunit.c (decide_is_function_needed): Ignored "used" attribute in
	unit-at-a-time mode.

	* gcc.dg/pr25795.c: New test.
	* gcc.dg/pr25795-1.c: New test.

--- gcc/cgraph.c	(revision 115692)
+++ gcc/cgraph.c	(revision 115693)
@@ -137,7 +137,7 @@ static GTY((param_is (struct cgraph_varp
 struct cgraph_varpool_node *cgraph_varpool_nodes_queue, *cgraph_varpool_first_unanalyzed_node;
 
 /* The linked list of cgraph varpool nodes.  */
-static GTY(()) struct cgraph_varpool_node *cgraph_varpool_nodes;
+struct cgraph_varpool_node *cgraph_varpool_nodes;
 
 /* End of the varpool queue.  Needs to be QTYed to work with PCH.  */
 static GTY(()) struct cgraph_varpool_node *cgraph_varpool_last_needed_node;
@@ -843,8 +843,10 @@ bool
 decide_is_variable_needed (struct cgraph_varpool_node *node, tree decl)
 {
   /* If the user told us it is used, then it must be so.  */
-  if (node->externally_visible
-      || lookup_attribute ("used", DECL_ATTRIBUTES (decl)))
+  if (node->externally_visible)
+    return true;
+  if (!flag_unit_at_a_time
+      && lookup_attribute ("used", DECL_ATTRIBUTES (decl)))
     return true;
 
   /* ??? If the assembler name is set by hand, it is possible to assemble
@@ -861,7 +863,8 @@ decide_is_variable_needed (struct cgraph
 
   /* Externally visible variables must be output.  The exception is
      COMDAT variables that must be output only when they are needed.  */
-  if (TREE_PUBLIC (decl) && !DECL_COMDAT (decl) && !DECL_EXTERNAL (decl))
+  if (TREE_PUBLIC (decl) && !flag_whole_program && !DECL_COMDAT (decl)
+      && !DECL_EXTERNAL (decl))
     return true;
 
   /* When not reordering top level variables, we have to assume that
--- gcc/cgraph.h	(revision 115692)
+++ gcc/cgraph.h	(revision 115693)
@@ -221,6 +221,7 @@ extern GTY(()) struct cgraph_node *cgrap
 
 extern GTY(()) struct cgraph_varpool_node *cgraph_varpool_first_unanalyzed_node;
 extern GTY(()) struct cgraph_varpool_node *cgraph_varpool_nodes_queue;
+extern GTY(()) struct cgraph_varpool_node *cgraph_varpool_nodes;
 
 /* In cgraph.c  */
 void dump_cgraph (FILE *);
--- gcc/cgraphunit.c	(revision 115692)
+++ gcc/cgraphunit.c	(revision 115693)
@@ -198,8 +198,10 @@ decide_is_function_needed (struct cgraph
     }
 
   /* If the user told us it is used, then it must be so.  */
-  if (node->local.externally_visible
-      || lookup_attribute ("used", DECL_ATTRIBUTES (decl)))
+  if (node->local.externally_visible)
+    return true;
+
+  if (!flag_unit_at_a_time && lookup_attribute ("used", DECL_ATTRIBUTES (decl)))
     return true;
 
   /* ??? If the assembler name is set by hand, it is possible to assemble
@@ -937,6 +939,71 @@ cgraph_analyze_function (struct cgraph_n
   current_function_decl = NULL;
 }
 
+/* Look for externally_visible and used attributes and mark cgraph nodes
+   accordingly.
+
+   We cannot mark the nodes at the point the attributes are processed (in
+   handle_*_attribute) because the copy of the declarations available at that
+   point may not be canonical.  For example, in:
+
+    void f();
+    void f() __attribute__((used));
+
+   the declaration we see in handle_used_attribute will be the second
+   declaration -- but the front end will subsequently merge that declaration
+   with the original declaration and discard the second declaration.
+
+   Furthermore, we can't mark these nodes in cgraph_finalize_function because:
+
+    void f() {}
+    void f() __attribute__((externally_visible));
+
+   is valid.
+
+   So, we walk the nodes at the end of the translation unit, applying the
+   attributes at that point.  */
+
+static void
+process_function_and_variable_attributes (struct cgraph_node *first,
+					  struct cgraph_varpool_node *first_var)
+{
+  struct cgraph_node *node;
+  struct cgraph_varpool_node *vnode;
+
+  for (node = cgraph_nodes; node != first; node = node->next)
+    {
+      tree decl = node->decl;
+      if (lookup_attribute ("used", DECL_ATTRIBUTES (decl)))
+	{
+	  mark_decl_referenced (decl);
+	  if (node->local.finalized)
+	     cgraph_mark_needed_node (node);
+	}
+      if (lookup_attribute ("externally_visible", DECL_ATTRIBUTES (decl)))
+	{
+	  if (node->local.finalized)
+	    cgraph_mark_needed_node (node);
+	  node->externally_visible = true;
+	}
+    }
+  for (vnode = cgraph_varpool_nodes; vnode != first_var; vnode = vnode->next)
+    {
+      tree decl = vnode->decl;
+      if (lookup_attribute ("used", DECL_ATTRIBUTES (decl)))
+	{
+	  mark_decl_referenced (decl);
+	  if (vnode->finalized)
+	    cgraph_varpool_mark_needed_node (vnode);
+	}
+      if (lookup_attribute ("externally_visible", DECL_ATTRIBUTES (decl)))
+	{
+	  if (vnode->finalized)
+	    cgraph_varpool_mark_needed_node (vnode);
+	  vnode->externally_visible = true;
+	}
+    }
+}
+
 /* Analyze the whole compilation unit once it is parsed completely.  */
 
 void
@@ -946,6 +1013,7 @@ cgraph_finalize_compilation_unit (void)
   /* Keep track of already processed nodes when called multiple times for
      intermodule optimization.  */
   static struct cgraph_node *first_analyzed;
+  static struct cgraph_varpool_node *first_analyzed_var;
 
   finish_aliases_1 ();
 
@@ -963,6 +1031,7 @@ cgraph_finalize_compilation_unit (void)
     }
 
   timevar_push (TV_CGRAPH);
+  process_function_and_variable_attributes (first_analyzed, first_analyzed_var);
   cgraph_varpool_analyze_pending_decls ();
   if (cgraph_dump_file)
     {
@@ -1047,6 +1116,7 @@ cgraph_finalize_compilation_unit (void)
       dump_cgraph (cgraph_dump_file);
     }
   first_analyzed = cgraph_nodes;
+  first_analyzed_var = cgraph_varpool_nodes;
   ggc_collect ();
   timevar_pop (TV_CGRAPH);
 }
--- gcc/c-decl.c	(revision 115692)
+++ gcc/c-decl.c	(revision 115693)
@@ -3554,7 +3554,7 @@ finish_decl (tree decl, tree init, tree 
     }
 
   /* If this was marked 'used', be sure it will be output.  */
-  if (lookup_attribute ("used", DECL_ATTRIBUTES (decl)))
+  if (!flag_unit_at_a_time && lookup_attribute ("used", DECL_ATTRIBUTES (decl)))
     mark_decl_referenced (decl);
 
   if (TREE_CODE (decl) == TYPE_DECL)
--- gcc/c-common.c	(revision 115692)
+++ gcc/c-common.c	(revision 115693)
@@ -4308,20 +4308,9 @@ handle_externally_visible_attribute (tre
 	       "%qE attribute have effect only on public objects", name);
       *no_add_attrs = true;
     }
-  else if (TREE_CODE (node) == FUNCTION_DECL)
-    {
-      struct cgraph_node *n = cgraph_node (node);
-      n->local.externally_visible = true;
-      if (n->local.finalized)
-	cgraph_mark_needed_node (n);
-    }
-  else if (TREE_CODE (node) == VAR_DECL)
-    {
-      struct cgraph_varpool_node *n = cgraph_varpool_node (node);
-      n->externally_visible = true;
-      if (n->finalized)
-	cgraph_varpool_mark_needed_node (n);
-    }
+  else if (TREE_CODE (node) == FUNCTION_DECL
+	   || TREE_CODE (node) == VAR_DECL)
+    ;
   else
     {
       warning (OPT_Wattributes, "%qE attribute ignored", name);
--- gcc/testsuite/gcc.dg/pr25795.c	(revision 0)
+++ gcc/testsuite/gcc.dg/pr25795.c	(revision 115693)
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fwhole-program" } */
+/* { dg-final { scan-assembler "mystr" } } */
+
+
+extern const char *mystr;       /* normally in a header */
+const char *mystr __attribute__ ((externally_visible));
+main()
+{
+}
--- gcc/testsuite/gcc.dg/pr25795-1.c	(revision 0)
+++ gcc/testsuite/gcc.dg/pr25795-1.c	(revision 115693)
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fwhole-program" } */
+/* { dg-final { scan-assembler-not "mystr" } } */
+
+
+extern const char *mystr;       /* normally in a header */
+const char *mystr;
+main()
+{
+}

gcc41-pr28706.patch:
 c-typeck.c                 |   20 ++++++++++++++++++++
 testsuite/gcc.dg/pr28706.c |   12 ++++++++++++
 testsuite/gcc.dg/pr28712.c |   16 ++++++++++++++++
 tree.c                     |   26 +++++++++++++++++++++-----
 4 files changed, 69 insertions(+), 5 deletions(-)

--- NEW FILE gcc41-pr28706.patch ---
2006-08-14  Jakub Jelinek  <jakub at redhat.com>

	PR c/28706
	PR c/28712
	* tree.c (merge_attributes, attribute_list_contained): If both
	TREE_VALUEs are TREE_LISTs, use simple_cst_list_equal instead of
	simple_cst_equal.
	* c-typeck.c (comptypes_internal): Don't consider aggregates
	in different TUs as compatible if there one set of attributes is
	not a subset of the other type's attributes.
	(composite_type): Try harder not to create a new aggregate type.

	* gcc.dg/pr28706.c: New test.
	* gcc.dg/pr28712.c: New test.

--- gcc/testsuite/gcc.dg/pr28706.c.jj	2006-08-14 17:03:51.000000000 +0200
+++ gcc/testsuite/gcc.dg/pr28706.c	2006-08-14 17:04:59.000000000 +0200
@@ -0,0 +1,12 @@
+/* PR c/28706 */
+/* { dg-do compile } */
+/* { dg-options "--combine" } */
+/* { dg-additional-sources "pr28706.c" } */
+
+struct A
+{
+  int i;
+} __attribute__((aligned (sizeof (long int))));
+
+extern void foo (struct A *);
+extern void foo (struct A *);
--- gcc/testsuite/gcc.dg/pr28712.c.jj	2006-08-14 19:12:26.000000000 +0200
+++ gcc/testsuite/gcc.dg/pr28712.c	2006-08-14 19:12:18.000000000 +0200
@@ -0,0 +1,16 @@
+/* PR c/28712 */
+/* { dg-do compile } */
+/* { dg-options "--combine" } */
+/* { dg-additional-sources "pr28712.c pr28712.c" } */
+
+struct A;
+
+extern struct A *a;
+
+struct A { } __attribute__((packed));
+
+struct B __attribute__((aligned (sizeof (int))));
+
+extern struct B *b;
+
+struct B { int i; } __attribute__((packed));
--- gcc/tree.c.jj	2006-08-14 13:58:27.000000000 +0200
+++ gcc/tree.c	2006-08-14 17:42:24.000000000 +0200
@@ -3555,7 +3555,17 @@ merge_attributes (tree a1, tree a2)
 		   a = lookup_attribute (IDENTIFIER_POINTER (TREE_PURPOSE (a2)),
 					 TREE_CHAIN (a)))
 		{
-		  if (simple_cst_equal (TREE_VALUE (a), TREE_VALUE (a2)) == 1)
+		  if (TREE_VALUE (a) != NULL
+		      && TREE_CODE (TREE_VALUE (a)) == TREE_LIST
+		      && TREE_VALUE (a2) != NULL
+		      && TREE_CODE (TREE_VALUE (a2)) == TREE_LIST)
+		    {
+		      if (simple_cst_list_equal (TREE_VALUE (a),
+						 TREE_VALUE (a2)) == 1)
+			break;
+		    }
+		  else if (simple_cst_equal (TREE_VALUE (a),
+					     TREE_VALUE (a2)) == 1)
 		    break;
 		}
 	      if (a == NULL_TREE)
@@ -4366,15 +4376,21 @@ attribute_list_contained (tree l1, tree 
 	   attr = lookup_attribute (IDENTIFIER_POINTER (TREE_PURPOSE (t2)),
 				    TREE_CHAIN (attr)))
 	{
-	  if (simple_cst_equal (TREE_VALUE (t2), TREE_VALUE (attr)) == 1)
+	  if (TREE_VALUE (t2) != NULL
+	      && TREE_CODE (TREE_VALUE (t2)) == TREE_LIST
+	      && TREE_VALUE (attr) != NULL
+	      && TREE_CODE (TREE_VALUE (attr)) == TREE_LIST)
+	    {
+	      if (simple_cst_list_equal (TREE_VALUE (t2),
+					 TREE_VALUE (attr)) == 1)
+		break;
+	    }
+	  else if (simple_cst_equal (TREE_VALUE (t2), TREE_VALUE (attr)) == 1)
 	    break;
 	}
 
       if (attr == 0)
 	return 0;
-
-      if (simple_cst_equal (TREE_VALUE (t2), TREE_VALUE (attr)) != 1)
-	return 0;
     }
 
   return 1;
--- gcc/c-typeck.c.jj	2006-08-14 13:58:27.000000000 +0200
+++ gcc/c-typeck.c	2006-08-14 19:08:03.000000000 +0200
@@ -344,6 +344,19 @@ composite_type (tree t1, tree t2)
 	return build_type_attribute_variant (t1, attributes);
       }
 
+    case ENUMERAL_TYPE:
+    case RECORD_TYPE:
+    case UNION_TYPE:
+      if (attributes != NULL)
+	{
+	  /* Try harder not to create a new aggregate type.  */
+	  if (attribute_list_equal (TYPE_ATTRIBUTES (t1), attributes))
+	    return t1;
+	  if (attribute_list_equal (TYPE_ATTRIBUTES (t2), attributes))
+	    return t2;
+	}
+      return build_type_attribute_variant (t1, attributes);
+
     case FUNCTION_TYPE:
       /* Function types: prefer the one that specified arg types.
 	 If both do, merge the arg types.  Also merge the return types.  */
@@ -818,6 +831,13 @@ comptypes_internal (tree type1, tree typ
     case UNION_TYPE:
       if (val != 1 && !same_translation_unit_p (t1, t2))
         {
+	  tree a1 = TYPE_ATTRIBUTES (t1);
+	  tree a2 = TYPE_ATTRIBUTES (t2);
+
+	  if (! attribute_list_contained (a1, a2)
+	      && ! attribute_list_contained (a2, a1))
+	    break;
+
 	  if (attrval != 2)
 	    return tagged_types_tu_compatible_p (t1, t2);
 	  val = tagged_types_tu_compatible_p (t1, t2);

gcc41-pr28709.patch:
 gcc/testsuite/gcc.dg/cpp/paste14.c |    7 +++++++
 libcpp/macro.c                     |   35 ++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 17 deletions(-)

--- NEW FILE gcc41-pr28709.patch ---
2006-08-16  Jakub Jelinek  <jakub at redhat.com>

	PR preprocessor/28709
	* macro.c (paste_tokens): Do error reporting here, use BUF with the
	spelled LHS token as opposed to spelling it again.
	(paste_all_tokens): Don't report errors here, just break on failure.

	* gcc.dg/cpp/paste14.c: New test.

--- libcpp/macro.c.jj	2006-06-09 23:07:54.000000000 +0200
+++ libcpp/macro.c	2006-08-16 17:30:17.000000000 +0200
@@ -430,15 +430,14 @@ stringify_arg (cpp_reader *pfile, macro_
 static bool
 paste_tokens (cpp_reader *pfile, const cpp_token **plhs, const cpp_token *rhs)
 {
-  unsigned char *buf, *end;
+  unsigned char *buf, *end, *lhsend;
   const cpp_token *lhs;
   unsigned int len;
-  bool valid;
 
   lhs = *plhs;
   len = cpp_token_len (lhs) + cpp_token_len (rhs) + 1;
   buf = (unsigned char *) alloca (len);
-  end = cpp_spell_token (pfile, lhs, buf, false);
+  end = lhsend = cpp_spell_token (pfile, lhs, buf, false);
 
   /* Avoid comment headers, since they are still processed in stage 3.
      It is simpler to insert a space here, rather than modifying the
@@ -455,10 +454,22 @@ paste_tokens (cpp_reader *pfile, const c
   /* Set pfile->cur_token as required by _cpp_lex_direct.  */
   pfile->cur_token = _cpp_temp_token (pfile);
   *plhs = _cpp_lex_direct (pfile);
-  valid = pfile->buffer->cur == pfile->buffer->rlimit;
-  _cpp_pop_buffer (pfile);
+  if (pfile->buffer->cur != pfile->buffer->rlimit)
+    {
+      _cpp_pop_buffer (pfile);
+      _cpp_backup_tokens (pfile, 1);
+      *lhsend = '\0';
 
-  return valid;
+      /* Mandatory error for all apart from assembler.  */
+      if (CPP_OPTION (pfile, lang) != CLK_ASM)
+	cpp_error (pfile, CPP_DL_ERROR,
+	 "pasting \"%s\" and \"%s\" does not give a valid preprocessing token",
+		   buf, cpp_token_as_text (pfile, rhs));
+      return false;
+    }
+
+  _cpp_pop_buffer (pfile);
+  return true;
 }
 
 /* Handles an arbitrarily long sequence of ## operators, with initial
@@ -490,17 +501,7 @@ paste_all_tokens (cpp_reader *pfile, con
 	abort ();
 
       if (!paste_tokens (pfile, &lhs, rhs))
-	{
-	  _cpp_backup_tokens (pfile, 1);
-
-	  /* Mandatory error for all apart from assembler.  */
-	  if (CPP_OPTION (pfile, lang) != CLK_ASM)
-	    cpp_error (pfile, CPP_DL_ERROR,
-	 "pasting \"%s\" and \"%s\" does not give a valid preprocessing token",
-		       cpp_token_as_text (pfile, lhs),
-		       cpp_token_as_text (pfile, rhs));
-	  break;
-	}
+	break;
     }
   while (rhs->flags & PASTE_LEFT);
 
--- gcc/testsuite/gcc.dg/cpp/paste14.c.jj	2006-08-16 16:51:45.000000000 +0200
+++ gcc/testsuite/gcc.dg/cpp/paste14.c	2006-08-16 16:53:30.000000000 +0200
@@ -0,0 +1,7 @@
+/* PR preprocessor/28709 */
+/* { dg-do preprocess } */
+
+#define foo - ## >>
+foo		/* { dg-error "pasting \"-\" and \">>\"" } */
+#define bar = ## ==
+bar		/* { dg-error "pasting \"=\" and \"==\"" } */

gcc41-pr28725.patch:
 env.c |   49 ++++++++++++++++++++++++++++++++++---------------
 1 files changed, 34 insertions(+), 15 deletions(-)

--- NEW FILE gcc41-pr28725.patch ---
2006-08-16  Jakub Jelinek  <jakub at redhat.com>

	PR libgomp/28725
	* env.c: Include ctype.h.
	(parse_schedule, parse_unsigned_long, parse_boolean): Allow
	leading and/or trailing whitespace and compare strings case
	insensitively.

--- libgomp/env.c.jj	2006-06-20 11:53:51.000000000 +0200
+++ libgomp/env.c	2006-08-16 13:29:24.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth at redhat.com>.
 
    This file is part of the GNU OpenMP Library (libgomp).
@@ -30,6 +30,7 @@
 
 #include "libgomp.h"
 #include "libgomp_f.h"
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
@@ -53,17 +54,19 @@ parse_schedule (void)
   if (env == NULL)
     return;
 
-  if (strncmp (env, "static", 6) == 0)
+  while (isspace ((unsigned char) *env))
+    ++env;
+  if (strncasecmp (env, "static", 6) == 0)
     {
       gomp_run_sched_var = GFS_STATIC;
       env += 6;
     }
-  else if (strncmp (env, "dynamic", 7) == 0)
+  else if (strncasecmp (env, "dynamic", 7) == 0)
     {
       gomp_run_sched_var = GFS_DYNAMIC;
       env += 7;
     }
-  else if (strncmp (env, "guided", 6) == 0)
+  else if (strncasecmp (env, "guided", 6) == 0)
     {
       gomp_run_sched_var = GFS_GUIDED;
       env += 6;
@@ -71,20 +74,20 @@ parse_schedule (void)
   else
     goto unknown;
 
+  while (isspace ((unsigned char) *env))
+    ++env;
   if (*env == '\0')
     return;
-  if (*env != ' ' && *env != ',')
+  if (*env++ != ',')
     goto unknown;
-  while (*env == ' ')
-    env++;
+  while (isspace ((unsigned char) *env))
+    ++env;
   if (*env == '\0')
-    return;
-  if (*env != ',')
-    goto unknown;
-  if (*++env == '\0')
     goto invalid;
 
   gomp_run_sched_chunk = strtoul (env, &end, 10);
+  while (isspace ((unsigned char) *end))
+    ++end;
   if (*end != '\0')
     goto invalid;
   return;
@@ -113,10 +116,14 @@ parse_unsigned_long (const char *name, u
   if (env == NULL)
     return false;
 
+  while (isspace ((unsigned char) *env))
+    ++env;
   if (*env == '\0')
     goto invalid;
 
   value = strtoul (env, &end, 10);
+  while (isspace ((unsigned char) *end))
+    ++end;
   if (*end != '\0')
     goto invalid;
 
@@ -140,11 +147,23 @@ parse_boolean (const char *name, bool *v
   if (env == NULL)
     return;
 
-  if (strcmp (env, "true") == 0)
-    *value = true;
-  else if (strcmp (env, "false") == 0)
-    *value = false;
+  while (isspace ((unsigned char) *env))
+    ++env;
+  if (strncasecmp (env, "true", 4) == 0)
+    {
+      *value = true;
+      env += 4;
+    }
+  else if (strncasecmp (env, "false", 5) == 0)
+    {
+      *value = false;
+      env += 5;
+    }
   else
+    env = "X";
+  while (isspace ((unsigned char) *env))
+    ++env;
+  if (*env != '\0')
     gomp_error ("Invalid value for environment variable %s", name);
 }
 

gcc41-pr28744.patch:
 c-common.c                                         |   16 +++----
 cgraph.h                                           |    2 
 cgraphunit.c                                       |   26 ++++++++---
 testsuite/g++.dg/parse/attr-externally-visible-1.C |   48 +++++++++++++++++++++
 testsuite/g++.dg/parse/attr-externally-visible-2.C |   38 ++++++++++++++++
 testsuite/gcc.dg/attr-externally-visible-1.c       |   48 +++++++++++++++++++++
 testsuite/gcc.dg/attr-externally-visible-2.c       |   33 ++++++++++++++
 7 files changed, 195 insertions(+), 16 deletions(-)

--- NEW FILE gcc41-pr28744.patch ---
2006-08-16  Jakub Jelinek  <jakub at redhat.com>

	PR c/28744
	* cgraph.h (struct cgraph_node): Remove externally_visible
	bitfield.
	* cgraphunit.c (process_function_and_variable_attributes): Set
	local.externally_visible rather than externally_visible.

	PR c/28744
	* c-common.c (handle_externally_visible_attribute): First look
	at TREE_CODE and only if it is function or var decl, check for
	non-public objects.  Don't warn for DECL_EXTERNAL.
	* cgraphunit.c (process_function_and_variable_attributes): Warn
	if externally_visible attribute is used on non-public object.

	* gcc.dg/attr-externally-visible-1.c: New test.
	* gcc.dg/attr-externally-visible-2.c: New test.
	* g++.dg/parse/attr-externally-visible-1.C: New test.
	* g++.dg/parse/attr-externally-visible-2.C: New test.

--- gcc/c-common.c.jj	2006-08-14 13:58:27.000000000 +0200
+++ gcc/c-common.c	2006-08-16 10:49:39.000000000 +0200
@@ -4301,16 +4301,16 @@ handle_externally_visible_attribute (tre
 {
   tree node = *pnode;
 
-  if ((!TREE_STATIC (node) && TREE_CODE (node) != FUNCTION_DECL)
-      || !TREE_PUBLIC (node))
+  if (TREE_CODE (node) == FUNCTION_DECL || TREE_CODE (node) == VAR_DECL)
     {
-      warning (OPT_Wattributes,
-	       "%qE attribute have effect only on public objects", name);
-      *no_add_attrs = true;
+      if ((!TREE_STATIC (node) && TREE_CODE (node) != FUNCTION_DECL
+	   && !DECL_EXTERNAL (node)) || !TREE_PUBLIC (node))
+	{
+	  warning (OPT_Wattributes,
+		   "%qE attribute have effect only on public objects", name);
+	  *no_add_attrs = true;
+	}
     }
-  else if (TREE_CODE (node) == FUNCTION_DECL
-	   || TREE_CODE (node) == VAR_DECL)
-    ;
   else
     {
       warning (OPT_Wattributes, "%qE attribute ignored", name);
--- gcc/cgraphunit.c.jj	2006-08-07 15:08:38.000000000 +0200
+++ gcc/cgraphunit.c	2006-08-16 11:56:56.000000000 +0200
@@ -985,9 +985,16 @@ process_function_and_variable_attributes
 	}
       if (lookup_attribute ("externally_visible", DECL_ATTRIBUTES (decl)))
 	{
-	  if (node->local.finalized)
-	    cgraph_mark_needed_node (node);
-	  node->externally_visible = true;
+	  if (! TREE_PUBLIC (node->decl))
+	    warning (OPT_Wattributes,
+		     "%J%<externally_visible%> attribute have effect only on public objects",
+		     node->decl);
+	  else
+	    {
+	      if (node->local.finalized)
+		cgraph_mark_needed_node (node);
+	      node->local.externally_visible = true;
+	    }
 	}
     }
   for (vnode = cgraph_varpool_nodes; vnode != first_var; vnode = vnode->next)
@@ -1001,9 +1008,16 @@ process_function_and_variable_attributes
 	}
       if (lookup_attribute ("externally_visible", DECL_ATTRIBUTES (decl)))
 	{
-	  if (vnode->finalized)
-	    cgraph_varpool_mark_needed_node (vnode);
-	  vnode->externally_visible = true;
+	  if (! TREE_PUBLIC (vnode->decl))
+	    warning (OPT_Wattributes,
+		     "%J%<externally_visible%> attribute have effect only on public objects",
+		     vnode->decl);
+	  else
+	    {
+	      if (vnode->finalized)
+		cgraph_varpool_mark_needed_node (vnode);
+	      vnode->externally_visible = true;
+	    }
 	}
     }
 }
--- gcc/cgraph.h.jj	2006-08-07 15:08:38.000000000 +0200
+++ gcc/cgraph.h	2006-08-16 15:05:31.000000000 +0200
@@ -157,8 +157,6 @@ struct cgraph_node GTY((chain_next ("%h.
   bool analyzed;
   /* Set when function is scheduled to be assembled.  */
   bool output;
-  /* Set when function is visible by other units.  */
-  bool externally_visible;
   /* Set for aliases once they got through assemble_alias.  */
   bool alias;
 };
--- gcc/testsuite/gcc.dg/attr-externally-visible-1.c.jj	2006-08-16 12:06:50.000000000 +0200
+++ gcc/testsuite/gcc.dg/attr-externally-visible-1.c	2006-08-16 12:07:49.000000000 +0200
@@ -0,0 +1,48 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fwhole-program" } */
+/* { dg-final { scan-assembler "foo1" } } */
+/* { dg-final { scan-assembler "foo2" } } */
+/* { dg-final { scan-assembler "foo3" } } */
+/* { dg-final { scan-assembler "foo4" } } */
+/* { dg-final { scan-assembler "foo5" } } */
+/* { dg-final { scan-assembler-not "foo6" } } */
+/* { dg-final { scan-assembler "bar1" } } */
+/* { dg-final { scan-assembler "bar2" } } */
+/* { dg-final { scan-assembler "bar3" } } */
+/* { dg-final { scan-assembler "bar4" } } */
+/* { dg-final { scan-assembler "bar5" } } */
+/* { dg-final { scan-assembler-not "bar6" } } */
+
+extern void foo1 (void) __attribute__((externally_visible));
+void foo1 (void) { }
+
+extern void foo2 (void) __attribute__((externally_visible));
+__attribute__((externally_visible)) void foo2 (void) { }
+
+extern void foo3 (void);
+__attribute__((externally_visible)) void foo3 (void) { }
+
+__attribute__((externally_visible)) void foo4 (void) { }
+
+void foo5 (void) { }
+extern void foo5 (void) __attribute__((externally_visible));
+
+void foo6 (void) { }
+
+extern char *bar1 __attribute__((externally_visible));
+char *bar1;
+
+extern char *bar2 __attribute__((externally_visible));
+char *bar2 __attribute__((externally_visible));
+
+extern char *bar3;
+char *bar3 __attribute__((externally_visible));
+
+char *bar4 __attribute__((externally_visible));
+
+char *bar5;
+extern char *bar5 __attribute__((externally_visible));
+
+char *bar6;
+
+int main (void) { }
--- gcc/testsuite/gcc.dg/attr-externally-visible-2.c.jj	2006-08-16 12:06:53.000000000 +0200
+++ gcc/testsuite/gcc.dg/attr-externally-visible-2.c	2006-08-16 12:12:43.000000000 +0200
@@ -0,0 +1,33 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fwhole-program" } */
+
+static void foo1 (void) { }					/* { dg-warning "have effect only on public" } */
+extern void foo1 (void) __attribute__((externally_visible));
+
+void foo2 (void)
+{
+  __attribute__((externally_visible)) void foo3 (void) { }	/* { dg-warning "have effect only on public" } */
+}
+
+__attribute__((externally_visible)) static void foo3 (void) { }	/* { dg-warning "have effect only on public" } */
+
+static int bar1;
+extern int bar1 __attribute__((externally_visible));		/* { dg-warning "have effect only on public" } */
+
+static int bar2 __attribute__((externally_visible));		/* { dg-warning "have effect only on public" } */
+
+void fn1 (void)
+{
+  static int bar3 __attribute__((externally_visible));		/* { dg-warning "have effect only on public" } */
+}
+
+void fn2 (void)
+{
+  int bar4 __attribute__((externally_visible));			/* { dg-warning "have effect only on public" } */
+}
+
+struct A
+{
+} __attribute__((externally_visible));				/* { dg-warning "does not apply to types" } */
+
+typedef int B __attribute__((externally_visible));		/* { dg-warning "attribute ignored" } */
--- gcc/testsuite/g++.dg/parse/attr-externally-visible-1.C.jj	2006-08-16 12:06:50.000000000 +0200
+++ gcc/testsuite/g++.dg/parse/attr-externally-visible-1.C	2006-08-16 12:16:01.000000000 +0200
@@ -0,0 +1,48 @@
+// { dg-do compile }
+// { dg-options "-O3 -fwhole-program" }
+// { dg-final { scan-assembler "foo1" } }
+// { dg-final { scan-assembler "foo2" } }
+// { dg-final { scan-assembler "foo3" } }
+// { dg-final { scan-assembler "foo4" } }
+// { dg-final { scan-assembler "foo5" } }
+// { dg-final { scan-assembler-not "foo6" } }
+// { dg-final { scan-assembler "bar1" } }
+// { dg-final { scan-assembler "bar2" } }
+// { dg-final { scan-assembler "bar3" } }
+// { dg-final { scan-assembler "bar4" } }
+// { dg-final { scan-assembler "bar5" } }
+// { dg-final { scan-assembler-not "bar6" } }
+
+extern void foo1 (void) __attribute__((externally_visible));
+void foo1 (void) { }
+
+extern void foo2 (void) __attribute__((externally_visible));
+__attribute__((externally_visible)) void foo2 (void) { }
+
+extern void foo3 (void);
+__attribute__((externally_visible)) void foo3 (void) { }
+
+__attribute__((externally_visible)) void foo4 (void) { }
+
+void foo5 (void) { }
+extern void foo5 (void) __attribute__((externally_visible));
+
+void foo6 (void) { }
+
+extern char *bar1 __attribute__((externally_visible));
+char *bar1;
+
+extern char *bar2 __attribute__((externally_visible));
+char *bar2 __attribute__((externally_visible));
+
+extern char *bar3;
+char *bar3 __attribute__((externally_visible));
+
+char *bar4 __attribute__((externally_visible));
+
+char *bar5;
+extern char *bar5 __attribute__((externally_visible));
+
+char *bar6;
+
+int main (void) { }
--- gcc/testsuite/g++.dg/parse/attr-externally-visible-2.C.jj	2006-08-16 12:06:53.000000000 +0200
+++ gcc/testsuite/g++.dg/parse/attr-externally-visible-2.C	2006-08-16 12:21:05.000000000 +0200
@@ -0,0 +1,38 @@
+// { dg-do compile }
+// { dg-options "-O -fwhole-program" }
+
+static void foo1 (void) { }					// { dg-warning "have effect only on public" }
+extern void foo1 (void) __attribute__((externally_visible));
+
+struct C
+{
+  __attribute__((externally_visible)) void foo3 (void) { }
+};
+
+__attribute__((externally_visible)) static void foo3 (void) { }	// { dg-warning "have effect only on public" }
+
+static int bar1;
+extern int bar1 __attribute__((externally_visible));		// { dg-warning "have effect only on public" }
+
+static int bar2 __attribute__((externally_visible));		// { dg-warning "have effect only on public" }
+
+void fn1 (void)
+{
+  static int bar3 __attribute__((externally_visible));		// { dg-warning "have effect only on public" }
+}
+
+void fn2 (void)
+{
+  int bar4 __attribute__((externally_visible));			// { dg-warning "have effect only on public" }
+}
+
+struct A
+{
+} __attribute__((externally_visible));				// { dg-warning "does not apply to types" }
+
+typedef int B __attribute__((externally_visible));		// { dg-warning "attribute ignored" }
+
+struct D
+{
+  static int d __attribute__((externally_visible));
+};


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- .cvsignore	11 Aug 2006 20:58:28 -0000	1.164
+++ .cvsignore	16 Aug 2006 18:08:42 -0000	1.165
@@ -1 +1 @@
-gcc-4.1.1-20060811.tar.bz2
+gcc-4.1.1-20060816.tar.bz2

gcc41-rh200887.patch:
 0 files changed

Index: gcc41-rh200887.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-rh200887.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-rh200887.patch	12 Aug 2006 05:31:39 -0000	1.2
+++ gcc41-rh200887.patch	16 Aug 2006 18:08:42 -0000	1.3
@@ -17,7 +17,7 @@
 +	rm -rf META-INF; \
 +	find -type f | xargs touch -r ../$$JARDIR.stamp; \
 +	find -type d | xargs touch -r ../$$JARDIR.stamp; \
-+	find * | LC_ALL=C sort | $(JAR) -cf at E ../$@ || exit 1; \
++	find * | LC_ALL=C sort | $(JAR) -cfM at E ../$@ || exit 1; \
 +	cd ..; \
 +	rm -rf $$JARDIR $$JARDIR.stamp
  
@@ -42,7 +42,7 @@
 +	rm -rf META-INF; \
 +	find -type f | xargs touch -r ../$$JARDIR.stamp; \
 +	find -type d | xargs touch -r ../$$JARDIR.stamp; \
-+	find * | LC_ALL=C sort | $(JAR) -cf at E ../$@ || exit 1; \
++	find * | LC_ALL=C sort | $(JAR) -cfM at E ../$@ || exit 1; \
 +	cd ..; \
 +	rm -rf $$JARDIR $$JARDIR.stamp
  


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gcc41.spec	12 Aug 2006 05:31:39 -0000	1.92
+++ gcc41.spec	16 Aug 2006 18:08:42 -0000	1.93
@@ -1,6 +1,6 @@
-%define DATE 20060811
+%define DATE 20060816
 %define gcc_version 4.1.1
-%define gcc_release 16
+%define gcc_release 17
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -127,7 +127,7 @@
 Patch20: gcc41-ppc64-ldouble-stdarg.patch
 Patch21: gcc41-pr25874.patch
 Patch22: gcc41-pr26881.patch
-Patch23: gcc41-pr27793.patch
+Patch23: gcc41-i386-tune-geode.patch
 Patch24: gcc41-pr26885.patch
 Patch25: gcc41-hash-style-gnu.patch
 Patch26: gcc41-visibility.patch
@@ -139,6 +139,11 @@
 Patch32: gcc41-pr28600.patch
 Patch33: gcc41-rh200887.patch
 Patch34: gcc41-pr27827-test.patch
+Patch35: gcc41-pr25795.patch
+Patch36: gcc41-pr28706.patch
+Patch37: gcc41-pr28725.patch
+Patch38: gcc41-pr28709.patch
+Patch39: gcc41-pr28744.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -442,7 +447,7 @@
 %patch20 -p0 -b .ppc64-ldouble-stdarg~
 %patch21 -p0 -b .pr25874~
 %patch22 -p0 -b .pr26881~
-%patch23 -p0 -b .pr27793~
+%patch23 -p0 -b .i386-tune-geode~
 %patch24 -p0 -b .pr26885~
 %patch25 -p0 -b .hash-style-gnu~
 %patch26 -p0 -b .visibility~
@@ -454,6 +459,11 @@
 %patch32 -p0 -b .pr28600~
 %patch33 -p0 -b .rh200887~
 %patch34 -p0 -b .pr27827-test~
+%patch35 -p0 -b .pr25795~
+%patch36 -p0 -b .pr28706~
+%patch37 -p0 -b .pr28725~
+%patch38 -p0 -b .pr28709~
+%patch39 -p0 -b .pr28744~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -503,7 +513,7 @@
 OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'`
 %ifarch sparc sparc64
-OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'`
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g;s/-mcpu=v[78]//g'`
 %endif
 %ifarch sparc64
 cat > gcc64 <<"EOF"
@@ -1514,6 +1524,22 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Aug 16 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-17
+- update from gcc-4_1-branch (-r116082:116176)
+  - PRs c++/27894, c++/28677, c/28649, middle-end/28075,
+	rtl-optimization/23454
+- merge gomp fixes from the trunk (-r116152:116154)
+  - PRs middle-end/28713, middle-end/28724
+- add -march=geode and -mtune=geode support (Vlad Makarov)
+- don't create jar manifest in libgcj-tools-4.*.jar (#200887)
+- externally_visible attribute fixes (Jan Hubicka, PRs c/25795, c++/27369)
+- --combine fixes for aggregates with attributes (PRs c/28706, c/28712)
+- further externally_visible attr fixes (PR c/28744)
+- fix invalid token pasting error message (PR preprocessor/28709)
+- obey OpenMP 2.5 chapter 4 env var requirements (whitespace rules
+  and case insensitivity in the env vars; PR libgomp/28725)
+- fix OPT_FLAGS on sparc
+
 * Sat Aug 12 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-16
 - fix multilib conflict in libgcj-tools-4.1.1.jar (#200887)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- sources	11 Aug 2006 20:58:28 -0000	1.166
+++ sources	16 Aug 2006 18:08:42 -0000	1.167
@@ -1 +1 @@
-5ef7a43629890be560c67e4354701824  gcc-4.1.1-20060811.tar.bz2
+3743f891cb127e18bca681d57c07a2c0  gcc-4.1.1-20060816.tar.bz2


--- gcc41-pr27793.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 16 18:14:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 14:14:07 -0400
Subject: rpms/postgresql-jdbc/devel postgresql-jdbc.spec,1.7,1.8
Message-ID: <200608161814.k7GIE7jt030574@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/postgresql-jdbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30403

Modified Files:
	postgresql-jdbc.spec 
Log Message:
Define gcj_support in the usual location




Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- postgresql-jdbc.spec	16 Aug 2006 16:59:42 -0000	1.7
+++ postgresql-jdbc.spec	16 Aug 2006 18:14:05 -0000	1.8
@@ -28,11 +28,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define _gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define section		devel
 %define upstreamver	8.1-407
-%define gcj_support	1
 
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc



From fedora-cvs-commits at redhat.com  Wed Aug 16 18:17:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 14:17:39 -0400
Subject: rpms/gcc/devel gcc41.spec, 1.93, 1.94 gcc41-pr27827-test.patch, 1.1,
	NONE
Message-ID: <200608161817.k7GIHdPW011420@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41.spec 
Removed Files:
	gcc41-pr27827-test.patch 
Log Message:
4.1.1-17


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gcc41.spec	16 Aug 2006 18:08:42 -0000	1.93
+++ gcc41.spec	16 Aug 2006 18:17:37 -0000	1.94
@@ -138,12 +138,11 @@
 Patch31: gcc41-java-libdotdotlib.patch
 Patch32: gcc41-pr28600.patch
 Patch33: gcc41-rh200887.patch
-Patch34: gcc41-pr27827-test.patch
-Patch35: gcc41-pr25795.patch
-Patch36: gcc41-pr28706.patch
-Patch37: gcc41-pr28725.patch
-Patch38: gcc41-pr28709.patch
-Patch39: gcc41-pr28744.patch
+Patch34: gcc41-pr25795.patch
+Patch35: gcc41-pr28706.patch
+Patch36: gcc41-pr28725.patch
+Patch37: gcc41-pr28709.patch
+Patch38: gcc41-pr28744.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -458,12 +457,11 @@
 %patch31 -p0 -b .java-libdotdotlib~
 %patch32 -p0 -b .pr28600~
 %patch33 -p0 -b .rh200887~
-%patch34 -p0 -b .pr27827-test~
-%patch35 -p0 -b .pr25795~
-%patch36 -p0 -b .pr28706~
-%patch37 -p0 -b .pr28725~
-%patch38 -p0 -b .pr28709~
-%patch39 -p0 -b .pr28744~
+%patch34 -p0 -b .pr25795~
+%patch35 -p0 -b .pr28706~
+%patch36 -p0 -b .pr28725~
+%patch37 -p0 -b .pr28709~
+%patch38 -p0 -b .pr28744~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c


--- gcc41-pr27827-test.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 16 18:28:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 14:28:16 -0400
Subject: rpms/gcc/devel gcc41-x86_64-kernel-ssp.patch, NONE, 1.1 gcc41.spec,
	1.94, 1.95
Message-ID: <200608161828.k7GISGdR017857@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-x86_64-kernel-ssp.patch 
Log Message:
4.1.1-17

gcc41-x86_64-kernel-ssp.patch:
 0 files changed

--- NEW FILE gcc41-x86_64-kernel-ssp.patch ---
2006-07-27  Arjan van de Ven <arjan at linux.intel.com>

	* config/i386/i386.md (stack_tls_protect_set_di) Use %gs rather than
	%fs for -mcmodel=kernel.
	(stack_tls_protect_test_di): Likewise.

	* gcc.target/i386/stack-prot-kernel.c: New test.

--- gcc/config/i386/i386.md	(revision 115781)
+++ gcc/config/i386/i386.md	(revision 115782)
@@ -20393,7 +20393,15 @@ (define_insn "stack_tls_protect_set_di"
    (set (match_scratch:DI 2 "=&r") (const_int 0))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
-  "mov{q}\t{%%fs:%P1, %2|%2, QWORD PTR %%fs:%P1}\;mov{q}\t{%2, %0|%0, %2}\;xor{l}\t%k2, %k2"
+  {
+     /* The kernel uses a different segment register for performance reasons; a
+        system call would not have to trash the userspace segment register,
+        which would be expensive */
+     if (ix86_cmodel != CM_KERNEL)
+        return "mov{q}\t{%%fs:%P1, %2|%2, QWORD PTR %%fs:%P1}\;mov{q}\t{%2, %0|%0, %2}\;xor{l}\t%k2, %k2";
+     else
+        return "mov{q}\t{%%gs:%P1, %2|%2, QWORD PTR %%gs:%P1}\;mov{q}\t{%2, %0|%0, %2}\;xor{l}\t%k2, %k2";
+  }
   [(set_attr "type" "multi")])
 
 (define_expand "stack_protect_test"
@@ -20461,7 +20469,15 @@ (define_insn "stack_tls_protect_test_di"
 		    UNSPEC_SP_TLS_TEST))
    (clobber (match_scratch:DI 3 "=r"))]
   "TARGET_64BIT"
-  "mov{q}\t{%1, %3|%3, %1}\;xor{q}\t{%%fs:%P2, %3|%3, QWORD PTR %%fs:%P2}"
+  {
+     /* The kernel uses a different segment register for performance reasons; a
+        system call would not have to trash the userspace segment register,
+        which would be expensive */
+     if (ix86_cmodel != CM_KERNEL)
+        return "mov{q}\t{%1, %3|%3, %1}\;xor{q}\t{%%fs:%P2, %3|%3, QWORD PTR %%fs:%P2}";
+     else
+        return "mov{q}\t{%1, %3|%3, %1}\;xor{q}\t{%%gs:%P2, %3|%3, QWORD PTR %%gs:%P2}";
+  }
   [(set_attr "type" "multi")])
 
 (include "sse.md")
--- gcc/testsuite/gcc.target/i386/stack-prot-kernel.c	(revision 0)
+++ gcc/testsuite/gcc.target/i386/stack-prot-kernel.c	(revision 115782)
@@ -0,0 +1,12 @@
+/* { dg-do compile { target lp64 } } */
+/* { dg-options "-O2 -fstack-protector-all -mcmodel=kernel" } */
+
+void test1 (int x)
+{
+  char p[40];
+  int i;
+  for (i=0; i<40; i++)
+	p[i] = x;
+}
+
+/* { dg-final { scan-assembler-not "%fs" } } */


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gcc41.spec	16 Aug 2006 18:17:37 -0000	1.94
+++ gcc41.spec	16 Aug 2006 18:28:12 -0000	1.95
@@ -143,6 +143,7 @@
 Patch36: gcc41-pr28725.patch
 Patch37: gcc41-pr28709.patch
 Patch38: gcc41-pr28744.patch
+Patch39: gcc41-x86_64-kernel-ssp.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -462,6 +463,7 @@
 %patch36 -p0 -b .pr28725~
 %patch37 -p0 -b .pr28709~
 %patch38 -p0 -b .pr28744~
+%patch39 -p0 -b .x86_64-kernel-ssp~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1529,6 +1531,8 @@
 - merge gomp fixes from the trunk (-r116152:116154)
   - PRs middle-end/28713, middle-end/28724
 - add -march=geode and -mtune=geode support (Vlad Makarov)
+- use %gs rather than %fs register on x86_64 with
+  -mcmodel=kernel -fstack-protector (Arjan van de Ven, #202842)
 - don't create jar manifest in libgcj-tools-4.*.jar (#200887)
 - externally_visible attribute fixes (Jan Hubicka, PRs c/25795, c++/27369)
 - --combine fixes for aggregates with attributes (PRs c/28706, c/28712)



From fedora-cvs-commits at redhat.com  Wed Aug 16 18:34:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 14:34:11 -0400
Subject: rpms/gnu-crypto/devel gnu-crypto-configure.patch, NONE,
	1.1 gnu-crypto-makefile.patch, NONE,
	1.1 gnu-crypto-security-Makefile.am, NONE,
	1.1 gnu-crypto-sources-Makefile.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 gnu-crypto.spec, 1.26, 1.27 sources, 1.3, 1.4
Message-ID: <200608161834.k7GIYBUS019375@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/gnu-crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19301

Modified Files:
	.cvsignore gnu-crypto.spec sources 
Added Files:
	gnu-crypto-configure.patch gnu-crypto-makefile.patch 
	gnu-crypto-security-Makefile.am 
	gnu-crypto-sources-Makefile.patch 
Log Message:
Merge with upstream version


gnu-crypto-configure.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnu-crypto-configure.patch ---
--- /home/mwringe/tmp/gnu-crypto/gnu-crypto-2.1.0/configure.ac	2005-10-22 03:22:40.000000000 -0400
+++ configure.ac	2006-08-15 18:44:19.000000000 -0400
@@ -106,6 +106,6 @@
 
 # -----------------------------------------------------------------------------
 
-AC_CONFIG_FILES([Makefile source/Makefile source/gnu/crypto/Registry.java source/gnu/testlet/config.java source/mauve-gnu-crypto docs/Makefile docs/diagrams/Makefile])
+AC_CONFIG_FILES([Makefile source/Makefile security/Makefile source/gnu/crypto/Registry.java source/gnu/testlet/config.java source/mauve-gnu-crypto docs/Makefile docs/diagrams/Makefile])
 
 AC_OUTPUT

gnu-crypto-makefile.patch:
 Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gnu-crypto-makefile.patch ---
--- /home/mwringe/tmp/gnu-crypto/gnu-crypto-2.1.0/Makefile.am	2006-08-15 22:04:31.000000000 -0400
+++ Makefile.am	2006-08-15 22:04:09.000000000 -0400
@@ -87,7 +87,7 @@
 #   JGSS_SUBDIR =
 # endif
 
-SUBDIRS = source docs
+SUBDIRS = source security docs
 
 # test vector generation targets ----------------------------------------------
 
@@ -110,6 +110,7 @@
 
 gnu-crypto-$(VERSION)-bin.tar.gz gnu-crypto-$(VERSION)-bin.tar.bz2 gnu-crypto-$(VERSION)-bin.zip: BUILD
 	$(MAKE) -C source
+	$(MAKE) -C security
 	$(MAKE) -C docs pdf
 	makeinfo $(srcdir)/docs/gnu-crypto.texi
 	-rm -rf gnu-crypto-$(VERSION)-bin


***** Error reading new file: [Errno 2] No such file or directory: 'gnu-crypto-security-Makefile.am'
gnu-crypto-sources-Makefile.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnu-crypto-sources-Makefile.patch ---
--- /home/mwringe/tmp/gnu-crypto/gnu-crypto-2.1.0/source/Makefile.am	2005-10-22 03:17:11.000000000 -0400
+++ source/Makefile.am	2006-08-16 00:50:31.000000000 -0400
@@ -1448,7 +1448,7 @@
 SUFFIXES = .java .lo .o .obj .class .jar
 
 $(main_classes): classes/%.class: $(srcdir)/%.java
-	CLASSPATH=$(extra_classpath)$(PS)$(der_jar) $(JAVAC) $(JAVACFLAGS) -sourcepath $(srcdir):. -d classes $<
+	CLASSPATH=$(extra_classpath)$(PS)$(der_jar) $(JAVAC) $(JAVACFLAGS) -sourcepath $(srcdir):.:../security/ -d classes $<
 
 classes/gnu/crypto/Registry.class: gnu/crypto/Registry.java
 	CLASSPATH=$(extra_classpath)$(PS)$(der_jar) $(JAVAC) $(JAVACFLAGS) -sourcepath $(srcdir):. -d classes $<


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Feb 2006 02:34:56 -0000	1.5
+++ .cvsignore	16 Aug 2006 18:34:00 -0000	1.6
@@ -1 +1,2 @@
 gnu-crypto-2.1.0.tar.bz2
+classpath-0.92.tar.gz


Index: gnu-crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/gnu-crypto.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnu-crypto.spec	22 Jul 2006 08:39:21 -0000	1.26
+++ gnu-crypto.spec	16 Aug 2006 18:34:00 -0000	1.27
@@ -1,8 +1,40 @@
-%define gcj_support 1
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 Name:           gnu-crypto
 Version:        2.1.0
-Release:        1jpp_4fc
+Release:        2jpp.1
 Epoch:          0
 Summary:        GNU Crypto library for Java
 
@@ -10,13 +42,15 @@
 License:        GPL with library exception
 URL:            http://www.gnu.org/software/gnu-crypto/
 Source0:        http://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.1.0.tar.bz2
-# Patch0:         %{name}-crosslink.patch
-# javax.security.auth.* is already in J2SE >= 1.4.
-Patch1:         %{name}-noauth.patch
-# Patch2:         %{name}-gcc41.patch
+Source1:	ftp://ftp.gnu.org/gnu/classpath/classpath-0.92.tar.gz	
+Source2:	gnu-crypto-security-Makefile.am
+Patch0:		%{name}-makefile.patch
+Patch1:         %{name}-configure.patch
+Patch2:		%{name}-sources-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ant, java-devel >= 0:1.4
+BuildRequires:  java-devel >= 0:1.4
+BuildRequires:  automake autoconf
 %if !%{gcj_support}
 Requires:       java >= 0:1.4
 Requires(post): jpackage-utils >= 0:1.6.3-1jpp_1rh
@@ -41,11 +75,19 @@
 implementations of cryptographic primitives and tools in the Java
 programming language for use by programmers and end-users.
 
+%package        sasl-jdk1.4
+Summary:        Gnu Crypto SASL API
+Group:          Security/Cryptography
+Provides:       java-sasl
+
+%description    sasl-jdk1.4
+%{summary}.
+
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Prereq: coreutils
+Requires(post): /bin/rm /bin/ln
 
 %description    javadoc
 %{summary}.
@@ -53,14 +95,16 @@
 
 %prep
 %setup -q
-# %patch0 -p0
-%if !%{gcj_support}
+%patch0 -p0
 %patch1 -p0
-%endif
-# %patch2 -p1 -b .orig
-
+%patch2 -p0
+tar xzf %{SOURCE1}
+mkdir -p security/javax/security
+mv classpath-0.92/javax/security/sasl security/javax/security
+cp %{SOURCE2} security/Makefile.am
 
 %build
+./autogen.sh
 %configure
 make
 
@@ -73,6 +117,8 @@
 %endif
 
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}
+install -dm 755 $RPM_BUILD_ROOT%{_javadir}-ext
+install -dm 755 $RPM_BUILD_ROOT%{_javadir}-1.4.2
 install -pm 644 source/gnu-crypto.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
@@ -82,12 +128,17 @@
   $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-%{version}.jar
 %endif
 
+install -pm 644 security/javax-security.jar \
+  $RPM_BUILD_ROOT%{_javadir}-ext/%{name}-sasl-jdk1.4.jar
+ln -s %{_javadir}-ext/%{name}-sasl-jdk1.4.jar \
+    $RPM_BUILD_ROOT%{_javadir}-1.4.2/sasl.jar
+
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pR source/overview.html $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %if %{gcj_support}
-aot-compile-rpm
+%{_bindir}/aot-compile-rpm
 %endif
 
 %check || :
@@ -97,7 +148,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %if %{gcj_support}
 %post
 if [ -x %{_bindir}/rebuild-security-providers ]
@@ -136,6 +186,15 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 %endif
 
+%files sasl-jdk1.4
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog COPYING README THANKS
+%{_javadir}-ext/%{name}-sasl-jdk1.4.jar
+%{_javadir}-1.4.2/sasl.jar
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-sasl-jdk1.4.jar.*
+%endif
+
 %files javadoc
 %defattr(644,root,root,755)
 %doc %{_javadocdir}/%{name}-%{version}
@@ -143,12 +202,29 @@
 
 
 %changelog
+* Sat Aug 12 2006 Matt Wringe <mwringe at redhat.com> - 0:2.1.0-2jpp.1
+- Merge with upstream version
+
+* Sat Aug 12 2006 Matt Wringe <mwringe at redhat.com> - 0:2.1.0-2jpp
+- Add the sasl classes from GNU Classpath to build the sasl-jdk1.4
+  package as this has been removed from gnu-crypto 2.1.0 sources.
+- gnu-crypto-noarch.patch no longer applies as ant is no longer used
+- Update to 2.1.0
+- From Thomas Fitzsimmons <fitzsim at redhat.com>:
+  - Add gcj endorsed dir support.
+  - Add GnuCrypto security provider to classpath.security
+  - Call rebuild-security-providers and rebuild-gcj-db-conditionally on
+    their existence.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.1.0-1jpp_4fc
 - Rebuilt
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.1.0-1jpp_3fc
 - rebuild
 
+* Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.0.1-2jpp
+- First JPP 1.7 build
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:2.1.0-1jpp_2fc
 - stop scriptlet spew
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Feb 2006 02:34:56 -0000	1.3
+++ sources	16 Aug 2006 18:34:01 -0000	1.4
@@ -1 +1,2 @@
 f1ecdf394d3324c52bde35c134d7b098  gnu-crypto-2.1.0.tar.bz2
+4603ef3e593713d94788b919bc0b6c75  classpath-0.92.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 16 19:21:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 15:21:59 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.125, 1.126 mkinitrd.spec, 1.153,
	1.154 sources, 1.152, 1.153
Message-ID: <200608161921.k7GJLxqI029725@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29664

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.1.7-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- .cvsignore	15 Aug 2006 03:12:22 -0000	1.125
+++ .cvsignore	16 Aug 2006 19:21:57 -0000	1.126
@@ -1 +1,2 @@
-mkinitrd-5.1.6.tar.bz2
+mkinitrd-5.1.7.tar.bz2
+bdevid-0.4.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- mkinitrd.spec	15 Aug 2006 03:12:22 -0000	1.153
+++ mkinitrd.spec	16 Aug 2006 19:21:57 -0000	1.154
@@ -3,7 +3,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.1.6
+Version: 5.1.7
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -28,6 +28,7 @@
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
 Provides: libbdevid = %{version}-%{release}
+Obsoletes: libbdevid < %{version}-%{release}
 
 %description
 Mkinitrd creates filesystem images for use as initial ramdisk (initrd)
@@ -117,8 +118,14 @@
 /%{python_sitelib}/bdevid.so
 
 %changelog
+* Wed Aug 16 2006 Peter Jones <pjones at redhat.com> - 5.1.7-1
+- Make "stabilized" work better (patch from Alexandre Oliva)
+- Rewrite usb handling (notting and pjones)
+- Fix libbdevid provides/obsoletes.
+- Include usb hcd drivers by default
+
 * Mon Aug 14 2006 Bill Nottingham <notting at redhat.com> - 5.1.6-1
-- don't make every loop device /dev/loop0. Eep.
+- don't make every root device /dev/loop0. Eep.
 
 * Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 5.1.5-1
 - Provide libbdevid.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- sources	15 Aug 2006 03:12:22 -0000	1.152
+++ sources	16 Aug 2006 19:21:57 -0000	1.153
@@ -1,2 +1,2 @@
 d963851dff275f0af392cb25d3ad45fd  bdevid-0.4.tar.bz2
-dc69d9c492ce98d3630bc8ceeb13bb10  mkinitrd-5.1.6.tar.bz2
+de6276555a347fe6179d7d54fedf1128  mkinitrd-5.1.7.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 16 19:28:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 15:28:44 -0400
Subject: rpms/NetworkManager/devel NetworkManager-0.7.0-shhh.patch, NONE,
	1.1 NetworkManager.spec, 1.117, 1.118
Message-ID: <200608161928.k7GJSitq032346@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32265

Modified Files:
	NetworkManager.spec 
Added Files:
	NetworkManager-0.7.0-shhh.patch 
Log Message:
- add patch to make networkmanager less verbose (bug 202832)


NetworkManager-0.7.0-shhh.patch:
 nm-device-802-11-wireless.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE NetworkManager-0.7.0-shhh.patch ---
--- NetworkManager-0.6.3-orig/src/nm-device-802-11-wireless.c 2006-06-07 23:30:25.000000000 +0600
+++ NetworkManager-0.6.3/src/nm-device-802-11-wireless.c 2006-06-09 20:05:21.000000000 +0600
@@ -2424,16 +2424,15 @@
 supplicant_exec (NMDevice80211Wireless *self)
 {
 	gboolean	success = FALSE;
-	char *	argv[5];
+	char *	argv[4];
 	GError *	error = NULL;
 	GPid		pid = -1;
 	int		sup_stdout;
 
 	argv[0] = WPA_SUPPLICANT_BIN;
-	argv[1] = "-dd";
-	argv[2] = "-g";
-	argv[3] = WPA_SUPPLICANT_GLOBAL_SOCKET;
-	argv[4] = NULL;
+	argv[1] = "-g";
+	argv[2] = WPA_SUPPLICANT_GLOBAL_SOCKET;
+	argv[3] = NULL;
 
 	success = g_spawn_async_with_pipes ("/", argv, NULL, 0,
NULL, NULL,
 	                    &pid, NULL, &sup_stdout, NULL,
&error);


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- NetworkManager.spec	9 Aug 2006 16:18:19 -0000	1.117
+++ NetworkManager.spec	16 Aug 2006 19:28:42 -0000	1.118
@@ -16,13 +16,14 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.7.0
-Release: 0%{?nm_cvs_version}.5
+Release: 0%{?nm_cvs_version}.6
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
 Patch0: NetworkManager-0.7.0-dbus-deprecated.patch
 Patch1: NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch
+Patch2: NetworkManager-0.7.0-shhh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 PreReq:   chkconfig
@@ -120,6 +121,7 @@
 %setup -q
 %patch0 -p1 -b .dbus-deprecated
 %patch1 -p1 -b .dont-choose-inactive-wired-device
+%patch2 -p1 -b .shhhh
 
 %build
 %configure \
@@ -218,6 +220,9 @@
 
 
 %changelog
+* Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> - 0.7.0-0.cvs20060529.6
+- add patch to make networkmanager less verbose (bug 202832)
+
 * Wed Aug  9 2006 Ray Strode <rstrode at redhat.com> - 0.7.0-0.cvs20060529.5
 - actually make the patch in 0.7.0-0.cvs20060529.4 apply
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 19:35:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 15:35:24 -0400
Subject: rpms/NetworkManager/devel NetworkManager-0.7.0-shhh.patch,1.1,1.2
Message-ID: <200608161935.k7GJZOOO001263@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1212

Modified Files:
	NetworkManager-0.7.0-shhh.patch 
Log Message:
demalform patch


NetworkManager-0.7.0-shhh.patch:
 nm-device-802-11-wireless.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

Index: NetworkManager-0.7.0-shhh.patch
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager-0.7.0-shhh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NetworkManager-0.7.0-shhh.patch	16 Aug 2006 19:28:42 -0000	1.1
+++ NetworkManager-0.7.0-shhh.patch	16 Aug 2006 19:35:12 -0000	1.2
@@ -19,7 +19,4 @@
 +	argv[2] = WPA_SUPPLICANT_GLOBAL_SOCKET;
 +	argv[3] = NULL;
  
- 	success = g_spawn_async_with_pipes ("/", argv, NULL, 0,
-NULL, NULL,
- 	                    &pid, NULL, &sup_stdout, NULL,
-&error);
+ 	success = g_spawn_async_with_pipes ("/", argv, NULL, 0, NULL, NULL, &pid, NULL, &sup_stdout, NULL, &error);



From fedora-cvs-commits at redhat.com  Wed Aug 16 20:01:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 16:01:51 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.7.91-maybe-fix-crash.patch, NONE,
	1.1 evolution-data-server.spec, 1.113, 1.114
Message-ID: <200608162001.k7GK1pDW028679@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28649

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.7.91-maybe-fix-crash.patch 
Log Message:
- Add fix from Matthias Clasen that might help bug 202309.


evolution-data-server-1.7.91-maybe-fix-crash.patch:
 camel-imap-search.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE evolution-data-server-1.7.91-maybe-fix-crash.patch ---
--- evolution-data-server-1.7.91/camel/providers/imap/camel-imap-search.c.maybe-fix-crash	2006-08-16 15:56:44.000000000 -0400
+++ evolution-data-server-1.7.91/camel/providers/imap/camel-imap-search.c	2006-08-16 15:57:09.000000000 -0400
@@ -342,8 +342,6 @@ sync_match(CamelImapSearch *is, struct _
 		}
 		g_string_append_c (search, '"');
 	}
-	camel_search_words_free (words);
-	
 	/* We only try search using utf8 if its non us-ascii text? */
 	if ((words->type & CAMEL_SEARCH_WORD_8BIT) &&  (store->capabilities & IMAP_CAPABILITY_utf8_search)) {
 		response = camel_imap_command (store, folder, NULL,
@@ -352,6 +350,8 @@ sync_match(CamelImapSearch *is, struct _
 		if (response == NULL)
 			store->capabilities &= ~IMAP_CAPABILITY_utf8_search;
 	}
+	camel_search_words_free (words);
+	
 	if (response == NULL)
 		response = camel_imap_command (store, folder, NULL,
 					       "UID SEARCH %s", search->str);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- evolution-data-server.spec	14 Aug 2006 16:39:54 -0000	1.113
+++ evolution-data-server.spec	16 Aug 2006 20:01:46 -0000	1.114
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.91
-Release: 2
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -41,6 +41,9 @@
 # RH bug #202329 / Gnome.org bug #351317
 Patch15: evolution-data-server-1.7.91-fix-edataserverui-libs.patch
 
+# RH bug #202309
+Patch16: evolution-data-server-1.7.91-may-fix-crash.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -123,6 +126,7 @@
 %patch13 -p1 -b .fix-implicit-function-declarations
 %patch14 -p1 -b .make_imap4_optional
 %patch15 -p1 -b .fix-edataserverui-libs
+%patch16 -p1 -b .maybe-fix-crash
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -325,6 +329,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> - 1.7.91-3
+- Add fix from Matthias Clasen that might help bug 202309.
+
 * Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.91-2
 - Add patch for RH bug #202329.
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 20:08:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 16:08:50 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.321, 1.322 anaconda.spec, 1.447,
	1.448 sources, 1.444, 1.445
Message-ID: <200608162008.k7GK8oPm028898@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28872/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.83-1 on branch devel from anaconda-11.1.0.83-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- .cvsignore	15 Aug 2006 18:55:20 -0000	1.321
+++ .cvsignore	16 Aug 2006 20:08:48 -0000	1.322
@@ -1,3 +1 @@
-anaconda-11.1.0.80.tar.bz2
-anaconda-11.1.0.81.tar.bz2
-anaconda-11.1.0.82.tar.bz2
+anaconda-11.1.0.83.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- anaconda.spec	15 Aug 2006 18:55:20 -0000	1.447
+++ anaconda.spec	16 Aug 2006 20:08:48 -0000	1.448
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.82
+Version: 11.1.0.83
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Aug 16 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.83-1
+- Fix text timezone typo (clumens, #202844)
+- Some installclass tweaking
+- Fix nfsiso to handle changing repopaths
+- Fix x86_64 install traceback (#202660)
+- Adjust for new theme
+
 * Tue Aug 15 2006 Chris Lumens <clumens at redhat.com> 11.1.0.82-1
 - Make Turkish translation build again.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- sources	15 Aug 2006 18:55:20 -0000	1.444
+++ sources	16 Aug 2006 20:08:48 -0000	1.445
@@ -1 +1 @@
-9bf3a1d28de81eddb0e7c6d0d5d561d1  anaconda-11.1.0.82.tar.bz2
+3e8ddcb0646c95cacd84b1a349438e83  anaconda-11.1.0.83.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 16 20:10:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 16:10:12 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2570,1.2571
Message-ID: <200608162010.k7GKACTE007190@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7020

Modified Files:
	kernel-2.6.spec 
Log Message:
reenable debug


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2570
retrieving revision 1.2571
diff -u -r1.2570 -r1.2571
--- kernel-2.6.spec	16 Aug 2006 08:38:00 -0000	1.2570
+++ kernel-2.6.spec	16 Aug 2006 20:10:10 -0000	1.2571
@@ -1692,6 +1692,7 @@
 
 * Wed Aug 16 2006 Dave Jones <davej at redhat.com>
 - Update to latest GregKH tree.
+- Reenable debug.
 
 * Tue Aug 15 2006 Don Zickus <dzickus at redhat.com>
 - cleanup config-rhel-generic to compile again



From fedora-cvs-commits at redhat.com  Wed Aug 16 20:10:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 16:10:13 -0400
Subject: rpms/kernel/devel/configs config-generic,1.243,1.244
Message-ID: <200608162010.k7GKADPt007197@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7020/configs

Modified Files:
	config-generic 
Log Message:
reenable debug


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- config-generic	16 Aug 2006 04:18:31 -0000	1.243
+++ config-generic	16 Aug 2006 20:10:10 -0000	1.244
@@ -2521,12 +2521,12 @@
 # CONFIG_RCU_TORTURE_TEST is not set
 
 # Turn off these debug options for production kernels.
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
+CONFIG_DEBUG_SLAB=y
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
+CONFIG_DEBUG_RWSEMS=y
+CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
@@ -2535,8 +2535,8 @@
 # They aren't that much of a performance impact, and the value
 # from getting out-of-tree modules fixed is worth the trade-off.
 CONFIG_DEBUG_HIGHMEM=y
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_VM=y



From fedora-cvs-commits at redhat.com  Wed Aug 16 20:14:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 16:14:28 -0400
Subject: rpms/gnome-panel/devel gnome-panel-2.15.90-fix-double-free.patch,
	1.1, 1.2 gnome-panel.spec, 1.143, 1.144
Message-ID: <200608162014.k7GKESDe008195@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8137

Modified Files:
	gnome-panel-2.15.90-fix-double-free.patch gnome-panel.spec 
Log Message:
- add more complete fix for bug 201439


gnome-panel-2.15.90-fix-double-free.patch:
 gnome-panel-2.15.90/gnome-panel/panel-menu-bar.c    |    2 ++
 gnome-panel-2.15.91/gnome-panel/panel-menu-button.c |    1 +
 2 files changed, 3 insertions(+)

Index: gnome-panel-2.15.90-fix-double-free.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.15.90-fix-double-free.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-panel-2.15.90-fix-double-free.patch	7 Aug 2006 15:34:30 -0000	1.1
+++ gnome-panel-2.15.90-fix-double-free.patch	16 Aug 2006 20:14:25 -0000	1.2
@@ -16,3 +16,13 @@
  		}
  	}
  }
+--- gnome-panel-2.15.91/gnome-panel/panel-menu-button.c.fix-crash	2006-08-16 16:09:08.000000000 -0400
++++ gnome-panel-2.15.91/gnome-panel/panel-menu-button.c	2006-08-16 16:09:19.000000000 -0400
+@@ -1005,6 +1005,7 @@ panel_menu_button_invoke_menu (PanelMenu
+ 					   &error);
+ 		if (error) {
+ 			g_error_free (error);
++			error = NULL;
+ 			panel_launch_desktop_file ("gmenu-simple-editor.desktop",
+ 						   "gmenu-simple-editor",
+ 						   screen,


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- gnome-panel.spec	15 Aug 2006 13:25:08 -0000	1.143
+++ gnome-panel.spec	16 Aug 2006 20:14:25 -0000	1.144
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.15.91
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 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
@@ -81,6 +81,7 @@
 Patch12: gnome-panel-2.14.2-xio-error.patch
 Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch
 Patch14: gnome-panel-2.15.90-fix-double-free.patch
+Patch15: gnome-panel-2.15.91-fix-crash.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -229,6 +230,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> - 2.15.91.3.fc6
+- add more complete fix for bug 201439
+
 * Fri Aug 15 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-2.fc6
 - Also use beagle for search actions (#201424)
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 20:19:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 16:19:09 -0400
Subject: rpms/cman/devel .cvsignore, 1.15, 1.16 cman.spec, 1.67, 1.68 sources,
	1.24, 1.25
Message-ID: <200608162019.k7GKJ96N024819@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24793

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
New upstream sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	15 Aug 2006 17:38:33 -0000	1.15
+++ .cvsignore	16 Aug 2006 20:19:07 -0000	1.16
@@ -1 +1 @@
-cman-2.0.9.tar.gz
+cman-2.0.10.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- cman.spec	16 Aug 2006 01:41:11 -0000	1.67
+++ cman.spec	16 Aug 2006 20:19:07 -0000	1.68
@@ -10,7 +10,7 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.9
+%define cman_minor 0.10
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
@@ -114,6 +114,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Aug 16 2006 Chris Feist <cfeist at redhat.com> - 2.0.10-1
+- Rebuild w/ new upstream sources
+
 * Tue Aug 15 2006 Chris Feist <cfeist at redhat.com> - 2.0.9-0
 - Rebuild w/ new upstream sources
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	15 Aug 2006 17:38:33 -0000	1.24
+++ sources	16 Aug 2006 20:19:07 -0000	1.25
@@ -1 +1 @@
-f6c816433e783b49d9a9a2c81212067c  cman-2.0.9.tar.gz
+5a66a831b45f4dd5a0c27209dc613e2c  cman-2.0.10.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 16 20:20:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 16:20:43 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.144,1.145
Message-ID: <200608162020.k7GKKhCe025358@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25278

Modified Files:
	gnome-panel.spec 
Log Message:
remove unneeded patch file from list



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- gnome-panel.spec	16 Aug 2006 20:14:25 -0000	1.144
+++ gnome-panel.spec	16 Aug 2006 20:20:41 -0000	1.145
@@ -81,7 +81,6 @@
 Patch12: gnome-panel-2.14.2-xio-error.patch
 Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch
 Patch14: gnome-panel-2.15.90-fix-double-free.patch
-Patch15: gnome-panel-2.15.91-fix-crash.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 20:22:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 16:22:30 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.114,
	1.115
Message-ID: <200608162022.k7GKMUNH025916@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25846

Modified Files:
	evolution-data-server.spec 
Log Message:
give patch file proper name



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- evolution-data-server.spec	16 Aug 2006 20:01:46 -0000	1.114
+++ evolution-data-server.spec	16 Aug 2006 20:22:27 -0000	1.115
@@ -42,7 +42,7 @@
 Patch15: evolution-data-server-1.7.91-fix-edataserverui-libs.patch
 
 # RH bug #202309
-Patch16: evolution-data-server-1.7.91-may-fix-crash.patch
+Patch16: evolution-data-server-1.7.91-maybe-fix-crash.patch
 
 ### Dependencies ###
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 20:43:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 16:43:09 -0400
Subject: rpms/kernel/devel/configs config-generic,1.237.8.1,1.237.8.2
Message-ID: <200608162043.k7GKh9W4031228@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv30955/configs

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-generic 
Log Message:
straightening out what can and what can not go into an updated beta build




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237.8.1
retrieving revision 1.237.8.2
diff -u -r1.237.8.1 -r1.237.8.2
--- config-generic	11 Aug 2006 19:11:07 -0000	1.237.8.1
+++ config-generic	16 Aug 2006 20:43:07 -0000	1.237.8.2
@@ -2432,6 +2432,7 @@
 CONFIG_CONFIGFS_FS=m
 
 CONFIG_DLM=m
+CONFIG_DLM_DEVICE=m
 CONFIG_DLM_DEBUG=y
 CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_NOLOCK=m



From fedora-cvs-commits at redhat.com  Wed Aug 16 20:43:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 16:43:09 -0400
Subject: rpms/kernel/devel xen-build-with-O2.patch, 1.1.6.1,
	1.1.6.2 xen-fix_huge_timeouts.patch, 1.1.8.1,
	1.1.8.2 xen-ia64-hv.patch, 1.1.4.1, 1.1.4.2 Config.mk, 1.3.8.1,
	1.3.8.2 kernel-2.6.spec, 1.2519.4.1,
	1.2519.4.2 linux-2.6-cell-mambo-drivers.patch, 1.4.16.1,
	1.4.16.2 linux-2.6-compile-fixes.patch, 1.97.6.1,
	1.97.6.2 linux-2.6-gfs2-dlm.patch, 1.12.4.1,
	1.12.4.2 linux-2.6-gfs2-locking-exports.patch, 1.1.10.1,
	1.1.10.2 linux-2.6-lockdep-fixes.patch, 1.16.4.1,
	1.16.4.2 linux-2.6-utrace.patch, 1.12.4.1,
	1.12.4.2 linux-2.6-xen.patch, 1.49.4.1, 1.49.4.2 sources,
	1.468.4.1, 1.468.4.2 linux-2.6-xen-unbreak-oprofile.patch,
	1.1.2.1, NONE
Message-ID: <200608162043.k7GKh9EY031219@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30955

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	Config.mk kernel-2.6.spec linux-2.6-cell-mambo-drivers.patch 
	linux-2.6-compile-fixes.patch linux-2.6-gfs2-dlm.patch 
	linux-2.6-gfs2-locking-exports.patch 
	linux-2.6-lockdep-fixes.patch linux-2.6-utrace.patch 
	linux-2.6-xen.patch sources 
Added Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	xen-build-with-O2.patch xen-fix_huge_timeouts.patch 
	xen-ia64-hv.patch 
Removed Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	linux-2.6-xen-unbreak-oprofile.patch 
Log Message:
straightening out what can and what can not go into an updated beta build



xen-build-with-O2.patch:
 Rules.mk |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: xen-build-with-O2.patch
===================================================================
RCS file: xen-build-with-O2.patch
diff -N xen-build-with-O2.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xen-build-with-O2.patch	16 Aug 2006 20:43:06 -0000	1.1.6.2
@@ -0,0 +1,17 @@
+Always build the hypervisor with -O2.  This reduces stack consumption
+significantly and seems to stop the stack overflows that made Xen crash
+frequently in some configurations.
+
+Signed-off-by: Rik van Riel <riel at redhat.com>
+
+--- xen/Rules.mk.noop	2006-07-26 17:44:02.000000000 -0400
++++ xen/Rules.mk	2006-07-26 17:44:16.000000000 -0400
+@@ -52,7 +52,7 @@
+ ALL_OBJS-$(ACM_SECURITY) += $(BASEDIR)/acm/built_in.o
+ ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o
+ 
+-CFLAGS-y               += -g -D__XEN__
++CFLAGS-y               += -g -D__XEN__ -O2
+ CFLAGS-$(ACM_SECURITY) += -DACM_SECURITY
+ CFLAGS-$(verbose)      += -DVERBOSE
+ CFLAGS-$(crash_debug)  += -DCRASH_DEBUG

xen-fix_huge_timeouts.patch:
 schedule.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: xen-fix_huge_timeouts.patch
===================================================================
RCS file: xen-fix_huge_timeouts.patch
diff -N xen-fix_huge_timeouts.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xen-fix_huge_timeouts.patch	16 Aug 2006 20:43:06 -0000	1.1.8.2
@@ -0,0 +1,12 @@
+diff -ur xen-10712/common/schedule.c xen/common/schedule.c
+--- xen-10712/common/schedule.c	2006-07-15 16:59:55.000000000 +0200
++++ xen/common/schedule.c	2006-07-25 15:56:24.000000000 +0200
+@@ -409,7 +409,7 @@
+         DPRINTK("Warning: huge timeout set by domain %d (vcpu %d):"
+                 " %"PRIx64"\n",
+                 v->domain->domain_id, v->vcpu_id, (uint64_t)timeout);
+-        send_timer_event(v);
++//        send_timer_event(v);
+     }
+     else
+     {

xen-ia64-hv.patch:
 arch/ia64/linux-xen/iosapic.c |    8 +++-
 arch/ia64/xen/domain.c        |   70 +++++++++++++++++++++++++++++++-----------
 arch/ia64/xen/vcpu.c          |    2 -
 arch/ia64/xen/vhpt.c          |   20 ++++++------
 arch/ia64/xen/xensetup.c      |    2 -
 include/asm-ia64/domain.h     |   10 ++++++
 include/asm-ia64/tlbflush.h   |    2 -
 include/asm-ia64/vhpt.h       |    1 
 8 files changed, 84 insertions(+), 31 deletions(-)

Index: xen-ia64-hv.patch
===================================================================
RCS file: xen-ia64-hv.patch
diff -N xen-ia64-hv.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xen-ia64-hv.patch	16 Aug 2006 20:43:06 -0000	1.1.4.2
@@ -0,0 +1,306 @@
+diff -urNp xen/arch/ia64/linux-xen/iosapic.c xen/arch/ia64/linux-xen/iosapic.c
+--- xen/arch/ia64/linux-xen/iosapic.c	2006-08-01 19:40:39.000000000 -0400
++++ xen/arch/ia64/linux-xen/iosapic.c	2006-08-01 19:41:31.000000000 -0400
+@@ -1155,7 +1155,7 @@ int iosapic_guest_read(unsigned long phy
+ 
+ int iosapic_guest_write(unsigned long physbase, unsigned int reg, u32 val)
+ {
+-	unsigned int id, gsi, vec, dest, high32;
++	unsigned int id, gsi, vec, xen_vec, dest, high32;
+ 	char rte_index;
+ 	struct iosapic *ios;
+ 	struct iosapic_intr_info *info;
+@@ -1185,13 +1185,17 @@ int iosapic_guest_write(unsigned long ph
+ 
+ 	/* Sanity check. Vector should be allocated before this update */
+ 	if ((rte_index > ios->num_rte) ||
+-	    test_bit(vec, ia64_xen_vector) ||
+ 	    ((vec > IA64_FIRST_DEVICE_VECTOR) &&
+ 	     (vec < IA64_LAST_DEVICE_VECTOR) &&
+ 	     (!test_bit(vec - IA64_FIRST_DEVICE_VECTOR, ia64_vector_mask))))
+ 	    return -EINVAL;
+ 
+ 	gsi = ios->gsi_base + rte_index;
++	xen_vec = gsi_to_vector(gsi);
++	if (xen_vec >= 0 && test_bit(xen_vec, ia64_xen_vector)) {
++		printk("WARN: GSI %d in use by Xen.\n", gsi);
++		return -EINVAL;
++	}
+ 	info = &iosapic_intr_info[vec];
+ 	spin_lock_irqsave(&irq_descp(vec)->lock, flags);
+ 	spin_lock(&iosapic_lock);
+diff -urNp xen/arch/ia64/xen/domain.c xen/arch/ia64/xen/domain.c
+--- xen/arch/ia64/xen/domain.c	2006-08-01 19:37:05.000000000 -0400
++++ xen/arch/ia64/xen/domain.c	2006-08-01 19:50:54.000000000 -0400
+@@ -93,6 +93,29 @@ DEFINE_PER_CPU(int *, current_psr_ic_add
+ 
+ #include <xen/sched-if.h>
+ 
++static void flush_vtlb_for_context_switch(struct vcpu* vcpu)
++{
++	int last_vcpu_id =
++		vcpu->domain->arch.last_vcpu[smp_processor_id()].vcpu_id;
++
++	if (is_idle_domain(vcpu->domain) || last_vcpu_id == vcpu->vcpu_id)
++		return;
++	vcpu->domain->arch.last_vcpu[smp_processor_id()].vcpu_id =
++		vcpu->vcpu_id;
++	if (last_vcpu_id == INVALID_VCPU_ID) 
++		return;
++
++	// if the vTLB implementation was changed,
++	// the followings must be updated either.
++	if (VMX_DOMAIN(vcpu)) {
++		// currently vTLB for vt-i domian is per vcpu.
++		// so any flushing isn't needed.
++	} else {
++		vhpt_flush();
++	}
++	local_flush_tlb_all();
++}
++
+ void schedule_tail(struct vcpu *prev)
+ {
+ 	extern char ia64_ivt;
+@@ -111,6 +134,7 @@ void schedule_tail(struct vcpu *prev)
+ 		__ia64_per_cpu_var(current_psr_ic_addr) = (int *)
+ 		  (current->domain->arch.shared_info_va + XSI_PSR_IC_OFS);
+ 	}
++	flush_vtlb_for_context_switch(current);
+ }
+ 
+ void context_switch(struct vcpu *prev, struct vcpu *next)
+@@ -176,6 +200,7 @@ if (!i--) { i = 1000000; printk("+"); }
+ 		__ia64_per_cpu_var(current_psr_ic_addr) = NULL;
+         }
+     }
++    flush_vtlb_for_context_switch(current);
+     local_irq_restore(spsr);
+     context_saved(prev);
+ }
+@@ -310,9 +335,14 @@ static void init_switch_stack(struct vcp
+ 
+ int arch_domain_create(struct domain *d)
+ {
++	int i;
++	
+ 	// the following will eventually need to be negotiated dynamically
+ 	d->arch.shared_info_va = DEFAULT_SHAREDINFO_ADDR;
+ 	d->arch.breakimm = 0x1000;
++	for (i = 0; i < NR_CPUS; i++) {
++		d->arch.last_vcpu[i].vcpu_id = INVALID_VCPU_ID;
++	}
+ 
+ 	if (is_idle_domain(d))
+ 	    return 0;
+diff -urNp xen/arch/ia64/xen/vhpt.c xen/arch/ia64/xen/vhpt.c
+--- xen/arch/ia64/xen/vhpt.c	2006-08-01 19:37:05.000000000 -0400
++++ xen/arch/ia64/xen/vhpt.c	2006-08-01 19:50:54.000000000 -0400
+@@ -23,7 +23,7 @@ extern long running_on_sim;
+ DEFINE_PER_CPU (unsigned long, vhpt_paddr);
+ DEFINE_PER_CPU (unsigned long, vhpt_pend);
+ 
+-static void vhpt_flush(void)
++void vhpt_flush(void)
+ {
+ 	struct vhpt_lf_entry *v = __va(__ia64_per_cpu_var(vhpt_paddr));
+ 	int i;
+diff -urNp xen/include/asm-ia64/domain.h xen/include/asm-ia64/domain.h
+--- xen/include/asm-ia64/domain.h	2006-08-01 19:37:05.000000000 -0400
++++ xen/include/asm-ia64/domain.h	2006-08-01 19:50:54.000000000 -0400
+@@ -58,6 +58,11 @@ struct mm_struct {
+     //	atomic_t mm_users;			/* How many users with user space? */
+ };
+ 
++struct last_vcpu {
++#define INVALID_VCPU_ID INT_MAX
++    int vcpu_id;
++} ____cacheline_aligned_in_smp;
++
+ struct arch_domain {
+     struct mm_struct mm;
+     unsigned long metaphysical_rr0;
+@@ -101,6 +106,8 @@ struct arch_domain {
+     void *efi_runtime;
+     /* Metaphysical address to fpswa_interface_t in domain firmware memory is set. */
+     void *fpswa_inf;
++
++    struct last_vcpu last_vcpu[NR_CPUS];
+ };
+ #define INT_ENABLE_OFFSET(v) 		  \
+     (sizeof(vcpu_info_t) * (v)->vcpu_id + \
+diff -urNp xen/include/asm-ia64/vhpt.h xen/include/asm-ia64/vhpt.h
+--- xen/include/asm-ia64/vhpt.h	2006-08-01 19:37:05.000000000 -0400
++++ xen/include/asm-ia64/vhpt.h	2006-08-01 19:50:54.000000000 -0400
+@@ -40,6 +40,7 @@ extern void vhpt_multiple_insert(unsigne
+ 				 unsigned long logps);
+ extern void vhpt_insert (unsigned long vadr, unsigned long pte,
+ 			 unsigned long logps);
++void vhpt_flush(void);
+ 
+ /* Currently the VHPT is allocated per CPU.  */
+ DECLARE_PER_CPU (unsigned long, vhpt_paddr);
+diff -urNp xen/arch/ia64/xen/domain.c xen/arch/ia64/xen/domain.c
+--- xen/arch/ia64/xen/domain.c	2006-08-01 19:50:54.000000000 -0400
++++ xen/arch/ia64/xen/domain.c	2006-08-01 19:52:11.000000000 -0400
+@@ -95,25 +95,32 @@ DEFINE_PER_CPU(int *, current_psr_ic_add
+ 
+ static void flush_vtlb_for_context_switch(struct vcpu* vcpu)
+ {
+-	int last_vcpu_id =
+-		vcpu->domain->arch.last_vcpu[smp_processor_id()].vcpu_id;
++	int cpu = smp_processor_id();
++	int last_vcpu_id = vcpu->domain->arch.last_vcpu[cpu].vcpu_id;
++	int last_processor = vcpu->arch.last_processor;
+ 
+-	if (is_idle_domain(vcpu->domain) || last_vcpu_id == vcpu->vcpu_id)
+-		return;
+-	vcpu->domain->arch.last_vcpu[smp_processor_id()].vcpu_id =
+-		vcpu->vcpu_id;
+-	if (last_vcpu_id == INVALID_VCPU_ID) 
++	if (is_idle_domain(vcpu->domain))
+ 		return;
++	
++	vcpu->domain->arch.last_vcpu[cpu].vcpu_id = vcpu->vcpu_id;
++	vcpu->arch.last_processor = cpu;
+ 
+-	// if the vTLB implementation was changed,
+-	// the followings must be updated either.
+-	if (VMX_DOMAIN(vcpu)) {
+-		// currently vTLB for vt-i domian is per vcpu.
+-		// so any flushing isn't needed.
+-	} else {
+-		vhpt_flush();
++	if ((last_vcpu_id != vcpu->vcpu_id &&
++	     last_vcpu_id != INVALID_VCPU_ID) ||
++	    (last_vcpu_id == vcpu->vcpu_id &&
++	     last_processor != cpu &&
++	     last_processor != INVALID_PROCESSOR)) {
++
++		// if the vTLB implementation was changed,
++		// the followings must be updated either.
++		if (VMX_DOMAIN(vcpu)) {
++			// currently vTLB for vt-i domian is per vcpu.
++			// so any flushing isn't needed.
++		} else {
++			vhpt_flush();
++		}
++		local_flush_tlb_all();
+ 	}
+-	local_flush_tlb_all();
+ }
+ 
+ void schedule_tail(struct vcpu *prev)
+@@ -299,6 +306,7 @@ struct vcpu *alloc_vcpu_struct(struct do
+ 	    v->arch.starting_rid = d->arch.starting_rid;
+ 	    v->arch.ending_rid = d->arch.ending_rid;
+ 	    v->arch.breakimm = d->arch.breakimm;
++	    v->arch.last_processor = INVALID_PROCESSOR;
+ 	}
+ 
+ 	return v;
+diff -urNp xen/include/asm-ia64/domain.h xen/include/asm-ia64/domain.h
+--- xen/include/asm-ia64/domain.h	2006-08-01 19:50:54.000000000 -0400
++++ xen/include/asm-ia64/domain.h	2006-08-01 19:52:11.000000000 -0400
+@@ -156,6 +156,9 @@ struct arch_vcpu {
+     int mode_flags;
+     fpswa_ret_t fpswa_ret;	/* save return values of FPSWA emulation */
+     struct arch_vmx_struct arch_vmx; /* Virtual Machine Extensions */
++
++#define INVALID_PROCESSOR       INT_MAX
++    int last_processor;
+ };
+ 
+ #include <asm/uaccess.h> /* for KERNEL_DS */
+diff -urNp xen/arch/ia64/xen/vcpu.c xen/arch/ia64/xen/vcpu.c
+--- xen/arch/ia64/xen/vcpu.c	2006-08-01 19:51:43.000000000 -0400
++++ xen/arch/ia64/xen/vcpu.c	2006-08-01 19:54:36.000000000 -0400
+@@ -2096,7 +2096,7 @@ IA64FAULT vcpu_ptc_e(VCPU *vcpu, UINT64 
+ 	// architected loop to purge the entire TLB, should use
+ 	//  base = stride1 = stride2 = 0, count0 = count 1 = 1
+ 
+-	vcpu_flush_vtlb_all ();
++	vcpu_flush_vtlb_all(current);
+ 
+ 	return IA64_NO_FAULT;
+ }
+diff -urNp xen/arch/ia64/xen/vhpt.c xen/arch/ia64/xen/vhpt.c
+--- xen/arch/ia64/xen/vhpt.c	2006-08-01 19:51:43.000000000 -0400
++++ xen/arch/ia64/xen/vhpt.c	2006-08-01 19:54:36.000000000 -0400
+@@ -129,10 +129,8 @@ void vhpt_init(void)
+ }
+ 
+ 
+-void vcpu_flush_vtlb_all (void)
++void vcpu_flush_vtlb_all(struct vcpu *v)
+ {
+-	struct vcpu *v = current;
+-
+ 	/* First VCPU tlb.  */
+ 	vcpu_purge_tr_entry(&PSCBX(v,dtlb));
+ 	vcpu_purge_tr_entry(&PSCBX(v,itlb));
+@@ -148,6 +146,11 @@ void vcpu_flush_vtlb_all (void)
+ 	   check this.  */
+ }
+ 
++static void __vcpu_flush_vtlb_all(void *vcpu)
++{
++	vcpu_flush_vtlb_all((struct vcpu*)vcpu);
++}
++
+ void domain_flush_vtlb_all (void)
+ {
+ 	int cpu = smp_processor_id ();
+@@ -158,12 +161,11 @@ void domain_flush_vtlb_all (void)
+ 			continue;
+ 
+ 		if (v->processor == cpu)
+-			vcpu_flush_vtlb_all ();
++			vcpu_flush_vtlb_all(v);
+ 		else
+-			smp_call_function_single
+-				(v->processor,
+-				 (void(*)(void *))vcpu_flush_vtlb_all,
+-				 NULL,1,1);
++			smp_call_function_single(v->processor,
++						 __vcpu_flush_vtlb_all,
++						 v, 1, 1);
+ 	}
+ }
+ 
+diff -urNp xen/include/asm-ia64/tlbflush.h xen/include/asm-ia64/tlbflush.h
+--- xen/include/asm-ia64/tlbflush.h	2006-08-01 19:51:43.000000000 -0400
++++ xen/include/asm-ia64/tlbflush.h	2006-08-01 19:54:36.000000000 -0400
+@@ -11,7 +11,7 @@
+ */
+ 
+ /* Local all flush of vTLB.  */
+-void vcpu_flush_vtlb_all (void);
++void vcpu_flush_vtlb_all(struct vcpu *v);
+ 
+ /* Local range flush of machine TLB only (not full VCPU virtual TLB!!!)  */
+ void vcpu_flush_tlb_vhpt_range (u64 vadr, u64 log_range);
+diff -urNp xen/arch/ia64/xen/domain.c xen/arch/ia64/xen/domain.c
+--- xen/arch/ia64/xen/domain.c	2006-08-01 19:53:55.000000000 -0400
++++ xen/arch/ia64/xen/domain.c	2006-08-01 19:57:18.000000000 -0400
+@@ -934,8 +934,6 @@ int construct_dom0(struct domain *d, 
+ 	sprintf(si->magic, "xen-%i.%i-ia64", XEN_VERSION, XEN_SUBVERSION);
+ 	si->nr_pages     = max_pages;
+ 
+-	console_endboot();
+-
+ 	printk("Dom0: 0x%lx\n", (u64)dom0);
+ 
+ #ifdef VALIDATE_VT
+diff -urNp xen/arch/ia64/xen/xensetup.c xen/arch/ia64/xen/xensetup.c
+--- xen/arch/ia64/xen/xensetup.c	2006-08-02 11:49:15.000000000 -0400
++++ xen/arch/ia64/xen/xensetup.c	2006-08-02 13:51:21.000000000 -0400
+@@ -65,7 +65,7 @@ integer_param("maxcpus", max_cpus); 
+ /* xencons: if true enable xenconsole input (and irq).
+    Note: you have to disable 8250 serials in domains (to avoid use of the
+    same resource).  */
+-static int opt_xencons = 0;
++static int opt_xencons = 1;
+ boolean_param("xencons", opt_xencons);
+ 
+ /* Toggle to allow non-legacy xencons UARTs to run in polling mode */


Index: Config.mk
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Config.mk,v
retrieving revision 1.3.8.1
retrieving revision 1.3.8.2
diff -u -r1.3.8.1 -r1.3.8.2
--- Config.mk	11 Aug 2006 19:11:00 -0000	1.3.8.1
+++ Config.mk	16 Aug 2006 20:42:08 -0000	1.3.8.2
@@ -36,7 +36,7 @@
 CFLAGS    ?= -O2 -fomit-frame-pointer
 CFLAGS    += -DNDEBUG
 else
-CFLAGS    += -O2 -g
+CFLAGS    += -g
 endif
 
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.1
retrieving revision 1.2519.4.2
diff -u -r1.2519.4.1 -r1.2519.4.2
--- kernel-2.6.spec	11 Aug 2006 19:01:59 -0000	1.2519.4.1
+++ kernel-2.6.spec	16 Aug 2006 20:42:09 -0000	1.2519.4.2
@@ -33,7 +33,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_hv_cset 10924
+%define xen_hv_cset 10730
 %define make_target bzImage
 %define kernel_image x86
 %define xen_flags debug=y verbose=y crash_debug=y
@@ -323,7 +323,7 @@
 Patch954: linux-2.6-xen-execshield.patch
 Patch955: linux-2.6-xen-tux.patch
 Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
-Patch957: linux-2.6-xen-unbreak-oprofile.patch
+
 
 Patch990: linux-2.6-xen-compile-fixes.patch
 
@@ -448,6 +448,8 @@
 Patch10001: linux-2.6-random-patches.patch
 
 # Xen hypervisor patches
+Patch20000: xen-build-with-O2.patch
+Patch20001: xen-ia64-hv.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -702,6 +704,8 @@
 
 cd xen
 # Any necessary hypervisor patches go here
+%patch20000 -p1
+%patch20001 -p1
 
 cd ..
 
@@ -813,7 +817,6 @@
 %patch954 -p1
 %patch955 -p1
 %patch956 -p1
-%patch957 -p1
 
 #%patch990 -p1
 
@@ -1694,6 +1697,13 @@
 %endif
 
 %changelog
+* Wed Aug 16 2006 Don Zickus <dzickus at redhat.com>
+- un-backport some patches that weren't beta-blockers
+- updating beta blockers
+- added #202466
+- added #200591
+- added #202464
+
 * Thu Aug  3 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3-git3
 

linux-2.6-cell-mambo-drivers.patch:
 arch/powerpc/Kconfig              |   21 ++
 b/drivers/block/mambo_bd.c        |  285 +++++++++++++++++++++++++++
 b/drivers/net/mambonet.c          |  392 ++++++++++++++++++++++++++++++++++++++
 b/include/asm-powerpc/systemsim.h |  130 ++++++++++++
 drivers/block/Makefile            |    1 
 drivers/net/Makefile              |    1 
 include/asm-powerpc/processor.h   |   17 +
 include/linux/root_dev.h          |    3 
 8 files changed, 850 insertions(+)

Index: linux-2.6-cell-mambo-drivers.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-mambo-drivers.patch,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- linux-2.6-cell-mambo-drivers.patch	11 Aug 2006 19:11:00 -0000	1.4.16.1
+++ linux-2.6-cell-mambo-drivers.patch	16 Aug 2006 20:42:24 -0000	1.4.16.2
@@ -338,7 +338,7 @@
  obj-$(CONFIG_ZNET) += znet.o
 --- /dev/null
 +++ b/drivers/net/mambonet.c
-@@ -0,0 +1,391 @@
+@@ -0,0 +1,392 @@
 +/*
 + *  Bogus Network Driver for PowerPC Full System Simulator
 + *
@@ -398,6 +398,7 @@
 +#include <linux/if_arp.h>	/* For ARPHRD_ETHER */
 +#include <linux/workqueue.h>
 +#include <asm/prom.h>
++#include <linux/version.h>
 +#include <asm/systemsim.h>
 +
 +#define MAMBO_BOGUS_NET_PROBE   119

linux-2.6-compile-fixes.patch:
 arch/ia64/kernel/ia64_ksyms.c                     |    2 +-
 arch/ia64/lib/Makefile                            |    2 +-
 linux-2.6.17.noarch/Makefile                      |    4 ----
 linux-2.6.17.noarch/arch/ia64/kernel/ia64_ksyms.c |    1 +
 4 files changed, 3 insertions(+), 6 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.97.6.1
retrieving revision 1.97.6.2
diff -u -r1.97.6.1 -r1.97.6.2
--- linux-2.6-compile-fixes.patch	11 Aug 2006 19:11:00 -0000	1.97.6.1
+++ linux-2.6-compile-fixes.patch	16 Aug 2006 20:42:24 -0000	1.97.6.2
@@ -22,4 +22,45 @@
  
  #define __KERNEL_SYSCALLS__
  #include <asm/unistd.h>
+Date: Mon, 31 Jul 2006 09:17:01 -0400
+From: Prarit Bhargava <prarit at redhat.com>
+Subject: [RHEL5/Fedora]: BZ 196903 Fix ia64 compile
+
+CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the 
+same
+change in arch/ia64
+
+Signed-off-by: Prarit Bhargava <prarit at redhat.com>
+Signed-off-by: Aron Griffis <aron at hp.com>
+
+
+
+CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the same
+change in arch/ia64
+
+Signed-off-by: Prarit Bhargava <prarit at redhat.com>
+Signed-off-by: Aron Griffis <aron at hp.com>
+
+--- linux-2.6.17.ia64.orig/arch/ia64/kernel/ia64_ksyms.c	2006-07-27 15:21:47.000000000 -0400
++++ linux-2.6.17.ia64/arch/ia64/kernel/ia64_ksyms.c	2006-07-31 09:02:06.000000000 -0400
+@@ -68,7 +68,7 @@ EXPORT_SYMBOL(__udivdi3);
+ EXPORT_SYMBOL(__moddi3);
+ EXPORT_SYMBOL(__umoddi3);
+ 
+-#if defined(CONFIG_MD_RAID5) || defined(CONFIG_MD_RAID5_MODULE)
++#if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)
+ extern void xor_ia64_2(void);
+ extern void xor_ia64_3(void);
+ extern void xor_ia64_4(void);
+--- linux-2.6.17.ia64.orig/arch/ia64/lib/Makefile	2006-07-27 09:20:01.000000000 -0400
++++ linux-2.6.17.ia64/arch/ia64/lib/Makefile	2006-07-31 09:02:41.000000000 -0400
+@@ -14,7 +14,7 @@ lib-y := __divsi3.o __udivsi3.o __modsi3
+ lib-$(CONFIG_ITANIUM)	+= copy_page.o copy_user.o memcpy.o
+ lib-$(CONFIG_MCKINLEY)	+= copy_page_mck.o memcpy_mck.o
+ lib-$(CONFIG_PERFMON)	+= carta_random.o
+-lib-$(CONFIG_MD_RAID5)	+= xor.o
++lib-$(CONFIG_MD_RAID456)	+= xor.o
+ 
+ AFLAGS___divdi3.o	=
+ AFLAGS___udivdi3.o	= -DUNSIGNED
 

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   21 
 fs/dlm/Makefile                    |   19 
 fs/dlm/ast.c                       |  172 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 +++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  384 +++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  539 +++++
 fs/dlm/lock.c                      | 3845 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   61 
 fs/dlm/lockspace.c                 |  705 ++++++
 fs/dlm/lockspace.h                 |   25 
 fs/dlm/lowcomms.c                  | 1238 +++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   97 
 fs/dlm/member.c                    |  312 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  115 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  457 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  776 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  285 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/user.c                      |  785 +++++++
 fs/dlm/user.h                      |   16 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1236 +++++++++++
 fs/gfs2/bmap.h                     |   27 
 fs/gfs2/daemon.c                   |  196 +
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1976 +++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++
 fs/gfs2/eattr.h                    |   97 
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2279 +++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  564 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  658 ++++++
 fs/gfs2/inode.c                    | 1344 ++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  295 ++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  301 ++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 +++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 +++++++
 fs/gfs2/lops.h                     |   96 
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  780 +++++++
 fs/gfs2/meta_io.h                  |   74 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  308 ++
 fs/gfs2/ops_address.c              |  778 +++++++
 fs/gfs2/ops_address.h              |   18 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  293 ++
 fs/gfs2/ops_export.h               |   19 
 fs/gfs2/ops_file.c                 |  812 +++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  836 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1165 +++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  471 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  194 +
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/quota.c                    | 1286 ++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  575 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1528 ++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  979 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 +++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/Kbuild               |   33 
 include/linux/dlm.h                |  302 ++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  443 ++++
 include/linux/iflags.h             |  102 
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   41 
 mm/filemap.c                       |    3 
 mm/readahead.c                     |    1 
 131 files changed, 40621 insertions(+), 21 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -r1.12.4.1 -r1.12.4.2
--- linux-2.6-gfs2-dlm.patch	11 Aug 2006 19:11:00 -0000	1.12.4.1
+++ linux-2.6-gfs2-dlm.patch	16 Aug 2006 20:42:30 -0000	1.12.4.2
@@ -67,10 +67,10 @@
 +  mount.gfs2	to help mount(8) mount a filesystem
 +  mkfs.gfs2	to make a filesystem
 diff --git a/MAINTAINERS b/MAINTAINERS
-index e3e1515..a050d7c 100644
+index b2afc7a..e42e143 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -875,6 +875,16 @@ M:	jack at suse.cz
+@@ -862,6 +862,16 @@ M:	jack at suse.cz
  L:	linux-kernel at vger.kernel.org
  S:	Maintained
  
@@ -87,7 +87,7 @@
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  P:	Tobias Ringstrom
  M:	tori at unhappy.mine.nu
-@@ -1129,6 +1139,14 @@ M:	khc at pm.waw.pl
+@@ -1112,6 +1122,14 @@ M:	khc at pm.waw.pl
  W:	http://www.kernel.org/pub/linux/utils/net/hdlc/
  S:	Maintained
  
@@ -1256,10 +1256,10 @@
 +
 diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
 new file mode 100644
-index 0000000..9c3aedd
+index 0000000..8f471d9
 --- /dev/null
 +++ b/fs/dlm/debug_fs.c
-@@ -0,0 +1,387 @@
+@@ -0,0 +1,384 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -1572,19 +1572,16 @@
 +{
 +	struct dlm_ls *ls = file->private_data;
 +	struct dlm_lkb *lkb;
-+	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, ret, rv;
++	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, rv;
 +
 +	mutex_lock(&debug_buf_lock);
 +	mutex_lock(&ls->ls_waiters_mutex);
 +	memset(debug_buf, 0, sizeof(debug_buf));
 +
 +	list_for_each_entry(lkb, &ls->ls_waiters, lkb_wait_reply) {
-+		ret = snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",
-+			       lkb->lkb_id, lkb->lkb_wait_type,
-+			       lkb->lkb_nodeid, lkb->lkb_resource->res_name);
-+		if (ret >= len - pos)
-+			break;
-+		pos += ret;
++		pos += snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",
++				lkb->lkb_id, lkb->lkb_wait_type,
++				lkb->lkb_nodeid, lkb->lkb_resource->res_name);
 +	}
 +	mutex_unlock(&ls->ls_waiters_mutex);
 +
@@ -2114,10 +2111,10 @@
 +
 diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
 new file mode 100644
-index 0000000..da75099
+index 0000000..7c3c2d2
 --- /dev/null
 +++ b/fs/dlm/dlm_internal.h
-@@ -0,0 +1,541 @@
+@@ -0,0 +1,539 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -2587,8 +2584,6 @@
 +	struct list_head	ls_requestqueue;/* queue remote requests */
 +	struct mutex		ls_requestqueue_mutex;
 +	char			*ls_recover_buf;
-+	int			ls_recover_nodeid; /* for debugging */
-+	uint64_t		ls_rcom_seq;
 +	struct list_head	ls_recover_list;
 +	spinlock_t		ls_recover_list_lock;
 +	int			ls_recover_list_count;
@@ -2661,10 +2656,10 @@
 +
 diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
 new file mode 100644
-index 0000000..bb2e351
+index 0000000..7d38f91
 --- /dev/null
 +++ b/fs/dlm/lock.c
-@@ -0,0 +1,3846 @@
+@@ -0,0 +1,3845 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -6366,7 +6361,6 @@
 +	if (lvb_in && ua->lksb.sb_lvbptr)
 +		memcpy(ua->lksb.sb_lvbptr, lvb_in, DLM_USER_LVB_LEN);
 +	ua->castparam = ua_tmp->castparam;
-+	ua->user_lksb = ua_tmp->user_lksb;
 +
 +	error = set_unlock_args(flags, ua, &args);
 +	if (error)
@@ -6580,10 +6574,10 @@
 +
 diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
 new file mode 100644
-index 0000000..7adaad5
+index 0000000..31ed0fe
 --- /dev/null
 +++ b/fs/dlm/lockspace.c
-@@ -0,0 +1,716 @@
+@@ -0,0 +1,705 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -6667,11 +6661,6 @@
 +	return sprintf(buf, "%x\n", status);
 +}
 +
-+static ssize_t dlm_recover_nodeid_show(struct dlm_ls *ls, char *buf)
-+{
-+	return sprintf(buf, "%d\n", ls->ls_recover_nodeid);
-+}
-+
 +struct dlm_attr {
 +	struct attribute attr;
 +	ssize_t (*show)(struct dlm_ls *, char *);
@@ -6699,17 +6688,11 @@
 +	.show  = dlm_recover_status_show
 +};
 +
-+static struct dlm_attr dlm_attr_recover_nodeid = {
-+	.attr  = {.name = "recover_nodeid", .mode = S_IRUGO},
-+	.show  = dlm_recover_nodeid_show
-+};
-+
 +static struct attribute *dlm_attrs[] = {
 +	&dlm_attr_control.attr,
 +	&dlm_attr_event.attr,
 +	&dlm_attr_id.attr,
 +	&dlm_attr_recover_status.attr,
-+	&dlm_attr_recover_nodeid.attr,
 +	NULL,
 +};
 +
@@ -8736,10 +8719,10 @@
 +
 diff --git a/fs/dlm/member.c b/fs/dlm/member.c
 new file mode 100644
-index 0000000..a3f7de7
+index 0000000..cd0c51e
 --- /dev/null
 +++ b/fs/dlm/member.c
-@@ -0,0 +1,327 @@
+@@ -0,0 +1,312 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -8904,23 +8887,11 @@
 +
 +/* send a status request to all members just to establish comms connections */
 +
-+static int ping_members(struct dlm_ls *ls)
++static void ping_members(struct dlm_ls *ls)
 +{
 +	struct dlm_member *memb;
-+	int error = 0;
-+
-+	list_for_each_entry(memb, &ls->ls_nodes, list) {
-+		error = dlm_recovery_stopped(ls);
-+		if (error)
-+			break;
-+		error = dlm_rcom_status(ls, memb->nodeid);
-+		if (error)
-+			break;
-+	}
-+	if (error)
-+		log_debug(ls, "ping_members aborted %d last nodeid %d",
-+			  error, ls->ls_recover_nodeid);
-+	return error;
++	list_for_each_entry(memb, &ls->ls_nodes, list)
++		dlm_rcom_status(ls, memb->nodeid);
 +}
 +
 +int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv, int *neg_out)
@@ -8966,13 +8937,10 @@
 +	dlm_set_recover_status(ls, DLM_RS_NODES);
 +	*neg_out = neg;
 +
-+	error = ping_members(ls);
-+	if (error)
-+		goto out;
++	ping_members(ls);
 +
 +	error = dlm_recover_members_wait(ls);
-+ out:
-+	log_debug(ls, "total members %d error %d", ls->ls_num_nodes, error);
++	log_debug(ls, "total members %d", ls->ls_num_nodes);
 +	return error;
 +}
 +
@@ -9099,10 +9067,10 @@
 +
 diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
 new file mode 100644
-index 0000000..989b608
+index 0000000..48dfc27
 --- /dev/null
 +++ b/fs/dlm/memory.c
-@@ -0,0 +1,116 @@
+@@ -0,0 +1,115 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -9205,8 +9173,7 @@
 +{
 +	struct dlm_direntry *de;
 +
-+	DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,
-+		   printk("namelen = %d\n", namelen););
++	DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,);
 +
 +	de = kmalloc(sizeof(*de) + namelen, GFP_KERNEL);
 +	if (de)
@@ -9429,10 +9396,10 @@
 +
 diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
 new file mode 100644
-index 0000000..64ba492
+index 0000000..55fbe31
 --- /dev/null
 +++ b/fs/dlm/rcom.c
-@@ -0,0 +1,471 @@
+@@ -0,0 +1,457 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -9532,7 +9499,6 @@
 +	int error = 0;
 +
 +	memset(ls->ls_recover_buf, 0, dlm_config.buffer_size);
-+	ls->ls_recover_nodeid = nodeid;
 +
 +	if (nodeid == dlm_our_nodeid()) {
 +		rc = (struct dlm_rcom *) ls->ls_recover_buf;
@@ -9543,7 +9509,6 @@
 +	error = create_rcom(ls, nodeid, DLM_RCOM_STATUS, 0, &rc, &mh);
 +	if (error)
 +		goto out;
-+	rc->rc_id = ++ls->ls_rcom_seq;
 +
 +	send_rcom(ls, mh, rc);
 +
@@ -9576,30 +9541,19 @@
 +			    sizeof(struct rcom_config), &rc, &mh);
 +	if (error)
 +		return;
-+	rc->rc_id = rc_in->rc_id;
 +	rc->rc_result = dlm_recover_status(ls);
 +	make_config(ls, (struct rcom_config *) rc->rc_buf);
 +
 +	send_rcom(ls, mh, rc);
 +}
 +
-+static void receive_sync_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
++static void receive_rcom_status_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
 +{
-+	if (rc_in->rc_id != ls->ls_rcom_seq) {
-+		log_debug(ls, "reject old reply %d got %llx wanted %llx",
-+			  rc_in->rc_type, rc_in->rc_id, ls->ls_rcom_seq);
-+		return;
-+	}
 +	memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length);
 +	set_bit(LSFL_RCOM_READY, &ls->ls_flags);
 +	wake_up(&ls->ls_wait_general);
 +}
 +
-+static void receive_rcom_status_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
-+{
-+	receive_sync_reply(ls, rc_in);
-+}
-+
 +int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len)
 +{
 +	struct dlm_rcom *rc;
@@ -9607,7 +9561,6 @@
 +	int error = 0, len = sizeof(struct dlm_rcom);
 +
 +	memset(ls->ls_recover_buf, 0, dlm_config.buffer_size);
-+	ls->ls_recover_nodeid = nodeid;
 +
 +	if (nodeid == dlm_our_nodeid()) {
 +		dlm_copy_master_names(ls, last_name, last_len,
@@ -9620,7 +9573,6 @@
 +	if (error)
 +		goto out;
 +	memcpy(rc->rc_buf, last_name, last_len);
-+	rc->rc_id = ++ls->ls_rcom_seq;
 +
 +	send_rcom(ls, mh, rc);
 +
@@ -9657,7 +9609,6 @@
 +	error = create_rcom(ls, nodeid, DLM_RCOM_NAMES_REPLY, outlen, &rc, &mh);
 +	if (error)
 +		return;
-+	rc->rc_id = rc_in->rc_id;
 +
 +	dlm_copy_master_names(ls, rc_in->rc_buf, inlen, rc->rc_buf, outlen,
 +			      nodeid);
@@ -9666,7 +9617,9 @@
 +
 +static void receive_rcom_names_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
 +{
-+	receive_sync_reply(ls, rc_in);
++	memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length);
++	set_bit(LSFL_RCOM_READY, &ls->ls_flags);
++	wake_up(&ls->ls_wait_general);
 +}
 +
 +int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid)
@@ -10758,10 +10711,10 @@
 +
 diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
 new file mode 100644
-index 0000000..eac8e9f
+index 0000000..7010353
 --- /dev/null
 +++ b/fs/dlm/recoverd.c
-@@ -0,0 +1,286 @@
+@@ -0,0 +1,285 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -11039,7 +10992,6 @@
 +
 +void dlm_recoverd_suspend(struct dlm_ls *ls)
 +{
-+	wake_up(&ls->ls_wait_general);
 +	mutex_lock(&ls->ls_recoverd_active);
 +}
 +
@@ -21331,10 +21283,10 @@
 +#endif /* __GLOPS_DOT_H__ */
 diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
 new file mode 100644
-index 0000000..e98c14f
+index 0000000..90e0624
 --- /dev/null
 +++ b/fs/gfs2/incore.h
-@@ -0,0 +1,659 @@
+@@ -0,0 +1,658 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -21616,7 +21568,6 @@
 +
 +enum {
 +	GFF_DID_DIRECT_ALLOC	= 0,
-+	GFF_EXLOCK = 1,
 +};
 +
 +struct gfs2_file {
@@ -23705,10 +23656,10 @@
 +#endif /* __LM_DOT_H__ */
 diff --git a/fs/gfs2/lm_interface.h b/fs/gfs2/lm_interface.h
 new file mode 100644
-index 0000000..1da95a5
+index 0000000..9d34bf3
 --- /dev/null
 +++ b/fs/gfs2/lm_interface.h
-@@ -0,0 +1,290 @@
+@@ -0,0 +1,295 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -23976,11 +23927,16 @@
 +/*
 + * Lock module bottom interface.  A lock module makes itself available to GFS
 + * with these functions.
++ *
++ * For the time being, we copy the gfs1 lock module bottom interface so the
++ * same lock modules can be used with both gfs1 and gfs2 (it won't be possible
++ * to load both gfs1 and gfs2 at once.)  Eventually the lock modules will fork
++ * for gfs1/gfs2 and this API can change to the gfs2_ prefix.
 + */
 +
-+int gfs2_register_lockproto(struct lm_lockops *proto);
++int gfs_register_lockproto(struct lm_lockops *proto);
 +
-+void gfs2_unregister_lockproto(struct lm_lockops *proto);
++void gfs_unregister_lockproto(struct lm_lockops *proto);
 +
 +/*
 + * Lock module top interface.  GFS calls these functions when mounting or
@@ -24001,7 +23957,7 @@
 +
 diff --git a/fs/gfs2/locking.c b/fs/gfs2/locking.c
 new file mode 100644
-index 0000000..ded1ef6
+index 0000000..1831928
 --- /dev/null
 +++ b/fs/gfs2/locking.c
 @@ -0,0 +1,191 @@
@@ -24038,13 +23994,13 @@
 +static struct mutex lmh_lock;
 +
 +/**
-+ * gfs2_register_lockproto - Register a low-level locking protocol
++ * gfs_register_lockproto - Register a low-level locking protocol
 + * @proto: the protocol definition
 + *
 + * Returns: 0 on success, -EXXX on failure
 + */
 +
-+int gfs2_register_lockproto(struct lm_lockops *proto)
++int gfs_register_lockproto(struct lm_lockops *proto)
 +{
 +	struct lmh_wrapper *lw;
 +
@@ -24074,12 +24030,12 @@
 +}
 +
 +/**
-+ * gfs2_unregister_lockproto - Unregister a low-level locking protocol
++ * gfs_unregister_lockproto - Unregister a low-level locking protocol
 + * @proto: the protocol definition
 + *
 + */
 +
-+void gfs2_unregister_lockproto(struct lm_lockops *proto)
++void gfs_unregister_lockproto(struct lm_lockops *proto)
 +{
 +	struct lmh_wrapper *lw;
 +
@@ -24124,7 +24080,7 @@
 +	int try = 0;
 +	int error, found;
 +
-+retry:
++ retry:
 +	mutex_lock(&lmh_lock);
 +
 +	found = 0;
@@ -24158,7 +24114,7 @@
 +				     min_lvb_size, flags, lockstruct, fskobj);
 +	if (error)
 +		module_put(lw->lw_ops->lm_owner);
-+out:
++ out:
 +	mutex_unlock(&lmh_lock);
 +	return error;
 +}
@@ -24193,8 +24149,8 @@
 +	INIT_LIST_HEAD(&lmh_list);
 +}
 +
-+EXPORT_SYMBOL_GPL(gfs2_register_lockproto);
-+EXPORT_SYMBOL_GPL(gfs2_unregister_lockproto);
++EXPORT_SYMBOL_GPL(gfs_register_lockproto);
++EXPORT_SYMBOL_GPL(gfs_unregister_lockproto);
 +
 diff --git a/fs/gfs2/locking/dlm/Makefile b/fs/gfs2/locking/dlm/Makefile
 new file mode 100644
@@ -24948,7 +24904,7 @@
 +
 diff --git a/fs/gfs2/locking/dlm/main.c b/fs/gfs2/locking/dlm/main.c
 new file mode 100644
-index 0000000..870a1cd
+index 0000000..89728c9
 --- /dev/null
 +++ b/fs/gfs2/locking/dlm/main.c
 @@ -0,0 +1,64 @@
@@ -24974,7 +24930,7 @@
 +{
 +	int error;
 +
-+	error = gfs2_register_lockproto(&gdlm_ops);
++	error = gfs_register_lockproto(&gdlm_ops);
 +	if (error) {
 +		printk(KERN_WARNING "lock_dlm:  can't register protocol: %d\n",
 +		       error);
@@ -24983,14 +24939,14 @@
 +
 +	error = gdlm_sysfs_init();
 +	if (error) {
-+		gfs2_unregister_lockproto(&gdlm_ops);
++		gfs_unregister_lockproto(&gdlm_ops);
 +		return error;
 +	}
 +
 +	error = gdlm_plock_init();
 +	if (error) {
 +		gdlm_sysfs_exit();
-+		gfs2_unregister_lockproto(&gdlm_ops);
++		gfs_unregister_lockproto(&gdlm_ops);
 +		return error;
 +	}
 +
@@ -25006,7 +24962,7 @@
 +{
 +	gdlm_plock_exit();
 +	gdlm_sysfs_exit();
-+	gfs2_unregister_lockproto(&gdlm_ops);
++	gfs_unregister_lockproto(&gdlm_ops);
 +}
 +
 +module_init(init_lock_dlm);
@@ -25280,10 +25236,10 @@
 +
 diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
 new file mode 100644
-index 0000000..1acb251
+index 0000000..e5b11f0
 --- /dev/null
 +++ b/fs/gfs2/locking/dlm/plock.c
-@@ -0,0 +1,302 @@
+@@ -0,0 +1,301 @@
 +/*
 + * Copyright (C) 2005 Red Hat, Inc.  All rights reserved.
 + *
@@ -25518,8 +25474,7 @@
 +	spin_lock(&ops_lock);
 +	list_for_each_entry(op, &recv_list, list) {
 +		if (op->info.fsid == info.fsid &&
-+		    op->info.number == info.number &&
-+		    op->info.owner == info.owner) {
++		    op->info.number == info.number) {
 +			list_del_init(&op->list);
 +			found = 1;
 +			op->done = 1;
@@ -26193,7 +26148,7 @@
 +
 diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c
 new file mode 100644
-index 0000000..748aa5d
+index 0000000..97ffac5
 --- /dev/null
 +++ b/fs/gfs2/locking/nolock/main.c
 @@ -0,0 +1,259 @@
@@ -26432,7 +26387,7 @@
 +{
 +	int error;
 +
-+	error = gfs2_register_lockproto(&nolock_ops);
++	error = gfs_register_lockproto(&nolock_ops);
 +	if (error) {
 +		printk(KERN_WARNING
 +		       "lock_nolock: can't register protocol: %d\n", error);
@@ -26446,7 +26401,7 @@
 +
 +static void __exit exit_nolock(void)
 +{
-+	gfs2_unregister_lockproto(&nolock_ops);
++	gfs_unregister_lockproto(&nolock_ops);
 +}
 +
 +module_init(init_nolock);
@@ -26458,7 +26413,7 @@
 +
 diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
 new file mode 100644
-index 0000000..a591fb8
+index 0000000..60fdc94
 --- /dev/null
 +++ b/fs/gfs2/log.c
 @@ -0,0 +1,601 @@
@@ -26720,8 +26675,8 @@
 +	if (list_empty(&sdp->sd_ail1_list))
 +		tail = sdp->sd_log_head;
 +	else {
-+		ai = list_entry(sdp->sd_ail1_list.prev, struct gfs2_ail,
-+				ai_list);
++		ai = list_entry(sdp->sd_ail1_list.prev,
++				struct gfs2_ail, ai_list);
 +		tail = ai->ai_first;
 +	}
 +
@@ -29670,10 +29625,10 @@
 +
 diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
 new file mode 100644
-index 0000000..45afd05
+index 0000000..fca69f1
 --- /dev/null
 +++ b/fs/gfs2/ops_address.c
-@@ -0,0 +1,797 @@
+@@ -0,0 +1,778 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -29807,8 +29762,8 @@
 +static int gfs2_writepage(struct page *page, struct writeback_control *wbc)
 +{
 +	struct inode *inode = page->mapping->host;
-+	struct gfs2_inode *ip = GFS2_I(inode);
-+	struct gfs2_sbd *sdp = GFS2_SB(inode);
++	struct gfs2_inode *ip = GFS2_I(page->mapping->host);
++	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
 +	loff_t i_size = i_size_read(inode);
 +	pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;
 +	unsigned offset;
@@ -29834,10 +29789,6 @@
 +		error = gfs2_trans_begin(sdp, RES_DINODE + 1, 0);
 +		if (error)
 +			goto out_ignore;
-+		if (!page_has_buffers(page)) {
-+			create_empty_buffers(page, inode->i_sb->s_blocksize,
-+					     (1 << BH_Dirty)|(1 << BH_Uptodate));
-+		}
 +		gfs2_page_add_databufs(ip, page, 0, sdp->sd_vfs->s_blocksize-1);
 +		done_trans = 1;
 +	}
@@ -29917,22 +29868,14 @@
 +	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
 +	struct gfs2_holder gh;
 +	int error;
-+	int do_unlock = 0;
 +
 +	if (likely(file != &gfs2_internal_file_sentinal)) {
-+		if (file) {
-+			struct gfs2_file *gf = file->private_data;
-+			if (test_bit(GFF_EXLOCK, &gf->f_flags))
-+				goto skip_lock;
-+		}
 +		gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|GL_AOP, &gh);
-+		do_unlock = 1;
 +		error = gfs2_glock_nq_m_atime(1, &gh);
 +		if (unlikely(error))
 +			goto out_unlock;
 +	}
 +
-+skip_lock:
 +	if (gfs2_is_stuffed(ip)) {
 +		error = stuffed_readpage(ip, page);
 +		unlock_page(page);
@@ -29950,7 +29893,7 @@
 +	return error;
 +out_unlock:
 +	unlock_page(page);
-+	if (do_unlock)
++	if (file != &gfs2_internal_file_sentinal)
 +		gfs2_holder_uninit(&gh);
 +	goto out;
 +}
@@ -29979,24 +29922,17 @@
 +	struct gfs2_holder gh;
 +	unsigned page_idx;
 +	int ret;
-+	int do_unlock = 0;
 +
 +	if (likely(file != &gfs2_internal_file_sentinal)) {
-+		if (file) {
-+			struct gfs2_file *gf = file->private_data;
-+			if (test_bit(GFF_EXLOCK, &gf->f_flags))
-+				goto skip_lock;
-+		}
 +		gfs2_holder_init(ip->i_gl, LM_ST_SHARED,
 +				 LM_FLAG_TRY_1CB|GL_ATIME|GL_AOP, &gh);
-+		do_unlock = 1;
 +		ret = gfs2_glock_nq_m_atime(1, &gh);
 +		if (ret == GLR_TRYFAILED) 
 +			goto out_noerror;
 +		if (unlikely(ret))
 +			goto out_unlock;
 +	}
-+skip_lock:
++
 +	if (gfs2_is_stuffed(ip)) {
 +		struct pagevec lru_pvec;
 +		pagevec_init(&lru_pvec, 0);
@@ -30021,7 +29957,7 @@
 +		ret = mpage_readpages(mapping, pages, nr_pages, gfs2_get_block);
 +	}
 +
-+	if (do_unlock) {
++	if (likely(file != &gfs2_internal_file_sentinal)) {
 +		gfs2_glock_dq_m(1, &gh);
 +		gfs2_holder_uninit(&gh);
 +	}
@@ -30039,7 +29975,7 @@
 +		unlock_page(page);
 +		page_cache_release(page);
 +	}
-+	if (do_unlock)
++	if (likely(file != &gfs2_internal_file_sentinal))
 +		gfs2_holder_uninit(&gh);
 +	goto out;
 +}
@@ -34372,10 +34308,10 @@
 +#endif /* __OPS_SUPER_DOT_H__ */
 diff --git a/fs/gfs2/ops_vm.c b/fs/gfs2/ops_vm.c
 new file mode 100644
-index 0000000..875a769
+index 0000000..aff6637
 --- /dev/null
 +++ b/fs/gfs2/ops_vm.c
-@@ -0,0 +1,188 @@
+@@ -0,0 +1,194 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -34424,7 +34360,13 @@
 +					unsigned long address, int *type)
 +{
 +	struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
++	struct gfs2_holder i_gh;
 +	struct page *result;
++	int error;
++
++	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, 0, &i_gh);
++	if (error)
++		return NULL;
 +
 +	set_bit(GIF_PAGED, &ip->i_flags);
 +
@@ -34433,6 +34375,8 @@
 +	if (result && result != NOPAGE_OOM)
 +		pfault_be_greedy(ip);
 +
++	gfs2_glock_dq_uninit(&i_gh);
++
 +	return result;
 +}
 +
@@ -34511,9 +34455,7 @@
 +static struct page *gfs2_sharewrite_nopage(struct vm_area_struct *area,
 +					   unsigned long address, int *type)
 +{
-+	struct file *file = area->vm_file;
-+	struct gfs2_file *gf = file->private_data;
-+	struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);
++	struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
 +	struct gfs2_holder i_gh;
 +	struct page *result = NULL;
 +	unsigned long index = ((address - area->vm_start) >> PAGE_CACHE_SHIFT) +
@@ -34528,14 +34470,13 @@
 +	set_bit(GIF_PAGED, &ip->i_flags);
 +	set_bit(GIF_SW_PAGED, &ip->i_flags);
 +
-+	error = gfs2_write_alloc_required(ip, (u64)index << PAGE_CACHE_SHIFT,
++	error = gfs2_write_alloc_required(ip,
++					  (uint64_t)index << PAGE_CACHE_SHIFT,
 +					  PAGE_CACHE_SIZE, &alloc_required);
 +	if (error)
 +		goto out;
 +
-+	set_bit(GFF_EXLOCK, &gf->f_flags);
 +	result = filemap_nopage(area, address, type);
-+	clear_bit(GFF_EXLOCK, &gf->f_flags);
 +	if (!result || result == NOPAGE_OOM)
 +		goto out;
 +
@@ -34550,7 +34491,8 @@
 +	}
 +
 +	pfault_be_greedy(ip);
-+out:
++
++ out:
 +	gfs2_glock_dq_uninit(&i_gh);
 +
 +	return result;
@@ -35918,10 +35860,10 @@
 +#endif /* __QUOTA_DOT_H__ */
 diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
 new file mode 100644
-index 0000000..bbd44a4
+index 0000000..7aabc03
 --- /dev/null
 +++ b/fs/gfs2/recovery.c
-@@ -0,0 +1,572 @@
+@@ -0,0 +1,575 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -36077,7 +36019,8 @@
 +
 +	if (lh.lh_header.mh_magic != GFS2_MAGIC ||
 +	    lh.lh_header.mh_type != GFS2_METATYPE_LH ||
-+	    lh.lh_blkno != blk || lh.lh_hash != hash)
++	    lh.lh_blkno != blk ||
++	    lh.lh_hash != hash)
 +		return 1;
 +
 +	*head = lh;
@@ -36405,9 +36348,11 @@
 +
 +		/* Acquire a shared hold on the transaction lock */
 +
-+		error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED,
++		error = gfs2_glock_nq_init(sdp->sd_trans_gl,
++					   LM_ST_SHARED,
 +					   LM_FLAG_NOEXP | LM_FLAG_PRIORITY |
-+					   GL_NOCANCEL | GL_NOCACHE, &t_gh);
++					   GL_NOCANCEL | GL_NOCACHE,
++					   &t_gh);
 +		if (error)
 +			goto fail_gunlock_ji;
 +

linux-2.6-gfs2-locking-exports.patch:
 locking.c |    3 +++
 1 files changed, 3 insertions(+)

Index: linux-2.6-gfs2-locking-exports.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-locking-exports.patch,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.2
diff -u -r1.1.10.1 -r1.1.10.2
--- linux-2.6-gfs2-locking-exports.patch	11 Aug 2006 19:11:01 -0000	1.1.10.1
+++ linux-2.6-gfs2-locking-exports.patch	16 Aug 2006 20:42:35 -0000	1.1.10.2
@@ -1,10 +1,12 @@
---- linux-2.6.17.noarch/fs/gfs2/locking.c~	2006-08-10 13:33:09.000000000 -0400
-+++ linux-2.6.17.noarch/fs/gfs2/locking.c	2006-08-10 13:33:23.000000000 -0400
-@@ -188,4 +188,6 @@ void __init gfs2_init_lmh(void)
- 
- EXPORT_SYMBOL_GPL(gfs2_register_lockproto);
- EXPORT_SYMBOL_GPL(gfs2_unregister_lockproto);
--
-+EXPORT_SYMBOL_GPL(gfs2_withdraw_lockproto);
-+EXPORT_SYMBOL_GPL(gfs2_mount_lockproto);
-+EXPORT_SYMBOL_GPL(gfs2_unmount_lockproto);
+*** gfs2-2.6-18-rc2/fs/gfs2/locking.c	2006-07-20 10:44:33.000000000 -0500
+--- gfs2-devel/fs/gfs2/locking.c	2006-07-20 12:27:53.000000000 -0500
+*************** void __init gfs2_init_lmh(void)
+*** 188,191 ****
+--- 188,194 ----
+  
+  EXPORT_SYMBOL_GPL(gfs_register_lockproto);
+  EXPORT_SYMBOL_GPL(gfs_unregister_lockproto);
++ EXPORT_SYMBOL_GPL(gfs2_withdraw_lockproto);
++ EXPORT_SYMBOL_GPL(gfs2_mount_lockproto);
++ EXPORT_SYMBOL_GPL(gfs2_unmount_lockproto);
+  

linux-2.6-lockdep-fixes.patch:
 a/net/ipv6/icmp.c                             |   13 ++++++++++
 linux-2.6.17-mm6/include/net/sock.h           |   33 +++++++++++++++++++++++---
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++++++++-
 linux-2.6.18-rc1/net/socket.c                 |    8 +++++-
 5 files changed, 64 insertions(+), 8 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.16.4.1
retrieving revision 1.16.4.2
diff -u -r1.16.4.1 -r1.16.4.2
--- linux-2.6-lockdep-fixes.patch	11 Aug 2006 19:11:01 -0000	1.16.4.1
+++ linux-2.6-lockdep-fixes.patch	16 Aug 2006 20:42:35 -0000	1.16.4.2
@@ -387,81 +387,4 @@
  
  		/* Enough space for 2 64K ICMP packets, including
  		 * sk_buff struct overhead.
-
---- a/kernel/lockdep.c~lockdep-print-kernel-version
-+++ a/kernel/lockdep.c
-@@ -36,6 +36,7 @@
- #include <linux/stacktrace.h>
- #include <linux/debug_locks.h>
- #include <linux/irqflags.h>
-+#include <linux/utsname.h>
- 
- #include <asm/sections.h>
- 
-@@ -508,6 +509,13 @@ print_circular_bug_entry(struct lock_lis
- 	return 0;
- }
- 
-+static void print_kernel_version(void)
-+{
-+	printk("%s %.*s\n", system_utsname.release,
-+		(int)strcspn(system_utsname.version, " "),
-+		system_utsname.version);
-+}
-+
- /*
-  * When a circular dependency is detected, print the
-  * header first:
-@@ -524,6 +532,7 @@ print_circular_bug_header(struct lock_li
- 
- 	printk("\n=======================================================\n");
- 	printk(  "[ INFO: possible circular locking dependency detected ]\n");
-+	print_kernel_version();
- 	printk(  "-------------------------------------------------------\n");
- 	printk("%s/%d is trying to acquire lock:\n",
- 		curr->comm, curr->pid);
-@@ -705,6 +714,7 @@ print_bad_irq_dependency(struct task_str
- 	printk("\n======================================================\n");
- 	printk(  "[ INFO: %s-safe -> %s-unsafe lock order detected ]\n",
- 		irqclass, irqclass);
-+	print_kernel_version();
- 	printk(  "------------------------------------------------------\n");
- 	printk("%s/%d [HC%u[%lu]:SC%u[%lu]:HE%u:SE%u] is trying to acquire:\n",
- 		curr->comm, curr->pid,
-@@ -786,6 +796,7 @@ print_deadlock_bug(struct task_struct *c
- 
- 	printk("\n=============================================\n");
- 	printk(  "[ INFO: possible recursive locking detected ]\n");
-+	print_kernel_version();
- 	printk(  "---------------------------------------------\n");
- 	printk("%s/%d is trying to acquire lock:\n",
- 		curr->comm, curr->pid);
-@@ -1368,6 +1379,7 @@ print_irq_inversion_bug(struct task_stru
- 
- 	printk("\n=========================================================\n");
- 	printk(  "[ INFO: possible irq lock inversion dependency detected ]\n");
-+	print_kernel_version();
- 	printk(  "---------------------------------------------------------\n");
- 	printk("%s/%d just changed the state of lock:\n",
- 		curr->comm, curr->pid);
-@@ -1462,6 +1474,7 @@ print_usage_bug(struct task_struct *curr
- 
- 	printk("\n=================================\n");
- 	printk(  "[ INFO: inconsistent lock state ]\n");
-+	print_kernel_version();
- 	printk(  "---------------------------------\n");
- 
- 	printk("inconsistent {%s} -> {%s} usage.\n",
 _
-
---- linux-2.6.17.noarch/fs/exec.c~	2006-08-10 21:49:38.000000000 -0400
-+++ linux-2.6.17.noarch/fs/exec.c	2006-08-10 21:50:36.000000000 -0400
-@@ -753,7 +753,7 @@ no_thread_group:
- 
- 		write_lock_irq(&tasklist_lock);
- 		spin_lock(&oldsighand->siglock);
--		spin_lock(&newsighand->siglock);
-+		spin_lock_nested(&newsighand->siglock, SINGLE_DEPTH_NESTING);
- 
- 		rcu_assign_pointer(current->sighand, newsighand);
- 		recalc_sigpending();

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  455 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  839 +++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  551 ++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            |  650 +++++++++++--
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  688 +++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   74 +
 include/asm-powerpc/tracehook.h         |  303 ++++++
 include/asm-s390/tracehook.h            |  105 ++
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  106 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   86 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  641 +++++++++++++
 include/linux/utrace.h                  |  471 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  259 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1562 +++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1520 +++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 89 files changed, 8167 insertions(+), 3281 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -r1.12.4.1 -r1.12.4.2
--- linux-2.6-utrace.patch	11 Aug 2006 19:11:01 -0000	1.12.4.1
+++ linux-2.6-utrace.patch	16 Aug 2006 20:42:36 -0000	1.12.4.2
@@ -7,24 +7,22 @@
  arch/i386/kernel/entry.S                |    7 
  arch/i386/kernel/i387.c                 |  143 +--
  arch/i386/kernel/process.c              |    3 
- arch/i386/kernel/ptrace.c               |  839 +++++++++-------
+ arch/i386/kernel/ptrace.c               |  839 +++++++++--------
  arch/i386/kernel/signal.c               |   39 -
  arch/i386/kernel/vm86.c                 |    7 
- arch/ia64/ia32/ia32_entry.S             |    2 
- arch/ia64/ia32/sys_ia32.c               |   23 
+ arch/ia64/ia32/sys_ia32.c               |    2 
  arch/ia64/kernel/asm-offsets.c          |    2 
  arch/ia64/kernel/fsys.S                 |   16 
  arch/ia64/kernel/mca.c                  |    2 
  arch/ia64/kernel/ptrace.c               |   41 -
- arch/ia64/kernel/signal.c               |    4 
  arch/mips/kernel/ptrace.c               |   21 
  arch/mips/kernel/sysirix.c              |    2 
  arch/powerpc/kernel/Makefile            |    4 
  arch/powerpc/kernel/asm-offsets.c       |    2 
  arch/powerpc/kernel/process.c           |    5 
  arch/powerpc/kernel/ptrace-common.h     |  161 ---
- arch/powerpc/kernel/ptrace.c            |  785 +++++++--------
- arch/powerpc/kernel/ptrace32.c          |  436 --------
+ arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
+ arch/powerpc/kernel/ptrace32.c          |  436 ---------
  arch/powerpc/kernel/signal_32.c         |   56 +
  arch/powerpc/kernel/signal_64.c         |    4 
  arch/powerpc/kernel/sys_ppc32.c         |    5 
@@ -34,12 +32,12 @@
  arch/s390/kernel/compat_linux.c         |    3 
  arch/s390/kernel/compat_signal.c        |    5 
  arch/s390/kernel/process.c              |    3 
- arch/s390/kernel/ptrace.c               |  553 ++++++++++-
+ arch/s390/kernel/ptrace.c               |  551 ++++++++++-
  arch/s390/kernel/signal.c               |    4 
  arch/s390/kernel/traps.c                |    6 
  arch/sparc64/kernel/entry.S             |    6 
  arch/sparc64/kernel/process.c           |    3 
- arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
+ arch/sparc64/kernel/ptrace.c            |  650 +++++++++++--
  arch/sparc64/kernel/signal.c            |    2 
  arch/sparc64/kernel/signal32.c          |    2 
  arch/sparc64/kernel/sys_sparc32.c       |    3 
@@ -48,7 +46,7 @@
  arch/x86_64/ia32/ia32_aout.c            |    6 
  arch/x86_64/ia32/ia32_signal.c          |    8 
  arch/x86_64/ia32/ia32entry.S            |    2 
- arch/x86_64/ia32/ptrace32.c             |  690 +++++++++----
+ arch/x86_64/ia32/ptrace32.c             |  690 +++++++++-----
  arch/x86_64/ia32/sys_ia32.c             |    5 
  arch/x86_64/kernel/process.c            |    5 
  arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
@@ -62,13 +60,12 @@
  fs/binfmt_flat.c                        |    3 
  fs/binfmt_som.c                         |    2 
  fs/exec.c                               |   11 
- fs/proc/array.c                         |   14 
+ fs/proc/array.c                         |    7 
  fs/proc/base.c                          |   17 
  include/asm-i386/i387.h                 |   13 
  include/asm-i386/signal.h               |    4 
  include/asm-i386/thread_info.h          |    7 
  include/asm-i386/tracehook.h            |   74 +
- include/asm-ia64/tracehook.h            |   67 +
  include/asm-powerpc/tracehook.h         |  303 ++++++
  include/asm-s390/tracehook.h            |  105 ++
  include/asm-sparc64/tracehook.h         |   44 +
@@ -76,27 +73,25 @@
  include/asm-x86_64/thread_info.h        |    2 
  include/asm-x86_64/tracehook.h          |  106 ++
  include/linux/init_task.h               |    3 
- include/linux/ptrace.h                  |   88 +-
+ include/linux/ptrace.h                  |   86 +-
  include/linux/sched.h                   |   25 
- include/linux/tracehook.h               |  645 +++++++++++++
- include/linux/utrace.h                  |  481 +++++++++
+ include/linux/tracehook.h               |  641 +++++++++++++
+ include/linux/utrace.h                  |  471 +++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
- kernel/exit.c                           |  253 +----
- kernel/fork.c                           |   62 -
- kernel/ptrace.c                         | 1592 ++++++++++++++++++++++++-------
+ kernel/exit.c                           |  259 +----
+ kernel/fork.c                           |   60 -
+ kernel/ptrace.c                         | 1562 ++++++++++++++++++++++++-------
  kernel/signal.c                         |  211 +---
  kernel/sys.c                            |    2 
  kernel/timer.c                          |    6 
- kernel/utrace.c                         | 1526 ++++++++++++++++++++++++++++++
- security/selinux/hooks.c                |   54 +
- security/selinux/include/objsec.h       |    1 
- 93 files changed, 8332 insertions(+), 3321 deletions(-)
+ kernel/utrace.c                         | 1520 ++++++++++++++++++++++++++++++
+ security/selinux/hooks.c                |    6 
+ 89 files changed, 8168 insertions(+), 3282 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
  create mode 100644 include/asm-i386/tracehook.h
- create mode 100644 include/asm-ia64/tracehook.h
  create mode 100644 include/asm-powerpc/tracehook.h
  create mode 100644 include/asm-s390/tracehook.h
  create mode 100644 include/asm-sparc64/tracehook.h
@@ -411,76 +406,6 @@
 +
 +
 +#endif
---- linux-2.6/include/asm-ia64/tracehook.h.utrace-ptrace-compat
-+++ linux-2.6/include/asm-ia64/tracehook.h
-@@ -0,0 +1,67 @@
-+/*
-+ * Copyright (C)2006 Intel Co
-+ *	Anil S Keshavamurthy <anil.s.keshavamurthy at intel.com>
-+ *	and Bibo Mao <bibo.mao at intel.com> adapted from i386.
-+ *
-+ * 	Tracing hooks, ia64 CPU support
-+ */
-+
-+#ifndef _ASM_TRACEHOOK_H
-+#define _ASM_TRACEHOOK_H	1
-+
-+#include <linux/sched.h>
-+#include <asm/ptrace.h>
-+
-+/*
-+ * See linux/tracehook.h for the descriptions of what these need to do.
-+ */
-+
-+#define ARCH_HAS_SINGLE_STEP	(1)
-+#define ARCH_HAS_BLOCK_STEP	(1)
-+
-+static inline void tracehook_enable_single_step(struct task_struct *tsk)
-+{
-+	struct pt_regs *pt = task_pt_regs(tsk);
-+	ia64_psr(pt)->ss = 1;
-+}
-+
-+static inline void tracehook_disable_single_step(struct task_struct *tsk)
-+{
-+	struct pt_regs *pt = task_pt_regs(tsk);
-+	ia64_psr(pt)->ss = 0;
-+}
-+
-+static inline void tracehook_enable_block_step(struct task_struct *tsk)
-+{
-+	struct pt_regs *pt = task_pt_regs(tsk);
-+	ia64_psr(pt)->tb = 1;
-+}
-+
-+static inline void tracehook_disable_block_step(struct task_struct *tsk)
-+{
-+	struct pt_regs *pt = task_pt_regs(tsk);
-+	ia64_psr(pt)->tb = 0;
-+}
-+
-+static inline void tracehook_enable_syscall_trace(struct task_struct *tsk)
-+{
-+	set_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE);
-+}
-+
-+static inline void tracehook_disable_syscall_trace(struct task_struct *tsk)
-+{
-+	clear_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE);
-+}
-+
-+static inline int tracehook_single_step_enabled(struct task_struct *tsk)
-+{
-+	struct pt_regs *pt = task_pt_regs(tsk);
-+	return ia64_psr(pt)->ss;
-+}
-+
-+static inline void tracehook_abort_syscall(struct pt_regs *regs)
-+{
-+	regs->r15 = -1L;
-+}
-+
-+#endif
 --- linux-2.6/include/asm-i386/i387.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-i386/i387.h
 @@ -126,17 +126,12 @@ extern int save_i387( struct _fpstate __
@@ -1008,7 +933,7 @@
  extern int send_sig(int, struct task_struct *, int);
 --- linux-2.6/include/linux/utrace.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/utrace.h
-@@ -0,0 +1,481 @@
+@@ -0,0 +1,471 @@
 +/*
 + * User Debugging Data & Event Rendezvous
 + *
@@ -1262,10 +1187,11 @@
 +	/*
 +	 * Event reported for parent using CLONE_VFORK or vfork system call.
 +	 * The child has died or exec'd, so the vfork parent has unblocked
-+	 * and is about to return child_pid.
++	 * and is about to return child->pid.
 +	 */
 +	u32 (*report_vfork_done)(struct utrace_attached_engine *engine,
-+				 struct task_struct *parent, pid_t child_pid);
++				 struct task_struct *parent,
++				 struct task_struct *child);
 +
 +	/*
 +	 * Event reported after UTRACE_ACTION_QUIESCE is set, when the target
@@ -1383,22 +1309,11 @@
 +			   struct task_struct *target);
 +
 +	/*
-+	 * Return the task_struct for the task using ptrace on this one, or
-+	 * NULL.  Always called with rcu_read_lock held to keep the
-+	 * returned struct alive.
-+	 *
-+	 * At exec time, this may be called with task_lock(target) still
-+	 * held from when unsafe_exec was just called.  In that case it
-+	 * must give results consistent with those unsafe_exec results,
-+	 * i.e. non-NULL if any LSM_UNSAFE_PTRACE_* bits were set.
-+	 *
-+	 * The value is also used to display after "TracerPid:" in
-+	 * /proc/PID/status, where it is called with only rcu_read_lock held.
-+	 *
-+	 * If this engine returns NULL, another engine may supply the result.
++	 * Return the value to display after "TracerPid:" in /proc/PID/status.
++	 * If this engine returns zero, another engine may supply the value.
 +	 */
-+	struct task_struct *(*tracer_task)(struct utrace_attached_engine *,
-+					   struct task_struct *target);
++	pid_t (*tracer_pid)(struct utrace_attached_engine *engine,
++			    struct task_struct *target);
 +};
 +
 +
@@ -1477,13 +1392,13 @@
 +int utrace_get_signal(struct task_struct *, struct pt_regs *,
 +		      siginfo_t *, struct k_sigaction *);
 +void utrace_report_clone(unsigned long clone_flags, struct task_struct *child);
-+void utrace_report_vfork_done(pid_t child_pid);
++void utrace_report_vfork_done(struct task_struct *child);
 +void utrace_report_exit(long *exit_code);
 +void utrace_report_death(struct task_struct *);
 +int utrace_report_jctl(int type);
 +void utrace_report_exec(struct linux_binprm *bprm, struct pt_regs *regs);
 +void utrace_report_syscall(struct pt_regs *regs, int is_exit);
-+struct task_struct *utrace_tracer_task(struct task_struct *);
++pid_t utrace_tracer_pid(struct task_struct *);
 +int utrace_allow_access_process_vm(struct task_struct *);
 +int utrace_unsafe_exec(struct task_struct *);
 +void utrace_signal_handler_singlestep(struct task_struct *, struct pt_regs *);
@@ -1492,7 +1407,7 @@
 +#endif	/* linux/utrace.h */
 --- linux-2.6/include/linux/ptrace.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/ptrace.h
-@@ -49,66 +49,44 @@
+@@ -49,66 +49,42 @@
  #include <asm/ptrace.h>
  
  #ifdef __KERNEL__
@@ -1570,8 +1485,6 @@
 + * This reports any ptrace-child that is ready as do_wait would a normal child.
 + * If there are no ptrace children, returns -ECHILD.
 + * If there are some ptrace children but none reporting now, returns 0.
-+ * In those cases the tasklist_lock is still held so next_thread(tsk) works.
-+ * For any other return value, tasklist_lock is released before return.
 + */
 +int ptrace_do_wait(struct task_struct *tsk,
 +		   pid_t pid, int options, struct siginfo __user *infop,
@@ -1606,7 +1519,7 @@
  	.sibling	= LIST_HEAD_INIT(tsk.sibling),			\
 --- linux-2.6/include/linux/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/tracehook.h
-@@ -0,0 +1,645 @@
+@@ -0,0 +1,641 @@
 +/*
 + * Tracing hooks
 + *
@@ -1798,10 +1711,8 @@
 +		      void **kbuf, void __user **ubuf,
 +		      const void *data, int start_pos, int end_pos)
 +{
-+	if (*count == 0)
-+		return 0;
 +	BUG_ON(*pos < start_pos);
-+	if (end_pos < 0 || *pos < end_pos) {
++	if (*count > 0 && (end_pos < 0 || *pos < end_pos)) {
 +		unsigned int copy = (end_pos < 0 ? *count
 +				     : min(*count, end_pos - *pos));
 +		data += *pos - start_pos;
@@ -1824,10 +1735,8 @@
 +		     const void **kbuf, const void __user **ubuf,
 +		     void *data, int start_pos, int end_pos)
 +{
-+	if (*count == 0)
-+		return 0;
 +	BUG_ON(*pos < start_pos);
-+	if (end_pos < 0 || *pos < end_pos) {
++	if (*count > 0 && (end_pos < 0 || *pos < end_pos)) {
 +		unsigned int copy = (end_pos < 0 ? *count
 +				     : min(*count, end_pos - *pos));
 +		data += *pos - start_pos;
@@ -1860,6 +1769,18 @@
 +#include <linux/utrace.h>
 +#endif
 +
++/*
++ * Return the value to display after "TracerPid:" in /proc/PID/status.
++ * Called without locks.
++ */
++static inline pid_t tracehook_tracer_pid(struct task_struct *p)
++{
++#ifdef CONFIG_UTRACE
++	if (p->utrace_flags)
++		return utrace_tracer_pid(p);
++#endif
++	return 0;
++}
 +
 +/*
 + * Called in copy_process when setting up the copied task_struct,
@@ -2079,22 +2000,13 @@
 +}
 +
 +/*
-+ * Return the task_struct for the task using ptrace on this one, or NULL.
-+ * Must be called with rcu_read_lock held to keep the returned struct alive.
-+ *
-+ * At exec time, this may be called with task_lock(p) still held from when
-+ * tracehook_unsafe_exec was just called.
-+ *
-+ * The value is also used to display after "TracerPid:" in /proc/PID/status,
-+ * where it is called with only rcu_read_lock held.
++ * Return nonzero if the task is being traced so security checks should apply.
++ * Called with task_lock(tsk) held.
 + */
-+static inline struct task_struct *tracehook_tracer_task(struct task_struct *p)
++static inline int tracehook_security_ptrace(struct task_struct *tsk)
 +{
-+#ifdef CONFIG_UTRACE
-+	if (p->utrace_flags)
-+		return utrace_tracer_task(p);
-+#endif
-+	return NULL;
++	return 0;
++	// return (p->ptrace & PT_PTRACED);
 +}
 +
 +/*
@@ -2200,15 +2112,12 @@
 +/*
 + * Called after a CLONE_VFORK parent has waited for the child to complete.
 + * The clone/vfork system call will return immediately after this.
-+ * The child pointer may be invalid if a self-reaping child died and
-+ * tracehook_report_clone took no action to prevent it from self-reaping.
 + */
-+static inline void tracehook_report_vfork_done(struct task_struct *child,
-+					       pid_t child_pid)
++static inline void tracehook_report_vfork_done(struct task_struct *child)
 +{
 +#ifdef CONFIG_UTRACE
 +	if (current->utrace_flags & UTRACE_EVENT(VFORK_DONE))
-+		utrace_report_vfork_done(child_pid);
++		utrace_report_vfork_done(child);
 +#endif
 +}
 +
@@ -2710,16 +2619,6 @@
 +value.  It says to push the signal back on the thread's queue, with
 +the signal number and details possibly changed in info.  When the
 +thread is allowed to resume, it will dequeue and report it again.
---- linux-2.6/security/selinux/include/objsec.h.utrace-ptrace-compat
-+++ linux-2.6/security/selinux/include/objsec.h
-@@ -34,7 +34,6 @@ struct task_security_struct {
- 	u32 create_sid;      /* fscreate SID */
- 	u32 keycreate_sid;   /* keycreate SID */
- 	u32 sockcreate_sid;  /* fscreate SID */
--	u32 ptrace_sid;      /* SID of ptrace parent */
- };
- 
- struct inode_security_struct {
 --- linux-2.6/security/selinux/hooks.c.utrace-ptrace-compat
 +++ linux-2.6/security/selinux/hooks.c
 @@ -21,7 +21,7 @@
@@ -2731,115 +2630,24 @@
  #include <linux/errno.h>
  #include <linux/sched.h>
  #include <linux/security.h>
-@@ -159,7 +159,7 @@ static int task_alloc_security(struct ta
- 		return -ENOMEM;
- 
- 	tsec->task = task;
--	tsec->osid = tsec->sid = tsec->ptrace_sid = SECINITSID_UNLABELED;
-+	tsec->osid = tsec->sid = SECINITSID_UNLABELED;
- 	task->security = tsec;
+@@ -1397,7 +1397,7 @@ static int selinux_ptrace(struct task_st
  
- 	return 0;
-@@ -1387,19 +1387,13 @@ static int inode_security_set_sid(struct
- 
- static int selinux_ptrace(struct task_struct *parent, struct task_struct *child)
- {
--	struct task_security_struct *psec = parent->security;
--	struct task_security_struct *csec = child->security;
- 	int rc;
- 
- 	rc = secondary_ops->ptrace(parent,child);
- 	if (rc)
- 		return rc;
- 
--	rc = task_has_perm(parent, child, PROCESS__PTRACE);
--	/* Save the SID of the tracing process for later use in apply_creds. */
+ 	rc = task_has_perm(parent, child, PROCESS__PTRACE);
+ 	/* Save the SID of the tracing process for later use in apply_creds. */
 -	if (!(child->ptrace & PT_PTRACED) && !rc)
--		csec->ptrace_sid = psec->sid;
--	return rc;
-+	return task_has_perm(parent, child, PROCESS__PTRACE);
- }
- 
- static int selinux_capget(struct task_struct *target, kernel_cap_t *effective,
-@@ -1821,12 +1815,24 @@ static void selinux_bprm_apply_creds(str
- 		/* Check for ptracing, and update the task SID if ok.
- 		   Otherwise, leave SID unchanged and kill. */
- 		if (unsafe & (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) {
--			rc = avc_has_perm(tsec->ptrace_sid, sid,
--					  SECCLASS_PROCESS, PROCESS__PTRACE,
--					  NULL);
--			if (rc) {
--				bsec->unsafe = 1;
--				return;
-+			struct task_struct *t;
-+
-+			rcu_read_lock();
-+			t = tracehook_tracer_task(current);
-+			if (unlikely(t == NULL))
-+				rcu_read_unlock();
-+			else {
-+				struct task_security_struct *sec = t->security;
-+				u32 ptsid = sec->sid;
-+				rcu_read_unlock();
-+
-+				rc = avc_has_perm(ptsid, sid,
-+						  SECCLASS_PROCESS,
-+						  PROCESS__PTRACE, NULL);
-+				if (rc) {
-+					bsec->unsafe = 1;
-+					return;
-+				}
- 			}
- 		}
- 		tsec->sid = sid;
-@@ -2684,11 +2690,6 @@ static int selinux_task_alloc_security(s
- 	tsec2->keycreate_sid = tsec1->keycreate_sid;
- 	tsec2->sockcreate_sid = tsec1->sockcreate_sid;
- 
--	/* Retain ptracer SID across fork, if any.
--	   This will be reset by the ptrace hook upon any
--	   subsequent ptrace_attach operations. */
--	tsec2->ptrace_sid = tsec1->ptrace_sid;
--
- 	return 0;
++	if (/* XXX !(child->ptrace & PT_PTRACED) && */ !rc)
+ 		csec->ptrace_sid = psec->sid;
+ 	return rc;
  }
- 
-@@ -4293,6 +4294,7 @@ static int selinux_setprocattr(struct ta
- 			       char *name, void *value, size_t size)
- {
- 	struct task_security_struct *tsec;
-+	struct task_struct *tracer;
- 	u32 sid = 0;
- 	int error;
- 	char *str = value;
-@@ -4381,18 +4383,24 @@ static int selinux_setprocattr(struct ta
+@@ -4385,7 +4385,7 @@ static int selinux_setprocattr(struct ta
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and fail. */
  		task_lock(p);
 -		if (p->ptrace & PT_PTRACED) {
--			error = avc_has_perm_noaudit(tsec->ptrace_sid, sid,
-+		rcu_read_lock();
-+		tracer = tracehook_tracer_task(p);
-+		if (tracer != NULL) {
-+			struct task_security_struct *ptsec = tracer->security;
-+			u32 ptsid = ptsec->sid;
-+			rcu_read_unlock();
-+			error = avc_has_perm_noaudit(ptsid, sid,
++		if (tracehook_security_ptrace(p)) {
+ 			error = avc_has_perm_noaudit(tsec->ptrace_sid, sid,
  						     SECCLASS_PROCESS,
  						     PROCESS__PTRACE, &avd);
- 			if (!error)
- 				tsec->sid = sid;
- 			task_unlock(p);
--			avc_audit(tsec->ptrace_sid, sid, SECCLASS_PROCESS,
-+			avc_audit(ptsid, sid, SECCLASS_PROCESS,
- 				  PROCESS__PTRACE, &avd, error, NULL);
- 			if (error)
- 				return error;
- 		} else {
-+			rcu_read_unlock();
- 			tsec->sid = sid;
- 			task_unlock(p);
- 		}
 --- linux-2.6/kernel/fork.c.utrace-ptrace-compat
 +++ linux-2.6/kernel/fork.c
 @@ -36,7 +36,7 @@
@@ -2979,7 +2787,7 @@
  			wait_for_completion(&vfork);
 -			if (unlikely (current->ptrace & PT_TRACE_VFORK_DONE))
 -				ptrace_notify ((PTRACE_EVENT_VFORK_DONE << 8) | SIGTRAP);
-+			tracehook_report_vfork_done(p, nr);
++			tracehook_report_vfork_done(p);
  		}
  	} else {
  		free_pid(pid);
@@ -3041,7 +2849,7 @@
  
  /*
   * Handle magic process-wide effects of stop/continue signals.
-@@ -896,7 +893,7 @@ __group_complete_signal(int sig, struct 
+@@ -887,7 +884,7 @@ __group_complete_signal(int sig, struct 
  	 */
  	if (sig_fatal(p, sig) && !(p->signal->flags & SIGNAL_GROUP_EXIT) &&
  	    !sigismember(&t->real_blocked, sig) &&
@@ -3050,7 +2858,7 @@
  		/*
  		 * This signal will be fatal to the whole group.
  		 */
-@@ -1438,8 +1435,7 @@ void do_notify_parent(struct task_struct
+@@ -1429,8 +1426,7 @@ void do_notify_parent(struct task_struct
   	/* do_notify_parent_cldstop should have been called instead.  */
   	BUG_ON(tsk->state & (TASK_STOPPED|TASK_TRACED));
  
@@ -3060,7 +2868,7 @@
  
  	info.si_signo = sig;
  	info.si_errno = 0;
-@@ -1464,7 +1460,7 @@ void do_notify_parent(struct task_struct
+@@ -1455,7 +1451,7 @@ void do_notify_parent(struct task_struct
  
  	psig = tsk->parent->sighand;
  	spin_lock_irqsave(&psig->siglock, flags);
@@ -3069,7 +2877,7 @@
  	    (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN ||
  	     (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) {
  		/*
-@@ -1492,20 +1488,13 @@ void do_notify_parent(struct task_struct
+@@ -1483,20 +1479,13 @@ void do_notify_parent(struct task_struct
  	spin_unlock_irqrestore(&psig->siglock, flags);
  }
  
@@ -3091,7 +2899,7 @@
  	info.si_signo = SIGCHLD;
  	info.si_errno = 0;
  	info.si_pid = tsk->pid;
-@@ -1530,6 +1519,15 @@ static void do_notify_parent_cldstop(str
+@@ -1521,6 +1510,15 @@ static void do_notify_parent_cldstop(str
   		BUG();
   	}
  
@@ -3107,7 +2915,7 @@
  	sighand = parent->sighand;
  	spin_lock_irqsave(&sighand->siglock, flags);
  	if (sighand->action[SIGCHLD-1].sa.sa_handler != SIG_IGN &&
-@@ -1542,110 +1540,6 @@ static void do_notify_parent_cldstop(str
+@@ -1533,110 +1531,6 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -3218,7 +3026,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1654,7 +1548,7 @@ finish_stop(int stop_count)
+@@ -1645,7 +1539,7 @@ finish_stop(int stop_count)
  	 * a group stop in progress and we are the last to stop,
  	 * report to the parent.  When ptraced, every thread reports itself.
  	 */
@@ -3227,7 +3035,7 @@
  		read_lock(&tasklist_lock);
  		do_notify_parent_cldstop(current, CLD_STOPPED);
  		read_unlock(&tasklist_lock);
-@@ -1779,44 +1673,24 @@ relock:
+@@ -1770,44 +1664,24 @@ relock:
  		    handle_group_stop())
  			goto relock;
  
@@ -3288,7 +3096,7 @@
  		if (ka->sa.sa_handler == SIG_IGN) /* Do nothing.  */
  			continue;
  		if (ka->sa.sa_handler != SIG_DFL) {
-@@ -1861,7 +1735,7 @@ relock:
+@@ -1852,7 +1726,7 @@ relock:
  				spin_lock_irq(&current->sighand->siglock);
  			}
  
@@ -3297,7 +3105,7 @@
  				/* It released the siglock.  */
  				goto relock;
  			}
-@@ -1888,13 +1762,13 @@ relock:
+@@ -1879,13 +1753,13 @@ relock:
  			 * first and our do_group_exit call below will use
  			 * that value and ignore the one we pass it.
  			 */
@@ -3313,7 +3121,7 @@
  		/* NOTREACHED */
  	}
  	spin_unlock_irq(&current->sighand->siglock);
-@@ -1907,7 +1781,6 @@ EXPORT_SYMBOL(flush_signals);
+@@ -1898,7 +1772,6 @@ EXPORT_SYMBOL(flush_signals);
  EXPORT_SYMBOL(force_sig);
  EXPORT_SYMBOL(kill_pg);
  EXPORT_SYMBOL(kill_proc);
@@ -3323,7 +3131,7 @@
  EXPORT_SYMBOL(sigprocmask);
 --- linux-2.6/kernel/utrace.c.utrace-ptrace-compat
 +++ linux-2.6/kernel/utrace.c
-@@ -0,0 +1,1526 @@
+@@ -0,0 +1,1520 @@
 +#include <linux/utrace.h>
 +#include <linux/tracehook.h>
 +#include <linux/err.h>
@@ -4262,7 +4070,7 @@
 + * Called iff UTRACE_EVENT(VFORK_DONE) flag is set.
 + */
 +void
-+utrace_report_vfork_done(pid_t child_pid)
++utrace_report_vfork_done(struct task_struct *child)
 +{
 +	struct task_struct *tsk = current;
 +	struct utrace *utrace = tsk->utrace;
@@ -4275,7 +4083,7 @@
 +	list_for_each_safe_rcu(pos, next, &utrace->engines) {
 +		engine = list_entry(pos, struct utrace_attached_engine, entry);
 +		if (engine->flags & UTRACE_EVENT(VFORK_DONE))
-+			REPORT(report_vfork_done, child_pid);
++			REPORT(report_vfork_done, child);
 +		if (action & UTRACE_ACTION_HIDE)
 +			break;
 +	}
@@ -4760,23 +4568,16 @@
 +
 +
 +/*
-+ * Return the task_struct for the task using ptrace on this one, or NULL.
-+ * Must be called with rcu_read_lock held to keep the returned struct alive.
-+ *
-+ * At exec time, this may be called with task_lock(p) still held from when
-+ * tracehook_unsafe_exec was just called.  In that case it must give
-+ * results consistent with those unsafe_exec results, i.e. non-NULL if
-+ * any LSM_UNSAFE_PTRACE_* bits were set.
-+ *
-+ * The value is also used to display after "TracerPid:" in /proc/PID/status,
-+ * where it is called with only rcu_read_lock held.
++ * Return the value to display after "TracerPid:" in /proc/PID/status.
++ * Called without locks.
 + */
-+struct task_struct *
-+utrace_tracer_task(struct task_struct *target)
++pid_t
++utrace_tracer_pid(struct task_struct *target)
 +{
 +	struct utrace *utrace;
-+	struct task_struct *tracer = NULL;
++	pid_t pid = 0;
 +
++	rcu_read_lock();
 +	utrace = rcu_dereference(target->utrace);
 +	if (utrace != NULL) {
 +		struct list_head *pos, *next;
@@ -4786,15 +4587,16 @@
 +			engine = list_entry(pos, struct utrace_attached_engine,
 +					    entry);
 +			ops = rcu_dereference(engine->ops);
-+			if (ops->tracer_task) {
-+				tracer = (*ops->tracer_task)(engine, target);
-+				if (tracer != NULL)
++			if (ops->tracer_pid) {
++				pid = (*ops->tracer_pid)(engine, target);
++				if (pid)
 +					break;
 +			}
 +		}
 +	}
++	rcu_read_unlock();
 +
-+	return tracer;
++	return pid;
 +}
 +
 +int
@@ -5252,7 +5054,23 @@
  static long do_wait(pid_t pid, int options, struct siginfo __user *infop,
  		    int __user *stat_addr, struct rusage __user *ru)
  {
-@@ -1465,26 +1332,17 @@ repeat:
+@@ -1449,13 +1316,14 @@ repeat:
+ 	 */
+ 	flag = 0;
+ 	current->state = TASK_INTERRUPTIBLE;
+-	read_lock(&tasklist_lock);
+ 	tsk = current;
++	rcu_read_lock();
+ 	do {
+ 		struct task_struct *p;
+ 		struct list_head *_p;
+ 		int ret;
+ 
++		read_lock(&tasklist_lock);
+ 		list_for_each(_p,&tsk->children) {
+ 			p = list_entry(_p, struct task_struct, sibling);
+ 
+@@ -1465,26 +1333,17 @@ repeat:
  
  			switch (p->state) {
  			case TASK_TRACED:
@@ -5283,7 +5101,7 @@
  					continue;
  				retval = wait_task_stopped(p, ret == 2,
  							   (options & WNOWAIT),
-@@ -1509,6 +1367,10 @@ repeat:
+@@ -1509,6 +1368,10 @@ repeat:
  						goto check_continued;
  					if (!likely(options & WEXITED))
  						continue;
@@ -5294,7 +5112,7 @@
  					retval = wait_task_zombie(
  						p, (options & WNOWAIT),
  						infop, stat_addr, ru);
-@@ -1525,6 +1387,8 @@ check_continued:
+@@ -1525,6 +1388,8 @@ check_continued:
  				flag = 1;
  				if (!unlikely(options & WCONTINUED))
  					continue;
@@ -5303,7 +5121,7 @@
  				retval = wait_task_continued(
  					p, (options & WNOWAIT),
  					infop, stat_addr, ru);
-@@ -1533,16 +1397,15 @@ check_continued:
+@@ -1533,23 +1398,25 @@ check_continued:
  				break;
  			}
  		}
@@ -5315,20 +5133,30 @@
 -					continue;
 -				flag = 1;
 -				break;
--			}
++		read_unlock(&tasklist_lock);
 +
 +		retval = ptrace_do_wait(tsk, pid, options,
 +					infop, stat_addr, ru);
 +		if (retval != -ECHILD) {
 +			flag = 1;
-+			if (retval != 0) /* He released the lock.  */
++			if (retval) {
++				rcu_read_unlock();
 +				goto end;
+ 			}
  		}
 +
  		if (options & __WNOTHREAD)
  			break;
  		tsk = next_thread(tsk);
-@@ -1566,7 +1429,7 @@ end:
+ 		BUG_ON(tsk->signal != current->signal);
+ 	} while (tsk != current);
++	rcu_read_unlock();
+ 
+-	read_unlock(&tasklist_lock);
+ 	if (flag) {
+ 		retval = 0;
+ 		if (options & WNOHANG)
+@@ -1566,7 +1433,7 @@ end:
  	remove_wait_queue(&current->signal->wait_chldexit,&wait);
  	if (infop) {
  		if (retval > 0)
@@ -5579,7 +5407,7 @@
  /*
   * Access another process' address space.
   * Source/target buffer must be kernel space, 
-@@ -295,249 +125,1341 @@ int access_process_vm(struct task_struct
+@@ -295,249 +125,1303 @@ int access_process_vm(struct task_struct
  	return buf - old_buf;
  }
  
@@ -5784,9 +5612,7 @@
 +			retval = -EPERM;
 +	}
 +	else {
-+		task_lock(current);
 +		retval = security_ptrace(current->parent, current);
-+		task_unlock(current);
 +		if (!retval)
 +			retval = ptrace_setup(current, engine,
 +					      current->parent, 0, 0);
@@ -5855,7 +5681,7 @@
 +	struct ptrace_state *state = (struct ptrace_state *) engine->data;
 +	/*
 +	 * Clearing ->data before detach makes sure an unrelated task
-+	 * calling into ptrace_tracer_task won't try to touch stale state.
++	 * calling into ptrace_tracer_pid won't try to touch stale state.
 +	 */
 +	rcu_assign_pointer(engine->data, 0UL);
 +	utrace_detach(task, engine);
@@ -5892,7 +5718,8 @@
 +		list_for_each_entry_rcu(state, &tsk->ptracees, entry) {
 +			rcu_assign_pointer(state->engine->data, 0UL);
 +			utrace_detach(state->task, state->engine);
-+		}
+ 		}
+-		spin_unlock_irq(&child->sighand->siglock);
 +
 +		/*
 +		 * Now clear out our list and clean up our data structures.
@@ -5902,8 +5729,7 @@
 +		list_for_each_entry_safe(state, next, &tsk->ptracees, entry) {
 +			list_del_rcu(&state->entry);
 +			ptrace_done(state);
- 		}
--		spin_unlock_irq(&child->sighand->siglock);
++		}
 +		task_unlock(tsk);
  	}
 -	read_unlock(&tasklist_lock);
@@ -5965,7 +5791,7 @@
 +
 +		return utrace_inject_signal(target, engine,
 +					    UTRACE_ACTION_RESUME, info, NULL);
-+	}
+ 	}
 +
 +	return 0;
 +}
@@ -5994,7 +5820,7 @@
 +			return -EINVAL;
 +		pos = (addr - regset->bias) * regset->size;
 +		n = 1;
- 	}
++	}
 +	else
 +		n = nregs == 0 ? regset->n : nregs;
 +
@@ -6153,21 +5979,6 @@
 +		utrace_set_flags(child, engine,
 +				 engine->flags | UTRACE_ACTION_QUIESCE);
 +	}
-+
-+	/*
-+	 * We do this for all requests to match traditional ptrace behavior.
-+	 * If the machine state synchronization done at context switch time
-+	 * includes e.g. writing back to user memory, we want to make sure
-+	 * that has finished before a PTRACE_PEEKDATA can fetch the results.
-+	 * On most machines, only regset data is affected by context switch
-+	 * and calling utrace_regset later on will take care of that, so
-+	 * this is superfluous.
-+	 *
-+	 * To do this purely in utrace terms, we could do:
-+	 *  (void) utrace_regset(child, engine, utrace_native_view(child), 0);
-+	 */
-+	wait_task_inactive(child);
-+
 +	if (child->exit_state)
 +		goto out_tsk;
 +
@@ -6534,20 +6345,15 @@
  	return ret;
  }
 +#endif
-+
  
 -/**
 - * ptrace_traceme  --  helper for PTRACE_TRACEME
 - *
 - * Performs checks and sets PT_PTRACED.
 - * Should be used by all ptrace implementations for PTRACE_TRACEME.
-+/*
-+ * We're called with tasklist_lock held for reading.
-+ * If we return -ECHILD or zero, next_thread(tsk) must still be valid to use.
-+ * If we return another error code, or a successful PID value, we
-+ * release tasklist_lock first.
-  */
+- */
 -int ptrace_traceme(void)
++
 +int
 +ptrace_do_wait(struct task_struct *tsk,
 +	       pid_t pid, int options, struct siginfo __user *infop,
@@ -6624,16 +6430,6 @@
 +		why = CLD_TRAPPED;
 +		status = (p->exit_code << 8) | 0x7f;
 +	}
- 
- 	/*
--	 * Are we already being traced?
-+	 * At this point we are committed to a successful return
-+	 * or a user error return.  Release the tasklist_lock.
- 	 */
--	task_lock(current);
--	if (!(current->ptrace & PT_PTRACED)) {
--		ret = security_ptrace(current->parent, current);
-+	read_unlock(&tasklist_lock);
 +
 +	if (rusagep)
 +		err = getrusage(p, RUSAGE_BOTH, rusagep);
@@ -6658,7 +6454,13 @@
 +		struct utrace *utrace;
 +
 +		err = p->pid;
-+
+ 
+-	/*
+-	 * Are we already being traced?
+-	 */
+-	task_lock(current);
+-	if (!(current->ptrace & PT_PTRACED)) {
+-		ret = security_ptrace(current->parent, current);
  		/*
 -		 * Set the ptrace bit in the process ptrace flags.
 +		 * If this was a non-death report, the child might now be
@@ -6744,7 +6546,10 @@
  	 */
 -	if (pid == 1)
 -		return ERR_PTR(-EPERM);
--
++	wake_up_interruptible_sync(&parent->signal->wait_chldexit);
++	spin_unlock_irqrestore(&sighand->siglock, flags);
++}
+ 
 -	read_lock(&tasklist_lock);
 -	child = find_task_by_pid(pid);
 -	if (child)
@@ -6753,18 +6558,10 @@
 -	if (!child)
 -		return ERR_PTR(-ESRCH);
 -	return child;
-+	wake_up_interruptible_sync(&parent->signal->wait_chldexit);
-+	spin_unlock_irqrestore(&sighand->siglock, flags);
- }
- 
--#ifndef __ARCH_SYS_PTRACE
--asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
 +static u32
 +ptrace_report(struct utrace_attached_engine *engine, struct task_struct *tsk,
 +	      int code)
- {
--	struct task_struct *child;
--	long ret;
++{
 +	struct ptrace_state *state = (struct ptrace_state *) engine->data;
 +
 +#ifdef PTRACE_DEBUG
@@ -6779,21 +6576,6 @@
 +	}
 +#endif
 +
-+	BUG_ON(state->u.live.stopped);
- 
- 	/*
--	 * This lock_kernel fixes a subtle race with suid exec
-+	 * Set our QUIESCE flag right now, before notifying the tracer.
-+	 * We do this before setting state->u.live.stopped rather than
-+	 * by using UTRACE_ACTION_NEWSTATE in our return value, to
-+	 * ensure that the tracer can't get the notification and then
-+	 * try to resume us with PTRACE_CONT before we set the flag.
- 	 */
--	lock_kernel();
--	if (request == PTRACE_TRACEME) {
--		ret = ptrace_traceme();
-+	utrace_set_flags(tsk, engine, engine->flags | UTRACE_ACTION_QUIESCE);
-+
 +	state->u.live.stopped = 1;
 +	state->u.live.reported = 0;
 +	tsk->exit_code = code;
@@ -6804,18 +6586,29 @@
 +	       current->pid, current->exit_code);
 +#endif
 +
-+	return UTRACE_ACTION_RESUME;
-+}
-+
++	return (UTRACE_ACTION_NEWSTATE
++		| UTRACE_ACTION_QUIESCE | UTRACE_ACTION_NOREAP);
+ }
+ 
+-#ifndef __ARCH_SYS_PTRACE
+-asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
 +static inline u32
 +ptrace_event(struct utrace_attached_engine *engine, struct task_struct *tsk,
 +	     int event)
-+{
+ {
+-	struct task_struct *child;
+-	long ret;
 +	struct ptrace_state *state = (struct ptrace_state *) engine->data;
 +	state->u.live.syscall = 0;
 +	return ptrace_report(engine, tsk, (event << 8) | SIGTRAP);
 +}
-+
+ 
+-	/*
+-	 * This lock_kernel fixes a subtle race with suid exec
+-	 */
+-	lock_kernel();
+-	if (request == PTRACE_TRACEME) {
+-		ret = ptrace_traceme();
 +
 +static u32
 +ptrace_report_death(struct utrace_attached_engine *engine,
@@ -6925,11 +6718,8 @@
 -	return ret;
 +static u32
 +ptrace_report_vfork_done(struct utrace_attached_engine *engine,
-+			 struct task_struct *parent, pid_t child_pid)
++			 struct task_struct *parent, struct task_struct *child)
 +{
-+	struct ptrace_state *state = (struct ptrace_state *) engine->data;
-+	state->u.live.have_eventmsg = 1;
-+	state->u.live.u.eventmsg = child_pid;
 +	return ptrace_event(engine, parent, PTRACE_EVENT_VFORK_DONE);
 +}
 +
@@ -6954,8 +6744,7 @@
 +		   struct task_struct *tsk, int type)
 +{
 +	return UTRACE_ACTION_RESUME; /* XXX */
- }
--#endif /* __ARCH_SYS_PTRACE */
++}
 +
 +static u32
 +ptrace_report_exec(struct utrace_attached_engine *engine,
@@ -6998,7 +6787,8 @@
 +			    struct task_struct *tsk, struct pt_regs *regs)
 +{
 +	return ptrace_report_syscall(engine, tsk, regs, 0);
-+}
+ }
+-#endif /* __ARCH_SYS_PTRACE */
 +
 +static u32
 +ptrace_report_exit(struct utrace_attached_engine *engine,
@@ -7021,20 +6811,24 @@
 +	return unsafe;
 +}
 +
-+static struct task_struct *
-+ptrace_tracer_task(struct utrace_attached_engine *engine,
-+		   struct task_struct *target)
++static pid_t
++ptrace_tracer_pid(struct utrace_attached_engine *engine,
++		  struct task_struct *target)
 +{
 +	struct ptrace_state *state;
++	pid_t pid;
 +
 +	/*
 +	 * This call is not necessarily made by the target task,
 +	 * so ptrace might be getting detached while we run here.
 +	 * The state pointer will be NULL if that happens.
 +	 */
++	rcu_read_lock();
 +	state = rcu_dereference((struct ptrace_state *) engine->data);
++	pid = state == NULL ? 0 : state->parent->pid;
++	rcu_read_unlock();
 +
-+	return state == NULL ? NULL : state->parent;
++	return pid;
 +}
 +
 +static int
@@ -7074,7 +6868,7 @@
 +	.report_exit = ptrace_report_exit,
 +	.report_death = ptrace_report_death,
 +	.unsafe_exec = ptrace_unsafe_exec,
-+	.tracer_task = ptrace_tracer_task,
++	.tracer_pid = ptrace_tracer_pid,
 +	.allow_access_process_vm = ptrace_allow_access_process_vm,
 +};
 +
@@ -7180,36 +6974,18 @@
  #include <linux/rcupdate.h>
  #include <linux/delayacct.h>
  
-@@ -158,10 +159,17 @@ static inline const char * get_task_stat
- 
- static inline char * task_state(struct task_struct *p, char *buffer)
- {
-+	struct task_struct *tracer;
-+	pid_t tracer_pid;
- 	struct group_info *group_info;
- 	int g;
- 	struct fdtable *fdt = NULL;
- 
-+	rcu_read_lock();
-+	tracer = tracehook_tracer_task(p);
-+	tracer_pid = tracer == NULL ? 0 : tracer->pid;
-+	rcu_read_unlock();
-+
- 	read_lock(&tasklist_lock);
- 	buffer += sprintf(buffer,
- 		"State:\t%s\n"
-@@ -175,8 +183,8 @@ static inline char * task_state(struct t
+@@ -175,8 +176,8 @@ static inline char * task_state(struct t
  		get_task_state(p),
  		(p->sleep_avg/1024)*100/(1020000000/1024),
  	       	p->tgid,
 -		p->pid, pid_alive(p) ? p->group_leader->real_parent->tgid : 0,
 -		pid_alive(p) && p->ptrace ? p->parent->pid : 0,
 +		p->pid, pid_alive(p) ? p->group_leader->parent->tgid : 0,
-+		tracer_pid,
++		tracehook_tracer_pid(p),
  		p->uid, p->euid, p->suid, p->fsuid,
  		p->gid, p->egid, p->sgid, p->fsgid);
  	read_unlock(&tasklist_lock);
-@@ -386,7 +394,7 @@ static int do_task_stat(struct task_stru
+@@ -386,7 +387,7 @@ static int do_task_stat(struct task_stru
  			stime = cputime_add(stime, task->signal->stime);
  		}
  	}
@@ -10577,7 +10353,7 @@
   * Copyright (C) 1997 Jakub Jelinek (jj at sunsite.mff.cuni.cz)
   *
   * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson,
-@@ -11,103 +11,598 @@
+@@ -11,103 +11,597 @@
   */
  
  #include <linux/kernel.h>
@@ -10607,13 +10383,7 @@
  #include <asm/page.h>
  #include <asm/cpudata.h>
 +#include <asm/psrcompat.h>
- 
--/* Returning from ptrace is a bit tricky because the syscall return
-- * low level code assumes any value returned which is negative and
-- * is a valid errno will mean setting the condition codes to indicate
-- * an error return.  This doesn't work, so we have this hook.
-- */
--static inline void pt_error_return(struct pt_regs *regs, unsigned long error)
++
 +#define GENREG_G0	0
 +#define GENREG_O0	8
 +#define GENREG_L0	16
@@ -10629,11 +10399,7 @@
 +		       const struct utrace_regset *regset,
 +		       unsigned int pos, unsigned int count,
 +		       void *kbuf, void __user *ubuf)
- {
--	regs->u_regs[UREG_I0] = error;
--	regs->tstate |= (TSTATE_ICARRY | TSTATE_XCARRY);
--	regs->tpc = regs->tnpc;
--	regs->tnpc += 4;
++{
 +	struct pt_regs *regs = task_pt_regs(target);
 +	int err;
 +
@@ -10683,12 +10449,16 @@
 +	}
 +
 +	return err;
- }
++}
  
--static inline void pt_succ_return(struct pt_regs *regs, unsigned long value)
+-/* Returning from ptrace is a bit tricky because the syscall return
+- * low level code assumes any value returned which is negative and
+- * is a valid errno will mean setting the condition codes to indicate
+- * an error return.  This doesn't work, so we have this hook.
 +/* Consistent with signal handling, we only allow userspace to
 + * modify the %asi, %icc, and %xcc fields of the %tstate register.
-+ */
+  */
+-static inline void pt_error_return(struct pt_regs *regs, unsigned long error)
 +#define TSTATE_DEBUGCHANGE	(TSTATE_ASI | TSTATE_ICC | TSTATE_XCC)
 +
 +static int genregs_set(struct task_struct *target,
@@ -10696,8 +10466,8 @@
 +		       unsigned int pos, unsigned int count,
 +		       const void *kbuf, const void __user *ubuf)
  {
--	regs->u_regs[UREG_I0] = value;
--	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
+-	regs->u_regs[UREG_I0] = error;
+-	regs->tstate |= (TSTATE_ICARRY | TSTATE_XCARRY);
 -	regs->tpc = regs->tnpc;
 -	regs->tnpc += 4;
 +	struct pt_regs *regs = task_pt_regs(target);
@@ -10762,8 +10532,7 @@
 +	return err;
  }
  
--static inline void
--pt_succ_return_linux(struct pt_regs *regs, unsigned long value, void __user *addr)
+-static inline void pt_succ_return(struct pt_regs *regs, unsigned long value)
 +#define FPREG_F0	0
 +#define FPREG_FSR	32
 +#define FPREG_GSR	33
@@ -10776,16 +10545,10 @@
 +		      unsigned int pos, unsigned int count,
 +		      void *kbuf, void __user *ubuf)
  {
--	if (test_thread_flag(TIF_32BIT)) {
--		if (put_user(value, (unsigned int __user *) addr)) {
--			pt_error_return(regs, EFAULT);
--			return;
--		}
--	} else {
--		if (put_user(value, (long __user *) addr)) {
--			pt_error_return(regs, EFAULT);
--			return;
--		}
+-	regs->u_regs[UREG_I0] = value;
+-	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
+-	regs->tpc = regs->tnpc;
+-	regs->tnpc += 4;
 +	struct thread_info *t = task_thread_info(target);
 +	int err;
 +
@@ -10809,26 +10572,27 @@
 +			*(unsigned long *) kbuf = regs->fprs;
 +		else if (put_user(regs->fprs, (unsigned long __user *) ubuf))
 +			return -EFAULT;
- 	}
--	regs->u_regs[UREG_I0] = 0;
--	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
--	regs->tpc = regs->tnpc;
--	regs->tnpc += 4;
++	}
 +
 +	return err;
  }
  
--static void
--pt_os_succ_return (struct pt_regs *regs, unsigned long val, void __user *addr)
+-static inline void
+-pt_succ_return_linux(struct pt_regs *regs, unsigned long value, void __user *addr)
 +static int fpregs_set(struct task_struct *target,
 +		      const struct utrace_regset *regset,
 +		      unsigned int pos, unsigned int count,
 +		      const void *kbuf, const void __user *ubuf)
  {
--	if (current->personality == PER_SUNOS)
--		pt_succ_return (regs, val);
--	else
--		pt_succ_return_linux (regs, val, addr);
+-	if (test_thread_flag(TIF_32BIT)) {
+-		if (put_user(value, (unsigned int __user *) addr)) {
+-			pt_error_return(regs, EFAULT);
+-			return;
+-		}
+-	} else {
+-		if (put_user(value, (long __user *) addr)) {
+-			pt_error_return(regs, EFAULT);
+-			return;
 +	struct thread_info *t = task_thread_info(target);
 +	int err;
 +
@@ -10855,10 +10619,8 @@
 +	}
 +
 +	return err;
- }
- 
--/* #define ALLOW_INIT_TRACING */
--/* #define DEBUG_PTRACE */
++}
++
 +static const struct utrace_regset native_regsets[] = {
 +	{
 +		.n = SPARC64_NGREGS,
@@ -10871,21 +10633,12 @@
 +		.get = fpregs_get, .set = fpregs_set
 +	},
 +};
- 
--#ifdef DEBUG_PTRACE
--char *pt_rq [] = {
--	/* 0  */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
--	/* 4  */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
--	/* 8  */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
--	/* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
--	/* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
--	/* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
--	/* 24 */ "SYSCALL", ""
++
 +const struct utrace_regset_view utrace_sparc64_native_view = {
 +	.name = UTS_MACHINE, .e_machine = ELF_ARCH,
 +	.regsets = native_regsets,
 +	.n = sizeof native_regsets / sizeof native_regsets[0],
- };
++};
 +EXPORT_SYMBOL_GPL(utrace_sparc64_native_view);
 +
 +#ifdef CONFIG_COMPAT
@@ -10969,8 +10722,12 @@
 +				ubuf += sizeof(u32);
 +			pos += sizeof(u32);
 +			count -= sizeof(u32);
-+		}
-+	}
+ 		}
+ 	}
+-	regs->u_regs[UREG_I0] = 0;
+-	regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY);
+-	regs->tpc = regs->tnpc;
+-	regs->tnpc += 4;
 +
 +	if (count > 0 && pos == (GENREG32_PSR * 4)) {
 +		u32 psr = tstate_to_psr(regs->tstate);
@@ -11034,13 +10791,19 @@
 +	}
 +
 +	return 0;
-+}
-+
+ }
+ 
+-static void
+-pt_os_succ_return (struct pt_regs *regs, unsigned long val, void __user *addr)
 +static int genregs32_set(struct task_struct *target,
 +			 const struct utrace_regset *regset,
 +			 unsigned int pos, unsigned int count,
 +			 const void *kbuf, const void __user *ubuf)
-+{
+ {
+-	if (current->personality == PER_SUNOS)
+-		pt_succ_return (regs, val);
+-	else
+-		pt_succ_return_linux (regs, val, addr);
 +	struct pt_regs *regs = task_pt_regs(target);
 +
 +	while (count > 0 && pos < (GENREG32_L0 * 4)) {
@@ -11154,8 +10917,25 @@
 +	/* Ignore WIM and TBR */
 +
 +	return 0;
-+}
- #endif
+ }
+ 
+-/* #define ALLOW_INIT_TRACING */
+-/* #define DEBUG_PTRACE */
++#define FPREG32_F0	0
++#define FPREG32_FSR	32
+ 
+-#ifdef DEBUG_PTRACE
+-char *pt_rq [] = {
+-	/* 0  */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
+-	/* 4  */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
+-	/* 8  */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
+-	/* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
+-	/* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
+-	/* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
+-	/* 24 */ "SYSCALL", ""
+-};
+-#endif
++#define SPARC32_NFPREGS	33
  
 -/*
 - * Called by kernel/ptrace.c when detaching..
@@ -11163,11 +10943,6 @@
 - * Make sure single step bits etc are not set.
 - */
 -void ptrace_disable(struct task_struct *child)
-+#define FPREG32_F0	0
-+#define FPREG32_FSR	32
-+
-+#define SPARC32_NFPREGS	33
-+
 +static int fpregs32_get(struct task_struct *target,
 +			const struct utrace_regset *regset,
 +			unsigned int pos, unsigned int count,
@@ -11240,20 +11015,7 @@
  /* To get the necessary page struct, access_process_vm() first calls
   * get_user_pages().  This has done a flush_dcache_page() on the
   * accessed page.  Then our caller (copy_{to,from}_user_page()) did
-@@ -167,6 +662,7 @@ void flush_ptrace_access(struct vm_area_
- 	}
- }
- 
-+#if 0				/* XXX */
- asmlinkage void do_ptrace(struct pt_regs *regs)
- {
- 	int request = regs->u_regs[UREG_I0];
-@@ -640,11 +1136,13 @@ out_tsk:
- out:
- 	unlock_kernel();
- }
-+#endif
- 
+@@ -644,7 +1138,8 @@ out:
  asmlinkage void syscall_trace(struct pt_regs *regs, int syscall_exit_p)
  {
  	/* do the secure computing check first */
@@ -11263,21 +11025,21 @@
  
  	if (unlikely(current->audit_context) && syscall_exit_p) {
  		unsigned long tstate = regs->tstate;
-@@ -656,26 +1154,9 @@ asmlinkage void syscall_trace(struct pt_
+@@ -656,26 +1151,9 @@ asmlinkage void syscall_trace(struct pt_
  		audit_syscall_exit(result, regs->u_regs[UREG_I0]);
  	}
  
 -	if (!(current->ptrace & PT_PTRACED))
 -		goto out;
--
++	if (test_thread_flag(TIF_SYSCALL_TRACE))
++		tracehook_report_syscall(regs, syscall_exit_p);
+ 
 -	if (!test_thread_flag(TIF_SYSCALL_TRACE))
 -		goto out;
 -
 -	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
 -				 ? 0x80 : 0));
-+	if (test_thread_flag(TIF_SYSCALL_TRACE))
-+		tracehook_report_syscall(regs, syscall_exit_p);
- 
+-
 -	/*
 -	 * this isn't the same as continuing with a signal, but it will do
 -	 * for normal use.  strace only continues with a signal if the
@@ -11372,26 +11134,6 @@
  	INIT_LIST_HEAD(&p->children);
  	INIT_LIST_HEAD(&p->sibling);
  	strncpy(p->comm, type, sizeof(p->comm)-1);
---- linux-2.6/arch/ia64/kernel/signal.c.utrace-ptrace-compat
-+++ linux-2.6/arch/ia64/kernel/signal.c
-@@ -10,7 +10,7 @@
- #include <linux/errno.h>
- #include <linux/kernel.h>
- #include <linux/mm.h>
--#include <linux/ptrace.h>
-+#include <linux/tracehook.h>
- #include <linux/sched.h>
- #include <linux/signal.h>
- #include <linux/smp.h>
-@@ -471,6 +471,8 @@ handle_signal (unsigned long sig, struct
- 		sigaddset(&current->blocked, sig);
- 	recalc_sigpending();
- 	spin_unlock_irq(&current->sighand->siglock);
-+
-+	tracehook_report_handle_signal(sig, ka, oldset, &scr->pt);
- 	return 1;
- }
- 
 --- linux-2.6/arch/ia64/kernel/fsys.S.utrace-ptrace-compat
 +++ linux-2.6/arch/ia64/kernel/fsys.S
 @@ -83,29 +83,29 @@ ENTRY(fsys_getppid)
@@ -11533,54 +11275,9 @@
  	DEFINE(IA64_TASK_SIGHAND_OFFSET,offsetof (struct task_struct, sighand));
  	DEFINE(IA64_TASK_SIGNAL_OFFSET,offsetof (struct task_struct, signal));
  	DEFINE(IA64_TASK_TGID_OFFSET, offsetof (struct task_struct, tgid));
---- linux-2.6/arch/ia64/ia32/ia32_entry.S.utrace-ptrace-compat
-+++ linux-2.6/arch/ia64/ia32/ia32_entry.S
-@@ -236,7 +236,7 @@ ia32_syscall_table:
- 	data8 sys_setuid	/* 16-bit version */
- 	data8 sys_getuid	/* 16-bit version */
- 	data8 compat_sys_stime    /* 25 */
--	data8 sys32_ptrace
-+	data8 compat_sys_ptrace
- 	data8 sys32_alarm
- 	data8 sys_ni_syscall
- 	data8 sys32_pause
 --- linux-2.6/arch/ia64/ia32/sys_ia32.c.utrace-ptrace-compat
 +++ linux-2.6/arch/ia64/ia32/sys_ia32.c
-@@ -1419,25 +1419,6 @@ sys32_waitpid (int pid, unsigned int *st
- 	return compat_sys_wait4(pid, stat_addr, options, NULL);
- }
- 
--static unsigned int
--ia32_peek (struct task_struct *child, unsigned long addr, unsigned int *val)
--{
--	size_t copied;
--	unsigned int ret;
--
--	copied = access_process_vm(child, addr, val, sizeof(*val), 0);
--	return (copied != sizeof(ret)) ? -EIO : 0;
--}
--
--static unsigned int
--ia32_poke (struct task_struct *child, unsigned long addr, unsigned int val)
--{
--
--	if (access_process_vm(child, addr, &val, sizeof(val), 1) != sizeof(val))
--		return -EIO;
--	return 0;
--}
--
- /*
-  *  The order in which registers are stored in the ptrace regs structure
-  */
-@@ -1735,6 +1716,7 @@ restore_ia32_fpxstate (struct task_struc
- 	return 0;
- }
- 
-+#if 0				/* XXX */
- asmlinkage long
- sys32_ptrace (int request, pid_t pid, unsigned int addr, unsigned int data)
- {
-@@ -1842,9 +1824,11 @@ sys32_ptrace (int request, pid_t pid, un
+@@ -1842,9 +1842,11 @@ sys32_ptrace (int request, pid_t pid, un
  					    compat_ptr(data));
  		break;
  
@@ -11592,14 +11289,6 @@
  
  	      case PTRACE_SYSCALL:	/* continue, stop after next syscall */
  	      case PTRACE_CONT:		/* restart after signal. */
-@@ -1865,6 +1849,7 @@ sys32_ptrace (int request, pid_t pid, un
- 	unlock_kernel();
- 	return ret;
- }
-+#endif
- 
- typedef struct {
- 	unsigned int	ss_sp;
 --- linux-2.6/arch/ppc/kernel/asm-offsets.c.utrace-ptrace-compat
 +++ linux-2.6/arch/ppc/kernel/asm-offsets.c
 @@ -37,7 +37,6 @@ main(void)
@@ -11732,7 +11421,7 @@
  
  #ifdef CONFIG_COMPAT
  #include "compat_ptrace.h"
-@@ -87,31 +91,499 @@ FixPerRegisters(struct task_struct *task
+@@ -87,31 +91,497 @@ FixPerRegisters(struct task_struct *task
  }
  
  void
@@ -11741,7 +11430,6 @@
  {
  	task->thread.per_info.single_step = 1;
  	FixPerRegisters(task);
-+	set_tsk_thread_flag(task, TIF_SINGLE_STEP);
  }
  
  void
@@ -11750,7 +11438,6 @@
  {
  	task->thread.per_info.single_step = 0;
  	FixPerRegisters(task);
-+	clear_tsk_thread_flag(task, TIF_SINGLE_STEP);
  }
  
 +int
@@ -12241,7 +11928,7 @@
  #ifndef CONFIG_64BIT
  # define __ADDR_MASK 3
  #else
-@@ -593,6 +1065,7 @@ do_ptrace_emu31(struct task_struct *chil
+@@ -593,6 +1063,7 @@ do_ptrace_emu31(struct task_struct *chil
  			copied += sizeof(unsigned int);
  		}
  		return 0;
@@ -12249,7 +11936,7 @@
  	case PTRACE_GETEVENTMSG:
  		return put_user((__u32) child->ptrace_message,
  				(unsigned int __user *) data);
-@@ -606,6 +1079,7 @@ do_ptrace_emu31(struct task_struct *chil
+@@ -606,6 +1077,7 @@ do_ptrace_emu31(struct task_struct *chil
  			return -EINVAL;
  		return copy_siginfo_from_user32(child->last_siginfo,
  						(compat_siginfo_t __user *) data);
@@ -12257,7 +11944,7 @@
  	}
  	return ptrace_request(child, request, addr, data);
  }
-@@ -656,7 +1130,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -656,7 +1128,7 @@ do_ptrace(struct task_struct *child, lon
  			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
  		child->exit_code = data;
  		/* make sure the single step bit is not set. */
@@ -12266,7 +11953,7 @@
  		wake_up_process(child);
  		return 0;
  
-@@ -670,7 +1144,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -670,7 +1142,7 @@ do_ptrace(struct task_struct *child, lon
  			return 0;
  		child->exit_code = SIGKILL;
  		/* make sure the single step bit is not set. */
@@ -12275,7 +11962,7 @@
  		wake_up_process(child);
  		return 0;
  
-@@ -683,7 +1157,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -683,7 +1155,7 @@ do_ptrace(struct task_struct *child, lon
  		if (data)
  			set_tsk_thread_flag(child, TIF_SINGLE_STEP);
  		else
@@ -12284,7 +11971,7 @@
  		/* give it a chance to run. */
  		wake_up_process(child);
  		return 0;
-@@ -704,31 +1178,9 @@ do_ptrace(struct task_struct *child, lon
+@@ -704,31 +1176,9 @@ do_ptrace(struct task_struct *child, lon
  	/* Not reached.  */
  	return -EIO;
  }
@@ -12317,7 +12004,7 @@
  
  asmlinkage void
  syscall_trace(struct pt_regs *regs, int entryexit)
-@@ -736,30 +1188,17 @@ syscall_trace(struct pt_regs *regs, int 
+@@ -736,30 +1186,17 @@ syscall_trace(struct pt_regs *regs, int 
  	if (unlikely(current->audit_context) && entryexit)
  		audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
  

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1182 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |    1 
 arch/ia64/kernel/gate.lds.S                         |    1 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  799 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  569 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  125 
 drivers/xen/netback/interface.c                     |  315 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1122 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1606 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 407 files changed, 85185 insertions(+), 201 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.49.4.1 -r 1.49.4.2 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.49.4.1
retrieving revision 1.49.4.2
diff -u -r1.49.4.1 -r1.49.4.2
--- linux-2.6-xen.patch	11 Aug 2006 19:11:01 -0000	1.49.4.1
+++ linux-2.6-xen.patch	16 Aug 2006 20:42:37 -0000	1.49.4.2
@@ -1,6 +1,6 @@
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
 --- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -24,8 +24,8 @@
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
---- linux-2.6/arch/i386/Kconfig	2006-08-01 06:44:38.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-08-02 18:15:29.000000000 +0200
+--- linux-2.6/arch/i386/Kconfig	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-07-26 17:11:03.000000000 +0200
 @@ -16,10 +16,12 @@ config X86_32
  
  config GENERIC_TIME
@@ -149,7 +149,7 @@
  	---help---
  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
  	  the Memory Type Range Registers (MTRRs) may be used to control
-@@ -673,7 +694,7 @@ config MTRR
+@@ -694,7 +694,7 @@ config MTRR
  
  config EFI
  	bool "Boot from EFI support"
@@ -313,7 +313,7 @@
  	default y
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.cpu linux-2.6-xen-fedora/arch/i386/Kconfig.cpu
 --- linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-07-18 03:27:59.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -332,7 +332,7 @@
  	default y
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.debug linux-2.6-xen-fedora/arch/i386/Kconfig.debug
 --- linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-07-22 20:37:34.000000000 +0200
 @@ -2,6 +2,7 @@ menu "Kernel hacking"
  
  config TRACE_IRQFLAGS_SUPPORT
@@ -351,7 +351,7 @@
            would otherwise cause a system to silently reboot. Disabling this
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/boot-xen.c linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c
 --- linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-07-22 20:37:34.000000000 +0200
 @@ -0,0 +1,1168 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1523,7 +1523,7 @@
 +}
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/Makefile linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile
 --- linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1534,7 +1534,7 @@
 +endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
 --- linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-07-22 20:37:34.000000000 +0200
 @@ -4,7 +4,11 @@
  #include <asm/alternative.h>
  #include <asm/sections.h>
@@ -1549,7 +1549,7 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/apic-xen.c linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c
 --- linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-07-22 20:37:34.000000000 +0200
 @@ -0,0 +1,160 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1713,7 +1713,7 @@
 +}
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/asm-offsets.c linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c
 --- linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-07-22 21:45:45.000000000 +0200
 @@ -66,9 +66,14 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
@@ -1732,7 +1732,7 @@
  	DEFINE(VDSO_PRELINK, VDSO_PRELINK);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/common-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c
 --- linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-08-03 22:52:02.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,740 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
@@ -2476,7 +2476,7 @@
 +#endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile
 --- linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2488,7 +2488,7 @@
 +endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c
 --- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-08-01 02:31:00.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2689,7 +2689,7 @@
 +subsys_initcall(mtrr_init);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile
 --- linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -3,3 +3,10 @@ obj-y		+= amd.o
  obj-y		+= cyrix.o
  obj-y		+= centaur.o
@@ -2703,13 +2703,13 @@
 +endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/early_printk-xen.c linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c
 --- linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-08-01 02:31:00.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,2 @@
 +
 +#include "../../x86_64/kernel/early_printk-xen.c"
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/entry.S linux-2.6-xen-fedora/arch/i386/kernel/entry.S
---- linux-2.6/arch/i386/kernel/entry.S	2006-08-01 06:44:38.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-08-02 18:15:29.000000000 +0200
+--- linux-2.6/arch/i386/kernel/entry.S	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-07-22 21:45:45.000000000 +0200
 @@ -265,7 +265,7 @@ ENTRY(sysenter_entry)
  	CFI_STARTPROC simple
  	CFI_DEF_CFA esp, 0
@@ -2739,13 +2739,13 @@
  	pushl $sysenter_past_esp
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/entry-xen.S linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S
 --- linux-2.6/arch/i386/kernel/entry-xen.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S	2006-08-02 18:15:29.000000000 +0200
-@@ -0,0 +1,1209 @@
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S	2006-07-22 21:45:45.000000000 +0200
+@@ -0,0 +1,1188 @@
 +/*
 + *  linux/arch/i386/entry.S
 + *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
++ *  Copyright (C) 1991, 1992  Linus Torvalds 
++*/
 +
 +/*
 + * entry.S contains the system-call and fault low-level handling routines.
@@ -2977,7 +2977,7 @@
 +ENTRY(ret_from_fork)
 +	CFI_STARTPROC
 +	pushl %eax
-+	CFI_ADJUST_CFA_OFFSET 4
++	CFI_ADJUST_CFA_OFFSET -4
 +	call schedule_tail
 +	GET_THREAD_INFO(%ebp)
 +	popl %eax
@@ -3109,10 +3109,8 @@
 +14:	__DISABLE_INTERRUPTS
 +sysexit_ecrit:	/**** END OF SYSEXIT CRITICAL REGION ****/
 +	push %esp
-+	CFI_ADJUST_CFA_OFFSET 4
 +	call evtchn_do_upcall
 +	add  $4,%esp
-+	CFI_ADJUST_CFA_OFFSET -4
 +	jmp  ret_from_intr
 +#else
 +	sti
@@ -3160,6 +3158,7 @@
 +	movb CS(%esp), %al
 +	andl $(VM_MASK | (4 << 8) | 3), %eax
 +	cmpl $((4 << 8) | 3), %eax
++	CFI_REMEMBER_STATE
 +	je ldt_ss			# returning to user-space with LDT SS
 +restore_nocheck:
 +#else
@@ -3174,7 +3173,6 @@
 +	jnz restore_all_enable_events	#        != 0 => enable event delivery
[...6130 lines suppressed...]
@@ -89510,7 +88467,7 @@
 +#endif /* _XEN_XENBUS_H */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/xen/xencons.h linux-2.6-xen-fedora/include/xen/xencons.h
 --- linux-2.6/include/xen/xencons.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/xencons.h	2006-08-01 02:31:26.000000000 +0200
++++ linux-2.6-xen-fedora/include/xen/xencons.h	2006-07-18 03:28:32.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef __ASM_XENCONS_H__
 +#define __ASM_XENCONS_H__
@@ -89528,7 +88485,7 @@
 +#endif /* __ASM_XENCONS_H__ */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/xen/xen_proc.h linux-2.6-xen-fedora/include/xen/xen_proc.h
 --- linux-2.6/include/xen/xen_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/xen_proc.h	2006-08-01 02:31:26.000000000 +0200
++++ linux-2.6-xen-fedora/include/xen/xen_proc.h	2006-07-18 03:28:32.000000000 +0200
 @@ -0,0 +1,13 @@
 +
 +#ifndef __ASM_XEN_PROC_H__
@@ -89545,7 +88502,7 @@
 +#endif /* __ASM_XEN_PROC_H__ */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/fork.c linux-2.6-xen-fedora/kernel/fork.c
 --- linux-2.6/kernel/fork.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/fork.c	2006-08-01 02:31:26.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/fork.c	2006-07-22 20:37:56.000000000 +0200
 @@ -275,6 +275,9 @@ static inline int dup_mmap(struct mm_str
  		if (retval)
  			goto out;
@@ -89557,9 +88514,9 @@
  out:
  	up_write(&mm->mmap_sem);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/irq/manage.c linux-2.6-xen-fedora/kernel/irq/manage.c
---- linux-2.6/kernel/irq/manage.c	2006-08-01 06:44:39.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/irq/manage.c	2006-08-02 18:15:29.000000000 +0200
-@@ -350,7 +350,6 @@ void free_irq(unsigned int irq, void *de
+--- linux-2.6/kernel/irq/manage.c	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/irq/manage.c	2006-07-22 20:37:56.000000000 +0200
+@@ -326,7 +326,6 @@ void free_irq(unsigned int irq, void *de
  	struct irqaction **p;
  	unsigned long flags;
  
@@ -89569,7 +88526,7 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/Kconfig.preempt linux-2.6-xen-fedora/kernel/Kconfig.preempt
 --- linux-2.6/kernel/Kconfig.preempt	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/Kconfig.preempt	2006-08-01 02:31:26.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/Kconfig.preempt	2006-07-18 03:28:32.000000000 +0200
 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
  
  config PREEMPT
@@ -89579,8 +88536,8 @@
  	  This option reduces the latency of the kernel by making
  	  all kernel code (that is not executing in a critical section)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/kernel/timer.c linux-2.6-xen-fedora/kernel/timer.c
---- linux-2.6/kernel/timer.c	2006-08-01 06:44:39.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/timer.c	2006-08-02 18:15:30.000000000 +0200
+--- linux-2.6/kernel/timer.c	2006-07-16 19:14:09.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/timer.c	2006-07-22 20:37:56.000000000 +0200
 @@ -554,6 +554,22 @@ found:
  	if (time_before(expires, jiffies))
  		return jiffies;
@@ -89606,19 +88563,19 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/lib/Kconfig.debug linux-2.6-xen-fedora/lib/Kconfig.debug
 --- linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-08-02 18:15:30.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-07-22 20:37:56.000000000 +0200
 @@ -325,7 +325,7 @@ config FRAME_POINTER
  
  config UNWIND_INFO
  	bool "Compile the kernel with frame unwind information"
 -	depends on !IA64 && !PARISC
-+	depends on !IA64 && !PARISC && !X86_64_XEN
++	depends on !IA64 && !PARISC && !XEN
  	depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
  	help
  	  If you say Y here the resulting kernel image will be slightly larger
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/lib/Makefile linux-2.6-xen-fedora/lib/Makefile
 --- linux-2.6/lib/Makefile	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/lib/Makefile	2006-08-01 02:31:26.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Makefile	2006-07-22 20:37:56.000000000 +0200
 @@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
  obj-$(CONFIG_SMP) += percpu_counter.o
  
@@ -89631,7 +88588,7 @@
  clean-files	:= crc32table.h
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/highmem.c linux-2.6-xen-fedora/mm/highmem.c
 --- linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/highmem.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/mm/highmem.c	2006-07-22 20:37:56.000000000 +0200
 @@ -142,6 +142,17 @@ start:
  	return vaddr;
  }
@@ -89652,7 +88609,7 @@
  	unsigned long vaddr;
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/Kconfig linux-2.6-xen-fedora/mm/Kconfig
 --- linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/Kconfig	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/mm/Kconfig	2006-07-22 20:37:56.000000000 +0200
 @@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
  # Default to 4 for wider testing, though 8 might be more appropriate.
  # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -89670,7 +88627,7 @@
  #
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
 --- linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/memory.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/mm/memory.c	2006-07-22 20:37:57.000000000 +0200
 @@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
  	 * and that the resulting page looks ok.
  	 */
@@ -89813,7 +88770,7 @@
   * which was read non-atomically.  Before making any commitment, on
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/mmap.c linux-2.6-xen-fedora/mm/mmap.c
 --- linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/mmap.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/mm/mmap.c	2006-07-22 20:37:57.000000000 +0200
 @@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
  	unsigned long nr_accounted = 0;
  	unsigned long end;
@@ -89827,7 +88784,7 @@
  	tlb = tlb_gather_mmu(mm, 1);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/page_alloc.c linux-2.6-xen-fedora/mm/page_alloc.c
 --- linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-07-22 20:37:57.000000000 +0200
 @@ -443,7 +443,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -89850,7 +88807,7 @@
  		page->mapping = NULL;
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
 --- linux-2.6/net/core/dev.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/dev.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/dev.c	2006-07-23 03:42:00.000000000 +0200
 @@ -117,6 +117,12 @@
  #include <linux/dmaengine.h>
  #include <linux/err.h>
@@ -89951,7 +88908,7 @@
  EXPORT_SYMBOL(br_handle_frame_hook);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/pktgen.c linux-2.6-xen-fedora/net/core/pktgen.c
 --- linux-2.6/net/core/pktgen.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/pktgen.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/pktgen.c	2006-07-22 20:37:57.000000000 +0200
 @@ -6,7 +6,7 @@
   *
   * Alexey Kuznetsov  <kuznet at ms2.inr.ac.ru>
@@ -89963,7 +88920,7 @@
   * modify it under the terms of the GNU General Public License
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
 --- linux-2.6/net/core/skbuff.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-07-22 20:37:57.000000000 +0200
 @@ -146,6 +146,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -90052,7 +89009,7 @@
  	C(priority);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c
 --- linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-18 03:28:34.000000000 +0200
 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -90069,7 +89026,7 @@
  							   hdr->check));
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c
 --- linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-22 20:37:58.000000000 +0200
 @@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
@@ -90086,7 +89043,7 @@
  							   hdr->check));
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/xfrm4_output.c linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c
 --- linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-08-01 02:31:28.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-07-22 20:37:58.000000000 +0200
 @@ -18,6 +18,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
@@ -90109,7 +89066,7 @@
  		if (err)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
 --- linux-2.6/net/ipv6/addrconf.c	2006-07-16 19:14:10.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-08-01 02:31:28.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-07-22 20:37:58.000000000 +0200
 @@ -2488,6 +2488,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  
@@ -90128,7 +89085,7 @@
  
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/scripts/Makefile.xen linux-2.6-xen-fedora/scripts/Makefile.xen
 --- linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-08-01 02:31:28.000000000 +0200
++++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-07-18 03:28:35.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.468.4.1
retrieving revision 1.468.4.2
diff -u -r1.468.4.1 -r1.468.4.2
--- sources	11 Aug 2006 19:11:07 -0000	1.468.4.1
+++ sources	16 Aug 2006 20:43:05 -0000	1.468.4.2
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-32a856cececcc35cb834cfaccc3c2523  xen-10924.tar.bz2
+4ae2c95631b54820475437c206c3a4c2  xen-10730.tar.bz2
 ba31b754aaf80aa388858f86c34c4d01  patch-2.6.18-rc3.bz2
 2b8d22d3832b97c2bbd87e75755b36c9  patch-2.6.18-rc3-git3.bz2


--- linux-2.6-xen-unbreak-oprofile.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 16 20:55:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 16:55:16 -0400
Subject: rpms/synaptics/devel synaptics.spec,1.22,1.23
Message-ID: <200608162055.k7GKtGTi016501@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/synaptics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16478

Modified Files:
	synaptics.spec 
Log Message:
* Wed Aug 16 2006 Jesse Keating <jkeating at redhat.com> - 0:0.14.4-8
- bump for missing ppc package
- remove 0 epoch
- add dist tag


Index: synaptics.spec
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- synaptics.spec	12 Jul 2006 08:20:25 -0000	1.22
+++ synaptics.spec	16 Aug 2006 20:55:14 -0000	1.23
@@ -2,8 +2,7 @@
 
 Name:           synaptics
 Version:        0.14.4
-Epoch:		0
-Release:	7.1
+Release:	8%{?dist}
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
@@ -70,7 +69,12 @@
 %{_mandir}/man?/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: pkg-config: command not found
+* Wed Aug 16 2006 Jesse Keating <jkeating at redhat.com> - 0:0.14.4-8
+- bump for missing ppc package
+- remove 0 epoch
+- add dist tag
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.14.4-7.1
 - rebuild
 
 * Tue May 16 2006 Kristian H??gsberg <krh at redhat.com> - 0:0.14.4-7



From fedora-cvs-commits at redhat.com  Wed Aug 16 21:07:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 17:07:27 -0400
Subject: rpms/kernel/devel linux-2.6-hotplug-cpu-workqueue.patch, NONE,
	1.2.2.1 kernel-2.6.spec, 1.2519.4.2, 1.2519.4.3
Message-ID: <200608162107.k7GL7RC3019719@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19651

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Added Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	linux-2.6-hotplug-cpu-workqueue.patch 
Log Message:
added hotplug cpu beta blocker



linux-2.6-hotplug-cpu-workqueue.patch:
 workqueue.c |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

--- NEW FILE linux-2.6-hotplug-cpu-workqueue.patch ---

From: Andrew Morton <akpm at osdl.org>

Use a private lock instead.  It protects all per-cpu data structures in
workqueue.c, including the workqueues list.

Fix a bug in schedule_on_each_cpu(): it was forgetting to lock down the
per-cpu resources.

Unfixed long-standing bug: if someone unplugs the CPU identified by
`singlethread_cpu' the kernel will get very sick.

Cc: Dave Jones <davej at codemonkey.org.uk>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 kernel/workqueue.c |   33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff -puN kernel/workqueue.c~workqueue-remove-lock_cpu_hotplug kernel/workqueue.c
--- a/kernel/workqueue.c~workqueue-remove-lock_cpu_hotplug
+++ a/kernel/workqueue.c
@@ -68,7 +68,7 @@ struct workqueue_struct {
 
 /* All the per-cpu workqueues on the system, for hotplug cpu to add/remove
    threads to each one as cpus come/go. */
-static DEFINE_SPINLOCK(workqueue_lock);
+static DEFINE_MUTEX(workqueue_mutex);
 static LIST_HEAD(workqueues);
 
 static int singlethread_cpu;
@@ -320,10 +320,10 @@ void fastcall flush_workqueue(struct wor
 	} else {
 		int cpu;
 
-		lock_cpu_hotplug();
+		mutex_lock(&workqueue_mutex);
 		for_each_online_cpu(cpu)
 			flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, cpu));
-		unlock_cpu_hotplug();
+		mutex_unlock(&workqueue_mutex);
 	}
 }
 EXPORT_SYMBOL_GPL(flush_workqueue);
@@ -371,8 +371,7 @@ struct workqueue_struct *__create_workqu
 	}
 
 	wq->name = name;
-	/* We don't need the distraction of CPUs appearing and vanishing. */
-	lock_cpu_hotplug();
+	mutex_lock(&workqueue_mutex);
 	if (singlethread) {
 		INIT_LIST_HEAD(&wq->list);
 		p = create_workqueue_thread(wq, singlethread_cpu);
@@ -381,9 +380,7 @@ struct workqueue_struct *__create_workqu
 		else
 			wake_up_process(p);
 	} else {
-		spin_lock(&workqueue_lock);
 		list_add(&wq->list, &workqueues);
-		spin_unlock(&workqueue_lock);
 		for_each_online_cpu(cpu) {
 			p = create_workqueue_thread(wq, cpu);
 			if (p) {
@@ -393,7 +390,7 @@ struct workqueue_struct *__create_workqu
 				destroy = 1;
 		}
 	}
-	unlock_cpu_hotplug();
+	mutex_unlock(&workqueue_mutex);
 
 	/*
 	 * Was there any error during startup? If yes then clean up:
@@ -434,17 +431,15 @@ void destroy_workqueue(struct workqueue_
 	flush_workqueue(wq);
 
 	/* We don't need the distraction of CPUs appearing and vanishing. */
-	lock_cpu_hotplug();
+	mutex_lock(&workqueue_mutex);
 	if (is_single_threaded(wq))
 		cleanup_workqueue_thread(wq, singlethread_cpu);
 	else {
 		for_each_online_cpu(cpu)
 			cleanup_workqueue_thread(wq, cpu);
-		spin_lock(&workqueue_lock);
 		list_del(&wq->list);
-		spin_unlock(&workqueue_lock);
 	}
-	unlock_cpu_hotplug();
+	mutex_unlock(&workqueue_mutex);
 	free_percpu(wq->cpu_wq);
 	kfree(wq);
 }
@@ -515,11 +510,13 @@ int schedule_on_each_cpu(void (*func)(vo
 	if (!works)
 		return -ENOMEM;
 
+	mutex_lock(&workqueue_mutex);
 	for_each_online_cpu(cpu) {
 		INIT_WORK(per_cpu_ptr(works, cpu), func, info);
 		__queue_work(per_cpu_ptr(keventd_wq->cpu_wq, cpu),
 				per_cpu_ptr(works, cpu));
 	}
+	mutex_unlock(&workqueue_mutex);
 	flush_workqueue(keventd_wq);
 	free_percpu(works);
 	return 0;
@@ -635,6 +632,7 @@ static int __devinit workqueue_cpu_callb
 
 	switch (action) {
 	case CPU_UP_PREPARE:
+		mutex_lock(&workqueue_mutex);
 		/* Create a new workqueue thread for it. */
 		list_for_each_entry(wq, &workqueues, list) {
 			if (!create_workqueue_thread(wq, hotcpu)) {
@@ -653,6 +651,7 @@ static int __devinit workqueue_cpu_callb
 			kthread_bind(cwq->thread, hotcpu);
 			wake_up_process(cwq->thread);
 		}
+		mutex_unlock(&workqueue_mutex);
 		break;
 
 	case CPU_UP_CANCELED:
@@ -664,6 +663,15 @@ static int __devinit workqueue_cpu_callb
 				     any_online_cpu(cpu_online_map));
 			cleanup_workqueue_thread(wq, hotcpu);
 		}
+		mutex_unlock(&workqueue_mutex);
+		break;
+
+	case CPU_DOWN_PREPARE:
+		mutex_lock(&workqueue_mutex);
+		break;
+
+	case CPU_DOWN_FAILED:
+		mutex_unlock(&workqueue_mutex);
 		break;
 
 	case CPU_DEAD:
@@ -671,6 +679,7 @@ static int __devinit workqueue_cpu_callb
 			cleanup_workqueue_thread(wq, hotcpu);
 		list_for_each_entry(wq, &workqueues, list)
 			take_over_work(wq, hotcpu);
+		mutex_unlock(&workqueue_mutex);
 		break;
 	}
 
_



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.2
retrieving revision 1.2519.4.3
diff -u -r1.2519.4.2 -r1.2519.4.3
--- kernel-2.6.spec	16 Aug 2006 20:42:09 -0000	1.2519.4.2
+++ kernel-2.6.spec	16 Aug 2006 21:07:19 -0000	1.2519.4.3
@@ -398,6 +398,7 @@
 Patch1630: linux-2.6-mm-suspend-improvements.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
 Patch1650: linux-2.6-serial-460800.patch
+Patch1660: linux-2.6-hotplug-cpu-workqueue.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
@@ -923,6 +924,8 @@
 %patch1640 -p1
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
+# Fix hotplug CPU locking in workqueue creation.
+%patch1660 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
 # Only print migration info on SMP
@@ -1698,6 +1701,9 @@
 
 %changelog
 * Wed Aug 16 2006 Don Zickus <dzickus at redhat.com>
+- added #200740
+
+* Wed Aug 16 2006 Don Zickus <dzickus at redhat.com>
 - un-backport some patches that weren't beta-blockers
 - updating beta blockers
 - added #202466



From fedora-cvs-commits at redhat.com  Wed Aug 16 21:49:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 17:49:01 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic,1.39.6.1,1.39.6.2
Message-ID: <200608162149.k7GLn1Ld024664@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv22113/configs

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-ia64-generic 
Log Message:
I thought I disabled utrace on ia64, guess I messed up during the backport




Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.39.6.1
retrieving revision 1.39.6.2
diff -u -r1.39.6.1 -r1.39.6.2
--- config-ia64-generic	11 Aug 2006 19:11:08 -0000	1.39.6.1
+++ config-ia64-generic	16 Aug 2006 21:48:53 -0000	1.39.6.2
@@ -176,4 +176,4 @@
 CONFIG_HW_RANDOM_INTEL=m
 
 # FIXME
-# CONFIG_PTRACE is not set
+# CONFIG_UTRACE is not set



From fedora-cvs-commits at redhat.com  Wed Aug 16 21:50:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 17:50:33 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2519.4.3,1.2519.4.4
Message-ID: <200608162150.k7GLoXWW029340@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29272

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Log Message:
need to increase the rev number for tagging



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.3
retrieving revision 1.2519.4.4
diff -u -r1.2519.4.3 -r1.2519.4.4
--- kernel-2.6.spec	16 Aug 2006 21:07:19 -0000	1.2519.4.3
+++ kernel-2.6.spec	16 Aug 2006 21:50:29 -0000	1.2519.4.4
@@ -1702,6 +1702,7 @@
 %changelog
 * Wed Aug 16 2006 Don Zickus <dzickus at redhat.com>
 - added #200740
+- forgot to disable utrace on ia64
 
 * Wed Aug 16 2006 Don Zickus <dzickus at redhat.com>
 - un-backport some patches that weren't beta-blockers



From fedora-cvs-commits at redhat.com  Wed Aug 16 21:56:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 17:56:28 -0400
Subject: rpms/postgresql-jdbc/devel postgresql-jdbc.spec,1.8,1.9
Message-ID: <200608162156.k7GLuPl3031024@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql-jdbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30997

Modified Files:
	postgresql-jdbc.spec 
Log Message:
Fix Requires: for rebuild-gcj-db (bz #202544)


Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- postgresql-jdbc.spec	16 Aug 2006 18:14:05 -0000	1.8
+++ postgresql-jdbc.spec	16 Aug 2006 21:56:22 -0000	1.9
@@ -38,7 +38,7 @@
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
 Version:	8.1.407
-Release:	1jpp.3
+Release:	1jpp.4
 Epoch:		0
 License:	BSD
 Group:		Applications/Databases
@@ -57,8 +57,8 @@
 BuildRequires:	findutils gettext
 %if %{gcj_support}
 BuildRequires:	gcc-java
-Requires(post): java-1.4.2-gcj-compat
-Requires(postun): java-1.4.2-gcj-compat
+Requires(post): /usr/bin/rebuild-gcj-db
+Requires(postun): /usr/bin/rebuild-gcj-db
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -131,6 +131,9 @@
 %endif
 
 %changelog
+* Wed Aug 16 2006 Tom Lane <tgl at redhat.com> 8.1.407-1jpp.4
+- Fix Requires: for rebuild-gcj-db (bz #202544)
+
 * Wed Aug 16 2006 Fernando Nasser <fnasser at redhat.com> 8.1.407-1jpp.3
 - Merge with upstream
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 22:32:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 18:32:30 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.126, 1.127 mkinitrd.spec, 1.154,
	1.155 sources, 1.153, 1.154
Message-ID: <200608162232.k7GMWU3Q022531@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22488

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.1.8-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- .cvsignore	16 Aug 2006 19:21:57 -0000	1.126
+++ .cvsignore	16 Aug 2006 22:32:26 -0000	1.127
@@ -1,2 +1,2 @@
-mkinitrd-5.1.7.tar.bz2
 bdevid-0.4.tar.bz2
+mkinitrd-5.1.8.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- mkinitrd.spec	16 Aug 2006 19:21:57 -0000	1.154
+++ mkinitrd.spec	16 Aug 2006 22:32:26 -0000	1.155
@@ -3,7 +3,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.1.7
+Version: 5.1.8
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -118,6 +118,10 @@
 /%{python_sitelib}/bdevid.so
 
 %changelog
+* Wed Aug 16 2006 Peter Jones <pjones at redhat.com> - 5.1.8-1
+- Use modprobe to find module deps (#202559, #202596)
+- Fix typo for /dev/efirtc (#202110)
+
 * Wed Aug 16 2006 Peter Jones <pjones at redhat.com> - 5.1.7-1
 - Make "stabilized" work better (patch from Alexandre Oliva)
 - Rewrite usb handling (notting and pjones)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- sources	16 Aug 2006 19:21:57 -0000	1.153
+++ sources	16 Aug 2006 22:32:26 -0000	1.154
@@ -1,2 +1,2 @@
 d963851dff275f0af392cb25d3ad45fd  bdevid-0.4.tar.bz2
-de6276555a347fe6179d7d54fedf1128  mkinitrd-5.1.7.tar.bz2
+79091378140e8bc20312bc0bb0f8aa58  mkinitrd-5.1.8.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 16 23:52:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 19:52:02 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11.spec,1.9,1.10
Message-ID: <200608162352.k7GNq2DM000664@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv577

Modified Files:
	pam_pkcs11.spec 
Log Message:


Remove sceventd.



Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pam_pkcs11.spec	24 Jul 2006 14:11:45 -0000	1.9
+++ pam_pkcs11.spec	16 Aug 2006 23:52:00 -0000	1.10
@@ -6,16 +6,15 @@
 
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        9
+Release:        10
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
 License:        LGPL
 URL:            http://www.opensc.org/pam_pkcs11
 Source0: 	http://www.opensc.org/files/%{name}-%{version}.tar.gz
-Source1:	sceventd.sh
-Source2:	rh_pam_pkcs11.conf
-Source3:	rh_pkcs11_eventmgr.conf
+Source1:	rh_pam_pkcs11.conf
+Source2:	rh_pkcs11_eventmgr.conf
 Patch1:		pam_pkcs11-0.5.3-nss.patch
 Patch2:		pam_pkcs11-0.5.3-cardonly.patch
 Patch3:		pam_pkcs11-0.5.3-setup-tool.patch
@@ -93,13 +92,8 @@
 # set up config files
 #
 install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
-#
-# install service
-#
-mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/sceventd
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
 #
 # clean up those files that aren't part of this package
 # (makefile should install them if --without-pcsclite is supplied
@@ -111,8 +105,6 @@
 rm -f $RPM_BUILD_ROOT/%{_bindir}/make_hash_link.sh
 
 %post
-# don't start by default. Depend on (future) authconfig api to start.
-/sbin/chkconfig --add sceventd
 
 %preun
 if [ $1 -eq 0 ] ; then
@@ -121,7 +113,6 @@
 fi
 
 %postun
-[ $1 -gt 0 ] && %{_initrddir}/sceventd try-restart >/dev/null || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -136,7 +127,6 @@
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
-%{_initrddir}/sceventd
 %{_bindir}/pkcs11_eventmgr
 %{_bindir}/pklogin_finder
 %{_bindir}/pkcs11_inspect
@@ -155,6 +145,9 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Mon Aug 16 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-10
+- remove sceventd
+
 * Mon Jul 24 2006 Ray Strode <rstrode at redhat.com> 0.5.3-9
 - compile with better debugging flags
 



From fedora-cvs-commits at redhat.com  Wed Aug 16 23:55:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 19:55:29 -0400
Subject: rpms/gcc/devel gcc41-s390-rh199604.patch, 1.1.2.1,
	1.1.2.2 gcc41.spec, 1.88.2.1, 1.88.2.2
Message-ID: <200608162355.k7GNtTUW001931@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1504

Modified Files:
      Tag: private-aoliva-gcc-4_1_1-13-branch
	gcc41-s390-rh199604.patch gcc41.spec 
Log Message:
* Wed Aug 16 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13.0.lxo.2
- Improve fix for openssl on s390.  (BZ#199604, target/28146)


gcc41-s390-rh199604.patch:
 reload.c  |   36 ++++++++++++++++++++++++++++++++++++
 reload.h  |    1 +
 reload1.c |   15 +++++++++++++++
 3 files changed, 52 insertions(+)

Index: gcc41-s390-rh199604.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/Attic/gcc41-s390-rh199604.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- gcc41-s390-rh199604.patch	27 Jul 2006 05:47:04 -0000	1.1.2.1
+++ gcc41-s390-rh199604.patch	16 Aug 2006 23:55:26 -0000	1.1.2.2
@@ -1,98 +1,185 @@
 for gcc/ChangeLog
 from  Alexandre Oliva  <aoliva at redhat.com>
 
-	* rtlanal.c (count_occurrences): Add new flag to enable
-	comparison of MEM attributes.
-	* reload1.c (delete_output_reload): Use it to count the
-	results of register elimination.
+	PR target/28146
+	* reload.h (reg_equiv_alt_mem_list): New declaration.
+	* reload1.c (reg_equiv_alt_mem_list): New definition.
+	(reload): Initialize it and release it.
+	(delete_output_reload): Use it.
+	* reload.c (push_reg_equiv_alt_mem): New function.
+	(find_reloads_toplev): Call it.
+	(find_reloads_address, find_reloads_address_1): Likewise.
+	(find_reloads_subreg_address): Likewise.
 
 Index: gcc/reload1.c
 ===================================================================
---- gcc/reload1.c.orig	2006-06-19 11:53:32.000000000 -0300
-+++ gcc/reload1.c	2006-07-26 07:07:40.000000000 -0300
-@@ -7798,9 +7798,21 @@ delete_output_reload (rtx insn, int j, i
-     }
-   n_occurrences = count_occurrences (PATTERN (insn), reg, 0);
-   if (substed)
--    n_occurrences += count_occurrences (PATTERN (insn),
--					eliminate_regs (substed, 0,
--							NULL_RTX), 0);
-+    {
-+      rtx elim = eliminate_regs (substed, 0, NULL_RTX);
-+      int flags = 0;
+--- gcc/reload1.c.orig	2006-08-16 05:47:32.000000000 -0300
++++ gcc/reload1.c	2006-08-16 05:48:07.000000000 -0300
+@@ -120,6 +120,10 @@ rtx *reg_equiv_address;
+    or zero if pseudo reg N is not equivalent to a memory slot.  */
+ rtx *reg_equiv_mem;
+ 
++/* Element N is an EXPR_LIST of REG_EQUIVs containing MEMs with
++   alternate representations of the location of pseudo reg N.  */
++rtx *reg_equiv_alt_mem_list;
 +
-+      /* eliminate_regs() may create simple rtxes for a pseudo mapped
-+	 to memory such as (plus (reg) (const_int X)) where the
-+	 reload-generated corresponding address is (plus (plus (reg)
-+	 (const_int Y)) (const_int Z)), where X = Y + Z.  We have to
-+	 match them otherwise we lose, so take advantage of memory
-+	 attributes.  */
-+      if (MEM_P (elim) && MEM_ATTRS (elim))
-+	flags |= 2;
+ /* Widest width in which each pseudo reg is referred to (via subreg).  */
+ static unsigned int *reg_max_ref_width;
+ 
+@@ -701,6 +705,7 @@ reload (rtx first, int global)
+   reg_equiv_constant = xcalloc (max_regno, sizeof (rtx));
+   reg_equiv_invariant = xcalloc (max_regno, sizeof (rtx));
+   reg_equiv_mem = xcalloc (max_regno, sizeof (rtx));
++  reg_equiv_alt_mem_list = xcalloc (max_regno, sizeof (rtx));
+   reg_equiv_address = xcalloc (max_regno, sizeof (rtx));
+   reg_max_ref_width = xcalloc (max_regno, sizeof (int));
+   reg_old_renumber = xcalloc (max_regno, sizeof (short));
+@@ -1258,6 +1263,11 @@ reload (rtx first, int global)
+   if (offsets_at)
+     free (offsets_at);
+ 
++  for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
++    if (reg_equiv_alt_mem_list[i])
++      free_EXPR_LIST_list (&reg_equiv_alt_mem_list[i]);
++  free (reg_equiv_alt_mem_list);
 +
-+      n_occurrences += count_occurrences (PATTERN (insn), elim, flags);
+   free (reg_equiv_mem);
+   reg_equiv_init = 0;
+   free (reg_equiv_address);
+@@ -7801,6 +7811,11 @@ delete_output_reload (rtx insn, int j, i
+     n_occurrences += count_occurrences (PATTERN (insn),
+ 					eliminate_regs (substed, 0,
+ 							NULL_RTX), 0);
++  for (i1 = reg_equiv_alt_mem_list [REGNO (reg)]; i1; i1 = XEXP (i1, 1))
++    {
++      gcc_assert (!rtx_equal_p (XEXP (i1, 0), substed));
++      n_occurrences += count_occurrences (PATTERN (insn), XEXP (i1, 0), 0);
 +    }
    if (n_occurrences > n_inherited)
      return;
  
-Index: gcc/rtlanal.c
+Index: gcc/reload.c
 ===================================================================
---- gcc/rtlanal.c.orig	2005-11-04 06:41:19.000000000 -0200
-+++ gcc/rtlanal.c	2006-07-26 07:09:06.000000000 -0300
-@@ -547,11 +547,15 @@ global_reg_mentioned_p (rtx x)
-   return for_each_rtx (&x, global_reg_mentioned_p_1, NULL);
- }
+--- gcc/reload.c.orig	2006-08-16 05:47:32.000000000 -0300
++++ gcc/reload.c	2006-08-16 05:47:39.000000000 -0300
+@@ -282,6 +282,26 @@ static int find_inc_amount (rtx, rtx);
+ static int refers_to_mem_for_reload_p (rtx);
+ static int refers_to_regno_for_reload_p (unsigned int, unsigned int,
+ 					 rtx, rtx *);
++
++/* Add NEW to reg_equiv_alt_mem_list[REGNO] if it's different from
++   ORIG and not present in the list yet.  */
++
++static inline void
++push_reg_equiv_alt_mem (int regno, rtx new, rtx orig)
++{
++  rtx it;
++
++  if (new == orig)
++    return;
++
++  for (it = reg_equiv_alt_mem_list [regno]; it; it = XEXP (it, 1))
++    if (rtx_equal_p (XEXP (it, 0), new))
++      return;
++
++  reg_equiv_alt_mem_list [regno]
++    = alloc_EXPR_LIST (REG_EQUIV, new,
++		       reg_equiv_alt_mem_list [regno]);
++}
  
--/* Return the number of places FIND appears within X.  If COUNT_DEST is
--   zero, we do not count occurrences inside the destination of a SET.  */
-+/* Return the number of places FIND appears within X.  If COUNT_FLAGS
-+   has the least-significant bit zero, we do not count occurrences
-+   inside the destination of a SET.  If COUNT_FLAGS has the
-+   second-least-significant bit one, FIND is assumed to be a MEM with
-+   attributes, and we compare MEMs containing attributes with it by
-+   their attributes rather than by rtx equality.  */
- 
- int
--count_occurrences (rtx x, rtx find, int count_dest)
-+count_occurrences (rtx x, rtx find, int flags)
- {
-   int i, j;
-   enum rtx_code code;
-@@ -576,13 +580,19 @@ count_occurrences (rtx x, rtx find, int 
-       return 0;
- 
-     case MEM:
--      if (MEM_P (find) && rtx_equal_p (x, find))
-+      if ((flags & 2) && MEM_ATTRS (x))
-+	{
-+	  if (MEM_EXPR (find) == MEM_EXPR (x)
-+	      && MEM_OFFSET (find) == MEM_OFFSET (x))
-+	    return 1;
-+	}
-+      else if (MEM_P (find) && rtx_equal_p (x, find))
- 	return 1;
-       break;
- 
-     case SET:
--      if (SET_DEST (x) == find && ! count_dest)
--	return count_occurrences (SET_SRC (x), find, count_dest);
-+      if (SET_DEST (x) == find && ! (flags & 1))
-+	return count_occurrences (SET_SRC (x), find, flags);
-       break;
- 
-     default:
-@@ -597,12 +607,12 @@ count_occurrences (rtx x, rtx find, int 
-       switch (*format_ptr++)
- 	{
- 	case 'e':
--	  count += count_occurrences (XEXP (x, i), find, count_dest);
-+	  count += count_occurrences (XEXP (x, i), find, flags);
- 	  break;
- 
- 	case 'E':
- 	  for (j = 0; j < XVECLEN (x, i); j++)
--	    count += count_occurrences (XVECEXP (x, i, j), find, count_dest);
-+	    count += count_occurrences (XVECEXP (x, i, j), find, flags);
- 	  break;
- 	}
-     }
+ #ifdef HAVE_SECONDARY_RELOADS
+ 
+@@ -4557,6 +4577,7 @@ find_reloads_toplev (rtx x, int opnum, e
+ 	      x = mem;
+ 	      i = find_reloads_address (GET_MODE (x), &x, XEXP (x, 0), &XEXP (x, 0),
+ 					opnum, type, ind_levels, insn);
++	      push_reg_equiv_alt_mem (regno, x, mem);
+ 	      if (address_reloaded)
+ 		*address_reloaded = i;
+ 	    }
+@@ -4765,9 +4786,12 @@ find_reloads_address (enum machine_mode 
+ 	      tem = make_memloc (ad, regno);
+ 	      if (! strict_memory_address_p (GET_MODE (tem), XEXP (tem, 0)))
+ 		{
++		  rtx orig = tem;
++
+ 		  find_reloads_address (GET_MODE (tem), &tem, XEXP (tem, 0),
+ 					&XEXP (tem, 0), opnum,
+ 					ADDR_TYPE (type), ind_levels, insn);
++		  push_reg_equiv_alt_mem (regno, tem, orig);
+ 		}
+ 	      /* We can avoid a reload if the register's equivalent memory
+ 		 expression is valid as an indirect memory address.
+@@ -5520,6 +5544,8 @@ find_reloads_address_1 (enum machine_mod
+ 	    if (reg_equiv_address[regno]
+ 		|| ! rtx_equal_p (tem, reg_equiv_mem[regno]))
+ 	      {
++		rtx orig = tem;
++
+ 		/* First reload the memory location's address.
+ 		    We can't use ADDR_TYPE (type) here, because we need to
+ 		    write back the value after reading it, hence we actually
+@@ -5529,6 +5555,8 @@ find_reloads_address_1 (enum machine_mod
+ 				      RELOAD_OTHER,
+ 				      ind_levels, insn);
+ 
++		push_reg_equiv_alt_mem (regno, tem, orig);
++
+ 		/* Then reload the memory location into a base
+ 		    register.  */
+ 		reloadnum = push_reload (tem, tem, &XEXP (x, 0),
+@@ -5583,6 +5611,8 @@ find_reloads_address_1 (enum machine_mod
+ 	      if (reg_equiv_address[regno]
+ 		  || ! rtx_equal_p (tem, reg_equiv_mem[regno]))
+ 		{
++		  rtx orig = tem;
++
+ 		  /* First reload the memory location's address.
+ 		     We can't use ADDR_TYPE (type) here, because we need to
+ 		     write back the value after reading it, hence we actually
+@@ -5590,6 +5620,7 @@ find_reloads_address_1 (enum machine_mod
+ 		  find_reloads_address (GET_MODE (tem), &tem, XEXP (tem, 0),
+ 					&XEXP (tem, 0), opnum, type,
+ 					ind_levels, insn);
++		  push_reg_equiv_alt_mem (regno, tem, orig);
+ 		  /* Put this inside a new increment-expression.  */
+ 		  x = gen_rtx_fmt_e (GET_CODE (x), GET_MODE (x), tem);
+ 		  /* Proceed to reload that, as if it contained a register.  */
+@@ -5779,6 +5810,7 @@ find_reloads_address_1 (enum machine_mod
+ 		find_reloads_address (GET_MODE (x), &x, XEXP (x, 0),
+ 				      &XEXP (x, 0), opnum, ADDR_TYPE (type),
+ 				      ind_levels, insn);
++		push_reg_equiv_alt_mem (regno, x, tem);
+ 	      }
+ 	  }
+ 
+@@ -5962,6 +5994,7 @@ find_reloads_subreg_address (rtx x, int 
+ 	      unsigned outer_size = GET_MODE_SIZE (GET_MODE (x));
+ 	      unsigned inner_size = GET_MODE_SIZE (GET_MODE (SUBREG_REG (x)));
+ 	      int offset;
++	      rtx orig = tem;
+ 
+ 	      /* For big-endian paradoxical subregs, SUBREG_BYTE does not
+ 		 hold the correct (negative) byte offset.  */
+@@ -5997,6 +6030,9 @@ find_reloads_subreg_address (rtx x, int 
+ 	      find_reloads_address (GET_MODE (tem), &tem, XEXP (tem, 0),
+ 				    &XEXP (tem, 0), opnum, type,
+ 				    ind_levels, insn);
++	      /* ??? Do we need to handle nonzero offsets somehow?  */
++	      if (!offset)
++		push_reg_equiv_alt_mem (regno, tem, orig);
+ 
+ 	      /* If this is not a toplevel operand, find_reloads doesn't see
+ 		 this substitution.  We have to emit a USE of the pseudo so
+Index: gcc/reload.h
+===================================================================
+--- gcc/reload.h.orig	2006-08-16 05:47:32.000000000 -0300
++++ gcc/reload.h	2006-08-16 05:47:39.000000000 -0300
+@@ -170,6 +170,7 @@ extern rtx *reg_equiv_invariant;
+ extern rtx *reg_equiv_memory_loc;
+ extern rtx *reg_equiv_address;
+ extern rtx *reg_equiv_mem;
++extern rtx *reg_equiv_alt_mem_list;
+ 
+ /* Element N is the list of insns that initialized reg N from its equivalent
+    constant or memory slot.  */


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.88.2.1
retrieving revision 1.88.2.2
diff -u -r1.88.2.1 -r1.88.2.2
--- gcc41.spec	27 Jul 2006 05:47:04 -0000	1.88.2.1
+++ gcc41.spec	16 Aug 2006 23:55:26 -0000	1.88.2.2
@@ -1,6 +1,6 @@
 %define DATE 20060721
 %define gcc_version 4.1.1
-%define gcc_release 13.0.lxo.1
+%define gcc_release 13.0.lxo.2
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -1524,8 +1524,11 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Aug 16 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13.0.lxo.2
+- Improve fix for openssl on s390.  (BZ#199604, target/28146)
+
 * Thu Jul 27 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13.0.lxo.1
-- Fix reload problem that breaks openssl on s390.  (BZ#199640, perhaps
+- Fix reload problem that breaks openssl on s390.  (BZ#199604, perhaps
 also PR target/28146)
 
 * Tue Jul 25 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13



From fedora-cvs-commits at redhat.com  Thu Aug 17 00:20:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 20:20:11 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.172,1.172.2.1
Message-ID: <200608170020.k7H0KBDa023439@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv23327/configs

Modified Files:
      Tag: private-linville-netdev-fc5-8-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.172
retrieving revision 1.172.2.1
diff -u -r1.172 -r1.172.2.1
--- config-generic	29 Jul 2006 18:20:09 -0000	1.172
+++ config-generic	17 Aug 2006 00:20:08 -0000	1.172.2.1
@@ -633,11 +633,13 @@
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_DECNET=m
 CONFIG_DECNET_ROUTER=y
 CONFIG_DECNET_ROUTE_FWMARK=y
 # CONFIG_DECNET_NF_GRABULATOR is not set
 CONFIG_BRIDGE=m
+CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
@@ -648,6 +650,8 @@
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -663,9 +667,11 @@
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 
@@ -677,21 +683,21 @@
 #
 CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_CONNTRACK_SECMARK=y
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
 CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_POLICY=m
-CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+CONFIG_IP_NF_MATCH_POLICY=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -729,22 +735,22 @@
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_IP_NF_PPTP=m
 CONFIG_IP_NF_H323=m
+CONFIG_IP_NF_SIP=m
 
 #
 # IPv6: Netfilter Configuration
 #
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MULTIPORT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
@@ -805,8 +811,8 @@
 # CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
 CONFIG_IP_DCCP=m
-CONFIG_IP_DCCP_CCID2=m
 CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_DCCP_UNLOAD_HACK=y
 
@@ -861,6 +867,7 @@
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NETDEVICES=y
 
 #
@@ -923,6 +930,7 @@
 CONFIG_QSEMI_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
+CONFIG_SMSC_PHY=m
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -946,6 +954,7 @@
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_ULI526X=m
+# CONFIG_AT1700 is not set
 # CONFIG_HP100 is not set
 CONFIG_LNE390=m
 CONFIG_NE3210=m
@@ -1006,6 +1015,7 @@
 CONFIG_SKGE=m
 CONFIG_TIGON3=m
 CONFIG_SKY2=m
+CONFIG_QLA3XXX=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1015,6 +1025,7 @@
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_CHELSIO_T1=m
+CONFIG_MYRI10GE=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1040,6 +1051,7 @@
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -1068,6 +1080,7 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW_QOS is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1077,8 +1090,14 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_PRISM54_USB=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
+CONFIG_ADM8211=m
+CONFIG_ACX_PCI=m
+CONFIG_ACX_USB=m
+CONFIG_ZD1211RW=m
+CONFIG_ZD1211RW_DEBUG=y
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1089,7 +1108,6 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_NET_WIRELESS=y
-CONFIG_NET_WIRELESS_RTNETLINK=y
 
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_PCI=m
@@ -1154,9 +1172,9 @@
 CONFIG_ESI_DONGLE=m
 CONFIG_ACTISYS_DONGLE=m
 CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
+CONFIG_TOIM3232_DONGLE=m
 CONFIG_LITELINK_DONGLE=m
 CONFIG_MA600_DONGLE=m
 CONFIG_GIRBIL_DONGLE=m
@@ -1173,6 +1191,7 @@
 CONFIG_ALI_FIR=m
 CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
 
 #
 # Bluetooth support



From fedora-cvs-commits at redhat.com  Thu Aug 17 01:25:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 16 Aug 2006 21:25:21 -0400
Subject: rpms/gcc/devel gcc41-s390-rh199604.patch, NONE, 1.1.4.1 gcc41.spec,
	1.95, 1.95.2.1
Message-ID: <200608170125.k7H1PLWD005711@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5450

Modified Files:
      Tag: private-aoliva-gcc-4_1_1-17-branch
	gcc41.spec 
Added Files:
      Tag: private-aoliva-gcc-4_1_1-17-branch
	gcc41-s390-rh199604.patch 
Log Message:
* Wed Aug 16 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-17.0.lxo.1
- Fix reload problem that breaks openssl on s390.  (BZ#199604, target/28146)


gcc41-s390-rh199604.patch:
 reload.c  |   36 ++++++++++++++++++++++++++++++++++++
 reload.h  |    1 +
 reload1.c |   15 +++++++++++++++
 3 files changed, 52 insertions(+)

--- NEW FILE gcc41-s390-rh199604.patch ---
for gcc/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	PR target/28146
	* reload.h (reg_equiv_alt_mem_list): New declaration.
	* reload1.c (reg_equiv_alt_mem_list): New definition.
	(reload): Initialize it and release it.
	(delete_output_reload): Use it.
	* reload.c (push_reg_equiv_alt_mem): New function.
	(find_reloads_toplev): Call it.
	(find_reloads_address, find_reloads_address_1): Likewise.
	(find_reloads_subreg_address): Likewise.

Index: gcc/reload1.c
===================================================================
--- gcc/reload1.c.orig	2006-08-16 05:47:32.000000000 -0300
+++ gcc/reload1.c	2006-08-16 05:48:07.000000000 -0300
@@ -120,6 +120,10 @@ rtx *reg_equiv_address;
    or zero if pseudo reg N is not equivalent to a memory slot.  */
 rtx *reg_equiv_mem;
 
+/* Element N is an EXPR_LIST of REG_EQUIVs containing MEMs with
+   alternate representations of the location of pseudo reg N.  */
+rtx *reg_equiv_alt_mem_list;
+
 /* Widest width in which each pseudo reg is referred to (via subreg).  */
 static unsigned int *reg_max_ref_width;
 
@@ -701,6 +705,7 @@ reload (rtx first, int global)
   reg_equiv_constant = xcalloc (max_regno, sizeof (rtx));
   reg_equiv_invariant = xcalloc (max_regno, sizeof (rtx));
   reg_equiv_mem = xcalloc (max_regno, sizeof (rtx));
+  reg_equiv_alt_mem_list = xcalloc (max_regno, sizeof (rtx));
   reg_equiv_address = xcalloc (max_regno, sizeof (rtx));
   reg_max_ref_width = xcalloc (max_regno, sizeof (int));
   reg_old_renumber = xcalloc (max_regno, sizeof (short));
@@ -1258,6 +1263,11 @@ reload (rtx first, int global)
   if (offsets_at)
     free (offsets_at);
 
+  for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
+    if (reg_equiv_alt_mem_list[i])
+      free_EXPR_LIST_list (&reg_equiv_alt_mem_list[i]);
+  free (reg_equiv_alt_mem_list);
+
   free (reg_equiv_mem);
   reg_equiv_init = 0;
   free (reg_equiv_address);
@@ -7801,6 +7811,11 @@ delete_output_reload (rtx insn, int j, i
     n_occurrences += count_occurrences (PATTERN (insn),
 					eliminate_regs (substed, 0,
 							NULL_RTX), 0);
+  for (i1 = reg_equiv_alt_mem_list [REGNO (reg)]; i1; i1 = XEXP (i1, 1))
+    {
+      gcc_assert (!rtx_equal_p (XEXP (i1, 0), substed));
+      n_occurrences += count_occurrences (PATTERN (insn), XEXP (i1, 0), 0);
+    }
   if (n_occurrences > n_inherited)
     return;
 
Index: gcc/reload.c
===================================================================
--- gcc/reload.c.orig	2006-08-16 05:47:32.000000000 -0300
+++ gcc/reload.c	2006-08-16 05:47:39.000000000 -0300
@@ -282,6 +282,26 @@ static int find_inc_amount (rtx, rtx);
 static int refers_to_mem_for_reload_p (rtx);
 static int refers_to_regno_for_reload_p (unsigned int, unsigned int,
 					 rtx, rtx *);
+
+/* Add NEW to reg_equiv_alt_mem_list[REGNO] if it's different from
+   ORIG and not present in the list yet.  */
+
+static inline void
+push_reg_equiv_alt_mem (int regno, rtx new, rtx orig)
+{
+  rtx it;
+
+  if (new == orig)
+    return;
+
+  for (it = reg_equiv_alt_mem_list [regno]; it; it = XEXP (it, 1))
+    if (rtx_equal_p (XEXP (it, 0), new))
+      return;
+
+  reg_equiv_alt_mem_list [regno]
+    = alloc_EXPR_LIST (REG_EQUIV, new,
+		       reg_equiv_alt_mem_list [regno]);
+}
 
 #ifdef HAVE_SECONDARY_RELOADS
 
@@ -4557,6 +4577,7 @@ find_reloads_toplev (rtx x, int opnum, e
 	      x = mem;
 	      i = find_reloads_address (GET_MODE (x), &x, XEXP (x, 0), &XEXP (x, 0),
 					opnum, type, ind_levels, insn);
+	      push_reg_equiv_alt_mem (regno, x, mem);
 	      if (address_reloaded)
 		*address_reloaded = i;
 	    }
@@ -4765,9 +4786,12 @@ find_reloads_address (enum machine_mode 
 	      tem = make_memloc (ad, regno);
 	      if (! strict_memory_address_p (GET_MODE (tem), XEXP (tem, 0)))
 		{
+		  rtx orig = tem;
+
 		  find_reloads_address (GET_MODE (tem), &tem, XEXP (tem, 0),
 					&XEXP (tem, 0), opnum,
 					ADDR_TYPE (type), ind_levels, insn);
+		  push_reg_equiv_alt_mem (regno, tem, orig);
 		}
 	      /* We can avoid a reload if the register's equivalent memory
 		 expression is valid as an indirect memory address.
@@ -5520,6 +5544,8 @@ find_reloads_address_1 (enum machine_mod
 	    if (reg_equiv_address[regno]
 		|| ! rtx_equal_p (tem, reg_equiv_mem[regno]))
 	      {
+		rtx orig = tem;
+
 		/* First reload the memory location's address.
 		    We can't use ADDR_TYPE (type) here, because we need to
 		    write back the value after reading it, hence we actually
@@ -5529,6 +5555,8 @@ find_reloads_address_1 (enum machine_mod
 				      RELOAD_OTHER,
 				      ind_levels, insn);
 
+		push_reg_equiv_alt_mem (regno, tem, orig);
+
 		/* Then reload the memory location into a base
 		    register.  */
 		reloadnum = push_reload (tem, tem, &XEXP (x, 0),
@@ -5583,6 +5611,8 @@ find_reloads_address_1 (enum machine_mod
 	      if (reg_equiv_address[regno]
 		  || ! rtx_equal_p (tem, reg_equiv_mem[regno]))
 		{
+		  rtx orig = tem;
+
 		  /* First reload the memory location's address.
 		     We can't use ADDR_TYPE (type) here, because we need to
 		     write back the value after reading it, hence we actually
@@ -5590,6 +5620,7 @@ find_reloads_address_1 (enum machine_mod
 		  find_reloads_address (GET_MODE (tem), &tem, XEXP (tem, 0),
 					&XEXP (tem, 0), opnum, type,
 					ind_levels, insn);
+		  push_reg_equiv_alt_mem (regno, tem, orig);
 		  /* Put this inside a new increment-expression.  */
 		  x = gen_rtx_fmt_e (GET_CODE (x), GET_MODE (x), tem);
 		  /* Proceed to reload that, as if it contained a register.  */
@@ -5779,6 +5810,7 @@ find_reloads_address_1 (enum machine_mod
 		find_reloads_address (GET_MODE (x), &x, XEXP (x, 0),
 				      &XEXP (x, 0), opnum, ADDR_TYPE (type),
 				      ind_levels, insn);
+		push_reg_equiv_alt_mem (regno, x, tem);
 	      }
 	  }
 
@@ -5962,6 +5994,7 @@ find_reloads_subreg_address (rtx x, int 
 	      unsigned outer_size = GET_MODE_SIZE (GET_MODE (x));
 	      unsigned inner_size = GET_MODE_SIZE (GET_MODE (SUBREG_REG (x)));
 	      int offset;
+	      rtx orig = tem;
 
 	      /* For big-endian paradoxical subregs, SUBREG_BYTE does not
 		 hold the correct (negative) byte offset.  */
@@ -5997,6 +6030,9 @@ find_reloads_subreg_address (rtx x, int 
 	      find_reloads_address (GET_MODE (tem), &tem, XEXP (tem, 0),
 				    &XEXP (tem, 0), opnum, type,
 				    ind_levels, insn);
+	      /* ??? Do we need to handle nonzero offsets somehow?  */
+	      if (!offset)
+		push_reg_equiv_alt_mem (regno, tem, orig);
 
 	      /* If this is not a toplevel operand, find_reloads doesn't see
 		 this substitution.  We have to emit a USE of the pseudo so
Index: gcc/reload.h
===================================================================
--- gcc/reload.h.orig	2006-08-16 05:47:32.000000000 -0300
+++ gcc/reload.h	2006-08-16 05:47:39.000000000 -0300
@@ -170,6 +170,7 @@ extern rtx *reg_equiv_invariant;
 extern rtx *reg_equiv_memory_loc;
 extern rtx *reg_equiv_address;
 extern rtx *reg_equiv_mem;
+extern rtx *reg_equiv_alt_mem_list;
 
 /* Element N is the list of insns that initialized reg N from its equivalent
    constant or memory slot.  */


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.95
retrieving revision 1.95.2.1
diff -u -r1.95 -r1.95.2.1
--- gcc41.spec	16 Aug 2006 18:28:12 -0000	1.95
+++ gcc41.spec	17 Aug 2006 01:25:16 -0000	1.95.2.1
@@ -1,6 +1,6 @@
 %define DATE 20060816
 %define gcc_version 4.1.1
-%define gcc_release 17
+%define gcc_release 17.0.lxo.1
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -145,6 +145,8 @@
 Patch38: gcc41-pr28744.patch
 Patch39: gcc41-x86_64-kernel-ssp.patch
 
+Patch1001: gcc41-s390-rh199604.patch
+
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -465,6 +467,8 @@
 %patch38 -p0 -b .pr28744~
 %patch39 -p0 -b .x86_64-kernel-ssp~
 
+%patch1001 -p0 -b .s390-rh199604~
+
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
 
@@ -1524,6 +1528,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Aug 16 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-17.0.lxo.1
+- Fix reload problem that breaks openssl on s390.  (BZ#199604, target/28146)
+
 * Wed Aug 16 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-17
 - update from gcc-4_1-branch (-r116082:116176)
   - PRs c++/27894, c++/28677, c/28649, middle-end/28075,



From fedora-cvs-commits at redhat.com  Thu Aug 17 07:15:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 03:15:08 -0400
Subject: rpms/fonts-indic/devel .cvsignore, 1.4, 1.5 fonts-indic.spec, 1.9,
	1.10 sources, 1.7, 1.8
Message-ID: <200608170715.k7H7F8Oa026560@cvs.devel.redhat.com>

Author: llch

Update of /cvs/dist/rpms/fonts-indic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26471

Modified Files:
	.cvsignore fonts-indic.spec sources 
Log Message:
* Thu Aug 17 2006 Leon Ho <llch at redhat.com> - 2.0.1-1
- fixed RH#201041 for bn_IN
- fixed RH#197639, RH#202161, RH#202163 for ml_IN
- fixed RH#201998 for kn_IN




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fonts-indic/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Jul 2006 05:13:52 -0000	1.4
+++ .cvsignore	17 Aug 2006 07:15:05 -0000	1.5
@@ -1,3 +1,4 @@
 fonts-indic-1.9.tar.gz
 fonts-indic-1.10.tar.gz
 fonts-indic-2.0.tar.gz
+fonts-indic-2.0.1.tar.gz


Index: fonts-indic.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fonts-indic.spec	31 Jul 2006 13:57:24 -0000	1.9
+++ fonts-indic.spec	17 Aug 2006 07:15:05 -0000	1.10
@@ -3,8 +3,8 @@
 %define langlist	"bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu"
 
 Name:		fonts-indic
-Version:	2.0
-Release: 	2
+Version:	2.0.1
+Release: 	1
 License:	GPL
 Group:		User Interface/X
 BuildArch:	noarch
@@ -256,6 +256,11 @@
 %{xfontdir}/telugu/*ttf
 
 %changelog
+* Thu Aug 17 2006 Leon Ho <llch at redhat.com> - 2.0.1-1
+- fixed RH#201041 for bn_IN
+- fixed RH#197639, RH#202161, RH#202163 for ml_IN
+- fixed RH#201998 for kn_IN
+
 * Mon Jul 31 2006 Darshan Santani <dsantani at redhat.com> - 2.0-2
 - Bug Fixes "Bengali" RH#179821,  RH#197216, RH#169110
 - Bug Fixes "Punjabi" RH #167592.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fonts-indic/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Jul 2006 13:57:24 -0000	1.7
+++ sources	17 Aug 2006 07:15:05 -0000	1.8
@@ -1,3 +1,4 @@
 3dd41a67df406480430fa954c76b44cb  fonts-indic-1.9.tar.gz
 6367531e48d531fbb175279fdbd2055a  fonts-indic-1.10.tar.gz
 d11aa6f1f189092af591b6bf3b90d96e  fonts-indic-2.0.tar.gz
+f50bd8a3b0c66e01fc4927fd2eae2d4f  fonts-indic-2.0.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 17 07:35:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 03:35:17 -0400
Subject: rpms/scim-chewing/devel scim-chewing.spec,1.20,1.21
Message-ID: <200608170735.k7H7ZHC4015674@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/scim-chewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15475

Modified Files:
	scim-chewing.spec 
Log Message:
removed patch regarding bug# 191957 as bug is not recognised as a bug



Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- scim-chewing.spec	15 Aug 2006 09:08:09 -0000	1.20
+++ scim-chewing.spec	17 Aug 2006 07:35:13 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:		scim-chewing
 Version:	0.3.1
-Release:	2.1
+Release:	3%{?dist}
 Summary:	Chewing Chinese input method for SCIM
 
 License:	GPL
@@ -11,7 +11,6 @@
 Source:		http://chewing.csie.net/download/scim/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}
 BuildRequires:	scim-devel, libchewing-devel >= 0.3.0, gettext, intltool
-Patch1:		scim-chewing-LTC23919-191957.patch 
 %if %{with_libstdc_preview}
 Buildrequires:	libstdc++so7-devel
 %endif
@@ -24,6 +23,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-LTC23919
 
 
 %build
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Aug 17 2006 Caius Chance <cchance at redhat.com> - 0.3.1-3
+- remove patch of 0.3.1-2 as bug# 191957 is not reproduceable
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.1-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 07:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 03:37:20 -0400
Subject: rpms/scim-chewing/devel scim-chewing-LTC23919-191957.patch, 1.1,
	NONE
Message-ID: <200608170737.k7H7bKuY016175@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/scim-chewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15977

Removed Files:
	scim-chewing-LTC23919-191957.patch 
Log Message:
patch removed as it is not applicable to latest version of sources



--- scim-chewing-LTC23919-191957.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 17 08:34:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 04:34:38 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.847,1.848
Message-ID: <200608170834.k7H8Ycgn030685@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30617

Modified Files:
	openoffice.org.spec 
Log Message:
files gone in 2.0.4


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.847
retrieving revision 1.848
diff -u -r1.847 -r1.848
--- openoffice.org.spec	16 Aug 2006 09:32:34 -0000	1.847
+++ openoffice.org.spec	17 Aug 2006 08:34:32 -0000	1.848
@@ -1741,7 +1741,6 @@
 %{instdir}/program/resource/fwe680en-US.res
 %{instdir}/program/resource/gal680en-US.res
 %{instdir}/program/resource/imp680en-US.res
-%{instdir}/program/resource/lgd680en-US.res
 %{instdir}/program/resource/ofa680en-US.res
 %{instdir}/program/resource/ooo680en-US.res
 %{instdir}/program/resource/pcr680en-US.res
@@ -2457,7 +2456,6 @@
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/hid.lst
-%{instdir}/program/.testtoolrc
 %{instdir}/program/libcommuni680*.so
 %{instdir}/program/libsimplecm680*.so
 %{instdir}/program/testtool.bin



From fedora-cvs-commits at redhat.com  Thu Aug 17 08:40:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 04:40:13 -0400
Subject: rpms/bind/devel bind.spec,1.120,1.121
Message-ID: <200608170840.k7H8eDDF008628@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8217

Modified Files:
	bind.spec 
Log Message:
fix for #202542 - /usr/sbin/bind-chroot-admin: No such file or directory, fix for #202547 - file_contexts: invalid context


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- bind.spec	11 Aug 2006 12:39:51 -0000	1.120
+++ bind.spec	17 Aug 2006 08:40:10 -0000	1.121
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	36%{?dist}
+Release: 	37%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -179,11 +179,13 @@
 Group: 	   System Environment/Daemons
 Obsoletes: bind-config
 Provides:  bind-config
-Requires:  bind = %{epoch}:%{version}-%{release}
+PreReq:    bind = %{epoch}:%{version}-%{release}
 Requires(post):   bash, coreutils, sed, grep
 Requires(postun): bash, coreutils, sed, grep
 %if %{selinux}
 Requires(post): policycoreutils
+Conflicts: 	selinux-policy-strict < 2.2.0
+Conflicts: 	selinux-policy-targeted < 2.2.0
 %endif
 
 %description -n caching-nameserver
@@ -201,11 +203,13 @@
 Summary:   A chroot runtime environment for the ISC BIND DNS server, named(8)
 Group: 	   System Environment/Daemons
 Prefix:    %{chroot_prefix}
-Requires:  bind = %{epoch}:%{version}-%{release}
+PreReq:    bind = %{epoch}:%{version}-%{release}
 Requires(post):  bash, coreutils, sed, grep
 Requires(preun): bash, coreutils, sed, grep
 %if %{selinux}
 Requires(post): policycoreutils
+Conflicts: 	selinux-policy-strict < 2.2.0
+Conflicts: 	selinux-policy-targeted < 2.2.0
 %endif
 
 %description chroot
@@ -846,6 +850,10 @@
 :;
 
 %changelog
+* Thu Aug 17 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.2-37
+- fix for #202542 - /usr/sbin/bind-chroot-admin: No such file or directory
+- fix for #202547 - file_contexts: invalid context
+
 * Fri Aug 11 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.2-36
 - added Provides: bind-config
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 08:43:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 04:43:47 -0400
Subject: rpms/bind/devel bind.spec,1.121,1.122
Message-ID: <200608170843.k7H8hlM5010146@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10135

Modified Files:
	bind.spec 
Log Message:
dentation fix


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- bind.spec	17 Aug 2006 08:40:10 -0000	1.121
+++ bind.spec	17 Aug 2006 08:43:45 -0000	1.122
@@ -184,8 +184,8 @@
 Requires(postun): bash, coreutils, sed, grep
 %if %{selinux}
 Requires(post): policycoreutils
-Conflicts: 	selinux-policy-strict < 2.2.0
-Conflicts: 	selinux-policy-targeted < 2.2.0
+Conflicts: selinux-policy-strict < 2.2.0
+Conflicts: selinux-policy-targeted < 2.2.0
 %endif
 
 %description -n caching-nameserver
@@ -208,8 +208,8 @@
 Requires(preun): bash, coreutils, sed, grep
 %if %{selinux}
 Requires(post): policycoreutils
-Conflicts: 	selinux-policy-strict < 2.2.0
-Conflicts: 	selinux-policy-targeted < 2.2.0
+Conflicts: selinux-policy-strict < 2.2.0
+Conflicts: selinux-policy-targeted < 2.2.0
 %endif
 
 %description chroot



From fedora-cvs-commits at redhat.com  Thu Aug 17 08:58:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 04:58:34 -0400
Subject: rpms/gcc/devel gcc41-s390-rh199604.patch,1.1.4.1,1.1.4.2
Message-ID: <200608170858.k7H8wYPi025493@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25479

Modified Files:
      Tag: private-aoliva-gcc-4_1_1-17-branch
	gcc41-s390-rh199604.patch 
Log Message:
Backport of the final version of the patch installed upstream.

gcc41-s390-rh199604.patch:
 reload.c  |   38 ++++++++++++++++++++++++++++++++++++++
 reload.h  |    1 +
 reload1.c |   15 +++++++++++++++
 3 files changed, 54 insertions(+)

Index: gcc41-s390-rh199604.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/Attic/gcc41-s390-rh199604.patch,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- gcc41-s390-rh199604.patch	17 Aug 2006 01:25:16 -0000	1.1.4.1
+++ gcc41-s390-rh199604.patch	17 Aug 2006 08:58:31 -0000	1.1.4.2
@@ -13,8 +13,8 @@
 
 Index: gcc/reload1.c
 ===================================================================
---- gcc/reload1.c.orig	2006-08-16 05:47:32.000000000 -0300
-+++ gcc/reload1.c	2006-08-16 05:48:07.000000000 -0300
+--- gcc/reload1.c.orig	2006-08-17 01:25:15.000000000 -0300
++++ gcc/reload1.c	2006-08-17 01:25:19.000000000 -0300
 @@ -120,6 +120,10 @@ rtx *reg_equiv_address;
     or zero if pseudo reg N is not equivalent to a memory slot.  */
  rtx *reg_equiv_mem;
@@ -60,44 +60,42 @@
  
 Index: gcc/reload.c
 ===================================================================
---- gcc/reload.c.orig	2006-08-16 05:47:32.000000000 -0300
-+++ gcc/reload.c	2006-08-16 05:47:39.000000000 -0300
-@@ -282,6 +282,26 @@ static int find_inc_amount (rtx, rtx);
+--- gcc/reload.c.orig	2006-08-17 01:25:15.000000000 -0300
++++ gcc/reload.c	2006-08-17 01:25:19.000000000 -0300
+@@ -282,6 +282,23 @@ static int find_inc_amount (rtx, rtx);
  static int refers_to_mem_for_reload_p (rtx);
  static int refers_to_regno_for_reload_p (unsigned int, unsigned int,
  					 rtx, rtx *);
 +
-+/* Add NEW to reg_equiv_alt_mem_list[REGNO] if it's different from
-+   ORIG and not present in the list yet.  */
++/* Add NEW to reg_equiv_alt_mem_list[REGNO] if it's not present in the
++   list yet.  */
 +
-+static inline void
-+push_reg_equiv_alt_mem (int regno, rtx new, rtx orig)
++static void
++push_reg_equiv_alt_mem (int regno, rtx mem)
 +{
 +  rtx it;
 +
-+  if (new == orig)
-+    return;
-+
 +  for (it = reg_equiv_alt_mem_list [regno]; it; it = XEXP (it, 1))
-+    if (rtx_equal_p (XEXP (it, 0), new))
++    if (rtx_equal_p (XEXP (it, 0), mem))
 +      return;
 +
 +  reg_equiv_alt_mem_list [regno]
-+    = alloc_EXPR_LIST (REG_EQUIV, new,
++    = alloc_EXPR_LIST (REG_EQUIV, mem,
 +		       reg_equiv_alt_mem_list [regno]);
 +}
  
  #ifdef HAVE_SECONDARY_RELOADS
  
-@@ -4557,6 +4577,7 @@ find_reloads_toplev (rtx x, int opnum, e
+@@ -4557,6 +4574,8 @@ find_reloads_toplev (rtx x, int opnum, e
  	      x = mem;
  	      i = find_reloads_address (GET_MODE (x), &x, XEXP (x, 0), &XEXP (x, 0),
  					opnum, type, ind_levels, insn);
-+	      push_reg_equiv_alt_mem (regno, x, mem);
++	      if (x != mem)
++		push_reg_equiv_alt_mem (regno, x);
  	      if (address_reloaded)
  		*address_reloaded = i;
  	    }
-@@ -4765,9 +4786,12 @@ find_reloads_address (enum machine_mode 
+@@ -4765,9 +4784,13 @@ find_reloads_address (enum machine_mode 
  	      tem = make_memloc (ad, regno);
  	      if (! strict_memory_address_p (GET_MODE (tem), XEXP (tem, 0)))
  		{
@@ -106,11 +104,12 @@
  		  find_reloads_address (GET_MODE (tem), &tem, XEXP (tem, 0),
  					&XEXP (tem, 0), opnum,
  					ADDR_TYPE (type), ind_levels, insn);
-+		  push_reg_equiv_alt_mem (regno, tem, orig);
++		  if (tem != orig)
++		    push_reg_equiv_alt_mem (regno, tem);
  		}
  	      /* We can avoid a reload if the register's equivalent memory
  		 expression is valid as an indirect memory address.
-@@ -5520,6 +5544,8 @@ find_reloads_address_1 (enum machine_mod
+@@ -5520,6 +5543,8 @@ find_reloads_address_1 (enum machine_mod
  	    if (reg_equiv_address[regno]
  		|| ! rtx_equal_p (tem, reg_equiv_mem[regno]))
  	      {
@@ -119,11 +118,12 @@
  		/* First reload the memory location's address.
  		    We can't use ADDR_TYPE (type) here, because we need to
  		    write back the value after reading it, hence we actually
-@@ -5529,6 +5555,8 @@ find_reloads_address_1 (enum machine_mod
+@@ -5529,6 +5554,9 @@ find_reloads_address_1 (enum machine_mod
  				      RELOAD_OTHER,
  				      ind_levels, insn);
  
-+		push_reg_equiv_alt_mem (regno, tem, orig);
++		if (tem != orig)
++		  push_reg_equiv_alt_mem (regno, tem);
 +
  		/* Then reload the memory location into a base
  		    register.  */
@@ -137,23 +137,25 @@
  		  /* First reload the memory location's address.
  		     We can't use ADDR_TYPE (type) here, because we need to
  		     write back the value after reading it, hence we actually
-@@ -5590,6 +5620,7 @@ find_reloads_address_1 (enum machine_mod
+@@ -5590,6 +5620,8 @@ find_reloads_address_1 (enum machine_mod
  		  find_reloads_address (GET_MODE (tem), &tem, XEXP (tem, 0),
  					&XEXP (tem, 0), opnum, type,
  					ind_levels, insn);
-+		  push_reg_equiv_alt_mem (regno, tem, orig);
++		  if (tem != orig)
++		    push_reg_equiv_alt_mem (regno, tem);
  		  /* Put this inside a new increment-expression.  */
  		  x = gen_rtx_fmt_e (GET_CODE (x), GET_MODE (x), tem);
  		  /* Proceed to reload that, as if it contained a register.  */
-@@ -5779,6 +5810,7 @@ find_reloads_address_1 (enum machine_mod
+@@ -5779,6 +5811,8 @@ find_reloads_address_1 (enum machine_mod
  		find_reloads_address (GET_MODE (x), &x, XEXP (x, 0),
  				      &XEXP (x, 0), opnum, ADDR_TYPE (type),
  				      ind_levels, insn);
-+		push_reg_equiv_alt_mem (regno, x, tem);
++		if (x != tem)
++		  push_reg_equiv_alt_mem (regno, x);
  	      }
  	  }
  
-@@ -5962,6 +5994,7 @@ find_reloads_subreg_address (rtx x, int 
+@@ -5962,6 +5996,7 @@ find_reloads_subreg_address (rtx x, int 
  	      unsigned outer_size = GET_MODE_SIZE (GET_MODE (x));
  	      unsigned inner_size = GET_MODE_SIZE (GET_MODE (SUBREG_REG (x)));
  	      int offset;
@@ -161,20 +163,20 @@
  
  	      /* For big-endian paradoxical subregs, SUBREG_BYTE does not
  		 hold the correct (negative) byte offset.  */
-@@ -5997,6 +6030,9 @@ find_reloads_subreg_address (rtx x, int 
+@@ -5997,6 +6032,9 @@ find_reloads_subreg_address (rtx x, int 
  	      find_reloads_address (GET_MODE (tem), &tem, XEXP (tem, 0),
  				    &XEXP (tem, 0), opnum, type,
  				    ind_levels, insn);
 +	      /* ??? Do we need to handle nonzero offsets somehow?  */
-+	      if (!offset)
-+		push_reg_equiv_alt_mem (regno, tem, orig);
++	      if (!offset && tem != orig)
++		push_reg_equiv_alt_mem (regno, tem);
  
  	      /* If this is not a toplevel operand, find_reloads doesn't see
  		 this substitution.  We have to emit a USE of the pseudo so
 Index: gcc/reload.h
 ===================================================================
---- gcc/reload.h.orig	2006-08-16 05:47:32.000000000 -0300
-+++ gcc/reload.h	2006-08-16 05:47:39.000000000 -0300
+--- gcc/reload.h.orig	2006-08-17 01:25:15.000000000 -0300
++++ gcc/reload.h	2006-08-17 01:25:19.000000000 -0300
 @@ -170,6 +170,7 @@ extern rtx *reg_equiv_invariant;
  extern rtx *reg_equiv_memory_loc;
  extern rtx *reg_equiv_address;



From fedora-cvs-commits at redhat.com  Thu Aug 17 10:07:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 06:07:26 -0400
Subject: rpms/gimp/devel gimp-plugin-mgr.in,1.1,1.2 gimp.spec,1.108,1.109
Message-ID: <200608171007.k7HA7Q8v017613@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17554

Modified Files:
	gimp-plugin-mgr.in gimp.spec 
Log Message:
don't barf on empty /etc/gimp/plugins.d (#202808)



Index: gimp-plugin-mgr.in
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp-plugin-mgr.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gimp-plugin-mgr.in	16 Aug 2006 11:11:31 -0000	1.1
+++ gimp-plugin-mgr.in	17 Aug 2006 10:07:23 -0000	1.2
@@ -23,12 +23,10 @@
     pushd "$GIMPPLUGINDIR/plug-ins" >&/dev/null
     if [ "$plugins" == "*" ]; then
         pushd "/etc/gimp/plugins.d" >&/dev/null
-        shopt -u nullglob
         plugins=""
         for file in *; do
             plugins="$plugins ${file%.conf}"
         done
-        shopt -s nullglob
         popd >&/dev/null
     fi
 


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- gimp.spec	16 Aug 2006 11:25:42 -0000	1.108
+++ gimp.spec	17 Aug 2006 10:07:23 -0000	1.109
@@ -36,7 +36,7 @@
 %define age 0
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -402,6 +402,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Aug 17 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-5
+- don't barf on empty /etc/gimp/plugins.d (#202808)
+
 * Wed Aug 16 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-4
 - revamp scheme for integrating external plugins (#202545)
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:14:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:14:43 -0400
Subject: rpms/man-pages-ja/devel .cvsignore, 1.39, 1.40 man-pages-ja.spec,
	1.45, 1.46 rh-man-pages-ja.pl, 1.11, 1.12 sources, 1.38, 1.39
Message-ID: <200608171114.k7HBEhGm001032@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/man-pages-ja/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv974

Modified Files:
	.cvsignore man-pages-ja.spec rh-man-pages-ja.pl sources 
Log Message:
* Thu Aug 17 2006 Akira TAGOH <tagoh at redhat.com> - 20060815-1
- updates to 20060815.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	20 Jul 2006 03:28:04 -0000	1.39
+++ .cvsignore	17 Aug 2006 11:14:40 -0000	1.40
@@ -26,3 +26,4 @@
 man-pages-ja-20060515.tar.gz
 man-pages-ja-20060615.tar.gz
 man-pages-ja-20060715.tar.gz
+man-pages-ja-20060815.tar.gz


Index: man-pages-ja.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/man-pages-ja.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- man-pages-ja.spec	20 Jul 2006 03:28:04 -0000	1.45
+++ man-pages-ja.spec	17 Aug 2006 11:14:40 -0000	1.46
@@ -1,4 +1,4 @@
-%define	manver		20060715
+%define	manver		20060815
 %define	use_utf8	1
 
 Name: man-pages-ja
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Thu Aug 17 2006 Akira TAGOH <tagoh at redhat.com> - 20060815-1
+- updates to 20060815.
+
 * Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 20060715-1
 - updates to 20060715.
 


Index: rh-man-pages-ja.pl
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/rh-man-pages-ja.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rh-man-pages-ja.pl	20 Jul 2006 06:25:21 -0000	1.11
+++ rh-man-pages-ja.pl	17 Aug 2006 11:14:40 -0000	1.12
@@ -20,7 +20,7 @@
 }
 print "C\n";
 
-for($i=0; $i<=61; $i++) {
+for($i=0; $i<=66; $i++) {
   print "0\n";
 }
 print "C\n";


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	20 Jul 2006 03:28:04 -0000	1.38
+++ sources	17 Aug 2006 11:14:40 -0000	1.39
@@ -1 +1 @@
-7ec37d771e1f9781be4b7af33379f5d7  man-pages-ja-20060715.tar.gz
+0d5f64ddaf4ee862d1a03c72acc20c15  man-pages-ja-20060815.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:40:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:40:06 -0400
Subject: rpms/paps/devel paps-cups.patch,1.5,1.6 paps.spec,1.11,1.12
Message-ID: <200608171140.k7HBe6aC001209@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1193

Modified Files:
	paps-cups.patch paps.spec 
Log Message:
* Thu Aug 17 2006 Tim Waugh <twaugh at redhat.com> - 0.6.6-12
- Map CUPS charset names to real ones (bug #197577).


paps-cups.patch:
 configure.in    |   13 +++++
 src/Makefile.am |    4 -
 src/paps.c      |  137 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 147 insertions(+), 7 deletions(-)

Index: paps-cups.patch
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps-cups.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- paps-cups.patch	17 Jul 2006 09:24:12 -0000	1.5
+++ paps-cups.patch	17 Aug 2006 11:40:04 -0000	1.6
@@ -1,27 +1,5 @@
-diff -ruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in
---- paps-0.6.6.orig/configure.in	2006-04-28 04:41:36.000000000 +0900
-+++ paps-0.6.6/configure.in	2006-07-17 13:38:30.000000000 +0900
-@@ -7,4 +7,17 @@
- AC_PROG_CC
- AM_PROG_LIBTOOL
- 
-+dnl ======================================================
-+dnl check for CUPS
-+dnl ======================================================
-+AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
-+if test "$CUPS_CONFIG" = "no"; then
-+  AC_MSG_ERROR([Please install cups development packages])
-+fi
-+CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-+CUPS_LIBS=`$CUPS_CONFIG --libs`
-+
-+AC_SUBST(CUPS_CFLAGS)
-+AC_SUBST(CUPS_LIBS)
-+
- AC_OUTPUT(Makefile src/Makefile doc/Makefile)
-diff -ruN paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am
---- paps-0.6.6.orig/src/Makefile.am	2006-07-17 13:35:07.000000000 +0900
-+++ paps-0.6.6/src/Makefile.am	2006-07-17 13:38:30.000000000 +0900
+--- paps-0.6.6/src/Makefile.am.cups	2006-08-17 12:12:43.000000000 +0100
++++ paps-0.6.6/src/Makefile.am	2006-08-17 12:12:43.000000000 +0100
 @@ -5,10 +5,10 @@
  libpaps_a_incdir = $(includedir)
  
@@ -35,9 +13,8 @@
  paps_DEPENDENCIES = $(noinst_LIBRARIES)
  
  EXTRA_DIST = test_libpaps.c paps.1
-diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
---- paps-0.6.6.orig/src/paps.c	2006-07-17 13:35:07.000000000 +0900
-+++ paps-0.6.6/src/paps.c	2006-07-17 13:45:45.000000000 +0900
+--- paps-0.6.6/src/paps.c.cups	2006-08-17 12:12:43.000000000 +0100
++++ paps-0.6.6/src/paps.c	2006-08-17 12:35:56.000000000 +0100
 @@ -31,6 +31,7 @@
  #include <time.h>
  #include <locale.h>
@@ -65,7 +42,7 @@
    int do_tumble = -1;   /* -1 means not initialized */
    int do_duplex = -1;
    gchar *paps_header = NULL;
-@@ -323,12 +325,115 @@
+@@ -323,12 +325,121 @@
    int header_sep = 20;
    int max_width = 0, w;
    GIConv cvh = NULL;
@@ -171,8 +148,14 @@
 +		if ((val = cupsGetOption("lpi", num_options, options)) != NULL) {
 +			lpi = atof(val);
 +		}
-+		if (getenv("CHARSET") != NULL)
-+			encoding = g_strdup(getenv("CHARSET"));
++		if (getenv("CHARSET") != NULL) {
++			char *charset = getenv("CHARSET");
++			// Map CUPS charset names to real ones.
++			// http://cups.org/newsgroups.php?s9797+gcups.general+v9797+T1
++			if (!g_ascii_strcasecmp(charset, "windows-932"))
++				charset = "WINDOWS-31J";
++			encoding = g_strdup(charset);
++		}
 +	}
 +  } G_STMT_END;
 +
@@ -181,7 +164,7 @@
    /* Parse command line */
    if (!g_option_context_parse(ctxt, &argc, &argv, &error))
      {
-@@ -355,6 +460,8 @@
+@@ -355,6 +466,8 @@
        IN = stdin;
      }
    title = filename_in;
@@ -190,7 +173,7 @@
    
    paps = paps_new();
    pango_context = paps_get_pango_context (paps);
-@@ -373,8 +480,10 @@
+@@ -373,8 +486,10 @@
    pango_context_set_font_description (pango_context, font_description);
  
    /* Page layout */
@@ -203,7 +186,7 @@
    
    if (num_columns == 1)
      total_gutter_width = 0;
-@@ -435,6 +544,7 @@
+@@ -435,6 +550,7 @@
    page_layout.pango_dir = pango_dir;
    page_layout.filename = filename_in;
    page_layout.header_font_desc = header_font_desc;
@@ -211,7 +194,7 @@
  
    /* calculate x-coordinate scale */
    if (cpi > 0.0L)
-@@ -781,6 +891,7 @@
+@@ -781,6 +897,7 @@
    int orientation = page_layout->page_width > page_layout->page_height;
    int bb_page_width = page_layout->page_width;
    int bb_page_height = page_layout->page_height;
@@ -219,7 +202,7 @@
    
    /* Keep bounding box non-rotated to make ggv happy */
    if (orientation)
-@@ -790,12 +901,20 @@
+@@ -790,12 +907,20 @@
        bb_page_height = tmp;
      }
    
@@ -241,7 +224,7 @@
            "%%%%BeginProlog\n"
            "%%%%Orientation: %s\n"
            "/papsdict 1 dict def\n"
-@@ -845,8 +964,10 @@
+@@ -845,8 +970,10 @@
            title,
            bb_page_width,
            bb_page_height,
@@ -252,3 +235,23 @@
    
    fprintf(OUT,
            "%% User settings\n"
+--- paps-0.6.6/configure.in.cups	2006-04-27 20:41:36.000000000 +0100
++++ paps-0.6.6/configure.in	2006-08-17 12:12:43.000000000 +0100
+@@ -7,4 +7,17 @@
+ AC_PROG_CC
+ AM_PROG_LIBTOOL
+ 
++dnl ======================================================
++dnl check for CUPS
++dnl ======================================================
++AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
++if test "$CUPS_CONFIG" = "no"; then
++  AC_MSG_ERROR([Please install cups development packages])
++fi
++CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
++CUPS_LIBS=`$CUPS_CONFIG --libs`
++
++AC_SUBST(CUPS_CFLAGS)
++AC_SUBST(CUPS_LIBS)
++
+ AC_OUTPUT(Makefile src/Makefile doc/Makefile)


Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- paps.spec	17 Jul 2006 09:24:12 -0000	1.11
+++ paps.spec	17 Aug 2006 11:40:04 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		paps
 Version:	0.6.6
-Release:	11%{?dist}
+Release:	12%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Thu Aug 17 2006 Tim Waugh <twaugh at redhat.com> - 0.6.6-12
+- Map CUPS charset names to real ones (bug #197577).
+
 * Mon Jul 17 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-11
 - add an owner info to PS.
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:58:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:58:17 -0400
Subject: rpms/vim/devel 7.0.054,NONE,1.1
Message-ID: <200608171158.k7HBwHht016612@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16600

Added Files:
	7.0.054 
Log Message:
- Patchlevel 54


--- NEW FILE 7.0.054 ---
To: vim-dev at vim.org
Subject: Patch 7.0.054
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.054
Problem:    Mac: Using a menu name that only has a mnemonic or accelerator
	    causes a crash.  (Elliot Shank)
Solution:   Check for an empty menu name.  Also delete empty submenus that
	    were created before detecting the error.
Files:	    src/menu.c


*** ../vim-7.0.053/src/menu.c	Wed May  3 23:28:47 2006
--- src/menu.c	Tue Aug  8 20:53:25 2006
***************
*** 511,516 ****
--- 511,524 ----
  	 * name (without mnemonic and accelerator text). */
  	next_name = menu_name_skip(name);
  	dname = menu_text(name, NULL, NULL);
+ 	if (dname == NULL)
+ 	    goto erret;
+ 	if (*dname == NUL)
+ 	{
+ 	    /* Only a mnemonic or accelerator is not valid. */
+ 	    EMSG(_("E792: Empty menu name"));
+ 	    goto erret;
+ 	}
  
  	/* See if it's already there */
  	lower_pri = menup;
***************
*** 704,709 ****
--- 712,718 ----
  	parent = menu;
  	name = next_name;
  	vim_free(dname);
+ 	dname = NULL;
  	if (pri_tab[pri_idx + 1] != -1)
  	    ++pri_idx;
      }
***************
*** 793,798 ****
--- 802,823 ----
  erret:
      vim_free(path_name);
      vim_free(dname);
+ 
+     /* Delete any empty submenu we added before discovering the error.  Repeat
+      * for higher levels. */
+     while (parent != NULL && parent->children == NULL)
+     {
+ 	if (parent->parent == NULL)
+ 	    menup = &root_menu;
+ 	else
+ 	    menup = &parent->parent->children;
+ 	for ( ; *menup != NULL && *menup != parent; menup = &((*menup)->next))
+ 	    ;
+ 	if (*menup == NULL) /* safety check */
+ 	    break;
+ 	parent = parent->parent;
+ 	free_menu(menup);
+     }
      return FAIL;
  }
  
*** ../vim-7.0.053/src/version.c	Tue Aug 15 22:26:04 2006
--- src/version.c	Wed Aug 16 15:53:39 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     54,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
156. You forget your friend's name but not her e-mail address.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:58:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:58:21 -0400
Subject: rpms/vim/devel 7.0.055,NONE,1.1
Message-ID: <200608171158.k7HBwLIG016632@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16620

Added Files:
	7.0.055 
Log Message:
- Patchlevel 55


--- NEW FILE 7.0.055 ---
To: vim-dev at vim.org
Subject: Patch 7.0.055
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.055
Problem:    ":startinsert" in a CmdwinEnter autocommand doesn't take immediate
	    effect. (Bradley White)
Solution:   Put a NOP key in the typeahead buffer.  Also avoid that using
	    CTRL-C to go back to the command line moves the cursor left.
Files:	    src/edit.c, src/ex_getln.c


*** ../vim-7.0.054/src/edit.c	Fri Jun 23 21:36:49 2006
--- src/edit.c	Wed Aug 16 16:17:29 2006
***************
*** 882,887 ****
--- 882,888 ----
  		/* Close the cmdline window. */
  		cmdwin_result = K_IGNORE;
  		got_int = FALSE; /* don't stop executing autocommands et al. */
+ 		nomove = TRUE;
  		goto doESCkey;
  	    }
  #endif
***************
*** 2414,2419 ****
--- 2415,2421 ----
      compl_matches = ins_compl_make_cyclic();
      compl_started = TRUE;
      compl_used_match = TRUE;
+     compl_cont_status = 0;
  
      compl_curr_match = compl_first_match;
      ins_complete(Ctrl_N);
*** ../vim-7.0.054/src/ex_getln.c	Sun Apr 30 20:43:17 2006
--- src/ex_getln.c	Wed Aug 16 16:07:04 2006
***************
*** 5982,5987 ****
--- 5982,5989 ----
      typestr[0] = cmdwin_type;
      typestr[1] = NUL;
      apply_autocmds(EVENT_CMDWINENTER, typestr, typestr, FALSE, curbuf);
+     if (restart_edit != 0)	/* autocmd with ":startinsert" */
+ 	stuffcharReadbuff(K_NOP);
  # endif
  
      i = RedrawingDisabled;
*** ../vim-7.0.054/src/version.c	Wed Aug 16 15:56:58 2006
--- src/version.c	Wed Aug 16 16:21:45 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     55,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
157. You fum through a magazine, you first check to see if it has a web
     address.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:58:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:58:24 -0400
Subject: rpms/vim/devel 7.0.056,NONE,1.1
Message-ID: <200608171158.k7HBwOsD016652@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16640

Added Files:
	7.0.056 
Log Message:
- Patchlevel 56


--- NEW FILE 7.0.056 ---
To: vim-dev at vim.org
Subject: Patch 7.0.056
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.056
Problem:    "#!something" gives an error message.
Solution:   Ignore this line, so that it can be used in an executable Vim
            script.
Files:      src/ex_docmd.c


*** ../vim-7.0.055/src/ex_docmd.c	Sat May 13 12:36:18 2006
--- src/ex_docmd.c	Thu Aug 10 23:50:32 2006
***************
*** 1709,1714 ****
--- 1712,1721 ----
       */
      save_cmdmod = cmdmod;
      vim_memset(&cmdmod, 0, sizeof(cmdmod));
+ 
+     /* "#!anything" is handled like a comment. */
+     if ((*cmdlinep)[0] == '#' && (*cmdlinep)[1] == '!')
+ 	goto doend;
  
      /*
       * Repeat until no more command modifiers are found.
*** ../vim-7.0.055/src/version.c	Wed Aug 16 16:24:58 2006
--- src/version.c	Wed Aug 16 17:05:35 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     56,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
158. You get a tuner card so you can watch TV while surfing.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:58:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:58:27 -0400
Subject: rpms/vim/devel 7.0.057,NONE,1.1
Message-ID: <200608171158.k7HBwR1I016672@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16660

Added Files:
	7.0.057 
Log Message:
- Patchlevel 57


--- NEW FILE 7.0.057 ---
To: vim-dev at vim.org
Subject: Patch 7.0.057 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.057 (extra, after 7.0.45)
Problem:    Win32: Compilation problem with Borland C 5.5.
Solution:   Include vim.h as before. (Mark S. Williams)
Files:	    src/if_ole.cpp


*** ../vim-7.0.056/src/if_ole.cpp	Tue Aug  8 17:06:21 2006
--- src/if_ole.cpp	Sun Aug 13 12:57:24 2006
***************
*** 13,26 ****
   * See os_mswin.c for the client side.
   */
  
  extern "C" {
! #include "vim.h"
  }
  
  #include <windows.h>
  #include <oleauto.h>
  
  extern "C" {
  extern HWND s_hwnd;
  extern HWND vim_parent_hwnd;
  }
--- 13,35 ----
   * See os_mswin.c for the client side.
   */
  
+ /*
+  * We have some trouble with order of includes here.  For Borland it needs to
+  * be different from MSVC...
+  */
+ #ifndef __BORLANDC__
  extern "C" {
! # include "vim.h"
  }
+ #endif
  
  #include <windows.h>
  #include <oleauto.h>
  
  extern "C" {
+ #ifdef __BORLANDC__
+ # include "vim.h"
+ #endif
  extern HWND s_hwnd;
  extern HWND vim_parent_hwnd;
  }
*** ../vim-7.0.056/src/version.c	Wed Aug 16 17:06:22 2006
--- src/version.c	Wed Aug 16 17:35:57 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     57,
  /**/

-- 
Send $25.00 for handy leaflet on how to make money by selling leaflets

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:58:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:58:30 -0400
Subject: rpms/vim/devel 7.0.058,NONE,1.1
Message-ID: <200608171158.k7HBwUNr016692@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16680

Added Files:
	7.0.058 
Log Message:
- Patchlevel 58


--- NEW FILE 7.0.058 ---
To: vim-dev at vim.org
Subject: Patch 7.0.058
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.058
Problem:    The gbk and and gb18030 encodings are not recognized.
Solution:   Add aliases to cp936. (Edward L. Fox)
Files:	    src/mbyte.c


*** ../vim-7.0.057/src/mbyte.c	Sat May 13 17:10:00 2006
--- src/mbyte.c	Sat Aug 12 22:59:55 2006
***************
*** 363,368 ****
--- 363,370 ----
      {"932",		IDX_CP932},
      {"949",		IDX_CP949},
      {"936",		IDX_CP936},
+     {"gbk",		IDX_CP936},
+     {"gb18030",		IDX_CP936},	/* only 99% the same */
      {"950",		IDX_CP950},
      {"eucjp",		IDX_EUC_JP},
      {"unix-jis",	IDX_EUC_JP},
*** ../vim-7.0.057/src/version.c	Wed Aug 16 17:36:21 2006
--- src/version.c	Wed Aug 16 18:04:14 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     58,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
162. You go outside and look for a brightness knob to turn down the sun.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:58:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:58:33 -0400
Subject: rpms/vim/devel 7.0.059,NONE,1.1
Message-ID: <200608171158.k7HBwX7l016712@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16700

Added Files:
	7.0.059 
Log Message:
- Patchlevel 59


--- NEW FILE 7.0.059 ---
To: vim-dev at vim.org
Subject: Patch 7.0.059
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.059
Problem:    The Perl interface doesn't compile with ActiveState Perl 5.8.8.
Solution:   Remove the __attribute__() items. (Edward L. Fox)
Files:	    src/if_perl.xs


*** ../vim-7.0.058/src/if_perl.xs	Fri Aug 11 22:56:44 2006
--- src/if_perl.xs	Wed Aug 16 14:45:15 2006
***************
*** 155,162 ****
  static int (*perl_run)(PerlInterpreter*);
  static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
  static void* (*Perl_get_context)(void);
! static void (*Perl_croak)(pTHX_ const char*, ...) __attribute__((noreturn));
! static void (*Perl_croak_nocontext)(const char*, ...) __attribute__((noreturn));
  static I32 (*Perl_dowantarray)(pTHX);
  static void (*Perl_free_tmps)(pTHX);
  static HV* (*Perl_gv_stashpv)(pTHX_ const char*, I32);
--- 155,162 ----
  static int (*perl_run)(PerlInterpreter*);
  static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
  static void* (*Perl_get_context)(void);
! static void (*Perl_croak)(pTHX_ const char*, ...);
! static void (*Perl_croak_nocontext)(const char*, ...);
  static I32 (*Perl_dowantarray)(pTHX);
  static void (*Perl_free_tmps)(pTHX);
  static HV* (*Perl_gv_stashpv)(pTHX_ const char*, I32);
*** ../vim-7.0.058/src/version.c	Wed Aug 16 18:05:36 2006
--- src/version.c	Wed Aug 16 18:18:35 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     59,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
163. You go outside for the fresh air (at -30 degrees) but open the
     window first to hear new mail arrive.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:58:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:58:37 -0400
Subject: rpms/vim/devel 7.0.060,NONE,1.1
Message-ID: <200608171158.k7HBwb8v016732@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16720

Added Files:
	7.0.060 
Log Message:
- Patchlevel 60


--- NEW FILE 7.0.060 ---
To: vim-dev at vim.org
Subject: Patch 7.0.060
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.060 (after 7.0.51)
Problem:    Code for temporarily switching to another buffer is duplicated in
	    quite a few places.
Solution:   Use aucmd_prepbuf() and aucmd_restbuf() also when FEAT_AUTOCMD is
	    not defined.
Files:	    src/buffer.c, src/eval.c, src/fileio.c, src/if_ruby.c,
	    src/if_perl.xs, src/quickfix.c, src/structs.h


*** ../vim-7.0.059/src/buffer.c	Thu Apr 27 01:49:30 2006
--- src/buffer.c	Wed Aug 16 14:36:17 2006
***************
*** 5420,5430 ****
      buf_T	*newbuf;
      int		differ = TRUE;
      linenr_T	lnum;
- #ifdef FEAT_AUTOCMD
      aco_save_T	aco;
- #else
-     buf_T	*old_curbuf = curbuf;
- #endif
      exarg_T	ea;
  
      /* Allocate a buffer without putting it in the buffer list. */
--- 5420,5426 ----
***************
*** 5439,5451 ****
  	return TRUE;
      }
  
- #ifdef FEAT_AUTOCMD
      /* set curwin/curbuf to buf and save a few things */
      aucmd_prepbuf(&aco, newbuf);
- #else
-     curbuf = newbuf;
-     curwin->w_buffer = newbuf;
- #endif
  
      if (ml_open(curbuf) == OK
  	    && readfile(buf->b_ffname, buf->b_fname,
--- 5435,5442 ----
***************
*** 5466,5478 ****
      }
      vim_free(ea.cmd);
  
- #ifdef FEAT_AUTOCMD
      /* restore curwin/curbuf and a few other things */
      aucmd_restbuf(&aco);
- #else
-     curbuf = old_curbuf;
-     curwin->w_buffer = old_curbuf;
- #endif
  
      if (curbuf != newbuf)	/* safety check */
  	wipe_buffer(newbuf, FALSE);
--- 5457,5464 ----
*** ../vim-7.0.059/src/eval.c	Sun Jul 23 22:07:55 2006
--- src/eval.c	Wed Aug 16 14:38:32 2006
***************
*** 14184,14194 ****
      typval_T	*rettv;
  {
      buf_T	*buf;
- #ifdef FEAT_AUTOCMD
      aco_save_T	aco;
- #else
-     buf_T	*save_curbuf;
- #endif
      char_u	*varname, *bufvarname;
      typval_T	*varp;
      char_u	nbuf[NUMBUFLEN];
--- 14184,14190 ----
***************
*** 14205,14216 ****
      if (buf != NULL && varname != NULL && varp != NULL)
      {
  	/* set curbuf to be our buf, temporarily */
- #ifdef FEAT_AUTOCMD
  	aucmd_prepbuf(&aco, buf);
- #else
- 	save_curbuf = curbuf;
- 	curbuf = buf;
- #endif
  
  	if (*varname == '&')
  	{
--- 14201,14207 ----
***************
*** 14237,14247 ****
  	}
  
  	/* reset notion of buffer */
- #ifdef FEAT_AUTOCMD
  	aucmd_restbuf(&aco);
- #else
- 	curbuf = save_curbuf;
- #endif
      }
  }
  
--- 14228,14234 ----
*** ../vim-7.0.059/src/fileio.c	Sun Apr 30 20:33:48 2006
--- src/fileio.c	Wed Aug 16 14:39:23 2006
***************
*** 6450,6466 ****
      int		old_ro = buf->b_p_ro;
      buf_T	*savebuf;
      int		saved = OK;
- #ifdef FEAT_AUTOCMD
      aco_save_T	aco;
  
      /* set curwin/curbuf for "buf" and save some things */
      aucmd_prepbuf(&aco, buf);
- #else
-     buf_T	*save_curbuf = curbuf;
- 
-     curbuf = buf;
-     curwin->w_buffer = buf;
- #endif
  
      /* We only want to read the text from the file, not reset the syntax
       * highlighting, clear marks, diff status, etc.  Force the fileformat
--- 6450,6459 ----
***************
*** 6573,6586 ****
  	    curbuf->b_p_ro |= old_ro;
      }
  
- #ifdef FEAT_AUTOCMD
      /* restore curwin/curbuf and a few other things */
      aucmd_restbuf(&aco);
      /* Careful: autocommands may have made "buf" invalid! */
- #else
-     curwin->w_buffer = save_curbuf;
-     curbuf = save_curbuf;
- #endif
  }
  
  /*ARGSUSED*/
--- 6566,6574 ----
***************
*** 8088,8093 ****
--- 8076,8082 ----
   * Search a window for the current buffer.  Save the cursor position and
   * screen offset.
   * Set "curbuf" and "curwin" to match "buf".
+  * When FEAT_AUTOCMD is not defined another version is used, see below.
   */
      void
  aucmd_prepbuf(aco, buf)
***************
*** 8151,8156 ****
--- 8140,8146 ----
  /*
   * Cleanup after executing autocommands for a (hidden) buffer.
   * Restore the window as it was (if possible).
+  * When FEAT_AUTOCMD is not defined another version is used, see below.
   */
      void
  aucmd_restbuf(aco)
***************
*** 9063,9069 ****
--- 9053,9089 ----
      return retval;
  }
  
+ #else	/* FEAT_AUTOCMD */
+ 
+ /*
+  * Prepare for executing commands for (hidden) buffer "buf".
+  * This is the non-autocommand version, it simply saves "curbuf" and sets
+  * "curbuf" and "curwin" to match "buf".
+  */
+     void
+ aucmd_prepbuf(aco, buf)
+     aco_save_T	*aco;		/* structure to save values in */
+     buf_T	*buf;		/* new curbuf */
+ {
+     aco->save_buf = buf;
+     curbuf = buf;
+     curwin->w_buffer = buf;
+ }
+ 
+ /*
+  * Restore after executing commands for a (hidden) buffer.
+  * This is the non-autocommand version.
+  */
+     void
+ aucmd_restbuf(aco)
+     aco_save_T	*aco;		/* structure holding saved values */
+ {
+     curbuf = aco->save_buf;
+     curwin->w_buffer = curbuf;
+ }
+ 
  #endif	/* FEAT_AUTOCMD */
+ 
  
  #if defined(FEAT_AUTOCMD) || defined(FEAT_WILDIGN) || defined(PROTO)
  /*
*** ../vim-7.0.059/src/if_ruby.c	Tue Jun 20 21:08:02 2006
--- src/if_ruby.c	Wed Aug 16 14:41:11 2006
***************
*** 644,664 ****
  static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
  {
      char	*line = STR2CSTR(str);
- #ifdef FEAT_AUTOCMD
      aco_save_T	aco;
- #else
-     buf_T	*save_curbuf = curbuf;
- #endif
  
      if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL)
      {
- #ifdef FEAT_AUTOCMD
  	/* set curwin/curbuf for "buf" and save some things */
  	aucmd_prepbuf(&aco, buf);
- #else
- 	curbuf = buf;
- 	curwin->w_buffer = buf;
- #endif
  
  	if (u_savesub(n) == OK) {
  	    ml_replace(n, (char_u *)line, TRUE);
--- 644,655 ----
***************
*** 668,681 ****
  #endif
  	}
  
- #ifdef FEAT_AUTOCMD
  	/* restore curwin/curbuf and a few other things */
  	aucmd_restbuf(&aco);
  	/* Careful: autocommands may have made "buf" invalid! */
! #else
! 	curwin->w_buffer = save_curbuf;
! 	curbuf = save_curbuf;
! #endif
  	update_curbuf(NOT_VALID);
      }
      else
--- 659,668 ----
  #endif
  	}
  
  	/* restore curwin/curbuf and a few other things */
  	aucmd_restbuf(&aco);
  	/* Careful: autocommands may have made "buf" invalid! */
! 
  	update_curbuf(NOT_VALID);
      }
      else
***************
*** 699,719 ****
  {
      buf_T	*buf = get_buf(self);
      long	n = NUM2LONG(num);
- #ifdef FEAT_AUTOCMD
      aco_save_T	aco;
- #else
-     buf_T	*save_curbuf = curbuf;
- #endif
  
      if (n > 0 && n <= buf->b_ml.ml_line_count)
      {
- #ifdef FEAT_AUTOCMD
  	/* set curwin/curbuf for "buf" and save some things */
  	aucmd_prepbuf(&aco, buf);
- #else
- 	curbuf = buf;
- 	curwin->w_buffer = buf;
- #endif
  
  	if (u_savedel(n, 1) == OK) {
  	    ml_delete(n, 0);
--- 686,697 ----
***************
*** 725,738 ****
  	    changed();
  	}
  
- #ifdef FEAT_AUTOCMD
  	/* restore curwin/curbuf and a few other things */
  	aucmd_restbuf(&aco);
  	/* Careful: autocommands may have made "buf" invalid! */
! #else
! 	curwin->w_buffer = save_curbuf;
! 	curbuf = save_curbuf;
! #endif
  	update_curbuf(NOT_VALID);
      }
      else
--- 703,712 ----
  	    changed();
  	}
  
  	/* restore curwin/curbuf and a few other things */
  	aucmd_restbuf(&aco);
  	/* Careful: autocommands may have made "buf" invalid! */
! 
  	update_curbuf(NOT_VALID);
      }
      else
***************
*** 747,767 ****
      buf_T	*buf = get_buf(self);
      char	*line = STR2CSTR(str);
      long	n = NUM2LONG(num);
- #ifdef FEAT_AUTOCMD
      aco_save_T	aco;
- #else
-     buf_T	*save_curbuf = curbuf;
- #endif
  
      if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL)
      {
- #ifdef FEAT_AUTOCMD
  	/* set curwin/curbuf for "buf" and save some things */
  	aucmd_prepbuf(&aco, buf);
- #else
- 	curbuf = buf;
- 	curwin->w_buffer = buf;
- #endif
  
  	if (u_inssub(n + 1) == OK) {
  	    ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
--- 721,732 ----
***************
*** 773,786 ****
  	    changed();
  	}
  
- #ifdef FEAT_AUTOCMD
  	/* restore curwin/curbuf and a few other things */
  	aucmd_restbuf(&aco);
  	/* Careful: autocommands may have made "buf" invalid! */
! #else
! 	curwin->w_buffer = save_curbuf;
! 	curbuf = save_curbuf;
! #endif
  	update_curbuf(NOT_VALID);
      }
      else {
--- 738,747 ----
  	    changed();
  	}
  
  	/* restore curwin/curbuf and a few other things */
  	aucmd_restbuf(&aco);
  	/* Careful: autocommands may have made "buf" invalid! */
! 
  	update_curbuf(NOT_VALID);
      }
      else {
*** ../vim-7.0.059/src/if_perl.xs	Wed Aug 16 18:19:41 2006
--- src/if_perl.xs	Wed Aug 16 14:45:15 2006
***************
*** 1068,1097 ****
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
- #ifdef FEAT_AUTOCMD
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
- #else
- 		buf_T	*save_curbuf = curbuf;
  
- 		curbuf = vimbuf;
- 		curwin->w_buffer = vimbuf;
- #endif
  		if (u_savesub(lnum) == OK)
  		{
  		    ml_replace(lnum, (char_u *)line, TRUE);
  		    changed_bytes(lnum, 0);
  		}
! #ifdef FEAT_AUTOCMD
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
- #else
- 		curwin->w_buffer = save_curbuf;
- 		curbuf = save_curbuf;
- #endif
  	    }
  	}
      }
--- 1068,1087 ----
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
  
  		if (u_savesub(lnum) == OK)
  		{
  		    ml_replace(lnum, (char_u *)line, TRUE);
  		    changed_bytes(lnum, 0);
  		}
! 
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
  	    }
  	}
      }
***************
*** 1128,1158 ****
  	    {
  		if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
  		{
- 		    buf_T	*save_curbuf = curbuf;
- #ifdef FEAT_AUTOCMD
  		    aco_save_T	aco;
  
  		    /* set curwin/curbuf for "vimbuf" and save some things */
  		    aucmd_prepbuf(&aco, vimbuf);
! #else
! 		    curbuf = vimbuf;
! 		    curwin->w_buffer = vimbuf;
! #endif
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
  			deleted_lines_mark(lnum, 1L);
! 			if (save_curbuf == curbuf)
  			    check_cursor();
  		    }
! #ifdef FEAT_AUTOCMD
  		    /* restore curwin/curbuf and a few other things */
  		    aucmd_restbuf(&aco);
  		    /* Careful: autocommands may have made "vimbuf" invalid! */
! #else
! 		    curwin->w_buffer = save_curbuf;
! 		    curbuf = save_curbuf;
! #endif
  		    update_curbuf(VALID);
  		}
  	    }
--- 1118,1140 ----
  	    {
  		if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
  		{
  		    aco_save_T	aco;
  
  		    /* set curwin/curbuf for "vimbuf" and save some things */
  		    aucmd_prepbuf(&aco, vimbuf);
! 
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
  			deleted_lines_mark(lnum, 1L);
! 			if (aco.save_buf == curbuf)
  			    check_cursor();
  		    }
! 
  		    /* restore curwin/curbuf and a few other things */
  		    aucmd_restbuf(&aco);
  		    /* Careful: autocommands may have made "vimbuf" invalid! */
! 
  		    update_curbuf(VALID);
  		}
  	    }
***************
*** 1179,1208 ****
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
- #ifdef FEAT_AUTOCMD
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
- #else
- 		buf_T	*save_curbuf = curbuf;
  
- 		curbuf = vimbuf;
- 		curwin->w_buffer = vimbuf;
- #endif
  		if (u_inssub(lnum + 1) == OK)
  		{
  		    ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
  		    appended_lines_mark(lnum, 1L);
  		}
! #ifdef FEAT_AUTOCMD
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
! #else
! 		curwin->w_buffer = save_curbuf;
! 		curbuf = save_curbuf;
! #endif
  		update_curbuf(VALID);
  	    }
  	}
--- 1161,1181 ----
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
  
  		if (u_inssub(lnum + 1) == OK)
  		{
  		    ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
  		    appended_lines_mark(lnum, 1L);
  		}
! 
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
! 
  		update_curbuf(VALID);
  	    }
  	}
*** ../vim-7.0.059/src/quickfix.c	Tue Jun 20 20:49:42 2006
--- src/quickfix.c	Wed Aug 16 14:43:06 2006
***************
*** 2463,2494 ****
      qf_info_T	*qi;
  {
      buf_T	*buf;
- #ifdef FEAT_AUTOCMD
      aco_save_T	aco;
- #else
-     buf_T	*save_curbuf;
- #endif
  
      /* Check if a buffer for the quickfix list exists.  Update it. */
      buf = qf_find_buf(qi);
      if (buf != NULL)
      {
- #ifdef FEAT_AUTOCMD
  	/* set curwin/curbuf to buf and save a few things */
  	aucmd_prepbuf(&aco, buf);
- #else
- 	save_curbuf = curbuf;
- 	curbuf = buf;
- #endif
  
  	qf_fill_buffer(qi);
  
- #ifdef FEAT_AUTOCMD
  	/* restore curwin/curbuf and a few other things */
  	aucmd_restbuf(&aco);
- #else
- 	curbuf = save_curbuf;
- #endif
  
  	(void)qf_win_pos_update(qi, 0);
      }
--- 2463,2481 ----
***************
*** 2977,2986 ****
  #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
      char_u	*save_ei = NULL;
  #endif
- #ifndef FEAT_AUTOCMD
-     buf_T	*save_curbuf;
- #else
      aco_save_T	aco;
      char_u	*au_name =  NULL;
      int		flags = 0;
      colnr_T	col;
--- 2964,2971 ----
  #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
      char_u	*save_ei = NULL;
  #endif
      aco_save_T	aco;
+ #ifdef FEAT_AUTOCMD
      char_u	*au_name =  NULL;
      int		flags = 0;
      colnr_T	col;
***************
*** 3201,3224 ****
  		     * need to be done now, in that buffer.  And the modelines
  		     * need to be done (again).  But not the window-local
  		     * options! */
- #if defined(FEAT_AUTOCMD)
  		    aucmd_prepbuf(&aco, buf);
- #else
- 		    save_curbuf = curbuf;
- 		    curbuf = buf;
- 		    curwin->w_buffer = curbuf;
- #endif
  #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
  		    apply_autocmds(EVENT_FILETYPE, buf->b_p_ft,
  						     buf->b_fname, TRUE, buf);
  #endif
  		    do_modelines(OPT_NOWIN);
- #if defined(FEAT_AUTOCMD)
  		    aucmd_restbuf(&aco);
- #else
- 		    curbuf = save_curbuf;
- 		    curwin->w_buffer = curbuf;
- #endif
  		}
  	    }
  	}
--- 3186,3198 ----
***************
*** 3319,3329 ****
  {
      buf_T	*newbuf;
      int		failed = TRUE;
- #ifdef FEAT_AUTOCMD
      aco_save_T	aco;
- #else
-     buf_T	*old_curbuf = curbuf;
- #endif
  
      /* Allocate a buffer without putting it in the buffer list. */
      newbuf = buflist_new(NULL, NULL, (linenr_T)1, BLN_DUMMY);
--- 3293,3299 ----
***************
*** 3333,3345 ****
      /* Init the options. */
      buf_copy_options(newbuf, BCO_ENTER | BCO_NOHELP);
  
- #ifdef FEAT_AUTOCMD
      /* set curwin/curbuf to buf and save a few things */
      aucmd_prepbuf(&aco, newbuf);
- #else
-     curbuf = newbuf;
-     curwin->w_buffer = newbuf;
- #endif
  
      /* Need to set the filename for autocommands. */
      (void)setfname(curbuf, fname, NULL, FALSE);
--- 3303,3310 ----
***************
*** 3370,3382 ****
  	}
      }
  
- #ifdef FEAT_AUTOCMD
      /* restore curwin/curbuf and a few other things */
      aucmd_restbuf(&aco);
- #else
-     curbuf = old_curbuf;
-     curwin->w_buffer = old_curbuf;
- #endif
  
      if (!buf_valid(newbuf))
  	return NULL;
--- 3335,3342 ----
*** ../vim-7.0.059/src/structs.h	Sun Apr  9 23:52:16 2006
--- src/structs.h	Wed Aug 16 19:30:48 2006
***************
*** 2213,2230 ****
  
  /*
   * Struct to save values in before executing autocommands for a buffer that is
!  * not the current buffer.
   */
  typedef struct
  {
      buf_T	*save_buf;	/* saved curbuf */
      buf_T	*new_curbuf;	/* buffer to be used */
      win_T	*save_curwin;	/* saved curwin, NULL if it didn't change */
      win_T	*new_curwin;	/* new curwin if save_curwin != NULL */
      pos_T	save_cursor;	/* saved cursor pos of save_curwin */
      linenr_T	save_topline;	/* saved topline of save_curwin */
! #ifdef FEAT_DIFF
      int		save_topfill;	/* saved topfill of save_curwin */
  #endif
  } aco_save_T;
  
--- 2213,2232 ----
  
  /*
   * Struct to save values in before executing autocommands for a buffer that is
!  * not the current buffer.  Without FEAT_AUTOCMD only "curbuf" is remembered.
   */
  typedef struct
  {
      buf_T	*save_buf;	/* saved curbuf */
+ #ifdef FEAT_AUTOCMD
      buf_T	*new_curbuf;	/* buffer to be used */
      win_T	*save_curwin;	/* saved curwin, NULL if it didn't change */
      win_T	*new_curwin;	/* new curwin if save_curwin != NULL */
      pos_T	save_cursor;	/* saved cursor pos of save_curwin */
      linenr_T	save_topline;	/* saved topline of save_curwin */
! # ifdef FEAT_DIFF
      int		save_topfill;	/* saved topfill of save_curwin */
+ # endif
  #endif
  } aco_save_T;
  
*** ../vim-7.0.059/src/version.c	Wed Aug 16 18:19:41 2006
--- src/version.c	Wed Aug 16 19:31:01 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     60,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
164. You got out to buy software, instead of going out for a beer.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:58:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:58:40 -0400
Subject: rpms/vim/devel 7.0.061,NONE,1.1
Message-ID: <200608171158.k7HBweCI016753@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16740

Added Files:
	7.0.061 
Log Message:
- Patchlevel 61


--- NEW FILE 7.0.061 ---
To: vim-dev at vim.org
Subject: Patch 7.0.061
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.061
Problem:    Insert mode completion for Vim commands may crash if there is
	    nothing to complete.
Solution:   Instead of freeing the pattern make it empty, so that a "not
	    found" error is given. (Yukihiro Nakadaira)
Files:	    src/edit.c


*** ../vim-7.0.060/src/edit.c	Wed Aug 16 16:24:58 2006
--- src/edit.c	Wed Aug 16 21:20:29 2006
***************
*** 4691,4708 ****
  				     (int)STRLEN(compl_pattern), curs_col);
  	    if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
  		    || compl_xp.xp_context == EXPAND_NOTHING)
! 	    {
  		compl_col = curs_col;
- 		compl_length = 0;
- 		vim_free(compl_pattern);
- 		compl_pattern = NULL;
- 	    }
  	    else
! 	    {
! 		startcol = (int)(compl_xp.xp_pattern - compl_pattern);
! 		compl_col = startcol;
! 		compl_length = curs_col - startcol;
! 	    }
  	}
  	else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
  	{
--- 4692,4703 ----
  				     (int)STRLEN(compl_pattern), curs_col);
  	    if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
  		    || compl_xp.xp_context == EXPAND_NOTHING)
! 		/* No completion possible, use an empty pattern to get a
! 		 * "pattern not found" message. */
  		compl_col = curs_col;
  	    else
! 		compl_col = (int)(compl_xp.xp_pattern - compl_pattern);
! 	    compl_length = curs_col - compl_col;
  	}
  	else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
  	{
*** ../vim-7.0.060/src/version.c	Wed Aug 16 19:34:59 2006
--- src/version.c	Wed Aug 16 21:25:03 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     61,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
165. You have a web page burned into your glasses

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:58:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:58:43 -0400
Subject: rpms/vim/devel 7.0.062,NONE,1.1
Message-ID: <200608171158.k7HBwhnh016773@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16761

Added Files:
	7.0.062 
Log Message:
- Patchlevel 62


--- NEW FILE 7.0.062 ---
To: vim-dev at vim.org
Subject: Patch 7.0.062
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.062
Problem:    Mac: Crash when using the popup menu for spell correction.  The
	    popup menu appears twice when letting go of the right mouse button
	    early.
Solution:   Don't show the popup menu on the release of the right mouse
	    button.  Also check that a menu pointer is actually valid.
Files:	    src/proto/menu.pro, src/menu.c, src/normal.c, src/term.c


*** ../vim-7.0.061/src/proto/menu.pro	Fri Mar 24 23:37:59 2006
--- src/proto/menu.pro	Wed Aug 16 20:25:57 2006
***************
*** 10,15 ****
--- 10,16 ----
  extern int menu_is_child_of_popup __ARGS((vimmenu_T *menu));
  extern int menu_is_toolbar __ARGS((char_u *name));
  extern int menu_is_separator __ARGS((char_u *name));
+ extern int check_menu_pointer __ARGS((vimmenu_T *root, vimmenu_T *menu_to_check));
  extern void gui_create_initial_menus __ARGS((vimmenu_T *menu));
  extern void gui_update_menus __ARGS((int modes));
  extern int gui_is_menu_shortcut __ARGS((int key));
*** ../vim-7.0.061/src/menu.c	Wed Aug 16 15:56:58 2006
--- src/menu.c	Wed Aug 16 20:35:09 2006
***************
*** 1778,1783 ****
--- 1778,1804 ----
  }
  
  /*
+  * Check that a pointer appears in the menu tree.  Used to protect from using
+  * a menu that was deleted after it was selected but before the event was
+  * handled.
+  * Return OK or FAIL.  Used recursively.
+  */
+     int
+ check_menu_pointer(root, menu_to_check)
+     vimmenu_T *root;
+     vimmenu_T *menu_to_check;
+ {
+     vimmenu_T	*p;
+ 
+     for (p = root; p != NULL; p = p->next)
+ 	if (p == menu_to_check
+ 		|| (p->children != NULL
+ 		    && check_menu_pointer(p->children, menu_to_check) == OK))
+ 	    return OK;
+     return FAIL;
+ }
+ 
+ /*
   * After we have started the GUI, then we can create any menus that have been
   * defined.  This is done once here.  add_menu_path() may have already been
   * called to define these menus, and may be called again.  This function calls
*** ../vim-7.0.061/src/normal.c	Sat Apr 29 23:53:55 2006
--- src/normal.c	Wed Aug 16 19:54:04 2006
***************
*** 2504,2510 ****
  	     * NOTE: Ignore right button down and drag mouse events.
  	     * Windows only shows the popup menu on the button up event.
  	     */
! #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON)
  	    if (!is_click)
  		return FALSE;
  #endif
--- 2504,2511 ----
  	     * NOTE: Ignore right button down and drag mouse events.
  	     * Windows only shows the popup menu on the button up event.
  	     */
! #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) \
! 			  || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC)
  	    if (!is_click)
  		return FALSE;
  #endif
*** ../vim-7.0.061/src/term.c	Wed May  3 23:26:49 2006
--- src/term.c	Wed Aug 16 21:24:21 2006
***************
*** 4783,4788 ****
--- 4783,4796 ----
  		return -1;
  	    current_menu = (vimmenu_T *)val;
  	    slen += num_bytes;
+ 
+ 	    /* The menu may have been deleted right after it was used, check
+ 	     * for that. */
+ 	    if (check_menu_pointer(root_menu, current_menu) == FAIL)
+ 	    {
+ 		key_name[0] = KS_EXTRA;
+ 		key_name[1] = (int)KE_IGNORE;
+ 	    }
  	}
  # endif
  # ifdef FEAT_GUI_TABLINE
*** ../vim-7.0.061/src/version.c	Wed Aug 16 21:26:19 2006
--- src/version.c	Wed Aug 16 21:40:37 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     62,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
166. You have been on your computer soo long that you didn't realize
     you had grandchildren.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Thu Aug 17 11:58:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 07:58:46 -0400
Subject: rpms/vim/devel 7.0.063,NONE,1.1
Message-ID: <200608171158.k7HBwkUP016796@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16781

Added Files:
	7.0.063 
Log Message:
- Patchlevel 63


--- NEW FILE 7.0.063 ---
To: vim-dev at vim.org
Subject: Patch 7.0.063
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.063
Problem:    Tiny chance for a memory leak. (coverity)
Solution:   Free pointer when next memory allocation fails.
Files:	    src/eval.c


*** ../vim-7.0.062/src/eval.c	Wed Aug 16 19:34:59 2006
--- src/eval.c	Wed Aug 16 21:33:24 2006
***************
*** 18811,18816 ****
--- 18811,18817 ----
  		if (dict_add(fudi.fd_dict, fudi.fd_di) == FAIL)
  		{
  		    vim_free(fudi.fd_di);
+ 		    vim_free(fp);
  		    goto erret;
  		}
  	    }
*** ../vim-7.0.062/src/version.c	Wed Aug 16 21:42:34 2006
--- src/version.c	Wed Aug 16 22:02:57 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     63,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
167. You have more than 200 websites bookmarked.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Thu Aug 17 12:01:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 08:01:36 -0400
Subject: rpms/vim/devel README.patches,1.54,1.55 vim.spec,1.132,1.133
Message-ID: <200608171201.k7HC1a6j016940@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16893

Modified Files:
	README.patches vim.spec 
Log Message:
- Patchlevel 63


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- README.patches	16 Aug 2006 12:45:14 -0000	1.54
+++ README.patches	17 Aug 2006 12:01:31 -0000	1.55
@@ -78,3 +78,13 @@
   6097  7.0.051  (after 7.0.44) compile and/or run problem with Perl interface
   2237  7.0.052  the Vim server may expose more functionality than expected
   1379  7.0.053  shortening multi-byte directory name may fail
+  2464  7.0.054  using an empty menu name may cause a crash
+  2204  7.0.055  ":startins" in CmdwinEnter autocmd doesn't work immediately
+  1484  7.0.056  can't use "#!" in Vim scripts to make them executable
+  1779  7.0.057  (extra, after 7.0.45) compilation trouble with Borland C 5.5
+  1423  7.0.058  gbk and gb18030 encodings are not recognized
+  2110  7.0.059  Perl interface doesn't compile with ActiveState Perl 5.8.8
+ 18082  7.0.060  code for switching buffers is repeated in several places
+  2249  7.0.061  crash in Vim command completion when nothing to complete
+  4075  7.0.062  Mac: crash when using popup menu with spell error
+  1295  7.0.063  tiny chance for a memory leak


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- vim.spec	16 Aug 2006 12:45:14 -0000	1.132
+++ vim.spec	17 Aug 2006 12:01:33 -0000	1.133
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 053
+%define patchlevel 063
 
 Summary: The VIM editor.
 Name: vim
@@ -98,6 +98,16 @@
 Patch051: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.051
 Patch052: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.052
 Patch053: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.053
+Patch054: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.054
+Patch055: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.055
+Patch056: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.056
+Patch057: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.057
+Patch058: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.058
+Patch059: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.059
+Patch060: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.060
+Patch061: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.061
+Patch062: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.062
+Patch063: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.063
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -281,6 +291,17 @@
 %patch051 -p0
 %patch052 -p0
 %patch053 -p0
+%patch054 -p0
+%patch055 -p0
+%patch056 -p0
+# Win32:
+#patch057 -p0
+%patch058 -p0
+%patch059 -p0
+%patch060 -p0
+%patch061 -p0
+%patch062 -p0
+%patch063 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -604,7 +625,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
-* Wed Aug 09 2006 Karsten Hopp <karsten at redhat.de> 7.0.053-1
+* Wed Aug 17 2006 Karsten Hopp <karsten at redhat.de> 7.0.063-1
+- Patchlevel 63
+
+* Wed Aug 15 2006 Karsten Hopp <karsten at redhat.de> 7.0.053-1
 - Patchlevel 53
 - Buildrequires libXpm-devel
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 12:08:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 08:08:51 -0400
Subject: rpms/ftp/FC-5 netkit-ftp-0.17-multiipv6.patch, NONE, 1.1 ftp.spec,
	1.27, 1.28
Message-ID: <200608171208.k7HC8pvH017010@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/ftp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16995

Modified Files:
	ftp.spec 
Added Files:
	netkit-ftp-0.17-multiipv6.patch 
Log Message:
Add update for fc5 - support for IPv6 for multihome.


netkit-ftp-0.17-multiipv6.patch:
 ftp.c |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

--- NEW FILE netkit-ftp-0.17-multiipv6.patch ---
--- netkit-ftp-0.17/ftp/ftp.c.multiipv6	2006-08-02 15:03:26.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp.c	2006-08-02 15:06:19.000000000 +0200
@@ -78,9 +78,7 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <arpa/ftp.h>
-#include <arpa/inet.h>
 #include <arpa/telnet.h>
-
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
@@ -132,7 +130,7 @@
 static sigjmp_buf ptabort;
 static int ptabflg = 0;
 static int abrtflag = 0;
-struct sockaddr_in source;
+struct sockaddr_storage source;
 
 void lostpeer(int);
 extern int connected;
@@ -154,8 +152,8 @@
 char *
 hookup(const char *host, const char *port)
 {
-	int s, tos, error, alen;
-	socklen_t len;
+	int s, tos, error;
+	socklen_t len, alen;
 	static char hostnamebuf[256];
 	struct addrinfo hints, *res, *res0;
 	char hbuf[MAXHOSTNAMELEN], pbuf[NI_MAXSERV];
@@ -281,7 +279,15 @@
 		printf("Connected to %s (%s).\n", hostname, hbuf);
 	alen = sizeof(source);
 	getsockname(s,(struct sockaddr*)&source, &alen);
-	source.sin_port = 0;    /* We just want the addr, not the port */
+	switch (source.ss_family) {
+	    /* We just want the addr, not the port */
+	    case AF_INET:
+		((struct sockaddr_in *) &source)->sin_port = 0;
+	        break;
+	    case AF_INET6:
+		((struct sockaddr_in6 *) &source)->sin6_port = 0;
+	        break;
+	}
 
 	if (getreply(0) > 2) { 	/* read startup message from server    */
 		if (cin)
@@ -1260,11 +1266,11 @@
 			return(1);
 		}
 		if((multihome) &&
-			bind(data, (struct sockaddr*)&source, sizeof(source)) == -1) {
-			close(data);
-			data = -1;
-			perror("ftp multihome bind");
-			return(1);
+                       bind(data, (struct sockaddr *)&source, sizeof(source)) == -1) {
+                       close(data);
+                       data = -1;
+                       perror("ftp multihome bind");
+                       return(1);
                 }
 		if (options & SO_DEBUG &&
 		    setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,


Index: ftp.spec
===================================================================
RCS file: /cvs/dist/rpms/ftp/FC-5/ftp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ftp.spec	4 Aug 2006 07:05:55 -0000	1.27
+++ ftp.spec	17 Aug 2006 12:08:49 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Name: ftp
 Version: 0.17
-Release: 32.1.2.fc5
+Release: 32.1.3.fc5
 License: BSD
 Group: Applications/Internet
 Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2
@@ -19,6 +19,7 @@
 Patch12: netkit-ftp-0.17-data.patch
 Patch13: netkit-ftp-0.17-multihome.patch
 Patch14: netkit-ftp-0.17-longnames.patch
+Patch15: netkit-ftp-0.17-multiipv6.patch
 BuildRoot: /var/tmp/%{name}-root
 BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel, perl
 
@@ -46,7 +47,7 @@
 %patch12 -p1 -b .data
 %patch13 -p1 -b .multihome
 %patch14 -p1 -b .longnames
-
+%patch15 -p1 -b .multiipv6
 %build
 sh configure --with-c-compiler=gcc --enable-ipv6
 perl -pi -e '
@@ -79,6 +80,9 @@
 %{_mandir}/man5/netrc.*
 
 %changelog
+* Thu Aug 17 2006 Marcela Maslanova <mmaslano at redhat.com> - 0.17-32.1.3.fc5
+- update - support multihome for IPv6
+
 * Fri Aug 4 2006 Marcela Maslanova <mmaslano at redhat.com> - 0.17-32.1.2.fc5
 - fix (#196103) patch for long filenames
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 12:18:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 08:18:15 -0400
Subject: rpms/cups/devel cups-str1880.patch,NONE,1.1 cups.spec,1.247,1.248
Message-ID: <200608171218.k7HCIFjC012575@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10549

Modified Files:
	cups.spec 
Added Files:
	cups-str1880.patch 
Log Message:
* Thu Aug 17 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-12
- Apply patch to fix STR #1880 (bug #200205).


cups-str1880.patch:
 snmp.c |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

--- NEW FILE cups-str1880.patch ---
--- cups-1.2.2/backend/snmp.c.str1880	2006-08-17 13:16:43.000000000 +0100
+++ cups-1.2.2/backend/snmp.c	2006-08-17 13:17:01.000000000 +0100
@@ -300,6 +300,9 @@
      char *argv[])			/* I - Command-line arguments */
 {
   int		fd;			/* SNMP socket */
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  struct sigaction action;		/* Actions for POSIX signals */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
 
 
  /*
@@ -319,6 +322,23 @@
   cupsSetPasswordCB(password_cb);
 
  /*
+  * Catch SIGALRM signals...
+  */
+
+#ifdef HAVE_SIGSET
+  sigset(SIGALRM, alarm_handler);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+
+  sigemptyset(&action.sa_mask);
+  sigaddset(&action.sa_mask, SIGALRM);
+  action.sa_handler = alarm_handler;
+  sigaction(SIGALRM, &action, NULL);
+#else
+  signal(SIGALRM, alarm_handler);
+#endif /* HAVE_SIGSET */
+
+ /*
   * Open the SNMP socket...
   */
 
@@ -425,6 +445,10 @@
 
   (void)sig;
 
+#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
+  signal(SIGALRM, alarm_handler);
+#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
+
   if (DebugLevel)
     write(2, "DEBUG: ALARM!\n", 14);
 }
@@ -1692,7 +1716,11 @@
 
   debug_printf("DEBUG: %.3f Probing %s...\n", run_time(), device->addrname);
 
-  if ((http = httpConnect(device->addrname, 631)) != NULL)
+  alarm(1);
+  http = httpConnect(device->addrname, 631);
+  alarm(0);
+
+  if (http);
   {
    /*
     * IPP is supported...
@@ -2333,7 +2361,6 @@
 
   addr->ipv4.sin_port = htons(port);
 
-  signal(SIGALRM, alarm_handler);
   alarm(1);
 
   status = connect(fd, (void *)addr, httpAddrLength(addr));


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- cups.spec	16 Aug 2006 09:08:22 -0000	1.247
+++ cups.spec	17 Aug 2006 12:18:12 -0000	1.248
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 11
+Release: 12
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -42,6 +42,7 @@
 Patch17: cups-relro.patch
 Patch18: cups-str1881.patch
 Patch19: cups-str1893.patch
+Patch20: cups-str1880.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -143,6 +144,7 @@
 %patch17 -p1 -b .relro
 %patch18 -p1 -b .str1881
 %patch19 -p1 -b .str1893
+%patch20 -p1 -b .str1880
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -419,6 +421,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 17 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-12
+- Apply patch to fix STR #1880 (bug #200205).
+
 * Wed Aug 16 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-11
 - Use upstream patch to fix STR #1881.
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 12:22:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 08:22:06 -0400
Subject: rpms/cups/FC-5 cups-str1880.patch,NONE,1.1 cups.spec,1.208,1.209
Message-ID: <200608171222.k7HCM6Q5013737@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13678

Modified Files:
	cups.spec 
Added Files:
	cups-str1880.patch 
Log Message:
* Thu Aug 16 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.8
- Apply patch to fix STR #1880 (bug #200205).


cups-str1880.patch:
 snmp.c |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

--- NEW FILE cups-str1880.patch ---
--- cups-1.2.2/backend/snmp.c.str1880	2006-08-17 13:16:43.000000000 +0100
+++ cups-1.2.2/backend/snmp.c	2006-08-17 13:17:01.000000000 +0100
@@ -300,6 +300,9 @@
      char *argv[])			/* I - Command-line arguments */
 {
   int		fd;			/* SNMP socket */
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  struct sigaction action;		/* Actions for POSIX signals */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
 
 
  /*
@@ -319,6 +322,23 @@
   cupsSetPasswordCB(password_cb);
 
  /*
+  * Catch SIGALRM signals...
+  */
+
+#ifdef HAVE_SIGSET
+  sigset(SIGALRM, alarm_handler);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+
+  sigemptyset(&action.sa_mask);
+  sigaddset(&action.sa_mask, SIGALRM);
+  action.sa_handler = alarm_handler;
+  sigaction(SIGALRM, &action, NULL);
+#else
+  signal(SIGALRM, alarm_handler);
+#endif /* HAVE_SIGSET */
+
+ /*
   * Open the SNMP socket...
   */
 
@@ -425,6 +445,10 @@
 
   (void)sig;
 
+#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
+  signal(SIGALRM, alarm_handler);
+#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
+
   if (DebugLevel)
     write(2, "DEBUG: ALARM!\n", 14);
 }
@@ -1692,7 +1716,11 @@
 
   debug_printf("DEBUG: %.3f Probing %s...\n", run_time(), device->addrname);
 
-  if ((http = httpConnect(device->addrname, 631)) != NULL)
+  alarm(1);
+  http = httpConnect(device->addrname, 631);
+  alarm(0);
+
+  if (http);
   {
    /*
     * IPP is supported...
@@ -2333,7 +2361,6 @@
 
   addr->ipv4.sin_port = htons(port);
 
-  signal(SIGALRM, alarm_handler);
   alarm(1);
 
   status = connect(fd, (void *)addr, httpAddrLength(addr));


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- cups.spec	16 Aug 2006 16:16:18 -0000	1.208
+++ cups.spec	17 Aug 2006 12:22:03 -0000	1.209
@@ -34,6 +34,7 @@
 Patch11: cups-str1893.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
+Patch14: cups-str1880.patch
 Patch17: cups-serverbin-compat.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
@@ -131,6 +132,7 @@
 %patch11 -p1 -b .str1893
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
+%patch14 -p1 -b .str1880
 %patch17 -p1 -b .serverbin-compat
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
@@ -414,6 +416,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 16 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.8
+- Apply patch to fix STR #1880 (bug #200205).
+
 * Wed Aug 16 2006 Tim Waugh <twaugh at redhat.com>
 - Added a clause in the %%post scriptlet to remove bad remote.cache
   files (bug #201800).



From fedora-cvs-commits at redhat.com  Thu Aug 17 12:22:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 08:22:36 -0400
Subject: rpms/cups/FC-5 cups.spec,1.209,1.210
Message-ID: <200608171222.k7HCMa5G013959@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13910

Modified Files:
	cups.spec 
Log Message:
1:1.2.2-1.8


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- cups.spec	17 Aug 2006 12:22:03 -0000	1.209
+++ cups.spec	17 Aug 2006 12:22:33 -0000	1.210
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 1.7
+Release: 1.8
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 17 13:05:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 09:05:15 -0400
Subject: rpms/ftp/FC-5 ftp.spec,1.28,1.29
Message-ID: <200608171305.k7HD5FM6008283@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/ftp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8154

Modified Files:
	ftp.spec 
Log Message:
Changed version.



Index: ftp.spec
===================================================================
RCS file: /cvs/dist/rpms/ftp/FC-5/ftp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ftp.spec	17 Aug 2006 12:08:49 -0000	1.28
+++ ftp.spec	17 Aug 2006 13:05:12 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Name: ftp
 Version: 0.17
-Release: 32.1.3.fc5
+Release: 33%{?dist}
 License: BSD
 Group: Applications/Internet
 Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2
@@ -80,6 +80,9 @@
 %{_mandir}/man5/netrc.*
 
 %changelog
+* Thu Aug 17 2006 Marcela Maslanova <mmaslano at redhat.com> - 0.17-33.fc5
+- change version
+
 * Thu Aug 17 2006 Marcela Maslanova <mmaslano at redhat.com> - 0.17-32.1.3.fc5
 - update - support multihome for IPv6
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 13:07:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 09:07:39 -0400
Subject: rpms/yum/devel yum.spec,1.113,1.114
Message-ID: <200608171307.k7HD7d2x008873@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8541

Modified Files:
	yum.spec 
Log Message:
- Requires: libxml2-python for updatesd subpackage

Starting yum-updatesd: Traceback (most recent call last):
...
    import libxml2
ImportError: No module named libxml2




Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- yum.spec	9 Aug 2006 14:41:32 -0000	1.113
+++ yum.spec	17 Aug 2006 13:07:36 -0000	1.114
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 2.9.4
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.9/yum-%{version}.tar.gz
@@ -37,6 +37,7 @@
 Requires: yum = %{version}-%{release}
 Requires: dbus-python
 Requires: pygobject2
+Requires: libxml2-python
 Prereq: /sbin/chkconfig 
 Prereq: /sbin/service
 
@@ -114,6 +115,9 @@
 
 
 %changelog
+* Thu Aug 17 2006 Karsten Hopp <karsten at redhat.com> - 2.9.4-2
+- Requires: libxml2-python for updatesd subpackage
+
 * Wed Aug  9 2006 Jeremy Katz <katzj at redhat.com> - 2.9.4-1
 - update to 2.9.4 (including logging fixes, gpg checking fix, 
   and fixes for #200901, #200346, #189483)



From fedora-cvs-commits at redhat.com  Thu Aug 17 13:12:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 09:12:16 -0400
Subject: rpms/ksh/FC-5 ksh.spec,1.25,1.26 sources,1.6,1.7
Message-ID: <200608171312.k7HDCGq5009838@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/ksh/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9783

Modified Files:
	ksh.spec sources 
Log Message:
- build as update for FC-5


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/FC-5/ksh.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ksh.spec	27 Feb 2006 12:24:02 -0000	1.25
+++ ksh.spec	17 Aug 2006 13:12:01 -0000	1.26
@@ -1,5 +1,5 @@
 #ExclusiveArch:  x86_64
-%define       releasedate   2006-01-24
+%define       releasedate   2006-02-14
 #ExcludeArch:  ia64
 
 Name:         ksh
@@ -7,8 +7,8 @@
 URL:          http://www.kornshell.com/
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
-Version:      20060124
-Release:      3
+Version:      20060214
+Release:      1%{?dist}.1
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
 Source2:      http://www.research.att.com/~gsf/download/tgz/ast-base-locale.%{releasedate}.tgz
@@ -100,6 +100,15 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Aug 17 2006 Karsten Hopp <karsten at redhat.de> 20060214-1.fc5.1
+- build as update for FC-5
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 20060214-1.1
+- rebuild
+
+* Thu Jun 01 2006 Karsten Hopp <karsten at redhat.de> 20060214-1
+- new upstream source
+
 * Mon Feb 27 2006 Karsten Hopp <karsten at redhat.de> 20060124-3
 - PreReq grep, coreutils (#182835)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ksh/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Feb 2006 10:09:53 -0000	1.6
+++ sources	17 Aug 2006 13:12:01 -0000	1.7
@@ -1,3 +1,3 @@
-d78f60d5429a64eb522fa95df0cb22c1  ast-base-locale.2006-01-24.tgz
-a2ccd63471e460f141d6461d659306b4  ast-ksh.2006-01-24.tgz
-7cbb9964efece69294fae60bb19f0d68  INIT.2006-01-24.tgz
+76a13bdb10a35b5ff67208cf9042a8bf  ast-ksh.2006-02-14.tgz
+f16ea2de409871633c797d4e4f401177  ast-base-locale.2006-02-14.tgz
+375ede1f75db451f645a140ec41b9216  INIT.2006-02-14.tgz



From fedora-cvs-commits at redhat.com  Thu Aug 17 13:49:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 09:49:44 -0400
Subject: rpms/libogg/devel libogg.spec,1.21,1.22
Message-ID: <200608171349.k7HDni7n018366@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libogg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18292

Modified Files:
	libogg.spec 
Log Message:
require pkgconfig



Index: libogg.spec
===================================================================
RCS file: /cvs/dist/rpms/libogg/devel/libogg.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libogg.spec	12 Jul 2006 06:55:02 -0000	1.21
+++ libogg.spec	17 Aug 2006 13:49:41 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: The Ogg bitstream file format library.
 Name:		libogg
 Version:	1.1.3
-Release:	1.2.1 
+Release:	2%{?dist}
 Epoch:		2
 Group: System Environment/Libraries
 License:      BSD
@@ -19,6 +19,7 @@
 Summary: Files needed for development using libogg.
 Group: Development/Libraries
 Requires: libogg = %{epoch}:%{version}
+Requires: pkgconfig
 
 %description devel
 Libogg is a library used for manipulating Ogg bitstreams. The
@@ -70,6 +71,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 17 2006 Matthias Clasen <mclasen at redhat.com> - 2:1.1.3-2.fc6
+- Fix 202280
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.1.3-1.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 14:29:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 10:29:51 -0400
Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec,
	1.39, 1.40
Message-ID: <200608171429.k7HETpgV013174@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13101

Modified Files:
	jakarta-commons-beanutils.spec 
Log Message:
Merge with upstream




Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- jakarta-commons-beanutils.spec	10 Aug 2006 10:01:32 -0000	1.39
+++ jakarta-commons-beanutils.spec	17 Aug 2006 14:29:48 -0000	1.40
@@ -39,7 +39,7 @@
 
 Name:		jakarta-commons-beanutils
 Version:	1.7.0
-Release:	4jpp_3fc
+Release:	5jpp.1
 Epoch:		0
 Summary:	Jakarta Commons BeanUtils Package
 License:	Apache Software License
@@ -75,8 +75,8 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Requires(post):		coreutils
-Requires(postun):	coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -153,6 +153,12 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Aug 17 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-5jpp.1
+- Merge with upstream
+
+* Thu Aug 17 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-5jpp
+- Require what is used in post/postun for javadoc
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.7.0-4jpp_3fc
 - Requires(post/postun): coreutils
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 14:36:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 10:36:41 -0400
Subject: rpms/aspell-nl/devel dutch-debian.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 aspell-nl.spec, 1.18, 1.19 sources, 1.3,
	1.4 aspell-nl-0.50-2-ned_alias.patch, 1.1, NONE
Message-ID: <200608171436.k7HEafCZ012197@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/aspell-nl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14389

Modified Files:
	.cvsignore aspell-nl.spec sources 
Added Files:
	dutch-debian.patch 
Removed Files:
	aspell-nl-0.50-2-ned_alias.patch 
Log Message:
 move to GPL dictionary


dutch-debian.patch:
 AUTHORS                        |   14 
 COPYING                        |    7 
 Makefile.am                    |    2 
 Makefile.in                    |  237 +
 README                         |   17 
 THANKS                         |   20 
 TODO                           |    1 
 aclocal.m4                     |  942 ++++++-
 aspell/Makefile.am             |   44 
 aspell/Makefile.in             |  239 +
 aspell/dutch.alias             |    1 
 aspell/dutch.dat               |    9 
 aspell/dutch.multi             |    1 
 aspell/flemish.multi           |    1 
 aspell/nederlands.multi        |    1 
 aspell/nl.contents             |    1 
 aspell/nl.multi                |    1 
 aspell/vlaams.multi            |    1 
 config.guess                   | 1365 ++++++++--
 config.h.in                    |   18 
 config.sub                     |  967 ++++++-
 configure                      | 5432 ++++++++++++++++++++++++++++++++---------
 configure.in                   |    3 
 debian/NOTES                   |    6 
 debian/README.spellingchange   |   20 
 debian/aspell-nl.dirs          |    3 
 debian/aspell-nl.docs          |    1 
 debian/aspell-nl.install       |    9 
 debian/aspell-nl.links         |    1 
 debian/changelog               |  397 ++
 debian/compat                  |    1 
 debian/control                 |   56 
 debian/copyright               |   43 
 debian/dutch.5                 |   32 
 debian/idutch.dirs             |    1 
 debian/idutch.docs             |    1 
 debian/idutch.info-ispell      |   25 
 debian/idutch.links            |    2 
 debian/myspell-nl.dirs         |    2 
 debian/myspell-nl.docs         |    1 
 debian/myspell-nl.info-myspell |    2 
 debian/rules                   |  113 
 debian/wdutch.dirs             |    1 
 debian/wdutch.docs             |    1 
 debian/wdutch.info-wordlist    |   31 
 debian/wdutch.links            |    1 
 doc/Makefile.in                |  204 -
 misc/Makefile.in               |  124 
 misc/config.guess              | 1459 +++++++++++
 misc/config.sub                | 1549 +++++++++++
 misc/ltmain.sh                 | 5055 ++++++++++++++++++++++++++++++++++++++
 misc/wl-mode.el                |    4 
 test/Makefile.in               |  115 
 wl/Makefile.am                 |    2 
 wl/Makefile.in                 |  162 -
 wl/chemistry.wla               |   13 
 wl/countries.wla               |   12 
 wl/jargon.wla                  |    9 
 wl/large.wl                    |   12 
 wl/nl_NL.myheader              |    2 
 wl/physics.wla                 |    7 
 wl/toponames.wla               |    1 
 62 files changed, 16865 insertions(+), 1939 deletions(-)

--- NEW FILE dutch-debian.patch ---
--- dutch-0.1e.orig/test/Makefile.in
+++ dutch-0.1e/test/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.2d from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,7 @@
 # PARTICULAR PURPOSE.
 
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -32,6 +32,8 @@
 includedir = @includedir@
 oldincludedir = /usr/include
 
+DESTDIR =
+
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -44,7 +46,7 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
@@ -55,16 +57,22 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+ASPELL = @ASPELL@
 BUILDHASH = @BUILDHASH@
 BUILDICT = @BUILDICT@
 CC = @CC@
 COMM = @COMM@
 DIST_DATE = @DIST_DATE@
 EMACS = @EMACS@
+HAVE_LIB = @HAVE_LIB@
 ISPELL = @ISPELL@
 KPSEWHICH = @KPSEWHICH@
+LIB = @LIB@
 LLANG = @LLANG@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MD5SUM = @MD5SUM@
@@ -89,15 +97,14 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
-GZIP = --best
-default: all
-
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps test/Makefile
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -110,62 +117,78 @@
 subdir = test
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu test/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
 	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-all: Makefile
-
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 
 
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
 
-clean:  clean-generic mostlyclean
+clean: clean-am
 
-distclean:  distclean-generic clean
-	-rm -f config.status
+distclean-am:  distclean-generic clean-am
 
-maintainer-clean:  maintainer-clean-generic distclean
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
-.PHONY: default tags distdir info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
--- dutch-0.1e.orig/aspell/flemish.multi
+++ dutch-0.1e/aspell/flemish.multi
[...21040 lines suppressed...]
+AC_LIB_PROG_LD_GNU
+])
+
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
-AC_DEFUN(AM_CONFIG_HEADER,
+AC_DEFUN([AM_CONFIG_HEADER],
 [AC_PREREQ([2.12])
 AC_CONFIG_HEADER([$1])
 dnl When config.status generates a header, we must update the stamp-h file.
@@ -126,8 +951,9 @@
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -137,33 +963,53 @@
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AM_SANITY_CHECK
-AC_ARG_PROGRAM
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_PROG_MAKE_SET])
-
+AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# serial 1
+# Copyright 2002  Free Software Foundation, Inc.
 
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION so it can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+	 [AM_AUTOMAKE_VERSION([1.4-p6])])
 
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -175,10 +1021,21 @@
 # directory).
 if (
    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$@" = "X"; then
+   if test "[$]*" = "X"; then
       # -L didn't work.
       set X `ls -t $srcdir/configure conftestfile`
    fi
+   if test "[$]*" != "X $srcdir/configure conftestfile" \
+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
    test "[$]2" = conftestfile
    )
 then
@@ -193,7 +1050,7 @@
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
+AC_DEFUN([AM_MISSING_PROG],
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -212,7 +1069,7 @@
 
 # serial 1
 
-AC_DEFUN(AM_MAINTAINER_MODE,
+AC_DEFUN([AM_MAINTAINER_MODE],
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -221,41 +1078,52 @@
       USE_MAINTAINER_MODE=$enableval,
       USE_MAINTAINER_MODE=no)
   AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  if test $USE_MAINTAINER_MODE = yes; then
-    MAINT=
-  else
-    MAINT='#M#'
-  fi
+  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
+  MAINT=$MAINTAINER_MODE_TRUE
   AC_SUBST(MAINT)dnl
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN([AM_CONDITIONAL],
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
 
 # serial 1
 
-AC_DEFUN(AM_PATH_LISPDIR,
+AC_DEFUN([AM_PATH_LISPDIR],
  [# If set to t, that means we are running in a shell under Emacs.
   # If you have an Emacs named "t", then use the full path.
   test "$EMACS" = t && EMACS=
-  AC_PATH_PROG(EMACS, emacs xemacs, no)
+  AC_PATH_PROGS(EMACS, emacs xemacs, no)
   if test $EMACS != "no"; then
     AC_MSG_CHECKING([where .elc files should go])
     dnl Set default value
     lispdir="\$(datadir)/emacs/site-lisp"
+    emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'`
     if test "x$prefix" = "xNONE"; then
-      if test -d $ac_default_prefix/share/emacs/site-lisp; then
-	lispdir="\$(prefix)/share/emacs/site-lisp"
+      if test -d $ac_default_prefix/share/$emacs_flavor/site-lisp; then
+	lispdir="\$(prefix)/share/$emacs_flavor/site-lisp"
       else
-	if test -d $ac_default_prefix/lib/emacs/site-lisp; then
-	  lispdir="\$(prefix)/lib/emacs/site-lisp"
+	if test -d $ac_default_prefix/lib/$emacs_flavor/site-lisp; then
+	  lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp"
 	fi
       fi
     else
-      if test -d $prefix/share/emacs/site-lisp; then
-	lispdir="\$(prefix)/share/emacs/site-lisp"
+      if test -d $prefix/share/$emacs_flavor/site-lisp; then
+	lispdir="\$(prefix)/share/$emacs_flavor/site-lisp"
       else
-	if test -d $prefix/lib/emacs/site-lisp; then
-	  lispdir="\$(prefix)/lib/emacs/site-lisp"
+	if test -d $prefix/lib/$emacs_flavor/site-lisp; then
+	  lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp"
 	fi
       fi
     fi


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/aspell-nl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 03:12:30 -0000	1.3
+++ .cvsignore	17 Aug 2006 14:36:37 -0000	1.4
@@ -1 +1 @@
-aspell-nl-0.50-2.tar.bz2
+dutch_0.1e.orig.tar.gz


Index: aspell-nl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-nl/devel/aspell-nl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aspell-nl.spec	12 Jul 2006 05:20:18 -0000	1.18
+++ aspell-nl.spec	17 Aug 2006 14:36:37 -0000	1.19
@@ -1,52 +1,62 @@
-%define lang nl
-%define langrelease 2
-Summary: Dutch dictionaries for Aspell.
-Name: aspell-%{lang}
-Epoch: 50
-Version: 0.50
-Release: 8.2.1
-License: distributable
+Summary: Dutch dictionaries for Aspell
+Name: aspell-nl
+# Have to bump this to make it newer than the old, bad version.
+Epoch: 51
+Version: 0.1e
+Release: 1%{?dist}
+License: GPL
 Group: Applications/Text
-URL: http://aspell.net/
-Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2
-Patch0: aspell-nl-0.50-2-ned_alias.patch
+URL: http://packages.debian.org/unstable/text/%{name}
+Source0: http://ftp.debian.org/debian/pool/main/d/dutch/dutch_%{version}.orig.tar.gz
+Source1: http://corbu.aq.upm.es/~agmartin/linux/ispellaff2myspell
+Patch0: dutch-debian.patch
 Buildrequires: aspell >= 12:0.60
 Requires: aspell >= 12:0.60
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-%define debug_package %{nil}
-
 %description
 Provides the word list/dictionaries for the following: Dutch
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-%setup -q -n aspell-%{lang}-%{version}-%{langrelease}
-%patch -p1 -b .neth
-cp dutch.alias nederlands.alias
+%setup -q -n dutch-%{version}
+%patch0 -p1
 
 %build
-echo "ASPELL = aspell" > Makefile
-echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile
-echo "WORD_LIST_COMPRESS = word-list-compress" >> Makefile
-echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60" >> Makefile
-echo "datadir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60" >> Makefile
-cat Makefile.pre >> Makefile
-make
+install -m0755 %{SOURCE1} wl/
+cd wl/
+sed -e '/[_:`^<>()]/d' ./small.wl ./medium.wl ./large.wl ./toponames.wla ./chemistry.wla ./countries.wla ./energy.wla ./jargon.wla ./newwords.wla ./physics.wla ./puzzle.wla | tr -d '\267' | sort -f | uniq | tee dutch | sed -e '/[- 0-9\.,]/d' > dutch.stripped
+./ispellaff2myspell --charset=latin1 --split=200 --myheader=nl_NL.myheader dutch.aff > nl_NL.myaff
+cp ../aspell/dutch.dat nl.dat
+cp nl_NL.myaff nl_affix.dat
+%{_bindir}/aspell --lang=nl create master ./nl.rws < dutch.stripped
 
 %install
-make install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/aspell-0.60
+install -m0644 aspell/dutch.alias $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/
+install -m0644 aspell/dutch.alias $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/nederlands.alias
+install -m0644 aspell/dutch.dat $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/nl.dat
+install -m0644 wl/nl_NL.myaff $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/nl_affix.dat
+install -m0644 wl/dutch.aff $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/
+install -m0644 wl/nl.rws $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/
+install -m0644 aspell/dutch.multi $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/
+install -m0644 aspell/flemish.multi $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/
+install -m0644 aspell/nederlands.multi $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/
+install -m0644 aspell/nl.multi $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/
+install -m0644 aspell/vlaams.multi $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-
+%doc COPYING README ChangeLog
 %{_libdir}/aspell-0.60/*
-#%{_datadir}/aspell/*
 
 %changelog
+* Mon Jul 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 51:0.1e-1
+- move to GPL dictionary
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-8.2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/aspell-nl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2004 03:12:30 -0000	1.3
+++ sources	17 Aug 2006 14:36:37 -0000	1.4
@@ -1 +1 @@
-c3ef9fd7dc4c47d816eee9ef5149c76a  aspell-nl-0.50-2.tar.bz2
+c9b63f9e0f754cc593d4c6233c2d5730  dutch_0.1e.orig.tar.gz


--- aspell-nl-0.50-2-ned_alias.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 17 14:41:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 10:41:16 -0400
Subject: rpms/aspell-nl/devel ispellaff2myspell,NONE,1.1
Message-ID: <200608171441.k7HEfEjt025411@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/aspell-nl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25387

Added Files:
	ispellaff2myspell 
Log Message:
added source



***** Error reading new file: [Errno 2] No such file or directory: 'ispellaff2myspell'



From fedora-cvs-commits at redhat.com  Thu Aug 17 14:59:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 10:59:47 -0400
Subject: rpms/xorg-x11-drv-sis/devel sis.xinf,1.2,1.3
Message-ID: <200608171459.k7HExl8n008344@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/xorg-x11-drv-sis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8330

Modified Files:
	sis.xinf 
Log Message:
this is case-sensitive, unfortunately



Index: sis.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sis/devel/sis.xinf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sis.xinf	24 Jul 2006 15:58:45 -0000	1.2
+++ sis.xinf	17 Aug 2006 14:59:44 -0000	1.3
@@ -18,5 +18,5 @@
 alias pcivideo:v00001039d00006330sv*sd*bc*sc*i* sis # 661/741/760/761
 
 # XGI block
-alias pcivideo:v000018cad00000020sv*sd*bc*sc*i* sis # XGI G20 (Z7)
-alias pcivideo:v000018cad00000040sv*sd*bc*sc*i* sis # XGI G50 (V3XT, V5, V8)
+alias pcivideo:v000018CAd00000020sv*sd*bc*sc*i* sis # XGI G20 (Z7)
+alias pcivideo:v000018CAd00000040sv*sd*bc*sc*i* sis # XGI G50 (V3XT, V5, V8)



From fedora-cvs-commits at redhat.com  Thu Aug 17 15:04:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 11:04:38 -0400
Subject: rpms/xorg-x11-drv-sis/devel xorg-x11-drv-sis.spec,1.15,1.16
Message-ID: <200608171504.k7HF4ckV008487@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/xorg-x11-drv-sis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8474

Modified Files:
	xorg-x11-drv-sis.spec 
Log Message:
bump



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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-sis.spec	24 Jul 2006 15:58:45 -0000	1.15
+++ xorg-x11-drv-sis.spec	17 Aug 2006 15:04:26 -0000	1.16
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 sis video driver
 Name:      xorg-x11-drv-sis
 Version:   0.9.1
-Release:   4
+Release:   5
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -64,6 +64,9 @@
 %{_mandir}/man4/sis.4*
 
 %changelog
+* Thu Aug 17 2006 Bill Nottingham <notting at redhat.com> 0.9.1-5
+- fix sis.xinf for XGI (case sensitive)
+
 * Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 0.9.1-4
 - Update sis.xinf for XGI cards.  (#186024)
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 15:09:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 11:09:58 -0400
Subject: rpms/tcsh/FC-5 tcsh-6.14.00-spell-crash.patch, NONE, 1.1 tcsh.spec,
	1.39, 1.40
Message-ID: <200608171509.k7HF9wV5008683@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/tcsh/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8568

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.14.00-spell-crash.patch 
Log Message:
* Thu Aug 17 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-6.fc5.3
- Fix an uninitialized variable causing stack corruption (#197968)


tcsh-6.14.00-spell-crash.patch:
 tw.parse.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE tcsh-6.14.00-spell-crash.patch ---
--- tcsh-6.14.00/tw.parse.c.spell-crash	2006-08-16 19:10:16.000000000 +0200
+++ tcsh-6.14.00/tw.parse.c	2006-08-16 19:11:51.000000000 +0200
@@ -1668,7 +1668,8 @@
 	return (-1);
     }
 
-    numitems = tw_collect(command, looking, exp_dir, exp_name, 
+    exp_name[0] = '\0';
+    numitems = tw_collect(command, looking, exp_dir, exp_name,
 			  &target, pat, flags, dir_fd);
     if (numitems == -1)
 	return -1;


Index: tcsh.spec
===================================================================
RCS file: /cvs/dist/rpms/tcsh/FC-5/tcsh.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- tcsh.spec	10 Jul 2006 20:59:21 -0000	1.39
+++ tcsh.spec	17 Aug 2006 15:09:56 -0000	1.40
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell.
 Name: tcsh
 Version: 6.14
-Release: 6.fc5.2
+Release: 6.fc5.3
 License: distributable
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -16,6 +16,7 @@
 Patch6: tcsh-6.14.00-sigint.patch
 Patch7: tcsh-6.14.00-wide-crash.patch
 Patch8: tcsh-6.14.00-wide-seeks.patch
+Patch9: tcsh-6.14.00-spell-crash.patch
 Provides: csh = %{version}
 Prereq: fileutils, grep
 URL: http://www.tcsh.org/
@@ -41,6 +42,7 @@
 %patch6 -p1 -b .sigint
 %patch7 -p1 -b .wide-crash
 %patch8 -p1 -b .wide-seeks
+%patch9 -p1 -b .spell-crash
 
 nroff -me eight-bit.me > eight-bit.txt
 
@@ -108,6 +110,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Aug 17 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-6.fc5.3
+- Fix an uninitialized variable causing stack corruption (#197968)
+
 * Mon Jul 10 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-6.fc5.2
 - Fix seeking over multibyte characters (#195972)
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 15:16:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 11:16:58 -0400
Subject: rpms/crypto-utils/devel keyrand.c, NONE, 1.1 .cvsignore, 1.5,
	1.6 crypto-utils.spec, 1.25, 1.26 sources, 1.5, 1.6
Message-ID: <200608171516.k7HFGwDN027791@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/crypto-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27334

Modified Files:
	.cvsignore crypto-utils.spec sources 
Added Files:
	keyrand.c 
Log Message:
* Thu Aug 17 2006 Joe Orton <jorton at redhat.com> 2.3-1
- add GPL-licensed keyrand replacement (#20254)



--- NEW FILE keyrand.c ---
/* 
   keyrand implementation using /dev/random
   Copyright (C) 2006 Red Hat, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
  
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
  
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#include <sys/types.h>

#include <unistd.h>
#include <string.h>
#include <stdio.h>
#include <fcntl.h>
#include <errno.h>
#include <stdlib.h>

#include <slang/slang.h>
#include <newt.h>

static void collect_bytes(int fd, char *buffer, int total)
{
    int count;
    newtComponent title, form, scale;
    char message[1024];
    newtGrid box;

    box = newtCreateGrid(1, 3);

    snprintf(message, sizeof message,
             "To generate %u random bits from the "
             "kernel random number generator, some "
             "keyboard or mouse input may be necessary at the "
             "console for this host.  Please try entering "
             "some random text or moving the mouse, if "
             "running this program locally.", total * 8);
    
    title = newtTextboxReflowed(1, 1, message, 60, 10, 0, 0);
    
    newtGridSetField(box, 0, 0, NEWT_GRID_COMPONENT, title,
		     0, 0, 0, 0, 0, 0);
    
    /* The progress bar */
    scale = newtScale(0, 0, 30, total);
    newtScaleSet(scale, 0);
    
    newtGridSetField(box, 0, 1, NEWT_GRID_COMPONENT, scale,
		     0, 1, 0, 0, 0, 0);

    form = newtForm(NULL, NULL, 0);
    newtGridAddComponentsToForm(box, form, 1);
    
    newtGridWrappedWindow(box, "Collecting random data");
    
    newtDrawForm(form);

    count = 0;

    do {
        ssize_t rv;
        
        newtScaleSet(scale, count);
        newtRefresh();

        rv = read(fd, buffer + count, total - count);
        if (rv == -1 && errno == EINTR) continue;
        else if (rv < 0) {
            newtWinMessage("Error", "Exit", 
                           "Error reading from /dev/random");
            newtFinished();
            exit(1);
        }

	SLang_flush_input();
        count += rv;
    } while (count < total);

    newtFormDestroy(form);
}
    

int main(int argc, char **argv)
{
    const char *output;
    int bits, bytes, fd, rfd;
    char *buffer;

    if (argc < 3) {
        fprintf(stderr, "Usage: keyrand <number-of-bits> <output-file>\n");
        exit(1);
    }
    
    bits = atoi(argv[1]);
    output = argv[2];
    fd = open(output, O_APPEND|O_WRONLY);
    rfd = open("/dev/random", O_RDONLY);
    
    newtInit();
    newtCls();
    
    newtDrawRootText(0, 0, 
                     "Red Hat Keypair Generation (c) 2006 Red Hat, Inc.");
    
    if (fd < 0) {
        newtWinMessage("Error", "Exit", "Could not open output file");
        newtFinished();
        exit(1);
    }
    else if (rfd < 0) {
        newtWinMessage("Error", "Exit", "Could not open /dev/random");
        newtFinished();
        exit(1);
    }
    else if (bits < 8 || bits > 800 * 1024) {
        newtWinMessage("Error", "Exit", "More than 8 bits must be requested");
        newtFinished();
        exit(1);
    }
    
    bytes = bits / 8;
    buffer = malloc(bytes);
    sleep(1);

    collect_bytes(rfd, buffer, bytes);
    
    if (write(fd, buffer, bytes) != bytes || close(fd)) {
        newtWinMessage("Error", "Exit", "Error writing to random file");
        newtFinished();
        exit(1);
    }

    newtFinished();
    
    newtRefresh();

    sleep(1);
    newtPopWindow();
    SLang_flush_input();
    newtClearKeyBuffer();

    return 0;
}



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/crypto-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Feb 2005 16:29:58 -0000	1.5
+++ .cvsignore	17 Aug 2006 15:16:56 -0000	1.6
@@ -1,4 +1 @@
-crypto-rand-1.1.tar.gz
-genkey.1
-certwatch.1
-i386
+*.rpm


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/crypto-utils/devel/crypto-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- crypto-utils.spec	12 Jul 2006 04:54:20 -0000	1.25
+++ crypto-utils.spec	17 Aug 2006 15:16:56 -0000	1.26
@@ -1,16 +1,17 @@
 
-%define crver 1.1
+%define crver 1.3
 
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
-Version: 2.2
-Release: 9.2.2
+Version: 2.3
+Release: 1
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
 Source3: certwatch.cron
 Source4: certwatch.xml
 Source5: genkey.xml
+Source6: keyrand.c
 Group: Applications/System
 License: Various
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -28,10 +29,14 @@
 
 %build 
 %configure --with-newt=%{_prefix} CFLAGS="-fPIC $RPM_OPT_FLAGS -Wall"
-make
+make -C librand
 
 cc $RPM_OPT_FLAGS -Wall -Werror -I/usr/include/openssl \
    $RPM_SOURCE_DIR/certwatch.c -o certwatch -lcrypto
+
+cc $RPM_OPT_FLAGS -Wall -Werror \
+   $RPM_SOURCE_DIR/keyrand.c -o keyrand -lnewt
+
 for m in certwatch.xml genkey.xml; do
   xmlto man $RPM_SOURCE_DIR/$m
 done
@@ -70,7 +75,7 @@
          $RPM_BUILD_ROOT%{_bindir}
 
 # install keyrand
-install -c -m 755 keyrand/keyrand $RPM_BUILD_ROOT%{_bindir}/keyrand
+install -c -m 755 keyrand $RPM_BUILD_ROOT%{_bindir}/keyrand
 
 # install certwatch
 install -c -m 755 certwatch $RPM_BUILD_ROOT%{_bindir}/certwatch
@@ -101,6 +106,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Thu Aug 17 2006 Joe Orton <jorton at redhat.com> 2.3-1
+- add GPL-licensed keyrand replacement (#20254)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2-9.2.2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/crypto-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Oct 2004 10:15:57 -0000	1.5
+++ sources	17 Aug 2006 15:16:56 -0000	1.6
@@ -1 +1,2 @@
-d641143f97864accb32debdebbff1994  crypto-rand-1.1.tar.gz
+baff6c3e015fb39c36342528e4b3eaf8  crypto-rand-1.2.tar.gz
+38d908834753ff50c454ec3c69f8de6c  crypto-rand-1.3.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 17 15:41:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 11:41:51 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.848, 1.849 sources,
	1.192, 1.193
Message-ID: <200608171541.k7HFfprF011153@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11012

Modified Files:
	openoffice.org.spec sources 
Log Message:
remove logos


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.848
retrieving revision 1.849
diff -u -r1.848 -r1.849
--- openoffice.org.spec	17 Aug 2006 08:34:32 -0000	1.848
+++ openoffice.org.spec	17 Aug 2006 15:41:48 -0000	1.849
@@ -145,6 +145,7 @@
 Summary: core modules for %{name}
 Group: Applications/Productivity
 Requires: urw-fonts
+Requires: dejavu-lgc-fonts
 %ifarch %{ppc}
 # 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
@@ -387,7 +388,6 @@
 Summary: Greek language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: dejavu-lgc-fonts
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-el
 Obsoletes: openoffice.org2-langpack-el_GR
@@ -669,7 +669,6 @@
 Summary: Russian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: dejavu-lgc-fonts
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ru
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- sources	15 Aug 2006 07:41:07 -0000	1.192
+++ sources	17 Aug 2006 15:41:48 -0000	1.193
@@ -1,7 +1,6 @@
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
 16cb79cb018c6311e9797e85bd2461b2  evolocal.odb
 b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
-8bc013e30e432ce3927e402e9aaa8c9f  redhat-templates.tar.gz
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 afe937f8dd4c3aa10e9bda068059cdfd  opens___.ttf
 7f31494f6d929e03b1e29408d8083d19  GSI_ga.sdf
@@ -13,3 +12,4 @@
 0ee333127e54353d49bf30aa112faee4  openoffice.org.langpack.template.tar.gz
 7a78b4b7151f8f71fe336245b19e68fa  OOD680_m1.tar.bz2
 cba51824724ada973394d8feecdd0213  pa-IN-179.sdf
+26c72b57608d21c7cccf941f1df2aea9  redhat-templates.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 17 15:51:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 11:51:21 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.849,1.850
Message-ID: <200608171551.k7HFpLTb029728@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29672

Modified Files:
	openoffice.org.spec 
Log Message:
new files


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.849
retrieving revision 1.850
diff -u -r1.849 -r1.850
--- openoffice.org.spec	17 Aug 2006 15:41:48 -0000	1.849
+++ openoffice.org.spec	17 Aug 2006 15:51:18 -0000	1.850
@@ -1476,6 +1476,7 @@
 %{instdir}/program/crash_report
 %{instdir}/program/deployment680*.uno.so
 %{instdir}/program/deploymentgui680*.uno.so
+%{instdir}/program/desktopbe1.uno.so
 %{instdir}/program/dlgprov680*.uno.so
 %{instdir}/program/fpicker.uno.so
 %{instdir}/program/fps_gnome.uno.so
@@ -1634,6 +1635,7 @@
 %{instdir}/program/libscriptframe.so
 %{instdir}/program/libsd680*.so
 %{instdir}/program/libsdbc2.so
+%{instdir}/program/libsdbt680*so
 %{instdir}/program/libsdd680*.so
 %{instdir}/program/libsdui680*.so
 %{instdir}/program/libsfx680*.so
@@ -1673,6 +1675,7 @@
 %{instdir}/program/libuno_salhelpergcc3.so
 %{instdir}/program/libuno_salhelpergcc3.so.3
 %{instdir}/program/libunoxml680*.so
+%{instdir}/program/libupdchk680*.so
 %{instdir}/program/liburp_uno.so
 %{instdir}/program/libutl680*.so
 %{instdir}/program/libuui680*.so
@@ -1751,6 +1754,7 @@
 %{instdir}/program/resource/sd680en-US.res
 %{instdir}/program/resource/sfx680en-US.res
 %{instdir}/program/resource/spa680en-US.res
+%{instdir}/program/resource/sdbt680en-US.res
 %{instdir}/program/resource/svs680en-US.res
 %{instdir}/program/resource/svt680en-US.res
 %{instdir}/program/resource/svx680en-US.res
@@ -1760,6 +1764,7 @@
 %{instdir}/program/resource/tk680en-US.res
 %{instdir}/program/resource/tpl680en-US.res
 %{instdir}/program/resource/uui680en-US.res
+%{instdir}/program/resource/updchk680en-US.res
 %{instdir}/program/resource/vcl680en-US.res
 %{instdir}/program/resource/wzi680en-US.res
 %{instdir}/program/resource/xmlsec680en-US.res
@@ -1857,6 +1862,7 @@
 %{instdir}/share/registry/data/org/openoffice/Office/Jobs.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/Labels.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/Math.xcu
+%{instdir}/share/registry/data/org/openoffice/Office/Paths.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/ProtocolHandler.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/Recovery.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/SFX.xcu
@@ -1927,6 +1933,7 @@
 %{instdir}/share/registry/schema/org/openoffice/LDAP.xcs
 %dir %{instdir}/share/registry/schema/org/openoffice/Office
 %{instdir}/share/registry/schema/org/openoffice/Office/Addons.xcs
+%{instdir}/share/registry/schema/org/openoffice/Office/CalcAddIns.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/Calc.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/Chart.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/Commands.xcs
@@ -1944,6 +1951,7 @@
 %{instdir}/share/registry/schema/org/openoffice/Office/Linguistic.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/Math.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/OptionsDialog.xcs
+%{instdir}/share/registry/schema/org/openoffice/Office/Paths.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/Recovery.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/SFX.xcs
@@ -2231,6 +2239,8 @@
 %{instdir}/program/libwpft680*.so
 %{instdir}/program/swriter
 %{instdir}/program/swriter.bin
+%dir %{instdir}/program/classes
+%{instdir}/program/classes/writer2latex.jar
 %dir %{instdir}/share
 %dir %{instdir}/share/registry
 %dir %{instdir}/share/registry/data
@@ -2457,6 +2467,7 @@
 %{instdir}/program/hid.lst
 %{instdir}/program/libcommuni680*.so
 %{instdir}/program/libsimplecm680*.so
+%{instdir}/program/testtoolrc
 %{instdir}/program/testtool.bin
 %dir %{instdir}/program/resource
 %{instdir}/program/resource/stt680en-US.res



From fedora-cvs-commits at redhat.com  Thu Aug 17 15:55:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 11:55:13 -0400
Subject: rpms/xorg-x11-drv-i810/devel i810.xinf, 1.5,
	1.6 xorg-x11-drv-i810.spec, 1.36, 1.37
Message-ID: <200608171555.k7HFtDrw031216@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31134

Modified Files:
	i810.xinf xorg-x11-drv-i810.spec 
Log Message:
* Thu Aug 17 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-3.fc6
- i810.xinf: Uppercase PCI IDs.



Index: i810.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/i810.xinf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- i810.xinf	14 Aug 2006 15:29:34 -0000	1.5
+++ i810.xinf	17 Aug 2006 15:55:11 -0000	1.6
@@ -10,7 +10,7 @@
 
 alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* i810	# 865G
 # katzj's laptop
-alias pcivideo:v00008086d00002572sv0000103csd000030a0bc*sc*i* intel
+alias pcivideo:v00008086d00002572sv0000103Csd000030A0bc*sc*i* intel
 
 alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* i810	# 915G
 # ajax's desktop
@@ -20,7 +20,7 @@
 
 alias pcivideo:v00008086d00002592sv*sd*bc*sc*i* i810	# 915GM
 # Toshiba Satellite M45 S351 (#202365)
-alias pcivideo:v00008086d00002592sv00001179sd0000ff10bc*sc*i* intel
+alias pcivideo:v00008086d00002592sv00001179sd0000FF10bc*sc*i* intel
 
 alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* i810	# 945G
 alias pcivideo:v00008086d000027A2sv*sd*bc*sc*i* i810	# 945GM


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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-x11-drv-i810.spec	14 Aug 2006 16:09:07 -0000	1.36
+++ xorg-x11-drv-i810.spec	17 Aug 2006 15:55:11 -0000	1.37
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   1.6.5
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -109,6 +109,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Thu Aug 17 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-3.fc6
+- i810.xinf: Uppercase PCI IDs.
+
 * Fri Aug 10 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-2.fc6
 - Update i810 to 1.6.5, should fix DRI.
 - Add kuzdu requires.



From fedora-cvs-commits at redhat.com  Thu Aug 17 16:01:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 12:01:12 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.145,1.146
Message-ID: <200608171601.k7HG1CPj000864@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv745

Modified Files:
	redhat-artwork.spec 
Log Message:
change gtk theme



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- redhat-artwork.spec	15 Aug 2006 14:44:15 -0000	1.145
+++ redhat-artwork.spec	17 Aug 2006 16:01:09 -0000	1.146
@@ -3,7 +3,7 @@
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
-Version: 5.0.1
+Version: 5.0.2
 Release: 1%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
@@ -170,7 +170,10 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
-* Tue Aug 15 2006 Matthias Clasen <mclasen at redhat.com> - 5.0.1-1.fc5
+* Thu Aug 17 2006 Matthias Clasen <mclasen at redhat.com> - 5.0.2-1.fc6
+- Change the default gtk theme
+
+* Tue Aug 15 2006 Matthias Clasen <mclasen at redhat.com> - 5.0.1-1.fc6
 - Fix gnome-spinner-rest.png size
 
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 5.0.0-2.fc6



From fedora-cvs-commits at redhat.com  Thu Aug 17 16:06:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 12:06:12 -0400
Subject: rpms/redhat-artwork/devel .cvsignore,1.78,1.79 sources,1.82,1.83
Message-ID: <200608171606.k7HG6CDc001589@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1541

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	15 Aug 2006 14:44:15 -0000	1.78
+++ .cvsignore	17 Aug 2006 16:06:10 -0000	1.79
@@ -2,3 +2,4 @@
 RHEL-gdm-theme-0.2.tar.gz
 post-install-sources.tar.gz
 redhat-artwork-5.0.1.tar.gz
+redhat-artwork-5.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	15 Aug 2006 14:44:15 -0000	1.82
+++ sources	17 Aug 2006 16:06:10 -0000	1.83
@@ -1,3 +1,3 @@
 cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
 f0a23d501ba5d5fef7338decd0b3608c  post-install-sources.tar.gz
-d3cc9b8faa145c2281b43722f10d0574  redhat-artwork-5.0.1.tar.gz
+dec75a5fb37813af77c347ec4817bb21  redhat-artwork-5.0.2.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 17 16:34:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 12:34:02 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.17,
	1.18 setroubleshoot.logrotate, 1.2, 1.3 setroubleshoot.spec,
	1.22, 1.23 sources, 1.20, 1.21
Message-ID: <200608171634.k7HGY2Lr024167@cvs.devel.redhat.com>

Author: jdennis

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24124/devel

Modified Files:
	.cvsignore setroubleshoot.logrotate setroubleshoot.spec 
	sources 
Log Message:
auto-import setroubleshoot-0.23-1 on branch devel from setroubleshoot-0.23-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	11 Aug 2006 16:17:47 -0000	1.17
+++ .cvsignore	17 Aug 2006 16:34:00 -0000	1.18
@@ -1 +1 @@
-setroubleshoot-0.21.tar.gz
+setroubleshoot-0.23.tar.gz


Index: setroubleshoot.logrotate
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setroubleshoot.logrotate	24 Jul 2006 14:55:43 -0000	1.2
+++ setroubleshoot.logrotate	17 Aug 2006 16:34:00 -0000	1.3
@@ -1,4 +1,4 @@
-/var/log/setroubleshoot/setroubleshoot.log {
+/var/log/setroubleshoot/*.log {
     weekly
     rotate 2
     missingok


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- setroubleshoot.spec	12 Aug 2006 06:27:34 -0000	1.22
+++ setroubleshoot.spec	17 Aug 2006 16:34:00 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.21
-Release: 2
+Version: 0.23
+Release: 1
 License: GPL
 Group: Applications/System
 URL: http://www.redhat.com/ 
@@ -24,17 +24,22 @@
 %define pkgconfigdir  %{_sysconfdir}/%{name}
 %define pkglogdir     %{_localstatedir}/log/%{name}
 
+Requires: audit >= audit-1.2.5-7
 Requires: libselinux >= 1.30.15-1
 Requires: pygtk2 >= 2.9.2
 Requires: notify-python
 
 BuildRequires: intltool gettext python
 
-Requires(post):   /sbin/chkconfig, /usr/bin/update-desktop-database
-Requires(postun): /usr/bin/update-desktop-database
+Requires(post):   /sbin/chkconfig
+Requires(post):   /sbin/service
+Requires(post):   /usr/bin/update-desktop-database
+
 Requires(preun):  /sbin/chkconfig
 Requires(preun):  /sbin/service
 
+Requires(postun): /usr/bin/update-desktop-database
+
 %description
 Provides tools to help diagnose SELinux problems. When AVC messages
 are generated an alert can be generated that will give information
@@ -57,8 +62,7 @@
 %post
 /usr/bin/update-desktop-database %{_datadir}/applications
 /sbin/chkconfig --add %{name}
-[ -x /sbin/service ] && /sbin/service %{name} condrestart
-exit 0
+/sbin/service %{name} condrestart >/dev/null 2>&1
 
 %preun
 if [ $1 = 0 ]; then
@@ -72,7 +76,6 @@
 
 %postun 
 /usr/bin/update-desktop-database %{_datadir}/applications
-exit 0
 
 %clean
 rm -rf %{buildroot}
@@ -85,7 +88,7 @@
 %{pkgpythondir}
 %{pkgdatadir}
 %config(noreplace) %{pkgconfigdir}/%{name}.cfg
-%dir %{pkglogdir}
+%dir %attr(0777,root,root) %{pkglogdir}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %dir %{pkgrundir}
 %dir %{pkgvardatadir}
@@ -95,8 +98,10 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
-* Sat Aug 12 2006 Florian La Roche <laroche at redhat.com> - 0.20-2
-	* add more deps for post/postun scripts
+* Thu Aug 17 2006 John Dennis <jdennis at redhat.com> - 0.23-1
+
+	* fix for bug #202206, require correct version of audit,
+	fixes for audit connection.
 
 * Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> - 0.20-1
 	* add html support


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	11 Aug 2006 16:17:47 -0000	1.20
+++ sources	17 Aug 2006 16:34:00 -0000	1.21
@@ -1 +1 @@
-c3373dbc83f2fc46d78a5777ae672ace  setroubleshoot-0.21.tar.gz
+540558c05691d20bb47a0eebc5b0be66  setroubleshoot-0.23.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 17 17:47:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 13:47:39 -0400
Subject: rpms/libvirt/devel uuid_parse.patch, NONE, 1.1 libvirt.spec, 1.22,
	1.23
Message-ID: <200608171747.k7HHldDt000904@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31507

Modified Files:
	libvirt.spec 
Added Files:
	uuid_parse.patch 
Log Message:
Fix a uuid parsing bug, Daniel


uuid_parse.patch:
 xml.c |   81 +++++++++++++++++++++++++++++++-----------------------------------
 1 files changed, 39 insertions(+), 42 deletions(-)

--- NEW FILE uuid_parse.patch ---
Index: src/xml.c
===================================================================
RCS file: /data/cvs/libxen/src/xml.c,v
retrieving revision 1.34
diff -u -r1.34 xml.c
--- src/xml.c	16 Aug 2006 16:33:55 -0000	1.34
+++ src/xml.c	17 Aug 2006 18:38:45 -0000
@@ -1254,59 +1254,56 @@
 
 unsigned char *virParseUUID(char **ptr, const char *uuid) {
     int rawuuid[16];
+    const char *cur;
     unsigned char *dst_uuid = NULL;
-    int ret;
     int i;
 
-    memset(rawuuid, 0xFF, sizeof(rawuuid));
-
     if (uuid == NULL)
         goto error;
 
-    ret = sscanf(uuid,
-                 "%02x%02x%02x%02x"
-                 "%02x%02x%02x%02x"
-                 "%02x%02x%02x%02x"
-                 "%02x%02x%02x%02x",
-                 rawuuid + 0, rawuuid + 1, rawuuid + 2, rawuuid + 3,
-                 rawuuid + 4, rawuuid + 5, rawuuid + 6, rawuuid + 7,
-                 rawuuid + 8, rawuuid + 9, rawuuid + 10, rawuuid + 11,
-                 rawuuid + 12, rawuuid + 13, rawuuid + 14, rawuuid + 15);
-    if (ret == 16)
-        goto done;
-
-    ret = sscanf(uuid,
-                 "%02x%02x%02x%02x-"
-                 "%02x%02x-"
-                 "%02x%02x-"
-                 "%02x%02x-"
-                 "%02x%02x%02x%02x%02x%02x",
-                 rawuuid + 0, rawuuid + 1, rawuuid + 2, rawuuid + 3,
-                 rawuuid + 4, rawuuid + 5, rawuuid + 6, rawuuid + 7,
-                 rawuuid + 8, rawuuid + 9, rawuuid + 10, rawuuid + 11,
-                 rawuuid + 12, rawuuid + 13, rawuuid + 14, rawuuid + 15);
-    if (ret == 16)
-        goto done;
-
-    ret = sscanf(uuid,
-                 "%02x%02x%02x%02x-"
-                 "%02x%02x%02x%02x-"
-                 "%02x%02x%02x%02x-"
-                 "%02x%02x%02x%02x",
-                 rawuuid + 0, rawuuid + 1, rawuuid + 2, rawuuid + 3,
-                 rawuuid + 4, rawuuid + 5, rawuuid + 6, rawuuid + 7,
-                 rawuuid + 8, rawuuid + 9, rawuuid + 10, rawuuid + 11,
-                 rawuuid + 12, rawuuid + 13, rawuuid + 14, rawuuid + 15);
-    if (ret != 16)
-        goto error;
+    /*
+     * do a liberal scan allowing '-' and ' ' anywhere between character
+     * pairs as long as there is 32 of them in the end.
+     */
+    cur = uuid;
+    for (i = 0;i < 16;) {
+        rawuuid[i] = 0;
+        if (*cur == 0)
+	    goto error;
+	if ((*cur == '-') || (*cur == ' ')) {
+	    cur++;
+	    continue;
+	}
+	if ((*cur >= '0') && (*cur <= '9'))
+	    rawuuid[i] = *cur - '0';
+	else if ((*cur >= 'a') && (*cur <= 'f'))
+	    rawuuid[i] = *cur - 'a' + 10;
+	else if ((*cur >= 'A') && (*cur <= 'F'))
+	    rawuuid[i] = *cur - 'A' + 10;
+	else
+	    goto error;
+	rawuuid[i] *= 16;
+	cur++;
+        if (*cur == 0)
+	    goto error;
+	if ((*cur >= '0') && (*cur <= '9'))
+	    rawuuid[i] += *cur - '0';
+	else if ((*cur >= 'a') && (*cur <= 'f'))
+	    rawuuid[i] += *cur - 'a' + 10;
+	else if ((*cur >= 'A') && (*cur <= 'F'))
+	    rawuuid[i] += *cur - 'A' + 10;
+	else
+	    goto error;
+        i++;
+	cur++;
+    }
 
-  done:
     dst_uuid = (unsigned char *) *ptr;
     *ptr += 16;
 
     for (i = 0; i < 16; i++)
         dst_uuid[i] = rawuuid[i] & 0xFF;
 
-  error:
-    return dst_uuid;
+error:
+    return(dst_uuid);
 }


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libvirt.spec	16 Aug 2006 17:15:20 -0000	1.22
+++ libvirt.spec	17 Aug 2006 17:47:37 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
 Version: 0.1.4
-Release: 1
+Release: 2
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -18,6 +18,7 @@
 BuildRequires: ncurses-devel
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64 ia64
+Patch0: uuid_parse.patch
 
 %description
 This C library provides an API to use the Xen virtualization framework,
@@ -47,6 +48,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
@@ -107,6 +109,9 @@
 %doc docs/examples/python
 
 %changelog
+* Thu Aug 17 2006 Daniel Veillard <veillard at redhat.com> 0.1.4-2
+- patch to fix virParseUUID()
+
 * Wed Aug 16 2006 Daniel Veillard <veillard at redhat.com> 0.1.4-1
 - vCPUs and affinity support
 - more complete XML, console and boot options



From fedora-cvs-commits at redhat.com  Thu Aug 17 17:52:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 13:52:09 -0400
Subject: rpms/parted/devel parted-1.7.1-gpt.patch, NONE,
	1.1 parted-1.7.1-O_DIRECT.patch, 1.2, 1.3 parted.spec, 1.81, 1.82
Message-ID: <200608171752.k7HHq9f9001021@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1003

Modified Files:
	parted-1.7.1-O_DIRECT.patch parted.spec 
Added Files:
	parted-1.7.1-gpt.patch 
Log Message:
- Updated O_DIRECT patch to work around s390 problems
- Update LastUsableLBA on GPT-labeled disks after LUN resize (#194238)
- Fix exception when backup GPT table is not in the correction location
  and parted tries to move it (#194238)


parted-1.7.1-gpt.patch:
 libparted/labels/gpt.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 parted/ui.c            |    2 +-
 2 files changed, 47 insertions(+), 3 deletions(-)

--- NEW FILE parted-1.7.1-gpt.patch ---
--- parted-1.7.1/libparted/labels/gpt.c.gpt	2006-05-25 13:28:55.000000000 -0400
+++ parted-1.7.1/libparted/labels/gpt.c	2006-08-17 13:44:17.000000000 -0400
@@ -607,11 +607,13 @@
 }
 
 static int
-_parse_header (PedDisk* disk, GuidPartitionTableHeader_t* gpt)
+_parse_header (PedDisk* disk, GuidPartitionTableHeader_t* gpt, int *update_needed)
 { 
 	GPTDiskData* gpt_disk_data = disk->disk_specific;
 	PedSector first_usable;
 	PedSector last_usable;
+	PedSector last_usable_if_grown, last_usable_min_default;
+	static int asked_already;
 
 	PED_ASSERT (_header_is_valid (disk->dev, gpt), return 0);
 
@@ -633,8 +635,50 @@
 
 	first_usable = PED_CPU_TO_LE64 (gpt->FirstUsableLBA);
 	last_usable = PED_CPU_TO_LE64 (gpt->LastUsableLBA);
+
+	/*
+	 * Need to check whether the volume has grown, the LastUsableLBA is
+	 * normally set to disk->dev->length - 2 - ptes_size (at least for parted
+	 * created volumes), where ptes_size is the number of entries * 
+	 * size of each entry / sector size or 16k / sector size, whatever the
+	 * greater.  If the volume has grown, offer the user the chance to use
+	 * the new space or continue with the current usable area.  Only ask once
+	 * per parted invocation.
+	 */
+
+	last_usable_if_grown =
+		PED_CPU_TO_LE64 (disk->dev->length - 2 - 
+		((PedSector)(PED_CPU_TO_LE32(gpt->NumberOfPartitionEntries)) * 
+		(PedSector)(PED_CPU_TO_LE32(gpt->SizeOfPartitionEntry)) / 
+		disk->dev->sector_size));
+
+	last_usable_min_default = disk->dev->length - 2 - 
+		GPT_DEFAULT_PARTITION_ENTRY_ARRAY_SIZE / disk->dev->sector_size;
+
+	if (last_usable_if_grown > last_usable_min_default)
+		last_usable_if_grown = last_usable_min_default;
+
 	PED_ASSERT (last_usable > first_usable, return 0);
 	PED_ASSERT (last_usable <= disk->dev->length, return 0);
+
+	PED_ASSERT (last_usable_if_grown > first_usable, return 0);
+	PED_ASSERT (last_usable_if_grown <= disk->dev->length, return 0);
+
+	if (!asked_already && last_usable < last_usable_if_grown) {
+		int q = ped_exception_throw(PED_EXCEPTION_WARNING,
+		                            PED_EXCEPTION_FIX | PED_EXCEPTION_IGNORE,
+		                            _("Not all of the space available to this "
+		                              "disk appears to be used, you can fix "
+		                              "the GPT to use all of the space or "
+		                              "continue with the current setting? "));
+		if (q == PED_EXCEPTION_FIX) {
+			last_usable = last_usable_if_grown;
+			*update_needed = 1;
+		}
+
+		asked_already = 1;
+	}
+
 	ped_geometry_init (&gpt_disk_data->data_area, disk->dev,
 			   first_usable, last_usable - first_usable + 1);
 
@@ -795,7 +839,7 @@
 		}
 	}
 
-	if (!_parse_header (disk, gpt))
+	if (!_parse_header (disk, gpt, &write_back))
 		goto error_free_gpt;
 
 
--- parted-1.7.1/parted/ui.c.gpt	2006-05-25 13:28:42.000000000 -0400
+++ parted-1.7.1/parted/ui.c	2006-08-17 12:11:30.000000000 -0400
@@ -1027,13 +1027,13 @@
 
 	opt = PED_EXCEPTION_OPTION_FIRST;
 	while (1) {
-		opt = option_get_next (options, opt);
 		if (strcmp (opt_name,
 			    ped_exception_get_option_string (opt)) == 0)
 			break;
 		if (strcmp (opt_name,
 			    _(ped_exception_get_option_string (opt))) == 0)
 			break;
+		opt = option_get_next (options, opt);
 	}
 	free (opt_name);
 	return opt;

parted-1.7.1-O_DIRECT.patch:
 linux.c |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)

Index: parted-1.7.1-O_DIRECT.patch
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted-1.7.1-O_DIRECT.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- parted-1.7.1-O_DIRECT.patch	22 Jun 2006 18:35:07 -0000	1.2
+++ parted-1.7.1-O_DIRECT.patch	17 Aug 2006 17:52:06 -0000	1.3
@@ -1,5 +1,5 @@
---- parted-1.7.1/libparted/arch/linux.c.o_direct	2006-06-22 14:31:38.000000000 -0400
-+++ parted-1.7.1/libparted/arch/linux.c	2006-06-22 14:32:59.000000000 -0400
+--- parted-1.7.1/libparted/arch/linux.c.o_direct	2006-08-17 11:20:31.000000000 -0400
++++ parted-1.7.1/libparted/arch/linux.c	2006-08-17 11:24:13.000000000 -0400
 @@ -30,6 +30,7 @@
  #include <libgen.h>
  #include <stdint.h>
@@ -8,30 +8,39 @@
  #include <string.h>
  #include <syscall.h>
  #include <unistd.h>
-@@ -1212,7 +1213,7 @@
+@@ -1212,7 +1213,11 @@
                  if (!name)
                          break;
                  if (!_partition_is_mounted_by_path (name)) {
--                        fd = open (name, O_WRONLY, 0);
++#if defined(__s390__) || defined(__s390x__)
+                         fd = open (name, O_WRONLY, 0);
++#else
 +                        fd = open (name, O_WRONLY | O_DIRECT, 0);
++#endif
                          if (fd > 0) {
                                  ioctl (fd, BLKFLSBUF);
                                  close (fd);
-@@ -1228,11 +1229,11 @@
+@@ -1228,11 +1233,19 @@
          LinuxSpecific*  arch_specific = LINUX_SPECIFIC (dev);
  
  retry:
--        arch_specific->fd = open (dev->path, O_RDWR);
++#if defined(__s390__) || defined(__s390x__)
+         arch_specific->fd = open (dev->path, O_RDWR);
++#else
 +        arch_specific->fd = open (dev->path, O_RDWR | O_DIRECT);
++#endif
          if (arch_specific->fd == -1) {
                  char*   rw_error_msg = strerror (errno);
  
--                arch_specific->fd = open (dev->path, O_RDONLY);
++#if defined(__s390__) || defined(__s390x__)
+                 arch_specific->fd = open (dev->path, O_RDONLY);
++#else
 +                arch_specific->fd = open (dev->path, O_RDONLY | O_DIRECT);
++#endif
                  if (arch_specific->fd == -1) {
                          if (ped_exception_throw (
                                  PED_EXCEPTION_ERROR,
-@@ -1375,6 +1376,7 @@
+@@ -1375,6 +1388,7 @@
          int                     status;
          PedExceptionOption      ex_status;
          size_t                  read_length = count * dev->sector_size;
@@ -39,7 +48,7 @@
  
          PED_ASSERT (dev->sector_size % 512 == 0, return 0);
  
-@@ -1412,8 +1414,12 @@
+@@ -1412,8 +1426,12 @@
                  }
          }
  
@@ -53,7 +62,7 @@
                  if (status == count * dev->sector_size) break;
                  if (status > 0) {
                          read_length -= status;
-@@ -1430,6 +1436,7 @@
+@@ -1430,6 +1448,7 @@
  
                  switch (ex_status) {
                          case PED_EXCEPTION_IGNORE:
@@ -61,7 +70,7 @@
                                  return 1;
  
                          case PED_EXCEPTION_RETRY:
-@@ -1438,9 +1445,11 @@
+@@ -1438,9 +1457,11 @@
                          case PED_EXCEPTION_UNHANDLED:
                                  ped_exception_catch ();
                          case PED_EXCEPTION_CANCEL:
@@ -73,7 +82,7 @@
  
          return 1;
  }
-@@ -1486,6 +1495,8 @@
+@@ -1486,6 +1507,8 @@
          int                     status;
          PedExceptionOption      ex_status;
          size_t                  write_length = count * dev->sector_size;
@@ -82,7 +91,7 @@
  
          PED_ASSERT(dev->sector_size % 512 == 0, return 0);
  
-@@ -1539,12 +1550,16 @@
+@@ -1539,12 +1562,16 @@
                  dev->path, buffer, (int) start, (int) count);
  #else
          dev->dirty = 1;
@@ -101,7 +110,7 @@
                          continue;
                  }
  
-@@ -1556,6 +1571,7 @@
+@@ -1556,6 +1583,7 @@
  
                  switch (ex_status) {
                          case PED_EXCEPTION_IGNORE:
@@ -109,7 +118,7 @@
                                  return 1;
  
                          case PED_EXCEPTION_RETRY:
-@@ -1564,9 +1580,11 @@
+@@ -1564,9 +1592,11 @@
                          case PED_EXCEPTION_UNHANDLED:
                                  ped_exception_catch ();
                          case PED_EXCEPTION_CANCEL:
@@ -121,7 +130,7 @@
  #endif /* !READ_ONLY */
          return 1;
  }
-@@ -1579,18 +1597,25 @@
+@@ -1579,18 +1609,25 @@
          LinuxSpecific*  arch_specific = LINUX_SPECIFIC (dev);
          PedSector       done = 0;
          int             status;


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- parted.spec	15 Aug 2006 20:04:16 -0000	1.81
+++ parted.spec	17 Aug 2006 17:52:06 -0000	1.82
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.7.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0: parted-1.7.0-fat.c.patch
 Patch1: parted-1.7.0-sx8.patch
@@ -15,6 +15,7 @@
 Patch7: parted-1.7.1-vtoc-errbuf.patch
 Patch8: parted-1.7.1-O_DIRECT.patch
 Patch9: parted-1.7.1-get_exception.patch
+Patch10: parted-1.7.1-gpt.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -51,10 +52,9 @@
 %patch5 -p1 -b .dm
 %patch6 -p1 -b .aix
 %patch7 -p1 -b .vtoc_errbuf
-%ifnarch s390 s390x
 %patch8 -p1 -b .o_direct
-%endif
 %patch9 -p1 -b .get_exception
+%patch10 -p1 -b .gpt
 
 iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_
 mv doc/pt_BR-parted.8_ doc/pt_BR-parted.8
@@ -108,6 +108,12 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Aug 17 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-12
+- Updated O_DIRECT patch to work around s390 problems
+- Update LastUsableLBA on GPT-labeled disks after LUN resize (#194238)
+- Fix exception when backup GPT table is not in the correction location
+  and parted tries to move it (#194238)
+
 * Tue Aug 15 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-11
 - Expand error buffer to 8192 bytes in vtoc_error()
 - Do not apply O_DIRECT patch on S/390 or S/390x platforms



From fedora-cvs-commits at redhat.com  Thu Aug 17 18:25:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 14:25:37 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.123, 1.124 kudzu.spec, 1.141,
	1.142 sources, 1.139, 1.140
Message-ID: <200608171825.k7HIPb9Z032047@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32008

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- .cvsignore	9 Aug 2006 17:52:36 -0000	1.123
+++ .cvsignore	17 Aug 2006 18:25:34 -0000	1.124
@@ -1 +1 @@
-kudzu-1.2.42.tar.gz
+kudzu-1.2.43.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- kudzu.spec	9 Aug 2006 18:32:13 -0000	1.141
+++ kudzu.spec	17 Aug 2006 18:25:34 -0000	1.142
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.42
+Version: 1.2.43
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Thu Aug 17 2006 Bill Nottingham <notting at redhat.com> - 1.2.43-1
+- fix the fix for #195934
+
 * Wed Aug  9 2006 Bill Nottingham <notting at redhat.com> - 1.2.42-1
 - always insert aliases at head of list (<ajackson at redhat.com>)
 - don't parse videoaliases that don't end in .xinf (<ajackson at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- sources	9 Aug 2006 18:50:31 -0000	1.139
+++ sources	17 Aug 2006 18:25:34 -0000	1.140
@@ -1 +1 @@
-b0b65938cd87ccfb2c6fd790baccf052  kudzu-1.2.42.tar.gz
+79b14dc7f6e4c6c938f05085bdd9df09  kudzu-1.2.43.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 17 18:26:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 14:26:55 -0400
Subject: rpms/eclipse/devel eclipse-tomcat55.patch, 1.7, 1.8 eclipse.spec,
	1.310, 1.311
Message-ID: <200608171826.k7HIQtMP032656@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32587

Modified Files:
	eclipse-tomcat55.patch eclipse.spec 
Log Message:
* Thu Aug 17 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_12fc
- Fix tomcat55 patch to not conflict with wst.ws (commons-logging visibility).


eclipse-tomcat55.patch:
 .classpath                                                   |   45 
 META-INF/MANIFEST.MF                                         |  117 -
 build.properties                                             |    2 
 src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java |   51 
 src/org/eclipse/tomcat/internal/TomcatAppServer.java         | 1254 +++++------
 src/org/eclipse/tomcat/internal/TomcatPlugin.java            |    3 
 6 files changed, 800 insertions(+), 672 deletions(-)

Index: eclipse-tomcat55.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-tomcat55.patch	10 Aug 2006 19:24:51 -0000	1.7
+++ eclipse-tomcat55.patch	17 Aug 2006 18:26:52 -0000	1.8
@@ -1524,12 +1524,11 @@
  Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin
  Bundle-Vendor: %providerName
  Bundle-Localization: plugin
-@@ -33,6 +35,74 @@
+@@ -33,6 +35,73 @@
   org.apache.ant;bundle-version="[1.6.5,1.7.0)";resolution:=optional,
   org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
  Eclipse-LazyStart: true
 -Export-Package: org.eclipse.tomcat.internal;x-internal:=true,
-+Eclipse-BuddyPolicy: global
 +Export-Package: javax.management;x-internal:=true,
 + javax.management.loading;x-internal:=true,
 + javax.management.modelmbean;x-internal:=true,


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- eclipse.spec	10 Aug 2006 22:06:10 -0000	1.310
+++ eclipse.spec	17 Aug 2006 18:26:52 -0000	1.311
@@ -41,7 +41,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_11fc
+Release:        1jpp_12fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1641,6 +1641,9 @@
 %endif
 
 %changelog
+* Thu Aug 17 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_12fc
+- Fix tomcat55 patch to not conflict with wst.ws (commons-logging visibility).
+
 * Thu Aug 10 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_11fc
 - Fix eclipse-tomcat55.patch and eclipse-tomcat55-build.patch to not reference
   jars that don't exist.



From fedora-cvs-commits at redhat.com  Thu Aug 17 19:31:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 15:31:44 -0400
Subject: rpms/pango/devel pango.spec,1.80,1.81
Message-ID: <200608171931.k7HJVWxX015895@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15783

Modified Files:
	pango.spec 
Log Message:
- Bump glib requirement to 2.12.0. (bug #201586)



Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- pango.spec	9 Aug 2006 06:06:20 -0000	1.80
+++ pango.spec	17 Aug 2006 19:31:29 -0000	1.81
@@ -1,4 +1,4 @@
-%define glib2_base_version 2.10.0
+%define glib2_base_version 2.12.0
 %define glib2_version %{glib2_base_version}-1
 %define pkgconfig_version 0.12
 %define freetype_version 2.1.3-3
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.14.0
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Thu Aug 17 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.14.0-3
+- Bump glib requirement to 2.12.0. (bug #201586)
+
 * Wed Aug 07 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.14.0-2
 - Incorrect sources in last update.  Fix.
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 19:35:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 15:35:43 -0400
Subject: rpms/dmraid/devel dmraid.spec,1.57,1.58
Message-ID: <200608171935.k7HJZhBV016582@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16518

Modified Files:
	dmraid.spec 
Log Message:
- get rid of excludearch



Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- dmraid.spec	28 Jul 2006 20:19:06 -0000	1.57
+++ dmraid.spec	17 Aug 2006 19:35:29 -0000	1.58
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc11
-Release: FC6.2
+Release: FC6.3
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -19,9 +19,6 @@
 Patch2: dmraid-1.0.0.rc11-hpt37x-errorlog.patch
 Patch3: dmraid-1.0.0.rc11-dupes.patch
 
-ExcludeArch:	s390
-ExcludeArch:	s390x
-
 %description
 DMRAID supports RAID device discovery, RAID set activation and display of
 properties for ATARAID on Linux >= 2.4 using device-mapper.
@@ -81,6 +78,9 @@
 %{_libdir}/libdmraid.so
 
 %changelog
+* Thu Aug 17 2006 Peter Jones <pjones at redhat.com> - 1.0.0.rc11-FC6.3
+- No more excludearch for s390/s390x
+
 * Fri Jul 28 2006 Peter Jones <pjones at redhat.com> - 1.0.0.rc11-FC6.2
 - Fix bounds checking on hpt37x error log
 - Only build the .so, not the .a



From fedora-cvs-commits at redhat.com  Thu Aug 17 19:46:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 15:46:37 -0400
Subject: rpms/python-pyblock/devel .cvsignore, 1.16, 1.17 python-pyblock.spec,
	1.27, 1.28 sources, 1.20, 1.21
Message-ID: <200608171946.k7HJkbYc025635@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/python-pyblock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24530

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
- get rid of s390 excludearch



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	3 Aug 2006 22:26:43 -0000	1.16
+++ .cvsignore	17 Aug 2006 19:46:35 -0000	1.17
@@ -1,2 +1 @@
-pyblock-0.17.tar.bz2
 pyblock-0.18.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- python-pyblock.spec	3 Aug 2006 22:26:43 -0000	1.27
+++ python-pyblock.spec	17 Aug 2006 19:46:35 -0000	1.28
@@ -1,12 +1,12 @@
 %define realname pyblock
 %define pyver %(%{__python} -c "import sys; print sys.version[:3]")
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)[1:]")}
-%define dmrver 1.0.0.rc11-FC6.2
+%define dmrver 1.0.0.rc11-FC6.3
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
 Version: 0.18
-Release: 1
+Release: 2
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
@@ -17,8 +17,6 @@
 Requires: python >= %{pyver}, device-mapper >= 1.01.04, libselinux
 Requires: libbdevid, libbdevid-python, dmraid >= %{dmrver}
 
-excludearch: s390 s390x
-
 %description
 The pyblock contains Python modules for dealing with block devices.
 
@@ -41,6 +39,9 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Thu Aug 17 2006 Peter Jones <pjones at redhat.com> - 0.18-2
+- No s390/s390x excludearch
+
 * Thu Aug  3 2006 Peter Jones <pjones at redhat.com> - 0.18-1
 - Fixes for multiple multipaths
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	3 Aug 2006 22:26:43 -0000	1.20
+++ sources	17 Aug 2006 19:46:35 -0000	1.21
@@ -1,2 +1 @@
-0eb2cd51b2d36557c55baf9a1c65870c  pyblock-0.17.tar.bz2
-cbcb850601f4b213f0f074a35dfe3da9  pyblock-0.18.tar.bz2
+c14235f360c01b85f77a225448ffcc12  pyblock-0.18.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 17 20:16:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 16:16:37 -0400
Subject: rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.33,1.34
Message-ID: <200608172016.k7HKGbR4014567@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/jakarta-commons-el/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11847

Modified Files:
	jakarta-commons-el.spec 
Log Message:
Merge with upstream




Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jakarta-commons-el.spec	22 Jul 2006 08:42:19 -0000	1.33
+++ jakarta-commons-el.spec	17 Aug 2006 20:16:34 -0000	1.34
@@ -39,7 +39,7 @@
 
 Name:           %{name}
 Version:        1.0
-Release:        5jpp_4fc
+Release:        7jpp.1
 Epoch:          0
 Summary:        The Jakarta Commons Extension Language
 License:        Apache Software License
@@ -72,7 +72,8 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-PreReq: coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 %if %{gcj_support}
 BuildRequires:		java-gcj-compat-devel
 Requires(post):		java-gcj-compat
@@ -133,8 +134,21 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
+%if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %if %{gcj_support}
+%postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -147,6 +161,7 @@
 %{_javadir}/*
 
 %if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-el-1.0.jar.*
 %endif
 
@@ -156,11 +171,13 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-el-1.0.jar.*
-%endif
-
 %changelog
+* Thu Aug 17 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-7jpp.1
+- Merge with upstream
+
+* Thu Aug 17 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-7jpp
+- Fix AOT support
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0-5jpp_4fc
 - Rebuilt
 
@@ -171,6 +188,9 @@
 - Build with gcj_support enabled
 - Add missing BR for jsp (API)
 
+* Fri May 19 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-6jpp
+- Add AOT support
+
 * Fri May 19 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-5jpp_1fc
 - First build for FC6
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 21:06:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 17:06:57 -0400
Subject: rpms/dmraid/devel dmraid.spec,1.58,1.59
Message-ID: <200608172106.k7HL6vWI028906@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28850

Modified Files:
	dmraid.spec 
Log Message:
change release to follow guidelines



Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- dmraid.spec	17 Aug 2006 19:35:29 -0000	1.58
+++ dmraid.spec	17 Aug 2006 21:06:55 -0000	1.59
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc11
-Release: FC6.3
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -78,6 +78,9 @@
 %{_libdir}/libdmraid.so
 
 %changelog
+* Thu Aug 17 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc11-3
+- Change Release to follow guidelines, and add dist tag.
+
 * Thu Aug 17 2006 Peter Jones <pjones at redhat.com> - 1.0.0.rc11-FC6.3
 - No more excludearch for s390/s390x
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 21:22:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 17:22:12 -0400
Subject: rpms/dhcp/devel dhcp-3.0.4-bz202911.patch, NONE, 1.1 dhcp.spec,
	1.110, 1.111
Message-ID: <200608172122.k7HLMCDn025442@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25399

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-3.0.4-bz202911.patch 
Log Message:
- Fix dhclient on s390x platform (#202911)


dhcp-3.0.4-bz202911.patch:
 dhclient.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE dhcp-3.0.4-bz202911.patch ---
--- dhcp-3.0.4/client/dhclient.c.bz202911	2006-08-17 17:18:21.000000000 -0400
+++ dhcp-3.0.4/client/dhclient.c	2006-08-17 17:19:57.000000000 -0400
@@ -425,14 +425,15 @@
 	}else
 	{
 	    FILE *pidfp=0L;
+	    long temp=0;
 	    pid_t dhcpid=0;
 	    int   dhc_running=0;
 	    char  procfn[256]="";
 	    
 	    if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL ) 	   
 	    {
-		 if( (fscanf(pidfp, "%u", &dhcpid)==1) 
-		   &&(dhcpid > 0)
+		 if( (fscanf(pidfp, "%ld", &temp)==1)
+		   &&( (dhcpid=(pid_t)temp) > 0)
 		    )
 		 {
 		     snprintf(procfn,256,"/proc/%u",dhcpid);


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- dhcp.spec	12 Jul 2006 05:37:07 -0000	1.110
+++ dhcp.spec	17 Aug 2006 21:22:10 -0000	1.111
@@ -4,10 +4,10 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.4
-Release: 17.1
+Release: 18%{?dist}
 Epoch:   12
 License: distributable
-Group: System Environment/Daemons
+Group:   System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
 Source1: dhcpd.conf.sample
 Source2: dhcpd.init
@@ -16,8 +16,8 @@
 Source5: findptrsize.c
 Source6: libdhcp4client.pc
 Source7: dhcptables.pl
-#
-Patch: 	  dhcp-3.0-alignment.patch
+
+Patch:    dhcp-3.0-alignment.patch
 Patch100: dhcp-3.0-jbuild.patch
 Patch102: dhcp-3.0.1rc13-dhcpctlman.patch
 Patch103: dhcp-3.0pl1-miscfixes.patch
@@ -89,13 +89,14 @@
 Patch176: dhcp-3.0.4-dhclient-R_option.patch
 Patch177: dhcp-3.0.4-dhclient-script-METRIC.patch
 Patch178: dhcp-3.0.4-dhclient-script-ntp-fudge-bz191461.patch
+Patch179: dhcp-3.0.4-bz202911.patch
 
 # patch to make the library subtree
-Patch179: dhcp-3.0.4-lib-makefile.patch
+Patch499: dhcp-3.0.4-lib-makefile.patch
 
-# patches that _must_ go after the split
-Patch180: dhcp-3.0.4-libdhcp4client.patch
-Patch181: dhcp-3.0.4-timeouts.patch
+# patches that _must_ go after the split (in %%build)
+Patch500: dhcp-3.0.4-libdhcp4client.patch
+Patch501: dhcp-3.0.4-timeouts.patch
 
 URL: http://isc.org/products/DHCP/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -142,18 +143,18 @@
 %description devel
 Libraries for interfacing with the ISC DHCP server.
 
-%package -n 	libdhcp4client
+%package -n libdhcp4client
 Summary: The ISC DHCP IPv4 client in a library for invocation from other programs
-Group:   Development/Libraries
+Group: Development/Libraries
 
 %description -n libdhcp4client
-The Internet Software Consortium (ISC) Dynamic Host Configuration Protocol (DHCP)
-Internet Protocol version 4 (IPv4) client software in a library suitable for
-linkage with and invocation by other programs.
+The Internet Software Consortium (ISC) Dynamic Host Configuration Protocol
+(DHCP) Internet Protocol version 4 (IPv4) client software in a library
+suitable for linkage with and invocation by other programs.
 
-%package -n 	libdhcp4client-devel
+%package -n libdhcp4client-devel
 Summary: Header files for development with the ISC DHCP IPv4 client library
-Group:   Development/Libraries
+Group: Development/Libraries
 
 %description -n libdhcp4client-devel
 Header files for development with the Internet Software Consortium (ISC)
@@ -246,7 +247,9 @@
 %patch176 -p1 -b .dhclient-R_option
 %patch177 -p1 -b .dhclient-script-METRIC
 %patch178 -p1 -b .dhclient-script-ntp-fudge-bz191461
-%patch179 -p1 -b .lib-makefile
+%patch179 -p1 -b .bz202911
+
+%patch499 -p1 -b .lib-makefile
 
 cp %SOURCE1 .
 cat <<EOF >site.conf
@@ -287,8 +290,8 @@
 %if %{LIBDHCP4CLIENT}
 sed 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE5 >libdhcp4client.pc
 make -f libdhcp4client.Makefile CC="%{__cc}" libdhcp4client/.
-%patch180 -p1 -b .lib
-%patch181 -p1 -b .timeouts
+%patch500 -p1 -b .lib
+%patch501 -p1 -b .timeouts
 # can't handle make -j yet!
 %endif
 
@@ -496,6 +499,9 @@
 %endif
 
 %changelog
+* Thu Aug 17 2006 David Cantrell <dcantrell at redhat.com> - 12:3.0.4-18
+- Fix dhclient on s390x platform (#202911)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 12:3.0.4-17.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 21:42:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 17:42:43 -0400
Subject: rpms/dhcp/devel dhcp-3.0.4-lib-makefile.patch, 1.1, 1.2 dhcp.spec,
	1.111, 1.112
Message-ID: <200608172142.k7HLghp4031271@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31232

Modified Files:
	dhcp-3.0.4-lib-makefile.patch dhcp.spec 
Log Message:
- Fix mkdir problem in libdhcp4client.Makefile


dhcp-3.0.4-lib-makefile.patch:
 libdhcp4client.Makefile |   67 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 67 insertions(+)

Index: dhcp-3.0.4-lib-makefile.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.4-lib-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.4-lib-makefile.patch	22 Jun 2006 18:17:27 -0000	1.1
+++ dhcp-3.0.4-lib-makefile.patch	17 Aug 2006 21:42:38 -0000	1.2
@@ -1,5 +1,5 @@
---- /dev/null	2006-06-15 21:25:35.725506500 -0400
-+++ dhcp-3.0.4/libdhcp4client.Makefile	2006-06-22 12:06:40.000000000 -0400
+--- /dev/null	2006-08-17 10:23:48.398308852 -0400
++++ dhcp-3.0.4/libdhcp4client.Makefile	2006-08-17 17:39:05.000000000 -0400
 @@ -0,0 +1,67 @@
 +#
 +# Makefile for libdhcp4client
@@ -24,7 +24,7 @@
 +	rm -rf libdhcp4client/ libdhcp4client.a libdhcp4client.so.1 includes/libdhcp_control.h 
 +
 +libdhcp4client/.:	$(patsubst %,$(WORK)/%,$(MAKS) $(SRCS))
-+	mkdir libdhcp4client
++	mkdir -p libdhcp4client
 +	for x in client $(LIBS) ; do cp -avL $(WORK)/$$x libdhcp4client/$$x || :; done
 +	sed -i -e '/^CC_OPTIONS\ =/{s/$$/ -DLIBDHCP/;s/-fpie/-fPIC/;s/-O2/-Os/}' libdhcp4client/*/Makefile
 +


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- dhcp.spec	17 Aug 2006 21:22:10 -0000	1.111
+++ dhcp.spec	17 Aug 2006 21:42:39 -0000	1.112
@@ -4,7 +4,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.4
-Release: 18%{?dist}
+Release: 19%{?dist}
 Epoch:   12
 License: distributable
 Group:   System Environment/Daemons
@@ -499,6 +499,9 @@
 %endif
 
 %changelog
+* Thu Aug 17 2006 David Cantrell <dcantrell at redhat.com> - 12:3.0.4-19
+- Fix mkdir problem in libdhcp4client.Makefile
+
 * Thu Aug 17 2006 David Cantrell <dcantrell at redhat.com> - 12:3.0.4-18
 - Fix dhclient on s390x platform (#202911)
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 21:43:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 17:43:41 -0400
Subject: rpms/python/devel python.spec,1.86,1.87
Message-ID: <200608172143.k7HLhfui031515@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31492

Modified Files:
	python.spec 
Log Message:
Fixed bug #201434


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- python.spec	21 Jul 2006 12:41:54 -0000	1.86
+++ python.spec	17 Aug 2006 21:43:38 -0000	1.87
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -330,6 +330,9 @@
 #endif
 EOF
 
+# Fix for bug 201434: make sure distutils looks at the right pyconfig.h file
+sed -i -e "s/'pyconfig.h'/'%{_pyconfig_h}'/" $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/distutils/sysconfig.py
+
 %clean
 rm -fr $RPM_BUILD_ROOT
 
@@ -396,6 +399,10 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Thu Aug 17 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-15
+- Fixed bug #201434 (distutils.sysconfig is confused by the change to make
+  python-devel multilib friendly)
+
 * Fri Jul 21 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-14
 - Fixed bug #198971 (case conversion not locale safe in logging library)
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 21:52:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 17:52:26 -0400
Subject: rpms/dhcp/devel dhcp.spec, 1.112,
	1.113 dhcp-3.0.1-host_dereference.patch, 1.2,
	NONE dhcp-3.0.1-mis_host.patch, 1.1,
	NONE dhcp-3.0.1-new-host.patch, 1.2,
	NONE dhcp-3.0.1-restrict-unconfigured-IF.patch, 1.1,
	NONE dhcp-3.0.1.preserve-sent-options.patch, 1.1,
	NONE dhcp-3.0.2-uint8_binding_state.patch, 1.1,
	NONE dhcp-3.0.2rc3-fix-hex.patch, 1.1,
	NONE dhcp-3.0.2rc3-mem.patch, 1.1,
	NONE dhcp-3.0.3-bz176615.patch, 1.2,
	NONE dhcp-3.0.3-gcc4_warnings.patch, 1.1,
	NONE dhcp-3.0.3-rt15293_bz160655.patch, 1.1,
	NONE dhcp-3.0.3-trailing_nul_options.patch, 1.1,
	NONE dhcp-3.0.3-trailing_nul_options_2.patch, 1.1,
	NONE dhcp-3.0.3rc1-boot-file-server.patch, 1.1,
	NONE dhcp-3.0.3rc1-no-__u16.patch, 1.1, NONE
Message-ID: <200608172152.k7HLqQtn016039@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15909

Modified Files:
	dhcp.spec 
Removed Files:
	dhcp-3.0.1-host_dereference.patch dhcp-3.0.1-mis_host.patch 
	dhcp-3.0.1-new-host.patch 
	dhcp-3.0.1-restrict-unconfigured-IF.patch 
	dhcp-3.0.1.preserve-sent-options.patch 
	dhcp-3.0.2-uint8_binding_state.patch 
	dhcp-3.0.2rc3-fix-hex.patch dhcp-3.0.2rc3-mem.patch 
	dhcp-3.0.3-bz176615.patch dhcp-3.0.3-gcc4_warnings.patch 
	dhcp-3.0.3-rt15293_bz160655.patch 
	dhcp-3.0.3-trailing_nul_options.patch 
	dhcp-3.0.3-trailing_nul_options_2.patch 
	dhcp-3.0.3rc1-boot-file-server.patch 
	dhcp-3.0.3rc1-no-__u16.patch 
Log Message:
Removed patches that made it upstream or are no longer needed.  See, the point of version control is so we have historical revisions of this stuff and we don't need to clutter the current directory and leave things coommented out in the spec file.



Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- dhcp.spec	17 Aug 2006 21:42:39 -0000	1.112
+++ dhcp.spec	17 Aug 2006 21:52:23 -0000	1.113
@@ -33,17 +33,10 @@
 Patch120: dhcp-3.0.1rc14-noconfig.patch
 Patch121: dhcp-3.0.1-change_resolv_conf.patch
 Patch122: dhcp-3.0.1-default_gateway.patch
-Patch123: dhcp-3.0.1.preserve-sent-options.patch
-Patch124: dhcp-3.0.1-mis_host.patch
-Patch125: dhcp-3.0.1-new-host.patch
-Patch126: dhcp-3.0.1-host_dereference.patch
-Patch127: dhcp-3.0.1-restrict-unconfigured-IF.patch
 Patch128: dhcp-3.0.1-check-empty-new-routers.patch
 Patch129: dhcp-3.0.1-fix-ntp.patch
 Patch130: dhcp-3.0.1-release-mode-ifup.patch
 Patch131: dhcp-3.0.1-dhclient-script-big-fix.patch
-Patch132: dhcp-3.0.2rc3-fix-hex.patch
-Patch133: dhcp-3.0.2rc3-mem.patch
 Patch134: dhcp-3.0.2rc3-dhclient_routes.patch
 Patch135: dhcp-3.0.1-z-relro-now.patch
 Patch136: dhcp-3.0.2rc3-dhclient-restorecon.patch
@@ -58,28 +51,20 @@
 Patch145: dhcp-3.0.2-dhclient-script-dbus-fix-interface.patch
 Patch146: dhcp-3.0.2-dhclient_nodelay.patch
 Patch147: dhcp-3.0.2-dhclient_decline_backoff.patch
-Patch148: dhcp-3.0.2-uint8_binding_state.patch
 Patch149: dhcp-3.0.2-dhclient_script_fast+arping.patch
-Patch150: dhcp-3.0.3rc1-no-__u16.patch
-Patch151: dhcp-3.0.3rc1-boot-file-server.patch
 Patch152: dhcp-3.0.3-fast_dhclient.patch
 Patch153: dhcp-3.0.3-dhclient-script-ypbind-hup-ok.patch
-Patch154: dhcp-3.0.3-trailing_nul_options.patch
-Patch155: dhcp-3.0.3-gcc4_warnings.patch
 Patch156: dhcp-3.0.4-version.patch
 Patch157: dhcp-3.0.3-dhclient-script-up-down-hooks.patch
 Patch158: dhcp-3.0.3-bz167273.patch
 Patch159: dhcp-3.0.3-failover_ports.patch
-Patch160: dhcp-3.0.3-rt15293_bz160655.patch
 Patch161: dhcp-3.0.3-static-routes.patch
 Patch162: dhcp-3.0.3-dhclient_script_route_metrics.patch
 Patch163: dhcp-3.0.3-dhclient-script-bz171312.patch
 Patch164: dhcp-3.0.3-bz167028-ibm-unicast-bootp.patch
-Patch165: dhcp-3.0.3-trailing_nul_options_2.patch
 Patch166: dhcp-3.0.3-bz173619.patch
 Patch167: dhcp-3.0.4-gcc4_warnings.patch
 Patch168: dhcp-3.0.3-bz176270.patch
-Patch169: dhcp-3.0.3-bz176615.patch
 Patch170: dhcp-3.0.3-bz177845.patch
 Patch171: dhcp-3.0.3-bz181482.patch
 Patch172: dhcp-3.0.4-dhcient_ibmzSeries_broadcast.patch
@@ -180,19 +165,10 @@
 %patch120 -p1 -b .noconfig
 %patch121 -p1 -b .change_resolv_conf
 %patch122 -p1 -b .default_gateway
-# patches now upstream:
-# %patch123 -p1 -b .preserve-sent-options
-# %patch124 -p1 -b .mis-host
-# %patch125 -p1 -b .new-host
-# %patch126 -p1 -b .host-dereference
-# %patch127 -p1 -b .restrict-unconfigured-IF
 %patch128 -p1 -b .check-empty-new-routers
 %patch129 -p1 -b .fix-ntp
 %patch130 -p1 -b .release-mode-ifup
 %patch131 -p1 -b .dhclient-script-big-fix
-# patches now upstream:
-# %patch132 -p1 -b .fix-hex
-# %patch133 -p1 -b .mem
 %patch134 -p1 -b .dhclient_routes
 %patch135 -p1 -b .-z-relro-now
 %patch136 -p1 -b .dhclient-restorecon
@@ -209,35 +185,20 @@
 %patch145 -p1 -b .dhclient-script-dbus-fix-interface
 %patch146 -p1 -b .dhclient_no_delay
 %patch147 -p1 -b .dhclient_decline_backoff
-# patch now upstream:
-# %patch148 -p1 -b .uint8_binding_state
 %patch149 -p1 -b .dhclient_script_fast+arping
-# %patch150 -p1 -b .no-__u16
-# ^- patch now upstream
-# %patch151 -p1 -b .boot-file-server
-# ^- RFC2131 compliance: force users to specify either the
-# next-server or server-name options for the tftp-boot-server.
 %patch152 -p1 -b .fast_dhclient
 %patch153 -p1 -b .ypbind_hup_ok
-#%patch154 -p1 -b .trailing_nul_options
-# ! %patch155 -p1 -b .gcc4_warnings
 %patch156 -p1 -b .version
 %patch157 -p1 -b .dhclient-script-up-down-hooks
 %patch158 -p1 -b .bz167273
 %patch159 -p1 -b .failover_ports
-#%patch160 -p1 -b .rt15293_bz160655
-#^- patch now upstream
 %patch161 -p1 -b .static-routes
 %patch162 -p1 -b .dhclient_script_route_metrics
 %patch163 -p1 -b .bz171312
 %patch164 -p1 -b .bz167028
-#%patch165 -p1 -b .trailing_nul_options_2
-#^- patch now upstream
 %patch166 -p1 -b .bz173619
 %patch167 -p1 -b .gcc4_warnings
 %patch168 -p1 -b .bz176270
-# %patch169 -p1 -b .bz176615
-# ^- patch now upstream
 %patch170 -p1 -b .bz177845
 %patch171 -p1 -b .bz181482
 %patch172 -p1 -b .dhclient_ibmzSeries_broadcast


--- dhcp-3.0.1-host_dereference.patch DELETED ---


--- dhcp-3.0.1-mis_host.patch DELETED ---


--- dhcp-3.0.1-new-host.patch DELETED ---


--- dhcp-3.0.1-restrict-unconfigured-IF.patch DELETED ---


--- dhcp-3.0.1.preserve-sent-options.patch DELETED ---


--- dhcp-3.0.2-uint8_binding_state.patch DELETED ---


--- dhcp-3.0.2rc3-fix-hex.patch DELETED ---


--- dhcp-3.0.2rc3-mem.patch DELETED ---


--- dhcp-3.0.3-bz176615.patch DELETED ---


--- dhcp-3.0.3-gcc4_warnings.patch DELETED ---


--- dhcp-3.0.3-rt15293_bz160655.patch DELETED ---


--- dhcp-3.0.3-trailing_nul_options.patch DELETED ---


--- dhcp-3.0.3-trailing_nul_options_2.patch DELETED ---


--- dhcp-3.0.3rc1-boot-file-server.patch DELETED ---


--- dhcp-3.0.3rc1-no-__u16.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 17 22:05:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 18:05:20 -0400
Subject: rpms/fontconfig/devel fontconfig-2.3.95-zysong01.patch, NONE,
	1.1 fontconfig.spec, 1.86, 1.87
Message-ID: <200608172205.k7HM5Kkm019662@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19596

Modified Files:
	fontconfig.spec 
Added Files:
	fontconfig-2.3.95-zysong01.patch 
Log Message:
- inclusion of zhong yi font and rearranged font prefer list. (bug# 201300)


fontconfig-2.3.95-zysong01.patch:
 fonts.conf.in |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE fontconfig-2.3.95-zysong01.patch ---
--- fontconfig-2.3.95/fonts.conf.in.zysong01	2006-08-14 16:18:51.000000000 +1000
+++ fontconfig-2.3.95/fonts.conf.in	2006-08-14 16:21:24.000000000 +1000
@@ -84,6 +84,7 @@
                 <family>AR PL ZenKai Uni</family>
 		<family>AR PL SungtiL GB</family>
 		<family>AR PL Mingti2L Big5</family>
+		<family>ZYSong18030</family>
 		<family>?????? ??????</family>
 		<family>Baekmuk Batang</family>
 		<family>FreeSerif</family>
@@ -110,6 +111,7 @@
 		<family>?????? ????????????</family>
 		<family>Baekmuk Dotum</family>
 		<family>SimSun</family>
+		<family>ZYSong18030</family>
 		<family>FreeSans</family>
 		<family>MgOpen Modata</family>
 		<default><family>sans-serif</family></default>
@@ -127,6 +129,7 @@
 		<family>Cumberland</family>
 		<family>Nimbus Mono L</family>
 		<family>NSimSun</family>
+		<family>ZYSong18030</family>
 		<family>FreeMono</family>
 		<default><family>monospace</family></default>
 	</alias>
@@ -369,12 +372,12 @@
 			<family>LKLUG</family>
 			<family>Sazanami Mincho</family>
 			<family>Kochi Mincho</family>
-			<family>ZYSong18030</family>
 			<family>MgOpen Canonica</family>
 			<family>FreeSerif</family>
 			<family>AR PL Zenkai Uni</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
+			<family>ZYSong18030</family>
 			<family>?????? ??????</family>
 			<family>Baekmuk Batang</family>
 		</prefer>
@@ -406,10 +409,10 @@
 			<family>?????? ????????????</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>ZYSong18030</family>
 			<family>Baekmuk Gulim</family>
 			<family>SimSun</family>
 		</prefer>
@@ -438,10 +441,10 @@
 			<family>Courier</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>ZYSong18030</family>
                         <family>Baekmuk Gulim</family>
 			<family>FreeMono</family>
 		</prefer>


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- fontconfig.spec	11 Aug 2006 17:35:44 -0000	1.86
+++ fontconfig.spec	17 Aug 2006 22:05:17 -0000	1.87
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.95
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -18,6 +18,7 @@
 Patch4: fontconfig-2.3.95-ttf-collections.patch
 Patch5: fontconfig-2.3.95-fd-leak.patch
 Patch6: fontconfig-2.3.95-fix-page-size-overflow.patch
+Patch7: fontconfig-2.3.95-zysong01.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -59,6 +60,7 @@
 %patch4 -p1 -b .ttf-collections
 %patch5 -p1 -b .fd-leak
 %patch6 -p1 -b .fix-page-size-overflow
+%patch7 -p1 -b .zysong01
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -145,6 +147,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 17 2006 Behdad Esfahbod <besfahbo at redhat.com> - 2.3.95-11
+- inclusion of zhong yi font and rearranged font prefer list. (bug# 201300)
+
 * Fri Aug 11 2006 Ray Strode <rstrode at redhat.com> - 2.3.95-10
 - use "%5x" instead of " %4x" to support 64k instead of
   clamping.  Idea from Behdad.



From fedora-cvs-commits at redhat.com  Thu Aug 17 22:15:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 18:15:54 -0400
Subject: rpms/freetype/devel freetype.spec,1.38,1.39
Message-ID: <200608172215.k7HMFsr7022035@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22012

Modified Files:
	freetype.spec 
Log Message:
* Thu Aug 17 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-5
- don't package static libs


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- freetype.spec	13 Aug 2006 21:09:00 -0000	1.38
+++ freetype.spec	17 Aug 2006 22:15:50 -0000	1.39
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -141,6 +141,9 @@
 #endif 
 EOF
 
+# Don't package static a or .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{l,la}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -185,13 +188,14 @@
 %{_datadir}/aclocal/freetype2.m4
 %{_includedir}/freetype2/*
 %{_includedir}/*.h
-%{_libdir}/libfreetype.a
-%{_libdir}/libfreetype.la
 %{_libdir}/libfreetype.so
 %{_bindir}/freetype-config
 %{_libdir}/pkgconfig/
 
 %changelog
+* Thu Aug 17 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-5
+- don't package static libs
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.1-4.fc6
 - fix a problem with the multilib patch (#202366)
 



From fedora-cvs-commits at redhat.com  Thu Aug 17 22:39:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 18:39:24 -0400
Subject: rpms/freetype/devel freetype.spec,1.39,1.40
Message-ID: <200608172239.k7HMdOJo010566@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10538

Modified Files:
	freetype.spec 
Log Message:
typo



Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- freetype.spec	17 Aug 2006 22:15:50 -0000	1.39
+++ freetype.spec	17 Aug 2006 22:39:20 -0000	1.40
@@ -142,7 +142,7 @@
 EOF
 
 # Don't package static a or .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.{l,la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Thu Aug 17 22:43:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 18:43:01 -0400
Subject: rpms/kernel/devel/configs config-olpc,1.4,NONE
Message-ID: <200608172243.k7HMh0f1011354@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv11218/configs

Removed Files:
	config-olpc 
Log Message:
olpc tweaks


--- config-olpc DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 17 22:43:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 18:43:00 -0400
Subject: rpms/kernel/devel config-olpc-generic, NONE, 1.1 kernel-2.6.spec,
	1.2571, 1.2572
Message-ID: <200608172243.k7HMh0sp011342@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11218

Modified Files:
	kernel-2.6.spec 
Added Files:
	config-olpc-generic 
Log Message:
olpc tweaks


--- NEW FILE config-olpc-generic ---
# CONFIG_M686 is not set
CONFIG_MGEODE_LX=y

CONFIG_NOHIGHMEM=y 
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set

# CONFIG_VM86 is not set

# CONFIG_HPET_TIMER is not set
# CONFIG_MICROCODE is not set

# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set

# CONFIG_MODULE_SIG is not set
# CONFIG_UTRACE is not set
# CONFIG_PTRACE is not set

CONFIG_EMBEDDED=y
# CONFIG_BASE_FULL is not set
CONFIG_BASE_SMALL=1
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_SHMEM=y
CONFIG_SLAB=y
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_DNOTIFY=y
CONFIG_SYSFS=y
CONFIG_EARLY_PRINTK=y
CONFIG_DOUBLEFAULT=y

# CONFIG_DVB is not set
# CONFIG_USB_DABUSB is not set

# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
# CONFIG_LSF is not set

# CONFIG_IOSCHED_NOOP is not set
# CONFIG_IOSCHED_AS is not set
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_SMP is not set
# CONFIG_X86_GENERICARCH is not set
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set

# CONFIG_X86_UP_APIC is not set
# CONFIG_X86_MCE is not set

# CONFIG_EDD is not set
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set

CONFIG_SPARSEMEM_STATIC=y
# CONFIG_RESOURCES_64BIT is not set
# CONFIG_EFI is not set

CONFIG_VGA_NOPROBE=y
CONFIG_HZ_100=y
# CONFIG_HZ_250 is not set
CONFIG_HZ=100

# CONFIG_ACPI_AC is not set
# CONFIG_ACPI_BATTERY is not set
# CONFIG_ACPI_BUTTON is not set
# CONFIG_ACPI_VIDEO is not set
# CONFIG_ACPI_FAN is not set
# CONFIG_ACPI_DOCK is not set
# CONFIG_ACPI_PROCESSOR is not set
# CONFIG_ACPI_ASUS is not set
# CONFIG_ACPI_IBM is not set
# CONFIG_ACPI_TOSHIBA is not set
# CONFIG_ACPI_CONTAINER is not set
# CONFIG_ACPI_SBS is not set

# FIXME: Doesn't the geode have powernow?
# CONFIG_CPU_FREQ is not set

# CONFIG_PCIEPORTBUS is not set
# CONFIG_ISA is not set
# CONFIG_PCCARD is not set
# CONFIG_HOTPLUG_PCI is not set

CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_NR_UARTS=1
CONFIG_SERIAL_8250_RUNTIME_UARTS=1

# CONFIG_DTLK is not set
# CONFIG_R3964 is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y
CONFIG_INET_XFRM_MODE_TUNNEL=y

# CONFIG_NETWORK_SECMARK is not set

# CONFIG_TIPC is not set
# CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
# CONFIG_NET_PKTGEN is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_IP_VS is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_IP_MROUTE is not set
# CONFIG_INET_DIAG is not set
# CONFIG_LLC is not set

# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_WISTRON_BTNS is not set
# CONFIG_GAMEPORT is not set

# CONFIG_IP_NF_SIP is not set
# CONFIG_IRPORT_SIR is not set
# CONFIG_MCS_FIR is not set

CONFIG_MTD=y
CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
CONFIG_MTD_NAND_CS553X=y

# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_PARPORT is not set
# CONFIG_PNP is not set
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_SX8 is not set
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_IDE is not set

CONFIG_SCSI=y
# CONFIG_RAID_ATTRS is not set
# CONFIG_CHR_DEV_ST is not set
# CONFIG_CHR_DEV_OSST is not set
# CONFIG_SCSI_SPI_ATTRS is not set
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
# CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_ISCSI_TCP is not set

# CONFIG_MD is not set
# CONFIG_DM_CRYPT=m
# CONFIG_DM_SNAPSHOT is not set
# CONFIG_DM_MIRROR is not set
# CONFIG_DM_ZERO is not set
# CONFIG_DM_MULTIPATH is not set
# CONFIG_DM_MULTIPATH_EMC is not set

CONFIG_BLK_DEV_SD=y
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_AIC79XX is not set
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_GDTH is not set
# CONFIG_SCSI_IPS is not set
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
# CONFIG_SCSI_QLA_FC is not set
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_MD_RAID456 is not set
# CONFIG_FUSION is not set
# CONFIG_FUSION_SPI is not set
# CONFIG_FUSION_FC is not set
# CONFIG_FUSION_SAS is not set
# CONFIG_IEEE1394 is not set
# CONFIG_I2O is not set
# CONFIG_PHYLIB is not set
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NET_TULIP is not set
# CONFIG_NET_PCI is not set
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
# CONFIG_E1000 is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
# CONFIG_CHELSIO_T1 is not set
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set
# CONFIG_MYRI10GE is not set
# CONFIG_TR is not set
# CONFIG_NET_WIRELESS_RTNETLINK is not set
# CONFIG_IPW2100 is not set
# CONFIG_IPW2200 is not set
# CONFIG_AIRO is not set
# CONFIG_HERMES is not set
# CONFIG_ATMEL is not set
# CONFIG_PRISM54 is not set
# CONFIG_USB_ZD1201 is not set
# CONFIG_HOSTAP is not set
# CONFIG_BCM43XX is not set
# CONFIG_ZD1211RW is not set
# CONFIG_ATM_LANAI is not set
# CONFIG_ATM_ENI is not set
# CONFIG_ATM_FIRESTREAM is not set
# CONFIG_ATM_NICSTAR is not set
# CONFIG_ATM_IDT77252 is not set
# CONFIG_ATM_AMBASSADOR is not set
# CONFIG_ATM_HORIZON is not set
# CONFIG_ATM_FORE200E_MAYBE is not set
# CONFIG_ATM_HE is not set
# CONFIG_FDDI is not set
# CONFIG_NET_FC is not set
# CONFIG_ISDN is not set
# CONFIG_SERIO_RAW is not set
# CONFIG_VT_HW_CONSOLE_BINDING is not set
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_N_HDLC is not set
# CONFIG_CYCLADES is not set
# CONFIG_SYNCLINK is not set
# CONFIG_SYNCLINKMP is not set
# CONFIG_SYNCLINK_GT is not set
# CONFIG_RISCOM8 is not set
# CONFIG_SERIAL_JSM is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_IBMASR is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_I8XX_TCO is not set
# CONFIG_W83627HF_WDT is not set
# CONFIG_W83877F_WDT is not set
# CONFIG_W83977F_WDT is not set
# CONFIG_MACHZ_WDT is not set
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
# CONFIG_USBPCWATCHDOG is not set
# CONFIG_HW_RANDOM_INTEL is not set
# CONFIG_HW_RANDOM_AMD is not set
CONFIG_HW_RANDOM_GEODE=y
# CONFIG_HW_RANDOM_VIA is not set
# CONFIG_SONYPI is not set
# CONFIG_FTAPE is not set
# CONFIG_AGP is not set
# CONFIG_DRM is not set
# CONFIG_MWAVE is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_NSC_GPIO is not set
# CONFIG_TCG_TPM is not set

CONFIG_I2C=y
# CONFIG_I2C_ALI1535 is not set
# CONFIG_I2C_ALI1563 is not set
# CONFIG_I2C_ALI15X3 is not set
# CONFIG_I2C_AMD756 is not set
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_I801 is not set
# CONFIG_I2C_I810 is not set
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PROSAVAGE is not set
# CONFIG_I2C_SAVAGE4 is not set
CONFIG_SCx200_ACB=y
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
# CONFIG_I2C_STUB is not set
# CONFIG_I2C_VIA is not set
# CONFIG_I2C_VIAPRO is not set
# CONFIG_I2C_VOODOO3 is not set
# CONFIG_I2C_PCA_ISA is not set
# CONFIG_I2C_DEBUG_CHIP is not set
# CONFIG_SENSORS_DS1337 is not set
# CONFIG_SENSORS_DS1374 is not set
# CONFIG_SENSORS_EEPROM is not set
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_MAX6875 is not set
# CONFIG_W1 is not set
# CONFIG_HWMON is not set
# CONFIG_HWMON_VID is not set
# CONFIG_IBM_ASM is not set
# CONFIG_VIDEO_V4L1 is not set
CONFIG_VIDEO_V4L2=y
# CONFIG_VIDEO_BT848 is not set
# CONFIG_VIDEO_SAA5249 is not set
# CONFIG_TUNER_3036 is not set
# CONFIG_VIDEO_SAA7134 is not set
# CONFIG_VIDEO_CX88 is not set
# CONFIG_VIDEO_MSP3400 is not set
# CONFIG_VIDEO_CS53L32A is not set
# CONFIG_VIDEO_TLV320AIC23B is not set
# CONFIG_VIDEO_WM8775 is not set
# CONFIG_VIDEO_WM8739 is not set
# CONFIG_VIDEO_CX2341X is not set
# CONFIG_VIDEO_CX25840 is not set
# CONFIG_VIDEO_SAA711X is not set
# CONFIG_VIDEO_SAA7127 is not set
# CONFIG_VIDEO_UPD64031A is not set
# CONFIG_VIDEO_UPD64083 is not set
# CONFIG_VIDEO_PVRUSB2 is not set
# CONFIG_USB_QUICKCAM_MESSENGER is not set
CONFIG_FIRMWARE_EDID=y

CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_VESA is not set
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_NVIDIA is not set
# CONFIG_FB_RIVA is not set
# CONFIG_FB_I810 is not set
# CONFIG_FB_INTEL is not set
# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_CYBLA is not set
# CONFIG_FB_TRIDENT is not set
CONFIG_FB_GEODE=y
CONFIG_FB_GEODE_GX=y
# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set
CONFIG_FB_GEODE_GX_DCON=m
# CONFIG_FB_GEODE_GX1 is not set

CONFIG_FONTS=y
# CONFIG_FONT_8x8 is not set
# CONFIG_FONT_8x16 is not set
# CONFIG_FONT_6x11 is not set
# CONFIG_FONT_7x14 is not set
# CONFIG_FONT_PEARL_8x8 is not set
# CONFIG_FONT_ACORN_8x8 is not set
# CONFIG_FONT_MINI_4x6 is not set
# CONFIG_FONT_SUN8x16 is not set
CONFIG_FONT_SUN12x22=y
# CONFIG_FONT_10x18 is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_LCD_CLASS_DEVICE=y
# CONFIG_SND_AD1889 is not set
# CONFIG_SND_ALS300 is not set
# CONFIG_SND_ALS4000 is not set
# CONFIG_SND_ALI5451 is not set
# CONFIG_SND_ATIIXP is not set
# CONFIG_SND_ATIIXP_MODEM is not set
# CONFIG_SND_AU8810 is not set
# CONFIG_SND_AU8820 is not set
# CONFIG_SND_AU8830 is not set
# CONFIG_SND_AZT3328 is not set
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_GINA20 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_DARLA24 is not set
# CONFIG_SND_GINA24 is not set
# CONFIG_SND_LAYLA24 is not set
# CONFIG_SND_MONA is not set
# CONFIG_SND_MIA is not set
# CONFIG_SND_ECHO3G is not set
# CONFIG_SND_INDIGO is not set
# CONFIG_SND_INDIGOIO is not set
# CONFIG_SND_INDIGODJ is not set
# CONFIG_SND_EMU10K1 is not set
# CONFIG_SND_EMU10K1X is not set
# CONFIG_SND_ENS1370 is not set
# CONFIG_SND_ENS1371 is not set
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
# CONFIG_SND_HDA_INTEL is not set
# CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIXART is not set
# CONFIG_SND_NM256 is not set
# CONFIG_SND_PCXHR is not set
# CONFIG_SND_RIPTIDE is not set
# CONFIG_SND_RME32 is not set
# CONFIG_SND_RME96 is not set
# CONFIG_SND_RME9652 is not set
# CONFIG_SND_SONICVIBES is not set
# CONFIG_SND_TRIDENT is not set
# CONFIG_SND_VIA82XX is not set
# CONFIG_SND_VIA82XX_MODEM is not set
# CONFIG_SND_VX222 is not set
# CONFIG_SND_YMFPCI is not set
CONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_SERIAL_ANYDATA=m
# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
# CONFIG_USB_SERIAL_OPTION is not set
# CONFIG_USB_APPLEDISPLAY is not set

# CONFIG_INPUT_TOUCHSCREEN is not set
# CONFIG_USB_TOUCHSCREEN_EGALAX is not set
# CONFIG_USB_TOUCHSCREEN_PANJIT is not set
# CONFIG_USB_TOUCHSCREEN_3M is not set
# CONFIG_USB_TOUCHSCREEN_ITM is not set

CONFIG_MMC=y
# CONFIG_MMC_WBSD is not set
# CONFIG_NEW_LEDS is not set
# CONFIG_INFINIBAND is not set
# CONFIG_EDAC is not set
# CONFIG_RTC_DRV_DS1307 is not set
# CONFIG_RTC_DRV_DS1553 is not set
# CONFIG_RTC_DRV_ISL1208 is not set
# CONFIG_RTC_DRV_DS1742 is not set
# CONFIG_RTC_DRV_PCF8583 is not set
# CONFIG_RTC_DRV_V3020 is not set
# CONFIG_DMA_ENGINE is not set
CONFIG_EXT3_FS=y
CONFIG_JBD=y
CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS_XATTR=y
CONFIG_JFFS2_FS_POSIX_ACL=y
CONFIG_JFFS2_FS_SECURITY=y
# CONFIG_CIFS_WEAK_PW_HASH is not set
CONFIG_UNUSED_SYMBOLS=y
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
# CONFIG_PROVE_LOCKING is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_FRAME_POINTER is not set
# CONFIG_STACK_UNWIND is not set
CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_DEV_PADLOCK is not set
CONFIG_CRYPTO_DEV_GEODE=m
CONFIG_ZLIB_DEFLATE=y

# CONFIG_TUX is not set
# CONFIG_NETLABEL is not set

# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_FSCACHE is not set
# CONFIG_CACHEFILES is not set
# CONFIG_NFS_FSCACHE is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_XFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
# CONFIG_DLM is not set
# CONFIG_FUSE_FS is not set
# CONFIG_CONFIGFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_9P_FS is not set

# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
# CONFIG_LDM_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_KARMA_PARTITION is not set
# CONFIG_EFI_PARTITION is not set

# CONFIG_OPROFILE is not set
# CONFIG_KPROBES is not set

# CONFIG_USB_HIDINPUT_POWERBOOK is not set
# CONFIG_HID_FF is not set
# CONFIG_HID_PID is not set
# CONFIG_LOGITECH_FF is not set
# CONFIG_THRUSTMASTER_FF is not set
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
# CONFIG_USB_ACECAD is not set
# CONFIG_USB_KBTAB is not set
# CONFIG_USB_POWERMATE is not set
# CONFIG_USB_XPAD is not set
# CONFIG_USB_ATI_REMOTE is not set
# CONFIG_USB_ATI_REMOTE2 is not set
# CONFIG_USB_KEYSPAN_REMOTE is not set
# CONFIG_USB_APPLETOUCH is not set
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set

# CONFIG_USB_SERIAL is not set
# CONFIG_USB_EMI62 is not set
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_AUERSWALD is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_PHIDGETKIT is not set
# CONFIG_USB_PHIDGETSERVO is not set
# CONFIG_USB_IDMOUSE is not set
# CONFIG_USB_SISUSBVGA is not set
# CONFIG_USB_SISUSBVGA_CON is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TEST is not set

# CONFIG_CONNECTOR is not set


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2571
retrieving revision 1.2572
diff -u -r1.2571 -r1.2572
--- kernel-2.6.spec	16 Aug 2006 20:10:10 -0000	1.2571
+++ kernel-2.6.spec	17 Aug 2006 22:42:52 -0000	1.2572
@@ -14,8 +14,6 @@
 %define buildkdump 1
 %define buildheaders 0
 
-%define buildolpc 0
-
 # Versions of various parts
 
 # After branching, please hardcode these values as the
@@ -45,6 +43,11 @@
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 
 # groups of related archs
+#OLPC stuff
+%if 0%{?olpc}
+%define buildxen 0
+%define buildkdump 0
+%endif
 # Don't build 586 kernels for RHEL builds.
 %if 0%{?rhel}
 %define all_x86 i686
@@ -187,7 +190,11 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
+%if 0%{?olpc}
+ExclusiveArch: i686
+%else
 ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries ia64 sparc sparc64 s390 s390x
+%endif
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -256,6 +263,7 @@
 #Source68: kernel-%{kversion}-sparc64-smp.config
 
 Source80: config-rhel-generic
+Source81: config-olpc-generic
 
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
@@ -658,6 +666,15 @@
     rm $i.tmp
   done
 %endif
+#if a olpc kernel, apply the olpc config options
+%if 0%{?olpc}
+  for i in %{all_arch_configs}
+  do
+    mv $i $i.tmp
+    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-olpc-generic $i.tmp > $i
+    rm $i.tmp
+  done
+%endif
 
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
@@ -1259,10 +1276,6 @@
 BuildKernel %make_target %kernel_image kdump
 %endif
 
-%if %{buildolpc}
-BuildKernel %make_target %kernel_image olpc
-%endif
-
 ###
 ### Special hacks for debuginfo subpackages.
 ###



From fedora-cvs-commits at redhat.com  Thu Aug 17 22:47:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 18:47:58 -0400
Subject: rpms/kernel/devel/configs config-generic,1.244,1.245
Message-ID: <200608172247.k7HMlwW3020200@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv14392/configs

Modified Files:
	config-generic 
Log Message:
Add in new features/fixes for beta1
- nfs 64-bit inode support
- ehea ethernet driver
- ppc irq mapping fix
- qlogic firmware
- selinux range transitions support




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- config-generic	16 Aug 2006 20:10:10 -0000	1.244
+++ config-generic	17 Aug 2006 22:47:56 -0000	1.245
@@ -2842,3 +2842,4 @@
 
 CONFIG_NFS_FSCACHE=y
 
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set



From fedora-cvs-commits at redhat.com  Thu Aug 17 22:47:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 18:47:58 -0400
Subject: rpms/kernel/devel linux-2.6-drivers-add-qlogic-firmware.patch, NONE,
	1.1 linux-2.6-ehea-ethernet-driver.patch, NONE,
	1.1 linux-2.6-nfs-64-bit-inode-support.patch, NONE,
	1.1 linux-2.6-ppc-fix-irq-mapping.patch, NONE,
	1.1 linux-2.6-selinux-support-range-transitions.patch, NONE,
	1.1 kernel-2.6.spec, 1.2572, 1.2573
Message-ID: <200608172247.k7HMlwFm020171@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14392

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-drivers-add-qlogic-firmware.patch 
	linux-2.6-ehea-ethernet-driver.patch 
	linux-2.6-nfs-64-bit-inode-support.patch 
	linux-2.6-ppc-fix-irq-mapping.patch 
	linux-2.6-selinux-support-range-transitions.patch 
Log Message:
Add in new features/fixes for beta1
- nfs 64-bit inode support
- ehea ethernet driver
- ppc irq mapping fix
- qlogic firmware
- selinux range transitions support



linux-2.6-drivers-add-qlogic-firmware.patch:
 Makefile    |    3 
 ql2100_fw.c | 6419 +++++++++++++++++++++++
 ql2200_fw.c | 7066 +++++++++++++++++++++++++
 ql2300_fw.c |10283 ++++++++++++++++++++++++++++++++++++
 ql2322_fw.c |11100 +++++++++++++++++++++++++++++++++++++++
 ql2400_fw.c |16705 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 qla_os.c    |   14 
 7 files changed, 51583 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-drivers-add-qlogic-firmware.patch ---
Date: Tue, 15 Aug 2006 11:07:15 -0400 (EDT)
From: Chip Coldwell <coldwell at redhat.com>

Part one, the content.

-- 
Charles M. "Chip" Coldwell
Senior Software Engineer
Red Hat, Inc
978-392-2426

diff -pruN a/drivers/scsi/qla2xxx/Makefile b/drivers/scsi/qla2xxx/Makefile
--- a/drivers/scsi/qla2xxx/Makefile	2006-08-15 10:45:32.000000000 -0400
+++ b/drivers/scsi/qla2xxx/Makefile	2006-08-15 10:50:42.000000000 -0400
@@ -1,4 +1,5 @@
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
-		qla_dbg.o qla_sup.o qla_attr.o
+		qla_dbg.o qla_sup.o qla_attr.o ql2100_fw.o ql2200_fw.o \
+		ql2300_fw.o ql2322_fw.o ql2400_fw.o
 
 obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
diff -pruN a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
--- a/drivers/scsi/qla2xxx/qla_os.c	2006-08-15 10:45:32.000000000 -0400
+++ b/drivers/scsi/qla2xxx/qla_os.c	2006-08-15 10:51:14.000000000 -0400
@@ -2575,12 +2575,14 @@ qla2x00_down_timeout(struct semaphore *s
 
 static DECLARE_MUTEX(qla_fw_lock);
 
+extern struct firmware ql2100_fw, ql2200_fw, ql2300_fw, ql2322_fw, ql2400_fw;
+
 static struct fw_blob qla_fw_blobs[FW_BLOBS] = {
-	{ .name = "ql2100_fw.bin", .segs = { 0x1000, 0 }, },
-	{ .name = "ql2200_fw.bin", .segs = { 0x1000, 0 }, },
-	{ .name = "ql2300_fw.bin", .segs = { 0x800, 0 }, },
-	{ .name = "ql2322_fw.bin", .segs = { 0x800, 0x1c000, 0x1e000, 0 }, },
-	{ .name = "ql2400_fw.bin", },
+	{ .name = "ql2100_fw.bin", .segs = { 0x1000, 0 }, .fw = &ql2100_fw },
+	{ .name = "ql2200_fw.bin", .segs = { 0x1000, 0 }, .fw = &ql2200_fw },
+	{ .name = "ql2300_fw.bin", .segs = { 0x800, 0 }, .fw = &ql2300_fw },
+	{ .name = "ql2322_fw.bin", .segs = { 0x800, 0x1c000, 0x1e000, 0 }, .fw = &ql2322_fw },
+	{ .name = "ql2400_fw.bin", .fw = &ql2400_fw },
 };
 
 struct fw_blob *
@@ -2699,7 +2701,7 @@ static void __exit
 qla2x00_module_exit(void)
 {
 	pci_unregister_driver(&qla2xxx_pci_driver);
-	qla2x00_release_firmware();
+	/* qla2x00_release_firmware(); */
 	kmem_cache_destroy(srb_cachep);
 	fc_release_transport(qla2xxx_transport_template);
 }

diff -pruN a/drivers/scsi/qla2xxx/ql2100_fw.c b/drivers/scsi/qla2xxx/ql2100_fw.c
--- a/drivers/scsi/qla2xxx/ql2100_fw.c	1969-12-31 19:00:00.000000000 -0500
+++ b/drivers/scsi/qla2xxx/ql2100_fw.c	2006-08-15 10:49:38.000000000 -0400
@@ -0,0 +1,6419 @@
+/*
+ * Firmware version 1.19 from
+ *
+ * ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2100_fw.bin
+ *
+ * xxd -g 1 -i ql2100_fw.bin | indent -l80 -i8 -o ql2100_fw.c
+ *
+ */
+
+#include <linux/firmware.h>
+
+static u8 ql2100_fw_bin[] = {
+	0x00, 0x78, 0x10, 0x2d, 0x00, 0x00, 0x96, 0x01, 0x00, 0x00, 0x00, 0x01,
+	0x00, 0x13, 0x00, 0x19, 0x00, 0x17, 0x20, 0x43, 0x4f, 0x50, 0x59, 0x52,
+	0x49, 0x47, 0x48, 0x54, 0x20, 0x32, 0x30, 0x30, 0x31, 0x20, 0x51, 0x4c,
+	0x4f, 0x47, 0x49, 0x43, 0x20, 0x43, 0x4f, 0x52, 0x50, 0x4f, 0x52, 0x41,
+	0x54, 0x49, 0x4f, 0x4e, 0x20, 0x49, 0x53, 0x50, 0x32, 0x31, 0x30, 0x30,
+	0x20, 0x46, 0x69, 0x72, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x20, 0x20, 0x56,
+	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x30, 0x31, 0x2e, 0x31, 0x39,
+	0x20, 0x20, 0x20, 0x20, 0x24, 0x00, 0x20, 0x91, 0x20, 0x00, 0x20, 0xc1,
+	0x00, 0x21, 0x20, 0x39, 0xff, 0xff, 0x20, 0x19, 0xaa, 0xaa, 0x27, 0x60,
+	0x20, 0x69, 0x7f, 0xff, 0x20, 0xc1, 0x00, 0x20, 0x2c, 0x2c, 0x2d, 0x34,
+	0x27, 0x62, 0x23, 0x6a, 0x2c, 0x24, 0x2d, 0x04, 0x26, 0x6a, 0x25, 0x62,
+	0xa4, 0x06, 0x00, 0xc0, 0x10, 0x52, 0x20, 0xc1, 0x00, 0x21, 0x2c, 0x2c,
+	0x23, 0x62, 0x2c, 0x04, 0x25, 0x62, 0xa3, 0x06, 0x00, 0x40, 0x10, 0x52,
+	0x20, 0xc1, 0x00, 0x20, 0x20, 0x39, 0x8f, 0xff, 0x20, 0xa1, 0xae, 0x00,
+	0x27, 0x08, 0x81, 0x0d, 0x81, 0x0d, 0x81, 0x0d, 0x81, 0x0d, 0xa1, 0x8c,
+	0x00, 0x0f, 0x20, 0x01, 0x00, 0x0a, 0xa1, 0x12, 0xa0, 0x0e, 0x21, 0xa8,
+	0x41, 0xa4, 0x34, 0x00, 0x82, 0x11, 0x00, 0xc0, 0x10, 0x5f, 0x27, 0x08,
+	0x34, 0x00, 0xa1, 0x02, 0x00, 0x40, 0x10, 0x6f, 0x00, 0x48, 0x10, 0x6f,
+	0x20, 0xa8, 0xa0, 0x0e, 0x41, 0xa4, 0x20, 0xa1, 0xa6, 0x01, 0x20, 0x09,
+	0x00, 0x00, 0x20, 0xa9, 0x07, 0xff, 0x41, 0xa4, 0x34, 0x00, 0x20, 0xc9,
+	0xab, 0xff, 0x20, 0x59, 0x00, 0x00, 0x2b, 0x78, 0x78, 0x23, 0x00, 0x04,
+	0x20, 0x89, 0x25, 0xc7, 0x20, 0x51, 0xa7, 0x00, 0x2a, 0x70, 0x77, 0x62,
+	0xa7, 0x86, 0x8f, 0xff, 0x00, 0x40, 0x10, 0x92, 0x70, 0x5f, 0xce, 0x00,
+	0x70, 0x5b, 0xcd, 0xf1, 0x70, 0x67, 0x02, 0x00, 0x70, 0x6b, 0x02, 0x00,
+	0x00, 0x78, 0x10, 0x9a, 0x70, 0x5b, 0xbe, 0x01, 0x70, 0x67, 0x01, 0x00,
+	0x70, 0x6b, 0x01, 0x00, 0x70, 0x5f, 0xbe, 0x00, 0x10, 0x78, 0x12, 0xdf,
+	0x10, 0x78, 0x13, 0xca, 0x10, 0x78, 0x15, 0x77, 0x10, 0x78, 0x1c, 0xe9,
+	0x10, 0x78, 0x42, 0xec, 0x10, 0x78, 0x76, 0xbf, 0x10, 0x78, 0x13, 0x55,
+	0x10, 0x78, 0x2a, 0xc0, 0x10, 0x78, 0x4e, 0x93, 0x10, 0x78, 0x49, 0xa3,
+	0x10, 0x78, 0x59, 0x4a, 0x10, 0x78, 0x22, 0x63, 0x10, 0x78, 0x5c, 0x43,
+	0x10, 0x78, 0x54, 0x85, 0x10, 0x78, 0x21, 0x62, 0x10, 0x78, 0x22, 0x40,
+	0x20, 0x91, 0x30, 0x09, 0x78, 0x23, 0x00, 0x00, 0x00, 0x90, 0x10, 0xcf,
+	0x78, 0x20, 0xa0, 0x86, 0x00, 0x02, 0x00, 0xc0, 0x10, 0xcf, 0x78, 0x23,
+	0x40, 0x00, 0x00, 0x68, 0x10, 0xc7, 0x78, 0x1b, 0x00, 0x01, 0x20, 0x91,
+	0x50, 0x00, 0x20, 0x91, 0x40, 0x80, 0x2a, 0x70, 0x70, 0x03, 0x00, 0x00,
+	0x20, 0x01, 0x01, 0x7f, 0x20, 0x03, 0x00, 0x00, 0x2a, 0x70, 0x70, 0x00,
+	0xa0, 0x8e, 0x00, 0x03, 0x00, 0xc0, 0x10, 0xef, 0x10, 0x78, 0x36, 0x5e,
+	0x10, 0x78, 0x2a, 0xe8, 0x10, 0x78, 0x4e, 0xe3, 0x10, 0x78, 0x4b, 0x66,
+	0x20, 0x09, 0x01, 0x00, 0x21, 0x04, 0xa0, 0x82, 0x00, 0x02, 0x00, 0x48,
+	0x10, 0xf3, 0x10, 0x78, 0x59, 0x66, 0x00, 0x78, 0x10, 0xd6, 0x10, 0x79,
+	0x10, 0xf7, 0x00, 0x78, 0x10, 0xdc, 0x10, 0x78, 0x71, 0x97, 0x00, 0x78,
+	0x10, 0xeb, 0x11, 0x01, 0x11, 0x02, 0x11, 0xbe, 0x10, 0xff, 0x12, 0x46,
+	0x12, 0xdc, 0x12, 0xdd, 0x12, 0xde, 0x10, 0x78, 0x13, 0x32, 0x00, 0x7c,
+	0x12, 0x7e, 0x0f, 0x7e, 0x20, 0x91, 0x80, 0x00, 0x70, 0x00, 0xa0, 0x86,
+	0x00, 0x01, 0x00, 0xc0, 0x11, 0x98, 0x10, 0x78, 0x3a, 0xec, 0x20, 0x79,
+	0x01, 0x00, 0x78, 0x44, 0xa0, 0x05, 0x00, 0xc0, 0x11, 0x98, 0x20, 0x11,
+	0x41, 0xdc, 0x10, 0x78, 0x5a, 0x45, 0x10, 0x78, 0x1a, 0xdf, 0x78, 0x0f,
+	0x00, 0xff, 0x78, 0x40, 0xa0, 0x84, 0xff, 0xfb, 0x78, 0x42, 0x20, 0x11,
+	0x80, 0x10, 0x73, 0xc4, 0x10, 0x78, 0x36, 0x1b, 0x20, 0x01, 0xff, 0xff,
+	0x10, 0x78, 0x5a, 0xe6, 0x72, 0x3c, 0xc2, 0x84, 0x72, 0x3e, 0x20, 0x01,
+	0xa7, 0x0c, 0x20, 0x14, 0xc2, 0xac, 0x22, 0x02, 0x10, 0x78, 0x6f, 0x9f,
+	0x20, 0x11, 0x00, 0x04, 0x10, 0x78, 0x8d, 0x2b, 0x10, 0x78, 0x48, 0x9e,
+	0x10, 0x78, 0x42, 0xd4, 0x00, 0x40, 0x11, 0x44, 0x70, 0x87, 0x00, 0x01,
+	0x70, 0xbf, 0x00, 0x00, 0x10, 0x78, 0x3c, 0x9e, 0x00, 0x78, 0x11, 0x98,
+	0x10, 0x78, 0x49, 0x67, 0x00, 0x40, 0x11, 0x4d, 0x7a, 0x0c, 0xc2, 0xb4,
+	0x7a, 0x0e, 0x00, 0x78, 0x11, 0x59, 0x10, 0x78, 0x90, 0xb6, 0x70, 0xcc,
+	0xd0, 0x9c, 0x00, 0xc0, 0x11, 0x59, 0x70, 0x98, 0xa0, 0x05, 0x00, 0x40,
+	0x11, 0x59, 0x10, 0x78, 0x42, 0xb8, 0x70, 0xd7, 0x00, 0x00, 0x70, 0xd3,
+	0x00, 0x00, 0x72, 0xcc, 0x20, 0x79, 0xa7, 0x52, 0x78, 0x04, 0xd0, 0xac,
+	0x00, 0x40, 0x11, 0x65, 0xc2, 0x95, 0x72, 0xce, 0xa2, 0x96, 0x00, 0x04,
+	0x00, 0x40, 0x11, 0x86, 0x20, 0x11, 0x00, 0x01, 0x10, 0x78, 0x8d, 0x2b,
+	0x70, 0x93, 0x00, 0x00, 0x70, 0x97, 0xff, 0xff, 0x70, 0x03, 0x00, 0x02,
+	0x0f, 0x7f, 0x10, 0x78, 0x26, 0x77, 0x20, 0x11, 0x00, 0x05, 0x10, 0x78,
+	0x70, 0xe0, 0x10, 0x78, 0x62, 0xd1, 0x0c, 0x7e, 0x20, 0x61, 0x01, 0x00,
+	0x60, 0xe3, 0x00, 0x08, 0x0c, 0x7f, 0x12, 0x7f, 0x00, 0x78, 0x11, 0x9a,
+	0x70, 0x93, 0x00, 0x00, 0x70, 0x97, 0xff, 0xff, 0x70, 0x03, 0x00, 0x02,
+	0x20, 0x11, 0x00, 0x05, 0x10, 0x78, 0x70, 0xe0, 0x10, 0x78, 0x62, 0xd1,
+	0x0c, 0x7e, 0x20, 0x61, 0x01, 0x00, 0x60, 0xe3, 0x00, 0x08, 0x0c, 0x7f,
+	0x0f, 0x7f, 0x12, 0x7f, 0x00, 0x7c, 0x0c, 0x7e, 0x20, 0xa9, 0x00, 0x82,
+	0x20, 0x09, 0x00, 0x7e, 0x01, 0x7e, 0x02, 0x7e, 0x03, 0x7e, 0x21, 0x10,
+	0x02, 0x7e, 0x20, 0x19, 0x00, 0x29, 0x10, 0x78, 0x73, 0xd0, 0x02, 0x7f,
+	0x10, 0x78, 0xa5, 0x01, 0x03, 0x7f, 0x02, 0x7f, 0x01, 0x7f, 0x10, 0x78,
+	0x29, 0x8e, 0x81, 0x08, 0x00, 0xf0, 0x11, 0xa0, 0x0c, 0x7f, 0x70, 0x6f,
+	0x00, 0x00, 0x70, 0x70, 0xa0, 0x84, 0x00, 0xff, 0x70, 0x72, 0x70, 0x9b,
+	0x00, 0x00, 0x00, 0x7c, 0x12, 0x7e, 0x20, 0x91, 0x80, 0x00, 0x70, 0x00,
+	0xa0, 0x86, 0x00, 0x02, 0x00, 0xc0, 0x12, 0x44, 0x70, 0x94, 0xa0, 0x86,
+	0xff, 0xff, 0x00, 0x40, 0x11, 0xd1, 0x10, 0x78, 0x26, 0x77, 0x10, 0x78,
+	0x62, 0xd1, 0x00, 0x78, 0x12, 0x44, 0x70, 0xcc, 0xd0, 0x9c, 0x00, 0x40,
+	0x11, 0xfd, 0xd0, 0x84, 0x00, 0x40, 0x11, 0xfd, 0x0f, 0x7e, 0x20, 0x79,
+	0x01, 0x00, 0x79, 0x0c, 0xc1, 0xb5, 0x79, 0x0e, 0x0f, 0x7f, 0xd0, 0x8c,
+	0x00, 0x40, 0x11, 0xfd, 0x70, 0xd0, 0xa0, 0x86, 0xff, 0xff, 0x00, 0x40,
+	0x11, 0xf9, 0x10, 0x78, 0x27, 0xf7, 0x10, 0x78, 0x62, 0xd1, 0x70, 0xcc,
+	0xd0, 0x94, 0x00, 0xc0, 0x12, 0x44, 0x20, 0x11, 0x00, 0x01, 0x20, 0x19,
+	0x00, 0x00, 0x10, 0x78, 0x28, 0x2f, 0x10, 0x78, 0x62, 0xd1, 0x00, 0x78,
+	0x12, 0x44, 0x70, 0xd4, 0xa0, 0x05, 0x00, 0xc0, 0x12, 0x44, 0x70, 0x90,
+	0xa0, 0x05, 0x00, 0xc0, 0x12, 0x44, 0x10, 0x78, 0x49, 0x67, 0x00, 0xc0,
+	0x12, 0x44, 0x20, 0x01, 0xa7, 0x53, 0x20, 0x04, 0xd0, 0xac, 0x00, 0x40,
+	0x12, 0x27, 0x15, 0x7e, 0x0c, 0x7e, 0x20, 0xa9, 0x00, 0x7f, 0x20, 0x09,
+	0x00, 0x00, 0x01, 0x7e, 0x10, 0x78, 0x45, 0xc4, 0x00, 0xc0, 0x12, 0x1a,
+	0x60, 0x00, 0xd0, 0xec, 0x00, 0xc0, 0x12, 0x22, 0x01, 0x7f, 0x81, 0x08,
+	0x00, 0xf0, 0x12, 0x11, 0x0c, 0x7f, 0x15, 0x7f, 0x00, 0x78, 0x12, 0x27,
+	0x01, 0x7f, 0x0c, 0x7f, 0x15, 0x7f, 0x00, 0x78, 0x12, 0x44, 0x70, 0x03,
+	0x00, 0x03, 0x70, 0x97, 0xff, 0xff, 0x20, 0x01, 0x00, 0x00, 0x10, 0x78,
+	0x24, 0xe8, 0x10, 0x78, 0x36, 0x99, 0x20, 0x01, 0xa9, 0xb2, 0x20, 0x04,
+	0xa0, 0x86, 0x00, 0x05, 0x00, 0xc0, 0x12, 0x3c, 0x20, 0x11, 0x00, 0x00,
+	0x10, 0x78, 0x70, 0xe0, 0x20, 0x11, 0x00, 0x00, 0x10, 0x78, 0x70, 0xea,
+	0x10, 0x78, 0x62, 0xd1, 0x10, 0x78, 0x63, 0x9b, 0x12, 0x7f, 0x00, 0x7c,
+	0x01, 0x7e, 0x0f, 0x7e, 0x12, 0x7e, 0x20, 0x91, 0x80, 0x00, 0x20, 0x79,
+	0x01, 0x00, 0x20, 0x09, 0x00, 0xf7, 0x10, 0x78, 0x42, 0xa1, 0x79, 0x40,
+	0xa1, 0x8c, 0x00, 0x10, 0x79, 0x42, 0x79, 0x24, 0xd1, 0xb4, 0x00, 0x40,
+	0x12, 0x5b, 0x78, 0x27, 0x00, 0x40, 0xd1, 0x9c, 0x00, 0x40, 0x12, 0x60,
+	0x78, 0x27, 0x00, 0x08, 0x00, 0x7e, 0x03, 0x7e, 0x15, 0x7e, 0xa0, 0x06,
+	0x10, 0x78, 0x5a, 0xe6, 0x79, 0x00, 0xa1, 0x8a, 0x00, 0x03, 0x00, 0x50,
+	0x12, 0x89, 0x79, 0x54, 0xd1, 0xac, 0x00, 0xc0, 0x12, 0x89, 0x20, 0x09,
+	0x00, 0xf8, 0x10, 0x78, 0x42, 0xa1, 0x78, 0x43, 0x00, 0x90, 0x78, 0x43,
+	0x00, 0x10, 0x20, 0xa9, 0x09, 0xc4, 0x78, 0x20, 0xd0, 0x9c, 0x00, 0xc0,
+	0x12, 0x81, 0x78, 0x24, 0xd0, 0xac, 0x00, 0xc0, 0x12, 0xca, 0x00, 0xf0,
+	0x12, 0x79, 0x20, 0x01, 0x00, 0x01, 0x10, 0x78, 0x24, 0xe8, 0x00, 0x78,
+	0x12, 0xd5, 0x78, 0x53, 0x00, 0x00, 0x78, 0x2f, 0x00, 0x20, 0x20, 0xa9,
+	0x00, 0x50, 0x00, 0xe0, 0x12, 0x8f, 0x20, 0x91, 0x60, 0x00, 0x00, 0xf0,
+	0x12, 0x8f, 0x78, 0x53, 0x04, 0x00, 0x78, 0x2f, 0x00, 0x00, 0x20, 0x09,
+	0x00, 0xf8, 0x10, 0x78, 0x42, 0xa1, 0x20, 0xa9, 0x00, 0x0e, 0x00, 0x05,
+	0x00, 0xf0, 0x12, 0x9f, 0x78, 0x53, 0x14, 0x00, 0x78, 0x43, 0x00, 0x90,
+	0x78, 0x43, 0x00, 0x10, 0x20, 0x19, 0x61, 0xa8, 0x78, 0x54, 0x00, 0x05,
+	0x00, 0x05, 0xd0, 0x8c, 0x00, 0x40, 0x12, 0xb4, 0x78, 0x24, 0xd0, 0xac,
+	0x00, 0xc0, 0x12, 0xca, 0x83, 0x19, 0x00, 0xc0, 0x12, 0xaa, 0x20, 0x09,
+	0xa7, 0x32, 0x21, 0x04, 0x80, 0x00, 0x20, 0x0a, 0xa0, 0x84, 0xff, 0xf0,
+	0x00, 0x40, 0x12, 0xc4, 0x20, 0x0b, 0x00, 0x00, 0x10, 0x78, 0x25, 0x88,
+	0x20, 0x01, 0x00, 0x01, 0x10, 0x78, 0x24, 0xe8, 0x00, 0x78, 0x12, 0xd3,
+	0x20, 0x01, 0xa7, 0x32, 0x20, 0x03, 0x00, 0x00, 0x78, 0x28, 0xc0, 0x9d,
+	0x78, 0x2a, 0x78, 0x27, 0x00, 0x48, 0x78, 0x53, 0x04, 0x00, 0x15, 0x7f,
+	0x03, 0x7f, 0x00, 0x7f, 0x12, 0x7f, 0x0f, 0x7f, 0x01, 0x7f, 0x00, 0x7c,
+	0x00, 0x7c, 0x00, 0x7c, 0x00, 0x7c, 0x2a, 0x70, 0x20, 0x61, 0xa9, 0xad,
+	0x20, 0x63, 0x00, 0x01, 0x60, 0x07, 0x00, 0x13, 0x60, 0x0b, 0x00, 0x19,
+	0x60, 0x0f, 0x00, 0x17, 0x20, 0x09, 0x01, 0x00, 0x21, 0x04, 0xa0, 0x82,
+	0x00, 0x02, 0x00, 0x48, 0x12, 0xf5, 0x70, 0x53, 0xff, 0xff, 0x00, 0x78,
+	0x12, 0xf7, 0x70, 0x53, 0x00, 0x00, 0x70, 0x57, 0xff, 0xff, 0x70, 0x6f,
+	0x00, 0x00, 0x70, 0x73, 0x00, 0x00, 0x10, 0x78, 0x90, 0xb6, 0x20, 0x61,
+	0xa9, 0x8d, 0x60, 0x03, 0x09, 0x09, 0x60, 0x07, 0x00, 0x00, 0x60, 0x0b,
[...51248 lines suppressed...]
+	0x06, 0x3f, 0x3c, 0x08, 0x06, 0x00, 0x00, 0x0d, 0x01, 0x3e, 0x40, 0x00,
+	0x06, 0x00, 0x00, 0x20, 0x04, 0x0f, 0x80, 0x1a, 0x03, 0x20, 0x00, 0x0a,
+	0x02, 0x20, 0x17, 0xd0, 0x03, 0x2f, 0xa0, 0x12, 0x02, 0x02, 0xc0, 0x13,
+	0x00, 0x80, 0x02, 0xcd, 0x04, 0x00, 0x70, 0x13, 0x07, 0xa0, 0x03, 0xcf,
+	0x00, 0x7a, 0x01, 0x01, 0x07, 0x05, 0x00, 0x00, 0x07, 0x30, 0x30, 0x00,
+	0x07, 0x00, 0x88, 0x90, 0x07, 0x4d, 0x00, 0x05, 0x06, 0x00, 0x60, 0x13,
+	0x05, 0x0f, 0x80, 0x1e, 0x03, 0x2f, 0xa0, 0x3a, 0x05, 0x60, 0x1a, 0x2b,
+	0x05, 0x0f, 0x80, 0xff, 0x02, 0x2f, 0xa0, 0x19, 0x04, 0x00, 0x10, 0x02,
+	0x04, 0x00, 0x20, 0x13, 0x04, 0x0f, 0x80, 0x1f, 0x02, 0x2f, 0xa0, 0x1a,
+	0x07, 0x3a, 0xa0, 0x0c, 0x06, 0x00, 0x00, 0x02, 0x07, 0x30, 0x0c, 0x03,
+	0x06, 0x00, 0x00, 0x0d, 0x02, 0x80, 0x03, 0xbc, 0x04, 0x00, 0x70, 0x13,
+	0x07, 0xa0, 0x03, 0xcf, 0x00, 0x7a, 0x01, 0x01, 0x03, 0x07, 0x00, 0x00,
+	0x06, 0x60, 0x28, 0x2a, 0x05, 0x0f, 0x80, 0xff, 0x07, 0x3f, 0xa0, 0x09,
+	0x06, 0x00, 0x00, 0x04, 0x02, 0x49, 0x90, 0x08, 0x06, 0x81, 0x03, 0x2a,
+	0x07, 0x30, 0x30, 0x00, 0x07, 0x00, 0x88, 0x90, 0x02, 0x80, 0x03, 0x2c,
+	0x07, 0x30, 0x30, 0x00, 0x04, 0x00, 0x89, 0x80, 0x05, 0x00, 0x70, 0x03,
+	0x07, 0x4d, 0x00, 0x05, 0x06, 0x00, 0x60, 0x13, 0x05, 0x0f, 0x80, 0x1e,
+	0x03, 0x2f, 0xa0, 0x3a, 0x07, 0x60, 0x14, 0x2b, 0x05, 0x0f, 0x80, 0xff,
+	0x03, 0x2f, 0xa0, 0x21, 0x06, 0x4b, 0x00, 0x02, 0x02, 0x49, 0x90, 0x08,
+	0x06, 0x81, 0x03, 0x38, 0x06, 0x44, 0xc0, 0x02, 0x05, 0x4b, 0x04, 0x00,
+	0x05, 0x00, 0x40, 0xff, 0x06, 0x69, 0x81, 0x04, 0x05, 0x81, 0x83, 0x4d,
+	0x06, 0x00, 0x00, 0x13, 0x04, 0x00, 0x10, 0x13, 0x04, 0x78, 0x01, 0x02,
+	0x06, 0x00, 0x00, 0x10, 0x06, 0x00, 0x30, 0x13, 0x04, 0x00, 0x40, 0x13,
+	0x06, 0x00, 0x50, 0x13, 0x06, 0x00, 0x60, 0x13, 0x04, 0x00, 0x70, 0x13,
+	0x00, 0x64, 0x40, 0x15, 0x06, 0x82, 0x03, 0x49, 0x04, 0x44, 0x80, 0x02,
+	0x02, 0x20, 0x50, 0x08, 0x04, 0x0f, 0x80, 0x1f, 0x03, 0x2f, 0xa0, 0x42,
+	0x04, 0x00, 0x80, 0x15, 0x02, 0x80, 0x03, 0x86, 0x04, 0x6c, 0x80, 0x04,
+	0x04, 0x81, 0x83, 0x5b, 0x01, 0x20, 0x80, 0x18, 0x06, 0x78, 0x00, 0x02,
+	0x07, 0x00, 0x00, 0x03, 0x04, 0x81, 0x83, 0x5e, 0x06, 0x00, 0x30, 0x01,
+	0x06, 0x00, 0x00, 0x13, 0x04, 0x00, 0x10, 0x13, 0x04, 0x00, 0x40, 0x13,
+	0x06, 0x00, 0x50, 0x13, 0x04, 0x0f, 0x80, 0x1f, 0x02, 0x2f, 0xa0, 0x32,
+	0x02, 0x80, 0x03, 0x86, 0x04, 0x0f, 0xd0, 0x2a, 0x07, 0xa0, 0x05, 0x3a,
+	0x03, 0x80, 0x00, 0x14, 0x03, 0x79, 0xff, 0x03, 0x07, 0x00, 0x00, 0xff,
+	0x04, 0x48, 0x80, 0x02, 0x07, 0x81, 0x03, 0x65, 0x07, 0x0f, 0xf0, 0x03,
+	0x04, 0x50, 0x04, 0x08, 0x05, 0x00, 0x80, 0xff, 0x03, 0x79, 0xff, 0x00,
+	0x07, 0x00, 0x00, 0xff, 0x06, 0x48, 0x90, 0x02, 0x07, 0x81, 0x03, 0x6c,
+	0x07, 0x0f, 0xf0, 0x00, 0x04, 0x50, 0x04, 0x08, 0x05, 0x00, 0x80, 0xff,
+	0x07, 0x00, 0x50, 0x03, 0x05, 0x00, 0x40, 0x00, 0x06, 0x00, 0x30, 0x01,
+	0x06, 0x00, 0x00, 0x13, 0x04, 0x00, 0x10, 0x13, 0x04, 0x0f, 0x80, 0x1f,
+	0x02, 0x2f, 0xa0, 0x32, 0x05, 0x60, 0x1c, 0x2b, 0x05, 0x0f, 0x80, 0xff,
+	0x02, 0x2f, 0xa0, 0x31, 0x06, 0x60, 0x0c, 0x1f, 0x05, 0x0f, 0x80, 0xff,
+	0x02, 0x2f, 0xa0, 0x32, 0x02, 0x68, 0x06, 0x08, 0x06, 0x81, 0x03, 0x86,
+	0x01, 0x64, 0x08, 0xff, 0x05, 0x7d, 0xfe, 0xff, 0x07, 0xff, 0xff, 0xff,
+	0x03, 0x40, 0x00, 0xff, 0x04, 0x5a, 0x04, 0x07, 0x07, 0x00, 0x00, 0xff,
+	0x07, 0x60, 0x06, 0x1e, 0x05, 0x0f, 0x80, 0xff, 0x03, 0x2f, 0xa0, 0x0a,
+	0x06, 0x60, 0x09, 0x08, 0x06, 0x69, 0xf9, 0x08, 0x02, 0x7a, 0x00, 0x08,
+	0x06, 0x00, 0x00, 0x20, 0x07, 0x0a, 0xa0, 0xff, 0x02, 0x4a, 0x24, 0x08,
+	0x03, 0x7a, 0x00, 0xff, 0x06, 0x00, 0x00, 0xdc, 0x07, 0x00, 0x00, 0xff,
+	0x02, 0x80, 0x03, 0xbc, 0x04, 0x00, 0x70, 0x13, 0x07, 0xa0, 0x03, 0xcf,
+	0x00, 0x7a, 0x01, 0x01, 0x07, 0x03, 0x00, 0x00, 0x07, 0x30, 0x30, 0x00,
+	0x07, 0x00, 0x81, 0x90, 0x06, 0x00, 0x60, 0x13, 0x05, 0x0f, 0x80, 0x1e,
+	0x03, 0x2f, 0xa0, 0x3a, 0x07, 0x3a, 0xa0, 0x00, 0x06, 0x00, 0x00, 0x02,
+	0x07, 0x30, 0x0c, 0x00, 0x07, 0x00, 0x00, 0x05, 0x02, 0x80, 0x03, 0xbc,
+	0x04, 0x00, 0x70, 0x13, 0x07, 0xa0, 0x03, 0xcf, 0x00, 0x7a, 0x01, 0x01,
+	0x07, 0x81, 0x00, 0x00, 0x07, 0x30, 0x30, 0x00, 0x07, 0x00, 0x00, 0x90,
+	0x06, 0x00, 0x60, 0x13, 0x06, 0x60, 0x0c, 0x2a, 0x05, 0x0f, 0x80, 0xff,
+	0x05, 0x3f, 0xa8, 0x09, 0x07, 0x00, 0x00, 0x03, 0x04, 0x78, 0x01, 0x07,
+	0x07, 0xff, 0xff, 0x00, 0x00, 0x7c, 0x01, 0x07, 0x07, 0x00, 0x05, 0x00,
+	0x05, 0x81, 0x83, 0xaf, 0x07, 0x30, 0x30, 0x00, 0x05, 0x00, 0x08, 0x90,
+	0x07, 0x4d, 0x00, 0x05, 0x06, 0x60, 0x28, 0x2a, 0x05, 0x0f, 0x80, 0xff,
+	0x05, 0x3f, 0xa8, 0x09, 0x07, 0x00, 0x00, 0x03, 0x00, 0x49, 0xd0, 0x07,
+	0x06, 0x81, 0x03, 0xb6, 0x02, 0x20, 0x60, 0x01, 0x05, 0x0f, 0x80, 0x1e,
+	0x03, 0x2f, 0xa0, 0x3a, 0x07, 0x3a, 0xa0, 0x00, 0x06, 0x00, 0x00, 0x02,
+	0x07, 0x30, 0x0c, 0x00, 0x07, 0x00, 0x00, 0x05, 0x01, 0x3e, 0x40, 0x00,
+	0x07, 0x00, 0x00, 0x30, 0x03, 0x98, 0x03, 0xbe, 0x07, 0x0f, 0xf0, 0xf6,
+	0x03, 0x68, 0x30, 0xff, 0x04, 0x81, 0x83, 0xbf, 0x07, 0x0f, 0x00, 0x1e,
+	0x04, 0x0f, 0x10, 0x1f, 0x07, 0x0f, 0x30, 0x00, 0x01, 0x3e, 0x40, 0x00,
+	0x06, 0x00, 0x00, 0x20, 0x04, 0x0f, 0x80, 0x1a, 0x03, 0x20, 0x00, 0x0a,
+	0x02, 0x20, 0x17, 0xd0, 0x03, 0x2f, 0xa0, 0x12, 0x00, 0x80, 0x02, 0xcd,
+	0x03, 0x20, 0x00, 0x00, 0x06, 0x00, 0x60, 0x76, 0x03, 0x80, 0x03, 0xd1,
+	0x03, 0x20, 0x00, 0x11, 0x06, 0x00, 0x60, 0x2a, 0x05, 0xa0, 0x04, 0x66,
+	0x05, 0x60, 0x04, 0x06, 0x05, 0x0f, 0x80, 0xff, 0x05, 0x3f, 0xa8, 0x09,
+	0x06, 0x00, 0x00, 0x02, 0x07, 0xc0, 0x00, 0x00, 0x02, 0x07, 0x60, 0x2f,
+	0x04, 0x60, 0x08, 0x76, 0x05, 0x0f, 0x80, 0xff, 0x02, 0x2f, 0xa0, 0x31,
+	0x03, 0x07, 0x50, 0x00, 0x00, 0x07, 0xb0, 0x04, 0x01, 0x01, 0x80, 0x05,
+	0x06, 0x60, 0x00, 0x76, 0x05, 0x00, 0x20, 0xff, 0x05, 0x0f, 0x80, 0xff,
+	0x03, 0x2f, 0xa0, 0x11, 0x03, 0x02, 0xf0, 0x00, 0x01, 0x86, 0x83, 0xee,
+	0x02, 0x02, 0xf0, 0x01, 0x00, 0x86, 0x83, 0xec, 0x00, 0x02, 0xe0, 0x13,
+	0x07, 0x60, 0x18, 0x18, 0x05, 0x0f, 0x80, 0xff, 0x05, 0x3f, 0xa8, 0x0a,
+	0x07, 0x00, 0x00, 0x09, 0x02, 0x80, 0x03, 0xf4, 0x00, 0x02, 0xe0, 0x01,
+	0x02, 0x80, 0x03, 0xf4, 0x04, 0x0f, 0xe0, 0x01, 0x03, 0x86, 0x03, 0xe7,
+	0x07, 0x60, 0x00, 0x2e, 0x05, 0x0f, 0x80, 0xff, 0x01, 0x2f, 0xa8, 0x0a,
+	0x00, 0x02, 0xe0, 0x01, 0x06, 0x00, 0x00, 0x13, 0x04, 0x00, 0x10, 0x13,
+	0x04, 0x0f, 0x80, 0x02, 0x03, 0x2f, 0xa0, 0x12, 0x06, 0x27, 0x30, 0x01,
+	0x04, 0x48, 0xb0, 0x75, 0x05, 0x81, 0x83, 0xff, 0x04, 0x60, 0x20, 0x76,
+	0x05, 0x0f, 0x80, 0xff, 0x05, 0x3f, 0xa8, 0x11, 0x07, 0x00, 0x00, 0x3c,
+	0x01, 0x79, 0xfe, 0x78, 0x07, 0x00, 0x00, 0xff, 0x03, 0x01, 0x90, 0xff,
+	0x02, 0x86, 0x84, 0x07, 0x05, 0xa0, 0x04, 0x1b, 0x00, 0x07, 0x80, 0x19,
+	0x00, 0x92, 0x04, 0x1a, 0x01, 0x80, 0x04, 0x5f, 0x04, 0x0f, 0xd0, 0x76,
+	0x04, 0x0f, 0xd0, 0x19, 0x04, 0x60, 0x02, 0x76, 0x05, 0x00, 0x20, 0xff,
+	0x05, 0x0f, 0x80, 0xff, 0x03, 0x2f, 0xa0, 0x09, 0x04, 0x0f, 0x80, 0x02,
+	0x05, 0x3f, 0xa8, 0x0a, 0x07, 0x00, 0x00, 0x09, 0x05, 0x0f, 0xe0, 0x00,
+	0x03, 0x86, 0x84, 0x17, 0x07, 0x60, 0x18, 0x18, 0x05, 0x0f, 0x80, 0xff,
+	0x05, 0x3f, 0xa8, 0x0a, 0x07, 0x00, 0x00, 0x09, 0x01, 0x80, 0x04, 0x18,
+	0x07, 0xa0, 0x00, 0xee, 0x07, 0x27, 0x30, 0x00, 0x02, 0x07, 0x60, 0x13,
+	0x03, 0x80, 0x00, 0x3c, 0x05, 0x8b, 0x04, 0x1b, 0x03, 0x38, 0x50, 0x00,
+	0x07, 0x03, 0x00, 0x00, 0x05, 0x60, 0x08, 0x18, 0x05, 0x0f, 0x80, 0xff,
+	0x03, 0x2f, 0xa0, 0x09, 0x05, 0x4b, 0x04, 0x00, 0x03, 0x08, 0xa0, 0xff,
+	0x01, 0x79, 0xfe, 0x00, 0x07, 0x00, 0x00, 0xff, 0x01, 0x08, 0x80, 0xff,
+	0x04, 0x48, 0xb0, 0x75, 0x05, 0x81, 0x04, 0x35, 0x07, 0x60, 0x14, 0x7b,
+	0x05, 0x0f, 0x80, 0xff, 0x00, 0x2f, 0xa8, 0x19, 0x06, 0x4b, 0x00, 0x01,
+	0x02, 0x08, 0x00, 0x02, 0x01, 0x08, 0x10, 0x03, 0x00, 0x08, 0x20, 0x01,
+	0x02, 0x08, 0x30, 0x01, 0x02, 0x07, 0x90, 0x01, 0x02, 0x07, 0xa0, 0x01,
+	0x00, 0x08, 0x40, 0x13, 0x02, 0x07, 0xf0, 0x13, 0x00, 0x80, 0x04, 0x57,
+	0x06, 0x48, 0x50, 0x75, 0x05, 0x81, 0x04, 0x4d, 0x02, 0x46, 0x50, 0x75,
+	0x06, 0x60, 0x14, 0x76, 0x05, 0x0f, 0x80, 0xff, 0x07, 0x3f, 0xa0, 0x21,
+	0x06, 0x00, 0x00, 0x3e, 0x07, 0x0f, 0xf0, 0x7d, 0x04, 0x50, 0x04, 0x7c,
+	0x05, 0x0f, 0x80, 0xff, 0x00, 0x2f, 0xa8, 0x19, 0x04, 0x8b, 0x04, 0x40,
+	0x02, 0x08, 0x00, 0x01, 0x00, 0x08, 0x10, 0x02, 0x01, 0x08, 0x20, 0x03,
+	0x03, 0x07, 0x90, 0x03, 0x02, 0x08, 0x30, 0x7a, 0x03, 0x40, 0x00, 0x7e,
+	0x06, 0x42, 0x00, 0x7f, 0x04, 0x81, 0x04, 0x52, 0x07, 0x0f, 0xf0, 0x7e,
+	0x05, 0xa0, 0x01, 0xe2, 0x02, 0x92, 0x84, 0x52, 0x00, 0x80, 0x04, 0x5e,
+	0x05, 0x8b, 0x04, 0x4d, 0x06, 0x60, 0x14, 0x76, 0x05, 0x0f, 0x80, 0xff,
+	0x07, 0x3f, 0xa0, 0x41, 0x06, 0x00, 0x00, 0x3e, 0x06, 0x60, 0x24, 0x76,
+	0x05, 0x0f, 0x80, 0xff, 0x07, 0x3f, 0xa0, 0x09, 0x06, 0x00, 0x00, 0x07,
+	0x00, 0x08, 0x40, 0x0e, 0x04, 0x8b, 0x04, 0x57, 0x03, 0x38, 0x50, 0x00,
+	0x03, 0x01, 0x00, 0x00, 0x06, 0x21, 0x90, 0x01, 0x04, 0x0f, 0xe0, 0x7f,
+	0x00, 0x86, 0x04, 0x5e, 0x00, 0x80, 0x01, 0xcb, 0x07, 0xc0, 0x00, 0x00,
+	0x00, 0x68, 0x3e, 0x75, 0x04, 0x81, 0x04, 0x64, 0x04, 0x48, 0xd0, 0x75,
+	0x04, 0x81, 0x04, 0x8a, 0x00, 0x80, 0x04, 0xbc, 0x06, 0xa0, 0x05, 0x1a,
+	0x00, 0x80, 0x04, 0x1a, 0x03, 0x97, 0x84, 0x71, 0x07, 0x60, 0x24, 0x18,
+	0x05, 0x0f, 0x80, 0xff, 0x01, 0x2f, 0xa8, 0x09, 0x06, 0x78, 0x00, 0x01,
+	0x07, 0x00, 0x00, 0xff, 0x07, 0x5a, 0x00, 0x00, 0x07, 0x0f, 0xf0, 0x14,
+	0x05, 0x69, 0xfe, 0xff, 0x05, 0x4b, 0x08, 0xff, 0x07, 0x5a, 0x00, 0x00,
+	0x05, 0x60, 0x04, 0x18, 0x05, 0x0f, 0x80, 0xff, 0x01, 0x2f, 0xa8, 0x09,
+	0x04, 0x0f, 0xe0, 0x07, 0x03, 0x86, 0x84, 0x78, 0x01, 0x20, 0x40, 0x00,
+	0x00, 0x80, 0x04, 0x86, 0x00, 0x70, 0x01, 0x01, 0x03, 0x01, 0x00, 0x00,
+	0x06, 0x78, 0x00, 0x01, 0x07, 0xff, 0x00, 0x00, 0x07, 0x6c, 0x00, 0xff,
+	0x06, 0x81, 0x84, 0x80, 0x00, 0x70, 0x01, 0x01, 0x03, 0x01, 0x00, 0x00,
+	0x05, 0x60, 0x04, 0x18, 0x05, 0x0f, 0x80, 0xff, 0x01, 0x2f, 0xa8, 0x0a,
+	0x06, 0x78, 0x00, 0x01, 0x07, 0xff, 0x00, 0x00, 0x05, 0x00, 0x40, 0xff,
+	0x02, 0x79, 0xff, 0x01, 0x07, 0x00, 0xff, 0xff, 0x05, 0x00, 0x20, 0x14,
+	0x07, 0xc0, 0x00, 0x00, 0x04, 0x00, 0x70, 0x76, 0x04, 0x48, 0xb0, 0x75,
+	0x04, 0x81, 0x04, 0xa4, 0x03, 0x20, 0x00, 0x11, 0x06, 0x00, 0x60, 0x76,
+	0x07, 0xa0, 0x03, 0xd1, 0x00, 0x7a, 0x01, 0x01, 0x07, 0x06, 0x00, 0x00,
+	0x07, 0x30, 0x30, 0x00, 0x07, 0x00, 0x82, 0x90, 0x07, 0x60, 0x00, 0x18,
+	0x05, 0x0f, 0x80, 0xff, 0x05, 0x3f, 0xa8, 0x09, 0x07, 0x00, 0x00, 0x03,
+	0x04, 0x48, 0xe0, 0x07, 0x07, 0x81, 0x84, 0x9c, 0x06, 0x00, 0x60, 0x13,
+	0x01, 0x80, 0x04, 0xb7, 0x02, 0x40, 0x00, 0x10, 0x05, 0x81, 0x04, 0x9c,
+	0x06, 0x00, 0x60, 0x10, 0x04, 0x60, 0x32, 0x76, 0x05, 0x0f, 0x80, 0xff,
+	0x07, 0x3f, 0xa0, 0x0a, 0x07, 0x00, 0x00, 0x03, 0x01, 0x80, 0x04, 0xb7,
+	0x06, 0x00, 0x00, 0x7a, 0x02, 0x49, 0x30, 0x75, 0x06, 0x81, 0x84, 0xad,
+	0x04, 0x60, 0x2a, 0x76, 0x05, 0x0f, 0x80, 0xff, 0x03, 0x2f, 0xa0, 0x09,
+	0x06, 0x0f, 0xf0, 0x7a, 0x05, 0x50, 0x04, 0x00, 0x07, 0x00, 0x00, 0xff,
+	0x06, 0x47, 0x30, 0x75, 0x04, 0x60, 0x2a, 0x76, 0x05, 0x0f, 0x80, 0xff,
+	0x03, 0x2f, 0xa0, 0x0a, 0x07, 0xa0, 0x03, 0xcc, 0x00, 0x7a, 0x01, 0x01,
+	0x03, 0x01, 0x00, 0x00, 0x06, 0x30, 0x30, 0x08, 0x05, 0x00, 0x80, 0x00,
+	0x06, 0x00, 0x60, 0x0e, 0x05, 0x0f, 0x80, 0x74, 0x03, 0x2f, 0xa0, 0x3a,
+	0x05, 0x30, 0x79, 0xa0, 0x07, 0x00, 0x00, 0x0c, 0x00, 0x80, 0x04, 0xfd,
+	0x00, 0x68, 0x3e, 0x75, 0x07, 0x6c, 0x0a, 0xff, 0x05, 0x81, 0x04, 0xdb,
+	0x04, 0x00, 0x70, 0x13, 0x03, 0x20, 0x00, 0x11, 0x06, 0x00, 0x60, 0x76,
+	0x07, 0xa0, 0x03, 0xd1, 0x00, 0x7a, 0x01, 0x01, 0x03, 0x07, 0x00, 0x00,
+	0x06, 0x60, 0x28, 0x76, 0x05, 0x0f, 0x80, 0xff, 0x05, 0x3f, 0xa8, 0x09,
+	0x06, 0x00, 0x00, 0x01, 0x03, 0x49, 0x90, 0x03, 0x04, 0x81, 0x04, 0xd0,
+	0x07, 0x30, 0x30, 0x00, 0x07, 0x00, 0x88, 0x90, 0x05, 0x30, 0x79, 0xa0,
+	0x07, 0x00, 0x00, 0x0c, 0x01, 0x80, 0x04, 0xd4, 0x07, 0x30, 0x30, 0x00,
+	0x04, 0x00, 0x89, 0x80, 0x04, 0x30, 0x79, 0x20, 0x07, 0x00, 0x00, 0x0c,
+	0x07, 0x4d, 0x00, 0x05, 0x06, 0x00, 0x60, 0x13, 0x05, 0x0f, 0x80, 0x74,
+	0x03, 0x2f, 0xa0, 0x3a, 0x04, 0x30, 0x79, 0x20, 0x07, 0x00, 0x00, 0x0c,
+	0x00, 0x80, 0x04, 0xfd, 0x04, 0x60, 0x2a, 0x76, 0x05, 0x0f, 0x80, 0xff,
+	0x03, 0x2f, 0xa0, 0x09, 0x06, 0x0f, 0xf0, 0x7a, 0x05, 0x50, 0x04, 0x00,
+	0x07, 0x00, 0x00, 0xff, 0x06, 0x47, 0x30, 0x75, 0x04, 0x60, 0x2a, 0x76,
+	0x05, 0x0f, 0x80, 0xff, 0x03, 0x2f, 0xa0, 0x0a, 0x04, 0x00, 0x70, 0x76,
+	0x07, 0xa0, 0x03, 0xcc, 0x00, 0x7a, 0x01, 0x01, 0x03, 0x01, 0x00, 0x00,
+	0x06, 0x30, 0x30, 0x08, 0x07, 0x00, 0x88, 0x00, 0x07, 0x4d, 0x00, 0x05,
+	0x06, 0x60, 0x0a, 0x76, 0x05, 0x0f, 0x80, 0xff, 0x07, 0x3f, 0xa0, 0x09,
+	0x07, 0x00, 0x00, 0x03, 0x05, 0x4b, 0x04, 0x06, 0x04, 0x5a, 0x04, 0x04,
+	0x05, 0x00, 0x40, 0xff, 0x06, 0x00, 0x60, 0x0e, 0x05, 0x0f, 0x80, 0x74,
+	0x03, 0x2f, 0xa0, 0x3a, 0x06, 0x48, 0xc0, 0x75, 0x04, 0x81, 0x04, 0xfb,
+	0x06, 0x30, 0x7d, 0x20, 0x07, 0x00, 0x00, 0x0c, 0x00, 0x80, 0x04, 0xfd,
+	0x04, 0x30, 0x79, 0x20, 0x07, 0x00, 0x00, 0x0c, 0x01, 0x3e, 0x40, 0x00,
+	0x07, 0x00, 0x00, 0x30, 0x01, 0x98, 0x04, 0xff, 0x07, 0x0f, 0xf0, 0xf6,
+	0x07, 0x48, 0x50, 0xff, 0x05, 0x81, 0x85, 0x00, 0x05, 0x0f, 0x20, 0x74,
+	0x06, 0x0a, 0x00, 0x07, 0x04, 0x00, 0x70, 0xfb, 0x04, 0x6a, 0x70, 0x07,
+	0x05, 0x0f, 0x40, 0xff, 0x01, 0x3e, 0x40, 0x00, 0x06, 0x00, 0x00, 0x20,
+	0x06, 0x78, 0x00, 0x7a, 0x07, 0xff, 0xf0, 0x00, 0x04, 0x81, 0x85, 0x10,
+	0x03, 0x20, 0x00, 0x0a, 0x02, 0x20, 0x17, 0xd0, 0x02, 0x80, 0x05, 0x13,
+	0x03, 0x20, 0x00, 0x0a, 0x06, 0x30, 0x1b, 0x58, 0x06, 0x00, 0x00, 0x01,
+	0x05, 0x0f, 0x80, 0x72, 0x03, 0x2f, 0xa0, 0x12, 0x00, 0x80, 0x04, 0x1a,
+	0x01, 0x20, 0x80, 0x60, 0x06, 0x00, 0x90, 0x2a, 0x04, 0x00, 0x20, 0x20,
+	0x02, 0x80, 0x05, 0x26, 0x04, 0x00, 0x80, 0xfb, 0x06, 0x6a, 0xe1, 0x08,
+	0x06, 0x00, 0x90, 0x76, 0x04, 0x00, 0x20, 0x75, 0x02, 0x80, 0x05, 0x26,
+	0x03, 0x20, 0x11, 0x00, 0x05, 0x84, 0x85, 0x24, 0x06, 0x42, 0x00, 0x01,
+	0x04, 0x81, 0x85, 0x20, 0x02, 0x80, 0x05, 0x3d, 0x02, 0x0e, 0x00, 0x08,
+	0x07, 0xc0, 0x00, 0x00, 0x05, 0x0f, 0xd0, 0x09, 0x04, 0x0f, 0xd0, 0x08,
+	0x03, 0x20, 0x11, 0x00, 0x05, 0x84, 0x85, 0x2d, 0x06, 0x42, 0x00, 0x01,
+	0x04, 0x81, 0x85, 0x29, 0x02, 0x80, 0x05, 0x3d, 0x00, 0x7a, 0x01, 0x02,
+	0x04, 0x00, 0x01, 0x01, 0x05, 0x60, 0x08, 0x09, 0x05, 0x0f, 0x80, 0xff,
+	0x07, 0x3f, 0xa0, 0x0a, 0x06, 0x00, 0x00, 0x01, 0x02, 0x0e, 0x00, 0x08,
+	0x06, 0x84, 0x05, 0x37, 0x03, 0x0e, 0x00, 0x09, 0x07, 0xc0, 0x00, 0x00,
+	0x01, 0x01, 0x10, 0x09, 0x05, 0x2e, 0x43, 0x00, 0x07, 0xc0, 0x00, 0x00,
+	0x05, 0x2e, 0x40, 0x0f, 0x01, 0x20, 0x80, 0x90, 0x02, 0x80, 0x05, 0x1f,
+	0x07, 0x0f, 0xc0, 0xff, 0x04, 0x0f, 0x80, 0x13, 0x03, 0x2f, 0xa0, 0x09,
+	0x02, 0x80, 0x05, 0x40, 0x77, 0x78, 0x21, 0xfa, 0xff, 0xee, 0xff, 0xd6
+};
+
+struct firmware ql2400_fw = {
+	.size = sizeof(ql2400_fw_bin),
+	.data = ql2400_fw_bin
+};

linux-2.6-ehea-ethernet-driver.patch:
 Makefile       |    7 
 ehea.h         |  434 +++++++++
 ehea_ethtool.c |  325 +++++++
 ehea_hcall.h   |   52 +
 ehea_hw.h      |  319 +++++++
 ehea_main.c    | 2560 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ehea_phyp.c    | 1020 ++++++++++++++++++++++
 ehea_phyp.h    |  625 +++++++++++++
 ehea_qmr.c     |  719 ++++++++++++++++
 ehea_qmr.h     |  390 ++++++++
 10 files changed, 6451 insertions(+)

--- NEW FILE linux-2.6-ehea-ethernet-driver.patch ---
Date: Tue, 18 Jul 2006 12:39:16 -0400 (EDT)
From: Manoj Iyer <miyer at redhat.com>
--- linux-2.6.17-rc6-orig/drivers/net/ehea/ehea_main.c	1969-12-31 16:00:00.000000000 -0800
+++ kernel/drivers/net/ehea/ehea_main.c	2006-06-09 05:29:59.776161616 -0700
@@ -0,0 +1,2560 @@
+/*
+ *  linux/drivers/net/ehea/ehea_main.c
+ *
+ *  eHEA ethernet device driver for IBM eServer System p
+ *
+ *  (C) Copyright IBM Corp. 2006
+ *
+ *  Authors:
+ *       Christoph Raisch <raisch at de.ibm.com>
+ *       Jan-Bernd Themann <themann at de.ibm.com>
+ *       Heiko-Joerg Schick <schickhj at de.ibm.com>
+ *       Thomas Klein <tklein at de.ibm.com>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, 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.
+ */
+
+#define DEB_PREFIX "main"
+
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <linux/if.h>
+#include <linux/list.h>
+#include <net/ip.h>
+
+#include "ehea.h"
+#include "ehea_qmr.h"
+#include "ehea_phyp.h"
+
+struct task_struct *ehea_irq_helper_thread;
+extern int ehea_irq_helper(void);
+
+
+#define USE_INTERRUPTS
+#define POLL_PORT_INTERVAL (HZ / 20)
+#define SKB_CLEANUP_INTERVAL (HZ / 1000)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christoph Raisch <raisch at de.ibm.com>");
+MODULE_DESCRIPTION("IBM eServer HEA Driver");
+MODULE_VERSION(EHEA_DRIVER_VERSION);
+
+static int __devinit ehea_probe(struct ibmebus_dev *dev,
+				const struct of_device_id *id);
+static int __devexit ehea_remove(struct ibmebus_dev *dev);
+static int ehea_sense_port_attr(struct ehea_adapter *adapter, int portnum);
+
+int ehea_trace_level = 5;
+
+static struct net_device_stats *ehea_get_stats(struct net_device *dev)
+{
+	u64 hret;
+	struct ehea_port *port = (struct ehea_port*)dev->priv;
+	struct ehea_adapter *adapter = port->adapter;
+	struct hcp_query_ehea_port_cb_2 *cb2 = NULL;
+	struct net_device_stats *stats = &port->stats;
+
+	EDEB_EN(7, "net_device=%p", dev);
+
+	cb2 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);
+	if(!cb2) {
+		EDEB_ERR(4, "No memory for cb2");
+		goto get_stat_exit;
+	}
+
+	hret = ehea_h_query_ehea_port(adapter->handle,
+				      port->logical_port_id,
+				      H_PORT_CB2,
+				      H_PORT_CB2_ALL,
+				      cb2);
+
+	if (hret != H_SUCCESS) {
+		EDEB_ERR(4, "query_ehea_port failed for cb2");
+		goto get_stat_exit;
+	}
+
+	EDEB_DMP(7, (u8*)cb2,
+		 sizeof(struct hcp_query_ehea_port_cb_2), "After HCALL");
+
+	stats->tx_packets = cb2->txucp + cb2->txmcp + cb2->txbcp;
+	stats->multicast = cb2->rxmcp;
+	stats->rx_errors = cb2->rxuerr;
+	stats->rx_bytes = cb2->rxo;
+	stats->tx_bytes = cb2->txo;
+
+get_stat_exit:
+	EDEB_EX(7, "");
+	return stats;
+}
+
+static inline int ehea_refill_rq1(struct ehea_port_res *port_res, int arr_index,
+				  int nr_of_wqes)
+{
+	int i;
+	int ret = 0;
+	struct ehea_qp *qp;
+	int skb_arr_rq1_len = port_res->skb_arr_rq1_len;
+	struct sk_buff **skb_arr_rq1 = port_res->skb_arr_rq1;
+	EDEB_EN(7, "port_res=%p, arr_index=%d, nr_of_wqes=%d, arr_rq1_len=%d",
+		port_res, arr_index, nr_of_wqes, skb_arr_rq1_len);
+
+	qp = port_res->qp;
+	if (unlikely(nr_of_wqes == 0))
+		return -EINVAL;
+	for (i = 0; i < nr_of_wqes; i++) {
+		int index = ((skb_arr_rq1_len + arr_index) - i)
+		    % skb_arr_rq1_len;
+		if (!skb_arr_rq1[index]) {
+			skb_arr_rq1[index] = dev_alloc_skb(EHEA_LL_PKT_SIZE);
+
+			if (!skb_arr_rq1[index]) {
+				EDEB_ERR(4, "No mem for skb/%d wqes filled", i);
+				ret = -ENOMEM;
+				break;
+			}
+		}
+	}
+	/* Ring doorbell */
+	ehea_update_rq1a(qp, nr_of_wqes);
+	EDEB_EX(7, "");
+	return ret;
+}
+
+static int ehea_init_fill_rq1(struct ehea_port_res *port_res, int nr_rq1a)
+{
+	int i;
+	int ret = 0;
+	struct ehea_qp *qp;
+	EDEB_EN(7, "port_res=%p, nr_rq1a=%d", port_res, nr_rq1a);
+	qp = port_res->qp;
+
+	for (i = 0; i < port_res->skb_arr_rq1_len; i++) {
+		port_res->skb_arr_rq1[i] = dev_alloc_skb(EHEA_LL_PKT_SIZE);
+		if (!port_res->skb_arr_rq1[i]) {
+			EDEB_ERR(4, "dev_alloc_skb failed. Only %d skb filled.",
+				 i);
+			ret = -ENOMEM;
+			break;
+		}
+	}
+	/* Ring doorbell */
+	ehea_update_rq1a(qp, nr_rq1a);
+	EDEB_EX(7, "");
+	return ret;
+}
+
+static inline int ehea_refill_rq2(struct ehea_port_res *pr, int nr_of_wqes)
+{
+	int i;
+	int ret = 0;
+	struct ehea_qp *qp;
+	struct ehea_rwqe *rwqe;
+	int skb_arr_rq2_len = pr->skb_arr_rq2_len;
+	struct sk_buff **skb_arr_rq2 = pr->skb_arr_rq2;
+
+	EDEB_EN(8, "pr=%p, nr_of_wqes=%d", pr, nr_of_wqes);
+	if (nr_of_wqes == 0)
+		return -EINVAL;
+	qp = pr->qp;
+	for (i = 0; i < nr_of_wqes; i++) {
+		int index = pr->skb_rq2_index++;
+		struct sk_buff *skb = dev_alloc_skb(EHEA_PAGESIZE);
+
+		if (!skb) {
+			EDEB_ERR(4, "dev_alloc_ask failed. Only %d skb filled.",
+				 i);
+			ret = -ENOMEM;
+			break;
+		}
+
+		rwqe = ehea_get_next_rwqe(qp, 2);
+		pr->skb_rq2_index %= skb_arr_rq2_len;
+		skb_arr_rq2[index] = skb;
+		rwqe->wr_id = EHEA_BMASK_SET(EHEA_WR_ID_TYPE, EHEA_RWQE2_TYPE)
+		            | EHEA_BMASK_SET(EHEA_WR_ID_INDEX, index);
+		rwqe->sg_list[0].l_key = ehea_get_lkey(pr->port->adapter,
+						       (void*)skb->data);
+		rwqe->sg_list[0].vaddr = (u64)skb->data;
+		rwqe->sg_list[0].len = EHEA_PAGESIZE;
+		rwqe->data_segments = 1;
[...6103 lines suppressed...]
+	u64 qpedx_rrva2;
+	u64 reserved4;
+	u64 qpedx_rrl3;
+	u64 qpedx_rrrkey3;
+	u64 qpedx_rrva3;
+};
+
+#define CQX_FECADDER EHEA_BMASK_IBM(32, 63)
+#define CQX_FEC_CQE_CNT EHEA_BMASK_IBM(32, 63)
+#define CQX_N1_GENERATE_COMP_EVENT EHEA_BMASK_IBM(0, 0)
+#define CQX_EP_EVENT_PENDING EHEA_BMASK_IBM(0, 0)
+
+#define CQTEMM_OFFSET(x) offsetof(struct ehea_cqtemm, x)
+
+struct ehea_cqtemm {
+	u64 cqx_hcr;
+	u64 cqx_c;
+	u64 cqx_herr;
+	u64 cqx_aer;
+	u64 cqx_ptp;
+	u64 cqx_tp;
+	u64 cqx_fec;
+	u64 cqx_feca;
+	u64 cqx_ep;
+	u64 cqx_eq;
+	u64 reserved1;
+	u64 cqx_n0;
+	u64 cqx_n1;
+	u64 reserved2[(0x1000 - 0x60) / 8];
+};
+
+#define EQTEMM_OFFSET(x) offsetof(struct ehea_eqtemm, x)
+
+struct ehea_eqtemm {
+	u64 EQx_HCR;
+	u64 EQx_C;
+	u64 EQx_HERR;
+	u64 EQx_AER;
+	u64 EQx_PTP;
+	u64 EQx_TP;
+	u64 EQx_SSBA;
+	u64 EQx_PSBA;
+	u64 EQx_CEC;
+	u64 EQx_MEQL;
+	u64 EQx_XISBI;
+	u64 EQx_XISC;
+	u64 EQx_IT;
+};
+
+static inline u64 hipz_galpa_load(struct h_galpa galpa, u32 offset)
+{
+	u64 addr = galpa.fw_handle + offset;
+	u64 out;
+	EDEB_EN(7, "addr=%lx offset=%x ", addr, offset);
+	out = *(volatile u64 *)addr;
+	EDEB_EX(7, "addr=%lx value=%lx", addr, out);
+	return out;
+};
+
+static inline void hipz_galpa_store(struct h_galpa galpa, u32 offset, u64 value)
+{
+	u64 addr = galpa.fw_handle + offset;
+	EDEB_EN(7, "addr=%lx offset=%x value=%lx", addr, offset,
+		value);
+	*(u64 *) addr = value;
+	hipz_galpa_load(galpa, offset);	/* synchronize explicitly to ehea */
+	EDEB_EX(7, "");
+};
+
+static inline void hipz_galpa_store_acc(struct h_galpa galpa, u32 offset,
+					u64 value)
+{
+	u64 addr = galpa.fw_handle + offset;
+	EDEB(7, "Accelerated store: addr=%lx offset=%x value=%lx",
+	     addr, offset, value);
+	*(u64 *) addr = value;
+};
+
+#define hipz_galpa_store_eq(gal, offset, value)\
+        hipz_galpa_store(gal, EQTEMM_OFFSET(offset), value)
+#define hipz_galpa_load_eq(gal, offset)\
+        hipz_galpa_load(gal, EQTEMM_OFFSET(offset))
+
+#define hipz_galpa_store_cq(gal, offset, value)\
+        hipz_galpa_store(gal, CQTEMM_OFFSET(offset), value)
+#define hipz_galpa_load_cq(gal, offset)\
+        hipz_galpa_load(gal, CQTEMM_OFFSET(offset))
+
+#define hipz_galpa_store_qp(gal, offset, value)\
+        hipz_galpa_store(gal, QPTEMM_OFFSET(offset), value)
+#define hipz_galpa_load_qp(gal, offset)\
+        hipz_galpa_load(gal, QPTEMM_OFFSET(offset))
+
+#define hipz_galpa_store_qped(gal, offset, value)\
+        hipz_galpa_store(gal, QPEDMM_OFFSET(offset), value)
+#define hipz_galpa_load_qped(gal, offset)\
+        hipz_galpa_load(gal, QPEDMM_OFFSET(offset))
+
+#define hipz_galpa_store_mrmw(gal, offset, value)\
+        hipz_galpa_store(gal, MRMWMM_OFFSET(offset), value)
+#define hipz_galpa_load_mrmw(gal, offset)\
+        hipz_galpa_load(gal, MRMWMM_OFFSET(offset))
+
+#define hipz_galpa_store_base(gal, offset, value)\
+        hipz_galpa_store(gal, HCAGR_OFFSET(offset), value)
+#define hipz_galpa_load_base(gal, offset)\
+        hipz_galpa_load(gal, HCAGR_OFFSET(offset))
+
+static inline void ehea_update_sqa(struct ehea_qp *qp, u16 nr_wqes)
+{
+	struct h_galpa gal = qp->galpas.kernel;
+	EDEB_EN(7, "qp=%p, nr_wqes=%d", qp, nr_wqes);
+
+	hipz_galpa_store_acc(gal, QPTEMM_OFFSET(qpx_sqa),
+			     EHEA_BMASK_SET(QPX_SQA_VALUE, nr_wqes));
+	EDEB_EX(7, "qpx_sqa = %i", nr_wqes);
+}
+
+static inline void ehea_update_rq3a(struct ehea_qp *qp, u16 nr_wqes)
+{
+	struct h_galpa gal = qp->galpas.kernel;
+	EDEB_EN(7, "ehea_qp=%p, nr_wqes=%d", qp, nr_wqes);
+	hipz_galpa_store_acc(gal, QPTEMM_OFFSET(qpx_rq3a),
+			     EHEA_BMASK_SET(QPX_RQ1A_VALUE, nr_wqes));
+	EDEB_EX(7, "QPx_RQA = %i", nr_wqes);
+}
+
+static inline void ehea_update_rq2a(struct ehea_qp *qp, u16 nr_wqes)
+{
+	struct h_galpa gal = qp->galpas.kernel;
+	EDEB_EN(7, "ehea_qp=%p, nr_wqes=%d", qp, nr_wqes);
+	hipz_galpa_store_acc(gal, QPTEMM_OFFSET(qpx_rq2a),
+			     EHEA_BMASK_SET(QPX_RQ1A_VALUE, nr_wqes));
+	EDEB_EX(7, "QPx_RQA = %i", nr_wqes);
+}
+
+static inline void ehea_update_rq1a(struct ehea_qp *qp, u16 nr_wqes)
+{
+	struct h_galpa gal = qp->galpas.kernel;
+	EDEB_EN(7, "ehea_qp=%p, nr_wqes=%d", qp, nr_wqes);
+	hipz_galpa_store_acc(gal, QPTEMM_OFFSET(qpx_rq1a),
+			     EHEA_BMASK_SET(QPX_RQ1A_VALUE, nr_wqes));
+	EDEB_EX(7, "QPx_RQA = %i", nr_wqes);
+}
+
+static inline void ehea_update_feca(struct ehea_cq *cq, u32 nr_cqes)
+{
+	struct h_galpa gal = cq->galpas.kernel;
+	EDEB_EN(7, "");
+	hipz_galpa_store_acc(gal, CQTEMM_OFFSET(cqx_feca),
+			     EHEA_BMASK_SET(CQX_FECADDER, nr_cqes));
+	EDEB_EX(7, "cqx_feca = %i", nr_cqes);
+}
+
+static inline void ehea_reset_cq_n1(struct ehea_cq *cq)
+{
+	struct h_galpa gal = cq->galpas.kernel;
+	EDEB_EN(7, "");
+	hipz_galpa_store_cq(gal,
+			    cqx_n1,
+			    EHEA_BMASK_SET(CQX_N1_GENERATE_COMP_EVENT, 1));
+	EDEB_EX(7, "");
+}
+
+static inline void ehea_reset_cq_ep(struct ehea_cq *my_cq)
+{
+	struct h_galpa gal = my_cq->galpas.kernel;
+	EDEB_EN(7, "");
+	hipz_galpa_store_acc(gal,
+			     CQTEMM_OFFSET(cqx_ep),
+			     EHEA_BMASK_SET(CQX_EP_EVENT_PENDING, 0));
+	EDEB_EX(7, "");
+}
+
+
+#endif	/* __EHEA_HW_H__ */


--- linux-2.6.17-rc6-orig/drivers/net/ehea/Makefile	1969-12-31 16:00:00.000000000 -0800
+++ kernel/drivers/net/ehea/Makefile	2006-06-09 05:29:59.170253728 -0700
@@ -0,0 +1,7 @@
+#
+# Makefile for the eHEA ethernet device driver for IBM eServer System p
+#
+
+ehea_mod-objs = ehea_main.o ehea_phyp.o ehea_qmr.o ehea_ethtool.o ehea_phyp.o
+obj-$(CONFIG_EHEA) += ehea_mod.o
+

--
Please review and ACK for RHEL5.0
----------
Manoj Iyer
IBM, Linux on PowerPC
Redhat Onsite Developer.
Phone: 1-978-392-3934
Cell: 1-512-350-3400
10 Technology Park Dr
Westford MA.


linux-2.6-nfs-64-bit-inode-support.patch:
 arch/alpha/kernel/osf_sys.c       |    6 +++++-
 arch/ia64/ia32/sys_ia32.c         |   23 ++++++++++++++++++-----
 arch/mips/kernel/linux32.c        |    2 ++
 arch/mips/kernel/sysirix.c        |   10 +++++++---
 arch/parisc/hpux/fs.c             |    6 +++++-
 arch/parisc/kernel/sys_parisc32.c |   19 ++++++++++++++++---
 arch/powerpc/kernel/sys_ppc32.c   |   15 ++++++++++++---
 arch/s390/kernel/compat_linux.c   |    5 +++++
 arch/sparc/kernel/sys_sunos.c     |   16 ++++++++++++----
 arch/sparc64/kernel/sys_sparc32.c |    5 +++++
 arch/sparc64/kernel/sys_sunos32.c |   12 ++++++++++--
 arch/sparc64/solaris/fs.c         |    7 ++++++-
 arch/x86_64/ia32/sys_ia32.c       |    7 ++++++-
 fs/afs/dir.c                      |    4 ++--
 fs/compat.c                       |   18 +++++++++++++-----
 fs/exportfs/expfs.c               |    2 +-
 fs/fat/dir.c                      |    2 +-
 fs/nfs/dir.c                      |    6 +++---
 fs/nfs/inode.c                    |   21 ++++++++++-----------
 fs/nfsd/nfs4recover.c             |    2 +-
 fs/readdir.c                      |   18 +++++++++++++-----
 fs/reiserfs/xattr.c               |    6 +++---
 fs/stat.c                         |    6 ++++++
 include/linux/fs.h                |    2 +-
 include/linux/nfs_fs.h            |    9 ---------
 include/linux/stat.h              |    2 +-
 26 files changed, 164 insertions(+), 67 deletions(-)

--- NEW FILE linux-2.6-nfs-64-bit-inode-support.patch ---
Date: Tue, 15 Aug 2006 16:36:05 +0100
From: David Howells <dhowells at redhat.com>

Make filldir_t take a 64-bit inode number and struct kstat carry a 64-bit inode
number so that 64-bit inode numbers can be passed back to userspace.

The stat functions then returns the full 64-bit inode number where available
and where possible.  If it is not possible to represent the inode number
supplied by the filesystem in the field provided by userspace, then error
EOVERFLOW will be issued.

Similarly, the getdents/readdir functions now pass the full 64-bit inode number
to userspace where possible, returning EOVERFLOW instead when a directory entry
is encountered that can't be properly represented.

Note that this means that some inodes will not be stat'able on a 32-bit system
with old libraries where they were before - but it does mean that there will be
no ambiguity over what a 32-bit inode number refers to.

Note similarly that directory scans may be cut short with an error on a 32-bit
system with old libraries where the scan would work before for the same
reasons.

It is judged unlikely that this situation will occur because modern glibc uses
64-bit capable versions of stat and getdents class functions exclusively, and
that older systems are unlikely to encounter unrepresentable inode numbers
anyway.

Signed-Off-By: David Howells <dhowells at redhat.com>
---

 arch/alpha/kernel/osf_sys.c       |    6 +++++-
 arch/ia64/ia32/sys_ia32.c         |   23 ++++++++++++++++++-----
 arch/mips/kernel/linux32.c        |    2 ++
 arch/mips/kernel/sysirix.c        |   10 +++++++---
 arch/parisc/hpux/fs.c             |    6 +++++-
 arch/parisc/kernel/sys_parisc32.c |   19 ++++++++++++++++---
 arch/powerpc/kernel/sys_ppc32.c   |   15 ++++++++++++---
 arch/s390/kernel/compat_linux.c   |    5 +++++
 arch/sparc/kernel/sys_sunos.c     |   16 ++++++++++++----
 arch/sparc64/kernel/sys_sparc32.c |    5 +++++
 arch/sparc64/kernel/sys_sunos32.c |   12 ++++++++++--
 arch/sparc64/solaris/fs.c         |    7 ++++++-
 arch/x86_64/ia32/sys_ia32.c       |    7 ++++++-
 fs/afs/dir.c                      |    4 ++--
 fs/compat.c                       |   18 +++++++++++++-----
 fs/exportfs/expfs.c               |    2 +-
 fs/fat/dir.c                      |    2 +-
 fs/nfsd/nfs4recover.c             |    2 +-
 fs/readdir.c                      |   18 +++++++++++++-----
 fs/reiserfs/xattr.c               |    6 +++---
 fs/stat.c                         |    6 ++++++
 include/linux/fs.h                |    2 +-
 include/linux/stat.h              |    2 +-
 23 files changed, 151 insertions(+), 44 deletions(-)

Index: latest/arch/alpha/kernel/osf_sys.c
===================================================================
--- latest.orig/arch/alpha/kernel/osf_sys.c
+++ latest/arch/alpha/kernel/osf_sys.c
@@ -116,17 +116,21 @@ osf_filldir(void *__buf, const char *nam
 	struct osf_dirent __user *dirent;
 	struct osf_dirent_callback *buf = (struct osf_dirent_callback *) __buf;
 	unsigned int reclen = ROUND_UP(NAME_OFFSET + namlen + 1);
+	unsigned int d_ino;
 
 	buf->error = -EINVAL;	/* only used if we fail */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	if (buf->basep) {
 		if (put_user(offset, buf->basep))
 			return -EFAULT;
 		buf->basep = NULL;
 	}
 	dirent = buf->dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(namlen, &dirent->d_namlen);
 	put_user(reclen, &dirent->d_reclen);
 	if (copy_to_user(dirent->d_name, name, namlen) ||
Index: latest/arch/ia64/ia32/sys_ia32.c
===================================================================
--- latest.orig/arch/ia64/ia32/sys_ia32.c
+++ latest/arch/ia64/ia32/sys_ia32.c
@@ -125,6 +125,7 @@ sys32_execve (char __user *name, compat_
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
 {
+	compat_ino_t ino;
 	int err;
 
 	if ((u64) stat->size > MAX_NON_LFS ||
@@ -132,11 +133,15 @@ int cp_compat_stat(struct kstat *stat, s
 	    !old_valid_dev(stat->rdev))
 		return -EOVERFLOW;
 
+	ino = stat->ino;
+	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+		return -EOVERFLOW;
+
 	if (clear_user(ubuf, sizeof(*ubuf)))
 		return -EFAULT;
 
 	err  = __put_user(old_encode_dev(stat->dev), &ubuf->st_dev);
-	err |= __put_user(stat->ino, &ubuf->st_ino);
+	err |= __put_user(ino, &ubuf->st_ino);
 	err |= __put_user(stat->mode, &ubuf->st_mode);
 	err |= __put_user(stat->nlink, &ubuf->st_nlink);
 	err |= __put_user(high2lowuid(stat->uid), &ubuf->st_uid);
@@ -1222,16 +1227,20 @@ struct readdir32_callback {
 };
 
 static int
-filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino,
+filldir32 (void *__buf, const char *name, int namlen, loff_t offset, u64 ino,
 	   unsigned int d_type)
 {
 	struct compat_dirent __user * dirent;
 	struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
 	int reclen = ROUND_UP(offsetof(struct compat_dirent, d_name) + namlen + 1, 4);
+	u32 d_ino;
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->error = -EFAULT;	/* only used if we fail.. */
 	dirent = buf->previous;
 	if (dirent)
@@ -1239,7 +1248,7 @@ filldir32 (void *__buf, const char *name
 			return -EFAULT;
 	dirent = buf->current_dir;
 	buf->previous = dirent;
-	if (put_user(ino, &dirent->d_ino)
+	if (put_user(d_ino, &dirent->d_ino)
 	    || put_user(reclen, &dirent->d_reclen)
 	    || copy_to_user(dirent->d_name, name, namlen)
 	    || put_user(0, dirent->d_name + namlen))
@@ -1287,17 +1296,21 @@ out:
 }
 
 static int
-fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, ino_t ino,
+fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, u64 ino,
 	      unsigned int d_type)
 {
 	struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
 	struct old_linux32_dirent __user * dirent;
+	u32 d_ino;
 
 	if (buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->count++;
 	dirent = buf->dirent;
-	if (put_user(ino, &dirent->d_ino)
+	if (put_user(d_ino, &dirent->d_ino)
 	    || put_user(offset, &dirent->d_offset)
 	    || put_user(namlen, &dirent->d_namlen)
 	    || copy_to_user(dirent->d_name, name, namlen)
Index: latest/arch/mips/kernel/linux32.c
===================================================================
--- latest.orig/arch/mips/kernel/linux32.c
+++ latest/arch/mips/kernel/linux32.c
@@ -77,6 +77,8 @@ int cp_compat_stat(struct kstat *stat, s
 	memset(&tmp, 0, sizeof(tmp));
 	tmp.st_dev = new_encode_dev(stat->dev);
 	tmp.st_ino = stat->ino;
+	if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+		return -EOVERFLOW;
 	tmp.st_mode = stat->mode;
 	tmp.st_nlink = stat->nlink;
 	SET_UID(tmp.st_uid, stat->uid);
Index: latest/arch/mips/kernel/sysirix.c
===================================================================
--- latest.orig/arch/mips/kernel/sysirix.c
+++ latest/arch/mips/kernel/sysirix.c
@@ -1739,12 +1739,13 @@ struct irix_dirent32_callback {
 #define ROUND_UP32(x) (((x)+sizeof(u32)-1) & ~(sizeof(u32)-1))
 
 static int irix_filldir32(void *__buf, const char *name,
-	int namlen, loff_t offset, ino_t ino, unsigned int d_type)
+	int namlen, loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct irix_dirent32 __user *dirent;
 	struct irix_dirent32_callback *buf = __buf;
 	unsigned short reclen = ROUND_UP32(NAME_OFFSET32(dirent) + namlen + 1);
 	int err = 0;
+	u32 d_ino;
 
 #ifdef DEBUG_GETDENTS
 	printk("\nirix_filldir32[reclen<%d>namlen<%d>count<%d>]",
@@ -1753,12 +1754,15 @@ static int irix_filldir32(void *__buf, c
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent)
 		err = __put_user(offset, &dirent->d_off);
 	dirent = buf->current_dir;
 	err |= __put_user(dirent, &buf->previous);
-	err |= __put_user(ino, &dirent->d_ino);
+	err |= __put_user(d_ino, &dirent->d_ino);
 	err |= __put_user(reclen, &dirent->d_reclen);
 	err |= copy_to_user((char __user *)dirent->d_name, name, namlen) ? -EFAULT : 0;
 	err |= __put_user(0, &dirent->d_name[namlen]);
@@ -1837,7 +1841,7 @@ struct irix_dirent64_callback {
 #define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
 
 static int irix_filldir64(void *__buf, const char *name,
-	int namlen, loff_t offset, ino_t ino, unsigned int d_type)
+	int namlen, loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct irix_dirent64 __user *dirent;
 	struct irix_dirent64_callback * buf = __buf;
Index: latest/arch/parisc/hpux/fs.c
===================================================================
--- latest.orig/arch/parisc/hpux/fs.c
+++ latest/arch/parisc/hpux/fs.c
@@ -77,17 +77,21 @@ static int filldir(void * __buf, const c
 {
 	struct hpux_dirent * dirent;
 	struct getdents_callback * buf = (struct getdents_callback *) __buf;
+	ino_t d_ino;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent)
 		put_user(offset, &dirent->d_off);
 	dirent = buf->current_dir;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(reclen, &dirent->d_reclen);
 	put_user(namlen, &dirent->d_namlen);
 	copy_to_user(dirent->d_name, name, namlen);
Index: latest/arch/parisc/kernel/sys_parisc32.c
===================================================================
--- latest.orig/arch/parisc/kernel/sys_parisc32.c
+++ latest/arch/parisc/kernel/sys_parisc32.c
@@ -237,14 +237,19 @@ int sys32_settimeofday(struct compat_tim
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+	compat_ino_t ino;
 	int err;
 
 	if (stat->size > MAX_NON_LFS || !new_valid_dev(stat->dev) ||
 	    !new_valid_dev(stat->rdev))
 		return -EOVERFLOW;
 
+	ino = stat->ino;
+	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+		return -EOVERFLOW;
+
 	err  = put_user(new_encode_dev(stat->dev), &statbuf->st_dev);
-	err |= put_user(stat->ino, &statbuf->st_ino);
+	err |= put_user(ino, &statbuf->st_ino);
 	err |= put_user(stat->mode, &statbuf->st_mode);
 	err |= put_user(stat->nlink, &statbuf->st_nlink);
 	err |= put_user(0, &statbuf->st_reserved1);
@@ -312,16 +317,20 @@ filldir32 (void *__buf, const char *name
 	struct linux32_dirent __user * dirent;
 	struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1, 4);
+	u32 d_ino;
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent)
 		put_user(offset, &dirent->d_off);
 	dirent = buf->current_dir;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(reclen, &dirent->d_reclen);
 	copy_to_user(dirent->d_name, name, namlen);
 	put_user(0, dirent->d_name + namlen);
@@ -371,12 +380,16 @@ fillonedir32 (void * __buf, const char *
 {
 	struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
 	struct old_linux32_dirent __user * dirent;
+	u32 d_ino;
 
 	if (buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->count++;
 	dirent = buf->dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(offset, &dirent->d_offset);
 	put_user(namlen, &dirent->d_namlen);
 	copy_to_user(dirent->d_name, name, namlen);
Index: latest/arch/powerpc/kernel/sys_ppc32.c
===================================================================
--- latest.orig/arch/powerpc/kernel/sys_ppc32.c
+++ latest/arch/powerpc/kernel/sys_ppc32.c
@@ -69,16 +69,20 @@ struct readdir_callback32 {
 };
 
 static int fillonedir(void * __buf, const char * name, int namlen,
-		                  off_t offset, ino_t ino, unsigned int d_type)
+		                  off_t offset, u64 ino, unsigned int d_type)
 {
 	struct readdir_callback32 * buf = (struct readdir_callback32 *) __buf;
 	struct old_linux_dirent32 __user * dirent;
+	ino_t d_ino;
 
 	if (buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->count++;
 	dirent = buf->dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(offset, &dirent->d_offset);
 	put_user(namlen, &dirent->d_namlen);
 	copy_to_user(dirent->d_name, name, namlen);
@@ -120,15 +124,20 @@ asmlinkage long ppc32_select(u32 n, comp
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+	compat_ino_t ino;
 	long err;
 
 	if (stat->size > MAX_NON_LFS || !new_valid_dev(stat->dev) ||
 	    !new_valid_dev(stat->rdev))
 		return -EOVERFLOW;
 
+	ino = stat->ino;
+	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+		return -EOVERFLOW;
+
 	err  = access_ok(VERIFY_WRITE, statbuf, sizeof(*statbuf)) ? 0 : -EFAULT;
 	err |= __put_user(new_encode_dev(stat->dev), &statbuf->st_dev);
-	err |= __put_user(stat->ino, &statbuf->st_ino);
+	err |= __put_user(ino, &statbuf->st_ino);
 	err |= __put_user(stat->mode, &statbuf->st_mode);
 	err |= __put_user(stat->nlink, &statbuf->st_nlink);
 	err |= __put_user(stat->uid, &statbuf->st_uid);
Index: latest/arch/s390/kernel/compat_linux.c
===================================================================
--- latest.orig/arch/s390/kernel/compat_linux.c
+++ latest/arch/s390/kernel/compat_linux.c
@@ -357,11 +357,16 @@ asmlinkage long sys32_ftruncate64(unsign
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+	compat_ino_t ino;
 	int err;
 
 	if (!old_valid_dev(stat->dev) || !old_valid_dev(stat->rdev))
 		return -EOVERFLOW;
 
+	ino = stat->ino;
+	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+		return -EOVERFLOW;
+
 	err = put_user(old_encode_dev(stat->dev), &statbuf->st_dev);
 	err |= put_user(stat->ino, &statbuf->st_ino);
 	err |= put_user(stat->mode, &statbuf->st_mode);
Index: latest/arch/sparc/kernel/sys_sunos.c
===================================================================
--- latest.orig/arch/sparc/kernel/sys_sunos.c
+++ latest/arch/sparc/kernel/sys_sunos.c
@@ -325,21 +325,25 @@ struct sunos_dirent_callback {
 #define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
 
 static int sunos_filldir(void * __buf, const char * name, int namlen,
-			 loff_t offset, ino_t ino, unsigned int d_type)
+			 loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct sunos_dirent __user *dirent;
 	struct sunos_dirent_callback * buf = __buf;
+	unsigned long d_ino;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent)
 		put_user(offset, &dirent->d_off);
 	dirent = buf->curr;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(namlen, &dirent->d_namlen);
 	put_user(reclen, &dirent->d_reclen);
 	copy_to_user(dirent->d_name, name, namlen);
@@ -406,19 +410,23 @@ struct sunos_direntry_callback {
 };
 
 static int sunos_filldirentry(void * __buf, const char * name, int namlen,
-			      loff_t offset, ino_t ino, unsigned int d_type)
+			      loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct sunos_direntry __user *dirent;
 	struct sunos_direntry_callback *buf = __buf;
+	unsigned long d_ino;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	dirent = buf->curr;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(namlen, &dirent->d_namlen);
 	put_user(reclen, &dirent->d_reclen);
 	copy_to_user(dirent->d_name, name, namlen);
Index: latest/arch/sparc64/kernel/sys_sparc32.c
===================================================================
--- latest.orig/arch/sparc64/kernel/sys_sparc32.c
+++ latest/arch/sparc64/kernel/sys_sparc32.c
@@ -337,12 +337,17 @@ asmlinkage long sys32_ftruncate64(unsign
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+	compat_ino_t ino;
 	int err;
 
 	if (stat->size > MAX_NON_LFS || !old_valid_dev(stat->dev) ||
 	    !old_valid_dev(stat->rdev))
 		return -EOVERFLOW;
 
+	ino = stat->ino;
+	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+		return -EOVERFLOW;
+
 	err  = put_user(old_encode_dev(stat->dev), &statbuf->st_dev);
 	err |= put_user(stat->ino, &statbuf->st_ino);
 	err |= put_user(stat->mode, &statbuf->st_mode);
Index: latest/arch/sparc64/kernel/sys_sunos32.c
===================================================================
--- latest.orig/arch/sparc64/kernel/sys_sunos32.c
+++ latest/arch/sparc64/kernel/sys_sunos32.c
@@ -280,16 +280,20 @@ static int sunos_filldir(void * __buf, c
 	struct sunos_dirent __user *dirent;
 	struct sunos_dirent_callback * buf = (struct sunos_dirent_callback *) __buf;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
+	u32 d_ino;
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent)
 		put_user(offset, &dirent->d_off);
 	dirent = buf->curr;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(namlen, &dirent->d_namlen);
 	put_user(reclen, &dirent->d_reclen);
 	if (copy_to_user(dirent->d_name, name, namlen))
@@ -363,14 +367,18 @@ static int sunos_filldirentry(void * __b
 	struct sunos_direntry_callback * buf =
 		(struct sunos_direntry_callback *) __buf;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
+	u32 d_ino;
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	dirent = buf->curr;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(namlen, &dirent->d_namlen);
 	put_user(reclen, &dirent->d_reclen);
 	if (copy_to_user(dirent->d_name, name, namlen))
Index: latest/arch/sparc64/solaris/fs.c
===================================================================
--- latest.orig/arch/sparc64/solaris/fs.c
+++ latest/arch/sparc64/solaris/fs.c
@@ -82,12 +82,17 @@ struct sol_stat64 {
 
 static inline int putstat(struct sol_stat __user *ubuf, struct kstat *kbuf)
 {
+	u32 ino;
+
 	if (kbuf->size > MAX_NON_LFS ||
 	    !sysv_valid_dev(kbuf->dev) ||
 	    !sysv_valid_dev(kbuf->rdev))
 		return -EOVERFLOW;
+	ino = kbuf->ino;
+	if (sizeof(ino) < sizeof(kbuf->ino) && ino != kbuf->ino)
+		return -EOVERFLOW;
 	if (put_user (sysv_encode_dev(kbuf->dev), &ubuf->st_dev)	||
-	    __put_user (kbuf->ino, &ubuf->st_ino)		||
+	    __put_user (ino, &ubuf->st_ino)				||
 	    __put_user (kbuf->mode, &ubuf->st_mode)		||
 	    __put_user (kbuf->nlink, &ubuf->st_nlink)	||
 	    __put_user (kbuf->uid, &ubuf->st_uid)		||
Index: latest/arch/x86_64/ia32/sys_ia32.c
===================================================================
--- latest.orig/arch/x86_64/ia32/sys_ia32.c
+++ latest/arch/x86_64/ia32/sys_ia32.c
@@ -75,6 +75,8 @@
 
 int cp_compat_stat(struct kstat *kbuf, struct compat_stat __user *ubuf)
 {
+	compat_ino_t ino;
+
 	typeof(ubuf->st_uid) uid = 0;
 	typeof(ubuf->st_gid) gid = 0;
 	SET_UID(uid, kbuf->uid);
@@ -83,9 +85,12 @@ int cp_compat_stat(struct kstat *kbuf, s
 		return -EOVERFLOW;
 	if (kbuf->size >= 0x7fffffff)
 		return -EOVERFLOW;
+	ino = kbuf->ino;
+	if (sizeof(ino) < sizeof(kbuf->ino) && ino != kbuf->ino)
+		return -EOVERFLOW;
 	if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct compat_stat)) ||
 	    __put_user (old_encode_dev(kbuf->dev), &ubuf->st_dev) ||
-	    __put_user (kbuf->ino, &ubuf->st_ino) ||
+	    __put_user (ino, &ubuf->st_ino) ||
 	    __put_user (kbuf->mode, &ubuf->st_mode) ||
 	    __put_user (kbuf->nlink, &ubuf->st_nlink) ||
 	    __put_user (uid, &ubuf->st_uid) ||
Index: latest/fs/afs/dir.c
===================================================================
--- latest.orig/fs/afs/dir.c
+++ latest/fs/afs/dir.c
@@ -30,7 +30,7 @@ static int afs_dir_readdir(struct file *
 static int afs_d_revalidate(struct dentry *dentry, struct nameidata *nd);
 static int afs_d_delete(struct dentry *dentry);
 static int afs_dir_lookup_filldir(void *_cookie, const char *name, int nlen,
-				  loff_t fpos, ino_t ino, unsigned dtype);
+				  loff_t fpos, u64 ino, unsigned dtype);
 
 const struct file_operations afs_dir_file_operations = {
 	.open		= afs_dir_open,
@@ -408,7 +408,7 @@ static int afs_dir_readdir(struct file *
  *   uniquifier through dtype
  */
 static int afs_dir_lookup_filldir(void *_cookie, const char *name, int nlen,
-				  loff_t fpos, ino_t ino, unsigned dtype)
+				  loff_t fpos, u64 ino, unsigned dtype)
 {
 	struct afs_dir_lookup_cookie *cookie = _cookie;
 
Index: latest/fs/compat.c
===================================================================
--- latest.orig/fs/compat.c
+++ latest/fs/compat.c
@@ -918,20 +918,24 @@ struct compat_readdir_callback {
 };
 
 static int compat_fillonedir(void *__buf, const char *name, int namlen,
-			loff_t offset, ino_t ino, unsigned int d_type)
+			loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct compat_readdir_callback *buf = __buf;
 	struct compat_old_linux_dirent __user *dirent;
+	compat_ulong_t d_ino;
 
 	if (buf->result)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->result++;
 	dirent = buf->dirent;
 	if (!access_ok(VERIFY_WRITE, dirent,
 			(unsigned long)(dirent->d_name + namlen + 1) -
 				(unsigned long)dirent))
 		goto efault;
-	if (	__put_user(ino, &dirent->d_ino) ||
+	if (	__put_user(d_ino, &dirent->d_ino) ||
 		__put_user(offset, &dirent->d_offset) ||
 		__put_user(namlen, &dirent->d_namlen) ||
 		__copy_to_user(dirent->d_name, name, namlen) ||
@@ -982,22 +986,26 @@ struct compat_getdents_callback {
 };
 
 static int compat_filldir(void *__buf, const char *name, int namlen,
-		loff_t offset, ino_t ino, unsigned int d_type)
+		loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct compat_linux_dirent __user * dirent;
 	struct compat_getdents_callback *buf = __buf;
+	compat_ulong_t d_ino;
 	int reclen = COMPAT_ROUND_UP(NAME_OFFSET(dirent) + namlen + 2);
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent) {
 		if (__put_user(offset, &dirent->d_off))
 			goto efault;
 	}
 	dirent = buf->current_dir;
-	if (__put_user(ino, &dirent->d_ino))
+	if (__put_user(d_ino, &dirent->d_ino))
 		goto efault;
 	if (__put_user(reclen, &dirent->d_reclen))
 		goto efault;
@@ -1068,7 +1076,7 @@ struct compat_getdents_callback64 {
 };
 
 static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t offset,
-		     ino_t ino, unsigned int d_type)
+		     u64 ino, unsigned int d_type)
 {
 	struct linux_dirent64 __user *dirent;
 	struct compat_getdents_callback64 *buf = __buf;
Index: latest/fs/exportfs/expfs.c
===================================================================
--- latest.orig/fs/exportfs/expfs.c
+++ latest/fs/exportfs/expfs.c
@@ -315,7 +315,7 @@ struct getdents_callback {
  * the name matching the specified inode number.
  */
 static int filldir_one(void * __buf, const char * name, int len,
-			loff_t pos, ino_t ino, unsigned int d_type)
+			loff_t pos, u64 ino, unsigned int d_type)
 {
 	struct getdents_callback *buf = __buf;
 	int result = 0;
Index: latest/fs/fat/dir.c
===================================================================
--- latest.orig/fs/fat/dir.c
+++ latest/fs/fat/dir.c
@@ -647,7 +647,7 @@ static int fat_readdir(struct file *filp
 }
 
 static int fat_ioctl_filldir(void *__buf, const char *name, int name_len,
-			     loff_t offset, ino_t ino, unsigned int d_type)
+			     loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct fat_ioctl_filldir_callback *buf = __buf;
 	struct dirent __user *d1 = buf->dirent;
Index: latest/fs/nfsd/nfs4recover.c
===================================================================
--- latest.orig/fs/nfsd/nfs4recover.c
+++ latest/fs/nfsd/nfs4recover.c
@@ -183,7 +183,7 @@ struct dentry_list_arg {
 
 static int
 nfsd4_build_dentrylist(void *arg, const char *name, int namlen,
-		loff_t offset, ino_t ino, unsigned int d_type)
+		loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct dentry_list_arg *dla = arg;
 	struct list_head *dentries = &dla->dentries;
Index: latest/fs/readdir.c
===================================================================
--- latest.orig/fs/readdir.c
+++ latest/fs/readdir.c
@@ -69,20 +69,24 @@ struct readdir_callback {
 };
 
 static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset,
-		      ino_t ino, unsigned int d_type)
+		      u64 ino, unsigned int d_type)
 {
 	struct readdir_callback * buf = (struct readdir_callback *) __buf;
 	struct old_linux_dirent __user * dirent;
+	unsigned long d_ino;
 
 	if (buf->result)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->result++;
 	dirent = buf->dirent;
 	if (!access_ok(VERIFY_WRITE, dirent,
 			(unsigned long)(dirent->d_name + namlen + 1) -
 				(unsigned long)dirent))
 		goto efault;
-	if (	__put_user(ino, &dirent->d_ino) ||
+	if (	__put_user(d_ino, &dirent->d_ino) ||
 		__put_user(offset, &dirent->d_offset) ||
 		__put_user(namlen, &dirent->d_namlen) ||
 		__copy_to_user(dirent->d_name, name, namlen) ||
@@ -138,22 +142,26 @@ struct getdents_callback {
 };
 
 static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
-		   ino_t ino, unsigned int d_type)
+		   u64 ino, unsigned int d_type)
 {
 	struct linux_dirent __user * dirent;
 	struct getdents_callback * buf = (struct getdents_callback *) __buf;
+	unsigned long d_ino;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 2);
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent) {
 		if (__put_user(offset, &dirent->d_off))
 			goto efault;
 	}
 	dirent = buf->current_dir;
-	if (__put_user(ino, &dirent->d_ino))
+	if (__put_user(d_ino, &dirent->d_ino))
 		goto efault;
 	if (__put_user(reclen, &dirent->d_reclen))
 		goto efault;
@@ -222,7 +230,7 @@ struct getdents_callback64 {
 };
 
 static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
-		     ino_t ino, unsigned int d_type)
+		     u64 ino, unsigned int d_type)
 {
 	struct linux_dirent64 __user *dirent;
 	struct getdents_callback64 * buf = (struct getdents_callback64 *) __buf;
Index: latest/fs/reiserfs/xattr.c
===================================================================
--- latest.orig/fs/reiserfs/xattr.c
+++ latest/fs/reiserfs/xattr.c
@@ -773,7 +773,7 @@ int reiserfs_xattr_del(struct inode *ino
 
 static int
 reiserfs_delete_xattrs_filler(void *buf, const char *name, int namelen,
-			      loff_t offset, ino_t ino, unsigned int d_type)
+			      loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct dentry *xadir = (struct dentry *)buf;
 
@@ -851,7 +851,7 @@ struct reiserfs_chown_buf {
 /* XXX: If there is a better way to do this, I'd love to hear about it */
 static int
 reiserfs_chown_xattrs_filler(void *buf, const char *name, int namelen,
-			     loff_t offset, ino_t ino, unsigned int d_type)
+			     loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct reiserfs_chown_buf *chown_buf = (struct reiserfs_chown_buf *)buf;
 	struct dentry *xafile, *xadir = chown_buf->xadir;
@@ -1036,7 +1036,7 @@ struct reiserfs_listxattr_buf {
 
 static int
 reiserfs_listxattr_filler(void *buf, const char *name, int namelen,
-			  loff_t offset, ino_t ino, unsigned int d_type)
+			  loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct reiserfs_listxattr_buf *b = (struct reiserfs_listxattr_buf *)buf;
 	int len = 0;
Index: latest/fs/stat.c
===================================================================
--- latest.orig/fs/stat.c
+++ latest/fs/stat.c
@@ -140,6 +140,8 @@ static int cp_old_stat(struct kstat *sta
 	memset(&tmp, 0, sizeof(struct __old_kernel_stat));
 	tmp.st_dev = old_encode_dev(stat->dev);
 	tmp.st_ino = stat->ino;
+	if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+		return -EOVERFLOW;
 	tmp.st_mode = stat->mode;
 	tmp.st_nlink = stat->nlink;
 	if (tmp.st_nlink != stat->nlink)
@@ -210,6 +212,8 @@ static int cp_new_stat(struct kstat *sta
 	tmp.st_dev = new_encode_dev(stat->dev);
 #endif
 	tmp.st_ino = stat->ino;
+	if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+		return -EOVERFLOW;
 	tmp.st_mode = stat->mode;
 	tmp.st_nlink = stat->nlink;
 	if (tmp.st_nlink != stat->nlink)
@@ -347,6 +351,8 @@ static long cp_new_stat64(struct kstat *
 	tmp.st_rdev = huge_encode_dev(stat->rdev);
 #endif
 	tmp.st_ino = stat->ino;
+	if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+		return -EOVERFLOW;
 #ifdef STAT64_HAS_BROKEN_ST_INO
 	tmp.__st_ino = stat->ino;
 #endif
Index: latest/include/linux/fs.h
===================================================================
--- latest.orig/include/linux/fs.h
+++ latest/include/linux/fs.h
@@ -1001,7 +1001,7 @@ int generic_osync_inode(struct inode *, 
  * This allows the kernel to read directories into kernel space or
  * to have different dirent layouts depending on the binary type.
  */
-typedef int (*filldir_t)(void *, const char *, int, loff_t, ino_t, unsigned);
+typedef int (*filldir_t)(void *, const char *, int, loff_t, u64, unsigned);
 
 struct block_device_operations {
 	int (*open) (struct inode *, struct file *);
Index: latest/include/linux/stat.h
===================================================================
--- latest.orig/include/linux/stat.h
+++ latest/include/linux/stat.h
@@ -57,7 +57,7 @@
 #include <linux/time.h>
 
 struct kstat {
-	unsigned long	ino;
+	u64		ino;
 	dev_t		dev;
 	umode_t		mode;
 	unsigned int	nlink;
Date: Tue, 15 Aug 2006 16:36:17 +0100
From: David Howells <dhowells at redhat.com>

Building on the previous patch that expanded the inode numbers in struct kstat
and filldir_t to an obligate 64-bits, make NFS represent 64-bit fileids as
64-bit inode numbers rather than compressing them down to 32-bits.

Signed-Off-By: David Howells <dhowells at redhat.com>
---

 fs/nfs/dir.c           |    6 +++---
 fs/nfs/inode.c         |   21 ++++++++++-----------
 include/linux/nfs_fs.h |    9 ---------
 3 files changed, 13 insertions(+), 23 deletions(-)

Index: latest/fs/nfs/dir.c
===================================================================
--- latest.orig/fs/nfs/dir.c
+++ latest/fs/nfs/dir.c
@@ -397,7 +397,7 @@ int nfs_do_filldir(nfs_readdir_descripto
 	struct file	*file = desc->file;
 	struct nfs_entry *entry = desc->entry;
 	struct dentry	*dentry = NULL;
-	unsigned long	fileid;
+	u64		fileid;
 	int		loop_count = 0,
 			res;
 
@@ -408,7 +408,7 @@ int nfs_do_filldir(nfs_readdir_descripto
 		unsigned d_type = DT_UNKNOWN;
 		/* Note: entry->prev_cookie contains the cookie for
 		 *	 retrieving the current dirent on the server */
-		fileid = nfs_fileid_to_ino_t(entry->ino);
+		fileid = entry->ino;
 
 		/* Get a dentry if we have one */
 		if (dentry != NULL)
@@ -418,7 +418,7 @@ int nfs_do_filldir(nfs_readdir_descripto
 		/* Use readdirplus info */
 		if (dentry != NULL && dentry->d_inode != NULL) {
 			d_type = dt_type(dentry->d_inode);
-			fileid = dentry->d_inode->i_ino;
+			fileid = NFS_FILEID(dentry->d_inode);
 		}
 
 		res = filldir(dirent, entry->name, entry->len, 
Index: latest/fs/nfs/inode.c
===================================================================
--- latest.orig/fs/nfs/inode.c
+++ latest/fs/nfs/inode.c
@@ -57,12 +57,6 @@ static void nfs_zap_acl_cache(struct ino
 
 static kmem_cache_t * nfs_inode_cachep;
 
-static inline unsigned long
-nfs_fattr_to_ino_t(struct nfs_fattr *fattr)
-{
-	return nfs_fileid_to_ino_t(fattr->fileid);
-}
-
 int nfs_write_inode(struct inode *inode, int sync)
 {
 	int flags = sync ? FLUSH_SYNC : 0;
@@ -226,7 +220,9 @@ nfs_fhget(struct super_block *sb, struct
 		goto out_no_inode;
 	}
 
-	hash = nfs_fattr_to_ino_t(fattr);
+	hash = fattr->fileid;
+	if (sizeof(hash) < sizeof(u64))
+		hash ^= fattr->fileid >> (sizeof(u64) - sizeof(ino_t)) * 8;
 
 	inode = iget5_locked(sb, hash, nfs_find_actor, nfs_init_locked, &desc);
 	if (inode == NULL) {
@@ -237,9 +233,10 @@ nfs_fhget(struct super_block *sb, struct
 	if (inode->i_state & I_NEW) {
 		struct nfs_inode *nfsi = NFS_I(inode);
 
-		/* We set i_ino for the few things that still rely on it,
-		 * such as stat(2) */
-		inode->i_ino = hash;
+		/* We set i_ino for the few things that still rely on it, such
+		 * as printing messages; stat and filldir use the fileid
+		 * directly since i_ino may not be large enough */
+		inode->i_ino = fattr->fileid;
 
 		/* We can't support update_atime(), since the server will reset it */
 		inode->i_flags |= S_NOATIME|S_NOCMTIME;
@@ -446,8 +443,10 @@ int nfs_getattr(struct vfsmount *mnt, st
 		err = __nfs_revalidate_inode(NFS_SERVER(inode), inode);
 	else
 		err = nfs_revalidate_inode(NFS_SERVER(inode), inode);
-	if (!err)
+	if (!err) {
 		generic_fillattr(inode, stat);
+		stat->ino = NFS_FILEID(inode);
+	}
 	return err;
 }
 
Index: latest/include/linux/nfs_fs.h
===================================================================
--- latest.orig/include/linux/nfs_fs.h
+++ latest/include/linux/nfs_fs.h
@@ -541,15 +541,6 @@ nfs_size_to_loff_t(__u64 size)
 	return (loff_t) size;
 }
 
-static inline ino_t
-nfs_fileid_to_ino_t(u64 fileid)
-{
-	ino_t ino = (ino_t) fileid;
-	if (sizeof(ino_t) < sizeof(u64))
-		ino ^= fileid >> (sizeof(u64)-sizeof(ino_t)) * 8;
-	return ino;
-}
-
 /* NFS root */
 
 extern void * nfs_root_data(void);

linux-2.6-ppc-fix-irq-mapping.patch:
 irq.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc-fix-irq-mapping.patch ---
Date: Thu, 17 Aug 2006 15:55:20 -0400 (EDT)
From: Manoj Iyer <miyer at redhat.com>
Subject: [RHEL5 PPC PATCH] RHBZ# 201731 ((BETA BLOCKER)) fix IDE device
 getting assigned the wrong irq number


RHBZ#:
------
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=201731

Description:
------------
The code for using the radix tree for reverse mapping of interrupts has
a typo that causes it to create incorrect mappings if the software and
hardware numbers happen to be different. This would, among others, cause
the IDE interrupt to fail on js20's. This fixes it.

RHEL Version Found:
-------------------
RHEL5 pre-beta1

Upstream Status:
----------------
Ben Herrenschmidt is working on getting this patch upstream.

Test Status:
------------
I will need to install FC6 or RHEL5-prebata inorder to build  this kernel 
and test it. Since FC6 and RHEL5-prebeta have install problems on a JS20, 
I am unable to test this patch on a JS20. I talked to peter martuccille 
and he agreed that it was acceptable to submit this patch without the 
usual testing.

Proposed Patch:
---------------
ndex: linux-work/arch/powerpc/kernel/irq.c
===================================================================
Index: latest/arch/powerpc/kernel/irq.c
===================================================================
--- latest.orig/arch/powerpc/kernel/irq.c
+++ latest/arch/powerpc/kernel/irq.c
@@ -693,7 +693,7 @@ unsigned int irq_radix_revmap(struct irq
 	/* If not there, try to insert it */
 	virq = irq_find_mapping(host, hwirq);
 	if (virq != NO_IRQ)
-		radix_tree_insert(tree, virq, &irq_map[virq]);
+		radix_tree_insert(tree, hwirq, &irq_map[virq]);
  bail:
 	spin_unlock_irqrestore(&irq_big_lock, flags);
 	return virq;

linux-2.6-selinux-support-range-transitions.patch:
 Kconfig            |   35 ++++++++++++++++++++++++++++++++++-
 include/security.h |    9 +++++++--
 ss/mls.c           |   21 ++++++++++-----------
 ss/policydb.c      |   27 ++++++++++++++++++++-------
 ss/policydb.h      |    7 ++++---
 5 files changed, 75 insertions(+), 24 deletions(-)

--- NEW FILE linux-2.6-selinux-support-range-transitions.patch ---
Date: Mon, 14 Aug 2006 17:27:49 -0400
From: Eric Paris <eparis at redhat.com>

Subject: selinux: enable configuration of max policy version
From: Stephen Smalley <sds at tycho.nsa.gov>

Enable configuration of SELinux maximum supported policy version to support
legacy userland (init) that does not gracefully handle kernels that support
newer policy versions two or more beyond the installed policy, as in FC3
and FC4.

Signed-off-by: Stephen Smalley <sds at tycho.nsa.gov>
Acked-by: James Morris <jmorris at namei.org>
Acked-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 security/selinux/Kconfig            |   33 ++++++++++++++++++++++++++
 security/selinux/include/security.h |    6 +++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff -puN security/selinux/Kconfig~selinux-enable-configuration-of-max-policy-version security/selinux/Kconfig
--- a/security/selinux/Kconfig~selinux-enable-configuration-of-max-policy-version
+++ a/security/selinux/Kconfig
@@ -124,3 +124,36 @@ config SECURITY_SELINUX_ENABLE_SECMARK_D
 
 	  If you are unsure what do do here, select N.
 
+config SECURITY_SELINUX_POLICYDB_VERSION_MAX
+	bool "NSA SELinux maximum supported policy format version"
+	depends on SECURITY_SELINUX
+	default n
+	help
+	  This option enables the maximum policy format version supported
+	  by SELinux to be set to a particular value.  This value is reported
+	  to userspace via /selinux/policyvers and used at policy load time.
+	  It can be adjusted downward to support legacy userland (init) that
+	  does not correctly handle kernels that support newer policy versions.
+
+	  Examples:  For FC3 or FC4, enable this option and set the value via
+	  the next option.  For FC5 and later, do not enable this option.
+
+	  If you are unsure how to answer this question, answer N.
+
+config SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
+	int "NSA SELinux maximum supported policy format version value"
+	depends on SECURITY_SELINUX_POLICYDB_VERSION_MAX
+	range 15 20
+	default 19
+	help
+	  This option sets the value for the maximum policy format version
+	  supported by SELinux.
+
+	  Examples:  For FC3, use 18.  For FC4, use 19.
+
+	  If you are unsure how to answer this question, look for the
+	  policy format version supported by your policy toolchain, by
+	  running 'checkpolicy -V'. Or look at what policy you have
+	  installed under /etc/selinux/$SELINUXTYPE/policy, where
+	  SELINUXTYPE is defined in your /etc/selinux/config.
+
diff -puN security/selinux/include/security.h~selinux-enable-configuration-of-max-policy-version security/selinux/include/security.h
--- a/security/selinux/include/security.h~selinux-enable-configuration-of-max-policy-version
+++ a/security/selinux/include/security.h
@@ -27,7 +27,11 @@
 
 /* Range of policy versions we understand*/
 #define POLICYDB_VERSION_MIN   POLICYDB_VERSION_BASE
-#define POLICYDB_VERSION_MAX   POLICYDB_VERSION_AVTAB
+#ifdef CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX
+#define POLICYDB_VERSION_MAX	CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
+#else
+#define POLICYDB_VERSION_MAX	POLICYDB_VERSION_AVTAB
+#endif
 
 extern int selinux_enabled;
 extern int selinux_mls_enabled;

Date: Mon, 14 Aug 2006 17:27:51 -0400
From: Eric Paris <eparis at redhat.com>

Subject: selinux: add support for range transitions on object classes
From: Darrel Goeddel <dgoeddel at TrustedCS.com>

Introduces support for policy version 21.  This version of the binary
kernel policy allows for defining range transitions on security classes
other than the process security class.  As always, backwards compatibility
for older formats is retained.  The security class is read in as specified
when using the new format, while the "process" security class is assumed
when using an older policy format.

Signed-off-by: Darrel Goeddel <dgoeddel at trustedcs.com>
Signed-off-by: Stephen Smalley <sds at tycho.nsa.gov>
Acked-by: James Morris <jmorris at namei.org>
Acked-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 security/selinux/Kconfig            |    2 -
 security/selinux/include/security.h |    3 +-
 security/selinux/ss/mls.c           |   21 +++++++++-----------
 security/selinux/ss/policydb.c      |   27 +++++++++++++++++++-------
 security/selinux/ss/policydb.h      |    7 +++---
 5 files changed, 37 insertions(+), 23 deletions(-)

diff -puN security/selinux/Kconfig~selinux-add-support-for-range-transitions-on-object security/selinux/Kconfig
--- a/security/selinux/Kconfig~selinux-add-support-for-range-transitions-on-object
+++ a/security/selinux/Kconfig
@@ -143,7 +143,7 @@ config SECURITY_SELINUX_POLICYDB_VERSION
 config SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
 	int "NSA SELinux maximum supported policy format version value"
 	depends on SECURITY_SELINUX_POLICYDB_VERSION_MAX
-	range 15 20
+	range 15 21
 	default 19
 	help
 	  This option sets the value for the maximum policy format version
diff -puN security/selinux/include/security.h~selinux-add-support-for-range-transitions-on-object security/selinux/include/security.h
--- a/security/selinux/include/security.h~selinux-add-support-for-range-transitions-on-object
+++ a/security/selinux/include/security.h
@@ -24,13 +24,14 @@
 #define POLICYDB_VERSION_VALIDATETRANS	19
 #define POLICYDB_VERSION_MLS		19
 #define POLICYDB_VERSION_AVTAB		20
+#define POLICYDB_VERSION_RANGETRANS	21
 
 /* Range of policy versions we understand*/
 #define POLICYDB_VERSION_MIN   POLICYDB_VERSION_BASE
 #ifdef CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX
 #define POLICYDB_VERSION_MAX	CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
 #else
-#define POLICYDB_VERSION_MAX	POLICYDB_VERSION_AVTAB
+#define POLICYDB_VERSION_MAX	POLICYDB_VERSION_RANGETRANS
 #endif
 
 extern int selinux_enabled;
diff -puN security/selinux/ss/mls.c~selinux-add-support-for-range-transitions-on-object security/selinux/ss/mls.c
--- a/security/selinux/ss/mls.c~selinux-add-support-for-range-transitions-on-object
+++ a/security/selinux/ss/mls.c
@@ -530,22 +530,21 @@ int mls_compute_sid(struct context *scon
 		    u32 specified,
 		    struct context *newcontext)
 {
+	struct range_trans *rtr;
+
 	if (!selinux_mls_enabled)
 		return 0;
 
 	switch (specified) {
 	case AVTAB_TRANSITION:
-		if (tclass == SECCLASS_PROCESS) {
-			struct range_trans *rangetr;
-			/* Look for a range transition rule. */
-			for (rangetr = policydb.range_tr; rangetr;
-			     rangetr = rangetr->next) {
-				if (rangetr->dom == scontext->type &&
-				    rangetr->type == tcontext->type) {
-					/* Set the range from the rule */
-					return mls_range_set(newcontext,
-					                     &rangetr->range);
-				}
+		/* Look for a range transition rule. */
+		for (rtr = policydb.range_tr; rtr; rtr = rtr->next) {
+			if (rtr->source_type == scontext->type &&
+			    rtr->target_type == tcontext->type &&
+			    rtr->target_class == tclass) {
+				/* Set the range from the rule */
+				return mls_range_set(newcontext,
+				                     &rtr->target_range);
 			}
 		}
 		/* Fallthrough */
diff -puN security/selinux/ss/policydb.c~selinux-add-support-for-range-transitions-on-object security/selinux/ss/policydb.c
--- a/security/selinux/ss/policydb.c~selinux-add-support-for-range-transitions-on-object
+++ a/security/selinux/ss/policydb.c
@@ -96,6 +96,11 @@ static struct policydb_compat_info polic
 		.sym_num        = SYM_NUM,
 		.ocon_num       = OCON_NUM,
 	},
+	{
+		.version        = POLICYDB_VERSION_RANGETRANS,
+		.sym_num        = SYM_NUM,
+		.ocon_num       = OCON_NUM,
+	},
 };
 
 static struct policydb_compat_info *policydb_lookup_compat(int version)
@@ -645,15 +650,15 @@ void policydb_destroy(struct policydb *p
 
 	for (rt = p->range_tr; rt; rt = rt -> next) {
 		if (lrt) {
-			ebitmap_destroy(&lrt->range.level[0].cat);
-			ebitmap_destroy(&lrt->range.level[1].cat);
+			ebitmap_destroy(&lrt->target_range.level[0].cat);
+			ebitmap_destroy(&lrt->target_range.level[1].cat);
 			kfree(lrt);
 		}
 		lrt = rt;
 	}
 	if (lrt) {
-		ebitmap_destroy(&lrt->range.level[0].cat);
-		ebitmap_destroy(&lrt->range.level[1].cat);
+		ebitmap_destroy(&lrt->target_range.level[0].cat);
+		ebitmap_destroy(&lrt->target_range.level[1].cat);
 		kfree(lrt);
 	}
 
@@ -1829,6 +1834,7 @@ int policydb_read(struct policydb *p, vo
 	}
 
 	if (p->policyvers >= POLICYDB_VERSION_MLS) {
+		int new_rangetr = p->policyvers >= POLICYDB_VERSION_RANGETRANS;
 		rc = next_entry(buf, fp, sizeof(u32));
 		if (rc < 0)
 			goto bad;
@@ -1847,9 +1853,16 @@ int policydb_read(struct policydb *p, vo
 			rc = next_entry(buf, fp, (sizeof(u32) * 2));
 			if (rc < 0)
 				goto bad;
-			rt->dom = le32_to_cpu(buf[0]);
-			rt->type = le32_to_cpu(buf[1]);
-			rc = mls_read_range_helper(&rt->range, fp);
+			rt->source_type = le32_to_cpu(buf[0]);
+			rt->target_type = le32_to_cpu(buf[1]);
+			if (new_rangetr) {
+				rc = next_entry(buf, fp, sizeof(u32));
+				if (rc < 0)
+					goto bad;
+				rt->target_class = le32_to_cpu(buf[0]);
+			} else
+				rt->target_class = SECCLASS_PROCESS;
+			rc = mls_read_range_helper(&rt->target_range, fp);
 			if (rc)
 				goto bad;
 			lrt = rt;
diff -puN security/selinux/ss/policydb.h~selinux-add-support-for-range-transitions-on-object security/selinux/ss/policydb.h
--- a/security/selinux/ss/policydb.h~selinux-add-support-for-range-transitions-on-object
+++ a/security/selinux/ss/policydb.h
@@ -106,9 +106,10 @@ struct cat_datum {
 };
 
 struct range_trans {
-	u32 dom;			/* current process domain */
-	u32 type;			/* program executable type */
-	struct mls_range range;		/* new range */
+	u32 source_type;
+	u32 target_type;
+	u32 target_class;
+	struct mls_range target_range;
 	struct range_trans *next;
 };
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2572
retrieving revision 1.2573
diff -u -r1.2572 -r1.2573
--- kernel-2.6.spec	17 Aug 2006 22:42:52 -0000	1.2572
+++ kernel-2.6.spec	17 Aug 2006 22:47:53 -0000	1.2573
@@ -292,6 +292,7 @@
 Patch301: linux-2.6-cell-mambo-drivers.patch
 Patch302: linux-2.6-hvc-console.patch
 Patch303: linux-2.6-ppc-rtas-check.patch
+Patch304: linux-2.6-ppc-fix-irq-mapping.patch
 
 # 400 - 499   ia64
 
@@ -397,6 +398,9 @@
 Patch1432: linux-2.6-filesystem-caching-for-afs-and-nfs.patch
 Patch1433: linux-2.6-nfs-superblock-unmount-optimization.patch
 
+# NFS uses 64-bit inodes
+Patch1440: linux-2.6-nfs-64-bit-inode-support.patch
+
 # Device mapper / MD layer
 Patch1500: linux-2.6-dm-mirroring.patch
 
@@ -412,9 +416,12 @@
 Patch1720: linux-2.6-proc-self-maps-fix.patch
 Patch1740: linux-2.6-softlockup-disable.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
+Patch1780: linux-2.6-ehea-ethernet-driver.patch
+Patch1790: linux-2.6-drivers-add-qlogic-firmware.patch
 
 # SELinux/audit patches.
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
+Patch1802: linux-2.6-selinux-support-range-transitions.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-oss-warning.patch
@@ -744,6 +751,8 @@
 #%patch302 -p1
 # Check properly for successful RTAS instantiation
 %patch303 -p1
+# fix ppc irq mapping for JS20s
+%patch304 -p1
 
 # S390
 # Kprobes.
@@ -899,6 +908,9 @@
 %patch1432 -p1
 %patch1433 -p1
 
+# NFS supports 64-bit inodes
+%patch1440 -p1
+
 # Device mapper / MD layer
 # dm mirroring
 %patch1500 -p1
@@ -926,9 +938,15 @@
 %patch1740 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
+# support EHEA ethernet driver
+%patch1780 -p1
+# qlogic firmware 
+%patch1790 -p1
 
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1
+# Add support for SELinux range transitions
+%patch1802 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1698,6 +1716,13 @@
 %endif
 
 %changelog
+* Thu Aug 17 2006 Don Zickus <dzickus at redhat.com>
+- NFS 64-bit inode support
+- QLogic firmware
+- SELinux support for range transitions
+- EHEA ethernet driver
+- ppc irq mapping fix
+
 * Wed Aug 16 2006 Roland McGrath <roland at redhat.com>
 - New utrace patch:
   - Fix s390 single-step for real this time.



From fedora-cvs-commits at redhat.com  Thu Aug 17 22:59:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 18:59:28 -0400
Subject: rpms/kernel/devel/configs config-generic,1.237.8.2,1.237.8.3
Message-ID: <200608172259.k7HMxSoJ031136@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv30905/configs

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-generic 
Log Message:
added in a list of beta1 blockers, read changelog for exact list




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237.8.2
retrieving revision 1.237.8.3
diff -u -r1.237.8.2 -r1.237.8.3
--- config-generic	16 Aug 2006 20:43:07 -0000	1.237.8.2
+++ config-generic	17 Aug 2006 22:59:25 -0000	1.237.8.3
@@ -816,6 +816,8 @@
 # CONFIG_TIPC_ADVANCED is not set
 # CONFIG_TIPC_DEBUG is not set
 
+CONFIG_NETLABEL=y
+
 #
 # QoS and/or fair queueing
 #
@@ -2840,3 +2842,4 @@
 
 CONFIG_NFS_FSCACHE=y
 
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set



From fedora-cvs-commits at redhat.com  Thu Aug 17 22:59:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 18:59:28 -0400
Subject: rpms/kernel/devel linux-2.6-drivers-add-qlogic-firmware.patch, NONE,
	1.1.2.1 linux-2.6-ehea-ethernet-driver.patch, NONE,
	1.1.2.1 linux-2.6-net-ipsec-labelling.patch, NONE,
	1.1.2.1 linux-2.6-net-netlabel-cipso.patch, NONE,
	1.1.2.1 linux-2.6-nfs-64-bit-inode-support.patch, NONE,
	1.1.2.1 linux-2.6-ppc-fix-irq-mapping.patch, NONE,
	1.1.2.1 linux-2.6-selinux-support-range-transitions.patch,
	NONE, 1.1.2.1 kernel-2.6.spec, 1.2519.4.4,
	1.2519.4.5 linux-2.6-gfs2-dlm.patch, 1.12.4.2,
	1.12.4.3 linux-2.6-gfs2-locking-exports.patch, 1.1.10.2, 1.1.10.3
Message-ID: <200608172259.k7HMxSJs031117@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30905

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec linux-2.6-gfs2-dlm.patch 
	linux-2.6-gfs2-locking-exports.patch 
Added Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	linux-2.6-drivers-add-qlogic-firmware.patch 
	linux-2.6-ehea-ethernet-driver.patch 
	linux-2.6-net-ipsec-labelling.patch 
	linux-2.6-net-netlabel-cipso.patch 
	linux-2.6-nfs-64-bit-inode-support.patch 
	linux-2.6-ppc-fix-irq-mapping.patch 
	linux-2.6-selinux-support-range-transitions.patch 
Log Message:
added in a list of beta1 blockers, read changelog for exact list



linux-2.6-drivers-add-qlogic-firmware.patch:
 Makefile    |    3 
 ql2100_fw.c | 6419 +++++++++++++++++++++++
 ql2200_fw.c | 7066 +++++++++++++++++++++++++
 ql2300_fw.c |10283 ++++++++++++++++++++++++++++++++++++
 ql2322_fw.c |11100 +++++++++++++++++++++++++++++++++++++++
 ql2400_fw.c |16705 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 qla_os.c    |   14 
 7 files changed, 51583 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-drivers-add-qlogic-firmware.patch ---
Date: Tue, 15 Aug 2006 11:07:15 -0400 (EDT)
From: Chip Coldwell <coldwell at redhat.com>

Part one, the content.

-- 
Charles M. "Chip" Coldwell
Senior Software Engineer
Red Hat, Inc
978-392-2426

diff -pruN a/drivers/scsi/qla2xxx/Makefile b/drivers/scsi/qla2xxx/Makefile
--- a/drivers/scsi/qla2xxx/Makefile	2006-08-15 10:45:32.000000000 -0400
+++ b/drivers/scsi/qla2xxx/Makefile	2006-08-15 10:50:42.000000000 -0400
@@ -1,4 +1,5 @@
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
-		qla_dbg.o qla_sup.o qla_attr.o
+		qla_dbg.o qla_sup.o qla_attr.o ql2100_fw.o ql2200_fw.o \
+		ql2300_fw.o ql2322_fw.o ql2400_fw.o
 
 obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
diff -pruN a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
--- a/drivers/scsi/qla2xxx/qla_os.c	2006-08-15 10:45:32.000000000 -0400
+++ b/drivers/scsi/qla2xxx/qla_os.c	2006-08-15 10:51:14.000000000 -0400
@@ -2575,12 +2575,14 @@ qla2x00_down_timeout(struct semaphore *s
 
 static DECLARE_MUTEX(qla_fw_lock);
 
+extern struct firmware ql2100_fw, ql2200_fw, ql2300_fw, ql2322_fw, ql2400_fw;
+
 static struct fw_blob qla_fw_blobs[FW_BLOBS] = {
-	{ .name = "ql2100_fw.bin", .segs = { 0x1000, 0 }, },
-	{ .name = "ql2200_fw.bin", .segs = { 0x1000, 0 }, },
-	{ .name = "ql2300_fw.bin", .segs = { 0x800, 0 }, },
-	{ .name = "ql2322_fw.bin", .segs = { 0x800, 0x1c000, 0x1e000, 0 }, },
-	{ .name = "ql2400_fw.bin", },
+	{ .name = "ql2100_fw.bin", .segs = { 0x1000, 0 }, .fw = &ql2100_fw },
+	{ .name = "ql2200_fw.bin", .segs = { 0x1000, 0 }, .fw = &ql2200_fw },
+	{ .name = "ql2300_fw.bin", .segs = { 0x800, 0 }, .fw = &ql2300_fw },
+	{ .name = "ql2322_fw.bin", .segs = { 0x800, 0x1c000, 0x1e000, 0 }, .fw = &ql2322_fw },
+	{ .name = "ql2400_fw.bin", .fw = &ql2400_fw },
 };
 
 struct fw_blob *
@@ -2699,7 +2701,7 @@ static void __exit
 qla2x00_module_exit(void)
 {
 	pci_unregister_driver(&qla2xxx_pci_driver);
-	qla2x00_release_firmware();
+	/* qla2x00_release_firmware(); */
 	kmem_cache_destroy(srb_cachep);
 	fc_release_transport(qla2xxx_transport_template);
 }

diff -pruN a/drivers/scsi/qla2xxx/ql2100_fw.c b/drivers/scsi/qla2xxx/ql2100_fw.c
--- a/drivers/scsi/qla2xxx/ql2100_fw.c	1969-12-31 19:00:00.000000000 -0500
+++ b/drivers/scsi/qla2xxx/ql2100_fw.c	2006-08-15 10:49:38.000000000 -0400
@@ -0,0 +1,6419 @@
+/*
+ * Firmware version 1.19 from
+ *
+ * ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2100_fw.bin
+ *
+ * xxd -g 1 -i ql2100_fw.bin | indent -l80 -i8 -o ql2100_fw.c
+ *
+ */
+
+#include <linux/firmware.h>
+
+static u8 ql2100_fw_bin[] = {
+	0x00, 0x78, 0x10, 0x2d, 0x00, 0x00, 0x96, 0x01, 0x00, 0x00, 0x00, 0x01,
+	0x00, 0x13, 0x00, 0x19, 0x00, 0x17, 0x20, 0x43, 0x4f, 0x50, 0x59, 0x52,
+	0x49, 0x47, 0x48, 0x54, 0x20, 0x32, 0x30, 0x30, 0x31, 0x20, 0x51, 0x4c,
+	0x4f, 0x47, 0x49, 0x43, 0x20, 0x43, 0x4f, 0x52, 0x50, 0x4f, 0x52, 0x41,
+	0x54, 0x49, 0x4f, 0x4e, 0x20, 0x49, 0x53, 0x50, 0x32, 0x31, 0x30, 0x30,
+	0x20, 0x46, 0x69, 0x72, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x20, 0x20, 0x56,
+	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x30, 0x31, 0x2e, 0x31, 0x39,
+	0x20, 0x20, 0x20, 0x20, 0x24, 0x00, 0x20, 0x91, 0x20, 0x00, 0x20, 0xc1,
+	0x00, 0x21, 0x20, 0x39, 0xff, 0xff, 0x20, 0x19, 0xaa, 0xaa, 0x27, 0x60,
+	0x20, 0x69, 0x7f, 0xff, 0x20, 0xc1, 0x00, 0x20, 0x2c, 0x2c, 0x2d, 0x34,
+	0x27, 0x62, 0x23, 0x6a, 0x2c, 0x24, 0x2d, 0x04, 0x26, 0x6a, 0x25, 0x62,
+	0xa4, 0x06, 0x00, 0xc0, 0x10, 0x52, 0x20, 0xc1, 0x00, 0x21, 0x2c, 0x2c,
+	0x23, 0x62, 0x2c, 0x04, 0x25, 0x62, 0xa3, 0x06, 0x00, 0x40, 0x10, 0x52,
+	0x20, 0xc1, 0x00, 0x20, 0x20, 0x39, 0x8f, 0xff, 0x20, 0xa1, 0xae, 0x00,
+	0x27, 0x08, 0x81, 0x0d, 0x81, 0x0d, 0x81, 0x0d, 0x81, 0x0d, 0xa1, 0x8c,
+	0x00, 0x0f, 0x20, 0x01, 0x00, 0x0a, 0xa1, 0x12, 0xa0, 0x0e, 0x21, 0xa8,
+	0x41, 0xa4, 0x34, 0x00, 0x82, 0x11, 0x00, 0xc0, 0x10, 0x5f, 0x27, 0x08,
+	0x34, 0x00, 0xa1, 0x02, 0x00, 0x40, 0x10, 0x6f, 0x00, 0x48, 0x10, 0x6f,
+	0x20, 0xa8, 0xa0, 0x0e, 0x41, 0xa4, 0x20, 0xa1, 0xa6, 0x01, 0x20, 0x09,
+	0x00, 0x00, 0x20, 0xa9, 0x07, 0xff, 0x41, 0xa4, 0x34, 0x00, 0x20, 0xc9,
+	0xab, 0xff, 0x20, 0x59, 0x00, 0x00, 0x2b, 0x78, 0x78, 0x23, 0x00, 0x04,
+	0x20, 0x89, 0x25, 0xc7, 0x20, 0x51, 0xa7, 0x00, 0x2a, 0x70, 0x77, 0x62,
+	0xa7, 0x86, 0x8f, 0xff, 0x00, 0x40, 0x10, 0x92, 0x70, 0x5f, 0xce, 0x00,
+	0x70, 0x5b, 0xcd, 0xf1, 0x70, 0x67, 0x02, 0x00, 0x70, 0x6b, 0x02, 0x00,
+	0x00, 0x78, 0x10, 0x9a, 0x70, 0x5b, 0xbe, 0x01, 0x70, 0x67, 0x01, 0x00,
+	0x70, 0x6b, 0x01, 0x00, 0x70, 0x5f, 0xbe, 0x00, 0x10, 0x78, 0x12, 0xdf,
+	0x10, 0x78, 0x13, 0xca, 0x10, 0x78, 0x15, 0x77, 0x10, 0x78, 0x1c, 0xe9,
+	0x10, 0x78, 0x42, 0xec, 0x10, 0x78, 0x76, 0xbf, 0x10, 0x78, 0x13, 0x55,
+	0x10, 0x78, 0x2a, 0xc0, 0x10, 0x78, 0x4e, 0x93, 0x10, 0x78, 0x49, 0xa3,
+	0x10, 0x78, 0x59, 0x4a, 0x10, 0x78, 0x22, 0x63, 0x10, 0x78, 0x5c, 0x43,
+	0x10, 0x78, 0x54, 0x85, 0x10, 0x78, 0x21, 0x62, 0x10, 0x78, 0x22, 0x40,
+	0x20, 0x91, 0x30, 0x09, 0x78, 0x23, 0x00, 0x00, 0x00, 0x90, 0x10, 0xcf,
+	0x78, 0x20, 0xa0, 0x86, 0x00, 0x02, 0x00, 0xc0, 0x10, 0xcf, 0x78, 0x23,
+	0x40, 0x00, 0x00, 0x68, 0x10, 0xc7, 0x78, 0x1b, 0x00, 0x01, 0x20, 0x91,
+	0x50, 0x00, 0x20, 0x91, 0x40, 0x80, 0x2a, 0x70, 0x70, 0x03, 0x00, 0x00,
+	0x20, 0x01, 0x01, 0x7f, 0x20, 0x03, 0x00, 0x00, 0x2a, 0x70, 0x70, 0x00,
+	0xa0, 0x8e, 0x00, 0x03, 0x00, 0xc0, 0x10, 0xef, 0x10, 0x78, 0x36, 0x5e,
+	0x10, 0x78, 0x2a, 0xe8, 0x10, 0x78, 0x4e, 0xe3, 0x10, 0x78, 0x4b, 0x66,
+	0x20, 0x09, 0x01, 0x00, 0x21, 0x04, 0xa0, 0x82, 0x00, 0x02, 0x00, 0x48,
+	0x10, 0xf3, 0x10, 0x78, 0x59, 0x66, 0x00, 0x78, 0x10, 0xd6, 0x10, 0x79,
+	0x10, 0xf7, 0x00, 0x78, 0x10, 0xdc, 0x10, 0x78, 0x71, 0x97, 0x00, 0x78,
+	0x10, 0xeb, 0x11, 0x01, 0x11, 0x02, 0x11, 0xbe, 0x10, 0xff, 0x12, 0x46,
+	0x12, 0xdc, 0x12, 0xdd, 0x12, 0xde, 0x10, 0x78, 0x13, 0x32, 0x00, 0x7c,
+	0x12, 0x7e, 0x0f, 0x7e, 0x20, 0x91, 0x80, 0x00, 0x70, 0x00, 0xa0, 0x86,
+	0x00, 0x01, 0x00, 0xc0, 0x11, 0x98, 0x10, 0x78, 0x3a, 0xec, 0x20, 0x79,
+	0x01, 0x00, 0x78, 0x44, 0xa0, 0x05, 0x00, 0xc0, 0x11, 0x98, 0x20, 0x11,
+	0x41, 0xdc, 0x10, 0x78, 0x5a, 0x45, 0x10, 0x78, 0x1a, 0xdf, 0x78, 0x0f,
+	0x00, 0xff, 0x78, 0x40, 0xa0, 0x84, 0xff, 0xfb, 0x78, 0x42, 0x20, 0x11,
+	0x80, 0x10, 0x73, 0xc4, 0x10, 0x78, 0x36, 0x1b, 0x20, 0x01, 0xff, 0xff,
+	0x10, 0x78, 0x5a, 0xe6, 0x72, 0x3c, 0xc2, 0x84, 0x72, 0x3e, 0x20, 0x01,
+	0xa7, 0x0c, 0x20, 0x14, 0xc2, 0xac, 0x22, 0x02, 0x10, 0x78, 0x6f, 0x9f,
+	0x20, 0x11, 0x00, 0x04, 0x10, 0x78, 0x8d, 0x2b, 0x10, 0x78, 0x48, 0x9e,
+	0x10, 0x78, 0x42, 0xd4, 0x00, 0x40, 0x11, 0x44, 0x70, 0x87, 0x00, 0x01,
+	0x70, 0xbf, 0x00, 0x00, 0x10, 0x78, 0x3c, 0x9e, 0x00, 0x78, 0x11, 0x98,
+	0x10, 0x78, 0x49, 0x67, 0x00, 0x40, 0x11, 0x4d, 0x7a, 0x0c, 0xc2, 0xb4,
+	0x7a, 0x0e, 0x00, 0x78, 0x11, 0x59, 0x10, 0x78, 0x90, 0xb6, 0x70, 0xcc,
+	0xd0, 0x9c, 0x00, 0xc0, 0x11, 0x59, 0x70, 0x98, 0xa0, 0x05, 0x00, 0x40,
+	0x11, 0x59, 0x10, 0x78, 0x42, 0xb8, 0x70, 0xd7, 0x00, 0x00, 0x70, 0xd3,
+	0x00, 0x00, 0x72, 0xcc, 0x20, 0x79, 0xa7, 0x52, 0x78, 0x04, 0xd0, 0xac,
+	0x00, 0x40, 0x11, 0x65, 0xc2, 0x95, 0x72, 0xce, 0xa2, 0x96, 0x00, 0x04,
+	0x00, 0x40, 0x11, 0x86, 0x20, 0x11, 0x00, 0x01, 0x10, 0x78, 0x8d, 0x2b,
+	0x70, 0x93, 0x00, 0x00, 0x70, 0x97, 0xff, 0xff, 0x70, 0x03, 0x00, 0x02,
+	0x0f, 0x7f, 0x10, 0x78, 0x26, 0x77, 0x20, 0x11, 0x00, 0x05, 0x10, 0x78,
+	0x70, 0xe0, 0x10, 0x78, 0x62, 0xd1, 0x0c, 0x7e, 0x20, 0x61, 0x01, 0x00,
+	0x60, 0xe3, 0x00, 0x08, 0x0c, 0x7f, 0x12, 0x7f, 0x00, 0x78, 0x11, 0x9a,
+	0x70, 0x93, 0x00, 0x00, 0x70, 0x97, 0xff, 0xff, 0x70, 0x03, 0x00, 0x02,
+	0x20, 0x11, 0x00, 0x05, 0x10, 0x78, 0x70, 0xe0, 0x10, 0x78, 0x62, 0xd1,
+	0x0c, 0x7e, 0x20, 0x61, 0x01, 0x00, 0x60, 0xe3, 0x00, 0x08, 0x0c, 0x7f,
+	0x0f, 0x7f, 0x12, 0x7f, 0x00, 0x7c, 0x0c, 0x7e, 0x20, 0xa9, 0x00, 0x82,
+	0x20, 0x09, 0x00, 0x7e, 0x01, 0x7e, 0x02, 0x7e, 0x03, 0x7e, 0x21, 0x10,
+	0x02, 0x7e, 0x20, 0x19, 0x00, 0x29, 0x10, 0x78, 0x73, 0xd0, 0x02, 0x7f,
+	0x10, 0x78, 0xa5, 0x01, 0x03, 0x7f, 0x02, 0x7f, 0x01, 0x7f, 0x10, 0x78,
+	0x29, 0x8e, 0x81, 0x08, 0x00, 0xf0, 0x11, 0xa0, 0x0c, 0x7f, 0x70, 0x6f,
+	0x00, 0x00, 0x70, 0x70, 0xa0, 0x84, 0x00, 0xff, 0x70, 0x72, 0x70, 0x9b,
+	0x00, 0x00, 0x00, 0x7c, 0x12, 0x7e, 0x20, 0x91, 0x80, 0x00, 0x70, 0x00,
+	0xa0, 0x86, 0x00, 0x02, 0x00, 0xc0, 0x12, 0x44, 0x70, 0x94, 0xa0, 0x86,
+	0xff, 0xff, 0x00, 0x40, 0x11, 0xd1, 0x10, 0x78, 0x26, 0x77, 0x10, 0x78,
+	0x62, 0xd1, 0x00, 0x78, 0x12, 0x44, 0x70, 0xcc, 0xd0, 0x9c, 0x00, 0x40,
+	0x11, 0xfd, 0xd0, 0x84, 0x00, 0x40, 0x11, 0xfd, 0x0f, 0x7e, 0x20, 0x79,
+	0x01, 0x00, 0x79, 0x0c, 0xc1, 0xb5, 0x79, 0x0e, 0x0f, 0x7f, 0xd0, 0x8c,
+	0x00, 0x40, 0x11, 0xfd, 0x70, 0xd0, 0xa0, 0x86, 0xff, 0xff, 0x00, 0x40,
+	0x11, 0xf9, 0x10, 0x78, 0x27, 0xf7, 0x10, 0x78, 0x62, 0xd1, 0x70, 0xcc,
+	0xd0, 0x94, 0x00, 0xc0, 0x12, 0x44, 0x20, 0x11, 0x00, 0x01, 0x20, 0x19,
+	0x00, 0x00, 0x10, 0x78, 0x28, 0x2f, 0x10, 0x78, 0x62, 0xd1, 0x00, 0x78,
+	0x12, 0x44, 0x70, 0xd4, 0xa0, 0x05, 0x00, 0xc0, 0x12, 0x44, 0x70, 0x90,
+	0xa0, 0x05, 0x00, 0xc0, 0x12, 0x44, 0x10, 0x78, 0x49, 0x67, 0x00, 0xc0,
+	0x12, 0x44, 0x20, 0x01, 0xa7, 0x53, 0x20, 0x04, 0xd0, 0xac, 0x00, 0x40,
+	0x12, 0x27, 0x15, 0x7e, 0x0c, 0x7e, 0x20, 0xa9, 0x00, 0x7f, 0x20, 0x09,
+	0x00, 0x00, 0x01, 0x7e, 0x10, 0x78, 0x45, 0xc4, 0x00, 0xc0, 0x12, 0x1a,
+	0x60, 0x00, 0xd0, 0xec, 0x00, 0xc0, 0x12, 0x22, 0x01, 0x7f, 0x81, 0x08,
+	0x00, 0xf0, 0x12, 0x11, 0x0c, 0x7f, 0x15, 0x7f, 0x00, 0x78, 0x12, 0x27,
+	0x01, 0x7f, 0x0c, 0x7f, 0x15, 0x7f, 0x00, 0x78, 0x12, 0x44, 0x70, 0x03,
+	0x00, 0x03, 0x70, 0x97, 0xff, 0xff, 0x20, 0x01, 0x00, 0x00, 0x10, 0x78,
+	0x24, 0xe8, 0x10, 0x78, 0x36, 0x99, 0x20, 0x01, 0xa9, 0xb2, 0x20, 0x04,
+	0xa0, 0x86, 0x00, 0x05, 0x00, 0xc0, 0x12, 0x3c, 0x20, 0x11, 0x00, 0x00,
+	0x10, 0x78, 0x70, 0xe0, 0x20, 0x11, 0x00, 0x00, 0x10, 0x78, 0x70, 0xea,
+	0x10, 0x78, 0x62, 0xd1, 0x10, 0x78, 0x63, 0x9b, 0x12, 0x7f, 0x00, 0x7c,
+	0x01, 0x7e, 0x0f, 0x7e, 0x12, 0x7e, 0x20, 0x91, 0x80, 0x00, 0x20, 0x79,
+	0x01, 0x00, 0x20, 0x09, 0x00, 0xf7, 0x10, 0x78, 0x42, 0xa1, 0x79, 0x40,
+	0xa1, 0x8c, 0x00, 0x10, 0x79, 0x42, 0x79, 0x24, 0xd1, 0xb4, 0x00, 0x40,
+	0x12, 0x5b, 0x78, 0x27, 0x00, 0x40, 0xd1, 0x9c, 0x00, 0x40, 0x12, 0x60,
+	0x78, 0x27, 0x00, 0x08, 0x00, 0x7e, 0x03, 0x7e, 0x15, 0x7e, 0xa0, 0x06,
+	0x10, 0x78, 0x5a, 0xe6, 0x79, 0x00, 0xa1, 0x8a, 0x00, 0x03, 0x00, 0x50,
+	0x12, 0x89, 0x79, 0x54, 0xd1, 0xac, 0x00, 0xc0, 0x12, 0x89, 0x20, 0x09,
+	0x00, 0xf8, 0x10, 0x78, 0x42, 0xa1, 0x78, 0x43, 0x00, 0x90, 0x78, 0x43,
+	0x00, 0x10, 0x20, 0xa9, 0x09, 0xc4, 0x78, 0x20, 0xd0, 0x9c, 0x00, 0xc0,
+	0x12, 0x81, 0x78, 0x24, 0xd0, 0xac, 0x00, 0xc0, 0x12, 0xca, 0x00, 0xf0,
+	0x12, 0x79, 0x20, 0x01, 0x00, 0x01, 0x10, 0x78, 0x24, 0xe8, 0x00, 0x78,
+	0x12, 0xd5, 0x78, 0x53, 0x00, 0x00, 0x78, 0x2f, 0x00, 0x20, 0x20, 0xa9,
+	0x00, 0x50, 0x00, 0xe0, 0x12, 0x8f, 0x20, 0x91, 0x60, 0x00, 0x00, 0xf0,
+	0x12, 0x8f, 0x78, 0x53, 0x04, 0x00, 0x78, 0x2f, 0x00, 0x00, 0x20, 0x09,
+	0x00, 0xf8, 0x10, 0x78, 0x42, 0xa1, 0x20, 0xa9, 0x00, 0x0e, 0x00, 0x05,
+	0x00, 0xf0, 0x12, 0x9f, 0x78, 0x53, 0x14, 0x00, 0x78, 0x43, 0x00, 0x90,
+	0x78, 0x43, 0x00, 0x10, 0x20, 0x19, 0x61, 0xa8, 0x78, 0x54, 0x00, 0x05,
+	0x00, 0x05, 0xd0, 0x8c, 0x00, 0x40, 0x12, 0xb4, 0x78, 0x24, 0xd0, 0xac,
+	0x00, 0xc0, 0x12, 0xca, 0x83, 0x19, 0x00, 0xc0, 0x12, 0xaa, 0x20, 0x09,
+	0xa7, 0x32, 0x21, 0x04, 0x80, 0x00, 0x20, 0x0a, 0xa0, 0x84, 0xff, 0xf0,
+	0x00, 0x40, 0x12, 0xc4, 0x20, 0x0b, 0x00, 0x00, 0x10, 0x78, 0x25, 0x88,
+	0x20, 0x01, 0x00, 0x01, 0x10, 0x78, 0x24, 0xe8, 0x00, 0x78, 0x12, 0xd3,
+	0x20, 0x01, 0xa7, 0x32, 0x20, 0x03, 0x00, 0x00, 0x78, 0x28, 0xc0, 0x9d,
+	0x78, 0x2a, 0x78, 0x27, 0x00, 0x48, 0x78, 0x53, 0x04, 0x00, 0x15, 0x7f,
+	0x03, 0x7f, 0x00, 0x7f, 0x12, 0x7f, 0x0f, 0x7f, 0x01, 0x7f, 0x00, 0x7c,
+	0x00, 0x7c, 0x00, 0x7c, 0x00, 0x7c, 0x2a, 0x70, 0x20, 0x61, 0xa9, 0xad,
+	0x20, 0x63, 0x00, 0x01, 0x60, 0x07, 0x00, 0x13, 0x60, 0x0b, 0x00, 0x19,
+	0x60, 0x0f, 0x00, 0x17, 0x20, 0x09, 0x01, 0x00, 0x21, 0x04, 0xa0, 0x82,
+	0x00, 0x02, 0x00, 0x48, 0x12, 0xf5, 0x70, 0x53, 0xff, 0xff, 0x00, 0x78,
+	0x12, 0xf7, 0x70, 0x53, 0x00, 0x00, 0x70, 0x57, 0xff, 0xff, 0x70, 0x6f,
+	0x00, 0x00, 0x70, 0x73, 0x00, 0x00, 0x10, 0x78, 0x90, 0xb6, 0x20, 0x61,
+	0xa9, 0x8d, 0x60, 0x03, 0x09, 0x09, 0x60, 0x07, 0x00, 0x00, 0x60, 0x0b,
[...51248 lines suppressed...]
+	0x06, 0x3f, 0x3c, 0x08, 0x06, 0x00, 0x00, 0x0d, 0x01, 0x3e, 0x40, 0x00,
+	0x06, 0x00, 0x00, 0x20, 0x04, 0x0f, 0x80, 0x1a, 0x03, 0x20, 0x00, 0x0a,
+	0x02, 0x20, 0x17, 0xd0, 0x03, 0x2f, 0xa0, 0x12, 0x02, 0x02, 0xc0, 0x13,
+	0x00, 0x80, 0x02, 0xcd, 0x04, 0x00, 0x70, 0x13, 0x07, 0xa0, 0x03, 0xcf,
+	0x00, 0x7a, 0x01, 0x01, 0x07, 0x05, 0x00, 0x00, 0x07, 0x30, 0x30, 0x00,
+	0x07, 0x00, 0x88, 0x90, 0x07, 0x4d, 0x00, 0x05, 0x06, 0x00, 0x60, 0x13,
+	0x05, 0x0f, 0x80, 0x1e, 0x03, 0x2f, 0xa0, 0x3a, 0x05, 0x60, 0x1a, 0x2b,
+	0x05, 0x0f, 0x80, 0xff, 0x02, 0x2f, 0xa0, 0x19, 0x04, 0x00, 0x10, 0x02,
+	0x04, 0x00, 0x20, 0x13, 0x04, 0x0f, 0x80, 0x1f, 0x02, 0x2f, 0xa0, 0x1a,
+	0x07, 0x3a, 0xa0, 0x0c, 0x06, 0x00, 0x00, 0x02, 0x07, 0x30, 0x0c, 0x03,
+	0x06, 0x00, 0x00, 0x0d, 0x02, 0x80, 0x03, 0xbc, 0x04, 0x00, 0x70, 0x13,
+	0x07, 0xa0, 0x03, 0xcf, 0x00, 0x7a, 0x01, 0x01, 0x03, 0x07, 0x00, 0x00,
+	0x06, 0x60, 0x28, 0x2a, 0x05, 0x0f, 0x80, 0xff, 0x07, 0x3f, 0xa0, 0x09,
+	0x06, 0x00, 0x00, 0x04, 0x02, 0x49, 0x90, 0x08, 0x06, 0x81, 0x03, 0x2a,
+	0x07, 0x30, 0x30, 0x00, 0x07, 0x00, 0x88, 0x90, 0x02, 0x80, 0x03, 0x2c,
+	0x07, 0x30, 0x30, 0x00, 0x04, 0x00, 0x89, 0x80, 0x05, 0x00, 0x70, 0x03,
+	0x07, 0x4d, 0x00, 0x05, 0x06, 0x00, 0x60, 0x13, 0x05, 0x0f, 0x80, 0x1e,
+	0x03, 0x2f, 0xa0, 0x3a, 0x07, 0x60, 0x14, 0x2b, 0x05, 0x0f, 0x80, 0xff,
+	0x03, 0x2f, 0xa0, 0x21, 0x06, 0x4b, 0x00, 0x02, 0x02, 0x49, 0x90, 0x08,
+	0x06, 0x81, 0x03, 0x38, 0x06, 0x44, 0xc0, 0x02, 0x05, 0x4b, 0x04, 0x00,
+	0x05, 0x00, 0x40, 0xff, 0x06, 0x69, 0x81, 0x04, 0x05, 0x81, 0x83, 0x4d,
+	0x06, 0x00, 0x00, 0x13, 0x04, 0x00, 0x10, 0x13, 0x04, 0x78, 0x01, 0x02,
+	0x06, 0x00, 0x00, 0x10, 0x06, 0x00, 0x30, 0x13, 0x04, 0x00, 0x40, 0x13,
+	0x06, 0x00, 0x50, 0x13, 0x06, 0x00, 0x60, 0x13, 0x04, 0x00, 0x70, 0x13,
+	0x00, 0x64, 0x40, 0x15, 0x06, 0x82, 0x03, 0x49, 0x04, 0x44, 0x80, 0x02,
+	0x02, 0x20, 0x50, 0x08, 0x04, 0x0f, 0x80, 0x1f, 0x03, 0x2f, 0xa0, 0x42,
+	0x04, 0x00, 0x80, 0x15, 0x02, 0x80, 0x03, 0x86, 0x04, 0x6c, 0x80, 0x04,
+	0x04, 0x81, 0x83, 0x5b, 0x01, 0x20, 0x80, 0x18, 0x06, 0x78, 0x00, 0x02,
+	0x07, 0x00, 0x00, 0x03, 0x04, 0x81, 0x83, 0x5e, 0x06, 0x00, 0x30, 0x01,
+	0x06, 0x00, 0x00, 0x13, 0x04, 0x00, 0x10, 0x13, 0x04, 0x00, 0x40, 0x13,
+	0x06, 0x00, 0x50, 0x13, 0x04, 0x0f, 0x80, 0x1f, 0x02, 0x2f, 0xa0, 0x32,
+	0x02, 0x80, 0x03, 0x86, 0x04, 0x0f, 0xd0, 0x2a, 0x07, 0xa0, 0x05, 0x3a,
+	0x03, 0x80, 0x00, 0x14, 0x03, 0x79, 0xff, 0x03, 0x07, 0x00, 0x00, 0xff,
+	0x04, 0x48, 0x80, 0x02, 0x07, 0x81, 0x03, 0x65, 0x07, 0x0f, 0xf0, 0x03,
+	0x04, 0x50, 0x04, 0x08, 0x05, 0x00, 0x80, 0xff, 0x03, 0x79, 0xff, 0x00,
+	0x07, 0x00, 0x00, 0xff, 0x06, 0x48, 0x90, 0x02, 0x07, 0x81, 0x03, 0x6c,
+	0x07, 0x0f, 0xf0, 0x00, 0x04, 0x50, 0x04, 0x08, 0x05, 0x00, 0x80, 0xff,
+	0x07, 0x00, 0x50, 0x03, 0x05, 0x00, 0x40, 0x00, 0x06, 0x00, 0x30, 0x01,
+	0x06, 0x00, 0x00, 0x13, 0x04, 0x00, 0x10, 0x13, 0x04, 0x0f, 0x80, 0x1f,
+	0x02, 0x2f, 0xa0, 0x32, 0x05, 0x60, 0x1c, 0x2b, 0x05, 0x0f, 0x80, 0xff,
+	0x02, 0x2f, 0xa0, 0x31, 0x06, 0x60, 0x0c, 0x1f, 0x05, 0x0f, 0x80, 0xff,
+	0x02, 0x2f, 0xa0, 0x32, 0x02, 0x68, 0x06, 0x08, 0x06, 0x81, 0x03, 0x86,
+	0x01, 0x64, 0x08, 0xff, 0x05, 0x7d, 0xfe, 0xff, 0x07, 0xff, 0xff, 0xff,
+	0x03, 0x40, 0x00, 0xff, 0x04, 0x5a, 0x04, 0x07, 0x07, 0x00, 0x00, 0xff,
+	0x07, 0x60, 0x06, 0x1e, 0x05, 0x0f, 0x80, 0xff, 0x03, 0x2f, 0xa0, 0x0a,
+	0x06, 0x60, 0x09, 0x08, 0x06, 0x69, 0xf9, 0x08, 0x02, 0x7a, 0x00, 0x08,
+	0x06, 0x00, 0x00, 0x20, 0x07, 0x0a, 0xa0, 0xff, 0x02, 0x4a, 0x24, 0x08,
+	0x03, 0x7a, 0x00, 0xff, 0x06, 0x00, 0x00, 0xdc, 0x07, 0x00, 0x00, 0xff,
+	0x02, 0x80, 0x03, 0xbc, 0x04, 0x00, 0x70, 0x13, 0x07, 0xa0, 0x03, 0xcf,
+	0x00, 0x7a, 0x01, 0x01, 0x07, 0x03, 0x00, 0x00, 0x07, 0x30, 0x30, 0x00,
+	0x07, 0x00, 0x81, 0x90, 0x06, 0x00, 0x60, 0x13, 0x05, 0x0f, 0x80, 0x1e,
+	0x03, 0x2f, 0xa0, 0x3a, 0x07, 0x3a, 0xa0, 0x00, 0x06, 0x00, 0x00, 0x02,
+	0x07, 0x30, 0x0c, 0x00, 0x07, 0x00, 0x00, 0x05, 0x02, 0x80, 0x03, 0xbc,
+	0x04, 0x00, 0x70, 0x13, 0x07, 0xa0, 0x03, 0xcf, 0x00, 0x7a, 0x01, 0x01,
+	0x07, 0x81, 0x00, 0x00, 0x07, 0x30, 0x30, 0x00, 0x07, 0x00, 0x00, 0x90,
+	0x06, 0x00, 0x60, 0x13, 0x06, 0x60, 0x0c, 0x2a, 0x05, 0x0f, 0x80, 0xff,
+	0x05, 0x3f, 0xa8, 0x09, 0x07, 0x00, 0x00, 0x03, 0x04, 0x78, 0x01, 0x07,
+	0x07, 0xff, 0xff, 0x00, 0x00, 0x7c, 0x01, 0x07, 0x07, 0x00, 0x05, 0x00,
+	0x05, 0x81, 0x83, 0xaf, 0x07, 0x30, 0x30, 0x00, 0x05, 0x00, 0x08, 0x90,
+	0x07, 0x4d, 0x00, 0x05, 0x06, 0x60, 0x28, 0x2a, 0x05, 0x0f, 0x80, 0xff,
+	0x05, 0x3f, 0xa8, 0x09, 0x07, 0x00, 0x00, 0x03, 0x00, 0x49, 0xd0, 0x07,
+	0x06, 0x81, 0x03, 0xb6, 0x02, 0x20, 0x60, 0x01, 0x05, 0x0f, 0x80, 0x1e,
+	0x03, 0x2f, 0xa0, 0x3a, 0x07, 0x3a, 0xa0, 0x00, 0x06, 0x00, 0x00, 0x02,
+	0x07, 0x30, 0x0c, 0x00, 0x07, 0x00, 0x00, 0x05, 0x01, 0x3e, 0x40, 0x00,
+	0x07, 0x00, 0x00, 0x30, 0x03, 0x98, 0x03, 0xbe, 0x07, 0x0f, 0xf0, 0xf6,
+	0x03, 0x68, 0x30, 0xff, 0x04, 0x81, 0x83, 0xbf, 0x07, 0x0f, 0x00, 0x1e,
+	0x04, 0x0f, 0x10, 0x1f, 0x07, 0x0f, 0x30, 0x00, 0x01, 0x3e, 0x40, 0x00,
+	0x06, 0x00, 0x00, 0x20, 0x04, 0x0f, 0x80, 0x1a, 0x03, 0x20, 0x00, 0x0a,
+	0x02, 0x20, 0x17, 0xd0, 0x03, 0x2f, 0xa0, 0x12, 0x00, 0x80, 0x02, 0xcd,
+	0x03, 0x20, 0x00, 0x00, 0x06, 0x00, 0x60, 0x76, 0x03, 0x80, 0x03, 0xd1,
+	0x03, 0x20, 0x00, 0x11, 0x06, 0x00, 0x60, 0x2a, 0x05, 0xa0, 0x04, 0x66,
+	0x05, 0x60, 0x04, 0x06, 0x05, 0x0f, 0x80, 0xff, 0x05, 0x3f, 0xa8, 0x09,
+	0x06, 0x00, 0x00, 0x02, 0x07, 0xc0, 0x00, 0x00, 0x02, 0x07, 0x60, 0x2f,
+	0x04, 0x60, 0x08, 0x76, 0x05, 0x0f, 0x80, 0xff, 0x02, 0x2f, 0xa0, 0x31,
+	0x03, 0x07, 0x50, 0x00, 0x00, 0x07, 0xb0, 0x04, 0x01, 0x01, 0x80, 0x05,
+	0x06, 0x60, 0x00, 0x76, 0x05, 0x00, 0x20, 0xff, 0x05, 0x0f, 0x80, 0xff,
+	0x03, 0x2f, 0xa0, 0x11, 0x03, 0x02, 0xf0, 0x00, 0x01, 0x86, 0x83, 0xee,
+	0x02, 0x02, 0xf0, 0x01, 0x00, 0x86, 0x83, 0xec, 0x00, 0x02, 0xe0, 0x13,
+	0x07, 0x60, 0x18, 0x18, 0x05, 0x0f, 0x80, 0xff, 0x05, 0x3f, 0xa8, 0x0a,
+	0x07, 0x00, 0x00, 0x09, 0x02, 0x80, 0x03, 0xf4, 0x00, 0x02, 0xe0, 0x01,
+	0x02, 0x80, 0x03, 0xf4, 0x04, 0x0f, 0xe0, 0x01, 0x03, 0x86, 0x03, 0xe7,
+	0x07, 0x60, 0x00, 0x2e, 0x05, 0x0f, 0x80, 0xff, 0x01, 0x2f, 0xa8, 0x0a,
+	0x00, 0x02, 0xe0, 0x01, 0x06, 0x00, 0x00, 0x13, 0x04, 0x00, 0x10, 0x13,
+	0x04, 0x0f, 0x80, 0x02, 0x03, 0x2f, 0xa0, 0x12, 0x06, 0x27, 0x30, 0x01,
+	0x04, 0x48, 0xb0, 0x75, 0x05, 0x81, 0x83, 0xff, 0x04, 0x60, 0x20, 0x76,
+	0x05, 0x0f, 0x80, 0xff, 0x05, 0x3f, 0xa8, 0x11, 0x07, 0x00, 0x00, 0x3c,
+	0x01, 0x79, 0xfe, 0x78, 0x07, 0x00, 0x00, 0xff, 0x03, 0x01, 0x90, 0xff,
+	0x02, 0x86, 0x84, 0x07, 0x05, 0xa0, 0x04, 0x1b, 0x00, 0x07, 0x80, 0x19,
+	0x00, 0x92, 0x04, 0x1a, 0x01, 0x80, 0x04, 0x5f, 0x04, 0x0f, 0xd0, 0x76,
+	0x04, 0x0f, 0xd0, 0x19, 0x04, 0x60, 0x02, 0x76, 0x05, 0x00, 0x20, 0xff,
+	0x05, 0x0f, 0x80, 0xff, 0x03, 0x2f, 0xa0, 0x09, 0x04, 0x0f, 0x80, 0x02,
+	0x05, 0x3f, 0xa8, 0x0a, 0x07, 0x00, 0x00, 0x09, 0x05, 0x0f, 0xe0, 0x00,
+	0x03, 0x86, 0x84, 0x17, 0x07, 0x60, 0x18, 0x18, 0x05, 0x0f, 0x80, 0xff,
+	0x05, 0x3f, 0xa8, 0x0a, 0x07, 0x00, 0x00, 0x09, 0x01, 0x80, 0x04, 0x18,
+	0x07, 0xa0, 0x00, 0xee, 0x07, 0x27, 0x30, 0x00, 0x02, 0x07, 0x60, 0x13,
+	0x03, 0x80, 0x00, 0x3c, 0x05, 0x8b, 0x04, 0x1b, 0x03, 0x38, 0x50, 0x00,
+	0x07, 0x03, 0x00, 0x00, 0x05, 0x60, 0x08, 0x18, 0x05, 0x0f, 0x80, 0xff,
+	0x03, 0x2f, 0xa0, 0x09, 0x05, 0x4b, 0x04, 0x00, 0x03, 0x08, 0xa0, 0xff,
+	0x01, 0x79, 0xfe, 0x00, 0x07, 0x00, 0x00, 0xff, 0x01, 0x08, 0x80, 0xff,
+	0x04, 0x48, 0xb0, 0x75, 0x05, 0x81, 0x04, 0x35, 0x07, 0x60, 0x14, 0x7b,
+	0x05, 0x0f, 0x80, 0xff, 0x00, 0x2f, 0xa8, 0x19, 0x06, 0x4b, 0x00, 0x01,
+	0x02, 0x08, 0x00, 0x02, 0x01, 0x08, 0x10, 0x03, 0x00, 0x08, 0x20, 0x01,
+	0x02, 0x08, 0x30, 0x01, 0x02, 0x07, 0x90, 0x01, 0x02, 0x07, 0xa0, 0x01,
+	0x00, 0x08, 0x40, 0x13, 0x02, 0x07, 0xf0, 0x13, 0x00, 0x80, 0x04, 0x57,
+	0x06, 0x48, 0x50, 0x75, 0x05, 0x81, 0x04, 0x4d, 0x02, 0x46, 0x50, 0x75,
+	0x06, 0x60, 0x14, 0x76, 0x05, 0x0f, 0x80, 0xff, 0x07, 0x3f, 0xa0, 0x21,
+	0x06, 0x00, 0x00, 0x3e, 0x07, 0x0f, 0xf0, 0x7d, 0x04, 0x50, 0x04, 0x7c,
+	0x05, 0x0f, 0x80, 0xff, 0x00, 0x2f, 0xa8, 0x19, 0x04, 0x8b, 0x04, 0x40,
+	0x02, 0x08, 0x00, 0x01, 0x00, 0x08, 0x10, 0x02, 0x01, 0x08, 0x20, 0x03,
+	0x03, 0x07, 0x90, 0x03, 0x02, 0x08, 0x30, 0x7a, 0x03, 0x40, 0x00, 0x7e,
+	0x06, 0x42, 0x00, 0x7f, 0x04, 0x81, 0x04, 0x52, 0x07, 0x0f, 0xf0, 0x7e,
+	0x05, 0xa0, 0x01, 0xe2, 0x02, 0x92, 0x84, 0x52, 0x00, 0x80, 0x04, 0x5e,
+	0x05, 0x8b, 0x04, 0x4d, 0x06, 0x60, 0x14, 0x76, 0x05, 0x0f, 0x80, 0xff,
+	0x07, 0x3f, 0xa0, 0x41, 0x06, 0x00, 0x00, 0x3e, 0x06, 0x60, 0x24, 0x76,
+	0x05, 0x0f, 0x80, 0xff, 0x07, 0x3f, 0xa0, 0x09, 0x06, 0x00, 0x00, 0x07,
+	0x00, 0x08, 0x40, 0x0e, 0x04, 0x8b, 0x04, 0x57, 0x03, 0x38, 0x50, 0x00,
+	0x03, 0x01, 0x00, 0x00, 0x06, 0x21, 0x90, 0x01, 0x04, 0x0f, 0xe0, 0x7f,
+	0x00, 0x86, 0x04, 0x5e, 0x00, 0x80, 0x01, 0xcb, 0x07, 0xc0, 0x00, 0x00,
+	0x00, 0x68, 0x3e, 0x75, 0x04, 0x81, 0x04, 0x64, 0x04, 0x48, 0xd0, 0x75,
+	0x04, 0x81, 0x04, 0x8a, 0x00, 0x80, 0x04, 0xbc, 0x06, 0xa0, 0x05, 0x1a,
+	0x00, 0x80, 0x04, 0x1a, 0x03, 0x97, 0x84, 0x71, 0x07, 0x60, 0x24, 0x18,
+	0x05, 0x0f, 0x80, 0xff, 0x01, 0x2f, 0xa8, 0x09, 0x06, 0x78, 0x00, 0x01,
+	0x07, 0x00, 0x00, 0xff, 0x07, 0x5a, 0x00, 0x00, 0x07, 0x0f, 0xf0, 0x14,
+	0x05, 0x69, 0xfe, 0xff, 0x05, 0x4b, 0x08, 0xff, 0x07, 0x5a, 0x00, 0x00,
+	0x05, 0x60, 0x04, 0x18, 0x05, 0x0f, 0x80, 0xff, 0x01, 0x2f, 0xa8, 0x09,
+	0x04, 0x0f, 0xe0, 0x07, 0x03, 0x86, 0x84, 0x78, 0x01, 0x20, 0x40, 0x00,
+	0x00, 0x80, 0x04, 0x86, 0x00, 0x70, 0x01, 0x01, 0x03, 0x01, 0x00, 0x00,
+	0x06, 0x78, 0x00, 0x01, 0x07, 0xff, 0x00, 0x00, 0x07, 0x6c, 0x00, 0xff,
+	0x06, 0x81, 0x84, 0x80, 0x00, 0x70, 0x01, 0x01, 0x03, 0x01, 0x00, 0x00,
+	0x05, 0x60, 0x04, 0x18, 0x05, 0x0f, 0x80, 0xff, 0x01, 0x2f, 0xa8, 0x0a,
+	0x06, 0x78, 0x00, 0x01, 0x07, 0xff, 0x00, 0x00, 0x05, 0x00, 0x40, 0xff,
+	0x02, 0x79, 0xff, 0x01, 0x07, 0x00, 0xff, 0xff, 0x05, 0x00, 0x20, 0x14,
+	0x07, 0xc0, 0x00, 0x00, 0x04, 0x00, 0x70, 0x76, 0x04, 0x48, 0xb0, 0x75,
+	0x04, 0x81, 0x04, 0xa4, 0x03, 0x20, 0x00, 0x11, 0x06, 0x00, 0x60, 0x76,
+	0x07, 0xa0, 0x03, 0xd1, 0x00, 0x7a, 0x01, 0x01, 0x07, 0x06, 0x00, 0x00,
+	0x07, 0x30, 0x30, 0x00, 0x07, 0x00, 0x82, 0x90, 0x07, 0x60, 0x00, 0x18,
+	0x05, 0x0f, 0x80, 0xff, 0x05, 0x3f, 0xa8, 0x09, 0x07, 0x00, 0x00, 0x03,
+	0x04, 0x48, 0xe0, 0x07, 0x07, 0x81, 0x84, 0x9c, 0x06, 0x00, 0x60, 0x13,
+	0x01, 0x80, 0x04, 0xb7, 0x02, 0x40, 0x00, 0x10, 0x05, 0x81, 0x04, 0x9c,
+	0x06, 0x00, 0x60, 0x10, 0x04, 0x60, 0x32, 0x76, 0x05, 0x0f, 0x80, 0xff,
+	0x07, 0x3f, 0xa0, 0x0a, 0x07, 0x00, 0x00, 0x03, 0x01, 0x80, 0x04, 0xb7,
+	0x06, 0x00, 0x00, 0x7a, 0x02, 0x49, 0x30, 0x75, 0x06, 0x81, 0x84, 0xad,
+	0x04, 0x60, 0x2a, 0x76, 0x05, 0x0f, 0x80, 0xff, 0x03, 0x2f, 0xa0, 0x09,
+	0x06, 0x0f, 0xf0, 0x7a, 0x05, 0x50, 0x04, 0x00, 0x07, 0x00, 0x00, 0xff,
+	0x06, 0x47, 0x30, 0x75, 0x04, 0x60, 0x2a, 0x76, 0x05, 0x0f, 0x80, 0xff,
+	0x03, 0x2f, 0xa0, 0x0a, 0x07, 0xa0, 0x03, 0xcc, 0x00, 0x7a, 0x01, 0x01,
+	0x03, 0x01, 0x00, 0x00, 0x06, 0x30, 0x30, 0x08, 0x05, 0x00, 0x80, 0x00,
+	0x06, 0x00, 0x60, 0x0e, 0x05, 0x0f, 0x80, 0x74, 0x03, 0x2f, 0xa0, 0x3a,
+	0x05, 0x30, 0x79, 0xa0, 0x07, 0x00, 0x00, 0x0c, 0x00, 0x80, 0x04, 0xfd,
+	0x00, 0x68, 0x3e, 0x75, 0x07, 0x6c, 0x0a, 0xff, 0x05, 0x81, 0x04, 0xdb,
+	0x04, 0x00, 0x70, 0x13, 0x03, 0x20, 0x00, 0x11, 0x06, 0x00, 0x60, 0x76,
+	0x07, 0xa0, 0x03, 0xd1, 0x00, 0x7a, 0x01, 0x01, 0x03, 0x07, 0x00, 0x00,
+	0x06, 0x60, 0x28, 0x76, 0x05, 0x0f, 0x80, 0xff, 0x05, 0x3f, 0xa8, 0x09,
+	0x06, 0x00, 0x00, 0x01, 0x03, 0x49, 0x90, 0x03, 0x04, 0x81, 0x04, 0xd0,
+	0x07, 0x30, 0x30, 0x00, 0x07, 0x00, 0x88, 0x90, 0x05, 0x30, 0x79, 0xa0,
+	0x07, 0x00, 0x00, 0x0c, 0x01, 0x80, 0x04, 0xd4, 0x07, 0x30, 0x30, 0x00,
+	0x04, 0x00, 0x89, 0x80, 0x04, 0x30, 0x79, 0x20, 0x07, 0x00, 0x00, 0x0c,
+	0x07, 0x4d, 0x00, 0x05, 0x06, 0x00, 0x60, 0x13, 0x05, 0x0f, 0x80, 0x74,
+	0x03, 0x2f, 0xa0, 0x3a, 0x04, 0x30, 0x79, 0x20, 0x07, 0x00, 0x00, 0x0c,
+	0x00, 0x80, 0x04, 0xfd, 0x04, 0x60, 0x2a, 0x76, 0x05, 0x0f, 0x80, 0xff,
+	0x03, 0x2f, 0xa0, 0x09, 0x06, 0x0f, 0xf0, 0x7a, 0x05, 0x50, 0x04, 0x00,
+	0x07, 0x00, 0x00, 0xff, 0x06, 0x47, 0x30, 0x75, 0x04, 0x60, 0x2a, 0x76,
+	0x05, 0x0f, 0x80, 0xff, 0x03, 0x2f, 0xa0, 0x0a, 0x04, 0x00, 0x70, 0x76,
+	0x07, 0xa0, 0x03, 0xcc, 0x00, 0x7a, 0x01, 0x01, 0x03, 0x01, 0x00, 0x00,
+	0x06, 0x30, 0x30, 0x08, 0x07, 0x00, 0x88, 0x00, 0x07, 0x4d, 0x00, 0x05,
+	0x06, 0x60, 0x0a, 0x76, 0x05, 0x0f, 0x80, 0xff, 0x07, 0x3f, 0xa0, 0x09,
+	0x07, 0x00, 0x00, 0x03, 0x05, 0x4b, 0x04, 0x06, 0x04, 0x5a, 0x04, 0x04,
+	0x05, 0x00, 0x40, 0xff, 0x06, 0x00, 0x60, 0x0e, 0x05, 0x0f, 0x80, 0x74,
+	0x03, 0x2f, 0xa0, 0x3a, 0x06, 0x48, 0xc0, 0x75, 0x04, 0x81, 0x04, 0xfb,
+	0x06, 0x30, 0x7d, 0x20, 0x07, 0x00, 0x00, 0x0c, 0x00, 0x80, 0x04, 0xfd,
+	0x04, 0x30, 0x79, 0x20, 0x07, 0x00, 0x00, 0x0c, 0x01, 0x3e, 0x40, 0x00,
+	0x07, 0x00, 0x00, 0x30, 0x01, 0x98, 0x04, 0xff, 0x07, 0x0f, 0xf0, 0xf6,
+	0x07, 0x48, 0x50, 0xff, 0x05, 0x81, 0x85, 0x00, 0x05, 0x0f, 0x20, 0x74,
+	0x06, 0x0a, 0x00, 0x07, 0x04, 0x00, 0x70, 0xfb, 0x04, 0x6a, 0x70, 0x07,
+	0x05, 0x0f, 0x40, 0xff, 0x01, 0x3e, 0x40, 0x00, 0x06, 0x00, 0x00, 0x20,
+	0x06, 0x78, 0x00, 0x7a, 0x07, 0xff, 0xf0, 0x00, 0x04, 0x81, 0x85, 0x10,
+	0x03, 0x20, 0x00, 0x0a, 0x02, 0x20, 0x17, 0xd0, 0x02, 0x80, 0x05, 0x13,
+	0x03, 0x20, 0x00, 0x0a, 0x06, 0x30, 0x1b, 0x58, 0x06, 0x00, 0x00, 0x01,
+	0x05, 0x0f, 0x80, 0x72, 0x03, 0x2f, 0xa0, 0x12, 0x00, 0x80, 0x04, 0x1a,
+	0x01, 0x20, 0x80, 0x60, 0x06, 0x00, 0x90, 0x2a, 0x04, 0x00, 0x20, 0x20,
+	0x02, 0x80, 0x05, 0x26, 0x04, 0x00, 0x80, 0xfb, 0x06, 0x6a, 0xe1, 0x08,
+	0x06, 0x00, 0x90, 0x76, 0x04, 0x00, 0x20, 0x75, 0x02, 0x80, 0x05, 0x26,
+	0x03, 0x20, 0x11, 0x00, 0x05, 0x84, 0x85, 0x24, 0x06, 0x42, 0x00, 0x01,
+	0x04, 0x81, 0x85, 0x20, 0x02, 0x80, 0x05, 0x3d, 0x02, 0x0e, 0x00, 0x08,
+	0x07, 0xc0, 0x00, 0x00, 0x05, 0x0f, 0xd0, 0x09, 0x04, 0x0f, 0xd0, 0x08,
+	0x03, 0x20, 0x11, 0x00, 0x05, 0x84, 0x85, 0x2d, 0x06, 0x42, 0x00, 0x01,
+	0x04, 0x81, 0x85, 0x29, 0x02, 0x80, 0x05, 0x3d, 0x00, 0x7a, 0x01, 0x02,
+	0x04, 0x00, 0x01, 0x01, 0x05, 0x60, 0x08, 0x09, 0x05, 0x0f, 0x80, 0xff,
+	0x07, 0x3f, 0xa0, 0x0a, 0x06, 0x00, 0x00, 0x01, 0x02, 0x0e, 0x00, 0x08,
+	0x06, 0x84, 0x05, 0x37, 0x03, 0x0e, 0x00, 0x09, 0x07, 0xc0, 0x00, 0x00,
+	0x01, 0x01, 0x10, 0x09, 0x05, 0x2e, 0x43, 0x00, 0x07, 0xc0, 0x00, 0x00,
+	0x05, 0x2e, 0x40, 0x0f, 0x01, 0x20, 0x80, 0x90, 0x02, 0x80, 0x05, 0x1f,
+	0x07, 0x0f, 0xc0, 0xff, 0x04, 0x0f, 0x80, 0x13, 0x03, 0x2f, 0xa0, 0x09,
+	0x02, 0x80, 0x05, 0x40, 0x77, 0x78, 0x21, 0xfa, 0xff, 0xee, 0xff, 0xd6
+};
+
+struct firmware ql2400_fw = {
+	.size = sizeof(ql2400_fw_bin),
+	.data = ql2400_fw_bin
+};

linux-2.6-ehea-ethernet-driver.patch:
 Makefile       |    7 
 ehea.h         |  434 +++++++++
 ehea_ethtool.c |  325 +++++++
 ehea_hcall.h   |   52 +
 ehea_hw.h      |  319 +++++++
 ehea_main.c    | 2560 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ehea_phyp.c    | 1020 ++++++++++++++++++++++
 ehea_phyp.h    |  625 +++++++++++++
 ehea_qmr.c     |  719 ++++++++++++++++
 ehea_qmr.h     |  390 ++++++++
 10 files changed, 6451 insertions(+)

--- NEW FILE linux-2.6-ehea-ethernet-driver.patch ---
Date: Tue, 18 Jul 2006 12:39:16 -0400 (EDT)
From: Manoj Iyer <miyer at redhat.com>
--- linux-2.6.17-rc6-orig/drivers/net/ehea/ehea_main.c	1969-12-31 16:00:00.000000000 -0800
+++ kernel/drivers/net/ehea/ehea_main.c	2006-06-09 05:29:59.776161616 -0700
@@ -0,0 +1,2560 @@
+/*
+ *  linux/drivers/net/ehea/ehea_main.c
+ *
+ *  eHEA ethernet device driver for IBM eServer System p
+ *
+ *  (C) Copyright IBM Corp. 2006
+ *
+ *  Authors:
+ *       Christoph Raisch <raisch at de.ibm.com>
+ *       Jan-Bernd Themann <themann at de.ibm.com>
+ *       Heiko-Joerg Schick <schickhj at de.ibm.com>
+ *       Thomas Klein <tklein at de.ibm.com>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, 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.
+ */
+
+#define DEB_PREFIX "main"
+
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <linux/if.h>
+#include <linux/list.h>
+#include <net/ip.h>
+
+#include "ehea.h"
+#include "ehea_qmr.h"
+#include "ehea_phyp.h"
+
+struct task_struct *ehea_irq_helper_thread;
+extern int ehea_irq_helper(void);
+
+
+#define USE_INTERRUPTS
+#define POLL_PORT_INTERVAL (HZ / 20)
+#define SKB_CLEANUP_INTERVAL (HZ / 1000)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christoph Raisch <raisch at de.ibm.com>");
+MODULE_DESCRIPTION("IBM eServer HEA Driver");
+MODULE_VERSION(EHEA_DRIVER_VERSION);
+
+static int __devinit ehea_probe(struct ibmebus_dev *dev,
+				const struct of_device_id *id);
+static int __devexit ehea_remove(struct ibmebus_dev *dev);
+static int ehea_sense_port_attr(struct ehea_adapter *adapter, int portnum);
+
+int ehea_trace_level = 5;
+
+static struct net_device_stats *ehea_get_stats(struct net_device *dev)
+{
+	u64 hret;
+	struct ehea_port *port = (struct ehea_port*)dev->priv;
+	struct ehea_adapter *adapter = port->adapter;
+	struct hcp_query_ehea_port_cb_2 *cb2 = NULL;
+	struct net_device_stats *stats = &port->stats;
+
+	EDEB_EN(7, "net_device=%p", dev);
+
+	cb2 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);
+	if(!cb2) {
+		EDEB_ERR(4, "No memory for cb2");
+		goto get_stat_exit;
+	}
+
+	hret = ehea_h_query_ehea_port(adapter->handle,
+				      port->logical_port_id,
+				      H_PORT_CB2,
+				      H_PORT_CB2_ALL,
+				      cb2);
+
+	if (hret != H_SUCCESS) {
+		EDEB_ERR(4, "query_ehea_port failed for cb2");
+		goto get_stat_exit;
+	}
+
+	EDEB_DMP(7, (u8*)cb2,
+		 sizeof(struct hcp_query_ehea_port_cb_2), "After HCALL");
+
+	stats->tx_packets = cb2->txucp + cb2->txmcp + cb2->txbcp;
+	stats->multicast = cb2->rxmcp;
+	stats->rx_errors = cb2->rxuerr;
+	stats->rx_bytes = cb2->rxo;
+	stats->tx_bytes = cb2->txo;
+
+get_stat_exit:
+	EDEB_EX(7, "");
+	return stats;
+}
+
+static inline int ehea_refill_rq1(struct ehea_port_res *port_res, int arr_index,
+				  int nr_of_wqes)
+{
+	int i;
+	int ret = 0;
+	struct ehea_qp *qp;
+	int skb_arr_rq1_len = port_res->skb_arr_rq1_len;
+	struct sk_buff **skb_arr_rq1 = port_res->skb_arr_rq1;
+	EDEB_EN(7, "port_res=%p, arr_index=%d, nr_of_wqes=%d, arr_rq1_len=%d",
+		port_res, arr_index, nr_of_wqes, skb_arr_rq1_len);
+
+	qp = port_res->qp;
+	if (unlikely(nr_of_wqes == 0))
+		return -EINVAL;
+	for (i = 0; i < nr_of_wqes; i++) {
+		int index = ((skb_arr_rq1_len + arr_index) - i)
+		    % skb_arr_rq1_len;
+		if (!skb_arr_rq1[index]) {
+			skb_arr_rq1[index] = dev_alloc_skb(EHEA_LL_PKT_SIZE);
+
+			if (!skb_arr_rq1[index]) {
+				EDEB_ERR(4, "No mem for skb/%d wqes filled", i);
+				ret = -ENOMEM;
+				break;
+			}
+		}
+	}
+	/* Ring doorbell */
+	ehea_update_rq1a(qp, nr_of_wqes);
+	EDEB_EX(7, "");
+	return ret;
+}
+
+static int ehea_init_fill_rq1(struct ehea_port_res *port_res, int nr_rq1a)
+{
+	int i;
+	int ret = 0;
+	struct ehea_qp *qp;
+	EDEB_EN(7, "port_res=%p, nr_rq1a=%d", port_res, nr_rq1a);
+	qp = port_res->qp;
+
+	for (i = 0; i < port_res->skb_arr_rq1_len; i++) {
+		port_res->skb_arr_rq1[i] = dev_alloc_skb(EHEA_LL_PKT_SIZE);
+		if (!port_res->skb_arr_rq1[i]) {
+			EDEB_ERR(4, "dev_alloc_skb failed. Only %d skb filled.",
+				 i);
+			ret = -ENOMEM;
+			break;
+		}
+	}
+	/* Ring doorbell */
+	ehea_update_rq1a(qp, nr_rq1a);
+	EDEB_EX(7, "");
+	return ret;
+}
+
+static inline int ehea_refill_rq2(struct ehea_port_res *pr, int nr_of_wqes)
+{
+	int i;
+	int ret = 0;
+	struct ehea_qp *qp;
+	struct ehea_rwqe *rwqe;
+	int skb_arr_rq2_len = pr->skb_arr_rq2_len;
+	struct sk_buff **skb_arr_rq2 = pr->skb_arr_rq2;
+
+	EDEB_EN(8, "pr=%p, nr_of_wqes=%d", pr, nr_of_wqes);
+	if (nr_of_wqes == 0)
+		return -EINVAL;
+	qp = pr->qp;
+	for (i = 0; i < nr_of_wqes; i++) {
+		int index = pr->skb_rq2_index++;
+		struct sk_buff *skb = dev_alloc_skb(EHEA_PAGESIZE);
+
+		if (!skb) {
+			EDEB_ERR(4, "dev_alloc_ask failed. Only %d skb filled.",
+				 i);
+			ret = -ENOMEM;
+			break;
+		}
+
+		rwqe = ehea_get_next_rwqe(qp, 2);
+		pr->skb_rq2_index %= skb_arr_rq2_len;
+		skb_arr_rq2[index] = skb;
+		rwqe->wr_id = EHEA_BMASK_SET(EHEA_WR_ID_TYPE, EHEA_RWQE2_TYPE)
+		            | EHEA_BMASK_SET(EHEA_WR_ID_INDEX, index);
+		rwqe->sg_list[0].l_key = ehea_get_lkey(pr->port->adapter,
+						       (void*)skb->data);
+		rwqe->sg_list[0].vaddr = (u64)skb->data;
+		rwqe->sg_list[0].len = EHEA_PAGESIZE;
+		rwqe->data_segments = 1;
[...6103 lines suppressed...]
+	u64 qpedx_rrva2;
+	u64 reserved4;
+	u64 qpedx_rrl3;
+	u64 qpedx_rrrkey3;
+	u64 qpedx_rrva3;
+};
+
+#define CQX_FECADDER EHEA_BMASK_IBM(32, 63)
+#define CQX_FEC_CQE_CNT EHEA_BMASK_IBM(32, 63)
+#define CQX_N1_GENERATE_COMP_EVENT EHEA_BMASK_IBM(0, 0)
+#define CQX_EP_EVENT_PENDING EHEA_BMASK_IBM(0, 0)
+
+#define CQTEMM_OFFSET(x) offsetof(struct ehea_cqtemm, x)
+
+struct ehea_cqtemm {
+	u64 cqx_hcr;
+	u64 cqx_c;
+	u64 cqx_herr;
+	u64 cqx_aer;
+	u64 cqx_ptp;
+	u64 cqx_tp;
+	u64 cqx_fec;
+	u64 cqx_feca;
+	u64 cqx_ep;
+	u64 cqx_eq;
+	u64 reserved1;
+	u64 cqx_n0;
+	u64 cqx_n1;
+	u64 reserved2[(0x1000 - 0x60) / 8];
+};
+
+#define EQTEMM_OFFSET(x) offsetof(struct ehea_eqtemm, x)
+
+struct ehea_eqtemm {
+	u64 EQx_HCR;
+	u64 EQx_C;
+	u64 EQx_HERR;
+	u64 EQx_AER;
+	u64 EQx_PTP;
+	u64 EQx_TP;
+	u64 EQx_SSBA;
+	u64 EQx_PSBA;
+	u64 EQx_CEC;
+	u64 EQx_MEQL;
+	u64 EQx_XISBI;
+	u64 EQx_XISC;
+	u64 EQx_IT;
+};
+
+static inline u64 hipz_galpa_load(struct h_galpa galpa, u32 offset)
+{
+	u64 addr = galpa.fw_handle + offset;
+	u64 out;
+	EDEB_EN(7, "addr=%lx offset=%x ", addr, offset);
+	out = *(volatile u64 *)addr;
+	EDEB_EX(7, "addr=%lx value=%lx", addr, out);
+	return out;
+};
+
+static inline void hipz_galpa_store(struct h_galpa galpa, u32 offset, u64 value)
+{
+	u64 addr = galpa.fw_handle + offset;
+	EDEB_EN(7, "addr=%lx offset=%x value=%lx", addr, offset,
+		value);
+	*(u64 *) addr = value;
+	hipz_galpa_load(galpa, offset);	/* synchronize explicitly to ehea */
+	EDEB_EX(7, "");
+};
+
+static inline void hipz_galpa_store_acc(struct h_galpa galpa, u32 offset,
+					u64 value)
+{
+	u64 addr = galpa.fw_handle + offset;
+	EDEB(7, "Accelerated store: addr=%lx offset=%x value=%lx",
+	     addr, offset, value);
+	*(u64 *) addr = value;
+};
+
+#define hipz_galpa_store_eq(gal, offset, value)\
+        hipz_galpa_store(gal, EQTEMM_OFFSET(offset), value)
+#define hipz_galpa_load_eq(gal, offset)\
+        hipz_galpa_load(gal, EQTEMM_OFFSET(offset))
+
+#define hipz_galpa_store_cq(gal, offset, value)\
+        hipz_galpa_store(gal, CQTEMM_OFFSET(offset), value)
+#define hipz_galpa_load_cq(gal, offset)\
+        hipz_galpa_load(gal, CQTEMM_OFFSET(offset))
+
+#define hipz_galpa_store_qp(gal, offset, value)\
+        hipz_galpa_store(gal, QPTEMM_OFFSET(offset), value)
+#define hipz_galpa_load_qp(gal, offset)\
+        hipz_galpa_load(gal, QPTEMM_OFFSET(offset))
+
+#define hipz_galpa_store_qped(gal, offset, value)\
+        hipz_galpa_store(gal, QPEDMM_OFFSET(offset), value)
+#define hipz_galpa_load_qped(gal, offset)\
+        hipz_galpa_load(gal, QPEDMM_OFFSET(offset))
+
+#define hipz_galpa_store_mrmw(gal, offset, value)\
+        hipz_galpa_store(gal, MRMWMM_OFFSET(offset), value)
+#define hipz_galpa_load_mrmw(gal, offset)\
+        hipz_galpa_load(gal, MRMWMM_OFFSET(offset))
+
+#define hipz_galpa_store_base(gal, offset, value)\
+        hipz_galpa_store(gal, HCAGR_OFFSET(offset), value)
+#define hipz_galpa_load_base(gal, offset)\
+        hipz_galpa_load(gal, HCAGR_OFFSET(offset))
+
+static inline void ehea_update_sqa(struct ehea_qp *qp, u16 nr_wqes)
+{
+	struct h_galpa gal = qp->galpas.kernel;
+	EDEB_EN(7, "qp=%p, nr_wqes=%d", qp, nr_wqes);
+
+	hipz_galpa_store_acc(gal, QPTEMM_OFFSET(qpx_sqa),
+			     EHEA_BMASK_SET(QPX_SQA_VALUE, nr_wqes));
+	EDEB_EX(7, "qpx_sqa = %i", nr_wqes);
+}
+
+static inline void ehea_update_rq3a(struct ehea_qp *qp, u16 nr_wqes)
+{
+	struct h_galpa gal = qp->galpas.kernel;
+	EDEB_EN(7, "ehea_qp=%p, nr_wqes=%d", qp, nr_wqes);
+	hipz_galpa_store_acc(gal, QPTEMM_OFFSET(qpx_rq3a),
+			     EHEA_BMASK_SET(QPX_RQ1A_VALUE, nr_wqes));
+	EDEB_EX(7, "QPx_RQA = %i", nr_wqes);
+}
+
+static inline void ehea_update_rq2a(struct ehea_qp *qp, u16 nr_wqes)
+{
+	struct h_galpa gal = qp->galpas.kernel;
+	EDEB_EN(7, "ehea_qp=%p, nr_wqes=%d", qp, nr_wqes);
+	hipz_galpa_store_acc(gal, QPTEMM_OFFSET(qpx_rq2a),
+			     EHEA_BMASK_SET(QPX_RQ1A_VALUE, nr_wqes));
+	EDEB_EX(7, "QPx_RQA = %i", nr_wqes);
+}
+
+static inline void ehea_update_rq1a(struct ehea_qp *qp, u16 nr_wqes)
+{
+	struct h_galpa gal = qp->galpas.kernel;
+	EDEB_EN(7, "ehea_qp=%p, nr_wqes=%d", qp, nr_wqes);
+	hipz_galpa_store_acc(gal, QPTEMM_OFFSET(qpx_rq1a),
+			     EHEA_BMASK_SET(QPX_RQ1A_VALUE, nr_wqes));
+	EDEB_EX(7, "QPx_RQA = %i", nr_wqes);
+}
+
+static inline void ehea_update_feca(struct ehea_cq *cq, u32 nr_cqes)
+{
+	struct h_galpa gal = cq->galpas.kernel;
+	EDEB_EN(7, "");
+	hipz_galpa_store_acc(gal, CQTEMM_OFFSET(cqx_feca),
+			     EHEA_BMASK_SET(CQX_FECADDER, nr_cqes));
+	EDEB_EX(7, "cqx_feca = %i", nr_cqes);
+}
+
+static inline void ehea_reset_cq_n1(struct ehea_cq *cq)
+{
+	struct h_galpa gal = cq->galpas.kernel;
+	EDEB_EN(7, "");
+	hipz_galpa_store_cq(gal,
+			    cqx_n1,
+			    EHEA_BMASK_SET(CQX_N1_GENERATE_COMP_EVENT, 1));
+	EDEB_EX(7, "");
+}
+
+static inline void ehea_reset_cq_ep(struct ehea_cq *my_cq)
+{
+	struct h_galpa gal = my_cq->galpas.kernel;
+	EDEB_EN(7, "");
+	hipz_galpa_store_acc(gal,
+			     CQTEMM_OFFSET(cqx_ep),
+			     EHEA_BMASK_SET(CQX_EP_EVENT_PENDING, 0));
+	EDEB_EX(7, "");
+}
+
+
+#endif	/* __EHEA_HW_H__ */


--- linux-2.6.17-rc6-orig/drivers/net/ehea/Makefile	1969-12-31 16:00:00.000000000 -0800
+++ kernel/drivers/net/ehea/Makefile	2006-06-09 05:29:59.170253728 -0700
@@ -0,0 +1,7 @@
+#
+# Makefile for the eHEA ethernet device driver for IBM eServer System p
+#
+
+ehea_mod-objs = ehea_main.o ehea_phyp.o ehea_qmr.o ehea_ethtool.o ehea_phyp.o
+obj-$(CONFIG_EHEA) += ehea_mod.o
+

--
Please review and ACK for RHEL5.0
----------
Manoj Iyer
IBM, Linux on PowerPC
Redhat Onsite Developer.
Phone: 1-978-392-3934
Cell: 1-512-350-3400
10 Technology Park Dr
Westford MA.


linux-2.6-net-ipsec-labelling.patch:
 Documentation/networking/secid.txt           |   14 +
 include/linux/security.h                     |  214 +++++++++++++++++++++++---
 include/net/flow.h                           |    5 
 include/net/request_sock.h                   |    1 
 include/net/route.h                          |    3 
 include/net/sock.h                           |   14 +
 include/net/xfrm.h                           |    2 
 net/core/flow.c                              |    7 
 net/core/sock.c                              |    2 
 net/dccp/ipv4.c                              |    4 
 net/dccp/ipv6.c                              |    9 +
 net/ipv4/af_inet.c                           |    1 
 net/ipv4/icmp.c                              |    2 
 net/ipv4/inet_connection_sock.c              |    3 
 net/ipv4/ip_output.c                         |    2 
 net/ipv4/netfilter/ipt_REJECT.c              |    1 
 net/ipv4/raw.c                               |    1 
 net/ipv4/syncookies.c                        |    5 
 net/ipv4/tcp_ipv4.c                          |    3 
 net/ipv4/udp.c                               |    1 
 net/ipv6/af_inet6.c                          |    1 
 net/ipv6/datagram.c                          |    2 
 net/ipv6/icmp.c                              |    2 
 net/ipv6/inet6_connection_sock.c             |    1 
 net/ipv6/ndisc.c                             |    1 
 net/ipv6/netfilter/ip6t_REJECT.c             |    1 
 net/ipv6/raw.c                               |    1 
 net/ipv6/tcp_ipv6.c                          |    9 +
 net/ipv6/udp.c                               |    2 
 net/key/af_key.c                             |   37 ++++
 net/xfrm/xfrm_policy.c                       |   27 +--
 net/xfrm/xfrm_state.c                        |   14 +
 net/xfrm/xfrm_user.c                         |   58 +++++--
 security/dummy.c                             |   58 ++++++-
 security/selinux/hooks.c                     |  183 +++++++++++++++-------
 security/selinux/include/av_perm_to_string.h |    1 
 security/selinux/include/av_permissions.h    |    1 
 security/selinux/include/objsec.h            |    1 
 security/selinux/include/security.h          |    2 
 security/selinux/include/xfrm.h              |   43 +++--
 security/selinux/ss/mls.c                    |   20 --
 security/selinux/ss/mls.h                    |   20 ++
 security/selinux/ss/services.c               |   69 ++++++++
 security/selinux/xfrm.c                      |  216 ++++++++++++++++++++++-----
 44 files changed, 854 insertions(+), 210 deletions(-)

--- NEW FILE linux-2.6-net-ipsec-labelling.patch ---
Date: Tue, 8 Aug 2006 00:20:01 -0400 (EDT)
From: James Morris <jmorris at redhat.com>
Subject: [SELINUX/NETWORK 1/2] IPsec labeling enhancements for MLS
Message-ID: <Pine.LNX.4.44.0608080013270.13632-100000 at redline.boston.redhat.com>

This patch, from TCS, enhances the IPsec xfrm labeling for MLS, to allow 
Linux to be certified against LSPP.

The upstream post of the first patch is here:
http://marc.theaimsgroup.com/?l=linux-netdev&m=115324352321637&w=2

This code has been merged into the upstream 2.6.19 networking tree and is 
also included in the latest -mm kernel.

Signed-off-by: Venkat Yekkirala <vyekkirala at TrustedCS.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: James Morris <jmorris at redhat.com>

---

 Documentation/networking/secid.txt           |   14 +
 include/linux/security.h                     |  214 +++++++++++++++++++++++---
 include/net/flow.h                           |    5 
 include/net/request_sock.h                   |    1 
 include/net/route.h                          |    3 
 include/net/sock.h                           |   14 +
 include/net/xfrm.h                           |    2 
 net/core/flow.c                              |    7 
 net/core/sock.c                              |    2 
 net/dccp/ipv4.c                              |    4 
 net/dccp/ipv6.c                              |    9 +
 net/ipv4/af_inet.c                           |    1 
 net/ipv4/icmp.c                              |    2 
 net/ipv4/inet_connection_sock.c              |    3 
 net/ipv4/ip_output.c                         |    2 
 net/ipv4/netfilter/ipt_REJECT.c              |    1 
 net/ipv4/raw.c                               |    1 
 net/ipv4/syncookies.c                        |    5 
 net/ipv4/tcp_ipv4.c                          |    3 
 net/ipv4/udp.c                               |    1 
 net/ipv6/af_inet6.c                          |    1 
 net/ipv6/datagram.c                          |    2 
 net/ipv6/icmp.c                              |    2 
 net/ipv6/inet6_connection_sock.c             |    1 
 net/ipv6/ndisc.c                             |    1 
 net/ipv6/netfilter/ip6t_REJECT.c             |    1 
 net/ipv6/raw.c                               |    1 
 net/ipv6/tcp_ipv6.c                          |    9 +
 net/ipv6/udp.c                               |    2 
 net/key/af_key.c                             |   37 ++++
 net/xfrm/xfrm_policy.c                       |   27 +--
 net/xfrm/xfrm_state.c                        |   14 +
 net/xfrm/xfrm_user.c                         |   58 +++++--
 security/dummy.c                             |   58 ++++++-
 security/selinux/hooks.c                     |  183 +++++++++++++++-------
 security/selinux/include/av_perm_to_string.h |    1 
 security/selinux/include/av_permissions.h    |    1 
 security/selinux/include/objsec.h            |    1 
 security/selinux/include/security.h          |    2 
 security/selinux/include/xfrm.h              |   43 +++--
 security/selinux/ss/mls.c                    |   20 --
 security/selinux/ss/mls.h                    |   20 ++
 security/selinux/ss/services.c               |   69 ++++++++
 security/selinux/xfrm.c                      |  216 ++++++++++++++++++++++-----
 44 files changed, 854 insertions(+), 210 deletions(-)


diff -purN -X dontdiff linux-2.6.17.i686/Documentation/networking/secid.txt linux-2.6.17.i686.w/Documentation/networking/secid.txt
--- linux-2.6.17.i686/Documentation/networking/secid.txt	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.i686.w/Documentation/networking/secid.txt	2006-08-07 20:29:29.000000000 -0400
@@ -0,0 +1,14 @@
+flowi structure:
+
+The secid member in the flow structure is used in LSMs (e.g. SELinux) to indicate
+the label of the flow. This label of the flow is currently used in selecting
+matching labeled xfrm(s).
+
+If this is an outbound flow, the label is derived from the socket, if any, or
+the incoming packet this flow is being generated as a response to (e.g. tcp
+resets, timewait ack, etc.). It is also conceivable that the label could be
+derived from other sources such as process context, device, etc., in special
+cases, as may be appropriate.
+
+If this is an inbound flow, the label is derived from the IPSec security
+associations, if any, used by the packet.
diff -purN -X dontdiff linux-2.6.17.i686/include/linux/security.h linux-2.6.17.i686.w/include/linux/security.h
--- linux-2.6.17.i686/include/linux/security.h	2006-08-07 10:40:09.000000000 -0400
+++ linux-2.6.17.i686.w/include/linux/security.h	2006-08-07 20:34:49.000000000 -0400
@@ -31,6 +31,8 @@
 #include <linux/msg.h>
 #include <linux/sched.h>
 #include <linux/key.h>
+#include <linux/xfrm.h>
+#include <net/flow.h>
 
 struct ctl_table;
 
@@ -88,6 +90,7 @@ extern int cap_netlink_recv(struct sk_bu
 struct nfsctl_arg;
 struct sched_param;
 struct swap_info_struct;
+struct request_sock;
 
 /* bprm_apply_creds unsafe reasons */
 #define LSM_UNSAFE_SHARE	1
@@ -812,9 +815,19 @@ struct swap_info_struct;
  *      which is used to copy security attributes between local stream sockets.
  * @sk_free_security:
  *	Deallocate security structure.
- * @sk_getsid:
- *	Retrieve the LSM-specific sid for the sock to enable caching of network
+ * @sk_clone_security:
+ *	Clone/copy security structure.
+ * @sk_getsecid:
+ *	Retrieve the LSM-specific secid for the sock to enable caching of network
  *	authorizations.
+ * @sock_graft:
+ *	Sets the socket's isec sid to the sock's sid.
+ * @inet_conn_request:
+ *	Sets the openreq's sid to socket's sid with MLS portion taken from peer sid.
+ * @inet_csk_clone:
+ *	Sets the new child socket's sid to the openreq sid.
+ * @req_classify_flow:
+ *	Sets the flow's sid to the openreq sid.
  *
  * Security hooks for XFRM operations.
  *
@@ -823,9 +836,10 @@ struct swap_info_struct;
  *	used by the XFRM system.
  *	@sec_ctx contains the security context information being provided by
  *	the user-level policy update program (e.g., setkey).
- *	Allocate a security structure to the xp->security field.
- *	The security field is initialized to NULL when the xfrm_policy is
- *	allocated.
+ *	@sk refers to the sock from which to derive the security context.
+ *	Allocate a security structure to the xp->security field; the security
+ *	field is initialized to NULL when the xfrm_policy is allocated. Only
+ *	one of sec_ctx or sock can be specified.
  *	Return 0 if operation was successful (memory to allocate, legal context)
  * @xfrm_policy_clone_security:
  *	@old contains an existing xfrm_policy in the SPD.
@@ -844,9 +858,14 @@ struct swap_info_struct;
  *	Database by the XFRM system.
  *	@sec_ctx contains the security context information being provided by
  *	the user-level SA generation program (e.g., setkey or racoon).
- *	Allocate a security structure to the x->security field.  The
- *	security field is initialized to NULL when the xfrm_state is
- *	allocated.
+ *	@polsec contains the security context information associated with a xfrm
+ *	policy rule from which to take the base context. polsec must be NULL
+ *	when sec_ctx is specified.
+ *	@secid contains the secid from which to take the mls portion of the context.
+ *	Allocate a security structure to the x->security field; the security
+ *	field is initialized to NULL when the xfrm_state is allocated. Set the
+ *	context to correspond to either sec_ctx or polsec, with the mls portion
+ *	taken from secid in the latter case.
  *	Return 0 if operation was successful (memory to allocate, legal context).
  * @xfrm_state_free_security:
  *	@x contains the xfrm_state.
@@ -857,13 +876,27 @@ struct swap_info_struct;
  * @xfrm_policy_lookup:
  *	@xp contains the xfrm_policy for which the access control is being
  *	checked.
- *	@sk_sid contains the sock security label that is used to authorize
+ *	@fl_secid contains the flow security label that is used to authorize
  *	access to the policy xp.
  *	@dir contains the direction of the flow (input or output).
- *	Check permission when a sock selects a xfrm_policy for processing
+ *	Check permission when a flow selects a xfrm_policy for processing
  *	XFRMs on a packet.  The hook is called when selecting either a
  *	per-socket policy or a generic xfrm policy.
  *	Return 0 if permission is granted.
+ * @xfrm_state_pol_flow_match:
+ *	@x contains the state to match.
+ *	@xp contains the policy to check for a match.
+ *	@fl contains the flow to check for a match.
+ *	Return 1 if there is a match.
+ * @xfrm_flow_state_match:
+ *	@fl contains the flow key to match.
+ *	@xfrm points to the xfrm_state to match.
+ *	Return 1 if there is a match.
+ * @xfrm_decode_session:
+ *	@skb points to skb to decode.
+ *	@secid points to the flow key secid to set.
+ *	@ckall says if all xfrms used should be checked for same secid.
+ *	Return 0 if ckall is zero or all xfrms used have the same secid.
  *
  * Security hooks affecting all Key Management operations
  *
@@ -1332,18 +1365,31 @@ struct security_operations {
 	int (*socket_getpeersec_dgram) (struct socket *sock, struct sk_buff *skb, u32 *secid);
 	int (*sk_alloc_security) (struct sock *sk, int family, gfp_t priority);
 	void (*sk_free_security) (struct sock *sk);
-	unsigned int (*sk_getsid) (struct sock *sk, struct flowi *fl, u8 dir);
+	void (*sk_clone_security) (const struct sock *sk, struct sock *newsk);
+	void (*sk_getsecid) (struct sock *sk, u32 *secid);
+	void (*sock_graft)(struct sock* sk, struct socket *parent);
+	int (*inet_conn_request)(struct sock *sk, struct sk_buff *skb,
+					struct request_sock *req);
[...1949 lines suppressed...]
+				if (!sid_set) {
+					*sid = ctx->ctx_sid;
+					sid_set = 1;
+
+					if (!ckall)
+						break;
+				}
+				else if (*sid != ctx->ctx_sid)
+					return -EINVAL;
+			}
+		}
+	}
+
+	return 0;
+}
+
+/*
  * Security blob allocation for xfrm_policy and xfrm_state
  * CTX does not have a meaningful value on input
  */
-static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_user_sec_ctx *uctx)
+static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp,
+	struct xfrm_user_sec_ctx *uctx, struct xfrm_sec_ctx *pol, u32 sid)
 {
 	int rc = 0;
 	struct task_security_struct *tsec = current->security;
-	struct xfrm_sec_ctx *ctx;
+	struct xfrm_sec_ctx *ctx = NULL;
+	char *ctx_str = NULL;
+	u32 str_len;
+	u32 ctx_sid;
 
-	BUG_ON(!uctx);
-	BUG_ON(uctx->ctx_doi != XFRM_SC_ALG_SELINUX);
+	BUG_ON(uctx && pol);
+
+	if (!uctx)
+		goto not_from_user;
+
+	if (uctx->ctx_doi != XFRM_SC_ALG_SELINUX)
+		return -EINVAL;
 
 	if (uctx->ctx_len >= PAGE_SIZE)
 		return -ENOMEM;
@@ -141,9 +249,43 @@ static int selinux_xfrm_sec_ctx_alloc(st
 
 	return rc;
 
+not_from_user:
+	if (pol) {
+		rc = security_sid_mls_copy(pol->ctx_sid, sid, &ctx_sid);
+		if (rc)
+			goto out;
+	}
+	else
+		ctx_sid = sid;
+
+	rc = security_sid_to_context(ctx_sid, &ctx_str, &str_len);
+	if (rc)
+		goto out;
+
+	*ctxp = ctx = kmalloc(sizeof(*ctx) +
+			      str_len,
+			      GFP_ATOMIC);
+
+	if (!ctx) {
+		rc = -ENOMEM;
+		goto out;
+	}
+
+	ctx->ctx_doi = XFRM_SC_DOI_LSM;
+	ctx->ctx_alg = XFRM_SC_ALG_SELINUX;
+	ctx->ctx_sid = ctx_sid;
+	ctx->ctx_len = str_len;
+	memcpy(ctx->ctx_str,
+	       ctx_str,
+	       str_len);
+
+	goto out2;
+
 out:
 	*ctxp = NULL;
 	kfree(ctx);
+out2:
+	kfree(ctx_str);
 	return rc;
 }
 
@@ -151,13 +293,23 @@ out:
  * LSM hook implementation that allocs and transfers uctx spec to
  * xfrm_policy.
  */
-int selinux_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *uctx)
+int selinux_xfrm_policy_alloc(struct xfrm_policy *xp,
+		struct xfrm_user_sec_ctx *uctx, struct sock *sk)
 {
 	int err;
+	u32 sid;
 
 	BUG_ON(!xp);
+	BUG_ON(uctx && sk);
 
-	err = selinux_xfrm_sec_ctx_alloc(&xp->security, uctx);
+	if (sk) {
+		struct sk_security_struct *ssec = sk->sk_security;
+		sid = ssec->sid;
+	}
+	else
+		sid = SECSID_NULL;
+
+	err = selinux_xfrm_sec_ctx_alloc(&xp->security, uctx, NULL, sid);
 	return err;
 }
 
@@ -217,13 +369,14 @@ int selinux_xfrm_policy_delete(struct xf
  * LSM hook implementation that allocs and transfers sec_ctx spec to
  * xfrm_state.
  */
-int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *uctx)
+int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *uctx,
+		struct xfrm_sec_ctx *pol, u32 secid)
 {
 	int err;
 
 	BUG_ON(!x);
 
-	err = selinux_xfrm_sec_ctx_alloc(&x->security, uctx);
+	err = selinux_xfrm_sec_ctx_alloc(&x->security, uctx, pol, secid);
 	return err;
 }
 
@@ -329,38 +482,30 @@ int selinux_xfrm_state_delete(struct xfr
  * we need to check for unlabelled access since this may not have
  * gone thru the IPSec process.
  */
-int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
+int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb,
+				struct avc_audit_data *ad)
 {
 	int i, rc = 0;
 	struct sec_path *sp;
+	u32 sel_sid = SECINITSID_UNLABELED;
 
 	sp = skb->sp;
 
 	if (sp) {
-		/*
-		 * __xfrm_policy_check does not approve unless xfrm_policy_ok
-		 * says that spi's match for policy and the socket.
-		 *
-		 *  Only need to verify the existence of an authorizable sp.
-		 */
 		for (i = 0; i < sp->len; i++) {
 			struct xfrm_state *x = sp->xvec[i];
 
-			if (x && selinux_authorizable_xfrm(x))
-				goto accept;
+			if (x && selinux_authorizable_xfrm(x)) {
+				struct xfrm_sec_ctx *ctx = x->security;
+				sel_sid = ctx->ctx_sid;
+				break;
+			}
 		}
 	}
 
-	/* check SELinux sock for unlabelled access */
-	rc = avc_has_perm(isec_sid, SECINITSID_UNLABELED, SECCLASS_ASSOCIATION,
-			  ASSOCIATION__RECVFROM, NULL);
-	if (rc)
-		goto drop;
-
-accept:
-	return 0;
+	rc = avc_has_perm(isec_sid, sel_sid, SECCLASS_ASSOCIATION,
+			  ASSOCIATION__RECVFROM, ad);
 
-drop:
 	return rc;
 }
 
@@ -371,7 +516,8 @@ drop:
  * If we do have a authorizable security association, then it has already been
  * checked in xfrm_policy_lookup hook.
  */
-int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb)
+int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
+					struct avc_audit_data *ad)
 {
 	struct dst_entry *dst;
 	int rc = 0;
@@ -391,7 +537,7 @@ int selinux_xfrm_postroute_last(u32 isec
 	}
 
 	rc = avc_has_perm(isec_sid, SECINITSID_UNLABELED, SECCLASS_ASSOCIATION,
-			  ASSOCIATION__SENDTO, NULL);
+			  ASSOCIATION__SENDTO, ad);
 out:
 	return rc;
 }


linux-2.6-net-netlabel-cipso.patch:
 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  781 ++++++
 Documentation/netlabel/introduction.txt                   |   46 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 Documentation/networking/ip-sysctl.txt                    |   35 
 include/linux/ip.h                                        |    1 
 include/linux/security.h                                  |   25 
 include/linux/sysctl.h                                    |    4 
 include/linux/utsrelease.h                                |    1 
 include/net/cipso_ipv4.h                                  |  250 ++
 include/net/inet_sock.h                                   |    2 
 include/net/netlabel.h                                    |  291 ++
 net/Kconfig                                               |    2 
 net/Makefile                                              |    1 
 net/ipv4/Makefile                                         |    1 
 net/ipv4/ah4.c                                            |    2 
 net/ipv4/cipso_ipv4.c                                     | 1607 ++++++++++++++
 net/ipv4/ip_options.c                                     |   19 
 net/ipv4/sysctl_net_ipv4.c                                |   35 
 net/netlabel/Kconfig                                      |   14 
 net/netlabel/Makefile                                     |   16 
 net/netlabel/netlabel_cipso_v4.c                          |  542 ++++
 net/netlabel/netlabel_cipso_v4.h                          |  217 +
 net/netlabel/netlabel_domainhash.c                        |  513 ++++
 net/netlabel/netlabel_domainhash.h                        |   63 
 net/netlabel/netlabel_kapi.c                              |  231 ++
 net/netlabel/netlabel_mgmt.c                              |  624 +++++
 net/netlabel/netlabel_mgmt.h                              |  246 ++
 net/netlabel/netlabel_unlabeled.c                         |  253 ++
 net/netlabel/netlabel_unlabeled.h                         |   98 
 net/netlabel/netlabel_user.c                              |  158 +
 net/netlabel/netlabel_user.h                              |  214 +
 net/socket.c                                              |   13 
 security/dummy.c                                          |    6 
 security/selinux/hooks.c                                  |   58 
 security/selinux/include/objsec.h                         |    8 
 security/selinux/include/selinux_netlabel.h               |  125 +
 security/selinux/ss/ebitmap.c                             |  144 +
 security/selinux/ss/ebitmap.h                             |    6 
 security/selinux/ss/mls.c                                 |  156 +
 security/selinux/ss/mls.h                                 |   21 
 security/selinux/ss/services.c                            |  488 ++++
 44 files changed, 7393 insertions(+), 31 deletions(-)

--- NEW FILE linux-2.6-net-netlabel-cipso.patch ---
Date: Tue, 8 Aug 2006 00:25:40 -0400 (EDT)
From: James Morris <jmorris at redhat.com>
Subject: [SELINUX/NETWORK 2/2] Netlabel: CIPSO labeled networking support

This patch implements a legacy MLS network labeling scheme (including, but 
generally referred to as CIPSO, with this particular implementation called 
Netlabel).

It's from HP, and is an alternative to the native Linux IPsec xfrm 
labeling.  Its purpose is to provide interoperability with legacy Trusted 
Solaris systems.

The upstream post of the first patch is here:
http://marc.theaimsgroup.com/?l=linux-netdev&m=115463625625389&w=2

This code has been merged into the upstream 2.6.19 networking tree and is 
also included in the latest -mm kernel.

This patch is a backport for FC6 and RHEL5.

Signed-off-by: Paul Moore <paul.moore at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: James Morris <jmorris at redhat.com>

---

 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  781 ++++++
 Documentation/netlabel/introduction.txt                   |   46 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 Documentation/networking/ip-sysctl.txt                    |   35 
 include/linux/ip.h                                        |    1 
 include/linux/security.h                                  |   25 
 include/linux/sysctl.h                                    |    4 
 include/linux/utsrelease.h                                |    1 
 include/net/cipso_ipv4.h                                  |  250 ++
 include/net/inet_sock.h                                   |    2 
 include/net/netlabel.h                                    |  291 ++
 net/Kconfig                                               |    2 
 net/Makefile                                              |    1 
 net/ipv4/Makefile                                         |    1 
 net/ipv4/ah4.c                                            |    2 
 net/ipv4/cipso_ipv4.c                                     | 1607 ++++++++++++++
 net/ipv4/ip_options.c                                     |   19 
 net/ipv4/sysctl_net_ipv4.c                                |   35 
 net/netlabel/Kconfig                                      |   14 
 net/netlabel/Makefile                                     |   16 
 net/netlabel/netlabel_cipso_v4.c                          |  542 ++++
 net/netlabel/netlabel_cipso_v4.h                          |  217 +
 net/netlabel/netlabel_domainhash.c                        |  513 ++++
 net/netlabel/netlabel_domainhash.h                        |   63 
 net/netlabel/netlabel_kapi.c                              |  231 ++
 net/netlabel/netlabel_mgmt.c                              |  624 +++++
 net/netlabel/netlabel_mgmt.h                              |  246 ++
 net/netlabel/netlabel_unlabeled.c                         |  253 ++
 net/netlabel/netlabel_unlabeled.h                         |   98 
 net/netlabel/netlabel_user.c                              |  158 +
 net/netlabel/netlabel_user.h                              |  214 +
 net/socket.c                                              |   13 
 security/dummy.c                                          |    6 
 security/selinux/hooks.c                                  |   58 
 security/selinux/include/objsec.h                         |    8 
 security/selinux/include/selinux_netlabel.h               |  125 +
 security/selinux/ss/ebitmap.c                             |  144 +
 security/selinux/ss/ebitmap.h                             |    6 
 security/selinux/ss/mls.c                                 |  156 +
 security/selinux/ss/mls.h                                 |   21 
 security/selinux/ss/services.c                            |  488 ++++
 44 files changed, 7393 insertions(+), 31 deletions(-)


diff -purN -X dontdiff linux-2.6.17.i686.p/Documentation/00-INDEX linux-2.6.17.i686.w/Documentation/00-INDEX
--- linux-2.6.17.i686.p/Documentation/00-INDEX	2006-06-17 21:49:35.000000000 -0400
+++ linux-2.6.17.i686.w/Documentation/00-INDEX	2006-08-07 21:03:07.000000000 -0400
@@ -184,6 +184,8 @@ mtrr.txt
 	- how to use PPro Memory Type Range Registers to increase performance.
 nbd.txt
 	- info on a TCP implementation of a network block device.
+netlabel/
+	- directory with information on the NetLabel subsystem.
 networking/
 	- directory with info on various aspects of networking with Linux.
 nfsroot.txt
diff -purN -X dontdiff linux-2.6.17.i686.p/Documentation/netlabel/00-INDEX linux-2.6.17.i686.w/Documentation/netlabel/00-INDEX
--- linux-2.6.17.i686.p/Documentation/netlabel/00-INDEX	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.i686.w/Documentation/netlabel/00-INDEX	2006-08-07 21:03:07.000000000 -0400
@@ -0,0 +1,10 @@
+00-INDEX
+	- this file.
+cipso_ipv4.txt
+	- documentation on the IPv4 CIPSO protocol engine.
+draft-ietf-cipso-ipsecurity-01.txt
+	- IETF draft of the CIPSO protocol, dated 16 July 1992.
+introduction.txt
+	- NetLabel introduction, READ THIS FIRST.
+lsm_interface.txt
+	- documentation on the NetLabel kernel security module API.
diff -purN -X dontdiff linux-2.6.17.i686.p/Documentation/netlabel/cipso_ipv4.txt linux-2.6.17.i686.w/Documentation/netlabel/cipso_ipv4.txt
--- linux-2.6.17.i686.p/Documentation/netlabel/cipso_ipv4.txt	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.i686.w/Documentation/netlabel/cipso_ipv4.txt	2006-08-07 21:03:07.000000000 -0400
@@ -0,0 +1,48 @@
+NetLabel CIPSO/IPv4 Protocol Engine
+==============================================================================
+Paul Moore, paul.moore at hp.com
+
+May 17, 2006
+
+ * Overview
+
+The NetLabel CIPSO/IPv4 protocol engine is based on the IETF Commercial IP
+Security Option (CIPSO) draft from July 16, 1992.  A copy of this draft can be
+found in this directory, consult '00-INDEX' for the filename.  While the IETF
+draft never made it to an RFC standard it has become a de-facto standard for
+labeled networking and is used in many trusted operating systems.
+
+ * Outbound Packet Processing
+
+The CIPSO/IPv4 protocol engine applies the CIPSO IP option to packets by
+adding the CIPSO label to the socket.  This causes all packets leaving the
+system through the socket to have the CIPSO IP option applied.  The socket's
+CIPSO label can be changed at any point in time, however, it is recommended
+that it is set upon the socket's creation.  The LSM can set the socket's CIPSO
+label by using the NetLabel security module API; if the NetLabel "domain" is
+configured to use CIPSO for packet labeling then a CIPSO IP option will be
+generated and attached to the socket.
+
+ * Inbound Packet Processing
+
+The CIPSO/IPv4 protocol engine validates every CIPSO IP option it finds at the
+IP layer without any special handling required by the LSM.  However, in order
+to decode and translate the CIPSO label on the packet the LSM must use the
+NetLabel security module API to extract the security attributes of the packet.
+This is typically done at the socket layer using the 'socket_sock_rcv_skb()'
+LSM hook.
+
+ * Label Translation
+
+The CIPSO/IPv4 protocol engine contains a mechanism to translate CIPSO security
+attributes such as sensitivity level and category to values which are
+appropriate for the host.  These mappings are defined as part of a CIPSO
+Domain Of Interpretation (DOI) definition and are configured through the
+NetLabel user space communication layer.  Each DOI definition can have a
+different security attribute mapping table.
+
+ * Label Translation Cache
+
+The NetLabel system provides a framework for caching security attribute
+mappings from the network labels to the corresponding LSM identifiers.  The
+CIPSO/IPv4 protocol engine supports this caching mechanism.
diff -purN -X dontdiff linux-2.6.17.i686.p/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt linux-2.6.17.i686.w/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
--- linux-2.6.17.i686.p/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.i686.w/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt	2006-08-07 21:03:07.000000000 -0400
@@ -0,0 +1,791 @@
+IETF CIPSO Working Group
+16 July, 1992
+
+
+
+                 COMMERCIAL IP SECURITY OPTION (CIPSO 2.2)
+
+
+
+1.    Status
+
+This Internet Draft provides the high level specification for a Commercial
+IP Security Option (CIPSO).  This draft reflects the version as approved by
+the CIPSO IETF Working Group.  Distribution of this memo is unlimited.
+
+This document is an Internet Draft.  Internet Drafts are working documents
+of the Internet Engineering Task Force (IETF), its Areas, and its Working
+Groups. Note that other groups may also distribute working documents as
+Internet Drafts.
+
+Internet Drafts are draft documents valid for a maximum of six months.
+Internet Drafts may be updated, replaced, or obsoleted by other documents
+at any time.  It is not appropriate to use Internet Drafts as reference
+material or to cite them other than as a "working draft" or "work in
+progress."
+
+Please check the I-D abstract listing contained in each Internet Draft
+directory to learn the current status of this or any other Internet Draft.
+
+
+
+
+2.    Background
+
+Currently the Internet Protocol includes two security options.  One of
+these options is the DoD Basic Security Option (BSO) (Type 130) which allows
+IP datagrams to be labeled with security classifications.  This option
+provides sixteen security classifications and a variable number of handling
+restrictions.  To handle additional security information, such as security
+categories or compartments, another security option (Type 133) exists and
+is referred to as the DoD Extended Security Option (ESO).  The values for
+the fixed fields within these two options are administered by the Defense
+Information Systems Agency (DISA).
+
[...7591 lines suppressed...]
+/**
+ * selinux_netlbl_socket_post_create - Label a socket using NetLabel
+ * @sock: the socket to label
+ * @sock_family: the socket family
+ * @sid: the SID to use
+ *
+ * Description:
+ * Attempt to label a socket using the NetLabel mechanism using the given
+ * SID.  Returns zero values on success, negative values on failure.
+ *
+ */
+int selinux_netlbl_socket_post_create(struct socket *sock,
+				      int sock_family,
+				      u32 sid)
+{
+	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+	struct sk_security_struct *sksec = sock->sk->sk_security;
+
+	if (sock_family != PF_INET)
+		return 0;
+
+	sksec->sclass = isec->sclass;
+	sksec->nlbl_state = NLBL_REQUIRE;
+	return selinux_netlbl_socket_setsid(sock, sid);
+}
+
+/**
+ * selinux_netlbl_sock_graft - Netlabel the new socket
+ * @sk: the new connection
+ * @sock: the new socket
+ *
+ * Description:
+ * The connection represented by @sk is being grafted onto @sock so set the
+ * socket's NetLabel to match the SID of @sk.
+ *
+ */
+void selinux_netlbl_sock_graft(struct sock *sk, struct socket *sock)
+{
+	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
+	struct sk_security_struct *sksec = sk->sk_security;
+
+	if (sk->sk_family != PF_INET)
+		return;
+
+	sksec->nlbl_state = NLBL_REQUIRE;
+	sksec->peer_sid = sksec->sid;
+	sksec->sclass = isec->sclass;
+
+	/* Try to set the NetLabel on the socket to save time later, if we fail
+	 * here we will pick up the pieces in later calls to
+	 * selinux_netlbl_inode_permission(). */
+	selinux_netlbl_socket_setsid(sock, sksec->sid);
+}
+
+/**
+ * selinux_netlbl_inet_conn_request - Handle a new connection request
+ * @skb: the packet
+ * @sock_sid: the SID of the parent socket
+ *
+ * Description:
+ * If present, use the security attributes of the packet in @skb and the
+ * parent sock's SID to arrive at a SID for the new child sock.  Returns the
+ * SID of the connection or SECSID_NULL on failure.
+ *
+ */
+u32 selinux_netlbl_inet_conn_request(struct sk_buff *skb, u32 sock_sid)
+{
+	int rc;
+	u32 peer_sid;
+
+	rc = selinux_netlbl_skbuff_getsid(skb, sock_sid, &peer_sid);
+	if (rc != 0)
+		return SECSID_NULL;
+
+	if (peer_sid == SECINITSID_UNLABELED)
+		return SECSID_NULL;
+
+	return peer_sid;
+}
+
+/**
+ * __selinux_netlbl_inode_permission - Label a socket using NetLabel
+ * @inode: the file descriptor's inode
+ * @mask: the permission mask
+ *
+ * Description:
+ * Try to label a socket with the inode's SID using NetLabel.  Returns zero on
+ * success, negative values on failure.
+ *
+ */
+int __selinux_netlbl_inode_permission(struct inode *inode, int mask)
+{
+	int rc;
+	struct socket *sock = SOCKET_I(inode);
+	struct sk_security_struct *sksec = sock->sk->sk_security;
+
+	lock_sock(sock->sk);
+	rc = selinux_netlbl_socket_setsid(sock, sksec->sid);
+	release_sock(sock->sk);
+
+	return rc;
+}
+
+/**
+ * selinux_netlbl_sock_rcv_skb - Do an inbound access check using NetLabel
+ * @sksec: the sock's sk_security_struct
+ * @skb: the packet
+ * @ad: the audit data
+ *
+ * Description:
+ * Fetch the NetLabel security attributes from @skb and perform an access check
+ * against the receiving socket.  Returns zero on success, negative values on
+ * error.
+ *
+ */
+int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
+				struct sk_buff *skb,
+				struct avc_audit_data *ad)
+{
+	int rc;
+	u32 netlbl_sid;
+	u32 recv_perm;
+
+	rc = selinux_netlbl_skbuff_getsid(skb, sksec->sid, &netlbl_sid);
+	if (rc != 0)
+		return rc;
+
+	if (netlbl_sid == SECINITSID_UNLABELED)
+		return 0;
+
+	switch (sksec->sclass) {
+	case SECCLASS_UDP_SOCKET:
+		recv_perm = UDP_SOCKET__RECV_MSG;
+		break;
+	case SECCLASS_TCP_SOCKET:
+		recv_perm = TCP_SOCKET__RECV_MSG;
+		break;
+	default:
+		recv_perm = RAWIP_SOCKET__RECV_MSG;
+	}
+
+	rc = avc_has_perm(sksec->sid,
+			  netlbl_sid,
+			  sksec->sclass,
+			  recv_perm,
+			  ad);
+	if (rc == 0)
+		return 0;
+
+	netlbl_skbuff_err(skb, rc);
+	return rc;
+}
+
+/**
+ * selinux_netlbl_socket_peersid - Return the peer SID of a connected socket
+ * @sock: the socket
+ *
+ * Description:
+ * Examine @sock to find the connected peer's SID.  Returns the SID on success
+ * or SECSID_NULL on error.
+ *
+ */
+u32 selinux_netlbl_socket_getpeersec_stream(struct socket *sock)
+{
+	struct sk_security_struct *sksec = sock->sk->sk_security;
+
+	if (sksec->peer_sid == SECINITSID_UNLABELED)
+		return SECSID_NULL;
+
+	return sksec->peer_sid;
+}
+
+/**
+ * selinux_netlbl_socket_getpeersec_dgram - Return the SID of a NetLabel packet
+ * @skb: the packet
+ *
+ * Description:
+ * Examine @skb to find the SID assigned to it by NetLabel.  Returns the SID on
+ * success, SECSID_NULL on error.
+ *
+ */
+u32 selinux_netlbl_socket_getpeersec_dgram(struct sk_buff *skb)
+{
+	int peer_sid;
+	struct sock *sk = skb->sk;
+	struct inode_security_struct *isec;
+
+	if (sk == NULL || sk->sk_socket == NULL)
+		return SECSID_NULL;
+
+	isec = SOCK_INODE(sk->sk_socket)->i_security;
+	if (selinux_netlbl_skbuff_getsid(skb, isec->sid, &peer_sid) != 0)
+		return SECSID_NULL;
+	if (peer_sid == SECINITSID_UNLABELED)
+		return SECSID_NULL;
+
+	return peer_sid;
+}
+#endif /* CONFIG_NETLABEL */


linux-2.6-nfs-64-bit-inode-support.patch:
 arch/alpha/kernel/osf_sys.c       |    6 +++++-
 arch/ia64/ia32/sys_ia32.c         |   23 ++++++++++++++++++-----
 arch/mips/kernel/linux32.c        |    2 ++
 arch/mips/kernel/sysirix.c        |   10 +++++++---
 arch/parisc/hpux/fs.c             |    6 +++++-
 arch/parisc/kernel/sys_parisc32.c |   19 ++++++++++++++++---
 arch/powerpc/kernel/sys_ppc32.c   |   15 ++++++++++++---
 arch/s390/kernel/compat_linux.c   |    5 +++++
 arch/sparc/kernel/sys_sunos.c     |   16 ++++++++++++----
 arch/sparc64/kernel/sys_sparc32.c |    5 +++++
 arch/sparc64/kernel/sys_sunos32.c |   12 ++++++++++--
 arch/sparc64/solaris/fs.c         |    7 ++++++-
 arch/x86_64/ia32/sys_ia32.c       |    7 ++++++-
 fs/afs/dir.c                      |    4 ++--
 fs/compat.c                       |   18 +++++++++++++-----
 fs/exportfs/expfs.c               |    2 +-
 fs/fat/dir.c                      |    2 +-
 fs/nfs/dir.c                      |    6 +++---
 fs/nfs/inode.c                    |   21 ++++++++++-----------
 fs/nfsd/nfs4recover.c             |    2 +-
 fs/readdir.c                      |   18 +++++++++++++-----
 fs/reiserfs/xattr.c               |    6 +++---
 fs/stat.c                         |    6 ++++++
 include/linux/fs.h                |    2 +-
 include/linux/nfs_fs.h            |    9 ---------
 include/linux/stat.h              |    2 +-
 26 files changed, 164 insertions(+), 67 deletions(-)

--- NEW FILE linux-2.6-nfs-64-bit-inode-support.patch ---
Date: Tue, 15 Aug 2006 16:36:05 +0100
From: David Howells <dhowells at redhat.com>

Make filldir_t take a 64-bit inode number and struct kstat carry a 64-bit inode
number so that 64-bit inode numbers can be passed back to userspace.

The stat functions then returns the full 64-bit inode number where available
and where possible.  If it is not possible to represent the inode number
supplied by the filesystem in the field provided by userspace, then error
EOVERFLOW will be issued.

Similarly, the getdents/readdir functions now pass the full 64-bit inode number
to userspace where possible, returning EOVERFLOW instead when a directory entry
is encountered that can't be properly represented.

Note that this means that some inodes will not be stat'able on a 32-bit system
with old libraries where they were before - but it does mean that there will be
no ambiguity over what a 32-bit inode number refers to.

Note similarly that directory scans may be cut short with an error on a 32-bit
system with old libraries where the scan would work before for the same
reasons.

It is judged unlikely that this situation will occur because modern glibc uses
64-bit capable versions of stat and getdents class functions exclusively, and
that older systems are unlikely to encounter unrepresentable inode numbers
anyway.

Signed-Off-By: David Howells <dhowells at redhat.com>
---

 arch/alpha/kernel/osf_sys.c       |    6 +++++-
 arch/ia64/ia32/sys_ia32.c         |   23 ++++++++++++++++++-----
 arch/mips/kernel/linux32.c        |    2 ++
 arch/mips/kernel/sysirix.c        |   10 +++++++---
 arch/parisc/hpux/fs.c             |    6 +++++-
 arch/parisc/kernel/sys_parisc32.c |   19 ++++++++++++++++---
 arch/powerpc/kernel/sys_ppc32.c   |   15 ++++++++++++---
 arch/s390/kernel/compat_linux.c   |    5 +++++
 arch/sparc/kernel/sys_sunos.c     |   16 ++++++++++++----
 arch/sparc64/kernel/sys_sparc32.c |    5 +++++
 arch/sparc64/kernel/sys_sunos32.c |   12 ++++++++++--
 arch/sparc64/solaris/fs.c         |    7 ++++++-
 arch/x86_64/ia32/sys_ia32.c       |    7 ++++++-
 fs/afs/dir.c                      |    4 ++--
 fs/compat.c                       |   18 +++++++++++++-----
 fs/exportfs/expfs.c               |    2 +-
 fs/fat/dir.c                      |    2 +-
 fs/nfsd/nfs4recover.c             |    2 +-
 fs/readdir.c                      |   18 +++++++++++++-----
 fs/reiserfs/xattr.c               |    6 +++---
 fs/stat.c                         |    6 ++++++
 include/linux/fs.h                |    2 +-
 include/linux/stat.h              |    2 +-
 23 files changed, 151 insertions(+), 44 deletions(-)

Index: latest/arch/alpha/kernel/osf_sys.c
===================================================================
--- latest.orig/arch/alpha/kernel/osf_sys.c
+++ latest/arch/alpha/kernel/osf_sys.c
@@ -116,17 +116,21 @@ osf_filldir(void *__buf, const char *nam
 	struct osf_dirent __user *dirent;
 	struct osf_dirent_callback *buf = (struct osf_dirent_callback *) __buf;
 	unsigned int reclen = ROUND_UP(NAME_OFFSET + namlen + 1);
+	unsigned int d_ino;
 
 	buf->error = -EINVAL;	/* only used if we fail */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	if (buf->basep) {
 		if (put_user(offset, buf->basep))
 			return -EFAULT;
 		buf->basep = NULL;
 	}
 	dirent = buf->dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(namlen, &dirent->d_namlen);
 	put_user(reclen, &dirent->d_reclen);
 	if (copy_to_user(dirent->d_name, name, namlen) ||
Index: latest/arch/ia64/ia32/sys_ia32.c
===================================================================
--- latest.orig/arch/ia64/ia32/sys_ia32.c
+++ latest/arch/ia64/ia32/sys_ia32.c
@@ -125,6 +125,7 @@ sys32_execve (char __user *name, compat_
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
 {
+	compat_ino_t ino;
 	int err;
 
 	if ((u64) stat->size > MAX_NON_LFS ||
@@ -132,11 +133,15 @@ int cp_compat_stat(struct kstat *stat, s
 	    !old_valid_dev(stat->rdev))
 		return -EOVERFLOW;
 
+	ino = stat->ino;
+	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+		return -EOVERFLOW;
+
 	if (clear_user(ubuf, sizeof(*ubuf)))
 		return -EFAULT;
 
 	err  = __put_user(old_encode_dev(stat->dev), &ubuf->st_dev);
-	err |= __put_user(stat->ino, &ubuf->st_ino);
+	err |= __put_user(ino, &ubuf->st_ino);
 	err |= __put_user(stat->mode, &ubuf->st_mode);
 	err |= __put_user(stat->nlink, &ubuf->st_nlink);
 	err |= __put_user(high2lowuid(stat->uid), &ubuf->st_uid);
@@ -1222,16 +1227,20 @@ struct readdir32_callback {
 };
 
 static int
-filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino,
+filldir32 (void *__buf, const char *name, int namlen, loff_t offset, u64 ino,
 	   unsigned int d_type)
 {
 	struct compat_dirent __user * dirent;
 	struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
 	int reclen = ROUND_UP(offsetof(struct compat_dirent, d_name) + namlen + 1, 4);
+	u32 d_ino;
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->error = -EFAULT;	/* only used if we fail.. */
 	dirent = buf->previous;
 	if (dirent)
@@ -1239,7 +1248,7 @@ filldir32 (void *__buf, const char *name
 			return -EFAULT;
 	dirent = buf->current_dir;
 	buf->previous = dirent;
-	if (put_user(ino, &dirent->d_ino)
+	if (put_user(d_ino, &dirent->d_ino)
 	    || put_user(reclen, &dirent->d_reclen)
 	    || copy_to_user(dirent->d_name, name, namlen)
 	    || put_user(0, dirent->d_name + namlen))
@@ -1287,17 +1296,21 @@ out:
 }
 
 static int
-fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, ino_t ino,
+fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, u64 ino,
 	      unsigned int d_type)
 {
 	struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
 	struct old_linux32_dirent __user * dirent;
+	u32 d_ino;
 
 	if (buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->count++;
 	dirent = buf->dirent;
-	if (put_user(ino, &dirent->d_ino)
+	if (put_user(d_ino, &dirent->d_ino)
 	    || put_user(offset, &dirent->d_offset)
 	    || put_user(namlen, &dirent->d_namlen)
 	    || copy_to_user(dirent->d_name, name, namlen)
Index: latest/arch/mips/kernel/linux32.c
===================================================================
--- latest.orig/arch/mips/kernel/linux32.c
+++ latest/arch/mips/kernel/linux32.c
@@ -77,6 +77,8 @@ int cp_compat_stat(struct kstat *stat, s
 	memset(&tmp, 0, sizeof(tmp));
 	tmp.st_dev = new_encode_dev(stat->dev);
 	tmp.st_ino = stat->ino;
+	if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+		return -EOVERFLOW;
 	tmp.st_mode = stat->mode;
 	tmp.st_nlink = stat->nlink;
 	SET_UID(tmp.st_uid, stat->uid);
Index: latest/arch/mips/kernel/sysirix.c
===================================================================
--- latest.orig/arch/mips/kernel/sysirix.c
+++ latest/arch/mips/kernel/sysirix.c
@@ -1739,12 +1739,13 @@ struct irix_dirent32_callback {
 #define ROUND_UP32(x) (((x)+sizeof(u32)-1) & ~(sizeof(u32)-1))
 
 static int irix_filldir32(void *__buf, const char *name,
-	int namlen, loff_t offset, ino_t ino, unsigned int d_type)
+	int namlen, loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct irix_dirent32 __user *dirent;
 	struct irix_dirent32_callback *buf = __buf;
 	unsigned short reclen = ROUND_UP32(NAME_OFFSET32(dirent) + namlen + 1);
 	int err = 0;
+	u32 d_ino;
 
 #ifdef DEBUG_GETDENTS
 	printk("\nirix_filldir32[reclen<%d>namlen<%d>count<%d>]",
@@ -1753,12 +1754,15 @@ static int irix_filldir32(void *__buf, c
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent)
 		err = __put_user(offset, &dirent->d_off);
 	dirent = buf->current_dir;
 	err |= __put_user(dirent, &buf->previous);
-	err |= __put_user(ino, &dirent->d_ino);
+	err |= __put_user(d_ino, &dirent->d_ino);
 	err |= __put_user(reclen, &dirent->d_reclen);
 	err |= copy_to_user((char __user *)dirent->d_name, name, namlen) ? -EFAULT : 0;
 	err |= __put_user(0, &dirent->d_name[namlen]);
@@ -1837,7 +1841,7 @@ struct irix_dirent64_callback {
 #define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
 
 static int irix_filldir64(void *__buf, const char *name,
-	int namlen, loff_t offset, ino_t ino, unsigned int d_type)
+	int namlen, loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct irix_dirent64 __user *dirent;
 	struct irix_dirent64_callback * buf = __buf;
Index: latest/arch/parisc/hpux/fs.c
===================================================================
--- latest.orig/arch/parisc/hpux/fs.c
+++ latest/arch/parisc/hpux/fs.c
@@ -77,17 +77,21 @@ static int filldir(void * __buf, const c
 {
 	struct hpux_dirent * dirent;
 	struct getdents_callback * buf = (struct getdents_callback *) __buf;
+	ino_t d_ino;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent)
 		put_user(offset, &dirent->d_off);
 	dirent = buf->current_dir;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(reclen, &dirent->d_reclen);
 	put_user(namlen, &dirent->d_namlen);
 	copy_to_user(dirent->d_name, name, namlen);
Index: latest/arch/parisc/kernel/sys_parisc32.c
===================================================================
--- latest.orig/arch/parisc/kernel/sys_parisc32.c
+++ latest/arch/parisc/kernel/sys_parisc32.c
@@ -237,14 +237,19 @@ int sys32_settimeofday(struct compat_tim
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+	compat_ino_t ino;
 	int err;
 
 	if (stat->size > MAX_NON_LFS || !new_valid_dev(stat->dev) ||
 	    !new_valid_dev(stat->rdev))
 		return -EOVERFLOW;
 
+	ino = stat->ino;
+	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+		return -EOVERFLOW;
+
 	err  = put_user(new_encode_dev(stat->dev), &statbuf->st_dev);
-	err |= put_user(stat->ino, &statbuf->st_ino);
+	err |= put_user(ino, &statbuf->st_ino);
 	err |= put_user(stat->mode, &statbuf->st_mode);
 	err |= put_user(stat->nlink, &statbuf->st_nlink);
 	err |= put_user(0, &statbuf->st_reserved1);
@@ -312,16 +317,20 @@ filldir32 (void *__buf, const char *name
 	struct linux32_dirent __user * dirent;
 	struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1, 4);
+	u32 d_ino;
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent)
 		put_user(offset, &dirent->d_off);
 	dirent = buf->current_dir;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(reclen, &dirent->d_reclen);
 	copy_to_user(dirent->d_name, name, namlen);
 	put_user(0, dirent->d_name + namlen);
@@ -371,12 +380,16 @@ fillonedir32 (void * __buf, const char *
 {
 	struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
 	struct old_linux32_dirent __user * dirent;
+	u32 d_ino;
 
 	if (buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->count++;
 	dirent = buf->dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(offset, &dirent->d_offset);
 	put_user(namlen, &dirent->d_namlen);
 	copy_to_user(dirent->d_name, name, namlen);
Index: latest/arch/powerpc/kernel/sys_ppc32.c
===================================================================
--- latest.orig/arch/powerpc/kernel/sys_ppc32.c
+++ latest/arch/powerpc/kernel/sys_ppc32.c
@@ -69,16 +69,20 @@ struct readdir_callback32 {
 };
 
 static int fillonedir(void * __buf, const char * name, int namlen,
-		                  off_t offset, ino_t ino, unsigned int d_type)
+		                  off_t offset, u64 ino, unsigned int d_type)
 {
 	struct readdir_callback32 * buf = (struct readdir_callback32 *) __buf;
 	struct old_linux_dirent32 __user * dirent;
+	ino_t d_ino;
 
 	if (buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->count++;
 	dirent = buf->dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(offset, &dirent->d_offset);
 	put_user(namlen, &dirent->d_namlen);
 	copy_to_user(dirent->d_name, name, namlen);
@@ -120,15 +124,20 @@ asmlinkage long ppc32_select(u32 n, comp
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+	compat_ino_t ino;
 	long err;
 
 	if (stat->size > MAX_NON_LFS || !new_valid_dev(stat->dev) ||
 	    !new_valid_dev(stat->rdev))
 		return -EOVERFLOW;
 
+	ino = stat->ino;
+	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+		return -EOVERFLOW;
+
 	err  = access_ok(VERIFY_WRITE, statbuf, sizeof(*statbuf)) ? 0 : -EFAULT;
 	err |= __put_user(new_encode_dev(stat->dev), &statbuf->st_dev);
-	err |= __put_user(stat->ino, &statbuf->st_ino);
+	err |= __put_user(ino, &statbuf->st_ino);
 	err |= __put_user(stat->mode, &statbuf->st_mode);
 	err |= __put_user(stat->nlink, &statbuf->st_nlink);
 	err |= __put_user(stat->uid, &statbuf->st_uid);
Index: latest/arch/s390/kernel/compat_linux.c
===================================================================
--- latest.orig/arch/s390/kernel/compat_linux.c
+++ latest/arch/s390/kernel/compat_linux.c
@@ -357,11 +357,16 @@ asmlinkage long sys32_ftruncate64(unsign
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+	compat_ino_t ino;
 	int err;
 
 	if (!old_valid_dev(stat->dev) || !old_valid_dev(stat->rdev))
 		return -EOVERFLOW;
 
+	ino = stat->ino;
+	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+		return -EOVERFLOW;
+
 	err = put_user(old_encode_dev(stat->dev), &statbuf->st_dev);
 	err |= put_user(stat->ino, &statbuf->st_ino);
 	err |= put_user(stat->mode, &statbuf->st_mode);
Index: latest/arch/sparc/kernel/sys_sunos.c
===================================================================
--- latest.orig/arch/sparc/kernel/sys_sunos.c
+++ latest/arch/sparc/kernel/sys_sunos.c
@@ -325,21 +325,25 @@ struct sunos_dirent_callback {
 #define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
 
 static int sunos_filldir(void * __buf, const char * name, int namlen,
-			 loff_t offset, ino_t ino, unsigned int d_type)
+			 loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct sunos_dirent __user *dirent;
 	struct sunos_dirent_callback * buf = __buf;
+	unsigned long d_ino;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent)
 		put_user(offset, &dirent->d_off);
 	dirent = buf->curr;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(namlen, &dirent->d_namlen);
 	put_user(reclen, &dirent->d_reclen);
 	copy_to_user(dirent->d_name, name, namlen);
@@ -406,19 +410,23 @@ struct sunos_direntry_callback {
 };
 
 static int sunos_filldirentry(void * __buf, const char * name, int namlen,
-			      loff_t offset, ino_t ino, unsigned int d_type)
+			      loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct sunos_direntry __user *dirent;
 	struct sunos_direntry_callback *buf = __buf;
+	unsigned long d_ino;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	dirent = buf->curr;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(namlen, &dirent->d_namlen);
 	put_user(reclen, &dirent->d_reclen);
 	copy_to_user(dirent->d_name, name, namlen);
Index: latest/arch/sparc64/kernel/sys_sparc32.c
===================================================================
--- latest.orig/arch/sparc64/kernel/sys_sparc32.c
+++ latest/arch/sparc64/kernel/sys_sparc32.c
@@ -337,12 +337,17 @@ asmlinkage long sys32_ftruncate64(unsign
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+	compat_ino_t ino;
 	int err;
 
 	if (stat->size > MAX_NON_LFS || !old_valid_dev(stat->dev) ||
 	    !old_valid_dev(stat->rdev))
 		return -EOVERFLOW;
 
+	ino = stat->ino;
+	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+		return -EOVERFLOW;
+
 	err  = put_user(old_encode_dev(stat->dev), &statbuf->st_dev);
 	err |= put_user(stat->ino, &statbuf->st_ino);
 	err |= put_user(stat->mode, &statbuf->st_mode);
Index: latest/arch/sparc64/kernel/sys_sunos32.c
===================================================================
--- latest.orig/arch/sparc64/kernel/sys_sunos32.c
+++ latest/arch/sparc64/kernel/sys_sunos32.c
@@ -280,16 +280,20 @@ static int sunos_filldir(void * __buf, c
 	struct sunos_dirent __user *dirent;
 	struct sunos_dirent_callback * buf = (struct sunos_dirent_callback *) __buf;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
+	u32 d_ino;
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent)
 		put_user(offset, &dirent->d_off);
 	dirent = buf->curr;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(namlen, &dirent->d_namlen);
 	put_user(reclen, &dirent->d_reclen);
 	if (copy_to_user(dirent->d_name, name, namlen))
@@ -363,14 +367,18 @@ static int sunos_filldirentry(void * __b
 	struct sunos_direntry_callback * buf =
 		(struct sunos_direntry_callback *) __buf;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
+	u32 d_ino;
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	dirent = buf->curr;
 	buf->previous = dirent;
-	put_user(ino, &dirent->d_ino);
+	put_user(d_ino, &dirent->d_ino);
 	put_user(namlen, &dirent->d_namlen);
 	put_user(reclen, &dirent->d_reclen);
 	if (copy_to_user(dirent->d_name, name, namlen))
Index: latest/arch/sparc64/solaris/fs.c
===================================================================
--- latest.orig/arch/sparc64/solaris/fs.c
+++ latest/arch/sparc64/solaris/fs.c
@@ -82,12 +82,17 @@ struct sol_stat64 {
 
 static inline int putstat(struct sol_stat __user *ubuf, struct kstat *kbuf)
 {
+	u32 ino;
+
 	if (kbuf->size > MAX_NON_LFS ||
 	    !sysv_valid_dev(kbuf->dev) ||
 	    !sysv_valid_dev(kbuf->rdev))
 		return -EOVERFLOW;
+	ino = kbuf->ino;
+	if (sizeof(ino) < sizeof(kbuf->ino) && ino != kbuf->ino)
+		return -EOVERFLOW;
 	if (put_user (sysv_encode_dev(kbuf->dev), &ubuf->st_dev)	||
-	    __put_user (kbuf->ino, &ubuf->st_ino)		||
+	    __put_user (ino, &ubuf->st_ino)				||
 	    __put_user (kbuf->mode, &ubuf->st_mode)		||
 	    __put_user (kbuf->nlink, &ubuf->st_nlink)	||
 	    __put_user (kbuf->uid, &ubuf->st_uid)		||
Index: latest/arch/x86_64/ia32/sys_ia32.c
===================================================================
--- latest.orig/arch/x86_64/ia32/sys_ia32.c
+++ latest/arch/x86_64/ia32/sys_ia32.c
@@ -75,6 +75,8 @@
 
 int cp_compat_stat(struct kstat *kbuf, struct compat_stat __user *ubuf)
 {
+	compat_ino_t ino;
+
 	typeof(ubuf->st_uid) uid = 0;
 	typeof(ubuf->st_gid) gid = 0;
 	SET_UID(uid, kbuf->uid);
@@ -83,9 +85,12 @@ int cp_compat_stat(struct kstat *kbuf, s
 		return -EOVERFLOW;
 	if (kbuf->size >= 0x7fffffff)
 		return -EOVERFLOW;
+	ino = kbuf->ino;
+	if (sizeof(ino) < sizeof(kbuf->ino) && ino != kbuf->ino)
+		return -EOVERFLOW;
 	if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct compat_stat)) ||
 	    __put_user (old_encode_dev(kbuf->dev), &ubuf->st_dev) ||
-	    __put_user (kbuf->ino, &ubuf->st_ino) ||
+	    __put_user (ino, &ubuf->st_ino) ||
 	    __put_user (kbuf->mode, &ubuf->st_mode) ||
 	    __put_user (kbuf->nlink, &ubuf->st_nlink) ||
 	    __put_user (uid, &ubuf->st_uid) ||
Index: latest/fs/afs/dir.c
===================================================================
--- latest.orig/fs/afs/dir.c
+++ latest/fs/afs/dir.c
@@ -30,7 +30,7 @@ static int afs_dir_readdir(struct file *
 static int afs_d_revalidate(struct dentry *dentry, struct nameidata *nd);
 static int afs_d_delete(struct dentry *dentry);
 static int afs_dir_lookup_filldir(void *_cookie, const char *name, int nlen,
-				  loff_t fpos, ino_t ino, unsigned dtype);
+				  loff_t fpos, u64 ino, unsigned dtype);
 
 const struct file_operations afs_dir_file_operations = {
 	.open		= afs_dir_open,
@@ -408,7 +408,7 @@ static int afs_dir_readdir(struct file *
  *   uniquifier through dtype
  */
 static int afs_dir_lookup_filldir(void *_cookie, const char *name, int nlen,
-				  loff_t fpos, ino_t ino, unsigned dtype)
+				  loff_t fpos, u64 ino, unsigned dtype)
 {
 	struct afs_dir_lookup_cookie *cookie = _cookie;
 
Index: latest/fs/compat.c
===================================================================
--- latest.orig/fs/compat.c
+++ latest/fs/compat.c
@@ -918,20 +918,24 @@ struct compat_readdir_callback {
 };
 
 static int compat_fillonedir(void *__buf, const char *name, int namlen,
-			loff_t offset, ino_t ino, unsigned int d_type)
+			loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct compat_readdir_callback *buf = __buf;
 	struct compat_old_linux_dirent __user *dirent;
+	compat_ulong_t d_ino;
 
 	if (buf->result)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->result++;
 	dirent = buf->dirent;
 	if (!access_ok(VERIFY_WRITE, dirent,
 			(unsigned long)(dirent->d_name + namlen + 1) -
 				(unsigned long)dirent))
 		goto efault;
-	if (	__put_user(ino, &dirent->d_ino) ||
+	if (	__put_user(d_ino, &dirent->d_ino) ||
 		__put_user(offset, &dirent->d_offset) ||
 		__put_user(namlen, &dirent->d_namlen) ||
 		__copy_to_user(dirent->d_name, name, namlen) ||
@@ -982,22 +986,26 @@ struct compat_getdents_callback {
 };
 
 static int compat_filldir(void *__buf, const char *name, int namlen,
-		loff_t offset, ino_t ino, unsigned int d_type)
+		loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct compat_linux_dirent __user * dirent;
 	struct compat_getdents_callback *buf = __buf;
+	compat_ulong_t d_ino;
 	int reclen = COMPAT_ROUND_UP(NAME_OFFSET(dirent) + namlen + 2);
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent) {
 		if (__put_user(offset, &dirent->d_off))
 			goto efault;
 	}
 	dirent = buf->current_dir;
-	if (__put_user(ino, &dirent->d_ino))
+	if (__put_user(d_ino, &dirent->d_ino))
 		goto efault;
 	if (__put_user(reclen, &dirent->d_reclen))
 		goto efault;
@@ -1068,7 +1076,7 @@ struct compat_getdents_callback64 {
 };
 
 static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t offset,
-		     ino_t ino, unsigned int d_type)
+		     u64 ino, unsigned int d_type)
 {
 	struct linux_dirent64 __user *dirent;
 	struct compat_getdents_callback64 *buf = __buf;
Index: latest/fs/exportfs/expfs.c
===================================================================
--- latest.orig/fs/exportfs/expfs.c
+++ latest/fs/exportfs/expfs.c
@@ -315,7 +315,7 @@ struct getdents_callback {
  * the name matching the specified inode number.
  */
 static int filldir_one(void * __buf, const char * name, int len,
-			loff_t pos, ino_t ino, unsigned int d_type)
+			loff_t pos, u64 ino, unsigned int d_type)
 {
 	struct getdents_callback *buf = __buf;
 	int result = 0;
Index: latest/fs/fat/dir.c
===================================================================
--- latest.orig/fs/fat/dir.c
+++ latest/fs/fat/dir.c
@@ -647,7 +647,7 @@ static int fat_readdir(struct file *filp
 }
 
 static int fat_ioctl_filldir(void *__buf, const char *name, int name_len,
-			     loff_t offset, ino_t ino, unsigned int d_type)
+			     loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct fat_ioctl_filldir_callback *buf = __buf;
 	struct dirent __user *d1 = buf->dirent;
Index: latest/fs/nfsd/nfs4recover.c
===================================================================
--- latest.orig/fs/nfsd/nfs4recover.c
+++ latest/fs/nfsd/nfs4recover.c
@@ -183,7 +183,7 @@ struct dentry_list_arg {
 
 static int
 nfsd4_build_dentrylist(void *arg, const char *name, int namlen,
-		loff_t offset, ino_t ino, unsigned int d_type)
+		loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct dentry_list_arg *dla = arg;
 	struct list_head *dentries = &dla->dentries;
Index: latest/fs/readdir.c
===================================================================
--- latest.orig/fs/readdir.c
+++ latest/fs/readdir.c
@@ -69,20 +69,24 @@ struct readdir_callback {
 };
 
 static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset,
-		      ino_t ino, unsigned int d_type)
+		      u64 ino, unsigned int d_type)
 {
 	struct readdir_callback * buf = (struct readdir_callback *) __buf;
 	struct old_linux_dirent __user * dirent;
+	unsigned long d_ino;
 
 	if (buf->result)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	buf->result++;
 	dirent = buf->dirent;
 	if (!access_ok(VERIFY_WRITE, dirent,
 			(unsigned long)(dirent->d_name + namlen + 1) -
 				(unsigned long)dirent))
 		goto efault;
-	if (	__put_user(ino, &dirent->d_ino) ||
+	if (	__put_user(d_ino, &dirent->d_ino) ||
 		__put_user(offset, &dirent->d_offset) ||
 		__put_user(namlen, &dirent->d_namlen) ||
 		__copy_to_user(dirent->d_name, name, namlen) ||
@@ -138,22 +142,26 @@ struct getdents_callback {
 };
 
 static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
-		   ino_t ino, unsigned int d_type)
+		   u64 ino, unsigned int d_type)
 {
 	struct linux_dirent __user * dirent;
 	struct getdents_callback * buf = (struct getdents_callback *) __buf;
+	unsigned long d_ino;
 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 2);
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
+	d_ino = ino;
+	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+		return -EOVERFLOW;
 	dirent = buf->previous;
 	if (dirent) {
 		if (__put_user(offset, &dirent->d_off))
 			goto efault;
 	}
 	dirent = buf->current_dir;
-	if (__put_user(ino, &dirent->d_ino))
+	if (__put_user(d_ino, &dirent->d_ino))
 		goto efault;
 	if (__put_user(reclen, &dirent->d_reclen))
 		goto efault;
@@ -222,7 +230,7 @@ struct getdents_callback64 {
 };
 
 static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
-		     ino_t ino, unsigned int d_type)
+		     u64 ino, unsigned int d_type)
 {
 	struct linux_dirent64 __user *dirent;
 	struct getdents_callback64 * buf = (struct getdents_callback64 *) __buf;
Index: latest/fs/reiserfs/xattr.c
===================================================================
--- latest.orig/fs/reiserfs/xattr.c
+++ latest/fs/reiserfs/xattr.c
@@ -773,7 +773,7 @@ int reiserfs_xattr_del(struct inode *ino
 
 static int
 reiserfs_delete_xattrs_filler(void *buf, const char *name, int namelen,
-			      loff_t offset, ino_t ino, unsigned int d_type)
+			      loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct dentry *xadir = (struct dentry *)buf;
 
@@ -851,7 +851,7 @@ struct reiserfs_chown_buf {
 /* XXX: If there is a better way to do this, I'd love to hear about it */
 static int
 reiserfs_chown_xattrs_filler(void *buf, const char *name, int namelen,
-			     loff_t offset, ino_t ino, unsigned int d_type)
+			     loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct reiserfs_chown_buf *chown_buf = (struct reiserfs_chown_buf *)buf;
 	struct dentry *xafile, *xadir = chown_buf->xadir;
@@ -1036,7 +1036,7 @@ struct reiserfs_listxattr_buf {
 
 static int
 reiserfs_listxattr_filler(void *buf, const char *name, int namelen,
-			  loff_t offset, ino_t ino, unsigned int d_type)
+			  loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct reiserfs_listxattr_buf *b = (struct reiserfs_listxattr_buf *)buf;
 	int len = 0;
Index: latest/fs/stat.c
===================================================================
--- latest.orig/fs/stat.c
+++ latest/fs/stat.c
@@ -140,6 +140,8 @@ static int cp_old_stat(struct kstat *sta
 	memset(&tmp, 0, sizeof(struct __old_kernel_stat));
 	tmp.st_dev = old_encode_dev(stat->dev);
 	tmp.st_ino = stat->ino;
+	if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+		return -EOVERFLOW;
 	tmp.st_mode = stat->mode;
 	tmp.st_nlink = stat->nlink;
 	if (tmp.st_nlink != stat->nlink)
@@ -210,6 +212,8 @@ static int cp_new_stat(struct kstat *sta
 	tmp.st_dev = new_encode_dev(stat->dev);
 #endif
 	tmp.st_ino = stat->ino;
+	if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+		return -EOVERFLOW;
 	tmp.st_mode = stat->mode;
 	tmp.st_nlink = stat->nlink;
 	if (tmp.st_nlink != stat->nlink)
@@ -347,6 +351,8 @@ static long cp_new_stat64(struct kstat *
 	tmp.st_rdev = huge_encode_dev(stat->rdev);
 #endif
 	tmp.st_ino = stat->ino;
+	if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+		return -EOVERFLOW;
 #ifdef STAT64_HAS_BROKEN_ST_INO
 	tmp.__st_ino = stat->ino;
 #endif
Index: latest/include/linux/fs.h
===================================================================
--- latest.orig/include/linux/fs.h
+++ latest/include/linux/fs.h
@@ -1001,7 +1001,7 @@ int generic_osync_inode(struct inode *, 
  * This allows the kernel to read directories into kernel space or
  * to have different dirent layouts depending on the binary type.
  */
-typedef int (*filldir_t)(void *, const char *, int, loff_t, ino_t, unsigned);
+typedef int (*filldir_t)(void *, const char *, int, loff_t, u64, unsigned);
 
 struct block_device_operations {
 	int (*open) (struct inode *, struct file *);
Index: latest/include/linux/stat.h
===================================================================
--- latest.orig/include/linux/stat.h
+++ latest/include/linux/stat.h
@@ -57,7 +57,7 @@
 #include <linux/time.h>
 
 struct kstat {
-	unsigned long	ino;
+	u64		ino;
 	dev_t		dev;
 	umode_t		mode;
 	unsigned int	nlink;
Date: Tue, 15 Aug 2006 16:36:17 +0100
From: David Howells <dhowells at redhat.com>

Building on the previous patch that expanded the inode numbers in struct kstat
and filldir_t to an obligate 64-bits, make NFS represent 64-bit fileids as
64-bit inode numbers rather than compressing them down to 32-bits.

Signed-Off-By: David Howells <dhowells at redhat.com>
---

 fs/nfs/dir.c           |    6 +++---
 fs/nfs/inode.c         |   21 ++++++++++-----------
 include/linux/nfs_fs.h |    9 ---------
 3 files changed, 13 insertions(+), 23 deletions(-)

Index: latest/fs/nfs/dir.c
===================================================================
--- latest.orig/fs/nfs/dir.c
+++ latest/fs/nfs/dir.c
@@ -397,7 +397,7 @@ int nfs_do_filldir(nfs_readdir_descripto
 	struct file	*file = desc->file;
 	struct nfs_entry *entry = desc->entry;
 	struct dentry	*dentry = NULL;
-	unsigned long	fileid;
+	u64		fileid;
 	int		loop_count = 0,
 			res;
 
@@ -408,7 +408,7 @@ int nfs_do_filldir(nfs_readdir_descripto
 		unsigned d_type = DT_UNKNOWN;
 		/* Note: entry->prev_cookie contains the cookie for
 		 *	 retrieving the current dirent on the server */
-		fileid = nfs_fileid_to_ino_t(entry->ino);
+		fileid = entry->ino;
 
 		/* Get a dentry if we have one */
 		if (dentry != NULL)
@@ -418,7 +418,7 @@ int nfs_do_filldir(nfs_readdir_descripto
 		/* Use readdirplus info */
 		if (dentry != NULL && dentry->d_inode != NULL) {
 			d_type = dt_type(dentry->d_inode);
-			fileid = dentry->d_inode->i_ino;
+			fileid = NFS_FILEID(dentry->d_inode);
 		}
 
 		res = filldir(dirent, entry->name, entry->len, 
Index: latest/fs/nfs/inode.c
===================================================================
--- latest.orig/fs/nfs/inode.c
+++ latest/fs/nfs/inode.c
@@ -57,12 +57,6 @@ static void nfs_zap_acl_cache(struct ino
 
 static kmem_cache_t * nfs_inode_cachep;
 
-static inline unsigned long
-nfs_fattr_to_ino_t(struct nfs_fattr *fattr)
-{
-	return nfs_fileid_to_ino_t(fattr->fileid);
-}
-
 int nfs_write_inode(struct inode *inode, int sync)
 {
 	int flags = sync ? FLUSH_SYNC : 0;
@@ -226,7 +220,9 @@ nfs_fhget(struct super_block *sb, struct
 		goto out_no_inode;
 	}
 
-	hash = nfs_fattr_to_ino_t(fattr);
+	hash = fattr->fileid;
+	if (sizeof(hash) < sizeof(u64))
+		hash ^= fattr->fileid >> (sizeof(u64) - sizeof(ino_t)) * 8;
 
 	inode = iget5_locked(sb, hash, nfs_find_actor, nfs_init_locked, &desc);
 	if (inode == NULL) {
@@ -237,9 +233,10 @@ nfs_fhget(struct super_block *sb, struct
 	if (inode->i_state & I_NEW) {
 		struct nfs_inode *nfsi = NFS_I(inode);
 
-		/* We set i_ino for the few things that still rely on it,
-		 * such as stat(2) */
-		inode->i_ino = hash;
+		/* We set i_ino for the few things that still rely on it, such
+		 * as printing messages; stat and filldir use the fileid
+		 * directly since i_ino may not be large enough */
+		inode->i_ino = fattr->fileid;
 
 		/* We can't support update_atime(), since the server will reset it */
 		inode->i_flags |= S_NOATIME|S_NOCMTIME;
@@ -446,8 +443,10 @@ int nfs_getattr(struct vfsmount *mnt, st
 		err = __nfs_revalidate_inode(NFS_SERVER(inode), inode);
 	else
 		err = nfs_revalidate_inode(NFS_SERVER(inode), inode);
-	if (!err)
+	if (!err) {
 		generic_fillattr(inode, stat);
+		stat->ino = NFS_FILEID(inode);
+	}
 	return err;
 }
 
Index: latest/include/linux/nfs_fs.h
===================================================================
--- latest.orig/include/linux/nfs_fs.h
+++ latest/include/linux/nfs_fs.h
@@ -541,15 +541,6 @@ nfs_size_to_loff_t(__u64 size)
 	return (loff_t) size;
 }
 
-static inline ino_t
-nfs_fileid_to_ino_t(u64 fileid)
-{
-	ino_t ino = (ino_t) fileid;
-	if (sizeof(ino_t) < sizeof(u64))
-		ino ^= fileid >> (sizeof(u64)-sizeof(ino_t)) * 8;
-	return ino;
-}
-
 /* NFS root */
 
 extern void * nfs_root_data(void);

linux-2.6-ppc-fix-irq-mapping.patch:
 irq.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc-fix-irq-mapping.patch ---
Date: Thu, 17 Aug 2006 15:55:20 -0400 (EDT)
From: Manoj Iyer <miyer at redhat.com>
Subject: [RHEL5 PPC PATCH] RHBZ# 201731 ((BETA BLOCKER)) fix IDE device
 getting assigned the wrong irq number


RHBZ#:
------
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=201731

Description:
------------
The code for using the radix tree for reverse mapping of interrupts has
a typo that causes it to create incorrect mappings if the software and
hardware numbers happen to be different. This would, among others, cause
the IDE interrupt to fail on js20's. This fixes it.

RHEL Version Found:
-------------------
RHEL5 pre-beta1

Upstream Status:
----------------
Ben Herrenschmidt is working on getting this patch upstream.

Test Status:
------------
I will need to install FC6 or RHEL5-prebata inorder to build  this kernel 
and test it. Since FC6 and RHEL5-prebeta have install problems on a JS20, 
I am unable to test this patch on a JS20. I talked to peter martuccille 
and he agreed that it was acceptable to submit this patch without the 
usual testing.

Proposed Patch:
---------------
ndex: linux-work/arch/powerpc/kernel/irq.c
===================================================================
Index: latest/arch/powerpc/kernel/irq.c
===================================================================
--- latest.orig/arch/powerpc/kernel/irq.c
+++ latest/arch/powerpc/kernel/irq.c
@@ -693,7 +693,7 @@ unsigned int irq_radix_revmap(struct irq
 	/* If not there, try to insert it */
 	virq = irq_find_mapping(host, hwirq);
 	if (virq != NO_IRQ)
-		radix_tree_insert(tree, virq, &irq_map[virq]);
+		radix_tree_insert(tree, hwirq, &irq_map[virq]);
  bail:
 	spin_unlock_irqrestore(&irq_big_lock, flags);
 	return virq;

linux-2.6-selinux-support-range-transitions.patch:
 Kconfig            |   35 ++++++++++++++++++++++++++++++++++-
 include/security.h |    9 +++++++--
 ss/mls.c           |   21 ++++++++++-----------
 ss/policydb.c      |   27 ++++++++++++++++++++-------
 ss/policydb.h      |    7 ++++---
 5 files changed, 75 insertions(+), 24 deletions(-)

--- NEW FILE linux-2.6-selinux-support-range-transitions.patch ---
Date: Mon, 14 Aug 2006 17:27:49 -0400
From: Eric Paris <eparis at redhat.com>

Subject: selinux: enable configuration of max policy version
From: Stephen Smalley <sds at tycho.nsa.gov>

Enable configuration of SELinux maximum supported policy version to support
legacy userland (init) that does not gracefully handle kernels that support
newer policy versions two or more beyond the installed policy, as in FC3
and FC4.

Signed-off-by: Stephen Smalley <sds at tycho.nsa.gov>
Acked-by: James Morris <jmorris at namei.org>
Acked-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 security/selinux/Kconfig            |   33 ++++++++++++++++++++++++++
 security/selinux/include/security.h |    6 +++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff -puN security/selinux/Kconfig~selinux-enable-configuration-of-max-policy-version security/selinux/Kconfig
--- a/security/selinux/Kconfig~selinux-enable-configuration-of-max-policy-version
+++ a/security/selinux/Kconfig
@@ -124,3 +124,36 @@ config SECURITY_SELINUX_ENABLE_SECMARK_D
 
 	  If you are unsure what do do here, select N.
 
+config SECURITY_SELINUX_POLICYDB_VERSION_MAX
+	bool "NSA SELinux maximum supported policy format version"
+	depends on SECURITY_SELINUX
+	default n
+	help
+	  This option enables the maximum policy format version supported
+	  by SELinux to be set to a particular value.  This value is reported
+	  to userspace via /selinux/policyvers and used at policy load time.
+	  It can be adjusted downward to support legacy userland (init) that
+	  does not correctly handle kernels that support newer policy versions.
+
+	  Examples:  For FC3 or FC4, enable this option and set the value via
+	  the next option.  For FC5 and later, do not enable this option.
+
+	  If you are unsure how to answer this question, answer N.
+
+config SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
+	int "NSA SELinux maximum supported policy format version value"
+	depends on SECURITY_SELINUX_POLICYDB_VERSION_MAX
+	range 15 20
+	default 19
+	help
+	  This option sets the value for the maximum policy format version
+	  supported by SELinux.
+
+	  Examples:  For FC3, use 18.  For FC4, use 19.
+
+	  If you are unsure how to answer this question, look for the
+	  policy format version supported by your policy toolchain, by
+	  running 'checkpolicy -V'. Or look at what policy you have
+	  installed under /etc/selinux/$SELINUXTYPE/policy, where
+	  SELINUXTYPE is defined in your /etc/selinux/config.
+
diff -puN security/selinux/include/security.h~selinux-enable-configuration-of-max-policy-version security/selinux/include/security.h
--- a/security/selinux/include/security.h~selinux-enable-configuration-of-max-policy-version
+++ a/security/selinux/include/security.h
@@ -27,7 +27,11 @@
 
 /* Range of policy versions we understand*/
 #define POLICYDB_VERSION_MIN   POLICYDB_VERSION_BASE
-#define POLICYDB_VERSION_MAX   POLICYDB_VERSION_AVTAB
+#ifdef CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX
+#define POLICYDB_VERSION_MAX	CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
+#else
+#define POLICYDB_VERSION_MAX	POLICYDB_VERSION_AVTAB
+#endif
 
 extern int selinux_enabled;
 extern int selinux_mls_enabled;

Date: Mon, 14 Aug 2006 17:27:51 -0400
From: Eric Paris <eparis at redhat.com>

Subject: selinux: add support for range transitions on object classes
From: Darrel Goeddel <dgoeddel at TrustedCS.com>

Introduces support for policy version 21.  This version of the binary
kernel policy allows for defining range transitions on security classes
other than the process security class.  As always, backwards compatibility
for older formats is retained.  The security class is read in as specified
when using the new format, while the "process" security class is assumed
when using an older policy format.

Signed-off-by: Darrel Goeddel <dgoeddel at trustedcs.com>
Signed-off-by: Stephen Smalley <sds at tycho.nsa.gov>
Acked-by: James Morris <jmorris at namei.org>
Acked-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 security/selinux/Kconfig            |    2 -
 security/selinux/include/security.h |    3 +-
 security/selinux/ss/mls.c           |   21 +++++++++-----------
 security/selinux/ss/policydb.c      |   27 +++++++++++++++++++-------
 security/selinux/ss/policydb.h      |    7 +++---
 5 files changed, 37 insertions(+), 23 deletions(-)

diff -puN security/selinux/Kconfig~selinux-add-support-for-range-transitions-on-object security/selinux/Kconfig
--- a/security/selinux/Kconfig~selinux-add-support-for-range-transitions-on-object
+++ a/security/selinux/Kconfig
@@ -143,7 +143,7 @@ config SECURITY_SELINUX_POLICYDB_VERSION
 config SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
 	int "NSA SELinux maximum supported policy format version value"
 	depends on SECURITY_SELINUX_POLICYDB_VERSION_MAX
-	range 15 20
+	range 15 21
 	default 19
 	help
 	  This option sets the value for the maximum policy format version
diff -puN security/selinux/include/security.h~selinux-add-support-for-range-transitions-on-object security/selinux/include/security.h
--- a/security/selinux/include/security.h~selinux-add-support-for-range-transitions-on-object
+++ a/security/selinux/include/security.h
@@ -24,13 +24,14 @@
 #define POLICYDB_VERSION_VALIDATETRANS	19
 #define POLICYDB_VERSION_MLS		19
 #define POLICYDB_VERSION_AVTAB		20
+#define POLICYDB_VERSION_RANGETRANS	21
 
 /* Range of policy versions we understand*/
 #define POLICYDB_VERSION_MIN   POLICYDB_VERSION_BASE
 #ifdef CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX
 #define POLICYDB_VERSION_MAX	CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE
 #else
-#define POLICYDB_VERSION_MAX	POLICYDB_VERSION_AVTAB
+#define POLICYDB_VERSION_MAX	POLICYDB_VERSION_RANGETRANS
 #endif
 
 extern int selinux_enabled;
diff -puN security/selinux/ss/mls.c~selinux-add-support-for-range-transitions-on-object security/selinux/ss/mls.c
--- a/security/selinux/ss/mls.c~selinux-add-support-for-range-transitions-on-object
+++ a/security/selinux/ss/mls.c
@@ -530,22 +530,21 @@ int mls_compute_sid(struct context *scon
 		    u32 specified,
 		    struct context *newcontext)
 {
+	struct range_trans *rtr;
+
 	if (!selinux_mls_enabled)
 		return 0;
 
 	switch (specified) {
 	case AVTAB_TRANSITION:
-		if (tclass == SECCLASS_PROCESS) {
-			struct range_trans *rangetr;
-			/* Look for a range transition rule. */
-			for (rangetr = policydb.range_tr; rangetr;
-			     rangetr = rangetr->next) {
-				if (rangetr->dom == scontext->type &&
-				    rangetr->type == tcontext->type) {
-					/* Set the range from the rule */
-					return mls_range_set(newcontext,
-					                     &rangetr->range);
-				}
+		/* Look for a range transition rule. */
+		for (rtr = policydb.range_tr; rtr; rtr = rtr->next) {
+			if (rtr->source_type == scontext->type &&
+			    rtr->target_type == tcontext->type &&
+			    rtr->target_class == tclass) {
+				/* Set the range from the rule */
+				return mls_range_set(newcontext,
+				                     &rtr->target_range);
 			}
 		}
 		/* Fallthrough */
diff -puN security/selinux/ss/policydb.c~selinux-add-support-for-range-transitions-on-object security/selinux/ss/policydb.c
--- a/security/selinux/ss/policydb.c~selinux-add-support-for-range-transitions-on-object
+++ a/security/selinux/ss/policydb.c
@@ -96,6 +96,11 @@ static struct policydb_compat_info polic
 		.sym_num        = SYM_NUM,
 		.ocon_num       = OCON_NUM,
 	},
+	{
+		.version        = POLICYDB_VERSION_RANGETRANS,
+		.sym_num        = SYM_NUM,
+		.ocon_num       = OCON_NUM,
+	},
 };
 
 static struct policydb_compat_info *policydb_lookup_compat(int version)
@@ -645,15 +650,15 @@ void policydb_destroy(struct policydb *p
 
 	for (rt = p->range_tr; rt; rt = rt -> next) {
 		if (lrt) {
-			ebitmap_destroy(&lrt->range.level[0].cat);
-			ebitmap_destroy(&lrt->range.level[1].cat);
+			ebitmap_destroy(&lrt->target_range.level[0].cat);
+			ebitmap_destroy(&lrt->target_range.level[1].cat);
 			kfree(lrt);
 		}
 		lrt = rt;
 	}
 	if (lrt) {
-		ebitmap_destroy(&lrt->range.level[0].cat);
-		ebitmap_destroy(&lrt->range.level[1].cat);
+		ebitmap_destroy(&lrt->target_range.level[0].cat);
+		ebitmap_destroy(&lrt->target_range.level[1].cat);
 		kfree(lrt);
 	}
 
@@ -1829,6 +1834,7 @@ int policydb_read(struct policydb *p, vo
 	}
 
 	if (p->policyvers >= POLICYDB_VERSION_MLS) {
+		int new_rangetr = p->policyvers >= POLICYDB_VERSION_RANGETRANS;
 		rc = next_entry(buf, fp, sizeof(u32));
 		if (rc < 0)
 			goto bad;
@@ -1847,9 +1853,16 @@ int policydb_read(struct policydb *p, vo
 			rc = next_entry(buf, fp, (sizeof(u32) * 2));
 			if (rc < 0)
 				goto bad;
-			rt->dom = le32_to_cpu(buf[0]);
-			rt->type = le32_to_cpu(buf[1]);
-			rc = mls_read_range_helper(&rt->range, fp);
+			rt->source_type = le32_to_cpu(buf[0]);
+			rt->target_type = le32_to_cpu(buf[1]);
+			if (new_rangetr) {
+				rc = next_entry(buf, fp, sizeof(u32));
+				if (rc < 0)
+					goto bad;
+				rt->target_class = le32_to_cpu(buf[0]);
+			} else
+				rt->target_class = SECCLASS_PROCESS;
+			rc = mls_read_range_helper(&rt->target_range, fp);
 			if (rc)
 				goto bad;
 			lrt = rt;
diff -puN security/selinux/ss/policydb.h~selinux-add-support-for-range-transitions-on-object security/selinux/ss/policydb.h
--- a/security/selinux/ss/policydb.h~selinux-add-support-for-range-transitions-on-object
+++ a/security/selinux/ss/policydb.h
@@ -106,9 +106,10 @@ struct cat_datum {
 };
 
 struct range_trans {
-	u32 dom;			/* current process domain */
-	u32 type;			/* program executable type */
-	struct mls_range range;		/* new range */
+	u32 source_type;
+	u32 target_type;
+	u32 target_class;
+	struct mls_range target_range;
 	struct range_trans *next;
 };
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.4
retrieving revision 1.2519.4.5
diff -u -r1.2519.4.4 -r1.2519.4.5
--- kernel-2.6.spec	16 Aug 2006 21:50:29 -0000	1.2519.4.4
+++ kernel-2.6.spec	17 Aug 2006 22:59:24 -0000	1.2519.4.5
@@ -282,6 +282,7 @@
 Patch209: linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch
 
 # 300 - 399   ppc(64)
+Patch304: linux-2.6-ppc-fix-irq-mapping.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
@@ -365,7 +366,9 @@
 Patch1201: linux-2.6-NFSD-ctlbits.patch
 Patch1203: linux-2.6-NFSD-badness.patch
 
-# NIC driver updates
+# core networking changes.
+Patch1300: linux-2.6-net-ipsec-labelling.patch
+Patch1301: linux-2.6-net-netlabel-cipso.patch
 
 # Filesystem stuff.
 # Squashfs
@@ -388,6 +391,9 @@
 Patch1432: linux-2.6-filesystem-caching-for-afs-and-nfs.patch
 Patch1433: linux-2.6-nfs-superblock-unmount-optimization.patch
 
+# NFS uses 64-bit inodes
+Patch1440: linux-2.6-nfs-64-bit-inode-support.patch
+
 # Device mapper / MD layer
 Patch1500: linux-2.6-dm-mirroring.patch
 
@@ -404,9 +410,12 @@
 Patch1720: linux-2.6-proc-self-maps-fix.patch
 Patch1740: linux-2.6-softlockup-disable.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
+Patch1780: linux-2.6-ehea-ethernet-driver.patch
+Patch1790: linux-2.6-drivers-add-qlogic-firmware.patch
 
 # SELinux/audit patches.
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
+Patch1802: linux-2.6-selinux-support-range-transitions.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-oss-warning.patch
@@ -750,6 +759,8 @@
 #
 # PowerPC
 #
+# fix ppc irq mapping for JS20s
+%patch304 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
 %patch305 -p1
 # Make HVC console generic; support simulator console device using it.
@@ -884,7 +895,9 @@
 # Fix badness.
 %patch1203 -p1
 
-# NIC driver fixes.
+# core networking changes.
+%patch1300 -p1
+%patch1301 -p1
 
 # Filesystem patches.
 # Squashfs
@@ -907,6 +920,9 @@
 %patch1432 -p1
 %patch1433 -p1
 
+# NFS supports 64-bit inodes
+%patch1440 -p1
+
 # Device mapper / MD layer
 # dm mirroring
 %patch1500 -p1
@@ -936,9 +952,15 @@
 %patch1740 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
+# support EHEA ethernet driver
+%patch1780 -p1
+# qlogic firmware 
+%patch1790 -p1
 
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1
+# Add support for SELinux range transitions
+%patch1802 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1700,6 +1722,16 @@
 %endif
 
 %changelog
+* Thu Aug 17 2006 Don Zickus <dzickus at redhat.com>
+- added #202779
+- added #202597
+- added #196082
+- added #196075
+- added #201604
+- added #202461
+- added #184752
+- added #201731
+
 * Wed Aug 16 2006 Don Zickus <dzickus at redhat.com>
 - added #200740
 - forgot to disable utrace on ia64

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   21 
 fs/dlm/Makefile                    |   19 
 fs/dlm/ast.c                       |  172 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 +++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  387 +++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  541 +++++
 fs/dlm/lock.c                      | 3846 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   61 
 fs/dlm/lockspace.c                 |  716 ++++++
 fs/dlm/lockspace.h                 |   25 
 fs/dlm/lowcomms.c                  | 1238 +++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   97 
 fs/dlm/member.c                    |  327 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  116 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  471 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  776 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  286 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/user.c                      |  785 +++++++
 fs/dlm/user.h                      |   16 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1236 +++++++++++
 fs/gfs2/bmap.h                     |   27 
 fs/gfs2/daemon.c                   |  196 +
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1976 +++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++
 fs/gfs2/eattr.h                    |   97 
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2282 +++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  564 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  659 ++++++
 fs/gfs2/inode.c                    | 1344 ++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  290 ++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  302 ++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 +++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 +++++++
 fs/gfs2/lops.h                     |   96 
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  780 +++++++
 fs/gfs2/meta_io.h                  |   74 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  308 ++
 fs/gfs2/ops_address.c              |  797 +++++++
 fs/gfs2/ops_address.h              |   18 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  293 ++
 fs/gfs2/ops_export.h               |   19 
 fs/gfs2/ops_file.c                 |  812 +++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  840 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1165 +++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  471 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  188 +
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/quota.c                    | 1286 ++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  573 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1528 ++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  979 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 +++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/Kbuild               |   33 
 include/linux/dlm.h                |  302 ++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  443 ++++
 include/linux/iflags.h             |  102 
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   41 
 mm/filemap.c                       |    3 
 mm/readahead.c                     |    1 
 131 files changed, 40684 insertions(+), 21 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.12.4.2
retrieving revision 1.12.4.3
diff -u -r1.12.4.2 -r1.12.4.3
--- linux-2.6-gfs2-dlm.patch	16 Aug 2006 20:42:30 -0000	1.12.4.2
+++ linux-2.6-gfs2-dlm.patch	17 Aug 2006 22:59:24 -0000	1.12.4.3
@@ -67,10 +67,10 @@
 +  mount.gfs2	to help mount(8) mount a filesystem
 +  mkfs.gfs2	to make a filesystem
 diff --git a/MAINTAINERS b/MAINTAINERS
-index b2afc7a..e42e143 100644
+index e3e1515..a050d7c 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -862,6 +862,16 @@ M:	jack at suse.cz
+@@ -875,6 +875,16 @@ M:	jack at suse.cz
  L:	linux-kernel at vger.kernel.org
  S:	Maintained
  
@@ -87,7 +87,7 @@
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  P:	Tobias Ringstrom
  M:	tori at unhappy.mine.nu
-@@ -1112,6 +1122,14 @@ M:	khc at pm.waw.pl
+@@ -1129,6 +1139,14 @@ M:	khc at pm.waw.pl
  W:	http://www.kernel.org/pub/linux/utils/net/hdlc/
  S:	Maintained
  
@@ -1256,10 +1256,10 @@
 +
 diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
 new file mode 100644
-index 0000000..8f471d9
+index 0000000..9c3aedd
 --- /dev/null
 +++ b/fs/dlm/debug_fs.c
-@@ -0,0 +1,384 @@
+@@ -0,0 +1,387 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -1572,16 +1572,19 @@
 +{
 +	struct dlm_ls *ls = file->private_data;
 +	struct dlm_lkb *lkb;
-+	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, rv;
++	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, ret, rv;
 +
 +	mutex_lock(&debug_buf_lock);
 +	mutex_lock(&ls->ls_waiters_mutex);
 +	memset(debug_buf, 0, sizeof(debug_buf));
 +
 +	list_for_each_entry(lkb, &ls->ls_waiters, lkb_wait_reply) {
-+		pos += snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",
-+				lkb->lkb_id, lkb->lkb_wait_type,
-+				lkb->lkb_nodeid, lkb->lkb_resource->res_name);
++		ret = snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",
++			       lkb->lkb_id, lkb->lkb_wait_type,
++			       lkb->lkb_nodeid, lkb->lkb_resource->res_name);
++		if (ret >= len - pos)
++			break;
++		pos += ret;
 +	}
 +	mutex_unlock(&ls->ls_waiters_mutex);
 +
@@ -2111,10 +2114,10 @@
 +
 diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
 new file mode 100644
-index 0000000..7c3c2d2
+index 0000000..da75099
 --- /dev/null
 +++ b/fs/dlm/dlm_internal.h
-@@ -0,0 +1,539 @@
+@@ -0,0 +1,541 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -2584,6 +2587,8 @@
 +	struct list_head	ls_requestqueue;/* queue remote requests */
 +	struct mutex		ls_requestqueue_mutex;
 +	char			*ls_recover_buf;
++	int			ls_recover_nodeid; /* for debugging */
++	uint64_t		ls_rcom_seq;
 +	struct list_head	ls_recover_list;
 +	spinlock_t		ls_recover_list_lock;
 +	int			ls_recover_list_count;
@@ -2656,10 +2661,10 @@
 +
 diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
 new file mode 100644
-index 0000000..7d38f91
+index 0000000..bb2e351
 --- /dev/null
 +++ b/fs/dlm/lock.c
-@@ -0,0 +1,3845 @@
+@@ -0,0 +1,3846 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -6361,6 +6366,7 @@
 +	if (lvb_in && ua->lksb.sb_lvbptr)
 +		memcpy(ua->lksb.sb_lvbptr, lvb_in, DLM_USER_LVB_LEN);
 +	ua->castparam = ua_tmp->castparam;
++	ua->user_lksb = ua_tmp->user_lksb;
 +
 +	error = set_unlock_args(flags, ua, &args);
 +	if (error)
@@ -6574,10 +6580,10 @@
 +
 diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
 new file mode 100644
-index 0000000..31ed0fe
+index 0000000..7adaad5
 --- /dev/null
 +++ b/fs/dlm/lockspace.c
-@@ -0,0 +1,705 @@
+@@ -0,0 +1,716 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -6661,6 +6667,11 @@
 +	return sprintf(buf, "%x\n", status);
 +}
 +
++static ssize_t dlm_recover_nodeid_show(struct dlm_ls *ls, char *buf)
++{
++	return sprintf(buf, "%d\n", ls->ls_recover_nodeid);
++}
++
 +struct dlm_attr {
 +	struct attribute attr;
 +	ssize_t (*show)(struct dlm_ls *, char *);
@@ -6688,11 +6699,17 @@
 +	.show  = dlm_recover_status_show
 +};
 +
++static struct dlm_attr dlm_attr_recover_nodeid = {
++	.attr  = {.name = "recover_nodeid", .mode = S_IRUGO},
++	.show  = dlm_recover_nodeid_show
++};
++
 +static struct attribute *dlm_attrs[] = {
 +	&dlm_attr_control.attr,
 +	&dlm_attr_event.attr,
 +	&dlm_attr_id.attr,
 +	&dlm_attr_recover_status.attr,
++	&dlm_attr_recover_nodeid.attr,
 +	NULL,
 +};
 +
@@ -7316,7 +7333,7 @@
 +
 diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
 new file mode 100644
-index 0000000..7ab4042
+index 0000000..23f5ce1
 --- /dev/null
 +++ b/fs/dlm/lowcomms.c
 @@ -0,0 +1,1238 @@
@@ -8256,11 +8273,11 @@
 +			break;
 +		e = list_entry(ni->writequeue.next, struct writequeue_entry,
 +			       list);
-+		kmap(e->page);
 +		len = e->len;
 +		offset = e->offset;
 +		BUG_ON(len == 0 && e->users == 0);
 +		spin_unlock(&ni->writequeue_lock);
++		kmap(e->page);
 +
 +		ret = 0;
 +		if (len) {
@@ -8719,10 +8736,10 @@
 +
 diff --git a/fs/dlm/member.c b/fs/dlm/member.c
 new file mode 100644
-index 0000000..cd0c51e
+index 0000000..a3f7de7
 --- /dev/null
 +++ b/fs/dlm/member.c
-@@ -0,0 +1,312 @@
+@@ -0,0 +1,327 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -8887,11 +8904,23 @@
 +
 +/* send a status request to all members just to establish comms connections */
 +
-+static void ping_members(struct dlm_ls *ls)
++static int ping_members(struct dlm_ls *ls)
 +{
 +	struct dlm_member *memb;
-+	list_for_each_entry(memb, &ls->ls_nodes, list)
-+		dlm_rcom_status(ls, memb->nodeid);
++	int error = 0;
++
++	list_for_each_entry(memb, &ls->ls_nodes, list) {
++		error = dlm_recovery_stopped(ls);
++		if (error)
++			break;
++		error = dlm_rcom_status(ls, memb->nodeid);
++		if (error)
++			break;
++	}
++	if (error)
++		log_debug(ls, "ping_members aborted %d last nodeid %d",
++			  error, ls->ls_recover_nodeid);
++	return error;
 +}
 +
 +int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv, int *neg_out)
@@ -8937,10 +8966,13 @@
 +	dlm_set_recover_status(ls, DLM_RS_NODES);
 +	*neg_out = neg;
 +
-+	ping_members(ls);
++	error = ping_members(ls);
++	if (error)
++		goto out;
 +
 +	error = dlm_recover_members_wait(ls);
-+	log_debug(ls, "total members %d", ls->ls_num_nodes);
++ out:
++	log_debug(ls, "total members %d error %d", ls->ls_num_nodes, error);
 +	return error;
 +}
 +
@@ -9067,10 +9099,10 @@
 +
 diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
 new file mode 100644
-index 0000000..48dfc27
+index 0000000..989b608
 --- /dev/null
 +++ b/fs/dlm/memory.c
-@@ -0,0 +1,115 @@
+@@ -0,0 +1,116 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -9173,7 +9205,8 @@
 +{
 +	struct dlm_direntry *de;
 +
-+	DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,);
++	DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,
++		   printk("namelen = %d\n", namelen););
 +
 +	de = kmalloc(sizeof(*de) + namelen, GFP_KERNEL);
 +	if (de)
@@ -9396,10 +9429,10 @@
 +
 diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
 new file mode 100644
-index 0000000..55fbe31
+index 0000000..64ba492
 --- /dev/null
 +++ b/fs/dlm/rcom.c
-@@ -0,0 +1,457 @@
+@@ -0,0 +1,471 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -9499,6 +9532,7 @@
 +	int error = 0;
 +
 +	memset(ls->ls_recover_buf, 0, dlm_config.buffer_size);
++	ls->ls_recover_nodeid = nodeid;
 +
 +	if (nodeid == dlm_our_nodeid()) {
 +		rc = (struct dlm_rcom *) ls->ls_recover_buf;
@@ -9509,6 +9543,7 @@
 +	error = create_rcom(ls, nodeid, DLM_RCOM_STATUS, 0, &rc, &mh);
 +	if (error)
 +		goto out;
++	rc->rc_id = ++ls->ls_rcom_seq;
 +
 +	send_rcom(ls, mh, rc);
 +
@@ -9541,19 +9576,30 @@
 +			    sizeof(struct rcom_config), &rc, &mh);
 +	if (error)
 +		return;
++	rc->rc_id = rc_in->rc_id;
 +	rc->rc_result = dlm_recover_status(ls);
 +	make_config(ls, (struct rcom_config *) rc->rc_buf);
 +
 +	send_rcom(ls, mh, rc);
 +}
 +
-+static void receive_rcom_status_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
++static void receive_sync_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
 +{
++	if (rc_in->rc_id != ls->ls_rcom_seq) {
++		log_debug(ls, "reject old reply %d got %llx wanted %llx",
++			  rc_in->rc_type, rc_in->rc_id, ls->ls_rcom_seq);
++		return;
++	}
 +	memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length);
 +	set_bit(LSFL_RCOM_READY, &ls->ls_flags);
 +	wake_up(&ls->ls_wait_general);
 +}
 +
++static void receive_rcom_status_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
++{
++	receive_sync_reply(ls, rc_in);
++}
++
 +int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len)
 +{
 +	struct dlm_rcom *rc;
@@ -9561,6 +9607,7 @@
 +	int error = 0, len = sizeof(struct dlm_rcom);
 +
 +	memset(ls->ls_recover_buf, 0, dlm_config.buffer_size);
++	ls->ls_recover_nodeid = nodeid;
 +
 +	if (nodeid == dlm_our_nodeid()) {
 +		dlm_copy_master_names(ls, last_name, last_len,
@@ -9573,6 +9620,7 @@
 +	if (error)
 +		goto out;
 +	memcpy(rc->rc_buf, last_name, last_len);
++	rc->rc_id = ++ls->ls_rcom_seq;
 +
 +	send_rcom(ls, mh, rc);
 +
@@ -9609,6 +9657,7 @@
 +	error = create_rcom(ls, nodeid, DLM_RCOM_NAMES_REPLY, outlen, &rc, &mh);
 +	if (error)
 +		return;
++	rc->rc_id = rc_in->rc_id;
 +
 +	dlm_copy_master_names(ls, rc_in->rc_buf, inlen, rc->rc_buf, outlen,
 +			      nodeid);
@@ -9617,9 +9666,7 @@
 +
 +static void receive_rcom_names_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
 +{
-+	memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length);
-+	set_bit(LSFL_RCOM_READY, &ls->ls_flags);
-+	wake_up(&ls->ls_wait_general);
++	receive_sync_reply(ls, rc_in);
 +}
 +
 +int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid)
@@ -10711,10 +10758,10 @@
 +
 diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
 new file mode 100644
-index 0000000..7010353
+index 0000000..eac8e9f
 --- /dev/null
 +++ b/fs/dlm/recoverd.c
-@@ -0,0 +1,285 @@
+@@ -0,0 +1,286 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -10992,6 +11039,7 @@
 +
 +void dlm_recoverd_suspend(struct dlm_ls *ls)
 +{
++	wake_up(&ls->ls_wait_general);
 +	mutex_lock(&ls->ls_recoverd_active);
 +}
 +
@@ -18241,10 +18289,10 @@
 +
 diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
 new file mode 100644
-index 0000000..b6edf7c
+index 0000000..a5e16e5
 --- /dev/null
 +++ b/fs/gfs2/glock.c
-@@ -0,0 +1,2279 @@
+@@ -0,0 +1,2282 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -20414,7 +20462,9 @@
 +
 +	spin_lock(&gl->gl_spin);
 +
-+	printk(KERN_INFO "Glock (%u, %llu)\n", gl->gl_name.ln_type,
++	printk(KERN_INFO "Glock 0x%p (%u, %llu)\n",
++	       gl,
++	       gl->gl_name.ln_type,
 +	       (unsigned long long)gl->gl_name.ln_number);
 +	printk(KERN_INFO "  gl_flags =");
 +	for (x = 0; x < 32; x++)
@@ -20434,8 +20484,9 @@
 +	printk(KERN_INFO "  reclaim = %s\n",
 +		    (list_empty(&gl->gl_reclaim)) ? "no" : "yes");
 +	if (gl->gl_aspace)
-+		printk(KERN_INFO "  aspace = %lu\n",
-+			    gl->gl_aspace->i_mapping->nrpages);
++		printk(KERN_INFO "  aspace = 0x%p nrpages = %lu\n",
++		       gl->gl_aspace,
++		       gl->gl_aspace->i_mapping->nrpages);
 +	else
 +		printk(KERN_INFO "  aspace = no\n");
 +	printk(KERN_INFO "  ail = %d\n", atomic_read(&gl->gl_ail_count));
@@ -21283,10 +21334,10 @@
 +#endif /* __GLOPS_DOT_H__ */
 diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
 new file mode 100644
-index 0000000..90e0624
+index 0000000..e98c14f
 --- /dev/null
 +++ b/fs/gfs2/incore.h
-@@ -0,0 +1,658 @@
+@@ -0,0 +1,659 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -21568,6 +21619,7 @@
 +
 +enum {
 +	GFF_DID_DIRECT_ALLOC	= 0,
++	GFF_EXLOCK = 1,
 +};
 +
 +struct gfs2_file {
@@ -23656,10 +23708,10 @@
 +#endif /* __LM_DOT_H__ */
 diff --git a/fs/gfs2/lm_interface.h b/fs/gfs2/lm_interface.h
 new file mode 100644
-index 0000000..9d34bf3
+index 0000000..1da95a5
 --- /dev/null
 +++ b/fs/gfs2/lm_interface.h
-@@ -0,0 +1,295 @@
+@@ -0,0 +1,290 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -23927,16 +23979,11 @@
 +/*
 + * Lock module bottom interface.  A lock module makes itself available to GFS
 + * with these functions.
-+ *
-+ * For the time being, we copy the gfs1 lock module bottom interface so the
-+ * same lock modules can be used with both gfs1 and gfs2 (it won't be possible
-+ * to load both gfs1 and gfs2 at once.)  Eventually the lock modules will fork
-+ * for gfs1/gfs2 and this API can change to the gfs2_ prefix.
 + */
 +
-+int gfs_register_lockproto(struct lm_lockops *proto);
++int gfs2_register_lockproto(struct lm_lockops *proto);
 +
-+void gfs_unregister_lockproto(struct lm_lockops *proto);
++void gfs2_unregister_lockproto(struct lm_lockops *proto);
 +
 +/*
 + * Lock module top interface.  GFS calls these functions when mounting or
@@ -23957,7 +24004,7 @@
 +
 diff --git a/fs/gfs2/locking.c b/fs/gfs2/locking.c
 new file mode 100644
-index 0000000..1831928
+index 0000000..ded1ef6
 --- /dev/null
 +++ b/fs/gfs2/locking.c
 @@ -0,0 +1,191 @@
@@ -23994,13 +24041,13 @@
 +static struct mutex lmh_lock;
 +
 +/**
-+ * gfs_register_lockproto - Register a low-level locking protocol
++ * gfs2_register_lockproto - Register a low-level locking protocol
 + * @proto: the protocol definition
 + *
 + * Returns: 0 on success, -EXXX on failure
 + */
 +
-+int gfs_register_lockproto(struct lm_lockops *proto)
++int gfs2_register_lockproto(struct lm_lockops *proto)
 +{
 +	struct lmh_wrapper *lw;
 +
@@ -24030,12 +24077,12 @@
 +}
 +
 +/**
-+ * gfs_unregister_lockproto - Unregister a low-level locking protocol
++ * gfs2_unregister_lockproto - Unregister a low-level locking protocol
 + * @proto: the protocol definition
 + *
 + */
 +
-+void gfs_unregister_lockproto(struct lm_lockops *proto)
++void gfs2_unregister_lockproto(struct lm_lockops *proto)
 +{
 +	struct lmh_wrapper *lw;
 +
@@ -24080,7 +24127,7 @@
 +	int try = 0;
 +	int error, found;
 +
-+ retry:
++retry:
 +	mutex_lock(&lmh_lock);
 +
 +	found = 0;
@@ -24114,7 +24161,7 @@
 +				     min_lvb_size, flags, lockstruct, fskobj);
 +	if (error)
 +		module_put(lw->lw_ops->lm_owner);
-+ out:
++out:
 +	mutex_unlock(&lmh_lock);
 +	return error;
 +}
@@ -24149,8 +24196,8 @@
 +	INIT_LIST_HEAD(&lmh_list);
 +}
 +
-+EXPORT_SYMBOL_GPL(gfs_register_lockproto);
-+EXPORT_SYMBOL_GPL(gfs_unregister_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_register_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_unregister_lockproto);
 +
 diff --git a/fs/gfs2/locking/dlm/Makefile b/fs/gfs2/locking/dlm/Makefile
 new file mode 100644
@@ -24904,7 +24951,7 @@
 +
 diff --git a/fs/gfs2/locking/dlm/main.c b/fs/gfs2/locking/dlm/main.c
 new file mode 100644
-index 0000000..89728c9
+index 0000000..870a1cd
 --- /dev/null
 +++ b/fs/gfs2/locking/dlm/main.c
 @@ -0,0 +1,64 @@
@@ -24930,7 +24977,7 @@
 +{
 +	int error;
 +
-+	error = gfs_register_lockproto(&gdlm_ops);
++	error = gfs2_register_lockproto(&gdlm_ops);
 +	if (error) {
 +		printk(KERN_WARNING "lock_dlm:  can't register protocol: %d\n",
 +		       error);
@@ -24939,14 +24986,14 @@
 +
 +	error = gdlm_sysfs_init();
 +	if (error) {
-+		gfs_unregister_lockproto(&gdlm_ops);
++		gfs2_unregister_lockproto(&gdlm_ops);
 +		return error;
 +	}
 +
 +	error = gdlm_plock_init();
 +	if (error) {
 +		gdlm_sysfs_exit();
-+		gfs_unregister_lockproto(&gdlm_ops);
++		gfs2_unregister_lockproto(&gdlm_ops);
 +		return error;
 +	}
 +
@@ -24962,7 +25009,7 @@
 +{
 +	gdlm_plock_exit();
 +	gdlm_sysfs_exit();
-+	gfs_unregister_lockproto(&gdlm_ops);
++	gfs2_unregister_lockproto(&gdlm_ops);
 +}
 +
 +module_init(init_lock_dlm);
@@ -25236,10 +25283,10 @@
 +
 diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
 new file mode 100644
-index 0000000..e5b11f0
+index 0000000..1acb251
 --- /dev/null
 +++ b/fs/gfs2/locking/dlm/plock.c
-@@ -0,0 +1,301 @@
+@@ -0,0 +1,302 @@
 +/*
 + * Copyright (C) 2005 Red Hat, Inc.  All rights reserved.
 + *
@@ -25474,7 +25521,8 @@
 +	spin_lock(&ops_lock);
 +	list_for_each_entry(op, &recv_list, list) {
 +		if (op->info.fsid == info.fsid &&
-+		    op->info.number == info.number) {
++		    op->info.number == info.number &&
++		    op->info.owner == info.owner) {
 +			list_del_init(&op->list);
 +			found = 1;
 +			op->done = 1;
@@ -26148,7 +26196,7 @@
 +
 diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c
 new file mode 100644
-index 0000000..97ffac5
+index 0000000..748aa5d
 --- /dev/null
 +++ b/fs/gfs2/locking/nolock/main.c
 @@ -0,0 +1,259 @@
@@ -26387,7 +26435,7 @@
 +{
 +	int error;
 +
-+	error = gfs_register_lockproto(&nolock_ops);
++	error = gfs2_register_lockproto(&nolock_ops);
 +	if (error) {
 +		printk(KERN_WARNING
 +		       "lock_nolock: can't register protocol: %d\n", error);
@@ -26401,7 +26449,7 @@
 +
 +static void __exit exit_nolock(void)
 +{
-+	gfs_unregister_lockproto(&nolock_ops);
++	gfs2_unregister_lockproto(&nolock_ops);
 +}
 +
 +module_init(init_nolock);
@@ -26413,7 +26461,7 @@
 +
 diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
 new file mode 100644
-index 0000000..60fdc94
+index 0000000..a591fb8
 --- /dev/null
 +++ b/fs/gfs2/log.c
 @@ -0,0 +1,601 @@
@@ -26675,8 +26723,8 @@
 +	if (list_empty(&sdp->sd_ail1_list))
 +		tail = sdp->sd_log_head;
 +	else {
-+		ai = list_entry(sdp->sd_ail1_list.prev,
-+				struct gfs2_ail, ai_list);
++		ai = list_entry(sdp->sd_ail1_list.prev, struct gfs2_ail,
++				ai_list);
 +		tail = ai->ai_first;
 +	}
 +
@@ -29625,10 +29673,10 @@
 +
 diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
 new file mode 100644
-index 0000000..fca69f1
+index 0000000..45afd05
 --- /dev/null
 +++ b/fs/gfs2/ops_address.c
-@@ -0,0 +1,778 @@
+@@ -0,0 +1,797 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -29762,8 +29810,8 @@
 +static int gfs2_writepage(struct page *page, struct writeback_control *wbc)
 +{
 +	struct inode *inode = page->mapping->host;
-+	struct gfs2_inode *ip = GFS2_I(page->mapping->host);
-+	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
++	struct gfs2_inode *ip = GFS2_I(inode);
++	struct gfs2_sbd *sdp = GFS2_SB(inode);
 +	loff_t i_size = i_size_read(inode);
 +	pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;
 +	unsigned offset;
@@ -29789,6 +29837,10 @@
 +		error = gfs2_trans_begin(sdp, RES_DINODE + 1, 0);
 +		if (error)
 +			goto out_ignore;
++		if (!page_has_buffers(page)) {
++			create_empty_buffers(page, inode->i_sb->s_blocksize,
++					     (1 << BH_Dirty)|(1 << BH_Uptodate));
++		}
 +		gfs2_page_add_databufs(ip, page, 0, sdp->sd_vfs->s_blocksize-1);
 +		done_trans = 1;
 +	}
@@ -29868,14 +29920,22 @@
 +	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
 +	struct gfs2_holder gh;
 +	int error;
++	int do_unlock = 0;
 +
 +	if (likely(file != &gfs2_internal_file_sentinal)) {
++		if (file) {
++			struct gfs2_file *gf = file->private_data;
++			if (test_bit(GFF_EXLOCK, &gf->f_flags))
++				goto skip_lock;
++		}
 +		gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|GL_AOP, &gh);
++		do_unlock = 1;
 +		error = gfs2_glock_nq_m_atime(1, &gh);
 +		if (unlikely(error))
 +			goto out_unlock;
 +	}
 +
++skip_lock:
 +	if (gfs2_is_stuffed(ip)) {
 +		error = stuffed_readpage(ip, page);
 +		unlock_page(page);
@@ -29893,7 +29953,7 @@
 +	return error;
 +out_unlock:
 +	unlock_page(page);
-+	if (file != &gfs2_internal_file_sentinal)
++	if (do_unlock)
 +		gfs2_holder_uninit(&gh);
 +	goto out;
 +}
@@ -29922,17 +29982,24 @@
 +	struct gfs2_holder gh;
 +	unsigned page_idx;
 +	int ret;
++	int do_unlock = 0;
 +
 +	if (likely(file != &gfs2_internal_file_sentinal)) {
++		if (file) {
++			struct gfs2_file *gf = file->private_data;
++			if (test_bit(GFF_EXLOCK, &gf->f_flags))
++				goto skip_lock;
++		}
 +		gfs2_holder_init(ip->i_gl, LM_ST_SHARED,
 +				 LM_FLAG_TRY_1CB|GL_ATIME|GL_AOP, &gh);
++		do_unlock = 1;
 +		ret = gfs2_glock_nq_m_atime(1, &gh);
 +		if (ret == GLR_TRYFAILED) 
 +			goto out_noerror;
 +		if (unlikely(ret))
 +			goto out_unlock;
 +	}
-+
++skip_lock:
 +	if (gfs2_is_stuffed(ip)) {
 +		struct pagevec lru_pvec;
 +		pagevec_init(&lru_pvec, 0);
@@ -29957,7 +30024,7 @@
 +		ret = mpage_readpages(mapping, pages, nr_pages, gfs2_get_block);
 +	}
 +
-+	if (likely(file != &gfs2_internal_file_sentinal)) {
++	if (do_unlock) {
 +		gfs2_glock_dq_m(1, &gh);
 +		gfs2_holder_uninit(&gh);
 +	}
@@ -29975,7 +30042,7 @@
 +		unlock_page(page);
 +		page_cache_release(page);
 +	}
-+	if (likely(file != &gfs2_internal_file_sentinal))
++	if (do_unlock)
 +		gfs2_holder_uninit(&gh);
 +	goto out;
 +}
@@ -31751,10 +31818,10 @@
 +#endif /* __OPS_FILE_DOT_H__ */
 diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
 new file mode 100644
-index 0000000..de18923
+index 0000000..4440009
 --- /dev/null
 +++ b/fs/gfs2/ops_fstype.c
-@@ -0,0 +1,836 @@
+@@ -0,0 +1,840 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -32036,6 +32103,10 @@
 +	int error = 0;
 +
 +	if (undo) {
++		if (sb->s_root) {
++			dput(sb->s_root);
++			sb->s_root = NULL;
++		}
 +		return 0;
 +	}
 +	
@@ -34308,10 +34379,10 @@
 +#endif /* __OPS_SUPER_DOT_H__ */
 diff --git a/fs/gfs2/ops_vm.c b/fs/gfs2/ops_vm.c
 new file mode 100644
-index 0000000..aff6637
+index 0000000..875a769
 --- /dev/null
 +++ b/fs/gfs2/ops_vm.c
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,188 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -34360,13 +34431,7 @@
 +					unsigned long address, int *type)
 +{
 +	struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
-+	struct gfs2_holder i_gh;
 +	struct page *result;
-+	int error;
-+
-+	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, 0, &i_gh);
-+	if (error)
-+		return NULL;
 +
 +	set_bit(GIF_PAGED, &ip->i_flags);
 +
@@ -34375,8 +34440,6 @@
 +	if (result && result != NOPAGE_OOM)
 +		pfault_be_greedy(ip);
 +
-+	gfs2_glock_dq_uninit(&i_gh);
-+
 +	return result;
 +}
 +
@@ -34455,7 +34518,9 @@
 +static struct page *gfs2_sharewrite_nopage(struct vm_area_struct *area,
 +					   unsigned long address, int *type)
 +{
-+	struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
++	struct file *file = area->vm_file;
++	struct gfs2_file *gf = file->private_data;
++	struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);
 +	struct gfs2_holder i_gh;
 +	struct page *result = NULL;
 +	unsigned long index = ((address - area->vm_start) >> PAGE_CACHE_SHIFT) +
@@ -34470,13 +34535,14 @@
 +	set_bit(GIF_PAGED, &ip->i_flags);
 +	set_bit(GIF_SW_PAGED, &ip->i_flags);
 +
-+	error = gfs2_write_alloc_required(ip,
-+					  (uint64_t)index << PAGE_CACHE_SHIFT,
++	error = gfs2_write_alloc_required(ip, (u64)index << PAGE_CACHE_SHIFT,
 +					  PAGE_CACHE_SIZE, &alloc_required);
 +	if (error)
 +		goto out;
 +
++	set_bit(GFF_EXLOCK, &gf->f_flags);
 +	result = filemap_nopage(area, address, type);
++	clear_bit(GFF_EXLOCK, &gf->f_flags);
 +	if (!result || result == NOPAGE_OOM)
 +		goto out;
 +
@@ -34491,8 +34557,7 @@
 +	}
 +
 +	pfault_be_greedy(ip);
-+
-+ out:
++out:
 +	gfs2_glock_dq_uninit(&i_gh);
 +
 +	return result;
@@ -35860,10 +35925,10 @@
 +#endif /* __QUOTA_DOT_H__ */
 diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
 new file mode 100644
-index 0000000..7aabc03
+index 0000000..8fe518c
 --- /dev/null
 +++ b/fs/gfs2/recovery.c
-@@ -0,0 +1,575 @@
+@@ -0,0 +1,573 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -36019,8 +36084,7 @@
 +
 +	if (lh.lh_header.mh_magic != GFS2_MAGIC ||
 +	    lh.lh_header.mh_type != GFS2_METATYPE_LH ||
-+	    lh.lh_blkno != blk ||
-+	    lh.lh_hash != hash)
++	    lh.lh_blkno != blk || lh.lh_hash != hash)
 +		return 1;
 +
 +	*head = lh;
@@ -36192,6 +36256,7 @@
 +			error = get_log_header(jd, start, &lh);
 +			if (!error) {
 +				gfs2_replay_incr_blk(sdp, &start);
++				brelse(bh);
 +				continue;
 +			}
 +			if (error == 1) {
@@ -36263,7 +36328,7 @@
 +	lh = (struct gfs2_log_header *)bh->b_data;
 +	memset(lh, 0, sizeof(struct gfs2_log_header));
 +	lh->lh_header.mh_magic = cpu_to_be32(GFS2_MAGIC);
-+	lh->lh_header.mh_type = cpu_to_be16(GFS2_METATYPE_LH);
++	lh->lh_header.mh_type = cpu_to_be32(GFS2_METATYPE_LH);
 +	lh->lh_header.mh_format = cpu_to_be32(GFS2_FORMAT_LH);
 +	lh->lh_sequence = cpu_to_be64(head->lh_sequence + 1);
 +	lh->lh_flags = cpu_to_be32(GFS2_LOG_HEAD_UNMOUNT);
@@ -36348,11 +36413,9 @@
 +
 +		/* Acquire a shared hold on the transaction lock */
 +
-+		error = gfs2_glock_nq_init(sdp->sd_trans_gl,
-+					   LM_ST_SHARED,
++		error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED,
 +					   LM_FLAG_NOEXP | LM_FLAG_PRIORITY |
-+					   GL_NOCANCEL | GL_NOCACHE,
-+					   &t_gh);
++					   GL_NOCANCEL | GL_NOCACHE, &t_gh);
 +		if (error)
 +			goto fail_gunlock_ji;
 +

linux-2.6-gfs2-locking-exports.patch:
 locking.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6-gfs2-locking-exports.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-locking-exports.patch,v
retrieving revision 1.1.10.2
retrieving revision 1.1.10.3
diff -u -r1.1.10.2 -r1.1.10.3
--- linux-2.6-gfs2-locking-exports.patch	16 Aug 2006 20:42:35 -0000	1.1.10.2
+++ linux-2.6-gfs2-locking-exports.patch	17 Aug 2006 22:59:25 -0000	1.1.10.3
@@ -1,12 +1,10 @@
-*** gfs2-2.6-18-rc2/fs/gfs2/locking.c	2006-07-20 10:44:33.000000000 -0500
---- gfs2-devel/fs/gfs2/locking.c	2006-07-20 12:27:53.000000000 -0500
-*************** void __init gfs2_init_lmh(void)
-*** 188,191 ****
---- 188,194 ----
-  
-  EXPORT_SYMBOL_GPL(gfs_register_lockproto);
-  EXPORT_SYMBOL_GPL(gfs_unregister_lockproto);
-+ EXPORT_SYMBOL_GPL(gfs2_withdraw_lockproto);
-+ EXPORT_SYMBOL_GPL(gfs2_mount_lockproto);
-+ EXPORT_SYMBOL_GPL(gfs2_unmount_lockproto);
-  
+--- linux-2.6.17.noarch/fs/gfs2/locking.c~	2006-08-10 13:33:09.000000000 -0400
++++ linux-2.6.17.noarch/fs/gfs2/locking.c	2006-08-10 13:33:23.000000000 -0400
+@@ -188,4 +188,6 @@ void __init gfs2_init_lmh(void)
+ 
+ EXPORT_SYMBOL_GPL(gfs2_register_lockproto);
+ EXPORT_SYMBOL_GPL(gfs2_unregister_lockproto);
+-
++EXPORT_SYMBOL_GPL(gfs2_withdraw_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_mount_lockproto);
++EXPORT_SYMBOL_GPL(gfs2_unmount_lockproto);



From fedora-cvs-commits at redhat.com  Thu Aug 17 23:00:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 19:00:02 -0400
Subject: rpms/selinux-policy/devel policy-20060817-useradd+radius.patch, NONE,
	1.1
Message-ID: <200608172300.k7HN021v031450@cvs.devel.redhat.com>

Author: jantill

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31324

Added Files:
	policy-20060817-useradd+radius.patch 
Log Message:
 Add patch for radius+useradd (no specfile changes)


policy-20060817-useradd+radius.patch:
 admin/usermanage.te  |    1 +
 admin/usermanage.te~ |only
 services/radius.te   |    1 +
 services/radius.te~  |only
 4 files changed, 2 insertions(+)

--- NEW FILE policy-20060817-useradd+radius.patch ---
diff -rup serefpolicy-2.3.7-orig/policy/modules/admin/usermanage.te serefpolicy-2.3.7/policy/modules/admin/usermanage.te
--- serefpolicy-2.3.7-orig/policy/modules/admin/usermanage.te	2006-08-17 17:44:48.000000000 -0400
+++ serefpolicy-2.3.7/policy/modules/admin/usermanage.te	2006-08-17 17:46:05.000000000 -0400
@@ -486,6 +486,7 @@ auth_manage_shadow(useradd_t)
 auth_relabel_shadow(useradd_t)
 auth_etc_filetrans_shadow(useradd_t)
 auth_rw_lastlog(useradd_t)
+auth_rw_faillog(useradd_t)
 auth_use_nsswitch(useradd_t)
 
 corecmd_exec_shell(useradd_t)
Only in serefpolicy-2.3.7/policy/modules/admin: usermanage.te~
diff -rup serefpolicy-2.3.7-orig/policy/modules/services/radius.te serefpolicy-2.3.7/policy/modules/services/radius.te
--- serefpolicy-2.3.7-orig/policy/modules/services/radius.te	2006-08-12 06:57:20.000000000 -0400
+++ serefpolicy-2.3.7/policy/modules/services/radius.te	2006-08-17 17:47:43.000000000 -0400
@@ -32,6 +32,7 @@ files_pid_file(radiusd_var_run_t)
 allow radiusd_t self:capability { chown dac_override fsetid kill setgid setuid sys_resource sys_tty_config };
 dontaudit radiusd_t self:capability sys_tty_config;
 allow radiusd_t self:process setsched;
+allow radiusd_t self:process signal; # kills entire process group on shutdown.
 allow radiusd_t self:fifo_file rw_file_perms;
 allow radiusd_t self:unix_stream_socket create_stream_socket_perms;
 allow radiusd_t self:tcp_socket create_stream_socket_perms;
Only in serefpolicy-2.3.7/policy/modules/services: radius.te~



From fedora-cvs-commits at redhat.com  Thu Aug 17 23:18:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 19:18:09 -0400
Subject: rpms/kernel/devel Makefile.config,1.47,1.48
Message-ID: <200608172318.k7HNI9Ro007471@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4060

Modified Files:
	Makefile.config 
Log Message:
fix


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.config	14 Aug 2006 02:24:34 -0000	1.47
+++ Makefile.config	17 Aug 2006 23:18:03 -0000	1.48
@@ -13,8 +13,7 @@
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
 	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \
-	$(CFG)-ia64-xen.config \
-	$(CFG)-olpc.config
+	$(CFG)-ia64-xen.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))



From fedora-cvs-commits at redhat.com  Fri Aug 18 00:52:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 20:52:55 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-edid-quirks-list.patch, 1.2,
	1.3 xorg-x11-server-1.1.1-infer-virtual.patch, 1.2,
	1.3 xorg-x11-server.spec, 1.148, 1.149
Message-ID: <200608180052.k7I0qtG5001138@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1108

Modified Files:
	xorg-x11-server-1.1.1-edid-quirks-list.patch 
	xorg-x11-server-1.1.1-infer-virtual.patch xorg-x11-server.spec 
Log Message:
* Thu Aug 17 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-22.fc6
- xorg-x11-server-1.1.1-infer-virtual.patch: When no modes or virtual size
  are given in the config file, attempt to pick a sensible one by examining
  the EDID modes and physical geometry.  Also generally make the server
  aware of driver-provided modes.
- xorg-x11-server-1.1.1-edid-quirks-list.patch: Redo, since the property I was
  checking for is both fairly common and fairly predictable.  


xorg-x11-server-1.1.1-edid-quirks-list.patch:
 interpret_edid.c |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletion(-)

Index: xorg-x11-server-1.1.1-edid-quirks-list.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-edid-quirks-list.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-server-1.1.1-edid-quirks-list.patch	11 Aug 2006 01:24:06 -0000	1.2
+++ xorg-x11-server-1.1.1-edid-quirks-list.patch	18 Aug 2006 00:52:50 -0000	1.3
@@ -1,27 +1,37 @@
 --- xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c.edid-quirks	2006-07-05 14:31:40.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c	2006-08-10 15:16:41.000000000 -0400
-@@ -32,6 +32,28 @@
++++ xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c	2006-08-17 18:25:05.000000000 -0400
+@@ -32,6 +32,38 @@
  static void get_detailed_timing_section(Uchar*, struct 	detailed_timings *);
  static Bool validate_version(int scrnIndex, struct edid_version *);
  
-+/* XXX i'm so ashamed of myself */
 +static void
 +handle_edid_quirks(xf86MonPtr m)
 +{
-+    int i;
++    int i, j;
++    struct detailed_timings *preferred_timing;
++    struct monitor_ranges *ranges;
 +
++    /*
++     * max_clock is only encoded in EDID in tens of MHz, so occasionally we
++     * find a monitor claiming a max of 160 with a mode requiring 162, or
++     * similar.  Strictly we should refuse to round up too far, but let's
++     * see how well this works.
++     */
 +    for (i = 0; i < 4; i++) {
-+	if (m->det_mon[i].type == DS_NAME) {
-+	    if (strstr(m->det_mon[i].section.name, "DELL 2000FP")) {
-+		for (i = 0; i < 4; i++) {
-+		    if (m->det_mon[i].type == DS_RANGES) {
-+			xf86Msg(X_INFO, "EDID fixup: Dell 2000FP: "
-+				"Max pixclock %d -> 165MHz\n",
-+				m->det_mon[i].section.ranges.max_clock);
-+			m->det_mon[i].section.ranges.max_clock = 165;
++	if (m->det_mon[i].type == DS_RANGES) {
++	    ranges = &m->det_mon[i].section.ranges;
++	    for (j = 0; j < 4; j++) {
++		if (m->det_mon[j].type == DT) {
++		    preferred_timing = &m->det_mon[j].section.d_timings;
++		    if (ranges->max_clock * 100 < preferred_timing->clock) {
++			xf86Msg(X_WARNING,
++			    "EDID preferred timing clock %dkHz exceeds "
++			    "claimed max %dMHz, fixing\n",
++			    preferred_timing->clock * 10, ranges->max_clock);
++			ranges->max_clock = (preferred_timing->clock+99)/100;
++			return;
 +		    }
 +		}
-+		return;
 +	    }
 +	}
 +    }
@@ -29,7 +39,7 @@
  
  xf86MonPtr
  xf86InterpretEDID(int scrnIndex, Uchar *block)
-@@ -54,7 +76,9 @@
+@@ -54,7 +86,9 @@
  			   &m->ver);
      get_dt_md_section(SECTION(DET_TIMING_SECTION,block),&m->ver, m->det_mon);
      m->no_sections = (int)*(char *)SECTION(NO_EDID,block);

xorg-x11-server-1.1.1-infer-virtual.patch:
 common/xf86Mode.c |  135 +++++++++++++++++++++++++++++++++---------------------
 common/xf86str.h  |    2 
 ddc/ddcProperty.c |   21 +++++---
 3 files changed, 99 insertions(+), 59 deletions(-)

Index: xorg-x11-server-1.1.1-infer-virtual.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-infer-virtual.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-server-1.1.1-infer-virtual.patch	16 Aug 2006 13:15:37 -0000	1.2
+++ xorg-x11-server-1.1.1-infer-virtual.patch	18 Aug 2006 00:52:50 -0000	1.3
@@ -1,5 +1,18 @@
---- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.infer-virtual	2006-08-15 16:24:23.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-15 18:30:27.000000000 -0400
+--- xorg-server-1.1.1/hw/xfree86/common/xf86str.h.infer-virtual	2006-08-17 16:55:43.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-17 16:55:43.000000000 -0400
+@@ -125,8 +125,10 @@
+ # define M_T_CRTC_C  (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC  */
+ # define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)
+                                /* built-in mode - configure CRTC and clock */
++# define M_T_PREFERRED 0x08
+ # define M_T_DEFAULT 0x10	/* (VESA) default modes */
+ # define M_T_USERDEF 0x20	/* One of the modes from the config file */
++# define M_T_DRIVER 0x40
+ 
+ /* Video mode */
+ typedef struct _DisplayModeRec {
+--- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.infer-virtual	2006-08-17 16:55:43.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-17 17:13:50.000000000 -0400
 @@ -47,6 +47,7 @@
  #include "globals.h"
  #include "xf86.h"
@@ -8,11 +21,32 @@
  
  /*
   * xf86GetNearestClock --
-@@ -1163,6 +1164,56 @@
+@@ -1163,6 +1164,77 @@
      return MODE_OK;
  }
  
 +static void
++printModeRejectMessage(int index, DisplayModePtr p, int status)
++{
++    if (p->type & M_T_BUILTIN)
++	xf86DrvMsg(index, X_INFO,
++		"Not using built-in mode \"%s\" (%s)\n",
++		p->name, xf86ModeStatusToString(status));
++    else if (p->type & M_T_DEFAULT)
++	xf86DrvMsg(index, X_INFO,
++		"Not using default mode \"%s\" (%s)\n", p->name,
++		xf86ModeStatusToString(status));
++    else if (p->type & M_T_DRIVER)
++	xf86DrvMsg(index, X_INFO,
++		"Not using driver mode \"%s\" (%s)\n", p->name,
++		xf86ModeStatusToString(status));
++    else
++	xf86DrvMsg(index, X_INFO,
++		"Not using mode \"%s\" (%s)\n", p->name,
++		xf86ModeStatusToString(status));
++}
++
++static void
 +inferVirtualSize(ScrnInfoPtr scrp, DisplayModePtr modes, int *vx, int *vy)
 +{
 +    float aspect = 0.0;
@@ -35,7 +69,7 @@
 +    /* find the largest M_T_DRIVER mode with that aspect ratio */
 +    for (mode = modes; mode; mode = mode->next) {
 +	float mode_aspect, metaspect;
-+	if (!(mode->type & M_T_DRIVER))
++	if (!(mode->type & (M_T_DRIVER|M_T_USERDEF)))
 +	    continue;
 +	mode_aspect = (float)mode->HDisplay / (float)mode->VDisplay;
 +	metaspect = aspect / mode_aspect;
@@ -65,7 +99,7 @@
  /*
   * xf86ValidateModes
   *
-@@ -1426,6 +1477,12 @@
+@@ -1426,6 +1498,12 @@
  	virtX = virtualX;
  	virtY = virtualY;
  	scrp->virtualFrom = X_CONFIG;
@@ -78,21 +112,107 @@
      }
  
      /* Print clock ranges and scaled clocks */
---- xorg-server-1.1.1/hw/xfree86/common/xf86str.h.infer-virtual	2006-08-15 16:24:23.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-15 16:24:23.000000000 -0400
-@@ -125,8 +125,10 @@
- # define M_T_CRTC_C  (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC  */
- # define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)
-                                /* built-in mode - configure CRTC and clock */
-+# define M_T_PREFERRED 0x08
- # define M_T_DEFAULT 0x10	/* (VESA) default modes */
- # define M_T_USERDEF 0x20	/* One of the modes from the config file */
-+# define M_T_DRIVER 0x40
+@@ -1442,7 +1520,7 @@
+ 	for (p = availModes; p != NULL; p = p->next) {
+ 	    status = xf86InitialCheckModeForDriver(scrp, p, clockRanges,
+ 						   strategy, maxPitch,
+-						   virtualX, virtualY);
++						   virtX, virtY);
  
- /* Video mode */
- typedef struct _DisplayModeRec {
---- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.infer-virtual	2006-08-15 16:24:23.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-15 16:24:23.000000000 -0400
+ 	    if (status == MODE_OK) {
+ 		status = xf86CheckModeForMonitor(p, scrp->monitor);
+@@ -1462,18 +1540,7 @@
+ 		q->name = xnfstrdup(p->name);
+ 	        q->status = MODE_OK;
+ 	    } else {
+-		if (p->type & M_T_BUILTIN)
+-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			       "Not using built-in mode \"%s\" (%s)\n",
+-			       p->name, xf86ModeStatusToString(status));
+-		else if (p->type & M_T_DEFAULT)
+-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			       "Not using default mode \"%s\" (%s)\n", p->name,
+-			       xf86ModeStatusToString(status));
+-		else
+-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			       "Not using mode \"%s\" (%s)\n", p->name,
+-			       xf86ModeStatusToString(status));
++		printModeRejectMessage(scrp->scrnIndex, p, status);
+ 	    }
+ 	}
+ 
+@@ -1615,18 +1682,7 @@
+ 	repeat = FALSE;
+     lookupNext:
+ 	if (repeat && ((status = p->status) != MODE_OK)) {
+-		if (p->type & M_T_BUILTIN)
+-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			       "Not using built-in mode \"%s\" (%s)\n",
+-			       p->name, xf86ModeStatusToString(status));
+-		else if (p->type & M_T_DEFAULT)
+-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			       "Not using default mode \"%s\" (%s)\n", p->name,
+-			       xf86ModeStatusToString(status));
+-		else
+-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			       "Not using mode \"%s\" (%s)\n", p->name,
+-			       xf86ModeStatusToString(status));
++	    printModeRejectMessage(scrp->scrnIndex, p, status);
+ 	}
+ 	saveType = p->type;
+ 	status = xf86LookupMode(scrp, p, clockRanges, strategy);
+@@ -1634,18 +1690,7 @@
+ 	    continue;
+ 	}
+ 	if (status != MODE_OK) {
+-		if (p->type & M_T_BUILTIN)
+-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			       "Not using built-in mode \"%s\" (%s)\n",
+-			       p->name, xf86ModeStatusToString(status));
+-		else if (p->type & M_T_DEFAULT)
+-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			       "Not using default mode \"%s\" (%s)\n", p->name,
+-			       xf86ModeStatusToString(status));
+-		else
+-		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			       "Not using mode \"%s\" (%s)\n", p->name,
+-			       xf86ModeStatusToString(status));
++	    printModeRejectMessage(scrp->scrnIndex, p, status);
+ 	}
+ 	if (status == MODE_ERROR) {
+ 	    ErrorF("xf86ValidateModes: "
+@@ -1841,20 +1886,6 @@
+ 	    return;
+ 	n = p->next;
+ 	if (p->status != MODE_OK) {
+-#if 0
+-	    if (p->type & M_T_BUILTIN)
+-		xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			   "Not using built-in mode \"%s\" (%s)\n", p->name,
+-			   xf86ModeStatusToString(p->status));
+-	    else if (p->type & M_T_DEFAULT)
+-		xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			   "Not using default mode \"%s\" (%s)\n", p->name,
+-			   xf86ModeStatusToString(p->status));
+-	    else
+-	        xf86DrvMsg(scrp->scrnIndex, X_INFO,
+-			   "Not using mode \"%s\" (%s)\n", p->name,
+-			   xf86ModeStatusToString(p->status));
+-#endif
+ 	    xf86DeleteMode(&(scrp->modes), p);
+ 	}
+ 	p = n;
+@@ -1991,6 +2022,8 @@
+ 	    prefix = "Built-in mode";
+ 	else if (p->type & M_T_DEFAULT)
+ 	    prefix = "Default mode";
++	else if (p->type & M_T_DRIVER)
++	    prefix = "Driver mode";
+ 	else
+ 	    prefix = "Mode";
+ 	if (p->type & M_T_USERDEF)
+--- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.infer-virtual	2006-08-17 16:55:43.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-17 16:55:43.000000000 -0400
 @@ -127,9 +127,8 @@
  /*
   * TODO:
@@ -122,7 +242,19 @@
  {
      DisplayModePtr Mode;
  
-@@ -217,7 +218,9 @@
+@@ -205,9 +206,8 @@
+     
+     /* We only do seperate sync currently */
+     if (timing->sync != 0x03) {
+-         xf86DrvMsg(scrnIndex, X_INFO, "%s: Ignoring: We only handle seperate"
+-                    " sync.\n", __func__);
+-         return NULL;
++         xf86DrvMsg(scrnIndex, X_INFO, "%s: %dx%d Warning: We only handle seperate"
++                    " sync.\n", __func__, timing->h_active, timing->v_active);
+     }
+     
+     Mode = xnfalloc(sizeof(DisplayModeRec));
+@@ -217,7 +217,9 @@
      xf86snprintf(Mode->name, 20, "%dx%d", timing->h_active,
                   timing->v_active);
      
@@ -133,7 +265,7 @@
      
      Mode->Clock = timing->clock / 1000.0;
      
-@@ -302,6 +305,7 @@
+@@ -302,6 +304,7 @@
      DisplayModePtr Modes = NULL, Mode;
      int i, clock;
      Bool have_hsync = FALSE, have_vrefresh = FALSE;
@@ -141,7 +273,7 @@
      
      if (!Monitor || !DDC)
          return;
-@@ -382,7 +386,9 @@
+@@ -382,7 +385,9 @@
              break;
          case DT:
              Mode = DDCModeFromDetailedTiming(scrnIndex, 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- xorg-x11-server.spec	15 Aug 2006 18:52:02 -0000	1.148
+++ xorg-x11-server.spec	18 Aug 2006 00:52:50 -0000	1.149
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   21%{?dist}
+Release:   22%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -63,7 +63,7 @@
 Patch3011:  xorg-x11-server-1.1.1-defaultdepth-24.patch
 Patch3012:  xorg-x11-server-1.1.1-always-mouse-thyself.patch
 Patch3013:  xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch
-#Patch3013:  xorg-x11-server-1.1.1-infer-virtual.patch
+Patch3014:  xorg-x11-server-1.1.1-infer-virtual.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -363,6 +363,7 @@
 %patch3011 -p1 -b .defaultdepth
 %patch3012 -p1 -b .mouse-thyself
 %patch3013 -p1 -b .mouse-device
+%patch3014 -p1 -b .infer-virtual
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -692,6 +693,14 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Thu Aug 17 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-22.fc6
+- xorg-x11-server-1.1.1-infer-virtual.patch: When no modes or virtual size
+  are given in the config file, attempt to pick a sensible one by examining
+  the EDID modes and physical geometry.  Also generally make the server
+  aware of driver-provided modes.
+- xorg-x11-server-1.1.1-edid-quirks-list.patch: Redo, since the property I was
+  checking for is both fairly common and fairly predictable.  
+
 * Tue Aug 15 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-21.fc6
 - xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch: Added.
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 00:56:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 20:56:11 -0400
Subject: rpms/xchat/devel xchat-2.6.6-fi.patch, NONE, 1.1
	xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch,
	NONE,
	1.1 xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch,
	NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 xchat.spec, 1.54, 1.55
	xchat-2.0.9-simplify-to-use-gnome-open-for-default-webbrowser.patch,
	1.2, NONE
	xchat-2.0.9-simplify-to-use-htmlview-for-default-webbrowser.patch,
	1.2, NONE
Message-ID: <200608180056.k7I0uBMv002485@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/xchat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2382

Modified Files:
	.cvsignore sources xchat.spec 
Added Files:
	xchat-2.6.6-fi.patch 
	xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch 
	xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch 
Removed Files:
	xchat-2.0.9-simplify-to-use-gnome-open-for-default-webbrowser.patch 
	xchat-2.0.9-simplify-to-use-htmlview-for-default-webbrowser.patch 
Log Message:
- disable gtkspell because it breaks Input Method commit
- apply upstream fi patch
- Update to 2.6.6


xchat-2.6.6-fi.patch:
 fi.po |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xchat-2.6.6-fi.patch ---
#
# Fixes an error in the Finnish translation that would
# cause highlighted messages not to wrap properly.
#
--- xchat-2.6.6/po/fi.po	2006-07-18 12:50:31.000000000 +1000
+++ xchat-2.6.6p1/po/fi.po	2006-07-30 12:51:16.000000000 +1000
@@ -734,7 +734,7 @@
 
 #: src/common/textevents.h:63
 msgid "$4%C21%B%H<%H$1%H>%H%O%C21$t$2"
-msgstr "$4%C21%B%H<%H$1%H%O%C21$t$2"
+msgstr "$4%C21%B%H<%H$1%H>%H%O%C21$t$2"
 
 #: src/common/textevents.h:66
 msgid "%C28-%C29$1/$2%C28-%O$t$3"


xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch:
 xchat.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch ---
--- xchat-2.6.6/src/common/xchat.c.orig	2006-08-02 23:07:47.000000000 -0400
+++ xchat-2.6.6/src/common/xchat.c	2006-08-02 23:10:16.000000000 -0400
@@ -578,7 +578,7 @@
 #ifdef WIN32
 static char defaultconf_urlhandlers[] =
 	"NAME Connect as IRC server\n"		"CMD url %s\n\n";
-#else
+#elif 0
 static char defaultconf_urlhandlers[] =
 	"NAME SUB\n"								"CMD Epiphany...\n\n"\
 		"NAME Open\n"							"CMD !epiphany '%s'\n\n"\
@@ -626,6 +626,9 @@
 		"NAME Ping\n"							"CMD !"XTERM"ping -c 4 %s\n\n"\
 	"NAME ENDSUB\n"							"CMD \n\n"\
 	"NAME Connect as IRC server\n"		"CMD url %s\n\n";
+#else
+static char defaultconf_urlhandlers[] =
+	"NAME Open URL in Web Browser\n"	"CMD !gnome-open '%s'\n\n";
 #endif
 #endif
 

xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch:
 xchat.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch ---
--- xchat-2.6.6/src/common/xchat.c.orig	2006-08-02 23:07:47.000000000 -0400
+++ xchat-2.6.6/src/common/xchat.c	2006-08-02 23:10:16.000000000 -0400
@@ -578,7 +578,7 @@
 #ifdef WIN32
 static char defaultconf_urlhandlers[] =
 	"NAME Connect as IRC server\n"		"CMD url %s\n\n";
-#else
+#elif 0
 static char defaultconf_urlhandlers[] =
 	"NAME SUB\n"								"CMD Epiphany...\n\n"\
 		"NAME Open\n"							"CMD !epiphany '%s'\n\n"\
@@ -626,6 +626,9 @@
 		"NAME Ping\n"							"CMD !"XTERM"ping -c 4 %s\n\n"\
 	"NAME ENDSUB\n"							"CMD \n\n"\
 	"NAME Connect as IRC server\n"		"CMD url %s\n\n";
+#else
+static char defaultconf_urlhandlers[] =
+	"NAME Open URL in Web Browser\n"	"CMD !htmlview '%s'\n\n";
 #endif
 #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	10 Nov 2005 16:48:03 -0000	1.21
+++ .cvsignore	18 Aug 2006 00:56:08 -0000	1.22
@@ -1,4 +1 @@
-xchat-2.4.3.tar.bz2
-xchat-2.4.4.tar.bz2
-xchat-2.4.5.tar.bz2
-xchat-2.6.0.tar.bz2
+xchat-2.6.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	10 Nov 2005 16:48:03 -0000	1.21
+++ sources	18 Aug 2006 00:56:08 -0000	1.22
@@ -1 +1 @@
-0c827bf6df0572231cbbb1e25965fb61  xchat-2.6.0.tar.bz2
+43c187582beb31e744c4c5a833a022b5  xchat-2.6.6.tar.bz2


Index: xchat.spec
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xchat.spec	19 Jul 2006 15:18:39 -0000	1.54
+++ xchat.spec	18 Aug 2006 00:56:08 -0000	1.55
@@ -4,29 +4,30 @@
 
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
-Version:   2.6.0
-Release:   6
+Version:   2.6.6
+Release:   2%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
 URL:       http://www.xchat.org
-Source:    http://www.xchat.org/files/source/2.0/xchat-%{version}.tar.bz2
+Source:    http://www.xchat.org/files/source/2.6/xchat-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 # Patches 0-9 reserved for official xchat.org patches
 
 Patch10: xchat-2.4.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
 Patch19: xchat-2.0.2-freenode.patch
-Patch22: xchat-2.0.9-simplify-to-use-gnome-open-for-default-webbrowser.patch
-Patch23: xchat-2.0.9-simplify-to-use-htmlview-for-default-webbrowser.patch
+Patch22: xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch
+Patch23: xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch
 Patch33: xchat-2.4.3-im_context_filter_keypress.patch
 # filed as 1262423 in the xchat bug tracker
 Patch34: xchat-2.4.4-unrealize.patch
 
-Patch35: xchat-2.6.0-dbus-api.patch
+# upstream 2.6.6 fi patch
+Patch35: xchat-2.6.6-fi.patch
 
 BuildRequires: perl python-devel openssl-devel pkgconfig
-BuildRequires: GConf2-devel
+BuildRequires: GConf2-devel, gtkspell-devel
 BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
 BuildRequires: glib2-devel >= 2.0.3, gtk2-devel >= 2.0.3, bison >= 1.35
 BuildRequires: gettext /bin/sed
@@ -35,6 +36,7 @@
 Requires(post): GConf2
 # Ensure that a compatible libperl is installed
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: gtkspell
 
 %description
 X-Chat is an easy to use graphical IRC chat client for the X Window
@@ -53,7 +55,7 @@
 %endif
 %patch33 -p1 -b .im_context_filter_keypress
 %patch34 -p1 -b .unrealize
-%patch35 -p1 -b .dbus-api
+%patch35 -p1 -b .fi266
 
 %build
 # Remove CVS files from source dirs so they're not installed into doc dirs.
@@ -67,7 +69,10 @@
            --enable-openssl \
            --enable-python \
 	   --disable-tcl \
-           --enable-ipv6
+           --enable-ipv6 
+
+# Spell checking breaks Input Method commit with ENTER
+#           --enable-spell=gtkspell
 
 make %{?_smp_mflags}
 
@@ -112,6 +117,15 @@
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 
 %changelog
+* Thu Aug 17 2006 Warren Togami <wtogami at redhat.com> - 1:2.6.6-2
+- disable gtkspell because it breaks Input Method commit
+- apply upstream fi patch
+
+* Wed Aug  2 2006 Marc Deslauriers <marcdeslauriers at videotron.ca> -  1:2.6.6-1
+- Update to 2.6.6
+- Removed upstreamed dbus patch
+- Enabled gtkspell support
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> -  1:2.6.0-6
 - Rebuild against dbus
 


--- xchat-2.0.9-simplify-to-use-gnome-open-for-default-webbrowser.patch DELETED ---


--- xchat-2.0.9-simplify-to-use-htmlview-for-default-webbrowser.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 18 01:36:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 21:36:33 -0400
Subject: rpms/compiz/devel resize-move-keybindings.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 aiglx-defaults.patch, 1.1,
	1.2 compiz.spec, 1.18, 1.19 composite-cube-logo.patch, 1.2,
	1.3 fbconfig-depth-fix.patch, 1.2, 1.3 fedora-logo.patch, 1.2,
	1.3 gl-include-inferiors.patch, 1.2, 1.3 glfinish.patch, 1.1,
	1.2 sources, 1.5, 1.6 tfp-server-extension.patch, 1.2, 1.3
Message-ID: <200608180136.k7I1aXDt028384@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28353

Modified Files:
	.cvsignore aiglx-defaults.patch compiz.spec 
	composite-cube-logo.patch fbconfig-depth-fix.patch 
	fedora-logo.patch gl-include-inferiors.patch glfinish.patch 
	sources tfp-server-extension.patch 
Added Files:
	resize-move-keybindings.patch 
Log Message:
* Thu Aug 17 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.16.20060817git.fc6
- Rebase to latest upstream changes which has the rest of the bindings
  rewrite.  Add resize-move-keybindings.patch to make move and resize
  bindings work like metacity.
- Add back scale plugin.


resize-move-keybindings.patch:
 include/compiz.h |   27 +++++---
 plugins/move.c   |    6 +
 plugins/resize.c |  177 ++++++++++++++++++++++++++++++++++++++-----------------
 src/display.c    |    1 
 src/event.c      |    9 ++
 src/screen.c     |   21 +++++-
 6 files changed, 174 insertions(+), 67 deletions(-)

--- NEW FILE resize-move-keybindings.patch ---
Update keybindings for move and resize to work like metacity.

From: Kristian H??gsberg <krh at redhat.com>


---

 include/compiz.h |   27 +++++---
 plugins/move.c   |    6 ++
 plugins/resize.c |  177 ++++++++++++++++++++++++++++++++++++++----------------
 src/display.c    |    1 
 src/event.c      |    9 ++-
 src/screen.c     |   21 +++++-
 6 files changed, 174 insertions(+), 67 deletions(-)

diff --git a/include/compiz.h b/include/compiz.h
index 87dd6d4..7a8291b 100644
--- a/include/compiz.h
+++ b/include/compiz.h
@@ -280,15 +280,17 @@ typedef enum {
 } CompBindingType;
 
 typedef enum {
-    CompActionStateInitKey     = 1 << 0,
-    CompActionStateTermKey     = 1 << 1,
-    CompActionStateInitButton  = 1 << 2,
-    CompActionStateTermButton  = 1 << 3,
-    CompActionStateInitBell    = 1 << 4,
-    CompActionStateInitEdge    = 1 << 5,
-    CompActionStateTermEdge    = 1 << 6,
-    CompActionStateInitEdgeDnd = 1 << 7,
-    CompActionStateTermEdgeDnd = 1 << 8
+    CompActionStateInitKey     = 1 <<  0,
+    CompActionStateTermKey     = 1 <<  1,
+    CompActionStateInitButton  = 1 <<  2,
+    CompActionStateTermButton  = 1 <<  3,
+    CompActionStateInitBell    = 1 <<  4,
+    CompActionStateInitEdge    = 1 <<  5,
+    CompActionStateTermEdge    = 1 <<  6,
+    CompActionStateInitEdgeDnd = 1 <<  7,
+    CompActionStateTermEdgeDnd = 1 <<  8,
+    CompActionStateCommit      = 1 <<  9,
+    CompActionStateCancel      = 1 << 10
 } CompActionState;
 
 typedef struct _CompKeyBinding {
@@ -680,6 +682,7 @@ struct _CompDisplay {
     unsigned int    ignoredModMask;
 
     KeyCode escapeKeyCode;
+    KeyCode returnKeyCode;
 
     CompOption opt[COMP_DISPLAY_OPTION_NUM];
 
@@ -1304,7 +1307,6 @@ struct _CompScreen {
     CompTexture       backgroundTexture;
     unsigned int      pendingDestroys;
     int		      desktopWindowCount;
-    KeyCode	      escapeKeyCode;
     unsigned int      mapNum;
     unsigned int      activeNum;
 
@@ -1490,6 +1492,11 @@ pushScreenGrab (CompScreen *s,
 		const char *name);
 
 void
+updateScreenGrab (CompScreen *s,
+		  int        index,
+		  Cursor     cursor);
+
+void
 removeScreenGrab (CompScreen *s,
 		  int	     index,
 		  XPoint     *restorePointer);
diff --git a/plugins/move.c b/plugins/move.c
index a572103..1bf66cf 100644
--- a/plugins/move.c
+++ b/plugins/move.c
@@ -210,6 +210,12 @@ moveTerminate (CompDisplay     *d,
 
 	(md->w->screen->windowUngrabNotify) (md->w);
 
+	if (state & CompActionStateCancel)
+	    moveWindow (md->w,
+			md->w->serverX - md->w->attrib.x,
+			md->w->serverY - md->w->attrib.y,
+			TRUE, FALSE);
+
 	syncWindowPosition (md->w);
 
 	if (ms->grabIndex)
diff --git a/plugins/resize.c b/plugins/resize.c
index f838da6..5b079fd 100644
--- a/plugins/resize.c
+++ b/plugins/resize.c
@@ -43,14 +43,16 @@ #define RESIZE_INITIATE_KEY_DEFAULT     
 #define RESIZE_INITIATE_KEY_MODIFIERS_DEFAULT CompAltMask
 
 struct _ResizeKeys {
-    char *name;
-    int  dx;
-    int  dy;
+    char	 *name;
+    int		 dx;
+    int		 dy;
+    unsigned int warpMask;
+    unsigned int resizeMask;
 } rKeys[] = {
-    { "Left",  -1,  0 },
-    { "Right",  1,  0 },
-    { "Up",     0, -1 },
-    { "Down",   0,  1 }
+    { "Left",  -1,  0, ResizeLeftMask | ResizeRightMask, ResizeLeftMask },
+    { "Right",  1,  0, ResizeLeftMask | ResizeRightMask, ResizeRightMask },
+    { "Up",     0, -1, ResizeUpMask | ResizeDownMask,    ResizeUpMask },
+    { "Down",   0,  1, ResizeUpMask | ResizeDownMask,    ResizeDownMask }
 };
 
 #define NUM_KEYS (sizeof (rKeys) / sizeof (rKeys[0]))
@@ -69,12 +71,13 @@ typedef struct _ResizeDisplay {
     int		    screenPrivateIndex;
     HandleEventProc handleEvent;
 
-    CompWindow	 *w;
-    int		 releaseButton;
-    unsigned int mask;
-    int		 width;
-    int		 height;
-    KeyCode      key[NUM_KEYS];
+    CompWindow	      *w;
+    XWindowAttributes savedAttrib;
+    int		      releaseButton;
+    unsigned int      mask;
+    int		      width;
+    int		      height;
+    KeyCode	      key[NUM_KEYS];
 } ResizeDisplay;
 
 typedef struct _ResizeScreen {
@@ -88,6 +91,8 @@ typedef struct _ResizeScreen {
     Cursor downCursor;
     Cursor downLeftCursor;
     Cursor downRightCursor;
+    Cursor middleCursor;
+    Cursor cursor[NUM_KEYS];
 } ResizeScreen;
 
 #define GET_RESIZE_DISPLAY(d)				       \
@@ -139,10 +144,16 @@ resizeInitiate (CompDisplay     *d,
 
 	mask = getIntOptionNamed (option, nOption, "direction", 0);
 
-	/* Initiate the resize in the direction suggested by the quarter
-	 * of the window the mouse is in, eg drag in top left will resize
-	 * up and to the left. */
-	if (!mask)
+	/* Initiate the resize in the direction suggested by the
+	 * quarter of the window the mouse is in, eg drag in top left
+	 * will resize up and to the left.  Keyboard resize starts out
+	 * with the cursor in the middle of the window and then starts
+	 * resizing the edge corresponding to the next key press. */
+	if (state & CompActionStateInitKey)
+	{
+	    mask = 0;
+	}
+	else if (!mask)
 	{
 	    mask |= ((x - w->attrib.x) < (w->width / 2)) ?
 		ResizeLeftMask : ResizeRightMask;
@@ -171,10 +182,11 @@ resizeInitiate (CompDisplay     *d,
 	if (w->shaded)
 	    mask &= ~(ResizeUpMask | ResizeDownMask);
 
-	rd->w	   = w;
-	rd->mask   = mask;
-	rd->width  = w->attrib.width;
-	rd->height = w->attrib.height;
+	rd->w	        = w;
+	rd->mask        = mask;
+	rd->width       = w->attrib.width;
+	rd->height      = w->attrib.height;
+	rd->savedAttrib = w->attrib;
 
 	lastPointerX = x;
 	lastPointerY = y;
@@ -183,7 +195,11 @@ resizeInitiate (CompDisplay     *d,
 	{
 	    Cursor cursor;
 
-	    if (mask & ResizeLeftMask)
+	    if (state & CompActionStateInitKey)
+	    {
+		cursor = rs->middleCursor;
+	    }
+	    else if (mask & ResizeLeftMask)
 	    {
 		if (mask & ResizeDownMask)
 		    cursor = rs->downLeftCursor;
@@ -251,14 +267,32 @@ resizeTerminate (CompDisplay	 *d,
 
 	(rd->w->screen->windowUngrabNotify) (rd->w);
 
+	if (state & CompActionStateCancel)
+	{
+	    XWindowChanges xwc;
+
+	    sendSyncRequest (rd->w);
+
+	    xwc.x      = rd->savedAttrib.x;
+	    xwc.y      = rd->savedAttrib.y;
+	    xwc.width  = rd->savedAttrib.width;
+	    xwc.height = rd->savedAttrib.height;
+
+	    XConfigureWindow (d->display, rd->w->id,
+			      CWX | CWY | CWWidth | CWHeight,
+			      &xwc);
+	}
+	else
+	{
+	    syncWindowPosition (rd->w);
+	}
+
 	if (rs->grabIndex)
 	{
 	    removeScreenGrab (rd->w->screen, rs->grabIndex, NULL);
 	    rs->grabIndex = 0;
 	}
 
-	syncWindowPosition (rd->w);
-
 	rd->w		  = 0;
 	rd->releaseButton = 0;
     }
@@ -363,6 +397,63 @@ #undef CLAMP
     *newHeight = height;
 }
 
+
+static void
+resizeHandleKeyEvent (CompScreen *s,
+		      KeyCode	 keycode)
+{
+    RESIZE_SCREEN (s);
+    RESIZE_DISPLAY (s->display);
+
+    if (rs->grabIndex && rd->w)
+    {
+	CompWindow *w;
+	int i, widthInc, heightInc;
+
+	w = rd->w;
+
+	widthInc  = w->sizeHints.width_inc;
+	heightInc = w->sizeHints.height_inc;
+
+	if (widthInc < MIN_KEY_WIDTH_INC)
+	    widthInc = MIN_KEY_WIDTH_INC;
+
+	if (heightInc < MIN_KEY_HEIGHT_INC)
+	    heightInc = MIN_KEY_HEIGHT_INC;
+
+	for (i = 0; i < NUM_KEYS; i++)
+	{
+	    if (keycode != rd->key[i])
+	      continue;
+
+	    if (rd->mask & rKeys[i].warpMask)
+	    {
+		XWarpPointer (s->display->display, None, None, 0, 0, 0, 0,
+			      rKeys[i].dx * widthInc,
+			      rKeys[i].dy * heightInc);
+	    }
+	    else
+	    {
+		int x, y, left, top, width, height;
+
+		left   = w->attrib.x - w->input.left;
+		top    = w->attrib.y - w->input.top;
+		width  = w->input.left + w->attrib.width  + w->input.right;
+		height = w->input.top  + w->attrib.height + w->input.bottom;
+
+		x = left + width  * (rKeys[i].dx + 1) / 2;
+		y = top  + height * (rKeys[i].dy + 1) / 2;
+
+		warpPointer (s->display, x - pointerX, y - pointerY);
+		rd->mask = rKeys[i].resizeMask;
+		updateScreenGrab (s, rs->grabIndex, rs->cursor[i]);
+	    }
+			    
+	    break;
+	}
+    }
+}
+
 static void
 resizeHandleMotionEvent (CompScreen *s,
 			 int	    xRoot,
@@ -416,37 +507,11 @@ resizeHandleEvent (CompDisplay *d,
 
     switch (event->type) {
     case KeyPress:
-    case KeyRelease:
 	s = findScreenAtDisplay (d, event->xkey.root);
 	if (s)
-	{
-	    RESIZE_SCREEN (s);
-
-	    if (rs->grabIndex && rd->w && event->type == KeyPress)
-	    {
-		int i, widthInc, heightInc;
-
-		widthInc  = rd->w->sizeHints.width_inc;
-		heightInc = rd->w->sizeHints.height_inc;
-
-		if (widthInc < MIN_KEY_WIDTH_INC)
-		    widthInc = MIN_KEY_WIDTH_INC;
-
-		if (heightInc < MIN_KEY_HEIGHT_INC)
-		    heightInc = MIN_KEY_HEIGHT_INC;
-
-		for (i = 0; i < NUM_KEYS; i++)
-		{
-		    if (event->xkey.keycode == rd->key[i])
-		    {
-			XWarpPointer (d->display, None, None, 0, 0, 0, 0,
-				      rKeys[i].dx * widthInc,
-				      rKeys[i].dy * heightInc);
-			break;
-		    }
-		}
-	    }
-	}
+	    resizeHandleKeyEvent (s, event->xkey.keycode);
+	break;
+    case KeyRelease:
 	break;
     case ButtonRelease: {
 	CompAction *action =
@@ -739,6 +804,12 @@ resizeInitScreen (CompPlugin *p,
 					     XC_bottom_left_corner);
     rs->downRightCursor = XCreateFontCursor (s->display->display,
 					     XC_bottom_right_corner);
+    rs->middleCursor    = XCreateFontCursor (s->display->display, XC_fleur);
+
+    rs->cursor[0] = rs->leftCursor;
+    rs->cursor[1] = rs->rightCursor;
+    rs->cursor[2] = rs->upCursor;
+    rs->cursor[3] = rs->downCursor;
 
     addScreenAction (s, &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.action);
 
diff --git a/src/display.c b/src/display.c
index c44b2a2..cb73719 100644
--- a/src/display.c
+++ b/src/display.c
@@ -2632,6 +2632,7 @@ #endif
     compDisplays = d;
 
     d->escapeKeyCode = XKeysymToKeycode (dpy, XStringToKeysym ("Escape"));
+    d->returnKeyCode = XKeysymToKeycode (dpy, XStringToKeysym ("Return"));
 
     {
 	XSetWindowAttributes attr;
diff --git a/src/event.c b/src/event.c
index 8192329..5eb5152 100644
--- a/src/event.c
+++ b/src/event.c
@@ -323,7 +323,13 @@ triggerKeyPressBindings (CompDisplay *d,
     unsigned int    modMask = REAL_MOD_MASK & ~d->ignoredModMask;
     unsigned int    bindMods;
 
+    state = 0;
     if (event->xkey.keycode == d->escapeKeyCode)
+	state = CompActionStateCancel;
+    else if (event->xkey.keycode == d->returnKeyCode)
+	state = CompActionStateCommit;
+
+    if (state)
     {
 	while (nOption--)
 	{
@@ -331,7 +337,7 @@ triggerKeyPressBindings (CompDisplay *d,
 	    {
 		if (option->value.action.terminate)
 		    (*option->value.action.terminate) (d, &option->value.action,
-						       0, NULL, 0);
+						       state, NULL, 0);
 	    }
 
 	    option++;
@@ -340,6 +346,7 @@ triggerKeyPressBindings (CompDisplay *d,
 	return FALSE;
     }
 
+    state = CompActionStateInitKey;
     while (nOption--)
     {
 	if (isInitiateBinding (option, CompBindingTypeKey, state, &action))
diff --git a/src/screen.c b/src/screen.c
index 75c6abc..769a3f1 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -979,9 +979,6 @@ addScreen (CompDisplay *display,
     s->wmSnAtom		   = wmSnAtom;
     s->wmSnTimestamp	   = wmSnTimestamp;
 
-    s->escapeKeyCode = XKeysymToKeycode (display->display,
-					 XStringToKeysym ("Escape"));
-
     s->damageMask  = COMP_SCREEN_DAMAGE_ALL_MASK;
     s->next	   = 0;
     s->exposeRects = 0;
@@ -1817,6 +1814,24 @@ pushScreenGrab (CompScreen *s,
 }
 
 void
+updateScreenGrab (CompScreen *s,
+		  int        index,
+		  Cursor     cursor)
+{
+  index--;
+
+#ifdef DEBUG
+    if (index < 0 || index >= s->maxGrab)
+	abort ();
+#endif
+
+  XChangeActivePointerGrab (s->display->display, POINTER_GRAB_MASK,
+			    cursor, CurrentTime);
+
+  s->grabs[index].cursor = cursor;
+}
+
+void
 removeScreenGrab (CompScreen *s,
 		  int	     index,
 		  XPoint     *restorePointer)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Aug 2006 21:31:21 -0000	1.5
+++ .cvsignore	18 Aug 2006 01:36:27 -0000	1.6
@@ -1,3 +1 @@
-compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
-desktop-effects-0.6.tar.gz
-desktop-effects-0.6.1.tar.gz
+compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2

aiglx-defaults.patch:
 main.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

Index: aiglx-defaults.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/aiglx-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aiglx-defaults.patch	18 Jul 2006 17:15:07 -0000	1.1
+++ aiglx-defaults.patch	18 Aug 2006 01:36:27 -0000	1.2
@@ -9,10 +9,10 @@
  1 files changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/src/main.c b/src/main.c
-index cf0a5d7..fd7afc3 100644
+index 3d3a9c5..bbafd2b 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -72,8 +72,8 @@ CompWindow *lastFoundWindow = 0;
+@@ -78,8 +78,8 @@ CompWindow *lastFoundWindow = 0;
  CompWindow *lastDamagedWindow = 0;
  
  Bool replaceCurrentWm = FALSE;
@@ -23,7 +23,7 @@
  
  static void
  usage (void)
-@@ -84,8 +84,10 @@ usage (void)
+@@ -90,8 +90,10 @@ usage (void)
  	    "[--refresh-rate RATE]\n       "
  	    "[--fast-filter] "
  	    "[--indirect-rendering] "
@@ -35,7 +35,7 @@
  	    "[--replace] "
  	    "[--sm-disable] "
  	    "[--sm-client-id ID] "
-@@ -176,10 +178,18 @@ main (int argc, char **argv)
+@@ -182,10 +184,18 @@ main (int argc, char **argv)
  	{
  	    indirectRendering = TRUE;
  	}


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- compiz.spec	11 Aug 2006 00:17:36 -0000	1.18
+++ compiz.spec	18 Aug 2006 01:36:27 -0000	1.19
@@ -1,7 +1,7 @@
 #						-*- mode: rpm-spec -*-
 
-%define		sha1 fc6b7773fc52f6104b66a9f86c18395f8a958848
-%define		snapshot 20060721
+%define		sha1 3173a142efe5e7af83ebb534a074d9d2a0c67a86
+%define		snapshot 20060817
 
 %define		dialogversion	0.6.1
 
@@ -10,7 +10,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.15.%{snapshot}git.fc5.aiglx
+Release:        0.16.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,7 +42,7 @@
 Patch105: fedora-logo.patch
 Patch106: glfinish.patch
 Patch107: desktop-effects-0.6.1-delete-session.patch
-
+Patch108: resize-move-keybindings.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -81,6 +81,8 @@
 %patch107 -p1 -b .delete-session
 popd
 
+%patch108 -p1 -b .resize-move-keybindings
+
 %build
 %configure --disable-libsvg-cairo
 
@@ -141,6 +143,12 @@
 %{_includedir}/compiz
 
 %changelog
+* Thu Aug 17 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.16.20060817git.fc6
+- Rebase to latest upstream changes which has the rest of the bindings
+  rewrite.  Add resize-move-keybindings.patch to make move and resize
+  bindings work like metacity.
+- Add back scale plugin.
+
 * Thu Aug 10 2006 Ray Strode <rstrode at redhat.com> 0.0.13-0.15.20060721git.fc5.aiglx
 - Add Requires: gnome-session 2.15.90-2.fc6 (bug 201473)
 - unlink session file on changing wms (bug 201473)

composite-cube-logo.patch:
 cube.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)

Index: composite-cube-logo.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/composite-cube-logo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- composite-cube-logo.patch	21 Jul 2006 18:59:46 -0000	1.2
+++ composite-cube-logo.patch	18 Aug 2006 01:36:27 -0000	1.3
@@ -9,10 +9,10 @@
  1 files changed, 17 insertions(+), 0 deletions(-)
 
 diff --git a/plugins/cube.c b/plugins/cube.c
-index b222685..0576b8d 100644
+index 31edd5c..339d843 100644
 --- a/plugins/cube.c
 +++ b/plugins/cube.c
-@@ -1204,11 +1204,28 @@ cubePaintTransformedScreen (CompScreen		
+@@ -1162,11 +1162,28 @@ cubePaintTransformedScreen (CompScreen		
  
  	if (cs->invert == 1 && s->size == 4 && cs->texture.name)
  	{

fbconfig-depth-fix.patch:
 screen.c |   10 ++++++++++
 1 files changed, 10 insertions(+)

Index: fbconfig-depth-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/fbconfig-depth-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fbconfig-depth-fix.patch	21 Jul 2006 18:59:46 -0000	1.2
+++ fbconfig-depth-fix.patch	18 Aug 2006 01:36:27 -0000	1.3
@@ -9,7 +9,7 @@
  1 files changed, 10 insertions(+), 0 deletions(-)
 
 diff --git a/src/screen.c b/src/screen.c
-index 14e7083..a9f1b99 100644
+index 9ec30d5..75c6abc 100644
 --- a/src/screen.c
 +++ b/src/screen.c
 @@ -1309,6 +1309,16 @@ addScreen (CompDisplay *display,

fedora-logo.patch:
 cube.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Index: fedora-logo.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/fedora-logo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-logo.patch	21 Jul 2006 18:59:46 -0000	1.2
+++ fedora-logo.patch	18 Aug 2006 01:36:27 -0000	1.3
@@ -5,34 +5,11 @@
 
 ---
 
- plugins/compiz.schemas.in.in |    4 ++--
- plugins/cube.c               |    8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ plugins/cube.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/plugins/compiz.schemas.in.in b/plugins/compiz.schemas.in.in
-index 899622d..dddbfcd 100644
---- a/plugins/compiz.schemas.in.in
-+++ b/plugins/compiz.schemas.in.in
-@@ -913,7 +913,7 @@
-             <applyto>/apps/compiz/plugins/cube/screen0/options/color</applyto>
-             <owner>compiz</owner>
-             <type>string</type>
--            <default>#efebe7ff</default>
-+            <default>#00194aff</default>
-             <locale name="C">
-                 <short>Cube Color</short>
-                 <long>
-@@ -956,7 +956,7 @@
-             <owner>compiz</owner>
-             <type>list</type>
-             <list_type>string</list_type>
--            <default>[novell.png]</default>
-+            <default>[/usr/share/pixmaps/fedora-logo.png]</default>
-             <locale name="C">
-                 <short>Image files</short>
-                 <long>
 diff --git a/plugins/cube.c b/plugins/cube.c
-index 0576b8d..e9e8299 100644
+index 339d843..783b408 100644
 --- a/plugins/cube.c
 +++ b/plugins/cube.c
 @@ -44,14 +44,14 @@ #include <X11/Xproto.h>

gl-include-inferiors.patch:
 include/compiz.h |    2 ++
 src/display.c    |   17 +++++++++++++++++
 2 files changed, 19 insertions(+)

Index: gl-include-inferiors.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/gl-include-inferiors.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gl-include-inferiors.patch	21 Jul 2006 18:59:46 -0000	1.2
+++ gl-include-inferiors.patch	18 Aug 2006 01:36:27 -0000	1.3
@@ -10,10 +10,10 @@
  2 files changed, 19 insertions(+), 0 deletions(-)
 
 diff --git a/include/compiz.h b/include/compiz.h
-index 920d3ce..2e21d44 100644
+index 282878b..87dd6d4 100644
 --- a/include/compiz.h
 +++ b/include/compiz.h
-@@ -664,6 +664,8 @@ struct _CompDisplay {
+@@ -668,6 +668,8 @@ struct _CompDisplay {
  
      GLenum textureFilter;
  
@@ -23,10 +23,10 @@
  
      Window below;
 diff --git a/src/display.c b/src/display.c
-index d1a5664..250abb7 100644
+index 60d340e..7cf12e1 100644
 --- a/src/display.c
 +++ b/src/display.c
-@@ -2021,6 +2021,23 @@ #endif
+@@ -2631,6 +2631,23 @@ #endif
  
      d->escapeKeyCode = XKeysymToKeycode (dpy, XStringToKeysym ("Escape"));
  

glfinish.patch:
 display.c |    2 ++
 1 files changed, 2 insertions(+)

Index: glfinish.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/glfinish.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glfinish.patch	21 Jul 2006 18:59:46 -0000	1.1
+++ glfinish.patch	18 Aug 2006 01:36:27 -0000	1.2
@@ -9,10 +9,10 @@
  1 files changed, 2 insertions(+), 0 deletions(-)
 
 diff --git a/src/display.c b/src/display.c
-index 250abb7..bc9b0bb 100644
+index 7cf12e1..c44b2a2 100644
 --- a/src/display.c
 +++ b/src/display.c
-@@ -1482,6 +1482,8 @@ eventLoop (void)
+@@ -2079,6 +2079,8 @@ eventLoop (void)
  
  		    (*s->donePaintScreen) (s);
  


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Aug 2006 21:31:21 -0000	1.5
+++ sources	18 Aug 2006 01:36:27 -0000	1.6
@@ -1,3 +1 @@
-16382b2db6ffc65161a6edc70559ee67  compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
-101df08c0adb11640e512db33165acf4  desktop-effects-0.6.tar.gz
-85c612c6ad47e31c70f0ba85063882e4  desktop-effects-0.6.1.tar.gz
+ec5b51f98b914af4d51ad53bc832b7e1  compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2

tfp-server-extension.patch:
 screen.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Index: tfp-server-extension.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/tfp-server-extension.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tfp-server-extension.patch	21 Jul 2006 18:59:46 -0000	1.2
+++ tfp-server-extension.patch	18 Aug 2006 01:36:27 -0000	1.3
@@ -9,7 +9,7 @@
  1 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/screen.c b/src/screen.c
-index b9be10b..14e7083 100644
+index 0941107..9ec30d5 100644
 --- a/src/screen.c
 +++ b/src/screen.c
 @@ -897,7 +897,7 @@ addScreen (CompDisplay *display,



From fedora-cvs-commits at redhat.com  Fri Aug 18 01:52:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 21:52:09 -0400
Subject: rpms/compiz/devel sources,1.6,1.7
Message-ID: <200608180152.k7I1q9Mk015776@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15751

Modified Files:
	sources 
Log Message:
Don't leave out desktop-effects tarball.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Aug 2006 01:36:27 -0000	1.6
+++ sources	18 Aug 2006 01:52:07 -0000	1.7
@@ -1 +1,3 @@
 ec5b51f98b914af4d51ad53bc832b7e1  compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2
+85c612c6ad47e31c70f0ba85063882e4  desktop-effects-0.6.1.tar.gz
+



From fedora-cvs-commits at redhat.com  Fri Aug 18 02:03:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 22:03:25 -0400
Subject: rpms/xorg-x11-xinit/devel xinitrc, 1.1, 1.2 xorg-x11-xinit.spec,
	1.28, 1.29
Message-ID: <200608180203.k7I23PeK019153@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19122

Modified Files:
	xinitrc xorg-x11-xinit.spec 
Log Message:
* Thu Aug 17 2006 Kristian H??gsberg <krh at redhat.com> - 1.0.2-9.fc6
- Start ssh-agent for startx also (#169259).



Index: xinitrc
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xinitrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinitrc	1 Nov 2005 02:00:56 -0000	1.1
+++ xinitrc	18 Aug 2006 02:03:22 -0000	1.2
@@ -18,11 +18,11 @@
 # The user may have their own clients they want to run.  If they don't,
 # fall back to system defaults.
 if [ -f $HOME/.Xclients ]; then
-    exec $DBUS_LAUNCH $HOME/.Xclients || \
-    exec $HOME/.Xclients
+    exec $SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients || \
+    exec $SSH_AGENT $HOME/.Xclients
 elif [ -f /etc/X11/xinit/Xclients ]; then
-    exec $DBUS_LAUNCH /etc/X11/xinit/Xclients || \
-    exec /etc/X11/xinit/Xclients
+    exec $SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients || \
+    exec $SSH_AGENT /etc/X11/xinit/Xclients
 else
     # Failsafe settings.  Although we should never get here
     # (we provide fallbacks in Xclients as well) it can't hurt.


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-x11-xinit.spec	22 Jul 2006 20:59:23 -0000	1.28
+++ xorg-x11-xinit.spec	18 Aug 2006 02:03:23 -0000	1.29
@@ -4,7 +4,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: %{xinitver}
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -101,6 +101,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Thu Aug 17 2006 Kristian H??gsberg <krh at redhat.com> - 1.0.2-9.fc6
+- Start ssh-agent for startx also (#169259).
+
 * Sat Jul 22 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-8.fc6
 - Fix SourceN line for localuser.sh to not collide.
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 02:57:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 22:57:47 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.40,
	1.41
Message-ID: <200608180257.k7I2vl6X031473@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31417

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
* Thu Aug 17 2006 Soren Sandmann <sandmann at redhat.com> 7.1.6.fc6
- Don't install xprint headers, as they are being moved to the libXp 
  package instead. Bug 175350.




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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xorg-x11-proto-devel.spec	27 Jul 2006 20:33:49 -0000	1.40
+++ xorg-x11-proto-devel.spec	18 Aug 2006 02:57:44 -0000	1.41
@@ -70,7 +70,7 @@
 X.Org X11 Protocol headers
 
 %prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
+%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
 
 %build
 #ls -al
@@ -142,8 +142,6 @@
 %{_includedir}/X11/dri/xf86dristr.h
 %dir %{_includedir}/X11/extensions
 %{_includedir}/X11/extensions/MITMisc.h
-%{_includedir}/X11/extensions/Print.h
-%{_includedir}/X11/extensions/Printstr.h
 %{_includedir}/X11/extensions/XEVI.h
 %{_includedir}/X11/extensions/XEVIstr.h
 %{_includedir}/X11/extensions/XI.h
@@ -262,7 +260,6 @@
 %{_libdir}/pkgconfig/glproto.pc
 %{_libdir}/pkgconfig/inputproto.pc
 %{_libdir}/pkgconfig/kbproto.pc
-%{_libdir}/pkgconfig/printproto.pc
 %{_libdir}/pkgconfig/randrproto.pc
 %{_libdir}/pkgconfig/recordproto.pc
 %{_libdir}/pkgconfig/renderproto.pc
@@ -283,6 +280,10 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Aug 17 2006 Soren Sandmann <sandmann at redhat.com> 7.1.6.fc6
+- Don't install xprint headers, as they are being moved to the libXp 
+  package instead. Bug 175350.
+
 * Thu Jul 27 2006 Mike A. Harris <mharris at redhat.com> 7.1-5.fc6
 - Don't install LBX protocol headers, as LBX is obsoleted in the 7.1 release
   and no longer supported.



From fedora-cvs-commits at redhat.com  Fri Aug 18 03:00:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 23:00:56 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.41,
	1.42
Message-ID: <200608180300.k7I30udg032577@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32559

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
Bump release number


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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xorg-x11-proto-devel.spec	18 Aug 2006 02:57:44 -0000	1.41
+++ xorg-x11-proto-devel.spec	18 Aug 2006 03:00:54 -0000	1.42
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -280,7 +280,7 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
-* Thu Aug 17 2006 Soren Sandmann <sandmann at redhat.com> 7.1.6.fc6
+* Thu Aug 17 2006 Soren Sandmann <sandmann at redhat.com> 7.1-6.fc6
 - Don't install xprint headers, as they are being moved to the libXp 
   package instead. Bug 175350.
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 03:36:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 17 Aug 2006 23:36:44 -0400
Subject: rpms/libXp/devel .cvsignore, 1.5, 1.6 libXp.spec, 1.15, 1.16 sources,
	1.6, 1.7
Message-ID: <200608180336.k7I3aiGp028728@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28710

Modified Files:
	.cvsignore libXp.spec sources 
Log Message:
* Thu Aug 17 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-5
- Moved Print.h, Printstr.h and printproto.pc into the devel package here
  (they used to be in xorg-x11-proto-devel). 




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Dec 2005 11:08:46 -0000	1.5
+++ .cvsignore	18 Aug 2006 03:36:42 -0000	1.6
@@ -1 +1,2 @@
 libXp-1.0.0.tar.bz2
+printproto-1.0.3.tar.bz2


Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXp.spec	12 Jul 2006 07:10:55 -0000	1.15
+++ libXp.spec	18 Aug 2006 03:36:42 -0000	1.16
@@ -12,13 +12,14 @@
 Summary: X.Org X11 libXp runtime library
 Name: libXp
 Version: 1.0.0
-Release: 4.1
+Release: 5
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/proto/printproto-1.0.3.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -49,7 +50,7 @@
 %endif
 
 %prep
-%setup -q
+%setup -q -b0 -b1
 
 # Disable static library creation by default.
 %define with_static 0
@@ -61,6 +62,10 @@
 %endif
 make
 
+pushd ../printproto-1.0.3
+%configure
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,6 +79,11 @@
    rm -rf $RPM_BUILD_ROOT%{_mandir}
 }
 %endif
+
+pushd ../printproto-1.0.3
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+
 # Don't encourage people to use the deprecated Xprint APIs.
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 
@@ -98,6 +108,9 @@
 %if %{with_static}
 %{_libdir}/libXp.a
 %endif
+%{_includedir}/X11/extensions/Print.h
+%{_includedir}/X11/extensions/Printstr.h
+%{_libdir}/pkgconfig/printproto.pc
 # FIXME: Should we remove the shared lib during deprecation, so that things
 # that keep linking to libXp, will always get the static lib and not break
 # when we eventually drop libXp?
@@ -108,6 +121,10 @@
 %endif
 
 %changelog
+* Thu Aug 17 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-5
+- Moved Print.h, Printstr.h and printproto.pc into the devel package here
+  (they used to be in xorg-x11-proto-devel). 
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 22:28:04 -0000	1.6
+++ sources	18 Aug 2006 03:36:42 -0000	1.7
@@ -1 +1,2 @@
 0f4ac39108c1ae8c443cdfac259b58fa  libXp-1.0.0.tar.bz2
+0f4e7982c6d4ec3b2cf38502dd1293a3  printproto-1.0.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 18 05:03:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 01:03:09 -0400
Subject: rpms/gtk2/devel .cvsignore, 1.58, 1.59 gtk2.spec, 1.169,
	1.170 sources, 1.63, 1.64
Message-ID: <200608180503.k7I539TB004988@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4938

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	24 Jul 2006 03:15:53 -0000	1.58
+++ .cvsignore	18 Aug 2006 05:03:05 -0000	1.59
@@ -41,3 +41,4 @@
 gtk+-2.9.4.tar.bz2
 gtk+-2.10.0.tar.bz2
 gtk+-2.10.1.tar.bz2
+gtk+-2.10.2.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- gtk2.spec	14 Aug 2006 17:59:13 -0000	1.169
+++ gtk2.spec	18 Aug 2006 05:03:05 -0000	1.170
@@ -10,16 +10,16 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.10.1
+%define base_version 2.10.2
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
-Source: gtk+-%{version}.tar.bz2
+Source: gtk+-%{version}.tar.gz
 Source1: update-scripts.tar.gz
 
 # Biarch changes
@@ -28,8 +28,6 @@
 Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
 # Filechooser search
 Patch2: gtk+-2.10.1-search.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=346800
-Patch3: gtk+-2.10.1-fix-tree-crash.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -110,7 +108,6 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .search
-%patch3 -p1 -b .fix-tree-crash
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -282,6 +279,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Fri Aug 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.2-1.fc6
+- Update to 2.10.2
+
 * Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.1-3.fc6
 - Fix a problem with the search patch
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	24 Jul 2006 03:15:53 -0000	1.63
+++ sources	18 Aug 2006 05:03:05 -0000	1.64
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-7f1d39031d50de8228211aa3230d4acd  gtk+-2.10.1.tar.bz2
+9039804dfd115e40a70a6ba096f418a2  gtk+-2.10.2.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 18 05:29:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 01:29:54 -0400
Subject: rpms/scim-chewing/FC-5 scim-chewing-0.2.1-LTC23919.patch, NONE,
	1.1 scim-chewing.spec, 1.11, 1.12
Message-ID: <200608180529.k7I5Ts7b026355@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/scim-chewing/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26217

Modified Files:
	scim-chewing.spec 
Added Files:
	scim-chewing-0.2.1-LTC23919.patch 
Log Message:
added scim-chewing-LTC23919-191957.patch (Shoji Sugiyama [IBM Japan], #191957)



scim-chewing-0.2.1-LTC23919.patch:
 scim_chewing_imengine.cpp |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE scim-chewing-0.2.1-LTC23919.patch ---
--- scim-chewing-0.2.1.orig/src/scim_chewing_imengine.cpp	2005-08-08 22:52:24.000000000 +0900
+++ scim-chewing-0.2.1/src/scim_chewing_imengine.cpp	2006-06-21 17:31:55.000000000 +0900
@@ -243,6 +243,10 @@
 	: IMEngineInstanceBase( factory, encoding, id ),
 	  m_factory( factory )
 {
+	// Initialize private members
+	memset(&gOut, 0, sizeof(gOut));
+	memset(&da, 0, sizeof(da));
+
 	reload_config( m_factory->m_config );
 	m_iconv.set_encoding( LIBCHEWING_ENCODING );
 	m_lookup_table.init();


Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/FC-5/scim-chewing.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scim-chewing.spec	2 Aug 2006 02:11:38 -0000	1.11
+++ scim-chewing.spec	18 Aug 2006 05:29:52 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:		scim-chewing
 Version:	0.2.1
-Release:	5.3%{?dist}
+Release:	6%{?dist}
 Summary:	Chewing Chinese input method for SCIM
 
 License:	GPL
@@ -16,6 +16,7 @@
 %endif
 Requires:	scim
 Obsoletes:	iiimf-le-xcin <= 0.1.10
+Patch1:		scim-chewing-0.2.1-LTC23919.patch
 
 %description
 This package provides Chewing Chinese input method for SCIM.
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-LTC23919
 
 
 %build
@@ -62,6 +64,10 @@
 
 
 %changelog
+* Fri Aug 18 2006 Caius Chance <cchance at redhat.com> - 0.2.1-6.fc5
+- relocated patch from devel to FC5 branch & rebuilt (#191957)
+- added scim-chewing-LTC23919-191957.patch (Shoji Sugiyama [IBM Japan], #191957)
+
 * Wed Aug  2 2006 Jens Petersen <petersen at redhat.com> - 0.2.1-5.3.fc5
 - rebuild against new libstdc++so7 (#197718)
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 05:42:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 01:42:40 -0400
Subject: rpms/scim-chewing/FC-5 scim-chewing.spec,1.12,1.13
Message-ID: <200608180542.k7I5ge3n029388@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/scim-chewing/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29294

Modified Files:
	scim-chewing.spec 
Log Message:
release number correction
CVs: ----------------------------------------------------------------------



Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/FC-5/scim-chewing.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scim-chewing.spec	18 Aug 2006 05:29:52 -0000	1.12
+++ scim-chewing.spec	18 Aug 2006 05:42:37 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:		scim-chewing
 Version:	0.2.1
-Release:	6%{?dist}
+Release:	5.4%{?dist}
 Summary:	Chewing Chinese input method for SCIM
 
 License:	GPL
@@ -64,9 +64,10 @@
 
 
 %changelog
-* Fri Aug 18 2006 Caius Chance <cchance at redhat.com> - 0.2.1-6.fc5
+* Fri Aug 18 2006 Caius Chance <cchance at redhat.com> - 0.2.1-5.4.fc5
 - relocated patch from devel to FC5 branch & rebuilt (#191957)
-- added scim-chewing-LTC23919-191957.patch (Shoji Sugiyama [IBM Japan], #191957)
+- added scim-chewing-LTC23919-191957.patch 
+  (Shoji Sugiyama [IBM Japan], #191957)
 
 * Wed Aug  2 2006 Jens Petersen <petersen at redhat.com> - 0.2.1-5.3.fc5
 - rebuild against new libstdc++so7 (#197718)



From fedora-cvs-commits at redhat.com  Fri Aug 18 05:49:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 01:49:46 -0400
Subject: rpms/scim-chewing/FC-5 scim-chewing.spec,1.13,1.14
Message-ID: <200608180549.k7I5nk7x014481@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/scim-chewing/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14362

Modified Files:
	scim-chewing.spec 
Log Message:
changelog refine



Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/FC-5/scim-chewing.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scim-chewing.spec	18 Aug 2006 05:42:37 -0000	1.13
+++ scim-chewing.spec	18 Aug 2006 05:49:44 -0000	1.14
@@ -65,7 +65,6 @@
 
 %changelog
 * Fri Aug 18 2006 Caius Chance <cchance at redhat.com> - 0.2.1-5.4.fc5
-- relocated patch from devel to FC5 branch & rebuilt (#191957)
 - added scim-chewing-LTC23919-191957.patch 
   (Shoji Sugiyama [IBM Japan], #191957)
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 07:04:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 03:04:20 -0400
Subject: rpms/file/devel file-4.17-bash.patch,NONE,1.1 file.spec,1.53,1.54
Message-ID: <200608180704.k7I74KpC002885@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2869

Modified Files:
	file.spec 
Added Files:
	file-4.17-bash.patch 
Log Message:
* Fri Aug 18 2006 Martin Bacovsky <mbacovsk at redhat.com> - 4.17-7
- fix recognition of bash script with embed awk (#202185)


file-4.17-bash.patch:
 commands |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE file-4.17-bash.patch ---
--- file-4.17/magic/Magdir/commands.bash	2006-03-02 22:50:25.000000000 +0100
+++ file-4.17/magic/Magdir/commands	2006-08-17 16:38:39.000000000 +0200
@@ -28,7 +28,7 @@
 0	string/b	#!\ /bin/awk		awk script text executable
 0	string/b	#!\ /usr/bin/awk	awk script text executable
 # update to distinguish from *.vcf files
-0	regex		BEGIN[[:space:]]*[{]	awk script text
+0	regex		[^'"]BEGIN[[:space:]]*[{]	awk script text
 
 # AT&T Bell Labs' Plan 9 shell
 0	string/b	#!\ /bin/rc	Plan 9 rc shell script text executable


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- file.spec	3 Aug 2006 13:43:36 -0000	1.53
+++ file.spec	18 Aug 2006 07:04:17 -0000	1.54
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.17
-Release: 6
+Release: 7
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -22,6 +22,7 @@
 Patch17: file-4.17-clamav.patch
 Patch18: file-4.17-powerpoint.patch
 Patch19: file-4.17-empty.patch
+Patch20: file-4.17-bash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -50,6 +51,7 @@
 %patch17 -p1 -b .clamav
 %patch18 -p1 -b .powerpoint
 %patch19 -p1 -b .empty
+%patch20 -p1 -b .bash
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -95,6 +97,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Fri Aug 18 2006 Martin Bacovsky <mbacovsk at redhat.com> - 4.17-7
+- fix recognition of bash script with embed awk (#202185)
+
 * Thu Aug 03 2006 Martin Bacovsky <mbacovsk at redhat.com> - 4.17-6
 - fix gziped empty file (#72986)
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 07:06:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 03:06:18 -0400
Subject: rpms/binutils/devel binutils.spec,1.99,1.100
Message-ID: <200608180706.k7I76Iea003004@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2991

Modified Files:
	binutils.spec 
Log Message:
2.17.50.0.3-3


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- binutils.spec	28 Jul 2006 23:28:26 -0000	1.99
+++ binutils.spec	18 Aug 2006 07:06:16 -0000	1.100
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.17.50.0.3
-Release: 2
+Release: 3
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -58,6 +58,8 @@
 %patch10 -p0 -b .opcodes-intl~
 %patch11 -p0 -b .x86-noautoarch~
 
+# On ppc64 we might use 64K pages
+sed -i -e '/#define.*ELF_COMMONPAGESIZE/s/0x1000$/0x10000/' bfd/elf*ppc.c
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
@@ -169,9 +171,12 @@
 %{_infodir}/*info*
 
 %changelog
+* Fri Aug 18 2006 Alexandre Oliva <aoliva at redhat.com> 2.17.50.0.3-3
+- on ppc and ppc64 increase default -z commonpagesize to 64K (#203001)
+
 * Fri Jul 28 2006 Alexandre Oliva <aoliva at redhat.com> 2.17.50.0.3-2
 - do not infer x86 arch implicitly based on instruction in the input
-(#200330)
+  (#200330)
 
 * Mon Jul 17 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.3-1
 - update to 2.17.50.0.3



From fedora-cvs-commits at redhat.com  Fri Aug 18 07:38:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 03:38:39 -0400
Subject: rpms/gcc/devel gcc41-pr27898.patch, NONE, 1.1 gcc41-pr28755.patch,
	NONE, 1.1 .cvsignore, 1.165, 1.166 gcc41.spec, 1.95,
	1.96 sources, 1.167, 1.168
Message-ID: <200608180738.k7I7cd9O004963@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4933

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-pr27898.patch gcc41-pr28755.patch 
Log Message:
4.1.1-18

gcc41-pr27898.patch:
 c-typeck.c                 |   50 ++++++++++++++++++++++++---------------------
 testsuite/gcc.dg/pr27898.c |    8 +++++++
 2 files changed, 35 insertions(+), 23 deletions(-)

--- NEW FILE gcc41-pr27898.patch ---
2006-07-06  Alexandre Oliva  <aoliva at redhat.com>

	PR c/27898
	* c-typeck.c (tagged_types_tu_compatible_p): Enable exact
	matches between anonymous union fields.

2006-08-18  Jakub Jelinek  <jakub at redhat.com>

	PR c/27898
	* gcc.dg/pr27898.c: New test.

--- gcc/testsuite/gcc.dg/pr27898.c.jj	2006-08-18 09:19:33.000000000 +0200
+++ gcc/testsuite/gcc.dg/pr27898.c	2006-08-18 09:19:27.000000000 +0200
@@ -0,0 +1,8 @@
+/* PR c/27898 */
+/* { dg-do compile } */
+/* { dg-options "--combine" } */
+/* { dg-additional-sources "pr27898.c" } */
+
+union u { struct { int i; }; };
+
+extern int foo (union u *);
--- gcc/c-typeck.c.jj	2006-08-17 09:55:11.000000000 +0200
+++ gcc/c-typeck.c	2006-08-18 09:14:15.000000000 +0200
@@ -1126,11 +1126,12 @@ tagged_types_tu_compatible_p (tree t1, t
 	  {
 	    int result;
 
-
-	    if (DECL_NAME (s1) == NULL
-		|| DECL_NAME (s1) != DECL_NAME (s2))
+	    if (DECL_NAME (s1) != DECL_NAME (s2))
 	      break;
 	    result = comptypes_internal (TREE_TYPE (s1), TREE_TYPE (s2));
+
+	    if (result != 1 && !DECL_NAME (s1))
+	      break;
 	    if (result == 0)
 	      {
 		tu->val = 0;
@@ -1157,28 +1158,31 @@ tagged_types_tu_compatible_p (tree t1, t
 	  {
 	    bool ok = false;
 
-	    if (DECL_NAME (s1) != NULL)
-	      for (s2 = TYPE_FIELDS (t2); s2; s2 = TREE_CHAIN (s2))
-		if (DECL_NAME (s1) == DECL_NAME (s2))
-		  {
-		    int result;
-		    result = comptypes_internal (TREE_TYPE (s1), TREE_TYPE (s2));
-		    if (result == 0)
-		      {
-			tu->val = 0;
-			return 0;
-		      }
-		    if (result == 2)
-		      needs_warning = true;
-
-		    if (TREE_CODE (s1) == FIELD_DECL
-			&& simple_cst_equal (DECL_FIELD_BIT_OFFSET (s1),
-					     DECL_FIELD_BIT_OFFSET (s2)) != 1)
-		      break;
+	    for (s2 = TYPE_FIELDS (t2); s2; s2 = TREE_CHAIN (s2))
+	      if (DECL_NAME (s1) == DECL_NAME (s2))
+		{
+		  int result;
+
+		  result = comptypes_internal (TREE_TYPE (s1), TREE_TYPE (s2));
 
-		    ok = true;
+		  if (result != 1 && !DECL_NAME (s1))
+		    continue;
+		  if (result == 0)
+		    {
+		      tu->val = 0;
+		      return 0;
+		    }
+		  if (result == 2)
+		    needs_warning = true;
+
+		  if (TREE_CODE (s1) == FIELD_DECL
+		      && simple_cst_equal (DECL_FIELD_BIT_OFFSET (s1),
+					   DECL_FIELD_BIT_OFFSET (s2)) != 1)
 		    break;
-		  }
+
+		  ok = true;
+		  break;
+		}
 	    if (!ok)
 	      {
 		tu->val = 0;

gcc41-pr28755.patch:
 expr.c                     |   16 ++++++++++++++--
 testsuite/gcc.dg/pr28755.c |   22 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

--- NEW FILE gcc41-pr28755.patch ---
2006-08-17  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/28755
	* expr.c (expand_expr_real_1) <case ARRAY_REF>: Make sure
	the const array field optimization doesn't create an extra constant
	MEM.

	* gcc.dg/pr28755.c: New test.

--- gcc/expr.c.jj	2006-08-09 17:54:03.000000000 +0200
+++ gcc/expr.c	2006-08-17 13:00:33.000000000 +0200
@@ -7105,13 +7105,25 @@ expand_expr_real_1 (tree exp, rtx target
 					      field, value)
 		      if (tree_int_cst_equal (field, index))
 			{
-			  if (!TREE_SIDE_EFFECTS (value))
+			  if (TREE_SIDE_EFFECTS (value))
+			    break;
+
+			  if (TREE_CODE (value) != CONSTRUCTOR)
 			    return expand_expr (fold (value), target, tmode,
 						modifier);
+
+			  /* For CONSTRUCTOR this optimization is not always
+			     a win - if expand_expr creates a temporary
+			     constant, we just waste unnecessarily rodata
+			     space.  */
+			  temp = expand_expr (value, target, tmode, modifier);
+			  if (temp == target
+			      || (temp && GET_CODE (temp) != MEM))
+			    return temp;
 			  break;
 			}
 		  }
-		else if(TREE_CODE (init) == STRING_CST)
+		else if (TREE_CODE (init) == STRING_CST)
 		  {
 		    tree index1 = index;
 		    tree low_bound = array_ref_low_bound (exp);
--- gcc/testsuite/gcc.dg/pr28755.c.jj	2006-08-17 12:59:57.000000000 +0200
+++ gcc/testsuite/gcc.dg/pr28755.c	2006-08-17 12:59:57.000000000 +0200
@@ -0,0 +1,22 @@
+/* PR middle-end/28755 */
+/* { dg-do compile } */
+/* { dg-options "-Os" } */
+/* { dg-final { scan-assembler-times "2112543726\|7deadbee" 2 } } */
+
+struct S
+{
+  void *s1;
+  unsigned s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14;
+};
+
+const struct S array[] = {
+  { (void *) 0, 60, 640, 2112543726, 39682, 48, 16, 33, 10, 96, 2, 0, 0, 4 },
+  { (void *) 0, 60, 2112543726, 192, 18251, 16, 33, 10, 96, 2, 0, 0, 4, 212 }
+};
+
+void
+foo (struct S *x)
+{
+  x[0] = array[0];
+  x[5] = array[1];
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- .cvsignore	16 Aug 2006 18:08:42 -0000	1.165
+++ .cvsignore	18 Aug 2006 07:38:36 -0000	1.166
@@ -1 +1 @@
-gcc-4.1.1-20060816.tar.bz2
+gcc-4.1.1-20060818.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gcc41.spec	16 Aug 2006 18:28:12 -0000	1.95
+++ gcc41.spec	18 Aug 2006 07:38:36 -0000	1.96
@@ -1,6 +1,6 @@
-%define DATE 20060816
+%define DATE 20060818
 %define gcc_version 4.1.1
-%define gcc_release 17
+%define gcc_release 18
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -144,6 +144,8 @@
 Patch37: gcc41-pr28709.patch
 Patch38: gcc41-pr28744.patch
 Patch39: gcc41-x86_64-kernel-ssp.patch
+Patch40: gcc41-pr28755.patch
+Patch41: gcc41-pr27898.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -464,6 +466,8 @@
 %patch37 -p0 -b .pr28709~
 %patch38 -p0 -b .pr28744~
 %patch39 -p0 -b .x86_64-kernel-ssp~
+%patch40 -p0 -b .pr28755~
+%patch41 -p0 -b .pr27898~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1524,6 +1528,17 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Aug 18 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-18
+- update from gcc-4_1-branch (-r116176:116223)
+  - PRs c++/28593, c++/28606, c++/28710, c/27697, middle-end/20256,
+	middle-end/25211, middle-end/26435
+- don't waste .rodata space when copying from const array with large
+  entries (PR middle-end/28755)
+- fix --combine with anonymous structures in unions (Alexandre Oliva,
+  PR c/27898)
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Wed Aug 16 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-17
 - update from gcc-4_1-branch (-r116082:116176)
   - PRs c++/27894, c++/28677, c/28649, middle-end/28075,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- sources	16 Aug 2006 18:08:42 -0000	1.167
+++ sources	18 Aug 2006 07:38:36 -0000	1.168
@@ -1 +1 @@
-3743f891cb127e18bca681d57c07a2c0  gcc-4.1.1-20060816.tar.bz2
+6c13068f0da00ac2e7fcef129cc6e555  gcc-4.1.1-20060818.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 18 08:02:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 04:02:20 -0400
Subject: rpms/gcc/devel gcc41-pr27898.patch,1.1,1.2
Message-ID: <200608180802.k7I82KnY027855@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27803

Modified Files:
	gcc41-pr27898.patch 
Log Message:
4.1.1-18

gcc41-pr27898.patch:
 c-typeck.c                 |   50 ++++++++++++++++++++++++---------------------
 testsuite/gcc.dg/pr27898.c |    8 +++++++
 2 files changed, 35 insertions(+), 23 deletions(-)

Index: gcc41-pr27898.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr27898.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-pr27898.patch	18 Aug 2006 07:38:36 -0000	1.1
+++ gcc41-pr27898.patch	18 Aug 2006 08:02:11 -0000	1.2
@@ -22,13 +22,13 @@
 +extern int foo (union u *);
 --- gcc/c-typeck.c.jj	2006-08-17 09:55:11.000000000 +0200
 +++ gcc/c-typeck.c	2006-08-18 09:14:15.000000000 +0200
-@@ -1126,11 +1126,12 @@ tagged_types_tu_compatible_p (tree t1, t
+@@ -1072,11 +1072,12 @@ tagged_types_tu_compatible_p (tree t1, t
  	  {
  	    int result;
- 
--
+ 	    
+-	    
 -	    if (DECL_NAME (s1) == NULL
--		|| DECL_NAME (s1) != DECL_NAME (s2))
+-	        || DECL_NAME (s1) != DECL_NAME (s2))
 +	    if (DECL_NAME (s1) != DECL_NAME (s2))
  	      break;
  	    result = comptypes_internal (TREE_TYPE (s1), TREE_TYPE (s2));
@@ -38,7 +38,7 @@
  	    if (result == 0)
  	      {
  		tu->val = 0;
-@@ -1157,28 +1158,31 @@ tagged_types_tu_compatible_p (tree t1, t
+@@ -1103,28 +1104,31 @@ tagged_types_tu_compatible_p (tree t1, t
  	  {
  	    bool ok = false;
  



From fedora-cvs-commits at redhat.com  Fri Aug 18 09:50:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 05:50:23 -0400
Subject: rpms/glibc/devel glibc.spec,1.257,1.258
Message-ID: <200608180950.k7I9oNSB026573@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26561

Modified Files:
	glibc.spec 
Log Message:
2.4.90-22


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- glibc.spec	15 Aug 2006 21:03:14 -0000	1.257
+++ glibc.spec	18 Aug 2006 09:50:20 -0000	1.258
@@ -3,7 +3,7 @@
 %define glibcsrcdir glibc-20060815T2033
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 21
+%define glibcrelease 22
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1453,6 +1453,10 @@
 %endif
 
 %changelog
+* Fri Aug 18 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-22
+- rebuilt with latest binutils to pick up 64K -z commonpagesize
+  on ppc/ppc64 (#203001)
+
 * Tue Aug 15 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-21
 - if some test gets stuck, kill the tee process after make check
   finishes



From fedora-cvs-commits at redhat.com  Fri Aug 18 10:47:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 06:47:25 -0400
Subject: rpms/compat-gcc-32/devel compat-libstdc++33-ldbl.patch, NONE,
	1.1 compat-gcc-32.spec, 1.26, 1.27
Message-ID: <200608181047.k7IAlPNB032298@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-32/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31408

Modified Files:
	compat-gcc-32.spec 
Added Files:
	compat-libstdc++33-ldbl.patch 
Log Message:
3.2.3-60

compat-libstdc++33-ldbl.patch:
 acinclude.m4 |   34 +++
 aclocal.m4   |   34 +++
 configure    |  527 ++++++++++++++++++++++++++++++++++++-----------------------
 3 files changed, 394 insertions(+), 201 deletions(-)

--- NEW FILE compat-libstdc++33-ldbl.patch ---
--- libstdc++-v3/acinclude.m4.jj	2004-06-24 12:06:53.000000000 -0400
+++ libstdc++-v3/acinclude.m4	2006-08-18 06:22:22.000000000 -0400
@@ -831,29 +831,61 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitef)
 
   dnl Check to see if basic C math functions have long double versions.
+  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double inverse trig,
+                                          long_double_itrig,
+                                          acosl asinl atanl)
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double trig,
                                           long_double_trig,
-                                          acosl asinl atanl \
                                           cosl sinl tanl \
                                           coshl sinhl tanhl)
+      ;;
+  esac
   GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double round,
                                           long_double_round,
                                           ceill floorl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinfl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysignl)
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(atan2l)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(expl)
+      ;;
+  esac
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fabsl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(fmodl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(frexpl)
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypotl)
+      ;;
+  esac
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpl)
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(logl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(log10l)
+      ;;
+  esac
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(modfl)
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(powl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtl)
+      ;;
+  esac
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitel)
 
--- libstdc++-v3/aclocal.m4.jj	2004-06-24 12:06:53.000000000 -0400
+++ libstdc++-v3/aclocal.m4	2006-08-18 06:23:52.000000000 -0400
@@ -843,29 +843,61 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitef)
 
   dnl Check to see if basic C math functions have long double versions.
+  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double inverse trig,
+                                          long_double_itrig,
+                                          acosl asinl atanl)
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double trig,
                                           long_double_trig,
-                                          acosl asinl atanl \
                                           cosl sinl tanl \
                                           coshl sinhl tanhl)
+      ;;
+  esac
   GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double round,
                                           long_double_round,
                                           ceill floorl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinfl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysignl)
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(atan2l)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(expl)
+      ;;
+  esac
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fabsl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(fmodl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(frexpl)
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypotl)
+      ;;
+  esac
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpl)
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(logl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(log10l)
+      ;;
+  esac
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(modfl)
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(powl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtl)
+      ;;
+  esac
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosl)
   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitel)
 
--- libstdc++-v3/configure.jj	2004-08-18 03:44:22.000000000 -0400
+++ libstdc++-v3/configure	2006-08-18 06:26:13.000000000 -0400
@@ -17554,8 +17474,113 @@ done
 
 
     
+  echo $ac_n "checking for long double inverse trig functions""... $ac_c" 1>&6
+echo "configure:17479: checking for long double inverse trig functions" >&5
+  if eval "test \"`echo '$''{'glibcpp_cv_func_long_double_itrig_use'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    
+    ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+    cat > conftest.$ac_ext <<EOF
+#line 17493 "configure"
+#include "confdefs.h"
+#include <math.h>
+int main() {
+ `for x in acosl asinl atanl; do echo "$x (0);"; done` 
+; return 0; }
+EOF
+if { (eval echo configure:17500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  glibcpp_cv_func_long_double_itrig_use=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  glibcpp_cv_func_long_double_itrig_use=no
+fi
+rm -f conftest*
+    ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+fi
+
+  echo "$ac_t""$glibcpp_cv_func_long_double_itrig_use" 1>&6
+  if test x$glibcpp_cv_func_long_double_itrig_use = x"yes"; then
+    for ac_func in acosl asinl atanl
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17524: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 17529 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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();
+
+int main() {
+
+/* 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
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:17552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+  fi
+
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
+  
   echo $ac_n "checking for long double trig functions""... $ac_c" 1>&6
-echo "configure:17559: checking for long double trig functions" >&5
+echo "configure:17584: checking for long double trig functions" >&5
   if eval "test \"`echo '$''{'glibcpp_cv_func_long_double_trig_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -17569,16 +17594,15 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
     cat > conftest.$ac_ext <<EOF
-#line 17573 "configure"
+#line 17598 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
- `for x in acosl asinl atanl \
-                                          cosl sinl tanl \
+ `for x in cosl sinl tanl \
                                           coshl sinhl tanhl; do echo "$x (0);"; done` 
 ; return 0; }
 EOF
-if { (eval echo configure:17582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_long_double_trig_use=yes
 else
@@ -17599,17 +17623,16 @@ fi
 
   echo "$ac_t""$glibcpp_cv_func_long_double_trig_use" 1>&6
   if test x$glibcpp_cv_func_long_double_trig_use = x"yes"; then
-    for ac_func in acosl asinl atanl \
-                                          cosl sinl tanl \
+    for ac_func in cosl sinl tanl \
                                           coshl sinhl tanhl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17608: checking for $ac_func" >&5
+echo "configure:17631: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17613 "configure"
+#line 17636 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17632,7 +17655,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17658,9 +17681,11 @@ done
 
   fi
 
+      ;;
+  esac
   
   echo $ac_n "checking for long double round functions""... $ac_c" 1>&6
-echo "configure:17664: checking for long double round functions" >&5
+echo "configure:17689: checking for long double round functions" >&5
   if eval "test \"`echo '$''{'glibcpp_cv_func_long_double_round_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -17674,14 +17699,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
     cat > conftest.$ac_ext <<EOF
-#line 17678 "configure"
+#line 17703 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  `for x in ceill floorl; do echo "$x (0);"; done` 
 ; return 0; }
 EOF
-if { (eval echo configure:17685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_long_double_round_use=yes
 else
@@ -17705,12 +17730,12 @@ fi
     for ac_func in ceill floorl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17709: checking for $ac_func" >&5
+echo "configure:17734: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17714 "configure"
+#line 17739 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17733,7 +17758,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17762,7 +17787,7 @@ done
   
   
   echo $ac_n "checking for isnanl declaration""... $ac_c" 1>&6
-echo "configure:17766: checking for isnanl declaration" >&5
+echo "configure:17791: checking for isnanl declaration" >&5
   if test x${glibcpp_cv_func_isnanl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_isnanl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17777,7 +17802,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 17781 "configure"
+#line 17806 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -17788,7 +17813,7 @@ int main() {
  isnanl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:17792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_isnanl_use=yes
 else
@@ -17815,12 +17840,12 @@ fi
     for ac_func in isnanl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17819: checking for $ac_func" >&5
+echo "configure:17844: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17824 "configure"
+#line 17849 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17843,7 +17868,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17870,7 +17895,7 @@ done
   else
     
   echo $ac_n "checking for _isnanl declaration""... $ac_c" 1>&6
-echo "configure:17874: checking for _isnanl declaration" >&5
+echo "configure:17899: checking for _isnanl declaration" >&5
   if test x${glibcpp_cv_func__isnanl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__isnanl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17885,7 +17910,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 17889 "configure"
+#line 17914 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -17896,7 +17921,7 @@ int main() {
  _isnanl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:17900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__isnanl_use=yes
 else
@@ -17923,12 +17948,12 @@ fi
       for ac_func in _isnanl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17927: checking for $ac_func" >&5
+echo "configure:17952: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17932 "configure"
+#line 17957 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17951,7 +17976,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17981,7 +18006,7 @@ done
   
   
   echo $ac_n "checking for isinfl declaration""... $ac_c" 1>&6
-echo "configure:17985: checking for isinfl declaration" >&5
+echo "configure:18010: checking for isinfl declaration" >&5
   if test x${glibcpp_cv_func_isinfl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_isinfl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17996,7 +18021,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 18000 "configure"
+#line 18025 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -18007,7 +18032,7 @@ int main() {
  isinfl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:18011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_isinfl_use=yes
 else
@@ -18034,12 +18059,12 @@ fi
     for ac_func in isinfl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18038: checking for $ac_func" >&5
+echo "configure:18063: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18043 "configure"
+#line 18068 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18062,7 +18087,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18089,7 +18114,7 @@ done
   else
     
   echo $ac_n "checking for _isinfl declaration""... $ac_c" 1>&6
-echo "configure:18093: checking for _isinfl declaration" >&5
+echo "configure:18118: checking for _isinfl declaration" >&5
   if test x${glibcpp_cv_func__isinfl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__isinfl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18104,7 +18129,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 18108 "configure"
+#line 18133 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -18115,7 +18140,7 @@ int main() {
  _isinfl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:18119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__isinfl_use=yes
 else
@@ -18142,12 +18167,12 @@ fi
       for ac_func in _isinfl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18146: checking for $ac_func" >&5
+echo "configure:18171: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18151 "configure"
+#line 18176 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18170,7 +18195,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18200,7 +18225,7 @@ done
   
   
   echo $ac_n "checking for copysignl declaration""... $ac_c" 1>&6
-echo "configure:18204: checking for copysignl declaration" >&5
+echo "configure:18229: checking for copysignl declaration" >&5
   if test x${glibcpp_cv_func_copysignl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_copysignl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18215,14 +18240,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 18219 "configure"
+#line 18244 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  copysignl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:18226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_copysignl_use=yes
 else
@@ -18249,12 +18274,12 @@ fi
     for ac_func in copysignl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18253: checking for $ac_func" >&5
+echo "configure:18278: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18258 "configure"
+#line 18283 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18277,7 +18302,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18304,7 +18329,7 @@ done
   else
     
   echo $ac_n "checking for _copysignl declaration""... $ac_c" 1>&6
-echo "configure:18308: checking for _copysignl declaration" >&5
+echo "configure:18333: checking for _copysignl declaration" >&5
   if test x${glibcpp_cv_func__copysignl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__copysignl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18319,14 +18344,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 18323 "configure"
+#line 18348 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  _copysignl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:18330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__copysignl_use=yes
 else
@@ -18353,12 +18378,12 @@ fi
       for ac_func in _copysignl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18357: checking for $ac_func" >&5
+echo "configure:18382: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18362 "configure"
+#line 18387 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18381,7 +18406,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18408,10 +18433,14 @@ done
     fi
   fi
 
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   
   
   echo $ac_n "checking for atan2l declaration""... $ac_c" 1>&6
-echo "configure:18415: checking for atan2l declaration" >&5
+echo "configure:18444: checking for atan2l declaration" >&5
   if test x${glibcpp_cv_func_atan2l_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_atan2l_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18426,14 +18455,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 18430 "configure"
+#line 18459 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  atan2l(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:18437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_atan2l_use=yes
 else
@@ -18460,12 +18489,12 @@ fi
     for ac_func in atan2l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18464: checking for $ac_func" >&5
+echo "configure:18493: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18469 "configure"
+#line 18498 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18488,7 +18517,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18515,7 +18544,7 @@ done
   else
     
   echo $ac_n "checking for _atan2l declaration""... $ac_c" 1>&6
-echo "configure:18519: checking for _atan2l declaration" >&5
+echo "configure:18548: checking for _atan2l declaration" >&5
   if test x${glibcpp_cv_func__atan2l_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__atan2l_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18530,14 +18559,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 18534 "configure"
+#line 18563 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  _atan2l(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:18541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__atan2l_use=yes
 else
@@ -18564,12 +18593,12 @@ fi
       for ac_func in _atan2l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18568: checking for $ac_func" >&5
+echo "configure:18597: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18573 "configure"
+#line 18602 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18592,7 +18621,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18622,7 +18651,7 @@ done
   
   
   echo $ac_n "checking for expl declaration""... $ac_c" 1>&6
-echo "configure:18626: checking for expl declaration" >&5
+echo "configure:18655: checking for expl declaration" >&5
   if test x${glibcpp_cv_func_expl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_expl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18637,7 +18666,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 18641 "configure"
+#line 18670 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -18648,7 +18677,7 @@ int main() {
  expl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:18652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_expl_use=yes
 else
@@ -18675,12 +18704,12 @@ fi
     for ac_func in expl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18679: checking for $ac_func" >&5
+echo "configure:18708: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18684 "configure"
+#line 18713 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18703,7 +18732,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18730,7 +18759,7 @@ done
   else
     
   echo $ac_n "checking for _expl declaration""... $ac_c" 1>&6
-echo "configure:18734: checking for _expl declaration" >&5
+echo "configure:18763: checking for _expl declaration" >&5
   if test x${glibcpp_cv_func__expl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__expl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18745,7 +18774,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 18749 "configure"
+#line 18778 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -18756,7 +18785,7 @@ int main() {
  _expl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:18760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__expl_use=yes
 else
@@ -18783,12 +18812,12 @@ fi
       for ac_func in _expl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18787: checking for $ac_func" >&5
+echo "configure:18816: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18792 "configure"
+#line 18821 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18811,7 +18840,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18838,10 +18867,12 @@ done
     fi
   fi
 
+      ;;
+  esac
   
   
   echo $ac_n "checking for fabsl declaration""... $ac_c" 1>&6
-echo "configure:18845: checking for fabsl declaration" >&5
+echo "configure:18876: checking for fabsl declaration" >&5
   if test x${glibcpp_cv_func_fabsl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_fabsl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18856,7 +18887,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 18860 "configure"
+#line 18891 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -18867,7 +18898,7 @@ int main() {
  fabsl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:18871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_fabsl_use=yes
 else
@@ -18894,12 +18925,12 @@ fi
     for ac_func in fabsl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18898: checking for $ac_func" >&5
+echo "configure:18929: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18903 "configure"
+#line 18934 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18922,7 +18953,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18949,7 +18980,7 @@ done
   else
     
   echo $ac_n "checking for _fabsl declaration""... $ac_c" 1>&6
-echo "configure:18953: checking for _fabsl declaration" >&5
+echo "configure:18984: checking for _fabsl declaration" >&5
   if test x${glibcpp_cv_func__fabsl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__fabsl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18964,7 +18995,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 18968 "configure"
+#line 18999 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -18975,7 +19006,7 @@ int main() {
  _fabsl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:18979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__fabsl_use=yes
 else
@@ -19002,12 +19033,12 @@ fi
       for ac_func in _fabsl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19006: checking for $ac_func" >&5
+echo "configure:19037: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19011 "configure"
+#line 19042 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19030,7 +19061,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19060,7 +19091,7 @@ done
   
   
   echo $ac_n "checking for fmodl declaration""... $ac_c" 1>&6
-echo "configure:19064: checking for fmodl declaration" >&5
+echo "configure:19095: checking for fmodl declaration" >&5
   if test x${glibcpp_cv_func_fmodl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_fmodl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19075,14 +19106,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 19079 "configure"
+#line 19110 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  fmodl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:19086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_fmodl_use=yes
 else
@@ -19109,12 +19140,12 @@ fi
     for ac_func in fmodl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19113: checking for $ac_func" >&5
+echo "configure:19144: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19118 "configure"
+#line 19149 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19137,7 +19168,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19164,7 +19195,7 @@ done
   else
     
   echo $ac_n "checking for _fmodl declaration""... $ac_c" 1>&6
-echo "configure:19168: checking for _fmodl declaration" >&5
+echo "configure:19199: checking for _fmodl declaration" >&5
   if test x${glibcpp_cv_func__fmodl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__fmodl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19179,14 +19210,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 19183 "configure"
+#line 19214 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  _fmodl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:19190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__fmodl_use=yes
 else
@@ -19213,12 +19244,12 @@ fi
       for ac_func in _fmodl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19217: checking for $ac_func" >&5
+echo "configure:19248: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19222 "configure"
+#line 19253 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19241,7 +19272,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19271,7 +19302,7 @@ done
   
   
   echo $ac_n "checking for frexpl declaration""... $ac_c" 1>&6
-echo "configure:19275: checking for frexpl declaration" >&5
+echo "configure:19306: checking for frexpl declaration" >&5
   if test x${glibcpp_cv_func_frexpl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_frexpl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19286,14 +19317,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 19290 "configure"
+#line 19321 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  frexpl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:19297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_frexpl_use=yes
 else
@@ -19320,12 +19351,12 @@ fi
     for ac_func in frexpl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19324: checking for $ac_func" >&5
+echo "configure:19355: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19329 "configure"
+#line 19360 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19348,7 +19379,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19375,7 +19406,7 @@ done
   else
     
   echo $ac_n "checking for _frexpl declaration""... $ac_c" 1>&6
-echo "configure:19379: checking for _frexpl declaration" >&5
+echo "configure:19410: checking for _frexpl declaration" >&5
   if test x${glibcpp_cv_func__frexpl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__frexpl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19390,14 +19421,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 19394 "configure"
+#line 19425 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  _frexpl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:19401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__frexpl_use=yes
 else
@@ -19424,12 +19455,12 @@ fi
       for ac_func in _frexpl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19428: checking for $ac_func" >&5
+echo "configure:19459: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19433 "configure"
+#line 19464 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19452,7 +19483,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19479,10 +19510,14 @@ done
     fi
   fi
 
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   
   
   echo $ac_n "checking for hypotl declaration""... $ac_c" 1>&6
-echo "configure:19486: checking for hypotl declaration" >&5
+echo "configure:19521: checking for hypotl declaration" >&5
   if test x${glibcpp_cv_func_hypotl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_hypotl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19497,14 +19532,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 19501 "configure"
+#line 19536 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  hypotl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:19508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_hypotl_use=yes
 else
@@ -19531,12 +19566,12 @@ fi
     for ac_func in hypotl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19535: checking for $ac_func" >&5
+echo "configure:19570: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19540 "configure"
+#line 19575 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19559,7 +19594,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19586,7 +19621,7 @@ done
   else
     
   echo $ac_n "checking for _hypotl declaration""... $ac_c" 1>&6
-echo "configure:19590: checking for _hypotl declaration" >&5
+echo "configure:19625: checking for _hypotl declaration" >&5
   if test x${glibcpp_cv_func__hypotl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__hypotl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19601,14 +19636,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 19605 "configure"
+#line 19640 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  _hypotl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:19612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__hypotl_use=yes
 else
@@ -19635,12 +19670,12 @@ fi
       for ac_func in _hypotl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19639: checking for $ac_func" >&5
+echo "configure:19674: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19644 "configure"
+#line 19679 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19663,7 +19698,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19690,10 +19725,12 @@ done
     fi
   fi
 
+      ;;
+  esac
   
   
   echo $ac_n "checking for ldexpl declaration""... $ac_c" 1>&6
-echo "configure:19697: checking for ldexpl declaration" >&5
+echo "configure:19734: checking for ldexpl declaration" >&5
   if test x${glibcpp_cv_func_ldexpl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_ldexpl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19708,14 +19745,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 19712 "configure"
+#line 19749 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  ldexpl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:19719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_ldexpl_use=yes
 else
@@ -19742,12 +19779,12 @@ fi
     for ac_func in ldexpl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19746: checking for $ac_func" >&5
+echo "configure:19783: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19751 "configure"
+#line 19788 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19770,7 +19807,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19797,7 +19834,7 @@ done
   else
     
   echo $ac_n "checking for _ldexpl declaration""... $ac_c" 1>&6
-echo "configure:19801: checking for _ldexpl declaration" >&5
+echo "configure:19838: checking for _ldexpl declaration" >&5
   if test x${glibcpp_cv_func__ldexpl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__ldexpl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19812,14 +19849,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 19816 "configure"
+#line 19853 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  _ldexpl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:19823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__ldexpl_use=yes
 else
@@ -19846,12 +19883,12 @@ fi
       for ac_func in _ldexpl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19850: checking for $ac_func" >&5
+echo "configure:19887: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19855 "configure"
+#line 19892 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19874,7 +19911,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19901,10 +19938,14 @@ done
     fi
   fi
 
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   
   
   echo $ac_n "checking for logl declaration""... $ac_c" 1>&6
-echo "configure:19908: checking for logl declaration" >&5
+echo "configure:19949: checking for logl declaration" >&5
   if test x${glibcpp_cv_func_logl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_logl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19919,7 +19960,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 19923 "configure"
+#line 19964 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -19930,7 +19971,7 @@ int main() {
  logl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:19934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_logl_use=yes
 else
@@ -19957,12 +19998,12 @@ fi
     for ac_func in logl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19961: checking for $ac_func" >&5
+echo "configure:20002: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19966 "configure"
+#line 20007 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19985,7 +20026,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20012,7 +20053,7 @@ done
   else
     
   echo $ac_n "checking for _logl declaration""... $ac_c" 1>&6
-echo "configure:20016: checking for _logl declaration" >&5
+echo "configure:20057: checking for _logl declaration" >&5
   if test x${glibcpp_cv_func__logl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__logl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20027,7 +20068,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 20031 "configure"
+#line 20072 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -20038,7 +20079,7 @@ int main() {
  _logl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:20042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__logl_use=yes
 else
@@ -20065,12 +20106,12 @@ fi
       for ac_func in _logl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20069: checking for $ac_func" >&5
+echo "configure:20110: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20074 "configure"
+#line 20115 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20093,7 +20134,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20123,7 +20164,7 @@ done
   
   
   echo $ac_n "checking for log10l declaration""... $ac_c" 1>&6
-echo "configure:20127: checking for log10l declaration" >&5
+echo "configure:20168: checking for log10l declaration" >&5
   if test x${glibcpp_cv_func_log10l_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_log10l_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20138,7 +20179,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 20142 "configure"
+#line 20183 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -20149,7 +20190,7 @@ int main() {
  log10l(0);
 ; return 0; }
 EOF
-if { (eval echo configure:20153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_log10l_use=yes
 else
@@ -20176,12 +20217,12 @@ fi
     for ac_func in log10l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20180: checking for $ac_func" >&5
+echo "configure:20221: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20185 "configure"
+#line 20226 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20204,7 +20245,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20231,7 +20272,7 @@ done
   else
     
   echo $ac_n "checking for _log10l declaration""... $ac_c" 1>&6
-echo "configure:20235: checking for _log10l declaration" >&5
+echo "configure:20276: checking for _log10l declaration" >&5
   if test x${glibcpp_cv_func__log10l_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__log10l_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20246,7 +20287,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 20250 "configure"
+#line 20291 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -20257,7 +20298,7 @@ int main() {
  _log10l(0);
 ; return 0; }
 EOF
-if { (eval echo configure:20261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__log10l_use=yes
 else
@@ -20284,12 +20325,12 @@ fi
       for ac_func in _log10l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20288: checking for $ac_func" >&5
+echo "configure:20329: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20293 "configure"
+#line 20334 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20312,7 +20353,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20339,10 +20380,12 @@ done
     fi
   fi
 
+      ;;
+  esac
   
   
   echo $ac_n "checking for modfl declaration""... $ac_c" 1>&6
-echo "configure:20346: checking for modfl declaration" >&5
+echo "configure:20389: checking for modfl declaration" >&5
   if test x${glibcpp_cv_func_modfl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_modfl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20357,14 +20400,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 20361 "configure"
+#line 20404 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  modfl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:20368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_modfl_use=yes
 else
@@ -20391,12 +20434,12 @@ fi
     for ac_func in modfl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20395: checking for $ac_func" >&5
+echo "configure:20438: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20400 "configure"
+#line 20443 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20419,7 +20462,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20446,7 +20489,7 @@ done
   else
     
   echo $ac_n "checking for _modfl declaration""... $ac_c" 1>&6
-echo "configure:20450: checking for _modfl declaration" >&5
+echo "configure:20493: checking for _modfl declaration" >&5
   if test x${glibcpp_cv_func__modfl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__modfl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20461,14 +20504,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 20465 "configure"
+#line 20508 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  _modfl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:20472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__modfl_use=yes
 else
@@ -20495,12 +20538,12 @@ fi
       for ac_func in _modfl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20499: checking for $ac_func" >&5
+echo "configure:20542: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20504 "configure"
+#line 20547 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20523,7 +20566,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20550,10 +20593,14 @@ done
     fi
   fi
 
+  case "$target" in
+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
+      ;;
+    *)
   
   
   echo $ac_n "checking for powl declaration""... $ac_c" 1>&6
-echo "configure:20557: checking for powl declaration" >&5
+echo "configure:20604: checking for powl declaration" >&5
   if test x${glibcpp_cv_func_powl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_powl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20568,14 +20615,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 20572 "configure"
+#line 20619 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  powl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:20579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_powl_use=yes
 else
@@ -20602,12 +20649,12 @@ fi
     for ac_func in powl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20606: checking for $ac_func" >&5
+echo "configure:20653: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20611 "configure"
+#line 20658 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20630,7 +20677,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20657,7 +20704,7 @@ done
   else
     
   echo $ac_n "checking for _powl declaration""... $ac_c" 1>&6
-echo "configure:20661: checking for _powl declaration" >&5
+echo "configure:20708: checking for _powl declaration" >&5
   if test x${glibcpp_cv_func__powl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__powl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20672,14 +20719,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 20676 "configure"
+#line 20723 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  _powl(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:20683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__powl_use=yes
 else
@@ -20706,12 +20753,12 @@ fi
       for ac_func in _powl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20710: checking for $ac_func" >&5
+echo "configure:20757: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20715 "configure"
+#line 20762 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20734,7 +20781,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20764,7 +20811,7 @@ done
   
   
   echo $ac_n "checking for sqrtl declaration""... $ac_c" 1>&6
-echo "configure:20768: checking for sqrtl declaration" >&5
+echo "configure:20815: checking for sqrtl declaration" >&5
   if test x${glibcpp_cv_func_sqrtl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_sqrtl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20779,7 +20826,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 20783 "configure"
+#line 20830 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -20790,7 +20837,7 @@ int main() {
  sqrtl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:20794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_sqrtl_use=yes
 else
@@ -20817,12 +20864,12 @@ fi
     for ac_func in sqrtl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20821: checking for $ac_func" >&5
+echo "configure:20868: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20826 "configure"
+#line 20873 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20845,7 +20892,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20872,7 +20919,7 @@ done
   else
     
   echo $ac_n "checking for _sqrtl declaration""... $ac_c" 1>&6
-echo "configure:20876: checking for _sqrtl declaration" >&5
+echo "configure:20923: checking for _sqrtl declaration" >&5
   if test x${glibcpp_cv_func__sqrtl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func__sqrtl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20887,7 +20934,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 20891 "configure"
+#line 20938 "configure"
 #include "confdefs.h"
 #include <math.h>
 		      #ifdef HAVE_IEEEFP_H
@@ -20898,7 +20945,7 @@ int main() {
  _sqrtl(0);
 ; return 0; }
 EOF
-if { (eval echo configure:20902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func__sqrtl_use=yes
 else
@@ -20925,12 +20972,12 @@ fi
       for ac_func in _sqrtl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20929: checking for $ac_func" >&5
+echo "configure:20976: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20934 "configure"
+#line 20981 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20953,7 +21000,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:21004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20980,10 +21027,12 @@ done
     fi
   fi
 
+      ;;
+  esac
   
   
   echo $ac_n "checking for sincosl declaration""... $ac_c" 1>&6
-echo "configure:20987: checking for sincosl declaration" >&5
+echo "configure:21036: checking for sincosl declaration" >&5
   if test x${glibcpp_cv_func_sincosl_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcpp_cv_func_sincosl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20998,14 +21047,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 21002 "configure"
+#line 21051 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  sincosl(0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:21009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:21058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_func_sincosl_use=yes
 else


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- compat-gcc-32.spec	10 Aug 2006 12:29:05 -0000	1.26
+++ compat-gcc-32.spec	18 Aug 2006 10:47:18 -0000	1.27
@@ -1,7 +1,7 @@
 %define LIBSTDCXXDATE 20040818
 %define DATE 20040701
 %define gcc_version 3.2.3
-%define gcc_release 59
+%define gcc_release 60
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define build_java 0
@@ -110,6 +110,7 @@
 Patch104: compat-libstdc++33++-fully-dynamic-strings.patch
 Patch105: compat-libstdc++33++-symver2.patch
 Patch106: compat-libstdc++33-cxa_demangle-ambiguity.patch
+Patch107: compat-libstdc++33-ldbl.patch
 
 %define _gnu %{nil}
 
@@ -200,6 +201,7 @@
 %patch104 -p0 -b .compat-libstdc++33++-fully-dynamic-strings~
 %patch105 -p0 -b .compat-libstdc++33++-symver2~
 %patch106 -p0 -b .compat-libstdc++33-cxa_demangle-ambiguity~
+%patch107 -p0 -b .compat-libstdc++33-ldbl.patch~
 
 perl -pi -e 's/3\.2\.4/3.2.3/' gcc/version.c
 perl -pi -e 's/"%{gcc_version}"/"%{gcc_version} \(release\)"/' gcc/version.c
@@ -391,6 +393,9 @@
 %{_prefix}/%{_lib}/libstdc++.so.5*
 
 %changelog
+* Fri Aug 18 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-60
+- on ppc*/s390* make sure all needed math *l stubs are included
+
 * Thu Aug 10 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-59
 - fix cleaning up the buildroot before debuginfo generation
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 11:48:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 07:48:05 -0400
Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec, 1.27,
	1.28 compat-libstdc++33-ldbl.patch, 1.1, 1.2
Message-ID: <200608181148.k7IBm5ul027800@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-32/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27768

Modified Files:
	compat-gcc-32.spec compat-libstdc++33-ldbl.patch 
Log Message:
3.2.3-60


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- compat-gcc-32.spec	18 Aug 2006 10:47:18 -0000	1.27
+++ compat-gcc-32.spec	18 Aug 2006 11:48:02 -0000	1.28
@@ -203,6 +203,15 @@
 %patch106 -p0 -b .compat-libstdc++33-cxa_demangle-ambiguity~
 %patch107 -p0 -b .compat-libstdc++33-ldbl.patch~
 
+%ifarch ppc ppc64 s390 s390x
+sed -i -e 's/-lm @LIBUNWIND_FLAG@/-lm @LIBUNWIND_FLAG@ -lnldbl_nonshared/' \
+  libstdc++33-v3/src/Makefile.{am,in}
+%endif
+# Don't need to test C, only check-g++ and libstdc++-v33's make check
+sed -i -e 's/\$(RUNTEST) --tool gcc/: $(RUNTEST) --tool gcc/' \
+  gcc/Makefile.in
+sed -i -e 's/\$\$runtest \$(RUNTESTDEFAULTFLAGS)/: $$runtest $(RUNTESTDEFAULTFLAGS)/' \
+  libstdc++-v3/testsuite/Makefile.in
 perl -pi -e 's/3\.2\.4/3.2.3/' gcc/version.c
 perl -pi -e 's/"%{gcc_version}"/"%{gcc_version} \(release\)"/' gcc/version.c
 perl -pi -e 's/\((prerelease|experimental|release|Red Hat[^)]*)\)/\(Red Hat Linux %{gcc_version}-%{gcc_release}\)/' gcc/version.c

compat-libstdc++33-ldbl.patch:
 acinclude.m4 |   34 +++
 aclocal.m4   |   34 +++
 configure    |  527 ++++++++++++++++++++++++++++++++++++-----------------------
 3 files changed, 394 insertions(+), 201 deletions(-)

Index: compat-libstdc++33-ldbl.patch
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-libstdc++33-ldbl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-libstdc++33-ldbl.patch	18 Aug 2006 10:47:18 -0000	1.1
+++ compat-libstdc++33-ldbl.patch	18 Aug 2006 11:48:02 -0000	1.2
@@ -1,5 +1,5 @@
---- libstdc++-v3/acinclude.m4.jj	2004-06-24 12:06:53.000000000 -0400
-+++ libstdc++-v3/acinclude.m4	2006-08-18 06:22:22.000000000 -0400
+--- libstdc++33-v3/acinclude.m4.jj	2004-06-24 12:06:53.000000000 -0400
++++ libstdc++33-v3/acinclude.m4	2006-08-18 06:22:22.000000000 -0400
 @@ -831,29 +831,61 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
    GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitef)
  
@@ -63,8 +63,8 @@
    GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosl)
    GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitel)
  
---- libstdc++-v3/aclocal.m4.jj	2004-06-24 12:06:53.000000000 -0400
-+++ libstdc++-v3/aclocal.m4	2006-08-18 06:23:52.000000000 -0400
+--- libstdc++33-v3/aclocal.m4.jj	2004-06-24 12:06:53.000000000 -0400
++++ libstdc++33-v3/aclocal.m4	2006-08-18 06:23:52.000000000 -0400
 @@ -843,29 +843,61 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
    GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitef)
  
@@ -128,8 +128,8 @@
    GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosl)
    GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitel)
  
---- libstdc++-v3/configure.jj	2004-08-18 03:44:22.000000000 -0400
-+++ libstdc++-v3/configure	2006-08-18 06:26:13.000000000 -0400
+--- libstdc++33-v3/configure.jj	2004-08-18 03:44:22.000000000 -0400
++++ libstdc++33-v3/configure	2006-08-18 06:26:13.000000000 -0400
 @@ -17554,8 +17474,113 @@ done
  
  



From fedora-cvs-commits at redhat.com  Fri Aug 18 12:24:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 08:24:59 -0400
Subject: rpms/nfs-utils/devel nfs-utils-1.0.9-krb5-memory.patch, NONE,
	1.1 nfs-utils.spec, 1.103, 1.104
Message-ID: <200608181224.k7ICOxVj021138@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21064

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.0.9-krb5-memory.patch 
Log Message:
- Changed gssd daemons to cache things in memory
  instead of /tmp which makes selinux much happier.
  (bz 203078)


nfs-utils-1.0.9-krb5-memory.patch:
 krb5_util.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nfs-utils-1.0.9-krb5-memory.patch ---
--- nfs-utils-1.0.9/utils/gssd/krb5_util.c~	2006-07-07 20:04:32.000000000 -0400
+++ nfs-utils-1.0.9/utils/gssd/krb5_util.c	2006-08-08 09:33:38.000000000 -0400
@@ -379,7 +379,7 @@
 	 * Initialize cache file which we're going to be using
 	 */
 
-	snprintf(cc_name, sizeof(cc_name), "FILE:%s/%s%s_%s",
+	snprintf(cc_name, sizeof(cc_name), "MEMORY:%s/%s%s_%s",
 		GSSD_DEFAULT_CRED_DIR, GSSD_DEFAULT_CRED_PREFIX,
 		GSSD_DEFAULT_MACHINE_CRED_SUFFIX, ple->realm);
 	ple->endtime = my_creds.times.endtime;


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- nfs-utils.spec	16 Aug 2006 14:44:55 -0000	1.103
+++ nfs-utils.spec	18 Aug 2006 12:24:56 -0000	1.104
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -29,6 +29,7 @@
 Patch55: nfs-utils-1.0.9-mount-options-v3.patch
 Patch56: nfs-utils-1.0.9-lazy-umount.patch
 Patch57: nfs-utils-1.0.9-mount-fsc.patch
+Patch58: nfs-utils-1.0.9-krb5-memory.patch
 
 Patch100: nfs-utils-1.0.8-compile.patch
 
@@ -76,6 +77,7 @@
 %patch55 -p1
 %patch56 -p1
 %patch57 -p1
+%patch58 -p1
 
 # Do the magic to get things to compile
 %patch100 -p1
@@ -249,7 +251,12 @@
 %endif
 
 %changelog
-* Wed Aug 16 2006 <SteveD at RedHat.com> 1.0.9-2
+* Fri Aug 18 2006 <SteveD at RedHat.com> 1.0.9-5
+- Changed gssd daemons to cache things in memory
+  instead of /tmp which makes selinux much happier.
+  (bz 203078)
+
+* Wed Aug 16 2006 <SteveD at RedHat.com> 1.0.9-4
 - Allow variable for HA callout program in /etc/init.d/nfslock
   (bz 202790)
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 12:33:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 08:33:11 -0400
Subject: rpms/yum/devel yum.spec,1.114,1.115
Message-ID: <200608181233.k7ICXB8a023518@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23506

Modified Files:
	yum.spec 
Log Message:
- revert last change


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- yum.spec	17 Aug 2006 13:07:36 -0000	1.114
+++ yum.spec	18 Aug 2006 12:33:09 -0000	1.115
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 2.9.4
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.9/yum-%{version}.tar.gz
@@ -37,7 +37,6 @@
 Requires: yum = %{version}-%{release}
 Requires: dbus-python
 Requires: pygobject2
-Requires: libxml2-python
 Prereq: /sbin/chkconfig 
 Prereq: /sbin/service
 
@@ -115,6 +114,9 @@
 
 
 %changelog
+* Fri Aug 18 2006 Karsten Hopp <karsten at redhat.com> - 2.9.4-3
+- revert last change
+
 * Thu Aug 17 2006 Karsten Hopp <karsten at redhat.com> - 2.9.4-2
 - Requires: libxml2-python for updatesd subpackage
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 12:38:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 08:38:35 -0400
Subject: rpms/dbus-python/devel dbus-python.spec,1.7,1.8
Message-ID: <200608181238.k7ICcZZk002037@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/dbus-python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2023

Modified Files:
	dbus-python.spec 
Log Message:
- require libxml2-python for site-packages/dbus/introspect_parser.py


Index: dbus-python.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus-python/devel/dbus-python.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dbus-python.spec	20 Jul 2006 17:56:50 -0000	1.7
+++ dbus-python.spec	18 Aug 2006 12:38:33 -0000	1.8
@@ -7,7 +7,7 @@
 Summary: D-Bus Python Bindings 
 Name: dbus-python
 Version: 0.70
-Release: 5 
+Release: 6 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch0: dbus-python-0.70-fix-binary-modules-dir.patch
@@ -17,6 +17,7 @@
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: Pyrex >= %{pyrex_version}
+Requires: libxml2-python
 
 %description
 
@@ -47,6 +48,9 @@
 %{python_sitearch}/dbus/*.py*
 
 %changelog
+* Fri Aug 18 2006 Karsten Hopp <karsten at redhat.com> - 0.70-6
+- require libxml2-python for site-packages/dbus/introspect_parser.py
+
 * Thu Jul 20 2006 Jesse Keating <jkeating at redhat.com> - 0.70-5
 - Remove unnecessary obsoletes
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 13:16:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 09:16:38 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.170,1.171
Message-ID: <200608181316.k7IDGcCw032578@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31529

Modified Files:
	gtk2.spec 
Log Message:
try again



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- gtk2.spec	18 Aug 2006 05:03:05 -0000	1.170
+++ gtk2.spec	18 Aug 2006 13:16:34 -0000	1.171
@@ -19,7 +19,7 @@
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
-Source: gtk+-%{version}.tar.gz
+Source: gtk+-%{version}.tar.bz2
 Source1: update-scripts.tar.gz
 
 # Biarch changes



From fedora-cvs-commits at redhat.com  Fri Aug 18 13:43:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 09:43:02 -0400
Subject: rpms/mono/devel mono.spec,1.41,1.42
Message-ID: <200608181343.k7IDh2WG020163@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20123

Modified Files:
	mono.spec 
Log Message:
* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16.1-2
- Move gac to libdir to be multilib compat
- rename mono-devtools back to mono-devel
- kill mono-lib and mono-lib-devel




Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mono.spec	10 Aug 2006 09:44:06 -0000	1.41
+++ mono.spec	18 Aug 2006 13:42:59 -0000	1.42
@@ -1,12 +1,13 @@
 Name:           mono
 Version:        1.1.16.1
-Release:        1
+Release:        2%{?dist}
 Summary:        a .NET runtime environment
 
 Group:          Development/Languages
 License:        GPL, LGPL, MIT X11
 URL:            http://www.mono-project.com/
 Source0:        %{name}-%{version}.tar.gz
+Source1:	monodir.c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison
@@ -18,6 +19,8 @@
 %ifarch ia64
 BuildRequires:  libunwind
 %endif
+# Required for mono-libdir.patch
+BuildRequires: automake
 
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
@@ -26,6 +29,8 @@
 
 Patch1: mono-1.1.13.4-selinux-ia64.patch
 Patch2: mono-1.1.13.4-ppc-threading.patch
+Patch3: mono-libdir.patch
+Patch4: mono-1.1.16.1-use-monodir.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -33,26 +38,14 @@
 class loader, the garbage collector, threading system and
 metadata access libraries.
 
-%package lib
-Summary:        Mono library, used by applications embedding mono
-Group:          Development/Languages
-
-%description lib
-This pickage contains libraries required for embedding/hosting the
-mono runtime in other applications.
-
-%package lib-devel
-Summary:        Header files for Mono library
-Group:          Development/Languages
-
-%description lib-devel
-Contains headers and other files needed to use the library in mono-lib.
-
 %package core
 Summary:        The Mono CIL runtime, suitable for running .NET code
 Group:          Development/Languages
 Requires:	libgdiplus
-Requires:	mono-lib
+
+# Temporary provides due to transient package, remove when rawhide is settled
+Obsoletes:      mono-lib
+Provides:       mono-lib
 
 %description core
 This package contains the core of the Mono runtime including its
@@ -60,20 +53,24 @@
 tools and libraries (corlib, XML, System.Security, ZipLib,
 I18N, Cairo and Mono.*).
 
-%package devtools
+%package devel
 Summary:        Development tools for Mono
 Group:          Development/Languages
 Requires:       mono-core = %{version}-%{release}
 Requires:       glib2-devel
-# We changed the name of this from mono-devel to avoid multilib issues (#185690)
-Provides:	mono-devel
-Obsoletes: 	mono-devel
 
+# Temporary provides due to transient package, remove when rawhide is settled
+Obsoletes:      mono-lib-devel
+Provides:       mono-lib-devel
 
-%description devtools
+%description devel
 This package completes the Mono developer toolchain with the mono profiler,
 assembler and other various tools.
 
+# Temporary provides due to transient package, remove when rawhide is settled
+Obsoletes:      mono-devtools
+Provides:       mono-devtools
+
 %package nunit
 Summary:        NUnit Testing Framework
 Group:          Development/Languages
@@ -230,7 +227,7 @@
 no longer maintained. MySQL AB now provides MySQL Connector/Net
 which is fully managed and actively maintained.
 
-%define monodir %_prefix/lib/mono
+%define monodir %{_libdir}/mono
 %define gac_dll(dll)  %{monodir}/gac/%{1} \
   %{monodir}/?.0/%{1}.dll \
   %{nil}
@@ -251,6 +248,8 @@
 %setup -q
 %patch1 -p1 -b .selinux-ia64
 %patch2 -p1 -b .ppc-threading
+%patch3 -p1 -b .libdir
+%patch4 -p1 -b .use-monodir
 
 %build
 %ifarch ia64 s390
@@ -258,17 +257,18 @@
 %else
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %endif
+autoreconf --force --install
+
+gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
 
 %configure --with-ikvm=yes --with-jit=yes
 make
 
+
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-
-# Libtool is on crack, installing the shell wrappers
-cp mono/dis/.libs/monodis $RPM_BUILD_ROOT%{_bindir}
-cp mono/monograph/.libs/monograph $RPM_BUILD_ROOT%{_bindir}
+install monodir $RPM_BUILD_ROOT%{_bindir}
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.a
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -298,22 +298,11 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%files lib
-%defattr(-,root,root,-)
-%{_libdir}/libmono.so.*
-%{_libdir}/libMonoPosixHelper.so
-%{_libdir}/libMonoSupportW.so
-
-%files lib-devel
-%defattr(-,root,root,-)
-%{_libdir}/libmono.so
-%{_includedir}/mono
-%{_libdir}/pkgconfig/mono.pc
-
 %files core
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog NEWS README
 %{_bindir}/mono
+%{_bindir}/monodir
 %mono_bin certmgr
 %mono_bin chktrust
 %mono_bin gacutil
@@ -322,6 +311,9 @@
 %mono_bin mozroots
 %mono_bin setreg
 %mono_bin sn
+%{_libdir}/libmono.so.*
+%{_libdir}/libMonoPosixHelper.so
+%{_libdir}/libMonoSupportW.so
 %{_mandir}/man1/certmgr.1.gz
 %{_mandir}/man1/chktrust.1.gz
 %{_mandir}/man1/gacutil.1.gz
@@ -364,7 +356,7 @@
 %config /etc/mono/2.0/machine.config
 %{_libdir}/libikvm-native.so
 
-%files devtools
+%files devel
 %defattr(-,root,root,-)
 %{_bindir}/monodis
 %{_bindir}/pedump
@@ -411,6 +403,7 @@
 %{_mandir}/man1/prj2make.1.gz
 %{_mandir}/man1/secutil.1.gz
 %{_mandir}/man1/signcode.1.gz
+%{_mandir}/man1/monoburg.*
 %gac_dll PEAPI
 %gac_dll Microsoft.Build.Engine
 %gac_dll Microsoft.Build.Framework
@@ -419,9 +412,11 @@
 %{_bindir}/monograph
 %{_libdir}/libmono-profiler-aot.*
 %{_libdir}/libmono-profiler-cov.*
+%{_libdir}/libmono.so
 %{_libdir}/pkgconfig/dotnet.pc
 %{_libdir}/pkgconfig/mono-cairo.pc
-%{_mandir}/man1/monoburg.*
+%{_libdir}/pkgconfig/mono.pc
+%{_includedir}/mono
 %{_datadir}/mono/cil/cil-opcodes.xml
 %dir %{_datadir}/mono
 %dir %{_datadir}/mono/cil
@@ -537,6 +532,11 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16.1-2
+- Move gac to libdir to be multilib compat
+- rename mono-devtools back to mono-devel
+- kill mono-lib and mono-lib-devel
+
 * Mon Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16.1-1
 - Update to 1.1.16.1
 - Split out mono libs and devel headers to fix lib64 conflicts (#199790)



From fedora-cvs-commits at redhat.com  Fri Aug 18 13:44:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 09:44:37 -0400
Subject: rpms/werken-xpath/devel werken-xpath.spec,1.3,1.4
Message-ID: <200608181344.k7IDibeR020783@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/werken-xpath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20580

Modified Files:
	werken-xpath.spec 
Log Message:
Merge with upstream
(Add requires for post and postun javadoc sections)




Index: werken-xpath.spec
===================================================================
RCS file: /cvs/dist/rpms/werken-xpath/devel/werken-xpath.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- werken-xpath.spec	3 Aug 2006 19:51:56 -0000	1.3
+++ werken-xpath.spec	18 Aug 2006 13:44:34 -0000	1.4
@@ -36,7 +36,7 @@
 
 Name:           werken-xpath
 Version:        0.9.4
-Release:        0.beta.11jpp_2fc
+Release:        0.beta.12jpp.1
 Epoch:          0
 Summary:        XPath implementation using JDOM
 License:        Apache Software License-like
@@ -83,6 +83,9 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+BuildRequires:  java-javadoc
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 Provides:    werken.xpath-javadoc = %{epoch}-%{version}-%{release}
 Obsoletes:   werken.xpath-javadoc <= 0.9.4
 
@@ -193,6 +196,12 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:0.9.4-0.beta.12jpp.1
+- Merge with upstream
+
+* Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:0.9.4-0.beta.12jpp
+- Add requires for post and postun javadoc sections
+
 * Thu Aug 03 2006 Fernando Nasser <fnasser at redhat.com> 0:0.9.4-0.beta.11jpp_2fc
 - Remove define gcj_support and rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 13:48:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 09:48:22 -0400
Subject: rpms/werken-xpath/devel werken-xpath.spec,1.4,1.5
Message-ID: <200608181348.k7IDmMwr004845@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/werken-xpath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4772

Modified Files:
	werken-xpath.spec 
Log Message:
Re-add define gcj_support




Index: werken-xpath.spec
===================================================================
RCS file: /cvs/dist/rpms/werken-xpath/devel/werken-xpath.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- werken-xpath.spec	18 Aug 2006 13:44:34 -0000	1.4
+++ werken-xpath.spec	18 Aug 2006 13:48:20 -0000	1.5
@@ -28,6 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define _gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define dotname werken.xpath
@@ -198,6 +200,7 @@
 %changelog
 * Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:0.9.4-0.beta.12jpp.1
 - Merge with upstream
+- Re-add define gcj_support
 
 * Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:0.9.4-0.beta.12jpp
 - Add requires for post and postun javadoc sections



From fedora-cvs-commits at redhat.com  Fri Aug 18 13:49:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 09:49:27 -0400
Subject: rpms/mono/devel mono-1.1.16.1-use-monodir.patch, NONE,
	1.1 mono-libdir.patch, NONE, 1.1 monodir.c, NONE, 1.1
Message-ID: <200608181349.k7IDnRXB005298@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5243

Added Files:
	mono-1.1.16.1-use-monodir.patch mono-libdir.patch monodir.c 
Log Message:
add patches


mono-1.1.16.1-use-monodir.patch:
 mono-service.in |    2 +-
 script.in       |    2 +-
 script_umask.in |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE mono-1.1.16.1-use-monodir.patch ---
--- mono-1.1.16.1/scripts/script_umask.in.monodir	2006-08-17 15:19:51.000000000 +0200
+++ mono-1.1.16.1/scripts/script_umask.in	2006-08-17 15:20:30.000000000 +0200
@@ -1,3 +1,3 @@
 #!/bin/sh
 umask 077
-exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name at .exe "$@"
+exec @bindir@/@mono_interp@ `@bindir@/monodir`/@framework_version@/@exe_name at .exe "$@"
--- mono-1.1.16.1/scripts/mono-service.in.monodir	2006-08-17 15:19:37.000000000 +0200
+++ mono-1.1.16.1/scripts/mono-service.in	2006-08-17 15:21:22.000000000 +0200
@@ -29,4 +29,4 @@
 fi
 
 export MONO_DISABLE_SHM=1
-exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name at .exe $args </dev/null >& /dev/null &
+exec @bindir@/@mono_interp@ `@bindir@/monodir`/@framework_version@/@exe_name at .exe $args </dev/null >& /dev/null &
--- mono-1.1.16.1/scripts/script.in.monodir	2006-08-17 15:19:45.000000000 +0200
+++ mono-1.1.16.1/scripts/script.in	2006-08-17 15:20:51.000000000 +0200
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name at .exe "$@"
+exec @bindir@/@mono_interp@ `@bindir@/monodir`/@framework_version@/@exe_name at .exe "$@"

mono-libdir.patch:
 mono-1.1.16.1/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs |    2 +-
 mono-1.1.16.1/mcs/tools/gacutil/driver.cs                                                     |    2 +-
 mono-1.1.16.1/mono/metadata/Makefile.am                                                       |    2 +-
 mono-1.1.16.1/mono/metadata/assembly.c                                                        |    8 ++++----
 mono-1.1.16/configure.in                                                                      |    2 +-
 mono-1.1.16/mcs/build/config-default.make                                                     |    2 +-
 mono-1.1.16/mcs/build/profiles/atomic.make                                                    |    6 +++---
 mono-1.1.16/mcs/class/Mono.Globalization/Makefile                                             |    4 ++--
 mono-1.1.16/mcs/tools/cilc/res-Makefile                                                       |    2 +-
 mono-1.1.16/mint.pc.in                                                                        |    2 +-
 mono-1.1.16/mono-cairo.pc.in                                                                  |    2 +-
 mono-1.1.16/mono/metadata/Makefile.am                                                         |    2 +-
 mono-1.1.16/scripts/Makefile.am                                                               |    2 +-
 mono-1.1.16/scripts/mono-nunit.pc.in                                                          |    2 +-
 14 files changed, 20 insertions(+), 20 deletions(-)

--- NEW FILE mono-libdir.patch ---
Index: mono-1.1.16/configure.in
===================================================================
--- mono-1.1.16.orig/configure.in
+++ mono-1.1.16/configure.in
@@ -2000,7 +2000,7 @@ fi
   if test x$cross_compiling = xno; then
     echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
     echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
-    echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
+    echo "mono_libdir=$libdir" >> $srcdir/$mcsdir/build/config.make
     echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
     echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
     echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
Index: mono-1.1.16/mono/metadata/Makefile.am
===================================================================
--- mono-1.1.16.orig/mono/metadata/Makefile.am
+++ mono-1.1.16/mono/metadata/Makefile.am
@@ -9,7 +9,7 @@ else
 # The mingw math.h has "extern inline" functions that dont appear in libs, so
 # optimisation is required to actually inline them
 AM_CFLAGS = -O
-assembliesdir = $(exec_prefix)/lib
+assembliesdir = $(libdir)
 confdir = $(sysconfdir)
 endif
 
Index: mono-1.1.16/scripts/Makefile.am
===================================================================
--- mono-1.1.16.orig/scripts/Makefile.am
+++ mono-1.1.16/scripts/Makefile.am
@@ -80,7 +80,7 @@ plat_bindir = $(shell cygpath -m $(libdi
 mono_instdir = $(shell cygpath -m $(libdir))/mono
 else
 plat_bindir = $(bindir)
-mono_instdir = $(prefix)/lib/mono
+mono_instdir = $(libdir)/mono
 endif
 
 REWRITE_COMMON = sed \
Index: mono-1.1.16/scripts/mono-nunit.pc.in
===================================================================
--- mono-1.1.16.orig/scripts/mono-nunit.pc.in
+++ mono-1.1.16/scripts/mono-nunit.pc.in
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@reloc_libdir@
 
 
 Name: Mono NUnit
Index: mono-1.1.16/mint.pc.in
===================================================================
--- mono-1.1.16.orig/mint.pc.in
+++ mono-1.1.16/mint.pc.in
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
+libdir=${prefix}/@reloc_libdir@
 includedir=${prefix}/include
 
 
Index: mono-1.1.16/mono-cairo.pc.in
===================================================================
--- mono-1.1.16.orig/mono-cairo.pc.in
+++ mono-1.1.16/mono-cairo.pc.in
@@ -6,4 +6,4 @@ includedir=${prefix}/include
 Name: Mono.Cairo
 Description: Cairo bindings for Mono
 Version: @VERSION@
-Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll
+Libs: -r:${libdir}/mono/1.0/Mono.Cairo.dll
Index: mono-1.1.16/mcs/build/config-default.make
===================================================================
--- mono-1.1.16.orig/mcs/build/config-default.make
+++ mono-1.1.16/mcs/build/config-default.make
@@ -17,7 +17,7 @@ LIBRARY_FLAGS = /noconfig
 CFLAGS = -g -O2
 prefix = /usr/local
 exec_prefix = $(prefix)
-mono_libdir = $(exec_prefix)/lib
+mono_libdir = $(libdir)
 #RUNTIME = mono
 RUNTIME = false
 TEST_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
Index: mono-1.1.16/mcs/build/profiles/atomic.make
===================================================================
--- mono-1.1.16.orig/mcs/build/profiles/atomic.make
+++ mono-1.1.16/mcs/build/profiles/atomic.make
@@ -15,14 +15,14 @@ MCS = $(BOOTSTRAP_MCS)
 
 # Get our installed libraries (an issue on windows)
 
-PROFILE_MCS_FLAGS = /lib:$(prefix)/lib
+PROFILE_MCS_FLAGS = /lib:$(libdir)
 
 # Check that installed libraries even exist.
 
 profile-check:
-	@if test '!' -f $(prefix)/lib/I18N.dll ; then \
+	@if test '!' -f $(libdir)/I18N.dll ; then \
 	    echo ; \
-	    echo "$(prefix)/lib/I18N.dll does not exist." ; \
+	    echo "$(libdir)/I18N.dll does not exist." ; \
 	    echo ; \
 	    echo "This probably means that you are building from a miniature" ; \
 	    echo "distribution of MCS or don't yet have an installed MCS at all." ; \
Index: mono-1.1.16/mcs/class/Mono.Globalization/Makefile
===================================================================
--- mono-1.1.16.orig/mcs/class/Mono.Globalization/Makefile
+++ mono-1.1.16/mcs/class/Mono.Globalization/Makefile
@@ -8,8 +8,8 @@ thelib = $(topdir)/class/lib/Mono.Global
 all-local: $(thelib)
 
 install-local:
-	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib
-	$(INSTALL_LIB) $(thelib) $(DESTDIR)$(prefix)/lib
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+	$(INSTALL_LIB) $(thelib) $(DESTDIR)$(libdir)
 
 clean-local:
 	rm -rf $(thelib) MonoCultures.cs write-source.exe
Index: mono-1.1.16/mcs/tools/cilc/res-Makefile
===================================================================
--- mono-1.1.16.orig/mcs/tools/cilc/res-Makefile
+++ mono-1.1.16/mcs/tools/cilc/res-Makefile
@@ -2,7 +2,7 @@ include defs.mk
 
 LIBNAME = $(shell echo $(basename $(SONAME)) | sed -e 's/^lib//')
 HTARGET = $(prefix)/include/$(LIBNAME)/
-LIBTARGET = $(prefix)/lib/
+LIBTARGET = $(libdir)
 
 CFLAGS += -static -fpic $(shell pkg-config --cflags glib-2.0 gobject-2.0 mono) $(EXTRAINCLUDES) -I.
 
--- mono-1.1.16.1/mono/metadata/Makefile.am.libdir	2006-07-05 23:55:46.000000000 +0200
+++ mono-1.1.16.1/mono/metadata/Makefile.am	2006-08-17 17:54:36.000000000 +0200
@@ -21,7 +21,7 @@
 #
 noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
 
 #
 # Make sure any prefix changes are updated in the binaries too.
--- mono-1.1.16.1/mono/metadata/assembly.c.libdir	2006-08-17 17:52:42.000000000 +0200
+++ mono-1.1.16.1/mono/metadata/assembly.c	2006-08-17 17:56:21.000000000 +0200
@@ -521,7 +521,7 @@
 	}
 
 	config = g_build_filename (base, "etc", NULL);
-	lib = g_build_filename (base, "lib", NULL);
+	lib = g_build_filename (base, MONO_RELOC_LIBDIR, NULL);
 	mono = g_build_filename (lib, "mono/1.0", NULL);
 	if (stat (mono, &buf) == -1)
 		fallback ();
@@ -1844,7 +1844,7 @@
 	if (extra_gac_paths) {
 		paths = extra_gac_paths;
 		while (!res && *paths) {
-			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
+			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", aname->name, NULL);
 			res = probe_for_partial_name (gacpath, fullname, aname, status);
 			g_free (gacpath);
 			paths++;
@@ -1908,7 +1908,7 @@
 		paths = extra_gac_paths;
 		while (!image && *paths) {
 			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
-					"lib", "mono", "gac", subpath, NULL);
+					MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
 			image = mono_image_open (fullpath, NULL);
 			g_free (fullpath);
 			paths++;
@@ -2058,7 +2058,7 @@
 	if (extra_gac_paths) {
 		paths = extra_gac_paths;
 		while (!result && *paths) {
-			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
+			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
 			result = mono_assembly_open_full (fullpath, status, refonly);
 			g_free (fullpath);
 			paths++;
--- mono-1.1.16.1/mcs/tools/gacutil/driver.cs.libdir	2006-08-17 15:40:14.000000000 +0200
+++ mono-1.1.16.1/mcs/tools/gacutil/driver.cs	2006-08-17 15:40:19.000000000 +0200
@@ -667,7 +667,7 @@
 		private static string EnsureLib (string dir)
 		{
 			DirectoryInfo d = new DirectoryInfo (dir);
-			if (d.Name == "lib")
+			if (d.Name == "lib" || d.Name == "lib64")
 				return dir;
 			return Path.Combine (dir, "lib");
 		}
--- mono-1.1.16.1/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs.libdir	2006-08-17 15:46:11.000000000 +0200
+++ mono-1.1.16.1/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs	2006-08-17 15:46:53.000000000 +0200
@@ -53,10 +53,10 @@
 			xbuildDir = Path.Combine (t2.FullName, "xbuild");
 			// /usr/local/lib
 			t3 = t2.Parent;
+			libDir = t3.FullName;
 			// /usr/local
 			t4 = t3.Parent;
 			binDir = Path.Combine (t4.FullName, "bin");
-			libDir = Path.Combine (t4.FullName, "lib");
 		}
 	
 		public static string GetBinDir ()


--- NEW FILE monodir.c ---
#include <stdio.h>

int
main (int argc, char *argv[]) {
  printf ("%s\n", MONODIR);
}



From fedora-cvs-commits at redhat.com  Fri Aug 18 14:01:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 10:01:29 -0400
Subject: rpms/mono/devel mono.spec,1.42,1.43
Message-ID: <200608181401.k7IE1Tig009493@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9456

Modified Files:
	mono.spec 
Log Message:
buildrequire libtool



Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mono.spec	18 Aug 2006 13:42:59 -0000	1.42
+++ mono.spec	18 Aug 2006 14:01:24 -0000	1.43
@@ -20,7 +20,7 @@
 BuildRequires:  libunwind
 %endif
 # Required for mono-libdir.patch
-BuildRequires: automake
+BuildRequires: automake libtool
 
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc



From fedora-cvs-commits at redhat.com  Fri Aug 18 14:16:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 10:16:20 -0400
Subject: rpms/gnu-getopt/devel gnu-getopt.spec,1.3,1.4
Message-ID: <200608181416.k7IEGK9o014808@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/gnu-getopt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13050

Modified Files:
	gnu-getopt.spec 
Log Message:
Merge with upstream
(Add requires for post and postun javadoc)




Index: gnu-getopt.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-getopt/devel/gnu-getopt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnu-getopt.spec	21 Jul 2006 14:12:24 -0000	1.3
+++ gnu-getopt.spec	18 Aug 2006 14:16:17 -0000	1.4
@@ -36,7 +36,7 @@
 
 Name:		gnu-getopt
 Version:	1.0.12
-Release:	2jpp_1fc
+Release:	3jpp.1
 Epoch:		0
 Summary:        Java getopt implementation
 License:        LGPL
@@ -69,6 +69,9 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+BuildRequires:  java-javadoc
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 Provides:	gnu.getopt-javadoc = %{epoch}:%{version}-%{release}
 Obsoletes:	gnu.getopt-javadoc <= 0:1.0.9
 
@@ -109,16 +112,16 @@
     %__rm -f %{_javadocdir}/%{name}
 fi
 
-%post
 %if %{gcj_support}
+%post
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%postun
 %if %{gcj_support}
+%postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -139,6 +142,12 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-3jpp.1
+- Merge with upstream
+
+* Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-3jpp
+- Add requires for post and postun javadoc
+
 * Fri Jul 21 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-2jpp_1fc
 - Merge with upstream
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 14:18:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 10:18:39 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch, 1.10,
	1.11 selinux-policy.spec, 1.252, 1.253
Message-ID: <200608181418.k7IEIdV8029021@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28976

Modified Files:
	policy-20060802.patch selinux-policy.spec 
Log Message:
* Fri Aug 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-1
- Update from upstream


policy-20060802.patch:
 mls                                  |    9 
 modules/admin/amanda.fc              |   51 ----
 modules/admin/anaconda.te            |   20 +
 modules/admin/bootloader.te          |    4 
 modules/admin/consoletype.te         |   11 -
 modules/admin/firstboot.te           |    2 
 modules/admin/prelink.te             |binary
 modules/admin/rpm.fc                 |    2 
 modules/admin/rpm.if                 |   13 -
 modules/admin/usermanage.te          |    5 
 modules/apps/java.fc                 |    9 
 modules/apps/mozilla.if              |    2 
 modules/apps/wine.te                 |    2 
 modules/kernel/corecommands.fc       |    1 
 modules/kernel/corecommands.if       |    1 
 modules/kernel/corenetwork.te.in     |    7 
 modules/kernel/devices.fc            |    2 
 modules/kernel/devices.if            |   37 +++
 modules/kernel/devices.te            |    8 
 modules/kernel/files.if              |   18 +
 modules/kernel/filesystem.te         |    2 
 modules/kernel/kernel.if             |   75 +++++++
 modules/kernel/terminal.if           |   19 +
 modules/services/amavis.te           |    7 
 modules/services/apache.te           |    1 
 modules/services/avahi.te            |    2 
 modules/services/bind.te             |    1 
 modules/services/ccs.fc              |    8 
 modules/services/ccs.if              |   45 ++++
 modules/services/ccs.te              |   84 +++++++
 modules/services/cpucontrol.te       |    2 
 modules/services/cron.if             |   17 +
 modules/services/cron.te             |    7 
 modules/services/cups.te             |   19 +
 modules/services/cyrus.te            |    5 
 modules/services/dbus.if             |    6 
 modules/services/dovecot.te          |    2 
 modules/services/inn.te              |    1 
 modules/services/ldap.te             |    2 
 modules/services/mta.fc              |    2 
 modules/services/ntp.te              |    2 
 modules/services/oddjob.fc           |    8 
 modules/services/oddjob.if           |   76 +++++++
 modules/services/oddjob.te           |   70 ++++++
 modules/services/oddjob_mkhomedir.fc |    6 
 modules/services/oddjob_mkhomedir.if |   24 ++
 modules/services/oddjob_mkhomedir.te |   26 ++
 modules/services/openvpn.te          |    2 
 modules/services/pegasus.if          |   31 ++
 modules/services/pegasus.te          |    5 
 modules/services/postfix.te          |    7 
 modules/services/procmail.te         |    1 
 modules/services/radius.te           |    2 
 modules/services/ricci.fc            |   20 +
 modules/services/ricci.if            |  184 +++++++++++++++++
 modules/services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++
 modules/services/rpc.if              |    2 
 modules/services/rpc.te              |    5 
 modules/services/samba.te            |    8 
 modules/services/setroubleshoot.fc   |    9 
 modules/services/setroubleshoot.if   |    3 
 modules/services/setroubleshoot.te   |  110 ++++++++++
 modules/services/spamassassin.te     |    4 
 modules/services/squid.te            |    4 
 modules/services/ssh.if              |   24 ++
 modules/services/sysstat.te          |    3 
 modules/services/xserver.if          |   69 ++++++
 modules/services/xserver.te          |   19 +
 modules/system/authlogin.if          |   42 ++-
 modules/system/authlogin.te          |   19 +
 modules/system/fstools.te            |    1 
 modules/system/hostname.te           |   10 
 modules/system/init.if               |    7 
 modules/system/init.te               |    2 
 modules/system/libraries.fc          |    7 
 modules/system/locallogin.te         |    4 
 modules/system/logging.fc            |    3 
 modules/system/logging.if            |   21 +
 modules/system/logging.te            |    3 
 modules/system/miscfiles.fc          |    1 
 modules/system/miscfiles.if          |   18 +
 modules/system/modutils.te           |    1 
 modules/system/mount.te              |    3 
 modules/system/selinuxutil.te        |   15 +
 modules/system/udev.fc               |    1 
 modules/system/udev.te               |    1 
 modules/system/unconfined.if         |    2 
 modules/system/unconfined.te         |    5 
 modules/system/userdomain.if         |  264 +++++++++++++++++-------
 modules/system/userdomain.te         |   52 ++--
 modules/system/xen.if                |   38 +++
 modules/system/xen.te                |   26 +-
 92 files changed, 1896 insertions(+), 258 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.10 -r 1.11 policy-20060802.patch
Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- policy-20060802.patch	12 Aug 2006 11:54:51 -0000	1.10
+++ policy-20060802.patch	18 Aug 2006 14:18:35 -0000	1.11
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.7/policy/mls
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.8/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.7/policy/mls	2006-08-12 07:18:46.000000000 -0400
++++ serefpolicy-2.3.8/policy/mls	2006-08-18 07:38:02.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -22,9 +22,76 @@
  mlsconstrain dir { add_name remove_name reparent rmdir }
  	((( l1 dom l2 ) and ( l1 domby h2 )) or
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.7/policy/modules/admin/anaconda.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-2.3.8/policy/modules/admin/amanda.fc
+--- nsaserefpolicy/policy/modules/admin/amanda.fc	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/amanda.fc	2006-08-18 08:12:54.000000000 -0400
+@@ -9,62 +9,13 @@
+ /tmp/amanda(/.*)?			gen_context(system_u:object_r:amanda_tmp_t,s0)
+ 
+ /usr/lib(64)?/amanda		-d	gen_context(system_u:object_r:amanda_usr_lib_t,s0)
++/usr/lib(64)?/amanda/.+		--	gen_context(system_u:object_r:amanda_exec_t,s0)
+ /usr/lib(64)?/amanda/amandad	--	gen_context(system_u:object_r:amanda_inetd_exec_t,s0)
+-/usr/lib(64)?/amanda/amcat\.awk	--	gen_context(system_u:object_r:amanda_script_exec_t,s0)
+-/usr/lib(64)?/amanda/amcleanupdisk --	gen_context(system_u:object_r:amanda_exec_t,s0)
+ /usr/lib(64)?/amanda/amidxtaped	--	gen_context(system_u:object_r:amanda_inetd_exec_t,s0)
+ /usr/lib(64)?/amanda/amindexd	--	gen_context(system_u:object_r:amanda_inetd_exec_t,s0)
+-/usr/lib(64)?/amanda/amlogroll	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/amplot\.awk --	gen_context(system_u:object_r:amanda_script_exec_t,s0)
+-/usr/lib(64)?/amanda/amplot\.g	--	gen_context(system_u:object_r:amanda_script_exec_t,s0)
+-/usr/lib(64)?/amanda/amplot\.gp	--	gen_context(system_u:object_r:amanda_script_exec_t,s0)
+-/usr/lib(64)?/amanda/amtrmidx	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/amtrmlog	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/calcsize	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/chg-chio	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/chg-chs	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/chg-manual	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/chg-mtx	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/chg-multi	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/chg-rth	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/chg-scsi	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/chg-zd-mtx	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/driver	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/dumper	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/killpgrp	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/patch-system --	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/planner	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/rundump	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/runtar	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/selfcheck	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/sendbackup	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/sendsize	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/taper	--	gen_context(system_u:object_r:amanda_exec_t,s0)
+-/usr/lib(64)?/amanda/versionsuffix --	gen_context(system_u:object_r:amanda_exec_t,s0)
+-
+-/usr/sbin/amadmin		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amcheck		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amcheckdb		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amcleanup		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amdump		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amflush		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amgetconf		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amlabel		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amoverview		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amplot		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+ /usr/sbin/amrecover		--	gen_context(system_u:object_r:amanda_recover_exec_t,s0)
+-/usr/sbin/amreport		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amrestore		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amrmtape		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amstatus		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amtape		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amtoc			--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-/usr/sbin/amverify		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
+-
+ /var/lib/amanda			-d	gen_context(system_u:object_r:amanda_var_lib_t,s0)
+ /var/lib/amanda/\.amandahosts	--	gen_context(system_u:object_r:amanda_config_t,s0)
+-/var/lib/amanda/\.bashrc	--	gen_context(system_u:object_r:amanda_shellconfig_t,s0)
+-/var/lib/amanda/\.profile	--	gen_context(system_u:object_r:amanda_shellconfig_t,s0)
+ /var/lib/amanda/disklist	--	gen_context(system_u:object_r:amanda_data_t,s0)
+ /var/lib/amanda/gnutar-lists(/.*)?	gen_context(system_u:object_r:amanda_gnutarlists_t,s0)
+ /var/lib/amanda/index			gen_context(system_u:object_r:amanda_data_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.8/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/admin/anaconda.te	2006-08-12 07:18:46.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/anaconda.te	2006-08-18 07:38:02.000000000 -0400
 @@ -25,8 +25,12 @@
  
  modutils_domtrans_insmod(anaconda_t)
@@ -67,9 +134,9 @@
 +dontaudit domain anaconda_t:fifo_file r_file_perms;
 +dontaudit domain anaconda_t:unix_stream_socket connectto;
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.7/policy/modules/admin/bootloader.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.8/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/admin/bootloader.te	2006-08-12 07:18:46.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/bootloader.te	2006-08-18 07:38:02.000000000 -0400
 @@ -83,8 +83,10 @@
  dev_read_rand(bootloader_t)
  dev_read_urand(bootloader_t)
@@ -82,9 +149,9 @@
  
  fs_getattr_xattr_fs(bootloader_t)
  fs_getattr_tmpfs(bootloader_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.7/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.8/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/admin/consoletype.te	2006-08-12 07:18:46.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/consoletype.te	2006-08-18 07:38:02.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -107,9 +174,9 @@
 +optional_policy(`
 +	xen_dontaudit_use_fds(consoletype_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.7/policy/modules/admin/firstboot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.8/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/admin/firstboot.te	2006-08-12 07:18:46.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/firstboot.te	2006-08-18 07:38:02.000000000 -0400
 @@ -106,7 +106,7 @@
  ')
  
@@ -119,26 +186,10 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.7/policy/modules/admin/prelink.te
---- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/admin/prelink.te	2006-08-12 07:18:46.000000000 -0400
-@@ -1,4 +1,3 @@
--
- policy_module(prelink,1.1.5)
- 
- ########################################
-@@ -74,6 +73,8 @@
- 
- miscfiles_read_localization(prelink_t)
- 
-+selinux_get_enforce_mode(prelink_t)
-+
- optional_policy(`
- 	cron_system_entry(prelink_t, prelink_exec_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.7/policy/modules/admin/rpm.fc
+Binary files nsaserefpolicy/policy/modules/admin/prelink.te and serefpolicy-2.3.8/policy/modules/admin/prelink.te differ
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.8/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/admin/rpm.fc	2006-08-12 07:18:46.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/rpm.fc	2006-08-18 07:38:02.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -148,9 +199,9 @@
  ')
  
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.7/policy/modules/admin/rpm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.8/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/admin/rpm.if	2006-08-12 07:18:46.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/rpm.if	2006-08-18 07:38:02.000000000 -0400
 @@ -75,12 +75,13 @@
  	')
  
@@ -171,9 +222,9 @@
  	allow rpm_t $3:chr_file rw_term_perms;
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.7/policy/modules/admin/usermanage.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.8/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/admin/usermanage.te	2006-08-12 07:18:46.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/usermanage.te	2006-08-18 07:38:02.000000000 -0400
 @@ -260,7 +260,7 @@
  ')
  
@@ -183,7 +234,15 @@
  	nscd_socket_use(groupadd_t)
  ')
  
-@@ -535,7 +535,7 @@
+@@ -486,6 +486,7 @@
+ auth_relabel_shadow(useradd_t)
+ auth_etc_filetrans_shadow(useradd_t)
+ auth_rw_lastlog(useradd_t)
++auth_rw_faillog(useradd_t)
+ auth_use_nsswitch(useradd_t)
+ 
+ corecmd_exec_shell(useradd_t)
+@@ -535,7 +536,7 @@
[...1658 lines suppressed...]
+@@ -357,6 +423,10 @@
+ 	')
+ 
+ 	optional_policy(`
++		jabber_tcp_connect($1_t)
++	')
++
++	optional_policy(`
+ 		mta_rw_spool($1_t)
+ 	')
+ 
+@@ -373,6 +443,10 @@
+ 	')
+ 
+ 	optional_policy(`
++		nessus_tcp_connect($1_t)
++	')
++
++	optional_policy(`
+ 		nscd_socket_use($1_t)
+ 	')
+ 
+@@ -426,8 +500,10 @@
  		xserver_stream_connect_xdm($1_t)
  		# certain apps want to read xdm.pid file
  		xserver_read_xdm_pid($1_t)
@@ -2916,7 +3413,7 @@
  	')
  ')
  
-@@ -501,6 +549,7 @@
+@@ -457,6 +533,7 @@
  
  	# Inherit rules for ordinary users.
  	base_user_template($1)
@@ -2924,7 +3421,7 @@
  
  	typeattribute $1_t unpriv_userdomain;
  	domain_interactive_fd($1_t)
-@@ -521,9 +570,6 @@
+@@ -477,9 +554,6 @@
  	# Local policy
  	#
  
@@ -2934,7 +3431,7 @@
  	# Rules used to associate a homedir as a mountpoint
  	allow $1_home_t self:filesystem associate;
  	allow $1_file_type $1_home_t:filesystem associate;
-@@ -535,10 +581,6 @@
+@@ -491,10 +565,6 @@
  	allow privhome $1_home_t:sock_file create_file_perms;
  	allow privhome $1_home_t:fifo_file create_file_perms;
  	type_transition privhome $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
@@ -2945,7 +3442,7 @@
  	dev_read_sysfs($1_t)
  
  	corecmd_exec_all_executables($1_t)
-@@ -546,11 +588,8 @@
+@@ -502,11 +572,8 @@
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
  
@@ -2958,7 +3455,7 @@
  	# Read directories and files with the readable_t type.
  	# This type is a general type for "world"-readable files.
  	files_list_world_readable($1_t)
-@@ -558,8 +597,6 @@
+@@ -514,8 +581,6 @@
  	files_read_world_readable_symlinks($1_t)
  	files_read_world_readable_pipes($1_t)
  	files_read_world_readable_sockets($1_t)
@@ -2967,7 +3464,7 @@
  
  	init_read_utmp($1_t)
  	# The library functions always try to open read-write first,
-@@ -665,6 +702,8 @@
+@@ -621,6 +686,8 @@
  
  	# do not audit read on disk devices
  	dontaudit $1_t { removable_device_t fixed_disk_device_t }:blk_file read;
@@ -2976,7 +3473,7 @@
  
  	ifdef(`xdm.te', `
  		allow xdm_t $1_home_t:lnk_file read;
-@@ -701,8 +740,6 @@
+@@ -657,8 +724,6 @@
  	# Do not audit write denials to /etc/ld.so.cache.
  	dontaudit $1_t ld_so_cache_t:file write;
  
@@ -2985,7 +3482,7 @@
  	allow $1_t initrc_t:fifo_file write;
  	') dnl end TODO
  ')
-@@ -748,6 +785,7 @@
+@@ -704,6 +769,7 @@
  
  	# Inherit rules for ordinary users.
  	base_user_template($1)
@@ -2993,7 +3490,7 @@
  
  	typeattribute $1_t privhome;
  	domain_obj_id_change_exemption($1_t)
-@@ -783,11 +821,6 @@
+@@ -736,11 +802,6 @@
  
  	allow $1_t self:netlink_audit_socket nlmsg_readpriv;
  
@@ -3005,7 +3502,7 @@
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -855,6 +888,7 @@
+@@ -806,6 +867,7 @@
  	domain_getattr_all_sockets($1_t)
  
  	files_exec_usr_src_files($1_t)
@@ -3013,7 +3510,7 @@
  
  	init_rw_initctl($1_t)
  
-@@ -3408,6 +3442,25 @@
+@@ -3359,6 +3421,25 @@
  
  ########################################
  ## <summary>
@@ -3039,7 +3536,7 @@
  ##	Read files in the staff users home directory.
  ## </summary>
  ## <param name="domain">
-@@ -4128,7 +4181,7 @@
+@@ -4079,7 +4160,7 @@
  	gen_require(`
  		type user_home_dir_t;
  	')
@@ -3048,7 +3545,7 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-@@ -4789,3 +4842,34 @@
+@@ -4740,3 +4821,34 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -3083,9 +3580,9 @@
 +        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.7/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/system/userdomain.te	2006-08-12 07:18:46.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.8/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-08-16 08:46:31.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/userdomain.te	2006-08-18 07:38:03.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -3168,7 +3665,18 @@
  	', `
  		logging_manage_audit_log(sysadm_t)
  		logging_manage_audit_config(sysadm_t)
-@@ -443,11 +439,11 @@
+@@ -417,6 +413,10 @@
+ 	')
+ 
+ 	optional_policy(`
++		radius_use(sysadm_t,sysadm_r,admin_terminal)
++	')
++
++	optional_policy(`
+ 		rpm_run(sysadm_t,sysadm_r,admin_terminal)
+ 	')
+ 
+@@ -439,11 +439,11 @@
  			selinux_set_parameters(secadm_t)
  
  			seutil_manage_bin_policy(secadm_t)
@@ -3185,9 +3693,9 @@
  		', `
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.7/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.8/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/system/xen.if	2006-08-12 07:18:46.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/xen.if	2006-08-18 07:38:03.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -3230,9 +3738,9 @@
 +
 +	dontaudit $1 xend_t:fd use;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.7/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.8/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/system/xen.te	2006-08-12 07:18:46.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/xen.te	2006-08-18 07:38:03.000000000 -0400
 @@ -69,7 +69,10 @@
  #
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- selinux-policy.spec	12 Aug 2006 11:54:51 -0000	1.252
+++ selinux-policy.spec	18 Aug 2006 14:18:35 -0000	1.253
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.7
+Version: 2.3.8
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Fri Aug 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-1
+- Update from upstream
+
 * Sat Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-1
 - Update from upstream
 - More java fixes



From fedora-cvs-commits at redhat.com  Fri Aug 18 14:41:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 10:41:16 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-xkb-in-xnest.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.149, 1.150
Message-ID: <200608181441.k7IEfGCk003372@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3285

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-xkb-in-xnest.patch 
Log Message:
* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-23.fc6
- xorg-x11-server-1.1.1-xkb-in-xnest.patch: Added. (#193431)


xorg-x11-server-1.1.1-xkb-in-xnest.patch:
 miinitext.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.1-xkb-in-xnest.patch ---
--- xorg-server-1.1.1/mi/miinitext.c.xkb-in-xnest	2006-07-05 14:38:48.000000000 -0400
+++ xorg-server-1.1.1/mi/miinitext.c	2006-08-17 22:57:27.000000000 -0400
@@ -595,7 +595,7 @@
 #ifdef XSYNC
     if (!noSyncExtension) SyncExtensionInit();
 #endif
-#if defined(XKB) && !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
+#if defined(XKB) && !defined(PRINT_ONLY_SERVER)
     if (!noXkbExtension) XkbExtensionInit();
 #endif
 #ifdef XCMISC


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- xorg-x11-server.spec	18 Aug 2006 00:52:50 -0000	1.149
+++ xorg-x11-server.spec	18 Aug 2006 14:41:13 -0000	1.150
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   22%{?dist}
+Release:   23%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -24,6 +24,7 @@
 Patch4:    xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch
 Patch5:    xorg-x11-server-libxf86config-dont-write-empty-sections.patch
 Patch6:    xorg-x11-server-1.1.1-builderstring.patch
+Patch7:    xorg-x11-server-1.1.1-xkb-in-xnest.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -329,6 +330,7 @@
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
 %patch5 -p0 -b .libxf86config-dont-write-empty-sections
 %patch6 -p1 -b .builderstring
+%patch7 -p1 -b .xkb-in-xnest
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -693,6 +695,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-23.fc6
+- xorg-x11-server-1.1.1-xkb-in-xnest.patch: Added. (#193431)
+
 * Thu Aug 17 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-22.fc6
 - xorg-x11-server-1.1.1-infer-virtual.patch: When no modes or virtual size
   are given in the config file, attempt to pick a sensible one by examining



From fedora-cvs-commits at redhat.com  Fri Aug 18 14:52:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 10:52:33 -0400
Subject: rpms/cups/devel cups.spec,1.248,1.249
Message-ID: <200608181452.k7IEqWph020941@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20884

Modified Files:
	cups.spec 
Log Message:
* Fri Aug 18 2006 Tim Waugh <twaugh at redhat.com>
- Own notifier directory (bug #203085).



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- cups.spec	17 Aug 2006 12:18:12 -0000	1.248
+++ cups.spec	18 Aug 2006 14:52:30 -0000	1.249
@@ -376,8 +376,7 @@
 %{cups_serverbin}/daemon/cups-polld
 %{cups_serverbin}/daemon/cups-deviced
 %{cups_serverbin}/daemon/cups-driverd
-%{cups_serverbin}/notifier/mailto
-%{cups_serverbin}/notifier/testnotify
+%{cups_serverbin}/notifier
 %{cups_serverbin}/filter
 %{cups_serverbin}/monitor
 %{cups_serverbin}/driver
@@ -421,6 +420,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Aug 18 2006 Tim Waugh <twaugh at redhat.com>
+- Own notifier directory (bug #203085).
+
 * Thu Aug 17 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-12
 - Apply patch to fix STR #1880 (bug #200205).
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 14:52:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 10:52:59 -0400
Subject: rpms/xorg-x11-drv-ati/devel mach64-cpio-for-ia64.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.38, 1.39
Message-ID: <200608181452.k7IEqxWR021099@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21066

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	mach64-cpio-for-ia64.patch 
Log Message:
* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-9.fc6
- mach64-cpio-for-ia64.patch: Enable CPIO for mach64 on ia64. (#203017)


mach64-cpio-for-ia64.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mach64-cpio-for-ia64.patch ---
This enables CPIO on ia64, which makes mach64 work at the expense of mach32.
We can probably safely say that the intersection of ia64 users and mach32
users is negligible, but unfortunately mach64 is somehow quite common in ia64
machines.  - ajax

--- xf86-video-ati-6.6.1/configure.ac.jx	2006-06-16 02:17:28.000000000 -0400
+++ xf86-video-ati-6.6.1/configure.ac	2006-08-18 10:40:24.000000000 -0400
@@ -135,7 +135,7 @@
     ATIMISC_TV_OUT=yes
     ATIMISC_CPIO=yes
     ;;
-  x86_64|amd64|alpha)
+  x86_64|amd64|alpha|ia64)
     ATIMISC_CPIO=yes
     ;;
   sparc)


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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xorg-x11-drv-ati.spec	11 Aug 2006 00:01:47 -0000	1.38
+++ xorg-x11-drv-ati.spec	18 Aug 2006 14:52:56 -0000	1.39
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -32,6 +32,9 @@
 # Rage 128 patches (100-199)
 Patch100:  r128-missing-xf86ForceHWCursor-symbol-bug168753.patch
 
+# mach64 patches (200-299)
+Patch200:  mach64-cpio-for-ia64.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
@@ -53,6 +56,7 @@
 %patch1 -p1 -b .rn50-dri
 %patch2 -p1 -b .xpress-200
 %patch100 -p0 -b .r128-missing-xf86ForceHWCursor-symbol-bug168753
+%patch200 -p1 -b .mach64-for-ia64
 
 %build
 %configure --disable-static
@@ -96,6 +100,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-9.fc6
+- mach64-cpio-for-ia64.patch: Enable CPIO for mach64 on ia64. (#203017)
+
 * Thu Aug 10 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-8.fc6
 - radeon-6.6.1-xpress-200.patch: Also disable DRI on xpress200, known broken.
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 14:54:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 10:54:30 -0400
Subject: rpms/cups/FC-5 cups.spec,1.210,1.211
Message-ID: <200608181454.k7IEsUC5021672@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21621

Modified Files:
	cups.spec 
Log Message:
* Fri Aug 18 2006 Tim Waugh <twaugh at redhat.com>
- Own notifier directory (bug #203085).



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- cups.spec	17 Aug 2006 12:22:33 -0000	1.210
+++ cups.spec	18 Aug 2006 14:54:27 -0000	1.211
@@ -371,8 +371,7 @@
 %{cups_serverbin}/daemon/cups-polld
 %{cups_serverbin}/daemon/cups-deviced
 %{cups_serverbin}/daemon/cups-driverd
-%{cups_serverbin}/notifier/mailto
-%{cups_serverbin}/notifier/testnotify
+%{cups_serverbin}/notifier
 %{cups_serverbin}/filter
 %{cups_serverbin}/monitor
 %{cups_serverbin}/driver
@@ -416,6 +415,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Aug 18 2006 Tim Waugh <twaugh at redhat.com>
+- Own notifier directory (bug #203085).
+
 * Thu Aug 16 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.8
 - Apply patch to fix STR #1880 (bug #200205).
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:06:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:06:22 -0400
Subject: rpms/gtk-sharp2/devel gtk-sharp-2.9.0-libdir.patch, NONE,
	1.1 gtk-sharp-2.9.0-monodir.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 gtk-sharp2.spec, 1.14, 1.15 sources, 1.5, 1.6
Message-ID: <200608181506.k7IF6M2L025092@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gtk-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25050

Modified Files:
	.cvsignore gtk-sharp2.spec sources 
Added Files:
	gtk-sharp-2.9.0-libdir.patch gtk-sharp-2.9.0-monodir.patch 
Log Message:
* Mon Aug 14 2006 Alexander Larsson <alexl at redhat.com> - 2.9.0-1
- update to 2.9.0, which splits out gnome stuff to gnome-sharp
- Split out devel package



gtk-sharp-2.9.0-libdir.patch:
 generator/Makefile.am          |    2 +-
 glade/glade-sharp-2.0.pc.in    |    2 +-
 glib/glib-sharp-2.0.pc.in      |    2 +-
 gtk/gtk-sharp-2.0.pc.in        |    2 +-
 gtkdotnet/gtk-dotnet-2.0.pc.in |    2 +-
 parser/Makefile.am             |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE gtk-sharp-2.9.0-libdir.patch ---
--- gtk-sharp-2.9.0/glib/glib-sharp-2.0.pc.in.libdir	2006-08-18 14:08:44.000000000 +0200
+++ gtk-sharp-2.9.0/glib/glib-sharp-2.0.pc.in	2006-08-18 14:10:16.000000000 +0200
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 
 
 Name: GLib#
--- gtk-sharp-2.9.0/parser/Makefile.am.libdir	2006-08-18 11:28:21.000000000 +0200
+++ gtk-sharp-2.9.0/parser/Makefile.am	2006-08-18 11:28:44.000000000 +0200
@@ -1,4 +1,4 @@
-assemblydir = $(prefix)/lib/gtk-sharp-2.0
+assemblydir = $(libdir)/gtk-sharp-2.0
 pkgconfigdir = $(libdir)/pkgconfig
 assembly_DATA = gapi-fixup.exe gapi-parser.exe
 pkgconfig_DATA = gapi-2.0.pc
--- gtk-sharp-2.9.0/generator/Makefile.am.libdir	2006-08-18 11:28:15.000000000 +0200
+++ gtk-sharp-2.9.0/generator/Makefile.am	2006-08-18 11:28:48.000000000 +0200
@@ -1,4 +1,4 @@
-assemblydir = $(prefix)/lib/gtk-sharp-2.0
+assemblydir = $(libdir)/gtk-sharp-2.0
 assembly_DATA = gapi_codegen.exe
 bin_SCRIPTS = gapi2-codegen
 CLEANFILES = gapi_codegen.exe
--- gtk-sharp-2.9.0/gtkdotnet/gtk-dotnet-2.0.pc.in.libdir	2006-08-18 14:08:44.000000000 +0200
+++ gtk-sharp-2.9.0/gtkdotnet/gtk-dotnet-2.0.pc.in	2006-08-18 14:10:08.000000000 +0200
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 
 
 Name: Gtk.DotNet
--- gtk-sharp-2.9.0/gtk/gtk-sharp-2.0.pc.in.libdir	2006-08-18 14:08:44.000000000 +0200
+++ gtk-sharp-2.9.0/gtk/gtk-sharp-2.0.pc.in	2006-08-18 14:09:35.000000000 +0200
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 gapidir=${prefix}/share/gapi-2.0
 
 
--- gtk-sharp-2.9.0/glade/glade-sharp-2.0.pc.in.libdir	2006-08-18 14:08:44.000000000 +0200
+++ gtk-sharp-2.9.0/glade/glade-sharp-2.0.pc.in	2006-08-18 14:10:23.000000000 +0200
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 gapidir=${prefix}/share/gapi-2.0
 
 

gtk-sharp-2.9.0-monodir.patch:
 generator/gapi2-codegen.in |    5 ++---
 parser/gapi2-fixup.in      |    5 ++---
 parser/gapi2-parser.in     |    7 +++----
 3 files changed, 7 insertions(+), 10 deletions(-)

--- NEW FILE gtk-sharp-2.9.0-monodir.patch ---
--- gtk-sharp-2.9.0/parser/gapi2-fixup.in.monodir	2006-08-18 10:14:36.000000000 +0200
+++ gtk-sharp-2.9.0/parser/gapi2-fixup.in	2006-08-18 10:16:24.000000000 +0200
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-a=`which "$0"`
-d=`dirname "$a"`
+d=`monodir`
 
- at RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi-fixup.exe "$@"
+ at RUNTIME@ $d/../gtk-sharp-2.0/gapi-fixup.exe "$@"
--- gtk-sharp-2.9.0/parser/gapi2-parser.in.monodir	2006-08-18 10:14:46.000000000 +0200
+++ gtk-sharp-2.9.0/parser/gapi2-parser.in	2006-08-18 10:16:03.000000000 +0200
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-a=`which "$0"`
-d=`dirname "$a"`
+d=`monodir`
 
-export PATH=$d/../lib/gtk-sharp-2.0:$PATH
- at RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi-parser.exe "$@"
+export PATH=$d/../gtk-sharp-2.0:$PATH
+ at RUNTIME@ $d/../gtk-sharp-2.0/gapi-parser.exe "$@"
--- gtk-sharp-2.9.0/generator/gapi2-codegen.in.monodir	2006-08-18 10:14:18.000000000 +0200
+++ gtk-sharp-2.9.0/generator/gapi2-codegen.in	2006-08-18 10:16:35.000000000 +0200
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-a=`which "$0"`
-d=`dirname "$a"`
+d=`monodir`
 
- at RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi_codegen.exe "$@"
+ at RUNTIME@ $d/../gtk-sharp-2.0/gapi_codegen.exe "$@"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Mar 2006 02:22:18 -0000	1.5
+++ .cvsignore	18 Aug 2006 15:06:19 -0000	1.6
@@ -1 +1 @@
-gtk-sharp-2.8.2.tar.gz
+gtk-sharp-2.9.0.tar.bz2


Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gtk-sharp2.spec	12 Jul 2006 06:17:42 -0000	1.14
+++ gtk-sharp2.spec	18 Aug 2006 15:06:19 -0000	1.15
@@ -1,19 +1,18 @@
 Name:           gtk-sharp2
-Version:        2.8.2
-Release:        2.1
+Version:        2.9.0
+Release:        1%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://gtk-sharp.sf.net
-Source0:        gtk-sharp-%{version}.tar.gz
+Source0:        gtk-sharp-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: 	gtk-sharp2-vtelibs.patch
+Patch1: gtk-sharp-2.9.0-monodir.patch
+Patch2: gtk-sharp-2.9.0-libdir.patch
 
-BuildRequires:  mono-devel gtk2-devel libart_lgpl-devel gnome-vfs2-devel libgnomecanvas-devel libgnomeui-devel
-BuildRequires:  libglade2-devel librsvg2-devel gtkhtml3-devel vte-devel gnome-panel-devel
-BuildRequires:  libgnomeprintui22-devel
+BuildRequires:  mono-devel gtk2-devel libglade2-devel
 BuildRequires:  automake, libtool
 
 # Mono only availible on these:
@@ -25,8 +24,7 @@
 fully native graphical GNOME applications using Mono. Gtk#
 is a binding to GTK+, the cross platform user interface
 toolkit used in GNOME. It includes bindings for Gtk, Atk,
-Pango, Gdk, libgnome, libgnomeui and libgnomecanvas. Gtk#
-2.4.x binds GTK+ 2.4.
+Pango, Gdk. 
 
 %package gapi
 Group:        Development/Languages
@@ -37,20 +35,25 @@
 This package provides developer tools for the creation and
 maintainance of managed bindings to native libraries which utilize
 glib and GObject. Some examples of libraries currently bound using
-the GAPI tools and found in Gtk# include Gtk, Atk, Pango, Gdk,
-libgnome, libgnomeui and libgnomecanvas.
+the GAPI tools and found in Gtk# include Gtk, Atk, Pango, Gdk.
+
+%package devel
+Summary: files needed for developing with gtk-sharp2
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkg-config
+
+%description devel
+This package provides the necessary development libraries and headers
+for writing gtk-sharp2 applications.
 
 %prep
 %setup -n gtk-sharp-%{version}
-%patch1 -p1 -b .vte 
+%patch1 -p1 -b .monodir
+%patch2 -p1 -b .libdir
 
 %build
-
-# need to re-automake for gtk-sharp2-vtelibs.patch
-aclocal
-libtoolize --force
-automake --add-missing
-autoconf
+autoreconf --force --install
 
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure
@@ -59,40 +62,46 @@
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp /gacdir %{_prefix}/lib /root ${RPM_BUILD_ROOT}%{_prefix}/lib"
+make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp-2.0 /gacdir %{_libdir} /root ${RPM_BUILD_ROOT}%{_libdir}"
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.*a
-mv $RPM_BUILD_ROOT%{_prefix}/lib/mono/gtk-sharp $RPM_BUILD_ROOT%{_prefix}/lib/mono/gtk-sharp-2.0
-
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_libdir}/*.so
-%dir %{_prefix}/lib/gtk-sharp-2.0
-%{_prefix}/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
-%{_bindir}/gconfsharp2-schemagen
-%{_prefix}/lib/mono/gac
-%{_prefix}/lib/mono/gtk-sharp-2.0
-%{_libdir}/pkgconfig/*-sharp-2.0.pc
-%{_libdir}/pkgconfig/gtk-dotnet-2.0.pc
+%dir %{_libdir}/gtk-sharp-2.0
+%{_libdir}/mono/gac
+%{_libdir}/mono/gtk-sharp-2.0
 
 %files gapi
 %defattr(-,root,root,-)
 %{_bindir}/gapi2-codegen
 %{_bindir}/gapi2-fixup
 %{_bindir}/gapi2-parser
-%{_prefix}/lib/gtk-sharp-2.0/gapi_codegen.exe
-%{_prefix}/lib/gtk-sharp-2.0/gapi-fixup.exe
-%{_prefix}/lib/gtk-sharp-2.0/gapi-parser.exe
-%{_prefix}/lib/gtk-sharp-2.0/gapi_pp.pl
-%{_prefix}/lib/gtk-sharp-2.0/gapi2xml.pl
+%{_libdir}/gtk-sharp-2.0/gapi_codegen.exe
+%{_libdir}/gtk-sharp-2.0/gapi-fixup.exe
+%{_libdir}/gtk-sharp-2.0/gapi-parser.exe
+%{_libdir}/gtk-sharp-2.0/gapi_pp.pl
+%{_libdir}/gtk-sharp-2.0/gapi2xml.pl
+%{_datadir}/gapi-2.0
 %{_libdir}/pkgconfig/gapi-2.0.pc
-%{_prefix}/share/gapi-2.0
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/*-sharp-2.0.pc
+%{_libdir}/pkgconfig/gtk-dotnet-2.0.pc
 
 %changelog
+* Mon Aug 14 2006 Alexander Larsson <alexl at redhat.com> - 2.9.0-1
+- update to 2.9.0, which splits out gnome stuff to gnome-sharp
+- Split out devel package
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Mar 2006 02:22:18 -0000	1.5
+++ sources	18 Aug 2006 15:06:19 -0000	1.6
@@ -1 +1 @@
-e7b68519ede7fd7521b2c6e10410aefa  gtk-sharp-2.8.2.tar.gz
+06228185cdbd34e033817940361e143f  gtk-sharp-2.9.0.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:10:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:10:29 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.54,1.55
Message-ID: <200608181510.k7IFATN2026039@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25979

Modified Files:
	mx4j.spec 
Log Message:
Merge with upstream




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mx4j.spec	26 Jul 2006 18:37:46 -0000	1.54
+++ mx4j.spec	18 Aug 2006 15:10:26 -0000	1.55
@@ -36,7 +36,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        4jpp_8fc
+Release:        6jpp.1
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -221,13 +221,6 @@
 fi
 %endif
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar
@@ -261,6 +254,12 @@
 %doc dist/docs/*
 
 %changelog
+* Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-6jpp.1
+- Merge with upstream
+
+* Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-6jpp
+- Rebuild
+  
 * Wed Jul 26 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_8fc
 - Unstub docs.
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:11:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:11:24 -0400
Subject: rpms/dbus-sharp/devel dbus-sharp-0.63-nogtk.patch, NONE,
	1.1 dbus-sharp.spec, 1.4, 1.5
Message-ID: <200608181511.k7IFBOOr026221@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/dbus-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26199

Modified Files:
	dbus-sharp.spec 
Added Files:
	dbus-sharp-0.63-nogtk.patch 
Log Message:
* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.63-5
- Update for new mono multilib setup
- Don't buildrequire old gtk-sharp



dbus-sharp-0.63-nogtk.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dbus-sharp-0.63-nogtk.patch ---
--- dbus-sharp-0.63/mono/Makefile.am.nogtk	2006-08-18 14:55:13.000000000 +0200
+++ dbus-sharp-0.63/mono/Makefile.am	2006-08-18 14:55:21.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS=. doc example
+SUBDIRS=. doc 
 
 TARGET=$(ASSEMBLY)
 NOINST_EXES=test-dbus-sharp.exe


Index: dbus-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus-sharp/devel/dbus-sharp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dbus-sharp.spec	20 Jul 2006 18:18:08 -0000	1.4
+++ dbus-sharp.spec	18 Aug 2006 15:11:22 -0000	1.5
@@ -4,7 +4,7 @@
 Summary: C# bindings for D-Bus
 Name: dbus-sharp
 Version: 0.63
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -14,10 +14,13 @@
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: autoconf
-BuildRequires: mono-devel gtk-sharp
+BuildRequires: automake, libtool
+BuildRequires: mono-devel
 # Mono only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
 
+Patch1: dbus-sharp-0.63-nogtk.patch
+
 %description
 
 D-Bus mono bindings for use with mono programs.
@@ -33,21 +36,16 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .nogtk
 
 %build
+autoreconf --force --install
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-
 %configure
 
 %install
 rm -rf %{buildroot}
 
-# dbus installs mono files in libdir, not in prefix/lib, fixup:
-perl -pi -e 's,/gacdir \$\(libdir\),/gacdir /usr/lib,g' mono/Makefile
-perl -pi -e "s,/root \\\$\\(DESTDIR\\)\\\$\(libdir\\),/root $RPM_BUILD_ROOT/usr/lib,g" mono/Makefile
-perl -pi -e "s,/usr/lib64,/usr/lib,g" dbus-sharp.pc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/mono
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -58,13 +56,17 @@
 %defattr(-,root,root)
 
 %doc COPYING ChangeLog NEWS
-%{_prefix}/lib/mono/dbus-sharp
-%{_prefix}/lib/mono/gac/dbus-sharp
+%{_libdir}/mono/dbus-sharp
+%{_libdir}/mono/gac/dbus-sharp
 
 %files devel
 %{_libdir}/pkgconfig/dbus-sharp.pc
 
 %changelog
+* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.63-5
+- Update for new mono multilib setup
+- Don't buildrequire old gtk-sharp
+
 * Thu Jul 20 2006 John (J5) Palmieri <johnp at redhat.com> - 0.63-4
 - Remove from the s390 builds
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:15:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:15:56 -0400
Subject: rpms/gmime/devel gmime-2.2.3-libdir.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 gmime.spec, 1.14, 1.15 sources, 1.5, 1.6
Message-ID: <200608181515.k7IFFuMV027454@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gmime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27417

Modified Files:
	.cvsignore gmime.spec sources 
Added Files:
	gmime-2.2.3-libdir.patch 
Log Message:
* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 2.2.3-1
- Upgrade to 2.2.3
- Use the new mono libdir



gmime-2.2.3-libdir.patch:
 Makefile.am       |   16 ++++++++--------
 gmime-sharp.pc.in |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE gmime-2.2.3-libdir.patch ---
--- gmime-2.2.3/mono/gmime-sharp.pc.in.libdir	2006-08-18 15:36:13.000000000 +0200
+++ gmime-2.2.3/mono/gmime-sharp.pc.in	2006-08-18 15:36:25.000000000 +0200
@@ -1,5 +1,5 @@
 prefix=@prefix@
-libdir=${prefix}/lib
+libdir=@libdir@
 
 Name: gmime-sharp 
 Description: .NET binding for GMime
--- gmime-2.2.3/mono/Makefile.am.libdir	2006-08-18 15:09:50.000000000 +0200
+++ gmime-2.2.3/mono/Makefile.am	2006-08-18 15:10:35.000000000 +0200
@@ -62,22 +62,22 @@
 install-data-local:
 	@if test -n '$(TARGET)'; then									\
 	  if test -n '$(DESTDIR)'; then								\
-	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib";		\
-	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib || exit 1;	\
+	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)";		\
+	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1;	\
 	  else												\
-	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib";			\
-	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib || exit 1;		\
+	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir)";			\
+	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1;		\
 	  fi;												\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then									\
 	  if test -n '$(DESTDIR)'; then								\
-	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib";	\
-	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib || exit 1;  \
+	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)";	\
+	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1;  \
 	  else												\
-	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib";	\
-	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib || exit 1;	\
+	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir)";	\
+	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1;	\
 	  fi;												\
 	fi
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 May 2006 15:58:47 -0000	1.5
+++ .cvsignore	18 Aug 2006 15:15:53 -0000	1.6
@@ -1 +1 @@
-gmime-2.2.1.tar.gz
+gmime-2.2.3.tar.gz


Index: gmime.spec
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gmime.spec	12 Jul 2006 05:57:55 -0000	1.14
+++ gmime.spec	18 Aug 2006 15:15:53 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gmime
-Version:        2.2.1
-Release:        2.1
+Version:        2.2.3
+Release:        1%{?dist}
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -11,9 +11,10 @@
 
 BuildRequires:  glib2-devel >= 2.0.0
 BuildRequires:  zlib-devel >= 1.2.1.1
+BuildRequires:  automake, libtool, gettext-devel, gtk-doc
 
 Patch1: gmime-2.2.1-use-pkg-config.patch
-
+Patch2: gmime-2.2.3-libdir.patch
 
 # Mono only availible on these:
 %define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc
@@ -59,9 +60,11 @@
 %prep
 %setup -q
 %patch1 -p1 -b .use-pkg-config
+%patch2 -p1 -b .libdir
 
 
 %build
+autoreconf --force --install
 %ifarch %mono_archs
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 MONO_ARGS="--enable-mono"
@@ -109,12 +112,16 @@
 %files sharp
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/gmime-sharp.pc
-%{_prefix}/lib/mono/gac/gmime-sharp
-%{_prefix}/lib/mono/gmime-sharp
+%{_libdir}/mono/gac/gmime-sharp
+%{_libdir}/mono/gmime-sharp
 %{_datadir}/gapi-2.0/gmime-api.xml
 %endif
 
 %changelog
+* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 2.2.3-1
+- Upgrade to 2.2.3
+- Use the new mono libdir
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 May 2006 15:58:47 -0000	1.5
+++ sources	18 Aug 2006 15:15:53 -0000	1.6
@@ -1 +1 @@
-b05e4d6344c8465fb74386e5f1fed45c  gmime-2.2.1.tar.gz
+0c48ece8b65955db8e7d89c171de974b  gmime-2.2.3.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:17:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:17:21 -0400
Subject: rpms/tomboy/devel tomboy.spec,1.23,1.24
Message-ID: <200608181517.k7IFHL4h005688@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/tomboy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4701

Modified Files:
	tomboy.spec 
Log Message:
* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.3.9-3
- Rebuild with new mono and gtk-sharp2




Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tomboy.spec	15 Aug 2006 02:17:54 -0000	1.23
+++ tomboy.spec	18 Aug 2006 15:17:18 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.3.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
 Group:          User Interface/Desktops
@@ -18,8 +18,9 @@
 BuildRequires:  gnome-panel-devel
 BuildRequires:  gtkspell-devel
 BuildRequires:  libgnomeprintui22-devel >= 2.2
-BuildRequires:  gtk-sharp
-BuildRequires:  dbus-sharp
+BuildRequires:  gtk-sharp2-devel
+BuildRequires:  gnome-sharp-devel
+BuildRequires:  dbus-sharp-devel
 BuildRequires:  gmime-sharp
 BuildRequires:	mono-devel
 BuildRequires:	gettext
@@ -102,6 +103,9 @@
 
 
 %changelog
+* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.3.9-3
+- Rebuild with new mono and gtk-sharp2
+
 * Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 0.3.9-2.fc6
 - Make the about dialog close (#202355)
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:18:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:18:29 -0400
Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.14,1.15
Message-ID: <200608181518.k7IFITwV011184@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gsf-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11143

Modified Files:
	gsf-sharp.spec 
Log Message:
* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.8-2
- Rebuild with new mono libdir




Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gsf-sharp.spec	12 Jul 2006 06:14:47 -0000	1.14
+++ gsf-sharp.spec	18 Aug 2006 15:18:26 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.8
-Release:        1.1
+Release:        2
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -31,11 +31,7 @@
 rm -rf $RPM_BUILD_ROOT
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 
-#fix lib64 issue
-perl -pi -e "s,lib64,lib,g" gsf-sharp.pc
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
+make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp /gacdir %{_libdir} /root ${RPM_BUILD_ROOT}%{_libdir}"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,11 +41,14 @@
 %doc AUTHORS NEWS README COPYING
 %{_libdir}/libgsfglue.*
 %{_libdir}/pkgconfig/gsf-sharp.pc
-%{_prefix}/lib/mono/gac/gsf-sharp
-%{_prefix}/lib/mono/gtk-sharp/*
+%{_libdir}/mono/gac/gsf-sharp
+%{_libdir}/mono/gtk-sharp/*
 %{_prefix}/share/gapi-2.0/gsf-api.xml
 
 %changelog
+* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.8-2
+- Rebuild with new mono libdir
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:19:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:19:30 -0400
Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.22,1.23
Message-ID: <200608181519.k7IFJU88011621@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/evolution-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11572

Modified Files:
	evolution-sharp.spec 
Log Message:
* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.11.1-8
- Rebuild with the new mono libdir




Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- evolution-sharp.spec	8 Aug 2006 03:09:13 -0000	1.22
+++ evolution-sharp.spec	18 Aug 2006 15:19:27 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           evolution-sharp
 Version:        0.11.1
-Release:        7
+Release:        8
 License:        LGPL
 Group:          System Environment/Libraries
 Summary:        Evolution Data Server Mono Bindings
@@ -15,7 +15,7 @@
 
 ### Patches ###
 
-Patch1:         evolution-sharp-mono-lib.patch
+Patch1:         evolution-sharp-0.11.1-libdir.patch
 Patch2:         evolution-sharp-evo26.patch
 Patch3:         evolution-sharp-0.11.1-evo28.patch
 
@@ -26,7 +26,7 @@
 ### Build Dependencies ###
 
 BuildRequires:  evolution-devel
-BuildRequires:  gtk-sharp2
+BuildRequires:  gtk-sharp2-devel
 BuildRequires:  gtk-sharp2-gapi
 BuildRequires:  libtool
 BuildRequires:  automake
@@ -38,7 +38,7 @@
 
 %prep
 %setup -q
-%patch1 -p0 -b .libs
+%patch1 -p1 -b .libdir
 %patch2 -p1 -b .evo26
 %patch3 -p1 -b .evo28
 
@@ -64,8 +64,8 @@
 %doc COPYING README
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/evolution-sharp.pc
-%{_prefix}/lib/mono/gac/evolution-sharp/*
-%{_prefix}/lib/mono/evolution-sharp/evolution-sharp.dll
+%{_libdir}/mono/gac/evolution-sharp/*
+%{_libdir}/mono/evolution-sharp/evolution-sharp.dll
 %{_prefix}/share/gapi-2.0/*
 
 # !!! REMINDER !!!
@@ -74,6 +74,9 @@
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.11.1-8
+- Rebuild with the new mono libdir
+
 * Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 0.11.1-7
 - Rebuild for evolution-data-server-1.7.91
 - Update required sonames from e-d-s.



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:21:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:21:05 -0400
Subject: rpms/gecko-sharp2/devel gecko-sharp-libdir.patch, NONE,
	1.1 gecko-sharp2.spec, 1.17, 1.18
Message-ID: <200608181521.k7IFL5MR012290@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gecko-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12254

Modified Files:
	gecko-sharp2.spec 
Added Files:
	gecko-sharp-libdir.patch 
Log Message:
* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.11-11
- Rebuild with new mono libdir



gecko-sharp-libdir.patch:
 Makefile.am           |    2 +-
 gecko-sharp-2.0.pc.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gecko-sharp-libdir.patch ---
--- gecko-sharp-2.0-0.11/Makefile.am.libdir	2006-08-18 16:19:40.000000000 +0200
+++ gecko-sharp-2.0-0.11/Makefile.am	2006-08-18 16:19:49.000000000 +0200
@@ -1,6 +1,6 @@
 SUBDIRS = sources gtkmozembed doc sample
 
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gecko-sharp-2.0.pc
 
 EXTRA_DIST = gecko-sharp-2.0.pc LICENSE.LGPL LICENSE.MPL gecko-sharp.pub gecko-sharp.snk
--- gecko-sharp-2.0-0.11/gecko-sharp-2.0.pc.in.libdir	2006-08-18 16:15:45.000000000 +0200
+++ gecko-sharp-2.0-0.11/gecko-sharp-2.0.pc.in	2006-08-18 16:15:54.000000000 +0200
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 
 Name: Gecko#
 Description: Gecko# - A Gtk# Mozilla binding


Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gecko-sharp2.spec	1 Aug 2006 14:16:35 -0000	1.17
+++ gecko-sharp2.spec	18 Aug 2006 15:21:03 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.11
-Release:        10
+Release:        11
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -9,7 +9,10 @@
 Source0:        gecko-sharp-2.0-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk-sharp2 firefox-devel gtk2-devel mono-devel gtk-sharp2-gapi
+Patch1: gecko-sharp-libdir.patch
+
+BuildRequires:  gtk-sharp2-devel firefox-devel gtk2-devel mono-devel gtk-sharp2-gapi
+BuildRequires:  automake, libtool
 Requires:       firefox 
 
 # Mono only availible on these: (s390(x) disabled for now)
@@ -23,8 +26,10 @@
 
 %prep
 %setup -n gecko-sharp-2.0-%{version}
+%patch1 -p1 -b .libdir
 
 %build
+autoreconf --force --install
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure
 make %{?_smp_mflags}
@@ -32,10 +37,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-make install DESTDIR=$RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig
-mv $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/* $RPM_BUILD_ROOT%{_datadir}/pkgconfig/
+make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gecko-sharp-2.0 /gacdir %{_libdir} /root ${RPM_BUILD_ROOT}%{_libdir}"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,11 +45,14 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
-%{_prefix}/lib/mono/gac/gecko-sharp
-%{_prefix}/lib/mono/gecko-sharp-2.0
-%{_datadir}/pkgconfig/*-sharp-2.0.pc
+%{_libdir}/mono/gac/gecko-sharp
+%{_libdir}/mono/gecko-sharp-2.0
+%{_libdir}/pkgconfig/*-sharp-2.0.pc
 
 %changelog
+* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.11-11
+- Rebuild with new mono libdir
+
 * Tue Aug  1 2006 Jesse Keating <jkeating at redhat.com> - 0.11-10
 - and change the requires to reflect building against firefox-devel
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:22:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:22:45 -0400
Subject: rpms/f-spot/devel f-spot-0.1.11-libdir.patch, NONE, 1.1 f-spot.spec,
	1.25, 1.26
Message-ID: <200608181522.k7IFMj5c012985@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12942

Modified Files:
	f-spot.spec 
Added Files:
	f-spot-0.1.11-libdir.patch 
Log Message:
* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.1.11-5
- Rebuild with new mono and gtk-sharp2



f-spot-0.1.11-libdir.patch:
 configure.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE f-spot-0.1.11-libdir.patch ---
--- f-spot-0.1.11/configure.in.libdir	2006-08-18 16:26:37.000000000 +0200
+++ f-spot-0.1.11/configure.in	2006-08-18 16:29:36.000000000 +0200
@@ -35,7 +35,7 @@
 needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services"
 for i in $needed_dlls; do
   AC_MSG_CHECKING([for $i.dll])
-  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/1.0/$i.dll; then
+  if test ! \( -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/1.0/$i.dll -o -e `$PKG_CONFIG --variable=prefix mono`/lib64/mono/1.0/$i.dll \); then
     AC_MSG_ERROR([missing required mono DLL: $i.dll])
   else
     AC_MSG_RESULT([found])


Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- f-spot.spec	27 Jul 2006 20:05:10 -0000	1.25
+++ f-spot.spec	18 Aug 2006 15:22:43 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.1.11
-Release:        4
+Release:        5
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -9,12 +9,15 @@
 Source0:        f-spot-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: f-spot-0.1.11-libdir.patch
+
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
 BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 
-BuildRequires:  gtk-sharp2 >= 2.7 libgnome-devel libgnomeui-devel
+BuildRequires:  gtk-sharp2-devel >= 2.7 libgnome-devel libgnomeui-devel
 BuildRequires:  gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1
 BuildRequires:  gettext
 BuildRequires:  dbus-sharp-devel
+BuildRequires:  autoconf
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
 
@@ -34,8 +37,10 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .libdir
 
 %build
+autoconf
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure
 make %{?_smp_mflags}
@@ -69,6 +74,9 @@
 %{_datadir}/gnome-screensaver/themes/f-spot-screensaver.desktop
 
 %changelog
+* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.1.11-5
+- Rebuild with new mono and gtk-sharp2
+
 * Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.1.11-4
 - Fix dbus-sharp BR
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:24:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:24:28 -0400
Subject: rpms/beagle/devel beagle-0.2.8-libdir.patch, NONE,
	1.1 beagle-0.2.8-nodebug.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 beagle.spec, 1.69, 1.70 sources, 1.15, 1.16
Message-ID: <200608181524.k7IFOSC1013718@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13654

Modified Files:
	.cvsignore beagle.spec sources 
Added Files:
	beagle-0.2.8-libdir.patch beagle-0.2.8-nodebug.patch 
Log Message:
* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.2.8-1
- Update to 0.2.8
- Rebuild with new mono and gtk-sharp2



beagle-0.2.8-libdir.patch:
 configure.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE beagle-0.2.8-libdir.patch ---
--- beagle-0.2.8/configure.in.libdir	2006-08-18 16:47:40.000000000 +0200
+++ beagle-0.2.8/configure.in	2006-08-18 16:49:11.000000000 +0200
@@ -63,7 +63,7 @@
 
 # SharpZipLib broke API in 1.1.11.  Route around the damage.
 if `$PKG_CONFIG --atleast-version=1.1.11 mono`; then
-  SHARPZIPLIB_LIBS="-r:`$PKG_CONFIG --variable=prefix mono`/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll"
+  SHARPZIPLIB_LIBS="-r:`monodir`/compat-1.0/ICSharpCode.SharpZipLib.dll"
 else
   SHARPZIPLIB_LIBS="-r:ICSharpCode.SharpZipLib"
 fi
@@ -73,7 +73,7 @@
 needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services"
 for i in $needed_dlls; do
   AC_MSG_CHECKING([for $i.dll])
-  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/1.0/$i.dll; then
+  if test ! -e `monodir`/1.0/$i.dll; then
     AC_MSG_ERROR([missing required mono DLL: $i.dll])
   else
     AC_MSG_RESULT([found])

beagle-0.2.8-nodebug.patch:
 ImLogViewer/beagle-imlogviewer.in |    2 +-
 beagled/beagled-index-helper.in   |    2 +-
 beagled/beagled.in                |    2 +-
 beagled/wrapper.in                |    2 +-
 bludgeon/bludgeon.in              |    2 +-
 search/beagle-search.in           |    2 +-
 tools/wrapper.in                  |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE beagle-0.2.8-nodebug.patch ---
--- beagle-0.2.8/beagled/beagled-index-helper.in.nodebug	2006-08-17 18:16:28.000000000 +0200
+++ beagle-0.2.8/beagled/beagled-index-helper.in	2006-08-18 16:41:36.000000000 +0200
@@ -30,7 +30,7 @@
 
 export MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}"
 
-CMDLINE="mono --debug $MONO_EXTRA_ARGS $THIS_EXE $@"
+CMDLINE="mono $MONO_EXTRA_ARGS $THIS_EXE $@"
 
 PROCESS_NAME="beagled-helper"
 exec -a $PROCESS_NAME $CMDLINE
--- beagle-0.2.8/beagled/wrapper.in.nodebug	2006-08-17 18:16:28.000000000 +0200
+++ beagle-0.2.8/beagled/wrapper.in	2006-08-18 16:43:24.000000000 +0200
@@ -19,5 +19,5 @@
     export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 fi
 
-MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a @wrapper@ mono --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a @wrapper@ mono $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.8/beagled/beagled.in.nodebug	2006-08-17 18:16:28.000000000 +0200
+++ beagle-0.2.8/beagled/beagled.in	2006-08-18 16:41:36.000000000 +0200
@@ -101,7 +101,7 @@
 elif [ $mdb -eq 1 ]; then
     CMDLINE="mdb $TARGET_EXE -args $BEAGLED_ARGS $FGBG_ARG"
 else
-    CMDLINE="$BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $TARGET_EXE $BEAGLED_ARGS $FGBG_ARG"
+    CMDLINE="$BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $TARGET_EXE $BEAGLED_ARGS $FGBG_ARG"
 fi
 
 PROCESS_NAME="beagled"
--- beagle-0.2.8/ImLogViewer/beagle-imlogviewer.in.nodebug	2006-08-17 18:16:26.000000000 +0200
+++ beagle-0.2.8/ImLogViewer/beagle-imlogviewer.in	2006-08-18 16:43:38.000000000 +0200
@@ -14,5 +14,5 @@
     export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 fi
 
-MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS --debug $THIS_EXE "$@"
+MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.8/tools/wrapper.in.nodebug	2006-08-17 18:16:31.000000000 +0200
+++ beagle-0.2.8/tools/wrapper.in	2006-08-18 16:43:50.000000000 +0200
@@ -20,5 +20,5 @@
    echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
 fi
 
-MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" BEAGLE_FILTER_PATH="$BEAGLE_FILTER_PATH${THIS_FILTERS+:$THIS_FILTERS}" BEAGLE_BACKEND_PATH="$BEAGLE_BACKEND_PATH${THIS_BACKENDS+:$THIS_BACKENDS}" exec $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" BEAGLE_FILTER_PATH="$BEAGLE_FILTER_PATH${THIS_FILTERS+:$THIS_FILTERS}" BEAGLE_BACKEND_PATH="$BEAGLE_BACKEND_PATH${THIS_BACKENDS+:$THIS_BACKENDS}" exec $BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.8/bludgeon/bludgeon.in.nodebug	2006-08-17 18:16:29.000000000 +0200
+++ beagle-0.2.8/bludgeon/bludgeon.in	2006-08-18 16:44:06.000000000 +0200
@@ -28,5 +28,5 @@
    echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
 fi
 
-MONO_PATH="$THIS_PATH:$MONO_PATH" exec $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+MONO_PATH="$THIS_PATH:$MONO_PATH" exec $BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.8/search/beagle-search.in.nodebug	2006-03-24 22:55:23.000000000 +0100
+++ beagle-0.2.8/search/beagle-search.in	2006-08-18 16:41:36.000000000 +0200
@@ -21,4 +21,4 @@
    echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
 fi
 
-exec -a beagle-search $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
\ No newline at end of file
+exec -a beagle-search $BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $THIS_EXE "$@"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	21 Jun 2006 12:07:00 -0000	1.12
+++ .cvsignore	18 Aug 2006 15:24:25 -0000	1.13
@@ -1,3 +1 @@
-beagle-0.2.6.tar.bz2
-beagle-0.2.4.tar.bz2
-beagle-0.2.7.tar.bz2
+beagle-0.2.8.tar.bz2


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- beagle.spec	15 Aug 2006 06:41:40 -0000	1.69
+++ beagle.spec	18 Aug 2006 15:24:26 -0000	1.70
@@ -1,6 +1,6 @@
 Name:           beagle
-Version:        0.2.7
-Release:       	9%{?dist}
+Version:        0.2.8
+Release:       	1%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -9,9 +9,9 @@
 Source1:	beagle-autostart.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  mono-lib-devel
+BuildRequires:  mono-devel
 BuildRequires:  mono-data mono-data-sqlite
-BuildRequires:  gtk-sharp2-gapi mono-web zip libexif-devel
+BuildRequires:  gtk-sharp2-gapi gtk-sharp2-devel gnome-sharp-devel mono-web zip libexif-devel
 BuildRequires:  gsf-sharp >= 0.6
 BuildRequires:  sqlite-devel > 3.3.1
 BuildRequires:  gmime-sharp >= 2.1.19
@@ -25,6 +25,7 @@
 BuildRequires:	python-devel
 BuildRequires:	libXt-devel
 BuildRequires:	gettext
+BuildRequires:	autoconf
 Requires: sqlite >= 3.3.1
 Requires: mono-core >= 1.1.13.5
 Requires: zip unzip sed grep poppler-utils
@@ -32,13 +33,12 @@
 # 4.0.17-5 fixes bug #201991
 Requires(pre):  shadow-utils >= 4.0.17-5
 
-Patch1: beagle-0.2.7-nodebug.patch
+Patch1: beagle-0.2.8-nodebug.patch
 Patch2: beagle-0.2.7-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
 Patch4: beagle-0.2.7-beagle-index-username.patch
 Patch5: beagle-0.2.7-runuser.patch
-# fixed in upstream cvs
-Patch6:	beagle-0.2.7-socket-path.patch
+Patch6: beagle-0.2.8-libdir.patch
 Patch7: beagle-0.2.7-key.patch
 
 # Mono only available on these:
@@ -95,10 +95,11 @@
 %patch3 -p1 -b .spew
 %patch4 -p1 -b .beagleidx
 %patch5 -p1 -b .runuser
-%patch6 -p1 -b .socket-path
+%patch6 -p1 -b .libdir
 %patch7 -p1 -b .key
 
 %build
+autoconf
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure 
 make %{?_smp_mflags}
@@ -235,6 +236,7 @@
 %{_libdir}/beagle/BeagleDaemon.exe*
 %{_libdir}/beagle/BuildIndex.exe*
 %{_libdir}/beagle/Config.exe*
+%{_libdir}/beagle/ContactViewer.exe*
 %{_libdir}/beagle/ExerciseFileSystem.exe*
 %{_libdir}/beagle/ExtractContent.exe*
 %{_libdir}/beagle/IndexHelper.exe*
@@ -246,6 +248,7 @@
 %{_libdir}/beagle/beagled-index-helper
 %{_libdir}/beagle/libbeagleglue*
 %{_libdir}/beagle/Filters/*
+%{_libdir}/beagle/Backends/ThunderbirdBackends.dll*
 # firefox plugin:
 %{_libdir}/beagle/beagle.xpi
 %{_datadir}/beagle
@@ -257,6 +260,7 @@
 
 %files gui
 %defattr(-, root, root)
+%{_bindir}/beagle-contactviewer
 %{_bindir}/beagle-imlogviewer
 %{_bindir}/beagle-search
 %{_bindir}/beagle-settings
@@ -286,6 +290,10 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.2.8-1
+- Update to 0.2.8
+- Rebuild with new mono and gtk-sharp2
+
 * Tue Aug 15 2006 Matthias Clasen <mclasen at redhat.com> - 0.2.7-9.fc6
 - Hide keybinding in beagle-settings, since the global
   search keybinding works.  (#201424)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	25 Jul 2006 22:54:48 -0000	1.15
+++ sources	18 Aug 2006 15:24:26 -0000	1.16
@@ -1 +1 @@
-d4c8e93db23c9b7d06104ce97a182502  beagle-0.2.7.tar.bz2
+477e34538776ca2f4da8f3404edf28dd  beagle-0.2.8.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:38:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:38:04 -0400
Subject: rpms/gtk2/devel gtk+-2.10.2-recent.patch, NONE, 1.1 gtk2.spec, 1.171,
	1.172
Message-ID: <200608181538.k7IFc4s4027666@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27651

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.10.2-recent.patch 
Log Message:
fix some recent-files problems


gtk+-2.10.2-recent.patch:
 gtkrecentchooser.c |    2 --
 gtkrecentmanager.c |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE gtk+-2.10.2-recent.patch ---
--- gtk+-2.10.2/gtk/gtkrecentchooser.c.recent	2006-08-18 11:34:17.000000000 -0400
+++ gtk+-2.10.2/gtk/gtkrecentchooser.c	2006-08-18 11:35:56.000000000 -0400
@@ -836,8 +836,6 @@
   gsize n_items, i;
   
   items = gtk_recent_chooser_get_items (chooser);
-  if (!items)
-    return NULL;
   
   n_items = g_list_length (items);
   retval = g_new0 (gchar *, n_items + 1);
--- gtk+-2.10.2/gtk/gtkrecentmanager.c.recent	2006-08-18 11:34:09.000000000 -0400
+++ gtk+-2.10.2/gtk/gtkrecentmanager.c	2006-08-18 11:34:35.000000000 -0400
@@ -411,6 +411,8 @@
 	  g_error_free (write_error);
 	}
 
+      priv->write_in_progress = FALSE;
+	  
       /* we have sync'ed our list with the storage file, so we
        * update the file mtime in order to skip the timed check
        * and spare us from a re-read.
@@ -422,8 +424,6 @@
 			    priv->filename,
 			    g_strerror (errno));
 
-	  priv->write_in_progress = FALSE;
-	  
 	  g_object_thaw_notify (G_OBJECT (manager));
 
 	  return;


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- gtk2.spec	18 Aug 2006 13:16:34 -0000	1.171
+++ gtk2.spec	18 Aug 2006 15:38:02 -0000	1.172
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -28,6 +28,8 @@
 Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
 # Filechooser search
 Patch2: gtk+-2.10.1-search.patch
+# Fixed in cvs
+Patch3: gtk+-2.10.2-recent.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -108,6 +110,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .search
+%patch3 -p1 -b .recent
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -279,6 +282,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Fri Aug 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.2-2.fc6
+- Fix some problems with the recent files code
+
 * Fri Aug 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.2-1.fc6
 - Update to 2.10.2
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:43:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:43:03 -0400
Subject: rpms/kdebase/devel kdebase-3.5.4-htdig.patch, NONE, 1.1 kdebase.spec,
	1.212, 1.213
Message-ID: <200608181543.k7IFh3ZP027934@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27891

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-htdig.patch 
Log Message:
fix #203083, correct htdig settings


kdebase-3.5.4-htdig.patch:
 khc_docbookdig.pl.in |    2 +-
 khc_htdig.pl.in      |    2 +-
 khc_htsearch.pl      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-3.5.4-htdig.patch ---
--- kdebase-3.5.4/khelpcenter/searchhandlers/khc_htsearch.pl.orig	2006-08-18 16:31:15.000000000 +0200
+++ kdebase-3.5.4/khelpcenter/searchhandlers/khc_htsearch.pl	2006-08-18 16:39:30.000000000 +0200
@@ -8,7 +8,7 @@
 use open IO => ':utf8';
 use open ':std';
 
-my $htsearchpath="/srv/www/cgi-bin/htsearch";
+my $htsearchpath="/var/www/cgi-bin/htsearch";
 
 my $config;
 my $format;
--- kdebase-3.5.4/khelpcenter/searchhandlers/khc_htdig.pl.in.orig	2006-08-18 16:30:16.000000000 +0200
+++ kdebase-3.5.4/khelpcenter/searchhandlers/khc_htdig.pl.in	2006-08-18 16:30:37.000000000 +0200
@@ -26,7 +26,7 @@
 
 use Getopt::Long;
 
-my $htdigdata = "/srv/www/htdig/common/";
+my $htdigdata = "/usr/share/htdig/";
 my $htdigbin = "/usr/bin";
 my $kdeprefix = "@prefix@";
 chomp $kdeprefix;
--- kdebase-3.5.4/khelpcenter/searchhandlers/khc_docbookdig.pl.in.orig	2006-08-18 16:28:11.000000000 +0200
+++ kdebase-3.5.4/khelpcenter/searchhandlers/khc_docbookdig.pl.in	2006-08-18 16:28:55.000000000 +0200
@@ -26,7 +26,7 @@
 
 use Getopt::Long;
 
-my $htdigdata = "/srv/www/htdig/common/";
+my $htdigdata = "/usr/share/htdig/";
 my $htdigbin = "/usr/bin";
 my $kdeprefix = "@prefix@";
 chomp $kdeprefix;


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- kdebase.spec	15 Aug 2006 09:51:34 -0000	1.212
+++ kdebase.spec	18 Aug 2006 15:43:00 -0000	1.213
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -52,6 +52,7 @@
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
 Patch20: kdebase-3.5.3-keyinit.patch
 Patch21: kdebase-3.5.3-khelpcenter-sort.patch
+Patch22: kdebase-3.5.4-htdig.patch
 
 # upstream patches
 Patch100: kdebase-3.5.4-halbackend-dbus.patch
@@ -160,6 +161,7 @@
 %patch18 -p1 -b .klipper
 %patch20 -p1 -b .keyinit
 %patch21 -p1 -b .khelpcenter-sort
+%patch22 -p1 -b .htdig
 
 # upstream patches
 %patch100 -p0 -b .halbackend-dbus
@@ -534,6 +536,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Fri Aug 18 2006 Than Ngo <than at redhat.com> 6:3.5.4-3
+- fix #203083, correct htdig settings
+
 * Tue Aug 15 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
 - apply upstream patch to fix argument quoting
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:43:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:43:42 -0400
Subject: rpms/gnome-panel/devel gnome-panel-2.15.91-clear-recent.patch, NONE,
	1.1 gnome-panel.spec, 1.145, 1.146
Message-ID: <200608181543.k7IFhgms028014@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27999

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.15.91-clear-recent.patch 
Log Message:
fix clearing recent fiels


gnome-panel-2.15.91-clear-recent.patch:
 panel-recent.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-panel-2.15.91-clear-recent.patch ---
--- gnome-panel-2.15.91/gnome-panel/panel-recent.c.clear-recent	2006-08-18 11:39:20.000000000 -0400
+++ gnome-panel-2.15.91/gnome-panel/panel-recent.c	2006-08-18 11:39:49.000000000 -0400
@@ -143,7 +143,7 @@
         if (response == GTK_RESPONSE_ACCEPT)
 		gtk_recent_manager_purge_items (manager, NULL);
 
-	gtk_widget_destroy (widget);
+	gtk_widget_hide (widget);
 }
 
 static void


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- gnome-panel.spec	16 Aug 2006 20:20:41 -0000	1.145
+++ gnome-panel.spec	18 Aug 2006 15:43:40 -0000	1.146
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.15.91
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 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
@@ -81,6 +81,7 @@
 Patch12: gnome-panel-2.14.2-xio-error.patch
 Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch
 Patch14: gnome-panel-2.15.90-fix-double-free.patch
+Patch15: gnome-panel-2.15.91-clear-recent.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -114,6 +115,7 @@
 %patch12 -p1 -b .xio-error
 %patch13 -p1 -b .move-suspend-to-menu
 %patch14 -p1 -b .fix-double-free
+%patch15 -p1 -b .clear-recent
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE2} m4
@@ -229,7 +231,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
-* Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> - 2.15.91.3.fc6
+* Fri Aug 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-4.fc6
+- Make clearing recent files work more than once
+
+* Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-3.fc6
 - add more complete fix for bug 201439
 
 * Fri Aug 15 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-2.fc6



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:47:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:47:08 -0400
Subject: rpms/esc/devel esc-1.0.0-ui-enhance.patch, NONE,
	1.1 esc-1.0.0-xul-sys-nss-nspr.patch, NONE,
	1.1 firefox-1.1-nss-system-nspr.patch, NONE,
	1.1 firefox-1.5-with-system-nss.patch, NONE, 1.1 esc, 1.1,
	1.2 esc.spec, 1.8, 1.9
Message-ID: <200608181547.k7IFl8w6005859@cvs.devel.redhat.com>

Author: jmagne

Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5279/devel

Modified Files:
	esc esc.spec 
Added Files:
	esc-1.0.0-ui-enhance.patch esc-1.0.0-xul-sys-nss-nspr.patch 
	firefox-1.1-nss-system-nspr.patch 
	firefox-1.5-with-system-nss.patch 
Log Message:
auto-import esc-1.0.0-5 on branch devel from esc-1.0.0-5.src.rpm

esc-1.0.0-ui-enhance.patch:
 rpm/esc                                              |   10 
 rpm/esc.spec                                         |   20 
 src/app/xpcom/Makefile.moz                           |    2 
 src/app/xpcom/rhCoolKey.cpp                          |   60 -
 src/app/xpcom/tray/Makefile.moz                      |    8 
 src/app/xpcom/tray/rhITray.idl                       |    8 
 src/app/xpcom/tray/rhLinuxTray.cpp                   |   59 +
 src/app/xpcom/tray/rhMacTray.cpp                     |   31 
 src/app/xpcom/tray/rhTray.cpp                        |   34 +
 src/app/xul/esc/chrome/content/esc/ESC.js            |  603 +++++++++++--------
 src/app/xul/esc/chrome/content/esc/TRAY.js           |   80 ++
 src/app/xul/esc/chrome/content/esc/advancedinfo.xul  |    2 
 src/app/xul/esc/chrome/content/esc/config.xul        |   16 
 src/app/xul/esc/chrome/content/esc/esc.css           |   21 
 src/app/xul/esc/chrome/content/esc/esc.xul           |   21 
 src/app/xul/esc/chrome/content/esc/esc_browser.xul   |   51 -
 src/app/xul/esc/chrome/content/esc/hiddenWindow.html |   11 
 src/app/xul/esc/chrome/content/esc/hiddenWindow.xul  |   26 
 src/app/xul/esc/chrome/content/esc/password.js       |    4 
 src/app/xul/esc/chrome/content/esc/settings.xul      |   19 
 src/app/xul/esc/chrome/locale/en-US/esc.dtd          |    5 
 src/app/xul/esc/chrome/locale/en-US/esc.properties   |   13 
 src/app/xul/esc/components/escCLH.js                 |    2 
 src/lib/NssHttpClient/request.cpp                    |    2 
 src/lib/NssHttpClient/response.cpp                   |    2 
 src/lib/coolkey/CoolKey.cpp                          |   20 
 src/lib/coolkey/CoolKeyHandler.cpp                   |   46 -
 src/lib/coolkey/CoolKey_Message.cpp                  |    2 
 src/lib/coolkey/NSSManager.cpp                       |   11 
 src/lib/coolkey/SlotUtils.cpp                        |    2 
 src/lib/coolkey/SmartCardMonitoringThread.cpp        |    5 
 src/lib/notifytray/Makefile                          |    7 
 src/lib/notifytray/manifest.mn                       |    7 
 src/lib/notifytray/notifyareaicon.c                  |   11 
 src/lib/notifytray/notifyareaicon.h                  |    4 
 src/lib/notifytray/notifytray.c                      |   75 ++
 src/lib/notifytray/notifytray.h                      |    4 
 src/xulrunner/Makefile                               |    2 
 38 files changed, 825 insertions(+), 481 deletions(-)

--- NEW FILE esc-1.0.0-ui-enhance.patch ---
--- ./esc/src/lib/coolkey/CoolKey_Message.cpp.fix6	2006-08-16 20:41:14.000000000 -0700
+++ ./esc/src/lib/coolkey/CoolKey_Message.cpp	2006-08-16 20:41:24.000000000 -0700
@@ -22,7 +22,7 @@
 #include "math.h"
 #include <iostream>
 
-PRLogModuleInfo *nkeyLogMS = PR_NewLogModule("netkey");
+PRLogModuleInfo *nkeyLogMS = PR_NewLogModule("coolKeyMessage");
 
 void URLEncode(unsigned char *buf,char *ret, int *ret_len,int buff_len);
 void URLDecode(char *buf,unsigned char *ret, int *ret_len,int buff_len);
--- ./esc/src/lib/coolkey/NSSManager.cpp.fix6	2006-08-16 20:41:42.000000000 -0700
+++ ./esc/src/lib/coolkey/NSSManager.cpp	2006-08-16 20:42:13.000000000 -0700
@@ -40,7 +40,7 @@
 
 #include "SlotUtils.h"
 
-static PRLogModuleInfo *coolKeyLogNSS = PR_NewLogModule("coolKey");
+static PRLogModuleInfo *coolKeyLogNSS = PR_NewLogModule("coolKeyNSS");
 
 NSSManager::NSSManager()
 {
@@ -61,6 +61,9 @@
 {
   // Init NSS
 
+  PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("Initializing the NSS Crypto Library. \n"));
+
+
   if(aAppDir)
   {
       SECStatus status =  NSS_Init(aAppDir);
@@ -75,7 +78,7 @@
 
 	  if(status != SECSuccess)
           {
-                PR_LOG( coolKeyLogNSS, PR_LOG_ERROR, ("InitNSS:Simple init failed.\n"));
+                PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS:Simple init failed.\n"));
 		return E_FAIL;
           }
       }
@@ -87,7 +90,7 @@
 
    char modSpec[512];
 
-   sprintf(modSpec,"library=\"%s\" name=\"%s\" parameters=\"%s\" NSS=\"slotParams=0x4=[slotFlags='PublicCerts']\"\n",COOLKEY_PKCS11_LIBRARY,COOLKEY_NAME,PROMISCUOUS_PARAMETER);
+   sprintf(modSpec,"library=\"%s\" name=\"%s\" parameters=\"%s\" NSS=\"slotParams={0x00000002=[slotFlags='PublicCerts']}\"\n",COOLKEY_PKCS11_LIBRARY,COOLKEY_NAME,PROMISCUOUS_PARAMETER);
 
 
    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS: modSpec %s\n",modSpec));
@@ -98,7 +101,7 @@
 
   if(!userModule || !userModule->loaded)
   {
-      PR_LOG( coolKeyLogNSS, PR_LOG_ERROR, ("NSSManager::InitNSS problem loading PKCS11 module. No keys will be recognized!\n"));
+      PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("NSSManager::InitNSS problem loading PKCS11 module. No keys will be recognized!\n"));
       return E_FAIL;
   }
 
--- ./esc/src/lib/coolkey/SlotUtils.cpp.fix6	2006-08-16 20:42:32.000000000 -0700
+++ ./esc/src/lib/coolkey/SlotUtils.cpp	2006-08-16 20:42:39.000000000 -0700
@@ -44,7 +44,7 @@
 static std::list<CoolKeyInfo*> gCoolKeyList;
 PRLock *gCoolKeyListLock = NULL;
 
-static PRLogModuleInfo *coolKeyLogSU = PR_NewLogModule("coolKey");
+static PRLogModuleInfo *coolKeyLogSU = PR_NewLogModule("coolKeySlot");
 #ifdef DEBUG
 int gCoolKeyListLockCount = 0;
 #endif // DEBUG
--- ./esc/src/lib/coolkey/CoolKey.cpp.fix6	2006-08-16 20:39:26.000000000 -0700
+++ ./esc/src/lib/coolkey/CoolKey.cpp	2006-08-16 20:39:58.000000000 -0700
@@ -36,7 +36,7 @@
 
 static NSSManager* g_NSSManager = NULL;
 
-static PRLogModuleInfo *coolKeyLog = PR_NewLogModule("netkey");
+static PRLogModuleInfo *coolKeyLog = PR_NewLogModule("coolKeyLib");
 
 static std::list<CoolKeyListener*> g_Listeners;
 
@@ -55,7 +55,7 @@
   PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyInit:\n appDir %s",aAppDir));
   if (g_NSSManager) 
   {
-    PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyInit:g_NSSManager already exists. \n"));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyInit:g_NSSManager already exists. \n"));
     return E_FAIL;
   }
 
@@ -72,7 +72,7 @@
   HRESULT rv = g_NSSManager->InitNSS(aAppDir);
   if (rv == E_FAIL)
   {
-       PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyInit:Failed to Init NSSManager. \n"));
+       PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Failed to initialize Crypto library! \n"));
        return rv;
   }
 
@@ -855,7 +855,7 @@
 
      assert(cardCtxt);
     if (!cardCtxt) {
-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't create Card Context !.\n"));
+      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't create Card Context !.\n"));
       result = E_FAIL;
       goto done;
     }
@@ -863,7 +863,7 @@
     conn = CKYCardConnection_Create(cardCtxt);
     assert(conn);
     if (!conn) {
-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't create Card Connection!\n"));
+      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't create Card Connection!\n"));
       result = E_FAIL;
       goto done;
     }
@@ -871,14 +871,14 @@
     readerName = GetReaderNameForKeyID(aKey);
     assert(readerName);
     if (!readerName) {
-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't get reader name!\n"));
+      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't get reader name!\n"));
       result = E_FAIL;
       goto done;
     }
 
     status = CKYCardConnection_Connect(conn, readerName);
     if (status != CKYSUCCESS) {
-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't connect to Card!\n"));
+      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't connect to Card!\n"));
 
       result = E_FAIL;
       goto done;
@@ -889,7 +889,7 @@
     status = CKYApplet_SelectCoolKeyManager(conn, &apduRC);
     if (status != CKYSUCCESS) {
 
-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't select CoolKey manager!\n"));
+      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't select CoolKey manager!\n"));
       goto done;
     }
 
@@ -898,7 +898,7 @@
 
     if(status != CKYSUCCESS)
     {
-        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Error actually getting IssuerInfo!\n"));
+        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Error actually getting IssuerInfo!\n"));
         result = E_FAIL;
         goto done;
     }
@@ -914,7 +914,7 @@
 
     if(infoSize >= (CKYSize ) aBufLen)
     {
-        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Insufficient space to put Issuer Info!\n"));
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Insufficient space to put Issuer Info!\n"));
 
         result = E_FAIL;
         goto done;
--- ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp.fix6	2006-08-16 20:43:11.000000000 -0700
+++ ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp	2006-08-16 20:43:25.000000000 -0700
@@ -29,7 +29,7 @@
 
 #include <assert.h>
 
-static PRLogModuleInfo *coolKeyLogSC = PR_NewLogModule("coolKey");
+static PRLogModuleInfo *coolKeyLogSC = PR_NewLogModule("coolKeySmart");
 
 SmartCardMonitoringThread::SmartCardMonitoringThread(SECMODModule *aModule)
   : mModule(aModule), mThread(NULL)
@@ -127,8 +127,7 @@
 
 
     PR_LOG( coolKeyLogSC, PR_LOG_ALWAYS, 
-           ("SmartCardMonitoringThread::Execute Token Event fired :"
-            " slot %p \n", slot));
+           ("SmartCard thread event detected. \n"));
 
     if (slot == NULL) {
 
--- ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix6	2006-08-16 20:40:24.000000000 -0700
+++ ./esc/src/lib/coolkey/CoolKeyHandler.cpp	2006-08-16 20:40:35.000000000 -0700
@@ -55,7 +55,7 @@
 #define CKA_MOZILLA_ATR        (CKO_NETSCAPE+25)
 #endif
 
-static PRLogModuleInfo *coolKeyLogHN = PR_NewLogModule("netkey");
+static PRLogModuleInfo *coolKeyLogHN = PR_NewLogModule("coolKeyHandler");
 
 void NotifyEndResult(CoolKeyHandler* context, int operation, int result, int description);
 
@@ -455,7 +455,7 @@
   const char *readerName =  NULL;
 
   if (!aKey || aKey->mKeyType != eCKType_CoolKey ||  !aKey->mKeyID) {
-      PR_LOG( coolKeyLogHN, PR_LOG_ERROR, ("CoolKeyHandler::Init: failure . Incorrect Key Attributes!\n"));
+      PR_LOG( coolKeyLogHN, PR_LOG_ERROR, ("Cannot begin CoolKey operation. Insuficient input parameters. \n"));
[...2874 lines suppressed...]
@@ -54,7 +54,7 @@
 <!ENTITY updateValues "Update Values">
 <!ENTITY doTest "Test URL">
 <!ENTITY escTitle "Red Hat Enterprise Security Client">
-<!ENTITY pleaseEnroll "Enrolling Your Key">
+<!ENTITY pleaseEnroll "Security Key Enrollment">
 <!ENTITY unenrolledDetected "Unenrolled Key Detected">
 <!ENTITY noKeyDetected "No Key Detected">
 <!ENTITY enrollMessage "To begin this enrollment process, you will need to choose a password to protect the key. You will need to enter this password each time you use your new key.  You will also need to enter the security information below needed by ESC to complete your enrollment.">
@@ -74,6 +74,7 @@
 <!ENTITY cancel "Cancel">
 <!ENTITY closeEnrollLater "Close, I'll Enroll Later">
 <!ENTITY closeAdminLater "Close">
+<!ENTITY closeNow "Close">
 <!ENTITY enrollKeyNow "Enroll My Key Now">
 <!ENTITY enrollKey "Enroll Key">
 <!ENTITY administerKeys "Manage Keys">
@@ -88,4 +89,4 @@
 <!ENTITY getESCPassword "ESC Password Information">
 <!ENTITY escOK "OK">
 <!ENTITY escCancel "Cancel">
-<!ENTITY tpsConfigDesc "ESC can not determine the location of the TPS configuration for this key. Please enter the correct value.">
+<!ENTITY tpsConfigDesc "ESC has detected a totally blank key for which it knows nothing about.  ESC can not determine the location of the TPS information for this key. Please enter the correct value so ESC can contact the TPS. The correct value is of the form: http(s)://test.host.com:7888/home.cgi.">
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix6	2006-08-16 20:37:50.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties	2006-08-16 20:37:56.000000000 -0700
@@ -34,10 +34,15 @@
 tpsURI=TPS Server URL
 tpsUI=TPS External UI URL
 status=Status
+issuer=Issuer
+escLogEntries=ESC Log Entries
+noLogFileOrData=No Log File or Log File Has No Data.
 certsOnToken=CERTIFICATES on KEY 
 certificateNickname=Certificate Nickname:
 coolkeyComponentVersion=ESC Version
 coolkeyDetectedNumberKeys=Number of Security Keys Detected
+enrolledDetected=Enrolled Key Detected
+enrolledDetectedMessage=ESC has detected an enrolled key. If you would rather not re-enroll this key press "Close".  
 formatingToken=Formatting Key 
 enrollingToken=Enrolling Key 
 resettingTokenPIN=Resetting Key Pin 
@@ -45,6 +50,8 @@
 blinkingToken=Blinking 
 keyInserted=Key Inserted!
 keyRemoved=Key Removed!
+keyInsertedComputer=Security Key Inserted into the computer.
+keyRemovedComputer=Security Key Removed from the computer.
 #ESC Error Messages from TPS
 errorNone=Operation Completed Successfully.
 serverError=Server Error.
@@ -63,7 +70,7 @@
 errorCommTokenDB=Cannot communicate with token database, try again later.
 errorTokenDisabled=Token is disabled, contact techincal support.
 errorPinReset=Cannot reset pin value for the token, contact technical support.
-errorConnLost=Connection to server lost.
+errorConnLost=Connection to server lost. If problem persists, contact technical support. 
 errorEntryTokenDB=Can not create entry for token in database, contact technical support.
 errorNoTokenState=No such token state, contact technical support.
 errorInvalidLostTokenReason=Invalid lost token reason, contact technical support.
@@ -92,6 +99,7 @@
 errorConfigValue=Error Getting Config Value:
 errorSetConfigValue=Error SettingConfig Value: 
 errorBlankTPSURI=Blank Tps Uri submitted.
+noTpsConfigUrl=You must provide a Url to test!
 aboutToTestTPSURI=About to test TPS URI:
 errorSelectKey=Please select a key.
 tpsURLContacted=TPS URL has been successfully contacted.
@@ -102,7 +110,7 @@
 errorContactEnrollURL=Error contacting ESC Enroll URL, reconfigure and try again.
 tpsConfigSuccess=TPS config information successfully obtained!
 tpsConfigError=Error obtaining TPS config information!
-tpsConfigTest=About to test the TSP config url :
+tpsConfigTest=About to test the TSP Phone Home Url :
 tpsNoConfigUrl=Provide a valid TPS config URL!
 tpsURIMustHaveValue=TPS URI item must have a value!
 errorSetConfigValue=Error setting config value!:
@@ -144,6 +152,7 @@
 errorFindESCPlatform=Unable to determine ESC platform.
 errorIssuerInfo=Error obtaining Issuer Info for key.
 #Strings for TRAY.js
+errorTrayComponent=ESC can not be operated with its Icon in the notification area. \n Please insert a Security Key to bring ESC to life.
 errorTrayIsInitialized=Can't get if Tray is already intialized!
 errorShowAllWindows=Error Showing All Windows:
 errorHideAllWindows=Error Hiding all Windows:
--- ./esc/src/app/xul/esc/components/escCLH.js.fix6	2006-08-16 20:38:29.000000000 -0700
+++ ./esc/src/app/xul/esc/components/escCLH.js	2006-08-16 20:38:53.000000000 -0700
@@ -54,7 +54,7 @@
                return;
            }
            
-           var chromeURI = "chrome://esc/content/hiddenWindow.html";
+           var chromeURI = "chrome://esc/content/hiddenWindow.xul";
 
            recordMessage(chromeURI);
 
--- ./esc/src/xulrunner/Makefile.fix6	2006-08-16 20:50:10.000000000 -0700
+++ ./esc/src/xulrunner/Makefile	2006-08-16 20:50:28.000000000 -0700
@@ -65,8 +65,6 @@
 	echo "ac_add_options --enable-default-toolkit=gtk2" >> $@.$(TYPE)
 	echo "ac_add_options --enable-xft" >> $@.$(TYPE)
 	echo "ac_add_options --disable-freetype2" >> $@.$(TYPE)
-	echo "ac_add_options --with-system-nspr" >> $@.$(TYPE)
-	echo "ac_add_options --with-system-nss" >> $@.$(TYPE)
 endif
 ifeq ($(OS_ARCH), WINNT)
 	echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE)
--- ./esc/rpm/esc.fix6	2006-08-16 20:14:22.000000000 -0700
+++ ./esc/rpm/esc	2006-08-16 20:19:32.000000000 -0700
@@ -1,5 +1,11 @@
 #!/bin/sh
-export NSPR_LOG_MODULES=tray:2,coolkey:2,netkey:2,coolKey:2
+export NSPR_LOG_MODULES=tray:2,coolKeyLib:2,coolKey:2,coolKeyNSS:2,coolKeySmart:2,coolKeyHandler:2
+
+if [ ! -d ~/.redhat/esc ]
+then
+mkdir -p ~/.redhat/esc
+fi
+
 export NSPR_LOG_FILE=~/.redhat/esc/esc.log
-cd /usr/lib/esc-1.0.0
+cd  $LIBDIR/esc-1.0.0
 ./esc
--- ./esc/rpm/esc.spec.fix6	2006-08-16 20:12:33.000000000 -0700
+++ ./esc/rpm/esc.spec	2006-08-16 20:19:38.000000000 -0700
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -13,6 +13,7 @@
 Patch3: firefox-1.5-with-system-nss.patch
 Patch4: firefox-1.1-nss-system-nspr.patch
 Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
+Patch6: esc-1.0.0-ui-enhance.patch
 
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
@@ -22,16 +23,16 @@
 BuildRequires: autoconf213 libX11-devel libXt-devel
 
 BuildRequires: pcsc-lite-devel coolkey-devel
-BuildRequires: desktop-file-utils zip binutils
+BuildRequires: desktop-file-utils zip binutils libnotify-devel
 Requires: pcsc-lite ifd-egate coolkey nss nspr
-Requires: zip
+Requires: zip libnotify
 
 # 390 does not have coolkey or smartCards
 # Xulrunner won't compile on ppc64 right now.
 ExcludeArch: s390 s390x ppc64
 
 # We can't allow the internal xulrunner to leak out
-AutoProv: 0
+AutoReqProv: 0
 
 #%define __prelink_undo_cmd %{nil}
 %define escname %{name}-%{version}
@@ -64,6 +65,7 @@
 #patch esc to use system nss and nspr.
 
 %patch5 -p1 -b .fix5
+%patch6 -p1 -b .fix6
 
 
 #Unpack xulrunner where esc expects it to be.
@@ -92,7 +94,7 @@
 
 cd ../..
 
-make BUILD_OPT=1 
+make BUILD_OPT=1 HAVE_LIB_NOTIFY=1
 
 %install
 
@@ -105,7 +107,8 @@
 mkdir -p $RPM_BUILD_ROOT/%{pixmapdir}
 mkdir -p $RPM_BUILD_ROOT/%{docdir}
 
-cp %{SOURCE1} $RPM_BUILD_ROOT/%{escbindir}
+sed -e 's;\$LIBDIR;'%{_libdir}';g'  %{SOURCE1} > $RPM_BUILD_ROOT/%{escbindir}/%{name}
+
 chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
 
 mkdir -p $RPM_BUILD_ROOT/%{escdir}
@@ -171,8 +174,11 @@
 fi
 
 %changelog
-* Tue Aug  1 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-4
+* Tue Aug  17 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-4
 - Build ESC's xulrunner component using system nss and nspr
+- Build process creates run script based on {_libdir} variable,
+  accounting for differences on 64 bit machines.
+- UI enhancements
 
 * Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-3
 - Don't provide mozilla libraries

esc-1.0.0-xul-sys-nss-nspr.patch:
 rpm/esc.spec                    |   48 +++++++++++++++++++++++++++++++++-------
 src/app/xpcom/tray/Makefile.moz |    2 -
 src/lib/notifytray/manifest.mn  |    2 -
 src/xulrunner/Makefile          |    2 +
 4 files changed, 44 insertions(+), 10 deletions(-)

--- NEW FILE esc-1.0.0-xul-sys-nss-nspr.patch ---
--- ./esc/src/lib/notifytray/manifest.mn.fix	2006-08-01 10:56:46.000000000 -0700
+++ ./esc/src/lib/notifytray/manifest.mn	2006-08-01 11:01:04.000000000 -0700
@@ -21,7 +21,7 @@
 LDFLAGS += $(shell pkg-config --libs gtk+-2.0)
 
 
-MODULE		= notify
+MODULE		= traynotify
 LIBRARY_NAME	= $(MODULE)
 MAPFILE 	= $(OBJDIR)/notify.def
 
--- ./esc/src/app/xpcom/tray/Makefile.moz.fix	2006-08-01 10:57:27.000000000 -0700
+++ ./esc/src/app/xpcom/tray/Makefile.moz	2006-08-01 11:02:12.000000000 -0700
@@ -52,7 +52,7 @@
 
 ifeq ($(OS_ARCH),Linux)
 
-COOLKEY_LIBS+= -L $(CORE_DIST)/lib -lnotify
+COOLKEY_LIBS+= -L $(CORE_DIST)/lib -ltraynotify
 
 endif
 
--- ./esc/src/xulrunner/Makefile.fix	2006-08-01 10:58:10.000000000 -0700
+++ ./esc/src/xulrunner/Makefile	2006-08-01 11:00:07.000000000 -0700
@@ -65,6 +65,8 @@
 	echo "ac_add_options --enable-default-toolkit=gtk2" >> $@.$(TYPE)
 	echo "ac_add_options --enable-xft" >> $@.$(TYPE)
 	echo "ac_add_options --disable-freetype2" >> $@.$(TYPE)
+	echo "ac_add_options --with-system-nspr" >> $@.$(TYPE)
+	echo "ac_add_options --with-system-nss" >> $@.$(TYPE)
 endif
 ifeq ($(OS_ARCH), WINNT)
 	echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE)
--- ./esc/rpm/esc.spec.fix	2006-08-01 10:55:50.000000000 -0700
+++ ./esc/rpm/esc.spec	2006-08-01 11:17:26.000000000 -0700
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 1 
+Release: 4%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -10,6 +10,10 @@
 
 Patch1: firefox-1.5.0.1-dumpstack.patch
 Patch2: xulrunner-1.8.0.1-coreconf.patch
+Patch3: firefox-1.5-with-system-nss.patch
+Patch4: firefox-1.1-nss-system-nspr.patch
+Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
+
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -19,8 +23,15 @@
 
 BuildRequires: pcsc-lite-devel coolkey-devel
 BuildRequires: desktop-file-utils zip binutils
-Requires: pcsc-lite ifd-egate coolkey
-Requires: gtk+ freetype zip nspr nss
+Requires: pcsc-lite ifd-egate coolkey nss nspr
+Requires: zip
+
+# 390 does not have coolkey or smartCards
+# Xulrunner won't compile on ppc64 right now.
+ExcludeArch: s390 s390x ppc64
+
+# We can't allow the internal xulrunner to leak out
+AutoProv: 0
 
 #%define __prelink_undo_cmd %{nil}
 %define escname %{name}-%{version}
@@ -50,6 +61,11 @@
 
 %setup -q -c -n %{escname}
 
+#patch esc to use system nss and nspr.
+
+%patch5 -p1 -b .fix5
+
+
 #Unpack xulrunner where esc expects it to be.
 
 %setup -T -D -a 3 -n %{escname}/esc/dist/src
@@ -60,11 +76,14 @@
 
 %patch1 -p1 -b .fix1
 %patch2 -p1 -b .fix2
+%patch3 -p1 -b .fix3
+%patch4 -p1 -b .fix4
+
 
 
 %build
 
-%ifarch x86_64 ppc64 ia64 s390x
+%ifarch x86_64 ppc64 ia64
 USE_64=1
 export USE_64
 %endif
@@ -77,7 +96,6 @@
 
 %install
 
-pwd
 cd ../../src/app/xpcom 
 
 mkdir -p $RPM_BUILD_ROOT/%{escbindir}
@@ -92,6 +110,12 @@
 
 mkdir -p $RPM_BUILD_ROOT/%{escdir}
 
+%ifarch x86_64 ppc64 ia64
+USE_64=1
+export USE_64
+%endif
+
+
 make BUILD_OPT=1 install DESTDIR=$RPM_BUILD_ROOT/%{escdir}
 
 rm -rf $RPM_BUILD_ROOT/%{escdir}/usr
@@ -99,7 +123,7 @@
 cd ../../../dist/*OPT*/esc_build/esc
 
 cp %{esc_chromepath}/esc.png $RPM_BUILD_ROOT/%{icondir}
-cp %{esc_chromepath}/esc.png $RPM_BUILD_ROOT/%{pixmapdir}
+ln -s $RPMBUILD_ROOT%{icondir}/esc.png $RPM_BUILD_ROOT/%{pixmapdir}/esc.png
 
 cp %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/%{appdir}
 cp %{SOURCE2} $RPM_BUILD_ROOT/%{autostartdir}
@@ -146,9 +170,17 @@
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-rm -rf %{escdir}
-
 %changelog
+* Tue Aug  1 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-4
+- Build ESC's xulrunner component using system nss and nspr
+
+* Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-3
+- Don't provide mozilla libraries
+
+* Fri Jul 28 2006 Ray Strode <rstrode at redhat.com> - 1.0.0-2
+- remove bogus gtk+ requires (and some others that will
+  be automatic)
+
 * Tue Jun 13 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-1
 - Initial revision for fedora
 

firefox-1.1-nss-system-nspr.patch:
 coreconf/location.mk                     |    2 ++
 manager/Makefile.in                      |   17 ++++++++++++++---
 nss/lib/ckfw/builtins/Makefile           |   10 +++++-----
 nss/lib/fortcrypt/swfort/pkcs11/Makefile |   10 +++++-----
 4 files changed, 26 insertions(+), 13 deletions(-)

--- NEW FILE firefox-1.1-nss-system-nspr.patch ---
Index: mozilla/security/coreconf/location.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v
retrieving revision 1.9
diff -u -r1.9 location.mk
--- mozilla/security/coreconf/location.mk	25 Apr 2004 15:02:17 -0000	1.9
+++ mozilla/security/coreconf/location.mk	11 Apr 2005 20:21:57 -0000
@@ -61,6 +61,8 @@
 
 DIST          = $(SOURCE_PREFIX)/$(PLATFORM)
 
+NSPR_LIBDIR   = $(DIST)/lib
+
 ifdef BUILD_DEBUG_GC
     DEFINES += -DDEBUG_GC
 endif
Index: mozilla/security/manager/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
retrieving revision 1.56
diff -u -r1.56 Makefile.in
--- mozilla/security/manager/Makefile.in	14 Mar 2005 10:00:58 -0000	1.56
+++ mozilla/security/manager/Makefile.in	11 Apr 2005 20:21:57 -0000
@@ -76,12 +76,23 @@
 endif
 endif
 
+ABS_DIST := $(shell cd $(DIST) && pwd)
+ifeq ($(OS_ARCH),WINNT)
+ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g')
+endif
+NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS)))
+ifneq (,$(strip $(NSPR_LIBDIR)))
+NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR)))
+else
+NSPR_LIBDIR = $(ABS_DIST)/lib
+endif
 # NSS makefiles are not safe for parallel execution.
 DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
 DEFAULT_GMAKE_FLAGS += CC="$(CC)"
-DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
-DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
-DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
+DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)"
+DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST)
+DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST)
+DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR)
 DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
 ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
Index: mozilla/security/nss/lib/ckfw/builtins/Makefile
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- mozilla/security/nss/lib/ckfw/builtins/Makefile	20 Jan 2005 02:25:46 -0000	1.14
+++ mozilla/security/nss/lib/ckfw/builtins/Makefile	11 Apr 2005 20:21:57 -0000
@@ -53,23 +53,23 @@
 # This is merely an expedient hack and not the right solution.
 ifdef NS_USE_GCC
 EXTRA_LIBS += \
-	-L$(DIST)/lib \
+	-L$(NSPR_LIBDIR) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
 	$(NULL)
 else
 EXTRA_LIBS += \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
 	$(NULL)
 endif
 
 else
 
 EXTRA_LIBS += \
-	$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 	$(NULL)
 
 endif
Index: mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile	25 Apr 2004 15:03:08 -0000	1.18
+++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile	11 Apr 2005 20:21:57 -0000
@@ -63,7 +63,7 @@
 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 	$(CRYPTO_LIB) \
 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-	-L$(DIST)/lib \
+	-L$(NSPR_LIBDIR) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -76,8 +76,8 @@
 	$(DIST)/lib/softokn.lib \
 	$(CRYPTO_LIB) \
 	$(DIST)/lib/secutil.lib \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
 	wsock32.lib \
 	winmm.lib \
 	$(NULL)
@@ -98,8 +98,8 @@
 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 	$(CRYPTO_LIB) \
 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 	$(NULL)
 
 endif

firefox-1.5-with-system-nss.patch:
 aclocal.m4                                  |    1 
 build/autoconf/nss.m4                       |   67 ++++++++++++++
 config/autoconf.mk.in                       |   43 +++++++++
 config/config.mk                            |   33 -------
 configure                                   |  129 ++++++++++++++++++++++++++++
 configure.in                                |   18 +++
 security/manager/Makefile.in                |   16 +++
 security/manager/ssl/src/Makefile.in        |    5 +
 security/manager/ssl/src/nsNSSComponent.cpp |   52 ++++-------
 9 files changed, 301 insertions(+), 63 deletions(-)

--- NEW FILE firefox-1.5-with-system-nss.patch ---
Index: mozilla/configure.in
===================================================================
RCS file: /cvsroot/mozilla/configure.in,v
retrieving revision 1.1503.2.15
diff -u -r1.1503.2.15 configure.in
--- mozilla/configure.in	4 Oct 2005 05:53:49 -0000	1.1503.2.15
+++ mozilla/configure.in	15 Dec 2005 05:40:40 -0000
@@ -86,6 +86,7 @@
 MOZPNG=10207
 MOZZLIB=1.2.3
 NSPR_VERSION=4
+NSS_VERSION=3
 
 dnl Set the minimum version of toolkit libs used by mozilla
 dnl ========================================================
@@ -3472,6 +3473,19 @@
     fi
 fi
 
+dnl ========================================================
+dnl = If NSS was not detected in the system, 
+dnl = use the one in the source tree (mozilla/security/nss)
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-nss,
+[  --with-system-nss      Use system installed NSS],
+    _USE_SYSTEM_NSS=1 )
+
+if test -n "$_USE_SYSTEM_NSS"; then
+    AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
+fi
+
 if test -z "$SKIP_LIBRARY_CHECKS"; then
 dnl system JPEG support
 dnl ========================================================
@@ -6698,6 +6712,10 @@
 AC_SUBST(NSPR_LIBS)
 AC_SUBST(MOZ_NATIVE_NSPR)
 
+AC_SUBST(NSS_CFLAGS)
+AC_SUBST(NSS_LIBS)
+AC_SUBST(MOZ_NATIVE_NSS)
+
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(CPPFLAGS)
Index: mozilla/configure
===================================================================
RCS file: /cvsroot/mozilla/configure,v
retrieving revision 1.1492.2.17
diff -u -r1.1492.2.17 configure
--- mozilla/configure	4 Oct 2005 06:01:48 -0000	1.1492.2.17
+++ mozilla/configure	15 Dec 2005 05:40:53 -0000
@@ -44,6 +44,13 @@
   --with-nspr-exec-prefix=PFX
                           Exec prefix where NSPR is installed"
 ac_help="$ac_help
+  --with-system-nss      Use system installed NSS"
+ac_help="$ac_help
+  --with-nss-prefix=PFX  Prefix where NSS is installed"
+ac_help="$ac_help
+  --with-nss-exec-prefix=PFX
+                          Exec prefix where NSS is installed"
+ac_help="$ac_help
   --with-system-jpeg[=PFX]
                           Use system libjpeg [installed at prefix PFX]"
 ac_help="$ac_help
@@ -1020,6 +1027,7 @@
 MOZPNG=10207
 MOZZLIB=1.2.3
 NSPR_VERSION=4
+NSS_VERSION=3
 
 GLIB_VERSION=1.2.0
 GTK_VERSION=1.2.0
@@ -11300,6 +11308,123 @@
     fi
 fi
 
+
+# Check whether --with-system-nss or --without-system-nss was given.
+if test "${with_system_nss+set}" = set; then
+  withval="$with_system_nss"
+  if test "$withval" = "yes"; then
+    _USE_SYSTEM_NSS=1 
+  elif test "$withval" = "no"; then
+    :
+  else
+    { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; exit 1; }
+  fi
+fi
+
+
+if test -n "$_USE_SYSTEM_NSS"; then
+    
+# Check whether --with-nss-prefix or --without-nss-prefix was given.
+if test "${with_nss_prefix+set}" = set; then
+  withval="$with_nss_prefix"
+  nss_config_prefix="$withval"
+else
+  nss_config_prefix=""
+fi
+
+
+# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given.
+if test "${with_nss_exec_prefix+set}" = set; then
+  withval="$with_nss_exec_prefix"
+  nss_config_exec_prefix="$withval"
+else
+  nss_config_exec_prefix=""
+fi
+
+
+	if test -n "$nss_config_exec_prefix"; then
+		nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
+		fi
+	fi
+	if test -n "$nss_config_prefix"; then
+		nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_prefix/bin/nss-config
+		fi
+	fi
+
+	unset ac_cv_path_NSS_CONFIG
+	# Extract the first word of "nss-config", so it can be a program name with args.
+set dummy nss-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:11363: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$NSS_CONFIG" in
+  /*)
+  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_NSS_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no"
+  ;;
+esac
+fi
+NSS_CONFIG="$ac_cv_path_NSS_CONFIG"
+if test -n "$NSS_CONFIG"; then
+  echo "$ac_t""$NSS_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	min_nss_version=3.0.0
+	echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
+echo "configure:11398: checking for NSS - version >= $min_nss_version (skipping)" >&5
+
+	no_nss=""
+	if test "$NSS_CONFIG" = "no"; then
+		no_nss="yes"
+	else
+		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
+		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+
+				nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+	fi
+
+	if test -z "$no_nss"; then
+		echo "$ac_t""yes" 1>&6
+		MOZ_NATIVE_NSS=1     
+	else
+		echo "$ac_t""no" 1>&6
+	fi
+
+
+	
+	
+
+
+fi
+
 if test -z "$SKIP_LIBRARY_CHECKS"; then
 # Check whether --with-system-jpeg or --without-system-jpeg was given.
 if test "${with_system_jpeg+set}" = set; then
@@ -19473,6 +19602,9 @@
 s%@NSPR_CONFIG@%$NSPR_CONFIG%g
 s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g
 s%@NSPR_LIBS@%$NSPR_LIBS%g
+s%@NSS_CONFIG@%$NSS_CONFIG%g
+s%@NSS_CFLAGS@%$NSS_CFLAGS%g
+s%@NSS_LIBS@%$NSS_LIBS%g
 s%@GTK_CONFIG@%$GTK_CONFIG%g
 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g
@@ -19753,6 +19885,7 @@
 s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g
 s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g
 s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g
+s%@MOZ_NATIVE_NSS@%$MOZ_NATIVE_NSS%g
 s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g
 s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g
 s%@CROSS_COMPILE@%$CROSS_COMPILE%g
Index: mozilla/aclocal.m4
===================================================================
RCS file: /cvsroot/mozilla/aclocal.m4,v
retrieving revision 1.14
diff -u -r1.14 aclocal.m4
--- mozilla/aclocal.m4	13 May 2004 03:12:47 -0000	1.14
+++ mozilla/aclocal.m4	15 Dec 2005 05:40:53 -0000
@@ -8,6 +8,7 @@
 builtin(include, build/autoconf/libIDL.m4)dnl
 builtin(include, build/autoconf/libIDL-2.m4)dnl
 builtin(include, build/autoconf/nspr.m4)dnl
+builtin(include, build/autoconf/nss.m4)dnl
 builtin(include, build/autoconf/libart.m4)dnl
 builtin(include, build/autoconf/pkg.m4)dnl
 builtin(include, build/autoconf/freetype2.m4)dnl
Index: mozilla/config/autoconf.mk.in
===================================================================
RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
retrieving revision 3.363.2.1
diff -u -r3.363.2.1 autoconf.mk.in
--- mozilla/config/autoconf.mk.in	17 Aug 2005 17:17:17 -0000	3.363.2.1
+++ mozilla/config/autoconf.mk.in	15 Dec 2005 05:40:53 -0000
@@ -229,6 +229,7 @@
 MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@
 
 MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@
+MOZ_NATIVE_NSS = @MOZ_NATIVE_NSS@
 
 CROSS_COMPILE   = @CROSS_COMPILE@
 
@@ -384,6 +385,48 @@
 NSPR_CFLAGS	= @NSPR_CFLAGS@
 NSPR_LIBS	= @NSPR_LIBS@
 
+NSS_CONFIG	= @NSS_CONFIG@
+NSS_CFLAGS	= @NSS_CFLAGS@
+NSS_LIBS	= @NSS_LIBS@
+
+ifdef MOZ_NATIVE_NSS
+NSS_DEP_LIBS	= \
+	$(NULL)
+NSS_LIBS += \
+	-lcrmf \
+	$(NULL)
+else
+NSS_DEP_LIBS	= \
+	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
+	$(NULL)
+NSS_LIBS = \
+	$(LIBS_DIR) \
+	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+	-lsmime3 \
+	-lssl3 \
+	-lnss3 \
+	-lsoftokn3 \
+	$(NULL)
+endif
+
+ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH)))
+ifndef GNU_CC
+ifndef MOZ_NATIVE_NSS
+NSS_LIBS	= \
+	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \
+	$(NULL)
+endif
+endif
+endif
+
 LDAP_CFLAGS	= @LDAP_CFLAGS@
 LDAP_LIBS	= @LDAP_LIBS@
 XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@
Index: mozilla/config/config.mk
===================================================================
RCS file: /cvsroot/mozilla/config/config.mk,v
retrieving revision 3.337
diff -u -r3.337 config.mk
--- mozilla/config/config.mk	28 Jul 2005 19:48:11 -0000	3.337
+++ mozilla/config/config.mk	15 Dec 2005 05:40:54 -0000
@@ -138,39 +138,6 @@
 FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps
 FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
 
-# 
-# NSS libs needed for final link in static build
-# 
-
-NSS_LIBS	= \
-	$(LIBS_DIR) \
-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	-lsmime3 \
-	-lssl3 \
-	-lnss3 \
-	-lsoftokn3 \
-	$(NULL)
-
-ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH)))
-ifndef GNU_CC
-NSS_LIBS	= \
-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \
-	$(NULL)
-endif
-endif
-
-NSS_DEP_LIBS	= \
-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
-	$(NULL)
-
 MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
 MOZ_REGISTRY_LIBS          = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
 MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
Index: mozilla/build/autoconf/nss.m4
===================================================================
RCS file: mozilla/build/autoconf/nss.m4
diff -N mozilla/build/autoconf/nss.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mozilla/build/autoconf/nss.m4	15 Dec 2005 05:40:54 -0000
@@ -0,0 +1,67 @@
+# -*- tab-width: 4; -*-
+# Configure paths for NSS
+# Public domain - Chris Seawood <cls at seawood.org> 2001-04-05
+# Based upon gtk.m4 (also PD) by Owen Taylor
+
+dnl AM_PATH_NSS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for NSS, and define NSS_CFLAGS and NSS_LIBS
+AC_DEFUN(AM_PATH_NSS,
+[dnl
+
+AC_ARG_WITH(nss-prefix,
+	[  --with-nss-prefix=PFX  Prefix where NSS is installed],
+	nss_config_prefix="$withval",
+	nss_config_prefix="")
+
+AC_ARG_WITH(nss-exec-prefix,
+	[  --with-nss-exec-prefix=PFX
+                          Exec prefix where NSS is installed],
+	nss_config_exec_prefix="$withval",
+	nss_config_exec_prefix="")
+
+	if test -n "$nss_config_exec_prefix"; then
+		nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
+		fi
+	fi
+	if test -n "$nss_config_prefix"; then
+		nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_prefix/bin/nss-config
+		fi
+	fi
+
+	unset ac_cv_path_NSS_CONFIG
+	AC_PATH_PROG(NSS_CONFIG, nss-config, no)
+	min_nss_version=ifelse([$1], ,3.0.0,$1)
+	AC_MSG_CHECKING(for NSS - version >= $min_nss_version (skipping))
+
+	no_nss=""
+	if test "$NSS_CONFIG" = "no"; then
+		no_nss="yes"
+	else
+		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
+		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+
+		dnl Skip version check for now
+		nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+	fi
+
+	if test -z "$no_nss"; then
+		AC_MSG_RESULT(yes)
+		ifelse([$2], , :, [$2])     
+	else
+		AC_MSG_RESULT(no)
+	fi
+
+
+	AC_SUBST(NSS_CFLAGS)
+	AC_SUBST(NSS_LIBS)
+
+])
Index: mozilla/security/manager/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
retrieving revision 1.57
diff -u -r1.57 Makefile.in
--- mozilla/security/manager/Makefile.in	2 Jun 2005 02:03:05 -0000	1.57
+++ mozilla/security/manager/Makefile.in	15 Dec 2005 05:40:54 -0000
@@ -46,6 +46,8 @@
 MODULE = psm
 
 PACKAGE_FILE = psm.pkg
+
+ifndef MOZ_NATIVE_NSS
 PACKAGE_VARS += \
 	NSS3_LIB \
 	SMIME3_LIB \
@@ -57,6 +59,7 @@
 	$(NULL)
 
 LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+endif
 
 NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
 SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
@@ -147,6 +150,7 @@
 export:: .nss.cleaned
 
 .nss.cleaned: .nss.checkout
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 ifndef SKIP_CHK
@@ -154,9 +158,12 @@
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 endif
 	touch $@
+endif
 
 .nss.checkout:
+ifndef MOZ_NATIVE_NSS
 	touch $(srcdir)/$@
+endif
 
 dependclean export packages chrome::
 	$(MAKE) -C boot $@
@@ -167,12 +174,15 @@
 endif
 
 libs::
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+endif
 ifeq ($(OS_ARCH),WINNT)
 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
 else
 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
 endif
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
 ifndef SKIP_CHK
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
@@ -210,6 +220,7 @@
 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
 endif
 endif
+endif
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C locales $@
@@ -218,6 +229,7 @@
 endif
 
 install::
+ifndef MOZ_NATIVE_NSS
 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
 ifndef SKIP_CHK
 	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -232,6 +244,7 @@
 	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
 endif
+endif
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C locales $@
@@ -246,15 +259,18 @@
 ifdef MOZ_XUL
 	$(MAKE) -C pki $@
 endif
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 ifndef SKIP_CHK
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 endif
+endif
 
 echo-requires-recursive::
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C pki $@
 	$(MAKE) -C locales $@
+
Index: mozilla/security/manager/ssl/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/Makefile.in,v
retrieving revision 1.67
diff -u -r1.67 Makefile.in
--- mozilla/security/manager/ssl/src/Makefile.in	3 Aug 2005 05:24:18 -0000	1.67
+++ mozilla/security/manager/ssl/src/Makefile.in	15 Dec 2005 05:40:56 -0000
@@ -123,8 +123,13 @@
 
 # Use local includes because they are inserted before INCLUDES
 # so that Mozilla's nss.h is used, not glibc's
+ifdef MOZ_NATIVE_NSS
+LOCAL_INCLUDES += $(NSS_CFLAGS) \
+                  $(NULL)
+else
 LOCAL_INCLUDES += -I$(DIST)/public/nss \
                   $(NULL)
+endif
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_UNICHARUTIL_LIBS) \
Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v
retrieving revision 1.126.2.1
diff -u -r1.126.2.1 nsNSSComponent.cpp
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp	26 Aug 2005 06:41:50 -0000	1.126.2.1
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	15 Dec 2005 05:41:00 -0000
@@ -488,14 +488,6 @@
 }
 
 
-#ifdef XP_MAC
-#ifdef DEBUG
-#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbiDebug.shlb")
-#else
-#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbi.shlb")
-#endif /*DEBUG*/ 
-#endif /*XP_MAC*/
-
 static void setOCSPOptions(nsIPrefBranch * pref);
 
 NS_IMETHODIMP
@@ -689,40 +681,40 @@
 
     const char *possible_ckbi_locations[] = {
       NS_GRE_DIR,
-      NS_XPCOM_CURRENT_PROCESS_DIR
+      NS_XPCOM_CURRENT_PROCESS_DIR,
+      0
     };
-    
+
     for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
       nsCOMPtr<nsILocalFile> mozFile;
-      directoryService->Get( possible_ckbi_locations[il],
-                             NS_GET_IID(nsILocalFile), 
-                             getter_AddRefs(mozFile));
+      char *fullModuleName = nsnull;
+
+      if (!possible_ckbi_locations[il])
+      {
+        fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
+      }
+      else
+      {
+        directoryService->Get( possible_ckbi_locations[il],
+                               NS_GET_IID(nsILocalFile), 
+                               getter_AddRefs(mozFile));
     
-      if (!mozFile) {
-        continue;
+        if (!mozFile) {
+          continue;
+        }
+
+        nsCAutoString processDir;
+        mozFile->GetNativePath(processDir);
+        fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
       }
 
-      char *fullModuleName = nsnull;
-#ifdef XP_MAC
-      nsCAutoString nativePath;
-      mozFile->AppendNative(NS_LITERAL_CSTRING("Essential Files"));
-      mozFile->AppendNative(LOADABLE_CERTS_MODULE);
-      mozFile->GetNativePath(nativePath);    
-      fullModuleName = (char *) nativePath.get();
-#else
-      nsCAutoString processDir;
-      mozFile->GetNativePath(processDir);
-      fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
-#endif
       /* If a module exists with the same name, delete it. */
       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
       int modType;
       SECMOD_DeleteModule(NS_CONST_CAST(char*, modNameUTF8.get()), &modType);
       SECStatus rv_add = 
         SECMOD_AddNewModule(NS_CONST_CAST(char*, modNameUTF8.get()), fullModuleName, 0, 0);
-#ifndef XP_MAC
-      PR_Free(fullModuleName); // allocated by NSPR
-#endif
+      PR_FreeLibraryName(fullModuleName); // allocated by NSPR
       if (SECSuccess == rv_add) {
         // found a module, no need to try other directories
         break;


Index: esc
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- esc	27 Jul 2006 18:18:54 -0000	1.1
+++ esc	18 Aug 2006 15:47:05 -0000	1.2
@@ -1,5 +1,11 @@
 #!/bin/sh
-export NSPR_LOG_MODULES=tray:2,coolkey:2,netkey:2,coolKey:2
+export NSPR_LOG_MODULES=tray:2,coolKeyLib:2,coolKey:2,coolKeyNSS:2,coolKeySmart:2,coolKeyHandler:2
+
+if [ ! -d ~/.redhat/esc ]
+then
+mkdir -p ~/.redhat/esc
+fi
+
 export NSPR_LOG_FILE=~/.redhat/esc/esc.log
-cd /usr/lib/esc-1.0.0
+cd  $LIBDIR/esc-1.0.0
 ./esc


Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- esc.spec	1 Aug 2006 04:01:05 -0000	1.8
+++ esc.spec	18 Aug 2006 15:47:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -10,6 +10,11 @@
 
 Patch1: firefox-1.5.0.1-dumpstack.patch
 Patch2: xulrunner-1.8.0.1-coreconf.patch
+Patch3: firefox-1.5-with-system-nss.patch
+Patch4: firefox-1.1-nss-system-nspr.patch
+Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
+Patch6: esc-1.0.0-ui-enhance.patch
+
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -18,10 +23,9 @@
 BuildRequires: autoconf213 libX11-devel libXt-devel
 
 BuildRequires: pcsc-lite-devel coolkey-devel
-BuildRequires: desktop-file-utils zip binutils
-Requires: pcsc-lite ifd-egate coolkey
+BuildRequires: desktop-file-utils zip binutils libnotify-devel
+Requires: pcsc-lite ifd-egate coolkey nss nspr
 Requires: zip
-Requires: gtk2 libstdc++
 
 # 390 does not have coolkey or smartCards
 # Xulrunner won't compile on ppc64 right now.
@@ -58,6 +62,12 @@
 
 %setup -q -c -n %{escname}
 
+#patch esc to use system nss and nspr.
+
+%patch5 -p1 -b .fix5
+%patch6 -p1 -b .fix6
+
+
 #Unpack xulrunner where esc expects it to be.
 
 %setup -T -D -a 3 -n %{escname}/esc/dist/src
@@ -68,6 +78,9 @@
 
 %patch1 -p1 -b .fix1
 %patch2 -p1 -b .fix2
+%patch3 -p1 -b .fix3
+%patch4 -p1 -b .fix4
+
 
 
 %build
@@ -81,7 +94,7 @@
 
 cd ../..
 
-make BUILD_OPT=1 
+make BUILD_OPT=1 HAVE_LIB_NOTIFY=1
 
 %install
 
@@ -94,7 +107,8 @@
 mkdir -p $RPM_BUILD_ROOT/%{pixmapdir}
 mkdir -p $RPM_BUILD_ROOT/%{docdir}
 
-cp %{SOURCE1} $RPM_BUILD_ROOT/%{escbindir}
+sed -e 's;\$LIBDIR;'%{_libdir}';g'  %{SOURCE1} > $RPM_BUILD_ROOT/%{escbindir}/%{name}
+
 chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
 
 mkdir -p $RPM_BUILD_ROOT/%{escdir}
@@ -160,8 +174,11 @@
 fi
 
 %changelog
-* Tue Aug  1 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-4
-- Don't auto-generate requires either
+* Tue Aug  17 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-4
+- Build ESC's xulrunner component using system nss and nspr
+- Build process creates run script based on {_libdir} variable,
+  accounting for differences on 64 bit machines.
+- UI enhancements
 
 * Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-3
 - Don't provide mozilla libraries



From fedora-cvs-commits at redhat.com  Fri Aug 18 15:52:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 11:52:33 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-edid-quirks-list.patch, 1.3,
	1.4 xorg-x11-server.spec, 1.150, 1.151
Message-ID: <200608181552.k7IFqXnZ011298@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11282

Modified Files:
	xorg-x11-server-1.1.1-edid-quirks-list.patch 
	xorg-x11-server.spec 
Log Message:
* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-24.fc6
- xorg-x11-server-1.1.1-edid-quirks-list.patch: Unbreak.


xorg-x11-server-1.1.1-edid-quirks-list.patch:
 interpret_edid.c |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletion(-)

Index: xorg-x11-server-1.1.1-edid-quirks-list.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-edid-quirks-list.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-server-1.1.1-edid-quirks-list.patch	18 Aug 2006 00:52:50 -0000	1.3
+++ xorg-x11-server-1.1.1-edid-quirks-list.patch	18 Aug 2006 15:52:31 -0000	1.4
@@ -1,6 +1,6 @@
 --- xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c.edid-quirks	2006-07-05 14:31:40.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c	2006-08-17 18:25:05.000000000 -0400
-@@ -32,6 +32,38 @@
++++ xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c	2006-08-18 11:44:25.000000000 -0400
+@@ -32,6 +32,40 @@
  static void get_detailed_timing_section(Uchar*, struct 	detailed_timings *);
  static Bool validate_version(int scrnIndex, struct edid_version *);
  
@@ -23,12 +23,14 @@
 +	    for (j = 0; j < 4; j++) {
 +		if (m->det_mon[j].type == DT) {
 +		    preferred_timing = &m->det_mon[j].section.d_timings;
-+		    if (ranges->max_clock * 100 < preferred_timing->clock) {
++		    if (ranges->max_clock * 1000000 < preferred_timing->clock) {
 +			xf86Msg(X_WARNING,
-+			    "EDID preferred timing clock %dkHz exceeds "
++			    "EDID preferred timing clock %.2fMHz exceeds "
 +			    "claimed max %dMHz, fixing\n",
-+			    preferred_timing->clock * 10, ranges->max_clock);
-+			ranges->max_clock = (preferred_timing->clock+99)/100;
++			    preferred_timing->clock / 1.0e6,
++			    ranges->max_clock);
++			ranges->max_clock =
++			    (preferred_timing->clock+999999)/1000000;
 +			return;
 +		    }
 +		}
@@ -39,7 +41,7 @@
  
  xf86MonPtr
  xf86InterpretEDID(int scrnIndex, Uchar *block)
-@@ -54,7 +86,9 @@
+@@ -54,7 +88,9 @@
  			   &m->ver);
      get_dt_md_section(SECTION(DET_TIMING_SECTION,block),&m->ver, m->det_mon);
      m->no_sections = (int)*(char *)SECTION(NO_EDID,block);


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- xorg-x11-server.spec	18 Aug 2006 14:41:13 -0000	1.150
+++ xorg-x11-server.spec	18 Aug 2006 15:52:31 -0000	1.151
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   23%{?dist}
+Release:   24%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -695,6 +695,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-24.fc6
+- xorg-x11-server-1.1.1-edid-quirks-list.patch: Unbreak.
+
 * Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-23.fc6
 - xorg-x11-server-1.1.1-xkb-in-xnest.patch: Added. (#193431)
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 16:04:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 12:04:39 -0400
Subject: rpms/yum/devel yum-globs.patch,NONE,1.1 yum.spec,1.115,1.116
Message-ID: <200608181604.k7IG4dOl011847@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11791

Modified Files:
	yum.spec 
Added Files:
	yum-globs.patch 
Log Message:
Add patch to fix pattern matching, rebuild.


yum-globs.patch:
 __init__.py |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE yum-globs.patch ---
diff -ruN yum-2.9.4/yum/__init__.py yum-2.9.4.new/yum/__init__.py
--- yum-2.9.4/yum/__init__.py	2006-08-09 00:14:44.000000000 -0400
+++ yum-2.9.4.new/yum/__init__.py	2006-08-17 14:44:53.000000000 -0400
@@ -42,6 +42,7 @@
 import transactioninfo
 import urlgrabber
 from urlgrabber.grabber import URLGrabError
+from packageSack import ListPackageSack
 import depsolve
 import plugins
 import logginglevels
@@ -1759,7 +1760,15 @@
                      ver=nevra_dict['version'], rel=nevra_dict['release'])
                 
             if pkgs:
-                pkgs = self.bestPackagesFromList(pkgs)
+                pkgSack = ListPackageSack(pkgs)
+                pkgs = pkgSack.returnNewestByName()
+                del(pkgSack)
+
+                lst = []
+                for pkg in pkgs:
+                    lst.extend(self.bestPackagesFromList(pkg))
+
+                pkgs = lst
 
         if len(pkgs) == 0:
             #FIXME - this is where we could check to see if it already installed


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- yum.spec	18 Aug 2006 12:33:09 -0000	1.115
+++ yum.spec	18 Aug 2006 16:04:37 -0000	1.116
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 2.9.4
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.9/yum-%{version}.tar.gz
@@ -14,6 +14,8 @@
 # default plugins here
 Source100: installonlyn.py
 
+Patch0: yum-globs.patch
+
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
 BuildRequires: python
@@ -46,6 +48,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -114,6 +117,9 @@
 
 
 %changelog
+* Fri Aug 18 2006 Chris Lumens <clumens at redhat.com> 2.9.4-4
+- Add patch to fix pattern matching (#202974).
+
 * Fri Aug 18 2006 Karsten Hopp <karsten at redhat.com> - 2.9.4-3
 - revert last change
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 16:07:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 12:07:06 -0400
Subject: rpms/classpathx-jaf/devel classpathx-jaf.spec,1.20,1.21
Message-ID: <200608181607.k7IG76O7011993@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/classpathx-jaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11974

Modified Files:
	classpathx-jaf.spec 
Log Message:
- Resync with latest from JPP.




Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- classpathx-jaf.spec	11 Aug 2006 20:29:27 -0000	1.20
+++ classpathx-jaf.spec	18 Aug 2006 16:07:01 -0000	1.21
@@ -37,7 +37,7 @@
 
 Name:           classpathx-jaf
 Version:        1.0
-Release:        8jpp.1
+Release:        9jpp.1
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 
@@ -139,6 +139,14 @@
 fi
 %endif
 
+%if %{gcj_support}
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %preun
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove jaf %{_javadir}/%{name}.jar
@@ -173,6 +181,9 @@
 
 
 %changelog
+* Fri Aug 18 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0-9jpp.1
+- Resync with latest from JPP.
+
 * Fri Aug 11 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0-8jpp.1
 - Replace explicit Requires(post) on coreutils with 
   Requires-post/postun on rm and ln since more portable with JPP.



From fedora-cvs-commits at redhat.com  Fri Aug 18 16:11:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 12:11:52 -0400
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.53,1.54
Message-ID: <200608181611.k7IGBqTb021408@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/xalan-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12175

Modified Files:
	xalan-j2.spec 
Log Message:
- Resync with latest from JPP.




Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xalan-j2.spec	11 Aug 2006 15:34:38 -0000	1.53
+++ xalan-j2.spec	18 Aug 2006 16:11:49 -0000	1.54
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        5jpp.3
+Release:        6jpp.1
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -234,6 +234,14 @@
 fi
 %endif
 
+%if %{gcj_support}
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %preun
 {
   [ $1 = 0 ] || exit 0
@@ -334,6 +342,9 @@
 %endif
 
 %changelog
+* Fri Aug 18 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-6jpp.1
+- Resync with latest from JPP.
+
 * Fri Aug 11 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-5jpp.3
 - Rebuild.
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 16:25:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 12:25:52 -0400
Subject: rpms/kdeadmin/devel kdeadmin-3.5.4-knetworkconf-fc-6.patch, NONE,
	1.1 kdeadmin.spec, 1.65, 1.66
Message-ID: <200608181625.k7IGPqeV008891@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8802

Modified Files:
	kdeadmin.spec 
Added Files:
	kdeadmin-3.5.4-knetworkconf-fc-6.patch 
Log Message:
add FC6 support in knetworkconf


kdeadmin-3.5.4-knetworkconf-fc-6.patch:
 network-conf.in |    2 +-
 network.pl.in   |    7 +++++++
 platform.pl.in  |    1 +
 service.pl.in   |    5 ++++-
 4 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE kdeadmin-3.5.4-knetworkconf-fc-6.patch ---
--- kdeadmin-3.5.4/knetworkconf/backends/service.pl.in.orig	2006-08-18 18:12:31.000000000 +0200
+++ kdeadmin-3.5.4/knetworkconf/backends/service.pl.in	2006-08-18 18:13:57.000000000 +0200
@@ -100,6 +100,7 @@
        "fedora-3"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "fedora-4"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "fedora-5"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+       "fedora-6"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "rpath"        => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
 
        "vine-3.0"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
@@ -171,6 +172,7 @@
        "fedora-3"       => [3, 5],
        "fedora-4"       => [3, 5],
        "fedora-5"       => [3, 5],
+       "fedora-6"       => [3, 5],
        "rpath"          => [3, 5],
        
        "vine-3.0"       => [3, 5],
@@ -239,6 +241,7 @@
      "fedora-3"       => "redhat-5.2",
      "fedora-4"       => "redhat-5.2",
      "fedora-5"       => "redhat-5.2",
+     "fedora-6"       => "redhat-5.2",
      "rpath"          => "redhat-5.2",
 
      "vine-3.0"       => "redhat-5.2",
@@ -1717,7 +1720,7 @@
        "fedora-3"     => \&gst_service_redhat_get_status,
        "fedora-4"     => \&gst_service_redhat_get_status,
        "fedora-5"     => \&gst_service_redhat_get_status,
-
+       "fedora-6"     => \&gst_service_redhat_get_status,
        "rpath"        => \&gst_service_redhat_get_status,
 
        "suse-9.0"     => \&gst_service_suse_get_status,
--- kdeadmin-3.5.4/knetworkconf/backends/network.pl.in.orig	2006-08-18 18:06:20.000000000 +0200
+++ kdeadmin-3.5.4/knetworkconf/backends/network.pl.in	2006-08-18 18:08:52.000000000 +0200
@@ -524,6 +524,7 @@
        "fedora-3"     => "redhat-6.2",
        "fedora-4"     => "redhat-6.2",
        "fedora-5"     => "redhat-6.2",
+       "fedora-6"     => "redhat-6.2",
        "rpath"        => "redhat-6.2",
        "vine-3.0"     => "redhat-6.2",
        "vine-3.1"     => "redhat-6.2",
@@ -1829,6 +1830,7 @@
           "fedora-3"     => \&gst_network_rh72_get_file,
           "fedora-4"     => \&gst_network_rh72_get_file,
           "fedora-5"     => \&gst_network_rh72_get_file,
+          "fedora-6"     => \&gst_network_rh72_get_file,
           "rpath"        => \&gst_network_rh72_get_file,
           "vine-3.0"     => \&gst_network_rh62_get_file,
           "vine-3.1"     => \&gst_network_rh62_get_file,
@@ -3950,6 +3952,7 @@
           "fedora-3"     => "",
           "fedora-4"     => "",
           "fedora-5"     => "",
+          "fedora-6"     => "",
           "rpath"        => "",
           "vine-3.0"     => "lo",
           "vine-3.1"     => "lo",
@@ -4116,6 +4119,7 @@
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
           "fedora-5"     => "redhat-7.2",
+          "fedora-6"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
@@ -4538,6 +4542,7 @@
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
           "fedora-5"     => "redhat-7.2",
+          "fedora-6"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
@@ -5377,6 +5382,7 @@
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
           "fedora-5"     => "redhat-7.2",
+          "fedora-6"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
@@ -5784,6 +5790,7 @@
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
           "fedora-5"     => "redhat-7.2",
+          "fedora-6"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
--- kdeadmin-3.5.4/knetworkconf/backends/platform.pl.in.orig	2006-08-18 18:08:56.000000000 +0200
+++ kdeadmin-3.5.4/knetworkconf/backends/platform.pl.in	2006-08-18 18:12:20.000000000 +0200
@@ -97,6 +97,7 @@
   "fedora-3"        => "Fedora Core 3 (Heidelberg)",
   "fedora-4"        => "Fedora Core 4 (Stentz)",
   "fedora-5"        => "Fedora Core 5 (Bordeaux)",
+  "fedora-6"        => "Fedora Core 6",
   "rpath"           => "rPath Linux",
   "ark"             => "Ark Linux",
 };
--- kdeadmin-3.5.4/knetworkconf/backends/network-conf.in.orig	2006-08-18 18:14:00.000000000 +0200
+++ kdeadmin-3.5.4/knetworkconf/backends/network-conf.in	2006-08-18 18:14:28.000000000 +0200
@@ -71,7 +71,7 @@
               "debian-2.2", "debian-3.0", "debian-sarge",
               "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06",
               "suse-7.0", "suse-9.0", "suse-9.1",
-              "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
+              "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "fedora-6", "rpath",
               "pld-1.0", "pld-1.1", "pld-1.99",
               "conectiva-9", "conectiva-10",
               "vine-3.0", "vine-3.1",


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- kdeadmin.spec	10 Aug 2006 10:21:46 -0000	1.65
+++ kdeadmin.spec	18 Aug 2006 16:25:46 -0000	1.66
@@ -24,7 +24,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -39,6 +39,8 @@
 Source4: kpackage.pamd
 Source5: kpackagerc
 
+Patch0: kdeadmin-3.5.4-knetworkconf-fc-6.patch
+
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
@@ -67,6 +69,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .fc6
 
 %if ! %{kpackage}
   echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
@@ -315,6 +318,9 @@
 %endif
 
 %changelog
+* Fri Aug 18 2006 Than Ngo <than at redhat.com> 7:3.5.4-2
+- add FC6 support in knetworkconf
+
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 7:3.5.4-1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 16:37:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 12:37:53 -0400
Subject: rpms/freetype/devel freetype.spec,1.40,1.41
Message-ID: <200608181637.k7IGbrAR012060@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12027

Modified Files:
	freetype.spec 
Log Message:
* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-6
- pass --disable-static to %configure. (#172628)


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- freetype.spec	17 Aug 2006 22:39:20 -0000	1.40
+++ freetype.spec	18 Aug 2006 16:37:50 -0000	1.41
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -86,7 +86,7 @@
 
 # Build Freetype 2
 {
-  %configure
+  %configure --disable-static
   make %{?_smp_mflags}
 }
 
@@ -193,6 +193,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-6
+- pass --disable-static to %%configure. (#172628)
+
 * Thu Aug 17 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-5
 - don't package static libs
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 17:00:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 13:00:48 -0400
Subject: rpms/kexec-tools/devel kdump.conf, 1.1, 1.2 kexec-tools.spec, 1.53,
	1.54 mkdumprd, 1.2, 1.3
Message-ID: <200608181700.k7IH0mv1000714@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv677

Modified Files:
	kdump.conf kexec-tools.spec mkdumprd 
Log Message:
fixing several typo bugs


Index: kdump.conf
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdump.conf	20 Jul 2006 03:36:18 -0000	1.1
+++ kdump.conf	18 Aug 2006 17:00:45 -0000	1.2
@@ -8,10 +8,10 @@
 #
 # Basics commands supported are:
 # raw <partition> - will dd /proc/vmcore into <partition>
-# net <nfs mount> - will mount fs and copy /proc/vmcore to 
+# <nfs mount>     - will mount fs and copy /proc/vmcore to 
 #			<mnt>/var/crash/%DATE/ , supports DNS
-# net <ssh user at location> - will scp /proc/vmcore to 
-#				<user at location>:/var/crash/%DATE/, supports DNS
+# <user at location> - will scp /proc/vmcore to 
+#			<user at location>:/var/crash/%DATE/, supports DNS
 # <fs type> - will mount -t <fs type> /mnt and copy /proc/vmcore to 
 #			/mnt/var/crash/%DATE/
 # default reboot - if all of the above fail, then reboot the system 
@@ -21,4 +21,6 @@
 
 #raw /dev/sda5
 #ext3 /dev/sda3
+#my.server.com:/export/tmp
+#user at my.server.com
 #default reboot


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kexec-tools.spec	15 Aug 2006 15:16:07 -0000	1.53
+++ kexec-tools.spec	18 Aug 2006 17:00:45 -0000	1.54
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 44%{dist}
+Release: 45%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -143,6 +143,11 @@
 %doc TODO
 
 %changelog
+* Fri Aug 18 2006 Neil Horman <nhorman at redhat.com> - 1.101-45%{dist}
+- fixed typo in mkdumprd for bz 202983
+- fixed typo in mkdumprd for bz 203053
+- clarified docs in kdump.conf with examples per bz 203015
+
 * Tue Aug 15 2006 Neil Horman <nhorman at redhat.com> - 1.101-44%{dist}
 - updated init script to implement status function/scrub err messages
  


Index: mkdumprd
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mkdumprd	20 Jul 2006 03:36:18 -0000	1.2
+++ mkdumprd	18 Aug 2006 17:00:45 -0000	1.3
@@ -833,7 +833,7 @@
             #find ethernet device used to route to remote host, ie eth0
             netdev=`/sbin/ip route get to $rhost 2>&1`
             [ $? != 0 ] && echo "Bad kdump location: $location" && continue
-            netdev=`echo $netdev|awk '{print $3;}'|head -n 1`
+            netdev=`echo $netdev|awk '{print $5;}'|head -n 1`
            
             #add the ethernet device to the list of modules 
             handlenetdev $netdev
@@ -1080,8 +1080,8 @@
                         tmnt=`mktemp -dq`
                         kdump_chk "mount -t nfs -o nolock $rlocation $tmnt" \
                                    "Bad NFS mount $location"
-                        mkdir -p /mnt/var/crash
-                        tdir=`mktemp -dqp /mnt/var/crash`
+                        mkdir -p $tmnt/var/crash
+                        tdir=`mktemp -dqp $tmnt/var/crash`
 
                         rc=$? && rm -rf $tdir && umount $tmnt && rm -rf $tmnt
                         if [ $rc != "0" ]; then 



From fedora-cvs-commits at redhat.com  Fri Aug 18 17:34:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 13:34:26 -0400
Subject: rpms/gnome-applets/devel gnome-applets-2.15.3-invest-gconf.patch,
	NONE, 1.1 gnome-applets.spec, 1.164, 1.165
Message-ID: <200608181734.k7IHYQXI025211@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25165

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.15.3-invest-gconf.patch 
Log Message:
fix invest applet


gnome-applets-2.15.3-invest-gconf.patch:
 applet.py |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gnome-applets-2.15.3-invest-gconf.patch ---
--- gnome-applets-2.15.3/invest-applet/invest/applet.py.invest-gconf	2006-08-18 13:18:47.000000000 -0400
+++ gnome-applets-2.15.3/invest-applet/invest/applet.py	2006-08-18 13:19:24.000000000 -0400
@@ -12,6 +12,7 @@
 	def __init__(self, applet):
 		# Default values
 		self.GCONF_APPLET_DIR = invest.GCONF_DIR
+		self.GCONF_CLIENT = invest.GCONF_CLIENT
 		
 		# Retreive this applet's pref folder
 		path = applet.get_preferences_key()


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gnome-applets.spec	13 Aug 2006 04:41:14 -0000	1.164
+++ gnome-applets.spec	18 Aug 2006 17:34:24 -0000	1.165
@@ -30,7 +30,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.3
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -44,6 +44,8 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 Patch13:        gnome-applets-2.15.1.1-destroy-on-close.patch
+# 
+Patch14: 	gnome-applets-2.15.3-invest-gconf.patch
 
 URL:		http://www.gnome.org/
 
@@ -122,6 +124,7 @@
 %patch10 -p1 -b .invest
 %patch11 -p1 -b .dont-require-display
 %patch13 -p1 -b .destroy-on-close
+%patch14 -p1 -b .invest-gconf
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -255,6 +258,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Fri Aug 18 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.3-2.fc6
+- Make the invest applet work
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.3-1.fc6
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 17:37:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 13:37:00 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.165,1.166
Message-ID: <200608181737.k7IHb0s3025789@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25742

Modified Files:
	gnome-applets.spec 
Log Message:
add bug ref



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gnome-applets.spec	18 Aug 2006 17:34:24 -0000	1.165
+++ gnome-applets.spec	18 Aug 2006 17:36:57 -0000	1.166
@@ -44,7 +44,7 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 Patch13:        gnome-applets-2.15.1.1-destroy-on-close.patch
-# 
+# http://bugzilla.gnome.org/show_bug.cgi?id=351956 
 Patch14: 	gnome-applets-2.15.3-invest-gconf.patch
 
 URL:		http://www.gnome.org/



From fedora-cvs-commits at redhat.com  Fri Aug 18 17:52:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 13:52:23 -0400
Subject: rpms/libXp/devel proto-check.patch,NONE,1.1 libXp.spec,1.16,1.17
Message-ID: <200608181752.k7IHqN5g013687@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13614

Modified Files:
	libXp.spec 
Added Files:
	proto-check.patch 
Log Message:
* Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
- Add patch to not check for printproto.pc. (Since it's part of this
  package now, it isn't installed at the time libXp is configured).



proto-check.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE proto-check.patch ---
--- libXp-1.0.0/configure.ac.proto-check	2006-08-18 13:41:35.000000000 -0400
+++ libXp-1.0.0/configure.ac	2006-08-18 13:41:49.000000000 -0400
@@ -36,7 +36,7 @@
 AC_PROG_LIBTOOL
 
 # Check for X and print proto
-PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto)
+PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau)
 
 AC_SUBST(XPRINT_CFLAGS)
 AC_SUBST(XPRINT_LIBS)


Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXp.spec	18 Aug 2006 03:36:42 -0000	1.16
+++ libXp.spec	18 Aug 2006 17:52:20 -0000	1.17
@@ -12,7 +12,7 @@
 Summary: X.Org X11 libXp runtime library
 Name: libXp
 Version: 1.0.0
-Release: 5
+Release: 6
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -30,6 +30,8 @@
 
 Obsoletes: XFree86-libs, xorg-x11-libs, xorg-x11-deprecated-libs
 
+Patch1: proto-check.patch
+
 %description
 X.Org X11 libXp runtime library
 
@@ -52,6 +54,8 @@
 %prep
 %setup -q -b0 -b1
 
+%patch1 -p1 -b .proto-check
+
 # Disable static library creation by default.
 %define with_static 0
 
@@ -69,6 +73,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+pushd ../printproto-1.0.3
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %if %{without_devel}
@@ -80,10 +88,6 @@
 }
 %endif
 
-pushd ../printproto-1.0.3
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
 # Don't encourage people to use the deprecated Xprint APIs.
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 
@@ -121,6 +125,10 @@
 %endif
 
 %changelog
+* Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
+- Add patch to not check for printproto.pc. (Since it's part of this
+  package now, it isn't installed at the time libXp is configured).
+
 * Thu Aug 17 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-5
 - Moved Print.h, Printstr.h and printproto.pc into the devel package here
   (they used to be in xorg-x11-proto-devel). 



From fedora-cvs-commits at redhat.com  Fri Aug 18 17:59:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 13:59:04 -0400
Subject: rpms/gcalctool/devel .cvsignore, 1.9, 1.10 gcalctool.spec, 1.21,
	1.22 sources, 1.10, 1.11
Message-ID: <200608181759.k7IHx4Vi016210@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16050

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.8.23



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Aug 2006 06:43:50 -0000	1.9
+++ .cvsignore	18 Aug 2006 17:59:02 -0000	1.10
@@ -1 +1 @@
-gcalctool-5.8.20.tar.bz2
+gcalctool-5.8.23.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gcalctool.spec	12 Aug 2006 06:43:50 -0000	1.21
+++ gcalctool.spec	18 Aug 2006 17:59:02 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.8.20
+Version:        5.8.23
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Sat Aug 18 2006 Matthias Clasen <mclasen at redhat.com> - 5.8.23-1.fc6
+- Update to 5.8.23
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 5.8.20-1.fc6
 - Update to 5.8.20
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Aug 2006 06:43:50 -0000	1.10
+++ sources	18 Aug 2006 17:59:02 -0000	1.11
@@ -1 +1 @@
-c6324ba4d3a50f9605229c0ba601e6b3  gcalctool-5.8.20.tar.bz2
+e3bb9eaf860454b47588a096b4215734  gcalctool-5.8.23.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 18 18:18:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 14:18:59 -0400
Subject: rpms/libXp/devel libXp.spec,1.17,1.18
Message-ID: <200608181818.k7IIIxFa003676@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3625

Modified Files:
	libXp.spec 
Log Message:
* Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
- Run autoreconf to make sure changes to configure.ac take effect




Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libXp.spec	18 Aug 2006 17:52:20 -0000	1.17
+++ libXp.spec	18 Aug 2006 18:18:57 -0000	1.18
@@ -60,6 +60,15 @@
 %define with_static 0
 
 %build
+
+# There is a patch that changes configure.ac, so we have
+# run autoreconf
+
+CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
+export CPPFLAGS
+
+autoreconf
+
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -126,6 +135,9 @@
 
 %changelog
 * Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
+- Run autoreconf to make sure changes to configure.ac take effect
+
+* Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
 - Add patch to not check for printproto.pc. (Since it's part of this
   package now, it isn't installed at the time libXp is configured).
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 18:21:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 14:21:50 -0400
Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.12,
	1.13
Message-ID: <200608181821.k7IILoBX004658@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4603

Modified Files:
	jakarta-commons-daemon.spec 
Log Message:

- Added missing requirements
- Fixed bug that cause post/postun to not run when built with --with native




Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jakarta-commons-daemon.spec	10 Aug 2006 10:37:56 -0000	1.12
+++ jakarta-commons-daemon.spec	18 Aug 2006 18:21:47 -0000	1.13
@@ -40,7 +40,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0.1
-Release:        4jpp_3fc
+Release:        6jpp.1
 Epoch:          1
 Summary:        Jakarta Commons Daemon Package
 License:        Apache Software License 2.0
@@ -93,7 +93,8 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):		coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -132,10 +133,11 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 %endif
 
-
+%if ! %{native}
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -145,8 +147,12 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ $1 -eq 0 ]; then
+  %{__rm} -f %{_javadocdir}/%{name}
+fi
 
-%if %{native}
+%if ! %{native}
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -162,7 +168,9 @@
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
+%endif
 
+%if %{native}
 %files jsvc
 %defattr(-,root,root,-)
 %doc LICENSE*
@@ -176,7 +184,7 @@
 %{_javadir}/*
 
 %if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-daemon-1.0.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %files javadoc
@@ -187,12 +195,13 @@
 %endif
 
 %changelog
+* Thu Aug 17 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0.1-6jpp.1
+- Added missing requirements
+- Fixed bug that cause post/postun to not run when built with --with native
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.0.1-4jpp_3fc
 - Requires(post):     coreutils
 
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:1.0.1-4jpp_2fc
-- Rebuilt
-
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0.1-4jpp_1fc
 - Remove name/release/version defines as applicable.
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 18:32:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 14:32:19 -0400
Subject: rpms/gtkhtml3/devel gtkhtml-3.11.91-fix-undefined-symbol.patch, NONE,
	1.1 gtkhtml3.spec, 1.68, 1.69
Message-ID: <200608181832.k7IIWIIl007983@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7910

Modified Files:
	gtkhtml3.spec 
Added Files:
	gtkhtml-3.11.91-fix-undefined-symbol.patch 
Log Message:

* Fri Aug 18 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.91-2.fc6
- Add patch for RH bug #202409.


gtkhtml-3.11.91-fix-undefined-symbol.patch:
 image.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gtkhtml-3.11.91-fix-undefined-symbol.patch ---
--- gtkhtml-3.11.91/components/html-editor/image.c.fix-undefined-symbol	2006-08-18 14:11:16.000000000 -0400
+++ gtkhtml-3.11.91/components/html-editor/image.c	2006-08-18 14:11:42.000000000 -0400
@@ -393,7 +393,7 @@
 			    "selection-changed", G_CALLBACK (pentry_changed), d);
 
 	gtk_widget_show_all (d->page);
-	gtk_file_chooser_set_preview_active (GTK_FILE_CHOOSER (d->pentry), FALSE);
+	gtk_file_chooser_set_preview_widget_active (GTK_FILE_CHOOSER (d->pentry), FALSE);
 
 	editor_check_stock ();
 	button = gtk_button_new_from_stock (GTKHTML_STOCK_TEST_URL);


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gtkhtml3.spec	7 Aug 2006 20:47:49 -0000	1.68
+++ gtkhtml3.spec	18 Aug 2006 18:32:14 -0000	1.69
@@ -6,7 +6,7 @@
 
 Name: gtkhtml3
 Version: 3.11.91
-Release: 1
+Release: 2%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
 Summary: gtkhtml library
@@ -23,6 +23,9 @@
 Patch3: gtkhtml-fix-indic-navigation-129212.patch
 Patch4: gtkhtml-3.10.0-im-too-late.patch
 
+# RH bug #202409
+Patch5: gtkhtml-3.11.91-fix-undefined-symbol.patch
+
 ### Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -62,6 +65,7 @@
 %patch1 -p1 -b .crash
 %patch3 -p1 -b .fix-129212
 %patch4 -p1 -b .im-too-late
+%patch5 -p1 -b .fix-undefined-symbol
 
 %build
 %configure
@@ -108,6 +112,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Aug 18 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.91-2.fc6
+- Add patch for RH bug #202409.
+
 * Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.91-1
 - Update to 3.11.91
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 18:44:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 14:44:51 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.23,
	1.24
Message-ID: <200608181844.k7IIipa7010725@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10675

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:

- Added missing postun section.




Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jakarta-commons-dbcp.spec	10 Aug 2006 18:36:27 -0000	1.23
+++ jakarta-commons-dbcp.spec	18 Aug 2006 18:44:48 -0000	1.24
@@ -45,7 +45,7 @@
 
 Name:		jakarta-commons-dbcp
 Version:	1.2.1
-Release:	6jpp.1
+Release:	7jpp.1
 Epoch:		0
 Summary:	Jakarta Commons DataBase Pooling Package
 License:	Apache Software License 2.0
@@ -249,6 +249,14 @@
 fi
 %endif
 
+%if %{gcj_support}
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %preun
 {
   [ $1 -eq 0 ] || exit 0
@@ -286,6 +294,9 @@
 %endif
 
 %changelog
+* Thu Aug 17 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-7jpp.1
+- Added missing postun section.
+
 * Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-6jpp.1
 - Added missing requirements.
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 19:11:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 15:11:57 -0400
Subject: rpms/evolution-sharp/devel evolution-sharp-0.11.1-libdir.patch, NONE,
	1.1
Message-ID: <200608181911.k7IJBvdo016027@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/evolution-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15963

Added Files:
	evolution-sharp-0.11.1-libdir.patch 
Log Message:
Add missing patch


evolution-sharp-0.11.1-libdir.patch:
 evolution-sharp.pc.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE evolution-sharp-0.11.1-libdir.patch ---
--- evolution-sharp-0.11.1/evolution-sharp.pc.in.libdir	2006-08-18 16:10:58.000000000 +0200
+++ evolution-sharp-0.11.1/evolution-sharp.pc.in	2006-08-18 16:11:12.000000000 +0200
@@ -1,5 +1,5 @@
 prefix=@prefix@
-libdir=${prefix}/lib
+libdir=@libdir@
 
 evolibdir=@EVO_SHELL_LIBDIR@
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 19:52:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 15:52:21 -0400
Subject: rpms/mesa/devel mesa-6.5.1-build-config.patch, NONE,
	1.1 mesa-6.5.1-selinux-awareness.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch, 1.2,
	1.3 mesa.spec, 1.83, 1.84 redhat-mesa-driver-install, 1.7,
	1.8 sources, 1.7, 1.8 mesa-6.3.2-fix-installmesa.patch, 1.3,
	NONE mesa-6.4.1-libGLw-enable-motif-support.patch, 1.1,
	NONE mesa-6.5-build-config.patch, 1.1,
	NONE mesa-6.5-fix-glxinfo-link.patch, 1.2,
	NONE mesa-6.5-fix-linux-indirect-build.patch, 1.1,
	NONE mesa-6.5-fix-opt-flags-bug197640.patch, 1.1,
	NONE mesa-6.5-fix-pbuffer-dispatch.patch, 1.1,
	NONE mesa-6.5-force-r300.patch, 1.1,
	NONE mesa-6.5-glx-use-tls.patch, 1.1,
	NONE mesa-6.5-noexecstack.patch, 1.1,
	NONE mesa-6.5-r300-free-gart-mem.patch, 1.1,
	NONE mesa-6.5-selinux-awareness.patch, 1.1, NONE
Message-ID: <200608181952.k7IJqLmV026956@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26922/devel

Modified Files:
	.cvsignore mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch 
	mesa.spec redhat-mesa-driver-install sources 
Added Files:
	mesa-6.5.1-build-config.patch 
	mesa-6.5.1-selinux-awareness.patch 
Removed Files:
	mesa-6.3.2-fix-installmesa.patch 
	mesa-6.4.1-libGLw-enable-motif-support.patch 
	mesa-6.5-build-config.patch mesa-6.5-fix-glxinfo-link.patch 
	mesa-6.5-fix-linux-indirect-build.patch 
	mesa-6.5-fix-opt-flags-bug197640.patch 
	mesa-6.5-fix-pbuffer-dispatch.patch mesa-6.5-force-r300.patch 
	mesa-6.5-glx-use-tls.patch mesa-6.5-noexecstack.patch 
	mesa-6.5-r300-free-gart-mem.patch 
	mesa-6.5-selinux-awareness.patch 
Log Message:
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm

mesa-6.5.1-build-config.patch:
 default        |    8 ++++----
 linux          |    4 +++-
 linux-dri      |    9 ++++-----
 linux-dri-ppc  |    2 +-
 linux-dri-x86  |    2 +-
 linux-osmesa   |    4 ++--
 linux-osmesa16 |    2 +-
 linux-osmesa32 |    2 +-
 8 files changed, 17 insertions(+), 16 deletions(-)

--- NEW FILE mesa-6.5.1-build-config.patch ---
--- mesa-cvs/configs/linux-dri-ppc.build-config	2005-08-19 16:20:03.000000000 -0400
+++ mesa-cvs/configs/linux-dri-ppc	2006-08-14 13:44:40.000000000 -0400
@@ -5,7 +5,7 @@
 
 CONFIG_NAME = linux-dri-ppc
 
-OPT_FLAGS = -Os -mcpu=603
+OPT_FLAGS ?= -Os -mcpu=603
 PIC_FLAGS = -fPIC
 
 ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
--- mesa-cvs/configs/linux-dri-x86.build-config	2005-09-12 11:19:19.000000000 -0400
+++ mesa-cvs/configs/linux-dri-x86	2006-08-14 13:44:40.000000000 -0400
@@ -6,7 +6,7 @@
 CONFIG_NAME = linux-dri-x86
 
 # Unnecessary on x86, generally.
-PIC_FLAGS = 
+# PIC_FLAGS = 
 
 # Add -m32 to CFLAGS:
 ARCH_FLAGS = -m32
--- mesa-cvs/configs/linux-osmesa16.build-config	2006-07-12 22:50:27.000000000 -0400
+++ mesa-cvs/configs/linux-osmesa16	2006-08-14 13:44:40.000000000 -0400
@@ -17,7 +17,7 @@
 
 
 # Directories
-SRC_DIRS = mesa glu
+SRC_DIRS = mesa
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 
--- mesa-cvs/configs/linux.build-config	2005-10-28 09:11:00.000000000 -0400
+++ mesa-cvs/configs/linux	2006-08-14 13:44:40.000000000 -0400
@@ -8,7 +8,9 @@
 CC = gcc
 CXX = g++
 
-OPT_FLAGS  = -O3 -g
+MKDEP = true
+
+OPT_FLAGS ?= -O3 -g
 PIC_FLAGS  = -fPIC
 
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.  Add -m32
--- mesa-cvs/configs/linux-dri.build-config	2006-08-09 15:14:05.000000000 -0400
+++ mesa-cvs/configs/linux-dri	2006-08-14 13:44:40.000000000 -0400
@@ -12,8 +12,9 @@
 #MKDEP = /usr/X11R6/bin/makedepend
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
+MKDEP = true
 
-OPT_FLAGS  = -O -g
+OPT_FLAGS ?= -O -g
 PIC_FLAGS  = -fPIC
 
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
@@ -24,8 +25,6 @@
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
 
-X11_INCLUDES = -I/usr/X11R6/include
-
 CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
 
@@ -35,7 +34,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 +63,4 @@
 # gamma are missing because they have not been converted to use the new
 # interface.
 DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
-	savage sis tdfx trident unichrome ffb
+	savage tdfx trident unichrome ffb # sis
--- mesa-cvs/configs/linux-osmesa32.build-config	2006-07-12 22:50:27.000000000 -0400
+++ mesa-cvs/configs/linux-osmesa32	2006-08-14 13:44:40.000000000 -0400
@@ -17,7 +17,7 @@
 
 
 # Directories
-SRC_DIRS = mesa glu
+SRC_DIRS = mesa
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 
--- mesa-cvs/configs/default.build-config	2006-07-20 00:34:36.000000000 -0400
+++ mesa-cvs/configs/default	2006-08-14 13:46:03.000000000 -0400
@@ -55,11 +55,11 @@
 
 # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
 # order to build the Motif widget too)
-GLW_SOURCES = GLwDrawA.c
+GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 
 
 # Directories to build
-LIB_DIR = lib
+LIB_DIR ?= lib
 SRC_DIRS = mesa glu glut/glx glw
 GLU_DIRS = sgi
 DRIVER_DIRS = x11 osmesa
@@ -73,14 +73,14 @@
 OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm $(EXTRA_LIB_PATH) -lXt -lX11
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
 
 
 
 # Installation directories (for make install)
 INSTALL_DIR = /usr/local
-DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
+DRI_DRIVER_INSTALL_DIR = $(DRI_DRIVER_DIR)
 
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
--- mesa-cvs/configs/linux-osmesa.build-config	2006-07-12 22:50:27.000000000 -0400
+++ mesa-cvs/configs/linux-osmesa	2006-08-14 13:44:40.000000000 -0400
@@ -14,9 +14,9 @@
 
 
 # Directories
-SRC_DIRS = mesa glu
+SRC_DIRS = mesa
 DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
+PROGRAM_DIRS =
 
 
 # Dependencies

mesa-6.5.1-selinux-awareness.patch:
 configs/linux-dri                            |    3 ++-
 src/mesa/drivers/dri/r200/r200_context.c     |    8 ++++++--
 src/mesa/drivers/dri/radeon/radeon_context.c |    8 ++++++--
 src/mesa/main/execmem.c                      |   17 ++++++++++++++---
 src/mesa/shader/slang/slang_execute_x86.c    |    3 ++-
 src/mesa/tnl/t_vb_arbprogram_sse.c           |    3 ++-
 src/mesa/tnl/t_vertex_sse.c                  |    8 ++++++--
 src/mesa/x86/rtasm/x86sse.c                  |    8 +++++---
 src/mesa/x86/rtasm/x86sse.h                  |    4 ++--
 9 files changed, 45 insertions(+), 17 deletions(-)

--- NEW FILE mesa-6.5.1-selinux-awareness.patch ---
--- mesa-cvs/configs/linux-dri.selinux-awareness	2006-08-10 16:39:55.000000000 -0400
+++ mesa-cvs/configs/linux-dri	2006-08-10 16:39:55.000000000 -0400
@@ -38,7 +38,8 @@
 
 LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
+DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) \
+		-lselinux
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
                 $(LIBDRM_LIB)
 
--- mesa-cvs/src/mesa/main/execmem.c.selinux-awareness	2006-05-10 05:00:16.000000000 -0400
+++ mesa-cvs/src/mesa/main/execmem.c	2006-08-10 16:39:55.000000000 -0400
@@ -36,7 +36,7 @@
 
 
 
-#if defined(__linux__) && !defined(XFree86Server)
+#if defined(__linux__)
 
 /*
  * Allocate a large block of memory which can hold code then dole it out
@@ -46,6 +46,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include "mm.h"
+#include <selinux/selinux.h>
 
 #define EXEC_HEAP_SIZE (10*1024*1024)
 
@@ -55,9 +56,16 @@
 static unsigned char *exec_mem = NULL;
 
 
-static void
+static int
 init_heap(void)
 {
+
+   if (is_selinux_enabled()) {
+      if (!security_get_boolean_active("allow_execmem") ||
+	  !security_get_boolean_pending("allow_execmem"))
+	 return 0;
+   }
+
    if (!exec_heap)
       exec_heap = mmInit( 0, EXEC_HEAP_SIZE );
    
@@ -65,6 +73,8 @@
       exec_mem = (unsigned char *) mmap(0, EXEC_HEAP_SIZE, 
 					PROT_EXEC | PROT_READ | PROT_WRITE, 
 					MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+   return (exec_mem != NULL);
 }
 
 
@@ -76,7 +86,8 @@
 
    _glthread_LOCK_MUTEX(exec_mutex);
 
-   init_heap();
+   if (!init_heap())
+       return NULL;
 
    if (exec_heap) {
       size = (size + 31) & ~31;
--- mesa-cvs/src/mesa/drivers/dri/r200/r200_context.c.selinux-awareness	2006-06-09 20:51:54.000000000 -0400
+++ mesa-cvs/src/mesa/drivers/dri/r200/r200_context.c	2006-08-10 16:39:55.000000000 -0400
@@ -546,8 +546,12 @@
    }
 
    if (rmesa->r200Screen->chip_flags & RADEON_CHIPSET_TCL) {
-      if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
-	 r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+      void *test = NULL;
+      if ((test = _mesa_exec_malloc(64)))
+         if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+	    r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+      if (test)
+         _mesa_exec_free(test);
 
       _tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
    }
--- mesa-cvs/src/mesa/drivers/dri/radeon/radeon_context.c.selinux-awareness	2006-04-09 13:48:28.000000000 -0400
+++ mesa-cvs/src/mesa/drivers/dri/radeon/radeon_context.c	2006-08-10 16:39:55.000000000 -0400
@@ -471,8 +471,12 @@
    }
 
    if (rmesa->radeonScreen->chip_flags & RADEON_CHIPSET_TCL) {
-      if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
-	 radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+      void *test = NULL;
+      if ((test = _mesa_exec_malloc(64)))
+         if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+	    radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+      if (test)
+         _mesa_exec_free(test);
 
       _tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
    }
--- mesa-cvs/src/mesa/shader/slang/slang_execute_x86.c.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
+++ mesa-cvs/src/mesa/shader/slang/slang_execute_x86.c	2006-08-10 16:41:07.000000000 -0400
@@ -666,7 +666,8 @@
 	 * The built-in library occupies 450K, so we can be safe for now.
 	 * It is going to change in the future, when we get assembly analysis running.
 	 */
-	x86_init_func_size (&G.f, 1048576);
+	if (!x86_init_func_size (&G.f, 1048576))
+	    return 0;
 	G.r_eax = x86_make_reg (file_REG32, reg_AX);
 	G.r_ecx = x86_make_reg (file_REG32, reg_CX);
 	G.r_edx = x86_make_reg (file_REG32, reg_DX);
--- mesa-cvs/src/mesa/x86/rtasm/x86sse.c.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
+++ mesa-cvs/src/mesa/x86/rtasm/x86sse.c	2006-08-10 16:42:21.000000000 -0400
@@ -1063,15 +1063,17 @@
 }
 
 
-void x86_init_func( struct x86_function *p )
+int x86_init_func( struct x86_function *p )
 {
-   x86_init_func_size(p, 1024);
+   return x86_init_func_size(p, 1024);
 }
 
-void x86_init_func_size( struct x86_function *p, GLuint code_size )
+int x86_init_func_size( struct x86_function *p, GLuint code_size )
 {
    p->store = _mesa_exec_malloc(code_size);
    p->csr = p->store;
+
+   return (p->store != NULL);
 }
 
 void x86_release_func( struct x86_function *p )
--- mesa-cvs/src/mesa/x86/rtasm/x86sse.h.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
+++ mesa-cvs/src/mesa/x86/rtasm/x86sse.h	2006-08-10 16:42:43.000000000 -0400
@@ -80,8 +80,8 @@
  */
 
 
-void x86_init_func( struct x86_function *p );
-void x86_init_func_size( struct x86_function *p, GLuint code_size );
+int x86_init_func( struct x86_function *p );
+int x86_init_func_size( struct x86_function *p, GLuint code_size );
 void x86_release_func( struct x86_function *p );
 void (*x86_get_func( struct x86_function *p ))( void );
 
--- mesa-cvs/src/mesa/tnl/t_vb_arbprogram_sse.c.selinux-awareness	2006-06-01 18:56:40.000000000 -0400
+++ mesa-cvs/src/mesa/tnl/t_vb_arbprogram_sse.c	2006-08-10 16:39:55.000000000 -0400
@@ -1298,7 +1298,8 @@
       p->compiled_func = NULL;
    }
 
-   x86_init_func(&cp.func);
+   if (!x86_init_func(&cp.func))
+       return GL_FALSE;
 
    cp.fpucntl = RESTORE_FPU;
 
--- mesa-cvs/src/mesa/tnl/t_vertex_sse.c.selinux-awareness	2005-09-16 14:14:25.000000000 -0400
+++ mesa-cvs/src/mesa/tnl/t_vertex_sse.c	2006-08-10 16:39:55.000000000 -0400
@@ -348,7 +348,8 @@
    struct x86_reg vp1 = x86_make_reg(file_XMM, 2);
    GLubyte *fixup, *label;
 
-   x86_init_func(&p->func);
+   if (!x86_init_func(&p->func))
+       return GL_FALSE;
    
    /* Push a few regs?
     */
@@ -646,7 +647,10 @@
    p.identity = x86_make_reg(file_XMM, 6);
    p.chan0 = x86_make_reg(file_XMM, 7);
 
-   x86_init_func(&p.func);
+   if (!x86_init_func(&p.func)) {
+      vtx->codegen_emit = NULL;
+      return;
+   }
 
    if (build_vertex_emit(&p)) {
       _tnl_register_fastpath( vtx, GL_TRUE );


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Jul 2006 06:14:08 -0000	1.8
+++ .cvsignore	18 Aug 2006 19:52:19 -0000	1.9
@@ -1,3 +1,2 @@
-*.tar.bz2
-*.tar.gz
-clog
\ No newline at end of file
+MesaDemos-6.5.1.tar.bz2
+MesaLib-6.5.1.tar.bz2

mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch:
 Makefile |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

Index: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch	25 Jul 2006 16:32:36 -0000	1.2
+++ mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch	18 Aug 2006 19:52:19 -0000	1.3
@@ -10,7 +10,7 @@
 +	$(CC) $(CFLAGS) glxgears.c -lGL -o $@
 +
 +glxinfo:
-+	$(CC) $(CFLAGS) -I$(INCDIR) glxinfo.c -lGL -lGLU -o $@
++	$(CC) $(CFLAGS) -I$(INCDIR) glxinfo.c -L$(TOP)/lib -L$(TOP)/lib64 -lGL -lGLU -o $@
 +
  pbinfo: pbinfo.o pbutil.o
  	$(CC) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- mesa.spec	13 Aug 2006 18:48:58 -0000	1.83
+++ mesa.spec	18 Aug 2006 19:52:19 -0000	1.84
@@ -35,76 +35,42 @@
 %define with_dri 0
 %endif
 
-# FIXME: libOSMesa does not build when DRI is enabled for some reason.  It
-# seems next to impossible using the totally broken Mesa buildsystem to build
-# both DRI drivers and OSMesa in a single build.  If someone feels like fixing
-# all this to build on all 7 architectures, be my guest.
-#
-# DOUBLE FIXME: OSMesa is only ever built when trying to build the 'linux'
-# target, but we now only build linux-indirect.  We need a separate build pass
-# now on _all_ architectures.
-%if %{with_dri}
-%define with_OSMesa	0
-%else
-%define with_OSMesa	0
-%endif
-
 # NOTE: Allow libGLw to be disabled since nothing in Fedora Core uses it
 # anymore, and we're planning on having it moved into Fedora Extras soon.
 %define with_libGLw	1
 
-%if %{with_libGLw}
-# NOTE: This option enables motif support in libGLw for bug #175251
-%define with_motif	1
-%else
-%define with_motif	0
-%endif
-
 #-- END DRI Build Configuration ------------------------------------------
 
-%define snapshot 20060808
+%define snapshot 20060818
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 21.%{snapshot}cvs%{?dist}
+Release: 22.%{snapshot}cvs%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-cvs%{snapshot}.tar.bz2
-# MesaDemos is included here just for glxinfo and glxgears, as they were
-# previously supplied in X.Org sources, whereas the rest of the demos were not.
-# It would be in it's own separate package if there was a way of sanely building
-# it outside of Mesa.
-Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-cvs%{snapshot}.tar.bz2
+#Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
+#Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
+Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.5.1.tar.bz2
+Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-6.5.1.tar.bz2
 Source10: redhat-mesa-target
 Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
 
 # Patches 0-9 reserved for mesa Makefiles/config fixes
-Patch0: mesa-6.5-build-config.patch
-#Patch1: mesa-6.5-glx-use-tls.patch
-Patch2: mesa-6.5-fix-opt-flags-bug197640.patch
-Patch3: mesa-6.4.1-libGLw-enable-motif-support.patch
+Patch0: mesa-6.5.1-build-config.patch
 Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
-Patch5: mesa-6.5-fix-linux-indirect-build.patch
-Patch6: mesa-6.5-fix-glxinfo-link.patch
 
-Patch10: mesa-6.3.2-fix-installmesa.patch
 Patch11: mesa-6.4-multilib-fix.patch
 Patch12: mesa-modular-dri-dir.patch
 Patch14: mesa-6.5-drop-static-inline.patch
-Patch15: mesa-6.5-noexecstack.patch
-Patch16: mesa-6.5-force-r300.patch
-Patch17: mesa-6.5-fix-pbuffer-dispatch.patch
-Patch18: mesa-6.5-selinux-awareness.patch
-Patch19: mesa-6.5-r300-free-gart-mem.patch
+Patch18: mesa-6.5.1-selinux-awareness.patch
 
 # General patches from upstream go here:
 
-
 # Red Hat custom patches, feature development
 Patch200: mesa-6.5-texture-from-pixmap-fixes.patch
 Patch201: mesa-6.4.1-radeon-use-right-texture-format.patch
@@ -121,21 +87,19 @@
 BuildRequires: makedepend
 BuildRequires: libselinux-devel
 
-%if %{with_motif}
+# FIXME: remove this when libGLw hits extras.
 BuildRequires: openmotif-devel
-%endif
 
 %description
 Mesa
 
 #-- libGL ------------------------------------------------------------
 %package libGL
-Summary: Mesa libGL runtime libraries and DRI drivers.
+Summary: Mesa libGL runtime libraries and DRI drivers
 Group: System Environment/Libraries
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires: libselinux
 # NOTE: This libGL virtual provide is intentionally non-versioned, and is
 # intended to be used as a generic dependency in other packages which require
 # _any_ implementation and version of libGL.  If a particular software
@@ -294,6 +258,29 @@
 
 %description libGLw-devel
 Mesa libGLw development package
+
+#-- libOSMesa -----------------------------------------------------------
+%package libOSMesa
+Summary: Mesa offscreen rendering libraries
+Group: System Environment/Libraries
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+Provides: libOSMesa
+
+%description libOSMesa
+Mesa offscreen rendering libraries
+
+#-- libOSMesa-devel -----------------------------------------------------
+%package libOSMesa-devel
+Summary: Mesa offscreen rendering development package
+Group: Development/Libraries
+Requires: mesa-libOSMesa = %{version}-%{release}
+
+%description libOSMesa-devel
+Mesa offscreen rendering development package
+
 #-- source -----------------------------------------------------------
 %package source
 Summary: Mesa source code required to build X server
@@ -313,30 +300,19 @@
 
 #-- prep -------------------------------------------------------------
 %prep
-%setup -q -n Mesa-cvs%{snapshot} -b1
+# %setup -q -n Mesa-%{version} -b1
+%setup -q -n mesa-cvs -b1
 # Copy Red Hat Mesa build/install simplificomplication scripts into build dir.
 install -m 755 %{SOURCE10} ./
 install -m 755 %{SOURCE11} ./
 install -m 755 %{SOURCE12} ./
 
-%patch0 -p0 -b .build-config
-#%patch1 -p0 -b .glx-use-tls
-#%patch2 -p1 -b .fix-opt-flags-bug197640
-#%if %{with_motif}
-#%patch3 -p0 -b .libGLw-enable-motif-support
-#%endif
+%patch0 -p1 -b .build-config
 %patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
-%patch5 -p1 -b .linux-indirect
-%patch6 -p1 -b .glxinfo
 
-#%patch10 -p0 -b .fix-installmesa
 %patch11 -p0 -b .multilib-fix
-#%patch12 -p1 -b .modular
 %patch14 -p0 -b .drop-static-inline
-#%patch15 -p0 -b .noexecstack
-%patch16 -p0 -b .force-r300
-#%patch17 -p0 -b .fix-pbuffer-dispatch
-#%patch18 -p1 -b .selinux-awareness
+%patch18 -p1 -b .selinux-awareness
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
@@ -361,9 +337,33 @@
 MESATARGET="$(./redhat-mesa-target %{with_dri} %{_arch})"
 #DRIVER_DIRS="dri osmesa"
 
-echo -e "********************\nMESATARGET=$MESATARGET\n********************\n"
+mkdir preserve
+export LIB_DIR=$( basename %{_libdir} ) 
+
+echo "Building osmesa"
+make linux-osmesa
+mv ${LIB_DIR}/* preserve
+make -s realclean
+
+echo "Building osmesa16"
+make linux-osmesa16
+mv ${LIB_DIR}/* preserve
+make -s realclean
+
+echo "Building osmesa32"
+make linux-osmesa32
+mv ${LIB_DIR}/* preserve
+make -s realclean
+
+echo "Building $MESATARGET"
 make ${MESATARGET}
 make -C progs/xdemos glxgears glxinfo
+mv preserve/* ${LIB_DIR}
+cd ${LIB_DIR}
+ln -s libOSMesa.so.6 libOSMesa.so 
+ln -s libOSMesa16.so.6 libOSMesa16.so
+ln -s libOSMesa32.so.6 libOSMesa32.so
+cd ..
 
 #-- Install ----------------------------------------------------------
 %install
@@ -418,6 +418,8 @@
 %postun libGLU -p /sbin/ldconfig
 %post libGLw -p /sbin/ldconfig
 %postun libGLw -p /sbin/ldconfig
+%post libOSMesa -p /sbin/ldconfig
+%postun libOSMesa -p /sbin/ldconfig
 
 %files libGL
 %defattr(-,root,root,-)
@@ -451,12 +453,6 @@
 #%{_libdir}/dri/trident_dri.so
 #%{_libdir}/dri/unichrome_dri.so
 %endif
-%if %{with_OSMesa}
-# 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*
-%endif
 
 %files libGL-devel
 %defattr(-,root,root,-)
@@ -474,7 +470,6 @@
 %{_includedir}/GL/glxext.h
 %{_includedir}/GL/mesa_wgl.h
 %{_includedir}/GL/mglmesa.h
-%{_includedir}/GL/osmesa.h
 %{_includedir}/GL/svgamesa.h
 #%{_includedir}/GL/uglglutshapes.h
 %{_includedir}/GL/uglmesa.h
@@ -484,9 +479,6 @@
 %{_includedir}/GL/xmesa_x.h
 %{_includedir}/GL/xmesa_xf86.h
 %{_libdir}/libGL.so
-%if %{with_OSMesa}
-%{_libdir}/libOSMesa.so
-%endif
 
 %files libGLU
 %defattr(-,root,root,-)
@@ -512,6 +504,22 @@
 %{_includedir}/GL/GLwMDrawA.h
 %{_includedir}/GL/GLwMDrawAP.h
 
+%files libOSMesa
+%defattr(-,root,root,-)
+%{_libdir}/libOSMesa.so.6
+%{_libdir}/libOSMesa.so.6.5.1
+%{_libdir}/libOSMesa16.so.6
+%{_libdir}/libOSMesa16.so.6.5.1
+%{_libdir}/libOSMesa32.so.6
+%{_libdir}/libOSMesa32.so.6.5.1
+
+%files libOSMesa-devel
+%defattr(-,root,root,-)
+%{_includedir}/GL/osmesa.h
+%{_libdir}/libOSMesa.so
+%{_libdir}/libOSMesa16.so
+%{_libdir}/libOSMesa32.so
+
 %files source -f mesa-source-rpm-filelist.lst
 %defattr(-,root,root,-)
 
@@ -521,6 +529,10 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.5-22.20060818cvs.fc6
+- Update to pre-6.5.1 snapshot.
+- Re-add libOSMesa{,16,32}. (#186366)
+
 * Sun Aug 13 2006 Florian La Roche <laroche at redhat.com> 6.5-21.fc6
 - fix one Requires: to use the correct mesa-libGLw name
 


Index: redhat-mesa-driver-install
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/redhat-mesa-driver-install,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- redhat-mesa-driver-install	5 Jul 2006 08:38:07 -0000	1.7
+++ redhat-mesa-driver-install	18 Aug 2006 19:52:19 -0000	1.8
@@ -36,14 +36,14 @@
 #---------------------------------------------------------------------
 
 # Define list of all of the DRI drivers Mesa builds by default.
-DRI_DRIVERS_ALL="ffb i810 i830 i915 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome"
+DRI_DRIVERS_ALL="ffb i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome"
 
 # Define per arch list of DRI drivers we wish to build and ship for DRI
 # enabled builds on particular platforms.
-DRI_DRIVERS_x86="i810 i830 i915 mga r128 r200 r300 radeon savage sis unichrome"
-DRI_DRIVERS_x86_64="i810 i830 i915 mga r128 r200 r300 radeon savage sis unichrome"
+DRI_DRIVERS_x86="i810 i915 i965 mga r128 r200 r300 radeon savage sis unichrome"
+DRI_DRIVERS_x86_64="i810 i915 i965 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_ia64="i810 i915 mga r128 r200 r300 radeon"
 DRI_DRIVERS_alpha="mga r128 r200 r300 radeon"
 
 # Current build architecture, passed by rpm spec


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Apr 2006 06:05:02 -0000	1.7
+++ sources	18 Aug 2006 19:52:19 -0000	1.8
@@ -1,2 +1,2 @@
-ab95b590dcd640726a2d89e62068c66e  MesaDemos-6.5.tar.bz2
-61beda590bfc5b4a12e979d5f2d70d7a  MesaLib-6.5.tar.bz2
+a22b2444ee379b4a00e9c5167da3299c  MesaDemos-6.5.1.tar.bz2
+c63c9536d92f1bf5ec07db5ceea5b556  MesaLib-6.5.1.tar.bz2


--- mesa-6.3.2-fix-installmesa.patch DELETED ---


--- mesa-6.4.1-libGLw-enable-motif-support.patch DELETED ---


--- mesa-6.5-build-config.patch DELETED ---


--- mesa-6.5-fix-glxinfo-link.patch DELETED ---


--- mesa-6.5-fix-linux-indirect-build.patch DELETED ---


--- mesa-6.5-fix-opt-flags-bug197640.patch DELETED ---


--- mesa-6.5-fix-pbuffer-dispatch.patch DELETED ---


--- mesa-6.5-force-r300.patch DELETED ---


--- mesa-6.5-glx-use-tls.patch DELETED ---


--- mesa-6.5-noexecstack.patch DELETED ---


--- mesa-6.5-r300-free-gart-mem.patch DELETED ---


--- mesa-6.5-selinux-awareness.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:05:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:05:32 -0400
Subject: rpms/gtk-sharp2/devel gtk-sharp2.spec,1.15,1.16
Message-ID: <200608182005.k7IK5Wwc030435@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30406

Modified Files:
	gtk-sharp2.spec 
Log Message:
fix requires



Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gtk-sharp2.spec	18 Aug 2006 15:06:19 -0000	1.15
+++ gtk-sharp2.spec	18 Aug 2006 20:05:28 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gtk-sharp2
 Version:        2.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -41,7 +41,7 @@
 Summary: files needed for developing with gtk-sharp2
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkg-config
+Requires: pkgconfig
 
 %description devel
 This package provides the necessary development libraries and headers
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/gtk-dotnet-2.0.pc
 
 %changelog
+* Fri Aug 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.0-2.fc6
+- Fix pkgconfig requires
+
 * Mon Aug 14 2006 Alexander Larsson <alexl at redhat.com> - 2.9.0-1
 - update to 2.9.0, which splits out gnome stuff to gnome-sharp
 - Split out devel package



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:10:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:10:50 -0400
Subject: rpms/audit/devel audit.spec,1.106,1.107
Message-ID: <200608182010.k7IKAoVN031649@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31599

Modified Files:
	audit.spec 
Log Message:
rebuilt with latest binutils


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- audit.spec	8 Aug 2006 17:26:37 -0000	1.106
+++ audit.spec	18 Aug 2006 20:10:47 -0000	1.107
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.5
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -168,6 +168,10 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 1.2.5-8
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Wed Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-7
 - Remove debug lines from dispatcher
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:11:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:11:41 -0400
Subject: rpms/cups/devel cups.spec,1.249,1.250
Message-ID: <200608182011.k7IKBf3W031877@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31852

Modified Files:
	cups.spec 
Log Message:
rebuilt with latest binutils


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- cups.spec	18 Aug 2006 14:52:30 -0000	1.249
+++ cups.spec	18 Aug 2006 20:11:38 -0000	1.250
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 12
+Release: 13
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -420,6 +420,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.2-13
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Fri Aug 18 2006 Tim Waugh <twaugh at redhat.com>
 - Own notifier directory (bug #203085).
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:12:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:12:03 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.113,1.114
Message-ID: <200608182012.k7IKC3DH032057@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32025

Modified Files:
	dhcp.spec 
Log Message:
rebuilt with latest binutils


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- dhcp.spec	17 Aug 2006 21:52:23 -0000	1.113
+++ dhcp.spec	18 Aug 2006 20:12:01 -0000	1.114
@@ -5,7 +5,7 @@
 Name:    dhcp
 Version: 3.0.4
 Release: 19%{?dist}
-Epoch:   12
+Epoch:   13
 License: distributable
 Group:   System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@@ -460,6 +460,10 @@
 %endif
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 12:3.0.4-20
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Thu Aug 17 2006 David Cantrell <dcantrell at redhat.com> - 12:3.0.4-19
 - Fix mkdir problem in libdhcp4client.Makefile
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:12:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:12:11 -0400
Subject: rpms/dhcpv6/devel dhcpv6.spec,1.41,1.42
Message-ID: <200608182012.k7IKCBWn032150@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32127

Modified Files:
	dhcpv6.spec 
Log Message:
rebuilt with latest binutils


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- dhcpv6.spec	19 Jul 2006 06:46:03 -0000	1.41
+++ dhcpv6.spec	18 Aug 2006 20:12:08 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 30
+Release: 31
 License: GPL 
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -193,6 +193,10 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 0.10-31
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Tue Jul 18 2006 Jason Vas Dias <jvdias at redhat.com> - 0.10-30
 - fix bug 196429: 
   Allow clients from dhcpv6-0.10<=16 to get addresses. 



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:12:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:12:37 -0400
Subject: rpms/gnupg/devel gnupg.spec,1.58,1.59
Message-ID: <200608182012.k7IKCbIM032321@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnupg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32291

Modified Files:
	gnupg.spec 
Log Message:
rebuilt with latest binutils


Index: gnupg.spec
===================================================================
RCS file: /cvs/dist/rpms/gnupg/devel/gnupg.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnupg.spec	1 Aug 2006 18:08:14 -0000	1.58
+++ gnupg.spec	18 Aug 2006 20:12:34 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: A GNU utility for secure communication and data storage.
 Name: gnupg
 Version: 1.4.5
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
@@ -99,6 +99,10 @@
 %{_mandir}/man7/*
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 1.4.5-4
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Tue Aug  1 2006 Nalin Dahyabhai <nalin at redhat.com> - 1.4.5-3
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:13:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:13:09 -0400
Subject: rpms/httpd/devel httpd.spec,1.98,1.99
Message-ID: <200608182013.k7IKD9oU032528@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32500

Modified Files:
	httpd.spec 
Log Message:
rebuilt with latest binutils


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- httpd.spec	3 Aug 2006 12:50:58 -0000	1.98
+++ httpd.spec	18 Aug 2006 20:13:06 -0000	1.99
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.3
-Release: 3
+Release: 4
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -482,6 +482,10 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 2.2.3-4
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Thu Aug  3 2006 Joe Orton <jorton at redhat.com> 2.2.3-3
 - init: use killproc() delay to avoid race killing parent
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:13:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:13:34 -0400
Subject: rpms/irqbalance/devel irqbalance.spec,1.31,1.32
Message-ID: <200608182013.k7IKDYBQ032704@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/irqbalance/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32672

Modified Files:
	irqbalance.spec 
Log Message:
rebuilt with latest binutils


Index: irqbalance.spec
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- irqbalance.spec	1 Aug 2006 16:15:58 -0000	1.31
+++ irqbalance.spec	18 Aug 2006 20:13:31 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
 Version:        1.13
-Release: 	%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL/OSL
@@ -72,6 +72,12 @@
 
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 1.13-2
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+- Remove hack to use cvs checkin ID as release as it doesn't follow
+  packaging guidelines
+
 * Tue Aug 01 2006 Neil Horman <nhorman at redhat.com>
 - Change license to GPL in version 0.13
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:14:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:14:05 -0400
Subject: rpms/libselinux/devel libselinux.spec,1.219,1.220
Message-ID: <200608182014.k7IKE5AX000456@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv431

Modified Files:
	libselinux.spec 
Log Message:
rebuilt with latest binutils


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- libselinux.spec	12 Aug 2006 11:21:11 -0000	1.219
+++ libselinux.spec	18 Aug 2006 20:14:02 -0000	1.220
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.26
-Release: 1
+Release: 2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -116,6 +116,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 1.20.26-2
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Sat Aug  12 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.25-1
 - Upgrade to latest from NSA
 	* Merged file context homedir and local path functions from



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:14:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:14:38 -0400
Subject: rpms/libstdc++so7/devel libstdc++7.spec,1.9,1.10
Message-ID: <200608182014.k7IKEcup000670@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libstdc++so7/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv645

Modified Files:
	libstdc++7.spec 
Log Message:
rebuilt with latest binutils


Index: libstdc++7.spec
===================================================================
RCS file: /cvs/dist/rpms/libstdc++so7/devel/libstdc++7.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libstdc++7.spec	2 Aug 2006 02:02:07 -0000	1.9
+++ libstdc++7.spec	18 Aug 2006 20:14:35 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: libstdc++.so.7 preview
 Name: libstdc++so7
 Version: 4.2.0
-Release: 0.8.%{snapdate}%{?dist}
+Release: 0.9.%{snapdate}%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source0: gcc_stub-4.1-20060118.tar.bz2
@@ -185,6 +185,10 @@
 %{_prefix}/include/c++/4.2.0-*
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 4.2.0-0.9.20060428
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Sat Jul 29 2006 Jens Petersen <petersen at redhat.com> - 4.2.0-0.8.20060428
 - revert libstdcxx string implementation to rc (#197718)
 - bump library version datestamp to 20060727



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:15:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:15:17 -0400
Subject: rpms/ltrace/devel ltrace.spec,1.42,1.43
Message-ID: <200608182015.k7IKFH5g000945@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv915

Modified Files:
	ltrace.spec 
Log Message:
rebuilt with latest binutils


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ltrace.spec	15 Jul 2006 00:51:09 -0000	1.42
+++ ltrace.spec	18 Aug 2006 20:15:15 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 1.0.45svn.5
+Release: 1.0.45svn.6
 Source: ltrace-0.5.tar.gz
 Patch2: ltrace-opd.patch
 Patch3: ltrace-ppc32fc5.patch
@@ -56,6 +56,10 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 0.5-1.0.45svn.6
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.5
 - adding .gnu.hash patch to support new ELF hash table section
 - adding testsuite patch to silent some bogus failures



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:15:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:15:51 -0400
Subject: rpms/netatalk/devel netatalk.spec,1.28,1.29
Message-ID: <200608182015.k7IKFpqc001127@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/netatalk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1098

Modified Files:
	netatalk.spec 
Log Message:
rebuilt with latest binutils


Index: netatalk.spec
===================================================================
RCS file: /cvs/dist/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- netatalk.spec	12 Jul 2006 07:26:40 -0000	1.28
+++ netatalk.spec	18 Aug 2006 20:15:48 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 6.fc6.1
+Release: 7%{?dist}
 Epoch:   4
 License: GPL
 Group: 	 System Environment/Daemons
@@ -179,6 +179,11 @@
 %{_libdir}/atalk/*.la
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 4:2.0.3-7
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+- Add dist tag
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4:2.0.3-6.fc6.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:16:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:16:46 -0400
Subject: rpms/postfix/devel postfix.spec,1.45,1.46
Message-ID: <200608182016.k7IKGkpe003219@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/postfix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2422

Modified Files:
	postfix.spec 
Log Message:
rebuilt with latest binutils


Index: postfix.spec
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- postfix.spec	31 Jul 2006 08:10:56 -0000	1.45
+++ postfix.spec	18 Aug 2006 20:16:43 -0000	1.46
@@ -43,7 +43,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.3.2
-Release: 1
+Release: 2
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -471,6 +471,10 @@
 
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 2:2.3.2-2
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Mon Jul 31 2006 Thomas Woerner <twoerner at redhat.com> 2:2.3.2-1
 - new version 2.3.2 with major upstream fixes:
   - corrupted queue file after a request to modify a short message header



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:17:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:17:24 -0400
Subject: rpms/radvd/devel radvd.spec,1.31,1.32
Message-ID: <200608182017.k7IKHO7e008213@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/radvd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7843

Modified Files:
	radvd.spec 
Log Message:
rebuilt with latest binutils


Index: radvd.spec
===================================================================
RCS file: /cvs/dist/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- radvd.spec	17 Jul 2006 15:35:12 -0000	1.31
+++ radvd.spec	18 Aug 2006 20:17:21 -0000	1.32
@@ -3,7 +3,7 @@
 Summary:   A Router Advertisement daemon
 Name:      radvd
 Version:   0.9.1
-Release:   3
+Release:   4
 License:   BSD-style
 Group:     System Environment/Daemons
 Source:    http://www.litech.org/radvd/radvd-%{version}.tar.gz
@@ -83,6 +83,10 @@
 %{_sbindir}/radvdump
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 0.9.1-4
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 0.9.1-3
 - rebuild for new FC-6 build environment
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:17:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:17:58 -0400
Subject: rpms/smartmontools/devel smartmontools.spec,1.22,1.23
Message-ID: <200608182017.k7IKHwa5012333@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/smartmontools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12045

Modified Files:
	smartmontools.spec 
Log Message:
rebuilt with latest binutils


Index: smartmontools.spec
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- smartmontools.spec	12 Jul 2006 08:15:53 -0000	1.22
+++ smartmontools.spec	18 Aug 2006 20:17:56 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.36
-Release: 	2.1
+Release: 	3
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -76,6 +76,10 @@
 
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 1:5.36-3
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:5.36-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:18:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:18:26 -0400
Subject: rpms/stunnel/devel stunnel.spec,1.39,1.40
Message-ID: <200608182018.k7IKIQWa015554@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/stunnel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15370

Modified Files:
	stunnel.spec 
Log Message:
rebuilt with latest binutils


Index: stunnel.spec
===================================================================
RCS file: /cvs/dist/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- stunnel.spec	12 Jul 2006 08:19:15 -0000	1.39
+++ stunnel.spec	18 Aug 2006 20:18:24 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper.
 Name: stunnel
 Version: 4.15
-Release: 1.1
+Release: 2
 License: GPL
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -91,6 +91,10 @@
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 4.15-2
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.15-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:19:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:19:02 -0400
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.41,1.42
Message-ID: <200608182019.k7IKJ2wk017471@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17443

Modified Files:
	tog-pegasus.spec 
Log Message:
rebuilt with latest binutils


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- tog-pegasus.spec	27 Jul 2006 21:43:42 -0000	1.41
+++ tog-pegasus.spec	18 Aug 2006 20:19:00 -0000	1.42
@@ -41,7 +41,7 @@
 %endif
 
 Version: 		2.5.2
-Release: 		1%{?LINUX_VERSION:%{LINUX_VERSION}}
+Release: 		2%{?dist}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -335,6 +335,10 @@
 
 
 %changelog
+* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 2:2.5.2-2
+- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
+  (#203001)
+
 * Thu Jul 27 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.2-1.fc6
 - Upgrade to upstream version 2.5.2
 - fix bug 198185



From fedora-cvs-commits at redhat.com  Fri Aug 18 20:54:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 16:54:27 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.127, 1.128 mkinitrd.spec, 1.155,
	1.156 sources, 1.154, 1.155
Message-ID: <200608182054.k7IKsRSK009322@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9220

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- fix "MOUNT_PROC_USB" warning
- bump version/add changelog



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- .cvsignore	16 Aug 2006 22:32:26 -0000	1.127
+++ .cvsignore	18 Aug 2006 20:54:24 -0000	1.128
@@ -1,2 +1,2 @@
 bdevid-0.4.tar.bz2
-mkinitrd-5.1.8.tar.bz2
+mkinitrd-5.1.9.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- mkinitrd.spec	16 Aug 2006 22:32:26 -0000	1.155
+++ mkinitrd.spec	18 Aug 2006 20:54:24 -0000	1.156
@@ -3,7 +3,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.1.8
+Version: 5.1.9
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -118,6 +118,9 @@
 /%{python_sitelib}/bdevid.so
 
 %changelog
+* Fri Aug 17 2006 Peter Jones <pjones at redhat.com> - 5.1.9-1
+- Fix "MOUNT_PROC_USB" warning
+
 * Wed Aug 16 2006 Peter Jones <pjones at redhat.com> - 5.1.8-1
 - Use modprobe to find module deps (#202559, #202596)
 - Fix typo for /dev/efirtc (#202110)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- sources	16 Aug 2006 22:32:26 -0000	1.154
+++ sources	18 Aug 2006 20:54:24 -0000	1.155
@@ -1,2 +1,2 @@
 d963851dff275f0af392cb25d3ad45fd  bdevid-0.4.tar.bz2
-79091378140e8bc20312bc0bb0f8aa58  mkinitrd-5.1.8.tar.bz2
+f76e44bbcc67cc1ca8a7c1ecfbf1d4fc  mkinitrd-5.1.9.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 18 21:12:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 17:12:00 -0400
Subject: rpms/dogtail/devel dogtail.spec,1.2,1.3
Message-ID: <200608182112.k7ILC01R013616@cvs.devel.redhat.com>

Author: zcerza

Update of /cvs/dist/rpms/dogtail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13573

Modified Files:
	dogtail.spec 
Log Message:
Update specfile.



Index: dogtail.spec
===================================================================
RCS file: /cvs/dist/rpms/dogtail/devel/dogtail.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dogtail.spec	11 Aug 2006 16:46:20 -0000	1.2
+++ dogtail.spec	18 Aug 2006 21:11:58 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: GUI test tool and automation framework
 Name: dogtail
 Version: 0.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: User Interface/X
 URL: http://people.redhat.com/zcerza/dogtail/
@@ -14,6 +14,7 @@
 Requires: pygtk2
 Requires: rpm-python
 Requires: xorg-x11-server-Xvfb
+Requires: xorg-x11-xinit
 patch0: headless-gconf.patch
 patch1: desktop-file-categories.patch
 
@@ -64,6 +65,9 @@
 %doc examples/
 
 %changelog
+* Fri Aug 18 2006 Zack Cerza <zcerza at redhat.com> - 0.5.2-3
+- Add Requires for xorg-x11-xinit. Closes: #203189.
+
 * Fri Aug 11 2006 Zack Cerza <zcerza at redhat.com> - 0.5.2-2
 - Added headless-gconf.patch to use the python gconf bindings.
 - Added desktop-file-categories.patch to put sniff and dogtail-recorder under



From fedora-cvs-commits at redhat.com  Fri Aug 18 21:18:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 17:18:08 -0400
Subject: rpms/mesa/devel mesa.spec,1.84,1.85
Message-ID: <200608182118.k7ILI8Eb028682@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28072

Modified Files:
	mesa.spec 
Log Message:
* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.5-22.20060818cvs.fc6
- Update to pre-6.5.1 snapshot.
- Re-add libOSMesa{,16,32}. (#186366)
- Add BuildReq: on libXp-devel due to openmotif header insanity.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- mesa.spec	18 Aug 2006 19:52:19 -0000	1.84
+++ mesa.spec	18 Aug 2006 21:18:05 -0000	1.85
@@ -86,9 +86,11 @@
 BuildRequires: libXt-devel
 BuildRequires: makedepend
 BuildRequires: libselinux-devel
-
+%if %{with_libGLw}
 # FIXME: remove this when libGLw hits extras.
+BuildRequires: libXp-devel
 BuildRequires: openmotif-devel
+%endif
 
 %description
 Mesa
@@ -532,6 +534,7 @@
 * Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.5-22.20060818cvs.fc6
 - Update to pre-6.5.1 snapshot.
 - Re-add libOSMesa{,16,32}. (#186366)
+- Add BuildReq: on libXp-devel due to openmotif header insanity.
 
 * Sun Aug 13 2006 Florian La Roche <laroche at redhat.com> 6.5-21.fc6
 - fix one Requires: to use the correct mesa-libGLw name



From fedora-cvs-commits at redhat.com  Fri Aug 18 21:22:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 17:22:25 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2519.4.5,1.2519.4.6
Message-ID: <200608182122.k7ILMOPN032089@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31955

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Log Message:
enable modsigning




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.5
retrieving revision 1.2519.4.6
diff -u -r1.2519.4.5 -r1.2519.4.6
--- kernel-2.6.spec	17 Aug 2006 22:59:24 -0000	1.2519.4.5
+++ kernel-2.6.spec	18 Aug 2006 21:22:21 -0000	1.2519.4.6
@@ -83,7 +83,7 @@
 %ifarch %{all_x86}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
-#define signmodules 1
+%define signmodules 1
 %endif
 
 %ifarch i686
@@ -95,13 +95,13 @@
 %ifarch x86_64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
-#define signmodules 1
+%define signmodules 1
 %endif
 
 %ifarch ppc64 ppc64iseries
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
-#define signmodules 1
+%define signmodules 1
 %define make_target vmlinux
 %define kernel_image vmlinux
 %define kernel_image_elf 1
@@ -146,7 +146,7 @@
 %ifarch ia64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64*.config
 %define image_install_path boot/efi/EFI/redhat
-#define signmodules 1
+%define signmodules 1
 %define make_target compressed
 %define kernel_image vmlinux.gz
 # ia64 xen HV doesn't building with debug=y at the moment
@@ -1722,6 +1722,9 @@
 %endif
 
 %changelog
+* Fri Aug 18 2006 Don Zickus <dzickus at redhat.com>
+- fixed modsigning but forgot to enable it
+
 * Thu Aug 17 2006 Don Zickus <dzickus at redhat.com>
 - added #202779
 - added #202597



From fedora-cvs-commits at redhat.com  Fri Aug 18 21:37:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 17:37:47 -0400
Subject: rpms/dbus/devel .cvsignore, 1.20, 1.21 dbus.spec, 1.93, 1.94 sources,
	1.20, 1.21 dbus-0.32-selinux_chroot_workaround.patch, 1.3,
	NONE dbus-0.61-mono-no-abi-version-change.patch, 1.1,
	NONE dbus-0.61.dbus-connection.c.backport.patch, 1.1,
	NONE dbus-0.90-fix-remove-timeout.patch, 1.1,
	NONE dbus-0.90-ref-unlocked.patch, 1.1,
	NONE dbus-0.90-remove-glib.patch, 1.2, NONE
Message-ID: <200608182137.k7ILblmF003943@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3867

Modified Files:
	.cvsignore dbus.spec sources 
Removed Files:
	dbus-0.32-selinux_chroot_workaround.patch 
	dbus-0.61-mono-no-abi-version-change.patch 
	dbus-0.61.dbus-connection.c.backport.patch 
	dbus-0.90-fix-remove-timeout.patch 
	dbus-0.90-ref-unlocked.patch dbus-0.90-remove-glib.patch 
Log Message:
- Update to 0.92 
- remove old patches



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	17 Jul 2006 20:41:14 -0000	1.20
+++ .cvsignore	18 Aug 2006 21:37:37 -0000	1.21
@@ -13,3 +13,4 @@
 dbus-0.61.tar.gz
 dbus-0.62.tar.gz
 dbus-0.90.tar.gz
+dbus-0.92.tar.gz


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- dbus.spec	22 Jul 2006 15:42:16 -0000	1.93
+++ dbus.spec	18 Aug 2006 21:37:43 -0000	1.94
@@ -7,8 +7,8 @@
 
 Summary: D-BUS message bus
 Name: dbus
-Version: 0.90
-Release: 8 
+Version: 0.92
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -65,9 +65,6 @@
 
 %patch2 -p1 -b .selinux-avc-audit
 %patch3 -p1 -b .start-early
-%patch4 -p1 -b .remove-glib
-%patch5 -p1 -b .ref-unlocked
-%patch6 -p1 -b .fix-remove-timeout
 
 autoreconf -f -i
 
@@ -173,6 +170,10 @@
 %{_includedir}/*
 
 %changelog
+* Fri Aug 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.92-1
+- Update to 0.92 
+- remove old patches
+
 * Thu Jul 22 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-8
 - add patch to fix timeout removal assertion
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	17 Jul 2006 20:41:14 -0000	1.20
+++ sources	18 Aug 2006 21:37:44 -0000	1.21
@@ -1 +1 @@
-f07e2adb6b1556408defbc706fb98d75  dbus-0.90.tar.gz
+ea2be58c80a80631ba5b3c92cffd335c  dbus-0.92.tar.gz


--- dbus-0.32-selinux_chroot_workaround.patch DELETED ---


--- dbus-0.61-mono-no-abi-version-change.patch DELETED ---


--- dbus-0.61.dbus-connection.c.backport.patch DELETED ---


--- dbus-0.90-fix-remove-timeout.patch DELETED ---


--- dbus-0.90-ref-unlocked.patch DELETED ---


--- dbus-0.90-remove-glib.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 18 21:46:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 17:46:01 -0400
Subject: rpms/control-center/devel
 control-center-2.15.90-fix-thumbnailing.patch, NONE, 1.1 control-center.spec,
 1.169, 1.170 control-center-2.10.1-fix-popunder-bug.patch, 1.1,
 NONE control-center-2.10.1-icon.patch, 1.1,
 NONE control-center-2.11.5-fedora-apps.patch, 1.1,
 NONE control-center-2.11.6-xft.patch, 1.2,
 NONE control-center-2.11.91-dont-use-pango-xft.patch, 1.1,
 NONE control-center-2.11.91-fix-about-me-disablement.patch, 1.1,
 NONE control-center-2.12.0-help-left-handed-dual-mice-users.patch, 1.1,
 NONE control-center-2.12.1-fedora-apps.patch, 1.1,
 NONE control-center-2.12.1-gecos.patch, 1.1,
 NONE control-center-2.12.1-inputmethod.patch, 1.2,
 NONE control-center-2.12.1-login-photo.patch, 1.1,
 NONE control-center-2.13.3-gecos.patch, 1.1,
 NONE control-center-2.13.4-fedora-apps.patch, 1.1,
 NONE control-center-2.13.5-fedora-apps.patch, 1.4,
 NONE control-center-2.13.5-m4.patch, 1.1,
 NONE control-center-2.13.90-broken-es-help.patch, 1.1,
 NONE control-center-2.14.2-gecos.patch, 1.1, NONE control-center-2.7.1-hel!
 pfix.patch, 1.1, NONE control-center-2.7.1-modifier.patch, 1.1,
 NONE control-center-2.8.0-fedora-apps.patch, 1.2,
 NONE control-center-2.8.0-filesel.patch, 1.2,
 NONE control-center-2.8.0-install-icons.patch, 1.1,
 NONE control-center-2.8.0-urlhandler-keys.patch, 1.1,
 NONE control-center-2.9.4-fedora-apps.patch, 1.1, NONE
Message-ID: <200608182146.k7ILk15M015336@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15323

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.15.90-fix-thumbnailing.patch 
Removed Files:
	control-center-2.10.1-fix-popunder-bug.patch 
	control-center-2.10.1-icon.patch 
	control-center-2.11.5-fedora-apps.patch 
	control-center-2.11.6-xft.patch 
	control-center-2.11.91-dont-use-pango-xft.patch 
	control-center-2.11.91-fix-about-me-disablement.patch 
	control-center-2.12.0-help-left-handed-dual-mice-users.patch 
	control-center-2.12.1-fedora-apps.patch 
	control-center-2.12.1-gecos.patch 
	control-center-2.12.1-inputmethod.patch 
	control-center-2.12.1-login-photo.patch 
	control-center-2.13.3-gecos.patch 
	control-center-2.13.4-fedora-apps.patch 
	control-center-2.13.5-fedora-apps.patch 
	control-center-2.13.5-m4.patch 
	control-center-2.13.90-broken-es-help.patch 
	control-center-2.14.2-gecos.patch 
	control-center-2.7.1-helpfix.patch 
	control-center-2.7.1-modifier.patch 
	control-center-2.8.0-fedora-apps.patch 
	control-center-2.8.0-filesel.patch 
	control-center-2.8.0-install-icons.patch 
	control-center-2.8.0-urlhandler-keys.patch 
	control-center-2.9.4-fedora-apps.patch 
Log Message:
- Fix thumbnailing problem in background capplet (bug 185142)


control-center-2.15.90-fix-thumbnailing.patch:
 gnome-wp-info.c |   26 --------------------------
 1 files changed, 26 deletions(-)

--- NEW FILE control-center-2.15.90-fix-thumbnailing.patch ---
--- control-center-2.15.90/capplets/background/gnome-wp-info.c.fix-thumbnailing	2006-08-18 16:27:56.000000000 -0400
+++ control-center-2.15.90/capplets/background/gnome-wp-info.c	2006-08-18 16:31:51.000000000 -0400
@@ -38,24 +38,11 @@
 				    GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
   if (info == NULL || info->mime_type == NULL || result != GNOME_VFS_OK) {
     if (!strcmp (uri, "(none)")) {
-      gchar * md5sum;
-
       new = g_new0 (GnomeWPInfo, 1);
 
       new->mime_type = g_strdup ("image/x-no-data");
       new->uri = g_strdup (uri);
-
-      md5sum = gnome_thumbnail_md5 (escaped_path);
-
-      new->thumburi = g_strconcat (g_get_home_dir (),
-				   "/.thumbnails/normal/",
-				   md5sum,
-				   ".png",
-				   NULL);
-      g_free (md5sum);
-
       new->name = g_strdup (_("No Wallpaper"));
-
       new->size = 0;
     } else {
       new = NULL;
@@ -68,19 +55,6 @@
     new->thumburi = gnome_thumbnail_factory_lookup (thumbs,
 						    escaped_path,
 						    info->mtime);
-    if (new->thumburi == NULL) {
-      gchar * md5sum;
-
-      md5sum = gnome_thumbnail_md5 (escaped_path);
-
-      new->thumburi = g_strconcat (g_get_home_dir (),
-				   "/.thumbnails/normal/",
-				   md5sum,
-				   ".png",
-				   NULL);
-
-      g_free (md5sum);
-    }
     new->name = g_strdup (info->name);
     new->mime_type = g_strdup (info->mime_type);
 


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- control-center.spec	14 Aug 2006 13:39:00 -0000	1.169
+++ control-center.spec	18 Aug 2006 21:45:58 -0000	1.170
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.91
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -38,6 +38,7 @@
 # Dobey being unreasonable again
 Patch10: control-center-2.15.4-finish.patch
 Patch11: control-center-2.15.91-search.patch
+Patch12: control-center-2.15.90-fix-thumbnailing.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -133,6 +134,7 @@
 %patch9 -p1 -b .add-dbus-flags
 %patch10 -p1 -b .finish
 %patch11 -p1 -b .search
+%patch12 -p1 -b .fix-thumbnailing
 
 %build
 
@@ -270,6 +272,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Aug 18 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-4.fc6
+- Fix thumbnailing problem in background capplet (bug 185142)
+
 * Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-3.fc6
 - Make the search keybinding work with beagle
 


--- control-center-2.10.1-fix-popunder-bug.patch DELETED ---


--- control-center-2.10.1-icon.patch DELETED ---


--- control-center-2.11.5-fedora-apps.patch DELETED ---


--- control-center-2.11.6-xft.patch DELETED ---


--- control-center-2.11.91-dont-use-pango-xft.patch DELETED ---


--- control-center-2.11.91-fix-about-me-disablement.patch DELETED ---


--- control-center-2.12.0-help-left-handed-dual-mice-users.patch DELETED ---


--- control-center-2.12.1-fedora-apps.patch DELETED ---


--- control-center-2.12.1-gecos.patch DELETED ---


--- control-center-2.12.1-inputmethod.patch DELETED ---


--- control-center-2.12.1-login-photo.patch DELETED ---


--- control-center-2.13.3-gecos.patch DELETED ---


--- control-center-2.13.4-fedora-apps.patch DELETED ---


--- control-center-2.13.5-fedora-apps.patch DELETED ---


--- control-center-2.13.5-m4.patch DELETED ---


--- control-center-2.13.90-broken-es-help.patch DELETED ---


--- control-center-2.14.2-gecos.patch DELETED ---


--- control-center-2.7.1-helpfix.patch DELETED ---


--- control-center-2.7.1-modifier.patch DELETED ---


--- control-center-2.8.0-fedora-apps.patch DELETED ---


--- control-center-2.8.0-filesel.patch DELETED ---


--- control-center-2.8.0-install-icons.patch DELETED ---


--- control-center-2.8.0-urlhandler-keys.patch DELETED ---


--- control-center-2.9.4-fedora-apps.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 18 21:47:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 17:47:24 -0400
Subject: rpms/mesa/devel mesa.spec,1.85,1.86
Message-ID: <200608182147.k7ILlOjq015907@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15387

Modified Files:
	mesa.spec 
Log Message:
require libXp >= 1.0.0-6


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- mesa.spec	18 Aug 2006 21:18:05 -0000	1.85
+++ mesa.spec	18 Aug 2006 21:47:22 -0000	1.86
@@ -88,7 +88,7 @@
 BuildRequires: libselinux-devel
 %if %{with_libGLw}
 # FIXME: remove this when libGLw hits extras.
-BuildRequires: libXp-devel
+BuildRequires: libXp-devel >= 1.0.0-6
 BuildRequires: openmotif-devel
 %endif
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 22:10:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 18:10:43 -0400
Subject: rpms/mesa/devel mesa.spec,1.86,1.87
Message-ID: <200608182210.k7IMAh3g031281@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31266

Modified Files:
	mesa.spec 
Log Message:
remove the version req on libXp-devel


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mesa.spec	18 Aug 2006 21:47:22 -0000	1.86
+++ mesa.spec	18 Aug 2006 22:10:39 -0000	1.87
@@ -88,7 +88,7 @@
 BuildRequires: libselinux-devel
 %if %{with_libGLw}
 # FIXME: remove this when libGLw hits extras.
-BuildRequires: libXp-devel >= 1.0.0-6
+BuildRequires: libXp-devel
 BuildRequires: openmotif-devel
 %endif
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 22:20:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 18:20:56 -0400
Subject: rpms/libXp/devel libXp.spec,1.18,1.19
Message-ID: <200608182220.k7IMKuDl014259@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14231

Modified Files:
	libXp.spec 
Log Message:
* Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
- BuildRequire libtool, autoconf, automake





Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libXp.spec	18 Aug 2006 18:18:57 -0000	1.18
+++ libXp.spec	18 Aug 2006 22:20:42 -0000	1.19
@@ -27,6 +27,7 @@
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXau-devel
+BuildRequires: libtool automake autoconf gettext
 
 Obsoletes: XFree86-libs, xorg-x11-libs, xorg-x11-deprecated-libs
 
@@ -135,6 +136,9 @@
 
 %changelog
 * Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
+- BuildRequire autoconf automake libtool gettext
+
+* Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
 - Run autoreconf to make sure changes to configure.ac take effect
 
 * Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6



From fedora-cvs-commits at redhat.com  Fri Aug 18 22:26:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 18:26:55 -0400
Subject: rpms/dbus/devel dbus.spec,1.94,1.95
Message-ID: <200608182226.k7IMQtNa014355@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14341

Modified Files:
	dbus.spec 
Log Message:
- Remove the patch lines for the patches we no longer use



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- dbus.spec	18 Aug 2006 21:37:43 -0000	1.94
+++ dbus.spec	18 Aug 2006 22:26:52 -0000	1.95
@@ -30,9 +30,6 @@
 
 Patch2: dbus-0.61-selinux-avc-audit.patch
 Patch3: dbus-0.60-start-early.patch
-Patch4: dbus-0.90-remove-glib.patch
-Patch5: dbus-0.90-ref-unlocked.patch
-Patch6: dbus-0.90-fix-remove-timeout.patch
 
 %description
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 23:00:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 19:00:46 -0400
Subject: rpms/libXp/devel libXp.spec,1.19,1.20
Message-ID: <200608182300.k7IN0kPT012977@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12902

Modified Files:
	libXp.spec 
Log Message:
Remove printproto again


Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXp.spec	18 Aug 2006 22:20:42 -0000	1.19
+++ libXp.spec	18 Aug 2006 23:00:41 -0000	1.20
@@ -31,8 +31,6 @@
 
 Obsoletes: XFree86-libs, xorg-x11-libs, xorg-x11-deprecated-libs
 
-Patch1: proto-check.patch
-
 %description
 X.Org X11 libXp runtime library
 
@@ -53,9 +51,7 @@
 %endif
 
 %prep
-%setup -q -b0 -b1
-
-%patch1 -p1 -b .proto-check
+%setup -q
 
 # Disable static library creation by default.
 %define with_static 0
@@ -76,17 +72,9 @@
 %endif
 make
 
-pushd ../printproto-1.0.3
-%configure
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd ../printproto-1.0.3
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %if %{without_devel}
@@ -135,6 +123,9 @@
 %endif
 
 %changelog
+* Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com>
+- Remove printproto source. 
+
 * Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
 - BuildRequire autoconf automake libtool gettext
 



From fedora-cvs-commits at redhat.com  Fri Aug 18 23:39:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 19:39:52 -0400
Subject: rpms/libXp/devel add-proto-files.patch, NONE, 1.1 libXp.spec, 1.20,
	1.21 sources, 1.7, 1.8
Message-ID: <200608182339.k7INdqjd004848@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4824

Modified Files:
	libXp.spec sources 
Added Files:
	add-proto-files.patch 
Log Message:
Add the proto files directly instead of attempting to build a second tarball

add-proto-files.patch:
 Makefile.am      |    9 
 Print.h          |  552 ++++++++++++++++++++++++++++++++++++++
 Printstr.h       |  783 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac     |    3 
 printproto.pc.in |   10 
 5 files changed, 1354 insertions(+), 3 deletions(-)

--- NEW FILE add-proto-files.patch ---
--- /dev/null	2006-08-16 13:34:07.659756891 -0400
+++ libXp-1.0.0/printproto.pc.in	2006-08-18 19:28:36.000000000 -0400
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+ 
+Name: PrintProto
+Description: Print extension headers
+Version: @PACKAGE_VERSION@
+Requires: xau
+Cflags: -I${includedir}
--- /dev/null	2006-08-16 13:34:07.659756891 -0400
+++ libXp-1.0.0/Print.h	2006-08-18 19:28:36.000000000 -0400
@@ -0,0 +1,552 @@
+/* $Xorg: Print.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
+/******************************************************************************
+ ******************************************************************************
+ **
+ ** File:         Print.h
+ **
+ ** Description:  Definitions needed by the server, library, and
+ **               clients.  Subportion restricted to library and
+ **               clients.
+ **
+ **               Server, Library, Client portion has:
+ **                  o All sz_* defines
+ **                  o Revision and Name defines
+ **                  o Common defines and constants (e.g. Keywords, Masks)
+ **                  o Extension version structure
+ **               
+ **               Library and client subportion has:
+ **                  o Convience Marcos
+ **                  o Client side data structures
+ **                  o Client side event structures (non wire)
+ **                  o Library function prototypes
+ **                  o some private stuff denoted with _whatever
+ **
+ **               Printstr.h for server and library, but NOT clients.
+ **
+ ******************************************************************************
+ **
+ ** (c) Copyright 1996 Hewlett-Packard Company
+ ** (c) Copyright 1996 International Business Machines Corp.
+ ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996 Novell, Inc.
+ ** (c) Copyright 1996 Digital Equipment Corp.
+ ** (c) Copyright 1996 Fujitsu Limited
+ ** (c) Copyright 1996 Hitachi, Ltd.
+ ** 
+ ** Permission is hereby granted, free of charge, to any person obtaining a copy
+ ** of this software and associated documentation files (the "Software"), to deal
+ ** in the Software without restriction, including without limitation the rights
+ ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ ** copies of the Software, and to permit persons to whom the Software is
+ ** furnished to do so, subject to the following conditions:
+ **
+ ** The above copyright notice and this permission notice shall be included in
+ ** all copies or substantial portions of the Software.
+ **
+ ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ ** COPYRIGHT 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.
+ **
+ ** Except as contained in this notice, the names of the copyright holders shall
+ ** not be used in advertising or otherwise to promote the sale, use or other
+ ** dealings in this Software without prior written authorization from said
+ ** copyright holders.
+ **
+ ******************************************************************************
+ *****************************************************************************/
+/* $XFree86: xc/include/extensions/Print.h,v 1.4 2000/01/25 18:37:31 dawes Exp $ */
+
+#ifndef _XpPrint_H_
+#define _XpPrint_H_
+
+#ifndef _XP_PRINT_SERVER_
+#include <X11/Xlib.h>
+#include <X11/Xresource.h>
+#include <X11/Xauth.h>
+#endif /* _XP_PRINT_SERVER_ */
+
+#include <X11/Xfuncproto.h>
+
+_XFUNCPROTOBEGIN
+
+/******************************************************************************
+ *
+ * Definitions used by the server, library and client.
+ */
+
+/********************************************************************
+ *
+ * Naming and versioning information.
+ */
+#define XP_PRINTNAME  "XpExtension"
+
+/*
+ * Add a define below for each major extension release.
+ */
+#define XP_DONT_CHECK		0
+#define XP_INITIAL_RELEASE	1
+
+/*
+ * For each single entry above, create one major/minor pair.
+ */
+#define XP_PROTO_MAJOR		1
+#define XP_PROTO_MINOR		0
+
+/*
+ * Identify current version.
+ */
+#define XP_MAJOR_VERSION	XP_PROTO_MAJOR
+#define XP_MINOR_VERSION	XP_PROTO_MINOR
+
+/*
+ * Misc version defines.
+ */
+#define XP_ABSENT		0	/* Prior to XP Print support */
+#define XP_PRESENT		1	/* With XP Print support */
+
+/********************************************************************
+ *
+ * Xp Print Error codes.
+ */
+#define XP_ERRORS		3	/* number of error types */
+
+#define XPBadContext		0	/* Print Context invalid or missing */
+#define XPBadSequence		1	/* Illegal sequence of XP operations */
+#define XPBadResourceID		2	/* X-resource not valid */
+
+/********************************************************************
+ *
+ * Xp Print Event masks and codes.
+ *
+ */
+#define XP_EVENTS		2	/* number of event types */
+
+#define XPNoEventMask		0	/* not an event - just a null mask */
+#define XPPrintMask		(1L<<0)
+#define XPAttributeMask		(1L<<1)
+
+#define XPPrintNotify		0	/* contains "detail" - see below */
+#define XPAttributeNotify	1	/* contains "detail" - see below */
+
+#define XPStartJobNotify	0	/* value for "detail" in XPPrintNotify*/
+#define XPEndJobNotify		1
+#define XPStartDocNotify	2
+#define XPEndDocNotify		3
+#define XPStartPageNotify	4
+#define XPEndPageNotify		5
+
+/********************************************************************
+ *
+ * Xp Print Attribute Object codes (subset of ISO DPA 10175).  The
+ * Xp Server can get and set any of the values, while the Xp Library
+ * may only be able to set a subset of the attribute objects.
+ *
+ * note: the codes are also used as "detail" for XPAttributeNotify
+ *
+ * note: XPPageAttr is not defined in ISO DPA 10175.  It is unique
+ * to Xp, and its attributes are a proper subset of XPDocAttr.
+ */
+typedef unsigned char XPAttributes;	/* type of Xp*Attr codes */
+
+#define XP_ATTRIBUTES		5	/* those attrs currently supported */
+
+#define XPJobAttr		1	/* get/set */
+#define XPDocAttr		2	/* get/set */
+#define XPPageAttr		3	/* get/set - subset of XPDocAttr */
+#define XPPrinterAttr		4	/* get only (library) */
+#define XPServerAttr		5	/* get only (library), no
+					   context needed */
+
+/*
+ * note: ISO DPA 10175 defines a number of "attribute objects", of
+ *       which POSIX 1387.4 and the SI Xp will only support a
+ *       subset.
+ */
+#define XPMediumAttr		6	/* DPA-Object Medium */
+#define XPFontAttr		7	/* DPA-Object Font */
+#define XPResAttr		8	/* DPA-Object Resource */
+#define XPTransAttr		9	/* DPA-Object Transfer method */
+#define XPDelAttr		10	/* DPA-Object Delivery method */
+#define XPAuxSPkg		11	/* DPA-Object Auxiliary sheet package */
+#define XPAuxS			12	/* DPA-Object Auxiliary sheet */
+#define XPFinishAttr		13	/* DPA-Object Finishing */
+#define XPOutputAttr		14	/* DPA-Object Output method */
+#define XPImpAttr		15	/* DPA-Object Imposition */
+#define XPSchedAttr		16	/* DPA-Object Scheduler */
+#define XPIntJobAttr		17	/* DPA-Object Initial value job */
+#define XPIntDocAttr		18	/* DPA-Object Initial value document */
+#define XPResConAttr		19	/* DPA-Object Resource context */
+
+
+/*
+ * Replacement rules for XpSetAttributes
+ */
+typedef unsigned char XPAttrReplacement;
+#define	XPAttrReplace		1
+#define XPAttrMerge		2
+
+
+/*
+ * Return codes for XpGetDocumentData
+ */
+typedef unsigned char XPGetDocStatus;
+#define XPGetDocFinished	0	/* normal termination */
+#define XPGetDocSecondConsumer	1	/* setup error */
+#define XPGetDocError		2	/* runtime error, see generated error */
+
+
+/*
+ * Save data types for XpStartJob.
+ */
+typedef unsigned char XPSaveData;
+#define XPSpool			1	/* Job data sent to spooler */
+#define XPGetData		2	/* Job data via XpGetDocumentData */
+
+
+/*
+ * Document types for XpStartDoc.
+ */
+typedef unsigned char XPDocumentType;
+#define	XPDocNormal		1	/* Doc data handled by Xserver */
+#define	XPDocRaw		2	/* Doc data passed through Xserver */
+
+
+/********************************************************************
+ *
+ * Xp Print Property Names
+ */
+
+
+#ifndef _XP_PRINT_SERVER_
+
+/******************************************************************************
+ *
+ * Definitions used by the library and clients only.
+ */
+
+/*******************************************************************
+ *
+ * General API defines and such.
+ */
+
+/*
+ * Print Context for XpInitContext and related calls.
+ */
+typedef XID XPContext;
+
+/*
+ * Struct for XpGetPrinterList.
+ */
+typedef struct {
+    char	*name;		/* name */
+    char	*desc;		/* localized description */
+} XPPrinterRec, *XPPrinterList;
+
+/*
+ * Typedefs for XpGetDocumentData
+ */
+typedef void (*XPSaveProc)( Display *display,
+                            XPContext context,
+                            unsigned char *data,
+                            unsigned int data_len,
+                            XPointer client_data);
+
+typedef void (*XPFinishProc)( Display *display,
+                              XPContext context,
+                              XPGetDocStatus status,
+                              XPointer client_data);
+
+/*
+ * Typedefs for XpSetLocaleHinter and XpGetLocaleHinter
+ */
+typedef char * (*XPHinterProc)(void);
+
+#if 0
+/*******************************************************************
+ *
+ * Extension version structures.
+ *
+ **** this structure is now defined localy in the one file that uses it
+ **** in order to avoid clashes with its definition in XI.h
+ */
+typedef struct {
+        int     present;
+        short   major_version;
+        short   minor_version;
+} XExtensionVersion;
+#endif
+
+/********************************************************************
+ *
+ * Event structs for clients.
+ *
+ * note: these events are relative to a print context, and
+ * not to a window as in core X.
+ */
+typedef struct {
+    int            type;       /* base + XPPrintNotify */
+    unsigned long  serial;     /* # of last request processed by server */
+    Bool           send_event; /* true if from a SendEvent request */
+    Display        *display;   /* Display the event was read from */
+    XPContext      context;    /* print context where operation was requested */
+    Bool           cancel;     /* was detailed event canceled */
+    int            detail;     /* XPStartJobNotify, XPEndJobNotify,
+                                  XPStartDocNotify, XPEndDocNotify,
+                                  XPStartPageNotify, XPEndPageNotify */
+} XPPrintEvent;
+
+typedef struct {
+    int            type;       /* base + XPAttributeNotify */
+    unsigned long  serial;     /* # of last request processed by server */
+    Bool           send_event; /* true if from a SendEvent request */
+    Display        *display;   /* Display the event was read from */
+    XPContext      context;    /* print context where operation was requested */
+    int            detail;     /* XPJobAttr, XPDocAttr, XPPageAttr,
+                                  XPPrinterAttr, XPSpoolerAttr,
+                                  XPMediumAttr, XPServerAttr */
+} XPAttributeEvent;
+
+typedef struct {
+    int            type;       /* base + XPDataReadyNotify */
+    unsigned long  serial;     /* # of last request processed by server */
+    Bool           send_event; /* true if from a SendEvent request */
+    Display        *display;   /* Display the event was read from */
+    XPContext      context;    /* print context where operation was requested */
+    unsigned long  available;  /* bytes available for retrieval */
+} XPDataReadyEvent;
+
+
+/**********************************************************
+ *
+ * Function prototypes for library side.
+ */
+
+extern XPContext XpCreateContext (
+    Display		*display,
+    char		*printer_name
+);
+
+extern void XpSetContext (
+    Display		*display,
+    XPContext     	print_context
+);
+
+extern XPContext XpGetContext (
+    Display		*display
+);
+
+extern void XpDestroyContext (
+    Display		*display,
+    XPContext     	print_context
+);
+
+extern Screen *XpGetScreenOfContext (
+    Display		*display,
+    XPContext     	print_context
+);
+
+extern Status XpGetPageDimensions (
+    Display		*display,
+    XPContext     	print_context,
+    unsigned short	*width,			/* return value */
+    unsigned short	*height,		/* return value */
+    XRectangle		*reproducible_area	/* return value */
+);
+
+extern void XpStartJob (
+    Display		*display,
+    XPSaveData		save_data
+);
+
+extern void XpEndJob (
+    Display		*display
+);
+
+extern void XpCancelJob (
+    Display		*display,
+    Bool		discard
+);
+
+extern void XpStartDoc (
+    Display		*display,
+    XPDocumentType	type
+);
+
+extern void XpEndDoc (
+    Display		*display
+);
+
+extern void XpCancelDoc (
+    Display		*display,
+    Bool		discard
+);
+
+extern void XpPutDocumentData (
+    Display		*display,
+    Drawable		drawable,
+    unsigned char	*data,
+    int			data_len,
+    char		*doc_fmt,
+    char		*options
+);
+
+extern Status XpGetDocumentData (
+    Display		*display,
+    XPContext		context,
+    XPSaveProc		save_proc,
+    XPFinishProc	finish_proc,
+    XPointer		client_data
+);
+
+extern void XpStartPage (
+    Display		*display,
+    Window		window
+);
+
+extern void XpEndPage (
+    Display		*display
+);
+
+extern void XpCancelPage (
+    Display		*display,
+    Bool		discard
+);
+
+extern void XpSelectInput (
+    Display		*display,
+    XPContext     	print_context,
+    unsigned long	event_mask
+);
+
+extern unsigned long XpInputSelected (
+    Display		*display,
+    XPContext     	print_context,
+    unsigned long	*all_events_mask
+);
+
+extern Bool XpSetImageResolution (
+    Display		*display,
+    XPContext     	print_context,
+    int			image_res,
+    int			*prev_res
+);
+
+extern int XpGetImageResolution (
+    Display		*display,
+    XPContext     	print_context
+);
+
+extern char *XpGetAttributes (
+    Display		*display,
+    XPContext     	print_context,
+    XPAttributes	type
+);
+
+extern void XpSetAttributes (
+    Display		*display,
+    XPContext     	print_context,
+    XPAttributes	type,
+    char		*pool,
+    XPAttrReplacement	replacement_rule
+);
+
+extern char *XpGetOneAttribute (
+    Display		*display,
+    XPContext     	print_context,
+    XPAttributes	type,
+    char		*attribute_name
+);
+
+extern XPPrinterList XpGetPrinterList (
+    Display		*display,
+    char		*printer_name,
+    int			*list_count		/* return value */
+);
+
+extern void XpFreePrinterList (
+    XPPrinterList	printer_list
+);
+
+extern void XpRehashPrinterList (
+    Display		*display
+);
+
+extern Status XpQueryVersion (
+    Display		*display,
+    short		*major_version,		/* return value */
+    short		*minor_version		/* return value */
+);
+
+extern Bool XpQueryExtension (
+    Display		*display,
+    int			*event_base_return,	/* return value */
+    int			*error_base_return	/* return value */
+);
+
+extern Screen **XpQueryScreens (
+    Display		*display,
+    int			*list_count		/* return value */
+);
+
+extern Status XpGetPdmStartParams (
+    Display		*print_display,
+    Window		print_window,
+    XPContext		print_context,
+    Display		*video_display,
+    Window		video_window,
+    Display		**selection_display,	/* return value */
+    Atom		*selection,		/* return value */
+    Atom		*type,			/* return value */
+    int			*format,		/* return value */
+    unsigned char	**data,			/* return value */
+    int			*nelements		/* return value */
+);
+
+extern Status XpGetAuthParams (
+    Display		*print_display,
+    Display		*video_display,
+    Display		**selection_display,	/* return value */
+    Atom		*selection,		/* return value */
+    Atom		*target			/* return value */
+);
+
+extern Status XpSendAuth (
+    Display		*display,
+    Window		window
+);
+
+extern Status XpSendOneTicket (
+    Display		*display,
+    Window		window,
+    Xauth		*ticket,
+    Bool		more
+);
+
+extern void XpSetLocaleHinter (
+    XPHinterProc hinter_proc,
+    char         *hinter_desc
+);
+
+extern char *XpGetLocaleHinter (
+    XPHinterProc *hinter_proc
+);
+
+extern char *XpGetLocaleNetString(void);
+
+extern char *XpNotifyPdm (
+    Display		*print_display,
+    Window		print_window,
+    XPContext     	print_context,
+    Display		*video_display,
+    Window		video_window,
+    Bool		auth_flag
+);
+
+#endif /* _XP_PRINT_SERVER_ */
+
+_XFUNCPROTOEND
+
+#endif /* _XpPrint_H_ */
--- /dev/null	2006-08-16 13:34:07.659756891 -0400
+++ libXp-1.0.0/Printstr.h	2006-08-18 19:28:36.000000000 -0400
@@ -0,0 +1,783 @@
+/* $Xorg: Printstr.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
+/******************************************************************************
+ ******************************************************************************
+ **
+ ** File:         Printstr.h
+ **
+ ** Description: Definitions needed by the server and library, but
+ **              not clients.
+ **
+ **              Print.h for server, library and clients.
+ **
+ ******************************************************************************
+ **
+ ** (c) Copyright 1996 Hewlett-Packard Company
+ ** (c) Copyright 1996 International Business Machines Corp.
+ ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996 Novell, Inc.
+ ** (c) Copyright 1996 Digital Equipment Corp.
+ ** (c) Copyright 1996 Fujitsu Limited
+ ** (c) Copyright 1996 Hitachi, Ltd.
+ ** 
+ ** Permission is hereby granted, free of charge, to any person obtaining a copy
+ ** of this software and associated documentation files (the "Software"), to deal
+ ** in the Software without restriction, including without limitation the rights
+ ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ ** copies of the Software, and to permit persons to whom the Software is
+ ** furnished to do so, subject to the following conditions:
+ **
+ ** The above copyright notice and this permission notice shall be included in
+ ** all copies or substantial portions of the Software.
+ **
+ ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ ** COPYRIGHT 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.
+ **
+ ** Except as contained in this notice, the names of the copyright holders shall
+ ** not be used in advertising or otherwise to promote the sale, use or other
+ ** dealings in this Software without prior written authorization from said
+ ** copyright holders.
+ **
+ ******************************************************************************
+ *****************************************************************************/
+/* $XFree86: xc/include/extensions/Printstr.h,v 1.5 2001/08/01 00:44:35 tsi Exp $ */
+
+
+#ifndef _XpPrintstr_H_
+#define _XpPrintstr_H_
+
+/*
+ * NEED_EVENTS and NEED_REPLIES are hacks to limit the linker symbol-table
+ * size.   When function prototypes are needed from Print.h, this sets up
+ * a cascading dependency on Printstr.h and eventually Xproto.h to provide
+ * the event and reply struct definitions.
+ */
+#ifndef NEED_EVENTS
+#define NEED_EVENTS
+#endif /* NEED_EVENTS */
+
+#define NEED_REPLIES
+
+#include <X11/Xproto.h>
+#ifndef _XP_PRINT_SERVER_
+#include <X11/Xlib.h>
+#endif /* _XP_PRINT_SERVER_ */
+
+/*
+ * Pull in other definitions.  Print.h will hide some things if we're
+ * doing server side work.
+ */
+#include <X11/extensions/Print.h>
+
+#include <X11/Xfuncproto.h>
+
+_XFUNCPROTOBEGIN
+
+/******************************************************************************
+ *
+ * Protocol requests constants and alignment values
+ *
+ * Note: Xlib macro's expect X_ABC where ABC is the name of the
+ * protocol request.
+ */
+#define X_PrintQueryVersion		0
+#define X_PrintGetPrinterList		1
+#define X_PrintCreateContext		2
+#define X_PrintSetContext		3
+#define X_PrintGetContext		4
+#define X_PrintDestroyContext		5
+#define X_PrintGetContextScreen		6
+#define X_PrintStartJob			7
+#define X_PrintEndJob			8
+#define X_PrintStartDoc			9
+#define X_PrintEndDoc			10
+#define X_PrintPutDocumentData		11
+#define X_PrintGetDocumentData		12
+#define X_PrintStartPage		13
+#define X_PrintEndPage			14
+#define X_PrintSelectInput		15
+#define X_PrintInputSelected		16
+#define X_PrintGetAttributes		17
+#define X_PrintSetAttributes		18
+#define X_PrintGetOneAttribute		19
+#define X_PrintRehashPrinterList	20
+#define X_PrintGetPageDimensions	21
+#define X_PrintQueryScreens		22
+#define X_PrintSetImageResolution	23
+#define X_PrintGetImageResolution	24
+
+/********************************************************************
+ *
+ * Protocol data types
+ */
+#define PCONTEXT CARD32
+#define WINDOW   CARD32
+#define DRAWABLE CARD32
+#define BITMASK  CARD32
+
+/******************************************************************************
+ *
+ * Event wire struct definitions
+ *
+ * Note: Xlib macro's expect xABC struct names and sz_xABC size
+ * constants where ABC is the name of the protocol request.
+ */
+
+
+/*********************************************************************
+ *
+ * Events.
+ *
+ * See Print.h for the protocol "type" values.
+ */
+typedef struct _xPrintPrintEvent {
+	BYTE type;		/* XPPrintNotify + extEntry->eventBase */
+	BYTE detail;		/* XPStartJobNotify, XPEndJobNotify,
+				   XPStartDocNotify, XPEndDocNotify,
+				   XPStartPageNotify, XPEndPageNotify */
+	CARD16 sequenceNumber B16;
+	PCONTEXT printContext B32; /* print context */
+	BOOL   cancel;		/* canceled flag */
+	CARD8  pad1;		/* rest is unused */
+	CARD16 pad2 B16;
+	CARD32 pad3 B32;
+	CARD32 pad4 B32;
+	CARD32 pad5 B32;
+	CARD32 pad6 B32;
+	CARD32 pad7 B32;
+} xPrintPrintEvent;
+#define sz_xPrintPrintEvent 32;
+
+typedef struct _xPrintAttributeEvent {
+	BYTE   type;		/* XPAttributeNotify + extEntry->eventBase */
+	BYTE   detail;		/* XPJobAttr, XPDocAttr, XPPageAttr,
+				   XPPrinterAttr, XPSpoolerAttr,
+				   XPMediumAttr, XPServerAttr */
+	CARD16 sequenceNumber B16;
+	PCONTEXT printContext B32; /* print context */
+	CARD32 pad1 B32;
+	CARD32 pad2 B32;
+	CARD32 pad3 B32;
+	CARD32 pad4 B32;
+	CARD32 pad5 B32;
+	CARD32 pad6 B32;
+} xPrintAttributeEvent;
+#define sz_xPrintAttributeEvent 32;
+
+
+/*********************************************************************
+ *
+ * Requests
+ */
+typedef struct _PrintQueryVersion {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintQueryVersion */
+	CARD16	length B16;
+} xPrintQueryVersionReq;
+#define sz_xPrintQueryVersionReq	4
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	CARD16	majorVersion B16;	/* major version of Xp protocol */
+	CARD16	minorVersion B16;	/* minor version of Xp protocol */
+	CARD32	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+	CARD32	pad5 B32;
+} xPrintQueryVersionReply;
+#define sz_xPrintQueryVersionReply	32
+
+
+typedef struct _PrintGetPrinterList {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintGetPrinterList */
+	CARD16	length B16;
+	CARD32	printerNameLen B32;	/* length of printer name */
+	CARD32	localeLen B32;		/* length of locale string */
+
+	/* variable portion *****************************************
+	STRING8	printerName;		 * printer name *
+	BYTE	pad(printerNameLen)	 * unused *
+	STRING8	locale;			 * locale *
+	BYTE	pad(localeLen)		 * unused *
+	************************************************************/
+} xPrintGetPrinterListReq;
+#define sz_xPrintGetPrinterListReq	12
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	CARD32	listCount B32;		/* of PRINTER recs below */
+	CARD32	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+	CARD32	pad5 B32;
+
+	/* variable portion *****************************************
+	CARD32	nameLen B32;		* length of name in bytes *
+	STRING8	name;			* name *
+	BYTE	pad(nameLen)		* unused *
+
+	CARD32	descLen B32;		* length of desc in bytes *
+	STRING8	desc;			* localized description *
+	BYTE	pad(descLen)		* unused *
+	************************************************************/
+} xPrintGetPrinterListReply;
+#define sz_xPrintGetPrinterListReply	32
+
+
+typedef struct _PrintRehashPrinterList {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintRehashPrinterList */
+	CARD16	length B16;
+} xPrintRehashPrinterListReq;
+#define sz_xPrintRehashPrinterListReq	4
+
+
+typedef struct _PrintCreateContext {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintInitSetContext */
+	CARD16	length B16;
+	CARD32	contextID B32;		/* ID for context */
+	CARD32	printerNameLen B32;	/* length of printerName in bytes */
+	CARD32	localeLen B32;		/* length of locale in bytes */
+
+	/* variable portion *****************************************
+	STRING8	printerName		 * printer name *
+	BYTE	pad(printerNameLen)	 * unused *
+	STRING8	locale			 * locale *
+	BYTE	pad(locale)		 * unused *
+	************************************************************/
+} xPrintCreateContextReq;		
+#define sz_xPrintCreateContextReq	16
+
+
+typedef struct _PrintSetContext {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintSetContext */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+} xPrintSetContextReq;		
+#define sz_xPrintSetContextReq		8
+
+
+typedef struct _PrintGetContext {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintGetContext */
+	CARD16	length B16;
+} xPrintGetContextReq;		
+#define sz_xPrintGetContextReq		4
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	PCONTEXT printContext B32;	/* print context */
+	CARD32	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+	CARD32	pad5 B32;
+} xPrintGetContextReply;
+#define sz_xPrintGetContextReply	32
+
+
+typedef struct _PrintDestroyContext {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintDestroyContext */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+} xPrintDestroyContextReq;		
+#define sz_xPrintDestroyContextReq	8
+
+
+typedef struct _PrintGetContextScreen {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintGetContextScreen */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+} xPrintGetContextScreenReq;		
+#define sz_xPrintGetContextScreenReq	8
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	WINDOW  rootWindow;		/* screenPtr represented as rootWin */
+	CARD32	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+	CARD32	pad5 B32;
+} xPrintGetContextScreenReply;
+#define sz_xPrintGetContextScreenReply	32
+
+
+typedef struct _PrintStartJob {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintStartJob */
+	CARD16	length B16;
+	CARD8	saveData;		/* save data boolean */
+	CARD8	pad1;
+	CARD16	pad2 B16;
+} xPrintStartJobReq;		
+#define sz_xPrintStartJobReq		8
+
+typedef struct _PrintEndJob {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintEndJob */
+	CARD16	length B16;
+	BOOL	cancel;			/* cancel boolean */
+	CARD8	pad1;
+	CARD16	pad2 B16;
+} xPrintEndJobReq;
+#define sz_xPrintEndJobReq		8
+
+
+typedef struct _PrintStartDoc {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintStartDoc */
+	CARD16	length B16;
+	CARD8	type;			/* type for document */
+	CARD8	pad1;
+	CARD16	pad2 B16;
+} xPrintStartDocReq;		
+#define sz_xPrintStartDocReq		8
+
+typedef struct _PrintEndDoc {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintEndDoc */
+	CARD16	length B16;
+	BOOL	cancel;			/* cancel boolean */
+	CARD8	pad1;
+	CARD16	pad2 B16;
+} xPrintEndDocReq;
+#define sz_xPrintEndDocReq		8
+
+
+typedef struct _PrintPutDocumentData {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintPutDocumentData */
+	CARD16	length B16;
+	DRAWABLE drawable B32;		/* target drawable */
+	CARD32	len_data B32;		/* big len in bytes */
+	CARD16	len_fmt;		/* len in bytes */
+	CARD16	len_options;		/* len in bytes */
+
+	/* variable portion *****************************************
+	LISTofBYTE	data;		 * data *
+	BYTE		pad(len_data)	 * unused *
+	STRING8		doc_fmt;	 * ISO compliant desc of data type *
+	BYTE		pad(len_fmt)	 * unused *
+	STRING8		options;	 * additional device-dependent desc *
+	BYTE		pad(len_options) * unused *
+	************************************************************/
+} xPrintPutDocumentDataReq;
+#define sz_xPrintPutDocumentDataReq	16
+
+
+typedef struct _PrintGetDocumentData {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintGetDocumentData */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+	CARD32	maxBufferSize B32;	/* maximum buffer size requested */
+} xPrintGetDocumentDataReq;		
+#define sz_xPrintGetDocumentDataReq	12
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	CARD32	statusCode B32;		/* status code for reply */
+	CARD32	finishedFlag B32;	/* is this the last reply */
+	CARD32	dataLen B32;		/* data length */
+	CARD32	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+
+	/* variable portion *****************************************
+	LISTofBYTE	data;		 * data *
+	BYTE		pad(count)	 * unused *
+	************************************************************/
+} xPrintGetDocumentDataReply;
+#define sz_xPrintGetDocumentDataReply	32
+
+
+typedef struct _PrintStartPage {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintStartPage */
+	CARD16	length B16;
+	WINDOW	window B32;		/* window */
+} xPrintStartPageReq;		
+#define sz_xPrintStartPageReq		8
+
+typedef struct _PrintEndPage {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintEndPage */
+	CARD16	length B16;
+	BOOL	cancel;			/* cancel boolean */
+	CARD8	pad1;
+	CARD16	pad2 B16;
+} xPrintEndPageReq;
+#define sz_xPrintEndPageReq		8
+
+
+typedef struct _PrintSelectInput {
+        CARD8   reqType;        	/* always PrintReqCode */
+	CARD8   printReqType;		/* always X_PrintSelectInput */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+	BITMASK	eventMask B32;
+} xPrintSelectInputReq;
+#define sz_xPrintSelectInputReq		12
+
+
+typedef struct _PrintInputSelected {
+        CARD8   reqType;        	/* always PrintReqCode */
+	CARD8   printReqType;		/* always X_PrintInputSelected */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+} xPrintInputSelectedReq;
+#define sz_xPrintInputSelectedReq	8
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	BITMASK	eventMask B32;		/* your event mask */
+	BITMASK	allEventsMask B32;	/* all event mask */
+	CARD32	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+} xPrintInputSelectedReply;
+#define sz_xPrintInputSelectedReply	32
+
+typedef struct _PrintGetAttributes {
+        CARD8   reqType;        	/* always PrintReqCode */
+	CARD8   printReqType;		/* always X_PrintGetAttributes */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+        CARD8   type;			/* type */
+        CARD8   pad1;			/* unused */
+        CARD16  pad2 B16;		/* unused */
+} xPrintGetAttributesReq;
+#define sz_xPrintGetAttributesReq	12
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	CARD32	stringLen B32;		/* length of xrm db string */
+	CARD32	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+	CARD32	pad5 B32;
+
+        /* variable portion *****************************************
+	STRING8	string;                  * xrm db as a string *
+	BYTE	pad(stringLen)           * unused *
+        ************************************************************/
+} xPrintGetAttributesReply;
+#define sz_xPrintGetAttributesReply	32
+
+
+typedef struct _PrintSetAttributes {
+        CARD8   reqType;        	/* always PrintReqCode */
+	CARD8   printReqType;		/* always X_PrintSetAttributes */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+	CARD32	stringLen B32;		/* length of xrm db string */
+        CARD8   type;                   /* type */
+	CARD8   rule;			/* replacement rule */
+	CARD16  pad1 B16;		/* unused */
+
+        /* variable portion *****************************************
+	STRING8	string;                  * xrm db as a string *
+	BYTE	pad(stringLen)           * unused *
+        ************************************************************/
+} xPrintSetAttributesReq;
+#define sz_xPrintSetAttributesReq	16
+
+
+typedef struct _PrintGetOneAttribute {
+        CARD8   reqType;        	/* always PrintReqCode */
+	CARD8   printReqType;		/* always X_PrintGetOneAttribute */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+	CARD32	nameLen;		/* length of name string */
+        CARD8   type;			/* type */
+        CARD8   pad1;			/* unused */
+        CARD16  pad2 B16;		/* unused */
+
+        /* variable portion *****************************************
+	STRING8	name;			 * name as a string *
+	BYTE	pad(name)		 * unused *
+        ************************************************************/
+} xPrintGetOneAttributeReq;
+#define sz_xPrintGetOneAttributeReq	16
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	CARD32	valueLen B32;		/* length of value string */
+	CARD32	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+	CARD32	pad5 B32;
+
+        /* variable portion *****************************************
+	STRING8	value;			 * value as a string *
+	BYTE	pad(value)		 * unused *
+        ************************************************************/
+} xPrintGetOneAttributeReply;
+#define sz_xPrintGetOneAttributeReply	32
+
+
+typedef struct _PrintGetPageDimensions {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintGetPageDimensions */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+} xPrintGetPageDimensionsReq;		
+#define sz_xPrintGetPageDimensionsReq	8
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	CARD16	width;			/* total pixel width */
+	CARD16	height;			/* total pixel height */
+	CARD16	rx;			/* reproducable x pixel offset */
+	CARD16	ry;			/* reproducable y pixel offset */
+	CARD16	rwidth;			/* reproducable x pixel width */
+	CARD16	rheight;		/* reproducable y pixel width */
+	CARD32	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+} xPrintGetPageDimensionsReply;
+#define sz_xPrintGetPageDimensionsReply	32
+
+
+typedef struct _PrintQueryScreens {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintQueryScreens */
+	CARD16	length B16;
+} xPrintQueryScreensReq;		
+#define sz_xPrintQueryScreensReq	4
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;			/* not used */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	CARD32	listCount;		/* number of screens following */
+	CARD32	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+	CARD32	pad5 B32;
+
+        /* variable portion *****************************************
+	WINDOW	rootWindow;		 * root window of screen *
+        ************************************************************/
+} xPrintQueryScreensReply;
+#define sz_xPrintQueryScreensReply	32
+
+typedef struct _PrintSetImageResolution {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintSetImageResolution */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+	CARD16 imageRes B16;		/* image resolution */
+	CARD16 pad1 B16;
+} xPrintSetImageResolutionReq;
+#define sz_xPrintSetImageResolutionReq	12
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	BOOL	status;			/* accepted or not */
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	CARD16	prevRes B16;		/* previous resolution */
+	CARD16	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+	CARD32	pad5 B32;
+	CARD32	pad6 B32;
+} xPrintSetImageResolutionReply;
+#define sz_xPrintSetImageResolutionReply 32
+
+typedef struct _PrintGetImageResolution {
+	CARD8	reqType;		/* always PrintReqCode */
+	CARD8	printReqType;		/* always X_PrintGetImageResolution */
+	CARD16	length B16;
+	PCONTEXT printContext B32;	/* print context */
+} xPrintGetImageResolutionReq;
+#define sz_xPrintGetImageResolutionReq	8
+
+typedef struct {
+	BYTE	type;			/* X_Reply */
+	CARD8	unused;
+	CARD16	sequenceNumber B16;
+	CARD32	length B32;
+	CARD16	imageRes B16;		/* image resolution */
+	CARD16	pad1 B32;
+	CARD32	pad2 B32;
+	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+	CARD32	pad5 B32;
+	CARD32	pad6 B32;
+} xPrintGetImageResolutionReply;
+#define sz_xPrintGetImageResolutionReply 32
+
+#ifndef _XP_PRINT_SERVER_
+/***********************************************************************
+ *
+ * Library-only definitions.
+ */
+extern XPHinterProc  _xp_hinter_proc;
+extern char         *_xp_hinter_desc;
+extern int           _xp_hinter_init;
+
+#else /* _XP_PRINT_SERVER_ */
+
+/***********************************************************************
+ *
+ * Server-only definitions shared between the extension and DDX layers.
+ *
+ */
+ 
+/*
+ * Internal return code used to indicate that the requesting
+ * client has been suspended.
+ */
+#define Suspended 84
+
+struct _XpContext;
+
+extern void XpRegisterPrinterScreen(
+    ScreenPtr pScreen,
+    int (*CreateContext)(struct _XpContext *));
+
+typedef struct _xpprintFuncs {
+    int (*StartJob)(
+	struct _XpContext *	/* pContext */,
+	Bool			/* sendClientData */,
+	ClientPtr		/* client */);
+    int (*EndJob)(struct _XpContext *, int);
+    int (*StartDoc)(
+	struct _XpContext *	/* pContext */,
+	XPDocumentType		/* type */);
+    int (*EndDoc)(struct _XpContext *, int);
+    int (*StartPage)(
+	struct _XpContext *	/* pContext */,
+	WindowPtr		/* pWin */);
+    int (*EndPage)(
+	struct _XpContext *	/* pContext */,
+	WindowPtr		/* pWin */);
+    int (*PutDocumentData)(
+	struct _XpContext *	/* pContext */,
+    	DrawablePtr		/* pDraw */,
+	char *			/* pData */,
+	int			/* len_data */,
+	char *			/* pDoc_fmt */,
+	int			/* len_fmt */,
+	char *			/* pOptions */,
+	int			/* len_options */,
+	ClientPtr		/* client */);
+    int (*GetDocumentData)(
+	struct _XpContext *	/* pContext */,
+	ClientPtr		/* client */,
+	int			/* maxBufferSize */);
+    int (*DestroyContext)(
+	struct _XpContext *);	/* pContext */
+    char *(*GetAttributes)(
+	struct _XpContext *,
+	XPAttributes 		/* pool */);
+    char *(*GetOneAttribute)(
+	struct _XpContext *	/* pContext */,
+	XPAttributes 		/* pool */,
+	char *			/* attrs */);
+    int (*SetAttributes)(
+	struct _XpContext *	/* pContext */,
+	XPAttributes 		/* pool */,
+	char *			/* attrs */);
+    int (*AugmentAttributes)(
+	struct _XpContext *	/* pContext */,
+	XPAttributes 		/* pool */,
+	char *			/* attrs */);
+    int (*GetMediumDimensions)(
+	struct _XpContext *	/* pPrintContext */,
+	CARD16 *		/* pWidth */,
+	CARD16 *		/* pHeight */);
+    int (*GetReproducibleArea)(
+	struct _XpContext *	/* pPrintContext */,
+	xRectangle *		/* pRect */);
+    int (*SetImageResolution)(
+	struct _XpContext *	/* pPrintContext */,
+	int			/* imageRes */,
+	Bool *			/* pStatus */);
+} XpDriverFuncs, *XpDriverFuncsPtr;
+
+/*
+ * Each print context is represented by one of the following structs
+ * associated with a resource ID of type RTcontext .  A pointer to
+ * the context is placed in the Xp extension's devPrivates
+ * element in each client * which establishes a context via
+ * either initContext or setContext.
+ * The context pointer is also placed in the struct indicated by the
+ * RTpage resource associated with each StartPage'd window.
+ */
+typedef struct _XpContext {
+        XID contextID;
+        char *printerName;
+        int screenNum;          /* screen containing the printer */
+        struct _XpClient *clientHead; /* list of clients */
+        CARD32 state;
+        VisualID pageWin;
+        DevUnion *devPrivates;
+        XpDriverFuncs funcs;
+	ClientPtr clientSlept;
+	int imageRes;
+} XpContextRec, *XpContextPtr;
+
+#include <X11/fonts/fontstruct.h>	/* FontResolutionPtr */
+
+extern Bool XpAllocateContextPrivate(int, unsigned);
+extern FontResolutionPtr XpGetClientResolutions(ClientPtr, int *);
+extern XpContextPtr XpContextOfClient(ClientPtr);
+extern XpContextPtr XpGetPrintContext(ClientPtr);
+extern int XpAllocateContextPrivateIndex(void);
+extern int XpRehashPrinterList(void);
+extern void XpSetFontResFunc(ClientPtr);
+extern void XpUnsetFontResFunc(ClientPtr);
+extern void XpRegisterInitFunc(ScreenPtr, char *, int (*)(struct _XpContext *));
+
+#endif /* _XP_PRINT_SERVER_ */
+
+_XFUNCPROTOEND
+
+#endif /* _XpPrintstr_H_ */
--- libXp-1.0.0/Makefile.am.add-proto-files	2005-05-18 16:33:36.000000000 -0400
+++ libXp-1.0.0/Makefile.am	2006-08-18 19:28:36.000000000 -0400
@@ -25,7 +25,12 @@
 
 SUBDIRS = src man
 
+printdir = $(includedir)/X11/extensions
+print_HEADERS = \
+        Print.h \
+        Printstr.h
+
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xp.pc
+pkgconfig_DATA = xp.pc printproto.pc
 
-EXTRA_DIST = xp.pc.in autogen.sh
+EXTRA_DIST = xp.pc.in printproto.pc.in autogen.sh
--- libXp-1.0.0/configure.ac.add-proto-files	2005-12-14 19:24:30.000000000 -0500
+++ libXp-1.0.0/configure.ac	2006-08-18 19:29:20.000000000 -0400
@@ -36,7 +36,7 @@
 AC_PROG_LIBTOOL
 
 # Check for X and print proto
-PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto)
+PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau)
 
 AC_SUBST(XPRINT_CFLAGS)
 AC_SUBST(XPRINT_LIBS)
@@ -48,5 +48,6 @@
 AC_OUTPUT([Makefile
 	   src/Makefile
 	   man/Makefile
+	   printproto.pc
            xp.pc])
 


Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libXp.spec	18 Aug 2006 23:00:41 -0000	1.20
+++ libXp.spec	18 Aug 2006 23:39:49 -0000	1.21
@@ -31,6 +31,8 @@
 
 Obsoletes: XFree86-libs, xorg-x11-libs, xorg-x11-deprecated-libs
 
+Patch0: add-proto-files.patch
+
 %description
 X.Org X11 libXp runtime library
 
@@ -53,6 +55,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .add-proto-files
+
 # Disable static library creation by default.
 %define with_static 0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Aug 2006 03:36:42 -0000	1.7
+++ sources	18 Aug 2006 23:39:49 -0000	1.8
@@ -1,2 +1 @@
 0f4ac39108c1ae8c443cdfac259b58fa  libXp-1.0.0.tar.bz2
-0f4e7982c6d4ec3b2cf38502dd1293a3  printproto-1.0.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 18 23:45:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 19:45:48 -0400
Subject: rpms/libXp/devel libXp.spec,1.21,1.22
Message-ID: <200608182345.k7INjmkw005936@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5693

Modified Files:
	libXp.spec 
Log Message:
Remove last traces of printproto-1.0.3.tar.gz



Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libXp.spec	18 Aug 2006 23:39:49 -0000	1.21
+++ libXp.spec	18 Aug 2006 23:45:34 -0000	1.22
@@ -19,7 +19,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/proto/printproto-1.0.3.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -127,6 +126,10 @@
 %endif
 
 %changelog
+* Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
+- Add the proto files directly instead of attempting to build a separate
+  tarball. Also remove last traces of printproto-1.0.3.tar.gz
+
 * Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com>
 - Remove printproto source. 
 



From fedora-cvs-commits at redhat.com  Sat Aug 19 00:04:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 20:04:50 -0400
Subject: rpms/libXp/devel add-proto-files.patch,1.1,1.2
Message-ID: <200608190004.k7J04oPF026894@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26869

Modified Files:
	add-proto-files.patch 
Log Message:
Put the include files under include/X11/extensions

add-proto-files.patch:
 Makefile.am                       |    9 
 configure.ac                      |    3 
 include/X11/extensions/Print.h    |  552 ++++++++++++++++++++++++++
 include/X11/extensions/Printstr.h |  783 ++++++++++++++++++++++++++++++++++++++
 printproto.pc.in                  |   10 
 src/Makefile.am                   |    2 
 6 files changed, 1355 insertions(+), 4 deletions(-)

Index: add-proto-files.patch
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/add-proto-files.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- add-proto-files.patch	18 Aug 2006 23:39:49 -0000	1.1
+++ add-proto-files.patch	19 Aug 2006 00:04:47 -0000	1.2
@@ -1,5 +1,5 @@
 --- /dev/null	2006-08-16 13:34:07.659756891 -0400
-+++ libXp-1.0.0/printproto.pc.in	2006-08-18 19:28:36.000000000 -0400
++++ libXp-1.0.0/printproto.pc.in	2006-08-18 20:01:28.000000000 -0400
 @@ -0,0 +1,10 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -11,8 +11,54 @@
 +Version: @PACKAGE_VERSION@
 +Requires: xau
 +Cflags: -I${includedir}
+--- libXp-1.0.0/Makefile.am.add-proto-files	2005-05-18 16:33:36.000000000 -0400
++++ libXp-1.0.0/Makefile.am	2006-08-18 20:01:28.000000000 -0400
+@@ -25,7 +25,12 @@
+ 
+ SUBDIRS = src man
+ 
++printdir = $(includedir)/X11/extensions
++print_HEADERS = \
++        $(top_srcdir)/include/X11/extensions/Print.h \
++        $(top_srcdir)/include/X11/extensions/Printstr.h
++
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = xp.pc
++pkgconfig_DATA = xp.pc printproto.pc
+ 
+-EXTRA_DIST = xp.pc.in autogen.sh
++EXTRA_DIST = xp.pc.in printproto.pc.in autogen.sh
+--- libXp-1.0.0/configure.ac.add-proto-files	2005-12-14 19:24:30.000000000 -0500
++++ libXp-1.0.0/configure.ac	2006-08-18 20:01:28.000000000 -0400
+@@ -36,7 +36,7 @@
+ AC_PROG_LIBTOOL
+ 
+ # Check for X and print proto
+-PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto)
++PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau)
+ 
+ AC_SUBST(XPRINT_CFLAGS)
+ AC_SUBST(XPRINT_LIBS)
+@@ -48,5 +48,6 @@
+ AC_OUTPUT([Makefile
+ 	   src/Makefile
+ 	   man/Makefile
++	   printproto.pc
+            xp.pc])
+ 
+--- libXp-1.0.0/src/Makefile.am.add-proto-files	2005-12-02 23:41:50.000000000 -0500
++++ libXp-1.0.0/src/Makefile.am	2006-08-18 20:01:28.000000000 -0400
+@@ -24,7 +24,7 @@
+ 
+ AM_CFLAGS = $(XPRINT_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+ 
+-INCLUDES = -I$(top_srcdir)/include/X11/extensions
++INCLUDES = -I$(top_srcdir)/include/
+ 
+ #
+ # Library version number. This must match old versions on
 --- /dev/null	2006-08-16 13:34:07.659756891 -0400
-+++ libXp-1.0.0/Print.h	2006-08-18 19:28:36.000000000 -0400
++++ libXp-1.0.0/include/X11/extensions/Print.h	2006-08-18 20:01:28.000000000 -0400
 @@ -0,0 +1,552 @@
 +/* $Xorg: Print.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
 +/******************************************************************************
@@ -567,7 +613,7 @@
 +
 +#endif /* _XpPrint_H_ */
 --- /dev/null	2006-08-16 13:34:07.659756891 -0400
-+++ libXp-1.0.0/Printstr.h	2006-08-18 19:28:36.000000000 -0400
++++ libXp-1.0.0/include/X11/extensions/Printstr.h	2006-08-18 20:01:28.000000000 -0400
 @@ -0,0 +1,783 @@
 +/* $Xorg: Printstr.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
 +/******************************************************************************
@@ -1352,38 +1398,3 @@
 +_XFUNCPROTOEND
 +
 +#endif /* _XpPrintstr_H_ */
---- libXp-1.0.0/Makefile.am.add-proto-files	2005-05-18 16:33:36.000000000 -0400
-+++ libXp-1.0.0/Makefile.am	2006-08-18 19:28:36.000000000 -0400
-@@ -25,7 +25,12 @@
- 
- SUBDIRS = src man
- 
-+printdir = $(includedir)/X11/extensions
-+print_HEADERS = \
-+        Print.h \
-+        Printstr.h
-+
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = xp.pc
-+pkgconfig_DATA = xp.pc printproto.pc
- 
--EXTRA_DIST = xp.pc.in autogen.sh
-+EXTRA_DIST = xp.pc.in printproto.pc.in autogen.sh
---- libXp-1.0.0/configure.ac.add-proto-files	2005-12-14 19:24:30.000000000 -0500
-+++ libXp-1.0.0/configure.ac	2006-08-18 19:29:20.000000000 -0400
-@@ -36,7 +36,7 @@
- AC_PROG_LIBTOOL
- 
- # Check for X and print proto
--PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto)
-+PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau)
- 
- AC_SUBST(XPRINT_CFLAGS)
- AC_SUBST(XPRINT_LIBS)
-@@ -48,5 +48,6 @@
- AC_OUTPUT([Makefile
- 	   src/Makefile
- 	   man/Makefile
-+	   printproto.pc
-            xp.pc])
- 



From fedora-cvs-commits at redhat.com  Sat Aug 19 03:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 23:14:49 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch, 1.11,
	1.12 policy-20060608.patch, 1.48, NONE
Message-ID: <200608190314.k7J3EnVO021350@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21313

Modified Files:
	policy-20060802.patch 
Removed Files:
	policy-20060608.patch 
Log Message:
* Fri Aug 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-1
- Update from upstream


policy-20060802.patch:
 mls                                  |    9 
 modules/admin/amanda.fc              |   51 ----
 modules/admin/anaconda.te            |   20 +
 modules/admin/bootloader.te          |    4 
 modules/admin/consoletype.te         |   11 -
 modules/admin/firstboot.te           |    2 
 modules/admin/prelink.te             |binary
 modules/admin/rpm.fc                 |    2 
 modules/admin/rpm.if                 |   13 -
 modules/admin/usermanage.te          |    5 
 modules/apps/java.fc                 |    9 
 modules/apps/mozilla.if              |    2 
 modules/apps/wine.te                 |    2 
 modules/kernel/corecommands.fc       |    1 
 modules/kernel/corecommands.if       |    1 
 modules/kernel/corenetwork.te.in     |    7 
 modules/kernel/devices.fc            |    2 
 modules/kernel/devices.if            |   37 +++
 modules/kernel/devices.te            |    8 
 modules/kernel/files.if              |   18 +
 modules/kernel/filesystem.te         |    2 
 modules/kernel/kernel.if             |   75 +++++++
 modules/kernel/terminal.if           |   19 +
 modules/services/amavis.te           |    7 
 modules/services/apache.te           |    1 
 modules/services/avahi.te            |    2 
 modules/services/bind.te             |    1 
 modules/services/ccs.fc              |    8 
 modules/services/ccs.if              |   45 ++++
 modules/services/ccs.te              |   84 +++++++
 modules/services/cpucontrol.te       |    2 
 modules/services/cron.if             |   17 +
 modules/services/cron.te             |    7 
 modules/services/cups.te             |   19 +
 modules/services/cyrus.te            |    5 
 modules/services/dbus.if             |    6 
 modules/services/dovecot.te          |    2 
 modules/services/inn.te              |    1 
 modules/services/ldap.te             |    2 
 modules/services/mta.fc              |    2 
 modules/services/ntp.te              |    2 
 modules/services/oddjob.fc           |    8 
 modules/services/oddjob.if           |   76 +++++++
 modules/services/oddjob.te           |   70 ++++++
 modules/services/oddjob_mkhomedir.fc |    6 
 modules/services/oddjob_mkhomedir.if |   24 ++
 modules/services/oddjob_mkhomedir.te |   26 ++
 modules/services/openvpn.te          |    2 
 modules/services/pegasus.if          |   31 ++
 modules/services/pegasus.te          |    5 
 modules/services/postfix.te          |    7 
 modules/services/procmail.te         |    1 
 modules/services/radius.te           |    2 
 modules/services/ricci.fc            |   20 +
 modules/services/ricci.if            |  184 +++++++++++++++++
 modules/services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++
 modules/services/rpc.if              |    2 
 modules/services/rpc.te              |    5 
 modules/services/samba.te            |    8 
 modules/services/setroubleshoot.fc   |    9 
 modules/services/setroubleshoot.if   |    3 
 modules/services/setroubleshoot.te   |  110 ++++++++++
 modules/services/spamassassin.te     |    4 
 modules/services/squid.te            |    4 
 modules/services/ssh.if              |   24 ++
 modules/services/sysstat.te          |    3 
 modules/services/xserver.if          |   69 ++++++
 modules/services/xserver.te          |   19 +
 modules/system/authlogin.if          |   42 ++-
 modules/system/authlogin.te          |   19 +
 modules/system/fstools.te            |    1 
 modules/system/hostname.te           |   10 
 modules/system/init.if               |    7 
 modules/system/init.te               |    2 
 modules/system/libraries.fc          |    7 
 modules/system/locallogin.te         |    4 
 modules/system/logging.fc            |    3 
 modules/system/logging.if            |   21 +
 modules/system/logging.te            |    3 
 modules/system/miscfiles.fc          |    1 
 modules/system/miscfiles.if          |   18 +
 modules/system/modutils.te           |    1 
 modules/system/mount.te              |    3 
 modules/system/selinuxutil.te        |   15 +
 modules/system/udev.fc               |    1 
 modules/system/udev.te               |    1 
 modules/system/unconfined.if         |    2 
 modules/system/unconfined.te         |    5 
 modules/system/userdomain.if         |  264 +++++++++++++++++-------
 modules/system/userdomain.te         |   52 ++--
 modules/system/xen.if                |   38 +++
 modules/system/xen.te                |   26 +-
 92 files changed, 1896 insertions(+), 258 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- policy-20060802.patch	18 Aug 2006 14:18:35 -0000	1.11
+++ policy-20060802.patch	19 Aug 2006 03:14:46 -0000	1.12
@@ -2331,7 +2331,7 @@
  kernel_read_fs_sysctls(sysstat_t)
  kernel_read_rpc_sysctls(sysstat_t)
  
-+locallogin_use_fds(systat_t)
++locallogin_use_fds(sysstat_t)
 +
  corecmd_dontaudit_search_sbin(sysstat_t)
  corecmd_exec_bin(sysstat_t)


--- policy-20060608.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Aug 19 03:40:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 18 Aug 2006 23:40:30 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-mesa-6.5.1.patch,
	NONE, 1.1 xorg-x11-server-1.1.1-xvfb-composite-crash.patch,
	NONE, 1.1 xorg-x11-server-1.1.0-edid-mode-injection-2.patch,
	1.4, 1.5 xorg-x11-server.spec, 1.151, 1.152
Message-ID: <200608190340.k7J3eUbZ011743@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11713

Modified Files:
	xorg-x11-server-1.1.0-edid-mode-injection-2.patch 
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-mesa-6.5.1.patch 
	xorg-x11-server-1.1.1-xvfb-composite-crash.patch 
Log Message:
* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-25.fc6
- xorg-x11-server-1.1.1-xvfb-composite-crash.patch: Fix Xvfb's -render flag
  to also disable the Composite extension.
- xorg-x11-server-1.1.1-mesa-6.5.1.patch: Update build system to account for
  Mesa 6.5.1 snapshots.
- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Add all available
  standard timings from EDID rather than just the first five.


xorg-x11-server-1.1.1-mesa-6.5.1.patch:
 mesa/main/Makefile.am |    2 ++
 symlink-mesa.sh       |    5 +++++
 2 files changed, 7 insertions(+)

--- NEW FILE xorg-x11-server-1.1.1-mesa-6.5.1.patch ---
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index 867fe57..4d5b0cd 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -29,6 +27,7 @@ nodist_libmain_la_SOURCES = accum.c \
                     api_loopback.c \
                     api_noop.c \
                     api_validate.c \
+                    arrayobj.c \
                     attrib.c \
                     blend.c \
                     bufferobj.c \
@@ -67,6 +66,7 @@ nodist_libmain_la_SOURCES = accum.c \
                     points.c \
                     polygon.c \
                     rastpos.c \
+                    rbadaptors.c \
                     renderbuffer.c \
                     state.c \
                     stencil.c \
diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index ccaa2a9..32f839a 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -88,8 +88,11 @@ symlink_mesa_main() {
     action api_noop.h
     action api_validate.c
     action api_validate.h
+    action arrayobj.c
+    action arrayobj.h
     action attrib.c
     action attrib.h
+    action bitset.h
     action blend.c
     action blend.h
     action bufferobj.c
@@ -168,6 +171,8 @@ symlink_mesa_main() {
     action polygon.h
     action rastpos.c
     action rastpos.h
+    action rbadaptors.c
+    action rbadaptors.h
     action renderbuffer.c
     action renderbuffer.h
     action simple_list.h

xorg-x11-server-1.1.1-xvfb-composite-crash.patch:
 InitOutput.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE xorg-x11-server-1.1.1-xvfb-composite-crash.patch ---
--- xorg-server-1.1.1/hw/vfb/InitOutput.c.jx	2006-07-05 14:38:47.000000000 -0400
+++ xorg-server-1.1.1/hw/vfb/InitOutput.c	2006-08-18 12:46:43.000000000 -0400
@@ -364,6 +364,7 @@
     if (strcmp (argv[i], "-render") == 0)	/* -render */
     {
 	Render = FALSE;
+	noCompositeExtension = TRUE;		/* hate */
 	return 1;
     }
 

xorg-x11-server-1.1.0-edid-mode-injection-2.patch:
 common/xf86Config.c |    1 
 common/xf86Mode.c   |    6 +++-
 common/xf86str.h    |    1 
 ddc/ddcProperty.c   |   66 +++++++++++++++++++++++++++++++++++++---------------
 4 files changed, 55 insertions(+), 19 deletions(-)

Index: xorg-x11-server-1.1.0-edid-mode-injection-2.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-edid-mode-injection-2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-server-1.1.0-edid-mode-injection-2.patch	7 Aug 2006 14:18:24 -0000	1.4
+++ xorg-x11-server-1.1.0-edid-mode-injection-2.patch	19 Aug 2006 03:40:27 -0000	1.5
@@ -5,12 +5,13 @@
 * Record the maximum dot clock of the monitor, and filter by it.
 * De-fang an open-coded reduced-blanking check to not cripple LCDs.
 * Allow HorizSync and VertRefresh to be overridden independently.
+* Insert all eight standard timings as modes, instead of just the first five.
 
 This probably needs a second glance before pushing it upstream, and of
 course this depends on the first -edid- patch.  - ajax
 
 --- xorg-server-1.1.1/hw/xfree86/common/xf86Config.c.edid2	2006-07-05 14:38:47.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86Config.c	2006-08-02 11:51:42.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86Config.c	2006-08-18 16:30:41.000000000 -0400
 @@ -2220,6 +2220,7 @@
      monitorp->heightmm = conf_monitor->mon_height;
      monitorp->reducedblanking = FALSE;
@@ -20,7 +21,7 @@
      /*
       * fill in the monitor structure
 --- xorg-server-1.1.1/hw/xfree86/common/xf86str.h.edid2	2006-07-05 14:38:47.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-02 11:51:42.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-18 16:30:41.000000000 -0400
 @@ -208,6 +208,7 @@
      pointer		options;
      pointer		DDC;
@@ -29,8 +30,8 @@
  } MonRec, *MonPtr;
  
  /* the list of clock ranges */
---- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.edid2	2006-08-02 11:51:42.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-02 11:51:42.000000000 -0400
+--- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.edid2	2006-08-18 16:30:41.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-18 16:30:41.000000000 -0400
 @@ -810,6 +810,9 @@
          }
      }
@@ -51,8 +52,17 @@
  			    ((double)q->HTotal / (double)q->HDisplay) < 1.15)
  			    continue;
  
---- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.edid2	2006-08-02 11:51:42.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-02 12:00:49.000000000 -0400
+--- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.edid2	2006-08-18 16:30:41.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-18 16:33:19.000000000 -0400
+@@ -174,7 +174,7 @@
+     DisplayModePtr Modes = NULL, Mode = NULL;
+     int i;
+     
+-    for (i = 0; i < 5; i++)
++    for (i = 0; i < STD_TIMINGS; i++)
+         if (timing[i].hsize && timing[i].vsize && timing[i].refresh) {
+             Mode =  xf86CVTMode(timing[i].hsize, timing[i].vsize,
+                                 timing[i].refresh, FALSE, FALSE);
 @@ -296,14 +296,19 @@
  xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
  {


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- xorg-x11-server.spec	18 Aug 2006 15:52:31 -0000	1.151
+++ xorg-x11-server.spec	19 Aug 2006 03:40:27 -0000	1.152
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   24%{?dist}
+Release:   25%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -25,6 +25,7 @@
 Patch5:    xorg-x11-server-libxf86config-dont-write-empty-sections.patch
 Patch6:    xorg-x11-server-1.1.1-builderstring.patch
 Patch7:    xorg-x11-server-1.1.1-xkb-in-xnest.patch
+Patch8:    xorg-x11-server-1.1.1-xvfb-composite-crash.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -35,6 +36,7 @@
 Patch105:  xorg-x11-server-1.1.1-enable-composite.patch
 Patch106:  xorg-x11-server-1.1.1-no-composite-in-xnest.patch
 Patch107:  xorg-x11-server-1.1.1-offscreen-pixmaps.patch
+Patch108:  xorg-x11-server-1.1.1-mesa-6.5.1.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -154,7 +156,7 @@
 # Needed at least for DRI enabled builds
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.5-1
-BuildRequires: mesa-source >= 6.5-19
+BuildRequires: mesa-source >= 6.5-22
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 
@@ -331,6 +333,7 @@
 %patch5 -p0 -b .libxf86config-dont-write-empty-sections
 %patch6 -p1 -b .builderstring
 %patch7 -p1 -b .xkb-in-xnest
+%patch8 -p1 -b .xvfb-render-fix
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -340,6 +343,7 @@
 %patch105 -p0 -b .enable-composite
 %patch106 -p1 -b .no-xnest-composite
 %patch107 -p1 -b .offscreen-pixmaps
+%patch108 -p1 -b .mesa-651
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
@@ -695,6 +699,14 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-25.fc6
+- xorg-x11-server-1.1.1-xvfb-composite-crash.patch: Fix Xvfb's -render flag
+  to also disable the Composite extension.
+- xorg-x11-server-1.1.1-mesa-6.5.1.patch: Update build system to account for
+  Mesa 6.5.1 snapshots.
+- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Add all available
+  standard timings from EDID rather than just the first five.
+
 * Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-24.fc6
 - xorg-x11-server-1.1.1-edid-quirks-list.patch: Unbreak.
 



From fedora-cvs-commits at redhat.com  Sat Aug 19 04:09:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 00:09:32 -0400
Subject: rpms/gmime/devel gmime.spec,1.15,1.16
Message-ID: <200608190409.k7J49WNI012253@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gmime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12241

Modified Files:
	gmime.spec 
Log Message:
rebuild



Index: gmime.spec
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gmime.spec	18 Aug 2006 15:15:53 -0000	1.15
+++ gmime.spec	19 Aug 2006 04:09:20 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -118,6 +118,9 @@
 %endif
 
 %changelog
+* Sat Aug 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.3-2
+- Rebuild
+
 * Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 2.2.3-1
 - Upgrade to 2.2.3
 - Use the new mono libdir



From fedora-cvs-commits at redhat.com  Sat Aug 19 04:26:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 00:26:52 -0400
Subject: rpms/gmime/devel gmime.spec,1.16,1.17
Message-ID: <200608190426.k7J4QpOJ027582@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gmime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27570

Modified Files:
	gmime.spec 
Log Message:
fix requires



Index: gmime.spec
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gmime.spec	19 Aug 2006 04:09:20 -0000	1.16
+++ gmime.spec	19 Aug 2006 04:26:47 -0000	1.17
@@ -22,7 +22,7 @@
 
 %ifarch %mono_archs
 BuildRequires:  mono-devel gtk-sharp2-gapi
-BuildRequires:  gtk-sharp2 >= 2.4.0
+BuildRequires:  gtk-sharp2-devel >= 2.4.0
 %endif
 
 %description



From fedora-cvs-commits at redhat.com  Sat Aug 19 05:04:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 01:04:38 -0400
Subject: rpms/esc/devel esc.spec,1.9,1.10
Message-ID: <200608190504.k7J54csH024751@cvs.devel.redhat.com>

Author: jmagne

Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24590

Modified Files:
	esc.spec 
Log Message:
Bump build number for fix to patch#6.



Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- esc.spec	18 Aug 2006 15:47:05 -0000	1.9
+++ esc.spec	19 Aug 2006 05:04:33 -0000	1.10
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -174,6 +174,9 @@
 fi
 
 %changelog
+* Fri Aug  18 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-6
+- Correct problem with Patch #6
+
 * Tue Aug  17 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-4
 - Build ESC's xulrunner component using system nss and nspr
 - Build process creates run script based on {_libdir} variable,



From fedora-cvs-commits at redhat.com  Sat Aug 19 05:06:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 01:06:21 -0400
Subject: rpms/esc/devel esc-1.0.0-ui-enhance.patch,1.1,1.2
Message-ID: <200608190506.k7J56LDi025062@cvs.devel.redhat.com>

Author: jmagne

Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24899

Modified Files:
	esc-1.0.0-ui-enhance.patch 
Log Message:
Fix to patch#6 that removed, in error, the changes to allow Xulrunner build using the system NSS and NSPR packages.


esc-1.0.0-ui-enhance.patch:
 rpm/esc                                              |   10 
 rpm/esc.spec                                         |   20 
 src/app/xpcom/Makefile.moz                           |    2 
 src/app/xpcom/rhCoolKey.cpp                          |   60 -
 src/app/xpcom/tray/Makefile.moz                      |    8 
 src/app/xpcom/tray/rhITray.idl                       |    8 
 src/app/xpcom/tray/rhLinuxTray.cpp                   |   59 +
 src/app/xpcom/tray/rhMacTray.cpp                     |   31 
 src/app/xpcom/tray/rhTray.cpp                        |   34 +
 src/app/xul/esc/chrome/content/esc/ESC.js            |  603 +++++++++++--------
 src/app/xul/esc/chrome/content/esc/TRAY.js           |   80 ++
 src/app/xul/esc/chrome/content/esc/advancedinfo.xul  |    2 
 src/app/xul/esc/chrome/content/esc/config.xul        |   16 
 src/app/xul/esc/chrome/content/esc/esc.css           |   21 
 src/app/xul/esc/chrome/content/esc/esc.xul           |   21 
 src/app/xul/esc/chrome/content/esc/esc_browser.xul   |   51 -
 src/app/xul/esc/chrome/content/esc/hiddenWindow.html |   11 
 src/app/xul/esc/chrome/content/esc/hiddenWindow.xul  |   26 
 src/app/xul/esc/chrome/content/esc/password.js       |    4 
 src/app/xul/esc/chrome/content/esc/settings.xul      |   19 
 src/app/xul/esc/chrome/locale/en-US/esc.dtd          |    5 
 src/app/xul/esc/chrome/locale/en-US/esc.properties   |   13 
 src/app/xul/esc/components/escCLH.js                 |    2 
 src/lib/NssHttpClient/request.cpp                    |    2 
 src/lib/NssHttpClient/response.cpp                   |    2 
 src/lib/coolkey/CoolKey.cpp                          |   20 
 src/lib/coolkey/CoolKeyHandler.cpp                   |   46 -
 src/lib/coolkey/CoolKey_Message.cpp                  |    2 
 src/lib/coolkey/NSSManager.cpp                       |   11 
 src/lib/coolkey/SlotUtils.cpp                        |    2 
 src/lib/coolkey/SmartCardMonitoringThread.cpp        |    5 
 src/lib/notifytray/Makefile                          |    7 
 src/lib/notifytray/manifest.mn                       |    7 
 src/lib/notifytray/notifyareaicon.c                  |   11 
 src/lib/notifytray/notifyareaicon.h                  |    4 
 src/lib/notifytray/notifytray.c                      |   75 ++
 src/lib/notifytray/notifytray.h                      |    4 
 37 files changed, 825 insertions(+), 479 deletions(-)

Index: esc-1.0.0-ui-enhance.patch
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc-1.0.0-ui-enhance.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- esc-1.0.0-ui-enhance.patch	18 Aug 2006 15:47:05 -0000	1.1
+++ esc-1.0.0-ui-enhance.patch	19 Aug 2006 05:06:17 -0000	1.2
@@ -3166,17 +3166,6 @@
  
             recordMessage(chromeURI);
  
---- ./esc/src/xulrunner/Makefile.fix6	2006-08-16 20:50:10.000000000 -0700
-+++ ./esc/src/xulrunner/Makefile	2006-08-16 20:50:28.000000000 -0700
-@@ -65,8 +65,6 @@
- 	echo "ac_add_options --enable-default-toolkit=gtk2" >> $@.$(TYPE)
- 	echo "ac_add_options --enable-xft" >> $@.$(TYPE)
- 	echo "ac_add_options --disable-freetype2" >> $@.$(TYPE)
--	echo "ac_add_options --with-system-nspr" >> $@.$(TYPE)
--	echo "ac_add_options --with-system-nss" >> $@.$(TYPE)
- endif
- ifeq ($(OS_ARCH), WINNT)
- 	echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE)
 --- ./esc/rpm/esc.fix6	2006-08-16 20:14:22.000000000 -0700
 +++ ./esc/rpm/esc	2006-08-16 20:19:32.000000000 -0700
 @@ -1,5 +1,11 @@



From fedora-cvs-commits at redhat.com  Sat Aug 19 05:54:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 01:54:24 -0400
Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.15,1.16
Message-ID: <200608190554.k7J5sO57002184@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gsf-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2134

Modified Files:
	gsf-sharp.spec 
Log Message:
reb uild



Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gsf-sharp.spec	18 Aug 2006 15:18:26 -0000	1.15
+++ gsf-sharp.spec	19 Aug 2006 05:54:20 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.8
-Release:        2
+Release:        3%{?dist}
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel libgsf-devel gtk-sharp2-gapi gtk-sharp2 >= 1.9.5
+BuildRequires:  gtk-sharp2-devel
 Requires:       libgsf
 
 # Mono only availible on these:
@@ -46,10 +47,13 @@
 %{_prefix}/share/gapi-2.0/gsf-api.xml
 
 %changelog
+* Sat Aug 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.8-3.fc6
+- Rebuild
+
 * Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.8-2
 - Rebuild with new mono libdir
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8-1.1
 - rebuild
 
 * Wed Jun 21 2006 Alexander Larsson <alexl at redhat.com> - 0.8-1



From fedora-cvs-commits at redhat.com  Sat Aug 19 06:06:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 02:06:18 -0400
Subject: rpms/f-spot/devel f-spot.spec,1.26,1.27
Message-ID: <200608190606.k7J66Htn005580@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5540

Modified Files:
	f-spot.spec 
Log Message:
fix build reqs



Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- f-spot.spec	18 Aug 2006 15:22:43 -0000	1.26
+++ f-spot.spec	19 Aug 2006 06:06:15 -0000	1.27
@@ -18,6 +18,7 @@
 BuildRequires:  gettext
 BuildRequires:  dbus-sharp-devel
 BuildRequires:  autoconf
+BuildRequires:  perl-XML-Parser
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
 



From fedora-cvs-commits at redhat.com  Sat Aug 19 11:23:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 07:23:38 -0400
Subject: rpms/evolution/FC-5 evolution.spec,1.149,1.149.2.1
Message-ID: <200608191123.k7JBNcfG021526@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21483

Modified Files:
      Tag: private-2_6_3-check-only-active-folders-branch
	evolution.spec 
Log Message:
2.6.3 build


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.149
retrieving revision 1.149.2.1
diff -u -r1.149 -r1.149.2.1
--- evolution.spec	7 Aug 2006 20:05:54 -0000	1.149
+++ evolution.spec	19 Aug 2006 11:23:36 -0000	1.149.2.1
@@ -41,7 +41,7 @@
 
 Name: evolution
 Version: 2.6.3
-Release: 1.fc5.5
+Release: 1.fc5.5.dwmw2.1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -88,6 +88,9 @@
 Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 Patch22: evolution-2.6.0-prototypes.patch
 
+Patch1000: evolution-2.5.91-check-only-active-folders.patch
+Patch1001: evolution-2.6.2-badalloc-crash.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -210,6 +213,9 @@
 %patch21 -p1 -b .fix-missing-declarations-2.5.5.1
 %patch22 -p1 -b .prototypes
 
+%patch1000 -p1 -b .checksub
+%patch1001 -p1 -b .badalloc
+
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
 mkdir -p krb5-fakeprefix/%{_lib}



From fedora-cvs-commits at redhat.com  Sat Aug 19 11:25:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 07:25:00 -0400
Subject: rpms/evolution-data-server/FC-5 evolution-data-server.spec, 1.93,
	1.93.2.1
Message-ID: <200608191125.k7JBP0wp022097@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution-data-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22069

Modified Files:
      Tag: private-1_6_3-check-only-active-folders-branch
	evolution-data-server.spec 
Log Message:
1.6.3 build


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v
retrieving revision 1.93
retrieving revision 1.93.2.1
diff -u -r1.93 -r1.93.2.1
--- evolution-data-server.spec	4 Aug 2006 14:03:03 -0000	1.93
+++ evolution-data-server.spec	19 Aug 2006 11:24:58 -0000	1.93.2.1
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.6.3
-Release: 1.fc5.2
+Release: 1.fc5.2.dwmw2
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for evolution
@@ -39,6 +39,9 @@
 Patch14: evolution-data-server-1.6.2-validatehelo.patch
 Patch15: 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
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -120,6 +123,9 @@
 %patch14 -p1 -b .validatehelo
 %patch15 -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  Sat Aug 19 11:25:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 07:25:33 -0400
Subject: rpms/evolution-data-server/FC-5 evolution-data-server.spec, 1.93.2.1,
	1.93.2.2
Message-ID: <200608191125.k7JBPX63022354@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution-data-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22322

Modified Files:
      Tag: private-1_6_3-check-only-active-folders-branch
	evolution-data-server.spec 
Log Message:
bix release tag


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v
retrieving revision 1.93.2.1
retrieving revision 1.93.2.2
diff -u -r1.93.2.1 -r1.93.2.2
--- evolution-data-server.spec	19 Aug 2006 11:24:58 -0000	1.93.2.1
+++ evolution-data-server.spec	19 Aug 2006 11:25:31 -0000	1.93.2.2
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.6.3
-Release: 1.fc5.2.dwmw2
+Release: 1.fc5.2.dwmw2.1
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for evolution



From fedora-cvs-commits at redhat.com  Sat Aug 19 13:09:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 09:09:34 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch,1.12,1.13
Message-ID: <200608191309.k7JD9YYb031490@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31446

Modified Files:
	policy-20060802.patch 
Log Message:
* Fri Aug 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-1
- Update from upstream


policy-20060802.patch:
 mls                                  |    9 
 modules/admin/amanda.fc              |   51 ----
 modules/admin/anaconda.te            |   20 +
 modules/admin/bootloader.te          |    4 
 modules/admin/consoletype.te         |   11 -
 modules/admin/firstboot.te           |    2 
 modules/admin/rpm.fc                 |    2 
 modules/admin/rpm.if                 |   13 -
 modules/admin/usermanage.te          |    5 
 modules/apps/java.fc                 |    9 
 modules/apps/mozilla.if              |    2 
 modules/apps/wine.te                 |    2 
 modules/kernel/corecommands.fc       |    1 
 modules/kernel/corecommands.if       |    1 
 modules/kernel/corenetwork.te.in     |    7 
 modules/kernel/devices.fc            |    2 
 modules/kernel/devices.if            |   37 +++
 modules/kernel/devices.te            |    8 
 modules/kernel/files.if              |   18 +
 modules/kernel/filesystem.te         |    2 
 modules/kernel/kernel.if             |   75 +++++++
 modules/kernel/terminal.if           |   19 +
 modules/services/amavis.te           |    7 
 modules/services/apache.te           |    1 
 modules/services/avahi.te            |    2 
 modules/services/bind.te             |    1 
 modules/services/ccs.fc              |    8 
 modules/services/ccs.if              |   45 ++++
 modules/services/ccs.te              |   84 +++++++
 modules/services/cpucontrol.te       |    2 
 modules/services/cron.if             |   17 +
 modules/services/cron.te             |    7 
 modules/services/cups.te             |   19 +
 modules/services/cyrus.te            |    5 
 modules/services/dbus.if             |    6 
 modules/services/dovecot.te          |    2 
 modules/services/inn.te              |    1 
 modules/services/ldap.te             |    2 
 modules/services/mta.fc              |    2 
 modules/services/ntp.te              |    2 
 modules/services/oddjob.fc           |    8 
 modules/services/oddjob.if           |   76 +++++++
 modules/services/oddjob.te           |   70 ++++++
 modules/services/oddjob_mkhomedir.fc |    6 
 modules/services/oddjob_mkhomedir.if |   24 ++
 modules/services/oddjob_mkhomedir.te |   26 ++
 modules/services/openvpn.te          |    2 
 modules/services/pegasus.if          |   31 ++
 modules/services/pegasus.te          |    5 
 modules/services/postfix.te          |    7 
 modules/services/procmail.te         |    1 
 modules/services/radius.te           |    2 
 modules/services/ricci.fc            |   20 +
 modules/services/ricci.if            |  184 +++++++++++++++++
 modules/services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++
 modules/services/rpc.if              |    2 
 modules/services/rpc.te              |    5 
 modules/services/samba.te            |    8 
 modules/services/setroubleshoot.fc   |    9 
 modules/services/setroubleshoot.if   |    3 
 modules/services/setroubleshoot.te   |  110 ++++++++++
 modules/services/spamassassin.te     |    4 
 modules/services/squid.te            |    4 
 modules/services/ssh.if              |   24 ++
 modules/services/sysstat.te          |    3 
 modules/services/xserver.if          |   69 ++++++
 modules/services/xserver.te          |   19 +
 modules/system/authlogin.if          |   42 ++-
 modules/system/authlogin.te          |   19 +
 modules/system/fstools.te            |    1 
 modules/system/hostname.te           |   10 
 modules/system/init.if               |    7 
 modules/system/init.te               |    2 
 modules/system/libraries.fc          |    7 
 modules/system/locallogin.te         |    4 
 modules/system/logging.fc            |    3 
 modules/system/logging.if            |   21 +
 modules/system/logging.te            |    3 
 modules/system/lvm.fc                |    2 
 modules/system/lvm.te                |    6 
 modules/system/miscfiles.fc          |    1 
 modules/system/miscfiles.if          |   18 +
 modules/system/modutils.te           |    1 
 modules/system/mount.te              |    3 
 modules/system/selinuxutil.te        |   15 +
 modules/system/udev.fc               |    1 
 modules/system/udev.te               |    1 
 modules/system/unconfined.if         |    2 
 modules/system/unconfined.te         |    5 
 modules/system/userdomain.if         |  236 +++++++++++++++-------
 modules/system/userdomain.te         |   48 ++--
 modules/system/xen.if                |   38 +++
 modules/system/xen.te                |   26 +-
 93 files changed, 1869 insertions(+), 261 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- policy-20060802.patch	19 Aug 2006 03:14:46 -0000	1.12
+++ policy-20060802.patch	19 Aug 2006 13:09:31 -0000	1.13
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.8/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.8/policy/mls	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/mls	2006-08-18 23:12:03.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -24,7 +24,7 @@
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-2.3.8/policy/modules/admin/amanda.fc
 --- nsaserefpolicy/policy/modules/admin/amanda.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/amanda.fc	2006-08-18 08:12:54.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/amanda.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -9,62 +9,13 @@
  /tmp/amanda(/.*)?			gen_context(system_u:object_r:amanda_tmp_t,s0)
  
@@ -91,7 +91,7 @@
  /var/lib/amanda/index			gen_context(system_u:object_r:amanda_data_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.8/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/anaconda.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/anaconda.te	2006-08-18 23:12:03.000000000 -0400
 @@ -25,8 +25,12 @@
  
  modutils_domtrans_insmod(anaconda_t)
@@ -136,7 +136,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.8/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/bootloader.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/bootloader.te	2006-08-18 23:12:03.000000000 -0400
 @@ -83,8 +83,10 @@
  dev_read_rand(bootloader_t)
  dev_read_urand(bootloader_t)
@@ -151,7 +151,7 @@
  fs_getattr_tmpfs(bootloader_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.8/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/consoletype.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/consoletype.te	2006-08-18 23:12:03.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -176,7 +176,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.8/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/firstboot.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/firstboot.te	2006-08-18 23:12:03.000000000 -0400
 @@ -106,7 +106,7 @@
  ')
  
@@ -186,10 +186,9 @@
  ')
  
  optional_policy(`
-Binary files nsaserefpolicy/policy/modules/admin/prelink.te and serefpolicy-2.3.8/policy/modules/admin/prelink.te differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.8/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/rpm.fc	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/rpm.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -201,7 +200,7 @@
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.8/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/rpm.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/rpm.if	2006-08-18 23:12:03.000000000 -0400
 @@ -75,12 +75,13 @@
  	')
  
@@ -224,7 +223,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.8/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/usermanage.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/admin/usermanage.te	2006-08-18 23:12:03.000000000 -0400
 @@ -260,7 +260,7 @@
  ')
  
@@ -253,7 +252,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.8/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/apps/java.fc	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/apps/java.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # /opt
@@ -276,7 +275,7 @@
 +/usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.8/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-16 08:46:26.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/apps/mozilla.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/apps/mozilla.if	2006-08-18 23:12:03.000000000 -0400
 @@ -63,6 +63,7 @@
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
@@ -295,7 +294,7 @@
  	sysnet_dns_name_resolve($1_mozilla_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.3.8/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/apps/wine.te	2006-08-18 09:59:13.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/apps/wine.te	2006-08-18 23:12:03.000000000 -0400
 @@ -18,7 +18,7 @@
  #
  
@@ -307,7 +306,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.8/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/corecommands.fc	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/kernel/corecommands.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -318,7 +317,7 @@
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.3.8/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/corecommands.if	2006-08-18 08:37:47.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/kernel/corecommands.if	2006-08-18 23:12:03.000000000 -0400
 @@ -950,6 +950,7 @@
  
  	allow $1 exec_type:file manage_file_perms;
@@ -329,7 +328,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.8/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/corenetwork.te.in	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/kernel/corenetwork.te.in	2006-08-18 23:12:03.000000000 -0400
 @@ -67,12 +67,14 @@
  network_port(clamd, tcp,3310,s0)
  network_port(clockspeed, udp,4041,s0)
@@ -372,7 +371,7 @@
  network_port(spamd, tcp,783,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.8/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/devices.fc	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/kernel/devices.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -37,7 +37,7 @@
  /dev/mpu401.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/null		-c	gen_context(system_u:object_r:null_device_t,s0)
@@ -384,7 +383,7 @@
  /dev/pmu		-c	gen_context(system_u:object_r:power_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.3.8/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/devices.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/kernel/devices.if	2006-08-18 23:12:03.000000000 -0400
 @@ -2992,3 +2992,40 @@
  
  	typeattribute $1 devices_unconfined_type;
@@ -428,7 +427,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.8/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/devices.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/kernel/devices.te	2006-08-18 23:12:03.000000000 -0400
 @@ -72,6 +72,12 @@
  dev_node(lvm_control_t)
  
@@ -453,7 +452,7 @@
  dev_node(xen_device_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.8/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/files.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/kernel/files.if	2006-08-18 23:12:03.000000000 -0400
 @@ -2934,6 +2934,24 @@
  
  ########################################
@@ -481,7 +480,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.8/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/filesystem.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/kernel/filesystem.te	2006-08-18 23:12:03.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -500,7 +499,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.8/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-08-16 08:46:26.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/kernel.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/kernel/kernel.if	2006-08-18 23:12:03.000000000 -0400
 @@ -1443,6 +1443,42 @@
  
  ########################################
@@ -589,7 +588,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.8/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/terminal.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/kernel/terminal.if	2006-08-18 23:12:03.000000000 -0400
 @@ -308,6 +308,7 @@
  		type devpts_t;
  	')
@@ -622,7 +621,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.8/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-08-16 08:46:29.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/amavis.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/amavis.te	2006-08-18 23:12:03.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -654,7 +653,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.8/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/apache.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/apache.te	2006-08-18 23:12:03.000000000 -0400
 @@ -272,7 +272,6 @@
  sysnet_read_config(httpd_t)
  
@@ -665,7 +664,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.8/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/avahi.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/avahi.te	2006-08-18 23:12:03.000000000 -0400
 @@ -63,6 +63,7 @@
  domain_use_interactive_fds(avahi_t)
  
@@ -684,7 +683,7 @@
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.8/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2006-08-16 08:46:29.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/bind.te	2006-08-18 07:39:17.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/bind.te	2006-08-18 23:12:03.000000000 -0400
 @@ -218,6 +218,7 @@
  allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
  
@@ -695,7 +694,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-2.3.8/policy/modules/services/ccs.fc
 --- nsaserefpolicy/policy/modules/services/ccs.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ccs.fc	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/ccs.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,8 @@
 +# ccs executable will have:
 +# label: system_u:object_r:ccs_exec_t
@@ -707,7 +706,7 @@
 +/etc/cluster(/.*)?		gen_context(system_u:object_r:cluster_conf_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.if serefpolicy-2.3.8/policy/modules/services/ccs.if
 --- nsaserefpolicy/policy/modules/services/ccs.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ccs.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/ccs.if	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,45 @@
 +## <summary>policy for ccs</summary>
 +
@@ -756,7 +755,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.3.8/policy/modules/services/ccs.te
 --- nsaserefpolicy/policy/modules/services/ccs.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ccs.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/ccs.te	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,84 @@
 +policy_module(ccs,1.0.0)
 +
@@ -844,7 +843,7 @@
 +allow ccs_t cluster_conf_t:file rw_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cpucontrol.te serefpolicy-2.3.8/policy/modules/services/cpucontrol.te
 --- nsaserefpolicy/policy/modules/services/cpucontrol.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/cpucontrol.te	2006-08-18 08:27:31.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/cpucontrol.te	2006-08-18 23:12:03.000000000 -0400
 @@ -25,7 +25,7 @@
  # CPU microcode loader local policy
  #
@@ -856,7 +855,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.8/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/cron.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/cron.if	2006-08-18 23:12:03.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -909,7 +908,7 @@
  	allow $1 system_crond_t:process sigchld;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.8/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/cron.te	2006-08-18 10:08:53.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/cron.te	2006-08-18 23:12:03.000000000 -0400
 @@ -146,6 +146,8 @@
  	')
  ')
@@ -940,7 +939,7 @@
  		# via redirection of standard out.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/cups.te	2006-08-18 08:13:44.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/cups.te	2006-08-18 23:12:03.000000000 -0400
 @@ -74,13 +74,14 @@
  #
  
@@ -1010,7 +1009,7 @@
  fs_search_auto_mountpoints(hplip_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.8/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/cyrus.te	2006-08-18 10:00:48.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/cyrus.te	2006-08-18 23:12:03.000000000 -0400
 @@ -69,6 +69,7 @@
  corenet_udp_sendrecv_all_ports(cyrus_t)
  corenet_tcp_bind_all_nodes(cyrus_t)
@@ -1029,7 +1028,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/dbus.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/dbus.if	2006-08-18 23:12:03.000000000 -0400
 @@ -123,6 +123,7 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
@@ -1052,7 +1051,7 @@
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.8/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/dovecot.te	2006-08-18 08:30:41.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/dovecot.te	2006-08-18 23:12:03.000000000 -0400
 @@ -168,7 +168,7 @@
  # Allow dovecot to create and read SSL parameters file
  allow dovecot_t dovecot_var_lib_t:dir rw_dir_perms;
@@ -1064,7 +1063,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.te serefpolicy-2.3.8/policy/modules/services/inn.te
 --- nsaserefpolicy/policy/modules/services/inn.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/inn.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/inn.te	2006-08-18 23:12:03.000000000 -0400
 @@ -36,6 +36,7 @@
  allow innd_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow innd_t self:tcp_socket create_stream_socket_perms;
@@ -1075,7 +1074,7 @@
  allow innd_t innd_etc_t:dir r_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.8/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/ldap.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/ldap.te	2006-08-18 23:12:03.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -1087,7 +1086,7 @@
  kernel_read_kernel_sysctls(slapd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-2.3.8/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/mta.fc	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/mta.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -2,6 +2,8 @@
  /etc/aliases		--	gen_context(system_u:object_r:etc_aliases_t,s0)
  /etc/aliases\.db	--	gen_context(system_u:object_r:etc_aliases_t,s0)
@@ -1099,7 +1098,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.8/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/ntp.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/ntp.te	2006-08-18 23:12:03.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -1111,7 +1110,7 @@
  allow ntpd_t self:fifo_file { read write getattr };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-2.3.8/policy/modules/services/oddjob.fc
 --- nsaserefpolicy/policy/modules/services/oddjob.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob.fc	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/oddjob.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,8 @@
 +# oddjob executable will have:
 +# label: system_u:object_r:oddjob_exec_t
@@ -1123,7 +1122,7 @@
 +/usr/lib/oddjobd			gen_context(system_u:object_r:oddjob_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-2.3.8/policy/modules/services/oddjob.if
 --- nsaserefpolicy/policy/modules/services/oddjob.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/oddjob.if	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,76 @@
 +## <summary>policy for oddjob</summary>
 +
@@ -1203,7 +1202,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.fc
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.fc	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,6 @@
 +# oddjob_mkhomedir executable will have:
 +# label: system_u:object_r:oddjob_mkhomedir_exec_t
@@ -1213,7 +1212,7 @@
 +/usr/lib/oddjob/mkhomedir		--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.if
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.if	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,24 @@
 +## <summary>policy for oddjob_mkhomedir</summary>
 +
@@ -1241,7 +1240,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.te
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.te	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,26 @@
 +policy_module(oddjob_mkhomedir,1.0.0)
 +
@@ -1271,7 +1270,7 @@
 +allow oddjob_mkhomedir_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-2.3.8/policy/modules/services/oddjob.te
 --- nsaserefpolicy/policy/modules/services/oddjob.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/oddjob.te	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,70 @@
 +policy_module(oddjob,1.0.0)
 +
@@ -1345,7 +1344,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.8/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/openvpn.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/openvpn.te	2006-08-18 23:12:03.000000000 -0400
 @@ -33,7 +33,7 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -1357,7 +1356,7 @@
  allow openvpn_t openvpn_etc_t:file r_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.8/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/pegasus.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/pegasus.if	2006-08-18 23:12:03.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -1393,7 +1392,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.8/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/pegasus.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/pegasus.te	2006-08-18 23:12:03.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -1412,7 +1411,7 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.8/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/postfix.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/postfix.te	2006-08-18 23:12:03.000000000 -0400
 @@ -250,6 +250,7 @@
  allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
  
@@ -1450,7 +1449,7 @@
  	postgrey_stream_connect(postfix_smtpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.8/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/procmail.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/procmail.te	2006-08-18 23:12:03.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -1461,7 +1460,7 @@
  corenet_tcp_sendrecv_all_nodes(procmail_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.3.8/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/radius.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/radius.te	2006-08-18 23:12:03.000000000 -0400
 @@ -31,7 +31,7 @@
  # gzip also needs chown access to preserve GID for radwtmp files
  allow radiusd_t self:capability { chown dac_override fsetid kill setgid setuid sys_resource sys_tty_config };
@@ -1473,7 +1472,7 @@
  allow radiusd_t self:tcp_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.fc serefpolicy-2.3.8/policy/modules/services/ricci.fc
 --- nsaserefpolicy/policy/modules/services/ricci.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ricci.fc	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/ricci.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,20 @@
 +# ricci executable will have:
 +# label: system_u:object_r:ricci_exec_t
@@ -1497,7 +1496,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.if serefpolicy-2.3.8/policy/modules/services/ricci.if
 --- nsaserefpolicy/policy/modules/services/ricci.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ricci.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/ricci.if	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,184 @@
 +## <summary>policy for ricci</summary>
 +
@@ -1685,7 +1684,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.3.8/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ricci.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/ricci.te	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,373 @@
 +policy_module(ricci,1.0.0)
 +
@@ -2062,7 +2061,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-2.3.8/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/rpc.if	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/rpc.if	2006-08-18 23:12:03.000000000 -0400
 @@ -51,6 +51,8 @@
  	kernel_rw_rpc_sysctls($1_t)
  
@@ -2074,7 +2073,7 @@
  	corenet_tcp_sendrecv_all_if($1_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.3.8/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/rpc.te	2006-08-18 07:38:02.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/rpc.te	2006-08-18 23:12:03.000000000 -0400
 @@ -48,9 +48,6 @@
  # for rpc.rquotad
  kernel_read_sysctl(rpcd_t)  
@@ -2096,7 +2095,7 @@
  fs_read_rpc_files(gssd_t) 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.8/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/samba.te	2006-08-18 08:23:31.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/samba.te	2006-08-18 23:12:03.000000000 -0400
 @@ -171,7 +171,7 @@
  #
  # smbd Local policy
@@ -2135,7 +2134,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.8/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/setroubleshoot.fc	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/setroubleshoot.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -2148,14 +2147,14 @@
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.8/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/setroubleshoot.if	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/setroubleshoot.if	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.8/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/setroubleshoot.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/setroubleshoot.te	2006-08-18 23:12:03.000000000 -0400
 @@ -0,0 +1,110 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -2269,7 +2268,7 @@
 +files_dontaudit_search_src(setroubleshootd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.8/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/spamassassin.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/spamassassin.te	2006-08-18 23:12:03.000000000 -0400
 @@ -193,3 +193,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -2280,7 +2279,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.8/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/squid.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/squid.te	2006-08-18 23:12:03.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -2295,7 +2294,7 @@
  allow squid_t self:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.8/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/ssh.if	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/ssh.if	2006-08-18 23:12:03.000000000 -0400
 @@ -711,3 +711,27 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
@@ -2326,7 +2325,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-2.3.8/policy/modules/services/sysstat.te
 --- nsaserefpolicy/policy/modules/services/sysstat.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/sysstat.te	2006-08-18 08:24:27.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/sysstat.te	2006-08-18 23:12:03.000000000 -0400
 @@ -36,6 +36,8 @@
  kernel_read_fs_sysctls(sysstat_t)
  kernel_read_rpc_sysctls(sysstat_t)
@@ -2346,7 +2345,7 @@
  init_use_script_ptys(sysstat_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/xserver.if	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/xserver.if	2006-08-18 23:12:03.000000000 -0400
 @@ -45,7 +45,6 @@
  	allow $1_xserver_t self:capability { dac_override fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
  	dontaudit $1_xserver_t self:capability chown;
@@ -2453,7 +2452,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/xserver.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/xserver.te	2006-08-18 23:12:03.000000000 -0400
 @@ -81,15 +81,19 @@
  #
  
@@ -2531,7 +2530,7 @@
  	unconfined_domtrans(xdm_xserver_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.3.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/authlogin.if	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/authlogin.if	2006-08-18 23:12:03.000000000 -0400
 @@ -128,6 +128,7 @@
  	# Transition from the user domain to this domain.
  	domain_auto_trans($2,chkpwd_exec_t,$1_chkpwd_t)
@@ -2704,7 +2703,7 @@
  	miscfiles_read_certs($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.8/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/authlogin.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/authlogin.te	2006-08-18 23:12:03.000000000 -0400
 @@ -93,10 +93,9 @@
  
  allow pam_t pam_var_run_t:dir { search getattr read write remove_name };
@@ -2764,7 +2763,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.8/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/fstools.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/fstools.te	2006-08-18 23:12:03.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -2775,7 +2774,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.8/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/hostname.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/hostname.te	2006-08-18 23:12:03.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -2800,7 +2799,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.8/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/init.if	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/init.if	2006-08-18 23:12:03.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -2817,7 +2816,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.8/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/init.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/init.te	2006-08-18 23:12:03.000000000 -0400
 @@ -357,6 +357,8 @@
  logging_read_audit_config(initrc_t)
  
@@ -2829,7 +2828,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.8/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/libraries.fc	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/libraries.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -97,6 +97,8 @@
  /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
  
@@ -2860,7 +2859,7 @@
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.8/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/locallogin.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/locallogin.te	2006-08-18 23:12:03.000000000 -0400
 @@ -47,7 +47,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -2881,7 +2880,7 @@
  dev_getattr_mouse_dev(local_login_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.8/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/logging.fc	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/logging.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -2891,7 +2890,7 @@
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.8/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/logging.if	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/logging.if	2006-08-18 23:12:03.000000000 -0400
 @@ -553,3 +553,24 @@
  	allow $1 var_log_t:dir rw_dir_perms;
  	allow $1 var_log_t:file create_file_perms;
@@ -2919,7 +2918,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.8/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/logging.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/logging.te	2006-08-18 23:12:03.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -2932,9 +2931,55 @@
  
  kernel_read_kernel_sysctls(auditd_t)
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.3.8/policy/modules/system/lvm.fc
+--- nsaserefpolicy/policy/modules/system/lvm.fc	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/lvm.fc	2006-08-18 23:50:13.000000000 -0400
+@@ -14,7 +14,6 @@
+ 
+ /etc/lvmtab(/.*)?		gen_context(system_u:object_r:lvm_metadata_t,s0)
+ /etc/lvmtab\.d(/.*)?		gen_context(system_u:object_r:lvm_metadata_t,s0)
+-
+ #
+ # /lib
+ #
+@@ -88,3 +87,4 @@
+ /var/lock/lvm(/.*)?		gen_context(system_u:object_r:lvm_lock_t,s0)
+ 
+ /var/cache/multipathd(/.*)?	gen_context(system_u:object_r:lvm_metadata_t,s0)
++/var/run/multipathd.sock	-s	gen_context(system_u:object_r:lvm_var_run_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.8/policy/modules/system/lvm.te
+--- nsaserefpolicy/policy/modules/system/lvm.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/lvm.te	2006-08-18 23:52:13.000000000 -0400
+@@ -125,7 +125,7 @@
+ 
+ # DAC overrides and mknod for modifying /dev entries (vgmknodes)
+ # rawio needed for dmraid
+-allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio };
++allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio net_admin };
+ dontaudit lvm_t self:capability sys_tty_config;
+ allow lvm_t self:process { sigchld sigkill sigstop signull signal };
+ # LVM will complain a lot if it cannot set its priority.
+@@ -133,6 +133,7 @@
+ allow lvm_t self:file rw_file_perms;
+ allow lvm_t self:fifo_file rw_file_perms;
+ allow lvm_t self:unix_dgram_socket create_socket_perms;
++allow lvm_t self:netlink_kobject_uevent_socket create_socket_perms;
+ 
+ allow lvm_t lvm_tmp_t:dir create_dir_perms;
+ allow lvm_t lvm_tmp_t:file create_file_perms;
+@@ -152,7 +153,8 @@
+ 
+ allow lvm_t lvm_var_run_t:file create_file_perms;
+ allow lvm_t lvm_var_run_t:dir create_dir_perms;
+-files_pid_filetrans(lvm_t,lvm_var_run_t,file)
++allow lvm_t lvm_var_run_t:sock_file create_file_perms;
++files_pid_filetrans(lvm_t,lvm_var_run_t,{ file sock_file })
+ 
+ allow lvm_t lvm_etc_t:file r_file_perms;
+ allow lvm_t lvm_etc_t:lnk_file r_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.8/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/miscfiles.fc	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/miscfiles.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -9,6 +9,7 @@
  # /etc
  #
@@ -2945,7 +2990,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.8/policy/modules/system/miscfiles.if
 --- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/miscfiles.if	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/miscfiles.if	2006-08-18 23:12:03.000000000 -0400
 @@ -116,6 +116,24 @@
  
  ########################################
@@ -2973,7 +3018,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.8/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/modutils.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/modutils.te	2006-08-18 23:12:03.000000000 -0400
 @@ -183,6 +183,7 @@
  fs_getattr_xattr_fs(depmod_t)
  
@@ -2984,7 +3029,7 @@
  corecmd_search_sbin(depmod_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.8/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/mount.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/mount.te	2006-08-18 23:12:03.000000000 -0400
 @@ -80,6 +80,7 @@
  files_read_isid_type_files(mount_t)
  # For reading cert files
@@ -3004,7 +3049,7 @@
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.8/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/selinuxutil.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/selinuxutil.te	2006-08-18 23:12:03.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -3050,7 +3095,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.8/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/udev.fc	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/udev.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -1,5 +1,6 @@
  # udev
  
@@ -3060,7 +3105,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.8/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/udev.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/udev.te	2006-08-18 23:12:03.000000000 -0400
 @@ -129,6 +129,7 @@
  mls_file_upgrade(udev_t)
  mls_file_downgrade(udev_t)
@@ -3071,7 +3116,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.8/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/unconfined.if	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/unconfined.if	2006-08-18 23:12:03.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -3090,7 +3135,7 @@
  	selinux_unconfined($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.8/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/unconfined.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/unconfined.te	2006-08-18 23:12:03.000000000 -0400
 @@ -195,4 +195,9 @@
  ifdef(`targeted_policy',`
  	allow unconfined_execmem_t self:process { execstack execmem };
@@ -3103,7 +3148,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/userdomain.if	2006-08-18 07:42:56.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/userdomain.if	2006-08-18 23:33:46.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -3255,7 +3300,10 @@
 -		allow $1_t self:process execmem;
 -	')
 +	sysnet_dns_name_resolve($1_t)
-+
+ 
+-	tunable_policy(`allow_execmem && allow_execstack',`
+-		# Allow making the stack executable via mprotect.
+-		allow $1_t self:process execstack;
 +')
 +#######################################
 +## <summary>
@@ -3280,10 +3328,7 @@
 +## </param>
 +#
 +template(`base_login_user_template',`
- 
--	tunable_policy(`allow_execmem && allow_execstack',`
--		# Allow making the stack executable via mprotect.
--		allow $1_t self:process execstack;
++
 +	gen_require(`
 +		attribute $1_file_type;
 +		attribute home_dir_type, home_type;
@@ -3353,56 +3398,7 @@
  		canna_stream_connect($1_t)
  	')
  
-@@ -346,6 +392,26 @@
- 	')
- 
- 	optional_policy(`
-+		dictd_tcp_connect($1_t)
-+	')
-+
-+	optional_policy(`
-+		tunable_policy(`ftpd_is_daemon',`
-+			ftp_tcp_connect($1_t)
-+		')
-+	')
-+
-+	optional_policy(`
-+		finger_tcp_connect($1_t)
-+	')
-+
-+	optional_policy(`
-+		i18n_use($1_t)
-+	')
-+
-+	optional_policy(`
-+		inetd_tcp_connect($1_t)
-+		inetd_udp_send($1_t)
- 		inetd_use_fds($1_t)
- 		inetd_rw_tcp_sockets($1_t)
- 	')
-@@ -357,6 +423,10 @@
- 	')
- 
- 	optional_policy(`
-+		jabber_tcp_connect($1_t)
-+	')
-+
-+	optional_policy(`
- 		mta_rw_spool($1_t)
- 	')
- 
-@@ -373,6 +443,10 @@
- 	')
- 
- 	optional_policy(`
-+		nessus_tcp_connect($1_t)
-+	')
-+
-+	optional_policy(`
- 		nscd_socket_use($1_t)
- 	')
- 
-@@ -426,8 +500,10 @@
+@@ -426,8 +472,10 @@
  		xserver_stream_connect_xdm($1_t)
  		# certain apps want to read xdm.pid file
  		xserver_read_xdm_pid($1_t)
@@ -3413,7 +3409,7 @@
  	')
  ')
  
-@@ -457,6 +533,7 @@
+@@ -457,6 +505,7 @@
  
  	# Inherit rules for ordinary users.
  	base_user_template($1)
@@ -3421,7 +3417,7 @@
  
  	typeattribute $1_t unpriv_userdomain;
  	domain_interactive_fd($1_t)
-@@ -477,9 +554,6 @@
+@@ -477,9 +526,6 @@
  	# Local policy
  	#
  
@@ -3431,7 +3427,7 @@
  	# Rules used to associate a homedir as a mountpoint
  	allow $1_home_t self:filesystem associate;
  	allow $1_file_type $1_home_t:filesystem associate;
-@@ -491,10 +565,6 @@
+@@ -491,10 +537,6 @@
  	allow privhome $1_home_t:sock_file create_file_perms;
  	allow privhome $1_home_t:fifo_file create_file_perms;
  	type_transition privhome $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
@@ -3442,7 +3438,7 @@
  	dev_read_sysfs($1_t)
  
  	corecmd_exec_all_executables($1_t)
-@@ -502,11 +572,8 @@
+@@ -502,11 +544,8 @@
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
  
@@ -3455,7 +3451,7 @@
  	# Read directories and files with the readable_t type.
  	# This type is a general type for "world"-readable files.
  	files_list_world_readable($1_t)
-@@ -514,8 +581,6 @@
+@@ -514,8 +553,6 @@
  	files_read_world_readable_symlinks($1_t)
  	files_read_world_readable_pipes($1_t)
  	files_read_world_readable_sockets($1_t)
@@ -3464,7 +3460,7 @@
  
  	init_read_utmp($1_t)
  	# The library functions always try to open read-write first,
-@@ -621,6 +686,8 @@
+@@ -621,6 +658,8 @@
  
  	# do not audit read on disk devices
  	dontaudit $1_t { removable_device_t fixed_disk_device_t }:blk_file read;
@@ -3473,7 +3469,7 @@
  
  	ifdef(`xdm.te', `
  		allow xdm_t $1_home_t:lnk_file read;
-@@ -657,8 +724,6 @@
+@@ -657,8 +696,6 @@
  	# Do not audit write denials to /etc/ld.so.cache.
  	dontaudit $1_t ld_so_cache_t:file write;
  
@@ -3482,7 +3478,7 @@
  	allow $1_t initrc_t:fifo_file write;
  	') dnl end TODO
  ')
-@@ -704,6 +769,7 @@
+@@ -704,6 +741,7 @@
  
  	# Inherit rules for ordinary users.
  	base_user_template($1)
@@ -3490,7 +3486,7 @@
  
  	typeattribute $1_t privhome;
  	domain_obj_id_change_exemption($1_t)
-@@ -736,11 +802,6 @@
+@@ -736,11 +774,6 @@
  
  	allow $1_t self:netlink_audit_socket nlmsg_readpriv;
  
@@ -3502,7 +3498,7 @@
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -806,6 +867,7 @@
+@@ -806,6 +839,7 @@
  	domain_getattr_all_sockets($1_t)
  
  	files_exec_usr_src_files($1_t)
@@ -3510,7 +3506,7 @@
  
  	init_rw_initctl($1_t)
  
-@@ -3359,6 +3421,25 @@
+@@ -3359,6 +3393,25 @@
  
  ########################################
  ## <summary>
@@ -3536,7 +3532,7 @@
  ##	Read files in the staff users home directory.
  ## </summary>
  ## <param name="domain">
-@@ -4079,7 +4160,7 @@
+@@ -4079,7 +4132,7 @@
  	gen_require(`
  		type user_home_dir_t;
  	')
@@ -3545,7 +3541,7 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-@@ -4740,3 +4821,34 @@
+@@ -4740,3 +4793,34 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -3582,7 +3578,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.8/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/userdomain.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/userdomain.te	2006-08-18 23:36:36.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -3665,18 +3661,7 @@
  	', `
  		logging_manage_audit_log(sysadm_t)
  		logging_manage_audit_config(sysadm_t)
-@@ -417,6 +413,10 @@
- 	')
- 
- 	optional_policy(`
-+		radius_use(sysadm_t,sysadm_r,admin_terminal)
-+	')
-+
-+	optional_policy(`
- 		rpm_run(sysadm_t,sysadm_r,admin_terminal)
- 	')
- 
-@@ -439,11 +439,11 @@
+@@ -439,11 +435,11 @@
  			selinux_set_parameters(secadm_t)
  
  			seutil_manage_bin_policy(secadm_t)
@@ -3695,7 +3680,7 @@
  			selinux_set_boolean(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.8/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/xen.if	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/xen.if	2006-08-18 23:12:03.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -3740,7 +3725,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.8/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/xen.te	2006-08-18 07:38:03.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/system/xen.te	2006-08-18 23:12:03.000000000 -0400
 @@ -69,7 +69,10 @@
  #
  



From fedora-cvs-commits at redhat.com  Sat Aug 19 14:33:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 10:33:49 -0400
Subject: rpms/f-spot/devel f-spot.spec,1.27,1.28
Message-ID: <200608191433.k7JEXn1Q014038@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13966

Modified Files:
	f-spot.spec 
Log Message:
fix build reqs



Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- f-spot.spec	19 Aug 2006 06:06:15 -0000	1.27
+++ f-spot.spec	19 Aug 2006 14:33:44 -0000	1.28
@@ -15,6 +15,7 @@
 BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 
 BuildRequires:  gtk-sharp2-devel >= 2.7 libgnome-devel libgnomeui-devel
 BuildRequires:  gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1
+BuildRequires:  gnome-sharp-devel
 BuildRequires:  gettext
 BuildRequires:  dbus-sharp-devel
 BuildRequires:  autoconf



From fedora-cvs-commits at redhat.com  Sat Aug 19 16:46:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 12:46:00 -0400
Subject: rpms/kernel/devel/scripts rebase-xen-kernel.sh,1.1,1.2
Message-ID: <200608191646.k7JGk0Vt021029@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/scripts
In directory cvs.devel.redhat.com:/tmp/cvs-serv21001/scripts

Modified Files:
	rebase-xen-kernel.sh 
Log Message:
- xen kernel update.
  * linux-2.6 changeset: 33525:dcc321d1340a
  * linux-2.6-xen-fedora changeset: 35245:3aae428b0bbd
  * linux-2.6-xen changeset: 22813:80c2ccf5c330
  * xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e




Index: rebase-xen-kernel.sh
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/scripts/rebase-xen-kernel.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rebase-xen-kernel.sh	12 Aug 2006 22:43:30 -0000	1.1
+++ rebase-xen-kernel.sh	19 Aug 2006 16:45:56 -0000	1.2
@@ -3,20 +3,30 @@
 # you are supposed to have both linux-2.6 "upstream tree"
 # and linux-2.6-xen-fedora mercurial updated against that tree
 
+# it needs linux-2.6 linux-2.6-xen and linux-2.6-xen-fedora on the current directory
+# with the right changesets on them.
+
 set -x
 
-if [ ! -d linux-2.6 ]; then
-    echo "linux-2.6 directory don't exist";
-    exit 1
-fi
-
-if [ ! -d linux-2.6-xen-fedora/ ]; then
-    echo "linux-2.6-xen-fedora directory don't exist";
-    exit 1
-fi
+# remove previous patch if it exist
+rm -f linux-2.6-xen.patch
+
+for repo in linux-2.6 linux-2.6-xen-fedora linux-2.6-xen; do
+    if [ ! -d $repo/ ]; then
+	echo "$repo directory don't exist";
+	exit 1
+    else
+	echo - $repo `cd $repo; (hg tip | grep "changeset:")` >> linux-2.6-xen.patch
+    fi
+done
+
+# xen unstable is special, don't you know
+echo - `cd linux-2.6-xen; (hg tip -v| grep "xen-unstable changeset:")` >> linux-2.6-xen.patch
+
+
 
 /usr/bin/diff -urNp --exclude=".hg*" --exclude="*.orig" --exclude="*~" \
-    linux-2.6/ linux-2.6-xen-fedora/ > linux-2.6-xen.patch
+    linux-2.6/ linux-2.6-xen-fedora/ >> linux-2.6-xen.patch
 
 
 set +x



From fedora-cvs-commits at redhat.com  Sat Aug 19 16:46:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 12:46:00 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.53,1.54
Message-ID: <200608191646.k7JGk0B4021021@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21001

Modified Files:
	linux-2.6-xen.patch 
Log Message:
- xen kernel update.
  * linux-2.6 changeset: 33525:dcc321d1340a
  * linux-2.6-xen-fedora changeset: 35245:3aae428b0bbd
  * linux-2.6-xen changeset: 22813:80c2ccf5c330
  * xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e



linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    2 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   92 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1185 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  379 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1831 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  153 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  457 +++
 arch/i386/mm/init-xen.c                             |  851 ++++++
 arch/i386/mm/ioremap-xen.c                          |  478 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  699 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  259 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  128 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  413 ++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  867 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2169 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   54 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1211 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1011 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1200 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  283 ++
 drivers/xen/Makefile                                |   19 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  616 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  567 ++++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  154 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1444 ++++++++++
 drivers/xen/blktap/common.h                         |  119 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  180 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  869 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  441 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/reboot.c                           |  383 ++
 drivers/xen/core/skbuff.c                           |  140 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  138 
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1346 +++++++++
 drivers/xen/netback/xenbus.c                        |  428 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1841 +++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  457 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   84 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  358 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1121 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 drivers/xen/xenfb/Makefile                          |    1 
 drivers/xen/xenfb/xenfb.c                           |  568 ++++
 drivers/xen/xenkbd/Makefile                         |    1 
 drivers/xen/xenkbd/xenkbd.c                         |  205 +
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  219 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  508 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   41 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   39 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  190 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  114 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  326 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/linux/xenfb.h                               |   97 
 include/linux/xenkbd.h                              |   82 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  442 +++
 include/xen/interface/arch-powerpc.h                |  120 
 include/xen/interface/arch-x86_32.h                 |  234 +
 include/xen/interface/arch-x86_64.h                 |  300 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  605 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  512 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  120 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 415 files changed, 87859 insertions(+), 218 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.53 -r 1.54 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- linux-2.6-xen.patch	12 Aug 2006 22:51:46 -0000	1.53
+++ linux-2.6-xen.patch	19 Aug 2006 16:45:47 -0000	1.54
@@ -1,6 +1,10 @@
+- linux-2.6 changeset: 33525:dcc321d1340a
+- linux-2.6-xen-fedora changeset: 35245:3aae428b0bbd
+- linux-2.6-xen changeset: 22813:80c2ccf5c330
+- xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
 --- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-07-26 16:46:14.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -24,8 +28,8 @@
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
---- linux-2.6/arch/i386/Kconfig	2006-08-01 06:44:38.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-08-02 18:15:29.000000000 +0200
+--- linux-2.6/arch/i386/Kconfig	2006-08-02 02:30:18.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-08-04 16:21:32.000000000 +0200
 @@ -16,10 +16,12 @@ config X86_32
  
  config GENERIC_TIME
@@ -313,7 +317,7 @@
  	default y
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/Kconfig.cpu linux-2.6-xen-fedora/arch/i386/Kconfig.cpu
 --- linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-07-26 16:46:14.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -332,7 +336,7 @@
  	default y
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/Kconfig.debug linux-2.6-xen-fedora/arch/i386/Kconfig.debug
 --- linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-07-26 16:46:14.000000000 +0200
 @@ -2,6 +2,7 @@ menu "Kernel hacking"
  
  config TRACE_IRQFLAGS_SUPPORT
@@ -351,7 +355,7 @@
            would otherwise cause a system to silently reboot. Disabling this
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/acpi/boot-xen.c linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c
 --- linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-07-26 16:46:14.000000000 +0200
 @@ -0,0 +1,1168 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1523,7 +1527,7 @@
 +}
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/acpi/Makefile linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile
 --- linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-07-26 16:46:14.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1534,22 +1538,19 @@
 +endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
 --- linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-01 02:30:59.000000000 +0200
-@@ -4,7 +4,11 @@
- #include <asm/alternative.h>
- #include <asm/sections.h>
- 
-+#ifdef CONFIG_X86_64_XEN
-+static int no_replacement    = 1;
-+#else
- static int no_replacement    = 0;
-+#endif
- static int smp_alt_once      = 0;
- static int debug_alternative = 0;
- 
++++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-19 17:38:28.000000000 +0200
+@@ -151,7 +151,7 @@ void apply_alternatives(struct alt_instr
+ #ifdef CONFIG_X86_64
+ 		/* vsyscall code is not mapped yet. resolve it manually. */
+ 		if (instr >= (u8 *)VSYSCALL_START && instr < (u8*)VSYSCALL_END) {
+-			instr = __va(instr - (u8*)VSYSCALL_START + (u8*)__pa_symbol(&__vsyscall_0));
++			instr = __va(instr - (u8*)VSYSCALL_START + (u8*)phys_to_machine(__pa_symbol(&__vsyscall_0)));
+ 			DPRINTK("%s: vsyscall fixup: %p => %p\n",
+ 				__FUNCTION__, a->instr, instr);
+ 		}
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/apic-xen.c linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c
 --- linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-07-26 16:46:14.000000000 +0200
 @@ -0,0 +1,160 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1713,7 +1714,7 @@
 +}
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/asm-offsets.c linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c
 --- linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-07-26 16:46:14.000000000 +0200
 @@ -66,9 +66,14 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
@@ -1732,7 +1733,7 @@
  	DEFINE(VDSO_PRELINK, VDSO_PRELINK);
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/cpu/common-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c
 --- linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-08-03 22:52:02.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-07-26 16:46:14.000000000 +0200
 @@ -0,0 +1,740 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
@@ -2476,7 +2477,7 @@
 +#endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/cpu/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile
 --- linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-07-26 16:46:14.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2488,7 +2489,7 @@
 +endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c
 --- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-08-01 02:31:00.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-07-26 16:46:14.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2689,7 +2690,7 @@
 +subsys_initcall(mtrr_init);
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile
 --- linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-08-01 02:30:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-26 16:46:14.000000000 +0200
 @@ -3,3 +3,10 @@ obj-y		+= amd.o
  obj-y		+= cyrix.o
  obj-y		+= centaur.o
@@ -2703,13 +2704,13 @@
 +endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/early_printk-xen.c linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c
 --- linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-08-01 02:31:00.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-07-26 16:46:14.000000000 +0200
 @@ -0,0 +1,2 @@
 +
 +#include "../../x86_64/kernel/early_printk-xen.c"
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/entry.S linux-2.6-xen-fedora/arch/i386/kernel/entry.S
---- linux-2.6/arch/i386/kernel/entry.S	2006-08-01 06:44:38.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-08-02 18:15:29.000000000 +0200
+--- linux-2.6/arch/i386/kernel/entry.S	2006-08-02 02:30:18.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-08-04 16:21:32.000000000 +0200
 @@ -265,7 +265,7 @@ ENTRY(sysenter_entry)
  	CFI_STARTPROC simple
  	CFI_DEF_CFA esp, 0
@@ -2739,7 +2740,7 @@
  	pushl $sysenter_past_esp
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/entry-xen.S linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S
 --- linux-2.6/arch/i386/kernel/entry-xen.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S	2006-08-02 18:15:29.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry-xen.S	2006-08-04 16:21:32.000000000 +0200
 @@ -0,0 +1,1209 @@
 +/*
 + *  linux/arch/i386/entry.S
@@ -3952,7 +3953,7 @@
 +syscall_table_size=(.-sys_call_table)
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/fixup.c linux-2.6-xen-fedora/arch/i386/kernel/fixup.c
 --- linux-2.6/arch/i386/kernel/fixup.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/fixup.c	2006-08-12 00:05:06.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/fixup.c	2006-08-13 01:28:21.000000000 +0200
 @@ -0,0 +1,92 @@
 +/******************************************************************************
 + * fixup.c
@@ -4048,7 +4049,7 @@
 +__initcall(fixup_init);
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/head-xen.S linux-2.6-xen-fedora/arch/i386/kernel/head-xen.S
 --- linux-2.6/arch/i386/kernel/head-xen.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/head-xen.S	2006-08-01 02:31:00.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/head-xen.S	2006-07-26 16:46:14.000000000 +0200
 @@ -0,0 +1,180 @@
 +
 +
@@ -4232,7 +4233,7 @@
 +	.byte	0
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/init_task-xen.c linux-2.6-xen-fedora/arch/i386/kernel/init_task-xen.c
 --- linux-2.6/arch/i386/kernel/init_task-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/init_task-xen.c	2006-08-01 02:31:00.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/init_task-xen.c	2006-07-26 16:46:14.000000000 +0200
 @@ -0,0 +1,51 @@
 +#include <linux/mm.h>
 +#include <linux/module.h>
@@ -4287,7 +4288,7 @@
[...3649 lines suppressed...]
 +/******************************************************************************
 + * evtchn.h
@@ -90900,7 +90933,7 @@
 +#endif /* __LINUX_PUBLIC_EVTCHN_H__ */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/public/privcmd.h linux-2.6-xen-fedora/include/xen/public/privcmd.h
 --- linux-2.6/include/xen/public/privcmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/public/privcmd.h	2006-08-01 02:31:26.000000000 +0200
++++ linux-2.6-xen-fedora/include/xen/public/privcmd.h	2006-07-26 16:46:37.000000000 +0200
 @@ -0,0 +1,79 @@
 +/******************************************************************************
 + * privcmd.h
@@ -90983,8 +91016,8 @@
 +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/xenbus.h linux-2.6-xen-fedora/include/xen/xenbus.h
 --- linux-2.6/include/xen/xenbus.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/xenbus.h	2006-08-12 00:05:06.000000000 +0200
-@@ -0,0 +1,300 @@
++++ linux-2.6-xen-fedora/include/xen/xenbus.h	2006-08-19 18:08:16.000000000 +0200
+@@ -0,0 +1,299 @@
 +/******************************************************************************
 + * xenbus.h
 + *
@@ -91144,7 +91177,6 @@
 +void unregister_xenbus_watch(struct xenbus_watch *watch);
 +void xs_suspend(void);
 +void xs_resume(void);
-+int xenbus_wait_for_devices(void);
 +
 +/* Used by xenbus_dev to borrow kernel's store connection. */
 +void *xenbus_dev_request_and_reply(struct xsd_sockmsg *msg);
@@ -91287,7 +91319,7 @@
 +#endif /* _XEN_XENBUS_H */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/xencons.h linux-2.6-xen-fedora/include/xen/xencons.h
 --- linux-2.6/include/xen/xencons.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/xencons.h	2006-08-01 02:31:26.000000000 +0200
++++ linux-2.6-xen-fedora/include/xen/xencons.h	2006-07-26 16:46:37.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef __ASM_XENCONS_H__
 +#define __ASM_XENCONS_H__
@@ -91305,7 +91337,7 @@
 +#endif /* __ASM_XENCONS_H__ */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/xen_proc.h linux-2.6-xen-fedora/include/xen/xen_proc.h
 --- linux-2.6/include/xen/xen_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/xen_proc.h	2006-08-12 00:05:06.000000000 +0200
++++ linux-2.6-xen-fedora/include/xen/xen_proc.h	2006-08-13 01:28:24.000000000 +0200
 @@ -0,0 +1,12 @@
 +
 +#ifndef __ASM_XEN_PROC_H__
@@ -91320,8 +91352,8 @@
 +
 +#endif /* __ASM_XEN_PROC_H__ */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/kernel/fork.c linux-2.6-xen-fedora/kernel/fork.c
---- linux-2.6/kernel/fork.c	2006-08-09 18:25:42.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/fork.c	2006-08-11 15:29:47.000000000 +0200
+--- linux-2.6/kernel/fork.c	2006-08-10 21:33:37.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/fork.c	2006-08-13 01:28:24.000000000 +0200
 @@ -275,6 +275,9 @@ static inline int dup_mmap(struct mm_str
  		if (retval)
  			goto out;
@@ -91334,7 +91366,7 @@
  	up_write(&mm->mmap_sem);
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/kernel/Kconfig.preempt linux-2.6-xen-fedora/kernel/Kconfig.preempt
 --- linux-2.6/kernel/Kconfig.preempt	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/Kconfig.preempt	2006-08-01 02:31:26.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/Kconfig.preempt	2006-07-26 16:46:37.000000000 +0200
 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
  
  config PREEMPT
@@ -91345,7 +91377,7 @@
  	  all kernel code (that is not executing in a critical section)
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/lib/Kconfig.debug linux-2.6-xen-fedora/lib/Kconfig.debug
 --- linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-08-02 18:15:30.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-08-04 16:21:33.000000000 +0200
 @@ -325,7 +325,7 @@ config FRAME_POINTER
  
  config UNWIND_INFO
@@ -91357,7 +91389,7 @@
  	  If you say Y here the resulting kernel image will be slightly larger
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/lib/Makefile linux-2.6-xen-fedora/lib/Makefile
 --- linux-2.6/lib/Makefile	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/lib/Makefile	2006-08-01 02:31:26.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Makefile	2006-07-26 16:46:37.000000000 +0200
 @@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
  obj-$(CONFIG_SMP) += percpu_counter.o
  
@@ -91370,7 +91402,7 @@
  clean-files	:= crc32table.h
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/highmem.c linux-2.6-xen-fedora/mm/highmem.c
 --- linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/highmem.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/mm/highmem.c	2006-07-26 16:46:37.000000000 +0200
 @@ -142,6 +142,17 @@ start:
  	return vaddr;
  }
@@ -91391,7 +91423,7 @@
  	unsigned long vaddr;
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/Kconfig linux-2.6-xen-fedora/mm/Kconfig
 --- linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/Kconfig	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/mm/Kconfig	2006-07-26 16:46:37.000000000 +0200
 @@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
  # Default to 4 for wider testing, though 8 might be more appropriate.
  # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -91409,7 +91441,7 @@
  #
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
 --- linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/memory.c	2006-08-12 00:05:06.000000000 +0200
++++ linux-2.6-xen-fedora/mm/memory.c	2006-08-13 01:28:24.000000000 +0200
 @@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
  	 * and that the resulting page looks ok.
  	 */
@@ -91560,7 +91592,7 @@
   * which was read non-atomically.  Before making any commitment, on
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/mmap.c linux-2.6-xen-fedora/mm/mmap.c
 --- linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/mmap.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/mm/mmap.c	2006-07-26 16:46:37.000000000 +0200
 @@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
  	unsigned long nr_accounted = 0;
  	unsigned long end;
@@ -91574,7 +91606,7 @@
  	tlb = tlb_gather_mmu(mm, 1);
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/page_alloc.c linux-2.6-xen-fedora/mm/page_alloc.c
 --- linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-07-26 16:46:38.000000000 +0200
 @@ -443,7 +443,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -91596,8 +91628,8 @@
  	if (PageAnon(page))
  		page->mapping = NULL;
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
---- linux-2.6/net/core/dev.c	2006-08-09 18:25:43.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/dev.c	2006-08-04 19:17:51.000000000 +0200
+--- linux-2.6/net/core/dev.c	2006-08-04 13:45:06.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/dev.c	2006-08-13 01:28:24.000000000 +0200
 @@ -117,6 +117,12 @@
  #include <linux/dmaengine.h>
  #include <linux/err.h>
@@ -91697,8 +91729,8 @@
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
---- linux-2.6/net/core/skbuff.c	2006-08-09 18:25:43.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-04 19:17:51.000000000 +0200
+--- linux-2.6/net/core/skbuff.c	2006-08-04 13:45:06.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-13 01:28:24.000000000 +0200
 @@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -91787,7 +91819,7 @@
  	C(priority);
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c
 --- linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-26 16:46:38.000000000 +0200
 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -91804,7 +91836,7 @@
  							   hdr->check));
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c
 --- linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-08-01 02:31:27.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-26 16:46:38.000000000 +0200
 @@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
@@ -91821,7 +91853,7 @@
  							   hdr->check));
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/ipv4/xfrm4_output.c linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c
 --- linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-08-01 02:31:28.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-07-26 16:46:38.000000000 +0200
 @@ -18,6 +18,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
@@ -91843,8 +91875,8 @@
  		err = skb_checksum_help(skb, 0);
  		if (err)
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
---- linux-2.6/net/ipv6/addrconf.c	2006-08-09 18:25:43.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-08-04 19:17:51.000000000 +0200
+--- linux-2.6/net/ipv6/addrconf.c	2006-08-04 13:45:06.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-08-13 01:28:24.000000000 +0200
 @@ -2514,6 +2514,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  
@@ -91863,7 +91895,7 @@
  
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/scripts/Makefile.xen linux-2.6-xen-fedora/scripts/Makefile.xen
 --- linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-08-01 02:31:28.000000000 +0200
++++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-07-26 16:46:40.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)



From fedora-cvs-commits at redhat.com  Sat Aug 19 16:47:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 12:47:17 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2573,1.2574
Message-ID: <200608191647.k7JGlHt7024152@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21049

Modified Files:
	kernel-2.6.spec 
Log Message:
- xen kernel update.
  * linux-2.6 changeset: 33525:dcc321d1340a
  * linux-2.6-xen-fedora changeset: 35245:3aae428b0bbd
  * linux-2.6-xen changeset: 22813:80c2ccf5c330
  * xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2573
retrieving revision 1.2574
diff -u -r1.2573 -r1.2574
--- kernel-2.6.spec	17 Aug 2006 22:47:53 -0000	1.2573
+++ kernel-2.6.spec	19 Aug 2006 16:47:10 -0000	1.2574
@@ -1716,6 +1716,13 @@
 %endif
 
 %changelog
+* Sat Aug 19 2006 Juan Quintela <quintela at trasno.mitica> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+- xen kernel update.
+  * linux-2.6 changeset: 33525:dcc321d1340a
+  * linux-2.6-xen-fedora changeset: 35245:3aae428b0bbd
+  * linux-2.6-xen changeset: 22813:80c2ccf5c330
+  * xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e
+
 * Thu Aug 17 2006 Don Zickus <dzickus at redhat.com>
 - NFS 64-bit inode support
 - QLogic firmware



From fedora-cvs-commits at redhat.com  Sat Aug 19 17:00:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 13:00:14 -0400
Subject: rpms/kernel/devel/configs config-xen-generic, 1.25,
	1.26 config-xen-x86, 1.1, 1.2 config-xen-x86_64, 1.6, 1.7
Message-ID: <200608191700.k7JH0Eco003922@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv3875/configs

Modified Files:
	config-xen-generic config-xen-x86 config-xen-x86_64 
Log Message:
- xen big config update.  Every config option is the same than normal kernel
  except MICROCODE, TCG_TPM & CONFIG_DEBUG_SLAB.



Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- config-xen-generic	11 Aug 2006 21:53:42 -0000	1.25
+++ config-xen-generic	19 Aug 2006 17:00:12 -0000	1.26
@@ -49,99 +49,10 @@
 # this breaks jbd & ext3
 # CONFIG_DEBUG_SLAB is not set
 
-#
-# Firmware Drivers
-#
-# CONFIG_EDD is not set
-
-# Huge pages do not currently work under Xen
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-
-# FIXME: Why are the following unset ?
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_DEBUG_RODATA is not set
-# CONFIG_DEBUG_SLAB_LEAK is not set
-
-# needs pm_power_off
-# CONFIG_IPMI_POWEROFF is not set
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCH_CLK_JIFFIES is not set
-CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO_AES_586=m
-
-#
-# kexec does not work with Xen right now.
-#
-# CONFIG_KEXEC is not set
-# CONFIG_TCG_TPM is not set
-
-
-# Microcode driver in Xen won't work as a module - should be upgraded
+# Microcode needs sys_mlock & sys_munlock that are not exported
+# it needs to be compiled in
 CONFIG_MICROCODE=y
 
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# Ethernet (10 or 100Mbit)
-# 
-# CONFIG_LANCE is not set
-# CONFIG_SUNLANCE is not set
-# CONFIG_3C515 is not set
-# CONFIG_NI65 is not set
-# CONFIG_ELPLUS is not set
-# B44 results in "b44.ko needs unknown symbol dma_get_cache_alignment"
-# CONFIG_B44 is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_SCSI_AHA1542 is not set
-
-#
-# ISA devices
-#
-# CONFIG_SND_SB16_CSP is not set
-
-#.
-# Serial drivers
-#
-CONFIG_SERIAL_8250=m
-# CONFIG_SERIAL_8250_CONSOLE is not set
-
-#
-# FIR device drivers
-#
-# CONFIG_TOSHIBA_FIR is not set
-
-# 
-# TPM
-# 
-# CONFIG_XEN_TPMDEV_FRONTEND is not set
-
-#
-# Power management bits that don't work in Xen:
-#
-# CONFIG_X86_P4_CLOCKMOD is not set
+# TPM is not working, somebody have to merge the xen bits
+# CONFIG_TCG_TPM is not set
 


Index: config-xen-x86
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-x86,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-xen-x86	19 Jul 2006 17:20:13 -0000	1.1
+++ config-xen-x86	19 Aug 2006 17:00:12 -0000	1.2
@@ -3,4 +3,3 @@
 CONFIG_X86_XEN=y
 # CONFIG_X86_GENERICARCH is not set
 
-# CONFIG_X86_POWERNOW_K7 is not set


Index: config-xen-x86_64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-x86_64,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-xen-x86_64	31 Jul 2006 20:55:10 -0000	1.6
+++ config-xen-x86_64	19 Aug 2006 17:00:12 -0000	1.7
@@ -6,5 +6,3 @@
 CONFIG_X86_64_XEN=y
 
 CONFIG_GENERIC_CPU=y
-
-# CONFIG_CALGARY_IOMMU is not set                                                               |extern int numa_setup(char *opt);



From fedora-cvs-commits at redhat.com  Sat Aug 19 17:00:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 13:00:14 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2574,1.2575
Message-ID: <200608191700.k7JH0Ev3003909@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3875

Modified Files:
	kernel-2.6.spec 
Log Message:
- xen big config update.  Every config option is the same than normal kernel
  except MICROCODE, TCG_TPM & CONFIG_DEBUG_SLAB.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2574
retrieving revision 1.2575
diff -u -r1.2574 -r1.2575
--- kernel-2.6.spec	19 Aug 2006 16:47:10 -0000	1.2574
+++ kernel-2.6.spec	19 Aug 2006 17:00:11 -0000	1.2575
@@ -1722,6 +1722,8 @@
   * linux-2.6-xen-fedora changeset: 35245:3aae428b0bbd
   * linux-2.6-xen changeset: 22813:80c2ccf5c330
   * xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e
+- xen big config update.  Every config option is the same than normal kernel
+  except MICROCODE, TCG_TPM & CONFIG_DEBUG_SLAB.
 
 * Thu Aug 17 2006 Don Zickus <dzickus at redhat.com>
 - NFS 64-bit inode support



From fedora-cvs-commits at redhat.com  Sat Aug 19 17:02:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 13:02:07 -0400
Subject: rpms/kernel/devel/configs config-xen-x86,1.2,1.3
Message-ID: <200608191702.k7JH27Xt004017@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv3990/configs

Modified Files:
	config-xen-x86 
Log Message:
disable XEN_FRAMEBUFFER & XEN_KEYBOARD.


Index: config-xen-x86
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-x86,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-xen-x86	19 Aug 2006 17:00:12 -0000	1.2
+++ config-xen-x86	19 Aug 2006 17:02:05 -0000	1.3
@@ -3,3 +3,6 @@
 CONFIG_X86_XEN=y
 # CONFIG_X86_GENERICARCH is not set
 
+# they are not ready yet
+# CONFIG_XEN_FRAMEBUFFER is not set
+# CONFIG_XEN_KEYBOARD is not set=======



From fedora-cvs-commits at redhat.com  Sat Aug 19 17:02:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 13:02:08 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2575,1.2576
Message-ID: <200608191702.k7JH288i004012@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3990

Modified Files:
	kernel-2.6.spec 
Log Message:
disable XEN_FRAMEBUFFER & XEN_KEYBOARD.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2575
retrieving revision 1.2576
diff -u -r1.2575 -r1.2576
--- kernel-2.6.spec	19 Aug 2006 17:00:11 -0000	1.2575
+++ kernel-2.6.spec	19 Aug 2006 17:02:05 -0000	1.2576
@@ -1724,6 +1724,7 @@
   * xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e
 - xen big config update.  Every config option is the same than normal kernel
   except MICROCODE, TCG_TPM & CONFIG_DEBUG_SLAB.
+- disable XEN_FRAMEBUFFER & XEN_KEYBOARD.
 
 * Thu Aug 17 2006 Don Zickus <dzickus at redhat.com>
 - NFS 64-bit inode support



From fedora-cvs-commits at redhat.com  Sat Aug 19 17:11:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 13:11:43 -0400
Subject: rpms/kernel/devel linux-2.6-sysrq-c.patch, NONE, 1.1 kernel-2.6.spec,
	1.2576, 1.2577
Message-ID: <200608191711.k7JHBhSW014792@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14704

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-sysrq-c.patch 
Log Message:
- make sysrq c to "crash" all kernels.


linux-2.6-sysrq-c.patch:
 sysrq.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-sysrq-c.patch ---
--- linux-2.6.17.noarch/drivers/char/sysrq.c.orig	2006-08-01 11:07:43.000000000 -0400
+++ linux-2.6.17.noarch/drivers/char/sysrq.c	2006-08-01 11:09:03.000000000 -0400
@@ -94,11 +94,13 @@
 #define sysrq_unraw_op (*(struct sysrq_key_op *)0)
 #endif /* CONFIG_VT */
 
-#ifdef CONFIG_KEXEC
 static void sysrq_handle_crashdump(int key, struct pt_regs *pt_regs,
 				struct tty_struct *tty)
 {
+#ifdef CONFIG_KEXEC
 	crash_kexec(pt_regs);
+#endif
+	*( (char *) 0) = 0;
 }
 static struct sysrq_key_op sysrq_crashdump_op = {
 	.handler	= sysrq_handle_crashdump,
@@ -106,9 +108,6 @@
 	.action_msg	= "Trigger a crashdump",
 	.enable_mask	= SYSRQ_ENABLE_DUMP,
 };
-#else
-#define sysrq_crashdump_op (*(struct sysrq_key_op *)0)
-#endif
 
 static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs,
 				struct tty_struct *tty)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2576
retrieving revision 1.2577
diff -u -r1.2576 -r1.2577
--- kernel-2.6.spec	19 Aug 2006 17:02:05 -0000	1.2576
+++ kernel-2.6.spec	19 Aug 2006 17:11:39 -0000	1.2577
@@ -275,6 +275,9 @@
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
 
+# enable sysrq-c on all kernels, not only kexec
+Patch20: linux-2.6-sysrq-c.patch
+
 # Patches 100 through 500 are meant for architecture patches
 
 # 200 - 299   x86(-64)
@@ -716,6 +719,9 @@
 # Rolands utrace ptrace replacement.
 %patch10 -p1
 
+# sysrq works always
+%patch20 -p1
+
 # Architecture patches
 
 #
@@ -1725,6 +1731,7 @@
 - xen big config update.  Every config option is the same than normal kernel
   except MICROCODE, TCG_TPM & CONFIG_DEBUG_SLAB.
 - disable XEN_FRAMEBUFFER & XEN_KEYBOARD.
+- make sysrq c to "crash" all kernels.
 
 * Thu Aug 17 2006 Don Zickus <dzickus at redhat.com>
 - NFS 64-bit inode support



From fedora-cvs-commits at redhat.com  Sat Aug 19 19:13:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 15:13:30 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2577,
	1.2578 linux-2.6-xen.patch, 1.54, 1.55
Message-ID: <200608191913.k7JJDUIW012411@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12182

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
  * linux-2.6-xen-fedora changeset: 35246:284d7c849c3f
  * fix compilation of non-xen



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2577
retrieving revision 1.2578
diff -u -r1.2577 -r1.2578
--- kernel-2.6.spec	19 Aug 2006 17:11:39 -0000	1.2577
+++ kernel-2.6.spec	19 Aug 2006 19:13:22 -0000	1.2578
@@ -1722,10 +1722,10 @@
 %endif
 
 %changelog
-* Sat Aug 19 2006 Juan Quintela <quintela at trasno.mitica> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+* Sat Aug 19 2006 Juan Quintela <quintela at redhat.com>
 - xen kernel update.
   * linux-2.6 changeset: 33525:dcc321d1340a
-  * linux-2.6-xen-fedora changeset: 35245:3aae428b0bbd
+  * linux-2.6-xen-fedora changeset: 35246:284d7c849c3f
   * linux-2.6-xen changeset: 22813:80c2ccf5c330
   * xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e
 - xen big config update.  Every config option is the same than normal kernel

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   92 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1185 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  379 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1831 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  153 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  457 +++
 arch/i386/mm/init-xen.c                             |  851 ++++++
 arch/i386/mm/ioremap-xen.c                          |  478 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  699 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  259 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  128 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  413 ++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  867 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2169 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   54 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1211 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1011 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1200 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  283 ++
 drivers/xen/Makefile                                |   19 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  616 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  567 ++++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  154 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1444 ++++++++++
 drivers/xen/blktap/common.h                         |  119 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  180 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  869 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  441 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/reboot.c                           |  383 ++
 drivers/xen/core/skbuff.c                           |  140 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  138 
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1346 +++++++++
 drivers/xen/netback/xenbus.c                        |  428 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1841 +++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  457 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   84 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  358 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1121 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 drivers/xen/xenfb/Makefile                          |    1 
 drivers/xen/xenfb/xenfb.c                           |  568 ++++
 drivers/xen/xenkbd/Makefile                         |    1 
 drivers/xen/xenkbd/xenkbd.c                         |  205 +
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  219 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  508 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   41 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   39 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  190 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  114 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  326 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/linux/xenfb.h                               |   97 
 include/linux/xenkbd.h                              |   82 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  442 +++
 include/xen/interface/arch-powerpc.h                |  120 
 include/xen/interface/arch-x86_32.h                 |  234 +
 include/xen/interface/arch-x86_64.h                 |  300 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  605 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  512 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  120 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 415 files changed, 87862 insertions(+), 217 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- linux-2.6-xen.patch	19 Aug 2006 16:45:47 -0000	1.54
+++ linux-2.6-xen.patch	19 Aug 2006 19:13:23 -0000	1.55
@@ -1,5 +1,5 @@
 - linux-2.6 changeset: 33525:dcc321d1340a
-- linux-2.6-xen-fedora changeset: 35245:3aae428b0bbd
+- linux-2.6-xen-fedora changeset: 35246:284d7c849c3f
 - linux-2.6-xen changeset: 22813:80c2ccf5c330
 - xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
@@ -1538,13 +1538,16 @@
 +endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
 --- linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-19 17:38:28.000000000 +0200
-@@ -151,7 +151,7 @@ void apply_alternatives(struct alt_instr
++++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-19 21:10:30.000000000 +0200
+@@ -151,7 +151,11 @@ void apply_alternatives(struct alt_instr
  #ifdef CONFIG_X86_64
  		/* vsyscall code is not mapped yet. resolve it manually. */
  		if (instr >= (u8 *)VSYSCALL_START && instr < (u8*)VSYSCALL_END) {
--			instr = __va(instr - (u8*)VSYSCALL_START + (u8*)__pa_symbol(&__vsyscall_0));
++#ifdef CONFIG_XEN
 +			instr = __va(instr - (u8*)VSYSCALL_START + (u8*)phys_to_machine(__pa_symbol(&__vsyscall_0)));
++#else
+ 			instr = __va(instr - (u8*)VSYSCALL_START + (u8*)__pa_symbol(&__vsyscall_0));
++#endif
  			DPRINTK("%s: vsyscall fixup: %p => %p\n",
  				__FUNCTION__, a->instr, instr);
  		}



From fedora-cvs-commits at redhat.com  Sat Aug 19 19:17:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 15:17:09 -0400
Subject: rpms/kernel/devel/configs config-xen-x86,1.3,1.4
Message-ID: <200608191917.k7JJH9sT022694@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv22439/configs

Modified Files:
	config-xen-x86 
Log Message:
fix merge error noticed by davej


Index: config-xen-x86
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-x86,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-xen-x86	19 Aug 2006 17:02:05 -0000	1.3
+++ config-xen-x86	19 Aug 2006 19:17:06 -0000	1.4
@@ -5,4 +5,4 @@
 
 # they are not ready yet
 # CONFIG_XEN_FRAMEBUFFER is not set
-# CONFIG_XEN_KEYBOARD is not set=======
+# CONFIG_XEN_KEYBOARD is not set



From fedora-cvs-commits at redhat.com  Sat Aug 19 22:49:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 18:49:37 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2578,
	1.2579 linux-2.6-xen.patch, 1.55, 1.56
Message-ID: <200608192249.k7JMnbDB016559@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12756

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
linux-2.6-xen-fedora changeset: 35247:400b0cf28ee or fix the floppy on x86_64 xen


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2578
retrieving revision 1.2579
diff -u -r1.2578 -r1.2579
--- kernel-2.6.spec	19 Aug 2006 19:13:22 -0000	1.2578
+++ kernel-2.6.spec	19 Aug 2006 22:49:05 -0000	1.2579
@@ -1725,7 +1725,7 @@
 * Sat Aug 19 2006 Juan Quintela <quintela at redhat.com>
 - xen kernel update.
   * linux-2.6 changeset: 33525:dcc321d1340a
-  * linux-2.6-xen-fedora changeset: 35246:284d7c849c3f
+  * linux-2.6-xen-fedora changeset: 35247:400b0cf28ee4
   * linux-2.6-xen changeset: 22813:80c2ccf5c330
   * xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e
 - xen big config update.  Every config option is the same than normal kernel

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   92 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1185 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  379 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1831 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  153 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  457 +++
 arch/i386/mm/init-xen.c                             |  851 ++++++
 arch/i386/mm/ioremap-xen.c                          |  478 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  699 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  259 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  128 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  413 ++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  867 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2169 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   54 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1211 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1011 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1200 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  283 ++
 drivers/xen/Makefile                                |   19 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  616 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  567 ++++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  154 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1444 ++++++++++
 drivers/xen/blktap/common.h                         |  119 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  180 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  869 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  441 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/reboot.c                           |  383 ++
 drivers/xen/core/skbuff.c                           |  140 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  138 
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1346 +++++++++
 drivers/xen/netback/xenbus.c                        |  428 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1841 +++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  457 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   84 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  358 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1121 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 drivers/xen/xenfb/Makefile                          |    1 
 drivers/xen/xenfb/xenfb.c                           |  568 ++++
 drivers/xen/xenkbd/Makefile                         |    1 
 drivers/xen/xenkbd/xenkbd.c                         |  205 +
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  219 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  508 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   41 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   39 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  190 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  114 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  326 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/linux/xenfb.h                               |   97 
 include/linux/xenkbd.h                              |   82 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  442 +++
 include/xen/interface/arch-powerpc.h                |  120 
 include/xen/interface/arch-x86_32.h                 |  234 +
 include/xen/interface/arch-x86_64.h                 |  300 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  605 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  512 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  120 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 415 files changed, 87862 insertions(+), 217 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- linux-2.6-xen.patch	19 Aug 2006 19:13:23 -0000	1.55
+++ linux-2.6-xen.patch	19 Aug 2006 22:49:07 -0000	1.56
@@ -1,5 +1,5 @@
 - linux-2.6 changeset: 33525:dcc321d1340a
-- linux-2.6-xen-fedora changeset: 35246:284d7c849c3f
+- linux-2.6-xen-fedora changeset: 35247:400b0cf28ee4
 - linux-2.6-xen changeset: 22813:80c2ccf5c330
 - xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
@@ -79226,7 +79226,7 @@
 +#endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/asm-x86_64/mach-xen/asm/floppy.h linux-2.6-xen-fedora/include/asm-x86_64/mach-xen/asm/floppy.h
 --- linux-2.6/include/asm-x86_64/mach-xen/asm/floppy.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/asm-x86_64/mach-xen/asm/floppy.h	2006-07-26 16:46:35.000000000 +0200
++++ linux-2.6-xen-fedora/include/asm-x86_64/mach-xen/asm/floppy.h	2006-08-20 00:35:38.000000000 +0200
 @@ -0,0 +1,206 @@
 +/*
 + * Architecture specific parts of the Floppy driver
@@ -79365,7 +79365,7 @@
 +static int fd_request_irq(void)
 +{
 +	return request_irq(FLOPPY_IRQ, floppy_hardint,
-+			   SA_DISABLED, "floppy", NULL);
++			   IRQF_DISABLED, "floppy", NULL);
 +}
 +
 +#if 0



From fedora-cvs-commits at redhat.com  Sat Aug 19 23:25:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 19:25:56 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2176, 1.2177 linux-2.6-xen.patch,
	1.19, 1.20
Message-ID: <200608192325.k7JNPub1013878@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13603

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
  * linux-2.6.17-xen cset changeset:   29032:47ca0afc5fad
    - fix oprofile non xen compilation



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2176
retrieving revision 1.2177
diff -u -r1.2176 -r1.2177
--- kernel-2.6.spec	15 Aug 2006 11:07:39 -0000	1.2176
+++ kernel-2.6.spec	19 Aug 2006 23:25:51 -0000	1.2177
@@ -1539,7 +1539,7 @@
 %changelog
 * Tue Aug 15 2006 Juan Quintela <quintela at redhat.com>
 - linux-2.6-xen update
-  * linux-2.6.17-xen cset 29030:888231795371
+  * linux-2.6.17-xen cset changeset:   29032:47ca0afc5fad
   * linux-2.6-xen cset 22813:80c2ccf5c330
 - s/xen_version/xen_hv_cset/ as Fedora.
 - update xen hv to cset 11061.

linux-2.6-xen.patch:
 Documentation/networking/netdevices.txt             |    8 
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  614 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1116 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  734 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  478 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  700 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  542 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  112 
 arch/ia64/kernel/gate.lds.S                         |   23 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  255 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   79 
 arch/ia64/kernel/setup.c                            |   77 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  414 +++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  116 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   55 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   62 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  753 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  159 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1710 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  690 +++++
 arch/x86_64/mm/init-xen.c                           | 1202 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  397 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/infiniband/ulp/ipoib/ipoib_multicast.c      |    6 
 drivers/media/dvb/dvb-core/dvb_net.c                |    4 
 drivers/net/8139cp.c                                |    2 
 drivers/net/bnx2.c                                  |    8 
 drivers/net/bonding/bond_main.c                     |    9 
 drivers/net/chelsio/sge.c                           |    4 
 drivers/net/e1000/e1000_main.c                      |   11 
 drivers/net/forcedeth.c                             |   26 
 drivers/net/hamradio/6pack.c                        |    8 
 drivers/net/hamradio/mkiss.c                        |    8 
 drivers/net/ifb.c                                   |   10 
 drivers/net/irda/vlsi_ir.c                          |    2 
 drivers/net/ixgb/ixgb_main.c                        |    4 
 drivers/net/loopback.c                              |    4 
 drivers/net/mv643xx_eth.c                           |    2 
 drivers/net/natsemi.c                               |    4 
 drivers/net/r8169.c                                 |    2 
 drivers/net/s2io.c                                  |   16 
 drivers/net/sky2.c                                  |    4 
 drivers/net/tg3.c                                   |    4 
 drivers/net/tulip/winbond-840.c                     |    9 
 drivers/net/typhoon.c                               |    6 
 drivers/net/via-velocity.c                          |   10 
 drivers/net/wireless/orinoco.c                      |    4 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   34 
 drivers/oprofile/oprof.h                            |    7 
 drivers/oprofile/oprofile_files.c                   |  205 +
 drivers/pci/Kconfig                                 |    1 
 drivers/s390/net/qeth_eddp.c                        |   12 
 drivers/s390/net/qeth_main.c                        |    8 
 drivers/s390/net/qeth_tso.h                         |    2 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  617 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  566 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1450 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  853 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  383 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  138 +
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1345 +++++++++
 drivers/xen/netback/xenbus.c                        |  428 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1841 +++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  457 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  286 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  359 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1142 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   77 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  220 +
 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                 |   28 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  109 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |  101 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-i386/spinlock.h                         |    2 
 include/asm-ia64/agp.h                              |   39 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  191 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  114 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  145 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  136 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/ethtool.h                             |    2 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/netdevice.h                           |   74 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   58 
 include/net/pkt_sched.h                             |    7 
 include/net/protocol.h                              |    3 
 include/net/sock.h                                  |    4 
 include/net/tcp.h                                   |    7 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  442 +++
 include/xen/interface/arch-powerpc.h                |  120 
 include/xen/interface/arch-x86_32.h                 |  234 +
 include/xen/interface/arch-x86_64.h                 |  300 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  605 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  512 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   77 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |   26 
 kernel/irq/spurious.c                               |    3 
 kernel/timer.c                                      |   16 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/atm/clip.c                                      |    8 
 net/bridge/br_device.c                              |    8 
 net/bridge/br_forward.c                             |    2 
 net/bridge/br_if.c                                  |   23 
 net/bridge/br_netfilter.c                           |    7 
 net/core/dev.c                                      |  284 +-
 net/core/dev_mcast.c                                |   28 
 net/core/ethtool.c                                  |   37 
 net/core/netpoll.c                                  |    9 
 net/core/pktgen.c                                   |    8 
 net/core/skbuff.c                                   |  181 +
 net/decnet/dn_nsp_in.c                              |    3 
 net/decnet/dn_route.c                               |    3 
 net/ipv4/af_inet.c                                  |   87 
 net/ipv4/ip_output.c                                |   18 
 net/ipv4/ipcomp.c                                   |   11 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   10 
 net/ipv4/tcp.c                                      |   86 
 net/ipv4/tcp_input.c                                |    2 
 net/ipv4/tcp_ipv4.c                                 |   18 
 net/ipv4/tcp_output.c                               |   47 
 net/ipv4/xfrm4_output.c                             |   60 
 net/ipv6/addrconf.c                                 |    2 
 net/ipv6/ip6_output.c                               |    7 
 net/ipv6/ipcomp6.c                                  |   11 
 net/ipv6/xfrm6_output.c                             |   39 
 net/sched/sch_generic.c                             |   66 
 net/sched/sch_teql.c                                |    9 
 scripts/Makefile.xen                                |   14 
 472 files changed, 87464 insertions(+), 623 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-xen.patch	15 Aug 2006 11:07:40 -0000	1.19
+++ linux-2.6-xen.patch	19 Aug 2006 23:25:52 -0000	1.20
@@ -36696,7 +36696,7 @@
 +}
 diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/x86_64/kernel/setup-xen.c compiling/arch/x86_64/kernel/setup-xen.c
 --- linux-2.6.17.8/arch/x86_64/kernel/setup-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/x86_64/kernel/setup-xen.c	2006-08-13 14:43:11.000000000 +0200
++++ compiling/arch/x86_64/kernel/setup-xen.c	2006-08-20 01:06:04.000000000 +0200
 @@ -0,0 +1,1710 @@
 +/*
 + *  linux/arch/x86-64/kernel/setup.c
@@ -38389,7 +38389,7 @@
 +	.show =	show_cpuinfo,
 +};
 +
-+#ifdef CONFIG_INPUT_PCSPKR
++#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
 +#include <linux/platform_device.h>
 +static __init int add_pcspkr(void)
 +{
@@ -45636,7 +45636,7 @@
   
 diff -urNp --exclude='.hg*' linux-2.6.17.8/drivers/oprofile/oprof.c compiling/drivers/oprofile/oprof.c
 --- linux-2.6.17.8/drivers/oprofile/oprof.c	2006-06-18 03:49:35.000000000 +0200
-+++ compiling/drivers/oprofile/oprof.c	2006-08-13 14:43:17.000000000 +0200
++++ compiling/drivers/oprofile/oprof.c	2006-08-17 19:39:14.000000000 +0200
 @@ -5,6 +5,10 @@
   * @remark Read the file COPYING
   *
@@ -45657,10 +45657,11 @@
  struct oprofile_operations oprofile_ops;
  
  unsigned long oprofile_started;
-@@ -33,6 +37,32 @@ static DECLARE_MUTEX(start_sem);
+@@ -33,6 +37,34 @@ static DECLARE_MUTEX(start_sem);
   */
  static int timer = 0;
  
++#ifdef CONFIG_XEN
 +int oprofile_set_active(int active_domains[], unsigned int adomains)
 +{
 +	int err;
@@ -45686,25 +45687,29 @@
 +	up(&start_sem);
 +	return err;
 +}
++#endif
 +
  int oprofile_setup(void)
  {
  	int err;
 diff -urNp --exclude='.hg*' linux-2.6.17.8/drivers/oprofile/oprof.h compiling/drivers/oprofile/oprof.h
 --- linux-2.6.17.8/drivers/oprofile/oprof.h	2006-06-18 03:49:35.000000000 +0200
-+++ compiling/drivers/oprofile/oprof.h	2006-08-13 14:43:17.000000000 +0200
-@@ -35,5 +35,8 @@ void oprofile_create_files(struct super_
++++ compiling/drivers/oprofile/oprof.h	2006-08-17 19:38:31.000000000 +0200
+@@ -35,5 +35,10 @@ void oprofile_create_files(struct super_
  void oprofile_timer_init(struct oprofile_operations * ops);
  
  int oprofile_set_backtrace(unsigned long depth);
+- 
 +
++#ifdef CONFIG_XEN
 +int oprofile_set_active(int active_domains[], unsigned int adomains);
 +int oprofile_set_passive(int passive_domains[], unsigned int pdomains);
-  
++#endif
++
  #endif /* OPROF_H */
 diff -urNp --exclude='.hg*' linux-2.6.17.8/drivers/oprofile/oprofile_files.c compiling/drivers/oprofile/oprofile_files.c
 --- linux-2.6.17.8/drivers/oprofile/oprofile_files.c	2006-06-18 03:49:35.000000000 +0200
-+++ compiling/drivers/oprofile/oprofile_files.c	2006-08-13 14:43:17.000000000 +0200
++++ compiling/drivers/oprofile/oprofile_files.c	2006-08-17 19:37:59.000000000 +0200
 @@ -5,15 +5,21 @@
   * @remark Read the file COPYING
   *
@@ -45728,7 +45733,7 @@
  unsigned long fs_buffer_size = 131072;
  unsigned long fs_cpu_buffer_size = 8192;
  unsigned long fs_buffer_watershed = 32768; /* FIXME: tune */
-@@ -117,11 +123,202 @@ static ssize_t dump_write(struct file * 
+@@ -117,11 +123,206 @@ static ssize_t dump_write(struct file * 
  static struct file_operations dump_fops = {
  	.write		= dump_write,
  };
@@ -45736,6 +45741,7 @@
 +
 +#define TMPBUFSIZE 512
 +
++#ifdef CONFIG_XEN
 +static unsigned int adomains = 0;
 +static int active_domains[MAX_OPROF_DOMAINS + 1];
 +static DEFINE_MUTEX(adom_mutex);
@@ -45922,13 +45928,16 @@
 +	.read		= pdomain_read,
 +	.write		= pdomain_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);
 +	oprofilefs_create_file(sb, root, "passive_domains", &passive_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);



From fedora-cvs-commits at redhat.com  Sun Aug 20 03:33:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 19 Aug 2006 23:33:26 -0400
Subject: rpms/kernel/devel git-gregkh.patch, 1.7, 1.8 kernel-2.6.spec, 1.2579,
	1.2580 linux-2.6-debug-Wundef.patch, 1.6,
	1.7 linux-2.6-lockdep-fixes.patch, 1.21,
	1.22 linux-2.6-ppc-fix-irq-mapping.patch, 1.1, NONE
Message-ID: <200608200333.k7K3XQxi021297@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21011

Modified Files:
	git-gregkh.patch kernel-2.6.spec linux-2.6-debug-Wundef.patch 
	linux-2.6-lockdep-fixes.patch 
Removed Files:
	linux-2.6-ppc-fix-irq-mapping.patch 
Log Message:
Update to latest upstream from GregKH's git tree.


git-gregkh.patch:
 b/Documentation/fb/imacfb.txt                  |   31 +
 b/Documentation/kobject.txt                    |    2 
 b/Documentation/networking/ip-sysctl.txt       |    6 
 b/Documentation/powerpc/booting-without-of.txt |   10 
 b/MAINTAINERS                                  |    8 
 b/Makefile                                     |   31 +
 b/arch/arm/common/rtctime.c                    |    1 
 b/arch/arm/kernel/traps.c                      |    2 
 b/arch/arm/mach-ixp4xx/common-pci.c            |    2 
 b/arch/arm/mach-ixp4xx/gtwx5715-setup.c        |    7 
 b/arch/i386/kernel/traps.c                     |    2 
 b/arch/ia64/kernel/traps.c                     |    2 
 b/arch/powerpc/Kconfig                         |    7 
 b/arch/powerpc/boot/dts/mpc8641_hpcn.dts       |  339 +++++++++++++++++++
 b/arch/powerpc/configs/g5_defconfig            |  122 +++++--
 b/arch/powerpc/configs/iseries_defconfig       |   78 +++-
 b/arch/powerpc/configs/pseries_defconfig       |   78 +++-
 b/arch/powerpc/kernel/Makefile                 |    4 
 b/arch/powerpc/kernel/cpu_setup_power4.S       |    2 
 b/arch/powerpc/kernel/crash.c                  |   11 
 b/arch/powerpc/kernel/irq.c                    |    2 
 b/arch/powerpc/kernel/kprobes.c                |    2 
 b/arch/powerpc/kernel/machine_kexec.c          |   56 +++
 b/arch/powerpc/kernel/machine_kexec_64.c       |   57 ---
 b/arch/powerpc/kernel/rtas.c                   |   21 +
 b/arch/powerpc/kernel/traps.c                  |   18 -
 b/arch/powerpc/platforms/pseries/setup.c       |    2 
 b/arch/powerpc/platforms/pseries/xics.c        |    6 
 b/arch/powerpc/sysdev/fsl_soc.c                |   12 
 b/arch/s390/appldata/appldata_base.c           |    2 
 b/arch/s390/mm/init.c                          |    6 
 b/arch/x86_64/kernel/traps.c                   |    2 
 b/arch/xtensa/kernel/traps.c                   |    2 
 b/drivers/char/watchdog/Kconfig                |    8 
 b/drivers/ide/pci/generic.c                    |   30 +
 b/drivers/md/dm-mpath.c                        |    3 
 b/drivers/media/dvb/bt8xx/dst.c                |   58 +--
 b/drivers/media/dvb/dvb-core/Makefile          |    6 
 b/drivers/media/radio/Kconfig                  |   12 
 b/drivers/media/radio/Makefile                 |    1 
 b/drivers/media/radio/dsbr100.c                |  430 +++++++++++++++++++++++++
 b/drivers/media/video/Kconfig                  |   12 
 b/drivers/media/video/Makefile                 |    2 
 b/drivers/media/video/compat_ioctl32.c         |   32 +
 b/drivers/media/video/cx25840/cx25840-core.c   |    4 
 b/drivers/media/video/cx88/cx88-video.c        |    4 
 b/drivers/media/video/msp3400-kthreads.c       |    4 
 b/drivers/media/video/pwc/Kconfig              |    2 
 b/drivers/media/video/pwc/pwc-if.c             |    1 
 b/drivers/media/video/saa7134/saa7134-video.c  |    2 
 b/drivers/media/video/tuner-types.c            |   14 
 b/drivers/media/video/v4l1-compat.c            |    4 
 b/drivers/media/video/v4l2-common.c            |    6 
 b/drivers/media/video/videodev.c               |    2 
 b/drivers/media/video/vivi.c                   |    4 
 b/drivers/mmc/mmc_queue.c                      |    3 
 b/drivers/mmc/wbsd.c                           |    9 
 b/drivers/net/bnx2.c                           |   49 +-
 b/drivers/net/bnx2.h                           |   12 
 b/drivers/net/myri10ge/myri10ge.c              |    2 
 b/drivers/net/ppp_generic.c                    |   30 +
 b/drivers/net/tg3.c                            |   51 +-
 b/drivers/net/tg3.h                            |    8 
 b/drivers/pci/hotplug/Kconfig                  |    7 
 b/drivers/pci/hotplug/pciehp.h                 |    5 
 b/drivers/pci/hotplug/pciehp_hpc.c             |    4 
 b/drivers/s390/block/dasd.c                    |    2 
 b/drivers/s390/block/dasd_devmap.c             |   84 ++--
 b/drivers/s390/block/dasd_eckd.c               |    8 
 b/drivers/s390/block/xpram.c                   |   25 -
 b/drivers/s390/char/tape_class.c               |    2 
 b/drivers/s390/cio/device_fsm.c                |    1 
 b/drivers/s390/cio/device_ops.c                |    3 
 b/drivers/scsi/arm/Kconfig                     |    3 
 b/drivers/scsi/arm/scsi.h                      |    2 
 b/drivers/scsi/ata_piix.c                      |    5 
 b/drivers/scsi/libata-core.c                   |   34 -
 b/drivers/scsi/libata-scsi.c                   |   13 
 b/drivers/scsi/sata_sil24.c                    |    1 
 b/drivers/usb/host/ohci-au1xxx.c               |    1 
 b/drivers/usb/input/appletouch.c               |    2 
 b/drivers/usb/misc/usbtest.c                   |    5 
 b/drivers/usb/serial/ftdi_sio.c                |    2 
 b/drivers/usb/serial/ftdi_sio.h                |    6 
 b/drivers/usb/serial/ipaq.c                    |    2 
 b/drivers/usb/storage/unusual_devs.h           |   10 
 b/drivers/video/Kconfig                        |    2 
 b/drivers/video/imacfb.c                       |   49 ++
 b/fs/adfs/super.c                              |    2 
 b/fs/fuse/file.c                               |   10 
 b/fs/jfs/inode.c                               |   16 
 b/fs/jfs/jfs_inode.h                           |    1 
 b/fs/jfs/super.c                               |  118 ++++++
 b/fs/locks.c                                   |    6 
 b/fs/ocfs2/dlm/dlmmaster.c                     |    1 
 b/fs/ocfs2/dlm/dlmunlock.c                     |   43 +-
 b/fs/ocfs2/localalloc.c                        |    8 
 b/fs/ocfs2/ocfs2.h                             |    2 
 b/fs/ocfs2/suballoc.c                          |  261 +++++++++++++--
 b/fs/ocfs2/suballoc.h                          |    2 
 b/fs/ocfs2/super.c                             |    8 
 b/fs/udf/super.c                               |    7 
 b/fs/xfs/xfs_alloc.c                           |  103 +++--
 b/include/asm-powerpc/kexec.h                  |    3 
 b/include/asm-powerpc/rtas.h                   |    1 
 b/include/linux/fb.h                           |    2 
 b/include/linux/if_vlan.h                      |    5 
 b/include/linux/kernel.h                       |    1 
 b/include/linux/mm.h                           |    1 
 b/include/linux/netdevice.h                    |   27 +
 b/include/linux/skbuff.h                       |   19 -
 b/include/media/v4l2-dev.h                     |    2 
 b/kernel/futex.c                               |   16 
 b/kernel/hrtimer.c                             |    2 
 b/kernel/panic.c                               |    1 
 b/kernel/timer.c                               |   41 --
 b/kernel/workqueue.c                           |   33 +
 b/mm/swap.c                                    |   20 +
 b/net/atm/proc.c                               |    2 
 b/net/bridge/br_if.c                           |    7 
 b/net/bridge/netfilter/ebt_ulog.c              |    3 
 b/net/core/dev.c                               |   37 --
 b/net/core/dst.c                               |    3 
 b/net/core/pktgen.c                            |    4 
 b/net/core/rtnetlink.c                         |   15 
 b/net/core/skbuff.c                            |    4 
 b/net/core/utils.c                             |    7 
 b/net/core/wireless.c                          |   24 +
 b/net/ipv4/fib_semantics.c                     |   12 
 b/net/ipv4/igmp.c                              |   38 +-
 b/net/ipv4/ip_output.c                         |    4 
 b/net/ipv4/netfilter/arp_tables.c              |   27 +
 b/net/ipv4/netfilter/ip_conntrack_netlink.c    |   17 
 b/net/ipv4/netfilter/ip_tables.c               |   36 +-
 b/net/ipv4/netfilter/ipt_ULOG.c                |    5 
 b/net/ipv4/netfilter/ipt_hashlimit.c           |   11 
 b/net/ipv4/route.c                             |    2 
 b/net/ipv4/tcp_output.c                        |   12 
 b/net/ipv4/tcp_probe.c                         |    3 
 b/net/ipv6/addrconf.c                          |    4 
 b/net/ipv6/icmp.c                              |   13 
 b/net/ipv6/ip6_output.c                        |    2 
 b/net/ipv6/mcast.c                             |   10 
 b/net/ipv6/netfilter/ip6_tables.c              |   34 +
 b/net/ipx/af_ipx.c                             |   10 
 b/net/llc/llc_sap.c                            |    3 
 b/net/netfilter/nf_conntrack_netlink.c         |   17 
 b/net/netfilter/nfnetlink_log.c                |    3 
 b/net/netfilter/xt_physdev.c                   |    1 
 b/net/netfilter/xt_string.c                    |    2 
 b/net/sched/cls_u32.c                          |    2 
 b/net/xfrm/xfrm_policy.c                       |   27 +
 b/scripts/mod/file2alias.c                     |    2 
 b/sound/oss/Kconfig                            |    6 
 b/sound/pci/Kconfig                            |   70 ++--
 b/usr/Makefile                                 |    3 
 drivers/media/video/dsbr100.c                  |  430 -------------------------
 157 files changed, 2464 insertions(+), 1226 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.7 -r 1.8 git-gregkh.patch
Index: git-gregkh.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-gregkh.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- git-gregkh.patch	16 Aug 2006 05:57:43 -0000	1.7
+++ git-gregkh.patch	20 Aug 2006 03:33:22 -0000	1.8
@@ -1,3 +1,538 @@
+commit ef7d1b244fa6c94fb76d5f787b8629df64ea4046
+Merge: ed0da6f... 78eb887...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date:   Fri Aug 18 11:02:52 2006 -0700
+
+    Merge gregkh at master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
+
+commit ed0da6fc9d3096f54c4a76737eeae57ac81418cf
+Merge: 774bd86... 9e8a9bc...
+Author: Greg Kroah-Hartman <gregkh at suse.de>
+Date:   Fri Aug 18 09:20:04 2006 -0700
+
+    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
+
+commit 78eb887733ec8ff5d6e6c69e3c32a187a9303622
+Author: Herbert Xu <herbert at gondor.apana.org.au>
+Date:   Thu Aug 17 18:22:32 2006 -0700
+
+    [BRIDGE]: Disable SG/GSO if TX checksum is off
+    
+    When the bridge recomputes features, it does not maintain the
+    constraint that SG/GSO must be off if TX checksum is off.
+    This patch adds that constraint.
+    
+    On a completely unrelated note, I've also added TSO6 and TSO_ECN
+    feature bits if GSO is enabled on the underlying device through
+    the new NETIF_F_GSO_SOFTWARE macro.
+    
+    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit 8311731afc439f508ab4d759edadedae75afb73e
+Author: Patrick McHardy <kaber at trash.net>
+Date:   Thu Aug 17 18:13:53 2006 -0700
+
+    [NETFILTER]: ip_tables: fix table locking in ipt_do_table
+    
+    table->private might change because of ruleset changes, don't use it without
+    holding the lock.
+    
+    Signed-off-by: Patrick McHardy <kaber at trash.net>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit d205dc40798d97d63ad348bfaf7394f445d152d4
+Author: Patrick McHardy <kaber at trash.net>
+Date:   Thu Aug 17 18:12:38 2006 -0700
+
+    [NETFILTER]: ctnetlink: fix deadlock in table dumping
+    
+    ip_conntrack_put must not be called while holding ip_conntrack_lock
+    since destroy_conntrack takes it again.
+    
+    Signed-off-by: Patrick McHardy <kaber at trash.net>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit 9e8a9bc2d2c3ac3b8542cc5c2544248df6f3f1c5
+Author: Jon Loeliger <jdl at freescale.com>
+Date:   Thu Aug 17 12:24:42 2006 -0500
+
+    [POWERPC] Fix the mpc8641_hpcn.dts file.
+    
+    Add 'linux,phandle' entry to i8259 at 4d0 node.
+    
+    Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
+    Signed-off-by: Jon Loeliger <jdl at freescale.com>
+    Signed-off-by: Paul Mackerras <paulus at samba.org>
+
+commit 5315862045c5dc5dfe0754fbd07df1350180628a
+Author: Jon Loeliger <jdl at jdl.com>
+Date:   Wed Aug 9 10:37:28 2006 -0500
+
+    [POWERPC] Offer PCI as a CONFIG choice for PPC_86xx.
+    
+    Also fix 80-column run-over.
+    
+    Signed-off-by: Jon Loeliger <jdl at freescale.com>
+    Signed-off-by: Paul Mackerras <paulus at samba.org>
+
+commit 707ba16f0ffed3b83ced3c7f4d4d332a70f8b41d
+Author: Jon Loeliger <jdl at freescale.com>
+Date:   Thu Aug 3 16:27:57 2006 -0500
+
+    [POWERPC] Add MPC8641 HPCN Device Tree Source file.
+    
+    As per list discussion, let's add device tree source files
+    under powerpc/boot/dts.  If nothing else, it is a starting point.
+    
+    Signed-off-by: Jon Loeliger <jdl at freescale.com>
+    Signed-off-by: Paul Mackerras <paulus at samba.org>
+
+commit f583165f6a926e9f27ff8d15c0e4b22e83f0d599
+Author: Jon Loeliger <jdl at jdl.com>
+Date:   Thu Aug 17 08:42:35 2006 -0500
+
+    [POWERPC] Convert to mac-address for ethernet MAC address data.
+    
+    Also accept "local-mac-address".  However the old "address"
+    is now obsolete, but accepted for backwards compatibility.
+    It should be removed after all device trees have been
+    converted to use "mac-address".
+    
+    Signed-off-by: Jon Loeliger <jdl at freescale.com>
+    Signed-off-by: Paul Mackerras <paulus at samba.org>
+
+commit 6e8fcbf64024f9056ba122abbb66554aa76bae5d
+Author: Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
+Date:   Thu Aug 17 16:44:46 2006 -0700
+
+    [IPV4]: severe locking bug in fib_semantics.c
+    
+    Found in 2.4 by Yixin Pan <yxpan at hotmail.com>.
+    
+    > When I read fib_semantics.c of Linux-2.4.32, write_lock(&fib_info_lock) =
+    > is used in fib_release_info() instead of write_lock_bh(&fib_info_lock).  =
+    > Is the following case possible: a BH interrupts fib_release_info() while =
+    > holding the write lock, and calls ip_check_fib_default() which calls =
+    > read_lock(&fib_info_lock), and spin forever.
+    
+    Signed-off-by: Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit acd6e00b8e4db542cb6bc9ddfbb4e18bbe29ce4d
+Author: David L Stevens <dlstevens at us.ibm.com>
+Date:   Thu Aug 17 16:27:39 2006 -0700
+
+    [MCAST]: Fix filter leak on device removal.
+    
+    This fixes source filter leakage when a device is removed and a
+    process leaves the group thereafter.
+    
+    This also includes corresponding fixes for IPv6 multicast source
+    filters on device removal.
+    
+    Signed-off-by: David L Stevens <dlstevens at us.ibm.com>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit c7fa9d189e93877a1fa08ab00f230e0689125e45
+Author: David S. Miller <davem at sunset.davemloft.net>
+Date:   Tue Aug 15 16:34:13 2006 -0700
+
+    [NET]: Disallow whitespace in network device names.
+    
+    It causes way too much trouble and confusion in userspace.
+    
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit d4274b51a5c8147b5341e15927368e75b632d297
+Author: Panagiotis Issaris <takis at issaris.org>
+Date:   Tue Aug 15 16:01:07 2006 -0700
+
+    [PPP]: handle kmalloc failures and convert to using kzalloc
+    
+    The PPP code contains two kmalloc()s followed by memset()s without
+    handling a possible memory allocation failure.  (Suggested by Joe
+    Perches).
+    
+    And furthermore, conversions from kmalloc+memset to kzalloc.
+    
+    [akpm at osdl.org: fix error-path leak]
+    [akpm at osdl.org: cleanups]
+    [paulus at samba.org: don't add useless printk and cardmap_destroy calls]
+    
+    Signed-off-by: Panagiotis Issaris <takis at issaris.org>
+    Signed-off-by: Andrew Morton <akpm at osdl.org>
+    Signed-off-by: Paul Mackerras <paulus at samba.org>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit c0956bd25161bff45304d482cda51ca4b3b572f1
+Author: Ralf Hildebrandt <Ralf.Hildebrandt at charite.de>
+Date:   Tue Aug 15 02:12:43 2006 -0700
+
+    [PKT_SCHED] cls_u32: Fix typo.
+    
+    Signed-off-by: Ralf Hildebrandt <Ralf.Hildebrandt at charite.de>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit b9c6e3e96669ade31afd3a39f17393e577b609c5
+Author: Kevin Hilman <khilman at mvista.com>
+Date:   Tue Aug 15 02:02:33 2006 -0700
+
+    [ATM]: Compile error on ARM
+    
+    atm_proc_exit() is declared as __exit, and thus in .exit.text.  On
+    some architectures (ARM) .exit.text is discarded at compile time, and
+    since atm_proc_exit() is called by some other __init functions, it
+    results in a link error.
+    
+    Signed-off-by: Kevin Hilman <khilman at mvista.com>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+commit 932f3772cf76cc1b1fd1538ceee3edba9bf2164f
[...3953 lines suppressed...]
+ 	struct ipt_entry *e, *back;
+-	struct xt_table_info *private = table->private;
++	struct xt_table_info *private;
+ 
+ 	/* Initialization */
+ 	ip = (*pskb)->nh.iph;
+@@ -247,6 +247,7 @@ ipt_do_table(struct sk_buff **pskb,
+ 
+ 	read_lock_bh(&table->lock);
+ 	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
++	private = table->private;
+ 	table_base = (void *)private->entries[smp_processor_id()];
+ 	e = get_entry(table_base, private->hook_entry[hook]);
+ 
+@@ -2239,22 +2240,39 @@ static int __init ip_tables_init(void)
  {
  	int ret;
  
@@ -6234,6 +9975,37 @@
  
  		addrconf_dad_start(ifp, 0);
  		in6_ifa_put(ifp);
+diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
+index 1044b6f..3d6e9a3 100644
+--- a/net/ipv6/icmp.c
++++ b/net/ipv6/icmp.c
+@@ -712,6 +712,11 @@ discard_it:
+ 	return 0;
+ }
+ 
++/*
++ * Special lock-class for __icmpv6_socket:
++ */
++static struct lock_class_key icmpv6_socket_sk_dst_lock_key;
++
+ int __init icmpv6_init(struct net_proto_family *ops)
+ {
+ 	struct sock *sk;
+@@ -730,6 +735,14 @@ int __init icmpv6_init(struct net_proto_
+ 
+ 		sk = per_cpu(__icmpv6_socket, i)->sk;
+ 		sk->sk_allocation = GFP_ATOMIC;
++		/*
++		 * Split off their lock-class, because sk->sk_dst_lock
++		 * gets used from softirqs, which is safe for
++		 * __icmpv6_socket (because those never get directly used
++		 * via userspace syscalls), but unsafe for normal sockets.
++		 */
++		lockdep_set_class(&sk->sk_dst_lock,
++				  &icmpv6_socket_sk_dst_lock_key);
+ 
+ 		/* Enough space for 2 64K ICMP packets, including
+ 		 * sk_buff struct overhead.
 diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
 index 69451af..4fb47a2 100644
 --- a/net/ipv6/ip6_output.c
@@ -6247,6 +10019,44 @@
  			}
  			copy = datalen - transhdrlen - fraggap;
  			if (copy < 0) {
+diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
+index 9d697d4..639eb20 100644
+--- a/net/ipv6/mcast.c
++++ b/net/ipv6/mcast.c
+@@ -268,13 +268,14 @@ int ipv6_sock_mc_drop(struct sock *sk, i
+ 			if ((dev = dev_get_by_index(mc_lst->ifindex)) != NULL) {
+ 				struct inet6_dev *idev = in6_dev_get(dev);
+ 
++				(void) ip6_mc_leave_src(sk, mc_lst, idev);
+ 				if (idev) {
+-					(void) ip6_mc_leave_src(sk,mc_lst,idev);
+ 					__ipv6_dev_mc_dec(idev, &mc_lst->addr);
+ 					in6_dev_put(idev);
+ 				}
+ 				dev_put(dev);
+-			}
++			} else
++				(void) ip6_mc_leave_src(sk, mc_lst, NULL);
+ 			sock_kfree_s(sk, mc_lst, sizeof(*mc_lst));
+ 			return 0;
+ 		}
+@@ -334,13 +335,14 @@ void ipv6_sock_mc_close(struct sock *sk)
+ 		if (dev) {
+ 			struct inet6_dev *idev = in6_dev_get(dev);
+ 
++			(void) ip6_mc_leave_src(sk, mc_lst, idev);
+ 			if (idev) {
+-				(void) ip6_mc_leave_src(sk, mc_lst, idev);
+ 				__ipv6_dev_mc_dec(idev, &mc_lst->addr);
+ 				in6_dev_put(idev);
+ 			}
+ 			dev_put(dev);
+-		}
++		} else
++			(void) ip6_mc_leave_src(sk, mc_lst, NULL);
+ 
+ 		sock_kfree_s(sk, mc_lst, sizeof(*mc_lst));
+ 
 diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
 index f26898b..c9d6b23 100644
 --- a/net/ipv6/netfilter/ip6_tables.c
@@ -6339,6 +10149,59 @@
  		skb1 = skb_clone(skb, GFP_ATOMIC);
  		if (!skb1)
  			break;
+diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
+index af48459..6527d4e 100644
+--- a/net/netfilter/nf_conntrack_netlink.c
++++ b/net/netfilter/nf_conntrack_netlink.c
+@@ -429,9 +429,9 @@ ctnetlink_dump_table(struct sk_buff *skb
+ 			cb->args[0], *id);
+ 
+ 	read_lock_bh(&nf_conntrack_lock);
++	last = (struct nf_conn *)cb->args[1];
+ 	for (; cb->args[0] < nf_conntrack_htable_size; cb->args[0]++) {
+ restart:
+-		last = (struct nf_conn *)cb->args[1];
+ 		list_for_each_prev(i, &nf_conntrack_hash[cb->args[0]]) {
+ 			h = (struct nf_conntrack_tuple_hash *) i;
+ 			if (DIRECTION(h) != IP_CT_DIR_ORIGINAL)
+@@ -442,13 +442,10 @@ restart:
+ 			 * then dump everything. */
+ 			if (l3proto && L3PROTO(ct) != l3proto)
+ 				continue;
+-			if (last != NULL) {
+-				if (ct == last) {
+-					nf_ct_put(last);
+-					cb->args[1] = 0;
+-					last = NULL;
+-				} else
++			if (cb->args[1]) {
++				if (ct != last)
+ 					continue;
++				cb->args[1] = 0;
+ 			}
+ 			if (ctnetlink_fill_info(skb, NETLINK_CB(cb->skb).pid,
+ 		                        	cb->nlh->nlmsg_seq,
+@@ -459,17 +456,17 @@ restart:
+ 				goto out;
+ 			}
+ 		}
+-		if (last != NULL) {
+-			nf_ct_put(last);
++		if (cb->args[1]) {
+ 			cb->args[1] = 0;
+ 			goto restart;
+ 		}
+ 	}
+ out:
+ 	read_unlock_bh(&nf_conntrack_lock);
++	if (last)
++		nf_ct_put(last);
+ 
+ 	DEBUGP("leaving, last bucket=%lu id=%u\n", cb->args[0], *id);
+-
+ 	return skb->len;
+ }
+ 
 diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
 index 61cdda4..b59d3b2 100644
 --- a/net/netfilter/nfnetlink_log.c
@@ -6353,6 +10216,18 @@
  	if (inst->qlen > 1)
  		inst->lastnlh->nlmsg_type = NLMSG_DONE;
  
+diff --git a/net/netfilter/xt_physdev.c b/net/netfilter/xt_physdev.c
+index a9f4f6f..63a9654 100644
+--- a/net/netfilter/xt_physdev.c
++++ b/net/netfilter/xt_physdev.c
+@@ -10,6 +10,7 @@
+ 
+ #include <linux/module.h>
+ #include <linux/skbuff.h>
++#include <linux/netfilter_bridge.h>
+ #include <linux/netfilter/xt_physdev.h>
+ #include <linux/netfilter/x_tables.h>
+ #include <linux/netfilter_bridge.h>
 diff --git a/net/netfilter/xt_string.c b/net/netfilter/xt_string.c
 index d8e3891..275330f 100644
 --- a/net/netfilter/xt_string.c
@@ -6366,6 +10241,19 @@
  }
  
  #define STRING_TEXT_PRIV(m) ((struct xt_string_info *) m)
+diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
+index eea3669..0a6cfa0 100644
+--- a/net/sched/cls_u32.c
++++ b/net/sched/cls_u32.c
+@@ -796,7 +796,7 @@ static int __init init_u32(void)
+ {
+ 	printk("u32 classifier\n");
+ #ifdef CONFIG_CLS_U32_PERF
+-	printk("    Perfomance counters on\n");
++	printk("    Performance counters on\n");
+ #endif
+ #ifdef CONFIG_NET_CLS_POLICE
+ 	printk("    OLD policer on \n");
 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
 index f35bc67..3da67ca 100644
 --- a/net/xfrm/xfrm_policy.c


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2579
retrieving revision 1.2580
diff -u -r1.2579 -r1.2580
--- kernel-2.6.spec	19 Aug 2006 22:49:05 -0000	1.2579
+++ kernel-2.6.spec	20 Aug 2006 03:33:22 -0000	1.2580
@@ -295,7 +295,6 @@
 Patch301: linux-2.6-cell-mambo-drivers.patch
 Patch302: linux-2.6-hvc-console.patch
 Patch303: linux-2.6-ppc-rtas-check.patch
-Patch304: linux-2.6-ppc-fix-irq-mapping.patch
 
 # 400 - 499   ia64
 
@@ -757,8 +756,6 @@
 #%patch302 -p1
 # Check properly for successful RTAS instantiation
 %patch303 -p1
-# fix ppc irq mapping for JS20s
-%patch304 -p1
 
 # S390
 # Kprobes.
@@ -1722,6 +1719,9 @@
 %endif
 
 %changelog
+* Sat Aug 19 2006 Dave Jones <davej at redhat.com>
+- Update to latest upstream from GregKH's git tree.
+
 * Sat Aug 19 2006 Juan Quintela <quintela at redhat.com>
 - xen kernel update.
   * linux-2.6 changeset: 33525:dcc321d1340a

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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-debug-Wundef.patch	4 Jul 2006 21:03:12 -0000	1.6
+++ linux-2.6-debug-Wundef.patch	20 Aug 2006 03:33:22 -0000	1.7
@@ -4,14 +4,14 @@
 
 Signed-off-by: Dave Jones <davej at redhat.com>
 
---- linux-2.6.17.noarch/Makefile~	2006-07-04 16:28:14.000000000 -0400
-+++ linux-2.6.17.noarch/Makefile	2006-07-04 16:28:30.000000000 -0400
+--- linux-2.6.17.noarch/Makefile~	2006-08-19 23:22:50.000000000 -0400
++++ linux-2.6.17.noarch/Makefile	2006-08-19 23:23:06.000000000 -0400
 @@ -308,7 +308,7 @@ LINUXINCLUDE    := -Iinclude \
  CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
  
  CFLAGS          := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
 -                   -fno-strict-aliasing -fno-common
 +                   -fno-strict-aliasing -fno-common -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration
- # Force gcc to behave correct even for buggy distributions
- CFLAGS          += $(call cc-option, -fno-stack-protector-all \
-                                      -fno-stack-protector)
+ AFLAGS          := -D__ASSEMBLY__
+ 
+ # Read KERNELRELEASE from include/config/kernel.release (if it exists)

linux-2.6-lockdep-fixes.patch:
 a/kernel/lockdep.c                             |   13 +++++++
 b/drivers/infiniband/hw/mthca/mthca_provider.h |    4 +-
 b/drivers/infiniband/hw/mthca/mthca_qp.c       |   43 +++++++++++++++++--------
 linux-2.6.17-mm6/include/net/sock.h            |   33 +++++++++++++++++--
 linux-2.6.17.noarch/fs/exec.c                  |    2 -
 linux-2.6.18-rc1/drivers/input/serio/libps2.c  |    6 +--
 linux-2.6.18-rc1/include/linux/libps2.h        |   12 ++++++
 linux-2.6.18-rc1/net/socket.c                  |    8 ++++
 8 files changed, 97 insertions(+), 24 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linux-2.6-lockdep-fixes.patch	11 Aug 2006 18:09:39 -0000	1.21
+++ linux-2.6-lockdep-fixes.patch	20 Aug 2006 03:33:22 -0000	1.22
@@ -338,56 +338,6 @@
  asmlinkage long sys_socket(int family, int type, int protocol)
 
 
-From: Ingo Molnar <mingo at elte.hu>
-
-Split off __icmpv6_socket's sk->sk_dst_lock class, because it gets used
-from softirqs, which is safe for __icmpv6_sockets (because they never get
-directly used via userspace syscalls), but unsafe for normal sockets.
-
-Has no effect on non-lockdep kernels.
-
-Signed-off-by: Ingo Molnar <mingo at elte.hu>
-Cc: "David S. Miller" <davem at davemloft.net>
-Cc: Jeff Garzik <jeff at garzik.org>
-Cc: Arjan van de Ven <arjan at linux.intel.com>
-Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- net/ipv6/icmp.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff -puN net/ipv6/icmp.c~lockdep-fix-sk_dst_check-deadlock net/ipv6/icmp.c
---- a/net/ipv6/icmp.c~lockdep-fix-sk_dst_check-deadlock
-+++ a/net/ipv6/icmp.c
-@@ -712,6 +712,11 @@ discard_it:
- 	return 0;
- }
- 
-+/*
-+ * Special lock-class for __icmpv6_socket:
-+ */
-+static struct lock_class_key icmpv6_socket_sk_dst_lock_key;
-+
- int __init icmpv6_init(struct net_proto_family *ops)
- {
- 	struct sock *sk;
-@@ -730,6 +735,14 @@ int __init icmpv6_init(struct net_proto_
- 
- 		sk = per_cpu(__icmpv6_socket, i)->sk;
- 		sk->sk_allocation = GFP_ATOMIC;
-+		/*
-+		 * Split off their lock-class, because sk->sk_dst_lock
-+		 * gets used from softirqs, which is safe for
-+		 * __icmpv6_socket (because those never get directly used
-+		 * via userspace syscalls), but unsafe for normal sockets.
-+		 */
-+		lockdep_set_class(&sk->sk_dst_lock,
-+				  &icmpv6_socket_sk_dst_lock_key);
- 
- 		/* Enough space for 2 64K ICMP packets, including
- 		 * sk_buff struct overhead.
-
 --- a/kernel/lockdep.c~lockdep-print-kernel-version
 +++ a/kernel/lockdep.c
 @@ -36,6 +36,7 @@


--- linux-2.6-ppc-fix-irq-mapping.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Aug 20 07:30:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 03:30:01 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc4-git1.bz2.sign, NONE,
	1.1 .cvsignore, 1.512, 1.513 kernel-2.6.spec, 1.2580,
	1.2581 sources, 1.475, 1.476 upstream, 1.413,
	1.414 git-gregkh.patch, 1.8, NONE
Message-ID: <200608200730.k7K7U15b016118@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16045

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc4-git1.bz2.sign 
Removed Files:
	git-gregkh.patch 
Log Message:
git1


--- NEW FILE patch-2.6.18-rc4-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBE6AjsyGugalF9Dw4RAhd/AJ96zkq1kWLueO/0DL36opxtovf8gwCfSJXj
dRXoJmC/e3KuPAgPh2H70Rw=
=GhwB
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -r1.512 -r1.513
--- .cvsignore	12 Aug 2006 00:39:12 -0000	1.512
+++ .cvsignore	20 Aug 2006 07:29:57 -0000	1.513
@@ -5,3 +5,4 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc4.bz2
 xen-11057.tar.bz2
+patch-2.6.18-rc4-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2580
retrieving revision 1.2581
diff -u -r1.2580 -r1.2581
--- kernel-2.6.spec	20 Aug 2006 03:33:22 -0000	1.2580
+++ kernel-2.6.spec	20 Aug 2006 07:29:57 -0000	1.2581
@@ -269,7 +269,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc4.bz2
-Patch2: git-gregkh.patch
+Patch2: patch-2.6.18-rc4-git1.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -1719,6 +1719,9 @@
 %endif
 
 %changelog
+* Sun Aug 20 2006 Dave Jones <davej at redhat.com>
+- 2.6.18rc4-git1
+
 * Sat Aug 19 2006 Dave Jones <davej at redhat.com>
 - Update to latest upstream from GregKH's git tree.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -r1.475 -r1.476
--- sources	12 Aug 2006 00:39:12 -0000	1.475
+++ sources	20 Aug 2006 07:29:57 -0000	1.476
@@ -1,3 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 780289cba0d4529ff80956e145ce567a  patch-2.6.18-rc4.bz2
 64a8783435b7628c39829984ba2e551f  xen-11057.tar.bz2
+4091e21a532aab769d5e92601697797e  patch-2.6.18-rc4-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- upstream	7 Aug 2006 19:07:45 -0000	1.413
+++ upstream	20 Aug 2006 07:29:57 -0000	1.414
@@ -1,2 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc4.bz2
+patch-2.6.18-rc4-git1.bz2


--- git-gregkh.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Aug 20 09:48:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 05:48:58 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-cancel-tasks-at-shutdown.patch,
	NONE, 1.1 autofs-5.0.1-rc1-dir-cleanup-on-expire-fix.patch,
	NONE, 1.1 autofs-5.0.1-rc1-included-map-lookup-fix.patch, NONE,
	1.1 autofs-5.0.1-rc1-included-map-wild-lookup-fix.patch, NONE,
	1.1 autofs.spec, 1.141, 1.142
Message-ID: <200608200948.k7K9mwAw013473@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13398

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-cancel-tasks-at-shutdown.patch 
	autofs-5.0.1-rc1-dir-cleanup-on-expire-fix.patch 
	autofs-5.0.1-rc1-included-map-lookup-fix.patch 
	autofs-5.0.1-rc1-included-map-wild-lookup-fix.patch 
Log Message:
* Sun Aug 20 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.16
- fix included map lookup.
- fix directory cleanup on expire.
- fix task cancelation at shutdown.
- fix included map wild card key lookup.


autofs-5.0.1-rc1-cancel-tasks-at-shutdown.patch:
 CHANGELOG                |    1 
 daemon/automount.c       |    7 +-
 daemon/direct.c          |   27 +++++++--
 daemon/indirect.c        |   37 +++++++++---
 daemon/lookup.c          |   42 +++++++++-----
 daemon/state.c           |  140 +++++++++++++++++------------------------------
 modules/lookup_file.c    |   60 +++++++-------------
 modules/lookup_ldap.c    |   19 ++++--
 modules/lookup_nisplus.c |   35 +++++++++--
 modules/lookup_yp.c      |   14 +---
 modules/parse_sun.c      |   46 ++++++++++-----
 11 files changed, 232 insertions(+), 196 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cancel-tasks-at-shutdown.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 8e4a8c1..bfc36c8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,7 @@
 - allow hostname to start with numeric when validating.
 - fix included map lookup.
 - fix directory cleanup on expire.
+- fix task cancelation at shutdown.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 14b385c..8195349 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -614,8 +614,12 @@ static int get_pkt(struct autofs_point *
 
 			state_mutex_unlock(ap);
 
-			if (post_state != ST_INVAL)
+			if (post_state != ST_INVAL) {
+				if (post_state == ST_SHUTDOWN_PENDING ||
+				    post_state == ST_SHUTDOWN_FORCE)
+					st_remove_tasks(ap);
 				st_add_task(ap, post_state);
+			}
 
 			if (next_state == ST_SHUTDOWN)
 				return -1;
@@ -1064,7 +1068,6 @@ static void handle_mounts_cleanup(void *
 	/* If we have been canceled then we may hold the state mutex. */
 	mutex_operation_wait(&ap->state_mutex);
 
-	st_remove_tasks(ap);
 	umount_autofs(ap, 1);
 
 	master_signal_submount(ap, MASTER_SUBMNT_JOIN);
diff --git a/daemon/direct.c b/daemon/direct.c
index ffb3009..b08cbdd 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -761,6 +761,13 @@ static int expire_direct(int ioctlfd, co
 	return (retries >= 0);
 }
 
+static void mnts_cleanup(void *arg)
+{
+	struct mnt_list *mnts = (struct mnt_list *) arg;
+	free_mnt_list(mnts);
+	return;
+}
+
 void *expire_proc_direct(void *arg)
 {
 	struct mnt_list *mnts, *next;
@@ -768,8 +775,8 @@ void *expire_proc_direct(void *arg)
 	struct autofs_point *ap;
 	struct mapent *me = NULL;
 	unsigned int now;
-	int ioctlfd = -1;
-	int status, ret;
+	int ioctlfd, cur_state;
+	int status, ret, left;
 
 	ea = (struct expire_args *) arg;
 
@@ -779,7 +786,7 @@ void *expire_proc_direct(void *arg)
 
 	ap = ea->ap;
 	now = ea->when;
-	ea->status = 0;
+	ea->status = 1;
 
 	ea->signaled = 1;
 	status = pthread_cond_signal(&ea->cond);
@@ -797,18 +804,24 @@ void *expire_proc_direct(void *arg)
 	if (status)
 		fatal(status);
 
+	left = 0;
+
 	/* Get a list of real mounts and expire them if possible */
 	mnts = get_mnt_list(_PROC_MOUNTS, "/", 0);
+	pthread_cleanup_push(mnts_cleanup, mnts);
 	for (next = mnts; next; next = next->next) {
 		if (!strcmp(next->fs_type, "autofs")) {
 			/*
 			 * If we have submounts check if this path lives below
 			 * one of them and pass on state change.
 			 */
+			pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 			if (strstr(next->opts, "indirect")) {
 				master_notify_submount(ap, next->path, ap->state);
+				pthread_setcancelstate(cur_state, NULL);
 				continue;
 			}
+			pthread_setcancelstate(cur_state, NULL);
 
 			/* Skip offsets */
 			if (strstr(next->opts, "offset"))
@@ -834,11 +847,15 @@ void *expire_proc_direct(void *arg)
 
 		debug(ap->logopt, "send expire to trigger %s", next->path);
 
+		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 		ret = expire_direct(ioctlfd, next->path, now, ap->logopt);
 		if (!ret)
-			ea->status++;
+			left++;
+		pthread_setcancelstate(cur_state, NULL);
 	}
-	free_mnt_list(mnts);
+	pthread_cleanup_pop(1);
+
+	ea->status = left;
 
 	pthread_cleanup_pop(1);
 
diff --git a/daemon/indirect.c b/daemon/indirect.c
index 729c9de..cff4f1c 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -402,6 +402,13 @@ static int expire_indirect(struct autofs
 	return (retries >= 0);
 }
 
+static void mnts_cleanup(void *arg)
+{
+	struct mnt_list *mnts = (struct mnt_list *) arg;
+	free_mnt_list(mnts);
+	return;
+}
+
 void *expire_proc_indirect(void *arg)
 {
 	struct autofs_point *ap;
@@ -410,8 +417,8 @@ void *expire_proc_indirect(void *arg)
 	struct expire_args *ea;
 	unsigned int now;
 	int offsets, submnts, count;
-	int ioctlfd;
-	int status, ret;
+	int ioctlfd, cur_state;
+	int status, ret, left;
 
 	ea = (struct expire_args *) arg;
 
@@ -421,7 +428,7 @@ void *expire_proc_indirect(void *arg)
 
 	ap = ea->ap;
 	now = ea->when;
-	ea->status = 0;
+	ea->status = 1;
 
 	ea->signaled = 1;
 	status = pthread_cond_signal(&ea->cond);
@@ -439,8 +446,11 @@ void *expire_proc_indirect(void *arg)
 	if (status)
 		fatal(status);
 
+	left = 0;
+
 	/* Get a list of real mounts and expire them if possible */
 	mnts = get_mnt_list(_PROC_MOUNTS, ap->path, 0);
+	pthread_cleanup_push(mnts_cleanup, mnts);
 	for (next = mnts; next; next = next->next) {
 		char *ind_key;
 		int ret;
@@ -450,8 +460,10 @@ void *expire_proc_indirect(void *arg)
 			 * If we have submounts check if this path lives below
 			 * one of them and pass on the state change.
 			 */
+			pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 			if (strstr(next->opts, "indirect"))
 				master_notify_submount(ap, next->path, ap->state);
+			pthread_setcancelstate(cur_state, NULL);
 
 			continue;
 		}
@@ -486,11 +498,13 @@ void *expire_proc_indirect(void *arg)
 
 		debug(ap->logopt, "expire %s", next->path);
 
+		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 		ret = expire_indirect(ap, ioctlfd, next->path, now);
 		if (!ret)
-			ea->status++;
+			left++;
+		pthread_setcancelstate(cur_state, NULL);
 	}
-	free_mnt_list(mnts);
+	pthread_cleanup_pop(1);
 
 	/*
 	 * If there are no more real mounts left we could still
@@ -498,13 +512,16 @@ void *expire_proc_indirect(void *arg)
 	 * umount them here.
 	 */
 	if (mnts) {
+		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 		ret = expire_indirect(ap, ap->ioctlfd, ap->path, now);
 		if (!ret)
-			ea->status++;
+			left++;
+		pthread_setcancelstate(cur_state, NULL);
 	}
 
 	count = offsets = submnts = 0;
 	mnts = get_mnt_list(_PROC_MOUNTS, ap->path, 0);
+	pthread_cleanup_push(mnts_cleanup, mnts);
 	/* Are there any real mounts left */
 	for (next = mnts; next; next = next->next) {
 		if (strcmp(next->fs_type, "autofs"))
@@ -516,7 +533,7 @@ void *expire_proc_indirect(void *arg)
 				offsets++;
 		}
 	}
-	free_mnt_list(mnts);
+	pthread_cleanup_pop(1);
 
 	if (submnts)
 		debug(ap->logopt,
@@ -531,12 +548,12 @@ void *expire_proc_indirect(void *arg)
 
 	/* If we are trying to shutdown make sure we can umount */
 	if (!ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {
-		if (!ret) {
+		if (!ret)
 			msg("mount still busy %s", ap->path);
-			ea->status++;
-		}
 	}
 
+	ea->status = left;
+
 	pthread_cleanup_pop(1);
 
 	return NULL;
diff --git a/daemon/lookup.c b/daemon/lookup.c
index dd620cf..dacb678 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -71,6 +71,14 @@ static int check_nss_result(struct nss_s
 	return -1;
 }
 
+static void nsslist_cleanup(void *arg)
+{
+	struct list_head *nsslist = (struct list_head *) arg;
+	if (!list_empty(nsslist))
+		free_sources(nsslist);
+	return;
+}
+
 static int do_read_master(struct master *master, char *type, time_t age)
 {
 	struct lookup_mod *lookup;
@@ -313,6 +321,14 @@ static int read_source_instance(struct a
 	return do_read_map(ap, instance, age);
 }
 
+static void argv_cleanup(void *arg)
+{
+	struct map_source *tmap = (struct map_source *) arg;
+	/* path is freed in free_argv */
+	free_argv(tmap->argc, tmap->argv);
+	return;
+}
+
 static enum nsswitch_status read_map_source(struct nss_source *this,
 		struct autofs_point *ap, struct map_source *map, time_t age)
 {
@@ -380,10 +396,9 @@ static enum nsswitch_status read_map_sou
 		return NSS_STATUS_UNKNOWN;
 	}
 
+	pthread_cleanup_push(argv_cleanup, &tmap);
 	result = read_file_source_instance(ap, &tmap, age);
-
-	/* path is freed in free_argv */
-	free_argv(tmap.argc, tmap.argv);
+	pthread_cleanup_pop(1);
 
 	return result;
 }
@@ -413,8 +428,6 @@ int lookup_nss_read_map(struct autofs_po
 			continue;
 		}
 
-		sched_yield();
-
 		if (map->type) {
 			debug(ap->logopt,
 			      "reading map %s %s", map->type, map->argv[0]);
@@ -446,7 +459,9 @@ int lookup_nss_read_map(struct autofs_po
 
 		INIT_LIST_HEAD(&nsslist);
 
+		pthread_cleanup_push(nsslist_cleanup, &nsslist);
 		status = nsswitch_parse(&nsslist);
+		pthread_cleanup_pop(0);
 		if (status) {
 			error(ap->logopt,
 			      "can't to read name service switch config.");
@@ -454,6 +469,7 @@ int lookup_nss_read_map(struct autofs_po
 			break;
 		}
 
+		pthread_cleanup_push(nsslist_cleanup, &nsslist);
 		head = &nsslist;
 		list_for_each(p, head) {
 			this = list_entry(p, struct nss_source, list);
@@ -472,9 +488,7 @@ int lookup_nss_read_map(struct autofs_po
 				break;
 			}
 		}
-
-		if (!list_empty(&nsslist))
-			free_sources(&nsslist);
+		pthread_cleanup_pop(1);
 
 		if (!map)
 			break;
@@ -876,6 +890,7 @@ int lookup_prune_cache(struct autofs_poi
 	char *path;
 	int status = CHE_FAIL;
 
+	pthread_cleanup_push(master_source_lock_cleanup, entry);
 	master_source_readlock(entry);
 
 	map = entry->first;
@@ -885,6 +900,7 @@ int lookup_prune_cache(struct autofs_poi
 			continue;
 		}
 		mc = map->mc;
+		pthread_cleanup_push(cache_lock_cleanup, mc);
 		cache_readlock(mc);
 		me = cache_enumerate(mc, NULL);
 		while (me) {
@@ -958,12 +974,12 @@ next:
 			free(path);
 			free(next_key);
 		}
-		cache_unlock(mc);
+		pthread_cleanup_pop(1);
 		map->stale = 0;
 		map = map->next;
 	}
 
-	master_source_unlock(entry);
+	pthread_cleanup_pop(1);
 
 	return 1;
 }
@@ -976,7 +992,6 @@ struct mapent *lookup_source_valid_mapen
 	struct mapent_cache *mc;
 	struct mapent *me = NULL;
 
-	pthread_cleanup_push(master_source_lock_cleanup, entry);
 	master_source_readlock(entry);
 	map = entry->first;
 	while (map) {
@@ -1000,7 +1015,7 @@ struct mapent *lookup_source_valid_mapen
 		cache_unlock(mc);
 		map = map->next;
 	}
-	pthread_cleanup_pop(1);
+	master_source_unlock(entry);
 
 	return me;
 }
@@ -1013,7 +1028,6 @@ struct mapent *lookup_source_mapent(stru
 	struct mapent_cache *mc;
 	struct mapent *me = NULL;
 
-	pthread_cleanup_push(master_source_lock_cleanup, entry);
 	master_source_readlock(entry);
 	map = entry->first;
 	while (map) {
@@ -1028,7 +1042,7 @@ struct mapent *lookup_source_mapent(stru
 		cache_unlock(mc);
 		map = map->next;
 	}
-	pthread_cleanup_pop(1);
+	master_source_unlock(entry);
 
 	return me;
 }
diff --git a/daemon/state.c b/daemon/state.c
index d38a64f..47fee39 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -30,15 +30,11 @@ struct state_queue {
 
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+static unsigned int signaled = 0;
 static LIST_HEAD(state_queue);
 
-static unsigned int signaled = 0;
 static void st_set_thid(struct autofs_point *, pthread_t);
 
-static pthread_mutex_t task_mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t task_cond = PTHREAD_COND_INITIALIZER;
-static unsigned int task_signaled;
-
 #define st_mutex_lock() \
 do { \
 	int status = pthread_mutex_lock(&mutex); \
@@ -53,20 +49,6 @@ do { \
 		fatal(status); \
 } while (0)
 
-#define task_mutex_lock() \
-do { \
-	int status = pthread_mutex_lock(&task_mutex); \
-	if (status) \
-		fatal(status); \
-} while (0)
-
-#define task_mutex_unlock() \
-do { \
-	int status = pthread_mutex_unlock(&task_mutex); \
-	if (status) \
-		fatal(status); \
-} while (0)
-
 int do_mount_autofs_direct(struct autofs_point *, struct mnt_list *, struct mapent *);
 
 void dump_state_queue(void)
@@ -116,12 +98,14 @@ void expire_cleanup(void *arg)
 	struct autofs_point *ap;
 	int statefd;
 	enum states next = ST_INVAL;
-	int success, ret;
+	int success, ret, cur_state;
 
 	ea = (struct expire_args *) arg;
 	ap = ea->ap;
 	success = ea->status;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
+
 	state_mutex_lock(ap);
 
 	debug(ap->logopt,
@@ -195,6 +179,8 @@ #endif
 
 	free(ea);
 
+	pthread_setcancelstate(cur_state, NULL);
+
 	return;
 }
 
@@ -333,13 +319,20 @@ static void do_readmap_cleanup(void *arg
 	return;
 }
 
+static void tree_mnts_cleanup(void *arg)
+{
+	struct mnt_list *mnts = (struct mnt_list *) arg;
+	tree_free_mnt_tree(mnts);
+	return;
+}
+
 static void *do_readmap(void *arg)
 {
 	struct autofs_point *ap;
 	struct map_source *map;
 	struct mapent_cache *mc;
 	struct readmap_args *ra;
-	struct  mnt_list *mnts;
+	struct mnt_list *mnts;
 	int status;
 	time_t now;
 
@@ -378,6 +371,7 @@ static void *do_readmap(void *arg)
 	} else {
 		struct mapent *me;
 		mnts = tree_make_mnt_tree(_PROC_MOUNTS, "/");
+		pthread_cleanup_push(tree_mnts_cleanup, mnts);
 		pthread_cleanup_push(master_source_lock_cleanup, ap->entry);
 		master_source_readlock(ap->entry);
 		map = ap->entry->first;
@@ -406,7 +400,7 @@ static void *do_readmap(void *arg)
 			pthread_cleanup_pop(1);
 			map = map->next;
 		}
-		tree_free_mnt_tree(mnts);
+		pthread_cleanup_pop(1);
 		pthread_cleanup_pop(1);
 		lookup_prune_cache(ap, now);
 	}
@@ -617,12 +611,10 @@ int st_add_task(struct autofs_point *ap,
 	unsigned int empty = 1;
 	int status;
 
-	state_mutex_lock(ap);
-
 	/* Task termination marker, poke state machine */
 	if (state == ST_READY) {
+		state_mutex_lock(ap);
 		st_ready(ap);
-
 		state_mutex_unlock(ap);
 
 		st_mutex_lock();
@@ -637,11 +629,11 @@ int st_add_task(struct autofs_point *ap,
 		return 1;
 	}
 
+	state_mutex_lock(ap);
 	if (ap->state == ST_SHUTDOWN) {
 		state_mutex_unlock(ap);
 		return 1;
 	}
-
 	state_mutex_unlock(ap);
 
 	new = malloc(sizeof(struct state_queue));
@@ -710,8 +702,13 @@ void st_remove_tasks(struct autofs_point
 		if (task->ap != ap)
 			continue;
 
-		if (task->busy)
-			task->cancel = 1;
+		if (task->busy) {
+			/* We only cancel readmap, prune and expire */
+			if (task->state == ST_EXPIRE ||
+			    task->state == ST_PRUNE ||
+			    task->state == ST_READMAP)
+				task->cancel = 1;
+		}
 
 		q = (&task->pending)->next;
 		while(q != &task->pending) {
@@ -734,27 +731,15 @@ void st_remove_tasks(struct autofs_point
 
 }
 
-static void *do_run_task(void *arg)
+static int run_state_task(struct state_queue *task)
 {
-	struct state_queue *task;
 	struct autofs_point *ap;
 	enum states next_state, state;
 	unsigned long ret = 1;
-	int status;
  
-	task_mutex_lock();
-
-	task = (struct state_queue *) arg;
 	ap = task->ap;
 	next_state = task->state;
 
-	task_signaled = 1;
-	status = pthread_cond_signal(&task_cond);
-	if (status)
-		fatal(status);
-
-	task_mutex_unlock();
-
 	state_mutex_lock(ap);
 
 	state = ap->state;
@@ -789,33 +774,7 @@ static void *do_run_task(void *arg)
 
 	state_mutex_unlock(ap);
 
-	return (void *) ret;
-}
-
-static int run_state_task(struct state_queue *task)
-{
-	pthread_t thid;
-	int status;
-
-	task_mutex_lock();
-
-	status = pthread_create(&thid, &thread_attr, do_run_task, task);
-	if (status) {
-		error(task->ap->logopt, "error running task");
-		task_mutex_unlock();
-		return 0;
-	}
-
-	task_signaled = 0;
-	while (!task_signaled) {
-		status = pthread_cond_wait(&task_cond, &task_mutex);
-		if (status)
-			fatal(status);
-	}
-
-	task_mutex_unlock();
-
-	return 1;
+	return ret;
 }
 
 static void st_set_thid(struct autofs_point *ap, pthread_t thid)
@@ -838,12 +797,10 @@ static void *st_queue_handler(void *arg)
 	struct list_head *head;
 	struct list_head *p;
 	struct timespec wait;
-	int status;
+	int status, ret;
 
 	st_mutex_lock();
 
-	head = &state_queue;
-
 	while (1) {
 		/*
 		 * If the state queue list is empty, wait until an
@@ -862,24 +819,25 @@ static void *st_queue_handler(void *arg)
 			}
 		}
 
-		list_for_each(p, head) {
+		p = head->next;
+		while(p != head) {
 			struct state_queue *task;
 
 			task = list_entry(p, struct state_queue, list);
+			p = p->next;
 /*
 			debug(LOGOPT_NONE,
 			      "task %p ap %p state %d next %d busy %d",
 			      task, task->ap, task->ap->state,
 			      task->state, task->busy);
 */
-
 			task->busy = 1;
-			/*
-			 * TODO: field return code and delete immediately
-			 * 	 on fail
-			 */
-			/* TODO: field return code and delete immediately on fail */
-			run_state_task(task);
+
+			ret = run_state_task(task);
+			if (!ret) {
+				list_del(&task->list);
+				free(task);
+			}
 		}
 
 		while (1) {
@@ -912,24 +870,30 @@ static void *st_queue_handler(void *arg)
 				if (!task->busy) {
 					/* Start a new task */
 					task->busy = 1;
-					/*
-					 * TODO: field return code and delete
-					 *	 immediately on fail
-					 */
-					run_state_task(task);
+
+					ret = run_state_task(task);
+					if (!ret)
+						goto remove;
 					continue;
 				}
-/*
-				if (task->thid && task->cancel)
+
+				/* Still starting up */
+				if (!task->thid)
+					continue;
+
+				if (task->cancel) {
 					pthread_cancel(task->thid);
-*/
+					task->cancel = 0;
+					continue;
+				}
+
 				/* Still busy */
 				if (task->thid) {
 					status = pthread_kill(task->thid, 0);
 					if (status != ESRCH)
 						continue;
 				}
-
+remove:
 				/* No more tasks for this queue */
 				if (list_empty(&task->pending)) {
 					list_del(&task->list);
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 47a208b..028c1ec 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -67,31 +67,31 @@ int lookup_init(const char *mapfmt, int 
 	}
 
 	if (argc < 1) {
-		crit(LOGOPT_ANY, MODPREFIX "No map name");
 		free(ctxt);
+		crit(LOGOPT_ANY, MODPREFIX "No map name");
 		return 1;
 	}
 
 	ctxt->mapname = argv[0];
 
 	if (ctxt->mapname[0] != '/') {
-		msg(MODPREFIX "file map %s is not an absolute pathname",
-		    ctxt->mapname);
 		free(ctxt);
+		msg(MODPREFIX "file map %s is not an absolute pathname",
+		    argv[0]);
 		return 1;
 	}
 
 	if (access(ctxt->mapname, R_OK)) {
-		msg(MODPREFIX "file map %s missing or not readable",
-		    ctxt->mapname);
 		free(ctxt);
+		msg(MODPREFIX "file map %s missing or not readable",
+		    argv[0]);
 		return 1;
 	}
 
 	if (stat(ctxt->mapname, &st)) {
-		crit(LOGOPT_ANY, MODPREFIX "file map %s, could not stat",
-		     ctxt->mapname);
 		free(ctxt);
+		crit(LOGOPT_ANY, MODPREFIX "file map %s, could not stat",
+		     argv[0]);
 		return 1;
 	}
 		
@@ -102,8 +102,8 @@ int lookup_init(const char *mapfmt, int 
 
 	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
 	if (!ctxt->parse) {
-		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
 		free(ctxt);
+		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
 		return 1;
 	}
 	*context = ctxt;
@@ -345,7 +345,7 @@ int lookup_read_master(struct master *ma
 	struct stat st;
 	FILE *f;
 	unsigned int path_len, ent_len;
-	int entry;
+	int entry, cur_state;
 
 	if (master->recurse)
 		return NSS_STATUS_UNAVAIL;
@@ -357,18 +357,17 @@ int lookup_read_master(struct master *ma
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	path = malloc(KEY_MAX_LEN + 1);
+	path = alloca(KEY_MAX_LEN + 1);
 	if (!path) {
 		error(LOGOPT_ANY,
 		      MODPREFIX "could not malloc storage for path");
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	ent = malloc(MAPENT_MAX_LEN + 1);
+	ent = alloca(MAPENT_MAX_LEN + 1);
 	if (!ent) {
 		error(LOGOPT_ANY,
 		      MODPREFIX "could not malloc storage for mapent");
-		free(path);
 		return NSS_STATUS_UNAVAIL;
 	}
 
@@ -377,8 +376,6 @@ int lookup_read_master(struct master *ma
 		error(LOGOPT_ANY,
 		      MODPREFIX "could not open master map file %s",
 		      ctxt->mapname);
-		free(path);
-		free(ent);
 		return NSS_STATUS_UNAVAIL;
 	}
 
@@ -425,8 +422,6 @@ int lookup_read_master(struct master *ma
 			if (!buffer) {
 				error(LOGOPT_ANY,
 				      MODPREFIX "could not malloc parse buffer");
-				free(path);
-				free(ent);
 				return NSS_STATUS_UNAVAIL;
 			}
 			memset(buffer, 0, blen);
@@ -435,9 +430,10 @@ int lookup_read_master(struct master *ma
 			strcat(buffer, " ");
 			strcat(buffer, ent);
 
+			pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 			master_parse_entry(buffer, timeout, logging, age);
-
 			free(buffer);
+			pthread_setcancelstate(cur_state, NULL);
 		}
 
 		if (feof(f))
@@ -447,17 +443,12 @@ int lookup_read_master(struct master *ma
 	if (fstat(fileno(f), &st)) {
 		crit(LOGOPT_ANY, MODPREFIX "file map %s, could not stat",
 		       ctxt->mapname);
-		free(path);
-		free(ent);
 		return NSS_STATUS_UNAVAIL;
 	}
 	ctxt->mtime = st.st_mtime;
 
 	fclose(f);
 
-	free(path);
-	free(ent);
-
 	return NSS_STATUS_SUCCESS;
 }
 
@@ -515,9 +506,9 @@ prepare_plus_include(struct autofs_point
 
 	ret = master_add_autofs_point(entry, timeout, logopt, ghost, 0);
 	if (!ret) {
+		master_free_mapent(entry);
 		error(ap->logopt,
 		      MODPREFIX "failed to add autofs_point to entry");
-		master_free_mapent(entry);
 		return NULL;
 	}
 	iap = entry->ap;
@@ -536,8 +527,8 @@ prepare_plus_include(struct autofs_point
 	/* skip plus */
 	buf = strdup(key + 1);
 	if (!buf) {
-		error(ap->logopt, MODPREFIX "failed to strdup key");
 		master_free_mapent(entry);
+		error(ap->logopt, MODPREFIX "failed to strdup key");
 		return NULL;
 	}
 
@@ -569,9 +560,9 @@ prepare_plus_include(struct autofs_point
 
 	source = master_add_map_source(entry, type, fmt, age, argc, argv);
 	if (!source) {
-		error(ap->logopt, "failed to creat map_source");
 		master_free_mapent(entry);
 		free(buf);
+		error(ap->logopt, "failed to creat map_source");
 		return NULL;
 	}
 	source->mc = current->mc;
@@ -611,18 +602,17 @@ int lookup_read_map(struct autofs_point 
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	key = malloc(KEY_MAX_LEN + 1);
+	key = alloca(KEY_MAX_LEN + 1);
 	if (!key) {
 		error(ap->logopt,
 		      MODPREFIX "could not malloc storage for key");
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	mapent = malloc(MAPENT_MAX_LEN + 1);
+	mapent = alloca(MAPENT_MAX_LEN + 1);
 	if (!mapent) {
 		error(ap->logopt,
 		      MODPREFIX "could not malloc storage for mapent");
-		free(key);
 		return NSS_STATUS_UNAVAIL;
 	}
 
@@ -630,8 +620,6 @@ int lookup_read_map(struct autofs_point 
 	if (!f) {
 		error(ap->logopt,
 		      MODPREFIX "could not open map file %s", ctxt->mapname);
-		free(key);
-		free(mapent);
 		return NSS_STATUS_UNAVAIL;
 	}
 
@@ -696,8 +684,6 @@ int lookup_read_map(struct autofs_point 
 		crit(ap->logopt,
 		     MODPREFIX "file map %s, could not stat",
 		     ctxt->mapname);
-		free(key);
-		free(mapent);
 		return NSS_STATUS_UNAVAIL;
 	}
 	ctxt->mtime = st.st_mtime;
@@ -705,9 +691,6 @@ int lookup_read_map(struct autofs_point 
 
 	fclose(f);
 
-	free(key);
-	free(mapent);
-
 	return NSS_STATUS_SUCCESS;
 }
 
@@ -793,11 +776,12 @@ static int lookup_one(struct autofs_poin
 
 				free(s_key);
 
-				fclose(f);
 				cache_writelock(mc);
 				ret = cache_update(mc, key, mapent, age);
 				cache_unlock(mc);
 
+				fclose(f);
+
 				return ret;
 			}
 		}
@@ -876,10 +860,12 @@ static int lookup_wild(struct autofs_poi
 				if (eq == 0)
 					continue;
 
-				fclose(f);
 				cache_writelock(mc);
 				ret = cache_update(mc, "*", mapent, age);
 				cache_unlock(mc);
+
+				fclose(f);
+
 				return ret;
 			}
 		}
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 855cb95..c0ced9e 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1280,16 +1280,19 @@ int lookup_read_map(struct autofs_point 
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
 	int rv = LDAP_SUCCESS;
-	int ret;
+	int ret, cur_state;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 	ret = read_one_map(ap, ctxt, age, &rv);
 	if (ret != NSS_STATUS_SUCCESS) {
 		switch (rv) {
 		case LDAP_SIZELIMIT_EXCEEDED:
 		case LDAP_UNWILLING_TO_PERFORM:
+			pthread_setcancelstate(cur_state, NULL);
 			return NSS_STATUS_UNAVAIL;
 		}
 	}
+	pthread_setcancelstate(cur_state, NULL);
 
 	return ret;
 }
@@ -1507,7 +1510,7 @@ static int check_map_indirect(struct aut
 	struct mapent *me, *exists;
 	time_t now = time(NULL);
 	time_t t_last_read;
-	int ret, need_map = 0;
+	int ret, cur_state, need_map = 0;
 
 	source = ap->entry->current;
 	ap->entry->current = NULL;
@@ -1524,9 +1527,13 @@ static int check_map_indirect(struct aut
 	master_source_current_wait(ap->entry);
 	ap->entry->current = source;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 	ret = lookup_one(ap, key, key_len, ctxt);
-	if (ret == CHE_FAIL)
+	if (ret == CHE_FAIL) {
+		pthread_setcancelstate(cur_state, NULL);
 		return NSS_STATUS_NOTFOUND;
+	}
+	pthread_setcancelstate(cur_state, NULL);
 
 	cache_readlock(mc);
 	me = cache_lookup_first(mc);
@@ -1540,8 +1547,8 @@ static int check_map_indirect(struct aut
 	}
 
 	if (ret == CHE_MISSING) {
-		cache_writelock(mc);
 		pthread_cleanup_push(cache_lock_cleanup, mc);
+		cache_writelock(mc);
 		if (cache_delete(mc, key))
 			rmdir_path(ap, key, ap->dev);
 		pthread_cleanup_pop(1);
@@ -1641,12 +1648,10 @@ int lookup_mount(struct autofs_point *ap
 
 	cache_readlock(mc);
 	me = cache_lookup(mc, key);
-	if (me) {
-		pthread_cleanup_push(cache_lock_cleanup, mc);
+	if (me && me->mapent) {
 		mapent_len = strlen(me->mapent);
 		mapent = alloca(mapent_len + 1);
 		strcpy(mapent, me->mapent);
-		pthread_cleanup_pop(0);
 	}
 	cache_unlock(mc);
 
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index 500bc53..b0fe4a6 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -46,8 +46,8 @@ int lookup_init(const char *mapfmt, int 
 	}
 
 	if (argc < 1) {
-		crit(LOGOPT_ANY, MODPREFIX "No map name");
 		free(ctxt);
+		crit(LOGOPT_ANY, MODPREFIX "No map name");
 		return 1;
 	}
 	ctxt->mapname = argv[0];
@@ -58,8 +58,8 @@ int lookup_init(const char *mapfmt, int 
 	 */
 	ctxt->domainname = nis_local_directory();
 	if (!ctxt->domainname) {
-		crit(LOGOPT_ANY, MODPREFIX "NIS+ domain not set");
 		free(ctxt);
+		crit(LOGOPT_ANY, MODPREFIX "NIS+ domain not set");
 		return 1;
 	}
 
@@ -68,8 +68,8 @@ int lookup_init(const char *mapfmt, int 
 
 	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
 	if (!ctxt->parse) {
-		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
 		free(ctxt);
+		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
 		return 1;
 	}
 	*context = ctxt;
@@ -89,11 +89,14 @@ int lookup_read_master(struct master *ma
 	char *path, *ent;
 	char *buffer;
 	char buf[MAX_ERR_BUF];
+	int cur_state;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 	tablename = alloca(strlen(ctxt->mapname) + strlen(ctxt->domainname) + 20);
 	if (!tablename) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "alloca: %s", estr);
+		pthread_setcancelstate(cur_state, NULL);
 		return NSS_STATUS_UNAVAIL;
 	}
 	sprintf(tablename, "%s.org_dir.%s", ctxt->mapname, ctxt->domainname);
@@ -104,6 +107,7 @@ int lookup_read_master(struct master *ma
 		nis_freeresult(result);
 		crit(LOGOPT_ANY,
 		     MODPREFIX "couldn't locat nis+ table %s", ctxt->mapname);
+		pthread_setcancelstate(cur_state, NULL);
 		return NSS_STATUS_NOTFOUND;
 	}
 
@@ -114,6 +118,7 @@ int lookup_read_master(struct master *ma
 		nis_freeresult(result);
 		crit(LOGOPT_ANY,
 		     MODPREFIX "couldn't enumrate nis+ map %s", ctxt->mapname);
+		pthread_setcancelstate(cur_state, NULL);
 		return NSS_STATUS_UNAVAIL;
 	}
 
@@ -149,6 +154,7 @@ int lookup_read_master(struct master *ma
 	}
 
 	nis_freeresult(result);
+	pthread_setcancelstate(cur_state, NULL);
 
 	return NSS_STATUS_SUCCESS;
 }
@@ -164,6 +170,7 @@ int lookup_read_map(struct autofs_point 
 	unsigned int current, result_count;
 	char *key, *mapent;
 	char buf[MAX_ERR_BUF];
+	int cur_state;
 
 	source = ap->entry->current;
 	ap->entry->current = NULL;
@@ -171,10 +178,12 @@ int lookup_read_map(struct autofs_point 
 
 	mc = source->mc;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 	tablename = alloca(strlen(ctxt->mapname) + strlen(ctxt->domainname) + 20);
 	if (!tablename) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "alloca: %s", estr);
+		pthread_setcancelstate(cur_state, NULL);
 		return NSS_STATUS_UNAVAIL;
 	}
 	sprintf(tablename, "%s.org_dir.%s", ctxt->mapname, ctxt->domainname);
@@ -185,6 +194,7 @@ int lookup_read_map(struct autofs_point 
 		nis_freeresult(result);
 		crit(ap->logopt,
 		     MODPREFIX "couldn't locat nis+ table %s", ctxt->mapname);
+		pthread_setcancelstate(cur_state, NULL);
 		return NSS_STATUS_NOTFOUND;
 	}
 
@@ -195,6 +205,7 @@ int lookup_read_map(struct autofs_point 
 		nis_freeresult(result);
 		crit(ap->logopt,
 		     MODPREFIX "couldn't enumrate nis+ map %s", ctxt->mapname);
+		pthread_setcancelstate(cur_state, NULL);
 		return NSS_STATUS_UNAVAIL;
 	}
 
@@ -233,6 +244,8 @@ int lookup_read_map(struct autofs_point 
 
 	source->age = age;
 
+	pthread_setcancelstate(cur_state, NULL);
+
 	return NSS_STATUS_SUCCESS;
 }
 
@@ -247,7 +260,7 @@ static int lookup_one(struct autofs_poin
 	nis_object *this;
 	char *mapent;
 	time_t age = time(NULL);
-	int ret;
+	int ret, cur_state;
 	char buf[MAX_ERR_BUF];
 
 	source = ap->entry->current;
@@ -256,11 +269,13 @@ static int lookup_one(struct autofs_poin
 
 	mc = source->mc;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 	tablename = alloca(strlen(key) +
 			strlen(ctxt->mapname) + strlen(ctxt->domainname) + 20);
 	if (!tablename) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "alloca: %s", estr);
+		pthread_setcancelstate(cur_state, NULL);
 		return -1;
 	}
 	sprintf(tablename, "[key=%s],%s.org_dir.%s", key, ctxt->mapname,
@@ -269,6 +284,7 @@ static int lookup_one(struct autofs_poin
 	result = nis_list(tablename, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
 	if (result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS) {
 		nis_freeresult(result);
+		pthread_setcancelstate(cur_state, NULL);
 		if (result->status == NIS_NOTFOUND ||
 		    result->status == NIS_S_NOTFOUND)
 			return CHE_MISSING;
@@ -284,6 +300,7 @@ static int lookup_one(struct autofs_poin
 	cache_unlock(mc);
 
 	nis_freeresult(result);
+	pthread_setcancelstate(cur_state, NULL);
 
 	return ret;
 }
@@ -297,7 +314,7 @@ static int lookup_wild(struct autofs_poi
 	nis_object *this;
 	char *mapent;
 	time_t age = time(NULL);
-	int ret;
+	int ret, cur_state;
 	char buf[MAX_ERR_BUF];
 
 	source = ap->entry->current;
@@ -306,10 +323,12 @@ static int lookup_wild(struct autofs_poi
 
 	mc = source->mc;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 	tablename = alloca(strlen(ctxt->mapname) + strlen(ctxt->domainname) + 20);
 	if (!tablename) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(LOGOPT_ANY, MODPREFIX "alloca: %s", estr);
+		pthread_setcancelstate(cur_state, NULL);
 		return -1;
 	}
 	sprintf(tablename, "[key=*],%s.org_dir.%s", ctxt->mapname,
@@ -318,6 +337,7 @@ static int lookup_wild(struct autofs_poi
 	result = nis_list(tablename, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
 	if (result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS) {
 		nis_freeresult(result);
+		pthread_setcancelstate(cur_state, NULL);
 		if (result->status == NIS_NOTFOUND ||
 		    result->status == NIS_S_NOTFOUND)
 			return CHE_MISSING;
@@ -332,6 +352,7 @@ static int lookup_wild(struct autofs_poi
 	cache_unlock(mc);
 
 	nis_freeresult(result);
+	pthread_setcancelstate(cur_state, NULL);
 
 	return ret;
 }
@@ -493,12 +514,10 @@ int lookup_mount(struct autofs_point *ap
 
 	cache_readlock(mc);
 	me = cache_lookup(mc, key);
-	if (me) {
-		pthread_cleanup_push(cache_lock_cleanup, mc);
+	if (me && me->mapent) {
 		mapent_len = strlen(me->mapent);
 		mapent = alloca(mapent_len + 1);
 		strcpy(mapent, me->mapent);
-		pthread_cleanup_pop(0);
 	}
 	cache_unlock(mc);
 
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index ccf6d60..275610a 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -117,8 +117,8 @@ int lookup_init(const char *mapfmt, int 
 	memset(ctxt, 0, sizeof(struct lookup_context));
 
 	if (argc < 1) {
-		crit(LOGOPT_ANY, MODPREFIX "no map name");
 		free(ctxt);
+		crit(LOGOPT_ANY, MODPREFIX "no map name");
 		return 1;
 	}
 	ctxt->mapname = argv[0];
@@ -128,9 +128,9 @@ int lookup_init(const char *mapfmt, int 
 	/* This should, but doesn't, take a const char ** */
 	err = yp_get_default_domain((char **) &ctxt->domainname);
 	if (err) {
+		free(ctxt);
 		debug(LOGOPT_NONE, MODPREFIX "map %s: %s", ctxt->mapname,
 		       yperr_string(err));
-		free(ctxt);
 		return 1;
 	}
 
@@ -141,8 +141,8 @@ int lookup_init(const char *mapfmt, int 
 
 	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
 	if (!ctxt->parse) {
-		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
 		free(ctxt);
+		crit(LOGOPT_ANY, MODPREFIX "failed to open parse context");
 		return 1;
 	}
 	*context = ctxt;
@@ -176,7 +176,7 @@ int yp_all_master_callback(int status, c
 
 	len = ypkeylen + 1 + vallen + 1;
 
-	buffer = malloc(len);
+	buffer = alloca(len);
 	if (!buffer) {
 		error(LOGOPT_ANY, MODPREFIX "could not malloc parse buffer");
 		return 0;
@@ -189,8 +189,6 @@ int yp_all_master_callback(int status, c
 
 	master_parse_entry(buffer, timeout, logging, age);
 
-	free(buffer);
-
 	return 0;
 }
 
@@ -600,12 +598,10 @@ int lookup_mount(struct autofs_point *ap
 
 	cache_readlock(mc);
 	me = cache_lookup(mc, key);
-	if (me) {
-		pthread_cleanup_push(cache_lock_cleanup, mc);
+	if (me && me->mapent) {
 		mapent_len = strlen(me->mapent);
 		mapent = alloca(mapent_len + 1);
 		strcpy(mapent, me->mapent);
-		pthread_cleanup_pop(0);
 	}
 	cache_unlock(mc);
 
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index b3f5d67..c132422 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -407,7 +407,9 @@ static char *concat_options(char *left, 
 		return NULL;
 	}
 
-	sprintf(ret, "%s,%s", left, right);
+	strcpy(ret, left);
+	strcat(ret, ",");
+	strcat(ret, right);
 
 	free(left);
 	free(right);
@@ -422,7 +424,7 @@ static int sun_mount(struct autofs_point
 {
 	char *fstype = "nfs";	/* Default filesystem type */
 	int nonstrict = 1;
-	int rv;
+	int rv, cur_state;
 	char *mountpoint;
 	char *what;
 
@@ -520,6 +522,7 @@ static int sun_mount(struct autofs_point
 	    "mounting root %s, mountpoint %s, what %s, fstype %s, options %s",
 	    root, mountpoint, what, fstype, options);
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 	if (!strcmp(fstype, "nfs")) {
 		rv = mount_nfs->mount_mount(ap, root, mountpoint, strlen(mountpoint),
 					    what, fstype, options, mount_nfs->context);
@@ -528,6 +531,7 @@ static int sun_mount(struct autofs_point
 		rv = do_mount(ap, root, mountpoint, strlen(mountpoint), what, fstype,
 			      options);
 	}
+	pthread_setcancelstate(cur_state, NULL);
 
 	if (nonstrict && rv)
 		return -rv;
@@ -878,7 +882,7 @@ int parse_mount(struct autofs_point *ap,
 	char *pmapent, *options;
 	const char *p;
 	int mapent_len, rv = 0;
-	int optlen;
+	int optlen, cur_state;
 	int slashify = ctxt->slashify_colons;
 
 	source = ap->entry->current;
@@ -962,8 +966,8 @@ int parse_mount(struct autofs_point *ap,
 			m_root = alloca(m_root_len + 1);
 			if (!m_root) {
 				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				error(ap->logopt, MODPREFIX "alloca: %s", estr);
 				free(options);
+				error(ap->logopt, MODPREFIX "alloca: %s", estr);
 				return 1;
 			}
 			strcpy(m_root, name);
@@ -972,8 +976,8 @@ int parse_mount(struct autofs_point *ap,
 			m_root = alloca(m_root_len + 1);
 			if (!m_root) {
 				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				error(ap->logopt, MODPREFIX "alloca: %s", estr);
 				free(options);
+				error(ap->logopt, MODPREFIX "alloca: %s", estr);
 				return 1;
 			}
 			strcpy(m_root, ap->path);
@@ -1007,13 +1011,14 @@ int parse_mount(struct autofs_point *ap,
 		}
 
 		if (!me) {
-			error(ap->logopt,
-			      MODPREFIX "can't find multi root %s", name);
 			free(options);
 			cache_unlock(mc);
+			error(ap->logopt,
+			      MODPREFIX "can't find multi root %s", name);
 			return 1;
 		}
 
+		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 		cache_multi_lock(me);
 		/* It's a multi-mount; deal with it */
 		do {
@@ -1038,6 +1043,7 @@ int parse_mount(struct autofs_point *ap,
 				cache_multi_unlock(me);
 				cache_unlock(mc);
 				free(options);
+				pthread_setcancelstate(cur_state, NULL);
 				return 1;
 			}
 
@@ -1051,6 +1057,7 @@ int parse_mount(struct autofs_point *ap,
 				cache_unlock(mc);
 				free(path);
 				free(options);
+				pthread_setcancelstate(cur_state, NULL);
 				return 1;
 			}
 
@@ -1073,6 +1080,7 @@ int parse_mount(struct autofs_point *ap,
 				free(options);
 				free(myoptions);
 				free(loc);
+				pthread_setcancelstate(cur_state, NULL);
 				return 1;
 			}
 
@@ -1101,6 +1109,7 @@ int parse_mount(struct autofs_point *ap,
 				cache_multi_unlock(me);
 				cache_unlock(mc);
 				free(options);
+				pthread_setcancelstate(cur_state, NULL);
 				return 1;
 			}
 
@@ -1118,6 +1127,7 @@ int parse_mount(struct autofs_point *ap,
 				cache_multi_unlock(me);
 				cache_unlock(mc);
 				free(options);
+				pthread_setcancelstate(cur_state, NULL);
 				return rv;
 			}
 		}
@@ -1128,6 +1138,7 @@ int parse_mount(struct autofs_point *ap,
 			cache_multi_unlock(me);
 			cache_unlock(mc);
 			free(options);
+			pthread_setcancelstate(cur_state, NULL);
 			return 1;
 		}
 
@@ -1135,6 +1146,7 @@ int parse_mount(struct autofs_point *ap,
 		cache_unlock(mc);
 
 		free(options);
+		pthread_setcancelstate(cur_state, NULL);
 
 		return rv;
 	} else {
@@ -1145,24 +1157,24 @@ int parse_mount(struct autofs_point *ap,
 
 		/* Location can't begin with a '/' */
 		if (*p == '/') {
+			free(options);
 			warn(ap->logopt,
 			      MODPREFIX "error location begins with \"/\"");
-			free(options);
 			return 1;
 		}
 
 		l = chunklen(p, check_colon(p));
 		loc = dequote(p, l, ap->logopt);
 		if (!loc) {
-			warn(ap->logopt, MODPREFIX "null location or out of memory");
 			free(options);
+			warn(ap->logopt, MODPREFIX "null location or out of memory");
 			return 1;
 		}
 
 		if (!validate_location(loc)) {
-			warn(ap->logopt, MODPREFIX "invalid location");
 			free(loc);
 			free(options);
+			warn(ap->logopt, MODPREFIX "invalid location");
 			return 1;
 		}
 
@@ -1178,18 +1190,18 @@ int parse_mount(struct autofs_point *ap,
 			l = chunklen(p, check_colon(p));
 			ent = dequote(p, l, ap->logopt);
 			if (!ent) {
-				warn(ap->logopt,
-				     MODPREFIX "null location or out of memory");
 				free(loc);
 				free(options);
+				warn(ap->logopt,
+				     MODPREFIX "null location or out of memory");
 				return 1;
 			}
 
 			if (!validate_location(ent)) {
-				warn(ap->logopt, MODPREFIX "invalid location");
 				free(ent);
 				free(loc);
 				free(options);
+				warn(ap->logopt, MODPREFIX "invalid location");
 				return 1;
 			}
 
@@ -1198,10 +1210,10 @@ int parse_mount(struct autofs_point *ap,
 
 			loc = realloc(loc, strlen(loc) + l + 2);
 			if (!loc) {
-				error(ap->logopt, MODPREFIX "out of memory");
 				free(ent);
 				free(loc);
 				free(options);
+				error(ap->logopt, MODPREFIX "out of memory");
 				return 1;
 			}
 
@@ -1216,10 +1228,10 @@ int parse_mount(struct autofs_point *ap,
 
 		loclen = strlen(loc);
 		if (loclen == 0) {
-			error(ap->logopt,
-			      MODPREFIX "entry %s is empty!", name);
 			free(loc);
 			free(options);
+			error(ap->logopt,
+			      MODPREFIX "entry %s is empty!", name);
 			return 1;
 		}
 
@@ -1242,12 +1254,14 @@ int parse_mount(struct autofs_point *ap,
 		 * If it's a multi-mount insert the triggers
 		 * These are always direct mount triggers so root = ""
 		 */
+		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 		cache_readlock(mc);
 		me = cache_lookup_distinct(mc, name);
 		if (me) {
 			mount_subtree_offsets(ap, mc, me);
 		}
 		cache_unlock(mc);
+		pthread_setcancelstate(cur_state, NULL);
 	}
 	return rv;
 }

autofs-5.0.1-rc1-dir-cleanup-on-expire-fix.patch:
 CHANGELOG          |    1 +
 daemon/automount.c |    3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-dir-cleanup-on-expire-fix.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 5ca3a1a..8e4a8c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@
 - more expire re-work to cope better with shutdown following cthon tests.
 - allow hostname to start with numeric when validating.
 - fix included map lookup.
+- fix directory cleanup on expire.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index a8969c0..14b385c 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -470,9 +470,6 @@ int umount_multi(struct autofs_point *ap
 
 	left += umount_subtree_mounts(ap, path, is_autofs_fs);
 
-	if (left || is_autofs_fs)
-		return left;
-
 	/* Delete detritus like unwanted mountpoints and symlinks */
 	if (left == 0) {
 		update_map_cache(ap, path);

autofs-5.0.1-rc1-included-map-lookup-fix.patch:
 CHANGELOG                 |    1 +
 daemon/automount.c        |    2 +-
 daemon/direct.c           |    8 ++++----
 daemon/indirect.c         |    2 +-
 include/automount.h       |    9 +++------
 lib/cache.c               |   12 +++++-------
 lib/parse_subs.c          |    2 +-
 modules/lookup_file.c     |   13 +++++++------
 modules/lookup_hesiod.c   |    2 +-
 modules/lookup_hosts.c    |    4 ++--
 modules/lookup_ldap.c     |   12 ++++++------
 modules/lookup_nisplus.c  |   12 ++++++------
 modules/lookup_program.c  |    2 +-
 modules/lookup_userhome.c |    2 +-
 modules/lookup_yp.c       |   12 ++++++------
 modules/parse_sun.c       |    2 +-
 16 files changed, 47 insertions(+), 50 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-included-map-lookup-fix.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 559f087..5ca3a1a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@
 - fix nested submount expiring away when pwd is base of submount.
 - more expire re-work to cope better with shutdown following cthon tests.
 - allow hostname to start with numeric when validating.
+- fix included map lookup.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 446c184..a8969c0 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -386,7 +386,7 @@ static int umount_subtree_mounts(struct 
 			return 0;
 	}
 
-	mc = me->source->mc;
+	mc = me->mc;
 	is_mm_root = (me->multi == me);
 
 	left = 0;
diff --git a/daemon/direct.c b/daemon/direct.c
index 18b56fe..ffb3009 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -424,7 +424,7 @@ got_version:
 		      "failed to stat direct mount trigger %s", me->key);
 		goto out_close;
 	}
-	cache_set_ino_index(me->source->mc, me->key, st.st_dev, st.st_ino);
+	cache_set_ino_index(me->mc, me->key, st.st_dev, st.st_ino);
 
 	close(ioctlfd);
 
@@ -705,7 +705,7 @@ int mount_autofs_offset(struct autofs_po
 		goto out_close;
 	}
 
-	cache_set_ino_index(me->source->mc, me->key, st.st_dev, st.st_ino);
+	cache_set_ino_index(me->mc, me->key, st.st_dev, st.st_ino);
 
 	close(ioctlfd);
 
@@ -826,9 +826,9 @@ void *expire_proc_direct(void *arg)
 		if (me->ioctlfd >= 0) {
 			/* Real mounts have an open ioctl fd */
 			ioctlfd = me->ioctlfd;
-			cache_unlock(me->source->mc);
+			cache_unlock(me->mc);
 		} else {
-			cache_unlock(me->source->mc);
+			cache_unlock(me->mc);
 			continue;
 		}
 
diff --git a/daemon/indirect.c b/daemon/indirect.c
index e04f164..729c9de 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -482,7 +482,7 @@ void *expire_proc_indirect(void *arg)
 		} else {
 			ioctlfd = ap->ioctlfd;
 		}
-		cache_unlock(me->source->mc);
+		cache_unlock(me->mc);
 
 		debug(ap->logopt, "expire %s", next->path);
 
diff --git a/include/automount.h b/include/automount.h
index e3ecc75..6153f71 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -139,8 +139,7 @@ struct mapent {
 	struct list_head ino_index;
 	pthread_mutex_t multi_mutex;
 	struct list_head multi_list;
-	/* Map source of the cache entry */
-	struct map_source *source;
+	struct mapent_cache *mc;
 	/* Need to know owner if we're a multi-mount */
 	struct mapent *multi;
 	/* Parent nesting point within multi-mount */
@@ -173,12 +172,10 @@ struct mapent *cache_lookup(struct mapen
 struct mapent *cache_lookup_distinct(struct mapent_cache *mc, const char *key);
 struct mapent *cache_lookup_offset(const char *prefix, const char *offset, int start, struct list_head *head);
 struct mapent *cache_partial_match(struct mapent_cache *mc, const char *prefix);
-int cache_add(struct mapent_cache *mc, struct map_source *source,
-			const char *key, const char *mapent, time_t age);
+int cache_add(struct mapent_cache *mc, const char *key, const char *mapent, time_t age);
 int cache_add_offset(struct mapent_cache *mc, const char *mkey, const char *key, const char *mapent, time_t age);
 int cache_set_parents(struct mapent *mm);
-int cache_update(struct mapent_cache *mc, struct map_source *source,
-			const char *key, const char *mapent, time_t age);
+int cache_update(struct mapent_cache *mc, const char *key, const char *mapent, time_t age);
 int cache_delete(struct mapent_cache *mc, const char *key);
 void cache_multi_lock(struct mapent *me);
 void cache_multi_unlock(struct mapent *me);
diff --git a/lib/cache.c b/lib/cache.c
index 35dfa5a..009d271 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -441,8 +441,7 @@ struct mapent *cache_partial_match(struc
 }
 
 /* cache must be write locked by caller */
-int cache_add(struct mapent_cache *mc, struct map_source *source,
-		const char *key, const char *mapent, time_t age)
+int cache_add(struct mapent_cache *mc, const char *key, const char *mapent, time_t age)
 {
 	struct mapent *me, *existing = NULL;
 	char *pkey, *pent;
@@ -473,7 +472,7 @@ int cache_add(struct mapent_cache *mc, s
 
 	me->age = age;
 	me->status = 0;
-	me->source = source;
+	me->mc = mc;
 	INIT_LIST_HEAD(&me->ino_index);
 	INIT_LIST_HEAD(&me->multi_list);
 	me->multi = NULL;
@@ -551,7 +550,7 @@ int cache_add_offset(struct mapent_cache
 	if (me && me != owner)
 		return CHE_DUPLICATE;
 
-	ret = cache_add(mc, owner->source, key, mapent, age);
+	ret = cache_add(mc, key, mapent, age);
 	if (ret == CHE_FAIL) {
 		warn(LOGOPT_ANY, "failed to add key %s to cache", key);
 		return CHE_FAIL;
@@ -619,8 +618,7 @@ int cache_set_parents(struct mapent *mm)
 }
 
 /* cache must be write locked by caller */
-int cache_update(struct mapent_cache *mc, struct map_source *source,
-		 const char *key, const char *mapent, time_t age)
+int cache_update(struct mapent_cache *mc, const char *key, const char *mapent, time_t age)
 {
 	struct mapent *me = NULL;
 	char *pent;
@@ -628,7 +626,7 @@ int cache_update(struct mapent_cache *mc
 
 	me = cache_lookup(mc, key);
 	if (!me || (*me->key == '*' && *key != '*')) {
-		ret = cache_add(mc, source, key, mapent, age);
+		ret = cache_add(mc, key, mapent, age);
 		if (!ret) {
 			debug(LOGOPT_NONE, "failed for %s", key);
 			return CHE_FAIL;
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index a782146..b584250 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -470,7 +470,7 @@ int umount_multi_triggers(struct autofs_
 	}
 
 	if (!left && me->multi == me) {
-		struct mapent_cache *mc = me->source->mc;
+		struct mapent_cache *mc = me->mc;
 		int status;
 
 		/*
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 9a9f498..47a208b 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -521,6 +521,7 @@ prepare_plus_include(struct autofs_point
 		return NULL;
 	}
 	iap = entry->ap;
+	iap->kpipefd = ap->kpipefd;
 	set_mnt_logging(iap);
 
 	/*
@@ -681,7 +682,7 @@ int lookup_read_map(struct autofs_point 
 				continue;
 
 			cache_writelock(mc);
-			cache_update(mc, source, s_key, mapent, age);
+			cache_update(mc, s_key, mapent, age);
 			cache_unlock(mc);
 
 			free(s_key);
@@ -794,7 +795,7 @@ static int lookup_one(struct autofs_poin
 
 				fclose(f);
 				cache_writelock(mc);
-				ret = cache_update(mc, source, key, mapent, age);
+				ret = cache_update(mc, key, mapent, age);
 				cache_unlock(mc);
 
 				return ret;
@@ -877,7 +878,7 @@ static int lookup_wild(struct autofs_poi
 
 				fclose(f);
 				cache_writelock(mc);
-				ret = cache_update(mc, source, "*", mapent, age);
+				ret = cache_update(mc, "*", mapent, age);
 				cache_unlock(mc);
 				return ret;
 			}
@@ -910,7 +911,7 @@ static int check_map_indirect(struct aut
 
 	cache_readlock(mc);
 	exists = cache_lookup_distinct(mc, key);
-	if (exists && exists->source != source)
+	if (exists && exists->mc != mc)
 		exists = NULL;
 	cache_unlock(mc);
 
@@ -1024,7 +1025,7 @@ int lookup_mount(struct autofs_point *ap
 	 * the map cache already we never get a mount lookup, so
 	 * we never know about it.
 	 */
-	if (ap->type == LKP_INDIRECT) {
+	if (ap->type == LKP_INDIRECT && *key != '/') {
 		char *lkp_key;
 
 		cache_readlock(mc);
@@ -1079,7 +1080,7 @@ int lookup_mount(struct autofs_point *ap
 			cache_writelock(mc);
 			me = cache_lookup_distinct(mc, key);
 			if (!me)
-				rv = cache_update(mc, source, key, NULL, now);
+				rv = cache_update(mc, key, NULL, now);
 			if (rv != CHE_FAIL) {
 				me = cache_lookup_distinct(mc, key);
 				me->status = now + NEGATIVE_TIMEOUT;
diff --git a/modules/lookup_hesiod.c b/modules/lookup_hesiod.c
index f30e9b2..562c51b 100644
--- a/modules/lookup_hesiod.c
+++ b/modules/lookup_hesiod.c
@@ -154,7 +154,7 @@ int lookup_mount(struct autofs_point *ap
 	}
 
 	cache_writelock(mc);
-	rv = cache_update(mc, source, name, best_record, time(NULL));
+	rv = cache_update(mc, name, best_record, time(NULL));
 	cache_unlock(mc);
 	if (rv == CHE_FAIL)
 		return NSS_STATUS_UNAVAIL;
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index 3b8c4ae..08ef278 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -97,7 +97,7 @@ int lookup_read_map(struct autofs_point 
 	while ((host = gethostent()) != NULL) {
 		pthread_cleanup_push(cache_lock_cleanup, mc);
 		cache_writelock(mc);
-		cache_update(mc, source, host->h_name, NULL, age);
+		cache_update(mc, host->h_name, NULL, age);
 		cache_unlock(mc);
 		pthread_cleanup_pop(0);
 	}
@@ -253,7 +253,7 @@ done:
 	debug(ap->logopt, MODPREFIX "%s -> %s", name, mapent);
 
 	cache_writelock(mc);
-	cache_update(mc, source, name, mapent, now);
+	cache_update(mc, name, mapent, now);
 	cache_unlock(mc);
 
 	master_source_current_wait(ap->entry);
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 40864d8..855cb95 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1251,7 +1251,7 @@ static int read_one_map(struct autofs_po
 			goto next;
 
 		cache_writelock(mc);
-		cache_update(mc, source, s_key, mapent, age);
+		cache_update(mc, s_key, mapent, age);
 		cache_unlock(mc);
 
 		free(s_key);
@@ -1463,7 +1463,7 @@ static int lookup_one(struct autofs_poin
 				goto next;
 			wild = 1;
 			cache_writelock(mc);
-			cache_update(mc, source, "*", mapent, age);
+			cache_update(mc, "*", mapent, age);
 			cache_unlock(mc);
 			goto next;
 		}
@@ -1473,7 +1473,7 @@ static int lookup_one(struct autofs_poin
 			goto next;
 
 		cache_writelock(mc);
-		ret = cache_update(mc, source, s_key, mapent, age);
+		ret = cache_update(mc, s_key, mapent, age);
 		cache_unlock(mc);
 
 		free(s_key);
@@ -1517,7 +1517,7 @@ static int check_map_indirect(struct aut
 
 	cache_readlock(mc);
 	exists = cache_lookup_distinct(mc, key);
-	if (exists && exists->source != source)
+	if (exists && exists->mc != mc)
 		exists = NULL;
 	cache_unlock(mc);
 
@@ -1613,7 +1613,7 @@ int lookup_mount(struct autofs_point *ap
 	 * the map cache already we never get a mount lookup, so
 	 * we never know about it.
 	 */
-	if (ap->type == LKP_INDIRECT) {
+	if (ap->type == LKP_INDIRECT && *key != '/') {
 		char *lkp_key;
 
 		cache_readlock(mc);
@@ -1665,7 +1665,7 @@ int lookup_mount(struct autofs_point *ap
 			cache_writelock(mc);
 			me = cache_lookup_distinct(mc, key);
 			if (!me)
-				rv = cache_update(mc, source, key, NULL, now);
+				rv = cache_update(mc, key, NULL, now);
 			if (rv != CHE_FAIL) {
 				me = cache_lookup_distinct(mc, key);
 				me->status = now + NEGATIVE_TIMEOUT;
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index e891c25..500bc53 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -223,7 +223,7 @@ int lookup_read_map(struct autofs_point 
 		mapent = ENTRY_VAL(this, 1);
 
 		cache_writelock(mc);
-		cache_update(mc, source, s_key, mapent, age);
+		cache_update(mc, s_key, mapent, age);
 		cache_unlock(mc);
 
 		free(s_key);
@@ -280,7 +280,7 @@ static int lookup_one(struct autofs_poin
 	this = NIS_RES_OBJECT(result);
 	mapent = ENTRY_VAL(this, 1);
 	cache_writelock(mc);
-	ret = cache_update(mc, source, key, mapent, age);
+	ret = cache_update(mc, key, mapent, age);
 	cache_unlock(mc);
 
 	nis_freeresult(result);
@@ -328,7 +328,7 @@ static int lookup_wild(struct autofs_poi
 	this = NIS_RES_OBJECT(result);
 	mapent = ENTRY_VAL(this, 1);
 	cache_writelock(mc);
-	ret = cache_update(mc, source, "*", mapent, age);
+	ret = cache_update(mc, "*", mapent, age);
 	cache_unlock(mc);
 
 	nis_freeresult(result);
@@ -356,7 +356,7 @@ static int check_map_indirect(struct aut
 
 	cache_readlock(mc);
 	exists = cache_lookup_distinct(mc, key);
-	if (exists && exists->source != source)
+	if (exists && exists->mc != mc)
 		exists = NULL;
 	cache_unlock(mc);
 
@@ -466,7 +466,7 @@ int lookup_mount(struct autofs_point *ap
 	 * the map cache already we never get a mount lookup, so
 	 * we never know about it.
 	 */
-	if (ap->type == LKP_INDIRECT) {
+	if (ap->type == LKP_INDIRECT && *key != '/') {
 		char *lkp_key;
 
 		cache_readlock(mc);
@@ -516,7 +516,7 @@ int lookup_mount(struct autofs_point *ap
 			cache_writelock(mc);
 			me = cache_lookup_distinct(mc, key);
 			if (!me)
-				rv = cache_update(mc, source, key, NULL, now);
+				rv = cache_update(mc, key, NULL, now);
 			if (rv != CHE_FAIL) {
 				me = cache_lookup_distinct(mc, key);
 				me->status = time(NULL) + NEGATIVE_TIMEOUT;
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index 1cdbf80..a22d400 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -339,7 +339,7 @@ int lookup_mount(struct autofs_point *ap
 	}
 
 	cache_writelock(mc);
-	ret = cache_update(mc, source, name, mapent, time(NULL));
+	ret = cache_update(mc, name, mapent, time(NULL));
 	cache_unlock(mc);
 	if (ret == CHE_FAIL)
 		return NSS_STATUS_UNAVAIL;
diff --git a/modules/lookup_userhome.c b/modules/lookup_userhome.c
index efcab0b..00a01ea 100644
--- a/modules/lookup_userhome.c
+++ b/modules/lookup_userhome.c
@@ -78,7 +78,7 @@ int lookup_mount(struct autofs_point *ap
 	}
 
 	cache_writelock(mc);
-	ret = cache_update(mc, source, name, NULL, time(NULL));
+	ret = cache_update(mc, name, NULL, time(NULL));
 	cache_unlock(mc);
 
 	if (ret == CHE_FAIL) {
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 29a72fb..ccf6d60 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -270,7 +270,7 @@ int yp_all_callback(int status, char *yp
 	*(mapent + vallen) = '\0';
 
 	cache_writelock(mc);
-	ret = cache_update(mc, source, key, mapent, age);
+	ret = cache_update(mc, key, mapent, age);
 	cache_unlock(mc);
 
 	free(key);
@@ -387,7 +387,7 @@ static int lookup_one(struct autofs_poin
 	}
 
 	cache_writelock(mc);
-	ret = cache_update(mc, source, key, mapent, age);
+	ret = cache_update(mc, key, mapent, age);
 	cache_unlock(mc);
 	free(mapent);
 
@@ -439,7 +439,7 @@ static int lookup_wild(struct autofs_poi
 	}
 
 	cache_writelock(mc);
-	ret = cache_update(mc, source, "*", mapent, age);
+	ret = cache_update(mc, "*", mapent, age);
 	cache_unlock(mc);
 	free(mapent);
 
@@ -465,7 +465,7 @@ static int check_map_indirect(struct aut
 
 	cache_readlock(mc);
 	exists = cache_lookup_distinct(mc, key);
-	if (exists && exists->source != source)
+	if (exists && exists->mc != mc)
 		exists = NULL;
 	cache_unlock(mc);
 
@@ -572,7 +572,7 @@ int lookup_mount(struct autofs_point *ap
 	  * the map cache already we never get a mount lookup, so
 	  * we never know about it.
 	  */
-        if (ap->type == LKP_INDIRECT) {
+        if (ap->type == LKP_INDIRECT && *key != '/') {
 		char *lkp_key;
 
 		cache_readlock(mc);
@@ -623,7 +623,7 @@ int lookup_mount(struct autofs_point *ap
 			cache_writelock(mc);
 			me = cache_lookup_distinct(mc, key);
 			if (!me)
-				rv = cache_update(mc, source, key, NULL, now);
+				rv = cache_update(mc, key, NULL, now);
 			if (rv != CHE_FAIL) {
 				me = cache_lookup_distinct(mc, key);
 				me->status = now + NEGATIVE_TIMEOUT;
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 1f1bc3c..b3f5d67 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -989,7 +989,7 @@ int parse_mount(struct autofs_point *ap,
 			 * Not in the cache, perhaps it's a program map
 			 * or one that doesn't support enumeration
 			 */
-			ret = cache_add(mc, source, name, mapent, time(NULL));
+			ret = cache_add(mc, name, mapent, time(NULL));
 			if (ret == CHE_FAIL) {
 				cache_unlock(mc);
 				free(options);

autofs-5.0.1-rc1-included-map-wild-lookup-fix.patch:
 CHANGELOG             |    1 
 modules/lookup_file.c |   51 ++++++++------------------------------------------
 2 files changed, 10 insertions(+), 42 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-included-map-wild-lookup-fix.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index bfc36c8..78a4cf8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@
 - fix included map lookup.
 - fix directory cleanup on expire.
 - fix task cancelation at shutdown.
+- fix included map wild card key lookup.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 028c1ec..3588129 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -822,52 +822,19 @@ static int lookup_wild(struct autofs_poi
 	while(1) {
 		entry = read_one(f, mkey, &k_len, mapent, &m_len);
 		if (entry) {
-			/*
-			 * If key starts with '+' it has to be an
-			 * included map.
-			 */
-			if (*mkey == '+') {
-				struct autofs_point *iap;
-				unsigned int inc;
-				int status;
-
-				inc = check_self_include(mkey, ctxt);
-
-				master_source_current_wait(ap->entry);
-				ap->entry->current = source;
-
-				iap = prepare_plus_include(ap, age, mkey, inc);
-				if (!iap) {
-					debug(ap->logopt,
-					      MODPREFIX
-					      "failed to select included map %s",
-					       mkey);
-					continue;
-				}
-
-				/* Gim'ee some o' that 16k stack baby !! */
-				status = lookup_nss_mount(iap, "*", 1);
-
-				master_free_mapent_sources(iap->entry, 0);
-				master_free_mapent(iap->entry);
-
-				if (status)
-					return CHE_COMPLETED;
-			} else {
-				int eq;
+			int eq;
 
-				eq = (*mkey == '*' && k_len == 1);
-				if (eq == 0)
-					continue;
+			eq = (*mkey == '*' && k_len == 1);
+			if (eq == 0)
+				continue;
 
-				cache_writelock(mc);
-				ret = cache_update(mc, "*", mapent, age);
-				cache_unlock(mc);
+			cache_writelock(mc);
+			ret = cache_update(mc, "*", mapent, age);
+			cache_unlock(mc);
 
-				fclose(f);
+			fclose(f);
 
-				return ret;
-			}
+			return ret;
 		}
 
 		if (feof(f))


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- autofs.spec	16 Aug 2006 07:27:49 -0000	1.141
+++ autofs.spec	20 Aug 2006 09:48:54 -0000	1.142
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.15
+%define release 0.rc1.16
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -41,6 +41,10 @@
 Patch28: autofs-5.0.1-rc1-premature-submount-expire.patch
 Patch29: autofs-5.0.1-rc1-more-expire-rework.patch
 Patch30: autofs-5.0.1-rc1-allow-initial-numeric-in-hostname.patch
+Patch31: autofs-5.0.1-rc1-included-map-lookup-fix.patch
+Patch32: autofs-5.0.1-rc1-dir-cleanup-on-expire-fix.patch
+Patch33: autofs-5.0.1-rc1-cancel-tasks-at-shutdown.patch
+Patch34: autofs-5.0.1-rc1-included-map-wild-lookup-fix.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -110,6 +114,10 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -166,6 +174,12 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Sun Aug 20 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.16
+- fix included map lookup.
+- fix directory cleanup on expire.
+- fix task cancelation at shutdown.
+- fix included map wild card key lookup.
+
 * Thu Aug 16 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.15
 - expire individual submounts.
 - add ino_index locking.



From fedora-cvs-commits at redhat.com  Sun Aug 20 12:31:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 08:31:53 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2177, 1.2178 linux-2.6-xen.patch,
	1.20, 1.21
Message-ID: <200608201231.k7KCVrow018396@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18278

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
should fix oprofile compilation on xen


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2177
retrieving revision 1.2178
diff -u -r1.2177 -r1.2178
--- kernel-2.6.spec	19 Aug 2006 23:25:51 -0000	1.2177
+++ kernel-2.6.spec	20 Aug 2006 12:31:32 -0000	1.2178
@@ -1539,7 +1539,7 @@
 %changelog
 * Tue Aug 15 2006 Juan Quintela <quintela at redhat.com>
 - linux-2.6-xen update
-  * linux-2.6.17-xen cset changeset:   29032:47ca0afc5fad
+  * linux-2.6.17-xen cset changeset: 29033:e6adb54afb96
   * linux-2.6-xen cset 22813:80c2ccf5c330
 - s/xen_version/xen_hv_cset/ as Fedora.
 - update xen hv to cset 11061.

linux-2.6-xen.patch:
 Documentation/networking/netdevices.txt             |    8 
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  614 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1116 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  734 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  478 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  700 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  554 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  112 
 arch/ia64/kernel/gate.lds.S                         |   23 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  255 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   79 
 arch/ia64/kernel/setup.c                            |   77 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  414 +++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  116 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   55 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   62 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  753 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  159 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1710 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  690 +++++
 arch/x86_64/mm/init-xen.c                           | 1202 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  397 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/infiniband/ulp/ipoib/ipoib_multicast.c      |    6 
 drivers/media/dvb/dvb-core/dvb_net.c                |    4 
 drivers/net/8139cp.c                                |    2 
 drivers/net/bnx2.c                                  |    8 
 drivers/net/bonding/bond_main.c                     |    9 
 drivers/net/chelsio/sge.c                           |    4 
 drivers/net/e1000/e1000_main.c                      |   11 
 drivers/net/forcedeth.c                             |   26 
 drivers/net/hamradio/6pack.c                        |    8 
 drivers/net/hamradio/mkiss.c                        |    8 
 drivers/net/ifb.c                                   |   10 
 drivers/net/irda/vlsi_ir.c                          |    2 
 drivers/net/ixgb/ixgb_main.c                        |    4 
 drivers/net/loopback.c                              |    4 
 drivers/net/mv643xx_eth.c                           |    2 
 drivers/net/natsemi.c                               |    4 
 drivers/net/r8169.c                                 |    2 
 drivers/net/s2io.c                                  |   16 
 drivers/net/sky2.c                                  |    4 
 drivers/net/tg3.c                                   |    4 
 drivers/net/tulip/winbond-840.c                     |    9 
 drivers/net/typhoon.c                               |    6 
 drivers/net/via-velocity.c                          |   10 
 drivers/net/wireless/orinoco.c                      |    4 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   34 
 drivers/oprofile/oprof.h                            |    7 
 drivers/oprofile/oprofile_files.c                   |  205 +
 drivers/pci/Kconfig                                 |    1 
 drivers/s390/net/qeth_eddp.c                        |   12 
 drivers/s390/net/qeth_main.c                        |    8 
 drivers/s390/net/qeth_tso.h                         |    2 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  617 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  566 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1450 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  853 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  383 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  138 +
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1345 +++++++++
 drivers/xen/netback/xenbus.c                        |  428 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1841 +++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  457 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  286 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  359 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1142 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   77 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  220 +
 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                 |   28 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  109 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |  101 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-i386/spinlock.h                         |    2 
 include/asm-ia64/agp.h                              |   39 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  191 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  114 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  145 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  136 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/ethtool.h                             |    2 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/netdevice.h                           |   74 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   58 
 include/net/pkt_sched.h                             |    7 
 include/net/protocol.h                              |    3 
 include/net/sock.h                                  |    4 
 include/net/tcp.h                                   |    7 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  442 +++
 include/xen/interface/arch-powerpc.h                |  120 
 include/xen/interface/arch-x86_32.h                 |  234 +
 include/xen/interface/arch-x86_64.h                 |  300 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  605 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  512 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   77 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |   26 
 kernel/irq/spurious.c                               |    3 
 kernel/timer.c                                      |   16 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/atm/clip.c                                      |    8 
 net/bridge/br_device.c                              |    8 
 net/bridge/br_forward.c                             |    2 
 net/bridge/br_if.c                                  |   23 
 net/bridge/br_netfilter.c                           |    7 
 net/core/dev.c                                      |  284 +-
 net/core/dev_mcast.c                                |   28 
 net/core/ethtool.c                                  |   37 
 net/core/netpoll.c                                  |    9 
 net/core/pktgen.c                                   |    8 
 net/core/skbuff.c                                   |  181 +
 net/decnet/dn_nsp_in.c                              |    3 
 net/decnet/dn_route.c                               |    3 
 net/ipv4/af_inet.c                                  |   87 
 net/ipv4/ip_output.c                                |   18 
 net/ipv4/ipcomp.c                                   |   11 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   10 
 net/ipv4/tcp.c                                      |   86 
 net/ipv4/tcp_input.c                                |    2 
 net/ipv4/tcp_ipv4.c                                 |   18 
 net/ipv4/tcp_output.c                               |   47 
 net/ipv4/xfrm4_output.c                             |   60 
 net/ipv6/addrconf.c                                 |    2 
 net/ipv6/ip6_output.c                               |    7 
 net/ipv6/ipcomp6.c                                  |   11 
 net/ipv6/xfrm6_output.c                             |   39 
 net/sched/sch_generic.c                             |   66 
 net/sched/sch_teql.c                                |    9 
 scripts/Makefile.xen                                |   14 
 472 files changed, 87476 insertions(+), 623 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-xen.patch	19 Aug 2006 23:25:52 -0000	1.20
+++ linux-2.6-xen.patch	20 Aug 2006 12:31:34 -0000	1.21
@@ -19270,8 +19270,8 @@
 +endif
 diff -urNp --exclude='.hg*' linux-2.6.17.8/arch/i386/oprofile/xenoprof.c compiling/arch/i386/oprofile/xenoprof.c
 --- linux-2.6.17.8/arch/i386/oprofile/xenoprof.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/oprofile/xenoprof.c	2006-08-13 14:43:06.000000000 +0200
-@@ -0,0 +1,542 @@
++++ compiling/arch/i386/oprofile/xenoprof.c	2006-08-20 07:23:32.000000000 +0200
+@@ -0,0 +1,554 @@
 +/**
 + * @file xenoprof.c
 + *
@@ -19303,6 +19303,7 @@
 +#include <xen/interface/xen.h>
 +#include <xen/interface/xenoprof.h>
 +#include <../../../drivers/oprofile/cpu_buffer.h>
++#include <../../../drivers/oprofile/event_buffer.h>
 +
 +static int xenoprof_start(void);
 +static void xenoprof_stop(void);
@@ -19425,16 +19426,27 @@
 +static void xenoprof_handle_passive(void)
 +{
 +	int i, j;
++	int flag_domain, flag_switch = 0;
 +
-+	for (i = 0; i < pdomains; i++)
++	for (i = 0; i < pdomains; i++) {
++		flag_domain = 0;
 +		for (j = 0; j < passive_domains[i].nbuf; j++) {
 +			xenoprof_buf_t *buf = p_xenoprof_buf[i][j];
 +			if (buf->event_head == buf->event_tail)
 +				continue;
-+                        oprofile_add_pc(IGNORED_PC, CPU_MODE_PASSIVE_START, passive_domains[i].domain_id);
-+			xenoprof_add_pc(buf, 1);
-+                        oprofile_add_pc(IGNORED_PC, CPU_MODE_PASSIVE_STOP, passive_domains[i].domain_id);
-+		}			
++                        if (!flag_domain) {
++				if (!oprofile_add_domain_switch(passive_domains[i].domain_id))
++					goto done;
++				flag_domain = 1;
++                        }
++                        xenoprof_add_pc(buf, 1);
++                        flag_switch = 1;
++		}
++	}
++ done:
++        if (flag_switch)
++                oprofile_add_domain_switch(COORDINATOR_DOMAIN);
++
 +}
 +
 +static irqreturn_t 



From fedora-cvs-commits at redhat.com  Sun Aug 20 12:42:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 08:42:37 -0400
Subject: rpms/gdb/FC-5 gdb-6.5-bz200048-find_line_pc-segv.patch, NONE,
	1.1.2.1 gdb-6.5-bz200533-ppc-solib_trampoline.patch, NONE,
	1.1.2.1 gdb.spec, 1.186, 1.186.2.1
Message-ID: <200608201242.k7KCgbmd020850@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/gdb/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20765

Modified Files:
      Tag: private-jkratoch
	gdb.spec 
Added Files:
      Tag: private-jkratoch
	gdb-6.5-bz200048-find_line_pc-segv.patch 
	gdb-6.5-bz200533-ppc-solib_trampoline.patch 
Log Message:
* Sun Aug 20 2006 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.3.0.0-1.132_jkratoch0
- Bugfix Patch130 segv (BZ 200048).
- Do not step into the PPC solib trampolines (BZ 200533).


gdb-6.5-bz200048-find_line_pc-segv.patch:
 tui-layout.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE gdb-6.5-bz200048-find_line_pc-segv.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200048


diff -ru gdb-6.5-orig/gdb/tui/tui-layout.c gdb-6.5-pr200048/gdb/tui/tui-layout.c
--- gdb-6.5-orig/gdb/tui/tui-layout.c	2006-08-07 21:33:42.000000000 +0200
+++ gdb-6.5-pr200048/gdb/tui/tui-layout.c	2006-08-13 02:26:39.000000000 +0200
@@ -519,13 +519,17 @@
     {
     case SRC_COMMAND:
     case SRC_DATA_COMMAND:
-      find_line_pc (cursal.symtab,
+      if (find_line_pc (cursal.symtab,
 		    TUI_SRC_WIN->detail.source_info.start_line_or_addr.line_no,
-		    &pc_list, &num_pc_values);
-      /* FIXME: What do we do with multiple pc values for ctors/dtors or
-                inlined functions?  */
-      addr = pc_list[0];
-      xfree (pc_list);
+		    &pc_list, &num_pc_values))
+	{
+	  /* FIXME: What do we do with multiple pc values for ctors/dtors or
+		    inlined functions?  */
+	  addr = pc_list[0];
+	  xfree (pc_list);
+	}
+      else
+        addr = 0;
       break;
     case DISASSEM_COMMAND:
     case SRC_DISASSEM_COMMAND:

gdb-6.5-bz200533-ppc-solib_trampoline.patch:
 minsyms.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE gdb-6.5-bz200533-ppc-solib_trampoline.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200533


diff -ru gdb-6.5-orig/gdb/minsyms.c gdb-6.5/gdb/minsyms.c
--- gdb-6.5-orig/gdb/minsyms.c	2005-12-17 17:34:01.000000000 -0500
+++ gdb-6.5/gdb/minsyms.c	2006-08-13 10:49:43.000000000 -0400
@@ -486,6 +486,9 @@
 			  don't fill the bfd_section member, so don't
 			  throw away symbols on those platforms.  */
 		       && SYMBOL_BFD_SECTION (&msymbol[hi]) != NULL
+		       /* Don't ignore symbols for solib trampolines
+			  Red Hat Bug 200533 and Bug 192964.  */
+		       && MSYMBOL_TYPE (&msymbol[hi]) != mst_solib_trampoline
 		       && SYMBOL_BFD_SECTION (&msymbol[hi]) != section)
 		  --hi;
 


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-5/gdb.spec,v
retrieving revision 1.186
retrieving revision 1.186.2.1
diff -u -r1.186 -r1.186.2.1
--- gdb.spec	15 Jun 2006 11:34:41 -0000	1.186
+++ gdb.spec	20 Aug 2006 12:42:32 -0000	1.186.2.1
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.132.FC5
+Release: 1.132_jkratoch0.FC5
 
 License: GPL
 Group: Development/Debuggers
@@ -292,6 +292,12 @@
 # ia32el.
 Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
+# Bugfix Patch130 segv (BZ 200048).
+Patch180: gdb-6.5-bz200048-find_line_pc-segv.patch
+
+# Do not step into the PPC solib trampolines (BZ 200533).
+Patch181: gdb-6.5-bz200533-ppc-solib_trampoline.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison
 
@@ -401,6 +407,8 @@
 %patch177 -p1
 %patch178 -p1
 %patch179 -p1
+%patch180 -p1
+%patch181 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -569,6 +577,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Sun Aug 20 2006 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.3.0.0-1.132_jkratoch0
+- Bugfix Patch130 segv (BZ 200048).
+- Do not step into the PPC solib trampolines (BZ 200533).
+
 * Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
 - Require flex and bison at build time.
 - Additional patch for BZ 175083, to cope with waitpid setting status



From fedora-cvs-commits at redhat.com  Sun Aug 20 14:30:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 10:30:51 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.ooo68369.dtrans.crash.patch, NONE,
	1.1 openoffice.org.spec, 1.850, 1.851
Message-ID: <200608201430.k7KEUpOB017176@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17149

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo68369.dtrans.crash.patch 
Log Message:
tracked down the problem

openoffice.org-2.0.4.ooo68369.dtrans.crash.patch:
 dtrans/source/X11/X11_selection.cxx |    1 -
 source/X11/X11_selection.cxx        |    0 
 2 files changed, 1 deletion(-)

--- NEW FILE openoffice.org-2.0.4.ooo68369.dtrans.crash.patch ---
Index: source/X11/X11_selection.cxx
===================================================================
RCS file: /cvs/gsl/dtrans/source/X11/X11_selection.cxx,v
retrieving revision 1.79.6.1
diff -u -r1.79.6.1 X11_selection.cxx
--- openoffice.org.orig/dtrans/source/X11/X11_selection.cxx	10 Aug 2006 14:48:39 -0000	1.79.6.1
+++ openoffice.org/dtrans/source/X11/X11_selection.cxx	20 Aug 2006 14:27:03 -0000
@@ -519,7 +519,6 @@
     if( m_xDisplayConnection.is() )
     {
         m_xDisplayConnection->removeEventHandler( Any(), this );
-        m_xDisplayConnection.clear();
     }
 
 	if( m_pDisplay )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.850
retrieving revision 1.851
diff -u -r1.850 -r1.851
--- openoffice.org.spec	17 Aug 2006 15:51:18 -0000	1.850
+++ openoffice.org.spec	20 Aug 2006 14:30:47 -0000	1.851
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 1
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -120,6 +120,7 @@
 Patch52: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 Patch53: openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch
 Patch54: openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch
+Patch55: openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -974,6 +975,7 @@
 %patch52 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 %patch53 -p1 -b .oooXXXXX.solenv.warnnoterror.patch
 %patch54 -p1 -b .ooo68665.x86_64gcj.jvm.patch
+%patch55 -p1 -b .ooo68369.dtrans.crash.patch
 
 tar xzf %{SOURCE1}
 
@@ -2497,6 +2499,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Sun Aug 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.2
+- fix openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
+
 * Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.1
 - rh#201447# -> openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
 - rh#201305# -> openoffice.org-1.9.115.ooo51931.fixxmlsec.patch



From fedora-cvs-commits at redhat.com  Sun Aug 20 14:37:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 10:37:37 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.18, 1.19 setroubleshoot.spec,
	1.23, 1.24 sources, 1.21, 1.22
Message-ID: <200608201437.k7KEbbu2017262@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17241/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.24-1 on branch devel from setroubleshoot-0.24-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Aug 2006 16:34:00 -0000	1.18
+++ .cvsignore	20 Aug 2006 14:37:32 -0000	1.19
@@ -1 +1 @@
-setroubleshoot-0.23.tar.gz
+setroubleshoot-0.24.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- setroubleshoot.spec	17 Aug 2006 16:34:00 -0000	1.23
+++ setroubleshoot.spec	20 Aug 2006 14:37:32 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.23
+Version: 0.24
 Release: 1
 License: GPL
 Group: Applications/System
@@ -98,6 +98,9 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Sun Aug 20 2006 Dan Walsh <dwalsh at redhat.com> - 0.24-1
+- add missing runcmd
+
 * Thu Aug 17 2006 John Dennis <jdennis at redhat.com> - 0.23-1
 
 	* fix for bug #202206, require correct version of audit,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	17 Aug 2006 16:34:00 -0000	1.21
+++ sources	20 Aug 2006 14:37:32 -0000	1.22
@@ -1 +1 @@
-540558c05691d20bb47a0eebc5b0be66  setroubleshoot-0.23.tar.gz
+cb87682917d9567396c8d61c98cac8b9  setroubleshoot-0.24.tar.gz



From fedora-cvs-commits at redhat.com  Sun Aug 20 14:54:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 10:54:50 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch, 1.13,
	1.14 selinux-policy.spec, 1.253, 1.254
Message-ID: <200608201454.k7KEsowG014136@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14080

Modified Files:
	policy-20060802.patch selinux-policy.spec 
Log Message:
* Sun Aug 20 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-2
- Fixes for stunnel and postgresql


policy-20060802.patch:
 mls                                  |    9 
 modules/admin/amanda.fc              |   51 ----
 modules/admin/anaconda.te            |   20 +
 modules/admin/bootloader.te          |    4 
 modules/admin/consoletype.te         |   11 -
 modules/admin/firstboot.te           |    2 
 modules/admin/rpm.fc                 |    2 
 modules/admin/rpm.if                 |   13 -
 modules/admin/usermanage.te          |    5 
 modules/apps/java.fc                 |    9 
 modules/apps/mozilla.if              |    2 
 modules/apps/wine.te                 |    2 
 modules/kernel/corecommands.fc       |    1 
 modules/kernel/corecommands.if       |    1 
 modules/kernel/corenetwork.te.in     |    7 
 modules/kernel/devices.fc            |    2 
 modules/kernel/devices.if            |   37 +++
 modules/kernel/devices.te            |    8 
 modules/kernel/files.if              |   18 +
 modules/kernel/filesystem.te         |    2 
 modules/kernel/kernel.if             |   75 +++++++
 modules/kernel/terminal.if           |   19 +
 modules/services/amavis.te           |    7 
 modules/services/apache.te           |    1 
 modules/services/avahi.te            |    2 
 modules/services/bind.te             |    1 
 modules/services/ccs.fc              |    8 
 modules/services/ccs.if              |   45 ++++
 modules/services/ccs.te              |   84 +++++++
 modules/services/cpucontrol.te       |    2 
 modules/services/cron.if             |   17 +
 modules/services/cron.te             |    7 
 modules/services/cups.te             |   19 +
 modules/services/cyrus.te            |    5 
 modules/services/dbus.if             |    6 
 modules/services/dovecot.te          |    2 
 modules/services/inn.te              |    1 
 modules/services/ldap.te             |    2 
 modules/services/mta.fc              |    2 
 modules/services/ntp.te              |    2 
 modules/services/oddjob.fc           |    8 
 modules/services/oddjob.if           |   76 +++++++
 modules/services/oddjob.te           |   70 ++++++
 modules/services/oddjob_mkhomedir.fc |    6 
 modules/services/oddjob_mkhomedir.if |   24 ++
 modules/services/oddjob_mkhomedir.te |   26 ++
 modules/services/openvpn.te          |    2 
 modules/services/pegasus.if          |   31 ++
 modules/services/pegasus.te          |    5 
 modules/services/postfix.te          |    7 
 modules/services/postgresql.te       |    1 
 modules/services/procmail.te         |    1 
 modules/services/radius.te           |    2 
 modules/services/ricci.fc            |   20 +
 modules/services/ricci.if            |  184 +++++++++++++++++
 modules/services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++
 modules/services/rpc.if              |    2 
 modules/services/rpc.te              |    5 
 modules/services/samba.te            |    8 
 modules/services/setroubleshoot.fc   |    9 
 modules/services/setroubleshoot.if   |    3 
 modules/services/setroubleshoot.te   |  110 ++++++++++
 modules/services/spamassassin.te     |    4 
 modules/services/squid.te            |    4 
 modules/services/ssh.if              |   24 ++
 modules/services/stunnel.te          |    2 
 modules/services/sysstat.te          |    3 
 modules/services/xserver.if          |   69 ++++++
 modules/services/xserver.te          |   19 +
 modules/system/authlogin.if          |   42 ++-
 modules/system/authlogin.te          |   19 +
 modules/system/fstools.te            |    1 
 modules/system/hostname.te           |   10 
 modules/system/init.if               |    7 
 modules/system/init.te               |    2 
 modules/system/libraries.fc          |    7 
 modules/system/locallogin.te         |    4 
 modules/system/logging.fc            |    3 
 modules/system/logging.if            |   21 +
 modules/system/logging.te            |    3 
 modules/system/lvm.fc                |    2 
 modules/system/lvm.te                |    6 
 modules/system/miscfiles.fc          |    1 
 modules/system/miscfiles.if          |   18 +
 modules/system/modutils.te           |    1 
 modules/system/mount.te              |    3 
 modules/system/selinuxutil.te        |   15 +
 modules/system/udev.fc               |    1 
 modules/system/udev.te               |    1 
 modules/system/unconfined.if         |    2 
 modules/system/unconfined.te         |    5 
 modules/system/userdomain.if         |  236 +++++++++++++++-------
 modules/system/userdomain.te         |   48 ++--
 modules/system/xen.if                |   38 +++
 modules/system/xen.te                |   26 +-
 95 files changed, 1872 insertions(+), 261 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- policy-20060802.patch	19 Aug 2006 13:09:31 -0000	1.13
+++ policy-20060802.patch	20 Aug 2006 14:54:47 -0000	1.14
@@ -1447,6 +1447,17 @@
  
  optional_policy(`
  	postgrey_stream_connect(postfix_smtpd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-2.3.8/policy/modules/services/postgresql.te
+--- nsaserefpolicy/policy/modules/services/postgresql.te	2006-08-16 08:46:30.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/postgresql.te	2006-08-20 10:40:06.000000000 -0400
+@@ -134,6 +134,7 @@
+ seutil_dontaudit_search_config(postgresql_t)
+ 
+ sysnet_read_config(postgresql_t)
++sysnet_use_ldap(postgresql_t)
+ 
+ userdom_dontaudit_search_sysadm_home_dirs(postgresql_t)
+ userdom_dontaudit_use_sysadm_ttys(postgresql_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.8/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.8/policy/modules/services/procmail.te	2006-08-18 23:12:03.000000000 -0400
@@ -2323,6 +2334,25 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.8/policy/modules/services/stunnel.te
+--- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.8/policy/modules/services/stunnel.te	2006-08-20 10:45:16.000000000 -0400
+@@ -38,6 +38,7 @@
+ allow stunnel_t self:fifo_file rw_file_perms;
+ allow stunnel_t self:tcp_socket create_stream_socket_perms;
+ allow stunnel_t self:udp_socket create_socket_perms;
++allow stunnel_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow stunnel_t stunnel_etc_t:dir { getattr read search };
+ allow stunnel_t stunnel_etc_t:file { read getattr };
+@@ -64,6 +65,7 @@
+ corenet_udp_sendrecv_all_ports(stunnel_t)
+ corenet_tcp_bind_all_nodes(stunnel_t)
+ #corenet_tcp_bind_stunnel_port(stunnel_t)
++corenet_tcp_connect_smtp_port(stunnel_t)
+ 
+ fs_getattr_all_fs(stunnel_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-2.3.8/policy/modules/services/sysstat.te
 --- nsaserefpolicy/policy/modules/services/sysstat.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.8/policy/modules/services/sysstat.te	2006-08-18 23:12:03.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- selinux-policy.spec	18 Aug 2006 14:18:35 -0000	1.253
+++ selinux-policy.spec	20 Aug 2006 14:54:47 -0000	1.254
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.8
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Sun Aug 20 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-2
+- Fixes for stunnel and postgresql
+
 * Fri Aug 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-1
 - Update from upstream
 



From fedora-cvs-commits at redhat.com  Sun Aug 20 15:11:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 11:11:41 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.80,
	1.81 policy-20060802.patch, 1.14, 1.15 selinux-policy.spec,
	1.254, 1.255 sources, 1.84, 1.85
Message-ID: <200608201511.k7KFBf6W018055@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17990

Modified Files:
	.cvsignore policy-20060802.patch selinux-policy.spec sources 
Log Message:
* Sun Aug 20 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-2
- Fixes for stunnel and postgresql
- Update from upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	12 Aug 2006 11:54:51 -0000	1.80
+++ .cvsignore	20 Aug 2006 15:11:37 -0000	1.81
@@ -81,3 +81,4 @@
 serefpolicy-2.3.5.tgz
 serefpolicy-2.3.6.tgz
 serefpolicy-2.3.7.tgz
+serefpolicy-2.3.8.tgz

policy-20060802.patch:
 mls                                  |    9 
 modules/admin/amanda.fc              |   51 ----
 modules/admin/anaconda.te            |   20 +
 modules/admin/bootloader.te          |    4 
 modules/admin/consoletype.te         |   11 -
 modules/admin/firstboot.te           |    2 
 modules/admin/rpm.fc                 |    2 
 modules/admin/rpm.if                 |   13 -
 modules/admin/usermanage.te          |    5 
 modules/apps/java.fc                 |    9 
 modules/apps/mozilla.if              |    2 
 modules/apps/wine.te                 |    2 
 modules/kernel/corecommands.fc       |    1 
 modules/kernel/corecommands.if       |    1 
 modules/kernel/corenetwork.te.in     |    7 
 modules/kernel/devices.fc            |    3 
 modules/kernel/devices.if            |   37 +++
 modules/kernel/devices.te            |    8 
 modules/kernel/files.if              |   18 +
 modules/kernel/filesystem.te         |    2 
 modules/kernel/kernel.if             |   75 +++++++
 modules/kernel/terminal.if           |   19 +
 modules/services/amavis.te           |    7 
 modules/services/apache.te           |    1 
 modules/services/avahi.te            |    2 
 modules/services/bind.te             |    1 
 modules/services/ccs.fc              |    8 
 modules/services/ccs.if              |   45 ++++
 modules/services/ccs.te              |   84 +++++++
 modules/services/cpucontrol.te       |    2 
 modules/services/cron.if             |   17 +
 modules/services/cron.te             |    7 
 modules/services/cups.te             |   19 +
 modules/services/cyrus.te            |    5 
 modules/services/dbus.if             |    6 
 modules/services/dovecot.te          |    2 
 modules/services/inn.te              |    1 
 modules/services/ldap.te             |    2 
 modules/services/mta.fc              |    2 
 modules/services/ntp.te              |    2 
 modules/services/oddjob.fc           |    8 
 modules/services/oddjob.if           |   76 +++++++
 modules/services/oddjob.te           |   70 ++++++
 modules/services/oddjob_mkhomedir.fc |    6 
 modules/services/oddjob_mkhomedir.if |   24 ++
 modules/services/oddjob_mkhomedir.te |   26 ++
 modules/services/openvpn.te          |    2 
 modules/services/pegasus.if          |   31 ++
 modules/services/pegasus.te          |    5 
 modules/services/postfix.te          |    7 
 modules/services/postgresql.te       |    1 
 modules/services/procmail.te         |    1 
 modules/services/radius.te           |    2 
 modules/services/ricci.fc            |   20 +
 modules/services/ricci.if            |  184 +++++++++++++++++
 modules/services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++
 modules/services/rpc.if              |    2 
 modules/services/rpc.te              |    5 
 modules/services/samba.te            |    8 
 modules/services/setroubleshoot.fc   |    9 
 modules/services/setroubleshoot.if   |    3 
 modules/services/setroubleshoot.te   |  110 ++++++++++
 modules/services/spamassassin.te     |    4 
 modules/services/squid.te            |    4 
 modules/services/ssh.if              |   24 ++
 modules/services/stunnel.te          |    2 
 modules/services/sysstat.te          |    3 
 modules/services/xserver.if          |   69 ++++++
 modules/services/xserver.te          |   19 +
 modules/system/authlogin.if          |   42 ++-
 modules/system/authlogin.te          |    2 
 modules/system/fstools.te            |    1 
 modules/system/hostname.te           |   10 
 modules/system/init.if               |    7 
 modules/system/init.te               |    2 
 modules/system/libraries.fc          |    7 
 modules/system/locallogin.te         |    4 
 modules/system/logging.fc            |    3 
 modules/system/logging.if            |   21 +
 modules/system/logging.te            |    3 
 modules/system/lvm.fc                |    2 
 modules/system/lvm.te                |    6 
 modules/system/miscfiles.fc          |    1 
 modules/system/miscfiles.if          |   18 +
 modules/system/modutils.te           |    1 
 modules/system/mount.te              |    3 
 modules/system/selinuxutil.te        |   12 +
 modules/system/udev.fc               |    1 
 modules/system/udev.te               |    1 
 modules/system/unconfined.if         |    2 
 modules/system/unconfined.te         |    5 
 modules/system/userdomain.if         |  236 +++++++++++++++-------
 modules/system/userdomain.te         |   48 ++--
 modules/system/xen.if                |   38 +++
 modules/system/xen.te                |   26 +-
 95 files changed, 1859 insertions(+), 255 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- policy-20060802.patch	20 Aug 2006 14:54:47 -0000	1.14
+++ policy-20060802.patch	20 Aug 2006 15:11:37 -0000	1.15
@@ -305,7 +305,7 @@
  	files_execmod_all_files(wine_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.8/policy/modules/kernel/corecommands.fc
---- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-02 10:34:05.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.8/policy/modules/kernel/corecommands.fc	2006-08-18 23:12:03.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
@@ -370,9 +370,17 @@
  network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
  network_port(spamd, tcp,783,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.8/policy/modules/kernel/devices.fc
---- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-02 10:34:05.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.8/policy/modules/kernel/devices.fc	2006-08-18 23:12:03.000000000 -0400
-@@ -37,7 +37,7 @@
+@@ -12,6 +12,7 @@
+ /dev/atibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/audio.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/beep		-c	gen_context(system_u:object_r:sound_device_t,s0)
++/dev/console		-c	gen_context(system_u:object_r:console_device_t,s0)
+ /dev/dsp.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/efirtc		-c	gen_context(system_u:object_r:clock_device_t,s0)
+ /dev/event.*		-c	gen_context(system_u:object_r:event_device_t,s0)
+@@ -36,7 +37,7 @@
  /dev/mpu401.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/null		-c	gen_context(system_u:object_r:null_device_t,s0)
  /dev/nvidia.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
@@ -426,7 +434,7 @@
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.8/policy/modules/kernel/devices.te
---- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-02 10:34:05.000000000 -0400
+--- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.8/policy/modules/kernel/devices.te	2006-08-18 23:12:03.000000000 -0400
 @@ -72,6 +72,12 @@
  dev_node(lvm_control_t)
@@ -2734,19 +2742,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.8/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-18 07:32:40.000000000 -0400
 +++ serefpolicy-2.3.8/policy/modules/system/authlogin.te	2006-08-18 23:12:03.000000000 -0400
-@@ -93,10 +93,9 @@
- 
- allow pam_t pam_var_run_t:dir { search getattr read write remove_name };
- allow pam_t pam_var_run_t:file { getattr read unlink };
--files_list_pids(pam_t)
- 
--allow pam_t pam_tmp_t:dir manage_dir_perms;
--allow pam_t pam_tmp_t:file manage_file_perms;
-+allow pam_t pam_tmp_t:dir create_dir_perms;
-+allow pam_t pam_tmp_t:file create_file_perms;
- files_tmp_filetrans(pam_t, pam_tmp_t, { file dir })
- 
- kernel_read_system_state(pam_t)
 @@ -109,6 +108,7 @@
  init_dontaudit_rw_utmp(pam_t)
  
@@ -2755,34 +2750,7 @@
  
  libs_use_ld_so(pam_t)
  libs_use_shared_libs(pam_t)
-@@ -140,10 +140,10 @@
- allow pam_console_t self:process { sigchld sigkill sigstop signull signal };
- 
- # for /var/run/console.lock checking
--allow pam_console_t pam_var_console_t:dir list_dir_perms;
--allow pam_console_t pam_var_console_t:lnk_file { getattr read };
-+allow pam_console_t pam_var_console_t:dir r_dir_perms;;
- allow pam_console_t pam_var_console_t:file r_file_perms;
- dontaudit pam_console_t pam_var_console_t:file write;
-+allow pam_console_t pam_var_console_t:lnk_file { getattr read };
- 
- kernel_read_kernel_sysctls(pam_console_t)
  kernel_use_fds(pam_console_t)
-@@ -220,7 +220,13 @@
- 
- userdom_dontaudit_use_unpriv_user_fds(pam_console_t)
- 
--ifdef(`targeted_policy',`
-+# cjp: with the old daemon_(base_)domain being broken up into
-+# a daemon and system interface, this probably is not needed:
-+ifdef(`direct_sysadm_daemon', `
-+	userdom_dontaudit_use_sysadm_terms(pam_console_t)
-+')
-+
-+ifdef(`targeted_policy', `
- 	term_dontaudit_use_unallocated_ttys(pam_console_t)
- 	term_dontaudit_use_generic_ptys(pam_console_t)
- 	files_dontaudit_read_root_files(pam_console_t)
 @@ -267,6 +273,7 @@
  
  term_dontaudit_use_unallocated_ttys(system_chkpwd_t)
@@ -2845,7 +2813,7 @@
  
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.8/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-08-16 08:46:31.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/init.te	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.8/policy/modules/system/init.te	2006-08-18 23:12:03.000000000 -0400
 @@ -357,6 +357,8 @@
  logging_read_audit_config(initrc_t)
@@ -2857,9 +2825,9 @@
  miscfiles_read_certs(initrc_t)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.8/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-02 10:34:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.8/policy/modules/system/libraries.fc	2006-08-18 23:12:03.000000000 -0400
-@@ -97,6 +97,8 @@
+@@ -109,6 +97,8 @@
  /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
  
  /usr/lib(64)?/xulrunner-[^/]*/libxul\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -2868,7 +2836,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:textrel_shlib_t,s0)
  /usr/lib(64)?/ati-fglrx/.+\.so(\..*)?	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -166,6 +168,7 @@
+@@ -178,6 +168,7 @@
  /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)
  
@@ -2876,7 +2844,7 @@
  /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)
  /usr/lib(64)?/sunbird.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -199,8 +202,8 @@
+@@ -211,8 +202,8 @@
  /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -2947,7 +2915,7 @@
 +	allow $1 auditd_t:unix_stream_socket connectto;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.8/policy/modules/system/logging.te
---- nsaserefpolicy/policy/modules/system/logging.te	2006-08-02 10:34:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/logging.te	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.8/policy/modules/system/logging.te	2006-08-18 23:12:03.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
@@ -3047,7 +3015,7 @@
  ## </summary>
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.8/policy/modules/system/modutils.te
---- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-02 10:34:08.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.8/policy/modules/system/modutils.te	2006-08-18 23:12:03.000000000 -0400
 @@ -183,6 +183,7 @@
  fs_getattr_xattr_fs(depmod_t)
@@ -3078,7 +3046,7 @@
  
  ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.8/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-02 10:34:09.000000000 -0400
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.8/policy/modules/system/selinuxutil.te	2006-08-18 23:12:03.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
@@ -3100,17 +3068,7 @@
  	# restorecond watches for users logging in, 
  	# so it getspwnam when a user logs in to find his homedir
  	nis_use_ypbind(restorecond_t)
-@@ -593,6 +599,9 @@
- 
- miscfiles_read_localization(semanage_t)
- 
-+allow semanage_t default_context_t:dir rw_dir_perms;
-+allow semanage_t default_context_t:file create_file_perms;
-+
- seutil_search_default_contexts(semanage_t)
- seutil_manage_file_contexts(semanage_t)
- seutil_manage_selinux_config(semanage_t)
-@@ -611,6 +620,12 @@
+@@ -612,6 +620,12 @@
  	# Handle pp files created in homedir and /tmp
  	files_read_generic_tmp_files(semanage_t)
  	userdom_read_generic_user_home_content_files(semanage_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- selinux-policy.spec	20 Aug 2006 14:54:47 -0000	1.254
+++ selinux-policy.spec	20 Aug 2006 15:11:37 -0000	1.255
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.8
-Release: 2
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -349,8 +349,6 @@
 %changelog
 * Sun Aug 20 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-2
 - Fixes for stunnel and postgresql
-
-* Fri Aug 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-1
 - Update from upstream
 
 * Sat Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	12 Aug 2006 11:54:51 -0000	1.84
+++ sources	20 Aug 2006 15:11:37 -0000	1.85
@@ -1 +1 @@
-db77e32295f642a88c7e89673361b15d  serefpolicy-2.3.7.tgz
+c144c7bfda6f332edd5aee0a71364eb1  serefpolicy-2.3.8.tgz



From fedora-cvs-commits at redhat.com  Sun Aug 20 15:19:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 11:19:41 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.ooo68805.sw.ww8size.patch, NONE,
	1.1 openoffice.org.spec, 1.851,
	1.852 openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch, 1.2, NONE
Message-ID: <200608201519.k7KFJfMl003598@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3530

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo68805.sw.ww8size.patch 
Removed Files:
	openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch 
Log Message:
new fix

openoffice.org-2.0.4.ooo68805.sw.ww8size.patch:
 source/filter/ww8/ww8scan.cxx    |    0 
 sw/source/filter/ww8/ww8scan.cxx |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.0.4.ooo68805.sw.ww8size.patch ---
Index: source/filter/ww8/ww8scan.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8scan.cxx,v
retrieving revision 1.126
diff -u -r1.126 ww8scan.cxx
--- openoffice.org.orig/sw/source/filter/ww8/ww8scan.cxx	19 Apr 2006 13:43:09 -0000	1.126
+++ openoffice.org/sw/source/filter/ww8/ww8scan.cxx	20 Aug 2006 15:12:40 -0000
@@ -6488,7 +6488,7 @@
             cDBC = Get_Long( pData );
             cDBCFtnEdn = Get_Long( pData );
 
-            pData += 1 * sizeof( long );
+            pData += 1 * sizeof( INT32);
 
             nfcFtnRef = Get_Short( pData );
             nfcEdnRef = Get_Short( pData );
@@ -6780,7 +6780,7 @@
         Set_UInt32( pData, cDBC );
         Set_UInt32( pData, cDBCFtnEdn );
 
-        pData += 1 * sizeof( long );
+        pData += 1 * sizeof( INT32);
 
         Set_UInt16( pData, nfcFtnRef );
         Set_UInt16( pData, nfcEdnRef );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.851
retrieving revision 1.852
diff -u -r1.851 -r1.852
--- openoffice.org.spec	20 Aug 2006 14:30:47 -0000	1.851
+++ openoffice.org.spec	20 Aug 2006 15:19:38 -0000	1.852
@@ -92,35 +92,35 @@
 Patch24: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch25: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch26: workspace.fpicker6.patch
-Patch27: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
-Patch28: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch29: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
-Patch30: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
-Patch31: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch32: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch33: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch34: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch35: ooobuild.VBAObjects.patch
-Patch36: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch37: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch38: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch39: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch40: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch41: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch42: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch43: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch44: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch45: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch46: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch47: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch48: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch49: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch50: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
-Patch51: openoffice.org-2.0.3.ooo68383.evo28support.patch
-Patch52: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
-Patch53: openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch
-Patch54: openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch
-Patch55: openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
+Patch27: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch28: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
+Patch29: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
+Patch30: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch31: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch32: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch33: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch34: ooobuild.VBAObjects.patch
+Patch35: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch36: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch37: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch38: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch39: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch40: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch41: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch42: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch43: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch44: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch45: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch46: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch47: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch48: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch49: openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
+Patch50: openoffice.org-2.0.3.ooo68383.evo28support.patch
+Patch51: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
+Patch52: openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch
+Patch53: openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch
+Patch54: openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
+Patch55: openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -947,35 +947,35 @@
 %patch24 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch25 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch26 -p1 -b .workspace.fpicker6.patch
-%patch27 -p1 -b .oooXXXXX.atkbroken.vcl.patch
-%patch28 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch29 -p1 -b .ooo59127.vcl.honourcairofont.patch
-%patch30 -p1 -b .rh192588.officecfg.defaultcairooff.patch
-%patch31 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch32 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch33 -p1 -b .rh187919.gtkunderkde.patch
-%patch34 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch35 -p0 -b .ooobuild.VBAObjects.patch
-%patch36 -p1 -b .ooo67644.sw.spacing.patch
-%patch37 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch38 -p1 -b .ooo67716.svx.overflow.patch
-%patch39 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch40 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch41 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch42 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch43 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch44 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch45 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch46 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch47 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch48 -p1 -b .ooo68047.vcl.zwj.patch
-%patch49 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch50 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
-%patch51 -p1 -b .ooo68383.evo28support.patch
-%patch52 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
-%patch53 -p1 -b .oooXXXXX.solenv.warnnoterror.patch
-%patch54 -p1 -b .ooo68665.x86_64gcj.jvm.patch
-%patch55 -p1 -b .ooo68369.dtrans.crash.patch
+%patch27 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch28 -p1 -b .ooo59127.vcl.honourcairofont.patch
+%patch29 -p1 -b .rh192588.officecfg.defaultcairooff.patch
+%patch30 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch31 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch32 -p1 -b .rh187919.gtkunderkde.patch
+%patch33 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch34 -p0 -b .ooobuild.VBAObjects.patch
+%patch35 -p1 -b .ooo67644.sw.spacing.patch
+%patch36 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch37 -p1 -b .ooo67716.svx.overflow.patch
+%patch38 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch39 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch40 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch41 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch42 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch43 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch44 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch45 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch46 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch47 -p1 -b .ooo68047.vcl.zwj.patch
+%patch48 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch49 -p1 -b .ooo68339.vcl.maskingtoomanybytes.patch
+%patch50 -p1 -b .ooo68383.evo28support.patch
+%patch51 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
+%patch52 -p1 -b .oooXXXXX.solenv.warnnoterror.patch
+%patch53 -p1 -b .ooo68665.x86_64gcj.jvm.patch
+%patch54 -p1 -b .ooo68369.dtrans.crash.patch
+%patch55 -p1 -b .ooo68805.sw.ww8size.patch
 
 tar xzf %{SOURCE1}
 
@@ -2501,6 +2501,8 @@
 %changelog
 * Sun Aug 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.2
 - fix openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
+- fix openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
+- drop openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch, fixed in gnome now
 
 * Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.1
 - rh#201447# -> openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch


--- openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Aug 20 17:41:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 13:41:39 -0400
Subject: rpms/gdb/devel
	gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch, NONE,
	1.1.2.1 gdb-6.3-bz182116-exec-from-pthread.patch, NONE,
	1.1.2.1 gdb-6.3-bz193763-object-name-completion.patch, NONE,
	1.1.2.1 gdb-6.5-bz195429-stale-threads-crash.patch, NONE,
	1.1.2.1 gdb-6.5-bz196439-valgrind-memcheck-compat.patch, NONE,
	1.1.2.1 gdb-6.5-bz200048-find_line_pc-segv.patch, NONE,
	1.1.2.1 gdb-6.5-bz200533-ppc-solib_trampoline.patch, NONE,
	1.1.2.1 gdb.spec, 1.193, 1.193.2.1
Message-ID: <200608201741.k7KHfdFp018022@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17933

Modified Files:
      Tag: private-jkratoch
	gdb.spec 
Added Files:
      Tag: private-jkratoch
	gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch 
	gdb-6.3-bz182116-exec-from-pthread.patch 
	gdb-6.3-bz193763-object-name-completion.patch 
	gdb-6.5-bz195429-stale-threads-crash.patch 
	gdb-6.5-bz196439-valgrind-memcheck-compat.patch 
	gdb-6.5-bz200048-find_line_pc-segv.patch 
	gdb-6.5-bz200533-ppc-solib_trampoline.patch 
Log Message:
* Sun Aug 20 2006 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.5-3_jkratoch0
- Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ 200048).
- Do not step into the PPC solib trampolines (BZ 200533).
- Fix exec() from threaded program, partial CVS backport (BZ 182116).
- Fix occasional failure to load shared libraries (BZ 146810).
- Bugfix object names completion (fixes Patch116, BZ 193763).
- Avoid crash of 'info threads' if stale threads exist (BZ 195429).
- Handle corrupted or missing location list information (BZ 196439).


gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch:
 solib.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146810

Bug is still present in 2006-07-21 GDB CVS. The segfault is just a consequence of earlier failure to properly load the custom shared library:
Error while mapping shared library sections:
libc++test4dl.so: Success.


Index: solib.c
===================================================================
RCS file: /cvs/src/src/gdb/solib.c,v
retrieving revision 1.84
diff -u -p -r1.84 solib.c
--- gdb/solib.c	25 Feb 2006 04:36:39 -0000	1.84
+++ gdb/solib.c	21 Jul 2006 18:27:49 -0000
@@ -146,13 +146,17 @@ solib_open (char *in_pathname, char **fo
   int found_file = -1;
   char *temp_pathname = NULL;
   char *p = in_pathname;
+  int solib_absolute_prefix_is_empty;
+
+  solib_absolute_prefix_is_empty = (solib_absolute_prefix == NULL
+                                    || *solib_absolute_prefix == 0);
 
   while (*p && !IS_DIR_SEPARATOR (*p))
     p++;
 
   if (*p)
     {
-      if (! IS_ABSOLUTE_PATH (in_pathname) || solib_absolute_prefix == NULL)
+      if (! IS_ABSOLUTE_PATH (in_pathname) || solib_absolute_prefix_is_empty)
         temp_pathname = in_pathname;
       else
 	{
@@ -208,14 +212,14 @@ solib_open (char *in_pathname, char **fo
 					   &temp_pathname);
 
   /* If not found, next search the inferior's $PATH environment variable. */
-  if (found_file < 0 && solib_absolute_prefix == NULL)
+  if (found_file < 0 && solib_absolute_prefix_is_empty)
     found_file = openp (get_in_environ (inferior_environ, "PATH"),
 			OPF_TRY_CWD_FIRST, in_pathname, O_RDONLY | O_BINARY, 0,
 			&temp_pathname);
 
   /* If not found, next search the inferior's $LD_LIBRARY_PATH 
      environment variable. */
-  if (found_file < 0 && solib_absolute_prefix == NULL)
+  if (found_file < 0 && solib_absolute_prefix_is_empty)
     found_file = openp (get_in_environ (inferior_environ, "LD_LIBRARY_PATH"),
 			OPF_TRY_CWD_FIRST, in_pathname, O_RDONLY | O_BINARY, 0,
 			&temp_pathname);

gdb-6.3-bz182116-exec-from-pthread.patch:
 linux-thread-db.c |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE gdb-6.3-bz182116-exec-from-pthread.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182116


Index: linux-thread-db.c
===================================================================
RCS file: /cvs/src/src/gdb/linux-thread-db.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gdb/linux-thread-db.c	18 Jul 2006 22:53:20 -0000	1.17
+++ gdb/linux-thread-db.c	24 Jul 2006 18:57:32 -0000	1.18
@@ -875,6 +875,15 @@ thread_db_wait (ptid_t ptid, struct targ
   if (ourstatus->kind == TARGET_WAITKIND_EXITED)
     return pid_to_ptid (-1);
 
+  if (ourstatus->kind == TARGET_WAITKIND_EXECD)
+    {
+      remove_thread_event_breakpoints ();
+      unpush_target (&thread_db_ops);
+      using_thread_db = 0;
+
+      return pid_to_ptid (GET_PID (ptid));
+    }
+
   if (ourstatus->kind == TARGET_WAITKIND_STOPPED
       && ourstatus->value.sig == TARGET_SIGNAL_TRAP)
     /* Check for a thread event.  */

gdb-6.3-bz193763-object-name-completion.patch:
 linespec.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gdb-6.3-bz193763-object-name-completion.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=193763


diff -u -r gdb-6.3-old/gdb/linespec.c gdb-6.3/gdb/linespec.c
--- gdb-6.3-old/gdb/linespec.c	2006-06-01 13:43:12.000000000 +0100
+++ gdb-6.3/gdb/linespec.c	2006-06-01 13:44:14.000000000 +0100
@@ -293,7 +293,7 @@
      This will give us a list of all the member names including
      the function signature.  */
   completion_name = xmalloc (strlen (class_name) +
-			     strlen (member_name) + 9);
+			     strlen (member_name) + strlen("'::$base(") + 1);
   completion_name[0] = '\'';
   strcpy (completion_name+1, class_name);
   /* FIXME: make this the language class separator.  */

gdb-6.5-bz195429-stale-threads-crash.patch:
 linux-thread-db.c |  230 ++++--------------------------------------------------
 1 files changed, 18 insertions(+), 212 deletions(-)

--- NEW FILE gdb-6.5-bz195429-stale-threads-crash.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195429


Index: linux-thread-db.c
===================================================================
RCS file: /cvs/src/src/gdb/linux-thread-db.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gdb/linux-thread-db.c	5 May 2006 22:42:43 -0000	1.16
+++ gdb/linux-thread-db.c	18 Jul 2006 22:53:20 -0000	1.17
@@ -105,14 +105,6 @@ static td_err_e (*td_ta_event_getmsg_p) 
 static td_err_e (*td_thr_validate_p) (const td_thrhandle_t *th);
 static td_err_e (*td_thr_get_info_p) (const td_thrhandle_t *th,
 				      td_thrinfo_t *infop);
-static td_err_e (*td_thr_getfpregs_p) (const td_thrhandle_t *th,
-				       gdb_prfpregset_t *regset);
-static td_err_e (*td_thr_getgregs_p) (const td_thrhandle_t *th,
-				      prgregset_t gregs);
-static td_err_e (*td_thr_setfpregs_p) (const td_thrhandle_t *th,
-				       const gdb_prfpregset_t *fpregs);
-static td_err_e (*td_thr_setgregs_p) (const td_thrhandle_t *th,
-				      prgregset_t gregs);
 static td_err_e (*td_thr_event_enable_p) (const td_thrhandle_t *th,
 					  int event);
 
@@ -220,31 +212,6 @@ thread_db_err_str (td_err_e err)
       return buf;
     }
 }
-
-static char *
-thread_db_state_str (td_thr_state_e state)
-{
-  static char buf[64];
-
-  switch (state)
-    {
-    case TD_THR_STOPPED:
-      return "stopped by debugger";
-    case TD_THR_RUN:
-      return "runnable";
-    case TD_THR_ACTIVE:
-      return "active";
-    case TD_THR_ZOMBIE:
-      return "zombie";
-    case TD_THR_SLEEP:
-      return "sleeping";
-    case TD_THR_STOPPED_ASLEEP:
-      return "stopped by debugger AND blocked";
-    default:
-      snprintf (buf, sizeof (buf), "unknown thread_db state %d", state);
-      return buf;
-    }
-}
 
 /* A callback function for td_ta_thr_iter, which we use to map all
    threads to LWPs.
@@ -330,27 +297,6 @@ thread_db_map_id2thr (struct thread_info
   else
     thread_info->private->th_valid = 1;
 }
-
-static td_thrinfo_t *
-thread_db_get_info (struct thread_info *thread_info)
-{
-  td_err_e err;
-
-  if (thread_info->private->ti_valid)
-    return &thread_info->private->ti;
-
-  if (!thread_info->private->th_valid)
-    thread_db_map_id2thr (thread_info, 1);
-
-  err =
-    td_thr_get_info_p (&thread_info->private->th, &thread_info->private->ti);
-  if (err != TD_OK)
-    error (_("thread_db_get_info: cannot get thread info: %s"),
-	   thread_db_err_str (err));
-
-  thread_info->private->ti_valid = 1;
-  return &thread_info->private->ti;
-}
 
 /* Convert between user-level thread ids and LWP ids.  */
 
@@ -461,22 +407,6 @@ thread_db_load (void)
   if (td_thr_get_info_p == NULL)
     return 0;
 
-  td_thr_getfpregs_p = verbose_dlsym (handle, "td_thr_getfpregs");
-  if (td_thr_getfpregs_p == NULL)
-    return 0;
-
-  td_thr_getgregs_p = verbose_dlsym (handle, "td_thr_getgregs");
-  if (td_thr_getgregs_p == NULL)
-    return 0;
-
-  td_thr_setfpregs_p = verbose_dlsym (handle, "td_thr_setfpregs");
-  if (td_thr_setfpregs_p == NULL)
-    return 0;
-
-  td_thr_setgregs_p = verbose_dlsym (handle, "td_thr_setgregs");
-  if (td_thr_setgregs_p == NULL)
-    return 0;
-
   /* Initialize the library.  */
   err = td_init_p ();
   if (err != TD_OK)
@@ -991,81 +921,6 @@ thread_db_xfer_partial (struct target_op
 }
 
 static void
-thread_db_fetch_registers (int regno)
-{
-  struct thread_info *thread_info;
-  prgregset_t gregset;
-  gdb_prfpregset_t fpregset;
-  td_err_e err;
-
-  if (!is_thread (inferior_ptid))
-    {
-      /* Pass the request to the target beneath us.  */
-      target_beneath->to_fetch_registers (regno);
-      return;
-    }
-
-  thread_info = find_thread_pid (inferior_ptid);
-  thread_db_map_id2thr (thread_info, 1);
-
-  err = td_thr_getgregs_p (&thread_info->private->th, gregset);
-  if (err != TD_OK)
-    error (_("Cannot fetch general-purpose registers for thread %ld: %s"),
-	   (long) GET_THREAD (inferior_ptid), thread_db_err_str (err));
-
-  err = td_thr_getfpregs_p (&thread_info->private->th, &fpregset);
-  if (err != TD_OK)
-    error (_("Cannot get floating-point registers for thread %ld: %s"),
-	   (long) GET_THREAD (inferior_ptid), thread_db_err_str (err));
-
-  /* Note that we must call supply_gregset after calling the thread_db
-     routines because the thread_db routines call ps_lgetgregs and
-     friends which clobber GDB's register cache.  */
-  supply_gregset ((gdb_gregset_t *) gregset);
-  supply_fpregset (&fpregset);
-}
-
-static void
-thread_db_store_registers (int regno)
-{
-  prgregset_t gregset;
-  gdb_prfpregset_t fpregset;
-  td_err_e err;
-  struct thread_info *thread_info;
-
-  if (!is_thread (inferior_ptid))
-    {
-      /* Pass the request to the target beneath us.  */
-      target_beneath->to_store_registers (regno);
-      return;
-    }
-
-  thread_info = find_thread_pid (inferior_ptid);
-  thread_db_map_id2thr (thread_info, 1);
-
-  if (regno != -1)
-    {
-      gdb_byte raw[MAX_REGISTER_SIZE];
-
-      regcache_raw_collect (current_regcache, regno, raw);
-      thread_db_fetch_registers (-1);
-      regcache_raw_supply (current_regcache, regno, raw);
-    }
-
-  fill_gregset ((gdb_gregset_t *) gregset, -1);
-  fill_fpregset (&fpregset, -1);
-
-  err = td_thr_setgregs_p (&thread_info->private->th, gregset);
-  if (err != TD_OK)
-    error (_("Cannot store general-purpose registers for thread %ld: %s"),
-	   (long) GET_THREAD (inferior_ptid), thread_db_err_str (err));
-  err = td_thr_setfpregs_p (&thread_info->private->th, &fpregset);
-  if (err != TD_OK)
-    error (_("Cannot store floating-point registers  for thread %ld: %s"),
-	   (long) GET_THREAD (inferior_ptid), thread_db_err_str (err));
-}
-
-static void
 thread_db_kill (void)
 {
   /* There's no need to save & restore inferior_ptid here, since the
@@ -1117,48 +972,6 @@ thread_db_mourn_inferior (void)
 }
 
 static int
-thread_db_thread_alive (ptid_t ptid)
-{
-  td_thrhandle_t th;
-  td_err_e err;
-
-  if (is_thread (ptid))
-    {
-      struct thread_info *thread_info;
-      thread_info = find_thread_pid (ptid);
-
-      thread_db_map_id2thr (thread_info, 0);
-      if (!thread_info->private->th_valid)
-	return 0;
-
-      err = td_thr_validate_p (&thread_info->private->th);
-      if (err != TD_OK)
-	return 0;
-
-      if (!thread_info->private->ti_valid)
-	{
-	  err =
-	    td_thr_get_info_p (&thread_info->private->th,
-			       &thread_info->private->ti);
-	  if (err != TD_OK)
-	    return 0;
-	  thread_info->private->ti_valid = 1;
-	}
-
-      if (thread_info->private->ti.ti_state == TD_THR_UNKNOWN
-	  || thread_info->private->ti.ti_state == TD_THR_ZOMBIE)
-	return 0;		/* A zombie thread.  */
-
-      return 1;
-    }
-
-  if (target_beneath->to_thread_alive)
-    return target_beneath->to_thread_alive (ptid);
-
-  return 0;
-}
-
-static int
 find_new_threads_callback (const td_thrhandle_t *th_p, void *data)
 {
   td_thrinfo_t ti;
@@ -1200,32 +1013,15 @@ thread_db_pid_to_str (ptid_t ptid)
   if (is_thread (ptid))
     {
       static char buf[64];
-      td_thrinfo_t *ti_p;
-      td_err_e err;
       struct thread_info *thread_info;
 
       thread_info = find_thread_pid (ptid);
-      thread_db_map_id2thr (thread_info, 0);
-      if (!thread_info->private->th_valid)
-	{
-	  snprintf (buf, sizeof (buf), "Thread %ld (Missing)",
-		    GET_THREAD (ptid));
-	  return buf;
-	}
-
-      ti_p = thread_db_get_info (thread_info);
-
-      if (ti_p->ti_state == TD_THR_ACTIVE && ti_p->ti_lid != 0)
-	{
-	  snprintf (buf, sizeof (buf), "Thread %ld (LWP %d)",
-		    (long) ti_p->ti_tid, ti_p->ti_lid);
-	}
+      if (thread_info == NULL)
+	snprintf (buf, sizeof (buf), "Thread %ld (LWP %ld) (Missing)",
+		  GET_THREAD (ptid), GET_LWP (ptid));
       else
-	{
-	  snprintf (buf, sizeof (buf), "Thread %ld (%s)",
-		    (long) ti_p->ti_tid,
-		    thread_db_state_str (ti_p->ti_state));
-	}
+	snprintf (buf, sizeof (buf), "Thread %ld (LWP %ld)",
+		  GET_THREAD (ptid), GET_LWP (ptid));
 
       return buf;
     }
@@ -1236,6 +1032,18 @@ thread_db_pid_to_str (ptid_t ptid)
   return normal_pid_to_str (ptid);
 }
 
+/* Return a string describing the state of the thread specified by
+   INFO.  */
+
+static char *
+thread_db_extra_thread_info (struct thread_info *info)
+{
+  if (info->private->dying)
+    return "Exiting";
+
+  return NULL;
+}
+
 /* Get the address of the thread local variable in load module LM which
    is stored at OFFSET within the thread local storage for thread PTID.  */
 
@@ -1306,20 +1114,18 @@ init_thread_db_ops (void)
   thread_db_ops.to_detach = thread_db_detach;
   thread_db_ops.to_resume = thread_db_resume;
   thread_db_ops.to_wait = thread_db_wait;
-  thread_db_ops.to_fetch_registers = thread_db_fetch_registers;
-  thread_db_ops.to_store_registers = thread_db_store_registers;
   thread_db_ops.to_xfer_partial = thread_db_xfer_partial;
   thread_db_ops.to_kill = thread_db_kill;
   thread_db_ops.to_create_inferior = thread_db_create_inferior;
   thread_db_ops.to_post_startup_inferior = thread_db_post_startup_inferior;
   thread_db_ops.to_mourn_inferior = thread_db_mourn_inferior;
-  thread_db_ops.to_thread_alive = thread_db_thread_alive;
   thread_db_ops.to_find_new_threads = thread_db_find_new_threads;
   thread_db_ops.to_pid_to_str = thread_db_pid_to_str;
   thread_db_ops.to_stratum = thread_stratum;
   thread_db_ops.to_has_thread_control = tc_schedlock;
   thread_db_ops.to_get_thread_local_address
     = thread_db_get_thread_local_address;
+  thread_db_ops.to_extra_thread_info = thread_db_extra_thread_info;
   thread_db_ops.to_magic = OPS_MAGIC;
 }
 

gdb-6.5-bz196439-valgrind-memcheck-compat.patch:
 dwarf2read.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gdb-6.5-bz196439-valgrind-memcheck-compat.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196439


Index: dwarf2read.c
===================================================================
RCS file: /cvs/src/src/gdb/dwarf2read.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- gdb/dwarf2read.c	14 Jun 2006 15:06:35 -0000	1.199
+++ gdb/dwarf2read.c	12 Jul 2006 21:14:57 -0000	1.200
@@ -9324,7 +9324,11 @@ static void
 dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
 			     struct dwarf2_cu *cu)
 {
-  if (attr->form == DW_FORM_data4 || attr->form == DW_FORM_data8)
+  if ((attr->form == DW_FORM_data4 || attr->form == DW_FORM_data8)
+      /* ".debug_loc" may not exist at all, or the offset may be outside
+	 the section.  If so, fall through to the complaint in the
+	 other branch.  */
+      && DW_UNSND (attr) < dwarf2_per_objfile->loc_size)
     {
       struct dwarf2_loclist_baton *baton;
 

gdb-6.5-bz200048-find_line_pc-segv.patch:
 tui-layout.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE gdb-6.5-bz200048-find_line_pc-segv.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200048


diff -ru gdb-6.5-orig/gdb/tui/tui-layout.c gdb-6.5-pr200048/gdb/tui/tui-layout.c
--- gdb-6.5-orig/gdb/tui/tui-layout.c	2006-08-07 21:33:42.000000000 +0200
+++ gdb-6.5-pr200048/gdb/tui/tui-layout.c	2006-08-13 02:26:39.000000000 +0200
@@ -519,13 +519,17 @@
     {
     case SRC_COMMAND:
     case SRC_DATA_COMMAND:
-      find_line_pc (cursal.symtab,
+      if (find_line_pc (cursal.symtab,
 		    TUI_SRC_WIN->detail.source_info.start_line_or_addr.u.line_no,
-		    &pc_list, &num_pc_values);
-      /* FIXME: What do we do with multiple pc values for ctors/dtors or
-                inlined functions?  */
-      addr = pc_list[0];
-      xfree (pc_list);
+		    &pc_list, &num_pc_values))
+	{
+	  /* FIXME: What do we do with multiple pc values for ctors/dtors or
+		    inlined functions?  */
+	  addr = pc_list[0];
+	  xfree (pc_list);
+	}
+      else
+        addr = 0;
       break;
     case DISASSEM_COMMAND:
     case SRC_DISASSEM_COMMAND:

gdb-6.5-bz200533-ppc-solib_trampoline.patch:
 minsyms.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE gdb-6.5-bz200533-ppc-solib_trampoline.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200533


diff -ru gdb-6.5-orig/gdb/minsyms.c gdb-6.5/gdb/minsyms.c
--- gdb-6.5-orig/gdb/minsyms.c	2005-12-17 17:34:01.000000000 -0500
+++ gdb-6.5/gdb/minsyms.c	2006-08-13 10:49:43.000000000 -0400
@@ -486,6 +486,9 @@
 			  don't fill the bfd_section member, so don't
 			  throw away symbols on those platforms.  */
 		       && SYMBOL_BFD_SECTION (&msymbol[hi]) != NULL
+		       /* Don't ignore symbols for solib trampolines
+			  Red Hat Bug 200533 and Bug 192964.  */
+		       && MSYMBOL_TYPE (&msymbol[hi]) != mst_solib_trampoline
 		       && SYMBOL_BFD_SECTION (&msymbol[hi]) != section)
 		  --hi;
 


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.193
retrieving revision 1.193.2.1
diff -u -r1.193 -r1.193.2.1
--- gdb.spec	14 Jul 2006 05:18:22 -0000	1.193
+++ gdb.spec	20 Aug 2006 17:41:36 -0000	1.193.2.1
@@ -11,7 +11,7 @@
 Version: 6.5
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 3%{?dist}
+Release: 3_jkratoch0%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -219,6 +219,27 @@
 # Backport GNU .hash support.
 Patch180: gdb-6.5-bfd-hash-style-20060714.patch
 
+# Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ 200048).
+Patch181: gdb-6.5-bz200048-find_line_pc-segv.patch
+
+# Do not step into the PPC solib trampolines (BZ 200533).
+Patch182: gdb-6.5-bz200533-ppc-solib_trampoline.patch
+
+# Fix exec() from threaded program, partial CVS backport (BZ 182116).
+Patch183: gdb-6.3-bz182116-exec-from-pthread.patch
+
+# Fix occasional failure to load shared libraries (BZ 146810).
+Patch184: gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch
+
+# Bugfix object names completion (fixes Patch116, BZ 193763).
+Patch185: gdb-6.3-bz193763-object-name-completion.patch
+
+# Avoid crash of 'info threads' if stale threads exist (BZ 195429).
+Patch186: gdb-6.5-bz195429-stale-threads-crash.patch
+
+# Handle corrupted or missing location list information (BZ 196439).
+Patch187: gdb-6.5-bz196439-valgrind-memcheck-compat.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils
 
@@ -310,6 +331,13 @@
 %patch178 -p1
 %patch179 -p1
 %patch180 -p1
+%patch181 -p1
+%patch182 -p1
+%patch183 -p0
+%patch184 -p0
+%patch185 -p1
+%patch186 -p0
+%patch187 -p0
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -470,6 +498,15 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Sun Aug 20 2006 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.5-3_jkratoch0
+- Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ 200048).
+- Do not step into the PPC solib trampolines (BZ 200533).
+- Fix exec() from threaded program, partial CVS backport (BZ 182116).
+- Fix occasional failure to load shared libraries (BZ 146810).
+- Bugfix object names completion (fixes Patch116, BZ 193763).
+- Avoid crash of 'info threads' if stale threads exist (BZ 195429).
+- Handle corrupted or missing location list information (BZ 196439).
+
 * Thu Jul 13 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-3
 - Add missing definition of multilib_64_archs for glibc-devel buildreqs.
 - Backport support for .gnu.hash sections.



From fedora-cvs-commits at redhat.com  Sun Aug 20 21:23:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 17:23:32 -0400
Subject: rpms/redhat-menus/devel .cvsignore, 1.37, 1.38 redhat-menus.spec,
	1.61, 1.62 sources, 1.39, 1.40
Message-ID: <200608202123.k7KLNWI8017444@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17390

Modified Files:
	.cvsignore redhat-menus.spec sources 
Log Message:
6.7.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	3 Mar 2006 04:22:49 -0000	1.37
+++ .cvsignore	20 Aug 2006 21:23:29 -0000	1.38
@@ -1 +1 @@
-redhat-menus-6.7.5.tar.gz
+redhat-menus-6.7.6.tar.gz


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- redhat-menus.spec	8 Jun 2006 17:11:42 -0000	1.61
+++ redhat-menus.spec	20 Aug 2006 21:23:29 -0000	1.62
@@ -3,8 +3,8 @@
 
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
-Version: 6.7.5
-Release: 3
+Version: 6.7.6
+Release: 1%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
@@ -67,6 +67,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Sun Aug 20 2006 Matthias Clasen <mclasen at redhat.com> - 6.7.6-1.fc6
+- Make menu editors happy
+
 * Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> - 6.7.5-3
 - Add missing BR of perl-XML-Parser, gettext
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	3 Mar 2006 04:22:49 -0000	1.39
+++ sources	20 Aug 2006 21:23:29 -0000	1.40
@@ -1 +1 @@
-2ea6d8eda699af7a0ba517beb1128ff3  redhat-menus-6.7.5.tar.gz
+20ea26fc60bae207f7c4ac471fa489b6  redhat-menus-6.7.6.tar.gz



From fedora-cvs-commits at redhat.com  Sun Aug 20 22:40:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 18:40:45 -0400
Subject: rpms/kernel/FC-5 linux-2.6-xen-compile-fixes.patch,1.7,1.8
Message-ID: <200608202240.k7KMej1F004642@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4607

Modified Files:
	linux-2.6-xen-compile-fixes.patch 
Log Message:
fix x86_64 xenU compilation

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +-
 drivers/block/aoe/aoenet.c                                   |    3 --
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 +
 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c            |    6 ----
 linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c                  |    2 -
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h        |   14 +++++++++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/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.17.noarch/include/asm-i386/mach-xen/asm/mmu.h      |    6 ++++
 linux-2.6.17.work/include/asm-x86_64/ipi.h                   |    2 +
 15 files changed, 47 insertions(+), 12 deletions(-)

Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-xen-compile-fixes.patch	15 Aug 2006 11:07:39 -0000	1.7
+++ linux-2.6-xen-compile-fixes.patch	20 Aug 2006 22:40:42 -0000	1.8
@@ -207,3 +207,21 @@
  		goto exit;
  	if (!is_aoe_netif(ifp))
  		goto exit;
+diff -up -urNp linux-2.6.17.noarch/include/asm-x86_64/ipi.h linux-2.6.17.work/include/asm-x86_64/ipi.h
+--- linux-2.6.17.noarch/include/asm-x86_64/ipi.h	2006-06-17 21:49:35.000000000 -0400
++++ linux-2.6.17.work/include/asm-x86_64/ipi.h	2006-08-20 17:29:31.000000000 -0400
+@@ -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 +113,6 @@ static inline void send_IPI_mask_sequenc
+ 	}
+ 	local_irq_restore(flags);
+ }
++#endif /* CONFIG_XEN_UNPRIVILEGED_GUEST */
+ 
+ #endif /* __ASM_IPI_H */



From fedora-cvs-commits at redhat.com  Mon Aug 21 02:52:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 22:52:40 -0400
Subject: rpms/sound-juicer/devel .cvsignore, 1.26, 1.27 sound-juicer.spec,
	1.59, 1.60 sources, 1.28, 1.29
Message-ID: <200608210252.k7L2qeLm006480@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6424

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.15.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	3 Aug 2006 04:46:31 -0000	1.26
+++ .cvsignore	21 Aug 2006 02:52:38 -0000	1.27
@@ -1 +1 @@
-sound-juicer-2.15.4.tar.bz2
+sound-juicer-2.15.5.1.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sound-juicer.spec	3 Aug 2006 04:46:31 -0000	1.59
+++ sound-juicer.spec	21 Aug 2006 02:52:38 -0000	1.60
@@ -12,7 +12,7 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.15.4
+Version:	2.15.5.1
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
@@ -112,6 +112,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Sun Aug 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.5.1-1.fc6
+- Update to 2.15.5.1
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1.fc6
 - Update to 2.15.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	3 Aug 2006 04:46:31 -0000	1.28
+++ sources	21 Aug 2006 02:52:38 -0000	1.29
@@ -1 +1 @@
-cfe4be06f6fa4b349cad6331e045de7a  sound-juicer-2.15.4.tar.bz2
+ff54cb0d4414a4305674117cb374735c  sound-juicer-2.15.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 02:59:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 22:59:46 -0400
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.21,
	1.22 gnome-power-manager.spec, 1.60, 1.61 sources, 1.21, 1.22
Message-ID: <200608210259.k7L2xkE9009196@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9126

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Aug 2006 21:21:41 -0000	1.21
+++ .cvsignore	21 Aug 2006 02:59:44 -0000	1.22
@@ -1 +1 @@
-gnome-power-manager-2.15.91.tar.bz2
+gnome-power-manager-2.15.92.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gnome-power-manager.spec	15 Aug 2006 05:21:44 -0000	1.60
+++ gnome-power-manager.spec	21 Aug 2006 02:59:44 -0000	1.61
@@ -4,14 +4,12 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.15.91
-Release: 2%{?dist}
+Version: 2.15.92
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
 Patch0: gnome-power-manager-2.15.4-nodefaultbeep.patch
-# fixed in cvs
-Patch1: gnome-power-manager-2.15.91-double-free.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -44,7 +42,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nodefaultbeep
-%patch1 -p0 -b .double-free
 
 %build
 %configure \
@@ -112,6 +109,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sun Aug 20 2006 Matthias Clasen <mclasne at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Tue Aug 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-2.fc6
 - Fix a double free in the smartcart code
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Aug 2006 21:21:41 -0000	1.21
+++ sources	21 Aug 2006 02:59:44 -0000	1.22
@@ -1 +1 @@
-1096d20879e5180912885acf22ff5741  gnome-power-manager-2.15.91.tar.bz2
+21403dd4974f7cc5748417e1c7a04632  gnome-power-manager-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 03:26:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 23:26:11 -0400
Subject: rpms/cairo/devel .cvsignore, 1.18, 1.19 cairo.spec, 1.58,
	1.59 sources, 1.18, 1.19
Message-ID: <200608210326.k7L3QBlp031511@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31440

Modified Files:
	.cvsignore cairo.spec sources 
Log Message:
- Update to 1.2.4
- Drop libXt-devel BuildReq as it shouldn't need it anymore.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	9 Aug 2006 05:20:58 -0000	1.18
+++ .cvsignore	21 Aug 2006 03:26:08 -0000	1.19
@@ -1 +1 @@
-cairo-1.2.2.tar.gz
+cairo-1.2.4.tar.gz


Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- cairo.spec	10 Aug 2006 15:54:53 -0000	1.58
+++ cairo.spec	21 Aug 2006 03:26:08 -0000	1.59
@@ -3,8 +3,8 @@
 
 Summary:   A vector graphics library
 Name:      cairo
-Version:   1.2.2
-Release:   3%{?dist}
+Version:   1.2.4
+Release:   1%{?dist}
 URL:       http://cairographics.org
 Source0:   http://cairographics.org/releases/%{name}-%{version}.tar.gz
 License:   LGPL/MPL
@@ -19,7 +19,6 @@
 BuildRequires: pkgconfig
 BuildRequires: libXrender-devel
 BuildRequires: libX11-devel
-BuildRequires: libXt-devel
 BuildRequires: libpng-devel
 BuildRequires: libxml2-devel
 BuildRequires: freetype-devel >= %{freetype_version}
@@ -84,6 +83,10 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Sun Aug 20 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.2.4-1
+- Update to 1.2.4
+- Drop libXt-devel BuildReq as it shouldn't need it anymore.
+
 * Wed Aug  9 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.2.2-3
 - Remove unnecessary --disable-* arguments to configure, add --enable-*
   for those backends we really want to make sure are enabled.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	9 Aug 2006 05:20:58 -0000	1.18
+++ sources	21 Aug 2006 03:26:08 -0000	1.19
@@ -1 +1 @@
-2460487b1257a5583c889b1b9d2033ec  cairo-1.2.2.tar.gz
+1222b2bfdf113e2c92f66b3389659f2d  cairo-1.2.4.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 21 03:46:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 20 Aug 2006 23:46:54 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.29, 1.30 fedora-logos.spec,
	1.36, 1.37 sources, 1.31, 1.32
Message-ID: <200608210346.k7L3kst1011204@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9597

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
1.1.48



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	28 Jul 2006 18:16:35 -0000	1.29
+++ .cvsignore	21 Aug 2006 03:46:51 -0000	1.30
@@ -1,3 +1 @@
-fedora-logos-1.1.45.tar.bz2
-fedora-logos-1.1.46.tar.bz2
-fedora-logos-1.1.47.tar.bz2
+fedora-logos-1.1.48.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fedora-logos.spec	13 Aug 2006 06:02:49 -0000	1.36
+++ fedora-logos.spec	21 Aug 2006 03:46:51 -0000	1.37
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures
-Version: 1.1.47
-Release: 2
+Version: 1.1.48
+Release: 1%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 License: Copyright ? 1999-2006 Red Hat, Inc.  All rights reserved.
@@ -148,6 +148,9 @@
 # end i386 bits
 
 %changelog
+* Sun Aug 20 2006 Matthias Clasen <mclasen at redhat.com> - 1.1.48-1.fc6
+- Update lock dialog to work with current gnome-screensaver
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.1.47-2.fc6
 - Add links for new icon name used in the gnome-panel menubar
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	28 Jul 2006 18:16:35 -0000	1.31
+++ sources	21 Aug 2006 03:46:51 -0000	1.32
@@ -1 +1 @@
-08d9101f517c61b4e3e67eba89c30f40  fedora-logos-1.1.47.tar.bz2
+2967224bb38dc9b731d0f2746b1d9aa6  fedora-logos-1.1.48.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 04:17:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 00:17:42 -0400
Subject: rpms/gnome-nettool/devel .cvsignore, 1.6, 1.7 gnome-nettool.spec,
	1.19, 1.20 sources, 1.6, 1.7
Message-ID: <200608210417.k7L4HgwF029148@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-nettool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28877

Modified Files:
	.cvsignore gnome-nettool.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Aug 2006 03:12:57 -0000	1.6
+++ .cvsignore	21 Aug 2006 04:17:33 -0000	1.7
@@ -1 +1 @@
-gnome-nettool-2.15.91.tar.bz2
+gnome-nettool-2.15.92.tar.bz2


Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-nettool.spec	13 Aug 2006 03:12:57 -0000	1.19
+++ gnome-nettool.spec	21 Aug 2006 04:17:34 -0000	1.20
@@ -5,7 +5,7 @@
 
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
-Version: 2.15.91
+Version: 2.15.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
@@ -89,6 +89,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Aug 2006 03:12:57 -0000	1.6
+++ sources	21 Aug 2006 04:17:34 -0000	1.7
@@ -1 +1 @@
-17b9a9dc7cf7c3a2748a09d341c19265  gnome-nettool-2.15.91.tar.bz2
+9eaf0654d25659958645542353335394  gnome-nettool-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 06:35:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 02:35:01 -0400
Subject: rpms/squid/devel squid-2.6.STABLE3-italian.patch, NONE,
	1.1 .cvsignore, 1.19, 1.20 sources, 1.21, 1.22 squid.spec,
	1.71, 1.72
Message-ID: <200608210635.k7L6Z1hd016564@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16530

Modified Files:
	.cvsignore sources squid.spec 
Added Files:
	squid-2.6.STABLE3-italian.patch 
Log Message:
the latest stable upstream

squid-2.6.STABLE3-italian.patch:
 ERR_TOO_BIG |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

--- NEW FILE squid-2.6.STABLE3-italian.patch ---
---------------------
PatchSet 10946 
Date: 2006/08/19 08:54:44
Author: serassio
Branch: HEAD
Tag: (none) 
Log:
Bug #1736: Missing Italian translation of ERR_TOO_BIG error page

Members: 
	errors/Italian/ERR_TOO_BIG:1.6->1.7 

Index: squid/errors/Italian/ERR_TOO_BIG
===================================================================
RCS file: /cvsroot/squid/squid/errors/Italian/ERR_TOO_BIG,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- squid/errors/Italian/ERR_TOO_BIG	17 May 2005 16:56:15 -0000	1.6
+++ squid/errors/Italian/ERR_TOO_BIG	19 Aug 2006 08:54:44 -0000	1.7
@@ -1,28 +1,28 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<TITLE>ERRORE: La URL richiesta non pu&ograve; essere recuperata</TITLE>
 <STYLE type="text/css"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}PRE{font-family:sans-serif}--></STYLE>
 </HEAD><BODY>
-<H1>ERROR</H1>
-<H2>The requested URL could not be retrieved</H2>
+<H1>ERRORE</H1>
+<H2>La URL richiesta non pu&ograve; essere recuperata</H2>
 <HR noshade size="1px">
 <P>
-While trying to retrieve the URL:
+Mentre si cercava di recuperare la URL:
 <A HREF="%U">%U</A>
 <P>
-The following error was encountered:
+&Egrave; avvenuto il seguente errore:
 <UL>
 <LI>
 <STRONG>
-The request or reply is too large.
+La richiesta o la risposta &egrave; troppo grande.
 </STRONG>
 <P>
-If you are making a POST or PUT request, then your request body
-(the thing you are trying to upload) is too large.  If you are 
-making a GET request, then the reply body (what you are trying
-to download) is too large.   These limits have been established
-by the Internet Service Provider who operates this cache.  Please
-contact them directly if you feel this is an error.
+Se state eseguendo una richiesta POST o PUT, allora il corpo della richiesta 
+(l'oggetto di cui state tendando l'upload) &egrave; troppo grande. Se state 
+eseguendo una richiesta GET, allora il corpo della risposta (l'oggetto di cui
+state tendando il download) &egrave; troppo grande. Questi limiti sono stati
+impostati dal gestore di questa cache. Se ritenete che questo sia un errore
+siete pregati di contattarlo direttamente.
 </UL>
 <P>
-Your cache administrator is <A HREF="mailto:%w">%w</A>.
+L'amministratore di questa cache &egrave; <A HREF="mailto:%w">%w</A>.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	29 May 2006 23:19:24 -0000	1.19
+++ .cvsignore	21 Aug 2006 06:34:58 -0000	1.20
@@ -4,3 +4,4 @@
 squid-2.5.STABLE12.tar.bz2
 squid-2.5.STABLE13.tar.bz2
 squid-2.5.STABLE14.tar.bz2
+squid-2.6.STABLE3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	31 Jul 2006 08:01:04 -0000	1.21
+++ sources	21 Aug 2006 06:34:58 -0000	1.22
@@ -1 +1 @@
-838492f95de0964e31e633bfa07a0682  squid-2.6.STABLE2.tar.bz2
+5b181e9c08f35d098e53e54b01fbd092  squid-2.6.STABLE3.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- squid.spec	10 Aug 2006 11:07:32 -0000	1.71
+++ squid.spec	21 Aug 2006 06:34:58 -0000	1.72
@@ -4,8 +4,8 @@
 
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.6.STABLE2
-Release: 3%{?dist}
+Version: 2.6.STABLE3
+Release: 1%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -19,7 +19,7 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-# the latest upstream CVS snapshot
+Patch101: squid-2.6.STABLE3-italian.patch
 
 # External patches
 
@@ -56,6 +56,8 @@
 %prep
 %setup -q
 
+%patch101 -p1
+
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -325,6 +327,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Aug 21 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE3-1
+- the latest stable upstream
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 7:2.6.STABLE2-3
 - added some requirements for pre/post install scripts
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 06:55:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 02:55:18 -0400
Subject: rpms/iptraf/FC-5 iptraf-3.0.0-compile.fix.patch, NONE,
	1.1 iptraf.spec, 1.19, 1.20
Message-ID: <200608210655.k7L6tI0K004371@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/iptraf/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1309

Modified Files:
	iptraf.spec 
Added Files:
	iptraf-3.0.0-compile.fix.patch 
Log Message:
Update for correct line-drawing in UTF-8.


iptraf-3.0.0-compile.fix.patch:
 ./src/Makefile        |    8 ++++----
 ./src/othptab.c       |    6 +++---
 ./src/tcptable.h      |    6 +++---
 iptraf-3.0.0/src/tr.c |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE iptraf-3.0.0-compile.fix.patch ---
--- ./src/othptab.c.old	2005-09-13 08:42:54.000000000 +0200
+++ ./src/othptab.c	2006-06-06 13:17:03.000000000 +0200
@@ -17,9 +17,9 @@
 ***/
 
 #include <asm/types.h>
-#include <linux/if_ether.h>
-#include <linux/if_tr.h>
-#include <linux/if_fddi.h>
+#include <netinet/if_ether.h>
+#include <netinet/if_tr.h>
+#include <netinet/if_fddi.h>
 #include <winops.h>
 #include "arphdr.h"
 #include "options.h"
--- ./src/Makefile.old	2006-06-06 13:36:40.000000000 +0200
+++ ./src/Makefile	2006-05-31 07:58:30.000000000 +0200
@@ -18,7 +18,7 @@
 BINDIR		= ../../iptraf-$(VERNUMBER).bin.$(ARCH)
 
 CC		= gcc
-LIBS		= -L../support -ltextbox -lpanel -lncurses   # in this order!
+LIBS		= -L../support -ltextbox -lpanelw -lncursesw	# in this order!
 
 # comment this one out to omit debug code when done.
 
@@ -39,7 +39,7 @@
 # you may want to change this to point to your ncurses include directory
 # if the ncurses include files are not in the default location.
 
-INCLUDEDIR	= -I/usr/include/ncurses -I../support
+INCLUDEDIR	= -I/usr/include/ncursesw -I../support	
 
 # You can uncomment this one to disable the backspace key in input fields.
 # This means you must use the Del key or Ctrl+H combination to erase the
@@ -162,7 +162,7 @@
 # and the compiled programs for release as a ready-to-run distribution.
 
 dist-bin: all
-	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanel.a /usr/lib/libncurses.a
+	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanelw.a /usr/lib/libncursesw.a	
 	rm -rf $(BINDIR)
 	mkdir $(BINDIR)
 	/bin/cp -p ../CHANGES ../LICENSE ../FAQ ../INSTALL ../README* \
@@ -178,7 +178,7 @@
 # Just in case anyone needs to link a static binary
 #
 static: $(OBJS)
-	$(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanel -lncurses
+	$(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanelw -lncursesw
 	$(CC) -static -o rvnamed rvnamed.o getpath.o
 	$(CC) -static -o rawtime rawtime.c
 
--- ./src/tcptable.h.old	2005-09-13 08:42:54.000000000 +0200
+++ ./src/tcptable.h	2006-06-06 13:40:24.000000000 +0200
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <curses.h>
+#include <ncurses.h>
 #include <panel.h>
 #include <netdb.h>
 #include <time.h>
@@ -22,8 +22,8 @@
 #include <asm/types.h>
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
-#include <linux/if_fddi.h>
-#include <linux/if_tr.h>
+#include <netinet/if_fddi.h>
+#include <netinet/if_tr.h>
 #include <net/if.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>
--- iptraf-3.0.0/src/tr.c.old   2006-06-07 10:47:27.000000000 +0200
+++ iptraf-3.0.0/src/tr.c       2006-06-07 10:38:20.000000000 +0200
@@ -7,7 +7,7 @@
  */
 
 #include <asm/types.h>
-#include <linux/if_tr.h>
+#include <netinet/if_tr.h>
 #include <netinet/in.h>
 
 unsigned int get_tr_ip_offset(unsigned char *pkt)


Index: iptraf.spec
===================================================================
RCS file: /cvs/dist/rpms/iptraf/FC-5/iptraf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- iptraf.spec	5 Apr 2006 15:25:46 -0000	1.19
+++ iptraf.spec	21 Aug 2006 06:55:16 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A console-based network monitoring utility.
 Name: iptraf
 Version: 3.0.0
-Release: 1.3.FC5
+Release: 2%{?dist}
 Source: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
 URL: http://iptraf.seul.org/
 Patch0: iptraf-2.4.0-Makefile.patch
@@ -11,6 +11,7 @@
 Patch4: iptraf-2.7.0-nostrip.patch
 Patch5: iptraf-3.0.0-setlocale.patch
 Patch6: iptraf-3.0.0-longdev.patch
+Patch7: iptraf-3.0.0-compile.fix.patch
 License: GPL
 Group: Applications/System
 BuildRoot: /var/tmp/%{name}-%{version}-root
@@ -43,6 +44,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 make -C src CFLAGS="$RPM_OPT_FLAGS" \
@@ -82,6 +84,9 @@
 %dir %attr(700,root,root) /var/lib/iptraf
 
 %changelog
+* Mon Aug 21 2006 Marcela Maslanova <mmaslano at redhat.com> 3.0.0-2.FC5
+- fix compile (#192510)
+ 
 * Wed Apr 05 2006 Miroslav Lichvar <mlichvar at redhat.com> 3.0.0-1.3.FC5
 - fix crash when parsing long network interface name (#187937)
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 09:17:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 05:17:13 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.ooo68369.dtrans.crash.patch, 1.1,
	1.2 openoffice.org.spec, 1.852, 1.853
Message-ID: <200608210917.k7L9HDIE020265@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20186

Modified Files:
	openoffice.org-2.0.4.ooo68369.dtrans.crash.patch 
	openoffice.org.spec 
Log Message:
wrong clear

openoffice.org-2.0.4.ooo68369.dtrans.crash.patch:
 dtrans/source/X11/X11_selection.cxx |    2 +-
 source/X11/X11_selection.cxx        |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.4.ooo68369.dtrans.crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.4.ooo68369.dtrans.crash.patch	20 Aug 2006 14:30:47 -0000	1.1
+++ openoffice.org-2.0.4.ooo68369.dtrans.crash.patch	21 Aug 2006 09:17:08 -0000	1.2
@@ -5,11 +5,12 @@
 diff -u -r1.79.6.1 X11_selection.cxx
 --- openoffice.org.orig/dtrans/source/X11/X11_selection.cxx	10 Aug 2006 14:48:39 -0000	1.79.6.1
 +++ openoffice.org/dtrans/source/X11/X11_selection.cxx	20 Aug 2006 14:27:03 -0000
-@@ -519,7 +519,6 @@
-     if( m_xDisplayConnection.is() )
-     {
+@@ -3776,7 +3776,7 @@
+         if( m_aThread )
+             osl_terminateThread( m_aThread );
          m_xDisplayConnection->removeEventHandler( Any(), this );
 -        m_xDisplayConnection.clear();
++//        m_xDisplayConnection.clear();
      }
- 
- 	if( m_pDisplay )
+     return sal_True;
+ }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.852
retrieving revision 1.853
diff -u -r1.852 -r1.853
--- openoffice.org.spec	20 Aug 2006 15:19:38 -0000	1.852
+++ openoffice.org.spec	21 Aug 2006 09:17:08 -0000	1.853
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 1
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2499,7 +2499,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Sun Aug 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.2
+* Mon Aug 21 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.3
 - fix openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 - fix openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
 - drop openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch, fixed in gnome now



From fedora-cvs-commits at redhat.com  Mon Aug 21 09:47:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 05:47:34 -0400
Subject: rpms/cdrdao/devel cdrdao.spec,1.35,1.36
Message-ID: <200608210947.k7L9lYH4019489@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/cdrdao/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18962

Modified Files:
	cdrdao.spec 
Log Message:
rebuild with new/old cdrtools


Index: cdrdao.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrdao/devel/cdrdao.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cdrdao.spec	12 Jul 2006 04:46:34 -0000	1.35
+++ cdrdao.spec	21 Aug 2006 09:47:31 -0000	1.36
@@ -9,7 +9,7 @@
 Source1: xcdrdao.desktop
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: cdrecord-devel >= 8:2.01.01.0.a03-2
+BuildRequires: cdrecord-devel >= 9:2.01
 BuildRequires: libvorbis-devel >= 1.0
 
 # Only exclude s390
@@ -52,6 +52,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Aug 21 2006 Harald Hoyer <harald at redhat.com> - 1.2.1-1.1
+- rebuild with new/old cdrtools
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.1-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 09:48:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 05:48:02 -0400
Subject: rpms/cdrdao/devel cdrdao.spec,1.36,1.37
Message-ID: <200608210948.k7L9m2AN023182@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/cdrdao/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22879

Modified Files:
	cdrdao.spec 
Log Message:
rebuild with new/old cdrtools


Index: cdrdao.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrdao/devel/cdrdao.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cdrdao.spec	21 Aug 2006 09:47:31 -0000	1.36
+++ cdrdao.spec	21 Aug 2006 09:48:00 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Writes audio CD-Rs in disk-at-once (DAO) mode.
 Name: cdrdao
 Version: 1.2.1
-Release: 1.1
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 URL: http://cdrdao.sourceforge.net/



From fedora-cvs-commits at redhat.com  Mon Aug 21 10:15:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 06:15:01 -0400
Subject: rpms/bind/devel bind-9.3.2-tmpfile.patch, NONE, 1.1 bind.spec, 1.122,
	1.123
Message-ID: <200608211015.k7LAF11e001979@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1881

Modified Files:
	bind.spec 
Added Files:
	bind-9.3.2-tmpfile.patch 
Log Message:
fix for #203194 - tmpfile usage

bind-9.3.2-tmpfile.patch:
 named-bootconf.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE bind-9.3.2-tmpfile.patch ---
--- bind-9.3.2/contrib/named-bootconf/named-bootconf.sh.old	2004-03-06 14:16:11.000000000 +0100
+++ bind-9.3.2/contrib/named-bootconf/named-bootconf.sh	2006-08-21 11:30:03.000000000 +0200
@@ -54,9 +54,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 if [ ${OPTIONFILE-X} = X ]; then
-	OPTIONFILE=/tmp/.options.`date +%s`.$$
-	ZONEFILE=/tmp/.zones.`date +%s`.$$
-	COMMENTFILE=/tmp/.comments.`date +%s`.$$
+	OPTIONFILE=`mktemp /tmp/.options.XXXXXX` || exit 1
+	ZONEFILE=`mktemp /tmp/.zones.XXXXXX` || exit 1
+	COMMENTFILE=`mktemp /tmp/.comments.XXXXXX` || exit 1
 	export OPTIONFILE ZONEFILE COMMENTFILE
 	touch $OPTIONFILE $ZONEFILE $COMMENTFILE
 	DUMP=1


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- bind.spec	17 Aug 2006 08:43:45 -0000	1.122
+++ bind.spec	21 Aug 2006 10:14:57 -0000	1.123
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	37%{?dist}
+Release: 	38%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -107,8 +107,9 @@
 Patch48:	bind-9.3.2-9_3_3_dnssec.patch
 Patch49:	bind-9.3.2-9_3_3_nsupdate.patch
 Patch50:	bind-9.3.2-9_3_3_tests.patch
+Patch51:	bind-9.3.2-tmpfile.patch
 #
-Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2
+Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26
 Requires(pre): 	shadow-utils
 Requires(preun):chkconfig >= 1.3.26
@@ -356,6 +357,7 @@
 %patch48 -p1 -b .9_3_3_dnssec
 %patch49 -p1 -b .9_3_3_nsupdate
 %patch50 -p1 -b .9_3_3_tests
+%patch51 -p1 -b .tmp
 #
 # this must follow all dbus patches:
 %if %{SDB}
@@ -850,6 +852,9 @@
 :;
 
 %changelog
+* Mon Aug 21 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.2-38
+- fix for #203194 - tmpfile usage
+
 * Thu Aug 17 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.2-37
 - fix for #202542 - /usr/sbin/bind-chroot-admin: No such file or directory
 - fix for #202547 - file_contexts: invalid context



From fedora-cvs-commits at redhat.com  Mon Aug 21 10:29:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 06:29:08 -0400
Subject: rpms/valgrind/devel valgrind-3.2.0-nopl.patch, NONE,
	1.1 valgrind.spec, 1.38, 1.39
Message-ID: <200608211029.k7LAT8jl021756@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21727

Modified Files:
	valgrind.spec 
Added Files:
	valgrind-3.2.0-nopl.patch 
Log Message:
3.2.0-5

valgrind-3.2.0-nopl.patch:
 0 files changed

--- NEW FILE valgrind-3.2.0-nopl.patch ---
--- valgrind-3.2.0/VEX/priv/guest-amd64/toIR.c	(revision 1633)
+++ valgrind-3.2.0/VEX/priv/guest-amd64/toIR.c	(revision 1634)
@@ -13570,6 +13570,17 @@ DisResult disInstr_AMD64_WRK ( 
          delta = dis_mul_E_G ( pfx, sz, delta );
          break;
 
+      /* =-=-=-=-=-=-=-=-=- NOPs =-=-=-=-=-=-=-=-=-=-=-= */
+
+      case 0x1F:
+         if (haveF2orF3(pfx)) goto decode_failure;
+         modrm = getUChar(delta);
+         if (epartIsReg(modrm)) goto decode_failure;
+         addr = disAMode ( &alen, pfx, delta, dis_buf, 0 );
+         delta += alen;
+         DIP("nop%c %s\n", nameISize(sz), dis_buf);
+         break;
+
       /* =-=-=-=-=-=-=-=-=- Jcond d32 -=-=-=-=-=-=-=-=-= */
       case 0x80:
       case 0x81:
--- valgrind-3.2.0/VEX/priv/guest-x86/toIR.c	(revision 1633)
+++ valgrind-3.2.0/VEX/priv/guest-x86/toIR.c	(revision 1634)
@@ -12388,6 +12388,16 @@ DisResult disInstr_X86_WRK ( 
          delta = dis_mul_E_G ( sorb, sz, delta );
          break;
 
+      /* =-=-=-=-=-=-=-=-=- NOPs =-=-=-=-=-=-=-=-=-=-=-= */
+
+      case 0x1F:
+         modrm = getUChar(delta);
+         if (epartIsReg(modrm)) goto decode_failure;
+         addr = disAMode ( &alen, sorb, delta, dis_buf );
+         delta += alen;
+         DIP("nop%c %s\n", nameISize(sz), dis_buf);
+         break;
+
       /* =-=-=-=-=-=-=-=-=- Jcond d32 -=-=-=-=-=-=-=-=-= */
       case 0x80:
       case 0x81:


Index: valgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- valgrind.spec	28 Jul 2006 19:07:09 -0000	1.38
+++ valgrind.spec	21 Aug 2006 10:29:05 -0000	1.39
@@ -1,11 +1,12 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.2.0
-Release: 4
+Release: 5
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.2.0-syscall-updates.patch
 Patch2: valgrind-3.2.0-makefile.patch
+Patch3: valgrind-3.2.0-nopl.patch
 License: GPL
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -35,6 +36,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -118,6 +120,9 @@
 %{_mandir}/man1/valgrind*
 
 %changelog
+* Mon Aug 21 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-5
+- handle the new i686/x86_64 nops (#203273)
+
 * Fri Jul 28 2006 Jeremy Katz <katzj at redhat.com> - 1:3.2.0-4
 - rebuild to bring ppc back
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 10:47:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 06:47:07 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch, NONE,
	1.1 openoffice.org.spec, 1.853, 1.854
Message-ID: <200608211047.k7LAl71N025834@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25798

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch 
Log Message:
add openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch

openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch:
 source/core/unocore/unoobj.cxx    |    0 
 sw/source/core/unocore/unoobj.cxx |    1 +
 2 files changed, 1 insertion(+)

--- NEW FILE openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch ---
Index: source/core/unocore/unoobj.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/unocore/unoobj.cxx,v
retrieving revision 1.94
diff -u -r1.94 unoobj.cxx
--- openoffice.org.orig/sw/source/core/unocore/unoobj.cxx	4 Aug 2006 13:06:20 -0000	1.94
+++ openoffice.org/sw/source/core/unocore/unoobj.cxx	21 Aug 2006 10:40:51 -0000
@@ -484,6 +484,7 @@
 		aOpt.SetCharSet( RTL_TEXTENCODING_UNICODE );
 		xWrt->SetAsciiOptions( aOpt );
 		xWrt->bUCS2_WithStartChar = FALSE;
+		xWrt->SetShowProgress(false);
 
 		long lLen;
 		if( !IsError( aWriter.Write( xWrt ) ) &&


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.853
retrieving revision 1.854
diff -u -r1.853 -r1.854
--- openoffice.org.spec	21 Aug 2006 09:17:08 -0000	1.853
+++ openoffice.org.spec	21 Aug 2006 10:47:03 -0000	1.854
@@ -121,6 +121,7 @@
 Patch53: openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch
 Patch54: openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 Patch55: openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
+Patch56: openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -976,6 +977,7 @@
 %patch53 -p1 -b .ooo68665.x86_64gcj.jvm.patch
 %patch54 -p1 -b .ooo68369.dtrans.crash.patch
 %patch55 -p1 -b .ooo68805.sw.ww8size.patch
+%patch56 -p1 -b .ooo68822.sw.recursiveim.patch
 
 tar xzf %{SOURCE1}
 
@@ -2502,6 +2504,7 @@
 * Mon Aug 21 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.3
 - fix openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 - fix openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
+- fix openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch
 - drop openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch, fixed in gnome now
 
 * Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.1



From fedora-cvs-commits at redhat.com  Mon Aug 21 11:05:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 07:05:24 -0400
Subject: rpms/ncompress/FC-5 ncompress-4.2.4-bssUnderflow.patch, NONE,
	1.1 ncompress.spec, 1.18, 1.19
Message-ID: <200608211105.k7LB5OcC013496@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/ncompress/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13445

Modified Files:
	ncompress.spec 
Added Files:
	ncompress-4.2.4-bssUnderflow.patch 
Log Message:
fix bss buffer underflow CVE-2006-1168


ncompress-4.2.4-bssUnderflow.patch:
 compress42.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE ncompress-4.2.4-bssUnderflow.patch ---
--- ncompress-4.2.4/compress42.c.bssUnderflow	2006-08-10 11:40:03.000000000 +0200
+++ ncompress-4.2.4/compress42.c	2006-08-10 11:40:31.000000000 +0200
@@ -1689,6 +1689,10 @@
 
 				if (oldcode == -1)
 				{
+		                        if (code >= 256) {
+                	                        fprintf(stderr, "uncompress: corrupt input\n");
+                        	                abort_compress();
+                                	}
 					outbuf[outpos++] = (char_type)(finchar = (int)(oldcode = code));
 					continue;
 				}


Index: ncompress.spec
===================================================================
RCS file: /cvs/dist/rpms/ncompress/FC-5/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 Aug 2006 11:05:21 -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
@@ -10,6 +10,8 @@
 Patch2: ncompress-4.2.4-filenamelen.patch
 Patch3: ncompress-2GB.patch
 Patch4: ncompress-4.2.4-zerobyteforce.patch
+Patch5: ncompress-4.2.4-bssUnderflow.patch
+
 BuildRequires: gcc glibc-devel fileutils
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -31,6 +33,7 @@
 %patch2 -p1 -b .filenamelen
 %patch3 -p1 -b .2GB
 %patch4 -p1 -b .zerobyteforce
+%patch5 -p1 -b .bssUnderflow
 
 %build
 
@@ -69,6 +72,9 @@
 %doc LZW.INFO README
 
 %changelog
+* Mon Aug 21 2006 Peter Vrabec <pvrabec at redhat.com> 4.2.4-44
+- fix bss buffer underflow CVE-2006-1168 (#201919)
+
 * 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  Mon Aug 21 11:16:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 07:16:10 -0400
Subject: rpms/ncompress/FC-5 ncompress.spec,1.19,1.20
Message-ID: <200608211116.k7LBGAO4016519@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/ncompress/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16274

Modified Files:
	ncompress.spec 
Log Message:
add dist macro to release numbering



Index: ncompress.spec
===================================================================
RCS file: /cvs/dist/rpms/ncompress/FC-5/ncompress.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ncompress.spec	21 Aug 2006 11:05:21 -0000	1.19
+++ ncompress.spec	21 Aug 2006 11:16:06 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Fast compression and decompression utilities.
 Name: ncompress
 Version: 4.2.4
-Release: 44
+Release: 44%{?dist}
 License: distributable
 Group: Applications/File
 Source: ftp://metalab.unc.edu/pub/Linux/utils/compress/ncompress-4.2.4.tar.Z



From fedora-cvs-commits at redhat.com  Mon Aug 21 11:34:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 07:34:55 -0400
Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec, 1.28,
	1.29 compat-libstdc++33-ldbl.patch, 1.2, 1.3
Message-ID: <200608211134.k7LBYtSD004706@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-32/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4681

Modified Files:
	compat-gcc-32.spec compat-libstdc++33-ldbl.patch 
Log Message:
3.2.3-61


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- compat-gcc-32.spec	18 Aug 2006 11:48:02 -0000	1.28
+++ compat-gcc-32.spec	21 Aug 2006 11:34:52 -0000	1.29
@@ -1,7 +1,7 @@
 %define LIBSTDCXXDATE 20040818
 %define DATE 20040701
 %define gcc_version 3.2.3
-%define gcc_release 60
+%define gcc_release 61
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define build_java 0
@@ -402,6 +402,9 @@
 %{_prefix}/%{_lib}/libstdc++.so.5*
 
 %changelog
+* Mon Aug 21 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-61
+- fix the ppc*/s390* math *l stub changes
+
 * Fri Aug 18 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-60
 - on ppc*/s390* make sure all needed math *l stubs are included
 

compat-libstdc++33-ldbl.patch:
 stubs.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

Index: compat-libstdc++33-ldbl.patch
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-libstdc++33-ldbl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compat-libstdc++33-ldbl.patch	18 Aug 2006 11:48:02 -0000	1.2
+++ compat-libstdc++33-ldbl.patch	21 Aug 2006 11:34:52 -0000	1.3
@@ -1,1939 +1,29 @@
---- libstdc++33-v3/acinclude.m4.jj	2004-06-24 12:06:53.000000000 -0400
-+++ libstdc++33-v3/acinclude.m4	2006-08-18 06:22:22.000000000 -0400
-@@ -831,29 +831,61 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitef)
- 
-   dnl Check to see if basic C math functions have long double versions.
-+  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double inverse trig,
-+                                          long_double_itrig,
-+                                          acosl asinl atanl)
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double trig,
-                                           long_double_trig,
--                                          acosl asinl atanl \
-                                           cosl sinl tanl \
-                                           coshl sinhl tanhl)
-+      ;;
-+  esac
-   GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double round,
-                                           long_double_round,
-                                           ceill floorl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinfl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysignl)
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(atan2l)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(expl)
-+      ;;
-+  esac
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fabsl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(fmodl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(frexpl)
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypotl)
-+      ;;
-+  esac
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpl)
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(logl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(log10l)
-+      ;;
-+  esac
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(modfl)
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(powl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtl)
-+      ;;
-+  esac
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitel)
- 
---- libstdc++33-v3/aclocal.m4.jj	2004-06-24 12:06:53.000000000 -0400
-+++ libstdc++33-v3/aclocal.m4	2006-08-18 06:23:52.000000000 -0400
-@@ -843,29 +843,61 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitef)
- 
-   dnl Check to see if basic C math functions have long double versions.
-+  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double inverse trig,
-+                                          long_double_itrig,
-+                                          acosl asinl atanl)
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double trig,
-                                           long_double_trig,
--                                          acosl asinl atanl \
-                                           cosl sinl tanl \
-                                           coshl sinhl tanhl)
-+      ;;
-+  esac
-   GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double round,
-                                           long_double_round,
-                                           ceill floorl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinfl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysignl)
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(atan2l)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(expl)
-+      ;;
-+  esac
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fabsl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(fmodl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(frexpl)
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypotl)
-+      ;;
-+  esac
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpl)
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(logl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(log10l)
-+      ;;
-+  esac
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(modfl)
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(powl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtl)
-+      ;;
-+  esac
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosl)
-   GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitel)
- 
---- libstdc++33-v3/configure.jj	2004-08-18 03:44:22.000000000 -0400
-+++ libstdc++33-v3/configure	2006-08-18 06:26:13.000000000 -0400
-@@ -17554,8 +17474,113 @@ done
- 
- 
-     
-+  echo $ac_n "checking for long double inverse trig functions""... $ac_c" 1>&6
-+echo "configure:17479: checking for long double inverse trig functions" >&5
-+  if eval "test \"`echo '$''{'glibcpp_cv_func_long_double_itrig_use'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+    
-+    ac_ext=C
-+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cxx_cross
-+
-+    cat > conftest.$ac_ext <<EOF
-+#line 17493 "configure"
-+#include "confdefs.h"
-+#include <math.h>
-+int main() {
-+ `for x in acosl asinl atanl; do echo "$x (0);"; done` 
-+; return 0; }
-+EOF
-+if { (eval echo configure:17500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  glibcpp_cv_func_long_double_itrig_use=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  glibcpp_cv_func_long_double_itrig_use=no
-+fi
-+rm -f conftest*
-+    ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+fi
-+
-+  echo "$ac_t""$glibcpp_cv_func_long_double_itrig_use" 1>&6
-+  if test x$glibcpp_cv_func_long_double_itrig_use = x"yes"; then
-+    for ac_func in acosl asinl atanl
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:17524: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 17529 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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();
-+
-+int main() {
-+
-+/* 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
-+$ac_func();
+--- libstdc++33-v3/libmath/stubs.c.jj	2003-06-03 08:48:02.000000000 -0400
++++ libstdc++33-v3/libmath/stubs.c	2006-08-21 07:25:18.000000000 -0400
+@@ -30,10 +30,25 @@
+ #include <math.h>
+ #include "config.h"
+ 
++#if defined __s390__ || defined __powerpc__
++#undef HAVE_ATAN2L
++#undef HAVE_COSHL
++#undef HAVE_COSL
++#undef HAVE_EXPL
++#undef HAVE_HYPOTL
++#undef HAVE_LOG10L
++#undef HAVE_LOGL
++#undef HAVE_POWL
++#undef HAVE_SINHL
++#undef HAVE_SINL
++#undef HAVE_SQRTL
++#undef HAVE_TANHL
++#undef HAVE_TANL
 +#endif
 +
-+; return 0; }
-+EOF
-+if { (eval echo configure:17552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+  fi
-+
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-+  
-   echo $ac_n "checking for long double trig functions""... $ac_c" 1>&6
--echo "configure:17559: checking for long double trig functions" >&5
-+echo "configure:17584: checking for long double trig functions" >&5
-   if eval "test \"`echo '$''{'glibcpp_cv_func_long_double_trig_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -17569,16 +17594,15 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-     cat > conftest.$ac_ext <<EOF
--#line 17573 "configure"
-+#line 17598 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-- `for x in acosl asinl atanl \
--                                          cosl sinl tanl \
-+ `for x in cosl sinl tanl \
-                                           coshl sinhl tanhl; do echo "$x (0);"; done` 
- ; return 0; }
- EOF
--if { (eval echo configure:17582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_long_double_trig_use=yes
- else
-@@ -17599,17 +17623,16 @@ fi
- 
-   echo "$ac_t""$glibcpp_cv_func_long_double_trig_use" 1>&6
-   if test x$glibcpp_cv_func_long_double_trig_use = x"yes"; then
--    for ac_func in acosl asinl atanl \
--                                          cosl sinl tanl \
-+    for ac_func in cosl sinl tanl \
-                                           coshl sinhl tanhl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:17608: checking for $ac_func" >&5
-+echo "configure:17631: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 17613 "configure"
-+#line 17636 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -17632,7 +17655,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:17636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:17659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -17658,9 +17681,11 @@ done
- 
-   fi
- 
-+      ;;
-+  esac
-   
-   echo $ac_n "checking for long double round functions""... $ac_c" 1>&6
--echo "configure:17664: checking for long double round functions" >&5
-+echo "configure:17689: checking for long double round functions" >&5
-   if eval "test \"`echo '$''{'glibcpp_cv_func_long_double_round_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -17674,14 +17699,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-     cat > conftest.$ac_ext <<EOF
--#line 17678 "configure"
-+#line 17703 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  `for x in ceill floorl; do echo "$x (0);"; done` 
- ; return 0; }
- EOF
--if { (eval echo configure:17685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_long_double_round_use=yes
- else
-@@ -17705,12 +17730,12 @@ fi
-     for ac_func in ceill floorl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:17709: checking for $ac_func" >&5
-+echo "configure:17734: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 17714 "configure"
-+#line 17739 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -17733,7 +17758,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:17737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:17762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -17762,7 +17787,7 @@ done
-   
-   
-   echo $ac_n "checking for isnanl declaration""... $ac_c" 1>&6
--echo "configure:17766: checking for isnanl declaration" >&5
-+echo "configure:17791: checking for isnanl declaration" >&5
-   if test x${glibcpp_cv_func_isnanl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_isnanl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -17777,7 +17802,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 17781 "configure"
-+#line 17806 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -17788,7 +17813,7 @@ int main() {
-  isnanl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:17792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_isnanl_use=yes
- else
-@@ -17815,12 +17840,12 @@ fi
-     for ac_func in isnanl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:17819: checking for $ac_func" >&5
-+echo "configure:17844: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 17824 "configure"
-+#line 17849 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -17843,7 +17868,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:17847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:17872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -17870,7 +17895,7 @@ done
-   else
-     
-   echo $ac_n "checking for _isnanl declaration""... $ac_c" 1>&6
--echo "configure:17874: checking for _isnanl declaration" >&5
-+echo "configure:17899: checking for _isnanl declaration" >&5
-   if test x${glibcpp_cv_func__isnanl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__isnanl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -17885,7 +17910,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 17889 "configure"
-+#line 17914 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -17896,7 +17921,7 @@ int main() {
-  _isnanl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:17900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__isnanl_use=yes
- else
-@@ -17923,12 +17948,12 @@ fi
-       for ac_func in _isnanl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:17927: checking for $ac_func" >&5
-+echo "configure:17952: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 17932 "configure"
-+#line 17957 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -17951,7 +17976,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:17955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:17980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -17981,7 +18006,7 @@ done
-   
-   
-   echo $ac_n "checking for isinfl declaration""... $ac_c" 1>&6
--echo "configure:17985: checking for isinfl declaration" >&5
-+echo "configure:18010: checking for isinfl declaration" >&5
-   if test x${glibcpp_cv_func_isinfl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_isinfl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -17996,7 +18021,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 18000 "configure"
-+#line 18025 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -18007,7 +18032,7 @@ int main() {
-  isinfl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:18011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_isinfl_use=yes
- else
-@@ -18034,12 +18059,12 @@ fi
-     for ac_func in isinfl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18038: checking for $ac_func" >&5
-+echo "configure:18063: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 18043 "configure"
-+#line 18068 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -18062,7 +18087,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:18066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -18089,7 +18114,7 @@ done
-   else
-     
-   echo $ac_n "checking for _isinfl declaration""... $ac_c" 1>&6
--echo "configure:18093: checking for _isinfl declaration" >&5
-+echo "configure:18118: checking for _isinfl declaration" >&5
-   if test x${glibcpp_cv_func__isinfl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__isinfl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -18104,7 +18129,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 18108 "configure"
-+#line 18133 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -18115,7 +18140,7 @@ int main() {
-  _isinfl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:18119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__isinfl_use=yes
- else
-@@ -18142,12 +18167,12 @@ fi
-       for ac_func in _isinfl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18146: checking for $ac_func" >&5
-+echo "configure:18171: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 18151 "configure"
-+#line 18176 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -18170,7 +18195,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:18174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -18200,7 +18225,7 @@ done
-   
-   
-   echo $ac_n "checking for copysignl declaration""... $ac_c" 1>&6
--echo "configure:18204: checking for copysignl declaration" >&5
-+echo "configure:18229: checking for copysignl declaration" >&5
-   if test x${glibcpp_cv_func_copysignl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_copysignl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -18215,14 +18240,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 18219 "configure"
-+#line 18244 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  copysignl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:18226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_copysignl_use=yes
- else
-@@ -18249,12 +18274,12 @@ fi
-     for ac_func in copysignl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18253: checking for $ac_func" >&5
-+echo "configure:18278: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 18258 "configure"
-+#line 18283 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -18277,7 +18302,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:18281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -18304,7 +18329,7 @@ done
-   else
-     
-   echo $ac_n "checking for _copysignl declaration""... $ac_c" 1>&6
--echo "configure:18308: checking for _copysignl declaration" >&5
-+echo "configure:18333: checking for _copysignl declaration" >&5
-   if test x${glibcpp_cv_func__copysignl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__copysignl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -18319,14 +18344,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 18323 "configure"
-+#line 18348 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  _copysignl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:18330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__copysignl_use=yes
- else
-@@ -18353,12 +18378,12 @@ fi
-       for ac_func in _copysignl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18357: checking for $ac_func" >&5
-+echo "configure:18382: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 18362 "configure"
-+#line 18387 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -18381,7 +18406,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:18385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -18408,10 +18433,14 @@ done
-     fi
-   fi
- 
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   
-   
-   echo $ac_n "checking for atan2l declaration""... $ac_c" 1>&6
--echo "configure:18415: checking for atan2l declaration" >&5
-+echo "configure:18444: checking for atan2l declaration" >&5
-   if test x${glibcpp_cv_func_atan2l_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_atan2l_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -18426,14 +18455,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 18430 "configure"
-+#line 18459 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  atan2l(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:18437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_atan2l_use=yes
- else
-@@ -18460,12 +18489,12 @@ fi
-     for ac_func in atan2l
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18464: checking for $ac_func" >&5
-+echo "configure:18493: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 18469 "configure"
-+#line 18498 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -18488,7 +18517,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:18492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -18515,7 +18544,7 @@ done
-   else
-     
-   echo $ac_n "checking for _atan2l declaration""... $ac_c" 1>&6
--echo "configure:18519: checking for _atan2l declaration" >&5
-+echo "configure:18548: checking for _atan2l declaration" >&5
-   if test x${glibcpp_cv_func__atan2l_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__atan2l_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -18530,14 +18559,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 18534 "configure"
-+#line 18563 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  _atan2l(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:18541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__atan2l_use=yes
- else
-@@ -18564,12 +18593,12 @@ fi
-       for ac_func in _atan2l
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18568: checking for $ac_func" >&5
-+echo "configure:18597: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 18573 "configure"
-+#line 18602 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -18592,7 +18621,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:18596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -18622,7 +18651,7 @@ done
-   
-   
-   echo $ac_n "checking for expl declaration""... $ac_c" 1>&6
--echo "configure:18626: checking for expl declaration" >&5
-+echo "configure:18655: checking for expl declaration" >&5
-   if test x${glibcpp_cv_func_expl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_expl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -18637,7 +18666,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 18641 "configure"
-+#line 18670 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -18648,7 +18677,7 @@ int main() {
-  expl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:18652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_expl_use=yes
- else
-@@ -18675,12 +18704,12 @@ fi
-     for ac_func in expl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18679: checking for $ac_func" >&5
-+echo "configure:18708: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 18684 "configure"
-+#line 18713 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -18703,7 +18732,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:18707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -18730,7 +18759,7 @@ done
-   else
-     
-   echo $ac_n "checking for _expl declaration""... $ac_c" 1>&6
--echo "configure:18734: checking for _expl declaration" >&5
-+echo "configure:18763: checking for _expl declaration" >&5
-   if test x${glibcpp_cv_func__expl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__expl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -18745,7 +18774,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 18749 "configure"
-+#line 18778 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -18756,7 +18785,7 @@ int main() {
-  _expl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:18760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__expl_use=yes
- else
-@@ -18783,12 +18812,12 @@ fi
-       for ac_func in _expl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18787: checking for $ac_func" >&5
-+echo "configure:18816: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 18792 "configure"
-+#line 18821 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -18811,7 +18840,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:18815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -18838,10 +18867,12 @@ done
-     fi
-   fi
- 
-+      ;;
-+  esac
-   
-   
-   echo $ac_n "checking for fabsl declaration""... $ac_c" 1>&6
--echo "configure:18845: checking for fabsl declaration" >&5
-+echo "configure:18876: checking for fabsl declaration" >&5
-   if test x${glibcpp_cv_func_fabsl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_fabsl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -18856,7 +18887,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 18860 "configure"
-+#line 18891 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -18867,7 +18898,7 @@ int main() {
-  fabsl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:18871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_fabsl_use=yes
- else
-@@ -18894,12 +18925,12 @@ fi
-     for ac_func in fabsl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18898: checking for $ac_func" >&5
-+echo "configure:18929: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 18903 "configure"
-+#line 18934 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -18922,7 +18953,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:18926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -18949,7 +18980,7 @@ done
-   else
-     
-   echo $ac_n "checking for _fabsl declaration""... $ac_c" 1>&6
--echo "configure:18953: checking for _fabsl declaration" >&5
-+echo "configure:18984: checking for _fabsl declaration" >&5
-   if test x${glibcpp_cv_func__fabsl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__fabsl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -18964,7 +18995,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 18968 "configure"
-+#line 18999 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -18975,7 +19006,7 @@ int main() {
-  _fabsl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:18979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__fabsl_use=yes
- else
-@@ -19002,12 +19033,12 @@ fi
-       for ac_func in _fabsl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:19006: checking for $ac_func" >&5
-+echo "configure:19037: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 19011 "configure"
-+#line 19042 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -19030,7 +19061,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:19034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -19060,7 +19091,7 @@ done
-   
-   
-   echo $ac_n "checking for fmodl declaration""... $ac_c" 1>&6
--echo "configure:19064: checking for fmodl declaration" >&5
-+echo "configure:19095: checking for fmodl declaration" >&5
-   if test x${glibcpp_cv_func_fmodl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_fmodl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -19075,14 +19106,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
+ /* For targets which do not have support for long double versions,
+    we use the crude approximation.  We'll do better later.  */
  
-       cat > conftest.$ac_ext <<EOF
--#line 19079 "configure"
-+#line 19110 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  fmodl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:19086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_fmodl_use=yes
- else
-@@ -19109,12 +19140,12 @@ fi
-     for ac_func in fmodl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:19113: checking for $ac_func" >&5
-+echo "configure:19144: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 19118 "configure"
-+#line 19149 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -19137,7 +19168,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:19141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -19164,7 +19195,7 @@ done
-   else
-     
-   echo $ac_n "checking for _fmodl declaration""... $ac_c" 1>&6
--echo "configure:19168: checking for _fmodl declaration" >&5
-+echo "configure:19199: checking for _fmodl declaration" >&5
-   if test x${glibcpp_cv_func__fmodl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__fmodl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -19179,14 +19210,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 19183 "configure"
-+#line 19214 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  _fmodl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:19190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__fmodl_use=yes
- else
-@@ -19213,12 +19244,12 @@ fi
-       for ac_func in _fmodl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:19217: checking for $ac_func" >&5
-+echo "configure:19248: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 19222 "configure"
-+#line 19253 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -19241,7 +19272,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:19245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -19271,7 +19302,7 @@ done
-   
-   
-   echo $ac_n "checking for frexpl declaration""... $ac_c" 1>&6
--echo "configure:19275: checking for frexpl declaration" >&5
-+echo "configure:19306: checking for frexpl declaration" >&5
-   if test x${glibcpp_cv_func_frexpl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_frexpl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -19286,14 +19317,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 19290 "configure"
-+#line 19321 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  frexpl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:19297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_frexpl_use=yes
- else
-@@ -19320,12 +19351,12 @@ fi
-     for ac_func in frexpl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:19324: checking for $ac_func" >&5
-+echo "configure:19355: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 19329 "configure"
-+#line 19360 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -19348,7 +19379,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:19352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -19375,7 +19406,7 @@ done
-   else
-     
-   echo $ac_n "checking for _frexpl declaration""... $ac_c" 1>&6
--echo "configure:19379: checking for _frexpl declaration" >&5
-+echo "configure:19410: checking for _frexpl declaration" >&5
-   if test x${glibcpp_cv_func__frexpl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__frexpl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -19390,14 +19421,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 19394 "configure"
-+#line 19425 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  _frexpl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:19401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__frexpl_use=yes
- else
-@@ -19424,12 +19455,12 @@ fi
-       for ac_func in _frexpl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:19428: checking for $ac_func" >&5
-+echo "configure:19459: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 19433 "configure"
-+#line 19464 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -19452,7 +19483,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:19456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -19479,10 +19510,14 @@ done
-     fi
-   fi
- 
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   
-   
-   echo $ac_n "checking for hypotl declaration""... $ac_c" 1>&6
--echo "configure:19486: checking for hypotl declaration" >&5
-+echo "configure:19521: checking for hypotl declaration" >&5
-   if test x${glibcpp_cv_func_hypotl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_hypotl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -19497,14 +19532,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 19501 "configure"
-+#line 19536 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  hypotl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:19508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_hypotl_use=yes
- else
-@@ -19531,12 +19566,12 @@ fi
-     for ac_func in hypotl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:19535: checking for $ac_func" >&5
-+echo "configure:19570: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 19540 "configure"
-+#line 19575 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -19559,7 +19594,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:19563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -19586,7 +19621,7 @@ done
-   else
-     
-   echo $ac_n "checking for _hypotl declaration""... $ac_c" 1>&6
--echo "configure:19590: checking for _hypotl declaration" >&5
-+echo "configure:19625: checking for _hypotl declaration" >&5
-   if test x${glibcpp_cv_func__hypotl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__hypotl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -19601,14 +19636,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 19605 "configure"
-+#line 19640 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  _hypotl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:19612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__hypotl_use=yes
- else
-@@ -19635,12 +19670,12 @@ fi
-       for ac_func in _hypotl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:19639: checking for $ac_func" >&5
-+echo "configure:19674: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 19644 "configure"
-+#line 19679 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -19663,7 +19698,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:19667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -19690,10 +19725,12 @@ done
-     fi
-   fi
- 
-+      ;;
-+  esac
-   
-   
-   echo $ac_n "checking for ldexpl declaration""... $ac_c" 1>&6
--echo "configure:19697: checking for ldexpl declaration" >&5
-+echo "configure:19734: checking for ldexpl declaration" >&5
-   if test x${glibcpp_cv_func_ldexpl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_ldexpl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -19708,14 +19745,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 19712 "configure"
-+#line 19749 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  ldexpl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:19719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_ldexpl_use=yes
- else
-@@ -19742,12 +19779,12 @@ fi
-     for ac_func in ldexpl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:19746: checking for $ac_func" >&5
-+echo "configure:19783: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 19751 "configure"
-+#line 19788 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -19770,7 +19807,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:19774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -19797,7 +19834,7 @@ done
-   else
-     
-   echo $ac_n "checking for _ldexpl declaration""... $ac_c" 1>&6
--echo "configure:19801: checking for _ldexpl declaration" >&5
-+echo "configure:19838: checking for _ldexpl declaration" >&5
-   if test x${glibcpp_cv_func__ldexpl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__ldexpl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -19812,14 +19849,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 19816 "configure"
-+#line 19853 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  _ldexpl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:19823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__ldexpl_use=yes
- else
-@@ -19846,12 +19883,12 @@ fi
-       for ac_func in _ldexpl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:19850: checking for $ac_func" >&5
-+echo "configure:19887: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 19855 "configure"
-+#line 19892 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -19874,7 +19911,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:19878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -19901,10 +19938,14 @@ done
-     fi
-   fi
- 
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   
-   
-   echo $ac_n "checking for logl declaration""... $ac_c" 1>&6
--echo "configure:19908: checking for logl declaration" >&5
-+echo "configure:19949: checking for logl declaration" >&5
-   if test x${glibcpp_cv_func_logl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_logl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -19919,7 +19960,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 19923 "configure"
-+#line 19964 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -19930,7 +19971,7 @@ int main() {
-  logl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:19934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_logl_use=yes
- else
-@@ -19957,12 +19998,12 @@ fi
-     for ac_func in logl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:19961: checking for $ac_func" >&5
-+echo "configure:20002: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 19966 "configure"
-+#line 20007 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -19985,7 +20026,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:19989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:20030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -20012,7 +20053,7 @@ done
-   else
-     
-   echo $ac_n "checking for _logl declaration""... $ac_c" 1>&6
--echo "configure:20016: checking for _logl declaration" >&5
-+echo "configure:20057: checking for _logl declaration" >&5
-   if test x${glibcpp_cv_func__logl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__logl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -20027,7 +20068,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 20031 "configure"
-+#line 20072 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -20038,7 +20079,7 @@ int main() {
-  _logl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:20042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__logl_use=yes
- else
-@@ -20065,12 +20106,12 @@ fi
-       for ac_func in _logl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:20069: checking for $ac_func" >&5
-+echo "configure:20110: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 20074 "configure"
-+#line 20115 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -20093,7 +20134,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:20097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:20138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -20123,7 +20164,7 @@ done
-   
-   
-   echo $ac_n "checking for log10l declaration""... $ac_c" 1>&6
--echo "configure:20127: checking for log10l declaration" >&5
-+echo "configure:20168: checking for log10l declaration" >&5
-   if test x${glibcpp_cv_func_log10l_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_log10l_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -20138,7 +20179,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 20142 "configure"
-+#line 20183 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -20149,7 +20190,7 @@ int main() {
-  log10l(0);
- ; return 0; }
- EOF
--if { (eval echo configure:20153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_log10l_use=yes
- else
-@@ -20176,12 +20217,12 @@ fi
-     for ac_func in log10l
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:20180: checking for $ac_func" >&5
-+echo "configure:20221: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 20185 "configure"
-+#line 20226 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -20204,7 +20245,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:20208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:20249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -20231,7 +20272,7 @@ done
-   else
-     
-   echo $ac_n "checking for _log10l declaration""... $ac_c" 1>&6
--echo "configure:20235: checking for _log10l declaration" >&5
-+echo "configure:20276: checking for _log10l declaration" >&5
-   if test x${glibcpp_cv_func__log10l_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__log10l_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -20246,7 +20287,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 20250 "configure"
-+#line 20291 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -20257,7 +20298,7 @@ int main() {
-  _log10l(0);
- ; return 0; }
- EOF
--if { (eval echo configure:20261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__log10l_use=yes
- else
-@@ -20284,12 +20325,12 @@ fi
-       for ac_func in _log10l
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:20288: checking for $ac_func" >&5
-+echo "configure:20329: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 20293 "configure"
-+#line 20334 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -20312,7 +20353,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:20316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:20357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -20339,10 +20380,12 @@ done
-     fi
-   fi
- 
-+      ;;
-+  esac
-   
-   
-   echo $ac_n "checking for modfl declaration""... $ac_c" 1>&6
--echo "configure:20346: checking for modfl declaration" >&5
-+echo "configure:20389: checking for modfl declaration" >&5
-   if test x${glibcpp_cv_func_modfl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_modfl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -20357,14 +20400,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 20361 "configure"
-+#line 20404 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  modfl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:20368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_modfl_use=yes
- else
-@@ -20391,12 +20434,12 @@ fi
-     for ac_func in modfl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:20395: checking for $ac_func" >&5
-+echo "configure:20438: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 20400 "configure"
-+#line 20443 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -20419,7 +20462,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:20423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:20466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -20446,7 +20489,7 @@ done
-   else
-     
-   echo $ac_n "checking for _modfl declaration""... $ac_c" 1>&6
--echo "configure:20450: checking for _modfl declaration" >&5
-+echo "configure:20493: checking for _modfl declaration" >&5
-   if test x${glibcpp_cv_func__modfl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__modfl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -20461,14 +20504,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 20465 "configure"
-+#line 20508 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  _modfl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:20472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__modfl_use=yes
- else
-@@ -20495,12 +20538,12 @@ fi
-       for ac_func in _modfl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:20499: checking for $ac_func" >&5
-+echo "configure:20542: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 20504 "configure"
-+#line 20547 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -20523,7 +20566,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:20527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:20570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -20550,10 +20593,14 @@ done
-     fi
-   fi
- 
-+  case "$target" in
-+    ppc*-*-linux*|powerpc*-*-linux*|s390*-*-linux*)
-+      ;;
-+    *)
-   
-   
-   echo $ac_n "checking for powl declaration""... $ac_c" 1>&6
--echo "configure:20557: checking for powl declaration" >&5
-+echo "configure:20604: checking for powl declaration" >&5
-   if test x${glibcpp_cv_func_powl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_powl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -20568,14 +20615,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 20572 "configure"
-+#line 20619 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  powl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:20579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_powl_use=yes
- else
-@@ -20602,12 +20649,12 @@ fi
-     for ac_func in powl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:20606: checking for $ac_func" >&5
-+echo "configure:20653: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 20611 "configure"
-+#line 20658 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -20630,7 +20677,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:20634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:20681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -20657,7 +20704,7 @@ done
-   else
-     
-   echo $ac_n "checking for _powl declaration""... $ac_c" 1>&6
--echo "configure:20661: checking for _powl declaration" >&5
-+echo "configure:20708: checking for _powl declaration" >&5
-   if test x${glibcpp_cv_func__powl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__powl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -20672,14 +20719,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 20676 "configure"
-+#line 20723 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  _powl(0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:20683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__powl_use=yes
- else
-@@ -20706,12 +20753,12 @@ fi
-       for ac_func in _powl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:20710: checking for $ac_func" >&5
-+echo "configure:20757: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 20715 "configure"
-+#line 20762 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -20734,7 +20781,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:20738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:20785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -20764,7 +20811,7 @@ done
-   
-   
-   echo $ac_n "checking for sqrtl declaration""... $ac_c" 1>&6
--echo "configure:20768: checking for sqrtl declaration" >&5
-+echo "configure:20815: checking for sqrtl declaration" >&5
-   if test x${glibcpp_cv_func_sqrtl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_sqrtl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -20779,7 +20826,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 20783 "configure"
-+#line 20830 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -20790,7 +20837,7 @@ int main() {
-  sqrtl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:20794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_sqrtl_use=yes
- else
-@@ -20817,12 +20864,12 @@ fi
-     for ac_func in sqrtl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:20821: checking for $ac_func" >&5
-+echo "configure:20868: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 20826 "configure"
-+#line 20873 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -20845,7 +20892,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:20849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:20896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -20872,7 +20919,7 @@ done
-   else
-     
-   echo $ac_n "checking for _sqrtl declaration""... $ac_c" 1>&6
--echo "configure:20876: checking for _sqrtl declaration" >&5
-+echo "configure:20923: checking for _sqrtl declaration" >&5
-   if test x${glibcpp_cv_func__sqrtl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func__sqrtl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -20887,7 +20934,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 20891 "configure"
-+#line 20938 "configure"
- #include "confdefs.h"
- #include <math.h>
- 		      #ifdef HAVE_IEEEFP_H
-@@ -20898,7 +20945,7 @@ int main() {
-  _sqrtl(0);
- ; return 0; }
- EOF
--if { (eval echo configure:20902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func__sqrtl_use=yes
- else
-@@ -20925,12 +20972,12 @@ fi
-       for ac_func in _sqrtl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:20929: checking for $ac_func" >&5
-+echo "configure:20976: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 20934 "configure"
-+#line 20981 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -20953,7 +21000,7 @@ $ac_func();
- 
- ; return 0; }
- EOF
--if { (eval echo configure:20957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:21004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -20980,10 +21027,12 @@ done
-     fi
-   fi
- 
-+      ;;
-+  esac
-   
-   
-   echo $ac_n "checking for sincosl declaration""... $ac_c" 1>&6
--echo "configure:20987: checking for sincosl declaration" >&5
-+echo "configure:21036: checking for sincosl declaration" >&5
-   if test x${glibcpp_cv_func_sincosl_use+set} != xset; then
-     if eval "test \"`echo '$''{'glibcpp_cv_func_sincosl_use'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -20998,14 +21047,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
- cross_compiling=$ac_cv_prog_cxx_cross
- 
-       cat > conftest.$ac_ext <<EOF
--#line 21002 "configure"
-+#line 21051 "configure"
- #include "confdefs.h"
- #include <math.h>
- int main() {
-  sincosl(0, 0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:21009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:21058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   glibcpp_cv_func_sincosl_use=yes
- else
+-
+ #ifndef HAVE_ATAN2F
+ float
+ atan2f(float x, float y)



From fedora-cvs-commits at redhat.com  Mon Aug 21 11:52:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 07:52:04 -0400
Subject: rpms/iproute/devel iproute2-2.6.16-flags.patch, NONE,
	1.1 iproute.spec, 1.51, 1.52
Message-ID: <200608211152.k7LBq4Ml031504@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/iproute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31489

Modified Files:
	iproute.spec 
Added Files:
	iproute2-2.6.16-flags.patch 
Log Message:
- add LOWER_UP and DORMANT flags (#202199)

iproute2-2.6.16-flags.patch:
 ipaddress.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE iproute2-2.6.16-flags.patch ---
--- iproute2-2.6.17-000000/ip/ipaddress.c.old	2006-08-21 13:31:30.000000000 +0200
+++ iproute2-2.6.17-000000/ip/ipaddress.c	2006-08-21 13:41:33.000000000 +0200
@@ -97,6 +97,8 @@
 	_PF(PORTSEL);
 	_PF(NOTRAILERS);
 	_PF(UP);
+	_PF(LOWER_UP);
+	_PF(DORMANT);
 #undef _PF
         if (flags)
 		fprintf(fp, "%x", flags);


Index: iproute.spec
===================================================================
RCS file: /cvs/dist/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- iproute.spec	12 Jul 2006 06:25:09 -0000	1.51
+++ iproute.spec	21 Aug 2006 11:52:02 -0000	1.52
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools.
 Name: iproute
 Version: 2.6.16
-Release: 3.1
+Release: 4%{?dist}
 Group: Applications/System
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}-%{date_version}.tar.gz
 URL:	http://linux-net.osdl.org/index.php/Iproute2
@@ -14,6 +14,7 @@
 Patch7: iproute2-051007-add_tunnel.patch
 Patch8: iproute2-2.6.16-libdir.patch
 Patch9:	iproute2-2.6.16-initcwnd-correct-order.patch
+Patch10: iproute2-2.6.16-flags.patch
 
 License: GNU GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -34,6 +35,7 @@
 %patch7 -p1 -b .tunnel_add
 %patch8 -p1 -b .libdir
 %patch9 -p1 -b .initcwnd
+%patch10 -p1 -b .flags
 
 %build
 export LIBDIR=%{_libdir}
@@ -94,6 +96,10 @@
 %config(noreplace) /etc/sysconfig/cbq/*
 
 %changelog
+* Mon Aug 21 2006 Radek Vok??l <rvokal at redhat.com> - 2.6.16-4
+- add LOWER_UP and DORMANT flags (#202199)
+- use dist tag
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.6.16-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 12:16:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 08:16:38 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.114,1.115
Message-ID: <200608211216.k7LCGcjk011704@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11468

Modified Files:
	dhcp.spec 
Log Message:
fix release typo


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- dhcp.spec	18 Aug 2006 20:12:01 -0000	1.114
+++ dhcp.spec	21 Aug 2006 12:16:35 -0000	1.115
@@ -4,8 +4,8 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.4
-Release: 19%{?dist}
-Epoch:   13
+Release: 20%{?dist}
+Epoch:   12
 License: distributable
 Group:   System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 21 13:08:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 09:08:45 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch, 1.6, 1.7
Message-ID: <200608211308.k7LD8iue023503@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23456

Modified Files:
	openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 
Log Message:
fix out of bounds

openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch:
 config_office/configure.in                       |   20 ++
 config_office/set_soenv.in                       |    1 
 source/cxxhelp/provider/makefile.mk              |    0 
 source/cxxhelp/provider/urlparameter.cxx         |    0 
 util/makefile.mk                                 |    0 
 xmlhelp/source/cxxhelp/provider/makefile.mk      |    6 
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx |  221 +++++++++++++++++++----
 xmlhelp/util/makefile.mk                         |   12 +
 8 files changed, 222 insertions(+), 38 deletions(-)

Index: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch	13 Aug 2006 14:09:22 -0000	1.6
+++ openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch	21 Aug 2006 13:08:41 -0000	1.7
@@ -250,7 +250,7 @@
  		SchemeHandler schemeHandler;
  		schemeHandler.getAll = schemehandlergetall;
  		schemeHandler.freeMemory = schemehandlerfreememory;
-@@ -822,6 +946,7 @@
+@@ -822,87 +946,89 @@
  		schemeHandler.get = schemehandlerget;
  		schemeHandler.put = schemehandlerput;
  		schemeHandler.close = schemehandlerclose;
@@ -258,7 +258,11 @@
  	
  		UserData userData( this,urlParam,pDatabases );
  	
-@@ -832,77 +957,78 @@
+ 		// Uses the implementation detail, that rtl::OString::getStr returns a zero terminated character-array
+         
+-		const char* parameter[42];
++		const char* parameter[44];
+ 		rtl::OString parString[43];
          int last = 0;
          
  		parString[last++] = "Program";



From fedora-cvs-commits at redhat.com  Mon Aug 21 13:20:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 09:20:40 -0400
Subject: rpms/compat-gcc-32/devel compat-libstdc++33-ldbl.patch,1.3,1.4
Message-ID: <200608211320.k7LDKeKN009421@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-32/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9319

Modified Files:
	compat-libstdc++33-ldbl.patch 
Log Message:
3.2.3-61


compat-libstdc++33-ldbl.patch:
 stubs.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+)

Index: compat-libstdc++33-ldbl.patch
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-libstdc++33-ldbl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- compat-libstdc++33-ldbl.patch	21 Aug 2006 11:34:52 -0000	1.3
+++ compat-libstdc++33-ldbl.patch	21 Aug 2006 13:20:35 -0000	1.4
@@ -1,6 +1,14 @@
 --- libstdc++33-v3/libmath/stubs.c.jj	2003-06-03 08:48:02.000000000 -0400
-+++ libstdc++33-v3/libmath/stubs.c	2006-08-21 07:25:18.000000000 -0400
-@@ -30,10 +30,25 @@
++++ libstdc++33-v3/libmath/stubs.c	2006-08-21 09:18:10.000000000 -0400
+@@ -27,13 +27,33 @@
+    invalidate any other reasons why the executable file might be covered by
+    the GNU General Public License.  */
+ 
++#if defined __s390__ || defined __powerpc__
++/* Lie.  */
++#define __LONG_DOUBLE_128__ 1
++#endif
++
  #include <math.h>
  #include "config.h"
  
@@ -9,7 +17,6 @@
 +#undef HAVE_COSHL
 +#undef HAVE_COSL
 +#undef HAVE_EXPL
-+#undef HAVE_HYPOTL
 +#undef HAVE_LOG10L
 +#undef HAVE_LOGL
 +#undef HAVE_POWL
@@ -23,7 +30,20 @@
  /* For targets which do not have support for long double versions,
     we use the crude approximation.  We'll do better later.  */
  
--
+ 
  #ifndef HAVE_ATAN2F
  float
  atan2f(float x, float y)
+@@ -137,6 +156,12 @@ hypotl(long double x, long double y)
+   x /= s; y /= s;
+   return s * sqrtl(x * x + y * y);
+ }
++#elif (defined __s390__ || defined __powerpc__) && defined HAVE_HYPOT
++long double
++hypotl(long double x, long double y)
++{
++  return hypot((double) x, (double) y);
++}
+ #endif
+ 
+ 



From fedora-cvs-commits at redhat.com  Mon Aug 21 13:25:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 09:25:24 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.48, 1.49 gnome-utils.spec,
	1.126, 1.127 sources, 1.52, 1.53
Message-ID: <200608211325.k7LDPO1M010850@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10794

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.15.93



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	13 Aug 2006 01:41:27 -0000	1.48
+++ .cvsignore	21 Aug 2006 13:25:22 -0000	1.49
@@ -1 +1 @@
-gnome-utils-2.15.92.tar.bz2
+gnome-utils-2.15.93.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- gnome-utils.spec	13 Aug 2006 01:41:27 -0000	1.126
+++ gnome-utils.spec	21 Aug 2006 13:25:22 -0000	1.127
@@ -9,7 +9,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.15.92
+Version:        2.15.93
 Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
@@ -69,6 +69,7 @@
 Requires:  glib2-devel >= %{glib2_version}
 Requires:  gtk2-devel >= %{gtk2_version}
 Requires:  gnome-utils = %{epoch}:%{version}-%{release}
+Requires:  pkgconfig
 
 %description devel
 The gnome-utils-devel package contains header files and other resources
@@ -226,6 +227,10 @@
 
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.93-1.fc6
+- Update to 2.115.93
+- Require pkgconfig in the devel package
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	13 Aug 2006 01:41:27 -0000	1.52
+++ sources	21 Aug 2006 13:25:22 -0000	1.53
@@ -1 +1 @@
-44b7f544e88dd48d8a6d51b61969ac67  gnome-utils-2.15.92.tar.bz2
+8e2b3cf3599a56a6d3a5247aade7b5a2  gnome-utils-2.15.93.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 13:26:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 09:26:50 -0400
Subject: rpms/compat-gcc-32/devel compat-libstdc++33-ldbl.patch,1.4,1.5
Message-ID: <200608211326.k7LDQoh2011437@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-32/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11408

Modified Files:
	compat-libstdc++33-ldbl.patch 
Log Message:
3.2.3-61

compat-libstdc++33-ldbl.patch:
 stubs.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+)

Index: compat-libstdc++33-ldbl.patch
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-libstdc++33-ldbl.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- compat-libstdc++33-ldbl.patch	21 Aug 2006 13:20:35 -0000	1.4
+++ compat-libstdc++33-ldbl.patch	21 Aug 2006 13:26:47 -0000	1.5
@@ -1,6 +1,6 @@
 --- libstdc++33-v3/libmath/stubs.c.jj	2003-06-03 08:48:02.000000000 -0400
 +++ libstdc++33-v3/libmath/stubs.c	2006-08-21 09:18:10.000000000 -0400
-@@ -27,13 +27,33 @@
+@@ -27,9 +27,29 @@
     invalidate any other reasons why the executable file might be covered by
     the GNU General Public License.  */
  
@@ -30,11 +30,7 @@
  /* For targets which do not have support for long double versions,
     we use the crude approximation.  We'll do better later.  */
  
- 
- #ifndef HAVE_ATAN2F
- float
- atan2f(float x, float y)
-@@ -137,6 +156,12 @@ hypotl(long double x, long double y)
+@@ -137,6 +157,12 @@ hypotl(long double x, long double y)
    x /= s; y /= s;
    return s * sqrtl(x * x + y * y);
  }



From fedora-cvs-commits at redhat.com  Mon Aug 21 13:30:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 09:30:59 -0400
Subject: rpms/vte/devel .cvsignore, 1.44, 1.45 sources, 1.44, 1.45 vte.spec,
	1.88, 1.89
Message-ID: <200608211330.k7LDUx1Q012978@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12905

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0-.13.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	2 Aug 2006 17:55:08 -0000	1.44
+++ .cvsignore	21 Aug 2006 13:30:57 -0000	1.45
@@ -1 +1 @@
-vte-0.13.5.tar.bz2
+vte-0.13.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	2 Aug 2006 17:55:08 -0000	1.44
+++ sources	21 Aug 2006 13:30:57 -0000	1.45
@@ -1 +1 @@
-47ea2c90bd64a7e8749cf7640dc82a28  vte-0.13.5.tar.bz2
+6f1e5939c7010fc709453947e4d35227  vte-0.13.6.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- vte.spec	2 Aug 2006 17:55:08 -0000	1.88
+++ vte.spec	21 Aug 2006 13:30:57 -0000	1.89
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.13.5
+Version: 0.13.6
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPL
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.13.6-1.fc6
+- Update to 0.13.6
+
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 0.13.5-1.fc6
 - Update to 0.13.5
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 13:36:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 09:36:53 -0400
Subject: rpms/zenity/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 zenity.spec,
	1.14, 1.15
Message-ID: <200608211336.k7LDarIH014398@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/zenity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14362

Modified Files:
	.cvsignore sources zenity.spec 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Aug 2006 22:55:33 -0000	1.7
+++ .cvsignore	21 Aug 2006 13:36:41 -0000	1.8
@@ -1 +1 @@
-zenity-2.15.91.tar.bz2
+zenity-2.15.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Aug 2006 22:55:33 -0000	1.7
+++ sources	21 Aug 2006 13:36:41 -0000	1.8
@@ -1 +1 @@
-51f3d70e72c25c8c77275362e2fa45e9  zenity-2.15.91.tar.bz2
+88b3447b46790b24e7904d494aa41496  zenity-2.15.92.tar.bz2


Index: zenity.spec
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- zenity.spec	12 Aug 2006 22:55:33 -0000	1.14
+++ zenity.spec	21 Aug 2006 13:36:41 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           zenity
-Version:        2.15.91
+Version:        2.15.92
 Release:        1%{?dist}
 Summary: 	Display dialog boxes from shell scripts
 Group:  	Applications/System 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 13:42:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 09:42:48 -0400
Subject: rpms/gnome-keyring/devel .cvsignore, 1.17, 1.18 gnome-keyring.spec,
	1.27, 1.28 sources, 1.17, 1.18
Message-ID: <200608211342.k7LDgmeo015762@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-keyring/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15712

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
0.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Jun 2006 14:22:41 -0000	1.17
+++ .cvsignore	21 Aug 2006 13:42:45 -0000	1.18
@@ -1 +1 @@
-gnome-keyring-0.5.1.tar.bz2
+gnome-keyring-0.5.2.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-keyring.spec	12 Jul 2006 05:59:15 -0000	1.27
+++ gnome-keyring.spec	21 Aug 2006 13:42:45 -0000	1.28
@@ -2,8 +2,8 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 0.5.1
-Release: 1.1
+Version: 0.5.2
+Release: 1%{?dist}
 License: GPL/LGPL
 Group: System Environment/Libraries
 Source: gnome-keyring-%{version}.tar.bz2
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-doc/html/gnome-keyring/
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.2-1.fc6
+- Update to 0.5.2
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	13 Jun 2006 14:22:42 -0000	1.17
+++ sources	21 Aug 2006 13:42:45 -0000	1.18
@@ -1 +1 @@
-63e3614d864198d7793b1dba9189e992  gnome-keyring-0.5.1.tar.bz2
+19b9fb4330ebbfdd22e63006a49ae3f7  gnome-keyring-0.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 13:56:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 09:56:05 -0400
Subject: rpms/xorg-x11-drv-i810/devel i810.xinf, 1.6,
	1.7 xorg-x11-drv-i810.spec, 1.37, 1.38
Message-ID: <200608211356.k7LDu55Q003532@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3503

Modified Files:
	i810.xinf xorg-x11-drv-i810.spec 
Log Message:
* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-4.fc6
- i810.xinf: PCI IDs for i965.



Index: i810.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/i810.xinf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- i810.xinf	17 Aug 2006 15:55:11 -0000	1.6
+++ i810.xinf	21 Aug 2006 13:56:02 -0000	1.7
@@ -24,6 +24,10 @@
 
 alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* i810	# 945G
 alias pcivideo:v00008086d000027A2sv*sd*bc*sc*i* i810	# 945GM
+alias pcivideo:v00008086d00002972sv*sd*bc*sc*i* i810	# 946GZ
+alias pcivideo:v00008086d00002982sv*sd*bc*sc*i* i810	# 965G1
+alias pcivideo:v00008086d00002992sv*sd*bc*sc*i* i810	# 965Q
+alias pcivideo:v00008086d000029A2sv*sd*bc*sc*i* i810	# 965G
 alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* i810	# i830
 alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* i810	# 855GM
 alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* i810	# i810


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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xorg-x11-drv-i810.spec	17 Aug 2006 15:55:11 -0000	1.37
+++ xorg-x11-drv-i810.spec	21 Aug 2006 13:56:02 -0000	1.38
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   1.6.5
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -109,6 +109,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-4.fc6
+- i810.xinf: PCI IDs for i965.
+
 * Thu Aug 17 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-3.fc6
 - i810.xinf: Uppercase PCI IDs.
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 13:57:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 09:57:35 -0400
Subject: rpms/gnopernicus/devel .cvsignore, 1.32, 1.33 gnopernicus.spec, 1.46,
	1.47 sources, 1.33, 1.34
Message-ID: <200608211357.k7LDvZVI004171@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnopernicus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4120

Modified Files:
	.cvsignore gnopernicus.spec sources 
Log Message:
1.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	2 Aug 2006 23:05:52 -0000	1.32
+++ .cvsignore	21 Aug 2006 13:57:33 -0000	1.33
@@ -1 +1 @@
-gnopernicus-1.1.1.tar.bz2
+gnopernicus-1.1.2.tar.bz2


Index: gnopernicus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/gnopernicus.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnopernicus.spec	2 Aug 2006 23:05:52 -0000	1.46
+++ gnopernicus.spec	21 Aug 2006 13:57:33 -0000	1.47
@@ -1,6 +1,6 @@
 Summary: GNOME screen reader
 Name: gnopernicus
-Version: 1.1.1
+Version: 1.1.2
 Release: 1%{?dist}
 License: LGPL
 Group: Desktop/Accessibility
@@ -116,6 +116,9 @@
 %{_includedir}/gnopernicus-1.0
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.1.2-1.fc6
+- Update to 1.1.2
+
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1.1.1-1.fc6
 - Update to 1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	2 Aug 2006 23:05:52 -0000	1.33
+++ sources	21 Aug 2006 13:57:33 -0000	1.34
@@ -1 +1 @@
-e691c408de4ca885a3589a0b6fa297be  gnopernicus-1.1.1.tar.bz2
+64677df8961a68a73003393166f710bd  gnopernicus-1.1.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 14:08:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 10:08:50 -0400
Subject: rpms/mesa/FC-5 mesa.spec, 1.50, 1.51 redhat-mesa-driver-install, 1.5,
	1.6
Message-ID: <200608211408.k7LE8orm006763@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6729

Modified Files:
	mesa.spec redhat-mesa-driver-install 
Log Message:
* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 6.4.2-6.fc5.4
- redhat-mesa-driver-install: Install the tdfx driver too. (#203295)
- Use dist tag in Release field.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/FC-5/mesa.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- mesa.spec	26 Jun 2006 12:39:58 -0000	1.50
+++ mesa.spec	21 Aug 2006 14:08:47 -0000	1.51
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.4.2
-Release: 6.FC5.3
+Release: 6%{?dist}.4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -454,6 +454,10 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 6.4.2-6.fc5.4
+- redhat-mesa-driver-install: Install the tdfx driver too. (#203295)
+- Use dist tag in Release field.
+
 * Mon Jun 26 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-6.FC5.3
 - Added mesa-6.4.2-64bit-fix-bug190245.patch to fix numerous bug reports on
   x86_64 including (#190245,185929,187603,185727,189730)


Index: redhat-mesa-driver-install
===================================================================
RCS file: /cvs/dist/rpms/mesa/FC-5/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	21 Aug 2006 14:08:47 -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 radeon savage sis unichrome tdfx"
+DRI_DRIVERS_x86_64="i810 i830 i915 mga r128 r200 radeon savage sis unichrome tdfx"
+DRI_DRIVERS_ppc="mga r128 r200 radeon tdfx"
+DRI_DRIVERS_ia64="i810 i830 i915 mga r128 r200 radeon tdfx"
+DRI_DRIVERS_alpha="mga r128 r200 radeon tdfx"
 
 # Current build architecture, passed by rpm spec
 if [ $# -lt 1 ] ; then



From fedora-cvs-commits at redhat.com  Mon Aug 21 14:09:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 10:09:46 -0400
Subject: rpms/libvirt/devel network.patch,NONE,1.1 libvirt.spec,1.23,1.24
Message-ID: <200608211409.k7LE9kCW006981@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6917

Modified Files:
	libvirt.spec 
Added Files:
	network.patch 
Log Message:
Added fix for network on non-hvm guests, daniel


network.patch:
 xml.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE network.patch ---
Index: src/xml.c
===================================================================
RCS file: /data/cvs/libxen/src/xml.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- src/xml.c	17 Aug 2006 18:39:32 -0000	1.35
+++ src/xml.c	18 Aug 2006 20:20:50 -0000	1.36
@@ -967,7 +967,7 @@
  * Returns 0 in case of success, -1 in case of error.
  */
 static int
-virDomainParseXMLIfDesc(xmlNodePtr node, virBufferPtr buf)
+virDomainParseXMLIfDesc(xmlNodePtr node, virBufferPtr buf, int hvm)
 {
     xmlNodePtr cur;
     xmlChar *type = NULL;
@@ -1016,7 +1016,8 @@
     }
     if (script != NULL)
         virBufferVSprintf(buf, "(script '%s')", script);
-    virBufferAdd(buf, "(type ioemu)", 12);
+    if (hvm)
+        virBufferAdd(buf, "(type ioemu)", 12);
 
     virBufferAdd(buf, ")", 1);
     if (mac != NULL)
@@ -1210,8 +1211,7 @@
         (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) {
         for (i = 0; i < obj->nodesetval->nodeNr; i++) {
             virBufferAdd(&buf, "(device ", 8);
-            res =
-                virDomainParseXMLIfDesc(obj->nodesetval->nodeTab[i], &buf);
+            res = virDomainParseXMLIfDesc(obj->nodesetval->nodeTab[i], &buf, hvm);
             if (res != 0) {
                 goto error;
             }


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libvirt.spec	17 Aug 2006 17:47:37 -0000	1.23
+++ libvirt.spec	21 Aug 2006 14:09:44 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
 Version: 0.1.4
-Release: 2
+Release: 3
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -19,6 +19,7 @@
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64 ia64
 Patch0: uuid_parse.patch
+Patch1: network.patch
 
 %description
 This C library provides an API to use the Xen virtualization framework,
@@ -49,6 +50,7 @@
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %configure
@@ -109,6 +111,9 @@
 %doc docs/examples/python
 
 %changelog
+* Mon Aug 21 2006 Daniel Veillard <veillard at redhat.com> 0.1.4-3
+- another patch to fix network handling in non-HVM guests
+
 * Thu Aug 17 2006 Daniel Veillard <veillard at redhat.com> 0.1.4-2
 - patch to fix virParseUUID()
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 14:20:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 10:20:47 -0400
Subject: rpms/gtkhtml3/devel .cvsignore, 1.39, 1.40 gtkhtml3.spec, 1.69,
	1.70 sources, 1.39, 1.40
Message-ID: <200608211420.k7LEKktT025420@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25319

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:

* Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.92-1.fc6
- Update to 3.11.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	7 Aug 2006 20:47:49 -0000	1.39
+++ .cvsignore	21 Aug 2006 14:20:44 -0000	1.40
@@ -1 +1 @@
-gtkhtml-3.11.91.tar.bz2
+gtkhtml-3.11.92.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gtkhtml3.spec	18 Aug 2006 18:32:14 -0000	1.69
+++ gtkhtml3.spec	21 Aug 2006 14:20:44 -0000	1.70
@@ -5,8 +5,8 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.11.91
-Release: 2%{?dist}
+Version: 3.11.92
+Release: 1%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
 Summary: gtkhtml library
@@ -112,6 +112,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.92-1.fc6
+- Update to 3.11.92
+
 * Fri Aug 18 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.91-2.fc6
 - Add patch for RH bug #202409.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	7 Aug 2006 20:47:49 -0000	1.39
+++ sources	21 Aug 2006 14:20:44 -0000	1.40
@@ -1 +1 @@
-e1c38c3c12371281895353e25757b959  gtkhtml-3.11.91.tar.bz2
+382767e3de3b0f2633bdccfbecb86ec6  gtkhtml-3.11.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 14:38:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 10:38:13 -0400
Subject: rpms/iputils/devel iputils-20020927-trace_stop.patch, 1.1,
	1.2 iputils.spec, 1.40, 1.41
Message-ID: <200608211438.k7LEcDlc030156@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/iputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30121

Modified Files:
	iputils-20020927-trace_stop.patch iputils.spec 
Log Message:
* Mon Aug 21 2006 Martin Bacovsky <mbacovsk at redhat.com>
- tracepath doesn't continue past destination host (#174032)
  previous patch replaced by new one provided by <mildew at gmail.com>
  option -c added


iputils-20020927-trace_stop.patch:
 doc/tracepath.8    |    5 +++--
 doc/tracepath.sgml |    3 ++-
 tracepath.c        |   18 +++++++++++++++---
 3 files changed, 20 insertions(+), 6 deletions(-)

Index: iputils-20020927-trace_stop.patch
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils-20020927-trace_stop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iputils-20020927-trace_stop.patch	10 Jul 2006 07:33:23 -0000	1.1
+++ iputils-20020927-trace_stop.patch	21 Aug 2006 14:37:59 -0000	1.2
@@ -1,64 +1,105 @@
---- iputils/tracepath.c.orig-mildew	2006-06-24 03:18:31.000000000 +0200
-+++ iputils/tracepath.c	2006-06-24 16:25:14.000000000 +0200
-@@ -76,6 +76,7 @@
- 	int sndhops;
- 	int progress = -1;
- 	int broken_router;
-+	int target_answ = 0;
- 	
- restart:
- 	memset(&rcvbuf, -1, sizeof(rcvbuf));
-@@ -141,6 +142,9 @@
- 		struct sockaddr_in *sin = (struct sockaddr_in*)(e+1);
+--- iputils/tracepath.c.orig	2006-07-07 20:09:21.000000000 +0200
++++ iputils/tracepath.c	2006-07-10 04:47:17.000000000 +0200
+@@ -41,6 +41,8 @@
+ int hops_to = -1;
+ int hops_from = -1;
+ int no_resolve = 0;
++int cmp_host = 0;
++int target_answ = 0;
+ 
+ struct probehdr
+ {
+@@ -142,6 +144,9 @@
  
  		inet_ntop(AF_INET, &sin->sin_addr, abuf, sizeof(abuf));
-+		
-+		if (sin->sin_addr.s_addr == target.sin_addr.s_addr)
-+			target_answ = 1;
  
++		if (cmp_host && sin->sin_addr.s_addr == target.sin_addr.s_addr)
++		  target_answ = 1;
++
  		if (sndhops>0)
  			printf("%2d:  ", sndhops);
-@@ -188,6 +192,17 @@
- 		mtu = e->ee_info;
+ 		else
+@@ -179,6 +184,9 @@
+ 			printf("(This broken router returned corrupted payload) ");
+ 	}
+ 
++	if (target_answ)
++	  goto reached;
++
+ 	switch (e->ee_errno) {
+ 	case ETIMEDOUT:
+ 		printf("\n");
+@@ -189,6 +197,7 @@
  		progress = mtu;
  		break;
-+	case EHOSTUNREACH:
-+		if (!target_answ) {
-+			if (e->ee_origin == SO_EE_ORIGIN_ICMP &&
-+			    e->ee_type == 11 &&
-+		   	    e->ee_code == 0) {
-+		   	    	printf("\n");
-+		   	    	break;
-+			}
-+			printf("!H\n");
-+			return 0;
-+		}
  	case ECONNREFUSED:
++	reached:
  		printf("reached\n");
  		hops_to = sndhops<0 ? ttl : sndhops;
-@@ -196,15 +211,7 @@
- 	case EPROTO:
- 		printf("!P\n");
- 		return 0;
--	case EHOSTUNREACH:
--		if (e->ee_origin == SO_EE_ORIGIN_ICMP &&
--		    e->ee_type == 11 &&
--		    e->ee_code == 0) {
--			printf("\n");
--			break;
--		}
--		printf("!H\n");
--		return 0;
-+
- 	case ENETUNREACH:
- 		printf("!N\n");
- 		return 0;
-@@ -319,7 +326,7 @@
+ 		hops_from = rethops;
+@@ -265,7 +274,7 @@
+ 
+ static void usage(void)
+ {
+-	fprintf(stderr, "Usage: tracepath [-n] <destination>[/<port>]\n");
++	fprintf(stderr, "Usage: tracepath [-nc] <destination>[/<port>]\n");
+ 	exit(-1);
+ }
+ 
+@@ -279,11 +288,14 @@
+ 	int ch;
+ 	struct addrinfo hints, *res;
+ 
+-	while ((ch = getopt(argc, argv, "nh?")) != EOF) {
++	while ((ch = getopt(argc, argv, "nch?")) != EOF) {
+ 		switch(ch) {
+ 		case 'n':	
+ 			no_resolve = 1;
+ 			break;
++		case 'c':
++			cmp_host = 1;
++			break;
+ 		default: ;	
+ 		}
+ 	}
+@@ -319,7 +331,7 @@
  	if (p) 
  		base_port = atoi(p+1);
  	else
 -		base_port = 44444;
-+		base_port = 33434; // IANA assigned port
++		base_port = 33434; // IANA assigned
  
  	on = IP_PMTUDISC_DO;
  	if (setsockopt(fd, SOL_IP, IP_MTU_DISCOVER, &on, sizeof(on))) {
+--- iputils/doc/tracepath.8.orig	2006-07-08 20:02:40.000000000 +0200
++++ iputils/doc/tracepath.8	2006-07-08 20:11:50.000000000 +0200
+@@ -8,14 +8,15 @@
+ tracepath, tracepath6 \- traces path to a network host discovering MTU along this path
+ .SH SYNOPSIS
+ 
+-\fBtracepath\fR \fB\fIdestination\fB\fR [ \fB\fIport\fB\fR] 
++\fBtracepath\fR [\fB-nc\fR] <\fB\fIdestination\fB\fR>[/<\fB\fIport\fB\fR>] 
+ 
+ .SH "DESCRIPTION"
+ .PP
+ It traces path to \fIdestination\fR discovering MTU along this path.
+ It uses UDP port \fIport\fR or some random port.
+ It is similar to \fBtraceroute\fR, only does not not require superuser
+-privileges and has no fancy options.
++privileges. Option \fB-c\fR causes tracepath to use the return address instead
++of the reply type (connection refused) to determine when to stop.
+ .PP
+ \fBtracepath6\fR is good replacement for \fBtraceroute6\fR
+ and classic example of application of Linux error queues.
+--- iputils/doc/tracepath.sgml.orig	2006-07-08 20:16:16.000000000 +0200
++++ iputils/doc/tracepath.sgml	2006-07-08 20:16:16.000000000 +0200
+@@ -25,7 +25,8 @@
+ It traces path to <replaceable/destination/ discovering MTU along this path.
+ It uses UDP port <replaceable/port/ or some random port.
+ It is similar to <command/traceroute/, only does not not require superuser
+-privileges and has no fancy options.
++privileges. Option -c causes tracepath to use the return address instead of
++the reply type (connection refused) to determine when to stop.
+ </para>
+ 
+ <para>


Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- iputils.spec	17 Jul 2006 14:38:37 -0000	1.40
+++ iputils.spec	21 Aug 2006 14:38:00 -0000	1.41
@@ -170,6 +170,11 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Mon Aug 21 2006 Martin Bacovsky <mbacovsk at redhat.com>
+- tracepath doesn't continue past destination host (#174032) 
+  previous patch replaced by new one provided by <mildew at gmail.com>
+  option -c added
+
 * Mon Jul 17 2006 Radek Vokal <rvokal at redhat.com> - 20020927-39
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 14:43:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 10:43:52 -0400
Subject: rpms/iputils/devel iputils.spec,1.41,1.42
Message-ID: <200608211443.k7LEhqw7008768@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/iputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11313

Modified Files:
	iputils.spec 
Log Message:
* Mon Aug 21 2006 Martin Bacovsky <mbacovsk at redhat.com>
- spec build update



Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- iputils.spec	21 Aug 2006 14:38:00 -0000	1.41
+++ iputils.spec	21 Aug 2006 14:43:50 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20020927
-Release: 39
+Release: 40
 License: BSD
 Group: System Environment/Daemons
 Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
@@ -170,7 +170,7 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
-* Mon Aug 21 2006 Martin Bacovsky <mbacovsk at redhat.com>
+* Mon Aug 21 2006 Martin Bacovsky <mbacovsk at redhat.com> - 20020927-40 
 - tracepath doesn't continue past destination host (#174032) 
   previous patch replaced by new one provided by <mildew at gmail.com>
   option -c added



From fedora-cvs-commits at redhat.com  Mon Aug 21 14:56:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 10:56:37 -0400
Subject: rpms/mesa/devel mesa.spec, 1.87, 1.88 redhat-mesa-driver-install,
	1.8, 1.9
Message-ID: <200608211456.k7LEub7W024182@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24168

Modified Files:
	mesa.spec redhat-mesa-driver-install 
Log Message:
* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 6.5-23.20060818cvs.fc6
- redhat-mesa-driver-install: Reenable installing the tdfx driver. (#203295)



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- mesa.spec	18 Aug 2006 22:10:39 -0000	1.87
+++ mesa.spec	21 Aug 2006 14:56:35 -0000	1.88
@@ -1,14 +1,4 @@
-#!/bin/bash
-# NOTE: Yes, this spec file is a horrible mess.  Mesa's buildsystem
-# currently leaves a lot to be desired, so we hack around it in the rpm
-# spec file with various hacks and kludges, which are further complicated
-# by needing it to build on all 7 RHEL/Fedora architectures, with and
-# without DRI enabled via conditional.  Lots of fun.  Patches to improve
-# either Mesa, or the spec file are welcome bugzilla submissions however.
-
-# NOTE: Build target macros:  For now, we will just use build_fc and
-# build_rhel to simplify things, until there is a reason to break it
-# into per-release macros.  Only 1 of these macros should be enabled.
+# Choose one and only one.
 %define build_fc	1
 %define build_rhel	0
 
@@ -46,7 +36,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 22.%{snapshot}cvs%{?dist}
+Release: 23.%{snapshot}cvs%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -437,23 +427,6 @@
 # make our script unnecessary, we might want to change to an explicit file
 # manifest here in the future.
 %{_libdir}/dri/*_dri.so
-# NOTE: Documentive list of all DRI drivers built by default in Mesa 6.4.1
-#%{_libdir}/dri/ffb_dri.so
-#%{_libdir}/dri/i810_dri.so
-#%{_libdir}/dri/i830_dri.so
-#%{_libdir}/dri/i915_dri.so
-#%{_libdir}/dri/mach64_dri.so
-#%{_libdir}/dri/mga_dri.so
-#%{_libdir}/dri/r128_dri.so
-#%{_libdir}/dri/r200_dri.so
-#%{_libdir}/dri/r300_dri.so
-#%{_libdir}/dri/radeon_dri.so
-#%{_libdir}/dri/s3v_dri.so
-#%{_libdir}/dri/savage_dri.so
-#%{_libdir}/dri/sis_dri.so
-#%{_libdir}/dri/tdfx_dri.so
-#%{_libdir}/dri/trident_dri.so
-#%{_libdir}/dri/unichrome_dri.so
 %endif
 
 %files libGL-devel
@@ -531,6 +504,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 6.5-23.20060818cvs.fc6
+- redhat-mesa-driver-install: Reenable installing the tdfx driver. (#203295)
+
 * Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.5-22.20060818cvs.fc6
 - Update to pre-6.5.1 snapshot.
 - Re-add libOSMesa{,16,32}. (#186366)


Index: redhat-mesa-driver-install
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/redhat-mesa-driver-install,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- redhat-mesa-driver-install	18 Aug 2006 19:52:19 -0000	1.8
+++ redhat-mesa-driver-install	21 Aug 2006 14:56:35 -0000	1.9
@@ -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 i915 i965 mga r128 r200 r300 radeon savage sis unichrome"
-DRI_DRIVERS_x86_64="i810 i915 i965 mga r128 r200 r300 radeon savage sis unichrome"
-DRI_DRIVERS_ppc="mga r128 r200 r300 radeon"
-DRI_DRIVERS_ia64="i810 i915 mga r128 r200 r300 radeon"
-DRI_DRIVERS_alpha="mga r128 r200 r300 radeon"
+DRI_DRIVERS_x86="i810 i915 i965 mga r128 r200 r300 radeon savage sis tdfx unichrome"
+DRI_DRIVERS_x86_64="i810 i915 i965 mga r128 r200 r300 radeon savage sis tdfx unichrome"
+DRI_DRIVERS_ppc="mga r128 r200 r300 radeon tdfx"
+DRI_DRIVERS_ia64="i810 i915 mga r128 r200 r300 radeon tdfx"
+DRI_DRIVERS_alpha="mga r128 r200 r300 radeon tdfx"
 
 # Current build architecture, passed by rpm spec
 if [ $# -lt 1 ] ; then



From fedora-cvs-commits at redhat.com  Mon Aug 21 14:58:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 10:58:02 -0400
Subject: rpms/kdebase/devel kdebase-3.5.4-konsole-bz#203221.patch, NONE,
	1.1 kdebase.spec, 1.213, 1.214
Message-ID: <200608211458.k7LEw259024280@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24262

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-konsole-bz#203221.patch 
Log Message:
fix #203221, konsole does not display bold characters


kdebase-3.5.4-konsole-bz#203221.patch:
 TEScreen.cpp |    2 +-
 TEWidget.cpp |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.4-konsole-bz#203221.patch ---
Index: konsole/konsole/TEScreen.cpp
===================================================================
--- konsole/konsole/TEScreen.cpp	(Revision 570193)
+++ konsole/konsole/TEScreen.cpp	(Revision 570194)
@@ -501,7 +501,7 @@
 void TEScreen::effectiveRendition()
 // calculate rendition
 {
-  ef_re = cu_re & (RE_UNDERLINE | RE_BLINK);
+  ef_re = cu_re & (RE_UNDERLINE | RE_BLINK | RE_BOLD);
   if (cu_re & RE_REVERSE)
   {
     ef_fg = cu_bg;
Index: konsole/konsole/TEWidget.cpp
===================================================================
--- konsole/konsole/TEWidget.cpp	(Revision 570193)
+++ konsole/konsole/TEWidget.cpp	(Revision 570194)
@@ -677,6 +677,18 @@
   }
 
   // Paint text
+  if (attr->r & RE_BOLD)
+  {
+    QFont currentFont = paint.font();
+    currentFont.setBold(true);
+    paint.setFont( currentFont );
+  } else {
+    QFont currentFont = paint.font();
+    currentFont.setBold(false);
+    paint.setFont( currentFont );
+  }
+
+
   if (!(blinking && (attr->r & RE_BLINK)))
   {
     // ### Disabled for now, since it causes problems with characters


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- kdebase.spec	18 Aug 2006 15:43:00 -0000	1.213
+++ kdebase.spec	21 Aug 2006 14:58:00 -0000	1.214
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -58,6 +58,7 @@
 Patch100: kdebase-3.5.4-halbackend-dbus.patch
 Patch101: kdebase-3.5.4-kde#128552.patch
 Patch102: kdebase-3.5.4-kde#124116.patch
+Patch103: kdebase-3.5.4-konsole-bz#203221.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -167,6 +168,7 @@
 %patch100 -p0 -b .halbackend-dbus
 %patch101 -p0 -b .kde#128552
 %patch102 -p0 -b .kde#124116
+%patch103 -p0 -b .bz#203221
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -536,6 +538,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Mon Aug 21 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
+- fix #203221, konsole does not display bold characters
+
 * Fri Aug 18 2006 Than Ngo <than at redhat.com> 6:3.5.4-3
 - fix #203083, correct htdig settings
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 15:12:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 11:12:23 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.4-kde#124116.patch, NONE,
	1.1 kdebase-3.5.4-konsole-bz#203221.patch, NONE,
	1.1 kdebase.spec, 1.179, 1.180
Message-ID: <200608211512.k7LFCN2g003148@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3089

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-kde#124116.patch 
	kdebase-3.5.4-konsole-bz#203221.patch 
Log Message:
- fix #203221, konsole does not display bold characters
- fix #203083, correct htdig settings
- apply upstream patch to fix argument quoting


kdebase-3.5.4-kde#124116.patch:
 main.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.4-kde#124116.patch ---
Index: ksystraycmd/main.cpp
===================================================================
--- ksystraycmd/main.cpp	(Revision 572102)
+++ ksystraycmd/main.cpp	(Revision 572103)
@@ -5,6 +5,7 @@
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
+#include <kprocess.h>
 
 #include "ksystraycmd.h"
 
@@ -94,7 +95,7 @@
   // Read the command
   QString command;
   for ( int i = 0; i < args->count(); i++ )
-    command += QCString( args->arg(i) ) + " ";
+    command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " ";
   if ( !command.isEmpty() )
       cmd.setCommand( command );
 

kdebase-3.5.4-konsole-bz#203221.patch:
 TEScreen.cpp |    2 +-
 TEWidget.cpp |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.4-konsole-bz#203221.patch ---
Index: konsole/konsole/TEScreen.cpp
===================================================================
--- konsole/konsole/TEScreen.cpp	(Revision 570193)
+++ konsole/konsole/TEScreen.cpp	(Revision 570194)
@@ -501,7 +501,7 @@
 void TEScreen::effectiveRendition()
 // calculate rendition
 {
-  ef_re = cu_re & (RE_UNDERLINE | RE_BLINK);
+  ef_re = cu_re & (RE_UNDERLINE | RE_BLINK | RE_BOLD);
   if (cu_re & RE_REVERSE)
   {
     ef_fg = cu_bg;
Index: konsole/konsole/TEWidget.cpp
===================================================================
--- konsole/konsole/TEWidget.cpp	(Revision 570193)
+++ konsole/konsole/TEWidget.cpp	(Revision 570194)
@@ -677,6 +677,18 @@
   }
 
   // Paint text
+  if (attr->r & RE_BOLD)
+  {
+    QFont currentFont = paint.font();
+    currentFont.setBold(true);
+    paint.setFont( currentFont );
+  } else {
+    QFont currentFont = paint.font();
+    currentFont.setBold(false);
+    paint.setFont( currentFont );
+  }
+
+
   if (!(blinking && (attr->r & RE_BLINK)))
   {
     // ### Disabled for now, since it causes problems with characters


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- kdebase.spec	11 Aug 2006 18:48:31 -0000	1.179
+++ kdebase.spec	21 Aug 2006 15:12:20 -0000	1.180
@@ -53,6 +53,8 @@
 # upstream patches
 Patch100: kdebase-3.5.4-halbackend-dbus.patch
 Patch101: kdebase-3.5.4-kde#128552.patch
+Patch102: kdebase-3.5.4-kde#124116.patch
+Patch103: kdebase-3.5.4-konsole-bz#203221.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -160,6 +162,8 @@
 # upstream patches
 %patch100 -p0 -b .halbackend-dbus
 %patch101 -p0 -b .kde#128552
+%patch102 -p0 -b .kde#124116
+%patch103 -p0 -b .bz#203221
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -522,6 +526,11 @@
 
 
 %changelog
+* Mon Aug 21 2006 Than Ngo <than at redhat.com> 3.5.4-0.2.fc5
+- fix #203221, konsole does not display bold characters
+- fix #203083, correct htdig settings
+- apply upstream patch to fix argument quoting
+
 * Fri Aug 11 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.2.fc5
 - fix BR
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 15:13:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 11:13:51 -0400
Subject: rpms/kdebase/FC-5 kdebase.spec,1.180,1.181
Message-ID: <200608211513.k7LFDpAU003573@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3274

Modified Files:
	kdebase.spec 
Log Message:
bump release 



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- kdebase.spec	21 Aug 2006 15:12:20 -0000	1.180
+++ kdebase.spec	21 Aug 2006 15:13:49 -0000	1.181
@@ -16,7 +16,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 0.2.fc5
+Release: 0.3.fc5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -526,7 +526,7 @@
 
 
 %changelog
-* Mon Aug 21 2006 Than Ngo <than at redhat.com> 3.5.4-0.2.fc5
+* Mon Aug 21 2006 Than Ngo <than at redhat.com> 3.5.4-0.3.fc5
 - fix #203221, konsole does not display bold characters
 - fix #203083, correct htdig settings
 - apply upstream patch to fix argument quoting



From fedora-cvs-commits at redhat.com  Mon Aug 21 15:16:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 11:16:22 -0400
Subject: rpms/evolution-data-server/devel .cvsignore, 1.50,
	1.51 evolution-data-server.spec, 1.115, 1.116 sources, 1.50, 1.51
Message-ID: <200608211516.k7LFGMiK005653@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4219

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:

* Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.92-1
- Update to 1.7.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	7 Aug 2006 20:17:14 -0000	1.50
+++ .cvsignore	21 Aug 2006 15:16:19 -0000	1.51
@@ -1 +1 @@
-evolution-data-server-1.7.91.tar.bz2
+evolution-data-server-1.7.92.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- evolution-data-server.spec	16 Aug 2006 20:22:27 -0000	1.115
+++ evolution-data-server.spec	21 Aug 2006 15:16:19 -0000	1.116
@@ -21,8 +21,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.7.91
-Release: 3%{?dist}
+Version: 1.7.92
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -329,6 +329,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.92-1
+- Update to 1.7.92
+
 * Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> - 1.7.91-3
 - Add fix from Matthias Clasen that might help bug 202309.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	7 Aug 2006 20:17:14 -0000	1.50
+++ sources	21 Aug 2006 15:16:19 -0000	1.51
@@ -1 +1 @@
-384f2bd20966f175fc18e6d1903fe040  evolution-data-server-1.7.91.tar.bz2
+e5cf9b7317b9b495e15b18586cacda6c  evolution-data-server-1.7.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 15:18:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 11:18:39 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.19, 1.20 setroubleshoot.init,
	1.5, 1.6 setroubleshoot.spec, 1.24, 1.25 sources, 1.22, 1.23
Message-ID: <200608211518.k7LFIduE020573@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20532/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.25-1 on branch devel from setroubleshoot-0.25-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	20 Aug 2006 14:37:32 -0000	1.19
+++ .cvsignore	21 Aug 2006 15:18:36 -0000	1.20
@@ -1 +1 @@
-setroubleshoot-0.24.tar.gz
+setroubleshoot-0.25.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setroubleshoot.init	10 Aug 2006 12:27:33 -0000	1.5
+++ setroubleshoot.init	21 Aug 2006 15:18:36 -0000	1.6
@@ -26,43 +26,39 @@
 
 
 # Silently exit is SELinux is not enabled
-[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 0
+[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 1
 
 # Check that we are root ... so non-root users stop here
 test `id -u` = 0  || exit 4
 
-# Check config
-test -x /usr/sbin/setroubleshoot  || exit 5
-
 RETVAL=0
 
-prog="setroubleshoot"
-exe="setroubleshootd"
+prog="setroubleshootd"
 
 start(){
     echo -n $"Starting $prog: "
     unset HOME MAIL USER USERNAME
-    daemon $exe "$EXTRAOPTIONS"
+    daemon $prog "$EXTRAOPTIONS"
     RETVAL=$?
     echo
     if test $RETVAL = 0 ; then
-        touch /var/lock/subsys/setroubleshoot
+        touch /var/lock/subsys/$prog
     fi
     return $RETVAL
 }
 
 stop(){
     echo -n $"Stopping $prog: "
-    killproc $exe
+    killproc $prog
     RETVAL=$?
     echo
-    rm -f /var/lock/subsys/setroubleshoot
+    rm -f /var/lock/subsys/$prog
     return $RETVAL
 }
 
 reload(){
     echo -n $"Reloading configuration: "	
-    killproc $exe -HUP
+    killproc $prog -HUP
     RETVAL=$?
     echo
     return $RETVAL
@@ -74,7 +70,7 @@
 }
 
 condrestart(){
-    [ -e /var/lock/subsys/setroubleshoot ] && restart
+    [ -e /var/lock/subsys/$prog ] && restart
     return 0
 }
 
@@ -88,7 +84,7 @@
 	stop
 	;;
     status)
-	status $exe
+	status $prog
 	;;
     restart)
 	restart
@@ -100,7 +96,7 @@
 	condrestart
 	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|rotate}"
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
 	RETVAL=3
 esac
 


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- setroubleshoot.spec	20 Aug 2006 14:37:32 -0000	1.24
+++ setroubleshoot.spec	21 Aug 2006 15:18:36 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.24
+Version: 0.25
 Release: 1
 License: GPL
 Group: Applications/System
@@ -58,8 +58,10 @@
 make DESTDIR=%{buildroot} install
 %{__install} -D -m755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/%{name}
 %{__install} -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+touch %{buildroot}%{pkgvardatadir}/database.xml
 
 %post
+[ -f %{pkgvardatadir}/database.xml ] && chmod 644 %{pkgvardatadir}/database.xml
 /usr/bin/update-desktop-database %{_datadir}/applications
 /sbin/chkconfig --add %{name}
 /sbin/service %{name} condrestart >/dev/null 2>&1
@@ -92,12 +94,17 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %dir %{pkgrundir}
 %dir %{pkgvardatadir}
+%ghost %attr(0644,root,root) %{pkgvardatadir}/database.xml
+
 /etc/rc.d/init.d/%{name}
 %{_sysconfdir}/xdg/autostart/*
 #%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Mon Aug 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.25-1
+- Fix 64 bit issue that caused runaway problem
+
 * Sun Aug 20 2006 Dan Walsh <dwalsh at redhat.com> - 0.24-1
 - add missing runcmd
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	20 Aug 2006 14:37:32 -0000	1.22
+++ sources	21 Aug 2006 15:18:36 -0000	1.23
@@ -1 +1 @@
-cb87682917d9567396c8d61c98cac8b9  setroubleshoot-0.24.tar.gz
+adfbe964a43e47c7afbcf7102f01f6d8  setroubleshoot-0.25.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 21 15:20:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 11:20:14 -0400
Subject: rpms/system-config-display/devel .cvsignore, 1.30, 1.31 sources,
	1.37, 1.38 system-config-display.spec, 1.42, 1.43
Message-ID: <200608211520.k7LFKEVM021279@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/system-config-display/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21241/devel

Modified Files:
	.cvsignore sources system-config-display.spec 
Log Message:
auto-import system-config-display-1.0.42-1 on branch devel from system-config-display-1.0.42-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	3 Aug 2006 15:27:02 -0000	1.30
+++ .cvsignore	21 Aug 2006 15:20:12 -0000	1.31
@@ -1 +1 @@
-system-config-display-1.0.41.tar.bz2
+system-config-display-1.0.42.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	3 Aug 2006 15:27:02 -0000	1.37
+++ sources	21 Aug 2006 15:20:12 -0000	1.38
@@ -1 +1 @@
-fc32744253bf8294a72448ad979f9e17  system-config-display-1.0.41.tar.bz2
+747471ca99ca5e1a13d663923ea8d45c  system-config-display-1.0.42.tar.bz2


Index: system-config-display.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- system-config-display.spec	3 Aug 2006 15:27:02 -0000	1.42
+++ system-config-display.spec	21 Aug 2006 15:20:12 -0000	1.43
@@ -1,6 +1,6 @@
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
-Version: 1.0.41
+Version: 1.0.42
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -81,6 +81,9 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
 
 %changelog
+* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 1.0.42-1
+- Align lists correctly in RTL locales.  (#202754)
+
 * Thu Aug  3 2006 Bill Nottingham <notting at redhat.com> 1.0.41-1
 - adjust to new rhpxl (<clumens at redhat.com>)
 - work with newer, sparser, config files



From fedora-cvs-commits at redhat.com  Mon Aug 21 15:25:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 11:25:28 -0400
Subject: rpms/classpathx-mail/devel classpathx-mail.spec,1.23,1.24
Message-ID: <200608211525.k7LFPSNu023294@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/classpathx-mail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23053

Modified Files:
	classpathx-mail.spec 
Log Message:
- Merge with upstream
(Add postun; Fix javadoc unversioned link handling)




Index: classpathx-mail.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-mail/devel/classpathx-mail.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- classpathx-mail.spec	25 Jul 2006 16:06:54 -0000	1.23
+++ classpathx-mail.spec	21 Aug 2006 15:25:25 -0000	1.24
@@ -37,7 +37,7 @@
 
 Name:           classpathx-mail
 Version:        1.1.1
-Release:        3jpp_1fc
+Release:        4jpp.1
 Epoch:          0
 Summary:        GNU JavaMail(tm)
 
@@ -166,9 +166,9 @@
 ln -s classpathx-mail-%{jmailver}-monolithic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar
 touch $RPM_BUILD_ROOT%{_javadir}/javamail.jar # for %ghost
 
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/classpathx-mail-%{jmailver}
-cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/classpathx-mail-%{jmailver}
-ln -s classpathx-mail-%{jmailver} $RPM_BUILD_ROOT%{_javadocdir}/classpathx-mail
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{jmailver}
+cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{jmailver}
+ln -s %{name}-%{jmailver} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 
 %if %{gcj_support}
@@ -195,11 +195,28 @@
 fi
 %endif
 
+%if %{gcj_support}
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %preun
 if [ "$1" = "0" ]; then
     /usr/sbin/update-alternatives --remove javamail %{_javadir}/classpathx-mail-1.3.1-monolithic.jar
 fi
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{jmailver} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 
 %files
 %defattr(644,root,root,755)
@@ -233,11 +250,18 @@
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/classpathx-mail-%{jmailver}
-%doc %{_javadocdir}/classpathx-mail
+%doc %{_javadocdir}/%{name}-%{jmailver}
+%ghost %{_javadocdir}/%{name}
 
 
 %changelog
+* Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> 0:1.1.1-4jpp.1
+- Merge with upstream
+
+* Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> 0:1.1.1-4jpp
+- Add postun
+- Fix javadoc unversioned link handling
+
 * Tue Jul 25 2006 Fernando Nasser <fnasser at redhat.com> 0:1.1.1-3jpp_1fc
 - Merge with upstream
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 15:43:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 11:43:28 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.37, 1.38 gnome-vfs2.spec, 1.128,
	1.129 sources, 1.38, 1.39
Message-ID: <200608211543.k7LFhS7S028793@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28752

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
* Mon Aug 21 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92-1
- update to 2.15.92




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	10 Aug 2006 13:28:51 -0000	1.37
+++ .cvsignore	21 Aug 2006 15:43:26 -0000	1.38
@@ -1 +1 @@
-gnome-vfs-2.15.91.tar.bz2
+gnome-vfs-2.15.92.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- gnome-vfs2.spec	11 Aug 2006 15:14:30 -0000	1.128
+++ gnome-vfs2.spec	21 Aug 2006 15:43:26 -0000	1.129
@@ -12,8 +12,8 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.15.91
-Release: 2%{?dist}
+Version: 2.15.92
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -200,6 +200,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Aug 21 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92-1
+- update to 2.15.92
+
 * Fri Aug 11 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.91-2.fc6
 - Add patch for RH bug #197868.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	10 Aug 2006 13:28:51 -0000	1.38
+++ sources	21 Aug 2006 15:43:26 -0000	1.39
@@ -1 +1 @@
-60a7a63b8ecdc04d13f9f9de0714205a  gnome-vfs-2.15.91.tar.bz2
+0c29a32fb67d4fbb2580ac6b35432657  gnome-vfs-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 15:49:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 11:49:30 -0400
Subject: rpms/xml-commons/devel xml-commons.spec,1.37,1.38
Message-ID: <200608211549.k7LFnU5i013623@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/xml-commons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13555

Modified Files:
	xml-commons.spec 
Log Message:
Add missing Requires for post and postun javadoc sections




Index: xml-commons.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons/devel/xml-commons.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xml-commons.spec	22 Jul 2006 08:46:42 -0000	1.37
+++ xml-commons.spec	21 Aug 2006 15:49:27 -0000	1.38
@@ -4,7 +4,7 @@
 Summary:        Common code for XML projects
 Name:           xml-commons
 Version:        1.3.02
-Release: 	0.b2.7jpp_9fc
+Release: 	0.b2.7jpp.10
 Epoch:          0
 License:        Apache Software License
 URL:            http://xml.apache.org/commons/
@@ -62,7 +62,8 @@
 %package apis-javadoc
 Summary:        Javadoc for %{name}-api
 Group:          Development/Documentation
-Prereq: coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description apis-javadoc
 Javadoc for %{name}-apis.
@@ -70,7 +71,8 @@
 %package which-javadoc
 Summary:        Javadoc for %{name}-which
 Group:          Development/Documentation
-Prereq: coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description which-javadoc
 Javadoc for %{name}-which.
@@ -206,6 +208,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.3.02-0.b2.7jpp.10
+- Add missing Requires for post and postun javadoc sections
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.3.02-0.b2.7jpp_9fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 15:58:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 11:58:55 -0400
Subject: rpms/pirut/devel .cvsignore, 1.30, 1.31 pirut.spec, 1.31,
	1.32 sources, 1.31, 1.32
Message-ID: <200608211558.k7LFwtLS017260@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17219/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-1.1.9-1 on branch devel from pirut-1.1.9-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	31 Jul 2006 01:44:53 -0000	1.30
+++ .cvsignore	21 Aug 2006 15:58:53 -0000	1.31
@@ -1 +1 @@
-pirut-1.1.8.tar.gz
+pirut-1.1.9.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pirut.spec	31 Jul 2006 01:44:53 -0000	1.31
+++ pirut.spec	21 Aug 2006 15:58:53 -0000	1.32
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.1.8
+Version: 1.1.9
 Release: 1
 License: GPL
 Group: Applications/System
@@ -11,7 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pygtk2 >= 2.9.2
 Requires: pygtk2-libglade, yum >= 2.9.3, comps-extras, rhpl
-Requires: gnome-python2-gconf
+Requires: gnome-python2-gconf, notify-python
 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,15 @@
 
 
 %changelog
+* Mon Aug 21 2006 Jeremy Katz <katzj at redhat.com> - 1.1.9-1
+- Support from lmacken for displaying information from update metadata
+- Support from lmacken for using libnotify to give information about 
+  available updates in puplet
+- Fix focus grabbing (#202536)
+
+* Mon Aug 14 2006 Luke Macken <lmacken at redhat.com> - 1.1.8-2
+- Require notify-python
+
 * Sun Jul 30 2006 Jeremy Katz <katzj at redhat.com> - 1.1.8-1
 - Fix traceback (clumens, #200515)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	31 Jul 2006 01:44:53 -0000	1.31
+++ sources	21 Aug 2006 15:58:53 -0000	1.32
@@ -1 +1 @@
-f1e1460974b63f3a6541cebb7db927ae  pirut-1.1.8.tar.gz
+27072051c053fa95cb032d206493194b  pirut-1.1.9.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 21 16:01:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 12:01:55 -0400
Subject: rpms/geronimo-specs/devel geronimo-specs.spec,1.18,1.19
Message-ID: <200608211601.k7LG1tA7018292@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/geronimo-specs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18251

Modified Files:
	geronimo-specs.spec 
Log Message:
Rebuild




Index: geronimo-specs.spec
===================================================================
RCS file: /cvs/dist/rpms/geronimo-specs/devel/geronimo-specs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- geronimo-specs.spec	22 Jul 2006 08:38:44 -0000	1.18
+++ geronimo-specs.spec	21 Aug 2006 16:01:52 -0000	1.19
@@ -9,7 +9,7 @@
 
 Name:           geronimo-specs
 Version:        1.0
-Release: 	0.%{mstone}.2jpp_11fc
+Release: 	0.%{mstone}.2jpp.12
 Epoch:          0
 License:        Apache Software License 2
 Group:          Development/Libraries/Java
@@ -119,6 +119,9 @@
 %{_javadir}/*.jar
 
 %changelog
+* Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-0.M2.2jpp.12
+- Rebuild
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0-0.M2.2jpp_11fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 16:04:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 12:04:40 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.129,1.130
Message-ID: <200608211604.k7LG4emp019068@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18998

Modified Files:
	gnome-vfs2.spec 
Log Message:
Remove upstreamed patch



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- gnome-vfs2.spec	21 Aug 2006 15:43:26 -0000	1.129
+++ gnome-vfs2.spec	21 Aug 2006 16:04:38 -0000	1.130
@@ -59,9 +59,6 @@
 
 Patch4:  gnome-vfs-2.15.1-use-sys-inotify.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=349979
-Patch5: gnome-vfs-2.15.90-dbus-spew.patch
-
 # RH bug #197868
 Patch6: gnome-vfs-2.15.91-mailto-command.patch
 
@@ -106,8 +103,6 @@
 
 %patch4 -p1 -b .use-sys-inotify
 
-%patch5 -p1 -b .dbus-spew
-
 %patch6 -p1 -b .mailto-command
 
 # send to upstream



From fedora-cvs-commits at redhat.com  Mon Aug 21 16:24:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 12:24:06 -0400
Subject: rpms/util-linux/devel util-linux-login.pamd, NONE,
	1.1 util-linux-remote.pamd, NONE,
	1.1 util-linux-2.13-mount-context.patch, 1.1,
	1.2 util-linux.spec, 1.138, 1.139 util-linux-selinux.pamd, 1.7, NONE
Message-ID: <200608211624.k7LGO6uJ007604@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7560

Modified Files:
	util-linux-2.13-mount-context.patch util-linux.spec 
Added Files:
	util-linux-login.pamd util-linux-remote.pamd 
Removed Files:
	util-linux-selinux.pamd 
Log Message:
fc6/rhel5 fixes


--- NEW FILE util-linux-login.pamd ---
#%PAM-1.0
auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so
auth       include      system-auth
account    required     pam_nologin.so
account    include      system-auth
password   include      system-auth
# pam_selinux.so close should be the first session rule
session    required     pam_selinux.so close
session    include      system-auth
session    required     pam_loginuid.so
session    optional     pam_console.so
# pam_selinux.so open should only be followed by sessions to be executed in the user context
session    required     pam_selinux.so open
session    optional     pam_keyinit.so force revoke


--- NEW FILE util-linux-remote.pamd ---
#%PAM-1.0
auth       required     pam_securetty.so
auth       include      system-auth
account    required     pam_nologin.so
account    include      system-auth
password   include      system-auth
# pam_selinux.so close should be the first session rule
session    required     pam_selinux.so close
session    include      system-auth
session    required     pam_loginuid.so
session    optional     pam_console.so
# pam_selinux.so open should only be followed by sessions to be executed in the user context
session    required     pam_selinux.so open
session    optional     pam_keyinit.so force revoke

util-linux-2.13-mount-context.patch:
 Makefile.am |    3 ++
 mount.8     |   44 ++++++++++++++++++++++++++++++++++++++++
 mount.c     |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 110 insertions(+), 2 deletions(-)

Index: util-linux-2.13-mount-context.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.13-mount-context.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.13-mount-context.patch	12 Jun 2006 11:38:50 -0000	1.1
+++ util-linux-2.13-mount-context.patch	21 Aug 2006 16:24:02 -0000	1.2
@@ -1,63 +1,10 @@
 
  This patch adds to the mount man page docs about context, fscontext and
-defcontext mount options and translate context options from human to raw
-selinux context format.  -- 03/30/2006 Karel Zak <kzak at redhat.com> 
+ defcontext mount options and translate context options from human to raw
+ selinux context format.  -- 03/30/2006 Karel Zak <kzak at redhat.com>
 
---- util-linux-2.13-pre7/mount/mount.8.cxt	2006-03-30 17:15:06.000000000 +0200
-+++ util-linux-2.13-pre7/mount/mount.8	2006-03-30 17:15:06.000000000 +0200
-@@ -661,6 +661,50 @@
- .BR noexec ", " nosuid ", and " nodev
- (unless overridden by subsequent options, as in the option line
- .BR users,exec,dev,suid ).
-+.TP
-+\fBcontext=\fP\fIcontext\fP, \fBfscontext=\fP\fIcontext\fP and \fBdefcontext=\fP\fIcontext\fP
-+The 
-+.BR context= 
-+option is useful when mounting filesystems that do not support
-+extended attributes, such as a floppy or hard disk formatted with VFAT, or
-+systems that are not normally running under SELinux, such as an ext3 formatted
-+disk from a non-SELinux workstation. You can also use
-+.BR context= 
-+on filesystems you do not trust, such as a floppy. It also helps in compatibility with
-+xattr-supporting filesystems on earlier 2.4.<x> kernel versions. Even where
-+xattrs are supported, you can save time not having to label every file by
-+assigning the entire disk one security context.
-+
-+A commonly used option for removable media is 
-+.BR context=system_u:object_r:removable_t .
-+
-+Two other options are 
-+.BR fscontext= 
-+and 
-+.BR defcontext= ,
-+both of which are mutually exclusive of the context option. This means you
-+can use fscontext and defcontext with each other, but neither can be used with
-+context.
-+
-+The 
-+.BR fscontext= 
-+option works for all filesystems, regardless of their xattr
-+support. The fscontext option sets the overarching filesystem label to a
-+specific security context. This filesystem label is separate from the
-+individual labels on the files. It represents the entire filesystem for
-+certain kinds of permission checks, such as during mount or file creation.
-+Individual file labels are still obtained from the xattrs on the files
-+themselves. The context option actually sets the aggregate context that
-+fscontext provides, in addition to supplying the same label for individual
-+files.
-+
-+You can set the default security context for unlabeled files using 
-+.BR defcontext=
-+option. This overrides the value set for unlabeled files in the policy and requires a
-+file system that supports xattr labeling. 
-+
-+For more details see 
-+.BR selinux (8)
- .RE
- .TP
- .B \-\-bind
---- util-linux-2.13-pre7/mount/mount.c.cxt	2006-03-30 17:15:06.000000000 +0200
-+++ util-linux-2.13-pre7/mount/mount.c	2006-03-30 20:16:57.000000000 +0200
+--- util-linux-2.13-pre6/mount/mount.c.kzak	2006-08-21 11:51:50.000000000 +0200
++++ util-linux-2.13-pre6/mount/mount.c	2006-08-21 11:51:50.000000000 +0200
 @@ -21,6 +21,11 @@
  #include <sys/wait.h>
  #include <sys/mount.h>
@@ -151,3 +98,68 @@
  
  		*extra_opts = xmalloc(len); 
  		**extra_opts = '\0';
+--- util-linux-2.13-pre6/mount/mount.8.kzak	2006-08-21 11:51:50.000000000 +0200
++++ util-linux-2.13-pre6/mount/mount.8	2006-08-21 11:51:50.000000000 +0200
+@@ -660,6 +660,50 @@
+ .BR noexec ", " nosuid ", and " nodev
+ (unless overridden by subsequent options, as in the option line
+ .BR users,exec,dev,suid ).
++.TP
++\fBcontext=\fP\fIcontext\fP, \fBfscontext=\fP\fIcontext\fP and \fBdefcontext=\fP\fIcontext\fP
++The 
++.BR context= 
++option is useful when mounting filesystems that do not support
++extended attributes, such as a floppy or hard disk formatted with VFAT, or
++systems that are not normally running under SELinux, such as an ext3 formatted
++disk from a non-SELinux workstation. You can also use
++.BR context= 
++on filesystems you do not trust, such as a floppy. It also helps in compatibility with
++xattr-supporting filesystems on earlier 2.4.<x> kernel versions. Even where
++xattrs are supported, you can save time not having to label every file by
++assigning the entire disk one security context.
++
++A commonly used option for removable media is 
++.BR context=system_u:object_r:removable_t .
++
++Two other options are 
++.BR fscontext= 
++and 
++.BR defcontext= ,
++both of which are mutually exclusive of the context option. This means you
++can use fscontext and defcontext with each other, but neither can be used with
++context.
++
++The 
++.BR fscontext= 
++option works for all filesystems, regardless of their xattr
++support. The fscontext option sets the overarching filesystem label to a
++specific security context. This filesystem label is separate from the
++individual labels on the files. It represents the entire filesystem for
++certain kinds of permission checks, such as during mount or file creation.
++Individual file labels are still obtained from the xattrs on the files
++themselves. The context option actually sets the aggregate context that
++fscontext provides, in addition to supplying the same label for individual
++files.
++
++You can set the default security context for unlabeled files using 
++.BR defcontext=
++option. This overrides the value set for unlabeled files in the policy and requires a
++file system that supports xattr labeling. 
++
++For more details see 
++.BR selinux (8)
+ .RE
+ .TP
+ .B \-\-bind
+--- util-linux-2.13-pre6/mount/Makefile.am.kzak	2006-08-21 12:13:10.000000000 +0200
++++ util-linux-2.13-pre6/mount/Makefile.am	2006-08-21 12:13:03.000000000 +0200
+@@ -37,6 +37,9 @@
+ man_MANS += pivot_root.8
+ endif
+ 
++if HAVE_SELINUX
++mount_LDADD += -lselinux
++endif
+ 
+ swapon.c: swapargs.h
+ 


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- util-linux.spec	11 Aug 2006 06:41:23 -0000	1.138
+++ util-linux.spec	21 Aug 2006 16:24:02 -0000	1.139
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.39
+Release: 0.40
 License: distributable
 Group: System Environment/Base
 
@@ -47,8 +47,9 @@
 ### Sources
 # TODO [stable]: s/2.13-pre6/%{version}/
 Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-2.13-pre6.tar.bz2
-Source1: util-linux-selinux.pamd
-Source2: util-linux-chsh-chfn.pamd
+Source1: util-linux-login.pamd
+Source2: util-linux-remote.pamd
+Source3: util-linux-chsh-chfn.pamd
 Source8: nologin.c
 Source9: nologin.8
 Source11: http://download.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.gz
@@ -441,9 +442,9 @@
 { 
   pushd ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
   install -m 644 %{SOURCE1} ./login
-  install -m 644 %{SOURCE1} ./remote
-  install -m 644 %{SOURCE2} ./chsh
-  install -m 644 %{SOURCE2} ./chfn
+  install -m 644 %{SOURCE2} ./remote
+  install -m 644 %{SOURCE3} ./chsh
+  install -m 644 %{SOURCE3} ./chfn
   popd
 }
 
@@ -502,6 +503,13 @@
 	fi
 done
 
+# /usr/bin -> /bin
+for I in taskset; do
+	if [ -e $RPM_BUILD_ROOT/usr/bin/$I ]; then
+		mv $RPM_BUILD_ROOT/usr/bin/$I $RPM_BUILD_ROOT/bin/$I
+	fi
+done
+
 # omit info/dir file
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
@@ -545,6 +553,7 @@
 %attr(755,root,root)	/bin/login
 /bin/more
 /bin/kill
+/bin/taskset
 
 %config %{_sysconfdir}/pam.d/chfn
 %config %{_sysconfdir}/pam.d/chsh
@@ -580,7 +589,6 @@
 
 %{_bindir}/chrt
 %{_bindir}/ionice
-%{_bindir}/taskset
 
 %{_bindir}/cal
 %attr(4711,root,root)	%{_bindir}/chfn
@@ -722,6 +730,12 @@
 /sbin/losetup
 
 %changelog
+* Mon Aug 21 2006 Karel Zak <kzak at redhat.com> 2.13-0.40
+- fix Makefile.am in util-linux-2.13-mount-context.patch
+- fix #201343 - pam_securetty requires known user to work
+                (split PAM login configuration to two files)
+- fix #203358 - change location of taskset binary to allow for early affinity work
+
 * Fri Aug 11 2006 Karel Zak <kzak at redhat.com> 2.13-0.39
 - fix #199745 - non-existant simpleinit(8) mentioned in ctrlaltdel(8)
 


--- util-linux-selinux.pamd DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 21 16:26:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 12:26:30 -0400
Subject: rpms/cups/devel cups-lspp.patch,1.2,1.3 cups.spec,1.250,1.251
Message-ID: <200608211626.k7LGQU47008447@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8357

Modified Files:
	cups-lspp.patch cups.spec 
Log Message:
* Mon Aug 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-14
- Updated LSPP patch (bug #203376).


cups-lspp.patch:
 Makedefs.in                 |    2 
 config-scripts/cups-lspp.m4 |   36 +++++
 config.h.in                 |    7 +
 configure.in                |    2 
 cups/cups.h                 |    8 +
 data/Makefile               |    5 
 data/mls                    |  277 ++++++++++++++++++++++++++++++++++++++++++++
 data/selinux                |  277 ++++++++++++++++++++++++++++++++++++++++++++
 data/te                     |  277 ++++++++++++++++++++++++++++++++++++++++++++
 scheduler/Makefile          |    6 
 scheduler/client.c          |  101 +++++++++++++++-
 scheduler/client.h          |   14 ++
 scheduler/conf.c            |   46 +++++++
 scheduler/conf.h            |    8 +
 scheduler/ipp.c             |  271 +++++++++++++++++++++++++++++++++++++++++++
 scheduler/job.c             |  155 ++++++++++++++++++++++++
 scheduler/job.h             |   11 +
 scheduler/lspp-access.c     |   56 ++++++++
 scheduler/main.c            |   32 +++++
 scheduler/printers.c        |   45 +++++++
 20 files changed, 1630 insertions(+), 6 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-lspp.patch	2 Aug 2006 09:37:30 -0000	1.2
+++ cups-lspp.patch	21 Aug 2006 16:26:28 -0000	1.3
@@ -1,6 +1,5 @@
-diff -burN cups-1.2.2-vanilla/config.h.in cups-1.2.2/config.h.in
---- cups-1.2.2-vanilla/config.h.in	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/config.h.in	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/config.h.in	2006-08-10 11:42:42.000000000 -0400
++++ cups-1.2.2/config.h.in	2006-08-07 06:19:33.000000000 -0400
 @@ -443,6 +443,13 @@
  #undef HAVE_APPLETALK_AT_PROTO_H
  
@@ -15,9 +14,8 @@
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
-diff -burN cups-1.2.2-vanilla/configure.in cups-1.2.2/configure.in
---- cups-1.2.2-vanilla/configure.in	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/configure.in	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/configure.in	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/configure.in	2006-08-07 06:19:33.000000000 -0400
 @@ -47,6 +47,8 @@
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -27,9 +25,47 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-diff -burN cups-1.2.2-vanilla/cups/cups.h cups-1.2.2/cups/cups.h
---- cups-1.2.2-vanilla/cups/cups.h	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/cups/cups.h	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/config-scripts/cups-lspp.m4	1969-12-31 19:00:00.000000000 -0500
++++ cups-1.2.2/config-scripts/cups-lspp.m4	2006-08-07 06:19:33.000000000 -0400
+@@ -0,0 +1,36 @@
++dnl
++dnl   LSPP code for the Common UNIX Printing System (CUPS).
++dnl
++dnl   Copyright 2005-2006 by Hewlett-Packard Development Company, L.P.
++dnl
++dnl   This program is free software; you can redistribute it and/or modify
++dnl   it under the terms of the GNU General Public License as published by
++dnl   the Free Software Foundation; version 2.
++dnl
++dnl   This program is distributed in the hope that it will be useful, but
++dnl   WITHOUT ANY WARRANTY; without even the implied warranty of
++dnl   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++dnl   General Public License for more details.
++dnl
++dnl   You should have received a copy of the GNU General Public License
++dnl   along with this program; if not, write to the Free Software Foundation,
++dnl   Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301 USA
++dnl
++
++dnl Are we trying to meet LSPP requirements
++AC_ARG_ENABLE(lspp, [  --enable-lspp           turn on auditing and label support, default=no])
++
++if test x"$enable_lspp" != xno; then
++    case "$uname" in
++        Linux)
++            AC_CHECK_LIB(audit,audit_log_user_message, [LIBAUDIT="-laudit" AC_SUBST(LIBAUDIT)])
++            AC_CHECK_HEADER(libaudit.h)
++            AC_CHECK_LIB(selinux,getpeercon, [LIBSELINUX="-lselinux" AC_SUBST(LIBSELINUX)])
++            AC_CHECK_HEADER(selinux/selinux.h)
++            AC_DEFINE(WITH_LSPP)
++            ;;
++        *)
++            # All others
++            ;;
++    esac
++fi
+--- cups-1.2.2-8/cups/cups.h	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/cups/cups.h	2006-08-07 06:19:33.000000000 -0400
 @@ -24,6 +24,8 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -52,9 +88,8 @@
  /*
   * Types and structures...
   */
-diff -burN cups-1.2.2-vanilla/data/Makefile cups-1.2.2/data/Makefile
---- cups-1.2.2-vanilla/data/Makefile	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/data/Makefile	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/data/Makefile	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/data/Makefile	2006-08-07 06:19:33.000000000 -0400
 @@ -34,7 +34,10 @@
  		secret \
  		standard \
@@ -67,9 +102,8 @@
  
  CHARMAPS =	\
  		euc-cn.txt \
-diff -burN cups-1.2.2-vanilla/data/mls cups-1.2.2/data/mls
---- cups-1.2.2-vanilla/data/mls	1969-12-31 19:00:00.000000000 -0500
-+++ cups-1.2.2/data/mls	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/data/mls	1969-12-31 19:00:00.000000000 -0500
++++ cups-1.2.2/data/mls	2006-08-07 06:19:33.000000000 -0400
 @@ -0,0 +1,277 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -348,9 +382,8 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -burN cups-1.2.2-vanilla/data/selinux cups-1.2.2/data/selinux
---- cups-1.2.2-vanilla/data/selinux	1969-12-31 19:00:00.000000000 -0500
-+++ cups-1.2.2/data/selinux	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/data/selinux	1969-12-31 19:00:00.000000000 -0500
++++ cups-1.2.2/data/selinux	2006-08-07 06:19:33.000000000 -0400
 @@ -0,0 +1,277 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -629,9 +662,8 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -burN cups-1.2.2-vanilla/data/te cups-1.2.2/data/te
---- cups-1.2.2-vanilla/data/te	1969-12-31 19:00:00.000000000 -0500
-+++ cups-1.2.2/data/te	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/data/te	1969-12-31 19:00:00.000000000 -0500
++++ cups-1.2.2/data/te	2006-08-07 06:19:33.000000000 -0400
 @@ -0,0 +1,277 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -910,9 +942,8 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -burN cups-1.2.2-vanilla/Makedefs.in cups-1.2.2/Makedefs.in
---- cups-1.2.2-vanilla/Makedefs.in	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/Makedefs.in	2006-08-01 07:08:43.000000000 -0400
+--- cups-1.2.2-8/Makedefs.in	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/Makedefs.in	2006-08-07 06:19:33.000000000 -0400
 @@ -135,7 +135,7 @@
  			@LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM)
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
@@ -922,9 +953,8 @@
  OPTIM		=	@OPTIM@
  OPTIONS		=
  PAMLIBS		=	@PAMLIBS@
-diff -burN cups-1.2.2-vanilla/scheduler/client.c cups-1.2.2/scheduler/client.c
---- cups-1.2.2-vanilla/scheduler/client.c	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/scheduler/client.c	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/scheduler/client.c	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/scheduler/client.c	2006-08-07 06:19:33.000000000 -0400
 @@ -43,12 +43,17 @@
   *   make_certificate()      - Make a self-signed SSL/TLS certificate.
   *   pipe_command()          - Pipe the output of a command to the remote client.
@@ -1067,9 +1097,8 @@
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
   */
-diff -burN cups-1.2.2-vanilla/scheduler/client.h cups-1.2.2/scheduler/client.h
---- cups-1.2.2-vanilla/scheduler/client.h	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/scheduler/client.h	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/scheduler/client.h	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/scheduler/client.h	2006-08-07 06:19:33.000000000 -0400
 @@ -22,6 +22,13 @@
   *         WWW: http://www.cups.org
   */
@@ -1105,9 +1134,8 @@
  
  
  /*
-diff -burN cups-1.2.2-vanilla/scheduler/conf.c cups-1.2.2/scheduler/conf.c
---- cups-1.2.2-vanilla/scheduler/conf.c	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/scheduler/conf.c	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/scheduler/conf.c	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/scheduler/conf.c	2006-08-14 06:09:33.000000000 -0400
 @@ -35,6 +35,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
@@ -1146,41 +1174,52 @@
  
  
   /*
-@@ -377,6 +387,16 @@
+@@ -377,6 +387,7 @@
      }
    }
  
++
+  /*
+   * Numeric options...
+   */
+@@ -470,6 +481,16 @@
+ 
+   RunUser = getuid();
+ 
 +#ifdef WITH_LSPP
 +  /*
 +   * ClassifyOverride is set during read_configuration, if its on, report it now
 +   */
-+  if (ClassifyOverride)
++  if (ClassifyOverride && AuditLog != -1)
 +    audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG,
 +              "[Config] ClassifyOverride=enabled Users can override print banners",
 +              ServerName, NULL, NULL, 1);
 +#endif /* WITH_LSPP */
 +
   /*
-   * Numeric options...
+   * See if the ServerName is an IP address...
    */
-@@ -779,7 +799,16 @@
+@@ -779,7 +800,19 @@
      cupsdClearString(&Classification);
  
    if (Classification)
 +  {
      cupsdLogMessage(CUPSD_LOG_INFO, "Security set to \"%s\"", Classification);
 +#ifdef WITH_LSPP
-+    audit_message = NULL;
-+    cupsdSetStringf(&audit_message, "[Config] Security level=%s", Classification);
-+    audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
-+                           ServerName, NULL, NULL, 1);
-+    free(audit_message);
++    if (AuditLog != -1)
++    {
++      audit_message = NULL;
++      cupsdSetStringf(&audit_message, "[Config] Security level=%s", Classification);
++      audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
++                             ServerName, NULL, NULL, 1);
++      free(audit_message);
++    }
 +#endif /* WITH_LSPP */
 +  }
  
   /*
    * Update the MaxClientsPerHost value, as needed...
-@@ -2233,7 +2262,6 @@
+@@ -2233,7 +2266,6 @@
  
        cupsd_dirsvc_addr_t	*dira;	/* New browse address array */
  
@@ -1188,7 +1227,7 @@
        if (NumBrowsers == 0)
          dira = malloc(sizeof(cupsd_dirsvc_addr_t));
        else
-@@ -3286,6 +3314,18 @@
+@@ -3286,6 +3318,18 @@
    return (0);
  }
  
@@ -1207,9 +1246,8 @@
  
  /*
   * End of "$Id$".
-diff -burN cups-1.2.2-vanilla/scheduler/conf.h cups-1.2.2/scheduler/conf.h
---- cups-1.2.2-vanilla/scheduler/conf.h	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/scheduler/conf.h	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/scheduler/conf.h	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/scheduler/conf.h	2006-08-07 06:19:33.000000000 -0400
 @@ -182,7 +182,6 @@
  					/* Number of MIME types */
  VAR const char		**MimeTypes		VALUE(NULL);
@@ -1239,9 +1277,8 @@
  
  /*
   * End of "$Id$".
-diff -burN cups-1.2.2-vanilla/scheduler/ipp.c cups-1.2.2/scheduler/ipp.c
---- cups-1.2.2-vanilla/scheduler/ipp.c	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/scheduler/ipp.c	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/scheduler/ipp.c	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/scheduler/ipp.c	2006-08-21 06:57:47.000000000 -0400
 @@ -96,6 +96,9 @@
   *   validate_user()             - Validate the user for the request.
   */
@@ -1267,7 +1304,7 @@
  
  /*
   * PPD default choice structure...
-@@ -1166,6 +1177,15 @@
+@@ -1166,6 +1177,18 @@
    int		kbytes;			/* Size of print file */
    int		i;			/* Looping var */
    int		lowerpagerange;		/* Page range bound */
@@ -1279,11 +1316,14 @@
 +  int		acstatus;		/* return value of the access check */
 +  pid_t		acpid;			/* pid for the access check */
 +  char		*printerfile;		/* device file pointed to by the printer */
++  char		*userheader = NULL;	/* User supplied job-sheets[0] */
++  char		*userfooter = NULL;	/* User supplied job-sheets[1] */
++  int		override = 0;		/* Was a banner overrode on a job */
 +#endif /* WITH_LSPP */
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %s)", con,
-@@ -1342,6 +1362,97 @@
+@@ -1342,6 +1365,90 @@
      return (NULL);
    }
  
@@ -1316,19 +1356,8 @@
 +    * Perform an access check so that if the user gets feedback at enqueue time
 +    */
 +
-+    printerfile = strdup(printer->device_uri);
-+    if ((printerfile = strrchr(printer->device_uri, '=')) == NULL)
-+    {
-+      if ((printerfile = strrchr(printer->device_uri, ':')) == NULL)
-+      {
-+        cupsdLogMessage(CUPSD_LOG_ERROR, "add_job: Unable to determine printer device file");
-+        send_ipp_status(con, IPP_INTERNAL_ERROR, _("Unable to perform printer access check"));
-+        return (NULL); 
-+      }
-+    }
-+
-+    printerfile++;
-+    if (strncmp(printerfile, "/dev/", 5) == 0)
++    printerfile = strstr(printer->device_uri, "/dev/");
++    if (printerfile != NULL)
 +    {
 +      cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: Attempting an access check on printer device %s",
 +                      printerfile);
@@ -1341,7 +1370,7 @@
 +      }
 +
 +      snprintf(buffer, sizeof(buffer), "%s/daemon/lspp-access", ServerBin);
-+      argv[0] = "access";
++      argv[0] = "lspp-access";
 +      argv[1] = printerfile;
 +      argv[2] = NULL;
 +
@@ -1357,12 +1386,16 @@
 +           /*
 +            * The access check failed, so cancel the job and send an audit message
 +            */
-+            audit_message = NULL;
-+            cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s refused, unable to access printer=%s",
-+                            job->id, con->auid, con->username, con->scon, printer->name);
-+            audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
-+                                   ServerName, NULL, NULL, 0);
-+            free(audit_message);
++            if (AuditLog != -1)
++            {
++              audit_message = NULL;
++              cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s refused,"
++                              "unable to access printer=%s", job->id, con->auid,
++                              con->username, con->scon, printer->name);
++              audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
++                                     ServerName, NULL, NULL, 0);
++              free(audit_message);
++            }
 +
 +            send_ipp_status(con, IPP_NOT_AUTHORIZED, _("SELinux prohibits access to the printer"));
 +            return (NULL);
@@ -1381,27 +1414,120 @@
    job->dtype   = dtype;
    job->attrs   = con->request;
    con->request = NULL;
-@@ -1553,6 +1664,19 @@
- 
-       if (ClassifyOverride)
-       {
+@@ -1537,6 +1644,29 @@
+       attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]);
+       attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]);
+     }
 +#ifdef WITH_LSPP
++    else
++    {
++     /*
++      * The option was present, so capture the user supplied strings
++      */
++      userheader = strdup(attr->values[0].string.text);
++
++      if (attr->num_values > 1)
++        userfooter = strdup(attr->values[1].string.text);
++  
++      if ((strcmp(userheader, Classification) == 0)
++          && (strcmp(userfooter, Classification) == 0))
++      {
 +       /*
-+        * The configuration allows for user's to Override the banner, so let them
++        * Since both values are Classification, the user is not trying to Override
 +        */
++        free(userheader);
++        free(userfooter);
++        userheader = userfooter = NULL;
++      }
++    }
++#endif /* WITH_LSPP */
+ 
+     job->job_sheets = attr;
+ 
+@@ -1567,6 +1697,9 @@
+ 	                		    "job-sheets=\"%s,none\", "
+ 					    "job-originating-user-name=\"%s\"",
+ 	        	 job->id, Classification, job->username);
++#ifdef WITH_LSPP
++          override = 1;
++#endif /* WITH_LSPP */
+ 	}
+ 	else if (attr->num_values == 2 &&
+ 	         strcmp(attr->values[0].string.text,
+@@ -1585,6 +1718,9 @@
+ 					    "job-originating-user-name=\"%s\"",
+ 	        	 job->id, attr->values[0].string.text,
+ 			 attr->values[1].string.text, job->username);
++#ifdef WITH_LSPP
++          override = 1;
++#endif /* WITH_LSPP */
+ 	}
+ 	else if (strcmp(attr->values[0].string.text, Classification) &&
+ 	         strcmp(attr->values[0].string.text, "none") &&
+@@ -1605,6 +1741,9 @@
+ 			    "job-originating-user-name=\"%s\"",
+ 	        	    job->id, attr->values[0].string.text,
+ 			    attr->values[1].string.text, job->username);
++#ifdef WITH_LSPP
++          override = 1;
++#endif /* WITH_LSPP */
+         }
+       }
+       else if (strcmp(attr->values[0].string.text, Classification) &&
+@@ -1645,9 +1784,52 @@
+ 	                  "job-sheets=\"%s\", "
+ 			  "job-originating-user-name=\"%s\"",
+ 	        	 job->id, Classification, job->username);
++#ifdef WITH_LSPP
++        override = 1;
++#endif /* WITH_LSPP */
++      }
++#ifdef WITH_LSPP
++      if (is_lspp_config() && AuditLog != -1)
++      {
 +        audit_message = NULL;
-+        cupsdSetStringf(&audit_message, "job=%d user supplied classification \"%s\" \"%s\"",
-+                        job->id,
-+                        (attr->values[0].string.text)?attr->values[0].string.text:"none",
-+                        (attr->values[1].string.text)?attr->values[1].string.text:"none");
-+        audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message,
-+                               ServerName, NULL, NULL, 1);
-+        free(audit_message);
-+#endif /* WITH_LSPP */
-         if (!strcmp(attr->values[0].string.text, "none") &&
- 	    (attr->num_values == 1 ||
- 	     !strcmp(attr->values[1].string.text, "none")))
-@@ -3501,6 +3625,11 @@
++
++        if (userheader || userfooter)
++        {
++          if (!override)
++          {
++           /*
++            * The user overrode the banner, so audit it
++            */
++            cupsdSetStringf(&audit_message, "job=%d user supplied classification \"%s\" \"%s\""
++                            " using \"%s\" \"%s\"", job->id, userheader,
++                            userfooter, attr->values[0].string.text,
++                            (attr->num_values > 1) ? attr->values[1].string.text : "(null)");
++            audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message,
++                                   ServerName, NULL, NULL, 1);
++          }
++          else
++          {
++           /*
++            * The user tried to override the banner, audit the failure
++            */
++            cupsdSetStringf(&audit_message, "job=%d user supplied classification \"%s\" \"%s\""
++                            ", ignored using \"%s\" \"%s\"", job->id, userheader,
++                            userfooter, attr->values[0].string.text,
++                            (attr->num_values > 1) ? attr->values[1].string.text : "(null)");
++            audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message,
++                                   ServerName, NULL, NULL, 0);
++          }
++          free(audit_message);
+       }
+     }
+ 
++      if (userheader)
++        free(userheader);
++      if (userfooter)
++        free(userfooter);
++#endif /* WITH_LSPP */
++    }
++
+    /*
+     * See if we need to add the starting sheet...
+     */
+@@ -3501,6 +3683,11 @@
    char		attrname[255],		/* Name of attribute */
  		*s;			/* Pointer into name */
    ipp_attribute_t *attr;		/* Attribute */
@@ -1413,7 +1539,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)",
-@@ -3628,6 +3757,24 @@
+@@ -3628,6 +3815,24 @@
        else
          s = attrname;
  
@@ -1438,7 +1564,7 @@
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -5353,6 +5500,15 @@
+@@ -5353,6 +5558,15 @@
    cupsd_printer_t *printer;		/* Printer */
    cups_array_t	*list;			/* Which job list... */
    cups_array_t	*ra;			/* Requested attributes array */
@@ -1454,7 +1580,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs(%p[%d], %s)", con, con->http.fd,
-@@ -5470,6 +5626,40 @@
+@@ -5470,6 +5684,40 @@
  
    ra = create_requested_array(con->request);
  
@@ -1495,7 +1621,7 @@
   /*
    * OK, build a list of jobs for this printer...
    */
-@@ -5507,6 +5697,19 @@
+@@ -5507,6 +5755,19 @@
      if (count > 0)
        ippAddSeparator(con->response);
  
@@ -1515,7 +1641,7 @@
      count ++;
  
      cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
-@@ -7935,12 +8138,22 @@
+@@ -7935,12 +8196,22 @@
      * See if we need to add the ending sheet...
      */
  
@@ -1538,9 +1664,8 @@
       /*
        * Yes...
        */
-diff -burN cups-1.2.2-vanilla/scheduler/job.c cups-1.2.2/scheduler/job.c
---- cups-1.2.2-vanilla/scheduler/job.c	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/scheduler/job.c	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/scheduler/job.c	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/scheduler/job.c	2006-08-17 10:38:41.000000000 -0400
 @@ -68,6 +68,9 @@
   *   unload_job()               - Unload a job from memory.
   */
@@ -1587,7 +1712,7 @@
    job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                       IPP_TAG_INTEGER);
    job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -2428,6 +2453,17 @@
+@@ -2428,6 +2453,18 @@
    int			remote_job;	/* Remote print job? */
    static char		*options = NULL;/* Full list of options */
    static int		optlength = 0;	/* Length of option buffer */
@@ -1595,6 +1720,7 @@
 +  int			acstatus = 0;	/* return value of the access check */
 +  pid_t			acpid = -1;	/* pid for the access check */
 +  const char		*mls_label = NULL;	/* SL to put in classification env var */
++  char			*label_template = NULL;	/* SL to put in classification env var */
 +  char			*audit_message = NULL;	/* Audit message string */
 +  char			*printerfile = NULL;	/* Device file pointed to by the printer */
 +  char			*acargv[3];	/* Command line args */
@@ -1605,7 +1731,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: id = %d, file = %d/%d",
-@@ -2709,6 +2745,76 @@
+@@ -2709,6 +2746,69 @@
  
    cupsdLogMessage(CUPSD_LOG_DEBUG, "banner_page = %d", banner_page);
  
@@ -1615,20 +1741,13 @@
 +   /*
 +    * Perform an access check before printing, but only if the printer starts with /dev/
 +    */
-+    printerfile = strdup(printer->device_uri);
-+    if ((printerfile = strrchr(printer->device_uri, '=')) == NULL)
-+    {
-+      if ((printerfile = strrchr(printer->device_uri, ':')) == NULL)
-+      {
-+        cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to determine printer device file");
-+        cupsdCancelJob(job, 0);
-+        return;
-+      }
-+    }
++    printerfile = strstr(printer->device_uri, "/dev/");
 +
-+    printerfile++;
-+    if (strncmp(printerfile, "/dev/", 5) == 0)
++    if (printerfile != NULL)
 +    {
++      cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: Attempting to check access on printer device %s",
++                      printerfile);
++
 +      if (setexeccon(job->scon) != 0)
 +      {
 +        cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to setexeccon to %s", job->scon);
@@ -1636,11 +1755,8 @@
 +        return;
 +      }
 +
-+      cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: Attempting to check access on printer device %s",
-+                      printerfile);
-+
 +      snprintf(buffer, sizeof(buffer), "%s/daemon/lspp-access", ServerBin);
-+      acargv[0] = "access";
++      acargv[0] = "lspp-access";
 +      acargv[1] = printerfile;
 +      acargv[2] = NULL;
 +
@@ -1656,13 +1772,16 @@
 +           /*
 +            * The access check failed, so cancel the job and send an audit message
 +            */
-+            audit_message = NULL;
-+            cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s cancelled,"
-+                                            " unable to access printer=%s",
-+                            job->id, job->auid, job->username, job->scon, printer->name);
-+            audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
-+                                   ServerName, NULL, NULL, 0);
-+            free(audit_message);
++            if (AuditLog != -1)
++            {
++              audit_message = NULL;
++              cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s cancelled,"
++                                              " unable to access printer=%s",
++                              job->id, job->auid, job->username, job->scon, printer->name);
++              audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
++                                     ServerName, NULL, NULL, 0);
++              free(audit_message);
++            }
 +
 +            cupsdCancelJob(job, 0);
 +
@@ -1682,51 +1801,70 @@
   /*
    * Building the options string is harder than it needs to be, but
    * for the moment we need to pass strings for command-line args and
-@@ -3026,6 +3132,41 @@
-     envp[envc ++] = final_content_type;
-   }
+@@ -3041,6 +3141,61 @@
+       snprintf(classification, sizeof(classification), "CLASSIFICATION=%s",
+                attr->values[0].string.text);
  
 +#ifdef WITH_LSPP
-+  if (is_lspp_config())
-+  {
-+    if (job->scon == NULL)
-+    {
-+      audit_message = NULL;
-+      cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s",
-+                      job->id, job->auid, job->username, printer->name);
-+      audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message,
-+                             ServerName, NULL, NULL, 1);
-+      free(audit_message);
-+    }
-+    else 
++    if (is_lspp_config())
 +    {
-+      job_context = context_new(job->scon);
-+      if (strcasecmp(Classification, MLS_CONFIG) == 0)
-+        mls_label = context_range_get(job_context);
-+      else if (strcasecmp(Classification, TE_CONFIG) == 0)
-+        mls_label = context_type_get(job_context);
-+      else  // default is SELinux which means print the whole context
-+        mls_label = context_str(job_context);
-+      snprintf(classification, sizeof(classification), "CLASSIFICATION=%s",
-+               mls_label);
-+      envp[envc ++] = classification;
-+      audit_message = NULL;
-+      cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s obj=%s",
-+                      job->id, job->auid, job->username, printer->name, job->scon);
-+      audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
-+                             ServerName, NULL, NULL, 1);
-+      context_free(job_context);
-+      free(audit_message);
++      if (job->scon == NULL)
++      {
++        if (AuditLog != -1)
++        {
++          audit_message = NULL;
++          cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s",
++                          job->id, job->auid, job->username, printer->name, title);
++          audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message,
++                                 ServerName, NULL, NULL, 1);
++          free(audit_message);
++        }
++      }
++      else 
++      {
++        job_context = context_new(job->scon);
++  
++        if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME)) == NULL)
++          label_template = strdup(Classification);
++        else if (attr->num_values > 1 &&
++                 strcmp(attr->values[1].string.text, "none") != 0)
++          label_template = strdup(attr->values[1].string.text);
++        else
++          label_template = strdup(attr->values[0].string.text);
++  
++        if (strcasecmp(label_template, MLS_CONFIG) == 0)
++          mls_label = context_range_get(job_context);
++        else if (strcasecmp(label_template, TE_CONFIG) == 0)
++          mls_label = context_type_get(job_context);
++        else if (strcasecmp(label_template, SELINUX_CONFIG) == 0)
++          mls_label = context_str(job_context);
++
++        if (!mls_label)
++          mls_label = label_template;
++
++        snprintf(classification, sizeof(classification), "CLASSIFICATION=%s", mls_label);
++  
++        if (AuditLog != -1)
++        {
++          audit_message = NULL;
++          cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s"
++                          " obj=%s label=%s", job->id, job->auid, job->username,
++                          printer->name, title, job->scon, mls_label);
++          audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
++                                 ServerName, NULL, NULL, 1);
++          free(audit_message);
++        }
++        context_free(job_context);
++        free(label_template);
++      }
 +    }
-+  }
-+  else 
 +#endif /* WITH_LSPP */
-   if (Classification && !banner_page)
-   {
-     if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-diff -burN cups-1.2.2-vanilla/scheduler/job.h cups-1.2.2/scheduler/job.h
---- cups-1.2.2-vanilla/scheduler/job.h	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/scheduler/job.h	2006-08-01 07:08:37.000000000 -0400
++
+     envp[envc ++] = classification;
+   }
+ 
+--- cups-1.2.2-8/scheduler/job.h	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/scheduler/job.h	2006-08-07 06:19:33.000000000 -0400
 @@ -22,6 +22,13 @@
   *         WWW: http://www.cups.org
   */
@@ -1752,9 +1890,67 @@
  } cupsd_job_t;
  
  
-diff -burN cups-1.2.2-vanilla/scheduler/main.c cups-1.2.2/scheduler/main.c
---- cups-1.2.2-vanilla/scheduler/main.c	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/scheduler/main.c	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/scheduler/lspp-access.c	1969-12-31 19:00:00.000000000 -0500
++++ cups-1.2.2/scheduler/lspp-access.c	2006-08-07 06:19:33.000000000 -0400
+@@ -0,0 +1,56 @@
++/*
++ *   Copyright (C) Hewlett-Packard Development Company, L.P., 2006
++ *
++ *   This program is free software;  you can redistribute it and/or modify
++ *   it under the terms of the GNU General Public License as published by
++ *   the Free Software Foundation; either version 2 of the License, or
++ *   (at your option) any later version.
++ *
++ *   This program is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
++ *   the GNU General Public License for more details.
++ *
++ *   You should have received a copy of the GNU General Public License
++ *   along with this program;  if not, write to the Free Software
++ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ * Contents:
++ *
++ *   main()               - Main entry for the access checker.
++ */
++
++#include <stdio.h>
++#include <unistd.h>
++#include <string.h>
++
++int main(int argc, char *argv[]) {
++  int status = -1;
++  char filename[FILENAME_MAX+1] = {0};
++
++  if (argc < 2)
++  {
++    printf("Check for access to which file? ");
++    scanf("%s", (char *)&filename);
++  }
++  else
++  {
++    strncpy(filename, argv[1], FILENAME_MAX);
++  }
++
++  status = access(filename, R_OK|W_OK);
++
++  if (argc < 2)
++  {
++   /*
++    * Assume the user would like to hear the answer on the terminal
++    * since the filename was received interactively.
++    */
++    if (status != 0)
++      printf("Unable to access that file.\n");
++    else
++      printf("Access Granted\n");
++  }
++  
++  return status;
++}
+--- cups-1.2.2-8/scheduler/main.c	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/scheduler/main.c	2006-08-15 09:15:28.000000000 -0400
 @@ -47,6 +47,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -1774,17 +1970,35 @@
  
  /*
   * Local functions...
-@@ -351,6 +359,17 @@
+@@ -141,6 +146,9 @@
+   int			launchd_idle_exit;
+ 					/* Idle exit on select timeout? */
+ #endif	/* HAVE_LAUNCHD */
++#if WITH_LSPP
++  auditfail_t           failmode;       /* Action for audit_open failure */
++#endif /* WITH_LSPP */
+ 
+ 
+  /*
+@@ -351,6 +359,25 @@
  #endif /* DEBUG */
    }
  
 +#ifdef WITH_LSPP
 +  if ((AuditLog = audit_open()) < 0 )
 +  {
-+    if (is_lspp_config())
++    if (get_auditfail_action(&failmode) == 0)
 +    {
-+      fprintf(stderr, "cupsd: unable to start auditing");
-+      return -1;
++      if (failmode == FAIL_LOG)
++      {
++        cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to connect to audit subsystem.");
++        AuditLog = -1;
++      }
++      else if (failmode == FAIL_TERMINATE)
++      {
++        fprintf(stderr, "cupsd: unable to start auditing, terminating");
++        return -1;
++      }
 +    }
 +  }
 +#endif /* WITH_LSPP */
@@ -1792,20 +2006,20 @@
   /*
    * Set the timezone info...
    */
-@@ -1115,6 +1142,10 @@
+@@ -1115,6 +1142,11 @@
    free(input);
    free(output);
  
 +#ifdef WITH_LSPP
-+  audit_close(AuditLog);
++  if (AuditLog != -1)
++    audit_close(AuditLog);
 +#endif /* WITH_LSPP */
 +
    return (!stop_scheduler);
  }
  
-diff -burN cups-1.2.2-vanilla/scheduler/Makefile cups-1.2.2/scheduler/Makefile
---- cups-1.2.2-vanilla/scheduler/Makefile	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/scheduler/Makefile	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/scheduler/Makefile	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/scheduler/Makefile	2006-08-07 06:19:33.000000000 -0400
 @@ -54,6 +54,7 @@
  OBJS	=	\
  		$(CUPSDOBJS) \
@@ -1844,9 +2058,8 @@
  	-$(RMDIR) $(STATEDIR)/certs
  	-$(RMDIR) $(STATEDIR)
  	-$(RMDIR) $(SERVERROOT)/ppd
-diff -burN cups-1.2.2-vanilla/scheduler/printers.c cups-1.2.2/scheduler/printers.c
---- cups-1.2.2-vanilla/scheduler/printers.c	2006-08-01 07:07:28.000000000 -0400
-+++ cups-1.2.2/scheduler/printers.c	2006-08-01 07:08:37.000000000 -0400
+--- cups-1.2.2-8/scheduler/printers.c	2006-08-10 11:43:02.000000000 -0400
++++ cups-1.2.2/scheduler/printers.c	2006-08-14 06:09:33.000000000 -0400
 @@ -57,6 +57,8 @@
   *                                 printing desktop tools.
   */
@@ -1856,138 +2069,67 @@
  /*
   * Include necessary headers...
   */
-@@ -79,6 +81,9 @@
+@@ -79,6 +81,10 @@
  static void	write_irix_state(cupsd_printer_t *p);
  #endif /* __sgi */
  
 +#ifdef WITH_LSPP
 +#  include <libaudit.h>
++#  include <selinux/context.h>
 +#endif /* WITH_LSPP */
  
  /*
   * 'cupsdAddPrinter()' - Add a printer to the system.
-@@ -1472,6 +1477,9 @@
+@@ -1472,6 +1478,13 @@
  		  "two-sided-long-edge",
  		  "two-sided-short-edge"
  		};
 +#ifdef WITH_LSPP
 +  char		*audit_message;		/* Audit message string */
++  char		*printerfile;		/* Path to a local printer dev */
++  char		*rangestr;		/* Printer's range if its available */
++  security_context_t	devcon;		/* Printer SELinux context */
++  context_t	printercon;		/* context_t for the printer */
 +#endif /* WITH_LSPP */
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1578,6 +1586,14 @@
+@@ -1578,6 +1591,38 @@
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }
 +#ifdef WITH_LSPP
-+    audit_message = NULL;
-+    cupsdSetStringf(&audit_message, "[Config] printer=%s uri=%s banners set to %s %s",
-+                    p->name, p->device_uri, p->job_sheets[0], p->job_sheets[1]);
-+    audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
-+                           ServerName, NULL, NULL, 1);
-+    free(audit_message);
-+#endif /* WITH_LSPP */
-   }
- 
-   printer_type = p->type;
---- /dev/null	2006-07-21 09:48:40.571484750 +0100
-+++ cups-1.2.2/config-scripts/cups-lspp.m4	2006-07-21 12:42:40.000000000 +0100
-@@ -0,0 +1,36 @@
-+dnl
-+dnl   LSPP code for the Common UNIX Printing System (CUPS).
-+dnl
-+dnl   Copyright 2005-2006 by Hewlett-Packard Development Company, L.P.
-+dnl
-+dnl   This program is free software; you can redistribute it and/or modify
-+dnl   it under the terms of the GNU General Public License as published by
-+dnl   the Free Software Foundation; version 2.
-+dnl
-+dnl   This program is distributed in the hope that it will be useful, but
-+dnl   WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+dnl   General Public License for more details.
-+dnl
-+dnl   You should have received a copy of the GNU General Public License
-+dnl   along with this program; if not, write to the Free Software Foundation,
-+dnl   Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301 USA
-+dnl
-+
-+dnl Are we trying to meet LSPP requirements
-+AC_ARG_ENABLE(lspp, [  --enable-lspp           turn on auditing and label support, default=no])
-+
-+if test x"$enable_lspp" != xno; then
-+    case "$uname" in
-+        Linux)
-+            AC_CHECK_LIB(audit,audit_log_user_message, [LIBAUDIT="-laudit" AC_SUBST(LIBAUDIT)])
-+            AC_CHECK_HEADER(libaudit.h)
-+            AC_CHECK_LIB(selinux,getpeercon, [LIBSELINUX="-lselinux" AC_SUBST(LIBSELINUX)])
-+            AC_CHECK_HEADER(selinux/selinux.h)
-+            AC_DEFINE(WITH_LSPP)
-+            ;;
-+        *)
-+            # All others
-+            ;;
-+    esac
-+fi
---- /dev/null	2006-07-21 09:48:40.571484750 +0100
-+++ cups-1.2.2/scheduler/lspp-access.c	2006-07-21 12:42:40.000000000 +0100
-@@ -0,0 +1,56 @@
-+/*
-+ *   Copyright (C) Hewlett-Packard Development Company, L.P., 2006
-+ *
-+ *   This program is free software;  you can redistribute it and/or modify
-+ *   it under the terms of the GNU General Public License as published by
-+ *   the Free Software Foundation; either version 2 of the License, or
-+ *   (at your option) any later version.
-+ *
-+ *   This program is distributed in the hope that it will be useful,
-+ *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
-+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-+ *   the GNU General Public License for more details.
-+ *
-+ *   You should have received a copy of the GNU General Public License
-+ *   along with this program;  if not, write to the Free Software
-+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * Contents:
-+ *
-+ *   main()               - Main entry for the access checker.
-+ */
-+
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <string.h>
++    if (AuditLog != -1)
++    {
++      audit_message = NULL;
++      rangestr = NULL;
++      printercon = 0;
++      printerfile = strstr(p->device_uri, "/dev/");
 +
-+int main(int argc, char *argv[]) {
-+  int status = -1;
-+  char filename[FILENAME_MAX+1] = {0};
++      if (printerfile != NULL)
++      {
++        if (getfilecon(printerfile, &devcon) == -1)
++            cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context");
++        else
++          printercon = context_new(devcon);
 +
-+  if (argc < 2)
-+  {
-+    printf("Check for access to which file? ");
-+    scanf("%s", (char *)&filename);
-+  }
-+  else
-+  {
-+    strncpy(filename, argv[1], FILENAME_MAX);
-+  }
++        if (context_range_get(printercon))
++          rangestr = strdup(context_range_get(printercon));
++      }
 +
-+  status = access(filename, R_OK|W_OK);
++      if (rangestr == NULL)
++        rangestr = strdup("unknown");
 +
-+  if (argc < 2)
-+  {
-+   /*
-+    * Assume the user would like to hear the answer on the terminal
-+    * since the filename was received interactively.
-+    */
-+    if (status != 0)
-+      printf("Unable to access that file.\n");
-+    else
-+      printf("Access Granted\n");
-+  }
-+  
-+  return status;
-+}
-
-
++      cupsdSetStringf(&audit_message, "[Config] printer=%s uri=%s banners set to %s %s has range %s",
++                      p->name, p->device_uri, p->job_sheets[0], p->job_sheets[1], rangestr);
++      audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
++                             ServerName, NULL, NULL, 1);
++      if (printercon)
++        context_free(printercon);
++      free(rangestr);
++      free(audit_message);
++    }
++#endif /* WITH_LSPP */
+   }
+ 
+   printer_type = p->type;


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- cups.spec	18 Aug 2006 20:11:38 -0000	1.250
+++ cups.spec	21 Aug 2006 16:26:28 -0000	1.251
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 13
+Release: 14
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -420,6 +420,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Aug 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-14
+- Updated LSPP patch (bug #203376).
+
 * Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.2-13
 - rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
   (#203001)



From fedora-cvs-commits at redhat.com  Mon Aug 21 16:36:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 12:36:16 -0400
Subject: rpms/control-center/devel
	control-center-2.15.91-fix-thumbnailing.patch, NONE,
	1.1 control-center.spec, 1.170,
	1.171 control-center-2.15.90-fix-thumbnailing.patch, 1.1, NONE
Message-ID: <200608211636.k7LGaGvN011253@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11177

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.15.91-fix-thumbnailing.patch 
Removed Files:
	control-center-2.15.90-fix-thumbnailing.patch 
Log Message:
- When creating new thumbnails, record thumbnail location rather
  that regenerating them over and over again.


control-center-2.15.91-fix-thumbnailing.patch:
 gnome-wp-info.c |   26 --------------------------
 gnome-wp-item.c |    4 ++++
 2 files changed, 4 insertions(+), 26 deletions(-)

--- NEW FILE control-center-2.15.91-fix-thumbnailing.patch ---
--- control-center-2.15.91/capplets/background/gnome-wp-info.c.fix-thumbnailing	2006-01-26 22:01:58.000000000 -0500
+++ control-center-2.15.91/capplets/background/gnome-wp-info.c	2006-08-21 12:31:49.000000000 -0400
@@ -38,24 +38,11 @@
 				    GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
   if (info == NULL || info->mime_type == NULL || result != GNOME_VFS_OK) {
     if (!strcmp (uri, "(none)")) {
-      gchar * md5sum;
-
       new = g_new0 (GnomeWPInfo, 1);
 
       new->mime_type = g_strdup ("image/x-no-data");
       new->uri = g_strdup (uri);
-
-      md5sum = gnome_thumbnail_md5 (escaped_path);
-
-      new->thumburi = g_strconcat (g_get_home_dir (),
-				   "/.thumbnails/normal/",
-				   md5sum,
-				   ".png",
-				   NULL);
-      g_free (md5sum);
-
       new->name = g_strdup (_("No Wallpaper"));
-
       new->size = 0;
     } else {
       new = NULL;
@@ -68,19 +55,6 @@
     new->thumburi = gnome_thumbnail_factory_lookup (thumbs,
 						    escaped_path,
 						    info->mtime);
-    if (new->thumburi == NULL) {
-      gchar * md5sum;
-
-      md5sum = gnome_thumbnail_md5 (escaped_path);
-
-      new->thumburi = g_strconcat (g_get_home_dir (),
-				   "/.thumbnails/normal/",
-				   md5sum,
-				   ".png",
-				   NULL);
-
-      g_free (md5sum);
-    }
     new->name = g_strdup (info->name);
     new->mime_type = g_strdup (info->mime_type);
 
--- control-center-2.15.91/capplets/background/gnome-wp-item.c.fix-thumbnailing	2006-01-26 22:01:58.000000000 -0500
+++ control-center-2.15.91/capplets/background/gnome-wp-item.c	2006-08-21 12:33:53.000000000 -0400
@@ -258,6 +258,10 @@
 					    escaped_path,
 					    item->fileinfo->mtime);
     g_free (escaped_path);
+    g_free (item->fileinfo->thumburi);
+    item->fileinfo->thumburi = gnome_thumbnail_factory_lookup (thumbs,
+							       escaped_path,
+							       item->fileinfo->mtime);
   }
 
   if (pixbuf != NULL) {


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- control-center.spec	18 Aug 2006 21:45:58 -0000	1.170
+++ control-center.spec	21 Aug 2006 16:36:12 -0000	1.171
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.91
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -38,7 +38,7 @@
 # Dobey being unreasonable again
 Patch10: control-center-2.15.4-finish.patch
 Patch11: control-center-2.15.91-search.patch
-Patch12: control-center-2.15.90-fix-thumbnailing.patch
+Patch12: control-center-2.15.91-fix-thumbnailing.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -272,6 +272,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Aug 21 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-5.fc6
+- When creating new thumbnails, record thumbnail location rather
+  that regenerating them over and over again.
+
 * Fri Aug 18 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-4.fc6
 - Fix thumbnailing problem in background capplet (bug 185142)
 


--- control-center-2.15.90-fix-thumbnailing.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 21 16:37:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 12:37:57 -0400
Subject: rpms/eel2/devel .cvsignore, 1.38, 1.39 eel2.spec, 1.54, 1.55 sources,
	1.38, 1.39
Message-ID: <200608211637.k7LGbvjU011844@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11798

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	10 Aug 2006 14:35:41 -0000	1.38
+++ .cvsignore	21 Aug 2006 16:37:54 -0000	1.39
@@ -1 +1 @@
-eel-2.15.91.tar.bz2
+eel-2.15.92.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- eel2.spec	10 Aug 2006 14:35:41 -0000	1.54
+++ eel2.spec	21 Aug 2006 16:37:54 -0000	1.55
@@ -15,7 +15,7 @@
 
 Name:		eel2
 Summary:        Eazel Extensions Library
-Version: 	2.15.91
+Version: 	2.15.92
 Release: 	1%{?dist}
 License: 	LGPL
 Group: System Environment/Libraries
@@ -109,6 +109,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Thu Aug 10 2006 Alexander Larsson <alexl at redhat.com> - 2.15.91-1
 - update to 2.15.91
 - Drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	10 Aug 2006 14:35:41 -0000	1.38
+++ sources	21 Aug 2006 16:37:54 -0000	1.39
@@ -1 +1 @@
-b025e631dece16e84ff3698ca207d49f  eel-2.15.91.tar.bz2
+171dbe892b44d972f6e11ff0a472b3c4  eel-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 16:41:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 12:41:59 -0400
Subject: rpms/hplip/devel hplip-guest.patch,NONE,1.1 hplip.spec,1.91,1.92
Message-ID: <200608211641.k7LGfwWp012914@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12855

Modified Files:
	hplip.spec 
Added Files:
	hplip-guest.patch 
Log Message:
* Mon Aug 21 2006 Tim Waugh <twaugh at redhat.com> 1.6.7-3
- Don't look up username in PWDB in the fax backend (removed redundant code).


hplip-guest.patch:
 hpfax.py |    3 ---
 1 files changed, 3 deletions(-)

--- NEW FILE hplip-guest.patch ---
--- hplip-1.6.7/fax/backend/hpfax.py.guest	2006-08-21 17:35:34.000000000 +0100
+++ hplip-1.6.7/fax/backend/hpfax.py	2006-08-21 17:38:48.000000000 +0100
@@ -188,9 +188,6 @@
     except IndexError:
         input_fd = 0
         
-    pdb = pwd.getpwnam(username)
-    home_folder, uid, gid = pdb[5], pdb[2], pdb[3]
-    
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     try:
         sock.connect((prop.hpssd_host, prop.hpssd_port))





From fedora-cvs-commits at redhat.com  Mon Aug 21 16:45:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 12:45:20 -0400
Subject: rpms/hplip/FC-5 hplip-guest.patch,NONE,1.1 hplip.spec,1.76,1.77
Message-ID: <200608211645.k7LGjKau013629@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13593

Modified Files:
	hplip.spec 
Added Files:
	hplip-guest.patch 
Log Message:
* Mon Aug 21 2006 Tim Waugh <twaugh at redhat.com>
- Don't look up username in PWDB in the fax backend (removed redundant code).


hplip-guest.patch:
 hpfax.py |    3 ---
 1 files changed, 3 deletions(-)

--- NEW FILE hplip-guest.patch ---
--- hplip-1.6.7/fax/backend/hpfax.py.guest	2006-08-21 17:35:34.000000000 +0100
+++ hplip-1.6.7/fax/backend/hpfax.py	2006-08-21 17:38:48.000000000 +0100
@@ -188,9 +188,6 @@
     except IndexError:
         input_fd = 0
         
-    pdb = pwd.getpwnam(username)
-    home_folder, uid, gid = pdb[5], pdb[2], pdb[3]
-    
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     try:
         sock.connect((prop.hpssd_host, prop.hpssd_port))


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- hplip.spec	10 Jul 2006 15:29:13 -0000	1.76
+++ hplip.spec	21 Aug 2006 16:45:18 -0000	1.77
@@ -16,6 +16,7 @@
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-compile.patch
 Patch6: hplip-libm.patch
+Patch7: hplip-guest.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -80,6 +81,10 @@
 # libhpip should link against libm (bug #197599).
 %patch6 -p1 -b .libm
 
+# Don't look up username in PWDB in the fax backend (removed redundant code).
+# https://www.redhat.com/archives/fedora-list/2006-August/msg02457.html
+%patch7 -p1 -b .guest
+
 autoconf # for patch4
 
 %build
@@ -193,6 +198,9 @@
 fi
 
 %changelog
+* Mon Aug 21 2006 Tim Waugh <twaugh at redhat.com>
+- Don't look up username in PWDB in the fax backend (removed redundant code).
+
 * Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com>
 - libhpip should link against libm (bug #197599).
 - Fixed libsane-hpaio %%post scriptlet (bug #196663).



From fedora-cvs-commits at redhat.com  Mon Aug 21 17:04:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 13:04:06 -0400
Subject: rpms/nautilus/devel .cvsignore, 1.43, 1.44 nautilus.spec, 1.116,
	1.117 sources, 1.46, 1.47
Message-ID: <200608211704.k7LH46se003139@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2756

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	10 Aug 2006 14:39:05 -0000	1.43
+++ .cvsignore	21 Aug 2006 17:04:00 -0000	1.44
@@ -1 +1 @@
-nautilus-2.15.91.tar.bz2
+nautilus-2.15.92.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- nautilus.spec	12 Aug 2006 22:02:00 -0000	1.116
+++ nautilus.spec	21 Aug 2006 17:04:00 -0000	1.117
@@ -22,8 +22,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.15.91
-Release:	2%{?dist}
+Version: 	2.15.92
+Release:	1%{?dist}
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -197,6 +197,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-2.fc6
 - Don't Provide/Obsolete nautilus-devel from the main package (#202322)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	10 Aug 2006 14:39:05 -0000	1.46
+++ sources	21 Aug 2006 17:04:00 -0000	1.47
@@ -1 +1 @@
-bce548ea8339339968e5d5da0679a51a  nautilus-2.15.91.tar.bz2
+1abe8e756117cd9d1eeaa84da3dea830  nautilus-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 17:07:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 13:07:49 -0400
Subject: rpms/gnome-themes/devel .cvsignore, 1.33, 1.34 gnome-themes.spec,
	1.65, 1.66 sources, 1.34, 1.35
Message-ID: <200608211707.k7LH7nI6004032@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-themes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3954

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	12 Aug 2006 07:48:58 -0000	1.33
+++ .cvsignore	21 Aug 2006 17:07:46 -0000	1.34
@@ -7,3 +7,4 @@
 gnome-themes-2.15.4.tar.bz2
 gnome-themes-2.15.90.tar.bz2
 gnome-themes-2.15.91.1.tar.bz2
+gnome-themes-2.15.92.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gnome-themes.spec	12 Aug 2006 07:48:58 -0000	1.65
+++ gnome-themes.spec	21 Aug 2006 17:07:46 -0000	1.66
@@ -2,7 +2,7 @@
 
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.15.91.1
+Version: 2.15.92
 Release: 1%{?dist}
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 Source: %{name}-%{version}.tar.bz2
@@ -82,6 +82,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91.1-1.fc6
 - Update to 2.15.91.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	12 Aug 2006 07:48:58 -0000	1.34
+++ sources	21 Aug 2006 17:07:46 -0000	1.35
@@ -1,2 +1,3 @@
 451ef33d1bffa261c5cbe01182199f97  clearlooks-0.6.2.tar.bz2
 9bbd4dfd2d1e44fa0d1ee3fcadff8f4c  gnome-themes-2.15.91.1.tar.bz2
+0c087f9e0f391fc9524b91bfd0270a07  gnome-themes-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 17:13:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 13:13:38 -0400
Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.18,1.19
Message-ID: <200608211713.k7LHDbGx005146@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-296/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5125

Modified Files:
	compat-gcc-296.spec 
Log Message:
2.96-138


Index: compat-gcc-296.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- compat-gcc-296.spec	10 Aug 2006 09:24:03 -0000	1.18
+++ compat-gcc-296.spec	21 Aug 2006 17:13:35 -0000	1.19
@@ -1,6 +1,6 @@
 %define DATE 20000731
 %define gcc_version 2.96
-%define gcc_release 137
+%define gcc_release 138
 Summary: 2.96-RH compatibility libraries
 Name: compat-gcc-296
 Version: %{gcc_version}
@@ -963,6 +963,10 @@
 touch gcc/c-parse.h gcc/cp/parse.h gcc/tradcif.c
 touch gcc/cstamp-h.in gcc/config.in
 
+%ifarch ppc
+sed -ie 's at -lgcc_s@-lgcc_s -lnldbl_nonshared@' libstdc++/Makefile.in
+%endif
+
 %build
 rm -fr obj-%{_target_platform}
 mkdir obj-%{_target_platform}
@@ -1064,6 +1068,9 @@
 %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o
 
 %changelog
+* Mon Aug 21 2006 Jakub Jelinek  <jakub at redhat.com> 2.96-138
+- link ppc libstdc++.so against -lnldbl_nonshared
+
 * Thu Aug 10 2006 Jakub Jelinek  <jakub at redhat.com> 2.96-137
 - remove egcs 1.1.2 compat libraries, there have been plenty
   of warnings these will go away in the last 7 years



From fedora-cvs-commits at redhat.com  Mon Aug 21 17:25:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 13:25:37 -0400
Subject: rpms/alacarte/devel .cvsignore, 1.2, 1.3 alacarte.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200608211725.k7LHPbMB024755@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24700

Modified Files:
	.cvsignore alacarte.spec sources 
Log Message:
0.9.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2006 21:17:38 -0000	1.2
+++ .cvsignore	21 Aug 2006 17:25:34 -0000	1.3
@@ -1 +1 @@
-alacarte-0.8.tar.gz
+alacarte-0.9.90.tar.bz2


Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alacarte.spec	17 Aug 2006 22:34:41 -0000	1.6
+++ alacarte.spec	21 Aug 2006 17:25:34 -0000	1.7
@@ -1,20 +1,20 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           alacarte
-Version:        0.8
-Release:        8%{?dist}
+Version:        0.9.90
+Release:        1%{?dist}
 Summary:        Simple menu editor for GNOME
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.realistanew.com/projects/alacarte/
-Source0:        http://dev.realistanew.com/alacarte/releases/%{version}/%{name}-%{version}.tar.gz
+Source0:        http://dev.realistanew.com/alacarte/releases/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  python-devel, intltool, gettext
-Requires: 	pyxdg >= 0.14
 Requires: 	pygtk2, gnome-python2-gconf 
+Requires:	gnome-menus >= 2.15.4
 Obsoletes:      smeg
 Provides:       smeg %{version}-%{release}
 %description
@@ -46,6 +46,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-1.fc6
+- Update to 0.9.90
+
 * Thu Aug 17 2006 Ray Strode <rstrode at redhat.com> - 0.8-8
 - initial build for Fedora Core
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2006 21:17:38 -0000	1.2
+++ sources	21 Aug 2006 17:25:34 -0000	1.3
@@ -1 +1 @@
-849fc35c84c81736974217bb810390b1  alacarte-0.8.tar.gz
+87cd72be97691f879e0f5de14320d1f0  alacarte-0.9.90.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 17:52:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 13:52:41 -0400
Subject: rpms/alacarte/devel alacarte.spec,1.7,1.8
Message-ID: <200608211752.k7LHqf4D020499@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20486

Modified Files:
	alacarte.spec 
Log Message:
0.9.90



Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- alacarte.spec	21 Aug 2006 17:25:34 -0000	1.7
+++ alacarte.spec	21 Aug 2006 17:52:39 -0000	1.8
@@ -27,23 +27,39 @@
 %setup -q -n %{name}-%{version}
 
 %build
-%{__python} setup.py build
+%{configure}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING
 %{python_sitelib}/Alacarte
 %{_bindir}/*
 %{_datadir}/applications/*
+%{_datadir}/alacarte
+%{_datadir}/icons/hicolor/22x22/apps/alacarte.png
+%{_datadir}/icons/hicolor/scalable/apps/alacarte.svg
 
 %changelog
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-1.fc6



From fedora-cvs-commits at redhat.com  Mon Aug 21 17:54:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 13:54:22 -0400
Subject: rpms/alacarte/devel alacarte.spec,1.8,1.9
Message-ID: <200608211754.k7LHsMwn020598@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20584

Modified Files:
	alacarte.spec 
Log Message:
bump rev



Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alacarte.spec	21 Aug 2006 17:52:39 -0000	1.8
+++ alacarte.spec	21 Aug 2006 17:54:20 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.9.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple menu editor for GNOME
 
 Group:          Applications/System



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:12:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:12:15 -0400
Subject: rpms/alacarte/devel alacarte.spec,1.9,1.10
Message-ID: <200608211812.k7LICFHs032196@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32090

Modified Files:
	alacarte.spec 
Log Message:
ifix build reqs



Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- alacarte.spec	21 Aug 2006 17:54:20 -0000	1.9
+++ alacarte.spec	21 Aug 2006 18:12:12 -0000	1.10
@@ -13,6 +13,7 @@
 BuildArch:      noarch
 
 BuildRequires:  python-devel, intltool, gettext
+BuildRequires:  pkgconfig
 Requires: 	pygtk2, gnome-python2-gconf 
 Requires:	gnome-menus >= 2.15.4
 Obsoletes:      smeg
@@ -62,6 +63,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-2.fc6
+- Add BR for pkgconfig
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-1.fc6
 - Update to 0.9.90
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:15:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:15:03 -0400
Subject: rpms/alacarte/devel alacarte.spec,1.10,1.11
Message-ID: <200608211815.k7LIF3wO000880@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv809

Modified Files:
	alacarte.spec 
Log Message:
bump rev



Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- alacarte.spec	21 Aug 2006 18:12:12 -0000	1.10
+++ alacarte.spec	21 Aug 2006 18:15:00 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.9.90
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple menu editor for GNOME
 
 Group:          Applications/System
@@ -63,7 +63,7 @@
 %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg
 
 %changelog
-* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-2.fc6
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-3.fc6
 - Add BR for pkgconfig
 
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-1.fc6



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:17:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:17:27 -0400
Subject: rpms/xorg-x11-drv-cirrus/devel xorg-x11-drv-cirrus.spec,1.11,1.12
Message-ID: <200608211817.k7LIHReW010326@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-cirrus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10095

Modified Files:
	xorg-x11-drv-cirrus.spec 
Log Message:
* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2.fc6
- Un-ExclusiveArch x86, as it should work everywhere and makes qemu much
  happier.  (#203373)



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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-cirrus.spec	12 Jul 2006 08:57:32 -0000	1.11
+++ xorg-x11-drv-cirrus.spec	21 Aug 2006 18:17:25 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 cirrus video driver
 Name:      xorg-x11-drv-cirrus
 Version:   1.1.0
-Release:   1.1
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -16,8 +16,6 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   cirrus.xinf
 
-ExclusiveArch: %{ix86}
-
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
@@ -60,7 +58,11 @@
 %{_mandir}/man4/cirrus.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2.fc6
+- Un-ExclusiveArch x86, as it should work everywhere and makes qemu much
+  happier.  (#203373)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.1.0-1.1
 - rebuild
 
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:26:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:26:40 -0400
Subject: rpms/alacarte/devel alacarte.spec,1.11,1.12
Message-ID: <200608211826.k7LIQeIY019819@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19779

Modified Files:
	alacarte.spec 
Log Message:
fix brs



Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- alacarte.spec	21 Aug 2006 18:15:00 -0000	1.11
+++ alacarte.spec	21 Aug 2006 18:26:26 -0000	1.12
@@ -15,7 +15,7 @@
 BuildRequires:  python-devel, intltool, gettext
 BuildRequires:  pkgconfig
 Requires: 	pygtk2, gnome-python2-gconf 
-Requires:	gnome-menus >= 2.15.4
+Requires:	gnome-menus-devel >= 2.15.4
 Obsoletes:      smeg
 Provides:       smeg %{version}-%{release}
 %description



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:28:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:28:34 -0400
Subject: rpms/alacarte/devel alacarte.spec,1.12,1.13
Message-ID: <200608211828.k7LISYvQ020274@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20180

Modified Files:
	alacarte.spec 
Log Message:
fix brs



Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- alacarte.spec	21 Aug 2006 18:26:26 -0000	1.12
+++ alacarte.spec	21 Aug 2006 18:28:31 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.9.90
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Simple menu editor for GNOME
 
 Group:          Applications/System
@@ -63,6 +63,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-4.fc6
+- Fix more build requires
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-3.fc6
 - Add BR for pkgconfig
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:29:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:29:28 -0400
Subject: rpms/xorg-x11-drv-cirrus/devel xorg-x11-drv-cirrus.spec,1.12,1.13
Message-ID: <200608211829.k7LITSAC020525@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-cirrus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20498

Modified Files:
	xorg-x11-drv-cirrus.spec 
Log Message:
Can't just remove ExclusiveArch, thanks s390


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-cirrus.spec	21 Aug 2006 18:17:25 -0000	1.12
+++ xorg-x11-drv-cirrus.spec	21 Aug 2006 18:29:26 -0000	1.13
@@ -13,6 +13,8 @@
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
+
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   cirrus.xinf
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:31:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:31:02 -0400
Subject: rpms/gtk-sharp2/devel .cvsignore, 1.6, 1.7 gtk-sharp2.spec, 1.16,
	1.17 sources, 1.6, 1.7
Message-ID: <200608211831.k7LIV2N1020993@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20940

Modified Files:
	.cvsignore gtk-sharp2.spec sources 
Log Message:
2.10.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Aug 2006 15:06:19 -0000	1.6
+++ .cvsignore	21 Aug 2006 18:30:58 -0000	1.7
@@ -1 +1 @@
-gtk-sharp-2.9.0.tar.bz2
+gtk-sharp-2.10.0.tar.bz2


Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gtk-sharp2.spec	18 Aug 2006 20:05:28 -0000	1.16
+++ gtk-sharp2.spec	21 Aug 2006 18:30:58 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gtk-sharp2
-Version:        2.9.0
-Release:        2%{?dist}
+Version:        2.10.0
+Release:        1%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/gtk-dotnet-2.0.pc
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-1.fc6
+- Update to 2.10.0
+
 * Fri Aug 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.0-2.fc6
 - Fix pkgconfig requires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Aug 2006 15:06:19 -0000	1.6
+++ sources	21 Aug 2006 18:30:58 -0000	1.7
@@ -1 +1 @@
-06228185cdbd34e033817940361e143f  gtk-sharp-2.9.0.tar.bz2
+7786801c53537e8c208fb9f46c22f18b  gtk-sharp-2.10.0.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:32:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:32:27 -0400
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.14,1.15
Message-ID: <200608211832.k7LIWR61021392@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21201

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 7.1-3
- Add cirrus to all arches
- Don't bother building this for s390{,x}



Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drivers.spec	12 Jul 2006 08:55:59 -0000	1.14
+++ xorg-x11-drivers.spec	21 Aug 2006 18:32:24 -0000	1.15
@@ -3,12 +3,16 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.1
-Release: 2.1
+Release: 3
 License: MIT/X11
 Group: User Interface/X Hardware Support
 URL: http://www.redhat.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# This should match the list of architectures we build the Xorg server for.
+# Note the lack of s390{,x}.
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
+
 Obsoletes: xorg-x11
 
 # *************************************************************************
@@ -19,6 +23,8 @@
 # I used the following to generate the list:
 # for a in $(< xorg-all-drivers.txt ) ; \
 #   do (echo -n "%ifarch " ;grep "^ExclusiveArch:" $a/devel/$a.spec | sed -e "s/^ExclusiveArch: //" ; echo -e "Requires: $a\n%endif\n") ; done
+#
+# XXX this is terrible.
 %ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-acecad
 %endif
@@ -51,7 +57,7 @@
 Requires: xorg-x11-drv-chips
 %endif
 
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-cirrus
 %endif
 
@@ -279,7 +285,11 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 7.1-3
+- Add cirrus to all arches
+- Don't bother building this for s390{,x}
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 7.1-2.1
 - rebuild
 
 * Thu Jun 29 2006 Mike Harris <mharris at redhat.com> 7.1-2



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:35:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:35:53 -0400
Subject: rpms/evolution/devel .cvsignore, 1.55,
	1.56 evolution-2.7.91-fix-missing-declarations.patch, 1.1,
	1.2 evolution.spec, 1.181, 1.182 sources, 1.55,
	1.56 evolution-2.7.3-submit-bug-report.patch, 1.2, NONE
Message-ID: <200608211835.k7LIZr8O022094@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22036

Modified Files:
	.cvsignore evolution-2.7.91-fix-missing-declarations.patch 
	evolution.spec sources 
Removed Files:
	evolution-2.7.3-submit-bug-report.patch 
Log Message:

* Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-1.fc6
- Update to 2.7.92
- Remove patch for RH bug #197834 (fixed upstream).
- Update patch for Gnome.org bug #351332 (partially fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	7 Aug 2006 20:37:08 -0000	1.55
+++ .cvsignore	21 Aug 2006 18:35:50 -0000	1.56
@@ -1 +1 @@
-evolution-2.7.91.tar.bz2
+evolution-2.7.92.tar.bz2

evolution-2.7.91-fix-missing-declarations.patch:
 a11y/calendar/ea-gnome-calendar.c        |    1 +
 addressbook/gui/widgets/e-minicard.c     |    1 +
 calendar/gui/alarm-notify/alarm-notify.c |    1 +
 calendar/gui/cal-search-bar.c            |    1 +
 calendar/gui/dialogs/alarm-dialog.c      |    1 +
 calendar/gui/dialogs/memo-page.h         |    2 ++
 calendar/gui/e-cal-model-tasks.h         |    1 +
 calendar/gui/e-calendar-view.h           |   12 ++++++++++++
 calendar/gui/gnome-cal.h                 |    2 ++
 composer/e-msg-composer.c                |    1 +
 e-util/e-util.h                          |    5 +++++
 mail/em-folder-view.c                    |    2 ++
 mail/em-format-html-display.c            |   22 +---------------------
 shell/e-shell-window.c                   |    7 +++++++
 widgets/misc/e-attachment-bar.h          |    1 +
 15 files changed, 39 insertions(+), 21 deletions(-)

Index: evolution-2.7.91-fix-missing-declarations.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.91-fix-missing-declarations.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.7.91-fix-missing-declarations.patch	14 Aug 2006 18:59:55 -0000	1.1
+++ evolution-2.7.91-fix-missing-declarations.patch	21 Aug 2006 18:35:50 -0000	1.2
@@ -1,5 +1,5 @@
---- evolution-2.7.91/mail/em-folder-view.c.fix-missing-declarations	2006-07-22 07:14:53.000000000 -0400
-+++ evolution-2.7.91/mail/em-folder-view.c	2006-08-13 23:05:44.000000000 -0400
+--- evolution-2.7.92/mail/em-folder-view.c.fix-missing-declarations	2006-08-21 02:32:14.000000000 -0400
++++ evolution-2.7.92/mail/em-folder-view.c	2006-08-21 13:21:27.000000000 -0400
 @@ -69,6 +69,8 @@
  #include <gtkhtml/gtkhtml.h>
  #include <gtkhtml/gtkhtml-stream.h>
@@ -9,8 +9,8 @@
  #include "menus/gal-view-etable.h"
  #include "menus/gal-view-factory-etable.h"
  #include "menus/gal-view-instance.h"
---- evolution-2.7.91/mail/em-format-html-display.c.fix-missing-declarations	2006-08-07 00:47:44.000000000 -0400
-+++ evolution-2.7.91/mail/em-format-html-display.c	2006-08-13 23:05:44.000000000 -0400
+--- evolution-2.7.92/mail/em-format-html-display.c.fix-missing-declarations	2006-08-19 01:49:24.000000000 -0400
++++ evolution-2.7.92/mail/em-format-html-display.c	2006-08-21 13:21:27.000000000 -0400
 @@ -29,6 +29,7 @@
  #include <glib.h>
  #include <glib/gstdio.h>
@@ -47,8 +47,8 @@
  #include <glade/glade.h>
  
  #include <libgnomevfs/gnome-vfs-mime-handlers.h>
---- evolution-2.7.91/a11y/calendar/ea-gnome-calendar.c.fix-missing-declarations	2004-10-29 05:56:35.000000000 -0400
-+++ evolution-2.7.91/a11y/calendar/ea-gnome-calendar.c	2006-08-13 23:05:44.000000000 -0400
+--- evolution-2.7.92/a11y/calendar/ea-gnome-calendar.c.fix-missing-declarations	2004-10-29 05:56:35.000000000 -0400
++++ evolution-2.7.92/a11y/calendar/ea-gnome-calendar.c	2006-08-21 13:21:27.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <string.h>
  #include <gtk/gtknotebook.h>
@@ -57,8 +57,8 @@
  #include <libgnome/gnome-i18n.h>
  
  static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
---- evolution-2.7.91/widgets/misc/e-attachment-bar.h.fix-missing-declarations	2006-08-14 04:01:39.000000000 -0400
-+++ evolution-2.7.91/widgets/misc/e-attachment-bar.h	2006-08-14 04:02:46.000000000 -0400
+--- evolution-2.7.92/widgets/misc/e-attachment-bar.h.fix-missing-declarations	2006-05-31 23:30:06.000000000 -0400
++++ evolution-2.7.92/widgets/misc/e-attachment-bar.h	2006-08-21 13:21:27.000000000 -0400
 @@ -82,6 +82,7 @@
  GSList *e_attachment_bar_get_selected (EAttachmentBar *bar);
  void e_attachment_bar_set_width(EAttachmentBar *bar, int bar_width);
@@ -67,44 +67,8 @@
  
  #ifdef __cplusplus
  }
---- evolution-2.7.91/widgets/misc/e-icon-entry.c.fix-missing-declarations	2006-08-07 00:47:55.000000000 -0400
-+++ evolution-2.7.91/widgets/misc/e-icon-entry.c	2006-08-13 23:05:44.000000000 -0400
-@@ -34,12 +34,9 @@
- 
- #include "config.h"
- 
-+#include <gtk/gtk.h>
- #include "e-icon-entry.h"
- 
--#include <gtk/gtkentry.h>
--#include <gtk/gtkbox.h>
--#include <gtk/gtkhbox.h>
--
- #define E_ICON_ENTRY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), E_TYPE_ICON_ENTRY, EIconEntryPrivate))
- 
- struct _EIconEntryPrivate
---- evolution-2.7.91/widgets/table/e-cell-text.c.fix-missing-declarations	2006-08-13 23:05:44.000000000 -0400
-+++ evolution-2.7.91/widgets/table/e-cell-text.c	2006-08-13 23:05:44.000000000 -0400
-@@ -45,6 +45,7 @@
- #include <gtk/gtk.h>
- #include <libgnomecanvas/gnome-canvas.h>
- #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-+#include <libgnomeprint/gnome-print-pango.h>
- 
- #include "a11y/e-table/gal-a11y-e-cell-registry.h"
- #include "a11y/e-table/gal-a11y-e-cell-text.h"
---- evolution-2.7.91/widgets/table/e-table-utils.c.fix-missing-declarations	2006-06-12 06:26:47.000000000 -0400
-+++ evolution-2.7.91/widgets/table/e-table-utils.c	2006-08-13 23:05:44.000000000 -0400
-@@ -24,6 +24,7 @@
- #include <config.h>
- 
- #include <libintl.h>		/* This file uses dgettext() but no _() */
-+#include <string.h>
- 
- #include "e-util/e-util.h"
- #include "misc/e-unicode.h"
---- evolution-2.7.91/e-util/e-util.h.fix-missing-declarations	2006-07-22 07:14:52.000000000 -0400
-+++ evolution-2.7.91/e-util/e-util.h	2006-08-13 23:05:44.000000000 -0400
+--- evolution-2.7.92/e-util/e-util.h.fix-missing-declarations	2006-07-22 07:14:52.000000000 -0400
++++ evolution-2.7.92/e-util/e-util.h	2006-08-21 13:21:27.000000000 -0400
 @@ -27,6 +27,7 @@
  #include <sys/types.h>
  #include <glib-object.h>
@@ -124,8 +88,8 @@
  #ifdef __cplusplus
  }
  #endif /* __cplusplus */
---- evolution-2.7.91/addressbook/gui/widgets/e-minicard.c.fix-missing-declarations	2006-07-22 07:14:49.000000000 -0400
-+++ evolution-2.7.91/addressbook/gui/widgets/e-minicard.c	2006-08-13 23:05:44.000000000 -0400
+--- evolution-2.7.92/addressbook/gui/widgets/e-minicard.c.fix-missing-declarations	2006-07-22 07:14:49.000000000 -0400
++++ evolution-2.7.92/addressbook/gui/widgets/e-minicard.c	2006-08-21 13:21:27.000000000 -0400
 @@ -39,6 +39,7 @@
  #include "e-minicard-label.h"
  #include "e-minicard-view.h"
@@ -134,8 +98,8 @@
  #include <e-util/e-icon-factory.h>
  #include <libebook/e-destination.h>
  #include "a11y/addressbook/ea-addressbook.h"
---- evolution-2.7.91/composer/e-msg-composer.c.fix-missing-declarations	2006-08-13 23:05:44.000000000 -0400
-+++ evolution-2.7.91/composer/e-msg-composer.c	2006-08-13 23:05:44.000000000 -0400
+--- evolution-2.7.92/composer/e-msg-composer.c.fix-missing-declarations	2006-08-21 13:21:27.000000000 -0400
++++ evolution-2.7.92/composer/e-msg-composer.c	2006-08-21 13:21:27.000000000 -0400
 @@ -61,6 +61,7 @@
  #include <gconf/gconf.h>
  #include <gconf/gconf-client.h>
@@ -144,8 +108,8 @@
  #include <libgnome/gnome-exec.h>
  #include <libgnome/gnome-i18n.h>
  #include <libgnomeui/gnome-uidefs.h>
---- evolution-2.7.91/shell/e-shell-window.c.fix-missing-declarations	2006-08-14 03:52:07.000000000 -0400
-+++ evolution-2.7.91/shell/e-shell-window.c	2006-08-14 03:54:10.000000000 -0400
+--- evolution-2.7.92/shell/e-shell-window.c.fix-missing-declarations	2006-08-21 13:21:27.000000000 -0400
++++ evolution-2.7.92/shell/e-shell-window.c	2006-08-21 13:21:27.000000000 -0400
 @@ -58,6 +58,13 @@
  
  #include <string.h>
@@ -160,8 +124,8 @@
  
  /* A view for each component.  These are all created when EShellWindow is
     instantiated, but with the widget pointers to NULL and the page number set
---- evolution-2.7.91/calendar/gui/alarm-notify/alarm-notify.c.fix-missing-declarations	2006-04-22 00:39:20.000000000 -0400
-+++ evolution-2.7.91/calendar/gui/alarm-notify/alarm-notify.c	2006-08-13 23:05:44.000000000 -0400
+--- evolution-2.7.92/calendar/gui/alarm-notify/alarm-notify.c.fix-missing-declarations	2006-04-22 00:39:20.000000000 -0400
++++ evolution-2.7.92/calendar/gui/alarm-notify/alarm-notify.c	2006-08-21 13:21:27.000000000 -0400
 @@ -25,6 +25,7 @@
  
  #include <string.h>
@@ -170,8 +134,8 @@
  #include <libedataserver/e-url.h>
  #include <libedataserverui/e-passwords.h>
  #include <libecal/e-cal.h>
---- evolution-2.7.91/calendar/gui/e-calendar-view.h.fix-missing-declarations	2006-08-07 00:47:42.000000000 -0400
-+++ evolution-2.7.91/calendar/gui/e-calendar-view.h	2006-08-14 03:59:30.000000000 -0400
+--- evolution-2.7.92/calendar/gui/e-calendar-view.h.fix-missing-declarations	2006-08-07 00:47:42.000000000 -0400
++++ evolution-2.7.92/calendar/gui/e-calendar-view.h	2006-08-21 13:21:27.000000000 -0400
 @@ -166,6 +166,18 @@
  					       gboolean new);
  
@@ -191,8 +155,8 @@
  G_END_DECLS
  
  #endif
---- evolution-2.7.91/calendar/gui/gnome-cal.h.fix-missing-declarations	2006-07-22 07:14:51.000000000 -0400
-+++ evolution-2.7.91/calendar/gui/gnome-cal.h	2006-08-13 23:05:44.000000000 -0400
+--- evolution-2.7.92/calendar/gui/gnome-cal.h.fix-missing-declarations	2006-07-22 07:14:51.000000000 -0400
++++ evolution-2.7.92/calendar/gui/gnome-cal.h	2006-08-21 13:21:27.000000000 -0400
 @@ -198,6 +198,8 @@
  						 const char* comp_uid,
  						 const char* comp_rid);
@@ -202,8 +166,8 @@
  G_END_DECLS
  
  #endif
---- evolution-2.7.91/calendar/gui/dialogs/alarm-dialog.c.fix-missing-declarations	2006-07-09 23:54:00.000000000 -0400
-+++ evolution-2.7.91/calendar/gui/dialogs/alarm-dialog.c	2006-08-13 23:05:44.000000000 -0400
+--- evolution-2.7.92/calendar/gui/dialogs/alarm-dialog.c.fix-missing-declarations	2006-07-09 23:54:00.000000000 -0400
++++ evolution-2.7.92/calendar/gui/dialogs/alarm-dialog.c	2006-08-21 13:21:27.000000000 -0400
 @@ -41,6 +41,7 @@
  #include <gtk/gtktextview.h>
  #include <gtk/gtktogglebutton.h>
@@ -212,8 +176,8 @@
  #include <bonobo/bonobo-control.h>
  #include <bonobo/bonobo-exception.h>
  #include <bonobo/bonobo-widget.h>
---- evolution-2.7.91/calendar/gui/dialogs/memo-page.h.fix-missing-declarations	2006-07-22 07:14:51.000000000 -0400
-+++ evolution-2.7.91/calendar/gui/dialogs/memo-page.h	2006-08-13 23:05:44.000000000 -0400
+--- evolution-2.7.92/calendar/gui/dialogs/memo-page.h.fix-missing-declarations	2006-07-22 07:14:51.000000000 -0400
++++ evolution-2.7.92/calendar/gui/dialogs/memo-page.h	2006-08-21 13:21:27.000000000 -0400
 @@ -53,6 +53,8 @@
  GtkType   memo_page_get_type  (void);
  MemoPage *memo_page_construct (MemoPage *epage);
@@ -223,8 +187,18 @@
  
  G_END_DECLS
  
---- evolution-2.7.91/calendar/gui/e-cal-model-tasks.h.fix-missing-declarations	2005-10-03 02:16:51.000000000 -0400
-+++ evolution-2.7.91/calendar/gui/e-cal-model-tasks.h	2006-08-13 23:05:44.000000000 -0400
+--- evolution-2.7.92/calendar/gui/cal-search-bar.c.fix-missing-declarations	2006-08-21 13:54:52.000000000 -0400
++++ evolution-2.7.92/calendar/gui/cal-search-bar.c	2006-08-21 13:55:25.000000000 -0400
+@@ -31,6 +31,7 @@
+ #include <gtk/gtksignal.h>
+ #include <libgnome/gnome-i18n.h>
+ #include <e-util/e-icon-factory.h>
++#include <libedataserver/e-categories.h>
+ #include "cal-search-bar.h"
+ 
+ typedef struct CALSearchBarItem {
+--- evolution-2.7.92/calendar/gui/e-cal-model-tasks.h.fix-missing-declarations	2005-10-03 02:16:51.000000000 -0400
++++ evolution-2.7.92/calendar/gui/e-cal-model-tasks.h	2006-08-21 13:21:27.000000000 -0400
 @@ -62,6 +62,7 @@
  ECalModelTasks *e_cal_model_tasks_new (void);
  


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- evolution.spec	15 Aug 2006 14:55:51 -0000	1.181
+++ evolution.spec	21 Aug 2006 18:35:50 -0000	1.182
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.7.91
-Release: 5%{?dist}
+Version: 2.7.92
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -107,23 +107,23 @@
 # RH bug #166231 / Gnome.org bug #264485
 Patch27: evolution-2.7.3-replicated-cjk-input.patch
 
-# RH bug #197834 / Gnome.org bug #346797
-Patch28: evolution-2.7.3-submit-bug-report.patch
-
 # RH bug #178295 / Gnome.org bug #348638
-Patch29: evolution-2.7.4-deleting-preedit-buffer.patch
+Patch28: evolution-2.7.4-deleting-preedit-buffer.patch
 
 # RH bug #197868 / Gnome.org bug #350823
-Patch30: evolution-2.7.91-default-mailer.patch
+Patch29: evolution-2.7.91-default-mailer.patch
 
 # Gnome.org bug #351332
-Patch31: evolution-2.7.91-fix-missing-declarations.patch
+Patch30: evolution-2.7.91-fix-missing-declarations.patch
 
 # RH bug #202383 / Gnome.org bug #351263
-Patch32: evolution-2.7.91-fix-duplicate-alarm.patch
+Patch31: evolution-2.7.91-fix-duplicate-alarm.patch
 
 # RH bug #201831 / Gnome.org bug #350901
-Patch33: evolution-2.7.91-mail-account-disable.patch
+Patch32: evolution-2.7.91-mail-account-disable.patch
+
+# Gnome.org bug #352248
+Patch33: evolution-2.7.91-provide-camel-exception.patch
 
 ### Dependencies ###
 
@@ -254,12 +254,12 @@
 %patch25 -p1 -b .candidate-window-position-calendar
 %patch26 -p1 -b .filter-datespec
 %patch27 -p1 -b .replicated-cjk-input
-%patch28 -p1 -b .submit-bug-report
-%patch29 -p1 -b .deleting-preedit-buffer
-%patch30 -p1 -b .default-mailer
-%patch31 -p1 -b .fix-missing-declarations
-%patch32 -p1 -b .fix-duplicate-alarm
-%patch33 -p1 -b .mail-account-disable
+%patch28 -p1 -b .deleting-preedit-buffer
+%patch29 -p1 -b .default-mailer
+%patch30 -p1 -b .fix-missing-declarations
+%patch31 -p1 -b .fix-duplicate-alarm
+%patch32 -p1 -b .mail-account-disable
+%patch33 -p1 -b .provide-camel-exception
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -650,6 +650,11 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-1.fc6
+- Update to 2.7.92
+- Remove patch for RH bug #197834 (fixed upstream).
+- Update patch for Gnome.org bug #351332 (partially fixed upstream).
+
 * Tue Aug 15 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-5.fc6
 - Drop the bug-buddy dependency since it's not required for Evolution to run.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	7 Aug 2006 20:37:08 -0000	1.55
+++ sources	21 Aug 2006 18:35:50 -0000	1.56
@@ -1 +1 @@
-c7aa347eb188d53b22941129d9300fb4  evolution-2.7.91.tar.bz2
+2c8e3e26b8861365e61e7a93713a204b  evolution-2.7.92.tar.bz2


--- evolution-2.7.3-submit-bug-report.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:37:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:37:38 -0400
Subject: rpms/alacarte/devel alacarte.spec,1.13,1.14
Message-ID: <200608211837.k7LIbcYU022649@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22588

Modified Files:
	alacarte.spec 
Log Message:
and again



Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- alacarte.spec	21 Aug 2006 18:28:31 -0000	1.13
+++ alacarte.spec	21 Aug 2006 18:37:35 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.9.90
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple menu editor for GNOME
 
 Group:          Applications/System
@@ -14,8 +14,9 @@
 
 BuildRequires:  python-devel, intltool, gettext
 BuildRequires:  pkgconfig
+BuildRequires:	gnome-menus >= 2.15.4
 Requires: 	pygtk2, gnome-python2-gconf 
-Requires:	gnome-menus-devel >= 2.15.4
+Requires:	gnome-menus >= 2.15.4
 Obsoletes:      smeg
 Provides:       smeg %{version}-%{release}
 %description
@@ -63,7 +64,7 @@
 %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg
 
 %changelog
-* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-4.fc6
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-5.fc6
 - Fix more build requires
 
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-3.fc6



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:40:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:40:24 -0400
Subject: rpms/evolution-connector/devel .cvsignore, 1.37,
	1.38 evolution-connector.spec, 1.75, 1.76 sources, 1.37, 1.38
Message-ID: <200608211840.k7LIeOjf023378@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23278

Modified Files:
	.cvsignore evolution-connector.spec sources 
Log Message:

* Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-1
- Update to 2.7.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	7 Aug 2006 19:53:50 -0000	1.37
+++ .cvsignore	21 Aug 2006 18:40:22 -0000	1.38
@@ -1 +1 @@
-evolution-exchange-2.7.91.tar.bz2
+evolution-exchange-2.7.92.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- evolution-connector.spec	8 Aug 2006 02:58:59 -0000	1.75
+++ evolution-connector.spec	21 Aug 2006 18:40:22 -0000	1.76
@@ -18,8 +18,8 @@
 ### Abstract ###
 
 Name: evolution-connector
-Version: 2.7.91
-Release: 2
+Version: 2.7.92
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -126,6 +126,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-1
+- Update to 2.7.92
+
 * Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.91-2
 - Rebuild against correct evolution-data-server.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	7 Aug 2006 19:53:50 -0000	1.37
+++ sources	21 Aug 2006 18:40:22 -0000	1.38
@@ -1 +1 @@
-2103cce17b5da9851e72014c2e94faeb  evolution-exchange-2.7.91.tar.bz2
+d76c93ec2fc73de244aa528df912a51f  evolution-exchange-2.7.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:42:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:42:44 -0400
Subject: rpms/yaboot/devel yaboot-1.3.13-multisata.patch,1.1,1.2
Message-ID: <200608211842.k7LIgiid023880@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23867

Modified Files:
	yaboot-1.3.13-multisata.patch 
Log Message:
yaboot-1.3.13-multisata.patch

yaboot-1.3.13-multisata.patch:
 ofpath |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

Index: yaboot-1.3.13-multisata.patch
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot-1.3.13-multisata.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.13-multisata.patch	9 Feb 2006 17:38:21 -0000	1.1
+++ yaboot-1.3.13-multisata.patch	21 Aug 2006 18:42:39 -0000	1.2
@@ -1,16 +1,30 @@
---- yaboot-1.3.13/ybin/ofpath.multisata	2006-02-09 12:32:37.000000000 -0500
-+++ yaboot-1.3.13/ybin/ofpath	2005-12-02 18:30:25.000000000 -0500
-@@ -298,10 +298,10 @@
+--- yaboot-1.3.13/ybin/ofpath.multisata	2006-08-21 14:30:50.000000000 -0400
++++ yaboot-1.3.13/ybin/ofpath	2006-08-21 14:41:28.000000000 -0400
+@@ -298,10 +298,24 @@
  	    echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION"
  	    ;;
  	ata_k2|sata_svw)
 -	    HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do
 -			lgrep "$i" "k2-s-ata" ; done)"
++            #Not all G5 device trees have a compatible "k2-sata" node 
++            #per channel use parent
 +	    HOST_LIST="$(for i in `find /proc/device-tree -name compatible ` ; do
-+			lgrep "$i" "k2-sata" ; done | sort)"
++			lgrep "$i" "k2-s-ata" ; done | sort)"
  	    DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
 -	    echo "${DEVICE_PATH##*device-tree}/k2-sata@$DEVICE_ID/disk at 0:$PARTITION"
-+	    echo "${DEVICE_PATH##*device-tree}/disk at 0:$PARTITION"
++	    K2_DEVICE_ID=0
++	    while [ "$DEVICE_PATH" = "" ] ; do
++	        SCSI_HOSTNUMBER=`expr $SCSI_HOSTNUMBER - 1`
++	        let "K2_DEVICE_ID += 1"
++	        DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
++	    done
++	    echo "${DEVICE_PATH##*device-tree}/k2-sata@$K2_DEVICE_ID/disk at 0:$PARTITION"
++	    ;;
++        sbp2)
++            HOST_LIST="$(for i in `find /proc/device-tree -name name` ; do
++                        lgrep "$i" "sbp-2" ; done)"
++            DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
++            echo "${DEVICE_PATH##*device-tree}/disk at 0:$PARTITION"
  	    ;;
  	*)
  	    echo 1>&2 "$PRG: Driver: $SCSI_DRIVER is not supported"



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:43:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:43:21 -0400
Subject: rpms/alacarte/devel alacarte.spec,1.14,1.15
Message-ID: <200608211843.k7LIhLFE024083@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24039

Modified Files:
	alacarte.spec 
Log Message:
grr



Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- alacarte.spec	21 Aug 2006 18:37:35 -0000	1.14
+++ alacarte.spec	21 Aug 2006 18:43:19 -0000	1.15
@@ -14,7 +14,7 @@
 
 BuildRequires:  python-devel, intltool, gettext
 BuildRequires:  pkgconfig
-BuildRequires:	gnome-menus >= 2.15.4
+BuildRequires:	gnome-menus-devel >= 2.15.4
 Requires: 	pygtk2, gnome-python2-gconf 
 Requires:	gnome-menus >= 2.15.4
 Obsoletes:      smeg



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:45:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:45:24 -0400
Subject: rpms/alacarte/devel alacarte.spec,1.15,1.16
Message-ID: <200608211845.k7LIjOLA024565@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24523

Modified Files:
	alacarte.spec 
Log Message:
grr



Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- alacarte.spec	21 Aug 2006 18:43:19 -0000	1.15
+++ alacarte.spec	21 Aug 2006 18:45:22 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.9.90
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple menu editor for GNOME
 
 Group:          Applications/System
@@ -64,7 +64,7 @@
 %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg
 
 %changelog
-* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-5.fc6
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-6.fc6
 - Fix more build requires
 
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-3.fc6



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:46:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:46:21 -0400
Subject: rpms/evolution/devel evolution-2.7.91-provide-camel-exception.patch,
	NONE, 1.1 evolution.spec, 1.182, 1.183
Message-ID: <200608211846.k7LIkLR7025046@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24758

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.91-provide-camel-exception.patch 
Log Message:

* Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-2.fc6
- Add patch for Gnome.org bug #352248 (and remember to commit it).


evolution-2.7.91-provide-camel-exception.patch:
 mail-send-recv.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE evolution-2.7.91-provide-camel-exception.patch ---
--- evolution-2.7.91/mail/mail-send-recv.c.provide-camel-exception	2006-08-21 06:28:36.000000000 -0400
+++ evolution-2.7.91/mail/mail-send-recv.c	2006-08-21 06:35:09.000000000 -0400
@@ -286,13 +286,17 @@
 static send_info_t get_receive_type(const char *url)
 {
 	CamelProvider *provider;
+	CamelException ex;
 
 	/* HACK: since mbox is ALSO used for native evolution trees now, we need to
 	   fudge this to treat it as a special 'movemail' source */
 	if (!strncmp(url, "mbox:", 5))
 		return SEND_RECEIVE;
 
-	provider = camel_provider_get(url, NULL);
+	camel_exception_init (&ex);
+	provider = camel_provider_get(url, &ex);
+	camel_exception_clear (&ex);
+
 	if (!provider)
 		return SEND_INVALID;
 	


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- evolution.spec	21 Aug 2006 18:35:50 -0000	1.182
+++ evolution.spec	21 Aug 2006 18:46:19 -0000	1.183
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -650,6 +650,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-2.fc6
+- Add patch for Gnome.org bug #352248 (and remember to commit it).
+
 * Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-1.fc6
 - Update to 2.7.92
 - Remove patch for RH bug #197834 (fixed upstream).



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:47:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:47:50 -0400
Subject: rpms/yaboot/devel yaboot.spec,1.36,1.37
Message-ID: <200608211847.k7LIloUU026940@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26538

Modified Files:
	yaboot.spec 
Log Message:
Fix multisata


Index: yaboot.spec
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- yaboot.spec	12 Jul 2006 09:24:35 -0000	1.36
+++ yaboot.spec	21 Aug 2006 18:47:47 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 0.18.1
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -108,6 +108,9 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Mon Aug 21 2006 Paul Nasrat <pnasrat at redhat.com> - 1.3.13-1
+- Fix multi disk G5 patch for all cases
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.13-0.18.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 18:49:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 14:49:39 -0400
Subject: rpms/eog/devel .cvsignore, 1.35, 1.36 eog.spec, 1.57, 1.58 sources,
	1.35, 1.36
Message-ID: <200608211849.k7LInd3Q001576@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv957

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	12 Aug 2006 23:25:59 -0000	1.35
+++ .cvsignore	21 Aug 2006 18:49:36 -0000	1.36
@@ -1 +1 @@
-eog-2.15.91.tar.bz2
+eog-2.15.92.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- eog.spec	12 Aug 2006 23:25:59 -0000	1.57
+++ eog.spec	21 Aug 2006 18:49:36 -0000	1.58
@@ -12,7 +12,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.15.91
+Version: 2.15.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
@@ -106,6 +106,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	12 Aug 2006 23:25:59 -0000	1.35
+++ sources	21 Aug 2006 18:49:36 -0000	1.36
@@ -1 +1 @@
-fd6860e07df2f3ec50fec052c999a121  eog-2.15.91.tar.bz2
+f0227269fe5568e03e58f228d9e41288  eog-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 19:02:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 15:02:08 -0400
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.36,1.37
Message-ID: <200608211902.k7LJ20kT013247@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13160

Modified Files:
	gnome-menus.spec 
Log Message:
add reqs



Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-menus.spec	12 Aug 2006 21:53:56 -0000	1.36
+++ gnome-menus.spec	21 Aug 2006 19:01:57 -0000	1.37
@@ -7,7 +7,7 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.15.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -20,6 +20,7 @@
 BuildRequires: gamin-devel
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
+BuildRequires: pkgconfig
 
 %description
 gnome-menus is an implementation of the draft "Desktop
@@ -32,6 +33,10 @@
 Summary: Libraries and include files for the GNOME menu system
 Group: Development/Libraries
 Requires:   %{name} = %{version}
+Requires: glib2-devel >= 2.6.0
+Requires: %{python}-devel >= 2.3.0
+Requires: gamin-devel
+Requires: pkgconfig
 
 %description devel
 This package provides the necessary development libraries for 
@@ -91,6 +96,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-2.fc6
+- Add Requires to the -devel package
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 19:03:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 15:03:41 -0400
Subject: rpms/jakarta-commons-validator/devel jakarta-commons-validator.spec,
	1.14, 1.15
Message-ID: <200608211903.k7LJ3fwT013503@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-validator/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13449

Modified Files:
	jakarta-commons-validator.spec 
Log Message:

Move rebuild-gcj-db to correct postun section




Index: jakarta-commons-validator.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-validator/devel/jakarta-commons-validator.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jakarta-commons-validator.spec	15 Aug 2006 18:48:54 -0000	1.14
+++ jakarta-commons-validator.spec	21 Aug 2006 19:03:39 -0000	1.15
@@ -41,7 +41,7 @@
 Summary:        Jakarta Commons Validator
 Name:           jakarta-%{short_name}
 Version:        1.1.4
-Release:        4jpp.1
+Release:        5jpp.1
 Epoch:          0
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -170,13 +170,6 @@
 fi
 %endif
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %postun
 # Note that we're using versioned catalog, so this is always ok.
 if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
@@ -185,6 +178,13 @@
     %{_datadir}/sgml/%{name}/catalog > /dev/null || :
 fi
 
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -196,13 +196,6 @@
 
 # -----------------------------------------------------------------------------
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt NOTICE.txt
@@ -220,6 +213,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Aug 18 2006 Deepak Bhole <dbhole at redhat.com> -  0:1.1.4-5jpp.1
+- Move rebuild-gcj-db to correct postun section
+
 * Tue Aug 15 2006 Deepak Bhole <dbhole at redhat.com> -  0:1.1.4-4jpp.1
 - Added missing post/postun for javadoc.
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 19:04:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 15:04:49 -0400
Subject: rpms/gnome-sharp/devel .cvsignore, 1.2, 1.3 gnome-sharp.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200608211904.k7LJ4nGm013895@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13680

Modified Files:
	.cvsignore gnome-sharp.spec sources 
Log Message:
fix requires



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-sharp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2006 14:44:05 -0000	1.2
+++ .cvsignore	21 Aug 2006 19:04:46 -0000	1.3
@@ -1 +1 @@
-gnome-sharp-2.15.0.tar.bz2
+gnome-sharp-2.16.0.tar.bz2


Index: gnome-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-sharp/devel/gnome-sharp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-sharp.spec	19 Aug 2006 02:42:32 -0000	1.3
+++ gnome-sharp.spec	21 Aug 2006 19:04:46 -0000	1.4
@@ -1,19 +1,19 @@
 Name:           gnome-sharp
-Version:        2.15.0
-Release:        2%{?dist}
+Version:        2.16.0
+Release:        1%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.15/
-Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.15/gnome-sharp-%{version}.tar.bz2
+URL:            ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.16/
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.16/gnome-sharp-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gnome-sharp-2.15.0-libdir.patch
 
 BuildRequires:  mono-devel gtk2-devel libart_lgpl-devel gnome-vfs2-devel libgnomecanvas-devel libgnomeui-devel
-BuildRequires:  gtk-sharp2-devel >= 2.9.0
-BuildRequires:  gtk-sharp2-gapi >= 2.9.0
+BuildRequires:  gtk-sharp2-devel >= 2.10.0
+BuildRequires:  gtk-sharp2-gapi >= 2.10.0
 BuildRequires:  librsvg2-devel gtkhtml3-devel vte-devel gnome-panel-devel
 BuildRequires:  libgnomeprintui22-devel
 BuildRequires:  automake, libtool
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/*-sharp-2.0.pc
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-1.fc6
+- Update to 2.16.0
+
 * Fri Aug 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.0-2.fc6
 - Require pkgconfig, not pkg-config
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-sharp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2006 14:44:05 -0000	1.2
+++ sources	21 Aug 2006 19:04:46 -0000	1.3
@@ -1 +1 @@
-757734d783df2cad2c30bff122acd774  gnome-sharp-2.15.0.tar.bz2
+09034669acec52f9d9818d9a31c032d5  gnome-sharp-2.16.0.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 19:05:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 15:05:55 -0400
Subject: rpms/xorg-x11-drv-amd/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xorg-x11-drv-amd.spec, 1.9, 1.10
Message-ID: <200608211905.k7LJ5t1d014307@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-amd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14273/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-amd.spec 
Log Message:
auto-import xorg-x11-drv-amd-0.0-5.20060821git.fc6 on branch devel from xorg-x11-drv-amd-0.0-5.20060821git.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Aug 2006 16:10:18 -0000	1.4
+++ .cvsignore	21 Aug 2006 19:05:52 -0000	1.5
@@ -1 +1 @@
-xf86-video-amd-0.0-git20060816.tar.bz2
+xf86-video-amd-0.0-git20060821.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Aug 2006 16:10:18 -0000	1.4
+++ sources	21 Aug 2006 19:05:52 -0000	1.5
@@ -1 +1 @@
-abdfa09937b4b0833e6786e09002aebd  xf86-video-amd-0.0-git20060816.tar.bz2
+5f9c1dbf1088120175e3b2b7d6265010  xf86-video-amd-0.0-git20060821.tar.bz2


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-amd.spec	16 Aug 2006 17:47:39 -0000	1.9
+++ xorg-x11-drv-amd.spec	21 Aug 2006 19:05:52 -0000	1.10
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20060816
+%define gitdate 20060821
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   4.%{gitdate}git%{?dist}
+Release:   5.%{gitdate}git%{?dist}
 URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
@@ -70,6 +70,9 @@
 %{_mandir}/man4/amd.4*
 
 %changelog
+* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 0.0-5.20060821git.fc6
+- Today's snapshot: EXA fixes.
+
 * Wed Aug 16 2006 Adam Jackson <ajackson at redhat.com> 0.0-4.20060816git.fc6
 - Un-reset the Release: number.
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 19:11:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 15:11:53 -0400
Subject: rpms/gnome-speech/devel .cvsignore, 1.14, 1.15 gnome-speech.spec,
	1.30, 1.31 sources, 1.14, 1.15
Message-ID: <200608211911.k7LJBrs7015802@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-speech/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15761

Modified Files:
	.cvsignore gnome-speech.spec sources 
Log Message:
0.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Aug 2006 20:38:27 -0000	1.14
+++ .cvsignore	21 Aug 2006 19:11:50 -0000	1.15
@@ -1 +1 @@
-gnome-speech-0.4.2.tar.bz2
+gnome-speech-0.4.4.tar.bz2


Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnome-speech.spec	4 Aug 2006 20:38:27 -0000	1.30
+++ gnome-speech.spec	21 Aug 2006 19:11:50 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary: GNOME Text to Speech
 Name: gnome-speech
-Version: 0.4.2
+Version: 0.4.4
 Release: 1%{?dist}
 License: LGPL
 Group: Desktop/Accessibility
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.4-1.fc6
+- Update to 0.4.4
+
 * Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.2-1.fc6
 - Update to 0.4.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Aug 2006 20:38:27 -0000	1.14
+++ sources	21 Aug 2006 19:11:50 -0000	1.15
@@ -1 +1 @@
-df06441a5b560830264c0557e3d3c376  gnome-speech-0.4.2.tar.bz2
+c26dde244c969d7a00b229f256e77546  gnome-speech-0.4.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 19:34:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 15:34:45 -0400
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.34,
	1.35 gnome-system-monitor.spec, 1.57, 1.58 sources, 1.34, 1.35
Message-ID: <200608211934.k7LJYjWA005780@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5541

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	12 Aug 2006 22:38:05 -0000	1.34
+++ .cvsignore	21 Aug 2006 19:34:42 -0000	1.35
@@ -1 +1 @@
-gnome-system-monitor-2.15.91.tar.bz2
+gnome-system-monitor-2.15.92.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnome-system-monitor.spec	12 Aug 2006 22:38:06 -0000	1.57
+++ gnome-system-monitor.spec	21 Aug 2006 19:34:42 -0000	1.58
@@ -10,7 +10,7 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.15.91
+Version: 2.15.92
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -95,6 +95,9 @@
 %{_datadir}/omf
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	12 Aug 2006 22:38:06 -0000	1.34
+++ sources	21 Aug 2006 19:34:42 -0000	1.35
@@ -1 +1 @@
-370b64f3b543390592058e39a64c91e7  gnome-system-monitor-2.15.91.tar.bz2
+1299558e913098414ce16042991cfa34  gnome-system-monitor-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 19:41:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 15:41:04 -0400
Subject: rpms/pygtk2/devel pygtk.spec,1.64,1.65
Message-ID: <200608211941.k7LJf4PR007676@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7626

Modified Files:
	pygtk.spec 
Log Message:
include docs



Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- pygtk.spec	14 Aug 2006 02:44:44 -0000	1.64
+++ pygtk.spec	21 Aug 2006 19:41:01 -0000	1.65
@@ -3,7 +3,7 @@
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
 Version: 2.9.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -25,6 +25,8 @@
 BuildRequires: pycairo-devel >= 0.5.0
 BuildRequires: pygobject2-devel >= 2.11.2 
 BuildRequires: libtool
+Buildrequires: libxslt
+Buildrequires: docbook-style-xsl
 
 Patch1: pygtk-2.9.3-init.patch
 Patch2: pygtk-2.9.3-crazy-reload-hack.patch
@@ -115,8 +117,12 @@
 %{_prefix}/share/pygtk/2.0/codegen/*
 %{_prefix}/share/pygtk/2.0/defs/*.defs
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
+%{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.6-2.fc6
+- Include docs 
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.6-1.fc6
 - Update to 2.9.6
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 19:44:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 15:44:16 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.20, 1.21 setroubleshoot.init,
	1.6, 1.7 setroubleshoot.spec, 1.25, 1.26 sources, 1.23, 1.24
Message-ID: <200608211944.k7LJiGQc008540@cvs.devel.redhat.com>

Author: jdennis

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8505/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.27-1 on branch devel from setroubleshoot-0.27-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	21 Aug 2006 15:18:36 -0000	1.20
+++ .cvsignore	21 Aug 2006 19:44:14 -0000	1.21
@@ -1 +1 @@
-setroubleshoot-0.25.tar.gz
+setroubleshoot-0.27.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- setroubleshoot.init	21 Aug 2006 15:18:36 -0000	1.6
+++ setroubleshoot.init	21 Aug 2006 19:44:14 -0000	1.7
@@ -74,6 +74,16 @@
     return 0
 }
 
+cleardb(){
+    running=0
+    [ -e /var/lock/subsys/$prog ] && running=1
+    [ $running == 1 ] && stop
+    echo $"Clearing database"
+    rm -f /var/lib/setroubleshoot/database.xml
+    [ $running == 1 ] && start
+    return 0
+}
+
 
 # See how we were called.
 case "$1" in
@@ -95,8 +105,11 @@
     condrestart)
 	condrestart
 	;;
+    cleardb)
+	cleardb
+	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|cleardb}"
 	RETVAL=3
 esac
 


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- setroubleshoot.spec	21 Aug 2006 15:18:36 -0000	1.25
+++ setroubleshoot.spec	21 Aug 2006 19:44:14 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.25
+Version: 0.27
 Release: 1
 License: GPL
 Group: Applications/System
@@ -72,9 +72,8 @@
     /sbin/chkconfig --del %{name}
 fi
 
-%triggerpostun -- setroubleshoot <= 0.9-1
-/sbin/chkconfig --del %{name}
-/sbin/chkconfig --add %{name}
+%triggerpostun -- setroubleshoot <= 0.25-1
+/sbin/service %{name} cleardb
 
 %postun 
 /usr/bin/update-desktop-database %{_datadir}/applications
@@ -89,8 +88,12 @@
 %{_sbindir}/*
 %{pkgpythondir}
 %{pkgdatadir}
-%config(noreplace) %{pkgconfigdir}/%{name}.cfg
-%dir %attr(0777,root,root) %{pkglogdir}
+# Note: it is explicitly known the config file is not noreplace,
+# this is because the config file during active development changes
+# so much it's worse to be incompatible than lose a user modified value
+# We'll set it back to noreplace when things stablize
+%config %{pkgconfigdir}/%{name}.cfg
+%dir %{pkglogdir}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %dir %{pkgrundir}
 %dir %{pkgvardatadir}
@@ -102,6 +105,35 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Mon Aug 21 2006 John Dennis <jdennis at redhat.com> - 0.27-1
+	* load_plugins() now catches exceptions when a plugin won't load,
+	reports the traceback in the log file, and continues with the next
+	plugin. Previously a bad plugin caused the entire plugin loading
+	to abort and no plugins were loaded.
+	
+	* Add "daemon_name" to automake variables, change pid file to match
+
+	* turn off "noreplace" on config file till things settle down a bit
+
+	* browser.py now validates data, also test for missing column data in the
+	cell_data function to avoid exceptions.
+
+	* add stub for analyzie_logfile() rpc call
+
+	* turn off balloon notifications by default in config file,
+	libnotify is just plain busted at this point :-(
+
+	* only the setroubleshootd daemon creates it's log file
+	under /var/log now, the user app's do it in /tmp, change file
+	permissions on /var/log/setroubleshoot back to 0644.
+
+	* sealert now looks up the username rather than hardcoding it to "foo"
+	
+	* CamelCase to lowercase_underscore clean up
+
+* Mon Aug 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.26-1
+- Zero out datbase.xml for updated browser
+
 * Mon Aug 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.25-1
 - Fix 64 bit issue that caused runaway problem
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	21 Aug 2006 15:18:36 -0000	1.23
+++ sources	21 Aug 2006 19:44:14 -0000	1.24
@@ -1 +1 @@
-adfbe964a43e47c7afbcf7102f01f6d8  setroubleshoot-0.25.tar.gz
+6ebf7e9cb8bbc91c3634b3452b79c2a5  setroubleshoot-0.27.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 21 19:45:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 15:45:10 -0400
Subject: rpms/pygobject2/devel .cvsignore, 1.4, 1.5 pygobject2.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <200608211945.k7LJjAKr009016@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygobject2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8955

Modified Files:
	.cvsignore pygobject2.spec sources 
Log Message:
2.11.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Aug 2006 22:20:50 -0000	1.4
+++ .cvsignore	21 Aug 2006 19:45:08 -0000	1.5
@@ -1 +1 @@
-pygobject-2.11.2.tar.bz2
+pygobject-2.11.3.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pygobject2.spec	14 Aug 2006 02:13:04 -0000	1.10
+++ pygobject2.spec	21 Aug 2006 19:45:08 -0000	1.11
@@ -3,8 +3,8 @@
 
 Summary: Python bindings for gobjects
 Name: pygobject2
-Version: 2.11.2
-Release: 2%{?dist}
+Version: 2.11.3
+Release: 1%{?dist}
 License: LGPL
 Group: Development/Languages
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.10/
@@ -73,6 +73,9 @@
 %{_datadir}/pygobject
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.3-1.fc6
+- Update to 2.11.3
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.2-2.fc6
 - BR libxslt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Aug 2006 22:20:50 -0000	1.4
+++ sources	21 Aug 2006 19:45:08 -0000	1.5
@@ -1 +1 @@
-ca5d9a6336f6b82fca90481683f5acef  pygobject-2.11.2.tar.bz2
+31e4da79d27d7941c36ea549acce8da6  pygobject-2.11.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 19:48:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 15:48:24 -0400
Subject: rpms/atk/devel .cvsignore, 1.22, 1.23 atk.spec, 1.39, 1.40 sources,
	1.22, 1.23
Message-ID: <200608211948.k7LJmOcY025400@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/atk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25350

Modified Files:
	.cvsignore atk.spec sources 
Log Message:
1.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	12 Jul 2006 06:06:53 -0000	1.22
+++ .cvsignore	21 Aug 2006 19:48:22 -0000	1.23
@@ -1 +1 @@
-atk-1.12.1.tar.bz2
+atk-1.12.2.tar.bz2


Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- atk.spec	12 Jul 2006 13:27:58 -0000	1.39
+++ atk.spec	21 Aug 2006 19:48:22 -0000	1.40
@@ -1,9 +1,9 @@
 %define glib2_version 2.6.0
 
-Summary: Interfaces for accessibility support.
+Summary: Interfaces for accessibility support
 Name: atk
-Version: 1.12.1
-Release: 2
+Version: 1.12.2
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: atk-%{version}.tar.bz2 
@@ -69,6 +69,9 @@
 %{_datadir}/gtk-doc/
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.12.2-1.fc6
+- Update to 1.12.2
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.12.1-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	12 Jul 2006 06:06:54 -0000	1.22
+++ sources	21 Aug 2006 19:48:22 -0000	1.23
@@ -1 +1 @@
-df1564d233944b1be0c596761464e53e  atk-1.12.1.tar.bz2
+c753b04801c6c3334a9e0ec54551ace4  atk-1.12.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 19:52:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 15:52:30 -0400
Subject: rpms/pango/devel .cvsignore, 1.39, 1.40 pango.spec, 1.81,
	1.82 sources, 1.39, 1.40
Message-ID: <200608211952.k7LJqUTh027083@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27028

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	9 Aug 2006 06:06:20 -0000	1.39
+++ .cvsignore	21 Aug 2006 19:52:27 -0000	1.40
@@ -1 +1 @@
-pango-1.14.0.tar.bz2
+pango-1.14.1.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- pango.spec	17 Aug 2006 19:31:29 -0000	1.81
+++ pango.spec	21 Aug 2006 19:52:27 -0000	1.82
@@ -7,8 +7,8 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.14.0
-Release: 3
+Version: 1.14.1
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.14.1-1.fc6
+- Update to 1.14.1
+
 * Thu Aug 17 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.14.0-3
 - Bump glib requirement to 2.12.0. (bug #201586)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	9 Aug 2006 06:06:20 -0000	1.39
+++ sources	21 Aug 2006 19:52:27 -0000	1.40
@@ -1 +1 @@
-39144843f377ec6b60dbbf1a25d2a49a  pango-1.14.0.tar.bz2
+cc478fa5bfc49e631a1696c632a9a9ae  pango-1.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:06:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:06:32 -0400
Subject: rpms/alacarte/devel alacarte.spec,1.16,1.17
Message-ID: <200608212006.k7LK6Wjo030515@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30458

Modified Files:
	alacarte.spec 
Log Message:
fix more brs 



Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- alacarte.spec	21 Aug 2006 18:45:22 -0000	1.16
+++ alacarte.spec	21 Aug 2006 20:06:21 -0000	1.17
@@ -13,6 +13,7 @@
 BuildArch:      noarch
 
 BuildRequires:  python-devel, intltool, gettext
+BuildRequires:  pygtk2-devel
 BuildRequires:  pkgconfig
 BuildRequires:	gnome-menus-devel >= 2.15.4
 Requires: 	pygtk2, gnome-python2-gconf 



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:07:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:07:16 -0400
Subject: rpms/alacarte/devel alacarte.spec,1.17,1.18
Message-ID: <200608212007.k7LK7G1V030702@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/alacarte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30656

Modified Files:
	alacarte.spec 
Log Message:
bump rev



Index: alacarte.spec
===================================================================
RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- alacarte.spec	21 Aug 2006 20:06:21 -0000	1.17
+++ alacarte.spec	21 Aug 2006 20:07:13 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.9.90
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Simple menu editor for GNOME
 
 Group:          Applications/System
@@ -65,7 +65,7 @@
 %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg
 
 %changelog
-* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-6.fc6
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-7.fc6
 - Fix more build requires
 
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.90-3.fc6



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:09:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:09:27 -0400
Subject: rpms/at-spi/devel .cvsignore, 1.26, 1.27 at-spi.spec, 1.49,
	1.50 sources, 1.26, 1.27
Message-ID: <200608212009.k7LK9RRX031436@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31341

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.7.11



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	2 Aug 2006 20:58:02 -0000	1.26
+++ .cvsignore	21 Aug 2006 20:09:24 -0000	1.27
@@ -1 +1 @@
-at-spi-1.7.10.tar.bz2
+at-spi-1.7.11.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- at-spi.spec	2 Aug 2006 20:58:02 -0000	1.49
+++ at-spi.spec	21 Aug 2006 20:09:24 -0000	1.50
@@ -6,7 +6,7 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.7.10
+Version: 1.7.11
 Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
@@ -49,6 +49,7 @@
 Requires: libbonobo-devel >= %{libbonobo_version}
 Requires: ORBit2-devel >= %{orbit2_version}
 Requires: gail-devel >= %{gail_version}
+Requires: pkgconfig
 
 %description devel
 Libraries and header files allowing compilation of apps that use at-spi.
@@ -97,6 +98,10 @@
 %{_includedir}/* 
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.11-1.fc6
+- Update to 1.7.11
+- Require pkgconfig in the -devel package
+
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.10-1.fc6
 - Update to 1.7.10
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	2 Aug 2006 20:58:02 -0000	1.26
+++ sources	21 Aug 2006 20:09:24 -0000	1.27
@@ -1 +1 @@
-4d233cbccb69865c07358d04e97d86cf  at-spi-1.7.10.tar.bz2
+f9770a342c311a5d7bcff0dcb6fd9369  at-spi-1.7.11.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:14:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:14:31 -0400
Subject: rpms/gail/devel .cvsignore, 1.21, 1.22 gail.spec, 1.48, 1.49 sources,
	1.21, 1.22
Message-ID: <200608212014.k7LKEVoj000329@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32749

Modified Files:
	.cvsignore gail.spec sources 
Log Message:
1.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	2 Aug 2006 22:11:50 -0000	1.21
+++ .cvsignore	21 Aug 2006 20:14:28 -0000	1.22
@@ -1 +1 @@
-gail-1.9.1.tar.bz2
+gail-1.9.2.tar.bz2


Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gail.spec	2 Aug 2006 22:11:50 -0000	1.48
+++ gail.spec	21 Aug 2006 20:14:29 -0000	1.49
@@ -4,12 +4,10 @@
 
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
-Version: 1.9.1
+Version: 1.9.2
 Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=345074
-Patch0: gail-1.9.0-notebook.patch
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -35,15 +33,15 @@
 Requires: %name = %{version}
 
 Requires: gtk2-devel >= %{gtk2_version}
+Requires: atk-devel >= %{atk_version}
 Requires: libgnomecanvas-devel >= %{libgnomecanvas_version}
-
+Requires: pkgconfig
 
 %description devel
 gail-devel contains the files required to compile applications against the GAIL libraries.
 
 %prep
 %setup -q
-%patch0 -p1 -b .notebook
 
 %build
 %configure --disable-gtk-doc
@@ -81,6 +79,11 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.9.2-1.fc6
+- Update to 1.9.2
+- Drop upstreamed patch
+- Require pkgconfig in the -devel package
+
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1.9.1-1.fc6
 - Update to 1.9.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	2 Aug 2006 22:11:50 -0000	1.21
+++ sources	21 Aug 2006 20:14:29 -0000	1.22
@@ -1 +1 @@
-afdfbf3e27cad67abaeb8ce0d174b09e  gail-1.9.1.tar.bz2
+4b21d87414aac4604e0db408133983e8  gail-1.9.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:19:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:19:40 -0400
Subject: rpms/hsqldb/devel hsqldb.spec,1.24,1.25
Message-ID: <200608212019.k7LKJeRU017215@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/hsqldb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17117

Modified Files:
	hsqldb.spec 
Log Message:

Add missing postun section.




Index: hsqldb.spec
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- hsqldb.spec	8 Aug 2006 15:19:06 -0000	1.24
+++ hsqldb.spec	21 Aug 2006 20:19:37 -0000	1.25
@@ -38,7 +38,7 @@
 
 Name:		hsqldb
 Version:	1.8.0.4
-Release:	2jpp.2
+Release:	3jpp.1
 Epoch:		1
 Summary:	Hsqldb Database Engine
 License:	BSD Style
@@ -206,6 +206,14 @@
 fi
 %endif
 
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %preun
 if [ "$1" = "0" ]; then
     rm -f %{_localstatedir}/lib/%{name}/lib/hsqldb.jar
@@ -253,6 +261,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Mon Aug 21 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-3jpp.1
+- Add missing postun section.
+
 * Tue Aug 08 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-2jpp.2
 - Fix regression re: missing shadow-utils prereq.
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:22:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:22:57 -0400
Subject: rpms/at-spi/devel at-spi.spec,1.50,1.51
Message-ID: <200608212022.k7LKMvZh018225@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18180

Modified Files:
	at-spi.spec 
Log Message:
drop a patch



Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- at-spi.spec	21 Aug 2006 20:09:24 -0000	1.50
+++ at-spi.spec	21 Aug 2006 20:22:54 -0000	1.51
@@ -10,7 +10,6 @@
 Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
-Patch1: at-spi-1.7.9-corba-refs.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -57,7 +56,6 @@
 
 %prep
 %setup -q
-%patch1 -p0 -b .corba-refs
 
 %build
 %configure --disable-gtk-doc
@@ -100,6 +98,7 @@
 %changelog
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.11-1.fc6
 - Update to 1.7.11
+- Drop upstreamed patch
 - Require pkgconfig in the -devel package
 
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.10-1.fc6



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:24:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:24:25 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.40, 1.41 file-roller.spec, 1.69,
	1.70 sources, 1.41, 1.42
Message-ID: <200608212024.k7LKOPOW018790@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18741

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.15.93



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	12 Aug 2006 23:46:02 -0000	1.40
+++ .cvsignore	21 Aug 2006 20:24:23 -0000	1.41
@@ -1 +1 @@
-file-roller-2.15.92.tar.bz2
+file-roller-2.15.93.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- file-roller.spec	13 Aug 2006 01:31:28 -0000	1.69
+++ file-roller.spec	21 Aug 2006 20:24:23 -0000	1.70
@@ -10,7 +10,7 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.15.92
+Version:	2.15.93
 Release: 	1%{?dist}
 
 License:	GPL
@@ -120,6 +120,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.93-1.fc6
+- Update to 2.15.93
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92
 - BR nautilus-devel


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	12 Aug 2006 23:46:02 -0000	1.41
+++ sources	21 Aug 2006 20:24:23 -0000	1.42
@@ -1 +1 @@
-3cedfcb791913bc090737783047759ce  file-roller-2.15.92.tar.bz2
+bcaa66c9fd0ae6dc0e0edb03a9bef9bf  file-roller-2.15.93.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:34:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:34:54 -0400
Subject: rpms/gdm/devel .cvsignore, 1.32, 1.33 gdm.spec, 1.190, 1.191 sources,
	1.34, 1.35
Message-ID: <200608212034.k7LKYsW2021964@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21918

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.15.10



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	14 Aug 2006 03:33:37 -0000	1.32
+++ .cvsignore	21 Aug 2006 20:34:52 -0000	1.33
@@ -1 +1 @@
-gdm-2.15.9.tar.bz2
+gdm-2.15.10.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- gdm.spec	14 Aug 2006 03:33:38 -0000	1.190
+++ gdm.spec	21 Aug 2006 20:34:52 -0000	1.191
@@ -15,7 +15,7 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.15.9
+Version: 2.15.10
 Release: 1%{?dist}
 Epoch: 1
 License: LGPL/GPL
@@ -304,6 +304,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.10-1.fc6
+- Update to 2.15.10
+
 * Fri Aug 4 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.9-1
 - update to 2.15.9
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	14 Aug 2006 03:33:38 -0000	1.34
+++ sources	21 Aug 2006 20:34:52 -0000	1.35
@@ -1 +1 @@
-91efa2f43374b5f3f7ff7e0a8a696421  gdm-2.15.9.tar.bz2
+7f4deca3ab620026c4178b7267d5a5ec  gdm-2.15.10.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:36:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:36:16 -0400
Subject: rpms/gedit/devel .cvsignore, 1.47, 1.48 gedit.spec, 1.96,
	1.97 sources, 1.49, 1.50
Message-ID: <200608212036.k7LKaGDX022358@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22314

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.15.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	15 Aug 2006 01:31:08 -0000	1.47
+++ .cvsignore	21 Aug 2006 20:36:14 -0000	1.48
@@ -1 +1 @@
-gedit-2.15.7.tar.bz2
+gedit-2.15.8.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gedit.spec	15 Aug 2006 01:31:08 -0000	1.96
+++ gedit.spec	21 Aug 2006 20:36:14 -0000	1.97
@@ -16,7 +16,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.15.7
+Version: 	2.15.8
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPL
@@ -185,6 +185,9 @@
 %{_datadir}/gtk-doc/html/gedit/
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.8-1.fc6
+- Update to 2.15.8
+
 * Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.7-1.fc6
 - Update to 2.15.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	15 Aug 2006 01:31:08 -0000	1.49
+++ sources	21 Aug 2006 20:36:14 -0000	1.50
@@ -1 +1 @@
-f18729d9a0cf2c02e59435e094f27d13  gedit-2.15.7.tar.bz2
+8129d97e9f9246cc91d93b2232459e12  gedit-2.15.8.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:37:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:37:45 -0400
Subject: rpms/gdm/devel gdm.spec,1.191,1.192
Message-ID: <200608212037.k7LKbj1V022790@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22732

Modified Files:
	gdm.spec 
Log Message:
drop patch



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- gdm.spec	21 Aug 2006 20:34:52 -0000	1.191
+++ gdm.spec	21 Aug 2006 20:37:42 -0000	1.192
@@ -46,9 +46,6 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=347871
 Patch24: gdm-2.15.6-wtmp.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=327530
-Patch25: gdm-2.15.6-center-cursor.patch
-
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
 Prereq: /usr/sbin/useradd
@@ -116,7 +113,6 @@
 %patch20 -p1 -b .reset-pam
 %patch21 -p1 -b .security-tokens
 %patch24 -p1 -b .wtmp
-%patch25 -p1 -b .center-cursor
 
 %build
 cp -f %{SOURCE1} config/gdm
@@ -306,6 +302,7 @@
 %changelog
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.10-1.fc6
 - Update to 2.15.10
+- Drop upstreamed patch
 
 * Fri Aug 4 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.9-1
 - update to 2.15.9



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:38:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:38:57 -0400
Subject: rpms/epiphany/devel .cvsignore, 1.44, 1.45 epiphany.spec, 1.114,
	1.115 sources, 1.45, 1.46
Message-ID: <200608212038.k7LKcv1n023174@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23116

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	13 Aug 2006 06:55:40 -0000	1.44
+++ .cvsignore	21 Aug 2006 20:38:54 -0000	1.45
@@ -1 +1 @@
-epiphany-2.15.91.tar.bz2
+epiphany-2.15.92.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- epiphany.spec	13 Aug 2006 20:25:57 -0000	1.114
+++ epiphany.spec	21 Aug 2006 20:38:54 -0000	1.115
@@ -8,8 +8,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.15.91
-Release: 2%{?dist}
+Version: 2.15.92
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -155,6 +155,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-2.fc6
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	13 Aug 2006 06:55:40 -0000	1.45
+++ sources	21 Aug 2006 20:38:54 -0000	1.46
@@ -1 +1 @@
-d71e3b524327678a55a74a3e6ebccbc4  epiphany-2.15.91.tar.bz2
+3a525daf4be413df043b12f9d10bc6e8  epiphany-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:49:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:49:20 -0400
Subject: rpms/parted/devel parted-1.7.1-dm.patch, 1.1, 1.2 parted.spec, 1.82,
	1.83
Message-ID: <200608212049.k7LKnKlW011467@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10855

Modified Files:
	parted-1.7.1-dm.patch parted.spec 
Log Message:
- Fix dm partition naming on gpt


parted-1.7.1-dm.patch:
 configure.ac            |   10 +
 include/parted/device.h |    3 
 libparted/Makefile.am   |    1 
 libparted/arch/linux.c  |  339 +++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 350 insertions(+), 3 deletions(-)

Index: parted-1.7.1-dm.patch
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted-1.7.1-dm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parted-1.7.1-dm.patch	29 May 2006 02:03:00 -0000	1.1
+++ parted-1.7.1-dm.patch	21 Aug 2006 20:49:15 -0000	1.2
@@ -1,6 +1,5 @@
-diff -urN parted-1.7.1.orig/configure.ac parted-1.7.1/configure.ac
---- parted-1.7.1.orig/configure.ac	2006-05-27 05:48:48.000000000 -0400
-+++ parted-1.7.1/configure.ac	2006-05-28 21:28:18.000000000 -0400
+--- parted-1.7.1/configure.ac.dm	2006-05-27 05:48:48.000000000 -0400
++++ parted-1.7.1/configure.ac	2006-08-21 16:34:28.000000000 -0400
 @@ -228,6 +228,14 @@
  )
  AC_SUBST(UUID_LIBS)
@@ -25,9 +24,8 @@
  	)
  	LIBS="$OLD_LIBS"
  fi
-diff -urN parted-1.7.1.orig/include/parted/device.h parted-1.7.1/include/parted/device.h
---- parted-1.7.1.orig/include/parted/device.h	2006-05-28 21:25:48.000000000 -0400
-+++ parted-1.7.1/include/parted/device.h	2006-05-28 21:26:42.000000000 -0400
+--- parted-1.7.1/include/parted/device.h.dm	2006-08-21 16:34:28.000000000 -0400
++++ parted-1.7.1/include/parted/device.h	2006-08-21 16:34:28.000000000 -0400
 @@ -45,7 +45,8 @@
          PED_DEVICE_UBD          = 8,
          PED_DEVICE_DASD         = 9,
@@ -38,9 +36,8 @@
  } PedDeviceType;
  
  typedef struct _PedDevice PedDevice;
-diff -urN parted-1.7.1.orig/libparted/Makefile.am parted-1.7.1/libparted/Makefile.am
---- parted-1.7.1.orig/libparted/Makefile.am	2006-05-25 13:29:06.000000000 -0400
-+++ parted-1.7.1/libparted/Makefile.am	2006-05-28 21:42:23.000000000 -0400
+--- parted-1.7.1/libparted/Makefile.am.dm	2006-05-25 13:29:06.000000000 -0400
++++ parted-1.7.1/libparted/Makefile.am	2006-08-21 16:34:28.000000000 -0400
 @@ -32,6 +32,7 @@
  
  libparted_la_LIBADD   = @OS_LIBS@			\
@@ -49,9 +46,8 @@
  			fs/libfs.la			\
  			labels/liblabels.la
  
-diff -urN parted-1.7.1.orig/libparted/arch/linux.c parted-1.7.1/libparted/arch/linux.c
---- parted-1.7.1.orig/libparted/arch/linux.c	2006-05-28 21:25:48.000000000 -0400
-+++ parted-1.7.1/libparted/arch/linux.c	2006-05-28 21:40:24.000000000 -0400
+--- parted-1.7.1/libparted/arch/linux.c.dm	2006-08-21 16:34:28.000000000 -0400
++++ parted-1.7.1/libparted/arch/linux.c	2006-08-21 16:35:33.000000000 -0400
 @@ -17,6 +17,7 @@
      Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
@@ -198,7 +194,7 @@
                          || isdigit (dev->path[path_len - 1]))
                  snprintf (result, result_len, "%sp%d", dev->path, num);
          else
-@@ -1959,6 +2063,243 @@
+@@ -1959,6 +2063,237 @@
  }
  
  static int
@@ -359,23 +355,17 @@
 +        char*           dev_name = NULL;
 +        char*           params = NULL;
 +
-+        if (ped_disk_type_check_feature (disk->type,
-+                                        PED_DISK_TYPE_PARTITION_NAME))
-+                vol_name = (char *)ped_partition_get_name (part);
-+        
 +        dev_name = _device_get_part_path (disk->dev, part->num);
 +        if (!dev_name)
 +                return 0;
 +
-+        if (!vol_name) {
-+                vol_name = strrchr (dev_name, '/');
-+                if (vol_name && *vol_name && *(++vol_name))
-+                        vol_name = strdup (vol_name);
-+                else
-+                        vol_name = strdup (dev_name);
-+                if (!vol_name)
-+                        return 0;
-+        }
++        vol_name = strrchr (dev_name, '/');
++        if (vol_name && *vol_name && *(++vol_name))
++                vol_name = strdup (vol_name);
++        else
++                vol_name = strdup (dev_name);
++        if (!vol_name)
++                return 0;
 +
 +        if (!_device_stat (disk->dev, &dev_stat))
 +                goto err;
@@ -442,7 +432,7 @@
  _kernel_reread_part_table (PedDevice* dev)
  {
          LinuxSpecific*  arch_specific = LINUX_SPECIFIC (dev);
-@@ -2001,7 +2342,9 @@
+@@ -2001,7 +2336,9 @@
  static int
  linux_disk_commit (PedDisk* disk)
  {


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- parted.spec	17 Aug 2006 17:52:06 -0000	1.82
+++ parted.spec	21 Aug 2006 20:49:16 -0000	1.83
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.7.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0: parted-1.7.0-fat.c.patch
 Patch1: parted-1.7.0-sx8.patch
@@ -108,6 +108,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Aug 21 2006 Peter Jones <pjones at redhat.com> - 1.7.1-13
+- Don't use the "volume name" as the device node name on dm device
+  partitions, it isn't really what we want at all.
+
 * Thu Aug 17 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-12
 - Updated O_DIRECT patch to work around s390 problems
 - Update LastUsableLBA on GPT-labeled disks after LUN resize (#194238)



From fedora-cvs-commits at redhat.com  Mon Aug 21 20:49:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 16:49:36 -0400
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.32,
	1.33 gnome-icon-theme.spec, 1.53, 1.54 sources, 1.35, 1.36
Message-ID: <200608212049.k7LKnajw013143@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12541

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	12 Aug 2006 07:05:25 -0000	1.32
+++ .cvsignore	21 Aug 2006 20:49:33 -0000	1.33
@@ -1 +1 @@
-gnome-icon-theme-2.15.91.tar.bz2
+gnome-icon-theme-2.15.92.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-icon-theme.spec	12 Aug 2006 07:05:25 -0000	1.53
+++ gnome-icon-theme.spec	21 Aug 2006 20:49:34 -0000	1.54
@@ -1,6 +1,6 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.15.91
+Version: 2.15.92
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -69,6 +69,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> 2.15.91-1.fc6
 - Update to 2.15.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	12 Aug 2006 07:05:25 -0000	1.35
+++ sources	21 Aug 2006 20:49:34 -0000	1.36
@@ -1 +1 @@
-a62c3b31da1df233ba735444be621ddb  gnome-icon-theme-2.15.91.tar.bz2
+bf4077a3cd85eee9e305098ad67f6ef1  gnome-icon-theme-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 21 21:27:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 17:27:24 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt-configuration.patch, NONE,
	1.1 eclipse-cdt.spec, 1.52, 1.53
Message-ID: <200608212127.k7LLROAc016899@cvs.devel.redhat.com>

Author: jjohnstn

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16846

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-configuration.patch 
Log Message:

* Mon Aug 21 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_12fc
- Fix build special targets when project hasn't configured yet.
- Fix to fully reconfigure after configuration options change.
- Fix configuration problem whereby config.sub complains.
- Bugzilla 200000, 201270, 203440




eclipse-cdt-configuration.patch:
 ChangeLog                                                      |   31 +++
 src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java        |   86 ++++++++--
 src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java |   19 ++
 3 files changed, 123 insertions(+), 13 deletions(-)

--- NEW FILE eclipse-cdt-configuration.patch ---
--- com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java.fix	2006-08-21 17:06:01.000000000 -0400
+++ com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java	2006-08-21 17:06:22.000000000 -0400
@@ -3,9 +3,13 @@ package com.redhat.eclipse.cdt.autotools
 import org.eclipse.cdt.make.core.IMakeTarget;
 import org.eclipse.cdt.make.ui.MakeLabelProvider;
 import org.eclipse.cdt.make.ui.TargetBuild;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.window.Window;
@@ -13,6 +17,7 @@ import org.eclipse.ui.IWorkbenchWindowAc
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
 
 import com.redhat.eclipse.cdt.autotools.AutotoolsPlugin;
+import com.redhat.eclipse.cdt.autotools.MakeGenerator;
 
 /**
  * Our sample action implements workbench action delegate.
@@ -42,7 +47,19 @@ public class BuildSpecial extends Abstra
 		if (container != null) {
 			ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), new MakeLabelProvider());
 			try {
-				dialog.setElements(AutotoolsPlugin.getDefault().getTargetManager().getTargets(container));
+				// Get the targets listed for the top-level makefile.  If none
+				// exist, we may not have a makefile yet so we should attempt to
+				// generate the makefile via configuration.
+				IMakeTarget[] targets = AutotoolsPlugin.getDefault().getTargetManager().getTargets(container);
+				if (targets.length == 0) {
+					IProject project = container.getProject();
+					IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+					MakeGenerator generator = new MakeGenerator();
+					generator.initialize(project, info, new NullProgressMonitor());
+					generator.regenerateMakefiles();
+				}
+				targets = AutotoolsPlugin.getDefault().getTargetManager().getTargets(container);
+				dialog.setElements(targets);
 			} catch (CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
--- com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java.fix	2006-08-21 17:01:14.000000000 -0400
+++ com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java	2006-08-21 17:01:44.000000000 -0400
@@ -1,8 +1,15 @@
 package com.redhat.eclipse.cdt.autotools;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -53,6 +60,8 @@ public class MakeGenerator implements IM
 	public final String AUTOGEN_SH = "autogen.sh";
 
 	public final String CONFIGURE = "configure";
+	
+	public final String SETTINGS_FILE_NAME = ".cdtconfigure";
 
 	private IProject project;
 
@@ -244,6 +253,7 @@ public class MakeGenerator implements IM
 	public MultiStatus regenerateMakefiles() throws CoreException {
 		MultiStatus status;
 		boolean ok = true;
+		boolean needFullConfigure = true;
 
 		// See if the user has cancelled the build
 		checkCancel();
@@ -292,8 +302,40 @@ public class MakeGenerator implements IM
 			IPath configfile = getProjectLocation().append(buildDir).append(
 					CONFIG_STATUS);
 			IFile configStatus = root.getFileForLocation(configfile);
-
-			if (configStatus != null && configStatus.exists()) {
+			IPath configSettingsPath = getProjectLocation().append(SETTINGS_FILE_NAME);
+			IFile configSettings = root.getFileForLocation(configSettingsPath);
+			String[] configArgs = getConfigArgs();
+
+			// We need to figure out if the end-user has changed the configuration
+			// settings.  In such a case, we need to reconfigure from scratch
+			// regardless of whether config.status exists or not.
+			// We figure this out by saving the configuration settings to
+			// a special file and reading/comparing whenever we are asked to build.
+			if (configSettings.exists()) {
+				int i = 0;
+				needFullConfigure = false;
+				IPath settingsPath = project.getLocation().append(SETTINGS_FILE_NAME);
+				try {
+					File f = new File(settingsPath.toOSString());
+					DataInputStream settings = new DataInputStream(
+							new BufferedInputStream(new FileInputStream(f)));
+					while (i < configArgs.length) {
+						String s = settings.readUTF();
+						if (!s.equals(configArgs[i])) {
+							i = configArgs.length;
+							needFullConfigure = true;
+						}
+						++i;
+					}
+					if (settings.available() > 0)
+						needFullConfigure = true;
+				} catch (EOFException e) {
+					needFullConfigure = true;
+				} catch (IOException e) {
+					needFullConfigure = true;
+				}
+			}
+			if (!needFullConfigure && configStatus != null && configStatus.exists()) {
 				ok = runCommand(configfile, project.getLocation().append(
 						buildDir), null, "Running config.status");
 			}
@@ -302,10 +344,13 @@ public class MakeGenerator implements IM
 				ok = runCommand(project.getLocation().append(
 						info.getToolForConfiguration("status")), project
 						.getLocation().append(buildDir),
-						getConfigArgs(), "Generating Makefile");
+						configArgs, "Generating Makefile");
 				File makefileFile = project.getLocation().append(buildDir)
 						.append("Makefile").toFile();
 				addMakeTargetsToManager(makefileFile);
+				// TODO: should we do something special if configure doesn't
+				// return ok?
+				saveConfigArgs(configArgs);
 			}
 			// If no configure, run autogen.sh
 			else if (autogenExists()) {
@@ -359,6 +404,21 @@ public class MakeGenerator implements IM
 		return autogenCommand.toFile().exists();
 	}
 	
+	private void saveConfigArgs(String[] args) {
+		IPath settingsPath = project.getLocation().append(SETTINGS_FILE_NAME);
+		try {
+			File f = new File(settingsPath.toOSString());
+			DataOutputStream settings = new DataOutputStream(
+					new BufferedOutputStream(new FileOutputStream(f)));
+			for (int i = 0; i < args.length; ++i) {
+				settings.writeUTF(args[i]);
+			}
+			settings.close();
+		} catch (IOException e) {
+			/* What should we do?  */
+		}
+	}
+	
 	private String[] getConfigArgs() throws BuildException {
 		// Get the arguments to be passed to config from build model
 		ITool tool = info.getToolFromOutputExtension("status");
@@ -376,15 +436,17 @@ public class MakeGenerator implements IM
 					value = value.trim();
 					boolean finished = false;
 					int lastIndex = value.indexOf("--");
-					while (!finished) {
-						int index = value.indexOf("--",lastIndex+2);
-						if (index != -1) {
-							String previous = value.substring(lastIndex, index).trim();
-							configArgs.add(previous);
-							value = value.substring(index);
-						} else {
-							configArgs.add(value);
-							finished = true;
+					if (lastIndex != -1) {
+						while (!finished) {
+							int index = value.indexOf("--",lastIndex+2);
+							if (index != -1) {
+								String previous = value.substring(lastIndex, index).trim();
+								configArgs.add(previous);
+								value = value.substring(index);
+							} else {
+								configArgs.add(value);
+								finished = true;
+							}
 						}
 					}
 				}
--- com.redhat.eclipse.cdt.autotools/ChangeLog.fix	2006-08-21 16:58:28.000000000 -0400
+++ com.redhat.eclipse.cdt.autotools/ChangeLog	2006-08-21 17:00:46.000000000 -0400
@@ -0,0 +1,31 @@
+2006-08-21  Jeff Johnston  <jjohnstn at redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java (run): If
+	there are no targets yet (i.e. no makefile), try and regenerate the makefile.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getConfigArgs): 
+	Make sure there is an "other" string to process rather than adding
+	an empty argument.
+
+2006-08-16  Jeff Johnston  <jjohnstn at redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles): 
+	Add logic to check if the configuration arguments have changed since the last
+	configuration and reconfigure if they have.
+	(saveConfigArgs): New method.
+
+2006-08-03  Jeff Johnston  <jjohnstn at redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (addAutotoolsBuilder):
+	Check for ManagedMake's genmakebuilder and remove if found.
+	(hasTargetBuilder): Look for Autotools default configuration and if found,
+	add the Autotools Makefile builder.
+
+2006-07-31  Jeff Johnston  <jjohnstn at redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java (getLibHoverDocs): New
+	method which replaces buildDocPath and fetches libhover base data file from
+	the plugin's jar.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java (buildDocPath): Replaced
+	by getLibHoverDocs.  Change all callers.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java (getDocument): Removed.
+


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- eclipse-cdt.spec	8 Aug 2006 19:51:24 -0000	1.52
+++ eclipse-cdt.spec	21 Aug 2006 21:27:19 -0000	1.53
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_11fc
+Release: 	1jpp_12fc
 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
@@ -52,6 +52,7 @@
 Patch5: %{name}-dynamic-scannerinfo-ext.patch
 Patch6: %{name}-libhover-jar.patch
 Patch7: %{name}-mm-builder.patch
+Patch8: %{name}-configuration.patch
 
 BuildRequires: eclipse-pde
 %if %{gcj_support}
@@ -102,6 +103,7 @@
 tar -xzf %{SOURCE1}
 %patch6 -p0
 %patch7 -p0
+%patch8 -p0
 popd
 
 # Upstream CVS includes random .so files.  Let's remove them now.
@@ -270,6 +272,12 @@
 %endif
 
 %changelog
+* Mon Aug 21 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_12fc
+- Fix build special targets when project hasn't configured yet.
+- Fix to fully reconfigure after configuration options change.
+- Fix configuration problem whereby config.sub complains.
+- Bugzilla 200000, 201270, 203440
+
 * Tue Aug 08 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_11fc
 - Fix Build Special Targets bug when importing a CVS project and
   using ManagedMake Project Wizard.



From fedora-cvs-commits at redhat.com  Mon Aug 21 21:43:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 17:43:24 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.90,1.91
Message-ID: <200608212143.k7LLhO5C021119@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20937

Modified Files:
	tomcat5.spec 
Log Message:
- Merge with upstream
(From Andrew Overholt <overholt at redhat.com>: Silence post common-lib and server-lib.)





Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- tomcat5.spec	27 Jul 2006 16:29:54 -0000	1.90
+++ tomcat5.spec	21 Aug 2006 21:43:21 -0000	1.91
@@ -69,7 +69,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.17
-Release: 3jpp_5fc
+Release: 6jpp.1
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -109,9 +109,7 @@
 Requires: xerces-j2 >= 0:2.7.1
 Requires: xml-commons-apis >= 1.3
 # jakarta-commons packages
-# FIXME Update commons-daemon
-#Requires: jakarta-commons-daemon >= 1.0.1
-Requires: jakarta-commons-daemon >= 1.0
+Requires: jakarta-commons-daemon >= 1.0.1
 Requires: jakarta-commons-launcher >= 0:0.9
 # alternatives
 Requires: jndi-ldap
@@ -135,8 +133,7 @@
 BuildRequires: xalan-j2
 BuildRequires: jakarta-commons-beanutils >= 1.7
 BuildRequires: jakarta-commons-collections >= 0:3.1
-#BuildRequires: jakarta-commons-daemon >= 1.0.1
-BuildRequires: jakarta-commons-daemon >= 1.0
+BuildRequires: jakarta-commons-daemon >= 1.0.1
 BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
 BuildRequires: jakarta-commons-digester >= 0:1.7
 BuildRequires: jakarta-commons-logging >= 0:1.0.4
@@ -877,9 +874,9 @@
 #build-jar-repository %{commondir}/lib geronimo-jta-1.0.1B-api 2>&1
 build-jar-repository %{commondir}/lib jta 2>&1
 %if %{with_ecj}
-pushd %{commondir}/lib
+pushd %{commondir}/lib > /dev/null
 ln -sf %{_javadir}/jdtcore.jar .
-popd
+popd > /dev/null
 %endif
 %{_bindir}/rebuild-gcj-db
 
@@ -905,9 +902,9 @@
                                       commons-modeler jaas mx4j/mx4j \
                                       regexp 2>&1
 %if %{with_ecj}
-pushd %{serverdir}/lib
+pushd %{serverdir}/lib > /dev/null
 ln -sf %{_javadir}/jdtcore.jar .
-popd
+popd > /dev/null
 %endif
 %{_bindir}/rebuild-gcj-db
 
@@ -1209,6 +1206,16 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Thu Jul 27 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-6jpp.1
+- Merge with upstream
+
+* Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-6jpp
+- Rebuild
+
+* Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-5jpp
+  From Andrew Overholt <overholt at redhat.com>:
+- Silence post common-lib and server-lib.
+
 * Thu Jul 27 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_5fc
 - Fix regression in relink with patch from Matt Wringe
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 21:45:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 17:45:44 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.91,1.92
Message-ID: <200608212145.k7LLjiqd021703@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21622

Modified Files:
	tomcat5.spec 
Log Message:
Fix changelog date




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- tomcat5.spec	21 Aug 2006 21:43:21 -0000	1.91
+++ tomcat5.spec	21 Aug 2006 21:45:42 -0000	1.92
@@ -1206,7 +1206,7 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
-* Thu Jul 27 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-6jpp.1
+* Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-6jpp.1
 - Merge with upstream
 
 * Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-6jpp



From fedora-cvs-commits at redhat.com  Mon Aug 21 22:06:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 18:06:23 -0400
Subject: rpms/pyxf86config/devel .cvsignore, 1.17, 1.18 pyxf86config.spec,
	1.32, 1.33 sources, 1.17, 1.18
Message-ID: <200608212206.k7LM6NLp009357@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/pyxf86config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9326/devel

Modified Files:
	.cvsignore pyxf86config.spec sources 
Log Message:
auto-import pyxf86config-0.3.28-1.fc6 on branch devel from pyxf86config-0.3.28-1.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	25 Jul 2006 19:31:39 -0000	1.17
+++ .cvsignore	21 Aug 2006 22:06:20 -0000	1.18
@@ -1,6 +1 @@
-pyxf86config-0.3.22.tar.gz
-pyxf86config-0.3.23.tar.gz
-pyxf86config-0.3.24.tar.gz
-pyxf86config-0.3.25.tar.gz
-pyxf86config-0.3.26.tar.gz
-pyxf86config-0.3.27.tar.gz
+pyxf86config-0.3.28.tar.gz


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pyxf86config.spec	26 Jul 2006 07:38:00 -0000	1.32
+++ pyxf86config.spec	21 Aug 2006 22:06:20 -0000	1.33
@@ -2,8 +2,8 @@
 
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
-Version: 0.3.27
-Release: 2%{?dist}
+Version: 0.3.28
+Release: 1%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 0.3.28-1.fc6
+- Decode degenerate ranges correctly. (#132679)
+
 * Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 0.3.27-2.fc6
 - Remove dependency on xorg-x11-server-sdk, and replace it with correct dep
   on "libxf86config-devel >= 1.1.1-7", and rebuild in order to pick up


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	25 Jul 2006 19:31:39 -0000	1.17
+++ sources	21 Aug 2006 22:06:20 -0000	1.18
@@ -1 +1 @@
-d0e29685fb495dc6ac7482edbc7c8947  pyxf86config-0.3.27.tar.gz
+28d76380bd479022797566ca8a2789e1  pyxf86config-0.3.28.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 21 22:23:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 18:23:53 -0400
Subject: rpms/xorg-x11-drv-mga/devel xorg-x11-drv-mga.spec,1.14,1.15
Message-ID: <200608212223.k7LMNrU1028394@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-drv-mga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28370

Modified Files:
	xorg-x11-drv-mga.spec 
Log Message:
* Fri Aug 18 2006 Kristian H??gsberg <krh at redhat.com> 1.4.1-5.fc6
- Add Tilman Sauerbecks patch to fix DRI locking.



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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-mga.spec	12 Jul 2006 09:03:11 -0000	1.14
+++ xorg-x11-drv-mga.spec	21 Aug 2006 22:23:50 -0000	1.15
@@ -2,8 +2,6 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define cvsdate xxxxxxx
-
 %ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 %define with_dri        1
 %else
@@ -13,7 +11,7 @@
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
 Version:   1.4.1
-Release:   4.1
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -22,6 +20,8 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   mga.xinf
 
+Patch0: dri-locking.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
@@ -39,6 +39,8 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p1 -b .dri-locking
+
 %build
 %configure --disable-static
 make
@@ -72,7 +74,10 @@
 %{_mandir}/man4/mga.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Fri Aug 18 2006 Kristian H??gsberg <krh at redhat.com> 1.4.1-5.fc6
+- Add Tilman Sauerbecks patch to fix DRI locking.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.4.1-4.1
 - rebuild
 
 * Thu Jul  6 2006 Adam Jackson <ajackson at redhat.com> 1.4.1-4



From fedora-cvs-commits at redhat.com  Mon Aug 21 22:41:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 18:41:27 -0400
Subject: rpms/evince/devel evince.spec,1.57,1.58
Message-ID: <200608212241.k7LMfRQE000317@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32740

Modified Files:
	evince.spec 
Log Message:
* Mon Aug 21 2006 Kristian H??gsberg <krh at redhat.com> - 0.5.5-2.fc6
- Rebuild agains new dbus.



Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- evince.spec	12 Aug 2006 02:47:20 -0000	1.57
+++ evince.spec	21 Aug 2006 22:41:25 -0000	1.58
@@ -4,7 +4,7 @@
 
 Name:		evince
 Version:	0.5.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Document viewer
 
 License: 	GPL
@@ -134,6 +134,9 @@
 
 
 %changelog
+* Mon Aug 21 2006 Kristian H??gsberg <krh at redhat.com> - 0.5.5-2.fc6
+- Rebuild agains new dbus.
+
 * Fri Aug 11 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.5-1.fc6
 - Update to 0.5.5
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 22:46:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 18:46:17 -0400
Subject: rpms/xorg-x11-drv-mga/devel dri-locking.patch,NONE,1.1
Message-ID: <200608212246.k7LMkHxa001329@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-drv-mga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1298

Added Files:
	dri-locking.patch 
Log Message:
* Fri Aug 18 2006 Kristian H??gsberg <krh at redhat.com> 1.4.1-5.fc6
- Add Tilman Sauerbecks patch to fix DRI locking.


dri-locking.patch:
 mga_dri.c |   59 +++++------------------------------------------------------
 1 files changed, 5 insertions(+), 54 deletions(-)

--- NEW FILE dri-locking.patch ---
From: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed, 9 Aug 2006 19:59:42 +0000 (+0200)
Subject: Bug #7265: Fix MGA DRI locking.
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-mga.git;a=commitdiff;h=bde592047cd62194d7ef67520a9fdbaf269a8b90

Bug #7265: Fix MGA DRI locking.

The server expects the driver to take the DRI lock in the wakeup
handler, and release it in the block handler.
The old locking scheme didn't work like this, which caused problems.
We now no longer override wakeup/block handler and just use the ones
provided by the server. This means the DRI lock will be taken
"all the time" and not just when it's needed by the driver.
MGADRISwapContext* are activated again, so the wakeup handler could be
removed.
I didn't notice any DRI performance drop, but I didn't do serious
benchmarking either.
---

--- a/src/mga_dri.c
+++ b/src/mga_dri.c
@@ -363,7 +363,6 @@ void MGAGetQuiescence( ScrnInfoPtr pScrn
 {
    MGAPtr pMga = MGAPTR(pScrn);
 
-   DRILock( screenInfo.screens[pScrn->scrnIndex], 0 );
    pMga->haveQuiescense = 1;
 
    if ( pMga->directRenderingEnabled ) {
@@ -401,8 +400,6 @@ void MGAGetQuiescenceShared( ScrnInfoPtr
    MGAEntPtr pMGAEnt = pMga->entityPrivate;
    MGAPtr pMGA2 = MGAPTR(pMGAEnt->pScrn_2);
 
-   DRILock( screenInfo.screens[pMGAEnt->pScrn_1->scrnIndex], 0 );
-
    pMga = MGAPTR(pMGAEnt->pScrn_1);
    pMga->haveQuiescense = 1;
    pMGA2->haveQuiescense = 1;
@@ -442,7 +439,11 @@ static void MGASwapContextShared( Screen
    pMGA2->AccelInfoRec->NeedToSync = TRUE;
 }
 
-/* This is really only called from validate/postvalidate as we
+/* FIXME: This comment is out of date, since we aren't overriding
+ * Block/Wakeuphandler anymore.
+ *
+ *
+ * This is really only called from validate/postvalidate as we
  * override the dri lock/unlock.  Want to remove validate/postvalidate
  * processing, but need to remove all client-side use of drawable lock
  * first (otherwise there is noone recover when a client dies holding
@@ -464,14 +465,12 @@ MGADRISwapContext( ScreenPtr pScreen, DR
 		   DRIContextType oldContextType, void *oldContext,
 		   DRIContextType newContextType, void *newContext )
 {
-#if 0
    if ( syncType == DRI_3D_SYNC &&
 	oldContextType == DRI_2D_CONTEXT &&
 	newContextType == DRI_2D_CONTEXT )
    {
       MGASwapContext( pScreen );
    }
-#endif
 }
 
 static void
@@ -479,58 +478,12 @@ MGADRISwapContextShared( ScreenPtr pScre
 			  DRIContextType oldContextType, void *oldContext,
 			  DRIContextType newContextType, void *newContext )
 {
-#if 0
    if ( syncType == DRI_3D_SYNC &&
 	oldContextType == DRI_2D_CONTEXT &&
 	newContextType == DRI_2D_CONTEXT )
    {
       MGASwapContextShared( pScreen );
    }
-#endif
-}
-
-
-static void MGAWakeupHandler( int screenNum, pointer wakeupData,
-			      unsigned long result, pointer pReadmask )
-{
-    ScreenPtr pScreen = screenInfo.screens[screenNum];
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    MGAPtr pMga = MGAPTR(pScrn);
-
-    if ( xf86IsEntityShared( pScrn->entityList[0] ) 
-		&& pMga->DualHeadEnabled) {
-        MGASwapContextShared( pScreen );
-    } else {
-        MGASwapContext( pScreen );
-    }
-}
-
-static void MGABlockHandler( int screenNum, pointer blockData,
-			     pointer pTimeout, pointer pReadmask )
-
-{
-   ScreenPtr pScreen = screenInfo.screens[screenNum];
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   MGAPtr pMga = MGAPTR(pScrn);
-   MGAEntPtr pMGAEnt;
-
-   if ( pMga->haveQuiescense ) {
-      if ( xf86IsEntityShared( pScrn->entityList[0] ) ) {
-	 /* Restore to first screen */
-	 pMga->RestoreAccelState( pScrn );
-	 xf86SetLastScrnFlag( pScrn->entityList[0], pScrn->scrnIndex );
-	 pMGAEnt = pMga->entityPrivate;
-
-	 if ( pMGAEnt->directRenderingEnabled ) {
-	    DRIUnlock( screenInfo.screens[pMGAEnt->pScrn_1->scrnIndex] );
-	 }
-      } else {
-	 if ( pMga->directRenderingEnabled ) {
-	    DRIUnlock( pScreen );
-	 }
-      }
-      pMga->haveQuiescense = 0;
-   }
 }
 
 void MGASelectBuffer( ScrnInfoPtr pScrn, int which )
@@ -1030,8 +983,6 @@ Bool MGADRIScreenInit( ScreenPtr pScreen
    pDRIInfo->frameBufferStride = pScrn->displayWidth*(pScrn->bitsPerPixel/8);
    pDRIInfo->ddxDrawableTableEntry = MGA_MAX_DRAWABLES;
 
-   pDRIInfo->wrap.BlockHandler = MGABlockHandler;
-   pDRIInfo->wrap.WakeupHandler = MGAWakeupHandler;
    pDRIInfo->wrap.ValidateTree = NULL;
    pDRIInfo->wrap.PostValidateTree = NULL;
 



From fedora-cvs-commits at redhat.com  Mon Aug 21 22:59:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 18:59:33 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-aiglx-locking.patch, NONE,
	1.1 xorg-x11-server.spec, 1.152, 1.153
Message-ID: <200608212259.k7LMxXqQ020673@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20639

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-aiglx-locking.patch 
Log Message:
* Mon Aug 21 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-26.fc6
- Add Tilman Sauerbecks patch to fix AIGLX DRI locking.


xorg-x11-server-1.1.1-aiglx-locking.patch:
 glxdri.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-aiglx-locking.patch ---
From: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed, 9 Aug 2006 18:21:52 +0000 (+0200)
Subject: Sanitized glxdri's Block/Wakeuphandler calling.
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=c4f5de6cc3b935025829af971b0b8010c1ecfedb

Sanitized glxdri's Block/Wakeuphandler calling.

__glXDRIleaveServer() and _enterServer() used to call DRIDoBlockHandler
(resp DRIDoWakeupHandler) directly. They are now calling DRIBlockHandler
(resp DRIWakeupHandler) to account for driver specific block/wakeup
hooks.
---

--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -137,19 +137,13 @@ static const char CREATE_NEW_SCREEN_FUNC
 static void
 __glXDRIleaveServer(void)
 {
-  int i;
-
-  for (i = 0; i < screenInfo.numScreens; i++)
-    DRIDoBlockHandler(i, NULL, NULL, NULL);
+  DRIBlockHandler(NULL, NULL, NULL);
 }
     
 static void
 __glXDRIenterServer(void)
 {
-  int i;
-
-  for (i = 0; i < screenInfo.numScreens; i++)
-    DRIDoWakeupHandler(i, NULL, 0, NULL);
+  DRIWakeupHandler(NULL, 0, NULL);
 }
 
 static void


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- xorg-x11-server.spec	19 Aug 2006 03:40:27 -0000	1.152
+++ xorg-x11-server.spec	21 Aug 2006 22:59:29 -0000	1.153
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   25%{?dist}
+Release:   26%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -51,6 +51,7 @@
 Patch2004:  xorg-x11-server-1.1.0-no-zlib.patch
 Patch2005:  xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch
 Patch2006:  xorg-x11-server-1.1.1-revert-xkb-change.patch
+Patch2007:  xorg-x11-server-1.1.1-aiglx-locking.patch
 
 # autoconfiguration feature patches
 Patch3001:  xorg-x11-server-1.1.0-edid-mode-injection-1.patch
@@ -355,6 +356,7 @@
 %patch2004 -p1 -b .zlib
 %patch2005 -p1 -b .Xdmx
 %patch2006 -p1 -b .revert-xkb-change
+%patch2007 -p1 -b .aiglx-locking
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .edid2
@@ -699,6 +701,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Aug 21 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-26.fc6
+- Add Tilman Sauerbecks patch to fix AIGLX DRI locking.
+
 * Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-25.fc6
 - xorg-x11-server-1.1.1-xvfb-composite-crash.patch: Fix Xvfb's -render flag
   to also disable the Composite extension.



From fedora-cvs-commits at redhat.com  Mon Aug 21 23:13:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 19:13:37 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.21, 1.22 setroubleshoot.spec,
	1.26, 1.27 sources, 1.24, 1.25
Message-ID: <200608212313.k7LNDaAX023553@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23526/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.28-1 on branch devel from setroubleshoot-0.28-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	21 Aug 2006 19:44:14 -0000	1.21
+++ .cvsignore	21 Aug 2006 23:13:34 -0000	1.22
@@ -1 +1 @@
-setroubleshoot-0.27.tar.gz
+setroubleshoot-0.28.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- setroubleshoot.spec	21 Aug 2006 19:44:14 -0000	1.26
+++ setroubleshoot.spec	21 Aug 2006 23:13:34 -0000	1.27
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.27
+Version: 0.28
 Release: 1
 License: GPL
 Group: Applications/System
@@ -59,6 +59,7 @@
 %{__install} -D -m755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/%{name}
 %{__install} -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 touch %{buildroot}%{pkgvardatadir}/database.xml
+%find_lang %{name}
 
 %post
 [ -f %{pkgvardatadir}/database.xml ] && chmod 644 %{pkgvardatadir}/database.xml
@@ -81,7 +82,7 @@
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc %{pkgdocdir}
 %{_bindir}/*
@@ -105,6 +106,10 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Mon Aug 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.28-1
+- Fix allow_execmem.py file 
+- Add translations
+
 * Mon Aug 21 2006 John Dennis <jdennis at redhat.com> - 0.27-1
 	* load_plugins() now catches exceptions when a plugin won't load,
 	reports the traceback in the log file, and continues with the next


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	21 Aug 2006 19:44:14 -0000	1.24
+++ sources	21 Aug 2006 23:13:34 -0000	1.25
@@ -1 +1 @@
-6ebf7e9cb8bbc91c3634b3452b79c2a5  setroubleshoot-0.27.tar.gz
+e6f3ed798762c9ebe6517d67c81801a9  setroubleshoot-0.28.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 21 23:34:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 19:34:55 -0400
Subject: rpms/coolkey/devel coolkey-1.0.1-64bit_bug.patch, NONE,
	1.1 coolkey.spec, 1.5, 1.6
Message-ID: <200608212334.k7LNYtka011577@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/coolkey/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11465

Modified Files:
	coolkey.spec 
Added Files:
	coolkey-1.0.1-64bit_bug.patch 
Log Message:


Fix problem where certs were not found in 64 bit builds.


coolkey-1.0.1-64bit_bug.patch:
 object.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE coolkey-1.0.1-64bit_bug.patch ---
Index: src/coolkey/object.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/object.cpp,v
retrieving revision 1.1
diff -u -r1.1 object.cpp
--- src/coolkey/object.cpp	9 Jun 2006 18:39:11 -0000	1.1
+++ src/coolkey/object.cpp	21 Aug 2006 23:16:56 -0000
@@ -105,7 +105,9 @@
 	if ((attrib.getType() == CKA_CLASS) || 
 	    (attrib.getType() == CKA_CERTIFICATE_TYPE) ||
 	    (attrib.getType() == CKA_KEY_TYPE)) {
-	    if (attrLen != sizeof (CK_ULONG)) {
+	    /* ulongs are 4 bytes on the token, even if they are 8 or
+	     * more in the pkcs11 module */
+	    if (attrLen != 4) {
                 throw PKCS11Exception(CKR_DEVICE_ERROR,
                 "Invalid attribute length %d\n", attrLen);
 	    }
@@ -183,7 +185,7 @@
     if (!attributeExists(CKA_CLASS)) {
 	PKCS11Attribute attrib;
 	attrib.setType(CKA_CLASS);
-	attrib.setValue((CKYByte *)&objectType, 4);
+	attrib.setValue((CKYByte *)&objectType, sizeof(CK_ULONG));
         attributes.push_back(attrib);
     }
 


Index: coolkey.spec
===================================================================
RCS file: /cvs/dist/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- coolkey.spec	16 Jul 2006 18:39:43 -0000	1.5
+++ coolkey.spec	21 Aug 2006 23:34:51 -0000	1.6
@@ -19,11 +19,12 @@
 
 Name: coolkey
 Version: 1.0.1
-Release: 2
+Release: 3
 Summary: CoolKey PKCS #11 module
 License: LGPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
 Source: coolkey-%{version}.tar.gz
+Patch1: coolkey-%{version}-64bit_bug.patch
 Group: System Environment/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pcsc-lite-devel
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q
+%patch1 -p0 -b .64bit_bug
 
 %build
 %configure --disable-dependency-tracking 



From fedora-cvs-commits at redhat.com  Tue Aug 22 00:10:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 20:10:08 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11.spec, 1.10, 1.11 rh_pam_pkcs11.conf,
	1.1, 1.2
Message-ID: <200608220010.k7M0A8wC010476@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10426

Modified Files:
	pam_pkcs11.spec rh_pam_pkcs11.conf 
Log Message:


Fix gdm crashes on 64 bit on startup - pam_pkcs11.conf has library path
names. Make sure those path names point to the correct libraries.



Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pam_pkcs11.spec	16 Aug 2006 23:52:00 -0000	1.10
+++ pam_pkcs11.spec	22 Aug 2006 00:10:03 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        10
+Release:        11
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -92,7 +92,9 @@
 # set up config files
 #
 install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
+sed -e 's;$_libdir;'%{_libdir}';g' %{SOURCE1} > $RPM_BUILD_ROOT/tmp_conf
+install -m 644 $RPM_BUILD_ROOT/tmp_conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
+rm -f $RPM_BUILD_ROOT/tmp_conf
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
 #
 # clean up those files that aren't part of this package
@@ -145,6 +147,9 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Mon Aug 21 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-10
+- Handle library paths in config file
+
 * Mon Aug 16 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-10
 - remove sceventd
 


Index: rh_pam_pkcs11.conf
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/rh_pam_pkcs11.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rh_pam_pkcs11.conf	5 Jul 2006 21:48:16 -0000	1.1
+++ rh_pam_pkcs11.conf	22 Aug 2006 00:10:03 -0000	1.2
@@ -30,7 +30,7 @@
   use_pkcs11_module = coolkey;
 
   pkcs11_module coolkey {
-    module = /usr/lib/libcoolkeypk11.so;
+    module = $_libdir/libcoolkeypk11.so;
     description = "Cool Key"
     # Slot-number to use. One for the first, two for the second and so
     # on. The default value is zero which means to use the first slot
@@ -61,7 +61,7 @@
   }
 
   pkcs11_module opensc {
-    module = /usr/lib/opensc-pkcs11.so;
+    module = $_libdir/opensc-pkcs11.so;
     description = "OpenSC PKCS#11 module";
     # Slot-number to use. One for the first, two for the second and so
     # on. The default value is zero which means to use the first slot
@@ -92,7 +92,7 @@
 
   # Default pkcs11 module
   pkcs11_module default {
-    module = /usr/lib/pam_pkcs11/pkcs11_module.so;
+    module = $_libdir/pam_pkcs11/pkcs11_module.so;
     description = "Default pkcs#11 module";
     slot_num = 0;
     ca_dir = /etc/pam_pkcs11/cacerts;
@@ -127,13 +127,13 @@
   # value as module search path
   # TODO:
   # This is not still functional: use absolute pathnames or LD_LIBRARY_PATH 
-  mapper_search_path = /usr/lib/pam_pkcs11;
+  mapper_search_path = $_libdir/pam_pkcs11;
 
   # 
   # Generic certificate contents mapper
   mapper generic {
         debug = true;
-        module = /usr/lib/pam_pkcs11/generic_mapper.so;
+        module = $_libdir/pam_pkcs11/generic_mapper.so;
         # ignore letter case on match/compare
         ignorecase = false;
         # Use one of "cn" , "subject" , "kpn" , "email" , "upn" or "uid"
@@ -148,7 +148,7 @@
   # provided file stores one or more "Subject -> login" lines
   mapper subject {
 	debug = false;
-	# module = /usr/lib/pam_pkcs11/subject_mapper.so;
+	# module = $_libdir/pam_pkcs11/subject_mapper.so;
 	module = internal;
 	ignorecase = false;
 	mapfile = file:///etc/pam_pkcs11/subject_mapping;
@@ -157,13 +157,13 @@
   # Search public keys from $HOME/.ssh/authorized_keys to match users
   mapper openssh {
 	debug = false;
-	module = /usr/lib/pam_pkcs11/openssh_mapper.so;
+	module = $_libdir/pam_pkcs11/openssh_mapper.so;
   }
 
   # Search certificates from $HOME/.eid/authorized_certificates to match users
   mapper opensc {
 	debug = false;
-	module = /usr/lib/pam_pkcs11/opensc_mapper.so;
+	module = $_libdir/pam_pkcs11/opensc_mapper.so;
   }
 
   # Certificate Common Name ( CN ) to getpwent() mapper
@@ -171,13 +171,13 @@
 	debug = false;
 	ignorecase = false;
 	module = internal;
-	# module = /usr/lib/pam_pkcs11/pwent_mapper.so;
+	# module = $_libdir/pam_pkcs11/pwent_mapper.so;
   }
 
   # Null ( no map ) mapper. when user as finder matchs to NULL or "nobody"
   mapper null {
 	debug = false;
-	# module = /usr/lib/pam_pkcs11/null_mapper.so;
+	# module = $_libdir/pam_pkcs11/null_mapper.so;
 	module = internal ;
 	# select behavior: always match, or always fail
 	default_match = false;
@@ -188,7 +188,7 @@
   # Directory ( ldap style ) mapper
   mapper ldap {
 	debug = false;
-	module = /usr/lib/pam_pkcs11/ldap_mapper.so;
+	module = $_libdir/pam_pkcs11/ldap_mapper.so;
 	# where base directory resides
 	basedir = /etc/pam_pkcs11/mapdir;
 	# hostname of ldap server
@@ -213,7 +213,7 @@
   mapper cn {
 	debug = false;
 	module = internal;
-	# module = /usr/lib/pam_pkcs11/cn_mapper.so;
+	# module = $_libdir/pam_pkcs11/cn_mapper.so;
 	ignorecase = true;
 	mapfile = file:///etc/pam_pkcs11/cn_map;
   }
@@ -222,7 +222,7 @@
   mapper mail {
 	debug = false;
 	module = internal;
-	# module = /usr/lib/pam_pkcs11/mail_mapper.so;
+	# module = $_libdir/pam_pkcs11/mail_mapper.so;
 	# Declare mapfile or
 	# leave empty "" or "none" to use no map 
 	mapfile = file:///etc/pam_pkcs11/mail_mapping;
@@ -239,7 +239,7 @@
   mapper ms {
 	debug = false;
 	module = internal;
-	# module = /usr/lib/pam_pkcs11/ms_mapper.so;
+	# module = $_libdir/pam_pkcs11/ms_mapper.so;
 	ignorecase = false;
 	ignoredomain = false;
 	domain = "domain.com";
@@ -249,7 +249,7 @@
   mapper krb {
 	debug = false;
 	module = internal;
-	# module = /usr/lib/pam_pkcs11/krb_mapper.so;
+	# module = $_libdir/pam_pkcs11/krb_mapper.so;
 	ignorecase = false;
 	mapfile = "none";
   }
@@ -258,7 +258,7 @@
   mapper uid {
 	debug = false;
 	module = internal;
-	# module = /usr/lib/pam_pkcs11/uid_mapper.so;
+	# module = $_libdir/pam_pkcs11/uid_mapper.so;
 	ignorecase = false;
 	mapfile = "none";
   }
@@ -267,7 +267,7 @@
   mapper digest {
 	debug = false;
 	module = internal;
-	# module = /usr/lib/pam_pkcs11/digest_mapper.so;
+	# module = $_libdir/pam_pkcs11/digest_mapper.so;
 	# algorithm used to evaluate certificate digest
         # Select one of:
 	# "null","md2","md4","md5","sha","sha1","dss","dss1","ripemd160"



From fedora-cvs-commits at redhat.com  Tue Aug 22 00:34:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 20:34:50 -0400
Subject: rpms/icon-naming-utils/devel icon-naming-utils.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200608220034.k7M0Yox8010033@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/icon-naming-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9971

Modified Files:
	icon-naming-utils.spec sources 
Log Message:
0.8.1



Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/devel/icon-naming-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- icon-naming-utils.spec	3 Aug 2006 05:11:32 -0000	1.8
+++ icon-naming-utils.spec	22 Aug 2006 00:34:39 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           icon-naming-utils
-Version:        0.8.0
+Version:        0.8.1
 Release:        1%{?dist}
 Summary: 	A script to handle icon names in desktop icon themes
 
@@ -48,6 +48,9 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.1-1.fc6
+- Update to 0.8.1
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.0-1.fc6
 - Update to 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Aug 2006 05:11:32 -0000	1.6
+++ sources	22 Aug 2006 00:34:39 -0000	1.7
@@ -1 +1 @@
-4cdb3ad449abe8b55e4559b85d0ac4e0  icon-naming-utils-0.8.0.tar.gz
+7a7d340f59c7a6c26391e906b7afa08c  icon-naming-utils-0.8.1.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 22 00:44:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 20:44:39 -0400
Subject: rpms/gtk2-engines/devel .cvsignore, 1.21, 1.22 gtk2-engines.spec,
	1.45, 1.46 sources, 1.22, 1.23
Message-ID: <200608220044.k7M0id92012071@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2-engines/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12026

Modified Files:
	.cvsignore gtk2-engines.spec sources 
Log Message:
2.7.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	12 Aug 2006 05:17:55 -0000	1.21
+++ .cvsignore	22 Aug 2006 00:44:36 -0000	1.22
@@ -1 +1 @@
-gtk-engines-2.7.7.tar.bz2
+gtk-engines-2.7.8.tar.bz2


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gtk2-engines.spec	12 Aug 2006 05:17:55 -0000	1.45
+++ gtk2-engines.spec	22 Aug 2006 00:44:36 -0000	1.46
@@ -1,6 +1,6 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.7.7
+Version:        2.7.8
 Release:	1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_datadir}/themes
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.8-1.fc6
+- Update to 2.7.8
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.7-1.fc6
 - Update to 2.7.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	12 Aug 2006 05:17:55 -0000	1.22
+++ sources	22 Aug 2006 00:44:36 -0000	1.23
@@ -1 +1 @@
-9019e3c0770e1ece497c9395a02444fd  gtk-engines-2.7.7.tar.bz2
+5eece46b655fcf027d6b3775ef105bcc  gtk-engines-2.7.8.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 00:54:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 20:54:11 -0400
Subject: rpms/libwnck/devel .cvsignore, 1.37, 1.38 libwnck.spec, 1.55,
	1.56 sources, 1.37, 1.38
Message-ID: <200608220054.k7M0sBDk030025@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29957

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	12 Aug 2006 04:44:11 -0000	1.37
+++ .cvsignore	22 Aug 2006 00:54:09 -0000	1.38
@@ -1 +1 @@
-libwnck-2.15.91.tar.bz2
+libwnck-2.15.92.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- libwnck.spec	12 Aug 2006 04:44:12 -0000	1.55
+++ libwnck.spec	22 Aug 2006 00:54:09 -0000	1.56
@@ -5,7 +5,7 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.15.91
+Version: 2.15.92
 Release: 1%{?dist}
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
@@ -40,6 +40,7 @@
 Requires: glib2-devel >= %{glib2_version}
 Requires: pango-devel >= %{pango_version}
 Requires: gtk2-devel >= %{gtk2_version}
+Requires: pkgconfig
 
 %description devel
 libwnck (pronounced "libwink") is used to implement pagers, tasklists, 
@@ -90,6 +91,10 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+- Require pkgconfig in the -devel package
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 - Don't ship static libraries


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	12 Aug 2006 04:44:12 -0000	1.37
+++ sources	22 Aug 2006 00:54:09 -0000	1.38
@@ -1 +1 @@
-d1dbe01de445b88359332061aa4cff0e  libwnck-2.15.91.tar.bz2
+1653782864352a5b46d0a82c75a09690  libwnck-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 01:06:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 21:06:51 -0400
Subject: rpms/gnome-backgrounds/devel .cvsignore, 1.4,
	1.5 gnome-backgrounds.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200608220106.k7M16pfs001055@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32721

Modified Files:
	.cvsignore gnome-backgrounds.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-backgrounds/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Jun 2006 05:32:16 -0000	1.4
+++ .cvsignore	22 Aug 2006 01:06:37 -0000	1.5
@@ -1 +1 @@
-gnome-backgrounds-2.14.2.1.tar.bz2
+gnome-backgrounds-2.15.92.tar.bz2


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-backgrounds.spec	9 Jun 2006 17:16:34 -0000	1.7
+++ gnome-backgrounds.spec	22 Aug 2006 01:06:37 -0000	1.8
@@ -2,8 +2,8 @@
 
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.14.2.1
-Release: 3
+Version: 2.15.92
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org
@@ -51,6 +51,9 @@
 %{_datadir}/backgrounds
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2.1-3
 - Add missing BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-backgrounds/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Jun 2006 05:32:16 -0000	1.4
+++ sources	22 Aug 2006 01:06:37 -0000	1.5
@@ -1 +1 @@
-10480df7c2e5a08c920c5b0a2ff4f161  gnome-backgrounds-2.14.2.1.tar.bz2
+42497f5feb8c77efca6497f87222d2a1  gnome-backgrounds-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 01:14:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 21:14:19 -0400
Subject: rpms/metacity/devel .cvsignore, 1.46, 1.47 metacity.spec, 1.90,
	1.91 sources, 1.46, 1.47
Message-ID: <200608220114.k7M1EJd6002875@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2782

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.15.34



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	13 Aug 2006 14:46:48 -0000	1.46
+++ .cvsignore	22 Aug 2006 01:14:16 -0000	1.47
@@ -1 +1 @@
-metacity-2.15.21.tar.bz2
+metacity-2.15.34.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- metacity.spec	13 Aug 2006 14:46:48 -0000	1.90
+++ metacity.spec	22 Aug 2006 01:14:16 -0000	1.91
@@ -1,6 +1,6 @@
 %define gettext_package metacity
 
-%define metacity_version 2.15.21
+%define metacity_version 2.15.34
 
 %define metacity_filename metacity-%{metacity_version}
 
@@ -28,6 +28,7 @@
 
 Requires: startup-notification >= 0.7
 Requires: redhat-artwork >= 0.62
+Requires: pkgconfig
 
 Patch0: metacity-2.4.13.90-ctrlaltdel.patch
 Patch1: metacity-2.13.89.0.2006.02.16-static-cm.patch
@@ -117,6 +118,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.34-1.fc6
+- Update to 2.15.34
+- Require pkgconfig, since we installing a .pc file
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.21-1.fc6
 - Update to 2.15.21
 - Uninstall gconf schemas in %%preun


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	13 Aug 2006 14:46:48 -0000	1.46
+++ sources	22 Aug 2006 01:14:16 -0000	1.47
@@ -1 +1 @@
-31fbcba45bc370300db7aa08de54b1c7  metacity-2.15.21.tar.bz2
+c0ba764f0e59187ae19713520d8f8d95  metacity-2.15.34.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 01:19:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 21:19:32 -0400
Subject: rpms/gnome-desktop/devel .cvsignore, 1.35, 1.36 gnome-desktop.spec,
	1.63, 1.64 sources, 1.35, 1.36
Message-ID: <200608220119.k7M1JW6l019502@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19445

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Aug 2006 06:31:29 -0000	1.35
+++ .cvsignore	22 Aug 2006 01:19:28 -0000	1.36
@@ -1 +1 @@
-gnome-desktop-2.15.91.tar.bz2
+gnome-desktop-2.15.92.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gnome-desktop.spec	13 Aug 2006 06:31:29 -0000	1.63
+++ gnome-desktop.spec	22 Aug 2006 01:19:28 -0000	1.64
@@ -9,9 +9,9 @@
 %define po_package gnome-desktop-2.0
 %define gnome_doc_utils_version 0.3.2
 
-Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
+Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.15.91
+Version: 2.15.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
@@ -67,6 +67,7 @@
 Requires: libgnomeui-devel >= %{libgnomeui_version}
 Requires: libgnome-devel >= %{libgnome_version}
 Requires: startup-notification-devel >= %{startup_notification_version}
+Requires: pkgconfig
 
 %description devel
 Libraries and header files for the GNOME-internal private library 
@@ -132,6 +133,10 @@
 %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+- Require pkgconfig in the -devel package
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	13 Aug 2006 06:31:29 -0000	1.35
+++ sources	22 Aug 2006 01:19:28 -0000	1.36
@@ -1 +1 @@
-a8bc45533d775ffce3b3760a185703d2  gnome-desktop-2.15.91.tar.bz2
+93c5edd6c047777263e6fcaf05fc9e59  gnome-desktop-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 01:33:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 21:33:41 -0400
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.37,
	1.38 nautilus-cd-burner.spec, 1.70, 1.71 sources, 1.37, 1.38
Message-ID: <200608220133.k7M1XfDR023519@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23488

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.15.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	13 Aug 2006 02:29:39 -0000	1.37
+++ .cvsignore	22 Aug 2006 01:33:38 -0000	1.38
@@ -1 +1 @@
-nautilus-cd-burner-2.15.6.tar.bz2
+nautilus-cd-burner-2.15.7.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- nautilus-cd-burner.spec	13 Aug 2006 02:29:39 -0000	1.70
+++ nautilus-cd-burner.spec	22 Aug 2006 01:33:38 -0000	1.71
@@ -1,6 +1,6 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.15.6
+Version: 2.15.7
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
@@ -22,8 +22,6 @@
 BuildRequires: gettext
 BuildRequires: hal-devel >= 0.5.7
 BuildRequires: gnome-mount-devel
-# Fix hal-devel not requiring dbus-devel for the moment
-BuildRequires: dbus-devel >= 0.60
 BuildRequires: nautilus-devel >= 2.5.4
 BuildRequires: gnome-mount >= 0.4
 
@@ -36,6 +34,8 @@
 Group: Development/Libraries
 Requires: %name = %{PACKAGE_VERSION}
 Requires: gtk2-devel
+Requires: nautilus-devel
+Requires: pkgconfig
 
 %description devel
 The nautilus-cd-burner-devel package contains the libraries and
@@ -110,6 +110,10 @@
 
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.7-1.fc6
+- Update to 2.15.7
+- Require pkgconfig in the -devel package
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.6-1.fc6
 - Update to 2.15.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	13 Aug 2006 02:29:39 -0000	1.37
+++ sources	22 Aug 2006 01:33:38 -0000	1.38
@@ -1 +1 @@
-63494c0547d70b3397f8f52f08956c78  nautilus-cd-burner-2.15.6.tar.bz2
+1d44ad178d3a1518285ec72b31c52cb8  nautilus-cd-burner-2.15.7.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 01:38:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 21:38:11 -0400
Subject: rpms/gnome-icon-theme/devel gnome-icon-theme.spec,1.54,1.55
Message-ID: <200608220138.k7M1cBvX024830@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24764

Modified Files:
	gnome-icon-theme.spec 
Log Message:
2.15.92



Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-icon-theme.spec	21 Aug 2006 20:49:34 -0000	1.54
+++ gnome-icon-theme.spec	22 Aug 2006 01:38:09 -0000	1.55
@@ -7,11 +7,12 @@
 BuildArch: noarch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: icon-naming-utils >= 0.7.3
+BuildRequires: icon-naming-utils >= 0.8.1
 BuildRequires: perl-XML-Parser
 BuildRequires: pkgconfig
 BuildRequires: gettext
 Requires: hicolor-icon-theme
+Requires: pkgconfig
 Prereq: gtk2 >= 2.6.2
 
 %description
@@ -71,6 +72,7 @@
 %changelog
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> 2.15.92-1.fc6
 - Update to 2.15.92
+- Require pkgconfig
 
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> 2.15.91-1.fc6
 - Update to 2.15.91



From fedora-cvs-commits at redhat.com  Tue Aug 22 02:11:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 22:11:54 -0400
Subject: rpms/gnome-panel/devel .cvsignore, 1.44, 1.45 gnome-panel.spec,
	1.146, 1.147 sources, 1.44, 1.45
Message-ID: <200608220211.k7M2BsJw016632@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16582

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	13 Aug 2006 06:06:32 -0000	1.44
+++ .cvsignore	22 Aug 2006 02:11:51 -0000	1.45
@@ -1 +1 @@
-gnome-panel-2.15.91.tar.bz2
+gnome-panel-2.15.92.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- gnome-panel.spec	18 Aug 2006 15:43:40 -0000	1.146
+++ gnome-panel.spec	22 Aug 2006 02:11:51 -0000	1.147
@@ -19,8 +19,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.15.91
-Release: 4%{?dist} 
+Version: 2.15.92
+Release: 1%{?dist} 
 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
@@ -75,13 +75,8 @@
 Patch6: gnome-panel-2.13.5-switch-user.patch
 Patch8: gnome-panel-2.15.91-use-beagle.patch
 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
-Patch10: gnome-panel-2.14.1-remove-duplicate-entry.patch
-# support transparent background in the notification area
-Patch11: gnome-panel-2.15.91-transparent-systray.patch
 Patch12: gnome-panel-2.14.2-xio-error.patch
 Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch
-Patch14: gnome-panel-2.15.90-fix-double-free.patch
-Patch15: gnome-panel-2.15.91-clear-recent.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -96,6 +91,7 @@
 Requires: gtk2-devel >= %{gtk2_version}
 Requires: libbonoboui-devel >= %{libbonoboui_version}
 Requires: libgnomeui-devel >= %{libgnomeui_version}
+Requires: pkgconfig
 
 %description devel
 Panel Applet development package. Contains files needed for developing
@@ -110,24 +106,13 @@
 %patch6 -p1 -b .switch-user
 %patch8 -p1 -b .use-beagle
 %patch9 -p1 -b .ignore-unknown-options
-%patch10 -p1 -b .remove-duplicate-entry
-%patch11 -p1 -b .transparent-systray
 %patch12 -p1 -b .xio-error
 %patch13 -p1 -b .move-suspend-to-menu
-%patch14 -p1 -b .fix-double-free
-%patch15 -p1 -b .clear-recent
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE2} m4
 cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas
 
-## use the main menu icon in the menu bar
-perl -pi -e 's/PANEL_STOCK_GNOME_LOGO/PANEL_STOCK_MAIN_MENU/g' gnome-panel/menu.c gnome-panel/panel-menu-bar.c
-
-for f in po/*.po; do 
-  sed -i -e 's/msgid "Desktop Environment.Desktop"/msgid "System"/' -e 's/^#~ .*$//' $f
-done
-
 %build
 # gpm-integration patches Makefile.am and configure.in
 automake-1.9
@@ -231,6 +216,12 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+- Require pkgconfig in the -devel package
+- Drop upstreamed patches
+- Drop stale code from .spec
+
 * Fri Aug 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-4.fc6
 - Make clearing recent files work more than once
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	13 Aug 2006 06:06:34 -0000	1.44
+++ sources	22 Aug 2006 02:11:51 -0000	1.45
@@ -1 +1 @@
-c65487c43ed633ceb026f9b98115114d  gnome-panel-2.15.91.tar.bz2
+7126b2070667fdf898e51a974976586c  gnome-panel-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 02:54:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 22:54:49 -0400
Subject: rpms/dasher/devel .cvsignore, 1.17, 1.18 dasher.spec, 1.51,
	1.52 sources, 1.17, 1.18
Message-ID: <200608220254.k7M2sn9T001441@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1426

Modified Files:
	.cvsignore dasher.spec sources 
Log Message:
4.1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Aug 2006 14:54:30 -0000	1.17
+++ .cvsignore	22 Aug 2006 02:54:47 -0000	1.18
@@ -1 +1 @@
-dasher-4.1.9.tar.bz2
+dasher-4.1.10.tar.bz2


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- dasher.spec	13 Aug 2006 14:54:30 -0000	1.51
+++ dasher.spec	22 Aug 2006 02:54:47 -0000	1.52
@@ -1,6 +1,6 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 4.1.9
+Version: 4.1.10
 Release: 1%{?dist} 
 License: GPL
 Group: Desktop/Accessibility
@@ -99,6 +99,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.10-1.fc6
+- Update to 4.1.10
+
 * Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.9-1.fc6
 - Update to 4.1.9
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	13 Aug 2006 14:54:30 -0000	1.17
+++ sources	22 Aug 2006 02:54:47 -0000	1.18
@@ -1 +1 @@
-626ae8da69c4b326cb6b06e572f9186b  dasher-4.1.9.tar.bz2
+69971f8700c2499db63d1f124cbb8b3c  dasher-4.1.10.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 03:02:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 23:02:06 -0400
Subject: rpms/gnome-session/devel .cvsignore, 1.26, 1.27 gnome-session.spec,
	1.82, 1.83 sources, 1.26, 1.27
Message-ID: <200608220302.k7M326Sw001651@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1634

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Aug 2006 18:27:09 -0000	1.26
+++ .cvsignore	22 Aug 2006 03:02:03 -0000	1.27
@@ -1 +1 @@
-gnome-session-2.15.91.tar.bz2
+gnome-session-2.15.92.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gnome-session.spec	14 Aug 2006 18:24:52 -0000	1.82
+++ gnome-session.spec	22 Aug 2006 03:02:03 -0000	1.83
@@ -13,7 +13,7 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.15.91
+Version: 2.15.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
@@ -154,10 +154,16 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnome-session.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/gnome-session.schemas > /dev/null
+/sbin/ldconfig
+
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-session.schemas > /dev/null
+fi
+
+%postun
 /sbin/ldconfig
 
 %files -f %{po_package}.lang
@@ -175,6 +181,10 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+- Add %%preun and %%postun scripts
+
 * Mon Aug 14 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-1.fc6
 - Update to 2.15.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Aug 2006 18:27:09 -0000	1.26
+++ sources	22 Aug 2006 03:02:03 -0000	1.27
@@ -1 +1 @@
-61739d816df371a079730fb6db4bd4a5  gnome-session-2.15.91.tar.bz2
+c4fa459f0c5d528e8f3019e096d3fd75  gnome-session-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 03:10:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 23:10:02 -0400
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.27,
	1.28 gnome-screensaver.spec, 1.100, 1.101 sources, 1.30, 1.31
Message-ID: <200608220310.k7M3A2c2001845@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1825

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.15.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	14 Aug 2006 19:17:09 -0000	1.27
+++ .cvsignore	22 Aug 2006 03:10:00 -0000	1.28
@@ -1 +1 @@
-gnome-screensaver-2.15.6.tar.bz2
+gnome-screensaver-2.15.7.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gnome-screensaver.spec	14 Aug 2006 20:17:28 -0000	1.100
+++ gnome-screensaver.spec	22 Aug 2006 03:10:00 -0000	1.101
@@ -12,7 +12,7 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.15.6
+Version: 2.15.7
 Release: 1%{?dist} 
 License: GPL
 Group: Amusements/Graphics
@@ -102,10 +102,13 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnome-screensaver.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/gnome-screensaver.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/gnome-screensaver.schemas >/dev/null
+fi
 
 if rpm -q xscreensaver-extras >& /dev/null || \
    rpm -q xscreensaver-gl-extras >& /dev/null; then
@@ -151,6 +154,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.7-1.fc6
+- Update to 2.15.7
+- Add a %%preun script
+
 * Sun Aug 13 2006 Ray Strode <rstrode at redhat.com> - 2.15.6-1.fc6
 - Update to 2.15.6
 - fix up rpm group (bug 202372)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	14 Aug 2006 19:17:09 -0000	1.30
+++ sources	22 Aug 2006 03:10:00 -0000	1.31
@@ -1 +1 @@
-fad605326dc2e922264bdea96bfa981f  gnome-screensaver-2.15.6.tar.bz2
+09c09760c774cc5ec0840e196363d272  gnome-screensaver-2.15.7.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 03:14:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 23:14:25 -0400
Subject: rpms/bug-buddy/devel .cvsignore, 1.29, 1.30 bug-buddy.spec, 1.58,
	1.59 sources, 1.29, 1.30
Message-ID: <200608220314.k7M3EP9t013242@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13187

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	2 Aug 2006 23:48:12 -0000	1.29
+++ .cvsignore	22 Aug 2006 03:14:23 -0000	1.30
@@ -1 +1 @@
-bug-buddy-2.15.90.tar.bz2
+bug-buddy-2.15.92.tar.bz2


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- bug-buddy.spec	5 Aug 2006 16:37:14 -0000	1.58
+++ bug-buddy.spec	22 Aug 2006 03:14:23 -0000	1.59
@@ -4,10 +4,10 @@
 %define gnome_doc_utils_version 0.2.0
 
 Name: bug-buddy
-Version: 2.15.90
-Release: 2%{?dist}
+Version: 2.15.92
+Release: 1%{?dist}
 Epoch: 1
-Summary: A bug reporting utility for GNOME.
+Summary: A bug reporting utility for GNOME
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/pre-gnome2/%{name}/%{name}-%{version}.tar.bz2
@@ -121,6 +121,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.92-1.fc6
+- Update to 2.15.92
+
 * Sat Aug  5 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.15.90-2.fc6
 - rebuild against new e-d-s
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	2 Aug 2006 23:48:12 -0000	1.29
+++ sources	22 Aug 2006 03:14:23 -0000	1.30
@@ -1 +1 @@
-38c092ad09b5b1a9dae04beb35311234  bug-buddy-2.15.90.tar.bz2
+7997d31343ebc88c5f1cc889c1f625be  bug-buddy-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 03:21:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 23:21:57 -0400
Subject: rpms/gnome-keyring-manager/devel .cvsignore, 1.6,
	1.7 gnome-keyring-manager.spec, 1.19, 1.20 sources, 1.6, 1.7
Message-ID: <200608220321.k7M3LvEf031138@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-keyring-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31078

Modified Files:
	.cvsignore gnome-keyring-manager.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring-manager/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Mar 2006 05:24:13 -0000	1.6
+++ .cvsignore	22 Aug 2006 03:21:54 -0000	1.7
@@ -1,5 +1 @@
-gnome-keyring-manager-0.0.3.tar.bz2
-gnome-keyring-manager-0.0.4.tar.bz2
-gnome-keyring-manager-2.11.1.tar.bz2
-gnome-keyring-manager-2.12.0.tar.bz2
-gnome-keyring-manager-2.14.0.tar.bz2
+gnome-keyring-manager-2.15.92.tar.bz2


Index: gnome-keyring-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring-manager/devel/gnome-keyring-manager.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-keyring-manager.spec	12 Jul 2006 17:32:27 -0000	1.19
+++ gnome-keyring-manager.spec	22 Aug 2006 03:21:54 -0000	1.20
@@ -1,14 +1,12 @@
 Summary: Manager for passwords stored in gnome-keyring
 Name: gnome-keyring-manager
-Version: 2.14.0
-Release: 2.1.1
+Version: 2.15.92
+Release: 1%{?dist}
 License: GPL
 Group: User Interface/Desktops
 Source: gnome-keyring-manager-%{version}.tar.bz2
 URL: http://www.gnome.org/
 
-Patch0: gnome-keyring-manager-2.12.0-no-default.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gnome-keyring-devel
 BuildRequires: libgnomeui-devel
@@ -24,7 +22,6 @@
 
 %prep
 %setup -q -n gnome-keyring-manager-%{version}
-%patch0 -p1 -b .no-default
 
 %build
 
@@ -44,10 +41,13 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnome-keyring-manager.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/gnome-keyring-manager.schemas > /dev/null
+
+%postun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-keyring-manager.schemas > /dev/null
+fi
 
 %files -f gnome-keyring-manager.lang
 %defattr(-, root, root)
@@ -61,6 +61,11 @@
 %{_datadir}/man/man1/*
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+- Drop upstreamed patch
+- Add a %%preun script
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-2.1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring-manager/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Mar 2006 05:24:14 -0000	1.6
+++ sources	22 Aug 2006 03:21:54 -0000	1.7
@@ -1,2 +1 @@
-0a588c64839390e0c6e07250b509a86a  gnome-keyring-manager-2.12.0.tar.bz2
-d4e38c7b7da99885fa898917e10d8aeb  gnome-keyring-manager-2.14.0.tar.bz2
+1b32b61ea9b38d9c0f2c6e11c548d875  gnome-keyring-manager-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 03:25:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 21 Aug 2006 23:25:56 -0400
Subject: rpms/gnome-python2/devel .cvsignore, 1.18, 1.19 gnome-python.spec,
	1.46, 1.47 sources, 1.18, 1.19
Message-ID: <200608220325.k7M3PuNe032699@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32631

Modified Files:
	.cvsignore gnome-python.spec sources 
Log Message:
2.15.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	4 Aug 2006 18:55:52 -0000	1.18
+++ .cvsignore	22 Aug 2006 03:25:54 -0000	1.19
@@ -1 +1 @@
-gnome-python-2.15.90.tar.bz2
+gnome-python-2.15.91.tar.bz2


Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-python.spec	4 Aug 2006 19:37:35 -0000	1.46
+++ gnome-python.spec	22 Aug 2006 03:25:54 -0000	1.47
@@ -4,9 +4,9 @@
 # libzvt is in Extras but not Core
 %define buildzvt 0
 
-Summary: The sources for the PyGNOME Python extension module.
+Summary: The sources for the PyGNOME Python extension module
 Name: gnome-python2
-Version: 2.15.90
+Version: 2.15.91
 Release: 1%{?dist}
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-python/gnome-python-%{version}.tar.bz2
 
@@ -184,6 +184,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
 * Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	4 Aug 2006 18:55:52 -0000	1.18
+++ sources	22 Aug 2006 03:25:54 -0000	1.19
@@ -1 +1 @@
-192e7bf570b76ca3749fad3778abefe7  gnome-python-2.15.90.tar.bz2
+d06c1cc0d715d9819f30ce5546dc07df  gnome-python-2.15.91.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 04:03:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 00:03:07 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic,1.41,1.42
Message-ID: <200608220403.k7M4373I026705@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv26629/configs

Modified Files:
	config-ia64-generic 
Log Message:
New utrace patch: experimental support for ia64, sparc64.


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- config-ia64-generic	14 Aug 2006 22:23:43 -0000	1.41
+++ config-ia64-generic	22 Aug 2006 04:03:04 -0000	1.42
@@ -173,6 +173,3 @@
 # CONFIG_BCM43XX is not set
 
 CONFIG_HW_RANDOM_INTEL=m
-
-# FIXME
-# CONFIG_PTRACE is not set



From fedora-cvs-commits at redhat.com  Tue Aug 22 04:03:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 00:03:07 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2581,
	1.2582 linux-2.6-utrace.patch, 1.19, 1.20
Message-ID: <200608220403.k7M437jE026698@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26629

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
New utrace patch: experimental support for ia64, sparc64.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2581
retrieving revision 1.2582
diff -u -r1.2581 -r1.2582
--- kernel-2.6.spec	20 Aug 2006 07:29:57 -0000	1.2581
+++ kernel-2.6.spec	22 Aug 2006 04:02:45 -0000	1.2582
@@ -943,7 +943,7 @@
 %patch1770 -p1
 # support EHEA ethernet driver
 %patch1780 -p1
-# qlogic firmware 
+# qlogic firmware
 %patch1790 -p1
 
 # Fix the SELinux mprotect checks on executable mappings
@@ -1719,6 +1719,9 @@
 %endif
 
 %changelog
+* Mon Aug 21 2006 Roland McGrath <roland at redhat.com>
+- New utrace patch: experimental support for ia64, sparc64.
+
 * Sun Aug 20 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc4-git1
 

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  454 ++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  863 +++++++++-------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/ia32_entry.S             |    2 
 arch/ia64/ia32/sys_ia32.c               |   23 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               | 1671 +++++++++++++++-----------------
 arch/ia64/kernel/signal.c               |    4 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  959 ++++++++++--------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  639 +++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            | 1222 ++++++++++++-----------
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  715 +++++++++----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  648 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |   14 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   49 
 include/asm-ia64/elf.h                  |   24 
 include/asm-ia64/tracehook.h            |   81 +
 include/asm-powerpc/tracehook.h         |   80 +
 include/asm-s390/tracehook.h            |   53 +
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |   54 +
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |  224 +++-
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  699 +++++++++++++
 include/linux/utrace.h                  |  481 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  253 +---
 kernel/fork.c                           |   62 -
 kernel/ptrace.c                         | 1560 +++++++++++++++++++++++------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    4 
 kernel/utrace.c                         | 1526 +++++++++++++++++++++++++++++
 security/selinux/hooks.c                |   54 -
 security/selinux/include/objsec.h       |    1 
 94 files changed, 9467 insertions(+), 4564 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.19 -r 1.20 linux-2.6-utrace.patch
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-utrace.patch	16 Aug 2006 08:38:01 -0000	1.19
+++ linux-2.6-utrace.patch	22 Aug 2006 04:03:01 -0000	1.20
@@ -1,13 +1,13 @@
- Documentation/utrace.txt                |  454 +++++++++
+ Documentation/utrace.txt                |  454 ++++++++
  arch/alpha/kernel/asm-offsets.c         |    2 
  arch/alpha/kernel/entry.S               |    4 
  arch/arm/kernel/ptrace.c                |   36 -
  arch/arm26/kernel/ptrace.c              |   32 -
  arch/frv/kernel/ptrace.c                |   15 
  arch/i386/kernel/entry.S                |    7 
- arch/i386/kernel/i387.c                 |  143 ++-
+ arch/i386/kernel/i387.c                 |  143 +--
  arch/i386/kernel/process.c              |    3 
- arch/i386/kernel/ptrace.c               |  863 +++++++++--------
+ arch/i386/kernel/ptrace.c               |  863 +++++++++-------
  arch/i386/kernel/signal.c               |   39 -
  arch/i386/kernel/vm86.c                 |    7 
  arch/ia64/ia32/ia32_entry.S             |    2 
@@ -15,7 +15,7 @@
  arch/ia64/kernel/asm-offsets.c          |    2 
  arch/ia64/kernel/fsys.S                 |   16 
  arch/ia64/kernel/mca.c                  |    2 
- arch/ia64/kernel/ptrace.c               |   41 -
+ arch/ia64/kernel/ptrace.c               | 1671 +++++++++++++++----------------
  arch/ia64/kernel/signal.c               |    4 
  arch/mips/kernel/ptrace.c               |   21 
  arch/mips/kernel/sysirix.c              |    2 
@@ -23,8 +23,8 @@
  arch/powerpc/kernel/asm-offsets.c       |    2 
  arch/powerpc/kernel/process.c           |    5 
  arch/powerpc/kernel/ptrace-common.h     |  161 ---
- arch/powerpc/kernel/ptrace.c            |  953 +++++++++++--------
- arch/powerpc/kernel/ptrace32.c          |  436 ---------
+ arch/powerpc/kernel/ptrace.c            |  959 +++++++++++-------
+ arch/powerpc/kernel/ptrace32.c          |  436 --------
  arch/powerpc/kernel/signal_32.c         |   56 +
  arch/powerpc/kernel/signal_64.c         |    4 
  arch/powerpc/kernel/sys_ppc32.c         |    5 
@@ -34,12 +34,12 @@
  arch/s390/kernel/compat_linux.c         |    3 
  arch/s390/kernel/compat_signal.c        |    5 
  arch/s390/kernel/process.c              |    3 
- arch/s390/kernel/ptrace.c               |  637 ++++++++++++-
+ arch/s390/kernel/ptrace.c               |  639 +++++++++++-
  arch/s390/kernel/signal.c               |    4 
  arch/s390/kernel/traps.c                |    6 
  arch/sparc64/kernel/entry.S             |    6 
  arch/sparc64/kernel/process.c           |    3 
- arch/sparc64/kernel/ptrace.c            |  653 +++++++++++--
+ arch/sparc64/kernel/ptrace.c            | 1222 ++++++++++++-----------
  arch/sparc64/kernel/signal.c            |    2 
  arch/sparc64/kernel/signal32.c          |    2 
  arch/sparc64/kernel/sys_sparc32.c       |    3 
@@ -48,10 +48,10 @@
  arch/x86_64/ia32/ia32_aout.c            |    6 
  arch/x86_64/ia32/ia32_signal.c          |    8 
  arch/x86_64/ia32/ia32entry.S            |    2 
- arch/x86_64/ia32/ptrace32.c             |  714 ++++++++++----
+ arch/x86_64/ia32/ptrace32.c             |  715 +++++++++----
  arch/x86_64/ia32/sys_ia32.c             |    5 
  arch/x86_64/kernel/process.c            |    5 
- arch/x86_64/kernel/ptrace.c             |  648 ++++++++-----
+ arch/x86_64/kernel/ptrace.c             |  648 +++++++-----
  arch/x86_64/kernel/signal.c             |   30 -
  arch/x86_64/kernel/traps.c              |    8 
  arch/x86_64/mm/fault.c                  |    4 
@@ -68,30 +68,31 @@
  include/asm-i386/signal.h               |    4 
  include/asm-i386/thread_info.h          |    7 
  include/asm-i386/tracehook.h            |   49 +
- include/asm-ia64/tracehook.h            |   67 +
- include/asm-powerpc/tracehook.h         |   80 ++
+ include/asm-ia64/elf.h                  |   24 
+ include/asm-ia64/tracehook.h            |   81 ++
+ include/asm-powerpc/tracehook.h         |   80 +
  include/asm-s390/tracehook.h            |   53 +
  include/asm-sparc64/tracehook.h         |   44 +
  include/asm-x86_64/fpu32.h              |    3 
  include/asm-x86_64/thread_info.h        |    2 
  include/asm-x86_64/tracehook.h          |   54 +
  include/linux/init_task.h               |    3 
- include/linux/ptrace.h                  |  214 +++-
- include/linux/sched.h                   |   25 -
- include/linux/tracehook.h               |  649 +++++++++++++
- include/linux/utrace.h                  |  481 ++++++++++
+ include/linux/ptrace.h                  |  224 +++-
+ include/linux/sched.h                   |   25 
+ include/linux/tracehook.h               |  699 +++++++++++++
+ include/linux/utrace.h                  |  481 +++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
  kernel/exit.c                           |  253 +----
  kernel/fork.c                           |   62 -
- kernel/ptrace.c                         | 1547 ++++++++++++++++++++++++-------
+ kernel/ptrace.c                         | 1560 +++++++++++++++++++++++------
  kernel/signal.c                         |  211 +---
  kernel/sys.c                            |    2 
  kernel/timer.c                          |    4 
- kernel/utrace.c                         | 1526 +++++++++++++++++++++++++++++++
+ kernel/utrace.c                         | 1526 ++++++++++++++++++++++++++++
  security/selinux/hooks.c                |   54 +
  security/selinux/include/objsec.h       |    1 
- 93 files changed, 8430 insertions(+), 3282 deletions(-)
+ 94 files changed, 9467 insertions(+), 4564 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -188,9 +189,42 @@
 +
 +
 +#endif
+--- linux-2.6/include/asm-ia64/elf.h.utrace-ptrace-compat
++++ linux-2.6/include/asm-ia64/elf.h
+@@ -154,6 +154,30 @@ extern void ia64_init_addr_space (void);
+ #define ELF_NGREG	128	/* we really need just 72 but let's leave some headroom... */
+ #define ELF_NFPREG	128	/* f0 and f1 could be omitted, but so what... */
+ 
++/* elf_gregset_t register offsets */
++#define ELF_GR_0_OFFSET     0
++#define ELF_NAT_OFFSET     (32 * sizeof(elf_greg_t))
++#define ELF_PR_OFFSET      (33 * sizeof(elf_greg_t))
++#define ELF_BR_0_OFFSET    (34 * sizeof(elf_greg_t))
++#define ELF_CR_IIP_OFFSET  (42 * sizeof(elf_greg_t))
++#define ELF_CFM_OFFSET     (43 * sizeof(elf_greg_t))
++#define ELF_CR_IPSR_OFFSET (44 * sizeof(elf_greg_t))
++#define ELF_GR_OFFSET(i)   (ELF_GR_0_OFFSET + i * sizeof(elf_greg_t))
++#define ELF_BR_OFFSET(i)   (ELF_BR_0_OFFSET + i * sizeof(elf_greg_t))
++#define ELF_AR_RSC_OFFSET  (45 * sizeof(elf_greg_t))
++#define ELF_AR_BSP_OFFSET  (46 * sizeof(elf_greg_t))
++#define ELF_AR_BSPSTORE_OFFSET (47 * sizeof(elf_greg_t))
++#define ELF_AR_RNAT_OFFSET (48 * sizeof(elf_greg_t))
++#define ELF_AR_CCV_OFFSET  (49 * sizeof(elf_greg_t))
++#define ELF_AR_UNAT_OFFSET (50 * sizeof(elf_greg_t))
++#define ELF_AR_FPSR_OFFSET (51 * sizeof(elf_greg_t))
++#define ELF_AR_PFS_OFFSET  (52 * sizeof(elf_greg_t))
++#define ELF_AR_LC_OFFSET   (53 * sizeof(elf_greg_t))
++#define ELF_AR_EC_OFFSET   (54 * sizeof(elf_greg_t))
++#define ELF_AR_CSD_OFFSET  (55 * sizeof(elf_greg_t))
++#define ELF_AR_SSD_OFFSET  (56 * sizeof(elf_greg_t))
++#define ELF_AR_END_OFFSET  (57 * sizeof(elf_greg_t))
++
+ typedef unsigned long elf_fpxregset_t;
+ 
+ typedef unsigned long elf_greg_t;
 --- linux-2.6/include/asm-ia64/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-ia64/tracehook.h
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,81 @@
 +/*
 + * Copyright (C)2006 Intel Co
 + *	Anil S Keshavamurthy <anil.s.keshavamurthy at intel.com>
@@ -257,6 +291,20 @@
 +	regs->r15 = -1L;
 +}
 +
++extern const struct utrace_regset_view utrace_ia64_native;
++static inline const struct utrace_regset_view *
++utrace_native_view(struct task_struct *tsk)
++{
++#if 0 //CONFIG_IA32_SUPPORT
++	extern const struct utrace_regset_view utrace_ia32_view;
++
++	struct pt_regs *pt = task_pt_regs(tsk);
++	if (pt->cr_ipsr & IA64_PSR_IS)
++		return &utrace_ia32_view;
++#endif
++	return &utrace_ia64_native;
++}
++
 +#endif
 --- linux-2.6/include/asm-i386/i387.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-i386/i387.h
@@ -1140,7 +1188,7 @@
 +#endif	/* linux/utrace.h */
 --- linux-2.6/include/linux/ptrace.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/ptrace.h
-@@ -49,66 +49,174 @@
+@@ -49,66 +49,184 @@
  #include <asm/ptrace.h>
  
  #ifdef __KERNEL__
@@ -1164,6 +1212,8 @@
 + * These must be defined by arch code to handle machine-specific ptrace
 + * requests such as PTRACE_PEEKUSR and PTRACE_GETREGS.  Returns -ENOSYS for
 + * any request it does not handle, then handled by machine-independent code.
++ * This can change *request and then return -ENOSYS to handle a
++ * machine-specific alias for a generic request.
   *
 - * The owner ship rules for task->ptrace which holds the ptrace
 - * flags is simple.  When a task is running it owns it's task->ptrace
@@ -1212,16 +1262,24 @@
 -extern int ptrace_may_attach(struct task_struct *task);
 + * This code should NOT access task machine state directly.  Instead it
[...3686 lines suppressed...]
 +};
 +
-+fastcall int arch_compat_ptrace(long request, struct task_struct *child,
++fastcall int arch_compat_ptrace(compat_long_t *request,
++				struct task_struct *child,
 +				struct utrace_attached_engine *engine,
-+				compat_ulong_t addr, compat_ulong_t data)
-+{
++				compat_ulong_t addr, compat_ulong_t data,
++				compat_long_t *val)
+ {
+-	/* make sure the single step bit is not set. */
+-	clear_single_step(child);
 +	ptrace_area_emu31 parea;
 +
-+	switch (request) {
++	switch (*request) {
 +	case PTRACE_PEEKUSR:
 +		return ptrace_compat_peekusr(child, engine, s390_compat_uarea,
 +					     addr, data);
@@ -12255,21 +14698,20 @@
 +					    parea.kernel_addr, parea.len,
 +					    (void __user *) parea.process_addr,
 +					    NULL,
-+					    request == PTRACE_POKEUSR_AREA);
++					    *request == PTRACE_POKEUSR_AREA);
 +	}
 +
 +	return -ENOSYS;
-+}
+ }
 +#endif	/* CONFIG_COMPAT */
 +#endif	/* CONFIG_PTRACE */
 +
 +
 +#if 0				/* XXX */
-+
+ 
  #ifndef CONFIG_64BIT
  # define __ADDR_MASK 3
- #else
-@@ -593,6 +1149,7 @@ do_ptrace_emu31(struct task_struct *chil
+@@ -593,6 +1151,7 @@ do_ptrace_emu31(struct task_struct *chil
  			copied += sizeof(unsigned int);
  		}
  		return 0;
@@ -12277,7 +14719,7 @@
  	case PTRACE_GETEVENTMSG:
  		return put_user((__u32) child->ptrace_message,
  				(unsigned int __user *) data);
-@@ -606,6 +1163,7 @@ do_ptrace_emu31(struct task_struct *chil
+@@ -606,6 +1165,7 @@ do_ptrace_emu31(struct task_struct *chil
  			return -EINVAL;
  		return copy_siginfo_from_user32(child->last_siginfo,
  						(compat_siginfo_t __user *) data);
@@ -12285,7 +14727,7 @@
  	}
  	return ptrace_request(child, request, addr, data);
  }
-@@ -656,7 +1214,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -656,7 +1216,7 @@ do_ptrace(struct task_struct *child, lon
  			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
  		child->exit_code = data;
  		/* make sure the single step bit is not set. */
@@ -12294,7 +14736,7 @@
  		wake_up_process(child);
  		return 0;
  
-@@ -670,7 +1228,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -670,7 +1230,7 @@ do_ptrace(struct task_struct *child, lon
  			return 0;
  		child->exit_code = SIGKILL;
  		/* make sure the single step bit is not set. */
@@ -12303,7 +14745,7 @@
  		wake_up_process(child);
  		return 0;
  
-@@ -683,7 +1241,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -683,7 +1243,7 @@ do_ptrace(struct task_struct *child, lon
  		if (data)
  			set_tsk_thread_flag(child, TIF_SINGLE_STEP);
  		else
@@ -12312,7 +14754,7 @@
  		/* give it a chance to run. */
  		wake_up_process(child);
  		return 0;
-@@ -704,31 +1262,9 @@ do_ptrace(struct task_struct *child, lon
+@@ -704,31 +1264,9 @@ do_ptrace(struct task_struct *child, lon
  	/* Not reached.  */
  	return -EIO;
  }
@@ -12345,7 +14787,7 @@
  
  asmlinkage void
  syscall_trace(struct pt_regs *regs, int entryexit)
-@@ -736,30 +1272,17 @@ syscall_trace(struct pt_regs *regs, int 
+@@ -736,30 +1274,17 @@ syscall_trace(struct pt_regs *regs, int 
  	if (unlikely(current->audit_context) && entryexit)
  		audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
  
@@ -13170,11 +15612,11 @@
 +	{0, 0, -1, 0}
 +};
 +
-+fastcall int arch_ptrace(long request, struct task_struct *child,
++fastcall int arch_ptrace(long *req, struct task_struct *child,
 +			 struct utrace_attached_engine *engine,
-+			 unsigned long addr, unsigned long data)
++			 unsigned long addr, unsigned long data, long *val)
 +{
-+	switch (request) {
++	switch (*req) {
 +	case PTRACE_PEEKUSR:
 +		return ptrace_peekusr(child, engine, x86_64_uarea, addr, data);
 +	case PTRACE_POKEUSR:
@@ -13193,7 +15635,7 @@
 +		return ptrace_onereg_access(child, engine,
 +					    &utrace_ia32_view, 3,
 +					    addr, (void __user *)data,
-+					    request == PTRACE_SET_THREAD_AREA);
++					    *req == PTRACE_SET_THREAD_AREA);
  #endif
 -
 -	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
@@ -13405,7 +15847,7 @@
  		break;
  
  	R32(cs, cs);
-@@ -163,232 +131,502 @@ static int getreg32(struct task_struct *
+@@ -163,232 +131,503 @@ static int getreg32(struct task_struct *
  	R32(eax, rax);
  	R32(orig_eax, orig_rax);
  	R32(eip, rip);
@@ -13458,7 +15900,7 @@
 +		 const struct utrace_regset *regset,
 +		 unsigned int pos, unsigned int count,
 +		 void *kbuf, void __user *ubuf)
-+{
+ {
 +	if (kbuf) {
 +		u32 *kp = kbuf;
 +		while (count > 0) {
@@ -13526,7 +15968,13 @@
 +		void *kbuf, void __user *ubuf)
 +{
 +	struct user_i387_ia32_struct fp;
-+	int ret;
+ 	int ret;
+-	compat_siginfo_t *si32 = (compat_siginfo_t *)compat_ptr(data);
+-	siginfo_t ssi; 
+-	siginfo_t *si = compat_alloc_user_space(sizeof(siginfo_t));
+-	if (request == PTRACE_SETSIGINFO) {
+-		memset(&ssi, 0, sizeof(siginfo_t));
+-		ret = copy_siginfo_from_user32(&ssi, si32);
 +
 +	if (tsk_used_math(target)) {
 +		if (target == current)
@@ -13548,15 +15996,9 @@
 +		const struct utrace_regset *regset,
 +		unsigned int pos, unsigned int count,
 +		const void *kbuf, const void __user *ubuf)
- {
++{
 +	struct user_i387_ia32_struct fp;
- 	int ret;
--	compat_siginfo_t *si32 = (compat_siginfo_t *)compat_ptr(data);
--	siginfo_t ssi; 
--	siginfo_t *si = compat_alloc_user_space(sizeof(siginfo_t));
--	if (request == PTRACE_SETSIGINFO) {
--		memset(&ssi, 0, sizeof(siginfo_t));
--		ret = copy_siginfo_from_user32(&ssi, si32);
++	int ret;
 +
 +	if (tsk_used_math(target)) {
 +		if (target == current)
@@ -14053,11 +16495,12 @@
 +	{0, 0, -1, 0}
 +};
 +
-+fastcall int arch_compat_ptrace(long request, struct task_struct *child,
++fastcall int arch_compat_ptrace(compat_long_t *req, struct task_struct *child,
 +				struct utrace_attached_engine *engine,
-+				compat_ulong_t addr, compat_ulong_t data)
++				compat_ulong_t addr, compat_ulong_t data,
++				compat_long_t *val)
 +{
-+	switch (request) {
++	switch (*req) {
 +	case PTRACE_PEEKUSR:
 +		return ptrace_compat_peekusr(child, engine, ia32_uarea,
 +					     addr, data);
@@ -14082,7 +16525,7 @@
 +					    &utrace_ia32_view, 3,
 +					    addr,
 +					    (void __user *)(unsigned long)data,
-+					    request == PTRACE_SET_THREAD_AREA);
++					    *req == PTRACE_SET_THREAD_AREA);
 +	}
 +	return -ENOSYS;
 +}



From fedora-cvs-commits at redhat.com  Tue Aug 22 04:17:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 00:17:31 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.43, 1.44 gnome-games.spec, 1.87,
	1.88 sources, 1.46, 1.47
Message-ID: <200608220417.k7M4HVr0029915@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-games/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28992

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	13 Aug 2006 03:44:00 -0000	1.43
+++ .cvsignore	22 Aug 2006 04:17:18 -0000	1.44
@@ -13,3 +13,4 @@
 gnome-games-2.15.4.tar.bz2
 gnome-games-2.15.5.tar.bz2
 gnome-games-2.15.6.tar.bz2
+gnome-games-2.15.92.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- gnome-games.spec	13 Aug 2006 03:44:00 -0000	1.87
+++ gnome-games.spec	22 Aug 2006 04:17:19 -0000	1.88
@@ -27,7 +27,7 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.15.6
+Version: 2.15.92
 Release: 1%{?dist}
 Epoch: 1
 License: LGPL
@@ -308,6 +308,9 @@
 
 
 %changelog
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.92-1.fc6
+- Update to 2.15.92
+
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.6-1.fc6
 - Update to 2.15.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	13 Aug 2006 03:44:00 -0000	1.46
+++ sources	22 Aug 2006 04:17:19 -0000	1.47
@@ -1,2 +1,2 @@
 01464739e83449288c6a58685604f86e  gnome-games-extra-data-2.14.0.tar.bz2
-358aab0ae7d4e92a21a1cd18eddb6523  gnome-games-2.15.6.tar.bz2
+bf065ef4085e304f9084db6e783bb353  gnome-games-2.15.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 04:20:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 00:20:43 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2582,
	1.2583 linux-2.6-utrace.patch, 1.20, 1.21
Message-ID: <200608220420.k7M4KhUQ006863@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6173

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
Typo fix



linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  454 ++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  863 +++++++++-------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/ia32_entry.S             |    2 
 arch/ia64/ia32/sys_ia32.c               |   23 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               | 1671 +++++++++++++++-----------------
 arch/ia64/kernel/signal.c               |    4 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  959 ++++++++++--------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  639 +++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            | 1222 ++++++++++++-----------
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  715 +++++++++----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  648 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |   14 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   49 
 include/asm-ia64/elf.h                  |   24 
 include/asm-ia64/tracehook.h            |   81 +
 include/asm-powerpc/tracehook.h         |   80 +
 include/asm-s390/tracehook.h            |   53 +
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |   54 +
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |  224 +++-
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  699 +++++++++++++
 include/linux/utrace.h                  |  481 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  253 +---
 kernel/fork.c                           |   62 -
 kernel/ptrace.c                         | 1560 +++++++++++++++++++++++------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    4 
 kernel/utrace.c                         | 1526 +++++++++++++++++++++++++++++
 security/selinux/hooks.c                |   54 -
 security/selinux/include/objsec.h       |    1 
 94 files changed, 9467 insertions(+), 4564 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-utrace.patch	22 Aug 2006 04:03:01 -0000	1.20
+++ linux-2.6-utrace.patch	22 Aug 2006 04:20:36 -0000	1.21
@@ -13901,7 +13901,7 @@
 +					    pt_all_user_regs_layout,
 +					    0, sizeof(struct pt_all_user_regs),
 +					    (void __user *) data, NULL,
-+					    request == PTRACE_SETREGS);
++					    *request == PTRACE_SETREGS);
 +	}
 +	return ret;
  }



From fedora-cvs-commits at redhat.com  Tue Aug 22 07:28:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 03:28:24 -0400
Subject: rpms/frysk/devel .cvsignore, 1.26, 1.27 frysk.spec, 1.85,
	1.86 sources, 1.26, 1.27
Message-ID: <200608220728.k7M7SOv1029429@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29354

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
- New upstream version.
- Add BuildRequires: gnome-python2-gconf, remove BuildRequires: ghostscript.
- Add `uname -a' to %check.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	16 Aug 2006 15:51:07 -0000	1.26
+++ .cvsignore	22 Aug 2006 07:28:22 -0000	1.27
@@ -1 +1 @@
-frysk-0.0.1.2006.08.16.rh1.tar.bz2
+frysk-0.0.1.2006.08.22.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- frysk.spec	16 Aug 2006 15:51:07 -0000	1.85
+++ frysk.spec	22 Aug 2006 07:28:22 -0000	1.86
@@ -1,12 +1,13 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.08.16.rh1
+Version:	0.0.1.2006.08.22.rh1
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
 
+# Disable the test which fails when building on older kernel.
 Patch:		frysk-xfail-2130.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -29,8 +30,8 @@
 BuildRequires:  xmlto
 BuildRequires:  sharutils
 BuildRequires:	transfig >= 3.2.0 
-BuildRequires:  ghostscript
 BuildRequires:  dogtail >= 0.5.2
+BuildRequires:	gnome-python2-gconf
 
 # FIXME:
 # Needed by dogtail-run-headless; should be Required by dogtail:
@@ -79,6 +80,7 @@
 make %{?_smp_mflags}
 
 %check
+uname -a
 make %{?_smp_mflags} -k check || :
 
 %install
@@ -110,6 +112,11 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Tue Aug 22 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.22.rh1-1
+- New upstream version.
+- Add BuildRequires: gnome-python2-gconf, remove BuildRequires: ghostscript.
+- Add `uname -a' to %%check.
+
 * Wed Aug 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.16.rh1-1
 - New upstream version.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	16 Aug 2006 15:51:07 -0000	1.26
+++ sources	22 Aug 2006 07:28:22 -0000	1.27
@@ -1 +1 @@
-99977243d4a8a2e3d659b3c48b29ec48  frysk-0.0.1.2006.08.16.rh1.tar.bz2
+52c506834fff266296f621b5f103c2a4  frysk-0.0.1.2006.08.22.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 08:22:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 04:22:33 -0400
Subject: rpms/fonts-chinese/FC-5 .cvsignore, 1.6, 1.7 fonts-chinese.spec,
	1.20, 1.21 sources, 1.5, 1.6
Message-ID: <200608220822.k7M8MXb4009942@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/fonts-chinese/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9743

Modified Files:
	.cvsignore fonts-chinese.spec sources 
Log Message:
font tarball with bug 197207 fixed



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Nov 2005 03:58:16 -0000	1.6
+++ .cvsignore	22 Aug 2006 08:22:30 -0000	1.7
@@ -11,3 +11,4 @@
 ttf-arphic-uming_0.1-0.dot.3.tar.gz
 ttf-arphic-ukai_0.1-0.dot.3.tar.gz
 taipeifonts-1.2.tar.gz
+ttf-arphic-uming_0.1-0.dot.3-20060822a.tar.gz


Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/FC-5/fonts-chinese.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fonts-chinese.spec	9 Dec 2005 22:40:27 -0000	1.20
+++ fonts-chinese.spec	22 Aug 2006 08:22:30 -0000	1.21
@@ -6,11 +6,12 @@
 %define beta 0.dot.3
 %define ver 0.1
 %define taipeiver 1.2
+%define umingpatch 20060822a
 
 Summary:    Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
 Name:		fonts-chinese
 Version:    3.02
-Release: 4.1
+Release:    5%{?dist}
 License:	Arphic Public License (GPL-like)
 Group:		User Interface/X
 BuildArch:	noarch
@@ -19,6 +20,7 @@
 Source:     http://apt.debian.org.tw/pool/t/ttf-arphic-uming/ttf-arphic-uming_%{ver}-%{beta}.tar.gz
 Source1:    http://apt.debian.org.tw/pool/t/ttf-arphic-ukai/ttf-arphic-ukai_%{ver}-%{beta}.tar.gz
 Source2:    taipeifonts-%{taipeiver}.tar.gz
+Source3:    ttf-arphic-uming_%{ver}-%{data}-%{umingpatch}.tar.gz
 Source9:    taipeifonts.alias
 Source10:	arphicpl.txt
 Source11:	arphicpl-big5.txt
@@ -38,7 +40,7 @@
 irefly. Read license files for details.
 
 %prep
-tar xzvf %{SOURCE0} 
+tar xzvf %{SOURCE3} 
 tar xzvf %{SOURCE1}
 tar xzvf %{SOURCE2}
 
@@ -137,6 +139,9 @@
 %{cidmapdir}/cidfmap.zh_CN
 
 %changelog
+* Tue Aug 22 2006 Caius Chance <cchance at redhat.com> - 3.02-5
+- fixed bug 197556 ??? scim hangs when entering two pinyin words
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Nov 2005 03:58:16 -0000	1.5
+++ sources	22 Aug 2006 08:22:30 -0000	1.6
@@ -7,3 +7,4 @@
 aff293398158998689a2d24816cc782e  ttf-arphic-uming_0.1-0.dot.3.tar.gz
 f294d9e35de34ff80156e11e00f33c38  ttf-arphic-ukai_0.1-0.dot.3.tar.gz
 9e4acdd5a218dea6aaa28bc80d472aad  taipeifonts-1.2.tar.gz
+4d9c2e6007564b7975921d648c45a657  ttf-arphic-uming_0.1-0.dot.3-20060822a.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 22 09:27:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 05:27:32 -0400
Subject: rpms/glibc/devel .cvsignore, 1.166, 1.167 glibc-fedora.patch, 1.172,
	1.173 glibc.spec, 1.258, 1.259 sources, 1.190, 1.191
Message-ID: <200608220927.k7M9RWOA031394@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31369/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4.90-23 on branch devel from glibc-2.4.90-23.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- .cvsignore	15 Aug 2006 21:03:13 -0000	1.166
+++ .cvsignore	22 Aug 2006 09:27:29 -0000	1.167
@@ -1,2 +1,2 @@
-glibc-20060815T2033.tar.bz2
-glibc-fedora-20060815T2033.tar.bz2
+glibc-20060822T0706.tar.bz2
+glibc-fedora-20060822T0706.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 57 files changed, 1394 insertions(+), 631 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- glibc-fedora.patch	15 Aug 2006 21:03:13 -0000	1.172
+++ glibc-fedora.patch	22 Aug 2006 09:27:29 -0000	1.173
@@ -1,5 +1,5 @@
---- glibc-20060815T2033/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060815T2033-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060822T0706/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060822T0706-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060815T2033/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060815T2033-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060822T0706/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060822T0706-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060815T2033/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060815T2033-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060822T0706/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060822T0706-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060815T2033/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060815T2033-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060822T0706/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060822T0706-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060815T2033/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060815T2033-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060822T0706/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060822T0706-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060815T2033/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060815T2033-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060822T0706/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060822T0706-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060815T2033/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060815T2033-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060822T0706/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060822T0706-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060815T2033/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060815T2033-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060822T0706/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060822T0706-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060815T2033/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060815T2033-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060822T0706/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060822T0706-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060815T2033/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060815T2033-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060822T0706/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060822T0706-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060815T2033/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T2033-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060822T0706/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060822T0706-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-20060815T2033/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T2033-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060822T0706/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060822T0706-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-20060815T2033/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060815T2033-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060822T0706/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060822T0706-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060815T2033/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060815T2033-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060822T0706/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060822T0706-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060815T2033/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060815T2033-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060822T0706/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060822T0706-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060815T2033/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060815T2033-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060822T0706/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060822T0706-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060815T2033/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060815T2033-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060822T0706/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060822T0706-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060815T2033/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060815T2033-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060822T0706/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060822T0706-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060815T2033/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
-+++ glibc-20060815T2033-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
+--- glibc-20060822T0706/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
++++ glibc-20060822T0706-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
 @@ -77,6 +77,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060815T2033/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060815T2033-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060822T0706/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060822T0706-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060815T2033/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
-+++ glibc-20060815T2033-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
+--- glibc-20060822T0706/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
++++ glibc-20060822T0706-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,71 +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-20060815T2033/localedata/locales/ml_IN	13 Aug 2006 05:51:50 -0000	1.8
-+++ glibc-20060815T2033-fedora/localedata/locales/ml_IN	20 Oct 2005 06:59:51 -0000	1.3.2.2
-@@ -90,10 +90,10 @@ abday     "<U0D1E><U0D3E>";"<U0D24><U0D3
- "<U0D36>"
- %
- % Full weekday names (%A)
--day     "<U0D1E><U0D3E><U0D2F><U0D30><U0D4D><U200D>";/
--"<U0D24><U0D3F><U0D19><U0D4D><U0D15><U0D33><U0D4D><U200D>";/
-+day     "<U0D1E><U0D3E><U0D2F><U0D31><U0D41><U0D4D>";/
-+"<U0D24><U0D3F><U0D19><U0D4D><U0D15><U0D33><U0D41><U0D4D>";/
- "<U0D1A><U0D4A><U0D35><U0D4D><U0D35>";/
--"<U0D2C><U0D41><U0D27><U0D28><U0D4D><U200D>";/
-+"<U0D2C><U0D41><U0D27><U0D28><U0D41><U0D4D>";/
- "<U0D35><U0D4D><U0D2F><U0D3E><U0D34><U0D02>";/
- "<U0D35><U0D46><U0D33><U0D4D><U0D33><U0D3F>";/
- "<U0D36><U0D28><U0D3F>"
-@@ -101,30 +101,30 @@ day     "<U0D1E><U0D3E><U0D2F><U0D30><U0
- % Abbreviated month names (%b)
- abmon     "<U0D1C><U0D28><U0D41>";/
- "<U0D2B><U0D46><U0D2C><U0D4D>";/
--"<U0D2E><U0D3E><U0D30><U0D4D><U200D>";/
--"<U0D0F><U0D2A><U0D4D><U0D30>";/
--"<U0D2E><U0D46>";/
--"<U0D1C><U0D42><U0D7B><U0D23><U0D4D><U200D>";/
--"<U0D1C><U0D42><U0D32><U0D48>";/
--"<U0D06><U0D17><U0D4D>";/
--"<U0D38><U0D46><U0D2A><U0D4D>";/
--"<U0D12><U0D15><U0D4D><U0D1F><U0D4B>";/
-+"<U0D2E><U0D3E><U0D31><U0D4D>";/
-+"<U0D0F><U0D2A><U0D4D><U0D31><U0D3F><U0D32><U0D4D>";/
-+"<U0D46><U0D2E><U0D2F><U0D4D>";/
-+"<U0D1C><U0D42><U0D23><U0D4D>";/
-+"<U0D1C><U0D42><U0D48><U0D32>";/
-+"<U0D06><U0D17>";/
-+"<U0D46><U0D38><U0D2A><U0D4D><U0D24><U0D02>";/
-+"<U0D12><U0D15><U0D4D><U0D48><U0D1F>";/
- "<U0D28><U0D35><U0D02>";/
- "<U0D21><U0D3F><U0D38><U0D02>"
- %
- % FULL month names (%B)
- mon     "<U0D1C><U0D28><U0D41><U0D35><U0D30><U0D3F>";/
- "<U0D2B><U0D46><U0D2C><U0D4D><U0D30><U0D41><U0D35><U0D30><U0D3F>";/
--"<U0D2E><U0D3E><U0D30><U0D4D><U200D><U0D1A><U0D4D><U0D1A><U0D4D>";/
--"<U0D0F><U0D2A><U0D4D><U0D30><U0D3F><U0D32><U0D4D><U200D><U0020>";/
-+"<U0D2E><U0D3E><U0D31><U0D41><U0D4D><U0D1A><U0D4D><U0D1A><U0D4D>";/
-+"<U0D0F><U0D2A><U0D4D><U0D31><U0D3F><U0D32><U0D41><U0D4D>";/
- "<U0D2E><U0D46><U0D2F><U0D4D>";/
--"<U0D1C><U0D42><U0D23><U0D4D><U200D>";/
-+"<U0D1C><U0D42><U0D23><U0D41><U0D4D>";/
- "<U0D1C><U0D42><U0D32><U0D48>";/
--"<U0D06><U0D17><U0D38><U0D4D><U0D31><U0D4D><U0D31><U0D4D>";/
--"<U0D38><U0D46><U0D2A><U0D4D><U0D31><U0D4D><U0D31><U0D02><U0D2C><U0D30><U0D4D><U200D>";/
--"<U0D12><U0D15><U0D4D><U0D1F><U0D4B><U0D2C><U0D30><U0D4D><U200D>";/
--"<U0D28><U0D35><U0D02><U0D2C><U0D30><U0D4D><U200D>";/
--"<U0D21><U0D3F><U0D38><U0D02><U0D2C><U0D30><U0D4D><U200D>"
-+"<U0D06><U0D17><U0D38><U0D4D><U0D24><U0D4D>";/
-+"<U0D38><U0D46><U0D2A><U0D4D><U0D24><U0D02><U0D2C><U0D31><U0D41><U0D4D>";/
-+"<U0D12><U0D15><U0D4D><U0D1F><U0D4B><U0D2C><U0D31><U0D41><U0D4D>";/
-+"<U0D28><U0D35><U0D02><U0D2C><U0D31><U0D41><U0D4D>";/
-+"<U0D21><U0D3F><U0D38><U0D02><U0D2C><U0D31><U0D41><U0D4D>"
- %
- %
- % Equivalent of AM PM
---- glibc-20060815T2033/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T2033-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060822T0706/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060822T0706-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -1013,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060815T2033/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060815T2033-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060822T0706/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060822T0706-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -1042,8 +979,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060815T2033/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060815T2033-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060822T0706/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060822T0706-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>
@@ -1119,8 +1056,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060815T2033/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060815T2033-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060822T0706/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060822T0706-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)
@@ -1176,17 +1113,17 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060815T2033/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060815T2033-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060822T0706/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060822T0706-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060815T2033/nptl/ChangeLog	15 Aug 2006 13:41:04 -0000	1.909
-+++ glibc-20060815T2033-fedora/nptl/ChangeLog	15 Aug 2006 20:43:51 -0000	1.706.2.97
-@@ -1018,6 +1018,15 @@
+--- glibc-20060822T0706/nptl/ChangeLog	21 Aug 2006 21:05:47 -0000	1.911
++++ glibc-20060822T0706-fedora/nptl/ChangeLog	22 Aug 2006 09:05:40 -0000	1.706.2.98
+@@ -1028,6 +1028,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1202,7 +1139,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1754,6 +1763,11 @@
+@@ -1764,6 +1773,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1214,7 +1151,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3828,6 +3842,11 @@
+@@ -3838,6 +3852,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1226,8 +1163,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060815T2033/nptl/Makefile	15 Aug 2006 06:53:01 -0000	1.185
-+++ glibc-20060815T2033-fedora/nptl/Makefile	15 Aug 2006 20:43:52 -0000	1.157.2.25
+--- glibc-20060822T0706/nptl/Makefile	21 Aug 2006 21:02:10 -0000	1.186
++++ glibc-20060822T0706-fedora/nptl/Makefile	22 Aug 2006 09:05:40 -0000	1.157.2.26
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1250,8 +1187,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060815T2033/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060815T2033-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060822T0706/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060822T0706-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;
@@ -1276,8 +1213,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T2033-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060822T0706-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>
 +
@@ -1285,8 +1222,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
-+++ glibc-20060815T2033-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
+--- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
++++ glibc-20060822T0706-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
 @@ -68,6 +68,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1622,8 +1559,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060815T2033-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060822T0706-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.
@@ -1769,8 +1706,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060815T2033-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060822T0706-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
@@ -1871,8 +1808,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060815T2033-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060822T0706-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.
@@ -2014,8 +1951,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
-+++ glibc-20060815T2033-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
+--- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
++++ glibc-20060822T0706-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
 @@ -49,6 +49,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2403,8 +2340,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060815T2033/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060815T2033-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060822T0706-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
@@ -2499,8 +2436,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060815T2033/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060815T2033-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060822T0706/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060822T0706-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2523,8 +2460,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060815T2033/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060815T2033-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060822T0706/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060822T0706-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2543,8 +2480,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060815T2033/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060815T2033-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060822T0706/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060822T0706-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
@@ -2556,8 +2493,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060815T2033/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060815T2033-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060822T0706/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060822T0706-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
@@ -2598,8 +2535,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060815T2033/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
-+++ glibc-20060815T2033-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
+--- glibc-20060822T0706/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
++++ glibc-20060822T0706-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2633,8 +2570,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060815T2033/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T2033-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060822T0706/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060822T0706-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 =
@@ -2651,8 +2588,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060815T2033/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060815T2033-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060822T0706/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060822T0706-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
@@ -2668,8 +2605,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060815T2033/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060815T2033-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060822T0706/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060822T0706-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2683,8 +2620,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060815T2033/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060815T2033-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060822T0706/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060822T0706-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))
@@ -2696,8 +2633,8 @@
  endif
  endif
  
---- glibc-20060815T2033/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060815T2033-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060822T0706/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060822T0706-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.  */
@@ -3049,8 +2986,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060815T2033/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T2033-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060822T0706/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060822T0706-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.
@@ -3136,8 +3073,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060815T2033/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20060815T2033-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20060822T0706/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20060822T0706-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3152,8 +3089,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20060815T2033/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
-+++ glibc-20060815T2033-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+--- glibc-20060822T0706/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20060822T0706-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
 @@ -18,11 +18,14 @@
     02111-1307 USA.  */
  
@@ -3201,8 +3138,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060815T2033/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060815T2033-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060822T0706/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060822T0706-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;
@@ -3245,8 +3182,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060815T2033/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060815T2033-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060822T0706/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060822T0706-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"
@@ -3256,8 +3193,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060815T2033/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060815T2033-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060822T0706/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060822T0706-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;
@@ -3303,8 +3240,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060815T2033/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T2033-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060822T0706/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060822T0706-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.
@@ -3365,8 +3302,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060815T2033/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060815T2033-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060822T0706/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060822T0706-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)
@@ -3399,24 +3336,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060815T2033/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T2033-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060822T0706/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060822T0706-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-20060815T2033/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060815T2033-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060822T0706/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060822T0706-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-20060815T2033/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060815T2033-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060822T0706/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060822T0706-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.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- glibc.spec	18 Aug 2006 09:50:20 -0000	1.258
+++ glibc.spec	22 Aug 2006 09:27:29 -0000	1.259
@@ -1,9 +1,9 @@
-%define glibcdate 20060815T2033
+%define glibcdate 20060822T0706
 %define glibcname glibc
-%define glibcsrcdir glibc-20060815T2033
+%define glibcsrcdir glibc-20060822T0706
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 22
+%define glibcrelease 23
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1453,6 +1453,12 @@
 %endif
 
 %changelog
+* Tue Aug 22 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-23
+- malloc fixes, especially for 32-bit arches (#202309)
+- further *_IN locale fixes (#200230)
+- fix get{serv,rpc}ent{,_r} if NIS map is empty (#203237)
+- fix /usr/bin/iconv (#203400)
+
 * Fri Aug 18 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-22
 - rebuilt with latest binutils to pick up 64K -z commonpagesize
   on ppc/ppc64 (#203001)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- sources	15 Aug 2006 21:03:14 -0000	1.190
+++ sources	22 Aug 2006 09:27:29 -0000	1.191
@@ -1,2 +1,2 @@
-b8442d6999a506e200b6236788365811  glibc-20060815T2033.tar.bz2
-ad4ce00bad0bd6dec3e3efa7f83313be  glibc-fedora-20060815T2033.tar.bz2
+219b28bcd42213eb4e7dbe9fbcb51ef9  glibc-20060822T0706.tar.bz2
+029df895f3b69dbc6a0a9d254195f589  glibc-fedora-20060822T0706.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 09:54:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 05:54:14 -0400
Subject: rpms/vsftpd/devel vsftpd-2.0.5-correct_comments.patch,NONE,1.1
Message-ID: <200608220954.k7M9sEGL029605@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29571

Added Files:
	vsftpd-2.0.5-correct_comments.patch 
Log Message:
comment patch update

vsftpd-2.0.5-correct_comments.patch:
 vsftpd.conf |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

--- NEW FILE vsftpd-2.0.5-correct_comments.patch ---
--- vsftpd-2.0.5/vsftpd.conf.old	2006-08-22 09:53:09.000000000 +0200
+++ vsftpd-2.0.5/vsftpd.conf	2006-08-22 10:04:55.000000000 +0200
@@ -100,14 +100,17 @@
 # sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
 # the presence of the "-R" option, so there is a strong case for enabling it.
 #ls_recurse_enable=YES
-
-pam_service_name=vsftpd
-userlist_enable=YES
-# When enabled, vsftpd runs in standalone mode, but listen only to IPv6 sockets. 
-# This directive cannot be used in conjunction with the listen directive.
-# Make sure, that one of listen options are commited
-# enable for standalone mode
+#
+# When "listen" directive is enabled, vsftpd runs in standalone mode and 
+# listens on IPv4 sockets. This directive cannot be used in conjunction 
+# with the listen_ipv6 directive.
 listen=YES
+#
+# This directive enables listening on IPv6 sockets. To listen on IPv4 and IPv6
+# sockets, you must run two copies of vsftpd whith two configuration files.
+# Make sure, that one of the listen options is commented !!
 #listen_ipv6=YES
 
+pam_service_name=vsftpd
+userlist_enable=YES
 tcp_wrappers=YES



From fedora-cvs-commits at redhat.com  Tue Aug 22 09:55:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 05:55:49 -0400
Subject: rpms/beagle/devel beagle-0.2.8-cvs.patch, NONE, 1.1 beagle.spec,
	1.70, 1.71
Message-ID: <200608220955.k7M9tnZU030249@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30190

Modified Files:
	beagle.spec 
Added Files:
	beagle-0.2.8-cvs.patch 
Log Message:
* Tue Aug 22 2006 Alexander Larsson <alexl at redhat.com> - 0.2.8-2
- Backport cvs indexing performance fix



beagle-0.2.8-cvs.patch:
 Filters/FilterMail.cs                   |    8 ++++---
 beagled/BeagleDaemon.cs                 |    2 -
 beagled/IndexHelper/IndexHelper.cs      |    2 -
 beagled/Lucene.Net/Store/FSDirectory.cs |   36 +++++++++++++++++++++++++++++---
 tools/Query.cs                          |    2 -
 5 files changed, 41 insertions(+), 9 deletions(-)

--- NEW FILE beagle-0.2.8-cvs.patch ---
Index: Filters/FilterMail.cs
===================================================================
RCS file: /cvs/gnome/beagle/Filters/FilterMail.cs,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- Filters/FilterMail.cs	25 Apr 2006 22:56:04 -0000	1.18
+++ Filters/FilterMail.cs	21 Aug 2006 19:38:40 -0000	1.19
@@ -191,10 +191,12 @@ namespace Beagle.Filters {
 
 			string l = handler.Reader.ReadLine ();
 
-			if (l != null)
-				AppendText (l);
-			else
+			if (l == null)
 				Finished ();
+			else if (l.Length > 0) {
+				AppendText (l);
+				AppendStructuralBreak ();
+			}
 		}
 
 		protected override void DoClose ()
Index: beagled/BeagleDaemon.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/BeagleDaemon.cs,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- beagled/BeagleDaemon.cs	10 Aug 2006 19:05:57 -0000	1.123
+++ beagled/BeagleDaemon.cs	21 Aug 2006 15:05:28 -0000	1.124
@@ -236,7 +236,7 @@ namespace Beagle.Daemon {
 			}
 		}
 
-		[DllImport("libgobject-2.0.so")]
+		[DllImport("libgobject-2.0.so.0")]
 		static extern void g_type_init ();
 
 		public static void DoMain (string[] args)
Index: beagled/IndexHelper/IndexHelper.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/IndexHelper/IndexHelper.cs,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- beagled/IndexHelper/IndexHelper.cs	10 Aug 2006 19:06:03 -0000	1.33
+++ beagled/IndexHelper/IndexHelper.cs	21 Aug 2006 15:05:30 -0000	1.34
@@ -60,7 +60,7 @@ namespace Beagle.IndexHelper {
 			}
 		}
 
-		[DllImport("libgobject-2.0.so")]
+		[DllImport("libgobject-2.0.so.0")]
 		static extern void g_type_init ();
 
 		private static void DoMain (string [] args)
Index: beagled/Lucene.Net/Store/FSDirectory.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/Lucene.Net/Store/FSDirectory.cs,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- beagled/Lucene.Net/Store/FSDirectory.cs	31 May 2006 18:44:08 -0000	1.18
+++ beagled/Lucene.Net/Store/FSDirectory.cs	18 Aug 2006 22:03:24 -0000	1.19
@@ -88,9 +88,39 @@ namespace Lucene.Net.Store
 					    Mono.Unix.Native.Stdlib.GetLastError ()
 				    ));
 
-		    System.IO.StreamWriter w = new System.IO.StreamWriter (new Mono.Unix.UnixStream (fd, false));
-		    w.WriteLine (System.Diagnostics.Process.GetCurrentProcess ().Id);
-		    w.Close ();
+		    // This code replaces the commented-out code below because
+		    // it ends up being much faster.  The reason for this is
+		    // that closing a UnixStream causes Syscall.fsync() to be
+		    // called, and that apparently is extremely slow!
+		    //
+		    // Time(ms) Count   P/call(ms) Method name
+		    // 1563.926      68   22.999   Mono.Unix.Native.Syscall::fsync(int)
+		    //
+		    // Since the lock file is written out very often, this time
+		    // adds up and noticably slows down indexing.
+		    IntPtr ptr = IntPtr.Zero;
+		    long ret;
+
+		    try {
+			    string s = System.Diagnostics.Process.GetCurrentProcess ().Id.ToString () + "\n";
+			    ptr = Mono.Unix.UnixMarshal.StringToHeap (s);
+
+			    do {
+				    ret = Mono.Unix.Native.Syscall.write (fd, ptr, (ulong) s.Length);
+			    } while (Mono.Unix.UnixMarshal.ShouldRetrySyscall ((int) ret));
+			    Mono.Unix.UnixMarshal.ThrowExceptionForLastErrorIf ((int) ret);
+		    } finally {
+			    Mono.Unix.UnixMarshal.FreeHeap (ptr);
+
+			    do {
+				    ret = Mono.Unix.Native.Syscall.close (fd);
+			    } while (Mono.Unix.UnixMarshal.ShouldRetrySyscall ((int) ret));
+			    Mono.Unix.UnixMarshal.ThrowExceptionForLastErrorIf ((int) ret);
+		    }
+
+		    //System.IO.StreamWriter w = new System.IO.StreamWriter (new Mono.Unix.UnixStream (fd, true));
+		    //w.WriteLine (System.Diagnostics.Process.GetCurrentProcess ().Id);
+		    //w.Close ();
 
 		    Log ("Obtained lock " + lockFile.FullName);
                     return true;
Index: tools/Query.cs
===================================================================
RCS file: /cvs/gnome/beagle/tools/Query.cs,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- tools/Query.cs	5 Aug 2006 07:29:53 -0000	1.63
+++ tools/Query.cs	21 Aug 2006 15:05:30 -0000	1.64
@@ -233,7 +233,7 @@ class QueryTool {
 		}
 	}
 	
-	[DllImport("libgobject-2.0.so")]
+	[DllImport("libgobject-2.0.so.0")]
 	static extern void g_type_init ();
 
 	public static void Main (string[] args) 


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- beagle.spec	18 Aug 2006 15:24:26 -0000	1.70
+++ beagle.spec	22 Aug 2006 09:55:46 -0000	1.71
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.8
-Release:       	1%{?dist}
+Release:       	2%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -40,6 +40,8 @@
 Patch5: beagle-0.2.7-runuser.patch
 Patch6: beagle-0.2.8-libdir.patch
 Patch7: beagle-0.2.7-key.patch
+# From upstream cvs, fixes indexing performance
+Patch8: beagle-0.2.8-cvs.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
@@ -97,6 +99,7 @@
 %patch5 -p1 -b .runuser
 %patch6 -p1 -b .libdir
 %patch7 -p1 -b .key
+%patch8 -p0 -b .cvs
 
 %build
 autoconf
@@ -290,6 +293,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Tue Aug 22 2006 Alexander Larsson <alexl at redhat.com> - 0.2.8-2
+- Backport cvs indexing performance fix
+
 * Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.2.8-1
 - Update to 0.2.8
 - Rebuild with new mono and gtk-sharp2



From fedora-cvs-commits at redhat.com  Tue Aug 22 10:17:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 06:17:42 -0400
Subject: rpms/vsftpd/devel vsftpd-2.0.5-man.patch, NONE, 1.1 vsftpd.spec,
	1.49, 1.50
Message-ID: <200608221017.k7MAHgoM013097@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12680

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.0.5-man.patch 
Log Message:
correct man pages

vsftpd-2.0.5-man.patch:
 vsftpd.conf.5 |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE vsftpd-2.0.5-man.patch ---
--- vsftpd-2.0.5/vsftpd.conf.5.old	2006-08-22 10:53:57.000000000 +0200
+++ vsftpd-2.0.5/vsftpd.conf.5	2006-08-22 10:57:24.000000000 +0200
@@ -138,7 +138,7 @@
 different if chroot_local_user is set to YES. In this case, the list becomes
 a list of users which are NOT to be placed in a chroot() jail.
 By default, the file containing this list is
-/etc/vsftpd.chroot_list, but you may override this with the
+/etc/vsftpd/chroot_list, but you may override this with the
 .BR chroot_list_file
 setting.
 
@@ -166,7 +166,7 @@
 .B deny_email_enable
 If activated, you may provide a list of anonymous password e-mail responses
 which cause login to be denied. By default, the file containing this list is
-/etc/vsftpd.banned_emails, but you may override this with the
+/etc/vsftpd/banned_emails, but you may override this with the
 .BR banned_email_file
 setting.
 
@@ -396,7 +396,7 @@
 file specified by the
 .BR email_password_file
 setting. The file format is one password per line, no extra whitespace. The
-default filename is /etc/vsftpd.email_passwords.
+default filename is /etc/vsftpd/email_passwords.
 
 Default: NO
 .TP
@@ -691,7 +691,7 @@
 .BR deny_email_enable
 is enabled.
 
-Default: /etc/vsftpd.banned_emails
+Default: /etc/vsftpd/banned_emails
 .TP
 .B banner_file
 This option is the name of a file containing text to display when someone
@@ -720,7 +720,7 @@
 is enabled, then the list file becomes a list of users to NOT place in a
 chroot() jail.
 
-Default: /etc/vsftpd.chroot_list
+Default: /etc/vsftpd/chroot_list
 .TP
 .B cmds_allowed
 This options specifies a comma separated list of allowed FTP commands (post
@@ -772,7 +772,7 @@
 .BR secure_email_list_enable
 setting.
 
-Default: /etc/vsftpd.email_passwords
+Default: /etc/vsftpd/email_passwords
 .TP
 .B ftp_username
 This is the name of the user we use for handling anonymous FTP. The home
@@ -934,7 +934,7 @@
 .BR userlist_enable
 option is active.
 
-Default: /etc/vsftpd.user_list
+Default: /etc/vsftpd/user_list
 .TP
 .B vsftpd_log_file
 This option is the name of the file to which we write the vsftpd style


Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- vsftpd.spec	15 Aug 2006 09:45:41 -0000	1.49
+++ vsftpd.spec	22 Aug 2006 10:17:39 -0000	1.50
@@ -34,6 +34,7 @@
 Patch19: vsftpd-2.0.5-default_ipv6.patch
 Patch20: vsftpd-2.0.5-add_ipv6_option.patch
 Patch21: vsftpd-2.0.5-correct_comments.patch
+Patch22: vsftpd-2.0.5-man.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -79,9 +80,10 @@
 %patch16 -p1 -b .user_config
 %patch17 -p1 -b .old-pam
 %patch18 -p1 -b .close-fds
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
+%patch19 -p1 -b .ipv6
+%patch20 -p1 -b .ipv6opt
+%patch21 -p1 -b .comments
+%patch22 -p1 -b .manp
 
 %build
 %ifarch s390x
@@ -140,6 +142,9 @@
 /var/ftp
 
 %changelog
+* Tue Aug 22 2006 Maros Barabas <mbarabas at redhat.com> - 2.0.5-7
+- correct paths of configuration files on man pages
+
 * Tue Aug 15 2006 Maros Barabas	<mbarabas at redhat.com> - 2.0.5-6
 - correct comments
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 10:18:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 06:18:50 -0400
Subject: rpms/vsftpd/devel vsftpd.spec,1.50,1.51
Message-ID: <200608221018.k7MAIocn018974@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18882

Modified Files:
	vsftpd.spec 
Log Message:



Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- vsftpd.spec	22 Aug 2006 10:17:39 -0000	1.50
+++ vsftpd.spec	22 Aug 2006 10:18:47 -0000	1.51
@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.5
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/



From fedora-cvs-commits at redhat.com  Tue Aug 22 10:58:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 06:58:38 -0400
Subject: rpms/net-snmp/devel net-snmp.spec,1.83,1.84
Message-ID: <200608221058.k7MAwcVt012913@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/net-snmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12874

Modified Files:
	net-snmp.spec 
Log Message:
 - turn off SMUX support (#110931) - the SMUX protocol has


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- net-snmp.spec	10 Aug 2006 14:14:03 -0000	1.83
+++ net-snmp.spec	22 Aug 2006 10:58:36 -0000	1.84
@@ -7,7 +7,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: %{major_ver}.0
-Release: 3
+Release: 4%{?dist}
 
 License: BSDish
 Group: System Environment/Daemons
@@ -161,9 +161,9 @@
 	--with-logfile="/var/log/snmpd.log"		\
 	--with-persistent-directory="/var/net-snmp"	\
 %ifarch %{ix86} x86_64
-	--with-mib-modules="host agentx smux ucd-snmp/lmSensors ucd-snmp/diskio disman/event-mib tcp-mib udp-mib" \
+	--with-mib-modules="host agentx ucd-snmp/lmSensors ucd-snmp/diskio disman/event-mib tcp-mib udp-mib" \
 %else
-	--with-mib-modules="host agentx smux "	\
+	--with-mib-modules="host agentx "	\
 %endif
 %if %{tcp_wrappers}
 	--with-libwrap=%{_libdir}			\
@@ -346,6 +346,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Aug 22 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.0-4
+- turn off SMUX support (#110931)
+- add dist tag
+
 * Thu Aug 10 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.0-3
 - fix lib dirs in configure (#197684)
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 11:01:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 07:01:35 -0400
Subject: rpms/bind/devel bind-chroot-admin.in, 1.10, 1.11 bind.spec, 1.123,
	1.124
Message-ID: <200608221101.k7MB1ZWe013752@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13674

Modified Files:
	bind-chroot-admin.in bind.spec 
Log Message:
added fix for #203522 - bind-chroot-admin -e command fails


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bind-chroot-admin.in	21 Jul 2006 20:36:45 -0000	1.10
+++ bind-chroot-admin.in	22 Aug 2006 11:01:33 -0000	1.11
@@ -85,6 +85,7 @@
         
     mkdir -p ${BIND_CHROOT_PREFIX}/{etc,dev,var/{run/named,named/{slaves,data}}};
     /bin/chown root:named ${BIND_CHROOT_PREFIX}/{etc,dev,var/{run,named/}};
+    /bin/chown root:named ${BIND_CHROOT_PREFIX}/var;
     /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}};        


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- bind.spec	21 Aug 2006 10:14:57 -0000	1.123
+++ bind.spec	22 Aug 2006 11:01:33 -0000	1.124
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	38%{?dist}
+Release: 	39%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -852,6 +852,9 @@
 :;
 
 %changelog
+* Mon Aug 22 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.2-39
+- added fix for #203522 - "bind-chroot-admin -e" command fails
+
 * Mon Aug 21 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.2-38
 - fix for #203194 - tmpfile usage
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 11:03:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 07:03:16 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch,
	NONE, 1.1 openoffice.org.spec, 1.854, 1.855
Message-ID: <200608221103.k7MB3Gf4013984@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13941

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch 
Log Message:
add openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch

openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch:
 framework/source/uielement/menubarmanager.cxx |   12 ++++++++++++
 source/uielement/menubarmanager.cxx           |    0 
 2 files changed, 12 insertions(+)

--- NEW FILE openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch ---
Index: source/uielement/menubarmanager.cxx
===================================================================
RCS file: /cvs/framework/framework/source/uielement/menubarmanager.cxx,v
retrieving revision 1.39
diff -u -r1.39 menubarmanager.cxx
--- openoffice.org.orig/framework/source/uielement/menubarmanager.cxx	4 Aug 2006 11:08:22 -0000	1.39
+++ openoffice.org/framework/source/uielement/menubarmanager.cxx	22 Aug 2006 10:54:02 -0000
@@ -1249,6 +1249,9 @@
                                 // Force update of popup menu
                                 pMenuItemHandler->xPopupMenuController->updatePopupMenu();
                                 bPopupMenu = sal_True;
+								if (PopupMenu*  pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
+									pMenu->EnableItem( pMenuItemHandler->nItemId, pThisPopup->GetItemCount() ? true : false );
+
                             }
 
                             if ( xMenuItemDispatch.is() )
@@ -1271,6 +1274,9 @@
                     {
                         // Force update of popup menu
                         pMenuItemHandler->xPopupMenuController->updatePopupMenu();
+						if (PopupMenu*  pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
+							pMenu->EnableItem( pMenuItemHandler->nItemId, pThisPopup->GetItemCount() ? true : false );
+
                     }
                     else if ( pMenuItemHandler->xMenuItemDispatch.is() )
                     {
@@ -1659,6 +1665,9 @@
                     if ( CreatePopupMenuController( pItemHandler ))
                         pItemHandler->xPopupMenuController->updatePopupMenu();
                 }
+
+				if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
+					pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
             }
             else if (( aItemCommand.getLength() > nAddonsURLPrefixLength ) &&
 				     ( aItemCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 ))
@@ -1806,6 +1815,9 @@
                     if ( CreatePopupMenuController( pItemHandler ))
                         pItemHandler->xPopupMenuController->updatePopupMenu();
                 }
+
+				if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
+					pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
             }
 
 			m_aMenuItemHandlerVector.push_back( pItemHandler );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.854
retrieving revision 1.855
diff -u -r1.854 -r1.855
--- openoffice.org.spec	21 Aug 2006 10:47:03 -0000	1.854
+++ openoffice.org.spec	22 Aug 2006 11:03:13 -0000	1.855
@@ -122,6 +122,7 @@
 Patch54: openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 Patch55: openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
 Patch56: openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch
+Patch57: openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -978,6 +979,7 @@
 %patch54 -p1 -b .ooo68369.dtrans.crash.patch
 %patch55 -p1 -b .ooo68805.sw.ww8size.patch
 %patch56 -p1 -b .ooo68822.sw.recursiveim.patch
+%patch57 -p1 -b .ooo68851.framework.disablemenuifempty.patch
 
 tar xzf %{SOURCE1}
 
@@ -2501,11 +2503,13 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Aug 21 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.3
+* Tue Aug 22 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.3
 - fix openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 - fix openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
 - fix openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch
+- fix potential out of bounds in xmlhelp
 - drop openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch, fixed in gnome now
+- rh#203497# -> openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
 
 * Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.1
 - rh#201447# -> openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch



From fedora-cvs-commits at redhat.com  Tue Aug 22 11:22:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 07:22:15 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch,
	NONE, 1.1 openoffice.org.spec, 1.855, 1.856
Message-ID: <200608221122.k7MBMFkK002077@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2016

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch 
Log Message:
rh#203439# add openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch

openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch:
 unx/gtk/a11y/atkutil.cxx     |    0 
 vcl/unx/gtk/a11y/atkutil.cxx |    5 +++++
 2 files changed, 5 insertions(+)

--- NEW FILE openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch ---
Index: unx/gtk/a11y/atkutil.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/a11y/atkutil.cxx,v
retrieving revision 1.3
diff -u -r1.3 atkutil.cxx
--- openoffice.org.orig/vcl/unx/gtk/a11y/atkutil.cxx	11 May 2006 13:31:55 -0000	1.3
+++ openoffice.org/vcl/unx/gtk/a11y/atkutil.cxx	22 Aug 2006 11:16:26 -0000
@@ -552,6 +552,7 @@
 
 long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
 {
+    try {
     switch (pEvent->GetId())
     {
     case VCLEVENT_WINDOW_SHOW:
@@ -611,6 +612,10 @@
     default:
         //fprintf(stderr, "got event %d \n", pEvent->GetId());
         break;
+    }
+    } catch(lang::IndexOutOfBoundsException e)
+    {
+	g_warning("Focused object has invalid index in parent");
     }
     return 0;
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.855
retrieving revision 1.856
diff -u -r1.855 -r1.856
--- openoffice.org.spec	22 Aug 2006 11:03:13 -0000	1.855
+++ openoffice.org.spec	22 Aug 2006 11:22:13 -0000	1.856
@@ -123,6 +123,7 @@
 Patch55: openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
 Patch56: openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch
 Patch57: openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
+Patch58: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -980,6 +981,7 @@
 %patch55 -p1 -b .ooo68805.sw.ww8size.patch
 %patch56 -p1 -b .ooo68822.sw.recursiveim.patch
 %patch57 -p1 -b .ooo68851.framework.disablemenuifempty.patch
+%patch58 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
 
 tar xzf %{SOURCE1}
 
@@ -2510,6 +2512,7 @@
 - fix potential out of bounds in xmlhelp
 - drop openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch, fixed in gnome now
 - rh#203497# -> openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
+- rh#203439# -> openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
 
 * Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.1
 - rh#201447# -> openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch



From fedora-cvs-commits at redhat.com  Tue Aug 22 12:28:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 08:28:53 -0400
Subject: rpms/ltrace/devel 1152117672-exec-patch, NONE,
	1.1 1153220107-fork-patch, NONE, 1.1 ltrace.spec, 1.43, 1.44
Message-ID: <200608221228.k7MCSrN5023474@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23461

Modified Files:
	ltrace.spec 
Added Files:
	1152117672-exec-patch 1153220107-fork-patch 
Log Message:
- adding fork and exec patches from IBM
- using dist tag



--- NEW FILE 1152117672-exec-patch ---
--- process_event.c	2006-02-20 16:48:07.000000000 -0500
+++ process_event.fix	2006-07-04 04:20:27.000000000 -0400
@@ -239,7 +239,6 @@ static void process_sysret(struct event 
 			     sysname(event->proc, event->e_un.sysnum));
 	}
 	if (exec_p(event->proc, event->e_un.sysnum)) {
-		if (gimme_arg(LT_TOF_SYSCALLR, event->proc, -1) == 0) {
 			pid_t saved_pid;
 			event->proc->mask_32bit = 0;
 			event->proc->personality = 0;
@@ -251,8 +250,6 @@ static void process_sysret(struct event 
 			event->proc->pid = 0;
 			breakpoints_init(event->proc);
 			event->proc->pid = saved_pid;
-		} else
-			enable_all_breakpoints(event->proc);
 	}
 	continue_process(event->proc->pid);
 }


--- NEW FILE 1153220107-fork-patch ---
diff -Naurp ltrace-0.4/ltrace.h ltrace-0.4-Getmsg/ltrace.h
--- ltrace-0.4/ltrace.h	2006-02-20 16:48:07.000000000 -0500
+++ ltrace-0.4-Getmsg/ltrace.h	2006-07-18 02:23:36.000000000 -0400
@@ -12,6 +12,7 @@
 #include "sysdep.h"
 
 #define MAX_LIBRARY	30
+#define TRACE_FORK	1
 
 #if defined HAVE_LIBIBERTY || defined HAVE_LIBSUPC__
 # define USE_DEMANGLE
@@ -170,7 +171,7 @@ extern void show_summary(void);
 
 /* Arch-dependent stuff: */
 extern char *pid2name(pid_t pid);
-extern void trace_set_options(struct process *proc, pid_t pid);
+extern void trace_set_options(struct process *proc, pid_t pid, int option);
 extern void trace_me(void);
 extern int trace_pid(pid_t pid);
 extern void untrace_pid(pid_t pid);
@@ -198,5 +199,5 @@ extern void *plt2addr(struct process *, 
 #if 0				/* not yet */
 extern int umoven(struct process *proc, void *addr, int len, void *laddr);
 #endif
-
+extern ulong get_child_pid(pid_t pid);
 #endif
diff -Naurp ltrace-0.4/proc.c ltrace-0.4-Getmsg/proc.c
--- ltrace-0.4/proc.c	2006-02-20 16:48:07.000000000 -0500
+++ ltrace-0.4-Getmsg/proc.c	2006-07-17 06:00:36.000000000 -0400
@@ -22,10 +22,11 @@ struct process *open_program(char *filen
 	}
 	proc->filename = filename;
 	proc->breakpoints_enabled = -1;
+	proc->pid = 0;
+	breakpoints_init(proc); 
 	if (pid) {
 		proc->pid = pid;
 	}
-	breakpoints_init(proc);
 
 	proc->next = list_of_processes;
 	list_of_processes = proc;
@@ -37,11 +38,13 @@ void open_pid(pid_t pid, int verbose)
 	struct process *proc;
 	char *filename;
 
+#if 0
 	if (trace_pid(pid) < 0) {
 		fprintf(stderr, "Cannot attach to pid %u: %s\n", pid,
 			strerror(errno));
 		return;
 	}
+#endif
 
 	filename = pid2name(pid);
 
@@ -54,7 +57,6 @@ void open_pid(pid_t pid, int verbose)
 		return;
 	}
 #endif
-
 	proc = open_program(filename, pid);
-	proc->breakpoints_enabled = 1;
+	proc->breakpoints_enabled = -1;
 }
diff -Naurp ltrace-0.4/process_event.c ltrace-0.4-Getmsg/process_event.c
--- ltrace-0.4/process_event.c	2006-02-20 16:48:07.000000000 -0500
+++ ltrace-0.4-Getmsg/process_event.c	2006-07-18 03:05:16.000000000 -0400
@@ -223,16 +223,6 @@ static void process_sysret(struct event 
 	if (opt_T || opt_c) {
 		calc_time_spent(event->proc);
 	}
-	if (fork_p(event->proc, event->e_un.sysnum)) {
-		if (opt_f) {
-			pid_t child =
-			    gimme_arg(LT_TOF_SYSCALLR, event->proc, -1);
-			if (child > 0) {
-				open_pid(child, 0);
-			}
-		}
-		enable_all_breakpoints(event->proc);
-	}
 	callstack_pop(event->proc);
 	if (opt_S) {
 		output_right(LT_TOF_SYSCALLR, event->proc,
diff -Naurp ltrace-0.4/sysdeps/linux-gnu/trace.c ltrace-0.4-Getmsg/sysdeps/linux-gnu/trace.c
--- ltrace-0.4/sysdeps/linux-gnu/trace.c	2006-02-20 16:48:07.000000000 -0500
+++ ltrace-0.4-Getmsg/sysdeps/linux-gnu/trace.c	2006-07-18 02:49:35.000000000 -0400
@@ -90,7 +90,7 @@ int trace_pid(pid_t pid)
 	return 0;
 }
 
-void trace_set_options(struct process *proc, pid_t pid)
+void trace_set_options(struct process *proc, pid_t pid, int option)
 {
 #ifndef PTRACE_SETOPTIONS
 #define PTRACE_SETOPTIONS 0x4200
@@ -101,10 +101,21 @@ void trace_set_options(struct process *p
 #ifndef PTRACE_O_TRACESYSGOOD
 #define PTRACE_O_TRACESYSGOOD 0x00000001
 #endif
+#ifndef PTRACE_O_TRACEFORK
+#define PTRACE_O_TRACEFORK 0x00000002
+#endif
+      
+	ulong setoptions = 0;
+
 	if (proc->tracesysgood & 0x80)
 		return;
-	if (ptrace(PTRACE_SETOPTIONS, pid, 0, PTRACE_O_TRACESYSGOOD) < 0 &&
-	    ptrace(PTRACE_OLDSETOPTIONS, pid, 0, PTRACE_O_TRACESYSGOOD) < 0) {
+ 
+	setoptions |= PTRACE_O_TRACESYSGOOD;
+	if (TRACE_FORK == option){
+		setoptions |= PTRACE_O_TRACEFORK;
+	}
+	if (ptrace(PTRACE_SETOPTIONS, pid, 0, setoptions) < 0 &&
+	    ptrace(PTRACE_OLDSETOPTIONS, pid, 0, PTRACE_O_TRACESYSGOOD) < 0){
 		perror("PTRACE_SETOPTIONS");
 		return;
 	}
@@ -175,3 +186,18 @@ int umovestr(struct process *proc, void 
 	*(char *)(laddr + offset) = '\0';
 	return 0;
 }
+
+ulong get_child_pid(pid_t pid)
+{
+#ifndef PTRACE_GETEVENTMSG
+#define PTRACE_GETEVENTMSG 0x4201
+#endif
+        ulong child_pid = 9999;
+                                                                                                                             
+       if( ptrace(PTRACE_GETEVENTMSG, pid, 0, &child_pid) < 0) {
+                perror("PTRACE_GETEVENTMSG");
+                return 0;
+        }
+        return child_pid;
+}
+
diff -Naurp ltrace-0.4/wait_for_something.c ltrace-0.4-Getmsg/wait_for_something.c
--- ltrace-0.4/wait_for_something.c	2006-02-20 16:48:07.000000000 -0500
+++ ltrace-0.4-Getmsg/wait_for_something.c	2006-07-18 02:32:26.000000000 -0400
@@ -14,15 +14,17 @@
 #include "options.h"
 #include "debug.h"
 
+#define FORK_MASK 0x00010000
 static struct event event;
 
 /* This should also update `current_process' */
 
 static struct process *pid2proc(int pid);
+void verify(int sig_status);
 
 struct event *wait_for_something(void)
 {
-	pid_t pid;
+	pid_t pid, child_pid;
 	int status;
 	int tmp;
 
@@ -54,7 +56,11 @@ struct event *wait_for_something(void)
 	if (event.proc->breakpoints_enabled == -1) {
 		enable_all_breakpoints(event.proc);
 		event.thing = LT_EV_NONE;
-		trace_set_options(event.proc, event.proc->pid);
+  		if(opt_f){
+			trace_set_options(event.proc, event.proc->pid, TRACE_FORK);
+		}else{
+			trace_set_options(event.proc, event.proc->pid, 0);
+		}
 		continue_process(event.proc->pid);
 		return &event;
 	}
@@ -92,6 +98,17 @@ struct event *wait_for_something(void)
 		event.e_un.signum = WSTOPSIG(status);
 		return &event;
 	}
+        if((WSTOPSIG(status) == SIGTRAP) && (status & FORK_MASK)) {
+		event.thing = LT_EV_NONE;
+		event.e_un.signum = WSTOPSIG(status);
+		child_pid = (pid_t) get_child_pid(event.proc->pid);
+                if (child_pid){
+			open_pid(child_pid,0);
+                }
+                enable_all_breakpoints(event.proc);
+		continue_after_signal(event.proc->pid, event.e_un.signum);
+		return &event;
+	}
 	event.thing = LT_EV_BREAKPOINT;
 	if (!event.proc->instruction_pointer) {
 		event.proc->instruction_pointer =
@@ -115,3 +132,4 @@ static struct process *pid2proc(pid_t pi
 	}
 	return NULL;
 }
+


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ltrace.spec	18 Aug 2006 20:15:15 -0000	1.43
+++ ltrace.spec	22 Aug 2006 12:28:50 -0000	1.44
@@ -1,8 +1,10 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 1.0.45svn.6
+Release: 1.1.45svn%{?dist}
 Source: ltrace-0.5.tar.gz
+Patch0: 1152117672-exec-patch
+Patch1: 1153220107-fork-patch
 Patch2: ltrace-opd.patch
 Patch3: ltrace-ppc32fc5.patch
 Patch4: ltrace-0.5-gnuhash.patch
@@ -11,7 +13,7 @@
 Group: Development/Debuggers
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
 Prefix: %{_prefix}
-Buildroot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: elfutils-libelf-devel dejagnu
 
 %description
@@ -38,6 +40,7 @@
 make
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} docdir=%{_docdir}/ltrace-%{version}/ install
 
 %check
@@ -56,6 +59,10 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Tue Aug 22 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.1.45svn
+- adding fork and exec patches from IBM
+- using dist tag
+
 * Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 0.5-1.0.45svn.6
 - rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
   (#203001)



From fedora-cvs-commits at redhat.com  Tue Aug 22 13:46:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 09:46:27 -0400
Subject: rpms/nautilus/devel .cvsignore, 1.44, 1.45 nautilus.spec, 1.117,
	1.118 sources, 1.47, 1.48
Message-ID: <200608221346.k7MDkRIh018976@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18173

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
* Tue Aug 22 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92.1-1
- update to 2.15.92.1




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	21 Aug 2006 17:04:00 -0000	1.44
+++ .cvsignore	22 Aug 2006 13:46:24 -0000	1.45
@@ -1 +1 @@
-nautilus-2.15.92.tar.bz2
+nautilus-2.15.92.1.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- nautilus.spec	21 Aug 2006 17:04:00 -0000	1.117
+++ nautilus.spec	22 Aug 2006 13:46:24 -0000	1.118
@@ -22,7 +22,7 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.15.92
+Version: 	2.15.92.1
 Release:	1%{?dist}
 License: 	GPL
 Group:          User Interface/Desktops
@@ -197,6 +197,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Aug 22 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92.1-1
+- update to 2.15.92.1
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	21 Aug 2006 17:04:00 -0000	1.47
+++ sources	22 Aug 2006 13:46:24 -0000	1.48
@@ -1 +1 @@
-1abe8e756117cd9d1eeaa84da3dea830  nautilus-2.15.92.tar.bz2
+a5a1335db27cbfa142ba9b5e41d3eb61  nautilus-2.15.92.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 13:47:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 09:47:04 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060822.patch, NONE, 1.1 .cvsignore,
	1.61, 1.62 selinux-policy.spec, 1.181, 1.182 sources, 1.65, 1.66
Message-ID: <200608221347.k7MDl4XE024811@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24547

Modified Files:
	.cvsignore selinux-policy.spec sources 
Added Files:
	policy-20060822.patch 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-2.fc5
- Bump for FC5
- Patch changes from 2.3.8


policy-20060822.patch:
 admin/amanda.fc            |   51 ---------------------------------------------
 admin/usermanage.te        |    1 
 apps/java.fc               |    8 ++++++-
 apps/wine.te               |    2 -
 kernel/corecommands.if     |    1 
 kernel/corenetwork.te.in   |    3 ++
 services/afs.te            |   14 ++----------
 services/apache.te         |    4 +--
 services/avahi.te          |    1 
 services/cpucontrol.te     |    2 -
 services/cron.if           |    2 +
 services/cron.te           |    8 ++-----
 services/cups.te           |   13 +++--------
 services/cyrus.te          |    4 +++
 services/dovecot.te        |    2 -
 services/gatekeeper.te     |   15 -------------
 services/inn.te            |    1 
 services/nis.te            |    2 +
 services/postgresql.te     |    1 
 services/radius.te         |    2 -
 services/rpc.if            |    2 +
 services/rpc.te            |    7 ------
 services/samba.te          |    2 -
 services/setroubleshoot.te |    5 ++++
 services/stunnel.te        |    2 +
 services/sysstat.te        |    3 ++
 system/libraries.fc        |    3 ++
 system/lvm.fc              |    2 -
 system/lvm.te              |    6 +++--
 system/selinuxutil.te      |    4 +++
 system/userdomain.if       |   10 ++++----
 31 files changed, 72 insertions(+), 111 deletions(-)

--- NEW FILE policy-20060822.patch ---
diff -u -r serefpolicy-2.3.7/policy/modules/admin/amanda.fc ../devel/serefpolicy-2.3.8/policy/modules/admin/amanda.fc
--- serefpolicy-2.3.7/policy/modules/admin/amanda.fc	2006-08-12 06:57:16.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/admin/amanda.fc	2006-08-18 23:12:03.000000000 -0400
@@ -9,62 +9,13 @@
 /tmp/amanda(/.*)?			gen_context(system_u:object_r:amanda_tmp_t,s0)
 
 /usr/lib(64)?/amanda		-d	gen_context(system_u:object_r:amanda_usr_lib_t,s0)
+/usr/lib(64)?/amanda/.*		--	gen_context(system_u:object_r:amanda_exec_t,s0)
 /usr/lib(64)?/amanda/amandad	--	gen_context(system_u:object_r:amanda_inetd_exec_t,s0)
-/usr/lib(64)?/amanda/amcat\.awk	--	gen_context(system_u:object_r:amanda_script_exec_t,s0)
-/usr/lib(64)?/amanda/amcleanupdisk --	gen_context(system_u:object_r:amanda_exec_t,s0)
 /usr/lib(64)?/amanda/amidxtaped	--	gen_context(system_u:object_r:amanda_inetd_exec_t,s0)
 /usr/lib(64)?/amanda/amindexd	--	gen_context(system_u:object_r:amanda_inetd_exec_t,s0)
-/usr/lib(64)?/amanda/amlogroll	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/amplot\.awk --	gen_context(system_u:object_r:amanda_script_exec_t,s0)
-/usr/lib(64)?/amanda/amplot\.g	--	gen_context(system_u:object_r:amanda_script_exec_t,s0)
-/usr/lib(64)?/amanda/amplot\.gp	--	gen_context(system_u:object_r:amanda_script_exec_t,s0)
-/usr/lib(64)?/amanda/amtrmidx	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/amtrmlog	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/calcsize	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-chio	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-chs	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-manual	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-mtx	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-multi	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-rth	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-scsi	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-zd-mtx	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/driver	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/dumper	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/killpgrp	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/patch-system --	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/planner	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/rundump	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/runtar	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/selfcheck	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/sendbackup	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/sendsize	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/taper	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/versionsuffix --	gen_context(system_u:object_r:amanda_exec_t,s0)
-
-/usr/sbin/amadmin		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amcheck		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amcheckdb		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amcleanup		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amdump		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amflush		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amgetconf		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amlabel		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amoverview		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amplot		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
 /usr/sbin/amrecover		--	gen_context(system_u:object_r:amanda_recover_exec_t,s0)
-/usr/sbin/amreport		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amrestore		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amrmtape		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amstatus		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amtape		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amtoc			--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amverify		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-
 /var/lib/amanda			-d	gen_context(system_u:object_r:amanda_var_lib_t,s0)
 /var/lib/amanda/\.amandahosts	--	gen_context(system_u:object_r:amanda_config_t,s0)
-/var/lib/amanda/\.bashrc	--	gen_context(system_u:object_r:amanda_shellconfig_t,s0)
-/var/lib/amanda/\.profile	--	gen_context(system_u:object_r:amanda_shellconfig_t,s0)
 /var/lib/amanda/disklist	--	gen_context(system_u:object_r:amanda_data_t,s0)
 /var/lib/amanda/gnutar-lists(/.*)?	gen_context(system_u:object_r:amanda_gnutarlists_t,s0)
 /var/lib/amanda/index			gen_context(system_u:object_r:amanda_data_t,s0)
diff -u -r serefpolicy-2.3.7/policy/modules/admin/usermanage.te ../devel/serefpolicy-2.3.8/policy/modules/admin/usermanage.te
--- serefpolicy-2.3.7/policy/modules/admin/usermanage.te	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/admin/usermanage.te	2006-08-18 23:12:03.000000000 -0400
@@ -486,6 +486,7 @@
 auth_relabel_shadow(useradd_t)
 auth_etc_filetrans_shadow(useradd_t)
 auth_rw_lastlog(useradd_t)
+auth_rw_faillog(useradd_t)
 auth_use_nsswitch(useradd_t)
 
 corecmd_exec_shell(useradd_t)
diff -u -r serefpolicy-2.3.7/policy/modules/apps/java.fc ../devel/serefpolicy-2.3.8/policy/modules/apps/java.fc
--- serefpolicy-2.3.7/policy/modules/apps/java.fc	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/apps/java.fc	2006-08-18 23:12:03.000000000 -0400
@@ -1,7 +1,7 @@
 #
 # /opt
 #
-/opt/(.*/)?bin/java([^/]*)? --	gen_context(system_u:object_r:java_exec_t,s0)
+/opt/(.*/)?java([^/]*)? --	gen_context(system_u:object_r:java_exec_t,s0)
 
 #
 # /usr
@@ -11,3 +11,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)
 /usr/bin/frysk		--	gen_context(system_u:object_r:java_exec_t,s0)
+/usr/bin/gappletviewer  --	gen_context(system_u:object_r:java_exec_t,s0)
+/usr/bin/gjarsigner  	--	gen_context(system_u:object_r:java_exec_t,s0)
+/usr/bin/gkeytool  	--	gen_context(system_u:object_r:java_exec_t,s0)
+/usr/bin/grmic  	--	gen_context(system_u:object_r:java_exec_t,s0)
+/usr/bin/grmiregistry  	--	gen_context(system_u:object_r:java_exec_t,s0)
+/usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
diff -u -r serefpolicy-2.3.7/policy/modules/apps/wine.te ../devel/serefpolicy-2.3.8/policy/modules/apps/wine.te
--- serefpolicy-2.3.7/policy/modules/apps/wine.te	2006-08-12 06:57:15.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/apps/wine.te	2006-08-18 23:12:03.000000000 -0400
@@ -18,7 +18,7 @@
 #
 
 ifdef(`targeted_policy',`
-	allow wine_t self:process { execstack execmem };
+	allow wine_t self:process { execstack execmem execheap };
 	unconfined_domain_noaudit(wine_t)
 	files_execmod_all_files(wine_t)
 
diff -u -r serefpolicy-2.3.7/policy/modules/kernel/corecommands.if ../devel/serefpolicy-2.3.8/policy/modules/kernel/corecommands.if
--- serefpolicy-2.3.7/policy/modules/kernel/corecommands.if	2006-08-12 06:57:20.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/kernel/corecommands.if	2006-08-18 23:12:03.000000000 -0400
@@ -950,6 +950,7 @@
 
 	allow $1 exec_type:file manage_file_perms;
 	allow $1 { bin_t sbin_t }:dir rw_dir_perms;
+	allow $1 exec_type:lnk_file create_lnk_perms;
 ')
 
 ########################################
diff -u -r serefpolicy-2.3.7/policy/modules/kernel/corenetwork.te.in ../devel/serefpolicy-2.3.8/policy/modules/kernel/corenetwork.te.in
--- serefpolicy-2.3.7/policy/modules/kernel/corenetwork.te.in	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/kernel/corenetwork.te.in	2006-08-18 23:12:03.000000000 -0400
@@ -67,6 +67,7 @@
 network_port(clamd, tcp,3310,s0)
 network_port(clockspeed, udp,4041,s0)
 network_port(comsat, udp,512,s0)
+network_port(cluster, tcp,40040,s0)
 network_port(cvs, tcp,2401,s0, udp,2401,s0)
 network_port(dcc, udp,6276,s0, udp,6277,s0)
 network_port(dbskkd, tcp,1178,s0)
@@ -121,6 +122,8 @@
 network_port(radacct, udp,1646,s0, udp,1813,s0)
 network_port(radius, udp,1645,s0, udp,1812,s0)
 network_port(razor, tcp,2703,s0)
+network_port(ricci, tcp,11111,s0, udp,11111,s0)
+network_port(ricci_modcluster, tcp,16851,s0, udp,16851,s0)
 network_port(rlogind, tcp,513,s0)
 network_port(rndc, tcp,953,s0)
 network_port(router, udp,520,s0)
diff -u -r serefpolicy-2.3.7/policy/modules/services/afs.te ../devel/serefpolicy-2.3.8/policy/modules/services/afs.te
--- serefpolicy-2.3.7/policy/modules/services/afs.te	2006-08-12 06:57:28.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/afs.te	2006-08-18 07:33:03.000000000 -0400
@@ -1,5 +1,5 @@
 
-policy_module(afs,1.0.1)
+policy_module(afs,1.0.2)
 
 ########################################
 #
@@ -134,8 +134,8 @@
 dontaudit afs_fsserver_t self:capability fsetid;
 allow afs_fsserver_t self:process { setsched signal_perms };
 allow afs_fsserver_t self:fifo_file rw_file_perms;
-allow afs_fsserver_t self:tcp_socket { create_stream_socket_perms connectto acceptfrom recvfrom };
-allow afs_fsserver_t self:udp_socket { create_socket_perms sendto recvfrom };
+allow afs_fsserver_t self:tcp_socket create_stream_socket_perms;
+allow afs_fsserver_t self:udp_socket create_socket_perms;
 
 allow afs_fsserver_t afs_config_t:file r_file_perms;
 allow afs_fsserver_t afs_config_t:dir r_dir_perms;
@@ -157,10 +157,6 @@
 allow afs_fsserver_t afs_logfile_t:file create_file_perms;
 allow afs_fsserver_t afs_logfile_t:dir create_dir_perms;
 
-allow afs_fsserver_t afs_ptserver_t:udp_socket recvfrom;
-
-allow afs_fsserver_t afs_vlserver_t:udp_socket recvfrom;
-
 kernel_read_system_state(afs_fsserver_t)
 kernel_read_kernel_sysctls(afs_fsserver_t)
 
@@ -269,8 +265,6 @@
 allow afs_ptserver_t afs_logfile_t:file create_file_perms;
 allow afs_ptserver_t afs_logfile_t:dir create_dir_perms;
 
-allow afs_ptserver_t afs_fsserver_t:udp_socket recvfrom;
-
 allow afs_ptserver_t afs_pt_db_t:file manage_file_perms;
 allow afs_ptserver_t afs_dbdir_t:dir rw_dir_perms;
 type_transition afs_ptserver_t afs_dbdir_t:file afs_pt_db_t;
@@ -310,8 +304,6 @@
 allow afs_vlserver_t afs_config_t:file r_file_perms;
 allow afs_vlserver_t afs_config_t:dir r_dir_perms;
 
-allow afs_vlserver_t afs_fsserver_t:udp_socket recvfrom;
-
 allow afs_vlserver_t afs_logfile_t:file create_file_perms;
 allow afs_vlserver_t afs_logfile_t:dir create_dir_perms;
 
diff -u -r serefpolicy-2.3.7/policy/modules/services/apache.te ../devel/serefpolicy-2.3.8/policy/modules/services/apache.te
--- serefpolicy-2.3.7/policy/modules/services/apache.te	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/apache.te	2006-08-18 23:12:03.000000000 -0400
@@ -1,5 +1,5 @@
 
-policy_module(apache,1.3.15)
+policy_module(apache,1.3.16)
 
 #
 # NOTES: 
@@ -142,7 +142,7 @@
 allow httpd_t self:unix_dgram_socket { create_socket_perms sendto };
 allow httpd_t self:unix_stream_socket { create_stream_socket_perms connectto };
 allow httpd_t self:netlink_route_socket { bind create getattr nlmsg_read read write };
-allow httpd_t self:tcp_socket { create_stream_socket_perms acceptfrom connectto recvfrom };
+allow httpd_t self:tcp_socket create_stream_socket_perms;
 allow httpd_t self:udp_socket create_socket_perms;
 
 # Allow httpd_t to put files in /var/cache/httpd etc
diff -u -r serefpolicy-2.3.7/policy/modules/services/avahi.te ../devel/serefpolicy-2.3.8/policy/modules/services/avahi.te
--- serefpolicy-2.3.7/policy/modules/services/avahi.te	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/avahi.te	2006-08-18 23:12:03.000000000 -0400
@@ -63,6 +63,7 @@
 domain_use_interactive_fds(avahi_t)
 
 files_read_etc_files(avahi_t)
+files_read_usr_files(avahi_t)
 files_read_etc_runtime_files(avahi_t)
 
 init_use_fds(avahi_t)
diff -u -r serefpolicy-2.3.7/policy/modules/services/cpucontrol.te ../devel/serefpolicy-2.3.8/policy/modules/services/cpucontrol.te
--- serefpolicy-2.3.7/policy/modules/services/cpucontrol.te	2006-08-12 06:57:20.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/cpucontrol.te	2006-08-18 23:12:03.000000000 -0400
@@ -25,7 +25,7 @@
 # CPU microcode loader local policy
 #
 
-allow cpucontrol_t self:capability sys_rawio;
+allow cpucontrol_t self:capability { ipc_lock sys_rawio };
 dontaudit cpucontrol_t self:capability sys_tty_config;
 allow cpucontrol_t self:process signal_perms;
 
diff -u -r serefpolicy-2.3.7/policy/modules/services/cron.if ../devel/serefpolicy-2.3.8/policy/modules/services/cron.if
--- serefpolicy-2.3.7/policy/modules/services/cron.if	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/cron.if	2006-08-18 23:12:03.000000000 -0400
@@ -340,6 +340,8 @@
 	allow $1 crond_t:fifo_file rw_file_perms;
 	allow $1 crond_t:fd use;
 	allow $1 crond_t:process sigchld;
+
+	role system_r types $1;
 ')
 
 ########################################
diff -u -r serefpolicy-2.3.7/policy/modules/services/cron.te ../devel/serefpolicy-2.3.8/policy/modules/services/cron.te
--- serefpolicy-2.3.7/policy/modules/services/cron.te	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/cron.te	2006-08-18 23:12:03.000000000 -0400
@@ -1,5 +1,5 @@
 
-policy_module(cron,1.3.9)
+policy_module(cron,1.3.10)
 
 gen_require(`
 	class passwd rootok;
@@ -146,6 +146,8 @@
 	')
 ')
 
+mta_send_mail(crond_t)
+
 ifdef(`targeted_policy',`
 	allow crond_t system_crond_tmp_t:dir create_dir_perms;
 	allow crond_t system_crond_tmp_t:file create_file_perms;
@@ -174,8 +176,6 @@
 	allow crond_t crond_tmp_t:file create_file_perms;
 	files_tmp_filetrans(crond_t, crond_tmp_t, { file dir })
 	files_pid_filetrans(system_crond_t,crond_var_run_t,file)
-
-	mta_send_mail(crond_t)
 ')
 
 tunable_policy(`fcron_crond', `
@@ -342,8 +342,6 @@
 
 	seutil_read_config(system_crond_t)
 
-	mta_send_mail(system_crond_t)
-
 	ifdef(`distro_redhat', `
 		# Run the rpm program in the rpm_t domain. Allow creation of RPM log files
 		# via redirection of standard out.
diff -u -r serefpolicy-2.3.7/policy/modules/services/cups.te ../devel/serefpolicy-2.3.8/policy/modules/services/cups.te
--- serefpolicy-2.3.7/policy/modules/services/cups.te	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/cups.te	2006-08-18 23:12:03.000000000 -0400
@@ -1,5 +1,5 @@
 
-policy_module(cups,1.3.10)
+policy_module(cups,1.3.11)
 
 ########################################
 #
@@ -83,7 +83,7 @@
 allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
 allow cupsd_t self:netlink_selinux_socket create_socket_perms;
 allow cupsd_t self:netlink_route_socket r_netlink_socket_perms;
-allow cupsd_t self:tcp_socket { create_stream_socket_perms connectto acceptfrom recvfrom };
+allow cupsd_t self:tcp_socket create_stream_socket_perms;
 allow cupsd_t self:udp_socket create_socket_perms;
 allow cupsd_t self:appletalk_socket create_socket_perms;
 # generic socket here until appletalk socket is available in kernels
@@ -303,13 +298,7 @@
 	xserver_read_xkb_libs(cupsd_t)
 ')
 
-ifdef(`TODO',`
-allow web_client_domain cupsd_t:tcp_socket { connectto recvfrom };
-allow cupsd_t web_client_domain:tcp_socket { acceptfrom recvfrom };
-allow cupsd_t kernel_t:tcp_socket recvfrom;
-allow web_client_domain kernel_t:tcp_socket recvfrom;
-') dnl end TODO
-
+#FIXME:
 allow cupsd_t usercanread:dir r_dir_perms;
 allow cupsd_t usercanread:file r_file_perms;
 allow cupsd_t usercanread:lnk_file { getattr read };
@@ -617,6 +602,7 @@
 dev_read_urand(hplip_t)
 dev_read_rand(hplip_t)
 dev_rw_generic_usb_dev(hplip_t)
+dev_read_usbfs(hplip_t)
 
 fs_getattr_all_fs(hplip_t)
 fs_search_auto_mountpoints(hplip_t)
diff -u -r serefpolicy-2.3.7/policy/modules/services/cyrus.te ../devel/serefpolicy-2.3.8/policy/modules/services/cyrus.te
--- serefpolicy-2.3.7/policy/modules/services/cyrus.te	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/cyrus.te	2006-08-18 23:12:03.000000000 -0400
@@ -143,3 +143,7 @@
 optional_policy(`
 	udev_read_db(cyrus_t)
 ')
+
+optional_policy(`
+	snmp_read_snmp_var_lib_files(cyrus_t)
+')
diff -u -r serefpolicy-2.3.7/policy/modules/services/dovecot.te ../devel/serefpolicy-2.3.8/policy/modules/services/dovecot.te
--- serefpolicy-2.3.7/policy/modules/services/dovecot.te	2006-08-12 06:57:28.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/dovecot.te	2006-08-18 23:12:03.000000000 -0400
@@ -168,7 +168,7 @@
 # Allow dovecot to create and read SSL parameters file
 allow dovecot_t dovecot_var_lib_t:dir rw_dir_perms;
 allow dovecot_t dovecot_var_lib_t:file manage_file_perms;
-files_search_var_lib(dovecot_t)
+files_read_var_lib_files(dovecot_t)
 
 allow dovecot_auth_t dovecot_var_run_t:dir r_dir_perms;
 
diff -u -r serefpolicy-2.3.7/policy/modules/services/gatekeeper.te ../devel/serefpolicy-2.3.8/policy/modules/services/gatekeeper.te
--- serefpolicy-2.3.7/policy/modules/services/gatekeeper.te	2006-08-12 06:57:28.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/gatekeeper.te	2006-08-18 07:33:03.000000000 -0400
@@ -1,5 +1,5 @@
 
-policy_module(gatekeeper,1.0.2)
+policy_module(gatekeeper,1.0.3)
 
 ########################################
 #
@@ -113,16 +113,3 @@
 optional_policy(`
 	udev_read_db(gatekeeper_t)
 ')
-
-ifdef(`TODO',`
-# for local users to run VOIP software
-allow userdomain gatekeeper_t:udp_socket sendto;
-allow gatekeeper_t userdomain:udp_socket recvfrom;
-allow gatekeeper_t userdomain:udp_socket sendto;
-allow userdomain gatekeeper_t:udp_socket recvfrom;
-
-allow gatekeeper_t userdomain:tcp_socket { connectto recvfrom };
-allow userdomain gatekeeper_t:tcp_socket { acceptfrom recvfrom };
-kernel_tcp_recvfrom(gatekeeper_t)
-kernel_tcp_recvfrom(userdomain)
-')
diff -u -r serefpolicy-2.3.7/policy/modules/services/inn.te ../devel/serefpolicy-2.3.8/policy/modules/services/inn.te
--- serefpolicy-2.3.7/policy/modules/services/inn.te	2006-08-12 06:57:28.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/inn.te	2006-08-18 23:12:03.000000000 -0400
@@ -36,6 +36,7 @@
 allow innd_t self:unix_stream_socket { connectto create_stream_socket_perms };
 allow innd_t self:tcp_socket create_stream_socket_perms;
 allow innd_t self:udp_socket create_socket_perms;
+allow innd_t self:netlink_route_socket r_netlink_socket_perms;
 
 allow innd_t innd_etc_t:file r_file_perms;
 allow innd_t innd_etc_t:dir r_dir_perms;
diff -u -r serefpolicy-2.3.7/policy/modules/services/nis.te ../devel/serefpolicy-2.3.8/policy/modules/services/nis.te
--- serefpolicy-2.3.7/policy/modules/services/nis.te	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/nis.te	2006-08-18 07:32:57.000000000 -0400
@@ -249,6 +244,8 @@
 allow ypserv_t self:unix_dgram_socket create_socket_perms;
 allow ypserv_t self:unix_stream_socket create_stream_socket_perms;
 allow ypserv_t self:netlink_route_socket r_netlink_socket_perms;
+allow ypserv_t self:tcp_socket connected_stream_socket_perms;
+allow ypserv_t self:udp_socket create_socket_perms;
 
 allow ypserv_t var_yp_t:dir rw_dir_perms;
 allow ypserv_t var_yp_t:file create_file_perms;
diff -u -r serefpolicy-2.3.7/policy/modules/services/postgresql.te ../devel/serefpolicy-2.3.8/policy/modules/services/postgresql.te
--- serefpolicy-2.3.7/policy/modules/services/postgresql.te	2006-08-12 06:57:20.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/postgresql.te	2006-08-21 14:10:26.000000000 -0400
@@ -135,6 +134,7 @@
 seutil_dontaudit_search_config(postgresql_t)
 
 sysnet_read_config(postgresql_t)
+sysnet_use_ldap(postgresql_t)
 
 userdom_dontaudit_search_sysadm_home_dirs(postgresql_t)
 userdom_dontaudit_use_sysadm_ttys(postgresql_t)
diff -u -r serefpolicy-2.3.7/policy/modules/services/radius.te ../devel/serefpolicy-2.3.8/policy/modules/services/radius.te
--- serefpolicy-2.3.7/policy/modules/services/radius.te	2006-08-12 06:57:20.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/radius.te	2006-08-18 23:12:03.000000000 -0400
@@ -31,7 +31,7 @@
 # gzip also needs chown access to preserve GID for radwtmp files
 allow radiusd_t self:capability { chown dac_override fsetid kill setgid setuid sys_resource sys_tty_config };
 dontaudit radiusd_t self:capability sys_tty_config;
-allow radiusd_t self:process setsched;
+allow radiusd_t self:process { setsched signal };
 allow radiusd_t self:fifo_file rw_file_perms;
 allow radiusd_t self:unix_stream_socket create_stream_socket_perms;
 allow radiusd_t self:tcp_socket create_stream_socket_perms;
diff -u -r serefpolicy-2.3.7/policy/modules/services/rpc.if ../devel/serefpolicy-2.3.8/policy/modules/services/rpc.if
--- serefpolicy-2.3.7/policy/modules/services/rpc.if	2006-08-12 06:57:28.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/rpc.if	2006-08-18 23:12:03.000000000 -0400
@@ -51,6 +51,8 @@
 	kernel_rw_rpc_sysctls($1_t)
 
 	dev_read_sysfs($1_t)
+	dev_read_urand($1_t)
+	dev_read_rand($1_t)
 
 	corenet_non_ipsec_sendrecv($1_t)
 	corenet_tcp_sendrecv_all_if($1_t)
diff -u -r serefpolicy-2.3.7/policy/modules/services/rpc.te ../devel/serefpolicy-2.3.8/policy/modules/services/rpc.te
--- serefpolicy-2.3.7/policy/modules/services/rpc.te	2006-08-12 06:57:20.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/rpc.te	2006-08-18 23:12:03.000000000 -0400
@@ -1,5 +1,5 @@
 
-policy_module(rpc,1.2.9)
+policy_module(rpc,1.2.10)
 
 ########################################
 #
@@ -48,9 +48,6 @@
 # for rpc.rquotad
 kernel_read_sysctl(rpcd_t)  
 
-dev_read_urand(rpcd_t)
-dev_read_rand(rpcd_t)
-
 fs_list_rpc(rpcd_t)
 fs_read_rpc_files(rpcd_t)
 fs_read_rpc_symlinks(rpcd_t)
@@ -140,8 +131,6 @@
 kernel_read_network_state(gssd_t)
 kernel_read_network_state_symlinks(gssd_t)	
 
-dev_read_urand(gssd_t)
-
 fs_list_rpc(gssd_t) 
 fs_read_rpc_sockets(gssd_t) 
 fs_read_rpc_files(gssd_t) 
diff -u -r serefpolicy-2.3.7/policy/modules/services/samba.te ../devel/serefpolicy-2.3.8/policy/modules/services/samba.te
--- serefpolicy-2.3.7/policy/modules/services/samba.te	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/samba.te	2006-08-18 23:12:03.000000000 -0400
@@ -646,7 +646,7 @@
 allow winbind_t samba_etc_t:dir rw_dir_perms;
 type_transition winbind_t samba_etc_t:file samba_secrets_t;
 
-allow winbind_t samba_log_t:dir rw_dir_perms;
+allow winbind_t samba_log_t:dir create_dir_perms;
 allow winbind_t samba_log_t:file create_file_perms;
 allow winbind_t samba_log_t:lnk_file create_lnk_perms;
 
diff -u -r serefpolicy-2.3.7/policy/modules/services/setroubleshoot.te ../devel/serefpolicy-2.3.8/policy/modules/services/setroubleshoot.te
--- serefpolicy-2.3.7/policy/modules/services/setroubleshoot.te	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/setroubleshoot.te	2006-08-18 23:12:03.000000000 -0400
@@ -46,6 +46,8 @@
 logging_send_syslog_msg(setroubleshootd_t)
 logging_audit_stream_connect(setroubleshootd_t)
 
+locallogin_dontaudit_use_fds(setroubleshootd_t)
+
 # pid file
 files_search_pids(setroubleshootd_t)
 allow setroubleshootd_t setroubleshoot_var_run_t:file manage_file_perms;
@@ -95,10 +97,13 @@
 
 term_dontaudit_use_console(setroubleshootd_t)
 term_dontaudit_use_generic_ptys(setroubleshootd_t)
+term_dontaudit_use_all_user_ptys(setroubleshootd_t)
+term_dontaudit_use_all_user_ttys(setroubleshootd_t)
 
 optional_policy(`
 	rpm_read_db(setroubleshootd_t)
 	rpm_dontaudit_manage_db(setroubleshootd_t)
+        rpm_use_script_fds(setroubleshootd_t)
 ')
 
 files_dontaudit_search_tmp(setroubleshootd_t)
diff -u -r serefpolicy-2.3.7/policy/modules/services/stunnel.te ../devel/serefpolicy-2.3.8/policy/modules/services/stunnel.te
--- serefpolicy-2.3.7/policy/modules/services/stunnel.te	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/stunnel.te	2006-08-20 10:45:16.000000000 -0400
@@ -38,6 +38,7 @@
 allow stunnel_t self:fifo_file rw_file_perms;
 allow stunnel_t self:tcp_socket create_stream_socket_perms;
 allow stunnel_t self:udp_socket create_socket_perms;
+allow stunnel_t self:netlink_route_socket r_netlink_socket_perms;
 
 allow stunnel_t stunnel_etc_t:dir { getattr read search };
 allow stunnel_t stunnel_etc_t:file { read getattr };
@@ -64,6 +65,7 @@
 corenet_udp_sendrecv_all_ports(stunnel_t)
 corenet_tcp_bind_all_nodes(stunnel_t)
 #corenet_tcp_bind_stunnel_port(stunnel_t)
+corenet_tcp_connect_smtp_port(stunnel_t)
 
 fs_getattr_all_fs(stunnel_t)
 
diff -u -r serefpolicy-2.3.7/policy/modules/services/sysstat.te ../devel/serefpolicy-2.3.8/policy/modules/services/sysstat.te
--- serefpolicy-2.3.7/policy/modules/services/sysstat.te	2006-08-12 06:57:20.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/services/sysstat.te	2006-08-18 23:12:03.000000000 -0400
@@ -36,6 +36,8 @@
 kernel_read_fs_sysctls(sysstat_t)
 kernel_read_rpc_sysctls(sysstat_t)
 
+locallogin_use_fds(sysstat_t)
+
 corecmd_dontaudit_search_sbin(sysstat_t)
 corecmd_exec_bin(sysstat_t)
 
@@ -50,6 +52,7 @@
 fs_getattr_xattr_fs(sysstat_t)
 
 term_use_console(sysstat_t)
+term_use_all_terms(sysstat_t)
 
 init_use_fds(sysstat_t)
 init_use_script_ptys(sysstat_t)
diff -u -r serefpolicy-2.3.7/policy/modules/system/libraries.fc ../devel/serefpolicy-2.3.8/policy/modules/system/libraries.fc
--- serefpolicy-2.3.7/policy/modules/system/libraries.fc	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/system/libraries.fc	2006-08-18 23:12:03.000000000 -0400
@@ -97,6 +97,8 @@
 /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
 
 /usr/lib(64)?/xulrunner-[^/]*/libxul\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+/usr/lib(64)?/xulrunner-[^/]*/libgtkembedmoz\.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:textrel_shlib_t,s0)
 /usr/lib(64)?/ati-fglrx/.+\.so(\..*)?	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -166,6 +168,7 @@
 /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/lib(64)?/seamonkey.*\.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)
 /usr/lib(64)?/sunbird.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
diff -u -r serefpolicy-2.3.7/policy/modules/system/lvm.fc ../devel/serefpolicy-2.3.8/policy/modules/system/lvm.fc
--- serefpolicy-2.3.7/policy/modules/system/lvm.fc	2006-08-12 06:57:16.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/system/lvm.fc	2006-08-18 23:50:13.000000000 -0400
@@ -14,7 +14,6 @@
 
 /etc/lvmtab(/.*)?		gen_context(system_u:object_r:lvm_metadata_t,s0)
 /etc/lvmtab\.d(/.*)?		gen_context(system_u:object_r:lvm_metadata_t,s0)
-
 #
 # /lib
 #
@@ -88,3 +87,4 @@
 /var/lock/lvm(/.*)?		gen_context(system_u:object_r:lvm_lock_t,s0)
 
 /var/cache/multipathd(/.*)?	gen_context(system_u:object_r:lvm_metadata_t,s0)
+/var/run/multipathd.sock	-s	gen_context(system_u:object_r:lvm_var_run_t,s0)
diff -u -r serefpolicy-2.3.7/policy/modules/system/lvm.te ../devel/serefpolicy-2.3.8/policy/modules/system/lvm.te
--- serefpolicy-2.3.7/policy/modules/system/lvm.te	2006-08-12 06:57:15.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/system/lvm.te	2006-08-18 23:52:13.000000000 -0400
@@ -125,7 +125,7 @@
 
 # DAC overrides and mknod for modifying /dev entries (vgmknodes)
 # rawio needed for dmraid
-allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio };
+allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio net_admin };
 dontaudit lvm_t self:capability sys_tty_config;
 allow lvm_t self:process { sigchld sigkill sigstop signull signal };
 # LVM will complain a lot if it cannot set its priority.
@@ -133,6 +133,7 @@
 allow lvm_t self:file rw_file_perms;
 allow lvm_t self:fifo_file rw_file_perms;
 allow lvm_t self:unix_dgram_socket create_socket_perms;
+allow lvm_t self:netlink_kobject_uevent_socket create_socket_perms;
 
 allow lvm_t lvm_tmp_t:dir create_dir_perms;
 allow lvm_t lvm_tmp_t:file create_file_perms;
@@ -152,7 +153,8 @@
 
 allow lvm_t lvm_var_run_t:file create_file_perms;
 allow lvm_t lvm_var_run_t:dir create_dir_perms;
-files_pid_filetrans(lvm_t,lvm_var_run_t,file)
+allow lvm_t lvm_var_run_t:sock_file create_file_perms;
+files_pid_filetrans(lvm_t,lvm_var_run_t,{ file sock_file })
 
 allow lvm_t lvm_etc_t:file r_file_perms;
 allow lvm_t lvm_etc_t:lnk_file r_file_perms;
diff -u -r serefpolicy-2.3.7/policy/modules/system/selinuxutil.te ../devel/serefpolicy-2.3.8/policy/modules/system/selinuxutil.te
--- serefpolicy-2.3.7/policy/modules/system/selinuxutil.te	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/system/selinuxutil.te	2006-08-18 23:12:03.000000000 -0400
@@ -465,6 +465,10 @@
 miscfiles_read_localization(restorecond_t)
 
 optional_policy(`
+	rpm_use_script_fds(restorecond_t)
+')
+
+optional_policy(`
 	# restorecond watches for users logging in, 
 	# so it getspwnam when a user logs in to find his homedir
 	nis_use_ypbind(restorecond_t)
diff -u -r serefpolicy-2.3.7/policy/modules/system/userdomain.if ../devel/serefpolicy-2.3.8/policy/modules/system/userdomain.if
--- serefpolicy-2.3.7/policy/modules/system/userdomain.if	2006-08-22 09:25:35.000000000 -0400
+++ ../devel/serefpolicy-2.3.8/policy/modules/system/userdomain.if	2006-08-21 13:48:28.000000000 -0400
@@ -4266,7 +4217,7 @@
 	')
 
 	files_search_home($1)
-	allow $1 user_home_dir_t:dir search_dir_perms;
+	allow $1 user_home_dir_t:dir rw_dir_perms;
 	allow $1 user_home_t:dir create_dir_perms;
 ')
 
@@ -4308,7 +4259,7 @@
 	')
 
 	files_search_home($1)
-	allow $1 user_home_dir_t:dir search_dir_perms;
+	allow $1 user_home_dir_t:dir rw_dir_perms;
 	allow $1 user_home_t:dir rw_dir_perms;
 	allow $1 user_home_t:file create_file_perms;
 ')
@@ -4330,7 +4281,7 @@
 	')
 
 	files_search_home($1)
-	allow $1 user_home_dir_t:dir search_dir_perms;
+	allow $1 user_home_dir_t:dir rw_dir_perms;
 	allow $1 user_home_t:dir rw_dir_perms;
 	allow $1 user_home_t:lnk_file create_lnk_perms;
 ')
@@ -4352,7 +4303,7 @@
 	')
 
 	files_search_home($1)
-	allow $1 user_home_dir_t:dir search_dir_perms;
+	allow $1 user_home_dir_t:dir rw_dir_perms;
 	allow $1 user_home_t:dir rw_dir_perms;
 	allow $1 user_home_t:fifo_file create_file_perms;
 ')
@@ -4374,7 +4325,7 @@
 	')
 
 	files_search_home($1)
-	allow $1 user_home_dir_t:dir search_dir_perms;
+	allow $1 user_home_dir_t:dir rw_dir_perms;
 	allow $1 user_home_t:dir rw_dir_perms;
 	allow $1 user_home_t:sock_file create_file_perms;
 ')


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	10 Aug 2006 13:19:30 -0000	1.61
+++ .cvsignore	22 Aug 2006 13:47:01 -0000	1.62
@@ -73,3 +73,4 @@
 serefpolicy-2.3.3.tgz
 serefpolicy-2.3.5.tgz
 serefpolicy-2.3.6.tgz
+serefpolicy-2.3.7.tgz


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- selinux-policy.spec	11 Aug 2006 03:14:53 -0000	1.181
+++ selinux-policy.spec	22 Aug 2006 13:47:01 -0000	1.182
@@ -15,12 +15,13 @@
 %define CHECKPOLICYVER 1.30.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.6
-Release: 3.fc5
+Version: 2.3.7
+Release: 1.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
 patch: policy-20060802.patch
+patch1: policy-20060822.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -163,6 +164,7 @@
 %prep 
 %setup -q -n serefpolicy-%{version}
 %patch -p1
+%patch1 -p1
 
 %install
 # Build targeted policy
@@ -347,6 +349,19 @@
 %endif
 
 %changelog
+* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-2.fc5
+- Bump for FC5
+- Patch changes from 2.3.8
+
+* Sat Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-1
+- Update from upstream
+- More java fixes
+
+* Fri Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-4
+- Change allow_execstack to default to on, for RHEL5 Beta.  
+  This is required because of a Java compiler problem.
+  Hope to turn off for next beta
+
 * Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.6-3.fc5
 - Bump for FC5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	10 Aug 2006 13:19:30 -0000	1.65
+++ sources	22 Aug 2006 13:47:01 -0000	1.66
@@ -1 +1 @@
-d374829a4b5a08e44d337dc5cbf77d21  serefpolicy-2.3.6.tgz
+db77e32295f642a88c7e89673361b15d  serefpolicy-2.3.7.tgz



From fedora-cvs-commits at redhat.com  Tue Aug 22 13:47:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 09:47:59 -0400
Subject: rpms/selinux-policy/FC-5 selinux-policy.spec,1.182,1.183
Message-ID: <200608221347.k7MDlxpJ031900@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31565

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-2.fc5
- Bump for FC5
- Patch changes from 2.3.8



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- selinux-policy.spec	22 Aug 2006 13:47:01 -0000	1.182
+++ selinux-policy.spec	22 Aug 2006 13:47:57 -0000	1.183
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.7
-Release: 1.fc5
+Release: 2.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz



From fedora-cvs-commits at redhat.com  Tue Aug 22 13:53:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 09:53:38 -0400
Subject: rpms/apmd/devel apmd.spec,1.25,1.26 apmscript,1.6,1.7
Message-ID: <200608221353.k7MDrchc003093@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/apmd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3069

Modified Files:
	apmd.spec apmscript 
Log Message:
* Tue Aug 22 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.2-5
- Fix typos in apmscript (#194024)


Index: apmd.spec
===================================================================
RCS file: /cvs/dist/rpms/apmd/devel/apmd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apmd.spec	12 Jul 2006 05:11:43 -0000	1.25
+++ apmd.spec	22 Aug 2006 13:53:36 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Advanced Power Management (APM) BIOS utilities for laptops.
 Name: apmd
 Version: 3.2.2
-Release: 4.1
+Release: 5
 Source: ftp://ftp.debian.org/debian/pool/main/a/apmd/%{name}_%{version}.orig.tar.gz
 Source1: apmd.init
 Source2: apmscript
@@ -96,6 +96,9 @@
 %config /etc/sysconfig/apm-scripts/*
 
 %changelog
+* Tue Aug 22 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.2-5
+- Fix typos in apmscript (#194024)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.2-4.1
 - rebuild
 


Index: apmscript
===================================================================
RCS file: /cvs/dist/rpms/apmd/devel/apmscript,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apmscript	16 Mar 2005 22:28:44 -0000	1.6
+++ apmscript	22 Aug 2006 13:53:36 -0000	1.7
@@ -58,7 +58,7 @@
 				SOUNDDISPLAY=`perl -e 's/\000/\n/g;' -p /proc/$SOUNDPID/environ| LC_ALL=C grep ^DISPLAY=|cut -d= -f2-`
 
 				# Make sure nobody is playing foul tricks on us
-				SOUNDPROG=`echo $SOUNDPROG |sed -e "s/|.*//`
+				SOUNDPROG=`echo $SOUNDPROG |sed -e 's/|.*//'`
 
 				kill $SOUNDPID
 				ps "$SOUNDPID" &>/dev/null && kill -9 $SOUNDPID
@@ -73,7 +73,7 @@
 			SOUNDDISPLAY=`perl -e 's/\000/\n/g;' -p /proc/$SOUNDPID/environ| LC_ALL=C grep ^DISPLAY=|cut -d= -f2-`
 
 			# Make sure nobody is playing foul tricks on us
-			SOUNDPROG=`echo $SOUNDPROG |sed -e "s/|.*//`
+			SOUNDPROG=`echo $SOUNDPROG |sed -e 's/|.*//'`
 
 			kill $SOUNDPID
 			ps "$SOUNDPID" &>/dev/null && kill -9 $SOUNDPID



From fedora-cvs-commits at redhat.com  Tue Aug 22 13:57:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 09:57:33 -0400
Subject: rpms/totem/devel .cvsignore, 1.26, 1.27 sources, 1.26,
	1.27 totem.spec, 1.74, 1.75
Message-ID: <200608221357.k7MDvXxc004600@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4552

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	13 Aug 2006 23:25:48 -0000	1.26
+++ .cvsignore	22 Aug 2006 13:57:31 -0000	1.27
@@ -1 +1 @@
-totem-1.5.91.tar.bz2
+totem-1.5.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Aug 2006 23:25:49 -0000	1.26
+++ sources	22 Aug 2006 13:57:31 -0000	1.27
@@ -1 +1 @@
-2195f9a36c5328c3ee10f1dfda206865  totem-1.5.91.tar.bz2
+830e2597cc5b8c93b7693642a6a414f2  totem-1.5.92.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- totem.spec	15 Aug 2006 01:14:58 -0000	1.74
+++ totem.spec	22 Aug 2006 13:57:31 -0000	1.75
@@ -4,7 +4,7 @@
 
 Summary: Movie player for GNOME 2
 Name: totem
-Version: 1.5.91
+Version: 1.5.92
 Release: 2%{?dist} 
 License: GPL
 Group: Applications/Multimedia
@@ -12,8 +12,6 @@
 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
-# fixed in cv
-Patch2: totem-1.5.91-gettext.patch
 
 Requires(post): GConf2
 Requires(post): desktop-file-utils
@@ -63,6 +61,7 @@
 Requires: gnome-vfs2-devel
 Requires: libxml2-devel
 Requires: gtk2-devel
+Requires: pkgconfig
 
 %description devel
 Totem is simple movie player for the Gnome desktop. It features a
@@ -76,7 +75,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .feature-help-removal
-%patch2 -p1 -b .gettext
 
 %build
 # try to work around a problem where gst-inspect does 
@@ -181,6 +179,10 @@
 %{_libdir}/*so
 
 %changelog
+* Tue Aug 22 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.92-1.fc6
+- Update to 1.5.92
+- Require pkgconfig in the -devel package
+
 * Mon Aug 14 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.91-2.fc6
 - Make translations work again
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 14:18:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 10:18:08 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-ppc64-cliargs.patch, NONE,
	1.1 kexec-tools-1.101-ppc64-ignore-args.patch, NONE,
	1.1 kexec-tools-1.101-ppc64-usage.patch, NONE,
	1.1 kexec-tools.spec, 1.54,
	1.55 kexec-ppc64-ingnore-args-linux.patch, 1.1, NONE
Message-ID: <200608221418.k7MEI8Yi021601@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19699

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-ppc64-cliargs.patch 
	kexec-tools-1.101-ppc64-ignore-args.patch 
	kexec-tools-1.101-ppc64-usage.patch 
Removed Files:
	kexec-ppc64-ingnore-args-linux.patch 
Log Message:
- ppc64 fixups:
  - actually build ppc64 binaries (bug 203407)
  - correct usage output
  - avoid segfault in command-line parsing
- install kexec man page
- use regulation Fedora BuildRoot


kexec-tools-1.101-ppc64-cliargs.patch:
 fs2dt.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE kexec-tools-1.101-ppc64-cliargs.patch ---
Index: kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c
===================================================================
--- kexec-tools-1.101.orig/kexec/arch/ppc64/fs2dt.c
+++ kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c
@@ -267,10 +267,12 @@ void putprops(char *fn, struct dirent **
 					char *old_param;
 					memcpy(temp_cmdline, dt, len);
 					param = strstr(temp_cmdline, "root=");
-					old_param = strtok(param, " ");
-					if (cmd_len != 0)
-						strcat(local_cmdline, " ");
-					strcat(local_cmdline, old_param);
+					if (param) {
+						old_param = strtok(param, " ");
+						if (cmd_len != 0)
+							strcat(local_cmdline, " ");
+						strcat(local_cmdline, old_param);
+					}
 				}
 				strcat(local_cmdline, " ");
 				cmd_len = strlen(local_cmdline);

kexec-tools-1.101-ppc64-ignore-args.patch:
 kexec-elf-ppc64.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE kexec-tools-1.101-ppc64-ignore-args.patch ---
--- a/kexec/arch/ppc64/kexec-elf-ppc64.c
+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c
@@ -93,6 +93,7 @@ int elf_ppc64_load(int argc, char **argv
 #define OPT_APPEND     (OPT_ARCH_MAX+0)
 #define OPT_RAMDISK     (OPT_ARCH_MAX+1)
 #define OPT_DEVICETREEBLOB     (OPT_ARCH_MAX+2)
+#define OPT_ARGS_IGNORE		(OPT_ARCH_MAX+3)
 
 	static const struct option options[] = {
 		KEXEC_ARCH_OPTIONS
@@ -101,6 +102,7 @@ int elf_ppc64_load(int argc, char **argv
 		{ "ramdisk",            1, NULL, OPT_RAMDISK },
 		{ "initrd",             1, NULL, OPT_RAMDISK },
 		{ "devicetreeblob",     1, NULL, OPT_DEVICETREEBLOB },
+		{ "args-linux",		0, NULL, OPT_ARGS_IGNORE },
 		{ 0,                    0, NULL, 0 },
 	};
 
@@ -134,6 +136,8 @@ int elf_ppc64_load(int argc, char **argv
 		case OPT_DEVICETREEBLOB:
 			devicetreeblob = optarg;
 			break;
+		case OPT_ARGS_IGNORE:
+			break;
 		}
 	}
 

kexec-tools-1.101-ppc64-usage.patch:
 kexec-ppc64.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE kexec-tools-1.101-ppc64-usage.patch ---
Index: kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c
===================================================================
--- kexec-tools-1.101.orig/kexec/arch/ppc64/kexec-ppc64.c
+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c
@@ -552,6 +552,10 @@ int file_types = sizeof(file_type) / siz
 
 void arch_usage(void)
 {
+	fprintf(stderr, "     --command-line=<Command line> command line to append.\n");
+	fprintf(stderr, "     --append=<Command line> same as --command-line.\n");
+	fprintf(stderr, "     --ramdisk=<filename> Initial RAM disk.\n");
+	fprintf(stderr, "     --initrd=<filename> same as --ramdisk.\n");
 	fprintf(stderr, "     --devicetreeblob=<filename> Specify device tree blob file.\n");
 	fprintf(stderr, "     --elf64-core-headers Prepare core headers in ELF64 format\n");
 }


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kexec-tools.spec	18 Aug 2006 17:00:45 -0000	1.54
+++ kexec-tools.spec	22 Aug 2006 14:18:04 -0000	1.55
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 45%{dist}
+Release: 46%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -12,7 +12,7 @@
 Source5: kcp.c
 Source6: Makefile.kcp
 Source7: makedumpfile.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): coreutils chkconfig sed
 BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel pkgconfig
 
@@ -34,7 +34,9 @@
 #
 # Patches 301 through 400 are meant for ppc64 kexec-tools enablement
 #
-Patch301: kexec-ppc64-ingnore-args-linux.patch
+Patch301: kexec-tools-1.101-ppc64-ignore-args.patch
+Patch302: kexec-tools-1.101-ppc64-usage.patch
+Patch303: kexec-tools-1.101-ppc64-cliargs.patch
 
 #
 # Patches 401 through 500 are meant for s390 kexec-tools enablement
@@ -70,6 +72,8 @@
 %patch101 -p1
 %patch201 -p1
 %patch301 -p1
+%patch302 -p1
+%patch303 -p1
 %patch401 -p1
 %patch501 -p1
 %patch601 -p1
@@ -87,7 +91,12 @@
 %patch606 -p1
 
 %build
-%configure --sbindir=/sbin
+%configure \
+%ifarch ppc64
+    --host=powerpc64-redhat-linux-gnu \
+    --build=powerpc64-redhat-linux-gnu \
+%endif
+    --sbindir=/sbin
 rm -f kexec-tools.spec.in
 make
 %ifarch %{ix86} x86_64
@@ -100,10 +109,12 @@
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mkdir -p -m755 $RPM_BUILD_ROOT%{_localstatedir}/crash
+mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/man8/
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/kdump
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
 install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/sbin/mkdumprd
 install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf
+install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8
 %ifarch %{ix86} x86_64
 install -m 755 makedumpfile/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
 %endif
@@ -138,11 +149,20 @@
 %ifarch %{ix86} x86_64
 %{_libdir}/kexec-tools/kexec_test
 %endif
+%{_mandir}/man8/kexec.8*
 %doc News
 %doc COPYING
 %doc TODO
 
 %changelog
+* Mon Aug 21 2006 Jarod Wilson <jwilson at redhat.com> - 1.101-46%{dist}
+- ppc64 fixups:
+  - actually build ppc64 binaries (bug 203407)
+  - correct usage output
+  - avoid segfault in command-line parsing
+- install kexec man page
+- use regulation Fedora BuildRoot
+
 * Fri Aug 18 2006 Neil Horman <nhorman at redhat.com> - 1.101-45%{dist}
 - fixed typo in mkdumprd for bz 202983
 - fixed typo in mkdumprd for bz 203053


--- kexec-ppc64-ingnore-args-linux.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 22 14:26:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 10:26:14 -0400
Subject: rpms/syslinux/devel syslinux.spec,1.36,1.37
Message-ID: <200608221426.k7MEQESv027502@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/syslinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27414

Modified Files:
	syslinux.spec 
Log Message:
obsolete syslinux-devel


Index: syslinux.spec
===================================================================
RCS file: /cvs/dist/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- syslinux.spec	14 Jul 2006 21:34:29 -0000	1.36
+++ syslinux.spec	22 Aug 2006 14:26:10 -0000	1.37
@@ -2,7 +2,7 @@
 Name: syslinux
 Version: 3.11
 %define tarball_version 3.11
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2
@@ -10,8 +10,8 @@
 Patch1: syslinux-3.07-gcc4.patch
 Patch2: syslinux-3.11-time.patch
 ExclusiveArch: i386 x86_64
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: nasm >= 0.98.38-1, perl, netpbm-progs
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: nasm >= 0.98.38-1, perl, netpbm-progs
 BuildRequires: /usr/include/gnu/stubs-32.h
 Autoreq: 0
 %ifarch i386
@@ -20,6 +20,7 @@
 %ifarch x86_64
 Requires: mtools, libc.so.6()(64bit)
 %endif
+Obsoletes: syslinux-devel < %{version}-%{release}
 Provides: syslinux-devel
 
 # NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
@@ -70,7 +71,7 @@
 rm -f %{buildroot}%{_includedir}/syslinux.h
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -95,6 +96,10 @@
 %{_prefix}/lib/syslinux/com32
 
 %changelog
+* Tue Aug 22 2006 Jesse Keating <jkeating at redhat.com> - 3.11-4
+- Obsolete syslinux-devel.
+- Couple cleanups for packaging guidelines
+
 * Fri Jul 14 2006 David Cantrell <dcantrell at redhat.com> - 3.11-3
 - Remove com32/include/time.h and com32/include/sys/times.h
 - Replace CLK_TCK macros with CLOCKS_PER_SEC



From fedora-cvs-commits at redhat.com  Tue Aug 22 14:51:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 10:51:50 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.22, 1.23 setroubleshoot.spec,
	1.27, 1.28 sources, 1.25, 1.26
Message-ID: <200608221451.k7MEpol4016385@cvs.devel.redhat.com>

Author: jdennis

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16344/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.29-1 on branch devel from setroubleshoot-0.29-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	21 Aug 2006 23:13:34 -0000	1.22
+++ .cvsignore	22 Aug 2006 14:51:47 -0000	1.23
@@ -1 +1 @@
-setroubleshoot-0.28.tar.gz
+setroubleshoot-0.29.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- setroubleshoot.spec	21 Aug 2006 23:13:34 -0000	1.27
+++ setroubleshoot.spec	22 Aug 2006 14:51:47 -0000	1.28
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.28
+Version: 0.29
 Release: 1
 License: GPL
 Group: Applications/System
@@ -25,6 +25,7 @@
 %define pkglogdir     %{_localstatedir}/log/%{name}
 
 Requires: audit >= audit-1.2.5-7
+Requires: audit-libs-python
 Requires: libselinux >= 1.30.15-1
 Requires: pygtk2 >= 2.9.2
 Requires: notify-python
@@ -106,6 +107,14 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Tue Aug 22 2006 John Dennis <jdennis at redhat.com> - 0.29-1
+	* fix bug #203479, missing requires of audit-libs-python
+
+	* add support to sealert to listen on a dbus session signal to display
+	the gui. This is needed for when the status icon is not visible and
+	the user wants to see the UI. There is now a seperate program
+	setroubleshoot_launch_gui which emits the signal.
+	
 * Mon Aug 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.28-1
 - Fix allow_execmem.py file 
 - Add translations


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	21 Aug 2006 23:13:34 -0000	1.25
+++ sources	22 Aug 2006 14:51:47 -0000	1.26
@@ -1 +1 @@
-e6f3ed798762c9ebe6517d67c81801a9  setroubleshoot-0.28.tar.gz
+26d9cffe6c74c19b35ba7cba281c926e  setroubleshoot-0.29.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 22 14:52:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 10:52:12 -0400
Subject: rpms/tzdata/devel .cvsignore, 1.26, 1.27 sources, 1.28,
	1.29 tzdata.spec, 1.33, 1.34
Message-ID: <200608221452.k7MEqCJQ016558@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/tzdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16455

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
- Upstream 2006j
  - Honduras stopped observing DST on Monday at 00:00
  - America/Bermuda will follow the US's lead next year
  - America/Moncton will use US-style rules next year
  - New Zone America/Blanc-Sablon, for Canadians who observe AST all
    year
  - New zone: America/Atikokan instead of America/Coral_Harbour
  - New zones: Europe/Jersey, Europe/Guernsey, Europe/Isle_of_Man
  - Historical changes
  - Commentary updates
- Upstream 2006i
  - localtime.c fixes
- Upstream 2006h
  - zic leapsecond fix



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	11 May 2006 08:33:03 -0000	1.26
+++ .cvsignore	22 Aug 2006 14:52:10 -0000	1.27
@@ -1,3 +1,3 @@
-tzcode2006g.tar.gz
-tzdata2006g.tar.gz
+tzcode2006j.tar.gz
+tzdata2006j.tar.gz
 tzdata-base-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	11 May 2006 08:33:03 -0000	1.28
+++ sources	22 Aug 2006 14:52:10 -0000	1.29
@@ -1,3 +1,3 @@
-4091e3f764a296b476bb77cf8eda01c7  tzcode2006g.tar.gz
-fed13df17e2e386f4c31b0962d3ed356  tzdata2006g.tar.gz
+0920ba0a68ab02681fe390dbc2a9c33d  tzcode2006j.tar.gz
+fef20ce476ec31b6c5a760eed3b358c0  tzdata2006j.tar.gz
 906a4c98cc5240f416524a256b039c42  tzdata-base-0.tar.bz2


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- tzdata.spec	12 Jul 2006 08:35:07 -0000	1.33
+++ tzdata.spec	22 Aug 2006 14:52:10 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006g
-Release: 1.1
+Version: 2006j%{?dist}
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: tzdata-base-0.tar.bz2
@@ -48,6 +48,22 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Tue Aug 22 2006 Petr Machata <pmachata at redhat.com> - 2006j-1
+- Upstream 2006j
+  - Honduras stopped observing DST on Monday at 00:00
+  - America/Bermuda will follow the US's lead next year
+  - America/Moncton will use US-style rules next year
+  - New Zone America/Blanc-Sablon, for Canadians who observe AST all
+    year
+  - New zone: America/Atikokan instead of America/Coral_Harbour
+  - New zones: Europe/Jersey, Europe/Guernsey, Europe/Isle_of_Man
+  - Historical changes
+  - Commentary updates
+- Upstream 2006i
+  - localtime.c fixes
+- Upstream 2006h
+  - zic leapsecond fix
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2006g-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 14:52:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 10:52:50 -0400
Subject: rpms/transfig/FC-5 transfig.spec,1.20,1.21
Message-ID: <200608221452.k7MEqoih016819@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/transfig/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16788

Modified Files:
	transfig.spec 
Log Message:
- Require ghostscript; fig2dev calls it.


Index: transfig.spec
===================================================================
RCS file: /cvs/dist/rpms/transfig/FC-5/transfig.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- transfig.spec	11 Feb 2006 05:53:18 -0000	1.20
+++ transfig.spec	22 Aug 2006 14:52:48 -0000	1.21
@@ -17,6 +17,8 @@
 Patch3: transfig-3.2.4-badc.patch
 Patch4: transfig.3.2.4-rgb.patch
 
+Requires:	ghostscript
+
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
 BuildRequires: %{imake}
@@ -82,6 +84,9 @@
 %{xfig_libdir}
 
 %changelog
+* Tue Aug 22 2006 Stepan Kasal <skasal at redhat.com> - 1:3.2.4-13.3
+- Require ghostscript; fig2dev calls it.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.4-13.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 14:57:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 10:57:40 -0400
Subject: rpms/tzdata/devel tzdata.spec,1.34,1.35
Message-ID: <200608221457.k7MEvebK018759@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/tzdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18703

Modified Files:
	tzdata.spec 
Log Message:
fix tag



Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- tzdata.spec	22 Aug 2006 14:52:10 -0000	1.34
+++ tzdata.spec	22 Aug 2006 14:57:38 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006j%{?dist}
-Release: 1
+Version: 2006j
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: tzdata-base-0.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 14:58:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 10:58:39 -0400
Subject: rpms/xkeyboard-config/devel
	xkeyboard-config-0.8-composify-ralt.patch, NONE,
	1.1 xkeyboard-config.spec, 1.2, 1.3
Message-ID: <200608221458.k7MEwdat019187@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xkeyboard-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19155

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-0.8-composify-ralt.patch 
Log Message:
* Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 0.8-3
- Add Compose semantics to right Alt when that's ISO_Level3_Shift (#193922)


xkeyboard-config-0.8-composify-ralt.patch:
 level3 |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE xkeyboard-config-0.8-composify-ralt.patch ---
--- xkeyboard-config-0.8/symbols/level3.bak	2006-08-15 11:16:23.000000000 +0200
+++ xkeyboard-config-0.8/symbols/level3	2006-08-15 11:45:34.000000000 +0200
@@ -10,11 +10,15 @@
 // third engraved symbol
 default partial modifier_keys
 xkb_symbols "ralt_switch" {
-  key <RALT> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
-    };
-  modifier_map Mod5   { ISO_Level3_Shift };
+  // key <RALT> {
+    // type[Group1]="ONE_LEVEL",
+    // symbols[Group1] = [ ISO_Level3_Shift ]
+    // };
+  // modifier_map Mod5   { ISO_Level3_Shift };
+    key <RALT>  { type[Group1]="TWO_LEVEL",
+                  [ ISO_Level3_Shift, Multi_key ]   };
+    modifier_map Mod5   { <RALT> };
+
 };
 
 // special case or right Alt switch - for use with grp:alts_toggle


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/dist/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xkeyboard-config.spec	7 Jul 2006 22:55:18 -0000	1.2
+++ xkeyboard-config.spec	22 Aug 2006 14:58:36 -0000	1.3
@@ -4,13 +4,14 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 0.8
-Release: 2
+Release: 3
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
+Patch0: xkeyboard-config-0.8-composify-ralt.patch
 
 BuildArch: noarch
 
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .composify-ralt
 
 %build
 %configure \
@@ -74,6 +76,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 0.8-3
+- Add Compose semantics to right Alt when that's ISO_Level3_Shift (#193922)
+
 * Fri Jul 07 2006 Mike A. Harris <mharris at redhat.com> 0.8-2
 - Rename spec file from xorg-x11-xkbdata to xkeyboard-config.spec
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 15:03:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 11:03:15 -0400
Subject: rpms/tzdata/FC-5 .cvsignore, 1.25, 1.26 sources, 1.27,
	1.28 tzdata.spec, 1.31, 1.32
Message-ID: <200608221503.k7MF3Fuk020296@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/tzdata/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20237

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
- Upstream 2006j
  - Honduras stopped observing DST on Monday at 00:00
  - America/Bermuda will follow the US's lead next year
  - America/Moncton will use US-style rules next year
  - New Zone America/Blanc-Sablon, for Canadians who observe AST all
    year
  - New zone: America/Atikokan instead of America/Coral_Harbour
  - New zones: Europe/Jersey, Europe/Guernsey, Europe/Isle_of_Man
  - Historical changes
  - Commentary updates
- Upstream 2006i
  - localtime.c fixes
- Upstream 2006h
  - zic leapsecond fix



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	11 May 2006 08:37:20 -0000	1.25
+++ .cvsignore	22 Aug 2006 15:03:10 -0000	1.26
@@ -1,3 +1,3 @@
-tzcode2006g.tar.gz
-tzdata2006g.tar.gz
+tzcode2006j.tar.gz
+tzdata2006j.tar.gz
 tzdata-base-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	11 May 2006 08:37:20 -0000	1.27
+++ sources	22 Aug 2006 15:03:10 -0000	1.28
@@ -1,3 +1,3 @@
-4091e3f764a296b476bb77cf8eda01c7  tzcode2006g.tar.gz
-fed13df17e2e386f4c31b0962d3ed356  tzdata2006g.tar.gz
+0920ba0a68ab02681fe390dbc2a9c33d  tzcode2006j.tar.gz
+fef20ce476ec31b6c5a760eed3b358c0  tzdata2006j.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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- tzdata.spec	11 May 2006 08:37:20 -0000	1.31
+++ tzdata.spec	22 Aug 2006 15:03:10 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006g
-Release: 1.fc5
+Version: 2006j
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: tzdata-base-0.tar.bz2
@@ -17,7 +17,7 @@
 the world.
 
 %prep
-%setup -n %{name}
+%setup -n tzdata
 mkdir %{name}%{version}
 tar xzf %{SOURCE1} -C %{name}%{version}
 mkdir tzcode%{version}
@@ -48,6 +48,22 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Tue Aug 22 2006 Petr Machata <pmachata at redhat.com> - 2006j-1
+- Upstream 2006j
+  - Honduras stopped observing DST on Monday at 00:00
+  - America/Bermuda will follow the US's lead next year
+  - America/Moncton will use US-style rules next year
+  - New Zone America/Blanc-Sablon, for Canadians who observe AST all
+    year
+  - New zone: America/Atikokan instead of America/Coral_Harbour
+  - New zones: Europe/Jersey, Europe/Guernsey, Europe/Isle_of_Man
+  - Historical changes
+  - Commentary updates
+- Upstream 2006i
+  - localtime.c fixes
+- Upstream 2006h
+  - zic leapsecond fix
+
 * Thu May 11 2006 Petr Machata <pmachata at redhat.com> - 2006g-1.fc5
 - Upstream 2006g
   - Honduras chose to follow Guatemala and will observe DST May/6 to Sep/2



From fedora-cvs-commits at redhat.com  Tue Aug 22 15:07:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 11:07:42 -0400
Subject: rpms/tzdata/FC-4 .cvsignore, 1.20, 1.21 sources, 1.21,
	1.22 tzdata.spec, 1.23, 1.24
Message-ID: <200608221507.k7MF7gnj021175@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/tzdata/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv21089

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
- Upstream 2006j
  - Honduras stopped observing DST on Monday at 00:00
  - America/Bermuda will follow the US's lead next year
  - America/Moncton will use US-style rules next year
  - New Zone America/Blanc-Sablon, for Canadians who observe AST all
    year
  - New zone: America/Atikokan instead of America/Coral_Harbour
  - New zones: Europe/Jersey, Europe/Guernsey, Europe/Isle_of_Man
  - Historical changes
  - Commentary updates
- Upstream 2006i
  - localtime.c fixes
- Upstream 2006h
  - zic leapsecond fix



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-4/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	11 May 2006 08:44:48 -0000	1.20
+++ .cvsignore	22 Aug 2006 15:07:37 -0000	1.21
@@ -1,3 +1,3 @@
-tzcode2006g.tar.gz
-tzdata2006g.tar.gz
+tzcode2006j.tar.gz
+tzdata2006j.tar.gz
 tzdata-base-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-4/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	11 May 2006 08:44:48 -0000	1.21
+++ sources	22 Aug 2006 15:07:37 -0000	1.22
@@ -1,3 +1,3 @@
-4091e3f764a296b476bb77cf8eda01c7  tzcode2006g.tar.gz
-fed13df17e2e386f4c31b0962d3ed356  tzdata2006g.tar.gz
+0920ba0a68ab02681fe390dbc2a9c33d  tzcode2006j.tar.gz
+fef20ce476ec31b6c5a760eed3b358c0  tzdata2006j.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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tzdata.spec	11 May 2006 08:44:48 -0000	1.23
+++ tzdata.spec	22 Aug 2006 15:07:37 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006g
-Release: 1.fc4
+Version: 2006j
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: tzdata-base-0.tar.bz2
@@ -17,7 +17,7 @@
 the world.
 
 %prep
-%setup -n %{name}
+%setup -n tzdata
 mkdir %{name}%{version}
 tar xzf %{SOURCE1} -C %{name}%{version}
 mkdir tzcode%{version}
@@ -48,6 +48,22 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Tue Aug 22 2006 Petr Machata <pmachata at redhat.com> - 2006j-1
+- Upstream 2006j
+  - Honduras stopped observing DST on Monday at 00:00
+  - America/Bermuda will follow the US's lead next year
+  - America/Moncton will use US-style rules next year
+  - New Zone America/Blanc-Sablon, for Canadians who observe AST all
+    year
+  - New zone: America/Atikokan instead of America/Coral_Harbour
+  - New zones: Europe/Jersey, Europe/Guernsey, Europe/Isle_of_Man
+  - Historical changes
+  - Commentary updates
+- Upstream 2006i
+  - localtime.c fixes
+- Upstream 2006h
+  - zic leapsecond fix
+
 * Thu May 11 2006 Petr Machata <pmachata at redhat.com> - 2006g-1.fc4
 - Upstream 2006g
   - Honduras chose to follow Guatemala and will observe DST May/6 to Sep/2



From fedora-cvs-commits at redhat.com  Tue Aug 22 15:07:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 11:07:48 -0400
Subject: rpms/gamin/devel gamin-stdin-devnull.patch, NONE, 1.1 gamin.spec,
	1.47, 1.48
Message-ID: <200608221507.k7MF7mgT021216@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gamin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21161

Modified Files:
	gamin.spec 
Added Files:
	gamin-stdin-devnull.patch 
Log Message:
* Tue Aug 22 2006 Alexander Larsson <alexl at redhat.com> - 0.1.7-2
- Use /dev/null as stdin/out/err when spawning gam_server
- This could help if there is stdout output somewhere.



gamin-stdin-devnull.patch:
 gam_fork.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+)

--- NEW FILE gamin-stdin-devnull.patch ---
Index: libgamin/gam_fork.c
===================================================================
RCS file: /cvs/gnome/gamin/libgamin/gam_fork.c,v
retrieving revision 1.11
diff -u -p -r1.11 gam_fork.c
--- libgamin/gam_fork.c	27 Oct 2005 10:58:50 -0000	1.11
+++ libgamin/gam_fork.c	22 Aug 2006 14:59:11 -0000
@@ -67,6 +67,7 @@ gamin_fork_server(const char *fam_client
     /* Become a daemon */
     pid = fork();
     if (pid == 0) {
+	int fd;
         long open_max;
 	long i;
 
@@ -75,6 +76,20 @@ gamin_fork_server(const char *fam_client
 	for (i = 0; i < open_max; i++)
 	    fcntl (i, F_SETFD, FD_CLOEXEC);
 
+	/* /dev/null for stdin, stdout, stderr */
+	fd = open ("/dev/null", O_RDONLY);
+	if (fd != -1) {
+	    dup2 (fd, 0);
+	    close (fd);
+	}
+	
+	fd = open ("/dev/null", O_WRONLY);
+	if (fd != -1) {
+	    dup2 (fd, 1);
+	    dup2 (fd, 2);
+	    close (fd);
+	}
+	
         setsid();
         if (fork() == 0) {
 #ifdef HAVE_SETENV


Index: gamin.spec
===================================================================
RCS file: /cvs/dist/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gamin.spec	16 Aug 2006 15:17:45 -0000	1.47
+++ gamin.spec	22 Aug 2006 15:07:45 -0000	1.48
@@ -12,6 +12,7 @@
 BuildRequires: glib2-devel python python-devel
 
 Patch1:         gamin-dont-close-fd.patch
+Patch2:         gamin-stdin-devnull.patch
 
 %description
 This C library provides an API and ABI compatible file alteration
@@ -45,6 +46,7 @@
 %setup -q
 
 %patch1 -p0 -b .dont-close-fd
+%patch2 -p0 -b .stdin-devnull
 
 %build
 %configure
@@ -92,6 +94,10 @@
 %doc doc/python.html
 
 %changelog
+* Tue Aug 22 2006 Alexander Larsson <alexl at redhat.com> - 0.1.7-2
+- Use /dev/null as stdin/out/err when spawning gam_server
+- This could help if there is stdout output somewhere.
+
 * Wed Aug 16 2006 Alexander Larsson <alexl at redhat.com> - 0.1.7-2
 - Add patch that avoids closing the fd after FAMOpen, fixes some 100% cpu bugs
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 15:08:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 11:08:31 -0400
Subject: rpms/tzdata/FC-4 tzdata.spec,1.24,1.25
Message-ID: <200608221508.k7MF8VJk021518@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/tzdata/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv21466

Modified Files:
	tzdata.spec 
Log Message:
fix tag



Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-4/tzdata.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tzdata.spec	22 Aug 2006 15:07:37 -0000	1.24
+++ tzdata.spec	22 Aug 2006 15:08:29 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2006j
-Release: 1%{?dist}
+Release: 1.fc4
 License: GPL
 Group: System Environment/Base
 Source0: tzdata-base-0.tar.bz2
@@ -48,7 +48,7 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
-* Tue Aug 22 2006 Petr Machata <pmachata at redhat.com> - 2006j-1
+* Tue Aug 22 2006 Petr Machata <pmachata at redhat.com> - 2006j-1.fc4
 - Upstream 2006j
   - Honduras stopped observing DST on Monday at 00:00
   - America/Bermuda will follow the US's lead next year



From fedora-cvs-commits at redhat.com  Tue Aug 22 15:10:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 11:10:33 -0400
Subject: rpms/gamin/devel gamin.spec,1.48,1.49
Message-ID: <200608221510.k7MFAXka001864@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gamin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22607

Modified Files:
	gamin.spec 
Log Message:
bump version



Index: gamin.spec
===================================================================
RCS file: /cvs/dist/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gamin.spec	22 Aug 2006 15:07:45 -0000	1.48
+++ gamin.spec	22 Aug 2006 15:10:31 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -94,7 +94,7 @@
 %doc doc/python.html
 
 %changelog
-* Tue Aug 22 2006 Alexander Larsson <alexl at redhat.com> - 0.1.7-2
+* Tue Aug 22 2006 Alexander Larsson <alexl at redhat.com> - 0.1.7-3
 - Use /dev/null as stdin/out/err when spawning gam_server
 - This could help if there is stdout output somewhere.
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 15:12:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 11:12:29 -0400
Subject: rpms/cman/devel .cvsignore, 1.16, 1.17 cman.spec, 1.68, 1.69 sources,
	1.25, 1.26
Message-ID: <200608221512.k7MFCTkJ021707@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19607

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
New upsteram sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	16 Aug 2006 20:19:07 -0000	1.16
+++ .cvsignore	22 Aug 2006 15:12:27 -0000	1.17
@@ -1 +1 @@
-cman-2.0.10.tar.gz
+cman-2.0.11.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- cman.spec	16 Aug 2006 20:19:07 -0000	1.68
+++ cman.spec	22 Aug 2006 15:12:27 -0000	1.69
@@ -10,7 +10,7 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.10
+%define cman_minor 0.11
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
@@ -114,6 +114,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Aug 22 2006 Chris Feist <cfeist at redhat.com> - 2.0.11-1
+- Rebuild w/ new upstream sources
+
 * Wed Aug 16 2006 Chris Feist <cfeist at redhat.com> - 2.0.10-1
 - Rebuild w/ new upstream sources
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	16 Aug 2006 20:19:07 -0000	1.25
+++ sources	22 Aug 2006 15:12:27 -0000	1.26
@@ -1 +1 @@
-5a66a831b45f4dd5a0c27209dc613e2c  cman-2.0.10.tar.gz
+123beab7cffaf7fd771e278fcdb04cc6  cman-2.0.11.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 22 15:27:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 11:27:32 -0400
Subject: rpms/file-roller/devel file-roller.spec,1.70,1.71
Message-ID: <200608221527.k7MFRW5A016368@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16355

Modified Files:
	file-roller.spec 
Log Message:
add %%preun



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- file-roller.spec	21 Aug 2006 20:24:23 -0000	1.70
+++ file-roller.spec	22 Aug 2006 15:27:30 -0000	1.71
@@ -11,7 +11,7 @@
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
 Version:	2.15.93
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 License:	GPL
 Group:		Applications/Archiving
@@ -90,15 +90,18 @@
 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
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/file-roller.schemas 2>&1 >/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
 
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/file-roller.schemas 2>&1 >/dev/null
+fi
+
 %postun
 update-desktop-database -q
 scrollkeeper-update -q
@@ -120,6 +123,10 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Tue Aug 22 2006 Matthias Clasen <mclasen at rehdat.com> - 2.15.93-2.fc6
+- Add a %%preun script
+- Silence %%post and %%preun
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.93-1.fc6
 - Update to 2.15.93
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 15:34:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 11:34:18 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-ppc64-platform-fix.patch,
	NONE, 1.1 kexec-tools.spec, 1.55, 1.56
Message-ID: <200608221534.k7MFYHCJ016561@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16545

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-ppc64-platform-fix.patch 
Log Message:
fix for removal of linux,platform in recent ppc64 kernels

kexec-tools-1.101-ppc64-platform-fix.patch:
 kexec-ppc64.c |   55 +++++++++++++++----------------------------------------
 1 files changed, 15 insertions(+), 40 deletions(-)

--- NEW FILE kexec-tools-1.101-ppc64-platform-fix.patch ---

In recent kernels, the plaform property is removed from the /proc/device-tree.
This property is used to determine whether the platform is LPAR or non-lpar,
and reads htab-* and tce-* properties based on the platform. Fixed this issue
such that read these properties if exists, otherwise continue instead of
exiting with an error message.

Signed-off-by: David Wilder <dwilder at us.ibm.com>
Signed-off-by: Haren Myneni <haren at us.ibm.com>
---
 kexec/arch/ppc64/kexec-ppc64.c |   55 +++++++++++------------------------------
 1 file changed, 15 insertions(+), 40 deletions(-)

Index: kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c
===================================================================
--- kexec-tools-1.101.orig/kexec/arch/ppc64/kexec-ppc64.c
+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c
@@ -34,13 +34,8 @@
 #include "crashdump-ppc64.h"
 #include <arch/options.h>
 
-/* Platforms supported by kexec on PPC64 */
-#define PLATFORM_PSERIES	0x0100
-#define PLATFORM_PSERIES_LPAR	0x0101
-
 static struct exclude_range exclude_range[MAX_MEMORY_RANGES];
 static unsigned long long rmo_top;
-static unsigned int platform;
 static struct memory_range memory_range[MAX_MEMORY_RANGES];
 static struct memory_range base_memory_range[MAX_MEMORY_RANGES];
 unsigned long long memory_max = 0;
@@ -201,26 +196,6 @@ static int get_devtree_details(unsigned 
 		}
 
 		if (strncmp(dentry->d_name, "chosen", 6) == 0) {
-			/* get platform details from /chosen node */
-			strcat(fname, "/linux,platform");
-			if ((file = fopen(fname, "r")) == NULL) {
-				perror(fname);
-				closedir(cdir);
-				closedir(dir);
-				return -1;
-			}
-			if (fread(&platform, sizeof(int), 1, file) != 1) {
-				perror(fname);
-				fclose(file);
-				closedir(cdir);
-				closedir(dir);
-				return -1;
-			}
-			fclose(file);
-
-			memset(fname, 0, sizeof(fname));
-			strcpy(fname, device_tree);
-			strcat(fname, dentry->d_name);
 			strcat(fname, "/linux,kernel-end");
 			if ((file = fopen(fname, "r")) == NULL) {
 				perror(fname);
@@ -291,18 +266,18 @@ static int get_devtree_details(unsigned 
 				reserve(KDUMP_BACKUP_LIMIT, crash_base-KDUMP_BACKUP_LIMIT);
 			}
 
-			/* if LPAR, no need to read any more from /chosen */
-			if (platform != PLATFORM_PSERIES) {
-				closedir(cdir);
-				continue;
-			}
 			memset(fname, 0, sizeof(fname));
 			strcpy(fname, device_tree);
 			strcat(fname, dentry->d_name);
 			strcat(fname, "/linux,htab-base");
 			if ((file = fopen(fname, "r")) == NULL) {
-				perror(fname);
 				closedir(cdir);
+				if (errno == ENOENT) {
+					/* Non LPAR */
+					errno = 0;
+					continue;
+                                }
+				perror(fname);
 				closedir(dir);
 				return -1;
 			}
@@ -394,23 +369,23 @@ static int get_devtree_details(unsigned 
 			}
 			rmo_base = ((unsigned long long *)buf)[0];
 			rmo_top = rmo_base + ((unsigned long long *)buf)[1];
-			if (platform == PLATFORM_PSERIES) {
-				if (rmo_top > 0x30000000UL)
-					rmo_top = 0x30000000UL;
-			}
+			if (rmo_top > 0x30000000UL)
+				rmo_top = 0x30000000UL;
+
 			fclose(file);
 			closedir(cdir);
 		} /* memory */
 
 		if (strncmp(dentry->d_name, "pci@", 4) == 0) {
-			if (platform != PLATFORM_PSERIES) {
-				closedir(cdir);
-				continue;
-			}
 			strcat(fname, "/linux,tce-base");
 			if ((file = fopen(fname, "r")) == NULL) {
-				perror(fname);
 				closedir(cdir);
+				if (errno == ENOENT) {
+					/* Non LPAR */
+					errno = 0;
+					continue;
+				}
+				perror(fname);
 				closedir(dir);
 				return -1;
 			}


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kexec-tools.spec	22 Aug 2006 14:18:04 -0000	1.55
+++ kexec-tools.spec	22 Aug 2006 15:34:14 -0000	1.56
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 46%{dist}
+Release: 47%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -37,6 +37,7 @@
 Patch301: kexec-tools-1.101-ppc64-ignore-args.patch
 Patch302: kexec-tools-1.101-ppc64-usage.patch
 Patch303: kexec-tools-1.101-ppc64-cliargs.patch
+Patch304: kexec-tools-1.101-ppc64-platform-fix.patch
 
 #
 # Patches 401 through 500 are meant for s390 kexec-tools enablement
@@ -74,6 +75,7 @@
 %patch301 -p1
 %patch302 -p1
 %patch303 -p1
+%patch304 -p1
 %patch401 -p1
 %patch501 -p1
 %patch601 -p1
@@ -155,6 +157,9 @@
 %doc TODO
 
 %changelog
+* Tue Aug 22 2006 Jarod Wilson <jwilson at redhat.com> - 1.101-47%{dist}
+- ppc64 no-more-platform fix
+
 * Mon Aug 21 2006 Jarod Wilson <jwilson at redhat.com> - 1.101-46%{dist}
 - ppc64 fixups:
   - actually build ppc64 binaries (bug 203407)



From fedora-cvs-commits at redhat.com  Tue Aug 22 15:55:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 11:55:14 -0400
Subject: rpms/gnome-applets/devel .cvsignore, 1.42, 1.43 gnome-applets.spec,
	1.166, 1.167 sources, 1.43, 1.44
Message-ID: <200608221555.k7MFtE6P002954@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2611

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.15.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	13 Aug 2006 04:41:12 -0000	1.42
+++ .cvsignore	22 Aug 2006 15:55:12 -0000	1.43
@@ -5,3 +5,4 @@
 gnome-applets-2.15.1.1.tar.bz2
 gnome-applets-2.15.2.tar.bz2
 gnome-applets-2.15.3.tar.bz2
+gnome-applets-2.15.90.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gnome-applets.spec	18 Aug 2006 17:36:57 -0000	1.166
+++ gnome-applets.spec	22 Aug 2006 15:55:12 -0000	1.167
@@ -27,10 +27,12 @@
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define build_stickynotes 0
+
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
-Version: 	2.15.3
-Release:  	2%{?dist}
+Version: 	2.15.90
+Release:  	1%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -40,12 +42,7 @@
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.15.1.1-cpufreq.patch
-Patch10:	gnome-applets-2.15.1.1-invest.patch
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
-Patch13:        gnome-applets-2.15.1.1-destroy-on-close.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=351956 
-Patch14: 	gnome-applets-2.15.3-invest-gconf.patch
 
 URL:		http://www.gnome.org/
 
@@ -109,6 +106,8 @@
 Obsoletes:      battstat_applet
 Obsoletes:      gnome-cpufreq-applet
 
+# since we are installing .pc files
+Requires: pkgconfig
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -121,10 +120,7 @@
 %patch0 -p1 -b .use-old-modemlights
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
-%patch10 -p1 -b .invest
 %patch11 -p1 -b .dont-require-display
-%patch13 -p1 -b .destroy-on-close
-%patch14 -p1 -b .invest-gconf
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -186,7 +182,6 @@
 fi
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-
 gconftool-2 --makefile-install-rule                                        \
 	    %{_sysconfdir}/gconf/schemas/battstat.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/charpick.schemas                  \
@@ -199,10 +194,33 @@
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
 	    %{_sysconfdir}/gconf/schemas/mixer.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/modemlights.schemas               \
-	    %{_sysconfdir}/gconf/schemas/multiload.schemas                 \
-	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas > /dev/null
+%if %{build_stickynotes}
+	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
+%endif
+	    %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
 %{_libexecdir}/gnome-applets/mc-install-default-macros > /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/battstat.schemas                  \
+	    %{_sysconfdir}/gconf/schemas/charpick.schemas                  \
+	    %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas            \
+	    %{_sysconfdir}/gconf/schemas/drivemount.schemas                \
+	    %{_sysconfdir}/gconf/schemas/geyes.schemas                     \
+	    %{_sysconfdir}/gconf/schemas/gswitchit.schemas                 \
+	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
+	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
+	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
+	    %{_sysconfdir}/gconf/schemas/mixer.schemas                     \
+	    %{_sysconfdir}/gconf/schemas/modemlights.schemas               \
+%if %{build_stickynotes}
+	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
+%endif
+	    %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
+fi
+
 %postun 
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor
@@ -215,7 +233,12 @@
 
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_datadir}/pixmaps
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/22x22/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/32x32/apps/*
 %{_datadir}/icons/hicolor/48x48/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/gnome
 %{_datadir}/gnome-applets
@@ -241,7 +264,11 @@
 %{_libexecdir}/modemlights_applet2
 %{_libexecdir}/multiload-applet-2
 %{_libexecdir}/null_applet
+
+%if %{build_stickynotes}
 %{_libexecdir}/stickynotes_applet
+%endif
+
 %{_libexecdir}/trashapplet
 %{_libexecdir}/invest-applet
 %{_sbindir}/*
@@ -258,6 +285,17 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Tue Aug 22 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-1.fc6
+- Update to 2.15.90
+- Drop upstreamed patches
+- Add a %%preun script
+- Require pkgconfig
+- Drop sticky-notes in favour of tomboy 
+  *** docs ***: Tomboy supports importing sticky notes. Currently
+  that requires a manual step by the user. This should be pointed
+  out in the release notes (unless we can convince upstream to make
+  this automatic)
+
 * Fri Aug 18 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.3-2.fc6
 - Make the invest applet work
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	13 Aug 2006 04:41:16 -0000	1.43
+++ sources	22 Aug 2006 15:55:12 -0000	1.44
@@ -1,3 +1,2 @@
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
-f7693a0780fe4b288c62c25d410395a9  gnome-applets-2.15.2.tar.bz2
-88814125b056b32d7d34b8ac75cfbf7e  gnome-applets-2.15.3.tar.bz2
+421eda161541b42d42ea04c59b9ee4f1  gnome-applets-2.15.90.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 16:06:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 12:06:09 -0400
Subject: rpms/foomatic/devel foomatic-driver-names.patch,NONE,1.1
Message-ID: <200608221606.k7MG69wl013636@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13606

Added Files:
	foomatic-driver-names.patch 
Log Message:
Add patch.

foomatic-driver-names.patch:
 foomatic-ppdfile.in |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletion(-)

--- NEW FILE foomatic-driver-names.patch ---
--- foomatic-db-engine-3.0-20060421/foomatic-ppdfile.in.driver-names	2006-08-03 12:38:34.000000000 +0100
+++ foomatic-db-engine-3.0-20060421/foomatic-ppdfile.in	2006-08-03 12:40:52.000000000 +0100
@@ -158,7 +158,27 @@
     my ($ppduri, $driver) = @_;
     my $poid;
 
-    if ($ppduri =~ /^$progname:([^-]+-.+)-([^-]+)\.ppd/) {
+    if ($ppduri =~ /^$progname:([^-]+-.+)-(gimp-print)\.ppd/) {
+	# cups-driverd operation
+	$poid   = $1;
+	$driver = $2;
+    } elsif ($ppduri =~ /^$progname:([^-]+-.+)-(gimp-print-ijs)\.ppd/) {
+	# cups-driverd operation
+	$poid   = $1;
+	$driver = $2;
+    } elsif ($ppduri =~ /^$progname:([^-]+-.+)-(hpijs-rss)\.ppd/) {
+	# cups-driverd operation
+	$poid   = $1;
+	$driver = $2;
+    } elsif ($ppduri =~ /^$progname:([^-]+-.+)-(eplaser-jp)\.ppd/) {
+	# cups-driverd operation
+	$poid   = $1;
+	$driver = $2;
+    } elsif ($ppduri =~ /^$progname:([^-]+-.+)-(lxm3200-tweaked)\.ppd/) {
+	# cups-driverd operation
+	$poid   = $1;
+	$driver = $2;
+    } elsif ($ppduri =~ /^$progname:([^-]+-.+)-([^-]+)\.ppd/) {
 	# cups-driverd operation
 	$poid   = $1;
 	$driver = $2;



From fedora-cvs-commits at redhat.com  Tue Aug 22 16:22:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 12:22:32 -0400
Subject: rpms/pam_ccreds/devel pam_ccreds.spec,1.17,1.18
Message-ID: <200608221622.k7MGMWBk032292@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam_ccreds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32254

Modified Files:
	pam_ccreds.spec 
Log Message:
* Tue Aug 22 2006 Tomas Mraz <tmraz at redhat.com> - 3-5
- add cc_test and cc_dump utilities



Index: pam_ccreds.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pam_ccreds.spec	21 Jul 2006 12:09:01 -0000	1.17
+++ pam_ccreds.spec	22 Aug 2006 16:22:30 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Pam module to cache login credentials
 Name: pam_ccreds
 Version: 3
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -36,6 +36,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+install -m 755 cc_test $RPM_BUILD_ROOT%{_sbindir}
+install -m 755 cc_dump $RPM_BUILD_ROOT%{_sbindir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -44,8 +47,13 @@
 %doc AUTHORS README
 /%{_lib}/security/pam_ccreds.so
 %attr(4755,root,root) %{_sbindir}/ccreds_validate
+%{_sbindir}/cc_test
+%{_sbindir}/cc_dump
 
 %changelog
+* Tue Aug 22 2006 Tomas Mraz <tmraz at redhat.com> - 3-5
+- add cc_test and cc_dump utilities
+
 * Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> - 3-4
 - fixed mistake in chkpwd patch causing update creds to fail
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 16:38:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 12:38:34 -0400
Subject: rpms/foomatic/devel foomatic.spec,1.140,1.141
Message-ID: <200608221638.k7MGcYdT003873@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3819

Modified Files:
	foomatic.spec 
Log Message:
- Change a2ps requirement to mpage.


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- foomatic.spec	7 Aug 2006 09:39:18 -0000	1.140
+++ foomatic.spec	22 Aug 2006 16:38:31 -0000	1.141
@@ -70,7 +70,7 @@
 PreReq: fileutils initscripts
 
 # foomatic-filters checks for a conversion utility (bug #124931).
-BuildRequires: a2ps
+BuildRequires: mpage
 
 # We need ghostscript to have the gimp-print-4.2.0 driver, and hpijs 1.1.
 Conflicts: ghostscript < 7.05
@@ -279,6 +279,7 @@
 
 %changelog
 * Thu Aug  3 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-38
+- Change a2ps requirement to mpage.
 - Make CUPS driver work with drivers containing '-' in their names
   (bug #201398).
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 16:50:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 12:50:39 -0400
Subject: rpms/eject/FC-5 eject-timeout.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 eject.spec, 1.22, 1.23 sources, 1.8,
	1.9 eject-2.1.1-config.patch, 1.1,
	NONE eject-2.1.2-media.patch, 1.1, NONE
Message-ID: <200608221650.k7MGodj9021967@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/eject/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21929

Modified Files:
	.cvsignore eject.spec sources 
Added Files:
	eject-timeout.patch 
Removed Files:
	eject-2.1.1-config.patch eject-2.1.2-media.patch 
Log Message:
- 2.1.5
- fix #203073, made eject use pam
- apply patch to fix timeout issue


eject-timeout.patch:
 eject.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eject-timeout.patch ---
--- eject/eject.c.orig	2006-08-07 16:35:15.000000000 +0200
+++ eject/eject.c	2006-08-07 16:35:54.000000000 +0200
@@ -723,7 +723,7 @@
 	io_hdr.dxfer_len = 0;
 	io_hdr.dxferp = inqBuff;
 	io_hdr.sbp = sense_buffer;
-	io_hdr.timeout = 2000;
+	io_hdr.timeout = 10000;
 
 	io_hdr.cmdp = allowRmBlk;
 	status = ioctl(fd, SG_IO, (void *)&io_hdr);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eject/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Aug 2005 09:34:26 -0000	1.8
+++ .cvsignore	22 Aug 2006 16:50:36 -0000	1.9
@@ -1,3 +1,4 @@
 eject-2.0.13.tar.gz
 eject-2.1.1.tar.gz
 eject-2.1.2.tar.gz
+eject-2.1.5.tar.gz


Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/FC-5/eject.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- eject.spec	11 Feb 2006 02:34:27 -0000	1.22
+++ eject.spec	22 Aug 2006 16:50:36 -0000	1.23
@@ -1,17 +1,20 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
-Version: 2.1.2
-Release: 1.2.1
+Version: 2.1.5
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
-Patch1: eject-2.1.1-config.patch
-Patch2: eject-2.1.1-verbose.patch
-Patch3: eject-2.1.2-media.patch
+Source1: eject.pam
+Patch1: eject-2.1.1-verbose.patch
+Patch2: eject-timeout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 URL: http://www.pobox.com/~tranter
 ExcludeArch: s390 s390x
 BuildRequires: gettext
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: libtool
 
 %description
 The eject program allows the user to eject removable media (typically
@@ -23,10 +26,9 @@
 control.
 
 %prep
-%setup -q
-%patch1 -p1 -b .config
-%patch2 -p1 -b .versbose
-%patch3 -p1 -b .media
+%setup -q -n %{name}
+%patch1 -p1 -b .versbose
+%patch2 -p1 -b .timeout
 
 %build
 %configure
@@ -36,7 +38,20 @@
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
+
+# pam stuff
+install -m 755 -d %{buildroot}/%{_sysconfdir}/pam.d
+install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/%{name}
+
+install -m 755 -d %{buildroot}/%{_sysconfdir}/security/console.apps/
+touch %{buildroot}/%{_sysconfdir}/security/console.apps/%{name}
+
+install -m 755 -d %{buildroot}/%{_sbindir}
+pushd %{buildroot}/%{_bindir}
+mv eject ../sbin
+ln -s consolehelper eject
+popd
 
 %find_lang %{name}
 
@@ -46,10 +61,18 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README TODO COPYING ChangeLog
+%attr(644,root,root) %{_sysconfdir}/security/console.apps/*
+%attr(644,root,root) %{_sysconfdir}/pam.d/*
 %{_bindir}/*
+%{_sbindir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 22 2006 Than Ngo <than at redhat.com> 2.1.5-3
+- 2.1.5
+- fix #203073, made eject use pam 
+- apply patch to fix timeout issue
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.2-1.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eject/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Aug 2005 09:34:26 -0000	1.8
+++ sources	22 Aug 2006 16:50:36 -0000	1.9
@@ -1 +1 @@
-cfdccb93d64869293dd6f5a6f42a8b15  eject-2.1.2.tar.gz
+b96a6d4263122f1711db12701d79f738  eject-2.1.5.tar.gz


--- eject-2.1.1-config.patch DELETED ---


--- eject-2.1.2-media.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 22 16:51:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 12:51:11 -0400
Subject: rpms/eject/FC-5 eject.spec,1.23,1.24
Message-ID: <200608221651.k7MGpBBB022084@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/eject/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22051

Modified Files:
	eject.spec 
Log Message:
- 2.1.5
- fix #203073, made eject use pam
- apply patch to fix timeout issue



Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/FC-5/eject.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- eject.spec	22 Aug 2006 16:50:36 -0000	1.23
+++ eject.spec	22 Aug 2006 16:51:08 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
 Version: 2.1.5
-Release: 3
+Release: 0.1.fc5
 License: GPL
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
@@ -68,7 +68,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Aug 22 2006 Than Ngo <than at redhat.com> 2.1.5-3
+* Tue Aug 22 2006 Than Ngo <than at redhat.com> 2.1.5-0.1.fc5
 - 2.1.5
 - fix #203073, made eject use pam 
 - apply patch to fix timeout issue



From fedora-cvs-commits at redhat.com  Tue Aug 22 16:51:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 12:51:25 -0400
Subject: rpms/eject/FC-5 eject.pam,NONE,1.1
Message-ID: <200608221651.k7MGpPev022175@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/eject/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22133

Added Files:
	eject.pam 
Log Message:
- 2.1.5
- fix #203073, made eject use pam
- apply patch to fix timeout issue



--- NEW FILE eject.pam ---
#%PAM-1.0
auth       sufficient	pam_rootok.so
auth       required	pam_console.so
account    required	pam_permit.so



From fedora-cvs-commits at redhat.com  Tue Aug 22 17:04:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 13:04:19 -0400
Subject: rpms/eject/devel eject.spec,1.26,1.27
Message-ID: <200608221704.k7MH4Jhg025914@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/eject/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25856

Modified Files:
	eject.spec 
Log Message:
made eject use pam



Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/eject.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- eject.spec	7 Aug 2006 14:41:12 -0000	1.26
+++ eject.spec	22 Aug 2006 17:04:13 -0000	1.27
@@ -1,10 +1,11 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
 Version: 2.1.5
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
+Source1: eject.pam
 Patch1: eject-2.1.1-verbose.patch
 Patch2: eject-timeout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -39,6 +40,19 @@
 
 make DESTDIR=%{buildroot} install
 
+# pam stuff
+install -m 755 -d %{buildroot}/%{_sysconfdir}/pam.d
+install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/%{name}
+
+install -m 755 -d %{buildroot}/%{_sysconfdir}/security/console.apps/
+touch %{buildroot}/%{_sysconfdir}/security/console.apps/%{name}
+
+install -m 755 -d %{buildroot}/%{_sbindir}
+pushd %{buildroot}/%{_bindir}
+mv eject ../sbin
+ln -s consolehelper eject
+popd
+
 %find_lang %{name}
 
 %clean
@@ -47,10 +61,16 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README TODO COPYING ChangeLog
+%attr(644,root,root) %{_sysconfdir}/security/console.apps/*
+%attr(644,root,root) %{_sysconfdir}/pam.d/*
 %{_bindir}/*
+%{_sbindir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 22 2006 Than Ngo <than at redhat.com> 2.1.5-3
+- made eject use pam 
+
 * Mon Aug 07 2006 Than Ngo <than at redhat.com> 2.1.5-2
 - apply patch to fix timeout issue
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 17:04:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 13:04:53 -0400
Subject: rpms/eject/devel eject.pam,NONE,1.1
Message-ID: <200608221704.k7MH4rsd026056@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/eject/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26022

Added Files:
	eject.pam 
Log Message:
made eject use pam




--- NEW FILE eject.pam ---
#%PAM-1.0
auth       sufficient	pam_rootok.so
auth       required	pam_console.so
account    required	pam_permit.so



From fedora-cvs-commits at redhat.com  Tue Aug 22 17:11:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 13:11:49 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.214,1.215
Message-ID: <200608221711.k7MHBnLc027615@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27571

Modified Files:
	kdebase.spec 
Log Message:
add Requires: eject




Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- kdebase.spec	21 Aug 2006 14:58:00 -0000	1.214
+++ kdebase.spec	22 Aug 2006 17:11:46 -0000	1.215
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -74,6 +74,7 @@
 Requires(post): xfs
 Requires: pam >= 0.79-6
 Requires: htdig
+Requires: eject
 
 %if %{redhatify}
 Requires: desktop-backgrounds-basic
@@ -538,6 +539,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Tue Aug 22 2006 Than Ngo <than at redhat.com> 6:3.5.4-5
+- add Requires: eject 
+
 * Mon Aug 21 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
 - fix #203221, konsole does not display bold characters
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 17:12:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 13:12:55 -0400
Subject: rpms/kdebase/FC-5 kdebase.spec,1.181,1.182
Message-ID: <200608221712.k7MHCtBD027829@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27786

Modified Files:
	kdebase.spec 
Log Message:
add requires: eject



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- kdebase.spec	21 Aug 2006 15:13:49 -0000	1.181
+++ kdebase.spec	22 Aug 2006 17:12:52 -0000	1.182
@@ -77,6 +77,7 @@
 Requires: desktop-backgrounds-basic
 Requires: redhat-menus => 1.2
 Requires: redhat-artwork >= 0.92
+requires: eject
 
 BuildRequires: kdelibs-devel >= %{version}
 BuildRequires: samba >= 2.2.3a-5
@@ -530,6 +531,7 @@
 - fix #203221, konsole does not display bold characters
 - fix #203083, correct htdig settings
 - apply upstream patch to fix argument quoting
+- add requires: eject
 
 * Fri Aug 11 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.2.fc5
 - fix BR



From fedora-cvs-commits at redhat.com  Tue Aug 22 18:15:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 14:15:43 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.7.92-uninitialized-gerror.patch, NONE,
	1.1 evolution-data-server.spec, 1.116, 1.117
Message-ID: <200608221815.k7MIFhwT008785@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8712

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.7.92-uninitialized-gerror.patch 
Log Message:

* Tue Aug 22 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.92-2
- Add patch for Gnome.org bug #349847.


evolution-data-server-1.7.92-uninitialized-gerror.patch:
 calendar/tests/ecal/test-ecal.c                 |    2 +-
 camel/providers/imap/camel-imap-message-cache.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE evolution-data-server-1.7.92-uninitialized-gerror.patch ---
--- evolution-data-server-1.7.92/calendar/tests/ecal/test-ecal.c.uninitialized-gerror	2006-08-22 12:08:14.000000000 -0400
+++ evolution-data-server-1.7.92/calendar/tests/ecal/test-ecal.c	2006-08-22 12:08:23.000000000 -0400
@@ -588,7 +588,7 @@
 	char *actual;
 	icalcomponent *icalcomp;
 	gboolean compare;
-	GError *error;
+	GError *error = NULL;
 	
 	if (!e_cal_get_object (client, uid, NULL, &icalcomp, &error)) {
 		cl_printf (client, "Test Get object : Could not get the object: %s\n", error->message);
--- evolution-data-server-1.7.92/camel/providers/imap/camel-imap-message-cache.c.uninitialized-gerror	2006-08-22 12:09:04.000000000 -0400
+++ evolution-data-server-1.7.92/camel/providers/imap/camel-imap-message-cache.c	2006-08-22 12:09:20.000000000 -0400
@@ -152,7 +152,7 @@
 	char *uid, *p;
 	GPtrArray *deletes;
 	CamelMessageInfo *info;
-	GError *error;
+	GError *error = NULL;
 
 	dir = g_dir_open (path, 0, &error);
 	if (!dir) {


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- evolution-data-server.spec	21 Aug 2006 15:16:19 -0000	1.116
+++ evolution-data-server.spec	22 Aug 2006 18:15:38 -0000	1.117
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -44,6 +44,9 @@
 # RH bug #202309
 Patch16: evolution-data-server-1.7.91-maybe-fix-crash.patch
 
+# Gnome.org bug #349847
+Patch17: evolution-data-server-1.7.92-uninitialized-gerror.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -127,6 +130,7 @@
 %patch14 -p1 -b .make_imap4_optional
 %patch15 -p1 -b .fix-edataserverui-libs
 %patch16 -p1 -b .maybe-fix-crash
+%patch17 -p1 -b .uninitialized-gerror
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -329,6 +333,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Tue Aug 22 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.92-2
+- Add patch for Gnome.org bug #349847.
+
 * Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.92-1
 - Update to 1.7.92
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 18:25:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 14:25:38 -0400
Subject: rpms/gfs2-utils/devel .cvsignore, 1.5, 1.6 gfs2-utils.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200608221825.k7MIPbDD026697@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gfs2-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26667

Modified Files:
	.cvsignore gfs2-utils.spec sources 
Log Message:
Updated sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Aug 2006 19:34:19 -0000	1.5
+++ .cvsignore	22 Aug 2006 18:25:34 -0000	1.6
@@ -1 +1 @@
-gfs2-0.1.3.tar.gz
+gfs2-0.1.4.tar.gz


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gfs2-utils.spec	14 Aug 2006 19:50:51 -0000	1.11
+++ gfs2-utils.spec	22 Aug 2006 18:25:34 -0000	1.12
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: gfs2-utils
-Version: 0.1.3
-Release: 4%{?dist}
+Version: 0.1.4
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Aug 2006 19:34:19 -0000	1.5
+++ sources	22 Aug 2006 18:25:34 -0000	1.6
@@ -1 +1 @@
-8988aa754a321402bdf441a824f57a6b  gfs2-0.1.3.tar.gz
+425356776e39901a488d1e17e2cb77cb  gfs2-0.1.4.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 22 18:27:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 14:27:25 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-edid-quirks-list.patch, 1.4,
	1.5 xorg-x11-server.spec, 1.153, 1.154
Message-ID: <200608221827.k7MIRPIr027350@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27317

Modified Files:
	xorg-x11-server-1.1.1-edid-quirks-list.patch 
	xorg-x11-server.spec 
Log Message:
* Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-27.fc6
- xorg-x11-server-1.1.1-edid-quirks-list.patch: Don't set an arbitrary
  pixclock limit if the monitor didn't claim to have one.


xorg-x11-server-1.1.1-edid-quirks-list.patch:
 interpret_edid.c |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletion(-)

Index: xorg-x11-server-1.1.1-edid-quirks-list.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-edid-quirks-list.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-server-1.1.1-edid-quirks-list.patch	18 Aug 2006 15:52:31 -0000	1.4
+++ xorg-x11-server-1.1.1-edid-quirks-list.patch	22 Aug 2006 18:27:22 -0000	1.5
@@ -1,6 +1,6 @@
 --- xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c.edid-quirks	2006-07-05 14:31:40.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c	2006-08-18 11:44:25.000000000 -0400
-@@ -32,6 +32,40 @@
++++ xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c	2006-08-22 13:07:16.000000000 -0400
+@@ -32,6 +32,41 @@
  static void get_detailed_timing_section(Uchar*, struct 	detailed_timings *);
  static Bool validate_version(int scrnIndex, struct edid_version *);
  
@@ -23,6 +23,7 @@
 +	    for (j = 0; j < 4; j++) {
 +		if (m->det_mon[j].type == DT) {
 +		    preferred_timing = &m->det_mon[j].section.d_timings;
++		    if (!ranges->max_clock) continue; /* zero is legal */
 +		    if (ranges->max_clock * 1000000 < preferred_timing->clock) {
 +			xf86Msg(X_WARNING,
 +			    "EDID preferred timing clock %.2fMHz exceeds "
@@ -41,7 +42,7 @@
  
  xf86MonPtr
  xf86InterpretEDID(int scrnIndex, Uchar *block)
-@@ -54,7 +88,9 @@
+@@ -54,7 +89,9 @@
  			   &m->ver);
      get_dt_md_section(SECTION(DET_TIMING_SECTION,block),&m->ver, m->det_mon);
      m->no_sections = (int)*(char *)SECTION(NO_EDID,block);


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- xorg-x11-server.spec	21 Aug 2006 22:59:29 -0000	1.153
+++ xorg-x11-server.spec	22 Aug 2006 18:27:22 -0000	1.154
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   26%{?dist}
+Release:   27%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -701,6 +701,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-27.fc6
+- xorg-x11-server-1.1.1-edid-quirks-list.patch: Don't set an arbitrary
+  pixclock limit if the monitor didn't claim to have one.
+
 * Mon Aug 21 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-26.fc6
 - Add Tilman Sauerbecks patch to fix AIGLX DRI locking.
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 19:04:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 15:04:01 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.23, 1.24 setroubleshoot.spec,
	1.28, 1.29 sources, 1.26, 1.27
Message-ID: <200608221904.k7MJ41Qn025948@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25926/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.30-1 on branch devel from setroubleshoot-0.30-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	22 Aug 2006 14:51:47 -0000	1.23
+++ .cvsignore	22 Aug 2006 19:03:59 -0000	1.24
@@ -1 +1 @@
-setroubleshoot-0.29.tar.gz
+setroubleshoot-0.30.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- setroubleshoot.spec	22 Aug 2006 14:51:47 -0000	1.28
+++ setroubleshoot.spec	22 Aug 2006 19:03:59 -0000	1.29
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.29
+Version: 0.30
 Release: 1
 License: GPL
 Group: Applications/System
@@ -103,18 +103,14 @@
 
 /etc/rc.d/init.d/%{name}
 %{_sysconfdir}/xdg/autostart/*
-#%{_datadir}/applications/*.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*png
 
 %changelog
-* Tue Aug 22 2006 John Dennis <jdennis at redhat.com> - 0.29-1
-	* fix bug #203479, missing requires of audit-libs-python
+* Tue Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.29-1
+- Add Requires: audit-libs-python
+- Add translations
 
-	* add support to sealert to listen on a dbus session signal to display
-	the gui. This is needed for when the status icon is not visible and
-	the user wants to see the UI. There is now a seperate program
-	setroubleshoot_launch_gui which emits the signal.
-	
 * Mon Aug 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.28-1
 - Fix allow_execmem.py file 
 - Add translations


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	22 Aug 2006 14:51:47 -0000	1.26
+++ sources	22 Aug 2006 19:03:59 -0000	1.27
@@ -1 +1 @@
-26d9cffe6c74c19b35ba7cba281c926e  setroubleshoot-0.29.tar.gz
+c23cdd7f59c43a64944e6f813c948b58  setroubleshoot-0.30.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 22 19:04:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 15:04:25 -0400
Subject: rpms/gfs2-utils/devel gfs2-tempondisk.patch, NONE,
	1.1 gfs2-tempondisk2.patch, NONE, 1.1 gfs2-utils.spec, 1.12, 1.13
Message-ID: <200608221904.k7MJ4Pf2026006@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gfs2-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25994

Modified Files:
	gfs2-utils.spec 
Added Files:
	gfs2-tempondisk.patch gfs2-tempondisk2.patch 
Log Message:
New upstream sources.

gfs2-tempondisk.patch:
 gfs2_ondisk.h |  443 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 443 insertions(+)

--- NEW FILE gfs2-tempondisk.patch ---
--- gfs2-0.1.4/include/gfs2_ondisk.h.tempondisk	2006-08-22 13:51:02.000000000 -0500
+++ gfs2-0.1.4/include/gfs2_ondisk.h	2006-08-22 13:51:02.000000000 -0500
@@ -0,0 +1,443 @@
+/*
+ * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License v.2.
+ */
+
+#ifndef __GFS2_ONDISK_DOT_H__
+#define __GFS2_ONDISK_DOT_H__
+
+#define GFS2_MAGIC		0x01161970
+#define GFS2_BASIC_BLOCK	512
+#define GFS2_BASIC_BLOCK_SHIFT	9
+
+/* Lock numbers of the LM_TYPE_NONDISK type */
+
+#define GFS2_MOUNT_LOCK		0
+#define GFS2_LIVE_LOCK		1
+#define GFS2_TRANS_LOCK		2
+#define GFS2_RENAME_LOCK	3
+
+/* Format numbers for various metadata types */
+
+#define GFS2_FORMAT_NONE	0
+#define GFS2_FORMAT_SB		100
+#define GFS2_FORMAT_RG		200
+#define GFS2_FORMAT_RB		300
+#define GFS2_FORMAT_DI		400
+#define GFS2_FORMAT_IN		500
+#define GFS2_FORMAT_LF		600
+#define GFS2_FORMAT_JD		700
+#define GFS2_FORMAT_LH		800
+#define GFS2_FORMAT_LD		900
+#define GFS2_FORMAT_LB		1000
+#define GFS2_FORMAT_EA		1600
+#define GFS2_FORMAT_ED		1700
+#define GFS2_FORMAT_QC		1400
+/* These are format numbers for entities contained in files */
+#define GFS2_FORMAT_RI		1100
+#define GFS2_FORMAT_DE		1200
+#define GFS2_FORMAT_QU		1500
+/* These are part of the superblock */
+#define GFS2_FORMAT_FS		1801
+#define GFS2_FORMAT_MULTI	1900
+
+/*
+ * An on-disk inode number
+ */
+
+struct gfs2_inum {
+	__be64 no_formal_ino;
+	__be64 no_addr;
+};
+
+static inline int gfs2_inum_equal(const struct gfs2_inum *ino1,
+				  const struct gfs2_inum *ino2)
+{
+	return ino1->no_formal_ino == ino2->no_formal_ino &&
+	       ino1->no_addr == ino2->no_addr;
+}
+
+/*
+ * Generic metadata head structure
+ * Every inplace buffer logged in the journal must start with this.
+ */
+
+#define GFS2_METATYPE_NONE	0
+#define GFS2_METATYPE_SB	1
+#define GFS2_METATYPE_RG	2
+#define GFS2_METATYPE_RB	3
+#define GFS2_METATYPE_DI	4
+#define GFS2_METATYPE_IN	5
+#define GFS2_METATYPE_LF	6
+#define GFS2_METATYPE_JD	7
+#define GFS2_METATYPE_LH	8
+#define GFS2_METATYPE_LD	9
+#define GFS2_METATYPE_LB	12
+#define GFS2_METATYPE_EA	10
+#define GFS2_METATYPE_ED	11
+#define GFS2_METATYPE_QC	14
+
+struct gfs2_meta_header {
+	__be32 mh_magic;
+	__be32 mh_type;
+	__be64 __pad0;		/* Was generation number in gfs1 */
+	__be32 mh_format;
+	__be32 __pad1;		/* Was incarnation number in gfs1 */
+};
+
+/*
+ * super-block structure
+ *
+ * It's probably good if SIZEOF_SB <= GFS2_BASIC_BLOCK (512 bytes)
+ *
+ * Order is important, need to be able to read old superblocks to do on-disk
+ * version upgrades.
+ */
+
+/* Address of superblock in GFS2 basic blocks */
+#define GFS2_SB_ADDR		128
+
+/* The lock number for the superblock (must be zero) */
+#define GFS2_SB_LOCK		0
+
+/* Requirement:  GFS2_LOCKNAME_LEN % 8 == 0
+   Includes: the fencing zero at the end */
+#define GFS2_LOCKNAME_LEN	64
+
+struct gfs2_sb {
+	struct gfs2_meta_header sb_header;
+
+	__be32 sb_fs_format;
+	__be32 sb_multihost_format;
+	__u32  __pad0;	/* Was superblock flags in gfs1 */
+
+	__be32 sb_bsize;
+	__be32 sb_bsize_shift;
+	__u32 __pad1;	/* Was journal segment size in gfs1 */
+
+	struct gfs2_inum sb_master_dir; /* Was jindex dinode in gfs1 */
+	struct gfs2_inum __pad2; /* Was rindex dinode in gfs1 */
+	struct gfs2_inum sb_root_dir;
+
+	char sb_lockproto[GFS2_LOCKNAME_LEN];
+	char sb_locktable[GFS2_LOCKNAME_LEN];
+	/* In gfs1, quota and license dinodes followed */
+};
+
+/*
+ * resource index structure
+ */
+
+struct gfs2_rindex {
+	__be64 ri_addr;	/* grp block disk address */
+	__be32 ri_length;	/* length of rgrp header in fs blocks */
+	__u32 __pad;
+
+	__be64 ri_data0;	/* first data location */
+	__be32 ri_data;	/* num of data blocks in rgrp */
+
+	__be32 ri_bitbytes;	/* number of bytes in data bitmaps */
+
+	__u8 ri_reserved[64];
+};
+
+/*
+ * resource group header structure
+ */
+
+/* Number of blocks per byte in rgrp */
+#define GFS2_NBBY		4
+#define GFS2_BIT_SIZE		2
+#define GFS2_BIT_MASK		0x00000003
+
+#define GFS2_BLKST_FREE		0
+#define GFS2_BLKST_USED		1
+#define GFS2_BLKST_UNLINKED	2
+#define GFS2_BLKST_DINODE	3
+
+#define GFS2_RGF_JOURNAL	0x00000001
+#define GFS2_RGF_METAONLY	0x00000002
+#define GFS2_RGF_DATAONLY	0x00000004
+#define GFS2_RGF_NOALLOC	0x00000008
+
+struct gfs2_rgrp {
+	struct gfs2_meta_header rg_header;
+
+	__be32 rg_flags;
+	__be32 rg_free;
+	__be32 rg_dinodes;
+	__be32 __pad;
+	__be64 rg_igeneration;
+
+	__u8 rg_reserved[80]; /* Several fields from gfs1 now reserved */
+};
+
+/*
+ * quota structure
+ */
+
+struct gfs2_quota {
+	__be64 qu_limit;
+	__be64 qu_warn;
+	__be64 qu_value;
+	__u8 qu_reserved[64];
+};
+
+/*
+ * dinode structure
+ */
+
+#define GFS2_MAX_META_HEIGHT	10
+#define GFS2_DIR_MAX_DEPTH	17
+
+#define DT2IF(dt) (((dt) << 12) & S_IFMT)
+#define IF2DT(sif) (((sif) & S_IFMT) >> 12)
+
+enum {
+	gfs2fl_Jdata		= 0,
+	gfs2fl_ExHash		= 1,
+	gfs2fl_Unused		= 2,
+	gfs2fl_EaIndirect	= 3,
+	gfs2fl_Directio		= 4,
+	gfs2fl_Immutable	= 5,
+	gfs2fl_AppendOnly	= 6,
+	gfs2fl_NoAtime		= 7,
+	gfs2fl_Sync		= 8,
+	gfs2fl_System		= 9,
+	gfs2fl_TruncInProg	= 29,
+	gfs2fl_InheritDirectio	= 30,
+	gfs2fl_InheritJdata	= 31,
+};
+
+/* Dinode flags */
+#define GFS2_DIF_JDATA			0x00000001
+#define GFS2_DIF_EXHASH			0x00000002
+#define GFS2_DIF_UNUSED			0x00000004  /* only in gfs1 */
+#define GFS2_DIF_EA_INDIRECT		0x00000008
+#define GFS2_DIF_DIRECTIO		0x00000010
+#define GFS2_DIF_IMMUTABLE		0x00000020
+#define GFS2_DIF_APPENDONLY		0x00000040
+#define GFS2_DIF_NOATIME		0x00000080
+#define GFS2_DIF_SYNC			0x00000100
+#define GFS2_DIF_SYSTEM			0x00000200 /* New in gfs2 */
+#define GFS2_DIF_TRUNC_IN_PROG		0x20000000 /* New in gfs2 */
+#define GFS2_DIF_INHERIT_DIRECTIO	0x40000000
+#define GFS2_DIF_INHERIT_JDATA		0x80000000
+
+struct gfs2_dinode {
+	struct gfs2_meta_header di_header;
+
+	struct gfs2_inum di_num;
+
+	__be32 di_mode;	/* mode of file */
+	__be32 di_uid;	/* owner's user id */
+	__be32 di_gid;	/* owner's group id */
+	__be32 di_nlink;	/* number of links to this file */
+	__be64 di_size;	/* number of bytes in file */
+	__be64 di_blocks;	/* number of blocks in file */
+	__be64 di_atime;	/* time last accessed */
+	__be64 di_mtime;	/* time last modified */
+	__be64 di_ctime;	/* time last changed */
+	__be32 di_major;	/* device major number */
+	__be32 di_minor;	/* device minor number */
+
+	/* This section varies from gfs1. Padding added to align with
+         * remainder of dinode
+	 */
+	__be64 di_goal_meta;	/* rgrp to alloc from next */
+	__be64 di_goal_data;	/* data block goal */
+	__be64 di_generation;	/* generation number for NFS */
+
+	__be32 di_flags;	/* GFS2_DIF_... */
+	__be32 di_payload_format;  /* GFS2_FORMAT_... */
+	__u16 __pad1;	/* Was ditype in gfs1 */
+	__be16 di_height;	/* height of metadata */
+	__u32 __pad2;	/* Unused incarnation number from gfs1 */
+
+	/* These only apply to directories  */
+	__u16 __pad3;	/* Padding */
+	__be16 di_depth;	/* Number of bits in the table */
+	__be32 di_entries;	/* The number of entries in the directory */
+
+	struct gfs2_inum __pad4; /* Unused even in current gfs1 */
+
+	__be64 di_eattr;	/* extended attribute block number */
+
+	__u8 di_reserved[56];
+};
+
+/*
+ * directory structure - many of these per directory file
+ */
+
+#define GFS2_FNAMESIZE		255
+#define GFS2_DIRENT_SIZE(name_len) ((sizeof(struct gfs2_dirent) + (name_len) + 7) & ~7)
+
+struct gfs2_dirent {
+	struct gfs2_inum de_inum;
+	__be32 de_hash;
+	__be16 de_rec_len;
+	__be16 de_name_len;
+	__be16 de_type;
+	__u8 __pad[14];
+};
+
+/*
+ * Header of leaf directory nodes
+ */
+
+struct gfs2_leaf {
+	struct gfs2_meta_header lf_header;
+
+	__be16 lf_depth;		/* Depth of leaf */
+	__be16 lf_entries;		/* Number of dirents in leaf */
+	__be32 lf_dirent_format;	/* Format of the dirents */
+	__be64 lf_next;			/* Next leaf, if overflow */
+
+	__u8 lf_reserved[64];
+};
+
+/*
+ * Extended attribute header format
+ */
+
+#define GFS2_EA_MAX_NAME_LEN	255
+#define GFS2_EA_MAX_DATA_LEN	65536
+
+#define GFS2_EATYPE_UNUSED	0
+#define GFS2_EATYPE_USR		1
+#define GFS2_EATYPE_SYS		2
+#define GFS2_EATYPE_SECURITY	3
+
+#define GFS2_EATYPE_LAST	3
+#define GFS2_EATYPE_VALID(x)	((x) <= GFS2_EATYPE_LAST)
+
+#define GFS2_EAFLAG_LAST	0x01	/* last ea in block */
+
+struct gfs2_ea_header {
+	__be32 ea_rec_len;
+	__be32 ea_data_len;
+	__u8 ea_name_len;	/* no NULL pointer after the string */
+	__u8 ea_type;		/* GFS2_EATYPE_... */
+	__u8 ea_flags;		/* GFS2_EAFLAG_... */
+	__u8 ea_num_ptrs;
+	__u32 __pad;
+};
+
+/*
+ * Log header structure
+ */
+
+#define GFS2_LOG_HEAD_UNMOUNT	0x00000001	/* log is clean */
+
+struct gfs2_log_header {
+	struct gfs2_meta_header lh_header;
+
+	__be64 lh_sequence;	/* Sequence number of this transaction */
+	__be32 lh_flags;	/* GFS2_LOG_HEAD_... */
+	__be32 lh_tail;		/* Block number of log tail */
+	__be32 lh_blkno;
+	__be32 lh_hash;
+};
+
+/*
+ * Log type descriptor
+ */
+
+#define GFS2_LOG_DESC_METADATA	300
+/* ld_data1 is the number of metadata blocks in the descriptor.
+   ld_data2 is unused. */
+
+#define GFS2_LOG_DESC_REVOKE	301
+/* ld_data1 is the number of revoke blocks in the descriptor.
+   ld_data2 is unused. */
+
+#define GFS2_LOG_DESC_JDATA	302
+/* ld_data1 is the number of data blocks in the descriptor.
+   ld_data2 is unused. */
+
+struct gfs2_log_descriptor {
+	struct gfs2_meta_header ld_header;
+
+	__be32 ld_type;		/* GFS2_LOG_DESC_... */
+	__be32 ld_length;	/* Number of buffers in this chunk */
+	__be32 ld_data1;	/* descriptor-specific field */
+	__be32 ld_data2;	/* descriptor-specific field */
+
+	__u8 ld_reserved[32];
+};
+
+/*
+ * Inum Range
+ * Describe a range of formal inode numbers allocated to
+ * one machine to assign to inodes.
+ */
+
+#define GFS2_INUM_QUANTUM	1048576
+
+struct gfs2_inum_range {
+	__be64 ir_start;
+	__be64 ir_length;
+};
+
+/*
+ * Statfs change
+ * Describes an change to the pool of free and allocated
+ * blocks.
+ */
+
+struct gfs2_statfs_change {
+	__be64 sc_total;
+	__be64 sc_free;
+	__be64 sc_dinodes;
+};
+
+/*
+ * Quota change
+ * Describes an allocation change for a particular
+ * user or group.
+ */
+
+#define GFS2_QCF_USER		0x00000001
+
+struct gfs2_quota_change {
+	__be64 qc_change;
+	__be32 qc_flags;	/* GFS2_QCF_... */
+	__be32 qc_id;
+};
+
+#ifdef __KERNEL__
+/* Translation functions */
+
+extern void gfs2_inum_in(struct gfs2_inum *no, char *buf);
+extern void gfs2_inum_out(const struct gfs2_inum *no, char *buf);
+extern void gfs2_sb_in(struct gfs2_sb *sb, char *buf);
+extern void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf);
+extern void gfs2_rindex_out(struct gfs2_rindex *ri, char *buf);
+extern void gfs2_rgrp_in(struct gfs2_rgrp *rg, char *buf);
+extern void gfs2_rgrp_out(struct gfs2_rgrp *rg, char *buf);
+extern void gfs2_quota_in(struct gfs2_quota *qu, char *buf);
+extern void gfs2_quota_out(struct gfs2_quota *qu, char *buf);
+extern void gfs2_dinode_in(struct gfs2_dinode *di, char *buf);
+extern void gfs2_dinode_out(struct gfs2_dinode *di, char *buf);
+extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, char *buf);
+extern void gfs2_ea_header_out(struct gfs2_ea_header *ea, char *buf);
+extern void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf);
+extern void gfs2_inum_range_in(struct gfs2_inum_range *ir, char *buf);
+extern void gfs2_inum_range_out(struct gfs2_inum_range *ir, char *buf);
+extern void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, char *buf);
+extern void gfs2_statfs_change_out(struct gfs2_statfs_change *sc, char *buf);
+extern void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf);
+
+/* Printing functions */
+
+extern void gfs2_rindex_print(struct gfs2_rindex *ri);
+extern void gfs2_dinode_print(struct gfs2_dinode *di);
+
+#endif /* __KERNEL__ */
+
+#endif /* __GFS2_ONDISK_DOT_H__ */

gfs2-tempondisk2.patch:
 gfs_ondisk.h | 1899 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 1899 insertions(+)

--- NEW FILE gfs2-tempondisk2.patch ---
--- gfs2-0.1.4/include/gfs_ondisk.h.tempondisk2	2006-08-22 13:56:03.000000000 -0500
+++ gfs2-0.1.4/include/gfs_ondisk.h	2006-08-22 13:55:50.000000000 -0500
@@ -0,0 +1,1899 @@
+/******************************************************************************
+*******************************************************************************
+**
+**  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
+**  Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
+**
+**  This copyrighted material is made available to anyone wishing to use,
+**  modify, copy, or redistribute it subject to the terms and conditions
+**  of the GNU General Public License v.2.
+**
+*******************************************************************************
+******************************************************************************/
+
+/*
+ * On-disk structures.
+ *
+ * THE BIG PICTURE of on-disk layout:
+ *
+ * GFS filesystem code views the entire filesystem, including journals, as
+ * one contiguous group of blocks on one (perhaps virtual) storage device.
+ * The filesystem space is shared, not distributed; each node in the cluster
+ * must see the entire filesystem space.
+ *
+ * If the filesystem is spread across multiple physical storage devices,
+ * volume management (device mapping) must be used to present the fileystem
+ * space to GFS as one (virtual) device, with contiguous blocks.
+ *
+ * The superblock contains basic information about the filesytem, and appears
+ * at a location 64 KBytes into the filesystem.  The first 64 KBytes of the
+ * filesystem are empty, providing a safety buffer against wayward volume
+ * management software (that sometimes write data into the first few bytes of
+ * a device) or administrators.
+ *
+ * After the superblock, the rest of the filesystem is divided into multiple
+ * Resource Groups and several journals.
+ *
+ * The Resource Groups (RGs or rgrps) contain the allocatable blocks that are
+ * used for storing files, directories, etc., and all of the associated
+ * metadata.  Each RG has its own set of block allocation statistics (within
+ * the RG header), a number of blocks containing the block allocation bitmap,
+ * and a large number of allocatable blocks for file data and metadata.
+ * Multiple RGs allow multiple nodes to simultaneously allocate blocks from the 
+ * filesystem (using different RGs), enhancing parallel access.  RG size and
+ * number of RGs are determined by gfs_mkfs when creating the filesystem.
+ * An administrator can specify RG size (see man gfs_mkfs).
+ *
+ * The journals contain temporary copies of metadata blocks, along with
+ * other data, that allow GFS to recover the filesystem to a consistent state
+ * (at least as far as metadata is concerned) if a node fails in the midst
+ * of performing a write transaction.  There must be one journal for each node
+ * in the cluster.  Since access to the entire filesystem space is shared,
+ * if a node crashes, another node will be able to read the crashed node's
+ * journal, and perform recovery.
+ *
+ * Currently, gfs_mkfs places the journals right in the middle of a freshly
+ * created filesystem space, between 2 large groups of RGs.  From a filesystem
+ * layout perspective, this placement is not a requirement; the journals
+ * could be placed anywhere within the filesystem space.
+ *
+ * New Resource Groups and Journals may be added to the filesystem after the
+ * filesystem has been created, if the filesystem's (virtual) device is made
+ * larger.  See man gfs_grow and gfs_jadd.
+ *
+ * A few special hidden inodes are contained in a GFS filesystem.  They do
+ * not appear in any directories; instead, the superblock points to them
+ * using block numbers for their location.  The special inodes are:
+ *
+ *   Root inode:  Root directory of the filesystem
+ *   Resource Group Index:  A file containing block numbers and sizes of all RGs
+ *   Journal Index:  A file containing block numbers and sizes of all journals
+ *   Quota:  A file containing all quota information for the filesystem
+ *   License:  A file containing license information
+ *
+ * Note that there is NOTHING RELATED TO INTER-NODE LOCK MANAGEMENT ON-DISK.
+ * Locking is handled completely off-disk, typically via LAN.
+ *
+ * NOTE:
+ * If you add 8 byte fields to these structures, they must be 8 byte
+ * aligned.  4 byte field must be 4 byte aligned, etc...
+ *
+ * All structures must be a multiple of 8 bytes long.
+ *
+ * GRIPES:
+ * We should have forgetten about supporting 512B FS block sizes 
+ * and made the di_reserved field in the struct gfs_dinode structure
+ * much bigger.
+ *
+ * de_rec_len in struct gfs_dirent should really have been a 32-bit value
+ * as it now limits us to a 64k FS block size (with the current code
+ * in dir.c).
+ */
+
+#ifndef __GFS_ONDISK_DOT_H__
+#define __GFS_ONDISK_DOT_H__
+
+#define GFS_MAGIC               (0x01161970) /* for all on-disk headers */
+#define GFS_BASIC_BLOCK         (512)  /* "basic block" = "sector" = 512B */
+#define GFS_BASIC_BLOCK_SHIFT   (9)
+
+/*  Controls how much data can be logged in-core before dumping log to disk */
+
+#define GFS_DUMPS_PER_LOG       (4)    /* 1/4 of on-disk journal size*/
+
+/*  Lock numbers of the LM_TYPE_NONDISK type.  These protect certain
+ *  cluster-wide operations (rather than on-disk entities).
+ *  Currently, the LIVE lock is not used for any real purpose.  */
+
+#define GFS_MOUNT_LOCK          (0)    /* only one node can Mount at a time */
+#define GFS_LIVE_LOCK           (1)    /* shared by all mounted nodes */
+#define GFS_TRANS_LOCK          (2)    /* Transaction, protects jrnl recovery */
+#define GFS_RENAME_LOCK         (3)    /* only one node can Rename at a time */
+
+/*  On-disk format (version) numbers for various metadata types,
+ *  used in gfs_meta_header  */
+
+#define GFS_FORMAT_SB           (100)  /* Super-Block */
+#define GFS_FORMAT_RG           (200)  /* Resource Group Header */
+#define GFS_FORMAT_RB           (300)  /* Resource Group Block Alloc BitBlock */
+#define GFS_FORMAT_DI           (400)  /* "Disk" inode (dinode) */
+#define GFS_FORMAT_IN           (500)  /* Indirect dinode block list */
+#define GFS_FORMAT_LF           (600)  /* Leaf dinode block list */
+#define GFS_FORMAT_JD           (700)  /* Journal Data */
+#define GFS_FORMAT_LH           (800)  /* Log Header */
+#define GFS_FORMAT_LD           (900)  /* Log Descriptor */
+/*  These don't have actual struct gfs_meta_header structures to go with them */
+#define GFS_FORMAT_JI           (1000) /* Journal Index */
+#define GFS_FORMAT_RI           (1100) /* Resource Group Index */
+#define GFS_FORMAT_DE           (1200) /* Directory Entry */
+#define GFS_FORMAT_QU           (1500) /* Quota */
+#define GFS_FORMAT_EA           (1600) /* Extended Attribute */
+#define GFS_FORMAT_ED           (1700) /* Extended Attribute data */
+/*  These version #s are embedded in the superblock  */
+#define GFS_FORMAT_FS           (1309) /* Filesystem (all-encompassing) */
+#define GFS_FORMAT_MULTI        (1401) /* Multi-Host */
+
+/*
+ *  An on-disk inode number
+ *  Initially, the on-disk block address of the inode block is assigned as the
+ *  formal (permanent) ID as well.  Block address can change (to move inode
+ *  on-disk), but formal ID must stay unchanged once assigned.
+ */
+
+#define gfs_inum_equal(ino1, ino2) \
+(((ino1)->no_formal_ino == (ino2)->no_formal_ino) && \
+ ((ino1)->no_addr == (ino2)->no_addr))
+
+struct gfs_inum {
+	uint64_t no_formal_ino;        /* inode identifier */
+	uint64_t no_addr;              /* block # of dinode block */
+};
+
+/*
+ *  Generic metadata head structure
+ *
+ *  Every inplace buffer logged in the journal must start
+ *  with a struct gfs_meta_header.
+ *
+ *  In addition to telling what kind of metadata is in the block,
+ *  the metaheader contains the important generation and incarnation
+ *  numbers.
+ *
+ *  The generation number is used during journal recovery to determine
+ *  whether an in-place block on-disk is older than an on-disk journaled copy
+ *  of the block.  If so, GFS overwrites the in-place block with the journaled
+ *  version of the block.
+ *
+ *  A meta block's generation number must increment monotonically across the
+ *  cluster, each time new contents are committed to the block.  This means
+ *  that whenever GFS allocates a pre-existing metadata block, GFS must read
+ *  that block from disk (in case another node has incremented it).  It also
+ *  means that GFS must sync the block (with incremented generation number)
+ *  to disk (both log and in-place blocks), not only after changing contents
+ *  of the block, but also after de-allocating the block (GFS can't just throw
+ *  away incore metadata for a file that it's just erased).
+ *
+ *  The incarnation number is used only for on-disk (d)inodes.  GFS increments
+ *  it each time it de-allocates a dinode block (i.e. each time the dinode
+ *  loses its identity with a particular file, directory, etc.).  When the
+ *  dinode is later allocated (i.e. to be identified with a new file, etc.),
+ *  GFS copies the incarnation number into the VFS inode's i_generation member.
+ *  If GFS is used as the backing store for an NFS server, GFS uses this
+ *  i_generation number as part of the NFS filehandle, which differentiates
+ *  it from the previous identity of the dinode, and helps protect against
+ *  filesystem corruption that could happen with the use of outdated,
+ *  invalid, or malicious filehandles.  See ops_export.c.
+ *
+ *  GFS caches de-allocated meta-headers, to minimize disk reads.
+ *  See struct gfs_meta_header_cache.
+ */
+
+#define GFS_METATYPE_NONE       (0)
+#define GFS_METATYPE_SB         (1)    /* Super-Block */
+#define GFS_METATYPE_RG         (2)    /* Resource Group Header */
+#define GFS_METATYPE_RB         (3)    /* Resource Group Block Alloc BitBlock */
+#define GFS_METATYPE_DI         (4)    /* "Disk" inode (dinode) */
+#define GFS_METATYPE_IN         (5)    /* Indirect dinode block list */
+#define GFS_METATYPE_LF         (6)    /* Leaf dinode block list */
+#define GFS_METATYPE_JD         (7)    /* Journal Data */
+#define GFS_METATYPE_LH         (8)    /* Log Header (gfs_log_header) */
+#define GFS_METATYPE_LD         (9)    /* Log Descriptor (gfs_log_descriptor) */
+#define GFS_METATYPE_EA         (10)   /* Extended Attribute */
+#define GFS_METATYPE_ED         (11)   /* Extended Attribute data */
+
+#define GFS_META_CLUMP          (64)   /* # blocks to convert fm data to meta */
+
+struct gfs_meta_header {
+	uint32_t mh_magic;      /* GFS_MAGIC sanity check magic number */
+	uint32_t mh_type;       /* GFS_METATYPE_XX type of metadata block */
+	uint64_t mh_generation; /* increment before writing to journal */
+	uint32_t mh_format;     /* GFS_FORMAT_XX (version # for this type) */
+	uint32_t mh_incarn;     /* increment when marking dinode "unused" */
+};
+
+/*
+ *  super-block structure
+ *
+ *  One of these is at beginning of filesystem.
+ *  It's probably good if SIZEOF_SB <= GFS_BASIC_BLOCK (512 bytes)
+ */
+
+/*  Address of SuperBlock in GFS basic blocks.  1st 64K of filesystem is empty
+    for safety against getting clobbered by wayward volume managers, etc.
+    64k was chosen because it's the largest GFS-supported fs block size.  */
+#define GFS_SB_ADDR             (128)
+
+/*  The lock number for the superblock (must be zero)  */
+#define GFS_SB_LOCK             (0)
+#define GFS_CRAP_LOCK           (1)
+
+/*  Requirement:  GFS_LOCKNAME_LEN % 8 == 0
+    Includes: the fencing zero at the end  */
+#define GFS_LOCKNAME_LEN        (64)
+
+struct gfs_sb {
+	/*  Order is important; need to be able to read old superblocks
+	    in order to support on-disk version upgrades */
+	struct gfs_meta_header sb_header;
+
+	uint32_t sb_fs_format;         /* GFS_FORMAT_FS (on-disk version) */
+	uint32_t sb_multihost_format;  /* GFS_FORMAT_MULTI */
+	uint32_t sb_flags;             /* ?? */
+
+	uint32_t sb_bsize;             /* fundamental FS block size in bytes */
+	uint32_t sb_bsize_shift;       /* log2(sb_bsize) */
+	uint32_t sb_seg_size;          /* Journal segment size in FS blocks */
+
+	/* These special inodes do not appear in any on-disk directory. */
+	struct gfs_inum sb_jindex_di;  /* journal index inode */
+	struct gfs_inum sb_rindex_di;  /* resource group index inode */
+	struct gfs_inum sb_root_di;    /* root directory inode */
+
+	/* Default inter-node locking protocol (lock module) and namespace */
+	char sb_lockproto[GFS_LOCKNAME_LEN]; /* lock protocol name */
+	char sb_locktable[GFS_LOCKNAME_LEN]; /* unique name for this FS */
+
+	/* More special inodes */
+	struct gfs_inum sb_quota_di;   /* quota inode */
+	struct gfs_inum sb_license_di; /* license inode */
+
+	char sb_reserved[96];
+};
+
+/*
+ *  journal index structure 
+ *
+ *  One for each journal used by the filesystem.
+ *  These descriptors are packed contiguously within the jindex inode (file).
+ */
+
+struct gfs_jindex {
+	uint64_t ji_addr;       /* starting block of the journal */
+	uint32_t ji_nsegment;   /* number (quantity) of segments in journal */
+	uint32_t ji_pad;
+
+	char ji_reserved[64];
+};
+
+/*
+ *  resource index structure 
+ *
+ *  One of these for each resource group in the filesystem.
+ *  These descriptors are packed contiguously within the rindex inode (file).
+ *  Also see struct gfs_rgrp.
+ */
+
+struct gfs_rindex {
+	uint64_t ri_addr;     /* block # of 1st block (header) in rgrp */
+	uint32_t ri_length;   /* # fs blocks containing rgrp header & bitmap */
+	uint32_t ri_pad;
+
+	uint64_t ri_data1;    /* block # of first data/meta block in rgrp */
+	uint32_t ri_data;     /* number (qty) of data/meta blocks in rgrp */
+
+	uint32_t ri_bitbytes; /* total # bytes used by block alloc bitmap */
+
+	char ri_reserved[64];
+};
+
+/*
+ *  resource group header structure
+ *
+ *  One of these at beginning of the first block of an rgrp,
+ *     followed by block alloc bitmap data in remainder of first block.
+ *  Each resource group contains:
+ *    Header block, including block allocation statistics (struct gfs_rgrp)
+ *       and first part of block alloc bitmap.
+ *    Bitmap block(s), continuing block alloc bitmap started in header block.
+ *    Data/meta blocks, allocatable blocks containing file data and metadata.
+ *  
+ *  In older versions, now-unused (but previously allocated) dinodes were
+ *  saved for re-use in an on-disk linked list (chain).  This is no longer
+ *  done, but support still exists for reclaiming dinodes from this list,
+ *  to support upgrades from older on-disk formats.
+ */
+
+/* Each data block within rgrp is represented by 2 bits in the alloc bitmap */
+#define GFS_NBBY                (4)  /* # blocks represented by 1 bitmap byte */
+#define GFS_BIT_SIZE            (2)
+#define GFS_BIT_MASK            (0x00000003)
+
+/*
+ * 4 possible block allocation states:
+ *   bit 0 = alloc(1)/free(0)
+ *   bit 1 = metadata(1)/data(0)
+ */
+#define GFS_BLKST_FREE          (0)
+#define GFS_BLKST_USED          (1)
+#define GFS_BLKST_FREEMETA      (2)
+#define GFS_BLKST_USEDMETA      (3)
+
+struct gfs_rgrp {
+	struct gfs_meta_header rg_header;
+
+	uint32_t rg_flags;      /* ?? */
+
+	uint32_t rg_free;       /* Number (qty) of free data blocks */
+
+	/* Dinodes are USEDMETA, but are handled separately from other METAs */
+	uint32_t rg_useddi;     /* Number (qty) of dinodes (used or free) */
+	uint32_t rg_freedi;     /* Number (qty) of unused (free) dinodes */
+	struct gfs_inum rg_freedi_list; /* 1st block in chain of free dinodes */
+
+	/* These META statistics do not include dinodes (used or free) */
+	uint32_t rg_usedmeta;   /* Number (qty) of used metadata blocks */
+	uint32_t rg_freemeta;   /* Number (qty) of unused metadata blocks */
+
+	char rg_reserved[64];
+};
+
+/*
+ *  quota structure
+ */
+
+struct gfs_quota {
+	uint64_t qu_limit;
+	uint64_t qu_warn;
+	int64_t qu_value;
+
+	char qu_reserved[64];
+};
+
+/*
+ *  dinode (disk inode) structure
+ *  The ondisk representation of inodes
+ *  One for each file, directory, etc.
+ *  GFS does not put more than one inode in a single block.
+ *  The inode may be "stuffed", carrying file data along with metadata,
+ *    if the file data is small enough.
+ *  Otherwise, the inode block contains pointers to other blocks that contain
+ *    either file data or other pointers to other blocks (indirect addressing
+ *    via a metadata tree).
+ */
+
+#define GFS_MAX_META_HEIGHT     (10)
+#define GFS_DIR_MAX_DEPTH       (17)
+
+/*  Dinode types  */
+#define GFS_FILE_NON            (0)
+#define GFS_FILE_REG            (1)    /* regular file */
+#define GFS_FILE_DIR            (2)    /* directory */
+#define GFS_FILE_LNK            (5)    /* link */
+#define GFS_FILE_BLK            (7)    /* block device node */
+#define GFS_FILE_CHR            (8)    /* character device node */
+#define GFS_FILE_FIFO           (101)  /* fifo/pipe */
+#define GFS_FILE_SOCK           (102)  /* socket */
+
+/*  Dinode flags  */
+#define GFS_DIF_JDATA             (0x00000001) /* jrnl all data for this file */
+#define GFS_DIF_EXHASH            (0x00000002) /* hashed directory (leaves) */
+#define GFS_DIF_UNUSED            (0x00000004) /* unused dinode */
+#define GFS_DIF_EA_INDIRECT       (0x00000008) /* extended attribute, indirect*/
+#define GFS_DIF_DIRECTIO          (0x00000010)
+#define GFS_DIF_IMMUTABLE         (0x00000020) /* Can't change file */
+#define GFS_DIF_APPENDONLY        (0x00000040) /* Can only add to end of file */
+#define GFS_DIF_NOATIME           (0x00000080) /* Don't update access time
+						  (currently unused/ignored) */
+#define GFS_DIF_SYNC              (0x00000100) /* Flush to disk, don't cache
+						  (currently unused/ignored) */
+#define GFS_DIF_INHERIT_DIRECTIO  (0x40000000) /* new files get DIRECTIO flag */
+#define GFS_DIF_INHERIT_JDATA     (0x80000000) /* new files get JDATA flag */
+
+struct gfs_dinode {
+	struct gfs_meta_header di_header;
+
+	struct gfs_inum di_num; /* formal inode # and block address */
+
+	uint32_t di_mode;	/* mode of file */
+	uint32_t di_uid;	/* owner's user id */
+	uint32_t di_gid;	/* owner's group id */
+	uint32_t di_nlink;	/* number (qty) of links to this file */
+	uint64_t di_size;	/* number (qty) of bytes in file */
+	uint64_t di_blocks;	/* number (qty) of blocks in file */
+	int64_t di_atime;	/* time last accessed */
+	int64_t di_mtime;	/* time last modified */
+	int64_t di_ctime;	/* time last changed */
+
+	/*  Non-zero only for character or block device nodes  */
+	uint32_t di_major;	/* device major number */
+	uint32_t di_minor;	/* device minor number */
+
+	/*  Block allocation strategy  */
+	uint64_t di_rgrp;	/* dinode rgrp block number */
+	uint64_t di_goal_rgrp;	/* rgrp to alloc from next */
+	uint32_t di_goal_dblk;	/* data block goal */
+	uint32_t di_goal_mblk;	/* metadata block goal */
+
+	uint32_t di_flags;	/* GFS_DIF_... */
+
+	/*  struct gfs_rindex, struct gfs_jindex, or struct gfs_dirent */
+	uint32_t di_payload_format;  /* GFS_FORMAT_... */
+	uint16_t di_type;	/* GFS_FILE_... type of file */
+	uint16_t di_height;	/* height of metadata (0 == stuffed) */
+	uint32_t di_incarn;	/* incarnation (unused, see gfs_meta_header) */
+	uint16_t di_pad;
+
+	/*  These only apply to directories  */
+	uint16_t di_depth;	/* Number of bits in the table */
+	uint32_t di_entries;	/* The # (qty) of entries in the directory */
+
+	/*  This formed an on-disk chain of unused dinodes  */
+	struct gfs_inum di_next_unused;  /* used in old versions only */
+
+	uint64_t di_eattr;	/* extended attribute block number */
+
+	char di_reserved[56];
+};
+
+/*
+ *  indirect block header
+ *
+ *  A component of a dinode's indirect addressing metadata tree.
+ *  These are pointed to by pointers in dinodes or other indirect blocks.
+ */
+
+struct gfs_indirect {
+	struct gfs_meta_header in_header;
+
+	char in_reserved[64];
+};
+
+/*
+ *  directory structure - many of these per directory file
+ *
+ * See comments at beginning of dir.c
+ */
+
+#define GFS_FNAMESIZE               (255)
+#define GFS_DIRENT_SIZE(name_len) ((sizeof(struct gfs_dirent) + (name_len) + 7) & ~7)
+#define IS_LEAF     (1) /* Hashed (leaf) directory */
+#define IS_DINODE   (2) /* Linear (stuffed dinode block) directory */
+
+struct gfs_dirent {
+	struct gfs_inum de_inum;    /* formal inode number and block address */
+	uint32_t de_hash;           /* hash of the filename */
+	uint16_t de_rec_len;        /* the length of the dirent */
+	uint16_t de_name_len;       /* the length of the name */
+	uint16_t de_type;           /* GFS_FILE_... type of dinode this points to */
+
+	char de_reserved[14];
+};
+
+/*
+ *  Header of leaf directory nodes
+ *
+ * See comments at beginning of dir.c
+ */
+
+struct gfs_leaf {
+	struct gfs_meta_header lf_header;
+
+	uint16_t lf_depth;          /* Depth of leaf */
+	uint16_t lf_entries;        /* Number of dirents in leaf */
+	uint32_t lf_dirent_format;  /* GFS_FORMAT_DE (version #) */
+	uint64_t lf_next;           /* Next leaf, if overflow */
+
+	char lf_reserved[64];
+};
+
+/*
+ *  Log header structure
+ *
+ *  Two of these are in the first block of a transaction log:
+ *    1)  at beginning of block
+ *    2)  at end of first 512-byte sector within block
+ */
+
+#define GFS_LOG_HEAD_UNMOUNT    (0x00000001)  /* log is clean, can unmount fs */
+
+struct gfs_log_header {
+	struct gfs_meta_header lh_header;
+
+	uint32_t lh_flags;	/* GFS_LOG_HEAD_... */
+	uint32_t lh_pad;
+
+	uint64_t lh_first;	/* Block number of first header in this trans */
+	uint64_t lh_sequence;	/* Sequence number of this transaction */
+
+	uint64_t lh_tail;	/* Block number of log tail */
+	uint64_t lh_last_dump;	/* Block number of last dump */
+
+	char lh_reserved[64];
+};
+
+/*
+ *  Log type descriptor
+ *
+ *  One of these for each chunk in a transaction
+ */
+
+#define GFS_LOG_DESC_METADATA   (300)    /* metadata */
+/*  ld_data1 is the number (quantity) of metadata blocks in the descriptor.
+    ld_data2 is unused.
+    */
+
+#define GFS_LOG_DESC_IUL        (400)    /* unlinked inode */
+/*  ld_data1 is TRUE if this is a dump.
+    ld_data2 is unused.
+    FixMe!!!  ld_data1 should be the number (quantity) of entries.
+              ld_data2 should be "TRUE if this is a dump".
+    */
+
+#define GFS_LOG_DESC_IDA        (401)    /* de-allocated inode */
+/*  ld_data1 is unused.
+    ld_data2 is unused.
+    FixMe!!!  ld_data1 should be the number (quantity) of entries.
+    */
+
+#define GFS_LOG_DESC_Q          (402)    /* quota */
+/*  ld_data1 is the number of quota changes in the descriptor.
+    ld_data2 is TRUE if this is a dump.
+    */
+
+#define GFS_LOG_DESC_LAST       (500)    /* final in a logged transaction */
+/*  ld_data1 is unused.
+    ld_data2 is unused.
+    */
+
+struct gfs_log_descriptor {
+	struct gfs_meta_header ld_header;
+
+	uint32_t ld_type;	/* GFS_LOG_DESC_... Type of this log chunk */
+	uint32_t ld_length;	/* Number of buffers in this chunk */
+	uint32_t ld_data1;	/* descriptor-specific field */
+	uint32_t ld_data2;	/* descriptor-specific field */
+
+	char ld_reserved[64];
+};
+
+/*
+ *  Metadata block tags
+ *
+ *  One for each logged block.  Tells where block really belongs on-disk.
+ *  These descriptor tags are packed contiguously after a gfs_log_descriptor.
+ */
+
+struct gfs_block_tag {
+	uint64_t bt_blkno;	/* inplace block number */
+	uint32_t bt_flags;	/* ?? */
+	uint32_t bt_pad;
+};
+
+/*
+ *  Quota Journal Tag
+ */
+
+#define GFS_QTF_USER            (0x00000001)
+
+struct gfs_quota_tag {
+	int64_t qt_change;
+	uint32_t qt_flags;      /* GFS_QTF_... */
+	uint32_t qt_id;
+};
+
+/*
+ *  Extended attribute header format
+ */
+
+#define GFS_EA_MAX_NAME_LEN     (255)
+#define GFS_EA_MAX_DATA_LEN     (65536)
+
+#define GFS_EATYPE_UNUSED       (0)
+#define GFS_EATYPE_USR          (1)     /* user attribute */
+#define GFS_EATYPE_SYS          (2)     /* system attribute */
+#define GFS_EATYPE_SECURITY	(3)	/* security attribute */
+
+#define GFS_EATYPE_LAST         (3)
+#define GFS_EATYPE_VALID(x)     ((x) <= GFS_EATYPE_LAST)
+
+#define GFS_EAFLAG_LAST         (0x01)	/* last ea in block */
+
+struct gfs_ea_header {
+	uint32_t ea_rec_len;    /* total record length: hdr + name + data */
+	uint32_t ea_data_len;   /* data length, in bytes */
+	uint8_t ea_name_len;    /* no NULL pointer after the string */
+	uint8_t ea_type;        /* GFS_EATYPE_... */
+	uint8_t ea_flags;       /* GFS_EAFLAG_... */
+	uint8_t ea_num_ptrs;    /* # fs blocks needed for EA */
+	uint32_t ea_pad;
+};
+
+/*  Endian functions  */
+
+#define GFS_ENDIAN_BIG
+
+#ifdef GFS_ENDIAN_BIG
+
+#define gfs16_to_cpu be16_to_cpu
+#define gfs32_to_cpu be32_to_cpu
+#define gfs64_to_cpu be64_to_cpu
+
+#define cpu_to_gfs16 cpu_to_be16
+#define cpu_to_gfs32 cpu_to_be32
+#define cpu_to_gfs64 cpu_to_be64
+
+#else				/*  GFS_ENDIAN_BIG  */
+
+#define gfs16_to_cpu le16_to_cpu
+#define gfs32_to_cpu le32_to_cpu
+#define gfs64_to_cpu le64_to_cpu
+
+#define cpu_to_gfs16 cpu_to_le16
+#define cpu_to_gfs32 cpu_to_le32
+#define cpu_to_gfs64 cpu_to_le64
+
+#endif				/*  GFS_ENDIAN_BIG  */
+
+/*  Translation functions  */
+
+void gfs_inum_in(struct gfs_inum *no, char *buf);
+void gfs_inum_out(struct gfs_inum *no, char *buf);
+void gfs_meta_header_in(struct gfs_meta_header *mh, char *buf);
+void gfs_meta_header_out(struct gfs_meta_header *mh, char *buf);
+void gfs_sb_in(struct gfs_sb *sb, char *buf);
+void gfs_sb_out(struct gfs_sb *sb, char *buf);
+void gfs_jindex_in(struct gfs_jindex *jindex, char *buf);
+void gfs_jindex_out(struct gfs_jindex *jindex, char *buf);
+void gfs_rindex_in(struct gfs_rindex *rindex, char *buf);
+void gfs_rindex_out(struct gfs_rindex *rindex, char *buf);
+void gfs_rgrp_in(struct gfs_rgrp *rgrp, char *buf);
+void gfs_rgrp_out(struct gfs_rgrp *rgrp, char *buf);
+void gfs_quota_in(struct gfs_quota *quota, char *buf);
+void gfs_quota_out(struct gfs_quota *quota, char *buf);
+void gfs_dinode_in(struct gfs_dinode *dinode, char *buf);
+void gfs_dinode_out(struct gfs_dinode *dinode, char *buf);
+void gfs_indirect_in(struct gfs_indirect *indirect, char *buf);
+void gfs_indirect_out(struct gfs_indirect *indirect, char *buf);
+void gfs_dirent_in(struct gfs_dirent *dirent, char *buf);
+void gfs_dirent_out(struct gfs_dirent *dirent, char *buf);
+void gfs_leaf_in(struct gfs_leaf *leaf, char *buf);
+void gfs_leaf_out(struct gfs_leaf *leaf, char *buf);
+void gfs_log_header_in(struct gfs_log_header *head, char *buf);
+void gfs_log_header_out(struct gfs_log_header *head, char *buf);
+void gfs_desc_in(struct gfs_log_descriptor *desc, char *buf);
+void gfs_desc_out(struct gfs_log_descriptor *desc, char *buf);
+void gfs_block_tag_in(struct gfs_block_tag *btag, char *buf);
+void gfs_block_tag_out(struct gfs_block_tag *btag, char *buf);
+void gfs_quota_tag_in(struct gfs_quota_tag *qtag, char *buf);
+void gfs_quota_tag_out(struct gfs_quota_tag *qtag, char *buf);
+void gfs_ea_header_in(struct gfs_ea_header *qtag, char *buf);
+void gfs_ea_header_out(struct gfs_ea_header *qtag, char *buf);
+
+/*  Printing functions  */
+
+void gfs_inum_print(struct gfs_inum *no);
+void gfs_meta_header_print(struct gfs_meta_header *mh);
+void gfs_sb_print(struct gfs_sb *sb);
+void gfs_jindex_print(struct gfs_jindex *jindex);
+void gfs_rindex_print(struct gfs_rindex *rindex);
+void gfs_rgrp_print(struct gfs_rgrp *rgrp);
+void gfs_quota_print(struct gfs_quota *quota);
+void gfs_dinode_print(struct gfs_dinode *dinode);
+void gfs_indirect_print(struct gfs_indirect *indirect);
+void gfs_dirent_print(struct gfs_dirent *dirent, char *name);
+void gfs_leaf_print(struct gfs_leaf *leaf);
+void gfs_log_header_print(struct gfs_log_header *head);
+void gfs_desc_print(struct gfs_log_descriptor *desc);
+void gfs_block_tag_print(struct gfs_block_tag *tag);
+void gfs_quota_tag_print(struct gfs_quota_tag *tag);
+void gfs_ea_header_print(struct gfs_ea_header *ea, char *name);
+
+/*  The hash function for ExHash directories  */
+
+uint32_t gfs_dir_hash(const char *data, int len);
+
+#endif /* __GFS_ONDISK_DOT_H__ */
+
+
+
+#ifdef WANT_GFS_CONVERSION_FUNCTIONS
+
+#define CPIN_08(s1, s2, member, count) {memcpy((s1->member), (s2->member), (count));}
+#define CPOUT_08(s1, s2, member, count) {memcpy((s2->member), (s1->member), (count));}
+#define CPIN_16(s1, s2, member) {(s1->member) = gfs16_to_cpu((s2->member));}
+#define CPOUT_16(s1, s2, member) {(s2->member) = cpu_to_gfs16((s1->member));}
+#define CPIN_32(s1, s2, member) {(s1->member) = gfs32_to_cpu((s2->member));}
+#define CPOUT_32(s1, s2, member) {(s2->member) = cpu_to_gfs32((s1->member));}
+#define CPIN_64(s1, s2, member) {(s1->member) = gfs64_to_cpu((s2->member));}
+#define CPOUT_64(s1, s2, member) {(s2->member) = cpu_to_gfs64((s1->member));}
+
+#define pa(struct, member, count) print_array(#member, struct->member, count);
+
+/**
+ * print_array - Print out an array of bytes
+ * @title: what to print before the array
+ * @buf: the array
+ * @count: the number of bytes
+ *
+ */
+
+static void
+print_array(char *title, char *buf, int count)
+{
+	int x;
+
+	printk("  %s =\n", title);
+	for (x = 0; x < count; x++) {
+		printk("%.2X ", (unsigned char)buf[x]);
+		if (x % 16 == 15)
+			printk("\n");
+	}
+	if (x % 16)
+		printk("\n");
+}
+
+/**
+ * gfs_inum_in - Read in an inode number
+ * @no: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_inum_in(struct gfs_inum *no, char *buf)
+{
+	struct gfs_inum *str = (struct gfs_inum *)buf;
+
+	CPIN_64(no, str, no_formal_ino);
+	CPIN_64(no, str, no_addr);
+}
+
+/**
+ * gfs_inum_out - Write out an inode number
+ * @no: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_inum_out(struct gfs_inum *no, char *buf)
+{
+	struct gfs_inum *str = (struct gfs_inum *)buf;
+
+	CPOUT_64(no, str, no_formal_ino);
+	CPOUT_64(no, str, no_addr);
+}
+
+/**
+ * gfs_inum_print - Print out a inode number
+ * @no: the cpu-order buffer
+ *
+ */
+
+void
+gfs_inum_print(struct gfs_inum *no)
+{
+	pv(no, no_formal_ino, "%"PRIu64);
+	pv(no, no_addr, "%"PRIu64);
+}
+
+/**
+ * gfs_meta_header_in - Read in a metadata header
+ * @mh: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_meta_header_in(struct gfs_meta_header *mh, char *buf)
+{
+	struct gfs_meta_header *str = (struct gfs_meta_header *)buf;
+
+	CPIN_32(mh, str, mh_magic);
+	CPIN_32(mh, str, mh_type);
+	CPIN_64(mh, str, mh_generation);
+	CPIN_32(mh, str, mh_format);
+	CPIN_32(mh, str, mh_incarn);
+}
+
+/**
+ * gfs_meta_header_in - Write out a metadata header
+ * @mh: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ * Don't ever change the generation number in this routine.
+ * It's done manually in increment_generation().
+ */
+
+void
+gfs_meta_header_out(struct gfs_meta_header *mh, char *buf)
+{
+	struct gfs_meta_header *str = (struct gfs_meta_header *)buf;
+
+	CPOUT_32(mh, str, mh_magic);
+	CPOUT_32(mh, str, mh_type);
+#if 0
+	/* Don't do this!
+	   Mh_generation should only be change manually. */
+	CPOUT_64(mh, str, mh_generation);
+#endif
+	CPOUT_32(mh, str, mh_format);
+	CPOUT_32(mh, str, mh_incarn);
+}
+
+/**
+ * gfs_meta_header_print - Print out a metadata header
+ * @mh: the cpu-order buffer
+ *
+ */
+
+void
+gfs_meta_header_print(struct gfs_meta_header *mh)
+{
+	pv(mh, mh_magic, "0x%.8X");
+	pv(mh, mh_type, "%u");
+	pv(mh, mh_generation, "%"PRIu64);
+	pv(mh, mh_format, "%u");
+	pv(mh, mh_incarn, "%u");
+}
+
+/**
+ * gfs_sb_in - Read in a superblock
+ * @sb: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_sb_in(struct gfs_sb *sb, char *buf)
+{
+	struct gfs_sb *str = (struct gfs_sb *)buf;
+
+	gfs_meta_header_in(&sb->sb_header, buf);
+
+	CPIN_32(sb, str, sb_fs_format);
+	CPIN_32(sb, str, sb_multihost_format);
+	CPIN_32(sb, str, sb_flags);
+
+	CPIN_32(sb, str, sb_bsize);
+	CPIN_32(sb, str, sb_bsize_shift);
+	CPIN_32(sb, str, sb_seg_size);
+
+	gfs_inum_in(&sb->sb_jindex_di, (char *)&str->sb_jindex_di);
+	gfs_inum_in(&sb->sb_rindex_di, (char *)&str->sb_rindex_di);
+	gfs_inum_in(&sb->sb_root_di, (char *)&str->sb_root_di);
+
+	CPIN_08(sb, str, sb_lockproto, GFS_LOCKNAME_LEN);
+	CPIN_08(sb, str, sb_locktable, GFS_LOCKNAME_LEN);
+
+	gfs_inum_in(&sb->sb_quota_di, (char *)&str->sb_quota_di);
+	gfs_inum_in(&sb->sb_license_di, (char *)&str->sb_license_di);
+
+	CPIN_08(sb, str, sb_reserved, 96);
+}
+
+/**
+ * gfs_sb_out - Write out a superblock
+ * @sb: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_sb_out(struct gfs_sb *sb, char *buf)
+{
+	struct gfs_sb *str = (struct gfs_sb *)buf;
+
+	gfs_meta_header_out(&sb->sb_header, buf);
+
+	CPOUT_32(sb, str, sb_fs_format);
+	CPOUT_32(sb, str, sb_multihost_format);
+	CPOUT_32(sb, str, sb_flags);
+
+	CPOUT_32(sb, str, sb_bsize);
+	CPOUT_32(sb, str, sb_bsize_shift);
+	CPOUT_32(sb, str, sb_seg_size);
+
+	gfs_inum_out(&sb->sb_jindex_di, (char *)&str->sb_jindex_di);
+	gfs_inum_out(&sb->sb_rindex_di, (char *)&str->sb_rindex_di);
+	gfs_inum_out(&sb->sb_root_di, (char *)&str->sb_root_di);
+
+	CPOUT_08(sb, str, sb_lockproto, GFS_LOCKNAME_LEN);
+	CPOUT_08(sb, str, sb_locktable, GFS_LOCKNAME_LEN);
+
+	gfs_inum_out(&sb->sb_quota_di, (char *)&str->sb_quota_di);
+	gfs_inum_out(&sb->sb_license_di, (char *)&str->sb_license_di);
+
+	CPOUT_08(sb, str, sb_reserved, 96);
+}
+
+/**
+ * gfs_sb_print - Print out a superblock
+ * @sb: the cpu-order buffer
+ *
+ */
+
+void
+gfs_sb_print(struct gfs_sb *sb)
+{
+	gfs_meta_header_print(&sb->sb_header);
+
+	pv(sb, sb_fs_format, "%u");
+	pv(sb, sb_multihost_format, "%u");
+	pv(sb, sb_flags, "%u");
+
+	pv(sb, sb_bsize, "%u");
+	pv(sb, sb_bsize_shift, "%u");
+	pv(sb, sb_seg_size, "%u");
+
+	gfs_inum_print(&sb->sb_jindex_di);
+	gfs_inum_print(&sb->sb_rindex_di);
+	gfs_inum_print(&sb->sb_root_di);
+
+	pv(sb, sb_lockproto, "%s");
+	pv(sb, sb_locktable, "%s");
+
+	gfs_inum_print(&sb->sb_quota_di);
+	gfs_inum_print(&sb->sb_license_di);
+
+	pa(sb, sb_reserved, 96);
+}
+
+/**
+ * gfs_jindex_in - Read in a journal index structure
+ * @jindex: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_jindex_in(struct gfs_jindex *jindex, char *buf)
+{
+	struct gfs_jindex *str = (struct gfs_jindex *)buf;
+
+	CPIN_64(jindex, str, ji_addr);
+	CPIN_32(jindex, str, ji_nsegment);
+	CPIN_32(jindex, str, ji_pad);
+
+	CPIN_08(jindex, str, ji_reserved, 64);
+}
+
+/**
+ * gfs_jindex_out - Write out a journal index structure
+ * @jindex: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_jindex_out(struct gfs_jindex *jindex, char *buf)
+{
+	struct gfs_jindex *str = (struct gfs_jindex *)buf;
+
+	CPOUT_64(jindex, str, ji_addr);
+	CPOUT_32(jindex, str, ji_nsegment);
+	CPOUT_32(jindex, str, ji_pad);
+
+	CPOUT_08(jindex, str, ji_reserved, 64);
+}
+
+/**
+ * gfs_jindex_print - Print out a journal index structure
+ * @ji: the cpu-order buffer
+ *
+ */
+
+void
+gfs_jindex_print(struct gfs_jindex *ji)
+{
+	pv(ji, ji_addr, "%"PRIu64);
+	pv(ji, ji_nsegment, "%u");
+	pv(ji, ji_pad, "%u");
+
+	pa(ji, ji_reserved, 64);
+}
+
+/**
+ * gfs_rindex_in - Read in a resource index structure
+ * @rindex: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_rindex_in(struct gfs_rindex *rindex, char *buf)
+{
+	struct gfs_rindex *str = (struct gfs_rindex *)buf;
+
+	CPIN_64(rindex, str, ri_addr);
+	CPIN_32(rindex, str, ri_length);
+	CPIN_32(rindex, str, ri_pad);
+
+	CPIN_64(rindex, str, ri_data1);
+	CPIN_32(rindex, str, ri_data);
+
+	CPIN_32(rindex, str, ri_bitbytes);
+
+	CPIN_08(rindex, str, ri_reserved, 64);
+}
+
+/**
+ * gfs_rindex_out - Write out a resource index structure
+ * @rindex: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_rindex_out(struct gfs_rindex *rindex, char *buf)
+{
+	struct gfs_rindex *str = (struct gfs_rindex *)buf;
+
+	CPOUT_64(rindex, str, ri_addr);
+	CPOUT_32(rindex, str, ri_length);
+	CPOUT_32(rindex, str, ri_pad);
+
+	CPOUT_64(rindex, str, ri_data1);
+	CPOUT_32(rindex, str, ri_data);
+
+	CPOUT_32(rindex, str, ri_bitbytes);
+
+	CPOUT_08(rindex, str, ri_reserved, 64);
+}
+
+/**
+ * gfs_rindex_print - Print out a resource index structure
+ * @ri: the cpu-order buffer
+ *
+ */
+
+void
+gfs_rindex_print(struct gfs_rindex *ri)
+{
+	pv(ri, ri_addr, "%"PRIu64);
+	pv(ri, ri_length, "%u");
+	pv(ri, ri_pad, "%u");
+
+	pv(ri, ri_data1, "%"PRIu64);
+	pv(ri, ri_data, "%u");
+
+	pv(ri, ri_bitbytes, "%u");
+
+	pa(ri, ri_reserved, 64);
+}
+
+/**
+ * gfs_rgrp_in - Read in a resource group header
+ * @rgrp: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_rgrp_in(struct gfs_rgrp *rgrp, char *buf)
+{
+	struct gfs_rgrp *str = (struct gfs_rgrp *)buf;
+
+	gfs_meta_header_in(&rgrp->rg_header, buf);
+
+	CPIN_32(rgrp, str, rg_flags);
+
+	CPIN_32(rgrp, str, rg_free);
+
+	CPIN_32(rgrp, str, rg_useddi);
+	CPIN_32(rgrp, str, rg_freedi);
+	gfs_inum_in(&rgrp->rg_freedi_list, (char *)&str->rg_freedi_list);
+
+	CPIN_32(rgrp, str, rg_usedmeta);
+	CPIN_32(rgrp, str, rg_freemeta);
+
+	CPIN_08(rgrp, str, rg_reserved, 64);
+}
+
+/**
+ * gfs_rgrp_out - Write out a resource group header
+ * @rgrp: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_rgrp_out(struct gfs_rgrp *rgrp, char *buf)
+{
+	struct gfs_rgrp *str = (struct gfs_rgrp *)buf;
+
+	gfs_meta_header_out(&rgrp->rg_header, buf);
+
+	CPOUT_32(rgrp, str, rg_flags);
+
+	CPOUT_32(rgrp, str, rg_free);
+
+	CPOUT_32(rgrp, str, rg_useddi);
+	CPOUT_32(rgrp, str, rg_freedi);
+	gfs_inum_out(&rgrp->rg_freedi_list, (char *)&str->rg_freedi_list);
+
+	CPOUT_32(rgrp, str, rg_usedmeta);
+	CPOUT_32(rgrp, str, rg_freemeta);
+
+	CPOUT_08(rgrp, str, rg_reserved, 64);
+}
+
+/**
+ * gfs_rgrp_print - Print out a resource group header
+ * @rg: the cpu-order buffer
+ *
+ */
+
+void
+gfs_rgrp_print(struct gfs_rgrp *rg)
+{
+	gfs_meta_header_print(&rg->rg_header);
+
+	pv(rg, rg_flags, "%u");
+
+	pv(rg, rg_free, "%u");
+
+	pv(rg, rg_useddi, "%u");
+	pv(rg, rg_freedi, "%u");
+	gfs_inum_print(&rg->rg_freedi_list);
+
+	pv(rg, rg_usedmeta, "%u");
+	pv(rg, rg_freemeta, "%u");
+
+	pa(rg, rg_reserved, 64);
+}
+
+/**
+ * gfs_quota_in - Read in a quota structures
+ * @quota: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_quota_in(struct gfs_quota *quota, char *buf)
+{
+	struct gfs_quota *str = (struct gfs_quota *)buf;
+
+	CPIN_64(quota, str, qu_limit);
+	CPIN_64(quota, str, qu_warn);
+	CPIN_64(quota, str, qu_value);
+
+	CPIN_08(quota, str, qu_reserved, 64);
+}
+
+/**
+ * gfs_quota_out - Write out a quota structure
+ * @quota: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_quota_out(struct gfs_quota *quota, char *buf)
+{
+	struct gfs_quota *str = (struct gfs_quota *)buf;
+
+	CPOUT_64(quota, str, qu_limit);
+	CPOUT_64(quota, str, qu_warn);
+	CPOUT_64(quota, str, qu_value);
+
+	CPOUT_08(quota, str, qu_reserved, 64);
+}
+
+/**
+ * gfs_quota_print - Print out a quota structure
+ * @quota: the cpu-order buffer
+ *
+ */
+
+void
+gfs_quota_print(struct gfs_quota *quota)
+{
+	pv(quota, qu_limit, "%"PRIu64);
+	pv(quota, qu_warn, "%"PRIu64);
+	pv(quota, qu_value, "%"PRId64);
+
+	pa(quota, qu_reserved, 64);
+}
+
+/**
+ * gfs_dinode_in - Read in a dinode
+ * @dinode: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_dinode_in(struct gfs_dinode *dinode, char *buf)
+{
+	struct gfs_dinode *str = (struct gfs_dinode *)buf;
+
+	gfs_meta_header_in(&dinode->di_header, buf);
+
+	gfs_inum_in(&dinode->di_num, (char *)&str->di_num);
+
+	CPIN_32(dinode, str, di_mode);
+	CPIN_32(dinode, str, di_uid);
+	CPIN_32(dinode, str, di_gid);
+	CPIN_32(dinode, str, di_nlink);
+	CPIN_64(dinode, str, di_size);
+	CPIN_64(dinode, str, di_blocks);
+	CPIN_64(dinode, str, di_atime);
+	CPIN_64(dinode, str, di_mtime);
+	CPIN_64(dinode, str, di_ctime);
+	CPIN_32(dinode, str, di_major);
+	CPIN_32(dinode, str, di_minor);
+
+	CPIN_64(dinode, str, di_rgrp);
+	CPIN_64(dinode, str, di_goal_rgrp);
+	CPIN_32(dinode, str, di_goal_dblk);
+	CPIN_32(dinode, str, di_goal_mblk);
+	CPIN_32(dinode, str, di_flags);
+	CPIN_32(dinode, str, di_payload_format);
+	CPIN_16(dinode, str, di_type);
+	CPIN_16(dinode, str, di_height);
+	CPIN_32(dinode, str, di_incarn);
+	CPIN_16(dinode, str, di_pad);
+
+	CPIN_16(dinode, str, di_depth);
+	CPIN_32(dinode, str, di_entries);
+
+	gfs_inum_in(&dinode->di_next_unused, (char *)&str->di_next_unused);
+
+	CPIN_64(dinode, str, di_eattr);
+
+	CPIN_08(dinode, str, di_reserved, 56);
+}
+
+/**
+ * gfs_dinode_out - Write out a dinode
+ * @dinode: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_dinode_out(struct gfs_dinode *dinode, char *buf)
+{
+	struct gfs_dinode *str = (struct gfs_dinode *)buf;
+
+	gfs_meta_header_out(&dinode->di_header, buf);
+
+	gfs_inum_out(&dinode->di_num, (char *)&str->di_num);
+
+	CPOUT_32(dinode, str, di_mode);
+	CPOUT_32(dinode, str, di_uid);
+	CPOUT_32(dinode, str, di_gid);
+	CPOUT_32(dinode, str, di_nlink);
+	CPOUT_64(dinode, str, di_size);
+	CPOUT_64(dinode, str, di_blocks);
+	CPOUT_64(dinode, str, di_atime);
+	CPOUT_64(dinode, str, di_mtime);
+	CPOUT_64(dinode, str, di_ctime);
+	CPOUT_32(dinode, str, di_major);
+	CPOUT_32(dinode, str, di_minor);
+
+	CPOUT_64(dinode, str, di_rgrp);
+	CPOUT_64(dinode, str, di_goal_rgrp);
+	CPOUT_32(dinode, str, di_goal_dblk);
+	CPOUT_32(dinode, str, di_goal_mblk);
+	CPOUT_32(dinode, str, di_flags);
+	CPOUT_32(dinode, str, di_payload_format);
+	CPOUT_16(dinode, str, di_type);
+	CPOUT_16(dinode, str, di_height);
+	CPOUT_32(dinode, str, di_incarn);
+	CPOUT_16(dinode, str, di_pad);
+
+	CPOUT_16(dinode, str, di_depth);
+	CPOUT_32(dinode, str, di_entries);
+
+	gfs_inum_out(&dinode->di_next_unused, (char *)&str->di_next_unused);
+
+	CPOUT_64(dinode, str, di_eattr);
+
+	CPOUT_08(dinode, str, di_reserved, 56);
+}
+
+/**
+ * gfs_dinode_print - Print out a dinode
+ * @di: the cpu-order buffer
+ *
+ */
+
+void
+gfs_dinode_print(struct gfs_dinode *di)
+{
+	gfs_meta_header_print(&di->di_header);
+
+	gfs_inum_print(&di->di_num);
+
+	pv(di, di_mode, "0%o");
+	pv(di, di_uid, "%u");
+	pv(di, di_gid, "%u");
+	pv(di, di_nlink, "%u");
+	pv(di, di_size, "%"PRIu64);
+	pv(di, di_blocks, "%"PRIu64);
+	pv(di, di_atime, "%"PRId64);
+	pv(di, di_mtime, "%"PRId64);
+	pv(di, di_ctime, "%"PRId64);
+	pv(di, di_major, "%u");
+	pv(di, di_minor, "%u");
+
+	pv(di, di_rgrp, "%"PRIu64);
+	pv(di, di_goal_rgrp, "%"PRIu64);
+	pv(di, di_goal_dblk, "%u");
+	pv(di, di_goal_mblk, "%u");
+	pv(di, di_flags, "0x%.8X");
+	pv(di, di_payload_format, "%u");
+	pv(di, di_type, "%u");
+	pv(di, di_height, "%u");
+	pv(di, di_incarn, "%u");
+	pv(di, di_pad, "%u");
+
+	pv(di, di_depth, "%u");
+	pv(di, di_entries, "%u");
+
+	gfs_inum_print(&di->di_next_unused);
+
+	pv(di, di_eattr, "%"PRIu64);
+
+	pa(di, di_reserved, 56);
+}
+
+/**
+ * gfs_indirect_in - copy in the header of an indirect block
+ * @indirect: the in memory copy
+ * @buf: the buffer copy
+ *
+ */
+
+void
+gfs_indirect_in(struct gfs_indirect *indirect, char *buf)
+{
+	struct gfs_indirect *str = (struct gfs_indirect *)buf;
+
+	gfs_meta_header_in(&indirect->in_header, buf);
+
+	CPIN_08(indirect, str, in_reserved, 64);
+}
+
+/**
+ * gfs_indirect_out - copy out the header of an indirect block
+ * @indirect: the in memory copy
+ * @buf: the buffer copy
+ *
+ */
+
+void
+gfs_indirect_out(struct gfs_indirect *indirect, char *buf)
+{
+	struct gfs_indirect *str = (struct gfs_indirect *)buf;
+
+	gfs_meta_header_out(&indirect->in_header, buf);
+
+	CPOUT_08(indirect, str, in_reserved, 64);
+}
+
+/**
+ * gfs_indirect_print - Print out a indirect block header
+ * @indirect: the cpu-order buffer
+ *
+ */
+
+void
+gfs_indirect_print(struct gfs_indirect *indirect)
+{
+	gfs_meta_header_print(&indirect->in_header);
+
+	pa(indirect, in_reserved, 64);
+}
+
+/**
+ * gfs_dirent_in - Read in a directory entry
+ * @dirent: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_dirent_in(struct gfs_dirent *dirent, char *buf)
+{
+	struct gfs_dirent *str = (struct gfs_dirent *)buf;
+
+	gfs_inum_in(&dirent->de_inum, (char *)&str->de_inum);
+	CPIN_32(dirent, str, de_hash);
+	CPIN_16(dirent, str, de_rec_len);
+	CPIN_16(dirent, str, de_name_len);
+	CPIN_16(dirent, str, de_type);
+
+	CPIN_08(dirent, str, de_reserved, 14);
+}
+
+/**
+ * gfs_dirent_out - Write out a directory entry
+ * @dirent: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_dirent_out(struct gfs_dirent *dirent, char *buf)
+{
+	struct gfs_dirent *str = (struct gfs_dirent *)buf;
+
+	gfs_inum_out(&dirent->de_inum, (char *)&str->de_inum);
+	CPOUT_32(dirent, str, de_hash);
+	CPOUT_16(dirent, str, de_rec_len);
+	CPOUT_16(dirent, str, de_name_len);
+	CPOUT_16(dirent, str, de_type);
+
+	CPOUT_08(dirent, str, de_reserved, 14);
+}
+
+/**
+ * gfs_dirent_print - Print out a directory entry
+ * @de: the cpu-order buffer
+ * @name: the filename
+ *
+ */
+
+void
+gfs_dirent_print(struct gfs_dirent *de, char *name)
+{
+	char buf[GFS_FNAMESIZE + 1];
+
+	gfs_inum_print(&de->de_inum);
+	pv(de, de_hash, "0x%.8X");
+	pv(de, de_rec_len, "%u");
+	pv(de, de_name_len, "%u");
+	pv(de, de_type, "%u");
+
+	pa(de, de_reserved, 14);
+
+	memset(buf, 0, GFS_FNAMESIZE + 1);
+	memcpy(buf, name, de->de_name_len);
+	printk("  name = %s\n", buf);
+}
+
+/**
+ * gfs_leaf_in - Read in a directory leaf header
+ * @leaf: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_leaf_in(struct gfs_leaf *leaf, char *buf)
+{
+	struct gfs_leaf *str = (struct gfs_leaf *)buf;
+
+	gfs_meta_header_in(&leaf->lf_header, buf);
+
+	CPIN_16(leaf, str, lf_depth);
+	CPIN_16(leaf, str, lf_entries);
+	CPIN_32(leaf, str, lf_dirent_format);
+	CPIN_64(leaf, str, lf_next);
+
+	CPIN_08(leaf, str, lf_reserved, 64);
+}
+
+/**
+ * gfs_leaf_out - Write out a directory leaf header
+ * @leaf: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_leaf_out(struct gfs_leaf *leaf, char *buf)
+{
+	struct gfs_leaf *str = (struct gfs_leaf *)buf;
+
+	gfs_meta_header_out(&leaf->lf_header, buf);
+
+	CPOUT_16(leaf, str, lf_depth);
+	CPOUT_16(leaf, str, lf_entries);
+	CPOUT_32(leaf, str, lf_dirent_format);
+	CPOUT_64(leaf, str, lf_next);
+
+	CPOUT_08(leaf, str, lf_reserved, 64);
+}
+
+/**
+ * gfs_leaf_print - Print out a directory leaf header
+ * @lf: the cpu-order buffer
+ *
+ */
+
+void
+gfs_leaf_print(struct gfs_leaf *lf)
+{
+	gfs_meta_header_print(&lf->lf_header);
+
+	pv(lf, lf_depth, "%u");
+	pv(lf, lf_entries, "%u");
+	pv(lf, lf_dirent_format, "%u");
+	pv(lf, lf_next, "%"PRIu64);
+
+	pa(lf, lf_reserved, 64);
+}
+
+/**
+ * gfs_log_header_in - Read in a log header
+ * @head: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_log_header_in(struct gfs_log_header *head, char *buf)
+{
+	struct gfs_log_header *str = (struct gfs_log_header *)buf;
+
+	gfs_meta_header_in(&head->lh_header, buf);
+
+	CPIN_32(head, str, lh_flags);
+	CPIN_32(head, str, lh_pad);
+
+	CPIN_64(head, str, lh_first);
+	CPIN_64(head, str, lh_sequence);
+
+	CPIN_64(head, str, lh_tail);
+	CPIN_64(head, str, lh_last_dump);
+
+	CPIN_08(head, str, lh_reserved, 64);
+}
+
+/**
+ * gfs_log_header_out - Write out a log header
+ * @head: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_log_header_out(struct gfs_log_header *head, char *buf)
+{
+	struct gfs_log_header *str = (struct gfs_log_header *)buf;
+
+	gfs_meta_header_out(&head->lh_header, buf);
+
+	CPOUT_32(head, str, lh_flags);
+	CPOUT_32(head, str, lh_pad);
+
+	CPOUT_64(head, str, lh_first);
+	CPOUT_64(head, str, lh_sequence);
+
+	CPOUT_64(head, str, lh_tail);
+	CPOUT_64(head, str, lh_last_dump);
+
+	CPOUT_08(head, str, lh_reserved, 64);
+}
+
+/**
+ * gfs_log_header_print - Print out a log header
+ * @head: the cpu-order buffer
+ *
+ */
+
+void
+gfs_log_header_print(struct gfs_log_header *lh)
+{
+	gfs_meta_header_print(&lh->lh_header);
+
+	pv(lh, lh_flags, "0x%.8X");
+	pv(lh, lh_pad, "%u");
+
+	pv(lh, lh_first, "%"PRIu64);
+	pv(lh, lh_sequence, "%"PRIu64);
+
+	pv(lh, lh_tail, "%"PRIu64);
+	pv(lh, lh_last_dump, "%"PRIu64);
+
+	pa(lh, lh_reserved, 64);
+}
+
+/**
+ * gfs_desc_in - Read in a log descriptor
+ * @desc: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_desc_in(struct gfs_log_descriptor *desc, char *buf)
+{
+	struct gfs_log_descriptor *str = (struct gfs_log_descriptor *)buf;
+
+	gfs_meta_header_in(&desc->ld_header, buf);
+
+	CPIN_32(desc, str, ld_type);
+	CPIN_32(desc, str, ld_length);
+	CPIN_32(desc, str, ld_data1);
+	CPIN_32(desc, str, ld_data2);
+
+	CPIN_08(desc, str, ld_reserved, 64);
+}
+
+/**
+ * gfs_desc_out - Write out a log descriptor
+ * @desc: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_desc_out(struct gfs_log_descriptor *desc, char *buf)
+{
+	struct gfs_log_descriptor *str = (struct gfs_log_descriptor *)buf;
+
+	gfs_meta_header_out(&desc->ld_header, buf);
+
+	CPOUT_32(desc, str, ld_type);
+	CPOUT_32(desc, str, ld_length);
+	CPOUT_32(desc, str, ld_data1);
+	CPOUT_32(desc, str, ld_data2);
+
+	CPOUT_08(desc, str, ld_reserved, 64);
+}
+
+/**
+ * gfs_desc_print - Print out a log descriptor
+ * @ld: the cpu-order buffer
+ *
+ */
+
+void
+gfs_desc_print(struct gfs_log_descriptor *ld)
+{
+	gfs_meta_header_print(&ld->ld_header);
+
+	pv(ld, ld_type, "%u");
+	pv(ld, ld_length, "%u");
+	pv(ld, ld_data1, "%u");
+	pv(ld, ld_data2, "%u");
+
+	pa(ld, ld_reserved, 64);
+}
+
+/**
+ * gfs_block_tag_in - Read in a block tag
+ * @tag: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_block_tag_in(struct gfs_block_tag *tag, char *buf)
+{
+	struct gfs_block_tag *str = (struct gfs_block_tag *)buf;
+
+	CPIN_64(tag, str, bt_blkno);
+	CPIN_32(tag, str, bt_flags);
+	CPIN_32(tag, str, bt_pad);
+}
+
+/**
+ * gfs_block_tag_out - Write out a block tag
+ * @tag: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_block_tag_out(struct gfs_block_tag *tag, char *buf)
+{
+	struct gfs_block_tag *str = (struct gfs_block_tag *)buf;
+
+	CPOUT_64(tag, str, bt_blkno);
+	CPOUT_32(tag, str, bt_flags);
+	CPOUT_32(tag, str, bt_pad);
+}
+
+/**
+ * gfs_block_tag_print - Print out a block tag
+ * @tag: the cpu-order buffer
+ *
+ */
+
+void
+gfs_block_tag_print(struct gfs_block_tag *tag)
+{
+	pv(tag, bt_blkno, "%"PRIu64);
+	pv(tag, bt_flags, "%u");
+	pv(tag, bt_pad, "%u");
+}
+
+/**
+ * gfs_quota_tag_in - Read in a quota tag
+ * @tag: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_quota_tag_in(struct gfs_quota_tag *tag, char *buf)
+{
+	struct gfs_quota_tag *str = (struct gfs_quota_tag *)buf;
+
+	CPIN_64(tag, str, qt_change);
+	CPIN_32(tag, str, qt_flags);
+	CPIN_32(tag, str, qt_id);
+}
+
+/**
+ * gfs_quota_tag_out - Write out a quota tag
+ * @tag: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_quota_tag_out(struct gfs_quota_tag *tag, char *buf)
+{
+	struct gfs_quota_tag *str = (struct gfs_quota_tag *)buf;
+
+	CPOUT_64(tag, str, qt_change);
+	CPOUT_32(tag, str, qt_flags);
+	CPOUT_32(tag, str, qt_id);
+}
+
+/**
+ * gfs_quota_tag_print - Print out a quota tag
+ * @tag: the cpu-order buffer
+ *
+ */
+
+void
+gfs_quota_tag_print(struct gfs_quota_tag *tag)
+{
+	pv(tag, qt_change, "%"PRId64);
+	pv(tag, qt_flags, "0x%.8X");
+	pv(tag, qt_id, "%u");
+}
+
+/**
+ * gfs_ea_header_in - Read in a Extended Attribute header
+ * @tag: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_ea_header_in(struct gfs_ea_header *ea, char *buf)
+{
+	struct gfs_ea_header *str = (struct gfs_ea_header *)buf;
+
+	CPIN_32(ea, str, ea_rec_len);
+	CPIN_32(ea, str, ea_data_len);
+	ea->ea_name_len = str->ea_name_len;
+	ea->ea_type = str->ea_type;
+	ea->ea_flags = str->ea_flags;
+	ea->ea_num_ptrs = str->ea_num_ptrs;
+	CPIN_32(ea, str, ea_pad);
+}
+
+/**
+ * gfs_ea_header_out - Write out a Extended Attribute header
+ * @ea: the cpu-order structure
+ * @buf: the disk-order buffer
+ *
+ */
+
+void
+gfs_ea_header_out(struct gfs_ea_header *ea, char *buf)
+{
+	struct gfs_ea_header *str = (struct gfs_ea_header *)buf;
+
+	CPOUT_32(ea, str, ea_rec_len);
+	CPOUT_32(ea, str, ea_data_len);
+	str->ea_name_len = ea->ea_name_len;
+	str->ea_type = ea->ea_type;
+	str->ea_flags = ea->ea_flags;
+	str->ea_num_ptrs = ea->ea_num_ptrs;
+	CPOUT_32(ea, str, ea_pad);
+}
+
+/**
+ * gfs_ea_header_printt - Print out a Extended Attribute header
+ * @ea: the cpu-order buffer
+ *
+ */
+
+void
+gfs_ea_header_print(struct gfs_ea_header *ea, char *name)
+{
+	char buf[GFS_EA_MAX_NAME_LEN + 1];
+
+	pv(ea, ea_rec_len, "%u");
+	pv(ea, ea_data_len, "%u");
+	pv(ea, ea_name_len, "%u");
+	pv(ea, ea_type, "%u");
+	pv(ea, ea_flags, "%u");
+	pv(ea, ea_num_ptrs, "%u");
+	pv(ea, ea_pad, "%u");
+
+	memset(buf, 0, GFS_EA_MAX_NAME_LEN + 1);
+	memcpy(buf, name, ea->ea_name_len);
+	printk("  name = %s\n", buf);
+}
+
+static const uint32_t crc_32_tab[] =
+{
+  0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+  0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+  0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+  0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+  0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+  0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+  0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+  0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+  0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+  0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+  0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+  0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+  0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+  0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+  0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+  0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+  0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+  0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+  0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+  0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+  0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+  0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+  0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+  0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+  0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+  0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+  0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+  0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+  0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+  0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+  0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+  0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+/**
+ * gfs_dir_hash - hash an array of data
+ * @data: the data to be hashed
+ * @len: the length of data to be hashed
+ *
+ * Take some data and convert it to a 32-bit hash.
+ *
+ * The hash function is a 32-bit CRC of the data.  The algorithm uses
+ * the crc_32_tab table above.
+ *
+ * This may not be the fastest hash function, but it does a fair bit better
+ * at providing uniform results than the others I've looked at.  That's
+ * really important for efficient directories.
+ *
+ * Returns: the hash
+ */
+
+uint32_t
+gfs_dir_hash(const char *data, int len)
+{
+	uint32_t hash = 0xFFFFFFFF;
+
+	for (; len--; data++)
+		hash = crc_32_tab[(hash ^ *data) & 0xFF] ^ (hash >> 8);
+
+	hash = ~hash;
+
+	return hash;
+}
+
+#endif  /* WANT_GFS_CONVERSION_FUNCTIONS */
+


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gfs2-utils.spec	22 Aug 2006 18:25:34 -0000	1.12
+++ gfs2-utils.spec	22 Aug 2006 19:04:20 -0000	1.13
@@ -12,7 +12,7 @@
 
 Name: gfs2-utils
 Version: 0.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)
@@ -26,6 +26,8 @@
 URL: http://sources.redhat.com/cluster/
 Source0: gfs2-%{version}.tar.gz
 Patch1: gfs2-utils-norun.patch
+Patch2: gfs2-tempondisk.patch
+Patch3: gfs2-tempondisk2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -37,12 +39,16 @@
 %prep
 %setup -q -n gfs2-%{version}
 %patch1 -p2 -b .norun
+%patch2 -p1 -b .tempondisk
+%patch3 -p1 -b .tempondisk2
 
 %build
 ./configure --kernel_src=/usr --libdir=%{_libdir}
 sed -i '/RELEASE_MAJOR/s/= .*/= 0/' make/defines.mk
 sed -i '/RELEASE_MINOR/s/= .*/= 1.0/' make/defines.mk
 sed -i '/RELEASE /s/= .*/= %{version}/' make/defines.mk
+mkdir include/linux
+cp include/gfs2_ondisk.h include/linux/
 make
 
 %post
@@ -56,8 +62,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd gfs2
-make copytobin
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -71,6 +75,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Aug 22 2006 Chris Feist <cfeist at redhat.com> 0.1.4-2
+- New Upstream sources.
+
 * Mon Aug 14 2006 Chris Feist <cfeist at redhat.com> 0.1.3-0
 - New Upstream sources, use dist tag.
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 19:18:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 15:18:00 -0400
Subject: rpms/gfs2-utils/devel .cvsignore, 1.6, 1.7 gfs2-utils.spec, 1.13,
	1.14 sources, 1.6, 1.7 gfs2-tempondisk2.patch, 1.1, NONE
Message-ID: <200608221918.k7MJI0Y2011280@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gfs2-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11067

Modified Files:
	.cvsignore gfs2-utils.spec sources 
Removed Files:
	gfs2-tempondisk2.patch 
Log Message:
New upstream sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Aug 2006 18:25:34 -0000	1.6
+++ .cvsignore	22 Aug 2006 19:17:57 -0000	1.7
@@ -1 +1 @@
-gfs2-0.1.4.tar.gz
+gfs2-0.1.5.tar.gz


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gfs2-utils.spec	22 Aug 2006 19:04:20 -0000	1.13
+++ gfs2-utils.spec	22 Aug 2006 19:17:57 -0000	1.14
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: gfs2-utils
-Version: 0.1.4
-Release: 2%{?dist}
+Version: 0.1.5
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)
@@ -27,7 +27,6 @@
 Source0: gfs2-%{version}.tar.gz
 Patch1: gfs2-utils-norun.patch
 Patch2: gfs2-tempondisk.patch
-Patch3: gfs2-tempondisk2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -40,7 +39,6 @@
 %setup -q -n gfs2-%{version}
 %patch1 -p2 -b .norun
 %patch2 -p1 -b .tempondisk
-%patch3 -p1 -b .tempondisk2
 
 %build
 ./configure --kernel_src=/usr --libdir=%{_libdir}
@@ -75,7 +73,7 @@
 %{_mandir}/*/*
 
 %changelog
-* Tue Aug 22 2006 Chris Feist <cfeist at redhat.com> 0.1.4-2
+* Tue Aug 22 2006 Chris Feist <cfeist at redhat.com> 0.1.5-1
 - New Upstream sources.
 
 * Mon Aug 14 2006 Chris Feist <cfeist at redhat.com> 0.1.3-0


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Aug 2006 18:25:34 -0000	1.6
+++ sources	22 Aug 2006 19:17:57 -0000	1.7
@@ -1 +1 @@
-425356776e39901a488d1e17e2cb77cb  gfs2-0.1.4.tar.gz
+f8cd7508e491355a81f409ec6997bc71  gfs2-0.1.5.tar.gz


--- gfs2-tempondisk2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 22 19:36:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 15:36:15 -0400
Subject: rpms/mesa/devel mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch,
	NONE, 1.1 mesa.spec, 1.88, 1.89
Message-ID: <200608221936.k7MJaFKg026312@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26275

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch 
Log Message:
* Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 6.5-24.20060818cvs.fc6
- mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch: Fix a segfault on context
  destruction when selinux is enabled.


mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch:
 radeon_context.c |    9 +++++++--
 radeon_context.h |    1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch ---
--- mesa-cvs/src/mesa/drivers/dri/radeon/radeon_context.h.vtxfmt	2006-04-11 07:41:11.000000000 -0400
+++ mesa-cvs/src/mesa/drivers/dri/radeon/radeon_context.h	2006-08-22 15:30:52.000000000 -0400
@@ -778,6 +778,7 @@
    GLuint TexMatColSwap;
    GLmatrix tmpmat[RADEON_MAX_TEXTURE_UNITS];
    GLuint last_ReallyEnabled;
+   int tcl_mode;
 
    /* VBI
     */
--- mesa-cvs/src/mesa/drivers/dri/radeon/radeon_context.c.vtxfmt	2006-08-21 09:52:12.000000000 -0400
+++ mesa-cvs/src/mesa/drivers/dri/radeon/radeon_context.c	2006-08-22 15:30:54.000000000 -0400
@@ -472,14 +472,19 @@
 
    if (rmesa->radeonScreen->chip_flags & RADEON_CHIPSET_TCL) {
       void *test = NULL;
-      if ((test = _mesa_exec_malloc(64)))
+      if ((test = _mesa_exec_malloc(64))) {
          if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
 	    radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+      } else {
+	  tcl_mode = DRI_CONF_TCL_PIPELINED;
+      }
       if (test)
          _mesa_exec_free(test);
 
       _tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
    }
+
+   rmesa->tcl_mode = tcl_mode;
    return GL_TRUE;
 }
 
@@ -520,7 +525,7 @@
       }
 
       if (!(rmesa->TclFallback & RADEON_TCL_FALLBACK_TCL_DISABLE)) {
-	 int tcl_mode = driQueryOptioni(&rmesa->optionCache, "tcl_mode");
+	 int tcl_mode = rmesa->tcl_mode;
 	 if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
 	    radeonVtxfmtDestroy( rmesa->glCtx );
       }


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- mesa.spec	21 Aug 2006 14:56:35 -0000	1.88
+++ mesa.spec	22 Aug 2006 19:36:12 -0000	1.89
@@ -36,7 +36,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 23.%{snapshot}cvs%{?dist}
+Release: 24.%{snapshot}cvs%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -58,6 +58,7 @@
 Patch12: mesa-modular-dri-dir.patch
 Patch14: mesa-6.5-drop-static-inline.patch
 Patch18: mesa-6.5.1-selinux-awareness.patch
+Patch19: mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch
 
 # General patches from upstream go here:
 
@@ -305,6 +306,7 @@
 %patch11 -p0 -b .multilib-fix
 %patch14 -p0 -b .drop-static-inline
 %patch18 -p1 -b .selinux-awareness
+%patch19 -p1 -b .vtxfmt
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
@@ -504,6 +506,10 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 6.5-24.20060818cvs.fc6
+- mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch: Fix a segfault on context
+  destruction when selinux is enabled.
+
 * Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 6.5-23.20060818cvs.fc6
 - redhat-mesa-driver-install: Reenable installing the tdfx driver. (#203295)
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 19:38:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 15:38:35 -0400
Subject: rpms/gnucash/FC-5 .cvsignore, 1.12.2.8, 1.12.2.9 gnucash.spec,
	1.18.2.19, 1.18.2.20
Message-ID: <200608221938.k7MJcZSW027235@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27205

Modified Files:
      Tag: gnucash-g2-branch
	.cvsignore gnucash.spec 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/.cvsignore,v
retrieving revision 1.12.2.8
retrieving revision 1.12.2.9
diff -u -r1.12.2.8 -r1.12.2.9
--- .cvsignore	13 Jul 2006 03:21:19 -0000	1.12.2.8
+++ .cvsignore	22 Aug 2006 19:38:33 -0000	1.12.2.9
@@ -1,2 +1,2 @@
-gnucash-2.0.0.tar.gz
 gnucash-docs-2.0.0.tar.gz
+gnucash-2.0.1.tar.gz


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/gnucash.spec,v
retrieving revision 1.18.2.19
retrieving revision 1.18.2.20
diff -u -r1.18.2.19 -r1.18.2.20
--- gnucash.spec	8 Aug 2006 19:46:45 -0000	1.18.2.19
+++ gnucash.spec	22 Aug 2006 19:38:33 -0000	1.18.2.20
@@ -7,9 +7,9 @@
 Summary: GnuCash is an application to keep track of your finances.
 Version: 2.0.1
 %if %{buildsvn}
-Release: 2.%{svnrev}svn.1
+Release: 3.%{svnrev}svn.1
 %else
-Release: 1.fc5
+Release: 2.fc5
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -32,7 +32,7 @@
 BuildRequires: libofx-devel, aqbanking-devel, docbook-style-xsl
 BuildRequires: desktop-file-utils, scrollkeeper, texinfo, libtool-ltdl-devel
 BuildRequires: gettext, slib >= 3a1-5, libtool
-Requires: slib >= 3a1-5
+Requires: slib >= 3a1-5, yelp
 # hack
 Requires: perl(Date::Manip)
 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4
@@ -150,7 +150,10 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
-* Tue Aug  8 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-1.fc5
+* Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-2.fc5
+- require yelp (#202266)
+
+* Tue Aug  8 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-2
 - fix schema list
 
 * Tue Aug  1 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-1



From fedora-cvs-commits at redhat.com  Tue Aug 22 19:44:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 15:44:24 -0400
Subject: rpms/strace/devel strace-4.5.14-subcall400.patch, NONE,
	1.1 strace.spec, 1.38, 1.39
Message-ID: <200608221944.k7MJiOwf028935@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/strace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28831

Modified Files:
	strace.spec 
Added Files:
	strace-4.5.14-subcall400.patch 
Log Message:
Fix bogus decoding of syscalls >= 300 (#201462, #202620).

strace-4.5.14-subcall400.patch:
 m68k/syscallent.h    |  192 ++++++++++++++++++++++++++++++++++++-----------
 powerpc/syscallent.h |  205 ++++++++++++++++++++++++++++++++++++++-------------
 s390/syscallent.h    |  190 ++++++++++++++++++++++++++++++++++++-----------
 s390x/syscallent.h   |  190 ++++++++++++++++++++++++++++++++++++-----------
 sh/syscallent.h      |  166 ++++++++++++++++++++++++++++++++++++-----
 sh64/syscallent.h    |  148 +++++++++++++++++++++++++++++++-----
 syscall.h            |    4 
 syscallent.h         |  192 ++++++++++++++++++++++++++++++++++++-----------
 8 files changed, 1013 insertions(+), 274 deletions(-)

--- NEW FILE strace-4.5.14-subcall400.patch ---
2006-08-21  Roland McGrath  <roland at redhat.com>

	* linux/syscall.h (SYS_socket_subcall): Bump to 400.
	* linux/syscallent.h: Update table.
	* linux/m68k/syscallent.h: Likewise.
	* linux/s390/syscallent.h: Likewise.
	* linux/s390x/syscallent.h: Likewise.
	* linux/powerpc/syscallent.h: Likewise.
	* linux/sh/syscallent.h: Likewise.
	* linux/sh64/syscallent.h: Likewise.
	Fixes RH#202620.

Index: strace/linux/syscall.h
diff -u strace/linux/syscall.h:1.46 strace/linux/syscall.h:1.47
--- strace/linux/syscall.h:1.46	Thu Jan 12 14:34:50 2006
+++ strace/linux/syscall.h	Mon Aug 21 23:06:12 2006
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscall.h,v 1.46 2006/01/12 22:34:50 roland Exp $
+ *	$Id: syscall.h,v 1.47 2006/08/22 06:06:12 roland Exp $
  */
 
 #include "dummy.h"
@@ -183,7 +183,7 @@
 #  undef SYS_sendmsg
 #  undef SYS_recvmsg
 # endif /* IA64 */
-#  define SYS_socket_subcall	300
+#  define SYS_socket_subcall	400
 #define SYS_sub_socket		(SYS_socket_subcall + 1)
 #define SYS_sub_bind		(SYS_socket_subcall + 2)
 #define SYS_sub_connect		(SYS_socket_subcall + 3)
Index: strace/linux/syscallent.h
diff -u strace/linux/syscallent.h:1.39 strace/linux/syscallent.h:1.40
--- strace/linux/syscallent.h:1.39	Thu Jan 12 14:34:50 2006
+++ strace/linux/syscallent.h	Mon Aug 21 23:06:12 2006
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscallent.h,v 1.39 2006/01/12 22:34:50 roland Exp $
+ *	$Id: syscallent.h,v 1.40 2006/08/22 06:06:12 roland Exp $
  */
 
 	{ 0,	0,	sys_restart_syscall,	"restart_syscall" }, /* 0 */
@@ -330,54 +330,154 @@
 	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
 	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
 	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
+	{ 5,	0,	printargs,		"SYS_300"	}, /* 300 */
+	{ 5,	0,	printargs,		"SYS_301"	}, /* 301 */
+	{ 5,	0,	printargs,		"SYS_302"	}, /* 302 */
+	{ 5,	0,	printargs,		"SYS_303"	}, /* 303 */
+	{ 5,	0,	printargs,		"SYS_304"	}, /* 304 */
+	{ 5,	0,	printargs,		"SYS_305"	}, /* 305 */
+	{ 5,	0,	printargs,		"SYS_306"	}, /* 306 */
+	{ 5,	0,	printargs,		"SYS_307"	}, /* 307 */
+	{ 5,	0,	printargs,		"SYS_308"	}, /* 308 */
+	{ 5,	0,	printargs,		"SYS_309"	}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"	}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
+	{ 5,	0,	printargs,		"SYS_350"	}, /* 350 */
+	{ 5,	0,	printargs,		"SYS_351"	}, /* 351 */
+	{ 5,	0,	printargs,		"SYS_352"	}, /* 352 */
+	{ 5,	0,	printargs,		"SYS_353"	}, /* 353 */
+	{ 5,	0,	printargs,		"SYS_354"	}, /* 354 */
+	{ 5,	0,	printargs,		"SYS_355"	}, /* 355 */
+	{ 5,	0,	printargs,		"SYS_356"	}, /* 356 */
+	{ 5,	0,	printargs,		"SYS_357"	}, /* 357 */
+	{ 5,	0,	printargs,		"SYS_358"	}, /* 358 */
+	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
+	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
+	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
+	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
+	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
+	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
+	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
+	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
+	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
+	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
+	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
+	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
+	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
+	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
+	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
+	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
+	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
+	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
+	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
+	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
+	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
+	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
+	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
+	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
+	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
+	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
+	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
+	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
+	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
+	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
+	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
+	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
+	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
+	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
+	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
+	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
+	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
+	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
+	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
+	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
+	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
 
-#if SYS_socket_subcall != 300
+#if SYS_socket_subcall != 400
  #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
+	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 404 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 405 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
+	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 412 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
 
-#if SYS_ipc_subcall != 318
+#if SYS_ipc_subcall != 418
  #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 418 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 419 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 420 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 421 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 422 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 423 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 429 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 430 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 431 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 432 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 433 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 439 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 440 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 441 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 442 */
Index: strace/linux/m68k/syscallent.h
diff -u strace/linux/m68k/syscallent.h:1.2 strace/linux/m68k/syscallent.h:1.3
--- strace/linux/m68k/syscallent.h:1.2	Thu Jan 12 14:34:50 2006
+++ strace/linux/m68k/syscallent.h	Mon Aug 21 23:06:13 2006
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscallent.h,v 1.2 2006/01/12 22:34:50 roland Exp $
+ *	$Id: syscallent.h,v 1.3 2006/08/22 06:06:13 roland Exp $
  */
 
 	{ 0,	0,	sys_restart_syscall,	"restart_syscall" }, /* 0 */
@@ -329,54 +329,154 @@
 	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
 	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
 	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
+	{ 5,	0,	printargs,		"SYS_300"	}, /* 300 */
+	{ 5,	0,	printargs,		"SYS_301"	}, /* 301 */
+	{ 5,	0,	printargs,		"SYS_302"	}, /* 302 */
+	{ 5,	0,	printargs,		"SYS_303"	}, /* 303 */
+	{ 5,	0,	printargs,		"SYS_304"	}, /* 304 */
+	{ 5,	0,	printargs,		"SYS_305"	}, /* 305 */
+	{ 5,	0,	printargs,		"SYS_306"	}, /* 306 */
+	{ 5,	0,	printargs,		"SYS_307"	}, /* 307 */
+	{ 5,	0,	printargs,		"SYS_308"	}, /* 308 */
+	{ 5,	0,	printargs,		"SYS_309"	}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"	}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
+	{ 5,	0,	printargs,		"SYS_350"	}, /* 350 */
+	{ 5,	0,	printargs,		"SYS_351"	}, /* 351 */
+	{ 5,	0,	printargs,		"SYS_352"	}, /* 352 */
+	{ 5,	0,	printargs,		"SYS_353"	}, /* 353 */
+	{ 5,	0,	printargs,		"SYS_354"	}, /* 354 */
+	{ 5,	0,	printargs,		"SYS_355"	}, /* 355 */
+	{ 5,	0,	printargs,		"SYS_356"	}, /* 356 */
+	{ 5,	0,	printargs,		"SYS_357"	}, /* 357 */
+	{ 5,	0,	printargs,		"SYS_358"	}, /* 358 */
+	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
+	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
+	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
+	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
+	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
+	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
+	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
+	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
+	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
+	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
+	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
+	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
+	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
+	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
+	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
+	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
+	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
+	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
+	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
+	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
+	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
+	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
+	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
+	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
+	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
+	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
+	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
+	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
+	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
+	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
+	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
+	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
+	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
+	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
+	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
+	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
+	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
+	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
+	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
+	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
+	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
 
-#if SYS_socket_subcall != 300
+#if SYS_socket_subcall != 400
  #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
+	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 404 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 405 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
+	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 412 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
 
-#if SYS_ipc_subcall != 318
+#if SYS_ipc_subcall != 418
  #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 418 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 419 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 420 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 421 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 422 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 423 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 429 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 430 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 431 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 432 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 433 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 439 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 440 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 441 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 442 */
Index: strace/linux/powerpc/syscallent.h
diff -u strace/linux/powerpc/syscallent.h:1.23 strace/linux/powerpc/syscallent.h:1.24
--- strace/linux/powerpc/syscallent.h:1.23	Thu Jan 12 14:34:50 2006
+++ strace/linux/powerpc/syscallent.h	Mon Aug 21 23:17:33 2006
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscallent.h,v 1.23 2006/01/12 22:34:50 roland Exp $
+ *	$Id: syscallent.h,v 1.24 2006/08/22 06:17:33 roland Exp $
  */
 
 	{ 0,	0,	sys_restart_syscall,	"restart_syscall"	}, /* 0 */
@@ -328,54 +328,159 @@
 	{ 5,	0,	printargs,		"SYS_296"		}, /* 296 */
 	{ 5,	0,	printargs,		"SYS_297"		}, /* 297 */
 	{ 5,	0,	printargs,		"SYS_298"		}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"		}, /* 299 */
+	{ 5,	0,	printargs,		"SYS_299"		}, /* 299 */	{ 5,	0,	printargs,		"SYS_300"		}, /* 300 */
+	{ 5,	0,	printargs,		"SYS_301"		}, /* 301 */
+	{ 5,	0,	printargs,		"SYS_302"		}, /* 302 */
+	{ 5,	0,	printargs,		"SYS_303"		}, /* 303 */
+	{ 5,	0,	printargs,		"SYS_304"		}, /* 304 */
+	{ 5,	0,	printargs,		"SYS_305"		}, /* 305 */
+	{ 5,	0,	printargs,		"SYS_306"		}, /* 306 */
+	{ 5,	0,	printargs,		"SYS_307"		}, /* 307 */
+	{ 5,	0,	printargs,		"SYS_308"		}, /* 308 */
+	{ 5,	0,	printargs,		"SYS_309"		}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"		}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"		}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"		}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"		}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"		}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"		}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"		}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"		}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"		}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"		}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"		}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"		}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"		}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"		}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"		}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"		}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"		}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"		}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"		}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"		}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"		}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"		}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"		}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"		}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"		}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"		}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"		}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"		}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"		}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"		}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"		}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"		}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"		}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"		}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"		}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"		}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"		}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"		}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"		}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"		}, /* 349 */
+	{ 5,	0,	printargs,		"SYS_350"		}, /* 350 */
+	{ 5,	0,	printargs,		"SYS_351"		}, /* 351 */
+	{ 5,	0,	printargs,		"SYS_352"		}, /* 352 */
+	{ 5,	0,	printargs,		"SYS_353"		}, /* 353 */
+	{ 5,	0,	printargs,		"SYS_354"		}, /* 354 */
+	{ 5,	0,	printargs,		"SYS_355"		}, /* 355 */
+	{ 5,	0,	printargs,		"SYS_356"		}, /* 356 */
+	{ 5,	0,	printargs,		"SYS_357"		}, /* 357 */
+	{ 5,	0,	printargs,		"SYS_358"		}, /* 358 */
+	{ 5,	0,	printargs,		"SYS_359"		}, /* 359 */
+	{ 5,	0,	printargs,		"SYS_360"		}, /* 360 */
+	{ 5,	0,	printargs,		"SYS_361"		}, /* 361 */
+	{ 5,	0,	printargs,		"SYS_362"		}, /* 362 */
+	{ 5,	0,	printargs,		"SYS_363"		}, /* 363 */
+	{ 5,	0,	printargs,		"SYS_364"		}, /* 364 */
+	{ 5,	0,	printargs,		"SYS_365"		}, /* 365 */
+	{ 5,	0,	printargs,		"SYS_366"		}, /* 366 */
+	{ 5,	0,	printargs,		"SYS_367"		}, /* 367 */
+	{ 5,	0,	printargs,		"SYS_368"		}, /* 368 */
+	{ 5,	0,	printargs,		"SYS_369"		}, /* 369 */
+	{ 5,	0,	printargs,		"SYS_370"		}, /* 370 */
+	{ 5,	0,	printargs,		"SYS_371"		}, /* 371 */
+	{ 5,	0,	printargs,		"SYS_372"		}, /* 372 */
+	{ 5,	0,	printargs,		"SYS_373"		}, /* 373 */
+	{ 5,	0,	printargs,		"SYS_374"		}, /* 374 */
+	{ 5,	0,	printargs,		"SYS_375"		}, /* 375 */
+	{ 5,	0,	printargs,		"SYS_376"		}, /* 376 */
+	{ 5,	0,	printargs,		"SYS_377"		}, /* 377 */
+	{ 5,	0,	printargs,		"SYS_378"		}, /* 378 */
+	{ 5,	0,	printargs,		"SYS_379"		}, /* 379 */
+	{ 5,	0,	printargs,		"SYS_380"		}, /* 380 */
+	{ 5,	0,	printargs,		"SYS_381"		}, /* 381 */
+	{ 5,	0,	printargs,		"SYS_382"		}, /* 382 */
+	{ 5,	0,	printargs,		"SYS_383"		}, /* 383 */
+	{ 5,	0,	printargs,		"SYS_384"		}, /* 384 */
+	{ 5,	0,	printargs,		"SYS_385"		}, /* 385 */
+	{ 5,	0,	printargs,		"SYS_386"		}, /* 386 */
+	{ 5,	0,	printargs,		"SYS_387"		}, /* 387 */
+	{ 5,	0,	printargs,		"SYS_388"		}, /* 388 */
+	{ 5,	0,	printargs,		"SYS_389"		}, /* 389 */
+	{ 5,	0,	printargs,		"SYS_390"		}, /* 390 */
+	{ 5,	0,	printargs,		"SYS_391"		}, /* 391 */
+	{ 5,	0,	printargs,		"SYS_392"		}, /* 392 */
+	{ 5,	0,	printargs,		"SYS_393"		}, /* 393 */
+	{ 5,	0,	printargs,		"SYS_394"		}, /* 394 */
+	{ 5,	0,	printargs,		"SYS_395"		}, /* 395 */
+	{ 5,	0,	printargs,		"SYS_396"		}, /* 396 */
+	{ 5,	0,	printargs,		"SYS_397"		}, /* 397 */
+	{ 5,	0,	printargs,		"SYS_398"		}, /* 398 */
+	{ 5,	0,	printargs,		"SYS_399"		}, /* 399 */
 
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
+#if SYS_socket_subcall != 400
+ #error fix me
+#endif
+	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 404 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 405 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 412 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
 
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	printargs,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
-	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
-	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
-	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
-	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
-	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+#if SYS_ipc_subcall != 418
+ #error fix me
+#endif
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 418 */
+	{ 4,	TI,	printargs,		"semop"		}, /* 419 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 420 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 421 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 422 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 423 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 429 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 430 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 431 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 432 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 433 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 439 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 440 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 441 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 442 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 443 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 444 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 445 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 446 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 447 */
Index: strace/linux/s390/syscallent.h
diff -u strace/linux/s390/syscallent.h:1.13 strace/linux/s390/syscallent.h:1.14
--- strace/linux/s390/syscallent.h:1.13	Thu Dec  1 20:19:13 2005
+++ strace/linux/s390/syscallent.h	Mon Aug 21 23:06:13 2006
@@ -329,54 +329,154 @@
 	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
 	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
 	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
+	{ 5,	0,	printargs,		"SYS_300"	}, /* 300 */
+	{ 5,	0,	printargs,		"SYS_301"	}, /* 301 */
+	{ 5,	0,	printargs,		"SYS_302"	}, /* 302 */
+	{ 5,	0,	printargs,		"SYS_303"	}, /* 303 */
+	{ 5,	0,	printargs,		"SYS_304"	}, /* 304 */
+	{ 5,	0,	printargs,		"SYS_305"	}, /* 305 */
+	{ 5,	0,	printargs,		"SYS_306"	}, /* 306 */
+	{ 5,	0,	printargs,		"SYS_307"	}, /* 307 */
+	{ 5,	0,	printargs,		"SYS_308"	}, /* 308 */
+	{ 5,	0,	printargs,		"SYS_309"	}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"	}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
+	{ 5,	0,	printargs,		"SYS_350"	}, /* 350 */
+	{ 5,	0,	printargs,		"SYS_351"	}, /* 351 */
+	{ 5,	0,	printargs,		"SYS_352"	}, /* 352 */
+	{ 5,	0,	printargs,		"SYS_353"	}, /* 353 */
+	{ 5,	0,	printargs,		"SYS_354"	}, /* 354 */
+	{ 5,	0,	printargs,		"SYS_355"	}, /* 355 */
+	{ 5,	0,	printargs,		"SYS_356"	}, /* 356 */
+	{ 5,	0,	printargs,		"SYS_357"	}, /* 357 */
+	{ 5,	0,	printargs,		"SYS_358"	}, /* 358 */
+	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
+	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
+	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
+	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
+	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
+	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
+	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
+	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
+	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
+	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
+	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
+	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
+	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
+	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
+	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
+	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
+	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
+	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
+	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
+	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
+	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
+	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
+	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
+	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
+	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
+	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
+	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
+	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
+	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
+	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
+	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
+	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
+	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
+	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
+	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
+	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
+	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
+	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
+	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
+	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
+	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
 
-#if SYS_socket_subcall != 300
+#if SYS_socket_subcall != 400
  #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
+	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 404 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 405 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 412 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
 
-#if SYS_ipc_subcall != 318
+#if SYS_ipc_subcall != 418
  #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 418 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 419 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 420 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 421 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 422 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 423 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 429 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 430 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 431 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 432 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 433 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 439 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 440 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 441 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 442 */
Index: strace/linux/s390x/syscallent.h
diff -u strace/linux/s390x/syscallent.h:1.12 strace/linux/s390x/syscallent.h:1.13
--- strace/linux/s390x/syscallent.h:1.12	Thu Dec  1 20:19:13 2005
+++ strace/linux/s390x/syscallent.h	Mon Aug 21 23:06:13 2006
@@ -328,54 +328,154 @@
 	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
 	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
 	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
+	{ 5,	0,	printargs,		"SYS_300"	}, /* 300 */
+	{ 5,	0,	printargs,		"SYS_301"	}, /* 301 */
+	{ 5,	0,	printargs,		"SYS_302"	}, /* 302 */
+	{ 5,	0,	printargs,		"SYS_303"	}, /* 303 */
+	{ 5,	0,	printargs,		"SYS_304"	}, /* 304 */
+	{ 5,	0,	printargs,		"SYS_305"	}, /* 305 */
+	{ 5,	0,	printargs,		"SYS_306"	}, /* 306 */
+	{ 5,	0,	printargs,		"SYS_307"	}, /* 307 */
+	{ 5,	0,	printargs,		"SYS_308"	}, /* 308 */
+	{ 5,	0,	printargs,		"SYS_309"	}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"	}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
+	{ 5,	0,	printargs,		"SYS_350"	}, /* 350 */
+	{ 5,	0,	printargs,		"SYS_351"	}, /* 351 */
+	{ 5,	0,	printargs,		"SYS_352"	}, /* 352 */
+	{ 5,	0,	printargs,		"SYS_353"	}, /* 353 */
+	{ 5,	0,	printargs,		"SYS_354"	}, /* 354 */
+	{ 5,	0,	printargs,		"SYS_355"	}, /* 355 */
+	{ 5,	0,	printargs,		"SYS_356"	}, /* 356 */
+	{ 5,	0,	printargs,		"SYS_357"	}, /* 357 */
+	{ 5,	0,	printargs,		"SYS_358"	}, /* 358 */
+	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
+	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
+	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
+	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
+	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
+	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
+	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
+	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
+	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
+	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
+	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
+	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
+	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
+	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
+	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
+	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
+	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
+	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
+	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
+	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
+	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
+	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
+	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
+	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
+	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
+	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
+	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
+	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
+	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
+	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
+	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
+	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
+	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
+	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
+	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
+	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
+	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
+	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
+	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
+	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
+	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
 
-#if SYS_socket_subcall != 300
+#if SYS_socket_subcall != 400
  #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
+	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 404 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 405 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 412 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
 
-#if SYS_ipc_subcall != 318
+#if SYS_ipc_subcall != 418
  #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 418 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 419 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 420 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 421 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 422 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 423 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 429 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 430 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 431 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 432 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 433 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 439 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 440 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 441 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 442 */
Index: strace/linux/sh/syscallent.h
diff -u strace/linux/sh/syscallent.h:1.8 strace/linux/sh/syscallent.h:1.9
--- strace/linux/sh/syscallent.h:1.8	Thu Jan 12 14:34:50 2006
+++ strace/linux/sh/syscallent.h	Mon Aug 21 23:17:33 2006
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscallent.h,v 1.8 2006/01/12 22:34:50 roland Exp $
+ *	$Id: syscallent.h,v 1.9 2006/08/22 06:17:33 roland Exp $
  */
 
 	{ 0,	0,	sys_restart_syscall,	"restart_syscall"}, /* 0 */
@@ -314,24 +314,150 @@
 	{ 5,	0,	printargs,		"SYS_277"	}, /* 277 */
 	{ 5,	0,	printargs,		"SYS_278"	}, /* 278 */
 	{ 5,	0,	printargs,		"SYS_279"	}, /* 279 */
-
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 280 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 281 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 282 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 283 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 284 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 285 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 286 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 287 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 288 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 289 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 290 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 291 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 292 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 293 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 294 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 295 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 296 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 297 */
+	{ 5,	0,	printargs,		"SYS_280"	}, /* 280 */
+	{ 5,	0,	printargs,		"SYS_281"	}, /* 281 */
+	{ 5,	0,	printargs,		"SYS_282"	}, /* 282 */
+	{ 5,	0,	printargs,		"SYS_283"	}, /* 283 */
+	{ 5,	0,	printargs,		"SYS_284"	}, /* 284 */
+	{ 5,	0,	printargs,		"SYS_285"	}, /* 285 */
+	{ 5,	0,	printargs,		"SYS_286"	}, /* 286 */
+	{ 5,	0,	printargs,		"SYS_287"	}, /* 287 */
+	{ 5,	0,	printargs,		"SYS_288"	}, /* 288 */
+	{ 5,	0,	printargs,		"SYS_289"	}, /* 289 */
+	{ 5,	0,	printargs,		"SYS_290"	}, /* 290 */
+	{ 5,	0,	printargs,		"SYS_291"	}, /* 291 */
+	{ 5,	0,	printargs,		"SYS_292"	}, /* 292 */
+	{ 5,	0,	printargs,		"SYS_293"	}, /* 293 */
+	{ 5,	0,	printargs,		"SYS_294"	}, /* 294 */
+	{ 5,	0,	printargs,		"SYS_295"	}, /* 295 */
+	{ 5,	0,	printargs,		"SYS_296"	}, /* 296 */
+	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
 	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
 	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
+	{ 5,	0,	printargs,		"SYS_300"	}, /* 300 */
+	{ 5,	0,	printargs,		"SYS_301"	}, /* 301 */
+	{ 5,	0,	printargs,		"SYS_302"	}, /* 302 */
+	{ 5,	0,	printargs,		"SYS_303"	}, /* 303 */
+	{ 5,	0,	printargs,		"SYS_304"	}, /* 304 */
+	{ 5,	0,	printargs,		"SYS_305"	}, /* 305 */
+	{ 5,	0,	printargs,		"SYS_306"	}, /* 306 */
+	{ 5,	0,	printargs,		"SYS_307"	}, /* 307 */
+	{ 5,	0,	printargs,		"SYS_308"	}, /* 308 */
+	{ 5,	0,	printargs,		"SYS_309"	}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"	}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
+	{ 5,	0,	printargs,		"SYS_350"	}, /* 350 */
+	{ 5,	0,	printargs,		"SYS_351"	}, /* 351 */
+	{ 5,	0,	printargs,		"SYS_352"	}, /* 352 */
+	{ 5,	0,	printargs,		"SYS_353"	}, /* 353 */
+	{ 5,	0,	printargs,		"SYS_354"	}, /* 354 */
+	{ 5,	0,	printargs,		"SYS_355"	}, /* 355 */
+	{ 5,	0,	printargs,		"SYS_356"	}, /* 356 */
+	{ 5,	0,	printargs,		"SYS_357"	}, /* 357 */
+	{ 5,	0,	printargs,		"SYS_358"	}, /* 358 */
+	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
+	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
+	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
+	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
+	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
+	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
+	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
+	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
+	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
+	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
+	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
+	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
+	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
+	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
+	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
+	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
+	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
+	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
+	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
+	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
+	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
+	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
+	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
+	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
+	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
+	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
+	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
+	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
+	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
+	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
+	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
+	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
+	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
+	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
+	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
+	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
+	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
+	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
+	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
+	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
+	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
+
+#if SYS_ipc_subcall != 400
+ #error fix me
+#endif
+	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 404 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 405 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 412 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
+
+#if SYS_ipc_subcall != 418
+ #error fix me
+#endif
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 418 */
Index: strace/linux/sh64/syscallent.h
diff -u strace/linux/sh64/syscallent.h:1.5 strace/linux/sh64/syscallent.h:1.6
--- strace/linux/sh64/syscallent.h:1.5	Wed Aug  3 04:27:34 2005
+++ strace/linux/sh64/syscallent.h	Mon Aug 21 23:17:33 2006
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscallent.h,v 1.5 2005/08/03 11:27:34 roland Exp $
+ *	$Id: syscallent.h,v 1.6 2006/08/22 06:17:33 roland Exp $
  */
 
 	{ 0,	0,	sys_setup,		"setup"		}, /* 0 */
@@ -328,22 +328,130 @@
 	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
 	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
 	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_300"	}, /* 300 */
+	{ 5,	0,	printargs,		"SYS_301"	}, /* 301 */
+	{ 5,	0,	printargs,		"SYS_302"	}, /* 302 */
+	{ 5,	0,	printargs,		"SYS_303"	}, /* 303 */
+	{ 5,	0,	printargs,		"SYS_304"	}, /* 304 */
+	{ 5,	0,	printargs,		"SYS_305"	}, /* 305 */
+	{ 5,	0,	printargs,		"SYS_306"	}, /* 306 */
+	{ 5,	0,	printargs,		"SYS_307"	}, /* 307 */
+	{ 5,	0,	printargs,		"SYS_308"	}, /* 308 */
+	{ 5,	0,	printargs,		"SYS_309"	}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"	}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
+	{ 5,	0,	printargs,		"SYS_350"	}, /* 350 */
+	{ 5,	0,	printargs,		"SYS_351"	}, /* 351 */
+	{ 5,	0,	printargs,		"SYS_352"	}, /* 352 */
+	{ 5,	0,	printargs,		"SYS_353"	}, /* 353 */
+	{ 5,	0,	printargs,		"SYS_354"	}, /* 354 */
+	{ 5,	0,	printargs,		"SYS_355"	}, /* 355 */
+	{ 5,	0,	printargs,		"SYS_356"	}, /* 356 */
+	{ 5,	0,	printargs,		"SYS_357"	}, /* 357 */
+	{ 5,	0,	printargs,		"SYS_358"	}, /* 358 */
+	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
+	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
+	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
+	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
+	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
+	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
+	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
+	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
+	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
+	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
+	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
+	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
+	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
+	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
+	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
+	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
+	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
+	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
+	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
+	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
+	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
+	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
+	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
+	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
+	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
+	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
+	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
+	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
+	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
+	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
+	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
+	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
+	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
+	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
+	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
+	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
+	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
+	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
+	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
+	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
+	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
+
+#if SYS_ipc_subcall != 400
+ #error fix me
+#endif
+	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 404 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 405 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 412 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
+
+#if SYS_ipc_subcall != 418
+ #error fix me
+#endif
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 418 */


Index: strace.spec
===================================================================
RCS file: /cvs/dist/rpms/strace/devel/strace.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- strace.spec	15 Jul 2006 03:30:48 -0000	1.38
+++ strace.spec	22 Aug 2006 19:44:21 -0000	1.39
@@ -8,6 +8,8 @@
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-root
 
+Patch1: strace-4.5.14-subcall400.patch
+
 %define strace64_arches ppc64
 
 %description
@@ -42,6 +44,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %configure
 make
@@ -75,6 +79,9 @@
 
 
 %changelog
+* Tue Aug 22 2006 Roland McGrath <roland at redhat.com> - 4.5.14-3
+- Fix bogus decoding of syscalls >= 300 (#201462, #202620).
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 4.5.14-2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 19:45:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 15:45:01 -0400
Subject: rpms/strace/devel strace.spec,1.39,1.40
Message-ID: <200608221945.k7MJj1Ze029211@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/strace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29184

Modified Files:
	strace.spec 
Log Message:
missing release bump


Index: strace.spec
===================================================================
RCS file: /cvs/dist/rpms/strace/devel/strace.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- strace.spec	22 Aug 2006 19:44:21 -0000	1.39
+++ strace.spec	22 Aug 2006 19:44:58 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: Tracks and displays system calls associated with a running process.
 Name: strace
 Version: 4.5.14
-Release: 2
+Release: 3
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/



From fedora-cvs-commits at redhat.com  Tue Aug 22 19:46:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 15:46:29 -0400
Subject: rpms/gnucash/devel gnucash.spec,1.53,1.54
Message-ID: <200608221946.k7MJkTtb029767@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29741

Modified Files:
	gnucash.spec 
Log Message:
require perl-Crypt-SSLeay (#203050)


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnucash.spec	12 Aug 2006 00:40:55 -0000	1.53
+++ gnucash.spec	22 Aug 2006 19:46:26 -0000	1.54
@@ -7,9 +7,9 @@
 Summary: GnuCash is an application to keep track of your finances.
 Version: 2.0.1
 %if %{buildsvn}
-Release: 3.%{svnrev}svn.1
+Release: 4%{?dist}.%{svnrev}svn.1
 %else
-Release: 3
+Release: 4%{?dist}
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -35,6 +35,7 @@
 Requires: slib >= 3a1-5, yelp
 # hack
 Requires: perl(Date::Manip)
+Requires: perl(Crypt::SSLeay)
 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4
 %define __perl_requires  %{nil}
 Obsoletes: gnucash-backend-postgres
@@ -150,6 +151,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Aug 22 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-4
+- require perl-Cyrpt-SSLeay (#203050)
+
 * Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-3
 - require yelp (#202266)
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 19:47:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 15:47:39 -0400
Subject: rpms/gnucash/FC-5 gnucash.spec,1.18.2.20,1.18.2.21
Message-ID: <200608221947.k7MJldR6007608@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5914

Modified Files:
      Tag: gnucash-g2-branch
	gnucash.spec 
Log Message:
require perl-Crypt-SSLeay (#203050)


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/gnucash.spec,v
retrieving revision 1.18.2.20
retrieving revision 1.18.2.21
diff -u -r1.18.2.20 -r1.18.2.21
--- gnucash.spec	22 Aug 2006 19:38:33 -0000	1.18.2.20
+++ gnucash.spec	22 Aug 2006 19:47:36 -0000	1.18.2.21
@@ -7,9 +7,9 @@
 Summary: GnuCash is an application to keep track of your finances.
 Version: 2.0.1
 %if %{buildsvn}
-Release: 3.%{svnrev}svn.1
+Release: 4%{?dist}.%{svnrev}svn.1
 %else
-Release: 2.fc5
+Release: 4%{?dist}
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -35,6 +35,7 @@
 Requires: slib >= 3a1-5, yelp
 # hack
 Requires: perl(Date::Manip)
+Requires: perl(Crypt::SSLeay)
 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4
 %define __perl_requires  %{nil}
 Obsoletes: gnucash-backend-postgres
@@ -150,7 +151,10 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
-* Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-2.fc5
+* Tue Aug 22 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-4
+- require perl-Cyrpt-SSLeay (#203050)
+
+* Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-3
 - require yelp (#202266)
 
 * Tue Aug  8 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-2



From fedora-cvs-commits at redhat.com  Tue Aug 22 19:54:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 15:54:50 -0400
Subject: rpms/control-center/devel
	control-center-2.15.91-compiz-support.patch, NONE,
	1.1 control-center.spec, 1.171, 1.172
Message-ID: <200608221954.k7MJsoaZ015885@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15797

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.15.91-compiz-support.patch 
Log Message:
* Tue Aug 22 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.91-6.fc6
- Add support for compiz in keybinding dialog.



control-center-2.15.91-compiz-support.patch:
 common/wm-common.h                        |    1 +
 keybindings/gnome-keybinding-properties.c |   26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

--- NEW FILE control-center-2.15.91-compiz-support.patch ---
--- control-center-2.15.91/capplets/keybindings/gnome-keybinding-properties.c.orig	2006-08-15 18:56:34.000000000 -0400
+++ control-center-2.15.91/capplets/keybindings/gnome-keybinding-properties.c	2006-08-15 18:56:45.000000000 -0400
@@ -64,6 +64,28 @@
   { NULL }
 };
 
+#define COMPIZ_KEY(k) { "/apps/compiz/general/allscreens/options/" #k, ALWAYS_VISIBLE, 0 }
+
+static const KeyListEntry compiz_key_list[] =
+{
+  COMPIZ_KEY (close_window),
+  COMPIZ_KEY (lower_window),
+  COMPIZ_KEY (main_menu),
+  COMPIZ_KEY (maximize_window),
+  COMPIZ_KEY (maximize_window_horizontally),
+  COMPIZ_KEY (maximize_window_vertically),
+  COMPIZ_KEY (minimize_window),
+  COMPIZ_KEY (opacity_decrease),
+  COMPIZ_KEY (opacity_increase),
+  COMPIZ_KEY (show_desktop),
+  COMPIZ_KEY (toggle_window_maximized),
+  COMPIZ_KEY (toggle_window_maximized_horizontally),
+  COMPIZ_KEY (toggle_window_maximized_vertically),
+  COMPIZ_KEY (toggle_window_shaded),
+  COMPIZ_KEY (unmaximize_window),
+  COMPIZ_KEY (window_menu),
+};
+
 static const KeyListEntry metacity_key_list[] =
 {
   { "/apps/metacity/window_keybindings/activate_window_menu",      ALWAYS_VISIBLE,  0 },
@@ -559,6 +581,10 @@
     {
       append_keys_to_tree (dialog, _("Window Management"), metacity_key_list);
     }
+  else if (strcmp((char *) wm_name, WM_COMMON_COMPIZ) == 0)
+    {
+      append_keys_to_tree (dialog, _("Window Management"), compiz_key_list);
+    }
 }
 
 static void
--- control-center-2.15.91/capplets/common/wm-common.h.orig	2006-08-15 18:56:14.000000000 -0400
+++ control-center-2.15.91/capplets/common/wm-common.h	2006-08-15 18:56:45.000000000 -0400
@@ -2,6 +2,7 @@
 #define WM_COMMON_H
 
 #define WM_COMMON_METACITY "Metacity"
+#define WM_COMMON_COMPIZ   "compiz"
 #define WM_COMMON_SAWFISH  "Sawfish"
 #define WM_COMMON_UNKNOWN  "Unknown"
 


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- control-center.spec	21 Aug 2006 16:36:12 -0000	1.171
+++ control-center.spec	22 Aug 2006 19:54:48 -0000	1.172
@@ -39,6 +39,7 @@
 Patch10: control-center-2.15.4-finish.patch
 Patch11: control-center-2.15.91-search.patch
 Patch12: control-center-2.15.91-fix-thumbnailing.patch
+Patch13: control-center-2.15.91-compiz-support.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -135,6 +136,7 @@
 %patch10 -p1 -b .finish
 %patch11 -p1 -b .search
 %patch12 -p1 -b .fix-thumbnailing
+%patch13 -p1 -b .compiz-support.patch
 
 %build
 
@@ -272,6 +274,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Aug 22 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.91-6.fc6
+- Add support for compiz in keybinding dialog.
+
 * Mon Aug 21 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-5.fc6
 - When creating new thumbnails, record thumbnail location rather
   that regenerating them over and over again.



From fedora-cvs-commits at redhat.com  Tue Aug 22 19:56:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 15:56:33 -0400
Subject: rpms/control-center/devel control-center.spec,1.172,1.173
Message-ID: <200608221956.k7MJuXt3016568@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16542

Modified Files:
	control-center.spec 
Log Message:
Bump


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- control-center.spec	22 Aug 2006 19:54:48 -0000	1.172
+++ control-center.spec	22 Aug 2006 19:56:30 -0000	1.173
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.91
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops



From fedora-cvs-commits at redhat.com  Tue Aug 22 20:05:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 16:05:19 -0400
Subject: rpms/kernel/devel linux-2.6-libertas.diff, NONE,
	1.1 config-olpc-generic, 1.1, 1.2 kernel-2.6.spec, 1.2583, 1.2584
Message-ID: <200608222005.k7MK5Jgh018335@cvs.devel.redhat.com>

Author: mtosatti

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18284

Modified Files:
	config-olpc-generic kernel-2.6.spec 
Added Files:
	linux-2.6-libertas.diff 
Log Message:
Add Marvell Libertas wireless driver



linux-2.6-libertas.diff:
 drivers/net/wireless/Kconfig                          |   13 
 drivers/net/wireless/Makefile                         |    2 
 drivers/net/wireless/libertas/Makefile                |   16 
 drivers/net/wireless/libertas/Makefile.old            |  205 +
 drivers/net/wireless/libertas/README                  |  831 +++++
 drivers/net/wireless/libertas/config/hostcmd.conf     |   75 
 drivers/net/wireless/libertas/host.h                  |  460 ++
 drivers/net/wireless/libertas/hostcmd.h               |  965 ++++++
 drivers/net/wireless/libertas/if_usb.c                | 1085 ++++++
 drivers/net/wireless/libertas/if_usb.h                |  114 
 drivers/net/wireless/libertas/radiotap.h              |   96 
 drivers/net/wireless/libertas/sbi.h                   |  125 
 drivers/net/wireless/libertas/wlan_11d.c              |  872 +++++
 drivers/net/wireless/libertas/wlan_11d.h              |  160 +
 drivers/net/wireless/libertas/wlan_cmd.c              | 2282 ++++++++++++++
 drivers/net/wireless/libertas/wlan_cmdresp.c          | 1243 +++++++
 drivers/net/wireless/libertas/wlan_debugfs.c          |  314 ++
 drivers/net/wireless/libertas/wlan_debugfs.h          |    6 
 drivers/net/wireless/libertas/wlan_decl.h             |  108 
 drivers/net/wireless/libertas/wlan_defs.h             |  571 +++
 drivers/net/wireless/libertas/wlan_dev.h              |  412 ++
 drivers/net/wireless/libertas/wlan_fw.c               |  442 ++
 drivers/net/wireless/libertas/wlan_fw.h               |   44 
 drivers/net/wireless/libertas/wlan_ioctl.c            | 2817 ++++++++++++++++++
 drivers/net/wireless/libertas/wlan_join.c             | 1602 ++++++++++
 drivers/net/wireless/libertas/wlan_join.h             |   99 
 drivers/net/wireless/libertas/wlan_main.c             | 1163 +++++++
 drivers/net/wireless/libertas/wlan_rx.c               |  482 +++
 drivers/net/wireless/libertas/wlan_scan.c             | 2337 ++++++++++++++
 drivers/net/wireless/libertas/wlan_scan.h             |  319 ++
 drivers/net/wireless/libertas/wlan_thread.h           |   69 
 drivers/net/wireless/libertas/wlan_tx.c               |  374 ++
 drivers/net/wireless/libertas/wlan_types.h            |  349 ++
 drivers/net/wireless/libertas/wlan_version.h          |   36 
 drivers/net/wireless/libertas/wlan_wext.c             | 2745 +++++++++++++++++
 drivers/net/wireless/libertas/wlan_wext.h             |  281 +
 drivers/net/wireless/libertas/wlanconfig/Makefile     |   61 
 drivers/net/wireless/libertas/wlanconfig/wlanconfig.c | 2255 ++++++++++++++
 drivers/net/wireless/libertas/wlanconfig/wlanconfig.h |   82 
 include/net/ieee80211_radiotap.h                      |   23 
 40 files changed, 25533 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-libertas.diff ---
diff -Nur -p linux-2.6-orig/drivers/net/wireless/Kconfig linux-2.6-libertas/drivers/net/wireless/Kconfig
--- linux-2.6-orig/drivers/net/wireless/Kconfig	2006-08-06 15:20:11.000000000 -0300
+++ linux-2.6-libertas/drivers/net/wireless/Kconfig	2006-08-22 01:37:03.000000000 -0300
@@ -291,6 +291,19 @@ config IPW2200_DEBUG
 	  If you are not trying to debug or develop the IPW2200 driver, you 
 	  most likely want to say N here.
 
+config LIBERTAS_USB
+	tristate "Marvell Libertas 802.11a/b/g cards"
+	depends on NET_RADIO && USB
+	select FW_LOADER
+	---help---
+	  A driver for Marvel Libertas USB devices.
+
+config LIBERTAS_USB_DEBUG
+	bool "Enable full debugging output in the Libertas USB module."
+	depends on LIBERTAS_USB
+	---help---
+	  Debugging support.
+
 config AIRO
 	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
  	depends on NET_RADIO && ISA_DMA_API && (PCI || BROKEN)
diff -Nur -p linux-2.6-orig/drivers/net/wireless/libertas/config/hostcmd.conf linux-2.6-libertas/drivers/net/wireless/libertas/config/hostcmd.conf
--- linux-2.6-orig/drivers/net/wireless/libertas/config/hostcmd.conf	1969-12-31 21:00:00.000000000 -0300
+++ linux-2.6-libertas/drivers/net/wireless/libertas/config/hostcmd.conf	2006-08-22 01:37:03.000000000 -0300
@@ -0,0 +1,75 @@
+#	File : hostcmd.conf
+#
+# (c) Copyright ? 2003-2006, Marvell International Ltd. 
+# All Rights Reserved
+#
+# This software file (the "File") is distributed by Marvell International 
+# Ltd. under the terms of the GNU General Public License Version 2, June 1991 
+# (the "License").  You may use, redistribute and/or modify this File in 
+# accordance with the terms and conditions of the License, a copy of which 
+# is available along with the File in the license.txt file or by writing to 
+# the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+# 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+#
+# THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE 
+# IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE 
+# ARE EXPRESSLY DISCLAIMED.  The License provides additional details about 
+# this warranty disclaimer.
+#
+
+
+######################### Subscribe Events command ##################
+subevent_get={
+	CmdCode=0x0075		# do NOT change this line
+
+	Action:2=0		# GET
+	Events:2=0
+}
+
+subevent_set={
+	CmdCode=0x0075		# do NOT change this line
+
+	Action:2=1		# SET
+	Events:2=0x3f		# bit0 - RSSI_LOW; bit1 - SNR_LOW
+				# bit2 - FAILED_COUNT; bit3 - Beacon Missed
+				# bit4 - RSSI_HIGH; bit5 - SNR_HIGH
+				# bit6-15 reserved
+
+	LowRssiTlvType:2=0x0104
+	LowRssiTlvLength:2={
+		Threshold:1=40
+		ReportingFreq:1=0
+	}
+
+	LowSnrTlvType:2=0x0105
+	LowSnrTlvLength:2={
+		Threshold:1=56
+		ReportingFreq:1=0
+	}
+
+	FailedCountTlvType:2=0x0106
+	FailedCountTlvLength:2={
+		Threshold:1=5
+		ReportingFreq:1=0
+	}
+
+	BeaconMissTlvType:2=0x0107
+	BeaconMissTlvLength:2={
+		BeaconMissed:1=60
+		Reserved:1=0
+	}
+
+	HighRssiTlvType:2=0x0116
+	HighRssiTlvLength:2={
+		Threshold:1=70
+		ReportingFreq:1=0
+	}
+
+	HighSnrTlvType:2=0x0117
+	HighSnrTlvLength:2={
+		Threshold:1=86
+		ReportingFreq:1=0
+	}
+}
+######################### Subscribe Events command ##################
+
diff -Nur -p linux-2.6-orig/drivers/net/wireless/libertas/hostcmd.h linux-2.6-libertas/drivers/net/wireless/libertas/hostcmd.h
--- linux-2.6-orig/drivers/net/wireless/libertas/hostcmd.h	1969-12-31 21:00:00.000000000 -0300
+++ linux-2.6-libertas/drivers/net/wireless/libertas/hostcmd.h	2006-08-22 01:37:03.000000000 -0300
@@ -0,0 +1,965 @@
+/* @file hostcmd.h
+ * 
+ * @brief This file contains the function prototypes, data structure 
+ * and defines for all the host/station commands
+ *
+ * (c) Copyright ? 2003-2006, Marvell International Ltd. 
+ * All Rights Reserved
+ *
+ * This software file (the "File") is distributed by Marvell International 
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991 
+ * (the "License").  You may use, redistribute and/or modify this File in 
+ * accordance with the terms and conditions of the License, a copy of which 
+ * is available along with the File in the license.txt file or by writing to 
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ * 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about 
+ * this warranty disclaimer.
+ *
+ */
+/********************************************************
+Change log:
+	10/11/05: Add Doxygen format comments
+	01/11/06: Update association struct to reflect IEEE passthrough response
+		  Conditionalize new scan/join structures
+	04/10/06: Add hostcmd generic API and power_adapt_cfg_ext command
+	04/18/06: Remove old Subscrive Event and add new Subscribe Event
+		  implementation through generic hostcmd API
+	
+********************************************************/
+
+#ifndef __HOSTCMD__H
+#define __HOSTCMD__H
+
+#include "wlan_11d.h"
+#include "wlan_types.h"
+
+/* 802.11-related definitions */
+
+/* TxPD descriptor */
+struct TxPD {
+	/* Current Tx packet status */
+	u32 TxStatus;
+	/* Tx Control */
+	u32 TxControl;
+	u32 TxPacketLocation;
+	/* Tx packet length */
+	u16 TxPacketLength;
+	/* First 2 byte of destination MAC address */
+	u8 TxDestAddrHigh[2];
+	/* Last 4 byte of destination MAC address */
+	u8 TxDestAddrLow[4];
+	/* Pkt Priority */
+	u8 Priority;
+	/* Pkt Trasnit Power control */
+	u8 PowerMgmt;
+	/* Amount of time the packet has been queued in the driver (units = 2ms) */
+	u8 PktDelay_2ms;
+	/* Reserved */
+	u8 Reserved1;
+};
+
+/* RxPD Descriptor */
+struct RxPD {
+	/* Current Rx packet status */
+	u16 Status;
+
+	/* SNR */
+	u8 SNR;
+
+	/* Tx Control */
+	u8 RxControl;
+
+	/* Pkt Length */
+	u16 PktLen;
+
+	/* Noise Floor */
+	u8 NF;
+
+	/* Rx Packet Rate */
+	u8 RxRate;
+
+	/* Pkt addr */
+	u32 PktPtr;
+
+	/* Next Rx RxPD addr */
+	u32 NextRxPDPtr;
+
+	/* Pkt Priority */
+	u8 Priority;
+	u8 Reserved[3];
[...25321 lines suppressed...]
+#define WLAN_SET64CHAR_GET64CHAR	(WLANIOCTL + 25)
+#define WLANSLEEPPARAMS 			2
+#define WLANSCAN_MODE				6
+
+#define WLAN_GET_ADHOC_STATUS			9
+
+#define WLAN_SUBCMD_DFT_ADD			15
+#define WLAN_SUBCMD_DFT_DEL   			16
+#define WLAN_SUBCMD_DFT_LIST			17
+#define WLAN_SUBCMD_BT_ADD			18
+#define WLAN_SUBCMD_BT_DEL   			19
+#define WLAN_SUBCMD_BT_LIST			20
+
+#define WLANEXTSCAN			(WLANIOCTL + 26)
+
+#define WLAN_SET_GET_SIXTEEN_INT       (WLANIOCTL + 29)
+#define WLAN_TPCCFG                             1
+#define WLAN_POWERCFG                           2
+
+#define WLAN_AUTO_FREQ_SET			3
+#define WLAN_AUTO_FREQ_GET			4
+#define WLAN_LED_GPIO_CTRL			5
+#define WLAN_SCANPROBES 			6
+#define WLAN_SLEEP_PERIOD			7
+#define	WLAN_ADAPT_RATESET			8
+#define	WLAN_INACTIVITY_TIMEOUT			9
+#define WLANSNR					10
+#define WLAN_GET_RATE				11
+#define	WLAN_GET_RXINFO				12
+
+#define WLANCMD52RDWR			(WLANIOCTL + 30)
+#define WLANCMD53RDWR			(WLANIOCTL + 31)
+#define CMD53BUFLEN				32
+
+#define	REG_MAC					0x19
+#define	REG_BBP					0x1a
+#define	REG_RF					0x1b
+#define	REG_EEPROM				0x59
+#define WLAN_LINKMODE_802_3			0
+#define WLAN_LINKMODE_802_11			2
+#define WLAN_RADIOMODE_NONE    			0
+#define WLAN_RADIOMODE_RADIOTAP			2
+
+#define	CMD_DISABLED				0
+#define	CMD_ENABLED				1
+#define	CMD_GET					2
+#define SKIP_CMDNUM				4
+#define SKIP_TYPE				1
+#define SKIP_SIZE				2
+#define SKIP_ACTION				2
+#define SKIP_TYPE_SIZE			(SKIP_TYPE + SKIP_SIZE)
+#define SKIP_TYPE_ACTION		(SKIP_TYPE + SKIP_ACTION)
+
+/** wlan_ioctl */
+typedef struct _wlan_ioctl {
+	/** Command ID */
+	u16 command;
+	/** data length */
+	u16 len;
+	/** data pointer */
+	u8 *data;
+} wlan_ioctl;
+
+/** wlan_ioctl_rfantenna */
+typedef struct _wlan_ioctl_rfantenna {
+	u16 Action;
+	u16 AntennaMode;
+} wlan_ioctl_rfantenna;
+
+/** wlan_ioctl_regrdwr */
+typedef struct _wlan_ioctl_regrdwr {
+	/** Which register to access */
+	u16 WhichReg;
+	/** Read or Write */
+	u16 Action;
+	u32 Offset;
+	u16 NOB;
+	u32 Value;
+} wlan_ioctl_regrdwr;
+
+/** wlan_ioctl_cfregrdwr */
+typedef struct _wlan_ioctl_cfregrdwr {
+	/** Read or Write */
+	u8 Action;
+	/** register address */
+	u16 Offset;
+	/** register value */
+	u16 Value;
+} wlan_ioctl_cfregrdwr;
+
+/** wlan_ioctl_rdeeprom */
+typedef struct _wlan_ioctl_rdeeprom {
+	u16 WhichReg;
+	u16 Action;
+	u16 Offset;
+	u16 NOB;
+	u8 Value;
+} wlan_ioctl_rdeeprom;
+
+/** wlan_ioctl_adhoc_key_info */
+typedef struct _wlan_ioctl_adhoc_key_info {
+	u16 action;
+	u8 key[16];
+	u8 tkiptxmickey[16];
+	u8 tkiprxmickey[16];
+} wlan_ioctl_adhoc_key_info;
+
+#ifdef __KERNEL__
+extern struct iw_handler_def libertas_handler_def;
+int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int i);
+int wlan_radio_ioctl(wlan_private * priv, u8 option);
+/* this one should not be needed in do_ioctl */
+int wlan_set_encode(struct net_device *dev, struct iw_request_info *info,
+			   struct iw_point *dwrq, char *extra);
+#endif
+
+/** sleep_params */
+typedef struct _wlan_ioctl_sleep_params_config {
+	u16 Action;
+	u16 Error;
+	u16 Offset;
+	u16 StableTime;
+	u8 CalControl;
+	u8 ExtSleepClk;
+	u16 Reserved;
+} __attribute__ ((packed)) wlan_ioctl_sleep_params_config,
+    *pwlan_ioctl_sleep_params_config;
+
+/** BCA TIME SHARE */
+typedef struct _wlan_ioctl_bca_timeshare_config {
+	/** ACT_GET/ACT_SET */
+	u16 Action;
+	/** Type: WLAN, BT */
+	u16 TrafficType;
+	/** Interval: 20msec - 60000msec */
+	u32 TimeShareInterval;
+	/** PTA arbiter time in msec */
+	u32 BTTime;
+} __attribute__ ((packed)) wlan_ioctl_bca_timeshare_config,
+    *pwlan_ioctl_bca_timeshare_config;
+
+typedef struct _wlan_ioctl_reassociation_info {
+	u8 CurrentBSSID[6];
+	u8 DesiredBSSID[6];
+	char DesiredSSID[IW_ESSID_MAX_SIZE + 1];
+} __attribute__ ((packed)) wlan_ioctl_reassociation_info;
+
+#endif				/* _WLAN_WEXT_H_ */
diff -Nur -p linux-2.6-orig/drivers/net/wireless/Makefile linux-2.6-libertas/drivers/net/wireless/Makefile
--- linux-2.6-orig/drivers/net/wireless/Makefile	2006-08-06 15:20:11.000000000 -0300
+++ linux-2.6-libertas/drivers/net/wireless/Makefile	2006-08-22 01:37:03.000000000 -0300
@@ -36,7 +36,7 @@ obj-$(CONFIG_PRISM54)		+= prism54/
 
 obj-$(CONFIG_HOSTAP)		+= hostap/
 obj-$(CONFIG_BCM43XX)		+= bcm43xx/
-obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
+obj-$(CONFIG_LIBERTAS_USB)	+= libertas/
 
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
diff -Nur -p linux-2.6-orig/include/net/ieee80211_radiotap.h linux-2.6-libertas/include/net/ieee80211_radiotap.h
--- linux-2.6-orig/include/net/ieee80211_radiotap.h	2006-08-06 15:20:11.000000000 -0300
+++ linux-2.6-libertas/include/net/ieee80211_radiotap.h	2006-08-22 01:37:03.000000000 -0300
@@ -168,6 +168,23 @@ struct ieee80211_radiotap_header {
  *      Unitless indication of the Rx/Tx antenna for this packet.
  *      The first antenna is antenna 0.
  *
+ * IEEE80211_RADIOTAP_RX_FLAGS          u_int16_t       bitmap
+ *
+ *     Properties of received frames. See flags defined below.
+ *
+ * IEEE80211_RADIOTAP_TX_FLAGS          u_int16_t       bitmap
+ *
+ *     Properties of transmitted frames. See flags defined below.
+ *
+ * IEEE80211_RADIOTAP_RTS_RETRIES       u_int8_t        data
+ *
+ *     Number of rts retries a transmitted frame used.
+ *
+ * IEEE80211_RADIOTAP_DATA_RETRIES      u_int8_t        data
+ *
+ *     Number of unicast retries a transmitted frame used.
+ *
+ *
  * IEEE80211_RADIOTAP_FCS           	u32       data
  *
  *	FCS from frame in network byte order.
@@ -187,7 +204,11 @@ enum ieee80211_radiotap_type {
 	IEEE80211_RADIOTAP_ANTENNA = 11,
 	IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
 	IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
-	IEEE80211_RADIOTAP_EXT = 31,
+	IEEE80211_RADIOTAP_RX_FLAGS = 14,
+	IEEE80211_RADIOTAP_TX_FLAGS = 15,
+	IEEE80211_RADIOTAP_RTS_RETRIES = 16,
+	IEEE80211_RADIOTAP_DATA_RETRIES = 17,
+	IEEE80211_RADIOTAP_EXT = 31
 };
 
 /* Channel flags. */


Index: config-olpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/config-olpc-generic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-olpc-generic	17 Aug 2006 22:42:52 -0000	1.1
+++ config-olpc-generic	22 Aug 2006 20:05:03 -0000	1.2
@@ -222,6 +222,8 @@
 # CONFIG_NET_WIRELESS_RTNETLINK is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
+CONFIG_LIBERTAS_USB=m
+# CONFIG_LIBERTAS_USB_DEBUG is not set
 # CONFIG_AIRO is not set
 # CONFIG_HERMES is not set
 # CONFIG_ATMEL is not set


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2583
retrieving revision 1.2584
diff -u -r1.2583 -r1.2584
--- kernel-2.6.spec	22 Aug 2006 04:20:35 -0000	1.2583
+++ kernel-2.6.spec	22 Aug 2006 20:05:12 -0000	1.2584
@@ -420,6 +420,7 @@
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
 Patch1780: linux-2.6-ehea-ethernet-driver.patch
 Patch1790: linux-2.6-drivers-add-qlogic-firmware.patch
+Patch1791: linux-2.6-libertas.diff
 
 # SELinux/audit patches.
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
@@ -946,6 +947,11 @@
 # qlogic firmware
 %patch1790 -p1
 
+# Marvell Libertas wireless driver (OLPC only)
+%if 0%{?olpc}
+%patch1791 -p1
+%endif
+
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1
 # Add support for SELinux range transitions
@@ -1719,6 +1725,9 @@
 %endif
 
 %changelog
+* Tue Aug 22 2006 Marcelo Tosatti <mtosatti at redhat.com>
+- Add Libertas wireless driver
+
 * Mon Aug 21 2006 Roland McGrath <roland at redhat.com>
 - New utrace patch: experimental support for ia64, sparc64.
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 20:11:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 16:11:28 -0400
Subject: rpms/evolution/devel evolution-2.7.92-uninitialized-gerror.patch,
	NONE, 1.1 evolution-2.7.91-fix-duplicate-alarm.patch, 1.1,
	1.2 evolution.spec, 1.183, 1.184
Message-ID: <200608222011.k7MKBSse019710@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19501

Modified Files:
	evolution-2.7.91-fix-duplicate-alarm.patch evolution.spec 
Added Files:
	evolution-2.7.92-uninitialized-gerror.patch 
Log Message:

* Tue Aug 22 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-3.fc6
- Replace my patch for RH bug #202383 with a better one from upstream.
- Add patch for Gnome.org bug #352423.


evolution-2.7.92-uninitialized-gerror.patch:
 calendar/gui/e-itip-control.c                       |    2 +-
 plugins/itip-formatter/itip-formatter.c             |    2 +-
 plugins/mailing-list-actions/mailing-list-actions.c |    3 +--
 widgets/misc/e-multi-config-dialog.c                |    4 +---
 4 files changed, 4 insertions(+), 7 deletions(-)

--- NEW FILE evolution-2.7.92-uninitialized-gerror.patch ---
--- evolution-2.7.92/widgets/misc/e-multi-config-dialog.c.uninitialized-gerror	2006-08-22 12:33:44.000000000 -0400
+++ evolution-2.7.92/widgets/misc/e-multi-config-dialog.c	2006-08-22 12:33:59.000000000 -0400
@@ -186,12 +186,10 @@
 impl_response (GtkDialog *dialog, int response_id)
 {
 	EMultiConfigDialog *multi_config_dialog;
-	GError *error;
+	GError *error = NULL;
 
 	multi_config_dialog = E_MULTI_CONFIG_DIALOG (dialog);
 
-	error = NULL;
-
 	switch (response_id) {
 	case GTK_RESPONSE_HELP:
 		gnome_help_display_desktop (NULL,
--- evolution-2.7.92/plugins/mailing-list-actions/mailing-list-actions.c.uninitialized-gerror	2006-08-22 12:29:43.000000000 -0400
+++ evolution-2.7.92/plugins/mailing-list-actions/mailing-list-actions.c	2006-08-22 12:29:55.000000000 -0400
@@ -99,7 +99,6 @@
 	const char* header = NULL, *headerpos;
 	char *end, *url = NULL;
 	int t;
-	GError *err;
 	EMsgComposer *composer;
 	int send_message_response;
 	EAccount *account;
@@ -160,7 +159,7 @@
 
 			goto exit;
 		} else {
-			err = NULL;
+			GError *err = NULL;
 			gnome_url_show (url, &err);
 			if (!err)
 				goto exit;
--- evolution-2.7.92/plugins/itip-formatter/itip-formatter.c.uninitialized-gerror	2006-08-22 12:31:08.000000000 -0400
+++ evolution-2.7.92/plugins/itip-formatter/itip-formatter.c	2006-08-22 12:31:23.000000000 -0400
@@ -994,7 +994,7 @@
 	icalcomponent *icalcomp = NULL, *org_icalcomp;
 	const char *uid, *rid;
 	const char *delegate;
-	GError *error;
+	GError *error = NULL;
 	
 	/* Obtain our version */
 	e_cal_component_get_uid (pitip->comp, &uid);
--- evolution-2.7.92/calendar/gui/e-itip-control.c.uninitialized-gerror	2006-08-22 12:25:45.000000000 -0400
+++ evolution-2.7.92/calendar/gui/e-itip-control.c	2006-08-22 12:25:59.000000000 -0400
@@ -1916,7 +1916,7 @@
 	icalcomponent *icalcomp = NULL;
 	const char *uid;
 	GtkWidget *dialog;
-	GError *error;
+	GError *error = NULL;
 	
 	priv = itip->priv;
 	

evolution-2.7.91-fix-duplicate-alarm.patch:
 event-page.c |   34 ++++++++++++++--------------------
 1 files changed, 14 insertions(+), 20 deletions(-)

Index: evolution-2.7.91-fix-duplicate-alarm.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.91-fix-duplicate-alarm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.7.91-fix-duplicate-alarm.patch	14 Aug 2006 18:59:55 -0000	1.1
+++ evolution-2.7.91-fix-duplicate-alarm.patch	22 Aug 2006 20:11:25 -0000	1.2
@@ -1,32 +1,59 @@
---- evolution-2.7.91/calendar/gui/dialogs/event-page.c.fix-duplicate-alarm	2006-08-14 03:32:52.000000000 -0400
-+++ evolution-2.7.91/calendar/gui/dialogs/event-page.c	2006-08-14 03:39:04.000000000 -0400
-@@ -2925,7 +2925,8 @@
- 	
+--- evolution-2.7.92/calendar/gui/dialogs/event-page.c.fix-duplicate-alarm	2006-08-22 15:28:23.000000000 -0400
++++ evolution-2.7.92/calendar/gui/dialogs/event-page.c	2006-08-22 15:28:34.000000000 -0400
+@@ -2922,42 +2922,36 @@
+ 	/* Add the user defined time if necessary */
+ 	priv->alarm_units = calendar_config_get_default_reminder_units ();
+ 	priv->alarm_interval = calendar_config_get_default_reminder_interval ();
+-	
++
++	menu_label = "";	
  	switch (priv->alarm_units) {
  	case CAL_DAYS:
 -		if (priv->alarm_interval != -1) {
-+                /* Note: "1 day before appointment" is already in menu */
-+		if (priv->alarm_interval != -1 && priv->alarm_interval != 1) {
++		if (priv->alarm_interval != 1) {
  			menu_label = g_strdup_printf (ngettext("%d day before appointment", "%d days before appointment", priv->alarm_interval), priv->alarm_interval);
- 		} else {
- 			priv->alarm_interval = -1;
-@@ -2933,7 +2934,8 @@
+-		} else {
+-			priv->alarm_interval = -1;
+-		}
++		} 
  		break;
  		
  	case CAL_HOURS:
 -		if (priv->alarm_interval != -1) {
-+                /* Note: "1 hour before appointment" is already in menu */
-+		if (priv->alarm_interval != -1 && priv->alarm_interval != 1) {
++		if (priv->alarm_interval != 1) {
  			menu_label = g_strdup_printf (ngettext("%d hour before appointment", "%d hours before appointment", priv->alarm_interval), priv->alarm_interval);
- 		} else {
- 			priv->alarm_interval = -1;
-@@ -2941,7 +2943,8 @@
+-		} else {
+-			priv->alarm_interval = -1;
+-		}
++		} 
  		break;
  		
  	case CAL_MINUTES:
 -		if (priv->alarm_interval != -1) {
-+                /* Note: "15 minutes before appointment" is already in menu */
-+		if (priv->alarm_interval != -1 && priv->alarm_interval != 15) {
++		if (priv->alarm_interval != 15) {
  			menu_label = g_strdup_printf (ngettext("%d minute before appointement", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval);
- 		} else {
- 			priv->alarm_interval = -1;
+-		} else {
+-			priv->alarm_interval = -1;
+-		}
++		} 
+ 		break;
+ 	}
+-	
+-	if (menu_label) {
+-		GtkWidget *item, *menu;
+ 
+-		item = gtk_menu_item_new_with_label (menu_label);
+-		gtk_widget_show (item);
+-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->alarm_time));
+-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
++	cus_item = gtk_menu_item_new_with_label (menu_label);
++	if(menu_label[0] != '\0') {
++		gtk_widget_show (cus_item);
+ 	}
+ 
++	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->alarm_time));
++	gtk_menu_shell_append (GTK_MENU_SHELL (menu), cus_item); 
++
+ 	cus_item = gtk_menu_item_new_with_label (_("Customize"));
+ 	gtk_widget_show (cus_item);
+ 	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->alarm_time));


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- evolution.spec	21 Aug 2006 18:46:19 -0000	1.183
+++ evolution.spec	22 Aug 2006 20:11:25 -0000	1.184
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -125,6 +125,9 @@
 # Gnome.org bug #352248
 Patch33: evolution-2.7.91-provide-camel-exception.patch
 
+# Gnome.org bug #352423
+Patch34: evolution-2.7.92-uninitialized-gerror.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -260,6 +263,7 @@
 %patch31 -p1 -b .fix-duplicate-alarm
 %patch32 -p1 -b .mail-account-disable
 %patch33 -p1 -b .provide-camel-exception
+%patch34 -p1 -b .uninitialized-gerror
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -650,6 +654,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Aug 22 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-3.fc6
+- Replace my patch for RH bug #202383 with a better one from upstream.
+- Add patch for Gnome.org bug #352423.
+
 * Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-2.fc6
 - Add patch for Gnome.org bug #352248 (and remember to commit it).
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 20:20:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 16:20:02 -0400
Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec, 1.19,
	1.20
Message-ID: <200608222020.k7MKK2Vw005143@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5097

Modified Files:
	gnome-python-desktop.spec 
Log Message:
* Tue Aug 22 2006 Dan Williams <dcbw at redhat.com> - 2.15.90-2.fc6
- Remove unecessary dependencies on gnome-python2-desktop from
    -libwnck and -rsvg subpackages (OLPC)




Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-python-desktop.spec	4 Aug 2006 19:35:13 -0000	1.19
+++ gnome-python-desktop.spec	22 Aug 2006 20:19:55 -0000	1.20
@@ -15,7 +15,7 @@
 Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop.
 Name: gnome-python2-desktop
 Version: 2.15.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL/LGPL
 Group: Development/Languages
 Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-desktop/2.13/gnome-python-desktop-%{version}.tar.bz2
@@ -84,7 +84,6 @@
 
 
 %package -n gnome-python2-libwnck
-Requires: %{name} = %{version}-%{release}
 Summary: Python bindings for interacting with libwnck
 Group: Development/Languages
 Requires:  libwnck >= %{libwnck_version}
@@ -136,7 +135,6 @@
 via Python.
 
 %package -n gnome-python2-rsvg
-Requires: %{name} = %{version}-%{release}
 Requires: librsvg2
 Summary: Python bindings for interacting with librsvg
 Group: Development/Languages
@@ -254,6 +252,10 @@
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Tue Aug 22 2006 Dan Williams <dcbw at redhat.com> - 2.15.90-2.fc6
+- Remove unecessary dependencies on gnome-python2-desktop from
+    -libwnck and -rsvg subpackages (OLPC)
+
 * Fri Aug  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 



From fedora-cvs-commits at redhat.com  Tue Aug 22 20:25:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 16:25:27 -0400
Subject: rpms/scrollkeeper/devel .cvsignore, 1.8, 1.9 scrollkeeper.spec, 1.20,
	1.21 sources, 1.8, 1.9
Message-ID: <200608222025.k7MKPRkU006403@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/scrollkeeper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6306

Modified Files:
	.cvsignore scrollkeeper.spec sources 
Log Message:

* Tue Aug 22 2006 Matthew Barnes <mbarnes at redhat.com> - 0.3.14-7
- Clean up spec file, package .bz2 file instead of .gz.
- Make intltool a BuildRequires instead of a Requires (RH bug #203606).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/scrollkeeper/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Sep 2004 12:10:14 -0000	1.8
+++ .cvsignore	22 Aug 2006 20:25:23 -0000	1.9
@@ -1 +1 @@
-scrollkeeper-0.3.14.tar.gz
+scrollkeeper-0.3.14.tar.bz2


Index: scrollkeeper.spec
===================================================================
RCS file: /cvs/dist/rpms/scrollkeeper/devel/scrollkeeper.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- scrollkeeper.spec	15 Jul 2006 03:38:54 -0000	1.20
+++ scrollkeeper.spec	22 Aug 2006 20:25:23 -0000	1.21
@@ -1,35 +1,43 @@
+### Abstract ###
+
+Name: scrollkeeper
+Version: 0.3.14
+Release: 7
+License: LGPL
+Group: System Environment/Base
 Summary: ScrollKeeper is a cataloging system for documentation on open systems.
-Name:       scrollkeeper
-Version:    0.3.14
-Release:    6
-Source0:    http://download.sourceforge.net/scrollkeeper/%{name}-%{version}.tar.gz
-License:    LGPL
-Group:      System Environment/Base
+URL: http://scrollkeeper.sourceforge.net/
+Source: %{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-buildroot
-URL:        http://scrollkeeper.sourceforge.net/
 
-## These packages have broken OMF
-Conflicts: nautilus < 2.0.3
-Conflicts: gnome-user-docs < 1.93
+### Patches ###
+
+Patch1: scrollkeeper-0.3.11-validate-warning.patch
+Patch2: scrollkeeper-0.3.14-fix-mkdir-segfault.patch
+
+### Dependencies ###
+
+# These packages have broken OMF
+Conflicts: evolution < 1.0.8 
 Conflicts: galeon < 1.2.5
-Conflicts: glade < 1:0.6.4-6
 Conflicts: ggv < 1.99.9
-Conflicts: evolution < 1.0.8 
+Conflicts: glade < 1:0.6.4-6
+Conflicts: gnome-user-docs < 1.93
+Conflicts: nautilus < 2.0.3
 
-Requires:   intltool >= 0.28
-Requires:   docbook-dtds
-Requires:   libxml2 >= 2.4.19
-Requires:   libxslt
+Requires: docbook-dtds
+Requires: libxml2 >= 2.4.19
+Requires: libxslt
 
+### Build Dependencies ###
+
+BuildRequires: intltool >= 0.28
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
 BuildRequires: docbook-dtds
 # For intltool:
 BuildRequires: perl-XML-Parser >= %{perl_XML_Parser_version}
 
-Patch1:         scrollkeeper-0.3.11-validate-warning.patch
-Patch2:         scrollkeeper-0.3.14-fix-mkdir-segfault.patch
-
 %description 
 ScrollKeeper is a cataloging system for documentation. It manages
 documentation metadata (as specified by the Open Source Metadata
@@ -120,6 +128,10 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Aug 22 2006 Matthew Barnes <mbarnes at redhat.com> - 0.3.14-7
+- Clean up spec file, package .bz2 file instead of .gz.
+- Make intltool a BuildRequires instead of a Requires (RH bug #203606).
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 0.3.14-6
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/scrollkeeper/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Sep 2004 12:10:14 -0000	1.8
+++ sources	22 Aug 2006 20:25:23 -0000	1.9
@@ -1 +1 @@
-161eb3f29e30e7b24f84eb93ac696155  scrollkeeper-0.3.14.tar.gz
+b175e582a6cec3e50a9de73a5bb7455a  scrollkeeper-0.3.14.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 20:43:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 16:43:17 -0400
Subject: rpms/parted/devel parted-1.7.1-gpt.patch, 1.1, 1.2 parted.spec, 1.83,
	1.84 parted-1.7.0-dm.patch, 1.2, NONE
Message-ID: <200608222043.k7MKhHor010186@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10129

Modified Files:
	parted-1.7.1-gpt.patch parted.spec 
Removed Files:
	parted-1.7.0-dm.patch 
Log Message:
- Improve error message returned by _parse_header() on GPT-labeled disks
  so users actually have an idea of how to correct the problem
- Fix off-by-one error with LastUsableLBA and PartitionEntryLBA overlap
  to prevent possible data corruption when using non-parted GPT editing
  tools


parted-1.7.1-gpt.patch:
 libparted/labels/gpt.c |   56 +++++++++++++++++++++++++++++++++++++++++++++----
 parted/ui.c            |    2 -
 2 files changed, 53 insertions(+), 5 deletions(-)

Index: parted-1.7.1-gpt.patch
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted-1.7.1-gpt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parted-1.7.1-gpt.patch	17 Aug 2006 17:52:06 -0000	1.1
+++ parted-1.7.1-gpt.patch	22 Aug 2006 20:43:14 -0000	1.2
@@ -1,5 +1,5 @@
 --- parted-1.7.1/libparted/labels/gpt.c.gpt	2006-05-25 13:28:55.000000000 -0400
-+++ parted-1.7.1/libparted/labels/gpt.c	2006-08-17 13:44:17.000000000 -0400
++++ parted-1.7.1/libparted/labels/gpt.c	2006-08-22 16:37:42.000000000 -0400
 @@ -607,11 +607,13 @@
  }
  
@@ -15,7 +15,7 @@
  
  	PED_ASSERT (_header_is_valid (disk->dev, gpt), return 0);
  
-@@ -633,8 +635,50 @@
+@@ -633,8 +635,54 @@
  
  	first_usable = PED_CPU_TO_LE64 (gpt->FirstUsableLBA);
  	last_usable = PED_CPU_TO_LE64 (gpt->LastUsableLBA);
@@ -49,24 +49,28 @@
 +	PED_ASSERT (last_usable_if_grown <= disk->dev->length, return 0);
 +
 +	if (!asked_already && last_usable < last_usable_if_grown) {
-+		int q = ped_exception_throw(PED_EXCEPTION_WARNING,
-+		                            PED_EXCEPTION_FIX | PED_EXCEPTION_IGNORE,
-+		                            _("Not all of the space available to this "
-+		                              "disk appears to be used, you can fix "
-+		                              "the GPT to use all of the space or "
-+		                              "continue with the current setting? "));
++		PedExceptionOption q;
++		q = ped_exception_throw(PED_EXCEPTION_WARNING,
++		                        PED_EXCEPTION_FIX | PED_EXCEPTION_IGNORE,
++		                        _("Not all of the space available to %s appears "
++		                          "to be used, you can fix the GPT to use all "
++		                          "of the space (an extra %llu blocks) or "
++		                          "continue with the current setting? "),
++		                        disk->dev->path,
++		                        (uint64_t)(last_usable_if_grown - last_usable));
++
 +		if (q == PED_EXCEPTION_FIX) {
 +			last_usable = last_usable_if_grown;
 +			*update_needed = 1;
++		} else if (q != PED_EXCEPTION_UNHANDLED) {
++			*asked_already = 1;
 +		}
-+
-+		asked_already = 1;
 +	}
 +
  	ped_geometry_init (&gpt_disk_data->data_area, disk->dev,
  			   first_usable, last_usable - first_usable + 1);
  
-@@ -795,7 +839,7 @@
+@@ -795,7 +843,7 @@
  		}
  	}
  
@@ -75,8 +79,26 @@
  		goto error_free_gpt;
  
  
+@@ -893,7 +941,7 @@
+ 		gpt->MyLBA = PED_CPU_TO_LE64 (disk->dev->length - 1);
+ 		gpt->AlternateLBA = PED_CPU_TO_LE64 (1);
+ 		gpt->PartitionEntryLBA
+-			= PED_CPU_TO_LE64 (disk->dev->length - 2 - ptes_size);
++			= PED_CPU_TO_LE64 (disk->dev->length - 1 - ptes_size);
+ 	} else {
+ 		gpt->MyLBA = PED_CPU_TO_LE64 (1);
+ 		gpt->AlternateLBA = PED_CPU_TO_LE64 (disk->dev->length - 1);
+@@ -984,7 +1032,7 @@
+ 	if (!ped_device_write (disk->dev, pth_raw, disk->dev->length - 1, 1))
+ 		goto error_free_ptes;
+ 	if (!ped_device_write (disk->dev, ptes,
+-			       disk->dev->length - 2 - ptes_size / disk->dev->sector_size,
++			       disk->dev->length - 1 - ptes_size / disk->dev->sector_size,
+ 			       ptes_size / disk->dev->sector_size))
+ 		goto error_free_ptes;
+ 
 --- parted-1.7.1/parted/ui.c.gpt	2006-05-25 13:28:42.000000000 -0400
-+++ parted-1.7.1/parted/ui.c	2006-08-17 12:11:30.000000000 -0400
++++ parted-1.7.1/parted/ui.c	2006-08-22 14:41:42.000000000 -0400
 @@ -1027,13 +1027,13 @@
  
  	opt = PED_EXCEPTION_OPTION_FIRST;


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- parted.spec	21 Aug 2006 20:49:16 -0000	1.83
+++ parted.spec	22 Aug 2006 20:43:14 -0000	1.84
@@ -2,19 +2,19 @@
 %define _sbindir /sbin
 
 Summary: The GNU disk partition manipulation program.
-Name: parted
+Name:    parted
 Version: 1.7.1
-Release: 13%{?dist}
-Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
-Patch0: parted-1.7.0-fat.c.patch
-Patch1: parted-1.7.0-sx8.patch
-Patch3: parted-1.7.1-dasd.patch
-Patch4: parted-1.7.0-iseries.patch
-Patch5: parted-1.7.1-dm.patch
-Patch6: parted-1.7.0-aix.patch
-Patch7: parted-1.7.1-vtoc-errbuf.patch
-Patch8: parted-1.7.1-O_DIRECT.patch
-Patch9: parted-1.7.1-get_exception.patch
+Release: 14%{?dist}
+Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
+Patch0:  parted-1.7.0-fat.c.patch
+Patch1:  parted-1.7.0-sx8.patch
+Patch3:  parted-1.7.1-dasd.patch
+Patch4:  parted-1.7.0-iseries.patch
+Patch5:  parted-1.7.1-dm.patch
+Patch6:  parted-1.7.0-aix.patch
+Patch7:  parted-1.7.1-vtoc-errbuf.patch
+Patch8:  parted-1.7.1-O_DIRECT.patch
+Patch9:  parted-1.7.1-get_exception.patch
 Patch10: parted-1.7.1-gpt.patch
 
 Buildroot: %{_tmppath}/%{name}-root
@@ -108,6 +108,13 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Aug 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-14
+- Improve error message returned by _parse_header() on GPT-labeled disks
+  so users actually have an idea of how to correct the problem
+- Fix off-by-one error with LastUsableLBA and PartitionEntryLBA overlap
+  to prevent possible data corruption when using non-parted GPT editing
+  tools
+
 * Mon Aug 21 2006 Peter Jones <pjones at redhat.com> - 1.7.1-13
 - Don't use the "volume name" as the device node name on dm device
   partitions, it isn't really what we want at all.


--- parted-1.7.0-dm.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 22 20:43:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 16:43:27 -0400
Subject: rpms/scrollkeeper/devel scrollkeeper.spec,1.21,1.22
Message-ID: <200608222043.k7MKhPjB010242@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/scrollkeeper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10174

Modified Files:
	scrollkeeper.spec 
Log Message:

* Tue Aug 22 2006 Matthew Barnes <mbarnes at redhat.com> - 0.3.14-7.1
- Fix the BuildRoot.



Index: scrollkeeper.spec
===================================================================
RCS file: /cvs/dist/rpms/scrollkeeper/devel/scrollkeeper.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- scrollkeeper.spec	22 Aug 2006 20:25:23 -0000	1.21
+++ scrollkeeper.spec	22 Aug 2006 20:43:22 -0000	1.22
@@ -2,13 +2,13 @@
 
 Name: scrollkeeper
 Version: 0.3.14
-Release: 7
+Release: 7.1
 License: LGPL
 Group: System Environment/Base
 Summary: ScrollKeeper is a cataloging system for documentation on open systems.
 URL: http://scrollkeeper.sourceforge.net/
 Source: %{name}-%{version}.tar.bz2
-BuildRoot:  %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 ### Patches ###
 
@@ -128,6 +128,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Aug 22 2006 Matthew Barnes <mbarnes at redhat.com> - 0.3.14-7.1
+- Fix the BuildRoot.
+
 * Tue Aug 22 2006 Matthew Barnes <mbarnes at redhat.com> - 0.3.14-7
 - Clean up spec file, package .bz2 file instead of .gz.
 - Make intltool a BuildRequires instead of a Requires (RH bug #203606).



From fedora-cvs-commits at redhat.com  Tue Aug 22 20:43:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 16:43:44 -0400
Subject: rpms/kernel/FC-5 .cvsignore, 1.415, 1.416 kernel-2.6.spec, 1.2178,
	1.2179 sources, 1.355, 1.356
Message-ID: <200608222043.k7MKhiwJ010306@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10253

Modified Files:
	.cvsignore kernel-2.6.spec sources 
Log Message:
update to 2.6.17.10


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- .cvsignore	15 Aug 2006 11:05:16 -0000	1.415
+++ .cvsignore	22 Aug 2006 20:43:39 -0000	1.416
@@ -5,3 +5,4 @@
 patch-2.6.17.8.bz2
 clog
 xen-11061.tar.bz2
+patch-2.6.17.10.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2178
retrieving revision 1.2179
diff -u -r1.2178 -r1.2179
--- kernel-2.6.spec	20 Aug 2006 12:31:32 -0000	1.2178
+++ kernel-2.6.spec	22 Aug 2006 20:43:40 -0000	1.2179
@@ -231,7 +231,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.8.bz2
+Patch1: patch-2.6.17.10.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1537,6 +1537,9 @@
 %endif
 
 %changelog
+* Tue Aug 22 2006 Bill Nottingham <notting at redhat.com>
+- update to 2.6.17.10
+
 * Tue Aug 15 2006 Juan Quintela <quintela at redhat.com>
 - linux-2.6-xen update
   * linux-2.6.17-xen cset changeset: 29033:e6adb54afb96


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- sources	15 Aug 2006 11:05:16 -0000	1.355
+++ sources	22 Aug 2006 20:43:41 -0000	1.356
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-791940106e40ff60fa1756e29f7b0488  patch-2.6.17.8.bz2
 71780125173fe1359fec8dabfbd0bc45  xen-11061.tar.bz2
+1707c480ddd60f28bcb7c9bb3eca0aae  patch-2.6.17.10.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 20:53:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 16:53:46 -0400
Subject: rpms/kernel/FC-5 upstream,1.323,1.324
Message-ID: <200608222053.k7MKrkGe027740@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27685

Modified Files:
	upstream 
Log Message:
fix build



Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- upstream	7 Aug 2006 18:44:16 -0000	1.323
+++ upstream	22 Aug 2006 20:53:39 -0000	1.324
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.8.bz2
+patch-2.6.17.10.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 22 21:02:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 17:02:08 -0400
Subject: rpms/kernel/FC-5 patch-2.6.17.10.bz2.sign, NONE,
	1.1 patch-2.6.17.8.bz2.sign, 1.1, NONE
Message-ID: <200608222102.k7ML28kc030415@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30356

Added Files:
	patch-2.6.17.10.bz2.sign 
Removed Files:
	patch-2.6.17.8.bz2.sign 
Log Message:
add sign file


--- NEW FILE patch-2.6.17.10.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBE614LyGugalF9Dw4RAkApAJ0Tu60hnY9lON9SC2GTuTJod7T6pwCeOUll
c8tYukT91WWW8+k0hOltcFs=
=2cWa
-----END PGP SIGNATURE-----


--- patch-2.6.17.8.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 22 21:37:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 17:37:18 -0400
Subject: rpms/control-center/devel .cvsignore, 1.45, 1.46 control-center.spec,
	1.173, 1.174 sources, 1.48,
	1.49 control-center-2.15.90-newapi.patch, 1.1, NONE
Message-ID: <200608222137.k7MLbIrG022005@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21824

Modified Files:
	.cvsignore control-center.spec sources 
Removed Files:
	control-center-2.15.90-newapi.patch 
Log Message:
- update to 2.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	13 Aug 2006 05:49:56 -0000	1.45
+++ .cvsignore	22 Aug 2006 21:37:15 -0000	1.46
@@ -1 +1 @@
-control-center-2.15.91.tar.bz2
+control-center-2.15.92.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- control-center.spec	22 Aug 2006 19:56:30 -0000	1.173
+++ control-center.spec	22 Aug 2006 21:37:15 -0000	1.174
@@ -20,8 +20,8 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.15.91
-Release: 6%{?dist}
+Version: 2.15.92
+Release: 1%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -274,6 +274,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Aug 22 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-6.fc6
+- update to 2.15.92
+
 * Tue Aug 22 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.91-6.fc6
 - Add support for compiz in keybinding dialog.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	13 Aug 2006 05:49:56 -0000	1.48
+++ sources	22 Aug 2006 21:37:15 -0000	1.49
@@ -1 +1 @@
-693c4462a39a1d95530be75fc6813a31  control-center-2.15.91.tar.bz2
+492ed30c90d59eb07f7ccd8fd1d9542c  control-center-2.15.92.tar.bz2


--- control-center-2.15.90-newapi.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 22 22:06:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 18:06:12 -0400
Subject: rpms/compiz/devel sync-override-redirect-windows.patch, NONE,
	1.1 compiz.spec, 1.19, 1.20
Message-ID: <200608222206.k7MM6C84020580@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20564

Modified Files:
	compiz.spec 
Added Files:
	sync-override-redirect-windows.patch 
Log Message:
* Tue Aug 22 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.17.20060817git.fc6
- Add patch from upstream to also use sync protocol for override
  redirect windows (sync-override-redirect-windows.patch).


sync-override-redirect-windows.patch:
 window.c |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

--- NEW FILE sync-override-redirect-windows.patch ---
diff-tree b660ec40bbf24c58c8e2e98207ab5f4b3ed3704e (from c44241bd567f740529461c0f343a36e9d26a7074)
Author: David Reveman <davidr at novell.com>
Date:   Tue Aug 22 09:41:42 2006 -0400

    Allow override-redirect windows to support sync request protocol.

diff --git a/src/window.c b/src/window.c
index c088e7e..1d8c94e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1685,7 +1685,8 @@ addWindow (CompScreen *screen,
 
     w->invisible = TRUE;
 
-    w->wmType = getWindowType (w->screen->display, w->id);
+    w->wmType    = getWindowType (w->screen->display, w->id);
+    w->protocols = getProtocols (w->screen->display, w->id);
 
     if (!w->attrib.override_redirect)
     {
@@ -1708,8 +1709,6 @@ addWindow (CompScreen *screen,
 
 	getMwmHints (w->screen->display, w->id, &w->mwmFunc, &w->mwmDecor);
 
-	w->protocols = getProtocols (w->screen->display, w->id);
-
 	recalcWindowActions (w);
 
 	if (!(w->type & CompWindowTypeDesktopMask))
@@ -1882,10 +1881,12 @@ sendConfigureNotify (CompWindow *w)
 void
 mapWindow (CompWindow *w)
 {
-    if (w->attrib.class == InputOnly)
+    if (w->attrib.map_state == IsViewable)
 	return;
 
-    if (w->attrib.map_state == IsViewable)
+    w->mapNum = w->screen->mapNum++;
+
+    if (w->attrib.class == InputOnly)
 	return;
 
     w->unmapRefCnt = 1;
@@ -1901,8 +1902,6 @@ mapWindow (CompWindow *w)
 
     w->lastPong = w->screen->display->lastPing;
 
-    w->mapNum = w->screen->mapNum++;
-
     updateWindowRegion (w);
     updateWindowSize (w);
 
@@ -1917,14 +1916,14 @@ mapWindow (CompWindow *w)
     if (w->type & CompWindowTypeDesktopMask)
 	w->screen->desktopWindowCount++;
 
-    if (!w->attrib.override_redirect)
+    if (w->protocols & CompWindowProtocolSyncRequestMask)
     {
-	if (w->protocols & CompWindowProtocolSyncRequestMask)
-	{
-	    sendSyncRequest (w);
-	    sendConfigureNotify (w);
-	}
+	sendSyncRequest (w);
+	sendConfigureNotify (w);
+    }
 
+    if (!w->attrib.override_redirect)
+    {
 	/* been shaded */
 	if (!w->height)
 	    resizeWindow (w,


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- compiz.spec	18 Aug 2006 01:36:27 -0000	1.19
+++ compiz.spec	22 Aug 2006 22:06:04 -0000	1.20
@@ -10,7 +10,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.16.%{snapshot}git%{?dist}
+Release:        0.17.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,7 +42,10 @@
 Patch105: fedora-logo.patch
 Patch106: glfinish.patch
 Patch107: desktop-effects-0.6.1-delete-session.patch
-Patch108: resize-move-keybindings.patch
+
+# Patches already upstream
+Patch200: resize-move-keybindings.patch
+Patch201: sync-override-redirect-windows.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -81,7 +84,8 @@
 %patch107 -p1 -b .delete-session
 popd
 
-%patch108 -p1 -b .resize-move-keybindings
+%patch200 -p1 -b .resize-move-keybindings
+%patch201 -p1 -b .sync-override-redirect-windows
 
 %build
 %configure --disable-libsvg-cairo
@@ -143,6 +147,10 @@
 %{_includedir}/compiz
 
 %changelog
+* Tue Aug 22 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.17.20060817git.fc6
+- Add patch from upstream to also use sync protocol for override
+  redirect windows (sync-override-redirect-windows.patch).
+
 * Thu Aug 17 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.16.20060817git.fc6
 - Rebase to latest upstream changes which has the rest of the bindings
   rewrite.  Add resize-move-keybindings.patch to make move and resize



From fedora-cvs-commits at redhat.com  Tue Aug 22 22:58:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 18:58:54 -0400
Subject: rpms/mesa/devel mesa-6.5-force-r300.patch, 1.2,
	1.3 mesa-6.5.1-r300-smooth-line.patch, NONE, 1.1 mesa.spec,
	1.89, 1.90
Message-ID: <200608222258.k7MMwslN001893@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1858

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-force-r300.patch mesa-6.5.1-r300-smooth-line.patch 
Log Message:
* Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 6.5-25.20060818cvs.fc6
- mesa-6.5.1-r300-smooth-line.patch: Added, fakes smooth lines with aliased
  lines on R300+ cards, makes Google Earth tolerable.
- mesa-6.5-force-r300.patch: Resurrect.


mesa-6.5-force-r300.patch:
 radeon_screen.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: mesa-6.5-force-r300.patch
===================================================================
RCS file: mesa-6.5-force-r300.patch
diff -N mesa-6.5-force-r300.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mesa-6.5-force-r300.patch	22 Aug 2006 22:58:51 -0000	1.3
@@ -0,0 +1,11 @@
+--- ./src/mesa/drivers/dri/radeon/radeon_screen.c.force-r300	2006-04-11 17:08:36.000000000 -0400
++++ ./src/mesa/drivers/dri/radeon/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;

mesa-6.5.1-r300-smooth-line.patch:
 r300_render.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mesa-6.5.1-r300-smooth-line.patch ---
--- Mesa-6.5/src/mesa/drivers/dri/r300/r300_render.c.r300-smooth-lines	2006-08-02 21:37:23.000000000 +0200
+++ Mesa-6.5/src/mesa/drivers/dri/r300/r300_render.c	2006-08-02 21:37:23.000000000 +0200
@@ -490,7 +490,7 @@
 	FALLBACK_IF(ctx->Line.StippleFlag);
 	
 	/* HW doesnt appear to directly support these */
-	FALLBACK_IF(ctx->Line.SmoothFlag); // GL_LINE_SMOOTH
+	//FALLBACK_IF(ctx->Line.SmoothFlag); // GL_LINE_SMOOTH
 	FALLBACK_IF(ctx->Point.SmoothFlag); // GL_POINT_SMOOTH
 	/* Rest could be done with vertex fragments */
 	if (ctx->Extensions.NV_point_sprite || ctx->Extensions.ARB_point_sprite)


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- mesa.spec	22 Aug 2006 19:36:12 -0000	1.89
+++ mesa.spec	22 Aug 2006 22:58:51 -0000	1.90
@@ -36,7 +36,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 24.%{snapshot}cvs%{?dist}
+Release: 25.%{snapshot}cvs%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -60,6 +60,9 @@
 Patch18: mesa-6.5.1-selinux-awareness.patch
 Patch19: mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch
 
+Patch20: mesa-6.5.1-r300-smooth-line.patch
+Patch21: mesa-6.5-force-r300.patch
+
 # General patches from upstream go here:
 
 # Red Hat custom patches, feature development
@@ -308,6 +311,9 @@
 %patch18 -p1 -b .selinux-awareness
 %patch19 -p1 -b .vtxfmt
 
+%patch20 -p1 -b .r300-smooth-lines
+%patch21 -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
 # a change for post feature freeze.  Leaving off for now...
@@ -506,6 +512,11 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 6.5-25.20060818cvs.fc6
+- mesa-6.5.1-r300-smooth-line.patch: Added, fakes smooth lines with aliased
+  lines on R300+ cards, makes Google Earth tolerable.
+- mesa-6.5-force-r300.patch: Resurrect.
+
 * Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 6.5-24.20060818cvs.fc6
 - mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch: Fix a segfault on context
   destruction when selinux is enabled.



From fedora-cvs-commits at redhat.com  Tue Aug 22 23:15:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 19:15:20 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.245,
	1.246 config-ia64-generic, 1.42, 1.43
Message-ID: <200608222315.k7MNF5j7005097@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv4969/configs

Modified Files:
	config-generic config-ia64-generic 
Log Message:

more bug fixes notably
lockdep-fixes
nfs connectathon
support qla4xxx
ia64 config options




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- config-generic	17 Aug 2006 22:47:56 -0000	1.245
+++ config-generic	22 Aug 2006 23:15:00 -0000	1.246
@@ -471,6 +471,7 @@
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_DPT_I2O is not set
 CONFIG_SCSI_LPFC=m


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- config-ia64-generic	22 Aug 2006 04:03:04 -0000	1.42
+++ config-ia64-generic	22 Aug 2006 23:15:00 -0000	1.43
@@ -34,7 +34,7 @@
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_IA64_MCA_RECOVERY=m
 CONFIG_IA64_CYCLONE=y
-# CONFIG_MMTIMER is not set
+CONFIG_MMTIMER=y
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
 CONFIG_NR_CPUS=1024
@@ -164,6 +164,8 @@
 
 CONFIG_SERIAL_SGI_IOC3=m
 CONFIG_SGI_IOC3=m
+CONFIG_SERIAL_SGI_IOC4=m
+CONFIG_SGI_IOC4=m
 
 # CONFIG_PERMIT_BSP_REMOVE is not set
 # CONFIG_FORCE_CPEI_RETARGET is not set



From fedora-cvs-commits at redhat.com  Tue Aug 22 23:15:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 19:15:20 -0400
Subject: rpms/kernel/devel linux-2.6-iscsi-add-qla4xxx2.patch, NONE,
	1.1 linux-2.6-nfs-special-tests-fix.patch, NONE,
	1.1 kernel-2.6.spec, 1.2584,
	1.2585 linux-2.6-lockdep-fixes.patch, 1.22, 1.23
Message-ID: <200608222315.k7MNF2Bq005082@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4969

Modified Files:
	kernel-2.6.spec linux-2.6-lockdep-fixes.patch 
Added Files:
	linux-2.6-iscsi-add-qla4xxx2.patch 
	linux-2.6-nfs-special-tests-fix.patch 
Log Message:

more bug fixes notably
lockdep-fixes
nfs connectathon
support qla4xxx
ia64 config options



linux-2.6-iscsi-add-qla4xxx2.patch:
 Kconfig               |    1 
 Makefile              |    1 
 qla4xxx/Kconfig       |    7 
 qla4xxx/Makefile      |    5 
 qla4xxx/ql4_dbg.c     |  197 +++++
 qla4xxx/ql4_dbg.h     |   55 +
 qla4xxx/ql4_def.h     |  599 +++++++++++++++++
 qla4xxx/ql4_fw.h      |  852 ++++++++++++++++++++++++
 qla4xxx/ql4_glbl.h    |   80 ++
 qla4xxx/ql4_init.c    | 1355 ++++++++++++++++++++++++++++++++++++++
 qla4xxx/ql4_inline.h  |   84 ++
 qla4xxx/ql4_iocb.c    |  516 ++++++++++++++
 qla4xxx/ql4_isr.c     |  796 ++++++++++++++++++++++
 qla4xxx/ql4_mbx.c     |  930 ++++++++++++++++++++++++++
 qla4xxx/ql4_nvram.c   |  224 ++++++
 qla4xxx/ql4_nvram.h   |  256 +++++++
 qla4xxx/ql4_os.c      | 1758 ++++++++++++++++++++++++++++++++++++++++++++++++++
 qla4xxx/ql4_version.h |   13 
 18 files changed, 7729 insertions(+)

--- NEW FILE linux-2.6-iscsi-add-qla4xxx2.patch ---
diff -Naurp linux-2.6.17.noarch/drivers/scsi/Kconfig linux-2.6.17.noarch.qla4xxx/drivers/scsi/Kconfig
--- linux-2.6.17.noarch/drivers/scsi/Kconfig	2006-08-15 14:19:43.000000000 -0400
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/Kconfig	2006-08-17 12:57:22.000000000 -0400
@@ -1352,6 +1352,7 @@ config SCSI_QLOGICPTI
 	  module will be called qlogicpti.
 
 source "drivers/scsi/qla2xxx/Kconfig"
+source "drivers/scsi/qla4xxx/Kconfig"
 
 config SCSI_LPFC
 	tristate "Emulex LightPulse Fibre Channel Support"
diff -Naurp linux-2.6.17.noarch/drivers/scsi/Makefile linux-2.6.17.noarch.qla4xxx/drivers/scsi/Makefile
--- linux-2.6.17.noarch/drivers/scsi/Makefile	2006-08-15 14:19:41.000000000 -0400
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/Makefile	2006-08-17 12:57:22.000000000 -0400
@@ -81,6 +81,7 @@ obj-$(CONFIG_SCSI_QLOGIC_FAS)	+= qlogicf
 obj-$(CONFIG_PCMCIA_QLOGIC)	+= qlogicfas408.o
 obj-$(CONFIG_SCSI_QLOGIC_1280)	+= qla1280.o 
 obj-$(CONFIG_SCSI_QLA_FC)	+= qla2xxx/
+obj-$(CONFIG_SCSI_QLA_ISCSI)	+= qla4xxx/
 obj-$(CONFIG_SCSI_LPFC)		+= lpfc/
 obj-$(CONFIG_SCSI_PAS16)	+= pas16.o
 obj-$(CONFIG_SCSI_SEAGATE)	+= seagate.o
diff -Naurp linux-2.6.17.noarch/drivers/scsi/qla4xxx/Kconfig linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/Kconfig
--- linux-2.6.17.noarch/drivers/scsi/qla4xxx/Kconfig	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/Kconfig	2006-08-17 12:57:22.000000000 -0400
@@ -0,0 +1,7 @@
+config SCSI_QLA_ISCSI
+	tristate "QLogic ISP4XXX host adapter family support"
+	depends on PCI && SCSI
+	select SCSI_ISCSI_ATTRS
+	---help---
+	This driver supports the QLogic 40xx (ISP4XXX) iSCSI host 
+	adapter family.
diff -Naurp linux-2.6.17.noarch/drivers/scsi/qla4xxx/Makefile linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/Makefile
--- linux-2.6.17.noarch/drivers/scsi/qla4xxx/Makefile	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/Makefile	2006-08-17 12:57:22.000000000 -0400
@@ -0,0 +1,5 @@
+qla4xxx-y := ql4_os.o ql4_init.o ql4_mbx.o ql4_iocb.o ql4_isr.o \
+		ql4_nvram.o ql4_dbg.o
+
+obj-$(CONFIG_SCSI_QLA_ISCSI) += qla4xxx.o
+
diff -Naurp linux-2.6.17.noarch/drivers/scsi/qla4xxx/ql4_dbg.c linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/ql4_dbg.c
--- linux-2.6.17.noarch/drivers/scsi/qla4xxx/ql4_dbg.c	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/ql4_dbg.c	2006-08-17 12:57:22.000000000 -0400
@@ -0,0 +1,197 @@
+/*
+ * QLogic iSCSI HBA Driver
+ * Copyright (c)  2003-2006 QLogic Corporation
+ *
+ * See LICENSE.qla4xxx for copyright and licensing details.
+ */
+
+#include "ql4_def.h"
+#include <scsi/scsi_dbg.h>
+
+static void qla4xxx_print_srb_info(struct srb * srb)
+{
+	printk("%s: srb = 0x%p, flags=0x%02x\n", __func__, srb, srb->flags);
+	printk("%s: cmd = 0x%p, saved_dma_handle = 0x%lx\n",
+	       __func__, srb->cmd, (unsigned long) srb->dma_handle);
+	printk("%s: fw_ddb_index = %d, lun = %d\n",
+	       __func__, srb->fw_ddb_index, srb->cmd->device->lun);
+	printk("%s: iocb_tov = %d\n",
+	       __func__, srb->iocb_tov);
+	printk("%s: cc_stat = 0x%x, r_start = 0x%lx, u_start = 0x%lx\n\n",
+	       __func__, srb->cc_stat, srb->r_start, srb->u_start);
+}
+
+void qla4xxx_print_scsi_cmd(struct scsi_cmnd *cmd)
+{
+	printk("SCSI Command = 0x%p, Handle=0x%p\n", cmd, cmd->host_scribble);
+	printk("  b=%d, t=%02xh, l=%02xh, cmd_len = %02xh\n",
+	       cmd->device->channel, cmd->device->id, cmd->device->lun,
+	       cmd->cmd_len);
+	scsi_print_command(cmd);
+	printk("  seg_cnt = %d\n", cmd->use_sg);
+	printk("  request buffer = 0x%p, request buffer len = 0x%x\n",
+	       cmd->request_buffer, cmd->request_bufflen);
+	if (cmd->use_sg) {
+		struct scatterlist *sg;
+		sg = (struct scatterlist *)cmd->request_buffer;
+		printk("  SG buffer: \n");
+		qla4xxx_dump_buffer((caddr_t) sg,
+				    (cmd->use_sg * sizeof(*sg)));
+	}
+	printk("  tag = %d, transfersize = 0x%x \n", cmd->tag,
+	       cmd->transfersize);
+	printk("  Pid = %d, SP = 0x%p\n", (int)cmd->pid, cmd->SCp.ptr);
+	printk("  underflow size = 0x%x, direction=0x%x\n", cmd->underflow,
+	       cmd->sc_data_direction);
+	printk("  Current time (jiffies) = 0x%lx, "
+	       "timeout expires = 0x%lx\n", jiffies, cmd->eh_timeout.expires);
+	qla4xxx_print_srb_info((struct srb *) cmd->SCp.ptr);
+}
+
+void __dump_registers(struct scsi_qla_host *ha)
+{
+	uint8_t i;
+	for (i = 0; i < MBOX_REG_COUNT; i++) {
+		printk(KERN_INFO "0x%02X mailbox[%d]	  = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, mailbox[i]), i,
+		       readw(&ha->reg->mailbox[i]));
+	}
+	printk(KERN_INFO "0x%02X flash_address	 = 0x%08X\n",
+	       (uint8_t) offsetof(struct isp_reg, flash_address),
+	       readw(&ha->reg->flash_address));
+	printk(KERN_INFO "0x%02X flash_data	 = 0x%08X\n",
+	       (uint8_t) offsetof(struct isp_reg, flash_data),
+	       readw(&ha->reg->flash_data));
+	printk(KERN_INFO "0x%02X ctrl_status	 = 0x%08X\n",
+	       (uint8_t) offsetof(struct isp_reg, ctrl_status),
+	       readw(&ha->reg->ctrl_status));
+	if (is_qla4010(ha)) {
+		printk(KERN_INFO "0x%02X nvram		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, u1.isp4010.nvram),
+		       readw(&ha->reg->u1.isp4010.nvram));
+	}
+
+	else if (is_qla4022(ha)) {
+		printk(KERN_INFO "0x%02X intr_mask	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u1.isp4022.intr_mask),
+		       readw(&ha->reg->u1.isp4022.intr_mask));
+		printk(KERN_INFO "0x%02X nvram		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, u1.isp4022.nvram),
+		       readw(&ha->reg->u1.isp4022.nvram));
+		printk(KERN_INFO "0x%02X semaphore	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u1.isp4022.semaphore),
+		       readw(&ha->reg->u1.isp4022.semaphore));
+	}
+	printk(KERN_INFO "0x%02X req_q_in	 = 0x%08X\n",
+	       (uint8_t) offsetof(struct isp_reg, req_q_in),
+	       readw(&ha->reg->req_q_in));
+	printk(KERN_INFO "0x%02X rsp_q_out	 = 0x%08X\n",
+	       (uint8_t) offsetof(struct isp_reg, rsp_q_out),
+	       readw(&ha->reg->rsp_q_out));
+	if (is_qla4010(ha)) {
+		printk(KERN_INFO "0x%02X ext_hw_conf	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4010.ext_hw_conf),
+		       readw(&ha->reg->u2.isp4010.ext_hw_conf));
+		printk(KERN_INFO "0x%02X port_ctrl	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4010.port_ctrl),
+		       readw(&ha->reg->u2.isp4010.port_ctrl));
+		printk(KERN_INFO "0x%02X port_status	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4010.port_status),
+		       readw(&ha->reg->u2.isp4010.port_status));
+		printk(KERN_INFO "0x%02X req_q_out	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4010.req_q_out),
+		       readw(&ha->reg->u2.isp4010.req_q_out));
+		printk(KERN_INFO "0x%02X gp_out		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, u2.isp4010.gp_out),
+		       readw(&ha->reg->u2.isp4010.gp_out));
+		printk(KERN_INFO "0x%02X gp_in		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, u2.isp4010.gp_in),
+		       readw(&ha->reg->u2.isp4010.gp_in));
+		printk(KERN_INFO "0x%02X port_err_status = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4010.port_err_status),
+		       readw(&ha->reg->u2.isp4010.port_err_status));
+	}
+
+	else if (is_qla4022(ha)) {
+		printk(KERN_INFO "Page 0 Registers:\n");
+		printk(KERN_INFO "0x%02X ext_hw_conf	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p0.ext_hw_conf),
+		       readw(&ha->reg->u2.isp4022.p0.ext_hw_conf));
+		printk(KERN_INFO "0x%02X port_ctrl	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p0.port_ctrl),
+		       readw(&ha->reg->u2.isp4022.p0.port_ctrl));
+		printk(KERN_INFO "0x%02X port_status	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p0.port_status),
+		       readw(&ha->reg->u2.isp4022.p0.port_status));
+		printk(KERN_INFO "0x%02X gp_out		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p0.gp_out),
+		       readw(&ha->reg->u2.isp4022.p0.gp_out));
+		printk(KERN_INFO "0x%02X gp_in		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, u2.isp4022.p0.gp_in),
+		       readw(&ha->reg->u2.isp4022.p0.gp_in));
+		printk(KERN_INFO "0x%02X port_err_status = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p0.port_err_status),
+		       readw(&ha->reg->u2.isp4022.p0.port_err_status));
+		printk(KERN_INFO "Page 1 Registers:\n");
+		writel(HOST_MEM_CFG_PAGE & set_rmask(CSR_SCSI_PAGE_SELECT),
+		       &ha->reg->ctrl_status);
+		printk(KERN_INFO "0x%02X req_q_out	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p1.req_q_out),
+		       readw(&ha->reg->u2.isp4022.p1.req_q_out));
[...7414 lines suppressed...]
+/**
+ * qla4xxx_eh_device_reset - callback for target reset.
+ * @cmd: Pointer to Linux's SCSI command structure
+ *
+ * This routine is called by the Linux OS to reset all luns on the
+ * specified target.
+ **/
+static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
+{
+	struct scsi_qla_host *ha = to_qla_host(cmd->device->host);
+	struct ddb_entry *ddb_entry = cmd->device->hostdata;
+	struct srb *sp;
+	int ret = FAILED, stat;
+
+	sp = (struct srb *) cmd->SCp.ptr;
+	if (!sp || !ddb_entry)
+		return ret;
+
+	dev_info(&ha->pdev->dev,
+		   "scsi%ld:%d:%d:%d: DEVICE RESET ISSUED.\n", ha->host_no,
+		   cmd->device->channel, cmd->device->id, cmd->device->lun);
+
+	DEBUG2(printk(KERN_INFO
+		      "scsi%ld: DEVICE_RESET cmd=%p jiffies = 0x%lx, to=%x,"
+		      "dpc_flags=%lx, status=%x allowed=%d\n", ha->host_no,
+		      cmd, jiffies, cmd->timeout_per_command / HZ,
+		      ha->dpc_flags, cmd->result, cmd->allowed));
+
+	/* FIXME: wait for hba to go online */
+	stat = qla4xxx_reset_lun(ha, ddb_entry, cmd->device->lun);
+	if (stat != QLA_SUCCESS) {
+		dev_info(&ha->pdev->dev, "DEVICE RESET FAILED. %d\n", stat);
+		goto eh_dev_reset_done;
+	}
+
+	/* Send marker. */
+	ha->marker_needed = 1;
+
+	/*
+	 * If we are coming down the EH path, wait for all commands to complete
+	 * for the device.
+	 */
+	if (cmd->device->host->shost_state == SHOST_RECOVERY) {
+		if (qla4xxx_eh_wait_for_active_target_commands(ha,
+							       cmd->device->id,
+							       cmd->device->
+							       lun)) {
+			dev_info(&ha->pdev->dev,
+				   "DEVICE RESET FAILED - waiting for "
+				   "commands.\n");
+			goto eh_dev_reset_done;
+		}
+	}
+
+	dev_info(&ha->pdev->dev,
+		   "scsi(%ld:%d:%d:%d): DEVICE RESET SUCCEEDED.\n",
+		   ha->host_no, cmd->device->channel, cmd->device->id,
+		   cmd->device->lun);
+
+	ret = SUCCESS;
+
+eh_dev_reset_done:
+
+	return ret;
+}
+
+/**
+ * qla4xxx_eh_host_reset - kernel callback
+ * @cmd: Pointer to Linux's SCSI command structure
+ *
+ * This routine is invoked by the Linux kernel to perform fatal error
+ * recovery on the specified adapter.
+ **/
+static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd)
+{
+	int return_status = FAILED;
+	struct scsi_qla_host *ha;
+
+	ha = (struct scsi_qla_host *) cmd->device->host->hostdata;
+
+	dev_info(&ha->pdev->dev,
+		   "scsi(%ld:%d:%d:%d): ADAPTER RESET ISSUED.\n", ha->host_no,
+		   cmd->device->channel, cmd->device->id, cmd->device->lun);
+
+	if (qla4xxx_wait_for_hba_online(ha) != QLA_SUCCESS) {
+		DEBUG2(printk("scsi%ld:%d: %s: Unable to reset host.  Adapter "
+			      "DEAD.\n", ha->host_no, cmd->device->channel,
+			      __func__));
+
+		return FAILED;
+	}
+
+	if (qla4xxx_recover_adapter(ha, PRESERVE_DDB_LIST) == QLA_SUCCESS) {
+		return_status = SUCCESS;
+	}
+
+	dev_info(&ha->pdev->dev, "HOST RESET %s.\n",
+		   return_status == FAILED ? "FAILED" : "SUCCEDED");
+
+	return return_status;
+}
+
+
+static struct pci_device_id qla4xxx_pci_tbl[] = {
+	{
+		.vendor		= PCI_VENDOR_ID_QLOGIC,
+		.device		= PCI_DEVICE_ID_QLOGIC_ISP4010,
+		.subvendor	= PCI_ANY_ID,
+		.subdevice	= PCI_ANY_ID,
+	},
+	{
+		.vendor		= PCI_VENDOR_ID_QLOGIC,
+		.device		= PCI_DEVICE_ID_QLOGIC_ISP4022,
+		.subvendor	= PCI_ANY_ID,
+		.subdevice	= PCI_ANY_ID,
+	},
+	{0, 0},
+};
+MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
+
+struct pci_driver qla4xxx_pci_driver = {
+	.name		= DRIVER_NAME,
+	.id_table	= qla4xxx_pci_tbl,
+	.probe		= qla4xxx_probe_adapter,
+	.remove		= qla4xxx_remove_adapter,
+};
+
+static int __init qla4xxx_module_init(void)
+{
+	int ret;
+
+	/* Allocate cache for SRBs. */
+	srb_cachep = kmem_cache_create("qla4xxx_srbs", sizeof(struct srb), 0,
+				       SLAB_HWCACHE_ALIGN, NULL, NULL);
+	if (srb_cachep == NULL) {
+		printk(KERN_ERR
+		       "%s: Unable to allocate SRB cache..."
+		       "Failing load!\n", DRIVER_NAME);
+		ret = -ENOMEM;
+		goto no_srp_cache;
+	}
+
+	/* Derive version string. */
+	strcpy(qla4xxx_version_str, QLA4XXX_DRIVER_VERSION);
+	if (extended_error_logging)
+		strcat(qla4xxx_version_str, "-debug");
+
+	qla4xxx_scsi_transport =
+		iscsi_register_transport(&qla4xxx_iscsi_transport);
+	if (!qla4xxx_scsi_transport){
+		ret = -ENODEV;
+		goto release_srb_cache;
+	}
+
+	printk(KERN_INFO "QLogic iSCSI HBA Driver\n");
+	ret = pci_register_driver(&qla4xxx_pci_driver);
+	if (ret)
+		goto unregister_transport;
+
+	printk(KERN_INFO "QLogic iSCSI HBA Driver\n");
+	return 0;
+unregister_transport:
+	iscsi_unregister_transport(&qla4xxx_iscsi_transport);
+release_srb_cache:
+	kmem_cache_destroy(srb_cachep);
+no_srp_cache:
+	return ret;
+}
+
+static void __exit qla4xxx_module_exit(void)
+{
+	pci_unregister_driver(&qla4xxx_pci_driver);
+	iscsi_unregister_transport(&qla4xxx_iscsi_transport);
+	kmem_cache_destroy(srb_cachep);
+}
+
+module_init(qla4xxx_module_init);
+module_exit(qla4xxx_module_exit);
+
+MODULE_AUTHOR("QLogic Corporation");
+MODULE_DESCRIPTION("QLogic iSCSI HBA Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(QLA4XXX_DRIVER_VERSION);
diff -Naurp linux-2.6.17.noarch/drivers/scsi/qla4xxx/ql4_version.h linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/ql4_version.h
--- linux-2.6.17.noarch/drivers/scsi/qla4xxx/ql4_version.h	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/ql4_version.h	2006-08-17 12:57:22.000000000 -0400
@@ -0,0 +1,13 @@
+/*
+ * QLogic iSCSI HBA Driver
+ * Copyright (c)  2003-2006 QLogic Corporation
+ *
+ * See LICENSE.qla4xxx for copyright and licensing details.
+ */
+
+#define QLA4XXX_DRIVER_VERSION	"5.00.05b9-k"
+
+#define QL4_DRIVER_MAJOR_VER	5
+#define QL4_DRIVER_MINOR_VER	0
+#define QL4_DRIVER_PATCH_VER	5
+#define QL4_DRIVER_BETA_VER	9

linux-2.6-nfs-special-tests-fix.patch:
 read.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-nfs-special-tests-fix.patch ---
Date: Sun, 20 Aug 2006 22:09:17 -0400
From: Steve Dickson <SteveD at redhat.com>
Subject: [PATCH] [RHEL5] connectathon general and special tests failing

The attached patch fixes a regression that causes the special tests
of the Connectation tests suite to fail. When a hole in a
file is created (like the holey test does), the page will
be allocated but there will be nothing read into it. The
means the number of byte read from the server will be
zero (i.e.  data->res.count). In the case, the page
still has PageUptodate-ed which is what this patch does.

I've tested with both the connectathon test suite
and fsx test suite.... as well as summited an upstream
version of the patch...


steved.

--- linux-2.6.17.i686/fs/nfs/read.c.orig	2006-08-17 17:25:00.000000000 -0400
+++ linux-2.6.17.i686/fs/nfs/read.c	2006-08-20 13:48:19.000000000 -0400
@@ -488,13 +488,14 @@ static void nfs_readpage_set_pages_uptod
 	unsigned int base = data->args.pgbase;
 	struct page **pages;
 
-	if (unlikely(count == 0))
-		return;
 	pages = &data->args.pages[base >> PAGE_CACHE_SHIFT];
 	base &= ~PAGE_CACHE_MASK;
 	count += base;
-	for (;count >= PAGE_CACHE_SIZE; count -= PAGE_CACHE_SIZE, pages++)
+	if (count == 0) 
 		SetPageUptodate(*pages);
+	else 
+		for (;count >= PAGE_CACHE_SIZE; count -= PAGE_CACHE_SIZE, pages++)
+			SetPageUptodate(*pages);
 	/*
 	 * Was this an eof or a short read? If the latter, don't mark the page
 	 * as uptodate yet.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2584
retrieving revision 1.2585
diff -u -r1.2584 -r1.2585
--- kernel-2.6.spec	22 Aug 2006 20:05:12 -0000	1.2584
+++ kernel-2.6.spec	22 Aug 2006 23:14:56 -0000	1.2585
@@ -369,11 +369,13 @@
 # SCSI bits.
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
 Patch1103: linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch
+Patch1104: linux-2.6-iscsi-add-qla4xxx2.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
 Patch1201: linux-2.6-NFSD-ctlbits.patch
 Patch1203: linux-2.6-NFSD-badness.patch
+Patch1204: linux-2.6-nfs-special-tests-fix.patch
 
 # core networking changes.
 Patch1300: linux-2.6-net-ipsec-labelling.patch
@@ -877,6 +879,8 @@
 # Add a pci table to advansys driver.
 %patch1102 -p1
 %patch1103 -p1
+# add support for qla4xxx
+%patch1104 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -886,6 +890,8 @@
 %patch1201 -p1
 # Fix badness.
 %patch1203 -p1
+# Fix nfs special tests problem
+%patch1204 -p1
 
 # core networking changes.
 %patch1300 -p1
@@ -1725,6 +1731,12 @@
 %endif
 
 %changelog
+* Tue Aug 22 2006 Don Zickus <dzickus at redhat.com>
+- Another lockdep-fix
+- NFS fix for the connectathon test
+- Enable mmtimer for ia64
+- Add support for iscsi qla4xxx
+
 * Tue Aug 22 2006 Marcelo Tosatti <mtosatti at redhat.com>
 - Add Libertas wireless driver
 

linux-2.6-lockdep-fixes.patch:
 a/kernel/lockdep.c                             |   13 ++
 b/drivers/infiniband/hw/mthca/mthca_provider.h |    4 
 b/drivers/infiniband/hw/mthca/mthca_qp.c       |   43 ++++++---
 linux-2.6.17-mm6/include/net/sock.h            |   33 ++++++-
 linux-2.6.17.noarch/fs/exec.c                  |    2 
 linux-2.6.18-rc1/drivers/input/serio/libps2.c  |    6 -
 linux-2.6.18-rc1/include/linux/libps2.h        |   12 ++
 linux-2.6.18-rc1/net/socket.c                  |    8 +
 linux-2.6/fs/block_dev.c                       |  116 ++++++++++++-------------
 9 files changed, 155 insertions(+), 82 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linux-2.6-lockdep-fixes.patch	20 Aug 2006 03:33:22 -0000	1.22
+++ linux-2.6-lockdep-fixes.patch	22 Aug 2006 23:14:57 -0000	1.23
@@ -560,3 +560,170 @@
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 Please read the FAQ at  http://www.tux.org/lkml/
 
+From: Peter Zijlstra <a.p.zijlstra at chello.nl>
+
+blkdev_open() calls
+  do_open(bdev, ...,BD_MUTEX_NORMAL) and takes
+    mutex_lock_nested(&bdev->bd_mutex, BD_MUTEX_NORMAL)
+    
+then something fails, and we're thrown to:
+
+out_first: where
+    if (bdev != bdev->bd_contains)
+      blkdev_put(bdev->bd_contains) which is
+        __blkdev_put(bdev->bd_contains, BD_MUTEX_NORMAL) which does
+          mutex_lock_nested(&bdev->bd_contains->bd_mutex, BD_MUTEX_NORMAL) <--- lockdep trigger
+
+When going to out_first, dbev->bd_contains is either bdev or whole, and
+since we take the branch it must be whole. So it seems to me the
+following patch would be the right one:
+
+Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
+Acked-by: Neil Brown <neilb at suse.de>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+ fs/block_dev.c |  116 ++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 58 insertions(+), 58 deletions(-)
+
+Index: linux-2.6/fs/block_dev.c
+===================================================================
+--- linux-2.6.orig/fs/block_dev.c
++++ linux-2.6/fs/block_dev.c
+@@ -887,6 +887,63 @@ EXPORT_SYMBOL(bd_set_size);
+ static int
+ blkdev_get_whole(struct block_device *bdev, mode_t mode, unsigned flags);
+ 
++static int __blkdev_put(struct block_device *bdev, unsigned int subclass)
++{
++	int ret = 0;
++	struct inode *bd_inode = bdev->bd_inode;
++	struct gendisk *disk = bdev->bd_disk;
++
++	mutex_lock_nested(&bdev->bd_mutex, subclass);
++	lock_kernel();
++	if (!--bdev->bd_openers) {
++		sync_blockdev(bdev);
++		kill_bdev(bdev);
++	}
++	if (bdev->bd_contains == bdev) {
++		if (disk->fops->release)
++			ret = disk->fops->release(bd_inode, NULL);
++	} else {
++		mutex_lock_nested(&bdev->bd_contains->bd_mutex,
++				  subclass + 1);
++		bdev->bd_contains->bd_part_count--;
++		mutex_unlock(&bdev->bd_contains->bd_mutex);
++	}
++	if (!bdev->bd_openers) {
++		struct module *owner = disk->fops->owner;
++
++		put_disk(disk);
++		module_put(owner);
++
++		if (bdev->bd_contains != bdev) {
++			kobject_put(&bdev->bd_part->kobj);
++			bdev->bd_part = NULL;
++		}
++		bdev->bd_disk = NULL;
++		bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
++		if (bdev != bdev->bd_contains)
++			__blkdev_put(bdev->bd_contains, subclass + 1);
++		bdev->bd_contains = NULL;
++	}
++	unlock_kernel();
++	mutex_unlock(&bdev->bd_mutex);
++	bdput(bdev);
++	return ret;
++}
++
++int blkdev_put(struct block_device *bdev)
++{
++	return __blkdev_put(bdev, BD_MUTEX_NORMAL);
++}
++
++EXPORT_SYMBOL(blkdev_put);
++
++int blkdev_put_partition(struct block_device *bdev)
++{
++	return __blkdev_put(bdev, BD_MUTEX_PARTITION);
++}
++
++EXPORT_SYMBOL(blkdev_put_partition);
++
+ static int
+ do_open(struct block_device *bdev, struct file *file, unsigned int subclass)
+ {
+@@ -980,7 +1037,7 @@ out_first:
+ 	bdev->bd_disk = NULL;
+ 	bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
+ 	if (bdev != bdev->bd_contains)
+-		blkdev_put(bdev->bd_contains);
++		__blkdev_put(bdev->bd_contains, BD_MUTEX_WHOLE);
+ 	bdev->bd_contains = NULL;
+ 	put_disk(disk);
+ 	module_put(owner);
+@@ -1079,63 +1136,6 @@ static int blkdev_open(struct inode * in
+ 	return res;
+ }
+ 
+-static int __blkdev_put(struct block_device *bdev, unsigned int subclass)
+-{
+-	int ret = 0;
+-	struct inode *bd_inode = bdev->bd_inode;
+-	struct gendisk *disk = bdev->bd_disk;
+-
+-	mutex_lock_nested(&bdev->bd_mutex, subclass);
+-	lock_kernel();
+-	if (!--bdev->bd_openers) {
+-		sync_blockdev(bdev);
+-		kill_bdev(bdev);
+-	}
+-	if (bdev->bd_contains == bdev) {
+-		if (disk->fops->release)
+-			ret = disk->fops->release(bd_inode, NULL);
+-	} else {
+-		mutex_lock_nested(&bdev->bd_contains->bd_mutex,
+-				  subclass + 1);
+-		bdev->bd_contains->bd_part_count--;
+-		mutex_unlock(&bdev->bd_contains->bd_mutex);
+-	}
+-	if (!bdev->bd_openers) {
+-		struct module *owner = disk->fops->owner;
+-
+-		put_disk(disk);
+-		module_put(owner);
+-
+-		if (bdev->bd_contains != bdev) {
+-			kobject_put(&bdev->bd_part->kobj);
+-			bdev->bd_part = NULL;
+-		}
+-		bdev->bd_disk = NULL;
+-		bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
+-		if (bdev != bdev->bd_contains)
+-			__blkdev_put(bdev->bd_contains, subclass + 1);
+-		bdev->bd_contains = NULL;
+-	}
+-	unlock_kernel();
+-	mutex_unlock(&bdev->bd_mutex);
+-	bdput(bdev);
+-	return ret;
+-}
+-
+-int blkdev_put(struct block_device *bdev)
+-{
+-	return __blkdev_put(bdev, BD_MUTEX_NORMAL);
+-}
+-
+-EXPORT_SYMBOL(blkdev_put);
+-
+-int blkdev_put_partition(struct block_device *bdev)
+-{
+-	return __blkdev_put(bdev, BD_MUTEX_PARTITION);
+-}
+-
+-EXPORT_SYMBOL(blkdev_put_partition);
+-
+ static int blkdev_close(struct inode * inode, struct file * filp)
+ {
+ 	struct block_device *bdev = I_BDEV(filp->f_mapping->host);
+



From fedora-cvs-commits at redhat.com  Tue Aug 22 23:17:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 19:17:33 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.24, 1.25 setroubleshoot.spec,
	1.29, 1.30 sources, 1.27, 1.28
Message-ID: <200608222317.k7MNHXXp005637@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5595/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.31-1 on branch devel from setroubleshoot-0.31-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	22 Aug 2006 19:03:59 -0000	1.24
+++ .cvsignore	22 Aug 2006 23:17:30 -0000	1.25
@@ -1 +1 @@
-setroubleshoot-0.30.tar.gz
+setroubleshoot-0.31.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- setroubleshoot.spec	22 Aug 2006 19:03:59 -0000	1.29
+++ setroubleshoot.spec	22 Aug 2006 23:17:30 -0000	1.30
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.30
+Version: 0.31
 Release: 1
 License: GPL
 Group: Applications/System
@@ -107,6 +107,17 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Tue Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.31-1
+- Fix desktop
+
+* Tue Aug 22 2006 John Dennis <jdennis at redhat.com> - 0.30-1
+	* fix bug #203479, missing requires of audit-libs-python
+
+	* add support to sealert to listen on a dbus session signal to display
+	the gui. This is needed for when the status icon is not visible and
+	the user wants to see the UI. There is now a seperate program
+	setroubleshoot_launch_gui which emits the signal.
+	
 * Tue Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.29-1
 - Add Requires: audit-libs-python
 - Add translations


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	22 Aug 2006 19:03:59 -0000	1.27
+++ sources	22 Aug 2006 23:17:30 -0000	1.28
@@ -1 +1 @@
-c23cdd7f59c43a64944e6f813c948b58  setroubleshoot-0.30.tar.gz
+6e49a12967555d386a16fc1cb27a462f  setroubleshoot-0.31.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 23 00:03:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 20:03:40 -0400
Subject: rpms/pango/devel .cvsignore, 1.40, 1.41 pango.spec, 1.82,
	1.83 sources, 1.40, 1.41
Message-ID: <200608230003.k7N03eeH015582@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15521

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
Update to 1.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	21 Aug 2006 19:52:27 -0000	1.40
+++ .cvsignore	23 Aug 2006 00:03:37 -0000	1.41
@@ -1 +1 @@
-pango-1.14.1.tar.bz2
+pango-1.14.2.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- pango.spec	21 Aug 2006 19:52:27 -0000	1.82
+++ pango.spec	23 Aug 2006 00:03:37 -0000	1.83
@@ -7,7 +7,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.14.1
+Version: 1.14.2
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Tue Aug 22 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.14.2-1
+- Update to 1.14.2
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.14.1-1.fc6
 - Update to 1.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	21 Aug 2006 19:52:27 -0000	1.40
+++ sources	23 Aug 2006 00:03:37 -0000	1.41
@@ -1 +1 @@
-cc478fa5bfc49e631a1696c632a9a9ae  pango-1.14.1.tar.bz2
+67b68a6b42dce1eb26e2e9abc31192c5  pango-1.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 23 00:10:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 20:10:09 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.237.8.3,
	1.237.8.4 config-ia64-generic, 1.39.6.2, 1.39.6.3
Message-ID: <200608230010.k7N0A9mO016909@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv16790/configs

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-generic config-ia64-generic 
Log Message:

more beta blocker bugs fixes




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237.8.3
retrieving revision 1.237.8.4
diff -u -r1.237.8.3 -r1.237.8.4
--- config-generic	17 Aug 2006 22:59:25 -0000	1.237.8.3
+++ config-generic	23 Aug 2006 00:10:05 -0000	1.237.8.4
@@ -472,6 +472,7 @@
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_DPT_I2O is not set
 CONFIG_SCSI_LPFC=m


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.39.6.2
retrieving revision 1.39.6.3
diff -u -r1.39.6.2 -r1.39.6.3
--- config-ia64-generic	16 Aug 2006 21:48:53 -0000	1.39.6.2
+++ config-ia64-generic	23 Aug 2006 00:10:06 -0000	1.39.6.3
@@ -34,7 +34,7 @@
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_IA64_MCA_RECOVERY=m
 CONFIG_IA64_CYCLONE=y
-# CONFIG_MMTIMER is not set
+CONFIG_MMTIMER=y
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
 CONFIG_NR_CPUS=1024
@@ -165,6 +165,8 @@
 
 CONFIG_SERIAL_SGI_IOC3=m
 CONFIG_SGI_IOC3=m
+CONFIG_SERIAL_SGI_IOC4=m
+CONFIG_SGI_IOC4=m
 
 # CONFIG_PERMIT_BSP_REMOVE is not set
 # CONFIG_FORCE_CPEI_RETARGET is not set
@@ -174,6 +176,3 @@
 # CONFIG_BCM43XX is not set
 
 CONFIG_HW_RANDOM_INTEL=m
-
-# FIXME
-# CONFIG_UTRACE is not set



From fedora-cvs-commits at redhat.com  Wed Aug 23 00:10:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 20:10:09 -0400
Subject: rpms/kernel/devel linux-2.6-iscsi-add-qla4xxx2.patch, NONE,
	1.1.2.1 linux-2.6-nfs-special-tests-fix.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2519.4.6,
	1.2519.4.7 linux-2.6-lockdep-fixes.patch, 1.16.4.2,
	1.16.4.3 linux-2.6-utrace.patch, 1.12.4.2, 1.12.4.3
Message-ID: <200608230010.k7N0A8bH016893@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16790

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec linux-2.6-lockdep-fixes.patch 
	linux-2.6-utrace.patch 
Added Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	linux-2.6-iscsi-add-qla4xxx2.patch 
	linux-2.6-nfs-special-tests-fix.patch 
Log Message:

more beta blocker bugs fixes



linux-2.6-iscsi-add-qla4xxx2.patch:
 Kconfig               |    1 
 Makefile              |    1 
 qla4xxx/Kconfig       |    7 
 qla4xxx/Makefile      |    5 
 qla4xxx/ql4_dbg.c     |  197 +++++
 qla4xxx/ql4_dbg.h     |   55 +
 qla4xxx/ql4_def.h     |  599 +++++++++++++++++
 qla4xxx/ql4_fw.h      |  852 ++++++++++++++++++++++++
 qla4xxx/ql4_glbl.h    |   80 ++
 qla4xxx/ql4_init.c    | 1355 ++++++++++++++++++++++++++++++++++++++
 qla4xxx/ql4_inline.h  |   84 ++
 qla4xxx/ql4_iocb.c    |  516 ++++++++++++++
 qla4xxx/ql4_isr.c     |  796 ++++++++++++++++++++++
 qla4xxx/ql4_mbx.c     |  930 ++++++++++++++++++++++++++
 qla4xxx/ql4_nvram.c   |  224 ++++++
 qla4xxx/ql4_nvram.h   |  256 +++++++
 qla4xxx/ql4_os.c      | 1758 ++++++++++++++++++++++++++++++++++++++++++++++++++
 qla4xxx/ql4_version.h |   13 
 18 files changed, 7729 insertions(+)

--- NEW FILE linux-2.6-iscsi-add-qla4xxx2.patch ---
diff -Naurp linux-2.6.17.noarch/drivers/scsi/Kconfig linux-2.6.17.noarch.qla4xxx/drivers/scsi/Kconfig
--- linux-2.6.17.noarch/drivers/scsi/Kconfig	2006-08-15 14:19:43.000000000 -0400
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/Kconfig	2006-08-17 12:57:22.000000000 -0400
@@ -1352,6 +1352,7 @@ config SCSI_QLOGICPTI
 	  module will be called qlogicpti.
 
 source "drivers/scsi/qla2xxx/Kconfig"
+source "drivers/scsi/qla4xxx/Kconfig"
 
 config SCSI_LPFC
 	tristate "Emulex LightPulse Fibre Channel Support"
diff -Naurp linux-2.6.17.noarch/drivers/scsi/Makefile linux-2.6.17.noarch.qla4xxx/drivers/scsi/Makefile
--- linux-2.6.17.noarch/drivers/scsi/Makefile	2006-08-15 14:19:41.000000000 -0400
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/Makefile	2006-08-17 12:57:22.000000000 -0400
@@ -81,6 +81,7 @@ obj-$(CONFIG_SCSI_QLOGIC_FAS)	+= qlogicf
 obj-$(CONFIG_PCMCIA_QLOGIC)	+= qlogicfas408.o
 obj-$(CONFIG_SCSI_QLOGIC_1280)	+= qla1280.o 
 obj-$(CONFIG_SCSI_QLA_FC)	+= qla2xxx/
+obj-$(CONFIG_SCSI_QLA_ISCSI)	+= qla4xxx/
 obj-$(CONFIG_SCSI_LPFC)		+= lpfc/
 obj-$(CONFIG_SCSI_PAS16)	+= pas16.o
 obj-$(CONFIG_SCSI_SEAGATE)	+= seagate.o
diff -Naurp linux-2.6.17.noarch/drivers/scsi/qla4xxx/Kconfig linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/Kconfig
--- linux-2.6.17.noarch/drivers/scsi/qla4xxx/Kconfig	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/Kconfig	2006-08-17 12:57:22.000000000 -0400
@@ -0,0 +1,7 @@
+config SCSI_QLA_ISCSI
+	tristate "QLogic ISP4XXX host adapter family support"
+	depends on PCI && SCSI
+	select SCSI_ISCSI_ATTRS
+	---help---
+	This driver supports the QLogic 40xx (ISP4XXX) iSCSI host 
+	adapter family.
diff -Naurp linux-2.6.17.noarch/drivers/scsi/qla4xxx/Makefile linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/Makefile
--- linux-2.6.17.noarch/drivers/scsi/qla4xxx/Makefile	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/Makefile	2006-08-17 12:57:22.000000000 -0400
@@ -0,0 +1,5 @@
+qla4xxx-y := ql4_os.o ql4_init.o ql4_mbx.o ql4_iocb.o ql4_isr.o \
+		ql4_nvram.o ql4_dbg.o
+
+obj-$(CONFIG_SCSI_QLA_ISCSI) += qla4xxx.o
+
diff -Naurp linux-2.6.17.noarch/drivers/scsi/qla4xxx/ql4_dbg.c linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/ql4_dbg.c
--- linux-2.6.17.noarch/drivers/scsi/qla4xxx/ql4_dbg.c	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/ql4_dbg.c	2006-08-17 12:57:22.000000000 -0400
@@ -0,0 +1,197 @@
+/*
+ * QLogic iSCSI HBA Driver
+ * Copyright (c)  2003-2006 QLogic Corporation
+ *
+ * See LICENSE.qla4xxx for copyright and licensing details.
+ */
+
+#include "ql4_def.h"
+#include <scsi/scsi_dbg.h>
+
+static void qla4xxx_print_srb_info(struct srb * srb)
+{
+	printk("%s: srb = 0x%p, flags=0x%02x\n", __func__, srb, srb->flags);
+	printk("%s: cmd = 0x%p, saved_dma_handle = 0x%lx\n",
+	       __func__, srb->cmd, (unsigned long) srb->dma_handle);
+	printk("%s: fw_ddb_index = %d, lun = %d\n",
+	       __func__, srb->fw_ddb_index, srb->cmd->device->lun);
+	printk("%s: iocb_tov = %d\n",
+	       __func__, srb->iocb_tov);
+	printk("%s: cc_stat = 0x%x, r_start = 0x%lx, u_start = 0x%lx\n\n",
+	       __func__, srb->cc_stat, srb->r_start, srb->u_start);
+}
+
+void qla4xxx_print_scsi_cmd(struct scsi_cmnd *cmd)
+{
+	printk("SCSI Command = 0x%p, Handle=0x%p\n", cmd, cmd->host_scribble);
+	printk("  b=%d, t=%02xh, l=%02xh, cmd_len = %02xh\n",
+	       cmd->device->channel, cmd->device->id, cmd->device->lun,
+	       cmd->cmd_len);
+	scsi_print_command(cmd);
+	printk("  seg_cnt = %d\n", cmd->use_sg);
+	printk("  request buffer = 0x%p, request buffer len = 0x%x\n",
+	       cmd->request_buffer, cmd->request_bufflen);
+	if (cmd->use_sg) {
+		struct scatterlist *sg;
+		sg = (struct scatterlist *)cmd->request_buffer;
+		printk("  SG buffer: \n");
+		qla4xxx_dump_buffer((caddr_t) sg,
+				    (cmd->use_sg * sizeof(*sg)));
+	}
+	printk("  tag = %d, transfersize = 0x%x \n", cmd->tag,
+	       cmd->transfersize);
+	printk("  Pid = %d, SP = 0x%p\n", (int)cmd->pid, cmd->SCp.ptr);
+	printk("  underflow size = 0x%x, direction=0x%x\n", cmd->underflow,
+	       cmd->sc_data_direction);
+	printk("  Current time (jiffies) = 0x%lx, "
+	       "timeout expires = 0x%lx\n", jiffies, cmd->eh_timeout.expires);
+	qla4xxx_print_srb_info((struct srb *) cmd->SCp.ptr);
+}
+
+void __dump_registers(struct scsi_qla_host *ha)
+{
+	uint8_t i;
+	for (i = 0; i < MBOX_REG_COUNT; i++) {
+		printk(KERN_INFO "0x%02X mailbox[%d]	  = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, mailbox[i]), i,
+		       readw(&ha->reg->mailbox[i]));
+	}
+	printk(KERN_INFO "0x%02X flash_address	 = 0x%08X\n",
+	       (uint8_t) offsetof(struct isp_reg, flash_address),
+	       readw(&ha->reg->flash_address));
+	printk(KERN_INFO "0x%02X flash_data	 = 0x%08X\n",
+	       (uint8_t) offsetof(struct isp_reg, flash_data),
+	       readw(&ha->reg->flash_data));
+	printk(KERN_INFO "0x%02X ctrl_status	 = 0x%08X\n",
+	       (uint8_t) offsetof(struct isp_reg, ctrl_status),
+	       readw(&ha->reg->ctrl_status));
+	if (is_qla4010(ha)) {
+		printk(KERN_INFO "0x%02X nvram		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, u1.isp4010.nvram),
+		       readw(&ha->reg->u1.isp4010.nvram));
+	}
+
+	else if (is_qla4022(ha)) {
+		printk(KERN_INFO "0x%02X intr_mask	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u1.isp4022.intr_mask),
+		       readw(&ha->reg->u1.isp4022.intr_mask));
+		printk(KERN_INFO "0x%02X nvram		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, u1.isp4022.nvram),
+		       readw(&ha->reg->u1.isp4022.nvram));
+		printk(KERN_INFO "0x%02X semaphore	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u1.isp4022.semaphore),
+		       readw(&ha->reg->u1.isp4022.semaphore));
+	}
+	printk(KERN_INFO "0x%02X req_q_in	 = 0x%08X\n",
+	       (uint8_t) offsetof(struct isp_reg, req_q_in),
+	       readw(&ha->reg->req_q_in));
+	printk(KERN_INFO "0x%02X rsp_q_out	 = 0x%08X\n",
+	       (uint8_t) offsetof(struct isp_reg, rsp_q_out),
+	       readw(&ha->reg->rsp_q_out));
+	if (is_qla4010(ha)) {
+		printk(KERN_INFO "0x%02X ext_hw_conf	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4010.ext_hw_conf),
+		       readw(&ha->reg->u2.isp4010.ext_hw_conf));
+		printk(KERN_INFO "0x%02X port_ctrl	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4010.port_ctrl),
+		       readw(&ha->reg->u2.isp4010.port_ctrl));
+		printk(KERN_INFO "0x%02X port_status	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4010.port_status),
+		       readw(&ha->reg->u2.isp4010.port_status));
+		printk(KERN_INFO "0x%02X req_q_out	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4010.req_q_out),
+		       readw(&ha->reg->u2.isp4010.req_q_out));
+		printk(KERN_INFO "0x%02X gp_out		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, u2.isp4010.gp_out),
+		       readw(&ha->reg->u2.isp4010.gp_out));
+		printk(KERN_INFO "0x%02X gp_in		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, u2.isp4010.gp_in),
+		       readw(&ha->reg->u2.isp4010.gp_in));
+		printk(KERN_INFO "0x%02X port_err_status = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4010.port_err_status),
+		       readw(&ha->reg->u2.isp4010.port_err_status));
+	}
+
+	else if (is_qla4022(ha)) {
+		printk(KERN_INFO "Page 0 Registers:\n");
+		printk(KERN_INFO "0x%02X ext_hw_conf	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p0.ext_hw_conf),
+		       readw(&ha->reg->u2.isp4022.p0.ext_hw_conf));
+		printk(KERN_INFO "0x%02X port_ctrl	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p0.port_ctrl),
+		       readw(&ha->reg->u2.isp4022.p0.port_ctrl));
+		printk(KERN_INFO "0x%02X port_status	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p0.port_status),
+		       readw(&ha->reg->u2.isp4022.p0.port_status));
+		printk(KERN_INFO "0x%02X gp_out		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p0.gp_out),
+		       readw(&ha->reg->u2.isp4022.p0.gp_out));
+		printk(KERN_INFO "0x%02X gp_in		 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg, u2.isp4022.p0.gp_in),
+		       readw(&ha->reg->u2.isp4022.p0.gp_in));
+		printk(KERN_INFO "0x%02X port_err_status = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p0.port_err_status),
+		       readw(&ha->reg->u2.isp4022.p0.port_err_status));
+		printk(KERN_INFO "Page 1 Registers:\n");
+		writel(HOST_MEM_CFG_PAGE & set_rmask(CSR_SCSI_PAGE_SELECT),
+		       &ha->reg->ctrl_status);
+		printk(KERN_INFO "0x%02X req_q_out	 = 0x%08X\n",
+		       (uint8_t) offsetof(struct isp_reg,
+					  u2.isp4022.p1.req_q_out),
+		       readw(&ha->reg->u2.isp4022.p1.req_q_out));
[...7414 lines suppressed...]
+/**
+ * qla4xxx_eh_device_reset - callback for target reset.
+ * @cmd: Pointer to Linux's SCSI command structure
+ *
+ * This routine is called by the Linux OS to reset all luns on the
+ * specified target.
+ **/
+static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
+{
+	struct scsi_qla_host *ha = to_qla_host(cmd->device->host);
+	struct ddb_entry *ddb_entry = cmd->device->hostdata;
+	struct srb *sp;
+	int ret = FAILED, stat;
+
+	sp = (struct srb *) cmd->SCp.ptr;
+	if (!sp || !ddb_entry)
+		return ret;
+
+	dev_info(&ha->pdev->dev,
+		   "scsi%ld:%d:%d:%d: DEVICE RESET ISSUED.\n", ha->host_no,
+		   cmd->device->channel, cmd->device->id, cmd->device->lun);
+
+	DEBUG2(printk(KERN_INFO
+		      "scsi%ld: DEVICE_RESET cmd=%p jiffies = 0x%lx, to=%x,"
+		      "dpc_flags=%lx, status=%x allowed=%d\n", ha->host_no,
+		      cmd, jiffies, cmd->timeout_per_command / HZ,
+		      ha->dpc_flags, cmd->result, cmd->allowed));
+
+	/* FIXME: wait for hba to go online */
+	stat = qla4xxx_reset_lun(ha, ddb_entry, cmd->device->lun);
+	if (stat != QLA_SUCCESS) {
+		dev_info(&ha->pdev->dev, "DEVICE RESET FAILED. %d\n", stat);
+		goto eh_dev_reset_done;
+	}
+
+	/* Send marker. */
+	ha->marker_needed = 1;
+
+	/*
+	 * If we are coming down the EH path, wait for all commands to complete
+	 * for the device.
+	 */
+	if (cmd->device->host->shost_state == SHOST_RECOVERY) {
+		if (qla4xxx_eh_wait_for_active_target_commands(ha,
+							       cmd->device->id,
+							       cmd->device->
+							       lun)) {
+			dev_info(&ha->pdev->dev,
+				   "DEVICE RESET FAILED - waiting for "
+				   "commands.\n");
+			goto eh_dev_reset_done;
+		}
+	}
+
+	dev_info(&ha->pdev->dev,
+		   "scsi(%ld:%d:%d:%d): DEVICE RESET SUCCEEDED.\n",
+		   ha->host_no, cmd->device->channel, cmd->device->id,
+		   cmd->device->lun);
+
+	ret = SUCCESS;
+
+eh_dev_reset_done:
+
+	return ret;
+}
+
+/**
+ * qla4xxx_eh_host_reset - kernel callback
+ * @cmd: Pointer to Linux's SCSI command structure
+ *
+ * This routine is invoked by the Linux kernel to perform fatal error
+ * recovery on the specified adapter.
+ **/
+static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd)
+{
+	int return_status = FAILED;
+	struct scsi_qla_host *ha;
+
+	ha = (struct scsi_qla_host *) cmd->device->host->hostdata;
+
+	dev_info(&ha->pdev->dev,
+		   "scsi(%ld:%d:%d:%d): ADAPTER RESET ISSUED.\n", ha->host_no,
+		   cmd->device->channel, cmd->device->id, cmd->device->lun);
+
+	if (qla4xxx_wait_for_hba_online(ha) != QLA_SUCCESS) {
+		DEBUG2(printk("scsi%ld:%d: %s: Unable to reset host.  Adapter "
+			      "DEAD.\n", ha->host_no, cmd->device->channel,
+			      __func__));
+
+		return FAILED;
+	}
+
+	if (qla4xxx_recover_adapter(ha, PRESERVE_DDB_LIST) == QLA_SUCCESS) {
+		return_status = SUCCESS;
+	}
+
+	dev_info(&ha->pdev->dev, "HOST RESET %s.\n",
+		   return_status == FAILED ? "FAILED" : "SUCCEDED");
+
+	return return_status;
+}
+
+
+static struct pci_device_id qla4xxx_pci_tbl[] = {
+	{
+		.vendor		= PCI_VENDOR_ID_QLOGIC,
+		.device		= PCI_DEVICE_ID_QLOGIC_ISP4010,
+		.subvendor	= PCI_ANY_ID,
+		.subdevice	= PCI_ANY_ID,
+	},
+	{
+		.vendor		= PCI_VENDOR_ID_QLOGIC,
+		.device		= PCI_DEVICE_ID_QLOGIC_ISP4022,
+		.subvendor	= PCI_ANY_ID,
+		.subdevice	= PCI_ANY_ID,
+	},
+	{0, 0},
+};
+MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
+
+struct pci_driver qla4xxx_pci_driver = {
+	.name		= DRIVER_NAME,
+	.id_table	= qla4xxx_pci_tbl,
+	.probe		= qla4xxx_probe_adapter,
+	.remove		= qla4xxx_remove_adapter,
+};
+
+static int __init qla4xxx_module_init(void)
+{
+	int ret;
+
+	/* Allocate cache for SRBs. */
+	srb_cachep = kmem_cache_create("qla4xxx_srbs", sizeof(struct srb), 0,
+				       SLAB_HWCACHE_ALIGN, NULL, NULL);
+	if (srb_cachep == NULL) {
+		printk(KERN_ERR
+		       "%s: Unable to allocate SRB cache..."
+		       "Failing load!\n", DRIVER_NAME);
+		ret = -ENOMEM;
+		goto no_srp_cache;
+	}
+
+	/* Derive version string. */
+	strcpy(qla4xxx_version_str, QLA4XXX_DRIVER_VERSION);
+	if (extended_error_logging)
+		strcat(qla4xxx_version_str, "-debug");
+
+	qla4xxx_scsi_transport =
+		iscsi_register_transport(&qla4xxx_iscsi_transport);
+	if (!qla4xxx_scsi_transport){
+		ret = -ENODEV;
+		goto release_srb_cache;
+	}
+
+	printk(KERN_INFO "QLogic iSCSI HBA Driver\n");
+	ret = pci_register_driver(&qla4xxx_pci_driver);
+	if (ret)
+		goto unregister_transport;
+
+	printk(KERN_INFO "QLogic iSCSI HBA Driver\n");
+	return 0;
+unregister_transport:
+	iscsi_unregister_transport(&qla4xxx_iscsi_transport);
+release_srb_cache:
+	kmem_cache_destroy(srb_cachep);
+no_srp_cache:
+	return ret;
+}
+
+static void __exit qla4xxx_module_exit(void)
+{
+	pci_unregister_driver(&qla4xxx_pci_driver);
+	iscsi_unregister_transport(&qla4xxx_iscsi_transport);
+	kmem_cache_destroy(srb_cachep);
+}
+
+module_init(qla4xxx_module_init);
+module_exit(qla4xxx_module_exit);
+
+MODULE_AUTHOR("QLogic Corporation");
+MODULE_DESCRIPTION("QLogic iSCSI HBA Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(QLA4XXX_DRIVER_VERSION);
diff -Naurp linux-2.6.17.noarch/drivers/scsi/qla4xxx/ql4_version.h linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/ql4_version.h
--- linux-2.6.17.noarch/drivers/scsi/qla4xxx/ql4_version.h	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.qla4xxx/drivers/scsi/qla4xxx/ql4_version.h	2006-08-17 12:57:22.000000000 -0400
@@ -0,0 +1,13 @@
+/*
+ * QLogic iSCSI HBA Driver
+ * Copyright (c)  2003-2006 QLogic Corporation
+ *
+ * See LICENSE.qla4xxx for copyright and licensing details.
+ */
+
+#define QLA4XXX_DRIVER_VERSION	"5.00.05b9-k"
+
+#define QL4_DRIVER_MAJOR_VER	5
+#define QL4_DRIVER_MINOR_VER	0
+#define QL4_DRIVER_PATCH_VER	5
+#define QL4_DRIVER_BETA_VER	9

linux-2.6-nfs-special-tests-fix.patch:
 read.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-nfs-special-tests-fix.patch ---
Date: Sun, 20 Aug 2006 22:09:17 -0400
From: Steve Dickson <SteveD at redhat.com>
Subject: [PATCH] [RHEL5] connectathon general and special tests failing

The attached patch fixes a regression that causes the special tests
of the Connectation tests suite to fail. When a hole in a
file is created (like the holey test does), the page will
be allocated but there will be nothing read into it. The
means the number of byte read from the server will be
zero (i.e.  data->res.count). In the case, the page
still has PageUptodate-ed which is what this patch does.

I've tested with both the connectathon test suite
and fsx test suite.... as well as summited an upstream
version of the patch...


steved.

--- linux-2.6.17.i686/fs/nfs/read.c.orig	2006-08-17 17:25:00.000000000 -0400
+++ linux-2.6.17.i686/fs/nfs/read.c	2006-08-20 13:48:19.000000000 -0400
@@ -488,13 +488,14 @@ static void nfs_readpage_set_pages_uptod
 	unsigned int base = data->args.pgbase;
 	struct page **pages;
 
-	if (unlikely(count == 0))
-		return;
 	pages = &data->args.pages[base >> PAGE_CACHE_SHIFT];
 	base &= ~PAGE_CACHE_MASK;
 	count += base;
-	for (;count >= PAGE_CACHE_SIZE; count -= PAGE_CACHE_SIZE, pages++)
+	if (count == 0) 
 		SetPageUptodate(*pages);
+	else 
+		for (;count >= PAGE_CACHE_SIZE; count -= PAGE_CACHE_SIZE, pages++)
+			SetPageUptodate(*pages);
 	/*
 	 * Was this an eof or a short read? If the latter, don't mark the page
 	 * as uptodate yet.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.6
retrieving revision 1.2519.4.7
diff -u -r1.2519.4.6 -r1.2519.4.7
--- kernel-2.6.spec	18 Aug 2006 21:22:21 -0000	1.2519.4.6
+++ kernel-2.6.spec	23 Aug 2006 00:09:48 -0000	1.2519.4.7
@@ -360,11 +360,13 @@
 # SCSI bits.
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
 Patch1103: linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch
+Patch1104: linux-2.6-iscsi-add-qla4xxx2.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
 Patch1201: linux-2.6-NFSD-ctlbits.patch
 Patch1203: linux-2.6-NFSD-badness.patch
+Patch1204: linux-2.6-nfs-special-tests-fix.patch
 
 # core networking changes.
 Patch1300: linux-2.6-net-ipsec-labelling.patch
@@ -885,6 +887,8 @@
 # Add a pci table to advansys driver.
 %patch1102 -p1
 %patch1103 -p1
+# add support for qla4xxx
+%patch1104 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -894,6 +898,8 @@
 %patch1201 -p1
 # Fix badness.
 %patch1203 -p1
+# Fix nfs special tests problem
+%patch1204 -p1
 
 # core networking changes.
 %patch1300 -p1
@@ -1722,6 +1728,13 @@
 %endif
 
 %changelog
+* Tue Aug 22 2006 Don Zickus <dzickus at redhat.com>
+- added #202778 possible recursive lock detected (Peter Zijlstr)
+- added #201852 connectathon tests failing (Steve Dickson)
+- added #196291 support for qla4xxx (Mike Christie)
+- added #203056/203387 refresh utrace patch (Roland McGrath)
+- added #203397 enable mmtimer on ia64 (Eric J)
+
 * Fri Aug 18 2006 Don Zickus <dzickus at redhat.com>
 - fixed modsigning but forgot to enable it
 

linux-2.6-lockdep-fixes.patch:
 a/net/ipv6/icmp.c                             |   13 ++
 linux-2.6.17-mm6/include/net/sock.h           |   33 ++++++-
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 -
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++
 linux-2.6.18-rc1/net/socket.c                 |    8 +
 linux-2.6/fs/block_dev.c                      |  116 +++++++++++++-------------
 6 files changed, 122 insertions(+), 66 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.16.4.2
retrieving revision 1.16.4.3
diff -u -r1.16.4.2 -r1.16.4.3
--- linux-2.6-lockdep-fixes.patch	16 Aug 2006 20:42:35 -0000	1.16.4.2
+++ linux-2.6-lockdep-fixes.patch	23 Aug 2006 00:09:53 -0000	1.16.4.3
@@ -388,3 +388,170 @@
  		/* Enough space for 2 64K ICMP packets, including
  		 * sk_buff struct overhead.
 _
+From: Peter Zijlstra <a.p.zijlstra at chello.nl>
+
+blkdev_open() calls
+  do_open(bdev, ...,BD_MUTEX_NORMAL) and takes
+    mutex_lock_nested(&bdev->bd_mutex, BD_MUTEX_NORMAL)
+    
+then something fails, and we're thrown to:
+
+out_first: where
+    if (bdev != bdev->bd_contains)
+      blkdev_put(bdev->bd_contains) which is
+        __blkdev_put(bdev->bd_contains, BD_MUTEX_NORMAL) which does
+          mutex_lock_nested(&bdev->bd_contains->bd_mutex, BD_MUTEX_NORMAL) <--- lockdep trigger
+
+When going to out_first, dbev->bd_contains is either bdev or whole, and
+since we take the branch it must be whole. So it seems to me the
+following patch would be the right one:
+
+Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
+Acked-by: Neil Brown <neilb at suse.de>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+ fs/block_dev.c |  116 ++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 58 insertions(+), 58 deletions(-)
+
+Index: linux-2.6/fs/block_dev.c
+===================================================================
+--- linux-2.6.orig/fs/block_dev.c
++++ linux-2.6/fs/block_dev.c
+@@ -887,6 +887,63 @@ EXPORT_SYMBOL(bd_set_size);
+ static int
+ blkdev_get_whole(struct block_device *bdev, mode_t mode, unsigned flags);
+ 
++static int __blkdev_put(struct block_device *bdev, unsigned int subclass)
++{
++	int ret = 0;
++	struct inode *bd_inode = bdev->bd_inode;
++	struct gendisk *disk = bdev->bd_disk;
++
++	mutex_lock_nested(&bdev->bd_mutex, subclass);
++	lock_kernel();
++	if (!--bdev->bd_openers) {
++		sync_blockdev(bdev);
++		kill_bdev(bdev);
++	}
++	if (bdev->bd_contains == bdev) {
++		if (disk->fops->release)
++			ret = disk->fops->release(bd_inode, NULL);
++	} else {
++		mutex_lock_nested(&bdev->bd_contains->bd_mutex,
++				  subclass + 1);
++		bdev->bd_contains->bd_part_count--;
++		mutex_unlock(&bdev->bd_contains->bd_mutex);
++	}
++	if (!bdev->bd_openers) {
++		struct module *owner = disk->fops->owner;
++
++		put_disk(disk);
++		module_put(owner);
++
++		if (bdev->bd_contains != bdev) {
++			kobject_put(&bdev->bd_part->kobj);
++			bdev->bd_part = NULL;
++		}
++		bdev->bd_disk = NULL;
++		bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
++		if (bdev != bdev->bd_contains)
++			__blkdev_put(bdev->bd_contains, subclass + 1);
++		bdev->bd_contains = NULL;
++	}
++	unlock_kernel();
++	mutex_unlock(&bdev->bd_mutex);
++	bdput(bdev);
++	return ret;
++}
++
++int blkdev_put(struct block_device *bdev)
++{
++	return __blkdev_put(bdev, BD_MUTEX_NORMAL);
++}
++
++EXPORT_SYMBOL(blkdev_put);
++
++int blkdev_put_partition(struct block_device *bdev)
++{
++	return __blkdev_put(bdev, BD_MUTEX_PARTITION);
++}
++
++EXPORT_SYMBOL(blkdev_put_partition);
++
+ static int
+ do_open(struct block_device *bdev, struct file *file, unsigned int subclass)
+ {
+@@ -980,7 +1037,7 @@ out_first:
+ 	bdev->bd_disk = NULL;
+ 	bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
+ 	if (bdev != bdev->bd_contains)
+-		blkdev_put(bdev->bd_contains);
++		__blkdev_put(bdev->bd_contains, BD_MUTEX_WHOLE);
+ 	bdev->bd_contains = NULL;
+ 	put_disk(disk);
+ 	module_put(owner);
+@@ -1079,63 +1136,6 @@ static int blkdev_open(struct inode * in
+ 	return res;
+ }
+ 
+-static int __blkdev_put(struct block_device *bdev, unsigned int subclass)
+-{
+-	int ret = 0;
+-	struct inode *bd_inode = bdev->bd_inode;
+-	struct gendisk *disk = bdev->bd_disk;
+-
+-	mutex_lock_nested(&bdev->bd_mutex, subclass);
+-	lock_kernel();
+-	if (!--bdev->bd_openers) {
+-		sync_blockdev(bdev);
+-		kill_bdev(bdev);
+-	}
+-	if (bdev->bd_contains == bdev) {
+-		if (disk->fops->release)
+-			ret = disk->fops->release(bd_inode, NULL);
+-	} else {
+-		mutex_lock_nested(&bdev->bd_contains->bd_mutex,
+-				  subclass + 1);
+-		bdev->bd_contains->bd_part_count--;
+-		mutex_unlock(&bdev->bd_contains->bd_mutex);
+-	}
+-	if (!bdev->bd_openers) {
+-		struct module *owner = disk->fops->owner;
+-
+-		put_disk(disk);
+-		module_put(owner);
+-
+-		if (bdev->bd_contains != bdev) {
+-			kobject_put(&bdev->bd_part->kobj);
+-			bdev->bd_part = NULL;
+-		}
+-		bdev->bd_disk = NULL;
+-		bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
+-		if (bdev != bdev->bd_contains)
+-			__blkdev_put(bdev->bd_contains, subclass + 1);
+-		bdev->bd_contains = NULL;
+-	}
+-	unlock_kernel();
+-	mutex_unlock(&bdev->bd_mutex);
+-	bdput(bdev);
+-	return ret;
+-}
+-
+-int blkdev_put(struct block_device *bdev)
+-{
+-	return __blkdev_put(bdev, BD_MUTEX_NORMAL);
+-}
+-
+-EXPORT_SYMBOL(blkdev_put);
+-
+-int blkdev_put_partition(struct block_device *bdev)
+-{
+-	return __blkdev_put(bdev, BD_MUTEX_PARTITION);
+-}
+-
+-EXPORT_SYMBOL(blkdev_put_partition);
+-
+ static int blkdev_close(struct inode * inode, struct file * filp)
+ {
+ 	struct block_device *bdev = I_BDEV(filp->f_mapping->host);
+

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  454 ++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  863 +++++++++-------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/ia32_entry.S             |    2 
 arch/ia64/ia32/sys_ia32.c               |   23 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               | 1671 +++++++++++++++-----------------
 arch/ia64/kernel/signal.c               |    4 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  959 ++++++++++--------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  639 +++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            | 1222 ++++++++++++-----------
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  715 +++++++++----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  648 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |   14 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   49 
 include/asm-ia64/elf.h                  |   24 
 include/asm-ia64/tracehook.h            |   81 +
 include/asm-powerpc/tracehook.h         |   80 +
 include/asm-s390/tracehook.h            |   53 +
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |   54 +
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |  224 +++-
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  699 +++++++++++++
 include/linux/utrace.h                  |  481 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  253 +---
 kernel/fork.c                           |   64 -
 kernel/ptrace.c                         | 1560 +++++++++++++++++++++++------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1526 +++++++++++++++++++++++++++++
 security/selinux/hooks.c                |   54 -
 security/selinux/include/objsec.h       |    1 
 94 files changed, 9470 insertions(+), 4565 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.12.4.2 -r 1.12.4.3 linux-2.6-utrace.patch
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.12.4.2
retrieving revision 1.12.4.3
diff -u -r1.12.4.2 -r1.12.4.3
--- linux-2.6-utrace.patch	16 Aug 2006 20:42:36 -0000	1.12.4.2
+++ linux-2.6-utrace.patch	23 Aug 2006 00:09:53 -0000	1.12.4.3
@@ -1,4 +1,4 @@
- Documentation/utrace.txt                |  455 +++++++++
+ Documentation/utrace.txt                |  454 ++++++++
  arch/alpha/kernel/asm-offsets.c         |    2 
  arch/alpha/kernel/entry.S               |    4 
  arch/arm/kernel/ptrace.c                |   36 -
@@ -7,22 +7,24 @@
  arch/i386/kernel/entry.S                |    7 
  arch/i386/kernel/i387.c                 |  143 +--
  arch/i386/kernel/process.c              |    3 
- arch/i386/kernel/ptrace.c               |  839 +++++++++--------
+ arch/i386/kernel/ptrace.c               |  863 +++++++++-------
  arch/i386/kernel/signal.c               |   39 -
  arch/i386/kernel/vm86.c                 |    7 
- arch/ia64/ia32/sys_ia32.c               |    2 
+ arch/ia64/ia32/ia32_entry.S             |    2 
+ arch/ia64/ia32/sys_ia32.c               |   23 
  arch/ia64/kernel/asm-offsets.c          |    2 
  arch/ia64/kernel/fsys.S                 |   16 
  arch/ia64/kernel/mca.c                  |    2 
- arch/ia64/kernel/ptrace.c               |   41 -
+ arch/ia64/kernel/ptrace.c               | 1671 +++++++++++++++----------------
+ arch/ia64/kernel/signal.c               |    4 
  arch/mips/kernel/ptrace.c               |   21 
  arch/mips/kernel/sysirix.c              |    2 
  arch/powerpc/kernel/Makefile            |    4 
  arch/powerpc/kernel/asm-offsets.c       |    2 
  arch/powerpc/kernel/process.c           |    5 
  arch/powerpc/kernel/ptrace-common.h     |  161 ---
- arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
- arch/powerpc/kernel/ptrace32.c          |  436 ---------
+ arch/powerpc/kernel/ptrace.c            |  959 +++++++++++-------
+ arch/powerpc/kernel/ptrace32.c          |  436 --------
  arch/powerpc/kernel/signal_32.c         |   56 +
  arch/powerpc/kernel/signal_64.c         |    4 
  arch/powerpc/kernel/sys_ppc32.c         |    5 
@@ -32,12 +34,12 @@
  arch/s390/kernel/compat_linux.c         |    3 
  arch/s390/kernel/compat_signal.c        |    5 
  arch/s390/kernel/process.c              |    3 
- arch/s390/kernel/ptrace.c               |  551 ++++++++++-
+ arch/s390/kernel/ptrace.c               |  639 +++++++++++-
  arch/s390/kernel/signal.c               |    4 
  arch/s390/kernel/traps.c                |    6 
  arch/sparc64/kernel/entry.S             |    6 
  arch/sparc64/kernel/process.c           |    3 
- arch/sparc64/kernel/ptrace.c            |  650 +++++++++++--
+ arch/sparc64/kernel/ptrace.c            | 1222 ++++++++++++-----------
  arch/sparc64/kernel/signal.c            |    2 
  arch/sparc64/kernel/signal32.c          |    2 
  arch/sparc64/kernel/sys_sparc32.c       |    3 
@@ -46,10 +48,10 @@
  arch/x86_64/ia32/ia32_aout.c            |    6 
  arch/x86_64/ia32/ia32_signal.c          |    8 
  arch/x86_64/ia32/ia32entry.S            |    2 
- arch/x86_64/ia32/ptrace32.c             |  690 +++++++++-----
+ arch/x86_64/ia32/ptrace32.c             |  715 +++++++++----
  arch/x86_64/ia32/sys_ia32.c             |    5 
  arch/x86_64/kernel/process.c            |    5 
- arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
+ arch/x86_64/kernel/ptrace.c             |  648 +++++++-----
  arch/x86_64/kernel/signal.c             |   30 -
  arch/x86_64/kernel/traps.c              |    8 
  arch/x86_64/mm/fault.c                  |    4 
@@ -60,38 +62,42 @@
  fs/binfmt_flat.c                        |    3 
  fs/binfmt_som.c                         |    2 
  fs/exec.c                               |   11 
- fs/proc/array.c                         |    7 
+ fs/proc/array.c                         |   14 
  fs/proc/base.c                          |   17 
  include/asm-i386/i387.h                 |   13 
  include/asm-i386/signal.h               |    4 
  include/asm-i386/thread_info.h          |    7 
- include/asm-i386/tracehook.h            |   74 +
- include/asm-powerpc/tracehook.h         |  303 ++++++
- include/asm-s390/tracehook.h            |  105 ++
+ include/asm-i386/tracehook.h            |   49 +
+ include/asm-ia64/elf.h                  |   24 
+ include/asm-ia64/tracehook.h            |   81 ++
+ include/asm-powerpc/tracehook.h         |   80 +
+ include/asm-s390/tracehook.h            |   53 +
  include/asm-sparc64/tracehook.h         |   44 +
  include/asm-x86_64/fpu32.h              |    3 
  include/asm-x86_64/thread_info.h        |    2 
- include/asm-x86_64/tracehook.h          |  106 ++
+ include/asm-x86_64/tracehook.h          |   54 +
  include/linux/init_task.h               |    3 
- include/linux/ptrace.h                  |   86 +-
+ include/linux/ptrace.h                  |  224 +++-
  include/linux/sched.h                   |   25 
- include/linux/tracehook.h               |  641 +++++++++++++
- include/linux/utrace.h                  |  471 +++++++++
+ include/linux/tracehook.h               |  699 +++++++++++++
+ include/linux/utrace.h                  |  481 +++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
- kernel/exit.c                           |  259 +----
- kernel/fork.c                           |   60 -
- kernel/ptrace.c                         | 1562 ++++++++++++++++++++++++-------
+ kernel/exit.c                           |  253 +----
+ kernel/fork.c                           |   62 -
+ kernel/ptrace.c                         | 1560 +++++++++++++++++++++++------
  kernel/signal.c                         |  211 +---
  kernel/sys.c                            |    2 
- kernel/timer.c                          |    6 
- kernel/utrace.c                         | 1520 ++++++++++++++++++++++++++++++
- security/selinux/hooks.c                |    6 
- 89 files changed, 8168 insertions(+), 3282 deletions(-)
+ kernel/timer.c                          |    4 
+ kernel/utrace.c                         | 1526 ++++++++++++++++++++++++++++
+ security/selinux/hooks.c                |   54 +
+ security/selinux/include/objsec.h       |    1 
+ 94 files changed, 9467 insertions(+), 4564 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
  create mode 100644 include/asm-i386/tracehook.h
+ create mode 100644 include/asm-ia64/tracehook.h
  create mode 100644 include/asm-powerpc/tracehook.h
  create mode 100644 include/asm-s390/tracehook.h
  create mode 100644 include/asm-sparc64/tracehook.h
@@ -102,7 +108,7 @@
 
 --- linux-2.6/include/asm-powerpc/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-powerpc/tracehook.h
-@@ -0,0 +1,303 @@
+@@ -0,0 +1,80 @@
 +/*
 + * Tracing hooks, PowerPC CPU support
 + */
@@ -182,229 +188,123 @@
 +}
 +
 +
-+#ifdef CONFIG_PTRACE
-+#include <linux/mm.h>
-+#include <asm/uaccess.h>
-+
-+static inline int arch_ptrace(long request, struct task_struct *child,
-+			      unsigned long addr, long data,
-+			      const struct utrace_regset_view **view,
-+			      int *regset, int *rw,
-+			      void __user **uaddr, int *nregs)
-+{
-+	switch (request) {
-+	case PPC_PTRACE_GETREGS: /* Get GPRs 0 - 31. */
-+	case PPC_PTRACE_SETREGS: /* Set GPRs 0 - 31. */
-+		*regset = 0;
-+		*rw = request == PPC_PTRACE_SETREGS;
-+		*nregs = 32;
-+		*uaddr = (void __user *)addr;
-+		break;
-+	case PPC_PTRACE_GETFPREGS: /* Get FPRs 0 - 31. */
-+	case PPC_PTRACE_SETFPREGS: /* Get FPRs 0 - 31. */
-+		*regset = 1;
-+		*rw = request == PPC_PTRACE_SETFPREGS;
-+		*uaddr = (void __user *)addr;
-+		*nregs = 32;
-+		break;
-+#ifdef CONFIG_PPC64
-+	case PTRACE_GET_DEBUGREG:
-+	case PTRACE_SET_DEBUGREG:
-+		*regset = 3;
-+		*nregs = -1;
-+		*rw = request == PTRACE_SET_DEBUGREG;
-+		break;
-+#endif /* CONFIG_PPC64 */
-+#ifdef CONFIG_ALTIVEC
-+	case PTRACE_GETVRREGS:
-+	case PTRACE_SETVRREGS:
-+		*regset = 2;
-+		*rw = request == PTRACE_SETVRREGS;
-+		break;
-+#endif
-+#ifdef CONFIG_SPE
-+	case PTRACE_GETEVRREGS:
-+	case PTRACE_SETEVRREGS:
-+#ifdef CONFIG_ALTIVEC
-+		*regset = 3;
-+#else
-+		*regset = 2;
-+#endif
-+		*rw = request == PTRACE_SETEVRREGS;
-+		break;
 +#endif
+--- linux-2.6/include/asm-ia64/elf.h.utrace-ptrace-compat
++++ linux-2.6/include/asm-ia64/elf.h
+@@ -154,6 +154,30 @@ extern void ia64_init_addr_space (void);
+ #define ELF_NGREG	128	/* we really need just 72 but let's leave some headroom... */
+ #define ELF_NFPREG	128	/* f0 and f1 could be omitted, but so what... */
+ 
[...8894 lines suppressed...]
--		unsigned long tmp;
+-	case PTRACE_GETREGS: { /* Get all gp regs from the child. */
 -		int i;
--	  	if (!access_ok(VERIFY_READ, datap, 16*4)) {
+-	  	if (!access_ok(VERIFY_WRITE, datap, 16*4)) {
 -			ret = -EIO;
 -			break;
 +		if (kbuf) {
 +			*(u32 *) kbuf = val;
 +			kbuf += sizeof(u32);
  		}
--		ret = 0; 
--		for ( i = 0; i <= 16*4; i += sizeof(u32) ) {
--			ret |= __get_user(tmp, (u32 __user *)datap);
--			putreg32(child, i, tmp);
+-		ret = 0;
+-		for ( i = 0; i <= 16*4 ; i += sizeof(__u32) ) {
+-			getreg32(child, i, &val);
+-			ret |= __put_user(val,(u32 __user *)datap);
 -			datap += sizeof(u32);
 +		else {
 +			if (__put_user(val, (u32 __user *) ubuf))
@@ -13414,26 +16215,15 @@
 -		break;
  	}
  
--	case PTRACE_GETFPREGS:
--		ret = -EIO; 
--		if (!access_ok(VERIFY_READ, compat_ptr(data), 
--			       sizeof(struct user_i387_struct)))
--			break;
--		save_i387_ia32(child, datap, childregs, 1);
--		ret = 0; 
+-	case PTRACE_SETREGS: { /* Set all gp regs in the child. */
+-		unsigned long tmp;
+-		int i;
+-	  	if (!access_ok(VERIFY_READ, datap, 16*4)) {
+-			ret = -EIO;
 -			break;
 +	return 0;
 +}
- 
--	case PTRACE_SETFPREGS:
--		ret = -EIO;
--		if (!access_ok(VERIFY_WRITE, datap, 
--			       sizeof(struct user_i387_struct)))
--			break;
--		ret = 0;
--		/* don't check EFAULT to be bug-to-bug compatible to i386 */
--		restore_i387_ia32(child, datap, 1);
--		break;
++
 +static int
 +ia32_dbregs_set(struct task_struct *target,
 +		const struct utrace_regset *regset,
@@ -13453,12 +16243,44 @@
 +		if (kbuf) {
 +			val = *(const u32 *) kbuf;
 +			kbuf += sizeof(u32);
-+		}
+ 		}
+-		ret = 0; 
+-		for ( i = 0; i <= 16*4; i += sizeof(u32) ) {
+-			ret |= __get_user(tmp, (u32 __user *)datap);
+-			putreg32(child, i, tmp);
+-			datap += sizeof(u32);
 +		else {
 +			if (__get_user(val, (u32 __user *) ubuf))
 +				return -EFAULT;
 +			ubuf += sizeof(u32);
-+		}
+ 		}
+-		break;
+-	}
+ 
+-	case PTRACE_GETFPREGS:
+-		ret = -EIO; 
+-		if (!access_ok(VERIFY_READ, compat_ptr(data), 
+-			       sizeof(struct user_i387_struct)))
+-			break;
+-		save_i387_ia32(child, datap, childregs, 1);
+-		ret = 0; 
++		ret = (*dbregset->set)(target, dbregset, pos * sizeof(long),
++				       sizeof(val), &val, NULL);
++		if (ret)
+ 			break;
++	}
+ 
+-	case PTRACE_SETFPREGS:
+-		ret = -EIO;
+-		if (!access_ok(VERIFY_WRITE, datap, 
+-			       sizeof(struct user_i387_struct)))
+-			break;
+-		ret = 0;
+-		/* don't check EFAULT to be bug-to-bug compatible to i386 */
+-		restore_i387_ia32(child, datap, 1);
+-		break;
++	return ret;
++}
  
 -	case PTRACE_GETFPXREGS: { 
 -		struct user32_fxsr_struct __user *u = datap;
@@ -13468,14 +16290,11 @@
 -			break;
 -			ret = -EFAULT;
 -		if (__copy_to_user(u, &child->thread.i387.fxsave, sizeof(*u)))
-+		ret = (*dbregset->set)(target, dbregset, pos * sizeof(long),
-+				       sizeof(val), &val, NULL);
-+		if (ret)
- 			break;
+-			break;
 -		ret = __put_user(childregs->cs, &u->fcs);
 -		ret |= __put_user(child->thread.ds, &u->fos); 
 -		break; 
- 	} 
+-	} 
 -	case PTRACE_SETFPXREGS: { 
 -		struct user32_fxsr_struct __user *u = datap;
 -		unlazy_fpu(child);
@@ -13489,10 +16308,6 @@
 -		ret = 0; 
 -		break;
 +
-+	return ret;
-+}
-+
-+
 +/*
 + * Perform get_thread_area on behalf of the traced child.
 + */
@@ -13669,21 +16484,61 @@
 +	},
 +};
 +
++const struct utrace_regset_view utrace_ia32_view = {
++	.name = "i386", .e_machine = EM_386,
++	.regsets = ia32_regsets,
++	.n = sizeof ia32_regsets / sizeof ia32_regsets[0],
++};
++EXPORT_SYMBOL_GPL(utrace_ia32_view);
++
++
++#ifdef CONFIG_PTRACE
++/*
++ * This matches the arch/i386/kernel/ptrace.c definitions.
++ */
 +
-+static const struct ptrace_uarea_segment ia32_uarea[] = {
++static const struct ptrace_layout_segment ia32_uarea[] = {
 +	{0, sizeof(struct user_regs_struct32), 0, 0},
 +	{offsetof(struct user32, u_debugreg[0]),
 +	 offsetof(struct user32, u_debugreg[8]), 4, 0},
 +	{0, 0, -1, 0}
 +};
 +
-+const struct utrace_regset_view utrace_ia32_view = {
-+	.name = "i386", .e_machine = EM_386,
-+	.regsets = ia32_regsets,
-+	.n = sizeof ia32_regsets / sizeof ia32_regsets[0],
-+	.uarea_segments = ia32_uarea
-+};
-+EXPORT_SYMBOL_GPL(utrace_ia32_view);
++fastcall int arch_compat_ptrace(compat_long_t *req, struct task_struct *child,
++				struct utrace_attached_engine *engine,
++				compat_ulong_t addr, compat_ulong_t data,
++				compat_long_t *val)
++{
++	switch (*req) {
++	case PTRACE_PEEKUSR:
++		return ptrace_compat_peekusr(child, engine, ia32_uarea,
++					     addr, data);
++	case PTRACE_POKEUSR:
++		return ptrace_compat_pokeusr(child, engine, ia32_uarea,
++					     addr, data);
++	case PTRACE_GETREGS:
++		return ptrace_whole_regset(child, engine, data, 0, 0);
++	case PTRACE_SETREGS:
++		return ptrace_whole_regset(child, engine, data, 0, 1);
++	case PTRACE_GETFPREGS:
++		return ptrace_whole_regset(child, engine, data, 1, 0);
++	case PTRACE_SETFPREGS:
++		return ptrace_whole_regset(child, engine, data, 1, 1);
++	case PTRACE_GETFPXREGS:
++		return ptrace_whole_regset(child, engine, data, 2, 0);
++	case PTRACE_SETFPXREGS:
++		return ptrace_whole_regset(child, engine, data, 2, 1);
++	case PTRACE_GET_THREAD_AREA:
++	case PTRACE_SET_THREAD_AREA:
++		return ptrace_onereg_access(child, engine,
++					    &utrace_ia32_view, 3,
++					    addr,
++					    (void __user *)(unsigned long)data,
++					    *req == PTRACE_SET_THREAD_AREA);
++	}
++	return -ENOSYS;
++}
++#endif	/* CONFIG_PTRACE */
 --- linux-2.6/arch/x86_64/ia32/ia32_signal.c.utrace-ptrace-compat
 +++ linux-2.6/arch/x86_64/ia32/ia32_signal.c
 @@ -497,11 +497,7 @@ int ia32_setup_frame(int sig, struct k_s



From fedora-cvs-commits at redhat.com  Wed Aug 23 00:31:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 20:31:22 -0400
Subject: rpms/firefox/devel firefox-1.5-nopangoxft.patch, NONE,
	1.1 firefox-1.5-pango-mathml.patch, NONE, 1.1 firefox.spec,
	1.140, 1.141 firefox-nopangoxft.patch, 1.1, NONE
Message-ID: <200608230031.k7N0VLa3005036@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4973

Modified Files:
	firefox.spec 
Added Files:
	firefox-1.5-nopangoxft.patch firefox-1.5-pango-mathml.patch 
Removed Files:
	firefox-nopangoxft.patch 
Log Message:
- Add a better nopangoxft patch that doesn't depend on pangocairo
- Add firefox-1.5-pango-mathml.patch (bug 150393)


firefox-1.5-nopangoxft.patch:
 mozilla-decoder.cpp |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE firefox-1.5-nopangoxft.patch ---
--- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft	2004-11-07 18:59:23.000000000 -0500
+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp	2006-08-06 18:24:37.000000000 -0400
@@ -40,10 +40,9 @@
 #define PANGO_ENABLE_ENGINE
 
 #include "mozilla-decoder.h"
-#include <pango/pangoxft.h>
 #include <pango/pangofc-fontmap.h>
 #include <pango/pangofc-font.h>
-#include <gdk/gdkx.h>
+#include <gdk/gdkpango.h>
 
 #include "nsString.h"
 #include "nsIPersistentProperties2.h"
@@ -54,6 +53,7 @@
 #include "nsCompressedCharMap.h"
 
 #undef DEBUG_CUSTOM_ENCODER
+#define DEBUG_CUSTOM_ENCODER 1
 
 G_DEFINE_TYPE (MozillaDecoder, mozilla_decoder, PANGO_TYPE_FC_DECODER)
 
@@ -145,6 +145,13 @@ mozilla_decoders_init(void)
     if (initialized)
         return 0;
 
+    PangoContext* context = gdk_pango_context_get ();
+    PangoFontMap* fontmap = pango_context_get_font_map (context);
+    g_object_unref (context);
+    
+    if (!PANGO_IS_FC_FONT_MAP (fontmap))
+        return -1;
+
     encoder_hash = g_hash_table_new(g_str_hash, g_str_equal);
     cmap_hash = g_hash_table_new(g_str_hash, g_str_equal);
     wide_hash = g_hash_table_new(g_str_hash, g_str_equal);
@@ -208,7 +215,7 @@ mozilla_decoders_init(void)
         }
     }
 
-    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(fontmap),
                                             mozilla_find_decoder,
                                             NULL,
                                             NULL);

firefox-1.5-pango-mathml.patch:
 nsFontMetricsPango.cpp |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

--- NEW FILE firefox-1.5-pango-mathml.patch ---
--- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.mathml	2006-02-23 16:01:42.000000000 -0500
+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2006-08-22 20:06:40.000000000 -0400
@@ -829,30 +829,27 @@ nsFontMetricsPango::GetBoundingMetrics(c
         goto loser;
     }
 
-    pango_layout_set_text(layout, text, strlen(text));
+    pango_layout_set_text(layout, text, -1);
     FixupSpaceWidths(layout, text);
 
-    // Get the logical extents
     PangoLayoutLine *line;
     if (pango_layout_get_line_count(layout) != 1) {
         printf("Warning: more than one line!\n");
     }
     line = pango_layout_get_line(layout, 0);
 
-    // Get the ink extents
-    PangoRectangle rect;
-    pango_layout_line_get_extents(line, NULL, &rect);
+    // Get the ink and logical extents
+    PangoRectangle ink, logical;
+    pango_layout_line_get_extents(line, &ink, &logical);
 
     float P2T;
     P2T = mDeviceContext->DevUnitsToAppUnits();
 
-    aBoundingMetrics.leftBearing =
-        NSToCoordRound(rect.x * P2T / PANGO_SCALE);
-    aBoundingMetrics.rightBearing =
-        NSToCoordRound(rect.width * P2T / PANGO_SCALE);
-    aBoundingMetrics.width = NSToCoordRound((rect.x + rect.width) * P2T / PANGO_SCALE);
-    aBoundingMetrics.ascent = NSToCoordRound(rect.y * P2T / PANGO_SCALE);
-    aBoundingMetrics.descent = NSToCoordRound(rect.height * P2T / PANGO_SCALE);
+    aBoundingMetrics.leftBearing  = NSToCoordRound(PANGO_LBEARING(ink) * P2T / PANGO_SCALE);
+    aBoundingMetrics.rightBearing = NSToCoordRound(PANGO_RBEARING(ink) * P2T / PANGO_SCALE);
+    aBoundingMetrics.ascent       = NSToCoordRound(PANGO_ASCENT(ink)   * P2T / PANGO_SCALE);
+    aBoundingMetrics.descent      = NSToCoordRound(PANGO_DESCENT(ink)  * P2T / PANGO_SCALE);
+    aBoundingMetrics.width        = NSToCoordRound(logical.width       * P2T / PANGO_SCALE);
 
  loser:
     g_free(text);


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- firefox.spec	8 Aug 2006 17:35:26 -0000	1.140
+++ firefox.spec	23 Aug 2006 00:31:05 -0000	1.141
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.6
-Release:        3
+Release:        4
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -53,7 +53,8 @@
 Patch42:        firefox-1.1-uriloader.patch
 
 # font system fixes
-Patch81:        firefox-nopangoxft.patch
+Patch81:        firefox-1.5-nopangoxft.patch
+Patch82:        firefox-1.5-pango-mathml.patch
 
 # patches from upstream (Patch100+)
 Patch101:       firefox-1.5-pango-ua.patch
@@ -136,6 +137,7 @@
 #%patch27 -p1
 %patch42 -p0
 %patch81 -p1
+%patch82 -p1
 
 %patch101 -p0 -b .pango-ua
 %patch102 -p0 -b .pango-about
@@ -354,6 +356,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Aug 22 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.5.0.6-4
+- Add a better nopangoxft patch that doesn't depend on pangocairo
+- Add firefox-1.5-pango-mathml.patch (bug 150393)
+
 * Tue Aug 08 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-3
 - Rebuild
 


--- firefox-nopangoxft.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 23 01:13:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 21:13:07 -0400
Subject: rpms/mesa/devel mesa-6.5.1-selinux-awareness.patch, 1.1,
	1.2 mesa.spec, 1.90,
	1.91 mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch, 1.1, NONE
Message-ID: <200608230113.k7N1D7fS028945@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28902

Modified Files:
	mesa-6.5.1-selinux-awareness.patch mesa.spec 
Removed Files:
	mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch 
Log Message:
* Tue Aug 22 2006 Kristian H??gsberg <krh at redhat.com> 6.5-26.20060818cvs.fc6
- Pull the vtxfmt patch into the selinux-awareness patch, handle exec
  mem heap init failure correctly by releasing mutex.


mesa-6.5.1-selinux-awareness.patch:
 configs/linux-dri                            |    3 ++-
 src/mesa/drivers/dri/r200/r200_context.c     |   15 +++++++++++----
 src/mesa/drivers/dri/r200/r200_context.h     |    1 +
 src/mesa/drivers/dri/radeon/radeon_context.c |   16 ++++++++++++----
 src/mesa/main/execmem.c                      |   20 ++++++++++++++++----
 src/mesa/shader/slang/slang_execute_x86.c    |    3 ++-
 src/mesa/tnl/t_vb_arbprogram_sse.c           |    3 ++-
 src/mesa/tnl/t_vertex_sse.c                  |    8 ++++++--
 src/mesa/x86/rtasm/x86sse.c                  |    8 +++++---
 src/mesa/x86/rtasm/x86sse.h                  |    4 ++--
 10 files changed, 59 insertions(+), 22 deletions(-)

Index: mesa-6.5.1-selinux-awareness.patch
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.5.1-selinux-awareness.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-6.5.1-selinux-awareness.patch	18 Aug 2006 19:52:19 -0000	1.1
+++ mesa-6.5.1-selinux-awareness.patch	23 Aug 2006 01:13:00 -0000	1.2
@@ -1,17 +1,41 @@
---- mesa-cvs/configs/linux-dri.selinux-awareness	2006-08-10 16:39:55.000000000 -0400
-+++ mesa-cvs/configs/linux-dri	2006-08-10 16:39:55.000000000 -0400
-@@ -38,7 +38,8 @@
+--- ./src/mesa/x86/rtasm/x86sse.h.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
++++ ./src/mesa/x86/rtasm/x86sse.h	2006-08-22 20:51:02.000000000 -0400
+@@ -80,8 +80,8 @@
+  */
+ 
+ 
+-void x86_init_func( struct x86_function *p );
+-void x86_init_func_size( struct x86_function *p, GLuint code_size );
++int x86_init_func( struct x86_function *p );
++int x86_init_func_size( struct x86_function *p, GLuint code_size );
+ void x86_release_func( struct x86_function *p );
+ void (*x86_get_func( struct x86_function *p ))( void );
+ 
+--- ./src/mesa/x86/rtasm/x86sse.c.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
++++ ./src/mesa/x86/rtasm/x86sse.c	2006-08-22 20:51:02.000000000 -0400
+@@ -1063,15 +1063,17 @@
+ }
  
- LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
- LIBDRM_LIB = `pkg-config --libs libdrm`
--DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-+DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) \
-+		-lselinux
- GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
-                 $(LIBDRM_LIB)
  
---- mesa-cvs/src/mesa/main/execmem.c.selinux-awareness	2006-05-10 05:00:16.000000000 -0400
-+++ mesa-cvs/src/mesa/main/execmem.c	2006-08-10 16:39:55.000000000 -0400
+-void x86_init_func( struct x86_function *p )
++int x86_init_func( struct x86_function *p )
+ {
+-   x86_init_func_size(p, 1024);
++   return x86_init_func_size(p, 1024);
+ }
+ 
+-void x86_init_func_size( struct x86_function *p, GLuint code_size )
++int x86_init_func_size( struct x86_function *p, GLuint code_size )
+ {
+    p->store = _mesa_exec_malloc(code_size);
+    p->csr = p->store;
++
++   return (p->store != NULL);
+ }
+ 
+ void x86_release_func( struct x86_function *p )
+--- ./src/mesa/main/execmem.c.selinux-awareness	2006-05-10 05:00:16.000000000 -0400
++++ ./src/mesa/main/execmem.c	2006-08-22 20:51:02.000000000 -0400
 @@ -36,7 +36,7 @@
  
  
@@ -62,94 +86,22 @@
  
 -   init_heap();
 +   if (!init_heap())
-+       return NULL;
++      goto bail;
  
     if (exec_heap) {
        size = (size + 31) & ~31;
---- mesa-cvs/src/mesa/drivers/dri/r200/r200_context.c.selinux-awareness	2006-06-09 20:51:54.000000000 -0400
-+++ mesa-cvs/src/mesa/drivers/dri/r200/r200_context.c	2006-08-10 16:39:55.000000000 -0400
-@@ -546,8 +546,12 @@
-    }
- 
-    if (rmesa->r200Screen->chip_flags & RADEON_CHIPSET_TCL) {
--      if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
--	 r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
-+      void *test = NULL;
-+      if ((test = _mesa_exec_malloc(64)))
-+         if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
-+	    r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
-+      if (test)
-+         _mesa_exec_free(test);
- 
-       _tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
-    }
---- mesa-cvs/src/mesa/drivers/dri/radeon/radeon_context.c.selinux-awareness	2006-04-09 13:48:28.000000000 -0400
-+++ mesa-cvs/src/mesa/drivers/dri/radeon/radeon_context.c	2006-08-10 16:39:55.000000000 -0400
-@@ -471,8 +471,12 @@
-    }
- 
-    if (rmesa->radeonScreen->chip_flags & RADEON_CHIPSET_TCL) {
--      if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
--	 radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
-+      void *test = NULL;
-+      if ((test = _mesa_exec_malloc(64)))
-+         if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
-+	    radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
-+      if (test)
-+         _mesa_exec_free(test);
- 
-       _tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
-    }
---- mesa-cvs/src/mesa/shader/slang/slang_execute_x86.c.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
-+++ mesa-cvs/src/mesa/shader/slang/slang_execute_x86.c	2006-08-10 16:41:07.000000000 -0400
-@@ -666,7 +666,8 @@
- 	 * The built-in library occupies 450K, so we can be safe for now.
- 	 * It is going to change in the future, when we get assembly analysis running.
- 	 */
--	x86_init_func_size (&G.f, 1048576);
-+	if (!x86_init_func_size (&G.f, 1048576))
-+	    return 0;
- 	G.r_eax = x86_make_reg (file_REG32, reg_AX);
- 	G.r_ecx = x86_make_reg (file_REG32, reg_CX);
- 	G.r_edx = x86_make_reg (file_REG32, reg_DX);
---- mesa-cvs/src/mesa/x86/rtasm/x86sse.c.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
-+++ mesa-cvs/src/mesa/x86/rtasm/x86sse.c	2006-08-10 16:42:21.000000000 -0400
-@@ -1063,15 +1063,17 @@
- }
- 
- 
--void x86_init_func( struct x86_function *p )
-+int x86_init_func( struct x86_function *p )
- {
--   x86_init_func_size(p, 1024);
-+   return x86_init_func_size(p, 1024);
- }
- 
--void x86_init_func_size( struct x86_function *p, GLuint code_size )
-+int x86_init_func_size( struct x86_function *p, GLuint code_size )
- {
-    p->store = _mesa_exec_malloc(code_size);
-    p->csr = p->store;
+@@ -87,7 +98,8 @@
+       addr = exec_mem + block->ofs;
+    else 
+       _mesa_printf("_mesa_exec_malloc failed\n");
+-   
 +
-+   return (p->store != NULL);
- }
- 
- void x86_release_func( struct x86_function *p )
---- mesa-cvs/src/mesa/x86/rtasm/x86sse.h.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
-+++ mesa-cvs/src/mesa/x86/rtasm/x86sse.h	2006-08-10 16:42:43.000000000 -0400
-@@ -80,8 +80,8 @@
-  */
- 
- 
--void x86_init_func( struct x86_function *p );
--void x86_init_func_size( struct x86_function *p, GLuint code_size );
-+int x86_init_func( struct x86_function *p );
-+int x86_init_func_size( struct x86_function *p, GLuint code_size );
- void x86_release_func( struct x86_function *p );
- void (*x86_get_func( struct x86_function *p ))( void );
- 
---- mesa-cvs/src/mesa/tnl/t_vb_arbprogram_sse.c.selinux-awareness	2006-06-01 18:56:40.000000000 -0400
-+++ mesa-cvs/src/mesa/tnl/t_vb_arbprogram_sse.c	2006-08-10 16:39:55.000000000 -0400
++ bail:   
+    _glthread_UNLOCK_MUTEX(exec_mutex);
+    
+    return addr;
+--- ./src/mesa/tnl/t_vb_arbprogram_sse.c.selinux-awareness	2006-06-01 18:56:40.000000000 -0400
++++ ./src/mesa/tnl/t_vb_arbprogram_sse.c	2006-08-22 20:51:02.000000000 -0400
 @@ -1298,7 +1298,8 @@
        p->compiled_func = NULL;
     }
@@ -160,8 +112,8 @@
  
     cp.fpucntl = RESTORE_FPU;
  
---- mesa-cvs/src/mesa/tnl/t_vertex_sse.c.selinux-awareness	2005-09-16 14:14:25.000000000 -0400
-+++ mesa-cvs/src/mesa/tnl/t_vertex_sse.c	2006-08-10 16:39:55.000000000 -0400
+--- ./src/mesa/tnl/t_vertex_sse.c.selinux-awareness	2005-09-16 14:14:25.000000000 -0400
++++ ./src/mesa/tnl/t_vertex_sse.c	2006-08-22 20:51:02.000000000 -0400
 @@ -348,7 +348,8 @@
     struct x86_reg vp1 = x86_make_reg(file_XMM, 2);
     GLubyte *fixup, *label;
@@ -184,3 +136,106 @@
  
     if (build_vertex_emit(&p)) {
        _tnl_register_fastpath( vtx, GL_TRUE );
+--- ./src/mesa/drivers/dri/radeon/radeon_context.c.selinux-awareness	2006-04-09 13:48:28.000000000 -0400
++++ ./src/mesa/drivers/dri/radeon/radeon_context.c	2006-08-22 20:51:02.000000000 -0400
+@@ -471,11 +471,20 @@
+    }
+ 
+    if (rmesa->radeonScreen->chip_flags & RADEON_CHIPSET_TCL) {
+-      if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+-	 radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
++      void *test = NULL;
++      if ((test = _mesa_exec_malloc(64))) {
++         if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
++	    radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
++      } else {
++	  tcl_mode = DRI_CONF_TCL_PIPELINED;
++      }
++      if (test)
++         _mesa_exec_free(test);
+ 
+       _tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
+    }
++
++   rmesa->tcl_mode = tcl_mode;
+    return GL_TRUE;
+ }
+ 
+@@ -516,8 +525,7 @@
+       }
+ 
+       if (!(rmesa->TclFallback & RADEON_TCL_FALLBACK_TCL_DISABLE)) {
+-	 int tcl_mode = driQueryOptioni(&rmesa->optionCache, "tcl_mode");
+-	 if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
++	 if (rmesa->tcl_mode >= DRI_CONF_TCL_VTXFMT)
+ 	    radeonVtxfmtDestroy( rmesa->glCtx );
+       }
+ 
+--- ./src/mesa/drivers/dri/r200/r200_context.c.selinux-awareness	2006-06-09 20:51:54.000000000 -0400
++++ ./src/mesa/drivers/dri/r200/r200_context.c	2006-08-22 20:51:02.000000000 -0400
+@@ -546,11 +546,19 @@
+    }
+ 
+    if (rmesa->r200Screen->chip_flags & RADEON_CHIPSET_TCL) {
+-      if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+-	 r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
++      void *test = NULL;
++      if ((test = _mesa_exec_malloc(64))) {
++         if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
++	    r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
++      } else {
++	 tcl_mode = DRI_CONF_TCL_PIPELINED;
++      }
++      if (test)
++         _mesa_exec_free(test);
+ 
+       _tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
+    }
++   rmesa->tcl_mode = tcl_mode;
+    return GL_TRUE;
+ }
+ 
+@@ -592,8 +600,7 @@
+       }
+ 
+       if (!(rmesa->TclFallback & R200_TCL_FALLBACK_TCL_DISABLE)) {
+-	 int tcl_mode = driQueryOptioni(&rmesa->optionCache, "tcl_mode");
+-	 if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
++	 if (rmesa->tcl_mode >= DRI_CONF_TCL_VTXFMT)
+ 	    r200VtxfmtDestroy( rmesa->glCtx );
+       }
+ 
+--- ./src/mesa/drivers/dri/r200/r200_context.h.selinux-awareness	2006-08-22 21:06:15.000000000 -0400
++++ ./src/mesa/drivers/dri/r200/r200_context.h	2006-08-22 21:06:44.000000000 -0400
+@@ -990,6 +990,7 @@
+    GLuint TexGenEnabled;
+    GLuint TexGenCompSel;
+    GLmatrix tmpmat;
++   GLint tcl_mode;
+ 
+    /* VBI / buffer swap
+     */
+--- ./src/mesa/shader/slang/slang_execute_x86.c.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
++++ ./src/mesa/shader/slang/slang_execute_x86.c	2006-08-22 20:51:02.000000000 -0400
+@@ -666,7 +666,8 @@
+ 	 * The built-in library occupies 450K, so we can be safe for now.
+ 	 * It is going to change in the future, when we get assembly analysis running.
+ 	 */
+-	x86_init_func_size (&G.f, 1048576);
++	if (!x86_init_func_size (&G.f, 1048576))
++	    return 0;
+ 	G.r_eax = x86_make_reg (file_REG32, reg_AX);
+ 	G.r_ecx = x86_make_reg (file_REG32, reg_CX);
+ 	G.r_edx = x86_make_reg (file_REG32, reg_DX);
+--- ./configs/linux-dri.selinux-awareness	2006-08-22 20:51:02.000000000 -0400
++++ ./configs/linux-dri	2006-08-22 20:51:02.000000000 -0400
+@@ -38,7 +38,8 @@
+ 
+ LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
+ LIBDRM_LIB = `pkg-config --libs libdrm`
+-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
++DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) \
++		-lselinux
+ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
+                 $(LIBDRM_LIB)
+ 


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- mesa.spec	22 Aug 2006 22:58:51 -0000	1.90
+++ mesa.spec	23 Aug 2006 01:13:00 -0000	1.91
@@ -36,7 +36,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 25.%{snapshot}cvs%{?dist}
+Release: 26.%{snapshot}cvs%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -58,7 +58,6 @@
 Patch12: mesa-modular-dri-dir.patch
 Patch14: mesa-6.5-drop-static-inline.patch
 Patch18: mesa-6.5.1-selinux-awareness.patch
-Patch19: mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch
 
 Patch20: mesa-6.5.1-r300-smooth-line.patch
 Patch21: mesa-6.5-force-r300.patch
@@ -309,17 +308,11 @@
 %patch11 -p0 -b .multilib-fix
 %patch14 -p0 -b .drop-static-inline
 %patch18 -p1 -b .selinux-awareness
-%patch19 -p1 -b .vtxfmt
 
 %patch20 -p1 -b .r300-smooth-lines
 %patch21 -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
-# a change for post feature freeze.  Leaving off for now...
-#%patch200 -p0 -b .texture-from-pixmap-fixes
 %patch201 -p1 -b .radeon-use-right-format
-#%patch202 -p0 -b .tfp-fbconfig-attribs
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -512,6 +505,10 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Aug 22 2006 Kristian H??gsberg <krh at redhat.com> 6.5-26.20060818cvs.fc6
+- Pull the vtxfmt patch into the selinux-awareness patch, handle exec
+  mem heap init failure correctly by releasing mutex.
+
 * Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 6.5-25.20060818cvs.fc6
 - mesa-6.5.1-r300-smooth-line.patch: Added, fakes smooth lines with aliased
   lines on R300+ cards, makes Google Earth tolerable.


--- mesa-6.5.1-radeon-vtxfmt-cleanup-properly.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 23 01:31:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 21:31:40 -0400
Subject: rpms/firefox/devel firefox.spec,1.141,1.142
Message-ID: <200608230131.k7N1VdbV015533@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15480

Modified Files:
	firefox.spec 
Log Message:
* Tue Aug 22 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-4
- Update NSS requires to workaround a bug introduced by NSS changes.
  https://bugzilla.mozilla.org/show_bug.cgi?id=294542
  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=201922



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- firefox.spec	23 Aug 2006 00:31:05 -0000	1.141
+++ firefox.spec	23 Aug 2006 01:31:29 -0000	1.142
@@ -1,7 +1,7 @@
 %define indexhtml file:///usr/share/doc/HTML/index.html
 %define desktop_file_utils_version 0.9
 %define nspr_version 4.6
-%define nss_version 3.10
+%define nss_version 3.11.1
 %define cairo_version 0.5
 %define builddir %{_builddir}/mozilla
 %define build_devel_package 1
@@ -356,7 +356,12 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Tue Aug 22 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.5.0.6-4
+* Tue Aug 22 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-4
+- Update NSS requires to workaround a bug introduced by NSS changes.
+  https://bugzilla.mozilla.org/show_bug.cgi?id=294542
+  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=201922
+
+* Tue Aug 22 2006 Behdad Esfahbod <besfahbo at redhat.com>
 - Add a better nopangoxft patch that doesn't depend on pangocairo
 - Add firefox-1.5-pango-mathml.patch (bug 150393)
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 01:58:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 21:58:29 -0400
Subject: rpms/fonts-chinese/FC-5 fonts-chinese.spec,1.21,1.22
Message-ID: <200608230158.k7N1wTcX011347@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/fonts-chinese/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11332

Modified Files:
	fonts-chinese.spec 
Log Message:
3.02-5 - bz#197207 cutting of ")" glyph in uming.ttf



Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/FC-5/fonts-chinese.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fonts-chinese.spec	22 Aug 2006 08:22:30 -0000	1.21
+++ fonts-chinese.spec	23 Aug 2006 01:58:25 -0000	1.22
@@ -17,10 +17,10 @@
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Source:     http://apt.debian.org.tw/pool/t/ttf-arphic-uming/ttf-arphic-uming_%{ver}-%{beta}.tar.gz
+#Source:     http://apt.debian.org.tw/pool/t/ttf-arphic-uming/ttf-arphic-uming_%{ver}-%{beta}.tar.gz
 Source1:    http://apt.debian.org.tw/pool/t/ttf-arphic-ukai/ttf-arphic-ukai_%{ver}-%{beta}.tar.gz
 Source2:    taipeifonts-%{taipeiver}.tar.gz
-Source3:    ttf-arphic-uming_%{ver}-%{data}-%{umingpatch}.tar.gz
+Source3:    ttf-arphic-uming_%{ver}-%{beta}-%{umingpatch}.tar.gz
 Source9:    taipeifonts.alias
 Source10:	arphicpl.txt
 Source11:	arphicpl-big5.txt
@@ -140,7 +140,8 @@
 
 %changelog
 * Tue Aug 22 2006 Caius Chance <cchance at redhat.com> - 3.02-5
-- fixed bug 197556 ??? scim hangs when entering two pinyin words
+- fixed bug 197207 ??? [zh_TW] In Anaconda GUI screens, 
+    the "( )" on the "Next" and other buttons, are cutting
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt



From fedora-cvs-commits at redhat.com  Wed Aug 23 02:07:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 22 Aug 2006 22:07:38 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.167,1.168
Message-ID: <200608230207.k7N27bV0011639@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11627

Modified Files:
	gnome-applets.spec 
Log Message:
2.15.90



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gnome-applets.spec	22 Aug 2006 15:55:12 -0000	1.167
+++ gnome-applets.spec	23 Aug 2006 02:07:33 -0000	1.168
@@ -27,7 +27,7 @@
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define build_stickynotes 0
+%define build_stickynotes 1
 
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
@@ -136,6 +136,9 @@
 autoreconf
 %configure			\
 	--enable-suid=no 	\
+%if %{build_stickynotes}
+	--enable-sticky-notes	\
+%endif
 	--disable-scrollkeeper 	\
 	--enable-mini-commander 
 make
@@ -290,11 +293,6 @@
 - Drop upstreamed patches
 - Add a %%preun script
 - Require pkgconfig
-- Drop sticky-notes in favour of tomboy 
-  *** docs ***: Tomboy supports importing sticky notes. Currently
-  that requires a manual step by the user. This should be pointed
-  out in the release notes (unless we can convince upstream to make
-  this automatic)
 
 * Fri Aug 18 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.3-2.fc6
 - Make the invest applet work



From fedora-cvs-commits at redhat.com  Wed Aug 23 04:11:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 00:11:43 -0400
Subject: rpms/fonts-chinese/devel .cvsignore, 1.6, 1.7 fonts-chinese.spec,
	1.21, 1.22 sources, 1.5, 1.6
Message-ID: <200608230411.k7N4BhQe005537@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/fonts-chinese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5420

Modified Files:
	.cvsignore fonts-chinese.spec sources 
Log Message:
fix bz#197207 - cutting ")" glyph in uming.ttf



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Nov 2005 03:58:16 -0000	1.6
+++ .cvsignore	23 Aug 2006 04:11:35 -0000	1.7
@@ -11,3 +11,4 @@
 ttf-arphic-uming_0.1-0.dot.3.tar.gz
 ttf-arphic-ukai_0.1-0.dot.3.tar.gz
 taipeifonts-1.2.tar.gz
+ttf-arphic-uming_0.1-0.dot.3-20060822a.tar.gz


Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fonts-chinese.spec	12 Jul 2006 05:49:27 -0000	1.21
+++ fonts-chinese.spec	23 Aug 2006 04:11:35 -0000	1.22
@@ -6,19 +6,21 @@
 %define beta 0.dot.3
 %define ver 0.1
 %define taipeiver 1.2
+%define umingpatch 20060822a
 
 Summary:    Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
 Name:		fonts-chinese
 Version:    3.02
-Release: 4.1.1
+Release:	5_%{?dist}
 License:	Arphic Public License (GPL-like)
 Group:		User Interface/X
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Source:     http://apt.debian.org.tw/pool/t/ttf-arphic-uming/ttf-arphic-uming_%{ver}-%{beta}.tar.gz
+#Source:     http://apt.debian.org.tw/pool/t/ttf-arphic-uming/ttf-arphic-uming_%{ver}-%{beta}.tar.gz
 Source1:    http://apt.debian.org.tw/pool/t/ttf-arphic-ukai/ttf-arphic-ukai_%{ver}-%{beta}.tar.gz
 Source2:    taipeifonts-%{taipeiver}.tar.gz
+Source3:    ttf-arphic-uming_%{ver}-%{beta}-%{umingpatch}.tar.gz
 Source9:    taipeifonts.alias
 Source10:	arphicpl.txt
 Source11:	arphicpl-big5.txt
@@ -38,7 +40,7 @@
 irefly. Read license files for details.
 
 %prep
-tar xzvf %{SOURCE0} 
+tar xzvf %{SOURCE3} 
 tar xzvf %{SOURCE1}
 tar xzvf %{SOURCE2}
 
@@ -137,6 +139,9 @@
 %{cidmapdir}/cidfmap.zh_CN
 
 %changelog
+* Wed Aug 23 2006 Caius Chance <cchance at redhat.com> - 3.02-5
+- fix bz#197207 - cutting of ")" glyph in uming.ttf
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.02-4.1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Nov 2005 03:58:16 -0000	1.5
+++ sources	23 Aug 2006 04:11:35 -0000	1.6
@@ -7,3 +7,4 @@
 aff293398158998689a2d24816cc782e  ttf-arphic-uming_0.1-0.dot.3.tar.gz
 f294d9e35de34ff80156e11e00f33c38  ttf-arphic-ukai_0.1-0.dot.3.tar.gz
 9e4acdd5a218dea6aaa28bc80d472aad  taipeifonts-1.2.tar.gz
+4d9c2e6007564b7975921d648c45a657  ttf-arphic-uming_0.1-0.dot.3-20060822a.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 23 04:18:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 00:18:53 -0400
Subject: rpms/fonts-chinese/devel fonts-chinese.spec,1.22,1.23
Message-ID: <200608230418.k7N4Ir4n014714@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/fonts-chinese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11459

Modified Files:
	fonts-chinese.spec 
Log Message:
fix bz#197207 - ")" glyph cutting in uming.ttf



Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fonts-chinese.spec	23 Aug 2006 04:11:35 -0000	1.22
+++ fonts-chinese.spec	23 Aug 2006 04:18:42 -0000	1.23
@@ -11,7 +11,7 @@
 Summary:    Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
 Name:		fonts-chinese
 Version:    3.02
-Release:	5_%{?dist}
+Release:	5%{?dist}
 License:	Arphic Public License (GPL-like)
 Group:		User Interface/X
 BuildArch:	noarch



From fedora-cvs-commits at redhat.com  Wed Aug 23 06:21:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 02:21:00 -0400
Subject: rpms/at-spi/devel at-spi-1.7.11-spew.patch, NONE, 1.1 at-spi.spec,
	1.51, 1.52
Message-ID: <200608230621.k7N6L0Fb016598@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16584

Modified Files:
	at-spi.spec 
Added Files:
	at-spi-1.7.11-spew.patch 
Log Message:
remove debug spew


at-spi-1.7.11-spew.patch:
 application.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE at-spi-1.7.11-spew.patch ---
--- at-spi-1.7.11/libspi/application.c.spew	2006-08-23 01:20:11.000000000 -0400
+++ at-spi-1.7.11/libspi/application.c	2006-08-23 01:20:16.000000000 -0400
@@ -67,7 +67,6 @@
   g_list_free (application->toolkit_listeners);
   application->toolkit_listeners = NULL;
 
-  g_print ("application finalize called\n");
   (G_OBJECT_CLASS (spi_application_parent_class))->finalize (object);
 }
 


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- at-spi.spec	21 Aug 2006 20:22:54 -0000	1.51
+++ at-spi.spec	23 Aug 2006 06:20:56 -0000	1.52
@@ -7,9 +7,10 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
+Patch0: at-spi-1.7.11-spew.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .spew
 
 %build
 %configure --disable-gtk-doc
@@ -96,6 +98,9 @@
 %{_includedir}/* 
 
 %changelog
+* Wed Aug 23 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.11-2.fc6
+- Remove debug spew
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.11-1.fc6
 - Update to 1.7.11
 - Drop upstreamed patch



From fedora-cvs-commits at redhat.com  Wed Aug 23 06:47:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 02:47:22 -0400
Subject: rpms/ImageMagick/FC-4 ImageMagick-6.2.2-cve-2006-3743.patch, NONE,
	1.1 ImageMagick-6.2.2-cve-2006-4144.patch, NONE,
	1.1 ImageMagick.spec, 1.44, 1.45
Message-ID: <200608230647.k7N6lMho021634@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ImageMagick/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv19982

Modified Files:
	ImageMagick.spec 
Added Files:
	ImageMagick-6.2.2-cve-2006-3743.patch 
	ImageMagick-6.2.2-cve-2006-4144.patch 
Log Message:
Fix several vulnerabilities


ImageMagick-6.2.2-cve-2006-3743.patch:
 sun.c |   32 ++++++++++++++++++++++++++------
 xcf.c |    8 ++++----
 2 files changed, 30 insertions(+), 10 deletions(-)

--- NEW FILE ImageMagick-6.2.2-cve-2006-3743.patch ---
--- ImageMagick-6.2.2/coders/xcf.c.ormandy	2006-08-23 01:39:53.000000000 -0400
+++ ImageMagick-6.2.2/coders/xcf.c	2006-08-23 01:40:09.000000000 -0400
@@ -268,7 +268,7 @@
 %
 %
 */
-static char *ReadBlobStringWithLongSize(Image *image,char *string)
+static char *ReadBlobStringWithLongSize(Image *image,char *string,size_t max)
 {
   int
     c;
@@ -284,7 +284,7 @@
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),image->filename);
   length = ReadBlobMSBLong(image);
-  for (i=0; i < (long) length; i++)
+  for (i=0; i < (long) Min(length, max); i++)
   {
     c=ReadBlobByte(image);
     if (c == EOF)
@@ -693,7 +693,7 @@
   outLayer->width = ReadBlobMSBLong(image);
   outLayer->height = ReadBlobMSBLong(image);
   outLayer->type = ReadBlobMSBLong(image);
-  (void) ReadBlobStringWithLongSize(image, outLayer->name);
+  (void) ReadBlobStringWithLongSize(image, outLayer->name, 1024);
 
   /* allocate the image for this layer */
   outLayer->image=CloneImage(image,outLayer->width, outLayer->height,MagickTrue,
@@ -1099,7 +1099,7 @@
         /*float  factor = (float) */ (void) ReadBlobMSBLong(image);
         /* unsigned long digits =  */ (void) ReadBlobMSBLong(image);
         for (i=0; i<5; i++)
-         (void) ReadBlobStringWithLongSize(image, unit_string);
+         (void) ReadBlobStringWithLongSize(image, unit_string, sizeof(unit_string));
       }
      break;
 
--- ImageMagick-6.2.2/coders/sun.c.ormandy	2006-08-23 01:39:58.000000000 -0400
+++ ImageMagick-6.2.2/coders/sun.c	2006-08-23 01:40:09.000000000 -0400
@@ -133,10 +133,10 @@
 %
 */
 static MagickBooleanType DecodeImage(const unsigned char *compressed_pixels,
-  const size_t length,unsigned char *pixels)
+  const size_t length,unsigned char *pixels,size_t maxpixels)
 {
   register const unsigned char
-    *p;
+    *p, *l;
 
   register unsigned char
     *q;
@@ -152,7 +152,8 @@
   assert(pixels != (unsigned char *) NULL);
   p=compressed_pixels;
   q=pixels;
-  while ((size_t) (p-compressed_pixels) < length)
+  l=q+maxpixels;
+  while ((size_t) (p-compressed_pixels) < length && q < l)
   {
     byte=(*p++);
     if (byte != 128U)
@@ -165,7 +166,7 @@
         count=(ssize_t) (*p++);
         if (count > 0)
           byte=(*p++);
-        while (count >= 0)
+        while (count >= 0 && q < l)
         {
           *q++=byte;
           count--;
@@ -376,6 +377,8 @@
         CloseBlob(image);
         return(GetFirstImageInList(image));
       }
+    if ((sun_info.length * sizeof(*sun_data)) / sizeof(*sun_data) != sun_info.length || !sun_info.length)
+        ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
     sun_data=(unsigned char *)
       AcquireMagickMemory((size_t) sun_info.length*sizeof(*sun_data));
     if (sun_data == (unsigned char *) NULL)
@@ -393,11 +396,28 @@
           Read run-length encoded raster pixels.
         */
         height=sun_info.height;
-        bytes_per_line=2*(sun_info.width*sun_info.depth+15)/16;
+
+        /* calculate bytes per line, verifying no overflow occurs */
+        bytes_per_line=sun_info.width*sun_info.depth;
+        if (!height || !sun_info.width || !sun_info.depth || bytes_per_line / sun_info.depth != sun_info.width)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
+        if ((ULONG_MAX - bytes_per_line) < 15)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
+        bytes_per_line += 15;
+        bytes_per_line <<= 1;
+        if (bytes_per_line >> 1 != sun_info.width * sun_info.depth + 15)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
+        bytes_per_line >>= 4;
+        if ((bytes_per_line * height) / height != bytes_per_line)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
         sun_pixels=(unsigned char *) AcquireMagickMemory(bytes_per_line*height);
         if (sun_pixels == (unsigned char *) NULL)
           ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
-        (void) DecodeImage(sun_data,sun_info.length,sun_pixels);
+        (void) DecodeImage(sun_data,sun_info.length,sun_pixels, bytes_per_line * height);
         sun_data=(unsigned char *) RelinquishMagickMemory(sun_data);
       }
     /*

ImageMagick-6.2.2-cve-2006-4144.patch:
 sgi.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE ImageMagick-6.2.2-cve-2006-4144.patch ---
--- ImageMagick-6.2.2/coders/sgi.c.ormandy	2006-08-23 01:44:20.000000000 -0400
+++ ImageMagick-6.2.2/coders/sgi.c	2006-08-23 01:48:05.000000000 -0400
@@ -395,7 +395,11 @@
         for (i=0; i < (int) (iris_info.rows*iris_info.depth); i++)
           offsets[i]=(ssize_t) ReadBlobMSBLong(image);
         for (i=0; i < (int) (iris_info.rows*iris_info.depth); i++)
+	{
           runlength[i]=ReadBlobMSBLong(image);
+          if (runlength[i] >= (4*(size_t) iris_info.columns+10))
+            ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+	}
         /*
           Check data order.
         */


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/FC-4/ImageMagick.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ImageMagick.spec	24 May 2006 15:21:21 -0000	1.44
+++ ImageMagick.spec	23 Aug 2006 06:47:12 -0000	1.45
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 3.fc4.2
+Release: 3.fc4.3
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -29,6 +29,10 @@
 Patch9: ImageMagick-6.2.2-format-string-again.patch
 # 192279
 Patch10: ImageMagick-6.2.2-yet-another-overflow.patch
+# 202193
+Patch11: ImageMagick-6.2.2-cve-2006-3743.patch
+# 202771
+Patch12: ImageMagick-6.2.2-cve-2006-4144.patch
 
 Url: http://www.imagemagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -125,6 +129,8 @@
 %patch8 -p1 -b .mask
 %patch9 -p1 -b .format-string-again
 %patch10 -p1 -b .yet-another-overflow
+%patch11 -p1 -b .cve-2006-3743
+%patch12 -p1 -b .cve-2006-4144
 
 %build
 %configure --enable-shared \
@@ -234,6 +240,10 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Wed Aug 23 2006 Matthias Clasen <mclasen at redhat.com> - 6.2.2.0-3.fc4.3
+- fix several integer and buffer overflows (#202193, CVE-2006-3743)
+- fix more integer overflows (#202771, CVE-2006-4144)
+
 * Wed May 24 2006 Matthias Clasen <mclasen at redhat.com> - 6.2.2.0-3.fc4.2
 - Fix a heap overflow CVE-2006-2440 (#192279)
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 06:53:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 02:53:03 -0400
Subject: rpms/gdb/FC-5 gdb-6.3-edit-missing-slash-20060718.patch, NONE,
	1.1 gdb.spec, 1.186, 1.187
Message-ID: <200608230653.k7N6r3iN032452@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32420/FC-5

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-edit-missing-slash-20060718.patch 
Log Message:
* ??? ??? ?? ???? Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.133
- BuildReq flex, bison, sharutils, prelink and, on multilib systems,
32-bit glibc-devel.
- Add slash between dir and file names in edit command (BZ 192261,
BZ 199156).

gdb-6.3-edit-missing-slash-20060718.patch:
 cli-cmds.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE gdb-6.3-edit-missing-slash-20060718.patch ---
Fix BZ 199596.  This bug is already fixed in GDB 6.5 and newer.

for  gdb-6.3/gdb/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	* cli/cli-cmds.c (edit_command): Add slash between dir and
	file names.

Index: gdb-6.3/gdb/cli/cli-cmds.c
===================================================================
--- gdb-6.3.orig/gdb/cli/cli-cmds.c	2006-07-07 00:29:26.000000000 -0300
+++ gdb-6.3/gdb/cli/cli-cmds.c	2006-07-18 03:11:48.000000000 -0300
@@ -656,16 +656,17 @@ edit_command (char *arg, int from_tty)
   log10 = 1 + (int)((log10 + (0 == ((m-1) & sal.line)))/3.32192809);
 
   cmdlen = strlen(editor) + 1
-         + (NULL == sal.symtab->dirname ? 0 : strlen(sal.symtab->dirname) + 1)
-	 + (NULL == sal.symtab->filename? 0 : strlen(sal.symtab->filename)+ 1)
+         + (NULL == sal.symtab->dirname ? 2 : strlen(sal.symtab->dirname) + 1)
+	 + (NULL == sal.symtab->filename? 7 : strlen(sal.symtab->filename)+ 1)
 	 + log10 + 2;
   
   p = xmalloc(cmdlen);
-  sprintf(p,"%s +%d %s%s",editor,sal.line,
-     (NULL == sal.symtab->dirname ? "./" :
+  sprintf(p,"%s +%d %s/%s",editor,sal.line,
+     (NULL == sal.symtab->dirname ? "." :
         (NULL != sal.symtab->filename && *(sal.symtab->filename) != '/') ?
 	   sal.symtab->dirname : ""),
-     (NULL == sal.symtab->filename ? "unknown" : sal.symtab->filename)
+     (NULL == sal.symtab->filename ? "unknown"
+      : (sal.symtab->filename + (*(sal.symtab->filename) == '/')))
   );
   shell_escape(p, from_tty);
 


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-5/gdb.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- gdb.spec	15 Jun 2006 11:34:41 -0000	1.186
+++ gdb.spec	23 Aug 2006 06:53:01 -0000	1.187
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.132.FC5
+Release: 1.133%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -288,16 +288,27 @@
 # Do not let errors related with debug registers break thread debugging.
 Patch178: gdb-6.3-catch-debug-registers-error-20060527.patch
 
-# Copy with waitpid modifying status even when returning zero, as on
+# Cope with waitpid modifying status even when returning zero, as on
 # ia32el.
 Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
+# Add slash between dir and file names passed to editor from cli's
+# edit command.
+Patch180: gdb-6.3-edit-missing-slash-20060718.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
-BuildRequires: flex bison
+BuildRequires: flex bison sharutils
+
+%ifarch %{multilib_64_archs} sparc ppc
+# Ensure glibc{,-devel} is installed for both multilib arches
+BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
+%endif
 
 %ifarch ia64
 BuildRequires: libunwind >= 0.96-3
 Requires: libunwind >= 0.96-3
+%else
+BuildRequires: prelink
 %endif
  
 Prereq: info
@@ -401,6 +412,7 @@
 %patch177 -p1
 %patch178 -p1
 %patch179 -p1
+%patch180 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -569,8 +581,13 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* ??? ??? ?? ???? Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.133
+- BuildReq flex, bison, sharutils, prelink and, on multilib systems,
+32-bit glibc-devel.
+- Add slash between dir and file names in edit command (BZ 192261,
+BZ 199156).
+
 * Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
-- Require flex and bison at build time.
 - Additional patch for BZ 175083, to cope with waitpid setting status
 even when returning zero.
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 06:54:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 02:54:57 -0400
Subject: rpms/gdb/devel gdb-6.5-opcodes-i386-nopmem.patch, NONE, 1.1 gdb.spec,
	1.193, 1.194
Message-ID: <200608230654.k7N6svdR032585@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32568

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.5-opcodes-i386-nopmem.patch 
Log Message:
* ??? Alexandre Oliva <aoliva at redhat.com> - 6.5-4
- Backport support for i386 nop memory instructions.

gdb-6.5-opcodes-i386-nopmem.patch:
 include/opcode/i386.h |    6 +++++-
 opcodes/i386-dis.c    |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE gdb-6.5-opcodes-i386-nopmem.patch ---
This is already upstream, past GDB 6.5.

include/opcode/

2006-06-09  H.J. Lu  <hongjiu.lu at intel.com>

	* i386.h (i386_optab): Add "nop" with memory reference.

opcodes/

2006-06-09  H.J. Lu  <hongjiu.lu at intel.com>

	* i386-dis.c (dis386_twobyte): Use "nopQ" for 0x1f.
	(twobyte_has_modrm): Set 1 for 0x1f.

--- binutils/include/opcode/i386.h.nops	2006-06-10 11:26:58.000000000 -0700
+++ binutils/include/opcode/i386.h	2006-06-10 11:26:58.000000000 -0700
@@ -555,7 +555,11 @@ static const template i386_optab[] =
 {"bound",  2,	0x62, X, Cpu186|CpuNo64, wl_Suf|Modrm,		{ WordReg, WordMem, 0} },
 
 {"hlt",	   0,	0xf4, X, 0,	 NoSuf,			{ 0, 0, 0} },
-/* nop is actually 'xchgl %eax, %eax'.  */
+
+{"nop",    1, 0x0f1f, X, Cpu686, wl_Suf|Modrm,		{ WordMem, 0, 0} },
+
+/* nop is actually "xchg %ax,%ax" in 16bit mode, "xchg %eax,%eax" in
+   32bit mode and "xchg %rax,%rax" in 64bit mode.  */
 {"nop",	   0,	0x90, X, 0,	 NoSuf,			{ 0, 0, 0} },
 
 /* Protection control.  */
--- binutils/opcodes/i386-dis.c.nops	2006-06-10 11:26:58.000000000 -0700
+++ binutils/opcodes/i386-dis.c	2006-06-10 11:26:58.000000000 -0700
@@ -843,7 +843,7 @@ static const struct dis386 dis386_twobyt
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
-  { "(bad)",		XX, XX, XX },
+  { "nopQ",		Ev, XX, XX },
   /* 20 */
   { "movZ",		Rm, Cm, XX },
   { "movZ",		Rm, Dm, XX },
@@ -1125,7 +1125,7 @@ static const unsigned char twobyte_has_m
   /*       0 1 2 3 4 5 6 7 8 9 a b c d e f        */
   /*       -------------------------------        */
   /* 00 */ 1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,1, /* 0f */
-  /* 10 */ 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0, /* 1f */
+  /* 10 */ 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1, /* 1f */
   /* 20 */ 1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1, /* 2f */
   /* 30 */ 0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0, /* 3f */
   /* 40 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 4f */



Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- gdb.spec	14 Jul 2006 05:18:22 -0000	1.193
+++ gdb.spec	23 Aug 2006 06:54:55 -0000	1.194
@@ -11,7 +11,7 @@
 Version: 6.5
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -219,6 +219,9 @@
 # Backport GNU .hash support.
 Patch180: gdb-6.5-bfd-hash-style-20060714.patch
 
+# Add support for memory nops on x86.
+Patch181: gdb-6.5-opcodes-i386-nopmem.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils
 
@@ -310,6 +313,7 @@
 %patch178 -p1
 %patch179 -p1
 %patch180 -p1
+%patch181 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -470,6 +474,9 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* ??? Alexandre Oliva <aoliva at redhat.com> - 6.5-4
+- Backport support for i386 nop memory instructions.
+
 * Thu Jul 13 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-3
 - Add missing definition of multilib_64_archs for glibc-devel buildreqs.
 - Backport support for .gnu.hash sections.



From fedora-cvs-commits at redhat.com  Wed Aug 23 06:55:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 02:55:02 -0400
Subject: rpms/ImageMagick/FC-5 ImageMagick-6.2.2-cve-2006-3743.patch, NONE,
	1.1 ImageMagick-6.2.2-cve-2006-4144.patch, NONE,
	1.1 ImageMagick.spec, 1.59, 1.60
Message-ID: <200608230655.k7N6t2kl032620@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ImageMagick/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32567

Modified Files:
	ImageMagick.spec 
Added Files:
	ImageMagick-6.2.2-cve-2006-3743.patch 
	ImageMagick-6.2.2-cve-2006-4144.patch 
Log Message:
fix several vulnerabilities


ImageMagick-6.2.2-cve-2006-3743.patch:
 sun.c |   32 ++++++++++++++++++++++++++------
 xcf.c |    8 ++++----
 2 files changed, 30 insertions(+), 10 deletions(-)

--- NEW FILE ImageMagick-6.2.2-cve-2006-3743.patch ---
--- ImageMagick-6.2.2/coders/xcf.c.ormandy	2006-08-23 01:39:53.000000000 -0400
+++ ImageMagick-6.2.2/coders/xcf.c	2006-08-23 01:40:09.000000000 -0400
@@ -268,7 +268,7 @@
 %
 %
 */
-static char *ReadBlobStringWithLongSize(Image *image,char *string)
+static char *ReadBlobStringWithLongSize(Image *image,char *string,size_t max)
 {
   int
     c;
@@ -284,7 +284,7 @@
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),image->filename);
   length = ReadBlobMSBLong(image);
-  for (i=0; i < (long) length; i++)
+  for (i=0; i < (long) Min(length, max); i++)
   {
     c=ReadBlobByte(image);
     if (c == EOF)
@@ -693,7 +693,7 @@
   outLayer->width = ReadBlobMSBLong(image);
   outLayer->height = ReadBlobMSBLong(image);
   outLayer->type = ReadBlobMSBLong(image);
-  (void) ReadBlobStringWithLongSize(image, outLayer->name);
+  (void) ReadBlobStringWithLongSize(image, outLayer->name, 1024);
 
   /* allocate the image for this layer */
   outLayer->image=CloneImage(image,outLayer->width, outLayer->height,MagickTrue,
@@ -1099,7 +1099,7 @@
         /*float  factor = (float) */ (void) ReadBlobMSBLong(image);
         /* unsigned long digits =  */ (void) ReadBlobMSBLong(image);
         for (i=0; i<5; i++)
-         (void) ReadBlobStringWithLongSize(image, unit_string);
+         (void) ReadBlobStringWithLongSize(image, unit_string, sizeof(unit_string));
       }
      break;
 
--- ImageMagick-6.2.2/coders/sun.c.ormandy	2006-08-23 01:39:58.000000000 -0400
+++ ImageMagick-6.2.2/coders/sun.c	2006-08-23 01:40:09.000000000 -0400
@@ -133,10 +133,10 @@
 %
 */
 static MagickBooleanType DecodeImage(const unsigned char *compressed_pixels,
-  const size_t length,unsigned char *pixels)
+  const size_t length,unsigned char *pixels,size_t maxpixels)
 {
   register const unsigned char
-    *p;
+    *p, *l;
 
   register unsigned char
     *q;
@@ -152,7 +152,8 @@
   assert(pixels != (unsigned char *) NULL);
   p=compressed_pixels;
   q=pixels;
-  while ((size_t) (p-compressed_pixels) < length)
+  l=q+maxpixels;
+  while ((size_t) (p-compressed_pixels) < length && q < l)
   {
     byte=(*p++);
     if (byte != 128U)
@@ -165,7 +166,7 @@
         count=(ssize_t) (*p++);
         if (count > 0)
           byte=(*p++);
-        while (count >= 0)
+        while (count >= 0 && q < l)
         {
           *q++=byte;
           count--;
@@ -376,6 +377,8 @@
         CloseBlob(image);
         return(GetFirstImageInList(image));
       }
+    if ((sun_info.length * sizeof(*sun_data)) / sizeof(*sun_data) != sun_info.length || !sun_info.length)
+        ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
     sun_data=(unsigned char *)
       AcquireMagickMemory((size_t) sun_info.length*sizeof(*sun_data));
     if (sun_data == (unsigned char *) NULL)
@@ -393,11 +396,28 @@
           Read run-length encoded raster pixels.
         */
         height=sun_info.height;
-        bytes_per_line=2*(sun_info.width*sun_info.depth+15)/16;
+
+        /* calculate bytes per line, verifying no overflow occurs */
+        bytes_per_line=sun_info.width*sun_info.depth;
+        if (!height || !sun_info.width || !sun_info.depth || bytes_per_line / sun_info.depth != sun_info.width)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
+        if ((ULONG_MAX - bytes_per_line) < 15)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
+        bytes_per_line += 15;
+        bytes_per_line <<= 1;
+        if (bytes_per_line >> 1 != sun_info.width * sun_info.depth + 15)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
+        bytes_per_line >>= 4;
+        if ((bytes_per_line * height) / height != bytes_per_line)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
         sun_pixels=(unsigned char *) AcquireMagickMemory(bytes_per_line*height);
         if (sun_pixels == (unsigned char *) NULL)
           ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
-        (void) DecodeImage(sun_data,sun_info.length,sun_pixels);
+        (void) DecodeImage(sun_data,sun_info.length,sun_pixels, bytes_per_line * height);
         sun_data=(unsigned char *) RelinquishMagickMemory(sun_data);
       }
     /*

ImageMagick-6.2.2-cve-2006-4144.patch:
 sgi.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE ImageMagick-6.2.2-cve-2006-4144.patch ---
--- ImageMagick-6.2.2/coders/sgi.c.ormandy	2006-08-23 01:44:20.000000000 -0400
+++ ImageMagick-6.2.2/coders/sgi.c	2006-08-23 01:48:05.000000000 -0400
@@ -395,7 +395,11 @@
         for (i=0; i < (int) (iris_info.rows*iris_info.depth); i++)
           offsets[i]=(ssize_t) ReadBlobMSBLong(image);
         for (i=0; i < (int) (iris_info.rows*iris_info.depth); i++)
+	{
           runlength[i]=ReadBlobMSBLong(image);
+          if (runlength[i] >= (4*(size_t) iris_info.columns+10))
+            ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+	}
         /*
           Check data order.
         */


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/FC-5/ImageMagick.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ImageMagick.spec	25 May 2006 16:39:48 -0000	1.59
+++ ImageMagick.spec	23 Aug 2006 06:55:00 -0000	1.60
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 4.2.1.fc5.3
+Release: 4.2.1.fc5.4
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -21,6 +21,11 @@
 Patch1: ImageMagick-6.2.1-local_doc.patch
 Patch2: ImageMagick-6.2.5-format-string-again.patch
 Patch3: ImageMagick-6.2.5-yet-another-overflow.patch
+# 202193
+Patch4: ImageMagick-6.2.2-cve-2006-3743.patch
+# 202771
+Patch5: ImageMagick-6.2.2-cve-2006-4144.patch
+
 
 Url: http://www.imagemagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -117,6 +122,8 @@
 %patch1 -p1 -b .local_doc
 %patch2 -p1 -b .format-string-again
 %patch3 -p1 -b .yet-another-overflow
+%patch4 -p1 -b .cve-2006-3743
+%patch5 -p1 -b .cve-2006-4144
 
 %build
 %configure --enable-shared \
@@ -227,6 +234,10 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Wed Aug 23 2006 Matthias Clasen <mclasen at redhat.com> - 6.2.5.4-4.2.1.fc5.4
+- fix several integer and buffer overflows (#202193, CVE-2006-3743)
+- fix more integer overflows (#202771, CVE-2006-4144)
+
 * Thu May 25 2006 Matthias Clasen <mclasen at redhat.com> - 6.2.5.4-4.2.1.fc5.3
 - Include the needed .la files again
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 07:05:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 03:05:24 -0400
Subject: rpms/ImageMagick/devel ImageMagick-6.2.8-cve-2006-3743.patch, NONE,
	1.1 ImageMagick-6.2.8-cve-2006-4144.patch, NONE,
	1.1 ImageMagick.spec, 1.66, 1.67
Message-ID: <200608230705.k7N75Otq000492@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv475

Modified Files:
	ImageMagick.spec 
Added Files:
	ImageMagick-6.2.8-cve-2006-3743.patch 
	ImageMagick-6.2.8-cve-2006-4144.patch 
Log Message:
fix several vulnerabilities


ImageMagick-6.2.8-cve-2006-3743.patch:
 sun.c |   32 ++++++++++++++++++++++++++------
 xcf.c |    8 ++++----
 2 files changed, 30 insertions(+), 10 deletions(-)

--- NEW FILE ImageMagick-6.2.8-cve-2006-3743.patch ---
--- ImageMagick-6.2.2/coders/xcf.c.ormandy	2006-08-23 01:39:53.000000000 -0400
+++ ImageMagick-6.2.2/coders/xcf.c	2006-08-23 01:40:09.000000000 -0400
@@ -268,7 +268,7 @@
 %
 %
 */
-static char *ReadBlobStringWithLongSize(Image *image,char *string)
+static char *ReadBlobStringWithLongSize(Image *image,char *string,size_t max)
 {
   int
     c;
@@ -284,7 +284,7 @@
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),image->filename);
   length = ReadBlobMSBLong(image);
-  for (i=0; i < (long) length; i++)
+  for (i=0; i < (long) Min(length, max); i++)
   {
     c=ReadBlobByte(image);
     if (c == EOF)
@@ -693,7 +693,7 @@
   outLayer->width = ReadBlobMSBLong(image);
   outLayer->height = ReadBlobMSBLong(image);
   outLayer->type = ReadBlobMSBLong(image);
-  (void) ReadBlobStringWithLongSize(image, outLayer->name);
+  (void) ReadBlobStringWithLongSize(image, outLayer->name, 1024);
 
   /* allocate the image for this layer */
   outLayer->image=CloneImage(image,outLayer->width, outLayer->height,MagickTrue,
@@ -1099,7 +1099,7 @@
         /*float  factor = (float) */ (void) ReadBlobMSBLong(image);
         /* unsigned long digits =  */ (void) ReadBlobMSBLong(image);
         for (i=0; i<5; i++)
-         (void) ReadBlobStringWithLongSize(image, unit_string);
+         (void) ReadBlobStringWithLongSize(image, unit_string, sizeof(unit_string));
       }
      break;
 
--- ImageMagick-6.2.2/coders/sun.c.ormandy	2006-08-23 01:39:58.000000000 -0400
+++ ImageMagick-6.2.2/coders/sun.c	2006-08-23 01:40:09.000000000 -0400
@@ -133,10 +133,10 @@
 %
 */
 static MagickBooleanType DecodeImage(const unsigned char *compressed_pixels,
-  const size_t length,unsigned char *pixels)
+  const size_t length,unsigned char *pixels,size_t maxpixels)
 {
   register const unsigned char
-    *p;
+    *p, *l;
 
   register unsigned char
     *q;
@@ -152,7 +152,8 @@
   assert(pixels != (unsigned char *) NULL);
   p=compressed_pixels;
   q=pixels;
-  while ((size_t) (p-compressed_pixels) < length)
+  l=q+maxpixels;
+  while ((size_t) (p-compressed_pixels) < length && q < l)
   {
     byte=(*p++);
     if (byte != 128U)
@@ -165,7 +166,7 @@
         count=(ssize_t) (*p++);
         if (count > 0)
           byte=(*p++);
-        while (count >= 0)
+        while (count >= 0 && q < l)
         {
           *q++=byte;
           count--;
@@ -376,6 +377,8 @@
         CloseBlob(image);
         return(GetFirstImageInList(image));
       }
+    if ((sun_info.length * sizeof(*sun_data)) / sizeof(*sun_data) != sun_info.length || !sun_info.length)
+        ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
     sun_data=(unsigned char *)
       AcquireMagickMemory((size_t) sun_info.length*sizeof(*sun_data));
     if (sun_data == (unsigned char *) NULL)
@@ -393,11 +396,28 @@
           Read run-length encoded raster pixels.
         */
         height=sun_info.height;
-        bytes_per_line=2*(sun_info.width*sun_info.depth+15)/16;
+
+        /* calculate bytes per line, verifying no overflow occurs */
+        bytes_per_line=sun_info.width*sun_info.depth;
+        if (!height || !sun_info.width || !sun_info.depth || bytes_per_line / sun_info.depth != sun_info.width)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
+        if ((ULONG_MAX - bytes_per_line) < 15)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
+        bytes_per_line += 15;
+        bytes_per_line <<= 1;
+        if (bytes_per_line >> 1 != sun_info.width * sun_info.depth + 15)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
+        bytes_per_line >>= 4;
+        if ((bytes_per_line * height) / height != bytes_per_line)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
         sun_pixels=(unsigned char *) AcquireMagickMemory(bytes_per_line*height);
         if (sun_pixels == (unsigned char *) NULL)
           ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
-        (void) DecodeImage(sun_data,sun_info.length,sun_pixels);
+        (void) DecodeImage(sun_data,sun_info.length,sun_pixels, bytes_per_line * height);
         sun_data=(unsigned char *) RelinquishMagickMemory(sun_data);
       }
     /*

ImageMagick-6.2.8-cve-2006-4144.patch:
 sgi.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE ImageMagick-6.2.8-cve-2006-4144.patch ---
--- ImageMagick-6.2.8/coders/sgi.c.cve-2006-4144	2006-02-07 22:52:54.000000000 -0500
+++ ImageMagick-6.2.8/coders/sgi.c	2006-08-23 02:05:52.000000000 -0400
@@ -410,7 +410,11 @@
         for (i=0; i < (long) (iris_info.rows*iris_info.depth); i++)
           offsets[i]=(ssize_t) ReadBlobMSBLong(image);
         for (i=0; i < (long) (iris_info.rows*iris_info.depth); i++)
+        {
           runlength[i]=ReadBlobMSBLong(image);
+          if (runlength[i] >= (4*(size_t) iris_info.columns+10))
+            ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+        }
         /*
           Check data order.
         */


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ImageMagick.spec	25 Jul 2006 03:42:08 -0000	1.66
+++ ImageMagick.spec	23 Aug 2006 07:05:22 -0000	1.67
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 2
+Release: 3%{?dist}
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -20,6 +20,11 @@
 Source1: magick_small.png
 Patch1: ImageMagick-6.2.1-local_doc.patch
 Patch2: ImageMagick-6.2.8-multilib.patch
+# 202193
+Patch3: ImageMagick-6.2.8-cve-2006-3743.patch
+# 202771
+Patch4: ImageMagick-6.2.8-cve-2006-4144.patch
+
 
 Url: http://www.imagemagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -116,6 +121,8 @@
 %setup -q -n %{name}-%{VER}
 %patch1 -p1 -b .local_doc
 %patch2 -p1 -b .multilib
+%patch3 -p1 -b .cve-2006-3743
+%patch4 -p1 -b .cve-2006-4144
 
 %build
 %configure --enable-shared \
@@ -251,6 +258,10 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Wed Aug 23 2006 Matthias Clasen <mclasen at redhat.com> - 6.2.8.0-3.fc6
+- fix several integer and buffer overflows (#202193, CVE-2006-3743)
+- fix more integer overflows (#202771, CVE-2006-4144)
+
 * Mon Jul 24 2006 Matthias Clasen <mclasen at redhat.com> - 6.2.8.0-2
 - Add missing BRs
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 07:10:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 03:10:08 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.168,1.169
Message-ID: <200608230710.k7N7A8Fx000617@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv591

Modified Files:
	gnome-applets.spec 
Log Message:
fix typo



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gnome-applets.spec	23 Aug 2006 02:07:33 -0000	1.168
+++ gnome-applets.spec	23 Aug 2006 07:10:02 -0000	1.169
@@ -137,7 +137,7 @@
 %configure			\
 	--enable-suid=no 	\
 %if %{build_stickynotes}
-	--enable-sticky-notes	\
+	--enable-stickynotes	\
 %endif
 	--disable-scrollkeeper 	\
 	--enable-mini-commander 



From fedora-cvs-commits at redhat.com  Wed Aug 23 07:50:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 03:50:03 -0400
Subject: rpms/compat-gcc-34/devel gcc34-ldbl-hack.patch, NONE,
	1.1 compat-gcc-34.spec, 1.4, 1.5
Message-ID: <200608230750.k7N7o3Gg013504@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-34/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13347

Modified Files:
	compat-gcc-34.spec 
Added Files:
	gcc34-ldbl-hack.patch 
Log Message:
3.4.6-4

gcc34-ldbl-hack.patch:
 stubs.c |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+)

--- NEW FILE gcc34-ldbl-hack.patch ---
--- libstdc++-v3/libmath/stubs.c.jj	2005-11-21 08:43:21.000000000 -0500
+++ libstdc++-v3/libmath/stubs.c	2006-08-23 03:30:53.000000000 -0400
@@ -27,9 +27,38 @@
    invalidate any other reasons why the executable file might be covered by
    the GNU General Public License.  */
 
+#if defined __s390__ || defined __powerpc__
+/* Lie.  */
+#define __LONG_DOUBLE_128__ 1
+#endif
+
 #include <math.h>
 #include "config.h"
 
+#if defined __s390__ || defined __powerpc__
+#undef HAVE_ACOSL
+#undef HAVE_ASINL
+#undef HAVE_ATAN2L
+#undef HAVE_ATANL
+#undef HAVE_CEILL
+#undef HAVE_COSHL
+#undef HAVE_COSL
+#undef HAVE_EXPL
+#undef HAVE_FLOORL
+#undef HAVE_FMODL
+#undef HAVE_FREXPL
+#undef HAVE_LDEXPL
+#undef HAVE_LOG10L
+#undef HAVE_LOGL
+#undef HAVE_MODFL
+#undef HAVE_POWL
+#undef HAVE_SINHL
+#undef HAVE_SINL
+#undef HAVE_SQRTL
+#undef HAVE_TANHL
+#undef HAVE_TANL
+#endif
+
 /* For targets which do not have support for long double versions,
    we use the crude approximation.  We'll do better later.  */
 
@@ -273,6 +302,12 @@ hypotl(long double x, long double y)
   x /= s; y /= s;
   return s * sqrtl(x * x + y * y);
 }
+#elif (defined __s390__ || defined __powerpc__) && defined HAVE_HYPOT
+long double
+hypotl(long double x, long double y)
+{
+  return hypot((double) x, (double) y);
+}
 #endif
 
 


Index: compat-gcc-34.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-34/devel/compat-gcc-34.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- compat-gcc-34.spec	10 Aug 2006 19:23:21 -0000	1.4
+++ compat-gcc-34.spec	23 Aug 2006 07:49:57 -0000	1.5
@@ -16,7 +16,7 @@
 Summary: Compatibility GNU Compiler Collection
 Name: compat-gcc-34
 Version: 3.4.6
-Release: 3
+Release: 4
 License: GPL
 Group: Development/Languages
 Source0: gcc-%{version}-%{DATE}.tar.bz2
@@ -41,6 +41,7 @@
 Conflicts: gdb < 5.1-2
 Requires: glibc-devel >= 2.2.90-12
 Requires: libgcc >= 4.1.0
+BuildRequires: elfutils-devel >= 0.72
 %ifarch %{multilib_64_archs} sparc ppc
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -95,6 +96,8 @@
 Patch38: gcc34-libgcc_eh-hidden.patch
 Patch39: gcc34-frame-base-loclist.patch
 
+Patch100: gcc34-ldbl-hack.patch
+
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-linux
@@ -196,6 +199,8 @@
 %patch38 -p0 -b .libgcc_eh-hidden~
 %patch39 -p0 -b .frame-base-loclist~
 
+%patch100 -p0 -b .ldbl-hack~
+
 perl -pi -e 's/3\.4\.7/3.4.6/' gcc/version.c
 perl -pi -e 's/"%{version}"/"%{version} \(release\)"/' gcc/version.c
 perl -pi -e 's/\((prerelease|experimental|release|Red Hat[^)]*)\)/\(Red Hat %{version}-%{release}\)/' gcc/version.c
@@ -368,6 +373,15 @@
 
 cd ..
 
+%ifarch ppc ppc64 s390 s390x
+# GCC 3.4.x always uses IEEE double long double type on ppc*/s390*
+# Although properly written programs should use headers which will DTRT,
+# the addition of -lnldbl_nonshared should fix even buggy programs
+# and shared libraries.
+sed -i -e 's/%G %L/%G -lnldbl_nonshared %L/' \
+  $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{gcc_target_platform}/%{version}/specs
+%endif
+
 %ifarch sparc ppc
 ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
   $RPM_BUILD_ROOT%{_prefix}/bin/%{_target_platform}-gcc
@@ -607,5 +621,11 @@
 %{_prefix}/%{_lib}/libg2c.so.0*
 
 %changelog
+* Wed Aug 23 2006 Jakub Jelinek  <jakub at redhat.com> 3.4.6-4
+- buildrequire elfutils-devel, so that libgcc_s is properly built
+  on ia64
+- on ppc*/s390* make sure all needed math *l stubs are included
+- add -lnldbl_nonshared to ppc*/s390* specs
+
 * Wed Aug  9 2006 Jakub Jelinek  <jakub at redhat.com> 3.4.6-3
 - new compat package



From fedora-cvs-commits at redhat.com  Wed Aug 23 08:08:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 04:08:21 -0400
Subject: rpms/firefox/devel firefox.spec,1.142,1.143
Message-ID: <200608230808.k7N88Lwp021520@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21459

Modified Files:
	firefox.spec 
Log Message:
* Wed Aug 23 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-5
- Attempt to turn visibility back on since the GCC issues should have
  been fixed.



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- firefox.spec	23 Aug 2006 01:31:29 -0000	1.142
+++ firefox.spec	23 Aug 2006 08:08:15 -0000	1.143
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.6
-Release:        4
+Release:        5
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -124,7 +124,7 @@
 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
 # UPDATE: 2006-07-24: i386 is also broken now.
 #%ifnarch i386
-%patch5  -p0
+#%patch5  -p0
 #%endif
 
 %patch20 -p0
@@ -356,6 +356,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Aug 23 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-5
+- Attempt to turn visibility back on since the GCC issues should have
+  been fixed.
+
 * Tue Aug 22 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-4
 - Update NSS requires to workaround a bug introduced by NSS changes.
   https://bugzilla.mozilla.org/show_bug.cgi?id=294542



From fedora-cvs-commits at redhat.com  Wed Aug 23 08:12:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 04:12:12 -0400
Subject: rpms/transfig/FC-5 transfig.spec,1.21,1.22
Message-ID: <200608230812.k7N8CBE7022199@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/transfig/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22149

Modified Files:
	transfig.spec 
Log Message:
- Make sure the spec file is parsed on machines without imake.


Index: transfig.spec
===================================================================
RCS file: /cvs/dist/rpms/transfig/FC-5/transfig.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- transfig.spec	22 Aug 2006 14:52:48 -0000	1.21
+++ transfig.spec	23 Aug 2006 08:12:00 -0000	1.22
@@ -1,11 +1,15 @@
 %define xfig_libdir %{_datadir}/xfig
 %define fig2dev_libdir %{_datadir}/fig2dev
+%if "%(which imake 2>/dev/null)" != ""
 %define imake %(which imake)
+%else
+%define imake /usr/X11R6/bin/imake
+%endif
 
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.4
-Release: 13.2
+Release: 13.3
 Epoch: 1
 License: distributable
 Group: Applications/Multimedia
@@ -86,6 +90,7 @@
 %changelog
 * Tue Aug 22 2006 Stepan Kasal <skasal at redhat.com> - 1:3.2.4-13.3
 - Require ghostscript; fig2dev calls it.
+- Make sure the spec file is parsed on machines without imake.
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.4-13.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Wed Aug 23 08:37:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 04:37:12 -0400
Subject: rpms/lftp/devel lftp.spec,1.53,1.54
Message-ID: <200608230837.k7N8bCRe010527@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10417

Modified Files:
	lftp.spec 
Log Message:
remove .a & .la from _libdir



Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- lftp.spec	17 Jul 2006 20:02:05 -0000	1.53
+++ lftp.spec	23 Aug 2006 08:37:02 -0000	1.54
@@ -52,6 +52,8 @@
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.so
 # Remove files from $RPM_BUILD_ROOT that we aren't shipping.
 rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.*a
 %find_lang %{name}
 %if %{DEBUG}
 /usr/lib/rpm/brp-compress



From fedora-cvs-commits at redhat.com  Wed Aug 23 08:43:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 04:43:40 -0400
Subject: rpms/lftp/devel lftp.spec,1.54,1.55
Message-ID: <200608230843.k7N8hdOh011937@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11913

Modified Files:
	lftp.spec 
Log Message:
remove .la & .a


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- lftp.spec	23 Aug 2006 08:37:02 -0000	1.54
+++ lftp.spec	23 Aug 2006 08:43:34 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.5.1
-Release: 	1.fc6
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2
@@ -86,6 +86,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Wed Aug 23 2006 Maros Barabas	<mbarabas at redhat.com> - 3.5.1-2
+- remove .a & .la from libdir
+
 * Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 3.5.1-1.fc6
 - Upgrade to 3.5.1
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 09:20:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 05:20:30 -0400
Subject: rpms/avahi/devel avahi-0.6.11-param.patch, NONE, 1.1 avahi.spec,
	1.66, 1.67
Message-ID: <200608230920.k7N9KTAq018395@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17150

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.11-param.patch 
Log Message:
added fix for #200767, added dist tag

avahi-0.6.11-param.patch:
 main.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE avahi-0.6.11-param.patch ---
--- avahi-0.6.11/avahi-dnsconfd/main.c.old	2006-04-24 02:48:40.000000000 +0200
+++ avahi-0.6.11/avahi-dnsconfd/main.c	2006-08-23 11:08:30.000000000 +0200
@@ -393,6 +393,7 @@
         { "version",   no_argument,       NULL, 'V' },
         { "refresh",   no_argument,       NULL, 'r' },
         { "check",     no_argument,       NULL, 'c' },
+	{ NULL, 0, NULL, 0 }
     };
 
     opterr = 0;


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- avahi.spec	18 Jul 2006 22:48:04 -0000	1.66
+++ avahi.spec	23 Aug 2006 09:20:26 -0000	1.67
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.11
-Release: 	2.fc6
+Release: 	3%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -55,6 +55,7 @@
 Patch16:	avahi-sharp-lock.patch
 Patch17:	avahi-0.6.11-use-ipv6-yes.patch
 Patch18: 	avahi-0.6.11-dbus-deprecated.patch
+Patch19: 	avahi-0.6.11-param.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -203,6 +204,7 @@
 #^- this patch now upstream
 %patch17 -p1 -b .use-ipv6-yes
 %patch18 -p1 -b .dbus-deprecated
+%patch19 -p1 -b .param
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -414,6 +416,11 @@
 %endif
 
 %changelog
+* Wed Aug 23 2006 Martin Stransky <stransky at redhat.com> - 0.6.11-3
+- added fix for #200767 - avahi-dnsconfd Segmentation fault 
+  with invalid command line argument
+- added dist tag
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.6.11-2.fc6
 - add BR for dbus-glib-devel
 - fix deprecated functions



From fedora-cvs-commits at redhat.com  Wed Aug 23 09:23:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 05:23:02 -0400
Subject: rpms/transfig/FC-5 transfig.spec,1.22,1.23
Message-ID: <200608230923.k7N9N2uN019129@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/transfig/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19098

Modified Files:
	transfig.spec 
Log Message:
Chaneg the imake default.


Index: transfig.spec
===================================================================
RCS file: /cvs/dist/rpms/transfig/FC-5/transfig.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- transfig.spec	23 Aug 2006 08:12:00 -0000	1.22
+++ transfig.spec	23 Aug 2006 09:22:59 -0000	1.23
@@ -3,7 +3,7 @@
 %if "%(which imake 2>/dev/null)" != ""
 %define imake %(which imake)
 %else
-%define imake /usr/X11R6/bin/imake
+%define imake imake
 %endif
 
 Summary: A utility for converting FIG files (made by xfig) to other formats.



From fedora-cvs-commits at redhat.com  Wed Aug 23 09:29:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 05:29:37 -0400
Subject: rpms/gdb/devel gdb-6.5-bz203661-emit-relocs.patch, NONE,
	1.1.2.1 gdb.spec, 1.193.2.1, 1.193.2.2
Message-ID: <200608230929.k7N9Tbqq020708@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20631

Modified Files:
      Tag: private-jkratoch
	gdb.spec 
Added Files:
      Tag: private-jkratoch
	gdb-6.5-bz203661-emit-relocs.patch 
Log Message:
* Wed Aug 23 2006 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.5-3_jkratoch1
- Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).


gdb-6.5-bz203661-emit-relocs.patch:
 symfile.c |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE gdb-6.5-bz203661-emit-relocs.patch ---
--- sources-clean/gdb/symfile.c	2006-08-23 09:22:21.000000000 +0200
+++ sources-custom/gdb/symfile.c	2006-08-23 09:54:24.000000000 +0200
@@ -3713,6 +3713,12 @@
 bfd_byte *
 symfile_relocate_debug_section (bfd *abfd, asection *sectp, bfd_byte *buf)
 {
+  /* Executable files have all the relocations already resolved.
+   * Handle files linked with --emit-relocs.
+   * http://sources.redhat.com/ml/gdb/2006-08/msg00137.html  */
+  if ((abfd->flags & EXEC_P) != 0)
+    return NULL;
+
   /* We're only interested in debugging sections with relocation
      information.  */
   if ((sectp->flags & SEC_RELOC) == 0)


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.193.2.1
retrieving revision 1.193.2.2
diff -u -r1.193.2.1 -r1.193.2.2
--- gdb.spec	20 Aug 2006 17:41:36 -0000	1.193.2.1
+++ gdb.spec	23 Aug 2006 09:29:33 -0000	1.193.2.2
@@ -11,7 +11,7 @@
 Version: 6.5
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 3_jkratoch0%{?dist}
+Release: 3_jkratoch1%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -240,6 +240,9 @@
 # Handle corrupted or missing location list information (BZ 196439).
 Patch187: gdb-6.5-bz196439-valgrind-memcheck-compat.patch
 
+# Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).
+Patch188: gdb-6.5-bz203661-emit-relocs.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils
 
@@ -338,6 +341,7 @@
 %patch185 -p1
 %patch186 -p0
 %patch187 -p0
+%patch188 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -498,6 +502,9 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Wed Aug 23 2006 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.5-3_jkratoch1
+- Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).
+
 * Sun Aug 20 2006 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.5-3_jkratoch0
 - Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ 200048).
 - Do not step into the PPC solib trampolines (BZ 200533).



From fedora-cvs-commits at redhat.com  Wed Aug 23 09:35:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 05:35:43 -0400
Subject: rpms/tux/devel tux-3.2.18-man_remove.patch, NONE, 1.1 tux.spec, 1.31,
	1.32
Message-ID: <200608230935.k7N9Zhn2022153@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/tux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22069

Modified Files:
	tux.spec 
Added Files:
	tux-3.2.18-man_remove.patch 
Log Message:
- remove tux.2 man page (moved to man-pages package)


tux-3.2.18-man_remove.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tux-3.2.18-man_remove.patch ---
--- tux-3.2.18/Makefile.man	2004-02-24 13:45:37.000000000 +0100
+++ tux-3.2.18/Makefile	2006-08-23 11:26:46.000000000 +0200
@@ -101,7 +101,7 @@
 	          $(SYSCONFIG) $(LOGROTATED) $(INCDIR) $(TMPDIR)
 	install -m 755 tux tux2w3c tuxstat $(TOPDIR)/usr/sbin/
 	install -m 755 tux.init $(RCDIR)/tux
-	install -m 644 tux.2 $(MAN2DIR)
+	#install -m 644 tux.2 $(MAN2DIR)
 	#install -m 644 tux.8 $(MAN8DIR)
 	install -m 644 tux$(MAJOR).h $(INCDIR)/tux.h
 	install -m 644 tuxmodule.h $(INCDIR)


Index: tux.spec
===================================================================
RCS file: /cvs/dist/rpms/tux/devel/tux.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- tux.spec	18 Jul 2006 00:09:47 -0000	1.31
+++ tux.spec	23 Aug 2006 09:35:38 -0000	1.32
@@ -5,7 +5,7 @@
 %define minor 2
 %define patchlevel 18
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: User-space component of TUX kernel-based threaded HTTP server
 License: GPL
 Group: System Environment/Daemons
@@ -16,6 +16,7 @@
 Patch1: tux-3.2.18-gcc34.patch
 Patch2: tux-3.2.18-strncpy-warning.patch
 Patch3: tux-3.2.18-compile-fix.patch
+Patch4: tux-3.2.18-man_remove.patch
 
 %description
 TUX is a kernel-based, threaded, extremely high performance HTTP server.
@@ -32,6 +33,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 make %{?_smp_mflags} CCFLAGS="$RPM_OPT_FLAGS"
@@ -66,12 +68,14 @@
 %config %attr(0644,root,root) /etc/sysconfig/*
 %config(noreplace) %attr(0644,root,root) /etc/logrotate.d/*
 %config %attr(0644,root,root) /etc/tux.mime.types
-%attr(0644,root,root) /usr/share/man/man*/*
 %attr(0644,root,root) /usr/include/*
 %attr(0700,root,root) %dir /var/tux
 %doc tux.README NEWS SUCCESS gettuxconfig checkbindings demo.c demo.tux.so demo2.c demo2.tux.so demo3.c demo3.tux.so demo4.c demo4.tux.so demo5.tux.so samples/sample.log samples/sample.out docs/tux docs/TUXAPI*
 
 %changelog
+* Wed Aug 23 2006 Ivana Varekova <varekova at redhat.com> - 3.2.18-9
+- remove tux.2 man page (moved to man-pages package)
+
 * Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 3.2.18-8
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 09:40:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 05:40:37 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch, NONE,
	1.1 openoffice.org.spec, 1.856, 1.857
Message-ID: <200608230940.k7N9eb7m023351@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23278

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch 
Log Message:
add openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch

openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch:
 inc/outdev.h             |    3 +--
 source/gdi/outdev3.cxx   |   42 +++++++++++++++++++++++-------------------
 source/gdi/sallayout.cxx |    4 +---
 3 files changed, 25 insertions(+), 24 deletions(-)

--- NEW FILE openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch ---
diff -ru vcl.orig/inc/outdev.h vcl/inc/outdev.h
--- vcl.orig/inc/outdev.h	2006-08-23 10:05:16.000000000 +0100
+++ vcl/inc/outdev.h	2006-08-23 10:13:54.000000000 +0100
@@ -213,8 +213,7 @@
                              const Font& rFont, const Size& rSize, ImplFontSubstEntry* pDevSpecific );
     ImplFontEntry*      GetFallback( ImplDevFontList* pFontList,
                                      const Font& rFont, const Size& rSize,
-                                     int nFallbackLevel, sal_Unicode *pMissingUnicodes,
-                                     int nMissingUnicodes );
+                                     int nFallbackLevel, std::vector<sal_Unicode> &rMissingGlyphs );
     void                Release( ImplFontEntry* );
     void                Invalidate();
 };
diff -ru vcl.orig/source/gdi/outdev3.cxx vcl/source/gdi/outdev3.cxx
--- vcl.orig/source/gdi/outdev3.cxx	2006-08-23 10:05:02.000000000 +0100
+++ vcl/source/gdi/outdev3.cxx	2006-08-23 10:28:30.000000000 +0100
@@ -3128,7 +3128,7 @@
 
 ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList,
      const Font& rOrigFont, const Size& rSize, int nFallbackLevel,
-     sal_Unicode *pMissingUnicodes, int nMissingUnicodes )
+     std::vector<sal_Unicode> &rMissingGlyphs )
 {
     ImplFontEntry*      pFallbackFont = NULL;
     bool                cached = false;
@@ -3165,14 +3165,12 @@
         cached = true;
     }
 
-    std::vector<sal_Unicode> aGlyphs;
-    for (int i=0; i < nMissingUnicodes; ++i)
-        aGlyphs.push_back(pMissingUnicodes[i]);
+    std::vector<sal_Unicode> aGlyphs(rMissingGlyphs);
 
     // Try cached fallbacks first
-    if ( !symbolFont && !aGlyphs.empty() )
+    if ( !symbolFont && !rMissingGlyphs.empty() )
     {
-        aSelData.maSearchName = pOrigFontEntry->GetFallbackForUnicode( aGlyphs[0] );
+        aSelData.maSearchName = pOrigFontEntry->GetFallbackForUnicode( rMissingGlyphs[0] );
         if ( aSelData.maSearchName.Len() )
             cached = true;
     }
@@ -3180,10 +3178,24 @@
     if ( !cached )
     {
         String aName(GetFcSubstitute( aSelData, aGlyphs ));
-      if (aName.Len())
-            aSelData.maSearchName = aName;
+		if (aName.Len())
+			aSelData.maSearchName = aName;
     }
 
+	if (!rMissingGlyphs.empty())
+	{
+        std::vector<sal_Unicode>::const_iterator aEnd = aGlyphs.end();
+        for (std::vector<sal_Unicode>::const_iterator aI = aGlyphs.begin(); aI != aEnd; ++aI)
+		{
+            rMissingGlyphs.erase(std::remove(rMissingGlyphs.begin(), rMissingGlyphs.end(), *aI));
+
+			//In this case only the first missing symbol has been taken into account, and is 
+			//known safe to replace
+			if (cached || symbolFont)
+				break;
+		}
+	}
+
     // Check our font instance cache first, if not found then
     // add this ImplFontSelectData to the cache along with its ImplFontEntry
     FontInstanceList::const_iterator it = maFontInstanceList.find( aSelData );
@@ -6257,14 +6269,9 @@
 #endif
     int nCharPos = -1;
     bool bRTL = false;
-    sal_Unicode *pMissingUnicodes = new sal_Unicode[8];
-    int nMissingUnicodes = 0;
-
+    std::vector<sal_Unicode> aGlyphs;
     for( int i=0; i<8 && rLayoutArgs.GetNextPos( &nCharPos, &bRTL); ++i )
-    {
-        pMissingUnicodes[i] = rLayoutArgs.mpStr[ nCharPos ];
-        nMissingUnicodes++;
-    }
+        aGlyphs.push_back(rLayoutArgs.mpStr[ nCharPos ]);
     rLayoutArgs.ResetPos();
 
     ImplFontSelectData aFontSelData = mpFontEntry->maFontSelData;
@@ -6282,8 +6289,7 @@
     {
         // find a font family suited for glyph fallback
         ImplFontEntry* pFallbackFont = mpFontCache->GetFallback( mpFontList,
-            maFont, aFontSize, nFallbackLevel-nDevSpecificFallback,
-            (nMissingUnicodes ? pMissingUnicodes : NULL), nMissingUnicodes );
+            maFont, aFontSize, nFallbackLevel-nDevSpecificFallback, aGlyphs);
         if( !pFallbackFont )
             break;
 
@@ -6335,8 +6341,6 @@
             break;
     }
 
-    delete[] pMissingUnicodes;
-
     if( pMultiSalLayout && pMultiSalLayout->LayoutText( rLayoutArgs ) )
         pSalLayout = pMultiSalLayout;
 
diff -ru vcl.orig/source/gdi/sallayout.cxx vcl/source/gdi/sallayout.cxx
--- vcl.orig/source/gdi/sallayout.cxx	2006-08-23 10:05:02.000000000 +0100
+++ vcl/source/gdi/sallayout.cxx	2006-08-23 10:06:12.000000000 +0100
@@ -1715,14 +1715,12 @@
         if( n > 0 )
         {
             // drop the NotDef glyphs in the base layout run if a fallback run exists
-            while( maFallbackRuns[ n-1 ].PosIsInRun( nCharPos[0] ) )
+            if ( maFallbackRuns[ n-1 ].PosIsInRun( nCharPos[0] ) )
             {
                 mpLayouts[0]->DropGlyph( nStartOld[0] );
                 nStartOld[0] = nStartNew[0];
                 nValid[0] = mpLayouts[0]->GetNextGlyphs( 1, &nDummy, aPos,
                     nStartNew[0], &nGlyphAdv[0], &nCharPos[0] );
-                if( !nValid[0] )
-                   break;
             }
         }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.856
retrieving revision 1.857
diff -u -r1.856 -r1.857
--- openoffice.org.spec	22 Aug 2006 11:22:13 -0000	1.856
+++ openoffice.org.spec	23 Aug 2006 09:40:33 -0000	1.857
@@ -124,6 +124,7 @@
 Patch56: openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch
 Patch57: openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
 Patch58: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch59: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -982,6 +983,7 @@
 %patch56 -p1 -b .ooo68822.sw.recursiveim.patch
 %patch57 -p1 -b .ooo68851.framework.disablemenuifempty.patch
 %patch58 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch59 -p1 -b .ooo54603.fontconfig.part3.patch
 
 tar xzf %{SOURCE1}
 
@@ -2513,6 +2515,7 @@
 - drop openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch, fixed in gnome now
 - rh#203497# -> openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
 - rh#203439# -> openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+- rh#203063# -> openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
 
 * Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.1
 - rh#201447# -> openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch



From fedora-cvs-commits at redhat.com  Wed Aug 23 09:50:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 05:50:44 -0400
Subject: rpms/coreutils/FC-5 coreutils-pam.patch, 1.7, 1.8 coreutils.spec,
	1.117, 1.118
Message-ID: <200608230950.k7N9oiXL008542@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8488

Modified Files:
	coreutils-pam.patch coreutils.spec 
Log Message:
* Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com>
- Don't chdir until after PAM bits in su (bug #197659).


coreutils-pam.patch:
 config.hin         |    3 
 configure.ac       |    7 +
 doc/coreutils.texi |   34 +-------
 src/Makefile.am    |    2 
 src/su.c           |  220 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 230 insertions(+), 36 deletions(-)

Index: coreutils-pam.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-5/coreutils-pam.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- coreutils-pam.patch	27 Oct 2005 15:05:08 -0000	1.7
+++ coreutils-pam.patch	23 Aug 2006 09:50:41 -0000	1.8
@@ -1,16 +1,55 @@
---- coreutils-5.92/src/Makefile.am.pam	2005-10-24 17:58:21.000000000 +0100
-+++ coreutils-5.92/src/Makefile.am	2005-10-24 17:58:21.000000000 +0100
-@@ -93,7 +93,7 @@
+--- coreutils-5.97/doc/coreutils.texi.pam	2006-02-07 08:31:28.000000000 +0000
++++ coreutils-5.97/doc/coreutils.texi	2006-08-23 10:42:17.000000000 +0100
+@@ -12768,8 +12768,11 @@
+ @findex syslog
+ @command{su} can optionally be compiled to use @code{syslog} to report
+ failed, and optionally successful, @command{su} attempts.  (If the system
+-supports @code{syslog}.)  However, GNU @command{su} does not check if the
+-user is a member of the @code{wheel} group; see below.
++supports @code{syslog}.)
++
++This version of @command{su} has support for using PAM for
++authentication.  You can edit @file{/etc/pam.d/su} to customize its
++behaviour.
  
- uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
+ The program accepts the following options.  Also see @ref{Common options}.
  
--su_LDADD = $(LDADD) $(LIB_CRYPT)
-+su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@
+@@ -12850,33 +12853,6 @@
+ the exit status of the subshell otherwise
+ @end display
  
- $(PROGRAMS): ../lib/libcoreutils.a
+- at cindex wheel group, not supported
+- at cindex group wheel, not supported
+- at cindex fascism
+- at subsection Why GNU @command{su} does not support the @samp{wheel} group
+-
+-(This section is by Richard Stallman.)
+-
+- at cindex Twenex
+- at cindex MIT AI lab
+-Sometimes a few of the users try to hold total power over all the
+-rest.  For example, in 1984, a few users at the MIT AI lab decided to
+-seize power by changing the operator password on the Twenex system and
+-keeping it secret from everyone else.  (I was able to thwart this coup
+-and give power back to the users by patching the kernel, but I
+-wouldn't know how to do that in Unix.)
+-
+-However, occasionally the rulers do tell someone.  Under the usual
+- at command{su} mechanism, once someone learns the root password who
+-sympathizes with the ordinary users, he or she can tell the rest.  The
+-``wheel group'' feature would make this impossible, and thus cement the
+-power of the rulers.
+-
+-I'm on the side of the masses, not that of the rulers.  If you are
+-used to supporting the bosses and sysadmins in whatever they do, you
+-might find this idea strange at first.
+-
+-
+ @node Process control
+ @chapter Process control
  
---- coreutils-5.92/src/su.c.pam	2005-10-24 17:58:21.000000000 +0100
-+++ coreutils-5.92/src/su.c	2005-10-24 18:06:22.000000000 +0100
+--- coreutils-5.97/src/su.c.pam	2006-08-23 10:42:17.000000000 +0100
++++ coreutils-5.97/src/su.c	2006-08-23 10:43:11.000000000 +0100
 @@ -38,6 +38,16 @@
     restricts who can su to UID 0 accounts.  RMS considers that to
     be fascist.
@@ -329,72 +368,33 @@
  }
  
  /* Return true if SHELL is a restricted shell (one not returned by
-@@ -550,9 +758,11 @@
+@@ -550,9 +758,9 @@
    shell = xstrdup (shell ? shell : pw->pw_shell);
    modify_environment (pw, shell);
  
 +#ifndef USE_PAM
    change_identity (pw);
+-  if (simulate_login && chdir (pw->pw_dir) != 0)
+-    error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
 +#endif
-   if (simulate_login && chdir (pw->pw_dir) != 0)
-     error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
  
 -  run_shell (shell, command, argv + optind, MAX (0, argc - optind));
 +  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
  }
---- coreutils-5.92/doc/coreutils.texi.pam	2005-10-16 08:26:21.000000000 +0100
-+++ coreutils-5.92/doc/coreutils.texi	2005-10-24 17:58:21.000000000 +0100
-@@ -12746,8 +12746,11 @@
- @findex syslog
- @command{su} can optionally be compiled to use @code{syslog} to report
- failed, and optionally successful, @command{su} attempts.  (If the system
--supports @code{syslog}.)  However, GNU @command{su} does not check if the
--user is a member of the @code{wheel} group; see below.
-+supports @code{syslog}.)
-+
-+This version of @command{su} has support for using PAM for
-+authentication.  You can edit @file{/etc/pam.d/su} to customize its
-+behaviour.
+--- coreutils-5.97/src/Makefile.am.pam	2006-08-23 10:42:17.000000000 +0100
++++ coreutils-5.97/src/Makefile.am	2006-08-23 10:42:17.000000000 +0100
+@@ -92,7 +92,7 @@
  
- The program accepts the following options.  Also see @ref{Common options}.
+ uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
  
-@@ -12828,33 +12831,6 @@
- the exit status of the subshell otherwise
- @end display
+-su_LDADD = $(LDADD) $(LIB_CRYPT)
++su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@
  
-- at cindex wheel group, not supported
-- at cindex group wheel, not supported
-- at cindex fascism
-- at subsection Why GNU @command{su} does not support the @samp{wheel} group
--
--(This section is by Richard Stallman.)
--
-- at cindex Twenex
-- at cindex MIT AI lab
--Sometimes a few of the users try to hold total power over all the
--rest.  For example, in 1984, a few users at the MIT AI lab decided to
--seize power by changing the operator password on the Twenex system and
--keeping it secret from everyone else.  (I was able to thwart this coup
--and give power back to the users by patching the kernel, but I
--wouldn't know how to do that in Unix.)
--
--However, occasionally the rulers do tell someone.  Under the usual
-- at command{su} mechanism, once someone learns the root password who
--sympathizes with the ordinary users, he or she can tell the rest.  The
--``wheel group'' feature would make this impossible, and thus cement the
--power of the rulers.
--
--I'm on the side of the masses, not that of the rulers.  If you are
--used to supporting the bosses and sysadmins in whatever they do, you
--might find this idea strange at first.
--
--
- @node Process control
- @chapter Process control
+ $(PROGRAMS): ../lib/libcoreutils.a
  
---- coreutils-5.92/configure.ac.pam	2005-10-24 17:58:21.000000000 +0100
-+++ coreutils-5.92/configure.ac	2005-10-24 17:58:21.000000000 +0100
-@@ -28,6 +28,13 @@
+--- coreutils-5.97/configure.ac.pam	2006-08-23 10:42:17.000000000 +0100
++++ coreutils-5.97/configure.ac	2006-08-23 10:42:17.000000000 +0100
+@@ -27,6 +27,13 @@
  AB_INIT()
  AM_INIT_AUTOMAKE([1.8.3 gnits dist-bzip2])
  
@@ -408,9 +408,9 @@
  gl_DEFAULT_POSIX2_VERSION
  gl_USE_SYSTEM_EXTENSIONS
  gl_PERL
---- coreutils-5.92/config.hin.pam	2005-10-24 17:58:21.000000000 +0100
-+++ coreutils-5.92/config.hin	2005-10-24 17:58:21.000000000 +0100
-@@ -1526,6 +1526,9 @@
+--- coreutils-5.97/config.hin.pam	2006-08-23 10:42:17.000000000 +0100
++++ coreutils-5.97/config.hin	2006-08-23 10:42:17.000000000 +0100
+@@ -1537,6 +1537,9 @@
  /* Define if you want access control list support. */
  #undef USE_ACL
  


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-5/coreutils.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- coreutils.spec	13 Jul 2006 10:00:59 -0000	1.117
+++ coreutils.spec	23 Aug 2006 09:50:41 -0000	1.118
@@ -270,6 +270,9 @@
 /sbin/runuser
 
 %changelog
+* Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com>
+- Don't chdir until after PAM bits in su (bug #197659).
+
 * Thu Jul 13 2006 Tim Waugh <twaugh at redhat.com> 5.97-1.1
 - 5.97.  No longer need pl translation.
 - Build requires libacl-devel (bug #198662).



From fedora-cvs-commits at redhat.com  Wed Aug 23 09:51:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 05:51:16 -0400
Subject: rpms/coreutils/FC-5 coreutils.spec,1.118,1.119
Message-ID: <200608230951.k7N9pGaU008713@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8657

Modified Files:
	coreutils.spec 
Log Message:
5.97-1.2


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-5/coreutils.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- coreutils.spec	23 Aug 2006 09:50:41 -0000	1.118
+++ coreutils.spec	23 Aug 2006 09:51:13 -0000	1.119
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 1.1
+Release: 1.2
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -270,7 +270,7 @@
 /sbin/runuser
 
 %changelog
-* Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com> 5.97-1.2
 - Don't chdir until after PAM bits in su (bug #197659).
 
 * Thu Jul 13 2006 Tim Waugh <twaugh at redhat.com> 5.97-1.1



From fedora-cvs-commits at redhat.com  Wed Aug 23 09:56:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 05:56:46 -0400
Subject: rpms/coreutils/devel coreutils-5.2.1-runuser.patch, 1.10,
	1.11 coreutils-pam.patch, 1.7, 1.8 coreutils.spec, 1.133, 1.134
Message-ID: <200608230956.k7N9ukSw010276@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10201

Modified Files:
	coreutils-5.2.1-runuser.patch coreutils-pam.patch 
	coreutils.spec 
Log Message:
* Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com> 5.97-8
- Don't chdir until after PAM bits in su (bug #197659).


coreutils-5.2.1-runuser.patch:
 AUTHORS            |    1 
 README             |    2 
 man/Makefile.am    |    3 -
 man/runuser.1      |   59 ++++++++++++++++++++++++++
 man/runuser.x      |    4 +
 src/Makefile.am    |    8 ++-
 src/su.c           |  118 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 tests/help-version |    1 
 8 files changed, 183 insertions(+), 13 deletions(-)

Index: coreutils-5.2.1-runuser.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- coreutils-5.2.1-runuser.patch	21 Jul 2006 14:50:12 -0000	1.10
+++ coreutils-5.2.1-runuser.patch	23 Aug 2006 09:56:41 -0000	1.11
@@ -221,7 +221,7 @@
      {
  #ifdef SYSLOG_FAILURE
        log_su (pw, false);
-@@ -790,10 +882,18 @@
+@@ -790,8 +882,16 @@
    modify_environment (pw, shell);
  
  #ifndef USE_PAM
@@ -232,8 +232,6 @@
 +#endif
 +		   );
  #endif
-   if (simulate_login && chdir (pw->pw_dir) != 0)
-     error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
  
 -  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
 +  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw

coreutils-pam.patch:
 config.hin         |    3 
 configure.ac       |    7 +
 doc/coreutils.texi |   34 +-------
 src/Makefile.am    |    2 
 src/su.c           |  220 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 230 insertions(+), 36 deletions(-)

Index: coreutils-pam.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-pam.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- coreutils-pam.patch	27 Oct 2005 15:05:08 -0000	1.7
+++ coreutils-pam.patch	23 Aug 2006 09:56:42 -0000	1.8
@@ -1,16 +1,55 @@
---- coreutils-5.92/src/Makefile.am.pam	2005-10-24 17:58:21.000000000 +0100
-+++ coreutils-5.92/src/Makefile.am	2005-10-24 17:58:21.000000000 +0100
-@@ -93,7 +93,7 @@
+--- coreutils-5.97/doc/coreutils.texi.pam	2006-02-07 08:31:28.000000000 +0000
++++ coreutils-5.97/doc/coreutils.texi	2006-08-23 10:45:26.000000000 +0100
+@@ -12768,8 +12768,11 @@
+ @findex syslog
+ @command{su} can optionally be compiled to use @code{syslog} to report
+ failed, and optionally successful, @command{su} attempts.  (If the system
+-supports @code{syslog}.)  However, GNU @command{su} does not check if the
+-user is a member of the @code{wheel} group; see below.
++supports @code{syslog}.)
++
++This version of @command{su} has support for using PAM for
++authentication.  You can edit @file{/etc/pam.d/su} to customize its
++behaviour.
  
- uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
+ The program accepts the following options.  Also see @ref{Common options}.
  
--su_LDADD = $(LDADD) $(LIB_CRYPT)
-+su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@
+@@ -12850,33 +12853,6 @@
+ the exit status of the subshell otherwise
+ @end display
  
- $(PROGRAMS): ../lib/libcoreutils.a
+- at cindex wheel group, not supported
+- at cindex group wheel, not supported
+- at cindex fascism
+- at subsection Why GNU @command{su} does not support the @samp{wheel} group
+-
+-(This section is by Richard Stallman.)
+-
+- at cindex Twenex
+- at cindex MIT AI lab
+-Sometimes a few of the users try to hold total power over all the
+-rest.  For example, in 1984, a few users at the MIT AI lab decided to
+-seize power by changing the operator password on the Twenex system and
+-keeping it secret from everyone else.  (I was able to thwart this coup
+-and give power back to the users by patching the kernel, but I
+-wouldn't know how to do that in Unix.)
+-
+-However, occasionally the rulers do tell someone.  Under the usual
+- at command{su} mechanism, once someone learns the root password who
+-sympathizes with the ordinary users, he or she can tell the rest.  The
+-``wheel group'' feature would make this impossible, and thus cement the
+-power of the rulers.
+-
+-I'm on the side of the masses, not that of the rulers.  If you are
+-used to supporting the bosses and sysadmins in whatever they do, you
+-might find this idea strange at first.
+-
+-
+ @node Process control
+ @chapter Process control
  
---- coreutils-5.92/src/su.c.pam	2005-10-24 17:58:21.000000000 +0100
-+++ coreutils-5.92/src/su.c	2005-10-24 18:06:22.000000000 +0100
+--- coreutils-5.97/src/su.c.pam	2006-08-23 10:45:26.000000000 +0100
++++ coreutils-5.97/src/su.c	2006-08-23 10:45:33.000000000 +0100
 @@ -38,6 +38,16 @@
     restricts who can su to UID 0 accounts.  RMS considers that to
     be fascist.
@@ -329,72 +368,33 @@
  }
  
  /* Return true if SHELL is a restricted shell (one not returned by
-@@ -550,9 +758,11 @@
+@@ -550,9 +758,9 @@
    shell = xstrdup (shell ? shell : pw->pw_shell);
    modify_environment (pw, shell);
  
 +#ifndef USE_PAM
    change_identity (pw);
+-  if (simulate_login && chdir (pw->pw_dir) != 0)
+-    error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
 +#endif
-   if (simulate_login && chdir (pw->pw_dir) != 0)
-     error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
  
 -  run_shell (shell, command, argv + optind, MAX (0, argc - optind));
 +  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
  }
---- coreutils-5.92/doc/coreutils.texi.pam	2005-10-16 08:26:21.000000000 +0100
-+++ coreutils-5.92/doc/coreutils.texi	2005-10-24 17:58:21.000000000 +0100
-@@ -12746,8 +12746,11 @@
- @findex syslog
- @command{su} can optionally be compiled to use @code{syslog} to report
- failed, and optionally successful, @command{su} attempts.  (If the system
--supports @code{syslog}.)  However, GNU @command{su} does not check if the
--user is a member of the @code{wheel} group; see below.
-+supports @code{syslog}.)
-+
-+This version of @command{su} has support for using PAM for
-+authentication.  You can edit @file{/etc/pam.d/su} to customize its
-+behaviour.
+--- coreutils-5.97/src/Makefile.am.pam	2006-08-23 10:45:26.000000000 +0100
++++ coreutils-5.97/src/Makefile.am	2006-08-23 10:45:26.000000000 +0100
+@@ -92,7 +92,7 @@
  
- The program accepts the following options.  Also see @ref{Common options}.
+ uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
  
-@@ -12828,33 +12831,6 @@
- the exit status of the subshell otherwise
- @end display
+-su_LDADD = $(LDADD) $(LIB_CRYPT)
++su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@
  
-- at cindex wheel group, not supported
-- at cindex group wheel, not supported
-- at cindex fascism
-- at subsection Why GNU @command{su} does not support the @samp{wheel} group
--
--(This section is by Richard Stallman.)
--
-- at cindex Twenex
-- at cindex MIT AI lab
--Sometimes a few of the users try to hold total power over all the
--rest.  For example, in 1984, a few users at the MIT AI lab decided to
--seize power by changing the operator password on the Twenex system and
--keeping it secret from everyone else.  (I was able to thwart this coup
--and give power back to the users by patching the kernel, but I
--wouldn't know how to do that in Unix.)
--
--However, occasionally the rulers do tell someone.  Under the usual
-- at command{su} mechanism, once someone learns the root password who
--sympathizes with the ordinary users, he or she can tell the rest.  The
--``wheel group'' feature would make this impossible, and thus cement the
--power of the rulers.
--
--I'm on the side of the masses, not that of the rulers.  If you are
--used to supporting the bosses and sysadmins in whatever they do, you
--might find this idea strange at first.
--
--
- @node Process control
- @chapter Process control
+ $(PROGRAMS): ../lib/libcoreutils.a
  
---- coreutils-5.92/configure.ac.pam	2005-10-24 17:58:21.000000000 +0100
-+++ coreutils-5.92/configure.ac	2005-10-24 17:58:21.000000000 +0100
-@@ -28,6 +28,13 @@
+--- coreutils-5.97/configure.ac.pam	2006-08-23 10:45:26.000000000 +0100
++++ coreutils-5.97/configure.ac	2006-08-23 10:45:26.000000000 +0100
+@@ -27,6 +27,13 @@
  AB_INIT()
  AM_INIT_AUTOMAKE([1.8.3 gnits dist-bzip2])
  
@@ -408,9 +408,9 @@
  gl_DEFAULT_POSIX2_VERSION
  gl_USE_SYSTEM_EXTENSIONS
  gl_PERL
---- coreutils-5.92/config.hin.pam	2005-10-24 17:58:21.000000000 +0100
-+++ coreutils-5.92/config.hin	2005-10-24 17:58:21.000000000 +0100
-@@ -1526,6 +1526,9 @@
+--- coreutils-5.97/config.hin.pam	2006-08-23 10:45:26.000000000 +0100
++++ coreutils-5.97/config.hin	2006-08-23 10:45:26.000000000 +0100
+@@ -1537,6 +1537,9 @@
  /* Define if you want access control list support. */
  #undef USE_ACL
  


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- coreutils.spec	15 Aug 2006 16:50:48 -0000	1.133
+++ coreutils.spec	23 Aug 2006 09:56:42 -0000	1.134
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 7
+Release: 8
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -280,6 +280,9 @@
 /sbin/runuser
 
 %changelog
+* Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com> 5.97-8
+- Don't chdir until after PAM bits in su (bug #197659).
+
 * Tue Aug 15 2006 Tim Waugh <twaugh at redhat.com> 5.97-7
 - Fixed 'sort -b' multibyte problem (bug #199986).
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 10:16:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 06:16:31 -0400
Subject: rpms/man-pages/devel man2_sys2.tar.gz, NONE, 1.1 man-pages.spec,
	1.51, 1.52
Message-ID: <200608231016.k7NAGVlK014726@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14438

Modified Files:
	man-pages.spec 
Added Files:
	man2_sys2.tar.gz 
Log Message:
 - add (get/set)_robust_list.2 man pages
 - add add_key.2, keyctl.2, request_key.2 man pages
     (removed from keyutils-libs-devel package)
 - add tux.2 man page
     (removed from tux package)



--- NEW FILE man2_sys2.tar.gz ---
?
??
dl$??a}l5k?(p?C^#S??x?af?S:~%???T????w???-dg????C?S?xoE?g??.?`v!?>?g?0??3???????lq?Y<???-t??Jnd????$
?3????B?z?#??t???$G?i?72?e???[?)Z???T??*,M???W?????K????QJ?p?g*2??O^?$?9O"???@
oOD?	????v?????????dx5?G???./?5??/?|s
G????
7???x3?-??d8z????z?F,A?|?6U?
??<????e<-???xp?{?h?>"?e"?7??FT at 7??D????l???co??x???.?d?~???&?V??P?/?FH4???wp	?Z%(?F??`v5??s??q31??g??\?
??/x?~??s????M?s?ZrWj??????h:??fC:_o?V???3N at A??G??A?? ???????\???p??????TQ<?P.?<?
|	??<!??:??ZP?????J?)2\=?B?B????_G??d<?:5?
?7{afk2???wp?k`+?
??}X??[?t?rD???mq at Nv8B~?0D?r:????C??:?6?xF'?F???<?b%?Oqp?O?;?+??8?F??}??.??]
?"qc`?Wc_????)??h?!/?????????-0?MU?????n?5??|?W?H??lS?O?tQ??????????-6uW???????p??????WK?<z(?sz????#hx???????K??<{y????????!?}{4J?r	?????7LL|??OlJ?????T??F?9
B?P?q?????7?b|??
?J??_NF??,????8??'?7?E???l???#|??|???Z??
MK{D?o? U/????W???h??i???gz?????$?????#b?n??jZ??[e???p?m?G??J?|?qK ??mz??rji<??Vfb
'OF?j??\????i????*1p?l????	03?g?E&?G???=?????S???F??????u?w??V?????????M0??<P?\?a???W??d????/??????????????.?_}^*1??@m_U]J???(?????*??-e-A!???~???
g?>??????????x?T???90?q'??e_??????q??	?$?(wZ=?wlG<?
???`
W????u?9=B?D???.?.???w???(x
???T??#?m
o?:n?qR~?dLEb^_c??t7??eB?@
}?H?
?[ZhBvhR???3p
?? ?B????u8^?0??s?*1?g???!j???oN?[W??b#7?D?'N?????C<U??????z7P?)?x???Xf?v????5?_?	8??;?}????B???E\!?
?k?*>?L?A??h?[0^???)?Q)@?ps?ha???K?j?)?"??#??Qe?Va??F??}??B?1 ??+D?Jn?q??U&?E?dc~???TS?
VmeeE??l:?;?
?Y?t
W??u?$q??xq???4??y???k|6d:I+@'???????K????O??
d-??????nJ^?????Y?,,??h??HR???(??1?7??z??V??V?M?	?wm,???r????6?fa?X?~*??\????p?????e???X`?<$V??????Y?!s???H??UaC?M???|2???????=?i}?@^???^????6n?????*6??.??8%}???d?b??|1???}1=%?
wek
p??
???u?+???S??
??????4}c?.??`?????&T+:[???h??
?=?TP??FM
?????.]+????M??{Q? {]
?vT)HZ???oC???????w??z=??????????P??_?2#l?Zh??????4o?????%?h???r???W??????ad?8^<???????r?R9b"?
f???h<?N??
??2?[(?????????C\?????+q???V(??0:?????
?1z#?KIWSf?s?kJ-":z?????2??O*#&?????N??./?+??Y?\??P:XK=rQ"??<?cJ??j??w?G??Wz???r??(	
?y?_-U?`??rP`?7??!? ;??2A????K?o??u???K?^?<???=?????S???Nn?(SI$???%?9c]l?fG??>@?n???R??"???z?Bq?????Z?bf??g??],???sE?Opz???(????H?,??q7g???O?;?+?)????
?oN??&????_?PP??N)???
;K????|pH?6d?z?h1?F?!???m?W????????8?xXC??wI???????5?a"????A]?o2?T6??[0?r?V???5????c/???.????M???m}??
<?n???S*?Oe????????J
L?$?BT?$?@d????jI???*^
???8?K?j?k???t????
??E?????e
4?0v???1O??Y???k[??U?????^????V?
k?O???g*??~P??6
???9??Qeq?k	
????w?2'Z?@5?????????????sT??<??T o?????3??6?N??	?m?)j?fx?C}?a???0uI7kfM?&u?????B??L|RA???????N?Y?r??0}D?
?	??????,5:V?-??????*{??????i((ET??fY?]?\?e?J1
??P??ya??]b^?>??7!????????????(?e
???Vr???????$???__+e?>o+?? r|0W?KZ!W?l+eyv?f??>??????W???N!	#?QVEZc????+??fmlm????9C????A??E?[??;?X??l??Q??m??%???bM??h?y?4??*).'?G??F?p'VY(Ll18]CV???!$4?#?????+T?y9I?????*RT?H??L"'???q2L????l%?	??H??0???~L
,??Q?D?(N???wT:?U????Rm-???z6'???]R???R?????~m
??tK.a?3^??$[???g??u?Xv?C???{bObVb??1A{[??d?????7x|N?@?X???????"O?=?QT?,Lo'???
2|;??A?r>6?e???z???5-????+???????A
?;O????:/???t>??J<?|N?j??0?$d?r???D6J?[?,??P??#?????>???5d>?D?/???
~
????Q?o{{?{??{???{??????????
?"?|?
?z?41??340h?????????b????????V$?????????????!?+5???|Q???AB?W???[G????49-???+??V????}???Z?:/F?????[
?T|6
jD??xK?t??,?5?b???"?<??6m???G+8????ZB?#???f??8??<??j??v?(???9xU?2?^? ;????'?*??L??K?BF?[t???n.?n??DkS??E_<?0???GU??Sd????(???2E$z.7?0$g??L)?DT'?7h???@.?}k??K????!????
???2???]?s????9}W<?s???Y|>??K???z?"?\8?r?/?
??_z?????K????;?{?;?r??u?????w?1???7?????_
??7?{???Eb??????R?~???	?'r??$????
&n?s???	??y?o?qri2L?X?Tk??Z?/??x????(?Yc}j??mu?@KX&????o????<9?g>8?/??i????7AH??jY?h??&??{}"??N?{???1???*???KB[w??8?8"X?0?Q?z??9x??]?#Z?:?u3oL?r??z??8?3??o??????h?J?P?m?\?2???H???tg5??3??7??$???^???"?qwS9?pOI=B????Cu????~?1?8?y$(92y?W?L?j|_s??`??3???:?	B&r????]z??Z?t??
D??
fk?
???8??o?4*i??@k?5?b?]}6??b	?Z?5??fM!A?fau????)?Z5????q???????F7?2??-??w???0?zG?8R?f?	L??????-?????X??K???3
_.??@??g_?t?F???n?b???t?q<'???@????}5??SGF?????,D?-??#9?=?8~@??0av?4??=8>~w??

Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- man-pages.spec	14 Aug 2006 16:48:18 -0000	1.51
+++ man-pages.spec	23 Aug 2006 10:16:28 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
 Version: 2.39
-Release: 3
+Release: 4
 License: distributable
 Group: Documentation
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
@@ -13,6 +13,7 @@
 Source11: man2_sys.tar.gz
 Source12: gai.conf.5
 Source13: nss.5
+Source14: man2_sys2.tar.gz
 Patch1: man-pages-1.51-iconv.patch
 Patch2: man-pages-1.51-nopent.patch
 Patch3: man-pages-2.32-langinfo.patch
@@ -53,6 +54,7 @@
 cp -a %{SOURCE10} man8
 cp -a %{SOURCE12} man5
 cp -a %{SOURCE13} man5
+tar xzf %{SOURCE14} 
 tar xzf %{SOURCE11}
 
 %patch1 -p1
@@ -176,6 +178,13 @@
 %{_mandir}/en/man*
 
 %changelog
+* Wed Aug 23 2006 Ivana Varekova <varekova at redhat.com> 2.39-4
+- add (get/set)_robust_list.2 man pages
+- add add_key.2, keyctl.2, request_key.2 man pages 
+    (removed from keyutils-libs-devel package)
+- add tux.2 man page
+    (removed from tux package)
+
 * Mon Aug 14 2006 Marcela Maslanova <mmaslano at redhat.com> 2.39-3
 - fix same bug better
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 10:58:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 06:58:31 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch, 1.1, 1.2
Message-ID: <200608231058.k7NAwVIF024618@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24596

Modified Files:
	openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch 
Log Message:
I hate you glyph fallback

openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch:
 inc/outdev.h             |    3 +--
 source/gdi/outdev3.cxx   |   42 +++++++++++++++++++++++-------------------
 source/gdi/sallayout.cxx |    2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

Index: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch	23 Aug 2006 09:40:33 -0000	1.1
+++ openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch	23 Aug 2006 10:58:28 -0000	1.2
@@ -107,19 +107,12 @@
 diff -ru vcl.orig/source/gdi/sallayout.cxx vcl/source/gdi/sallayout.cxx
 --- vcl.orig/source/gdi/sallayout.cxx	2006-08-23 10:05:02.000000000 +0100
 +++ vcl/source/gdi/sallayout.cxx	2006-08-23 10:06:12.000000000 +0100
-@@ -1715,14 +1715,12 @@
+@@ -1712,7 +1715,7 @@
          if( n > 0 )
          {
              // drop the NotDef glyphs in the base layout run if a fallback run exists
 -            while( maFallbackRuns[ n-1 ].PosIsInRun( nCharPos[0] ) )
-+            if ( maFallbackRuns[ n-1 ].PosIsInRun( nCharPos[0] ) )
++            while (( maFallbackRuns[ n-1 ].PosIsInRun( nCharPos[0] ) ) && ( !maFallbackRuns[ n ].PosIsInRun( nCharPos[0] ) ))
              {
                  mpLayouts[0]->DropGlyph( nStartOld[0] );
                  nStartOld[0] = nStartNew[0];
-                 nValid[0] = mpLayouts[0]->GetNextGlyphs( 1, &nDummy, aPos,
-                     nStartNew[0], &nGlyphAdv[0], &nCharPos[0] );
--                if( !nValid[0] )
--                   break;
-             }
-         }
- 



From fedora-cvs-commits at redhat.com  Wed Aug 23 11:46:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 07:46:35 -0400
Subject: rpms/at/devel at-3.1.8-dontfork.patch,NONE,1.1 at.spec,1.38,1.39
Message-ID: <200608231146.k7NBkZlA029530@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/at/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26178

Modified Files:
	at.spec 
Added Files:
	at-3.1.8-dontfork.patch 
Log Message:
Added don't fork option.


at-3.1.8-dontfork.patch:
 atd.8.in |    6 +++++-
 daemon.c |    8 ++++++--
 daemon.h |    2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE at-3.1.8-dontfork.patch ---
--- at-3.1.8/daemon.c.dontfork	2002-01-18 05:15:27.000000000 +0100
+++ at-3.1.8/daemon.c	2006-08-23 12:13:11.000000000 +0200
@@ -50,7 +50,8 @@
 
 static char rcsid[] = "$Id: daemon.c,v 1.9 1996/08/12 08:23:55 ig25 Exp $";
 
-int daemon_debug;
+int daemon_debug = 0;
+int daemon_nofork = 0;
 
 static int
 lock_fd(int fd)
@@ -119,15 +120,18 @@
 	    (open("/dev/null", O_RDWR) != 2)) {
 	    perr("Error redirecting I/O");
 	}
+    }
+    if (daemon_nofork) pid = getpid();
+    else {
 	pid = fork();
 	if (pid == -1) {
 	    perr("Cannot fork");
 	} else if (pid != 0) {
 	    exit(0);
 	}
+	(void) setsid();
     }
     old_umask = umask(S_IWGRP | S_IWOTH);
-    (void) setsid();
 
     PRIV_START
 
--- at-3.1.8/atd.8.in.dontfork	2002-01-18 08:41:03.000000000 +0100
+++ at-3.1.8/atd.8.in	2006-08-23 12:18:38.000000000 +0200
@@ -1,5 +1,5 @@
 .Id $Id: atd.8.in,v 1.6 1997/09/28 20:00:26 ig25 Exp $
-.TH ATD 8 "Mar 1997" local "Linux Programmer's Manual"
+.TH ATD "8" "Mar 1997" "at-3.1.8" "Linux Programmer's Manual"
 .SH NAME
 atd \- run jobs queued for later execution
 .SH SYNOPSIS
@@ -10,6 +10,7 @@
 .IR batch_interval ]
 .RB [ -d ]
 .RB [ -s ]
+.RB [ -n ]
 .SH DESCRIPTION
 .B atd
 runs jobs queued by
@@ -46,6 +47,9 @@
 is installed as
 .B @prefix@/sbin/atrun
 for backward compatibility.
+.TP 8
+.B -n
+Don't fork option.
 .SH WARNING
 .B atd
 won't work if its spool directory is mounted via NFS even if
--- at-3.1.8/daemon.h.dontfork	1997-05-06 10:28:18.000000000 +0200
+++ at-3.1.8/daemon.h	2006-08-23 12:14:10.000000000 +0200
@@ -14,3 +14,5 @@
 perr (const char *fmt, ...);
 
 extern int daemon_debug;
+extern int daemon_nofork;
+


Index: at.spec
===================================================================
RCS file: /cvs/dist/rpms/at/devel/at.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- at.spec	12 Jul 2006 05:22:08 -0000	1.38
+++ at.spec	23 Aug 2006 11:46:32 -0000	1.39
@@ -4,7 +4,7 @@
 Summary: Job spooling tools.
 Name: at
 Version: 3.1.8
-Release: 81.2
+Release: 82%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.debian.org/debian/pool/main/a/at/at_3.1.8-11.tar.gz
@@ -39,6 +39,7 @@
 Patch32: at-3.1.8-pam_loginuid.patch
 Patch33: at-3.1.8-getseuserbyname.patch
 Patch34: at-3.1.8-install_no_chown.patch
+Patch35: at-3.1.8-dontfork.patch
 Prereq: fileutils chkconfig /etc/init.d
 BuildPrereq: flex bison autoconf
 BuildPrereq: libselinux-devel >= 1.27.9
@@ -105,6 +106,7 @@
 %patch32 -p1 -b .pam_loginuid
 %patch33 -p1 -b .getseuserbyname
 %patch34 -p1 -b .install_no_chown
+%patch35 -p1 -b .dontfork
 
 %build
 # patch10 touches configure.in
@@ -191,6 +193,9 @@
 %attr(4755,root,root)	%{_bindir}/at
 
 %changelog
+* Thu Aug 23 2006 Marcela Maslanova <mmaslano at redhat.com> - 3.1.8-82.fc6
+- #176486 don't fork option added (patch from Enrico Scholz)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1.8-81.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 12:05:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 08:05:00 -0400
Subject: rpms/kdeutils/devel kdeutils-3.5.4-kde#127341.patch, NONE,
	1.1 kdeutils.spec, 1.61, 1.62
Message-ID: <200608231205.k7NC50sw014887@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14838

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-3.5.4-kde#127341.patch 
Log Message:
apply upstream patch to fix ark crashes, kde#127341


kdeutils-3.5.4-kde#127341.patch:
 arch.cpp |    2 +-
 main.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdeutils-3.5.4-kde#127341.patch ---
Index: ark/arch.cpp
===================================================================
--- ark/arch.cpp	(Revision 576068)
+++ ark/arch.cpp	(Revision 576069)
@@ -193,9 +193,9 @@
     }
   }
   m_password = "";
-  emit sigExtract( success );
   delete _kp;
   _kp = m_currentProcess = 0;
+  emit sigExtract( success );
 }
 
 void Arch::unarchFile( QStringList *fileList, const QString & destDir,
Index: ark/main.cpp
===================================================================
--- ark/main.cpp	(Revision 576068)
+++ ark/main.cpp	(Revision 576069)
@@ -65,7 +65,7 @@
 extern "C" KDE_EXPORT int kdemain( int argc, char *argv[]  )
 {
 	KAboutData aboutData( "ark", I18N_NOOP( "Ark" ),
-	                      "2.6.3", I18N_NOOP( "KDE Archiving tool" ),
+	                      "2.6.4", I18N_NOOP( "KDE Archiving tool" ),
 	                      KAboutData::License_GPL,
 	                      I18N_NOOP( "(c) 1997-2006, The Various Ark Developers" )
 	                    );


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kdeutils.spec	10 Aug 2006 16:06:11 -0000	1.61
+++ kdeutils.spec	23 Aug 2006 12:04:57 -0000	1.62
@@ -11,7 +11,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Name: kdeutils
 Summary: K Desktop Environment - Utilities
 Epoch: 6
@@ -24,6 +24,9 @@
 Patch1: kdf-3.0.2-label.patch
 Patch2: kde-libtool.patch
 
+# upstream patches
+Patch100: kdeutils-3.5.4-kde#127341.patch
+
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post): /sbin/ldconfig
@@ -82,6 +85,9 @@
 %setup -q
 %patch1 -p1 -b .label
 
+#upstream patches
+%patch100 -p0 -b .kde#127341
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -172,6 +178,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Aug 23 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
+- apply upstream patch to fix ark crashes, kde#127341
+
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 12:43:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 08:43:00 -0400
Subject: rpms/kdeutils/devel kdeutils-3.5.4-kde#132420.patch, NONE,
	1.1 kdeutils.spec, 1.62, 1.63
Message-ID: <200608231243.k7NCh08f006124@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6074

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-3.5.4-kde#132420.patch 
Log Message:
apply upstream patch to fix kgpg crashes, kde#132420


kdeutils-3.5.4-kde#132420.patch:
 kgpgeditor.cpp |    8 ++++----
 kgpgeditor.h   |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE kdeutils-3.5.4-kde#132420.patch ---
Index: kgpg/kgpgeditor.h
===================================================================
--- kgpg/kgpgeditor.h	(Revision 569318)
+++ kgpg/kgpgeditor.h	(Revision 569319)
@@ -104,7 +104,7 @@
 private:
 
         QStringList customDecrypt;
-	KToggleAction *encodingAction ;
+	//KToggleAction *encodingAction ;
         KURL urlselected;
         KAction* fileSave, *editUndo, *editRedo;
 	KComboBox *fontCombo;
Index: kgpg/kgpgeditor.cpp
===================================================================
--- kgpg/kgpgeditor.cpp	(Revision 569318)
+++ kgpg/kgpgeditor.cpp	(Revision 569319)
@@ -164,9 +164,9 @@
 void KgpgApp::slotSetCharset()
 {
 ////////  work in progress
-if (encodingAction->isChecked())
-view->editor->setText(QString::fromUtf8(view->editor->text().ascii()));
-else
+//if (encodingAction->isChecked())
+//view->editor->setText(QString::fromUtf8(view->editor->text().ascii()));
+//else
 {
 if (checkEncoding(QTextCodec::codecForLocale ())) return;
 view->editor->setText(view->editor->text().utf8());
@@ -196,7 +196,7 @@
 void KgpgApp::slotResetEncoding(bool enc)
 {
 //kdDebug(2100)<<"Resetting encoding--------------------"<<endl;
-encodingAction->setChecked(enc);
+//encodingAction->setChecked(enc);
 //if (enc) slotSetCharset();
 }
 


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kdeutils.spec	23 Aug 2006 12:04:57 -0000	1.62
+++ kdeutils.spec	23 Aug 2006 12:42:46 -0000	1.63
@@ -26,6 +26,7 @@
 
 # upstream patches
 Patch100: kdeutils-3.5.4-kde#127341.patch
+Patch101: kdeutils-3.5.4-kde#132420.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -87,6 +88,7 @@
 
 #upstream patches
 %patch100 -p0 -b .kde#127341
+%patch101 -p0 -b .kde#132420
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -180,6 +182,7 @@
 %changelog
 * Wed Aug 23 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
 - apply upstream patch to fix ark crashes, kde#127341
+- apply upstream patch to fix kgpg crashes, kde#132420
 
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
 - rebuild



From fedora-cvs-commits at redhat.com  Wed Aug 23 12:58:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 08:58:01 -0400
Subject: rpms/ltrace/devel ltrace.spec,1.44,1.45
Message-ID: <200608231258.k7NCw1M6025610@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25416

Modified Files:
	ltrace.spec 
Log Message:
Turn off testsuite on ppc for now, it doesn't pass.



Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ltrace.spec	22 Aug 2006 12:28:50 -0000	1.44
+++ ltrace.spec	23 Aug 2006 12:57:59 -0000	1.45
@@ -45,7 +45,9 @@
 
 %check
 echo ====================TESTING=========================
+%ifarch ppc
 make check
+%endif
 echo ====================TESTING END=====================
 
 %clean



From fedora-cvs-commits at redhat.com  Wed Aug 23 12:58:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 08:58:44 -0400
Subject: rpms/ltrace/devel ltrace.spec,1.45,1.46
Message-ID: <200608231258.k7NCwiCi025908@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25844

Modified Files:
	ltrace.spec 
Log Message:
and bump up release



Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ltrace.spec	23 Aug 2006 12:57:59 -0000	1.45
+++ ltrace.spec	23 Aug 2006 12:58:42 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 1.1.45svn%{?dist}
+Release: 1.2.45svn%{?dist}
 Source: ltrace-0.5.tar.gz
 Patch0: 1152117672-exec-patch
 Patch1: 1153220107-fork-patch



From fedora-cvs-commits at redhat.com  Wed Aug 23 13:04:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 09:04:45 -0400
Subject: rpms/ltrace/devel ltrace.spec,1.46,1.47
Message-ID: <200608231304.k7ND4j3W027286@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27136

Modified Files:
	ltrace.spec 
Log Message:
no comment :-/



Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ltrace.spec	23 Aug 2006 12:58:42 -0000	1.46
+++ ltrace.spec	23 Aug 2006 13:04:42 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 1.2.45svn%{?dist}
+Release: 1.3.45svn%{?dist}
 Source: ltrace-0.5.tar.gz
 Patch0: 1152117672-exec-patch
 Patch1: 1153220107-fork-patch
@@ -46,6 +46,7 @@
 %check
 echo ====================TESTING=========================
 %ifarch ppc
+%else
 make check
 %endif
 echo ====================TESTING END=====================



From fedora-cvs-commits at redhat.com  Wed Aug 23 13:18:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 09:18:19 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.4-kde#131933.patch, NONE,
	1.1 kdelibs.spec, 1.168, 1.169
Message-ID: <200608231318.k7NDIJP6006100@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5821

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.4-kde#131933.patch 
Log Message:
apply upstream patch to fix crash when pressing enter inside a doxygen comment block, kde#131933



kdelibs-3.5.4-kde#131933.patch:
 kateautoindent.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.4-kde#131933.patch ---
Index: kate/part/kateautoindent.cpp
===================================================================
--- kate/part/kateautoindent.cpp	(Revision 570245)
+++ kate/part/kateautoindent.cpp	(Revision 570246)
@@ -1494,7 +1494,7 @@
   bool doxygenAutoInsert = doc->config()->configFlags() & KateDocumentConfig::cfDoxygenAutoTyping;
 
   // starts with *: indent one space more to line up *s
-  if ( textLine->stringAtPos(first, "*") )
+  if ( first > 0 && textLine->stringAtPos(first, "*") )
     indent = indent + " ";
   // does not start with *: insert one if user wants that
   else if ( doxygenAutoInsert )


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kdelibs.spec	8 Aug 2006 16:01:08 -0000	1.168
+++ kdelibs.spec	23 Aug 2006 13:18:15 -0000	1.169
@@ -17,7 +17,7 @@
 %define arts 1
 
 Version: 3.5.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -46,6 +46,9 @@
 Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
 Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
 
+# upstream patches
+Patch100: kdelibs-3.5.4-kde#131933.patch
+
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
 %endif
@@ -173,6 +176,9 @@
 %patch37 -p1 -b .kdebug-kmail-quiet
 %patch38 -p1 -b .cupsdconf2-group
 
+# upstream pathces
+%patch100 -p0 -b .kde#131933
+
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
 %build
@@ -398,6 +404,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Wed Aug 23 2006 Than Ngo <than at redhat.com> 6:3.5.4-3
+- apply upstream patch to fix crash when pressing enter inside a doxygen comment block, kde#131933
+
 * Tue Aug 08 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
 - add BR on gettext, cups
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 13:54:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 09:54:44 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.4-kde#106812.patch, NONE,
	1.1 kdelibs-3.5.4-kde#131366.patch, NONE, 1.1 kdelibs.spec,
	1.169, 1.170
Message-ID: <200608231354.k7NDsi2Z016345@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16328

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.4-kde#106812.patch kdelibs-3.5.4-kde#131366.patch 
Log Message:
fix kde#131933, crash when pressing enter inside a doxygen comment block
fix kde#106812, text-align of tables should only be reset in quirk mode


kdelibs-3.5.4-kde#106812.patch:
 html4.css  |    1 -
 quirks.css |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.4-kde#106812.patch ---
Index: khtml/css/html4.css
===================================================================
--- khtml/css/html4.css	(Revision 576075)
+++ khtml/css/html4.css	(Revision 576076)
@@ -170,7 +170,6 @@
 table {
 	display: table;
 	border-collapse: separate;
-	text-align: -khtml-auto;
 	border-spacing: 2px;
         -khtml-flow-mode: -khtml-around-floats;
         box-sizing: border-box;
Index: khtml/css/quirks.css
===================================================================
--- khtml/css/quirks.css	(Revision 576075)
+++ khtml/css/quirks.css	(Revision 576076)
@@ -24,6 +24,7 @@
     color: -khtml-text;
     font-size: medium;
     empty-cells: hide;
+    text-align: -khtml-auto;
 }
 
 LAYER {

kdelibs-3.5.4-kde#131366.patch:
 render_line.cpp |    6 +++---
 render_line.h   |   11 +++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-3.5.4-kde#131366.patch ---
Index: khtml/rendering/render_line.cpp
===================================================================
--- khtml/rendering/render_line.cpp	(Revision 576083)
+++ khtml/rendering/render_line.cpp	(Revision 576084)
@@ -441,7 +441,7 @@
         else if (curr->yPos() == PositionBottom)
             curr->setYPos(y + maxHeight - curr->height());
         else {
-            if (!curr->hasTextChildren() && !strictMode)
+            if (!strictMode && !curr->hasTextDescendant())
                 childAffectsTopBottomPos = false;
             curr->setYPos(curr->yPos() + y + maxAscent - curr->baseline());
         }
@@ -499,7 +499,7 @@
             setBaseline(ascent);
         }
 #endif
-        if (hasTextChildren() || strictMode) {
+        if (hasTextDescendant() || strictMode) {
             if (yPos() < topPosition)
                 topPosition = yPos();
             if (yPos() + height() > bottomPosition)
@@ -520,7 +520,7 @@
     }
 
     // See if we have text children. If not, then we need to shrink ourselves to fit on the line.
-    if (!hasTextChildren()) {
+    if (!hasTextDescendant()) {
         if (yPos() < topPos)
             setYPos(topPos);
         if (yPos() + height() > bottomPos)
Index: khtml/rendering/render_line.h
===================================================================
--- khtml/rendering/render_line.h	(Revision 576083)
+++ khtml/rendering/render_line.h	(Revision 576084)
@@ -96,6 +96,7 @@
     int baseline() const { return m_baseline; }
 
     virtual bool hasTextChildren() const { return true; }
+    virtual bool hasTextDescendant() const { return true; }
 
     virtual int topOverflow() const { return yPos(); }
     virtual int bottomOverflow() const { return yPos()+height(); }
@@ -155,6 +156,7 @@
         m_lastChild = 0;
         m_includeLeftEdge = m_includeRightEdge = false;
         m_hasTextChildren = false;
+        m_hasTextDescendant = false;
         m_afterPageBreak = false;
     }
 
@@ -180,8 +182,11 @@
         }
         child->setFirstLineStyleBit(m_firstLine);
         child->setParent(this);
-        if (child->isInlineTextBox())
-            m_hasTextChildren = true;
+        if (!m_hasTextChildren && child->isInlineTextBox()) {
+            m_hasTextDescendant = m_hasTextChildren = true;
+            for (InlineFlowBox* p = m_parent; p && !p->hasTextDescendant(); p = p->parent())
+                p->m_hasTextDescendant = true;
+        }
     }
     void removeFromLine(InlineBox* child);
     virtual void paintBackgroundAndBorder(RenderObject::PaintInfo&, int _tx, int _ty, int xOffsetOnLine);
@@ -207,6 +212,7 @@
         m_includeRightEdge = includeRight;
     }
     virtual bool hasTextChildren() const { return m_hasTextChildren; }
+    bool hasTextDescendant() const { return m_hasTextDescendant; }
 
     // Helper functions used during line construction and placement.
     void determineSpacingForFlowBoxes(bool lastLine, RenderObject* endObject);
@@ -235,6 +241,7 @@
     bool m_includeLeftEdge : 1;
     bool m_includeRightEdge : 1;
     bool m_hasTextChildren : 1;
+    bool m_hasTextDescendant : 1;
     bool m_afterPageBreak : 1;
 };
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kdelibs.spec	23 Aug 2006 13:18:15 -0000	1.169
+++ kdelibs.spec	23 Aug 2006 13:54:42 -0000	1.170
@@ -48,6 +48,8 @@
 
 # upstream patches
 Patch100: kdelibs-3.5.4-kde#131933.patch
+Patch101: kdelibs-3.5.4-kde#131366.patch
+Patch102: kdelibs-3.5.4-kde#106812.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -178,6 +180,8 @@
 
 # upstream pathces
 %patch100 -p0 -b .kde#131933
+%patch101 -p0 -b .kde#131366
+%patch102 -p0 -b .kde#106812
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -405,7 +409,10 @@
 
 %changelog
 * Wed Aug 23 2006 Than Ngo <than at redhat.com> 6:3.5.4-3
-- apply upstream patch to fix crash when pressing enter inside a doxygen comment block, kde#131933
+- apply upstream patches
+   fix kde#131366, Padding-bottom and padding-top not applied to inline elements
+   fix kde#131933, crash when pressing enter inside a doxygen comment block
+   fix kde#106812, text-align of tables should only be reset in quirk mode
 
 * Tue Aug 08 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
 - add BR on gettext, cups



From fedora-cvs-commits at redhat.com  Wed Aug 23 13:58:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 09:58:36 -0400
Subject: rpms/gnucash/FC-5 gnucash.spec,1.18.2.21,1.18.2.22
Message-ID: <200608231358.k7NDwac0016457@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16433/FC-5

Modified Files:
      Tag: gnucash-g2-branch
	gnucash.spec 
Log Message:
learn how to type!k



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/gnucash.spec,v
retrieving revision 1.18.2.21
retrieving revision 1.18.2.22
diff -u -r1.18.2.21 -r1.18.2.22
--- gnucash.spec	22 Aug 2006 19:47:36 -0000	1.18.2.21
+++ gnucash.spec	23 Aug 2006 13:58:34 -0000	1.18.2.22
@@ -152,7 +152,7 @@
 
 %changelog
 * Tue Aug 22 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-4
-- require perl-Cyrpt-SSLeay (#203050)
+- require perl-Crypt-SSLeay (#203050)
 
 * Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-3
 - require yelp (#202266)



From fedora-cvs-commits at redhat.com  Wed Aug 23 13:58:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 09:58:36 -0400
Subject: rpms/gnucash/devel gnucash.spec,1.54,1.55
Message-ID: <200608231358.k7NDwa78016473@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16433/devel

Modified Files:
	gnucash.spec 
Log Message:
learn how to type!k



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnucash.spec	22 Aug 2006 19:46:26 -0000	1.54
+++ gnucash.spec	23 Aug 2006 13:58:34 -0000	1.55
@@ -152,7 +152,7 @@
 
 %changelog
 * Tue Aug 22 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-4
-- require perl-Cyrpt-SSLeay (#203050)
+- require perl-Crypt-SSLeay (#203050)
 
 * Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-3
 - require yelp (#202266)



From fedora-cvs-commits at redhat.com  Wed Aug 23 14:22:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 10:22:17 -0400
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.6.1-use-mtdriver.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.39, 1.40
Message-ID: <200608231422.k7NEMHN4032005@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31989

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.6.1-use-mtdriver.patch 
Log Message:
* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-10.fc6
- radeon-6.6.1-use-mtdriver.patch: Use new M_T_DRIVER mode type for mode
  synthesis.
- Bump Requires to match.


radeon-6.6.1-use-mtdriver.patch:
 radeon_driver.c |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

--- NEW FILE radeon-6.6.1-use-mtdriver.patch ---
--- xf86-video-ati-6.6.1/src/radeon_driver.c.mtdriver	2006-08-18 15:13:54.000000000 -0400
+++ xf86-video-ati-6.6.1/src/radeon_driver.c	2006-08-18 15:50:44.000000000 -0400
@@ -3271,6 +3271,7 @@
     int             j, tmp;
     char            stmp[32];
     xf86MonPtr      ddc   = pScrn->monitor->DDC;
+    int		    preferred = 1;
 
     /* Go thru detailed timing table first */
     for (j = 0; j < 4; j++) {
@@ -3299,7 +3300,11 @@
 	    new->Clock      = d_timings->clock / 1000;
 	    new->Flags      = (d_timings->interlaced ? V_INTERLACE : 0);
 	    new->status     = MODE_OK;
-	    new->type       = M_T_DEFAULT;
+	    new->type       = M_T_DRIVER;
+	    if (preferred) {
+		new->type |= M_T_PREFERRED;
+		preferred = 0;
+	    }
 
 	    if (d_timings->sync == 3) {
 		switch (d_timings->misc) {
@@ -3337,7 +3342,7 @@
 		    new->name = xnfalloc(strlen(p->name) + 1);
 		    strcpy(new->name, p->name);
 		    new->status = MODE_OK;
-		    new->type   = M_T_DEFAULT;
+		    new->type   = M_T_DRIVER;
 
 		    count++;
 
@@ -3369,7 +3374,7 @@
 			new->name = xnfalloc(strlen(p->name) + 1);
 			strcpy(new->name, p->name);
 			new->status = MODE_OK;
-			new->type   = M_T_DEFAULT;
+			new->type   = M_T_DRIVER;
 
 			count++;
 
@@ -3706,7 +3711,7 @@
 		new->Clock      = info->DotClock;
 		new->Flags     |= RADEON_USE_RMX;
 
-		new->type      |= M_T_DEFAULT;
+		new->type      |= M_T_DRIVER;
 
 		new->next       = NULL;
 		new->prev       = last;
@@ -3888,6 +3893,9 @@
      * 'stretched' from their native mode.
      */
     if (info->MergeType == MT_CRT && !info->ddc_mode) {
+
+	if (pScrn->monitor->DDC)
+	    xf86SetDDCproperties(pScrn, pScrn->monitor->DDC);
  
 	modesFound =
 	    xf86ValidateModes(pScrn,
@@ -4154,6 +4162,9 @@
      */
     if (info->DisplayType == MT_CRT && !info->ddc_mode) {
 
+	if (pScrn->monitor->DDC)
+	    xf86SetDDCproperties(pScrn, pScrn->monitor->DDC);
+
 	modesFound =
 	    xf86ValidateModes(pScrn,
 			      pScrn->monitor->Modes,


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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-drv-ati.spec	18 Aug 2006 14:52:56 -0000	1.39
+++ xorg-x11-drv-ati.spec	23 Aug 2006 14:22:15 -0000	1.40
@@ -28,6 +28,7 @@
 Patch0:    radeon-6.6.1-dotclock-filter.patch
 Patch1:    radeon-6.6.1-no-dri-on-rn50.patch
 Patch2:    radeon-6.6.1-xpress-200.patch
+Patch3:	   radeon-6.6.1-use-mtdriver.patch
 
 # Rage 128 patches (100-199)
 Patch100:  r128-missing-xf86ForceHWCursor-symbol-bug168753.patch
@@ -38,13 +39,13 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.1.0-12
+BuildRequires: xorg-x11-server-sdk >= 1.1.1-24
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.4-4
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 
-Requires:  xorg-x11-server-Xorg >= 1.1.0-12
+Requires:  xorg-x11-server-Xorg >= 1.1.1-24
 
 %description 
 X.Org X11 ati video driver.
@@ -55,6 +56,7 @@
 %patch0 -p1 -b .dotclock-filter
 %patch1 -p1 -b .rn50-dri
 %patch2 -p1 -b .xpress-200
+%patch3 -p1 -b .mtdriver
 %patch100 -p0 -b .r128-missing-xf86ForceHWCursor-symbol-bug168753
 %patch200 -p1 -b .mach64-for-ia64
 
@@ -100,6 +102,11 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-10.fc6
+- radeon-6.6.1-use-mtdriver.patch: Use new M_T_DRIVER mode type for mode
+  synthesis.
+- Bump Requires to match.
+
 * Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-9.fc6
 - mach64-cpio-for-ia64.patch: Enable CPIO for mach64 on ia64. (#203017)
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 14:23:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 10:23:07 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.40,1.41
Message-ID: <200608231423.k7NEN7kx032076@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32062

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
bump


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xorg-x11-drv-ati.spec	23 Aug 2006 14:22:15 -0000	1.40
+++ xorg-x11-drv-ati.spec	23 Aug 2006 14:23:04 -0000	1.41
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support



From fedora-cvs-commits at redhat.com  Wed Aug 23 14:28:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 10:28:19 -0400
Subject: rpms/mesa/devel mesa-6.5.1-selinux-awareness.patch,1.2,1.3
Message-ID: <200608231428.k7NESJPS032223@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32208

Modified Files:
	mesa-6.5.1-selinux-awareness.patch 
Log Message:
Add missing chunk to selinux patch.

mesa-6.5.1-selinux-awareness.patch:
 configs/linux-dri                            |    3 ++-
 src/mesa/drivers/dri/r200/r200_context.c     |   15 +++++++++++----
 src/mesa/drivers/dri/r200/r200_context.h     |    1 +
 src/mesa/drivers/dri/radeon/radeon_context.c |   16 ++++++++++++----
 src/mesa/drivers/dri/radeon/radeon_context.h |    1 +
 src/mesa/main/execmem.c                      |   20 ++++++++++++++++----
 src/mesa/shader/slang/slang_execute_x86.c    |    3 ++-
 src/mesa/tnl/t_vb_arbprogram_sse.c           |    3 ++-
 src/mesa/tnl/t_vertex_sse.c                  |    8 ++++++--
 src/mesa/x86/rtasm/x86sse.c                  |    8 +++++---
 src/mesa/x86/rtasm/x86sse.h                  |    4 ++--
 11 files changed, 60 insertions(+), 22 deletions(-)

Index: mesa-6.5.1-selinux-awareness.patch
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.5.1-selinux-awareness.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mesa-6.5.1-selinux-awareness.patch	23 Aug 2006 01:13:00 -0000	1.2
+++ mesa-6.5.1-selinux-awareness.patch	23 Aug 2006 14:28:14 -0000	1.3
@@ -1,5 +1,5 @@
 --- ./src/mesa/x86/rtasm/x86sse.h.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
-+++ ./src/mesa/x86/rtasm/x86sse.h	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/x86/rtasm/x86sse.h	2006-08-22 21:14:45.000000000 -0400
 @@ -80,8 +80,8 @@
   */
  
@@ -12,7 +12,7 @@
  void (*x86_get_func( struct x86_function *p ))( void );
  
 --- ./src/mesa/x86/rtasm/x86sse.c.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
-+++ ./src/mesa/x86/rtasm/x86sse.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/x86/rtasm/x86sse.c	2006-08-22 21:14:45.000000000 -0400
 @@ -1063,15 +1063,17 @@
  }
  
@@ -35,7 +35,7 @@
  
  void x86_release_func( struct x86_function *p )
 --- ./src/mesa/main/execmem.c.selinux-awareness	2006-05-10 05:00:16.000000000 -0400
-+++ ./src/mesa/main/execmem.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/main/execmem.c	2006-08-22 21:14:45.000000000 -0400
 @@ -36,7 +36,7 @@
  
  
@@ -101,7 +101,7 @@
     
     return addr;
 --- ./src/mesa/tnl/t_vb_arbprogram_sse.c.selinux-awareness	2006-06-01 18:56:40.000000000 -0400
-+++ ./src/mesa/tnl/t_vb_arbprogram_sse.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/tnl/t_vb_arbprogram_sse.c	2006-08-22 21:14:45.000000000 -0400
 @@ -1298,7 +1298,8 @@
        p->compiled_func = NULL;
     }
@@ -113,7 +113,7 @@
     cp.fpucntl = RESTORE_FPU;
  
 --- ./src/mesa/tnl/t_vertex_sse.c.selinux-awareness	2005-09-16 14:14:25.000000000 -0400
-+++ ./src/mesa/tnl/t_vertex_sse.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/tnl/t_vertex_sse.c	2006-08-22 21:14:45.000000000 -0400
 @@ -348,7 +348,8 @@
     struct x86_reg vp1 = x86_make_reg(file_XMM, 2);
     GLubyte *fixup, *label;
@@ -136,8 +136,18 @@
  
     if (build_vertex_emit(&p)) {
        _tnl_register_fastpath( vtx, GL_TRUE );
+--- ./src/mesa/drivers/dri/radeon/radeon_context.h.selinux-awareness	2006-04-11 07:41:11.000000000 -0400
++++ ./src/mesa/drivers/dri/radeon/radeon_context.h	2006-08-23 10:23:20.000000000 -0400
+@@ -778,6 +778,7 @@
+    GLuint TexMatColSwap;
+    GLmatrix tmpmat[RADEON_MAX_TEXTURE_UNITS];
+    GLuint last_ReallyEnabled;
++   GLint tcl_mode;
+ 
+    /* VBI
+     */
 --- ./src/mesa/drivers/dri/radeon/radeon_context.c.selinux-awareness	2006-04-09 13:48:28.000000000 -0400
-+++ ./src/mesa/drivers/dri/radeon/radeon_context.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/drivers/dri/radeon/radeon_context.c	2006-08-22 21:14:45.000000000 -0400
 @@ -471,11 +471,20 @@
     }
  
@@ -172,7 +182,7 @@
        }
  
 --- ./src/mesa/drivers/dri/r200/r200_context.c.selinux-awareness	2006-06-09 20:51:54.000000000 -0400
-+++ ./src/mesa/drivers/dri/r200/r200_context.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/drivers/dri/r200/r200_context.c	2006-08-22 21:14:45.000000000 -0400
 @@ -546,11 +546,19 @@
     }
  
@@ -205,8 +215,8 @@
  	    r200VtxfmtDestroy( rmesa->glCtx );
        }
  
---- ./src/mesa/drivers/dri/r200/r200_context.h.selinux-awareness	2006-08-22 21:06:15.000000000 -0400
-+++ ./src/mesa/drivers/dri/r200/r200_context.h	2006-08-22 21:06:44.000000000 -0400
+--- ./src/mesa/drivers/dri/r200/r200_context.h.selinux-awareness	2006-07-20 12:49:57.000000000 -0400
++++ ./src/mesa/drivers/dri/r200/r200_context.h	2006-08-22 21:14:45.000000000 -0400
 @@ -990,6 +990,7 @@
     GLuint TexGenEnabled;
     GLuint TexGenCompSel;
@@ -216,7 +226,7 @@
     /* VBI / buffer swap
      */
 --- ./src/mesa/shader/slang/slang_execute_x86.c.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
-+++ ./src/mesa/shader/slang/slang_execute_x86.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/shader/slang/slang_execute_x86.c	2006-08-22 21:14:45.000000000 -0400
 @@ -666,7 +666,8 @@
  	 * The built-in library occupies 450K, so we can be safe for now.
  	 * It is going to change in the future, when we get assembly analysis running.
@@ -227,8 +237,8 @@
  	G.r_eax = x86_make_reg (file_REG32, reg_AX);
  	G.r_ecx = x86_make_reg (file_REG32, reg_CX);
  	G.r_edx = x86_make_reg (file_REG32, reg_DX);
---- ./configs/linux-dri.selinux-awareness	2006-08-22 20:51:02.000000000 -0400
-+++ ./configs/linux-dri	2006-08-22 20:51:02.000000000 -0400
+--- ./configs/linux-dri.selinux-awareness	2006-08-22 21:14:45.000000000 -0400
++++ ./configs/linux-dri	2006-08-22 21:14:45.000000000 -0400
 @@ -38,7 +38,8 @@
  
  LIBDRM_CFLAGS = `pkg-config --cflags libdrm`



From fedora-cvs-commits at redhat.com  Wed Aug 23 14:36:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 10:36:14 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2519.4.7,1.2519.4.8
Message-ID: <200608231436.k7NEaEax032387@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32367

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Log Message:
added config options for modsigning




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.7
retrieving revision 1.2519.4.8
diff -u -r1.2519.4.7 -r1.2519.4.8
--- kernel-2.6.spec	23 Aug 2006 00:09:48 -0000	1.2519.4.7
+++ kernel-2.6.spec	23 Aug 2006 14:36:11 -0000	1.2519.4.8
@@ -1728,6 +1728,9 @@
 %endif
 
 %changelog
+* Wed Aug 23 2006 Don Zickus <dzickus at redhat.com>
+- apparently a broken modsigning had missing options, fixed that
+
 * Tue Aug 22 2006 Don Zickus <dzickus at redhat.com>
 - added #202778 possible recursive lock detected (Peter Zijlstr)
 - added #201852 connectathon tests failing (Steve Dickson)



From fedora-cvs-commits at redhat.com  Wed Aug 23 14:36:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 10:36:14 -0400
Subject: rpms/kernel/devel/configs config-generic,1.237.8.4,1.237.8.5
Message-ID: <200608231436.k7NEaE3b032396@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv32367/configs

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-generic 
Log Message:
added config options for modsigning




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237.8.4
retrieving revision 1.237.8.5
diff -u -r1.237.8.4 -r1.237.8.5
--- config-generic	23 Aug 2006 00:10:05 -0000	1.237.8.4
+++ config-generic	23 Aug 2006 14:36:12 -0000	1.237.8.5
@@ -2595,6 +2595,9 @@
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_SIGNATURE=y
+CONFIG_CRYPTO_SIGNATURE_DSA=y
+CONFIG_CRYPTO_MPILIB=y
 
 #
 # Library routines



From fedora-cvs-commits at redhat.com  Wed Aug 23 14:51:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 10:51:22 -0400
Subject: rpms/eel2/devel eel-2.15.92-dndcrash.patch, NONE, 1.1 eel2.spec,
	1.55, 1.56
Message-ID: <200608231451.k7NEpMlO027586@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27509

Modified Files:
	eel2.spec 
Added Files:
	eel-2.15.92-dndcrash.patch 
Log Message:
* Wed Aug 23 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92-2
- fix dnd crash from firefox (#203678)



eel-2.15.92-dndcrash.patch:
 eel-vfs-extensions.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE eel-2.15.92-dndcrash.patch ---
Index: eel/eel-vfs-extensions.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-vfs-extensions.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- eel/eel-vfs-extensions.c	24 May 2006 13:22:25 -0000	1.22
+++ eel/eel-vfs-extensions.c	23 Aug 2006 13:10:38 -0000	1.23
@@ -1144,6 +1144,10 @@ eel_vfs_has_capability (const char      
 
 	uri = gnome_vfs_uri_new (text_uri);
 
+	if (uri == NULL) {
+		return FALSE;
+	}
+	
 	ret = eel_vfs_has_capability_uri (uri, capability);
 	
 	gnome_vfs_uri_unref (uri);


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- eel2.spec	21 Aug 2006 16:37:54 -0000	1.55
+++ eel2.spec	23 Aug 2006 14:51:18 -0000	1.56
@@ -16,13 +16,15 @@
 Name:		eel2
 Summary:        Eazel Extensions Library
 Version: 	2.15.92
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
 URL: 		http://www.gnome.org/projects/nautilus/
 BuildRoot:	/var/tmp/%{name}-%{version}-root
 
+Patch1: eel-2.15.92-dndcrash.patch
+
 Requires: pango >= %{pango_version}
 Requires: gtk2 >= %{gtk2_version}
 Requires: libgnomeui >= %{libgnomeui_version}
@@ -74,6 +76,7 @@
 
 %prep
 %setup -q -n eel-%{version}
+%patch1 -p0 -b .dndcrash
 
 %build
 %configure
@@ -109,6 +112,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Wed Aug 23 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92-2
+- fix dnd crash from firefox (#203678)
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 15:06:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 11:06:48 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2519.4.8,1.2519.4.9
Message-ID: <200608231506.k7NF6m4Z031841@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31649

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Log Message:

i think modsigining is finally ready to go...



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.8
retrieving revision 1.2519.4.9
diff -u -r1.2519.4.8 -r1.2519.4.9
--- kernel-2.6.spec	23 Aug 2006 14:36:11 -0000	1.2519.4.8
+++ kernel-2.6.spec	23 Aug 2006 15:06:44 -0000	1.2519.4.9
@@ -794,12 +794,12 @@
 #
 # GPG signed kernel modules
 #
-#%patch900 -p1
-#%patch901 -p1
-#%patch902 -p1
-#%patch903 -p1
-#%patch904 -p1
-#%patch905 -p1
+%patch900 -p1
+%patch901 -p1
+%patch902 -p1
+%patch903 -p1
+%patch904 -p1
+%patch905 -p1
 
 # Tux
 %patch910 -p1
@@ -1729,6 +1729,10 @@
 
 %changelog
 * Wed Aug 23 2006 Don Zickus <dzickus at redhat.com>
+- modsigning was fixed, but I never enabled applying the patches
+  too many late nights
+  
+* Wed Aug 23 2006 Don Zickus <dzickus at redhat.com>
 - apparently a broken modsigning had missing options, fixed that
 
 * Tue Aug 22 2006 Don Zickus <dzickus at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Aug 23 15:15:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 11:15:18 -0400
Subject: rpms/python-pyblock/devel .cvsignore, 1.17, 1.18 python-pyblock.spec,
	1.28, 1.29 sources, 1.21, 1.22
Message-ID: <200608231515.k7NFFIkV001385@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/python-pyblock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1353

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
- 0.19-1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	17 Aug 2006 19:46:35 -0000	1.17
+++ .cvsignore	23 Aug 2006 15:15:15 -0000	1.18
@@ -1 +1 @@
-pyblock-0.18.tar.bz2
+pyblock-0.19.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- python-pyblock.spec	17 Aug 2006 19:46:35 -0000	1.28
+++ python-pyblock.spec	23 Aug 2006 15:15:15 -0000	1.29
@@ -5,8 +5,8 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.18
-Release: 2
+Version: 0.19
+Release: 1
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
@@ -39,6 +39,10 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Wed Aug 23 2006 Peter Jones <pjones at redhat.com> - 0.19-1
+- Make RaidSet deactivation work like MultiPath deactivation.  Fixes a
+  traceback when removing partition maps.
+
 * Thu Aug 17 2006 Peter Jones <pjones at redhat.com> - 0.18-2
 - No s390/s390x excludearch
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	17 Aug 2006 19:46:35 -0000	1.21
+++ sources	23 Aug 2006 15:15:15 -0000	1.22
@@ -1 +1 @@
-c14235f360c01b85f77a225448ffcc12  pyblock-0.18.tar.bz2
+609788dc09e8967dff044597b9d7d769  pyblock-0.19.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 23 15:33:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 11:33:29 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.25, 1.26 setroubleshoot.spec,
	1.30, 1.31 sources, 1.28, 1.29
Message-ID: <200608231533.k7NFXTAH021220@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21167/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.32-1 on branch devel from setroubleshoot-0.32-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	22 Aug 2006 23:17:30 -0000	1.25
+++ .cvsignore	23 Aug 2006 15:33:26 -0000	1.26
@@ -1 +1 @@
-setroubleshoot-0.31.tar.gz
+setroubleshoot-0.32.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- setroubleshoot.spec	22 Aug 2006 23:17:30 -0000	1.30
+++ setroubleshoot.spec	23 Aug 2006 15:33:27 -0000	1.31
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.31
+Version: 0.32
 Release: 1
 License: GPL
 Group: Applications/System
@@ -107,6 +107,23 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Tue Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.32-1
+- Add avc_syslog to syslog translated avc message
+- Fix submitbug button
+-  John Dennis  Changes
+	* fix signature inflation, all data attached to a signature is now
+	encapsulated in a SEFaultSignatureInfo (siginfo) class. The GUI no
+	longer reaches into a signature looking for information, it looks
+	in the siginfo. The Plugin class now defines the method
+	get_signature() which report() calls to obtain the signature. The
+	default signature provided by the Plugin class includes the
+	analysisID, an AVC with just the src & target contexts, and the
+	object_path. All data accesses and parameters which had been "sig
+	and solution" are now done via the unified siginfo class. There is
+	still a bit more work to be done on this but this represents a
+	reasonble point to checkpoint the code in CVS.
+
+
 * Tue Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.31-1
 - Fix desktop
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	22 Aug 2006 23:17:30 -0000	1.28
+++ sources	23 Aug 2006 15:33:27 -0000	1.29
@@ -1 +1 @@
-6e49a12967555d386a16fc1cb27a462f  setroubleshoot-0.31.tar.gz
+3e9877c1abd9976ea697fb3c2ebec5ff  setroubleshoot-0.32.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 23 15:36:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 11:36:17 -0400
Subject: rpms/cscope/devel cscope-15.5-fscanf-overflows.patch, NONE,
	1.1 cscope.spec, 1.27, 1.28
Message-ID: <200608231536.k7NFaHGY021788@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/cscope/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21760

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.5-fscanf-overflows.patch 
Log Message:
checking in fix for bz 203651

cscope-15.5-fscanf-overflows.patch:
 build.c     |   10 +++++-----
 command.c   |    2 +-
 constants.h |    8 ++++++++
 dir.c       |    2 +-
 display.c   |    2 +-
 edit.c      |    4 ++--
 input.c     |   17 ++++++++---------
 main.c      |   17 ++++++++++++-----
 8 files changed, 38 insertions(+), 24 deletions(-)

--- NEW FILE cscope-15.5-fscanf-overflows.patch ---
--- cscope-15.5/src/display.c.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/display.c	2006-08-23 10:19:41.000000000 -0400
@@ -217,7 +217,7 @@
 		     disprefs < mdisprefs && screenline <= lastdispline;
 		     ++disprefs, ++screenline) {
 			/* read the reference line */
-			if (fscanf(refsfound, "%s%s%s %[^\n]", file, function, 
+			if (fscanf(refsfound, "%" PATHLEN_STR "s%" PATHLEN_STR "s%" NUMLEN_STR "s %" TEMPSTRING_LEN_STR "[^\n]", file, function,
 			    linenum, tempstring) < 4) {
 				break;
 			}
--- cscope-15.5/src/input.c.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/input.c	2006-08-23 10:57:01.000000000 -0400
@@ -293,16 +293,15 @@
 		/* if the login name is null, then use $HOME */
 		if (*out == '\0') {
 			v = getenv("HOME");
-		}
-		else {	/* get the home directory of the login name */
+		} else { /* get the home directory of the login name */
 			v = logdir(out);
 		}
-		/* copy the directory name */
-		if (v != NULL) {
+		/* copy the directory name if it isn't too big */
+		if (v != NULL && strlen(v) < (lastchar - out)) {
 			(void) strcpy(out - 1, v);
 			out += strlen(v) - 1;
-		}
-		else {	/* login not found, so ~ must be part of the file name */
+		} else {
+			/* login not found, so ~ must be part of the file name */
 			out += strlen(out);
 		}
 	}
@@ -322,11 +321,11 @@
 			*s = '\0';
 	
 			/* get its value */
-			if ((v = getenv(out)) != NULL) {
+			if ((v = getenv(out)) != NULL && strlen(v) < (lastchar - out)) {
 				(void) strcpy(out - 1, v);
 				out += strlen(v) - 1;
-			}
-			else {	/* var not found, so $ must be part of the file name */
+			} else {
+				/* var not found, so $ must be part of the file name */
 				out += strlen(out);
 			}
 		}
--- cscope-15.5/src/edit.c.orig	2001-07-18 09:49:01.000000000 -0400
+++ cscope-15.5/src/edit.c	2006-08-23 10:16:30.000000000 -0400
@@ -60,7 +60,7 @@
 	seekline(i + topline);
 	
 	/* get the file name and line number */
-	if (fscanf(refsfound, "%s%*s%s", file, linenum) == 2) {
+	if (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s", file, linenum) == 2) {
 		edit(file, linenum);	/* edit it */
 	}
 	seekline(topline);	/* restore the line pointer */
@@ -83,7 +83,7 @@
 	seekline(1);
 	
 	/* get each file name and line number */
-	while (fscanf(refsfound, "%s%*s%s%*[^\n]", file, linenum) == 2) {
+	while (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", file, linenum) == 2) {
 		edit(file, linenum);	/* edit it */
 		if (editallprompt == YES) {
 			addstr("Type ^D to stop editing all lines, or any other character to continue: ");
--- cscope-15.5/src/command.c.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/command.c	2006-08-23 10:08:50.000000000 -0400
@@ -727,7 +727,7 @@
 	(void) fprintf(script, "ed - <<\\!\n");
 	*oldfile = '\0';
 	seekline(1);
-	for (i = 0; fscanf(refsfound, "%s%*s%s%*[^\n]", newfile, linenum) == 2;
+	for (i = 0; fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", newfile, linenum) == 2; 
 	    ++i) {
 		/* see if the line is to be changed */
 		if (change[i] == YES) {
--- cscope-15.5/src/dir.c.orig	2003-06-02 06:43:00.000000000 -0400
+++ cscope-15.5/src/dir.c	2006-08-23 10:09:20.000000000 -0400
@@ -319,7 +319,7 @@
 			
 			/* Parse whitespace-terminated strings in line: */
 			point_in_line = line;
-			while (sscanf(point_in_line, "%s", path) == 1) {
+			while (sscanf(point_in_line, "%" PATHLEN_STR "s", path) == 1) {
 				/* Have to store this length --- inviewpath() will
 				 * modify path, later! */
 				length_of_name = strlen(path);
--- cscope-15.5/src/main.c.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/main.c	2006-08-23 11:26:48.000000000 -0400
@@ -102,10 +102,10 @@
 #endif
 char	temp1[PATHLEN + 1];	/* temporary file name */
 char	temp2[PATHLEN + 1];	/* temporary file name */
-char	tempdirpv[PATHLEN +1];	/* private temp directory */
+char	tempdirpv[PATHLEN + 1];	/* private temp directory */
 long	totalterms;		/* total inverted index terms */
 BOOL	trun_syms;		/* truncate symbols to 8 characters */
-char	tempstring[8192];	/* use this as a buffer, instead of 'yytext', 
+char	tempstring[TEMPSTRING_LEN + 1]; /* use this as a buffer, instead of 'yytext', 
 				 * which had better be left alone */
 char	*tmpdir;		/* temporary directory */
 
@@ -270,6 +270,13 @@
 						s[11] = '\0';
 					}
 #endif
+		    if (strlen(reffile) > sizeof(path) - 1) {
+			  char buffer[512];
+			  sprintf(buffer,"cscope: reffile too long, cannot be > %d characters\n", sizeof(path) - 1);
+			  postmsg(buffer);
+			  myexit(1);
+			  /* NOTREACHED */
+		    }
 					s = path + strlen(path);
 					(void) strcpy(s, ".in");
 					invname = stralloc(path);
@@ -491,11 +498,11 @@
 			    || (names = vpfopen(NAMEFILE, "r")) != NULL) {
 	
 				/* read any -p option from it */
-				while (fscanf(names, "%s", path) == 1 && *path == '-') {
+				while (fgets(path, sizeof(path), names) != NULL && *path == '-') {
 					i = path[1];
 					s = path + 2;		/* for "-Ipath" */
 					if (*s == '\0') {	/* if "-I path" */
-						(void) fscanf(names, "%s", path);
+						fgets(path, sizeof(path), names);
 						s = path;
 					}
 					switch (i) {
@@ -512,7 +519,7 @@
 		}
 		else {
 			for (i = 0; i < nsrcfiles; ++i) {
-				if (fscanf(oldrefs, "%s", path) != 1) {
+				if (!fgets(path, sizeof(path), oldrefs) ) {
  					posterr("cscope: cannot read source file name from file %s\n", reffile);
 					myexit(1);
 				}
--- cscope-15.5/src/constants.h.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/constants.h	2006-08-23 10:16:30.000000000 -0400
@@ -68,6 +68,7 @@
 #define	NUMLEN	5		/* line number length */
 #define	PATHLEN	250		/* file pathname length */
 #define	PATLEN	250		/* symbol pattern length */
+#define TEMPSTRING_LEN 8191     /* max strlen() of the global temp string */
 #define	REFFILE	"cscope.out"	/* cross-reference output file */
 #define	NAMEFILE "cscope.files"	/* default list-of-files file */
 #define	INVNAME	"cscope.in.out"	/* inverted index to the database */
@@ -77,6 +78,13 @@
 
 #define	STMTMAX	10000		/* maximum source statement length */
 
+#define STR2(x) #x
+#define STRINGIZE(x) STR2(x)
+#define PATLEN_STR STRINGIZE(PATLEN)
+#define PATHLEN_STR STRINGIZE(PATHLEN)
+#define NUMLEN_STR STRINGIZE(NUMLEN)
+#define TEMPSTRING_LEN_STR STRINGIZE(TEMPSTRING_LEN)
+
 /* screen lines */
 #define	FLDLINE	(LINES - FIELDS - 1)	/* first input field line */
 #define	MSGLINE	0			/* message line */
--- cscope-15.5/src/build.c.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/build.c	2006-08-23 11:17:57.000000000 -0400
@@ -115,7 +115,7 @@
 	}
 	/* see if the name list is the same */
 	for (i = 0; i < count; ++i) {
-		if (fscanf(oldrefs, "%s", oldname) != 1 ||
+		if (! fgets(oldname, sizeof(oldname), oldrefs)||
 		    strnotequal(oldname, names[i])) {
 			return(NO);
 		}
@@ -223,8 +223,8 @@
 	/* if there is an old cross-reference and its current directory matches */
 	/* or this is an unconditional build */
 	if ((oldrefs = vpfopen(reffile, "rb")) != NULL && unconditional == NO &&
-	    fscanf(oldrefs, "cscope %d %s", &fileversion, olddir) == 2 &&
-	    (strcmp(olddir, currentdir) == 0 || /* remain compatible */
+		fscanf(oldrefs, "cscope %d %" PATHLEN_STR "s", &fileversion, olddir) == 2
+	     && (strcmp(olddir, currentdir) == 0 || /* remain compatible */
 	     strcmp(olddir, newdir) == 0)) {
 		/* get the cross-reference file's modification time */
 		(void) fstat(fileno(oldrefs), &statstruct);
@@ -292,7 +292,7 @@
 		/* see if the list of source files is the same and
 		   none have been changed up to the included files */
 		for (i = 0; i < nsrcfiles; ++i) {
-			if (fscanf(oldrefs, "%s", oldname) != 1 ||
+			if (! fgets(oldname, sizeof(oldname), oldrefs) ||
 			    strnotequal(oldname, srcfiles[i]) ||
 			    lstat(srcfiles[i], &statstruct) != 0 ||
 			    statstruct.st_mtime > reftime) {
@@ -301,7 +301,7 @@
 		}
 		/* the old cross-reference is up-to-date */
 		/* so get the list of included files */
-		while (i++ < oldnum && fscanf(oldrefs, "%s", oldname) == 1) {
+		while (i++ < oldnum && fgets(oldname, sizeof(oldname), oldrefs)) {
 			addsrcfile(oldname);
 		}
 		(void) fclose(oldrefs);


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/devel/cscope.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cscope.spec	17 Jul 2006 23:36:53 -0000	1.27
+++ cscope.spec	23 Aug 2006 15:36:15 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.5
-Release: 14
+Release: 15%{dist}.1
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -23,6 +23,7 @@
 Patch7:cscope-15.5-inv-overflow.patch
 Patch8:cscope-15.5-ocs-sysdir.patch
 Patch9:cscope-15.5-putstring-overflow.patch
+Patch10: cscope-15.5-fscanf-overflows.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -43,6 +44,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1 
+%patch10 -p1
 
 %build
 %configure
@@ -91,6 +93,10 @@
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Wed Aug 23 2006 Neil Horman <nhorman at redhat.com> -15.5-15%{dist}.1
+- fixed overflows per bz 203651
+- start using %{dist} tag to make release numbering easier
+
 * Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 15.5-14
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 15:37:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 11:37:34 -0400
Subject: rpms/kernel/devel config-olpc-generic,1.2,1.3
Message-ID: <200608231537.k7NFbYUc022071@cvs.devel.redhat.com>

Author: mtosatti

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22024

Modified Files:
	config-olpc-generic 
Log Message:
Add VESAFB to config-olpc-generic




Index: config-olpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/config-olpc-generic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-olpc-generic	22 Aug 2006 20:05:03 -0000	1.2
+++ config-olpc-generic	23 Aug 2006 15:37:31 -0000	1.3
@@ -337,7 +337,7 @@
 CONFIG_FIRMWARE_EDID=y
 
 CONFIG_FB_MODE_HELPERS=y
-# CONFIG_FB_VESA is not set
+CONFIG_FB_VESA=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set



From fedora-cvs-commits at redhat.com  Wed Aug 23 15:43:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 11:43:47 -0400
Subject: rpms/yaboot/devel yaboot-1.3.13-dontwritehome.patch, NONE,
	1.1 yaboot.spec, 1.37, 1.38
Message-ID: <200608231543.k7NFhlOP023460@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23393

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.13-dontwritehome.patch 
Log Message:
Fix ybin with SELinux (#201414)


yaboot-1.3.13-dontwritehome.patch:
 ybin |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE yaboot-1.3.13-dontwritehome.patch ---
--- yaboot-1.3.13/ybin/ybin.dontwritehome	2006-08-10 14:33:06.000000000 -0400
+++ yaboot-1.3.13/ybin/ybin	2006-08-10 14:33:15.000000000 -0400
@@ -821,6 +821,10 @@
 	    return 1
 	fi
 
+	## N.B.: SELinux does not like bootloader executables writing to 
+	## root's homedir, so we lie about HOME here.
+	export HOME=/boot
+
 	## hmount is really more of a way to make sure we have a valid HFS
 	## filesystem before proceding, and hcopy requires it...
 	hmount "$boot" > /dev/null


Index: yaboot.spec
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- yaboot.spec	21 Aug 2006 18:47:47 -0000	1.37
+++ yaboot.spec	23 Aug 2006 15:43:44 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -33,6 +33,7 @@
 Patch26: yaboot-1.3.13-printversion.patch
 Patch27: yaboot-ppc64.patch
 Patch28: yaboot-1.3.13-multisata.patch
+Patch29: yaboot-1.3.13-dontwritehome.patch
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: ybin
@@ -75,6 +76,7 @@
 %patch26 -p1 -b .printversion
 %patch27 -p1 -b .ppc64
 %patch28 -p1 -b .multisata
+%patch29 -p1 -b .bootwrite
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -108,6 +110,9 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Wed Aug 23 2006 Paul Nasrat <pnasrat at redhat.com> - 1.3.13-2
+- Fix ybin with SELinux (#201414)
+
 * Mon Aug 21 2006 Paul Nasrat <pnasrat at redhat.com> - 1.3.13-1
 - Fix multi disk G5 patch for all cases
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 15:48:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 11:48:19 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.32, 1.33 rhpxl.spec, 1.37,
	1.38 sources, 1.35, 1.36
Message-ID: <200608231548.k7NFmJhN007889@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7857/devel

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
auto-import rhpxl-0.31-1 on branch devel from rhpxl-0.31-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	14 Aug 2006 15:58:58 -0000	1.32
+++ .cvsignore	23 Aug 2006 15:48:17 -0000	1.33
@@ -1 +1 @@
-rhpxl-0.30.tar.gz
+rhpxl-0.31.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rhpxl.spec	14 Aug 2006 15:58:58 -0000	1.37
+++ rhpxl.spec	23 Aug 2006 15:48:17 -0000	1.38
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.30
+Version: 0.31
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,7 +43,13 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Wed Aug 23 2006 Adam Jackson <ajackson at redhat.com> 0.31-1
+- Default depth of 24.
+
 * Mon Aug 14 2006 Adam Jackson <ajackson at redhat.com> 0.30-1
+- Bump.
+
+* Mon Aug 14 2006 Adam Jackson <ajackson at redhat.com> 0.29-1
 - Don't emit a Load "synaptics" directive, it's wrong.
 
 * Mon Aug 07 2006 Chris Lumens <clumens at redhat.com> 0.28-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	14 Aug 2006 15:58:58 -0000	1.35
+++ sources	23 Aug 2006 15:48:17 -0000	1.36
@@ -1 +1 @@
-d2858d9c824469eda93322ca99603225  rhpxl-0.30.tar.gz
+91e3956de53321d83378e3be556a22fc  rhpxl-0.31.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 23 15:59:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 11:59:45 -0400
Subject: rpms/esc/devel esc.spec, 1.10, 1.11 esc-1.0.0-ui-enhance.patch, 1.2,
	NONE
Message-ID: <200608231559.k7NFxjJh012099@cvs.devel.redhat.com>

Author: jmagne

Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12067/devel

Modified Files:
	esc.spec 
Removed Files:
	esc-1.0.0-ui-enhance.patch 
Log Message:
auto-import esc-1.0.0-7 on branch devel from esc-1.0.0-7.src.rpm


Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- esc.spec	19 Aug 2006 05:04:33 -0000	1.10
+++ esc.spec	23 Aug 2006 15:59:42 -0000	1.11
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -13,8 +13,6 @@
 Patch3: firefox-1.5-with-system-nss.patch
 Patch4: firefox-1.1-nss-system-nspr.patch
 Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
-Patch6: esc-1.0.0-ui-enhance.patch
-
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -23,7 +21,7 @@
 BuildRequires: autoconf213 libX11-devel libXt-devel
 
 BuildRequires: pcsc-lite-devel coolkey-devel
-BuildRequires: desktop-file-utils zip binutils libnotify-devel
+BuildRequires: desktop-file-utils zip binutils
 Requires: pcsc-lite ifd-egate coolkey nss nspr
 Requires: zip
 
@@ -65,8 +63,6 @@
 #patch esc to use system nss and nspr.
 
 %patch5 -p1 -b .fix5
-%patch6 -p1 -b .fix6
-
 
 #Unpack xulrunner where esc expects it to be.
 
@@ -81,8 +77,6 @@
 %patch3 -p1 -b .fix3
 %patch4 -p1 -b .fix4
 
-
-
 %build
 
 %ifarch x86_64 ppc64 ia64
@@ -94,7 +88,7 @@
 
 cd ../..
 
-make BUILD_OPT=1 HAVE_LIB_NOTIFY=1
+make BUILD_OPT=1 
 
 %install
 
@@ -107,8 +101,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{pixmapdir}
 mkdir -p $RPM_BUILD_ROOT/%{docdir}
 
+
 sed -e 's;\$LIBDIR;'%{_libdir}';g'  %{SOURCE1} > $RPM_BUILD_ROOT/%{escbindir}/%{name}
 
+
 chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
 
 mkdir -p $RPM_BUILD_ROOT/%{escdir}
@@ -174,15 +170,23 @@
 fi
 
 %changelog
+* Tue Aug 22 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-7
+- Fix for bug #203211, use of system NSS and NSPR for
+- Xulrunner ,addressing the problem running on 64 bit.
+- Overwriting 5 and 6 due to important bug #203211.
+
 * Fri Aug  18 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-6
 - Correct problem with Patch #6
 
-* Tue Aug  17 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-4
+* Tue Aug  17 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-5
 - Build ESC's xulrunner component using system nss and nspr
 - Build process creates run script based on {_libdir} variable,
   accounting for differences on 64 bit machines.
 - UI enhancements
 
+* Tue Aug  1 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-4
+- Don't auto-generate requires either
+
 * Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-3
 - Don't provide mozilla libraries
 


--- esc-1.0.0-ui-enhance.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 23 16:04:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 12:04:47 -0400
Subject: rpms/pyxf86config/devel .cvsignore, 1.18, 1.19 pyxf86config.spec,
	1.33, 1.34 sources, 1.18, 1.19
Message-ID: <200608231604.k7NG4l5A013313@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/pyxf86config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13280/devel

Modified Files:
	.cvsignore pyxf86config.spec sources 
Log Message:
auto-import pyxf86config-0.3.29-1.fc6 on branch devel from pyxf86config-0.3.29-1.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Aug 2006 22:06:20 -0000	1.18
+++ .cvsignore	23 Aug 2006 16:04:44 -0000	1.19
@@ -1 +1 @@
-pyxf86config-0.3.28.tar.gz
+pyxf86config-0.3.29.tar.gz


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pyxf86config.spec	21 Aug 2006 22:06:20 -0000	1.33
+++ pyxf86config.spec	23 Aug 2006 16:04:44 -0000	1.34
@@ -2,7 +2,7 @@
 
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
-Version: 0.3.28
+Version: 0.3.29
 Release: 1%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Wed Aug 23 2006 Adam Jackson <ajackson at redhat.com> 0.3.29-1.fc6
+- Default depth of 24.
+
 * Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 0.3.28-1.fc6
 - Decode degenerate ranges correctly. (#132679)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Aug 2006 22:06:20 -0000	1.18
+++ sources	23 Aug 2006 16:04:45 -0000	1.19
@@ -1 +1 @@
-28d76380bd479022797566ca8a2789e1  pyxf86config-0.3.28.tar.gz
+c0f6cd9e2e3f8c00017c6215e5e6c37f  pyxf86config-0.3.29.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 23 16:14:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 12:14:09 -0400
Subject: rpms/file/devel file-4.17-bash.patch,1.1,1.2 file.spec,1.54,1.55
Message-ID: <200608231614.k7NGE9Df015461@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15379

Modified Files:
	file-4.17-bash.patch file.spec 
Log Message:
* Wed Aug 23 2006 Martin Bacovsky <mbacovsky at redhat.com> - 4.17-8
- fix recognition of perl script with embed awk (#203610)


file-4.17-bash.patch:
 commands |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: file-4.17-bash.patch
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file-4.17-bash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file-4.17-bash.patch	18 Aug 2006 07:04:17 -0000	1.1
+++ file-4.17-bash.patch	23 Aug 2006 16:14:07 -0000	1.2
@@ -5,7 +5,7 @@
  0	string/b	#!\ /usr/bin/awk	awk script text executable
  # update to distinguish from *.vcf files
 -0	regex		BEGIN[[:space:]]*[{]	awk script text
-+0	regex		[^'"]BEGIN[[:space:]]*[{]	awk script text
++#0	regex		[^'"]BEGIN[[:space:]]*[{]	awk script text
  
  # AT&T Bell Labs' Plan 9 shell
  0	string/b	#!\ /bin/rc	Plan 9 rc shell script text executable


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- file.spec	18 Aug 2006 07:04:17 -0000	1.54
+++ file.spec	23 Aug 2006 16:14:07 -0000	1.55
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.17
-Release: 7
+Release: 8
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -97,6 +97,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Wed Aug 23 2006 Martin Bacovsky <mbacovsky at redhat.com> - 4.17-8
+- fix recognition of perl script with embed awk (#203610) 
+
 * Fri Aug 18 2006 Martin Bacovsky <mbacovsk at redhat.com> - 4.17-7
 - fix recognition of bash script with embed awk (#202185)
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 16:48:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 12:48:21 -0400
Subject: rpms/gnome-system-monitor/devel gnome-system-monitor.spec, 1.58,
	1.59
Message-ID: <200608231648.k7NGmLXT012054@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10101

Modified Files:
	gnome-system-monitor.spec 
Log Message:
fix spec file issues



Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnome-system-monitor.spec	21 Aug 2006 19:34:42 -0000	1.58
+++ gnome-system-monitor.spec	23 Aug 2006 16:48:18 -0000	1.59
@@ -11,10 +11,11 @@
 Summary: Simple process monitor
 Name: gnome-system-monitor
 Version: 2.15.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
-Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2
+URL: http://www.gnome.org/
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.15/gnome-system-monitor-%{version}.tar.bz2
 # po/LINGUAS disaster
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libgnomeui >= %{libgnomeui_version}
@@ -43,11 +44,10 @@
 gnome-system-monitor is a simple process and system monitor.
 
 %prep
-%setup -q -n gnome-system-monitor-%{version}
+%setup -q
 
 %build
 %configure --enable-selinux
-
 make %{?_smp_mflags}
 
 %install
@@ -86,15 +86,16 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root,-)
-
-%{_bindir}/gnome-system-monitor
-%{_datadir}/applications
-%{_datadir}/gnome
-%{_datadir}/applications
 %{_sysconfdir}/gconf/schemas/*
-%{_datadir}/omf
+%{_bindir}/gnome-system-monitor
+%{_datadir}/applications/*
+%{_datadir}/gnome/help/gnome-system-monitor/
+%{_datadir}/omf/gnome-system-monitor/
 
 %changelog
+* Wed Aug 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-2.fc6
+- Apply a patch by Matthias Saou to clean up the .spec file
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 17:28:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 13:28:09 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.85, 1.86 sources,
	1.88, 1.89 system-config-printer.spec, 1.51, 1.52
Message-ID: <200608231728.k7NHS9eM024969@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24955

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com> 0.7.26-1
- 0.7.26.  Fixes bug # 203149.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- .cvsignore	14 Aug 2006 16:19:22 -0000	1.85
+++ .cvsignore	23 Aug 2006 17:28:07 -0000	1.86
@@ -65,3 +65,4 @@
 system-config-printer-0.7.23.tar.bz2
 system-config-printer-0.7.24.tar.bz2
 system-config-printer-0.7.25.tar.bz2
+system-config-printer-0.7.26.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sources	14 Aug 2006 16:19:22 -0000	1.88
+++ sources	23 Aug 2006 17:28:07 -0000	1.89
@@ -1,2 +1,2 @@
 c853b55286216568f14dde8a5ae21a21  pycups-1.9.12.tar.bz2
-64400f94fe57afc35d45819d83f6724e  system-config-printer-0.7.25.tar.bz2
+bbd11e873b4adb6aa7a3ecd46cf20f25  system-config-printer-0.7.26.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- system-config-printer.spec	14 Aug 2006 16:19:22 -0000	1.51
+++ system-config-printer.spec	23 Aug 2006 17:28:07 -0000	1.52
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.25
+Version: 0.7.26
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -114,7 +114,10 @@
 exit 0
 
 %changelog
-* Mon Aug 14 2006 Florian Festi <ffesti at redhat.com>
+* Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com> 0.7.26-1
+- 0.7.26.  Fixes bug # 203149.
+
+* Mon Aug 14 2006 Florian Festi <ffesti at redhat.com> 0.7.25-1
 - 0.7.25. (bug #202060)
 
 * Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Aug 23 17:36:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 13:36:19 -0400
Subject: rpms/cscope/FC-5 cscope-15.5-fscanf-overflows.patch, NONE,
	1.1 cscope.spec, 1.26, 1.27
Message-ID: <200608231736.k7NHaJHH025119@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/cscope/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25106

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.5-fscanf-overflows.patch 
Log Message:
checking in fscanf overflow patch

cscope-15.5-fscanf-overflows.patch:
 build.c     |   10 +++++-----
 command.c   |    2 +-
 constants.h |    8 ++++++++
 dir.c       |    2 +-
 display.c   |    2 +-
 edit.c      |    4 ++--
 input.c     |   17 ++++++++---------
 main.c      |   17 ++++++++++++-----
 8 files changed, 38 insertions(+), 24 deletions(-)

--- NEW FILE cscope-15.5-fscanf-overflows.patch ---
--- cscope-15.5/src/display.c.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/display.c	2006-08-23 10:19:41.000000000 -0400
@@ -217,7 +217,7 @@
 		     disprefs < mdisprefs && screenline <= lastdispline;
 		     ++disprefs, ++screenline) {
 			/* read the reference line */
-			if (fscanf(refsfound, "%s%s%s %[^\n]", file, function, 
+			if (fscanf(refsfound, "%" PATHLEN_STR "s%" PATHLEN_STR "s%" NUMLEN_STR "s %" TEMPSTRING_LEN_STR "[^\n]", file, function,
 			    linenum, tempstring) < 4) {
 				break;
 			}
--- cscope-15.5/src/input.c.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/input.c	2006-08-23 10:57:01.000000000 -0400
@@ -293,16 +293,15 @@
 		/* if the login name is null, then use $HOME */
 		if (*out == '\0') {
 			v = getenv("HOME");
-		}
-		else {	/* get the home directory of the login name */
+		} else { /* get the home directory of the login name */
 			v = logdir(out);
 		}
-		/* copy the directory name */
-		if (v != NULL) {
+		/* copy the directory name if it isn't too big */
+		if (v != NULL && strlen(v) < (lastchar - out)) {
 			(void) strcpy(out - 1, v);
 			out += strlen(v) - 1;
-		}
-		else {	/* login not found, so ~ must be part of the file name */
+		} else {
+			/* login not found, so ~ must be part of the file name */
 			out += strlen(out);
 		}
 	}
@@ -322,11 +321,11 @@
 			*s = '\0';
 	
 			/* get its value */
-			if ((v = getenv(out)) != NULL) {
+			if ((v = getenv(out)) != NULL && strlen(v) < (lastchar - out)) {
 				(void) strcpy(out - 1, v);
 				out += strlen(v) - 1;
-			}
-			else {	/* var not found, so $ must be part of the file name */
+			} else {
+				/* var not found, so $ must be part of the file name */
 				out += strlen(out);
 			}
 		}
--- cscope-15.5/src/edit.c.orig	2001-07-18 09:49:01.000000000 -0400
+++ cscope-15.5/src/edit.c	2006-08-23 10:16:30.000000000 -0400
@@ -60,7 +60,7 @@
 	seekline(i + topline);
 	
 	/* get the file name and line number */
-	if (fscanf(refsfound, "%s%*s%s", file, linenum) == 2) {
+	if (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s", file, linenum) == 2) {
 		edit(file, linenum);	/* edit it */
 	}
 	seekline(topline);	/* restore the line pointer */
@@ -83,7 +83,7 @@
 	seekline(1);
 	
 	/* get each file name and line number */
-	while (fscanf(refsfound, "%s%*s%s%*[^\n]", file, linenum) == 2) {
+	while (fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", file, linenum) == 2) {
 		edit(file, linenum);	/* edit it */
 		if (editallprompt == YES) {
 			addstr("Type ^D to stop editing all lines, or any other character to continue: ");
--- cscope-15.5/src/command.c.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/command.c	2006-08-23 10:08:50.000000000 -0400
@@ -727,7 +727,7 @@
 	(void) fprintf(script, "ed - <<\\!\n");
 	*oldfile = '\0';
 	seekline(1);
-	for (i = 0; fscanf(refsfound, "%s%*s%s%*[^\n]", newfile, linenum) == 2;
+	for (i = 0; fscanf(refsfound, "%" PATHLEN_STR "s%*s%" NUMLEN_STR "s%*[^\n]", newfile, linenum) == 2; 
 	    ++i) {
 		/* see if the line is to be changed */
 		if (change[i] == YES) {
--- cscope-15.5/src/dir.c.orig	2003-06-02 06:43:00.000000000 -0400
+++ cscope-15.5/src/dir.c	2006-08-23 10:09:20.000000000 -0400
@@ -319,7 +319,7 @@
 			
 			/* Parse whitespace-terminated strings in line: */
 			point_in_line = line;
-			while (sscanf(point_in_line, "%s", path) == 1) {
+			while (sscanf(point_in_line, "%" PATHLEN_STR "s", path) == 1) {
 				/* Have to store this length --- inviewpath() will
 				 * modify path, later! */
 				length_of_name = strlen(path);
--- cscope-15.5/src/main.c.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/main.c	2006-08-23 11:26:48.000000000 -0400
@@ -102,10 +102,10 @@
 #endif
 char	temp1[PATHLEN + 1];	/* temporary file name */
 char	temp2[PATHLEN + 1];	/* temporary file name */
-char	tempdirpv[PATHLEN +1];	/* private temp directory */
+char	tempdirpv[PATHLEN + 1];	/* private temp directory */
 long	totalterms;		/* total inverted index terms */
 BOOL	trun_syms;		/* truncate symbols to 8 characters */
-char	tempstring[8192];	/* use this as a buffer, instead of 'yytext', 
+char	tempstring[TEMPSTRING_LEN + 1]; /* use this as a buffer, instead of 'yytext', 
 				 * which had better be left alone */
 char	*tmpdir;		/* temporary directory */
 
@@ -270,6 +270,13 @@
 						s[11] = '\0';
 					}
 #endif
+		    if (strlen(reffile) > sizeof(path) - 1) {
+			  char buffer[512];
+			  sprintf(buffer,"cscope: reffile too long, cannot be > %d characters\n", sizeof(path) - 1);
+			  postmsg(buffer);
+			  myexit(1);
+			  /* NOTREACHED */
+		    }
 					s = path + strlen(path);
 					(void) strcpy(s, ".in");
 					invname = stralloc(path);
@@ -491,11 +498,11 @@
 			    || (names = vpfopen(NAMEFILE, "r")) != NULL) {
 	
 				/* read any -p option from it */
-				while (fscanf(names, "%s", path) == 1 && *path == '-') {
+				while (fgets(path, sizeof(path), names) != NULL && *path == '-') {
 					i = path[1];
 					s = path + 2;		/* for "-Ipath" */
 					if (*s == '\0') {	/* if "-I path" */
-						(void) fscanf(names, "%s", path);
+						fgets(path, sizeof(path), names);
 						s = path;
 					}
 					switch (i) {
@@ -512,7 +519,7 @@
 		}
 		else {
 			for (i = 0; i < nsrcfiles; ++i) {
-				if (fscanf(oldrefs, "%s", path) != 1) {
+				if (!fgets(path, sizeof(path), oldrefs) ) {
  					posterr("cscope: cannot read source file name from file %s\n", reffile);
 					myexit(1);
 				}
--- cscope-15.5/src/constants.h.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/constants.h	2006-08-23 10:16:30.000000000 -0400
@@ -68,6 +68,7 @@
 #define	NUMLEN	5		/* line number length */
 #define	PATHLEN	250		/* file pathname length */
 #define	PATLEN	250		/* symbol pattern length */
+#define TEMPSTRING_LEN 8191     /* max strlen() of the global temp string */
 #define	REFFILE	"cscope.out"	/* cross-reference output file */
 #define	NAMEFILE "cscope.files"	/* default list-of-files file */
 #define	INVNAME	"cscope.in.out"	/* inverted index to the database */
@@ -77,6 +78,13 @@
 
 #define	STMTMAX	10000		/* maximum source statement length */
 
+#define STR2(x) #x
+#define STRINGIZE(x) STR2(x)
+#define PATLEN_STR STRINGIZE(PATLEN)
+#define PATHLEN_STR STRINGIZE(PATHLEN)
+#define NUMLEN_STR STRINGIZE(NUMLEN)
+#define TEMPSTRING_LEN_STR STRINGIZE(TEMPSTRING_LEN)
+
 /* screen lines */
 #define	FLDLINE	(LINES - FIELDS - 1)	/* first input field line */
 #define	MSGLINE	0			/* message line */
--- cscope-15.5/src/build.c.orig	2006-08-23 07:08:40.000000000 -0400
+++ cscope-15.5/src/build.c	2006-08-23 11:17:57.000000000 -0400
@@ -115,7 +115,7 @@
 	}
 	/* see if the name list is the same */
 	for (i = 0; i < count; ++i) {
-		if (fscanf(oldrefs, "%s", oldname) != 1 ||
+		if (! fgets(oldname, sizeof(oldname), oldrefs)||
 		    strnotequal(oldname, names[i])) {
 			return(NO);
 		}
@@ -223,8 +223,8 @@
 	/* if there is an old cross-reference and its current directory matches */
 	/* or this is an unconditional build */
 	if ((oldrefs = vpfopen(reffile, "rb")) != NULL && unconditional == NO &&
-	    fscanf(oldrefs, "cscope %d %s", &fileversion, olddir) == 2 &&
-	    (strcmp(olddir, currentdir) == 0 || /* remain compatible */
+		fscanf(oldrefs, "cscope %d %" PATHLEN_STR "s", &fileversion, olddir) == 2
+	     && (strcmp(olddir, currentdir) == 0 || /* remain compatible */
 	     strcmp(olddir, newdir) == 0)) {
 		/* get the cross-reference file's modification time */
 		(void) fstat(fileno(oldrefs), &statstruct);
@@ -292,7 +292,7 @@
 		/* see if the list of source files is the same and
 		   none have been changed up to the included files */
 		for (i = 0; i < nsrcfiles; ++i) {
-			if (fscanf(oldrefs, "%s", oldname) != 1 ||
+			if (! fgets(oldname, sizeof(oldname), oldrefs) ||
 			    strnotequal(oldname, srcfiles[i]) ||
 			    lstat(srcfiles[i], &statstruct) != 0 ||
 			    statstruct.st_mtime > reftime) {
@@ -301,7 +301,7 @@
 		}
 		/* the old cross-reference is up-to-date */
 		/* so get the list of included files */
-		while (i++ < oldnum && fscanf(oldrefs, "%s", oldname) == 1) {
+		while (i++ < oldnum && fgets(oldname, sizeof(oldname), oldrefs)) {
 			addsrcfile(oldname);
 		}
 		(void) fclose(oldrefs);


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/FC-5/cscope.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cscope.spec	23 Jun 2006 20:21:10 -0000	1.26
+++ cscope.spec	23 Aug 2006 17:36:16 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.5
-Release: 13.7 
+Release: 15%{dist}.1 
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -23,6 +23,7 @@
 Patch7:cscope-15.5-inv-overflow.patch
 Patch8:cscope-15.5-ocs-sysdir.patch
 Patch9:cscope-15.5-putstring-overflow.patch
+Patch10:cscope-15.5-fscanf-overflows.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -43,6 +44,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %configure
@@ -91,6 +93,9 @@
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Wed Aug 23 2006 Neil Horman <nhorman at redhat.com>
+- fix fscanf overflows for bz 203649
+
 * Fri Jun 23 2006 Neil Horman <nhorman at redhat.com>
 - Fixing putstring bug (bz 189666)
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 17:51:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 13:51:56 -0400
Subject: rpms/mcstrans/devel .cvsignore, 1.9, 1.10 mcstrans.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <200608231751.k7NHpuTV021235@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/mcstrans/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21202

Modified Files:
	.cvsignore mcstrans.spec sources 
Log Message:
* Wed Aug 23 2006 Dan Walsh <dwalsh at redhat.com> 0.1.8-1
- Only allow one version to run



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mcstrans/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	19 Jun 2006 20:25:05 -0000	1.9
+++ .cvsignore	23 Aug 2006 17:51:54 -0000	1.10
@@ -6,3 +6,4 @@
 mcstrans-0.1.5.tgz
 mcstrans-0.1.6.tgz
 mcstrans-0.1.7.tgz
+mcstrans-0.1.8.tgz


Index: mcstrans.spec
===================================================================
RCS file: /cvs/dist/rpms/mcstrans/devel/mcstrans.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mcstrans.spec	12 Jul 2006 07:19:44 -0000	1.15
+++ mcstrans.spec	23 Aug 2006 17:51:54 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
-Version: 0.1.7
-Release: 1.1
+Version: 0.1.8
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz
@@ -67,6 +67,9 @@
 %{_sysconfdir}/rc.d/init.d/mcstrans
 
 %changelog
+* Wed Aug 23 2006 Dan Walsh <dwalsh at redhat.com> 0.1.8-1
+- Only allow one version to run
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mcstrans/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Jun 2006 20:25:05 -0000	1.9
+++ sources	23 Aug 2006 17:51:54 -0000	1.10
@@ -1 +1 @@
-92f128d7c906f74e1350e15bcabe0821  mcstrans-0.1.7.tgz
+020664a47efb3a91ba16e9dfd849605d  mcstrans-0.1.8.tgz



From fedora-cvs-commits at redhat.com  Wed Aug 23 17:58:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 13:58:22 -0400
Subject: rpms/parted/devel parted-1.7.1-gpt.patch, 1.2, 1.3 parted.spec, 1.84,
	1.85
Message-ID: <200608231758.k7NHwMwb023659@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23615

Modified Files:
	parted-1.7.1-gpt.patch parted.spec 
Log Message:
- Fixed gpt patch (*asked_already -> asked_already, whoops)


parted-1.7.1-gpt.patch:
 libparted/labels/gpt.c |   56 +++++++++++++++++++++++++++++++++++++++++++++----
 parted/ui.c            |    2 -
 2 files changed, 53 insertions(+), 5 deletions(-)

Index: parted-1.7.1-gpt.patch
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted-1.7.1-gpt.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- parted-1.7.1-gpt.patch	22 Aug 2006 20:43:14 -0000	1.2
+++ parted-1.7.1-gpt.patch	23 Aug 2006 17:58:19 -0000	1.3
@@ -1,5 +1,5 @@
 --- parted-1.7.1/libparted/labels/gpt.c.gpt	2006-05-25 13:28:55.000000000 -0400
-+++ parted-1.7.1/libparted/labels/gpt.c	2006-08-22 16:37:42.000000000 -0400
++++ parted-1.7.1/libparted/labels/gpt.c	2006-08-23 13:57:49.000000000 -0400
 @@ -607,11 +607,13 @@
  }
  
@@ -63,7 +63,7 @@
 +			last_usable = last_usable_if_grown;
 +			*update_needed = 1;
 +		} else if (q != PED_EXCEPTION_UNHANDLED) {
-+			*asked_already = 1;
++			asked_already = 1;
 +		}
 +	}
 +
@@ -98,7 +98,7 @@
  		goto error_free_ptes;
  
 --- parted-1.7.1/parted/ui.c.gpt	2006-05-25 13:28:42.000000000 -0400
-+++ parted-1.7.1/parted/ui.c	2006-08-22 14:41:42.000000000 -0400
++++ parted-1.7.1/parted/ui.c	2006-08-23 13:56:35.000000000 -0400
 @@ -1027,13 +1027,13 @@
  
  	opt = PED_EXCEPTION_OPTION_FIRST;


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- parted.spec	22 Aug 2006 20:43:14 -0000	1.84
+++ parted.spec	23 Aug 2006 17:58:19 -0000	1.85
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name:    parted
 Version: 1.7.1
-Release: 14%{?dist}
+Release: 15%{?dist}
 Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0:  parted-1.7.0-fat.c.patch
 Patch1:  parted-1.7.0-sx8.patch
@@ -108,6 +108,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug 23 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-15
+- Fixed gpt patch (*asked_already -> asked_already, whoops)
+
 * Tue Aug 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-14
 - Improve error message returned by _parse_header() on GPT-labeled disks
   so users actually have an idea of how to correct the problem



From fedora-cvs-commits at redhat.com  Wed Aug 23 18:00:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 14:00:00 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.65, 1.66 libsemanage.spec,
	1.105, 1.106 sources, 1.67, 1.68
Message-ID: <200608231800.k7NI00Mx024277@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24245

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	12 Aug 2006 10:59:35 -0000	1.65
+++ .cvsignore	23 Aug 2006 17:59:58 -0000	1.66
@@ -71,3 +71,4 @@
 libsemanage-1.6.12.tgz
 libsemanage-1.6.13.tgz
 libsemanage-1.6.15.tgz
+libsemanage-1.6.16.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- libsemanage.spec	12 Aug 2006 12:26:53 -0000	1.105
+++ libsemanage.spec	23 Aug 2006 17:59:58 -0000	1.106
@@ -2,7 +2,7 @@
 %define libselinuxver 1.30.26-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.6.15
+Version: 1.6.16
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -76,6 +76,12 @@
 
 %changelog
 
+* Wed Aug 23 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.16-1
+- Upgrade to latest from NSA
+	* Make most copy errors fatal, but allow exceptions for
+	  file_contexts.local, seusers, and netfilter_contexts if
+	  the source file does not exist in the store.
+
 * Sat Aug 12 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.15-1
 - Upgrade to latest from NSA
 	* Merged separate local file contexts patch from Chris PeBenito.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	12 Aug 2006 10:59:35 -0000	1.67
+++ sources	23 Aug 2006 17:59:58 -0000	1.68
@@ -1 +1 @@
-7946dfe59e42af1a67ad60f6e069e1a3  libsemanage-1.6.15.tgz
+b2756fb403b87a28bed08f98423cabca  libsemanage-1.6.16.tgz



From fedora-cvs-commits at redhat.com  Wed Aug 23 18:22:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 14:22:07 -0400
Subject: rpms/evolution/devel evolution-2.7.92-deprecated-gdk.patch, NONE,
	1.1 evolution-2.7.92-deprecated-glib.patch, NONE,
	1.1 evolution.spec, 1.184, 1.185
Message-ID: <200608231822.k7NIM7KY012096@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11998

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.92-deprecated-gdk.patch 
	evolution-2.7.92-deprecated-glib.patch 
Log Message:

* Wed Aug 23 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-4.fc6
- Add patches for Gnome.org bug #352450.


evolution-2.7.92-deprecated-gdk.patch:
 calendar/gui/calendar-commands.c           |    2 +-
 calendar/gui/e-day-view-main-item.c        |   12 ++++++------
 calendar/gui/e-day-view-top-item.c         |   12 ++++++------
 calendar/gui/e-meeting-time-sel-item.c     |    6 +++---
 calendar/gui/e-meeting-time-sel.c          |    2 +-
 calendar/gui/e-week-view-event-item.c      |   12 ++++++------
 e-util/e-cursor.c                          |    2 +-
 widgets/misc/e-canvas-background.c         |    6 +++---
 widgets/misc/e-cursors.c                   |    2 +-
 widgets/misc/e-map.c                       |   26 +++++++++++++-------------
 widgets/misc/e-reflow.c                    |    4 ++--
 widgets/misc/e-task-widget.c               |    4 ++--
 widgets/misc/gal-combo-box.c               |    6 +++---
 widgets/table/e-cell-text.c                |    4 ++--
 widgets/table/e-cell-toggle.c              |    6 +++---
 widgets/table/e-table-field-chooser-item.c |    4 ++--
 widgets/table/e-table-field-chooser.c      |    2 +-
 widgets/table/e-table-header-item.c        |   12 ++++++------
 widgets/table/e-table-header-utils.c       |    4 ++--
 widgets/table/e-table-item.c               |    2 +-
 widgets/table/e-table.c                    |    2 +-
 widgets/table/e-tree.c                     |    2 +-
 widgets/text/e-text.c                      |   10 +++++-----
 23 files changed, 72 insertions(+), 72 deletions(-)

--- NEW FILE evolution-2.7.92-deprecated-gdk.patch ---
--- evolution-2.7.92/widgets/misc/gal-combo-box.c.deprecated-gdk	2006-01-11 05:33:24.000000000 -0500
+++ evolution-2.7.92/widgets/misc/gal-combo-box.c	2006-08-23 10:42:12.000000000 -0400
@@ -429,7 +429,7 @@
 	gtk_widget_realize (combo_box->priv->popup);
 	cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW);
 	gdk_window_set_cursor (combo_box->priv->popup->window, cursor);
-	gdk_cursor_destroy (cursor);
+	gdk_cursor_unref (cursor);
 
 	combo_box->priv->torn_off = FALSE;
 	combo_box->priv->tearoff_window = NULL;
@@ -607,7 +607,7 @@
 					 widget->allocation.height,
 					 -1);
 
-		gdk_draw_pixmap (pixmap, gc,
+		gdk_draw_drawable (GDK_DRAWABLE (pixmap), gc,
 				 widget->window,
 				 0, 0, 0, 0, -1, -1);
 		gdk_gc_unref (gc);
@@ -618,7 +618,7 @@
       
 		gdk_window_set_back_pixmap
 			(combo->priv->tearoff_window->window, pixmap, FALSE);
-		gdk_pixmap_unref (pixmap);
+		g_object_unref (pixmap);
 	}
 }
 
--- evolution-2.7.92/widgets/misc/e-reflow.c.deprecated-gdk	2006-02-28 05:49:36.000000000 -0500
+++ evolution-2.7.92/widgets/misc/e-reflow.c	2006-08-23 10:42:12.000000000 -0400
@@ -882,8 +882,8 @@
 	if (!item->canvas->aa) {
 	}
   
-	gdk_cursor_destroy (reflow->arrow_cursor);
-	gdk_cursor_destroy (reflow->default_cursor);
+	gdk_cursor_unref (reflow->arrow_cursor);
+	gdk_cursor_unref (reflow->default_cursor);
 	reflow->arrow_cursor = NULL;
 	reflow->default_cursor = NULL;
 
--- evolution-2.7.92/widgets/misc/e-map.c.deprecated-gdk	2006-06-08 23:31:23.000000000 -0400
+++ evolution-2.7.92/widgets/misc/e-map.c	2006-08-23 10:42:12.000000000 -0400
@@ -319,7 +319,7 @@
 	attr.height = widget->allocation.height;
 	attr.wclass = GDK_INPUT_OUTPUT;
 	attr.visual = gdk_rgb_get_visual ();
-	attr.colormap = gdk_rgb_get_cmap ();
+	attr.colormap = gdk_rgb_get_colormap ();
 	attr.event_mask = gtk_widget_get_events (widget) |
 	  GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK |
 	  GDK_POINTER_MOTION_MASK;
@@ -1277,9 +1277,9 @@
 	gc = gdk_gc_new (window);
 	gdk_gc_set_exposures (gc, TRUE);
 
-	gdk_window_copy_area (window, gc, dest_x, dest_y, window, src_x, src_y, width - abs (xofs), height - abs (yofs));
+	gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), src_x, src_y, dest_x, dest_y, width - abs (xofs), height - abs (yofs));
 
-	gdk_gc_destroy (gc);
+	g_object_unref (gc);
 
 	/* Add the scrolled-in region */
 
@@ -1429,7 +1429,7 @@
 
 	/* Get area constraints */
 
-	gdk_window_get_size (window, &area_width, &area_height);
+	gdk_drawable_get_size (GDK_DRAWABLE (window), &area_width, &area_height);
 
 	/* Initialize area division array indexes */
 
@@ -1487,9 +1487,9 @@
 				/* Push left */
 
 				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, line + j + 1, 0, window, line, 0, 1, area_height);
+					gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line, 0, line + j + 1, 0, 1, area_height);
 
-				gdk_window_copy_area (window, gc, 0, 0, window, zoom_chunk, 0, line, area_height);
+				gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), zoom_chunk, 0, 0, 0, line, area_height);
 				if (line > target_x) target_x -= zoom_chunk;
 			}
 			else
@@ -1497,9 +1497,9 @@
 				/* Push right */
 
 				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, line + j - (zoom_chunk - 1), 0, window, line - zoom_chunk, 0, 1, area_height);
+					gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line - zoom_chunk, 0, line + j - (zoom_chunk - 1), 0, 1, area_height);
 
-				gdk_window_copy_area (window, gc, line, 0, window, line - zoom_chunk, 0, area_width - line, area_height);
+				gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line - zoom_chunk, 0, line, 0, area_width - line, area_height);
 				if (line < target_x) target_x += zoom_chunk;
 			}
 		}
@@ -1515,9 +1515,9 @@
 				/* Push up */
 
 				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, 0, line + j + 1, window, 0, line, area_width, 1);
+					gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, line, 0, line + j + 1, area_width, 1);
 
-				gdk_window_copy_area (window, gc, 0, 0, window, 0, zoom_chunk, area_width, line);
+				gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, zoom_chunk, 0, 0, area_width, line);
 				if (line > target_y) target_y -= zoom_chunk;
 			}
 			else
@@ -1525,9 +1525,9 @@
 				/* Push down */
 
 				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, 0, line + j - (zoom_chunk - 1), window, 0, line - zoom_chunk, area_width, 1);
+					gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_WINDOW (window), 0, line - zoom_chunk, 0, line + j - (zoom_chunk - 1), area_width, 1);
 
-				gdk_window_copy_area (window, gc, 0, line, window, 0, line - zoom_chunk, area_width, area_height - line);
+				gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, line - zoom_chunk, 0, line, area_width, area_height - line);
 				if (line < target_y) target_y += zoom_chunk;
 			}
 		}
@@ -1540,7 +1540,7 @@
 
 	/* Free our GC */
 
-	gdk_gc_destroy (gc);
+	g_object_unref (gc);
 }
 
 
--- evolution-2.7.92/widgets/misc/e-cursors.c.deprecated-gdk	2005-04-29 10:18:18.000000000 -0400
+++ evolution-2.7.92/widgets/misc/e-cursors.c	2006-08-23 10:42:12.000000000 -0400
@@ -143,7 +143,7 @@
 	int i;
 
 	for (i = 0; cursors [i].hot_x; i++)
-		gdk_cursor_destroy (cursors [i].cursor);
+		gdk_cursor_unref (cursors [i].cursor);
 }
 
 
--- evolution-2.7.92/widgets/misc/e-canvas-background.c.deprecated-gdk	2006-01-30 07:28:04.000000000 -0500
+++ evolution-2.7.92/widgets/misc/e-canvas-background.c	2006-08-23 10:42:12.000000000 -0400
@@ -161,11 +161,11 @@
 {
 	if (use_value) {
 		if (ecb->priv->stipple)
-			gdk_bitmap_unref (ecb->priv->stipple);
+			g_object_unref (ecb->priv->stipple);
 
 		ecb->priv->stipple = stipple;
 		if (stipple)
-			gdk_bitmap_ref (stipple);
+			g_object_ref (stipple);
 	}
 
 	if (ecb->priv->gc) {
@@ -184,7 +184,7 @@
 
 	if (ecb->priv) {
 		if (ecb->priv->stipple)
-			gdk_bitmap_unref (ecb->priv->stipple);
+			g_object_unref (ecb->priv->stipple);
 		ecb->priv->stipple = NULL;
 
 		g_free (ecb->priv);
--- evolution-2.7.92/widgets/misc/e-task-widget.c.deprecated-gdk	2004-11-26 10:15:36.000000000 -0500
+++ evolution-2.7.92/widgets/misc/e-task-widget.c	2006-08-23 10:42:12.000000000 -0400
@@ -162,9 +162,9 @@
 	gtk_widget_show (priv->label);
 	gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0);
 
-	gdk_pixmap_unref (pixmap);
+	g_object_unref (pixmap);
 	if (mask)
-		gdk_bitmap_unref (mask);
+		g_object_unref (mask);
 
 	priv->tooltips = gtk_tooltips_new ();
 	g_object_ref (priv->tooltips);
--- evolution-2.7.92/widgets/table/e-cell-text.c.deprecated-gdk	2006-08-21 00:11:42.000000000 -0400
+++ evolution-2.7.92/widgets/table/e-cell-text.c	2006-08-23 10:42:12.000000000 -0400
@@ -425,9 +425,9 @@
 	}
 
 	if (text_view->stipple)
-		gdk_bitmap_unref (text_view->stipple);
+		g_object_unref (text_view->stipple);
 
-	gdk_cursor_destroy (text_view->i_cursor);
+	gdk_cursor_unref (text_view->i_cursor);
 
 	if (ect->colors) {
 		colormap = gtk_widget_get_colormap (GTK_WIDGET (text_view->canvas));
--- evolution-2.7.92/widgets/table/e-table-item.c.deprecated-gdk	2006-03-02 00:39:57.000000000 -0500
+++ evolution-2.7.92/widgets/table/e-table-item.c	2006-08-23 10:42:12.000000000 -0400
@@ -1793,7 +1793,7 @@
 	eti->grid_gc = NULL;
 	gdk_gc_unref (eti->focus_gc);
 	eti->focus_gc = NULL;
-	gdk_bitmap_unref (eti->stipple);
+	g_object_unref (eti->stipple);
 	eti->stipple = NULL;
 
 	eti_unrealize_cell_views (eti);
--- evolution-2.7.92/widgets/table/e-table-header-utils.c.deprecated-gdk	2006-06-12 06:26:47.000000000 -0400
+++ evolution-2.7.92/widgets/table/e-table-header-utils.c	2006-08-23 10:42:12.000000000 -0400
@@ -455,12 +455,12 @@
 		gdk_gc_set_clip_rectangle (gc, NULL);
 
 		if (pixmap) {
-			gdk_draw_pixmap (drawable, gc, pixmap,
+			gdk_draw_drawable (drawable, gc, pixmap,
 					 0, 0,
 					 xpos,
 					 inner_y + (inner_height - clip_height) / 2,
 					 clip_width, clip_height);
-			gdk_pixmap_unref (pixmap);
+			g_object_unref (pixmap);
 		}
 	} else {
 		e_table_draw_elided_string (drawable, gc, widget, 
--- evolution-2.7.92/widgets/table/e-table-field-chooser-item.c.deprecated-gdk	2006-01-30 07:28:20.000000000 -0500
+++ evolution-2.7.92/widgets/table/e-table-field-chooser-item.c	2006-08-23 10:42:12.000000000 -0400
@@ -564,12 +564,12 @@
 				    E_TABLE_COL_ARROW_NONE);
 
 	gtk_drag_set_icon_pixmap        (context,
-					 gdk_window_get_colormap (widget->window),
+					 gdk_drawable_get_colormap (GDK_DRAWABLE (widget->window)),
 					 pixmap,
 					 NULL,
 					 etfci->width / 2,
 					 button_height / 2);
-	gdk_pixmap_unref (pixmap);
+	g_object_unref (pixmap);
 	etfci->maybe_drag = FALSE;
 }
 
--- evolution-2.7.92/widgets/table/e-tree.c.deprecated-gdk	2006-01-30 07:28:21.000000000 -0500
+++ evolution-2.7.92/widgets/table/e-tree.c	2006-08-23 10:42:12.000000000 -0400
@@ -1376,7 +1376,7 @@
 
 	et_connect_to_etta (e_tree);
 
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
 
 	e_tree->priv->sorter = e_sorter_new();
 
--- evolution-2.7.92/widgets/table/e-table-field-chooser.c.deprecated-gdk	2006-01-30 07:28:20.000000000 -0500
+++ evolution-2.7.92/widgets/table/e-table-field-chooser.c	2006-08-23 10:42:12.000000000 -0400
@@ -167,7 +167,7 @@
 	gtk_widget_reparent(widget,
 			    GTK_WIDGET(etfc));
 
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
 
 	etfc->canvas = GNOME_CANVAS(glade_xml_get_widget(gui, "canvas-buttons"));
 
--- evolution-2.7.92/widgets/table/e-table.c.deprecated-gdk	2006-01-30 07:28:21.000000000 -0500
+++ evolution-2.7.92/widgets/table/e-table.c	2006-08-23 10:42:12.000000000 -0400
@@ -1533,7 +1533,7 @@
 	e_table->model = etm;
 	g_object_ref (etm);
 
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
 
 	connect_header (e_table, state);
 	e_table->horizontal_scrolling = specification->horizontal_scrolling;
--- evolution-2.7.92/widgets/table/e-cell-toggle.c.deprecated-gdk	2006-01-30 07:28:20.000000000 -0500
+++ evolution-2.7.92/widgets/table/e-cell-toggle.c	2006-08-23 10:42:12.000000000 -0400
@@ -97,7 +97,7 @@
 
 	for (i = 0; i < etog->n_states * CACHE_SEQ_COUNT; i++)
 		if (toggle_view->pixmap_cache[i])
-			gdk_pixmap_unref (toggle_view->pixmap_cache[i]);
+			g_object_unref (toggle_view->pixmap_cache[i]);
 	g_free (toggle_view->pixmap_cache);
 	g_free (ecell_view);
 }	
@@ -236,7 +236,7 @@
 		height = gdk_pixbuf_get_height (image);
 	}
 
-	gdk_draw_pixmap	 (drawable, toggle_view->gc,
+	gdk_draw_drawable (drawable, toggle_view->gc,
 			  pixmap,
 			  0, 0,
 			  x, y,
@@ -369,7 +369,7 @@
 
 	for (i = 0; i < toggle->n_states * CACHE_SEQ_COUNT; i++) {
 		if (toggle_view->pixmap_cache[i]) {
-			gdk_pixmap_unref (toggle_view->pixmap_cache[i]);
+			g_object_unref (toggle_view->pixmap_cache[i]);
 			toggle_view->pixmap_cache[i] = NULL;
 		}
 	}
--- evolution-2.7.92/widgets/table/e-table-header-item.c.deprecated-gdk	2006-06-12 06:26:47.000000000 -0400
+++ evolution-2.7.92/widgets/table/e-table-header-item.c	2006-08-23 10:42:12.000000000 -0400
@@ -491,7 +491,7 @@
 	gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128);
 	gdk_pixbuf_unref (pixbuf);
 
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
 	win = gtk_window_new (GTK_WINDOW_POPUP);
 
 	pix = gtk_image_new_from_pixmap (pixmap, bitmap);
@@ -500,8 +500,8 @@
 	gtk_widget_shape_combine_mask (win, bitmap, 0, 0);
 	gtk_widget_pop_colormap ();
 	
-	gdk_pixmap_unref (pixmap);
-	gdk_bitmap_unref (bitmap);
+	g_object_unref (pixmap);
+	g_object_unref (bitmap);
 	
 	return win;
 }
@@ -950,7 +950,7 @@
 	gtk_drag_dest_unset (GTK_WIDGET (item->canvas));
 
 	if (ethi->stipple){
-		gdk_bitmap_unref (ethi->stipple);
+		g_object_unref (ethi->stipple);
 		ethi->stipple = NULL;
 	}
 	
@@ -1216,12 +1216,12 @@
 			arrows, GINT_TO_POINTER (ecol->col_idx)));
 	gtk_drag_set_icon_pixmap (
 		context,
-		gdk_window_get_colormap (widget->window),
+		gdk_drawable_get_colormap (GDK_DRAWABLE (widget->window)),
 		pixmap,
 		NULL,
 		col_width / 2,
 		ethi->height / 2);
-	gdk_pixmap_unref (pixmap);
+	g_object_unref (pixmap);
 
 	ethi->maybe_drag = FALSE;
 	g_hash_table_destroy (arrows);
--- evolution-2.7.92/widgets/text/e-text.c.deprecated-gdk	2006-07-22 07:14:57.000000000 -0400
+++ evolution-2.7.92/widgets/text/e-text.c	2006-08-23 10:42:12.000000000 -0400
@@ -229,7 +229,7 @@
 	text->revert = NULL;
 
 	if (text->stipple)
-		gdk_bitmap_unref (text->stipple);
+		g_object_unref (text->stipple);
 	text->stipple = NULL;
 
 	if (text->timeout_id) {
@@ -645,11 +645,11 @@
 set_stipple (EText *text, GdkBitmap *stipple, int reconfigure)
 {
 	if (text->stipple && !reconfigure)
-		gdk_bitmap_unref (text->stipple);
+		g_object_unref (text->stipple);
 
 	text->stipple = stipple;
 	if (stipple && !reconfigure)
-		gdk_bitmap_ref (stipple);
+		g_object_ref (stipple);
 
 	if (text->gc) {
 		if (stipple) {
@@ -1263,9 +1263,9 @@
 	gdk_gc_unref (text->gc);
 	text->gc = NULL;
 
-	gdk_cursor_destroy (text->i_cursor);
+	gdk_cursor_unref (text->i_cursor);
 	text->i_cursor = NULL;
-	gdk_cursor_destroy (text->default_cursor);
+	gdk_cursor_unref (text->default_cursor);
 	text->default_cursor = NULL;
 
 	if (parent_class->unrealize)
--- evolution-2.7.92/e-util/e-cursor.c.deprecated-gdk	2005-06-08 07:46:48.000000000 -0400
+++ evolution-2.7.92/e-util/e-cursor.c	2006-08-23 10:42:12.000000000 -0400
@@ -61,7 +61,7 @@
 		}
 
 		gdk_window_set_cursor (toplevel->window, window_cursor);
-		gdk_cursor_destroy (window_cursor);
+		gdk_cursor_unref (window_cursor);
 	}
 
 }
--- evolution-2.7.92/calendar/gui/e-day-view-top-item.c.deprecated-gdk	2006-05-09 05:02:30.000000000 -0400
+++ evolution-2.7.92/calendar/gui/e-day-view-top-item.c	2006-08-23 10:42:12.000000000 -0400
@@ -572,7 +572,7 @@
 			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 			if (mask != NULL)
 				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
+			gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 E_DAY_VIEW_ICON_WIDTH,
@@ -580,9 +580,9 @@
 			icon_x -= icon_x_inc;
 		}
 
-		gdk_pixmap_unref (pixmap);
+		g_object_unref (pixmap);
 		if (mask != NULL)
-			gdk_bitmap_unref (mask);
+			g_object_unref (mask);
 	}
 
 	e_cal_component_free_categories_list (categories_list);
@@ -1158,7 +1158,7 @@
 			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 			if (mask != NULL)
 				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
+			gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 E_DAY_VIEW_ICON_WIDTH,
@@ -1166,9 +1166,9 @@
 			icon_x -= icon_x_inc;
 		}
 
-		gdk_pixmap_unref (pixmap);
+		g_object_unref (pixmap);
 		if (mask != NULL)
-			gdk_bitmap_unref (mask);
+			g_object_unref (mask);
 	}
 
 	e_cal_component_free_categories_list (categories_list);
--- evolution-2.7.92/calendar/gui/e-day-view-main-item.c.deprecated-gdk	2006-08-07 00:47:42.000000000 -0400
+++ evolution-2.7.92/calendar/gui/e-day-view-main-item.c	2006-08-23 10:42:12.000000000 -0400
@@ -795,7 +795,7 @@
 			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 			if (mask != NULL)
 				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
+			gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 MIN (E_DAY_VIEW_ICON_WIDTH,
@@ -803,9 +803,9 @@
 					 MIN (E_DAY_VIEW_ICON_HEIGHT,
 					      max_icon_h));
 
-			gdk_pixmap_unref (pixmap);
+			g_object_unref (pixmap);
 			if (mask != NULL)
-				gdk_bitmap_unref (mask);
+				g_object_unref (mask);
 
 			icon_x += icon_x_inc;
 			icon_y += icon_y_inc;
@@ -1930,7 +1930,7 @@
 				gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 				if (mask != NULL)
 					gdk_gc_set_clip_mask (gc, mask);
-				gdk_draw_pixmap (drawable, gc,
+				gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 MIN (E_DAY_VIEW_ICON_WIDTH,
@@ -1938,9 +1938,9 @@
 					 MIN (E_DAY_VIEW_ICON_HEIGHT,
 					      max_icon_h));
 
-				gdk_pixmap_unref (pixmap);
+				g_object_unref (pixmap);
 				if (mask != NULL)
-					gdk_bitmap_unref (mask);
+					g_object_unref (mask);
 
 				icon_x += icon_x_inc;
 				icon_y += icon_y_inc;
--- evolution-2.7.92/calendar/gui/e-week-view-event-item.c.deprecated-gdk	2006-08-19 01:49:09.000000000 -0400
+++ evolution-2.7.92/calendar/gui/e-week-view-event-item.c	2006-08-23 10:42:12.000000000 -0400
@@ -704,16 +704,16 @@
 			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 			if (mask != NULL)
 				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
+			gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 E_WEEK_VIEW_ICON_WIDTH,
 					 E_WEEK_VIEW_ICON_HEIGHT);
 			icon_x += icon_x_inc;
 		}
-		gdk_pixmap_unref (pixmap);
+		g_object_unref (pixmap);
 		if (mask != NULL)
-			gdk_bitmap_unref (mask);
+			g_object_unref (mask);
 	}
 
 	e_cal_component_free_categories_list (categories_list);
@@ -1388,16 +1388,16 @@
 			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 			if (mask != NULL)
 				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
+			gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 E_WEEK_VIEW_ICON_WIDTH,
 					 E_WEEK_VIEW_ICON_HEIGHT);
 			icon_x += icon_x_inc;
 		}
-		gdk_pixmap_unref (pixmap);
+		g_object_unref (pixmap);
 		if (mask != NULL)
-			gdk_bitmap_unref (mask);
+			g_object_unref (mask);
 	}
 
 	cairo_destroy (cr);
--- evolution-2.7.92/calendar/gui/calendar-commands.c.deprecated-gdk	2006-01-29 23:27:10.000000000 -0500
+++ evolution-2.7.92/calendar/gui/calendar-commands.c	2006-08-23 10:42:12.000000000 -0400
@@ -154,7 +154,7 @@
 
 	cursor = gdk_cursor_new (GDK_WATCH);
 	gdk_window_set_cursor (GTK_WIDGET (gcal)->window, cursor);
-	gdk_cursor_destroy (cursor);
+	gdk_cursor_unref (cursor);
 	gdk_flush ();
 }
 
--- evolution-2.7.92/calendar/gui/e-meeting-time-sel-item.c.deprecated-gdk	2006-07-22 07:14:51.000000000 -0400
+++ evolution-2.7.92/calendar/gui/e-meeting-time-sel-item.c	2006-08-23 10:42:12.000000000 -0400
@@ -159,15 +159,15 @@
 	mts_item = E_MEETING_TIME_SELECTOR_ITEM (object);
 
 	if (mts_item->normal_cursor) {
-		gdk_cursor_destroy (mts_item->normal_cursor);
+		gdk_cursor_unref (mts_item->normal_cursor);
 		mts_item->normal_cursor = NULL;
 	}
 	if (mts_item->resize_cursor) {
-		gdk_cursor_destroy (mts_item->resize_cursor);
+		gdk_cursor_unref (mts_item->resize_cursor);
 		mts_item->resize_cursor = NULL;
 	}
 	if (mts_item->busy_cursor) {
-		gdk_cursor_destroy (mts_item->busy_cursor);
+		gdk_cursor_unref (mts_item->busy_cursor);
 		mts_item->busy_cursor = NULL;
 	}
 
--- evolution-2.7.92/calendar/gui/e-meeting-time-sel.c.deprecated-gdk	2006-07-22 07:14:51.000000000 -0400
+++ evolution-2.7.92/calendar/gui/e-meeting-time-sel.c	2006-08-23 10:42:12.000000000 -0400
@@ -822,7 +822,7 @@
 	e_meeting_time_selector_remove_timeout (mts);
 	
 	if (mts->stipple) {
-		gdk_bitmap_unref (mts->stipple);
+		g_object_unref (mts->stipple);
 		mts->stipple = NULL;
 	}
 	

evolution-2.7.92-deprecated-glib.patch:
 calendar/gui/e-meeting-list-view.c |    2 +-
 widgets/table/e-tree-memory.c      |    9 ++-------
 widgets/table/e-tree-sorted.c      |    9 ++-------
 3 files changed, 5 insertions(+), 15 deletions(-)

--- NEW FILE evolution-2.7.92-deprecated-glib.patch ---
--- evolution-2.7.92/widgets/table/e-tree-memory.c.deprecated-glib	2005-06-17 11:20:34.000000000 -0400
+++ evolution-2.7.92/widgets/table/e-tree-memory.c	2006-08-23 10:41:16.000000000 -0400
@@ -38,10 +38,7 @@
 
 #include "e-tree-memory.h"
 
-#define TREEPATH_CHUNK_AREA_SIZE (30 * sizeof (ETreeMemoryPath))
-
 static ETreeModelClass *parent_class;
-static GMemChunk  *node_chunk;
 
 enum {
 	FILL_IN_CHILDREN,
@@ -358,8 +355,6 @@
 
 	parent_class                     = g_type_class_peek_parent (klass);
 	
-	node_chunk                       = g_mem_chunk_create (ETreeMemoryPath, TREEPATH_CHUNK_AREA_SIZE, G_ALLOC_AND_FREE);
-
 	signals [FILL_IN_CHILDREN] =
 		g_signal_new ("fill_in_children",
 			      E_OBJECT_CLASS_TYPE (object_class),
@@ -509,7 +504,7 @@
 	if (!tree_model->priv->frozen)
 		e_tree_model_pre_change(E_TREE_MODEL(tree_model));
 
-	new_path = g_chunk_new0 (ETreeMemoryPath, node_chunk);
+	new_path = g_slice_new0 (ETreeMemoryPath);
 
 	new_path->node_data = node_data;
 	new_path->children_computed = FALSE;
@@ -584,7 +579,7 @@
 		etree->priv->destroy_func (node->node_data, etree->priv->destroy_user_data);
 	}
 
-	g_chunk_free(node, node_chunk);
+	g_slice_free (ETreeMemoryPath, node);
 }
 
 /**
--- evolution-2.7.92/widgets/table/e-tree-sorted.c.deprecated-glib	2005-06-17 11:20:34.000000000 -0400
+++ evolution-2.7.92/widgets/table/e-tree-sorted.c	2006-08-23 10:41:16.000000000 -0400
@@ -47,12 +47,9 @@
 /* maximum insertions between an idle event that we will do without scheduling an idle sort */
 #define ETS_INSERT_MAX (4)
 
-#define TREEPATH_CHUNK_AREA_SIZE (30 * sizeof (ETreeSortedPath))
-
 #define d(x)
 
 static ETreeModel *parent_class;
-static GMemChunk  *node_chunk;
 
 enum {
 	NODE_RESORTED,
@@ -365,7 +362,7 @@
 free_path (ETreeSortedPath *path)
 {
 	free_children(path);
-	g_chunk_free(path, node_chunk);
+	g_slice_free(ETreeSortedPath, path);
 }
 
 static ETreeSortedPath *
@@ -373,7 +370,7 @@
 {
 	ETreeSortedPath *path;
 
-	path = g_chunk_new0 (ETreeSortedPath, node_chunk);
+	path = g_slice_new0 (ETreeSortedPath);
 
 	path->corresponding = corresponding;
 	path->parent = parent;
@@ -1157,8 +1154,6 @@
 
 	parent_class                     = g_type_class_peek_parent (klass);
 
-	node_chunk                       = g_mem_chunk_create (ETreeSortedPath, TREEPATH_CHUNK_AREA_SIZE, G_ALLOC_AND_FREE);
-
 	klass->node_resorted             = NULL;
 	
 	object_class->dispose            = ets_dispose;
--- evolution-2.7.92/calendar/gui/e-meeting-list-view.c.deprecated-glib	2006-04-22 00:39:20.000000000 -0400
+++ evolution-2.7.92/calendar/gui/e-meeting-list-view.c	2006-08-23 10:41:16.000000000 -0400
@@ -786,7 +786,7 @@
 					g_slist_free (*la);
 					*la = NULL;
 				} else
-					*la = g_slist_remove_link (*la, g_slist_find_custom (*la, attendee, (GCompareFunc)g_strcasecmp));
+					*la = g_slist_remove_link (*la, g_slist_find_custom (*la, attendee, (GCompareFunc)g_ascii_strcasecmp));
 			}
 		}
 


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- evolution.spec	22 Aug 2006 20:11:25 -0000	1.184
+++ evolution.spec	23 Aug 2006 18:22:04 -0000	1.185
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -128,6 +128,10 @@
 # Gnome.org bug #352423
 Patch34: evolution-2.7.92-uninitialized-gerror.patch
 
+# Gnome.org bug #352450 (2 patches)
+Patch35: evolution-2.7.92-deprecated-glib.patch
+Patch36: evolution-2.7.92-deprecated-gdk.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -264,6 +268,8 @@
 %patch32 -p1 -b .mail-account-disable
 %patch33 -p1 -b .provide-camel-exception
 %patch34 -p1 -b .uninitialized-gerror
+%patch35 -p1 -b .deprecated-glib
+%patch36 -p1 -b .deprecated-gdk
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -654,6 +660,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Aug 23 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-4.fc6
+- Add patches for Gnome.org bug #352450.
+
 * Tue Aug 22 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-3.fc6
 - Replace my patch for RH bug #202383 with a better one from upstream.
 - Add patch for Gnome.org bug #352423.



From fedora-cvs-commits at redhat.com  Wed Aug 23 18:29:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 14:29:10 -0400
Subject: rpms/jpackage-utils/devel jpackage-utils.spec,1.29,1.30
Message-ID: <200608231829.k7NITA5r014401@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/jpackage-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14352

Modified Files:
	jpackage-utils.spec 
Log Message:
Rebuild




Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jpackage-utils.spec	22 Jul 2006 08:43:57 -0000	1.29
+++ jpackage-utils.spec	23 Aug 2006 18:29:07 -0000	1.30
@@ -5,7 +5,7 @@
 
 Name:           jpackage-utils
 Version:        1.6.6
-Release:        1jpp_5rh
+Release:        1jpp.6
 Epoch:          0
 Summary:        JPackage utilities
 License:        JPackage License
@@ -208,6 +208,9 @@
 
 
 %changelog
+* Wed Aug 23 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.6.6-1jpp.6
+- Rebuild
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.6.6-1jpp_5rh
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 18:48:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 14:48:55 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.166,
	1.167
Message-ID: <200608231848.k7NImtQc029978@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28913

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
Remove duplicate macro definitions




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- java-1.4.2-gcj-compat.spec	14 Aug 2006 18:59:44 -0000	1.166
+++ java-1.4.2-gcj-compat.spec	23 Aug 2006 18:48:52 -0000	1.167
@@ -13,9 +13,6 @@
 %define gccver		4.0.0-0.42
 %define jgcver		1.0.61
 
-%define name		java-%{javaver}-%{origin}-compat
-%define version		%{javaver}.%{buildver}
-%define release 	40jpp_101rh
 %define cname           java-%{javaver}-%{origin}
 
 %define	sdklnk		java-%{javaver}-%{origin}
@@ -28,9 +25,9 @@
 
 %define plugindir       %{_libdir}/mozilla/plugins
 
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
+Name:		java-%{javaver}-%{origin}-compat
+Version:	%{javaver}.%{buildver}
+Release: 	40jpp.102
 Epoch:		0
 Summary:	JPackage runtime scripts for GCJ
 
@@ -649,6 +646,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Wed Aug 23 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.4.2.0-40jpp.102
+- Remove duplicate macro definitions
+- Rebuild
+
 * Mon Aug 14 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_101rh
 - Add libgcj-devel to devel and src post and postun
   requirements. (202007)



From fedora-cvs-commits at redhat.com  Wed Aug 23 19:07:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 15:07:44 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.172,1.173
Message-ID: <200608231907.k7NJ7iSI007652@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7558

Modified Files:
	gtk2.spec 
Log Message:
fix 203588



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- gtk2.spec	18 Aug 2006 15:38:02 -0000	1.172
+++ gtk2.spec	23 Aug 2006 19:07:42 -0000	1.173
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -30,6 +30,7 @@
 Patch2: gtk+-2.10.1-search.patch
 # Fixed in cvs
 Patch3: gtk+-2.10.2-recent.patch
+Patch4: gtk+-2.10.2-values-and-names.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -111,6 +112,7 @@
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .search
 %patch3 -p1 -b .recent
+%patch4 -p1 -b .values-and-names
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -282,6 +284,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Wed Aug 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.2-3.fc6
+- Fix confusion between values and names in printer options (#203588)
+
 * Fri Aug 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.2-2.fc6
 - Fix some problems with the recent files code
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 19:23:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 15:23:21 -0400
Subject: rpms/gtk2/devel gtk+-2.10.2-values-and-names.patch,NONE,1.1
Message-ID: <200608231923.k7NJNKkA027483@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27443

Added Files:
	gtk+-2.10.2-values-and-names.patch 
Log Message:
add patch


gtk+-2.10.2-values-and-names.patch:
 gtkprinteroptionwidget.c |   93 +++++++++++++++++++++++++----------------------
 gtkprinteroptionwidget.h |   14 +++----
 2 files changed, 58 insertions(+), 49 deletions(-)

--- NEW FILE gtk+-2.10.2-values-and-names.patch ---
--- gtk+-2.10.2/gtk/gtkprinteroptionwidget.c.values-and-names	2006-08-23 15:05:07.000000000 -0400
+++ gtk+-2.10.2/gtk/gtkprinteroptionwidget.c	2006-08-23 15:05:26.000000000 -0400
@@ -89,7 +89,7 @@
 						    GValue       *value,
 						    GParamSpec   *pspec);
 static gboolean gtk_printer_option_widget_mnemonic_activate (GtkWidget *widget,
-							      gboolean   group_cycling);
+							      gboolean  group_cycling);
 
 static void
 gtk_printer_option_widget_class_init (GtkPrinterOptionWidgetClass *class)
@@ -229,8 +229,8 @@
 }
 
 void
-gtk_printer_option_widget_set_source (GtkPrinterOptionWidget  *widget,
-				      GtkPrinterOption *source)
+gtk_printer_option_widget_set_source (GtkPrinterOptionWidget *widget,
+				      GtkPrinterOption       *source)
 {
   GtkPrinterOptionWidgetPrivate *priv = widget->priv;
 
@@ -256,12 +256,18 @@
   g_object_notify (G_OBJECT (widget), "source");
 }
 
+enum {
+  NAME_COLUMN,
+  VALUE_COLUMN,
+  N_COLUMNS
+};
+
 static void
 combo_box_set_model (GtkWidget *combo_box)
 {
   GtkListStore *store;
 
-  store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+  store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
   gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
   g_object_unref (store);
 }
@@ -274,7 +280,7 @@
   cell = gtk_cell_renderer_text_new ();
   gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE);
   gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell,
-                                  "text", 1,
+                                  "text", NAME_COLUMN,
                                    NULL);
 }
 
@@ -286,7 +292,7 @@
 
   combo_box_set_model (combo_box);
 
-  gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo_box), 1);
+  gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo_box), NAME_COLUMN);
 
   return combo_box;
 }
@@ -304,9 +310,9 @@
 }
   
 static void
-combo_box_append (GtkWidget *combo,
-		  const char *display_text,
-		  const char *value)
+combo_box_append (GtkWidget   *combo,
+		  const gchar *display_text,
+		  const gchar *value)
 {
   GtkTreeModel *model;
   GtkListStore *store;
@@ -317,24 +323,27 @@
 
   gtk_list_store_append (store, &iter);
   gtk_list_store_set (store, &iter,
-		      0, display_text,
-		      1, value,
+		      NAME_COLUMN, display_text,
+		      VALUE_COLUMN, value,
 		      -1);
 }
 
 struct ComboSet {
   GtkComboBox *combo;
-  const char *value;
+  const gchar *value;
 };
 
 static gboolean
-set_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+set_cb (GtkTreeModel *model, 
+	GtkTreePath  *path, 
+	GtkTreeIter  *iter, 
+	gpointer      data)
 {
   struct ComboSet *set_data = data;
   gboolean found;
   char *value;
   
-  gtk_tree_model_get (model, iter, 1, &value, -1);
+  gtk_tree_model_get (model, iter, VALUE_COLUMN, &value, -1);
   found = (strcmp (value, set_data->value) == 0);
   g_free (value);
   
@@ -345,8 +354,8 @@
 }
 
 static void
-combo_box_set (GtkWidget *combo,
-	       const char *value)
+combo_box_set (GtkWidget   *combo,
+	       const gchar *value)
 {
   GtkTreeModel *model;
   GtkListStore *store;
@@ -364,24 +373,23 @@
 combo_box_get (GtkWidget *combo)
 {
   GtkTreeModel *model;
-  char *val;
+  gchar *value;
   GtkTreeIter iter;
 
   if (GTK_IS_COMBO_BOX_ENTRY (combo))
     {
-      val = gtk_combo_box_get_active_text(GTK_COMBO_BOX (combo));
+      value = gtk_combo_box_get_active_text(GTK_COMBO_BOX (combo));
     }
   else
     {
       model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
 
-      val = NULL;
+      value = NULL;
       if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
-         gtk_tree_model_get (model, &iter,
-	 		     1, &val,
-			    -1);
+         gtk_tree_model_get (model, &iter, VALUE_COLUMN, &value, -1);
      }
-  return val;
+
+  return value;
 }
 
 
@@ -430,7 +438,7 @@
 }
 
 static void
-check_toggled_cb (GtkToggleButton *toggle_button,
+check_toggled_cb (GtkToggleButton        *toggle_button,
 		  GtkPrinterOptionWidget *widget)
 {
   GtkPrinterOptionWidgetPrivate *priv = widget->priv;
@@ -443,7 +451,7 @@
 }
 
 static void
-filesave_changed_cb (GtkWidget *w,
+filesave_changed_cb (GtkWidget              *button,
                      GtkPrinterOptionWidget *widget)
 {
   GtkPrinterOptionWidgetPrivate *priv = widget->priv;
@@ -487,11 +495,11 @@
   emit_changed (widget);
 }
 
-static char *
-filter_numeric (const char *val,
-                gboolean allow_neg,
-		gboolean allow_dec,
-                gboolean *changed_out)
+static gchar *
+filter_numeric (const gchar *val,
+                gboolean     allow_neg,
+		gboolean     allow_dec,
+                gboolean    *changed_out)
 {
   gchar *filtered_val;
   int i, j;
@@ -530,8 +538,9 @@
 
   return filtered_val;
 }
+
 static void
-combo_changed_cb (GtkWidget *combo,
+combo_changed_cb (GtkWidget              *combo,
 		  GtkPrinterOptionWidget *widget)
 {
   GtkPrinterOptionWidgetPrivate *priv = widget->priv;
@@ -582,11 +591,11 @@
 }
 
 static void
-entry_changed_cb (GtkWidget *entry,
+entry_changed_cb (GtkWidget              *entry,
 		  GtkPrinterOptionWidget *widget)
 {
   GtkPrinterOptionWidgetPrivate *priv = widget->priv;
-  const char *value;
+  const gchar *value;
   
   g_signal_handler_block (priv->source, priv->source_changed_handler);
   value = gtk_entry_get_text (GTK_ENTRY (entry));
@@ -602,7 +611,7 @@
 		  GtkPrinterOptionWidget *widget)
 {
   GtkPrinterOptionWidgetPrivate *priv = widget->priv;
-  char *value;
+  gchar *value;
   
   g_signal_handler_block (priv->source, priv->source_changed_handler);
   value = g_object_get_data (G_OBJECT (button), "value");
@@ -616,7 +625,7 @@
 select_maybe (GtkWidget   *widget, 
 	      const gchar *value)
 {
-  char *v = g_object_get_data (G_OBJECT (widget), "value");
+  gchar *v = g_object_get_data (G_OBJECT (widget), "value");
       
   if (strcmp (value, v) == 0)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
@@ -632,11 +641,11 @@
 }
 
 static GSList *
-alternative_append (GtkWidget   *box,
-		    const gchar *label,
-                    const gchar *value,
+alternative_append (GtkWidget              *box,
+		    const gchar            *label,
+                    const gchar            *value,
 		    GtkPrinterOptionWidget *widget,
-		    GSList      *group)
+		    GSList                 *group)
 {
   GtkWidget *button;
 
@@ -875,7 +884,7 @@
 }
 
 gboolean
-gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget  *widget)
+gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *widget)
 {
   return widget->priv->label != NULL;
 }
@@ -886,8 +895,8 @@
   return widget->priv->label;
 }
 
-const char *
-gtk_printer_option_widget_get_value (GtkPrinterOptionWidget  *widget)
+const gchar *
+gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *widget)
 {
   GtkPrinterOptionWidgetPrivate *priv = widget->priv;
 
--- gtk+-2.10.2/gtk/gtkprinteroptionwidget.h.values-and-names	2006-08-23 15:05:18.000000000 -0400
+++ gtk+-2.10.2/gtk/gtkprinteroptionwidget.h	2006-08-23 15:05:26.000000000 -0400
@@ -50,14 +50,14 @@
   void (*changed) (GtkPrinterOptionWidget *widget);
 };
 
-GType		 gtk_printer_option_widget_get_type   (void) G_GNUC_CONST;
+GType	     gtk_printer_option_widget_get_type           (void) G_GNUC_CONST;
 
-GtkWidget * gtk_printer_option_widget_new                (GtkPrinterOption       *source);
-void        gtk_printer_option_widget_set_source         (GtkPrinterOptionWidget *setting,
-							  GtkPrinterOption       *source);
-gboolean    gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *setting);
-GtkWidget * gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget *setting);
-const char *gtk_printer_option_widget_get_value          (GtkPrinterOptionWidget *setting);
+GtkWidget   *gtk_printer_option_widget_new                (GtkPrinterOption       *source);
+void         gtk_printer_option_widget_set_source         (GtkPrinterOptionWidget *setting,
+		 					   GtkPrinterOption       *source);
+gboolean     gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *setting);
+GtkWidget   *gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget *setting);
+const gchar *gtk_printer_option_widget_get_value          (GtkPrinterOptionWidget *setting);
 
 G_END_DECLS
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 19:34:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 15:34:43 -0400
Subject: rpms/yelp/devel yelp.spec,1.72,1.73
Message-ID: <200608231934.k7NJYhKj030968@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30920

Modified Files:
	yelp.spec 
Log Message:

* Wed Aug 23 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.91-2
- Rebuild



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- yelp.spec	10 Aug 2006 15:10:54 -0000	1.72
+++ yelp.spec	23 Aug 2006 19:34:38 -0000	1.73
@@ -19,7 +19,7 @@
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
 Version: 2.15.91
-Release: 1
+Release: 2
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -130,6 +130,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Wed Aug 23 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.91-2
+- Rebuild
+
 * Thu Aug 10 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.91-1
 - Update to 2.15.91
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 20:26:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 16:26:23 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.56,1.57
Message-ID: <200608232026.k7NKQNSR017009@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16983

Modified Files:
	kexec-tools.spec 
Log Message:
bumping revision number


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kexec-tools.spec	22 Aug 2006 15:34:14 -0000	1.56
+++ kexec-tools.spec	23 Aug 2006 20:26:20 -0000	1.57
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 47%{?dist}
+Release: 48%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -157,6 +157,9 @@
 %doc TODO
 
 %changelog
+* Wed Aug 23, 2006 Neil Horman <nhorman at redhat.com> - 1.101-47%{dist}
+- Bumping revision number 
+
 * Tue Aug 22 2006 Jarod Wilson <jwilson at redhat.com> - 1.101-47%{dist}
 - ppc64 no-more-platform fix
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 20:27:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 16:27:59 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.57,1.58
Message-ID: <200608232027.k7NKRxq3017212@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17198

Modified Files:
	kexec-tools.spec 
Log Message:
bumping revision


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kexec-tools.spec	23 Aug 2006 20:26:20 -0000	1.57
+++ kexec-tools.spec	23 Aug 2006 20:27:56 -0000	1.58
@@ -157,7 +157,7 @@
 %doc TODO
 
 %changelog
-* Wed Aug 23, 2006 Neil Horman <nhorman at redhat.com> - 1.101-47%{dist}
+* Wed Aug 23 2006 Neil Horman <nhorman at redhat.com> - 1.101-47%{dist}
 - Bumping revision number 
 
 * Tue Aug 22 2006 Jarod Wilson <jwilson at redhat.com> - 1.101-47%{dist}



From fedora-cvs-commits at redhat.com  Wed Aug 23 20:31:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 16:31:48 -0400
Subject: rpms/gnome-keyring/devel gnome-keyring-0.5.2-null-fix.patch, NONE,
	1.1 gnome-keyring.spec, 1.28, 1.29
Message-ID: <200608232031.k7NKVm64017409@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/gnome-keyring/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17392

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-0.5.2-null-fix.patch 
Log Message:
* Wed Aug 23 2006 Dan Williams <dcbw at redhat.com> - 0.5.2-2.fc6
- Fix null pointer dereference (Gnome.org #352587)



gnome-keyring-0.5.2-null-fix.patch:
 gnome-keyring.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-keyring-0.5.2-null-fix.patch ---
--- gnome-keyring-0.5.2/gnome-keyring.c.nullfix	2006-08-23 16:31:47.000000000 -0400
+++ gnome-keyring-0.5.2/gnome-keyring.c	2006-08-23 16:32:25.000000000 -0400
@@ -2483,7 +2483,7 @@
 	GnomeKeyringResult result;
 	GList *found;
 	
-	out_list = NULL;
+	*out_list = NULL;
 	attributes = make_attribute_list_for_network_password (user,
 							       domain,
 							       server,


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnome-keyring.spec	21 Aug 2006 13:42:45 -0000	1.28
+++ gnome-keyring.spec	23 Aug 2006 20:31:46 -0000	1.29
@@ -3,10 +3,11 @@
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL/LGPL
 Group: System Environment/Libraries
 Source: gnome-keyring-%{version}.tar.bz2
+Patch0: gnome-keyring-0.5.2-null-fix.patch
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: gtk2 >= %{gtk2_version}
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q -n gnome-keyring-%{version}
+%patch0 -p1 -b .nullfix
 
 %build
 %configure --disable-gtk-doc
@@ -68,6 +70,9 @@
 %{_datadir}/gtk-doc/html/gnome-keyring/
 
 %changelog
+* Wed Aug 23 2006 Dan Williams <dcbw at redhat.com> - 0.5.2-2.fc6
+- Fix null pointer dereference (Gnome.org #352587)
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.2-1.fc6
 - Update to 0.5.2
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 20:37:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 16:37:58 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.26, 1.27 setroubleshoot.spec,
	1.31, 1.32 sources, 1.29, 1.30
Message-ID: <200608232037.k7NKbwg2018024@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17963/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.33-1 on branch devel from setroubleshoot-0.33-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	23 Aug 2006 15:33:26 -0000	1.26
+++ .cvsignore	23 Aug 2006 20:37:45 -0000	1.27
@@ -1 +1 @@
-setroubleshoot-0.32.tar.gz
+setroubleshoot-0.33.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- setroubleshoot.spec	23 Aug 2006 15:33:27 -0000	1.31
+++ setroubleshoot.spec	23 Aug 2006 20:37:45 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.32
+Version: 0.33
 Release: 1
 License: GPL
 Group: Applications/System
@@ -104,9 +104,14 @@
 /etc/rc.d/init.d/%{name}
 %{_sysconfdir}/xdg/autostart/*
 %{_datadir}/applications/*.desktop
+%{_datadir}/dbus-1/services/sealert.service
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Tue Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.33-1
+- Spell check plugins
+- fix dbus instantiation
+
 * Tue Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.32-1
 - Add avc_syslog to syslog translated avc message
 - Fix submitbug button


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	23 Aug 2006 15:33:27 -0000	1.29
+++ sources	23 Aug 2006 20:37:45 -0000	1.30
@@ -1 +1 @@
-3e9877c1abd9976ea697fb3c2ebec5ff  setroubleshoot-0.32.tar.gz
+667e5d7ba25fea3e74994cc52aebb254  setroubleshoot-0.33.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 23 20:42:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 16:42:41 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.81,
	1.82 policy-20060802.patch, 1.15, 1.16 selinux-policy.spec,
	1.255, 1.256 sources, 1.85, 1.86
Message-ID: <200608232042.k7NKgfqt028741@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28701

Modified Files:
	.cvsignore policy-20060802.patch selinux-policy.spec sources 
Log Message:
* Sun Aug 23 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-1
- Update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- .cvsignore	20 Aug 2006 15:11:37 -0000	1.81
+++ .cvsignore	23 Aug 2006 20:42:38 -0000	1.82
@@ -82,3 +82,4 @@
 serefpolicy-2.3.6.tgz
 serefpolicy-2.3.7.tgz
 serefpolicy-2.3.8.tgz
+serefpolicy-2.3.9.tgz

policy-20060802.patch:
 mls                                  |    9 
 modules/admin/amanda.fc              |   51 ----
 modules/admin/anaconda.te            |   20 +
 modules/admin/bootloader.te          |    4 
 modules/admin/consoletype.te         |   11 -
 modules/admin/firstboot.te           |    2 
 modules/admin/prelink.te             |    2 
 modules/admin/rpm.fc                 |    2 
 modules/admin/rpm.if                 |   13 -
 modules/admin/usermanage.te          |    5 
 modules/apps/java.fc                 |    9 
 modules/apps/mozilla.if              |    2 
 modules/apps/wine.te                 |    2 
 modules/kernel/corecommands.fc       |    1 
 modules/kernel/corecommands.if       |    1 
 modules/kernel/corenetwork.te.in     |    7 
 modules/kernel/devices.fc            |    3 
 modules/kernel/devices.if            |   36 +++
 modules/kernel/devices.te            |    8 
 modules/kernel/files.if              |   18 +
 modules/kernel/filesystem.te         |    2 
 modules/kernel/kernel.if             |   75 +++++++
 modules/kernel/terminal.if           |   19 +
 modules/services/amavis.te           |    7 
 modules/services/apache.te           |    2 
 modules/services/avahi.te            |    2 
 modules/services/bind.te             |    1 
 modules/services/ccs.fc              |    8 
 modules/services/ccs.if              |   45 ++++
 modules/services/ccs.te              |   84 +++++++
 modules/services/cpucontrol.te       |    2 
 modules/services/cron.if             |   17 +
 modules/services/cron.te             |    7 
 modules/services/cups.te             |   19 +
 modules/services/cyrus.te            |    5 
 modules/services/dbus.if             |    6 
 modules/services/dbus.te             |    2 
 modules/services/dovecot.te          |    4 
 modules/services/inn.te              |    1 
 modules/services/ldap.te             |    2 
 modules/services/mta.fc              |    2 
 modules/services/ntp.te              |    6 
 modules/services/oddjob.fc           |    8 
 modules/services/oddjob.if           |   76 +++++++
 modules/services/oddjob.te           |   70 ++++++
 modules/services/oddjob_mkhomedir.fc |    6 
 modules/services/oddjob_mkhomedir.if |   24 ++
 modules/services/oddjob_mkhomedir.te |   26 ++
 modules/services/openvpn.te          |    2 
 modules/services/pegasus.if          |   31 ++
 modules/services/pegasus.te          |    5 
 modules/services/postfix.te          |    7 
 modules/services/postgresql.te       |    1 
 modules/services/procmail.te         |    1 
 modules/services/radius.te           |    2 
 modules/services/ricci.fc            |   20 +
 modules/services/ricci.if            |  184 +++++++++++++++++
 modules/services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++
 modules/services/rpc.if              |    2 
 modules/services/rpc.te              |    6 
 modules/services/samba.te            |    8 
 modules/services/setroubleshoot.fc   |    9 
 modules/services/setroubleshoot.if   |    3 
 modules/services/setroubleshoot.te   |  110 ++++++++++
 modules/services/spamassassin.te     |    4 
 modules/services/squid.te            |    4 
 modules/services/ssh.if              |   23 ++
 modules/services/stunnel.te          |    2 
 modules/services/sysstat.te          |    3 
 modules/services/xserver.if          |   69 ++++++
 modules/services/xserver.te          |   19 +
 modules/system/authlogin.te          |   10 
 modules/system/fstools.te            |    1 
 modules/system/hostname.te           |   10 
 modules/system/init.if               |    7 
 modules/system/init.te               |    2 
 modules/system/libraries.fc          |    7 
 modules/system/locallogin.te         |    4 
 modules/system/logging.fc            |    3 
 modules/system/logging.if            |   21 +
 modules/system/logging.te            |    3 
 modules/system/lvm.fc                |    2 
 modules/system/lvm.te                |    6 
 modules/system/miscfiles.fc          |    1 
 modules/system/miscfiles.if          |   18 +
 modules/system/modutils.te           |    1 
 modules/system/mount.te              |    7 
 modules/system/selinuxutil.te        |   13 +
 modules/system/udev.fc               |    1 
 modules/system/udev.te               |    5 
 modules/system/unconfined.if         |    2 
 modules/system/unconfined.te         |    5 
 modules/system/userdomain.if         |  246 +++++++++++++++--------
 modules/system/userdomain.te         |   48 ++--
 modules/system/xen.if                |   38 +++
 modules/system/xen.te                |   26 +-
 96 files changed, 1861 insertions(+), 248 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- policy-20060802.patch	20 Aug 2006 15:11:37 -0000	1.15
+++ policy-20060802.patch	23 Aug 2006 20:42:38 -0000	1.16
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.8/policy/mls
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.9/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.8/policy/mls	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/mls	2006-08-23 13:04:07.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -22,9 +22,9 @@
  mlsconstrain dir { add_name remove_name reparent rmdir }
  	((( l1 dom l2 ) and ( l1 domby h2 )) or
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-2.3.8/policy/modules/admin/amanda.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-2.3.9/policy/modules/admin/amanda.fc
 --- nsaserefpolicy/policy/modules/admin/amanda.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/amanda.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/amanda.fc	2006-08-23 13:04:07.000000000 -0400
 @@ -9,62 +9,13 @@
  /tmp/amanda(/.*)?			gen_context(system_u:object_r:amanda_tmp_t,s0)
  
@@ -89,9 +89,9 @@
  /var/lib/amanda/disklist	--	gen_context(system_u:object_r:amanda_data_t,s0)
  /var/lib/amanda/gnutar-lists(/.*)?	gen_context(system_u:object_r:amanda_gnutarlists_t,s0)
  /var/lib/amanda/index			gen_context(system_u:object_r:amanda_data_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.8/policy/modules/admin/anaconda.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.9/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/anaconda.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/anaconda.te	2006-08-23 13:04:07.000000000 -0400
 @@ -25,8 +25,12 @@
  
  modutils_domtrans_insmod(anaconda_t)
@@ -134,9 +134,9 @@
 +dontaudit domain anaconda_t:fifo_file r_file_perms;
 +dontaudit domain anaconda_t:unix_stream_socket connectto;
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.8/policy/modules/admin/bootloader.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.9/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/bootloader.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/bootloader.te	2006-08-23 13:04:07.000000000 -0400
 @@ -83,8 +83,10 @@
  dev_read_rand(bootloader_t)
  dev_read_urand(bootloader_t)
@@ -149,9 +149,9 @@
  
  fs_getattr_xattr_fs(bootloader_t)
  fs_getattr_tmpfs(bootloader_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.8/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.9/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/consoletype.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/consoletype.te	2006-08-23 13:04:07.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -174,9 +174,9 @@
 +optional_policy(`
 +	xen_dontaudit_use_fds(consoletype_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.8/policy/modules/admin/firstboot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.9/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/firstboot.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/firstboot.te	2006-08-23 13:04:07.000000000 -0400
 @@ -106,7 +106,7 @@
  ')
  
@@ -186,9 +186,21 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.8/policy/modules/admin/rpm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.9/policy/modules/admin/prelink.te
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/prelink.te	2006-08-23 13:04:07.000000000 -0400
+@@ -74,6 +74,8 @@
+ 
+ miscfiles_read_localization(prelink_t)
+ 
++selinux_get_enforce_mode(prelink_t)
++
+ optional_policy(`
+ 	cron_system_entry(prelink_t, prelink_exec_t)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.9/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/rpm.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/rpm.fc	2006-08-23 13:04:07.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -198,9 +210,9 @@
  ')
  
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.8/policy/modules/admin/rpm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.9/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/rpm.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/rpm.if	2006-08-23 13:04:07.000000000 -0400
 @@ -75,12 +75,13 @@
  	')
  
@@ -221,19 +233,19 @@
  	allow rpm_t $3:chr_file rw_term_perms;
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.8/policy/modules/admin/usermanage.te
---- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/admin/usermanage.te	2006-08-18 23:12:03.000000000 -0400
-@@ -260,7 +260,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.9/policy/modules/admin/usermanage.te
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-23 12:14:56.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/usermanage.te	2006-08-23 13:04:07.000000000 -0400
+@@ -256,7 +256,7 @@
  ')
  
  optional_policy(`
 -	nscd_exec(groupadd_t)
 +	nscd_domtrans(groupadd_t)
- 	nscd_socket_use(groupadd_t)
  ')
  
-@@ -486,6 +486,7 @@
+ optional_policy(`
+@@ -481,6 +481,7 @@
  auth_relabel_shadow(useradd_t)
  auth_etc_filetrans_shadow(useradd_t)
  auth_rw_lastlog(useradd_t)
@@ -241,18 +253,18 @@
  auth_use_nsswitch(useradd_t)
  
  corecmd_exec_shell(useradd_t)
-@@ -535,7 +536,7 @@
+@@ -526,7 +527,7 @@
  ')
  
  optional_policy(`
 -	nscd_exec(useradd_t)
 +	nscd_domtrans(useradd_t)
- 	nscd_socket_use(useradd_t)
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.8/policy/modules/apps/java.fc
+ optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.9/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/apps/java.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/apps/java.fc	2006-08-23 13:04:07.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # /opt
@@ -273,9 +285,9 @@
 +/usr/bin/grmic  	--	gen_context(system_u:object_r:java_exec_t,s0)
 +/usr/bin/grmiregistry  	--	gen_context(system_u:object_r:java_exec_t,s0)
 +/usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.8/policy/modules/apps/mozilla.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.9/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-16 08:46:26.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/apps/mozilla.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/apps/mozilla.if	2006-08-23 13:04:07.000000000 -0400
 @@ -63,6 +63,7 @@
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
@@ -292,9 +304,9 @@
  
  	# Browse the web, connect to printer
  	sysnet_dns_name_resolve($1_mozilla_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.3.8/policy/modules/apps/wine.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.3.9/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/apps/wine.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/apps/wine.te	2006-08-23 13:04:07.000000000 -0400
 @@ -18,7 +18,7 @@
  #
  
@@ -304,9 +316,9 @@
  	unconfined_domain_noaudit(wine_t)
  	files_execmod_all_files(wine_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.8/policy/modules/kernel/corecommands.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/corecommands.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc	2006-08-23 13:04:07.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -315,9 +327,9 @@
  
  ifdef(`distro_debian',`
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.3.8/policy/modules/kernel/corecommands.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.3.9/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/corecommands.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.if	2006-08-23 13:04:07.000000000 -0400
 @@ -950,6 +950,7 @@
  
  	allow $1 exec_type:file manage_file_perms;
@@ -326,9 +338,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.8/policy/modules/kernel/corenetwork.te.in
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.9/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/corenetwork.te.in	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/corenetwork.te.in	2006-08-23 13:04:07.000000000 -0400
 @@ -67,12 +67,14 @@
  network_port(clamd, tcp,3310,s0)
  network_port(clockspeed, udp,4041,s0)
@@ -369,9 +381,9 @@
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
  network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
  network_port(spamd, tcp,783,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.8/policy/modules/kernel/devices.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.9/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/devices.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/devices.fc	2006-08-23 13:04:07.000000000 -0400
 @@ -12,6 +12,7 @@
  /dev/atibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/audio.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
@@ -389,10 +401,10 @@
  /dev/par.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
  /dev/patmgr[01]		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/pmu		-c	gen_context(system_u:object_r:power_device_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.3.8/policy/modules/kernel/devices.if
---- nsaserefpolicy/policy/modules/kernel/devices.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/devices.if	2006-08-18 23:12:03.000000000 -0400
-@@ -2992,3 +2992,40 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.3.9/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-08-23 12:14:51.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/devices.if	2006-08-23 13:04:07.000000000 -0400
+@@ -3034,3 +3034,39 @@
  
  	typeattribute $1 devices_unconfined_type;
  ')
@@ -432,10 +444,9 @@
 +
 +	allow $1 bios_device_t:chr_file write;
 +')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.8/policy/modules/kernel/devices.te
---- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/devices.te	2006-08-18 23:12:03.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.9/policy/modules/kernel/devices.te
+--- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-23 12:14:51.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/devices.te	2006-08-23 13:04:07.000000000 -0400
 @@ -72,6 +72,12 @@
  dev_node(lvm_control_t)
  
@@ -458,9 +469,9 @@
  
  type xen_device_t;
  dev_node(xen_device_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.8/policy/modules/kernel/files.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.9/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/files.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/files.if	2006-08-23 13:04:07.000000000 -0400
 @@ -2934,6 +2934,24 @@
  
  ########################################
@@ -486,9 +497,9 @@
  ##	Read the tmp directory (/tmp).
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.8/policy/modules/kernel/filesystem.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.9/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/filesystem.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/filesystem.te	2006-08-23 13:04:07.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -505,9 +516,9 @@
  
  ########################################
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.8/policy/modules/kernel/kernel.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.9/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-08-16 08:46:26.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/kernel.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/kernel.if	2006-08-23 13:04:07.000000000 -0400
 @@ -1443,6 +1443,42 @@
  
  ########################################
@@ -594,10 +605,10 @@
 +	dontaudit $1 proc_type:file getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.8/policy/modules/kernel/terminal.if
---- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/kernel/terminal.if	2006-08-18 23:12:03.000000000 -0400
-@@ -308,6 +308,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.9/policy/modules/kernel/terminal.if
+--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-23 12:14:51.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/terminal.if	2006-08-23 13:04:07.000000000 -0400
+@@ -329,6 +329,7 @@
  		type devpts_t;
  	')
  
@@ -605,7 +616,7 @@
  	dontaudit $1 devpts_t:dir search;
  ')
  
-@@ -948,3 +949,21 @@
+@@ -969,3 +970,21 @@
  	dontaudit $1 ttynode:chr_file { read write };
  ')
  
@@ -627,9 +638,9 @@
 +	allow $1 devpts_t:filesystem getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.8/policy/modules/services/amavis.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.9/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-08-16 08:46:29.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/amavis.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/amavis.te	2006-08-23 13:04:07.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -659,10 +670,14 @@
 +optional_policy(`
 +	postfix_read_config(amavis_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.8/policy/modules/services/apache.te
---- nsaserefpolicy/policy/modules/services/apache.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/apache.te	2006-08-18 23:12:03.000000000 -0400
-@@ -272,7 +272,6 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.9/policy/modules/services/apache.te
+--- nsaserefpolicy/policy/modules/services/apache.te	2006-08-23 12:14:54.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/apache.te	2006-08-23 13:04:07.000000000 -0400
+@@ -268,10 +268,10 @@
+ 
+ seutil_dontaudit_search_config(httpd_t)
+ 
++sysnet_use_ldap(httpd_t)
  sysnet_read_config(httpd_t)
  
  userdom_use_unpriv_users_fds(httpd_t)
@@ -670,9 +685,9 @@
  
  mta_send_mail(httpd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.8/policy/modules/services/avahi.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.9/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/avahi.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/avahi.te	2006-08-23 13:04:07.000000000 -0400
 @@ -63,6 +63,7 @@
  domain_use_interactive_fds(avahi_t)
  
@@ -689,9 +704,9 @@
  
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.8/policy/modules/services/bind.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.9/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2006-08-16 08:46:29.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/bind.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/bind.te	2006-08-23 13:04:07.000000000 -0400
 @@ -218,6 +218,7 @@
  allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
  
@@ -700,9 +715,9 @@
  
  allow ndc_t named_t:unix_stream_socket connectto;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-2.3.8/policy/modules/services/ccs.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-2.3.9/policy/modules/services/ccs.fc
 --- nsaserefpolicy/policy/modules/services/ccs.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ccs.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ccs.fc	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,8 @@
 +# ccs executable will have:
 +# label: system_u:object_r:ccs_exec_t
@@ -712,9 +727,9 @@
 +/sbin/ccsd		--	gen_context(system_u:object_r:ccs_exec_t,s0)
 +/var/run/cluster(/.*)?		gen_context(system_u:object_r:ccs_var_run_t,s0)
 +/etc/cluster(/.*)?		gen_context(system_u:object_r:cluster_conf_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.if serefpolicy-2.3.8/policy/modules/services/ccs.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.if serefpolicy-2.3.9/policy/modules/services/ccs.if
 --- nsaserefpolicy/policy/modules/services/ccs.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ccs.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ccs.if	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,45 @@
 +## <summary>policy for ccs</summary>
 +
@@ -761,9 +776,9 @@
 +	allow $1 ccs_var_run_t:sock_file write;
 +	allow $1 ccs_t:unix_stream_socket connectto;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.3.8/policy/modules/services/ccs.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.3.9/policy/modules/services/ccs.te
 --- nsaserefpolicy/policy/modules/services/ccs.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ccs.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ccs.te	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,84 @@
 +policy_module(ccs,1.0.0)
 +
@@ -849,9 +864,9 @@
 +
 +allow ccs_t cluster_conf_t:dir r_dir_perms;
 +allow ccs_t cluster_conf_t:file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cpucontrol.te serefpolicy-2.3.8/policy/modules/services/cpucontrol.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cpucontrol.te serefpolicy-2.3.9/policy/modules/services/cpucontrol.te
 --- nsaserefpolicy/policy/modules/services/cpucontrol.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/cpucontrol.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cpucontrol.te	2006-08-23 13:04:07.000000000 -0400
 @@ -25,7 +25,7 @@
  # CPU microcode loader local policy
  #
@@ -861,9 +876,9 @@
  dontaudit cpucontrol_t self:capability sys_tty_config;
  allow cpucontrol_t self:process signal_perms;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.8/policy/modules/services/cron.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.9/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/cron.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cron.if	2006-08-23 13:04:07.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -914,9 +929,9 @@
  	allow $1 system_crond_t:fd use;
  	allow $1 system_crond_t:fifo_file rw_file_perms;
  	allow $1 system_crond_t:process sigchld;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.8/policy/modules/services/cron.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.9/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/cron.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cron.te	2006-08-23 13:04:07.000000000 -0400
 @@ -146,6 +146,8 @@
  	')
  ')
@@ -945,9 +960,9 @@
  	ifdef(`distro_redhat', `
  		# Run the rpm program in the rpm_t domain. Allow creation of RPM log files
  		# via redirection of standard out.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.8/policy/modules/services/cups.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.9/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/cups.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cups.te	2006-08-23 13:04:07.000000000 -0400
 @@ -74,13 +74,14 @@
  #
  
@@ -1015,9 +1030,9 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.8/policy/modules/services/cyrus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.9/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/cyrus.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cyrus.te	2006-08-23 13:04:07.000000000 -0400
 @@ -69,6 +69,7 @@
  corenet_udp_sendrecv_all_ports(cyrus_t)
  corenet_tcp_bind_all_nodes(cyrus_t)
@@ -1034,9 +1049,9 @@
 +optional_policy(`
 +	snmp_read_snmp_var_lib_files(cyrus_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.8/policy/modules/services/dbus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.9/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/dbus.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/dbus.if	2006-08-23 13:04:07.000000000 -0400
 @@ -123,6 +123,7 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
@@ -1057,9 +1072,28 @@
  ')
  
  #######################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.8/policy/modules/services/dovecot.te
---- nsaserefpolicy/policy/modules/services/dovecot.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/dovecot.te	2006-08-18 23:12:03.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.3.9/policy/modules/services/dbus.te
+--- nsaserefpolicy/policy/modules/services/dbus.te	2006-08-23 12:14:54.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/dbus.te	2006-08-23 13:04:07.000000000 -0400
+@@ -38,6 +38,7 @@
+ allow system_dbusd_t self:unix_stream_socket { connectto create_stream_socket_perms connectto };
+ allow system_dbusd_t self:unix_dgram_socket create_socket_perms;
+ allow system_dbusd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
++allow system_dbusd_t self:netlink_route_socket r_netlink_socket_perms;
+ # Receive notifications of policy reloads and enforcing status changes.
+ allow system_dbusd_t self:netlink_selinux_socket { create bind read };
+ 
+@@ -102,6 +103,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/dovecot.te serefpolicy-2.3.9/policy/modules/services/dovecot.te
+--- nsaserefpolicy/policy/modules/services/dovecot.te	2006-08-23 12:14:54.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/dovecot.te	2006-08-23 13:04:07.000000000 -0400
 @@ -168,7 +168,7 @@
  # Allow dovecot to create and read SSL parameters file
  allow dovecot_t dovecot_var_lib_t:dir rw_dir_perms;
@@ -1069,9 +1103,18 @@
  
  allow dovecot_auth_t dovecot_var_run_t:dir r_dir_perms;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.te serefpolicy-2.3.8/policy/modules/services/inn.te
+@@ -193,6 +193,8 @@
+ 
+ seutil_dontaudit_search_config(dovecot_auth_t)
+ 
++sysnet_dns_name_resolve(dovecot_auth_t)
++
+ optional_policy(`
+ 	kerberos_use(dovecot_auth_t)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.te serefpolicy-2.3.9/policy/modules/services/inn.te
 --- nsaserefpolicy/policy/modules/services/inn.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/inn.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/inn.te	2006-08-23 13:04:07.000000000 -0400
 @@ -36,6 +36,7 @@
  allow innd_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow innd_t self:tcp_socket create_stream_socket_perms;
@@ -1080,9 +1123,9 @@
  
  allow innd_t innd_etc_t:file r_file_perms;
  allow innd_t innd_etc_t:dir r_dir_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.8/policy/modules/services/ldap.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.9/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/ldap.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ldap.te	2006-08-23 13:04:07.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -1092,9 +1135,9 @@
  
  kernel_read_system_state(slapd_t)
  kernel_read_kernel_sysctls(slapd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-2.3.8/policy/modules/services/mta.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-2.3.9/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/mta.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/mta.fc	2006-08-23 13:04:07.000000000 -0400
 @@ -2,6 +2,8 @@
  /etc/aliases		--	gen_context(system_u:object_r:etc_aliases_t,s0)
  /etc/aliases\.db	--	gen_context(system_u:object_r:etc_aliases_t,s0)
@@ -1104,9 +1147,9 @@
  ifdef(`distro_redhat',`
  /etc/postfix/aliases.*		gen_context(system_u:object_r:etc_aliases_t,s0)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.8/policy/modules/services/ntp.te
---- nsaserefpolicy/policy/modules/services/ntp.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/ntp.te	2006-08-18 23:12:03.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.9/policy/modules/services/ntp.te
+--- nsaserefpolicy/policy/modules/services/ntp.te	2006-08-23 12:14:54.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ntp.te	2006-08-23 13:04:07.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -1116,9 +1159,20 @@
  dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
  allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
  allow ntpd_t self:fifo_file { read write getattr };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-2.3.8/policy/modules/services/oddjob.fc
+@@ -139,6 +139,10 @@
+ ')
+ 
+ optional_policy(`
++	samba_stream_connect_winbind(ntpd_t)
++')
++
++optional_policy(`
+ 	seutil_sigchld_newrole(ntpd_t)
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-2.3.9/policy/modules/services/oddjob.fc
 --- nsaserefpolicy/policy/modules/services/oddjob.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob.fc	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,8 @@
 +# oddjob executable will have:
 +# label: system_u:object_r:oddjob_exec_t
@@ -1128,9 +1182,9 @@
 +/usr/sbin/oddjobd		--	gen_context(system_u:object_r:oddjob_exec_t,s0)
 +/var/run/oddjobd.pid			gen_context(system_u:object_r:oddjob_var_run_t,s0)
 +/usr/lib/oddjobd			gen_context(system_u:object_r:oddjob_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-2.3.8/policy/modules/services/oddjob.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-2.3.9/policy/modules/services/oddjob.if
 --- nsaserefpolicy/policy/modules/services/oddjob.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob.if	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,76 @@
 +## <summary>policy for oddjob</summary>
 +
@@ -1208,9 +1262,9 @@
 +	allow $1 oddjob_t:dbus send_msg;
 +	allow oddjob_t $1:dbus send_msg;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.fc
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.fc	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,6 @@
 +# oddjob_mkhomedir executable will have:
 +# label: system_u:object_r:oddjob_mkhomedir_exec_t
@@ -1218,9 +1272,9 @@
 +# MCS categories: <none>
 +
 +/usr/lib/oddjob/mkhomedir		--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.if
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.if	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,24 @@
 +## <summary>policy for oddjob_mkhomedir</summary>
 +
@@ -1246,9 +1300,9 @@
 +	allow oddjob_mkhomedir_t $1:fifo_file rw_file_perms;
 +	allow oddjob_mkhomedir_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.te
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob_mkhomedir.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.te	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,26 @@
 +policy_module(oddjob_mkhomedir,1.0.0)
 +
@@ -1276,9 +1330,9 @@
 +## internal communication is often done using fifo and unix sockets.
 +allow oddjob_mkhomedir_t self:fifo_file { read write };
 +allow oddjob_mkhomedir_t self:unix_stream_socket create_stream_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-2.3.8/policy/modules/services/oddjob.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-2.3.9/policy/modules/services/oddjob.te
 --- nsaserefpolicy/policy/modules/services/oddjob.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/oddjob.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob.te	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,70 @@
 +policy_module(oddjob,1.0.0)
 +
@@ -1350,9 +1404,9 @@
 +
 +term_dontaudit_use_generic_ptys(oddjob_t)
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.8/policy/modules/services/openvpn.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.9/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/openvpn.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/openvpn.te	2006-08-23 13:04:07.000000000 -0400
 @@ -33,7 +33,7 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -1362,9 +1416,9 @@
  
  allow openvpn_t openvpn_etc_t:dir r_dir_perms;
  allow openvpn_t openvpn_etc_t:file r_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.8/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.9/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/pegasus.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/pegasus.if	2006-08-23 13:04:07.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -1398,9 +1452,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.8/policy/modules/services/pegasus.te
---- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/pegasus.te	2006-08-18 23:12:03.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.9/policy/modules/services/pegasus.te
+--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-08-23 12:14:54.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/pegasus.te	2006-08-23 13:04:07.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -1417,9 +1471,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.8/policy/modules/services/postfix.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.9/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/postfix.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/postfix.te	2006-08-23 13:04:07.000000000 -0400
 @@ -250,6 +250,7 @@
  allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
  
@@ -1455,9 +1509,9 @@
  
  optional_policy(`
  	postgrey_stream_connect(postfix_smtpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-2.3.8/policy/modules/services/postgresql.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-2.3.9/policy/modules/services/postgresql.te
 --- nsaserefpolicy/policy/modules/services/postgresql.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/postgresql.te	2006-08-20 10:40:06.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/postgresql.te	2006-08-23 13:04:07.000000000 -0400
 @@ -134,6 +134,7 @@
  seutil_dontaudit_search_config(postgresql_t)
  
@@ -1466,9 +1520,11 @@
  
  userdom_dontaudit_search_sysadm_home_dirs(postgresql_t)
  userdom_dontaudit_use_sysadm_ttys(postgresql_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.8/policy/modules/services/procmail.te
---- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/procmail.te	2006-08-18 23:12:03.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.9/policy/modules/services/procmail.te
+ ########################################
+ 
+--- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-23 12:14:54.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/procmail.te	2006-08-23 13:04:07.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -1477,9 +1533,9 @@
  corenet_tcp_sendrecv_all_if(procmail_t)
  corenet_udp_sendrecv_all_if(procmail_t)
  corenet_tcp_sendrecv_all_nodes(procmail_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.3.8/policy/modules/services/radius.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.3.9/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/radius.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/radius.te	2006-08-23 13:04:07.000000000 -0400
 @@ -31,7 +31,7 @@
  # gzip also needs chown access to preserve GID for radwtmp files
  allow radiusd_t self:capability { chown dac_override fsetid kill setgid setuid sys_resource sys_tty_config };
@@ -1489,9 +1545,9 @@
  allow radiusd_t self:fifo_file rw_file_perms;
  allow radiusd_t self:unix_stream_socket create_stream_socket_perms;
  allow radiusd_t self:tcp_socket create_stream_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.fc serefpolicy-2.3.8/policy/modules/services/ricci.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.fc serefpolicy-2.3.9/policy/modules/services/ricci.fc
 --- nsaserefpolicy/policy/modules/services/ricci.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ricci.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ricci.fc	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,20 @@
 +# ricci executable will have:
 +# label: system_u:object_r:ricci_exec_t
@@ -1513,9 +1569,9 @@
 +/usr/sbin/ricci-modservice	--	gen_context(system_u:object_r:ricci_modservice_exec_t,s0)
 +/usr/sbin/ricci-modstorage	--	gen_context(system_u:object_r:ricci_modstorage_exec_t,s0)
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.if serefpolicy-2.3.8/policy/modules/services/ricci.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.if serefpolicy-2.3.9/policy/modules/services/ricci.if
 --- nsaserefpolicy/policy/modules/services/ricci.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ricci.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ricci.if	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,184 @@
 +## <summary>policy for ricci</summary>
 +
@@ -1701,9 +1757,9 @@
 +	allow $1 ricci_modcluster_var_run_t:sock_file write;
 +	allow $1 ricci_modclusterd_t:unix_stream_socket connectto;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.3.8/policy/modules/services/ricci.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.3.9/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/ricci.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ricci.te	2006-08-23 13:04:07.000000000 -0400
 @@ -0,0 +1,373 @@
 +policy_module(ricci,1.0.0)
 +
@@ -2078,9 +2134,9 @@
 +')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-2.3.8/policy/modules/services/rpc.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-2.3.9/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/rpc.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/rpc.if	2006-08-23 13:04:07.000000000 -0400
 @@ -51,6 +51,8 @@
  	kernel_rw_rpc_sysctls($1_t)
  
@@ -2090,10 +2146,18 @@
  
  	corenet_non_ipsec_sendrecv($1_t)
  	corenet_tcp_sendrecv_all_if($1_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.3.8/policy/modules/services/rpc.te
---- nsaserefpolicy/policy/modules/services/rpc.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/rpc.te	2006-08-18 23:12:03.000000000 -0400
-@@ -48,9 +48,6 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.3.9/policy/modules/services/rpc.te
+--- nsaserefpolicy/policy/modules/services/rpc.te	2006-08-23 12:14:54.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/rpc.te	2006-08-23 13:04:47.000000000 -0400
+@@ -39,6 +39,7 @@
+ 
+ allow rpcd_t self:capability { chown dac_override setgid setuid };
+ allow rpcd_t self:fifo_file rw_file_perms;
++allow rpcd_t self:file { getattr read };
+ 
+ allow rpcd_t rpcd_var_run_t:file manage_file_perms;
+ allow rpcd_t rpcd_var_run_t:dir { rw_dir_perms setattr };
+@@ -48,9 +49,6 @@
  # for rpc.rquotad
  kernel_read_sysctl(rpcd_t)  
  
@@ -2103,7 +2167,7 @@
  fs_list_rpc(rpcd_t)
  fs_read_rpc_files(rpcd_t)
  fs_read_rpc_symlinks(rpcd_t)
-@@ -134,8 +131,6 @@
+@@ -129,8 +128,6 @@
  kernel_read_network_state(gssd_t)
  kernel_read_network_state_symlinks(gssd_t)	
  
@@ -2112,9 +2176,9 @@
  fs_list_rpc(gssd_t) 
  fs_read_rpc_sockets(gssd_t) 
  fs_read_rpc_files(gssd_t) 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.8/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/samba.te	2006-08-18 23:12:03.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.9/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-08-23 12:14:54.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/samba.te	2006-08-23 13:04:07.000000000 -0400
 @@ -171,7 +171,7 @@
  #
  # smbd Local policy
@@ -2133,7 +2197,7 @@
  dontaudit smbd_t samba_log_t:dir remove_name;
  allow smbd_t samba_log_t:file { create ra_file_perms };
  
-@@ -367,7 +367,7 @@
+@@ -359,7 +367,7 @@
  allow nmbd_t samba_etc_t:dir { search getattr };
  allow nmbd_t samba_etc_t:file { getattr read };
  
@@ -2142,7 +2206,7 @@
  allow nmbd_t samba_log_t:file { create ra_file_perms };
  
  allow nmbd_t samba_var_t:dir rw_dir_perms;
-@@ -646,7 +646,7 @@
+@@ -638,7 +646,7 @@
  allow winbind_t samba_etc_t:dir rw_dir_perms;
  type_transition winbind_t samba_etc_t:file samba_secrets_t;
  
@@ -2151,9 +2215,9 @@
  allow winbind_t samba_log_t:file create_file_perms;
  allow winbind_t samba_log_t:lnk_file create_lnk_perms;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.8/policy/modules/services/setroubleshoot.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.9/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/setroubleshoot.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.fc	2006-08-23 13:04:08.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -2164,16 +2228,16 @@
 +/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
 +
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.8/policy/modules/services/setroubleshoot.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.9/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/setroubleshoot.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.if	2006-08-23 13:04:08.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.8/policy/modules/services/setroubleshoot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.9/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.8/policy/modules/services/setroubleshoot.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.te	2006-08-23 13:04:08.000000000 -0400
 @@ -0,0 +1,110 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -2285,9 +2349,9 @@
 +
 +files_dontaudit_search_tmp(setroubleshootd_t)
 +files_dontaudit_search_src(setroubleshootd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.8/policy/modules/services/spamassassin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.9/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/spamassassin.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/spamassassin.te	2006-08-23 13:04:08.000000000 -0400
 @@ -193,3 +193,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -2296,9 +2360,9 @@
 +optional_policy(`
 +	postfix_read_config(spamd_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.8/policy/modules/services/squid.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.9/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/squid.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/squid.te	2006-08-23 13:04:08.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -2311,9 +2375,9 @@
  allow squid_t self:fifo_file rw_file_perms;
  allow squid_t self:sock_file r_file_perms;
  allow squid_t self:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.8/policy/modules/services/ssh.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.9/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/ssh.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ssh.if	2006-08-23 13:04:08.000000000 -0400
 @@ -711,3 +711,27 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
@@ -2326,8 +2390,7 @@
 +## </summary>
 +## <param name="domain">
 +##	<summary>
-+##	Domain allowed access.
-+##	</summary>
++##	Domain allowed access.+##	</summary>
 +## </param>
 +#
 +interface(`ssh_domtrans_keygen',`
@@ -2342,9 +2405,9 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.8/policy/modules/services/stunnel.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.9/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/stunnel.te	2006-08-20 10:45:16.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/stunnel.te	2006-08-23 13:04:08.000000000 -0400
 @@ -38,6 +38,7 @@
  allow stunnel_t self:fifo_file rw_file_perms;
  allow stunnel_t self:tcp_socket create_stream_socket_perms;
@@ -2361,9 +2424,9 @@
  
  fs_getattr_all_fs(stunnel_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-2.3.8/policy/modules/services/sysstat.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-2.3.9/policy/modules/services/sysstat.te
 --- nsaserefpolicy/policy/modules/services/sysstat.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/sysstat.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/sysstat.te	2006-08-23 13:04:08.000000000 -0400
 @@ -36,6 +36,8 @@
  kernel_read_fs_sysctls(sysstat_t)
  kernel_read_rpc_sysctls(sysstat_t)
@@ -2381,9 +2444,9 @@
  
  init_use_fds(sysstat_t)
  init_use_script_ptys(sysstat_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.8/policy/modules/services/xserver.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.9/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/xserver.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/xserver.if	2006-08-23 13:04:08.000000000 -0400
 @@ -45,7 +45,6 @@
  	allow $1_xserver_t self:capability { dac_override fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
  	dontaudit $1_xserver_t self:capability chown;
@@ -2488,9 +2551,9 @@
 +	allow $1 ice_tmp_t:dir ra_dir_perms;
 +	allow $1 ice_tmp_t:sock_file create_file_perms;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.8/policy/modules/services/xserver.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.9/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/services/xserver.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/xserver.te	2006-08-23 13:04:08.000000000 -0400
 @@ -81,15 +81,19 @@
  #
  
@@ -2566,192 +2629,31 @@
  
  	unconfined_domain_noaudit(xdm_xserver_t)
  	unconfined_domtrans(xdm_xserver_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.3.8/policy/modules/system/authlogin.if
---- nsaserefpolicy/policy/modules/system/authlogin.if	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/authlogin.if	2006-08-18 23:12:03.000000000 -0400
-@@ -128,6 +128,7 @@
- 	# Transition from the user domain to this domain.
- 	domain_auto_trans($2,chkpwd_exec_t,$1_chkpwd_t)
- 	allow $1_chkpwd_t $2:fd use;
-+	allow $2 $1_chkpwd_t:fd use;
- 	allow $1_chkpwd_t $2:fifo_file rw_file_perms;
- 	allow $1_chkpwd_t $2:process sigchld;
- 
-@@ -288,6 +289,8 @@
- 
- 	corecmd_search_bin($1)
- 	domain_auto_trans($1,login_exec_t,$2)
-+
-+	allow $1 $2:fd use;
- 	allow $2 $1:fd use;
- 	allow $2 $1:fifo_file rw_file_perms;
- 	allow $2 $1:process sigchld;
-@@ -308,12 +311,13 @@
- 		type system_chkpwd_t, chkpwd_exec_t, shadow_t;
- 	')
- 
-+	corecmd_search_sbin($1)
-+	domain_auto_trans($1,chkpwd_exec_t,system_chkpwd_t)
- 
- 	allow $1 self:capability { audit_write audit_control };
- 	allow $1 self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
- 
--	corecmd_search_sbin($1)
--	domain_auto_trans($1,chkpwd_exec_t,system_chkpwd_t)
-+	allow $1 system_chkpwd_t:fd use;
- 	allow system_chkpwd_t $1:fd use;
- 	allow system_chkpwd_t $1:fifo_file rw_file_perms;
- 	allow system_chkpwd_t $1:process sigchld;
-@@ -509,7 +513,7 @@
- 		type shadow_t;
- 	')
- 
--	allow $1 shadow_t:file manage_file_perms;
-+	allow $1 shadow_t:file create_file_perms;
- 	typeattribute $1 can_read_shadow_passwords, can_write_shadow_passwords;
- ')
- 
-@@ -686,6 +690,8 @@
- 	')
- 
- 	domain_auto_trans($1,pam_exec_t,pam_t)
-+
-+	allow $1 pam_t:fd use;
- 	allow pam_t $1:fd use;
- 	allow pam_t $1:fifo_file rw_file_perms;
- 	allow pam_t $1:process sigchld;
-@@ -756,7 +762,7 @@
- 	')
- 
- 	files_search_var($1)
--	allow $1 var_auth_t:dir manage_dir_perms;
-+	allow $1 var_auth_t:dir create_dir_perms;
- 	allow $1 var_auth_t:file rw_file_perms;
- 	allow $1 var_auth_t:lnk_file rw_file_perms;
- ')
-@@ -776,8 +782,9 @@
- 		type pam_var_run_t;
- 	')
- 
-+	files_search_var($1)
- 	files_search_pids($1)
--	allow $1 pam_var_run_t:dir list_dir_perms;
-+	allow $1 pam_var_run_t:dir r_dir_perms;
- 	allow $1 pam_var_run_t:file r_file_perms;
- ')
- 
-@@ -814,6 +821,7 @@
- 		type pam_var_run_t;
- 	')
- 
-+	files_search_var($1)
- 	files_search_pids($1)
- 	allow $1 pam_var_run_t:dir { getattr search read write remove_name };
- 	allow $1 pam_var_run_t:file { getattr unlink };
-@@ -835,8 +843,8 @@
- 	')
- 
- 	files_search_pids($1)
--	allow $1 pam_var_run_t:dir manage_dir_perms;
--	allow $1 pam_var_run_t:file manage_file_perms;
-+	allow $1 pam_var_run_t:dir create_dir_perms;
-+	allow $1 pam_var_run_t:file create_file_perms;
- ')
- 
- ########################################
-@@ -855,6 +863,8 @@
- 	')
- 
- 	domain_auto_trans($1,pam_console_exec_t,pam_console_t)
-+
-+	allow $1 pam_console_t:fd use;
- 	allow pam_console_t $1:fd use;
- 	allow pam_console_t $1:fifo_file rw_file_perms;
- 	allow pam_console_t $1:process sigchld;
-@@ -876,6 +886,7 @@
- 		type pam_var_console_t;
- 	')
- 
-+	files_search_var($1)
- 	files_search_pids($1)
- 	allow $1 pam_var_console_t:dir search_dir_perms;
- ')
-@@ -896,8 +907,9 @@
- 		type pam_var_console_t;
- 	')
- 
-+	files_search_var($1)
- 	files_search_pids($1)
--	allow $1 pam_var_console_t:dir list_dir_perms;
-+	allow $1 pam_var_console_t:dir r_dir_perms;
- ')
- 
- ########################################
-@@ -915,8 +927,9 @@
- 		type pam_var_console_t;
- 	')
- 
-+	files_search_var($1)
- 	files_search_pids($1)
--	allow $1 pam_var_console_t:dir list_dir_perms;
-+	allow $1 pam_var_console_t:dir r_dir_perms;
- 	allow $1 pam_var_console_t:file r_file_perms;
- ')
- 
-@@ -936,9 +949,10 @@
- 		type pam_var_console_t;
- 	')
- 
-+	files_search_var($1)
- 	files_search_pids($1)
- 	allow $1 pam_var_console_t:dir rw_dir_perms;
--	allow $1 pam_var_console_t:file manage_file_perms;
-+	allow $1 pam_var_console_t:file create_file_perms;
- 	allow $1 pam_var_console_t:lnk_file create_lnk_perms;
- ')
- 
-@@ -1106,6 +1120,8 @@
- 	')
- 
- 	domain_auto_trans($1,utempter_exec_t,utempter_t)
-+
-+	allow $1 utempter_t:fd use;
- 	allow utempter_t $1:fd use;
- 	allow utempter_t $1:fifo_file rw_file_perms;
- 	allow utempter_t $1:process sigchld;
-@@ -1307,7 +1323,7 @@
- 	')
- 
- 	logging_rw_generic_log_dirs($1)
--	allow $1 wtmp_t:file manage_file_perms;
-+	allow $1 wtmp_t:file create_file_perms;
- ')
- 
- ########################################
-@@ -1327,8 +1343,8 @@
- 
- 	allow $1 self:netlink_route_socket r_netlink_socket_perms;
- 
--	allow $1 var_auth_t:dir list_dir_perms;
--	allow $1 var_auth_t:file manage_file_perms;
-+	allow $1 var_auth_t:dir r_dir_perms;
-+	allow $1 var_auth_t:file create_file_perms;
- 	files_list_var_lib($1)
- 
- 	miscfiles_read_certs($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.8/policy/modules/system/authlogin.te
---- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/authlogin.te	2006-08-18 23:12:03.000000000 -0400
-@@ -109,6 +108,7 @@
- init_dontaudit_rw_utmp(pam_t)
- 
- files_read_etc_files(pam_t)
-+files_list_pids(pam_t)
- 
- libs_use_ld_so(pam_t)
- libs_use_shared_libs(pam_t)
- kernel_use_fds(pam_console_t)
-@@ -267,6 +273,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.9/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-23 12:14:55.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/authlogin.te	2006-08-23 13:04:08.000000000 -0400
+@@ -215,12 +215,19 @@
+ logging_send_syslog_msg(pam_console_t)
+ 
+ miscfiles_read_localization(pam_console_t)
++miscfiles_read_certs(pam_console_t)
+ 
+ seutil_read_file_contexts(pam_console_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(pam_console_t)
+ 
+-ifdef(`targeted_policy',`
++# cjp: with the old daemon_(base_)domain being broken up into
++# a daemon and system interface, this probably is not needed:
++ifdef(`direct_sysadm_daemon', `
++	userdom_dontaudit_use_sysadm_terms(pam_console_t)
++')
++
++ifdef(`targeted_policy', `
+ 	term_dontaudit_use_unallocated_ttys(pam_console_t)
+ 	term_dontaudit_use_generic_ptys(pam_console_t)
+ 	files_dontaudit_read_root_files(pam_console_t)
+@@ -263,6 +270,7 @@
  
  term_dontaudit_use_unallocated_ttys(system_chkpwd_t)
  term_dontaudit_use_generic_ptys(system_chkpwd_t)
@@ -2759,9 +2661,9 @@
  
  userdom_dontaudit_use_unpriv_users_ttys(system_chkpwd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.8/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.9/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/fstools.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/fstools.te	2006-08-23 13:04:08.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -2770,9 +2672,9 @@
  
  domain_use_interactive_fds(fsadm_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.8/policy/modules/system/hostname.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.9/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/hostname.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/hostname.te	2006-08-23 13:04:08.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -2795,9 +2697,9 @@
 +	xen_dontaudit_use_fds(hostname_t)
 +')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.8/policy/modules/system/init.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.9/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/init.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/init.if	2006-08-23 13:04:08.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -2812,10 +2714,10 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.8/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/init.te	2006-08-18 23:12:03.000000000 -0400
-@@ -357,6 +357,8 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.9/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-08-23 12:14:55.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/init.te	2006-08-23 13:04:08.000000000 -0400
+@@ -361,6 +357,8 @@
  logging_read_audit_config(initrc_t)
  
  miscfiles_read_localization(initrc_t)
@@ -2824,10 +2726,10 @@
  # slapd needs to read cert files from its initscript
  miscfiles_read_certs(initrc_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.8/policy/modules/system/libraries.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.9/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/libraries.fc	2006-08-18 23:12:03.000000000 -0400
-@@ -109,6 +97,8 @@
++++ serefpolicy-2.3.9/policy/modules/system/libraries.fc	2006-08-23 13:04:08.000000000 -0400
+@@ -109,6 +109,8 @@
  /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
  
  /usr/lib(64)?/xulrunner-[^/]*/libxul\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -2836,7 +2738,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:textrel_shlib_t,s0)
  /usr/lib(64)?/ati-fglrx/.+\.so(\..*)?	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -178,6 +168,7 @@
+@@ -178,6 +180,7 @@
  /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)
  
@@ -2844,7 +2746,7 @@
  /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)
  /usr/lib(64)?/sunbird.*\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -211,8 +202,8 @@
+@@ -211,8 +214,8 @@
  /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -2855,9 +2757,9 @@
  /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.8/policy/modules/system/locallogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.9/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/locallogin.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/locallogin.te	2006-08-23 13:04:08.000000000 -0400
 @@ -47,7 +47,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -2876,9 +2778,9 @@
  
  dev_setattr_mouse_dev(local_login_t)
  dev_getattr_mouse_dev(local_login_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.8/policy/modules/system/logging.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.9/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/logging.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/logging.fc	2006-08-23 13:04:08.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -2886,9 +2788,9 @@
 +
 +/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.8/policy/modules/system/logging.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.9/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/logging.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/logging.if	2006-08-23 13:04:08.000000000 -0400
 @@ -553,3 +553,24 @@
  	allow $1 var_log_t:dir rw_dir_perms;
  	allow $1 var_log_t:file create_file_perms;
@@ -2914,9 +2816,9 @@
 +	allow $1 auditd_var_run_t:sock_file rw_file_perms;
 +	allow $1 auditd_t:unix_stream_socket connectto;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.8/policy/modules/system/logging.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.9/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/logging.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/logging.te	2006-08-23 13:04:08.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -2929,9 +2831,9 @@
  
  kernel_read_kernel_sysctls(auditd_t)
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.3.8/policy/modules/system/lvm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.3.9/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/lvm.fc	2006-08-18 23:50:13.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/lvm.fc	2006-08-23 13:04:08.000000000 -0400
 @@ -14,7 +14,6 @@
  
  /etc/lvmtab(/.*)?		gen_context(system_u:object_r:lvm_metadata_t,s0)
@@ -2945,9 +2847,9 @@
  
  /var/cache/multipathd(/.*)?	gen_context(system_u:object_r:lvm_metadata_t,s0)
 +/var/run/multipathd.sock	-s	gen_context(system_u:object_r:lvm_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.8/policy/modules/system/lvm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.9/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/lvm.te	2006-08-18 23:52:13.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/lvm.te	2006-08-23 13:04:08.000000000 -0400
 @@ -125,7 +125,7 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
@@ -2975,9 +2877,9 @@
  
  allow lvm_t lvm_etc_t:file r_file_perms;
  allow lvm_t lvm_etc_t:lnk_file r_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.8/policy/modules/system/miscfiles.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.9/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/miscfiles.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/miscfiles.fc	2006-08-23 13:04:08.000000000 -0400
 @@ -9,6 +9,7 @@
  # /etc
  #
@@ -2986,9 +2888,9 @@
  /etc/pki(/.*)?			gen_context(system_u:object_r:cert_t,s0)
  
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.8/policy/modules/system/miscfiles.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.9/policy/modules/system/miscfiles.if
 --- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/miscfiles.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/miscfiles.if	2006-08-23 13:04:08.000000000 -0400
 @@ -116,6 +116,24 @@
  
  ########################################
@@ -3014,9 +2916,9 @@
  ##	Allow process to read legacy time localization info
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.8/policy/modules/system/modutils.te
---- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/modutils.te	2006-08-18 23:12:03.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.9/policy/modules/system/modutils.te
+--- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-23 12:14:55.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/modutils.te	2006-08-23 13:04:08.000000000 -0400
 @@ -183,6 +183,7 @@
  fs_getattr_xattr_fs(depmod_t)
  
@@ -3025,9 +2927,9 @@
  
  corecmd_search_bin(depmod_t)
  corecmd_search_sbin(depmod_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.8/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.9/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/mount.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/mount.te	2006-08-23 13:04:08.000000000 -0400
 @@ -80,6 +80,7 @@
  files_read_isid_type_files(mount_t)
  # For reading cert files
@@ -3045,9 +2947,20 @@
  userdom_use_all_users_fds(mount_t)
  
  ifdef(`distro_redhat',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.8/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/selinuxutil.te	2006-08-18 23:12:03.000000000 -0400
+@@ -166,6 +169,10 @@
+ 	samba_domtrans_smbmount(mount_t)
+ ')
+ 
++optional_policy(`
++	nscd_socket_use(mount_t)
++')
++
+ ########################################
+ #
+ # Unconfined mount local policy
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.9/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-23 12:14:55.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/selinuxutil.te	2006-08-23 13:04:08.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -3068,7 +2981,15 @@
  	# restorecond watches for users logging in, 
  	# so it getspwnam when a user logs in to find his homedir
  	nis_use_ypbind(restorecond_t)
-@@ -612,6 +620,12 @@
+@@ -550,6 +556,7 @@
+ allow semanage_t self:unix_stream_socket create_stream_socket_perms;
+ allow semanage_t self:unix_dgram_socket create_socket_perms;
+ allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
++allow semanage_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow semanage_t policy_config_t:file { read write };
+ 
+@@ -611,6 +618,12 @@
  	# Handle pp files created in homedir and /tmp
  	files_read_generic_tmp_files(semanage_t)
  	userdom_read_generic_user_home_content_files(semanage_t)
@@ -3080,10 +3001,10 @@
 +	')
  ')
  
- optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.8/policy/modules/system/udev.fc
+ ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.9/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/udev.fc	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/udev.fc	2006-08-23 13:04:08.000000000 -0400
 @@ -1,5 +1,6 @@
  # udev
  
@@ -3091,10 +3012,10 @@
  /dev/\.udevdb	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.8/policy/modules/system/udev.te
---- nsaserefpolicy/policy/modules/system/udev.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/udev.te	2006-08-18 23:12:03.000000000 -0400
-@@ -129,6 +129,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.9/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te	2006-08-23 12:14:55.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/udev.te	2006-08-23 13:04:08.000000000 -0400
+@@ -131,6 +131,7 @@
  mls_file_upgrade(udev_t)
  mls_file_downgrade(udev_t)
  mls_process_write_down(udev_t)
@@ -3102,9 +3023,19 @@
  
  modutils_domtrans_insmod(udev_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.8/policy/modules/system/unconfined.if
+@@ -183,5 +184,9 @@
+ ')
+ 
+ optional_policy(`
++	sysnet_domtrans_dhcpc(udev_t)
++')
++
++optional_policy(`
+ 	xserver_read_xdm_pid(udev_t)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.9/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/unconfined.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/unconfined.if	2006-08-23 13:04:08.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -3121,9 +3052,9 @@
  	files_unconfined($1)
  	fs_unconfined($1)
  	selinux_unconfined($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.8/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.9/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/unconfined.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/unconfined.te	2006-08-23 13:04:08.000000000 -0400
 @@ -195,4 +195,9 @@
  ifdef(`targeted_policy',`
  	allow unconfined_execmem_t self:process { execstack execmem };
@@ -3134,9 +3065,9 @@
 +		unconfined_dbus_chat(unconfined_execmem_t)
 +	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.8/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.9/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/userdomain.if	2006-08-18 23:33:46.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/userdomain.if	2006-08-23 13:04:08.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -3288,10 +3219,7 @@
 -		allow $1_t self:process execmem;
 -	')
 +	sysnet_dns_name_resolve($1_t)
- 
--	tunable_policy(`allow_execmem && allow_execstack',`
--		# Allow making the stack executable via mprotect.
--		allow $1_t self:process execstack;
++
 +')
 +#######################################
 +## <summary>
@@ -3316,7 +3244,10 @@
 +## </param>
 +#
 +template(`base_login_user_template',`
-+
+ 
+-	tunable_policy(`allow_execmem && allow_execstack',`
+-		# Allow making the stack executable via mprotect.
+-		allow $1_t self:process execstack;
 +	gen_require(`
 +		attribute $1_file_type;
 +		attribute home_dir_type, home_type;
@@ -3529,6 +3460,51 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
+@@ -4164,7 +4217,7 @@
+ 	')
+ 
+ 	files_search_home($1)
+-	allow $1 user_home_dir_t:dir search_dir_perms;
++	allow $1 user_home_dir_t:dir rw_dir_perms;
+ 	allow $1 user_home_t:dir create_dir_perms;
+ ')
+ 
+@@ -4206,7 +4259,7 @@
+ 	')
+ 
+ 	files_search_home($1)
+-	allow $1 user_home_dir_t:dir search_dir_perms;
++	allow $1 user_home_dir_t:dir rw_dir_perms;
+ 	allow $1 user_home_t:dir rw_dir_perms;
+ 	allow $1 user_home_t:file create_file_perms;
+ ')
+@@ -4228,7 +4281,7 @@
+ 	')
+ 
+ 	files_search_home($1)
+-	allow $1 user_home_dir_t:dir search_dir_perms;
++	allow $1 user_home_dir_t:dir rw_dir_perms;
+ 	allow $1 user_home_t:dir rw_dir_perms;
+ 	allow $1 user_home_t:lnk_file create_lnk_perms;
+ ')
+@@ -4250,7 +4303,7 @@
+ 	')
+ 
+ 	files_search_home($1)
+-	allow $1 user_home_dir_t:dir search_dir_perms;
++	allow $1 user_home_dir_t:dir rw_dir_perms;
+ 	allow $1 user_home_t:dir rw_dir_perms;
+ 	allow $1 user_home_t:fifo_file create_file_perms;
+ ')
+@@ -4272,7 +4325,7 @@
+ 	')
+ 
+ 	files_search_home($1)
+-	allow $1 user_home_dir_t:dir search_dir_perms;
++	allow $1 user_home_dir_t:dir rw_dir_perms;
+ 	allow $1 user_home_t:dir rw_dir_perms;
+ 	allow $1 user_home_t:sock_file create_file_perms;
+ ')
 @@ -4740,3 +4793,34 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
@@ -3564,9 +3540,9 @@
 +        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.8/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.9/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/userdomain.te	2006-08-18 23:36:36.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/userdomain.te	2006-08-23 13:04:08.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -3666,9 +3642,9 @@
  		', `
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.8/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.9/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/xen.if	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/xen.if	2006-08-23 13:04:08.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -3711,9 +3687,9 @@
 +
 +	dontaudit $1 xend_t:fd use;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.8/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.9/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.8/policy/modules/system/xen.te	2006-08-18 23:12:03.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/xen.te	2006-08-23 13:04:08.000000000 -0400
 @@ -69,7 +69,10 @@
  #
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- selinux-policy.spec	20 Aug 2006 15:11:37 -0000	1.255
+++ selinux-policy.spec	23 Aug 2006 20:42:38 -0000	1.256
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.8
+Version: 2.3.9
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Sun Aug 23 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-1
+- Update to upstream
+
 * Sun Aug 20 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-2
 - Fixes for stunnel and postgresql
 - Update from upstream


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	20 Aug 2006 15:11:37 -0000	1.85
+++ sources	23 Aug 2006 20:42:38 -0000	1.86
@@ -1 +1 @@
-c144c7bfda6f332edd5aee0a71364eb1  serefpolicy-2.3.8.tgz
+41f53e40030dbc765875f29d3b34dc2a  serefpolicy-2.3.9.tgz



From fedora-cvs-commits at redhat.com  Wed Aug 23 20:54:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 16:54:00 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch,1.16,1.17
Message-ID: <200608232054.k7NKs0i9014116@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14071

Modified Files:
	policy-20060802.patch 
Log Message:
* Sun Aug 23 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-1
- Update to upstream


policy-20060802.patch:
 mls                                  |    9 
 modules/admin/amanda.fc              |   51 ----
 modules/admin/anaconda.te            |   20 +
 modules/admin/bootloader.te          |    4 
 modules/admin/consoletype.te         |   11 -
 modules/admin/firstboot.te           |    2 
 modules/admin/prelink.te             |    2 
 modules/admin/rpm.fc                 |    2 
 modules/admin/rpm.if                 |   13 -
 modules/admin/usermanage.te          |    5 
 modules/apps/java.fc                 |    9 
 modules/apps/mozilla.if              |    2 
 modules/apps/wine.te                 |    2 
 modules/kernel/corecommands.fc       |    1 
 modules/kernel/corecommands.if       |    1 
 modules/kernel/corenetwork.te.in     |    7 
 modules/kernel/devices.fc            |    3 
 modules/kernel/devices.if            |   36 +++
 modules/kernel/devices.te            |    8 
 modules/kernel/files.if              |   18 +
 modules/kernel/filesystem.te         |    2 
 modules/kernel/kernel.if             |   75 +++++++
 modules/kernel/terminal.if           |   19 +
 modules/services/amavis.te           |    7 
 modules/services/apache.te           |    2 
 modules/services/avahi.te            |    2 
 modules/services/bind.te             |    1 
 modules/services/ccs.fc              |    8 
 modules/services/ccs.if              |   45 ++++
 modules/services/ccs.te              |   84 +++++++
 modules/services/cpucontrol.te       |    2 
 modules/services/cron.if             |   17 +
 modules/services/cron.te             |    7 
 modules/services/cups.te             |   19 +
 modules/services/cyrus.te            |    5 
 modules/services/dbus.if             |    6 
 modules/services/dbus.te             |    2 
 modules/services/dovecot.te          |    4 
 modules/services/inn.te              |    1 
 modules/services/ldap.te             |    2 
 modules/services/mta.fc              |    2 
 modules/services/ntp.te              |    6 
 modules/services/oddjob.fc           |    8 
 modules/services/oddjob.if           |   76 +++++++
 modules/services/oddjob.te           |   70 ++++++
 modules/services/oddjob_mkhomedir.fc |    6 
 modules/services/oddjob_mkhomedir.if |   24 ++
 modules/services/oddjob_mkhomedir.te |   26 ++
 modules/services/openvpn.te          |    2 
 modules/services/pegasus.if          |   31 ++
 modules/services/pegasus.te          |    5 
 modules/services/postfix.te          |    7 
 modules/services/postgresql.te       |    1 
 modules/services/procmail.te         |    1 
 modules/services/pyzor.te            |    1 
 modules/services/radius.te           |    2 
 modules/services/ricci.fc            |   20 +
 modules/services/ricci.if            |  184 +++++++++++++++++
 modules/services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++
 modules/services/rpc.if              |    2 
 modules/services/rpc.te              |    6 
 modules/services/samba.te            |    8 
 modules/services/setroubleshoot.fc   |    9 
 modules/services/setroubleshoot.if   |    3 
 modules/services/setroubleshoot.te   |  110 ++++++++++
 modules/services/spamassassin.te     |    4 
 modules/services/squid.te            |    4 
 modules/services/ssh.if              |   24 ++
 modules/services/stunnel.te          |    2 
 modules/services/sysstat.te          |    3 
 modules/services/xserver.if          |   69 ++++++
 modules/services/xserver.te          |   19 +
 modules/system/authlogin.te          |   10 
 modules/system/fstools.te            |    1 
 modules/system/hostname.te           |   10 
 modules/system/init.if               |    7 
 modules/system/init.te               |    2 
 modules/system/libraries.fc          |    7 
 modules/system/locallogin.te         |    4 
 modules/system/logging.fc            |    3 
 modules/system/logging.if            |   21 +
 modules/system/logging.te            |    3 
 modules/system/lvm.fc                |    2 
 modules/system/lvm.te                |    6 
 modules/system/miscfiles.fc          |    1 
 modules/system/miscfiles.if          |   18 +
 modules/system/modutils.te           |    1 
 modules/system/mount.te              |    9 
 modules/system/selinuxutil.te        |   13 +
 modules/system/udev.fc               |    1 
 modules/system/udev.te               |    5 
 modules/system/unconfined.if         |    2 
 modules/system/unconfined.te         |    5 
 modules/system/userdomain.if         |  246 +++++++++++++++--------
 modules/system/userdomain.te         |   48 ++--
 modules/system/xen.if                |   38 +++
 modules/system/xen.te                |   26 +-
 97 files changed, 1865 insertions(+), 248 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- policy-20060802.patch	23 Aug 2006 20:42:38 -0000	1.16
+++ policy-20060802.patch	23 Aug 2006 20:53:57 -0000	1.17
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.9/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.9/policy/mls	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/mls	2006-08-23 13:09:33.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -24,7 +24,7 @@
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-2.3.9/policy/modules/admin/amanda.fc
 --- nsaserefpolicy/policy/modules/admin/amanda.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/amanda.fc	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/amanda.fc	2006-08-23 13:09:33.000000000 -0400
 @@ -9,62 +9,13 @@
  /tmp/amanda(/.*)?			gen_context(system_u:object_r:amanda_tmp_t,s0)
  
@@ -91,7 +91,7 @@
  /var/lib/amanda/index			gen_context(system_u:object_r:amanda_data_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.9/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/anaconda.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/anaconda.te	2006-08-23 13:09:33.000000000 -0400
 @@ -25,8 +25,12 @@
  
  modutils_domtrans_insmod(anaconda_t)
@@ -136,7 +136,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.9/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/bootloader.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/bootloader.te	2006-08-23 13:09:33.000000000 -0400
 @@ -83,8 +83,10 @@
  dev_read_rand(bootloader_t)
  dev_read_urand(bootloader_t)
@@ -151,7 +151,7 @@
  fs_getattr_tmpfs(bootloader_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.9/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/consoletype.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/consoletype.te	2006-08-23 13:09:33.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -176,7 +176,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.9/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/firstboot.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/firstboot.te	2006-08-23 13:09:33.000000000 -0400
 @@ -106,7 +106,7 @@
  ')
  
@@ -188,7 +188,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.9/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/prelink.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/prelink.te	2006-08-23 13:09:33.000000000 -0400
 @@ -74,6 +74,8 @@
  
  miscfiles_read_localization(prelink_t)
@@ -200,7 +200,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.9/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/rpm.fc	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/rpm.fc	2006-08-23 13:09:33.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -212,7 +212,7 @@
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.9/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/rpm.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/rpm.if	2006-08-23 13:09:33.000000000 -0400
 @@ -75,12 +75,13 @@
  	')
  
@@ -235,7 +235,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.9/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-23 12:14:56.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/usermanage.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/usermanage.te	2006-08-23 13:09:33.000000000 -0400
 @@ -256,7 +256,7 @@
  ')
  
@@ -264,7 +264,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.9/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/apps/java.fc	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/apps/java.fc	2006-08-23 13:09:33.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # /opt
@@ -287,7 +287,7 @@
 +/usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.9/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-16 08:46:26.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/apps/mozilla.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/apps/mozilla.if	2006-08-23 13:09:33.000000000 -0400
 @@ -63,6 +63,7 @@
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
@@ -306,7 +306,7 @@
  	sysnet_dns_name_resolve($1_mozilla_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.3.9/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/apps/wine.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/apps/wine.te	2006-08-23 13:09:33.000000000 -0400
 @@ -18,7 +18,7 @@
  #
  
@@ -318,7 +318,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc	2006-08-23 13:09:33.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -329,7 +329,7 @@
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.3.9/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.if	2006-08-23 13:09:33.000000000 -0400
 @@ -950,6 +950,7 @@
  
  	allow $1 exec_type:file manage_file_perms;
@@ -340,7 +340,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.9/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/corenetwork.te.in	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/corenetwork.te.in	2006-08-23 13:09:33.000000000 -0400
 @@ -67,12 +67,14 @@
  network_port(clamd, tcp,3310,s0)
  network_port(clockspeed, udp,4041,s0)
@@ -383,7 +383,7 @@
  network_port(spamd, tcp,783,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.9/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/devices.fc	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/devices.fc	2006-08-23 13:09:33.000000000 -0400
 @@ -12,6 +12,7 @@
  /dev/atibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/audio.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
@@ -403,7 +403,7 @@
  /dev/pmu		-c	gen_context(system_u:object_r:power_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.3.9/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-08-23 12:14:51.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/devices.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/devices.if	2006-08-23 13:09:33.000000000 -0400
 @@ -3034,3 +3034,39 @@
  
  	typeattribute $1 devices_unconfined_type;
@@ -446,7 +446,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.9/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-23 12:14:51.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/devices.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/devices.te	2006-08-23 13:09:33.000000000 -0400
 @@ -72,6 +72,12 @@
  dev_node(lvm_control_t)
  
@@ -471,7 +471,7 @@
  dev_node(xen_device_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.9/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/files.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/files.if	2006-08-23 13:09:33.000000000 -0400
 @@ -2934,6 +2934,24 @@
  
  ########################################
@@ -499,7 +499,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.9/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/filesystem.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/filesystem.te	2006-08-23 13:09:33.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -518,7 +518,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.9/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-08-16 08:46:26.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/kernel.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/kernel.if	2006-08-23 13:09:33.000000000 -0400
 @@ -1443,6 +1443,42 @@
  
  ########################################
@@ -607,7 +607,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.9/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-23 12:14:51.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/terminal.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/terminal.if	2006-08-23 13:09:33.000000000 -0400
 @@ -329,6 +329,7 @@
  		type devpts_t;
  	')
@@ -640,7 +640,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.9/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-08-16 08:46:29.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/amavis.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/amavis.te	2006-08-23 13:09:33.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -672,7 +672,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.9/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/apache.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/apache.te	2006-08-23 13:09:33.000000000 -0400
 @@ -268,10 +268,10 @@
  
  seutil_dontaudit_search_config(httpd_t)
@@ -687,7 +687,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.9/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/avahi.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/avahi.te	2006-08-23 13:09:33.000000000 -0400
 @@ -63,6 +63,7 @@
  domain_use_interactive_fds(avahi_t)
  
@@ -706,7 +706,7 @@
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.9/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2006-08-16 08:46:29.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/bind.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/bind.te	2006-08-23 13:09:33.000000000 -0400
 @@ -218,6 +218,7 @@
  allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
  
@@ -717,7 +717,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-2.3.9/policy/modules/services/ccs.fc
 --- nsaserefpolicy/policy/modules/services/ccs.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ccs.fc	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ccs.fc	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,8 @@
 +# ccs executable will have:
 +# label: system_u:object_r:ccs_exec_t
@@ -729,7 +729,7 @@
 +/etc/cluster(/.*)?		gen_context(system_u:object_r:cluster_conf_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.if serefpolicy-2.3.9/policy/modules/services/ccs.if
 --- nsaserefpolicy/policy/modules/services/ccs.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ccs.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ccs.if	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,45 @@
 +## <summary>policy for ccs</summary>
 +
@@ -778,7 +778,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.3.9/policy/modules/services/ccs.te
 --- nsaserefpolicy/policy/modules/services/ccs.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ccs.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ccs.te	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,84 @@
 +policy_module(ccs,1.0.0)
 +
@@ -866,7 +866,7 @@
 +allow ccs_t cluster_conf_t:file rw_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cpucontrol.te serefpolicy-2.3.9/policy/modules/services/cpucontrol.te
 --- nsaserefpolicy/policy/modules/services/cpucontrol.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/cpucontrol.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cpucontrol.te	2006-08-23 13:09:33.000000000 -0400
 @@ -25,7 +25,7 @@
  # CPU microcode loader local policy
  #
@@ -878,7 +878,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.9/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/cron.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cron.if	2006-08-23 13:09:33.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -931,7 +931,7 @@
  	allow $1 system_crond_t:process sigchld;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.9/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/cron.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cron.te	2006-08-23 13:09:33.000000000 -0400
 @@ -146,6 +146,8 @@
  	')
  ')
@@ -962,7 +962,7 @@
  		# via redirection of standard out.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.9/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/cups.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cups.te	2006-08-23 13:09:33.000000000 -0400
 @@ -74,13 +74,14 @@
  #
  
@@ -1032,7 +1032,7 @@
  fs_search_auto_mountpoints(hplip_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.9/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/cyrus.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cyrus.te	2006-08-23 13:09:33.000000000 -0400
 @@ -69,6 +69,7 @@
  corenet_udp_sendrecv_all_ports(cyrus_t)
  corenet_tcp_bind_all_nodes(cyrus_t)
@@ -1051,7 +1051,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.9/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/dbus.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/dbus.if	2006-08-23 13:09:33.000000000 -0400
 @@ -123,6 +123,7 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
@@ -1074,7 +1074,7 @@
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.3.9/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/dbus.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/dbus.te	2006-08-23 13:09:33.000000000 -0400
 @@ -38,6 +38,7 @@
  allow system_dbusd_t self:unix_stream_socket { connectto create_stream_socket_perms connectto };
  allow system_dbusd_t self:unix_dgram_socket create_socket_perms;
@@ -1093,7 +1093,7 @@
  seutil_read_default_contexts(system_dbusd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.9/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/dovecot.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/dovecot.te	2006-08-23 13:09:33.000000000 -0400
 @@ -168,7 +168,7 @@
  # Allow dovecot to create and read SSL parameters file
  allow dovecot_t dovecot_var_lib_t:dir rw_dir_perms;
@@ -1114,7 +1114,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.te serefpolicy-2.3.9/policy/modules/services/inn.te
 --- nsaserefpolicy/policy/modules/services/inn.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/inn.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/inn.te	2006-08-23 13:09:33.000000000 -0400
 @@ -36,6 +36,7 @@
  allow innd_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow innd_t self:tcp_socket create_stream_socket_perms;
@@ -1125,7 +1125,7 @@
  allow innd_t innd_etc_t:dir r_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.9/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/ldap.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ldap.te	2006-08-23 13:09:33.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -1137,7 +1137,7 @@
  kernel_read_kernel_sysctls(slapd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-2.3.9/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/mta.fc	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/mta.fc	2006-08-23 13:09:33.000000000 -0400
 @@ -2,6 +2,8 @@
  /etc/aliases		--	gen_context(system_u:object_r:etc_aliases_t,s0)
  /etc/aliases\.db	--	gen_context(system_u:object_r:etc_aliases_t,s0)
@@ -1149,7 +1149,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.9/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/ntp.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ntp.te	2006-08-23 13:09:33.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -1172,7 +1172,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-2.3.9/policy/modules/services/oddjob.fc
 --- nsaserefpolicy/policy/modules/services/oddjob.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob.fc	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob.fc	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,8 @@
 +# oddjob executable will have:
 +# label: system_u:object_r:oddjob_exec_t
@@ -1184,7 +1184,7 @@
 +/usr/lib/oddjobd			gen_context(system_u:object_r:oddjob_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-2.3.9/policy/modules/services/oddjob.if
 --- nsaserefpolicy/policy/modules/services/oddjob.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob.if	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,76 @@
 +## <summary>policy for oddjob</summary>
 +
@@ -1264,7 +1264,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.fc
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.fc	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.fc	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,6 @@
 +# oddjob_mkhomedir executable will have:
 +# label: system_u:object_r:oddjob_mkhomedir_exec_t
@@ -1274,7 +1274,7 @@
 +/usr/lib/oddjob/mkhomedir		--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.if
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.if	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,24 @@
 +## <summary>policy for oddjob_mkhomedir</summary>
 +
@@ -1302,7 +1302,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.te
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.te	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,26 @@
 +policy_module(oddjob_mkhomedir,1.0.0)
 +
@@ -1332,7 +1332,7 @@
 +allow oddjob_mkhomedir_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-2.3.9/policy/modules/services/oddjob.te
 --- nsaserefpolicy/policy/modules/services/oddjob.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob.te	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,70 @@
 +policy_module(oddjob,1.0.0)
 +
@@ -1406,7 +1406,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.9/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/openvpn.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/openvpn.te	2006-08-23 13:09:33.000000000 -0400
 @@ -33,7 +33,7 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -1418,7 +1418,7 @@
  allow openvpn_t openvpn_etc_t:file r_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.9/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/pegasus.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/pegasus.if	2006-08-23 13:09:33.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -1454,7 +1454,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.9/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/pegasus.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/pegasus.te	2006-08-23 13:09:33.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -1473,7 +1473,7 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.9/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/postfix.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/postfix.te	2006-08-23 13:09:33.000000000 -0400
 @@ -250,6 +250,7 @@
  allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
  
@@ -1511,7 +1511,7 @@
  	postgrey_stream_connect(postfix_smtpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-2.3.9/policy/modules/services/postgresql.te
 --- nsaserefpolicy/policy/modules/services/postgresql.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/postgresql.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/postgresql.te	2006-08-23 13:09:33.000000000 -0400
 @@ -134,6 +134,7 @@
  seutil_dontaudit_search_config(postgresql_t)
  
@@ -1521,10 +1521,8 @@
  userdom_dontaudit_search_sysadm_home_dirs(postgresql_t)
  userdom_dontaudit_use_sysadm_ttys(postgresql_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.9/policy/modules/services/procmail.te
- ########################################
- 
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/procmail.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/procmail.te	2006-08-23 13:09:33.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -1533,9 +1531,17 @@
  corenet_tcp_sendrecv_all_if(procmail_t)
  corenet_udp_sendrecv_all_if(procmail_t)
  corenet_tcp_sendrecv_all_nodes(procmail_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.3.9/policy/modules/services/pyzor.te
+--- nsaserefpolicy/policy/modules/services/pyzor.te	2006-08-23 12:14:54.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/pyzor.te	2006-08-23 13:09:33.000000000 -0400
+@@ -126,3 +126,4 @@
+ optional_policy(`
+ 	logging_send_syslog_msg(pyzord_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.3.9/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/radius.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/radius.te	2006-08-23 13:09:33.000000000 -0400
 @@ -31,7 +31,7 @@
  # gzip also needs chown access to preserve GID for radwtmp files
  allow radiusd_t self:capability { chown dac_override fsetid kill setgid setuid sys_resource sys_tty_config };
@@ -1547,7 +1553,7 @@
  allow radiusd_t self:tcp_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.fc serefpolicy-2.3.9/policy/modules/services/ricci.fc
 --- nsaserefpolicy/policy/modules/services/ricci.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ricci.fc	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ricci.fc	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,20 @@
 +# ricci executable will have:
 +# label: system_u:object_r:ricci_exec_t
@@ -1571,7 +1577,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.if serefpolicy-2.3.9/policy/modules/services/ricci.if
 --- nsaserefpolicy/policy/modules/services/ricci.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ricci.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ricci.if	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,184 @@
 +## <summary>policy for ricci</summary>
 +
@@ -1759,7 +1765,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.3.9/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ricci.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ricci.te	2006-08-23 13:09:33.000000000 -0400
 @@ -0,0 +1,373 @@
 +policy_module(ricci,1.0.0)
 +
@@ -2136,7 +2142,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-2.3.9/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/rpc.if	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/rpc.if	2006-08-23 13:09:33.000000000 -0400
 @@ -51,6 +51,8 @@
  	kernel_rw_rpc_sysctls($1_t)
  
@@ -2148,7 +2154,7 @@
  	corenet_tcp_sendrecv_all_if($1_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.3.9/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/rpc.te	2006-08-23 13:04:47.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/rpc.te	2006-08-23 13:09:33.000000000 -0400
 @@ -39,6 +39,7 @@
  
  allow rpcd_t self:capability { chown dac_override setgid setuid };
@@ -2167,7 +2173,7 @@
  fs_list_rpc(rpcd_t)
  fs_read_rpc_files(rpcd_t)
  fs_read_rpc_symlinks(rpcd_t)
-@@ -129,8 +128,6 @@
+@@ -129,8 +127,6 @@
  kernel_read_network_state(gssd_t)
  kernel_read_network_state_symlinks(gssd_t)	
  
@@ -2178,7 +2184,7 @@
  fs_read_rpc_files(gssd_t) 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.9/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/samba.te	2006-08-23 13:04:07.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/samba.te	2006-08-23 13:09:33.000000000 -0400
 @@ -171,7 +171,7 @@
  #
  # smbd Local policy
@@ -2197,7 +2203,7 @@
  dontaudit smbd_t samba_log_t:dir remove_name;
  allow smbd_t samba_log_t:file { create ra_file_perms };
  
-@@ -359,7 +367,7 @@
+@@ -359,7 +359,7 @@
  allow nmbd_t samba_etc_t:dir { search getattr };
  allow nmbd_t samba_etc_t:file { getattr read };
  
@@ -2206,7 +2212,7 @@
  allow nmbd_t samba_log_t:file { create ra_file_perms };
  
  allow nmbd_t samba_var_t:dir rw_dir_perms;
-@@ -638,7 +646,7 @@
+@@ -638,7 +638,7 @@
  allow winbind_t samba_etc_t:dir rw_dir_perms;
  type_transition winbind_t samba_etc_t:file samba_secrets_t;
  
@@ -2217,7 +2223,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.9/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.fc	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.fc	2006-08-23 13:09:34.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -2230,14 +2236,14 @@
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.9/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.if	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.if	2006-08-23 13:09:34.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.9/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.te	2006-08-23 13:09:34.000000000 -0400
 @@ -0,0 +1,110 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -2351,7 +2357,7 @@
 +files_dontaudit_search_src(setroubleshootd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.9/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/spamassassin.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/spamassassin.te	2006-08-23 13:09:34.000000000 -0400
 @@ -193,3 +193,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -2362,7 +2368,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.9/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/squid.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/squid.te	2006-08-23 13:09:34.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -2377,7 +2383,7 @@
  allow squid_t self:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.9/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/ssh.if	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ssh.if	2006-08-23 13:09:34.000000000 -0400
 @@ -711,3 +711,27 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
@@ -2390,7 +2396,8 @@
 +## </summary>
 +## <param name="domain">
 +##	<summary>
-+##	Domain allowed access.+##	</summary>
++##	Domain allowed access.
++##	</summary>
 +## </param>
 +#
 +interface(`ssh_domtrans_keygen',`
@@ -2407,7 +2414,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.9/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/stunnel.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/stunnel.te	2006-08-23 13:09:34.000000000 -0400
 @@ -38,6 +38,7 @@
  allow stunnel_t self:fifo_file rw_file_perms;
  allow stunnel_t self:tcp_socket create_stream_socket_perms;
@@ -2426,7 +2433,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-2.3.9/policy/modules/services/sysstat.te
 --- nsaserefpolicy/policy/modules/services/sysstat.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/sysstat.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/sysstat.te	2006-08-23 13:09:34.000000000 -0400
 @@ -36,6 +36,8 @@
  kernel_read_fs_sysctls(sysstat_t)
  kernel_read_rpc_sysctls(sysstat_t)
@@ -2446,7 +2453,7 @@
  init_use_script_ptys(sysstat_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.9/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/xserver.if	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/xserver.if	2006-08-23 13:09:34.000000000 -0400
 @@ -45,7 +45,6 @@
  	allow $1_xserver_t self:capability { dac_override fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
  	dontaudit $1_xserver_t self:capability chown;
@@ -2553,7 +2560,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.9/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/xserver.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/xserver.te	2006-08-23 13:09:34.000000000 -0400
 @@ -81,15 +81,19 @@
  #
  
@@ -2631,7 +2638,7 @@
  	unconfined_domtrans(xdm_xserver_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.9/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/authlogin.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/authlogin.te	2006-08-23 13:09:34.000000000 -0400
 @@ -215,12 +215,19 @@
  logging_send_syslog_msg(pam_console_t)
  
@@ -2663,7 +2670,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.9/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/fstools.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/fstools.te	2006-08-23 13:09:34.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -2674,7 +2681,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.9/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/hostname.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/hostname.te	2006-08-23 13:09:34.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -2699,7 +2706,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.9/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/init.if	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/init.if	2006-08-23 13:09:34.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -2716,8 +2723,8 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.9/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/init.te	2006-08-23 13:04:08.000000000 -0400
-@@ -361,6 +357,8 @@
++++ serefpolicy-2.3.9/policy/modules/system/init.te	2006-08-23 13:09:34.000000000 -0400
+@@ -361,6 +361,8 @@
  logging_read_audit_config(initrc_t)
  
  miscfiles_read_localization(initrc_t)
@@ -2728,7 +2735,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.9/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/libraries.fc	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/libraries.fc	2006-08-23 13:09:34.000000000 -0400
 @@ -109,6 +109,8 @@
  /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
  
@@ -2759,7 +2766,7 @@
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.9/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/locallogin.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/locallogin.te	2006-08-23 13:09:34.000000000 -0400
 @@ -47,7 +47,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -2780,7 +2787,7 @@
  dev_getattr_mouse_dev(local_login_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.9/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/logging.fc	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/logging.fc	2006-08-23 13:09:34.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -2790,7 +2797,7 @@
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.9/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/logging.if	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/logging.if	2006-08-23 13:09:34.000000000 -0400
 @@ -553,3 +553,24 @@
  	allow $1 var_log_t:dir rw_dir_perms;
  	allow $1 var_log_t:file create_file_perms;
@@ -2818,7 +2825,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.9/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/logging.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/logging.te	2006-08-23 13:09:34.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -2833,7 +2840,7 @@
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.3.9/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/lvm.fc	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/lvm.fc	2006-08-23 13:09:34.000000000 -0400
 @@ -14,7 +14,6 @@
  
  /etc/lvmtab(/.*)?		gen_context(system_u:object_r:lvm_metadata_t,s0)
@@ -2849,7 +2856,7 @@
 +/var/run/multipathd.sock	-s	gen_context(system_u:object_r:lvm_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.9/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/lvm.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/lvm.te	2006-08-23 13:09:34.000000000 -0400
 @@ -125,7 +125,7 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
@@ -2879,7 +2886,7 @@
  allow lvm_t lvm_etc_t:lnk_file r_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.9/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/miscfiles.fc	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/miscfiles.fc	2006-08-23 13:09:34.000000000 -0400
 @@ -9,6 +9,7 @@
  # /etc
  #
@@ -2890,7 +2897,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.9/policy/modules/system/miscfiles.if
 --- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/miscfiles.if	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/miscfiles.if	2006-08-23 13:09:34.000000000 -0400
 @@ -116,6 +116,24 @@
  
  ########################################
@@ -2918,7 +2925,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.9/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/modutils.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/modutils.te	2006-08-23 13:09:34.000000000 -0400
 @@ -183,6 +183,7 @@
  fs_getattr_xattr_fs(depmod_t)
  
@@ -2929,7 +2936,7 @@
  corecmd_search_sbin(depmod_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.9/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/mount.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/mount.te	2006-08-23 13:09:34.000000000 -0400
 @@ -80,6 +80,7 @@
  files_read_isid_type_files(mount_t)
  # For reading cert files
@@ -2958,9 +2965,15 @@
  ########################################
  #
  # Unconfined mount local policy
+@@ -175,3 +182,5 @@
+ 	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
+ 	unconfined_domain(unconfined_mount_t)
+ ')
++
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.9/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/selinuxutil.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/selinuxutil.te	2006-08-23 13:09:34.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -3004,7 +3017,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.9/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/udev.fc	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/udev.fc	2006-08-23 13:09:34.000000000 -0400
 @@ -1,5 +1,6 @@
  # udev
  
@@ -3014,7 +3027,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.9/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/udev.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/udev.te	2006-08-23 13:09:34.000000000 -0400
 @@ -131,6 +131,7 @@
  mls_file_upgrade(udev_t)
  mls_file_downgrade(udev_t)
@@ -3035,7 +3048,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.9/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/unconfined.if	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/unconfined.if	2006-08-23 13:09:34.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -3054,7 +3067,7 @@
  	selinux_unconfined($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.9/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/unconfined.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/unconfined.te	2006-08-23 13:09:34.000000000 -0400
 @@ -195,4 +195,9 @@
  ifdef(`targeted_policy',`
  	allow unconfined_execmem_t self:process { execstack execmem };
@@ -3067,7 +3080,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.9/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/userdomain.if	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/userdomain.if	2006-08-23 13:09:34.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -3542,7 +3555,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.9/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/userdomain.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/userdomain.te	2006-08-23 13:09:34.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -3644,7 +3657,7 @@
  			selinux_set_boolean(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.9/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/xen.if	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/xen.if	2006-08-23 13:09:34.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -3689,7 +3702,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.9/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/xen.te	2006-08-23 13:04:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/xen.te	2006-08-23 13:09:34.000000000 -0400
 @@ -69,7 +69,10 @@
  #
  



From fedora-cvs-commits at redhat.com  Wed Aug 23 21:06:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 17:06:40 -0400
Subject: rpms/openssh/devel openssh-4.3p2-allow-ip-opts.patch, NONE,
	1.1 openssh-4.3p2-coverity-memleaks.patch, NONE,
	1.1 openssh-4.3p2-gssapi-no-spnego.patch, NONE,
	1.1 openssh-4.3p2-localtime.patch, NONE,
	1.1 openssh-4.3p2-no-dup-logs.patch, NONE, 1.1 openssh.spec,
	1.95, 1.96
Message-ID: <200608232106.k7NL6ekg017587@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17537

Modified Files:
	openssh.spec 
Added Files:
	openssh-4.3p2-allow-ip-opts.patch 
	openssh-4.3p2-coverity-memleaks.patch 
	openssh-4.3p2-gssapi-no-spnego.patch 
	openssh-4.3p2-localtime.patch openssh-4.3p2-no-dup-logs.patch 
Log Message:
* Wed Aug 23 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-9
- don't report duplicate syslog messages, use correct local time (#189158)
- don't allow spnego as gssapi mechanism (from upstream)
- fixed memleaks found by Coverity (from upstream)
- allow ip options except source routing (#202856) (patch by HP)


openssh-4.3p2-allow-ip-opts.patch:
 canohost.c |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

--- NEW FILE openssh-4.3p2-allow-ip-opts.patch ---
From: Paul Moore <paul.moore at hp.com>
Subject: OpenSSH: fix option handling on incoming connections

OpenSSH rejects incoming connections if any IP options are present when the
comments state that they are only concerned with source routing options.  This
connection rejection causes problems with CIPSO which uses IP options to tag
packets with security attributes.

This patch modifies the check_ip_options() function to only fail if loose or
strict source routing options are present, all other options are allowed.

Signed-off-by: Paul Moore <paul.moore at hp.com>

---
 canohost.c |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

Index: openssh-4.3p2/canohost.c
===================================================================
--- openssh-4.3p2.orig/canohost.c
+++ openssh-4.3p2/canohost.c
@@ -146,6 +146,7 @@ check_ip_options(int sock, char *ipaddr)
 	u_int i;
 	int ipproto;
 	struct protoent *ip;
+	u_int opt_iter;
 
 	if ((ip = getprotobyname("ip")) != NULL)
 		ipproto = ip->p_proto;
@@ -154,13 +155,23 @@ check_ip_options(int sock, char *ipaddr)
 	option_size = sizeof(options);
 	if (getsockopt(sock, ipproto, IP_OPTIONS, options,
 	    &option_size) >= 0 && option_size != 0) {
-		text[0] = '\0';
-		for (i = 0; i < option_size; i++)
-			snprintf(text + i*3, sizeof(text) - i*3,
-			    " %2.2x", options[i]);
-		fatal("Connection from %.100s with IP options:%.800s",
-		    ipaddr, text);
+		opt_iter = 0;
+		do {
+			/* Fail, fatally, if we detect either loose or strict
+			 * source routing options. */
+			if (options[opt_iter] == 131 ||
+			    options[opt_iter] == 137)
+				goto fail;
+			opt_iter += options[opt_iter + 1] + 2;
+		} while (opt_iter < option_size);
 	}
+	return;
+
+fail:
+	text[0] = '\0';
+	for (i = 0; i < option_size; i++)
+		snprintf(text + i*3, sizeof(text) - i*3, " %2.2x", options[i]);
+	fatal("Connection from %.100s with IP options:%.800s", ipaddr, text);
 #endif /* IP_OPTIONS */
 }
 

openssh-4.3p2-coverity-memleaks.patch:
 auth2-gss.c  |    2 ++
 gss-genr.c   |   14 +++++++++++---
 gss-serv.c   |    2 ++
 monitor.c    |    4 ++++
 serverloop.c |    1 +
 sftp.c       |    6 ++++--
 6 files changed, 24 insertions(+), 5 deletions(-)

--- NEW FILE openssh-4.3p2-coverity-memleaks.patch ---
Some memleaks fixes from coverity scan taken from upstream CVS
--- openssh/auth2-gss.c	2005/11/05 05:07:05	1.13
+++ openssh/auth2-gss.c	2006/03/25 14:04:53	1.14
@@ -100,6 +100,8 @@
 	}
 
 	if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
+		if (ctxt != NULL)
+			ssh_gssapi_delete_ctx(&ctxt);
 		xfree(doid);
 		return (0);
 	}
--- openssh/gss-genr.c	2005/11/05 05:07:05	1.7
+++ openssh/gss-genr.c	2006/03/25 14:05:23	1.8
@@ -72,7 +72,11 @@
 void
 ssh_gssapi_error(Gssctxt *ctxt)
 {
-	debug("%s", ssh_gssapi_last_error(ctxt, NULL, NULL));
+	char *s;
+
+	s = ssh_gssapi_last_error(ctxt, NULL, NULL);
+	debug("%s", s);
+	xfree(s);
 }
 
 char *
@@ -231,11 +235,15 @@
 	gss_create_empty_oid_set(&status, &oidset);
 	gss_add_oid_set_member(&status, ctx->oid, &oidset);
 
-	if (gethostname(lname, MAXHOSTNAMELEN))
+	if (gethostname(lname, MAXHOSTNAMELEN)) {
+		gss_release_oid_set(&status, &oidset);
 		return (-1);
+	}
 
-	if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname)))
+	if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
+		gss_release_oid_set(&status, &oidset);
 		return (ctx->major);
+	}
 
 	if ((ctx->major = gss_acquire_cred(&ctx->minor,
 	    ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL)))
--- openssh/gss-serv.c	2006/03/15 01:20:04	1.14
+++ openssh/gss-serv.c	2006/03/25 14:05:44	1.15
@@ -78,6 +78,8 @@
 			    &supported_mechs[i]->oid, oidset);
 		i++;
 	}
+
+	gss_release_oid_set(&min_status, &supported);
 }
 
 
--- openssh/monitor.c	2006/03/26 03:58:56	1.96
+++ openssh/monitor.c	2006/03/26 04:01:55	1.97
@@ -1021,6 +1021,10 @@
 		key_blobtype = type;
 		hostbased_cuser = cuser;
 		hostbased_chost = chost;
+	} else {
+		xfree(blob);
+		xfree(cuser);
+		xfree(chost);
 	}
 
 	debug3("%s: key %p is %s",
--- openssh/sftp.c	2006/03/25 14:03:23	1.82
+++ openssh/sftp.c	2006/03/26 03:51:44	1.83
@@ -548,6 +548,7 @@
 
 		if (g.gl_matchc == 1 && dst) {
 			/* If directory specified, append filename */
+			xfree(tmp);
 			if (is_dir(dst)) {
 				if (infer_path(g.gl_pathv[0], &tmp)) {
 					err = 1;
@@ -572,8 +573,6 @@
 
 out:
 	xfree(abs_src);
-	if (abs_dst)
-		xfree(abs_dst);
 	globfree(&g);
 	return(err);
 }
@@ -1289,6 +1288,7 @@
 			if (parse_dispatch_command(conn, cmd, &pwd, 1) != 0) {
 				xfree(dir);
 				xfree(pwd);
+				xfree(conn);
 				return (-1);
 			}
 		} else {
@@ -1301,6 +1301,7 @@
 			err = parse_dispatch_command(conn, cmd, &pwd, 1);
 			xfree(dir);
 			xfree(pwd);
+			xfree(conn);
 			return (err);
 		}
 		xfree(dir);
@@ -1365,6 +1366,7 @@
 			break;
 	}
 	xfree(pwd);
+	xfree(conn);
 
 #ifdef USE_LIBEDIT
 	if (el != NULL)
--- openssh/serverloop.c	2006/03/25 14:03:23	1.131
+++ openssh/serverloop.c	2006/03/26 03:51:09	1.132
@@ -1090,6 +1090,7 @@
 
 		success = channel_cancel_rport_listener(cancel_address,
 		    cancel_port);
+		xfree(cancel_address);
 	}
 	if (want_reply) {
 		packet_start(success ?


openssh-4.3p2-gssapi-no-spnego.patch:
 gss-genr.c    |   29 +++++++++++++++++++++++++++++
 ssh-gss.h     |    1 +
 sshconnect2.c |    9 ++-------
 3 files changed, 32 insertions(+), 7 deletions(-)

--- NEW FILE openssh-4.3p2-gssapi-no-spnego.patch ---
--- openssh/gss-genr.c	2006/08/05 02:39:40	1.15
+++ openssh/gss-genr.c	2006/08/18 14:33:34	1.16
@@ -289,6 +289,35 @@
 	ssh_gssapi_build_ctx(ctx);
 	ssh_gssapi_set_oid(*ctx, oid);
 	return (ssh_gssapi_acquire_cred(*ctx));
+}
+
+int
+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
+{
+	gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
+	OM_uint32 major, minor;
+	gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"};
+
+	/* RFC 4462 says we MUST NOT do SPNEGO */
+	if (oid->length == spnego_oid.length && 
+	    (memcmp(oid->elements, spnego_oid.elements, oid->length) == 0))
+		return 0;
+
+	ssh_gssapi_build_ctx(ctx);
+	ssh_gssapi_set_oid(*ctx, oid);
+	major = ssh_gssapi_import_name(*ctx, host);
+	if (!GSS_ERROR(major)) {
+		major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, 
+		    NULL);
+		gss_release_buffer(&minor, &token);
+		gss_delete_sec_context(&minor, &(*ctx)->context, 
+		    GSS_C_NO_BUFFER);
+	}
+
+	if (GSS_ERROR(major)) 
+		ssh_gssapi_delete_ctx(ctx);
+
+	return (!GSS_ERROR(major));
 }
 
 #endif /* GSSAPI */
--- openssh/ssh-gss.h	2006/08/05 02:39:40	1.9
+++ openssh/ssh-gss.h	2006/08/18 14:33:34	1.10
@@ -118,6 +118,7 @@
 OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
 OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
 void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *);
+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *);
 
 /* In the server */
 int ssh_gssapi_userok(char *name);
--- openssh/sshconnect2.c	2006/08/05 02:39:41	1.150
+++ openssh/sshconnect2.c	2006/08/18 14:33:34	1.151
@@ -508,15 +508,10 @@
 
 	/* Check to see if the mechanism is usable before we offer it */
 	while (mech < gss_supported->count && !ok) {
-		if (gssctxt)
-			ssh_gssapi_delete_ctx(&gssctxt);
-		ssh_gssapi_build_ctx(&gssctxt);
-		ssh_gssapi_set_oid(gssctxt, &gss_supported->elements[mech]);
-
 		/* My DER encoding requires length<128 */
 		if (gss_supported->elements[mech].length < 128 &&
-		    !GSS_ERROR(ssh_gssapi_import_name(gssctxt,
-		    authctxt->host))) {
+		    ssh_gssapi_check_mechanism(&gssctxt, 
+		    &gss_supported->elements[mech], authctxt->host)) {
 			ok = 1; /* Mechanism works */
 		} else {
 			mech++;

openssh-4.3p2-localtime.patch:
 sshd.init |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE openssh-4.3p2-localtime.patch ---
--- openssh-4.3p2/contrib/redhat/sshd.init.localtime	2006-08-23 14:50:05.000000000 +0200
+++ openssh-4.3p2/contrib/redhat/sshd.init	2006-08-23 22:08:13.000000000 +0200
@@ -102,6 +102,8 @@
 	do_rsa1_keygen
 	do_rsa_keygen
 	do_dsa_keygen
+	
+	cp -af /etc/localtime /var/empty/sshd/etc
 
 	echo -n $"Starting $prog: "
 	$SSHD $OPTIONS && success || failure

openssh-4.3p2-no-dup-logs.patch:
 auth.c    |   42 ++++++------------------------------------
 monitor.c |   18 +++++++++++++++---
 2 files changed, 21 insertions(+), 39 deletions(-)

--- NEW FILE openssh-4.3p2-no-dup-logs.patch ---
Don't log duplicate auth messages in the system log.
--- openssh-4.3p2/auth.c.no-dups	2006-08-23 14:50:05.000000000 +0200
+++ openssh-4.3p2/auth.c	2006-08-23 14:51:14.000000000 +0200
@@ -55,6 +55,7 @@
 
 /* import */
 extern ServerOptions options;
+extern int use_privsep;
 extern Buffer loginmsg;
 
 /* Debugging messages */
@@ -231,6 +232,9 @@
 	void (*authlog) (const char *fmt,...) = verbose;
 	char *authmsg;
 
+	if (use_privsep && !mm_is_monitor() && !authctxt->postponed)
+		return;
+
 	/* Raise logging level */
 	if (authenticated == 1 ||
 	    !authctxt->valid ||
@@ -267,42 +271,8 @@
 	}
 #endif
 #ifdef SSH_AUDIT_EVENTS
-	if (authenticated == 0 && !authctxt->postponed) {
-		ssh_audit_event_t event;
-
-		debug3("audit failed auth attempt, method %s euid %d",
-		    method, (int)geteuid());
-		/*
-		 * Because the auth loop is used in both monitor and slave,
-		 * we must be careful to send each event only once and with
-		 * enough privs to write the event.
-		 */
-		event = audit_classify_auth(method);
-		switch(event) {
-		case SSH_AUTH_FAIL_NONE:
-		case SSH_AUTH_FAIL_PASSWD:
-		case SSH_AUTH_FAIL_KBDINT:
-			if (geteuid() == 0)
-				audit_event(event);
-			break;
-		case SSH_AUTH_FAIL_PUBKEY:
-		case SSH_AUTH_FAIL_HOSTBASED:
-		case SSH_AUTH_FAIL_GSSAPI:
-			/*
-			 * This is required to handle the case where privsep
-			 * is enabled but it's root logging in, since
-			 * use_privsep won't be cleared until after a
-			 * successful login.
-			 */
-			if (geteuid() == 0)
-				audit_event(event);
-			else
-				PRIVSEP(audit_event(event));
-			break;
-		default:
-			error("unknown authentication audit event %d", event);
-		}
-	}
+	if (authenticated == 0 && !authctxt->postponed)
+		audit_event(audit_classify_auth(method));
 #endif
 }
 
--- openssh-4.3p2/monitor.c.no-dups	2006-08-23 14:50:42.000000000 +0200
+++ openssh-4.3p2/monitor.c	2006-08-23 14:51:14.000000000 +0200
@@ -172,6 +172,7 @@
 #define MON_ISAUTH	0x0004	/* Required for Authentication */
 #define MON_AUTHDECIDE	0x0008	/* Decides Authentication */
 #define MON_ONCE	0x0010	/* Disable after calling */
+#define MON_ALOG	0x0020	/* Log auth attempt without authenticating */
 
 #define MON_AUTH	(MON_ISAUTH|MON_AUTHDECIDE)
 
@@ -233,8 +234,8 @@
     {MONITOR_REQ_SESSKEY, MON_ONCE, mm_answer_sesskey},
     {MONITOR_REQ_SESSID, MON_ONCE, mm_answer_sessid},
     {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
-    {MONITOR_REQ_RSAKEYALLOWED, MON_ISAUTH, mm_answer_rsa_keyallowed},
-    {MONITOR_REQ_KEYALLOWED, MON_ISAUTH, mm_answer_keyallowed},
+    {MONITOR_REQ_RSAKEYALLOWED, MON_ISAUTH|MON_ALOG, mm_answer_rsa_keyallowed},
+    {MONITOR_REQ_KEYALLOWED, MON_ISAUTH|MON_ALOG, mm_answer_keyallowed},
     {MONITOR_REQ_RSACHALLENGE, MON_ONCE, mm_answer_rsa_challenge},
     {MONITOR_REQ_RSARESPONSE, MON_ONCE|MON_AUTHDECIDE, mm_answer_rsa_response},
 #ifdef BSD_AUTH
@@ -328,6 +329,7 @@
 
 	/* The first few requests do not require asynchronous access */
 	while (!authenticated) {
+		auth_method = "unknown";
 		authenticated = monitor_read(pmonitor, mon_dispatch, &ent);
 		if (authenticated) {
 			if (!(ent->flags & MON_AUTHDECIDE))
@@ -350,7 +352,7 @@
 #endif
 		}
 
-		if (ent->flags & MON_AUTHDECIDE) {
+		if (ent->flags & (MON_AUTHDECIDE|MON_ALOG)) {
 			auth_log(authctxt, authenticated, auth_method,
 			    compat20 ? " ssh2" : "");
 			if (!authenticated)
@@ -360,6 +362,8 @@
 
 	if (!authctxt->valid)
 		fatal("%s: authenticated invalid user", __func__);
+	if (strcmp(auth_method, "unknown") == 0)
+		fatal("%s: authentication method name unknown", __func__);
 
 	debug("%s: %s has been authenticated by privileged process",
 	    __func__, authctxt->user);
@@ -913,6 +917,7 @@
 		xfree(prompts);
 	if (echo_on != NULL)
 		xfree(echo_on);
+	auth_method = "keyboard-interactive/pam";
 	mm_request_send(sock, MONITOR_ANS_PAM_QUERY, m);
 	return (0);
 }
@@ -955,6 +960,7 @@
 	(sshpam_device.free_ctx)(sshpam_ctxt);
 	buffer_clear(m);
 	mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m);
+	auth_method = "keyboard-interactive/pam";
 	return (sshpam_authok == sshpam_ctxt);
 }
 #endif
@@ -1000,17 +1006,20 @@
 		case MM_USERKEY:
 			allowed = options.pubkey_authentication &&
 			    user_key_allowed(authctxt->pw, key);
+			auth_method = "publickey";
 			break;
 		case MM_HOSTKEY:
 			allowed = options.hostbased_authentication &&
 			    hostbased_key_allowed(authctxt->pw,
 			    cuser, chost, key);
+			auth_method = "hostbased";
 			break;
 		case MM_RSAHOSTKEY:
 			key->type = KEY_RSA1; /* XXX */
 			allowed = options.rhosts_rsa_authentication &&
 			    auth_rhosts_rsa_key_allowed(authctxt->pw,
 			    cuser, chost, key);
+			auth_method = "rsa";
 			break;
 		default:
 			fatal("%s: unknown key type %d", __func__, type);
@@ -1031,6 +1040,8 @@
 		hostbased_cuser = cuser;
 		hostbased_chost = chost;
 	} else {
+		/* Log failed attempt */
+		auth_log(authctxt, 0, auth_method, compat20 ? " ssh2" : "");
 		xfree(blob);
 		xfree(cuser);
 		xfree(chost);
@@ -1398,6 +1409,7 @@
 
 	debug3("%s entering", __func__);
 
+	auth_method = "rsa";
 	if (options.rsa_authentication && authctxt->valid) {
 		if ((client_n = BN_new()) == NULL)
 			fatal("%s: BN_new", __func__);


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- openssh.spec	8 Aug 2006 11:58:33 -0000	1.95
+++ openssh.spec	23 Aug 2006 21:06:38 -0000	1.96
@@ -61,7 +61,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 4.3p2
-Release: 8%{?rescue_rel}
+Release: 9%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.sig
@@ -91,6 +91,11 @@
 Patch37: openssh-4.3p2-configure-typo.patch
 Patch38: openssh-4.3p2-askpass-grab-info.patch
 Patch39: openssh-4.3p2-no-v6only.patch
+Patch40: openssh-4.3p2-coverity-memleaks.patch
+Patch41: openssh-4.3p2-gssapi-no-spnego.patch
+Patch42: openssh-4.3p2-no-dup-logs.patch
+Patch43: openssh-4.3p2-localtime.patch
+Patch44: openssh-4.3p2-allow-ip-opts.patch
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -219,6 +224,11 @@
 %patch37 -p1 -b .typo
 %patch38 -p1 -b .grab-info
 %patch39 -p1 -b .no-v6only
+%patch40 -p1 -b .memleaks
+%patch41 -p1 -b .no-spnego
+%patch42 -p1 -b .no-dups
+%patch43 -p1 -b .localtime
+%patch44 -p1 -b .ip-opts
 
 autoreconf
 
@@ -228,7 +238,7 @@
 CFLAGS="$CFLAGS -Os"
 %endif
 %if %{pie}
-%ifarch s390 s390x
+%ifarch s390 s390x sparc sparc64
 CFLAGS="$CFLAGS -fPIE"
 %else
 CFLAGS="$CFLAGS -fpie"
@@ -311,9 +321,10 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh
 mkdir -p -m755 $RPM_BUILD_ROOT%{_libexecdir}/openssh
-mkdir -p -m755 $RPM_BUILD_ROOT%{_var}/empty/sshd
+mkdir -p -m755 $RPM_BUILD_ROOT%{_var}/empty/sshd/etc
 make install DESTDIR=$RPM_BUILD_ROOT
 
+touch $RPM_BUILD_ROOT%{_var}/empty/sshd/etc/localtime
 install -d $RPM_BUILD_ROOT/etc/pam.d/
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -d $RPM_BUILD_ROOT%{_libexecdir}/openssh
@@ -440,6 +451,8 @@
 %files server
 %defattr(-,root,root)
 %dir %attr(0711,root,root) %{_var}/empty/sshd
+%dir %attr(0755,root,root) %{_var}/empty/sshd/etc
+%ghost %verify(not md5 size mtime) %{_var}/empty/sshd/etc/localtime
 %attr(0755,root,root) %{_sbindir}/sshd
 %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
 %attr(0644,root,root) %{_mandir}/man5/sshd_config.5*
@@ -460,6 +473,12 @@
 %endif
 
 %changelog
+* Wed Aug 23 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-9
+- don't report duplicate syslog messages, use correct local time (#189158)
+- don't allow spnego as gssapi mechanism (from upstream)
+- fixed memleaks found by Coverity (from upstream)
+- allow ip options except source routing (#202856) (patch by HP)
+
 * Tue Aug  8 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-8
 - drop the pam-session patch from the previous build (#201341)
 - don't set IPV6_V6ONLY sock opt when listening on wildcard addr (#201594)



From fedora-cvs-commits at redhat.com  Wed Aug 23 22:02:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 18:02:52 -0400
Subject: rpms/xchat/devel xchat.spec,1.55,1.56
Message-ID: <200608232202.k7NM2qC9029140@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/xchat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29068

Modified Files:
	xchat.spec 
Log Message:
- enable optional spell checking if you install enchant
  because gtkspell is currently unusable (#201116)



Index: xchat.spec
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xchat.spec	18 Aug 2006 00:56:08 -0000	1.55
+++ xchat.spec	23 Aug 2006 22:02:41 -0000	1.56
@@ -5,7 +5,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.6.6
-Release:   2%{?dist}
+Release:   3%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -69,10 +69,11 @@
            --enable-openssl \
            --enable-python \
 	   --disable-tcl \
-           --enable-ipv6 
+           --enable-ipv6 \
+           --enable-spell=static
 
-# Spell checking breaks Input Method commit with ENTER
-#           --enable-spell=gtkspell
+# gtkspell breaks Input Method commit with ENTER
+# static works if the optional exchant package is installed
 
 make %{?_smp_mflags}
 
@@ -117,6 +118,10 @@
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 
 %changelog
+* Wed Aug 23 2006 Warren Togami <wtogami at redhat.com> - 1:2.6.6-3
+- enable optional spell checking if you install enchant
+  because gtkspell is currently unusable (#201116)
+
 * Thu Aug 17 2006 Warren Togami <wtogami at redhat.com> - 1:2.6.6-2
 - disable gtkspell because it breaks Input Method commit
 - apply upstream fi patch



From fedora-cvs-commits at redhat.com  Wed Aug 23 22:17:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 18:17:36 -0400
Subject: rpms/xinetd/devel xinetd-2.3.14-label.patch, NONE, 1.1 xinetd.spec,
	1.32, 1.33
Message-ID: <200608232217.k7NMHZKC003318@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/xinetd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3020

Modified Files:
	xinetd.spec 
Added Files:
	xinetd-2.3.14-label.patch 
Log Message:
* Wed Aug 23 2006 Steve Grubb <sgrubb at redhat.com> 2:2.3.14-4
- Added labeled networking patch


xinetd-2.3.14-label.patch:
 config.h.in            |    1 
 configure.in           |   28 +++++++++++++++++++
 xinetd/child.c         |   69 +++++++++++++++++++++++++++++++++++++++++++++++++
 xinetd/main.c          |    5 ++-
 xinetd/nvlists.c       |    1 
 xinetd/sconf.h         |    2 +
 xinetd/xinetd.conf.man |    3 ++
 7 files changed, 108 insertions(+), 1 deletion(-)

--- NEW FILE xinetd-2.3.14-label.patch ---
diff -urNp xinetd-2.3.14.orig/config.h.in xinetd-2.3.14/config.h.in
--- xinetd-2.3.14.orig/config.h.in	2006-06-16 13:20:01.000000000 -0400
+++ xinetd-2.3.14/config.h.in	2006-08-23 17:26:04.000000000 -0400
@@ -112,6 +112,7 @@
 /* Options */
 #undef HAVE_LIBWRAP
 #undef LIBWRAP
+#undef LABELED_NET
 
 #undef HAVE_LOADAVG
 
diff -urNp xinetd-2.3.14.orig/configure.in xinetd-2.3.14/configure.in
--- xinetd-2.3.14.orig/configure.in	2006-06-16 13:20:01.000000000 -0400
+++ xinetd-2.3.14/configure.in	2006-08-23 17:26:04.000000000 -0400
@@ -289,6 +289,34 @@ AC_ARG_WITH(libwrap,
 	AC_MSG_RESULT(no)
 )
 
+AC_MSG_CHECKING(whether to use labeled-networking)
+AC_ARG_WITH(labeled-networking,
+[  --with-labeled-networking[=PATH]   Compile in labeled networking support.],
+[ case "$withval" in
+	no)
+		AC_MSG_RESULT(no)
+		;;
+	yes)
+		AC_MSG_RESULT(yes)
+		AC_CHECK_LIB(selinux, setexeccon, [
+			AC_DEFINE(LABELED_NET)
+			LABELLIBS="-lselinux" ])
+		LIBS="$LABELLIBS $LIBS"
+		;;
+	*)
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(LABELED_NET)
+		if test -d "$withval"; then
+			LABELLIBS="-L$withval -lselinux"
+		else
+			LABELLIBS="$withval"
+		fi
+		LIBS="$LABELLIBS $LIBS"
+		;;
+	esac ],
+	AC_MSG_RESULT(no)
+)
+
 AC_FUNC_MMAP
 
 AC_CHECK_FUNCS(isatty)
diff -urNp xinetd-2.3.14.orig/xinetd/child.c xinetd-2.3.14/xinetd/child.c
--- xinetd-2.3.14.orig/xinetd/child.c	2006-06-16 13:20:01.000000000 -0400
+++ xinetd-2.3.14/xinetd/child.c	2006-08-23 17:27:22.000000000 -0400
@@ -31,6 +31,9 @@
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
+#ifdef LABELED_NET
+#include <selinux/selinux.h>
+#endif
 
 #include "str.h"
 #include "child.h"
@@ -44,6 +47,12 @@
 #include "options.h"
 #include "redirect.h"
 
+/* Local declarations */
+#ifdef LABELED_NET
+static int set_exec_context_from_socket( int fd );
+#endif
+
+
 /*
  * This function is running in the new process
  */
@@ -143,6 +152,19 @@ void exec_server( const struct server *s
    }
 #endif
 
+   /*
+      Set the context if the option was given
+   */
+#ifdef LABELED_NET
+   if (SC_LABELED_NET(scp))
+   {
+      if (set_exec_context_from_socket( descriptor ) < 0)
+         msg( LOG_ERR, func,
+             "Changing process context failed for %s", SC_NAME( scp )) ;
+         _exit( 1 ) ;
+   }
+#endif
+
    (void) Sclose( descriptor ) ;
 
 #ifndef solaris
@@ -461,3 +483,50 @@ void child_exit(void)
    }
 }
 
+#ifdef LABELED_NET
+static int get_context_from_socket(int fd, char *buffer, unsigned int *buflen)
+{
+   const char *func = "get_context_from_socket" ;
+
+   int retval = getsockopt(fd, SOL_SOCKET, SO_PEERSEC, buffer, buflen);
+   
+   if ( debug.on )
+   {
+     if (retval)
+	msg( LOG_DEBUG, func, 
+	     "error getting context of fd %d: %s", fd, strerror(errno));
+     else
+	msg( LOG_DEBUG, func, 
+	     "got context for fd %d: %s", fd, buffer);
+   }
+     
+   return retval;
+}
+
+static int set_exec_context_from_socket( int fd )
+{
+   const char *func = "set_exec_context_from_socket" ;
+
+   char buffer[255];
+   unsigned int buflen = 255;
+
+   if (get_context_from_socket(fd, buffer, &buflen))
+      return -1;
+
+   int retval = setexeccon(buffer);
+
+   if (debug.on)
+   {
+      security_context_t current_exec_context;
+      getexeccon( &current_exec_context );
+
+      msg( LOG_DEBUG, func, 
+	   "current security exec context now: %s", 
+	   current_exec_context);
+
+      freecon( current_exec_context );
+   }
+
+   return retval;
+}
+#endif
diff -urNp xinetd-2.3.14.orig/xinetd/main.c xinetd-2.3.14/xinetd/main.c
--- xinetd-2.3.14.orig/xinetd/main.c	2006-06-16 13:20:01.000000000 -0400
+++ xinetd-2.3.14/xinetd/main.c	2006-08-23 17:26:04.000000000 -0400
@@ -80,7 +80,10 @@ int main( int argc, char *argv[] )
 #ifdef HAVE_DNSREGISTRATION
    "rendezvous "
 #endif
-#if !defined(LIBWRAP) && !defined(HAVE_LOADAVG) && !defined(HAVE_MDNS) && !defined(HAVE_HOWL) && !defined(HAVE_DNSREGISTRATION)
+#ifdef LABELED_NET
+   "labeled-networking "
+#endif
+#if !defined(LIBWRAP) && !defined(HAVE_LOADAVG) && !defined(HAVE_MDNS) && !defined(HAVE_HOWL) && !defined(HAVE_DNSREGISTRATION) && !defined(LABELED_NET)
    "no "
 #endif
    "options compiled in."
diff -urNp xinetd-2.3.14.orig/xinetd/nvlists.c xinetd-2.3.14/xinetd/nvlists.c
--- xinetd-2.3.14.orig/xinetd/nvlists.c	2006-06-16 13:20:01.000000000 -0400
+++ xinetd-2.3.14/xinetd/nvlists.c	2006-08-23 17:26:04.000000000 -0400
@@ -47,6 +47,7 @@ const struct name_value service_flags[] 
       { "SENSOR",                     SF_SENSOR              },
       { "IPv4",                       SF_IPV4                },
       { "IPv6",                       SF_IPV6                },
+      { "LABELED",                    SF_LABELED             },
       { CHAR_NULL,                    0                      }
    } ;
 
diff -urNp xinetd-2.3.14.orig/xinetd/sconf.h xinetd-2.3.14/xinetd/sconf.h
--- xinetd-2.3.14.orig/xinetd/sconf.h	2006-06-16 13:20:01.000000000 -0400
+++ xinetd-2.3.14/xinetd/sconf.h	2006-08-23 17:26:04.000000000 -0400
@@ -58,6 +58,7 @@
 #define SF_SENSOR       9
 #define SF_IPV4         10
 #define SF_IPV6         11
+#define SF_LABELED      12
 
 /*
  * Values for log options
@@ -239,6 +240,7 @@ struct service_config
 #define SC_SENSOR( scp )          M_IS_SET( (scp)->sc_xflags, SF_SENSOR )
 #define SC_IPV4( scp )            M_IS_SET( (scp)->sc_xflags, SF_IPV4 )
 #define SC_IPV6( scp )            M_IS_SET( (scp)->sc_xflags, SF_IPV6 )
+#define SC_LABELED_NET( scp )     M_IS_SET( (scp)->sc_xflags, SF_LABELED )
 
 #define SC_IS_RPC( scp )         ( M_IS_SET( (scp)->sc_type, ST_RPC ) )
 #define SC_IS_INTERNAL( scp )    ( M_IS_SET( (scp)->sc_type, ST_INTERNAL ) )
diff -urNp xinetd-2.3.14.orig/xinetd/xinetd.conf.man xinetd-2.3.14/xinetd/xinetd.conf.man
--- xinetd-2.3.14.orig/xinetd/xinetd.conf.man	2006-06-16 13:20:01.000000000 -0400
+++ xinetd-2.3.14/xinetd/xinetd.conf.man	2006-08-23 17:26:04.000000000 -0400
@@ -145,6 +145,9 @@ Sets the service to be an IPv4 service (
 .B IPv6
 Sets the service to be an IPv6 service (AF_INET6), if IPv6 is available on the system.
 .TP
+.B LABELED
+The LABELED flag will tell xinetd to change the child processes SE Linux context to match that of the incoming connection as it starts the service.
+.TP
 .B REUSE
 The REUSE flag is deprecated.  All services now implicitly use the REUSE flag.
 .RE


Index: xinetd.spec
===================================================================
RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xinetd.spec	12 Jul 2006 08:54:06 -0000	1.32
+++ xinetd.spec	23 Aug 2006 22:17:33 -0000	1.33
@@ -4,7 +4,7 @@
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.14
-Release: 3.1
+Release: 4
 License: Distributable (BSD-like)
 Group: System Environment/Daemons
 Epoch: 2
@@ -16,6 +16,7 @@
 Source99: filter-requires-xinetd.sh
 Patch0: xinetd-2.3.11-pie.patch
 Patch1: xinetd-2.3.12-tcp_rpc.patch
+Patch2: xinetd-2.3.14-label.patch
 Prereq: /sbin/chkconfig /etc/init.d /sbin/service
 %{!?tcp_wrappers:BuildRequires: tcp_wrappers}
 Requires: filesystem >= 2.0.1, initscripts, setup, fileutils
@@ -37,9 +38,13 @@
 %setup -q  
 %patch0 -p0 -b .pie
 %patch1 -p1 -b .tcp_rpc
+%patch2 -p1 -b .lspp
+
+aclocal
+autoconf
 
 %build
-%configure --with-loadavg --with-inet6 %{!?tcp_wrappers:--with-libwrap}
+%configure --with-loadavg --with-inet6 %{!?tcp_wrappers:--with-libwrap} --with-labeled-networking
 make
 
 %install
@@ -95,6 +100,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Aug 23 2006 Steve Grubb <sgrubb at redhat.com> 2:2.3.14-4
+- Added labeled networking patch
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.3.14-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 22:23:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 18:23:17 -0400
Subject: rpms/xinetd/devel xinetd.spec,1.33,1.34
Message-ID: <200608232223.k7NMNHAP016158@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/xinetd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16010

Modified Files:
	xinetd.spec 
Log Message:
Add BuildRequires for autoconf



Index: xinetd.spec
===================================================================
RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xinetd.spec	23 Aug 2006 22:17:33 -0000	1.33
+++ xinetd.spec	23 Aug 2006 22:23:15 -0000	1.34
@@ -17,6 +17,7 @@
 Patch0: xinetd-2.3.11-pie.patch
 Patch1: xinetd-2.3.12-tcp_rpc.patch
 Patch2: xinetd-2.3.14-label.patch
+BuildRequires: autoconf >= 2.59
 Prereq: /sbin/chkconfig /etc/init.d /sbin/service
 %{!?tcp_wrappers:BuildRequires: tcp_wrappers}
 Requires: filesystem >= 2.0.1, initscripts, setup, fileutils



From fedora-cvs-commits at redhat.com  Wed Aug 23 22:26:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 18:26:19 -0400
Subject: rpms/mesa/devel .cvsignore, 1.9, 1.10 mesa.spec, 1.91, 1.92 sources,
	1.8, 1.9
Message-ID: <200608232226.k7NMQJCF017173@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17148

Modified Files:
	.cvsignore mesa.spec sources 
Log Message:
* Wed Aug 23 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc1.fc6
- Bump to 6.5.1 RC1.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Aug 2006 19:52:19 -0000	1.9
+++ .cvsignore	23 Aug 2006 22:26:16 -0000	1.10
@@ -1,2 +1,2 @@
-MesaDemos-6.5.1.tar.bz2
-MesaLib-6.5.1.tar.bz2
+MesaDemos-6.5.1-rc1.tar.bz2
+MesaLib-6.5.1-rc1.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- mesa.spec	23 Aug 2006 01:13:00 -0000	1.91
+++ mesa.spec	23 Aug 2006 22:26:16 -0000	1.92
@@ -31,21 +31,17 @@
 
 #-- END DRI Build Configuration ------------------------------------------
 
-%define snapshot 20060818
-
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 6.5
-Release: 26.%{snapshot}cvs%{?dist}
+Version: 6.5.1
+Release: 0.rc1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
-#Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
-Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.5.1.tar.bz2
-Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-6.5.1.tar.bz2
+Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.5.1-rc1.tar.bz2
+Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-6.5.1-rc1.tar.bz2
 Source10: redhat-mesa-target
 Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
@@ -295,8 +291,7 @@
 
 #-- prep -------------------------------------------------------------
 %prep
-# %setup -q -n Mesa-%{version} -b1
-%setup -q -n mesa-cvs -b1
+%setup -q -n Mesa-%{version} -b1
 # Copy Red Hat Mesa build/install simplificomplication scripts into build dir.
 install -m 755 %{SOURCE10} ./
 install -m 755 %{SOURCE11} ./
@@ -505,6 +500,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Wed Aug 23 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc1.fc6
+- Bump to 6.5.1 RC1.
+
 * Tue Aug 22 2006 Kristian H??gsberg <krh at redhat.com> 6.5-26.20060818cvs.fc6
 - Pull the vtxfmt patch into the selinux-awareness patch, handle exec
   mem heap init failure correctly by releasing mutex.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Aug 2006 19:52:19 -0000	1.8
+++ sources	23 Aug 2006 22:26:16 -0000	1.9
@@ -1,2 +1,2 @@
-a22b2444ee379b4a00e9c5167da3299c  MesaDemos-6.5.1.tar.bz2
-c63c9536d92f1bf5ec07db5ceea5b556  MesaLib-6.5.1.tar.bz2
+0fe3339a9a15be865a343fa7c6dc4f6f  MesaDemos-6.5.1-rc1.tar.bz2
+aa96e9d7e59e63b25b623b7307bc1262  MesaLib-6.5.1-rc1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 23 23:04:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 19:04:41 -0400
Subject: rpms/struts/devel struts-1.2.9-FacesTilesRequestProcessor.patch,
	NONE, 1.1 struts-1.2.9-HttpServletRequestWrapper.patch, NONE,
	1.1 struts-1.2.9-strutsel-build_xml.patch, NONE,
	1.1 struts-1.2.9-strutsfaces-example1-build_xml.patch, NONE,
	1.1 struts-1.2.9-strutsfaces-example2-build_xml.patch, NONE,
	1.1 struts-1.2.9-strutsfaces-systest1-build_xml.patch, NONE,
	1.1 struts-1.2.9.bz157205.patch, NONE, 1.1 struts.spec, 1.40,
	1.41 struts-1.2.8.build.patch, 1.5,
	NONE struts-1.2.8.servlet24.patch, 1.1, NONE
Message-ID: <200608232304.k7NN4fut009681@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9416

Modified Files:
	struts.spec 
Added Files:
	struts-1.2.9-FacesTilesRequestProcessor.patch 
	struts-1.2.9-HttpServletRequestWrapper.patch 
	struts-1.2.9-strutsel-build_xml.patch 
	struts-1.2.9-strutsfaces-example1-build_xml.patch 
	struts-1.2.9-strutsfaces-example2-build_xml.patch 
	struts-1.2.9-strutsfaces-systest1-build_xml.patch 
	struts-1.2.9.bz157205.patch 
Removed Files:
	struts-1.2.8.build.patch struts-1.2.8.servlet24.patch 
Log Message:

Upgrade to 1.2.9, merge with jpp. Also, see bz# 202692.



struts-1.2.9-FacesTilesRequestProcessor.patch:
 FacesTilesRequestProcessor.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE struts-1.2.9-FacesTilesRequestProcessor.patch ---
--- contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java.sav	2006-03-09 16:32:44.000000000 +0100
+++ contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java	2006-03-29 19:30:15.000000000 +0200
@@ -37,6 +37,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.InvalidCancelException;
 import org.apache.struts.config.FormBeanConfig;
 import org.apache.struts.config.ForwardConfig;
 import org.apache.struts.faces.Constants;
@@ -425,8 +426,12 @@
         if (log.isTraceEnabled()) {
             log.trace("Performing standard validation");
         }
-        boolean result = super.processValidate
-            (request, response, form, mapping);
+        boolean result = false;
+        try {
+        result = super.processValidate(request, response, form, mapping);
+        } catch(InvalidCancelException ice) {
+            throw new ServletException(ice);
+        }
         if (log.isDebugEnabled()) {
             log.debug("Standard validation processing returned " + result);
         }

struts-1.2.9-HttpServletRequestWrapper.patch:
 HttpServletRequestWrapper.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)

--- NEW FILE struts-1.2.9-HttpServletRequestWrapper.patch ---
--- contrib/struts-faces/core-library/src/java/org/apache/struts/faces/util/HttpServletRequestWrapper.java.sav	2006-03-09 16:32:50.000000000 +0100
+++ contrib/struts-faces/core-library/src/java/org/apache/struts/faces/util/HttpServletRequestWrapper.java	2006-03-29 19:09:54.000000000 +0200
@@ -409,4 +409,21 @@
 	public String toString() {
 		return original.toString();
 	}
+
+        public int getRemotePort(){
+            return original.getRemotePort();
+        }
+
+        public String getLocalName(){
+            return original.getLocalName();
+        }
+
+        public String getLocalAddr(){
+            return original.getLocalAddr();
+        }
+
+        public int getLocalPort(){
+            return original.getLocalPort();
+        }
+
 }

struts-1.2.9-strutsel-build_xml.patch:
 build.xml |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE struts-1.2.9-strutsel-build_xml.patch ---
--- contrib/struts-el/build.xml.sav	2005-09-29 18:41:40.000000000 +0200
+++ contrib/struts-el/build.xml	2005-09-29 18:42:12.000000000 +0200
@@ -171,6 +171,7 @@
   <pathelement location="${commons-validator.jar}"/>
   <pathelement location="${jdbc20ext.jar}"/>
   <pathelement location="${servlet.jar}"/>
+  <pathelement location="${jsp.jar}"/>
   <pathelement location="${struts.jar}"/>
   <pathelement location="${struts-el.jar}"/>
   <pathelement location="${jstl.jar}"/>

struts-1.2.9-strutsfaces-example1-build_xml.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE struts-1.2.9-strutsfaces-example1-build_xml.patch ---
--- contrib/struts-faces/example1-webapp/build.xml.sav	2005-09-30 10:04:38.000000000 +0200
+++ contrib/struts-faces/example1-webapp/build.xml	2005-09-30 10:05:05.000000000 +0200
@@ -170,7 +170,7 @@
 
     <!-- Copy required configuration files -->
     <copy    todir="${build.home}/${context.path}/WEB-INF">
-      <fileset dir="${struts.home}/lib"
+      <fileset dir="${struts.home}/target/library"
           includes="valid*.xml,*.tld"/>
     </copy>
 

struts-1.2.9-strutsfaces-example2-build_xml.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE struts-1.2.9-strutsfaces-example2-build_xml.patch ---
--- contrib/struts-faces/example2-webapp/build.xml.sav	2005-09-30 10:20:47.000000000 +0200
+++ contrib/struts-faces/example2-webapp/build.xml	2005-09-30 10:21:52.000000000 +0200
@@ -170,7 +170,7 @@
 
     <!-- Copy required configuration files -->
     <copy    todir="${build.home}/${context.path}/WEB-INF">
-      <fileset dir="${struts.home}/lib"
+      <fileset dir="${struts.home}/target/library"
           includes="valid*.xml,*.tld"/>
     </copy>
 

struts-1.2.9-strutsfaces-systest1-build_xml.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE struts-1.2.9-strutsfaces-systest1-build_xml.patch ---
--- contrib/struts-faces/systest1-webapp/build.xml.sav	2005-09-30 11:30:20.000000000 +0200
+++ contrib/struts-faces/systest1-webapp/build.xml	2005-09-30 11:30:41.000000000 +0200
@@ -170,7 +170,7 @@
 
     <!-- Copy required configuration files -->
     <copy    todir="${build.home}/${context.path}/WEB-INF">
-      <fileset dir="${struts.home}/lib"
+      <fileset dir="${struts.home}/target/library"
           includes="valid*.xml"/>
     </copy>
 

struts-1.2.9.bz157205.patch:
 MessageResourcesFactory.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE struts-1.2.9.bz157205.patch ---
--- ./src/share/org/apache/struts/util/MessageResourcesFactory.java.sav	2006-08-22 13:31:12.000000000 -0400
+++ ./src/share/org/apache/struts/util/MessageResourcesFactory.java	2006-08-22 13:32:35.000000000 -0400
@@ -167,8 +167,18 @@
 
         // Construct a new instance of the specified factory class
         try {
-            if (clazz == null)
-                clazz = RequestUtils.applicationClass(factoryClass);
+            if (clazz == null) {
+                if (System.getProperty("java.vm.name").equals("GNU libgcj")) {
+                    // XXX should use context class loader but it's wrong
+                    ClassLoader classLoader =
+                        MessageResourcesFactory.class.getClassLoader();
+                    clazz = classLoader.loadClass(factoryClass);
+                }
+                else { 
+                   clazz = RequestUtils.applicationClass(factoryClass);
+                }
+            }
+
             MessageResourcesFactory factory =
                 (MessageResourcesFactory) clazz.newInstance();
             return (factory);


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- struts.spec	10 Aug 2006 23:06:33 -0000	1.40
+++ struts.spec	23 Aug 2006 23:04:36 -0000	1.41
@@ -1,13 +1,57 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+%define _with_coreonly 1
+
+# If you want only core modules to be built, 
+# give rpmbuild option '--with coreonly'
+
+%define with_coreonly %{?_with_coreonly:1}%{!?_with_coreonly:0}
+%define without_coreonly %{!?_with_coreonly:1}%{?_with_coreonly:0}
+
 %define full_name	jakarta-%{name}
+%define tomcat3appsdir	%{_localstatedir}/tomcat3/webapps
+%define tomcat4appsdir	%{_localstatedir}/lib/tomcat4/webapps
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
-%define section		free
 %define webapps		blank documentation example examples tiles-documentation
 %define webapplibs commons-beanutils commons-digester commons-fileupload commons-validator oro struts
+%define section		free
 
 Name:		struts
-Version:	1.2.8
-Release: 	2jpp.17
+Version:	1.2.9
+Release:	3jpp.1
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -15,43 +59,68 @@
 Source0:	%{name}-%{version}-src.tar.gz
 Source2:	tomcat4-context-allowlinking.xml
 Source3:	tomcat5-context-allowlinking.xml
-Patch0:		%{name}-%{version}.build.patch
-Patch1:         %{name}-%{version}.bz157205.patch
-Url:		http://jakarta.apache.org/%{name}
+#Patch0:		%{name}-%{version}.build.patch
+Patch0:		struts-1.2.9-strutsel-build_xml.patch
+Patch1:		struts-1.2.9-FacesRequestProcessor.patch
+Patch2:		struts-1.2.9-HttpServletRequestWrapper.patch
+Patch3:		struts-1.2.9-FacesTilesRequestProcessor.patch
+Patch4:		struts-1.2.9-strutsfaces-example1-build_xml.patch
+Patch5:		struts-1.2.9-strutsfaces-example2-build_xml.patch
+Patch6:		struts-1.2.9-strutsfaces-systest1-build_xml.patch
+Patch7:		struts-1.2.9.bz157205.patch
+Url:		http://struts.apache.org/
 Requires:	servletapi5
 Requires:	jdbc-stdext
-Requires:	jakarta-commons-beanutils >= 0:1.7.0
-Requires:	jakarta-commons-digester >= 0:1.6
-Requires:	jakarta-commons-fileupload >= 0:1.0
-Requires:	jakarta-commons-validator >= 0:1.1.4
-Requires:	oro >= 0:2.0.7
-Requires:       tomcat5-jsp-2.0-api
-BuildRequires:	jpackage-utils >= 1.5
-BuildRequires:	ant >= 1.6.1
-BuildRequires:	antlr >= 2.7.2
+Requires:	jakarta-commons-beanutils
+Requires:	jakarta-commons-digester
+Requires:	jakarta-commons-fileupload
+Requires:	jakarta-commons-validator
+Requires:	oro
+BuildRequires:	jpackage-utils >= 1.6
+BuildRequires:	ant >= 1.6
+BuildRequires:	antlr
 BuildRequires:	ant-trax
 BuildRequires:	ant-nodeps
 BuildRequires:	jaxp_transform_impl
 BuildRequires:	sed
 BuildRequires:	servletapi5
 BuildRequires:	jdbc-stdext
-BuildRequires:  jakarta-commons-beanutils >= 0:1.7.0
-BuildRequires:  jakarta-commons-digester >= 0:1.6
-BuildRequires:  jakarta-commons-fileupload >= 0:1.0
-BuildRequires:  jakarta-commons-logging >= 0:1.0.4
-BuildRequires:  jakarta-commons-validator >= 0:1.1.4
-BuildRequires:  oro >= 0:2.0.7
-BuildRequires:  tomcat5-jsp-2.0-api
-BuildRequires:	xhtml1-dtds
+BuildRequires:  jakarta-commons-beanutils
+BuildRequires:  jakarta-commons-digester
+BuildRequires:  jakarta-commons-fileupload
+BuildRequires:  jakarta-commons-logging
+BuildRequires:  jakarta-commons-validator
+BuildRequires:  oro
+BuildRequires:	tomcat5
+
+%if %{without_coreonly}
+BuildRequires:	aspectj
+BuildRequires:	httpunit
+BuildRequires:	junit
+BuildRequires:	jakarta-cactus >= 0:1.7.1-2jpp
+BuildRequires:	jakarta-commons-chain
+BuildRequires:	jakarta-commons-collections
+BuildRequires:	jakarta-commons-httpclient
+BuildRequires:	jakarta-commons-lang
+BuildRequires:	jakarta-commons-pool
+BuildRequires:	jakarta-taglibs-standard
+BuildRequires:	jtidy
+BuildRequires:	log4j
+BuildRequires:	myfaces
+BuildRequires:	xalan-j2
+%endif
 
 Group:		Development/Java
+%if ! %{gcj_support}
+Buildarch:	noarch
+%endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
-# RHEL4 and FC4
-Obsoletes:	struts11 <= 0:1.1-1jpp_7fc
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.35
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 Welcome to the Struts Framework! The goal of this project is to provide
@@ -75,74 +144,410 @@
 
 %package manual
 Summary:        Manual for %{name}
-Group:          Development/Java
+Group:          Development/Documentation
 
 %description manual
 Documentation for %{name}.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Java
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
+Group:          Development/Documentation
 
 %description javadoc
 Javadoc for %{name}.
 
+%if ! %{gcj_support}
+%package webapps-tomcat3
+Summary:        Sample %{name} webapps for tomcat3
+Group:          Development/Java
+Requires:       %{name} = %{version}-%{release}
+Requires:         tomcat3
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description webapps-tomcat3
+Sample %{name} webapps for tomcat3.
+
+%package webapps-tomcat4
+Summary:        Sample %{name} webapps for tomcat4
+Group:          Development/Java
+Requires:       %{name} = %{version}-%{release}
+Requires:         tomcat4
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description webapps-tomcat4
+Sample %{name} webapps for tomcat4.
+%endif
+
 %package webapps-tomcat5
 Summary:        Sample %{name} webapps for tomcat5
 Group:          Development/Java
 Requires:       %{name} = %{version}-%{release}
 Prereq:         tomcat5
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description webapps-tomcat5
 Sample %{name} webapps for tomcat5.
 
+%if %{without_coreonly}
+%package chain
+Summary:        The %{name} Chain Of Responsibility Adapter
+Group:          Development/Java
+Requires:       %{name} = %{version}-%{release}
+Prereq:         jakarta-commons-chain
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description chain
+%{summary}.
+
+%package chain-javadoc
+Summary:        Javadoc for %{name}-chain
+Group:          Development/Documentation
+
+%description chain-javadoc
+%{summary}.
+
+%package chain-webapps-tomcat5
+Summary:        Sample %{name} chain adapter webapps for tomcat5
+Group:          Development/Java
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-chain = %{version}-%{release}
+Prereq:         tomcat5
+Prereq:         jakarta-commons-chain
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description chain-webapps-tomcat5
+%{summary}.
+%endif
+
+%if %{without_coreonly}
+%package el
+Summary:        The %{name} EL extension
+Group:          Development/Java
+Requires:       %{name} = %{version}-%{release}
+Prereq:         jakarta-taglibs-standard
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description el
+This subproject is an extension of the Struts tag library.
+Each JSP custom tag in this library is a subclass of an 
+associated tag in the Struts tag library. One difference is 
+that this tag library does not use "rtexprvalues", it uses
+the expression evaluation engine in the Jakarta Taglibs 
+implementation of the JSP Standard Tag Library (version 1.0) 
+to evaluate attribute values.
+
+%package el-javadoc
+Summary:        Javadoc for %{name}-el
+Group:          Development/Documentation
+
+%description el-javadoc
+%{summary}.
+
+%package el-webapps-tomcat5
+Summary:        Sample %{name} EL extension webapps for tomcat5
+Group:          Development/Java
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-el = %{version}-%{release}
+Prereq:         tomcat5
+Prereq:         jakarta-taglibs-standard
+
+%description el-webapps-tomcat5
+%{summary}.
+%endif
+
+%if %{without_coreonly}
+%package faces
+Summary:        The %{name}-faces integration library
+Group:          Development/Java
+Requires:       %{name} = %{version}-%{release}
+Prereq:         myfaces
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description faces
+This package contains an add-on library that supports the 
+use of JavaServer Faces (JSF) user interface technology in a 
+Struts based web application, in place of the Struts custom 
+tag libraries.  As a proof of concept, it also includes the 
+canonical "struts-example" example web application, converted 
+to use JSF tags, as well as tags from the JSP Standard Tag 
+Library (JSTL), version 1.0 or later.  It also includes
+a very basic Tiles based application, modified in a similar 
+manner.
+
+%package faces-javadoc
+Summary:        Javadoc for %{name}-faces
+Group:          Development/Documentation
+
+%description faces-javadoc
+%{summary}.
+
+%package faces-webapps-tomcat5
+Summary:        Sample %{name}-faces integration webapps for tomcat5
+Group:          Development/Java
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-faces = %{version}-%{release}
+Prereq:         tomcat5
+Prereq:         myfaces
+
+%description faces-webapps-tomcat5
+%{summary}.
+%endif
+
 
 %prep
 rm -rf $RPM_BUILD_ROOT
 %setup -n %{name}-%{version}-src -q
-%patch0
-%patch1 -p1
+%patch0 -b .sav
+%patch1 -b .sav
+%patch2 -b .sav
+%patch3 -b .sav
+%patch4 -b .sav
+%patch5 -b .sav
+%patch6 -b .sav
+%patch7 -b .sav
 # remove all binary libs
-find . -name "*.class" -exec rm -f {} \;
 find . -name "*.jar" -exec rm -f {} \;
-find . -name "*.war" -exec rm -f {} \;
-
-mkdir lib; pushd lib
-  ln -s $(find-jar jspapi) .
-popd
 
 %build
 
 # build struts
-ant -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
+export CLASSPATH=
+export ANT_OPTS="-Xmx256m"
+STRUTS_BUILD_HOME=$(pwd)
+ant -Dlibdir=/usr/share/java \
+	-Dcommons-beanutils.jar=$(build-classpath commons-beanutils) \
+	-Dcommons-digester.jar=$(build-classpath commons-digester) \
+	-Dcommons-fileupload.jar=$(build-classpath commons-fileupload) \
+	-Dcommons-logging.jar=$(build-classpath commons-logging) \
+	-Dcommons-validator.jar=$(build-classpath commons-validator) \
+	-Djakarta-oro.jar=$(build-classpath oro) \
+        -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
+	-Djsp.jar=$(build-classpath jspapi) \
+	-Dservlet.jar=$(build-classpath servletapi5) \
+	-Dantlr.jar=$(build-classpath antlr) \
+	 dist
+#	 compile.library compile.webapps compile.javadoc
+
+%if %{without_coreonly}
+pushd contrib/struts-chain
+export CLASSPATH=$(build-classpath catalina-ant5)
+ant -Dlibdir=/usr/share/java \
+	-Dcommons-chain.jar=$(build-classpath commons-chain) \
+	-Djsp.jar=$(build-classpath jspapi) \
+	-Dservlet.jar=$(build-classpath servletapi5) \
+	-Dstruts.core.home=$STRUTS_BUILD_HOME \
+	 dist
+popd
+%endif
+
+%if %{without_coreonly}
+pushd contrib/struts-el
+ant -Dlibdir=/usr/share/java \
+	-Dstruts.jar=$STRUTS_BUILD_HOME/dist/lib/struts.jar \
+	-Djstl.jar=$(build-classpath taglibs-core) \
+	-Djstl-standard.jar=$(build-classpath taglibs-standard) \
+	-Dservlet.jar=$(build-classpath servletapi5) \
+        -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
 	-Dcommons-beanutils.jar=$(build-classpath commons-beanutils) \
+	-Dcommons-collections.jar=$(build-classpath commons-collections) \
+	-Dcommons-digester.jar=$(build-classpath commons-digester) \
+	-Dcommons-logging.jar=$(build-classpath commons-logging) \
+	-Dcommons-pool.jar=$(build-classpath commons-pool) \
+	-Dcommons-validator.jar=$(build-classpath commons-validator) \
+	-Djakarta-oro.jar=$(build-classpath oro) \
+	-Djsp.jar=$(build-classpath jspapi) \
+	-Dlog4j.jar=$(build-classpath log4j) \
+	-Daspectjrt.jar=$(build-classpath aspectjrt) \
+	-Dcactus.jar=$(build-classpath cactus-14/cactus) \
+	-Dcactus-ant.jar=$(build-classpath cactus-14/cactus-ant) \
+	-Djunit.jar=$(build-classpath junit) \
+	-Dhttpunit.jar=$(build-classpath httpunit) \
+	-Djtidy.jar=$(build-classpath jtidy) \
+	-Dcommons-httpclient.jar=$(build-classpath commons-httpclient) \
+	-Dxalanj.jar=$(build-classpath xalan-j2) \
+	compile.library compile.webapps compile.javadoc compile.website dist
+popd
+%endif
+
+%if %{without_coreonly}
+pushd contrib/struts-faces
+export CLASSPATH=$(build-classpath catalina-ant5):../../dist/lib/struts.jar
+ant -Dlibdir=/usr/share/java \
+	-Dcommons-beanutils.jar=$(build-classpath commons-beanutils) \
+	-Dcommons-collections.jar=$(build-classpath commons-collections) \
 	-Dcommons-digester.jar=$(build-classpath commons-digester) \
 	-Dcommons-fileupload.jar=$(build-classpath commons-fileupload) \
+	-Dcommons-lang.jar=$(build-classpath commons-lang) \
 	-Dcommons-logging.jar=$(build-classpath commons-logging) \
 	-Dcommons-validator.jar=$(build-classpath commons-validator) \
 	-Djakarta-oro.jar=$(build-classpath oro) \
-        -Djsp.jar=$(build-classpath jspapi) \
-        -Dservlet.jar=$(build-classpath servletapi5) \
-        -Dantlr.jar=$(build-classpath antlr) \
-	 compile.library compile.webapps compile.javadoc
+	-Djsf-api.jar=$(build-classpath myfaces/myfaces-jsf-api) \
+	-Djsf-impl.jar=$(build-classpath myfaces/myfaces-impl) \
+	-Djstl.jar=$(build-classpath taglibs-core) \
+	-Dstandard.jar=$(build-classpath taglibs-standard) \
+	-Djsp-api.jar=$(build-classpath jspapi) \
+	-Dservlet.jar=$(build-classpath servletapi5) \
+	-Dstruts.jar=$STRUTS_BUILD_HOME/dist/lib/struts.jar \
+	-Dstruts.home=$STRUTS_BUILD_HOME \
+	 dist
+popd
+%endif
 
 %install
+
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/library/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 dist/lib/%{name}.jar \
+	$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%if %{without_coreonly}
+install -m 644 contrib/%{name}-chain/dist/lib/%{name}-chain.jar \
+	$RPM_BUILD_ROOT%{_javadir}/%{name}-chain-%{version}.jar
+install -m 644 contrib/%{name}-el/dist/lib/%{name}-el.jar \
+	$RPM_BUILD_ROOT%{_javadir}/%{name}-el-%{version}.jar
+install -m 644 contrib/%{name}-faces/dist/lib/%{name}-faces.jar \
+	$RPM_BUILD_ROOT%{_javadir}/%{name}-faces-%{version}.jar
+%endif
+
+
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr target/documentation/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf target/documentation/api
+
+%if %{without_coreonly}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-chain-%{version}
+cp -pr contrib/struts-chain/dist/docs/api/* \
+	$RPM_BUILD_ROOT%{_javadocdir}/%{name}-chain-%{version}
+ln -s %{name}-chain-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-chain
+rm -rf contrib/struts-chain/dist/docs/api
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-el-%{version}
+cp -pr contrib/struts-el/target/documentation/api/* \
+	$RPM_BUILD_ROOT%{_javadocdir}/%{name}-el-%{version}
+ln -s %{name}-el-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-el
+rm -rf contrib/struts-el/target/documentation/api
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-faces-%{version}
+cp -pr contrib/struts-faces/dist/docs/api/* \
+	$RPM_BUILD_ROOT%{_javadocdir}/%{name}-faces-%{version}
+ln -s %{name}-faces-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-faces
+rm -rf contrib/struts-faces/dist/docs/api
+%endif
+
 # data
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 644 target/library/*.tld $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 644 target/library/*.dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -m 644 dist/lib/*.tld $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -m 644 dist/lib/*.dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -m 644 dist/lib/vali*.xml $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+%if %{without_coreonly}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-chain
+install -m 644 contrib/%{name}-chain/dist/webapps/%{name}-chain.war \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}-chain
+install -m 644 contrib/%{name}-chain/src/conf/chain-config.xml \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}-chain
+
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-el
+install -m 644 contrib/%{name}-el/dist/webapps/%{name}el-exercise-taglib.war \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}-el
+install -m 644 contrib/%{name}-el/dist/lib/*.tld \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}-el
+
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-faces
+install -m 644 contrib/%{name}-faces/dist/webapps/%{name}-faces-example1.war \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}-faces
+install -m 644 contrib/%{name}-faces/dist/webapps/%{name}-faces-example2.war \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}-faces
+install -m 644 contrib/%{name}-faces/dist/lib/%{name}-faces.tld \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}-faces
+%endif
+
+# core docs
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/docs
+cp -p {INSTALL,LICENSE.txt,NOTICE.txt,README,STATUS.txt} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -p target/documentation/*.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/docs
+cp -p target/documentation/*.gif $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/docs
+cp -pr target/documentation/uml $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/docs
+cp -pr target/documentation/userGuide $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/docs
+cp -pr target/documentation/images $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/docs
+
+%if %{without_coreonly}
+# chain docs
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-chain-%{version}/docs
+#cp -pr contrib/struts-chain/dist/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-chain-%{version}/docs
+cp -p contrib/struts-chain/{LICENSE.txt,NOTICE.txt,README.txt} $RPM_BUILD_ROOT%{_docdir}/%{name}-chain-%{version}
+
+# el docs
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-el-%{version}/docs
+cp -pr contrib/struts-el/target/documentation/* $RPM_BUILD_ROOT%{_docdir}/%{name}-el-%{version}/docs
+cp -pr contrib/struts-el/{LICENSE.txt,README.txt} $RPM_BUILD_ROOT%{_docdir}/%{name}-el-%{version}
+
+# faces docs
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-faces-%{version}/docs
+cp -pr contrib/struts-faces/dist/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-faces-%{version}/docs
+cp -pr contrib/struts-faces/{LICENSE.txt,NOTICE.txt,README.txt} $RPM_BUILD_ROOT%{_docdir}/%{name}-faces-%{version}
+%endif
+
+%if ! %{gcj_support}
+# tomcat 3 webapps
+install -d -m 755 $RPM_BUILD_ROOT%{tomcat3appsdir}
+for webapp in %{webapps}; do
+    cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp
+    # tomcat3 doesn't support allowLinking, this might not work
+	# XXX: move to %%post/preun
+	rm -f $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp/WEB-INF/lib/*
+    (cd $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp/WEB-INF \
+    && for tld in ../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
+done
+
+# tomcat 4 webapps
+install -d -m 755 $RPM_BUILD_ROOT%{tomcat4appsdir}
+for webapp in %{webapps}; do
+    cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp
+    cat %{SOURCE2} | sed -e "s/@@@APPNAME@@@/$webapp/g;" > $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp.xml
+	# XXX: move to %%post/preun
+	rm -f $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp/WEB-INF/lib/*
+    (cd $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp/WEB-INF \
+    && for tld in ../../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
+done
+%endif
 
 # tomcat 5 webapps
 install -d -m 755 $RPM_BUILD_ROOT%{tomcat5appsdir}
@@ -151,15 +556,136 @@
     cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat5appsdir}/%{name}-$webapp
     cat %{SOURCE3} | sed -e "s/@@@APPNAME@@@/$webapp/g;" > $RPM_BUILD_ROOT%{tomcat5ctxdir}/%{name}-$webapp.xml
 	# XXX: move to %%post/preun
-	for jar in %{webapplibs}; do
-        (cd $RPM_BUILD_ROOT%{tomcat5appsdir}/%{name}-$webapp/WEB-INF/lib \
-        && ln -sf ../../../../../../..%{_javadir}/$jar.jar .)
-    done
+	rm -f $RPM_BUILD_ROOT%{tomcat5appsdir}/%{name}-$webapp/WEB-INF/lib/*
     (cd $RPM_BUILD_ROOT%{tomcat5appsdir}/%{name}-$webapp/WEB-INF \
     && for tld in ../../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
 done
 
-aot-compile-rpm
+%if %{without_coreonly}
+pushd $RPM_BUILD_ROOT%{tomcat5appsdir}
+mkdir %{name}-chain
+pushd %{name}-chain
+%{jar} xf $RPM_BUILD_ROOT%{_datadir}/%{name}-chain/%{name}-chain.war
+pushd WEB-INF
+#for tld in ../../../../../..%{_datadir}/%{name}-chain/*.tld; do ln -sf $tld `basename $tld`; done
+rm -f lib/*
+popd
+popd
+cat %{SOURCE3} | sed -e "s/@@@APPNAME@@@/chain/g;" > $RPM_BUILD_ROOT%{tomcat5ctxdir}/%{name}-chain.xml
+mkdir %{name}-el-exercise-taglib
+pushd %{name}-el-exercise-taglib
+%{jar} xf $RPM_BUILD_ROOT%{_datadir}/%{name}-el/%{name}el-exercise-taglib.war
+pushd WEB-INF
+rm -f lib/*
+for tld in ../../../../../..%{_datadir}/%{name}-el/*.tld; do ln -sf $tld `basename $tld`; done
+popd
+popd
+cat %{SOURCE3} | sed -e "s/@@@APPNAME@@@/el-exercise-taglib/g;" > $RPM_BUILD_ROOT%{tomcat5ctxdir}/%{name}-el-exercise-taglib.xml
+
+mkdir %{name}-faces-example1
+pushd %{name}-faces-example1
+%{jar} xf $RPM_BUILD_ROOT%{_datadir}/%{name}-faces/%{name}-faces-example1.war
+pushd WEB-INF
+rm -f lib/*
+for tld in ../../../../../..%{_datadir}/%{name}-faces/*.tld; do ln -sf $tld `basename $tld`; done
+popd
+popd
+cat %{SOURCE3} | sed -e "s/@@@APPNAME@@@/faces-example1/g;" > $RPM_BUILD_ROOT%{tomcat5ctxdir}/%{name}-faces-example1.xml
+
+mkdir %{name}-faces-example2
+pushd %{name}-faces-example2
+%{jar} xf $RPM_BUILD_ROOT%{_datadir}/%{name}-faces/%{name}-faces-example2.war
+pushd WEB-INF
+rm -f lib/*
+for tld in ../../../../../..%{_datadir}/%{name}-faces/*.tld; do ln -sf $tld `basename $tld`; done
+popd
+popd
+cat %{SOURCE3} | sed -e "s/@@@APPNAME@@@/faces-example2/g;" > $RPM_BUILD_ROOT%{tomcat5ctxdir}/%{name}-faces-example2.xml
+popd
+#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-chain/%{name}-chain.war
+#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-el/%{name}-el-exercise-taglib.war
+#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-faces/%{name}-faces-example1.war
+#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-faces/%{name}-faces-example2.war
+%endif
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post webapps-tomcat5
+for webapp in %{webapps}; do
+build-jar-repository -s -p %{tomcat5appsdir}/%{name}-$webapp/WEB-INF/lib commons-beanutils commons-digester commons-fileupload commons-validator oro
+ln -s %{_javadir}/struts.jar %{tomcat5appsdir}/%{name}-$webapp/WEB-INF/lib
+done
+
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%preun webapps-tomcat5
+for webapp in %{webapps}; do
+rm -f %{tomcat5appsdir}/%{name}-$webapp/WEB-INF/lib/*
+done
+
+%if %{gcj_support}
+%postun webapps-tomcat5
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+
+%if %{without_coreonly}
+%post webapps-tomcat3
+for webapp in %{webapps}; do
+build-jar-repository -s -p %{tomcat3appsdir}/%{name}-$webapp/WEB-INF/lib commons-beanutils commons-digester commons-fileupload commons-validator oro
+ln -s %{_javadir}/struts.jar %{tomcat3appsdir}/%{name}-$webapp/WEB-INF/lib
+done
+
+%preun webapps-tomcat3
+for webapp in %{webapps}; do
+rm -f %{tomcat3appsdir}/%{name}-$webapp/WEB-INF/lib/*
+done
+
+%post webapps-tomcat4
+for webapp in %{webapps}; do
+build-jar-repository -s -p %{tomcat4appsdir}/%{name}-$webapp/WEB-INF/lib commons-beanutils commons-digester commons-fileupload commons-validator oro
+ln -s %{_javadir}/struts.jar %{tomcat4appsdir}/%{name}-$webapp/WEB-INF/lib
+done
+
+%preun webapps-tomcat4
+for webapp in %{webapps}; do
+rm -f %{tomcat4appsdir}/%{name}-$webapp/WEB-INF/lib/*
+done
+
+%post chain-webapps-tomcat5
+build-jar-repository -s -p %{tomcat5appsdir}/%{name}-chain/WEB-INF/lib commons-chain struts-chain
+
+%preun chain-webapps-tomcat5
+rm -f  %{tomcat5appsdir}/%{name}-chain/WEB-INF/lib/*
+
+%post el-webapps-tomcat5
+build-jar-repository -s -p %{tomcat5appsdir}/%{name}-el-exercise-taglib/WEB-INF/lib taglibs-core taglibs-standard struts-el struts
+
+%preun el-webapps-tomcat5
+rm -f  %{tomcat5appsdir}/%{name}-el-exercise-taglib/WEB-INF/lib/*
+
+%post faces-webapps-tomcat5
+build-jar-repository -s -p %{tomcat5appsdir}/%{name}-faces-example1/WEB-INF/lib commons-beanutils commons-collections commons-digester commons-fileupload commons-logging commons-validator oro struts-faces struts myfaces/myfaces-all
+build-jar-repository -s -p %{tomcat5appsdir}/%{name}-faces-example2/WEB-INF/lib commons-beanutils commons-collections commons-digester commons-fileupload commons-logging commons-validator oro struts-faces struts myfaces/myfaces-all
+
+%preun faces-webapps-tomcat5
+rm -f %{tomcat5appsdir}/%{name}-faces-example1/WEB-INF/lib/*
+rm -f %{tomcat5appsdir}/%{name}-faces-example2/WEB-INF/lib/*
+
+%endif
 
 %post javadoc
 rm -f %{_javadocdir}/%{name}
@@ -167,43 +693,174 @@
 
 %postun javadoc
 if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
+  rm -f %{_javadocdir}/%{name}
+fi
+
+%if %{without_coreonly}
+%post chain-javadoc
+rm -f %{_javadocdir}/%{name}-chain
+ln -s %{name}-chain-%{version} %{_javadocdir}/%{name}-chain
+
+%postun chain-javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}-chain
+fi
+
+%post el-javadoc
+rm -f %{_javadocdir}/%{name}-el
+ln -s %{name}-el-%{version} %{_javadocdir}/%{name}-el
+
+%postun el-javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}-el
 fi
 
+%post faces-javadoc
+rm -f %{_javadocdir}/%{name}-faces
+ln -s %{name}-faces-%{version} %{_javadocdir}/%{name}-faces
+
+%postun faces-javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}-faces
+fi
+%endif
+
+
+%if %{without_coreonly}
+%if %{gcj_support}
+%post chain-webapps-tomcat5
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%postun chain-webapps-tomcat5
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+%endif
+
+%if %{gcj_support}
 %post
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
+%if %{gcj_support}
 %postun
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%post webapps-tomcat5
-%{_bindir}/rebuild-gcj-db
+%if %{without_coreonly}
+%if %{gcj_support}
+%post el
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%postun webapps-tomcat5
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+%postun el
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%if %{gcj_support}
+%post chain
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%postun chain
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%post faces
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%postun faces
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+%endif
 
 %files
 %defattr(-,root,root)
-%doc INSTALL LICENSE.txt README NOTICE.txt STATUS.txt
-%{_javadir}/*
+%doc %{_docdir}/%{name}-%{version}/INSTALL
+%doc %{_docdir}/%{name}-%{version}/README
+%doc %{_docdir}/%{name}-%{version}/*.txt
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
 %{_datadir}/%{name}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/struts-1.2.9.jar.*
+%endif
 
 %files manual
 %defattr(-,root,root)
-%doc target/documentation/*.html
-%doc target/documentation/*.gif
-%doc target/documentation/uml
-%doc target/documentation/userGuide
-%doc target/documentation/images
+%doc %{_docdir}/%{name}-%{version}/docs
 
 %files javadoc
 %defattr(-,root,root)
-%{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
+
+%if ! %{gcj_support}
+%files webapps-tomcat3
+%defattr(-,tomcat3,tomcat3)
+%dir %{tomcat3appsdir}/%{name}-blank
+%{tomcat3appsdir}/%{name}-blank/*
+%dir %{tomcat3appsdir}/%{name}-documentation
+%{tomcat3appsdir}/%{name}-documentation/*
+%dir %{tomcat3appsdir}/%{name}-example
+%{tomcat3appsdir}/%{name}-example/*
+%dir %{tomcat3appsdir}/%{name}-examples
+%{tomcat3appsdir}/%{name}-examples/*
+%dir %{tomcat3appsdir}/%{name}-tiles-documentation
+%{tomcat3appsdir}/%{name}-tiles-documentation/*
+
+%files webapps-tomcat4
+%defattr(-,tomcat4,tomcat4)
+%dir %{tomcat4appsdir}/%{name}-blank
+%{tomcat4appsdir}/%{name}-blank/*
+%dir %{tomcat4appsdir}/%{name}-documentation
+%{tomcat4appsdir}/%{name}-documentation/*
+%dir %{tomcat4appsdir}/%{name}-example
+%{tomcat4appsdir}/%{name}-example/*
+%dir %{tomcat4appsdir}/%{name}-examples
+%{tomcat4appsdir}/%{name}-examples/*
+%dir %{tomcat4appsdir}/%{name}-tiles-documentation
+%{tomcat4appsdir}/%{name}-tiles-documentation/*
+%{tomcat4appsdir}/%{name}-*.xml
+%endif
 
 %files webapps-tomcat5
 %defattr(-,tomcat,tomcat)
@@ -217,75 +874,136 @@
 %{tomcat5appsdir}/%{name}-examples/*
 %dir %{tomcat5appsdir}/%{name}-tiles-documentation
 %{tomcat5appsdir}/%{name}-tiles-documentation/*
-%{tomcat5ctxdir}/%{name}-*.xml
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
-
-%changelog
-* Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 1.2.8-2jpp.17
-- Added post/postun for javadoc.
-
-* Wed Jul 26 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_16fc
-- Remove xalan-j2-serializer from classpath.
-- Added missing BR for xhtml1-dtds.
-
-* Mon Jul 24 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_15fc
-- Fixed classpath issue.
-- Removed spurious macros.
-- Disable failonerror for xml validation for now.
-
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.8-2jpp_14fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.8-2jpp_13fc
-- rebuild
-
-* Wed Jun 21 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_12fc
-- Re-enable ppc64, s390 and s390x builds
+%{tomcat5ctxdir}/%{name}-blank.xml
+%{tomcat5ctxdir}/%{name}-documentation.xml
+%{tomcat5ctxdir}/%{name}-example.xml
+%{tomcat5ctxdir}/%{name}-examples.xml
+%{tomcat5ctxdir}/%{name}-tiles-documentation.xml
+
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-example_classes*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-examples_classes*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-tiles-documentation_classes*
+%endif
 
-* Wed Jun  7 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_11fc
-- Added missing BR/Req. for tomcat5-jsp-2.0-api.
+%if %{without_coreonly}
+%files chain
+%defattr(-,root,root)
+%doc %{_docdir}/%{name}-chain-%{version}
+%{_javadir}/%{name}-chain-%{version}.jar
+%{_javadir}/%{name}-chain.jar
+%{_datadir}/%{name}-chain
+
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/struts-chain-1.2.9.jar.*
+%endif
 
-* Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2.8-2jpp_10fc
-- excluded s390[x] and ppc64 due to eclipse
+%files chain-javadoc
+%defattr(-,root,root)
+%doc %{_javadocdir}/%{name}-chain-%{version}
+%ghost %{_javadocdir}/%{name}-chain
 
-* Fri Feb 24 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2.8-2jpp_9fc
-- Removed the webapps-tomcat{3,4} subpackages.
+%files chain-webapps-tomcat5
+%defattr(-,tomcat,tomcat)
+%dir %{tomcat5appsdir}/%{name}-chain
+%{tomcat5appsdir}/%{name}-chain/*
+%{tomcat5ctxdir}/%{name}-chain.xml
+
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/antlr.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-beanutils.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-digester.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-fileupload.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-validator.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-oro.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/struts.jar.*
+%endif
 
-* Tue Feb 21 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2.8-2jpp_8fc
-- Updated to 1.2.8
+%files el
+%defattr(-,root,root)
+%doc %{_docdir}/%{name}-el-%{version}
+%{_javadir}/%{name}-el-%{version}.jar
+%{_javadir}/%{name}-el.jar
+%{_datadir}/%{name}-el
+
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/struts-el-1.2.9.jar.*
+%endif
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.4-2jpp_7fc
-- bump again for double-long bug on ppc(64)
+%files el-javadoc
+%defattr(-,root,root)
+%doc %{_javadocdir}/%{name}-el-%{version}
+%ghost %{_javadocdir}/%{name}-el
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.4-2jpp_6fc
-- rebuilt for new gcc4.1 snapshot and glibc changes
+%files el-webapps-tomcat5
+%defattr(-,tomcat,tomcat)
+%dir %{tomcat5appsdir}/%{name}-el-exercise-taglib
+%{tomcat5appsdir}/%{name}-el-exercise-taglib/*
+%{tomcat5ctxdir}/%{name}-el-exercise-taglib.xml
 
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.2.4-2jpp_5fc
-- rebuilt again
+%files faces
+%defattr(-,root,root)
+%doc %{_docdir}/%{name}-faces-%{version}
+%{_javadir}/%{name}-faces-%{version}.jar
+%{_javadir}/%{name}-faces.jar
+%{_datadir}/%{name}-faces
+
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/struts-faces-1.2.9.jar.*
+%endif
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.2.4-2jpp_4fc
-- rebuilt
+%files faces-javadoc
+%defattr(-,root,root)
+%doc %{_javadocdir}/%{name}-faces-%{version}
+%ghost %{_javadocdir}/%{name}-faces
 
-* Fri Jul 22 2005 Gary Benson <gbenson at redhat.com> - 0:1.2.4-2jpp_3fc
-- Remove workarounds for #163689.
+%files faces-webapps-tomcat5
+%defattr(-,tomcat,tomcat)
+%dir %{tomcat5appsdir}/%{name}-faces-example1
+%{tomcat5appsdir}/%{name}-faces-example1/*
+%{tomcat5ctxdir}/%{name}-faces-example1.xml
+%dir %{tomcat5appsdir}/%{name}-faces-example2
+%{tomcat5appsdir}/%{name}-faces-example2/*
+%{tomcat5ctxdir}/%{name}-faces-example2.xml
+%endif
 
-* Wed Jul 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.2.4-2jpp_2fc
-- Build on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm (also BC-compiles webapps).
 
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> - 0:1.2.4-2jpp_1fc
-- Make workaround for #157205 specific to libgcj.
+%changelog
+* Tue Aug 22 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.2.9-3jpp.1
+- Merge with upstream for upgrade to 1.2.9
+- Use symlinks instead of actual files in WEB-INF/lib folders
+- Add conditional native compilation
+
+* Tue Aug 22 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.2.9-3jpp
+- Remove duplicate macros
+- Fix removal of old struts-el documentation link
+- Create coreonly option
+
+* Thu Apr 06 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2.9-2jpp
+- Switch to _javadir/cactus-14/*.jar
+- Thus require cactus >= 1.7.1-2jpp
+
+* Wed Mar 29 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2.9-1jpp
+- Upgrade to 1.2.9
+
+* Thu Oct 20 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.2.7-2jpp
+- Add struts-chain subpackages
+- Add struts-el subpackages
+- Add struts-faces subpackages
 
-* Tue Jun 14 2005 Gary Benson <gbenson at redhat.com>
-- Remove jars, wars and classes from the tarball.
+* Tue Jul 26 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.2.7-1jpp
+- Upgrade to 1.2.7
 
 * Fri May 27 2005 Gary Benson <gbenson at redhat.com> - 0:1.2.4-2jpp
 - Build with servletapi5.
 - Add build dependency on ant-nodeps.
 
-* Fri May 27 2005 Gary Benson <gbenson at redhat.com> - 0:1.2.4-1jpp_1fc
-- Build into Fedora.
-
 * Tue Feb  1 2005 Joe Orton <jorton at redhat.com>
 - Change webapps subpackages' tomcat dependencies to prereqs.
 


--- struts-1.2.8.build.patch DELETED ---


--- struts-1.2.8.servlet24.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 23 23:08:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 19:08:52 -0400
Subject: rpms/beagle/devel beagle-0.2.8-im-log.patch, NONE, 1.1 beagle.spec,
	1.71, 1.72
Message-ID: <200608232308.k7NN8qKL010581@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10504

Modified Files:
	beagle.spec 
Added Files:
	beagle-0.2.8-im-log.patch 
Log Message:
fix a crash


beagle-0.2.8-im-log.patch:
 Filters/FilterImLog.cs                       |   13 ++++++++-----
 Util/ImLog.cs                                |    2 +-
 beagled/GaimLogQueryable/GaimLogQueryable.cs |    8 ++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

--- NEW FILE beagle-0.2.8-im-log.patch ---
? beagle-broken-powerpoint-filter.patch
? beagle-evolution-broken-mbox.patch
? beagle-imlog-emote.patch
? beagle-imlog-thinko-and-sanity-checks.patch
? beagle-password-protected-ppt.patch
? beagle-stop-scheduler-on-battery.patch
? beagle-verbose-debugging-on-sigusr1.patch
? beagle-wildcard-support.patch
? Util/SemWeb/README.txt
? beagled/LuceneCommon.cs.fuckup
? beagled/LuceneCommon.cs.joe
? beagled/LuceneIndexingDriver.cs.fuckup
? beagled/LuceneQueryingDriver.cs.fuckup
? beagled/Makefile.am.fuckup
? beagled/MetadataStore.cs
? beagled/outfile.beagled
? beagled/profile-slow.out
? libbeagle/examples/beagle-info
? mozilla-extension/beagle-firefox-1.5-support.patch
? wrappers/python/tmp.diff
Index: Filters/FilterImLog.cs
===================================================================
RCS file: /cvs/gnome/beagle/Filters/FilterImLog.cs,v
retrieving revision 1.3
diff -u -p -u -r1.3 FilterImLog.cs
--- Filters/FilterImLog.cs	9 Jun 2006 03:38:13 -0000	1.3
+++ Filters/FilterImLog.cs	23 Aug 2006 19:36:43 -0000
@@ -46,12 +46,15 @@ namespace Beagle.Filters {
 
 		override protected void DoOpen (FileInfo file)
 		{
-			if (MimeType == GaimLog.MimeType)
-				log = new GaimLog (FileInfo, new StreamReader (Stream));
-			else if (MimeType == KopeteLog.MimeType)
-				log = new KopeteLog (FileInfo, new StreamReader (Stream));
-			else
+			try {
+				if (MimeType == GaimLog.MimeType)
+					log = new GaimLog (FileInfo, new StreamReader (Stream));
+				else if (MimeType == KopeteLog.MimeType)
+					log = new KopeteLog (FileInfo, new StreamReader (Stream));
+			} catch (Exception e) {
+				Log.Warn (e, "Unable to index IM log {0}", file.FullName);
 				Error ();
+			}
 		}
 
 		protected override void DoPullProperties ()
Index: Util/ImLog.cs
===================================================================
RCS file: /cvs/gnome/beagle/Util/ImLog.cs,v
retrieving revision 1.28
diff -u -p -u -r1.28 ImLog.cs
--- Util/ImLog.cs	15 Aug 2006 18:45:52 -0000	1.28
+++ Util/ImLog.cs	23 Aug 2006 19:36:43 -0000
@@ -234,7 +234,7 @@ namespace Beagle.Util {
 			if (line.StartsWith ("***")) {
 				i = line.IndexOf (' ');
 
-				alias = line.Substring (3, i);
+				alias = line.Substring (3, i - 3);
 				text = line.Substring (i + 1);
 			} else {
 				// FIXME: This will break if there is a ':' in the nickname
Index: beagled/GaimLogQueryable/GaimLogQueryable.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/GaimLogQueryable/GaimLogQueryable.cs,v
retrieving revision 1.59
diff -u -p -u -r1.59 GaimLogQueryable.cs
--- beagled/GaimLogQueryable/GaimLogQueryable.cs	10 Aug 2006 18:34:23 -0000	1.59
+++ beagled/GaimLogQueryable/GaimLogQueryable.cs	23 Aug 2006 19:36:43 -0000
@@ -310,6 +310,14 @@ namespace Beagle.Daemon.GaimLogQueryable
 
 		override protected bool HitFilter (Hit hit) 
 		{
+			// If the protocol isn't set (because maybe we got an
+			// exception while we were indexing), this isn't a
+			// valid hit.
+			if (hit ["fixme:protocol"] == null) {
+				Log.Warn ("Discarding IM log hit with missing protocol info: {0}", hit.Uri);
+				return false;
+			}
+
 			string speakingto = hit ["fixme:speakingto"];
 
 			// We have no idea who we're speaking to.  Bad, but we


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- beagle.spec	22 Aug 2006 09:55:46 -0000	1.71
+++ beagle.spec	23 Aug 2006 23:08:49 -0000	1.72
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.8
-Release:       	2%{?dist}
+Release:       	3%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -42,6 +42,8 @@
 Patch7: beagle-0.2.7-key.patch
 # From upstream cvs, fixes indexing performance
 Patch8: beagle-0.2.8-cvs.patch
+# Fixed in upstream cvs
+Patch9: beagle-0.2.8-im-log.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
@@ -100,6 +102,7 @@
 %patch6 -p1 -b .libdir
 %patch7 -p1 -b .key
 %patch8 -p0 -b .cvs
+%patch9 -p1 -b .im-log
 
 %build
 autoconf
@@ -293,6 +296,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Wed Aug 23 2006 Matthias Clasen <mclasen at redhat.com> - 0.2.8-3
+- Fix a crash, patch from upstream cvs (#203519)
+
 * Tue Aug 22 2006 Alexander Larsson <alexl at redhat.com> - 0.2.8-2
 - Backport cvs indexing performance fix
 



From fedora-cvs-commits at redhat.com  Wed Aug 23 23:11:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 19:11:37 -0400
Subject: rpms/struts/devel struts-1.2.9-FacesRequestProcessor.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 sources, 1.6, 1.7 struts.spec, 1.41, 1.42
Message-ID: <200608232311.k7NNBbEc011123@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11052

Modified Files:
	.cvsignore sources struts.spec 
Added Files:
	struts-1.2.9-FacesRequestProcessor.patch 
Log Message:

Adding new sources.



struts-1.2.9-FacesRequestProcessor.patch:
 FacesRequestProcessor.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE struts-1.2.9-FacesRequestProcessor.patch ---
--- contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java.sav	2006-03-09 16:32:40.000000000 +0100
+++ contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java	2006-03-29 19:07:10.000000000 +0200
@@ -37,6 +37,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.InvalidCancelException;
 import org.apache.struts.action.RequestProcessor;
 import org.apache.struts.config.FormBeanConfig;
 import org.apache.struts.config.ForwardConfig;
@@ -411,8 +412,12 @@
         if (log.isTraceEnabled()) {
             log.trace("Performing standard validation");
         }
-        boolean result = super.processValidate
-            (request, response, form, mapping);
+        boolean result = false;
+        try {
+        result = super.processValidate(request, response, form, mapping);
+        } catch(InvalidCancelException ice) {
+            throw new ServletException(ice);
+        }
         if (log.isDebugEnabled()) {
             log.debug("Standard validation processing returned " + result);
         }


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Feb 2006 04:46:42 -0000	1.7
+++ .cvsignore	23 Aug 2006 23:11:34 -0000	1.8
@@ -1 +1 @@
-struts-1.2.8-src.tar.gz
+struts-1.2.9-src-RHCLEAN.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Feb 2006 04:46:42 -0000	1.6
+++ sources	23 Aug 2006 23:11:34 -0000	1.7
@@ -1 +1 @@
-99b90aed5fd29bb06b2b97f70da4b889  struts-1.2.8-src.tar.gz
+58f008bee154525b67af7fa84c55570f  struts-1.2.9-src-RHCLEAN.tar.gz


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- struts.spec	23 Aug 2006 23:04:36 -0000	1.41
+++ struts.spec	23 Aug 2006 23:11:34 -0000	1.42
@@ -56,7 +56,7 @@
 Summary:	Web application framework
 License:	Apache License
 Group:          Development/Libraries/Java
-Source0:	%{name}-%{version}-src.tar.gz
+Source0:	%{name}-%{version}-src-RHCLEAN.tar.gz
 Source2:	tomcat4-context-allowlinking.xml
 Source3:	tomcat5-context-allowlinking.xml
 #Patch0:		%{name}-%{version}.build.patch



From fedora-cvs-commits at redhat.com  Wed Aug 23 23:12:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 19:12:56 -0400
Subject: rpms/struts/devel struts-1.2.8.bz157205.patch,1.1,NONE
Message-ID: <200608232312.k7NNCupg011423@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11370

Removed Files:
	struts-1.2.8.bz157205.patch 
Log Message:

Remove obsolete version of patch file.




--- struts-1.2.8.bz157205.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 23 23:25:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 19:25:54 -0400
Subject: rpms/beagle/devel beagle.spec,1.72,1.73
Message-ID: <200608232325.k7NNPsE7029629@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29562

Modified Files:
	beagle.spec 
Log Message:
fix spec



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- beagle.spec	23 Aug 2006 23:08:49 -0000	1.72
+++ beagle.spec	23 Aug 2006 23:25:52 -0000	1.73
@@ -102,7 +102,7 @@
 %patch6 -p1 -b .libdir
 %patch7 -p1 -b .key
 %patch8 -p0 -b .cvs
-%patch9 -p1 -b .im-log
+%patch9 -p0 -b .im-log
 
 %build
 autoconf



From fedora-cvs-commits at redhat.com  Thu Aug 24 00:08:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 20:08:50 -0400
Subject: rpms/xinetd/devel xinetd.spec,1.34,1.35
Message-ID: <200608240008.k7O08op5025496@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/xinetd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25484

Modified Files:
	xinetd.spec 
Log Message:
Another adjustment to BuildRequires



Index: xinetd.spec
===================================================================
RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xinetd.spec	23 Aug 2006 22:23:15 -0000	1.34
+++ xinetd.spec	24 Aug 2006 00:08:46 -0000	1.35
@@ -17,7 +17,7 @@
 Patch0: xinetd-2.3.11-pie.patch
 Patch1: xinetd-2.3.12-tcp_rpc.patch
 Patch2: xinetd-2.3.14-label.patch
-BuildRequires: autoconf >= 2.59
+BuildRequires: autoconf, automake
 Prereq: /sbin/chkconfig /etc/init.d /sbin/service
 %{!?tcp_wrappers:BuildRequires: tcp_wrappers}
 Requires: filesystem >= 2.0.1, initscripts, setup, fileutils



From fedora-cvs-commits at redhat.com  Thu Aug 24 00:14:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 20:14:31 -0400
Subject: rpms/xinetd/devel xinetd.spec,1.35,1.36
Message-ID: <200608240014.k7O0EVfE004283@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/xinetd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4169

Modified Files:
	xinetd.spec 
Log Message:
Add BuildRequires for libselinux-devel



Index: xinetd.spec
===================================================================
RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xinetd.spec	24 Aug 2006 00:08:46 -0000	1.35
+++ xinetd.spec	24 Aug 2006 00:14:28 -0000	1.36
@@ -18,6 +18,7 @@
 Patch1: xinetd-2.3.12-tcp_rpc.patch
 Patch2: xinetd-2.3.14-label.patch
 BuildRequires: autoconf, automake
+BuildRequires: libselinux-devel >= 1.30
 Prereq: /sbin/chkconfig /etc/init.d /sbin/service
 %{!?tcp_wrappers:BuildRequires: tcp_wrappers}
 Requires: filesystem >= 2.0.1, initscripts, setup, fileutils



From fedora-cvs-commits at redhat.com  Thu Aug 24 01:21:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 21:21:05 -0400
Subject: rpms/ypbind/devel ypbind-1.19-debuginfo.patch, NONE, 1.1 ypbind.spec,
	1.28, 1.29
Message-ID: <200608240121.k7O1L5F2002238@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2157

Modified Files:
	ypbind.spec 
Added Files:
	ypbind-1.19-debuginfo.patch 
Log Message:
Remove the -s from install process making the -debuginfo
package useful (bz 203851)


ypbind-1.19-debuginfo.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ypbind-1.19-debuginfo.patch ---
--- ypbind-mt-1.19/src/Makefile.am.orig	2004-02-13 16:17:12.000000000 -0500
+++ ypbind-mt-1.19/src/Makefile.am	2006-08-23 21:10:30.000000000 -0400
@@ -6,7 +6,7 @@
 
 AUTOMAKE_OPTIONS = 1.4 gnits
 
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 555
 
 AM_CFLAGS = -D_REENTRANT=1 @WARNFLAGS@ -DUSE_BROADCAST=@USE_BROADCAST@
 LDADD = ../lib/libcompat.a @LIBINTL@ @SLP_LIBS@


Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ypbind.spec	11 Aug 2006 19:05:56 -0000	1.28
+++ ypbind.spec	24 Aug 2006 01:21:00 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.19
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -9,6 +9,7 @@
 Source1: ypbind.init
 Patch1: ypbind-1.11-broadcast.patch
 Patch2: ypbind-1.11-gettextdomain.patch
+Patch3: ypbind-1.19-debuginfo.patch
 Prereq: /sbin/chkconfig
 Requires: portmap, yp-tools, bash >= 2.0
 Epoch: 3
@@ -35,8 +36,10 @@
 %setup -q -n ypbind-mt-%{version}
 %patch1 -p1 -b .broadcast
 %patch2 -p1 -b .fixit
+%patch3 -p1 -b .debuginfo
 
 %build
+autoreconf
 %configure --sbindir=/sbin
 make
 
@@ -80,6 +83,10 @@
 %doc README NEWS
 
 %changelog
+* Wed Aug 23 2006 Steve Dickson <steved at redhat.com> - 3:1.19-3
+- Remove the -s from install process making the -debuginfo
+  package useful (bz 203851)
+
 * Fri Aug 11 2006 Steve Dickson <steved at redhat.com> - 3:1.19-2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 01:36:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 21:36:09 -0400
Subject: rpms/ypbind/devel ypbind.spec,1.29,1.30
Message-ID: <200608240136.k7O1a9UO006650@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6586

Modified Files:
	ypbind.spec 
Log Message:
added BuildRequires:      autoconf



Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ypbind.spec	24 Aug 2006 01:21:00 -0000	1.29
+++ ypbind.spec	24 Aug 2006 01:36:06 -0000	1.30
@@ -15,6 +15,8 @@
 Epoch: 3
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
+BuildRequires:      autoconf
+
 %description
 The Network Information Service (NIS) is a system that provides
 network information (login names, passwords, home directories, group



From fedora-cvs-commits at redhat.com  Thu Aug 24 01:42:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 21:42:39 -0400
Subject: rpms/ypbind/devel ypbind.spec,1.30,1.31
Message-ID: <200608240142.k7O1gdBL007912@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7818

Modified Files:
	ypbind.spec 
Log Message:
added BuildRequire automake



Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ypbind.spec	24 Aug 2006 01:36:06 -0000	1.30
+++ ypbind.spec	24 Aug 2006 01:42:27 -0000	1.31
@@ -15,7 +15,7 @@
 Epoch: 3
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires:      autoconf
+BuildRequires: autoconf,automake
 
 %description
 The Network Information Service (NIS) is a system that provides



From fedora-cvs-commits at redhat.com  Thu Aug 24 02:03:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 22:03:42 -0400
Subject: rpms/beagle/devel beagle.spec,1.73,1.74
Message-ID: <200608240203.k7O23gax029758@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29720

Modified Files:
	beagle.spec 
Log Message:
fix build reqs



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- beagle.spec	23 Aug 2006 23:25:52 -0000	1.73
+++ beagle.spec	24 Aug 2006 02:03:38 -0000	1.74
@@ -26,6 +26,7 @@
 BuildRequires:	libXt-devel
 BuildRequires:	gettext
 BuildRequires:	autoconf
+BuildRequires:	perl-XML-Parser
 Requires: sqlite >= 3.3.1
 Requires: mono-core >= 1.1.13.5
 Requires: zip unzip sed grep poppler-utils



From fedora-cvs-commits at redhat.com  Thu Aug 24 02:06:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 22:06:31 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.322, 1.323 anaconda.spec, 1.448,
	1.449 sources, 1.445, 1.446
Message-ID: <200608240206.k7O26VEb030399@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30351/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.84-1 on branch devel from anaconda-11.1.0.84-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- .cvsignore	16 Aug 2006 20:08:48 -0000	1.322
+++ .cvsignore	24 Aug 2006 02:06:27 -0000	1.323
@@ -1 +1 @@
-anaconda-11.1.0.83.tar.bz2
+anaconda-11.1.0.84.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- anaconda.spec	16 Aug 2006 20:08:48 -0000	1.448
+++ anaconda.spec	24 Aug 2006 02:06:27 -0000	1.449
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.83
+Version: 11.1.0.84
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -16,6 +16,7 @@
 BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
 BuildPreReq: glib2-devel >= 2.11.1-5
 BuildPreReq: libdhcp-devel >= 1.12, mkinitrd-devel >= 5.1.2-1
+BuildPreReq: audit-libs-devel
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, booty
 Requires: parted >= 1.7.1, pyparted >= 1.7.2
 Requires: kudzu >= 1.2.42, yum >= 2.9.2, pirut >= 1.1.0
@@ -23,10 +24,9 @@
 Requires: system-logos, pykickstart, system-config-date
 Requires: device-mapper >= 1.01.05-3
 Requires: dosfstools e2fsprogs
-%ifnarch s390 s390x
 Requires: python-pyblock >= 0.17-2
 Requires: libbdevid >= 5.1.2-1, libbdevid-python
-%endif
+Requires: audit-libs
 %ifnarch s390 s390x ppc64
 Requires: rhpxl >= 0.25
 %endif
@@ -103,6 +103,19 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Aug 23 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.84-1
+- Run in English for CJKI text installs (clumens, #180417, #202738)
+- Don't mistake hard drives for CD drives (clumens, #202714)
+- Start to add s390x mpath support (pjones)
+- Whiteout scim-libs (clumens, #202543)
+- Fix LV size check with growing (clumens, #203095)
+- Fix graphical selection of drives (pjones)
+- Speed up mke2fs (pjones, #201645)
+- Add a simple audit daemon to get rid of audit spam (pjones)
+- Some tweaks to repo addition/task selection
+- Fix multipath for x86_64 (pjones, #203425)
+- Set language to English every time it's unsupported (clumens, #203331)
+
 * Wed Aug 16 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.83-1
 - Fix text timezone typo (clumens, #202844)
 - Some installclass tweaking


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- sources	16 Aug 2006 20:08:48 -0000	1.445
+++ sources	24 Aug 2006 02:06:27 -0000	1.446
@@ -1 +1 @@
-3e8ddcb0646c95cacd84b1a349438e83  anaconda-11.1.0.83.tar.bz2
+d1b652ed36613668ee34d4b4db7c440b  anaconda-11.1.0.84.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 24 02:14:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 22:14:43 -0400
Subject: rpms/ypbind/devel ypbind.init,1.10,1.11 ypbind.spec,1.31,1.32
Message-ID: <200608240214.k7O2EhsM032414@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32355

Modified Files:
	ypbind.init ypbind.spec 
Log Message:
Added the sourcing of /etc/sysconfig/ypbind (bz 199448)



Index: ypbind.init
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ypbind.init	18 Jul 2006 13:42:15 -0000	1.10
+++ ypbind.init	24 Aug 2006 02:14:40 -0000	1.11
@@ -19,6 +19,9 @@
 
 . /etc/sysconfig/network
 
+# Check for and source configuration file otherwise set defaults
+[ -f /etc/sysconfig/ypbind ] && . /etc/sysconfig/ypbind
+
 [ -z "$NISTIMEOUT" ] && NISTIMEOUT=20
 
 # Check that networking is configured.


Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ypbind.spec	24 Aug 2006 01:42:27 -0000	1.31
+++ ypbind.spec	24 Aug 2006 02:14:40 -0000	1.32
@@ -88,6 +88,7 @@
 * Wed Aug 23 2006 Steve Dickson <steved at redhat.com> - 3:1.19-3
 - Remove the -s from install process making the -debuginfo
   package useful (bz 203851)
+- Added the sourcing of /etc/sysconfig/ypbind (bz 199448)
 
 * Fri Aug 11 2006 Steve Dickson <steved at redhat.com> - 3:1.19-2
 - rebuild



From fedora-cvs-commits at redhat.com  Thu Aug 24 02:27:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 23 Aug 2006 22:27:37 -0400
Subject: rpms/ypbind/devel ypbind.spec,1.32,1.33
Message-ID: <200608240227.k7O2Rbfc019259@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19034

Modified Files:
	ypbind.spec 
Log Message:
Bump up the rev number because brew untag-pkg does not seem to work.



Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ypbind.spec	24 Aug 2006 02:14:40 -0000	1.32
+++ ypbind.spec	24 Aug 2006 02:27:33 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.19
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -85,7 +85,7 @@
 %doc README NEWS
 
 %changelog
-* Wed Aug 23 2006 Steve Dickson <steved at redhat.com> - 3:1.19-3
+* Wed Aug 23 2006 Steve Dickson <steved at redhat.com> - 3:1.19-4
 - Remove the -s from install process making the -debuginfo
   package useful (bz 203851)
 - Added the sourcing of /etc/sysconfig/ypbind (bz 199448)



From fedora-cvs-commits at redhat.com  Thu Aug 24 06:18:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 02:18:10 -0400
Subject: rpms/gdb/devel
	gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch, 1.1,
	1.2 gdb-6.3-bz182116-exec-from-pthread.patch, 1.1,
	1.2 gdb-6.3-bz193763-object-name-completion.patch, 1.1,
	1.2 gdb-6.5-bz195429-stale-threads-crash.patch, 1.1,
	1.2 gdb-6.5-bz196439-valgrind-memcheck-compat.patch, 1.1,
	1.2 gdb-6.5-bz200048-find_line_pc-segv.patch, 1.1,
	1.2 gdb-6.5-bz200533-ppc-solib_trampoline.patch, 1.1,
	1.2 gdb-6.5-bz203661-emit-relocs.patch, 1.1,
	1.2 gdb-6.5-opcodes-i386-nopmem.patch, 1.1, 1.2 gdb.spec,
	1.194, 1.195
Message-ID: <200608240618.k7O6IAsi013336@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8456

Modified Files:
	gdb-6.5-opcodes-i386-nopmem.patch gdb.spec 
Added Files:
	gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch 
	gdb-6.3-bz182116-exec-from-pthread.patch 
	gdb-6.3-bz193763-object-name-completion.patch 
	gdb-6.5-bz195429-stale-threads-crash.patch 
	gdb-6.5-bz196439-valgrind-memcheck-compat.patch 
	gdb-6.5-bz200048-find_line_pc-segv.patch 
	gdb-6.5-bz200533-ppc-solib_trampoline.patch 
	gdb-6.5-bz203661-emit-relocs.patch 
Log Message:
* Thu Aug 24 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-5
- Backport support for i386 nop memory instructions.
- Fix debuginfo addresses resolving for --emit-relocs Linux kernels
(BZ 203661, from Jan Kratochvil, like the remaining changes).
- Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ
200048).
- Do not step into the PPC solib trampolines (BZ 200533).
- Fix exec() from threaded program, partial CVS backport (BZ 182116).
- Fix occasional failure to load shared libraries (BZ 146810).
- Bugfix object names completion (fixes Patch116, BZ 193763).
- Avoid crash of 'info threads' if stale threads exist (BZ 195429).
- Handle corrupted or missing location list information (BZ 196439).


gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch:
 solib.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

Index: gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch
===================================================================
RCS file: gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch
diff -N gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch	24 Aug 2006 06:18:03 -0000	1.2
@@ -0,0 +1,47 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146810
+
+Bug is still present in 2006-07-21 GDB CVS. The segfault is just a consequence of earlier failure to properly load the custom shared library:
+Error while mapping shared library sections:
+libc++test4dl.so: Success.
+
+
+Index: gdb-6.5/gdb/solib.c
+===================================================================
+--- gdb-6.5.orig/gdb/solib.c	2006-08-24 02:55:23.000000000 -0300
++++ gdb-6.5/gdb/solib.c	2006-08-24 02:55:25.000000000 -0300
+@@ -150,13 +150,17 @@ solib_open (char *in_pathname, char **fo
+   int found_file = -1;
+   char *temp_pathname = NULL;
+   char *p = in_pathname;
++  int solib_absolute_prefix_is_empty;
++
++  solib_absolute_prefix_is_empty = (solib_absolute_prefix == NULL
++                                    || *solib_absolute_prefix == 0);
+ 
+   while (*p && !IS_DIR_SEPARATOR (*p))
+     p++;
+ 
+   if (*p)
+     {
+-      if (! IS_ABSOLUTE_PATH (in_pathname) || solib_absolute_prefix == NULL)
++      if (! IS_ABSOLUTE_PATH (in_pathname) || solib_absolute_prefix_is_empty)
+         temp_pathname = in_pathname;
+       else
+ 	{
+@@ -212,14 +216,14 @@ solib_open (char *in_pathname, char **fo
+ 					   &temp_pathname);
+ 
+   /* If not found, next search the inferior's $PATH environment variable. */
+-  if (found_file < 0 && solib_absolute_prefix == NULL)
++  if (found_file < 0 && solib_absolute_prefix_is_empty)
+     found_file = openp (get_in_environ (inferior_environ, "PATH"),
+ 			OPF_TRY_CWD_FIRST, in_pathname, O_RDONLY | O_BINARY, 0,
+ 			&temp_pathname);
+ 
+   /* If not found, next search the inferior's $LD_LIBRARY_PATH 
+      environment variable. */
+-  if (found_file < 0 && solib_absolute_prefix == NULL)
++  if (found_file < 0 && solib_absolute_prefix_is_empty)
+     found_file = openp (get_in_environ (inferior_environ, "LD_LIBRARY_PATH"),
+ 			OPF_TRY_CWD_FIRST, in_pathname, O_RDONLY | O_BINARY, 0,
+ 			&temp_pathname);

gdb-6.3-bz182116-exec-from-pthread.patch:
 linux-thread-db.c |    9 +++++++++
 1 files changed, 9 insertions(+)

Index: gdb-6.3-bz182116-exec-from-pthread.patch
===================================================================
RCS file: gdb-6.3-bz182116-exec-from-pthread.patch
diff -N gdb-6.3-bz182116-exec-from-pthread.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb-6.3-bz182116-exec-from-pthread.patch	24 Aug 2006 06:18:03 -0000	1.2
@@ -0,0 +1,23 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182116
+
+
+Index: gdb-6.5/gdb/linux-thread-db.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-thread-db.c	2006-08-24 02:55:24.000000000 -0300
++++ gdb-6.5/gdb/linux-thread-db.c	2006-08-24 02:56:16.000000000 -0300
+@@ -939,6 +939,15 @@ thread_db_wait (ptid_t ptid, struct targ
+       || ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
+     return pid_to_ptid (-1);
+ 
++  if (ourstatus->kind == TARGET_WAITKIND_EXECD)
++    {
++      remove_thread_event_breakpoints ();
++      unpush_target (&thread_db_ops);
++      using_thread_db = 0;
++
++      return pid_to_ptid (GET_PID (ptid));
++    }
++
+   if (ourstatus->kind == TARGET_WAITKIND_STOPPED
+       && (ourstatus->value.sig == TARGET_SIGNAL_TRAP
+           || ourstatus->value.sig == TARGET_SIGNAL_ILL))

gdb-6.3-bz193763-object-name-completion.patch:
 linespec.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: gdb-6.3-bz193763-object-name-completion.patch
===================================================================
RCS file: gdb-6.3-bz193763-object-name-completion.patch
diff -N gdb-6.3-bz193763-object-name-completion.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb-6.3-bz193763-object-name-completion.patch	24 Aug 2006 06:18:03 -0000	1.2
@@ -0,0 +1,16 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=193763
+
+
+Index: gdb-6.5/gdb/linespec.c
+===================================================================
+--- gdb-6.5.orig/gdb/linespec.c	2006-08-24 02:57:04.000000000 -0300
++++ gdb-6.5/gdb/linespec.c	2006-08-24 02:57:07.000000000 -0300
+@@ -295,7 +295,7 @@ add_minsym_members (const char *class_na
+      This will give us a list of all the member names including
+      the function signature.  */
+   completion_name = xmalloc (strlen (class_name) +
+-			     strlen (member_name) + 9);
++			     strlen (member_name) + strlen("'::$base(") + 1);
+   completion_name[0] = '\'';
+   strcpy (completion_name+1, class_name);
+   /* FIXME: make this the language class separator.  */

gdb-6.5-bz195429-stale-threads-crash.patch:
 linux-thread-db.c |  230 ++++--------------------------------------------------
 1 files changed, 18 insertions(+), 212 deletions(-)

Index: gdb-6.5-bz195429-stale-threads-crash.patch
===================================================================
RCS file: gdb-6.5-bz195429-stale-threads-crash.patch
diff -N gdb-6.5-bz195429-stale-threads-crash.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb-6.5-bz195429-stale-threads-crash.patch	24 Aug 2006 06:18:03 -0000	1.2
@@ -0,0 +1,315 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195429
+
+
+Index: gdb-6.5/gdb/linux-thread-db.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-thread-db.c	2006-08-24 02:55:25.000000000 -0300
++++ gdb-6.5/gdb/linux-thread-db.c	2006-08-24 02:55:25.000000000 -0300
+@@ -106,14 +106,6 @@ static td_err_e (*td_ta_event_getmsg_p) 
+ static td_err_e (*td_thr_validate_p) (const td_thrhandle_t *th);
+ static td_err_e (*td_thr_get_info_p) (const td_thrhandle_t *th,
+ 				      td_thrinfo_t *infop);
+-static td_err_e (*td_thr_getfpregs_p) (const td_thrhandle_t *th,
+-				       gdb_prfpregset_t *regset);
+-static td_err_e (*td_thr_getgregs_p) (const td_thrhandle_t *th,
+-				      prgregset_t gregs);
+-static td_err_e (*td_thr_setfpregs_p) (const td_thrhandle_t *th,
+-				       const gdb_prfpregset_t *fpregs);
+-static td_err_e (*td_thr_setgregs_p) (const td_thrhandle_t *th,
+-				      prgregset_t gregs);
+ static td_err_e (*td_thr_event_enable_p) (const td_thrhandle_t *th,
+ 					  int event);
+ 
+@@ -221,31 +213,6 @@ thread_db_err_str (td_err_e err)
+       return buf;
+     }
+ }
+-
+-static char *
+-thread_db_state_str (td_thr_state_e state)
+-{
+-  static char buf[64];
+-
+-  switch (state)
+-    {
+-    case TD_THR_STOPPED:
+-      return "stopped by debugger";
+-    case TD_THR_RUN:
+-      return "runnable";
+-    case TD_THR_ACTIVE:
+-      return "active";
+-    case TD_THR_ZOMBIE:
+-      return "zombie";
+-    case TD_THR_SLEEP:
+-      return "sleeping";
+-    case TD_THR_STOPPED_ASLEEP:
+-      return "stopped by debugger AND blocked";
+-    default:
+-      snprintf (buf, sizeof (buf), "unknown thread_db state %d", state);
+-      return buf;
+-    }
+-}
+ 
+ /* A callback function for td_ta_thr_iter, which we use to map all
+    threads to LWPs.
+@@ -331,27 +298,6 @@ thread_db_map_id2thr (struct thread_info
+   else
+     thread_info->private->th_valid = 1;
+ }
+-
+-static td_thrinfo_t *
+-thread_db_get_info (struct thread_info *thread_info)
+-{
+-  td_err_e err;
+-
+-  if (thread_info->private->ti_valid)
+-    return &thread_info->private->ti;
+-
+-  if (!thread_info->private->th_valid)
+-    thread_db_map_id2thr (thread_info, 1);
+-
+-  err =
+-    td_thr_get_info_p (&thread_info->private->th, &thread_info->private->ti);
+-  if (err != TD_OK)
+-    error (_("thread_db_get_info: cannot get thread info: %s"),
+-	   thread_db_err_str (err));
+-
+-  thread_info->private->ti_valid = 1;
+-  return &thread_info->private->ti;
+-}
+ 
+ /* Convert between user-level thread ids and LWP ids.  */
+ 
+@@ -462,22 +408,6 @@ thread_db_load (void)
+   if (td_thr_get_info_p == NULL)
+     return 0;
+ 
+-  td_thr_getfpregs_p = verbose_dlsym (handle, "td_thr_getfpregs");
+-  if (td_thr_getfpregs_p == NULL)
+-    return 0;
+-
+-  td_thr_getgregs_p = verbose_dlsym (handle, "td_thr_getgregs");
+-  if (td_thr_getgregs_p == NULL)
+-    return 0;
+-
+-  td_thr_setfpregs_p = verbose_dlsym (handle, "td_thr_setfpregs");
+-  if (td_thr_setfpregs_p == NULL)
+-    return 0;
+-
+-  td_thr_setgregs_p = verbose_dlsym (handle, "td_thr_setgregs");
+-  if (td_thr_setgregs_p == NULL)
+-    return 0;
+-
+   /* Initialize the library.  */
+   err = td_init_p ();
+   if (err != TD_OK)
+@@ -995,81 +925,6 @@ thread_db_xfer_partial (struct target_op
+ }
+ 
+ static void
+-thread_db_fetch_registers (int regno)
+-{
+-  struct thread_info *thread_info;
+-  prgregset_t gregset;
+-  gdb_prfpregset_t fpregset;
+-  td_err_e err;
+-
+-  if (!is_thread (inferior_ptid))
+-    {
+-      /* Pass the request to the target beneath us.  */
+-      target_beneath->to_fetch_registers (regno);
+-      return;
+-    }
+-
+-  thread_info = find_thread_pid (inferior_ptid);
+-  thread_db_map_id2thr (thread_info, 1);
+-
+-  err = td_thr_getgregs_p (&thread_info->private->th, gregset);
+-  if (err != TD_OK)
+-    error (_("Cannot fetch general-purpose registers for thread %ld: %s"),
+-	   (long) GET_THREAD (inferior_ptid), thread_db_err_str (err));
+-
+-  err = td_thr_getfpregs_p (&thread_info->private->th, &fpregset);
+-  if (err != TD_OK)
+-    error (_("Cannot get floating-point registers for thread %ld: %s"),
+-	   (long) GET_THREAD (inferior_ptid), thread_db_err_str (err));
+-
+-  /* Note that we must call supply_gregset after calling the thread_db
+-     routines because the thread_db routines call ps_lgetgregs and
+-     friends which clobber GDB's register cache.  */
+-  supply_gregset ((gdb_gregset_t *) gregset);
+-  supply_fpregset (&fpregset);
+-}
+-
+-static void
+-thread_db_store_registers (int regno)
+-{
+-  prgregset_t gregset;
+-  gdb_prfpregset_t fpregset;
+-  td_err_e err;
+-  struct thread_info *thread_info;
+-
+-  if (!is_thread (inferior_ptid))
+-    {
+-      /* Pass the request to the target beneath us.  */
+-      target_beneath->to_store_registers (regno);
+-      return;
+-    }
+-
+-  thread_info = find_thread_pid (inferior_ptid);
+-  thread_db_map_id2thr (thread_info, 1);
+-
+-  if (regno != -1)
+-    {
+-      gdb_byte raw[MAX_REGISTER_SIZE];
+-
+-      regcache_raw_collect (current_regcache, regno, raw);
+-      thread_db_fetch_registers (-1);
+-      regcache_raw_supply (current_regcache, regno, raw);
+-    }
+-
+-  fill_gregset ((gdb_gregset_t *) gregset, -1);
+-  fill_fpregset (&fpregset, -1);
+-
+-  err = td_thr_setgregs_p (&thread_info->private->th, gregset);
+-  if (err != TD_OK)
+-    error (_("Cannot store general-purpose registers for thread %ld: %s"),
+-	   (long) GET_THREAD (inferior_ptid), thread_db_err_str (err));
+-  err = td_thr_setfpregs_p (&thread_info->private->th, &fpregset);
+-  if (err != TD_OK)
+-    error (_("Cannot store floating-point registers  for thread %ld: %s"),
+-	   (long) GET_THREAD (inferior_ptid), thread_db_err_str (err));
+-}
+-
+-static void
+ thread_db_kill (void)
+ {
+   /* There's no need to save & restore inferior_ptid here, since the
+@@ -1121,48 +976,6 @@ thread_db_mourn_inferior (void)
+ }
+ 
+ static int
+-thread_db_thread_alive (ptid_t ptid)
+-{
+-  td_thrhandle_t th;
+-  td_err_e err;
+-
+-  if (is_thread (ptid))
+-    {
+-      struct thread_info *thread_info;
+-      thread_info = find_thread_pid (ptid);
+-
+-      thread_db_map_id2thr (thread_info, 0);
+-      if (!thread_info->private->th_valid)
+-	return 0;
+-
+-      err = td_thr_validate_p (&thread_info->private->th);
+-      if (err != TD_OK)
+-	return 0;
+-
+-      if (!thread_info->private->ti_valid)
+-	{
+-	  err =
+-	    td_thr_get_info_p (&thread_info->private->th,
+-			       &thread_info->private->ti);
+-	  if (err != TD_OK)
+-	    return 0;
+-	  thread_info->private->ti_valid = 1;
+-	}
+-
+-      if (thread_info->private->ti.ti_state == TD_THR_UNKNOWN
+-	  || thread_info->private->ti.ti_state == TD_THR_ZOMBIE)
+-	return 0;		/* A zombie thread.  */
+-
+-      return 1;
+-    }
+-
+-  if (target_beneath->to_thread_alive)
+-    return target_beneath->to_thread_alive (ptid);
+-
+-  return 0;
+-}
+-
+-static int
+ find_new_threads_callback (const td_thrhandle_t *th_p, void *data)
+ {
+   td_thrinfo_t ti;
+@@ -1204,32 +1017,15 @@ thread_db_pid_to_str (ptid_t ptid)
+   if (is_thread (ptid))
+     {
+       static char buf[64];
+-      td_thrinfo_t *ti_p;
+-      td_err_e err;
+       struct thread_info *thread_info;
+ 
+       thread_info = find_thread_pid (ptid);
+-      thread_db_map_id2thr (thread_info, 0);
+-      if (!thread_info->private->th_valid)
+-	{
+-	  snprintf (buf, sizeof (buf), "Thread %ld (Missing)",
+-		    GET_THREAD (ptid));
+-	  return buf;
+-	}
+-
+-      ti_p = thread_db_get_info (thread_info);
+-
+-      if (ti_p->ti_state == TD_THR_ACTIVE && ti_p->ti_lid != 0)
+-	{
+-	  snprintf (buf, sizeof (buf), "Thread %ld (LWP %d)",
+-		    (long) ti_p->ti_tid, ti_p->ti_lid);
+-	}
++      if (thread_info == NULL)
++	snprintf (buf, sizeof (buf), "Thread %ld (LWP %ld) (Missing)",
++		  GET_THREAD (ptid), GET_LWP (ptid));
+       else
+-	{
+-	  snprintf (buf, sizeof (buf), "Thread %ld (%s)",
+-		    (long) ti_p->ti_tid,
+-		    thread_db_state_str (ti_p->ti_state));
+-	}
++	snprintf (buf, sizeof (buf), "Thread %ld (LWP %ld)",
++		  GET_THREAD (ptid), GET_LWP (ptid));
+ 
+       return buf;
+     }
+@@ -1240,6 +1036,18 @@ thread_db_pid_to_str (ptid_t ptid)
+   return normal_pid_to_str (ptid);
+ }
+ 
++/* Return a string describing the state of the thread specified by
++   INFO.  */
++
++static char *
++thread_db_extra_thread_info (struct thread_info *info)
++{
++  if (info->private->dying)
++    return "Exiting";
++
++  return NULL;
++}
++
+ /* Get the address of the thread local variable in load module LM which
+    is stored at OFFSET within the thread local storage for thread PTID.  */
+ 
+@@ -1310,20 +1118,18 @@ init_thread_db_ops (void)
+   thread_db_ops.to_detach = thread_db_detach;
+   thread_db_ops.to_resume = thread_db_resume;
+   thread_db_ops.to_wait = thread_db_wait;
+-  thread_db_ops.to_fetch_registers = thread_db_fetch_registers;
+-  thread_db_ops.to_store_registers = thread_db_store_registers;
+   thread_db_ops.to_xfer_partial = thread_db_xfer_partial;
+   thread_db_ops.to_kill = thread_db_kill;
+   thread_db_ops.to_create_inferior = thread_db_create_inferior;
+   thread_db_ops.to_post_startup_inferior = thread_db_post_startup_inferior;
+   thread_db_ops.to_mourn_inferior = thread_db_mourn_inferior;
+-  thread_db_ops.to_thread_alive = thread_db_thread_alive;
+   thread_db_ops.to_find_new_threads = thread_db_find_new_threads;
+   thread_db_ops.to_pid_to_str = thread_db_pid_to_str;
+   thread_db_ops.to_stratum = thread_stratum;
+   thread_db_ops.to_has_thread_control = tc_schedlock;
+   thread_db_ops.to_get_thread_local_address
+     = thread_db_get_thread_local_address;
++  thread_db_ops.to_extra_thread_info = thread_db_extra_thread_info;
+   thread_db_ops.to_magic = OPS_MAGIC;
+ }
+ 

gdb-6.5-bz196439-valgrind-memcheck-compat.patch:
 dwarf2read.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Index: gdb-6.5-bz196439-valgrind-memcheck-compat.patch
===================================================================
RCS file: gdb-6.5-bz196439-valgrind-memcheck-compat.patch
diff -N gdb-6.5-bz196439-valgrind-memcheck-compat.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb-6.5-bz196439-valgrind-memcheck-compat.patch	24 Aug 2006 06:18:03 -0000	1.2
@@ -0,0 +1,20 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196439
+
+
+Index: gdb-6.5/gdb/dwarf2read.c
+===================================================================
+--- gdb-6.5.orig/gdb/dwarf2read.c	2006-08-24 02:55:24.000000000 -0300
++++ gdb-6.5/gdb/dwarf2read.c	2006-08-24 02:55:25.000000000 -0300
+@@ -9317,7 +9317,11 @@ static void
+ dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
+ 			     struct dwarf2_cu *cu)
+ {
+-  if (attr->form == DW_FORM_data4 || attr->form == DW_FORM_data8)
++  if ((attr->form == DW_FORM_data4 || attr->form == DW_FORM_data8)
++      /* ".debug_loc" may not exist at all, or the offset may be outside
++	 the section.  If so, fall through to the complaint in the
++	 other branch.  */
++      && DW_UNSND (attr) < dwarf2_per_objfile->loc_size)
+     {
+       struct dwarf2_loclist_baton *baton;
+ 

gdb-6.5-bz200048-find_line_pc-segv.patch:
 tui-layout.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

Index: gdb-6.5-bz200048-find_line_pc-segv.patch
===================================================================
RCS file: gdb-6.5-bz200048-find_line_pc-segv.patch
diff -N gdb-6.5-bz200048-find_line_pc-segv.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb-6.5-bz200048-find_line_pc-segv.patch	24 Aug 2006 06:18:06 -0000	1.2
@@ -0,0 +1,30 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200048
+
+
+diff -ru gdb-6.5-orig/gdb/tui/tui-layout.c gdb-6.5-pr200048/gdb/tui/tui-layout.c
+--- gdb-6.5-orig/gdb/tui/tui-layout.c	2006-08-07 21:33:42.000000000 +0200
++++ gdb-6.5-pr200048/gdb/tui/tui-layout.c	2006-08-13 02:26:39.000000000 +0200
+@@ -519,13 +519,17 @@
+     {
+     case SRC_COMMAND:
+     case SRC_DATA_COMMAND:
+-      find_line_pc (cursal.symtab,
++      if (find_line_pc (cursal.symtab,
+ 		    TUI_SRC_WIN->detail.source_info.start_line_or_addr.u.line_no,
+-		    &pc_list, &num_pc_values);
+-      /* FIXME: What do we do with multiple pc values for ctors/dtors or
+-                inlined functions?  */
+-      addr = pc_list[0];
+-      xfree (pc_list);
++		    &pc_list, &num_pc_values))
++	{
++	  /* FIXME: What do we do with multiple pc values for ctors/dtors or
++		    inlined functions?  */
++	  addr = pc_list[0];
++	  xfree (pc_list);
++	}
++      else
++        addr = 0;
+       break;
+     case DISASSEM_COMMAND:
+     case SRC_DISASSEM_COMMAND:

gdb-6.5-bz200533-ppc-solib_trampoline.patch:
 minsyms.c |    3 +++
 1 files changed, 3 insertions(+)

Index: gdb-6.5-bz200533-ppc-solib_trampoline.patch
===================================================================
RCS file: gdb-6.5-bz200533-ppc-solib_trampoline.patch
diff -N gdb-6.5-bz200533-ppc-solib_trampoline.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb-6.5-bz200533-ppc-solib_trampoline.patch	24 Aug 2006 06:18:06 -0000	1.2
@@ -0,0 +1,16 @@
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200533
+
+
+diff -ru gdb-6.5-orig/gdb/minsyms.c gdb-6.5/gdb/minsyms.c
+--- gdb-6.5-orig/gdb/minsyms.c	2005-12-17 17:34:01.000000000 -0500
++++ gdb-6.5/gdb/minsyms.c	2006-08-13 10:49:43.000000000 -0400
+@@ -486,6 +486,9 @@
+ 			  don't fill the bfd_section member, so don't
+ 			  throw away symbols on those platforms.  */
+ 		       && SYMBOL_BFD_SECTION (&msymbol[hi]) != NULL
++		       /* Don't ignore symbols for solib trampolines
++			  Red Hat Bug 200533 and Bug 192964.  */
++		       && MSYMBOL_TYPE (&msymbol[hi]) != mst_solib_trampoline
+ 		       && SYMBOL_BFD_SECTION (&msymbol[hi]) != section)
+ 		  --hi;
+ 

gdb-6.5-bz203661-emit-relocs.patch:
 symfile.c |    6 ++++++
 1 files changed, 6 insertions(+)

Index: gdb-6.5-bz203661-emit-relocs.patch
===================================================================
RCS file: gdb-6.5-bz203661-emit-relocs.patch
diff -N gdb-6.5-bz203661-emit-relocs.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb-6.5-bz203661-emit-relocs.patch	24 Aug 2006 06:18:06 -0000	1.2
@@ -0,0 +1,17 @@
+Index: gdb-6.5/gdb/symfile.c
+===================================================================
+--- gdb-6.5.orig/gdb/symfile.c	2006-08-24 02:56:02.000000000 -0300
++++ gdb-6.5/gdb/symfile.c	2006-08-24 02:56:36.000000000 -0300
+@@ -3739,6 +3739,12 @@ symfile_dummy_outputs (bfd *abfd, asecti
+ bfd_byte *
+ symfile_relocate_debug_section (bfd *abfd, asection *sectp, bfd_byte *buf)
+ {
++  /* Executable files have all the relocations already resolved.
++   * Handle files linked with --emit-relocs.
++   * http://sources.redhat.com/ml/gdb/2006-08/msg00137.html  */
++  if ((abfd->flags & EXEC_P) != 0)
++    return NULL;
++
+   /* We're only interested in debugging sections with relocation
+      information.  */
+   if ((sectp->flags & SEC_RELOC) == 0)

gdb-6.5-opcodes-i386-nopmem.patch:
 include/opcode/i386.h |    6 +++++-
 opcodes/i386-dis.c    |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

Index: gdb-6.5-opcodes-i386-nopmem.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.5-opcodes-i386-nopmem.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.5-opcodes-i386-nopmem.patch	23 Aug 2006 06:54:55 -0000	1.1
+++ gdb-6.5-opcodes-i386-nopmem.patch	24 Aug 2006 06:18:06 -0000	1.2
@@ -13,9 +13,11 @@
 	* i386-dis.c (dis386_twobyte): Use "nopQ" for 0x1f.
 	(twobyte_has_modrm): Set 1 for 0x1f.
 
---- binutils/include/opcode/i386.h.nops	2006-06-10 11:26:58.000000000 -0700
-+++ binutils/include/opcode/i386.h	2006-06-10 11:26:58.000000000 -0700
-@@ -555,7 +555,11 @@ static const template i386_optab[] =
+Index: gdb-6.5/include/opcode/i386.h
+===================================================================
+--- gdb-6.5.orig/include/opcode/i386.h	2006-08-24 02:55:59.000000000 -0300
++++ gdb-6.5/include/opcode/i386.h	2006-08-24 02:56:36.000000000 -0300
+@@ -563,7 +563,11 @@ static const template i386_optab[] =
  {"bound",  2,	0x62, X, Cpu186|CpuNo64, wl_Suf|Modrm,		{ WordReg, WordMem, 0} },
  
  {"hlt",	   0,	0xf4, X, 0,	 NoSuf,			{ 0, 0, 0} },
@@ -28,9 +30,11 @@
  {"nop",	   0,	0x90, X, 0,	 NoSuf,			{ 0, 0, 0} },
  
  /* Protection control.  */
---- binutils/opcodes/i386-dis.c.nops	2006-06-10 11:26:58.000000000 -0700
-+++ binutils/opcodes/i386-dis.c	2006-06-10 11:26:58.000000000 -0700
-@@ -843,7 +843,7 @@ static const struct dis386 dis386_twobyt
+Index: gdb-6.5/opcodes/i386-dis.c
+===================================================================
+--- gdb-6.5.orig/opcodes/i386-dis.c	2006-08-24 02:55:59.000000000 -0300
++++ gdb-6.5/opcodes/i386-dis.c	2006-08-24 02:56:36.000000000 -0300
+@@ -842,7 +842,7 @@ static const struct dis386 dis386_twobyt
    { "(bad)",		XX, XX, XX },
    { "(bad)",		XX, XX, XX },
    { "(bad)",		XX, XX, XX },
@@ -39,7 +43,7 @@
    /* 20 */
    { "movZ",		Rm, Cm, XX },
    { "movZ",		Rm, Dm, XX },
-@@ -1125,7 +1125,7 @@ static const unsigned char twobyte_has_m
+@@ -1124,7 +1124,7 @@ static const unsigned char twobyte_has_m
    /*       0 1 2 3 4 5 6 7 8 9 a b c d e f        */
    /*       -------------------------------        */
    /* 00 */ 1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,1, /* 0f */
@@ -48,4 +52,3 @@
    /* 20 */ 1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1, /* 2f */
    /* 30 */ 0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0, /* 3f */
    /* 40 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 4f */
-


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- gdb.spec	23 Aug 2006 06:54:55 -0000	1.194
+++ gdb.spec	24 Aug 2006 06:18:06 -0000	1.195
@@ -11,7 +11,7 @@
 Version: 6.5
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -219,8 +219,32 @@
 # Backport GNU .hash support.
 Patch180: gdb-6.5-bfd-hash-style-20060714.patch
 
+# Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ 200048).
+Patch181: gdb-6.5-bz200048-find_line_pc-segv.patch
+
+# Do not step into the PPC solib trampolines (BZ 200533).
+Patch182: gdb-6.5-bz200533-ppc-solib_trampoline.patch
+
+# Fix exec() from threaded program, partial CVS backport (BZ 182116).
+Patch183: gdb-6.3-bz182116-exec-from-pthread.patch
+
+# Fix occasional failure to load shared libraries (BZ 146810).
+Patch184: gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch
+
+# Bugfix object names completion (fixes Patch116, BZ 193763).
+Patch185: gdb-6.3-bz193763-object-name-completion.patch
+
+# Avoid crash of 'info threads' if stale threads exist (BZ 195429).
+Patch186: gdb-6.5-bz195429-stale-threads-crash.patch
+
+# Handle corrupted or missing location list information (BZ 196439).
+Patch187: gdb-6.5-bz196439-valgrind-memcheck-compat.patch
+
+# Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).
+Patch188: gdb-6.5-bz203661-emit-relocs.patch
+
 # Add support for memory nops on x86.
-Patch181: gdb-6.5-opcodes-i386-nopmem.patch
+Patch189: gdb-6.5-opcodes-i386-nopmem.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils
@@ -314,6 +338,14 @@
 %patch179 -p1
 %patch180 -p1
 %patch181 -p1
+%patch182 -p1
+%patch183 -p1
+%patch184 -p1
+%patch185 -p1
+%patch186 -p1
+%patch187 -p1
+%patch188 -p1
+%patch189 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -474,8 +506,18 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* ??? Alexandre Oliva <aoliva at redhat.com> - 6.5-4
+* Thu Aug 24 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-5
 - Backport support for i386 nop memory instructions.
+- Fix debuginfo addresses resolving for --emit-relocs Linux kernels
+(BZ 203661, from Jan Kratochvil, like the remaining changes).
+- Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ
+200048).
+- Do not step into the PPC solib trampolines (BZ 200533).
+- Fix exec() from threaded program, partial CVS backport (BZ 182116).
+- Fix occasional failure to load shared libraries (BZ 146810).
+- Bugfix object names completion (fixes Patch116, BZ 193763).
+- Avoid crash of 'info threads' if stale threads exist (BZ 195429).
+- Handle corrupted or missing location list information (BZ 196439).
 
 * Thu Jul 13 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-3
 - Add missing definition of multilib_64_archs for glibc-devel buildreqs.



From fedora-cvs-commits at redhat.com  Thu Aug 24 09:20:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 05:20:40 -0400
Subject: rpms/vim/devel vim-7.0-syntax.patch,1.1,1.2
Message-ID: <200608240920.k7O9KeeU008770@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29836

Modified Files:
	vim-7.0-syntax.patch 
Log Message:
- fix syntax patch (#203798)

vim-7.0-syntax.patch:
 filetype.vim |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: vim-7.0-syntax.patch
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim-7.0-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vim-7.0-syntax.patch	23 Mar 2006 13:07:01 -0000	1.1
+++ vim-7.0-syntax.patch	24 Aug 2006 09:20:37 -0000	1.2
@@ -5,7 +5,7 @@
  " Apache config file
  au BufNewFile,BufRead .htaccess			 setf apache
 -au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache')
-+au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
++au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
  
  " XA65 MOS6510 cross assembler
  au BufNewFile,BufRead *.a65			setf a65



From fedora-cvs-commits at redhat.com  Thu Aug 24 09:23:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 05:23:59 -0400
Subject: rpms/vim/devel 7.0.064, NONE, 1.1 7.0.065, NONE, 1.1 7.0.066, NONE,
	1.1 README.patches, 1.55, 1.56 vim.spec, 1.133, 1.134
Message-ID: <200608240923.k7O9NxSl015013@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14999

Modified Files:
	README.patches vim.spec 
Added Files:
	7.0.064 7.0.065 7.0.066 
Log Message:
- fix syntax patch (#203798)
- patchlevel 66



--- NEW FILE 7.0.064 ---
To: vim-dev at vim.org
Subject: Patch 7.0.064
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.064
Problem:    Using uninitialized variable. (Tony Mechelynck)
Solution:   When not used set "temp" to zero.  Also avoid a warning for
	    "files" in ins_compl_dictionaries().
Files:	    src/edit.c


*** ../vim-7.0.063/src/edit.c	Wed Aug 16 21:26:19 2006
--- src/edit.c	Thu Aug 17 22:28:34 2006
***************
*** 2760,2765 ****
--- 2760,2766 ----
  	}
  	else
  # endif
+ 	    if (count > 0)	/* avoid warning for using "files" uninit */
  	{
  	    ins_compl_files(count, files, thesaurus, flags,
  							&regmatch, buf, &dir);
***************
*** 3222,3228 ****
      int	    c;
  {
      char_u	*ptr;
-     int		temp;
      int		want_cindent;
      int		retval = FALSE;
  
--- 3223,3228 ----
***************
*** 3378,3383 ****
--- 3378,3384 ----
  	    if (compl_curr_match != NULL || compl_leader != NULL || c == Ctrl_E)
  	    {
  		char_u	*p;
+ 		int	temp = 0;
  
  		/*
  		 * If any of the original typed text has been changed, eg when
*** ../vim-7.0.063/src/version.c	Wed Aug 16 22:03:35 2006
--- src/version.c	Tue Aug 22 19:56:05 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     64,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
200. You really believe in the concept of a "paperless" office.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


--- NEW FILE 7.0.065 ---
To: vim-dev at vim.org
Subject: Patch 7.0.065 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.065 (extra)
Problem:    Mac: left-right movement of the scrollwheel causes up-down
	    scrolling.
Solution:   Ignore mouse wheel events that are not up-down. (Nicolas Weber)
Files:	    src/gui_mac.c


*** ../vim-7.0.064/src/gui_mac.c	Wed May  3 00:03:26 2006
--- src/gui_mac.c	Tue Aug 22 13:41:12 2006
***************
*** 2480,2485 ****
--- 2480,2491 ----
      UInt32	mod;
      SInt32	delta;
      int_u	vim_mod;
+     EventMouseWheelAxis axis;
+ 
+     if (noErr == GetEventParameter(theEvent, kEventParamMouseWheelAxis,
+ 			  typeMouseWheelAxis, NULL, sizeof(axis), NULL, &axis)
+ 	    && axis != kEventMouseWheelAxisY)
+ 	goto bail; /* Vim only does up-down scrolling */
  
      if (noErr != GetEventParameter(theEvent, kEventParamMouseWheelDelta,
  			      typeSInt32, NULL, sizeof(SInt32), NULL, &delta))
*** ../vim-7.0.064/src/version.c	Tue Aug 22 19:58:22 2006
--- src/version.c	Tue Aug 22 21:38:07 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     65,
  /**/

-- 
Spam seems to be something useful to novices.  Later you realize that
it's a bunch of indigestable junk that only clogs your system.
Applies to both the food and the e-mail!

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


--- NEW FILE 7.0.066 ---
To: vim-dev at vim.org
Subject: Patch 7.0.066
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.066
Problem:    After the popup menu for Insert mode completion overlaps the tab
	    pages line it is not completely removed.
Solution:   Redraw the tab pages line after removing the popup menu. (Ori
	    Avtalion)
Files:	    src/popupmnu.c


*** ../vim-7.0.065/src/popupmnu.c	Fri Apr 21 00:12:29 2006
--- src/popupmnu.c	Tue Aug 22 16:10:55 2006
***************
*** 552,557 ****
--- 552,560 ----
  {
      pum_array = NULL;
      redraw_all_later(SOME_VALID);
+ #ifdef FEAT_WINDOWS
+     redraw_tabline = TRUE;
+ #endif
      status_redraw_all();
  }
  
*** ../vim-7.0.065/src/version.c	Tue Aug 22 21:39:18 2006
--- src/version.c	Tue Aug 22 21:50:34 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     66,
  /**/

-- 
panic("Foooooooood fight!");
	-- In the kernel source aha1542.c, after detecting a bad segment list

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- README.patches	17 Aug 2006 12:01:31 -0000	1.55
+++ README.patches	24 Aug 2006 09:23:56 -0000	1.56
@@ -88,3 +88,6 @@
   2249  7.0.061  crash in Vim command completion when nothing to complete
   4075  7.0.062  Mac: crash when using popup menu with spell error
   1295  7.0.063  tiny chance for a memory leak
+  1818  7.0.064  compiler warnings for unused variables
+  1750  7.0.065  (extra) Mac: horizontal scroll wheel caused vertical scroll
+  1407  7.0.066  tab pages line not redrawn after removing the popup menu


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- vim.spec	17 Aug 2006 12:01:33 -0000	1.133
+++ vim.spec	24 Aug 2006 09:23:56 -0000	1.134
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 063
+%define patchlevel 066
 
 Summary: The VIM editor.
 Name: vim
@@ -108,6 +108,9 @@
 Patch061: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.061
 Patch062: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.062
 Patch063: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.063
+Patch064: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.064
+Patch065: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.065
+Patch066: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.066
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -302,6 +305,10 @@
 %patch061 -p0
 %patch062 -p0
 %patch063 -p0
+%patch064 -p0
+# Mac:
+#patch065 -p0
+%patch066 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -625,6 +632,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Aug 24 2006 Karsten Hopp <karsten at redhat.de> 7.0.066-1
+- fix syntax patch (#203798)
+- patchlevel 66
+
 * Wed Aug 17 2006 Karsten Hopp <karsten at redhat.de> 7.0.063-1
 - Patchlevel 63
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 09:50:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 05:50:30 -0400
Subject: rpms/cups/devel cups-lspp.patch,1.3,1.4 cups.spec,1.251,1.252
Message-ID: <200608240950.k7O9oUfn011730@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11627

Modified Files:
	cups-lspp.patch cups.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-15
- Fixed LSPP patch passing NULL to strcmp (bug #203784).


cups-lspp.patch:
 Makedefs.in                 |    2 
 config-scripts/cups-lspp.m4 |   36 +++++
 config.h.in                 |    7 +
 configure.in                |    2 
 cups/cups.h                 |    8 +
 data/Makefile               |    5 
 data/mls                    |  277 ++++++++++++++++++++++++++++++++++++++++++++
 data/selinux                |  277 ++++++++++++++++++++++++++++++++++++++++++++
 data/te                     |  277 ++++++++++++++++++++++++++++++++++++++++++++
 scheduler/Makefile          |    6 
 scheduler/client.c          |  101 +++++++++++++++-
 scheduler/client.h          |   14 ++
 scheduler/conf.c            |   46 +++++++
 scheduler/conf.h            |    8 +
 scheduler/ipp.c             |  271 +++++++++++++++++++++++++++++++++++++++++++
 scheduler/job.c             |  155 ++++++++++++++++++++++++
 scheduler/job.h             |   11 +
 scheduler/lspp-access.c     |   56 ++++++++
 scheduler/main.c            |   32 +++++
 scheduler/printers.c        |   45 +++++++
 20 files changed, 1630 insertions(+), 6 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-lspp.patch	21 Aug 2006 16:26:28 -0000	1.3
+++ cups-lspp.patch	24 Aug 2006 09:50:28 -0000	1.4
@@ -1430,13 +1430,13 @@
 +        userfooter = strdup(attr->values[1].string.text);
 +  
 +      if ((strcmp(userheader, Classification) == 0)
-+          && (strcmp(userfooter, Classification) == 0))
++          && userfooter &&(strcmp(userfooter, Classification) == 0))
 +      {
 +       /*
 +        * Since both values are Classification, the user is not trying to Override
 +        */
 +        free(userheader);
-+        free(userfooter);
++        if (userfooter) free(userfooter);
 +        userheader = userfooter = NULL;
 +      }
 +    }


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- cups.spec	21 Aug 2006 16:26:28 -0000	1.251
+++ cups.spec	24 Aug 2006 09:50:28 -0000	1.252
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 14
+Release: 15
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -420,6 +420,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-15
+- Fixed LSPP patch passing NULL to strcmp (bug #203784).
+
 * Mon Aug 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-14
 - Updated LSPP patch (bug #203376).
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 11:10:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 07:10:17 -0400
Subject: rpms/gdb/devel gdb-6.5-opcodes-i386-nopmem.patch, NONE,
	1.2.2.1 gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch,
	1.1.2.1, 1.1.2.2 gdb-6.3-bz182116-exec-from-pthread.patch,
	1.1.2.1, 1.1.2.2 gdb-6.3-bz193763-object-name-completion.patch,
	1.1.2.1, 1.1.2.2 gdb-6.5-bz195429-stale-threads-crash.patch,
	1.1.2.1, 1.1.2.2 gdb-6.5-bz196439-valgrind-memcheck-compat.patch,
	1.1.2.1, 1.1.2.2 gdb-6.5-bz203661-emit-relocs.patch, 1.1.2.1,
	1.1.2.2 gdb.spec, 1.193.2.2, 1.193.2.3
Message-ID: <200608241110.k7OBAHJl031034@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30940

Modified Files:
      Tag: private-jkratoch
	gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch 
	gdb-6.3-bz182116-exec-from-pthread.patch 
	gdb-6.3-bz193763-object-name-completion.patch 
	gdb-6.5-bz195429-stale-threads-crash.patch 
	gdb-6.5-bz196439-valgrind-memcheck-compat.patch 
	gdb-6.5-bz203661-emit-relocs.patch gdb.spec 
Added Files:
      Tag: private-jkratoch
	gdb-6.5-opcodes-i386-nopmem.patch 
Log Message:
Branch update for gdb-6.5-5, CVS rev. 1.195.


gdb-6.5-opcodes-i386-nopmem.patch:
 include/opcode/i386.h |    6 +++++-
 opcodes/i386-dis.c    |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE gdb-6.5-opcodes-i386-nopmem.patch ---
This is already upstream, past GDB 6.5.

include/opcode/

2006-06-09  H.J. Lu  <hongjiu.lu at intel.com>

	* i386.h (i386_optab): Add "nop" with memory reference.

opcodes/

2006-06-09  H.J. Lu  <hongjiu.lu at intel.com>

	* i386-dis.c (dis386_twobyte): Use "nopQ" for 0x1f.
	(twobyte_has_modrm): Set 1 for 0x1f.

Index: gdb-6.5/include/opcode/i386.h
===================================================================
--- gdb-6.5.orig/include/opcode/i386.h	2006-08-24 02:55:59.000000000 -0300
+++ gdb-6.5/include/opcode/i386.h	2006-08-24 02:56:36.000000000 -0300
@@ -563,7 +563,11 @@ static const template i386_optab[] =
 {"bound",  2,	0x62, X, Cpu186|CpuNo64, wl_Suf|Modrm,		{ WordReg, WordMem, 0} },
 
 {"hlt",	   0,	0xf4, X, 0,	 NoSuf,			{ 0, 0, 0} },
-/* nop is actually 'xchgl %eax, %eax'.  */
+
+{"nop",    1, 0x0f1f, X, Cpu686, wl_Suf|Modrm,		{ WordMem, 0, 0} },
+
+/* nop is actually "xchg %ax,%ax" in 16bit mode, "xchg %eax,%eax" in
+   32bit mode and "xchg %rax,%rax" in 64bit mode.  */
 {"nop",	   0,	0x90, X, 0,	 NoSuf,			{ 0, 0, 0} },
 
 /* Protection control.  */
Index: gdb-6.5/opcodes/i386-dis.c
===================================================================
--- gdb-6.5.orig/opcodes/i386-dis.c	2006-08-24 02:55:59.000000000 -0300
+++ gdb-6.5/opcodes/i386-dis.c	2006-08-24 02:56:36.000000000 -0300
@@ -842,7 +842,7 @@ static const struct dis386 dis386_twobyt
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
-  { "(bad)",		XX, XX, XX },
+  { "nopQ",		Ev, XX, XX },
   /* 20 */
   { "movZ",		Rm, Cm, XX },
   { "movZ",		Rm, Dm, XX },
@@ -1124,7 +1124,7 @@ static const unsigned char twobyte_has_m
   /*       0 1 2 3 4 5 6 7 8 9 a b c d e f        */
   /*       -------------------------------        */
   /* 00 */ 1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,1, /* 0f */
-  /* 10 */ 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0, /* 1f */
+  /* 10 */ 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1, /* 1f */
   /* 20 */ 1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1, /* 2f */
   /* 30 */ 0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0, /* 3f */
   /* 40 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 4f */

gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch:
 solib.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

Index: gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch	20 Aug 2006 17:41:26 -0000	1.1.2.1
+++ gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch	24 Aug 2006 11:10:13 -0000	1.1.2.2
@@ -5,14 +5,11 @@
 libc++test4dl.so: Success.
 
 
-Index: solib.c
+Index: gdb-6.5/gdb/solib.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/solib.c,v
-retrieving revision 1.84
-diff -u -p -r1.84 solib.c
---- gdb/solib.c	25 Feb 2006 04:36:39 -0000	1.84
-+++ gdb/solib.c	21 Jul 2006 18:27:49 -0000
-@@ -146,13 +146,17 @@ solib_open (char *in_pathname, char **fo
+--- gdb-6.5.orig/gdb/solib.c	2006-08-24 02:55:23.000000000 -0300
++++ gdb-6.5/gdb/solib.c	2006-08-24 02:55:25.000000000 -0300
+@@ -150,13 +150,17 @@ solib_open (char *in_pathname, char **fo
    int found_file = -1;
    char *temp_pathname = NULL;
    char *p = in_pathname;
@@ -31,7 +28,7 @@
          temp_pathname = in_pathname;
        else
  	{
-@@ -208,14 +212,14 @@ solib_open (char *in_pathname, char **fo
+@@ -212,14 +216,14 @@ solib_open (char *in_pathname, char **fo
  					   &temp_pathname);
  
    /* If not found, next search the inferior's $PATH environment variable. */

gdb-6.3-bz182116-exec-from-pthread.patch:
 linux-thread-db.c |    9 +++++++++
 1 files changed, 9 insertions(+)

Index: gdb-6.3-bz182116-exec-from-pthread.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-bz182116-exec-from-pthread.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- gdb-6.3-bz182116-exec-from-pthread.patch	20 Aug 2006 17:41:26 -0000	1.1.2.1
+++ gdb-6.3-bz182116-exec-from-pthread.patch	24 Aug 2006 11:10:13 -0000	1.1.2.2
@@ -1,16 +1,12 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182116
 
 
-Index: linux-thread-db.c
+Index: gdb-6.5/gdb/linux-thread-db.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/linux-thread-db.c,v
-retrieving revision 1.17
-retrieving revision 1.18
-diff -u -p -r1.17 -r1.18
---- gdb/linux-thread-db.c	18 Jul 2006 22:53:20 -0000	1.17
-+++ gdb/linux-thread-db.c	24 Jul 2006 18:57:32 -0000	1.18
-@@ -875,6 +875,15 @@ thread_db_wait (ptid_t ptid, struct targ
-   if (ourstatus->kind == TARGET_WAITKIND_EXITED)
+--- gdb-6.5.orig/gdb/linux-thread-db.c	2006-08-24 02:55:24.000000000 -0300
++++ gdb-6.5/gdb/linux-thread-db.c	2006-08-24 02:56:16.000000000 -0300
+@@ -939,6 +939,15 @@ thread_db_wait (ptid_t ptid, struct targ
+       || ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
      return pid_to_ptid (-1);
  
 +  if (ourstatus->kind == TARGET_WAITKIND_EXECD)
@@ -23,5 +19,5 @@
 +    }
 +
    if (ourstatus->kind == TARGET_WAITKIND_STOPPED
-       && ourstatus->value.sig == TARGET_SIGNAL_TRAP)
-     /* Check for a thread event.  */
+       && (ourstatus->value.sig == TARGET_SIGNAL_TRAP
+           || ourstatus->value.sig == TARGET_SIGNAL_ILL))

gdb-6.3-bz193763-object-name-completion.patch:
 linespec.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: gdb-6.3-bz193763-object-name-completion.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-bz193763-object-name-completion.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- gdb-6.3-bz193763-object-name-completion.patch	20 Aug 2006 17:41:26 -0000	1.1.2.1
+++ gdb-6.3-bz193763-object-name-completion.patch	24 Aug 2006 11:10:13 -0000	1.1.2.2
@@ -1,10 +1,11 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=193763
 
 
-diff -u -r gdb-6.3-old/gdb/linespec.c gdb-6.3/gdb/linespec.c
---- gdb-6.3-old/gdb/linespec.c	2006-06-01 13:43:12.000000000 +0100
-+++ gdb-6.3/gdb/linespec.c	2006-06-01 13:44:14.000000000 +0100
-@@ -293,7 +293,7 @@
+Index: gdb-6.5/gdb/linespec.c
+===================================================================
+--- gdb-6.5.orig/gdb/linespec.c	2006-08-24 02:57:04.000000000 -0300
++++ gdb-6.5/gdb/linespec.c	2006-08-24 02:57:07.000000000 -0300
+@@ -295,7 +295,7 @@ add_minsym_members (const char *class_na
       This will give us a list of all the member names including
       the function signature.  */
    completion_name = xmalloc (strlen (class_name) +

gdb-6.5-bz195429-stale-threads-crash.patch:
 linux-thread-db.c |  230 ++++--------------------------------------------------
 1 files changed, 18 insertions(+), 212 deletions(-)

Index: gdb-6.5-bz195429-stale-threads-crash.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.5-bz195429-stale-threads-crash.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- gdb-6.5-bz195429-stale-threads-crash.patch	20 Aug 2006 17:41:36 -0000	1.1.2.1
+++ gdb-6.5-bz195429-stale-threads-crash.patch	24 Aug 2006 11:10:13 -0000	1.1.2.2
@@ -1,15 +1,11 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195429
 
 
-Index: linux-thread-db.c
+Index: gdb-6.5/gdb/linux-thread-db.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/linux-thread-db.c,v
-retrieving revision 1.16
-retrieving revision 1.17
-diff -u -p -r1.16 -r1.17
---- gdb/linux-thread-db.c	5 May 2006 22:42:43 -0000	1.16
-+++ gdb/linux-thread-db.c	18 Jul 2006 22:53:20 -0000	1.17
-@@ -105,14 +105,6 @@ static td_err_e (*td_ta_event_getmsg_p) 
+--- gdb-6.5.orig/gdb/linux-thread-db.c	2006-08-24 02:55:25.000000000 -0300
++++ gdb-6.5/gdb/linux-thread-db.c	2006-08-24 02:55:25.000000000 -0300
+@@ -106,14 +106,6 @@ static td_err_e (*td_ta_event_getmsg_p) 
  static td_err_e (*td_thr_validate_p) (const td_thrhandle_t *th);
  static td_err_e (*td_thr_get_info_p) (const td_thrhandle_t *th,
  				      td_thrinfo_t *infop);
@@ -24,7 +20,7 @@
  static td_err_e (*td_thr_event_enable_p) (const td_thrhandle_t *th,
  					  int event);
  
-@@ -220,31 +212,6 @@ thread_db_err_str (td_err_e err)
+@@ -221,31 +213,6 @@ thread_db_err_str (td_err_e err)
        return buf;
      }
  }
@@ -56,7 +52,7 @@
  
  /* A callback function for td_ta_thr_iter, which we use to map all
     threads to LWPs.
-@@ -330,27 +297,6 @@ thread_db_map_id2thr (struct thread_info
+@@ -331,27 +298,6 @@ thread_db_map_id2thr (struct thread_info
    else
      thread_info->private->th_valid = 1;
  }
@@ -84,7 +80,7 @@
  
  /* Convert between user-level thread ids and LWP ids.  */
  
-@@ -461,22 +407,6 @@ thread_db_load (void)
+@@ -462,22 +408,6 @@ thread_db_load (void)
    if (td_thr_get_info_p == NULL)
      return 0;
  
@@ -107,7 +103,7 @@
    /* Initialize the library.  */
    err = td_init_p ();
    if (err != TD_OK)
-@@ -991,81 +921,6 @@ thread_db_xfer_partial (struct target_op
+@@ -995,81 +925,6 @@ thread_db_xfer_partial (struct target_op
  }
  
  static void
@@ -189,7 +185,7 @@
  thread_db_kill (void)
  {
    /* There's no need to save & restore inferior_ptid here, since the
-@@ -1117,48 +972,6 @@ thread_db_mourn_inferior (void)
+@@ -1121,48 +976,6 @@ thread_db_mourn_inferior (void)
  }
  
  static int
@@ -238,7 +234,7 @@
  find_new_threads_callback (const td_thrhandle_t *th_p, void *data)
  {
    td_thrinfo_t ti;
-@@ -1200,32 +1013,15 @@ thread_db_pid_to_str (ptid_t ptid)
+@@ -1204,32 +1017,15 @@ thread_db_pid_to_str (ptid_t ptid)
    if (is_thread (ptid))
      {
        static char buf[64];
@@ -276,7 +272,7 @@
  
        return buf;
      }
-@@ -1236,6 +1032,18 @@ thread_db_pid_to_str (ptid_t ptid)
+@@ -1240,6 +1036,18 @@ thread_db_pid_to_str (ptid_t ptid)
    return normal_pid_to_str (ptid);
  }
  
@@ -295,7 +291,7 @@
  /* Get the address of the thread local variable in load module LM which
     is stored at OFFSET within the thread local storage for thread PTID.  */
  
-@@ -1306,20 +1114,18 @@ init_thread_db_ops (void)
+@@ -1310,20 +1118,18 @@ init_thread_db_ops (void)
    thread_db_ops.to_detach = thread_db_detach;
    thread_db_ops.to_resume = thread_db_resume;
    thread_db_ops.to_wait = thread_db_wait;

gdb-6.5-bz196439-valgrind-memcheck-compat.patch:
 dwarf2read.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Index: gdb-6.5-bz196439-valgrind-memcheck-compat.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.5-bz196439-valgrind-memcheck-compat.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- gdb-6.5-bz196439-valgrind-memcheck-compat.patch	20 Aug 2006 17:41:36 -0000	1.1.2.1
+++ gdb-6.5-bz196439-valgrind-memcheck-compat.patch	24 Aug 2006 11:10:13 -0000	1.1.2.2
@@ -1,15 +1,11 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196439
 
 
-Index: dwarf2read.c
+Index: gdb-6.5/gdb/dwarf2read.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/dwarf2read.c,v
-retrieving revision 1.199
-retrieving revision 1.200
-diff -u -p -r1.199 -r1.200
---- gdb/dwarf2read.c	14 Jun 2006 15:06:35 -0000	1.199
-+++ gdb/dwarf2read.c	12 Jul 2006 21:14:57 -0000	1.200
-@@ -9324,7 +9324,11 @@ static void
+--- gdb-6.5.orig/gdb/dwarf2read.c	2006-08-24 02:55:24.000000000 -0300
++++ gdb-6.5/gdb/dwarf2read.c	2006-08-24 02:55:25.000000000 -0300
+@@ -9317,7 +9317,11 @@ static void
  dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
  			     struct dwarf2_cu *cu)
  {

gdb-6.5-bz203661-emit-relocs.patch:
 symfile.c |    6 ++++++
 1 files changed, 6 insertions(+)

Index: gdb-6.5-bz203661-emit-relocs.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.5-bz203661-emit-relocs.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- gdb-6.5-bz203661-emit-relocs.patch	23 Aug 2006 09:29:33 -0000	1.1.2.1
+++ gdb-6.5-bz203661-emit-relocs.patch	24 Aug 2006 11:10:13 -0000	1.1.2.2
@@ -1,6 +1,8 @@
---- sources-clean/gdb/symfile.c	2006-08-23 09:22:21.000000000 +0200
-+++ sources-custom/gdb/symfile.c	2006-08-23 09:54:24.000000000 +0200
-@@ -3713,6 +3713,12 @@
+Index: gdb-6.5/gdb/symfile.c
+===================================================================
+--- gdb-6.5.orig/gdb/symfile.c	2006-08-24 02:56:02.000000000 -0300
++++ gdb-6.5/gdb/symfile.c	2006-08-24 02:56:36.000000000 -0300
+@@ -3739,6 +3739,12 @@ symfile_dummy_outputs (bfd *abfd, asecti
  bfd_byte *
  symfile_relocate_debug_section (bfd *abfd, asection *sectp, bfd_byte *buf)
  {


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.193.2.2
retrieving revision 1.193.2.3
diff -u -r1.193.2.2 -r1.193.2.3
--- gdb.spec	23 Aug 2006 09:29:33 -0000	1.193.2.2
+++ gdb.spec	24 Aug 2006 11:10:13 -0000	1.193.2.3
@@ -11,7 +11,7 @@
 Version: 6.5
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 3_jkratoch1%{?dist}
+Release: 5_jkratoch0%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -243,6 +243,9 @@
 # Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).
 Patch188: gdb-6.5-bz203661-emit-relocs.patch
 
+# Add support for memory nops on x86.
+Patch189: gdb-6.5-opcodes-i386-nopmem.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils
 
@@ -336,12 +339,13 @@
 %patch180 -p1
 %patch181 -p1
 %patch182 -p1
-%patch183 -p0
-%patch184 -p0
+%patch183 -p1
+%patch184 -p1
 %patch185 -p1
-%patch186 -p0
-%patch187 -p0
+%patch186 -p1
+%patch187 -p1
 %patch188 -p1
+%patch189 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -502,11 +506,12 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Wed Aug 23 2006 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.5-3_jkratoch1
-- Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).
-
-* Sun Aug 20 2006 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.5-3_jkratoch0
-- Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ 200048).
+* Thu Aug 24 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-5
+- Backport support for i386 nop memory instructions.
+- Fix debuginfo addresses resolving for --emit-relocs Linux kernels
+(BZ 203661, from Jan Kratochvil, like the remaining changes).
+- Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ
+200048).
 - Do not step into the PPC solib trampolines (BZ 200533).
 - Fix exec() from threaded program, partial CVS backport (BZ 182116).
 - Fix occasional failure to load shared libraries (BZ 146810).



From fedora-cvs-commits at redhat.com  Thu Aug 24 11:40:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 07:40:22 -0400
Subject: rpms/cups/devel cups-lspp.patch,1.4,1.5 cups.spec,1.252,1.253
Message-ID: <200608241140.k7OBeMwt022665@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22595

Modified Files:
	cups-lspp.patch cups.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-16
- Fixed another LSPP patch problem noted by Erwin Rol.


cups-lspp.patch:
 Makedefs.in                     |    2 
 config-scripts/cups-lspp.m4     |   36 +++++
 config.h.in                     |    7 +
 configure.in                    |    2 
 cups-1.2.2/scheduler/printers.c |   44 ++++++
 cups/cups.h                     |    8 +
 data/Makefile                   |    5 
 data/mls                        |  277 ++++++++++++++++++++++++++++++++++++++++
 data/selinux                    |  277 ++++++++++++++++++++++++++++++++++++++++
 data/te                         |  277 ++++++++++++++++++++++++++++++++++++++++
 scheduler/Makefile              |    6 
 scheduler/client.c              |  101 ++++++++++++++
 scheduler/client.h              |   14 ++
 scheduler/conf.c                |   46 ++++++
 scheduler/conf.h                |    8 +
 scheduler/ipp.c                 |  271 +++++++++++++++++++++++++++++++++++++++
 scheduler/job.c                 |  155 ++++++++++++++++++++++
 scheduler/job.h                 |   11 +
 scheduler/lspp-access.c         |   56 ++++++++
 scheduler/main.c                |   32 ++++
 20 files changed, 1629 insertions(+), 6 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-lspp.patch	24 Aug 2006 09:50:28 -0000	1.4
+++ cups-lspp.patch	24 Aug 2006 11:40:19 -0000	1.5
@@ -2058,8 +2058,8 @@
  	-$(RMDIR) $(STATEDIR)/certs
  	-$(RMDIR) $(STATEDIR)
  	-$(RMDIR) $(SERVERROOT)/ppd
---- cups-1.2.2-8/scheduler/printers.c	2006-08-10 11:43:02.000000000 -0400
-+++ cups-1.2.2/scheduler/printers.c	2006-08-14 06:09:33.000000000 -0400
+--- cups-1.2.2/scheduler/printers.c.lspp	2006-08-24 12:28:38.000000000 +0100
++++ cups-1.2.2/scheduler/printers.c	2006-08-24 12:30:49.000000000 +0100
 @@ -57,6 +57,8 @@
   *                                 printing desktop tools.
   */
@@ -2094,7 +2094,7 @@
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1578,6 +1591,38 @@
+@@ -1579,6 +1592,37 @@
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }
@@ -2112,12 +2112,11 @@
 +            cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context");
 +        else
 +          printercon = context_new(devcon);
-+
-+        if (context_range_get(printercon))
-+          rangestr = strdup(context_range_get(printercon));
 +      }
 +
-+      if (rangestr == NULL)
++      if (printercon && context_range_get(printercon))
++	rangestr = strdup(context_range_get(printercon));
++      else
 +        rangestr = strdup("unknown");
 +
 +      cupsdSetStringf(&audit_message, "[Config] printer=%s uri=%s banners set to %s %s has range %s",


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- cups.spec	24 Aug 2006 09:50:28 -0000	1.252
+++ cups.spec	24 Aug 2006 11:40:19 -0000	1.253
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 15
+Release: 16
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -420,6 +420,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-16
+- Fixed another LSPP patch problem noted by Erwin Rol.
+
 * Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-15
 - Fixed LSPP patch passing NULL to strcmp (bug #203784).
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 11:42:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 07:42:37 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.857,1.858
Message-ID: <200608241142.k7OBgbqX023243@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23163

Modified Files:
	openoffice.org.spec 
Log Message:
push 2.0.4


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.857
retrieving revision 1.858
diff -u -r1.857 -r1.858
--- openoffice.org.spec	23 Aug 2006 09:40:33 -0000	1.857
+++ openoffice.org.spec	24 Aug 2006 11:42:34 -0000	1.858
@@ -2507,7 +2507,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Tue Aug 22 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.3
+* Thu Aug 24 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.3
 - fix openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 - fix openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
 - fix openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch



From fedora-cvs-commits at redhat.com  Thu Aug 24 11:55:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 07:55:30 -0400
Subject: rpms/kexec-tools/devel kcp.c, 1.2, 1.3 kexec-tools.spec, 1.58,
	1.59 mkdumprd, 1.3, 1.4
Message-ID: <200608241155.k7OBtUXs010690@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10666

Modified Files:
	kcp.c kexec-tools.spec mkdumprd 
Log Message:
updating kexec-tools with new kcp utiltiy


Index: kcp.c
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kcp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kcp.c	20 Jul 2006 03:36:18 -0000	1.2
+++ kcp.c	24 Aug 2006 11:55:28 -0000	1.3
@@ -30,36 +30,6 @@
 #include <strings.h>
 #include <string.h>
 
-#define BLOCK_SIZE 512
-#define SSH_TMP ".kcp-ssh"
-
-/* simple copy routine to copy src to dst */
-int copy_core(const char *src, const char *dst)
-{
-	int bytes, total=0;
-	int fd_dst, fd_src;
-	char buf[BLOCK_SIZE];
-
-	if ((fd_dst=open(dst,O_RDWR|O_CREAT, 0755)) < 0) 	
-		return -1;
-	if ((fd_src=open(src,O_RDONLY)) < 0) 		
-		return -1;
-
-	while ((bytes=read(fd_src,buf,BLOCK_SIZE)) > 0) {
-		if ((bytes=write(fd_dst,buf,bytes)) < 0) 
-			break;
-		total+=bytes;
-	}
-	if (bytes < 0) 
-		return -1;
-
-	close(fd_dst);
-	close(fd_src);
-
-	printf("Total bytes written: %d\n", total);
-	return total;
-}
-
 /* grab the local time and replace the %DATE var with it */
 char * xlate_time(const char *dst)
 {
@@ -101,8 +71,8 @@
 {
 
 	printf("usage: kcp source dest\n");
-	printf("       kcp --ssh dest (first time)\n");
-	printf("       kcp --ssh src (second time)\n");
+	printf("       kcp --ssh src user at host:/dst\n");
+	printf("       kcp --local src dst\n");
 	printf("Will translate any %%DATE command properly\n");
 	printf("in the 'dest' variable\n");
 	exit(rc);
@@ -110,95 +80,103 @@
 
 int main(int argc, char *argv[])
 {
-	char *src,*dst, *new_dst, *top;
-	char path[256];
+	char *src, *dst, *new_dst, *ptr;
+	char *path;
 	int using_ssh=0;
 	char *login;
+	int status;
+	pid_t child;
 
-	if (argc < 3)
+	if (argc < 4)
 		usage(1);
 
-	if (!strncmp(argv[1], "--ssh", 5))
-		using_ssh=1;
-	else
-		src=argv[1];
-
-	dst=argv[2];
-
+	src = argv[2];
+	dst = argv[3];
 	if ((new_dst=xlate_time(dst)) == NULL){
 		printf("Failed to translate time\n");
 		exit(1);
 	}
-	top=new_dst;
-	
-	//Hack for ssh because nash doesn't support variables
-	//The idea here is to save the translated date to a file to 
-	//be read back later for scp
-	if (using_ssh){
-		int fd_dst, x;
 
-		if ((fd_dst=open(SSH_TMP, O_RDWR|O_CREAT, 0755)) < 0){
-			perror("Failed to open SSH_TMP: ");
-			exit(1);
-		}
-		if ((x=read(fd_dst, path, BLOCK_SIZE)) > 0){
-			//second time around
-			src=dst;
-			path[x]='\0';
-			close(fd_dst);
-			remove(SSH_TMP);
-			execlp("scp", "scp", "-q", "-o", "BatchMode=yes", "-o", 
-				"StrictHostKeyChecking=no", src, path, NULL);
-			//should never return!!
-			perror("Failed to scp: ");
-			exit(1);
-		}
-		//save data for next run of this program
-		printf("writing <%s> to file %s\n",top, SSH_TMP);
-		if ((write(fd_dst, top, strlen(top))) < 0){
-			perror("Failed to write to SSH_TMP: ");
-			exit(1);
-		}
-		close(fd_dst);
-
-		//save the login info
-		login=top;
-		if ((top=index(login, ':')) == NULL){
-			printf("Bad ssh format %s\n", path);
-			exit(1);
-		}
-		*top++='\0';
-	}
-
-	//find the directory portion and separate it from the file
-	if ((new_dst=rindex(top, '/')) == NULL){
-		new_dst=top;  //strange but okay, only the file passed in
-		sprintf(path,"%s",new_dst);
-	}else{
-		*new_dst='\0';
-		new_dst++;
-
-		//finish the ssh hack by running mkdir
-		if (using_ssh){
-			execlp("ssh", "ssh", "-q", "-o", "BatchMode=yes", "-o",
-                               "StrictHostKeyChecking=no", login, "mkdir", "-p", 
-				top, NULL);
-			//should never return!!
-			perror("Failed to ssh: ");
-			exit(1);
-		}
-		//make the new directory
-		if ((mkdir(top, 0777)) != 0){
-			perror("mkdir failed: ");
+	if (!strcmp(argv[1], "--ssh"))
+		using_ssh =1;
+	
+	/*
+	 * Now that we have called xlate_time, new_dst
+	 * holds the expanded ssh destination
+	 */
+	if (using_ssh) {
+		login=strdup(new_dst);
+		ptr=index(login, ':');
+		*ptr++='\0';
+		path = ptr;
+	} else {
+		login = NULL;
+		path = new_dst;
+	}
+
+	/*
+	 *this makes our target directory
+	 */
+	if ((child = fork()) == 0) {
+		/*
+		 * child
+		 */
+		if (using_ssh) {
+			if (execlp("ssh", "ssh", "-q", "-o", "BatchMode=yes", "-o",
+				"StrictHostKeyChecking=no", login, "mkdir", "-p",
+				path, NULL) < 0) {
+				perror("Failed to run ssh");
+				exit(1);
+			}
+		} else {
+			if (execlp("mkdir", "mkdir", "-p", path, NULL) < 0) {
+				perror("Failed to run mkdir");
+				exit(1);
+			}
+		}
+	} else {
+		/*
+		 * parent
+		 */
+		if (child < 0) {
+			perror("Could not fork");
+			exit(1);
+		}
+		wait(&status);
+		if (WEXITSTATUS(status) != 0) {
+			printf ("%s exited abnormally: error = %d\n",
+				using_ssh ? "ssh":"mkdir", WEXITSTATUS(status));
+			exit(1);  
+		}
+
+	}
+
+	/*
+	 * now that we have our directory, lets copy everything over
+	 * Note that scp can be used for local copies as well
+	 */
+	if ((child = fork()) == 0) {
+		/*need to include login info if scp to remote host*/
+		if (using_ssh)
+			path=new_dst; 
+			src, path;
+		if (execlp("scp", "scp", "-q", "-o", "BatchMode=yes", "-o",
+			"StrictHostKeyChecking=no", src, path, NULL) < 0) {
+			perror("Failed to run scp\n");
+			exit(1);
+		}
+	} else {
+		if (child < 0) {
+			perror("Could not fork");
+			exit(1);
+		}
+		wait(&status);
+		if (WEXITSTATUS(status) != 0) {
+			printf("scp exited abnormally: error = %d\n",
+				WEXITSTATUS(status));
 			exit(1);
 		}
-		sprintf(path,"%s/%s",top,new_dst);
 	}
-
-	if (copy_core(src,path) < 0){
-		perror("Failed to write core file: ");
-		exit(1);
-	}
-
-	return 0;
+	
+	exit(0);	
 }


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kexec-tools.spec	23 Aug 2006 20:27:56 -0000	1.58
+++ kexec-tools.spec	24 Aug 2006 11:55:28 -0000	1.59
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 48%{?dist}
+Release: 49%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -157,7 +157,11 @@
 %doc TODO
 
 %changelog
-* Wed Aug 23 2006 Neil Horman <nhorman at redhat.com> - 1.101-47%{dist}
+* Thu Aug 24 2006 Neil Horman <nhorman at redhat.com> - 1.101-49%{dist}
+- rewriting kcp to properly do ssh and scp
+- updating mkdumprd to use new kcp syntax
+
+* Wed Aug 23 2006 Neil Horman <nhorman at redhat.com> - 1.101-48%{dist}
 - Bumping revision number 
 
 * Tue Aug 22 2006 Jarod Wilson <jwilson at redhat.com> - 1.101-47%{dist}


Index: mkdumprd
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mkdumprd	18 Aug 2006 17:00:45 -0000	1.3
+++ mkdumprd	24 Aug 2006 11:55:28 -0000	1.4
@@ -1093,7 +1093,7 @@
                         #setup nfs case
                         mkdir -p $MNTIMAGE/mnt
                         emit "mount -t nfs -o nolock $rlocation /mnt"
-                        emit "cond kcp /proc/vmcore /mnt/var/crash/$lhost-%DATE/vmcore"
+                        emit "cond kcp --local /proc/vmcore /mnt/var/crash/$lhost-%DATE/vmcore"
                         emit "cond reboot -h -f"
                     else
                         #SSH path
@@ -1123,8 +1123,7 @@
                             emit "mknod /dev/urandom c 1 9"
                         fi
                         emit "dd if=/dev/mem of=/dev/urandom count=1 bs=512 skip=100" 
-                        emit "cond kcp --ssh $rlocation:/var/crash/$lhost-%DATE/vmcore"
-                        emit "cond kcp --ssh /proc/vmcore"
+                        emit "cond kcp --ssh /proc/vmcore $rlocation:/var/crash/$lhost-%DATE/vmcore"
                         emit "cond reboot -h -f"
                         bin="$bin /usr/bin/scp /usr/bin/ssh /bin/dd"
                         
@@ -1157,7 +1156,7 @@
                     emit "echo Saving to the local filesystem $location"
                     emit "fsck.$type $location"
                     emit "cond mount -t $type $location /mnt"
-                    emit "cond kcp /proc/vmcore /mnt/var/crash/$lhost-%DATE/vmcore"
+                    emit "cond kcp --local /proc/vmcore /mnt/var/crash/$lhost-%DATE/vmcore"
                     emit "cond umount /mnt"
                     emit "cond reboot -h -f"
                     bin="$bin /sbin/fsck.$type /bin/mount"



From fedora-cvs-commits at redhat.com  Thu Aug 24 12:10:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 08:10:20 -0400
Subject: rpms/kernel/devel linux-2.6-gfs2-dlm.patch,1.14,1.15
Message-ID: <200608241210.k7OCAKNp023100@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23081

Modified Files:
	linux-2.6-gfs2-dlm.patch 
Log Message:
Update GFS2 patch

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   21 
 fs/dlm/Makefile                    |   19 
 fs/dlm/ast.c                       |  173 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 +++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  387 +++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  543 +++++
 fs/dlm/lock.c                      | 3869 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   62 
 fs/dlm/lockspace.c                 |  716 ++++++
 fs/dlm/lockspace.h                 |   25 
 fs/dlm/lowcomms.c                  | 1238 +++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   97 
 fs/dlm/member.c                    |  327 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  116 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  472 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  765 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  286 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/user.c                      |  785 +++++++
 fs/dlm/user.h                      |   16 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 ++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1236 +++++++++++
 fs/gfs2/bmap.h                     |   27 
 fs/gfs2/daemon.c                   |  196 +
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1976 ++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++
 fs/gfs2/eattr.h                    |   97 
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2282 +++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  564 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  659 ++++++
 fs/gfs2/inode.c                    | 1344 ++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  290 ++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  302 ++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 +++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 +++++++
 fs/gfs2/lops.h                     |   96 
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  779 +++++++
 fs/gfs2/meta_io.h                  |   74 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  308 ++
 fs/gfs2/ops_address.c              |  795 +++++++
 fs/gfs2/ops_address.h              |   18 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  293 ++
 fs/gfs2/ops_export.h               |   19 
 fs/gfs2/ops_file.c                 |  812 +++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  840 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1165 +++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  469 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  188 +
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/quota.c                    | 1286 ++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  573 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1525 ++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  979 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 +++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/Kbuild               |   33 
 include/linux/dlm.h                |  302 ++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  443 ++++
 include/linux/iflags.h             |  102 
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   41 
 mm/filemap.c                       |    3 
 mm/readahead.c                     |    1 
 131 files changed, 40693 insertions(+), 21 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-gfs2-dlm.patch	11 Aug 2006 22:22:53 -0000	1.14
+++ linux-2.6-gfs2-dlm.patch	24 Aug 2006 12:10:17 -0000	1.15
@@ -106,7 +106,7 @@
 index 3f00a9f..ddc7462 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -323,6 +323,7 @@ config FS_POSIX_ACL
+@@ -323,6 +323,7 @@ #
  	default n
  
  source "fs/xfs/Kconfig"
@@ -203,10 +203,10 @@
 +
 diff --git a/fs/dlm/ast.c b/fs/dlm/ast.c
 new file mode 100644
-index 0000000..a211330
+index 0000000..f91d39c
 --- /dev/null
 +++ b/fs/dlm/ast.c
-@@ -0,0 +1,172 @@
+@@ -0,0 +1,173 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -247,6 +247,7 @@
 +		dlm_user_add_ast(lkb, type);
 +		return;
 +	}
++	DLM_ASSERT(lkb->lkb_astaddr != DLM_FAKE_USER_AST, dlm_print_lkb(lkb););
 +
 +	spin_lock(&ast_queue_lock);
 +	if (!(lkb->lkb_ast_type & (AST_COMP | AST_BAST))) {
@@ -2114,10 +2115,10 @@
 +
 diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
 new file mode 100644
-index 0000000..da75099
+index 0000000..1e5cd67
 --- /dev/null
 +++ b/fs/dlm/dlm_internal.h
-@@ -0,0 +1,541 @@
+@@ -0,0 +1,543 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -2211,6 +2212,8 @@
 +  } \
 +}
 +
++#define DLM_FAKE_USER_AST ERR_PTR(-EINVAL)
++
 +
 +struct dlm_direntry {
 +	struct list_head	list;
@@ -2661,10 +2664,10 @@
 +
 diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
 new file mode 100644
-index 0000000..bb2e351
+index 0000000..67247f0
 --- /dev/null
 +++ b/fs/dlm/lock.c
-@@ -0,0 +1,3846 @@
+@@ -0,0 +1,3869 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -2753,8 +2756,6 @@
 +				    struct dlm_message *ms);
 +static int receive_extralen(struct dlm_message *ms);
 +
-+#define FAKE_USER_AST (void*)0xff00ff00
-+
 +/*
 + * Lock compatibilty matrix - thanks Steve
 + * UN = Unlocked state. Not really a state, used as a flag
@@ -2838,6 +2839,28 @@
 +	       r->res_recover_locks_count, r->res_name);
 +}
 +
++void dlm_dump_rsb(struct dlm_rsb *r)
++{
++	struct dlm_lkb *lkb;
++
++	dlm_print_rsb(r);
++
++	printk(KERN_ERR "rsb: root_list empty %d recover_list empty %d\n",
++	       list_empty(&r->res_root_list), list_empty(&r->res_recover_list));
++	printk(KERN_ERR "rsb lookup list\n");
++	list_for_each_entry(lkb, &r->res_lookup, lkb_rsb_lookup)
++		dlm_print_lkb(lkb);
++	printk(KERN_ERR "rsb grant queue:\n");
++	list_for_each_entry(lkb, &r->res_grantqueue, lkb_statequeue)
++		dlm_print_lkb(lkb);
++	printk(KERN_ERR "rsb convert queue:\n");
++	list_for_each_entry(lkb, &r->res_convertqueue, lkb_statequeue)
++		dlm_print_lkb(lkb);
++	printk(KERN_ERR "rsb wait queue:\n");
++	list_for_each_entry(lkb, &r->res_waitqueue, lkb_statequeue)
++		dlm_print_lkb(lkb);
++}
++
 +/* Threads cannot use the lockspace while it's being recovered */
 +
 +static inline void lock_recovery(struct dlm_ls *ls)
@@ -3145,7 +3168,7 @@
 +{
 +	int rv;
 +	rv = kref_put(&r->res_ref, toss_rsb);
-+	DLM_ASSERT(!rv, dlm_print_rsb(r););
++	DLM_ASSERT(!rv, dlm_dump_rsb(r););
 +}
 +
 +static void kill_rsb(struct kref *kref)
@@ -3155,12 +3178,12 @@
 +	/* All work is done after the return from kref_put() so we
 +	   can release the write_lock before the remove and free. */
 +
-+	DLM_ASSERT(list_empty(&r->res_lookup),);
-+	DLM_ASSERT(list_empty(&r->res_grantqueue),);
-+	DLM_ASSERT(list_empty(&r->res_convertqueue),);
-+	DLM_ASSERT(list_empty(&r->res_waitqueue),);
-+	DLM_ASSERT(list_empty(&r->res_root_list),);
-+	DLM_ASSERT(list_empty(&r->res_recover_list),);
++	DLM_ASSERT(list_empty(&r->res_lookup), dlm_dump_rsb(r););
++	DLM_ASSERT(list_empty(&r->res_grantqueue), dlm_dump_rsb(r););
++	DLM_ASSERT(list_empty(&r->res_convertqueue), dlm_dump_rsb(r););
++	DLM_ASSERT(list_empty(&r->res_waitqueue), dlm_dump_rsb(r););
++	DLM_ASSERT(list_empty(&r->res_root_list), dlm_dump_rsb(r););
++	DLM_ASSERT(list_empty(&r->res_recover_list), dlm_dump_rsb(r););
 +}
 +
 +/* Attaching/detaching lkb's from rsb's is for rsb reference counting.
@@ -4003,7 +4026,7 @@
 +	struct dlm_lkb *lkb, *s;
 +	int high = DLM_LOCK_IV;
 +
-+	DLM_ASSERT(is_master(r), dlm_print_rsb(r););
++	DLM_ASSERT(is_master(r), dlm_dump_rsb(r););
 +
 +	high = grant_pending_convert(r, high);
 +	high = grant_pending_wait(r, high);
@@ -4098,7 +4121,7 @@
 +		return 0;
 +	}
 +
-+	DLM_ASSERT(r->res_nodeid == -1, dlm_print_rsb(r););
++	DLM_ASSERT(r->res_nodeid == -1, dlm_dump_rsb(r););
 +
 +	dir_nodeid = dlm_dir_nodeid(r);
 +
@@ -4840,6 +4863,7 @@
 +	if (!error && down_conversion(lkb)) {
 +		remove_from_waiters(lkb);
 +		r->res_ls->ls_stub_ms.m_result = 0;
++		r->res_ls->ls_stub_ms.m_flags = lkb->lkb_flags;
 +		__receive_convert_reply(r, lkb, &r->res_ls->ls_stub_ms);
 +	}
 +
@@ -6260,7 +6284,7 @@
 +	   lock and that lkb_astparam is the dlm_user_args structure. */
 +
 +	error = set_lock_args(mode, &ua->lksb, flags, namelen, parent_lkid,
-+			      FAKE_USER_AST, ua, FAKE_USER_AST, &args);
++			      DLM_FAKE_USER_AST, ua, DLM_FAKE_USER_AST, &args);
 +	lkb->lkb_flags |= DLM_IFL_USER;
 +	ua->old_mode = DLM_LOCK_IV;
 +
@@ -6328,10 +6352,11 @@
 +	ua->castaddr = ua_tmp->castaddr;
 +	ua->bastparam = ua_tmp->bastparam;
 +	ua->bastaddr = ua_tmp->bastaddr;
++	ua->user_lksb = ua_tmp->user_lksb;
 +	ua->old_mode = lkb->lkb_grmode;
 +
-+	error = set_lock_args(mode, &ua->lksb, flags, 0, 0, FAKE_USER_AST, ua,
-+			      FAKE_USER_AST, &args);
++	error = set_lock_args(mode, &ua->lksb, flags, 0, 0, DLM_FAKE_USER_AST,
++			      ua, DLM_FAKE_USER_AST, &args);
 +	if (error)
 +		goto out_put;
 +
@@ -6409,6 +6434,7 @@
 +
 +	ua = (struct dlm_user_args *)lkb->lkb_astparam;
 +	ua->castparam = ua_tmp->castparam;
++	ua->user_lksb = ua_tmp->user_lksb;
 +
 +	error = set_unlock_args(flags, ua, &args);
 +	if (error)
@@ -6513,10 +6539,10 @@
 +}
 diff --git a/fs/dlm/lock.h b/fs/dlm/lock.h
 new file mode 100644
-index 0000000..8d2660f
+index 0000000..0843a30
 --- /dev/null
 +++ b/fs/dlm/lock.h
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,62 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -6533,6 +6559,7 @@
 +#define __LOCK_DOT_H__
 +
 +void dlm_print_rsb(struct dlm_rsb *r);
++void dlm_dump_rsb(struct dlm_rsb *r);
 +void dlm_print_lkb(struct dlm_lkb *lkb);
 +int dlm_receive_message(struct dlm_header *hd, int nodeid, int recovery);
 +int dlm_modes_compat(int mode1, int mode2);
@@ -9429,10 +9456,10 @@
 +
 diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
 new file mode 100644
-index 0000000..64ba492
+index 0000000..518239a
 --- /dev/null
 +++ b/fs/dlm/rcom.c
-@@ -0,0 +1,471 @@
+@@ -0,0 +1,472 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -9823,6 +9850,7 @@
 +	rc->rc_header.h_cmd = DLM_RCOM;
 +
 +	rc->rc_type = DLM_RCOM_STATUS_REPLY;
++	rc->rc_id = rc_in->rc_id;
 +	rc->rc_result = -ESRCH;
 +
 +	dlm_rcom_out(rc);
@@ -9936,10 +9964,10 @@
 +
 diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c
 new file mode 100644
-index 0000000..1a86dfc
+index 0000000..a5e6d18
 --- /dev/null
 +++ b/fs/dlm/recover.c
-@@ -0,0 +1,776 @@
+@@ -0,0 +1,765 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -10415,24 +10443,13 @@
 +	return error;
 +}
 +
-+static int all_queues_empty(struct dlm_rsb *r)
-+{
-+	if (!list_empty(&r->res_grantqueue) ||
-+	    !list_empty(&r->res_convertqueue) ||
-+	    !list_empty(&r->res_waitqueue))
-+		return 0;
-+	return 1;
-+}
-+
 +static int recover_locks(struct dlm_rsb *r)
 +{
 +	int error = 0;
 +
 +	lock_rsb(r);
-+	if (all_queues_empty(r))
-+		goto out;
 +
-+	DLM_ASSERT(!r->res_recover_locks_count, dlm_print_rsb(r););
++	DLM_ASSERT(!r->res_recover_locks_count, dlm_dump_rsb(r););
 +
 +	error = recover_locks_queue(r, &r->res_grantqueue);
 +	if (error)
@@ -10499,7 +10516,7 @@
 +
 +void dlm_recovered_lock(struct dlm_rsb *r)
 +{
-+	DLM_ASSERT(rsb_flag(r, RSB_NEW_MASTER), dlm_print_rsb(r););
++	DLM_ASSERT(rsb_flag(r, RSB_NEW_MASTER), dlm_dump_rsb(r););
 +
 +	r->res_recover_locks_count--;
 +	if (!r->res_recover_locks_count) {
@@ -27135,7 +27152,7 @@
 +#endif /* __LOG_DOT_H__ */
 diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
 new file mode 100644
-index 0000000..af03bf3
+index 0000000..08de8b7
 --- /dev/null
 +++ b/fs/gfs2/lops.c
 @@ -0,0 +1,800 @@
@@ -27605,7 +27622,7 @@
 +	struct gfs2_inode *ip = GFS2_I(mapping->host);
 +
 +	tr->tr_touched = 1;
-+	if (!list_empty(&bd->bd_list_tr) &&
++	if (list_empty(&bd->bd_list_tr) &&
 +	    (ip->i_di.di_flags & GFS2_DIF_JDATA)) {
 +		tr->tr_num_buf++;
 +		list_add(&bd->bd_list_tr, &tr->tr_list_buf);
@@ -27614,7 +27631,7 @@
 +	}
 +	gfs2_trans_add_gl(bd->bd_gl);
 +	gfs2_log_lock(sdp);
-+	if (!list_empty(&le->le_list)) {
++	if (list_empty(&le->le_list)) {
 +		if (ip->i_di.di_flags & GFS2_DIF_JDATA)
 +			sdp->sd_log_num_jdata++;
 +		sdp->sd_log_num_databuf++;
@@ -27779,12 +27796,12 @@
 +		gfs2_log_lock(sdp);
 +		bd1 = list_entry(started.next, struct gfs2_bufdata,
 +				 bd_le.le_list);
-+		list_del(&bd1->bd_le.le_list);
++		list_del_init(&bd1->bd_le.le_list);
 +		sdp->sd_log_num_databuf--;
-+
 +		bh = bd1->bd_bh;
 +		if (bh) {
 +			bh->b_private = NULL;
++			get_bh(bh);
 +			gfs2_log_unlock(sdp);
 +			wait_on_buffer(bh);
 +			brelse(bh);
@@ -27878,7 +27895,7 @@
 +
 +	while (!list_empty(head)) {
 +		bd = list_entry(head->next, struct gfs2_bufdata, bd_le.le_list);
-+		list_del(&bd->bd_le.le_list);
++		list_del_init(&bd->bd_le.le_list);
 +		sdp->sd_log_num_databuf--;
 +		sdp->sd_log_num_jdata--;
 +		gfs2_unpin(sdp, bd->bd_bh, ai);
@@ -28252,10 +28269,10 @@
 +
 diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
 new file mode 100644
-index 0000000..42dfd32
+index 0000000..502864b
 --- /dev/null
 +++ b/fs/gfs2/meta_io.c
-@@ -0,0 +1,780 @@
+@@ -0,0 +1,779 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -28722,7 +28739,6 @@
 +		lops_init_le(&bd->bd_le, &gfs2_buf_lops);
 +	} else {
 +		lops_init_le(&bd->bd_le, &gfs2_databuf_lops);
-+		get_bh(bh);
 +	}
 +	bh->b_private = bd;
 +
@@ -29673,10 +29689,10 @@
 +
 diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
 new file mode 100644
-index 0000000..45afd05
+index 0000000..4c59cb1
 --- /dev/null
 +++ b/fs/gfs2/ops_address.c
-@@ -0,0 +1,797 @@
+@@ -0,0 +1,795 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -30260,10 +30276,8 @@
 +	if (bd) {
 +		bd->bd_bh = NULL;
 +		bh->b_private = NULL;
-+		gfs2_log_unlock(sdp);
-+		brelse(bh);
-+	} else
-+		gfs2_log_unlock(sdp);
++	}
++	gfs2_log_unlock(sdp);
 +
 +	lock_buffer(bh);
 +	clear_buffer_dirty(bh);
@@ -30277,7 +30291,7 @@
 +
 +static void gfs2_invalidatepage(struct page *page, unsigned long offset)
 +{
-+	struct gfs2_sbd *sdp = page->mapping->host->i_sb->s_fs_info;
++	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
 +	struct buffer_head *head, *bh, *next;
 +	unsigned int curr_off = 0;
 +
@@ -33881,10 +33895,10 @@
 +#endif /* __OPS_INODE_DOT_H__ */
 diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
 new file mode 100644
-index 0000000..730c722
+index 0000000..2e392c9
 --- /dev/null
 +++ b/fs/gfs2/ops_super.c
-@@ -0,0 +1,471 @@
+@@ -0,0 +1,469 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -34103,8 +34117,6 @@
 +	if (error)
 +		return error;
 +
-+	memset(buf, 0, sizeof(struct kstatfs));
-+
 +	buf->f_type = GFS2_MAGIC;
 +	buf->f_bsize = sdp->sd_sb.sb_bsize;
 +	buf->f_blocks = sc.sc_total;
@@ -36542,10 +36554,10 @@
 +
 diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
 new file mode 100644
-index 0000000..4e0357d
+index 0000000..84fcc1b
 --- /dev/null
 +++ b/fs/gfs2/rgrp.c
-@@ -0,0 +1,1528 @@
+@@ -0,0 +1,1525 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -37405,8 +37417,7 @@
 +		if (sdp->sd_rgrps >= journals)
 +			rg = sdp->sd_rgrps * sdp->sd_jdesc->jd_jid / journals;
 +
-+		for (x = 0, rgd = gfs2_rgrpd_get_first(sdp);
-+		     x < rg;
++		for (x = 0, rgd = gfs2_rgrpd_get_first(sdp); x < rg;
 +		     x++, rgd = gfs2_rgrpd_get_next(rgd))
 +			/* Do Nothing */;
 +
@@ -37457,9 +37468,8 @@
 +	rgd = recent_rgrp_first(sdp, ip->i_last_rg_alloc);
 +
 +	while (rgd) {
-+		error = gfs2_glock_nq_init(rgd->rd_gl,
-+					  LM_ST_EXCLUSIVE, LM_FLAG_TRY,
-+					  &al->al_rgd_gh);
++		error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 
++					   LM_FLAG_TRY, &al->al_rgd_gh);
 +		switch (error) {
 +		case 0:
 +			if (try_rgrp_fit(rgd, al))
@@ -37482,8 +37492,7 @@
 +	begin = rgd = forward_rgrp_get(sdp);
 +
 +	for (;;) {
-+		error = gfs2_glock_nq_init(rgd->rd_gl,
-+					  LM_ST_EXCLUSIVE, flags,
++		error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, flags,
 +					  &al->al_rgd_gh);
 +		switch (error) {
 +		case 0:
@@ -41489,7 +41498,7 @@
 index 181c69c..06c2768 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -32,6 +32,7 @@ extern const char linux_banner[];
+@@ -32,6 +32,7 @@ #define STACK_MAGIC	0xdeadbeef
  
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))



From fedora-cvs-commits at redhat.com  Thu Aug 24 12:18:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 08:18:04 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch, 1.2, 1.3
Message-ID: <200608241218.k7OCI43t005930@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5916

Modified Files:
	openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch 
Log Message:
fix patch prefix

openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch:
 inc/outdev.h             |    3 +--
 source/gdi/outdev3.cxx   |   42 +++++++++++++++++++++++-------------------
 source/gdi/sallayout.cxx |    2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

Index: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch	23 Aug 2006 10:58:28 -0000	1.2
+++ openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch	24 Aug 2006 12:18:01 -0000	1.3
@@ -1,6 +1,6 @@
 diff -ru vcl.orig/inc/outdev.h vcl/inc/outdev.h
---- vcl.orig/inc/outdev.h	2006-08-23 10:05:16.000000000 +0100
-+++ vcl/inc/outdev.h	2006-08-23 10:13:54.000000000 +0100
+--- openoffice.org.orig/vcl/inc/outdev.h	2006-08-23 10:05:16.000000000 +0100
++++ openoffice.org/vcl/inc/outdev.h	2006-08-23 10:13:54.000000000 +0100
 @@ -213,8 +213,7 @@
                               const Font& rFont, const Size& rSize, ImplFontSubstEntry* pDevSpecific );
      ImplFontEntry*      GetFallback( ImplDevFontList* pFontList,
@@ -12,8 +12,8 @@
      void                Invalidate();
  };
 diff -ru vcl.orig/source/gdi/outdev3.cxx vcl/source/gdi/outdev3.cxx
---- vcl.orig/source/gdi/outdev3.cxx	2006-08-23 10:05:02.000000000 +0100
-+++ vcl/source/gdi/outdev3.cxx	2006-08-23 10:28:30.000000000 +0100
+--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx	2006-08-23 10:05:02.000000000 +0100
++++ openoffice.org/vcl/source/gdi/outdev3.cxx	2006-08-23 10:28:30.000000000 +0100
 @@ -3128,7 +3128,7 @@
  
  ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList,
@@ -105,8 +105,8 @@
          pSalLayout = pMultiSalLayout;
  
 diff -ru vcl.orig/source/gdi/sallayout.cxx vcl/source/gdi/sallayout.cxx
---- vcl.orig/source/gdi/sallayout.cxx	2006-08-23 10:05:02.000000000 +0100
-+++ vcl/source/gdi/sallayout.cxx	2006-08-23 10:06:12.000000000 +0100
+--- openoffice.org.orig/vcl/source/gdi/sallayout.cxx	2006-08-23 10:05:02.000000000 +0100
++++ openoffice.org/vcl/source/gdi/sallayout.cxx	2006-08-23 10:06:12.000000000 +0100
 @@ -1712,7 +1715,7 @@
          if( n > 0 )
          {



From fedora-cvs-commits at redhat.com  Thu Aug 24 12:22:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 08:22:09 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.ooo68919.sc.atk.patch, NONE, 1.1
Message-ID: <200608241222.k7OCM9Dv005995@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5981

Added Files:
	openoffice.org-2.0.4.ooo68919.sc.atk.patch 
Log Message:
add openoffice.org-2.0.4.ooo68919.sc.atk.patch

openoffice.org-2.0.4.ooo68919.sc.atk.patch:
 sc/source/ui/Accessibility/AccessibleText.cxx |    1 +
 source/ui/Accessibility/AccessibleText.cxx    |    0 
 2 files changed, 1 insertion(+)

--- NEW FILE openoffice.org-2.0.4.ooo68919.sc.atk.patch ---
Index: source/ui/Accessibility/AccessibleText.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/Accessibility/AccessibleText.cxx,v
retrieving revision 1.35
diff -u -r1.35 AccessibleText.cxx
--- openoffice.org.orig/sc/source/ui/Accessibility/AccessibleText.cxx	21 Jul 2006 13:07:53 -0000	1.35
+++ openoffice.org/sc/source/ui/Accessibility/AccessibleText.cxx	24 Aug 2006 12:17:06 -0000
@@ -1190,6 +1200,7 @@
 
     DELETEZ(mpForwarder);
     DELETEZ(mpEditViewForwarder);
+    DELETEZ(mpViewForwarder);
     mbEditEngineCreated = sal_False;
 }
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 12:26:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 08:26:40 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.858,1.859
Message-ID: <200608241226.k7OCQeK2006086@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6045

Modified Files:
	openoffice.org.spec 
Log Message:
add openoffice.org-2.0.4.ooo68919.sc.atk.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.858
retrieving revision 1.859
diff -u -r1.858 -r1.859
--- openoffice.org.spec	24 Aug 2006 11:42:34 -0000	1.858
+++ openoffice.org.spec	24 Aug 2006 12:26:37 -0000	1.859
@@ -125,6 +125,7 @@
 Patch57: openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
 Patch58: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
 Patch59: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
+Patch60: openoffice.org-2.0.4.ooo68919.sc.atk.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -984,6 +985,7 @@
 %patch57 -p1 -b .ooo68851.framework.disablemenuifempty.patch
 %patch58 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
 %patch59 -p1 -b .ooo54603.fontconfig.part3.patch
+%patch60 -p1 -b .ooo68919.sc.atk.patch
 
 tar xzf %{SOURCE1}
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 12:32:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 08:32:45 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2585,1.2586
Message-ID: <200608241232.k7OCWjKp006191@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6179

Modified Files:
	kernel-2.6.spec 
Log Message:
GFS2 update, enable buildheaders


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2585
retrieving revision 1.2586
diff -u -r1.2585 -r1.2586
--- kernel-2.6.spec	22 Aug 2006 23:14:56 -0000	1.2585
+++ kernel-2.6.spec	24 Aug 2006 12:32:41 -0000	1.2586
@@ -12,7 +12,7 @@
 %define buildxen 1
 %define builddoc 0
 %define buildkdump 1
-%define buildheaders 0
+%define buildheaders 1
 
 # Versions of various parts
 
@@ -50,9 +50,9 @@
 %endif
 # Don't build 586 kernels for RHEL builds.
 %if 0%{?rhel}
-%define all_x86 i686
+%define all_x86 i386 i686
 %else
-%define all_x86 i586 i686
+%define all_x86 i386 i586 i686
 %endif
 
 # Override generic defaults with per-arch defaults
@@ -76,7 +76,7 @@
 
 # Second, per-architecture exclusions (ifarch)
 
-%ifarch ppc64iseries i686
+%ifarch ppc64iseries i686 i586
 %define buildheaders 0
 %endif
 
@@ -155,6 +155,24 @@
 %define xen_image vmlinux.gz
 %endif
 
+# To temporarily exclude an architecture from being built, add it to
+# %nobuildarches. Do _NOT_ use the ExclusiveArch: line, because if we
+# don't build kernel-headers then the new build system will no longer let
+# us use the previous build of that package -- it'll just be completely AWOL.
+# Which is a BadThing(tm).
+
+# We don't build a kernel on i386 -- we only do kernel-headers there.
+%define nobuildarches i386
+
+%ifarch %nobuildarches
+%define buildup 0
+%define buildsmp 0
+%define buildpae 0
+%define buildxen 0
+%define buildkdump 0
+%define _enable_debug_packages 0
+%endif
+
 #
 # Three sets of minimum package version requirements in the form of Conflicts:
 # to versions below the minimum
@@ -193,6 +211,8 @@
 %if 0%{?olpc}
 ExclusiveArch: i686
 %else
+# DO NOT CHANGE THIS LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
+# SET %nobuildarches (ABOVE) INSTEAD
 ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries ia64 sparc sparc64 s390 s390x
 %endif
 ExclusiveOS: Linux
@@ -1731,6 +1751,11 @@
 %endif
 
 %changelog
+* Thu Aug 24 2006 David Woodhouse <dwmw2 at redhat.com>
+- Update GFS2 patch (from swhiteho)
+- Enable kernel-headers build
+- Enable i386 build _only_ for kernel-headers
+
 * Tue Aug 22 2006 Don Zickus <dzickus at redhat.com>
 - Another lockdep-fix
 - NFS fix for the connectathon test



From fedora-cvs-commits at redhat.com  Thu Aug 24 13:36:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 09:36:44 -0400
Subject: rpms/openssl097a/devel openssl-0.9.7a-bn-ia64asm.patch, NONE,
	1.1 openssl-0.9.7a-ca-check.patch, NONE,
	1.1 openssl-0.9.7a-sha-2gb-boundary.patch, NONE,
	1.1 openssl097a.spec, 1.9, 1.10
Message-ID: <200608241336.k7ODaiDw029117@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29095

Modified Files:
	openssl097a.spec 
Added Files:
	openssl-0.9.7a-bn-ia64asm.patch openssl-0.9.7a-ca-check.patch 
	openssl-0.9.7a-sha-2gb-boundary.patch 
Log Message:
* Thu Aug 24 2006 Tomas Mraz <tmraz at redhat.com> 0.9.7a-7
- fixed sha1 on 2gb boundary (patch from upstream) (#189492)
- enable compilation of updated assembler code on IA64 (#180091)
- correct verification of CA certs in SSL (#201005)


openssl-0.9.7a-bn-ia64asm.patch:
 ia64.S |  217 +++++++++++++++++++++++++----------------------------------------
 1 files changed, 86 insertions(+), 131 deletions(-)

--- NEW FILE openssl-0.9.7a-bn-ia64asm.patch ---
--- openssl-0.9.7a/crypto/bn/asm/ia64.S.ia64asm	2003-01-19 22:31:20.000000000 +0100
+++ openssl-0.9.7a/crypto/bn/asm/ia64.S	2004-07-17 15:27:38.000000000 +0200
@@ -1,6 +1,6 @@
 .explicit
 .text
-.ident	"ia64.S, Version 2.0"
+.ident	"ia64.S, Version 2.1"
 .ident	"IA-64 ISA artwork by Andy Polyakov <appro at fy.chalmers.se>"
 
 //
@@ -35,7 +35,7 @@
 // What does it mean? You might ratiocinate that the original code
 // should run just faster... Because sum of latencies is smaller...
 // Wrong! Note that getf latency increased. This means that if a loop is
-// scheduled for lower latency (and they are), then it will suffer from
+// scheduled for lower latency (as they were), then it will suffer from
 // stall condition and the code will therefore turn anti-scalable, e.g.
 // original bn_mul_words spun at 5*n or 2.5 times slower than expected
 // on Itanium2! What to do? Reschedule loops for Itanium2? But then
@@ -145,6 +145,12 @@
 //	-Drum=nop.m in command line.
 //
 
+#if defined(_HPUX_SOURCE) && !defined(_LP64)
+#define	ADDP	addp4
+#else
+#define	ADDP	add
+#endif
+
 #if 1
 //
 // bn_[add|sub]_words routines.
@@ -178,27 +184,12 @@
 	brp.loop.imp	.L_bn_add_words_ctop,.L_bn_add_words_cend-16
 					}
 	.body
-{ .mib;
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
-	addp4		r14=0,r32		// rp
-#else
-	mov		r14=r32			// rp
-#endif
+{ .mib;	ADDP		r14=0,r32		// rp
 	mov		r9=pr		};;
-{ .mii;
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
-	addp4		r15=0,r33		// ap
-#else
-	mov		r15=r33			// ap
-#endif
+{ .mii;	ADDP		r15=0,r33		// ap
 	mov		ar.lc=r10
 	mov		ar.ec=6		}
-{ .mib;
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
-	addp4		r16=0,r34		// bp
-#else
-	mov		r16=r34			// bp
-#endif
+{ .mib;	ADDP		r16=0,r34		// bp
 	mov		pr.rot=1<<16	};;
 
 .L_bn_add_words_ctop:
@@ -246,27 +237,12 @@
 	brp.loop.imp	.L_bn_sub_words_ctop,.L_bn_sub_words_cend-16
 					}
 	.body
-{ .mib;
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
-	addp4		r14=0,r32		// rp
-#else
-	mov		r14=r32			// rp
-#endif
+{ .mib;	ADDP		r14=0,r32		// rp
 	mov		r9=pr		};;
-{ .mii;
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
-	addp4		r15=0,r33		// ap
-#else
-	mov		r15=r33			// ap
-#endif
+{ .mii;	ADDP		r15=0,r33		// ap
 	mov		ar.lc=r10
 	mov		ar.ec=6		}
-{ .mib;
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
-	addp4		r16=0,r34		// bp
-#else
-	mov		r16=r34			// bp
-#endif
+{ .mib;	ADDP		r16=0,r34		// bp
 	mov		pr.rot=1<<16	};;
 
 .L_bn_sub_words_ctop:
@@ -332,16 +308,10 @@
 
 #ifndef XMA_TEMPTATION
 
-{ .mii;
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
-	addp4		r14=0,r32	// rp
-	addp4		r15=0,r33	// ap
-#else
-	mov		r14=r32		// rp
-	mov		r15=r33		// ap
-#endif
+{ .mmi;	ADDP		r14=0,r32	// rp
+	ADDP		r15=0,r33	// ap
 	mov		ar.lc=r10	}
-{ .mii;	mov		r40=0	// serves as r35 at first (p27)
+{ .mmi;	mov		r40=0		// serves as r35 at first (p27)
 	mov		ar.ec=13	};;
 
 // This loop spins in 2*(n+12) ticks. It's scheduled for data in Itanium
@@ -424,89 +394,64 @@
 .global	bn_mul_add_words#
 .proc	bn_mul_add_words#
 .align	64
-//.skip	0	// makes the loop split at 64-byte boundary
+.skip	48	// makes the loop body aligned at 64-byte boundary
 bn_mul_add_words:
 	.prologue
 	.fframe	0
 	.save	ar.pfs,r2
-{ .mii;	alloc		r2=ar.pfs,4,12,0,16
-	cmp4.le		p6,p0=r34,r0	};;
-{ .mfb;	mov		r8=r0			// return value
-(p6)	br.ret.spnt.many	b0	};;
-
 	.save	ar.lc,r3
-{ .mii;	sub	r10=r34,r0,1
-	mov	r3=ar.lc
-	mov	r9=pr			};;
+	.save	pr,r9
+{ .mmi;	alloc		r2=ar.pfs,4,4,0,8
+	cmp4.le		p6,p0=r34,r0
+	mov		r3=ar.lc	};;
+{ .mib;	mov		r8=r0		// return value
+	sub		r10=r34,r0,1
+(p6)	br.ret.spnt.many	b0	};;
 
 	.body
-{ .mib;	setf.sig	f8=r35	// w
-	mov		pr.rot=0x800001<<16
-			// ------^----- serves as (p50) at first (p27)
+{ .mib;	setf.sig	f8=r35		// w
+	mov		r9=pr
 	brp.loop.imp	.L_bn_mul_add_words_ctop,.L_bn_mul_add_words_cend-16
 					}
-{ .mii;
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
-	addp4		r14=0,r32	// rp
-	addp4		r15=0,r33	// ap
-#else
-	mov		r14=r32		// rp
-	mov		r15=r33		// ap
-#endif
+{ .mmi;	ADDP		r14=0,r32	// rp
+	ADDP		r15=0,r33	// ap
 	mov		ar.lc=r10	}
-{ .mii;	mov		r40=0	// serves as r35 at first (p27)
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
-	addp4		r18=0,r32	// rp copy
-#else
-	mov		r18=r32		// rp copy
-#endif
-	mov		ar.ec=15	};;
-
-// This loop spins in 3*(n+14) ticks on Itanium and should spin in
-// 2*(n+14) on "wider" IA-64 implementations (to be verified with new
-// ?-architecture manuals as they become available). As usual it's
-// possible to compress the epilogue, down to 10 in this case, at the
-// cost of scalability. Compressed (and therefore non-scalable) loop
-// running at 3*(n+11) would buy you ~10% on Itanium but take ~35%
-// from "wider" IA-64 so let it be scalable! Special attention was
-// paid for having the loop body split at 64-byte boundary. ld8 is
-// scheduled for L1 cache as the data is more than likely there.
-// Indeed, bn_mul_words has put it there a moment ago:-)
+{ .mii;	ADDP		r16=0,r32	// rp copy
+	mov		pr.rot=0x2001<<16
+			// ------^----- serves as (p40) at first (p27)
+	mov		ar.ec=11	};;
+
+// This loop spins in 3*(n+10) ticks on Itanium and in 2*(n+10) on
+// Itanium 2. Yes, unlike previous versions it scales:-) Previous
+// version was peforming *all* additions in IALU and was starving
+// for those even on Itanium 2. In this version one addition is
+// moved to FPU and is folded with multiplication. This is at cost
+// of propogating the result from previous call to this subroutine
+// to L2 cache... In other words negligible even for shorter keys.
+// *Overall* performance improvement [over previous version] varies
+// from 11 to 22 percent depending on key length.
 .L_bn_mul_add_words_ctop:
-{ .mfi;	(p25)	getf.sig	r36=f52			// low
-	(p21)	xmpy.lu		f48=f37,f8
-	(p28)	cmp.ltu		p54,p50=r41,r39	}
-{ .mfi;	(p16)	ldf8		f32=[r15],8
-	(p21)	xmpy.hu		f40=f37,f8
-	(p28)	add		r45=r45,r41	};;
-{ .mii;	(p25)	getf.sig	r32=f44			// high
-	.pred.rel	"mutex",p50,p54
-	(p50)	add		r40=r38,r35		// (p27)
-	(p54)	add		r40=r38,r35,1	}	// (p27)
-{ .mfb;	(p28)	cmp.ltu.unc	p60,p0=r45,r41
-	(p0)	nop.f		0x0
-	(p0)	nop.b		0x0		}
-{ .mii;	(p27)	ld8		r44=[r18],8
-	(p62)	cmp.eq.or	p61,p0=-1,r46
-	(p62)	add		r46=1,r46	}
-{ .mfb;	(p30)	st8		[r14]=r47,8
-	(p0)	nop.f		0x0
+.pred.rel	"mutex",p40,p42
+{ .mfi;	(p23)	getf.sig	r36=f45			// low
+	(p20)	xma.lu		f42=f36,f8,f50		// low
+	(p40)	add		r39=r39,r35	}	// (p27)
+{ .mfi;	(p16)	ldf8		f32=[r15],8		// *(ap++)
+	(p20)	xma.hu		f36=f36,f8,f50		// high
+	(p42)	add		r39=r39,r35,1	};;	// (p27)
+{ .mmi;	(p24)	getf.sig	r32=f40			// high
+	(p16)	ldf8		f46=[r16],8		// *(rp1++)
+	(p40)	cmp.ltu		p41,p39=r39,r35	}	// (p27)
+{ .mib;	(p26)	st8		[r14]=r39,8		// *(rp2++)
+	(p42)	cmp.leu		p41,p39=r39,r35		// (p27)
 	br.ctop.sptk	.L_bn_mul_add_words_ctop};;
 .L_bn_mul_add_words_cend:
 
-{ .mii;	nop.m		0x0
-.pred.rel	"mutex",p53,p57
-(p53)	add		r8=r38,r0
-(p57)	add		r8=r38,r0,1	}
-{ .mfb;	nop.m	0x0
-	nop.f	0x0
-	nop.b	0x0			};;
-{ .mii;
-(p63)	add		r8=1,r8
-	mov		pr=r9,0x1ffff
-	mov		ar.lc=r3	}
-{ .mfb;	rum		1<<5		// clear um.mfh
-	nop.f		0x0
+{ .mmi;	.pred.rel	"mutex",p40,p42
+(p40)	add		r8=r35,r0
+(p42)	add		r8=r35,r0,1
+	mov		pr=r9,0x1ffff	}
+{ .mib;	rum		1<<5		// clear um.mfh
+	mov		ar.lc=r3
 	br.ret.sptk.many	b0	};;
 .endp	bn_mul_add_words#
 #endif
@@ -527,7 +472,8 @@
 	sxt4		r34=r34		};;
 { .mii;	cmp.le		p6,p0=r34,r0
 	mov		r8=r0		}	// return value
-{ .mfb;	nop.f		0x0
+{ .mfb;	ADDP		r32=0,r32
+	nop.f		0x0
 (p6)	br.ret.spnt.many	b0	};;
 
 	.save	ar.lc,r3
@@ -536,11 +482,7 @@
 	mov	r9=pr			};;
 
 	.body
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
-{ .mii; addp4		r32=0,r32
-	addp4		r33=0,r33	};;
-#endif
-{ .mib;
+{ .mib;	ADDP		r33=0,r33
 	mov		pr.rot=1<<16
 	brp.loop.imp	.L_bn_sqr_words_ctop,.L_bn_sqr_words_cend-16
 					}
@@ -605,7 +547,7 @@
 	.prologue
 	.fframe	0
 	.save	ar.pfs,r2
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
+#if defined(_HPUX_SOURCE) && !defined(_LP64)
 { .mii;	alloc	r2=ar.pfs,2,1,0,0
 	addp4	r33=0,r33
 	addp4	r32=0,r32		};;
@@ -631,6 +573,10 @@
 // clause in Itanium ?-architecture manual? Comments are welcomed and
 // highly appreciated.
 //
+// On Itanium 2 it takes ~190 ticks. This is because of stalls on
+// result from getf.sig. I do nothing about it at this point for
+// reasons depicted below.
+//
 // However! It should be noted that even 160 ticks is darn good result
 // as it's over 10 (yes, ten, spelled as t-e-n) times faster than the
 // C version (compiled with gcc with inline assembler). I really
@@ -673,7 +619,7 @@
 	.prologue
 	.fframe	0
 	.save	ar.pfs,r2
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
+#if defined(_HPUX_SOURCE) && !defined(_LP64)
 { .mii;	alloc	r2=ar.pfs,3,0,0,0
 	addp4	r33=0,r33
 	addp4	r34=0,r34		};;
@@ -1231,7 +1177,7 @@
 	.prologue
 	.fframe	0
 	.save	ar.pfs,r2
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
+#if defined(_HPUX_SOURCE) && !defined(_LP64)
 { .mii;	alloc   r2=ar.pfs,2,1,0,0
 	addp4	r32=0,r32
 	addp4	r33=0,r33		};;
@@ -1264,7 +1210,7 @@
 	.prologue
 	.fframe	0
 	.save	ar.pfs,r2
-#if defined(_HPUX_SOURCE) && defined(_ILP32)
+#if defined(_HPUX_SOURCE) && !defined(_LP64)
 { .mii;	alloc   r2=ar.pfs,3,0,0,0
 	addp4	r33=0,r33
 	addp4	r34=0,r34		};;
@@ -1448,8 +1394,8 @@
 #define	I	r21
 
 #if 0
-// Some preprocessors (most notably HP-UX) apper to be allergic to
-// macros enclosed to parenthesis as these three will be.
+// Some preprocessors (most notably HP-UX) appear to be allergic to
+// macros enclosed to parenthesis [as these three were].
 #define	cont	p16
 #define	break	p0	// p20
 #define	equ	p24
@@ -1581,9 +1527,18 @@
 // output:	f8 = (int)(a/b)
 // clobbered:	f8,f9,f10,f11,pred
 pred=p15
-// This procedure is essentially Intel code and therefore is
-// copyrighted to Intel Corporation (I suppose...). It's sligtly
-// modified for specific needs.
+// One can argue that this snippet is copyrighted to Intel
+// Corporation, as it's essentially identical to one of those
+// found in "Divide, Square Root and Remainder" section at
+// http://www.intel.com/software/products/opensource/libraries/num.htm.
+// Yes, I admit that the referred code was used as template,
+// but after I realized that there hardly is any other instruction
+// sequence which would perform this operation. I mean I figure that
+// any independent attempt to implement high-performance division
+// will result in code virtually identical to the Intel code. It
+// should be noted though that below division kernel is 1 cycle
+// faster than Intel one (note commented splits:-), not to mention
+// original prologue (rather lack of one) and epilogue.
 .align	32
 .skip	16
 .L_udiv64_32_b6:

openssl-0.9.7a-ca-check.patch:
 v3_purp.c |   32 ++++++++++----------------------
 1 files changed, 10 insertions(+), 22 deletions(-)

--- NEW FILE openssl-0.9.7a-ca-check.patch ---
--- openssl-0.9.7a/crypto/x509v3/v3_purp.c.ca-check	2006-08-07 17:11:28.000000000 +0200
+++ openssl-0.9.7a/crypto/x509v3/v3_purp.c	2006-08-07 17:20:59.000000000 +0200
@@ -437,7 +437,11 @@
 		if((x->ex_flags & V1_ROOT) == V1_ROOT) return 3;
 		/* If key usage present it must have certSign so tolerate it */
 		else if (x->ex_flags & EXFLAG_KUSAGE) return 3;
-		else return 2;
+		/* Older certificates could have Netscape-specific CA types */
+		else if (x->ex_flags & EXFLAG_NSCERT
+			 && x->ex_nscert & NS_ANY_CA) return 5;
+		/* can this still be regarded a CA certificate?  I doubt it */
+		return 0;
 	}
 }
 
@@ -448,11 +452,7 @@
 	ca_ret = ca_check(x);
 	if(!ca_ret) return 0;
 	/* check nsCertType if present */
-	if(x->ex_flags & EXFLAG_NSCERT && x->ex_nscert & NS_ANY_CA) {
-		if(x->ex_nscert & NS_SSL_CA) return ca_ret;
-		return 0;
-	}
-	if(ca_ret != 2) return ca_ret;
+	if(ca_ret != 5 || x->ex_nscert & NS_SSL_CA) return ca_ret;
 	else return 0;
 }
 
@@ -500,11 +500,7 @@
 		ca_ret = ca_check(x);
 		if(!ca_ret) return 0;
 		/* check nsCertType if present */
-		if(x->ex_flags & EXFLAG_NSCERT) {
-			if(x->ex_nscert & NS_SMIME_CA) return ca_ret;
-			return 0;
-		}
-		if(ca_ret != 2) return ca_ret;
+		if(ca_ret != 5 || x->ex_nscert & NS_SMIME_CA) return ca_ret;
 		else return 0;
 	}
 	if(x->ex_flags & EXFLAG_NSCERT) {
@@ -551,17 +547,9 @@
 
 static int ocsp_helper(const X509_PURPOSE *xp, const X509 *x, int ca)
 {
-	/* Must be a valid CA */
-	if(ca) {
-		int ca_ret;
-		ca_ret = ca_check(x);
-		if(ca_ret != 2) return ca_ret;
-		if(x->ex_flags & EXFLAG_NSCERT) {
-			if(x->ex_nscert & NS_ANY_CA) return ca_ret;
-			return 0;
-		}
-		return 0;
-	}
+	/* Must be a valid CA.  Should we really support the "I don't know"
+	   value (2)? */
+	if(ca) return ca_check(x);
 	/* leaf certificate is checked in OCSP_verify() */
 	return 1;
 }

openssl-0.9.7a-sha-2gb-boundary.patch:
 sha1-586.pl |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openssl-0.9.7a-sha-2gb-boundary.patch ---
--- openssl-0.9.7a/crypto/sha/asm/sha1-586.pl.2gb-boundary	2006-04-21 18:17:09.000000000 +0200
+++ openssl-0.9.7a/crypto/sha/asm/sha1-586.pl	2006-04-21 18:18:03.000000000 +0200
@@ -520,7 +520,7 @@
 	&mov(&DWP(16,$tmp1,"",0),$E);
 	 &cmp("esi","eax");
 	&mov(&DWP( 4,$tmp1,"",0),$B);
-	 &jl(&label("start"));
+	 &jb(&label("start"));
 
 	&stack_pop(18+9);
 	 &pop("edi");


Index: openssl097a.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl097a.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openssl097a.spec	12 Jul 2006 07:35:56 -0000	1.9
+++ openssl097a.spec	24 Aug 2006 13:36:39 -0000	1.10
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl097a
 Version: 0.9.7a
-Release: 6.1
+Release: 7
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -56,6 +56,9 @@
 Patch20: openssl-0.9.6c-ccert.patch
 Patch21: openssl-0.9.7a-utf8fix.patch
 Patch22: openssl-0.9.7a-no-der_chop.patch
+Patch23: openssl-0.9.7a-bn-ia64asm.patch
+Patch24: openssl-0.9.7a-sha-2gb-boundary.patch
+Patch25: openssl-0.9.7a-ca-check.patch
 Patch40: libica-1.3.4-urandom.patch
 Patch42: openssl-0.9.7a-krb5.patch
 Patch43: openssl-0.9.7a-krb5-security.patch
@@ -147,6 +150,9 @@
 %patch20 -p1 -b .ccert
 %patch21 -p1 -b .utf8fix
 %patch22 -p1 -b .no-der_chop
+%patch23 -p1 -b .ia64asm
+%patch24 -p1 -b .2gb-boundary
+%patch25 -p1 -b .ca-check
 
 # Patch for libica to use /dev/urandom instead of internal pseudo random number
 # generator.
@@ -196,7 +202,6 @@
 %endif
 %ifarch ia64
 sslarch=linux-ia64
-sslflags=no-asm
 %endif
 %ifarch alpha
 sslarch=linux-alpha-gcc
@@ -392,6 +397,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 24 2006 Tomas Mraz <tmraz at redhat.com> 0.9.7a-7
+- fixed sha1 on 2gb boundary (patch from upstream) (#189492)
+- enable compilation of updated assembler code on IA64 (#180091)
+- correct verification of CA certs in SSL (#201005)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.7a-6.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 13:49:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 09:49:06 -0400
Subject: rpms/openssl097a/devel openssl-0.9.7a-ca-check.patch,1.1,1.2
Message-ID: <200608241349.k7ODn63B015204@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15045

Modified Files:
	openssl-0.9.7a-ca-check.patch 
Log Message:
- oops bad diff


openssl-0.9.7a-ca-check.patch:
 v3_purp.c |   32 ++++++++++----------------------
 1 files changed, 10 insertions(+), 22 deletions(-)

Index: openssl-0.9.7a-ca-check.patch
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl-0.9.7a-ca-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssl-0.9.7a-ca-check.patch	24 Aug 2006 13:36:39 -0000	1.1
+++ openssl-0.9.7a-ca-check.patch	24 Aug 2006 13:49:03 -0000	1.2
@@ -17,7 +17,7 @@
  	ca_ret = ca_check(x);
  	if(!ca_ret) return 0;
  	/* check nsCertType if present */
--	if(x->ex_flags & EXFLAG_NSCERT && x->ex_nscert & NS_ANY_CA) {
+-	if(x->ex_flags & EXFLAG_NSCERT) {
 -		if(x->ex_nscert & NS_SSL_CA) return ca_ret;
 -		return 0;
 -	}



From fedora-cvs-commits at redhat.com  Thu Aug 24 14:04:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 10:04:19 -0400
Subject: rpms/oprofile/devel oprofile-0.9.1-xen.patch, 1.1, 1.2 oprofile.spec,
	1.47, 1.48
Message-ID: <200608241404.k7OE4J3e019818@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19739

Modified Files:
	oprofile-0.9.1-xen.patch oprofile.spec 
Log Message:
Update xen patch.



oprofile-0.9.1-xen.patch:
 daemon/init.c          |    6 +
 daemon/opd_interface.h |   13 ++-
 daemon/opd_kernel.c    |  170 +++++++++++++++++++++++++++++++++++++++
 daemon/opd_kernel.h    |   10 ++
 daemon/opd_sfile.c     |    2 
 daemon/opd_trans.c     |   51 +++++++++++
 daemon/opd_trans.h     |    4 
 daemon/oprofiled.c     |   31 +++++++
 daemon/oprofiled.h     |    7 +
 doc/opcontrol.1.in     |   49 +++++++++++
 utils/opcontrol        |  209 +++++++++++++++++++++++++++++++++++++++++++++----
 11 files changed, 526 insertions(+), 26 deletions(-)

Index: oprofile-0.9.1-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile-0.9.1-xen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oprofile-0.9.1-xen.patch	13 May 2006 15:58:43 -0000	1.1
+++ oprofile-0.9.1-xen.patch	24 Aug 2006 14:04:16 -0000	1.2
@@ -1,25 +1,8 @@
-diff -Naur oprofile-0.9.1/ChangeLog oprofile-0.9.1-xen/ChangeLog
---- oprofile-0.9.1/ChangeLog	2005-07-18 13:02:37.000000000 -0700
-+++ oprofile-0.9.1-xen/ChangeLog	2005-12-22 13:58:38.000000000 -0800
-@@ -1,3 +1,15 @@
-+2005-12-22  Jose Renato Santos  <jsantos at hpl.hp.com>
-+
-+	* daemon/init.c:
-+	* daemon/opd_interface.h:
-+	* daemon/opd_kernel.h:
-+	* daemon/opd_kernel.c:
-+	* daemon/opd_trans.c:
-+	* daemon/oprofiled.h:
-+	* daemon/oprofiled.c:
-+	* doc/opcontrol.1.in:
-+	* utils/opcontrol: Added support for Xen
-+
- 2005-07-18  John Levon  <levon at movementarian.org>
- 
- 	* libutil++/tests/Makefile.am: canonicalize
-diff -Naur oprofile-0.9.1/daemon/init.c oprofile-0.9.1-xen/daemon/init.c
+Signed-off-by: Jose Renato Santos <jsantos at hpl.hp.com>
+
+diff -Naur oprofile-0.9.1/daemon/init.c oprofile-0.9.1-passive/daemon/init.c
 --- oprofile-0.9.1/daemon/init.c	2005-05-02 08:06:57.000000000 -0700
-+++ oprofile-0.9.1-xen/daemon/init.c	2005-12-22 11:38:09.000000000 -0800
++++ oprofile-0.9.1-passive/daemon/init.c	2006-08-22 08:46:00.000000000 -0700
 @@ -7,6 +7,9 @@
   *
   * @author John Levon
@@ -30,17 +13,19 @@
   */
  
  #include "config.h"
-@@ -222,6 +225,7 @@
+@@ -222,6 +225,9 @@
  	size_t opd_buf_size;
  
  	opd_create_vmlinux(vmlinux, kernel_range);
 +	opd_create_xen(xenimage, xen_range);
++	if (xen_passive_setup)
++		opd_create_passive(xen_passive_setup);
  
  	opd_buf_size = opd_read_fs_int("/dev/oprofile/", "buffer_size", 1);
  	kernel_pointer_size = opd_read_fs_int("/dev/oprofile/", "pointer_size", 1);
-diff -Naur oprofile-0.9.1/daemon/opd_interface.h oprofile-0.9.1-xen/daemon/opd_interface.h
+diff -Naur oprofile-0.9.1/daemon/opd_interface.h oprofile-0.9.1-passive/daemon/opd_interface.h
 --- oprofile-0.9.1/daemon/opd_interface.h	2005-04-13 19:14:17.000000000 -0700
-+++ oprofile-0.9.1-xen/daemon/opd_interface.h	2005-12-22 17:28:30.000000000 -0800
++++ oprofile-0.9.1-passive/daemon/opd_interface.h	2006-08-23 17:45:00.000000000 -0700
 @@ -8,6 +8,9 @@
   *
   * @author John Levon
@@ -51,7 +36,7 @@
   */
  
  #ifndef OPD_INTERFACE_H
-@@ -17,10 +20,13 @@
+@@ -17,10 +20,14 @@
  #define CPU_SWITCH_CODE			2
  #define COOKIE_SWITCH_CODE		3
  #define KERNEL_ENTER_SWITCH_CODE	4
@@ -65,12 +50,13 @@
 +/* Code 9 used to be TRACE_END_CODE which is not used anymore  */
 +/* Code 9 is now considered an unknown escape code             */
 +#define XEN_ENTER_SWITCH_CODE		10
-+#define LAST_CODE			11
++#define DOMAIN_SWITCH_CODE		11
++#define LAST_CODE			12
   
  #endif /* OPD_INTERFACE_H */
-diff -Naur oprofile-0.9.1/daemon/opd_kernel.c oprofile-0.9.1-xen/daemon/opd_kernel.c
+diff -Naur oprofile-0.9.1/daemon/opd_kernel.c oprofile-0.9.1-passive/daemon/opd_kernel.c
 --- oprofile-0.9.1/daemon/opd_kernel.c	2004-01-29 12:00:26.000000000 -0800
-+++ oprofile-0.9.1-xen/daemon/opd_kernel.c	2005-12-22 11:38:09.000000000 -0800
++++ oprofile-0.9.1-passive/daemon/opd_kernel.c	2006-08-23 16:50:43.000000000 -0700
 @@ -7,6 +7,9 @@
   *
   * @author John Levon
@@ -81,21 +67,28 @@
   */
  
  #include "opd_kernel.h"
-@@ -29,6 +32,8 @@
+@@ -29,6 +32,13 @@
  
  static struct kernel_image vmlinux_image;
  
 +static struct kernel_image xen_image;
 +
++static LIST_HEAD(passive_vmlinux);
++static LIST_HEAD(passive_xen);
++static LIST_HEAD(passive_apps);
++static LIST_HEAD(passive_modules);
++
  void opd_create_vmlinux(char const * name, char const * arg)
  {
  	/* vmlinux is *not* on the list of modules */
-@@ -54,6 +59,31 @@
+@@ -54,6 +64,107 @@
  	}
  }
  
 +void opd_create_xen(char const * name, char const * arg)
 +{
++	int stat;
++
 +	/* xen is *not* on the list of modules */
 +	list_init(&xen_image.list);
 +
@@ -107,33 +100,164 @@
 +
 +	xen_image.name = xstrdup(name);
 +
-+	sscanf(arg, "%llx,%llx", &xen_image.start, &xen_image.end);
++	stat = sscanf(arg, "%llx,%llx", &xen_image.start, &xen_image.end);
 +
 +	verbprintf(vmisc, "xen_start = %llx, xen_end = %llx\n",
 +	           xen_image.start, xen_image.end);
 +
-+	if (!xen_image.start && !xen_image.end) {
++	if ( stat != 2 ) {
 +		fprintf(stderr, "error: mis-parsed xen range: %llx-%llx\n",
 +		        xen_image.start, xen_image.end);
 +		exit(EXIT_FAILURE);
 +	}
 +}
 +
++void opd_create_passive_domain(int id, char const * image_kernel, 
++			       char const * range, char const * image_xen)
++{
++	char file[64];
++	struct kernel_image * image;
++	int stat;
++
++	image = xmalloc(sizeof(struct kernel_image));
++	image->name = xstrdup(image_kernel);
++	image->start = image->end = 0; 
++	stat = sscanf(range, "%llx,%llx", &image->start, &image->end);
++	image->id = id;
++	list_add(&image->list, &passive_vmlinux);
++	
++	if ( stat != 2 ) {
++		fprintf(stderr, "error: mis-parsed passive domain range for "
++			"domain %d: %llx-%llx\n", id, image->start, image->end);
++		exit(EXIT_FAILURE);
++	}
++
++	image = xmalloc(sizeof(struct kernel_image));
++	image->name = xstrdup(image_xen);
++	image->start = xen_image.start;
++	image->end = xen_image.end;
++	image->id = id;
++	list_add(&image->list, &passive_xen);
++
++	sprintf(file, "domain%d-apps", id);
++	image = xmalloc(sizeof(struct kernel_image));
++	image->name = xstrdup(file);
++	image->start = 0; 
++	image->end = 0;
++	image->id = id;
++	list_add(&image->list, &passive_apps);
++
++	sprintf(file, "domain%d-modules", id);
++	image = xmalloc(sizeof(struct kernel_image));
++	image->name = xstrdup(file);
++	image->start = 0; 
++	image->end = 0;
++	image->id = id;
++	list_add(&image->list, &passive_modules);
++
++}
++
++void opd_create_passive(char const *setup_file)
++{
++	FILE *fp;
++	int id=0;
++	char image_kernel[128+1];
++	char range[32+1];
++	char image_xen[128+1];
++	int stat;
++
++	image_kernel[0] = range[0] = image_xen[0] = 0;
++
++	fp = fopen(setup_file, "r");
++
++	if (!fp) {
++		fprintf(stderr, "error: Could not open Xen passive domain "
++			"setup file %s\n", setup_file);
++		exit(EXIT_FAILURE);
++	}
++
++	while (1) {
++		stat = fscanf(fp, "%d %128s %32s %128s", &id, image_kernel, range, 
++			image_xen);
++		if ( stat != 4 )
++			return;
++		opd_create_passive_domain(id, image_kernel, range, image_xen);
++	}
++
++	fclose(fp);
++}
  
  /**
   * Allocate and initialise a kernel image description
-@@ -192,5 +222,8 @@
- 			return image;
- 	}
- 
+@@ -180,6 +291,65 @@
+ 	struct list_head * pos;
+ 	struct kernel_image * image = &vmlinux_image;
+ 
++	if (current_domain != COORDINATOR_DOMAIN) {
++		/* We always rely on pc for identifying Xen samples
++		 * since on Xen entry/exit cpu_mode may still
++		 * indicate we are in kernel or user level while the
++		 * pc belongs to xen address space */
++		list_for_each(pos, &passive_xen) {
++			image = list_entry(pos, struct kernel_image, list);
++			if (image->id == current_domain
++			    && image->start <= trans->pc 
++			    && image->end > trans->pc) 
++				return image;
++		}
++
++		/* for kernel and user level samples we rely on 
++		* cpu_mode value (i.e. trans->in_kernel)
++		* Note however that we incremented trans->in_kernel
++		* when entering passive domain mode, Now vaid values 
++		* are in range [1,3]  */
++		switch ( trans->in_kernel ) {
++
++		/* kernel mode */
++		case 2:
++			list_for_each(pos, &passive_vmlinux) {
++				image = list_entry(pos, struct kernel_image, list);
++				if ( (image->id == current_domain)
++				     && ( (image->start == 0 && image->end == 0)
++					  || (image->start <= trans->pc 
++					      && image->end > trans->pc) ) )
++						return image;
++			}
++			/* if not in kernel image range then it should be a module */ 
++			list_for_each(pos, &passive_modules) {
++				image = list_entry(pos, struct kernel_image, list);
++				if (image->id == current_domain) 
++					return image;
++			}
++			/* This should not happen if the kernel and user level 
++                           oprofile code are sane and in sync */
++			return NULL;
++		/* user mode */
++		case 1:
++			list_for_each(pos, &passive_apps) {
++				image = list_entry(pos, struct kernel_image, list);
++				if (image->id == current_domain) 
++					return image;
++			}
++			return NULL;
++		default:
++			printf("Unexpected error on passive mode: CPU mode is "
++			       "%d for domain %d\n", trans->in_kernel, current_domain);
++			return NULL;
++		}
++		
++		
++	}
++
 +	if (xen_image.start <= trans->pc && xen_image.end > trans->pc)
 +		return &xen_image;
-+
- 	return NULL;
- }
-diff -Naur oprofile-0.9.1/daemon/opd_kernel.h oprofile-0.9.1-xen/daemon/opd_kernel.h
++ 
+ 	if (no_vmlinux)
+ 		return image;
+ 
+diff -Naur oprofile-0.9.1/daemon/opd_kernel.h oprofile-0.9.1-passive/daemon/opd_kernel.h
 --- oprofile-0.9.1/daemon/opd_kernel.h	2003-09-24 14:21:14.000000000 -0700
-+++ oprofile-0.9.1-xen/daemon/opd_kernel.h	2005-12-22 11:38:09.000000000 -0800
++++ oprofile-0.9.1-passive/daemon/opd_kernel.h	2006-08-22 09:26:41.000000000 -0700
 @@ -7,6 +7,9 @@
   *
   * @author John Levon
@@ -144,18 +268,42 @@
   */
  
  #ifndef OPD_KERNEL_H
-@@ -20,6 +23,8 @@
+@@ -20,6 +23,12 @@
  /** create the kernel image */
  void opd_create_vmlinux(char const * name, char const * arg);
  
++/** create Xen image */
 +void opd_create_xen(char const * name, char const * arg);
 +
++/** create Xen passive domain images */
++void opd_create_passive(char const *setup_file);
++
  /** opd_reread_module_info - parse /proc/modules for kernel modules */
  void opd_reread_module_info(void);
  
-diff -Naur oprofile-0.9.1/daemon/opd_trans.c oprofile-0.9.1-xen/daemon/opd_trans.c
+@@ -28,6 +37,7 @@
+ 	char * name;
+ 	vma_t start;
+ 	vma_t end;
++	int id;
+ 	struct list_head list;
+ };
+ 
+diff -Naur oprofile-0.9.1/daemon/opd_sfile.c oprofile-0.9.1-passive/daemon/opd_sfile.c
+--- oprofile-0.9.1/daemon/opd_sfile.c	2005-05-25 17:00:02.000000000 -0700
++++ oprofile-0.9.1-passive/daemon/opd_sfile.c	2006-08-23 16:54:46.000000000 -0700
+@@ -226,7 +226,7 @@
+ 	}
+ 
+ 	/* we might need a kernel image start/end to hash on */
+-	if (trans->in_kernel) {
++	else if (trans->in_kernel) {
+ 		ki = find_kernel_image(trans);
+ 		if (!ki) {
+ 			verbprintf(vsamples, "Lost kernel sample %llx\n", trans->pc);
+diff -Naur oprofile-0.9.1/daemon/opd_trans.c oprofile-0.9.1-passive/daemon/opd_trans.c
 --- oprofile-0.9.1/daemon/opd_trans.c	2005-05-25 17:00:02.000000000 -0700
-+++ oprofile-0.9.1-xen/daemon/opd_trans.c	2005-12-22 14:48:41.000000000 -0800
++++ oprofile-0.9.1-passive/daemon/opd_trans.c	2006-08-23 16:56:07.000000000 -0700
 @@ -7,6 +7,9 @@
   *
   * @author John Levon
@@ -166,7 +314,26 @@
   */
  
  #include "opd_trans.h"
-@@ -219,9 +222,9 @@
+@@ -24,6 +27,8 @@
+ #include <stdio.h>
+ #include <errno.h>
+ 
++int32_t current_domain = COORDINATOR_DOMAIN;
++
+ extern size_t kernel_pointer_size;
+ 
+ 
+@@ -210,6 +215,9 @@
+ {
+ 	verbprintf(vmisc, "KERNEL_ENTER_SWITCH to kernel\n");
+ 	trans->in_kernel = 1;
++	/* if in passive domain mode cpu mode should be incremented */
++	if (current_domain != COORDINATOR_DOMAIN)
++		trans->in_kernel++;
+ 	clear_trans_current(trans);
+ 	/* subtlety: we must keep trans->cookie cached,
+ 	 * even though it's meaningless for the kernel -
+@@ -219,10 +227,13 @@
  }
  
  
@@ -176,29 +343,51 @@
 -	verbprintf(vmisc, "KERNEL_EXIT_SWITCH to user-space\n");
 +	verbprintf(vmisc, "USER_ENTER_SWITCH to user-space\n");
  	trans->in_kernel = 0;
++	/* if in passive domain mode cpu mode should be incremented */
++	if (current_domain != COORDINATOR_DOMAIN)
++		trans->in_kernel++;
  	clear_trans_current(trans);
  	clear_trans_last(trans);
-@@ -248,6 +251,19 @@
+ }
+@@ -248,6 +259,37 @@
  	trans->tracing = TRACING_START;
  }
  
 +static void code_xen_enter(struct transient *trans)
 +{
 +	verbprintf(vmisc, "XEN_ENTER_SWITCH to xen\n");
-+	trans->in_kernel = 1;
++	trans->in_kernel = 2;
++	/* if in passive domain mode cpu mode should be incremented */
++	if (current_domain != COORDINATOR_DOMAIN)
++		trans->in_kernel++;
 +	trans->current = NULL;
 +	/* subtlety: we must keep trans->cookie cached, even though it's 
-+	 * meaningless for Xen - we won't necessarily get a cookie switch 
-+	 * on Xen exit. See comments in opd_sfile.c. It seems that we can 
-+	 * get away with in_kernel = 1 as long as we supply the correct 
-+	 * Xen image, and its address range in startup find_kernel_image 
-+	 * is modified to look in the Xen image also
++	 * meaningless for Xen - same reason as for kernel 
++	 */
++}
++
++static void code_domain_switch(struct transient *trans)
++{
++	/* While processing passive domain samples we ensure (in_kernel!=0)
++	 * We do this in order to ignore cookies for passive domain samples 
++	 * But, we have to remember the kernel value for coordinator domain, 
++	 * so we do the safe thing: increment when leaving the coordinator
++	 * domain and decrement when returning to it 
 +	 */
++	if (current_domain == COORDINATOR_DOMAIN)
++		trans->in_kernel++;
++
++	trans->current = NULL;
++	current_domain = (int32_t) pop_buffer_value(trans);
++
++	/* If returning to coordinator domain restore the kernel value */
++	if (current_domain == COORDINATOR_DOMAIN)
++		trans->in_kernel--;
 +}
  
  typedef void (*handler_t)(struct transient *);
  
-@@ -257,11 +273,13 @@
+@@ -257,11 +299,14 @@
  	&code_cpu_switch,
  	&code_cookie_switch,
  	&code_kernel_enter,
@@ -210,12 +399,27 @@
  	&code_trace_begin,
 +	&code_unknown,
 + 	&code_xen_enter,
++	&code_domain_switch,
  };
  
  
-diff -Naur oprofile-0.9.1/daemon/oprofiled.c oprofile-0.9.1-xen/daemon/oprofiled.c
+diff -Naur oprofile-0.9.1/daemon/opd_trans.h oprofile-0.9.1-passive/daemon/opd_trans.h
+--- oprofile-0.9.1/daemon/opd_trans.h	2005-05-02 08:06:59.000000000 -0700
++++ oprofile-0.9.1-passive/daemon/opd_trans.h	2006-08-22 10:04:52.000000000 -0700
+@@ -15,6 +15,10 @@
+ #include "opd_cookie.h"
+ #include "op_types.h"
+ 
++#define COORDINATOR_DOMAIN -1
++
++extern int32_t current_domain;
++
+ struct sfile;
+ struct anon_mapping;
+ 
+diff -Naur oprofile-0.9.1/daemon/oprofiled.c oprofile-0.9.1-passive/daemon/oprofiled.c
 --- oprofile-0.9.1/daemon/oprofiled.c	2005-03-29 09:10:51.000000000 -0800
-+++ oprofile-0.9.1-xen/daemon/oprofiled.c	2005-12-22 12:01:30.000000000 -0800
++++ oprofile-0.9.1-passive/daemon/oprofiled.c	2006-08-22 09:37:36.000000000 -0700
 @@ -7,6 +7,9 @@
   *
   * @author John Levon
@@ -226,26 +430,29 @@
   */
  
  #include "config.h"
-@@ -60,6 +63,9 @@
+@@ -60,6 +63,10 @@
  int no_vmlinux;
  char * vmlinux;
  char * kernel_range;
 +int no_xen;
 +char * xenimage;
 +char * xen_range;
++char * xen_passive_setup;
  static char * verbose;
  static char * binary_name_filter;
  static char * events;
-@@ -75,6 +81,8 @@
+@@ -75,7 +82,10 @@
  	{ "kernel-range", 'r', POPT_ARG_STRING, &kernel_range, 0, "Kernel VMA range", "start-end", },
  	{ "vmlinux", 'k', POPT_ARG_STRING, &vmlinux, 0, "vmlinux kernel image", "file", },
  	{ "no-vmlinux", 0, POPT_ARG_NONE, &no_vmlinux, 0, "vmlinux kernel image file not available", NULL, },
 +	{ "xen-range", 0, POPT_ARG_STRING, &xen_range, 0, "Xen VMA range", "start-end", },
 +	{ "xen-image", 0, POPT_ARG_STRING, &xenimage, 0, "Xen image", "file", },
  	{ "image", 0, POPT_ARG_STRING, &binary_name_filter, 0, "image name filter", "profile these comma separated image" },
++	{ "xen-passive-setup", 0, POPT_ARG_STRING, &xen_passive_setup, 0, "Xen passive domain setup file", "filename", },
  	{ "separate-lib", 0, POPT_ARG_INT, &separate_lib, 0, "separate library samples for each distinct application", "[0|1]", },
  	{ "separate-kernel", 0, POPT_ARG_INT, &separate_kernel, 0, "separate kernel samples for each distinct application", "[0|1]", },
-@@ -407,7 +415,26 @@
+ 	{ "separate-thread", 0, POPT_ARG_INT, &separate_thread, 0, "thread-profiling mode", "[0|1]" },
+@@ -407,7 +417,26 @@
  		poptPrintHelp(optcon, stderr, 0);
  		exit(EXIT_FAILURE);
  	}
@@ -273,9 +480,9 @@
  	opd_parse_events(events);
  
  	opd_parse_image_filter();
-diff -Naur oprofile-0.9.1/daemon/oprofiled.h oprofile-0.9.1-xen/daemon/oprofiled.h
+diff -Naur oprofile-0.9.1/daemon/oprofiled.h oprofile-0.9.1-passive/daemon/oprofiled.h
 --- oprofile-0.9.1/daemon/oprofiled.h	2005-04-26 16:49:45.000000000 -0700
-+++ oprofile-0.9.1-xen/daemon/oprofiled.h	2005-12-22 11:38:09.000000000 -0800
++++ oprofile-0.9.1-passive/daemon/oprofiled.h	2006-08-22 08:46:33.000000000 -0700
 @@ -7,6 +7,9 @@
   *
   * @author John Levon
@@ -286,19 +493,30 @@
   */
  
  #ifndef OPROFILED_H
-@@ -58,5 +61,8 @@
+@@ -58,5 +61,9 @@
  extern int no_vmlinux;
  extern char * vmlinux;
  extern char * kernel_range;
 +extern int no_xen;
 +extern char * xenimage;
 +extern char * xen_range;
++extern char * xen_passive_setup;
  
  #endif /* OPROFILED_H */
-diff -Naur oprofile-0.9.1/doc/opcontrol.1.in oprofile-0.9.1-xen/doc/opcontrol.1.in
+diff -Naur oprofile-0.9.1/doc/opcontrol.1.in oprofile-0.9.1-passive/doc/opcontrol.1.in
 --- oprofile-0.9.1/doc/opcontrol.1.in	2005-04-28 14:09:21.000000000 -0700
-+++ oprofile-0.9.1-xen/doc/opcontrol.1.in	2005-12-22 11:38:09.000000000 -0800
-@@ -129,8 +129,23 @@
++++ oprofile-0.9.1-passive/doc/opcontrol.1.in	2006-08-21 15:31:41.000000000 -0700
+@@ -105,7 +105,8 @@
+ .BI "--callgraph=#depth"
+ Enable callgraph sample collection with a maximum depth. Use 0 to disable
+ callgraph profiling. This option is currently only usable on x86, using a
+-2.6+ kernel with callgraph support enabled.
++2.6+ kernel with callgraph support enabled. This option is not yet supported
++on Xen.
+ .br
+ .TP
+ .BI "--image="[name,name...|"all"]
+@@ -129,8 +130,52 @@
  .BI "--kernel-range="start,end
  Set kernel range vma address in hexadecimal.
  
@@ -309,12 +527,41 @@
 +.br
 +.TP
 +.BI "--active-domains="<list>
-+List of domain ids participating in a multi-domain profiling session. If 
++List of domain ids participating in a multi-domain profiling session. 
++Each of the specified domains must run an instance of oprofile. The 
++sequence of opcontrol commands in each domain must follow a given 
++order which is specified in the oprofile user manual. If 
 +more than one domain is specified in <list> they should be separated using 
 +commas. This option can only be used in domain 0 which is the only domain 
 +that can coordinate a multi-domain profiling session. Including domain 0 in 
 +the list of active domains is optional. (e.g. --active-domains=2,5,6 and 
-+--active-domains=0,2,5,6 are equivalent)
++--active-domains=0,2,5,6 are equivalent).
++This option can only be specified
++if --start-daemon is also specified and it is only 
++valid for the current run of the oprofile daemon; e.g. the list 
++of active domains is not persistent.
++.br
++.TP
++.BI "--passive-domains="<list> or "--domains="<list>
++List of domain ids to be profiled, separated by commas. 
++As opposed to the --active-domains option, the domains specified with this
++option do not need to run oprofile. This makes 
++profiling multiple domains easier. However, with the passive-domains option, 
++samples in user level processes and kernel modules cannot be 
++mapped to specific symbols and are aggregated
++under a generic class. Both --active-domains and --passive-domains 
++options can be specified in the same command, but the same domain cannot be
++specified in both options. This option can only be specified if either --start
++or --start-daemon is specified on the same command and it is only valid for 
++the current run of the oprofile daemon; e.g. the list of passive domains is 
++not persistent.
++.br
++.TP
++.BI "--passive-images="<list> or "--domains-images="<list>
++List of kernel images associated with the domains specified in the
++--passive-domains option, also separated by commas. The association
++between the images and domains is based on the order they are
++specified in both options.
 +.br
 +
  .SH ENVIRONMENT
@@ -323,21 +570,28 @@
  
  .SH FILES
  .TP
-diff -Naur oprofile-0.9.1/utils/opcontrol oprofile-0.9.1-xen/utils/opcontrol
+diff -Naur oprofile-0.9.1/utils/opcontrol oprofile-0.9.1-passive/utils/opcontrol
 --- oprofile-0.9.1/utils/opcontrol	2005-06-16 12:12:07.000000000 -0700
-+++ oprofile-0.9.1-xen/utils/opcontrol	2005-12-22 12:30:56.000000000 -0800
-@@ -144,6 +144,10 @@
++++ oprofile-0.9.1-passive/utils/opcontrol	2006-08-23 17:25:13.000000000 -0700
+@@ -144,6 +144,17 @@
     --buffer-size=num             kernel buffer size in sample units
     --cpu-buffer-size=num         per-cpu buffer size in units (2.6 only)
     --note-table-size             kernel notes buffer size in notes units (2.4 only)
 +
-+   --xen                         Xen image (for Xen only)
-+   --active-domains=<list>       List of domains in profiling session (for Xen only)
-+                                 (list contains domain ids separated by commas)
++   --xen=file                    Xen image (for Xen only)
++   --active-domains=id[,ids]     list of domains in multiple domain profiling session (Xen)
++                                 (detailed profiling of user level and kernel modules code)
++                                 (requires running oprofile on these domains)
++   --passive-domains=id[,ids]    list of domains to be profiled (Xen).
++     or --domains=id[,ids]       (coarse profiling of user level and kernel modules code)
++                                 (no need to run oprofile on these domains)
++   --passive-images=file[,files] list of kernel images associated with each passive domain
++     or 
++   --domain-images=file[,files]
  " >&2
  }
  
-@@ -246,6 +250,7 @@
+@@ -246,6 +257,7 @@
  	CPU_BUF_SIZE=0
  	NOTE_SIZE=0
  	VMLINUX=
@@ -345,7 +599,17 @@
  	VERBOSE=""
  	SEPARATE_LIB=0
  	SEPARATE_KERNEL=0
-@@ -326,6 +331,7 @@
+@@ -259,6 +271,9 @@
+ 	SETUP_DIR="/root/.oprofile"
+ 	SETUP_FILE="$SETUP_DIR/daemonrc"
+ 
++	# location for passing info about passive domains to daemon
++	PASSIVE_SETUP_FILE="$SETUP_DIR/xendomain.setup"
++
+ 	CPUTYPE=`cat $MOUNT/cpu_type`
+ 	OP_COUNTERS=`ls $MOUNT/ | grep "^[0-9]\+\$" | tr "\n" " "`
+ 	NR_CHOSEN=0
+@@ -326,6 +341,7 @@
  		echo "NOTE_SIZE=$NOTE_SIZE" >> $SETUP_FILE
  	fi
  	echo "CALLGRAPH=$CALLGRAPH" >> $SETUP_FILE
@@ -353,33 +617,44 @@
  }
  
  
-@@ -384,35 +390,61 @@
+@@ -363,7 +379,7 @@
+ }
  
- 	echo "The specified vmlinux file \"$VMLINUX\" doesn't exist." >&2
- 	exit 1
-+
+ 
+-check_valid_args()
++check_valid_vmlinux()
+ {
+ 	if test -z "$VMLINUX"; then
+ 		echo "No vmlinux file specified. You must specify the correct vmlinux file, e.g." >&2
+@@ -387,34 +403,134 @@
+ }
+ 
+ 
+-# get start and end points of the kernel
+-get_kernel_range()
 +# similar check for Xen image
++check_valid_xen()
+ {
+-	if test ! -z "$KERNEL_RANGE"; then
+-		return;
 +	if test -f "$XENIMAGE"; then
 +		return
-+	fi
-+
+ 	fi
+ 
+-	if test "$VMLINUX" = "none"; then
 +	if test "$XENIMAGE" = "none"; then
 +		return
 +	fi
 +
 +	echo "The specified XenImage file \"$XENIMAGE\" does not exist." >&2
 +	exit 1
- }
- 
- 
--# get start and end points of the kernel
--get_kernel_range()
++}
++
++
 +# get start and end points of a file image (linux kernel or xen)
 +# get_image_range parameter: $1=type_of_image (linux or xen)
 +get_image_range()
- {
--	if test ! -z "$KERNEL_RANGE"; then
--		return;
++{
 +	if test "$1" = "xen"; then
 +		if test ! -z "$XEN_RANGE"; then
 +			return;
@@ -390,9 +665,8 @@
 +			return;
 +		fi
 +		FILE_IMAGE="$VMLINUX"
- 	fi
- 
--	if test "$VMLINUX" = "none"; then
++	fi
++
 +	if test "$FILE_IMAGE" = "none"; then
  		return;
  	fi
@@ -425,8 +699,80 @@
 +	fi
  }
   
++set_passive_domain()
++{
++	DOMAIN_ID=$1
++	FILE_IMAGE=$2
++	XEN_IMAGE=$3
++
++	if test "$FILE_IMAGE" = "none"; then
++		RANGE="0,0"
++		FILE_IMAGE="domain$DOMAIN_ID-kernel"
++	else
++		# Find VMA range for passive domain kernel image 
++		range_info=`objdump -h $FILE_IMAGE 2>/dev/null | grep " .text "`
++		tmp1=`echo $range_info | awk '{print $4}'`	
++		tmp_length=`echo $range_info | awk  '{print $3}'`
++		tmp2=`objdump -h $FILE_IMAGE --adjust-vma=0x$tmp_length 2>/dev/null | grep " .text " | awk  '{print $4}'`
++
++		if test -z "$tmp1" -o -z "$tmp2"; then
++			echo "The specified file $FILE_IMAGE does not seem to be valid" >&2
++			echo "Make sure you are using the non-compressed image file (e.g. vmlinux not vmlinuz)" >&2
++			vecho "found start as \"$tmp1\", end as \"$tmp2\"" >&2
++			exit 1
++		fi
++		RANGE="`echo $tmp1`,`echo $tmp2`"
++	fi
++	echo " $DOMAIN_ID $FILE_IMAGE $RANGE $XEN_IMAGE" >> $PASSIVE_SETUP_FILE
++}
++
++
++set_passive_domain_config()
++{
++
++	create_dir "$SETUP_DIR"
++
++	touch $PASSIVE_SETUP_FILE
++	chmod 644 $PASSIVE_SETUP_FILE
++	>$PASSIVE_SETUP_FILE
++
++	NDOMAINS=`echo "$PASSIVE_DOMAINS" | awk -F',' '{print NF}'`
++
++	if test -n "$PASSIVE_IMAGES"; then
++		NIMAGES=`echo "$PASSIVE_IMAGES" | awk -F',' '{print NF}'`
++		if [ $NDOMAINS != $NIMAGES ]; then
++			echo "# of passive domains and # of passive images doesn't match." >&2
++			do_help
++			exit 1
++		fi
++
++		for (( i=1; i<=$NDOMAINS; i++ )); do
++			ID=`echo "$PASSIVE_DOMAINS" | awk -F"," '{print $'$i'}'`
++			FILE=`echo "$PASSIVE_IMAGES" | awk -F',' '{print $'$i'}'`
++			if test ! -f "$FILE"; then
++				echo "Image $FILE for passive domain $ID not found." >&2
++				return 1
++			fi
++			LNK_KERNEL=/boot/domain$ID-kernel
++			ln -sf $FILE $LNK_KERNEL
++			LNK_XEN=/boot/domain$ID-xen
++			ln -sf $XENIMAGE $LNK_XEN
++			set_passive_domain $ID $LNK_KERNEL $LNK_XEN 
++		done
++	else
++			for (( i=1; i<=$NDOMAINS; i++ )); do
++				ID=`echo "$PASSIVE_DOMAINS" | awk -F"," '{print $'$i'}'`
++				LNK_XEN=/boot/domain$ID-xen
++				set_passive_domain $ID none $LNK_XEN
++		done 
++
++	fi
++}
++
   
-@@ -692,7 +724,7 @@
+ # validate --separate= parameters. This function is called with IFS=,
+ # so on each argument is splitted
+@@ -692,7 +808,7 @@
  				VMLINUX=$val
  				DO_SETUP=yes
  				# check validity
@@ -435,7 +781,7 @@
  				;;
  			--no-vmlinux)
  				VMLINUX=none
-@@ -703,6 +735,17 @@
+@@ -703,6 +819,27 @@
  				KERNEL_RANGE=$val
  				DO_SETUP=yes
  				;;
@@ -450,10 +796,37 @@
 +				ACTIVE_DOMAINS=$val
 +				DO_SETUP=yes
 +				;;
++			--passive-domains|--domains)
++				error_if_empty $arg $val
++				PASSIVE_DOMAINS=$val
++				DO_SETUP=yes
++				;;
++			--passive-images|--domain-images)
++				error_if_empty $arg $val
++				PASSIVE_IMAGES=$val
++				DO_SETUP=yes
++				;;
  			--note-table-size)
  				error_if_empty $arg $val
  				if test $"KERNEL_SUPPORT" = "yes"; then
-@@ -974,6 +1017,14 @@
+@@ -775,6 +912,16 @@
+ 			exit 1
+ 		fi
+ 	fi
++
++	if test -n "$ACTIVE_DOMAINS" -a "$START_DAEMON" != "yes"; then
++		echo "Option \"--active-domains\" can only be used with option \"-start-daemon\"." >&2
++		exit 1
++	fi
++
++	if test -n "$PASSIVE_DOMAINS" -a "$START_DAEMON" != "yes" -a "$START" != "yes"; then
++		echo "Option \"--passive-domains\" or "--domains" can only be used with option \"--start-daemon\" or \"--start\"." >&2
++		exit 1
++	fi
+ }
+ 
+ 
+@@ -974,6 +1121,23 @@
  		fi
  	fi
  
@@ -465,20 +838,32 @@
 +		fi
 +	fi
 +
++	if test -n "$PASSIVE_DOMAINS"; then
++		if test "$KERNEL_SUPPORT" = "yes"; then
++			echo $PASSIVE_DOMAINS >$MOUNT/passive_domains
++			set_passive_domain_config
++		else
++			echo "passive-domains not supported - ignored" >&2
++		fi
++	fi
++	
  	if test $NOTE_SIZE != 0; then
  		set_param notesize $NOTE_SIZE
  	fi
-@@ -1067,7 +1118,8 @@
+@@ -1066,8 +1230,10 @@
+  
  	do_setup
  	do_load_setup
- 	check_valid_args
+-	check_valid_args
 -	get_kernel_range
++	check_valid_vmlinux
++	check_valid_xen
 +	get_image_range "linux"
 +	get_image_range "xen"
  	do_param_setup
  
  	OPD_ARGS=" \
-@@ -1084,6 +1136,10 @@
+@@ -1084,10 +1250,18 @@
  		OPD_ARGS="$OPD_ARGS --vmlinux=$VMLINUX --kernel-range=$KERNEL_RANGE"
  	fi
  
@@ -489,3 +874,30 @@
  	if ! test -z "$IMAGE_FILTER"; then
  		OPD_ARGS="$OPD_ARGS --image=$IMAGE_FILTER"
  	fi
+ 
++	if ! test -z "$PASSIVE_DOMAINS"; then
++		OPD_ARGS="$OPD_ARGS --xen-passive-setup=$PASSIVE_SETUP_FILE"
++	fi
++
+ 	if test -n "$VERBOSE"; then
+ 		OPD_ARGS="$OPD_ARGS --verbose=$VERBOSE"
+ 	fi
+@@ -1294,6 +1468,8 @@
+ 	move_and_remove $SAMPLES_DIR/current/{root}
+ 
+ 	hup_daemon
++
++	rm -f /boot/domain-*-kernel /boot/domain-*-xen
+ }
+ 
+ 
+@@ -1324,7 +1500,8 @@
+ 	fi
+  
+ 	if test "$SETUP" = "yes"; then
+-		check_valid_args
++		check_valid_vmlinux
++		check_valid_xen
+ 		do_save_setup
+ 	fi
+ 


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- oprofile.spec	19 Jul 2006 13:26:08 -0000	1.47
+++ oprofile.spec	24 Aug 2006 14:04:16 -0000	1.48
@@ -3,7 +3,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.1
-Release: 15
+Release: 16
 License: GPL
 Group: Development/System
 #
@@ -261,6 +261,9 @@
 %{_bindir}/oprof_start
 
 %changelog
+* Thu Aug 24 2006 Will Cohen <wcohen at redhat.com>
+- Update xenoprof patch.
+
 * Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 0.9.1-15
 - rebuild
 - remove silly release definition



From fedora-cvs-commits at redhat.com  Thu Aug 24 14:08:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 10:08:52 -0400
Subject: rpms/am-utils/devel am-utils-6.1.5-nfs-version.patch, NONE,
	1.1 am-utils-6.1.5-rmtab-temp.patch, NONE, 1.1 am-utils.spec,
	1.38, 1.39
Message-ID: <200608241408.k7OE8qh2020832@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/am-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20716

Modified Files:
	am-utils.spec 
Added Files:
	am-utils-6.1.5-nfs-version.patch 
	am-utils-6.1.5-rmtab-temp.patch 
Log Message:
- fix critical bug


am-utils-6.1.5-nfs-version.patch:
 mount/mount_linux.c       |    2 +-
 nfs_prot/nfs_prot_linux.h |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE am-utils-6.1.5-nfs-version.patch ---
--- am-utils-6.1.5/conf/mount/mount_linux.c.kzak	2006-08-24 15:59:24.000000000 +0200
+++ am-utils-6.1.5/conf/mount/mount_linux.c	2006-08-24 15:59:32.000000000 +0200
@@ -277,7 +277,7 @@
   int errorcode;
 
   /* Fake some values for linux */
-  mnt_data->version = NFS_MOUNT_VERSION;
+  mnt_data->version = AMD_NFS_MOUNT_VERSION;
   if (!mnt_data->timeo) {
 #ifdef MNT2_NFS_OPT_TCP
     if (mnt_data->flags & MNT2_NFS_OPT_TCP)
--- am-utils-6.1.5/conf/nfs_prot/nfs_prot_linux.h.kzak	2006-08-24 15:55:02.000000000 +0200
+++ am-utils-6.1.5/conf/nfs_prot/nfs_prot_linux.h	2006-08-24 15:58:27.000000000 +0200
@@ -241,6 +241,13 @@
   u_char	data[FHSIZE3];
 };
 
+/* version of our nsf_mount_data struct
+ * -- we cannot use NFS_MOUNT_VERSION from system kernel 
+ *    headers, because there could version that doesn't 
+ *    match with nfs_args struct.
+ */
+#define AMD_NFS_MOUNT_VERSION	4
+
 struct nfs_args {
   int			version;	/* 1 */
   int			fd;		/* 1 */

am-utils-6.1.5-rmtab-temp.patch:
 fixrmtab.in |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE am-utils-6.1.5-rmtab-temp.patch ---
diff -ur am-utils-6.1.5.orig/scripts/fixrmtab.in am-utils-6.1.5/scripts/fixrmtab.in
--- am-utils-6.1.5.orig/scripts/fixrmtab.in	2006-08-18 16:24:53.000000000 -0400
+++ am-utils-6.1.5/scripts/fixrmtab.in	2006-08-18 16:31:12.000000000 -0400
@@ -11,7 +11,10 @@
 #set -x
 
 RMTAB=/etc/rmtab
-TMP=/tmp/rmtab.$$
+TMP=`mktemp /tmp/rmtab.XXXXXXXX`
+if [ x"$TMP" = "x" ] ; then
+	exit 1
+fi
 
 if [ ! -f /etc/rmtab ]; then
 	exit 0


Index: am-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/am-utils/devel/am-utils.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- am-utils.spec	12 Jul 2006 20:13:00 -0000	1.38
+++ am-utils.spec	24 Aug 2006 14:08:49 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd.
 Name: am-utils
 Version: 6.1.5
-Release: 3
+Release: 4
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -17,6 +17,11 @@
 Prereq: /sbin/install-info, /sbin/chkconfig, grep
 Obsoletes: amd
 
+# 203193 - tmpfile usage
+Patch1: am-utils-6.1.5-rmtab-temp.patch
+# 202180 - amd service doesn't work
+Patch2: am-utils-6.1.5-nfs-version.patch
+
 # We need to filter out some perl requirements for now.
 %define _use_internal_dependency_generator 0
 %define old_find_requires %{__find_requires}
@@ -35,6 +40,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+%patch2 -p1
 
 find_requires=%{old_find_requires}
 echo "$find_requires | grep -v lostaltmail.conf" > find-requires
@@ -129,6 +136,10 @@
 %{_libdir}/libamu.so*
 
 %changelog
+* Tue Aug 24 2006 Karel Zak <kzak at redhat.com> 5:6.1.5-4
+- fix #203193 - tmpfile usage
+- fix #202180 - amd service doesn't work
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5:6.1.5-3
 - rebuild
 - Add missing br flex



From fedora-cvs-commits at redhat.com  Thu Aug 24 14:16:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 10:16:11 -0400
Subject: rpms/acpid/devel acpid.power.conf,NONE,1.1 acpid.spec,1.13,1.14
Message-ID: <200608241416.k7OEGB3L023492@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/acpid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23361

Modified Files:
	acpid.spec 
Added Files:
	acpid.power.conf 
Log Message:
- Made a better fix for the powerdown button which checks if g-p-m is running



--- NEW FILE acpid.power.conf ---
# ACPID config to power down machine if powerbutton is pressed, but only if
# no gnome-power-manager is running

event=button/power.*
action=/bin/ps awwux | /bin/grep gnome-power-manager | /bin/grep -qv grep || /sbin/shutdown -h now


Index: acpid.spec
===================================================================
RCS file: /cvs/dist/rpms/acpid/devel/acpid.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- acpid.spec	10 Aug 2006 15:27:35 -0000	1.13
+++ acpid.spec	24 Aug 2006 14:16:09 -0000	1.14
@@ -1,13 +1,14 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.4
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
 Source1: acpid.logrotate
 Source2: acpid.init
 Source3: acpid.video.conf
+Source4: acpid.power.conf
 Patch2: acpid-1.0.3-makefile.patch
 Patch3: acpid-1.0.4-warning.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -39,6 +40,7 @@
 chmod 755 $RPM_BUILD_ROOT/etc/acpi/events
 install -m 644 samples/sample.conf $RPM_BUILD_ROOT/etc/acpi/events
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/acpi/events/video.conf
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/acpi/events/power.conf
 
 mkdir -p $RPM_BUILD_ROOT/var/log
 touch $RPM_BUILD_ROOT/var/log/acpid
@@ -60,8 +62,8 @@
 %dir /etc/acpi
 %dir /etc/acpi/events
 %dir /etc/acpi/actions
-%config %attr(0644,root,root) /etc/acpi/events/sample.conf
 %config %attr(0644,root,root) /etc/acpi/events/video.conf
+%config %attr(0644,root,root) /etc/acpi/events/power.conf
 %config /etc/logrotate.d/acpid
 %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/acpid
 /usr/bin/acpi_listen
@@ -86,6 +88,9 @@
 fi
 
 %changelog
+* Thu Aug 24 2006 Phil Knirsch <pknirsch at redhat.com> - 1.0.4-4
+- Made a better fix for the powerdown button which checks if g-p-m is running
+
 * Thu Aug 10 2006 Phil Knirsch <pknirsch at redhat.com> - 1.0.4-3
 - Disable the automatic shutdown -h via powerdown button by default due to
   conflicts with gnome-power-manager



From fedora-cvs-commits at redhat.com  Thu Aug 24 14:20:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 10:20:57 -0400
Subject: rpms/acpid/devel acpid.spec,1.14,1.15
Message-ID: <200608241420.k7OEKvRV007726@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/acpid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7646

Modified Files:
	acpid.spec 
Log Message:
- Removed sample.conf, not needed anymore



Index: acpid.spec
===================================================================
RCS file: /cvs/dist/rpms/acpid/devel/acpid.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- acpid.spec	24 Aug 2006 14:16:09 -0000	1.14
+++ acpid.spec	24 Aug 2006 14:20:55 -0000	1.15
@@ -38,7 +38,6 @@
 mkdir -p $RPM_BUILD_ROOT/etc/acpi/events
 mkdir -p $RPM_BUILD_ROOT/etc/acpi/actions
 chmod 755 $RPM_BUILD_ROOT/etc/acpi/events
-install -m 644 samples/sample.conf $RPM_BUILD_ROOT/etc/acpi/events
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/acpi/events/video.conf
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/acpi/events/power.conf
 
@@ -90,6 +89,7 @@
 %changelog
 * Thu Aug 24 2006 Phil Knirsch <pknirsch at redhat.com> - 1.0.4-4
 - Made a better fix for the powerdown button which checks if g-p-m is running
+- Don't install sample.conf anymore, not needed
 
 * Thu Aug 10 2006 Phil Knirsch <pknirsch at redhat.com> - 1.0.4-3
 - Disable the automatic shutdown -h via powerdown button by default due to



From fedora-cvs-commits at redhat.com  Thu Aug 24 14:34:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 10:34:34 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.124, 1.125 kudzu.spec, 1.142,
	1.143 sources, 1.140, 1.141
Message-ID: <200608241434.k7OEYYkL011376@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11327

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- .cvsignore	17 Aug 2006 18:25:34 -0000	1.124
+++ .cvsignore	24 Aug 2006 14:34:31 -0000	1.125
@@ -1 +1 @@
-kudzu-1.2.43.tar.gz
+kudzu-1.2.44.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- kudzu.spec	17 Aug 2006 18:25:34 -0000	1.142
+++ kudzu.spec	24 Aug 2006 14:34:31 -0000	1.143
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.43
+Version: 1.2.44
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Thu Aug 24 2006 Bill Nottingham <notting at redhat.com> - 1.2.44-1
+- remove debugging noise (#203909)
+
 * Thu Aug 17 2006 Bill Nottingham <notting at redhat.com> - 1.2.43-1
 - fix the fix for #195934
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- sources	17 Aug 2006 18:25:34 -0000	1.140
+++ sources	24 Aug 2006 14:34:31 -0000	1.141
@@ -1 +1 @@
-79b14dc7f6e4c6c938f05085bdd9df09  kudzu-1.2.43.tar.gz
+74055ec27b41d3b03b6b298552d77ed8  kudzu-1.2.44.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 24 14:38:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 10:38:19 -0400
Subject: rpms/frysk/devel .cvsignore, 1.27, 1.28 frysk.spec, 1.86,
	1.87 sources, 1.27, 1.28
Message-ID: <200608241438.k7OEcJvP012243@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12211

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
- New upstream version.
- Add Requires: libgconf-java


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	22 Aug 2006 07:28:22 -0000	1.27
+++ .cvsignore	24 Aug 2006 14:38:17 -0000	1.28
@@ -1 +1 @@
-frysk-0.0.1.2006.08.22.rh1.tar.bz2
+frysk-0.0.1.2006.08.24.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- frysk.spec	22 Aug 2006 07:28:22 -0000	1.86
+++ frysk.spec	24 Aug 2006 14:38:17 -0000	1.87
@@ -1,6 +1,6 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.08.22.rh1
+Version:	0.0.1.2006.08.24.rh1
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
@@ -14,6 +14,7 @@
 
 Requires:   	libglade-java >= 2.12.5
 Requires: 	libvte-java >= 0.12.0
+Requires:   	libgconf-java
 BuildRequires:  gcc-java >= 4.1.1
 BuildRequires:	junit >= 3.8.1
 BuildRequires:  antlr >= 2.7.4 
@@ -112,6 +113,10 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Thu Aug 24 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.24.rh1-1
+- New upstream version.
+- Add Requires: libgconf-java
+
 * Tue Aug 22 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.22.rh1-1
 - New upstream version.
 - Add BuildRequires: gnome-python2-gconf, remove BuildRequires: ghostscript.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	22 Aug 2006 07:28:22 -0000	1.27
+++ sources	24 Aug 2006 14:38:17 -0000	1.28
@@ -1 +1 @@
-52c506834fff266296f621b5f103c2a4  frysk-0.0.1.2006.08.22.rh1.tar.bz2
+162180563ebbcf828c09a2d8e9a4e5a3  frysk-0.0.1.2006.08.24.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 24 15:28:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 11:28:33 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.237.8.5,
	1.237.8.6 config-ia64, 1.1, 1.1.128.1
Message-ID: <200608241528.k7OFSX41030807@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv30758/configs

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-generic config-ia64 
Log Message:
more beta1 fixes...
see changelog for list




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237.8.5
retrieving revision 1.237.8.6
diff -u -r1.237.8.5 -r1.237.8.6
--- config-generic	23 Aug 2006 14:36:12 -0000	1.237.8.5
+++ config-generic	24 Aug 2006 15:28:30 -0000	1.237.8.6
@@ -445,6 +445,23 @@
 CONFIG_SCSI_PDC_ADMA=m
 CONFIG_SCSI_HPTIOP=m
 
+CONFIG_ATA=y
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_SIL24=m
+CONFIG_PDC_ADMA=m
+
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_INITIO=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set


Index: config-ia64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64,v
retrieving revision 1.1
retrieving revision 1.1.128.1
diff -u -r1.1 -r1.1.128.1
--- config-ia64	6 Feb 2005 05:49:11 -0000	1.1
+++ config-ia64	24 Aug 2006 15:28:30 -0000	1.1.128.1
@@ -1 +1,3 @@
+CONFIG_CRASH_DUMP=y
+CONFIG_PROC_VMCORE=y
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 15:28:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 11:28:32 -0400
Subject: rpms/kernel/devel config-rhel-x86-generic, NONE,
	1.1.2.1 linux-2.6-ia64-kexec-kdump-xen-conflict.patch, NONE,
	1.1.2.1 linux-2.6-ia64-kexec-kdump.patch, NONE,
	1.1.2.1 linux-2.6-sata-big-update.patch, NONE,
	1.1.2.1 linux-2.6-sata-move-to-drivers-ata.patch, NONE,
	1.1.2.1 linux-2.6-x86-relocatable.patch, NONE,
	1.1.2.1 linux-2.6-xen-x86-relocatable.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2519.4.9,
	1.2519.4.10 linux-2.6-gfs2-dlm.patch, 1.12.4.3,
	1.12.4.4 linux-2.6-utrace.patch, 1.12.4.3, 1.12.4.4
Message-ID: <200608241528.k7OFSW94030788@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30758

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec linux-2.6-gfs2-dlm.patch 
	linux-2.6-utrace.patch 
Added Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-rhel-x86-generic 
	linux-2.6-ia64-kexec-kdump-xen-conflict.patch 
	linux-2.6-ia64-kexec-kdump.patch 
	linux-2.6-sata-big-update.patch 
	linux-2.6-sata-move-to-drivers-ata.patch 
	linux-2.6-x86-relocatable.patch 
	linux-2.6-xen-x86-relocatable.patch 
Log Message:
more beta1 fixes...
see changelog for list




--- NEW FILE config-rhel-x86-generic ---
CONFIG_PHYSICAL_ALIGN=0x400000
CONFIG_CRASH_DUMP=y
CONFIG_PROC_VMCORE=y
CONFIG_RELOCATABLE=y


linux-2.6-ia64-kexec-kdump-xen-conflict.patch:
 meminit.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-ia64-kexec-kdump-xen-conflict.patch ---
diff -Nraup a/include/asm-ia64/meminit.h b/include/asm-ia64/meminit.h
--- a/include/asm-ia64/meminit.h        2006-08-15 05:52:24.000000000 +0800
+++ b/include/asm-ia64/meminit.h        2006-08-15 09:50:03.000000000 +0800
@@ -15,15 +15,16 @@
  * 	- initrd (optional)
  * 	- command line string
  * 	- kernel code & data
+ *	- crash dumping code reserved region
  * 	- Kernel memory map built from EFI memory map
  *	- xen start info
  *
  * More could be added if necessary
  */
 #ifndef CONFIG_XEN
-#define IA64_MAX_RSVD_REGIONS 6
-#else
 #define IA64_MAX_RSVD_REGIONS 7
+#else
+#define IA64_MAX_RSVD_REGIONS 8
 #endif
 
 struct rsvd_region {

linux-2.6-ia64-kexec-kdump.patch:
 arch/ia64/Kconfig                  |   23 +
 arch/ia64/hp/common/sba_iommu.c    |   22 +
 arch/ia64/kernel/Makefile          |    1 
 arch/ia64/kernel/crash.c           |  119 ++++++++
 arch/ia64/kernel/efi.c             |   19 +
 arch/ia64/kernel/entry.S           |    2 
 arch/ia64/kernel/iosapic.c         |   19 +
 arch/ia64/kernel/machine_kexec.c   |  139 ++++++++++
 arch/ia64/kernel/relocate_kernel.S |  490 +++++++++++++++++++++++++++++++++++++
 arch/ia64/kernel/setup.c           |   44 +++
 arch/ia64/kernel/smp.c             |   55 ++++
 include/asm-ia64/kexec.h           |   40 +++
 include/asm-ia64/machvec_hpzx1.h   |    2 
 include/asm-ia64/smp.h             |    3 
 kernel/irq/manage.c                |    1 
 15 files changed, 973 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-ia64-kexec-kdump.patch ---

The fix and change in this patch include

1. According to suggestion from Dave,
   I put an extra switch stack frame on each CPU to help crash utility 
   to run bt command.	  

2. Fix issue reported by Fujitsu that crash kernel can't startup 
   with CONFIG_SPARSEMEM 
   
3. More simplified crash path.


Signed-off-by: Zou Nan hai <nanhai.zou at intel.com>

 

diff -Nraup linux-2.6.18-rc4/arch/ia64/hp/common/sba_iommu.c linux-2.6.18-rc4-kdump/arch/ia64/hp/common/sba_iommu.c
--- linux-2.6.18-rc4/arch/ia64/hp/common/sba_iommu.c	2006-08-19 12:46:42.000000000 +0800
+++ linux-2.6.18-rc4-kdump/arch/ia64/hp/common/sba_iommu.c	2006-08-19 12:54:10.000000000 +0800
@@ -1623,6 +1623,28 @@ ioc_iova_init(struct ioc *ioc)
 	READ_REG(ioc->ioc_hpa + IOC_IBASE);
 }
 
+#ifdef CONFIG_KEXEC
+void
+ioc_iova_disable(void)
+{
+	struct ioc *ioc;
+
+	ioc = ioc_list;
+
+	while (ioc != NULL) {
+		/* Disable IOVA translation */
+		WRITE_REG(ioc->ibase & 0xfffffffffffffffe, ioc->ioc_hpa + IOC_IBASE);
+		READ_REG(ioc->ioc_hpa + IOC_IBASE);
+
+		/* Clear I/O TLB of any possible entries */
+		WRITE_REG(ioc->ibase | (get_iovp_order(ioc->iov_size) + iovp_shift), ioc->ioc_hpa + IOC_PCOM);
+		READ_REG(ioc->ioc_hpa + IOC_PCOM);
+
+		ioc = ioc->next;
+	}
+}
+#endif
+
 static void __init
 ioc_resource_init(struct ioc *ioc)
 {
diff -Nraup linux-2.6.18-rc4/arch/ia64/Kconfig linux-2.6.18-rc4-kdump/arch/ia64/Kconfig
--- linux-2.6.18-rc4/arch/ia64/Kconfig	2006-08-19 12:46:42.000000000 +0800
+++ linux-2.6.18-rc4-kdump/arch/ia64/Kconfig	2006-08-19 12:54:10.000000000 +0800
@@ -427,6 +427,29 @@ config SGI_SN
 
 source "drivers/sn/Kconfig"
 
+config KEXEC
+	bool "kexec system call (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	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
+	  but it is indepedent of the system firmware.   And like a reboot
+	  you can start any kernel with it, not just Linux.
+
+	  The name comes from the similiarity to the exec system call.
+
+	  It is an ongoing process to be certain the hardware in a machine
+	  is properly shutdown, so do not be surprised if this code does not
+	  initially work for you.  It may help to enable device hotplugging
+	  support.  As of this writing the exact hardware interface is
+	  strongly in flux, so no good recommendation can be made.
+
+config CRASH_DUMP
+	  bool "kernel crash dumps (EXPERIMENTAL)"
+	  depends on EXPERIMENTAL
+	  help
+	    Generate crash dump after being started by kexec.
+
 source "drivers/firmware/Kconfig"
 
 source "fs/Kconfig.binfmt"
diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/crash.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/crash.c
--- linux-2.6.18-rc4/arch/ia64/kernel/crash.c	1970-01-01 08:00:00.000000000 +0800
+++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/crash.c	2006-08-19 12:54:10.000000000 +0800
@@ -0,0 +1,119 @@
+/*
+ * arch/ia64/kernel/crash.c
+ *
+ * Architecture specific (ia64) functions for kexec based crash dumps.
+ *
+ * Created by: Khalid Aziz <khalid.aziz at hp.com>
+ * Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
+ * Copyright (C) 2005 Intel Corp	Zou Nan hai <nanhai.zou at intel.com>
+ *
+ */
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/smp.h>
+#include <linux/irq.h>
+#include <linux/pci.h>
+#include <linux/reboot.h>
+#include <linux/kexec.h>
+#include <linux/irq.h>
+#include <linux/delay.h>
+#include <linux/elf.h>
+#include <linux/elfcore.h>
+#include <linux/device.h>
+#include <asm/uaccess.h>
+
+size_t copy_oldmem_page(unsigned long pfn, char *buf,
+                               size_t csize, unsigned long offset, int userbuf)
+{
+        void  *vaddr;
+
+        if (!csize)
+                return 0;
+        vaddr = __va(pfn<<PAGE_SHIFT);
+        if (userbuf) {
+                if (copy_to_user(buf, (vaddr + offset), csize)) {
+                        return -EFAULT;
+                }
+        } else
+                memcpy(buf, (vaddr + offset), csize);
+        return csize;
+}
+
+static void device_shootdown(void)
+{
+	kdump_disable_iosapic();
+#ifdef CONFIG_IA64_HP_ZX1
+	ioc_iova_disable();
+#endif
+}
+
+static inline Elf64_Word
+*append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data,
+		size_t data_len)
+{
+	struct elf_note *note = (struct elf_note *)buf;
+	note->n_namesz = strlen(name) + 1;
+	note->n_descsz = data_len;
+	note->n_type   = type;
+	buf += (sizeof(*note) + 3)/4;
+	memcpy(buf, name, note->n_namesz);
+	buf += (note->n_namesz + 3)/4;
+	memcpy(buf, data, data_len);
+	buf += (data_len + 3)/4;
+	return buf;
+}
+
+static void
+final_note(void *buf)
+{
+	memset(buf, 0, sizeof(struct elf_note));
+}
+
+extern void ia64_dump_cpu_regs(void *);
+
+void
+crash_save_this_cpu()
+{
+	void *buf;
+	struct elf_prstatus prstatus;
+	int cpu = smp_processor_id();
+	unsigned long cfm, sof, sol;
+	elf_greg_t *dst = (elf_greg_t *)&prstatus.pr_reg;
+	memset(&prstatus, 0, sizeof(prstatus));
+	prstatus.pr_pid = current->pid;
+
+	ia64_dump_cpu_regs(dst);
+        cfm = dst[43];
+        sol = (cfm >> 7) & 0x7f;
+        sof = cfm & 0x7f;
+        dst[46] = (unsigned long)ia64_rse_skip_regs((unsigned long *)dst[46],
+                        sof - sol);
+
+        buf = (u64 *) per_cpu_ptr(crash_notes, cpu);
+	if (!buf)
+		return;
+	buf = append_elf_note(buf, "CORE", NT_PRSTATUS, &prstatus,
+		sizeof(prstatus));
+	final_note(buf);
+}
+
+void
+machine_crash_shutdown(struct pt_regs *pt)
+{
+	/* This function is only called after the system
+	 * has paniced or is otherwise in a critical state.
+	 * The minimum amount of code to allow a kexec'd kernel
+	 * to run successfully needs to happen here.
+	 *
+	 * In practice this means shooting down the other cpus in
+	 * an SMP system.
+	 */
+	if (in_interrupt())
+		ia64_eoi();
+	device_shootdown();
+#ifdef CONFIG_SMP
+	kdump_smp_send_stop();
+#endif
+	udelay(1000000);
+}
diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/efi.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/efi.c
--- linux-2.6.18-rc4/arch/ia64/kernel/efi.c	2006-08-19 12:46:42.000000000 +0800
+++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/efi.c	2006-08-19 12:54:10.000000000 +0800
@@ -26,6 +26,7 @@
 #include <linux/types.h>
 #include <linux/time.h>
 #include <linux/efi.h>
+#include <linux/kexec.h>
 
 #include <asm/io.h>
 #include <asm/kregs.h>
@@ -41,7 +42,7 @@ extern efi_status_t efi_call_phys (void 
 struct efi efi;
 EXPORT_SYMBOL(efi);
 static efi_runtime_services_t *runtime;
-static unsigned long mem_limit = ~0UL, max_addr = ~0UL;
+static unsigned long mem_limit = ~0UL, max_addr = ~0UL, min_addr = 0UL;
 
 #define efi_call_virt(f, args...)	(*(f))(args)
 
@@ -421,6 +422,8 @@ efi_init (void)
 			mem_limit = memparse(cp + 4, &cp);
 		} else if (memcmp(cp, "max_addr=", 9) == 0) {
 			max_addr = GRANULEROUNDDOWN(memparse(cp + 9, &cp));
+		} else if (memcmp(cp, "min_addr=", 9) == 0) {
+			min_addr = GRANULEROUNDDOWN(memparse(cp + 9, &cp));
 		} else {
 			while (*cp != ' ' && *cp)
 				++cp;
@@ -428,6 +431,8 @@ efi_init (void)
 				++cp;
 		}
 	}
+	if (min_addr != 0UL)
+		printk(KERN_INFO "Ignoring memory below %luMB\n", min_addr >> 20);
 	if (max_addr != ~0UL)
 		printk(KERN_INFO "Ignoring memory above %luMB\n", max_addr >> 20);
 
@@ -894,7 +899,8 @@ find_memmap_space (void)
 		as = max(contig_low, md->phys_addr);
 		ae = min(contig_high, efi_md_end(md));
 
-		/* keep within max_addr= command line arg */
+		/* keep within max_addr= and min_addr= command line arg */
+		as = max(as, min_addr);
 		ae = min(ae, max_addr);
 		if (ae <= as)
 			continue;
@@ -1004,7 +1010,8 @@ efi_memmap_init(unsigned long *s, unsign
 		} else
 			ae = efi_md_end(md);
 
-		/* keep within max_addr= command line arg */
+		/* keep within max_addr= and min_addr= command line arg */
+		as = max(as, min_addr);
 		ae = min(ae, max_addr);
 		if (ae <= as)
 			continue;
@@ -1116,6 +1123,12 @@ efi_initialize_iomem_resources(struct re
 			 */
 			insert_resource(res, code_resource);
 			insert_resource(res, data_resource);
+#ifdef CONFIG_KEXEC
+                        insert_resource(res, &efi_memmap_res);
+                        insert_resource(res, &boot_param_res);
+			if (crashk_res.end > crashk_res.start)
+				insert_resource(res, &crashk_res);
+#endif
 		}
 	}
 }
diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/entry.S linux-2.6.18-rc4-kdump/arch/ia64/kernel/entry.S
--- linux-2.6.18-rc4/arch/ia64/kernel/entry.S	2006-08-19 12:46:42.000000000 +0800
+++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/entry.S	2006-08-19 12:54:10.000000000 +0800
@@ -1575,7 +1575,7 @@ sys_call_table:
 	data8 sys_mq_timedreceive		// 1265
 	data8 sys_mq_notify
 	data8 sys_mq_getsetattr
-	data8 sys_ni_syscall			// reserved for kexec_load
+	data8 sys_kexec_load
 	data8 sys_ni_syscall			// reserved for vserver
 	data8 sys_waitid			// 1270
 	data8 sys_add_key
diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/iosapic.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/iosapic.c
--- linux-2.6.18-rc4/arch/ia64/kernel/iosapic.c	2006-08-19 12:46:42.000000000 +0800
+++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/iosapic.c	2006-08-19 12:54:10.000000000 +0800
@@ -288,6 +288,25 @@ nop (unsigned int irq)
 	/* do nothing... */
 }
 
+#ifdef CONFIG_CRASH_DUMP
+void
+kdump_disable_iosapic(void)
+{
+	u32 low32;
+	struct iosapic_intr_info *info;
+	struct iosapic_rte_info *rte;
+	for (info = iosapic_intr_info; info <
+			iosapic_intr_info + IA64_NUM_VECTORS; ++info) {
+		low32 = info->low32 |= IOSAPIC_MASK;
+		list_for_each_entry(rte, &info->rtes,
+				rte_list) {
+			iosapic_write(rte->addr,
+					IOSAPIC_RTE_LOW(rte->rte_index), low32);
+		}
+	}
+}
+#endif
+
 static void
 mask_irq (unsigned int irq)
 {
diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/machine_kexec.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/machine_kexec.c
--- linux-2.6.18-rc4/arch/ia64/kernel/machine_kexec.c	1970-01-01 08:00:00.000000000 +0800
+++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/machine_kexec.c	2006-08-19 12:54:10.000000000 +0800
@@ -0,0 +1,139 @@
+/*
+ * arch/ia64/kernel/machine_kexec.c
+ *
+ * Handle transition of Linux booting another kernel
+ * Copyright (C) 2005 Hewlett-Packard Development Comapny, L.P.
+ * Copyright (C) 2005 Khalid Aziz <khalid.aziz at hp.com>
+ * Copyright (C) 2006 Intel Corp, Zou Nan hai <nanhai.zou at intel.com>
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/config.h>
+#include <linux/mm.h>
+#include <linux/kexec.h>
+#include <linux/pci.h>
+#include <linux/cpu.h>
+#include <asm/mmu_context.h>
+#include <asm/setup.h>
+#include <asm/mca.h>
+#include <asm/page.h>
+#include <asm/bitops.h>
+#include <asm/tlbflush.h>
+#include <asm/delay.h>
+#include <asm/meminit.h>
+
+typedef void (*relocate_new_kernel_t)(unsigned long, unsigned long,
+		struct ia64_boot_param *, unsigned long);
+static struct kimage *ia64_kimage;
+struct resource efi_memmap_res = {
+        .name  = "EFI Memory Map",
+        .start = 0,
+        .end   = 0,
+        .flags = IORESOURCE_BUSY | IORESOURCE_MEM
+};
+
+struct resource boot_param_res = {
+        .name  = "Boot parameter",
+        .start = 0,
+        .end   = 0,
+        .flags = IORESOURCE_BUSY | IORESOURCE_MEM
+};
+
+
+/*
+ * Do what every setup is needed on image and the
+ * reboot code buffer to allow us to avoid allocations
+ * later.
+ */
+int machine_kexec_prepare(struct kimage *image)
+{
+	void *control_code_buffer;
+	const unsigned long *func;
+
+	func = (unsigned long *)&relocate_new_kernel;
+	/* Pre-load control code buffer to minimize work in kexec path */
+	control_code_buffer = page_address(image->control_code_page);
+	memcpy((void *)control_code_buffer, (const void *)func[0],
+			relocate_new_kernel_size);
+	flush_icache_range((unsigned long)control_code_buffer,
+			(unsigned long)control_code_buffer + relocate_new_kernel_size);
+	ia64_kimage = image;
+
+	return 0;
+}
+
+void machine_kexec_cleanup(struct kimage *image)
+{
+}
+
+void machine_shutdown(void)
+{
+#ifdef CONFIG_HOTPLUG_CPU
+	{
+		int cpu;
+
+		for_each_online_cpu(cpu) {
+			if (cpu != smp_processor_id())
+				cpu_down(cpu);
+		}
+	}
+#elif defined(CONFIG_SMP)
+	smp_call_function(kexec_stop_this_cpu, (void *)ia64_kimage->start, 0, 0);
+#endif
+#ifdef CONFIG_PCI
+	{
+		struct pci_dev *dev = NULL;
+		irq_desc_t *idesc;
+		/* Disable all PCI devices */
+		while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+			if (!(dev->is_enabled))
+				continue;
+			idesc = irq_desc + dev->irq;
+			if (!idesc||!idesc->chip)
+				continue;
+			disable_irq_nosync(dev->irq);
+			idesc->chip->end(dev->irq);
+			idesc->action = NULL;
+			pci_disable_device(dev);
+		}
+	}
+#endif
+
+#ifdef CONFIG_IA64_HP_ZX1
+	ioc_iova_disable();
+#endif
+}
+
+/*
+ * Do not allocate memory (or fail in any way) in machine_kexec().
+ * We are past the point of no return, committed to rebooting now.
+ */
+extern void *efi_get_pal_addr(void);
+static void ia64_machine_kexec(struct unw_frame_info *info, void *arg) 
+{
+	struct kimage *image = arg;
+	relocate_new_kernel_t rnk;
+	void *pal_addr = efi_get_pal_addr();
+	unsigned long code_addr = (unsigned long)page_address(image->control_code_page);
+	if (image->type == KEXEC_TYPE_CRASH) {
+		crash_save_this_cpu();
+		current->thread.ksp = (__u64)info->sw - 16;
+	}
+
+	/* Interrupts aren't acceptable while we reboot */
+	ia64_set_itv(1<<16);
+	local_irq_disable();
+	rnk = (relocate_new_kernel_t)&code_addr;
+	(*rnk)(image->head, image->start, ia64_boot_param,
+		     GRANULEROUNDDOWN((unsigned long) pal_addr));
+	BUG();
+} 
+
+void machine_kexec(struct kimage *image)
+{
+	unw_init_running(ia64_machine_kexec, image);
+	for(;;);
+}
diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/Makefile linux-2.6.18-rc4-kdump/arch/ia64/kernel/Makefile
--- linux-2.6.18-rc4/arch/ia64/kernel/Makefile	2006-08-19 12:46:42.000000000 +0800
+++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/Makefile	2006-08-19 12:54:10.000000000 +0800
@@ -28,6 +28,7 @@ obj-$(CONFIG_IA64_CYCLONE)	+= cyclone.o
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_IA64_MCA_RECOVERY)	+= mca_recovery.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o jprobes.o
+obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o
 obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)	+= uncached.o
 obj-$(CONFIG_AUDIT)		+= audit.o
 mca_recovery-y			+= mca_drv.o mca_drv_asm.o
diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/relocate_kernel.S linux-2.6.18-rc4-kdump/arch/ia64/kernel/relocate_kernel.S
--- linux-2.6.18-rc4/arch/ia64/kernel/relocate_kernel.S	1970-01-01 08:00:00.000000000 +0800
+++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/relocate_kernel.S	2006-08-19 12:54:10.000000000 +0800
@@ -0,0 +1,490 @@
+/*
+ * arch/ia64/kernel/relocate_kernel.S
+ *
+ * Relocate kexec'able kernel and start it
+ *
+ * Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
+ * Copyright (C) 2005 Khalid Aziz  <khalid.aziz at hp.com>
+ * Copyright (C) 2005 Intel Corp,  Zou Nan hai <nanhai.zou at intel.com>
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+#include <linux/config.h>
+#include <asm/asmmacro.h>
+#include <asm/kregs.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+#include <asm/mca_asm.h>
+
+       /* Must be relocatable PIC code callable as a C function
+        */
+GLOBAL_ENTRY(relocate_new_kernel)
+	.prologue
+	alloc r31=ar.pfs,4,0,0,0
+        .body
+.reloc_entry:
+{
+	rsm psr.i| psr.ic
+	mov r2=ip
+}
+	;;
+{
+        flushrs                         // must be first insn in group
+        srlz.i
+}
+	;;
+	dep r2=0,r2,61,3		//to physical address
+	;;
+	//first switch to physical mode
+	add r3=1f-.reloc_entry, r2
+	movl r16 = IA64_PSR_AC|IA64_PSR_BN|IA64_PSR_IC
+	mov ar.rsc=0	          	// put RSE in enforced lazy mode
+	;;
+	add sp=(memory_stack_end - 16 - .reloc_entry),r2
+	add r8=(register_stack - .reloc_entry),r2
+	;;
+	mov r18=ar.rnat
+	mov ar.bspstore=r8
+	;;
+        mov cr.ipsr=r16
+        mov cr.iip=r3
+        mov cr.ifs=r0
+	srlz.i
+	;;
+	mov ar.rnat=r18
+	rfi
+	;;
+1:
+	//physical mode code begin
+	mov b6=in1
+	dep r28=0,in2,61,3	//to physical address
+
+	// purge all TC entries
+#define O(member)       IA64_CPUINFO_##member##_OFFSET
+        GET_THIS_PADDR(r2, cpu_info)    // load phys addr of cpu_info into r2
+        ;;
+        addl r17=O(PTCE_STRIDE),r2
+        addl r2=O(PTCE_BASE),r2
+        ;;
+        ld8 r18=[r2],(O(PTCE_COUNT)-O(PTCE_BASE));;    	// r18=ptce_base
+        ld4 r19=[r2],4                                  // r19=ptce_count[0]
+        ld4 r21=[r17],4                                 // r21=ptce_stride[0]
+        ;;
+        ld4 r20=[r2]                                    // r20=ptce_count[1]
+        ld4 r22=[r17]                                   // r22=ptce_stride[1]
+        mov r24=r0
+        ;;
+        adds r20=-1,r20
+        ;;
+#undef O
+2:
+        cmp.ltu p6,p7=r24,r19
+(p7)    br.cond.dpnt.few 4f
+        mov ar.lc=r20
+3:
+        ptc.e r18
+        ;;
+        add r18=r22,r18
+        br.cloop.sptk.few 3b
+        ;;
+        add r18=r21,r18
+        add r24=1,r24
+        ;;
+        br.sptk.few 2b
+4:
+        srlz.i
+        ;;
+	//purge TR entry for kernel text and data
+        movl r16=KERNEL_START
+        mov r18=KERNEL_TR_PAGE_SHIFT<<2
+        ;;
+        ptr.i r16, r18
+        ptr.d r16, r18
+        ;;
+        srlz.i
+        ;;
+
+	// purge TR entry for percpu data
+        movl r16=PERCPU_ADDR
+        mov r18=PERCPU_PAGE_SHIFT<<2
+        ;;
+        ptr.d r16,r18
+        ;;
+        srlz.d
+	;;
+
+        // purge TR entry for pal code
+        mov r16=in3
+        mov r18=IA64_GRANULE_SHIFT<<2
+        ;;
+        ptr.i r16,r18
+        ;;
+        srlz.i
+	;;
+
+        // purge TR entry for stack
+        mov r16=IA64_KR(CURRENT_STACK)
+        ;;
+        shl r16=r16,IA64_GRANULE_SHIFT
+        movl r19=PAGE_OFFSET
+        ;;
+        add r16=r19,r16
+        mov r18=IA64_GRANULE_SHIFT<<2
+        ;;
+        ptr.d r16,r18
+        ;;
+        srlz.i
+	;;
+
+	//copy segments
+	movl r16=PAGE_MASK
+        mov  r30=in0                    // in0 is page_list
+        br.sptk.few .dest_page
+	;;
+.loop:
+	ld8  r30=[in0], 8;;
+.dest_page:
+	tbit.z p0, p6=r30, 0;;    	// 0x1 dest page
+(p6)	and r17=r30, r16
+(p6)	br.cond.sptk.few .loop;;
+
+	tbit.z p0, p6=r30, 1;;		// 0x2 indirect page
+(p6)	and in0=r30, r16
+(p6)	br.cond.sptk.few .loop;;
+
+	tbit.z p0, p6=r30, 2;;		// 0x4 end flag
+(p6)	br.cond.sptk.few .end_loop;;
+
+	tbit.z p6, p0=r30, 3;;		// 0x8 source page
+(p6)	br.cond.sptk.few .loop
+
+	and r18=r30, r16
+
+	// simple copy page, may optimize later
+	movl r14=PAGE_SIZE/8 - 1;;
+	mov ar.lc=r14;;
+1:
+	ld8 r14=[r18], 8;;
+	st8 [r17]=r14, 8;;
+	fc.i r17
+	br.ctop.sptk.few 1b
+	br.sptk.few .loop
+	;;
+
+.end_loop:
+	sync.i			// for fc.i
+	;;
+	srlz.i
+	;;
+	srlz.d
+	;;
+	br.call.sptk.many b0=b6;;
+
+.align  32
+memory_stack:
+	.fill           8192, 1, 0
+memory_stack_end:
+register_stack:
+	.fill           8192, 1, 0
+register_stack_end:
+relocate_new_kernel_end:
+END(relocate_new_kernel)
+
+GLOBAL_ENTRY(kexec_fake_sal_rendez)
+	.prologue
+	alloc r31=ar.pfs,3,0,0,0
+	.body
+.rendez_entry:
+	rsm	psr.i | psr.ic
+	mov r25=ip
+	;;
+	{
+		flushrs
+		srlz.i
+	}
+	;;
+       /* See where I am running, and compute gp */
+	{
+		mov     ar.rsc = 0      /* Put RSE in enforce lacy, LE mode */
+		mov     gp = ip         /* gp == relocate_new_kernel */
+	}
+
+	movl r8=0x00000100000000
+	;;
+	mov cr.iva=r8
+	/* Transition from virtual to physical mode */
+	srlz.i
+	;;
+	add	r17=5f-.rendez_entry, r25
+	movl	r16=(IA64_PSR_AC | IA64_PSR_BN | IA64_PSR_IC | IA64_PSR_MFL)
+	;;
+	tpa	r17=r17
+	mov	cr.ipsr=r16
+	;;
+	mov	cr.iip=r17
+	mov	cr.ifs=r0
+	;;
+	rfi
+	;;
+5:
+	mov     b6=in0			/* _start addr */
+	mov	r8=in1			/* ap_wakeup_vector */
+	mov	r26=in2			/* PAL addr */
+	;;
+	/* Purge kernel TRs */
+	movl	r16=KERNEL_START
+	mov	r18=KERNEL_TR_PAGE_SHIFT<<2
+	;;
+	ptr.i	r16,r18
+	ptr.d	r16,r18
+	;;
+	srlz.i
+	;;
+	srlz.d
+	;;
+	/* Purge percpu TR */
+	movl	r16=PERCPU_ADDR
+	mov	r18=PERCPU_PAGE_SHIFT<<2
+	;;
+	ptr.d	r16,r18
+	;;
+	srlz.d
+	;;
+	/* Purge PAL TR */
+	mov	r18=IA64_GRANULE_SHIFT<<2
+	;;
+	ptr.i	r26,r18
+	;;
+	srlz.i
+	;;
+	/* Purge stack TR */
+	mov	r16=IA64_KR(CURRENT_STACK)
+	;;
+	shl	r16=r16,IA64_GRANULE_SHIFT
+	movl	r19=PAGE_OFFSET
+	;;
+	add	r16=r19,r16
+	mov	r18=IA64_GRANULE_SHIFT<<2
+	;;
+	ptr.d	r16,r18
+	;;
+	srlz.i
+	;;
+
+	/* Ensure we can read and clear external interrupts */
+	mov	cr.tpr=r0
+	srlz.d
+
+	shr.u	r9=r8,6			/* which irr */
+	;;
+	and	r8=63,r8		/* bit offset into irr */
+	;;
+	mov	r10=1;;
+	;;
+	shl	r10=r10,r8		/* bit mask off irr we want */
+	cmp.eq	p6,p0=0,r9
+	;;
+(p6)	br.cond.sptk.few        check_irr0
+	cmp.eq	p7,p0=1,r9
+	;;
+(p7)	br.cond.sptk.few        check_irr1
+	cmp.eq	p8,p0=2,r9
+	;;
+(p8)	br.cond.sptk.few        check_irr2
+	cmp.eq	p9,p0=3,r9
+	;;
+(p9)	br.cond.sptk.few        check_irr3
+
+check_irr0:
+	mov	r8=cr.irr0
+	;;
+	and	r8=r8,r10
+	;;
+	cmp.eq	p6,p0=0,r8
+(p6)	br.cond.sptk.few	check_irr0
+	br.few	call_start
+
+check_irr1:
+	mov	r8=cr.irr1
+	;;
+	and	r8=r8,r10
+	;;
+	cmp.eq	p6,p0=0,r8
+(p6)	br.cond.sptk.few	check_irr1
+	br.few	call_start
+
+check_irr2:
+	mov	r8=cr.irr2
+	;;
+	and	r8=r8,r10
+	;;
+	cmp.eq	p6,p0=0,r8
+(p6)	br.cond.sptk.few	check_irr2
+	br.few	call_start
+
+check_irr3:
+	mov	r8=cr.irr3
+	;;
+	and	r8=r8,r10
+	;;
+	cmp.eq	p6,p0=0,r8
+(p6)	br.cond.sptk.few	check_irr3
+	br.few	call_start
+
+call_start:
+	mov	cr.eoi=r0
+	;;
+	srlz.d
+	;;
+	mov	r8=cr.ivr
+	;;
+	srlz.d
+	;;
+	cmp.eq	p0,p6=15,r8
+(p6)	br.cond.sptk.few	call_start
+	br.sptk.few		b6
+kexec_fake_sal_rendez_end:
+END(kexec_fake_sal_rendez)
+
+	.global relocate_new_kernel_size
+relocate_new_kernel_size:
+	data8	kexec_fake_sal_rendez_end - relocate_new_kernel
+
+GLOBAL_ENTRY(ia64_dump_cpu_regs)
+        .prologue
+        alloc loc0=ar.pfs,1,2,0,0
+        .body
+        mov     ar.rsc=0                // put RSE in enforced lazy mode
+        add     loc1=4*8, in0           // save r4 and r5 first
+        ;;
+{
+        flushrs                         // flush dirty regs to backing store
+        srlz.i
+}
+        st8 [loc1]=r4, 8
+        ;;
+        st8 [loc1]=r5, 8
+        ;;
+        add loc1=32*8, in0
+        mov r4=ar.rnat
+        ;;
+        st8 [in0]=r0, 8			// r0
+        st8 [loc1]=r4, 8		// rnat
+        mov r5=pr
+        ;;
+        st8 [in0]=r1, 8			// r1
+        st8 [loc1]=r5, 8		// pr
+        mov r4=b0
+        ;;
+        st8 [in0]=r2, 8			// r2
+        st8 [loc1]=r4, 8		// b0
+        mov r5=b1;
+        ;;
+        st8 [in0]=r3, 24		// r3
+        st8 [loc1]=r5, 8		// b1
+        mov r4=b2
+        ;;
+        st8 [in0]=r6, 8			// r6
+        st8 [loc1]=r4, 8		// b2
+	mov r5=b3
+        ;;
+        st8 [in0]=r7, 8			// r7
+        st8 [loc1]=r5, 8		// b3
+        mov r4=b4
+        ;;
+        st8 [in0]=r8, 8			// r8
+        st8 [loc1]=r4, 8		// b4
+        mov r5=b5
+        ;;
+        st8 [in0]=r9, 8			// r9
+        st8 [loc1]=r5, 8		// b5
+        mov r4=b6
+        ;;
+        st8 [in0]=r10, 8		// r10
+        st8 [loc1]=r5, 8		// b6
+        mov r5=b7
+        ;;
+        st8 [in0]=r11, 8		// r11
+        st8 [loc1]=r5, 8		// b7
+        mov r4=b0
+        ;;
+        st8 [in0]=r12, 8		// r12
+        st8 [loc1]=r4, 8		// ip
+        mov r5=loc0
+	;;
+        st8 [in0]=r13, 8		// r13
+        extr.u r5=r5, 0, 38		// ar.pfs.pfm
+	mov r4=r0			// user mask
+        ;;
+        st8 [in0]=r14, 8		// r14
+        st8 [loc1]=r5, 8		// cfm
+        ;;
+        st8 [in0]=r15, 8		// r15
+        st8 [loc1]=r4, 8        	// user mask
+	mov r5=ar.rsc
+        ;;
+        st8 [in0]=r16, 8		// r16
+        st8 [loc1]=r5, 8        	// ar.rsc
+        mov r4=ar.bsp
+        ;;
+        st8 [in0]=r17, 8		// r17
+        st8 [loc1]=r4, 8        	// ar.bsp
+        mov r5=ar.bspstore
+        ;;
+        st8 [in0]=r18, 8		// r18
+        st8 [loc1]=r5, 8        	// ar.bspstore
+        mov r4=ar.rnat
+        ;;
+        st8 [in0]=r19, 8		// r19
+        st8 [loc1]=r4, 8        	// ar.rnat
+        mov r5=ar.ccv
+        ;;
+        st8 [in0]=r20, 8		// r20
+	st8 [loc1]=r5, 8        	// ar.ccv
+        mov r4=ar.unat
+        ;;
+        st8 [in0]=r21, 8		// r21
+        st8 [loc1]=r4, 8        	// ar.unat
+        mov r5 = ar.fpsr
+        ;;
+        st8 [in0]=r22, 8		// r22
+        st8 [loc1]=r5, 8        	// ar.fpsr
+        mov r4 = ar.unat
+        ;;
+        st8 [in0]=r23, 8		// r23
+        st8 [loc1]=r4, 8        	// unat
+        mov r5 = ar.fpsr
+        ;;
+        st8 [in0]=r24, 8		// r24
+        st8 [loc1]=r5, 8        	// fpsr
+        mov r4 = ar.pfs
+        ;;
+        st8 [in0]=r25, 8		// r25
+        st8 [loc1]=r4, 8        	// ar.pfs
+        mov r5 = ar.lc
+        ;;
+        st8 [in0]=r26, 8		// r26
+        st8 [loc1]=r5, 8        	// ar.lc
+        mov r4 = ar.ec
+        ;;
+        st8 [in0]=r27, 8		// r27
+        st8 [loc1]=r4, 8        	// ar.ec
+        mov r5 = ar.csd
+        ;;
+        st8 [in0]=r28, 8		// r28
+        st8 [loc1]=r5, 8        	// ar.csd
+        mov r4 = ar.ssd
+        ;;
+        st8 [in0]=r29, 8		// r29
+        st8 [loc1]=r4, 8        	// ar.ssd
+        ;;
+        st8 [in0]=r30, 8		// r30
+        ;;
+	st8 [in0]=r31, 8		// r31
+        mov ar.pfs=loc0
+        ;;
+        br.ret.sptk.many rp
+END(ia64_dump_cpu_regs)
+
+
diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/setup.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/setup.c
--- linux-2.6.18-rc4/arch/ia64/kernel/setup.c	2006-08-19 12:46:42.000000000 +0800
+++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/setup.c	2006-08-19 12:54:28.000000000 +0800
@@ -43,6 +43,8 @@
 #include <linux/initrd.h>
 #include <linux/pm.h>
 #include <linux/cpufreq.h>
+#include <linux/kexec.h>
+#include <linux/crash_dump.h>
 
 #include <asm/ia32.h>
 #include <asm/machvec.h>
@@ -250,6 +252,38 @@ reserve_memory (void)
 	}
 #endif
 
+#ifdef CONFIG_KEXEC
+	/* crashkernel=size at addr specifies the location to reserve for
+	 * a crash kernel.  By reserving this memory we guarantee
+	 * that linux never set's it up as a DMA target.
+	 * Useful for holding code to do something appropriate
+	 * after a kernel panic.
+	 */
+	{
+		char *from = strstr(saved_command_line, "crashkernel=");
+		if (from) {
+			unsigned long size, base;
+			size = memparse(from + 12, &from);
+			if (*from == '@') {
+				base = memparse(from + 1, &from);
+				rsvd_region[n].start =
+					(unsigned long)__va(base);
+				rsvd_region[n].end =
+					(unsigned long)__va(base + size);
+				crashk_res.start = base;
+				crashk_res.end = base + size - 1;
+				n++;
+			}
+		}
+		efi_memmap_res.start = ia64_boot_param->efi_memmap;
+                efi_memmap_res.end = efi_memmap_res.start +
+                        ia64_boot_param->efi_memmap_size;
+                boot_param_res.start = __pa(ia64_boot_param);
+                boot_param_res.end = boot_param_res.start +
+                        sizeof(*ia64_boot_param);
+	}
+#endif
+
 	efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end);
 	n++;
 
@@ -484,6 +518,16 @@ setup_arch (char **cmdline_p)
 	if (!nomca)
 		ia64_mca_init();
 
+#ifdef CONFIG_CRASH_DUMP
+	{
+		char *from = strstr(saved_command_line, "elfcorehdr=");
+
+		if (from)
+			elfcorehdr_addr = memparse(from+11, &from);
+		saved_max_pfn = (unsigned long) -1;
+	}
+#endif
+
 	platform_setup(cmdline_p);
 	paging_init();
 }
diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/smp.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/smp.c
--- linux-2.6.18-rc4/arch/ia64/kernel/smp.c	2006-06-18 09:49:35.000000000 +0800
+++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/smp.c	2006-08-19 12:54:10.000000000 +0800
@@ -30,6 +30,7 @@
 #include <linux/delay.h>
 #include <linux/efi.h>
 #include <linux/bitops.h>
+#include <linux/kexec.h>
 
 #include <asm/atomic.h>
 #include <asm/current.h>
@@ -66,6 +67,7 @@ static volatile struct call_data_struct 
 
 #define IPI_CALL_FUNC		0
 #define IPI_CPU_STOP		1
+#define IPI_KDUMP_CPU_STOP	3
 
 /* This needs to be cacheline aligned because it is written to by *other* CPUs.  */
 static DEFINE_PER_CPU(u64, ipi_operation) ____cacheline_aligned;
@@ -84,6 +86,34 @@ unlock_ipi_calllock(void)
 	spin_unlock_irq(&call_lock);
 }
 
+#ifdef CONFIG_KEXEC
+/*
+ * Stop the CPU and put it in fake SAL rendezvous. This allows CPU to wake
+ * up with IPI from boot processor
+ */
+void
+kexec_stop_this_cpu (void *func)
+{
+	unsigned long pta, impl_va_bits, pal_base;
+
+	/*
+	 * Remove this CPU by putting it into fake SAL rendezvous
+	 */
+	cpu_clear(smp_processor_id(), cpu_online_map);
+	max_xtp();
+	ia64_eoi();
+
+	/* Disable VHPT */
+	impl_va_bits = ffz(~(local_cpu_data->unimpl_va_mask | (7UL << 61)));
+	pta = POW2(61) - POW2(vmlpt_bits);
+	ia64_set_pta(pta | (0 << 8) | (vmlpt_bits << 2) | 0);
+
+	local_irq_disable();
+	pal_base = __get_cpu_var(ia64_mca_pal_base);
+	kexec_fake_sal_rendez(func, ap_wakeup_vector, pal_base);
+}
+#endif
+
 static void
 stop_this_cpu (void)
 {
@@ -96,6 +126,18 @@ stop_this_cpu (void)
 	cpu_halt();
 }
 
+#ifdef CONFIG_CRASH_DUMP
+static void 
+kdump_cpu_freeze(struct unw_frame_info *info, void *arg)
+{
+	local_irq_disable();
+	crash_save_this_cpu();
+	current->thread.ksp = (__u64)info->sw - 16;
+	cpu_halt();
+}
+#endif
+
+
 void
 cpu_die(void)
 {
@@ -155,7 +197,11 @@ handle_IPI (int irq, void *dev_id, struc
 			      case IPI_CPU_STOP:
 				stop_this_cpu();
 				break;
-
+#ifdef CONFIG_CRASH_DUMP
+			      case IPI_KDUMP_CPU_STOP:
+				unw_init_running(kdump_cpu_freeze, NULL);
+				break;
+#endif
 			      default:
 				printk(KERN_CRIT "Unknown IPI on CPU %d: %lu\n", this_cpu, which);
 				break;
@@ -213,6 +259,13 @@ send_IPI_self (int op)
 	send_IPI_single(smp_processor_id(), op);
 }
 
+#ifdef CONFIG_CRASH_DUMP
+void
+kdump_smp_send_stop()
+{
+ 	send_IPI_allbutself(IPI_KDUMP_CPU_STOP);
+}
+#endif
 /*
  * Called with preeemption disabled.
  */
diff -Nraup linux-2.6.18-rc4/include/asm-ia64/kexec.h linux-2.6.18-rc4-kdump/include/asm-ia64/kexec.h
--- linux-2.6.18-rc4/include/asm-ia64/kexec.h	1970-01-01 08:00:00.000000000 +0800
+++ linux-2.6.18-rc4-kdump/include/asm-ia64/kexec.h	2006-08-19 12:54:10.000000000 +0800
@@ -0,0 +1,40 @@
+#ifndef _ASM_IA64_KEXEC_H
+#define _ASM_IA64_KEXEC_H
+
+
+/* Maximum physical address we can use pages from */
+#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
+/* Maximum address we can reach in physical address mode */
+#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
+/* Maximum address we can use for the control code buffer */
+#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE
+
+#define KEXEC_CONTROL_CODE_SIZE (8192 + 8192 + 4096)
+
+/* The native architecture */
+#define KEXEC_ARCH KEXEC_ARCH_IA_64
+
+#define MAX_NOTE_BYTES 1024
+
+#define pte_bits	3
+#define vmlpt_bits	(impl_va_bits - PAGE_SHIFT + pte_bits)
+#define POW2(n)		(1ULL << (n))
+
+DECLARE_PER_CPU(u64, ia64_mca_pal_base);
+const extern unsigned int relocate_new_kernel_size;
+volatile extern long kexec_rendez;
+extern void relocate_new_kernel(unsigned long, unsigned long,
+		struct ia64_boot_param *, unsigned long);
+extern void kexec_fake_sal_rendez(void *start, unsigned long wake_up,
+		unsigned long pal_base);
+static inline void
+crash_setup_regs(struct pt_regs *newregs, struct pt_regs *oldregs)
+{
+}
+extern struct resource efi_memmap_res;
+extern struct resource boot_param_res;
+extern void kdump_smp_send_stop(void);
+extern void kdump_disable_iosapic(void);
+extern void crash_save_this_cpu(void);
+
+#endif /* _ASM_IA64_KEXEC_H */
diff -Nraup linux-2.6.18-rc4/include/asm-ia64/machvec_hpzx1.h linux-2.6.18-rc4-kdump/include/asm-ia64/machvec_hpzx1.h
--- linux-2.6.18-rc4/include/asm-ia64/machvec_hpzx1.h	2006-06-18 09:49:35.000000000 +0800
+++ linux-2.6.18-rc4-kdump/include/asm-ia64/machvec_hpzx1.h	2006-08-19 12:54:10.000000000 +0800
@@ -34,4 +34,6 @@ extern ia64_mv_dma_mapping_error	sba_dma
 #define platform_dma_supported			sba_dma_supported
 #define platform_dma_mapping_error		sba_dma_mapping_error
 
+extern void ioc_iova_disable(void);
+
 #endif /* _ASM_IA64_MACHVEC_HPZX1_h */
diff -Nraup linux-2.6.18-rc4/include/asm-ia64/smp.h linux-2.6.18-rc4-kdump/include/asm-ia64/smp.h
--- linux-2.6.18-rc4/include/asm-ia64/smp.h	2006-08-19 12:46:51.000000000 +0800
+++ linux-2.6.18-rc4-kdump/include/asm-ia64/smp.h	2006-08-19 12:54:10.000000000 +0800
@@ -128,6 +128,9 @@ extern void smp_send_reschedule (int cpu
 extern void lock_ipi_calllock(void);
 extern void unlock_ipi_calllock(void);
 extern void identify_siblings (struct cpuinfo_ia64 *);
+#ifdef CONFIG_KEXEC
+extern void kexec_stop_this_cpu(void *);
+#endif
 
 #else
 
diff -Nraup linux-2.6.18-rc4/kernel/irq/manage.c linux-2.6.18-rc4-kdump/kernel/irq/manage.c
--- linux-2.6.18-rc4/kernel/irq/manage.c	2006-08-19 12:46:51.000000000 +0800
+++ linux-2.6.18-rc4-kdump/kernel/irq/manage.c	2006-08-19 12:54:10.000000000 +0800
@@ -475,4 +475,3 @@ int request_irq(unsigned int irq,
 	return retval;
 }
 EXPORT_SYMBOL(request_irq);
-

_______________________________________________
fastboot mailing list
fastboot at lists.osdl.org
https://lists.osdl.org/mailman/listinfo/fastboot

linux-2.6-sata-big-update.patch:
 linux-2.6.17.x86_64.p2/drivers/Kconfig                      |    2 
 linux-2.6.17.x86_64.p2/drivers/Makefile                     |    1 
 linux-2.6.17.x86_64.p2/drivers/ata/Kconfig                  |  150 +
 linux-2.6.17.x86_64.p2/drivers/ata/Makefile                 |   21 
 linux-2.6.17.x86_64.p2/drivers/ata/ahci.c                   |  121 -
 linux-2.6.17.x86_64.p2/drivers/ata/ata_piix.c               |  151 +
 linux-2.6.17.x86_64.p2/drivers/ata/libata-core.c            |  619 +++---
 linux-2.6.17.x86_64.p2/drivers/ata/libata-eh.c              |   18 
 linux-2.6.17.x86_64.p2/drivers/ata/libata-scsi.c            |  236 ++
 linux-2.6.17.x86_64.p2/drivers/ata/libata-sff.c             | 1109 +++++++++++
 linux-2.6.17.x86_64.p2/drivers/ata/libata.h                 |    5 
 linux-2.6.17.x86_64.p2/drivers/ata/pdc_adma.c               |   51 
 linux-2.6.17.x86_64.p2/drivers/ata/sata_mv.c                |  100 -
 linux-2.6.17.x86_64.p2/drivers/ata/sata_nv.c                |   60 
 linux-2.6.17.x86_64.p2/drivers/ata/sata_promise.c           |   97 -
 linux-2.6.17.x86_64.p2/drivers/ata/sata_qstor.c             |   46 
 linux-2.6.17.x86_64.p2/drivers/ata/sata_sil.c               |   59 
 linux-2.6.17.x86_64.p2/drivers/ata/sata_sil24.c             |   68 
 linux-2.6.17.x86_64.p2/drivers/ata/sata_sis.c               |   20 
 linux-2.6.17.x86_64.p2/drivers/ata/sata_svw.c               |   12 
 linux-2.6.17.x86_64.p2/drivers/ata/sata_sx4.c               |   66 
 linux-2.6.17.x86_64.p2/drivers/ata/sata_uli.c               |   10 
 linux-2.6.17.x86_64.p2/drivers/ata/sata_via.c               |  124 +
 linux-2.6.17.x86_64.p2/drivers/ata/sata_vsc.c               |   18 
 linux-2.6.17.x86_64.p2/drivers/scsi/Kconfig                 |  138 -
 linux-2.6.17.x86_64.p2/drivers/scsi/Makefile                |   16 
 linux-2.6.17.x86_64.p2/include/asm-generic/libata-portmap.h |   12 
 linux-2.6.17.x86_64.p2/include/asm-i386/libata-portmap.h    |    1 
 linux-2.6.17.x86_64.p2/include/asm-ia64/libata-portmap.h    |    1 
 linux-2.6.17.x86_64.p2/include/asm-powerpc/libata-portmap.h |    1 
 linux-2.6.17.x86_64.p2/include/asm-sparc/libata-portmap.h   |    1 
 linux-2.6.17.x86_64.p2/include/asm-sparc64/libata-portmap.h |    1 
 linux-2.6.17.x86_64.p2/include/asm-x86_64/libata-portmap.h  |    1 
 linux-2.6.17.x86_64.p2/include/linux/ata.h                  |   22 
 linux-2.6.17.x86_64.p2/include/linux/libata.h               |   73 
 linux-2.6.17.x86_64.p3/drivers/ata/libata-bmdma.c           | 1149 ------------
 linux-2.6.17.x86_64.p3/drivers/pci/quirks.c                 |    6 
 37 files changed, 2510 insertions(+), 2076 deletions(-)

--- NEW FILE linux-2.6-sata-big-update.patch ---

Resend of patch #2, now diffed against
BUILD/kernel-2.6.17/linux-2.6.17.x86_64.

The patch got a lot smaller (lost over half its size), and no longer
needs to modify the core kernel to add facilities.  The end result is
the same, of course.

 drivers/Kconfig                      |    2 
 drivers/Makefile                     |    1 
 drivers/ata/Kconfig                  |  150 ++++
 drivers/ata/Makefile                 |   21 
 drivers/ata/ahci.c                   |  121 +--
 drivers/ata/ata_piix.c               |  151 +++-
 drivers/ata/libata-core.c            |  619 +++++++++++--------
 drivers/ata/libata-eh.c              |   18 
 drivers/ata/libata-scsi.c            |  236 ++++++-
 drivers/ata/libata-sff.c             | 1109 +++++++++++++++++++++++++++++++++++
 drivers/ata/libata.h                 |    5 
 drivers/ata/pdc_adma.c               |   51 -
 drivers/ata/sata_mv.c                |  100 +--
 drivers/ata/sata_nv.c                |   60 -
 drivers/ata/sata_promise.c           |   97 ---
 drivers/ata/sata_qstor.c             |   46 -
 drivers/ata/sata_sil.c               |   59 -
 drivers/ata/sata_sil24.c             |   68 +-
 drivers/ata/sata_sis.c               |   20 
 drivers/ata/sata_svw.c               |   12 
 drivers/ata/sata_sx4.c               |   66 +-
 drivers/ata/sata_uli.c               |   10 
 drivers/ata/sata_via.c               |  124 +++
 drivers/ata/sata_vsc.c               |   18 
 drivers/scsi/Kconfig                 |  138 ----
 drivers/scsi/Makefile                |   16 
 include/asm-generic/libata-portmap.h |   12 
 include/asm-i386/libata-portmap.h    |    1 
 include/asm-ia64/libata-portmap.h    |    1 
 include/asm-powerpc/libata-portmap.h |    1 
 include/asm-sparc/libata-portmap.h   |    1 
 include/asm-sparc64/libata-portmap.h |    1 
 include/asm-x86_64/libata-portmap.h  |    1 
 include/linux/ata.h                  |   22 
 include/linux/libata.h               |   73 +-
 35 files changed, 2507 insertions(+), 924 deletions(-)

diff -urN linux-2.6.17.x86_64.p1/drivers/ata/ahci.c linux-2.6.17.x86_64.p2/drivers/ata/ahci.c
--- linux-2.6.17.x86_64.p1/drivers/ata/ahci.c	2006-08-24 09:49:03.000000000 -0400
+++ linux-2.6.17.x86_64.p2/drivers/ata/ahci.c	2006-08-24 09:54:30.000000000 -0400
@@ -277,7 +277,7 @@
 	/* board_ahci */
 	{
 		.sht		= &ahci_sht,
-		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
 				  ATA_FLAG_SKIP_D2H_BSY,
 		.pio_mask	= 0x1f, /* pio0-4 */
@@ -287,7 +287,7 @@
 	/* board_ahci_vt8251 */
 	{
 		.sht		= &ahci_sht,
-		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
 				  ATA_FLAG_SKIP_D2H_BSY |
 				  AHCI_FLAG_RESET_NEEDS_CLO | AHCI_FLAG_NO_NCQ,
@@ -362,6 +362,14 @@
 	{ PCI_VENDOR_ID_NVIDIA, 0x044f, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_ahci },		/* MCP65 */
 
+	/* SiS */
+	{ PCI_VENDOR_ID_SI, 0x1184, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci }, /* SiS 966 */
+	{ PCI_VENDOR_ID_SI, 0x1185, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci }, /* SiS 966 */
+	{ PCI_VENDOR_ID_SI, 0x0186, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci }, /* SiS 968 */
+
 	{ }	/* terminate list */
 };
 
@@ -654,14 +662,13 @@
 		VPRINTK("PORT_SCR_ERR 0x%x\n", tmp);
 		writel(tmp, port_mmio + PORT_SCR_ERR);
 
-		/* clear & turn off port IRQ */
+		/* clear port IRQ */
 		tmp = readl(port_mmio + PORT_IRQ_STAT);
 		VPRINTK("PORT_IRQ_STAT 0x%x\n", tmp);
 		if (tmp)
 			writel(tmp, port_mmio + PORT_IRQ_STAT);
 
 		writel(1 << i, mmio + HOST_IRQ_STAT);
-		writel(0, port_mmio + PORT_IRQ_MASK);
 	}
 
 	tmp = readl(mmio + HOST_CTL);
@@ -702,7 +709,7 @@
 static int ahci_clo(struct ata_port *ap)
 {
 	void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
-	struct ahci_host_priv *hpriv = ap->host_set->private_data;
+	struct ahci_host_priv *hpriv = ap->host->private_data;
 	u32 tmp;
 
 	if (!(hpriv->cap & HOST_CAP_CLO))
@@ -734,7 +741,7 @@
 static int ahci_softreset(struct ata_port *ap, unsigned int *class)
 {
 	struct ahci_port_priv *pp = ap->private_data;
-	void __iomem *mmio = ap->host_set->mmio_base;
+	void __iomem *mmio = ap->host->mmio_base;
 	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
 	const u32 cmd_fis_len = 5; /* five dwords */
 	const char *reason = NULL;
@@ -843,7 +850,7 @@
 	struct ahci_port_priv *pp = ap->private_data;
 	u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
 	struct ata_taskfile tf;
-	void __iomem *mmio = ap->host_set->mmio_base;
+	void __iomem *mmio = ap->host->mmio_base;
 	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
 	int rc;
 
@@ -1032,7 +1039,7 @@
 
 static void ahci_host_intr(struct ata_port *ap)
 {
-	void __iomem *mmio = ap->host_set->mmio_base;
+	void __iomem *mmio = ap->host->mmio_base;
 	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
 	struct ata_eh_info *ehi = &ap->eh_info;
 	u32 status, qc_active;
@@ -1068,14 +1075,8 @@
 		return;
 
 	/* ignore interim PIO setup fis interrupts */
-	if (ata_tag_valid(ap->active_tag)) {
-		struct ata_queued_cmd *qc =
-			ata_qc_from_tag(ap, ap->active_tag);
-
-		if (qc && qc->tf.protocol == ATA_PROT_PIO &&
-		    (status & PORT_IRQ_PIOS_FIS))
-			return;
-	}
+	if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS)) 
+		return;
 
 	if (ata_ratelimit())
 		ata_port_printk(ap, KERN_INFO, "spurious interrupt "
@@ -1090,7 +1091,7 @@
 
 static irqreturn_t ahci_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
 {
-	struct ata_host_set *host_set = dev_instance;
+	struct ata_host *host = dev_instance;
 	struct ahci_host_priv *hpriv;
 	unsigned int i, handled = 0;
 	void __iomem *mmio;
@@ -1098,8 +1099,8 @@
 
 	VPRINTK("ENTER\n");
 
-	hpriv = host_set->private_data;
-	mmio = host_set->mmio_base;
+	hpriv = host->private_data;
+	mmio = host->mmio_base;
 
 	/* sigh.  0xffffffff is a valid return from h/w */
 	irq_stat = readl(mmio + HOST_IRQ_STAT);
@@ -1107,22 +1108,22 @@
 	if (!irq_stat)
 		return IRQ_NONE;
 
-        spin_lock(&host_set->lock);
+        spin_lock(&host->lock);
 
-        for (i = 0; i < host_set->n_ports; i++) {
+        for (i = 0; i < host->n_ports; i++) {
 		struct ata_port *ap;
 
 		if (!(irq_stat & (1 << i)))
 			continue;
 
-		ap = host_set->ports[i];
+		ap = host->ports[i];
 		if (ap) {
 			ahci_host_intr(ap);
 			VPRINTK("port %u\n", i);
 		} else {
 			VPRINTK("port %u (no irq)\n", i);
 			if (ata_ratelimit())
-				dev_printk(KERN_WARNING, host_set->dev,
+				dev_printk(KERN_WARNING, host->dev,
 					"interrupt on disabled port %u\n", i);
 		}
 
@@ -1134,7 +1135,7 @@
 		handled = 1;
[...7566 lines suppressed...]
-		/* TODO: What if one channel is in native mode ... */
-		pci_read_config_byte(pdev, PCI_CLASS_PROG, &tmp8);
-		mask = (1 << 2) | (1 << 0);
-		if ((tmp8 & mask) != mask)
-			legacy_mode = (1 << 3);
-	}
-
-	/* FIXME... */
-	if ((!legacy_mode) && (n_ports > 2)) {
-		printk(KERN_ERR "ata: BUG: native mode, n_ports > 2\n");
-		n_ports = 2;
-		/* For now */
-	}
-
-	/* FIXME: Really for ATA it isn't safe because the device may be
-	   multi-purpose and we want to leave it alone if it was already
-	   enabled. Secondly for shared use as Arjan says we want refcounting
-
-	   Checking dev->is_enabled is insufficient as this is not set at
-	   boot for the primary video which is BIOS enabled
-         */
-
-	rc = pci_enable_device(pdev);
-	if (rc)
-		return rc;
-
-	rc = pci_request_regions(pdev, DRV_NAME);
-	if (rc) {
-		disable_dev_on_err = 0;
-		goto err_out;
-	}
-
-	/* FIXME: Should use platform specific mappers for legacy port ranges */
-	if (legacy_mode) {
-		if (!request_region(0x1f0, 8, "libata")) {
-			struct resource *conflict, res;
-			res.start = 0x1f0;
-			res.end = 0x1f0 + 8 - 1;
-			conflict = ____request_resource(&ioport_resource, &res);
-			if (!strcmp(conflict->name, "libata"))
-				legacy_mode |= (1 << 0);
-			else {
-				disable_dev_on_err = 0;
-				printk(KERN_WARNING "ata: 0x1f0 IDE port busy\n");
-			}
-		} else
-			legacy_mode |= (1 << 0);
-
-		if (!request_region(0x170, 8, "libata")) {
-			struct resource *conflict, res;
-			res.start = 0x170;
-			res.end = 0x170 + 8 - 1;
-			conflict = ____request_resource(&ioport_resource, &res);
-			if (!strcmp(conflict->name, "libata"))
-				legacy_mode |= (1 << 1);
-			else {
-				disable_dev_on_err = 0;
-				printk(KERN_WARNING "ata: 0x170 IDE port busy\n");
-			}
-		} else
-			legacy_mode |= (1 << 1);
-	}
-
-	/* we have legacy mode, but all ports are unavailable */
-	if (legacy_mode == (1 << 3)) {
-		rc = -EBUSY;
-		goto err_out_regions;
-	}
-
-	/* FIXME: If we get no DMA mask we should fall back to PIO */
-	rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
-	if (rc)
-		goto err_out_regions;
-	rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK);
-	if (rc)
-		goto err_out_regions;
-
-	if (legacy_mode) {
-		if (legacy_mode & (1 << 0))
-			probe_ent = ata_pci_init_legacy_port(pdev, port[0], 0);
-		if (legacy_mode & (1 << 1))
-			probe_ent2 = ata_pci_init_legacy_port(pdev, port[1], 1);
-	} else {
-		if (n_ports == 2)
-			probe_ent = ata_pci_init_native_mode(pdev, port, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
-		else
-			probe_ent = ata_pci_init_native_mode(pdev, port, ATA_PORT_PRIMARY);
-	}
-	if (!probe_ent && !probe_ent2) {
-		rc = -ENOMEM;
-		goto err_out_regions;
-	}
-
-	pci_set_master(pdev);
-
-	/* FIXME: check ata_device_add return */
-	if (legacy_mode) {
-		struct device *dev = &pdev->dev;
-		struct ata_host_set *host_set = NULL;
-
-		if (legacy_mode & (1 << 0)) {
-			ata_device_add(probe_ent);
-			host_set = dev_get_drvdata(dev);
-		}
-
-		if (legacy_mode & (1 << 1)) {
-			ata_device_add(probe_ent2);
-			if (host_set) {
-				host_set->next = dev_get_drvdata(dev);
-				dev_set_drvdata(dev, host_set);
-			}
-		}
-	} else
-		ata_device_add(probe_ent);
-
-	kfree(probe_ent);
-	kfree(probe_ent2);
-
-	return 0;
-
-err_out_regions:
-	if (legacy_mode & (1 << 0))
-		release_region(0x1f0, 8);
-	if (legacy_mode & (1 << 1))
-		release_region(0x170, 8);
-	pci_release_regions(pdev);
-err_out:
-	if (disable_dev_on_err)
-		pci_disable_device(pdev);
-	return rc;
-}
-
-/**
- *	ata_pci_clear_simplex	-	attempt to kick device out of simplex
- *	@pdev: PCI device
- *
- *	Some PCI ATA devices report simplex mode but in fact can be told to
- *	enter non simplex mode. This implements the neccessary logic to
- *	perform the task on such devices. Calling it on other devices will
- *	have -undefined- behaviour.
- */
-
-int ata_pci_clear_simplex(struct pci_dev *pdev)
-{
-	unsigned long bmdma = pci_resource_start(pdev, 4);
-	u8 simplex;
-
-	if (bmdma == 0)
-		return -ENOENT;
-
-	simplex = inb(bmdma + 0x02);
-	outb(simplex & 0x60, bmdma + 0x02);
-	simplex = inb(bmdma + 0x02);
-	if (simplex & 0x80)
-		return -EOPNOTSUPP;
-	return 0;
-}
-
-unsigned long ata_pci_default_filter(const struct ata_port *ap, struct ata_device *adev, unsigned long xfer_mask)
-{
-	/* Filter out DMA modes if the device has been configured by
-	   the BIOS as PIO only */
-
-	if (ap->ioaddr.bmdma_addr == 0)
-		xfer_mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
-	return xfer_mask;
-}
-
-#endif /* CONFIG_PCI */
-
diff -urN linux-2.6.17.x86_64.p2/drivers/pci/quirks.c linux-2.6.17.x86_64.p3/drivers/pci/quirks.c
--- linux-2.6.17.x86_64.p2/drivers/pci/quirks.c	2006-08-24 09:48:59.000000000 -0400
+++ linux-2.6.17.x86_64.p3/drivers/pci/quirks.c	2006-08-24 10:48:42.000000000 -0400
@@ -1202,7 +1202,7 @@
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_963,		quirk_sis_96x_smbus );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_LPC,		quirk_sis_96x_smbus );
 
-#if defined(CONFIG_SCSI_SATA) || defined(CONFIG_SCSI_SATA_MODULE)
+#if defined(CONFIG_ATA) || defined(CONFIG_ATA_MODULE)
 
 /*
  *	If we are using libata we can drive this chip properly but must
@@ -1292,7 +1292,7 @@
 }
 __setup("combined_mode=", combined_setup);
 
-#ifdef CONFIG_SCSI_SATA_INTEL_COMBINED
+#ifdef CONFIG_SATA_INTEL_COMBINED
 static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev)
 {
 	u8 prog, comb, tmp;
@@ -1385,7 +1385,7 @@
 		request_region(0x170, 8, "libata");	/* port 1 */
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_ANY_ID,	  quirk_intel_ide_combined );
-#endif /* CONFIG_SCSI_SATA_INTEL_COMBINED */
+#endif /* CONFIG_SATA_INTEL_COMBINED */
 
 
 int pcie_mch_quirk;

linux-2.6-sata-move-to-drivers-ata.patch:
 ata/ahci.c          | 1683 ++++++++++++++
 ata/ata_piix.c      |  961 ++++++++
 ata/libata-bmdma.c  | 1149 +++++++++
 ata/libata-core.c   | 6036 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ata/libata-eh.c     | 2246 +++++++++++++++++++
 ata/libata-scsi.c   | 3160 +++++++++++++++++++++++++++
 ata/libata.h        |  117 +
 ata/pdc_adma.c      |  739 ++++++
 ata/sata_mv.c       | 2468 +++++++++++++++++++++
 ata/sata_nv.c       |  595 +++++
 ata/sata_promise.c  |  879 +++++++
 ata/sata_promise.h  |  157 +
 ata/sata_qstor.c    |  730 ++++++
 ata/sata_sil.c      |  727 ++++++
 ata/sata_sil24.c    | 1223 ++++++++++
 ata/sata_sis.c      |  347 ++
 ata/sata_svw.c      |  508 ++++
 ata/sata_sx4.c      | 1502 ++++++++++++
 ata/sata_uli.c      |  300 ++
 ata/sata_via.c      |  394 +++
 ata/sata_vsc.c      |  482 ++++
 scsi/ahci.c         | 1683 --------------
 scsi/ata_piix.c     |  961 --------
 scsi/libata-bmdma.c | 1149 ---------
 scsi/libata-core.c  | 6036 ----------------------------------------------------
 scsi/libata-eh.c    | 2246 -------------------
 scsi/libata-scsi.c  | 3160 ---------------------------
 scsi/libata.h       |  117 -
 scsi/pdc_adma.c     |  739 ------
 scsi/sata_mv.c      | 2468 ---------------------
 scsi/sata_nv.c      |  595 -----
 scsi/sata_promise.c |  879 -------
 scsi/sata_promise.h |  157 -
 scsi/sata_qstor.c   |  730 ------
 scsi/sata_sil.c     |  727 ------
 scsi/sata_sil24.c   | 1223 ----------
 scsi/sata_sis.c     |  347 --
 scsi/sata_svw.c     |  508 ----
 scsi/sata_sx4.c     | 1502 ------------
 scsi/sata_uli.c     |  300 --
 scsi/sata_via.c     |  394 ---
 scsi/sata_vsc.c     |  482 ----
 42 files changed, 26403 insertions(+), 26403 deletions(-)

--- NEW FILE linux-2.6-sata-move-to-drivers-ata.patch ---

Resend of last patch #1, now diffed against
BUILD/kernel-2.6.17/linux-2.6.17.x86_64.

No code changes, just moving the relevant RHEL5 source files to
drivers/ata.

 drivers/ata/ahci.c          | 1683 ++++++++++++
 drivers/ata/ata_piix.c      |  961 +++++++
 drivers/ata/libata-bmdma.c  | 1149 ++++++++
 drivers/ata/libata-core.c   | 6036 ++++++++++++++++++++++++++++++++++++++++++++
 drivers/ata/libata-eh.c     | 2246 ++++++++++++++++
 drivers/ata/libata-scsi.c   | 3160 +++++++++++++++++++++++
 drivers/ata/libata.h        |  117 
 drivers/ata/pdc_adma.c      |  739 +++++
 drivers/ata/sata_mv.c       | 2468 +++++++++++++++++
 drivers/ata/sata_nv.c       |  595 ++++
 drivers/ata/sata_promise.c  |  879 ++++++
 drivers/ata/sata_promise.h  |  157 +
 drivers/ata/sata_qstor.c    |  730 +++++
 drivers/ata/sata_sil.c      |  727 +++++
 drivers/ata/sata_sil24.c    | 1223 ++++++++
 drivers/ata/sata_sis.c      |  347 ++
 drivers/ata/sata_svw.c      |  508 +++
 drivers/ata/sata_sx4.c      | 1502 ++++++++++
 drivers/ata/sata_uli.c      |  300 ++
 drivers/ata/sata_via.c      |  394 ++
 drivers/ata/sata_vsc.c      |  482 +++
 drivers/scsi/ahci.c         | 1683 ------------
 drivers/scsi/ata_piix.c     |  961 -------
 drivers/scsi/libata-bmdma.c | 1149 --------
 drivers/scsi/libata-core.c  | 6036 --------------------------------------------
 drivers/scsi/libata-eh.c    | 2246 ----------------
 drivers/scsi/libata-scsi.c  | 3160 -----------------------
 drivers/scsi/libata.h       |  117 
 drivers/scsi/pdc_adma.c     |  739 -----
 drivers/scsi/sata_mv.c      | 2468 -----------------
 drivers/scsi/sata_nv.c      |  595 ----
 drivers/scsi/sata_promise.c |  879 ------
 drivers/scsi/sata_promise.h |  157 -
 drivers/scsi/sata_qstor.c   |  730 -----
 drivers/scsi/sata_sil.c     |  727 -----
 drivers/scsi/sata_sil24.c   | 1223 --------
 drivers/scsi/sata_sis.c     |  347 --
 drivers/scsi/sata_svw.c     |  508 ---
 drivers/scsi/sata_sx4.c     | 1502 ----------
 drivers/scsi/sata_uli.c     |  300 --
 drivers/scsi/sata_via.c     |  394 --
 drivers/scsi/sata_vsc.c     |  482 ---
 42 files changed, 26403 insertions(+), 26403 deletions(-)

diff -urN linux-2.6.17.x86_64/drivers/ata/ahci.c linux-2.6.17.x86_64.p1/drivers/ata/ahci.c
--- linux-2.6.17.x86_64/drivers/ata/ahci.c	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.x86_64.p1/drivers/ata/ahci.c	2006-08-24 09:49:03.000000000 -0400
@@ -0,0 +1,1683 @@
+/*
+ *  ahci.c - AHCI SATA support
+ *
+ *  Maintained by:  Jeff Garzik <jgarzik at pobox.com>
+ *    		    Please ALWAYS copy linux-ide at vger.kernel.org
+ *		    on emails.
+ *
+ *  Copyright 2004-2005 Red Hat, Inc.
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ * libata documentation is available via 'make {ps|pdf}docs',
+ * as Documentation/DocBook/libata.*
+ *
+ * AHCI hardware documentation:
+ * http://www.intel.com/technology/serialata/pdf/rev1_0.pdf
+ * http://www.intel.com/technology/serialata/pdf/rev1_1.pdf
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/blkdev.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/sched.h>
+#include <linux/dma-mapping.h>
+#include <linux/device.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_cmnd.h>
+#include <linux/libata.h>
+#include <asm/io.h>
+
+#define DRV_NAME	"ahci"
+#define DRV_VERSION	"2.0"
+
+
+enum {
+	AHCI_PCI_BAR		= 5,
+	AHCI_MAX_SG		= 168, /* hardware max is 64K */
+	AHCI_DMA_BOUNDARY	= 0xffffffff,
+	AHCI_USE_CLUSTERING	= 0,
+	AHCI_MAX_CMDS		= 32,
+	AHCI_CMD_SZ		= 32,
+	AHCI_CMD_SLOT_SZ	= AHCI_MAX_CMDS * AHCI_CMD_SZ,
+	AHCI_RX_FIS_SZ		= 256,
+	AHCI_CMD_TBL_CDB	= 0x40,
+	AHCI_CMD_TBL_HDR_SZ	= 0x80,
+	AHCI_CMD_TBL_SZ		= AHCI_CMD_TBL_HDR_SZ + (AHCI_MAX_SG * 16),
+	AHCI_CMD_TBL_AR_SZ	= AHCI_CMD_TBL_SZ * AHCI_MAX_CMDS,
+	AHCI_PORT_PRIV_DMA_SZ	= AHCI_CMD_SLOT_SZ + AHCI_CMD_TBL_AR_SZ +
+				  AHCI_RX_FIS_SZ,
+	AHCI_IRQ_ON_SG		= (1 << 31),
+	AHCI_CMD_ATAPI		= (1 << 5),
+	AHCI_CMD_WRITE		= (1 << 6),
+	AHCI_CMD_PREFETCH	= (1 << 7),
+	AHCI_CMD_RESET		= (1 << 8),
+	AHCI_CMD_CLR_BUSY	= (1 << 10),
+
+	RX_FIS_D2H_REG		= 0x40,	/* offset of D2H Register FIS data */
+	RX_FIS_UNK		= 0x60, /* offset of Unknown FIS data */
+
+	board_ahci		= 0,
+	board_ahci_vt8251	= 1,
+
+	/* global controller registers */
+	HOST_CAP		= 0x00, /* host capabilities */
+	HOST_CTL		= 0x04, /* global host control */
+	HOST_IRQ_STAT		= 0x08, /* interrupt status */
+	HOST_PORTS_IMPL		= 0x0c, /* bitmap of implemented ports */
+	HOST_VERSION		= 0x10, /* AHCI spec. version compliancy */
+
+	/* HOST_CTL bits */
+	HOST_RESET		= (1 << 0),  /* reset controller; self-clear */
+	HOST_IRQ_EN		= (1 << 1),  /* global IRQ enable */
+	HOST_AHCI_EN		= (1 << 31), /* AHCI enabled */
+
+	/* HOST_CAP bits */
+	HOST_CAP_SSC		= (1 << 14), /* Slumber capable */
+	HOST_CAP_CLO		= (1 << 24), /* Command List Override support */
+	HOST_CAP_SSS		= (1 << 27), /* Staggered Spin-up */
+	HOST_CAP_NCQ		= (1 << 30), /* Native Command Queueing */
+	HOST_CAP_64		= (1 << 31), /* PCI DAC (64-bit DMA) support */
+
+	/* registers for each SATA port */
+	PORT_LST_ADDR		= 0x00, /* command list DMA addr */
+	PORT_LST_ADDR_HI	= 0x04, /* command list DMA addr hi */
+	PORT_FIS_ADDR		= 0x08, /* FIS rx buf addr */
+	PORT_FIS_ADDR_HI	= 0x0c, /* FIS rx buf addr hi */
+	PORT_IRQ_STAT		= 0x10, /* interrupt status */
+	PORT_IRQ_MASK		= 0x14, /* interrupt enable/disable mask */
+	PORT_CMD		= 0x18, /* port command */
+	PORT_TFDATA		= 0x20,	/* taskfile data */
+	PORT_SIG		= 0x24,	/* device TF signature */
+	PORT_CMD_ISSUE		= 0x38, /* command issue */
+	PORT_SCR		= 0x28, /* SATA phy register block */
+	PORT_SCR_STAT		= 0x28, /* SATA phy register: SStatus */
+	PORT_SCR_CTL		= 0x2c, /* SATA phy register: SControl */
+	PORT_SCR_ERR		= 0x30, /* SATA phy register: SError */
+	PORT_SCR_ACT		= 0x34, /* SATA phy register: SActive */
+
+	/* PORT_IRQ_{STAT,MASK} bits */
+	PORT_IRQ_COLD_PRES	= (1 << 31), /* cold presence detect */
+	PORT_IRQ_TF_ERR		= (1 << 30), /* task file error */
+	PORT_IRQ_HBUS_ERR	= (1 << 29), /* host bus fatal error */
+	PORT_IRQ_HBUS_DATA_ERR	= (1 << 28), /* host bus data error */
+	PORT_IRQ_IF_ERR		= (1 << 27), /* interface fatal error */
+	PORT_IRQ_IF_NONFATAL	= (1 << 26), /* interface non-fatal error */
+	PORT_IRQ_OVERFLOW	= (1 << 24), /* xfer exhausted available S/G */
+	PORT_IRQ_BAD_PMP	= (1 << 23), /* incorrect port multiplier */
+
+	PORT_IRQ_PHYRDY		= (1 << 22), /* PhyRdy changed */
+	PORT_IRQ_DEV_ILCK	= (1 << 7), /* device interlock */
+	PORT_IRQ_CONNECT	= (1 << 6), /* port connect change status */
+	PORT_IRQ_SG_DONE	= (1 << 5), /* descriptor processed */
+	PORT_IRQ_UNK_FIS	= (1 << 4), /* unknown FIS rx'd */
+	PORT_IRQ_SDB_FIS	= (1 << 3), /* Set Device Bits FIS rx'd */
+	PORT_IRQ_DMAS_FIS	= (1 << 2), /* DMA Setup FIS rx'd */
+	PORT_IRQ_PIOS_FIS	= (1 << 1), /* PIO Setup FIS rx'd */
+	PORT_IRQ_D2H_REG_FIS	= (1 << 0), /* D2H Register FIS rx'd */
+
+	PORT_IRQ_FREEZE		= PORT_IRQ_HBUS_ERR |
+				  PORT_IRQ_IF_ERR |
+				  PORT_IRQ_CONNECT |
+				  PORT_IRQ_PHYRDY |
+				  PORT_IRQ_UNK_FIS,
+	PORT_IRQ_ERROR		= PORT_IRQ_FREEZE |
+				  PORT_IRQ_TF_ERR |
[...52626 lines suppressed...]
-	.bios_param		= ata_std_bios_param,
-};
-
-
-static const struct ata_port_operations vsc_sata_ops = {
-	.port_disable		= ata_port_disable,
-	.tf_load		= vsc_sata_tf_load,
-	.tf_read		= vsc_sata_tf_read,
-	.exec_command		= ata_exec_command,
-	.check_status		= ata_check_status,
-	.dev_select		= ata_std_dev_select,
-	.bmdma_setup            = ata_bmdma_setup,
-	.bmdma_start            = ata_bmdma_start,
-	.bmdma_stop		= ata_bmdma_stop,
-	.bmdma_status		= ata_bmdma_status,
-	.qc_prep		= ata_qc_prep,
-	.qc_issue		= ata_qc_issue_prot,
-	.data_xfer		= ata_mmio_data_xfer,
-	.freeze			= ata_bmdma_freeze,
-	.thaw			= ata_bmdma_thaw,
-	.error_handler		= ata_bmdma_error_handler,
-	.post_internal_cmd	= ata_bmdma_post_internal_cmd,
-	.irq_handler		= vsc_sata_interrupt,
-	.irq_clear		= ata_bmdma_irq_clear,
-	.scr_read		= vsc_sata_scr_read,
-	.scr_write		= vsc_sata_scr_write,
-	.port_start		= ata_port_start,
-	.port_stop		= ata_port_stop,
-	.host_stop		= ata_pci_host_stop,
-};
-
-static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned long base)
-{
-	port->cmd_addr		= base + VSC_SATA_TF_CMD_OFFSET;
-	port->data_addr		= base + VSC_SATA_TF_DATA_OFFSET;
-	port->error_addr	= base + VSC_SATA_TF_ERROR_OFFSET;
-	port->feature_addr	= base + VSC_SATA_TF_FEATURE_OFFSET;
-	port->nsect_addr	= base + VSC_SATA_TF_NSECT_OFFSET;
-	port->lbal_addr		= base + VSC_SATA_TF_LBAL_OFFSET;
-	port->lbam_addr		= base + VSC_SATA_TF_LBAM_OFFSET;
-	port->lbah_addr		= base + VSC_SATA_TF_LBAH_OFFSET;
-	port->device_addr	= base + VSC_SATA_TF_DEVICE_OFFSET;
-	port->status_addr	= base + VSC_SATA_TF_STATUS_OFFSET;
-	port->command_addr	= base + VSC_SATA_TF_COMMAND_OFFSET;
-	port->altstatus_addr	= base + VSC_SATA_TF_ALTSTATUS_OFFSET;
-	port->ctl_addr		= base + VSC_SATA_TF_CTL_OFFSET;
-	port->bmdma_addr	= base + VSC_SATA_DMA_CMD_OFFSET;
-	port->scr_addr		= base + VSC_SATA_SCR_STATUS_OFFSET;
-	writel(0, base + VSC_SATA_UP_DESCRIPTOR_OFFSET);
-	writel(0, base + VSC_SATA_UP_DATA_BUFFER_OFFSET);
-}
-
-
-static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-	static int printed_version;
-	struct ata_probe_ent *probe_ent = NULL;
-	unsigned long base;
-	int pci_dev_busy = 0;
-	void __iomem *mmio_base;
-	int rc;
-
-	if (!printed_version++)
-		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
-
-	rc = pci_enable_device(pdev);
-	if (rc)
-		return rc;
-
-	/*
-	 * Check if we have needed resource mapped.
-	 */
-	if (pci_resource_len(pdev, 0) == 0) {
-		rc = -ENODEV;
-		goto err_out;
-	}
-
-	rc = pci_request_regions(pdev, DRV_NAME);
-	if (rc) {
-		pci_dev_busy = 1;
-		goto err_out;
-	}
-
-	/*
-	 * Use 32 bit DMA mask, because 64 bit address support is poor.
-	 */
-	rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
-	if (rc)
-		goto err_out_regions;
-	rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
-	if (rc)
-		goto err_out_regions;
-
-	probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL);
-	if (probe_ent == NULL) {
-		rc = -ENOMEM;
-		goto err_out_regions;
-	}
-	memset(probe_ent, 0, sizeof(*probe_ent));
-	probe_ent->dev = pci_dev_to_dev(pdev);
-	INIT_LIST_HEAD(&probe_ent->node);
-
-	mmio_base = pci_iomap(pdev, 0, 0);
-	if (mmio_base == NULL) {
-		rc = -ENOMEM;
-		goto err_out_free_ent;
-	}
-	base = (unsigned long) mmio_base;
-
-	/*
-	 * Due to a bug in the chip, the default cache line size can't be used
-	 */
-	pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x80);
-
-	probe_ent->sht = &vsc_sata_sht;
-	probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-				ATA_FLAG_MMIO;
-	probe_ent->port_ops = &vsc_sata_ops;
-	probe_ent->n_ports = 4;
-	probe_ent->irq = pdev->irq;
-	probe_ent->irq_flags = IRQF_SHARED;
-	probe_ent->mmio_base = mmio_base;
-
-	/* We don't care much about the PIO/UDMA masks, but the core won't like us
-	 * if we don't fill these
-	 */
-	probe_ent->pio_mask = 0x1f;
-	probe_ent->mwdma_mask = 0x07;
-	probe_ent->udma_mask = 0x7f;
-
-	/* We have 4 ports per PCI function */
-	vsc_sata_setup_port(&probe_ent->port[0], base + 1 * VSC_SATA_PORT_OFFSET);
-	vsc_sata_setup_port(&probe_ent->port[1], base + 2 * VSC_SATA_PORT_OFFSET);
-	vsc_sata_setup_port(&probe_ent->port[2], base + 3 * VSC_SATA_PORT_OFFSET);
-	vsc_sata_setup_port(&probe_ent->port[3], base + 4 * VSC_SATA_PORT_OFFSET);
-
-	pci_set_master(pdev);
-
-	/*
-	 * Config offset 0x98 is "Extended Control and Status Register 0"
-	 * Default value is (1 << 28).  All bits except bit 28 are reserved in
-	 * DPA mode.  If bit 28 is set, LED 0 reflects all ports' activity.
-	 * If bit 28 is clear, each port has its own LED.
-	 */
-	pci_write_config_dword(pdev, 0x98, 0);
-
-	/* FIXME: check ata_device_add return value */
-	ata_device_add(probe_ent);
-	kfree(probe_ent);
-
-	return 0;
-
-err_out_free_ent:
-	kfree(probe_ent);
-err_out_regions:
-	pci_release_regions(pdev);
-err_out:
-	if (!pci_dev_busy)
-		pci_disable_device(pdev);
-	return rc;
-}
-
-
-static const struct pci_device_id vsc_sata_pci_tbl[] = {
-	{ PCI_VENDOR_ID_VITESSE, 0x7174,
-	  PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
-	{ PCI_VENDOR_ID_INTEL, 0x3200,
-	  PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
-	{ }	/* terminate list */
-};
-
-
-static struct pci_driver vsc_sata_pci_driver = {
-	.name			= DRV_NAME,
-	.id_table		= vsc_sata_pci_tbl,
-	.probe			= vsc_sata_init_one,
-	.remove			= ata_pci_remove_one,
-};
-
-
-static int __init vsc_sata_init(void)
-{
-	return pci_module_init(&vsc_sata_pci_driver);
-}
-
-
-static void __exit vsc_sata_exit(void)
-{
-	pci_unregister_driver(&vsc_sata_pci_driver);
-}
-
-
-MODULE_AUTHOR("Jeremy Higdon");
-MODULE_DESCRIPTION("low-level driver for Vitesse VSC7174 SATA controller");
-MODULE_LICENSE("GPL");
-MODULE_DEVICE_TABLE(pci, vsc_sata_pci_tbl);
-MODULE_VERSION(DRV_VERSION);
-
-module_init(vsc_sata_init);
-module_exit(vsc_sata_exit);

linux-2.6-x86-relocatable.patch:
 b/arch/i386/Kconfig                                              |   13 
 b/arch/i386/Makefile                                             |    2 
 b/arch/i386/boot/Makefile                                        |    2 
 b/arch/i386/boot/bootsect.S                                      |   97 +
 b/arch/i386/boot/compressed/Makefile                             |   22 
 b/arch/i386/boot/compressed/head.S                               |  184 ++-
 b/arch/i386/boot/compressed/misc.c                               |  513 ++++++---
 b/arch/i386/boot/compressed/relocs.c                             |  563 ++++++++++
 b/arch/i386/boot/compressed/vmlinux.lds                          |   40 
 b/arch/i386/boot/compressed/vmlinux.scr                          |    3 
 b/arch/i386/boot/setup.S                                         |   29 
 b/arch/i386/boot/tools/build.c                                   |  214 +++
 b/arch/i386/kernel/alternative.c                                 |    8 
 b/arch/i386/kernel/setup.c                                       |    4 
 b/arch/i386/kernel/vmlinux.lds.S                                 |  114 +-
 b/arch/i386/mm/init.c                                            |   15 
 b/arch/x86_64/Kconfig                                            |   19 
 b/arch/x86_64/boot/Makefile                                      |    2 
 b/arch/x86_64/boot/bootsect.S                                    |   93 +
 b/arch/x86_64/boot/compressed/Makefile                           |   13 
 b/arch/x86_64/boot/compressed/head.S                             |  301 +++--
 b/arch/x86_64/boot/compressed/misc.c                             |  500 ++++++--
 b/arch/x86_64/boot/compressed/vmlinux.lds                        |   44 
 b/arch/x86_64/boot/compressed/vmlinux.scr                        |    5 
 b/arch/x86_64/boot/tools/build.c                                 |  232 +++-
 b/arch/x86_64/defconfig                                          |    1 
 b/arch/x86_64/kernel/acpi/sleep.c                                |   19 
 b/arch/x86_64/kernel/acpi/wakeup.S                               |  325 ++---
 b/arch/x86_64/kernel/e820.c                                      |   13 
 b/arch/x86_64/kernel/early_printk.c                              |    3 
 b/arch/x86_64/kernel/head.S                                      |  326 ++---
 b/arch/x86_64/kernel/head64.c                                    |   35 
 b/arch/x86_64/kernel/setup.c                                     |   29 
 b/arch/x86_64/kernel/setup64.c                                   |    1 
 b/arch/x86_64/kernel/smp.c                                       |    2 
 b/arch/x86_64/kernel/suspend.c                                   |    3 
 b/arch/x86_64/kernel/trampoline.S                                |  168 ++
 b/arch/x86_64/kernel/vmlinux.lds.S                               |    2 
 b/arch/x86_64/kernel/vsyscall.c                                  |   10 
 b/arch/x86_64/mm/fault.c                                         |    4 
 b/arch/x86_64/mm/init.c                                          |  288 ++---
 b/arch/x86_64/mm/pageattr.c                                      |   20 
 b/include/asm-generic/vmlinux.lds.h                              |    2 
 b/include/asm-i386/page.h                                        |    4 
 b/include/asm-x86_64/const.h                                     |   20 
 b/include/asm-x86_64/page.h                                      |   44 
 b/include/asm-x86_64/pgtable.h                                   |   39 
 b/include/asm-x86_64/proto.h                                     |    2 
 b/include/asm-x86_64/segment.h                                   |    4 
 b/include/asm-x86_64/suspend.h                                   |   13 
 b/include/linux/elf.h                                            |   27 
 b/include/linux/elf_boot.h                                       |   19 
 b/include/linux/screen_info.h                                    |    3 
 b/scripts/kallsyms.c                                             |   30 
 linux-2.6.17.noarch/arch/x86_64/mm/init.c                        |    2 
 linux-2.6.18-rc3-1M-root/arch/i386/Kconfig                       |   34 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/bootsect.S               |    8 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/head.S        |   28 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/misc.c        |    7 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/vmlinux.lds   |    3 
 linux-2.6.18-rc3-1M-root/arch/i386/kernel/vmlinux.lds.S          |    5 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/Makefile               |    3 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/compressed/vmlinux.lds |    2 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/tools/build.c          |  129 +-
 linux-2.6.18-rc3-1M-root/include/asm-i386/boot.h                 |    6 
 65 files changed, 3400 insertions(+), 1315 deletions(-)

--- NEW FILE linux-2.6-x86-relocatable.patch ---
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index daa75ce..a0707d7 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -761,11 +761,24 @@ config CRASH_DUMP
 	help
 	  Generate crash dump after being started by kexec.
 
+config RELOCATABLE
+	bool "Build a relocatable kernel"
+	help
+	  This build a kernel image that retains relocation information
+          so it can be loaded someplace besides the default 1MB.
+	  The relocations tend to the kernel binary about 10% larger,
+          but are discarded at runtime.
+
+	  One use is for the kexec on panic case where the recovery kernel
+          must live at a different physical address than the primary
+          kernel.
+
 config PHYSICAL_START
 	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
 
 	default "0x1000000" if CRASH_DUMP
 	default "0x100000"
+	range 0x100000 0x37c00000
 	help
 	  This gives the physical address where the kernel is loaded. Normally
 	  for regular kernels this value is 0x100000 (1MB). But in the case
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 3e4adb1..e9d6eac 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -26,7 +26,7 @@ endif
 
 LDFLAGS		:= -m elf_i386
 OBJCOPYFLAGS	:= -O binary -R .note -R .comment -S
-LDFLAGS_vmlinux :=
+LDFLAGS_vmlinux := --emit-relocs
 CHECKFLAGS	+= -D__i386__
 
 CFLAGS += -pipe -msoft-float
diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index e979466..44ef35c 100644
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -43,7 +43,7 @@ # --------------------------------------
 
 quiet_cmd_image = BUILD   $@
 cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/bootsect $(obj)/setup \
-	    $(obj)/vmlinux.bin $(ROOT_DEV) > $@
+	    $(obj)/vmlinux.bin $(ROOT_DEV) vmlinux > $@
 
 $(obj)/zImage $(obj)/bzImage: $(obj)/bootsect $(obj)/setup \
 			      $(obj)/vmlinux.bin $(obj)/tools/build FORCE
diff --git a/arch/i386/boot/bootsect.S b/arch/i386/boot/bootsect.S
index 011b7a4..847dc8f 100644
--- a/arch/i386/boot/bootsect.S
+++ b/arch/i386/boot/bootsect.S
@@ -13,6 +13,13 @@
  *
  */
 
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/utsrelease.h>
+#include <linux/compile.h>
+#include <linux/elf.h>
+#include <linux/elf_boot.h>
+#include <asm/page.h>
 #include <asm/boot.h>
 
 SETUPSECTS	= 4			/* default nr of setup-sectors */
@@ -42,10 +49,92 @@ #endif
 
 .global _start
 _start:
-
+ehdr:
+	# e_ident is carefully crafted so if this is treated
+	# as an x86 bootsector you will execute through
+	# e_ident and then print the bugger off message.
+	# The 1 stores to bx+di is unfortunate it is
+	# unlikely to affect the ability to print
+	# a message and you aren't supposed to be booting a
+	# bzImage directly from a floppy anyway.
+
+	# e_ident
+	.byte ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3
+	.byte ELFCLASS32, ELFDATA2LSB, EV_CURRENT, ELFOSABI_STANDALONE
+	.byte 0xeb, 0x3d, 0, 0, 0, 0, 0, 0
+#ifndef CONFIG_RELOCATABLE
+	.word ET_EXEC				# e_type
+#else
+	.word ET_DYN				# e_type
+#endif
+	.word EM_386				# e_machine
+	.int  1					# e_version
+	.int  CONFIG_PHYSICAL_START		# e_entry
+	.int  phdr - _start			# e_phoff
+	.int  0					# e_shoff
+	.int  0					# e_flags
+	.word e_ehdr - ehdr			# e_ehsize
+	.word e_phdr1 - phdr			# e_phentsize
+	.word (e_phdr - phdr)/(e_phdr1 - phdr)	# e_phnum
+	.word 40				# e_shentsize
+	.word 0					# e_shnum
+	.word 0					# e_shstrndx
+e_ehdr:
+
+.org 71
+normalize:
 	# Normalize the start address
 	jmpl	$BOOTSEG, $start2
 
+.org 80
+phdr:
+	.int PT_LOAD					# p_type
+	.int (SETUPSECTS+1)*512				# p_offset
+	.int __PAGE_OFFSET + CONFIG_PHYSICAL_START	# p_vaddr
+	.int CONFIG_PHYSICAL_START			# p_paddr
+	.int SYSSIZE*16					# p_filesz
+	.int 0						# p_memsz
+	.int PF_R | PF_W | PF_X				# p_flags
+	.int 4*1024*1024				# p_align
+e_phdr1:
+
+	.int PT_NOTE					# p_type
+	.int b_note - _start				# p_offset
+	.int 0						# p_vaddr
+	.int 0						# p_paddr
+	.int e_note - b_note				# p_filesz
+	.int 0						# p_memsz
+	.int 0						# p_flags
+	.int 0						# p_align
+e_phdr:
+
+.macro note name, type
+	.balign 4
+	.int	2f - 1f			# n_namesz
+	.int	4f - 3f			# n_descsz
+	.int	\type			# n_type
+	.balign 4
+1:	.asciz "\name"
+2:	.balign 4
+3:
+.endm
+.macro enote
+4:	.balign 4
+.endm
+
+	.balign 4
+b_note:
+	note ELF_NOTE_BOOT, EIN_PROGRAM_NAME
+		.asciz	"Linux"
+	enote
+	note ELF_NOTE_BOOT, EIN_PROGRAM_VERSION
+		.asciz	UTS_RELEASE
+	enote
+	note ELF_NOTE_BOOT, EIN_ARGUMENT_STYLE
+		.asciz	"Linux"
+	enote
+e_note:
+
 start2:
 	movw	%cs, %ax
 	movw	%ax, %ds
@@ -78,11 +167,11 @@ die:
 
 
 bugger_off_msg:
-	.ascii	"Direct booting from floppy is no longer supported.\r\n"
-	.ascii	"Please use a boot loader program instead.\r\n"
+	.ascii	"Booting linux without a boot loader is no longer supported.\r\n"
 	.ascii	"\n"
-	.ascii	"Remove disk and press any key to reboot . . .\r\n"
+	.ascii	"Press any key to reboot . . .\r\n"
 	.byte	0
+ebugger_off_msg:
 
 
 	# Kernel attributes; used by setup
diff --git a/arch/i386/boot/compressed/Makefile b/arch/i386/boot/compressed/Makefile
index 258ea95..1c486d1 100644
--- a/arch/i386/boot/compressed/Makefile
+++ b/arch/i386/boot/compressed/Makefile
@@ -7,19 +7,33 @@ #
 targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
 EXTRA_AFLAGS	:= -traditional
 
-LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup_32
+LDFLAGS_vmlinux := -T
+CFLAGS_misc.o += -fPIC
+hostprogs-y	:= relocs
 
-$(obj)/vmlinux: $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
+$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
 	$(call if_changed,ld)
 	@:
[...6707 lines suppressed...]
-	  of kexec on panic the fail safe kernel needs to run at a different
-	  address than the panic-ed kernel. This option is used to set the load
-	  address for kernels used to capture crash dump on being kexec'ed
-	  after panic. The default value for crash dump kernels is
-	  0x1000000 (16MB). This can also be set based on the "X" value as
-	  specified in the "crashkernel=YM at XM" command line boot parameter
-	  passed to the panic-ed kernel. Typically this parameter is set as
-	  crashkernel=64M at 16M. Please take a look at
-	  Documentation/kdump/kdump.txt for more details about crash dumps.
+	  This value puts the alignment restrictions on physical address
+	  where kernel is loaded and run from. Kernel is compiled for an
+	  address which meets above alignment restriction.
+
+	  If bootloader loads the kernel at a non-aligned address and
+	  CONFIG_RELOCATABLE is set, kernel will move itself to nearest
+	  address aligned to above value and run from there.
+
+	  If bootloader loads the kernel at a non-aligned address and
+	  CONFIG_RELOCATABLE is not set, kernel will ignore the run time
+	  load address and decompress itself to the address it has been
+	  compiled for and run from there. The address for which kernel is
+	  compiled already meets above alignment restrictions. Hence the
+	  end result is that kernel runs from a physical address meeting above
+	  alignment restrictions.
 
 	  Don't change this unless you know what you are doing.
 
diff -puN include/asm-i386/boot.h~i386-implement-config-physical-align-option include/asm-i386/boot.h
--- linux-2.6.18-rc3-1M/include/asm-i386/boot.h~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
+++ linux-2.6.18-rc3-1M-root/include/asm-i386/boot.h	2006-08-17 10:56:46.000000000 -0400
@@ -12,4 +12,8 @@
 #define EXTENDED_VGA	0xfffe		/* 80x50 mode */
 #define ASK_VGA		0xfffd		/* ask for it at bootup */
 
-#endif
+/* Physical address where kenrel should be loaded. */
+#define LOAD_PHYSICAL_ADDR ((0x100000 + CONFIG_PHYSICAL_ALIGN - 1) \
+				& ~(CONFIG_PHYSICAL_ALIGN - 1))
+
+#endif /* _LINUX_BOOT_H */
diff -puN arch/i386/kernel/vmlinux.lds.S~i386-implement-config-physical-align-option arch/i386/kernel/vmlinux.lds.S
--- linux-2.6.18-rc3-1M/arch/i386/kernel/vmlinux.lds.S~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
+++ linux-2.6.18-rc3-1M-root/arch/i386/kernel/vmlinux.lds.S	2006-08-17 10:56:46.000000000 -0400
@@ -2,13 +2,14 @@
  * Written by Martin Mares <mj at atrey.karlin.mff.cuni.cz>;
  */
 
-#define LOAD_OFFSET __PAGE_OFFSET
+#define LOAD_OFFSET	__PAGE_OFFSET
 
 #include <linux/config.h>
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
 #include <asm/cache.h>
+#include <asm/boot.h>
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
 OUTPUT_ARCH(i386)
@@ -16,7 +17,7 @@ ENTRY(phys_startup_32)
 jiffies = jiffies_64;
 SECTIONS
 {
-  . = LOAD_OFFSET + CONFIG_PHYSICAL_START;
+  . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
   phys_startup_32 = startup_32 - LOAD_OFFSET;
   /* read-only */
   .text : AT(ADDR(.text) - LOAD_OFFSET) {
diff -puN arch/i386/boot/bootsect.S~i386-implement-config-physical-align-option arch/i386/boot/bootsect.S
--- linux-2.6.18-rc3-1M/arch/i386/boot/bootsect.S~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
+++ linux-2.6.18-rc3-1M-root/arch/i386/boot/bootsect.S	2006-08-17 12:37:19.000000000 -0400
@@ -69,7 +69,7 @@ ehdr:
 #endif
 	.word EM_386				# e_machine
 	.int  1					# e_version
-	.int  CONFIG_PHYSICAL_START		# e_entry
+	.int  LOAD_PHYSICAL_ADDR		# e_entry
 	.int  phdr - _start			# e_phoff
 	.int  0					# e_shoff
 	.int  0					# e_flags
@@ -90,12 +90,12 @@ normalize:
 phdr:
 	.int PT_LOAD					# p_type
 	.int (SETUPSECTS+1)*512				# p_offset
-	.int __PAGE_OFFSET + CONFIG_PHYSICAL_START	# p_vaddr
-	.int CONFIG_PHYSICAL_START			# p_paddr
+	.int LOAD_PHYSICAL_ADDR + __PAGE_OFFSET		# p_vaddr
+	.int LOAD_PHYSICAL_ADDR				# p_paddr
 	.int SYSSIZE*16					# p_filesz
 	.int 0						# p_memsz
 	.int PF_R | PF_W | PF_X				# p_flags
-	.int 4*1024*1024				# p_align
+	.int CONFIG_PHYSICAL_ALIGN			# p_align
 e_phdr1:
 
 	.int PT_NOTE					# p_type
diff -puN arch/i386/boot/compressed/vmlinux.lds~i386-implement-config-physical-align-option arch/i386/boot/compressed/vmlinux.lds
--- linux-2.6.18-rc3-1M/arch/i386/boot/compressed/vmlinux.lds~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
+++ linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/vmlinux.lds	2006-08-17 10:56:46.000000000 -0400
@@ -3,6 +3,9 @@ OUTPUT_ARCH(i386)
 ENTRY(startup_32)
 SECTIONS
 {
+        /* Be careful parts of head.S assume startup_32 is at
+         * address 0.
+	 */
 	. =  0 	;
 	.text.head : {
 		_head = . ;
diff -puN arch/i386/boot/compressed/head.S~i386-implement-config-physical-align-option arch/i386/boot/compressed/head.S
--- linux-2.6.18-rc3-1M/arch/i386/boot/compressed/head.S~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
+++ linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/head.S	2006-08-17 11:12:51.000000000 -0400
@@ -27,6 +27,7 @@
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page.h>
+#include <asm/boot.h>
 
 .section ".text.head"
 	.globl startup_32
@@ -53,17 +54,19 @@ startup_32:
 1:	popl %ebp
 	subl $1b, %ebp
 
-/* Compute the delta between where we were compiled to run at
- * and where the code will actually run at.
+
+/* %ebp contains the address we are loaded at by the boot loader and %ebx
+ * contains the address where we should move the kernel image temporarily
+ * for safe in-place decompression.
  */
-	/* Start with the delta to where the kernel will run at.  If we are
-	 * a relocatable kernel this is the delta to our load address otherwise
-	 * this is the delta to CONFIG_PHYSICAL start.
-	 */
+
 #ifdef CONFIG_RELOCTABLE
-	movl %ebp, %ebx
+	movl 	%ebp, %ebx
+	addl    $(CONFIG_PHYSICAL_ALIGN - 1), %ebx
+	andl    $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebx
+
 #else
-	movl $(CONFIG_PHYSICAL_START - startup_32), %ebx
+	movl $LOAD_PHYSICAL_ADDR, %ebx
 #endif
 
 	/* Replace the compressed data size with the uncompressed size */
@@ -95,9 +98,10 @@ startup_32:
 /* Compute the kernel start address.
  */
 #ifdef CONFIG_RELOCATABLE
-	leal	startup_32(%ebp), %ebp
+	addl    $(CONFIG_PHYSICAL_ALIGN - 1), %ebp
+	andl    $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebp
 #else
-	movl	$CONFIG_PHYSICAL_START, %ebp
+	movl	$LOAD_PHYSICAL_ADDR, %ebp
 #endif
 
 /*
@@ -151,8 +155,8 @@ relocated:
  * and where it was actually loaded.
  */
 	movl %ebp, %ebx
-	subl $CONFIG_PHYSICAL_START, %ebx
-
+	subl $LOAD_PHYSICAL_ADDR, %ebx
+	jz   2f		/* Nothing to be done if loaded at compiled addr. */
 /*
  * Process relocations.
  */
diff -puN arch/i386/boot/compressed/misc.c~i386-implement-config-physical-align-option arch/i386/boot/compressed/misc.c
--- linux-2.6.18-rc3-1M/arch/i386/boot/compressed/misc.c~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
+++ linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/misc.c	2006-08-17 11:19:05.000000000 -0400
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/page.h>
+#include <asm/boot.h>
 
 /* WARNING!!
  * This code is compiled with -fPIC and it is relocated dynamically
@@ -585,12 +586,12 @@ asmlinkage void decompress_kernel(void *
 	insize = input_len;
 	inptr  = 0;
 
-	if (((u32)output - CONFIG_PHYSICAL_START) & 0x3fffff)
-		error("Destination address not 4M aligned");
+	if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1))
+		error("Destination address not CONFIG_PHYSICAL_ALIGN aligned");
 	if (end > ((-__PAGE_OFFSET-(512 <<20)-1) & 0x7fffffff))
 		error("Destination address too large");
 #ifndef CONFIG_RELOCATABLE
-	if ((u32)output != CONFIG_PHYSICAL_START)
+	if ((u32)output != LOAD_PHYSICAL_ADDR)
 		error("Wrong destination address");
 #endif
 
_

linux-2.6-xen-x86-relocatable.patch:
 arch/i386/kernel/head-xen.S               |    5 
 arch/i386/kernel/setup-xen.c              |    4 
 arch/i386/kernel/traps-xen.c              |    2 
 arch/i386/kernel/traps.c                  |    2 
 arch/i386/kernel/vmlinux.lds.S            |    6 
 arch/i386/mm/init-xen.c                   |   17 -
 arch/i386/mm/init.c                       |    2 
 arch/x86_64/kernel/e820-xen.c             |   13 -
 arch/x86_64/kernel/early_printk-xen.c     |    3 
 arch/x86_64/kernel/head-xen.S             |   19 -
 arch/x86_64/kernel/head64-xen.c           |   33 ++-
 arch/x86_64/kernel/setup-xen.c            |   30 +-
 arch/x86_64/kernel/setup64-xen.c          |    1 
 arch/x86_64/kernel/smp-xen.c              |    2 
 arch/x86_64/kernel/vmlinux.lds.S          |    5 
 arch/x86_64/kernel/vsyscall-xen.c         |   10 
 arch/x86_64/mm/fault-xen.c                |    4 
 arch/x86_64/mm/init-xen.c                 |  314 +++++++++++++++++-------------
 arch/x86_64/mm/pageattr-xen.c             |   20 +
 include/asm-i386/mach-xen/asm/page.h      |    4 
 include/asm-x86_64/mach-xen/asm/page.h    |   41 +--
 include/asm-x86_64/mach-xen/asm/pgtable.h |   39 ++-
 22 files changed, 326 insertions(+), 250 deletions(-)

--- NEW FILE linux-2.6-xen-x86-relocatable.patch ---
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/kernel/head-xen.S linux-2.6.17.work/arch/i386/kernel/head-xen.S
--- linux-2.6.17.reloc/arch/i386/kernel/head-xen.S	2006-08-24 14:49:28.000000000 +0200
+++ linux-2.6.17.work/arch/i386/kernel/head-xen.S	2006-08-24 16:16:09.000000000 +0200
@@ -5,6 +5,7 @@
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page.h>
+#include <asm/boot.h>
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
 #include <xen/interface/arch-x86_32.h>
@@ -163,9 +164,9 @@ ENTRY(cpu_gdt_table)
 	.ascii	",ELF_PADDR_OFFSET=0x0"
 #endif /* !CONFIG_XEN_COMPAT_030002 */
 	.ascii	",VIRT_ENTRY=0x"
-		utoa (__PAGE_OFFSET + __PHYSICAL_START + VIRT_ENTRY_OFFSET)
+		utoa (__PAGE_OFFSET + LOAD_PHYSICAL_ADDR + VIRT_ENTRY_OFFSET)
 	.ascii	",HYPERCALL_PAGE=0x"
-		utoa ((__PHYSICAL_START+HYPERCALL_PAGE_OFFSET)>>PAGE_SHIFT)
+		utoa ((LOAD_PHYSICAL_ADDR + HYPERCALL_PAGE_OFFSET)>>PAGE_SHIFT)
 	.ascii  ",FEATURES=writable_page_tables"
 	.ascii	         "|writable_descriptor_tables"
 	.ascii	         "|auto_translated_physmap"
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/kernel/setup-xen.c linux-2.6.17.work/arch/i386/kernel/setup-xen.c
--- linux-2.6.17.reloc/arch/i386/kernel/setup-xen.c	2006-08-24 14:49:28.000000000 +0200
+++ linux-2.6.17.work/arch/i386/kernel/setup-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -1292,8 +1292,8 @@ void __init setup_bootmem_allocator(void
 	 * the (very unlikely) case of us accidentally initializing the
 	 * bootmem allocator with an invalid RAM area.
 	 */
-	reserve_bootmem(__PHYSICAL_START, (PFN_PHYS(min_low_pfn) +
-			 bootmap_size + PAGE_SIZE-1) - (__PHYSICAL_START));
+	reserve_bootmem(__pa_symbol(_text), (PFN_PHYS(min_low_pfn) +
+			 bootmap_size + PAGE_SIZE-1) - __pa_symbol(_text));
 
 #ifndef CONFIG_XEN
 	/*
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/kernel/traps.c linux-2.6.17.work/arch/i386/kernel/traps.c
--- linux-2.6.17.reloc/arch/i386/kernel/traps.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/i386/kernel/traps.c	2006-08-24 14:59:36.000000000 +0200
@@ -1192,7 +1192,7 @@ asmlinkage void math_emulate(long arg)
 #ifdef CONFIG_X86_F00F_BUG
 void __init trap_init_f00f_bug(void)
 {
-	__set_fixmap(FIX_F00F_IDT, __pa(&idt_table), PAGE_KERNEL_RO);
+	__set_fixmap(FIX_F00F_IDT, __pa_symbol(&idt_table), PAGE_KERNEL_RO);
 
 	/*
 	 * Update the IDT descriptor and reload the IDT so that
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/kernel/traps-xen.c linux-2.6.17.work/arch/i386/kernel/traps-xen.c
--- linux-2.6.17.reloc/arch/i386/kernel/traps-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/i386/kernel/traps-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -1180,7 +1180,7 @@ asmlinkage void math_emulate(long arg)
 #ifdef CONFIG_X86_F00F_BUG
 void __init trap_init_f00f_bug(void)
 {
-	__set_fixmap(FIX_F00F_IDT, __pa(&idt_table), PAGE_KERNEL_RO);
+	__set_fixmap(FIX_F00F_IDT, __pa_symbol(&idt_table), PAGE_KERNEL_RO);
 
 	/*
 	 * Update the IDT descriptor and reload the IDT so that
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/kernel/vmlinux.lds.S linux-2.6.17.work/arch/i386/kernel/vmlinux.lds.S
--- linux-2.6.17.reloc/arch/i386/kernel/vmlinux.lds.S	2006-08-24 14:56:40.000000000 +0200
+++ linux-2.6.17.work/arch/i386/kernel/vmlinux.lds.S	2006-08-24 15:56:34.000000000 +0200
@@ -17,7 +17,13 @@ ENTRY(phys_startup_32)
 jiffies = jiffies_64;
 SECTIONS
 {
+/* xen i386 redefineds LOAD_OFFSET to zero on page.h
+   quintela at redhat.com */
+#ifdef CONFIG_XEN
+  . = __PAGE_OFFSET + LOAD_PHYSICAL_ADDR;
+#else
   . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
+#endif
   phys_startup_32 = startup_32 - LOAD_OFFSET;
   /* read-only */
   .text : AT(ADDR(.text) - LOAD_OFFSET) {
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/mm/init.c linux-2.6.17.work/arch/i386/mm/init.c
--- linux-2.6.17.reloc/arch/i386/mm/init.c	2006-08-24 14:56:40.000000000 +0200
+++ linux-2.6.17.work/arch/i386/mm/init.c	2006-08-24 14:59:36.000000000 +0200
@@ -563,7 +563,7 @@ static void __init test_wp_bit(void)
 	printk("Checking if this processor honours the WP bit even in supervisor mode... ");
 
 	/* Any page-aligned address will do, the test is non-destructive */
-	__set_fixmap(FIX_WP_TEST, __pa(&swapper_pg_dir), PAGE_READONLY);
+	__set_fixmap(FIX_WP_TEST, __pa_symbol(&swapper_pg_dir), PAGE_READONLY);
 	boot_cpu_data.wp_works_ok = do_test_wp_bit();
 	clear_fixmap(FIX_WP_TEST);
 
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/mm/init-xen.c linux-2.6.17.work/arch/i386/mm/init-xen.c
--- linux-2.6.17.reloc/arch/i386/mm/init-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/i386/mm/init-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -611,7 +611,7 @@ static void __init test_wp_bit(void)
 	printk("Checking if this processor honours the WP bit even in supervisor mode... ");
 
 	/* Any page-aligned address will do, the test is non-destructive */
-	__set_fixmap(FIX_WP_TEST, __pa(&swapper_pg_dir), PAGE_READONLY);
+	__set_fixmap(FIX_WP_TEST, __pa_symbol(&swapper_pg_dir), PAGE_READONLY);
 	boot_cpu_data.wp_works_ok = do_test_wp_bit();
 	clear_fixmap(FIX_WP_TEST);
 
@@ -851,10 +851,11 @@ void free_init_pages(char *what, unsigne
 	unsigned long addr;
 
 	for (addr = begin; addr < end; addr += PAGE_SIZE) {
-		ClearPageReserved(virt_to_page(addr));
-		init_page_count(virt_to_page(addr));
-		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
-		free_page(addr);
+		struct page *page = pfn_to_page(addr >> PAGE_SHIFT);
+		ClearPageReserved(page);
+		init_page_count(page);
+		memset(page_address(page), POISON_FREE_INITMEM, PAGE_SIZE);
+		__free_page(page);
 		totalram_pages++;
 	}
 	printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
@@ -863,14 +864,14 @@ void free_init_pages(char *what, unsigne
 void free_initmem(void)
 {
 	free_init_pages("unused kernel memory",
-			(unsigned long)(&__init_begin),
-			(unsigned long)(&__init_end));
+			__pa_symbol(&__init_begin),
+			__pa_symbol(&__init_end));
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-	free_init_pages("initrd memory", start, end);
+	free_init_pages("initrd memory", __pa_symbol(start), __pa_symbol(end));
 }
 #endif
 
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/e820-xen.c linux-2.6.17.work/arch/x86_64/kernel/e820-xen.c
--- linux-2.6.17.reloc/arch/x86_64/kernel/e820-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/kernel/e820-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -72,9 +72,14 @@ static inline int bad_addr(unsigned long
 		return 1;
 	} 
 #endif
-	/* kernel code + 640k memory hole (later should not be needed, but 
+	/* 640k memory hole (later should not be needed, but
 	   be paranoid for now) */
-	if (last >= 640*1024 && addr < __pa_symbol(&_end)) { 
+	if (last >= 640*1024 && addr < HIGH_MEMORY) {
+		*addrp = HIGH_MEMORY;
+	}
+
+	/* kernel code */
+	if (last >= __pa_symbol(&_text) && addr < __pa_symbol(&_end)) {
 		*addrp = __pa_symbol(&_end);
 		return 1;
 	}
@@ -214,8 +219,8 @@ unsigned long __init e820_end_of_ram(voi
 		if (start >= end)
 			continue;
 		if (ei->type == E820_RAM) { 
-		if (end > end_pfn<<PAGE_SHIFT)
-			end_pfn = end>>PAGE_SHIFT;
+			if (end > end_pfn<<PAGE_SHIFT)
+				end_pfn = end>>PAGE_SHIFT;
 		} else { 
 			if (end > end_pfn_map<<PAGE_SHIFT) 
 				end_pfn_map = end>>PAGE_SHIFT;
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/early_printk-xen.c linux-2.6.17.work/arch/x86_64/kernel/early_printk-xen.c
--- linux-2.6.17.reloc/arch/x86_64/kernel/early_printk-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/kernel/early_printk-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -12,11 +12,10 @@
 
 #ifdef __i386__
 #include <asm/setup.h>
-#define VGABASE		(__ISA_IO_base + 0xb8000)
 #else
 #include <asm/bootsetup.h>
-#define VGABASE		((void __iomem *)0xffffffff800b8000UL)
 #endif
+#define VGABASE		(__ISA_IO_base + 0xb8000)
 
 static int max_ypos = 25, max_xpos = 80;
 static int current_ypos = 25, current_xpos = 0;
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/head64-xen.c linux-2.6.17.work/arch/x86_64/kernel/head64-xen.c
--- linux-2.6.17.reloc/arch/x86_64/kernel/head64-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/kernel/head64-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -22,13 +22,21 @@
 #include <asm/setup.h>
 #include <asm/desc.h>
 #include <asm/pgtable.h>
+#include <asm/tlbflush.h>
 #include <asm/sections.h>
 
 unsigned long start_pfn;
 
+#if 0
+static void __init zap_identity_mappings(void)
+{
+	pgd_t *pgd = pgd_offset_k(0UL);
+	pgd_clear(pgd);
+	__flush_tlb();
+}
+
 /* Don't add a printk in there. printk relies on the PDA which is not initialized 
    yet. */
-#if 0
 static void __init clear_bss(void)
 {
 	memset(__bss_start, 0,
@@ -37,30 +45,29 @@ static void __init clear_bss(void)
 #endif
 
 #define NEW_CL_POINTER		0x228	/* Relative to real mode data */
-#define OLD_CL_MAGIC_ADDR	0x90020
+#define OLD_CL_MAGIC_ADDR	0x20
 #define OLD_CL_MAGIC            0xA33F
-#define OLD_CL_BASE_ADDR        0x90000
-#define OLD_CL_OFFSET           0x90022
+#define OLD_CL_OFFSET           0x22
 
 extern char saved_command_line[];
 
 static void __init copy_bootdata(char *real_mode_data)
 {
 #ifndef CONFIG_XEN
-	int new_data;
+	unsigned long new_data;
 	char * command_line;
 
 	memcpy(x86_boot_params, real_mode_data, BOOT_PARAM_SIZE);
-	new_data = *(int *) (x86_boot_params + NEW_CL_POINTER);
+	new_data = *(u32 *) (x86_boot_params + NEW_CL_POINTER);
 	if (!new_data) {
-		if (OLD_CL_MAGIC != * (u16 *) OLD_CL_MAGIC_ADDR) {
+		if (OLD_CL_MAGIC != *(u16 *)(real_mode_data + OLD_CL_MAGIC_ADDR)) {
 			printk("so old bootloader that it does not support commandline?!\n");
 			return;
 		}
-		new_data = OLD_CL_BASE_ADDR + * (u16 *) OLD_CL_OFFSET;
+		new_data = __pa(real_mode_data) + *(u16 *)(read_mode_data + OLD_CL_OFFSET);
 		printk("old bootloader convention, maybe loadlin?\n");
 	}
-	command_line = (char *) ((u64)(new_data));
+	command_line = __va(new_data);
 	memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
 #else
 	int max_cmdline;
@@ -104,6 +111,10 @@ void __init x86_64_start_kernel(char * r
 	char *s;
 	int i;
 
+#if 0
+	/* Make NULL pointers segfault */
+	zap_identity_mappings();
+#endif
 	xen_start_info = (struct start_info *)real_mode_data;
 	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
 		phys_to_machine_mapping =
@@ -136,7 +147,7 @@ void __init x86_64_start_kernel(char * r
  		cpu_pda(i) = &boot_cpu_pda[i];
 
 	pda_init(0);
-	copy_bootdata(real_mode_data);
+	copy_bootdata(__va(real_mode_data));
 #ifdef CONFIG_SMP
 	cpu_set(0, cpu_online_map);
 #endif
@@ -153,7 +164,7 @@ void __init x86_64_start_kernel(char * r
 		disable_apic = 1;
 #endif
 	/* You need early console to see that */
-	if (__pa_symbol(&_end) >= KERNEL_TEXT_SIZE)
+	if (((unsigned long)&_end) >= (__START_KERNEL_map + KERNEL_TEXT_SIZE))
 		panic("Kernel too big for kernel mapping\n");
 
 	setup_boot_cpu_data();
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/head-xen.S linux-2.6.17.work/arch/x86_64/kernel/head-xen.S
--- linux-2.6.17.reloc/arch/x86_64/kernel/head-xen.S	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/kernel/head-xen.S	2006-08-24 14:59:36.000000000 +0200
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <asm/desc.h>
 #include <asm/segment.h>
+#include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/msr.h>
 #include <asm/cache.h>
@@ -29,6 +30,7 @@
 .org VIRT_ENTRY_OFFSET
 	.globl startup_64
 startup_64:
+ENTRY(secondary_startup_64)
 ENTRY(_start)
 	movq $(init_thread_union+THREAD_SIZE-8),%rsp
 	/* zero EFLAGS after setting rsp */
@@ -47,7 +49,7 @@ ENTRY(_stext)
 #define NEXT_PAGE(name) \
 	$page = $page + 1; \
 	.org $page * 0x1000; \
-	phys_/**/name = $page * 0x1000 + __PHYSICAL_START; \
+	phys_/**/name = $page * 0x1000 + 0x200000; \
 ENTRY(name)
 
 NEXT_PAGE(init_level4_pgt)
@@ -110,13 +112,12 @@ gdt:
 
 ENTRY(cpu_gdt_table)
 	.quad	0x0000000000000000	/* NULL descriptor */
-	.quad	0x0			/* unused */
-	.quad	0x00af9a000000ffff	/* __KERNEL_CS */
-	.quad	0x00cf92000000ffff	/* __KERNEL_DS */
-	.quad	0x00cffa000000ffff	/* __USER32_CS */
-	.quad	0x00cff2000000ffff	/* __USER_DS, __USER32_DS  */
-	.quad	0x00affa000000ffff	/* __USER_CS */
-	.quad	0x00cf9a000000ffff	/* __KERNEL32_CS */
+	.quad	0x00cf9b000000ffff	/* __KERNEL32_CS */
+	.quad	0x00af9b000000ffff	/* __KERNEL_CS */
+	.quad	0x00cf93000000ffff	/* __KERNEL_DS */
+	.quad	0x00cffb000000ffff	/* __USER32_CS */
+	.quad	0x00cff3000000ffff	/* __USER_DS, __USER32_DS  */
+	.quad	0x00affb000000ffff	/* __USER_CS */
 	.quad	0,0			/* TSS */
 	.quad	0,0			/* LDT */
 	.quad   0,0,0			/* three TLS descriptors */
@@ -165,7 +166,7 @@ ENTRY(empty_zero_page)
 	.ascii	",ELF_PADDR_OFFSET=0x0"
 #endif /* !CONFIG_XEN_COMPAT_030002 */
 	.ascii	",VIRT_ENTRY=0x"
-		utoh (__START_KERNEL_map + __PHYSICAL_START + VIRT_ENTRY_OFFSET)
+		utoh (__START_KERNEL_map + 0x200000 + VIRT_ENTRY_OFFSET)
 	.ascii	",HYPERCALL_PAGE=0x"
 		utoh (phys_hypercall_page >> PAGE_SHIFT)
 	.ascii  ",FEATURES=writable_page_tables"
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/setup64-xen.c linux-2.6.17.work/arch/x86_64/kernel/setup64-xen.c
--- linux-2.6.17.reloc/arch/x86_64/kernel/setup64-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/kernel/setup64-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -234,7 +234,6 @@ void __cpuinit cpu_init (void)
 	/* CPU 0 is initialised in head64.c */
 	if (cpu != 0) {
 		pda_init(cpu);
-		zap_low_mappings(cpu);
 	}
 #ifndef CONFIG_X86_NO_TSS
 	else
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/setup-xen.c linux-2.6.17.work/arch/x86_64/kernel/setup-xen.c
--- linux-2.6.17.reloc/arch/x86_64/kernel/setup-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/kernel/setup-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -559,10 +559,10 @@ static void discover_ebda(void)
 	 * there is a real-mode segmented pointer pointing to the 
 	 * 4K EBDA area at 0x40E
 	 */
-	ebda_addr = *(unsigned short *)EBDA_ADDR_POINTER;
+	ebda_addr = *(unsigned short *)__va(EBDA_ADDR_POINTER);
 	ebda_addr <<= 4;
 
-	ebda_size = *(unsigned short *)(unsigned long)ebda_addr;
+	ebda_size = *(unsigned short *)__va(ebda_addr);
 
 	/* Round EBDA up to pages */
 	if (ebda_size == 0)
@@ -576,7 +576,7 @@ static void discover_ebda(void)
 
 void __init setup_arch(char **cmdline_p)
 {
-	unsigned long kernel_end;
+	unsigned long kernel_start, kernel_end;
 
 #if defined(CONFIG_XEN_PRIVILEGED_GUEST)
 	struct e820entry *machine_e820;
@@ -643,11 +643,12 @@ void __init setup_arch(char **cmdline_p)
 	init_mm.end_code = (unsigned long) &_etext;
 	init_mm.end_data = (unsigned long) &_edata;
 	init_mm.brk = (unsigned long) &_end;
+	init_mm.pgd = __va(__pa_symbol(&init_level4_pgt));
 
-	code_resource.start = virt_to_phys(&_text);
-	code_resource.end = virt_to_phys(&_etext)-1;
-	data_resource.start = virt_to_phys(&_etext);
-	data_resource.end = virt_to_phys(&_edata)-1;
+	code_resource.start = __pa_symbol(&_text);
+	code_resource.end = __pa_symbol(&_etext)-1;
+	data_resource.start = __pa_symbol(&_etext);
+	data_resource.end = __pa_symbol(&_edata)-1;
 
 	parse_cmdline_early(cmdline_p);
 
@@ -686,8 +687,9 @@ void __init setup_arch(char **cmdline_p)
 				(table_end - table_start) << PAGE_SHIFT);
 
 	/* reserve kernel */
+	kernel_start = __pa_symbol(&_text);
 	kernel_end = round_up(__pa_symbol(&_end),PAGE_SIZE);
-	reserve_bootmem_generic(HIGH_MEMORY, kernel_end - HIGH_MEMORY);
+	reserve_bootmem_generic(kernel_start, kernel_end - kernel_start);
 
 #ifdef CONFIG_XEN
 	/* reserve physmap, start info and initial page tables */
@@ -705,15 +707,8 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
 #ifdef CONFIG_SMP
-	/*
-	 * But first pinch a few for the stack/trampoline stuff
-	 * FIXME: Don't need the extra page at 4K, but need to fix
-	 * trampoline before removing it. (see the GDT stuff)
-	 */
-	reserve_bootmem_generic(PAGE_SIZE, PAGE_SIZE);
-
 	/* Reserve SMP trampoline */
-	reserve_bootmem_generic(SMP_TRAMPOLINE_BASE, PAGE_SIZE);
+	reserve_bootmem_generic(SMP_TRAMPOLINE_BASE, 2*PAGE_SIZE);
 #endif
 
 #ifdef CONFIG_ACPI_SLEEP
@@ -833,9 +828,6 @@ void __init setup_arch(char **cmdline_p)
 #ifndef CONFIG_XEN
 	check_ioapic();
 #endif
-
-	zap_low_mappings(0);
-
 	/*
 	 * set this early, so we dont allocate cpu0
 	 * if MADT list doesnt list BSP first
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/smp-xen.c linux-2.6.17.work/arch/x86_64/kernel/smp-xen.c
--- linux-2.6.17.reloc/arch/x86_64/kernel/smp-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/kernel/smp-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -81,7 +81,7 @@ static inline void leave_mm(unsigned lon
 	if (read_pda(mmu_state) == TLBSTATE_OK)
 		BUG();
 	cpu_clear(cpu, read_pda(active_mm)->cpu_vm_mask);
-	load_cr3(swapper_pg_dir);
+	load_cr3(init_mm.pgd);
 }
 
 #ifndef CONFIG_XEN
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/vmlinux.lds.S linux-2.6.17.work/arch/x86_64/kernel/vmlinux.lds.S
--- linux-2.6.17.reloc/arch/x86_64/kernel/vmlinux.lds.S	2006-08-24 14:56:40.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/kernel/vmlinux.lds.S	2006-08-24 14:59:36.000000000 +0200
@@ -15,7 +15,12 @@ ENTRY(phys_startup_64)
 jiffies_64 = jiffies;
 SECTIONS
 {
+/* XEN x86_64 don't work with relocations yet quintela at redhat.com */
+#ifdef CONFIG_X86_64_XEN
+  . = __START_KERNEL_map + 0x200000;
+#else	
   . = __START_KERNEL_map;
+#endif
   phys_startup_64 = startup_64 - LOAD_OFFSET;
   _text = .;			/* Text and read-only data */
   .text :  AT(ADDR(.text) - LOAD_OFFSET) {
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/vsyscall-xen.c linux-2.6.17.work/arch/x86_64/kernel/vsyscall-xen.c
--- linux-2.6.17.reloc/arch/x86_64/kernel/vsyscall-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/kernel/vsyscall-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -41,6 +41,12 @@ seqlock_t __xtime_lock __section_xtime_l
 
 #include <asm/unistd.h>
 
+#define __pa_vsymbol(x)			\
+	({unsigned long v;  		\
+	extern char __vsyscall_0; 	\
+	  asm("" : "=r" (v) : "0" (x)); \
+	  ((v - VSYSCALL_FIRST_PAGE) + __pa_symbol(&__vsyscall_0)); })
+
 static __always_inline void timeval_normalize(struct timeval * tv)
 {
 	time_t __sec;
@@ -155,10 +161,10 @@ static int vsyscall_sysctl_change(ctl_ta
 		return ret;
 	/* gcc has some trouble with __va(__pa()), so just do it this
 	   way. */
-	map1 = ioremap(__pa_symbol(&vsysc1), 2);
+	map1 = ioremap(__pa_vsymbol(&vsysc1), 2);
 	if (!map1)
 		return -ENOMEM;
-	map2 = ioremap(__pa_symbol(&vsysc2), 2);
+	map2 = ioremap(__pa_vsymbol(&vsysc2), 2);
 	if (!map2) {
 		ret = -ENOMEM;
 		goto out;
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/mm/fault-xen.c linux-2.6.17.work/arch/x86_64/mm/fault-xen.c
--- linux-2.6.17.reloc/arch/x86_64/mm/fault-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/mm/fault-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -710,9 +710,9 @@ void vmalloc_sync_all(void)
 			start = address + PGDIR_SIZE;
 	}
 	/* Check that there is no need to do the same for the modules area. */
-	BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL));
+	BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL_map));
 	BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) == 
-				(__START_KERNEL & PGDIR_MASK)));
+				(__START_KERNEL_map & PGDIR_MASK)));
 }
 
 static int __init enable_pagefaulttrace(char *str)
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/mm/init-xen.c linux-2.6.17.work/arch/x86_64/mm/init-xen.c
--- linux-2.6.17.reloc/arch/x86_64/mm/init-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/mm/init-xen.c	2006-08-24 15:02:05.000000000 +0200
@@ -369,20 +369,6 @@ void __set_fixmap_user (enum fixed_addre
 
 unsigned long __initdata table_start, table_end; 
 
-#ifndef CONFIG_XEN
-extern pmd_t temp_boot_pmds[]; 
-
-static  struct temp_map { 
-	pmd_t *pmd;
-	void  *address; 
-	int    allocated; 
-} temp_mappings[] __initdata = { 
-	{ &temp_boot_pmds[0], (void *)(40UL * 1024 * 1024) },
-	{ &temp_boot_pmds[1], (void *)(42UL * 1024 * 1024) }, 
-	{}
-}; 
-#endif /* !CONFIG_XEN */
-
 unsigned long get_machine_pfn(unsigned long addr)
 {
 	pud_t* pud = pud_offset_k(NULL, addr);
@@ -392,17 +378,10 @@ unsigned long get_machine_pfn(unsigned l
 	return pte_mfn(*pte);
 } 
 
-static __meminit void *alloc_static_page(unsigned long *phys)
+static __init void *alloc_static_page(unsigned long *phys)
 {
 	unsigned long va = (start_pfn << PAGE_SHIFT) + __START_KERNEL_map;
 
-	if (after_bootmem) {
-		void *adr = (void *)get_zeroed_page(GFP_ATOMIC);
-
-		*phys = __pa(adr);
-		return adr;
-	}
-
 	*phys = start_pfn << PAGE_SHIFT;
 	start_pfn++;
 	memset((void *)va, 0, PAGE_SIZE);
@@ -446,32 +425,50 @@ static inline int make_readonly(unsigned
 /* Must run before zap_low_mappings */
 __init void *early_ioremap(unsigned long addr, unsigned long size)
 {
-	unsigned long map = round_down(addr, LARGE_PAGE_SIZE); 
-
-	/* actually usually some more */
-	if (size >= LARGE_PAGE_SIZE) { 
-		printk("SMBIOS area too long %lu\n", size);
-		return NULL;
+	unsigned long vaddr;
+	pmd_t *pmd, *last_pmd;
+	int i, pmds;
+
+	pmds = ((addr & ~PMD_MASK) + size + ~PMD_MASK) / PMD_SIZE;
+	vaddr = __START_KERNEL_map;
+	pmd = level2_kernel_pgt;
+	last_pmd = level2_kernel_pgt + PTRS_PER_PMD - 1;
+	for (; pmd <= last_pmd; pmd++, vaddr += PMD_SIZE) {
+		for (i = 0; i < pmds; i++) {
+			if (pmd_present(pmd[i]))
+				goto next;
+		}
+		vaddr += addr & ~PMD_MASK;
+		addr &= PMD_MASK;
+		for (i = 0; i < pmds; i++, addr += PMD_SIZE)
+			set_pmd(pmd + i,__pmd(addr | _KERNPG_TABLE | _PAGE_PSE));
+		__flush_tlb();
+		return (void *)vaddr;
+	next:
+		;
 	}
-	set_pmd(temp_mappings[0].pmd,  __pmd(map | _KERNPG_TABLE | _PAGE_PSE));
-	map += LARGE_PAGE_SIZE;
-	set_pmd(temp_mappings[1].pmd,  __pmd(map | _KERNPG_TABLE | _PAGE_PSE));
-	__flush_tlb();
-	return temp_mappings[0].address + (addr & (LARGE_PAGE_SIZE-1));
+	printk("early_ioremap(0x%lx, %lu) failed\n", addr, size);
+	return NULL;
+
 }
 
 /* To avoid virtual aliases later */
 __init void early_iounmap(void *addr, unsigned long size)
 {
-	if ((void *)round_down((unsigned long)addr, LARGE_PAGE_SIZE) != temp_mappings[0].address)
-		printk("early_iounmap: bad address %p\n", addr);
-	set_pmd(temp_mappings[0].pmd, __pmd(0));
-	set_pmd(temp_mappings[1].pmd, __pmd(0));
+	unsigned long vaddr;
+	pmd_t *pmd;
+	int i, pmds;
+
+	vaddr = (unsigned long)addr;
+	pmds = ((vaddr & ~PMD_MASK) + size + ~PMD_MASK) / PMD_SIZE;
+	pmd = level2_kernel_pgt + pmd_index(vaddr);
+	for (i = 0; i < pmds; i++)
+		pmd_clear(pmd + i);
 	__flush_tlb();
 }
 #endif /* !CONFIG_XEN */
 
-static void __meminit
+static void __init
 phys_pmd_init(pmd_t *pmd, unsigned long address, unsigned long end)
 {
 	int i, k;
@@ -481,9 +478,8 @@ phys_pmd_init(pmd_t *pmd, unsigned long 
 		pte_t *pte, *pte_save;
 
 		if (address >= end) {
-			if (!after_bootmem)
-				for (; i < PTRS_PER_PMD; i++, pmd++)
-					set_pmd(pmd, __pmd(0));
+			for (; i < PTRS_PER_PMD; i++, pmd++)
+				set_pmd(pmd, __pmd(0));
 			break;
 		}
 		pte = alloc_static_page(&pte_phys);
@@ -508,30 +504,12 @@ phys_pmd_init(pmd_t *pmd, unsigned long 
 	}
 }
 
-static void __meminit
-phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end)
-{
-	pmd_t *pmd = pmd_offset(pud, (unsigned long)__va(address));
-
-	if (pmd_none(*pmd)) {
-		spin_lock(&init_mm.page_table_lock);
-		phys_pmd_init(pmd, address, end);
-		spin_unlock(&init_mm.page_table_lock);
-		__flush_tlb_all();
-	}
-}
-
-static void __meminit phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)
+static void __init phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)
 { 
 	long i = pud_index(address);
 
 	pud = pud + i;
 
-	if (after_bootmem && pud_val(*pud)) {
-		phys_pmd_update(pud, address, end);
-		return;
-	}
-
 	for (; i < PTRS_PER_PUD; pud++, i++) {
 		unsigned long paddr, pmd_phys;
 		pmd_t *pmd;
@@ -542,10 +520,8 @@ static void __meminit phys_pud_init(pud_
 
 		pmd = alloc_static_page(&pmd_phys);
 		early_make_page_readonly(pmd, XENFEAT_writable_page_tables);
-		spin_lock(&init_mm.page_table_lock);
 		set_pud(pud, __pud(pmd_phys | _KERNPG_TABLE));
 		phys_pmd_init(pmd, paddr, end);
-		spin_unlock(&init_mm.page_table_lock);
 	}
 	__flush_tlb();
 } 
@@ -669,7 +645,7 @@ static void __init find_early_table_spac
 /* Setup the direct mapping of the physical memory at PAGE_OFFSET.
    This runs before bootmem is initialized and gets pages directly from the 
    physical memory. To access them they are temporarily mapped. */
-void __meminit init_memory_mapping(unsigned long start, unsigned long end)
+void __init init_memory_mapping(unsigned long start, unsigned long end)
 { 
 	unsigned long next; 
 
@@ -681,73 +657,54 @@ void __meminit init_memory_mapping(unsig
 	 * mapped.  Unfortunately this is done currently before the nodes are 
 	 * discovered.
 	 */
-	if (!after_bootmem)
-		find_early_table_space(end);
+	find_early_table_space(end);
 
 	start = (unsigned long)__va(start);
 	end = (unsigned long)__va(end);
 
 	for (; start < end; start = next) {
 		unsigned long pud_phys; 
-		pgd_t *pgd = pgd_offset_k(start);
+ 		pgd_t *pgd = pgd_offset_k(start);
 		pud_t *pud;
 
-		if (after_bootmem) {
-			pud = pud_offset(pgd, start & PGDIR_MASK);
-			make_page_readonly(pud, XENFEAT_writable_page_tables);
-			pud_phys = __pa(pud);
-		} else {
-			pud = alloc_static_page(&pud_phys);
-			early_make_page_readonly(pud, XENFEAT_writable_page_tables);
-		}
+		pud = alloc_static_page(&pud_phys);
+		early_make_page_readonly(pud, XENFEAT_writable_page_tables);
+
 		next = start + PGDIR_SIZE;
 		if (next > end) 
 			next = end; 
 		phys_pud_init(pud, __pa(start), __pa(next));
-		if (!after_bootmem)
-			set_pgd(pgd_offset_k(start), mk_kernel_pgd(pud_phys));
+		set_pgd(pgd, mk_kernel_pgd(pud_phys));
 	}
 
-	if (!after_bootmem) {
-		BUG_ON(start_pfn != table_end);
+	BUG_ON(start_pfn != table_end);
 
-		/* Re-vector virtual addresses pointing into the initial
-		   mapping to the just-established permanent ones. */
-		xen_start_info = __va(__pa(xen_start_info));
-		xen_start_info->pt_base = (unsigned long)
-			__va(__pa(xen_start_info->pt_base));
-		if (!xen_feature(XENFEAT_auto_translated_physmap)) {
-			phys_to_machine_mapping =
-				__va(__pa(xen_start_info->mfn_list));
-			xen_start_info->mfn_list = (unsigned long)
+	/* Re-vector virtual addresses pointing into the initial
+	   mapping to the just-established permanent ones. */
+	xen_start_info = __va(__pa(xen_start_info));
+	xen_start_info->pt_base = (unsigned long)
+		__va(__pa(xen_start_info->pt_base));
+	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+		phys_to_machine_mapping = __va(__pa(xen_start_info->mfn_list));
+		xen_start_info->mfn_list = (unsigned long)
 				phys_to_machine_mapping;
-		}
-		if (xen_start_info->mod_start)
-			xen_start_info->mod_start = (unsigned long)
-				__va(__pa(xen_start_info->mod_start));
-
-		/* Destroy the Xen-created mappings beyond the kernel image as
-		 * well as the temporary mappings created above. Prevents
-		 * overlap with modules area (if init mapping is very big).
-		 */
-		start = PAGE_ALIGN((unsigned long)_end);
-		end   = __START_KERNEL_map + (table_end << PAGE_SHIFT);
-		for (; start < end; start += PAGE_SIZE)
-			WARN_ON(HYPERVISOR_update_va_mapping(
-				start, __pte_ma(0), 0));
 	}
+	if (xen_start_info->mod_start)
+		xen_start_info->mod_start = (unsigned long)
+			__va(__pa(xen_start_info->mod_start));
+
+	/* Destroy the Xen-created mappings beyond the kernel image as
+	 * well as the temporary mappings created above. Prevents
+	 * overlap with modules area (if init mapping is very big).
+	 */
+	start = PAGE_ALIGN((unsigned long)_end);
+	end   = __START_KERNEL_map + (table_end << PAGE_SHIFT);
+	for (; start < end; start += PAGE_SIZE)
+		WARN_ON(HYPERVISOR_update_va_mapping(start, __pte_ma(0), 0));
 
 	__flush_tlb_all();
 }
 
-void __cpuinit zap_low_mappings(int cpu)
-{
-	/* this is not required for Xen */
-#if 0
-	swap_low_mappings();
-#endif
-}
-
 /* Compute zone sizes for the DMA and DMA32 zones in a node. */
 __init void
 size_zones(unsigned long *z, unsigned long *h,
@@ -901,6 +858,111 @@ int memory_add_physaddr_to_nid(u64 start
 }
 #endif
 
+static void
+late_phys_pmd_init(pmd_t *pmd, unsigned long address, unsigned long end)
+{
+	int i, k;
+
+	for (i = 0; i < PTRS_PER_PMD; pmd++, i++) {
+		unsigned long pte_phys;
+		pte_t *pte, *pte_save;
+
+		if (address >= end)
+			break;
+		pte = alloc_static_page(&pte_phys);
+		pte_save = pte;
+		for (k = 0; k < PTRS_PER_PTE; pte++, k++, address += PTE_SIZE) {
+			if ((address >= end) ||
+			    ((address >> PAGE_SHIFT) >=
+			     xen_start_info->nr_pages)) { 
+				__set_pte(pte, __pte(0)); 
+				continue;
+			}
+			if (make_readonly(address)) {
+				__set_pte(pte, 
+					  __pte(address | (_KERNPG_TABLE & ~_PAGE_RW)));
+				continue;
+			}
+			__set_pte(pte, __pte(address | _KERNPG_TABLE));
+		}
+		pte = pte_save;
+		early_make_page_readonly(pte, XENFEAT_writable_page_tables);
+		set_pmd(pmd, __pmd(pte_phys | _KERNPG_TABLE));
+	}
+}
+
+static void
+late_phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end)
+{
+	pmd_t *pmd = pmd_offset(pud, (unsigned long)__va(address));
+
+	if (pmd_none(*pmd)) {
+		spin_lock(&init_mm.page_table_lock);
+		late_phys_pmd_init(pmd, address, end);
+		spin_unlock(&init_mm.page_table_lock);
+		__flush_tlb_all();
+	}
+}
+
+static void late_phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)
+{ 
+	long i = pud_index(address);
+
+	pud = pud + i;
+
+	if (pud_val(*pud)) {
+		late_phys_pmd_update(pud, address, end);
+		return;
+	}
+
+	for (; i < PTRS_PER_PUD; pud++, i++) {
+		unsigned long paddr, pmd_phys;
+		pmd_t *pmd;
+
+		paddr = (address & PGDIR_MASK) + i*PUD_SIZE;
+		if (paddr >= end)
+			break;
+
+		pmd = (pmd_t *)get_zeroed_page(GFP_ATOMIC);
+		pmd_phys = __pa(pmd);
+
+		early_make_page_readonly(pmd, XENFEAT_writable_page_tables);
+		spin_lock(&init_mm.page_table_lock);
+		set_pud(pud, __pud(pmd_phys | _KERNPG_TABLE));
+		late_phys_pmd_init(pmd, paddr, end);
+		spin_unlock(&init_mm.page_table_lock);
+	}
+} 
+
+/* Setup the direct mapping of the physical memory at PAGE_OFFSET.
+   This runs before bootmem is initialized and gets pages normally.
+*/
+static void late_init_memory_mapping(unsigned long start, unsigned long end)
+{ 
+	unsigned long next; 
+
+	Dprintk("init_memory_mapping\n");
+
+	start = (unsigned long)__va(start);
+	end = (unsigned long)__va(end);
+
+	for (; start < end; start = next) {
+		unsigned long pud_phys; 
+		pgd_t *pgd = pgd_offset_k(start);
+		pud_t *pud;
+
+		pud = pud_offset(pgd, start & PGDIR_MASK);
+		make_page_readonly(pud, XENFEAT_writable_page_tables);
+		pud_phys = __pa(pud);
+
+		next = start + PGDIR_SIZE;
+		if (next > end) 
+			next = end; 
+		late_phys_pud_init(pud, __pa(start), __pa(next));
+	}
+	__flush_tlb_all();
+}
+
 /*
  * Memory is added always to NORMAL zone. This means you will never get
  * additional DMA/DMA32 memory.
@@ -917,7 +979,7 @@ int arch_add_memory(int nid, u64 start, 
 	if (ret)
 		goto error;
 
-	init_memory_mapping(start, (start + size -1));
+	late_init_memory_mapping(start, (start + size -1));
 
 	return ret;
 error:
@@ -1048,17 +1110,6 @@ void __init mem_init(void)
 		reservedpages << (PAGE_SHIFT-10),
 		datasize >> 10,
 		initsize >> 10);
-
-#ifndef CONFIG_XEN
-#ifdef CONFIG_SMP
-	/*
-	 * Sync boot_level4_pgt mappings with the init_level4_pgt
-	 * except for the low identity mappings which are already zapped
-	 * in init_level4_pgt. This sync-up is essential for AP's bringup
-	 */
-	memcpy(boot_level4_pgt+1, init_level4_pgt+1, (PTRS_PER_PGD-1)*sizeof(pgd_t));
-#endif
-#endif
 }
 
 void free_init_pages(char *what, unsigned long begin, unsigned long end)
@@ -1071,11 +1122,11 @@ void free_init_pages(char *what, unsigne
 
 	printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
 	for (addr = begin; addr < end; addr += PAGE_SIZE) {
-		ClearPageReserved(virt_to_page(addr));
-		init_page_count(virt_to_page(addr));
-		memset((void *)(addr & ~(PAGE_SIZE-1)),
-			POISON_FREE_INITMEM, PAGE_SIZE);
-		free_page(addr);
+		struct page *page = pfn_to_page(addr >> PAGE_SHIFT);
+		ClearPageReserved(page);
+		init_page_count(page);
+		memset(page_address(page), POISON_FREE_INITMEM, PAGE_SIZE);
+		__free_page(page);
 		totalram_pages++;
 	}
 #endif
@@ -1087,8 +1138,8 @@ void free_initmem(void)
 	memset(__initdata_begin, POISON_FREE_INITDATA,
 	       __initdata_end - __initdata_begin);
 	free_init_pages("unused kernel memory",
-			(unsigned long)(&__init_begin),
-			(unsigned long)(&__init_end));
+			__pa_symbol(&__init_begin),
+			__pa_symbol(&__init_end));
 #endif
 }
 
@@ -1097,9 +1148,10 @@ void free_initmem(void)
 extern char __start_rodata, __end_rodata;
 void mark_rodata_ro(void)
 {
-	unsigned long addr = (unsigned long)__start_rodata;
+	unsigned long addr = (unsigned long)__va(__pa_symbol(&__start_rodata));
+	unsigned long end  = (unsigned long)__va(__pa_symbol(&__end_rodata));
 
-	for (; addr < (unsigned long)__end_rodata; addr += PAGE_SIZE)
+	for (; addr < end; addr += PAGE_SIZE)
 		change_page_attr_addr(addr, 1, PAGE_KERNEL_RO);
 
 	printk ("Write protecting the kernel read-only data: %luk\n",
@@ -1117,7 +1169,7 @@ void mark_rodata_ro(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-	free_init_pages("initrd memory", start, end);
+	free_init_pages("initrd memory", __pa(start), __pa(end));
 }
 #endif
 
diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/mm/pageattr-xen.c linux-2.6.17.work/arch/x86_64/mm/pageattr-xen.c
--- linux-2.6.17.reloc/arch/x86_64/mm/pageattr-xen.c	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/arch/x86_64/mm/pageattr-xen.c	2006-08-24 14:59:36.000000000 +0200
@@ -212,7 +212,6 @@ static struct page *split_large_page(uns
 	SetPagePrivate(base);
 	page_private(base) = 0;
 
-	address = __pa(address);
 	addr = address & LARGE_PAGE_MASK; 
 	pbase = (pte_t *)page_address(base);
 	for (i = 0; i < PTRS_PER_PTE; i++, addr += PAGE_SIZE) {
@@ -256,7 +255,7 @@ static inline void save_page(struct page
  * No more special protections in this 2/4MB area - revert to a
  * large page again. 
  */
-static void revert_page(unsigned long address, pgprot_t ref_prot)
+static void revert_page(unsigned long address, unsigned long pfn, pgprot_t ref_prot)
 {
 	pgd_t *pgd;
 	pud_t *pud;
@@ -270,7 +269,7 @@ static void revert_page(unsigned long ad
 	pmd = pmd_offset(pud, address);
 	BUG_ON(pmd_val(*pmd) & _PAGE_PSE);
 	pgprot_val(ref_prot) |= _PAGE_PSE;
-	large_pte = mk_pte_phys(__pa(address) & LARGE_PAGE_MASK, ref_prot);
+	large_pte = mk_pte_phys((pfn << PAGE_SHIFT) & LARGE_PAGE_MASK, ref_prot);
 	set_pte((pte_t *)pmd, large_pte);
 }      
 
@@ -298,7 +297,7 @@ __change_page_attr(unsigned long address
 			struct page *split;
 			ref_prot2 = __pgprot(pgprot_val(pte_pgprot(*lookup_address(address))) & ~(1<<_PAGE_BIT_PSE));
 
-			split = split_large_page(address, prot, ref_prot2);
+			split = split_large_page(pfn << PAGE_SHIFT, prot, ref_prot2);
 			if (!split)
 				return -ENOMEM;
 			set_pte(kpte,mk_pte(split, ref_prot2));
@@ -324,7 +323,7 @@ __change_page_attr(unsigned long address
 #endif
 	if (page_private(kpte_page) == 0) {
 		save_page(kpte_page);
-		revert_page(address, ref_prot);
+		revert_page(address, pfn, ref_prot);
 	}
 	return 0;
 } 
@@ -344,6 +343,7 @@ __change_page_attr(unsigned long address
  */
 int change_page_attr_addr(unsigned long address, int numpages, pgprot_t prot)
 {
+	unsigned long phys_base_pfn = __pa_symbol(__START_KERNEL_map) >> PAGE_SHIFT;
 	int err = 0; 
 	int i; 
 
@@ -356,14 +356,16 @@ int change_page_attr_addr(unsigned long 
 			break; 
 		/* Handle kernel mapping too which aliases part of the
 		 * lowmem */
-		if (__pa(address) < KERNEL_TEXT_SIZE) {
+		if ((pfn >= phys_base_pfn) &&
+			((pfn - phys_base_pfn) < (KERNEL_TEXT_SIZE >> PAGE_SHIFT)))
+		{
 			unsigned long addr2;
 			pgprot_t prot2 = prot;
-			addr2 = __START_KERNEL_map + __pa(address);
+			addr2 = __START_KERNEL_map + ((pfn - phys_base_pfn) << PAGE_SHIFT);
  			pgprot_val(prot2) &= ~_PAGE_NX;
 			err = __change_page_attr(addr2, pfn, prot2, PAGE_KERNEL_EXEC);
-		} 
-	} 	
+		}
+	}
 	up_write(&init_mm.mmap_sem); 
 	return err;
 }
diff --exclude='*~' -urNp linux-2.6.17.reloc/include/asm-i386/mach-xen/asm/page.h linux-2.6.17.work/include/asm-i386/mach-xen/asm/page.h
--- linux-2.6.17.reloc/include/asm-i386/mach-xen/asm/page.h	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/include/asm-i386/mach-xen/asm/page.h	2006-08-24 14:59:36.000000000 +0200
@@ -295,12 +295,9 @@ extern int page_is_ram(unsigned long pag
 
 #ifdef __ASSEMBLY__
 #define __PAGE_OFFSET		CONFIG_PAGE_OFFSET
-#define __PHYSICAL_START	CONFIG_PHYSICAL_START
 #else
 #define __PAGE_OFFSET		((unsigned long)CONFIG_PAGE_OFFSET)
-#define __PHYSICAL_START	((unsigned long)CONFIG_PHYSICAL_START)
 #endif
-#define __KERNEL_START		(__PAGE_OFFSET + __PHYSICAL_START)
 
 #ifdef CONFIG_XEN_COMPAT_030002
 #undef LOAD_OFFSET
@@ -311,6 +308,7 @@ extern int page_is_ram(unsigned long pag
 #define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)
 #define MAXMEM			(__FIXADDR_TOP-__PAGE_OFFSET-__VMALLOC_RESERVE)
 #define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
+#define __pa_symbol(x)		__pa(x)
 #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
 #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)
 #ifdef CONFIG_FLATMEM
diff --exclude='*~' -urNp linux-2.6.17.reloc/include/asm-x86_64/mach-xen/asm/page.h linux-2.6.17.work/include/asm-x86_64/mach-xen/asm/page.h
--- linux-2.6.17.reloc/include/asm-x86_64/mach-xen/asm/page.h	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/include/asm-x86_64/mach-xen/asm/page.h	2006-08-24 15:01:29.000000000 +0200
@@ -1,6 +1,8 @@
 #ifndef _X86_64_PAGE_H
 #define _X86_64_PAGE_H
 
+#include <asm/const.h>
+
 #include <linux/config.h>
 /* #include <linux/string.h> */
 #ifndef __ASSEMBLY__
@@ -28,11 +30,7 @@
 
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT	12
-#ifdef __ASSEMBLY__
-#define PAGE_SIZE	(0x1 << PAGE_SHIFT)
-#else
-#define PAGE_SIZE	(1UL << PAGE_SHIFT)
-#endif
+#define PAGE_SIZE	(_AC(1,UL) << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 #define PHYSICAL_PAGE_MASK	(~(PAGE_SIZE-1) & __PHYSICAL_MASK)
 
@@ -57,10 +55,10 @@
 #define N_EXCEPTION_STACKS 5  /* hw limit: 7 */
 
 #define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
-#define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)
+#define LARGE_PAGE_SIZE (_AC(1,UL) << PMD_SHIFT)
 
 #define HPAGE_SHIFT PMD_SHIFT
-#define HPAGE_SIZE	((1UL) << HPAGE_SHIFT)
+#define HPAGE_SIZE	(_AC(1,UL) << HPAGE_SHIFT)
 #define HPAGE_MASK	(~(HPAGE_SIZE - 1))
 #define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)
 
@@ -256,18 +254,11 @@ static inline pgd_t __pgd(unsigned long 
 
 #define __pgprot(x)	((pgprot_t) { (x) } )
 
-#define __PHYSICAL_START	((unsigned long)CONFIG_PHYSICAL_START)
-#define __START_KERNEL		(__START_KERNEL_map + __PHYSICAL_START)
-#define __START_KERNEL_map	0xffffffff80000000UL
-#define __PAGE_OFFSET           0xffff880000000000UL	
-
-#else
-#define __PHYSICAL_START	CONFIG_PHYSICAL_START
-#define __START_KERNEL		(__START_KERNEL_map + __PHYSICAL_START)
-#define __START_KERNEL_map	0xffffffff80000000
-#define __PAGE_OFFSET           0xffff880000000000
 #endif /* !__ASSEMBLY__ */
 
+#define __START_KERNEL_map	_AC(0xffffffff80000000,UL)
+#define __PAGE_OFFSET           _AC(0xffff880000000000,UL)
+
 #ifdef CONFIG_XEN_COMPAT_030002
 #undef LOAD_OFFSET
 #define LOAD_OFFSET		0
@@ -278,28 +269,28 @@ static inline pgd_t __pgd(unsigned long 
 
 /* See Documentation/x86_64/mm.txt for a description of the memory map. */
 #define __PHYSICAL_MASK_SHIFT	46
-#define __PHYSICAL_MASK		((1UL << __PHYSICAL_MASK_SHIFT) - 1)
+#define __PHYSICAL_MASK		((_AC(1,UL) << __PHYSICAL_MASK_SHIFT) - 1)
 #define __VIRTUAL_MASK_SHIFT	48
-#define __VIRTUAL_MASK		((1UL << __VIRTUAL_MASK_SHIFT) - 1)
+#define __VIRTUAL_MASK		((_AC(1,UL) << __VIRTUAL_MASK_SHIFT) - 1)
 
-#define KERNEL_TEXT_SIZE  (40UL*1024*1024)
-#define KERNEL_TEXT_START 0xffffffff80000000UL 
+#define KERNEL_TEXT_SIZE  (_AC(40,UL)*1024*1024)
+#define KERNEL_TEXT_START _AC(0xffffffff80000000,UL)
 
-#define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
+#define PAGE_OFFSET		__PAGE_OFFSET
 
 /* Note: __pa(&symbol_visible_to_c) should be always replaced with __pa_symbol.
    Otherwise you risk miscompilation. */ 
+/* Optimized __pa() didn't work on xen, because we also use it for kernel addresses */
+/* #define __pa(x)			((unsigned long)(x) - PAGE_OFFSET) */
 #define __pa(x)			(((unsigned long)(x)>=__START_KERNEL_map)?(unsigned long)(x) - (unsigned long)__START_KERNEL_map:(unsigned long)(x) - PAGE_OFFSET)
 /* __pa_symbol should be used for C visible symbols.
    This seems to be the official gcc blessed way to do such arithmetic. */ 
 #define __pa_symbol(x)		\
 	({unsigned long v;  \
 	  asm("" : "=r" (v) : "0" (x)); \
-	  __pa(v); })
+	  (v - __START_KERNEL_map); })
 
 #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
-#define __boot_va(x)		__va(x)
-#define __boot_pa(x)		__pa(x)
 #ifdef CONFIG_FLATMEM
 #define pfn_valid(pfn)		((pfn) < end_pfn)
 #endif
diff --exclude='*~' -urNp linux-2.6.17.reloc/include/asm-x86_64/mach-xen/asm/pgtable.h linux-2.6.17.work/include/asm-x86_64/mach-xen/asm/pgtable.h
--- linux-2.6.17.reloc/include/asm-x86_64/mach-xen/asm/pgtable.h	2006-08-24 14:49:29.000000000 +0200
+++ linux-2.6.17.work/include/asm-x86_64/mach-xen/asm/pgtable.h	2006-08-24 14:59:36.000000000 +0200
@@ -1,6 +1,9 @@
 #ifndef _X86_64_PGTABLE_H
 #define _X86_64_PGTABLE_H
 
+#include <asm/const.h>
+#ifndef __ASSEMBLY__
+
 /*
  * This file contains the functions and defines necessary to modify and use
  * the x86-64 page table tree.
@@ -35,14 +38,12 @@ extern void xen_init_pt(void);
 #endif
 
 extern pud_t level3_kernel_pgt[512];
-extern pud_t level3_physmem_pgt[512];
 extern pud_t level3_ident_pgt[512];
 extern pmd_t level2_kernel_pgt[512];
 extern pgd_t init_level4_pgt[];
-extern pgd_t boot_level4_pgt[];
 extern unsigned long __supported_pte_mask;
 
-#define swapper_pg_dir init_level4_pgt
+#define swapper_pg_dir ((pgd_t *)NULL)
 
 extern void nonx_setup(char *str);
 extern void paging_init(void);
@@ -55,7 +56,9 @@ extern unsigned long pgkern_mask;
  * for zero-mapped memory areas etc..
  */
 extern unsigned long empty_zero_page[PAGE_SIZE/sizeof(unsigned long)];
-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
+#define ZERO_PAGE(vaddr) (pfn_to_page(__pa_symbol(&empty_zero_page) >> PAGE_SHIFT))
+
+#endif /* !__ASSEMBLY__ */
 
 /*
  * PGDIR_SHIFT determines what a top-level page table entry can map
@@ -81,6 +84,8 @@ extern unsigned long empty_zero_page[PAG
  */
 #define PTRS_PER_PTE	512
 
+#ifndef __ASSEMBLY__
+
 #define pte_ERROR(e) \
 	printk("%s:%d: bad pte %p(%016lx).\n", __FILE__, __LINE__, &(e), pte_val(e))
 #define pmd_ERROR(e) \
@@ -162,22 +167,23 @@ static inline pte_t ptep_get_and_clear_f
 
 #define pte_pgprot(a)	(__pgprot((a).pte & ~PHYSICAL_PAGE_MASK))
 
-#define PMD_SIZE	(1UL << PMD_SHIFT)
+#endif /* !__ASSEMBLY__ */
+
+#define PMD_SIZE	(_AC(1,UL) << PMD_SHIFT)
 #define PMD_MASK	(~(PMD_SIZE-1))
-#define PUD_SIZE	(1UL << PUD_SHIFT)
+#define PUD_SIZE	(_AC(1,UL) << PUD_SHIFT)
 #define PUD_MASK	(~(PUD_SIZE-1))
-#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)
+#define PGDIR_SIZE	(_AC(1,UL) << PGDIR_SHIFT)
 #define PGDIR_MASK	(~(PGDIR_SIZE-1))
 
 #define USER_PTRS_PER_PGD	((TASK_SIZE-1)/PGDIR_SIZE+1)
 #define FIRST_USER_ADDRESS	0
 
-#ifndef __ASSEMBLY__
-#define MAXMEM		 0x3fffffffffffUL
-#define VMALLOC_START    0xffffc20000000000UL
-#define VMALLOC_END      0xffffe1ffffffffffUL
-#define MODULES_VADDR    0xffffffff88000000UL
-#define MODULES_END      0xfffffffffff00000UL
+#define MAXMEM		 _AC(0x3fffffffffff,UL)
+#define VMALLOC_START    _AC(0xffffc20000000000,UL)
+#define VMALLOC_END      _AC(0xffffe1ffffffffff,UL)
+#define MODULES_VADDR    _AC(0xffffffff88000000,UL)
+#define MODULES_END      _AC(0xfffffffffff00000,UL)
 #define MODULES_LEN   (MODULES_END - MODULES_VADDR)
 
 #define _PAGE_BIT_PRESENT	0
@@ -203,7 +209,7 @@ static inline pte_t ptep_get_and_clear_f
 #define _PAGE_GLOBAL	0x100	/* Global TLB entry */
 
 #define _PAGE_PROTNONE	0x080	/* If not present */
-#define _PAGE_NX        (1UL<<_PAGE_BIT_NX)
+#define _PAGE_NX        (_AC(1,UL)<<_PAGE_BIT_NX)
 
 #define _PAGE_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)
 #define _KERNPG_TABLE	_PAGE_TABLE
@@ -269,6 +275,8 @@ static inline pte_t ptep_get_and_clear_f
 #define __S110	PAGE_SHARED_EXEC
 #define __S111	PAGE_SHARED_EXEC
 
+#ifndef __ASSEMBLY__
+
 static inline unsigned long pgd_bad(pgd_t pgd)
 {
        unsigned long val = pgd_val(pgd);
@@ -502,8 +510,6 @@ extern spinlock_t pgd_lock;
 extern struct page *pgd_list;
 void vmalloc_sync_all(void);
 
-#endif /* !__ASSEMBLY__ */
-
 extern int kern_addr_valid(unsigned long addr); 
 
 #define DOMID_LOCAL (0xFFFFU)
@@ -556,5 +562,6 @@ int touch_pte_range(struct mm_struct *mm
 #define __HAVE_ARCH_PTEP_SET_WRPROTECT
 #define __HAVE_ARCH_PTE_SAME
 #include <asm-generic/pgtable.h>
+#endif /* !__ASSEMBLY__ */
 
 #endif /* _X86_64_PGTABLE_H */


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.9
retrieving revision 1.2519.4.10
diff -u -r1.2519.4.9 -r1.2519.4.10
--- kernel-2.6.spec	23 Aug 2006 15:06:44 -0000	1.2519.4.9
+++ kernel-2.6.spec	24 Aug 2006 15:28:29 -0000	1.2519.4.10
@@ -46,6 +46,10 @@
 # Don't build 586 kernels for RHEL builds.
 %if 0%{?rhel}
 %define all_x86 i686
+# we differ here b/c of the reloc patches
+%ifarch i686 x86_64
+%define buildkump 0
+%endif
 %else
 %define all_x86 i586 i686
 %endif
@@ -55,7 +59,7 @@
 %ifarch noarch
 %define builddoc 1
 %define buildup 0
-%define buildheaders 0
+%define buildheaders 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
@@ -259,6 +263,7 @@
 #Source68: kernel-%{kversion}-sparc64-smp.config
 
 Source80: config-rhel-generic
+Source81: config-rhel-x86-generic
 
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
@@ -280,6 +285,7 @@
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
 Patch209: linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch
+Patch210: linux-2.6-x86-relocatable.patch
 
 # 300 - 399   ppc(64)
 Patch304: linux-2.6-ppc-fix-irq-mapping.patch
@@ -288,6 +294,9 @@
 Patch314: linux-2.6-ppc-rtas-check.patch
 
 # 400 - 499   ia64
+Patch402: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
+Patch403: linux-2.6-ia64-kexec-kdump.patch
+
 
 # 500 - 599   s390(x)
 Patch500: linux-2.6-s390-kprobes.patch
@@ -324,7 +333,7 @@
 Patch954: linux-2.6-xen-execshield.patch
 Patch955: linux-2.6-xen-tux.patch
 Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
-
+Patch957: linux-2.6-xen-x86-relocatable.patch
 
 Patch990: linux-2.6-xen-compile-fixes.patch
 
@@ -440,6 +449,8 @@
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-sata-ata_device_add-oops.patch
 Patch2202: linux-2.6-sata-ahci-suspend.patch
+Patch2203: linux-2.6-sata-move-to-drivers-ata.patch
+Patch2204: linux-2.6-sata-big-update.patch
 
 # ACPI bits
 
@@ -673,6 +684,13 @@
     $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-generic $i.tmp > $i
     rm $i.tmp
   done
+  for i in $RPM_SOURCE_DIR/kernel-%{kversion}-{i586,i686,i686-PAE,x86_64}*.config
+  do
+    echo i is this file  $i
+    mv $i $i.tmp
+    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-x86-generic $i.tmp > $i
+    rm $i.tmp
+  done
 %endif
 
 # First we unpack the kernel tarball.
@@ -757,6 +775,10 @@
 %patch208 -p1
 # fix opteron timer scaling
 %patch209 -p1
+%if 0%{?rhel}
+#add in support for x86 and x86_64 relocatable kernels
+%patch210 -p1
+%endif
 
 #
 # PowerPC
@@ -831,6 +853,10 @@
 %patch954 -p1
 %patch955 -p1
 %patch956 -p1
+%if 0%{?rhel}
+#xen fix for x86 relocatable support
+%patch957 -p1
+%endif
 
 #%patch990 -p1
 
@@ -987,7 +1013,11 @@
 # Increase timeout on firmware loader.
 %patch2101 -p1
 # Change PHYSICAL_START
+%if 0%{?rhel}
+#%patch2102 -p1
+%else
 %patch2102 -p1
+%endif
 # Use unicode VT's by default.
 %patch2103 -p1
 # Disable split page table lock
@@ -999,6 +1029,10 @@
 %patch2201 -p1
 # Fix AHCI Suspend.
 %patch2202 -p1
+# move libata to drivers/ata
+%patch2203 -p1
+# big sata update to match upstream 2.6.19 queue
+%patch2204 -p1
 
 # ACPI patches
 
@@ -1022,6 +1056,11 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
+# ia64 kexec/kdump
+%patch402 -p1
+# ia64 xen cleanups for kexec/kdump
+%patch403 -p1
+
 # END OF PATCH APPLICATIONS
 
 cp %{SOURCE10} Documentation/
@@ -1031,6 +1070,11 @@
 cp -f %{all_arch_configs} .
 
 
+%if 0%{?rhel}
+# don't need these for relocatable kernels
+rm kernel-%{kversion}-{i686,x86_64}-kdump.config
+%endif
+
 # now run oldconfig over all the config files
 for i in *.config
 do
@@ -1276,8 +1320,12 @@
   install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
   cd ..
-  mkdir -p $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
-  mv xen $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}/
+  # need to let BuildKernel() create directory first.  The problem here is BuildKernel
+  # doesn't mkdir a new directory, but instead 'mv /lib/modules/<kern>/build to <new dir>
+  # if the <new dir> were to exist already, then the contents of 'build' are placed in a sub-dir
+  # named 'build' under <new dir>.  ugh.  So save xen directory temporarily instead
+  mkdir -p $RPM_BUILD_ROOT/usr/src/kernels
+  mv xen $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}-HV-temp
 %endif
 %endif
 
@@ -1298,6 +1346,8 @@
 %if %{includexen}
 %if %{buildxen}
 BuildKernel %xen_target %xen_image xen
+# Now the directory is properly created, copy xen over
+mv $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}-HV-temp $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}/xen
 %endif
 %endif
 
@@ -1728,6 +1778,16 @@
 %endif
 
 %changelog
+* Thu Aug 24 2006 Don Zickus <dzickus at redhat.com>
+- added #203781 SATA/SAS update (Jeff Garzik)
+- added #203435/203657 - GFS2 DLM updates (Steven Whitehouse)
+- added #202993 - Inconsistent directory structure (Juan Quintela)
+- added #181358 - kexec/kdump on ia64 (Zou nan hai)
+- added #200010 - x86/x86_64 relocatable patch (Eric Biederman, Vivek Goyal,
+				Larry Woodman, Juan Quintela)
+- added #203614 - build kernel headers for glibc (David Woodhouse)
+- added #203056/#203387 - utrace refresh (Roland McGrath)
+				
 * Wed Aug 23 2006 Don Zickus <dzickus at redhat.com>
 - modsigning was fixed, but I never enabled applying the patches
   too many late nights

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   21 
 fs/dlm/Makefile                    |   19 
 fs/dlm/ast.c                       |  173 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 +++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  387 +++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  543 +++++
 fs/dlm/lock.c                      | 3869 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   62 
 fs/dlm/lockspace.c                 |  716 ++++++
 fs/dlm/lockspace.h                 |   25 
 fs/dlm/lowcomms.c                  | 1238 +++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   97 
 fs/dlm/member.c                    |  327 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  116 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  472 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  765 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  286 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/user.c                      |  785 +++++++
 fs/dlm/user.h                      |   16 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 ++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1236 +++++++++++
 fs/gfs2/bmap.h                     |   27 
 fs/gfs2/daemon.c                   |  196 +
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1976 ++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++
 fs/gfs2/eattr.h                    |   97 
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2282 +++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  564 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  659 ++++++
 fs/gfs2/inode.c                    | 1344 ++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  290 ++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  302 ++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 +++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 +++++++
 fs/gfs2/lops.h                     |   96 
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  779 +++++++
 fs/gfs2/meta_io.h                  |   74 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  308 ++
 fs/gfs2/ops_address.c              |  795 +++++++
 fs/gfs2/ops_address.h              |   18 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  293 ++
 fs/gfs2/ops_export.h               |   19 
 fs/gfs2/ops_file.c                 |  812 +++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  840 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1165 +++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  469 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  188 +
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/quota.c                    | 1286 ++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  573 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1525 ++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  979 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 +++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/Kbuild               |   33 
 include/linux/dlm.h                |  302 ++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  443 ++++
 include/linux/iflags.h             |  102 
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   41 
 mm/filemap.c                       |    3 
 mm/readahead.c                     |    1 
 131 files changed, 40693 insertions(+), 21 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.12.4.3
retrieving revision 1.12.4.4
diff -u -r1.12.4.3 -r1.12.4.4
--- linux-2.6-gfs2-dlm.patch	17 Aug 2006 22:59:24 -0000	1.12.4.3
+++ linux-2.6-gfs2-dlm.patch	24 Aug 2006 15:28:29 -0000	1.12.4.4
@@ -106,7 +106,7 @@
 index 3f00a9f..ddc7462 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -323,6 +323,7 @@ config FS_POSIX_ACL
+@@ -323,6 +323,7 @@ #
  	default n
  
  source "fs/xfs/Kconfig"
@@ -203,10 +203,10 @@
 +
 diff --git a/fs/dlm/ast.c b/fs/dlm/ast.c
 new file mode 100644
-index 0000000..a211330
+index 0000000..f91d39c
 --- /dev/null
 +++ b/fs/dlm/ast.c
-@@ -0,0 +1,172 @@
+@@ -0,0 +1,173 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -247,6 +247,7 @@
 +		dlm_user_add_ast(lkb, type);
 +		return;
 +	}
++	DLM_ASSERT(lkb->lkb_astaddr != DLM_FAKE_USER_AST, dlm_print_lkb(lkb););
 +
 +	spin_lock(&ast_queue_lock);
 +	if (!(lkb->lkb_ast_type & (AST_COMP | AST_BAST))) {
@@ -2114,10 +2115,10 @@
 +
 diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
 new file mode 100644
-index 0000000..da75099
+index 0000000..1e5cd67
 --- /dev/null
 +++ b/fs/dlm/dlm_internal.h
-@@ -0,0 +1,541 @@
+@@ -0,0 +1,543 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -2211,6 +2212,8 @@
 +  } \
 +}
 +
++#define DLM_FAKE_USER_AST ERR_PTR(-EINVAL)
++
 +
 +struct dlm_direntry {
 +	struct list_head	list;
@@ -2661,10 +2664,10 @@
 +
 diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
 new file mode 100644
-index 0000000..bb2e351
+index 0000000..67247f0
 --- /dev/null
 +++ b/fs/dlm/lock.c
-@@ -0,0 +1,3846 @@
+@@ -0,0 +1,3869 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -2753,8 +2756,6 @@
 +				    struct dlm_message *ms);
 +static int receive_extralen(struct dlm_message *ms);
 +
-+#define FAKE_USER_AST (void*)0xff00ff00
-+
 +/*
 + * Lock compatibilty matrix - thanks Steve
 + * UN = Unlocked state. Not really a state, used as a flag
@@ -2838,6 +2839,28 @@
 +	       r->res_recover_locks_count, r->res_name);
 +}
 +
++void dlm_dump_rsb(struct dlm_rsb *r)
++{
++	struct dlm_lkb *lkb;
++
++	dlm_print_rsb(r);
++
++	printk(KERN_ERR "rsb: root_list empty %d recover_list empty %d\n",
++	       list_empty(&r->res_root_list), list_empty(&r->res_recover_list));
++	printk(KERN_ERR "rsb lookup list\n");
++	list_for_each_entry(lkb, &r->res_lookup, lkb_rsb_lookup)
++		dlm_print_lkb(lkb);
++	printk(KERN_ERR "rsb grant queue:\n");
++	list_for_each_entry(lkb, &r->res_grantqueue, lkb_statequeue)
++		dlm_print_lkb(lkb);
++	printk(KERN_ERR "rsb convert queue:\n");
++	list_for_each_entry(lkb, &r->res_convertqueue, lkb_statequeue)
++		dlm_print_lkb(lkb);
++	printk(KERN_ERR "rsb wait queue:\n");
++	list_for_each_entry(lkb, &r->res_waitqueue, lkb_statequeue)
++		dlm_print_lkb(lkb);
++}
++
 +/* Threads cannot use the lockspace while it's being recovered */
 +
 +static inline void lock_recovery(struct dlm_ls *ls)
@@ -3145,7 +3168,7 @@
 +{
 +	int rv;
 +	rv = kref_put(&r->res_ref, toss_rsb);
-+	DLM_ASSERT(!rv, dlm_print_rsb(r););
++	DLM_ASSERT(!rv, dlm_dump_rsb(r););
 +}
 +
 +static void kill_rsb(struct kref *kref)
@@ -3155,12 +3178,12 @@
 +	/* All work is done after the return from kref_put() so we
 +	   can release the write_lock before the remove and free. */
 +
-+	DLM_ASSERT(list_empty(&r->res_lookup),);
-+	DLM_ASSERT(list_empty(&r->res_grantqueue),);
-+	DLM_ASSERT(list_empty(&r->res_convertqueue),);
-+	DLM_ASSERT(list_empty(&r->res_waitqueue),);
-+	DLM_ASSERT(list_empty(&r->res_root_list),);
-+	DLM_ASSERT(list_empty(&r->res_recover_list),);
++	DLM_ASSERT(list_empty(&r->res_lookup), dlm_dump_rsb(r););
++	DLM_ASSERT(list_empty(&r->res_grantqueue), dlm_dump_rsb(r););
++	DLM_ASSERT(list_empty(&r->res_convertqueue), dlm_dump_rsb(r););
++	DLM_ASSERT(list_empty(&r->res_waitqueue), dlm_dump_rsb(r););
++	DLM_ASSERT(list_empty(&r->res_root_list), dlm_dump_rsb(r););
++	DLM_ASSERT(list_empty(&r->res_recover_list), dlm_dump_rsb(r););
 +}
 +
 +/* Attaching/detaching lkb's from rsb's is for rsb reference counting.
@@ -4003,7 +4026,7 @@
 +	struct dlm_lkb *lkb, *s;
 +	int high = DLM_LOCK_IV;
 +
-+	DLM_ASSERT(is_master(r), dlm_print_rsb(r););
++	DLM_ASSERT(is_master(r), dlm_dump_rsb(r););
 +
 +	high = grant_pending_convert(r, high);
 +	high = grant_pending_wait(r, high);
@@ -4098,7 +4121,7 @@
 +		return 0;
 +	}
 +
-+	DLM_ASSERT(r->res_nodeid == -1, dlm_print_rsb(r););
++	DLM_ASSERT(r->res_nodeid == -1, dlm_dump_rsb(r););
 +
 +	dir_nodeid = dlm_dir_nodeid(r);
 +
@@ -4840,6 +4863,7 @@
 +	if (!error && down_conversion(lkb)) {
 +		remove_from_waiters(lkb);
 +		r->res_ls->ls_stub_ms.m_result = 0;
++		r->res_ls->ls_stub_ms.m_flags = lkb->lkb_flags;
 +		__receive_convert_reply(r, lkb, &r->res_ls->ls_stub_ms);
 +	}
 +
@@ -6260,7 +6284,7 @@
 +	   lock and that lkb_astparam is the dlm_user_args structure. */
 +
 +	error = set_lock_args(mode, &ua->lksb, flags, namelen, parent_lkid,
-+			      FAKE_USER_AST, ua, FAKE_USER_AST, &args);
++			      DLM_FAKE_USER_AST, ua, DLM_FAKE_USER_AST, &args);
 +	lkb->lkb_flags |= DLM_IFL_USER;
 +	ua->old_mode = DLM_LOCK_IV;
 +
@@ -6328,10 +6352,11 @@
 +	ua->castaddr = ua_tmp->castaddr;
 +	ua->bastparam = ua_tmp->bastparam;
 +	ua->bastaddr = ua_tmp->bastaddr;
++	ua->user_lksb = ua_tmp->user_lksb;
 +	ua->old_mode = lkb->lkb_grmode;
 +
-+	error = set_lock_args(mode, &ua->lksb, flags, 0, 0, FAKE_USER_AST, ua,
-+			      FAKE_USER_AST, &args);
++	error = set_lock_args(mode, &ua->lksb, flags, 0, 0, DLM_FAKE_USER_AST,
++			      ua, DLM_FAKE_USER_AST, &args);
 +	if (error)
 +		goto out_put;
 +
@@ -6409,6 +6434,7 @@
 +
 +	ua = (struct dlm_user_args *)lkb->lkb_astparam;
 +	ua->castparam = ua_tmp->castparam;
++	ua->user_lksb = ua_tmp->user_lksb;
 +
 +	error = set_unlock_args(flags, ua, &args);
 +	if (error)
@@ -6513,10 +6539,10 @@
 +}
 diff --git a/fs/dlm/lock.h b/fs/dlm/lock.h
 new file mode 100644
-index 0000000..8d2660f
+index 0000000..0843a30
 --- /dev/null
 +++ b/fs/dlm/lock.h
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,62 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -6533,6 +6559,7 @@
 +#define __LOCK_DOT_H__
 +
 +void dlm_print_rsb(struct dlm_rsb *r);
++void dlm_dump_rsb(struct dlm_rsb *r);
 +void dlm_print_lkb(struct dlm_lkb *lkb);
 +int dlm_receive_message(struct dlm_header *hd, int nodeid, int recovery);
 +int dlm_modes_compat(int mode1, int mode2);
@@ -9429,10 +9456,10 @@
 +
 diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
 new file mode 100644
-index 0000000..64ba492
+index 0000000..518239a
 --- /dev/null
 +++ b/fs/dlm/rcom.c
-@@ -0,0 +1,471 @@
+@@ -0,0 +1,472 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -9823,6 +9850,7 @@
 +	rc->rc_header.h_cmd = DLM_RCOM;
 +
 +	rc->rc_type = DLM_RCOM_STATUS_REPLY;
++	rc->rc_id = rc_in->rc_id;
 +	rc->rc_result = -ESRCH;
 +
 +	dlm_rcom_out(rc);
@@ -9936,10 +9964,10 @@
 +
 diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c
 new file mode 100644
-index 0000000..1a86dfc
+index 0000000..a5e6d18
 --- /dev/null
 +++ b/fs/dlm/recover.c
-@@ -0,0 +1,776 @@
+@@ -0,0 +1,765 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -10415,24 +10443,13 @@
 +	return error;
 +}
 +
-+static int all_queues_empty(struct dlm_rsb *r)
-+{
-+	if (!list_empty(&r->res_grantqueue) ||
-+	    !list_empty(&r->res_convertqueue) ||
-+	    !list_empty(&r->res_waitqueue))
-+		return 0;
-+	return 1;
-+}
-+
 +static int recover_locks(struct dlm_rsb *r)
 +{
 +	int error = 0;
 +
 +	lock_rsb(r);
-+	if (all_queues_empty(r))
-+		goto out;
 +
-+	DLM_ASSERT(!r->res_recover_locks_count, dlm_print_rsb(r););
++	DLM_ASSERT(!r->res_recover_locks_count, dlm_dump_rsb(r););
 +
 +	error = recover_locks_queue(r, &r->res_grantqueue);
 +	if (error)
@@ -10499,7 +10516,7 @@
 +
 +void dlm_recovered_lock(struct dlm_rsb *r)
 +{
-+	DLM_ASSERT(rsb_flag(r, RSB_NEW_MASTER), dlm_print_rsb(r););
++	DLM_ASSERT(rsb_flag(r, RSB_NEW_MASTER), dlm_dump_rsb(r););
 +
 +	r->res_recover_locks_count--;
 +	if (!r->res_recover_locks_count) {
@@ -27135,7 +27152,7 @@
 +#endif /* __LOG_DOT_H__ */
 diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
 new file mode 100644
-index 0000000..af03bf3
+index 0000000..08de8b7
 --- /dev/null
 +++ b/fs/gfs2/lops.c
 @@ -0,0 +1,800 @@
@@ -27605,7 +27622,7 @@
 +	struct gfs2_inode *ip = GFS2_I(mapping->host);
 +
 +	tr->tr_touched = 1;
-+	if (!list_empty(&bd->bd_list_tr) &&
++	if (list_empty(&bd->bd_list_tr) &&
 +	    (ip->i_di.di_flags & GFS2_DIF_JDATA)) {
 +		tr->tr_num_buf++;
 +		list_add(&bd->bd_list_tr, &tr->tr_list_buf);
@@ -27614,7 +27631,7 @@
 +	}
 +	gfs2_trans_add_gl(bd->bd_gl);
 +	gfs2_log_lock(sdp);
-+	if (!list_empty(&le->le_list)) {
++	if (list_empty(&le->le_list)) {
 +		if (ip->i_di.di_flags & GFS2_DIF_JDATA)
 +			sdp->sd_log_num_jdata++;
 +		sdp->sd_log_num_databuf++;
@@ -27779,12 +27796,12 @@
 +		gfs2_log_lock(sdp);
 +		bd1 = list_entry(started.next, struct gfs2_bufdata,
 +				 bd_le.le_list);
-+		list_del(&bd1->bd_le.le_list);
++		list_del_init(&bd1->bd_le.le_list);
 +		sdp->sd_log_num_databuf--;
-+
 +		bh = bd1->bd_bh;
 +		if (bh) {
 +			bh->b_private = NULL;
++			get_bh(bh);
 +			gfs2_log_unlock(sdp);
 +			wait_on_buffer(bh);
 +			brelse(bh);
@@ -27878,7 +27895,7 @@
 +
 +	while (!list_empty(head)) {
 +		bd = list_entry(head->next, struct gfs2_bufdata, bd_le.le_list);
-+		list_del(&bd->bd_le.le_list);
++		list_del_init(&bd->bd_le.le_list);
 +		sdp->sd_log_num_databuf--;
 +		sdp->sd_log_num_jdata--;
 +		gfs2_unpin(sdp, bd->bd_bh, ai);
@@ -28252,10 +28269,10 @@
 +
 diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
 new file mode 100644
-index 0000000..42dfd32
+index 0000000..502864b
 --- /dev/null
 +++ b/fs/gfs2/meta_io.c
-@@ -0,0 +1,780 @@
+@@ -0,0 +1,779 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -28722,7 +28739,6 @@
 +		lops_init_le(&bd->bd_le, &gfs2_buf_lops);
 +	} else {
 +		lops_init_le(&bd->bd_le, &gfs2_databuf_lops);
-+		get_bh(bh);
 +	}
 +	bh->b_private = bd;
 +
@@ -29673,10 +29689,10 @@
 +
 diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
 new file mode 100644
-index 0000000..45afd05
+index 0000000..4c59cb1
 --- /dev/null
 +++ b/fs/gfs2/ops_address.c
-@@ -0,0 +1,797 @@
+@@ -0,0 +1,795 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -30260,10 +30276,8 @@
 +	if (bd) {
 +		bd->bd_bh = NULL;
 +		bh->b_private = NULL;
-+		gfs2_log_unlock(sdp);
-+		brelse(bh);
-+	} else
-+		gfs2_log_unlock(sdp);
++	}
++	gfs2_log_unlock(sdp);
 +
 +	lock_buffer(bh);
 +	clear_buffer_dirty(bh);
@@ -30277,7 +30291,7 @@
 +
 +static void gfs2_invalidatepage(struct page *page, unsigned long offset)
 +{
-+	struct gfs2_sbd *sdp = page->mapping->host->i_sb->s_fs_info;
++	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
 +	struct buffer_head *head, *bh, *next;
 +	unsigned int curr_off = 0;
 +
@@ -33881,10 +33895,10 @@
 +#endif /* __OPS_INODE_DOT_H__ */
 diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
 new file mode 100644
-index 0000000..730c722
+index 0000000..2e392c9
 --- /dev/null
 +++ b/fs/gfs2/ops_super.c
-@@ -0,0 +1,471 @@
+@@ -0,0 +1,469 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -34103,8 +34117,6 @@
 +	if (error)
 +		return error;
 +
-+	memset(buf, 0, sizeof(struct kstatfs));
-+
 +	buf->f_type = GFS2_MAGIC;
 +	buf->f_bsize = sdp->sd_sb.sb_bsize;
 +	buf->f_blocks = sc.sc_total;
@@ -36542,10 +36554,10 @@
 +
 diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
 new file mode 100644
-index 0000000..4e0357d
+index 0000000..84fcc1b
 --- /dev/null
 +++ b/fs/gfs2/rgrp.c
-@@ -0,0 +1,1528 @@
+@@ -0,0 +1,1525 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -37405,8 +37417,7 @@
 +		if (sdp->sd_rgrps >= journals)
 +			rg = sdp->sd_rgrps * sdp->sd_jdesc->jd_jid / journals;
 +
-+		for (x = 0, rgd = gfs2_rgrpd_get_first(sdp);
-+		     x < rg;
++		for (x = 0, rgd = gfs2_rgrpd_get_first(sdp); x < rg;
 +		     x++, rgd = gfs2_rgrpd_get_next(rgd))
 +			/* Do Nothing */;
 +
@@ -37457,9 +37468,8 @@
 +	rgd = recent_rgrp_first(sdp, ip->i_last_rg_alloc);
 +
 +	while (rgd) {
-+		error = gfs2_glock_nq_init(rgd->rd_gl,
-+					  LM_ST_EXCLUSIVE, LM_FLAG_TRY,
-+					  &al->al_rgd_gh);
++		error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 
++					   LM_FLAG_TRY, &al->al_rgd_gh);
 +		switch (error) {
 +		case 0:
 +			if (try_rgrp_fit(rgd, al))
@@ -37482,8 +37492,7 @@
 +	begin = rgd = forward_rgrp_get(sdp);
 +
 +	for (;;) {
-+		error = gfs2_glock_nq_init(rgd->rd_gl,
-+					  LM_ST_EXCLUSIVE, flags,
++		error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, flags,
 +					  &al->al_rgd_gh);
 +		switch (error) {
 +		case 0:
@@ -41489,7 +41498,7 @@
 index 181c69c..06c2768 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -32,6 +32,7 @@ extern const char linux_banner[];
+@@ -32,6 +32,7 @@ #define STACK_MAGIC	0xdeadbeef
  
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))

linux-2.6-utrace.patch:
 b/Documentation/utrace.txt                        |    7 
 b/include/linux/tracehook.h                       |   16 
 b/include/linux/utrace.h                          |    7 
 b/kernel/exit.c                                   |    5 
 b/kernel/ptrace.c                                 |   40 
 b/kernel/utrace.c                                 |  120 +
 linux-2.6/Documentation/utrace.txt                |  454 +++++
 linux-2.6/arch/alpha/kernel/asm-offsets.c         |    2 
 linux-2.6/arch/alpha/kernel/entry.S               |    4 
 linux-2.6/arch/arm/kernel/ptrace.c                |   36 
 linux-2.6/arch/arm26/kernel/ptrace.c              |   32 
 linux-2.6/arch/frv/kernel/ptrace.c                |   15 
 linux-2.6/arch/i386/kernel/entry.S                |    7 
 linux-2.6/arch/i386/kernel/i387.c                 |  143 -
 linux-2.6/arch/i386/kernel/process.c              |    3 
 linux-2.6/arch/i386/kernel/ptrace.c               |  863 ++++++-----
 linux-2.6/arch/i386/kernel/signal.c               |   39 
 linux-2.6/arch/i386/kernel/vm86.c                 |    7 
 linux-2.6/arch/ia64/ia32/ia32_entry.S             |    2 
 linux-2.6/arch/ia64/ia32/sys_ia32.c               |   23 
 linux-2.6/arch/ia64/kernel/asm-offsets.c          |    2 
 linux-2.6/arch/ia64/kernel/fsys.S                 |   16 
 linux-2.6/arch/ia64/kernel/mca.c                  |    2 
 linux-2.6/arch/ia64/kernel/ptrace.c               | 1671 ++++++++++------------
 linux-2.6/arch/ia64/kernel/signal.c               |    4 
 linux-2.6/arch/mips/kernel/ptrace.c               |   21 
 linux-2.6/arch/mips/kernel/sysirix.c              |    2 
 linux-2.6/arch/powerpc/kernel/Makefile            |    4 
 linux-2.6/arch/powerpc/kernel/asm-offsets.c       |    2 
 linux-2.6/arch/powerpc/kernel/process.c           |    5 
 linux-2.6/arch/powerpc/kernel/ptrace-common.h     |  161 --
 linux-2.6/arch/powerpc/kernel/ptrace.c            |  959 +++++++-----
 linux-2.6/arch/powerpc/kernel/ptrace32.c          |  436 -----
 linux-2.6/arch/powerpc/kernel/signal_32.c         |   56 
 linux-2.6/arch/powerpc/kernel/signal_64.c         |    4 
 linux-2.6/arch/powerpc/kernel/sys_ppc32.c         |    5 
 linux-2.6/arch/powerpc/lib/sstep.c                |    3 
 linux-2.6/arch/powerpc/platforms/cell/spufs/run.c |    2 
 linux-2.6/arch/ppc/kernel/asm-offsets.c           |    2 
 linux-2.6/arch/s390/kernel/compat_linux.c         |    3 
 linux-2.6/arch/s390/kernel/compat_signal.c        |    5 
 linux-2.6/arch/s390/kernel/process.c              |    3 
 linux-2.6/arch/s390/kernel/ptrace.c               |  639 +++++++-
 linux-2.6/arch/s390/kernel/signal.c               |    4 
 linux-2.6/arch/s390/kernel/traps.c                |    6 
 linux-2.6/arch/sparc64/kernel/entry.S             |    6 
 linux-2.6/arch/sparc64/kernel/process.c           |    3 
 linux-2.6/arch/sparc64/kernel/ptrace.c            | 1222 ++++++++--------
 linux-2.6/arch/sparc64/kernel/signal.c            |    2 
 linux-2.6/arch/sparc64/kernel/signal32.c          |    2 
 linux-2.6/arch/sparc64/kernel/sys_sparc32.c       |    3 
 linux-2.6/arch/sparc64/kernel/systbls.S           |    4 
 linux-2.6/arch/x86_64/ia32/fpu32.c                |   92 -
 linux-2.6/arch/x86_64/ia32/ia32_aout.c            |    6 
 linux-2.6/arch/x86_64/ia32/ia32_signal.c          |    8 
 linux-2.6/arch/x86_64/ia32/ia32entry.S            |    2 
 linux-2.6/arch/x86_64/ia32/ptrace32.c             |  715 ++++++---
 linux-2.6/arch/x86_64/ia32/sys_ia32.c             |    5 
 linux-2.6/arch/x86_64/kernel/process.c            |    5 
 linux-2.6/arch/x86_64/kernel/ptrace.c             |  648 +++++---
 linux-2.6/arch/x86_64/kernel/signal.c             |   30 
 linux-2.6/arch/x86_64/kernel/traps.c              |    8 
 linux-2.6/arch/x86_64/mm/fault.c                  |    4 
 linux-2.6/drivers/connector/cn_proc.c             |    4 
 linux-2.6/fs/binfmt_aout.c                        |    6 
 linux-2.6/fs/binfmt_elf.c                         |    6 
 linux-2.6/fs/binfmt_elf_fdpic.c                   |    7 
 linux-2.6/fs/binfmt_flat.c                        |    3 
 linux-2.6/fs/binfmt_som.c                         |    2 
 linux-2.6/fs/exec.c                               |   11 
 linux-2.6/fs/proc/array.c                         |   14 
 linux-2.6/fs/proc/base.c                          |   17 
 linux-2.6/include/asm-i386/i387.h                 |   13 
 linux-2.6/include/asm-i386/signal.h               |    4 
 linux-2.6/include/asm-i386/thread_info.h          |    7 
 linux-2.6/include/asm-i386/tracehook.h            |   49 
 linux-2.6/include/asm-ia64/elf.h                  |   24 
 linux-2.6/include/asm-ia64/tracehook.h            |   81 +
 linux-2.6/include/asm-powerpc/tracehook.h         |   80 +
 linux-2.6/include/asm-s390/tracehook.h            |   53 
 linux-2.6/include/asm-sparc64/tracehook.h         |   44 
 linux-2.6/include/asm-x86_64/fpu32.h              |    3 
 linux-2.6/include/asm-x86_64/thread_info.h        |    2 
 linux-2.6/include/asm-x86_64/tracehook.h          |   54 
 linux-2.6/include/linux/init_task.h               |    3 
 linux-2.6/include/linux/ptrace.h                  |  224 ++
 linux-2.6/include/linux/sched.h                   |   25 
 linux-2.6/include/linux/tracehook.h               |  699 +++++++++
 linux-2.6/include/linux/utrace.h                  |  481 ++++++
 linux-2.6/init/Kconfig                            |   29 
 linux-2.6/kernel/Makefile                         |    1 
 linux-2.6/kernel/exit.c                           |  253 ---
 linux-2.6/kernel/fork.c                           |   64 
 linux-2.6/kernel/ptrace.c                         | 1560 ++++++++++++++++----
 linux-2.6/kernel/signal.c                         |  211 --
 linux-2.6/kernel/sys.c                            |    2 
 linux-2.6/kernel/timer.c                          |    6 
 linux-2.6/kernel/utrace.c                         | 1526 ++++++++++++++++++++
 linux-2.6/security/selinux/hooks.c                |   54 
 linux-2.6/security/selinux/include/objsec.h       |    1 
 100 files changed, 9622 insertions(+), 4608 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.12.4.3
retrieving revision 1.12.4.4
diff -u -r1.12.4.3 -r1.12.4.4
--- linux-2.6-utrace.patch	23 Aug 2006 00:09:53 -0000	1.12.4.3
+++ linux-2.6-utrace.patch	24 Aug 2006 15:28:29 -0000	1.12.4.4
@@ -16807,3 +16807,409 @@
 -	}
 +	tracehook_report_syscall(regs, leaving);
  }
+I found and fixed some underlying problems showing up when running the
+frysk test suite, which accounted for some crash failure modes.
+This is probably an improvement, but there are still some problems.
+Below is the patch in addition to the rawhide code.
+This is all I can do tonight.
+
+
+diff --git a/Documentation/utrace.txt b/Documentation/utrace.txt
+index 7eb2495..0000000 100644  
+--- a/Documentation/utrace.txt
++++ b/Documentation/utrace.txt
+@@ -370,9 +370,10 @@ Callback:
+ 			    struct task_struct *tsk);
+ 
+ The thread is really dead now.  If the UTRACE_ACTION_NOREAP flag is set
+-after this callback, it remains an unreported zombie.  Otherwise, it
+-might be reaped by its parent, or self-reap immediately.
+-
++after this callback, it remains an unreported zombie.  Otherwise, it might
++be reaped by its parent, or self-reap immediately.  Though the actual
++reaping may happen in parallel, a report_reap callback will always be
++ordered after a report_death callback.
+ 
+ UTRACE_EVENT(SYSCALL_ENTRY)	Thread has entered kernel for a system call
+ Callback:
+diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
+index dd84527..0000000 100644  
+--- a/include/linux/tracehook.h
++++ b/include/linux/tracehook.h
+@@ -366,10 +366,14 @@ static inline int tracehook_notify_cldst
+  * thread's death (i.e. when it is not ignored and its thread group is
+  * empty).  This call must set *noreap to 0, or to 1 to force this thread
+  * to become a zombie when it would normally reap itself.
++ * The *death_cookie is passed to tracehook_report_death (below).
+  */
+-static inline int tracehook_notify_death(struct task_struct *tsk, int *noreap)
++static inline int tracehook_notify_death(struct task_struct *tsk,
++					 int *noreap, void **death_cookie)
+ {
++	*death_cookie = NULL;
+ #ifdef CONFIG_UTRACE
++	*death_cookie = tsk->utrace;
+ 	if (tsk->utrace_flags & UTRACE_ACTION_NOREAP) {
+ 		*noreap = 1;
+ 		return 1;
+@@ -570,14 +574,18 @@ static inline int tracehook_allow_access
+  ***/
+ 
+ /*
+- * Thread has just become a zombie or is about to self-reap (tsk->exit_state).
++ * Thread has just become a zombie (exit_state==TASK_ZOMBIE) or is about to
++ * self-reap (exit_state==EXIT_DEAD).  If normal reaping is not inhibited,
++ * tsk->exit_state might be changing in parallel.  The death_cookie was
++ * passed back by tracehook_notify_death (above).
+  */
+-static inline void tracehook_report_death(struct task_struct *tsk)
++static inline void tracehook_report_death(struct task_struct *tsk,
++					  int exit_state, void *death_cookie)
+ {
+ #ifdef CONFIG_UTRACE
+ 	smp_mb();
+ 	if (tsk->utrace_flags & (UTRACE_EVENT(DEATH) | UTRACE_ACTION_QUIESCE))
+-		utrace_report_death(tsk);
++		utrace_report_death(tsk, death_cookie);
+ #endif
+ }
+ 
+diff --git a/include/linux/utrace.h b/include/linux/utrace.h
+index bb9d22b..0000000 100644  
+--- a/include/linux/utrace.h
++++ b/include/linux/utrace.h
+@@ -191,6 +191,7 @@ struct utrace
+ 		} live;
+ 		struct {
+ 			int notified;
++			int reap;
+ 		} exit;
+ 	} u;
+ 
+@@ -330,7 +331,9 @@ struct utrace_engine_ops
+ 	/*
+ 	 * Thread is really dead now.  If UTRACE_ACTION_NOREAP is in force,
+ 	 * it remains an unreported zombie.  Otherwise, it might be reaped
+-	 * by its parent, or self-reap immediately.
++	 * by its parent, or self-reap immediately.  Though the actual
++	 * reaping may happen in parallel, a report_reap callback will
++	 * always be ordered after a report_death callback.
+ 	 */
+ 	u32 (*report_death)(struct utrace_attached_engine *engine,
+ 			    struct task_struct *tsk);
+@@ -468,7 +471,7 @@ int utrace_get_signal(struct task_struct
+ void utrace_report_clone(unsigned long clone_flags, struct task_struct *child);
+ void utrace_report_vfork_done(pid_t child_pid);
+ void utrace_report_exit(long *exit_code);
+-void utrace_report_death(struct task_struct *);
++void utrace_report_death(struct task_struct *, struct utrace *);
+ int utrace_report_jctl(int type);
+ void utrace_report_exec(struct linux_binprm *bprm, struct pt_regs *regs);
+ void utrace_report_syscall(struct pt_regs *regs, int is_exit);
+diff --git a/kernel/exit.c b/kernel/exit.c
+index c349ee9..0000000 100644  
+--- a/kernel/exit.c
++++ b/kernel/exit.c
+@@ -658,6 +658,7 @@ static void exit_notify(struct task_stru
+ 	int state;
+ 	struct task_struct *t;
+ 	int noreap;
++	void *cookie;
+ 
+ 	if (signal_pending(tsk) && !(tsk->signal->flags & SIGNAL_GROUP_EXIT)
+ 	    && !thread_group_empty(tsk)) {
+@@ -738,7 +739,7 @@ static void exit_notify(struct task_stru
+ 	    && !capable(CAP_KILL))
+ 		tsk->exit_signal = SIGCHLD;
+ 
+-	if (!tracehook_notify_death(tsk, &noreap)
++	if (!tracehook_notify_death(tsk, &noreap, &cookie)
+ 	    && tsk->exit_signal != -1 && thread_group_empty(tsk))
+ 		do_notify_parent(tsk, tsk->exit_signal);
+ 
+@@ -749,7 +750,7 @@ static void exit_notify(struct task_stru
+ 
+ 	write_unlock_irq(&tasklist_lock);
+ 
+-	tracehook_report_death(tsk);
++	tracehook_report_death(tsk, state, cookie);
+ 
+ 	/* If the process is dead, release it - nobody will wait for it */
+ 	if (state == EXIT_DEAD)
+diff --git a/kernel/ptrace.c b/kernel/ptrace.c
+index 827a0e8..0000000 100644  
+--- a/kernel/ptrace.c
++++ b/kernel/ptrace.c
+@@ -253,8 +253,9 @@ ptrace_update(struct task_struct *target
+ 
+ 	/*
+ 	 * ptrace always inhibits normal parent reaping.
++	 * But for a corner case we sometimes see the REAP event instead.
+ 	 */
+-	flags |= UTRACE_ACTION_NOREAP;
++	flags |= UTRACE_ACTION_NOREAP | UTRACE_EVENT(REAP);
+ 
+ 	state->u.live.stopped = (flags & UTRACE_ACTION_QUIESCE) != 0;
+ 	if (!state->u.live.stopped) {
+@@ -1010,8 +1011,11 @@ ptrace_do_wait(struct task_struct *tsk,
+ 		if (p->exit_state == EXIT_ZOMBIE) {
+ 			if (!likely(options & WEXITED))
+ 				continue;
++			if (delay_group_leader(p))
++				continue;
+ 			goto found;
+ 		}
++		// XXX should handle WCONTINUED
+ 	}
+ 	rcu_read_unlock();
+ 	return err;
+@@ -1094,10 +1098,10 @@ found:
+ 			utrace_unlock(utrace);
+ 		}
+ 		rcu_read_unlock();
+-	}
+ 
+-	if (why != CLD_TRAPPED)
+-		ptrace_detach(p, state->engine);
++		if (err > 0 && why != CLD_TRAPPED)
++			ptrace_detach(p, state->engine);
++	}
+ 
+ 	return err;
+ }
+@@ -1220,6 +1224,14 @@ ptrace_report_death(struct utrace_attach
+ 	struct ptrace_state *state = (struct ptrace_state *) engine->data;
+ 
+ 	if (tsk->parent == state->parent) {
++		/*
++		 * This is a natural child, so we detach and let the normal
++		 * reporting happen once we our NOREAP action is gone.  But
++		 * first, generate a SIGCHLD for those cases where normal
++		 * behavior won't.  A ptrace'd child always generates SIGCHLD.
++		 */
++		if (tsk->exit_signal == -1 || !thread_group_empty(tsk))
++			do_notify(tsk, state->parent, CLD_EXITED);
+ 		ptrace_state_unlink(state);
+ 		rcu_assign_pointer(engine->data, 0UL);
+ 		ptrace_done(state);
+@@ -1231,6 +1243,25 @@ ptrace_report_death(struct utrace_attach
+ 	return UTRACE_ACTION_RESUME;
+ }
+ 
++/*
++ * We get this only in the case where our UTRACE_ACTION_NOREAP was ignored.
++ * That happens solely when a non-leader exec reaps the old leader.
++ */
++static void
++ptrace_report_reap(struct utrace_attached_engine *engine,
++		   struct task_struct *tsk)
++{
++	struct ptrace_state *state;
++	rcu_read_lock();
++	state = rcu_dereference((struct ptrace_state *) engine->data);
++	if (state != NULL) {
++		ptrace_state_unlink(state);
++		rcu_assign_pointer(engine->data, 0UL);
++		ptrace_done(state);
++	}
++	rcu_read_unlock();
++}
++
+ 
+ static u32
+ ptrace_report_clone(struct utrace_attached_engine *engine,
+@@ -1453,6 +1484,7 @@ static const struct utrace_engine_ops pt
+ 	.report_clone = ptrace_report_clone,
+ 	.report_exit = ptrace_report_exit,
+ 	.report_death = ptrace_report_death,
++	.report_reap = ptrace_report_reap,
+ 	.unsafe_exec = ptrace_unsafe_exec,
+ 	.tracer_task = ptrace_tracer_task,
+ 	.allow_access_process_vm = ptrace_allow_access_process_vm,
+diff --git a/kernel/utrace.c b/kernel/utrace.c
+index 4bd405c..0000000 100644  
+--- a/kernel/utrace.c
++++ b/kernel/utrace.c
+@@ -485,14 +485,46 @@ EXPORT_SYMBOL_GPL(utrace_detach);
+ 
+ 
+ /*
++ * Called with utrace->lock held.
++ * Notify and clean up all engines, then free utrace.
++ */
++static void
++utrace_reap(struct task_struct *target, struct utrace *utrace)
++{
++	struct utrace_attached_engine *engine, *next;
++	const struct utrace_engine_ops *ops;
++
++restart:
++	list_for_each_entry_safe(engine, next, &utrace->engines, entry) {
++		list_del_rcu(&engine->entry);
++
++		/*
++		 * Now nothing else refers to this engine.
++		 */
++		if (engine->flags & UTRACE_EVENT(REAP)) {
++			ops = rcu_dereference(engine->ops);
++			if (ops != &dead_engine_ops) {
++				utrace_unlock(utrace);
++				(*ops->report_reap)(engine, target);
++				call_rcu(&engine->rhead, utrace_engine_free);
++				utrace_lock(utrace);
++				goto restart;
++			}
++		}
++		call_rcu(&engine->rhead, utrace_engine_free);
++	}
++	utrace_unlock(utrace);
++
++	rcu_utrace_free(utrace);
++}
++
++/*
+  * Called by release_task.  After this, target->utrace must be cleared.
+  */
+ void
+ utrace_release_task(struct task_struct *target)
+ {
+ 	struct utrace *utrace;
+-	struct utrace_attached_engine *engine, *next;
+-	const struct utrace_engine_ops *ops;
+ 
+ 	task_lock(target);
+ 	utrace = target->utrace;
+@@ -502,27 +534,24 @@ utrace_release_task(struct task_struct *
+ 	if (unlikely(utrace == NULL))
+ 		return;
+ 
+-restart:
+ 	utrace_lock(utrace);
+-	list_for_each_entry_safe(engine, next, &utrace->engines, entry) {
+-		list_del_rcu(&engine->entry);
+ 
++	if (!utrace->u.exit.notified
++	    && (target->utrace_flags & (UTRACE_EVENT(DEATH)
++					| UTRACE_EVENT(QUIESCE)))) {
+ 		/*
+-		 * Now nothing else refers to this engine.
++		 * The target will do some final callbacks but hasn't
++		 * finished them yet.  We know because it clears these
++		 * event bits after it's done.  Instead of cleaning up here
++		 * and requiring utrace_report_death to cope with it, we
++		 * delay the REAP report and the teardown until after the
++		 * target finishes its death reports.
+ 		 */
+-		if (engine->flags & UTRACE_EVENT(REAP)) {
+-			ops = rcu_dereference(engine->ops);
+-			utrace_unlock(utrace);
+-			(*ops->report_reap)(engine, target);
+-			call_rcu(&engine->rhead, utrace_engine_free);
+-			goto restart;
+-		}
+-		else
+-			call_rcu(&engine->rhead, utrace_engine_free);
++		utrace->u.exit.reap = 1;
++		utrace_unlock(utrace);
+ 	}
+-	utrace_unlock(utrace);
+-
+-	rcu_utrace_free(utrace);
++	else
++		utrace_reap(target, utrace); /* Unlocks and frees.  */
+ }
+ 
+ 
+@@ -642,16 +671,17 @@ update_action(struct task_struct *tsk, s
+ 	} while (0)
+ 
+ 
+-
++/*
++ * Called with utrace->lock held, returns with it released.
++ */
+ static u32
+-remove_detached(struct task_struct *tsk, struct utrace **utracep, u32 action)
++remove_detached(struct task_struct *tsk, struct utrace *utrace,
++		struct utrace **utracep, u32 action)
+ {
+-	struct utrace *utrace = tsk->utrace;
+ 	struct utrace_attached_engine *engine, *next;
+ 	unsigned long flags;
+ 
+ 	flags = 0;
+-	utrace_lock(utrace);
+ 	list_for_each_entry_safe(engine, next, &utrace->engines, entry) {
+ 		if (engine->ops == &dead_engine_ops)
+ 			remove_engine(engine, tsk, utrace);
+@@ -672,8 +702,10 @@ remove_detached(struct task_struct *tsk,
+ static inline u32
+ check_detach(struct task_struct *tsk, u32 action)
+ {
+-	if (action & UTRACE_ACTION_DETACH)
+-		action = remove_detached(tsk, NULL, action);
++	if (action & UTRACE_ACTION_DETACH) {
++		utrace_lock(tsk->utrace);
++		action = remove_detached(tsk, tsk->utrace, NULL, action);
++	}
+ 	return action;
+ }
+ 
+@@ -900,11 +932,16 @@ utrace_report_exit(long *exit_code)
+ 
+ /*
+  * Called iff UTRACE_EVENT(DEATH) flag is set.
++ *
++ * It is always possible that we are racing with utrace_release_task here,
++ * if UTRACE_ACTION_NOREAP is not set, or in the case of non-leader exec
++ * where the old leader will get released regardless of NOREAP.  For this
++ * reason, utrace_release_task checks for the event bits that get us here,
++ * and delays its cleanup for us to do.
+  */
+ void
+-utrace_report_death(struct task_struct *tsk)
++utrace_report_death(struct task_struct *tsk, struct utrace *utrace)
+ {
+-	struct utrace *utrace = tsk->utrace;
+ 	struct list_head *pos, *next;
+ 	struct utrace_attached_engine *engine;
+ 	u32 action, oaction;
+@@ -927,9 +964,36 @@ utrace_report_death(struct task_struct *
+ 	 * This may notice that there are no engines left and
+ 	 * free the utrace struct.
+ 	 */
+-	action = remove_detached(tsk, &utrace, action);
++	utrace_lock(utrace);
++	if (utrace->u.exit.reap) {
++		/*
++		 * utrace_release_task was already called in parallel.
++		 * We must complete its work now.
++		 */
++	reap:
++		utrace_reap(tsk, utrace);
++	}
++	else {
++		action = remove_detached(tsk, utrace, &utrace, action);
++
++		if (utrace != NULL) {
++			utrace_lock(utrace);
++			if (utrace->u.exit.reap)
++				goto reap;
+ 
+-	check_noreap(tsk, utrace, oaction, action);
++			/*
++			 * Clear event bits we can't see any more.  This
++			 * tells utrace_release_task we have already
++			 * finished, if it comes along later.
++			 */
++			tsk->utrace_flags &= (UTRACE_EVENT(REAP)
++					      | UTRACE_ACTION_NOREAP);
++
++			utrace_unlock(utrace);
++		}
++
++		check_noreap(tsk, utrace, oaction, action);
++	}
+ }
+ 
+ /*



From fedora-cvs-commits at redhat.com  Thu Aug 24 15:41:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 11:41:51 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2519.4.10,1.2519.4.11
Message-ID: <200608241541.k7OFfpe4009418@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9312

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Log Message:
force remove files that don't exist...




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.10
retrieving revision 1.2519.4.11
diff -u -r1.2519.4.10 -r1.2519.4.11
--- kernel-2.6.spec	24 Aug 2006 15:28:29 -0000	1.2519.4.10
+++ kernel-2.6.spec	24 Aug 2006 15:41:47 -0000	1.2519.4.11
@@ -1072,7 +1072,7 @@
 
 %if 0%{?rhel}
 # don't need these for relocatable kernels
-rm kernel-%{kversion}-{i686,x86_64}-kdump.config
+rm -f kernel-%{kversion}-{i686,x86_64}-kdump.config
 %endif
 
 # now run oldconfig over all the config files



From fedora-cvs-commits at redhat.com  Thu Aug 24 15:50:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 11:50:54 -0400
Subject: rpms/cups/devel cups-lspp.patch, 1.5, 1.6 cups-str1881.patch, 1.3,
	1.4 cups.spec, 1.253, 1.254
Message-ID: <200608241550.k7OFoscv027755@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27569

Modified Files:
	cups-lspp.patch cups-str1881.patch cups.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
- Fixed another LSPP patch problem (bug #203784).
- Updated fix for STR #1881 from upstream.


cups-lspp.patch:
 Makedefs.in                     |    2 
 config-scripts/cups-lspp.m4     |   36 +++++
 config.h.in                     |    7 +
 configure.in                    |    2 
 cups-1.2.2/scheduler/printers.c |   44 ++++++
 cups/cups.h                     |    8 +
 data/Makefile                   |    5 
 data/mls                        |  277 ++++++++++++++++++++++++++++++++++++++++
 data/selinux                    |  277 ++++++++++++++++++++++++++++++++++++++++
 data/te                         |  277 ++++++++++++++++++++++++++++++++++++++++
 scheduler/Makefile              |    6 
 scheduler/client.c              |  101 ++++++++++++++
 scheduler/client.h              |   14 ++
 scheduler/conf.c                |   46 ++++++
 scheduler/conf.h                |    8 +
 scheduler/ipp.c                 |  271 +++++++++++++++++++++++++++++++++++++++
 scheduler/job.c                 |  155 ++++++++++++++++++++++
 scheduler/job.h                 |   11 +
 scheduler/lspp-access.c         |   56 ++++++++
 scheduler/main.c                |   32 ++++
 20 files changed, 1629 insertions(+), 6 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cups-lspp.patch	24 Aug 2006 11:40:19 -0000	1.5
+++ cups-lspp.patch	24 Aug 2006 15:50:51 -0000	1.6
@@ -1429,7 +1429,7 @@
 +      if (attr->num_values > 1)
 +        userfooter = strdup(attr->values[1].string.text);
 +  
-+      if ((strcmp(userheader, Classification) == 0)
++      if (Classification != NULL && (strcmp(userheader, Classification) == 0)
 +          && userfooter &&(strcmp(userfooter, Classification) == 0))
 +      {
 +       /*

cups-str1881.patch:
 backend/ipp.c        |    3 +++
 scheduler/job.c      |   22 +++++++---------------
 scheduler/printers.c |   12 ++++++++----
 scheduler/printers.h |    1 +
 4 files changed, 19 insertions(+), 19 deletions(-)

Index: cups-str1881.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-str1881.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-str1881.patch	16 Aug 2006 09:08:21 -0000	1.3
+++ cups-str1881.patch	24 Aug 2006 15:50:51 -0000	1.4
@@ -1,5 +1,5 @@
---- cups-1.2.2/scheduler/job.c.str1881	2006-08-16 09:42:32.000000000 +0100
-+++ cups-1.2.2/scheduler/job.c	2006-08-16 09:43:26.000000000 +0100
+--- cups-1.2.2/scheduler/job.c.str1881	2006-08-24 16:05:14.000000000 +0100
++++ cups-1.2.2/scheduler/job.c	2006-08-24 16:05:46.000000000 +0100
 @@ -2425,7 +2425,6 @@
  					/* PRINTER env variable */
  			rip_max_cache[255];
@@ -45,17 +45,16 @@
    {
      for (i = 0; i < job->num_files; i ++)
      {
-@@ -3018,7 +3010,8 @@
-   envp[envc ++] = device_uri;
-   envp[envc ++] = printer_name;
- 
--  if ((filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
-+  if (!printer->remote &&
-+      (filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
+@@ -3022,7 +3014,7 @@
    {
      snprintf(final_content_type, sizeof(final_content_type),
               "FINAL_CONTENT_TYPE=%s/%s",
-@@ -3059,7 +3052,7 @@
+-	     filter->src->super, filter->src->type);
++	     filter->dst->super, filter->dst->type);
+     envp[envc ++] = final_content_type;
+   }
+ 
+@@ -3059,7 +3051,7 @@
        cupsdLogMessage(CUPSD_LOG_DEBUG, "[Job %d] envp[%d]=\"DEVICE_URI=%s\"",
                        job->id, i, sani_uri);
  
@@ -64,7 +63,7 @@
      job->current_file = job->num_files;
    else
      job->current_file ++;
-@@ -3401,7 +3394,7 @@
+@@ -3401,7 +3393,7 @@
  		  slot, filterfds[slot][0], filterfds[slot][1]);
    cupsdClosePipe(filterfds[slot]);
  
@@ -73,7 +72,7 @@
    {
      for (i = 0; i < job->num_files; i ++)
        free(argv[i + 6]);
-@@ -3445,7 +3438,7 @@
+@@ -3445,7 +3437,7 @@
  
    cupsArrayDelete(filters);
  
@@ -83,7 +82,7 @@
      for (i = 0; i < job->num_files; i ++)
        free(argv[i + 6]);
 --- cups-1.2.2/scheduler/printers.h.str1881	2006-03-23 21:07:20.000000000 +0000
-+++ cups-1.2.2/scheduler/printers.h	2006-08-16 09:42:48.000000000 +0100
++++ cups-1.2.2/scheduler/printers.h	2006-08-24 16:05:14.000000000 +0100
 @@ -66,6 +66,7 @@
    char		*device_uri;		/* Device URI */
    char		*port_monitor;		/* Port monitor */
@@ -92,8 +91,8 @@
    mime_type_t	*filetype;		/* Pseudo-filetype for printer */
    cups_array_t	*filetypes;		/* Supported file types */
    void		*job;			/* Current job in queue */
---- cups-1.2.2/scheduler/printers.c.str1881	2006-08-16 09:42:32.000000000 +0100
-+++ cups-1.2.2/scheduler/printers.c	2006-08-16 09:42:48.000000000 +0100
+--- cups-1.2.2/scheduler/printers.c.str1881	2006-08-24 16:05:14.000000000 +0100
++++ cups-1.2.2/scheduler/printers.c	2006-08-24 16:05:14.000000000 +0100
 @@ -1502,7 +1502,8 @@
      else
        snprintf(resource, sizeof(resource), "/printers/%s", p->name);
@@ -135,7 +134,7 @@
  	else
  	{
 --- cups-1.2.2/backend/ipp.c.str1881	2006-07-12 20:42:35.000000000 +0100
-+++ cups-1.2.2/backend/ipp.c	2006-08-16 09:42:48.000000000 +0100
++++ cups-1.2.2/backend/ipp.c	2006-08-24 16:05:14.000000000 +0100
 @@ -214,6 +214,9 @@
      if ((content_type = getenv("CONTENT_TYPE")) == NULL)
        content_type = "application/octet-stream";


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- cups.spec	24 Aug 2006 11:40:19 -0000	1.253
+++ cups.spec	24 Aug 2006 15:50:51 -0000	1.254
@@ -420,6 +420,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed another LSPP patch problem (bug #203784).
+- Updated fix for STR #1881 from upstream.
+
 * Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-16
 - Fixed another LSPP patch problem noted by Erwin Rol.
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 15:52:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 11:52:54 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2519.4.11,1.2519.4.12
Message-ID: <200608241552.k7OFqsHf028494@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28293

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Log Message:
fix a buildheaders problem



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.11
retrieving revision 1.2519.4.12
diff -u -r1.2519.4.11 -r1.2519.4.12
--- kernel-2.6.spec	24 Aug 2006 15:41:47 -0000	1.2519.4.11
+++ kernel-2.6.spec	24 Aug 2006 15:52:51 -0000	1.2519.4.12
@@ -59,7 +59,7 @@
 %ifarch noarch
 %define builddoc 1
 %define buildup 0
-%define buildheaders 1
+%define buildheaders 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 15:53:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 11:53:10 -0400
Subject: rpms/coreutils/devel coreutils-acl.patch, 1.2, 1.3 coreutils.spec,
	1.134, 1.135
Message-ID: <200608241553.k7OFrAhG028658@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28593

Modified Files:
	coreutils-acl.patch coreutils.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
- Fixed warnings in acl patch (bug #203166).


coreutils-acl.patch:
 ChangeLog       |   45 ++++++++++++
 NEWS            |    3 
 config.hin      |   30 ++++++++
 configure.ac    |    2 
 lib/acl.c       |  209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 lib/acl.h       |    7 +
 m4/posix_acl.m4 |   28 +++++++
 src/Makefile.am |   12 +--
 src/copy.c      |  173 +++++++++++++++++++++++++++++-----------------
 src/copy.h      |    3 
 src/cp.c        |   98 +++++++++++++++++++-------
 src/install.c   |    1 
 src/ls.c        |    8 +-
 src/mv.c        |    6 -
 14 files changed, 509 insertions(+), 116 deletions(-)

Index: coreutils-acl.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-acl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coreutils-acl.patch	27 Oct 2005 15:05:08 -0000	1.2
+++ coreutils-acl.patch	24 Aug 2006 15:53:08 -0000	1.3
@@ -1,297 +1,72 @@
---- /dev/null	2005-10-10 09:36:06.437701000 +0100
-+++ coreutils-5.92/m4/posix_acl.m4	2005-10-27 11:44:29.000000000 +0100
-@@ -0,0 +1,28 @@
-+#serial 1
-+
-+dnl Written by Andreas Gruenbacher <a.gruenbacher at computer.org>.
+--- coreutils-5.97/ChangeLog.acl	2006-06-22 13:52:13.000000000 +0100
++++ coreutils-5.97/ChangeLog	2006-08-24 14:07:42.000000000 +0100
+@@ -0,0 +1,45 @@
++2002-07-01  Bernhard Rosenkraenzer <bero at bero.org>
++	* Port the following patch to 4.1.9:
 +
-+dnl Posix 1003.1e draft standard 17 (abandoned) and similar
-+dnl access control list support
-+AC_DEFUN([ag_POSIX_ACL],
-+[
-+  AC_CHECK_HEADERS(sys/acl.h)
-+  AC_CHECK_LIB(acl, main, cu_cv_lacl=yes, cu_cv_lacl=no)
-+  if test "$cu_cv_lacl" = yes; then
-+    LIBACL=-lacl
-+  else
-+    LIBACL=
-+  fi
-+  AC_SUBST(LIBACL)
-+  OLDLIBS="$LIBS"
-+  LIBS="$LIBS $LIBACL"
-+  AC_CHECK_FUNCS(acl_get_file acl_set_file acl_free acl_to_text \
-+                 acl_from_text acl_delete_def_file)
-+  # Linux specific extensions:
-+  AC_CHECK_FUNCS(acl_entries acl_extended_file)
-+  LIBS="$OLDLIBS"
++2002-04-10  Andreas Gruenbacher  <a.gruenbacher at computer.org>
 +
-+  if test $ac_cv_header_sys_acl_h = yes; then
-+    AC_DEFINE(USE_ACL, 1, [Define if you want access control list support.])
-+  fi
-+])
---- coreutils-5.92/lib/acl.h.acl	2005-05-14 08:58:06.000000000 +0100
-+++ coreutils-5.92/lib/acl.h	2005-10-27 11:44:29.000000000 +0100
-@@ -18,11 +18,16 @@
- 
-    Written by Paul Eggert.  */
- 
--#if HAVE_SYS_ACL_H && HAVE_ACL
-+#if HAVE_SYS_ACL_H
- # include <sys/acl.h>
- #endif
-+#if HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
- #if ! defined GETACLCNT && defined ACL_CNT
- # define GETACLCNT ACL_CNT
- #endif
- 
- int file_has_acl (char const *, struct stat const *);
-+int copy_acl (char const *, char const *, mode_t);
-+int set_acl (char const *, mode_t);
---- coreutils-5.92/lib/acl.c.acl	2005-09-22 07:47:18.000000000 +0100
-+++ coreutils-5.92/lib/acl.c	2005-10-27 11:44:29.000000000 +0100
-@@ -22,18 +22,30 @@
- # include <config.h>
- #endif
- 
-+#if ENABLE_NLS
-+# include <libintl.h>
-+# define _(Text) gettext (Text)
-+#else
-+# define _(Text) Text
-+#endif
++	* Version 4.1.8acl.
 +
- #include <sys/types.h>
- #include <sys/stat.h>
- #ifndef S_ISLNK
- # define S_ISLNK(Mode) 0
- #endif
- 
-+#include <stdlib.h>
++	* src/copy.c (get_dest_mode): Remove.
++	* src/copy.c (copy_internal): Merge src_mode and src_type.
++	* src/copy.c (copy_internal): Add dst_mode and dst_mode_valid,
++	which are set when the destination file mode is changed temporarily.
++	* src/copy.c (copy_internal): Check effective permissions after
++	mkdir(). Add S_IRWXU only after saving the default permissions, so
++	the default permissions can be restored. This is needed with
++	default ACLs on some systems.
++	* src/copy.c (copy_internal): Use dst_mode and dst_mode_valid for
++	ran_chown. Save the current permissions if needed before chown().
++	* src/copy.c (copy_internal): Clean up the final permission setting
++	code and prepare for copy/set ACL support.
++	* src/cp.c, src/install.c, src/mv.c, src/copy.h: Remove umask_kill,
++	and never change the startup umask. The functions creating files need
++	the original umask to be active to create the correct permissions
++	inside directories with default ACLs; umask_kill no longer works.
++	* src/cp.c (struct dir_attr, re_protect, make_path_private): Remove
++	is_new_dir and add mode and mode_valid instead.
++	* src/cp.c (make_path_private): Remove the mode parameter. Pass in
++	cp_options, instead of cp_options->xstat only. Stat the source dir,
++	and create the destination dir with the source dir's mode as create
++	mode (see analog change to src/copy.c (copy_internal)). Check if the
++	effective permissions include S_IRWXU. Remember the original code only
++	if needed later.
++	* lib/acl.h, lib/acl.c (copy_acl, set_acl): Add these functions,
++	initially with the bare non-ACL functionality.
++	* src/copy.c (copy_internal): Use copy_acl and set_acl instead of chmod.
++	* src/cp.c (re_protect): Use copy_acl instead of chmod.
++	* m4/posix_acl.m4, configure.ac (ag_POSIX_ACL): Add POSIX ACL tests.
++	* lib/acl.h: Remove HAVE_ACL symbol; <sys/acl.h> is needed for POSIX
++	ACLs even if there is no acl system call.
++	* lib/acl.c (ENOTSUP): Provide default value.
++	* lib/acl.c (file_has_acl, copy_acl, set_acl): Add Linux ACL
++	implementations.
++	* src/ls.c: change `HAVE_ACL' to `HAVE_ACL || USE_ACL' for POSIX ACLs:
++	there is no acl system call for POSIX ACLs.
++	* tests/misc: Add my own small test suite so it doesn't get lost.
 +
- #include "acl.h"
- 
- #include <errno.h>
- #ifndef ENOSYS
- # define ENOSYS (-1)
- #endif
-+#ifndef ENOTSUP
-+# define ENOTSUP (-1)
-+#endif
+--- coreutils-5.97/NEWS.acl	2006-08-24 14:07:42.000000000 +0100
++++ coreutils-5.97/NEWS	2006-08-24 14:07:42.000000000 +0100
+@@ -1,3 +1,6 @@
++[4.5.3acl]
++* ACL framework and Linux ACL support.
++* `cp -p' and `mv' now preserve ACLs
+ GNU coreutils NEWS                                    -*- outline -*-
  
- #ifndef MIN_ACL_ENTRIES
- # define MIN_ACL_ENTRIES 4
-@@ -45,19 +57,201 @@
- int
- file_has_acl (char const *file, struct stat const *filestat)
- {
--  /* FIXME: This implementation should work on recent-enough versions
--     of HP-UX, Solaris, and Unixware, but it simply returns 0 with
--     POSIX 1003.1e (draft 17 -- abandoned), AIX, GNU/Linux, Irix, and
--     Tru64.  Please see Samba's source/lib/sysacls.c file for
--     fix-related ideas.  */
--
- #if HAVE_ACL && defined GETACLCNT
-+  /* This implementation should work on recent-enough versions of HP-UX,
-+     Solaris, and Unixware.  */
-+
-   if (! S_ISLNK (filestat->st_mode))
-     {
-       int n = acl (file, GETACLCNT, 0, NULL);
-       return n < 0 ? (errno == ENOSYS ? 0 : -1) : (MIN_ACL_ENTRIES < n);
-     }
-+#elif HAVE_ACL_EXTENDED_FILE
-+
-+  /* Linux specific.  */
-+
-+  if (! S_ISLNK (filestat->st_mode))
-+    {
-+      int ret = acl_extended_file (file);
-+      if (ret < 0)
-+	return (errno == ENOSYS || errno == ENOTSUP) ? 0 : -1;
-+      return ret;
-+    }
-+#else
-+  /* FIXME: Add support for AIX, Irix, and Tru64, FreeBSD, etc.
-+     Please see Samba's source/lib/sysacls.c file for fix-related ideas.  */
- #endif
+ * Major changes in release 5.97 (2006-06-24) [stable]
+--- coreutils-5.97/src/install.c.acl	2005-09-23 21:50:49.000000000 +0100
++++ coreutils-5.97/src/install.c	2006-08-24 14:07:42.000000000 +0100
+@@ -153,7 +153,6 @@
+   x->mode = S_IRUSR | S_IWUSR;
+   x->stdin_tty = false;
  
-   return 0;
- }
-+
-+/* Copy the permissions from SRC_PATH to DST_PATH, including access control
-+   lists on systems where this is supported. MODE is the file mode for
-+   DST_PATH, including the file type.
-+   Also sets special bits in MODE on DST_PATH.  */
-+
-+int
-+copy_acl (char const *src_path, char const *dst_path, mode_t mode)
-+{
-+#if HAVE_ACL_GET_FILE && HAVE_ACL_SET_FILE && HAVE_ACL_FREE && \
-+    HAVE_ACL_ENTRIES
-+
-+  /* Linux specific. Will work on all POSIX 1003.1e draft 17 (abandoned)
-+     compliant systems if the acl_entries() function is implemented.  */
-+
-+  acl_t acl = acl_get_file (src_path, ACL_TYPE_ACCESS);
-+  if (acl == NULL)
-+    {
-+      if (errno == ENOSYS || errno == ENOTSUP)
-+	return set_acl (dst_path, mode);
-+      else
-+        {
-+	  error (0, errno, "%s", quote (src_path));
-+	  return -1;
-+	}
-+    }
-+
-+  if (acl_set_file (dst_path, ACL_TYPE_ACCESS, acl))
-+    {
-+      int saved_errno = errno;
-+
-+      if (errno == ENOSYS || errno == ENOTSUP)
-+        {
-+	  int n = acl_entries (acl);
-+
-+	  acl_free (acl);
-+	  if (n == 3)
-+	    {
-+	      if (chmod (dst_path, mode))
-+		saved_errno = errno;
-+	      else
-+		return 0;
-+	    }
-+	  else
-+	    chmod (dst_path, mode);
-+	}
-+      else
-+	{
-+	  acl_free (acl);
-+	  chmod (dst_path, mode);
-+	}
-+      error (0, saved_errno, _("preserving permissions for %s"),
-+	     quote (dst_path));
-+      return -1;
-+    }
-+  acl_free (acl);
-+
-+  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
-+    {
-+      /* We did not call chmod so far, so the special bits have not yet
-+         been set.  */
-+
-+      if (chmod (dst_path, mode))
-+	{
-+	  error (0, errno, _("preserving permissions for %s"),
-+	  	 quote (dst_path));
-+	  return -1;
-+	}
-+    }
-+
-+  if (S_ISDIR (mode))
-+    {
-+      acl = acl_get_file (src_path, ACL_TYPE_DEFAULT);
-+      if (acl == NULL)
-+	{
-+	  error (0, errno, "%s", quote (src_path));
-+	  return -1;
-+	}
-+
-+      if (acl_set_file (dst_path, ACL_TYPE_DEFAULT, acl))
-+	{
-+	  error (0, errno, _("preserving permissions for %s"),
-+		 quote (dst_path));
-+	  acl_free(acl);
-+	  return -1;
-+	}
-+      else
-+        acl_free(acl);
-+    }
-+  return 0;
-+#else
-+  int ret = chmod (dst_path, mode);
-+  if (ret)
-+    error (0, errno, _("preserving permissions for %s"), quote (dst_path));
-+  return ret;
-+#endif
-+}
-+
-+/* Set the permissions of PATH, overwriting access control lists, on systems
-+   where this is supported. MODE is the file mode for PATH, including the
-+   file type. Also sets special bits in MODE on PATH.  */
-+
-+int
-+set_acl (char const *path, mode_t mode)
-+{
-+#if HAVE_ACL_FROM_TEXT && HAVE_ACL_SET_FILE && HAVE_ACL_FREE && \
-+       HAVE_ACL_DELETE_DEF_FILE
-+  char acl_text[] = "u::---,g::---,o::---";
-+  acl_t acl;
-+
-+  if (mode & S_IRUSR) acl_text[ 3] = 'r';
-+  if (mode & S_IWUSR) acl_text[ 4] = 'w';
-+  if (mode & S_IXUSR) acl_text[ 5] = 'x';
-+  if (mode & S_IRGRP) acl_text[10] = 'r';
-+  if (mode & S_IWGRP) acl_text[11] = 'w';
-+  if (mode & S_IXGRP) acl_text[12] = 'x';
-+  if (mode & S_IROTH) acl_text[17] = 'r';
-+  if (mode & S_IWOTH) acl_text[18] = 'w';
-+  if (mode & S_IXOTH) acl_text[19] = 'x';
-+
-+  acl = acl_from_text(acl_text);
-+  if (!acl)
-+    {
-+      error (0, errno, "%s", quote (path));
-+      return -1;
-+    }
-+
-+  if (acl_set_file(path, ACL_TYPE_ACCESS, acl))
-+    {
-+      int saved_errno = errno;
-+      acl_free (acl);
-+
-+      if (errno == ENOTSUP || errno == ENOSYS)
-+	{
-+	  if (chmod (path, mode))
-+	    saved_errno = errno;
-+	  else
-+	    return 0;
-+	}
-+      error (0, saved_errno, _("setting permissions for %s"), quote (path));
-+      return -1;
-+    }
-+  acl_free (acl);
-+
-+  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
-+    {
-+      /* We did not call chmod so far, so the special bits have not yet
-+         been set.  */
-+
-+      if (chmod (path, mode))
-+	{
-+	  error (0, errno, _("preserving permissions for %s"),
-+	  	 quote (path));
-+	  return -1;
-+	}
-+    }
-+
-+  if (S_ISDIR (mode) && acl_delete_def_file (path))
-+    {
-+      error (0, errno, _("setting permissions for %s"), quote (path));
-+      return -1;
-+    }
-+  return 0;
-+#else
-+  int ret = chmod (path, mode);
-+  if (ret)
-+    error (0, errno, _("setting permissions for %s"), quote (path));
-+  return ret;
-+#endif
-+}
-+
---- coreutils-5.92/src/mv.c.acl	2005-07-03 17:55:19.000000000 +0100
-+++ coreutils-5.92/src/mv.c	2005-10-27 11:44:29.000000000 +0100
+-  x->umask_kill = 0;
+   x->update = false;
+   x->verbose = false;
+   x->dest_info = NULL;
+--- coreutils-5.97/src/mv.c.acl	2006-01-21 11:15:35.000000000 +0000
++++ coreutils-5.97/src/mv.c	2006-08-24 14:07:42.000000000 +0100
 @@ -135,12 +135,6 @@
    x->mode = 0;
    x->stdin_tty = isatty (STDIN_FILENO);
@@ -305,55 +80,17 @@
    x->update = false;
    x->verbose = false;
    x->dest_info = NULL;
---- coreutils-5.92/src/ls.c.acl	2005-10-27 11:44:29.000000000 +0100
-+++ coreutils-5.92/src/ls.c	2005-10-27 11:44:29.000000000 +0100
-@@ -193,13 +193,13 @@
- 
-     enum filetype filetype;
- 
--#if HAVE_ACL
-+#if HAVE_ACL || USE_ACL
-     /* For long listings, true if the file has an access control list.  */
-     bool have_acl;
- #endif
-   };
- 
--#if HAVE_ACL
-+#if HAVE_ACL || USE_ACL
- # define FILE_HAS_ACL(F) ((F)->have_acl)
- #else
- # define FILE_HAS_ACL(F) 0
-@@ -334,7 +334,7 @@
- /* Whether any of the files has an ACL.  This affects the width of the
-    mode column.  */
- 
--#if HAVE_ACL
-+#if HAVE_ACL || USE_ACL
- static bool any_has_acl;
- #else
- enum { any_has_acl = false };
-@@ -2582,7 +2582,7 @@
- 	  return 0;
- 	}
- 
--#if HAVE_ACL
-+#if HAVE_ACL || USE_ACL
-       if (format == long_format)
- 	{
- 	  int n = file_has_acl (absolute_name, &f->stat);
---- coreutils-5.92/src/install.c.acl	2005-09-23 21:58:37.000000000 +0100
-+++ coreutils-5.92/src/install.c	2005-10-27 11:44:29.000000000 +0100
-@@ -153,7 +153,6 @@
-   x->mode = S_IRUSR | S_IWUSR;
-   x->stdin_tty = false;
- 
--  x->umask_kill = 0;
-   x->update = false;
-   x->verbose = false;
-   x->dest_info = NULL;
---- coreutils-5.92/src/cp.c.acl	2005-09-16 08:51:01.000000000 +0100
-+++ coreutils-5.92/src/cp.c	2005-10-27 11:44:29.000000000 +0100
-@@ -56,7 +56,8 @@
+--- coreutils-5.97/src/cp.c.acl	2005-09-16 08:50:33.000000000 +0100
++++ coreutils-5.97/src/cp.c	2006-08-24 14:13:48.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <getopt.h>
+ 
+ #include "system.h"
++#include "acl.h"
+ #include "argmatch.h"
+ #include "backupfile.h"
+ #include "copy.h"
+@@ -56,7 +57,8 @@
     need to be fixed after copying. */
  struct dir_attr
  {
@@ -363,7 +100,7 @@
    size_t slash_offset;
    struct dir_attr *next;
  };
-@@ -327,9 +328,14 @@
+@@ -327,9 +329,14 @@
  	    }
  	}
  
@@ -381,7 +118,7 @@
  	    {
  	      error (0, errno, _("failed to preserve permissions for %s"),
  		     quote (dst_name));
-@@ -347,8 +353,7 @@
+@@ -347,8 +354,7 @@
  
     SRC_OFFSET is the index in CONST_DIR (which is a destination
     directory) of the beginning of the source directory name.
@@ -391,7 +128,7 @@
     If VERBOSE_FMT_STRING is nonzero, use it as a printf format
     string for printing a message after successfully making a directory.
     The format should take two string arguments: the names of the
-@@ -364,15 +369,20 @@
+@@ -364,15 +370,20 @@
  
  static bool
  make_dir_parents_private (char const *const_dir, size_t src_offset,
@@ -414,7 +151,7 @@
  
    ASSIGN_STRDUPA (dir, const_dir);
  
-@@ -407,12 +417,20 @@
+@@ -407,12 +418,20 @@
  	  if ((*xstat) (dir, &stats))
  	    {
  	      /* This component does not exist.  We must set
@@ -437,7 +174,7 @@
  	      if (mkdir (dir, mode))
  		{
  		  error (0, errno, _("cannot make directory %s"),
-@@ -424,6 +442,46 @@
+@@ -424,6 +443,46 @@
  		  if (verbose_fmt_string != NULL)
  		    printf (verbose_fmt_string, src, dir);
  		}
@@ -484,7 +221,7 @@
  	    }
  	  else if (!S_ISDIR (stats.st_mode))
  	    {
-@@ -433,7 +491,7 @@
+@@ -433,7 +492,7 @@
  	    }
  	  else
  	    {
@@ -493,7 +230,7 @@
  	      *new_dst = false;
  	    }
  	  *slash++ = '/';
-@@ -536,10 +594,6 @@
+@@ -536,10 +595,6 @@
  	 Copy the files `file1' through `filen'
  	 to the existing directory `edir'. */
        int i;
@@ -504,7 +241,7 @@
  
        /* Initialize these hash tables only if we'll need them.
  	 The problems they're used to detect can arise only if
-@@ -585,9 +639,9 @@
+@@ -585,9 +640,9 @@
  	         leading directories. */
  	      parent_exists =
  		(make_dir_parents_private
@@ -516,7 +253,7 @@
  	    }
  	  else
  	    {
-@@ -697,12 +751,6 @@
+@@ -697,12 +752,6 @@
    /* Not used.  */
    x->stdin_tty = false;
  
@@ -529,7 +266,7 @@
    x->update = false;
    x->verbose = false;
    x->dest_info = NULL;
-@@ -987,9 +1035,6 @@
+@@ -987,9 +1036,6 @@
  				   version_control_string)
  		   : no_backups);
  
@@ -539,21 +276,83 @@
    if (x.dereference == DEREF_UNDEFINED)
      {
        if (x.recursive)
---- coreutils-5.92/src/copy.h.acl	2005-07-03 10:45:51.000000000 +0100
-+++ coreutils-5.92/src/copy.h	2005-10-27 11:44:29.000000000 +0100
-@@ -165,9 +165,6 @@
-      Create destination directories as usual. */
-   bool symbolic_link;
+--- coreutils-5.97/src/Makefile.am.acl	2006-08-24 14:07:42.000000000 +0100
++++ coreutils-5.97/src/Makefile.am	2006-08-24 14:07:42.000000000 +0100
+@@ -52,9 +52,9 @@
+ LDADD = ../lib/libcoreutils.a $(LIBINTL) ../lib/libcoreutils.a
+ 
+ # for eaccess in lib/euidaccess.c.
+-cp_LDADD = $(LDADD) $(LIB_EACCESS)
+-ginstall_LDADD = $(LDADD) $(LIB_EACCESS)
+-mv_LDADD = $(LDADD) $(LIB_EACCESS)
++cp_LDADD = $(LDADD) $(LIB_EACCESS) @LIBACL@
++ginstall_LDADD = $(LDADD) $(LIB_EACCESS) @LIBACL@
++mv_LDADD = $(LDADD) $(LIB_EACCESS) @LIBACL@
+ pathchk_LDADD = $(LDADD) $(LIB_EACCESS)
+ rm_LDADD = $(LDADD) $(LIB_EACCESS)
+ test_LDADD = $(LDADD) $(LIB_EACCESS)
+@@ -63,11 +63,11 @@
+ 
+ # for clock_gettime and fdatasync
+ dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC)
+-dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+-ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
++dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBACL@
++ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBACL@
+ pr_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+ shred_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC)
+-vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
++vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBACL@
+ 
+ ## If necessary, add -lm to resolve use of pow in lib/strtod.c.
+ sort_LDADD = $(LDADD) $(POW_LIB)
+--- coreutils-5.97/src/ls.c.acl	2006-08-24 14:07:42.000000000 +0100
++++ coreutils-5.97/src/ls.c	2006-08-24 14:07:42.000000000 +0100
+@@ -193,13 +193,13 @@
+ 
+     enum filetype filetype;
+ 
+-#if HAVE_ACL
++#if HAVE_ACL || USE_ACL
+     /* For long listings, true if the file has an access control list.  */
+     bool have_acl;
+ #endif
+   };
+ 
+-#if HAVE_ACL
++#if HAVE_ACL || USE_ACL
+ # define FILE_HAS_ACL(F) ((F)->have_acl)
+ #else
+ # define FILE_HAS_ACL(F) 0
+@@ -334,7 +334,7 @@
+ /* Whether any of the files has an ACL.  This affects the width of the
+    mode column.  */
+ 
+-#if HAVE_ACL
++#if HAVE_ACL || USE_ACL
+ static bool any_has_acl;
+ #else
+ enum { any_has_acl = false };
+@@ -2582,7 +2582,7 @@
+ 	  return 0;
+ 	}
  
--  /* The bits to preserve in created files' modes. */
--  mode_t umask_kill;
--
-   /* If true, do not copy a nondirectory that has an existing destination
-      with the same or newer modification time. */
-   bool update;
---- coreutils-5.92/src/copy.c.acl	2005-09-25 06:57:47.000000000 +0100
-+++ coreutils-5.92/src/copy.c	2005-10-27 11:57:41.000000000 +0100
-@@ -101,26 +101,6 @@
+-#if HAVE_ACL
++#if HAVE_ACL || USE_ACL
+       if (format == long_format)
+ 	{
+ 	  int n = file_has_acl (absolute_name, &f->stat);
+--- coreutils-5.97/src/copy.c.acl	2006-05-12 08:04:29.000000000 +0100
++++ coreutils-5.97/src/copy.c	2006-08-24 14:14:52.000000000 +0100
+@@ -30,6 +30,7 @@
+ #endif
+ 
+ #include "system.h"
++#include "acl.h"
+ #include "backupfile.h"
+ #include "copy.h"
+ #include "cp-hash.h"
+@@ -101,26 +102,6 @@
  /* The invocation name of this program.  */
  extern char *program_name;
  
@@ -580,7 +379,7 @@
  /* FIXME: describe */
  /* FIXME: rewrite this to use a hash table so we avoid the quadratic
     performance hit that's probably noticeable only on trees deeper
-@@ -460,18 +440,41 @@
+@@ -460,18 +441,41 @@
       succeeded, because the chown must have reset those bits.  */
    if (!(*new_dst
  	&& !(*chown_succeeded && (src_sb->st_mode & ~S_IRWXUGO)))
@@ -589,9 +388,11 @@
      {
 -      if (fchmod (dest_desc, get_dest_mode (x, src_sb->st_mode)) != 0)
 +      if (x->preserve_mode || x->move_mode)
-+	{
+ 	{
+-	  error (0, errno, _("setting permissions for %s"), quote (dst_name));
+-	  if (x->set_mode || x->require_preserve)
 +	  if (copy_acl (src_name, dst_name, src_sb->st_mode))
-+	    {
+ 	    {
 +	      error (0, errno, _("preserving ACL for %s"), quote (dst_name));
 +	      if (x->set_mode || x->require_preserve)
 +	      {
@@ -601,11 +402,9 @@
 +	    }
 +	}
 +      else if (x->set_mode)
- 	{
--	  error (0, errno, _("setting permissions for %s"), quote (dst_name));
--	  if (x->set_mode || x->require_preserve)
++	{
 +	  if (set_acl (dst_name, x->mode))
- 	    {
++	    {
 +	      error (0, errno, _("setting ACL for %s"), quote (dst_name));
  	      return_val = false;
  	      goto close_src_and_dst_desc;
@@ -626,7 +425,7 @@
      }
  #endif
  
-@@ -908,13 +911,14 @@
+@@ -908,13 +912,14 @@
    struct stat src_sb;
    struct stat dst_sb;
    mode_t src_mode;
@@ -642,7 +441,7 @@
    bool preserve_metadata;
  
    if (x->move_mode && rename_succeeded)
-@@ -928,11 +932,9 @@
+@@ -928,11 +933,9 @@
        return false;
      }
  
@@ -655,7 +454,7 @@
      {
        error (0, 0, _("omitting directory %s"), quote (src_name));
        return false;
-@@ -1001,7 +1003,7 @@
+@@ -1001,7 +1004,7 @@
  
  	  if (!S_ISDIR (dst_sb.st_mode))
  	    {
@@ -664,7 +463,7 @@
  		{
  		  error (0, 0,
  		     _("cannot overwrite non-directory %s with directory %s"),
-@@ -1027,7 +1029,7 @@
+@@ -1027,7 +1030,7 @@
  		}
  	    }
  
@@ -673,7 +472,7 @@
  	    {
  	      if (S_ISDIR (dst_sb.st_mode))
  		{
-@@ -1067,7 +1069,7 @@
+@@ -1067,7 +1070,7 @@
  	     This may be due to an interactive `negative' reply to the
  	     prompt about the existing file.  It may also be due to the
  	     use of the --reply=no option.  */
@@ -682,7 +481,7 @@
  	    {
  	      /* cp and mv treat -i and -f differently.  */
  	      if (x->move_mode)
-@@ -1181,7 +1183,7 @@
+@@ -1175,7 +1178,7 @@
    /* If the source is a directory, we don't always create the destination
       directory.  So --verbose should not announce anything until we're
       sure we'll create a directory. */
@@ -691,7 +490,7 @@
      {
        printf ("%s -> %s", quote_n (0, src_name), quote_n (1, dst_name));
        if (backup_succeeded)
-@@ -1229,7 +1231,7 @@
+@@ -1223,7 +1226,7 @@
  		|| (command_line_arg
  		    && x->dereference == DEREF_COMMAND_LINE_ARGUMENTS)
  		|| x->dereference == DEREF_ALWAYS))
@@ -700,7 +499,7 @@
      {
        earlier_file = remember_copied (dst_name, src_sb.st_ino, src_sb.st_dev);
      }
-@@ -1242,7 +1244,7 @@
+@@ -1236,7 +1239,7 @@
        /* Avoid damaging the destination file system by refusing to preserve
  	 hard-linked directories (which are found at least in Netapp snapshot
  	 directories).  */
@@ -709,7 +508,7 @@
  	{
  	  /* If src_name and earlier_file refer to the same directory entry,
  	     then warn about copying a directory into itself.  */
-@@ -1292,7 +1294,7 @@
+@@ -1295,7 +1298,7 @@
      {
        if (rename (src_name, dst_name) == 0)
  	{
@@ -718,7 +517,7 @@
  	    printf ("%s -> %s\n", quote_n (0, src_name), quote_n (1, dst_name));
  	  if (rename_succeeded)
  	    *rename_succeeded = true;
-@@ -1405,7 +1407,7 @@
+@@ -1408,7 +1411,7 @@
       In such cases, set this variable to zero.  */
    preserve_metadata = true;
  
@@ -727,7 +526,7 @@
      {
        struct dir_list *dir;
  
-@@ -1430,16 +1432,38 @@
+@@ -1433,16 +1436,38 @@
  
        if (new_dst || !S_ISDIR (dst_sb.st_mode))
  	{
@@ -770,7 +569,7 @@
  	  /* Insert the created directory's inode and device
               numbers into the search structure, so that we can
               avoid copying it again.  */
-@@ -1515,23 +1539,24 @@
+@@ -1518,23 +1543,24 @@
  	  goto un_backup;
  	}
      }
@@ -800,7 +599,7 @@
  	{
  	  error (0, errno, _("cannot create fifo %s"), quote (dst_name));
  	  goto un_backup;
-@@ -1539,10 +1564,10 @@
+@@ -1542,10 +1568,10 @@
      }
    else
  #endif
@@ -814,7 +613,7 @@
  	{
  	  error (0, errno, _("cannot create special file %s"),
  		 quote (dst_name));
-@@ -1551,7 +1576,7 @@
+@@ -1554,7 +1580,7 @@
      }
    else
  #ifdef S_ISLNK
@@ -823,7 +622,7 @@
      {
        char *src_link_val = xreadlink (src_name, src_sb.st_size);
        if (src_link_val == NULL)
-@@ -1654,6 +1679,25 @@
+@@ -1657,6 +1683,25 @@
    if (!(copied_as_regular && HAVE_FCHOWN) && x->preserve_ownership
        && (new_dst || !SAME_OWNER_AND_GROUP (src_sb, dst_sb)))
      {
@@ -849,7 +648,7 @@
        if (chown (dst_name, src_sb.st_uid, src_sb.st_gid) == 0)
  	chown_succeeded = true;
        else if (! chown_failure_ok (x))
-@@ -1682,21 +1726,23 @@
+@@ -1685,21 +1730,23 @@
    }
  #endif
  
@@ -872,169 +671,389 @@
 +      if (copy_acl (src_name, dst_name, src_mode) && x->require_preserve)
 +	return false;
 +    }
-+  else if (x->set_mode)
++  else if (x->set_mode)
++    {
++      if (set_acl (dst_name, x->mode) && x->require_preserve)
++	return false;
++    }
++  else if (dst_mode_valid)
++    {
++      if (chmod (dst_name, dst_mode))
++        {
++	  error (0, errno, _("preserving permissions for %s"),
++	         quote (dst_name));
++	  if (x->require_preserve)
+ 	    return false;
+ 	}
+     }
+--- coreutils-5.97/src/copy.h.acl	2005-07-03 10:31:19.000000000 +0100
++++ coreutils-5.97/src/copy.h	2006-08-24 14:07:42.000000000 +0100
+@@ -165,9 +165,6 @@
+      Create destination directories as usual. */
+   bool symbolic_link;
+ 
+-  /* The bits to preserve in created files' modes. */
+-  mode_t umask_kill;
+-
+   /* If true, do not copy a nondirectory that has an existing destination
+      with the same or newer modification time. */
+   bool update;
+--- /dev/null	2006-08-24 09:50:30.595836250 +0100
++++ coreutils-5.97/m4/posix_acl.m4	2006-08-24 14:07:42.000000000 +0100
+@@ -0,0 +1,28 @@
++#serial 1
++
++dnl Written by Andreas Gruenbacher <a.gruenbacher at computer.org>.
++
++dnl Posix 1003.1e draft standard 17 (abandoned) and similar
++dnl access control list support
++AC_DEFUN([ag_POSIX_ACL],
++[
++  AC_CHECK_HEADERS(sys/acl.h)
++  AC_CHECK_LIB(acl, main, cu_cv_lacl=yes, cu_cv_lacl=no)
++  if test "$cu_cv_lacl" = yes; then
++    LIBACL=-lacl
++  else
++    LIBACL=
++  fi
++  AC_SUBST(LIBACL)
++  OLDLIBS="$LIBS"
++  LIBS="$LIBS $LIBACL"
++  AC_CHECK_FUNCS(acl_get_file acl_set_file acl_free acl_to_text \
++                 acl_from_text acl_delete_def_file)
++  # Linux specific extensions:
++  AC_CHECK_FUNCS(acl_entries acl_extended_file)
++  LIBS="$OLDLIBS"
++
++  if test $ac_cv_header_sys_acl_h = yes; then
++    AC_DEFINE(USE_ACL, 1, [Define if you want access control list support.])
++  fi
++])
+--- coreutils-5.97/configure.ac.acl	2006-08-24 14:07:42.000000000 +0100
++++ coreutils-5.97/configure.ac	2006-08-24 14:07:42.000000000 +0100
+@@ -251,6 +251,8 @@
+ AM_GNU_GETTEXT([external], [need-ngettext])
+ AM_GNU_GETTEXT_VERSION(0.13.1)
+ 
++ag_POSIX_ACL
++
+ AC_CONFIG_FILES(
+   Makefile
+   doc/Makefile
+--- coreutils-5.97/config.hin.acl	2006-06-10 10:03:51.000000000 +0100
++++ coreutils-5.97/config.hin	2006-08-24 14:07:42.000000000 +0100
+@@ -101,6 +101,30 @@
+ /* Define to 1 if you have the `acl' function. */
+ #undef HAVE_ACL
+ 
++/* Define to 1 if you have the `acl_delete_def_file' function. */
++#undef HAVE_ACL_DELETE_DEF_FILE
++
++/* Define to 1 if you have the `acl_entries' function. */
++#undef HAVE_ACL_ENTRIES
++
++/* Define to 1 if you have the `acl_extended_file' function. */
++#undef HAVE_ACL_EXTENDED_FILE
++
++/* Define to 1 if you have the `acl_free' function. */
++#undef HAVE_ACL_FREE
++
++/* Define to 1 if you have the `acl_from_text' function. */
++#undef HAVE_ACL_FROM_TEXT
++
++/* Define to 1 if you have the `acl_get_file' function. */
++#undef HAVE_ACL_GET_FILE
++
++/* Define to 1 if you have the `acl_set_file' function. */
++#undef HAVE_ACL_SET_FILE
++
++/* Define to 1 if you have the `acl_to_text' function. */
++#undef HAVE_ACL_TO_TEXT
++
+ /* Define to 1 if you have the `alarm' function. */
+ #undef HAVE_ALARM
+ 
+@@ -589,6 +613,9 @@
+ /* Define to 1 if you have the `lchown' function. */
+ #undef HAVE_LCHOWN
+ 
++/* Define to 1 if you have the `acl' library (-lacl). */
++#undef HAVE_LIBACL
++
+ /* Define to 1 if you have the `dgc' library (-ldgc). */
+ #undef HAVE_LIBDGC
+ 
+@@ -1507,6 +1534,9 @@
+    safe for multithreaded apps. */
+ #undef USE_UNLOCKED_IO
+ 
++/* Define if you want access control list support. */
++#undef USE_ACL
++
+ /* Version number of package */
+ #undef VERSION
+ 
+--- coreutils-5.97/lib/acl.c.acl	2005-09-22 07:05:39.000000000 +0100
++++ coreutils-5.97/lib/acl.c	2006-08-24 14:14:10.000000000 +0100
+@@ -22,18 +22,33 @@
+ # include <config.h>
+ #endif
+ 
++#if ENABLE_NLS
++# include <libintl.h>
++# define _(Text) gettext (Text)
++#else
++# define _(Text) Text
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #ifndef S_ISLNK
+ # define S_ISLNK(Mode) 0
+ #endif
+ 
++#include <stdlib.h>
++#include <acl/libacl.h>
++
+ #include "acl.h"
++#include "error.h"
++#include "quote.h"
+ 
+ #include <errno.h>
+ #ifndef ENOSYS
+ # define ENOSYS (-1)
+ #endif
++#ifndef ENOTSUP
++# define ENOTSUP (-1)
++#endif
+ 
+ #ifndef MIN_ACL_ENTRIES
+ # define MIN_ACL_ENTRIES 4
+@@ -45,19 +60,201 @@
+ int
+ file_has_acl (char const *file, struct stat const *filestat)
+ {
+-  /* FIXME: This implementation should work on recent-enough versions
+-     of HP-UX, Solaris, and Unixware, but it simply returns 0 with
+-     POSIX 1003.1e (draft 17 -- abandoned), AIX, GNU/Linux, Irix, and
+-     Tru64.  Please see Samba's source/lib/sysacls.c file for
+-     fix-related ideas.  */
+-
+ #if HAVE_ACL && defined GETACLCNT
++  /* This implementation should work on recent-enough versions of HP-UX,
++     Solaris, and Unixware.  */
++
+   if (! S_ISLNK (filestat->st_mode))
+     {
+       int n = acl (file, GETACLCNT, 0, NULL);
+       return n < 0 ? (errno == ENOSYS ? 0 : -1) : (MIN_ACL_ENTRIES < n);
+     }
++#elif HAVE_ACL_EXTENDED_FILE
++
++  /* Linux specific.  */
++
++  if (! S_ISLNK (filestat->st_mode))
++    {
++      int ret = acl_extended_file (file);
++      if (ret < 0)
++	return (errno == ENOSYS || errno == ENOTSUP) ? 0 : -1;
++      return ret;
++    }
++#else
++  /* FIXME: Add support for AIX, Irix, and Tru64, FreeBSD, etc.
++     Please see Samba's source/lib/sysacls.c file for fix-related ideas.  */
+ #endif
+ 
+   return 0;
+ }
++
++/* Copy the permissions from SRC_PATH to DST_PATH, including access control
++   lists on systems where this is supported. MODE is the file mode for
++   DST_PATH, including the file type.
++   Also sets special bits in MODE on DST_PATH.  */
++
++int
++copy_acl (char const *src_path, char const *dst_path, mode_t mode)
++{
++#if HAVE_ACL_GET_FILE && HAVE_ACL_SET_FILE && HAVE_ACL_FREE && \
++    HAVE_ACL_ENTRIES
++
++  /* Linux specific. Will work on all POSIX 1003.1e draft 17 (abandoned)
++     compliant systems if the acl_entries() function is implemented.  */
++
++  acl_t acl = acl_get_file (src_path, ACL_TYPE_ACCESS);
++  if (acl == NULL)
++    {
++      if (errno == ENOSYS || errno == ENOTSUP)
++	return set_acl (dst_path, mode);
++      else
++        {
++	  error (0, errno, "%s", quote (src_path));
++	  return -1;
++	}
++    }
++
++  if (acl_set_file (dst_path, ACL_TYPE_ACCESS, acl))
++    {
++      int saved_errno = errno;
++
++      if (errno == ENOSYS || errno == ENOTSUP)
++        {
++	  int n = acl_entries (acl);
++
++	  acl_free (acl);
++	  if (n == 3)
++	    {
++	      if (chmod (dst_path, mode))
++		saved_errno = errno;
++	      else
++		return 0;
++	    }
++	  else
++	    chmod (dst_path, mode);
++	}
++      else
++	{
++	  acl_free (acl);
++	  chmod (dst_path, mode);
++	}
++      error (0, saved_errno, _("preserving permissions for %s"),
++	     quote (dst_path));
++      return -1;
++    }
++  acl_free (acl);
++
++  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
 +    {
-+      if (set_acl (dst_name, x->mode) && x->require_preserve)
-+	return false;
++      /* We did not call chmod so far, so the special bits have not yet
++         been set.  */
++
++      if (chmod (dst_path, mode))
++	{
++	  error (0, errno, _("preserving permissions for %s"),
++	  	 quote (dst_path));
++	  return -1;
++	}
 +    }
-+  else if (dst_mode_valid)
++
++  if (S_ISDIR (mode))
 +    {
-+      if (chmod (dst_name, dst_mode))
-+        {
++      acl = acl_get_file (src_path, ACL_TYPE_DEFAULT);
++      if (acl == NULL)
++	{
++	  error (0, errno, "%s", quote (src_path));
++	  return -1;
++	}
++
++      if (acl_set_file (dst_path, ACL_TYPE_DEFAULT, acl))
++	{
 +	  error (0, errno, _("preserving permissions for %s"),
-+	         quote (dst_name));
-+	  if (x->require_preserve)
- 	    return false;
- 	}
-     }
---- coreutils-5.92/src/Makefile.am.acl	2005-09-29 11:28:37.000000000 +0100
-+++ coreutils-5.92/src/Makefile.am	2005-10-27 11:44:29.000000000 +0100
-@@ -50,9 +50,9 @@
- LDADD = ../lib/libcoreutils.a $(LIBINTL) ../lib/libcoreutils.a
- 
- # for eaccess in lib/euidaccess.c.
--cp_LDADD = $(LDADD) $(LIB_EACCESS)
--ginstall_LDADD = $(LDADD) $(LIB_EACCESS)
--mv_LDADD = $(LDADD) $(LIB_EACCESS)
-+cp_LDADD = $(LDADD) $(LIB_EACCESS) @LIBACL@
-+ginstall_LDADD = $(LDADD) $(LIB_EACCESS) @LIBACL@
-+mv_LDADD = $(LDADD) $(LIB_EACCESS) @LIBACL@
- pathchk_LDADD = $(LDADD) $(LIB_EACCESS)
- rm_LDADD = $(LDADD) $(LIB_EACCESS)
- test_LDADD = $(LDADD) $(LIB_EACCESS)
-@@ -61,11 +61,11 @@
- 
- # for clock_gettime and fdatasync
- dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC)
--dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
--ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
-+dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBACL@
-+ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBACL@
- pr_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
- shred_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC)
--vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
-+vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBACL@
- 
- ## If necessary, add -lm to resolve use of pow in lib/strtod.c.
- sort_LDADD = $(LDADD) $(POW_LIB)
---- coreutils-5.92/configure.ac.acl	2005-10-22 19:12:36.000000000 +0100
-+++ coreutils-5.92/configure.ac	2005-10-27 11:44:30.000000000 +0100
-@@ -251,6 +251,8 @@
- AM_GNU_GETTEXT([external], [need-ngettext])
- AM_GNU_GETTEXT_VERSION(0.13.1)
- 
-+ag_POSIX_ACL
++		 quote (dst_path));
++	  acl_free(acl);
++	  return -1;
++	}
++      else
++        acl_free(acl);
++    }
++  return 0;
++#else
++  int ret = chmod (dst_path, mode);
++  if (ret)
++    error (0, errno, _("preserving permissions for %s"), quote (dst_path));
++  return ret;
++#endif
++}
 +
- AC_CONFIG_FILES(
-   Makefile
-   doc/Makefile
---- coreutils-5.92/config.hin.acl	2005-10-22 19:14:08.000000000 +0100
-+++ coreutils-5.92/config.hin	2005-10-27 11:44:30.000000000 +0100
-@@ -101,6 +101,30 @@
- /* Define to 1 if you have the `acl' function. */
- #undef HAVE_ACL
- 
-+/* Define to 1 if you have the `acl_delete_def_file' function. */
-+#undef HAVE_ACL_DELETE_DEF_FILE
++/* Set the permissions of PATH, overwriting access control lists, on systems
++   where this is supported. MODE is the file mode for PATH, including the
++   file type. Also sets special bits in MODE on PATH.  */
 +
-+/* Define to 1 if you have the `acl_entries' function. */
-+#undef HAVE_ACL_ENTRIES
++int
++set_acl (char const *path, mode_t mode)
++{
++#if HAVE_ACL_FROM_TEXT && HAVE_ACL_SET_FILE && HAVE_ACL_FREE && \
++       HAVE_ACL_DELETE_DEF_FILE
++  char acl_text[] = "u::---,g::---,o::---";
++  acl_t acl;
 +
-+/* Define to 1 if you have the `acl_extended_file' function. */
-+#undef HAVE_ACL_EXTENDED_FILE
++  if (mode & S_IRUSR) acl_text[ 3] = 'r';
++  if (mode & S_IWUSR) acl_text[ 4] = 'w';
++  if (mode & S_IXUSR) acl_text[ 5] = 'x';
++  if (mode & S_IRGRP) acl_text[10] = 'r';
++  if (mode & S_IWGRP) acl_text[11] = 'w';
++  if (mode & S_IXGRP) acl_text[12] = 'x';
++  if (mode & S_IROTH) acl_text[17] = 'r';
++  if (mode & S_IWOTH) acl_text[18] = 'w';
++  if (mode & S_IXOTH) acl_text[19] = 'x';
 +
-+/* Define to 1 if you have the `acl_free' function. */
-+#undef HAVE_ACL_FREE
++  acl = acl_from_text(acl_text);
++  if (!acl)
++    {
++      error (0, errno, "%s", quote (path));
++      return -1;
++    }
 +
-+/* Define to 1 if you have the `acl_from_text' function. */
-+#undef HAVE_ACL_FROM_TEXT
++  if (acl_set_file(path, ACL_TYPE_ACCESS, acl))
++    {
++      int saved_errno = errno;
++      acl_free (acl);
 +
-+/* Define to 1 if you have the `acl_get_file' function. */
-+#undef HAVE_ACL_GET_FILE
++      if (errno == ENOTSUP || errno == ENOSYS)
++	{
++	  if (chmod (path, mode))
++	    saved_errno = errno;
++	  else
++	    return 0;
++	}
++      error (0, saved_errno, _("setting permissions for %s"), quote (path));
++      return -1;
++    }
++  acl_free (acl);
 +
-+/* Define to 1 if you have the `acl_set_file' function. */
-+#undef HAVE_ACL_SET_FILE
++  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
++    {
++      /* We did not call chmod so far, so the special bits have not yet
++         been set.  */
 +
-+/* Define to 1 if you have the `acl_to_text' function. */
-+#undef HAVE_ACL_TO_TEXT
++      if (chmod (path, mode))
++	{
++	  error (0, errno, _("preserving permissions for %s"),
++	  	 quote (path));
++	  return -1;
++	}
++    }
 +
- /* Define to 1 if you have the `alarm' function. */
- #undef HAVE_ALARM
- 
-@@ -589,6 +613,9 @@
- /* Define to 1 if you have the `lchown' function. */
- #undef HAVE_LCHOWN
- 
-+/* Define to 1 if you have the `acl' library (-lacl). */
-+#undef HAVE_LIBACL
++  if (S_ISDIR (mode) && acl_delete_def_file (path))
++    {
++      error (0, errno, _("setting permissions for %s"), quote (path));
++      return -1;
++    }
++  return 0;
++#else
++  int ret = chmod (path, mode);
++  if (ret)
++    error (0, errno, _("setting permissions for %s"), quote (path));
++  return ret;
++#endif
++}
 +
- /* Define to 1 if you have the `dgc' library (-ldgc). */
- #undef HAVE_LIBDGC
- 
-@@ -1496,6 +1523,9 @@
-    safe for multithreaded apps. */
- #undef USE_UNLOCKED_IO
+--- coreutils-5.97/lib/acl.h.acl	2005-05-14 08:58:06.000000000 +0100
++++ coreutils-5.97/lib/acl.h	2006-08-24 14:14:13.000000000 +0100
+@@ -18,11 +18,16 @@
  
-+/* Define if you want access control list support. */
-+#undef USE_ACL
-+
- /* Version number of package */
- #undef VERSION
+    Written by Paul Eggert.  */
  
---- coreutils-5.92/NEWS.acl	2005-10-22 19:11:56.000000000 +0100
-+++ coreutils-5.92/NEWS	2005-10-27 11:44:30.000000000 +0100
-@@ -1,3 +1,6 @@
-+[4.5.3acl]
-+* ACL framework and Linux ACL support.
-+* `cp -p' and `mv' now preserve ACLs
- GNU coreutils NEWS                                    -*- outline -*-
+-#if HAVE_SYS_ACL_H && HAVE_ACL
++#if HAVE_SYS_ACL_H
+ # include <sys/acl.h>
+ #endif
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
+ #if ! defined GETACLCNT && defined ACL_CNT
+ # define GETACLCNT ACL_CNT
+ #endif
  
- * Major changes in release 5.92 (2005-10-22) [stable]
---- coreutils-5.92/ChangeLog.acl	2005-10-22 19:12:51.000000000 +0100
-+++ coreutils-5.92/ChangeLog	2005-10-27 11:44:30.000000000 +0100
-@@ -0,0 +1,45 @@
-+2002-07-01  Bernhard Rosenkraenzer <bero at bero.org>
-+	* Port the following patch to 4.1.9:
-+
-+2002-04-10  Andreas Gruenbacher  <a.gruenbacher at computer.org>
-+
-+	* Version 4.1.8acl.
-+
-+	* src/copy.c (get_dest_mode): Remove.
-+	* src/copy.c (copy_internal): Merge src_mode and src_type.
-+	* src/copy.c (copy_internal): Add dst_mode and dst_mode_valid,
-+	which are set when the destination file mode is changed temporarily.
-+	* src/copy.c (copy_internal): Check effective permissions after
-+	mkdir(). Add S_IRWXU only after saving the default permissions, so
-+	the default permissions can be restored. This is needed with
-+	default ACLs on some systems.
-+	* src/copy.c (copy_internal): Use dst_mode and dst_mode_valid for
-+	ran_chown. Save the current permissions if needed before chown().
-+	* src/copy.c (copy_internal): Clean up the final permission setting
-+	code and prepare for copy/set ACL support.
-+	* src/cp.c, src/install.c, src/mv.c, src/copy.h: Remove umask_kill,
-+	and never change the startup umask. The functions creating files need
-+	the original umask to be active to create the correct permissions
-+	inside directories with default ACLs; umask_kill no longer works.
-+	* src/cp.c (struct dir_attr, re_protect, make_path_private): Remove
-+	is_new_dir and add mode and mode_valid instead.
-+	* src/cp.c (make_path_private): Remove the mode parameter. Pass in
-+	cp_options, instead of cp_options->xstat only. Stat the source dir,
-+	and create the destination dir with the source dir's mode as create
-+	mode (see analog change to src/copy.c (copy_internal)). Check if the
-+	effective permissions include S_IRWXU. Remember the original code only
-+	if needed later.
-+	* lib/acl.h, lib/acl.c (copy_acl, set_acl): Add these functions,
-+	initially with the bare non-ACL functionality.
-+	* src/copy.c (copy_internal): Use copy_acl and set_acl instead of chmod.
-+	* src/cp.c (re_protect): Use copy_acl instead of chmod.
-+	* m4/posix_acl.m4, configure.ac (ag_POSIX_ACL): Add POSIX ACL tests.
-+	* lib/acl.h: Remove HAVE_ACL symbol; <sys/acl.h> is needed for POSIX
-+	ACLs even if there is no acl system call.
-+	* lib/acl.c (ENOTSUP): Provide default value.
-+	* lib/acl.c (file_has_acl, copy_acl, set_acl): Add Linux ACL
-+	implementations.
-+	* src/ls.c: change `HAVE_ACL' to `HAVE_ACL || USE_ACL' for POSIX ACLs:
-+	there is no acl system call for POSIX ACLs.
-+	* tests/misc: Add my own small test suite so it doesn't get lost.
-+
+ int file_has_acl (char const *, struct stat const *);
++int copy_acl (char const *, char const *, mode_t);
++int set_acl (char const *, mode_t);


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- coreutils.spec	23 Aug 2006 09:56:42 -0000	1.134
+++ coreutils.spec	24 Aug 2006 15:53:08 -0000	1.135
@@ -280,6 +280,9 @@
 /sbin/runuser
 
 %changelog
+* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed warnings in acl patch (bug #203166).
+
 * Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com> 5.97-8
 - Don't chdir until after PAM bits in su (bug #197659).
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 15:56:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 11:56:53 -0400
Subject: rpms/coreutils/devel coreutils-selinux.patch, 1.23,
	1.24 coreutils.spec, 1.135, 1.136
Message-ID: <200608241556.k7OFur57030038@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29975

Modified Files:
	coreutils-selinux.patch coreutils.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
- Fixed warnings in selinux patch (bug #203166).

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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- coreutils-selinux.patch	22 Jun 2006 22:41:57 -0000	1.23
+++ coreutils-selinux.patch	24 Aug 2006 15:56:50 -0000	1.24
@@ -1863,7 +1863,7 @@
 +  if(secure)
 +    if (getfilecon(filename,&scontext)<0) {
 +      perror (filename);
-+      return;
++      return false;
 +    }
 +#endif
  
@@ -2079,7 +2079,7 @@
  \n\
  "), stdout);
 +#ifdef WITH_SELINUX
-+      printf (_("\
++      fputs (_("\
 +  -Z, --context=CONTEXT   set security context (quoted string)\n\
 +"), stdout);
 +#endif


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- coreutils.spec	24 Aug 2006 15:53:08 -0000	1.135
+++ coreutils.spec	24 Aug 2006 15:56:51 -0000	1.136
@@ -281,6 +281,7 @@
 
 %changelog
 * Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed warnings in selinux patch (bug #203166).
 - Fixed warnings in acl patch (bug #203166).
 
 * Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com> 5.97-8



From fedora-cvs-commits at redhat.com  Thu Aug 24 15:59:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 11:59:34 -0400
Subject: rpms/coreutils/devel coreutils-4.5.3-sysinfo.patch, 1.3,
	1.4 coreutils.spec, 1.136, 1.137
Message-ID: <200608241559.k7OFxY30031079@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31041

Modified Files:
	coreutils-4.5.3-sysinfo.patch coreutils.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
- Fixed warnings in sysinfo patch (bug #203166).

coreutils-4.5.3-sysinfo.patch:
 uname.c |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletion(-)

Index: coreutils-4.5.3-sysinfo.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-4.5.3-sysinfo.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coreutils-4.5.3-sysinfo.patch	5 Feb 2005 17:32:10 -0000	1.3
+++ coreutils-4.5.3-sysinfo.patch	24 Aug 2006 15:59:31 -0000	1.4
@@ -38,15 +38,6 @@
  #endif
  #ifdef UNAME_PROCESSOR
        if (element == unknown)
-@@ -262,7 +284,7 @@
- 
-   if (toprint & PRINT_HARDWARE_PLATFORM)
-     {
--      char const *element = unknown;
-+      char *element = unknown;
- #if HAVE_SYSINFO && defined SI_PLATFORM
-       {
- 	static char hardware_platform[257];
 @@ -270,6 +292,14 @@
  			  hardware_platform, sizeof hardware_platform))
  	  element = hardware_platform;


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- coreutils.spec	24 Aug 2006 15:56:51 -0000	1.136
+++ coreutils.spec	24 Aug 2006 15:59:31 -0000	1.137
@@ -281,6 +281,7 @@
 
 %changelog
 * Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed warnings in sysinfo patch (bug #203166).
 - Fixed warnings in selinux patch (bug #203166).
 - Fixed warnings in acl patch (bug #203166).
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 16:01:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 12:01:14 -0400
Subject: rpms/coreutils/devel coreutils-i18n.patch, 1.18, 1.19 coreutils.spec,
	1.137, 1.138
Message-ID: <200608241601.k7OG1E5x031587@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31532

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
- Fixed warnings in i18n patch (bug #203166).

coreutils-i18n.patch:
 coreutils-5.95/lib/linebuffer.h         |    8 
 coreutils-5.95/src/cut.c                |  420 +++++++++++++++++++-
 coreutils-5.95/src/expand.c             |  161 +++++++
 coreutils-5.95/src/fold.c               |  317 +++++++++++++--
 coreutils-5.95/src/join.c               |  348 ++++++++++++++--
 coreutils-5.95/src/pr.c                 |  431 ++++++++++++++++++--
 coreutils-5.95/src/unexpand.c           |  226 ++++++++++
 coreutils-5.95/src/uniq.c               |  259 ++++++++++++
 coreutils-5.95/tests/sort/Makefile.am   |    8 
 coreutils-5.95/tests/sort/Makefile.in   |   99 ++--
 coreutils-5.95/tests/sort/mb1.I         |    4 
 coreutils-5.95/tests/sort/mb1.X         |    4 
 coreutils-5.95/tests/sort/mb2.I         |    4 
 coreutils-5.95/tests/sort/mb2.X         |    4 
 coreutils-5.95/tests/sort/sort-mb-tests |   58 ++
 src/sort.c                              |  665 ++++++++++++++++++++++++++++++--
 16 files changed, 2781 insertions(+), 235 deletions(-)

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- coreutils-i18n.patch	15 Aug 2006 16:50:47 -0000	1.18
+++ coreutils-i18n.patch	24 Aug 2006 16:01:11 -0000	1.19
@@ -640,7 +640,7 @@
 +print_char_multi (char c)
 +{
 +  static size_t mbc_pos = 0;
-+  static unsigned char mbc[MB_LEN_MAX] = {'\0'};
++  static char mbc[MB_LEN_MAX] = {'\0'};
 +  static mbstate_t state = {'\0'};
 +  mbstate_t state_bak;
 +  wchar_t wc;
@@ -650,7 +650,7 @@
 +  if (tabify_output)
 +    {
 +      state_bak = state;
-+      mbc[mbc_pos++] = (unsigned char)c;
++      mbc[mbc_pos++] = c;
 +      mblength = mbrtowc (&wc, mbc, mbc_pos, &state);
 +
 +      while (mbc_pos > 0)


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- coreutils.spec	24 Aug 2006 15:59:31 -0000	1.137
+++ coreutils.spec	24 Aug 2006 16:01:11 -0000	1.138
@@ -281,6 +281,7 @@
 
 %changelog
 * Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed warnings in i18n patch (bug #203166).
 - Fixed warnings in sysinfo patch (bug #203166).
 - Fixed warnings in selinux patch (bug #203166).
 - Fixed warnings in acl patch (bug #203166).



From fedora-cvs-commits at redhat.com  Thu Aug 24 16:05:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 12:05:54 -0400
Subject: rpms/coreutils/devel coreutils-pam.patch, 1.8, 1.9 coreutils.spec,
	1.138, 1.139
Message-ID: <200608241605.k7OG5sxV032348@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32315

Modified Files:
	coreutils-pam.patch coreutils.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
- Fixed warnings in pam patch (bug #203166).

coreutils-pam.patch:
 config.hin         |    3 
 configure.ac       |    7 +
 doc/coreutils.texi |   34 +-------
 src/Makefile.am    |    2 
 src/su.c           |  224 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 234 insertions(+), 36 deletions(-)

Index: coreutils-pam.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-pam.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- coreutils-pam.patch	23 Aug 2006 09:56:42 -0000	1.8
+++ coreutils-pam.patch	24 Aug 2006 16:05:51 -0000	1.9
@@ -48,8 +48,8 @@
  @node Process control
  @chapter Process control
  
---- coreutils-5.97/src/su.c.pam	2006-08-23 10:45:26.000000000 +0100
-+++ coreutils-5.97/src/su.c	2006-08-23 10:45:33.000000000 +0100
+--- coreutils-5.97/src/su.c	2006-08-23 10:45:33.000000000 +0100
++++ coreutils-5.97/src/su.c	2006-08-24 17:04:48.000000000 +0100
 @@ -38,6 +38,16 @@
     restricts who can su to UID 0 accounts.  RMS considers that to
     be fascist.
@@ -108,7 +108,7 @@
  
  /* The name this program was run with.  */
  char *program_name;
-@@ -248,7 +274,22 @@
+@@ -248,7 +274,26 @@
  }
  #endif
  
@@ -124,6 +124,10 @@
 +  pam_end(pamh, PAM_SUCCESS); \
 +  return 0; \
 +}
++#define PAM_BAIL_P_VOID if (retval) {		\
++  pam_end(pamh, PAM_SUCCESS);			\
++return;						\
++}
 +#endif
 +
  /* Ask the user for a password.
@@ -131,7 +135,7 @@
     Return true if the user gives the correct password for entry PW,
     false if not.  Return true without asking for a password if run by UID 0
     or if PW has an empty password.  */
-@@ -256,6 +297,44 @@
+@@ -256,6 +301,44 @@
  static bool
  correct_password (const struct passwd *pw)
  {
@@ -176,7 +180,7 @@
    char *unencrypted, *encrypted, *correct;
  #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP
    /* Shadow passwd stuff for SVR3 and maybe other systems.  */
-@@ -280,6 +359,7 @@
+@@ -280,6 +363,7 @@
    encrypted = crypt (unencrypted, correct);
    memset (unencrypted, 0, strlen (unencrypted));
    return STREQ (encrypted, correct);
@@ -184,7 +188,7 @@
  }
  
  /* Update `environ' for the new shell based on PW, with SHELL being
-@@ -293,12 +373,18 @@
+@@ -293,12 +377,18 @@
        /* Leave TERM unchanged.  Set HOME, SHELL, USER, LOGNAME, PATH.
           Unset all other environment variables.  */
        char const *term = getenv ("TERM");
@@ -203,7 +207,7 @@
        xsetenv ("HOME", pw->pw_dir);
        xsetenv ("SHELL", shell);
        xsetenv ("USER", pw->pw_name);
-@@ -331,8 +417,13 @@
+@@ -331,8 +421,13 @@
  {
  #ifdef HAVE_INITGROUPS
    errno = 0;
@@ -218,7 +222,7 @@
    endgrent ();
  #endif
    if (setgid (pw->pw_gid))
-@@ -341,6 +432,31 @@
+@@ -341,6 +436,31 @@
      error (EXIT_FAIL, errno, _("cannot set user id"));
  }
  
@@ -250,7 +254,7 @@
  /* Run SHELL, or DEFAULT_SHELL if SHELL is empty.
     If COMMAND is nonzero, pass it to the shell with the -c option.
     Pass ADDITIONAL_ARGS to the shell as more arguments; there
-@@ -348,17 +464,49 @@
+@@ -348,17 +468,49 @@
  
  static void
  run_shell (char const *shell, char const *command, char **additional_args,
@@ -301,7 +305,7 @@
        shell_basename = base_name (shell);
        arg0 = xmalloc (strlen (shell_basename) + 2);
        arg0[0] = '-';
-@@ -383,6 +531,66 @@
+@@ -383,6 +535,66 @@
      error (0, errno, "%s", shell);
      exit (exit_status);
    }
@@ -354,9 +358,9 @@
 +  /* Not checking retval on this because we need to call close session */
 +  pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
 +  retval = pam_close_session(pamh, 0);
-+  PAM_BAIL_P;
++  PAM_BAIL_P_VOID;
 +  retval = pam_end(pamh, PAM_SUCCESS);
-+  PAM_BAIL_P;
++  PAM_BAIL_P_VOID;
 +  if (caught) {
 +    sleep(2);
 +    kill(child, SIGKILL);
@@ -368,9 +372,7 @@
  }
  
  /* Return true if SHELL is a restricted shell (one not returned by
-@@ -550,9 +758,9 @@
-   shell = xstrdup (shell ? shell : pw->pw_shell);
-   modify_environment (pw, shell);
+@@ -552,7 +764,7 @@
  
 +#ifndef USE_PAM
    change_identity (pw);


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- coreutils.spec	24 Aug 2006 16:01:11 -0000	1.138
+++ coreutils.spec	24 Aug 2006 16:05:51 -0000	1.139
@@ -281,6 +281,7 @@
 
 %changelog
 * Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed warnings in pam patch (bug #203166).
 - Fixed warnings in i18n patch (bug #203166).
 - Fixed warnings in sysinfo patch (bug #203166).
 - Fixed warnings in selinux patch (bug #203166).



From fedora-cvs-commits at redhat.com  Thu Aug 24 16:17:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 12:17:54 -0400
Subject: rpms/cups/devel cups.spec,1.254,1.255
Message-ID: <200608241617.k7OGHsHa005274@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4591

Modified Files:
	cups.spec 
Log Message:
1:1.2.2-17


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- cups.spec	24 Aug 2006 15:50:51 -0000	1.254
+++ cups.spec	24 Aug 2006 16:17:52 -0000	1.255
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 16
+Release: 17
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -420,7 +420,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
+* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-17
 - Fixed another LSPP patch problem (bug #203784).
 - Updated fix for STR #1881 from upstream.
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 16:18:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 12:18:49 -0400
Subject: rpms/cups/FC-5 cups-str1881.patch,1.2,1.3 cups.spec,1.211,1.212
Message-ID: <200608241618.k7OGInlK011686@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11139

Modified Files:
	cups-str1881.patch cups.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
- Updated fix for STR #1881 from upstream.


cups-str1881.patch:
 backend/ipp.c        |    3 +++
 scheduler/job.c      |   22 +++++++---------------
 scheduler/printers.c |   12 ++++++++----
 scheduler/printers.h |    1 +
 4 files changed, 19 insertions(+), 19 deletions(-)

Index: cups-str1881.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-str1881.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-str1881.patch	16 Aug 2006 09:14:46 -0000	1.2
+++ cups-str1881.patch	24 Aug 2006 16:18:46 -0000	1.3
@@ -1,5 +1,5 @@
---- cups-1.2.2/scheduler/job.c.str1881	2006-08-16 09:42:32.000000000 +0100
-+++ cups-1.2.2/scheduler/job.c	2006-08-16 09:43:26.000000000 +0100
+--- cups-1.2.2/scheduler/job.c.str1881	2006-08-24 16:05:14.000000000 +0100
++++ cups-1.2.2/scheduler/job.c	2006-08-24 16:05:46.000000000 +0100
 @@ -2425,7 +2425,6 @@
  					/* PRINTER env variable */
  			rip_max_cache[255];
@@ -45,17 +45,16 @@
    {
      for (i = 0; i < job->num_files; i ++)
      {
-@@ -3018,7 +3010,8 @@
-   envp[envc ++] = device_uri;
-   envp[envc ++] = printer_name;
- 
--  if ((filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
-+  if (!printer->remote &&
-+      (filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
+@@ -3022,7 +3014,7 @@
    {
      snprintf(final_content_type, sizeof(final_content_type),
               "FINAL_CONTENT_TYPE=%s/%s",
-@@ -3059,7 +3052,7 @@
+-	     filter->src->super, filter->src->type);
++	     filter->dst->super, filter->dst->type);
+     envp[envc ++] = final_content_type;
+   }
+ 
+@@ -3059,7 +3051,7 @@
        cupsdLogMessage(CUPSD_LOG_DEBUG, "[Job %d] envp[%d]=\"DEVICE_URI=%s\"",
                        job->id, i, sani_uri);
  
@@ -64,7 +63,7 @@
      job->current_file = job->num_files;
    else
      job->current_file ++;
-@@ -3401,7 +3394,7 @@
+@@ -3401,7 +3393,7 @@
  		  slot, filterfds[slot][0], filterfds[slot][1]);
    cupsdClosePipe(filterfds[slot]);
  
@@ -73,7 +72,7 @@
    {
      for (i = 0; i < job->num_files; i ++)
        free(argv[i + 6]);
-@@ -3445,7 +3438,7 @@
+@@ -3445,7 +3437,7 @@
  
    cupsArrayDelete(filters);
  
@@ -83,7 +82,7 @@
      for (i = 0; i < job->num_files; i ++)
        free(argv[i + 6]);
 --- cups-1.2.2/scheduler/printers.h.str1881	2006-03-23 21:07:20.000000000 +0000
-+++ cups-1.2.2/scheduler/printers.h	2006-08-16 09:42:48.000000000 +0100
++++ cups-1.2.2/scheduler/printers.h	2006-08-24 16:05:14.000000000 +0100
 @@ -66,6 +66,7 @@
    char		*device_uri;		/* Device URI */
    char		*port_monitor;		/* Port monitor */
@@ -92,8 +91,8 @@
    mime_type_t	*filetype;		/* Pseudo-filetype for printer */
    cups_array_t	*filetypes;		/* Supported file types */
    void		*job;			/* Current job in queue */
---- cups-1.2.2/scheduler/printers.c.str1881	2006-08-16 09:42:32.000000000 +0100
-+++ cups-1.2.2/scheduler/printers.c	2006-08-16 09:42:48.000000000 +0100
+--- cups-1.2.2/scheduler/printers.c.str1881	2006-08-24 16:05:14.000000000 +0100
++++ cups-1.2.2/scheduler/printers.c	2006-08-24 16:05:14.000000000 +0100
 @@ -1502,7 +1502,8 @@
      else
        snprintf(resource, sizeof(resource), "/printers/%s", p->name);
@@ -135,7 +134,7 @@
  	else
  	{
 --- cups-1.2.2/backend/ipp.c.str1881	2006-07-12 20:42:35.000000000 +0100
-+++ cups-1.2.2/backend/ipp.c	2006-08-16 09:42:48.000000000 +0100
++++ cups-1.2.2/backend/ipp.c	2006-08-24 16:05:14.000000000 +0100
 @@ -214,6 +214,9 @@
      if ((content_type = getenv("CONTENT_TYPE")) == NULL)
        content_type = "application/octet-stream";


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- cups.spec	18 Aug 2006 14:54:27 -0000	1.211
+++ cups.spec	24 Aug 2006 16:18:46 -0000	1.212
@@ -415,6 +415,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
+- Updated fix for STR #1881 from upstream.
+
 * Fri Aug 18 2006 Tim Waugh <twaugh at redhat.com>
 - Own notifier directory (bug #203085).
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 16:25:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 12:25:44 -0400
Subject: rpms/coreutils/devel coreutils-4.5.3-sysinfo.patch, 1.4,
	1.5 coreutils.spec, 1.139, 1.140
Message-ID: <200608241625.k7OGPiX9019605@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19567

Modified Files:
	coreutils-4.5.3-sysinfo.patch coreutils.spec 
Log Message:
5.97-9

coreutils-4.5.3-sysinfo.patch:
 uname.c |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)

Index: coreutils-4.5.3-sysinfo.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-4.5.3-sysinfo.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- coreutils-4.5.3-sysinfo.patch	24 Aug 2006 15:59:31 -0000	1.4
+++ coreutils-4.5.3-sysinfo.patch	24 Aug 2006 16:25:39 -0000	1.5
@@ -1,15 +1,23 @@
---- coreutils-4.5.3/src/uname.c.sysinfo	2002-08-31 09:52:11.000000000 +0100
-+++ coreutils-4.5.3/src/uname.c	2002-11-28 18:29:15.000000000 +0000
-@@ -232,7 +232,7 @@
-       if (toprint & PRINT_KERNEL_RELEASE)
- 	print_element (name.release);
-       if (toprint & PRINT_KERNEL_VERSION)
--	print_element (name.version);
-+	print_element (name.version);
-       if (toprint & PRINT_MACHINE)
- 	print_element (name.machine);
-     }
-@@ -246,6 +246,28 @@
+--- coreutils-5.97/src/uname.c.sysinfo	2005-09-15 20:57:04.000000000 +0100
++++ coreutils-5.97/src/uname.c	2006-08-24 17:15:56.000000000 +0100
+@@ -155,7 +155,7 @@
+ main (int argc, char **argv)
+ {
+   int c;
+-  static char const unknown[] = "unknown";
++  static char unknown[] = "unknown";
+ 
+   /* Mask indicating which elements to print. */
+   unsigned int toprint = 0;
+@@ -249,13 +249,35 @@
+ 
+   if (toprint & PRINT_PROCESSOR)
+     {
+-      char const *element = unknown;
++      char *element = unknown;
+ #if HAVE_SYSINFO && defined SI_ARCHITECTURE
+       {
+ 	static char processor[257];
  	if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
  	  element = processor;
        }
@@ -38,7 +46,16 @@
  #endif
  #ifdef UNAME_PROCESSOR
        if (element == unknown)
-@@ -270,6 +292,14 @@
+@@ -293,7 +315,7 @@
+ 
+   if (toprint & PRINT_HARDWARE_PLATFORM)
+     {
+-      char const *element = unknown;
++      char *element = unknown;
+ #if HAVE_SYSINFO && defined SI_PLATFORM
+       {
+ 	static char hardware_platform[257];
+@@ -301,6 +323,14 @@
  			  hardware_platform, sizeof hardware_platform))
  	  element = hardware_platform;
        }


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- coreutils.spec	24 Aug 2006 16:05:51 -0000	1.139
+++ coreutils.spec	24 Aug 2006 16:25:40 -0000	1.140
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 8
+Release: 9
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -280,12 +280,8 @@
 /sbin/runuser
 
 %changelog
-* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
-- Fixed warnings in pam patch (bug #203166).
-- Fixed warnings in i18n patch (bug #203166).
-- Fixed warnings in sysinfo patch (bug #203166).
-- Fixed warnings in selinux patch (bug #203166).
-- Fixed warnings in acl patch (bug #203166).
+* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 5.97-9
+- Fixed warnings in pam, i18n, sysinfo, selinux and acl patches (bug #203166).
 
 * Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com> 5.97-8
 - Don't chdir until after PAM bits in su (bug #197659).



From fedora-cvs-commits at redhat.com  Thu Aug 24 16:48:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 12:48:39 -0400
Subject: rpms/perl-DBI/devel .cvsignore, 1.15, 1.16 perl-DBI.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <200608241648.k7OGmdvM031388@cvs.devel.redhat.com>

Author: rnorwood

Update of /cvs/dist/rpms/perl-DBI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31341

Modified Files:
	.cvsignore perl-DBI.spec sources 
Log Message:
bugzilla: 202310 - bump version of perl-DBI to 1.52 - fixes some memory leaks, etc.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	17 Jul 2006 18:44:40 -0000	1.15
+++ .cvsignore	24 Aug 2006 16:48:37 -0000	1.16
@@ -1,3 +1,4 @@
 DBI-1.48.tar.gz
 DBI-1.50.tar.gz
 DBI-1.51.tar.gz
+DBI-1.52.tar.gz


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- perl-DBI.spec	19 Jul 2006 22:58:56 -0000	1.28
+++ perl-DBI.spec	24 Aug 2006 16:48:37 -0000	1.29
@@ -1,5 +1,5 @@
 Name:           perl-DBI
-Version:        1.51
+Version:        1.52
 Release: 	1%{?dist}
 Summary:        A database access API for perl
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Aug 24 2006 Robin Norwood <rnorwood at redhat.com> - 1.52-1
+- Upgrade to 1.52 for bug #202310
+	
 * Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 1.51-1
 - Upgrade to 1.51
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Jul 2006 18:44:40 -0000	1.15
+++ sources	24 Aug 2006 16:48:37 -0000	1.16
@@ -1 +1 @@
-d2ecc92395c4ab8221bac2866afbae04  DBI-1.51.tar.gz
+57208ef6dccb3e72cf2df665983ce313  DBI-1.52.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 24 17:18:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 13:18:49 -0400
Subject: rpms/perl-DBI/FC-5 .cvsignore, 1.15, 1.16 perl-DBI.spec, 1.26,
	1.27 sources, 1.15, 1.16
Message-ID: <200608241718.k7OHIn4e030608@cvs.devel.redhat.com>

Author: rnorwood

Update of /cvs/dist/rpms/perl-DBI/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30583

Modified Files:
	.cvsignore perl-DBI.spec sources 
Log Message:
bugzilla: 202310 - bump version of perl-DBI to 1.52 - fixes some memory leaks, etc.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/FC-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	17 Jul 2006 19:24:21 -0000	1.15
+++ .cvsignore	24 Aug 2006 17:18:46 -0000	1.16
@@ -1,3 +1,4 @@
 DBI-1.48.tar.gz
 DBI-1.50.tar.gz
 DBI-1.51.tar.gz
+DBI-1.52.tar.gz


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/FC-5/perl-DBI.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- perl-DBI.spec	19 Jul 2006 23:00:26 -0000	1.26
+++ perl-DBI.spec	24 Aug 2006 17:18:46 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           perl-DBI
-Version:        1.51
+Version:        1.52
 Release: 	1%{?dist}
 Summary:        A database access API for perl
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Aug 24 2006 Robin Norwood <rnorwood at redhat.com> - 1.52-1
+- Upgrade to 1.52 for bug #202310
+	
 * Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 1.51-1
 - Upgrade to 1.51
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Jul 2006 19:24:21 -0000	1.15
+++ sources	24 Aug 2006 17:18:46 -0000	1.16
@@ -1 +1 @@
-d2ecc92395c4ab8221bac2866afbae04  DBI-1.51.tar.gz
+57208ef6dccb3e72cf2df665983ce313  DBI-1.52.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 24 18:11:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 14:11:18 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.105, 1.106 libsepol.spec, 1.138,
	1.139 sources, 1.106, 1.107
Message-ID: <200608241811.k7OIBI0E028545@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28502

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 1.12.25-1
- Upgrade to latest from NSA
	* Merged conditionally expand neverallows patch from Jeremy Mowery.
	* Merged refactor expander patch from Jeremy Mowery.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- .cvsignore	3 Aug 2006 20:26:10 -0000	1.105
+++ .cvsignore	24 Aug 2006 18:11:02 -0000	1.106
@@ -105,3 +105,4 @@
 libsepol-1.12.21.tgz
 libsepol-1.12.23.tgz
 libsepol-1.12.24.tgz
+libsepol-1.12.25.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- libsepol.spec	3 Aug 2006 20:26:10 -0000	1.138
+++ libsepol.spec	24 Aug 2006 18:11:02 -0000	1.139
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.12.24
+Version: 1.12.25
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -85,6 +85,11 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 1.12.25-1
+- Upgrade to latest from NSA
+	* Merged conditionally expand neverallows patch from Jeremy Mowery.
+	* Merged refactor expander patch from Jeremy Mowery.
+
 * Thu Aug 3 2006 Dan Walsh <dwalsh at redhat.com> 1.12.24-1
 - Upgrade to latest from NSA
 	* Merged libsepol unit tests from Joshua Brindle.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sources	3 Aug 2006 20:26:10 -0000	1.106
+++ sources	24 Aug 2006 18:11:15 -0000	1.107
@@ -1 +1 @@
-316bf9a44eafa3345afd7af90e1b36e4  libsepol-1.12.24.tgz
+956442e4b83b0e3a2a32a84d499c92c8  libsepol-1.12.25.tgz



From fedora-cvs-commits at redhat.com  Thu Aug 24 18:30:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 14:30:48 -0400
Subject: rpms/xinetd/devel xinetd-2.3.14-label.patch, 1.1, 1.2 xinetd.spec,
	1.36, 1.37
Message-ID: <200608241830.k7OIUmrP023283@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/xinetd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23267

Modified Files:
	xinetd-2.3.14-label.patch xinetd.spec 
Log Message:
* Thu Aug 24 2006 Steve Grubb <sgrubb at redhat.com> 2:2.3.14-5
- Revised labeled networking patch


xinetd-2.3.14-label.patch:
 config.h.in            |    1 
 configure.in           |   28 ++++++++++++++++++++++++++
 xinetd/child.c         |   52 +++++++++++++++++++++++++++++++++++++++++++++++++
 xinetd/confparse.c     |   23 +++++++++++++++++++++
 xinetd/main.c          |    5 +++-
 xinetd/nvlists.c       |    1 
 xinetd/sconf.h         |    2 +
 xinetd/xinetd.conf.man |    3 ++
 8 files changed, 114 insertions(+), 1 deletion(-)

Index: xinetd-2.3.14-label.patch
===================================================================
RCS file: /cvs/dist/rpms/xinetd/devel/xinetd-2.3.14-label.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinetd-2.3.14-label.patch	23 Aug 2006 22:17:33 -0000	1.1
+++ xinetd-2.3.14-label.patch	24 Aug 2006 18:30:45 -0000	1.2
@@ -1,6 +1,6 @@
 diff -urNp xinetd-2.3.14.orig/config.h.in xinetd-2.3.14/config.h.in
 --- xinetd-2.3.14.orig/config.h.in	2006-06-16 13:20:01.000000000 -0400
-+++ xinetd-2.3.14/config.h.in	2006-08-23 17:26:04.000000000 -0400
++++ xinetd-2.3.14/config.h.in	2006-08-24 14:20:38.000000000 -0400
 @@ -112,6 +112,7 @@
  /* Options */
  #undef HAVE_LIBWRAP
@@ -11,7 +11,7 @@
  
 diff -urNp xinetd-2.3.14.orig/configure.in xinetd-2.3.14/configure.in
 --- xinetd-2.3.14.orig/configure.in	2006-06-16 13:20:01.000000000 -0400
-+++ xinetd-2.3.14/configure.in	2006-08-23 17:26:04.000000000 -0400
++++ xinetd-2.3.14/configure.in	2006-08-24 14:20:38.000000000 -0400
 @@ -289,6 +289,34 @@ AC_ARG_WITH(libwrap,
  	AC_MSG_RESULT(no)
  )
@@ -49,7 +49,7 @@
  AC_CHECK_FUNCS(isatty)
 diff -urNp xinetd-2.3.14.orig/xinetd/child.c xinetd-2.3.14/xinetd/child.c
 --- xinetd-2.3.14.orig/xinetd/child.c	2006-06-16 13:20:01.000000000 -0400
-+++ xinetd-2.3.14/xinetd/child.c	2006-08-23 17:27:22.000000000 -0400
++++ xinetd-2.3.14/xinetd/child.c	2006-08-24 14:25:39.000000000 -0400
 @@ -31,6 +31,9 @@
  #ifdef HAVE_NETDB_H
  #include <netdb.h>
@@ -66,7 +66,7 @@
  
 +/* Local declarations */
 +#ifdef LABELED_NET
-+static int set_exec_context_from_socket( int fd );
++static int set_context_from_socket( int fd );
 +#endif
 +
 +
@@ -83,9 +83,9 @@
 +#ifdef LABELED_NET
 +   if (SC_LABELED_NET(scp))
 +   {
-+      if (set_exec_context_from_socket( descriptor ) < 0)
++      if (set_context_from_socket( descriptor ) < 0)
 +         msg( LOG_ERR, func,
-+             "Changing process context failed for %s", SC_NAME( scp )) ;
++             "Changing process context failed for %s", SC_ID( scp )) ;
 +         _exit( 1 ) ;
 +   }
 +#endif
@@ -93,60 +93,76 @@
     (void) Sclose( descriptor ) ;
  
  #ifndef solaris
-@@ -461,3 +483,50 @@ void child_exit(void)
+@@ -461,3 +483,33 @@ void child_exit(void)
     }
  }
  
 +#ifdef LABELED_NET
-+static int get_context_from_socket(int fd, char *buffer, unsigned int *buflen)
++static int set_context_from_socket( int fd )
 +{
-+   const char *func = "get_context_from_socket" ;
++   const char *func = "set_context_from_socket" ;
++   security_context_t peer_context;
 +
-+   int retval = getsockopt(fd, SOL_SOCKET, SO_PEERSEC, buffer, buflen);
-+   
-+   if ( debug.on )
-+   {
-+     if (retval)
-+	msg( LOG_DEBUG, func, 
-+	     "error getting context of fd %d: %s", fd, strerror(errno));
-+     else
-+	msg( LOG_DEBUG, func, 
-+	     "got context for fd %d: %s", fd, buffer);
-+   }
-+     
-+   return retval;
-+}
-+
-+static int set_exec_context_from_socket( int fd )
-+{
-+   const char *func = "set_exec_context_from_socket" ;
-+
-+   char buffer[255];
-+   unsigned int buflen = 255;
-+
-+   if (get_context_from_socket(fd, buffer, &buflen))
++   if (getpeercon(fd, &peer_context) < 0)
 +      return -1;
 +
-+   int retval = setexeccon(buffer);
++   int retval = setexeccon(peer_context);
++   freecon( peer_context );
 +
 +   if (debug.on)
 +   {
 +      security_context_t current_exec_context;
-+      getexeccon( &current_exec_context );
++      if ( getexeccon( &current_exec_context ) == 0 ) {
 +
-+      msg( LOG_DEBUG, func, 
++         msg( LOG_DEBUG, func, 
 +	   "current security exec context now: %s", 
-+	   current_exec_context);
++	   current_exec_context ? current_exec_context : "unknown" );
 +
-+      freecon( current_exec_context );
++         freecon( current_exec_context );
++      } 
++      else
++         msg( LOG_DEBUG, func, "Error calling getexeccon: %m" );
 +   }
 +
 +   return retval;
 +}
 +#endif
+diff -urNp xinetd-2.3.14.orig/xinetd/confparse.c xinetd-2.3.14/xinetd/confparse.c
+--- xinetd-2.3.14.orig/xinetd/confparse.c	2006-06-16 13:20:01.000000000 -0400
++++ xinetd-2.3.14/xinetd/confparse.c	2006-08-24 14:20:38.000000000 -0400
+@@ -697,6 +697,29 @@ static status_e check_entry( struct serv
+          return( FAILED ) ;
+    }
+ 
++#ifdef LABELED_NET
++      if (SC_LABELED_NET(scp)) {
++         if ( SC_IS_INTERNAL( scp ) ) {
++            msg( LOG_ERR, func,
++               "Internal services cannot support labeled networking: %s",
++               SC_ID(scp) ) ;
++            return( FAILED ) ;
++         }
++         if ( SC_SOCKET_TYPE(scp) != SOCK_STREAM ) {
++            msg( LOG_ERR, func,
++               "Non-stream socket types cannot support labeled networking: %s",
++               SC_ID(scp) ) ;
++            return( FAILED ) ;
++         }
++         if ( SC_WAITS( scp ) ) {
++            msg( LOG_ERR, func,
++               "Tcp wait services cannot support labeled networking: %s",
++               SC_ID(scp) ) ;
++            return( FAILED ) ;
++         }
++      }
++#endif
++
+    if ( SC_IS_MUXCLIENT( scp ) ) 
+    {
+ 	   if ( !SC_IS_UNLISTED( scp ) )
 diff -urNp xinetd-2.3.14.orig/xinetd/main.c xinetd-2.3.14/xinetd/main.c
 --- xinetd-2.3.14.orig/xinetd/main.c	2006-06-16 13:20:01.000000000 -0400
-+++ xinetd-2.3.14/xinetd/main.c	2006-08-23 17:26:04.000000000 -0400
++++ xinetd-2.3.14/xinetd/main.c	2006-08-24 14:20:38.000000000 -0400
 @@ -80,7 +80,10 @@ int main( int argc, char *argv[] )
  #ifdef HAVE_DNSREGISTRATION
     "rendezvous "
@@ -161,7 +177,7 @@
     "options compiled in."
 diff -urNp xinetd-2.3.14.orig/xinetd/nvlists.c xinetd-2.3.14/xinetd/nvlists.c
 --- xinetd-2.3.14.orig/xinetd/nvlists.c	2006-06-16 13:20:01.000000000 -0400
-+++ xinetd-2.3.14/xinetd/nvlists.c	2006-08-23 17:26:04.000000000 -0400
++++ xinetd-2.3.14/xinetd/nvlists.c	2006-08-24 14:20:38.000000000 -0400
 @@ -47,6 +47,7 @@ const struct name_value service_flags[] 
        { "SENSOR",                     SF_SENSOR              },
        { "IPv4",                       SF_IPV4                },
@@ -172,7 +188,7 @@
  
 diff -urNp xinetd-2.3.14.orig/xinetd/sconf.h xinetd-2.3.14/xinetd/sconf.h
 --- xinetd-2.3.14.orig/xinetd/sconf.h	2006-06-16 13:20:01.000000000 -0400
-+++ xinetd-2.3.14/xinetd/sconf.h	2006-08-23 17:26:04.000000000 -0400
++++ xinetd-2.3.14/xinetd/sconf.h	2006-08-24 14:20:38.000000000 -0400
 @@ -58,6 +58,7 @@
  #define SF_SENSOR       9
  #define SF_IPV4         10
@@ -191,13 +207,13 @@
  #define SC_IS_INTERNAL( scp )    ( M_IS_SET( (scp)->sc_type, ST_INTERNAL ) )
 diff -urNp xinetd-2.3.14.orig/xinetd/xinetd.conf.man xinetd-2.3.14/xinetd/xinetd.conf.man
 --- xinetd-2.3.14.orig/xinetd/xinetd.conf.man	2006-06-16 13:20:01.000000000 -0400
-+++ xinetd-2.3.14/xinetd/xinetd.conf.man	2006-08-23 17:26:04.000000000 -0400
++++ xinetd-2.3.14/xinetd/xinetd.conf.man	2006-08-24 14:20:38.000000000 -0400
 @@ -145,6 +145,9 @@ Sets the service to be an IPv4 service (
  .B IPv6
  Sets the service to be an IPv6 service (AF_INET6), if IPv6 is available on the system.
  .TP
 +.B LABELED
-+The LABELED flag will tell xinetd to change the child processes SE Linux context to match that of the incoming connection as it starts the service.
++The LABELED flag will tell xinetd to change the child processes SE Linux context to match that of the incoming connection as it starts the service. This only works for external tcp non-waiting servers and is an error if applied to an internal, udp, or tcp-wait server.
 +.TP
  .B REUSE
  The REUSE flag is deprecated.  All services now implicitly use the REUSE flag.


Index: xinetd.spec
===================================================================
RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xinetd.spec	24 Aug 2006 00:14:28 -0000	1.36
+++ xinetd.spec	24 Aug 2006 18:30:45 -0000	1.37
@@ -4,7 +4,7 @@
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.14
-Release: 4
+Release: 5
 License: Distributable (BSD-like)
 Group: System Environment/Daemons
 Epoch: 2
@@ -102,6 +102,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Aug 24 2006 Steve Grubb <sgrubb at redhat.com> 2:2.3.14-5
+- Revised labeled networking patch
+
 * Wed Aug 23 2006 Steve Grubb <sgrubb at redhat.com> 2:2.3.14-4
 - Added labeled networking patch
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 18:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 14:37:20 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.117, 1.118 libselinux.spec,
	1.220, 1.221 sources, 1.119, 1.120
Message-ID: <200608241837.k7OIbKlv023471@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23457

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.27-1
- Upgrade to latest from NSA
	* Merged patch to not log avc stats upon a reset from Steve Grubb.
	* Applied patch to revert compat_net setting upon policy load.
	* Merged file context homedir and local path functions from
	  Chris PeBenito.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- .cvsignore	12 Aug 2006 11:21:11 -0000	1.117
+++ .cvsignore	24 Aug 2006 18:37:17 -0000	1.118
@@ -92,3 +92,4 @@
 libselinux-1.30.22.tgz
 libselinux-1.30.24.tgz
 libselinux-1.30.26.tgz
+libselinux-1.30.27.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- libselinux.spec	18 Aug 2006 20:14:02 -0000	1.220
+++ libselinux.spec	24 Aug 2006 18:37:17 -0000	1.221
@@ -1,8 +1,8 @@
-%define libsepolver 1.12.21-1
+%define libsepolver 1.12.25-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.26
-Release: 2
+Version: 1.30.27
+Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -116,6 +116,13 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.27-1
+- Upgrade to latest from NSA
+	* Merged patch to not log avc stats upon a reset from Steve Grubb.
+	* Applied patch to revert compat_net setting upon policy load.
+	* Merged file context homedir and local path functions from
+	  Chris PeBenito.
+
 * Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 1.20.26-2
 - rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
   (#203001)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- sources	12 Aug 2006 11:21:11 -0000	1.119
+++ sources	24 Aug 2006 18:37:18 -0000	1.120
@@ -1 +1 @@
-ebee2528a1faa81597eea074c167ce04  libselinux-1.30.26.tgz
+699c8de04ef4021b726fc4603034e30f  libselinux-1.30.27.tgz



From fedora-cvs-commits at redhat.com  Thu Aug 24 19:34:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 15:34:45 -0400
Subject: rpms/kernel/FC-5 patch-2.6.17.11.bz2, NONE,
	1.1 patch-2.6.17.11.bz2.sign, NONE, 1.1 kernel-2.6.spec,
	1.2179, 1.2180 patch-2.6.17.10.bz2.sign, 1.1, NONE
Message-ID: <200608241934.k7OJYjgE014879@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14847

Modified Files:
	kernel-2.6.spec 
Added Files:
	patch-2.6.17.11.bz2 patch-2.6.17.11.bz2.sign 
Removed Files:
	patch-2.6.17.10.bz2.sign 
Log Message:
It compiles! Bump to 2.6.17.11...


--- NEW FILE patch-2.6.17.11.bz2 ---
BZh91AY&SY????
,m??{?9??n?n`????f?Y??m|????;??]5]?????W`???5??????z:?0?m????sFZ?h?7sq
z???VA?Ed$?#`??i%""ve

?D???cIE-?!X??J)?????R?""????R??mF?,mJZ1???lB?JQDJ?kZ
?k?%??-B????[m[DcUZQ%%m*??5?~\??c
???J?[4??,e?K???c4??-j?%)DZUR?m?d???lH?)[il?m??aV ?j?Wp????8?#DT???s(??YiL.?\L?2??????s???50vb???	????x??G?-jC?u?uOL??????8???+?,?@+)z?q?b0? ?
??c??R?? ?h?(6?R???0P??????j?1??",????-???)q*)Dq????X?Q?R?Q?3???J??C
R??EG+F??c?0??f\[?2?9??ih??????\L?3??b??(?????????9L???JS&72??Im??-l????\ai`?j50G2?2
d???"5?????0?????????fd`?`?f90??d.*???BX?"?nDd? ????????'v???kclc???Yr?5??hba???6??????)m?p.T?U??1)????e1+?LB?aV?U?P?1?\???t???4?E???)???Q ?2X$?J???tSFX#???`????J?s*V??)g??m????3??????(?L?????????c'y?+g?}????	?{???????<?
??my?\?p?(\V?*XH?P?(?
e?Q??N?X?+m??L??V?????#??f5?X ?1???-*?d??.k0??32????@D??h??D???a?I?0???-??? ??XU??3
c?K?????2?i?e.`&\q0???`???W.9?e??e?2d?)Y?0-S.aFZR4?U,??0e3??Q0PU&&3????h?J9?W"?KAU?d? ?????s?????(?Q,?b???B?DH?,Xc#?Z?P
?????)??T[]?(?d?H,????)??G?L.`?!Z1???*????b??R????+?\??
9???H?lO??,??T.eS
??
?*??k5ELf"????????R????c?3ec?f[?0?G
1?(e9?V-?aG)re??L?`2?32??fb??d
L???Q???2Ld?13"???%e?-*?ffR??q(??????P?w??.?G???G?????????2B?F??????4??????>??
R???????
<T`?????????\????,?r?????T!	?+K6????+9?YM????????yY??????Ek?s>\?.??=|{3???Fc???:?'?y?O?1R?G<~??"?????W???s??L\??K???16???????[????iGe????>zM?e(???1????<?)?6i??<?7????P????*??2??<?L?????<?~?oZ?mK?=?_????;7;wkuh?????=?)?Y?<[?????>?l?S???I??>???O:ca\???<-???~??Mq?2?g?~[?b???????&Q?T|??||???????5??V6?>	?oL????D????z7?e=ySk??2_W???+?g?>?ZUSn|??,???{?c\zFWS????B*2???)/lf*;?.d??o?av???s?????R<y?m?'???G??h?t?#6??6(??=?3{?(46?c*gK.???"?T?x)???l6??hB???H????(?l???$?2???m?3?/??R??????'{_????<?{#]???Y??$r\???5??=??j???=jF????????????IZ?l7r???b????k
??j-Zl
"?o?????u+?|?)??	q?,QAE??:?c??????T(?+??<?a?????F_:?????????x??9?eP;?&???k?????????????^????lmG_z?[?t?C`???????
?E?????? l???e4a??J~????n??????!?????
?{??Z?zvu????
F[+??a??5?M????????frp>???W???`U???&P?H?1?1?0?.????}?g???f??????O??52/?3?f7uu`???%9?9?'???2~w??zd?????r?\%mB_?1/?0???nTL??k.?B\???
????_)QU-???n	?y?TU???X??4????q1K*??P????A.f?X6aJ??????????N?T?V?bBPZTEH?z??o??????3tO?|H'	6UQ*?T?_+?.??*???F{2??#????_?'???\l??g?????N??>?????"???<?}??Z??
??B+*

dLP??C@??y[? ???g?????g?gKb????u?:?G=?Y????@/RW?cT???
?z?u(?g4?6??o?C?_??o????????J?B]??T\??r?n?A??!?:?????T??????){il??q:X);?	?UuU??Q*D_???a?,?%($?"Q?l??]?x??7???,p??6?#w??-?I?mkFpM??,????????NP? ??-J?Z
+?r?0?i??a??n:?a????????!?U???X?M?
FG??ql????~?????+??p? ???R*??p?=??ll???????l?es?_???F? ?zRC?3ja?}?R~? ????Z\???????????U4s?D?F???8?pA?9a%}?I??W?])??56z?????h?h0jG??\K?J?J????w??sT???;???r????x??I?=?r??_C?8??a?e`#??1????	??cW?Id?~??b.?[?-\$1????sc!???????m/k_'?v??<xls???????}-m?bQ*J?Q?RT?YYV{?!KP-?)
G

???*??????!N!D?*?"??
?E???Q??F??Ac&Z?~??????pv??????
"o???????g?=??_?????????~????,?????/>1?????u?:w?"^qE	 ?)??o? c"???
K?Y;?!??3????}?B<??????fh`???_?g??	j?p?9@???X?????E?N???y???8I?`??N?t\I4?iK??)??:?$Y
???fY]???` '??????(?r	???,?zW/?}??4'B???d"?V????r?H??
c''C?L?P.R};???'??P8e at S?x???b????7a???`?????M????\???Td?f?J<?w~UZ??????_[??B)????????	?"?N????s?C??Z???tmp{c?????<????:???.??hvw?*???u(?+}??'????_?P??8??!_??P???????????Z???????M?|G{?|???1"?.??E?$??P??]
4q???d?/??
???5H??O????Z???????&tTp3_???????
2????4?x?D??I?lnf?????o??&*3???rT4????S?7)?R%??0?$??l/WS?&jY??V??33I???????$\?e?-?s
6?&?m??K??%?-??g????????r????Kc5??S-??]3WI????|??zs???Cc*?i??}z??? ?j?<?A???"??O?$#*"@?
.?w???QQ???OV??;S4/?\~?X??
'Z?=?$???|R?{?|??7X:??]????4js???s?{?dP???Q0,*4RW?????K?:???F'C?'?mg????_}??Y?A??5O???0Y*4~\??)M?}*w???[5?,?rM?}???Q????2????Q???aui??;?%w8?%
??MW??U?78dd|??????F;??? ???@^z<????u~?x???Il^????7??`0O?Q?j??Pt?i?p)J???;????AQ??p????W,????????H??u?,
*iNw????Vh??.?{?'3?v,L
h???p??#j?w?0???K??Gu]????"?H?:fEb?K???J?????????D?T}??H?Ps?7=??xp&?J^??(p?x\p3?2v??d???x?c???:$?????A???*?mpF?????Y^??EW`hh??qT??:%V~
-k1?J?OW!o:M??g6?5??N???$??ImBIDor????4?(?a7r??I?Nu(W3hZ&
??\???s?.???wWJ?Z?.????I???E???=]???????I???i||????????}????.???w???G??c?t?!#V?8G??8X????????=?L?% ??|?????i??
?MC?!????a
?Q???????'|??{f??B?m???`????X???-????UU?o;??h???b????s????48?z5??????9?????c?n??????5
na?.>??????????$e???(???@??`?lmwKT?4?h^?#????&???i?sD&?M???????e? 1F??h?<?<?38s?????U
???????5????>??:??c?yO??2????SD?n?G9?b@?{??`??*Y??>??b<????n????eGb??O??????
g^?u??^[\k??1??J?????B??x??2?&fQ?n?H8???>????p^?I'i???I8??{T????M?1??Fo8?o??????6?i???~?=b:?u??s]?UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU[m??)??62N????????-?

????c???Z?9?}??????H?
u.?:M?(??&??N^k?!k-<\ou?|?-??z?yGV??"R,{???Z???x ?h="?????????H2?Kj\?0t<????/?\z?k?;
m??|?{?K???~????UkZ??Uq??????????5U\j??W??j????????????????UUq?5UUUUU??????????????8?????
e????e??Tc?W?}h??b?G?S
?	?D???
T*?v??OP?5w??T?UH]?b???S??}?X??Q?Q6m_?~????.???E?????t?;?:?E?????*Iv?{?"???<z???Ki#,?J???DU??&p)N???V"??+?%??S????????)?7??+??\FX??\?????y???V?^?(Q?1??v????@m?(?Y<??u??z??n B??
?(??m@?I?~+?????D?/XS???/??P??Z?(?f????@b?E???Pf?]??af??
?l?R?f(??'???j???x
6a??C!??ux@?"?J??F???6???p??P??B??Sa????5??
?0???????
1???d??g?q?#???????G~??8K$,J??x?W?g?^??????T???c'??gt&??Q???K\?%???AG??*4V%????d???X???
U?El?-??f??cg??T?-B???Y???J9}?bP?"F0M???&z??U???`4??/????	u?{G?1?y]l??(?:&?LzoWR;????u??????
ez/??@?
A?d~??9NT.=?{Ao;DMO???J???Ah?S#?Z?6V"Z???$Ph?8?%H??f]!??@yu
??????y?? .??c????t??k????j@?w?*?q?
?g?*?????]?Y?\wQ?.???M???b???y'??G*i6??l?9?A??K???c
?%t???S`?c??P?rS"?\%{?U??;lE????@??!y???Z?t??H?o???F)??P?S?K?nM?????&?[???r??u~?(?d?p??])?RU)?g??e?W???
zSWp?+?#D?U??:?r????????/7???L????????Z<?oG??????????IH????f	?{??sw@?R????>T|???1?w0??LO??^b?Y{lx?
4?,??wsy0?????????R,????U??k?ps??pS????????Ofz?9?????r?(:?P??Y'?Qz??23??????7??XS??R
????\+ ??
????8??????d???r&??>?7o??????tf0??v??RO???}??
B?tyY??bg???>Dr?7B??????/N??????b?
@QE??H?)E ?` ?"*?UH?DQTE`'??m?
??6?m?8E+i?j?6M&k:????D???^???4?/?(M@????Lq???8?7?b???D????b??*??0?	?Z??Z?r?<?x?3??x-e?7?_f!?\HX??i??0??v?Q?v
ej?O?Hx5?:??0?y?Q??
??$??Po??g??r??a??2???\;>?q?Mf?Q?*??a?_??Xn
??A(Xx?8?
?4?c~?o???E??????
7?R?U?S.?Q?}?a?k/???%?TH??????b?
[????uP9l?zb<????s<??.???????O?0?;?C?m?=??N?'??Uu???&?
U?h?????B??????;?
KYB?
???;B???vT?@?r???R?v???_?vKy??
???3?G?M?
!??}(la4?w?o?jg?9??K??!????	lAn/?i??'?s?u6?g;?.;??m???
???q??1??Z??
??#p?7QMO?????,?4????j? ?k?Cx???? ?????!?Ot??LS?}????O(P??
???`)??T&@K?W??h?>9???????O~??X?W???e?????^P???)J=x??p???}??#?6?WeD??????6?????:G$@??/????Aa??/??~??}???\????6??q???????C<?^???i	?r???????4?)???$?C??TU??9?<?z??,?A?R!????4??????$A'Q????D>?????T" 0?R?????)A?0??{%??}?????]?P??E????E"?T?DH?Fb??FHC`Pd?????PA?"?BQ i$?0??T
?XO????|g>??????????????~???E$????????? ???`?x??~?|&?8??__?LaZ`3???????*??X?????LD?E?B?3????gN??????T????=?KP????lw=}J?{?~??"k??????m??????S?G??l???5?aK?
!\M???.!-}?3l#???`?]^????,HSO.`
??>?J??V?
????'?l??X????	??? ?g?:>
?cFL?tt Qs??X???UiO??P?,3?{H&_U??
?qc?*i??jOz???Qv???x>?:?
?>?L?:??%??
?6n?B?L?e????Yg???!#*??6??%d5?|I?t??U????>?,?WJ?&=?6[d???;e
z???????\?;~Fr?S'
M????T??U>??j?5?XBN)???????#????_?T??u??l????;b.???????P??dM?TbmPL???o;j?h??????v<?bm?j??????O???z???~??
?????5?*'?????ZR?y]??$?R?w3??(S?g???&Ot????@U???
????rQ?[S?4??
???G??}??U???????????*Jc???<|????5?[??_?"	;????q[?T?5
????P}?????????cN??PdXb???*J?????+??W???Y?I???3w??9wz?e??n[??kJ??]7?_??Z?4<?/M ???_?`?kB?K????[L??l?h?.?w?????_W??J????p?4?????>?kui?I??S"z?	p({??I?Q?\???.?N?Z>???K????*??eeeg??_".??N_&??G9?K7????%?p?P????m????vZxY[?Y????N?4y:i?.}u??4?jwu?eW????uf?ko??|??}???VZwU??6??a?t<m????v????????)??r?n?/?????n????_????i???*??~?TJ????}z???????OC????????X???]v???I?_V?????uJ60????_:/?	?>iS??I????m?c?i/???G?{????t????~???K???-?R????????k????+?	????F?!??	???Y*??-Z^M;V????????????5R??v=??;v?h????q*??7?m?R?{??:?A???m???)????????W??zTj?Q??w??r?>+??'????5i"?FS?i?X$`??D??#c	Q?AV"?2( ?+Q???DPY?J??Y?@UV??Hq?H""??U???L?h@?????S?u?????P?????Q+??X\?%>?
,PZ@?D?O?EP$P?dF1H?"?(P??@r?j??m8.?8,9??
=uA?1???
??????l?Oy?????1{?>c?^o???O??'??????x????"?{?S??Uj?iVsW??2?V38?UUK+9?jV???z?b???3?o9?1?s?
???*q	a?j?+???p??
V?t???V?n??&??c???l??L?s??I??{??L?7H[?[??S?Z?gjj?n?{??t???VM?Z????????m^???qx?j?y?+c?i?{&?9?:?j???????b???S??????iR??cW??????:?r?7?r?5????:??]V????y????????8?7W?.lUUN?{???????)\?? ??x~oW??????T??

????DC?o#?$????-B{@???&Ci?V?????fJ? -??IX?$????vjf~???.|?*`<v??N? d2=?$?n+}a??I16?????[5hjk?"dr?p?????????SR)?85?QT1D??S??#fE????X?ev?`+- at J?t(b?+????3(N.K?*Y???-?.[\,:??yi??
?I
?%?
?b??N?g??O?????
?4?Q???Q?Y?_p?2???vo?(??
`I??=?J?y??@?C??c?X????2?wv???+??a???p?1.????a?)ba?z?Kyqq/??U??W??ZrxM????L?B??=[7?]|1u????W]3?kc??'??+????r???~'+?M?G?'?(?e
|?=?X$??}!????EU??????m>?_?
??D????v]????f????l?:??t?S??qS?0?3]??	x????q*'???1??????5???U??????!???? ?a??t? S?h?8aM??????[??W?z???+??O?7?t?/?3????G????J??<;?+???{oN????1??2o?????-???(,???????8?U??yon+???rXp\?eNyoY??LB??	
??z???l-?????N??5?L?????g???????????\???3??=9??????q??.?|7???M%???i???????V?.??We???h???y?????B?/???8???l?^????S???8??p?<?Q?}?a??s?6????p=.?w?j\???c?d??=?-oi_ ??z
??T
?*|????CM?????????xo?:????U{TUZ??a????{@??CS?1[R???zx?r??nmc^?{Tte?|Ec????Z7??=N?1,?????M?r?e7??nC.yX?]???p?%?u???4#?2DF'?H?*?(?(+5F0?d???b
	6B????????C?' ;
?C??JC0	
?C?"""""""""#?1?
??8?
?@??j??
@u
??	?I???'?z?p??i????73??~?H ?/?*Q??ND?????G??f?#w??i?*666cs??]???%H??????s??
???_?'??,"9iO?j???"?e4?7?&*???C???#????O??wg??`??Y??x?????{3?%?m/??F???&]?-??CP>??V?c???@??/??	?(???{?wlFL[3?\???R??7??????????>??#??w?(???f?y~????N???X,d??J????
??"T?G????)???i?????????_z??~a?gjC?|O???)K????o?d?9wr_=????P??!?{?????6`?O??,?E?I??|??
??k????h=?4;?AN?5j;e??????????_D???k?wv?]0?????j??9J??
???7?)NQu?nP??2??]:?}????Jh
AR?\??<?f}Y??jK???;8?????RQ?g???S???????~?EU?-?x#?ZQ'>H?o	J7??F??!??Qs???z?0?
:oBV33????[???3??????Z?`3?J?Kg?jq?f!??S?sB?????x????????{?l??j?K??_??@UbG5B?Y?,4?||@????)?lZI?o\??????,`>??Q??2>???{&???D?wlK??o???????1??b????|p=??
??O
??????????
??J?>? ???
(?????????D,??g7iL????tT???'xS?7M?!?\7h???o43`??5??'??[_Jxj?J?jb???8???~Y?o??+?@?:????m~??bv??U??h0D??~???p?C?!v????T%?PN-`B?? ??#????oV/?????E?"
tZ-??jYy4\yk?/????t?0?
Y?lR??N????i????????2??/+????*??????m6?)Kyy%v?+pd<?)Mri???i????S?x???k|#Pt???)?!?h,B??????C1?)?ma????p?????Xb?b?]??W????I
,?C?#`?m'-)w(?^?4c?3:J??H?Y?@?Af?1?9????????]??9Sy?hWl{<'m?btI ??L??????)5?&??/???&?q?Kxib?W{?z??g?9yz?c?Z????	V??9?????N?$?w?????????????{HM??+?!??@?43??g7?)U???[	??6L?!??I
?$ ]i?'??????`?????????_=?!q?4?"?????`??|???1<p??T???vn???B?_9????i??k?*iZ???]?~$??d,??!H??t?4???6???jg
[???.3ck???????n?EX?>????????????,????(??J???zY??8?iB???:]?????4????
~?[[??!???l???\?9?|??P?Q???|[sa???*?1\ha???????o?
SZ: ?M?}?????"??\???
?i???*??I??t?hZe
?m??
?<??!?(?IW?v?A???????@????US?V?D?fP??????`/e?
????j??[S???%??'
??6??fF?ji??S???w9W??p?^
???xS?X??N?m:"l??	???b?Oy-??S^8?.????S?(?A???????t_?n	Q???)?\???}i/??1??13?????e2??o`?
?U????O
?gl!?E??M??g.5??,E?T??#A??4Fq????p?&?#?li?????e??#???{`??qq?d???#?4PC?>??g????????j?
???1?%???????]Ka?P?s??v(n??}?T?>?6?f?????_??QG+?T
?"%?83???d???h??-8%C4Zf'?3xU-JU?????%???^g??QI<?p????z??L%??zAQ??PG#H ???]?T??U?"?Hd??]???y?z???s??5?B???????$,$?????U?<<??WDv???????uo??T?>-?;
?<8??2??n?
?'\????y?jf?gh6;V???0?r?u?-?_N?t?f1??
?X??(@?^?@?)???????&?fFF?C??i?)???`??t\?U?=?r???W?*y??????0?$??F??A?>Z??#?B?"??A?^D#?Y??EA?oZIdmb?
???
??d?T???!??wJz(kp?[?d;?R
??0Z?@?1D?8???(?'
?????W?/,?(?????N57.RA??8?????H?WRc:WK??<?,?X?%&??D!?X at 8?5?k?L6;??Cm?j?t;?ce@?F0b1W?b???!f?5???2<<?O1y??F4;?2hEa@???W?1?(???????RR???????i,#?hT7??M??q?????}
af??E?????h?4Y
S\????B??b??`&????IY??S)(?nk???B]%#M?ywZK?1??[??=8?+o(?V?"??}???"?`%????????#??T?"?d?!?h[`%??+?("+l?5?tP*???[I?I?v?K??,?????)?(?s???????j??^[??C??{BM??!8?F??xg%1O?"94?(????& ` q?dF?Z??!????i(?????-
p??w???16?n?sIE??@?[u?0,??LL??? ??790?.??*f????F(?G-???Ug???d?b?????I0?4V-??m???$/?\l9$N?H	
x@???
cy?p????23+K???t?H?B42k$.?[O?
????G?q??k?1?a+:??"$
??|?z???????#???cZm`???V
Y???[C3??7?????
??G=
?'f4????}????
6?hMmhB6OT?
w
??~???Y?&??c8?yr??:"Td????J?b?o*4V??rv9@|v#??VGo?2e]????@o?????
???FE??^??Q?3??#?o|\????bF?e<e[???.???C?[?e?h??h?tTTI?!?TB??;?L?rl??n??v`??_C??
?:??y??
-O??]??%Je$???X?;h?q?m??O?U%???WI??a
,7?p?T3/??Z?M??8r?????zZ
]!?R?wZ?Q+?:?#?~'p????.??????????>+??/????]?
?}?q
??q	?]??J?K.Dx????????;??R$?+*^???"??7??X?3???r?N3Rd6?o\`gSF???????v\[$??9?9?c?#?????!???e??
?8??]ji?A?"+????H?\??mT???.zl7V_?1!???5?`-4?[(???H%????	??J??Y?*l?6?t$??z?>?E=?\Q??Hs?`xs?????9???0??^1??`?????:?1z?(G?-i?J?5?h_X&?E	F{5c?5?+?????wI?????>??@??d????????IHF??T?>?D8?????A??v?? ?_g????4(
?????I???IF~???|?.?v#	!?0?q??
m?`??Y at E?1|9?w??i???C??17e~e
???eh ~#??@?
???wp`???+X???	#?S???MY?v??????W????(?8???y}?????#??P\??
??\?
????g,6v???C??iW
w???o??[?8?????#?vfQ?Wg3??fr??nm?M?(d??C
?L?/?f??K[??`????e?.????Ar
??Q
??3
??????;???yZ??EG
???8?S?p2??????9,5??????R?!???????BHl???@??V?h?hMI0?J?????:???:?	?;8?l??,"?????cM???6?-?????"F?S{76A?N?B??????q?w??,
%??#y7?gHpy?{n\P?9????k??]?r?????? q8	????
u^???0bR]?L?J??hs?7?:?\0]?c???wo\?????QT?g??
f=]??i?Bz?j???F???_?e?r?0?z?	
?9N"D?'k?|????!.F?p????7\?z?\8???3:?|???????+)
?#FP????5??a?????? ?N<??_.+|??~?p?@??fl9?5?g+`?????^?&?e?C?=\???R?????@?`??:?u?????l?1????9w??;??'??6??])????9Oo?]??????T6G!FA9XU$?a??<c!?j?!2&?F???
?~=?l??l(lP6
?=AB
?h?7?\?r?
(h???]??,?
?'3 +<?V5??C???????Mn<?]?FHD8m??uI??l???{???????
??
???	+?U
y??y?<_???J??l#?#??????N?]}??^+???<???#??;?;??$B^??*?l??N? ???H??$?mB@ \xt?p?G??>??
S????E??Y??h2	?!??3???%#
?w[{?????	??w?=????Zv??~????\??05???wTDA??#S????>????@!^uCs?T?-A?-?v???d??$ ??2,????A??
?n?Tn?C]q??D?]??4? ??Z#??~?1/????h?6h??4?R??gr???Q?? 1=AH???d2..rY?????>?????K34%#j E?9 at c#????@?
?#?C?R???4S
W?u?'??	?`???`?QvN?E+??
&??}??e??'?v2????D,??	'????????u????9???1?@?kK??T?(???w???t?+???????Kc?(Wa8?RP1??x@?=A??W??o?O????:??@0a at 61?????z???m?xS?l??k?.??6???v?]?????S?`
N{[?uj?^gvV+?u???
Yv????,????d*?B<# I^?;?V?#???"#??j	?o ???o???On??7gG?"???P?*??C????
H?j)>?3?EU@?|?Q???????F?4U?!9&??4rt??\??t??????9YT?;??{??<??E?????q?"\?)2????&Qd?RQG=r??`?:?TB???tv?????
?q??t}???$???0V?T,d?`o????/?E???
o???`~<?4P?VF1X?q
?	???4?????
;j,???L??_?}!?
%Q?(?"
%??t?'?A>???X??2?4
f"????\new?&????Q$Cs4l??43F?7?/-U?,?n?W}?UO??????$?wL?8.?6???l?=?26?r??-S?7???????????v?HA?!?G7?????????????
!PZ
?Mk??Y??+	w???F5
|????7_YOp?`?mh????HaqG?x??rs???>?R??1j?'?1?????\?=?P0?/??Z?!??C??
?????UW?.?r????b&??x(?????g0?@?????J!mx>??U??=L?4f`?????;k????J??(?
!???'??vH?Bz)?v??<???????T`?,(?~?f?S?lnn'??
?????XVG?E?MC????8??S# ??h??Cpb\?u?N?B?CE-??Md?P????}}?5?????\???I?$???~E????????C?R?8?
=??9???P4?B?5???O0V??Y???{j?K`?$??????9
?????????0??
?l"?a*?^?x[e???!?	Z?A%?L?rG!a?[?b0?<?9??|????^~???b,?$C??B?0n?HID????????_H?????s????}a???g_c?d$JE??{mP???`?At?P0?? ???r5c0?"{?h?f???O>??{?QQY?C?#D??]
Q
???????x?N$ X
/n?pr??
"?"
?C
?O????Xh,b?;QK"?B(??=??D??????AD??=aC??Y???2?????????^4/??X????????????????!@8@???gN?r??=??H~?Nv#?' ??L???f`?E?ID`????o!????EI?L??Na??C?Oa????x??(?*??o??????9?8?gZt?:5??6?Bv?ZdS?t?!B??%Qb*???(/??*?"?g2?^vR?e.PP?F?????
|????????%B?	
???f???r?}z?6~?i?2o??g?J??u?~Yc??6??1?L?????cc?
<V?m??
??
i1X??D?X>U4?	"<m?0???t??-????6???>?????W??7?g????y`??~?f??????f?????o??n?2+B?2??;?x?2??0+??c
b66??"A??I; ?Ta??y?H$;???`??????r????}S???!?"%~?l"lc??
9??Hw?DOL
N?/>??Q?|E??
?P?x^Ai T???o?y??u'?F?v??:?,?+??{??? ?uP??`4k!:8$IY?B?<?`3?#
/?!?????
??C???II???????,I?yt?&???!?H|?M???4?G	"??????c?W?Kh??6??&
????d"(??BW????H! b??Z&O?:?p?GhHC?B??X at h??yPQ?pT?u??8?t at f8???5??V??jF?U??t?SV 
??^?\?
?
r??r ??P??
???YPy
???;^.??Z??cY1"??????I!?o??1
S?A?D?oB???)R?i??
!?
??D??R?8A?c @?+r}????#??
<?
W #??(
?M'^???.x???
??!?T(T???e?;??,?$?"
P?!??|???J?T?
7??d[?x@mc	Yc???xd?H	?y??%7T?h?|?
2
?AG?r
?#???hT???Y
F?C
	m`Q?-.?H,?!???i
??
?$E4???e.?????N??Q?.?$??CH$)? a??$E?~3?=?0??7?:-???<??W???,T?a?lJ[BYAd???<x9??i???l'?e{???O?N?^V??4???@?@fqI	p?????<?N ?ihb>?f5]?z????$8V?Ik?Ko??!?_;??64?w?@?u?,H|?C?O????UG??PA1F?*?(F( ,C9S?G:w??|'?d??uB	P?h?'??
v_4?*??U?@?p?[!??9)v"^O?W?????4?HoX?K?X?p[?p?BA;,??Z.*??A??2??.+????Qk???^! )?
??n'Y???w???r?ru2?X?z}?n?D?+????????cM\?M??q-{?@?@?? ?@{??
??]?_'??b?Mn;?2?????y???
{??N?m4t???"?b"?mb?U*z?M?{?wC:?Md??????-??(?G6v?3??
@??8????+%?)\???`?)?<?03\???m?h??I9 Ct????%???&p??C??(?

?$M?7V??i??
??)???$???&?JbK*????S?*????iFH?T?F8???v???69E?$??Kjix??]B??]?P
?8+?C%?D?H^I 6?'
,R??<
1???.4??j???)b
@?RD&3???J?1??????+?~???Af
?d?RUc?,')K
.	???w?YO?2<??#;FY????Q?oA?7??	A??????6???s?2????6P ??cRn?MP;?M???6?/?2?2???`h?d??????y]????x)??~=?q;??=1i?G?u?A??y#?-{MA??P??	Z???*	?L??8??S???`?Cc?????N?{P@:? ??m?+?1Gw|??+

????i??*q?)EV.???9?x?????
?DS??? oMw??26????n?l???0????(=E?J?!I?M
?C??[,?$?????
~?H??4?#"f?p?
?2i???d?
????fJbX_?'k??'u??B?
F"=?????B?????????R?K??:.x?]??S?T???? ???6?gDc??????:2???Gdf??m?Ljl!TH84
?T.
??P??N??W?????43?w/?l6?"3?XT>???????r???\ ?ILL?0$[??dA????" $??"
I(??!???S????HP?D???8d
??PAY?Hg??g?AG????
?O??g~???_?	l;?,??????q8$
???g?4R???x?f???qg??J?T?D?<??A	4?-?mVO*vT?????L???lpq?+,???ip-?`??f`M??6???
?U?%I?D,Y+p"?"@????H???o??A?Q"?X?K???",$?eq@?z?a??v???-?u??AYM?e(>Y???K???5???[??????????u?6I????.<~Bx?$?????:????z	??????(d;9??3???88?)9??0ZQ)q?vb?!t???
]?i?F???eG??y&??E90????!,h!????\O+O?/*(?DJ??X<??????D"?#ho????:??"??
]6?@?5??#??W??? ?&)/?P?K;=-p??2?v??q??l?	D?B??OX'1X??ixX???K???BaA
?b?'???7???1?????u?9?]?0?????g\?;??Z??#??	?3??%:7b?"{??
??1'?.????b????W????n_????dt:&??~
?a???@?????
?`?W??????S?????1?'xA6^??<j?"?

;q!s?5?@?(ka?h*??^
F\??3???0T?????????v??=V?`?Ar/0?? ???"?EX?LI@?;?|? ??????@??????8?"6????IK??4J?`???N?
??="b?tg?$??O????????R?\??GX?s???????U"???,!`xC?<
f??k?i??????
1=?j?UJ??????b??c
E?/4+??*
e????KD??e?F??mzo?TI??c???K,`Z5;?CIR??J?B?`l,????jsb??R?YB?~`@
????????????@\U??p?M??
JJ/??bB?z?;???;????)???????O?????]_W
<A???.???\R ??X?zp!@;?<b	`?-<U!V
?a8M;?
?$B?I??
]???0@?#?V at P?????.rA ???Z??9??e? ?Z??$|F??\DR:???9K2??????w???P
,8;???L??;.\???n?>???G3
??-,?C??&3???
FY?Z?Q?K)???9?:?R?a??NG???pw?w=P??/9 ?????M??C2>?B
g???$?x????M3.?I?.??S?q???z?b?6?}m%)6?a??p&?Hy?P??N????jK??:???
?A??R?l\?g3?#?O?|?Z$p?04
hn2(????&-??{
?Z??1G.G?s???"{?u?;,?e"???j?V$?Q??i??????/??<?????B^?7?c5?h???p74????n??X??Q*q?6t6p)_S;??;???(THX[?V/4e2o4e??$??f??GJ?S?
 P??O?????B?Wm?????s??]?T??t?:^?1???w??U?]???r?2???Q??(?l4R? ?
??P(.HE???A??|??^???b??#?H`?=?:(r#??A?m??40n?$.??4=?????E??
@?
??2E??@?$Pa$???)A1??}?????6??
C?{???4?!=P?????
)?v???A?<n5??(d?ih?*?#[,K
F$`?????DiF[l?iF?T-????J!???Q??1
?-?
$?$ei@?B?Z??-?Z?;?f?S??)J??+??q`????]??g?l~??8?9?>??#
)<?q??@??y??????????s?V????)uh?
????N?nqH??
?TZ#9?-J?q?????n?Z%t?[]??f?h???oNL?fKPqc?????E?A???h!
??^#+,?]2JYS??d\?xHY(?	??9??
-@??<???T?LI?c?#?
?B?x?~CP9v?NQ???Do???=d??D D4?gZ#8???????*%??P??	m?3?)??E???????\?
 T?2?C??6Ln?FIUd?Xc??f.? ??r3?eD??Q0??82?-?Q'??M??@??7
??Rh?h??$?)
????s???YT????v?I????????#?$???X\HR??????J???4?;?B??}????????i???4???.??BH??@?A@??j5??p?J?
?2P?Lb???A?2L?Pn:?d2??8?
7?X,e?TY0
K0?9?Q?Z8?a?5D?D???C?`B??N??6????????{MOY?=H`????Gt???0hQLo^

?V4?
n`
.?qH?h?????&R=?0
CZ)B??-;}]?u7W??8??:?;4\({
?Z?? ?(?0@???EM?9(??????(????[F#??~_?<?????????????X?|B?I!.???6??}0 ???+'?J?~F?v?]`Q???Tk]????)V?????#?zws:??S??$??

U;B??~n?'?T???iG`XU???X???9L??\????-=?>|????i???^&?9?e???H(
??5
?`??:????:vNH??p?	J?Z???kH????v?E`??????6???V????/003P??u??,?8e????\?$)1W
 11?(@???AP?EdwG
?ce?q3?uC?7??|????????8?U
Q;A??????M?F?Z??(??C?=? ??
V?l#Im?H1dD?M???
}?? ? ????b,8W'U(5M??0?3??=Q??:????Z???V???a?x`#?j??????
d??U?YG??DT^^`? ?6?1?g{?Kz?h:??k?	N??P?????????]e?V??/????????*?
d? D???e???@?.??1?z?a?V?{.opI???jY
!,Ba???rK&???????O?:??@?,???'1??
aB?Y?iT/??4h??@?g!5(?<?2b?? Q?BBu????LQ ??d)d
???3D??e?u?????r?2?-?D?I(Q???H?!M?t??Z??$??Nf??i??[F?]?_?/??HF? ?!?% ??&???E??????_L?4 ?D?????/???PJ;`\????b?vK?u)h\?
|????ja<?&?4 ?|?+?tN??c????R??A??????D?!????('s+(?????
@??$?.??`?????n??:???v?,`8?-???mv?04j at O3
?V???D??9?8B?A??0I
R(??UA?+Q?
?(P????6???0?r^??f(J5F?1??????	?l1?n'#U?kX?F??
??D?????g??O??!?d }??i	91A"?U??V

??AX#"A`??,????r???d?
? ?`??J???	
M2?F?l?$:d??% ?1?!???~??????]??BB?W 

--- NEW FILE patch-2.6.17.11.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBE7NAgyGugalF9Dw4RAgybAKCOhskqsKUfS1M+RMjNDKyw2JlwMwCgh17c
m8wnQe8iR796LDlzGTKWnC0=
=HnuZ
-----END PGP SIGNATURE-----


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2179
retrieving revision 1.2180
diff -u -r1.2179 -r1.2180
--- kernel-2.6.spec	22 Aug 2006 20:43:40 -0000	1.2179
+++ kernel-2.6.spec	24 Aug 2006 19:34:42 -0000	1.2180
@@ -231,7 +231,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.10.bz2
+Patch1: patch-2.6.17.11.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1537,6 +1537,9 @@
 %endif
 
 %changelog
+* Thu Aug 24 2006 Jarod Wilson <jwilson at redhat.com>
+- update to 2.6.17.11
+
 * Tue Aug 22 2006 Bill Nottingham <notting at redhat.com>
 - update to 2.6.17.10
 


--- patch-2.6.17.10.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 24 19:46:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 15:46:13 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,
	1.12, 1.13
Message-ID: <200608241946.k7OJkDic018039@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17998

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
Log Message:
memleak

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 psprint/inc/psprint/fontmanager.hxx        |   37 +++++-
 psprint/source/fontmanager/fontcache.cxx   |   13 --
 psprint/source/fontmanager/fontconfig.cxx  |   97 +++++++++++++---
 psprint/source/fontmanager/fontmanager.cxx |    6 -
 vcl/inc/impfont.hxx                        |   36 ++++++
 vcl/inc/outdev.hxx                         |    3 
 vcl/inc/outfont.hxx                        |    4 
 vcl/inc/salgdi.hxx                         |    2 
 vcl/inc/vclenum.hxx                        |   21 +++
 vcl/source/gdi/outdev3.cxx                 |    8 +
 vcl/source/glyphs/gcach_ftyp.cxx           |   80 ++++++++-----
 vcl/source/glyphs/gcach_ftyp.hxx           |    5 
 vcl/unx/inc/pspgraphics.h                  |    1 
 vcl/unx/inc/salgdi.h                       |    1 
 vcl/unx/source/gdi/pspgraphics.cxx         |   30 -----
 vcl/unx/source/gdi/salgdi3.cxx             |  168 +++++++++++++++++++++++++++++
 vcl/unx/source/gdi/xlfd_extd.cxx           |    3 
 vcl/win/inc/salgdi.h                       |    1 
 vcl/win/source/gdi/salgdi3.cxx             |    6 +
 19 files changed, 417 insertions(+), 105 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	14 Aug 2006 08:21:22 -0000	1.12
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	24 Aug 2006 19:46:10 -0000	1.13
@@ -788,7 +788,7 @@
                  
                  // update font cache
                  m_pFontCache->updateFontCacheEntry( pUpdate, false );
-@@ -751,6 +746,77 @@
+@@ -751,6 +746,78 @@
      return aName;
  }
  
@@ -829,7 +829,8 @@
 +    FcResult eAutoHint = rWrapper.FcPatternGetBool( pPattern, FC_AUTOHINT, 0, &autohint );
 +    FcResult eHinting = rWrapper.FcPatternGetBool( pPattern, FC_HINTING, 0, &hinting );
 +    FcResult eHintStyle = rWrapper.FcPatternGetInteger( pPattern, FC_HINT_STYLE, 0, &hintstyle );
-+
++    rWrapper.FcPatternDestroy(pPattern);
++ 
 +    if( eEmbeddedBitmap == FcResultMatch )
 +        aHints.m_eEmbeddedbitmap = embitmap ? fcstatus::istrue : fcstatus::isfalse;
 +    if( eAntialias == FcResultMatch )



From fedora-cvs-commits at redhat.com  Thu Aug 24 20:06:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 16:06:13 -0400
Subject: rpms/authconfig/devel .cvsignore, 1.49, 1.50 authconfig.spec, 1.65,
	1.66 sources, 1.56,
	1.57 authconfig-5.3.3-fixup-for-freeze.patch, 1.1, NONE
Message-ID: <200608242006.k7OK6DWN006786@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6742

Modified Files:
	.cvsignore authconfig.spec sources 
Removed Files:
	authconfig-5.3.3-fixup-for-freeze.patch 
Log Message:
* Thu Aug 24 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.4-1
- pass options given to authconfig-gtk to authconfig (#203955)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	21 Jul 2006 22:40:33 -0000	1.49
+++ .cvsignore	24 Aug 2006 20:06:10 -0000	1.50
@@ -1 +1 @@
-authconfig-5.3.3.tar.bz2
+authconfig-5.3.4.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- authconfig.spec	24 Jul 2006 01:36:22 -0000	1.65
+++ authconfig.spec	24 Aug 2006 20:06:10 -0000	1.66
@@ -1,12 +1,9 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.3.3
+Version: 5.3.4
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
-# rstrode: i'm bumping release here instead of doing elvis CVS
-# upstream release because we're freezing tomorrow and I don't
-# want to do an upstream release without patch review
-Release: 2
+Release: 1
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -18,8 +15,6 @@
 BuildRequires: glib2-devel, python, python-devel
 BuildRequires: desktop-file-utils, intltool, gettext, perl-XML-Parser
 
-Patch0: authconfig-5.3.3-fixup-for-freeze.patch
-
 %description 
 Authconfig is a command line utility which can configure a workstation
 to use shadow (more secure) passwords.  Authconfig can also configure a
@@ -40,7 +35,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .fixup-for-freeze
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -101,6 +95,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Aug 24 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.4-1
+- pass options given to authconfig-gtk to authconfig (#203955)
+
 * Sun Jul 23 2006 Ray Strode <rstrode at redhat.com> - 5.3.3-2
 - write out new "wait_for_card" config option if we're
   forcing smart card authentication


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	21 Jul 2006 22:40:33 -0000	1.56
+++ sources	24 Aug 2006 20:06:10 -0000	1.57
@@ -1 +1 @@
-13b63e9d3ee8c345de9f4ac65ee08768  authconfig-5.3.3.tar.bz2
+359c929306509705ef9cfb70cc01776f  authconfig-5.3.4.tar.bz2


--- authconfig-5.3.3-fixup-for-freeze.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 24 20:21:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 16:21:02 -0400
Subject: rpms/elfutils/devel fake-eu-strip,NONE,1.1 elfutils.spec,1.75,1.76
Message-ID: <200608242021.k7OKL2eS026402@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26051

Modified Files:
	elfutils.spec 
Added Files:
	fake-eu-strip 
Log Message:
* Thu Aug 24 2006 Alexandre Oliva <aoliva at redhat.com> 0.123-2
- Go back to eu-strip wrapper that uses binutils' objcopy.  (#203000)



--- NEW FILE fake-eu-strip ---
#!/bin/bash
[ "$1" != "-f" -a "$2" != "-f" ] && exec strip "$@"
if [ "$1" = "-f" ]; then
  opts=
  debug="$2"
  file="$3"
  [ $# -ne 3 ] && exit 1
  file "$file" 2>/dev/null | grep -q relocatable && opts=-g
elif [ "$1" = "-g" ]; then
  opts=-g
  debug="$3"
  file="$4"
  [ $# -ne 4 ] && exit 1
else
  exit 1
fi
set -e
objcopy --only-keep-debug "$file" "$debug"
strip $opts "$file"
objcopy --add-gnu-debuglink="$debug" "$file"


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- elfutils.spec	15 Aug 2006 06:02:29 -0000	1.75
+++ elfutils.spec	24 Aug 2006 20:20:59 -0000	1.76
@@ -1,5 +1,5 @@
 %define eu_version 0.123
-%define eu_release 1
+%define eu_release 2
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -17,12 +17,14 @@
 %endif
 License: GPL
 Group: Development/Tools
-Source: elfutils-%{version}.tar.gz
+Source0: elfutils-%{version}.tar.gz
+Source1: fake-eu-strip
 Patch1: elfutils-portability.patch
 Patch2: elfutils-robustify.patch
 Obsoletes: libelf libelf-devel
 Requires: elfutils-libelf = %{version}-%{release}
 Requires: elfutils-libs = %{version}-%{release}
+Requires: /usr/bin/objcopy
 
 # ExcludeArch: xxx
 
@@ -146,8 +148,11 @@
   rm -f .%{_libdir}/libasm-%{version}.so
   rm -f .%{_libdir}/libasm.so*
   rm -f .%{_libdir}/libasm.a
+  mv -f .%{_bindir}/eu-strip .%{_bindir}/eu-strip.bin
 }
 
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/eu-strip
+
 %check
 # XXX elflint not happy on ia64
 make check || :
@@ -176,6 +181,7 @@
 %{_bindir}/eu-size
 %{_bindir}/eu-strings
 %{_bindir}/eu-strip
+%{_bindir}/eu-strip.bin
 #%{_bindir}/eu-ld
 
 %files libs
@@ -214,6 +220,9 @@
 %{_libdir}/libelf.so
 
 %changelog
+* Thu Aug 24 2006 Alexandre Oliva <aoliva at redhat.com> 0.123-2
+- Go back to eu-strip wrapper that uses binutils' objcopy.  (#203000)
+
 * Mon Aug 14 2006 Roland McGrath <roland at redhat.com> 0.123-1
 - Update to 0.123
   - libebl: Backend build fixes, thanks to Stepan Kasal.



From fedora-cvs-commits at redhat.com  Thu Aug 24 20:31:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 16:31:17 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch, 1.17,
	1.18 selinux-policy.spec, 1.256, 1.257
Message-ID: <200608242031.k7OKVG0o029719@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29672

Modified Files:
	policy-20060802.patch selinux-policy.spec 
Log Message:
* Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-2
- Fixes for setroubleshoot


policy-20060802.patch:
 mls                                  |    9 
 modules/admin/amanda.fc              |   51 ----
 modules/admin/anaconda.te            |   20 +
 modules/admin/bootloader.te          |    4 
 modules/admin/consoletype.te         |   11 -
 modules/admin/firstboot.te           |    2 
 modules/admin/prelink.te             |    2 
 modules/admin/rpm.fc                 |    2 
 modules/admin/rpm.if                 |   13 -
 modules/admin/usermanage.te          |    5 
 modules/apps/java.fc                 |    9 
 modules/apps/mozilla.if              |    2 
 modules/apps/wine.te                 |    2 
 modules/kernel/corecommands.fc       |    1 
 modules/kernel/corecommands.if       |    1 
 modules/kernel/corenetwork.te.in     |    7 
 modules/kernel/devices.fc            |    2 
 modules/kernel/devices.if            |   36 +++
 modules/kernel/devices.te            |    8 
 modules/kernel/files.if              |   18 +
 modules/kernel/filesystem.te         |    2 
 modules/kernel/kernel.if             |   75 +++++++
 modules/kernel/terminal.if           |   19 +
 modules/services/amavis.te           |    7 
 modules/services/apache.te           |    2 
 modules/services/avahi.te            |    2 
 modules/services/bind.te             |    1 
 modules/services/ccs.fc              |    8 
 modules/services/ccs.if              |   45 ++++
 modules/services/ccs.te              |   84 +++++++
 modules/services/cpucontrol.te       |    2 
 modules/services/cron.if             |   17 +
 modules/services/cron.te             |    7 
 modules/services/cups.te             |   19 +
 modules/services/cyrus.te            |    5 
 modules/services/dbus.if             |    6 
 modules/services/dbus.te             |    2 
 modules/services/dovecot.te          |    4 
 modules/services/inn.te              |    1 
 modules/services/ldap.te             |    2 
 modules/services/mta.fc              |    2 
 modules/services/ntp.te              |    6 
 modules/services/oddjob.fc           |    8 
 modules/services/oddjob.if           |   76 +++++++
 modules/services/oddjob.te           |   70 ++++++
 modules/services/oddjob_mkhomedir.fc |    6 
 modules/services/oddjob_mkhomedir.if |   24 ++
 modules/services/oddjob_mkhomedir.te |   26 ++
 modules/services/openvpn.te          |    2 
 modules/services/pegasus.if          |   31 ++
 modules/services/pegasus.te          |    5 
 modules/services/postfix.te          |    7 
 modules/services/postgresql.te       |    1 
 modules/services/procmail.te         |    1 
 modules/services/pyzor.te            |    1 
 modules/services/radius.te           |    2 
 modules/services/ricci.fc            |   20 +
 modules/services/ricci.if            |  184 +++++++++++++++++
 modules/services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++
 modules/services/rpc.if              |    2 
 modules/services/rpc.te              |    6 
 modules/services/samba.te            |    8 
 modules/services/setroubleshoot.fc   |    9 
 modules/services/setroubleshoot.if   |    3 
 modules/services/setroubleshoot.te   |  111 ++++++++++
 modules/services/spamassassin.te     |    4 
 modules/services/squid.te            |    4 
 modules/services/ssh.if              |   24 ++
 modules/services/stunnel.te          |    2 
 modules/services/sysstat.te          |    3 
 modules/services/xserver.if          |   69 ++++++
 modules/services/xserver.te          |   19 +
 modules/system/authlogin.te          |   10 
 modules/system/fstools.te            |    1 
 modules/system/hostname.te           |   10 
 modules/system/init.if               |    7 
 modules/system/init.te               |    2 
 modules/system/libraries.fc          |    7 
 modules/system/locallogin.te         |    4 
 modules/system/logging.fc            |    3 
 modules/system/logging.if            |   21 +
 modules/system/logging.te            |    3 
 modules/system/lvm.fc                |    2 
 modules/system/lvm.te                |    6 
 modules/system/miscfiles.fc          |    1 
 modules/system/miscfiles.if          |   18 +
 modules/system/modutils.te           |    1 
 modules/system/mount.te              |    9 
 modules/system/selinuxutil.te        |   13 +
 modules/system/udev.fc               |    1 
 modules/system/udev.te               |    5 
 modules/system/unconfined.if         |    2 
 modules/system/unconfined.te         |    5 
 modules/system/userdomain.if         |  246 +++++++++++++++--------
 modules/system/userdomain.te         |   48 ++--
 modules/system/xen.if                |   38 +++
 modules/system/xen.te                |   26 +-
 97 files changed, 1865 insertions(+), 248 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- policy-20060802.patch	23 Aug 2006 20:53:57 -0000	1.17
+++ policy-20060802.patch	24 Aug 2006 20:31:13 -0000	1.18
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.9/policy/mls
 --- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.9/policy/mls	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/mls	2006-08-24 08:04:23.000000000 -0400
 @@ -184,19 +184,12 @@
  	 ( t2 == mlstrustedobject ));
  
@@ -24,7 +24,7 @@
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-2.3.9/policy/modules/admin/amanda.fc
 --- nsaserefpolicy/policy/modules/admin/amanda.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/amanda.fc	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/amanda.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -9,62 +9,13 @@
  /tmp/amanda(/.*)?			gen_context(system_u:object_r:amanda_tmp_t,s0)
  
@@ -91,7 +91,7 @@
  /var/lib/amanda/index			gen_context(system_u:object_r:amanda_data_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.9/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/anaconda.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/anaconda.te	2006-08-24 08:04:23.000000000 -0400
 @@ -25,8 +25,12 @@
  
  modutils_domtrans_insmod(anaconda_t)
@@ -136,7 +136,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.9/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/bootloader.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/bootloader.te	2006-08-24 08:04:23.000000000 -0400
 @@ -83,8 +83,10 @@
  dev_read_rand(bootloader_t)
  dev_read_urand(bootloader_t)
@@ -151,7 +151,7 @@
  fs_getattr_tmpfs(bootloader_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.9/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/consoletype.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/consoletype.te	2006-08-24 08:04:23.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -176,7 +176,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.9/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/firstboot.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/firstboot.te	2006-08-24 08:04:23.000000000 -0400
 @@ -106,7 +106,7 @@
  ')
  
@@ -188,7 +188,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.9/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/prelink.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/prelink.te	2006-08-24 08:04:23.000000000 -0400
 @@ -74,6 +74,8 @@
  
  miscfiles_read_localization(prelink_t)
@@ -200,7 +200,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.9/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/rpm.fc	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/rpm.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -212,7 +212,7 @@
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.9/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/rpm.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/rpm.if	2006-08-24 08:04:23.000000000 -0400
 @@ -75,12 +75,13 @@
  	')
  
@@ -235,7 +235,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.9/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-23 12:14:56.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/admin/usermanage.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/usermanage.te	2006-08-24 08:04:23.000000000 -0400
 @@ -256,7 +256,7 @@
  ')
  
@@ -264,7 +264,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.9/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/apps/java.fc	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/apps/java.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # /opt
@@ -287,7 +287,7 @@
 +/usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.9/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-16 08:46:26.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/apps/mozilla.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/apps/mozilla.if	2006-08-24 08:04:23.000000000 -0400
 @@ -63,6 +63,7 @@
  	allow $1_mozilla_t self:unix_stream_socket { listen accept };
  	# Browse the web, connect to printer
@@ -306,7 +306,7 @@
  	sysnet_dns_name_resolve($1_mozilla_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.3.9/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/apps/wine.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/apps/wine.te	2006-08-24 08:04:23.000000000 -0400
 @@ -18,7 +18,7 @@
  #
  
@@ -318,7 +318,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -62,6 +62,7 @@
  /etc/X11/xinit(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -329,7 +329,7 @@
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.3.9/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.if	2006-08-24 08:04:23.000000000 -0400
 @@ -950,6 +950,7 @@
  
  	allow $1 exec_type:file manage_file_perms;
@@ -340,7 +340,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.9/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/corenetwork.te.in	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/corenetwork.te.in	2006-08-24 08:04:23.000000000 -0400
 @@ -67,12 +67,14 @@
  network_port(clamd, tcp,3310,s0)
  network_port(clockspeed, udp,4041,s0)
@@ -383,16 +383,8 @@
  network_port(spamd, tcp,783,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.9/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/devices.fc	2006-08-23 13:09:33.000000000 -0400
-@@ -12,6 +12,7 @@
- /dev/atibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
- /dev/audio.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
- /dev/beep		-c	gen_context(system_u:object_r:sound_device_t,s0)
-+/dev/console		-c	gen_context(system_u:object_r:console_device_t,s0)
- /dev/dsp.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
- /dev/efirtc		-c	gen_context(system_u:object_r:clock_device_t,s0)
- /dev/event.*		-c	gen_context(system_u:object_r:event_device_t,s0)
-@@ -36,7 +37,7 @@
++++ serefpolicy-2.3.9/policy/modules/kernel/devices.fc	2006-08-24 08:04:23.000000000 -0400
+@@ -36,7 +36,7 @@
  /dev/mpu401.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/null		-c	gen_context(system_u:object_r:null_device_t,s0)
  /dev/nvidia.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
@@ -403,7 +395,7 @@
  /dev/pmu		-c	gen_context(system_u:object_r:power_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.3.9/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-08-23 12:14:51.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/devices.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/devices.if	2006-08-24 08:04:23.000000000 -0400
 @@ -3034,3 +3034,39 @@
  
  	typeattribute $1 devices_unconfined_type;
@@ -446,7 +438,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.9/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-23 12:14:51.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/devices.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/devices.te	2006-08-24 08:04:23.000000000 -0400
 @@ -72,6 +72,12 @@
  dev_node(lvm_control_t)
  
@@ -471,7 +463,7 @@
  dev_node(xen_device_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.9/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/files.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/files.if	2006-08-24 08:04:23.000000000 -0400
 @@ -2934,6 +2934,24 @@
  
  ########################################
@@ -499,7 +491,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.9/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/filesystem.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/filesystem.te	2006-08-24 08:04:23.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -518,7 +510,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.9/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-08-16 08:46:26.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/kernel.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/kernel.if	2006-08-24 08:04:23.000000000 -0400
 @@ -1443,6 +1443,42 @@
  
  ########################################
@@ -607,7 +599,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.9/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-23 12:14:51.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/terminal.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/terminal.if	2006-08-24 08:04:23.000000000 -0400
 @@ -329,6 +329,7 @@
  		type devpts_t;
  	')
@@ -640,7 +632,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.9/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-08-16 08:46:29.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/amavis.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/amavis.te	2006-08-24 08:04:23.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -672,7 +664,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.9/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/apache.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/apache.te	2006-08-24 08:04:23.000000000 -0400
 @@ -268,10 +268,10 @@
  
  seutil_dontaudit_search_config(httpd_t)
@@ -687,7 +679,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.9/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/avahi.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/avahi.te	2006-08-24 08:04:23.000000000 -0400
 @@ -63,6 +63,7 @@
  domain_use_interactive_fds(avahi_t)
  
@@ -706,7 +698,7 @@
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.9/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2006-08-16 08:46:29.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/bind.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/bind.te	2006-08-24 08:04:23.000000000 -0400
 @@ -218,6 +218,7 @@
  allow ndc_t self:netlink_route_socket r_netlink_socket_perms;
  
@@ -717,7 +709,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-2.3.9/policy/modules/services/ccs.fc
 --- nsaserefpolicy/policy/modules/services/ccs.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ccs.fc	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ccs.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,8 @@
 +# ccs executable will have:
 +# label: system_u:object_r:ccs_exec_t
@@ -729,7 +721,7 @@
 +/etc/cluster(/.*)?		gen_context(system_u:object_r:cluster_conf_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.if serefpolicy-2.3.9/policy/modules/services/ccs.if
 --- nsaserefpolicy/policy/modules/services/ccs.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ccs.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ccs.if	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,45 @@
 +## <summary>policy for ccs</summary>
 +
@@ -778,7 +770,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.3.9/policy/modules/services/ccs.te
 --- nsaserefpolicy/policy/modules/services/ccs.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ccs.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ccs.te	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,84 @@
 +policy_module(ccs,1.0.0)
 +
@@ -866,7 +858,7 @@
 +allow ccs_t cluster_conf_t:file rw_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cpucontrol.te serefpolicy-2.3.9/policy/modules/services/cpucontrol.te
 --- nsaserefpolicy/policy/modules/services/cpucontrol.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/cpucontrol.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cpucontrol.te	2006-08-24 08:04:23.000000000 -0400
 @@ -25,7 +25,7 @@
  # CPU microcode loader local policy
  #
@@ -878,7 +870,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.9/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/cron.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cron.if	2006-08-24 08:04:23.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -931,7 +923,7 @@
  	allow $1 system_crond_t:process sigchld;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.9/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-08-18 07:32:40.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/cron.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cron.te	2006-08-24 08:04:23.000000000 -0400
 @@ -146,6 +146,8 @@
  	')
  ')
@@ -962,7 +954,7 @@
  		# via redirection of standard out.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.9/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/cups.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cups.te	2006-08-24 08:04:23.000000000 -0400
 @@ -74,13 +74,14 @@
  #
  
@@ -1032,7 +1024,7 @@
  fs_search_auto_mountpoints(hplip_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.9/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/cyrus.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/cyrus.te	2006-08-24 08:04:23.000000000 -0400
 @@ -69,6 +69,7 @@
  corenet_udp_sendrecv_all_ports(cyrus_t)
  corenet_tcp_bind_all_nodes(cyrus_t)
@@ -1051,7 +1043,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.9/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/dbus.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/dbus.if	2006-08-24 08:04:23.000000000 -0400
 @@ -123,6 +123,7 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
@@ -1074,7 +1066,7 @@
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.3.9/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/dbus.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/dbus.te	2006-08-24 08:04:23.000000000 -0400
 @@ -38,6 +38,7 @@
  allow system_dbusd_t self:unix_stream_socket { connectto create_stream_socket_perms connectto };
  allow system_dbusd_t self:unix_dgram_socket create_socket_perms;
@@ -1093,7 +1085,7 @@
  seutil_read_default_contexts(system_dbusd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.9/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/dovecot.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/dovecot.te	2006-08-24 08:04:23.000000000 -0400
 @@ -168,7 +168,7 @@
  # Allow dovecot to create and read SSL parameters file
  allow dovecot_t dovecot_var_lib_t:dir rw_dir_perms;
@@ -1114,7 +1106,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.te serefpolicy-2.3.9/policy/modules/services/inn.te
 --- nsaserefpolicy/policy/modules/services/inn.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/inn.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/inn.te	2006-08-24 08:04:23.000000000 -0400
 @@ -36,6 +36,7 @@
  allow innd_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow innd_t self:tcp_socket create_stream_socket_perms;
@@ -1125,7 +1117,7 @@
  allow innd_t innd_etc_t:dir r_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.9/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/ldap.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ldap.te	2006-08-24 08:04:23.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -1137,7 +1129,7 @@
  kernel_read_kernel_sysctls(slapd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-2.3.9/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/mta.fc	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/mta.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -2,6 +2,8 @@
  /etc/aliases		--	gen_context(system_u:object_r:etc_aliases_t,s0)
  /etc/aliases\.db	--	gen_context(system_u:object_r:etc_aliases_t,s0)
@@ -1149,7 +1141,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.9/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/ntp.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ntp.te	2006-08-24 08:04:23.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -1172,7 +1164,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-2.3.9/policy/modules/services/oddjob.fc
 --- nsaserefpolicy/policy/modules/services/oddjob.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob.fc	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,8 @@
 +# oddjob executable will have:
 +# label: system_u:object_r:oddjob_exec_t
@@ -1184,7 +1176,7 @@
 +/usr/lib/oddjobd			gen_context(system_u:object_r:oddjob_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-2.3.9/policy/modules/services/oddjob.if
 --- nsaserefpolicy/policy/modules/services/oddjob.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob.if	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,76 @@
 +## <summary>policy for oddjob</summary>
 +
@@ -1264,7 +1256,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.fc
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.fc	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,6 @@
 +# oddjob_mkhomedir executable will have:
 +# label: system_u:object_r:oddjob_mkhomedir_exec_t
@@ -1274,7 +1266,7 @@
 +/usr/lib/oddjob/mkhomedir		--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.if
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.if	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,24 @@
 +## <summary>policy for oddjob_mkhomedir</summary>
 +
@@ -1302,7 +1294,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.te
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.te	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,26 @@
 +policy_module(oddjob_mkhomedir,1.0.0)
 +
@@ -1332,7 +1324,7 @@
 +allow oddjob_mkhomedir_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-2.3.9/policy/modules/services/oddjob.te
 --- nsaserefpolicy/policy/modules/services/oddjob.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/oddjob.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/oddjob.te	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,70 @@
 +policy_module(oddjob,1.0.0)
 +
@@ -1406,7 +1398,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.9/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/openvpn.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/openvpn.te	2006-08-24 08:04:23.000000000 -0400
 @@ -33,7 +33,7 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -1418,7 +1410,7 @@
  allow openvpn_t openvpn_etc_t:file r_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.9/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/pegasus.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/pegasus.if	2006-08-24 08:04:23.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -1454,7 +1446,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.9/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/pegasus.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/pegasus.te	2006-08-24 08:04:23.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -1473,7 +1465,7 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.9/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/postfix.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/postfix.te	2006-08-24 08:04:23.000000000 -0400
 @@ -250,6 +250,7 @@
  allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
  
@@ -1511,7 +1503,7 @@
  	postgrey_stream_connect(postfix_smtpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-2.3.9/policy/modules/services/postgresql.te
 --- nsaserefpolicy/policy/modules/services/postgresql.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/postgresql.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/postgresql.te	2006-08-24 08:04:23.000000000 -0400
 @@ -134,6 +134,7 @@
  seutil_dontaudit_search_config(postgresql_t)
  
@@ -1522,7 +1514,7 @@
  userdom_dontaudit_use_sysadm_ttys(postgresql_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.9/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/procmail.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/procmail.te	2006-08-24 08:04:23.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -1533,7 +1525,7 @@
  corenet_tcp_sendrecv_all_nodes(procmail_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.3.9/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/pyzor.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/pyzor.te	2006-08-24 08:04:23.000000000 -0400
 @@ -126,3 +126,4 @@
  optional_policy(`
  	logging_send_syslog_msg(pyzord_t)
@@ -1541,7 +1533,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.3.9/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/radius.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/radius.te	2006-08-24 08:04:23.000000000 -0400
 @@ -31,7 +31,7 @@
  # gzip also needs chown access to preserve GID for radwtmp files
  allow radiusd_t self:capability { chown dac_override fsetid kill setgid setuid sys_resource sys_tty_config };
@@ -1553,7 +1545,7 @@
  allow radiusd_t self:tcp_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.fc serefpolicy-2.3.9/policy/modules/services/ricci.fc
 --- nsaserefpolicy/policy/modules/services/ricci.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ricci.fc	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ricci.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,20 @@
 +# ricci executable will have:
 +# label: system_u:object_r:ricci_exec_t
@@ -1577,7 +1569,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.if serefpolicy-2.3.9/policy/modules/services/ricci.if
 --- nsaserefpolicy/policy/modules/services/ricci.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ricci.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ricci.if	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,184 @@
 +## <summary>policy for ricci</summary>
 +
@@ -1765,7 +1757,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.3.9/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/ricci.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ricci.te	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,373 @@
 +policy_module(ricci,1.0.0)
 +
@@ -2142,7 +2134,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-2.3.9/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/rpc.if	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/rpc.if	2006-08-24 08:04:23.000000000 -0400
 @@ -51,6 +51,8 @@
  	kernel_rw_rpc_sysctls($1_t)
  
@@ -2154,7 +2146,7 @@
  	corenet_tcp_sendrecv_all_if($1_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.3.9/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/rpc.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/rpc.te	2006-08-24 08:04:23.000000000 -0400
 @@ -39,6 +39,7 @@
  
  allow rpcd_t self:capability { chown dac_override setgid setuid };
@@ -2184,7 +2176,7 @@
  fs_read_rpc_files(gssd_t) 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.9/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/samba.te	2006-08-23 13:09:33.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/samba.te	2006-08-24 08:04:23.000000000 -0400
 @@ -171,7 +171,7 @@
  #
  # smbd Local policy
@@ -2223,7 +2215,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.9/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.fc	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -2236,15 +2228,15 @@
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.9/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.if	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.if	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.9/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.te	2006-08-23 13:09:34.000000000 -0400
-@@ -0,0 +1,110 @@
++++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.te	2006-08-24 15:59:58.000000000 -0400
+@@ -0,0 +1,111 @@
 +policy_module(setroubleshoot,1.0.0)
 +
 +########################################
@@ -2276,7 +2268,7 @@
 +allow setroubleshootd_t self:capability { dac_override sys_tty_config };
 +allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
 +allow setroubleshootd_t self:process { signal getattr };
-+allow setroubleshootd_t self:fifo_file { read write };
++allow setroubleshootd_t self:fifo_file rw_file_perms;
 +allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
 +allow setroubleshootd_t self:unix_dgram_socket create_socket_perms;
 +allow setroubleshootd_t self:netlink_route_socket r_netlink_socket_perms;
@@ -2327,6 +2319,7 @@
 +
 +corecmd_exec_sbin(setroubleshootd_t)
 +corecmd_exec_bin(setroubleshootd_t)
++corecmd_exec_shell(setroubleshootd_t)
 +
 +dev_read_urand(setroubleshootd_t)
 +
@@ -2357,7 +2350,7 @@
 +files_dontaudit_search_src(setroubleshootd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.9/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/spamassassin.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/spamassassin.te	2006-08-24 08:04:23.000000000 -0400
 @@ -193,3 +193,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
@@ -2368,7 +2361,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.9/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/squid.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/squid.te	2006-08-24 08:04:23.000000000 -0400
 @@ -28,9 +28,9 @@
  # Local policy
  #
@@ -2383,7 +2376,7 @@
  allow squid_t self:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.9/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/ssh.if	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/ssh.if	2006-08-24 08:04:23.000000000 -0400
 @@ -711,3 +711,27 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
@@ -2414,7 +2407,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.9/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/stunnel.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/stunnel.te	2006-08-24 08:04:23.000000000 -0400
 @@ -38,6 +38,7 @@
  allow stunnel_t self:fifo_file rw_file_perms;
  allow stunnel_t self:tcp_socket create_stream_socket_perms;
@@ -2433,7 +2426,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-2.3.9/policy/modules/services/sysstat.te
 --- nsaserefpolicy/policy/modules/services/sysstat.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/sysstat.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/sysstat.te	2006-08-24 08:04:23.000000000 -0400
 @@ -36,6 +36,8 @@
  kernel_read_fs_sysctls(sysstat_t)
  kernel_read_rpc_sysctls(sysstat_t)
@@ -2453,7 +2446,7 @@
  init_use_script_ptys(sysstat_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.9/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/xserver.if	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/xserver.if	2006-08-24 08:04:23.000000000 -0400
 @@ -45,7 +45,6 @@
  	allow $1_xserver_t self:capability { dac_override fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
  	dontaudit $1_xserver_t self:capability chown;
@@ -2560,7 +2553,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.9/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/services/xserver.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/services/xserver.te	2006-08-24 08:04:23.000000000 -0400
 @@ -81,15 +81,19 @@
  #
  
@@ -2638,7 +2631,7 @@
  	unconfined_domtrans(xdm_xserver_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.9/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/authlogin.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/authlogin.te	2006-08-24 08:04:23.000000000 -0400
 @@ -215,12 +215,19 @@
  logging_send_syslog_msg(pam_console_t)
  
@@ -2670,7 +2663,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.9/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/fstools.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/fstools.te	2006-08-24 08:04:23.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -2681,7 +2674,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.9/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/hostname.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/hostname.te	2006-08-24 08:04:23.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -2706,7 +2699,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.9/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/init.if	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/init.if	2006-08-24 08:04:23.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -2723,7 +2716,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.9/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/init.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/init.te	2006-08-24 08:04:23.000000000 -0400
 @@ -361,6 +361,8 @@
  logging_read_audit_config(initrc_t)
  
@@ -2735,7 +2728,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.9/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/libraries.fc	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/libraries.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -109,6 +109,8 @@
  /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
  
@@ -2766,7 +2759,7 @@
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.9/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/locallogin.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/locallogin.te	2006-08-24 08:04:23.000000000 -0400
 @@ -47,7 +47,7 @@
  allow local_login_t self:sem create_sem_perms;
  allow local_login_t self:msgq create_msgq_perms;
@@ -2787,7 +2780,7 @@
  dev_getattr_mouse_dev(local_login_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.9/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/logging.fc	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/logging.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -38,3 +38,6 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
@@ -2797,7 +2790,7 @@
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.9/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/logging.if	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/logging.if	2006-08-24 08:04:23.000000000 -0400
 @@ -553,3 +553,24 @@
  	allow $1 var_log_t:dir rw_dir_perms;
  	allow $1 var_log_t:file create_file_perms;
@@ -2825,7 +2818,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.9/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/logging.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/logging.te	2006-08-24 08:04:23.000000000 -0400
 @@ -120,9 +120,10 @@
  allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
  allow auditd_t var_log_t:dir search;
@@ -2840,7 +2833,7 @@
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.3.9/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/lvm.fc	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/lvm.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -14,7 +14,6 @@
  
  /etc/lvmtab(/.*)?		gen_context(system_u:object_r:lvm_metadata_t,s0)
@@ -2856,7 +2849,7 @@
 +/var/run/multipathd.sock	-s	gen_context(system_u:object_r:lvm_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.9/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/lvm.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/lvm.te	2006-08-24 08:04:23.000000000 -0400
 @@ -125,7 +125,7 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
@@ -2886,7 +2879,7 @@
  allow lvm_t lvm_etc_t:lnk_file r_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.9/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/miscfiles.fc	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/miscfiles.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -9,6 +9,7 @@
  # /etc
  #
@@ -2897,7 +2890,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.9/policy/modules/system/miscfiles.if
 --- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/miscfiles.if	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/miscfiles.if	2006-08-24 08:04:23.000000000 -0400
 @@ -116,6 +116,24 @@
  
  ########################################
@@ -2925,7 +2918,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.9/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/modutils.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/modutils.te	2006-08-24 08:04:23.000000000 -0400
 @@ -183,6 +183,7 @@
  fs_getattr_xattr_fs(depmod_t)
  
@@ -2936,7 +2929,7 @@
  corecmd_search_sbin(depmod_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.9/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/mount.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/mount.te	2006-08-24 08:04:23.000000000 -0400
 @@ -80,6 +80,7 @@
  files_read_isid_type_files(mount_t)
  # For reading cert files
@@ -2973,7 +2966,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.9/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/selinuxutil.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/selinuxutil.te	2006-08-24 08:04:23.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -3017,7 +3010,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.9/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/udev.fc	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/udev.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -1,5 +1,6 @@
  # udev
  
@@ -3027,7 +3020,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.9/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/udev.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/udev.te	2006-08-24 08:04:23.000000000 -0400
 @@ -131,6 +131,7 @@
  mls_file_upgrade(udev_t)
  mls_file_downgrade(udev_t)
@@ -3048,7 +3041,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.9/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/unconfined.if	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/unconfined.if	2006-08-24 08:04:23.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -3067,7 +3060,7 @@
  	selinux_unconfined($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.9/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/unconfined.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/unconfined.te	2006-08-24 08:04:23.000000000 -0400
 @@ -195,4 +195,9 @@
  ifdef(`targeted_policy',`
  	allow unconfined_execmem_t self:process { execstack execmem };
@@ -3080,7 +3073,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.9/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/userdomain.if	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/userdomain.if	2006-08-24 08:04:23.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -3555,7 +3548,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.9/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/userdomain.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/userdomain.te	2006-08-24 08:04:23.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -3657,7 +3650,7 @@
  			selinux_set_boolean(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.9/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/xen.if	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/xen.if	2006-08-24 08:04:23.000000000 -0400
 @@ -127,3 +127,41 @@
  	allow xm_t $1:fifo_file rw_file_perms;
  	allow xm_t $1:process sigchld;
@@ -3702,7 +3695,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.9/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/system/xen.te	2006-08-23 13:09:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/xen.te	2006-08-24 08:04:23.000000000 -0400
 @@ -69,7 +69,10 @@
  #
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- selinux-policy.spec	23 Aug 2006 20:42:38 -0000	1.256
+++ selinux-policy.spec	24 Aug 2006 20:31:13 -0000	1.257
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.9
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,7 +347,10 @@
 %endif
 
 %changelog
-* Sun Aug 23 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-1
+* Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-2
+- Fixes for setroubleshoot
+
+* Wed Aug 23 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-1
 - Update to upstream
 
 * Sun Aug 20 2006 Dan Walsh <dwalsh at redhat.com> 2.3.8-2



From fedora-cvs-commits at redhat.com  Thu Aug 24 20:39:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 16:39:24 -0400
Subject: rpms/mx4j/devel mx4j-build.patch,1.2,1.3 mx4j.spec,1.55,1.56
Message-ID: <200608242039.k7OKdO1r031567@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27580

Modified Files:
	mx4j-build.patch mx4j.spec 
Log Message:

Fixed build.xml so that it can pick up local dtd files correctly.



mx4j-build.patch:
 build.xml |   53 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 11 deletions(-)

Index: mx4j-build.patch
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mx4j-build.patch	19 Jul 2006 18:55:34 -0000	1.2
+++ mx4j-build.patch	24 Aug 2006 20:39:20 -0000	1.3
@@ -1,5 +1,5 @@
---- build/build.xml.sav	2005-03-01 11:14:37.000000000 +0100
-+++ build/build.xml	2006-03-10 16:45:56.000000000 +0100
+--- ./build/build.xml.sav	2005-03-01 05:14:37.000000000 -0500
++++ ./build/build.xml	2006-08-24 16:07:11.000000000 -0400
 @@ -55,6 +55,9 @@
     <property name="rjmx.jar.file" value="${dist.lib.dir}/${name}-rjmx.jar"/>
     <property name="rimpl.jar.file" value="${dist.lib.dir}/${name}-rimpl.jar"/>
@@ -18,7 +18,7 @@
  
        <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
           <patternset refid="mx4j.classes"/>
-@@ -270,8 +265,29 @@
+@@ -270,8 +274,29 @@
        </javac>
        <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
        <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
@@ -48,7 +48,7 @@
  
        <jar jarfile="${rjmx.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
           <fileset dir="${core.classes.dir}">
-@@ -423,8 +439,7 @@
+@@ -423,8 +448,7 @@
           author="true"
           version="true"
           use="true"
@@ -58,7 +58,7 @@
           <package name="mx4j.*"/>
  
           <bottom><![CDATA[<center><small>Copyright &#169; 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
-@@ -437,8 +452,6 @@
+@@ -437,8 +461,6 @@
     </target>
  
     <target name="docs" description="Builds the MX4J documentation">
@@ -67,17 +67,26 @@
        <mkdir dir="${dist.docs.dir}"/>
  
        <style processor="trax"
-@@ -450,9 +463,6 @@
-          classpathref="lib.classpath"
-          />
- 
+@@ -447,11 +469,13 @@
+          force="yes"
+          style="${docs.src.dir}/xsl/mx4j-chunk.xsl"
+          includes="${root.document.name}"
+-         classpathref="lib.classpath"
+-         />
+-
 -      <delete dir="${docs.src.dir}/docbook" quiet="true"/>
 -      <delete dir="${docs.src.dir}/docbookx" quiet="true"/>
--
++         classpathref="lib.classpath">
++        <xmlcatalog>
++          <catalogpath>
++            <pathelement location="/etc/xml/catalog"/>
++          </catalogpath>
++        </xmlcatalog>
++      </style>
+ 
        <!-- Bug in Ant forces this move, since destdir of the style task does not work -->
        <move todir="${dist.docs.dir}">
-          <fileset dir="${basedir}/build">
-@@ -583,7 +593,8 @@
+@@ -583,7 +607,8 @@
              <include name="wsdl4j.jar"/>
              <include name="commons-discovery.jar"/>
              <include name="org.mortbay.jetty.jar"/>
@@ -87,7 +96,7 @@
              <!-- Also jars downloaded apart -->
              <include name="servlet.jar"/>
              <include name="jython.jar"/>
-@@ -612,7 +623,9 @@
+@@ -612,7 +637,9 @@
  
     <target name="single-test" description="Executes the test class defined by the system property 'testname'" depends="tests">
        <junit printsummary="withOutAndErr" fork="yes" dir="${basedir}" showoutput="yes">
@@ -98,7 +107,7 @@
           <!--sysproperty key="java.security.debug" value="access.failure"/-->
           <formatter type="plain" usefile="no"/>
           <test name="${testname}" if="testname" fork="yes"/>
-@@ -639,6 +652,8 @@
+@@ -639,6 +666,8 @@
  
        <junit printsummary="withOutAndErr" fork="yes" timeout="300000" dir="${basedir}" showoutput="yes">
           <sysproperty key="mx4j.log.priority" value="warn"/>
@@ -107,7 +116,7 @@
           <!-- sysproperty key="java.security.debug" value="access.failure"/-->
           <formatter type="xml"/>
           <batchtest fork="yes" todir="${test.xml.dir}">
-@@ -687,6 +702,8 @@
+@@ -687,6 +716,8 @@
  
        <junit printsummary="withOutAndErr" fork="yes" timeout="300000" dir="${basedir}" showoutput="yes">
           <sysproperty key="mx4j.log.priority" value="warn"/>


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mx4j.spec	18 Aug 2006 15:10:26 -0000	1.55
+++ mx4j.spec	24 Aug 2006 20:39:20 -0000	1.56
@@ -171,7 +171,6 @@
 popd
 
 %build
-export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-trax jaxp_transform_impl"
 
 cd build
 # ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
@@ -256,6 +255,7 @@
 %changelog
 * Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-6jpp.1
 - Merge with upstream
+- Fixed build file to correctly resolve dtds.
 
 * Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-6jpp
 - Rebuild



From fedora-cvs-commits at redhat.com  Thu Aug 24 20:53:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 16:53:43 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch, 1.18,
	1.19 selinux-policy.spec, 1.257, 1.258
Message-ID: <200608242053.k7OKrhrT017712@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17678

Modified Files:
	policy-20060802.patch selinux-policy.spec 
Log Message:
* Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-3
- Fix xen tty devices


policy-20060802.patch:
 mls                                  |    9 
 modules/admin/amanda.fc              |   51 ----
 modules/admin/anaconda.te            |   20 +
 modules/admin/bootloader.te          |    4 
 modules/admin/consoletype.te         |   11 -
 modules/admin/firstboot.te           |    2 
 modules/admin/prelink.te             |    2 
 modules/admin/rpm.fc                 |    2 
 modules/admin/rpm.if                 |   13 -
 modules/admin/usermanage.te          |    5 
 modules/apps/java.fc                 |    9 
 modules/apps/mozilla.if              |    2 
 modules/apps/wine.te                 |    2 
 modules/kernel/corecommands.fc       |    1 
 modules/kernel/corecommands.if       |    1 
 modules/kernel/corenetwork.te.in     |    7 
 modules/kernel/devices.fc            |    2 
 modules/kernel/devices.if            |   36 +++
 modules/kernel/devices.te            |    8 
 modules/kernel/files.if              |   18 +
 modules/kernel/filesystem.te         |    2 
 modules/kernel/kernel.if             |   75 +++++++
 modules/kernel/terminal.fc           |    2 
 modules/kernel/terminal.if           |   19 +
 modules/services/amavis.te           |    7 
 modules/services/apache.te           |    2 
 modules/services/avahi.te            |    2 
 modules/services/bind.te             |    1 
 modules/services/ccs.fc              |    8 
 modules/services/ccs.if              |   45 ++++
 modules/services/ccs.te              |   84 +++++++
 modules/services/cpucontrol.te       |    2 
 modules/services/cron.if             |   17 +
 modules/services/cron.te             |    7 
 modules/services/cups.te             |   19 +
 modules/services/cyrus.te            |    5 
 modules/services/dbus.if             |    6 
 modules/services/dbus.te             |    2 
 modules/services/dovecot.te          |    4 
 modules/services/inn.te              |    1 
 modules/services/ldap.te             |    2 
 modules/services/mta.fc              |    2 
 modules/services/ntp.te              |    6 
 modules/services/oddjob.fc           |    8 
 modules/services/oddjob.if           |   76 +++++++
 modules/services/oddjob.te           |   70 ++++++
 modules/services/oddjob_mkhomedir.fc |    6 
 modules/services/oddjob_mkhomedir.if |   24 ++
 modules/services/oddjob_mkhomedir.te |   26 ++
 modules/services/openvpn.te          |    2 
 modules/services/pegasus.if          |   31 ++
 modules/services/pegasus.te          |    5 
 modules/services/postfix.te          |    7 
 modules/services/postgresql.te       |    1 
 modules/services/procmail.te         |    1 
 modules/services/pyzor.te            |    1 
 modules/services/radius.te           |    2 
 modules/services/ricci.fc            |   20 +
 modules/services/ricci.if            |  184 +++++++++++++++++
 modules/services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++
 modules/services/rpc.if              |    2 
 modules/services/rpc.te              |    6 
 modules/services/samba.te            |    8 
 modules/services/setroubleshoot.fc   |    9 
 modules/services/setroubleshoot.if   |    3 
 modules/services/setroubleshoot.te   |  111 ++++++++++
 modules/services/spamassassin.te     |    4 
 modules/services/squid.te            |    4 
 modules/services/ssh.if              |   24 ++
 modules/services/stunnel.te          |    2 
 modules/services/sysstat.te          |    3 
 modules/services/xserver.if          |   69 ++++++
 modules/services/xserver.te          |   19 +
 modules/system/authlogin.te          |   10 
 modules/system/fstools.te            |    1 
 modules/system/hostname.te           |   10 
 modules/system/init.if               |    7 
 modules/system/init.te               |    2 
 modules/system/libraries.fc          |    7 
 modules/system/locallogin.te         |    4 
 modules/system/logging.fc            |    3 
 modules/system/logging.if            |   21 +
 modules/system/logging.te            |    3 
 modules/system/lvm.fc                |    2 
 modules/system/lvm.te                |    6 
 modules/system/miscfiles.fc          |    1 
 modules/system/miscfiles.if          |   18 +
 modules/system/modutils.te           |    1 
 modules/system/mount.te              |    9 
 modules/system/selinuxutil.te        |   13 +
 modules/system/udev.fc               |    1 
 modules/system/udev.te               |    5 
 modules/system/unconfined.if         |    2 
 modules/system/unconfined.te         |    5 
 modules/system/userdomain.if         |  246 +++++++++++++++--------
 modules/system/userdomain.te         |   48 ++--
 modules/system/xen.if                |   38 +++
 modules/system/xen.te                |   26 +-
 98 files changed, 1867 insertions(+), 248 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- policy-20060802.patch	24 Aug 2006 20:31:13 -0000	1.18
+++ policy-20060802.patch	24 Aug 2006 20:53:40 -0000	1.19
@@ -383,7 +383,7 @@
  network_port(spamd, tcp,783,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.9/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/devices.fc	2006-08-24 08:04:23.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/devices.fc	2006-08-24 16:51:53.000000000 -0400
 @@ -36,7 +36,7 @@
  /dev/mpu401.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/null		-c	gen_context(system_u:object_r:null_device_t,s0)
@@ -597,6 +597,15 @@
 +	dontaudit $1 proc_type:file getattr;
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.fc serefpolicy-2.3.9/policy/modules/kernel/terminal.fc
+--- nsaserefpolicy/policy/modules/kernel/terminal.fc	2006-08-20 10:55:49.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/terminal.fc	2006-08-24 16:52:33.000000000 -0400
+@@ -34,3 +34,5 @@
+ # used by init scripts to initally populate udev /dev
+ /lib/udev/devices/console -c	gen_context(system_u:object_r:console_device_t,s0)
+ ')
++
++/dev/xvc[0-9]*		-c	gen_context(system_u:object_r:tty_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.9/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-23 12:14:51.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/terminal.if	2006-08-24 08:04:23.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- selinux-policy.spec	24 Aug 2006 20:31:13 -0000	1.257
+++ selinux-policy.spec	24 Aug 2006 20:53:40 -0000	1.258
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.9
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-3
+- Fix xen tty devices
+
 * Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-2
 - Fixes for setroubleshoot
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 20:56:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 16:56:37 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.125, 1.126 kudzu.spec, 1.143,
	1.144 sources, 1.141, 1.142
Message-ID: <200608242056.k7OKublo018945@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18902/devel

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
auto-import kudzu-1.2.46-1 on branch devel from kudzu-1.2.46-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- .cvsignore	24 Aug 2006 14:34:31 -0000	1.125
+++ .cvsignore	24 Aug 2006 20:56:35 -0000	1.126
@@ -1 +1 @@
-kudzu-1.2.44.tar.gz
+kudzu-1.2.46.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- kudzu.spec	24 Aug 2006 14:34:31 -0000	1.143
+++ kudzu.spec	24 Aug 2006 20:56:35 -0000	1.144
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.44
+Version: 1.2.46
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -8,7 +8,7 @@
 Source: kudzu-%{PACKAGE_VERSION}.tar.gz
 Obsoletes: rhs-hwdiag setconsole
 Prereq: chkconfig, modutils >= 2.3.11-5, /etc/init.d
-Requires: pam >= 0.74-17, hwdata
+Requires: pam >= 0.74-17
 Conflicts: netconfig < 0.8.18, kernel < 2.6.13
 Requires: hwdata >= 0.169-1, hal >= 0.2.96
 BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext
@@ -31,11 +31,6 @@
 
 %setup
 
-# hack: do not start kudzu on s390/s390x on bootup
-%ifarch s390 s390x
-perl -pi -e "s/345/-/g" kudzu.init
-%endif
-
 %build
 ln -s `pwd` kudzu
 
@@ -79,6 +74,15 @@
 %{_includedir}/kudzu
 
 %changelog
+* Thu Aug 24 2006 Jeremy Katz <katzj at redhat.com> - 1.2.46-1
+- Xen console support
+
+* Thu Aug 24 2006 Bill Nottingham <notting at redhat.com> - 1.2.45-1
+- various cleanups:
+  - don't sed the initscript on s390
+  - don't explicitly configure parport_serial
+  - fix X configuration
+
 * Thu Aug 24 2006 Bill Nottingham <notting at redhat.com> - 1.2.44-1
 - remove debugging noise (#203909)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- sources	24 Aug 2006 14:34:31 -0000	1.141
+++ sources	24 Aug 2006 20:56:35 -0000	1.142
@@ -1 +1 @@
-74055ec27b41d3b03b6b298552d77ed8  kudzu-1.2.44.tar.gz
+cf1e5c4cbda49f7900585bdd17e3443c  kudzu-1.2.46.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 24 20:57:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 16:57:54 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.56,1.57
Message-ID: <200608242057.k7OKvsqE019578@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19410

Modified Files:
	mx4j.spec 
Log Message:

Add OPT_JAR_LIST and xml-commons-resolver to the list




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- mx4j.spec	24 Aug 2006 20:39:20 -0000	1.56
+++ mx4j.spec	24 Aug 2006 20:57:52 -0000	1.57
@@ -172,6 +172,8 @@
 
 %build
 
+export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-trax jaxp_transform_impl xml-commons-resolver"
+
 cd build
 # ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
 ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools javadocs docs



From fedora-cvs-commits at redhat.com  Thu Aug 24 21:09:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 17:09:57 -0400
Subject: rpms/libgnomeprintui22/devel
	libgnomeprintui22-print-job-preview.patch, NONE,
	1.1 libgnomeprintui22.spec, 1.35, 1.36
Message-ID: <200608242109.k7OL9vV3022331@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/libgnomeprintui22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21325

Modified Files:
	libgnomeprintui22.spec 
Added Files:
	libgnomeprintui22-print-job-preview.patch 
Log Message:

* Thu Aug 24 2006 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-6
- Add patch to fix print preview crashes (RH bug #201155).


libgnomeprintui22-print-job-preview.patch:
 gnome-print-job-preview.c |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE libgnomeprintui22-print-job-preview.patch ---
--- libgnomeprintui-2.12.1/libgnomeprintui/gnome-print-job-preview.c.print-job-preview	2006-08-24 16:34:24.000000000 -0400
+++ libgnomeprintui-2.12.1/libgnomeprintui/gnome-print-job-preview.c	2006-08-24 16:36:32.000000000 -0400
@@ -1548,6 +1548,15 @@
 				"group", group,
 				"theme_compliance", jp->theme_compliance,
 				NULL);
+			if (!jp->pages || !jp->pages->len)
+				p.n = 0;
+			else {
+				GnomePrintJobPreviewPage pp;
+
+				pp = g_array_index (jp->pages, GnomePrintJobPreviewPage,
+						jp->pages->len - 1);
+				p.n = pp.n + 1;
+			}
 			g_array_append_val (jp->pages, p);
 
 			if (jp->pages->len == 1)


Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libgnomeprintui22.spec	28 Jul 2006 15:39:38 -0000	1.35
+++ libgnomeprintui22.spec	24 Aug 2006 21:09:55 -0000	1.36
@@ -6,7 +6,7 @@
 Summary: GUI support for libgnomeprint
 Name: libgnomeprintui22
 Version: 2.12.1
-Release: 5
+Release: 6
 Source0: libgnomeprintui-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=349098 
 Source1: docs.tar.gz
@@ -35,6 +35,9 @@
 # Re-autogen without GNOME_COMPILE_WARNINGS
 Patch1: libgnomeprintui-nognomecommon.patch
 
+# RH bug #201155 (backported from upstream cvs)
+Patch2: libgnomeprintui22-print-job-preview.patch
+
 %description
 
 The libgnomeprintui package contains GTK+ widgets related to printing.
@@ -63,6 +66,7 @@
 tar xzf %{SOURCE1}
 
 %patch1 -p1 -b .nognomecommon
+%patch2 -p1 -b .print-job-preview
 
 %build
 
@@ -106,6 +110,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Aug 24 2006 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-6
+- Add patch to fix print preview crashes (RH bug #201155).
+
 * Fri Jul 28 2006 Matthias Clasen  <mclasen at redhat.com> - 2.12.1-5
 - Re-add docs
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 21:24:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 17:24:12 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.27, 1.28 setroubleshoot.spec,
	1.32, 1.33 sources, 1.30, 1.31
Message-ID: <200608242124.k7OLOCuv016594@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16570/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.34-1 on branch devel from setroubleshoot-0.34-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	23 Aug 2006 20:37:45 -0000	1.27
+++ .cvsignore	24 Aug 2006 21:24:10 -0000	1.28
@@ -1 +1 @@
-setroubleshoot-0.33.tar.gz
+setroubleshoot-0.34.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- setroubleshoot.spec	23 Aug 2006 20:37:45 -0000	1.32
+++ setroubleshoot.spec	24 Aug 2006 21:24:10 -0000	1.33
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.33
+Version: 0.34
 Release: 1
 License: GPL
 Group: Applications/System
@@ -108,6 +108,17 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Thu Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.34-1
+- Standardize on the browser. remove alert window
+-  John Dennis  Changes
+	* remove all vestiges of popup alert, now browser is the only
+	UI game in town
+	* restore the automatic updating of the browser window which had
+	been a regression, the AlertClient class now emits signals which
+	the GUI classes can connect to receive signals from the fault server,
+	also fix the "mark seen" regression
+	* browser.py: restore mark_seen timeout
+
 * Tue Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.33-1
 - Spell check plugins
 - fix dbus instantiation


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	23 Aug 2006 20:37:45 -0000	1.30
+++ sources	24 Aug 2006 21:24:10 -0000	1.31
@@ -1 +1 @@
-667e5d7ba25fea3e74994cc52aebb254  setroubleshoot-0.33.tar.gz
+35e9ed290f7673db4a565dfa1619331f  setroubleshoot-0.34.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 24 21:31:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 17:31:56 -0400
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.33,1.34
Message-ID: <200608242131.k7OLVuQ4016762@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16749

Modified Files:
	setroubleshoot.spec 
Log Message:
* Thu Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.34-1
- Standardize on the browser. remove alert window
-  John Dennis  Changes
	* remove all vestiges of popup alert, now browser is the only
	UI game in town
	* restore the automatic updating of the browser window which had
	been a regression, the AlertClient class now emits signals which
	the GUI classes can connect to receive signals from the fault server,
	also fix the "mark seen" regression
	* browser.py: restore mark_seen timeout



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- setroubleshoot.spec	24 Aug 2006 21:24:10 -0000	1.33
+++ setroubleshoot.spec	24 Aug 2006 21:31:53 -0000	1.34
@@ -105,7 +105,6 @@
 %{_sysconfdir}/xdg/autostart/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/sealert.service
-%{_datadir}/pixmaps/*png
 
 %changelog
 * Thu Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.34-1



From fedora-cvs-commits at redhat.com  Thu Aug 24 21:37:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 17:37:46 -0400
Subject: rpms/kernel/FC-5 .cvsignore,1.416,1.417 sources,1.356,1.357
Message-ID: <200608242137.k7OLbkHO016929@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16915

Modified Files:
	.cvsignore sources 
Log Message:
Never let a rookie do stuff like this unattended... :)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- .cvsignore	22 Aug 2006 20:43:39 -0000	1.416
+++ .cvsignore	24 Aug 2006 21:37:44 -0000	1.417
@@ -6,3 +6,4 @@
 clog
 xen-11061.tar.bz2
 patch-2.6.17.10.bz2
+patch-2.6.17.11.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- sources	22 Aug 2006 20:43:41 -0000	1.356
+++ sources	24 Aug 2006 21:37:44 -0000	1.357
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 71780125173fe1359fec8dabfbd0bc45  xen-11061.tar.bz2
-1707c480ddd60f28bcb7c9bb3eca0aae  patch-2.6.17.10.bz2
+e2449d6cbef24200a5ee65831edb8806  patch-2.6.17.11.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 24 21:38:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 17:38:36 -0400
Subject: rpms/kernel/FC-5 patch-2.6.17.11.bz2,1.1,NONE
Message-ID: <200608242138.k7OLcaSG017028@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17011

Removed Files:
	patch-2.6.17.11.bz2 
Log Message:
patch goes in cache, not in cvs


--- patch-2.6.17.11.bz2 DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 24 21:41:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 17:41:58 -0400
Subject: rpms/kernel/FC-5 upstream,1.324,1.325
Message-ID: <200608242141.k7OLfwIp027640@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24250

Modified Files:
	upstream 
Log Message:
Another little oops to fix


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- upstream	22 Aug 2006 20:53:39 -0000	1.324
+++ upstream	24 Aug 2006 21:41:55 -0000	1.325
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.10.bz2
+patch-2.6.17.11.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 24 22:05:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 18:05:53 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.57,1.58
Message-ID: <200608242205.k7OM5raL016213@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16160

Modified Files:
	mx4j.spec 
Log Message:

Add missing BR.




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mx4j.spec	24 Aug 2006 20:57:52 -0000	1.57
+++ mx4j.spec	24 Aug 2006 22:05:50 -0000	1.58
@@ -55,6 +55,7 @@
 BuildRequires:  jpackage-utils > 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-trax
+BuildRequires:	ant-apache-resolver
 #BuildRequires:  ant-junit
 BuildRequires:	jaf
 BuildRequires:	javamail >= 0:1.2-5jpp
@@ -172,7 +173,7 @@
 
 %build
 
-export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-trax jaxp_transform_impl xml-commons-resolver"
+export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-trax jaxp_transform_impl ant/ant-apache-resolver xml-commons-resolver"
 
 cd build
 # ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs



From fedora-cvs-commits at redhat.com  Thu Aug 24 22:09:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 18:09:35 -0400
Subject: rpms/vte/devel .cvsignore, 1.45, 1.46 sources, 1.45, 1.46 vte.spec,
	1.89, 1.90
Message-ID: <200608242209.k7OM9Z0k017163@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17038

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
- Update to 0.13.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	21 Aug 2006 13:30:57 -0000	1.45
+++ .cvsignore	24 Aug 2006 22:09:32 -0000	1.46
@@ -1 +1 @@
-vte-0.13.6.tar.bz2
+vte-0.13.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	21 Aug 2006 13:30:57 -0000	1.45
+++ sources	24 Aug 2006 22:09:32 -0000	1.46
@@ -1 +1 @@
-6f1e5939c7010fc709453947e4d35227  vte-0.13.6.tar.bz2
+6008a8643e313f212671274ac6662d3b  vte-0.13.7.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- vte.spec	21 Aug 2006 13:30:57 -0000	1.89
+++ vte.spec	24 Aug 2006 22:09:32 -0000	1.90
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.13.6
+Version: 0.13.7
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPL
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Aug 24 2006 Behdad Esfahbod <besfahbo at redhat.com> 0.13.4-1
+- Update to 0.13.7
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.13.6-1.fc6
 - Update to 0.13.6
 



From fedora-cvs-commits at redhat.com  Thu Aug 24 22:26:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 18:26:36 -0400
Subject: rpms/frysk/devel frysk.spec,1.87,1.88
Message-ID: <200608242226.k7OMQaO9004037@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4001

Modified Files:
	frysk.spec 
Log Message:
- Comment out the %check section temporarily.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- frysk.spec	24 Aug 2006 14:38:17 -0000	1.87
+++ frysk.spec	24 Aug 2006 22:26:33 -0000	1.88
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.08.24.rh1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -80,9 +80,11 @@
 
 make %{?_smp_mflags}
 
+%if 0
 %check
 uname -a
 make %{?_smp_mflags} -k check || :
+%endif
 
 %install
 
@@ -113,6 +115,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Fri Aug 25 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.24.rh1-2
+- Comment out the %%check section temporarily.
+
 * Thu Aug 24 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.24.rh1-1
 - New upstream version.
 - Add Requires: libgconf-java



From fedora-cvs-commits at redhat.com  Thu Aug 24 22:30:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 18:30:11 -0400
Subject: rpms/libsepol/devel libsepol.spec,1.139,1.140
Message-ID: <200608242230.k7OMUBlQ005017@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4803

Modified Files:
	libsepol.spec 
Log Message:
Added a Requires tag to prevent breakage when people don't upgrade everything



Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- libsepol.spec	24 Aug 2006 18:11:02 -0000	1.139
+++ libsepol.spec	24 Aug 2006 22:30:08 -0000	1.140
@@ -9,6 +9,8 @@
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Provides: libsepol.so
+# Next item is because of selinux_file_context_local_path
+Requires: libselinux >= 1.30.26
 
 %description
 Security-enhanced Linux is a feature of the Linux?? kernel and a number



From fedora-cvs-commits at redhat.com  Thu Aug 24 23:05:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 19:05:15 -0400
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.6.1-use-mtdriver.patch, 1.1,
	1.2 xorg-x11-drv-ati.spec, 1.41, 1.42
Message-ID: <200608242305.k7ON5FMN029034@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28989

Modified Files:
	radeon-6.6.1-use-mtdriver.patch xorg-x11-drv-ati.spec 
Log Message:
* Thu Aug 24 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-11.fc6
- radeon-6.6.1-use-mtdriver.patch: Only flag modes with M_T_PREFERRED if
  the EDID blocks says to.


radeon-6.6.1-use-mtdriver.patch:
 radeon_driver.c |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

Index: radeon-6.6.1-use-mtdriver.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/radeon-6.6.1-use-mtdriver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon-6.6.1-use-mtdriver.patch	23 Aug 2006 14:22:15 -0000	1.1
+++ radeon-6.6.1-use-mtdriver.patch	24 Aug 2006 23:05:10 -0000	1.2
@@ -1,14 +1,14 @@
---- xf86-video-ati-6.6.1/src/radeon_driver.c.mtdriver	2006-08-18 15:13:54.000000000 -0400
-+++ xf86-video-ati-6.6.1/src/radeon_driver.c	2006-08-18 15:50:44.000000000 -0400
-@@ -3271,6 +3271,7 @@
+--- xf86-video-ati-6.6.1/src/radeon_driver.c.mtdriver	2006-08-24 18:52:37.000000000 -0400
++++ xf86-video-ati-6.6.1/src/radeon_driver.c	2006-08-24 18:58:09.000000000 -0400
+@@ -3271,6 +3271,7 @@ static DisplayModePtr RADEONDDCModes(Scr
      int             j, tmp;
      char            stmp[32];
      xf86MonPtr      ddc   = pScrn->monitor->DDC;
-+    int		    preferred = 1;
++    int		    preferred = PREFERRED_TIMING_MODE(ddc->features.msc);
  
      /* Go thru detailed timing table first */
      for (j = 0; j < 4; j++) {
-@@ -3299,7 +3300,11 @@
+@@ -3299,7 +3300,11 @@ static DisplayModePtr RADEONDDCModes(Scr
  	    new->Clock      = d_timings->clock / 1000;
  	    new->Flags      = (d_timings->interlaced ? V_INTERLACE : 0);
  	    new->status     = MODE_OK;
@@ -21,7 +21,7 @@
  
  	    if (d_timings->sync == 3) {
  		switch (d_timings->misc) {
-@@ -3337,7 +3342,7 @@
+@@ -3337,7 +3342,7 @@ static DisplayModePtr RADEONDDCModes(Scr
  		    new->name = xnfalloc(strlen(p->name) + 1);
  		    strcpy(new->name, p->name);
  		    new->status = MODE_OK;
@@ -30,7 +30,7 @@
  
  		    count++;
  
-@@ -3369,7 +3374,7 @@
+@@ -3369,7 +3374,7 @@ static DisplayModePtr RADEONDDCModes(Scr
  			new->name = xnfalloc(strlen(p->name) + 1);
  			strcpy(new->name, p->name);
  			new->status = MODE_OK;
@@ -39,7 +39,7 @@
  
  			count++;
  
-@@ -3706,7 +3711,7 @@
+@@ -3706,7 +3711,7 @@ static int RADEONValidateFPModes(ScrnInf
  		new->Clock      = info->DotClock;
  		new->Flags     |= RADEON_USE_RMX;
  
@@ -48,7 +48,7 @@
  
  		new->next       = NULL;
  		new->prev       = last;
-@@ -3888,6 +3893,9 @@
+@@ -3888,6 +3893,9 @@ static int RADEONValidateMergeModes(Scrn
       * 'stretched' from their native mode.
       */
      if (info->MergeType == MT_CRT && !info->ddc_mode) {
@@ -58,7 +58,7 @@
   
  	modesFound =
  	    xf86ValidateModes(pScrn,
-@@ -4154,6 +4162,9 @@
+@@ -4154,6 +4162,9 @@ static Bool RADEONPreInitModes(ScrnInfoP
       */
      if (info->DisplayType == MT_CRT && !info->ddc_mode) {
  


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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xorg-x11-drv-ati.spec	23 Aug 2006 14:23:04 -0000	1.41
+++ xorg-x11-drv-ati.spec	24 Aug 2006 23:05:10 -0000	1.42
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -102,6 +102,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Aug 24 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-11.fc6
+- radeon-6.6.1-use-mtdriver.patch: Only flag modes with M_T_PREFERRED if
+  the EDID blocks says to.
+
 * Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-10.fc6
 - radeon-6.6.1-use-mtdriver.patch: Use new M_T_DRIVER mode type for mode
   synthesis.



From fedora-cvs-commits at redhat.com  Thu Aug 24 23:18:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 19:18:45 -0400
Subject: rpms/kernel/devel/configs config-generic,1.237.8.6,1.237.8.7
Message-ID: <200608242318.k7ONIjnq015379@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15194/configs

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-generic 
Log Message:
whole bunch of build cleanups and fixes
remove the sata/sas driver
added a cachefs fix



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237.8.6
retrieving revision 1.237.8.7
diff -u -r1.237.8.6 -r1.237.8.7
--- config-generic	24 Aug 2006 15:28:30 -0000	1.237.8.6
+++ config-generic	24 Aug 2006 23:18:42 -0000	1.237.8.7
@@ -445,23 +445,6 @@
 CONFIG_SCSI_PDC_ADMA=m
 CONFIG_SCSI_HPTIOP=m
 
-CONFIG_ATA=y
-CONFIG_SATA_SVW=m
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_SIL24=m
-CONFIG_PDC_ADMA=m
-
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_INITIO=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set



From fedora-cvs-commits at redhat.com  Thu Aug 24 23:18:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 19:18:45 -0400
Subject: rpms/kernel/devel Makefile.config, 1.46, 1.46.10.1 kernel-2.6.spec,
	1.2519.4.12, 1.2519.4.13 linux-2.6-x86-relocatable.patch,
	1.1.2.1, 1.1.2.2 linux-2.6-sata-big-update.patch, 1.1.2.1,
	NONE linux-2.6-sata-move-to-drivers-ata.patch, 1.1.2.1, NONE
Message-ID: <200608242318.k7ONIj1L015367@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15194

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	Makefile.config kernel-2.6.spec 
	linux-2.6-x86-relocatable.patch 
Removed Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	linux-2.6-sata-big-update.patch 
	linux-2.6-sata-move-to-drivers-ata.patch 
Log Message:
whole bunch of build cleanups and fixes
remove the sata/sas driver
added a cachefs fix



Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.46
retrieving revision 1.46.10.1
diff -u -r1.46 -r1.46.10.1
--- Makefile.config	22 Jul 2006 14:52:52 -0000	1.46
+++ Makefile.config	24 Aug 2006 23:18:41 -0000	1.46.10.1
@@ -72,10 +72,7 @@
 temp-x86_64-xen-generic: configs/config-xen-x86_64 temp-x86_64-xen-generic-tmp
 	perl merge.pl $^ > $@
 
-temp-ia64-xen-generic-tmp: configs/config-xen-generic temp-ia64-generic
-	perl merge.pl $^ > $@
-
-temp-ia64-xen-generic: configs/config-xen-ia64 temp-ia64-xen-generic-tmp
+temp-ia64-xen-generic: configs/config-xen-generic temp-ia64-generic
 	perl merge.pl $^ > $@
 
 kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic
@@ -141,6 +138,5 @@
 kernel-$(VERSION)-x86_64-xen.config: configs/config-x86_64 temp-x86_64-xen-generic
 	perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-ia64-xen.config: configs/config-ia64 temp-ia64-xen-generic
+kernel-$(VERSION)-ia64-xen.config: configs/config-xen-ia64 temp-ia64-xen-generic
 	perl merge.pl $^ ia64 > $@
-


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.12
retrieving revision 1.2519.4.13
diff -u -r1.2519.4.12 -r1.2519.4.13
--- kernel-2.6.spec	24 Aug 2006 15:52:51 -0000	1.2519.4.12
+++ kernel-2.6.spec	24 Aug 2006 23:18:41 -0000	1.2519.4.13
@@ -48,7 +48,7 @@
 %define all_x86 i686
 # we differ here b/c of the reloc patches
 %ifarch i686 x86_64
-%define buildkump 0
+%define buildkdump 0
 %endif
 %else
 %define all_x86 i586 i686
@@ -294,9 +294,7 @@
 Patch314: linux-2.6-ppc-rtas-check.patch
 
 # 400 - 499   ia64
-Patch402: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
-Patch403: linux-2.6-ia64-kexec-kdump.patch
-
+Patch402: linux-2.6-ia64-kexec-kdump.patch
 
 # 500 - 599   s390(x)
 Patch500: linux-2.6-s390-kprobes.patch
@@ -334,6 +332,7 @@
 Patch955: linux-2.6-xen-tux.patch
 Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
 Patch957: linux-2.6-xen-x86-relocatable.patch
+Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
 
 Patch990: linux-2.6-xen-compile-fixes.patch
 
@@ -401,6 +400,7 @@
 Patch1431: linux-2.6-cachefiles.patch
 Patch1432: linux-2.6-filesystem-caching-for-afs-and-nfs.patch
 Patch1433: linux-2.6-nfs-superblock-unmount-optimization.patch
+Patch1434: linux-2.6-nfs-client-double_d-drop.patch
 
 # NFS uses 64-bit inodes
 Patch1440: linux-2.6-nfs-64-bit-inode-support.patch
@@ -449,8 +449,6 @@
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-sata-ata_device_add-oops.patch
 Patch2202: linux-2.6-sata-ahci-suspend.patch
-Patch2203: linux-2.6-sata-move-to-drivers-ata.patch
-Patch2204: linux-2.6-sata-big-update.patch
 
 # ACPI bits
 
@@ -792,6 +790,9 @@
 # Check properly for successful RTAS instantiation
 %patch314 -p1
 
+# ia64 kexec/kdump
+%patch402 -p1
+
 # S390
 # Kprobes.
 %patch500 -p1
@@ -857,6 +858,9 @@
 #xen fix for x86 relocatable support
 %patch957 -p1
 %endif
+# ia64 xen cleanups for kexec/kdump
+%patch958 -p1
+
 
 #%patch990 -p1
 
@@ -951,6 +955,8 @@
 %patch1431 -p1
 %patch1432 -p1
 %patch1433 -p1
+%patch1434 -p1
+
 
 # NFS supports 64-bit inodes
 %patch1440 -p1
@@ -1029,10 +1035,6 @@
 %patch2201 -p1
 # Fix AHCI Suspend.
 %patch2202 -p1
-# move libata to drivers/ata
-%patch2203 -p1
-# big sata update to match upstream 2.6.19 queue
-%patch2204 -p1
 
 # ACPI patches
 
@@ -1056,11 +1058,6 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
-# ia64 kexec/kdump
-%patch402 -p1
-# ia64 xen cleanups for kexec/kdump
-%patch403 -p1
-
 # END OF PATCH APPLICATIONS
 
 cp %{SOURCE10} Documentation/
@@ -1779,7 +1776,6 @@
 
 %changelog
 * Thu Aug 24 2006 Don Zickus <dzickus at redhat.com>
-- added #203781 SATA/SAS update (Jeff Garzik)
 - added #203435/203657 - GFS2 DLM updates (Steven Whitehouse)
 - added #202993 - Inconsistent directory structure (Juan Quintela)
 - added #181358 - kexec/kdump on ia64 (Zou nan hai)
@@ -1787,6 +1783,7 @@
 				Larry Woodman, Juan Quintela)
 - added #203614 - build kernel headers for glibc (David Woodhouse)
 - added #203056/#203387 - utrace refresh (Roland McGrath)
+- added #203861 - nfs client fix (David Howells)
 				
 * Wed Aug 23 2006 Don Zickus <dzickus at redhat.com>
 - modsigning was fixed, but I never enabled applying the patches

linux-2.6-x86-relocatable.patch:
 b/arch/i386/Kconfig                                              |   13 
 b/arch/i386/Makefile                                             |    2 
 b/arch/i386/boot/Makefile                                        |    2 
 b/arch/i386/boot/bootsect.S                                      |   97 +
 b/arch/i386/boot/compressed/Makefile                             |   22 
 b/arch/i386/boot/compressed/head.S                               |  184 ++-
 b/arch/i386/boot/compressed/misc.c                               |  513 ++++++---
 b/arch/i386/boot/compressed/relocs.c                             |  563 ++++++++++
 b/arch/i386/boot/compressed/vmlinux.lds                          |   40 
 b/arch/i386/boot/compressed/vmlinux.scr                          |    3 
 b/arch/i386/boot/setup.S                                         |   29 
 b/arch/i386/boot/tools/build.c                                   |  214 +++
 b/arch/i386/kernel/alternative.c                                 |    8 
 b/arch/i386/kernel/setup.c                                       |    4 
 b/arch/i386/kernel/vmlinux.lds.S                                 |  114 +-
 b/arch/i386/mm/init.c                                            |   15 
 b/arch/x86_64/Kconfig                                            |   19 
 b/arch/x86_64/boot/Makefile                                      |    2 
 b/arch/x86_64/boot/bootsect.S                                    |   93 +
 b/arch/x86_64/boot/compressed/Makefile                           |   13 
 b/arch/x86_64/boot/compressed/head.S                             |  301 +++--
 b/arch/x86_64/boot/compressed/misc.c                             |  500 ++++++--
 b/arch/x86_64/boot/compressed/vmlinux.lds                        |   44 
 b/arch/x86_64/boot/compressed/vmlinux.scr                        |    5 
 b/arch/x86_64/boot/tools/build.c                                 |  232 +++-
 b/arch/x86_64/defconfig                                          |    1 
 b/arch/x86_64/kernel/acpi/sleep.c                                |   19 
 b/arch/x86_64/kernel/acpi/wakeup.S                               |  325 ++---
 b/arch/x86_64/kernel/e820.c                                      |   13 
 b/arch/x86_64/kernel/early_printk.c                              |    3 
 b/arch/x86_64/kernel/head.S                                      |  326 ++---
 b/arch/x86_64/kernel/head64.c                                    |   35 
 b/arch/x86_64/kernel/setup.c                                     |   29 
 b/arch/x86_64/kernel/setup64.c                                   |    1 
 b/arch/x86_64/kernel/smp.c                                       |    2 
 b/arch/x86_64/kernel/suspend.c                                   |    3 
 b/arch/x86_64/kernel/trampoline.S                                |  168 ++
 b/arch/x86_64/kernel/vmlinux.lds.S                               |    2 
 b/arch/x86_64/kernel/vsyscall.c                                  |   10 
 b/arch/x86_64/mm/fault.c                                         |    4 
 b/arch/x86_64/mm/init.c                                          |  288 ++---
 b/arch/x86_64/mm/pageattr.c                                      |   20 
 b/include/asm-generic/vmlinux.lds.h                              |    2 
 b/include/asm-i386/page.h                                        |    4 
 b/include/asm-x86_64/const.h                                     |   20 
 b/include/asm-x86_64/page.h                                      |   44 
 b/include/asm-x86_64/pgtable.h                                   |   39 
 b/include/asm-x86_64/proto.h                                     |    2 
 b/include/asm-x86_64/segment.h                                   |    4 
 b/include/asm-x86_64/suspend.h                                   |   13 
 b/include/linux/elf.h                                            |   27 
 b/include/linux/elf_boot.h                                       |   19 
 b/include/linux/screen_info.h                                    |    3 
 b/scripts/kallsyms.c                                             |   30 
 linux-2.6.17.noarch/arch/x86_64/mm/init.c                        |    2 
 linux-2.6.18-rc3-1M-root/arch/i386/Kconfig                       |   34 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/bootsect.S               |    8 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/head.S        |   28 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/misc.c        |    7 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/vmlinux.lds   |    3 
 linux-2.6.18-rc3-1M-root/arch/i386/kernel/vmlinux.lds.S          |    5 
 linux-2.6.18-rc3-1M-root/arch/powerpc/kernel/vmlinux.lds.S       |    1 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/Makefile               |    3 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/compressed/vmlinux.lds |    2 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/tools/build.c          |  129 +-
 linux-2.6.18-rc3-1M-root/include/asm-i386/boot.h                 |    6 
 66 files changed, 3401 insertions(+), 1315 deletions(-)

Index: linux-2.6-x86-relocatable.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-x86-relocatable.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-x86-relocatable.patch	24 Aug 2006 15:28:30 -0000	1.1.2.1
+++ linux-2.6-x86-relocatable.patch	24 Aug 2006 23:18:42 -0000	1.1.2.2
@@ -7104,3 +7104,26 @@
  #endif
  
 _
+
+
+o ppc64 does not seem to be defining symbol _text  which is used by
+  kernel/kallsyms.c
+
+Signed-off-by: Vivek Goyal <vgoyal at in.ibm.com>
+---
+
+ arch/powerpc/kernel/vmlinux.lds.S |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff -puN arch/powerpc/kernel/vmlinux.lds.S~ppc64-compilation-fix arch/powerpc/kernel/vmlinux.lds.S
+--- linux-2.6.18-rc3-1M/arch/powerpc/kernel/vmlinux.lds.S~ppc64-compilation-fix	2006-08-24 16:16:17.000000000 -0400
++++ linux-2.6.18-rc3-1M-root/arch/powerpc/kernel/vmlinux.lds.S	2006-08-24 16:26:33.000000000 -0400
+@@ -33,6 +33,7 @@ SECTIONS
+ 
+ 	/* Text and gots */
+ 	.text : {
++		_text = .;
+ 		*(.text .text.*)
+ 		SCHED_TEXT
+ 		LOCK_TEXT
+_


--- linux-2.6-sata-big-update.patch DELETED ---


--- linux-2.6-sata-move-to-drivers-ata.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 24 23:20:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 19:20:49 -0400
Subject: rpms/kernel/devel linux-2.6-nfs-client-double_d-drop.patch, NONE,
	1.1.2.1
Message-ID: <200608242320.k7ONKn9h016205@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16048

Added Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	linux-2.6-nfs-client-double_d-drop.patch 
Log Message:
forgot to add the nfs client patch



linux-2.6-nfs-client-double_d-drop.patch:
 fs/nfs/dir.c            |   16 ++++------------
 fs/nfs/nfs3proc.c       |   26 ++++++++++++++++----------
 fs/nfs/nfs4proc.c       |   31 ++++++++++++++++---------------
 fs/nfs/proc.c           |   29 +++++++++++++++++++++--------
 include/linux/nfs_xdr.h |    5 ++---
 5 files changed, 59 insertions(+), 48 deletions(-)

--- NEW FILE linux-2.6-nfs-client-double_d-drop.patch ---
NFS: Fix double d_drop in nfs_instantiate() error path

From: Chuck Lever <chuck.lever at oracle.com>

If the LOOKUP or GETATTR in nfs_instantiate fail, nfs_instantiate will do a
d_drop before returning.  But some callers already do a d_drop in the case
of an error return.  Make certain we do only one d_drop in all error paths.

This issue was introduced because over time, the symlink proc API diverged
slightly from the create/mkdir/mknod proc API.  To prevent other coding
mistakes of this type, change the symlink proc API to be more like
create/mkdir/mknod and move the nfs_instantiate call into the symlink proc
routines so it is used in exactly the same way for create, mkdir, mknod,
and symlink.

Test plan:
Connectathon, all versions of NFS.

Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
---

 fs/nfs/dir.c            |   16 ++++------------
 fs/nfs/nfs3proc.c       |   26 ++++++++++++++++----------
 fs/nfs/nfs4proc.c       |   31 ++++++++++++++++---------------
 fs/nfs/proc.c           |   29 +++++++++++++++++++++--------
 include/linux/nfs_xdr.h |    5 ++---
 5 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 084e8cb..affd3ae 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1147,23 +1147,20 @@ int nfs_instantiate(struct dentry *dentr
 		struct inode *dir = dentry->d_parent->d_inode;
 		error = NFS_PROTO(dir)->lookup(dir, &dentry->d_name, fhandle, fattr);
 		if (error)
-			goto out_err;
+			return error;
 	}
 	if (!(fattr->valid & NFS_ATTR_FATTR)) {
 		struct nfs_server *server = NFS_SB(dentry->d_sb);
 		error = server->nfs_client->rpc_ops->getattr(server, fhandle, fattr);
 		if (error < 0)
-			goto out_err;
+			return error;
 	}
 	inode = nfs_fhget(dentry->d_sb, fhandle, fattr);
 	error = PTR_ERR(inode);
 	if (IS_ERR(inode))
-		goto out_err;
+		return error;
 	d_instantiate(dentry, inode);
 	return 0;
-out_err:
-	d_drop(dentry);
-	return error;
 }
 
 /*
@@ -1448,8 +1445,6 @@ static int
 nfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
 {
 	struct iattr attr;
-	struct nfs_fattr sym_attr;
-	struct nfs_fh sym_fh;
 	struct qstr qsymname;
 	int error;
 
@@ -1473,12 +1468,9 @@ #endif
 
 	lock_kernel();
 	nfs_begin_data_update(dir);
-	error = NFS_PROTO(dir)->symlink(dir, &dentry->d_name, &qsymname,
-					  &attr, &sym_fh, &sym_attr);
+	error = NFS_PROTO(dir)->symlink(dir, dentry, &qsymname, &attr);
 	nfs_end_data_update(dir);
 	if (!error) {
-		error = nfs_instantiate(dentry, &sym_fh, &sym_attr);
-	} else {
		if (error == -EEXIST)
			printk("nfs_proc_symlink: %s/%s already exists??\n",
			       dentry->d_parent->d_name.name, dentry->d_name.name);
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index 9e8258e..d85ac42 100644
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -544,23 +544,23 @@ nfs3_proc_link(struct inode *inode, stru
 }
 
 static int
-nfs3_proc_symlink(struct inode *dir, struct qstr *name, struct qstr *path,
-		  struct iattr *sattr, struct nfs_fh *fhandle,
-		  struct nfs_fattr *fattr)
+nfs3_proc_symlink(struct inode *dir, struct dentry *dentry, struct qstr *path,
+		  struct iattr *sattr)
 {
-	struct nfs_fattr	dir_attr;
+	struct nfs_fh fhandle;
+	struct nfs_fattr fattr, dir_attr;
 	struct nfs3_symlinkargs	arg = {
 		.fromfh		= NFS_FH(dir),
-		.fromname	= name->name,
-		.fromlen	= name->len,
+		.fromname	= dentry->d_name.name,
+		.fromlen	= dentry->d_name.len,
 		.topath		= path->name,
 		.tolen		= path->len,
 		.sattr		= sattr
 	};
 	struct nfs3_diropres	res = {
 		.dir_attr	= &dir_attr,
-		.fh		= fhandle,
-		.fattr		= fattr
+		.fh		= &fhandle,
+		.fattr		= &fattr
 	};
 	struct rpc_message msg = {
 		.rpc_proc	= &nfs3_procedures[NFS3PROC_SYMLINK],
@@ -571,11 +571,17 @@ nfs3_proc_symlink(struct inode *dir, str
 
 	if (path->len > NFS3_MAXPATHLEN)
 		return -ENAMETOOLONG;
-	dprintk("NFS call  symlink %s -> %s\n", name->name, path->name);
+
+	dprintk("NFS call  symlink %s -> %s\n", dentry->d_name.name,
+			path->name);
 	nfs_fattr_init(&dir_attr);
-	nfs_fattr_init(fattr);
+	nfs_fattr_init(&fattr);
 	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
 	nfs_post_op_update_inode(dir, &dir_attr);
+	if (status != 0)
+		goto out;
+	status = nfs_instantiate(dentry, &fhandle, &fattr);
+out:
 	dprintk("NFS reply symlink: %d\n", status);
 	return status;
 }
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 17c46a3..de4a76b 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2084,24 +2084,24 @@ static int nfs4_proc_link(struct inode *
 	return err;
 }
 
-static int _nfs4_proc_symlink(struct inode *dir, struct qstr *name,
-		struct qstr *path, struct iattr *sattr, struct nfs_fh *fhandle,
-		struct nfs_fattr *fattr)
+static int _nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,
+		struct qstr *path, struct iattr *sattr)
 {
 	struct nfs_server *server = NFS_SERVER(dir);
-	struct nfs_fattr dir_fattr;
+	struct nfs_fh fhandle;
+	struct nfs_fattr fattr, dir_fattr;
 	struct nfs4_create_arg arg = {
 		.dir_fh = NFS_FH(dir),
 		.server = server,
-		.name = name,
+		.name = &dentry->d_name,
 		.attrs = sattr,
 		.ftype = NF4LNK,
 		.bitmask = server->attr_bitmask,
 	};
 	struct nfs4_create_res res = {
 		.server = server,
-		.fh = fhandle,
-		.fattr = fattr,
+		.fh = &fhandle,
+		.fattr = &fattr,
 		.dir_fattr = &dir_fattr,
 	};
 	struct rpc_message msg = {
@@ -2113,27 +2113,28 @@ static int _nfs4_proc_symlink(struct ino
 
 	if (path->len > NFS4_MAXPATHLEN)
 		return -ENAMETOOLONG;
+
 	arg.u.symlink = path;
-	nfs_fattr_init(fattr);
+	nfs_fattr_init(&fattr);
 	nfs_fattr_init(&dir_fattr);
 	
 	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
-	if (!status)
+	if (!status) {
 		update_changeattr(dir, &res.dir_cinfo);
-	nfs_post_op_update_inode(dir, res.dir_fattr);
+		nfs_post_op_update_inode(dir, res.dir_fattr);
+		status = nfs_instantiate(dentry, &fhandle, &fattr);
+	}
 	return status;
 }
 
-static int nfs4_proc_symlink(struct inode *dir, struct qstr *name,
-		struct qstr *path, struct iattr *sattr, struct nfs_fh *fhandle,
-		struct nfs_fattr *fattr)
+static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,
+		struct qstr *path, struct iattr *sattr)
 {
 	struct nfs4_exception exception = { };
 	int err;
 	do {
 		err = nfs4_handle_exception(NFS_SERVER(dir),
-				_nfs4_proc_symlink(dir, name, path, sattr,
-					fhandle, fattr),
+				_nfs4_proc_symlink(dir, dentry, path, sattr),
 				&exception);
 	} while (exception.retry);
 	return err;
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 5a8b940..0b507bf 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -425,14 +425,15 @@ nfs_proc_link(struct inode *inode, struc
 }
 
 static int
-nfs_proc_symlink(struct inode *dir, struct qstr *name, struct qstr *path,
-		 struct iattr *sattr, struct nfs_fh *fhandle,
-		 struct nfs_fattr *fattr)
+nfs_proc_symlink(struct inode *dir, struct dentry *dentry, struct qstr *path,
+		 struct iattr *sattr)
 {
+	struct nfs_fh fhandle;
+	struct nfs_fattr fattr;
 	struct nfs_symlinkargs	arg = {
 		.fromfh		= NFS_FH(dir),
-		.fromname	= name->name,
-		.fromlen	= name->len,
+		.fromname	= dentry->d_name.name,
+		.fromlen	= dentry->d_name.len,
 		.topath		= path->name,
 		.tolen		= path->len,
 		.sattr		= sattr
@@ -445,11 +446,23 @@ nfs_proc_symlink(struct inode *dir, stru
 
 	if (path->len > NFS2_MAXPATHLEN)
 		return -ENAMETOOLONG;
-	dprintk("NFS call  symlink %s -> %s\n", name->name, path->name);
-	nfs_fattr_init(fattr);
-	fhandle->size = 0;
+
+	dprintk("NFS call  symlink %s -> %s\n", dentry->d_name.name,
+			path->name);
 	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
 	nfs_mark_for_revalidate(dir);
+
+	/*
+	 * V2 SYMLINK requests don't return any attributes.  Setting the
+	 * filehandle size to zero indicates to nfs_instantiate that it
+	 * should fill in the data with a LOOKUP call on the wire.
+	 */
+	if (status == 0) {
+		nfs_fattr_init(&fattr);
+		fhandle.size = 0;
+		status = nfs_instantiate(dentry, &fhandle, &fattr);
+	}
+
 	dprintk("NFS reply symlink: %d\n", status);
 	return status;
 }
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 490fe4a..b080cca 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -793,9 +793,8 @@ struct nfs_rpc_ops {
 	int	(*rename)  (struct inode *, struct qstr *,
 			    struct inode *, struct qstr *);
 	int	(*link)    (struct inode *, struct inode *, struct qstr *);
-	int	(*symlink) (struct inode *, struct qstr *, struct qstr *,
-			    struct iattr *, struct nfs_fh *,
-			    struct nfs_fattr *);
+	int	(*symlink) (struct inode *, struct dentry *, struct qstr *,
+			    struct iattr *);
 	int	(*mkdir)   (struct inode *, struct dentry *, struct iattr *);
 	int	(*rmdir)   (struct inode *, struct qstr *);
 	int	(*readdir) (struct dentry *, struct rpc_cred *,



From fedora-cvs-commits at redhat.com  Thu Aug 24 23:21:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 19:21:35 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2519.4.13,1.2519.4.14
Message-ID: <200608242321.k7ONLXcf016636@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16533

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Log Message:
stub for tagging



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.13
retrieving revision 1.2519.4.14
diff -u -r1.2519.4.13 -r1.2519.4.14
--- kernel-2.6.spec	24 Aug 2006 23:18:41 -0000	1.2519.4.13
+++ kernel-2.6.spec	24 Aug 2006 23:21:29 -0000	1.2519.4.14
@@ -1783,7 +1783,7 @@
 				Larry Woodman, Juan Quintela)
 - added #203614 - build kernel headers for glibc (David Woodhouse)
 - added #203056/#203387 - utrace refresh (Roland McGrath)
-- added #203861 - nfs client fix (David Howells)
+- added #203861 - nfs client fix (David Howells) 
 				
 * Wed Aug 23 2006 Don Zickus <dzickus at redhat.com>
 - modsigning was fixed, but I never enabled applying the patches



From fedora-cvs-commits at redhat.com  Thu Aug 24 23:22:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 19:22:21 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11.spec, 1.11, 1.12 rh_pam_pkcs11.conf,
	1.2, 1.3 rh_pkcs11_eventmgr.conf, 1.1, 1.2
Message-ID: <200608242322.k7ONMLVq016936@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16794

Modified Files:
	pam_pkcs11.spec rh_pam_pkcs11.conf rh_pkcs11_eventmgr.conf 
Log Message:


use $LIB to allow dl_open to select the corrrect library on the platform.



Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pam_pkcs11.spec	22 Aug 2006 00:10:03 -0000	1.11
+++ pam_pkcs11.spec	24 Aug 2006 23:22:18 -0000	1.12
@@ -6,7 +6,7 @@
 
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        11
+Release:        12
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -92,9 +92,7 @@
 # set up config files
 #
 install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-sed -e 's;$_libdir;'%{_libdir}';g' %{SOURCE1} > $RPM_BUILD_ROOT/tmp_conf
-install -m 644 $RPM_BUILD_ROOT/tmp_conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
-rm -f $RPM_BUILD_ROOT/tmp_conf
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
 #
 # clean up those files that aren't part of this package
@@ -147,7 +145,11 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
-* Mon Aug 21 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-10
+* Mon Aug 28 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-12
+- use $LIB so the config file works for multi archs on the
+- same machine
+
+* Mon Aug 21 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-11
 - Handle library paths in config file
 
 * Mon Aug 16 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-10


Index: rh_pam_pkcs11.conf
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/rh_pam_pkcs11.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rh_pam_pkcs11.conf	22 Aug 2006 00:10:03 -0000	1.2
+++ rh_pam_pkcs11.conf	24 Aug 2006 23:22:18 -0000	1.3
@@ -30,7 +30,7 @@
   use_pkcs11_module = coolkey;
 
   pkcs11_module coolkey {
-    module = $_libdir/libcoolkeypk11.so;
+    module = /usr/$LIB/libcoolkeypk11.so;
     description = "Cool Key"
     # Slot-number to use. One for the first, two for the second and so
     # on. The default value is zero which means to use the first slot
@@ -61,7 +61,7 @@
   }
 
   pkcs11_module opensc {
-    module = $_libdir/opensc-pkcs11.so;
+    module = /usr/$LIB/opensc-pkcs11.so;
     description = "OpenSC PKCS#11 module";
     # Slot-number to use. One for the first, two for the second and so
     # on. The default value is zero which means to use the first slot
@@ -92,7 +92,7 @@
 
   # Default pkcs11 module
   pkcs11_module default {
-    module = $_libdir/pam_pkcs11/pkcs11_module.so;
+    module = /usr/$LIB/pam_pkcs11/pkcs11_module.so;
     description = "Default pkcs#11 module";
     slot_num = 0;
     ca_dir = /etc/pam_pkcs11/cacerts;
@@ -127,13 +127,13 @@
   # value as module search path
   # TODO:
   # This is not still functional: use absolute pathnames or LD_LIBRARY_PATH 
-  mapper_search_path = $_libdir/pam_pkcs11;
+  mapper_search_path = /usr/$LIB/pam_pkcs11;
 
   # 
   # Generic certificate contents mapper
   mapper generic {
         debug = true;
-        module = $_libdir/pam_pkcs11/generic_mapper.so;
+        module = /usr/$LIB/pam_pkcs11/generic_mapper.so;
         # ignore letter case on match/compare
         ignorecase = false;
         # Use one of "cn" , "subject" , "kpn" , "email" , "upn" or "uid"
@@ -148,7 +148,7 @@
   # provided file stores one or more "Subject -> login" lines
   mapper subject {
 	debug = false;
-	# module = $_libdir/pam_pkcs11/subject_mapper.so;
+	# module = /usr/$LIB/pam_pkcs11/subject_mapper.so;
 	module = internal;
 	ignorecase = false;
 	mapfile = file:///etc/pam_pkcs11/subject_mapping;
@@ -157,13 +157,13 @@
   # Search public keys from $HOME/.ssh/authorized_keys to match users
   mapper openssh {
 	debug = false;
-	module = $_libdir/pam_pkcs11/openssh_mapper.so;
+	module = /usr/$LIB/pam_pkcs11/openssh_mapper.so;
   }
 
   # Search certificates from $HOME/.eid/authorized_certificates to match users
   mapper opensc {
 	debug = false;
-	module = $_libdir/pam_pkcs11/opensc_mapper.so;
+	module = /usr/$LIB/pam_pkcs11/opensc_mapper.so;
   }
 
   # Certificate Common Name ( CN ) to getpwent() mapper
@@ -171,13 +171,13 @@
 	debug = false;
 	ignorecase = false;
 	module = internal;
-	# module = $_libdir/pam_pkcs11/pwent_mapper.so;
+	# module = /usr/$LIB/pam_pkcs11/pwent_mapper.so;
   }
 
   # Null ( no map ) mapper. when user as finder matchs to NULL or "nobody"
   mapper null {
 	debug = false;
-	# module = $_libdir/pam_pkcs11/null_mapper.so;
+	# module = /usr/$LIB/pam_pkcs11/null_mapper.so;
 	module = internal ;
 	# select behavior: always match, or always fail
 	default_match = false;
@@ -188,7 +188,7 @@
   # Directory ( ldap style ) mapper
   mapper ldap {
 	debug = false;
-	module = $_libdir/pam_pkcs11/ldap_mapper.so;
+	module = /usr/$LIB/pam_pkcs11/ldap_mapper.so;
 	# where base directory resides
 	basedir = /etc/pam_pkcs11/mapdir;
 	# hostname of ldap server
@@ -213,7 +213,7 @@
   mapper cn {
 	debug = false;
 	module = internal;
-	# module = $_libdir/pam_pkcs11/cn_mapper.so;
+	# module = /usr/$LIB/pam_pkcs11/cn_mapper.so;
 	ignorecase = true;
 	mapfile = file:///etc/pam_pkcs11/cn_map;
   }
@@ -222,7 +222,7 @@
   mapper mail {
 	debug = false;
 	module = internal;
-	# module = $_libdir/pam_pkcs11/mail_mapper.so;
+	# module = /usr/$LIB/pam_pkcs11/mail_mapper.so;
 	# Declare mapfile or
 	# leave empty "" or "none" to use no map 
 	mapfile = file:///etc/pam_pkcs11/mail_mapping;
@@ -239,7 +239,7 @@
   mapper ms {
 	debug = false;
 	module = internal;
-	# module = $_libdir/pam_pkcs11/ms_mapper.so;
+	# module = /usr/$LIB/pam_pkcs11/ms_mapper.so;
 	ignorecase = false;
 	ignoredomain = false;
 	domain = "domain.com";
@@ -249,7 +249,7 @@
   mapper krb {
 	debug = false;
 	module = internal;
-	# module = $_libdir/pam_pkcs11/krb_mapper.so;
+	# module = /usr/$LIB/pam_pkcs11/krb_mapper.so;
 	ignorecase = false;
 	mapfile = "none";
   }
@@ -258,7 +258,7 @@
   mapper uid {
 	debug = false;
 	module = internal;
-	# module = $_libdir/pam_pkcs11/uid_mapper.so;
+	# module = /usr/$LIB/pam_pkcs11/uid_mapper.so;
 	ignorecase = false;
 	mapfile = "none";
   }
@@ -267,7 +267,7 @@
   mapper digest {
 	debug = false;
 	module = internal;
-	# module = $_libdir/pam_pkcs11/digest_mapper.so;
+	# module = /usr/$LIB/pam_pkcs11/digest_mapper.so;
 	# algorithm used to evaluate certificate digest
         # Select one of:
 	# "null","md2","md4","md5","sha","sha1","dss","dss1","ripemd160"


Index: rh_pkcs11_eventmgr.conf
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/rh_pkcs11_eventmgr.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rh_pkcs11_eventmgr.conf	5 Jul 2006 21:48:16 -0000	1.1
+++ rh_pkcs11_eventmgr.conf	24 Aug 2006 23:22:18 -0000	1.2
@@ -16,7 +16,7 @@
 	expire_time = 0;
 	
 	# pkcs11 module to use
-	pkcs11_module = /usr/lib/libcoolkeypk11.so;
+	pkcs11_module = /usr/$LIB/libcoolkeypk11.so;
 
 	#
 	# list of events and actions



From fedora-cvs-commits at redhat.com  Fri Aug 25 00:28:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 20:28:55 -0400
Subject: rpms/control-center/devel
	control-center-2.15.92-fix-media-keys.patch, NONE,
	1.1 control-center.spec, 1.174, 1.175
Message-ID: <200608250028.k7P0Step008955@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8941

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.15.92-fix-media-keys.patch 
Log Message:
- don't try to map user defined key shortcuts to keysyms
  (bug 201176)


control-center-2.15.92-fix-media-keys.patch:
 actions/acme.h                   |   10 --
 gnome-settings-multimedia-keys.c |  145 +--------------------------------------
 2 files changed, 5 insertions(+), 150 deletions(-)

--- NEW FILE control-center-2.15.92-fix-media-keys.patch ---
--- control-center-2.15.92/gnome-settings-daemon/actions/acme.h.fix-media-keys	2006-08-24 20:09:15.000000000 -0400
+++ control-center-2.15.92/gnome-settings-daemon/actions/acme.h	2006-08-24 20:09:31.000000000 -0400
@@ -38,11 +38,6 @@
 	SCREENSAVER_KEY,
 	HELP_KEY,
 	WWW_KEY,
-	PLAY_KEY,
-	PAUSE_KEY,
-	STOP_KEY,
-	PREVIOUS_KEY,
-	NEXT_KEY,
 	HANDLED_KEYS
 };
 
@@ -69,11 +64,6 @@
 	{ SCREENSAVER_KEY, GCONF_BINDING_DIR "/screensaver", NULL },
 	{ HELP_KEY, GCONF_BINDING_DIR "/help", NULL },
 	{ WWW_KEY, GCONF_BINDING_DIR "/www", NULL },
-	{ PLAY_KEY, GCONF_BINDING_DIR "/play", NULL },
-	{ PAUSE_KEY, GCONF_BINDING_DIR "/pause", NULL },
-	{ STOP_KEY, GCONF_BINDING_DIR "/stop", NULL },
-	{ PREVIOUS_KEY, GCONF_BINDING_DIR "/previous", NULL },
-	{ NEXT_KEY, GCONF_BINDING_DIR "/next", NULL },
 };
 
 #endif /* __ACME_H__ */
--- control-center-2.15.92/gnome-settings-daemon/gnome-settings-multimedia-keys.c.fix-media-keys	2006-08-24 20:04:55.000000000 -0400
+++ control-center-2.15.92/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2006-08-24 20:08:48.000000000 -0400
@@ -227,35 +227,6 @@
 	}
 }
 
-static void                                                                     
-unhookup_keysym (int keycode)
-{
-	char *command;
-
-	if (keycode <= 0)
-		return;
-
-	command = g_strdup_printf ("xmodmap -e \"keycode %d = \"", keycode);
-	g_spawn_command_line_sync (command, NULL, NULL, NULL, NULL);
-	g_free (command);
-}                                                                               
-
-static gboolean
-hookup_keysym (int keycode, const char *keysym)
-{
-	char *command;
-
-	if (keycode <= 0)
-		return TRUE;
-
-	command = g_strdup_printf ("xmodmap -e \"keycode %d = %s\"",
-				   keycode, keysym);
-	g_spawn_command_line_sync (command, NULL, NULL, NULL, NULL);
-	g_free (command);
-
-	return FALSE;
-}
-
 static gboolean
 is_valid_shortcut (const char *string)
 {
@@ -277,7 +248,7 @@
 	g_return_if_fail (entry->key != NULL);
 
 	/* Find the key that was modified */
-	for (i = 0; i < PLAY_KEY; i++)
+	for (i = 0; i < HANDLED_KEYS; i++)
 	{
 		if (strcmp (entry->key, keys[i].gconf_key) == 0)
 		{
@@ -307,73 +278,13 @@
 			{
 				g_free (tmp);
 				g_free (key);
-				break;
+				return;
 			}
 
 			grab_key (acme, key, TRUE);
 			keys[i].key = key;
 
-			g_free (tmp);
-
-			break;
-		}
-	}
-
-	if (found != FALSE)
-		return;
-
-	for (i = PLAY_KEY; i < HANDLED_KEYS; i++)
-	{
-		if (strcmp (entry->key, keys[i].gconf_key) == 0)
-		{
-			char *tmp;
-			Key *key;
-
-			if (keys[i].key != NULL)
-				unhookup_keysym (keys[i].key->keycode);
-
-			g_free (keys[i].key);
-			keys[i].key = NULL;
-
-			tmp = gconf_client_get_string (acme->conf_client,
-						       keys[i].gconf_key, NULL);
-
-			if (is_valid_shortcut (tmp) == FALSE)
-			{
-				g_free (tmp);
-				break;
-			}
-
-			key = g_new0 (Key, 1);
-			if (egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state) == FALSE
-			    || key->keycode == 0)
-			{
-				g_free (tmp);
-				g_free (key);
-				break;
-			}
-
-			switch (keys[i].key_type) {
-			case PLAY_KEY:
-				hookup_keysym (key->keycode, "XF86AudioPlay");
-				break;
-			case PAUSE_KEY:
-				hookup_keysym (key->keycode, "XF86AudioPause");
-				break; 
-			case STOP_KEY:
-				hookup_keysym (key->keycode, "XF86AudioStop");
-				break;
-			case PREVIOUS_KEY:
-				hookup_keysym (key->keycode, "XF86AudioPrev");
-				break;
-			case NEXT_KEY:                                                
-				hookup_keysym (key->keycode, "XF86AudioNext");
-				break;
-			}
-
-			keys[i].key = key;
-
-			g_free (tmp);
+			return;
 		}
 	}
 }
@@ -409,7 +320,7 @@
 {
 	int i;
 
-	for (i = 0; i < PLAY_KEY; i++)
+	for (i = 0; i < HANDLED_KEYS; i++)
 	{
 		char *tmp;
 		Key *key;
@@ -439,52 +350,6 @@
 
 		grab_key (acme, key, TRUE);
 	}
-
-	for (i = PLAY_KEY; i < HANDLED_KEYS; i++)
-	{
-		char *tmp;
-		Key *key;
-
-		gconf_client_notify_add (acme->conf_client,
-					 keys[i].gconf_key, update_kbd_cb,
-					 acme, NULL, NULL);
-
-		tmp = gconf_client_get_string (acme->conf_client,
-					       keys[i].gconf_key, NULL);
-		if (!is_valid_shortcut (tmp)) {
-			g_free (tmp);
-			continue;                                           
-		}                                               
-
-		key = g_new0 (Key, 1);
-		if (egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state) == FALSE
-		    || key->keycode == 0)
-		{                                       
-			g_free (tmp);
-			g_free (key);
-			continue;
-		}                                               
-		g_free (tmp);
-
-		keys[i].key = key;
-		switch (keys[i].key_type) {
-		case PLAY_KEY:
-			hookup_keysym (keys[i].key->keycode, "XF86AudioPlay");
-			break;
-		case PAUSE_KEY:
-			hookup_keysym (keys[i].key->keycode, "XF86AudioPause");
-			break;
-		case STOP_KEY:
-			hookup_keysym (keys[i].key->keycode, "XF86AudioStop");
-			break;
-		case PREVIOUS_KEY:
-			hookup_keysym (keys[i].key->keycode, "XF86AudioPrev");
-			break;
-		case NEXT_KEY:
-			hookup_keysym (keys[i].key->keycode, "XF86AudioNext");
-			break;
-		}
-	}
 }
 
 static gboolean
@@ -824,7 +689,7 @@
 	keycode = xev->xkey.keycode;
 	state = xev->xkey.state;
 
-	for (i = 0; i < PLAY_KEY; i++)
+	for (i = 0; i < HANDLED_KEYS; i++)
 	{
 		if (keys[i].key == NULL)
 			continue;


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- control-center.spec	22 Aug 2006 21:37:15 -0000	1.174
+++ control-center.spec	25 Aug 2006 00:28:53 -0000	1.175
@@ -40,6 +40,7 @@
 Patch11: control-center-2.15.91-search.patch
 Patch12: control-center-2.15.91-fix-thumbnailing.patch
 Patch13: control-center-2.15.91-compiz-support.patch
+Patch14: control-center-2.15.92-fix-media-keys.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -136,7 +137,8 @@
 %patch10 -p1 -b .finish
 %patch11 -p1 -b .search
 %patch12 -p1 -b .fix-thumbnailing
-%patch13 -p1 -b .compiz-support.patch
+%patch13 -p1 -b .compiz-support
+%patch14 -p1 -b .fix-media-keys
 
 %build
 
@@ -274,6 +276,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Aug 24 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-7.fc6
+- don't try to map user defined key shortcuts to keysyms
+  (bug 201176)
+
 * Tue Aug 22 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-6.fc6
 - update to 2.15.92
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 00:42:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 20:42:19 -0400
Subject: rpms/control-center/devel
	control-center-2.15.92-fix-media-keys.patch, 1.1,
	1.2 control-center.spec, 1.175, 1.176
Message-ID: <200608250042.k7P0gJL3009165@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9151

Modified Files:
	control-center-2.15.92-fix-media-keys.patch 
	control-center.spec 
Log Message:
update patch to set defaults in schema files


control-center-2.15.92-fix-media-keys.patch:
 gnome-settings-daemon/actions/acme.h                      |   10 
 gnome-settings-daemon/gnome-settings-multimedia-keys.c    |  145 --------------
 schemas/apps_gnome_settings_daemon_keybindings.schemas.in |   10 
 3 files changed, 10 insertions(+), 155 deletions(-)

Index: control-center-2.15.92-fix-media-keys.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.15.92-fix-media-keys.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- control-center-2.15.92-fix-media-keys.patch	25 Aug 2006 00:28:53 -0000	1.1
+++ control-center-2.15.92-fix-media-keys.patch	25 Aug 2006 00:42:16 -0000	1.2
@@ -1,5 +1,52 @@
---- control-center-2.15.92/gnome-settings-daemon/actions/acme.h.fix-media-keys	2006-08-24 20:09:15.000000000 -0400
-+++ control-center-2.15.92/gnome-settings-daemon/actions/acme.h	2006-08-24 20:09:31.000000000 -0400
+--- control-center-2.15.92/schemas/apps_gnome_settings_daemon_keybindings.schemas.in.fix-media-keys	2006-08-24 20:38:14.000000000 -0400
++++ control-center-2.15.92/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2006-08-24 20:39:06.000000000 -0400
+@@ -161,7 +161,7 @@
+             <key>/schemas/apps/gnome_settings_daemon/keybindings/play</key>
+             <applyto>/apps/gnome_settings_daemon/keybindings/play</applyto>
+             <type>string</type>
+-            <default></default>
++            <default>XF86AudioPlay</default>
+             <locale name="C">
+                 <short>Play (or play/pause)</short>
+                 <long>Play (or play/pause) key's shortcut.</long>
+@@ -173,7 +173,7 @@
+             <key>/schemas/apps/gnome_settings_daemon/keybindings/pause</key>
+             <applyto>/apps/gnome_settings_daemon/keybindings/pause</applyto>
+             <type>string</type>
+-            <default></default>
++            <default>XF86AudioPause</default>
+             <locale name="C">
+                 <short>Pause</short>
+                 <long>Pause key's shortcut.</long>
+@@ -185,7 +185,7 @@
+             <key>/schemas/apps/gnome_settings_daemon/keybindings/stop</key>
+             <applyto>/apps/gnome_settings_daemon/keybindings/stop</applyto>
+             <type>string</type>
+-            <default></default>
++            <default>XF86AudioStop</default>
+             <locale name="C">
+                 <short>Stop playback key</short>
+                 <long>Stop playback key's shortcut.</long>
+@@ -197,7 +197,7 @@
+             <key>/schemas/apps/gnome_settings_daemon/keybindings/previous</key>
+             <applyto>/apps/gnome_settings_daemon/keybindings/previous</applyto>
+             <type>string</type>
+-            <default></default>
++            <default>XF86AudioPrev</default>
+             <locale name="C">
+                 <short>Skip to previous track</short>
+                 <long>Previous track key's shortcut.</long>
+@@ -209,7 +209,7 @@
+             <key>/schemas/apps/gnome_settings_daemon/keybindings/next</key>
+             <applyto>/apps/gnome_settings_daemon/keybindings/next</applyto>
+             <type>string</type>
+-            <default></default>
++            <default>XF86AudioNext</default>
+             <locale name="C">
+                 <short>Skip to next track</short>
+                 <long>Next track key's shortcut.</long>
+--- control-center-2.15.92/gnome-settings-daemon/actions/acme.h.fix-media-keys	2006-04-27 05:50:42.000000000 -0400
++++ control-center-2.15.92/gnome-settings-daemon/actions/acme.h	2006-08-24 20:14:29.000000000 -0400
 @@ -38,11 +38,6 @@
  	SCREENSAVER_KEY,
  	HELP_KEY,
@@ -24,8 +71,8 @@
  };
  
  #endif /* __ACME_H__ */
---- control-center-2.15.92/gnome-settings-daemon/gnome-settings-multimedia-keys.c.fix-media-keys	2006-08-24 20:04:55.000000000 -0400
-+++ control-center-2.15.92/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2006-08-24 20:08:48.000000000 -0400
+--- control-center-2.15.92/gnome-settings-daemon/gnome-settings-multimedia-keys.c.fix-media-keys	2006-08-24 20:14:29.000000000 -0400
++++ control-center-2.15.92/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2006-08-24 20:14:29.000000000 -0400
 @@ -227,35 +227,6 @@
  	}
  }


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- control-center.spec	25 Aug 2006 00:28:53 -0000	1.175
+++ control-center.spec	25 Aug 2006 00:42:16 -0000	1.176
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -276,11 +276,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Thu Aug 24 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-7.fc6
+* Thu Aug 24 2006 Ray Strode <rstrode at redhat.com> - 2.15.92-2.fc6
 - don't try to map user defined key shortcuts to keysyms
   (bug 201176)
 
-* Tue Aug 22 2006 Ray Strode <rstrode at redhat.com> - 2.15.91-6.fc6
+* Tue Aug 22 2006 Ray Strode <rstrode at redhat.com> - 2.15.92-1.fc6
 - update to 2.15.92
 
 * Tue Aug 22 2006 Soren Sandmann <sandmann at redhat.com> - 2.15.91-6.fc6



From fedora-cvs-commits at redhat.com  Fri Aug 25 01:11:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 21:11:47 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.28, 1.29 setroubleshoot.spec,
	1.34, 1.35 sources, 1.31, 1.32
Message-ID: <200608250111.k7P1Blbm002824@cvs.devel.redhat.com>

Author: jdennis

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2790/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.35-1 on branch devel from setroubleshoot-0.35-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	24 Aug 2006 21:24:10 -0000	1.28
+++ .cvsignore	25 Aug 2006 01:11:32 -0000	1.29
@@ -1 +1 @@
-setroubleshoot-0.34.tar.gz
+setroubleshoot-0.35.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- setroubleshoot.spec	24 Aug 2006 21:31:53 -0000	1.34
+++ setroubleshoot.spec	25 Aug 2006 01:11:32 -0000	1.35
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.34
+Version: 0.35
 Release: 1
 License: GPL
 Group: Applications/System
@@ -107,6 +107,18 @@
 %{_datadir}/dbus-1/services/sealert.service
 
 %changelog
+* Thu Aug 24 2006 John Dennis <jdennis at redhat.com> - 0.35-1
+
+- add sorting on category column and seen column in browser,
+  fix reference to my_draw() in print function.
+	
+- make browser window hidden by default so it does not flash
+  when it's first realized, connect to the "realize" signal to
+  initially position the vpane, add signal handlers to track
+  when the browser is visible, the presentation of the status
+  icon now checks if the browser is visible, the status icon is
+  not presented if the browser is already displayed.
+
 * Thu Aug 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.34-1
 - Standardize on the browser. remove alert window
 -  John Dennis  Changes


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	24 Aug 2006 21:24:10 -0000	1.31
+++ sources	25 Aug 2006 01:11:32 -0000	1.32
@@ -1 +1 @@
-35e9ed290f7673db4a565dfa1619331f  setroubleshoot-0.34.tar.gz
+2bfc267152076a3795f0c17cb2150138  setroubleshoot-0.35.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 25 01:21:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 21:21:38 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-mode-sort-kung-fu.patch, NONE,
	1.1 xorg-x11-server-1.1.1-infer-virtual.patch, 1.3,
	1.4 xorg-x11-server.spec, 1.154, 1.155
Message-ID: <200608250121.k7P1LbiJ020606@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20575

Modified Files:
	xorg-x11-server-1.1.1-infer-virtual.patch xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-mode-sort-kung-fu.patch 
Log Message:
* Thu Aug 24 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-28.fc6
- xorg-x11-server-1.1.1-infer-virtual.patch: Only flag modes as preferred
  if the EDID block says to.
- xorg-x11-server-1.1.1-mode-sort-kung-fu.patch: Enforce a sort order on
  modes during lookup: builtin before driver before userdef before other,
  and preferred modes within a class before others in that class.


xorg-x11-server-1.1.1-mode-sort-kung-fu.patch:
 xf86Mode.c |  254 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 132 insertions(+), 122 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-mode-sort-kung-fu.patch ---
--- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.jx	2006-08-22 13:07:49.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-24 17:09:36.000000000 -0400
@@ -429,6 +429,17 @@ xf86LookupMode(ScrnInfoPtr scrp, Display
     ModeStatus status = MODE_NOMODE;
     Bool allowDiv2 = (strategy & LOOKUP_CLKDIV2) != 0;
     Bool haveBuiltin;
+    int n;
+    const int types[] = {
+	M_T_BUILTIN | M_T_PREFERRED,
+	M_T_BUILTIN,
+	M_T_USERDEF | M_T_PREFERRED,
+	M_T_USERDEF,
+	M_T_DRIVER | M_T_PREFERRED,
+	M_T_DRIVER,
+	0
+    };
+    const int ntypes = sizeof(types) / sizeof(int);
 
     strategy &= ~(LOOKUP_CLKDIV2 | LOOKUP_OPTIONAL_TOLERANCES);
 
@@ -448,143 +459,141 @@ xf86LookupMode(ScrnInfoPtr scrp, Display
 	cp->ClockMulFactor = max(1, cp->ClockMulFactor);
     }
 
-    haveBuiltin = FALSE;
     /* Scan the mode pool for matching names */
-    for (p = scrp->modePool; p != NULL; p = p->next) {
-	if (strcmp(p->name, modep->name) == 0) {
-	    /*
-	     * Requested mode is a built-in mode. Don't let the user
-	     * override it.
-	     * Since built-in modes always come before user specified
-	     * modes it will always be found first.  
-	     */
-	    if (p->type & M_T_BUILTIN) {
-		haveBuiltin = TRUE;
-	    }
+    for (n = 0; n < ntypes; n++) {
+	int type = types[n];
+	for (p = scrp->modePool; p != NULL; p = p->next) {
 
-	    if (haveBuiltin && !(p->type & M_T_BUILTIN))
+	    /* scan through the modes in the sort order above */
+	    if ((p->type & type) != type)
 		continue;
 
-	    /* Skip over previously rejected modes */
-	    if (p->status != MODE_OK) {
-		if (!found)
-		    status = p->status;
-		continue;
-	    }
-		
-	    /* Skip over previously considered modes */
-	    if (p->prev)
-		continue;
+	    if (strcmp(p->name, modep->name) == 0) {
 
-	    if (p->type & M_T_BUILTIN) {
-		return xf86HandleBuiltinMode(scrp, p,modep, clockRanges,
-					     allowDiv2);
-	    }
+		/* Skip over previously rejected modes */
+		if (p->status != MODE_OK) {
+		    if (!found)
+			status = p->status;
+		    continue;
+		}
 
-	    /* Check clock is in range */
-	    cp = xf86FindClockRangeForMode(clockRanges, p);
-	    if (cp == NULL) {
-		/*
-		 * XXX Could do more here to provide a more detailed
-		 * reason for not finding a mode.
-		 */
-		p->status = MODE_CLOCK_RANGE;
-		if (!found)
-		    status = MODE_CLOCK_RANGE;
-		continue;
-	    }
+		/* Skip over previously considered modes */
+		if (p->prev)
+		    continue;
 
-	    /*
-	     * If programmable clock and strategy is not LOOKUP_BEST_REFRESH,
-	     * the required mode has been found, otherwise record the refresh
-	     * and continue looking.
-	     */
-	    if (scrp->progClock) {
-		found = TRUE;
-		if (strategy != LOOKUP_BEST_REFRESH) {
-		    bestMode = p;
-		    DivFactor = cp->ClockDivFactor;
-		    MulFactor = cp->ClockMulFactor;
-		    ModePrivFlags = cp->PrivFlags;
-		    break;
+		if (p->type & M_T_BUILTIN) {
+		    return xf86HandleBuiltinMode(scrp, p,modep, clockRanges,
+			    allowDiv2);
 		}
-		refresh = ModeVRefresh(p);
-		if (p->Flags & V_INTERLACE)
-		    refresh /= INTERLACE_REFRESH_WEIGHT;
-		if (refresh > bestRefresh) {
-		    bestMode = p;
-		    DivFactor = cp->ClockDivFactor;
-		    MulFactor = cp->ClockMulFactor;
-		    ModePrivFlags = cp->PrivFlags;
-		    bestRefresh = refresh;
+
+		/* Check clock is in range */
+		cp = xf86FindClockRangeForMode(clockRanges, p);
+		if (cp == NULL) {
+		    /*
+		     * XXX Could do more here to provide a more detailed
+		     * reason for not finding a mode.
+		     */
+		    p->status = MODE_CLOCK_RANGE;
+		    if (!found)
+			status = MODE_CLOCK_RANGE;
+		    continue;
 		}
-		continue;
-	    }
 
-	    /*
-	     * Clock is in range, so if it is not a programmable clock, find
-	     * a matching clock.
-	     */
+		/*
+		 * If programmable clock and strategy is not
+		 * LOOKUP_BEST_REFRESH, the required mode has been found,
+		 * otherwise record the refresh and continue looking.
+		 */
+		if (scrp->progClock) {
+		    found = TRUE;
+		    if (strategy != LOOKUP_BEST_REFRESH) {
+			bestMode = p;
+			DivFactor = cp->ClockDivFactor;
+			MulFactor = cp->ClockMulFactor;
+			ModePrivFlags = cp->PrivFlags;
+			break;
+		    }
+		    refresh = ModeVRefresh(p);
+		    if (p->Flags & V_INTERLACE)
+			refresh /= INTERLACE_REFRESH_WEIGHT;
+		    if (refresh > bestRefresh) {
+			bestMode = p;
+			DivFactor = cp->ClockDivFactor;
+			MulFactor = cp->ClockMulFactor;
+			ModePrivFlags = cp->PrivFlags;
+			bestRefresh = refresh;
+		    }
+		    continue;
+		}
 
-	    i = xf86GetNearestClock(scrp, p->Clock, allowDiv2,
-		cp->ClockDivFactor, cp->ClockMulFactor, &k);
-	    /*
-	     * If the clock is too far from the requested clock, this
-	     * mode is no good.
-	     */
-	    if (k & V_CLKDIV2)
-		gap = abs((p->Clock * 2) -
-		    ((scrp->clock[i] * cp->ClockDivFactor) / cp->ClockMulFactor));
-	    else
-		gap = abs(p->Clock -
-		    ((scrp->clock[i] * cp->ClockDivFactor) / cp->ClockMulFactor));
-	    if (gap > minimumGap) {
-		p->status = MODE_NOCLOCK;
-		if (!found)
-		    status = MODE_NOCLOCK;
-		continue;
-	    }
-	    found = TRUE;
+		/*
+		 * Clock is in range, so if it is not a programmable clock, find
+		 * a matching clock.
+		 */
 
-	    if (strategy == LOOKUP_BEST_REFRESH) {
-		refresh = ModeVRefresh(p);
-		if (p->Flags & V_INTERLACE)
-		    refresh /= INTERLACE_REFRESH_WEIGHT;
-		if (refresh > bestRefresh) {
-		    bestMode = p;
-		    DivFactor = cp->ClockDivFactor;
-		    MulFactor = cp->ClockMulFactor;
-		    ModePrivFlags = cp->PrivFlags;
-		    extraFlags = k;
-		    clockIndex = i;
-		    bestRefresh = refresh;
+		i = xf86GetNearestClock(scrp, p->Clock, allowDiv2,
+			cp->ClockDivFactor, cp->ClockMulFactor, &k);
+		/*
+		 * If the clock is too far from the requested clock, this
+		 * mode is no good.
+		 */
+		if (k & V_CLKDIV2)
+		    gap = abs((p->Clock * 2) -
+			    ((scrp->clock[i] * cp->ClockDivFactor) /
+				cp->ClockMulFactor));
+		else
+		    gap = abs(p->Clock -
+			    ((scrp->clock[i] * cp->ClockDivFactor) /
+				cp->ClockMulFactor));
+		if (gap > minimumGap) {
+		    p->status = MODE_NOCLOCK;
+		    if (!found)
+			status = MODE_NOCLOCK;
+		    continue;
 		}
-		continue;
-	    }
-	    if (strategy == LOOKUP_CLOSEST_CLOCK) {
-		if (gap < minimumGap) {
-		    bestMode = p;
-		    DivFactor = cp->ClockDivFactor;
-		    MulFactor = cp->ClockMulFactor;
-		    ModePrivFlags = cp->PrivFlags;
-		    extraFlags = k;
-		    clockIndex = i;
-		    minimumGap = gap;
+		found = TRUE;
+
+		if (strategy == LOOKUP_BEST_REFRESH) {
+		    refresh = ModeVRefresh(p);
+		    if (p->Flags & V_INTERLACE)
+			refresh /= INTERLACE_REFRESH_WEIGHT;
+		    if (refresh > bestRefresh) {
+			bestMode = p;
+			DivFactor = cp->ClockDivFactor;
+			MulFactor = cp->ClockMulFactor;
+			ModePrivFlags = cp->PrivFlags;
+			extraFlags = k;
+			clockIndex = i;
+			bestRefresh = refresh;
+		    }
+		    continue;
 		}
-		continue;
+		if (strategy == LOOKUP_CLOSEST_CLOCK) {
+		    if (gap < minimumGap) {
+			bestMode = p;
+			DivFactor = cp->ClockDivFactor;
+			MulFactor = cp->ClockMulFactor;
+			ModePrivFlags = cp->PrivFlags;
+			extraFlags = k;
+			clockIndex = i;
+			minimumGap = gap;
+		    }
+		    continue;
+		}
+		/*
+		 * If strategy is neither LOOKUP_BEST_REFRESH or
+		 * LOOKUP_CLOSEST_CLOCK the required mode has been found.
+		 */
+		bestMode = p;
+		DivFactor = cp->ClockDivFactor;
+		MulFactor = cp->ClockMulFactor;
+		ModePrivFlags = cp->PrivFlags;
+		extraFlags = k;
+		clockIndex = i;
+		break;
 	    }
-	    /*
-	     * If strategy is neither LOOKUP_BEST_REFRESH or
-	     * LOOKUP_CLOSEST_CLOCK the required mode has been found.
-	     */
-	    bestMode = p;
-	    DivFactor = cp->ClockDivFactor;
-	    MulFactor = cp->ClockMulFactor;
-	    ModePrivFlags = cp->PrivFlags;
-	    extraFlags = k;
-	    clockIndex = i;
-	    break;
 	}
+	if (found) break;
     }
     if (!found || bestMode == NULL)
 	return status;
@@ -595,7 +604,8 @@ xf86LookupMode(ScrnInfoPtr scrp, Display
 	modep->ClockIndex	= -1;
 	modep->SynthClock	= (modep->Clock * MulFactor) / DivFactor;
     } else {
-	modep->Clock		= (scrp->clock[clockIndex] * DivFactor) / MulFactor;
+	modep->Clock		= (scrp->clock[clockIndex] * DivFactor) /
+				    MulFactor;
 	modep->ClockIndex	= clockIndex;
 	modep->SynthClock	= scrp->clock[clockIndex];
 	if (extraFlags & V_CLKDIV2) {

xorg-x11-server-1.1.1-infer-virtual.patch:
 common/xf86Mode.c |  135 +++++++++++++++++++++++++++++++++---------------------
 common/xf86str.h  |    2 
 ddc/ddcProperty.c |   23 ++++++---
 3 files changed, 101 insertions(+), 59 deletions(-)

Index: xorg-x11-server-1.1.1-infer-virtual.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-infer-virtual.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-server-1.1.1-infer-virtual.patch	18 Aug 2006 00:52:50 -0000	1.3
+++ xorg-x11-server-1.1.1-infer-virtual.patch	25 Aug 2006 01:21:32 -0000	1.4
@@ -1,6 +1,6 @@
---- xorg-server-1.1.1/hw/xfree86/common/xf86str.h.infer-virtual	2006-08-17 16:55:43.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-17 16:55:43.000000000 -0400
-@@ -125,8 +125,10 @@
+--- xorg-server-1.1.1/hw/xfree86/common/xf86str.h.infer-virtual	2006-08-24 19:05:24.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-24 19:05:24.000000000 -0400
+@@ -125,8 +125,10 @@ typedef enum {
  # define M_T_CRTC_C  (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC  */
  # define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)
                                 /* built-in mode - configure CRTC and clock */
@@ -11,8 +11,8 @@
  
  /* Video mode */
  typedef struct _DisplayModeRec {
---- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.infer-virtual	2006-08-17 16:55:43.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-17 17:13:50.000000000 -0400
+--- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.infer-virtual	2006-08-24 19:05:24.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-24 19:05:24.000000000 -0400
 @@ -47,6 +47,7 @@
  #include "globals.h"
  #include "xf86.h"
@@ -21,7 +21,7 @@
  
  /*
   * xf86GetNearestClock --
-@@ -1163,6 +1164,77 @@
+@@ -1163,6 +1164,77 @@ xf86CheckModeForDriver(ScrnInfoPtr scrp,
      return MODE_OK;
  }
  
@@ -99,7 +99,7 @@
  /*
   * xf86ValidateModes
   *
-@@ -1426,6 +1498,12 @@
+@@ -1426,6 +1498,12 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
  	virtX = virtualX;
  	virtY = virtualY;
  	scrp->virtualFrom = X_CONFIG;
@@ -112,7 +112,7 @@
      }
  
      /* Print clock ranges and scaled clocks */
-@@ -1442,7 +1520,7 @@
+@@ -1442,7 +1520,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
  	for (p = availModes; p != NULL; p = p->next) {
  	    status = xf86InitialCheckModeForDriver(scrp, p, clockRanges,
  						   strategy, maxPitch,
@@ -121,7 +121,7 @@
  
  	    if (status == MODE_OK) {
  		status = xf86CheckModeForMonitor(p, scrp->monitor);
-@@ -1462,18 +1540,7 @@
+@@ -1462,18 +1540,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
  		q->name = xnfstrdup(p->name);
  	        q->status = MODE_OK;
  	    } else {
@@ -141,7 +141,7 @@
  	    }
  	}
  
-@@ -1615,18 +1682,7 @@
+@@ -1615,18 +1682,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
  	repeat = FALSE;
      lookupNext:
  	if (repeat && ((status = p->status) != MODE_OK)) {
@@ -161,7 +161,7 @@
  	}
  	saveType = p->type;
  	status = xf86LookupMode(scrp, p, clockRanges, strategy);
-@@ -1634,18 +1690,7 @@
+@@ -1634,18 +1690,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
  	    continue;
  	}
  	if (status != MODE_OK) {
@@ -181,7 +181,7 @@
  	}
  	if (status == MODE_ERROR) {
  	    ErrorF("xf86ValidateModes: "
-@@ -1841,20 +1886,6 @@
+@@ -1841,20 +1886,6 @@ xf86PruneDriverModes(ScrnInfoPtr scrp)
  	    return;
  	n = p->next;
  	if (p->status != MODE_OK) {
@@ -202,7 +202,7 @@
  	    xf86DeleteMode(&(scrp->modes), p);
  	}
  	p = n;
-@@ -1991,6 +2022,8 @@
+@@ -1991,6 +2022,8 @@ xf86PrintModes(ScrnInfoPtr scrp)
  	    prefix = "Built-in mode";
  	else if (p->type & M_T_DEFAULT)
  	    prefix = "Default mode";
@@ -211,9 +211,9 @@
  	else
  	    prefix = "Mode";
  	if (p->type & M_T_USERDEF)
---- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.infer-virtual	2006-08-17 16:55:43.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-17 16:55:43.000000000 -0400
-@@ -127,9 +127,8 @@
+--- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.infer-virtual	2006-08-24 19:05:24.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-24 19:06:44.000000000 -0400
+@@ -127,9 +127,8 @@ PrintModeline(int scrnIndex,DisplayModeP
  /*
   * TODO:
   *  - for those with access to the VESA DMT standard; review please.
@@ -224,7 +224,7 @@
  #define MODESUFFIX   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0
  
  DisplayModeRec DDCEstablishedModes[17] = {
-@@ -182,6 +181,7 @@
+@@ -182,6 +181,7 @@ DDCModesFromStandardTiming(int scrnIndex
          if (timing[i].hsize && timing[i].vsize && timing[i].refresh) {
              Mode =  xf86CVTMode(timing[i].hsize, timing[i].vsize,
                                  timing[i].refresh, FALSE, FALSE);
@@ -232,7 +232,7 @@
              Modes = xf86ModesAdd(Modes, Mode);
          }
  
-@@ -192,7 +192,8 @@
+@@ -192,7 +192,8 @@ DDCModesFromStandardTiming(int scrnIndex
   *
   */
  static DisplayModePtr
@@ -242,7 +242,7 @@
  {
      DisplayModePtr Mode;
  
-@@ -205,9 +206,8 @@
+@@ -205,9 +206,8 @@ DDCModeFromDetailedTiming(int scrnIndex,
      
      /* We only do seperate sync currently */
      if (timing->sync != 0x03) {
@@ -254,7 +254,7 @@
      }
      
      Mode = xnfalloc(sizeof(DisplayModeRec));
-@@ -217,7 +217,9 @@
+@@ -217,7 +217,9 @@ DDCModeFromDetailedTiming(int scrnIndex,
      xf86snprintf(Mode->name, 20, "%dx%d", timing->h_active,
                   timing->v_active);
      
@@ -265,15 +265,23 @@
      
      Mode->Clock = timing->clock / 1000.0;
      
-@@ -302,6 +304,7 @@
+@@ -302,12 +304,15 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr 
      DisplayModePtr Modes = NULL, Mode;
      int i, clock;
      Bool have_hsync = FALSE, have_vrefresh = FALSE;
-+    int preferred = 1;
++    int preferred;
      
      if (!Monitor || !DDC)
          return;
-@@ -382,7 +385,9 @@
+ 
+     Monitor->DDC = DDC;
+ 
++    preferred = PREFERRED_TIMING_MODE(DDC->features.msc);
++
+     /*
+      * Don't want to fill this in yet, drivers will (wrongly!) set their
+      * gamma ramp based on this info.
+@@ -382,7 +387,9 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr 
              break;
          case DT:
              Mode = DDCModeFromDetailedTiming(scrnIndex, 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- xorg-x11-server.spec	22 Aug 2006 18:27:22 -0000	1.154
+++ xorg-x11-server.spec	25 Aug 2006 01:21:32 -0000	1.155
@@ -68,6 +68,7 @@
 Patch3012:  xorg-x11-server-1.1.1-always-mouse-thyself.patch
 Patch3013:  xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch
 Patch3014:  xorg-x11-server-1.1.1-infer-virtual.patch
+Patch3015:  xorg-x11-server-1.1.1-mode-sort-kung-fu.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -372,6 +373,7 @@
 %patch3012 -p1 -b .mouse-thyself
 %patch3013 -p1 -b .mouse-device
 %patch3014 -p1 -b .infer-virtual
+%patch3015 -p1 -b .sort-modes
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -701,6 +703,13 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Thu Aug 24 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-28.fc6
+- xorg-x11-server-1.1.1-infer-virtual.patch: Only flag modes as preferred
+  if the EDID block says to.
+- xorg-x11-server-1.1.1-mode-sort-kung-fu.patch: Enforce a sort order on
+  modes during lookup: builtin before driver before userdef before other,
+  and preferred modes within a class before others in that class.
+
 * Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-27.fc6
 - xorg-x11-server-1.1.1-edid-quirks-list.patch: Don't set an arbitrary
   pixclock limit if the monitor didn't claim to have one.



From fedora-cvs-commits at redhat.com  Fri Aug 25 01:22:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 21:22:23 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.155,1.156
Message-ID: <200608250122.k7P1MNF6020823@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20802

Modified Files:
	xorg-x11-server.spec 
Log Message:
bump


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- xorg-x11-server.spec	25 Aug 2006 01:21:32 -0000	1.155
+++ xorg-x11-server.spec	25 Aug 2006 01:22:20 -0000	1.156
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   27%{?dist}
+Release:   28%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X



From fedora-cvs-commits at redhat.com  Fri Aug 25 01:57:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 21:57:20 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.29, 1.30 setroubleshoot.spec,
	1.35, 1.36 sources, 1.32, 1.33
Message-ID: <200608250157.k7P1vKM1014175@cvs.devel.redhat.com>

Author: jdennis

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14137/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.36-1 on branch devel from setroubleshoot-0.36-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	25 Aug 2006 01:11:32 -0000	1.29
+++ .cvsignore	25 Aug 2006 01:57:18 -0000	1.30
@@ -1 +1 @@
-setroubleshoot-0.35.tar.gz
+setroubleshoot-0.36.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- setroubleshoot.spec	25 Aug 2006 01:11:32 -0000	1.35
+++ setroubleshoot.spec	25 Aug 2006 01:57:18 -0000	1.36
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.35
+Version: 0.36
 Release: 1
 License: GPL
 Group: Applications/System
@@ -74,7 +74,7 @@
     /sbin/chkconfig --del %{name}
 fi
 
-%triggerpostun -- setroubleshoot <= 0.25-1
+%triggerpostun -- setroubleshoot <= 0.35-1
 /sbin/service %{name} cleardb
 
 %postun 
@@ -107,6 +107,10 @@
 %{_datadir}/dbus-1/services/sealert.service
 
 %changelog
+* Thu Aug 24 2006 John Dennis <jdennis at redhat.com> - 0.36-1
+
+- change dbclear trigger to 0.35
+
 * Thu Aug 24 2006 John Dennis <jdennis at redhat.com> - 0.35-1
 
 - add sorting on category column and seen column in browser,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	25 Aug 2006 01:11:32 -0000	1.32
+++ sources	25 Aug 2006 01:57:18 -0000	1.33
@@ -1 +1 @@
-2bfc267152076a3795f0c17cb2150138  setroubleshoot-0.35.tar.gz
+fd7a2e066448afdcb6e510ddbaee24b8  setroubleshoot-0.36.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 25 02:05:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 22:05:09 -0400
Subject: rpms/firefox/devel firefox-1.5-nopangoxft.patch, 1.1,
	1.2 firefox.spec, 1.143, 1.144
Message-ID: <200608250205.k7P259xv015642@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15598

Modified Files:
	firefox-1.5-nopangoxft.patch firefox.spec 
Log Message:
- Remove debugging statement from firefox-1.5-pango-mathml.patch


firefox-1.5-nopangoxft.patch:
 mozilla-decoder.cpp |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

Index: firefox-1.5-nopangoxft.patch
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-1.5-nopangoxft.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-nopangoxft.patch	23 Aug 2006 00:31:05 -0000	1.1
+++ firefox-1.5-nopangoxft.patch	25 Aug 2006 02:04:51 -0000	1.2
@@ -12,15 +12,7 @@
  
  #include "nsString.h"
  #include "nsIPersistentProperties2.h"
-@@ -54,6 +53,7 @@
- #include "nsCompressedCharMap.h"
- 
- #undef DEBUG_CUSTOM_ENCODER
-+#define DEBUG_CUSTOM_ENCODER 1
- 
- G_DEFINE_TYPE (MozillaDecoder, mozilla_decoder, PANGO_TYPE_FC_DECODER)
- 
-@@ -145,6 +145,13 @@ mozilla_decoders_init(void)
+@@ -145,6 +144,13 @@ mozilla_decoders_init(void)
      if (initialized)
          return 0;
  
@@ -34,7 +26,7 @@
      encoder_hash = g_hash_table_new(g_str_hash, g_str_equal);
      cmap_hash = g_hash_table_new(g_str_hash, g_str_equal);
      wide_hash = g_hash_table_new(g_str_hash, g_str_equal);
-@@ -208,7 +215,7 @@ mozilla_decoders_init(void)
+@@ -208,7 +214,7 @@ mozilla_decoders_init(void)
          }
      }
  


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- firefox.spec	23 Aug 2006 08:08:15 -0000	1.143
+++ firefox.spec	25 Aug 2006 02:04:52 -0000	1.144
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.6
-Release:        5
+Release:        6
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -356,6 +356,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Aug 24 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.5.0.6-6
+- Remove debugging statement from firefox-1.5-pango-mathml.patch
+
 * Wed Aug 23 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-5
 - Attempt to turn visibility back on since the GCC issues should have
   been fixed.



From fedora-cvs-commits at redhat.com  Fri Aug 25 02:17:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 22:17:33 -0400
Subject: rpms/control-center/devel keyboard-drawing-corner.patch, NONE,
	1.1 keyboard-drawing-focus.patch, NONE,
	1.1 keyboard-drawing-label-color.patch, NONE,
	1.1 keyboard-drawing-primary.patch, NONE,
	1.1 keyboard-drawing-rotated-text.patch, NONE,
	1.1 control-center.spec, 1.176, 1.177
Message-ID: <200608250217.k7P2HXCB028857@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27297

Modified Files:
	control-center.spec 
Added Files:
	keyboard-drawing-corner.patch keyboard-drawing-focus.patch 
	keyboard-drawing-label-color.patch 
	keyboard-drawing-primary.patch 
	keyboard-drawing-rotated-text.patch 
Log Message:
improve the keyboard capplet


keyboard-drawing-corner.patch:
 keyboard-drawing.c |   85 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 69 insertions(+), 16 deletions(-)

--- NEW FILE keyboard-drawing-corner.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.corner	2006-08-24 22:08:59.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 22:13:07.000000000 -0400
@@ -121,6 +121,61 @@
     g_object_unref (gc);
 }
 
+static void
+curve_rectangle (cairo_t *cr,
+		 gdouble  x0,
+		 gdouble  y0,
+		 gdouble  width,
+		 gdouble  height,
+		 gdouble  radius)
+{
+  gdouble x1, y1;
+  
+  if (!width || !height)
+    return;
+
+  x1 = x0 + width;
+  y1 = y0 + height;
+
+  radius = MIN(radius, MIN(width / 2, height / 2));
+
+  cairo_move_to (cr, x0, y0 + radius);
+  cairo_arc (cr, x0 + radius, y0 + radius, radius, M_PI, 3*M_PI/2);  
+  cairo_line_to (cr, x1 - radius, y0);
+  cairo_arc (cr, x1 - radius, y0 + radius, radius, 3*M_PI/2, 2*M_PI);  
+  cairo_line_to (cr, x1, y1 - radius);
+  cairo_arc (cr, x1 - radius, y1 - radius, radius, 0, M_PI/2);  
+  cairo_line_to (cr, x0 + radius, y1);
+  cairo_arc (cr, x0 + radius, y1 - radius, radius, M_PI/2, M_PI);  
+
+  cairo_close_path (cr);  
+}
+
+static void
+draw_curve_rectangle (GdkPixmap *pixmap,
+		      gboolean   filled,
+		      GdkColor  *fill_color,
+		      gint       x,
+		      gint       y,
+		      gint       width,
+		      gint       height,
+		      gint       radius)
+{
+  cairo_t *cr;
+
+  cr = gdk_cairo_create (GDK_DRAWABLE (pixmap));
+  curve_rectangle (cr, x, y, width, height, radius);
+
+  gdk_cairo_set_source_color (cr, fill_color);
+  
+  if (filled)
+    cairo_fill (cr);
+  else
+    cairo_stroke (cr);
+  
+  cairo_destroy (cr);
+}
+
 /* x, y, width, height are in the xkb coordinate system */
 static void
 draw_rectangle (
@@ -130,7 +185,8 @@
   gint xkb_x,
   gint xkb_y,
   gint xkb_width,
-  gint xkb_height)
+  gint xkb_height,
+  gint radius)
 {
   if (drawing->pixmap == NULL)
     return;
@@ -140,17 +196,12 @@
       GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
       gint x, y, width, height;
       gboolean filled;
-      GdkGC *gc;
 
       if (fill_color)
-        {
-          gc = gdk_gc_new (GTK_WIDGET (drawing)->window);
-          gdk_gc_set_rgb_fg_color (gc, fill_color);
-          filled = TRUE;
-        }
+	filled = TRUE;
       else
         {
-          gc = GTK_WIDGET (drawing)->style->dark_gc[state];
+          fill_color = &GTK_WIDGET (drawing)->style->dark[state];
           filled = FALSE;
         }
 
@@ -159,10 +210,8 @@
       width = xkb_to_pixmap_coord (drawing, xkb_x + xkb_width) - x;
       height = xkb_to_pixmap_coord (drawing, xkb_y + xkb_height) - y;
 
-      gdk_draw_rectangle (drawing->pixmap, gc, filled, x, y, width, height);
-
-      if (fill_color)
-        g_object_unref (gc);
+      draw_curve_rectangle (drawing->pixmap, filled, fill_color, 
+			    x, y, width, height, radius);
     }
   else
     {
@@ -203,7 +252,8 @@
     {
       if (color)
         draw_rectangle (drawing, color, angle, origin_x, origin_y,
-                        outline->points[0].x, outline->points[0].y);
+                        outline->points[0].x, outline->points[0].y,
+			outline->corner_radius);
 
 #ifdef KBDRAW_DEBUG
       printf("points:%p\n", outline->points);
@@ -211,7 +261,8 @@
 #endif
 
       draw_rectangle (drawing, NULL, angle, origin_x, origin_y,
-                      outline->points[0].x, outline->points[0].y);
+                      outline->points[0].x, outline->points[0].y,
+		      outline->corner_radius);
     }
   else if (outline->num_points == 2)
     {
@@ -223,10 +274,12 @@
                          angle, &rotated_x0, &rotated_y0);
       if (color)
         draw_rectangle (drawing, color, angle, rotated_x0, rotated_y0,
-                        outline->points[1].x, outline->points[1].y);
+                        outline->points[1].x, outline->points[1].y,
+			outline->corner_radius);
 
       draw_rectangle (drawing, NULL, angle, rotated_x0, rotated_y0,
-                      outline->points[1].x, outline->points[1].y);
+                      outline->points[1].x, outline->points[1].y,
+		      outline->corner_radius);
     }
   else
     {

keyboard-drawing-focus.patch:
 keyboard-drawing.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE keyboard-drawing-focus.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.old	2006-08-24 21:47:21.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 21:47:24.000000000 -0400
@@ -1073,12 +1153,12 @@
     {
       g_signal_emit (drawing, keyboard_drawing_signals[BAD_KEYCODE], 0,
                      event->hardware_keycode);
-      return FALSE;
+      return TRUE;
     }
 
   if ((event->type == GDK_KEY_PRESS && key->pressed) ||
       (event->type == GDK_KEY_RELEASE && !key->pressed))
-    return FALSE;
+    return TRUE;
   /* otherwise this event changes the state we believed we had before */
 
   key->pressed = (event->type == GDK_KEY_PRESS);
@@ -1087,7 +1167,7 @@
 
   invalidate_key_region (drawing, key);
 
-  return FALSE;
+  return TRUE;
 }
 
 static gint

keyboard-drawing-label-color.patch:
 keyboard-drawing.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE keyboard-drawing-label-color.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.label-color	2006-08-24 22:01:50.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 22:02:40.000000000 -0400
@@ -541,6 +541,9 @@
   PangoLayout * layout)
 {
   GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
+  GdkColor *color;
+  
+  color = drawing->colors + (drawing->xkb->geom->label_color - drawing->xkb->geom->colors);
 
   if (drawing->pixmap == NULL)
     return;
@@ -554,9 +557,9 @@
       drawing->angle = angle;
     }
 
-  gdk_draw_layout (drawing->pixmap,
-                   GTK_WIDGET (drawing)->style->text_gc[state], x, y,
-                   drawing->layout);
+  gdk_draw_layout_with_colors (drawing->pixmap,
+			       GTK_WIDGET (drawing)->style->text_gc[state], x, y,
+			       drawing->layout, color, NULL);
 }
 
 static void

keyboard-drawing-primary.patch:
 keyboard-drawing.c |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

--- NEW FILE keyboard-drawing-primary.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.primary	2006-08-24 22:04:09.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 22:07:38.000000000 -0400
@@ -719,9 +719,22 @@
   printf ("outlines: %p(%d)\n", shape->outlines, shape->num_outlines);
 #endif
 
-  for (i = 0; i < 1 /* shape->num_outlines */ ; i++)
-    draw_outline (drawing, shape->outlines + i, color, key->angle,
-                  key->origin_x, key->origin_y);
+  /* draw the primary outline */
+  draw_outline (drawing, shape->primary ? shape->primary : shape->outlines, 
+		color, key->angle, key->origin_x, key->origin_y);
+#if 0
+  /* don't draw other outlines for now, since
+   * the text placement does not take them into account 
+   */
+  for (i = 0; i < shape->num_outlines; i++)
+    {
+      if (shape->outlines + i == shape->approx ||
+	  shape->outlines + i == shape->primary)
+	continue;
+      draw_outline (drawing, shape->outlines + i, NULL, 
+		    key->angle, key->origin_x, key->origin_y);
+    }
+#endif
 
   draw_key_label (drawing, key->keycode, key->angle, key->origin_x,
                   key->origin_y, shape->bounds.x2, shape->bounds.y2);
@@ -850,10 +863,22 @@
   shape = drawing->xkb->geom->shapes + shape_doodad->shape_ndx;
   color = drawing->colors + shape_doodad->color_ndx;
 
+  /* draw the primary outline filled */
+  draw_outline (drawing, shape->primary ? shape->primary : shape->outlines, 
+		color, doodad->angle,
+		doodad->origin_x + shape_doodad->left,
+		doodad->origin_y + shape_doodad->top);
+
+  /* stroke the other outlines */
   for (i = 0; i < shape->num_outlines; i++)
-    draw_outline (drawing, shape->outlines + i, color, doodad->angle,
-                  doodad->origin_x + shape_doodad->left,
-                  doodad->origin_y + shape_doodad->top);
+    {
+      if (shape->outlines + i == shape->approx ||
+	  shape->outlines + i == shape->primary) 
+	continue;
+      draw_outline (drawing, shape->outlines + i, NULL, doodad->angle,
+		    doodad->origin_x + shape_doodad->left,
+		    doodad->origin_y + shape_doodad->top);
+    }
 }
 
 static void

keyboard-drawing-rotated-text.patch:
 keyboard-drawing.c |   38 --------------------------------------
 1 files changed, 38 deletions(-)

--- NEW FILE keyboard-drawing-rotated-text.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.rotated-text	2006-08-24 21:59:45.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 22:01:21.000000000 -0400
@@ -541,9 +541,6 @@
   PangoLayout * layout)
 {
   GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
-  PangoLayoutLine *line;
-  gint x_off, y_off;
-  gint i;
 
   if (drawing->pixmap == NULL)
     return;
@@ -557,41 +554,6 @@
       drawing->angle = angle;
     }
 
-  i = 0;
-  y_off = 0;
-  for (line = pango_layout_get_line (drawing->layout, i);
-       line != NULL; line = pango_layout_get_line (drawing->layout, ++i))
-    {
-      GSList *runp;
-      PangoRectangle line_extents;
-
-      x_off = 0;
-
-      for (runp = line->runs; runp != NULL; runp = runp->next)
-        {
-          PangoGlyphItem *run = runp->data;
-          gint j;
-
-          for (j = 0; j < run->glyphs->num_glyphs; j++)
-            {
-              PangoGlyphGeometry *geometry;
-              gint xx, yy;
-
-              geometry = &run->glyphs->glyphs[j].geometry;
-
-              rotate_coordinate (0, 0, x_off, y_off, angle, &xx, &yy);
-              geometry->x_offset -= x_off - xx;
-              geometry->y_offset -= y_off - yy;
-
-              x_off += geometry->width;
-            }
-        }
-
-      pango_layout_line_get_extents (line, NULL, &line_extents);
-      y_off +=
-        line_extents.height + pango_layout_get_spacing (drawing->layout);
-    }
-
   gdk_draw_layout (drawing->pixmap,
                    GTK_WIDGET (drawing)->style->text_gc[state], x, y,
                    drawing->layout);


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- control-center.spec	25 Aug 2006 00:42:16 -0000	1.176
+++ control-center.spec	25 Aug 2006 02:17:30 -0000	1.177
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -42,6 +42,12 @@
 Patch13: control-center-2.15.91-compiz-support.patch
 Patch14: control-center-2.15.92-fix-media-keys.patch
 
+Patch14: keyboard-drawing-focus.patch
+Patch15: keyboard-drawing-rotated-text.patch
+Patch16: keyboard-drawing-label-color.patch
+Patch17: keyboard-drawing-primary.patch
+Patch18: keyboard-drawing-corner.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
 
@@ -140,6 +146,12 @@
 %patch13 -p1 -b .compiz-support
 %patch14 -p1 -b .fix-media-keys
 
+%patch14 -p1 -b .focus
+%patch15 -p1 -b .rotated-text
+%patch16 -p1 -b .label-color
+%patch17 -p1 -b .primary
+%patch18 -p1 -b .corner
+
 %build
 
 autoreconf
@@ -276,6 +288,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Aug 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-3.fc6
+- Various improvements for the keyboard capplet
+
 * Thu Aug 24 2006 Ray Strode <rstrode at redhat.com> - 2.15.92-2.fc6
 - don't try to map user defined key shortcuts to keysyms
   (bug 201176)



From fedora-cvs-commits at redhat.com  Fri Aug 25 02:48:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 22:48:48 -0400
Subject: rpms/control-center/devel control-center.spec,1.177,1.178
Message-ID: <200608250248.k7P2mmfg018601@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17767

Modified Files:
	control-center.spec 
Log Message:
fix patch numbers



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- control-center.spec	25 Aug 2006 02:17:30 -0000	1.177
+++ control-center.spec	25 Aug 2006 02:48:39 -0000	1.178
@@ -42,11 +42,11 @@
 Patch13: control-center-2.15.91-compiz-support.patch
 Patch14: control-center-2.15.92-fix-media-keys.patch
 
-Patch14: keyboard-drawing-focus.patch
-Patch15: keyboard-drawing-rotated-text.patch
-Patch16: keyboard-drawing-label-color.patch
-Patch17: keyboard-drawing-primary.patch
-Patch18: keyboard-drawing-corner.patch
+Patch15: keyboard-drawing-focus.patch
+Patch16: keyboard-drawing-rotated-text.patch
+Patch17: keyboard-drawing-label-color.patch
+Patch18: keyboard-drawing-primary.patch
+Patch19: keyboard-drawing-corner.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -146,11 +146,11 @@
 %patch13 -p1 -b .compiz-support
 %patch14 -p1 -b .fix-media-keys
 
-%patch14 -p1 -b .focus
-%patch15 -p1 -b .rotated-text
-%patch16 -p1 -b .label-color
-%patch17 -p1 -b .primary
-%patch18 -p1 -b .corner
+%patch15 -p1 -b .focus
+%patch16 -p1 -b .rotated-text
+%patch17 -p1 -b .label-color
+%patch18 -p1 -b .primary
+%patch19 -p1 -b .corner
 
 %build
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 02:51:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 22:51:38 -0400
Subject: rpms/gnome-applets/devel keyboard-drawing-corner.patch, NONE,
	1.1 keyboard-drawing-focus.patch, NONE,
	1.1 keyboard-drawing-label-color.patch, NONE,
	1.1 keyboard-drawing-primary.patch, NONE,
	1.1 keyboard-drawing-rotated-text.patch, NONE,
	1.1 gnome-applets.spec, 1.169, 1.170
Message-ID: <200608250251.k7P2pcsH025887@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25810

Modified Files:
	gnome-applets.spec 
Added Files:
	keyboard-drawing-corner.patch keyboard-drawing-focus.patch 
	keyboard-drawing-label-color.patch 
	keyboard-drawing-primary.patch 
	keyboard-drawing-rotated-text.patch 
Log Message:
improve keyboard drawing


keyboard-drawing-corner.patch:
 keyboard-drawing.c |   85 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 69 insertions(+), 16 deletions(-)

--- NEW FILE keyboard-drawing-corner.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.corner	2006-08-24 22:08:59.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 22:13:07.000000000 -0400
@@ -121,6 +121,61 @@
     g_object_unref (gc);
 }
 
+static void
+curve_rectangle (cairo_t *cr,
+		 gdouble  x0,
+		 gdouble  y0,
+		 gdouble  width,
+		 gdouble  height,
+		 gdouble  radius)
+{
+  gdouble x1, y1;
+  
+  if (!width || !height)
+    return;
+
+  x1 = x0 + width;
+  y1 = y0 + height;
+
+  radius = MIN(radius, MIN(width / 2, height / 2));
+
+  cairo_move_to (cr, x0, y0 + radius);
+  cairo_arc (cr, x0 + radius, y0 + radius, radius, M_PI, 3*M_PI/2);  
+  cairo_line_to (cr, x1 - radius, y0);
+  cairo_arc (cr, x1 - radius, y0 + radius, radius, 3*M_PI/2, 2*M_PI);  
+  cairo_line_to (cr, x1, y1 - radius);
+  cairo_arc (cr, x1 - radius, y1 - radius, radius, 0, M_PI/2);  
+  cairo_line_to (cr, x0 + radius, y1);
+  cairo_arc (cr, x0 + radius, y1 - radius, radius, M_PI/2, M_PI);  
+
+  cairo_close_path (cr);  
+}
+
+static void
+draw_curve_rectangle (GdkPixmap *pixmap,
+		      gboolean   filled,
+		      GdkColor  *fill_color,
+		      gint       x,
+		      gint       y,
+		      gint       width,
+		      gint       height,
+		      gint       radius)
+{
+  cairo_t *cr;
+
+  cr = gdk_cairo_create (GDK_DRAWABLE (pixmap));
+  curve_rectangle (cr, x, y, width, height, radius);
+
+  gdk_cairo_set_source_color (cr, fill_color);
+  
+  if (filled)
+    cairo_fill (cr);
+  else
+    cairo_stroke (cr);
+  
+  cairo_destroy (cr);
+}
+
 /* x, y, width, height are in the xkb coordinate system */
 static void
 draw_rectangle (
@@ -130,7 +185,8 @@
   gint xkb_x,
   gint xkb_y,
   gint xkb_width,
-  gint xkb_height)
+  gint xkb_height,
+  gint radius)
 {
   if (drawing->pixmap == NULL)
     return;
@@ -140,17 +196,12 @@
       GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
       gint x, y, width, height;
       gboolean filled;
-      GdkGC *gc;
 
       if (fill_color)
-        {
-          gc = gdk_gc_new (GTK_WIDGET (drawing)->window);
-          gdk_gc_set_rgb_fg_color (gc, fill_color);
-          filled = TRUE;
-        }
+	filled = TRUE;
       else
         {
-          gc = GTK_WIDGET (drawing)->style->dark_gc[state];
+          fill_color = &GTK_WIDGET (drawing)->style->dark[state];
           filled = FALSE;
         }
 
@@ -159,10 +210,8 @@
       width = xkb_to_pixmap_coord (drawing, xkb_x + xkb_width) - x;
       height = xkb_to_pixmap_coord (drawing, xkb_y + xkb_height) - y;
 
-      gdk_draw_rectangle (drawing->pixmap, gc, filled, x, y, width, height);
-
-      if (fill_color)
-        g_object_unref (gc);
+      draw_curve_rectangle (drawing->pixmap, filled, fill_color, 
+			    x, y, width, height, radius);
     }
   else
     {
@@ -203,7 +252,8 @@
     {
       if (color)
         draw_rectangle (drawing, color, angle, origin_x, origin_y,
-                        outline->points[0].x, outline->points[0].y);
+                        outline->points[0].x, outline->points[0].y,
+			outline->corner_radius);
 
 #ifdef KBDRAW_DEBUG
       printf("points:%p\n", outline->points);
@@ -211,7 +261,8 @@
 #endif
 
       draw_rectangle (drawing, NULL, angle, origin_x, origin_y,
-                      outline->points[0].x, outline->points[0].y);
+                      outline->points[0].x, outline->points[0].y,
+		      outline->corner_radius);
     }
   else if (outline->num_points == 2)
     {
@@ -223,10 +274,12 @@
                          angle, &rotated_x0, &rotated_y0);
       if (color)
         draw_rectangle (drawing, color, angle, rotated_x0, rotated_y0,
-                        outline->points[1].x, outline->points[1].y);
+                        outline->points[1].x, outline->points[1].y,
+			outline->corner_radius);
 
       draw_rectangle (drawing, NULL, angle, rotated_x0, rotated_y0,
-                      outline->points[1].x, outline->points[1].y);
+                      outline->points[1].x, outline->points[1].y,
+		      outline->corner_radius);
     }
   else
     {

keyboard-drawing-focus.patch:
 keyboard-drawing.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE keyboard-drawing-focus.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.old	2006-08-24 21:47:21.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 21:47:24.000000000 -0400
@@ -1073,12 +1153,12 @@
     {
       g_signal_emit (drawing, keyboard_drawing_signals[BAD_KEYCODE], 0,
                      event->hardware_keycode);
-      return FALSE;
+      return TRUE;
     }
 
   if ((event->type == GDK_KEY_PRESS && key->pressed) ||
       (event->type == GDK_KEY_RELEASE && !key->pressed))
-    return FALSE;
+    return TRUE;
   /* otherwise this event changes the state we believed we had before */
 
   key->pressed = (event->type == GDK_KEY_PRESS);
@@ -1087,7 +1167,7 @@
 
   invalidate_key_region (drawing, key);
 
-  return FALSE;
+  return TRUE;
 }
 
 static gint

keyboard-drawing-label-color.patch:
 keyboard-drawing.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE keyboard-drawing-label-color.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.label-color	2006-08-24 22:01:50.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 22:02:40.000000000 -0400
@@ -541,6 +541,9 @@
   PangoLayout * layout)
 {
   GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
+  GdkColor *color;
+  
+  color = drawing->colors + (drawing->xkb->geom->label_color - drawing->xkb->geom->colors);
 
   if (drawing->pixmap == NULL)
     return;
@@ -554,9 +557,9 @@
       drawing->angle = angle;
     }
 
-  gdk_draw_layout (drawing->pixmap,
-                   GTK_WIDGET (drawing)->style->text_gc[state], x, y,
-                   drawing->layout);
+  gdk_draw_layout_with_colors (drawing->pixmap,
+			       GTK_WIDGET (drawing)->style->text_gc[state], x, y,
+			       drawing->layout, color, NULL);
 }
 
 static void

keyboard-drawing-primary.patch:
 keyboard-drawing.c |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

--- NEW FILE keyboard-drawing-primary.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.primary	2006-08-24 22:04:09.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 22:07:38.000000000 -0400
@@ -719,9 +719,22 @@
   printf ("outlines: %p(%d)\n", shape->outlines, shape->num_outlines);
 #endif
 
-  for (i = 0; i < 1 /* shape->num_outlines */ ; i++)
-    draw_outline (drawing, shape->outlines + i, color, key->angle,
-                  key->origin_x, key->origin_y);
+  /* draw the primary outline */
+  draw_outline (drawing, shape->primary ? shape->primary : shape->outlines, 
+		color, key->angle, key->origin_x, key->origin_y);
+#if 0
+  /* don't draw other outlines for now, since
+   * the text placement does not take them into account 
+   */
+  for (i = 0; i < shape->num_outlines; i++)
+    {
+      if (shape->outlines + i == shape->approx ||
+	  shape->outlines + i == shape->primary)
+	continue;
+      draw_outline (drawing, shape->outlines + i, NULL, 
+		    key->angle, key->origin_x, key->origin_y);
+    }
+#endif
 
   draw_key_label (drawing, key->keycode, key->angle, key->origin_x,
                   key->origin_y, shape->bounds.x2, shape->bounds.y2);
@@ -850,10 +863,22 @@
   shape = drawing->xkb->geom->shapes + shape_doodad->shape_ndx;
   color = drawing->colors + shape_doodad->color_ndx;
 
+  /* draw the primary outline filled */
+  draw_outline (drawing, shape->primary ? shape->primary : shape->outlines, 
+		color, doodad->angle,
+		doodad->origin_x + shape_doodad->left,
+		doodad->origin_y + shape_doodad->top);
+
+  /* stroke the other outlines */
   for (i = 0; i < shape->num_outlines; i++)
-    draw_outline (drawing, shape->outlines + i, color, doodad->angle,
-                  doodad->origin_x + shape_doodad->left,
-                  doodad->origin_y + shape_doodad->top);
+    {
+      if (shape->outlines + i == shape->approx ||
+	  shape->outlines + i == shape->primary) 
+	continue;
+      draw_outline (drawing, shape->outlines + i, NULL, doodad->angle,
+		    doodad->origin_x + shape_doodad->left,
+		    doodad->origin_y + shape_doodad->top);
+    }
 }
 
 static void

keyboard-drawing-rotated-text.patch:
 keyboard-drawing.c |   38 --------------------------------------
 1 files changed, 38 deletions(-)

--- NEW FILE keyboard-drawing-rotated-text.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.rotated-text	2006-08-24 21:59:45.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 22:01:21.000000000 -0400
@@ -541,9 +541,6 @@
   PangoLayout * layout)
 {
   GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
-  PangoLayoutLine *line;
-  gint x_off, y_off;
-  gint i;
 
   if (drawing->pixmap == NULL)
     return;
@@ -557,41 +554,6 @@
       drawing->angle = angle;
     }
 
-  i = 0;
-  y_off = 0;
-  for (line = pango_layout_get_line (drawing->layout, i);
-       line != NULL; line = pango_layout_get_line (drawing->layout, ++i))
-    {
-      GSList *runp;
-      PangoRectangle line_extents;
-
-      x_off = 0;
-
-      for (runp = line->runs; runp != NULL; runp = runp->next)
-        {
-          PangoGlyphItem *run = runp->data;
-          gint j;
-
-          for (j = 0; j < run->glyphs->num_glyphs; j++)
-            {
-              PangoGlyphGeometry *geometry;
-              gint xx, yy;
-
-              geometry = &run->glyphs->glyphs[j].geometry;
-
-              rotate_coordinate (0, 0, x_off, y_off, angle, &xx, &yy);
-              geometry->x_offset -= x_off - xx;
-              geometry->y_offset -= y_off - yy;
-
-              x_off += geometry->width;
-            }
-        }
-
-      pango_layout_line_get_extents (line, NULL, &line_extents);
-      y_off +=
-        line_extents.height + pango_layout_get_spacing (drawing->layout);
-    }
-
   gdk_draw_layout (drawing->pixmap,
                    GTK_WIDGET (drawing)->style->text_gc[state], x, y,
                    drawing->layout);


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- gnome-applets.spec	23 Aug 2006 07:10:02 -0000	1.169
+++ gnome-applets.spec	25 Aug 2006 02:51:35 -0000	1.170
@@ -32,7 +32,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.90
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -44,6 +44,12 @@
 Patch4:		gnome-applets-2.15.1.1-cpufreq.patch
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
+Patch15: keyboard-drawing-focus.patch
+Patch16: keyboard-drawing-rotated-text.patch
+Patch17: keyboard-drawing-label-color.patch
+Patch18: keyboard-drawing-primary.patch
+Patch19: keyboard-drawing-corner.patch
+
 URL:		http://www.gnome.org/
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -122,6 +128,13 @@
 %patch4 -p1 -b .cpufreq
 %patch11 -p1 -b .dont-require-display
 
+%patch15 -p1 -b .focus
+%patch16 -p1 -b .rotated-text
+%patch17 -p1 -b .label-color
+%patch18 -p1 -b .primary
+%patch19 -p1 -b .corner
+
+
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
 # We don't ship gnome-system-tools
@@ -288,6 +301,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Thu Aug 24 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-2.fc6
+- Various improvements for the keyboard applet
+ 
 * Tue Aug 22 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-1.fc6
 - Update to 2.15.90
 - Drop upstreamed patches



From fedora-cvs-commits at redhat.com  Fri Aug 25 03:00:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 23:00:20 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.170,1.171
Message-ID: <200608250300.k7P30KL0029161@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29129

Modified Files:
	gnome-applets.spec 
Log Message:
fix build reqs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- gnome-applets.spec	25 Aug 2006 02:51:35 -0000	1.170
+++ gnome-applets.spec	25 Aug 2006 03:00:18 -0000	1.171
@@ -91,6 +91,7 @@
 BuildRequires:  libtool autoconf gettext
 BuildRequires:  pkgconfig
 BuildRequires:  gnome-icon-theme 
+BuildRequires:  perl-XML-Parser
 
 Requires:	gnome-panel >= %{gnome_panel_version}
 Requires:	libxklavier >= %{libxklavier_version}



From fedora-cvs-commits at redhat.com  Fri Aug 25 03:20:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 23:20:17 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.171,1.172
Message-ID: <200608250320.k7P3KHJp017973@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17897

Modified Files:
	gnome-applets.spec 
Log Message:
add bug refs



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- gnome-applets.spec	25 Aug 2006 03:00:18 -0000	1.171
+++ gnome-applets.spec	25 Aug 2006 03:20:15 -0000	1.172
@@ -44,10 +44,15 @@
 Patch4:		gnome-applets-2.15.1.1-cpufreq.patch
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=352776
 Patch15: keyboard-drawing-focus.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352777
 Patch16: keyboard-drawing-rotated-text.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352778
 Patch17: keyboard-drawing-label-color.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352779
 Patch18: keyboard-drawing-primary.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352781
 Patch19: keyboard-drawing-corner.patch
 
 URL:		http://www.gnome.org/



From fedora-cvs-commits at redhat.com  Fri Aug 25 03:20:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 23:20:37 -0400
Subject: rpms/control-center/devel control-center.spec,1.178,1.179
Message-ID: <200608250320.k7P3Kbdh018105@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18053

Modified Files:
	control-center.spec 
Log Message:
add bug refs



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- control-center.spec	25 Aug 2006 02:48:39 -0000	1.178
+++ control-center.spec	25 Aug 2006 03:20:34 -0000	1.179
@@ -42,10 +42,15 @@
 Patch13: control-center-2.15.91-compiz-support.patch
 Patch14: control-center-2.15.92-fix-media-keys.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=352776
 Patch15: keyboard-drawing-focus.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352777
 Patch16: keyboard-drawing-rotated-text.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352778
 Patch17: keyboard-drawing-label-color.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352779
 Patch18: keyboard-drawing-primary.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352781
 Patch19: keyboard-drawing-corner.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root



From fedora-cvs-commits at redhat.com  Fri Aug 25 03:28:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 23:28:54 -0400
Subject: rpms/xkeyboard-config/devel xkeyboard-config-0.8-dell.patch, NONE,
	1.1 xkeyboard-config-0.8-kinesis.patch, NONE,
	1.1 xkeyboard-config-0.8-thinkpad.patch, NONE,
	1.1 xkeyboard-config.spec, 1.3, 1.4
Message-ID: <200608250328.k7P3Ssh0021178@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/xkeyboard-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21037

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-0.8-dell.patch 
	xkeyboard-config-0.8-kinesis.patch 
	xkeyboard-config-0.8-thinkpad.patch 
Log Message:
Fix some keyboard descriptions, add some 


xkeyboard-config-0.8-dell.patch:
 geometry/dell     |  359 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rules/base        |    2 
 rules/base.xml.in |    6 
 symbols/inet      |   15 ++
 4 files changed, 382 insertions(+)

--- NEW FILE xkeyboard-config-0.8-dell.patch ---
--- xkeyboard-config-0.8/rules/base.dellm65	2006-02-27 18:14:28.000000000 -0500
+++ xkeyboard-config-0.8/rules/base	2006-08-24 20:09:46.000000000 -0400
@@ -104,6 +104,7 @@
   microsoftprousb =	microsoft(natural)
   microsoftprose =	microsoft(natural)
   dell101	=	dell(dell101)
+  dellm65	=	dell(dellm65)
   flexpro	=	keytronic(FlexPro)
   hp6000	=	hp(omnibook)
   omnikey101	=	northgate(omnikey101)
@@ -201,6 +202,7 @@
  $mac		$macvendorlayouts	nodeadkeys	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
 
 ! model		layout				=	symbols
+  dellm65       *                       =       pc(pc104)+%l+inet(%m)
   $pcmodels	ar			=	pc(%m)+ara
   *		ar			=	pc(pc105)+ara
   $pcmodels	ben			=	pc(%m)+in(ben)
--- xkeyboard-config-0.8/rules/base.xml.in.dellm65	2006-08-24 20:28:41.000000000 -0400
+++ xkeyboard-config-0.8/rules/base.xml.in	2006-08-24 20:29:08.000000000 -0400
@@ -34,6 +34,12 @@
     </model>
     <model>
       <configItem>
+        <name>dellm65</name>
+        <_description>Dell Precision M65</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>everex</name>
         <_description>Everex STEPnote</_description>
       </configItem>
--- xkeyboard-config-0.8/geometry/dell.dellm65	2006-08-24 20:03:12.000000000 -0400
+++ xkeyboard-config-0.8/geometry/dell	2006-08-24 20:03:20.000000000 -0400
@@ -181,3 +181,362 @@
     alias <AA00> = <LCTL>;
 
 }; // End of "default" geometry
+
+
+xkb_geometry "dell65" {
+};
+
+xkb_geometry "dell65x" {
+
+    description= "Dell 101";
+    width= 470;
+    height= 210;
+    color="grey10";
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    shape "BACKGROUND"  { cornerRadius=5, { [  470,  210 ] } };
+    solid "Background" {
+	shape= "BACKGROUND";
+	top=  0;
+	left= 0;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 21 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 21 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+};
+
+
+//
+// Dell Precision M65
+//
+
+xkb_geometry "dellm65" {
+
+    description= "Dell Precision M65";
+    width= 308;
+    height= 152;
+    baseColor = "grey20";
+    labelColor = "white";
+
+    shape "BACKGROUND"  { cornerRadius = 3, { [  308,  152 ] } };
+    shape "BACKGROUND2" { cornerRadius = 2, { [  7, 22 ], 
+                                              [ 171, 22 ],
+                                              [ 171, 10 ],
+                                              [ 301, 10 ],
+                                              [ 301, 148 ],
+                                              [ 244, 148 ],
+                                              [ 244, 132 ],
+                                              [   7, 132] } }; 
+    solid "Background" {
+	shape = "BACKGROUND";
+	top = 0;
+	left = 0;
+	color = "grey20";
+    };
+    solid "Background2" {
+	shape = "BACKGROUND2";
+	top = 0;
+	left = 0;
+	color = "black";
+    };
+
+    shape "LEDS" { cornerRadius = 4, { [ 26, 8 ] } };
+    shape "LED" { cornerRadius = 0, { [ 4, 4 ] } };
+    solid "LedPanel" {
+	shape = "LEDS";
+	top = 8;
+	left = 69;
+	color = "grey20";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray20";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 72; };
+    indicator "Caps Lock"    { left= 80; };
+    indicator "Scroll Lock"  { left= 88; };
+
+    shape "MEDIA" { cornerRadius = 5, { [ 2, 2], [ 12, 12 ] } };
+    shape "POWER" { cornerRadius = 7, { [ 14, 14 ] } };
+
+    section "Media" {
+        top = 5;
+        left = 102;
+        width = 60;
+        height = 14;
+        key.color="grey30";
+        key.shape = "MEDIA";
+        row {
+           top = 0;
+           keys {
+             <I2E>, <I30>, <I20>, { <I04>, shape = "POWER", gap = 3 }
+           };
+        };
+    };
+
+
+    shape "FKEY" { cornerRadius = 1, { [ 18, 12 ] }, { [ 1, 1 ], [ 17, 10 ] } };
+
+    section "Function" {
+       top = 12;
+       left = 8;
+       width = 290;
+       height = 24;
+       key.color = "grey80";
+       key.shape = "FKEY";
+       key.gap = 0;
+       row {
+	    top = 0;
+            keys {      { <MENU>, 165 }, <PRSC>, <NMLK>, <PAUS>, 
+                        { <INS>, 1 },  <HOME>, <PGUP> };
+       };
+       row {
+	    top = 12;
+            keys { <ESC>, { <FK01>, 1 }, <FK02>, <FK03>, <FK04>, 
+                          { <FK05>, 1 }, <FK06>, <FK07>, <FK08>,
+                          { <FK09>, 1 }, <FK10>, <FK11>, <FK12>,
+                          { <DELE>,  1 }, <END>, <PGDN> };
+       };
+   };
+
+   shape "AKEY" { cornerRadius = 1, { [ 19, 19 ] }, { [ 2, 1 ], [ 17, 15 ] } };
+   shape "BKSP" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "TABK" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "BKSL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "CAPS" { cornerRadius = 1, { [ 34, 19 ] }, { [ 2, 1 ], [ 32, 15 ] } };
+   shape "RTRN" { cornerRadius = 1, { [ 47, 19 ] }, { [ 2, 1 ], [ 45, 15 ] } };
+   shape "LFSH" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "RTSH" { cornerRadius = 1, { [ 56, 19 ] }, { [ 2, 1 ], [ 54, 15 ] } };
+   shape "LCTL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "LALT" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "RCTL" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "SPCE" { cornerRadius = 1, { [ 96, 19 ] }, { [ 2, 1 ], [ 94, 15 ] } };
+   
+
+   section "Alpha" {
+       top = 36;
+       left = 8;
+       width = 290;
+       height = 21;
+       key.color = "grey80";
+       key.shape = "AKEY";
+       key.gap = 0;
+       row {
+	    top = 1;
+            keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, 1, "BKSP" } };
+	};
+       row {
+	    top = 20;
+            keys { { <TAB>, "TABK" },
+		   { <AD01>, 1 }, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, 1, "BKSL" } };
+	};
+       row {
+	    top = 39;
+            keys { { <CAPS>, "CAPS" },
+		   { <AC01>, 1 }, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, 1, "RTRN" } };
+	};
+       row {
+	    top = 58;
+            keys { { <LFSH>, "LFSH" },
+		   { <AB01>, 1 }, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   { <RTSH>, 1, "RTSH" } };
+	};
+       row {
+           top = 77;
+           keys { { <LCTL>, "LCTL" }, { <LWIN>, 20 }, { <LALT>, "LALT" }, 
+                  { <SPCE>, "SPCE" }, <RALT>, { <RCTL>, "RCTL" } };
+	};
+   };
+
+   shape "SKEY" { cornerRadius = 1, { [ 18, 17 ] }, { [ 2, 1 ], [ 16, 13 ] } };
+   section "Arrows" {
+        top = 113;
+        left = 243;
+        width = 54;
+        height = 36;
+        
+       key.color = "grey80";
+        key.shape = "SKEY";
+        row {
+           top = 0;
+           left = 20;
+
+           keys { <UP> };
+        };
+  
+        row {
+            top = 17;
+            left = 2;
+
+            keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+   };
+
+  shape "STIK" { cornerRadius = 4, { [ 7, 7 ] } };
+
+  solid "STIK" {
+      priority = 255;
+      color = "blue";
+      shape = "STIK";
+      top = 90; 
+      left = 135;
+  };
+};
+ 
+
--- xkeyboard-config-0.8/symbols/inet.dellm65	2006-08-24 20:05:41.000000000 -0400
+++ xkeyboard-config-0.8/symbols/inet	2006-08-24 20:05:55.000000000 -0400
@@ -2028,3 +2028,18 @@
     key <K67>  { [ XF86MyComputer ] };
     key <XFER> { [ XF86AudioMedia ] };
 };
+
+//
+// Dell Precision M65
+//
+partial alphanumeric_keys
+xkb_symbols "dellm65" {
+
+    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
+    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I20>   {       [ XF86AudioMute         ]       };
+    key <I04>   {       [ XF86PowerOff          ]       };
+
+    key <LWIN> {        [       Super_L         ]       };
+};
+

xkeyboard-config-0.8-kinesis.patch:
 base        |    1 +
 base.xml.in |    6 ++++++
 2 files changed, 7 insertions(+)

--- NEW FILE xkeyboard-config-0.8-kinesis.patch ---
--- xkeyboard-config-0.8/rules/base.kinesis	2006-08-24 21:39:56.000000000 -0400
+++ xkeyboard-config-0.8/rules/base	2006-08-24 21:40:45.000000000 -0400
@@ -115,6 +115,7 @@
   pc98		=	nec(pc98)
   abnt2		=	pc(abnt2)
  $mac		=	macintosh(macintosh)
+  kinesis       =       kinesis(model100)
   *		=       pc(pc104)
 
 ! model		layout		variant		=	symbols
--- xkeyboard-config-0.8/rules/base.xml.in.kinesis	2006-08-24 21:40:52.000000000 -0400
+++ xkeyboard-config-0.8/rules/base.xml.in	2006-08-24 21:42:13.000000000 -0400
@@ -704,6 +704,12 @@
         <_description>Laptop/notebook eMachines m68xx</_description>
       </configItem>
     </model>
+    <model>
+      <configItem>
+        <name>kinesis</name>
+        <description>Kinesis Classic Keyboard</description>
+      </configItem>
+    </model>
   </modelList>
   <layoutList>
     <layout>

xkeyboard-config-0.8-thinkpad.patch:
 base        |    3 ++-
 base.xml.in |    6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE xkeyboard-config-0.8-thinkpad.patch ---
--- xkeyboard-config-0.8/rules/base.thinkpad	2006-08-24 19:42:40.000000000 -0400
+++ xkeyboard-config-0.8/rules/base	2006-08-24 19:42:54.000000000 -0400
@@ -107,7 +107,8 @@
   flexpro	=	keytronic(FlexPro)
   hp6000	=	hp(omnibook)
   omnikey101	=	northgate(omnikey101)
-  thinkpad	=	ibm_vndr/thinkpad(common)
+  thinkpad	=	ibm_vndr/thinkpad(us)
+  thinkpadintl	=	ibm_vndr/thinkpad(intl)
  $pcmodels	=	pc(%m)
   jp106		=	pc(jp106)
   everex	=	everex(STEPnote)
--- xkeyboard-config-0.8/rules/base.xml.in.thinkpad	2006-08-24 19:43:03.000000000 -0400
+++ xkeyboard-config-0.8/rules/base.xml.in	2006-08-24 19:43:25.000000000 -0400
@@ -400,6 +400,12 @@
     </model>
     <model>
       <configItem>
+        <name>thinkpadintl</name>
+        <_description>IBM ThinkPad 560Z/600/600E/A22E, Intl</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>logiaccess</name>
         <_description>Logitech Access Keyboard</_description>
       </configItem>


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/dist/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xkeyboard-config.spec	22 Aug 2006 14:58:36 -0000	1.3
+++ xkeyboard-config.spec	25 Aug 2006 03:28:51 -0000	1.4
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 0.8
-Release: 3
+Release: 4
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -13,6 +13,10 @@
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 Patch0: xkeyboard-config-0.8-composify-ralt.patch
 
+Patch1: xkeyboard-config-0.8-thinkpad.patch
+Patch2: xkeyboard-config-0.8-kinesis.patch
+Patch3: xkeyboard-config-0.8-dell.patch
+
 BuildArch: noarch
 
 BuildRequires: pkgconfig
@@ -41,6 +45,10 @@
 %setup -q
 %patch0 -p1 -b .composify-ralt
 
+%patch1 -p1 -b .thinkpad
+%patch2 -p1 -b .kinesis
+%patch3 -p1 -b .dell
+
 %build
 %configure \
     --enable-compat-rules \
@@ -76,6 +84,11 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Thu Aug 22 2006 Matthias Clasen <mclasen at redhat.com> 0.8-4
+- Fix geometry description for Thinkpads
+- Add a Kinesis model
+- Add Dell Precision M65 geometry and model
+
 * Tue Aug 22 2006 Adam Jackson <ajackson at redhat.com> 0.8-3
 - Add Compose semantics to right Alt when that's ISO_Level3_Shift (#193922)
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 03:50:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 24 Aug 2006 23:50:34 -0400
Subject: rpms/xkeyboard-config/devel xkeyboard-config.spec,1.4,1.5
Message-ID: <200608250350.k7P3oYxL018152@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/xkeyboard-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18139

Modified Files:
	xkeyboard-config.spec 
Log Message:
add bug refs



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/dist/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xkeyboard-config.spec	25 Aug 2006 03:28:51 -0000	1.4
+++ xkeyboard-config.spec	25 Aug 2006 03:50:31 -0000	1.5
@@ -13,8 +13,11 @@
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 Patch0: xkeyboard-config-0.8-composify-ralt.patch
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=7990
 Patch1: xkeyboard-config-0.8-thinkpad.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=7991
 Patch2: xkeyboard-config-0.8-kinesis.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=7992
 Patch3: xkeyboard-config-0.8-dell.patch
 
 BuildArch: noarch



From fedora-cvs-commits at redhat.com  Fri Aug 25 04:04:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 00:04:10 -0400
Subject: rpms/dejavu-lgc-fonts/devel .cvsignore, 1.3,
	1.4 dejavu-lgc-fonts.conf, 1.1, 1.2 dejavu-lgc-fonts.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200608250404.k7P44AhW029284@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/dejavu-lgc-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29232

Modified Files:
	.cvsignore dejavu-lgc-fonts.conf dejavu-lgc-fonts.spec sources 
Log Message:
- Update to 2.9
- Add langcover.txt and unicover.txt to docs, as they are not empty anymore
- Alias DejaVu Sans Light to DejaVu LGC Sans Light



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Jul 2006 16:22:48 -0000	1.3
+++ .cvsignore	25 Aug 2006 04:04:05 -0000	1.4
@@ -1 +1 @@
-dejavu-lgc-ttf-2.8.tar.gz
+dejavu-lgc-ttf-2.9.tar.gz


Index: dejavu-lgc-fonts.conf
===================================================================
RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/dejavu-lgc-fonts.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dejavu-lgc-fonts.conf	18 Jul 2006 16:22:48 -0000	1.1
+++ dejavu-lgc-fonts.conf	25 Aug 2006 04:04:05 -0000	1.2
@@ -61,6 +61,14 @@
 	</match>
 	<match>
 		<test name="family">
+			<string>DejaVu Sans Light</string>
+		</test>
+		<edit name="family" mode="append" binding="same">
+			<string>DejaVu LGC Sans Light</string>
+		</edit>
+	</match>
+	<match>
+		<test name="family">
 			<string>DejaVu Sans Condensed</string>
 		</test>
 		<edit name="family" mode="assign" binding="same">


Index: dejavu-lgc-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/dejavu-lgc-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dejavu-lgc-fonts.spec	18 Jul 2006 16:22:48 -0000	1.3
+++ dejavu-lgc-fonts.spec	25 Aug 2006 04:04:05 -0000	1.4
@@ -3,7 +3,7 @@
 %define fontconfdir     %{_sysconfdir}/fonts/conf.d
 
 Name:      dejavu-lgc-fonts
-Version:   2.8
+Version:   2.9
 Release:   1
 Summary:   DejaVu LGC Fonts
 Group:     User Interface/X
@@ -54,13 +54,18 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc AUTHORS BUGS LICENSE NEWS README
+%doc AUTHORS BUGS LICENSE NEWS README langcover.txt unicover.txt
 %dir %{fontdir}
 %{fontdir}/*.ttf
 %config %{fontconfdir}/25-%{name}.conf
 
 
 %changelog
+* Fri Aug 24 2006 Behdad Esfahbod <besfahbo at redhat.com> - 2.9-1
+- Update to 2.9
+- Add langcover.txt and unicover.txt to docs, as they are not empty anymore
+- Alias DejaVu Sans Light to DejaVu LGC Sans Light
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.8-1
 - Update to 2.8
 - Add fontconfig configuration to make Dejavu the default


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Jul 2006 16:22:48 -0000	1.3
+++ sources	25 Aug 2006 04:04:05 -0000	1.4
@@ -1 +1 @@
-809f338658752b22b2d649658c3a228e  dejavu-lgc-ttf-2.8.tar.gz
+46bf8f18b5b6530ae435586e105e5beb  dejavu-lgc-ttf-2.9.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 25 04:26:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 00:26:17 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch, NONE,
	1.1 xorg-x11-server.spec, 1.156, 1.157
Message-ID: <200608250426.k7P4QHH0015837@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15754

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch 
Log Message:
* Fri Aug 25 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-29.fc6
- Add xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch to fix VT
  switching (and suspend/resume) when using AIGLX. (#199692, fdo #7916).


xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch:
 glxdri.c    |   54 +++++++++++++++++++++++++++++++++++++++----------
 glxext.c    |   65 +++++++++++++++++++++++++++++++++++++++++++++---------------
 glxserver.h |    5 ++--
 3 files changed, 95 insertions(+), 29 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch ---
diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index cfa9996..77fa4bf 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -63,27 +63,30 @@ #include "dispatch.h"
 #define STRINGIFY(macro_or_string)	STRINGIFY_ARG (macro_or_string)
 #define	STRINGIFY_ARG(contents)	#contents
 
-typedef struct __GLXDRIscreen      __GLXDRIscreen;
-typedef struct __GLXDRIcontext         __GLXDRIcontext;
+typedef struct __GLXDRIscreen   __GLXDRIscreen;
+typedef struct __GLXDRIcontext  __GLXDRIcontext;
 typedef struct __GLXDRIdrawable __GLXDRIdrawable;
 
 struct __GLXDRIscreen {
-    __GLXscreen		 base;
+    __GLXscreen	     base;
 
-    __DRIscreen			 driScreen;
-    void			*driver;
+    xf86EnterVTProc *enterVT;
+    xf86LeaveVTProc *leaveVT;
+
+    __DRIscreen	     driScreen;
+    void	    *driver;
 };
 
 struct __GLXDRIcontext {
-    __GLXcontext		 base;
+    __GLXcontext base;
 
-    __DRIcontext		 driContext;
+    __DRIcontext driContext;
 };
 
 struct __GLXDRIdrawable {
-    __GLXdrawable	 base;
+    __GLXdrawable  base;
 
-    __DRIdrawable		*driDrawable;
+    __DRIdrawable *driDrawable;
 };
 
 /* History:
@@ -594,8 +597,7 @@ static __DRIfuncPtr getProcAddress(const
 
 static __DRIscreen *findScreen(__DRInativeDisplay *dpy, int scrn)
 {
-    __GLXDRIscreen *screen =
-	(__GLXDRIscreen *) __glXgetActiveScreen(scrn);
+    __GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(scrn);
 
     return &screen->driScreen;
 }
@@ -789,6 +791,30 @@ static const __DRIinterfaceMethods inter
 
 static const char dri_driver_path[] = DRI_DRIVER_PATH;
 
+static Bool
+glxDRIEnterVT (int index, int flags)
+{
+    __GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(index);
+
+    LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
+
+    glxResumeClients();
+
+    return (*screen->enterVT) (index, flags);
+}
+
+static void
+glxDRILeaveVT (int index, int flags)
+{
+    __GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(index);
+
+    LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n");
+
+    glxSuspendClients();
+
+    return (*screen->leaveVT) (index, flags);
+}
+
 static __GLXscreen *
 __glXDRIscreenProbe(ScreenPtr pScreen)
 {
@@ -813,6 +839,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     void *dev_priv = NULL;
     char filename[128];
     Bool isCapable;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 
     if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable")) {
 	LogMessage(X_ERROR, "AIGLX: DRI module not loaded\n");
@@ -983,6 +1010,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
 
     __glXsetEnterLeaveServerFuncs(__glXDRIenterServer, __glXDRIleaveServer);
 
+    screen->enterVT = pScrn->EnterVT;
+    pScrn->EnterVT = glxDRIEnterVT; 
+    screen->leaveVT = pScrn->LeaveVT;
+    pScrn->LeaveVT = glxDRILeaveVT;
+
     LogMessage(X_INFO,
 	       "AIGLX: Loaded and initialized %s\n", filename);
 
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index 8bbb83f..edc257c 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -234,13 +231,11 @@ GLboolean __glXFreeContext(__GLXcontext 
      * __glXDispatch() or as a callback from the resource manager.  In
      * the latter case we need to lift the DRI lock manually. */
 
-    if (!inDispatch)
-      __glXleaveServer();
+    __glXleaveServer();
 
     cx->destroy(cx);
 
-    if (!inDispatch)
-      __glXenterServer();
+    __glXenterServer();
 
     return GL_TRUE;
 }
@@ -336,7 +331,7 @@ void GlxExtensionInit(void)
     /*
     ** Initialize table of client state.  There is never a client 0.
     */
-    for (i=1; i <= MAXCLIENTS; i++) {
+    for (i = 1; i <= MAXCLIENTS; i++) {
 	__glXClients[i] = 0;
     }
 
@@ -407,11 +402,36 @@ __GLXcontext *__glXForceCurrent(__GLXcli
 
 /************************************************************************/
 
-/*
-** Top level dispatcher; all commands are executed from here down.
-*/
+static int glxServerLeaveCount;
+static int glxBlockClients;
 
-/* I cried when I wrote this.  Damn you XAA! */
+void glxSuspendClients(void)
+{
+    int i;
+
+    for (i = 1; i <= MAXCLIENTS; i++) {
+	if (__glXClients[i] == NULL || !__glXClients[i]->inUse)
+	    continue;
+
+	IgnoreClient(__glXClients[i]->client);
+    }
+
+    glxBlockClients = TRUE;
+}
+
+void glxResumeClients(void)
+{
+    int i;
+
+    glxBlockClients = FALSE;
+
+    for (i = 1; i <= MAXCLIENTS; i++) {
+	if (__glXClients[i] == NULL || !__glXClients[i]->inUse)
+	    continue;
+
+	AttendClient(__glXClients[i]->client);
+    }
+}
 
 static void
 __glXnopEnterServer(void)
@@ -436,14 +456,19 @@ void __glXsetEnterLeaveServerFuncs(void 
 
 void __glXenterServer(void)
 {
-  (*__glXenterServerFunc)();
+  glxServerLeaveCount--;
+
+  if (glxServerLeaveCount == 0)
+    (*__glXenterServerFunc)();
 }
 
 void __glXleaveServer(void)
 {
-  (*__glXleaveServerFunc)();
-}
+  if (glxServerLeaveCount == 0)
+    (*__glXleaveServerFunc)();
 
+  glxServerLeaveCount++;
+}
 
 /*
 ** Top level dispatcher; all commands are executed from here down.
@@ -496,6 +521,15 @@ static int __glXDispatch(ClientPtr clien
 	return __glXError(GLXBadLargeRequest);
     }
 
+    /* If we're currently blocking GLX clients, just put this guy to
+     * sleep, reset the request and return. */
+    if (glxBlockClients) {
+	ResetCurrentRequest(client);
+	client->sequence--;
+	IgnoreClient(client);
+	return(client->noClientException);
+    }
+
     /*
     ** Use the opcode to index into the procedure table.
     */
@@ -506,12 +540,8 @@ static int __glXDispatch(ClientPtr clien
 
     __glXleaveServer();
 
-    inDispatch = True;
-
     retval = proc(cl, (GLbyte *) stuff);
 
-    inDispatch = False;
-
     __glXenterServer();
 
     return retval;
diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h
index 8ece1e2..9eed1bc 100644
--- a/GL/glx/glxserver.h
+++ b/GL/glx/glxserver.h
@@ -136,6 +136,9 @@ void __glXsetEnterLeaveServerFuncs(void 
 void __glXenterServer(void);
 void __glXleaveServer(void);
 
+void glxSuspendClients(void);
+void glxResumeClients(void);
+
 /*
 ** State kept per client.
 */
@@ -176,8 +179,6 @@ struct __GLXclientStateRec {
     char *GLClientextensions;
 };
 
-extern __GLXclientState *__glXClients[];
-
 /************************************************************************/
 
 /*


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- xorg-x11-server.spec	25 Aug 2006 01:22:20 -0000	1.156
+++ xorg-x11-server.spec	25 Aug 2006 04:26:12 -0000	1.157
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   28%{?dist}
+Release:   29%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -37,6 +37,7 @@
 Patch106:  xorg-x11-server-1.1.1-no-composite-in-xnest.patch
 Patch107:  xorg-x11-server-1.1.1-offscreen-pixmaps.patch
 Patch108:  xorg-x11-server-1.1.1-mesa-6.5.1.patch
+Patch109:  xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -346,6 +347,7 @@
 %patch106 -p1 -b .no-xnest-composite
 %patch107 -p1 -b .offscreen-pixmaps
 %patch108 -p1 -b .mesa-651
+%patch109 -p1 -b .aiglx-happy-vt-switch
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
@@ -703,6 +705,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Aug 25 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-29.fc6
+- Add xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch to fix VT
+  switching (and suspend/resume) when using AIGLX. (#199692, fdo #7916).
+
 * Thu Aug 24 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-28.fc6
 - xorg-x11-server-1.1.1-infer-virtual.patch: Only flag modes as preferred
   if the EDID block says to.



From fedora-cvs-commits at redhat.com  Fri Aug 25 04:35:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 00:35:29 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.157,1.158
Message-ID: <200608250435.k7P4ZTur017759@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17716

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Fri Aug 25 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-29.fc6
- Add xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch to fix VT
  switching (and suspend/resume) when using AIGLX. (#199692, fdo #7916).
- Bump mesa source and libGL BuildRequires.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- xorg-x11-server.spec	25 Aug 2006 04:26:12 -0000	1.157
+++ xorg-x11-server.spec	25 Aug 2006 04:35:26 -0000	1.158
@@ -158,8 +158,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.5-1
-BuildRequires: mesa-source >= 6.5-22
+BuildRequires: mesa-libGL-devel >= 6.5.1
+BuildRequires: mesa-source >= 6.5.1
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 
@@ -708,6 +708,7 @@
 * Fri Aug 25 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-29.fc6
 - Add xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch to fix VT
   switching (and suspend/resume) when using AIGLX. (#199692, fdo #7916).
+- Bump mesa source and libGL BuildRequires.
 
 * Thu Aug 24 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-28.fc6
 - xorg-x11-server-1.1.1-infer-virtual.patch: Only flag modes as preferred



From fedora-cvs-commits at redhat.com  Fri Aug 25 04:54:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 00:54:28 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-mesa-6.5.1.patch,
	1.1, 1.2 xorg-x11-server.spec, 1.158, 1.159
Message-ID: <200608250454.k7P4sSRp003739@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3710

Modified Files:
	xorg-x11-server-1.1.1-mesa-6.5.1.patch xorg-x11-server.spec 
Log Message:
* Fri Aug 25 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-29.fc6
- Add xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch to fix VT
  switching (and suspend/resume) when using AIGLX. (#199692, fdo #7916).
- Bump mesa source and libGL BuildRequires.
- Update mesa-6.5.1 patch to work with 6.5.1 rc1 (slang_version_syn.h
  renamed to slang_pp_version_syn.h).


xorg-x11-server-1.1.1-mesa-6.5.1.patch:
 mesa/main/Makefile.am |    2 ++
 symlink-mesa.sh       |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: xorg-x11-server-1.1.1-mesa-6.5.1.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-mesa-6.5.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.1-mesa-6.5.1.patch	19 Aug 2006 03:40:27 -0000	1.1
+++ xorg-x11-server-1.1.1-mesa-6.5.1.patch	25 Aug 2006 04:54:22 -0000	1.2
@@ -43,3 +43,12 @@
      action renderbuffer.c
      action renderbuffer.h
      action simple_list.h
+@@ -468,7 +468,7 @@ symlink_mesa_shader_slang_library() {
+     action slang_core_gc.h
+     action slang_fragment_builtin_gc.h
+     action slang_shader_syn.h
+-    action slang_version_syn.h
++    action slang_pp_version_syn.h
+     action slang_vertex_builtin_gc.h
+ }        
+ 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- xorg-x11-server.spec	25 Aug 2006 04:35:26 -0000	1.158
+++ xorg-x11-server.spec	25 Aug 2006 04:54:22 -0000	1.159
@@ -709,6 +709,8 @@
 - Add xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch to fix VT
   switching (and suspend/resume) when using AIGLX. (#199692, fdo #7916).
 - Bump mesa source and libGL BuildRequires.
+- Update mesa-6.5.1 patch to work with 6.5.1 rc1 (slang_version_syn.h
+  renamed to slang_pp_version_syn.h).
 
 * Thu Aug 24 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-28.fc6
 - xorg-x11-server-1.1.1-infer-virtual.patch: Only flag modes as preferred



From fedora-cvs-commits at redhat.com  Fri Aug 25 05:08:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 01:08:42 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch, 1.1, 1.2
Message-ID: <200608250508.k7P58g8X006585@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6513

Modified Files:
	xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch 
Log Message:
Update happy vt-switch patch; don't delete __glXClients array decl.

xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch:
 glxdri.c    |   54 +++++++++++++++++++++++++++++++++++++++----------
 glxext.c    |   65 +++++++++++++++++++++++++++++++++++++++++++++---------------
 glxserver.h |    3 ++
 3 files changed, 95 insertions(+), 27 deletions(-)

Index: xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch	25 Aug 2006 04:26:12 -0000	1.1
+++ xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch	25 Aug 2006 05:08:34 -0000	1.2
@@ -239,12 +239,3 @@
  /*
  ** State kept per client.
  */
-@@ -176,8 +179,6 @@ struct __GLXclientStateRec {
-     char *GLClientextensions;
- };
- 
--extern __GLXclientState *__glXClients[];
--
- /************************************************************************/
- 
- /*



From fedora-cvs-commits at redhat.com  Fri Aug 25 06:15:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 02:15:12 -0400
Subject: rpms/autofs/devel
	autofs-5.0.1-rc1-cancel-tasks-at-shutdown-fix.patch, NONE, 1.1
	autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch,
	NONE, 1.1 autofs.spec, 1.142, 1.143
Message-ID: <200608250615.k7P6FBJF020153@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20073

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-cancel-tasks-at-shutdown-fix.patch 
	autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch 
Log Message:
* Fri Aug 25 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.17
- fix task cancelation at shutdown (more)
- fix concurrent mount and expire race with nested submounts.


autofs-5.0.1-rc1-cancel-tasks-at-shutdown-fix.patch:
 CHANGELOG                |    1 
 daemon/automount.c       |   32 ++++++-------
 daemon/direct.c          |   19 ++++++--
 daemon/indirect.c        |   18 ++++++-
 daemon/state.c           |  109 ++++++++++++++++++++++++++++++-----------------
 include/automount.h      |    2 
 lib/master.c             |    9 +++
 modules/lookup_file.c    |    2 
 modules/lookup_ldap.c    |    2 
 modules/lookup_nisplus.c |    2 
 modules/lookup_yp.c      |    2 
 11 files changed, 128 insertions(+), 70 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cancel-tasks-at-shutdown-fix.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 78a4cf8..b6e30c4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -33,6 +33,7 @@
 - fix directory cleanup on expire.
 - fix task cancelation at shutdown.
 - fix included map wild card key lookup.
+- fix task cancelation at shutdown (more).
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 8195349..343fd68 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -391,9 +391,12 @@ static int umount_subtree_mounts(struct 
 
 	left = 0;
 
+	pthread_cleanup_push(cache_lock_cleanup, mc);
+
 	if (me->multi) {
 		char *root, *base;
 		size_t ap_len;
+		int cur_state;
 
 		ap_len = strlen(ap->path);
 
@@ -411,6 +414,7 @@ static int umount_subtree_mounts(struct 
 		else
 			base = me->key + strlen(root);
 
+		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 		/* Lock the closest parent nesting point for umount */
 		cache_multi_lock(me->parent);
 		if (umount_multi_triggers(ap, root, me, base)) {
@@ -419,9 +423,10 @@ static int umount_subtree_mounts(struct 
 			left++;
 		}
 		cache_multi_unlock(me->parent);
+		pthread_setcancelstate(cur_state, NULL);
 	}
 
-	cache_unlock(mc);
+	pthread_cleanup_pop(1);
 
 	if (left || is_autofs_fs)
 		return left;
@@ -616,8 +621,10 @@ static int get_pkt(struct autofs_point *
 
 			if (post_state != ST_INVAL) {
 				if (post_state == ST_SHUTDOWN_PENDING ||
-				    post_state == ST_SHUTDOWN_FORCE)
+				    post_state == ST_SHUTDOWN_FORCE) {
+					alarm_delete(ap);
 					st_remove_tasks(ap);
+				}
 				st_add_task(ap, post_state);
 			}
 
@@ -947,7 +954,7 @@ static int do_hup_signal(struct master *
 static void *statemachine(void *arg)
 {
 	sigset_t signalset;
-	int sig, status;
+	int sig;
 
 	sigfillset(&signalset);
 	sigdelset(&signalset, SIGCHLD);
@@ -956,20 +963,9 @@ static void *statemachine(void *arg)
 	while (1) {
 		sigwait(&signalset, &sig);
 
-		status = pthread_mutex_lock(&master_mutex);
-		if (status)
-			fatal(status);
 
-		if (list_empty(&master_list->mounts)) {
-			status = pthread_mutex_unlock(&master_mutex);
-			if (status)
-				fatal(status);
+		if (master_list_empty(master_list))
 			return NULL;
-		}
-
-		status = pthread_mutex_unlock(&master_mutex);
-		if (status)
-			fatal(status);
 
 		switch (sig) {
 		case SIGTERM:
@@ -1068,6 +1064,9 @@ static void handle_mounts_cleanup(void *
 	/* If we have been canceled then we may hold the state mutex. */
 	mutex_operation_wait(&ap->state_mutex);
 
+	alarm_delete(ap);
+	st_remove_tasks(ap);
+
 	umount_autofs(ap, 1);
 
 	master_signal_submount(ap, MASTER_SUBMNT_JOIN);
@@ -1117,6 +1116,7 @@ void *handle_mounts(void *arg)
 		suc.status = 1;
 		state_mutex_unlock(ap);
 		umount_autofs(ap, 1);
+		pthread_setcancelstate(cancel_state, NULL);
 		pthread_exit(NULL);
 	}
 
@@ -1132,7 +1132,7 @@ void *handle_mounts(void *arg)
 		alarm_add(ap, ap->exp_runfreq + rand() % ap->exp_runfreq);
 
 	pthread_cleanup_push(handle_mounts_cleanup, ap);
-	pthread_setcancelstate(cancel_state, &cancel_state);
+	pthread_setcancelstate(cancel_state, NULL);
 
 	state_mutex_unlock(ap);
 
diff --git a/daemon/direct.c b/daemon/direct.c
index b08cbdd..9a1cd59 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -758,7 +758,12 @@ static int expire_direct(int ioctlfd, co
 		nanosleep(&tm, NULL);
 	}
 
-	return (retries >= 0);
+	if (!ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {
+		if (!ret)
+			return 0;
+	}
+
+	return 1;
 }
 
 static void mnts_cleanup(void *arg)
@@ -770,7 +775,7 @@ static void mnts_cleanup(void *arg)
 
 void *expire_proc_direct(void *arg)
 {
-	struct mnt_list *mnts, *next;
+	struct mnt_list *mnts = NULL, *next;
 	struct expire_args *ea;
 	struct autofs_point *ap;
 	struct mapent *me = NULL;
@@ -786,7 +791,7 @@ void *expire_proc_direct(void *arg)
 
 	ap = ea->ap;
 	now = ea->when;
-	ea->status = 1;
+	ea->status = -1;
 
 	ea->signaled = 1;
 	status = pthread_cond_signal(&ea->cond);
@@ -807,8 +812,8 @@ void *expire_proc_direct(void *arg)
 	left = 0;
 
 	/* Get a list of real mounts and expire them if possible */
-	mnts = get_mnt_list(_PROC_MOUNTS, "/", 0);
 	pthread_cleanup_push(mnts_cleanup, mnts);
+	mnts = get_mnt_list(_PROC_MOUNTS, "/", 0);
 	for (next = mnts; next; next = next->next) {
 		if (!strcmp(next->fs_type, "autofs")) {
 			/*
@@ -828,6 +833,9 @@ void *expire_proc_direct(void *arg)
 				continue;
 		}
 
+		if (ap->state == ST_EXPIRE || ap->state == ST_PRUNE)
+			pthread_testcancel();
+
 		/*
 		 * All direct mounts must be present in the map
 		 * entry cache.
@@ -857,7 +865,9 @@ void *expire_proc_direct(void *arg)
 
 	ea->status = left;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 	pthread_cleanup_pop(1);
+	pthread_setcancelstate(cur_state, NULL);
 
 	return NULL;
 }
@@ -1361,6 +1371,7 @@ int handle_packet_missing_direct(struct 
 
 	cache_unlock(mc);
 	pthread_cleanup_push(pending_cleanup, mt);
+	pthread_setcancelstate(state, NULL);
 
 	mt->signaled = 0;
 	while (!mt->signaled) {
diff --git a/daemon/indirect.c b/daemon/indirect.c
index cff4f1c..38d0b7a 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -399,7 +399,12 @@ static int expire_indirect(struct autofs
 		nanosleep(&tm, NULL);
 	}
 
-	return (retries >= 0);
+	if (!ioctl(ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {
+		if (!ret)
+			return 0;
+	}
+
+	return 1;
 }
 
 static void mnts_cleanup(void *arg)
@@ -413,7 +418,7 @@ void *expire_proc_indirect(void *arg)
 {
 	struct autofs_point *ap;
 	struct mapent *me = NULL;
-	struct mnt_list *mnts, *next;
+	struct mnt_list *mnts = NULL, *next;
 	struct expire_args *ea;
 	unsigned int now;
 	int offsets, submnts, count;
@@ -428,7 +433,7 @@ void *expire_proc_indirect(void *arg)
 
 	ap = ea->ap;
 	now = ea->when;
-	ea->status = 1;
+	ea->status = -1;
 
 	ea->signaled = 1;
 	status = pthread_cond_signal(&ea->cond);
@@ -449,8 +454,8 @@ void *expire_proc_indirect(void *arg)
 	left = 0;
 
 	/* Get a list of real mounts and expire them if possible */
-	mnts = get_mnt_list(_PROC_MOUNTS, ap->path, 0);
 	pthread_cleanup_push(mnts_cleanup, mnts);
+	mnts = get_mnt_list(_PROC_MOUNTS, ap->path, 0);
 	for (next = mnts; next; next = next->next) {
 		char *ind_key;
 		int ret;
@@ -468,6 +473,9 @@ void *expire_proc_indirect(void *arg)
 			continue;
 		}
 
+		if (ap->state == ST_EXPIRE || ap->state == ST_PRUNE)
+			pthread_testcancel();
+
 		/*
 		 * If the mount corresponds to an offset trigger then
 		 * the key is the path, otherwise it's the last component.
@@ -554,7 +562,9 @@ void *expire_proc_indirect(void *arg)
 
 	ea->status = left;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 	pthread_cleanup_pop(1);
+	pthread_setcancelstate(cur_state, NULL);
 
 	return NULL;
 }
diff --git a/daemon/state.c b/daemon/state.c
index 47fee39..526725b 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -98,14 +98,12 @@ void expire_cleanup(void *arg)
 	struct autofs_point *ap;
 	int statefd;
 	enum states next = ST_INVAL;
-	int success, ret, cur_state;
+	int success, ret;
 
 	ea = (struct expire_args *) arg;
 	ap = ea->ap;
 	success = ea->status;
 
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
-
 	state_mutex_lock(ap);
 
 	debug(ap->logopt,
@@ -179,8 +177,6 @@ #endif
 
 	free(ea);
 
-	pthread_setcancelstate(cur_state, NULL);
-
 	return;
 }
 
@@ -602,12 +598,31 @@ static unsigned int st_expire(struct aut
 	return 0;
 }
 
+static struct state_queue *st_alloc_task(struct autofs_point *ap, enum states state)
+{
+	struct state_queue *task;
+
+	task = malloc(sizeof(struct state_queue));
+	if (!task)
+		return NULL;
+	memset(task, 0, sizeof(struct state_queue));
+
+	task->ap = ap;
+	task->state = state;
+
+	INIT_LIST_HEAD(&task->list);
+	INIT_LIST_HEAD(&task->pending);
+
+	return task;
+}
+
 /* Insert alarm entry on ordered list. */
 int st_add_task(struct autofs_point *ap, enum states state)
 {
 	struct list_head *head;
-	struct list_head *p;
+	struct list_head *p, *q;
 	struct state_queue *new;
+	enum states ap_state;
 	unsigned int empty = 1;
 	int status;
 
@@ -630,23 +645,13 @@ int st_add_task(struct autofs_point *ap,
 	}
 
 	state_mutex_lock(ap);
-	if (ap->state == ST_SHUTDOWN) {
+	ap_state = ap->state;
+	if (ap_state == ST_SHUTDOWN) {
 		state_mutex_unlock(ap);
 		return 1;
 	}
 	state_mutex_unlock(ap);
 
-	new = malloc(sizeof(struct state_queue));
-	if (!new)
-		return 0;
-	memset(new, 0, sizeof(struct state_queue));
-
-	new->ap = ap;
-	new->state = state;
-
-	INIT_LIST_HEAD(&new->list);
-	INIT_LIST_HEAD(&new->pending);
-
 	st_mutex_lock();
 
 	head = &state_queue;
@@ -657,15 +662,48 @@ int st_add_task(struct autofs_point *ap,
 
 		task = list_entry(p, struct state_queue, list);
 
-		if (task->ap == ap) {
-			empty = 0;
-			list_add_tail(&new->pending, &task->pending);
+		if (task->ap != ap)
+			continue;
+
+		empty = 0;
+
+		/* Don't add duplicate shutdown tasks */
+		if (task->state == state &&
+		   (ap_state == ST_SHUTDOWN_PENDING ||
+		    ap_state == ST_SHUTDOWN_FORCE))
 			break;
+
+		/* No pending tasks */
+		if (list_empty(&task->pending)) {
+			new = st_alloc_task(ap, state);
+			if (new)
+				list_add_tail(&new->pending, &task->pending);
+			goto done;
+		}
+
+		list_for_each(q, &task->pending) {
+			struct state_queue *p_task;
+
+			p_task = list_entry(q, struct state_queue, pending);
+
+			if (p_task->state == state &&
+			   (ap_state == ST_SHUTDOWN_PENDING ||
+			    ap_state == ST_SHUTDOWN_FORCE))
+				goto done;
 		}
+
+		new = st_alloc_task(ap, state);
+		if (new)
+			list_add_tail(&new->pending, &task->pending);
+done:
+		break;
 	}
 
-	if (empty)
-		list_add(&new->list, head);
+	if (empty) {
+		new = st_alloc_task(ap, state);
+		if (new)
+			list_add(&new->list, head);
+	}
 
 	/* Added task, encourage state machine */
 	signaled = 1;
@@ -715,8 +753,12 @@ void st_remove_tasks(struct autofs_point
 			waiting = list_entry(q, struct state_queue, pending);
 			q = q->next;
 
-			list_del(&waiting->pending);
-			free(waiting);
+			/* Don't remove existing shutdown task */
+			if (waiting->state != ST_SHUTDOWN_PENDING &&
+			    waiting->state != ST_SHUTDOWN_FORCE) {
+				list_del(&waiting->pending);
+				free(waiting);
+			}
 		}
 	}
 
@@ -735,7 +777,7 @@ static int run_state_task(struct state_q
 {
 	struct autofs_point *ap;
 	enum states next_state, state;
-	unsigned long ret = 1;
+	unsigned long ret = 0;
  
 	ap = task->ap;
 	next_state = task->state;
@@ -767,7 +809,6 @@ static int run_state_task(struct state_q
 			break;
 
 		default:
-			ret = 0;
 			error(ap->logopt, "bad next state %d", next_state);
 		}
 	}
@@ -825,12 +866,7 @@ static void *st_queue_handler(void *arg)
 
 			task = list_entry(p, struct state_queue, list);
 			p = p->next;
-/*
-			debug(LOGOPT_NONE,
-			      "task %p ap %p state %d next %d busy %d",
-			      task, task->ap, task->ap->state,
-			      task->state, task->busy);
-*/
+
 			task->busy = 1;
 
 			ret = run_state_task(task);
@@ -861,12 +897,7 @@ static void *st_queue_handler(void *arg)
 
 				task = list_entry(p, struct state_queue, list);
 				p = p->next;
-/*
-				debug(LOGOPT_NONE,
-				      "task %p ap %p state %d next %d busy %d",
-				      task, task->ap, task->ap->state,
-				      task->state, task->busy);
-*/
+
 				if (!task->busy) {
 					/* Start a new task */
 					task->busy = 1;
diff --git a/include/automount.h b/include/automount.h
index 6153f71..1f4fc6b 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -123,7 +123,7 @@ #define CHE_DUPLICATE	0x0020
 
 #define HASHSIZE		77
 #define NEGATIVE_TIMEOUT	10
-#define UMOUNT_RETRIES		6
+#define UMOUNT_RETRIES		8
 #define EXPIRE_RETRIES		3
 
 struct mapent_cache {
diff --git a/lib/master.c b/lib/master.c
index 1d66542..a411459 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -724,8 +724,8 @@ int master_read_master(struct master *ma
 	master_mutex_lock();
 
 	if (list_empty(&master->mounts)) {
-		error(LOGOPT_ANY, "no mounts in table");
 		master_mutex_unlock();
+		error(LOGOPT_ANY, "no mounts in table");
 		return 0;
 	}
 
@@ -856,8 +856,9 @@ void master_notify_state_change(struct m
 	struct master_mapent *entry;
 	struct autofs_point *ap;
 	struct list_head *p;
-	int state_pipe;
+	int state_pipe, cur_state;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 	master_mutex_lock();
 
 	list_for_each(p, &master->mounts) {
@@ -907,6 +908,7 @@ next:
 	}
 
 	master_mutex_unlock();
+	pthread_setcancelstate(cur_state, NULL);
 
 	return;
 }
@@ -1065,7 +1067,9 @@ static void check_update_map_sources(str
 int master_mount_mounts(struct master *master, time_t age, int readall)
 {
 	struct list_head *p, *head;
+	int cur_state;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cur_state);
 	master_mutex_lock();
 
 	head = &master->mounts;
@@ -1109,6 +1113,7 @@ int master_mount_mounts(struct master *m
 	}
 
 	master_mutex_unlock();
+	pthread_setcancelstate(cur_state, NULL);
 
 	return 1;
 }
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 3588129..1bfdeed 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -1010,7 +1010,7 @@ int lookup_mount(struct autofs_point *ap
 
 	cache_readlock(mc);
 	me = cache_lookup(mc, key);
-	if (me && me->mapent) {
+	if (me && me->mapent && *me->mapent) {
 		pthread_cleanup_push(cache_lock_cleanup, mc);
 		mapent_len = strlen(me->mapent);
 		mapent = alloca(mapent_len + 1);
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index c0ced9e..b63539e 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1648,7 +1648,7 @@ int lookup_mount(struct autofs_point *ap
 
 	cache_readlock(mc);
 	me = cache_lookup(mc, key);
-	if (me && me->mapent) {
+	if (me && me->mapent && *me->mapent) {
 		mapent_len = strlen(me->mapent);
 		mapent = alloca(mapent_len + 1);
 		strcpy(mapent, me->mapent);
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index b0fe4a6..683ec6c 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -514,7 +514,7 @@ int lookup_mount(struct autofs_point *ap
 
 	cache_readlock(mc);
 	me = cache_lookup(mc, key);
-	if (me && me->mapent) {
+	if (me && me->mapent && *me->mapent) {
 		mapent_len = strlen(me->mapent);
 		mapent = alloca(mapent_len + 1);
 		strcpy(mapent, me->mapent);
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 275610a..8dfb9c0 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -598,7 +598,7 @@ int lookup_mount(struct autofs_point *ap
 
 	cache_readlock(mc);
 	me = cache_lookup(mc, key);
-	if (me && me->mapent) {
+	if (me && me->mapent && *me->mapent) {
 		mapent_len = strlen(me->mapent);
 		mapent = alloca(mapent_len + 1);
 		strcpy(mapent, me->mapent);

autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch:
 CHANGELOG      |    1 +
 daemon/state.c |   33 ++++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index b6e30c4..1387d49 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -34,6 +34,7 @@
 - fix task cancelation at shutdown.
 - fix included map wild card key lookup.
 - fix task cancelation at shutdown (more).
+- fix concurrent mount and expire race with nested submounts.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/state.c b/daemon/state.c
index 526725b..e356715 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -96,9 +96,8 @@ void expire_cleanup(void *arg)
 	pthread_t thid = pthread_self();
 	struct expire_args *ea;
 	struct autofs_point *ap;
-	int statefd;
+	int statefd, status;
 	enum states next = ST_INVAL;
-	int success, ret;
 
 	ea = (struct expire_args *) arg;
 	ap = ea->ap;
@@ -120,19 +119,35 @@ void expire_cleanup(void *arg)
 		case ST_EXPIRE:
 			/* FALLTHROUGH */
 		case ST_PRUNE:
-			/* If we're a submount and we've just
-			   pruned or expired everything away,
-			   try to shut down */
+			/*
+			 * If we're a submount and we've just pruned or
+			 * expired everything away, try to shut down.
+			 *
+			 * Since we use the the fact that a mount will not
+			 * expire for at least ap->exp_timeout to avoid a
+			 * mount <-> expire race we need to wait before
+			 * letting a submount expire away. We also need
+			 * them to go away fairly quickly so the owner
+			 * mount expires in a reasonable time. Just skip
+			 * one expire check after it's no longer busy before
+			 * allowing it to shutdown.
+			 */
 			if (ap->submount && !success) {
-				if (!ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {
-					if (ret)
-						next = ST_SHUTDOWN_PENDING;
+				int rv, idle;
+
+				rv = ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &idle);
+				if (!rv && idle && ap->submount > 1) {
+					next = ST_SHUTDOWN_PENDING;
+					break;
 				}
-				break;
+
+				if (ap->submount++ == 0)
+					ap->submount = 2;
 			}
 
 			if (!ap->submount)
 				alarm_add(ap, ap->exp_runfreq);
+
 			/* FALLTHROUGH */
 
 		case ST_READY:


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- autofs.spec	20 Aug 2006 09:48:54 -0000	1.142
+++ autofs.spec	25 Aug 2006 06:15:06 -0000	1.143
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.16
+%define release 0.rc1.17
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -45,6 +45,8 @@
 Patch32: autofs-5.0.1-rc1-dir-cleanup-on-expire-fix.patch
 Patch33: autofs-5.0.1-rc1-cancel-tasks-at-shutdown.patch
 Patch34: autofs-5.0.1-rc1-included-map-wild-lookup-fix.patch
+Patch35: autofs-5.0.1-rc1-cancel-tasks-at-shutdown-fix.patch
+Patch36: autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -118,6 +120,8 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -174,6 +178,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Aug 25 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.17
+- fix task cancelation at shutdown (more)
+- fix concurrent mount and expire race with nested submounts.
+
 * Sun Aug 20 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.16
 - fix included map lookup.
 - fix directory cleanup on expire.



From fedora-cvs-commits at redhat.com  Fri Aug 25 06:29:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 02:29:16 -0400
Subject: rpms/autofs/devel
	autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch,
	1.1, 1.2
Message-ID: <200608250629.k7P6TFve007012@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6018

Modified Files:
	autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch 
Log Message:
- correct var name error in patch.


autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch:
 CHANGELOG      |    1 +
 daemon/state.c |   33 ++++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

Index: autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch	25 Aug 2006 06:15:06 -0000	1.1
+++ autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch	25 Aug 2006 06:29:13 -0000	1.2
@@ -19,7 +19,7 @@
  	struct expire_args *ea;
  	struct autofs_point *ap;
 -	int statefd;
-+	int statefd, status;
++	int statefd, success;
  	enum states next = ST_INVAL;
 -	int success, ret;
  



From fedora-cvs-commits at redhat.com  Fri Aug 25 07:15:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 03:15:03 -0400
Subject: rpms/glibc/devel .cvsignore, 1.167, 1.168 glibc-fedora.patch, 1.173,
	1.174 glibc.spec, 1.259, 1.260 sources, 1.191, 1.192
Message-ID: <200608250715.k7P7F2Xv009972@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9938/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4.90-24 on branch devel from glibc-2.4.90-24.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- .cvsignore	22 Aug 2006 09:27:29 -0000	1.167
+++ .cvsignore	25 Aug 2006 07:14:59 -0000	1.168
@@ -1,2 +1,2 @@
-glibc-20060822T0706.tar.bz2
-glibc-fedora-20060822T0706.tar.bz2
+glibc-20060825T0639.tar.bz2
+glibc-fedora-20060825T0639.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/malloc.c                                             |    5 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 58 files changed, 1398 insertions(+), 632 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- glibc-fedora.patch	22 Aug 2006 09:27:29 -0000	1.173
+++ glibc-fedora.patch	25 Aug 2006 07:14:59 -0000	1.174
@@ -1,5 +1,5 @@
---- glibc-20060822T0706/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060822T0706-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060825T0639/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060825T0639-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060822T0706/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060822T0706-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060825T0639/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060825T0639-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060822T0706/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060822T0706-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060825T0639/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060825T0639-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060822T0706/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060822T0706-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060825T0639/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060825T0639-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060822T0706/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060822T0706-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060825T0639/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060825T0639-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060822T0706/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060822T0706-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060825T0639/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060825T0639-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060822T0706/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060822T0706-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060825T0639/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060825T0639-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060822T0706/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060822T0706-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060825T0639/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060825T0639-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060822T0706/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060822T0706-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060825T0639/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060825T0639-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060822T0706/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060822T0706-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060825T0639/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060825T0639-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060822T0706/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060822T0706-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060825T0639/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060825T0639-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-20060822T0706/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060822T0706-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060825T0639/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060825T0639-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-20060822T0706/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060822T0706-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060825T0639/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060825T0639-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060822T0706/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060822T0706-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060825T0639/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060825T0639-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060822T0706/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060822T0706-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060825T0639/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060825T0639-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060822T0706/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060822T0706-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060825T0639/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060825T0639-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060822T0706/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060822T0706-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060825T0639/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060825T0639-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060822T0706/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060822T0706-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060825T0639/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060825T0639-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060822T0706/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
-+++ glibc-20060822T0706-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
+--- glibc-20060825T0639/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
++++ glibc-20060825T0639-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
 @@ -77,6 +77,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060822T0706/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060822T0706-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060825T0639/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060825T0639-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060822T0706/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
-+++ glibc-20060822T0706-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
+--- glibc-20060825T0639/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
++++ glibc-20060825T0639-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20060822T0706/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060822T0706-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060825T0639/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060825T0639-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -950,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060822T0706/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060822T0706-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060825T0639/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060825T0639-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -979,8 +979,36 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060822T0706/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060822T0706-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060825T0639/malloc/malloc.c	24 Aug 2006 17:29:36 -0000	1.164
++++ glibc-20060825T0639-fedora/malloc/malloc.c	25 Aug 2006 06:54:11 -0000	1.127.2.28
+@@ -4069,9 +4069,10 @@ _int_malloc(mstate av, size_t bytes)
+   */
+ 
+   for(;;) {
+-
++#if 0
+     int iters = 0;
+     bool any_larger = false;
++#endif    
+     while ( (victim = unsorted_chunks(av)->bk) != unsorted_chunks(av)) {
+       bck = victim->bk;
+       if (__builtin_expect (victim->size <= 2 * SIZE_SZ, 0)
+@@ -4168,11 +4169,13 @@ _int_malloc(mstate av, size_t bytes)
+       fwd->bk = victim;
+       bck->fd = victim;
+ 
++#if 0
+       if (size >= nb)
+ 	any_larger = true;
+ #define MAX_ITERS	10000
+       if (++iters >= MAX_ITERS)
+ 	break;
++#endif
+     }
+ 
+     /*
+--- glibc-20060825T0639/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060825T0639-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1056,8 +1084,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060822T0706/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060822T0706-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060825T0639/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060825T0639-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -1113,17 +1141,17 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060822T0706/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060822T0706-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060825T0639/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060825T0639-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060822T0706/nptl/ChangeLog	21 Aug 2006 21:05:47 -0000	1.911
-+++ glibc-20060822T0706-fedora/nptl/ChangeLog	22 Aug 2006 09:05:40 -0000	1.706.2.98
-@@ -1028,6 +1028,15 @@
+--- glibc-20060825T0639/nptl/ChangeLog	23 Aug 2006 17:47:19 -0000	1.912
++++ glibc-20060825T0639-fedora/nptl/ChangeLog	25 Aug 2006 06:45:14 -0000	1.706.2.99
+@@ -1040,6 +1040,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1139,7 +1167,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1764,6 +1773,11 @@
+@@ -1776,6 +1785,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1151,7 +1179,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3838,6 +3852,11 @@
+@@ -3850,6 +3864,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1163,8 +1191,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060822T0706/nptl/Makefile	21 Aug 2006 21:02:10 -0000	1.186
-+++ glibc-20060822T0706-fedora/nptl/Makefile	22 Aug 2006 09:05:40 -0000	1.157.2.26
+--- glibc-20060825T0639/nptl/Makefile	21 Aug 2006 21:02:10 -0000	1.186
++++ glibc-20060825T0639-fedora/nptl/Makefile	22 Aug 2006 09:05:40 -0000	1.157.2.26
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1187,8 +1215,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060822T0706/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060822T0706-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060825T0639/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060825T0639-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1213,8 +1241,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060822T0706-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1222,8 +1250,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
-+++ glibc-20060822T0706-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
+--- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
++++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
 @@ -68,6 +68,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1559,8 +1587,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060822T0706-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@@ -1706,8 +1734,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060822T0706-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
 @@ -44,9 +44,16 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -1808,8 +1836,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060822T0706-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1951,8 +1979,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
-+++ glibc-20060822T0706-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
+--- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
++++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
 @@ -49,6 +49,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2340,8 +2368,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060822T0706/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060822T0706-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
 @@ -46,8 +46,13 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -2436,8 +2464,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060822T0706/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060822T0706-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060825T0639/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060825T0639-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2460,8 +2488,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060822T0706/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060822T0706-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060825T0639/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060825T0639-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2480,8 +2508,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060822T0706/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060822T0706-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060825T0639/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060825T0639-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2493,8 +2521,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060822T0706/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060822T0706-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060825T0639/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060825T0639-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -2535,8 +2563,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060822T0706/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
-+++ glibc-20060822T0706-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
+--- glibc-20060825T0639/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
++++ glibc-20060825T0639-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2570,8 +2598,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060822T0706/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060822T0706-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060825T0639/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060825T0639-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -2588,8 +2616,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060822T0706/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060822T0706-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060825T0639/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060825T0639-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -2605,8 +2633,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-20060822T0706/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060822T0706-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060825T0639/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060825T0639-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2620,8 +2648,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060822T0706/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060822T0706-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060825T0639/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060825T0639-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -2633,8 +2661,8 @@
  endif
  endif
  
---- glibc-20060822T0706/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060822T0706-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060825T0639/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060825T0639-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -2986,8 +3014,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060822T0706/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060822T0706-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060825T0639/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060825T0639-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3073,8 +3101,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060822T0706/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20060822T0706-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20060825T0639/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20060825T0639-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3089,8 +3117,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20060822T0706/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
-+++ glibc-20060822T0706-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+--- glibc-20060825T0639/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20060825T0639-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
 @@ -18,11 +18,14 @@
     02111-1307 USA.  */
  
@@ -3138,8 +3166,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060822T0706/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060822T0706-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060825T0639/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060825T0639-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;
@@ -3182,8 +3210,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060822T0706/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060822T0706-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060825T0639/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060825T0639-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"
@@ -3193,8 +3221,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060822T0706/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060822T0706-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060825T0639/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060825T0639-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;
@@ -3240,8 +3268,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060822T0706/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060822T0706-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060825T0639/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060825T0639-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.
@@ -3302,8 +3330,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060822T0706/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060822T0706-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060825T0639/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060825T0639-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)
@@ -3336,24 +3364,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060822T0706/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060822T0706-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060825T0639/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060825T0639-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-20060822T0706/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060822T0706-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060825T0639/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060825T0639-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-20060822T0706/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060822T0706-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060825T0639/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060825T0639-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.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- glibc.spec	22 Aug 2006 09:27:29 -0000	1.259
+++ glibc.spec	25 Aug 2006 07:14:59 -0000	1.260
@@ -1,9 +1,9 @@
-%define glibcdate 20060822T0706
+%define glibcdate 20060825T0639
 %define glibcname glibc
-%define glibcsrcdir glibc-20060822T0706
+%define glibcsrcdir glibc-20060825T0639
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 23
+%define glibcrelease 24
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1147,7 +1147,7 @@
 cd build-%{nptl_target_cpu}-linuxnptl
 ( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
   sleep 10s
-  teepid="`ps -eo ppid,pid,command | grep ^${parent}' [0-9]\+ tee' | cut -d' ' -f2`"
+  teepid="`ps -eo ppid,pid,command | grep ^${parent}'[ 	]\+[0-9]\+[ 	]\+tee' | cut -d' ' -f2`"
   [ -n "$teepid" ] && kill $teepid
 ) | tee check.log || :
 cd ..
@@ -1156,7 +1156,7 @@
 cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
 ( make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1
   sleep 10s
-  teepid="`ps -eo ppid,pid,command | grep ^${parent}' [0-9]\+ tee' | cut -d' ' -f2`"
+  teepid="`ps -eo ppid,pid,command | grep ^${parent}'[ 	]\+[0-9]\+[ 	]\+tee' | cut -d' ' -f2`"
   [ -n "$teepid" ] && kill $teepid
 ) | tee check.log || :
 cd ..
@@ -1453,6 +1453,13 @@
 %endif
 
 %changelog
+* Fri Aug 25 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-24
+- temporarily back out code to limit number of unsorted block
+  sort iterations (#203735, #204027)
+- handle PLT symbols in dladdr properly (BZ#2683)
+- avoid malloc infinite looping for allocations larger than
+  the system can allocate (#203915)
+
 * Tue Aug 22 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-23
 - malloc fixes, especially for 32-bit arches (#202309)
 - further *_IN locale fixes (#200230)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- sources	22 Aug 2006 09:27:29 -0000	1.191
+++ sources	25 Aug 2006 07:14:59 -0000	1.192
@@ -1,2 +1,2 @@
-219b28bcd42213eb4e7dbe9fbcb51ef9  glibc-20060822T0706.tar.bz2
-029df895f3b69dbc6a0a9d254195f589  glibc-fedora-20060822T0706.tar.bz2
+769179b293d497b4e8e7adf703ff7e9b  glibc-20060825T0639.tar.bz2
+84f2fd751da598c7ab6712c923ce5093  glibc-fedora-20060825T0639.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 25 07:46:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 03:46:46 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.859,1.860
Message-ID: <200608250746.k7P7kk0S009766@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8221

Modified Files:
	openoffice.org.spec 
Log Message:
try using MALLOC_CHECK_


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.859
retrieving revision 1.860
diff -u -r1.859 -r1.860
--- openoffice.org.spec	24 Aug 2006 12:26:37 -0000	1.859
+++ openoffice.org.spec	25 Aug 2006 07:46:43 -0000	1.860
@@ -1064,6 +1064,7 @@
 echo build end time is `date`, diskspace: `df -h . | tail -n 1`
 #getting an unpackaged install
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
+export MALLOC_CHECK_=0
 echo start en-US install time is `date`
 if ! dmake openoffice_en-US; then
     echo parallel openoffice_en-US failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build...



From fedora-cvs-commits at redhat.com  Fri Aug 25 08:17:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 04:17:28 -0400
Subject: rpms/gettext/devel gettext.spec,1.55,1.56
Message-ID: <200608250817.k7P8HSxC007550@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/gettext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32705

Modified Files:
	gettext.spec 
Log Message:
move libgettext*.so devel files to devel package (Patrice Dumas, #203622)



Index: gettext.spec
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gettext.spec	7 Aug 2006 08:02:10 -0000	1.55
+++ gettext.spec	25 Aug 2006 08:17:25 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
 Version: 0.14.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL/LGPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -178,8 +178,8 @@
 %dir %{_datadir}/locale/en at quot
 %dir %{_datadir}/locale/en at quot/LC_MESSAGES
 
-%{_libdir}/libgettextlib*.so
-%{_libdir}/libgettextsrc*.so
+%{_libdir}/libgettextlib-%{version}.so
+%{_libdir}/libgettextsrc-%{version}.so
 %{_libdir}/preloadable_libintl.so
 %{_infodir}/gettext*
 %{_mandir}/man1/*
@@ -211,6 +211,8 @@
 %{_libdir}/lib*.a
 %{_libdir}/libasprintf.so*
 %{_libdir}/libgettextpo.so*
+%{_libdir}/libgettextlib.so
+%{_libdir}/libgettextsrc.so
 %{_mandir}/man1/gettextize.1.gz
 %{_mandir}/man1/autopoint.1.gz
 %{_mandir}/man3/*
@@ -220,6 +222,9 @@
 
 
 %changelog
+* Fri Aug 25 2006 Jens Petersen <petersen at redhat.com> - 0.14.6-2
+- move libgettext*.so devel files to devel package (Patrice Dumas, #203622)
+
 * Mon Aug  7 2006 Jens Petersen <petersen at redhat.com> - 0.14.6-1
 - update to 0.14.6
 - include preloadable_libintl.so again (Roozbeh Pournader, #149809)



From fedora-cvs-commits at redhat.com  Fri Aug 25 08:28:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 04:28:12 -0400
Subject: rpms/vixie-cron/devel vixie-cron-4.1-_55-bz203746.patch, NONE,
	1.1 vixie-cron-4.1-man-page-typo.patch, NONE,
	1.1 vixie-cron.spec, 1.72, 1.73
Message-ID: <200608250828.k7P8SCmr015616@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15370

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_55-bz203746.patch 
	vixie-cron-4.1-man-page-typo.patch 
Log Message:
Add patch on crond should use Auto-Submitted header in outbound mail and 
man-page typo.


vixie-cron-4.1-_55-bz203746.patch:
 do_command.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE vixie-cron-4.1-_55-bz203746.patch ---
--- vixie-cron-4.1/do_command.c.rfc3834	2006-08-23 11:19:19.000000000 -0400
+++ vixie-cron-4.1/do_command.c	2006-08-23 11:19:19.000000000 -0400
@@ -436,6 +436,11 @@
 					fprintf(mail,"Content-Transfer-Encoding: %s\n", content_transfer_encoding);
 				}
 
+				/* The Auto-Submitted header is
+				 * defined (and suggested by) RFC3834.
+				 */
+				fprintf(mail, "Auto-Submitted: auto-generated\n");
+
 				for (env = jobenv;  *env;  env++)
 					fprintf(mail, "X-Cron-Env: <%s>\n",
 						*env);

vixie-cron-4.1-man-page-typo.patch:
 cron.8 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE vixie-cron-4.1-man-page-typo.patch ---
--- vixie-cron-4.1/cron.8.typo	2006-08-23 11:16:25.000000000 +0200
+++ vixie-cron-4.1/cron.8	2006-08-23 11:40:13.000000000 +0200
@@ -19,7 +19,7 @@
 .\"
 .\" $Id: cron.8,v 1.8 2004/01/23 19:03:32 vixie Exp $
 .\" 
-.TH CRON 8 "10 January 1996""
+.TH CRON "8" "10 January 1996" "Linux Programmer's Manual"
 .UC 4
 .SH NAME
 cron \- daemon to execute scheduled commands (ISC Cron V4.1)
@@ -32,10 +32,10 @@
 .RB [ \-m <mail command> ]
 .SH DESCRIPTION
 .I Cron
-should be started from /etc/rc or /etc/rc.local.  It will return immediately,
-so you don't need to start it with '&'.  The \-n option changes this default
-behavior causing it to run in the foreground.  This can be useful when 
-starting it out of init.
+should be started from /etc/rc.d/rc or /etc/rc.d/rc.local.  It will return 
+immediately, so you don't need to start it with '&'.  The \-n option changes 
+this default behavior causing it to run in the foreground.  This can be 
+useful when starting it out of init.
 .PP
 .I Cron
 searches /var/spool/cron for crontab files which are named after accounts in
@@ -91,7 +91,7 @@
 .SS PAM Access Control
 On Red Hat systems, crond now supports access control with PAM - see 
 .IR pam (8) .
-A PAM configuration file for crond is installed in /etc/pam.d/crond .
+A PAM configuration file for crond is installed in /etc/pam.d/crond.
 crond loads the PAM environment from the pam_env module, but these
 can be overriden by settings in the crontab file.
 .SH SIGNALS


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- vixie-cron.spec	21 Jul 2006 02:01:22 -0000	1.72
+++ vixie-cron.spec	25 Aug 2006 08:28:09 -0000	1.73
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 58%{?dist}
+Release: 59%{?dist}
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -72,6 +72,9 @@
 Patch52: vixie-cron-4.1-_52-bz181439.patch
 Patch53: vixie-cron-4.1-_53_bz199294_selinux_mls.patch
 Patch54: vixie-cron-4.1-_54_bz198019_database_changes.patch
+Patch55: vixie-cron-4.1-man-page-typo.patch
+Patch56: vixie-cron-4.1-_55-bz203746.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
 Conflicts: sysklogd < 1.4.1
@@ -162,7 +165,8 @@
 %patch52 -p1 -b .bz181439
 %patch53 -p1 -b .selinux_mls
 %patch54 -p1 -b .bz198019
-
+%patch55 -p1 -b .man-page-typo
+%patch56 -p1 -b .bz203746
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" \
 %if %{WITH_SELINUX}
@@ -229,6 +233,10 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Wed Aug 25 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-59
+- small changes in man-page cron
+- (#203746) RFC3834, patch from James Ralston
+
 * Thu Jul 20 2006 Jason Vas Dias <jvdias at redhat.com> - 4:4.1-58
 - fix bug 199294: support for LSPP multiple per-job SELinux contexts
 - fix bug 198019: make database.c correct if crontab mtime changes 



From fedora-cvs-commits at redhat.com  Fri Aug 25 08:46:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 04:46:13 -0400
Subject: rpms/vixie-cron/FC-5 vixie-cron-4.1-_55-bz203746.patch, NONE,
	1.1 vixie-cron-4.1-man-page-typo.patch, NONE,
	1.1 vixie-cron.spec, 1.69, 1.70
Message-ID: <200608250846.k7P8kDn0019699@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19583

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_55-bz203746.patch 
	vixie-cron-4.1-man-page-typo.patch 
Log Message:
Adding crond should use Auto-Submitted header in outbound mail and
man-pages typo to FC-5 update.


vixie-cron-4.1-_55-bz203746.patch:
 do_command.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE vixie-cron-4.1-_55-bz203746.patch ---
--- vixie-cron-4.1/do_command.c.rfc3834	2006-08-23 11:19:19.000000000 -0400
+++ vixie-cron-4.1/do_command.c	2006-08-23 11:19:19.000000000 -0400
@@ -436,6 +436,11 @@
 					fprintf(mail,"Content-Transfer-Encoding: %s\n", content_transfer_encoding);
 				}
 
+				/* The Auto-Submitted header is
+				 * defined (and suggested by) RFC3834.
+				 */
+				fprintf(mail, "Auto-Submitted: auto-generated\n");
+
 				for (env = jobenv;  *env;  env++)
 					fprintf(mail, "X-Cron-Env: <%s>\n",
 						*env);

vixie-cron-4.1-man-page-typo.patch:
 cron.8 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE vixie-cron-4.1-man-page-typo.patch ---
--- vixie-cron-4.1/cron.8.typo	2006-08-23 11:16:25.000000000 +0200
+++ vixie-cron-4.1/cron.8	2006-08-23 11:40:13.000000000 +0200
@@ -19,7 +19,7 @@
 .\"
 .\" $Id: cron.8,v 1.8 2004/01/23 19:03:32 vixie Exp $
 .\" 
-.TH CRON 8 "10 January 1996""
+.TH CRON "8" "10 January 1996" "Linux Programmer's Manual"
 .UC 4
 .SH NAME
 cron \- daemon to execute scheduled commands (ISC Cron V4.1)
@@ -32,10 +32,10 @@
 .RB [ \-m <mail command> ]
 .SH DESCRIPTION
 .I Cron
-should be started from /etc/rc or /etc/rc.local.  It will return immediately,
-so you don't need to start it with '&'.  The \-n option changes this default
-behavior causing it to run in the foreground.  This can be useful when 
-starting it out of init.
+should be started from /etc/rc.d/rc or /etc/rc.d/rc.local.  It will return 
+immediately, so you don't need to start it with '&'.  The \-n option changes 
+this default behavior causing it to run in the foreground.  This can be 
+useful when starting it out of init.
 .PP
 .I Cron
 searches /var/spool/cron for crontab files which are named after accounts in
@@ -91,7 +91,7 @@
 .SS PAM Access Control
 On Red Hat systems, crond now supports access control with PAM - see 
 .IR pam (8) .
-A PAM configuration file for crond is installed in /etc/pam.d/crond .
+A PAM configuration file for crond is installed in /etc/pam.d/crond.
 crond loads the PAM environment from the pam_env module, but these
 can be overriden by settings in the crontab file.
 .SH SIGNALS


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/FC-5/vixie-cron.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- vixie-cron.spec	15 Jul 2006 00:31:15 -0000	1.69
+++ vixie-cron.spec	25 Aug 2006 08:46:11 -0000	1.70
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 55.FC5
+Release: 56%{?dist}
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -70,6 +70,9 @@
 Patch50: vixie-cron-4.1-_50-bz178931.patch
 Patch51: vixie-cron-4.1-_51-bz180145-mail_i18n.patch
 Patch52: vixie-cron-4.1-_52-bz181439.patch
+Patch53: vixie-cron-4.1-man-page-typo.patch
+Patch54: vixie-cron-4.1-_55-bz203746.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
 Conflicts: sysklogd < 1.4.1
@@ -158,7 +161,8 @@
 %patch50 -p1 -b .bz178931
 %patch51 -p1 -b .mail_i18n
 %patch52 -p1 -b .bz181439
-
+%patch53 -p1 -b .man-pages-typo
+%patch54 -p1 -b .bz203746
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" \
 %if %{WITH_SELINUX}
@@ -225,6 +229,10 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Fri Aug 25 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-56.FC5
+- small changes in man-page cron
+- (#203746) RFC3834, patch from James Ralston
+
 * Fri Jul 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4:4.1-55.FC5
 - fix bug 198893 - change permissions of cron spool directories to 0700
 - fix bug 191823: fix missing BuildRequires: audit-libs-devel



From fedora-cvs-commits at redhat.com  Fri Aug 25 09:12:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 05:12:15 -0400
Subject: rpms/glibc/devel glibc-fedora.patch, 1.174, 1.175 glibc.spec, 1.260,
	1.261
Message-ID: <200608250912.k7P9CFme008038@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8012

Modified Files:
	glibc-fedora.patch glibc.spec 
Log Message:
2.4.90-25

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libc/locale/programs/ld-ctype.c                             |    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/malloc.c                                             |    5 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 59 files changed, 1398 insertions(+), 634 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- glibc-fedora.patch	25 Aug 2006 07:14:59 -0000	1.174
+++ glibc-fedora.patch	25 Aug 2006 09:12:06 -0000	1.175
@@ -3385,3 +3385,14 @@
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
+--- libc/locale/programs/ld-ctype.c	25 Aug 2006 00:38:54 -0000	1.109
++++ libc/locale/programs/ld-ctype.c	12 Aug 2006 20:19:14 -0000	1.108
+@@ -2256,8 +2256,6 @@ ctype_read (struct linereader *ldfile, s
+   /* Prepare the data structures.  */
+   ctype_startup (ldfile, result, charmap, copy_locale, ignore_content);
+   ctype = result->categories[LC_CTYPE].ctype;
+-  if (ctype == NULL)
+-    return;
+ 
+   /* Remember the repertoire we use.  */
+   if (!ignore_content)


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- glibc.spec	25 Aug 2006 07:14:59 -0000	1.260
+++ glibc.spec	25 Aug 2006 09:12:11 -0000	1.261
@@ -3,7 +3,7 @@
 %define glibcsrcdir glibc-20060825T0639
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 24
+%define glibcrelease 25
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1453,7 +1453,7 @@
 %endif
 
 %changelog
-* Fri Aug 25 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-24
+* Fri Aug 25 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-25
 - temporarily back out code to limit number of unsorted block
   sort iterations (#203735, #204027)
 - handle PLT symbols in dladdr properly (BZ#2683)



From fedora-cvs-commits at redhat.com  Fri Aug 25 09:39:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 05:39:17 -0400
Subject: rpms/frysk/devel frysk.spec,1.88,1.89
Message-ID: <200608250939.k7P9dHSm031481@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31460

Modified Files:
	frysk.spec 
Log Message:
- Patch1 for bug #203902.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- frysk.spec	24 Aug 2006 22:26:33 -0000	1.88
+++ frysk.spec	25 Aug 2006 09:39:15 -0000	1.89
@@ -10,6 +10,9 @@
 # Disable the test which fails when building on older kernel.
 Patch:		frysk-xfail-2130.patch
 
+# Fix for #203902:
+Patch1:		frysk-ghosts.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:   	libglade-java >= 2.12.5
@@ -53,6 +56,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch
+%patch1
 
 %build 
 
@@ -115,6 +119,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Fri Aug 25 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.24.rh1-3
+- Patch1 for bug #203902.
+
 * Fri Aug 25 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.24.rh1-2
 - Comment out the %%check section temporarily.
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 09:39:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 05:39:48 -0400
Subject: rpms/frysk/devel frysk.spec,1.89,1.90
Message-ID: <200608250939.k7P9dmVO031605@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31584

Modified Files:
	frysk.spec 
Log Message:
inc release


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- frysk.spec	25 Aug 2006 09:39:15 -0000	1.89
+++ frysk.spec	25 Aug 2006 09:39:46 -0000	1.90
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.08.24.rh1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk



From fedora-cvs-commits at redhat.com  Fri Aug 25 09:42:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 05:42:53 -0400
Subject: rpms/frysk/devel frysk-ghosts.patch,NONE,1.1
Message-ID: <200608250942.k7P9gr5t032280@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32253

Added Files:
	frysk-ghosts.patch 
Log Message:
- Patch1 for bug #203902.

frysk-ghosts.patch:
 TestLib.cxx |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE frysk-ghosts.patch ---
Index: frysk-sys/frysk/sys/cni/TestLib.cxx
===================================================================
RCS file: /cvs/frysk/frysk-sys/frysk/sys/cni/TestLib.cxx,v
retrieving revision 1.3
diff -u -r1.3 TestLib.cxx
--- frysk-sys/frysk/sys/cni/TestLib.cxx	24 Aug 2006 02:29:30 -0000	1.3
+++ frysk-sys/frysk/sys/cni/TestLib.cxx	25 Aug 2006 09:35:26 -0000
@@ -64,7 +64,7 @@
     exit(1);
   } else if (pid == 0) { /* Child */
     sleep(5);
-    printf("DETACHED PROCESS: EXITING\n");
+    exit(0); //printf("DETACHED PROCESS: EXITING\n");
   }
   return pid; 
 }



From fedora-cvs-commits at redhat.com  Fri Aug 25 09:55:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 05:55:05 -0400
Subject: rpms/openoffice.org/devel sources,1.193,1.194
Message-ID: <200608250955.k7P9t5tU019347@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19316

Modified Files:
	sources 
Log Message:
m2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- sources	17 Aug 2006 15:41:48 -0000	1.193
+++ sources	25 Aug 2006 09:55:02 -0000	1.194
@@ -10,6 +10,6 @@
 2618cff7bfdf0a9ca30233e349df73c6  openoffice.org-myspell-contrib.tar.gz
 156fca901e2850226f16dd5034b6c941  openoffice.org-simple-crash_report.sh
 0ee333127e54353d49bf30aa112faee4  openoffice.org.langpack.template.tar.gz
-7a78b4b7151f8f71fe336245b19e68fa  OOD680_m1.tar.bz2
 cba51824724ada973394d8feecdd0213  pa-IN-179.sdf
 26c72b57608d21c7cccf941f1df2aea9  redhat-templates.tar.gz
+9c2105f0cf1b1dc82900bf15d9364fdb  OOD680_m2.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 25 09:56:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 05:56:20 -0400
Subject: rpms/glibc/devel glibc-fedora.patch,1.175,1.176
Message-ID: <200608250956.k7P9uKjT019856@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19819

Modified Files:
	glibc-fedora.patch 
Log Message:
2.4.90-25

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libc/locale/programs/ld-ctype.c                             |    2 
 libc/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c       |    3 
 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/malloc.c                                             |    5 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 60 files changed, 1400 insertions(+), 635 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- glibc-fedora.patch	25 Aug 2006 09:12:06 -0000	1.175
+++ glibc-fedora.patch	25 Aug 2006 09:56:17 -0000	1.176
@@ -3396,3 +3396,17 @@
  
    /* Remember the repertoire we use.  */
    if (!ignore_content)
+--- libc/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c.jj	2006-08-25 11:01:24.000000000 +0200
++++ libc/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c	2006-08-25 11:53:28.000000000 +0200
+@@ -58,9 +58,10 @@ __libc_pthread_init (ptr, reclaim, funct
+ #endif
+ }
+ 
+-
++#ifdef SHARED
+ libc_freeres_fn (freeres_libptread)
+ {
+   if (__libc_pthread_functions.ptr_freeres != NULL)
+     __libc_pthread_functions.ptr_freeres ();
+ }
++#endif



From fedora-cvs-commits at redhat.com  Fri Aug 25 09:56:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 05:56:50 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.860,1.861
Message-ID: <200608250956.k7P9uoK9020094@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20038

Modified Files:
	openoffice.org.spec 
Log Message:
m2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.860
retrieving revision 1.861
diff -u -r1.860 -r1.861
--- openoffice.org.spec	25 Aug 2006 07:46:43 -0000	1.860
+++ openoffice.org.spec	25 Aug 2006 09:56:48 -0000	1.861
@@ -1,6 +1,6 @@
 %define oootag OOD680
-%define ooomilestone 1
-%define rh_rpm_release 3
+%define ooomilestone 2
+%define rh_rpm_release 1
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2510,7 +2510,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Thu Aug 24 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.3
+* Fri Aug 25 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-2.1
 - fix openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 - fix openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
 - fix openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:02:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:02:38 -0400
Subject: rpms/kdebase/devel kdebase-3.5.4-antialias.patch, NONE,
	1.1 kdebase.spec, 1.215, 1.216
Message-ID: <200608251002.k7PA2cTh021781@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21542

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-antialias.patch 
Log Message:
fix #203279, antialiasing issue


kdebase-3.5.4-antialias.patch:
 krdb.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.4-antialias.patch ---
--- kdebase-3.5.4/kcontrol/krdb/krdb.cpp.orig	2006-08-25 10:23:05.000000000 +0200
+++ kdebase-3.5.4/kcontrol/krdb/krdb.cpp	2006-08-25 10:23:29.000000000 +0200
@@ -515,7 +515,7 @@
             subPixel(kglobals.readEntry("XftSubPixel"));
 
     contents += "Xft.antialias: ";
-    if(kglobals.readBoolEntry("XftAntialias", false))
+    if(kglobals.readBoolEntry("XftAntialias", true))
       contents += "1";
     else
       contents += "0";


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- kdebase.spec	22 Aug 2006 17:11:46 -0000	1.215
+++ kdebase.spec	25 Aug 2006 10:02:35 -0000	1.216
@@ -53,6 +53,7 @@
 Patch20: kdebase-3.5.3-keyinit.patch
 Patch21: kdebase-3.5.3-khelpcenter-sort.patch
 Patch22: kdebase-3.5.4-htdig.patch
+Patch23: kdebase-3.5.4-antialias.patch
 
 # upstream patches
 Patch100: kdebase-3.5.4-halbackend-dbus.patch
@@ -164,6 +165,7 @@
 %patch20 -p1 -b .keyinit
 %patch21 -p1 -b .khelpcenter-sort
 %patch22 -p1 -b .htdig
+%patch23 -p1 -b .antialias
 
 # upstream patches
 %patch100 -p0 -b .halbackend-dbus
@@ -539,8 +541,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
-* Tue Aug 22 2006 Than Ngo <than at redhat.com> 6:3.5.4-5
+* Fri Aug 25 2006 Than Ngo <than at redhat.com> 6:3.5.4-5
 - add Requires: eject 
+- fix #203279, antialiasing issue
 
 * Mon Aug 21 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
 - fix #203221, konsole does not display bold characters



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:23:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:23:39 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.3-dbus.patch, NONE,
	1.1 kdebase-3.5.4-antialias.patch, NONE,
	1.1 kdebase-3.5.4-htdig.patch, NONE, 1.1 kdebase.spec, 1.182,
	1.183 kdebase-3.5.2-dbus.patch, 1.3,
	NONE kdebase-3.5.3-kfind-largefile.patch, 1.1,
	NONE kdebase-3.5.3-kicker-panel.patch, 1.1,
	NONE kdebase-3.5.3-kscreensaver.patch, 1.1,
	NONE kdebase-3.5.3-kxkb-kcmlayout.patch, 1.1,
	NONE kdebase-3.5.3.diff, 1.1, NONE post-3.5.0-kdebase-kdm.diff,
	1.1, NONE
Message-ID: <200608251023.k7PANdEw017596@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17582

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-dbus.patch kdebase-3.5.4-antialias.patch 
	kdebase-3.5.4-htdig.patch 
Removed Files:
	kdebase-3.5.2-dbus.patch kdebase-3.5.3-kfind-largefile.patch 
	kdebase-3.5.3-kicker-panel.patch 
	kdebase-3.5.3-kscreensaver.patch 
	kdebase-3.5.3-kxkb-kcmlayout.patch kdebase-3.5.3.diff 
	post-3.5.0-kdebase-kdm.diff 
Log Message:
- fix #203221, konsole does not display bold characters
- fix #203083, correct htdig settings
- apply upstream patch to fix argument quoting
- add requires: eject
- fix Antialias issue



kdebase-3.5.3-dbus.patch:
 kdebase-3.5.1/kioslave/media/configure.in.in             |   66 -
 kdebase-3.5.1/kioslave/media/mediamanager/connection.cpp |  168 ++++
 kdebase-3.5.1/kioslave/media/mediamanager/connection.h   |   86 ++
 kdebase-3.5.1/kioslave/media/mediamanager/integrator.cpp |  244 ++++++
 kdebase-3.5.1/kioslave/media/mediamanager/integrator.h   |   95 ++
 kdebase-3.5.1/kioslave/media/mediamanager/message.cpp    |  551 +++++++++++++++
 kdebase-3.5.1/kioslave/media/mediamanager/message.h      |  132 +++
 kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am    |   11 
 kdebase-3.5.3/kioslave/media/mediamanager/halbackend.h   |    2 
 9 files changed, 1286 insertions(+), 69 deletions(-)

--- NEW FILE kdebase-3.5.3-dbus.patch ---
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.cpp kdebase-3.5.1/kioslave/media/mediamanager/connection.cpp
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.cpp	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/connection.cpp	2006-01-26 14:54:40.000000000 +0100
@@ -0,0 +1,168 @@
+// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* connection.cpp: Qt wrapper for DBusConnection
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.0
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include "connection.h"
+
+using namespace DBusQt;
+
+#include "integrator.h"
+using Internal::Integrator;
+
+struct Connection::Private
+{
+  Private( Connection *qq );
+  void setConnection( DBusConnection *c );
+  DBusConnection *connection;
+  int connectionSlot;
+  DBusError error;
+  Integrator *integrator;
+  int timeout;
+  Connection *q;
+};
+
+Connection::Private::Private( Connection *qq )
+  : connection( 0 ), connectionSlot( 0 ), integrator( 0 ),
+    timeout( -1 ), q( qq )
+{
+  dbus_error_init( &error );
+}
+
+void Connection::Private::setConnection( DBusConnection *c )
+{
+  if (!c) {
+    qDebug( "error: %s, %s", error.name, error.message );
+    dbus_error_free( &error );
+    return;
+  }
+  connection = c;
+  integrator = new Integrator( c, q );
+  connect( integrator, SIGNAL(readReady()), q, SLOT(dispatchRead()) );
+}
+
+Connection::Connection( QObject *parent )
+  : QObject( parent )
+{
+  d = new Private( this );
+}
+
+Connection::Connection( const QString& host, QObject *parent )
+  : QObject( parent )
+{
+  d = new Private( this );
+
+  if ( !host.isEmpty() )
+    init( host );
+}
+
+Connection::Connection( DBusBusType type, QObject* parent )
+  : QObject( parent )
+{
+  d = new Private( this );
+  d->setConnection( dbus_bus_get(type, &d->error) );
+}
+
+void Connection::init( const QString& host )
+{
+  d->setConnection( dbus_connection_open( host.ascii(), &d->error) );
+  //dbus_connection_allocate_data_slot( &d->connectionSlot );
+  //dbus_connection_set_data( d->connection, d->connectionSlot, 0, 0 );
+}
+
+bool Connection::isConnected() const
+{
+  return dbus_connection_get_is_connected( d->connection );
+}
+
+bool Connection::isAuthenticated() const
+{
+  return dbus_connection_get_is_authenticated( d->connection );
+}
+
+void Connection::open( const QString& host )
+{
+  if ( host.isEmpty() ) return;
+
+  init( host );
+}
+
+void Connection::close()
+{
+  dbus_connection_close( d->connection );
+}
+
+void Connection::flush()
+{
+  dbus_connection_flush( d->connection );
+}
+
+void Connection::dispatchRead()
+{
+  while ( dbus_connection_dispatch( d->connection ) == DBUS_DISPATCH_DATA_REMAINS )
+    ;
+}
+
+DBusConnection* Connection::connection() const
+{
+  return d->connection;
+}
+
+Connection::Connection( DBusConnection *connection, QObject *parent  )
+  : QObject( parent )
+{
+  d = new Private(this);
+  d->setConnection(connection);
+}
+
+void Connection::send( const Message &m )
+{
+    dbus_connection_send(d->connection, m.message(), 0);
+}
+
+void Connection::sendWithReply( const Message& )
+{
+}
+
+Message Connection::sendWithReplyAndBlock( const Message &m )
+{
+  DBusMessage *reply;
+  reply = dbus_connection_send_with_reply_and_block( d->connection, m.message(), d->timeout, &d->error );
+  if (dbus_error_is_set(&d->error)) {
+      qDebug("error: %s, %s", d->error.name, d->error.message);
+      dbus_error_free(&d->error);
+  }
+  return Message( reply );
+}
+
+void* Connection::virtual_hook( int, void*  )
+{
+}
+
+void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection)
+{
+  d->setConnection( connection );
+}
+
+
+
+/////////////////////////////////////////////////////////
+
+#include "connection.moc"
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.h kdebase-3.5.1/kioslave/media/mediamanager/connection.h
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.h	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/connection.h	2006-01-26 14:54:44.000000000 +0100
@@ -0,0 +1,86 @@
+// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* connection.h: Qt wrapper for DBusConnection
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#ifndef DBUS_QT_CONNECTION_H
+#define DBUS_QT_CONNECTION_H
+
+/* We acknowledge the the dbus API is unstable */
+#define DBUS_API_SUBJECT_TO_CHANGE
+
+#include "message.h"
+
+#include <qobject.h>
+#include <qstring.h>
+
+#include "dbus/dbus.h"
+
+namespace DBusQt {
+  namespace Internal {
+    class Integrator;
+  }
+
+  class Connection : public QObject
+  {
+    Q_OBJECT
+  public:
+    Connection( QObject *parent =0 );
+    Connection( const QString& host,
+                QObject *parent = 0 );
+    Connection( DBusBusType type, QObject* parent = 0 );
+
+    bool isConnected() const;
+    bool isAuthenticated() const;
+
+    Message borrowMessage();
+    Message popMessage();
+    void stealBorrowMessage( const Message& );
+    void dbus_connection_setup_with_qt_main (DBusConnection *connection);
+
+  public slots:
+    void open( const QString& );
+    void close();
+    void flush();
+    void send( const Message& );
+    void sendWithReply( const Message& );
+    Message sendWithReplyAndBlock( const Message& );
+
+  protected slots:
+    void dispatchRead();
+
+  protected:
+    void init( const QString& host );
+    virtual void *virtual_hook( int id, void *data );
+
+  private:
+    friend class Internal::Integrator;
+    DBusConnection *connection() const;
+    Connection( DBusConnection *connection, QObject *parent );
+
+  private:
+    struct Private;
+    Private *d;
+  };
+
+}
+
+
+#endif
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.cpp kdebase-3.5.1/kioslave/media/mediamanager/integrator.cpp
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.cpp	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/integrator.cpp	2006-01-26 14:54:52.000000000 +0100
@@ -0,0 +1,244 @@
+// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* integrator.h: integrates D-BUS into Qt event loop
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.0
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include "integrator.h"
+#include "connection.h"
+
+#include <qtimer.h>
+#include <qsocketnotifier.h>
+#include <qintdict.h>
+#include <qptrlist.h>
+
+namespace DBusQt
+{
+namespace Internal {
+
+struct Watch {
+  Watch(): readSocket( 0 ), writeSocket( 0 ) { }
+
+  DBusWatch *watch;
+  QSocketNotifier *readSocket;
+  QSocketNotifier *writeSocket;
+};
+
+//////////////////////////////////////////////////////////////
+dbus_bool_t dbusAddWatch( DBusWatch *watch, void *data )
+{
+  Integrator *con = static_cast<Integrator*>( data );
+  con->addWatch( watch );
+  return true;
+}
+void dbusRemoveWatch( DBusWatch *watch, void *data )
+{
+  Integrator *con = static_cast<Integrator*>( data );
+  con->removeWatch( watch );
+}
+
+void dbusToggleWatch( DBusWatch *watch, void *data )
+{
+  Integrator *itg = static_cast<Integrator*>( data );
+  if ( dbus_watch_get_enabled( watch ) )
+    itg->addWatch( watch );
+  else
+    itg->removeWatch( watch );
+}
+
+dbus_bool_t dbusAddTimeout( DBusTimeout *timeout, void *data )
+{
+  if ( !dbus_timeout_get_enabled(timeout) )
+    return true;
+
+  Integrator *itg = static_cast<Integrator*>( data );
+  itg->addTimeout( timeout );
+  return true;
+}
+
+void dbusRemoveTimeout( DBusTimeout *timeout, void *data )
+{
+  Integrator *itg = static_cast<Integrator*>( data );
+  itg->removeTimeout( timeout );
+}
+
+void dbusToggleTimeout( DBusTimeout *timeout, void *data )
+{
+  Integrator *itg = static_cast<Integrator*>( data );
+
+  if ( dbus_timeout_get_enabled( timeout ) )
+    itg->addTimeout( timeout );
+  else
+    itg->removeTimeout( timeout );
+}
+
+void dbusWakeupMain( void* )
+{
+}
+
+void dbusNewConnection( DBusServer     *server,
+                        DBusConnection *new_connection,
+                        void           *data )
+{
+  Integrator *itg = static_cast<Integrator*>( data );
+  itg->handleConnection( new_connection );
+}
+/////////////////////////////////////////////////////////////
+
+Timeout::Timeout( QObject *parent, DBusTimeout *t )
+  : QObject( parent ),  m_timeout( t )
+{
+  m_timer = new QTimer( this );
+  connect( m_timer,  SIGNAL(timeout()),
+           SLOT(slotTimeout()) );
+}
+
+void Timeout::slotTimeout()
+{
+  emit timeout( m_timeout );
+}
+
+void Timeout::start()
+{
+  m_timer->start( dbus_timeout_get_interval( m_timeout ) );
+}
+
+Integrator::Integrator( DBusConnection *conn, QObject *parent )
+  : QObject( parent ), m_connection( conn )
+{
+  m_timeouts.setAutoDelete( true );
+
+  dbus_connection_set_watch_functions( m_connection,
+                                       dbusAddWatch,
+                                       dbusRemoveWatch,
+                                       dbusToggleWatch,
+                                       this, 0 );
+  dbus_connection_set_timeout_functions( m_connection,
+                                         dbusAddTimeout,
+                                         dbusRemoveTimeout,
+                                         dbusToggleTimeout,
+                                         this, 0 );
+  dbus_connection_set_wakeup_main_function( m_connection,
+					    dbusWakeupMain,
+					    this, 0 );
+}
+
+Integrator::Integrator( DBusServer *server, QObject *parent )
+  : QObject( parent ), m_server( server )
+{
+  m_connection = reinterpret_cast<DBusConnection*>( m_server );
+  m_timeouts.setAutoDelete( true );
+
+  dbus_server_set_watch_functions( m_server,
+                                   dbusAddWatch,
+                                   dbusRemoveWatch,
+                                   dbusToggleWatch,
+                                   this, 0 );
+  dbus_server_set_timeout_functions( m_server,
+                                     dbusAddTimeout,
+                                     dbusRemoveTimeout,
+                                     dbusToggleTimeout,
+                                     this, 0 );
+  dbus_server_set_new_connection_function( m_server,
+                                           dbusNewConnection,
+                                           this,  0 );
+}
+
+void Integrator::slotRead( int fd )
+{
+  QIntDictIterator<Watch>	it( m_watches );
+  for ( ; it.current(); ++it )
+    dbus_watch_handle ( it.current()->watch, DBUS_WATCH_READABLE );
+
+  emit readReady();
+}
+
+void Integrator::slotWrite( int fd )
+{
+  QIntDictIterator<Watch>       it( m_watches );
+  for ( ; it.current(); ++it )
+    dbus_watch_handle ( it.current()->watch, DBUS_WATCH_WRITABLE );
+}
+
+void Integrator::slotTimeout( DBusTimeout *timeout )
+{
+  dbus_timeout_handle( timeout );
+}
+
+void Integrator::addWatch( DBusWatch *watch )
+{
+  if ( !dbus_watch_get_enabled( watch ) )
+    return;
+
+  Watch *qtwatch = new Watch;
+  qtwatch->watch = watch;
+
+  int flags = dbus_watch_get_flags( watch );
+  int fd = dbus_watch_get_fd( watch );
+
+  if ( flags & DBUS_WATCH_READABLE ) {
+    qtwatch->readSocket = new QSocketNotifier( fd, QSocketNotifier::Read, this );
+    QObject::connect( qtwatch->readSocket, SIGNAL(activated(int)), SLOT(slotRead(int)) );
+  }
+
+  if (flags & DBUS_WATCH_WRITABLE) {
+    qtwatch->writeSocket = new QSocketNotifier( fd, QSocketNotifier::Write, this );
+    QObject::connect( qtwatch->writeSocket, SIGNAL(activated(int)), SLOT(slotWrite(int)) );
+  }
+
+  m_watches.insert( fd, qtwatch );
+}
+
+void Integrator::removeWatch( DBusWatch *watch )
+{
+  int key = dbus_watch_get_fd( watch );
+
+  Watch *qtwatch = m_watches.take( key );
+
+  if ( qtwatch ) {
+    delete qtwatch->readSocket;  qtwatch->readSocket = 0;
+    delete qtwatch->writeSocket; qtwatch->writeSocket = 0;
+    delete qtwatch;
+  }
+}
+
+void Integrator::addTimeout( DBusTimeout *timeout )
+{
+  Timeout *mt = new Timeout( this, timeout );
+  m_timeouts.insert( timeout, mt );
+  connect( mt, SIGNAL(timeout(DBusTimeout*)),
+           SLOT(slotTimeout(DBusTimeout*)) );
+  mt->start();
+}
+
+void Integrator::removeTimeout( DBusTimeout *timeout )
+{
+  m_timeouts.remove( timeout );
+}
+
+void Integrator::handleConnection( DBusConnection *c )
+{
+  Connection *con = new Connection( c, this );
+  emit newConnection( con );
+}
+
+}//end namespace Internal
+}//end namespace DBusQt
+
+#include "integrator.moc"
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.h kdebase-3.5.1/kioslave/media/mediamanager/integrator.h
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.h	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/integrator.h	2006-01-26 14:54:50.000000000 +0100
@@ -0,0 +1,95 @@
+// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* integrator.h: integrates D-BUS into Qt event loop
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#ifndef DBUS_QT_INTEGRATOR_H
+#define DBUS_QT_INTEGRATOR_H
+
+/* We acknowledge the the dbus API is unstable */
+#define DBUS_API_SUBJECT_TO_CHANGE
+
+#include <qobject.h>
+
+#include <qintdict.h>
+#include <qptrdict.h>
+
+#include "dbus/dbus.h"
+
+class QTimer;
+
+namespace DBusQt
+{
+  class Connection;
+
+  namespace Internal
+  {
+    struct Watch;
+
+    class Timeout : public QObject
+    {
+      Q_OBJECT
+    public:
+      Timeout( QObject *parent, DBusTimeout *t );
+    public:
+      void start();
+    signals:
+      void timeout( DBusTimeout* );
+    protected slots:
+      void slotTimeout();
+    private:
+      QTimer *m_timer;
+      DBusTimeout *m_timeout;
+    };
+
+    class Integrator : public QObject
+    {
+      Q_OBJECT
+    public:
+      Integrator( DBusConnection *connection, QObject *parent );
+      Integrator( DBusServer *server, QObject *parent );
+
+    signals:
+      void readReady();
+      void newConnection( Connection* );
+
+    protected slots:
+      void slotRead( int );
+      void slotWrite( int );
+      void slotTimeout( DBusTimeout *timeout );
+
+    public:
+      void addWatch( DBusWatch* );
+      void removeWatch( DBusWatch* );
+
+      void addTimeout( DBusTimeout* );
+      void removeTimeout( DBusTimeout* );
+
+      void handleConnection( DBusConnection* );
+    private:
+      QIntDict<Watch> m_watches;
+      QPtrDict<Timeout> m_timeouts;
+      DBusConnection *m_connection;
+      DBusServer *m_server;
+    };
+  }
+}
+
+#endif
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/message.cpp kdebase-3.5.1/kioslave/media/mediamanager/message.cpp
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/message.cpp	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/message.cpp	2006-01-26 14:54:57.000000000 +0100
@@ -0,0 +1,551 @@
+/* -*- mode: C++; c-file-style: "gnu" -*- */
+/* message.cpp: Qt wrapper for DBusMessage
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.0
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include "message.h"
+
+#include <qmap.h>
+
+#include <cstdlib>
+
+namespace DBusQt {
+
+struct Message::iterator::IteratorData {
+  DBusMessageIter *iter;
+  QVariant         var;
+  bool             end;
+  DBusMessage	  *mesg;
+};
+
+/**
+ * Iterator.
+ */
+Message::iterator::iterator()
+{
+  d = new IteratorData;
+  d->iter = 0; d->end = true;
+}
+
+/**
+ * Constructs iterator for the message.
+ * @param msg message whose fields we want to iterate
+ */
+Message::iterator::iterator( DBusMessage* msg )
+{
+  d = new IteratorData;
+  d->mesg = msg;
+  d->iter = static_cast<DBusMessageIter *>( malloc( sizeof(DBusMessageIter) ) );
+  dbus_message_iter_init( d->mesg, d->iter );
+  if ( !d->iter ) {
+    qDebug("No iterator??");
+  }
+  fillVar();
+  d->end = false;
+}
+
+/**
+ * Copy constructor for the iterator.
+ * @param itr iterator
+ */
+Message::iterator::iterator( const iterator& itr )
+{
+  d = new IteratorData;
+  d->iter = itr.d->iter;
+  d->var  = itr.d->var;
+  d->end  = itr.d->end;
+}
+
+/**
+ * Destructor.
+ */
+Message::iterator::~iterator()
+{
+  free( d->iter );
+  delete d; d=0;
+}
+
+/**
+ * Creates an iterator equal to the @p itr iterator
+ * @param itr other iterator
+ * @return
+ */
+Message::iterator&
+Message::iterator::operator=( const iterator& itr )
+{
+  IteratorData *tmp = new IteratorData;
+  tmp->iter = itr.d->iter;
+  tmp->var  = itr.d->var;
+  tmp->end  = itr.d->end;
+  delete d; d=tmp;
+  return *this;
+}
+
+/**
+ * Returns the constant QVariant held by the iterator.
+ * @return the constant reference to QVariant held by this iterator
+ */
+const QVariant&
+Message::iterator::operator*() const
+{
+  return d->var;
+}
+
+/**
+ * Returns the QVariant held by the iterator.
+ * @return reference to QVariant held by this iterator
+ */
+QVariant&
+Message::iterator::operator*()
+{
+  return d->var;
+}
+
+/**
+ * Moves to the next field and return a reference to itself after
+ * incrementing.
+ * @return reference to self after incrementing
+ */
+Message::iterator&
+Message::iterator::operator++()
+{
+  if ( d->end )
+    return *this;
+
+  if (  dbus_message_iter_next( d->iter ) ) {
+    fillVar();
+  } else {
+    d->end = true;
+    d->var = QVariant();
+  }
+  return *this;
+}
+
+/**
+ * Moves to the next field and returns self before incrementing.
+ * @return self before incrementing
+ */
+Message::iterator
+Message::iterator::operator++(int)
+{
+  iterator itr( *this );
+  operator++();
+  return itr;
+}
+
+/**
+ * Compares this iterator to @p it iterator.
+ * @param it the iterator to which we're comparing this one to
+ * @return true if they're equal, false otherwise
+ */
+bool
+Message::iterator::operator==( const iterator& it )
+{
+  if ( d->end == it.d->end ) {
+    if ( d->end == true ) {
+      return true;
+    } else {
+      return d->var == it.d->var;
+    }
+  } else
+    return false;
+}
+
+/**
+ * Compares two iterators.
+ * @param it The other iterator.
+ * @return true if two iterators are not equal, false
+ *         otherwise
+ */
+bool
+Message::iterator::operator!=( const iterator& it )
+{
+  return !operator==( it );
+}
+
+QVariant Message::iterator::marshallBaseType( DBusMessageIter* i )
+{
+  QVariant ret;
+  switch (dbus_message_iter_get_arg_type(i)) {
+  case DBUS_TYPE_INT32:
+    {
+      dbus_int32_t v;
+      dbus_message_iter_get_basic (i, &v);
+      ret = QVariant( v );
+    }
+    break;
+  case DBUS_TYPE_UINT32:
+    {
+      dbus_uint32_t v;
+      dbus_message_iter_get_basic (i, &v);
+      ret = QVariant( v );
+    }
+    break;
+  case DBUS_TYPE_DOUBLE:
+    {
+      double v;
+      dbus_message_iter_get_basic (i, &v);
+      ret = QVariant( v );
+    }
+    break;
+  case DBUS_TYPE_STRING:
+    {
+      const char *v;
+      dbus_message_iter_get_basic (i, &v);
+      ret = QVariant( v );
+    }
+    break;
+  default:
+    ret = QVariant();
+    break;
+  }
+  return ret;
+}
+
+/**
+ * Fills QVariant based on what current DBusMessageIter helds.
+ */
+void
+Message::iterator::fillVar()
+{
+  switch ( dbus_message_iter_get_arg_type( d->iter ) ) {
+  case DBUS_TYPE_INT32:
+  case DBUS_TYPE_UINT32:
+  case DBUS_TYPE_DOUBLE:
+  case DBUS_TYPE_STRING:
+    d->var = marshallBaseType( d->iter );
+    break;
+  case DBUS_TYPE_ARRAY: {
+    switch ( dbus_message_iter_get_element_type( d->iter ) ) {
+    case DBUS_TYPE_STRING: {
+      QStringList tempList;
+      DBusMessageIter sub;
+      dbus_message_iter_recurse (d->iter, &sub);
+      while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID)
+        {
+          const char *v;
+          dbus_message_iter_get_basic (&sub, &v);
+          tempList.append( QString( v ) );
+          dbus_message_iter_next (&sub);
+        }
+      d->var = QVariant( tempList );
+      break;
+    }
+    default:
+      qDebug( "Array of type not implemented" );
+      d->var = QVariant();
+      break;
+    }
+    break;
+  }
+#if 0
+  /* DICT is gone for now, but expected to be reintroduced, or else
+   * reintroduced as a flag on the introspection data that can
+   * apply to array of struct of two fields
+   */
+  case DBUS_TYPE_DICT: {
+    qDebug( "Got a hash!" );
+    QMap<QString, QVariant> tempMap;
+    DBusMessageIter dictIter;
+    dbus_message_iter_init_dict_iterator( d->iter, &dictIter );
+    do {
+      char *key = dbus_message_iter_get_dict_key( &dictIter );
+      tempMap[key] = marshallBaseType( &dictIter );
+      dbus_free( key );
+      dbus_message_iter_next( &dictIter );
+    } while( dbus_message_iter_has_next( &dictIter ) );
+    d->var = QVariant( tempMap );
+    break;
+    qDebug( "Hash/Dict type not implemented" );
+    d->var = QVariant();
+    break;
+  }
+#endif
+  default:
+    qDebug( "not implemented" );
+    d->var = QVariant();
+    break;
+  }
+}
+
+/**
+ * Returns a QVariant help by this iterator.
+ * @return QVariant held by this iterator
+ */
+QVariant
+Message::iterator::var() const
+{
+  return d->var;
+}
+
+struct Message::Private {
+  DBusMessage *msg;
+};
+
+Message::Message( DBusMessage *m )
+{
+  d = new Private;
+  d->msg = m;
+}
+
+/**
+ *
+ */
+Message::Message( int messageType )
+{
+  d = new Private;
+  d->msg = dbus_message_new( messageType );
+}
+
+/**
+ * Constructs a new Message with the given service and name.
+ * @param service service service that the message should be sent to
+ * @param name name of the message
+ */
+Message::Message( const QString& service, const QString& path,
+                  const QString& interface, const QString& method )
+{
+  d = new Private;
+  d->msg = dbus_message_new_method_call( service.latin1(), path.latin1(),
+                                         interface.latin1(), method.latin1() );
+}
+
+/**
+ * Constructs a message that is a reply to some other
+ * message.
+ * @param name the name of the message
+ * @param replayingTo original_message the message which the created
+ * message is a reply to.
+ */
+Message::Message( const Message& replayingTo )
+{
+  d = new Private;
+  d->msg = dbus_message_new_method_return( replayingTo.d->msg );
+}
+
+Message:: Message( const QString& path, const QString& interface,
+                   const QString& name )
+{
+  d = new Private;
+  d->msg = dbus_message_new_signal( path.ascii(), interface.ascii(),
+                                    name.ascii() );
+}
+
+Message::Message( const Message& replayingTo, const QString& errorName,
+                  const QString& errorMessage )
+{
+  d = new Private;
+  d->msg = dbus_message_new_error( replayingTo.d->msg, errorName.utf8(),
+                                   errorMessage.utf8() );
+}
+
+Message Message::operator=( const Message& other )
+{
+  //FIXME: ref the other.d->msg instead of copying it?
+}
+/**
+ * Destructs message.
+ */
+Message::~Message()
+{
+  if ( d->msg ) {
+    dbus_message_unref( d->msg );
+  }
+  delete d; d=0;
+}
+
+int Message::type() const
+{
+  return dbus_message_get_type( d->msg );
+}
+
+void Message::setPath( const QString& path )
+{
+  dbus_message_set_path( d->msg, path.ascii() );
+}
+
+QString Message::path() const
+{
+  return dbus_message_get_path( d->msg );
+}
+
+void Message::setInterface( const QString& iface )
+{
+  dbus_message_set_interface( d->msg, iface.ascii() );
+}
+
+QString Message::interface() const
+{
+  return dbus_message_get_interface( d->msg );
+}
+
+void Message::setMember( const QString& member )
+{
+  dbus_message_set_member( d->msg, member.ascii() );
+}
+
+QString Message::member() const
+{
+  return dbus_message_get_member( d->msg );
+}
+
+QString Message::errorName() const
+{
+  return dbus_message_get_error_name( d->msg );
+}
+
+QString Message::destination() const
+{
+  return dbus_message_get_destination( d->msg );
+}
+
+/**
+ * Sets the message sender.
+ * @param sender the sender
+ * @return false if unsuccessful
+ */
+bool
+Message::setSender( const QString& sender )
+{
+  return dbus_message_set_sender( d->msg, sender.latin1() );
+}
+
+/**
+ * Returns sender of this message.
+ * @return sender
+ */
+QString
+Message::sender() const
+{
+  return dbus_message_get_sender( d->msg );
+}
+
+QString Message::signature() const
+{
+  return dbus_message_get_signature( d->msg );
+}
+
+
+/**
+ * Returns the starting iterator for the fields of this
+ * message.
+ * @return starting iterator
+ */
+Message::iterator
+Message::begin() const
+{
+  return iterator( d->msg );
+}
+
+/**
+ * Returns the ending iterator for the fields of this
+ * message.
+ * @return ending iterator
+ */
+Message::iterator
+Message::end() const
+{
+  return iterator();
+}
+
+/**
+ * Returns the field at position @p i
+ * @param i position of the wanted field
+ * @return QVariant at position @p i or an empty QVariant
+ */
+QVariant
+Message::at( int i )
+{
+  iterator itr( d->msg );
+
+  while ( i-- ) {
+    if ( itr == end() )
+      return QVariant();//nothing there
+    ++itr;
+  }
+  return *itr;
+}
+
+/**
+ * The underlying DBusMessage of this class.
+ * @return DBusMessage pointer.
+ */
+DBusMessage*
+Message::message() const
+{
+  return d->msg;
+}
+
+Message& Message::operator<<( bool b )
+{
+  const dbus_bool_t right_size_bool = b;
+  dbus_message_append_args( d->msg, DBUS_TYPE_BOOLEAN, &right_size_bool,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( Q_INT8 byte )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_BYTE, &byte,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( Q_INT32 num )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_INT32, &num,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( Q_UINT32 num )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_UINT32, &num,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( Q_INT64 num )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_INT64, &num,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( Q_UINT64 num )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_UINT64, &num,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( double num )
+{
+  dbus_message_append_args( d->msg, DBUS_TYPE_DOUBLE, &num,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( const QString& str )
+{
+  const char *u = str.utf8();
+  dbus_message_append_args( d->msg, DBUS_TYPE_STRING, &u,
+                            DBUS_TYPE_INVALID );
+}
+
+Message& Message::operator<<( const QVariant& custom )
+{
+  //FIXME: imeplement
+}
+
+}
diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/message.h kdebase-3.5.1/kioslave/media/mediamanager/message.h
--- kdebase-3.5.1/kioslave/media.orig/mediamanager/message.h	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/mediamanager/message.h	2006-01-26 14:55:00.000000000 +0100
@@ -0,0 +1,132 @@
+/* -*- mode: C++; c-file-style: "gnu" -*- */
+/* message.h: Qt wrapper for DBusMessage
+ *
+ * Copyright (C) 2003  Zack Rusin <zack at kde.org>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#ifndef DBUS_QT_MESSAGE_H
+#define DBUS_QT_MESSAGE_H
+
+/* We acknowledge the the dbus API is unstable */
+#define DBUS_API_SUBJECT_TO_CHANGE
+
+#include <qvariant.h>
+#include <qstring.h>
+#include <qstringlist.h>
+
+#include "dbus/dbus.h"
+
+namespace DBusQt {
+
+  class Message
+  {
+  public:
+    class iterator {
+    public:
+      iterator();
+      iterator( const iterator& );
+      iterator( DBusMessage* msg );
+      ~iterator();
+
+      iterator& operator=( const iterator& );
+      const QVariant& operator*() const;
+      QVariant& operator*();
+      iterator& operator++();
+      iterator operator++(int);
+      bool operator==( const iterator& it );
+      bool operator!=( const iterator& it );
+
+      QVariant var() const;
+    protected:
+      QVariant marshallBaseType( DBusMessageIter* i );
+      void fillVar();
+      struct IteratorData;
+      IteratorData *d;
+    };
+
+    Message( int messageType );
+    Message( DBusMessage * );//hide this one from the public implementation
+    Message( const QString& service, const QString& path,
+             const QString& interface, const QString& method );
+    Message( const Message& replayingTo );
+    Message( const QString& path, const QString& interface,
+             const QString& name );
+    Message( const Message& replayingTo, const QString& errorName,
+             const QString& errorMessage );
+
+    Message operator=( const Message& other );
+
+    virtual ~Message();
+
+    int type() const;
+
+    void setPath( const QString& );
+    QString path() const;
+
+    void setInterface( const QString& );
+    QString interface() const;
+
+    void setMember( const QString& );
+    QString member() const;
+
+    QString errorName() const;
+
+    QString destination() const;
+
+    bool    setSender( const QString& sender );
+    QString    sender() const;
+
+    QString signature() const;
+
+    iterator begin() const;
+    iterator end() const;
+
+    QVariant at( int i );
+
+
+  public:
+    Message& operator<<( bool );
+    Message& operator<<( Q_INT8 );
+    Message& operator<<( Q_INT32 );
+    Message& operator<<( Q_UINT32 );
+    Message& operator<<( Q_INT64 );
+    Message& operator<<( Q_UINT64 );
+    Message& operator<<( double );
+    Message& operator<<( const QString& );
+    Message& operator<<( const QVariant& );
+    //Message& operator<<();
+    //Message& operator<<();
+    //Message& operator<<();
+    //Message& operator<<();
+    //Message& operator<<();
+    //Message& operator<<();
+    //Message& operator<<();
+
+  protected:
+    friend class Connection;
+    DBusMessage* message() const;
+
+  private:
+    struct Private;
+    Private *d;
+  };
+
+}
+
+#endif
--- kdebase-3.5.1/kioslave/media/configure.in.in.dbus	2006-01-26 15:45:06.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/configure.in.in	2006-01-26 15:53:54.000000000 +0100
@@ -106,70 +106,6 @@
 
   AC_SUBST(DBUS_INCS)
   AC_SUBST(DBUS_LIBS)
-
-########### Check for DBus-Qt bindings
-
-  AC_MSG_CHECKING(for DBus-Qt bindings)
-
-  dbusqt_inc=NOTFOUND
-  dbusqt_lib=NOTFOUND
-  dbusqt=NOTFOUND
-
-  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-  AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
-
-  if test -r $dbusqt_incdir/dbus/connection.h ; then
-    have_qt_patch=0
-    grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
-    > /dev/null 2>&1 && have_qt_patch=1
-    if test $have_qt_patch = 1 ; then
-      DBUSQT_INCS="-I$dbusqt_incdir"
-      dbusqt_inc=FOUND
-    fi
-  fi
-
-  search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
-  AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir)
-
-  if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
-    DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
-    dbusqt_lib=FOUND
-  fi
-
-  if test $dbusqt_inc != FOUND  || test $dbusqt_lib != FOUND ; then 
-
-    search_incs="`pkg-config --cflags dbus-1  |sed 's/-I//g'`"
-    AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
-    if test -r $dbusqt_incdir/dbus/connection.h ; then
-      have_qt_patch=0
-      grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
-      > /dev/null 2>&1 && have_qt_patch=1
-      if test $have_qt_patch = 1 ; then
-        DBUSQT_INCS="-I$dbusqt_incdir"
-        dbusqt_inc=FOUND
-      fi
-    fi
-
-    search_libs="`pkg-config --libs dbus-1 --libs-only-L | sed 's/-L//g'`"
-    AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir)
-
-    if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
-      DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
-      dbusqt_lib=FOUND
-    fi
-
-  fi
-
-
-  if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then
-    AC_MSG_RESULT(headers $dbusqt_incdir libraries $dbusqt_libdir)
-    dbusqt=FOUND
-  else
-    AC_MSG_RESULT(searched but not found)
-  fi
-
-  AC_SUBST(DBUSQT_INCS)
-  AC_SUBST(DBUSQT_LIBS)
 fi
 
 ########### Check if media HAL backend sould be compiled
@@ -177,7 +113,7 @@
 AC_MSG_CHECKING(if the HAL backend for media:/ should be compiled)
 
 HALBACKEND=no
-if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then
+if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" ; then
   AC_DEFINE_UNQUOTED([COMPILE_HALBACKEND],1, [media HAL backend compilation])
   HALBACKEND=yes
   AC_SUBST(HALBACKEND)
--- kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am.tn	2006-04-03 23:29:27.000000000 +0200
+++ kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am	2006-04-03 23:29:31.000000000 +0200
@@ -1,17 +1,22 @@
 kde_module_LTLIBRARIES = kded_mediamanager.la
 
 if include_media_halbackend
-HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS)
+HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS)
 endif
 
 METASOURCES = AUTO
 INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(HALBACKEND_INCS) $(all_includes)
 
+DBUSQT3BINDING_LIB = libdbusqt3.la
+libdbusqt3_la_SOURCES = connection.cpp integrator.cpp message.cpp
+libdbusqt3_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
+libdbusqt3_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS)
+
 if include_media_halbackend
 HALBACKEND_LIB = libhalbackend.la
 libhalbackend_la_SOURCES = halbackend.cpp
 libhalbackend_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
-libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT_LIBS)
+libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT3BINDING_LIB)
 endif
 
 if include_media_linuxcdpolling
@@ -20,7 +25,7 @@
 liblinuxcdpolling_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
 endif
 
-noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB)
+noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB) $(DBUSQT3BINDING_LIB)
 
 kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
 kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version
--- kdebase-3.5.3/kioslave/media/mediamanager/halbackend.h.tn	2006-06-01 17:40:51.000000000 +0200
+++ kdebase-3.5.3/kioslave/media/mediamanager/halbackend.h	2006-06-01 17:36:23.000000000 +0200
@@ -40,7 +40,7 @@
 /* We acknowledge the the dbus API is unstable */
 #define DBUS_API_SUBJECT_TO_CHANGE
 /* DBus-Qt bindings */
-#include <dbus/connection.h>
+#include <connection.h>
 /* HAL libraries */
 #include <libhal.h>
 #include <libhal-storage.h>

kdebase-3.5.4-antialias.patch:
 krdb.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.4-antialias.patch ---
--- kdebase-3.5.4/kcontrol/krdb/krdb.cpp.orig	2006-08-25 10:23:05.000000000 +0200
+++ kdebase-3.5.4/kcontrol/krdb/krdb.cpp	2006-08-25 10:23:29.000000000 +0200
@@ -515,7 +515,7 @@
             subPixel(kglobals.readEntry("XftSubPixel"));
 
     contents += "Xft.antialias: ";
-    if(kglobals.readBoolEntry("XftAntialias", false))
+    if(kglobals.readBoolEntry("XftAntialias", true))
       contents += "1";
     else
       contents += "0";

kdebase-3.5.4-htdig.patch:
 khc_docbookdig.pl.in |    2 +-
 khc_htdig.pl.in      |    2 +-
 khc_htsearch.pl      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-3.5.4-htdig.patch ---
--- kdebase-3.5.4/khelpcenter/searchhandlers/khc_htsearch.pl.orig	2006-08-18 16:31:15.000000000 +0200
+++ kdebase-3.5.4/khelpcenter/searchhandlers/khc_htsearch.pl	2006-08-18 16:39:30.000000000 +0200
@@ -8,7 +8,7 @@
 use open IO => ':utf8';
 use open ':std';
 
-my $htsearchpath="/srv/www/cgi-bin/htsearch";
+my $htsearchpath="/var/www/cgi-bin/htsearch";
 
 my $config;
 my $format;
--- kdebase-3.5.4/khelpcenter/searchhandlers/khc_htdig.pl.in.orig	2006-08-18 16:30:16.000000000 +0200
+++ kdebase-3.5.4/khelpcenter/searchhandlers/khc_htdig.pl.in	2006-08-18 16:30:37.000000000 +0200
@@ -26,7 +26,7 @@
 
 use Getopt::Long;
 
-my $htdigdata = "/srv/www/htdig/common/";
+my $htdigdata = "/usr/share/htdig/";
 my $htdigbin = "/usr/bin";
 my $kdeprefix = "@prefix@";
 chomp $kdeprefix;
--- kdebase-3.5.4/khelpcenter/searchhandlers/khc_docbookdig.pl.in.orig	2006-08-18 16:28:11.000000000 +0200
+++ kdebase-3.5.4/khelpcenter/searchhandlers/khc_docbookdig.pl.in	2006-08-18 16:28:55.000000000 +0200
@@ -26,7 +26,7 @@
 
 use Getopt::Long;
 
-my $htdigdata = "/srv/www/htdig/common/";
+my $htdigdata = "/usr/share/htdig/";
 my $htdigbin = "/usr/bin";
 my $kdeprefix = "@prefix@";
 chomp $kdeprefix;


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- kdebase.spec	22 Aug 2006 17:12:52 -0000	1.182
+++ kdebase.spec	25 Aug 2006 10:23:37 -0000	1.183
@@ -27,7 +27,7 @@
 Source1: konsole.desktop
 Source2: KDE.session.gnome
 Source3: kde.desktop
-Source4: kde-redhat-config-3.5-fc5-0.2.tar.bz2
+Source4: kde-redhat-config-3.5-fc5-0.3.tar.bz2
 Source5: kde-np
 Source6: logrotate-kdm
 Source7: mailsettings.cc
@@ -43,12 +43,14 @@
 Patch8: kdebase-3.2.92-logo.patch 
 Patch10: kdebase-3.4.2-kdesktop-konsole.patch
 Patch11: kdebase-3.5.1-xdg.patch
-Patch13: kdebase-3.5.2-dbus.patch
+Patch13: kdebase-3.5.3-dbus.patch
 Patch14: kdebase-3.5.1-kdm-readme.patch
 Patch15: kdebase-3.5.1-konsole-fonts.patch
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
 Patch21: kdebase-3.5.3-khelpcenter-sort.patch
+Patch22: kdebase-3.5.4-htdig.patch
+Patch23: kdebase-3.5.4-antialias.patch
 
 # upstream patches
 Patch100: kdebase-3.5.4-halbackend-dbus.patch
@@ -159,6 +161,8 @@
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
 %patch21 -p1 -b .khelpcenter-sort
+%patch22 -p1 -b .htdig
+%patch23 -p1 -b .xft
 
 # upstream patches
 %patch100 -p0 -b .halbackend-dbus
@@ -527,11 +531,12 @@
 
 
 %changelog
-* Mon Aug 21 2006 Than Ngo <than at redhat.com> 3.5.4-0.3.fc5
+* Mon Aug 21 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.3.fc5
 - fix #203221, konsole does not display bold characters
 - fix #203083, correct htdig settings
 - apply upstream patch to fix argument quoting
 - add requires: eject
+- fix Antialias issue
 
 * Fri Aug 11 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.2.fc5
 - fix BR


--- kdebase-3.5.2-dbus.patch DELETED ---


--- kdebase-3.5.3-kfind-largefile.patch DELETED ---


--- kdebase-3.5.3-kicker-panel.patch DELETED ---


--- kdebase-3.5.3-kscreensaver.patch DELETED ---


--- kdebase-3.5.3-kxkb-kcmlayout.patch DELETED ---


--- kdebase-3.5.3.diff DELETED ---


--- post-3.5.0-kdebase-kdm.diff DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:26:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:26:17 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.861,
	1.862 openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch, 1.1, NONE
Message-ID: <200608251026.k7PAQHAG017717@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17704

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch 
Log Message:
patch got integrated


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.861
retrieving revision 1.862
diff -u -r1.861 -r1.862
--- openoffice.org.spec	25 Aug 2006 09:56:48 -0000	1.861
+++ openoffice.org.spec	25 Aug 2006 10:26:14 -0000	1.862
@@ -121,11 +121,10 @@
 Patch53: openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch
 Patch54: openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 Patch55: openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
-Patch56: openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch
-Patch57: openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
-Patch58: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch59: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
-Patch60: openoffice.org-2.0.4.ooo68919.sc.atk.patch
+Patch56: openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
+Patch57: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch58: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
+Patch59: openoffice.org-2.0.4.ooo68919.sc.atk.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -981,11 +980,10 @@
 %patch53 -p1 -b .ooo68665.x86_64gcj.jvm.patch
 %patch54 -p1 -b .ooo68369.dtrans.crash.patch
 %patch55 -p1 -b .ooo68805.sw.ww8size.patch
-%patch56 -p1 -b .ooo68822.sw.recursiveim.patch
-%patch57 -p1 -b .ooo68851.framework.disablemenuifempty.patch
-%patch58 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch59 -p1 -b .ooo54603.fontconfig.part3.patch
-%patch60 -p1 -b .ooo68919.sc.atk.patch
+%patch56 -p1 -b .ooo68851.framework.disablemenuifempty.patch
+%patch57 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch58 -p1 -b .ooo54603.fontconfig.part3.patch
+%patch59 -p1 -b .ooo68919.sc.atk.patch
 
 tar xzf %{SOURCE1}
 


--- openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:28:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:28:48 -0400
Subject: rpms/eel2/devel eel2.spec,1.56,1.57
Message-ID: <200608251028.k7PASm1R017789@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17775

Modified Files:
	eel2.spec 
Log Message:
* Fri Aug 25 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92-3
- Omit self check code in build




Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- eel2.spec	23 Aug 2006 14:51:18 -0000	1.56
+++ eel2.spec	25 Aug 2006 10:28:45 -0000	1.57
@@ -16,7 +16,7 @@
 Name:		eel2
 Summary:        Eazel Extensions Library
 Version: 	2.15.92
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -79,7 +79,7 @@
 %patch1 -p0 -b .dndcrash
 
 %build
-%configure
+CFLAGS="$RPM_OPT_FLAGS -g -DEEL_OMIT_SELF_CHECK" %configure
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
 
@@ -112,6 +112,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Fri Aug 25 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92-3
+- Omit self check code in build
+
 * Wed Aug 23 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92-2
 - fix dnd crash from firefox (#203678)
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:32:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:32:35 -0400
Subject: rpms/nautilus/devel nautilus.spec,1.118,1.119
Message-ID: <200608251032.k7PAWZL2017927@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17913

Modified Files:
	nautilus.spec 
Log Message:
* Fri Aug 25 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92.1-2
- Omit self check code in build




Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- nautilus.spec	22 Aug 2006 13:46:24 -0000	1.118
+++ nautilus.spec	25 Aug 2006 10:32:32 -0000	1.119
@@ -23,7 +23,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
 Version: 	2.15.92.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -117,7 +117,7 @@
 %build
 
 libtoolize --force --copy
-CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO_DETECT_KDE" %configure --disable-more-warnings --disable-update-mimedb %{disable_beagle}
+CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO_DETECT_KDE -DNAUTILUS_OMIT_SELF_CHECK" %configure --disable-more-warnings --disable-update-mimedb %{disable_beagle}
 
 export tagname=CC
 LANG=en_US make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
@@ -197,6 +197,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug 25 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92.1-2
+- Omit self check code in build
+
 * Tue Aug 22 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92.1-1
 - update to 2.15.92.1
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:40:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:40:36 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin-helper.patch,1.4,1.5
Message-ID: <200608251040.k7PAea5R018150@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18129

Modified Files:
	scim-pinyin-helper.patch 
Log Message:
qshen: update helper to the new version, and add online help to it


scim-pinyin-helper.patch:
 configure.ac                             |    8 
 po/POTFILES.in                           |    1 
 po/zh_CN.po                              |  187 ++
 src/Makefile.am                          |   19 
 src/scim_pinyin_helper.cpp               | 1345 +++++++++++++++
 src/scim_pinyin_helper.h                 |   54 
 src/scim_pinyin_imengine.cpp             |  317 +++
 src/scim_pinyin_imengine.cpp.2_shuangpin | 2701 +++++++++++++++++++++++++++++++
 src/scim_pinyin_imengine.h               |    9 
 src/scim_pinyin_imengine_config_keys.h   |    3 
 src/scim_pinyin_imengine_setup.cpp       |  126 -
 src/scim_pinyin_phrase.h                 |   49 
 12 files changed, 4736 insertions(+), 83 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 scim-pinyin-helper.patch
Index: scim-pinyin-helper.patch
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin-helper.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scim-pinyin-helper.patch	24 Jul 2006 08:25:26 -0000	1.4
+++ scim-pinyin-helper.patch	25 Aug 2006 10:40:16 -0000	1.5
@@ -1,11 +1,7 @@
 diff -Naur scim-pinyin-0.5.91.bak/configure.ac scim-pinyin-0.5.91/configure.ac
 --- scim-pinyin-0.5.91.bak/configure.ac	2005-08-12 08:03:38.000000000 +0800
-+++ scim-pinyin-0.5.91/configure.ac	2006-06-28 17:19:27.000000000 +0800
-@@ -46,10 +46,17 @@
- else
-   SCIM_BUILD_SETUP=0
- fi
--
++++ scim-pinyin-0.5.91/configure.ac	2006-08-25 18:04:40.000000000 +0800
+@@ -50,6 +50,14 @@
  AM_CONDITIONAL(SCIM_BUILD_SETUP, [test "$SCIM_HAS_GTKUTILS" = "yes"])
  AC_SUBST(SCIM_BUILD_SETUP)
  
@@ -22,15 +18,46 @@
  AC_HEADER_STDC
 diff -Naur scim-pinyin-0.5.91.bak/po/POTFILES.in scim-pinyin-0.5.91/po/POTFILES.in
 --- scim-pinyin-0.5.91.bak/po/POTFILES.in	2005-01-06 21:30:53.000000000 +0800
-+++ scim-pinyin-0.5.91/po/POTFILES.in	2006-06-28 17:20:16.000000000 +0800
++++ scim-pinyin-0.5.91/po/POTFILES.in	2006-08-25 18:04:40.000000000 +0800
 @@ -1,2 +1,3 @@
  src/scim_pinyin_imengine.cpp
  src/scim_pinyin_imengine_setup.cpp
 +src/scim_pinyin_helper.cpp
 diff -Naur scim-pinyin-0.5.91.bak/po/zh_CN.po scim-pinyin-0.5.91/po/zh_CN.po
 --- scim-pinyin-0.5.91.bak/po/zh_CN.po	2005-08-07 00:00:12.000000000 +0800
-+++ scim-pinyin-0.5.91/po/zh_CN.po	2006-06-28 17:20:16.000000000 +0800
-@@ -480,3 +480,138 @@
++++ scim-pinyin-0.5.91/po/zh_CN.po	2006-08-25 18:21:29.000000000 +0800
+@@ -6,7 +6,7 @@
+ msgstr ""
+ "Project-Id-Version: scim-chinese 0.2.1\n"
+ "Report-Msgid-Bugs-To: James Su <suzhe at tsinghua.org.cn>\n"
+-"POT-Creation-Date: 2005-08-07 00:00+0800\n"
++"POT-Creation-Date: 2005-08-23 09:09+0800\n"
+ "PO-Revision-Date: 2003-05-26 17:16+0800\n"
+ "Last-Translator: James Su<suzhe at tsinghua.org.cn>\n"
+ "Language-Team: James Su<suzhe at tsinghua.org.cn\n"
+@@ -35,6 +35,10 @@
+ msgid "Full/Half Punct"
+ msgstr "???/????????????"
+ 
++#: src/scim_pinyin_imengine.cpp:435 src/scim_pinyin_imengine_setup.cpp:67
++msgid "Smart Pinyin"
++msgstr "????????????"
++
+ #: src/scim_pinyin_imengine.cpp:550
+ msgid "Copyright (C) 2002, 2003 James Su <suzhe at tsinghua.org.cn>"
+ msgstr "???????????? (C) 2002, 2003 James Su <suzhe at tsinghua.org.cn>"
+@@ -140,10 +144,6 @@
+ "    ?????????????????????????????????????????????:\n"
+ "    /usr/share/scim/chinese/special_table"
+ 
+-#: src/scim_pinyin_imengine_setup.cpp:67
+-msgid "Smart Pinyin"
+-msgstr "????????????"
+-
+ #: src/scim_pinyin_imengine_setup.cpp:72
+ msgid "An IMEngine Module for Chinese which utilizes pinyin input method."
+ msgstr "??????????????????????????????????????????????????????."
+@@ -480,3 +480,180 @@
  #~ msgstr ""
  #~ "???????????????????????????????????????(locale). ???????????????????????????????????????. ?????? "
  #~ "\"default\" ???????????????????????????."
@@ -124,6 +151,10 @@
 +msgstr "??????????????????(_I)"
 +
 +#: src/scim_pinyin_helper.cpp:1039
++msgid "_Export User Phrase Library"
++msgstr "??????????????????(_E)"
++
++#: src/scim_pinyin_helper.cpp:1039
 +msgid "_Add New Phrases"
 +msgstr "???????????????(_A)"
 +
@@ -169,9 +200,47 @@
 +#: src/scim_pinyin_imengine_setup.cpp:611
 +msgid "The switch to invoke pinyin helper. Click to invoke it."
 +msgstr "?????????????????????????????????, ?????????????????????????????????."
++
++#: src/scim_pinyin_helper.cpp:181
++msgid ""
++"SCIM Pinyin Helper\n\n"
++"This helper supply a GUI for users to handle the user phrase library.Users can see current user \n"
++"phrase library, add new phrases, delete phrases, export the library into a simple text file, \n"
++"and import it back from the text file.\n\n\n"
++"Command Options:\n\n"
++"Show User Phrase Library: list current users' phrase library. \n\n"
++"Import User Phrase Library: read a library file in simple text format which was exported before,\n"
++"							and convert the phrases into scim pinyin phrase format.\n\n"
++"Export User Phrase Library: convert current user phrase library into simple text format,\n"
++"							and write them into a simple text file.\n\n"
++"Add New Phrases: add new user phrases into current scim pinyin user phrase library.\n\n"
++"Delete Phrase: remove phrases in current scim piniyin user phrase library.\n"
++msgstr ""
++"SCIM??????????????????\n\n"
++"???????????????????????????????????????????????????????????????????????????????????????????????? \n"
++"???????????????????????????????????????????????????????????????????????????????????????????????? \n"
++"????????????????????????????????????????????????????????????\n\n\n"
++"?????????:\n\n"
++"??????????????????????????????????????????????????? \n\n"
++"????????????????????????????????????????????????????????????????????????????????????????????????????????????\n\n"
++"???????????????????????????????????????????????????????????????????????????????????????????????????\n\n"
++"?????????????????????????????????????????????????????????????????????\n\n"
++"???????????????????????????????????????????????????\n"
++
++#: src/scim_pinyin_helper.cpp:201
++msgid "SCIM Help"
++msgstr "SCIM??????"
++
++#: src/scim_pinyin_helper.cpp:218
++msgid "Smart Common Input Method"
++msgstr "???????????????????????????"
++
++#: src/scim_pinyin_helper.cpp:201
++msgid "_Help On Line"
++msgstr "????????????(H)"
 diff -Naur scim-pinyin-0.5.91.bak/src/Makefile.am scim-pinyin-0.5.91/src/Makefile.am
 --- scim-pinyin-0.5.91.bak/src/Makefile.am	2005-08-06 20:08:46.000000000 +0800
-+++ scim-pinyin-0.5.91/src/Makefile.am	2006-06-28 17:20:26.000000000 +0800
++++ scim-pinyin-0.5.91/src/Makefile.am	2006-08-25 18:04:40.000000000 +0800
 @@ -36,7 +36,8 @@
  			  scim_pinyin_phrase.h \
  			  scim_native_lookup_table.h \
@@ -207,8 +276,8 @@
  endif
 diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.cpp scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp
 --- scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.cpp	1970-01-01 08:00:00.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp	2006-06-28 17:20:26.000000000 +0800
-@@ -0,0 +1,1123 @@
++++ scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp	2006-08-25 18:22:01.000000000 +0800
+@@ -0,0 +1,1345 @@
 +/*
 + *  Copyright (C) 2006 Qian Shen <qshen at redhat.com>
 + *
@@ -232,6 +301,7 @@
 +#include <map>
 +#include <scim.h>
 +#include <gtk/gtk.h>
++#include <stdio.h>
 +#include "scim_pinyin_helper.h"
 +
 +using namespace scim;
@@ -252,7 +322,7 @@
 +                        "",                            // icon
 +                        "",
 +                        SCIM_HELPER_NEED_SCREEN_INFO|SCIM_HELPER_NEED_SCREEN_INFO);
-+
++			
 +//Module Interface
 +extern "C" {
 +    void scim_module_init (void)
@@ -384,16 +454,79 @@
 +}
 +
 +void
-+on_about1_activate                      (GtkMenuItem     *menuitem,
++on_help_online_activate                      (GtkMenuItem     *menuitem,
 +                                        gpointer         user_data)
 +{
++    char *help_text = _("SCIM Pinyin Helper\n\n"
++"This helper supply a GUI for users to handle the user phrase library.Users can see current user \n"
++"phrase library, add new phrases, delete phrases, export the library into a simple text file, \n"
++"and import it back from the text file.\n\n\n"
++"Command Options:\n\n"
++"Show User Phrase Library: list current users' phrase library. \n\n"
++"Import User Phrase Library: read a library file in simple text format which was exported before,\n"
++"							and convert the phrases into scim pinyin phrase format.\n\n"
++"Export User Phrase Library: convert current user phrase library into simple text format,\n"
++"							and write them into a simple text file.\n\n"
++"Add New Phrases: add new user phrases into current scim pinyin user phrase library.\n\n"
++"Delete Phrase: remove phrases in current scim piniyin user phrase library.\n");
++
++    // Create help window - copy from "scim_panel_gtk.cpp"
++    {
++    
++	GtkWidget *_help_dialog, *_help_scroll, *_help_area, *_command_menu;    
++        GtkWidget *frame;
++        GtkWidget *vbox;
++        GtkWidget *scroll;
++
++        _help_dialog = gtk_dialog_new_with_buttons (_("SCIM Help"),
++                                NULL,
++                                GtkDialogFlags (0),
++                                GTK_STOCK_OK,
++                                GTK_RESPONSE_OK,
++                                NULL);
++
++        g_signal_connect_swapped (GTK_OBJECT (_help_dialog), 
++                                  "response", 
++                                  G_CALLBACK (gtk_widget_hide),
++                                  GTK_OBJECT (_help_dialog));
[...3997 lines suppressed...]
++                                "Newly inputed phrases will be placed onto the "
+                                 "burst stack. The phrases in this stack "
+                                 "have higher priority than others."), NULL);
+ 
+         gtk_tooltips_set_tip (__widget_tooltips, __widget_dynamic_sensitivity,
+-                              _("The sensitivity of the "
+-                                "dynamic adjusting algorithm. "
+-                                "The larger the more sensitive."), NULL);
++                              _("Sensitivity of the dynamic adjusting algorithm, "
++                                "the higher the more sensitive."), NULL);
+ 
+         gtk_tooltips_set_tip (__widget_tooltips, __widget_save_period,
+-                              _("The period in seconds to "
++                              _("Time period, in seconds, to "
+                                 "save the user data."), NULL);
+ 
+         gtk_tooltips_set_tip (__widget_tooltips, __widget_tone,
+-                              _("If this option is checked, "
+-                                "the tone information will be used "
+-                                "in matching pinyin key."), NULL);
++                              _("Tone information will be used "
++                                "in matching the pinyin key."), NULL);
+ 
+         gtk_tooltips_set_tip (__widget_tooltips, __widget_incomplete,
+-                              _("If this option is checked, "
+-                                "the pinyin keys which only have initial part (Sheng Mu) "
++                              _("Pinyin keys which only have the initial part (Sheng Mu) "
+                                 "will be allowed. "), NULL);
+ 
+         gtk_tooltips_set_tip (__widget_tooltips, __widget_ambiguities [0],
+                               _("The following options control the ambiguous "
+-                                "behaviour of the pinyin matching algorithm. "
+-                                "Turn on them as you wish, if you can't "
+-                                "distinguish between them."), NULL);
++                                "behaviour of the pinyin matching algorithm, "
++                                "useful if the user cannot distinguish between them."), NULL);
+ 
+         for (i = 0; __config_keyboards [i].key; ++ i) {
+             gtk_tooltips_set_tip (__widget_tooltips, __config_keyboards [i].entry,
+@@ -980,6 +983,12 @@
+             GTK_TOGGLE_BUTTON (__widget_user_data_binary),
+             __config_user_data_binary);
+     }
++    //qshen
++    if (__widget_pinyin_helper) {
++        gtk_toggle_button_set_active (
++            GTK_TOGGLE_BUTTON (__widget_pinyin_helper),
++            __config_pinyin_helper);
++    }    
+ 
+     for (i = 0; __config_keyboards [i].key; ++ i) {
+         if (__config_keyboards [i].entry) {
+@@ -1044,6 +1053,9 @@
+         __config_user_data_binary=
+             config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_USER_DATA_BINARY),
+                           __config_user_data_binary);
++        __config_pinyin_helper= //qshen
++            config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_SHOW_WORD_PROPERTY),
++                          __config_pinyin_helper);	
+         __config_max_user_phrase_length =
+             config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_MAX_USER_PHRASE_LENGTH),
+                           __config_max_user_phrase_length);
+@@ -1107,6 +1119,8 @@
+                       __config_dynamic_adjust);
+         config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_USER_DATA_BINARY),
+                       __config_user_data_binary);
++        config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_SHOW_WORD_PROPERTY),  //qshen
++                      __config_pinyin_helper);		
+         config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_MAX_USER_PHRASE_LENGTH),
+                       __config_max_user_phrase_length);
+         config->write (String (SCIM_CONFIG_IMENGINE_PINYIN_MAX_PREEDIT_LENGTH),
+diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_phrase.h scim-pinyin-0.5.91/src/scim_pinyin_phrase.h
+--- scim-pinyin-0.5.91.bak/src/scim_pinyin_phrase.h	2005-01-06 21:31:00.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.h	2006-08-25 18:04:40.000000000 +0800
+@@ -7,7 +7,7 @@
+  * 
+  * Copyright (c) 2005 James Su <suzhe at tsinghua.org.cn>
+  *
+- * $Id$
++ * $Id$
+  *
+  */
+ 
+@@ -98,6 +98,9 @@
+ 	PinyinPhraseLessThan (const PinyinCustomSettings &custom)
+ 		: m_less (custom) {}
+ 
++	PinyinPhraseLessThan (const PinyinKeyLessThan &le)
++		: m_less (le) {}
++
+ 	bool operator () (const PinyinPhrase &lhs, const PinyinPhrase &rhs) const;
+ };
+ 
+@@ -109,6 +112,9 @@
+ 	PinyinPhraseEqualTo (const PinyinCustomSettings &custom)
+ 		: m_equal (custom) {}
+ 
++	PinyinPhraseEqualTo (const PinyinKeyEqualTo &eq)
++		: m_equal (eq) {}
++
+ 	bool operator () (const PinyinPhrase &lhs, const PinyinPhrase &rhs) const;
+ };
+ 
+@@ -123,6 +129,10 @@
+ 								  const PinyinCustomSettings &custom)
+ 		: m_lib (lib), m_less (custom) { }
+ 
++	PinyinPhraseLessThanByOffset (PinyinPhraseLib *lib,
++								  const PinyinKeyLessThan &le)
++		: m_lib (lib), m_less (le) { }
++
+ 	bool operator () (const std::pair <uint32, uint32> & lhs,
+ 					  const std::pair <uint32, uint32> & rhs) const;
+ };
+@@ -138,6 +148,10 @@
+ 								 const PinyinCustomSettings &custom)
+ 		: m_lib (lib), m_equal (custom) { }
+ 
++	PinyinPhraseEqualToByOffset (PinyinPhraseLib *lib,
++								 const PinyinKeyEqualTo &eq)
++		: m_lib (lib), m_equal (eq) { }
++
+ 	bool operator () (const std::pair <uint32, uint32> & lhs,
+ 					  const std::pair <uint32, uint32> & rhs) const;
+ };
+@@ -153,6 +167,23 @@
+ 										const PinyinKeyLessThan &le)
+ 		: m_lib (lib), m_less (le) { }
+ 
++	PinyinPhrasePinyinLessThanByOffset (PinyinPhraseLib *lib,
++										const PinyinCustomSettings &custom)
++		: m_lib (lib), m_less (custom) { }
++
++	bool operator () (const std::pair <uint32, uint32> & lhs,
++					  const std::pair <uint32, uint32> & rhs) const;
++};
++
++class PinyinPhrasePhraseLessThanByOffset
++	: public std::binary_function < std::pair <uint32, uint32>,
++									std::pair <uint32, uint32>, bool >
++{
++	PinyinPhraseLib *m_lib;
++public:
++	PinyinPhrasePhraseLessThanByOffset (PinyinPhraseLib *lib)
++		: m_lib (lib) { }
++
+ 	bool operator () (const std::pair <uint32, uint32> & lhs,
+ 					  const std::pair <uint32, uint32> & rhs) const;
+ };
+@@ -254,6 +285,7 @@
+ 	friend class PinyinPhraseEqualToByOffsetSP;
+ 
+ 	friend class PinyinPhrasePinyinLessThanByOffset;
++	friend class PinyinPhrasePhraseLessThanByOffset;
+ public:
+ 	PinyinPhraseLib (const PinyinCustomSettings &custom,
+ 					 const PinyinValidator *validator,
+@@ -348,7 +380,7 @@
+ 	Phrase append (const Phrase &phrase, const PinyinKeyVector &keys);
+ 	Phrase append (const WideString &phrase, const PinyinKeyVector &keys);
+ 
+-	void dump_content (std::ostream &os, int minlen = 2, int maxlen = SCIM_PHRASE_MAX_LENGTH);
++	void dump_content (std::ostream &os, int minlen = 1, int maxlen = SCIM_PHRASE_MAX_LENGTH);
+ 
+ 	void set_burst_stack_size (uint32 size) {
+ 		m_phrase_lib.set_burst_stack_size (size);
+@@ -371,6 +403,9 @@
+ 	}
+ 
+ 	void optimize_phrase_frequencies (uint32 max_freq = (SCIM_PHRASE_MAX_FREQUENCY >> 1));
++	
++	template<class T>
++	void for_each_phrase (T &op);
+ 
+ private:
+ 	Phrase get_phrase (uint32 phrase_offset) {
+@@ -409,9 +444,6 @@
+ 	bool insert_phrase_into_index (const Phrase &phrase, const PinyinKeyVector &keys);
+ 
+ 	template<class T>
 -	void for_each_phrase (T &op);
 -
 -	template<class T>
  	void for_each_phrase_level_one (uint32 len, T &op);
  
  	template<class T>
+@@ -580,6 +612,13 @@
+ 	return m_lib->get_phrase (lhs.first) < m_lib->get_phrase (rhs.first);
+ }
+ 
++inline bool
++PinyinPhrasePhraseLessThanByOffset::operator () (const std::pair <uint32, uint32> & lhs,
++												 const std::pair <uint32, uint32> & rhs) const
++{
++	return m_lib->get_phrase (lhs.first) < m_lib->get_phrase (rhs.first);
++}
++
+ //Implementation of some PinyinPhraseLib members.
+ template<class T> void
+ PinyinPhraseLib::for_each_phrase (T &op)



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:44:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:44:27 -0400
Subject: rpms/eel2/devel eel-fix-omit-self-check.patch, NONE, 1.1 eel2.spec,
	1.57, 1.58
Message-ID: <200608251044.k7PAiRnI029183@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29129

Modified Files:
	eel2.spec 
Added Files:
	eel-fix-omit-self-check.patch 
Log Message:
fix omit self check build


eel-fix-omit-self-check.patch:
 check-program.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE eel-fix-omit-self-check.patch ---
Index: eel/check-program.c
===================================================================
RCS file: /cvs/gnome/eel/eel/check-program.c,v
retrieving revision 1.16
diff -u -p -r1.16 check-program.c
--- eel/check-program.c	25 Jun 2002 16:31:04 -0000	1.16
+++ eel/check-program.c	25 Aug 2006 10:41:29 -0000
@@ -38,6 +38,8 @@
 int
 main (int argc, char *argv[])
 {
+#if !defined (EEL_OMIT_SELF_CHECK)
+
 	eel_make_warnings_and_criticals_stop_in_debugger ();
 	
 
@@ -57,5 +59,7 @@ main (int argc, char *argv[])
 	gnome_vfs_shutdown ();
 	eel_debug_shut_down ();
 
+#endif /* !EEL_OMIT_SELF_CHECK */
+	
 	return EXIT_SUCCESS;
 }


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- eel2.spec	25 Aug 2006 10:28:45 -0000	1.57
+++ eel2.spec	25 Aug 2006 10:44:25 -0000	1.58
@@ -24,6 +24,7 @@
 BuildRoot:	/var/tmp/%{name}-%{version}-root
 
 Patch1: eel-2.15.92-dndcrash.patch
+Patch2: eel-fix-omit-self-check.patch
 
 Requires: pango >= %{pango_version}
 Requires: gtk2 >= %{gtk2_version}
@@ -77,6 +78,7 @@
 %prep
 %setup -q -n eel-%{version}
 %patch1 -p0 -b .dndcrash
+%patch2 -p0 -b .fix_omit_self_check
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -g -DEEL_OMIT_SELF_CHECK" %configure



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:44:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:44:41 -0400
Subject: rpms/kdebase/devel kdebase-3.5.4-kde#132873.patch, NONE,
	1.1 kdebase.spec, 1.216, 1.217
Message-ID: <200608251044.k7PAif3h029222@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29198

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-kde#132873.patch 
Log Message:
apply upstream patch to fix kdedesktop crash, kde#132873



kdebase-3.5.4-kde#132873.patch:
 kdiconview.cc |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.4-kde#132873.patch ---
Index: kdesktop/kdiconview.cc
===================================================================
--- kdesktop/kdiconview.cc	(Revision 576335)
+++ kdesktop/kdiconview.cc	(Revision 576336)
@@ -633,7 +633,12 @@
 
 void KDIconView::slotProperties()
 {
-    (void) new KPropertiesDialog( selectedFileItems() );
+    KFileItemList selectedFiles = selectedFileItems();
+
+    if( selectedFiles.isEmpty() )
+      return;
+
+    (void) new KPropertiesDialog( selectedFiles );
 }
 
 void KDIconView::slotContextMenuRequested(QIconViewItem *_item, const QPoint& _global)


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- kdebase.spec	25 Aug 2006 10:02:35 -0000	1.216
+++ kdebase.spec	25 Aug 2006 10:44:39 -0000	1.217
@@ -60,6 +60,7 @@
 Patch101: kdebase-3.5.4-kde#128552.patch
 Patch102: kdebase-3.5.4-kde#124116.patch
 Patch103: kdebase-3.5.4-konsole-bz#203221.patch
+Patch104: kdebase-3.5.4-kde#132873.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -172,6 +173,7 @@
 %patch101 -p0 -b .kde#128552
 %patch102 -p0 -b .kde#124116
 %patch103 -p0 -b .bz#203221
+%patch104 -p0 -b .kde#132873
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -544,6 +546,7 @@
 * Fri Aug 25 2006 Than Ngo <than at redhat.com> 6:3.5.4-5
 - add Requires: eject 
 - fix #203279, antialiasing issue
+- apply upstream patch to fix kdedesktop crash, kde#132873
 
 * Mon Aug 21 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
 - fix #203221, konsole does not display bold characters



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:45:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:45:14 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.28,1.29
Message-ID: <200608251045.k7PAjEYJ029400@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28853

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen:update helper module. add online help doc to it.



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- scim-pinyin.spec	24 Jul 2006 08:27:00 -0000	1.28
+++ scim-pinyin.spec	25 Aug 2006 10:45:00 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        11.3%{?dist}
+Release:        11.4%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Aug 25 2006 Qian Shen <qshen at redhat.com> - 0.5.91-11.4
+- update pinyin helper
+
 * Mon Jul 24 2006 Qian Shen <qshen at redhat.com> - 0.5.91-11.3
 - remove all ShuangPin plans
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:45:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:45:34 -0400
Subject: rpms/alsa-lib/devel .cvsignore, 1.22, 1.23 alsa-lib.spec, 1.48,
	1.49 sources, 1.25, 1.26
Message-ID: <200608251045.k7PAjYSb029520@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/alsa-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29487

Modified Files:
	.cvsignore alsa-lib.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	7 Aug 2006 12:28:08 -0000	1.22
+++ .cvsignore	25 Aug 2006 10:45:31 -0000	1.23
@@ -9,3 +9,4 @@
 ainit-0.7.tar.gz
 alsa-lib-1.0.12rc1.tar.bz2
 alsa-lib-1.0.12rc2.tar.bz2
+alsa-lib-1.0.12.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- alsa-lib.spec	7 Aug 2006 12:27:39 -0000	1.48
+++ alsa-lib.spec	25 Aug 2006 10:45:31 -0000	1.49
@@ -1,11 +1,9 @@
-%define prever         rc2
-%define prever_dot     .rc2
 %define version_main   1.0.12
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 1%{?prever_dot}%{?dist}
+Release: 2%{?prever_dot}%{?dist}
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
@@ -90,6 +88,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Fri Aug 25 2006 Martin Stransky <stransky at redhat.com> 1.0.12-2
+- new upstream
+
 * Mon Aug 07 2006 Martin Stransky <stransky at redhat.com> 1.0.12-1.rc2
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	7 Aug 2006 13:08:38 -0000	1.25
+++ sources	25 Aug 2006 10:45:31 -0000	1.26
@@ -1 +1 @@
-4062701630b1dc15aa3721eb0a3c23ec  alsa-lib-1.0.12rc2.tar.bz2
+d351d46c5e415d4c8448487737939c72  alsa-lib-1.0.12.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:47:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:47:58 -0400
Subject: rpms/alsa-utils/devel .cvsignore, 1.17, 1.18 alsa-utils.spec, 1.44,
	1.45 sources, 1.20, 1.21
Message-ID: <200608251047.k7PAlwUV002176@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/alsa-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1829

Modified Files:
	.cvsignore alsa-utils.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	7 Aug 2006 12:49:58 -0000	1.17
+++ .cvsignore	25 Aug 2006 10:47:56 -0000	1.18
@@ -10,3 +10,4 @@
 alsa-lib-1.0.11.tar.bz2
 alsa-utils-1.0.11.tar.bz2
 alsa-utils-1.0.12rc2.tar.bz2
+alsa-utils-1.0.12.tar.bz2


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- alsa-utils.spec	7 Aug 2006 12:49:58 -0000	1.44
+++ alsa-utils.spec	25 Aug 2006 10:47:56 -0000	1.45
@@ -1,10 +1,7 @@
-%define prever      rc2
-%define prever_dot .rc2
-
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.12
-Release: 	1%{prever_dot}%{?dist}
+Release: 	2%{?prever_dot}%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -68,6 +65,9 @@
 /usr/share/locale/*
 
 %changelog
+* Fri Aug 25 2006 Martin Stransky <stransky at redhat.com> 1.0.12-2
+- new upstream
+
 * Mon Aug 07 2006 Martin Stransky <stransky at redhat.com> 1.0.12-1.rc2
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	7 Aug 2006 12:49:58 -0000	1.20
+++ sources	25 Aug 2006 10:47:56 -0000	1.21
@@ -1 +1 @@
-ec3ee0143b0af21effbd112e4458613e  alsa-utils-1.0.12rc2.tar.bz2
+a3b904040418f18d4276687388429907  alsa-utils-1.0.12.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 25 10:49:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 06:49:23 -0400
Subject: rpms/im-chooser/devel im-chooser-r49.patch, NONE,
	1.1 im-chooser.spec, 1.7, 1.8
Message-ID: <200608251049.k7PAnNDq013195@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/im-chooser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13164

Modified Files:
	im-chooser.spec 
Added Files:
	im-chooser-r49.patch 
Log Message:
* Fri Aug 25 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.1-2
- im-chooser-r49.patch: removed MimeType field from .desktop file. (#203982)

im-chooser-r49.patch:
 ChangeLog                    |    4 ++++
 src/im-chooser.desktop.in.in |    1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE im-chooser-r49.patch ---
Index: ChangeLog
===================================================================
--- ChangeLog	(??????????????? 49)
+++ ChangeLog	(???????????????)
@@ -1,3 +1,7 @@
+2006-08-25  Akira TAGOH  <at at gclab.org>
+
+	* src/im-chooser.desktop.in.in: removed MimeType.
+
 2006-08-15  Akira TAGOH  <at at gclab.org>
 
 	* configure.ac: bumped to 0.3.1.
Index: src/im-chooser.desktop.in.in
===================================================================
--- src/im-chooser.desktop.in.in	(??????????????? 49)
+++ src/im-chooser.desktop.in.in	(???????????????)
@@ -6,5 +6,4 @@
 Terminal=false
 Type=Application
 StartupNotify=true
-MimeType=text/plain;
 Categories=Applications;Settings;


Index: im-chooser.spec
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- im-chooser.spec	15 Aug 2006 03:59:17 -0000	1.7
+++ im-chooser.spec	25 Aug 2006 10:49:20 -0000	1.8
@@ -1,12 +1,13 @@
 Name:		im-chooser
 Version:	0.3.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel intltool gettext libgnomeui-devel
 
 Source0:	http://trac.tagoh.net/download/%{name}/%{name}-%{version}.tar.gz
+Patch0:		im-chooser-r49.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure --with-xinput-suffix=.conf
@@ -51,6 +53,9 @@
 %{_datadir}/applications/im-chooser.desktop
 
 %changelog
+* Fri Aug 25 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.1-2
+- im-chooser-r49.patch: removed MimeType field from .desktop file. (#203982)
+
 * Tue Aug 15 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.1-1
 - New upstream release.
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 11:11:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 07:11:28 -0400
Subject: rpms/vim/devel vim-7.0-syncolor.patch, NONE, 1.1 vim.spec, 1.134,
	1.135
Message-ID: <200608251111.k7PBBSUA018894@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18800

Modified Files:
	vim.spec 
Added Files:
	vim-7.0-syncolor.patch 
Log Message:
- fix vimdiff colors (#204042)

vim-7.0-syncolor.patch:
 syncolor.vim |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.0-syncolor.patch ---
--- vim70/runtime/syntax/syncolor.vim.orig	2006-08-25 14:58:29.000000000 +0200
+++ vim70/runtime/syntax/syncolor.vim	2006-08-25 14:59:24.000000000 +0200
@@ -41,7 +41,7 @@
   SynColor Underlined	term=underline cterm=underline ctermfg=LightBlue gui=underline guifg=#80a0ff
   SynColor Ignore	term=NONE cterm=NONE ctermfg=black ctermbg=NONE gui=NONE guifg=bg guibg=NONE
 else
-  SynColor Comment	term=bold cterm=NONE ctermfg=DarkBlue ctermbg=NONE gui=NONE guifg=Blue guibg=NONE
+  SynColor Comment	term=bold cterm=NONE ctermfg=DarkRed  ctermbg=NONE gui=NONE guifg=red2 guibg=NONE
   SynColor Constant	term=underline cterm=NONE ctermfg=DarkRed ctermbg=NONE gui=NONE guifg=Magenta guibg=NONE
   SynColor Special	term=bold cterm=NONE ctermfg=DarkMagenta ctermbg=NONE gui=NONE guifg=SlateBlue guibg=NONE
   SynColor Identifier	term=underline cterm=NONE ctermfg=DarkCyan ctermbg=NONE gui=NONE guifg=DarkCyan guibg=NONE


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- vim.spec	24 Aug 2006 09:23:56 -0000	1.134
+++ vim.spec	25 Aug 2006 11:11:26 -0000	1.135
@@ -20,7 +20,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1
+Release: 2
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -123,6 +123,7 @@
 Patch3007: vim-7.0-fstabsyntax.patch
 Patch3008: vim-6.4-lib64.patch
 Patch3009: vim-7.0-warning.patch
+Patch3010: vim-7.0-syncolor.patch
 #
 Patch3100: vim-selinux.patch
 Patch3101: vim-selinux2.patch
@@ -320,6 +321,7 @@
 %patch3007 -p1
 %patch3008 -p1
 %patch3009 -p1
+%patch3010 -p1
 
 %if %{WITH_SELINUX}
 %patch3100 -p1
@@ -632,6 +634,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Aug 25 2006 Karsten Hopp <karsten at redhat.de> 7.0.066-2
+- fix vimdiff colors (#204042)
+
 * Thu Aug 24 2006 Karsten Hopp <karsten at redhat.de> 7.0.066-1
 - fix syntax patch (#203798)
 - patchlevel 66



From fedora-cvs-commits at redhat.com  Fri Aug 25 11:41:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 07:41:54 -0400
Subject: rpms/vixie-cron/devel vixie-cron-4.1-_44-delayed_database.patch,
	NONE, 1.1 vixie-cron.spec, 1.73, 1.74
Message-ID: <200608251141.k7PBfsvC010502@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10294

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_44-delayed_database.patch 
Log Message:
Added patch, which fix: Job delayed after using crontab -e


vixie-cron-4.1-_44-delayed_database.patch:
 cron.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE vixie-cron-4.1-_44-delayed_database.patch ---
--- vixie-cron-4.1/cron.c.delay	2006-08-25 08:55:33.000000000 +0200
+++ vixie-cron-4.1/cron.c	2006-08-25 13:30:51.000000000 +0200
@@ -175,7 +175,8 @@
 		 * clock.  Classify the change into one of 4 cases.
 		 */
 		timeDiff = timeRunning - virtualTime;
-
+		
+		load_database(&database);
 		/* shortcut for the most common case */
 		if (timeDiff == 1) {
 			virtualTime = timeRunning;
@@ -275,7 +276,6 @@
 			got_sigchld = 0;
 			sigchld_reaper();
 		}
-		load_database(&database);
 	}
 }
 


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- vixie-cron.spec	25 Aug 2006 08:28:09 -0000	1.73
+++ vixie-cron.spec	25 Aug 2006 11:41:51 -0000	1.74
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 59%{?dist}
+Release: 60%{?dist}
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -74,6 +74,7 @@
 Patch54: vixie-cron-4.1-_54_bz198019_database_changes.patch
 Patch55: vixie-cron-4.1-man-page-typo.patch
 Patch56: vixie-cron-4.1-_55-bz203746.patch
+Patch57: vixie-cron-4.1-_44-delayed_database.patch 
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
@@ -167,6 +168,8 @@
 %patch54 -p1 -b .bz198019
 %patch55 -p1 -b .man-page-typo
 %patch56 -p1 -b .bz203746
+%patch57 -p1 -b .delayed_database
+
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" \
 %if %{WITH_SELINUX}
@@ -233,7 +236,10 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
-* Wed Aug 25 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-59
+* Fri Aug 25 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-60
+- patch from Jose Plans fixed: Job delayed after using crontab -e
+
+* Fri Aug 25 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-59
 - small changes in man-page cron
 - (#203746) RFC3834, patch from James Ralston
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 11:50:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 07:50:34 -0400
Subject: rpms/a2ps/devel a2ps.spec,1.38,1.39
Message-ID: <200608251150.k7PBoYOh028850@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28819

Modified Files:
	a2ps.spec 
Log Message:
* Fri Aug 25 2006 Tim Waugh <twaugh at redhat.com> 4.13b-55
- Use better manifest flags for fonts.map.



Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- a2ps.spec	8 Aug 2006 13:54:20 -0000	1.38
+++ a2ps.spec	25 Aug 2006 11:50:31 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
 Version: 4.13b
-Release: 54
+Release: 55
 License: GPL
 Group: Applications/Publishing
 Source: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -217,7 +217,7 @@
 %{_infodir}/ogonkify.info*
 %{_infodir}/regex.info*
 %{_mandir}/*/*
-%config %{_datadir}/a2ps/afm/fonts.map
+%config(noreplace) %verify(not md5 size mtime) %{_datadir}/a2ps/afm/fonts.map
 %{_datadir}/a2ps/afm/*.afm
 %{_datadir}/a2ps/afm/make_fonts_map.sh
 %{_datadir}/a2ps/README
@@ -232,6 +232,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Fri Aug 25 2006 Tim Waugh <twaugh at redhat.com> 4.13b-55
+- Use better manifest flags for fonts.map.
+
 * Tue Aug  8 2006 Tim Waugh <twaugh at redhat.com> 4.13b-54
 - Prevent fixps tmpdir problem (bug #188156).
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 12:14:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 08:14:36 -0400
Subject: rpms/vixie-cron/FC-5 vixie-cron-4.1-_44-delayed_database.patch, NONE,
	1.1 vixie-cron.spec, 1.70, 1.71
Message-ID: <200608251214.k7PCEaFK002784@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2661

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_44-delayed_database.patch 
Log Message:
Add patch for delayed database.


vixie-cron-4.1-_44-delayed_database.patch:
 cron.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE vixie-cron-4.1-_44-delayed_database.patch ---
--- vixie-cron-4.1/cron.c.delay	2006-08-25 08:55:33.000000000 +0200
+++ vixie-cron-4.1/cron.c	2006-08-25 13:30:51.000000000 +0200
@@ -175,7 +175,8 @@
 		 * clock.  Classify the change into one of 4 cases.
 		 */
 		timeDiff = timeRunning - virtualTime;
-
+		
+		load_database(&database);
 		/* shortcut for the most common case */
 		if (timeDiff == 1) {
 			virtualTime = timeRunning;
@@ -275,7 +276,6 @@
 			got_sigchld = 0;
 			sigchld_reaper();
 		}
-		load_database(&database);
 	}
 }
 


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/FC-5/vixie-cron.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- vixie-cron.spec	25 Aug 2006 08:46:11 -0000	1.70
+++ vixie-cron.spec	25 Aug 2006 12:14:33 -0000	1.71
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 56%{?dist}
+Release: 57%{?dist}
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -72,6 +72,7 @@
 Patch52: vixie-cron-4.1-_52-bz181439.patch
 Patch53: vixie-cron-4.1-man-page-typo.patch
 Patch54: vixie-cron-4.1-_55-bz203746.patch
+Patch55: vixie-cron-4.1-_44-delayed_database.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
@@ -163,6 +164,8 @@
 %patch52 -p1 -b .bz181439
 %patch53 -p1 -b .man-pages-typo
 %patch54 -p1 -b .bz203746
+%patch55 -p1 -b .delayed_database
+
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" \
 %if %{WITH_SELINUX}
@@ -229,6 +232,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Fri Aug 25 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-57.FC5
+- patch from Jose Plans fixed: Job delayed after using crontab -e
+
 * Fri Aug 25 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-56.FC5
 - small changes in man-page cron
 - (#203746) RFC3834, patch from James Ralston



From fedora-cvs-commits at redhat.com  Fri Aug 25 12:16:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 08:16:38 -0400
Subject: rpms/kdebase/devel kdebase-3.5.4-2-redhat.patch, NONE,
	1.1 kdebase.spec, 1.217, 1.218 kdebase-3.5.4-1-redhat.patch,
	1.1, NONE
Message-ID: <200608251216.k7PCGccb006369@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3684

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-2-redhat.patch 
Removed Files:
	kdebase-3.5.4-1-redhat.patch 
Log Message:
- fix #201507, pam config issue


kdebase-3.5.4-2-redhat.patch:
 kdebase-3.5.3/startkde |   66 +++++++++++++++++++++++++++++++++++++++++++------
 kdebase-3.5.4/kde.pamd |   14 +++++-----
 kdebase-3.5.4/startkde |   66 +++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 124 insertions(+), 22 deletions(-)

--- NEW FILE kdebase-3.5.4-2-redhat.patch ---
--- kdebase-3.5.4/kde.pamd.redhat	2005-09-10 10:26:16.000000000 +0200
+++ kdebase-3.5.4/kde.pamd	2006-08-25 14:15:02.000000000 +0200
@@ -1,7 +1,9 @@
 #%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       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_selinux.so
+session    optional	pam_console.so
--- kdebase-3.5.4/startkde.redhat	2006-07-23 16:23:24.000000000 +0200
+++ kdebase-3.5.4/startkde	2006-08-23 12:35:17.000000000 +0200
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.4 )
+#  Modified for Red Hat Linux
 #
 
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`LANG=C df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`LANG=C df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
+
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
 trap 'echo GOT SIGHUP' HUP
@@ -14,12 +62,12 @@
 	exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default blue
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -61,7 +109,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]
@@ -132,8 +180,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`
@@ -145,9 +193,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
@@ -337,7 +386,8 @@
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done
--- kdebase-3.5.3/startkde.redhat	2006-07-24 11:52:53.000000000 +0200
+++ kdebase-3.5.3/startkde	2006-07-24 11:55:19.000000000 +0200
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.4 )
+#  Modified for Red Hat Linux
 #
 
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`LANG=C df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`LANG=C df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
+
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
 trap 'echo GOT SIGHUP' HUP
@@ -14,12 +62,12 @@
 	exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default blue
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -61,7 +109,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]
@@ -132,8 +180,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`
@@ -145,9 +193,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
@@ -337,7 +386,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.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- kdebase.spec	25 Aug 2006 10:44:39 -0000	1.217
+++ kdebase.spec	25 Aug 2006 12:16:36 -0000	1.218
@@ -35,7 +35,7 @@
 Source8: env.sh
 
 Patch200: kde-libtool.patch
-Patch1: kdebase-3.5.4-1-redhat.patch
+Patch1: kdebase-3.5.4-2-redhat.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -547,6 +547,7 @@
 - add Requires: eject 
 - fix #203279, antialiasing issue
 - apply upstream patch to fix kdedesktop crash, kde#132873
+- fix #201507, pam config issue
 
 * Mon Aug 21 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
 - fix #203221, konsole does not display bold characters


--- kdebase-3.5.4-1-redhat.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 25 12:26:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 08:26:40 -0400
Subject: rpms/kdebase/devel kdebase-3.5.4-kdm.patch, NONE, 1.1 kdebase.spec,
	1.218, 1.219
Message-ID: <200608251226.k7PCQeZX021920@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21856

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-kdm.patch 
Log Message:
- fix kdm crash



kdebase-3.5.4-kdm.patch:
 choose.c |    3 ++-
 ctrl.c   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.4-kdm.patch ---
Index: kdm/backend/ctrl.c
===================================================================
--- kdm/backend/ctrl.c	(Revision 574587)
+++ kdm/backend/ctrl.c	(Revision 574588)
@@ -842,7 +842,7 @@
 					break;
 				case remoteLogin:
 					if (di->serverPid != -1 && nuke)
-						TerminateProcess( di->serverPid, d->termSignal );
+						TerminateProcess( di->serverPid, di->termSignal );
 					break;
 				case reserve:
 					di->status = notRunning;
Index: kdm/backend/choose.c
===================================================================
--- kdm/backend/choose.c	(Revision 574623)
+++ kdm/backend/choose.c	(Revision 574624)
@@ -83,7 +83,8 @@
 		if (XdmcpARRAY8Equal( clientAddress, &i->client ) &&
 		    connectionType == i->connectionType)
 			return 1;
-	i = (IndirectUsersPtr)Malloc( sizeof(IndirectUsersRec) );
+	if (!(i = (IndirectUsersPtr)Malloc( sizeof(IndirectUsersRec) )))
+		return 0;
 	if (!XdmcpCopyARRAY8( clientAddress, &i->client )) {
 		free( (char *)i );
 		return 0;


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- kdebase.spec	25 Aug 2006 12:16:36 -0000	1.218
+++ kdebase.spec	25 Aug 2006 12:26:37 -0000	1.219
@@ -61,6 +61,7 @@
 Patch102: kdebase-3.5.4-kde#124116.patch
 Patch103: kdebase-3.5.4-konsole-bz#203221.patch
 Patch104: kdebase-3.5.4-kde#132873.patch
+Patch105: kdebase-3.5.4-kdm.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -174,6 +175,7 @@
 %patch102 -p0 -b .kde#124116
 %patch103 -p0 -b .bz#203221
 %patch104 -p0 -b .kde#132873
+%patch105 -p0 -b .kdm-crash
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -548,6 +550,7 @@
 - fix #203279, antialiasing issue
 - apply upstream patch to fix kdedesktop crash, kde#132873
 - fix #201507, pam config issue
+- fix kdm crash
 
 * Mon Aug 21 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
 - fix #203221, konsole does not display bold characters



From fedora-cvs-commits at redhat.com  Fri Aug 25 12:30:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 08:30:23 -0400
Subject: rpms/kdebase/FC-5 kdebase-3.5.4-2-redhat.patch, NONE,
	1.1 kdebase-3.5.4-kde#132873.patch, NONE,
	1.1 kdebase-3.5.4-kdm.patch, NONE, 1.1 kdebase.spec, 1.183,
	1.184 kdebase-3.5.4-1-redhat.patch, 1.1, NONE
Message-ID: <200608251230.k7PCUNnp023266@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23208

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-2-redhat.patch kdebase-3.5.4-kde#132873.patch 
	kdebase-3.5.4-kdm.patch 
Removed Files:
	kdebase-3.5.4-1-redhat.patch 
Log Message:
- fix #203221, konsole does not display bold characters
- fix #203083, correct htdig settings
- fix #201507, pam config issue
- fix #203279, Antialiasing issue
- apply upstream patch to fix argument quoting
- add requires: eject
- fix kdm crash


kdebase-3.5.4-2-redhat.patch:
 kde.pamd |   14 +++++++------
 startkde |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 66 insertions(+), 14 deletions(-)

--- NEW FILE kdebase-3.5.4-2-redhat.patch ---
--- kdebase-3.5.4/kde.pamd.redhat	2005-09-10 10:26:16.000000000 +0200
+++ kdebase-3.5.4/kde.pamd	2006-08-25 14:15:02.000000000 +0200
@@ -1,7 +1,9 @@
 #%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       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_selinux.so
+session    optional	pam_console.so
--- kdebase-3.5.4/startkde.redhat	2006-07-24 11:52:53.000000000 +0200
+++ kdebase-3.5.4/startkde	2006-07-24 11:55:19.000000000 +0200
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.4 )
+#  Modified for Red Hat Linux
 #
 
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`LANG=C df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`LANG=C df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
+
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
 trap 'echo GOT SIGHUP' HUP
@@ -14,12 +62,12 @@
 	exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default blue
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -61,7 +109,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]
@@ -132,8 +180,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`
@@ -145,9 +193,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
@@ -337,7 +386,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.4-kde#132873.patch:
 kdiconview.cc |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.4-kde#132873.patch ---
Index: kdesktop/kdiconview.cc
===================================================================
--- kdesktop/kdiconview.cc	(Revision 576335)
+++ kdesktop/kdiconview.cc	(Revision 576336)
@@ -633,7 +633,12 @@
 
 void KDIconView::slotProperties()
 {
-    (void) new KPropertiesDialog( selectedFileItems() );
+    KFileItemList selectedFiles = selectedFileItems();
+
+    if( selectedFiles.isEmpty() )
+      return;
+
+    (void) new KPropertiesDialog( selectedFiles );
 }
 
 void KDIconView::slotContextMenuRequested(QIconViewItem *_item, const QPoint& _global)

kdebase-3.5.4-kdm.patch:
 choose.c |    3 ++-
 ctrl.c   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.4-kdm.patch ---
Index: kdm/backend/ctrl.c
===================================================================
--- kdm/backend/ctrl.c	(Revision 574587)
+++ kdm/backend/ctrl.c	(Revision 574588)
@@ -842,7 +842,7 @@
 					break;
 				case remoteLogin:
 					if (di->serverPid != -1 && nuke)
-						TerminateProcess( di->serverPid, d->termSignal );
+						TerminateProcess( di->serverPid, di->termSignal );
 					break;
 				case reserve:
 					di->status = notRunning;
Index: kdm/backend/choose.c
===================================================================
--- kdm/backend/choose.c	(Revision 574623)
+++ kdm/backend/choose.c	(Revision 574624)
@@ -83,7 +83,8 @@
 		if (XdmcpARRAY8Equal( clientAddress, &i->client ) &&
 		    connectionType == i->connectionType)
 			return 1;
-	i = (IndirectUsersPtr)Malloc( sizeof(IndirectUsersRec) );
+	if (!(i = (IndirectUsersPtr)Malloc( sizeof(IndirectUsersRec) )))
+		return 0;
 	if (!XdmcpCopyARRAY8( clientAddress, &i->client )) {
 		free( (char *)i );
 		return 0;


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- kdebase.spec	25 Aug 2006 10:23:37 -0000	1.183
+++ kdebase.spec	25 Aug 2006 12:30:20 -0000	1.184
@@ -33,7 +33,7 @@
 Source7: mailsettings.cc
 Source8: env.sh
 
-Patch1: kdebase-3.5.4-1-redhat.patch
+Patch1: kdebase-3.5.4-2-redhat.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -57,6 +57,8 @@
 Patch101: kdebase-3.5.4-kde#128552.patch
 Patch102: kdebase-3.5.4-kde#124116.patch
 Patch103: kdebase-3.5.4-konsole-bz#203221.patch
+Patch104: kdebase-3.5.4-kde#132873.patch
+Patch105: kdebase-3.5.4-kdm.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -169,6 +171,8 @@
 %patch101 -p0 -b .kde#128552
 %patch102 -p0 -b .kde#124116
 %patch103 -p0 -b .bz#203221
+%patch104 -p0 -b .kde#132873
+%patch105 -p0 -b .kdm-crash
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -531,12 +535,14 @@
 
 
 %changelog
-* Mon Aug 21 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.3.fc5
+* Fri Aug 25 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.3.fc5
 - fix #203221, konsole does not display bold characters
 - fix #203083, correct htdig settings
+- fix #201507, pam config issue
+- fix #203279, Antialiasing issue
 - apply upstream patch to fix argument quoting
 - add requires: eject
-- fix Antialias issue
+- fix kdm crash
 
 * Fri Aug 11 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.2.fc5
 - fix BR


--- kdebase-3.5.4-1-redhat.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 25 12:37:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 08:37:03 -0400
Subject: rpms/kdebase/FC-5 kdebase.spec,1.184,1.185
Message-ID: <200608251237.k7PCb3tS024757@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24687

Modified Files:
	kdebase.spec 
Log Message:
typo



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- kdebase.spec	25 Aug 2006 12:30:20 -0000	1.184
+++ kdebase.spec	25 Aug 2006 12:36:57 -0000	1.185
@@ -27,7 +27,7 @@
 Source1: konsole.desktop
 Source2: KDE.session.gnome
 Source3: kde.desktop
-Source4: kde-redhat-config-3.5-fc5-0.3.tar.bz2
+Source4: kde-redhat-config-3.5-fc5-0.2.tar.bz2
 Source5: kde-np
 Source6: logrotate-kdm
 Source7: mailsettings.cc



From fedora-cvs-commits at redhat.com  Fri Aug 25 12:49:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 08:49:04 -0400
Subject: rpms/kdebase/devel kdebase-3.5.4-2-redhat.patch,1.1,1.2
Message-ID: <200608251249.k7PCn46g004978@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2519

Modified Files:
	kdebase-3.5.4-2-redhat.patch 
Log Message:
cleanup


kdebase-3.5.4-2-redhat.patch:
 kde.pamd |   14 +++++++------
 startkde |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 66 insertions(+), 14 deletions(-)

Index: kdebase-3.5.4-2-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase-3.5.4-2-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.4-2-redhat.patch	25 Aug 2006 12:16:36 -0000	1.1
+++ kdebase-3.5.4-2-redhat.patch	25 Aug 2006 12:49:01 -0000	1.2
@@ -133,120 +133,3 @@
    for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
      test -x "$prefix$file" && "$prefix$file"
    done
---- kdebase-3.5.3/startkde.redhat	2006-07-24 11:52:53.000000000 +0200
-+++ kdebase-3.5.3/startkde	2006-07-24 11:55:19.000000000 +0200
-@@ -1,8 +1,56 @@
- #!/bin/sh
- #
- #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.4 )
-+#  Modified for Red Hat Linux
- #
- 
-+unset BLOCK_SIZE # breaks parsing of df output
-+shopt -u -o noclobber # allow overwriting of files with '>'
-+
-+# set up user environment if not present
-+# check for space on /tmp and "$HOME" and for write access
-+#  error exit, if not
-+space_tmp=`LANG=C df /tmp | xargs | cut -d" " -f11`
-+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
-+
-+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
-+    # check for AFS
-+    space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
-+else
-+    # check regular mounts
-+    space_home=`LANG=C df "$HOME" | xargs | cut -d" " -f11`
-+fi
-+
-+if [ $space_tmp -lt 50 ]; then
-+    echo $"Not enough free disk space on /tmp"
-+    exit 1
-+fi
-+
-+if [ $space_home -lt 25 ]; then
-+    echo $"Not enough free disk space on "$HOME""
-+    exit 1
-+fi
-+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
-+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
-+
-+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
-+    echo $"You don't have write permissions for /tmp"
-+    exit 1
-+fi
-+rm -f $testfile_tmp
-+
-+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
-+     echo $"You don't have write permissions for "$HOME""
-+     exit 1
-+fi
-+rm -f $testfile_home
-+
-+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
-+
-+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
-+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
-+fi
-+
- # When the X server dies we get a HUP signal from xinit. We must ignore it
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
-@@ -14,12 +62,12 @@
- 	exit 1
- fi
- 
--# Set the background to plain grey.
-+# Set the background to the Red Hat default blue
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard KDE palette for those with
- # palettised displays.
- if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
--  xsetroot -solid "#000000"
-+  xsetroot -solid "#5477A0"
- fi
- 
- # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
-@@ -61,7 +109,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]
-@@ -132,8 +180,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`
-@@ -145,9 +193,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
-@@ -337,7 +386,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



From fedora-cvs-commits at redhat.com  Fri Aug 25 12:54:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 08:54:16 -0400
Subject: rpms/rdate/devel rdate.spec,1.19,1.20
Message-ID: <200608251254.k7PCsGFQ011587@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/rdate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11520

Modified Files:
	rdate.spec 
Log Message:
- Enabled IPv6 support



Index: rdate.spec
===================================================================
RCS file: /cvs/dist/rpms/rdate/devel/rdate.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rdate.spec	15 Jul 2006 02:55:48 -0000	1.19
+++ rdate.spec	25 Aug 2006 12:54:14 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Tool for getting the date/time from a remote machine.
 Name: rdate
 Version: 1.4
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/System
 Source: ftp://people.redhat.com/sopwith/rdate-%{version}.tar.gz
@@ -17,7 +17,7 @@
 %setup -q
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS"
+make CFLAGS="$RPM_OPT_FLAGS -DINET6"
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -34,6 +34,9 @@
 %{_mandir}/man1/rdate.1*
 
 %changelog
+* Fri Aug 25 2006 Phil Knirsch <pknirsch at redhat.com> - 1.4-6
+- Enabled IPv6 support (#197509)
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.4-5
 - bump
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 13:12:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 09:12:12 -0400
Subject: rpms/system-config-date/devel system-config-date.spec,1.52,1.53
Message-ID: <200608251312.k7PDCCWa016042@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-date/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10687

Modified Files:
	system-config-date.spec 
Log Message:
hide 'Enable NTP Broadcast' checkbutton as more action is needed than a mere change in ntp.conf



Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- system-config-date.spec	17 Jul 2006 11:38:15 -0000	1.52
+++ system-config-date.spec	25 Aug 2006 13:12:07 -0000	1.53
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.8.4
+Version: 1.8.5
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -98,6 +98,10 @@
 %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template
 
 %changelog
+* Fri Aug 25 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.5
+- hide 'Enable NTP Broadcast' checkbutton as more action is needed than a mere
+  change in ntp.conf
+
 * Mon Jul 17 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.4
 - pick up updated translations
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 13:42:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 09:42:38 -0400
Subject: rpms/system-config-date/devel .cvsignore, 1.43, 1.44 sources, 1.46,
	1.47
Message-ID: <200608251342.k7PDgcUX021040@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-date/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20914

Modified Files:
	.cvsignore sources 
Log Message:
hide 'Enable NTP Broadcast' checkbutton as more action is needed than a mere change in ntp.conf



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	17 Jul 2006 13:04:39 -0000	1.43
+++ .cvsignore	25 Aug 2006 13:42:35 -0000	1.44
@@ -1 +1 @@
-system-config-date-1.8.4.tar.bz2
+system-config-date-1.8.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	17 Jul 2006 13:04:39 -0000	1.46
+++ sources	25 Aug 2006 13:42:35 -0000	1.47
@@ -1 +1 @@
-b8c5f608dbdd00c1bd40b39fde1c5a10  system-config-date-1.8.4.tar.bz2
+5fc6330e89e52919061a88941ebae09e  system-config-date-1.8.5.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 25 14:20:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 10:20:19 -0400
Subject: rpms/libsepol/devel libsepol.spec,1.140,1.141
Message-ID: <200608251420.k7PEKJ0b029875@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29843

Modified Files:
	libsepol.spec 
Log Message:
* Fri Aug 25 2006 Dan Walsh <dwalsh at redhat.com> 1.12.25-2
- Remove invalid Requires 



Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- libsepol.spec	24 Aug 2006 22:30:08 -0000	1.140
+++ libsepol.spec	25 Aug 2006 14:20:16 -0000	1.141
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 1.12.25
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -9,8 +9,6 @@
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Provides: libsepol.so
-# Next item is because of selinux_file_context_local_path
-Requires: libselinux >= 1.30.26
 
 %description
 Security-enhanced Linux is a feature of the Linux?? kernel and a number
@@ -87,6 +85,9 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Fri Aug 25 2006 Dan Walsh <dwalsh at redhat.com> 1.12.25-2
+- Remove invalid Requires 
+
 * Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 1.12.25-1
 - Upgrade to latest from NSA
 	* Merged conditionally expand neverallows patch from Jeremy Mowery.



From fedora-cvs-commits at redhat.com  Fri Aug 25 14:26:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 10:26:19 -0400
Subject: rpms/cups/FC-5 cups.spec,1.212,1.213
Message-ID: <200608251426.k7PEQIDZ031774@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31730

Modified Files:
	cups.spec 
Log Message:
1:1.2.2-1.9


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- cups.spec	24 Aug 2006 16:18:46 -0000	1.212
+++ cups.spec	25 Aug 2006 14:26:15 -0000	1.213
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 1.8
+Release: 1.9
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -415,7 +415,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
+* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.9
 - Updated fix for STR #1881 from upstream.
 
 * Fri Aug 18 2006 Tim Waugh <twaugh at redhat.com>



From fedora-cvs-commits at redhat.com  Fri Aug 25 14:29:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 10:29:32 -0400
Subject: rpms/gcc/devel gcc41-pr28683.patch, NONE, 1.1 .cvsignore, 1.166,
	1.167 gcc41.spec, 1.96, 1.97 sources, 1.168,
	1.169 gcc41-java-pr13212.patch, 1.2, NONE
Message-ID: <200608251429.k7PETWub000464@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv427

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-pr28683.patch 
Removed Files:
	gcc41-java-pr13212.patch 
Log Message:
4.1.1-19

gcc41-pr28683.patch:
 cfgexpand.c                                  |    2 ++
 testsuite/gcc.c-torture/compile/20060823-1.c |   18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

--- NEW FILE gcc41-pr28683.patch ---
2006-08-23  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/28683
	* cfgexpand.c (add_reg_br_prob_note): Check if last has exactly
	3 following insns.

	* gcc.c-torture/compile/20060823-1.c: New test.

--- gcc/testsuite/gcc.c-torture/compile/20060823-1.c.jj	2006-08-23 19:35:53.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/compile/20060823-1.c	2006-08-23 19:37:34.000000000 +0200
@@ -0,0 +1,18 @@
+/* PR middle-end/28683 */
+
+extern void foo (int *);
+
+struct A
+{
+  int f;
+};
+
+struct A *
+test (struct A *r)
+{
+  int *f = &r->f;
+  static int i = 0;
+  if (!i && !((void *) f == (void *) r))
+    foo (&i);
+  return r;
+}
--- gcc/cfgexpand.c.jj	2006-08-23 18:31:24.000000000 +0200
+++ gcc/cfgexpand.c	2006-08-23 19:24:30.000000000 +0200
@@ -58,7 +58,9 @@ add_reg_br_prob_note (rtx last, int prob
 	if (!any_condjump_p (last)
 	    || !JUMP_P (NEXT_INSN (last))
 	    || !simplejump_p (NEXT_INSN (last))
+	    || !NEXT_INSN (NEXT_INSN (last))
 	    || !BARRIER_P (NEXT_INSN (NEXT_INSN (last)))
+	    || !NEXT_INSN (NEXT_INSN (NEXT_INSN (last)))
 	    || !LABEL_P (NEXT_INSN (NEXT_INSN (NEXT_INSN (last))))
 	    || NEXT_INSN (NEXT_INSN (NEXT_INSN (NEXT_INSN (last)))))
 	  goto failed;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- .cvsignore	18 Aug 2006 07:38:36 -0000	1.166
+++ .cvsignore	25 Aug 2006 14:29:29 -0000	1.167
@@ -1 +1 @@
-gcc-4.1.1-20060818.tar.bz2
+gcc-4.1.1-20060825.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gcc41.spec	18 Aug 2006 07:38:36 -0000	1.96
+++ gcc41.spec	25 Aug 2006 14:29:29 -0000	1.97
@@ -1,6 +1,6 @@
-%define DATE 20060818
+%define DATE 20060825
 %define gcc_version 4.1.1
-%define gcc_release 18
+%define gcc_release 19
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -121,7 +121,7 @@
 Patch14: gcc41-pr21764.patch
 Patch15: gcc41-pr21581.patch
 Patch16: gcc41-pr20297-test.patch
-Patch17: gcc41-java-pr13212.patch
+Patch17: gcc41-pr28683.patch
 Patch18: gcc41-objc-rh185398.patch
 Patch19: gcc41-tests.patch
 Patch20: gcc41-ppc64-ldouble-stdarg.patch
@@ -443,7 +443,7 @@
 %patch14 -p0 -b .pr21764~
 #%patch15 -p0 -b .pr21581~
 %patch16 -p0 -E -b .pr20297-test~
-%patch17 -p0 -b .java-pr13212~
+%patch17 -p0 -b .pr28683~
 %patch18 -p0 -b .objc-rh185398~
 %patch19 -p0 -b .tests~
 %patch20 -p0 -b .ppc64-ldouble-stdarg~
@@ -1528,6 +1528,16 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Aug 25 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-19
+- update from gcc-4_1-branch (-r116223:116389)
+  - PRs c++/23372, c++/27714, c++/28346, c++/28385, fortran/18111,
+	fortran/20886, fortran/25217, fortran/25828, fortran/28425,
+	fortran/28496, fortran/28601, fortran/28630, fortran/28660,
+	fortran/28735, fortran/28762, fortran/28771, fortran/28788,
+	libstdc++/28765, target/27565
+- another big Java merge from the trunk (Tom Fitzsimmons)
+- fix ICE in add_reg_br_prob_note (PR middle-end/28683)
+
 * Fri Aug 18 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-18
 - update from gcc-4_1-branch (-r116176:116223)
   - PRs c++/28593, c++/28606, c++/28710, c/27697, middle-end/20256,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- sources	18 Aug 2006 07:38:36 -0000	1.168
+++ sources	25 Aug 2006 14:29:29 -0000	1.169
@@ -1 +1 @@
-6c13068f0da00ac2e7fcef129cc6e555  gcc-4.1.1-20060818.tar.bz2
+f269c8fb24478179193fe3421da65c62  gcc-4.1.1-20060825.tar.bz2


--- gcc41-java-pr13212.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 25 15:17:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 11:17:25 -0400
Subject: rpms/a2ps/devel a2ps.spec,1.39,1.40
Message-ID: <200608251517.k7PFHP1e002123@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1697

Modified Files:
	a2ps.spec 
Log Message:
* Fri Aug 25 2006 Tim Waugh <twaugh at redhat.com>
- Build requires groff.



Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- a2ps.spec	25 Aug 2006 11:50:31 -0000	1.39
+++ a2ps.spec	25 Aug 2006 15:17:23 -0000	1.40
@@ -36,7 +36,7 @@
 Patch28: a2ps-wdiff.patch
 Patch29: a2ps-U.patch
 Requires: fileutils sh-utils info
-BuildRequires: /usr/bin/emacs, gperf, flex, libtool, texinfo
+BuildRequires: /usr/bin/emacs, gperf, flex, libtool, texinfo, groff
 Url: http://www.inf.enst.fr/~demaille/a2ps/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: psutils
@@ -232,6 +232,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Fri Aug 25 2006 Tim Waugh <twaugh at redhat.com>
+- Build requires groff.
+
 * Fri Aug 25 2006 Tim Waugh <twaugh at redhat.com> 4.13b-55
 - Use better manifest flags for fonts.map.
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 15:27:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 11:27:14 -0400
Subject: rpms/pyxf86config/devel .cvsignore, 1.19, 1.20 pyxf86config.spec,
	1.34, 1.35 sources, 1.19, 1.20
Message-ID: <200608251527.k7PFREQl012684@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/pyxf86config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12637/devel

Modified Files:
	.cvsignore pyxf86config.spec sources 
Log Message:
auto-import pyxf86config-0.3.30-1.fc6 on branch devel from pyxf86config-0.3.30-1.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	23 Aug 2006 16:04:44 -0000	1.19
+++ .cvsignore	25 Aug 2006 15:27:11 -0000	1.20
@@ -1 +1 @@
-pyxf86config-0.3.29.tar.gz
+pyxf86config-0.3.30.tar.gz


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pyxf86config.spec	23 Aug 2006 16:04:44 -0000	1.34
+++ pyxf86config.spec	25 Aug 2006 15:27:11 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
-Version: 0.3.29
+Version: 0.3.30
 Release: 1%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Fri Aug 25 2006 Adam Jackson <ajackson at redhat.com> 0.3.30-1.fc6
+- Remove a stray reference to XFree86.
+
 * Wed Aug 23 2006 Adam Jackson <ajackson at redhat.com> 0.3.29-1.fc6
 - Default depth of 24.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	23 Aug 2006 16:04:45 -0000	1.19
+++ sources	25 Aug 2006 15:27:11 -0000	1.20
@@ -1 +1 @@
-c0f6cd9e2e3f8c00017c6215e5e6c37f  pyxf86config-0.3.29.tar.gz
+bc772818b8de7149fc27a695f24a7d25  pyxf86config-0.3.30.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 25 15:41:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 11:41:41 -0400
Subject: rpms/numactl/devel numactl.spec,1.33,1.34
Message-ID: <200608251541.k7PFff5R015882@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/numactl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15852

Modified Files:
	numactl.spec 
Log Message:
splitting out devel headers to devel pacakge]


Index: numactl.spec
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- numactl.spec	15 Aug 2006 14:18:47 -0000	1.33
+++ numactl.spec	25 Aug 2006 15:41:38 -0000	1.34
@@ -17,6 +17,15 @@
 other programs with a specific NUMA policy and a libnuma to do
 allocations with NUMA policy in applications.
 
+%package devel
+Summary: Development package for building Applications that use numa
+Group: System Environment/Libraries
+AutoReqProv: no
+Provides: numactl-devel 
+
+%description devel
+Provides development headers for numa library calls
+
 %prep
 %setup -q -c -a 0
 %patch1
@@ -46,8 +55,6 @@
 
 %files
 %defattr(-,root,root,-)
-%{_includedir}/numa.h
-%{_includedir}/numaif.h
 %{_libdir}/libnuma.so.1
 %{_libdir}/libnuma.so
 %{_bindir}/numactl
@@ -55,11 +62,19 @@
 %{_bindir}/numastat
 %{_bindir}/memhog
 %{_bindir}/migratepages
-%{_mandir}/man3/*.3*
 %{_mandir}/man5/*.5*
 %{_mandir}/man8/*.8*
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/numa.h
+%{_includedir}/numaif.h
+%{_mandir}/man3/*.3*
+
 %changelog
+* Fri Aug 25 2006 Neil Horman <nhorman at redhat.com> - 0.9.8-1.34
+- split out headers/devel man pages to a devel subpackage
+
 * Tue Aug 15 2006 Neil Horman <nhorman at redhat.com> - 0.9.8-1.32
 - add patch for broken cpu/nodebind output (bz 201906)
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 15:53:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 11:53:00 -0400
Subject: rpms/gimp/devel gimp.spec,1.109,1.110
Message-ID: <200608251553.k7PFr0nV002386@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2248

Modified Files:
	gimp.spec 
Log Message:
version 2.2.13



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- gimp.spec	17 Aug 2006 10:07:23 -0000	1.109
+++ gimp.spec	25 Aug 2006 15:52:57 -0000	1.110
@@ -29,14 +29,14 @@
 
 Summary:	GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.12
+Version: 	2.2.13
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
 %define age 0
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release: 5%{?dist}
+Release: 1%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -402,6 +402,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Aug 25 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.13-1
+- version 2.2.13
+
 * Thu Aug 17 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-5
 - don't barf on empty /etc/gimp/plugins.d (#202808)
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 16:02:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 12:02:54 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.30, 1.31 setroubleshoot.spec,
	1.36, 1.37 sources, 1.33, 1.34
Message-ID: <200608251602.k7PG2sRX005302@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5270/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.37-1 on branch devel from setroubleshoot-0.37-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	25 Aug 2006 01:57:18 -0000	1.30
+++ .cvsignore	25 Aug 2006 16:02:42 -0000	1.31
@@ -1 +1 @@
-setroubleshoot-0.36.tar.gz
+setroubleshoot-0.37.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- setroubleshoot.spec	25 Aug 2006 01:57:18 -0000	1.36
+++ setroubleshoot.spec	25 Aug 2006 16:02:42 -0000	1.37
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.36
+Version: 0.37
 Release: 1
 License: GPL
 Group: Applications/System
@@ -107,6 +107,9 @@
 %{_datadir}/dbus-1/services/sealert.service
 
 %changelog
+* Fri Aug 25 2006 Dan Walsh <dwalsh at redhat.com> - 0.37-1
+- Add back in the status icon
+
 * Thu Aug 24 2006 John Dennis <jdennis at redhat.com> - 0.36-1
 
 - change dbclear trigger to 0.35


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	25 Aug 2006 01:57:18 -0000	1.33
+++ sources	25 Aug 2006 16:02:42 -0000	1.34
@@ -1 +1 @@
-fd7a2e066448afdcb6e510ddbaee24b8  setroubleshoot-0.36.tar.gz
+69dbdc8fa4d989426bc01d681ebd08de  setroubleshoot-0.37.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 25 16:08:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 12:08:48 -0400
Subject: rpms/kdewebdev/devel hi48-app-kxsldbg.png, NONE, 1.1 kdewebdev.spec,
	1.35, 1.36
Message-ID: <200608251608.k7PG8mHt006505@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6416

Modified Files:
	kdewebdev.spec 
Added Files:
	hi48-app-kxsldbg.png 
Log Message:
fix #203893, add missing icon for kxsldbg




Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kdewebdev.spec	10 Aug 2006 16:21:12 -0000	1.35
+++ kdewebdev.spec	25 Aug 2006 16:08:45 -0000	1.36
@@ -2,15 +2,13 @@
 %define final 0
 %define make_cvs 1
 
-%define arts 1
-
 %define qt_version 3.3.6
 %define kde_version 3.5.4
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -19,13 +17,15 @@
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: http://download.sourceforge.net/quanta/css.tar.bz2
 Source2: http://download.sourceforge.net/quanta/html.tar.bz2
 Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
 Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
+Source5: hi48-app-kxsldbg.png
 
-Patch1: javascript.patch
+Patch0: javascript.patch
+Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -62,11 +62,14 @@
 
 %prep
 %setup -q -a 1 -a 2 -a 3 -a 4
-%patch1 -p0 -b .javascript
+%patch0 -p0 -b .javascript
+%patch1 -p1 -b .kxsldbg-icons
 
 %build
 QTDIR="" && . /etc/profile.d/qt.sh
 
+cp %{SOURCE5} kxsldbg/
+
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -76,9 +79,6 @@
    --disable-dependency-tracking \
    --disable-rpath \
    --disable-gcc-hidden-visibility \
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -138,9 +138,10 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog NEWS README
 %doc %{_docdir}/HTML/en/*
 %{_bindir}/*
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
 %{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_datadir}/applications/kde/*
@@ -154,9 +155,13 @@
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/*.so
 %{_includedir}/*
 
 %changelog
+* Fri Aug 25 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
+- fix #203893, add missing icon for kxsldbg
+
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 16:19:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 12:19:33 -0400
Subject: rpms/gimp/devel .cvsignore,1.27,1.28 sources,1.27,1.28
Message-ID: <200608251619.k7PGJXAg023793@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13287

Modified Files:
	.cvsignore sources 
Log Message:
version 2.2.13



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	10 Jul 2006 09:55:29 -0000	1.27
+++ .cvsignore	25 Aug 2006 16:19:30 -0000	1.28
@@ -1 +1 @@
-gimp-2.2.12.tar.bz2
+gimp-2.2.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	10 Jul 2006 09:55:29 -0000	1.27
+++ sources	25 Aug 2006 16:19:30 -0000	1.28
@@ -1 +1 @@
-6a1906db60166a88317f2df5f195a57d  gimp-2.2.12.tar.bz2
+d84a4a476a0c4fae24602db67f6fe49a  gimp-2.2.13.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 25 16:24:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 12:24:39 -0400
Subject: rpms/gimp/devel gimp.spec,1.110,1.111
Message-ID: <200608251624.k7PGOdHo001854@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1841

Modified Files:
	gimp.spec 
Log Message:
remove obsolete filename patch



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- gimp.spec	25 Aug 2006 15:52:57 -0000	1.110
+++ gimp.spec	25 Aug 2006 16:24:36 -0000	1.111
@@ -97,7 +97,6 @@
 Patch4:		gimp-2.2.4-gifload.patch
 Patch5:     gimp-2.2.11-htmlview.patch
 Patch6:     gimp-2.2.11-gimptool.patch
-Patch7:     gimp-2.2.12-filename.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -152,7 +151,6 @@
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
-%patch7 -p1 -b .filename
 
 %build
 libtoolize --copy --force
@@ -404,6 +402,7 @@
 %changelog
 * Fri Aug 25 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.13-1
 - version 2.2.13
+- remove obsolete filename patch
 
 * Thu Aug 17 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-5
 - don't barf on empty /etc/gimp/plugins.d (#202808)



From fedora-cvs-commits at redhat.com  Fri Aug 25 17:16:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 13:16:07 -0400
Subject: rpms/shared-mime-info/devel .cvsignore, 1.11,
	1.12 shared-mime-info.spec, 1.44, 1.45 sources, 1.11,
	1.12 shared-mime-info-0.16-fonts.patch, 1.2,
	NONE shared-mime-info-0.17-pdf.patch, 1.1,
	NONE shared-mime-info-0.17-postscript.patch, 1.1, NONE
Message-ID: <200608251716.k7PHG71a029095@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29070

Modified Files:
	.cvsignore shared-mime-info.spec sources 
Removed Files:
	shared-mime-info-0.16-fonts.patch 
	shared-mime-info-0.17-pdf.patch 
	shared-mime-info-0.17-postscript.patch 
Log Message:
* Fri Aug 25 2006 Christopher Aillon <caillon at redhat.com> - 0.19-1
- Update to 0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Jul 2006 04:38:48 -0000	1.11
+++ .cvsignore	25 Aug 2006 17:16:04 -0000	1.12
@@ -1 +1 @@
-shared-mime-info-0.18.tar.gz
+shared-mime-info-0.19.tar.gz


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- shared-mime-info.spec	26 Jul 2006 17:27:28 -0000	1.44
+++ shared-mime-info.spec	25 Aug 2006 17:16:04 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
-Version: 0.18
-Release: 2
+Version: 0.19
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -9,8 +9,6 @@
 Source1: defaults.list
 
 Patch0: shared-mime-info-0.16-cisco-vpn.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=4675 
-Patch1: shared-mime-info-0.16-fonts.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  libxml2-devel
@@ -30,27 +28,26 @@
 %prep
 %setup -q
 %patch0 -p0 -b .cisco-vpn
-%patch1 -p1 -b .fonts
 %build
 
 %configure --disable-update-mimedb
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/applications
 install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
 
 ## remove these bogus files
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/locale/*
 
 %post 
 %{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
@@ -63,6 +60,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Aug 25 2006 Christopher Aillon <caillon at redhat.com> - 0.19-1
+- Update to 0.19
+
 * Wed Jul 26 2006 Matthias Clasen <mclasen at redhat.com> - 0.18-2
 - add an inode/directory entry to defaults.list (#187021)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Jul 2006 04:38:48 -0000	1.11
+++ sources	25 Aug 2006 17:16:04 -0000	1.12
@@ -1 +1 @@
-63398294a078dd9f72a7c4e122a668c8  shared-mime-info-0.18.tar.gz
+056a86a8245aecfd9c80740380c5265a  shared-mime-info-0.19.tar.gz


--- shared-mime-info-0.16-fonts.patch DELETED ---


--- shared-mime-info-0.17-pdf.patch DELETED ---


--- shared-mime-info-0.17-postscript.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 25 17:18:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 13:18:28 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2586,1.2587
Message-ID: <200608251718.k7PHIRDW000423@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32033

Modified Files:
	kernel-2.6.spec 
Log Message:
Enable i386 for olpc so that we get kernel-headers



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2586
retrieving revision 1.2587
diff -u -r1.2586 -r1.2587
--- kernel-2.6.spec	24 Aug 2006 12:32:41 -0000	1.2586
+++ kernel-2.6.spec	25 Aug 2006 17:18:24 -0000	1.2587
@@ -209,7 +209,7 @@
 Version: %{rpmversion}
 Release: %{release}
 %if 0%{?olpc}
-ExclusiveArch: i686
+ExclusiveArch: i386 i686
 %else
 # DO NOT CHANGE THIS LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %nobuildarches (ABOVE) INSTEAD
@@ -1751,6 +1751,9 @@
 %endif
 
 %changelog
+* Fri Aug 25 2006 Jesse Keating <jkeating at redhat.com>
+- Enable i386 for olpc so that kernel-headers is built
+
 * Thu Aug 24 2006 David Woodhouse <dwmw2 at redhat.com>
 - Update GFS2 patch (from swhiteho)
 - Enable kernel-headers build



From fedora-cvs-commits at redhat.com  Fri Aug 25 17:32:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 13:32:16 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch, 1.19,
	1.20 selinux-policy.spec, 1.258, 1.259
Message-ID: <200608251732.k7PHWGFV016192@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16168

Modified Files:
	policy-20060802.patch selinux-policy.spec 
Log Message:
* Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-4
- Set /usr/lib/ia32el/ia32x_loader to unconfined_execmem_exec_t for ia32 platform
- Fix spec for /dev/adsp


policy-20060802.patch:
 mls                                  |    9 
 modules/admin/amanda.fc              |   51 ----
 modules/admin/anaconda.te            |   20 +
 modules/admin/bootloader.te          |    4 
 modules/admin/consoletype.te         |   11 -
 modules/admin/firstboot.te           |    2 
 modules/admin/prelink.te             |    2 
 modules/admin/rpm.fc                 |    2 
 modules/admin/rpm.if                 |   13 -
 modules/admin/usermanage.te          |    5 
 modules/apps/java.fc                 |    9 
 modules/apps/mozilla.if              |    2 
 modules/apps/wine.te                 |    2 
 modules/kernel/corecommands.fc       |    1 
 modules/kernel/corecommands.if       |    1 
 modules/kernel/corenetwork.te.in     |    7 
 modules/kernel/devices.fc            |    4 
 modules/kernel/devices.if            |   36 +++
 modules/kernel/devices.te            |    8 
 modules/kernel/files.if              |   18 +
 modules/kernel/filesystem.te         |    2 
 modules/kernel/kernel.if             |   75 +++++++
 modules/kernel/terminal.fc           |    2 
 modules/kernel/terminal.if           |   19 +
 modules/services/amavis.te           |    7 
 modules/services/apache.te           |    2 
 modules/services/avahi.te            |    2 
 modules/services/bind.te             |    1 
 modules/services/ccs.fc              |    8 
 modules/services/ccs.if              |   45 ++++
 modules/services/ccs.te              |   84 +++++++
 modules/services/cpucontrol.te       |    2 
 modules/services/cron.if             |   17 +
 modules/services/cron.te             |    7 
 modules/services/cups.te             |   19 +
 modules/services/cyrus.te            |    5 
 modules/services/dbus.if             |    6 
 modules/services/dbus.te             |    2 
 modules/services/dovecot.te          |    4 
 modules/services/inn.te              |    1 
 modules/services/ldap.te             |    2 
 modules/services/mta.fc              |    2 
 modules/services/ntp.te              |    6 
 modules/services/oddjob.fc           |    8 
 modules/services/oddjob.if           |   76 +++++++
 modules/services/oddjob.te           |   70 ++++++
 modules/services/oddjob_mkhomedir.fc |    6 
 modules/services/oddjob_mkhomedir.if |   24 ++
 modules/services/oddjob_mkhomedir.te |   26 ++
 modules/services/openvpn.te          |    2 
 modules/services/pegasus.if          |   31 ++
 modules/services/pegasus.te          |    5 
 modules/services/postfix.te          |    7 
 modules/services/postgresql.te       |    1 
 modules/services/procmail.te         |    1 
 modules/services/pyzor.te            |    1 
 modules/services/radius.te           |    2 
 modules/services/ricci.fc            |   20 +
 modules/services/ricci.if            |  184 +++++++++++++++++
 modules/services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++
 modules/services/rpc.if              |    2 
 modules/services/rpc.te              |    6 
 modules/services/samba.te            |    8 
 modules/services/setroubleshoot.fc   |    9 
 modules/services/setroubleshoot.if   |    3 
 modules/services/setroubleshoot.te   |  111 ++++++++++
 modules/services/spamassassin.te     |    4 
 modules/services/squid.te            |    4 
 modules/services/ssh.if              |   24 ++
 modules/services/stunnel.te          |    2 
 modules/services/sysstat.te          |    3 
 modules/services/xserver.if          |   69 ++++++
 modules/services/xserver.te          |   19 +
 modules/system/authlogin.te          |   10 
 modules/system/fstools.te            |    1 
 modules/system/hostname.te           |   10 
 modules/system/init.if               |    7 
 modules/system/init.te               |    2 
 modules/system/libraries.fc          |    7 
 modules/system/locallogin.te         |    4 
 modules/system/logging.fc            |    3 
 modules/system/logging.if            |   21 +
 modules/system/logging.te            |    3 
 modules/system/lvm.fc                |    2 
 modules/system/lvm.te                |    6 
 modules/system/miscfiles.fc          |    1 
 modules/system/miscfiles.if          |   18 +
 modules/system/modutils.te           |    1 
 modules/system/mount.te              |    9 
 modules/system/selinuxutil.te        |   13 +
 modules/system/udev.fc               |    1 
 modules/system/udev.te               |    5 
 modules/system/unconfined.fc         |    1 
 modules/system/unconfined.if         |    2 
 modules/system/unconfined.te         |    5 
 modules/system/userdomain.if         |  246 +++++++++++++++--------
 modules/system/userdomain.te         |   48 ++--
 modules/system/xen.if                |   38 +++
 modules/system/xen.te                |   26 +-
 99 files changed, 1869 insertions(+), 249 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- policy-20060802.patch	24 Aug 2006 20:53:40 -0000	1.19
+++ policy-20060802.patch	25 Aug 2006 17:32:13 -0000	1.20
@@ -383,7 +383,16 @@
  network_port(spamd, tcp,783,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.9/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.9/policy/modules/kernel/devices.fc	2006-08-24 16:51:53.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/devices.fc	2006-08-25 10:04:00.000000000 -0400
+@@ -3,7 +3,7 @@
+ /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)
++/dev/adsp.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/(misc/)?agpgart	-c	gen_context(system_u:object_r:agp_device_t,s0)
+ /dev/aload.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/amidi.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
 @@ -36,7 +36,7 @@
  /dev/mpu401.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/null		-c	gen_context(system_u:object_r:null_device_t,s0)
@@ -3048,6 +3057,15 @@
 +optional_policy(`
  	xserver_read_xdm_pid(udev_t)
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.9/policy/modules/system/unconfined.fc
+--- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/system/unconfined.fc	2006-08-25 13:25:45.000000000 -0400
+@@ -10,4 +10,5 @@
+ /usr/local/RealPlay/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ /usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ /usr/bin/xine		 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/lib/ia32el/ia32x_loader 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.9/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/unconfined.if	2006-08-24 08:04:23.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- selinux-policy.spec	24 Aug 2006 20:53:40 -0000	1.258
+++ selinux-policy.spec	25 Aug 2006 17:32:13 -0000	1.259
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.9
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,6 +347,10 @@
 %endif
 
 %changelog
+* Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-4
+- Set /usr/lib/ia32el/ia32x_loader to unconfined_execmem_exec_t for ia32 platform
+- Fix spec for /dev/adsp
+
 * Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-3
 - Fix xen tty devices
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 17:33:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 13:33:50 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.33, 1.34 rhpxl.spec, 1.38,
	1.39 sources, 1.36, 1.37
Message-ID: <200608251733.k7PHXoaX016473@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16430/devel

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
auto-import rhpxl-0.32-1 on branch devel from rhpxl-0.32-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	23 Aug 2006 15:48:17 -0000	1.33
+++ .cvsignore	25 Aug 2006 17:33:48 -0000	1.34
@@ -1 +1 @@
-rhpxl-0.31.tar.gz
+rhpxl-0.32.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- rhpxl.spec	23 Aug 2006 15:48:17 -0000	1.38
+++ rhpxl.spec	25 Aug 2006 17:33:48 -0000	1.39
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.31
+Version: 0.32
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,11 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Fri Aug 25 2006 Jeremy Katz <katzj at redhat.com> - 0.32-1
+- Probe all buses for video cards
+- Only do PCI bits for PCI video cards
+- Another place to fix the default depth
+
 * Wed Aug 23 2006 Adam Jackson <ajackson at redhat.com> 0.31-1
 - Default depth of 24.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	23 Aug 2006 15:48:17 -0000	1.36
+++ sources	25 Aug 2006 17:33:48 -0000	1.37
@@ -1 +1 @@
-91e3956de53321d83378e3be556a22fc  rhpxl-0.31.tar.gz
+8fd385f54e46e950261b13369a5c97ee  rhpxl-0.32.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 25 17:35:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 13:35:20 -0400
Subject: rpms/shared-mime-info/devel shared-mime-info.spec,1.45,1.46
Message-ID: <200608251735.k7PHZKb8016812@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16784

Modified Files:
	shared-mime-info.spec 
Log Message:
fix buildrequires


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- shared-mime-info.spec	25 Aug 2006 17:16:04 -0000	1.45
+++ shared-mime-info.spec	25 Aug 2006 17:35:17 -0000	1.46
@@ -13,6 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  libxml2-devel
 BuildRequires:  glib2-devel
+BuildRequires:  gettext
 # For intltool:
 BuildRequires: perl-XML-Parser >= 2.31-16
 Requires: libxml2 glib2



From fedora-cvs-commits at redhat.com  Fri Aug 25 17:41:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 13:41:36 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.126, 1.127 kudzu.spec, 1.144,
	1.145 sources, 1.142, 1.143
Message-ID: <200608251741.k7PHfaAj018206@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18159/devel

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
auto-import kudzu-1.2.47-1 on branch devel from kudzu-1.2.47-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- .cvsignore	24 Aug 2006 20:56:35 -0000	1.126
+++ .cvsignore	25 Aug 2006 17:41:34 -0000	1.127
@@ -1 +1 @@
-kudzu-1.2.46.tar.gz
+kudzu-1.2.47.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- kudzu.spec	24 Aug 2006 20:56:35 -0000	1.144
+++ kudzu.spec	25 Aug 2006 17:41:34 -0000	1.145
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.46
+Version: 1.2.47
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -74,6 +74,14 @@
 %{_includedir}/kudzu
 
 %changelog
+* Fri Aug 25 2006 Jeremy Katz <katzj at redhat.com> - 1.2.47-1
+- Fix the Xen console stuff to work properly with the PV framebuffer too
+- Add support for probing xenfb as a video device
+
+* Thu Aug 24 2006 Bill Nottingham <notting at redhat.com>
+- use the sysfs serial list rather than iterating over ttyS0-3 (#64899, #195635)
+  - ergo, remove pciserial code
+
 * Thu Aug 24 2006 Jeremy Katz <katzj at redhat.com> - 1.2.46-1
 - Xen console support
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- sources	24 Aug 2006 20:56:35 -0000	1.142
+++ sources	25 Aug 2006 17:41:34 -0000	1.143
@@ -1 +1 @@
-cf1e5c4cbda49f7900585bdd17e3443c  kudzu-1.2.46.tar.gz
+cc2f287012a0bf3a2d12da2c39283f0e  kudzu-1.2.47.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 25 17:43:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 13:43:08 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2519.4.14,1.2519.4.15
Message-ID: <200608251743.k7PHh8EB018845@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18754

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Log Message:
forgot to turn on kern headers




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.14
retrieving revision 1.2519.4.15
diff -u -r1.2519.4.14 -r1.2519.4.15
--- kernel-2.6.spec	24 Aug 2006 23:21:29 -0000	1.2519.4.14
+++ kernel-2.6.spec	25 Aug 2006 17:43:05 -0000	1.2519.4.15
@@ -12,7 +12,7 @@
 %define buildxen 1
 %define builddoc 0
 %define buildkdump 1
-%define buildheaders 0
+%define buildheaders 1
 
 # Versions of various parts
 
@@ -1775,6 +1775,9 @@
 %endif
 
 %changelog
+* Fri Aug 25 2006 Don Zickus <dzickus at redhat.com>
+- really turn on building kernel headers
+
 * Thu Aug 24 2006 Don Zickus <dzickus at redhat.com>
 - added #203435/203657 - GFS2 DLM updates (Steven Whitehouse)
 - added #202993 - Inconsistent directory structure (Juan Quintela)



From fedora-cvs-commits at redhat.com  Fri Aug 25 17:52:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 13:52:16 -0400
Subject: rpms/struts/devel struts.spec,1.42,1.43
Message-ID: <200608251752.k7PHqGwR004892@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4843

Modified Files:
	struts.spec 
Log Message:

Fix requirements




Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- struts.spec	23 Aug 2006 23:11:34 -0000	1.42
+++ struts.spec	25 Aug 2006 17:52:13 -0000	1.43
@@ -51,7 +51,7 @@
 
 Name:		struts
 Version:	1.2.9
-Release:	3jpp.1
+Release:	4jpp.1
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -71,11 +71,11 @@
 Url:		http://struts.apache.org/
 Requires:	servletapi5
 Requires:	jdbc-stdext
-Requires:	jakarta-commons-beanutils
-Requires:	jakarta-commons-digester
-Requires:	jakarta-commons-fileupload
-Requires:	jakarta-commons-validator
-Requires:	oro
+PreReq:		jakarta-commons-beanutils
+PreReq:		jakarta-commons-digester
+PreReq:		jakarta-commons-fileupload
+PreReq:		jakarta-commons-validator
+PreReq:		oro
 BuildRequires:	jpackage-utils >= 1.6
 BuildRequires:	ant >= 1.6
 BuildRequires:	antlr
@@ -152,6 +152,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -222,6 +224,8 @@
 %package chain-javadoc
 Summary:        Javadoc for %{name}-chain
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description chain-javadoc
 %{summary}.
@@ -229,8 +233,8 @@
 %package chain-webapps-tomcat5
 Summary:        Sample %{name} chain adapter webapps for tomcat5
 Group:          Development/Java
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-chain = %{version}-%{release}
+PreReq:         %{name} = %{version}-%{release}
+PreReq:         %{name}-chain = %{version}-%{release}
 Prereq:         tomcat5
 Prereq:         jakarta-commons-chain
 
@@ -269,6 +273,8 @@
 %package el-javadoc
 Summary:        Javadoc for %{name}-el
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description el-javadoc
 %{summary}.
@@ -276,8 +282,8 @@
 %package el-webapps-tomcat5
 Summary:        Sample %{name} EL extension webapps for tomcat5
 Group:          Development/Java
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-el = %{version}-%{release}
+PreReq:         %{name} = %{version}-%{release}
+PreReq:         %{name}-el = %{version}-%{release}
 Prereq:         tomcat5
 Prereq:         jakarta-taglibs-standard
 
@@ -312,6 +318,8 @@
 %package faces-javadoc
 Summary:        Javadoc for %{name}-faces
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description faces-javadoc
 %{summary}.
@@ -319,10 +327,11 @@
 %package faces-webapps-tomcat5
 Summary:        Sample %{name}-faces integration webapps for tomcat5
 Group:          Development/Java
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-faces = %{version}-%{release}
+PreReq:         %{name} = %{version}-%{release}
+PreReq:         %{name}-faces = %{version}-%{release}
 Prereq:         tomcat5
 Prereq:         myfaces
+PreReq:         jakarta-commons-collections
 
 %description faces-webapps-tomcat5
 %{summary}.
@@ -975,6 +984,9 @@
 
 
 %changelog
+* Fri Aug 25 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.9-4jpp.1
+- Fix requirements
+
 * Tue Aug 22 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.2.9-3jpp.1
 - Merge with upstream for upgrade to 1.2.9
 - Use symlinks instead of actual files in WEB-INF/lib folders



From fedora-cvs-commits at redhat.com  Fri Aug 25 18:28:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 14:28:50 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.49, 1.50 gnome-utils.spec,
	1.127, 1.128 sources, 1.53, 1.54
Message-ID: <200608251828.k7PISomC030490@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30419

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.15.94



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	21 Aug 2006 13:25:22 -0000	1.49
+++ .cvsignore	25 Aug 2006 18:28:48 -0000	1.50
@@ -1 +1 @@
-gnome-utils-2.15.93.tar.bz2
+gnome-utils-2.15.94.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- gnome-utils.spec	21 Aug 2006 13:25:22 -0000	1.127
+++ gnome-utils.spec	25 Aug 2006 18:28:48 -0000	1.128
@@ -9,7 +9,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.15.93
+Version:        2.15.94
 Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
@@ -227,8 +227,11 @@
 
 
 %changelog
+* Fri Aug 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.94-1.fc6
+- Update to 2.15.94
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.93-1.fc6
-- Update to 2.115.93
+- Update to 2.15.93
 - Require pkgconfig in the devel package
 
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	21 Aug 2006 13:25:22 -0000	1.53
+++ sources	25 Aug 2006 18:28:48 -0000	1.54
@@ -1 +1 @@
-8e2b3cf3599a56a6d3a5247aade7b5a2  gnome-utils-2.15.93.tar.bz2
+e9f22a7fb3a7a89380fede42dbb3d97b  gnome-utils-2.15.94.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 25 18:42:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 14:42:24 -0400
Subject: rpms/numactl/devel numactl.spec,1.34,1.35
Message-ID: <200608251842.k7PIgONt001399@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/numactl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1363

Modified Files:
	numactl.spec 
Log Message:
updating numactl to put libnuma.so in -devel


Index: numactl.spec
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- numactl.spec	25 Aug 2006 15:41:38 -0000	1.34
+++ numactl.spec	25 Aug 2006 18:42:21 -0000	1.35
@@ -56,7 +56,6 @@
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libnuma.so.1
-%{_libdir}/libnuma.so
 %{_bindir}/numactl
 %{_bindir}/numademo
 %{_bindir}/numastat
@@ -67,11 +66,15 @@
 
 %files devel
 %defattr(-,root,root,-)
+%{_libdir}/libnuma.so
 %{_includedir}/numa.h
 %{_includedir}/numaif.h
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Aug 25 2006 Neil Horman <nhorman at redhat.com> - 0.9.8-1.35
+- moving over libnuma.so to -devel package as well
+
 * Fri Aug 25 2006 Neil Horman <nhorman at redhat.com> - 0.9.8-1.34
 - split out headers/devel man pages to a devel subpackage
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 18:46:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 14:46:58 -0400
Subject: rpms/gcc/devel gcc41.spec,1.97,1.98
Message-ID: <200608251846.k7PIkwpl002199@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2163

Modified Files:
	gcc41.spec 
Log Message:
4.1.1-19


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- gcc41.spec	25 Aug 2006 14:29:29 -0000	1.97
+++ gcc41.spec	25 Aug 2006 18:46:56 -0000	1.98
@@ -1415,10 +1415,9 @@
 %{_prefix}/%{_lib}/gcj-%{version}/libjvm.so
 %dir %{_prefix}/share/java
 %{_prefix}/share/java/[^s]*
-%dir %{_prefix}/lib/security
-%config(noreplace) %{_prefix}/lib/security/classpath.security
-%config(noreplace) %{_prefix}/lib/security/libgcj.security
-%{_prefix}/lib/logging.properties
+%dir %{_prefix}/%{_lib}/security
+%config(noreplace) %{_prefix}/%{_lib}/security/classpath.security
+%{_prefix}/%{_lib}/logging.properties
 %dir %{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_prefix}/%{_lib}/gcj-%{version}/classmap.db
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 18:48:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 14:48:03 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.128,1.129
Message-ID: <200608251848.k7PIm3D2005595@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4421

Modified Files:
	gnome-utils.spec 
Log Message:
fix build reqs



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- gnome-utils.spec	25 Aug 2006 18:28:48 -0000	1.128
+++ gnome-utils.spec	25 Aug 2006 18:48:00 -0000	1.129
@@ -36,6 +36,7 @@
 BuildRequires:	e2fsprogs-devel
 BuildRequires:  usermode
 BuildRequires:  gettext
+BuildRequires:  perl-XML-Parser
 
 Requires:	usermode
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 19:09:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 15:09:07 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.129,1.130
Message-ID: <200608251909.k7PJ97OA022325@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22262

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.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- gnome-utils.spec	25 Aug 2006 18:48:00 -0000	1.129
+++ gnome-utils.spec	25 Aug 2006 19:09:05 -0000	1.130
@@ -203,7 +203,7 @@
 %{_datadir}/pixmaps/gsearchtool/thumbnail_frame.png
 %{_datadir}/icons/hicolor/48x48/apps/baobab.png
 %{_datadir}/icons/hicolor/48x48/apps/gnome-dictionary.png
-%{_datadir}/icons/hicolor/scalable/gnome-dictionary.svg
+%{_datadir}/icons/hicolor/scalable/apps/gnome-dictionary.svg
 %{_libexecdir}/gnome-dictionary-applet
 %{_datadir}/gnome-2.0/ui/GNOME_DictionaryApplet.xml
 %{_libdir}/bonobo/servers/GNOME_DictionaryApplet.server



From fedora-cvs-commits at redhat.com  Fri Aug 25 19:16:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 15:16:56 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.147,1.148
Message-ID: <200608251916.k7PJGutu032001@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29822

Modified Files:
	gnome-panel.spec 
Log Message:
install omf files in the right location



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- gnome-panel.spec	22 Aug 2006 02:11:51 -0000	1.147
+++ gnome-panel.spec	25 Aug 2006 19:16:54 -0000	1.148
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.15.92
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 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
@@ -146,6 +146,15 @@
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
 
+# clean up help mess
+/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/workspace-switcher*.omf \
+           $RPM_BUILD_ROOT/usr/share/omf/workspace-switcher
+/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/window-list*.omf \
+           $RPM_BUILD_ROOT/usr/share/omf/window-list
+/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/fish*.omf \
+           $RPM_BUILD_ROOT/usr/share/omf/fish
+/bin/rmdir $RPM_BUILD_ROOT/usr/share/omf/gnome-panel
+
 %find_lang %{gettext_package}
 
 %clean
@@ -199,7 +208,10 @@
 %{_datadir}/gnome-panelrc
 %{_datadir}/idl/gnome-panel-2.0
 %{_datadir}/gnome-2.0/ui/*.xml
-%{_datadir}/omf/*
+%{_datadir}/omf/clock
+%{_datadir}/omf/fish
+%{_datadir}/omf/window-list
+%{_datadir}/omf/workspace-switcher
 %{_datadir}/man/man*/*
 %{_bindir}/*
 %{_libexecdir}/*
@@ -216,6 +228,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Aug 25 2006 Matthias Clsaen <mclasen at redhat.com> - 2.15.92-2.fc6
+- Install omf files in the proper location (#201034)
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92
 - Require pkgconfig in the -devel package



From fedora-cvs-commits at redhat.com  Fri Aug 25 19:18:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 15:18:22 -0400
Subject: rpms/kernel/devel/configs config-ia64, 1.1,
	1.2 config-powerpc64-iseries-kdump, 1.2,
	1.3 config-powerpc64-kdump, 1.2, 1.3
Message-ID: <200608251918.k7PJIMmS008413@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv1119/configs

Modified Files:
	config-ia64 config-powerpc64-iseries-kdump 
	config-powerpc64-kdump 
Log Message:
syncing devel with beta1
biggest changes is i686 and x86_64 relocatable for rhel only
and ia64 kexec/kdump




Index: config-ia64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-ia64	6 Feb 2005 05:49:11 -0000	1.1
+++ config-ia64	25 Aug 2006 19:18:20 -0000	1.2
@@ -1 +1,3 @@
+CONFIG_CRASH_DUMP=y
+CONFIG_PROC_VMCORE=y
 


Index: config-powerpc64-iseries-kdump
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries-kdump,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-powerpc64-iseries-kdump	28 Jul 2006 21:44:10 -0000	1.2
+++ config-powerpc64-iseries-kdump	25 Aug 2006 19:18:20 -0000	1.3
@@ -1,4 +1,3 @@
 # CONFIG_EMBEDDED is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PROC_VMCORE=y


Index: config-powerpc64-kdump
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-kdump,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-powerpc64-kdump	28 Jul 2006 21:44:09 -0000	1.2
+++ config-powerpc64-kdump	25 Aug 2006 19:18:20 -0000	1.3
@@ -1,4 +1,3 @@
 # CONFIG_EMBEDDED is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PROC_VMCORE=y



From fedora-cvs-commits at redhat.com  Fri Aug 25 19:18:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 15:18:22 -0400
Subject: rpms/kernel/devel linux-2.6-ia64-kexec-kdump-xen-conflict.patch, 1.1,
	1.2 linux-2.6-ia64-kexec-kdump.patch, 1.1,
	1.2 linux-2.6-x86-relocatable.patch, 1.1,
	1.2 linux-2.6-xen-x86-relocatable.patch, 1.1,
	1.2 Makefile.config, 1.48, 1.49 kernel-2.6.spec, 1.2587,
	1.2588 linux-2.6-utrace.patch, 1.21, 1.22
Message-ID: <200608251918.k7PJIMw2008407@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1119

Modified Files:
	Makefile.config kernel-2.6.spec linux-2.6-utrace.patch 
Added Files:
	linux-2.6-ia64-kexec-kdump-xen-conflict.patch 
	linux-2.6-ia64-kexec-kdump.patch 
	linux-2.6-x86-relocatable.patch 
	linux-2.6-xen-x86-relocatable.patch 
Log Message:
syncing devel with beta1
biggest changes is i686 and x86_64 relocatable for rhel only
and ia64 kexec/kdump



linux-2.6-ia64-kexec-kdump-xen-conflict.patch:
 meminit.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Index: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
===================================================================
RCS file: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
diff -N linux-2.6-ia64-kexec-kdump-xen-conflict.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-ia64-kexec-kdump-xen-conflict.patch	25 Aug 2006 19:18:19 -0000	1.2
@@ -0,0 +1,22 @@
+diff -Nraup a/include/asm-ia64/meminit.h b/include/asm-ia64/meminit.h
+--- a/include/asm-ia64/meminit.h        2006-08-15 05:52:24.000000000 +0800
++++ b/include/asm-ia64/meminit.h        2006-08-15 09:50:03.000000000 +0800
+@@ -15,15 +15,16 @@
+  * 	- initrd (optional)
+  * 	- command line string
+  * 	- kernel code & data
++ *	- crash dumping code reserved region
+  * 	- Kernel memory map built from EFI memory map
+  *	- xen start info
+  *
+  * More could be added if necessary
+  */
+ #ifndef CONFIG_XEN
+-#define IA64_MAX_RSVD_REGIONS 6
+-#else
+ #define IA64_MAX_RSVD_REGIONS 7
++#else
++#define IA64_MAX_RSVD_REGIONS 8
+ #endif
+ 
+ struct rsvd_region {

linux-2.6-ia64-kexec-kdump.patch:
 arch/ia64/Kconfig                  |   23 +
 arch/ia64/hp/common/sba_iommu.c    |   22 +
 arch/ia64/kernel/Makefile          |    1 
 arch/ia64/kernel/crash.c           |  119 ++++++++
 arch/ia64/kernel/efi.c             |   19 +
 arch/ia64/kernel/entry.S           |    2 
 arch/ia64/kernel/iosapic.c         |   19 +
 arch/ia64/kernel/machine_kexec.c   |  139 ++++++++++
 arch/ia64/kernel/relocate_kernel.S |  490 +++++++++++++++++++++++++++++++++++++
 arch/ia64/kernel/setup.c           |   44 +++
 arch/ia64/kernel/smp.c             |   55 ++++
 include/asm-ia64/kexec.h           |   40 +++
 include/asm-ia64/machvec_hpzx1.h   |    2 
 include/asm-ia64/smp.h             |    3 
 kernel/irq/manage.c                |    1 
 15 files changed, 973 insertions(+), 6 deletions(-)

Index: linux-2.6-ia64-kexec-kdump.patch
===================================================================
RCS file: linux-2.6-ia64-kexec-kdump.patch
diff -N linux-2.6-ia64-kexec-kdump.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-ia64-kexec-kdump.patch	25 Aug 2006 19:18:19 -0000	1.2
@@ -0,0 +1,1213 @@
+
+The fix and change in this patch include
+
+1. According to suggestion from Dave,
+   I put an extra switch stack frame on each CPU to help crash utility 
+   to run bt command.	  
+
+2. Fix issue reported by Fujitsu that crash kernel can't startup 
+   with CONFIG_SPARSEMEM 
+   
+3. More simplified crash path.
+
+
+Signed-off-by: Zou Nan hai <nanhai.zou at intel.com>
+
+ 
+
+diff -Nraup linux-2.6.18-rc4/arch/ia64/hp/common/sba_iommu.c linux-2.6.18-rc4-kdump/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.18-rc4/arch/ia64/hp/common/sba_iommu.c	2006-08-19 12:46:42.000000000 +0800
++++ linux-2.6.18-rc4-kdump/arch/ia64/hp/common/sba_iommu.c	2006-08-19 12:54:10.000000000 +0800
+@@ -1623,6 +1623,28 @@ ioc_iova_init(struct ioc *ioc)
+ 	READ_REG(ioc->ioc_hpa + IOC_IBASE);
+ }
+ 
++#ifdef CONFIG_KEXEC
++void
++ioc_iova_disable(void)
++{
++	struct ioc *ioc;
++
++	ioc = ioc_list;
++
++	while (ioc != NULL) {
++		/* Disable IOVA translation */
++		WRITE_REG(ioc->ibase & 0xfffffffffffffffe, ioc->ioc_hpa + IOC_IBASE);
++		READ_REG(ioc->ioc_hpa + IOC_IBASE);
++
++		/* Clear I/O TLB of any possible entries */
++		WRITE_REG(ioc->ibase | (get_iovp_order(ioc->iov_size) + iovp_shift), ioc->ioc_hpa + IOC_PCOM);
++		READ_REG(ioc->ioc_hpa + IOC_PCOM);
++
++		ioc = ioc->next;
++	}
++}
++#endif
++
+ static void __init
+ ioc_resource_init(struct ioc *ioc)
+ {
+diff -Nraup linux-2.6.18-rc4/arch/ia64/Kconfig linux-2.6.18-rc4-kdump/arch/ia64/Kconfig
+--- linux-2.6.18-rc4/arch/ia64/Kconfig	2006-08-19 12:46:42.000000000 +0800
++++ linux-2.6.18-rc4-kdump/arch/ia64/Kconfig	2006-08-19 12:54:10.000000000 +0800
+@@ -427,6 +427,29 @@ config SGI_SN
+ 
+ source "drivers/sn/Kconfig"
+ 
++config KEXEC
++	bool "kexec system call (EXPERIMENTAL)"
++	depends on EXPERIMENTAL
++	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
++	  but it is indepedent of the system firmware.   And like a reboot
++	  you can start any kernel with it, not just Linux.
++
++	  The name comes from the similiarity to the exec system call.
++
++	  It is an ongoing process to be certain the hardware in a machine
++	  is properly shutdown, so do not be surprised if this code does not
++	  initially work for you.  It may help to enable device hotplugging
++	  support.  As of this writing the exact hardware interface is
++	  strongly in flux, so no good recommendation can be made.
++
++config CRASH_DUMP
++	  bool "kernel crash dumps (EXPERIMENTAL)"
++	  depends on EXPERIMENTAL
++	  help
++	    Generate crash dump after being started by kexec.
++
+ source "drivers/firmware/Kconfig"
+ 
+ source "fs/Kconfig.binfmt"
+diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/crash.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/crash.c
+--- linux-2.6.18-rc4/arch/ia64/kernel/crash.c	1970-01-01 08:00:00.000000000 +0800
++++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/crash.c	2006-08-19 12:54:10.000000000 +0800
+@@ -0,0 +1,119 @@
++/*
++ * arch/ia64/kernel/crash.c
++ *
++ * Architecture specific (ia64) functions for kexec based crash dumps.
++ *
++ * Created by: Khalid Aziz <khalid.aziz at hp.com>
++ * Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
++ * Copyright (C) 2005 Intel Corp	Zou Nan hai <nanhai.zou at intel.com>
++ *
++ */
++#include <linux/init.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/smp.h>
++#include <linux/irq.h>
++#include <linux/pci.h>
++#include <linux/reboot.h>
++#include <linux/kexec.h>
++#include <linux/irq.h>
++#include <linux/delay.h>
++#include <linux/elf.h>
++#include <linux/elfcore.h>
++#include <linux/device.h>
++#include <asm/uaccess.h>
++
++size_t copy_oldmem_page(unsigned long pfn, char *buf,
++                               size_t csize, unsigned long offset, int userbuf)
++{
++        void  *vaddr;
++
++        if (!csize)
++                return 0;
++        vaddr = __va(pfn<<PAGE_SHIFT);
++        if (userbuf) {
++                if (copy_to_user(buf, (vaddr + offset), csize)) {
++                        return -EFAULT;
++                }
++        } else
++                memcpy(buf, (vaddr + offset), csize);
++        return csize;
++}
++
++static void device_shootdown(void)
++{
++	kdump_disable_iosapic();
++#ifdef CONFIG_IA64_HP_ZX1
++	ioc_iova_disable();
++#endif
++}
++
++static inline Elf64_Word
++*append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data,
++		size_t data_len)
++{
++	struct elf_note *note = (struct elf_note *)buf;
++	note->n_namesz = strlen(name) + 1;
++	note->n_descsz = data_len;
++	note->n_type   = type;
++	buf += (sizeof(*note) + 3)/4;
++	memcpy(buf, name, note->n_namesz);
++	buf += (note->n_namesz + 3)/4;
++	memcpy(buf, data, data_len);
++	buf += (data_len + 3)/4;
++	return buf;
++}
++
++static void
++final_note(void *buf)
++{
++	memset(buf, 0, sizeof(struct elf_note));
++}
++
++extern void ia64_dump_cpu_regs(void *);
++
++void
++crash_save_this_cpu()
++{
++	void *buf;
++	struct elf_prstatus prstatus;
++	int cpu = smp_processor_id();
++	unsigned long cfm, sof, sol;
++	elf_greg_t *dst = (elf_greg_t *)&prstatus.pr_reg;
++	memset(&prstatus, 0, sizeof(prstatus));
++	prstatus.pr_pid = current->pid;
++
++	ia64_dump_cpu_regs(dst);
++        cfm = dst[43];
++        sol = (cfm >> 7) & 0x7f;
++        sof = cfm & 0x7f;
++        dst[46] = (unsigned long)ia64_rse_skip_regs((unsigned long *)dst[46],
++                        sof - sol);
++
++        buf = (u64 *) per_cpu_ptr(crash_notes, cpu);
++	if (!buf)
++		return;
++	buf = append_elf_note(buf, "CORE", NT_PRSTATUS, &prstatus,
++		sizeof(prstatus));
++	final_note(buf);
++}
++
++void
++machine_crash_shutdown(struct pt_regs *pt)
++{
++	/* This function is only called after the system
++	 * has paniced or is otherwise in a critical state.
++	 * The minimum amount of code to allow a kexec'd kernel
++	 * to run successfully needs to happen here.
++	 *
++	 * In practice this means shooting down the other cpus in
++	 * an SMP system.
++	 */
++	if (in_interrupt())
++		ia64_eoi();
++	device_shootdown();
++#ifdef CONFIG_SMP
++	kdump_smp_send_stop();
++#endif
++	udelay(1000000);
++}
+diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/efi.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/efi.c
+--- linux-2.6.18-rc4/arch/ia64/kernel/efi.c	2006-08-19 12:46:42.000000000 +0800
++++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/efi.c	2006-08-19 12:54:10.000000000 +0800
+@@ -26,6 +26,7 @@
+ #include <linux/types.h>
+ #include <linux/time.h>
+ #include <linux/efi.h>
++#include <linux/kexec.h>
+ 
+ #include <asm/io.h>
+ #include <asm/kregs.h>
+@@ -41,7 +42,7 @@ extern efi_status_t efi_call_phys (void 
+ struct efi efi;
+ EXPORT_SYMBOL(efi);
+ static efi_runtime_services_t *runtime;
+-static unsigned long mem_limit = ~0UL, max_addr = ~0UL;
++static unsigned long mem_limit = ~0UL, max_addr = ~0UL, min_addr = 0UL;
+ 
+ #define efi_call_virt(f, args...)	(*(f))(args)
+ 
+@@ -421,6 +422,8 @@ efi_init (void)
+ 			mem_limit = memparse(cp + 4, &cp);
+ 		} else if (memcmp(cp, "max_addr=", 9) == 0) {
+ 			max_addr = GRANULEROUNDDOWN(memparse(cp + 9, &cp));
++		} else if (memcmp(cp, "min_addr=", 9) == 0) {
++			min_addr = GRANULEROUNDDOWN(memparse(cp + 9, &cp));
+ 		} else {
+ 			while (*cp != ' ' && *cp)
+ 				++cp;
+@@ -428,6 +431,8 @@ efi_init (void)
+ 				++cp;
+ 		}
+ 	}
++	if (min_addr != 0UL)
++		printk(KERN_INFO "Ignoring memory below %luMB\n", min_addr >> 20);
+ 	if (max_addr != ~0UL)
+ 		printk(KERN_INFO "Ignoring memory above %luMB\n", max_addr >> 20);
+ 
+@@ -894,7 +899,8 @@ find_memmap_space (void)
+ 		as = max(contig_low, md->phys_addr);
+ 		ae = min(contig_high, efi_md_end(md));
+ 
+-		/* keep within max_addr= command line arg */
++		/* keep within max_addr= and min_addr= command line arg */
++		as = max(as, min_addr);
+ 		ae = min(ae, max_addr);
+ 		if (ae <= as)
+ 			continue;
+@@ -1004,7 +1010,8 @@ efi_memmap_init(unsigned long *s, unsign
+ 		} else
+ 			ae = efi_md_end(md);
+ 
+-		/* keep within max_addr= command line arg */
++		/* keep within max_addr= and min_addr= command line arg */
++		as = max(as, min_addr);
+ 		ae = min(ae, max_addr);
+ 		if (ae <= as)
+ 			continue;
+@@ -1116,6 +1123,12 @@ efi_initialize_iomem_resources(struct re
+ 			 */
+ 			insert_resource(res, code_resource);
+ 			insert_resource(res, data_resource);
++#ifdef CONFIG_KEXEC
++                        insert_resource(res, &efi_memmap_res);
++                        insert_resource(res, &boot_param_res);
++			if (crashk_res.end > crashk_res.start)
++				insert_resource(res, &crashk_res);
++#endif
+ 		}
+ 	}
+ }
+diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/entry.S linux-2.6.18-rc4-kdump/arch/ia64/kernel/entry.S
+--- linux-2.6.18-rc4/arch/ia64/kernel/entry.S	2006-08-19 12:46:42.000000000 +0800
++++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/entry.S	2006-08-19 12:54:10.000000000 +0800
+@@ -1575,7 +1575,7 @@ sys_call_table:
+ 	data8 sys_mq_timedreceive		// 1265
+ 	data8 sys_mq_notify
+ 	data8 sys_mq_getsetattr
+-	data8 sys_ni_syscall			// reserved for kexec_load
++	data8 sys_kexec_load
+ 	data8 sys_ni_syscall			// reserved for vserver
+ 	data8 sys_waitid			// 1270
+ 	data8 sys_add_key
+diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/iosapic.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/iosapic.c
+--- linux-2.6.18-rc4/arch/ia64/kernel/iosapic.c	2006-08-19 12:46:42.000000000 +0800
++++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/iosapic.c	2006-08-19 12:54:10.000000000 +0800
+@@ -288,6 +288,25 @@ nop (unsigned int irq)
+ 	/* do nothing... */
+ }
+ 
++#ifdef CONFIG_CRASH_DUMP
++void
++kdump_disable_iosapic(void)
++{
++	u32 low32;
++	struct iosapic_intr_info *info;
++	struct iosapic_rte_info *rte;
++	for (info = iosapic_intr_info; info <
++			iosapic_intr_info + IA64_NUM_VECTORS; ++info) {
++		low32 = info->low32 |= IOSAPIC_MASK;
++		list_for_each_entry(rte, &info->rtes,
++				rte_list) {
++			iosapic_write(rte->addr,
++					IOSAPIC_RTE_LOW(rte->rte_index), low32);
++		}
++	}
++}
++#endif
++
+ static void
+ mask_irq (unsigned int irq)
+ {
+diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/machine_kexec.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/machine_kexec.c
+--- linux-2.6.18-rc4/arch/ia64/kernel/machine_kexec.c	1970-01-01 08:00:00.000000000 +0800
++++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/machine_kexec.c	2006-08-19 12:54:10.000000000 +0800
+@@ -0,0 +1,139 @@
++/*
++ * arch/ia64/kernel/machine_kexec.c
++ *
++ * Handle transition of Linux booting another kernel
++ * Copyright (C) 2005 Hewlett-Packard Development Comapny, L.P.
++ * Copyright (C) 2005 Khalid Aziz <khalid.aziz at hp.com>
++ * Copyright (C) 2006 Intel Corp, Zou Nan hai <nanhai.zou at intel.com>
++ *
++ * This source code is licensed under the GNU General Public License,
++ * Version 2.  See the file COPYING for more details.
++ */
++
++#include <linux/kernel.h>
++#include <linux/config.h>
++#include <linux/mm.h>
++#include <linux/kexec.h>
++#include <linux/pci.h>
++#include <linux/cpu.h>
++#include <asm/mmu_context.h>
++#include <asm/setup.h>
++#include <asm/mca.h>
++#include <asm/page.h>
++#include <asm/bitops.h>
++#include <asm/tlbflush.h>
++#include <asm/delay.h>
++#include <asm/meminit.h>
++
++typedef void (*relocate_new_kernel_t)(unsigned long, unsigned long,
++		struct ia64_boot_param *, unsigned long);
++static struct kimage *ia64_kimage;
++struct resource efi_memmap_res = {
++        .name  = "EFI Memory Map",
++        .start = 0,
++        .end   = 0,
++        .flags = IORESOURCE_BUSY | IORESOURCE_MEM
++};
++
++struct resource boot_param_res = {
++        .name  = "Boot parameter",
++        .start = 0,
++        .end   = 0,
++        .flags = IORESOURCE_BUSY | IORESOURCE_MEM
++};
++
++
++/*
++ * Do what every setup is needed on image and the
++ * reboot code buffer to allow us to avoid allocations
++ * later.
++ */
++int machine_kexec_prepare(struct kimage *image)
++{
++	void *control_code_buffer;
++	const unsigned long *func;
++
++	func = (unsigned long *)&relocate_new_kernel;
++	/* Pre-load control code buffer to minimize work in kexec path */
++	control_code_buffer = page_address(image->control_code_page);
++	memcpy((void *)control_code_buffer, (const void *)func[0],
++			relocate_new_kernel_size);
++	flush_icache_range((unsigned long)control_code_buffer,
++			(unsigned long)control_code_buffer + relocate_new_kernel_size);
++	ia64_kimage = image;
++
++	return 0;
++}
++
++void machine_kexec_cleanup(struct kimage *image)
++{
++}
++
++void machine_shutdown(void)
++{
++#ifdef CONFIG_HOTPLUG_CPU
++	{
++		int cpu;
++
++		for_each_online_cpu(cpu) {
++			if (cpu != smp_processor_id())
++				cpu_down(cpu);
++		}
++	}
++#elif defined(CONFIG_SMP)
++	smp_call_function(kexec_stop_this_cpu, (void *)ia64_kimage->start, 0, 0);
++#endif
++#ifdef CONFIG_PCI
++	{
++		struct pci_dev *dev = NULL;
++		irq_desc_t *idesc;
++		/* Disable all PCI devices */
++		while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
++			if (!(dev->is_enabled))
++				continue;
++			idesc = irq_desc + dev->irq;
++			if (!idesc||!idesc->chip)
++				continue;
++			disable_irq_nosync(dev->irq);
++			idesc->chip->end(dev->irq);
++			idesc->action = NULL;
++			pci_disable_device(dev);
++		}
++	}
++#endif
++
++#ifdef CONFIG_IA64_HP_ZX1
++	ioc_iova_disable();
++#endif
++}
++
++/*
++ * Do not allocate memory (or fail in any way) in machine_kexec().
++ * We are past the point of no return, committed to rebooting now.
++ */
++extern void *efi_get_pal_addr(void);
++static void ia64_machine_kexec(struct unw_frame_info *info, void *arg) 
++{
++	struct kimage *image = arg;
++	relocate_new_kernel_t rnk;
++	void *pal_addr = efi_get_pal_addr();
++	unsigned long code_addr = (unsigned long)page_address(image->control_code_page);
++	if (image->type == KEXEC_TYPE_CRASH) {
++		crash_save_this_cpu();
++		current->thread.ksp = (__u64)info->sw - 16;
++	}
++
++	/* Interrupts aren't acceptable while we reboot */
++	ia64_set_itv(1<<16);
++	local_irq_disable();
++	rnk = (relocate_new_kernel_t)&code_addr;
++	(*rnk)(image->head, image->start, ia64_boot_param,
++		     GRANULEROUNDDOWN((unsigned long) pal_addr));
++	BUG();
++} 
++
++void machine_kexec(struct kimage *image)
++{
++	unw_init_running(ia64_machine_kexec, image);
++	for(;;);
++}
+diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/Makefile linux-2.6.18-rc4-kdump/arch/ia64/kernel/Makefile
+--- linux-2.6.18-rc4/arch/ia64/kernel/Makefile	2006-08-19 12:46:42.000000000 +0800
++++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/Makefile	2006-08-19 12:54:10.000000000 +0800
+@@ -28,6 +28,7 @@ obj-$(CONFIG_IA64_CYCLONE)	+= cyclone.o
+ obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
+ obj-$(CONFIG_IA64_MCA_RECOVERY)	+= mca_recovery.o
+ obj-$(CONFIG_KPROBES)		+= kprobes.o jprobes.o
++obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o
+ obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)	+= uncached.o
+ obj-$(CONFIG_AUDIT)		+= audit.o
+ mca_recovery-y			+= mca_drv.o mca_drv_asm.o
+diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/relocate_kernel.S linux-2.6.18-rc4-kdump/arch/ia64/kernel/relocate_kernel.S
+--- linux-2.6.18-rc4/arch/ia64/kernel/relocate_kernel.S	1970-01-01 08:00:00.000000000 +0800
++++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/relocate_kernel.S	2006-08-19 12:54:10.000000000 +0800
+@@ -0,0 +1,490 @@
++/*
++ * arch/ia64/kernel/relocate_kernel.S
++ *
++ * Relocate kexec'able kernel and start it
++ *
++ * Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
++ * Copyright (C) 2005 Khalid Aziz  <khalid.aziz at hp.com>
++ * Copyright (C) 2005 Intel Corp,  Zou Nan hai <nanhai.zou at intel.com>
++ *
++ * This source code is licensed under the GNU General Public License,
++ * Version 2.  See the file COPYING for more details.
++ */
++#include <linux/config.h>
++#include <asm/asmmacro.h>
++#include <asm/kregs.h>
++#include <asm/page.h>
++#include <asm/pgtable.h>
++#include <asm/mca_asm.h>
++
++       /* Must be relocatable PIC code callable as a C function
++        */
++GLOBAL_ENTRY(relocate_new_kernel)
++	.prologue
++	alloc r31=ar.pfs,4,0,0,0
++        .body
++.reloc_entry:
++{
++	rsm psr.i| psr.ic
++	mov r2=ip
++}
++	;;
++{
++        flushrs                         // must be first insn in group
++        srlz.i
++}
++	;;
++	dep r2=0,r2,61,3		//to physical address
++	;;
++	//first switch to physical mode
++	add r3=1f-.reloc_entry, r2
++	movl r16 = IA64_PSR_AC|IA64_PSR_BN|IA64_PSR_IC
++	mov ar.rsc=0	          	// put RSE in enforced lazy mode
++	;;
++	add sp=(memory_stack_end - 16 - .reloc_entry),r2
++	add r8=(register_stack - .reloc_entry),r2
++	;;
++	mov r18=ar.rnat
++	mov ar.bspstore=r8
++	;;
++        mov cr.ipsr=r16
++        mov cr.iip=r3
++        mov cr.ifs=r0
++	srlz.i
++	;;
++	mov ar.rnat=r18
++	rfi
++	;;
++1:
++	//physical mode code begin
++	mov b6=in1
++	dep r28=0,in2,61,3	//to physical address
++
++	// purge all TC entries
++#define O(member)       IA64_CPUINFO_##member##_OFFSET
++        GET_THIS_PADDR(r2, cpu_info)    // load phys addr of cpu_info into r2
++        ;;
++        addl r17=O(PTCE_STRIDE),r2
++        addl r2=O(PTCE_BASE),r2
++        ;;
++        ld8 r18=[r2],(O(PTCE_COUNT)-O(PTCE_BASE));;    	// r18=ptce_base
++        ld4 r19=[r2],4                                  // r19=ptce_count[0]
++        ld4 r21=[r17],4                                 // r21=ptce_stride[0]
++        ;;
++        ld4 r20=[r2]                                    // r20=ptce_count[1]
++        ld4 r22=[r17]                                   // r22=ptce_stride[1]
++        mov r24=r0
++        ;;
++        adds r20=-1,r20
++        ;;
++#undef O
++2:
++        cmp.ltu p6,p7=r24,r19
++(p7)    br.cond.dpnt.few 4f
++        mov ar.lc=r20
++3:
++        ptc.e r18
++        ;;
++        add r18=r22,r18
++        br.cloop.sptk.few 3b
++        ;;
++        add r18=r21,r18
++        add r24=1,r24
++        ;;
++        br.sptk.few 2b
++4:
++        srlz.i
++        ;;
++	//purge TR entry for kernel text and data
++        movl r16=KERNEL_START
++        mov r18=KERNEL_TR_PAGE_SHIFT<<2
++        ;;
++        ptr.i r16, r18
++        ptr.d r16, r18
++        ;;
++        srlz.i
++        ;;
++
++	// purge TR entry for percpu data
++        movl r16=PERCPU_ADDR
++        mov r18=PERCPU_PAGE_SHIFT<<2
++        ;;
++        ptr.d r16,r18
++        ;;
++        srlz.d
++	;;
++
++        // purge TR entry for pal code
++        mov r16=in3
++        mov r18=IA64_GRANULE_SHIFT<<2
++        ;;
++        ptr.i r16,r18
++        ;;
++        srlz.i
++	;;
++
++        // purge TR entry for stack
++        mov r16=IA64_KR(CURRENT_STACK)
++        ;;
++        shl r16=r16,IA64_GRANULE_SHIFT
++        movl r19=PAGE_OFFSET
++        ;;
++        add r16=r19,r16
++        mov r18=IA64_GRANULE_SHIFT<<2
++        ;;
++        ptr.d r16,r18
++        ;;
++        srlz.i
++	;;
++
++	//copy segments
++	movl r16=PAGE_MASK
++        mov  r30=in0                    // in0 is page_list
++        br.sptk.few .dest_page
++	;;
++.loop:
++	ld8  r30=[in0], 8;;
++.dest_page:
++	tbit.z p0, p6=r30, 0;;    	// 0x1 dest page
++(p6)	and r17=r30, r16
++(p6)	br.cond.sptk.few .loop;;
++
++	tbit.z p0, p6=r30, 1;;		// 0x2 indirect page
++(p6)	and in0=r30, r16
++(p6)	br.cond.sptk.few .loop;;
++
++	tbit.z p0, p6=r30, 2;;		// 0x4 end flag
++(p6)	br.cond.sptk.few .end_loop;;
++
++	tbit.z p6, p0=r30, 3;;		// 0x8 source page
++(p6)	br.cond.sptk.few .loop
++
++	and r18=r30, r16
++
++	// simple copy page, may optimize later
++	movl r14=PAGE_SIZE/8 - 1;;
++	mov ar.lc=r14;;
++1:
++	ld8 r14=[r18], 8;;
++	st8 [r17]=r14, 8;;
++	fc.i r17
++	br.ctop.sptk.few 1b
++	br.sptk.few .loop
++	;;
++
++.end_loop:
++	sync.i			// for fc.i
++	;;
++	srlz.i
++	;;
++	srlz.d
++	;;
++	br.call.sptk.many b0=b6;;
++
++.align  32
++memory_stack:
++	.fill           8192, 1, 0
++memory_stack_end:
++register_stack:
++	.fill           8192, 1, 0
++register_stack_end:
++relocate_new_kernel_end:
++END(relocate_new_kernel)
++
++GLOBAL_ENTRY(kexec_fake_sal_rendez)
++	.prologue
++	alloc r31=ar.pfs,3,0,0,0
++	.body
++.rendez_entry:
++	rsm	psr.i | psr.ic
++	mov r25=ip
++	;;
++	{
++		flushrs
++		srlz.i
++	}
++	;;
++       /* See where I am running, and compute gp */
++	{
++		mov     ar.rsc = 0      /* Put RSE in enforce lacy, LE mode */
++		mov     gp = ip         /* gp == relocate_new_kernel */
++	}
++
++	movl r8=0x00000100000000
++	;;
++	mov cr.iva=r8
++	/* Transition from virtual to physical mode */
++	srlz.i
++	;;
++	add	r17=5f-.rendez_entry, r25
++	movl	r16=(IA64_PSR_AC | IA64_PSR_BN | IA64_PSR_IC | IA64_PSR_MFL)
++	;;
++	tpa	r17=r17
++	mov	cr.ipsr=r16
++	;;
++	mov	cr.iip=r17
++	mov	cr.ifs=r0
++	;;
++	rfi
++	;;
++5:
++	mov     b6=in0			/* _start addr */
++	mov	r8=in1			/* ap_wakeup_vector */
++	mov	r26=in2			/* PAL addr */
++	;;
++	/* Purge kernel TRs */
++	movl	r16=KERNEL_START
++	mov	r18=KERNEL_TR_PAGE_SHIFT<<2
++	;;
++	ptr.i	r16,r18
++	ptr.d	r16,r18
++	;;
++	srlz.i
++	;;
++	srlz.d
++	;;
++	/* Purge percpu TR */
++	movl	r16=PERCPU_ADDR
++	mov	r18=PERCPU_PAGE_SHIFT<<2
++	;;
++	ptr.d	r16,r18
++	;;
++	srlz.d
++	;;
++	/* Purge PAL TR */
++	mov	r18=IA64_GRANULE_SHIFT<<2
++	;;
++	ptr.i	r26,r18
++	;;
++	srlz.i
++	;;
++	/* Purge stack TR */
++	mov	r16=IA64_KR(CURRENT_STACK)
++	;;
++	shl	r16=r16,IA64_GRANULE_SHIFT
++	movl	r19=PAGE_OFFSET
++	;;
++	add	r16=r19,r16
++	mov	r18=IA64_GRANULE_SHIFT<<2
++	;;
++	ptr.d	r16,r18
++	;;
++	srlz.i
++	;;
++
++	/* Ensure we can read and clear external interrupts */
++	mov	cr.tpr=r0
++	srlz.d
++
++	shr.u	r9=r8,6			/* which irr */
++	;;
++	and	r8=63,r8		/* bit offset into irr */
++	;;
++	mov	r10=1;;
++	;;
++	shl	r10=r10,r8		/* bit mask off irr we want */
++	cmp.eq	p6,p0=0,r9
++	;;
++(p6)	br.cond.sptk.few        check_irr0
++	cmp.eq	p7,p0=1,r9
++	;;
++(p7)	br.cond.sptk.few        check_irr1
++	cmp.eq	p8,p0=2,r9
++	;;
++(p8)	br.cond.sptk.few        check_irr2
++	cmp.eq	p9,p0=3,r9
++	;;
++(p9)	br.cond.sptk.few        check_irr3
++
++check_irr0:
++	mov	r8=cr.irr0
++	;;
++	and	r8=r8,r10
++	;;
++	cmp.eq	p6,p0=0,r8
++(p6)	br.cond.sptk.few	check_irr0
++	br.few	call_start
++
++check_irr1:
++	mov	r8=cr.irr1
++	;;
++	and	r8=r8,r10
++	;;
++	cmp.eq	p6,p0=0,r8
++(p6)	br.cond.sptk.few	check_irr1
++	br.few	call_start
++
++check_irr2:
++	mov	r8=cr.irr2
++	;;
++	and	r8=r8,r10
++	;;
++	cmp.eq	p6,p0=0,r8
++(p6)	br.cond.sptk.few	check_irr2
++	br.few	call_start
++
++check_irr3:
++	mov	r8=cr.irr3
++	;;
++	and	r8=r8,r10
++	;;
++	cmp.eq	p6,p0=0,r8
++(p6)	br.cond.sptk.few	check_irr3
++	br.few	call_start
++
++call_start:
++	mov	cr.eoi=r0
++	;;
++	srlz.d
++	;;
++	mov	r8=cr.ivr
++	;;
++	srlz.d
++	;;
++	cmp.eq	p0,p6=15,r8
++(p6)	br.cond.sptk.few	call_start
++	br.sptk.few		b6
++kexec_fake_sal_rendez_end:
++END(kexec_fake_sal_rendez)
++
++	.global relocate_new_kernel_size
++relocate_new_kernel_size:
++	data8	kexec_fake_sal_rendez_end - relocate_new_kernel
++
++GLOBAL_ENTRY(ia64_dump_cpu_regs)
++        .prologue
++        alloc loc0=ar.pfs,1,2,0,0
++        .body
++        mov     ar.rsc=0                // put RSE in enforced lazy mode
++        add     loc1=4*8, in0           // save r4 and r5 first
++        ;;
++{
++        flushrs                         // flush dirty regs to backing store
++        srlz.i
++}
++        st8 [loc1]=r4, 8
++        ;;
++        st8 [loc1]=r5, 8
++        ;;
++        add loc1=32*8, in0
++        mov r4=ar.rnat
++        ;;
++        st8 [in0]=r0, 8			// r0
++        st8 [loc1]=r4, 8		// rnat
++        mov r5=pr
++        ;;
++        st8 [in0]=r1, 8			// r1
++        st8 [loc1]=r5, 8		// pr
++        mov r4=b0
++        ;;
++        st8 [in0]=r2, 8			// r2
++        st8 [loc1]=r4, 8		// b0
++        mov r5=b1;
++        ;;
++        st8 [in0]=r3, 24		// r3
++        st8 [loc1]=r5, 8		// b1
++        mov r4=b2
++        ;;
++        st8 [in0]=r6, 8			// r6
++        st8 [loc1]=r4, 8		// b2
++	mov r5=b3
++        ;;
++        st8 [in0]=r7, 8			// r7
++        st8 [loc1]=r5, 8		// b3
++        mov r4=b4
++        ;;
++        st8 [in0]=r8, 8			// r8
++        st8 [loc1]=r4, 8		// b4
++        mov r5=b5
++        ;;
++        st8 [in0]=r9, 8			// r9
++        st8 [loc1]=r5, 8		// b5
++        mov r4=b6
++        ;;
++        st8 [in0]=r10, 8		// r10
++        st8 [loc1]=r5, 8		// b6
++        mov r5=b7
++        ;;
++        st8 [in0]=r11, 8		// r11
++        st8 [loc1]=r5, 8		// b7
++        mov r4=b0
++        ;;
++        st8 [in0]=r12, 8		// r12
++        st8 [loc1]=r4, 8		// ip
++        mov r5=loc0
++	;;
++        st8 [in0]=r13, 8		// r13
++        extr.u r5=r5, 0, 38		// ar.pfs.pfm
++	mov r4=r0			// user mask
++        ;;
++        st8 [in0]=r14, 8		// r14
++        st8 [loc1]=r5, 8		// cfm
++        ;;
++        st8 [in0]=r15, 8		// r15
++        st8 [loc1]=r4, 8        	// user mask
++	mov r5=ar.rsc
++        ;;
++        st8 [in0]=r16, 8		// r16
++        st8 [loc1]=r5, 8        	// ar.rsc
++        mov r4=ar.bsp
++        ;;
++        st8 [in0]=r17, 8		// r17
++        st8 [loc1]=r4, 8        	// ar.bsp
++        mov r5=ar.bspstore
++        ;;
++        st8 [in0]=r18, 8		// r18
++        st8 [loc1]=r5, 8        	// ar.bspstore
++        mov r4=ar.rnat
++        ;;
++        st8 [in0]=r19, 8		// r19
++        st8 [loc1]=r4, 8        	// ar.rnat
++        mov r5=ar.ccv
++        ;;
++        st8 [in0]=r20, 8		// r20
++	st8 [loc1]=r5, 8        	// ar.ccv
++        mov r4=ar.unat
++        ;;
++        st8 [in0]=r21, 8		// r21
++        st8 [loc1]=r4, 8        	// ar.unat
++        mov r5 = ar.fpsr
++        ;;
++        st8 [in0]=r22, 8		// r22
++        st8 [loc1]=r5, 8        	// ar.fpsr
++        mov r4 = ar.unat
++        ;;
++        st8 [in0]=r23, 8		// r23
++        st8 [loc1]=r4, 8        	// unat
++        mov r5 = ar.fpsr
++        ;;
++        st8 [in0]=r24, 8		// r24
++        st8 [loc1]=r5, 8        	// fpsr
++        mov r4 = ar.pfs
++        ;;
++        st8 [in0]=r25, 8		// r25
++        st8 [loc1]=r4, 8        	// ar.pfs
++        mov r5 = ar.lc
++        ;;
++        st8 [in0]=r26, 8		// r26
++        st8 [loc1]=r5, 8        	// ar.lc
++        mov r4 = ar.ec
++        ;;
++        st8 [in0]=r27, 8		// r27
++        st8 [loc1]=r4, 8        	// ar.ec
++        mov r5 = ar.csd
++        ;;
++        st8 [in0]=r28, 8		// r28
++        st8 [loc1]=r5, 8        	// ar.csd
++        mov r4 = ar.ssd
++        ;;
++        st8 [in0]=r29, 8		// r29
++        st8 [loc1]=r4, 8        	// ar.ssd
++        ;;
++        st8 [in0]=r30, 8		// r30
++        ;;
++	st8 [in0]=r31, 8		// r31
++        mov ar.pfs=loc0
++        ;;
++        br.ret.sptk.many rp
++END(ia64_dump_cpu_regs)
++
++
+diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/setup.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/setup.c
+--- linux-2.6.18-rc4/arch/ia64/kernel/setup.c	2006-08-19 12:46:42.000000000 +0800
++++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/setup.c	2006-08-19 12:54:28.000000000 +0800
+@@ -43,6 +43,8 @@
+ #include <linux/initrd.h>
+ #include <linux/pm.h>
+ #include <linux/cpufreq.h>
++#include <linux/kexec.h>
++#include <linux/crash_dump.h>
+ 
+ #include <asm/ia32.h>
+ #include <asm/machvec.h>
+@@ -250,6 +252,38 @@ reserve_memory (void)
+ 	}
+ #endif
+ 
++#ifdef CONFIG_KEXEC
++	/* crashkernel=size at addr specifies the location to reserve for
++	 * a crash kernel.  By reserving this memory we guarantee
++	 * that linux never set's it up as a DMA target.
++	 * Useful for holding code to do something appropriate
++	 * after a kernel panic.
++	 */
++	{
++		char *from = strstr(saved_command_line, "crashkernel=");
++		if (from) {
++			unsigned long size, base;
++			size = memparse(from + 12, &from);
++			if (*from == '@') {
++				base = memparse(from + 1, &from);
++				rsvd_region[n].start =
++					(unsigned long)__va(base);
++				rsvd_region[n].end =
++					(unsigned long)__va(base + size);
++				crashk_res.start = base;
++				crashk_res.end = base + size - 1;
++				n++;
++			}
++		}
++		efi_memmap_res.start = ia64_boot_param->efi_memmap;
++                efi_memmap_res.end = efi_memmap_res.start +
++                        ia64_boot_param->efi_memmap_size;
++                boot_param_res.start = __pa(ia64_boot_param);
++                boot_param_res.end = boot_param_res.start +
++                        sizeof(*ia64_boot_param);
++	}
++#endif
++
+ 	efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end);
+ 	n++;
+ 
+@@ -484,6 +518,16 @@ setup_arch (char **cmdline_p)
+ 	if (!nomca)
+ 		ia64_mca_init();
+ 
++#ifdef CONFIG_CRASH_DUMP
++	{
++		char *from = strstr(saved_command_line, "elfcorehdr=");
++
++		if (from)
++			elfcorehdr_addr = memparse(from+11, &from);
++		saved_max_pfn = (unsigned long) -1;
++	}
++#endif
++
+ 	platform_setup(cmdline_p);
+ 	paging_init();
+ }
+diff -Nraup linux-2.6.18-rc4/arch/ia64/kernel/smp.c linux-2.6.18-rc4-kdump/arch/ia64/kernel/smp.c
+--- linux-2.6.18-rc4/arch/ia64/kernel/smp.c	2006-06-18 09:49:35.000000000 +0800
++++ linux-2.6.18-rc4-kdump/arch/ia64/kernel/smp.c	2006-08-19 12:54:10.000000000 +0800
+@@ -30,6 +30,7 @@
+ #include <linux/delay.h>
+ #include <linux/efi.h>
+ #include <linux/bitops.h>
++#include <linux/kexec.h>
+ 
+ #include <asm/atomic.h>
+ #include <asm/current.h>
+@@ -66,6 +67,7 @@ static volatile struct call_data_struct 
+ 
+ #define IPI_CALL_FUNC		0
+ #define IPI_CPU_STOP		1
++#define IPI_KDUMP_CPU_STOP	3
+ 
+ /* This needs to be cacheline aligned because it is written to by *other* CPUs.  */
+ static DEFINE_PER_CPU(u64, ipi_operation) ____cacheline_aligned;
+@@ -84,6 +86,34 @@ unlock_ipi_calllock(void)
+ 	spin_unlock_irq(&call_lock);
+ }
+ 
++#ifdef CONFIG_KEXEC
++/*
++ * Stop the CPU and put it in fake SAL rendezvous. This allows CPU to wake
++ * up with IPI from boot processor
++ */
++void
++kexec_stop_this_cpu (void *func)
++{
++	unsigned long pta, impl_va_bits, pal_base;
++
++	/*
++	 * Remove this CPU by putting it into fake SAL rendezvous
++	 */
++	cpu_clear(smp_processor_id(), cpu_online_map);
++	max_xtp();
++	ia64_eoi();
++
++	/* Disable VHPT */
++	impl_va_bits = ffz(~(local_cpu_data->unimpl_va_mask | (7UL << 61)));
++	pta = POW2(61) - POW2(vmlpt_bits);
++	ia64_set_pta(pta | (0 << 8) | (vmlpt_bits << 2) | 0);
++
++	local_irq_disable();
++	pal_base = __get_cpu_var(ia64_mca_pal_base);
++	kexec_fake_sal_rendez(func, ap_wakeup_vector, pal_base);
++}
++#endif
++
+ static void
+ stop_this_cpu (void)
+ {
+@@ -96,6 +126,18 @@ stop_this_cpu (void)
+ 	cpu_halt();
+ }
+ 
++#ifdef CONFIG_CRASH_DUMP
++static void 
++kdump_cpu_freeze(struct unw_frame_info *info, void *arg)
++{
++	local_irq_disable();
++	crash_save_this_cpu();
++	current->thread.ksp = (__u64)info->sw - 16;
++	cpu_halt();
++}
++#endif
++
++
+ void
+ cpu_die(void)
+ {
+@@ -155,7 +197,11 @@ handle_IPI (int irq, void *dev_id, struc
+ 			      case IPI_CPU_STOP:
+ 				stop_this_cpu();
+ 				break;
+-
++#ifdef CONFIG_CRASH_DUMP
++			      case IPI_KDUMP_CPU_STOP:
++				unw_init_running(kdump_cpu_freeze, NULL);
++				break;
++#endif
+ 			      default:
+ 				printk(KERN_CRIT "Unknown IPI on CPU %d: %lu\n", this_cpu, which);
+ 				break;
+@@ -213,6 +259,13 @@ send_IPI_self (int op)
+ 	send_IPI_single(smp_processor_id(), op);
+ }
+ 
++#ifdef CONFIG_CRASH_DUMP
++void
++kdump_smp_send_stop()
++{
++ 	send_IPI_allbutself(IPI_KDUMP_CPU_STOP);
++}
++#endif
+ /*
+  * Called with preeemption disabled.
+  */
+diff -Nraup linux-2.6.18-rc4/include/asm-ia64/kexec.h linux-2.6.18-rc4-kdump/include/asm-ia64/kexec.h
+--- linux-2.6.18-rc4/include/asm-ia64/kexec.h	1970-01-01 08:00:00.000000000 +0800
++++ linux-2.6.18-rc4-kdump/include/asm-ia64/kexec.h	2006-08-19 12:54:10.000000000 +0800
+@@ -0,0 +1,40 @@
++#ifndef _ASM_IA64_KEXEC_H
++#define _ASM_IA64_KEXEC_H
++
++
++/* Maximum physical address we can use pages from */
++#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
++/* Maximum address we can reach in physical address mode */
++#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
++/* Maximum address we can use for the control code buffer */
++#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE
++
++#define KEXEC_CONTROL_CODE_SIZE (8192 + 8192 + 4096)
++
++/* The native architecture */
++#define KEXEC_ARCH KEXEC_ARCH_IA_64
++
++#define MAX_NOTE_BYTES 1024
++
++#define pte_bits	3
++#define vmlpt_bits	(impl_va_bits - PAGE_SHIFT + pte_bits)
++#define POW2(n)		(1ULL << (n))
++
++DECLARE_PER_CPU(u64, ia64_mca_pal_base);
++const extern unsigned int relocate_new_kernel_size;
++volatile extern long kexec_rendez;
++extern void relocate_new_kernel(unsigned long, unsigned long,
++		struct ia64_boot_param *, unsigned long);
++extern void kexec_fake_sal_rendez(void *start, unsigned long wake_up,
++		unsigned long pal_base);
++static inline void
++crash_setup_regs(struct pt_regs *newregs, struct pt_regs *oldregs)
++{
++}
++extern struct resource efi_memmap_res;
++extern struct resource boot_param_res;
++extern void kdump_smp_send_stop(void);
++extern void kdump_disable_iosapic(void);
++extern void crash_save_this_cpu(void);
++
++#endif /* _ASM_IA64_KEXEC_H */
+diff -Nraup linux-2.6.18-rc4/include/asm-ia64/machvec_hpzx1.h linux-2.6.18-rc4-kdump/include/asm-ia64/machvec_hpzx1.h
+--- linux-2.6.18-rc4/include/asm-ia64/machvec_hpzx1.h	2006-06-18 09:49:35.000000000 +0800
++++ linux-2.6.18-rc4-kdump/include/asm-ia64/machvec_hpzx1.h	2006-08-19 12:54:10.000000000 +0800
+@@ -34,4 +34,6 @@ extern ia64_mv_dma_mapping_error	sba_dma
+ #define platform_dma_supported			sba_dma_supported
+ #define platform_dma_mapping_error		sba_dma_mapping_error
+ 
++extern void ioc_iova_disable(void);
++
+ #endif /* _ASM_IA64_MACHVEC_HPZX1_h */
+diff -Nraup linux-2.6.18-rc4/include/asm-ia64/smp.h linux-2.6.18-rc4-kdump/include/asm-ia64/smp.h
+--- linux-2.6.18-rc4/include/asm-ia64/smp.h	2006-08-19 12:46:51.000000000 +0800
++++ linux-2.6.18-rc4-kdump/include/asm-ia64/smp.h	2006-08-19 12:54:10.000000000 +0800
+@@ -128,6 +128,9 @@ extern void smp_send_reschedule (int cpu
+ extern void lock_ipi_calllock(void);
+ extern void unlock_ipi_calllock(void);
+ extern void identify_siblings (struct cpuinfo_ia64 *);
++#ifdef CONFIG_KEXEC
++extern void kexec_stop_this_cpu(void *);
++#endif
+ 
+ #else
+ 
+diff -Nraup linux-2.6.18-rc4/kernel/irq/manage.c linux-2.6.18-rc4-kdump/kernel/irq/manage.c
+--- linux-2.6.18-rc4/kernel/irq/manage.c	2006-08-19 12:46:51.000000000 +0800
++++ linux-2.6.18-rc4-kdump/kernel/irq/manage.c	2006-08-19 12:54:10.000000000 +0800
+@@ -475,4 +475,3 @@ int request_irq(unsigned int irq,
+ 	return retval;
+ }
+ EXPORT_SYMBOL(request_irq);
+-
+
+_______________________________________________
+fastboot mailing list
+fastboot at lists.osdl.org
+https://lists.osdl.org/mailman/listinfo/fastboot

linux-2.6-x86-relocatable.patch:
 b/arch/i386/Kconfig                                              |   13 
 b/arch/i386/Makefile                                             |    2 
 b/arch/i386/boot/Makefile                                        |    2 
 b/arch/i386/boot/bootsect.S                                      |   97 +
 b/arch/i386/boot/compressed/Makefile                             |   22 
 b/arch/i386/boot/compressed/head.S                               |  184 ++-
 b/arch/i386/boot/compressed/misc.c                               |  513 ++++++---
 b/arch/i386/boot/compressed/relocs.c                             |  563 ++++++++++
 b/arch/i386/boot/compressed/vmlinux.lds                          |   40 
 b/arch/i386/boot/compressed/vmlinux.scr                          |    3 
 b/arch/i386/boot/setup.S                                         |   29 
 b/arch/i386/boot/tools/build.c                                   |  214 +++
 b/arch/i386/kernel/alternative.c                                 |    8 
 b/arch/i386/kernel/setup.c                                       |    4 
 b/arch/i386/kernel/vmlinux.lds.S                                 |  114 +-
 b/arch/i386/mm/init.c                                            |   15 
 b/arch/x86_64/Kconfig                                            |   19 
 b/arch/x86_64/boot/Makefile                                      |    2 
 b/arch/x86_64/boot/bootsect.S                                    |   93 +
 b/arch/x86_64/boot/compressed/Makefile                           |   13 
 b/arch/x86_64/boot/compressed/head.S                             |  301 +++--
 b/arch/x86_64/boot/compressed/misc.c                             |  500 ++++++--
 b/arch/x86_64/boot/compressed/vmlinux.lds                        |   44 
 b/arch/x86_64/boot/compressed/vmlinux.scr                        |    5 
 b/arch/x86_64/boot/tools/build.c                                 |  232 +++-
 b/arch/x86_64/defconfig                                          |    1 
 b/arch/x86_64/kernel/acpi/sleep.c                                |   19 
 b/arch/x86_64/kernel/acpi/wakeup.S                               |  325 ++---
 b/arch/x86_64/kernel/e820.c                                      |   13 
 b/arch/x86_64/kernel/early_printk.c                              |    3 
 b/arch/x86_64/kernel/head.S                                      |  326 ++---
 b/arch/x86_64/kernel/head64.c                                    |   35 
 b/arch/x86_64/kernel/setup.c                                     |   29 
 b/arch/x86_64/kernel/setup64.c                                   |    1 
 b/arch/x86_64/kernel/smp.c                                       |    2 
 b/arch/x86_64/kernel/suspend.c                                   |    3 
 b/arch/x86_64/kernel/trampoline.S                                |  168 ++
 b/arch/x86_64/kernel/vmlinux.lds.S                               |    2 
 b/arch/x86_64/kernel/vsyscall.c                                  |   10 
 b/arch/x86_64/mm/fault.c                                         |    4 
 b/arch/x86_64/mm/init.c                                          |  288 ++---
 b/arch/x86_64/mm/pageattr.c                                      |   20 
 b/include/asm-generic/vmlinux.lds.h                              |    2 
 b/include/asm-i386/page.h                                        |    4 
 b/include/asm-x86_64/const.h                                     |   20 
 b/include/asm-x86_64/page.h                                      |   44 
 b/include/asm-x86_64/pgtable.h                                   |   39 
 b/include/asm-x86_64/proto.h                                     |    2 
 b/include/asm-x86_64/segment.h                                   |    4 
 b/include/asm-x86_64/suspend.h                                   |   13 
 b/include/linux/elf.h                                            |   27 
 b/include/linux/elf_boot.h                                       |   19 
 b/include/linux/screen_info.h                                    |    3 
 b/scripts/kallsyms.c                                             |   30 
 linux-2.6.17.noarch/arch/x86_64/mm/init.c                        |    2 
 linux-2.6.18-rc3-1M-root/arch/i386/Kconfig                       |   34 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/bootsect.S               |    8 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/head.S        |   28 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/misc.c        |    7 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/vmlinux.lds   |    3 
 linux-2.6.18-rc3-1M-root/arch/i386/kernel/vmlinux.lds.S          |    5 
 linux-2.6.18-rc3-1M-root/arch/powerpc/kernel/vmlinux.lds.S       |    1 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/Makefile               |    3 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/compressed/vmlinux.lds |    2 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/tools/build.c          |  129 +-
 linux-2.6.18-rc3-1M-root/include/asm-i386/boot.h                 |    6 
 66 files changed, 3401 insertions(+), 1315 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6-x86-relocatable.patch
Index: linux-2.6-x86-relocatable.patch
===================================================================
RCS file: linux-2.6-x86-relocatable.patch
diff -N linux-2.6-x86-relocatable.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-x86-relocatable.patch	25 Aug 2006 19:18:19 -0000	1.2
@@ -0,0 +1,7129 @@
+diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
+index daa75ce..a0707d7 100644
+--- a/arch/i386/Kconfig
++++ b/arch/i386/Kconfig
+@@ -761,11 +761,24 @@ config CRASH_DUMP
+ 	help
+ 	  Generate crash dump after being started by kexec.
+ 
++config RELOCATABLE
++	bool "Build a relocatable kernel"
++	help
++	  This build a kernel image that retains relocation information
++          so it can be loaded someplace besides the default 1MB.
++	  The relocations tend to the kernel binary about 10% larger,
++          but are discarded at runtime.
++
++	  One use is for the kexec on panic case where the recovery kernel
++          must live at a different physical address than the primary
++          kernel.
++
+ config PHYSICAL_START
+ 	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
+ 
+ 	default "0x1000000" if CRASH_DUMP
+ 	default "0x100000"
++	range 0x100000 0x37c00000
+ 	help
+ 	  This gives the physical address where the kernel is loaded. Normally
+ 	  for regular kernels this value is 0x100000 (1MB). But in the case
+diff --git a/arch/i386/Makefile b/arch/i386/Makefile
+index 3e4adb1..e9d6eac 100644
+--- a/arch/i386/Makefile
++++ b/arch/i386/Makefile
+@@ -26,7 +26,7 @@ endif
+ 
+ LDFLAGS		:= -m elf_i386
+ OBJCOPYFLAGS	:= -O binary -R .note -R .comment -S
+-LDFLAGS_vmlinux :=
++LDFLAGS_vmlinux := --emit-relocs
+ CHECKFLAGS	+= -D__i386__
+ 
+ CFLAGS += -pipe -msoft-float
+diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
+index e979466..44ef35c 100644
+--- a/arch/i386/boot/Makefile
++++ b/arch/i386/boot/Makefile
+@@ -43,7 +43,7 @@ # --------------------------------------
+ 
+ quiet_cmd_image = BUILD   $@
+ cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/bootsect $(obj)/setup \
+-	    $(obj)/vmlinux.bin $(ROOT_DEV) > $@
++	    $(obj)/vmlinux.bin $(ROOT_DEV) vmlinux > $@
+ 
+ $(obj)/zImage $(obj)/bzImage: $(obj)/bootsect $(obj)/setup \
+ 			      $(obj)/vmlinux.bin $(obj)/tools/build FORCE
+diff --git a/arch/i386/boot/bootsect.S b/arch/i386/boot/bootsect.S
+index 011b7a4..847dc8f 100644
+--- a/arch/i386/boot/bootsect.S
++++ b/arch/i386/boot/bootsect.S
+@@ -13,6 +13,13 @@
+  *
+  */
+ 
++#include <linux/config.h>
++#include <linux/version.h>
++#include <linux/utsrelease.h>
++#include <linux/compile.h>
++#include <linux/elf.h>
++#include <linux/elf_boot.h>
++#include <asm/page.h>
+ #include <asm/boot.h>
+ 
+ SETUPSECTS	= 4			/* default nr of setup-sectors */
+@@ -42,10 +49,92 @@ #endif
+ 
+ .global _start
+ _start:
+-
++ehdr:
++	# e_ident is carefully crafted so if this is treated
++	# as an x86 bootsector you will execute through
++	# e_ident and then print the bugger off message.
++	# The 1 stores to bx+di is unfortunate it is
++	# unlikely to affect the ability to print
++	# a message and you aren't supposed to be booting a
++	# bzImage directly from a floppy anyway.
++
++	# e_ident
++	.byte ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3
++	.byte ELFCLASS32, ELFDATA2LSB, EV_CURRENT, ELFOSABI_STANDALONE
++	.byte 0xeb, 0x3d, 0, 0, 0, 0, 0, 0
++#ifndef CONFIG_RELOCATABLE
++	.word ET_EXEC				# e_type
++#else
++	.word ET_DYN				# e_type
++#endif
++	.word EM_386				# e_machine
++	.int  1					# e_version
++	.int  CONFIG_PHYSICAL_START		# e_entry
++	.int  phdr - _start			# e_phoff
++	.int  0					# e_shoff
++	.int  0					# e_flags
++	.word e_ehdr - ehdr			# e_ehsize
++	.word e_phdr1 - phdr			# e_phentsize
++	.word (e_phdr - phdr)/(e_phdr1 - phdr)	# e_phnum
++	.word 40				# e_shentsize
++	.word 0					# e_shnum
++	.word 0					# e_shstrndx
++e_ehdr:
++
++.org 71
++normalize:
+ 	# Normalize the start address
+ 	jmpl	$BOOTSEG, $start2
+ 
++.org 80
++phdr:
++	.int PT_LOAD					# p_type
++	.int (SETUPSECTS+1)*512				# p_offset
++	.int __PAGE_OFFSET + CONFIG_PHYSICAL_START	# p_vaddr
++	.int CONFIG_PHYSICAL_START			# p_paddr
++	.int SYSSIZE*16					# p_filesz
++	.int 0						# p_memsz
++	.int PF_R | PF_W | PF_X				# p_flags
++	.int 4*1024*1024				# p_align
++e_phdr1:
++
++	.int PT_NOTE					# p_type
++	.int b_note - _start				# p_offset
++	.int 0						# p_vaddr
++	.int 0						# p_paddr
++	.int e_note - b_note				# p_filesz
++	.int 0						# p_memsz
++	.int 0						# p_flags
++	.int 0						# p_align
++e_phdr:
++
++.macro note name, type
++	.balign 4
++	.int	2f - 1f			# n_namesz
++	.int	4f - 3f			# n_descsz
++	.int	\type			# n_type
++	.balign 4
++1:	.asciz "\name"
++2:	.balign 4
++3:
++.endm
++.macro enote
++4:	.balign 4
++.endm
++
++	.balign 4
++b_note:
++	note ELF_NOTE_BOOT, EIN_PROGRAM_NAME
++		.asciz	"Linux"
++	enote
++	note ELF_NOTE_BOOT, EIN_PROGRAM_VERSION
++		.asciz	UTS_RELEASE
++	enote
++	note ELF_NOTE_BOOT, EIN_ARGUMENT_STYLE
++		.asciz	"Linux"
++	enote
++e_note:
++
+ start2:
+ 	movw	%cs, %ax
+ 	movw	%ax, %ds
+@@ -78,11 +167,11 @@ die:
+ 
+ 
+ bugger_off_msg:
+-	.ascii	"Direct booting from floppy is no longer supported.\r\n"
+-	.ascii	"Please use a boot loader program instead.\r\n"
++	.ascii	"Booting linux without a boot loader is no longer supported.\r\n"
+ 	.ascii	"\n"
+-	.ascii	"Remove disk and press any key to reboot . . .\r\n"
++	.ascii	"Press any key to reboot . . .\r\n"
+ 	.byte	0
++ebugger_off_msg:
+ 
+ 
+ 	# Kernel attributes; used by setup
+diff --git a/arch/i386/boot/compressed/Makefile b/arch/i386/boot/compressed/Makefile
+index 258ea95..1c486d1 100644
+--- a/arch/i386/boot/compressed/Makefile
++++ b/arch/i386/boot/compressed/Makefile
+@@ -7,19 +7,33 @@ #
+ targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
+ EXTRA_AFLAGS	:= -traditional
+ 
+-LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup_32
++LDFLAGS_vmlinux := -T
++CFLAGS_misc.o += -fPIC
[...6736 lines suppressed...]
++	  alignment restrictions.
+ 
+ 	  Don't change this unless you know what you are doing.
+ 
+diff -puN include/asm-i386/boot.h~i386-implement-config-physical-align-option include/asm-i386/boot.h
+--- linux-2.6.18-rc3-1M/include/asm-i386/boot.h~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
++++ linux-2.6.18-rc3-1M-root/include/asm-i386/boot.h	2006-08-17 10:56:46.000000000 -0400
+@@ -12,4 +12,8 @@
+ #define EXTENDED_VGA	0xfffe		/* 80x50 mode */
+ #define ASK_VGA		0xfffd		/* ask for it at bootup */
+ 
+-#endif
++/* Physical address where kenrel should be loaded. */
++#define LOAD_PHYSICAL_ADDR ((0x100000 + CONFIG_PHYSICAL_ALIGN - 1) \
++				& ~(CONFIG_PHYSICAL_ALIGN - 1))
++
++#endif /* _LINUX_BOOT_H */
+diff -puN arch/i386/kernel/vmlinux.lds.S~i386-implement-config-physical-align-option arch/i386/kernel/vmlinux.lds.S
+--- linux-2.6.18-rc3-1M/arch/i386/kernel/vmlinux.lds.S~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
++++ linux-2.6.18-rc3-1M-root/arch/i386/kernel/vmlinux.lds.S	2006-08-17 10:56:46.000000000 -0400
+@@ -2,13 +2,14 @@
+  * Written by Martin Mares <mj at atrey.karlin.mff.cuni.cz>;
+  */
+ 
+-#define LOAD_OFFSET __PAGE_OFFSET
++#define LOAD_OFFSET	__PAGE_OFFSET
+ 
+ #include <linux/config.h>
+ #include <asm-generic/vmlinux.lds.h>
+ #include <asm/thread_info.h>
+ #include <asm/page.h>
+ #include <asm/cache.h>
++#include <asm/boot.h>
+ 
+ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+ OUTPUT_ARCH(i386)
+@@ -16,7 +17,7 @@ ENTRY(phys_startup_32)
+ jiffies = jiffies_64;
+ SECTIONS
+ {
+-  . = LOAD_OFFSET + CONFIG_PHYSICAL_START;
++  . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
+   phys_startup_32 = startup_32 - LOAD_OFFSET;
+   /* read-only */
+   .text : AT(ADDR(.text) - LOAD_OFFSET) {
+diff -puN arch/i386/boot/bootsect.S~i386-implement-config-physical-align-option arch/i386/boot/bootsect.S
+--- linux-2.6.18-rc3-1M/arch/i386/boot/bootsect.S~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
++++ linux-2.6.18-rc3-1M-root/arch/i386/boot/bootsect.S	2006-08-17 12:37:19.000000000 -0400
+@@ -69,7 +69,7 @@ ehdr:
+ #endif
+ 	.word EM_386				# e_machine
+ 	.int  1					# e_version
+-	.int  CONFIG_PHYSICAL_START		# e_entry
++	.int  LOAD_PHYSICAL_ADDR		# e_entry
+ 	.int  phdr - _start			# e_phoff
+ 	.int  0					# e_shoff
+ 	.int  0					# e_flags
+@@ -90,12 +90,12 @@ normalize:
+ phdr:
+ 	.int PT_LOAD					# p_type
+ 	.int (SETUPSECTS+1)*512				# p_offset
+-	.int __PAGE_OFFSET + CONFIG_PHYSICAL_START	# p_vaddr
+-	.int CONFIG_PHYSICAL_START			# p_paddr
++	.int LOAD_PHYSICAL_ADDR + __PAGE_OFFSET		# p_vaddr
++	.int LOAD_PHYSICAL_ADDR				# p_paddr
+ 	.int SYSSIZE*16					# p_filesz
+ 	.int 0						# p_memsz
+ 	.int PF_R | PF_W | PF_X				# p_flags
+-	.int 4*1024*1024				# p_align
++	.int CONFIG_PHYSICAL_ALIGN			# p_align
+ e_phdr1:
+ 
+ 	.int PT_NOTE					# p_type
+diff -puN arch/i386/boot/compressed/vmlinux.lds~i386-implement-config-physical-align-option arch/i386/boot/compressed/vmlinux.lds
+--- linux-2.6.18-rc3-1M/arch/i386/boot/compressed/vmlinux.lds~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
++++ linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/vmlinux.lds	2006-08-17 10:56:46.000000000 -0400
+@@ -3,6 +3,9 @@ OUTPUT_ARCH(i386)
+ ENTRY(startup_32)
+ SECTIONS
+ {
++        /* Be careful parts of head.S assume startup_32 is at
++         * address 0.
++	 */
+ 	. =  0 	;
+ 	.text.head : {
+ 		_head = . ;
+diff -puN arch/i386/boot/compressed/head.S~i386-implement-config-physical-align-option arch/i386/boot/compressed/head.S
+--- linux-2.6.18-rc3-1M/arch/i386/boot/compressed/head.S~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
++++ linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/head.S	2006-08-17 11:12:51.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <linux/linkage.h>
+ #include <asm/segment.h>
+ #include <asm/page.h>
++#include <asm/boot.h>
+ 
+ .section ".text.head"
+ 	.globl startup_32
+@@ -53,17 +54,19 @@ startup_32:
+ 1:	popl %ebp
+ 	subl $1b, %ebp
+ 
+-/* Compute the delta between where we were compiled to run at
+- * and where the code will actually run at.
++
++/* %ebp contains the address we are loaded at by the boot loader and %ebx
++ * contains the address where we should move the kernel image temporarily
++ * for safe in-place decompression.
+  */
+-	/* Start with the delta to where the kernel will run at.  If we are
+-	 * a relocatable kernel this is the delta to our load address otherwise
+-	 * this is the delta to CONFIG_PHYSICAL start.
+-	 */
++
+ #ifdef CONFIG_RELOCTABLE
+-	movl %ebp, %ebx
++	movl 	%ebp, %ebx
++	addl    $(CONFIG_PHYSICAL_ALIGN - 1), %ebx
++	andl    $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebx
++
+ #else
+-	movl $(CONFIG_PHYSICAL_START - startup_32), %ebx
++	movl $LOAD_PHYSICAL_ADDR, %ebx
+ #endif
+ 
+ 	/* Replace the compressed data size with the uncompressed size */
+@@ -95,9 +98,10 @@ startup_32:
+ /* Compute the kernel start address.
+  */
+ #ifdef CONFIG_RELOCATABLE
+-	leal	startup_32(%ebp), %ebp
++	addl    $(CONFIG_PHYSICAL_ALIGN - 1), %ebp
++	andl    $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebp
+ #else
+-	movl	$CONFIG_PHYSICAL_START, %ebp
++	movl	$LOAD_PHYSICAL_ADDR, %ebp
+ #endif
+ 
+ /*
+@@ -151,8 +155,8 @@ relocated:
+  * and where it was actually loaded.
+  */
+ 	movl %ebp, %ebx
+-	subl $CONFIG_PHYSICAL_START, %ebx
+-
++	subl $LOAD_PHYSICAL_ADDR, %ebx
++	jz   2f		/* Nothing to be done if loaded at compiled addr. */
+ /*
+  * Process relocations.
+  */
+diff -puN arch/i386/boot/compressed/misc.c~i386-implement-config-physical-align-option arch/i386/boot/compressed/misc.c
+--- linux-2.6.18-rc3-1M/arch/i386/boot/compressed/misc.c~i386-implement-config-physical-align-option	2006-08-17 10:56:46.000000000 -0400
++++ linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/misc.c	2006-08-17 11:19:05.000000000 -0400
+@@ -18,6 +18,7 @@
+ #include <asm/io.h>
+ #include <asm/setup.h>
+ #include <asm/page.h>
++#include <asm/boot.h>
+ 
+ /* WARNING!!
+  * This code is compiled with -fPIC and it is relocated dynamically
+@@ -585,12 +586,12 @@ asmlinkage void decompress_kernel(void *
+ 	insize = input_len;
+ 	inptr  = 0;
+ 
+-	if (((u32)output - CONFIG_PHYSICAL_START) & 0x3fffff)
+-		error("Destination address not 4M aligned");
++	if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1))
++		error("Destination address not CONFIG_PHYSICAL_ALIGN aligned");
+ 	if (end > ((-__PAGE_OFFSET-(512 <<20)-1) & 0x7fffffff))
+ 		error("Destination address too large");
+ #ifndef CONFIG_RELOCATABLE
+-	if ((u32)output != CONFIG_PHYSICAL_START)
++	if ((u32)output != LOAD_PHYSICAL_ADDR)
+ 		error("Wrong destination address");
+ #endif
+ 
+_
+
+
+o ppc64 does not seem to be defining symbol _text  which is used by
+  kernel/kallsyms.c
+
+Signed-off-by: Vivek Goyal <vgoyal at in.ibm.com>
+---
+
+ arch/powerpc/kernel/vmlinux.lds.S |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff -puN arch/powerpc/kernel/vmlinux.lds.S~ppc64-compilation-fix arch/powerpc/kernel/vmlinux.lds.S
+--- linux-2.6.18-rc3-1M/arch/powerpc/kernel/vmlinux.lds.S~ppc64-compilation-fix	2006-08-24 16:16:17.000000000 -0400
++++ linux-2.6.18-rc3-1M-root/arch/powerpc/kernel/vmlinux.lds.S	2006-08-24 16:26:33.000000000 -0400
+@@ -33,6 +33,7 @@ SECTIONS
+ 
+ 	/* Text and gots */
+ 	.text : {
++		_text = .;
+ 		*(.text .text.*)
+ 		SCHED_TEXT
+ 		LOCK_TEXT
+_

linux-2.6-xen-x86-relocatable.patch:
 arch/i386/kernel/head-xen.S               |    5 
 arch/i386/kernel/setup-xen.c              |    4 
 arch/i386/kernel/traps-xen.c              |    2 
 arch/i386/kernel/traps.c                  |    2 
 arch/i386/kernel/vmlinux.lds.S            |    6 
 arch/i386/mm/init-xen.c                   |   17 -
 arch/i386/mm/init.c                       |    2 
 arch/x86_64/kernel/e820-xen.c             |   13 -
 arch/x86_64/kernel/early_printk-xen.c     |    3 
 arch/x86_64/kernel/head-xen.S             |   19 -
 arch/x86_64/kernel/head64-xen.c           |   33 ++-
 arch/x86_64/kernel/setup-xen.c            |   30 +-
 arch/x86_64/kernel/setup64-xen.c          |    1 
 arch/x86_64/kernel/smp-xen.c              |    2 
 arch/x86_64/kernel/vmlinux.lds.S          |    5 
 arch/x86_64/kernel/vsyscall-xen.c         |   10 
 arch/x86_64/mm/fault-xen.c                |    4 
 arch/x86_64/mm/init-xen.c                 |  314 +++++++++++++++++-------------
 arch/x86_64/mm/pageattr-xen.c             |   20 +
 include/asm-i386/mach-xen/asm/page.h      |    4 
 include/asm-x86_64/mach-xen/asm/page.h    |   41 +--
 include/asm-x86_64/mach-xen/asm/pgtable.h |   39 ++-
 22 files changed, 326 insertions(+), 250 deletions(-)

Index: linux-2.6-xen-x86-relocatable.patch
===================================================================
RCS file: linux-2.6-xen-x86-relocatable.patch
diff -N linux-2.6-xen-x86-relocatable.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-xen-x86-relocatable.patch	25 Aug 2006 19:18:19 -0000	1.2
@@ -0,0 +1,1273 @@
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/kernel/head-xen.S linux-2.6.17.work/arch/i386/kernel/head-xen.S
+--- linux-2.6.17.reloc/arch/i386/kernel/head-xen.S	2006-08-24 14:49:28.000000000 +0200
++++ linux-2.6.17.work/arch/i386/kernel/head-xen.S	2006-08-24 16:16:09.000000000 +0200
+@@ -5,6 +5,7 @@
+ #include <linux/linkage.h>
+ #include <asm/segment.h>
+ #include <asm/page.h>
++#include <asm/boot.h>
+ #include <asm/thread_info.h>
+ #include <asm/asm-offsets.h>
+ #include <xen/interface/arch-x86_32.h>
+@@ -163,9 +164,9 @@ ENTRY(cpu_gdt_table)
+ 	.ascii	",ELF_PADDR_OFFSET=0x0"
+ #endif /* !CONFIG_XEN_COMPAT_030002 */
+ 	.ascii	",VIRT_ENTRY=0x"
+-		utoa (__PAGE_OFFSET + __PHYSICAL_START + VIRT_ENTRY_OFFSET)
++		utoa (__PAGE_OFFSET + LOAD_PHYSICAL_ADDR + VIRT_ENTRY_OFFSET)
+ 	.ascii	",HYPERCALL_PAGE=0x"
+-		utoa ((__PHYSICAL_START+HYPERCALL_PAGE_OFFSET)>>PAGE_SHIFT)
++		utoa ((LOAD_PHYSICAL_ADDR + HYPERCALL_PAGE_OFFSET)>>PAGE_SHIFT)
+ 	.ascii  ",FEATURES=writable_page_tables"
+ 	.ascii	         "|writable_descriptor_tables"
+ 	.ascii	         "|auto_translated_physmap"
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/kernel/setup-xen.c linux-2.6.17.work/arch/i386/kernel/setup-xen.c
+--- linux-2.6.17.reloc/arch/i386/kernel/setup-xen.c	2006-08-24 14:49:28.000000000 +0200
++++ linux-2.6.17.work/arch/i386/kernel/setup-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -1292,8 +1292,8 @@ void __init setup_bootmem_allocator(void
+ 	 * the (very unlikely) case of us accidentally initializing the
+ 	 * bootmem allocator with an invalid RAM area.
+ 	 */
+-	reserve_bootmem(__PHYSICAL_START, (PFN_PHYS(min_low_pfn) +
+-			 bootmap_size + PAGE_SIZE-1) - (__PHYSICAL_START));
++	reserve_bootmem(__pa_symbol(_text), (PFN_PHYS(min_low_pfn) +
++			 bootmap_size + PAGE_SIZE-1) - __pa_symbol(_text));
+ 
+ #ifndef CONFIG_XEN
+ 	/*
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/kernel/traps.c linux-2.6.17.work/arch/i386/kernel/traps.c
+--- linux-2.6.17.reloc/arch/i386/kernel/traps.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/i386/kernel/traps.c	2006-08-24 14:59:36.000000000 +0200
+@@ -1192,7 +1192,7 @@ asmlinkage void math_emulate(long arg)
+ #ifdef CONFIG_X86_F00F_BUG
+ void __init trap_init_f00f_bug(void)
+ {
+-	__set_fixmap(FIX_F00F_IDT, __pa(&idt_table), PAGE_KERNEL_RO);
++	__set_fixmap(FIX_F00F_IDT, __pa_symbol(&idt_table), PAGE_KERNEL_RO);
+ 
+ 	/*
+ 	 * Update the IDT descriptor and reload the IDT so that
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/kernel/traps-xen.c linux-2.6.17.work/arch/i386/kernel/traps-xen.c
+--- linux-2.6.17.reloc/arch/i386/kernel/traps-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/i386/kernel/traps-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -1180,7 +1180,7 @@ asmlinkage void math_emulate(long arg)
+ #ifdef CONFIG_X86_F00F_BUG
+ void __init trap_init_f00f_bug(void)
+ {
+-	__set_fixmap(FIX_F00F_IDT, __pa(&idt_table), PAGE_KERNEL_RO);
++	__set_fixmap(FIX_F00F_IDT, __pa_symbol(&idt_table), PAGE_KERNEL_RO);
+ 
+ 	/*
+ 	 * Update the IDT descriptor and reload the IDT so that
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/kernel/vmlinux.lds.S linux-2.6.17.work/arch/i386/kernel/vmlinux.lds.S
+--- linux-2.6.17.reloc/arch/i386/kernel/vmlinux.lds.S	2006-08-24 14:56:40.000000000 +0200
++++ linux-2.6.17.work/arch/i386/kernel/vmlinux.lds.S	2006-08-24 15:56:34.000000000 +0200
+@@ -17,7 +17,13 @@ ENTRY(phys_startup_32)
+ jiffies = jiffies_64;
+ SECTIONS
+ {
++/* xen i386 redefineds LOAD_OFFSET to zero on page.h
++   quintela at redhat.com */
++#ifdef CONFIG_XEN
++  . = __PAGE_OFFSET + LOAD_PHYSICAL_ADDR;
++#else
+   . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
++#endif
+   phys_startup_32 = startup_32 - LOAD_OFFSET;
+   /* read-only */
+   .text : AT(ADDR(.text) - LOAD_OFFSET) {
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/mm/init.c linux-2.6.17.work/arch/i386/mm/init.c
+--- linux-2.6.17.reloc/arch/i386/mm/init.c	2006-08-24 14:56:40.000000000 +0200
++++ linux-2.6.17.work/arch/i386/mm/init.c	2006-08-24 14:59:36.000000000 +0200
+@@ -563,7 +563,7 @@ static void __init test_wp_bit(void)
+ 	printk("Checking if this processor honours the WP bit even in supervisor mode... ");
+ 
+ 	/* Any page-aligned address will do, the test is non-destructive */
+-	__set_fixmap(FIX_WP_TEST, __pa(&swapper_pg_dir), PAGE_READONLY);
++	__set_fixmap(FIX_WP_TEST, __pa_symbol(&swapper_pg_dir), PAGE_READONLY);
+ 	boot_cpu_data.wp_works_ok = do_test_wp_bit();
+ 	clear_fixmap(FIX_WP_TEST);
+ 
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/i386/mm/init-xen.c linux-2.6.17.work/arch/i386/mm/init-xen.c
+--- linux-2.6.17.reloc/arch/i386/mm/init-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/i386/mm/init-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -611,7 +611,7 @@ static void __init test_wp_bit(void)
+ 	printk("Checking if this processor honours the WP bit even in supervisor mode... ");
+ 
+ 	/* Any page-aligned address will do, the test is non-destructive */
+-	__set_fixmap(FIX_WP_TEST, __pa(&swapper_pg_dir), PAGE_READONLY);
++	__set_fixmap(FIX_WP_TEST, __pa_symbol(&swapper_pg_dir), PAGE_READONLY);
+ 	boot_cpu_data.wp_works_ok = do_test_wp_bit();
+ 	clear_fixmap(FIX_WP_TEST);
+ 
+@@ -851,10 +851,11 @@ void free_init_pages(char *what, unsigne
+ 	unsigned long addr;
+ 
+ 	for (addr = begin; addr < end; addr += PAGE_SIZE) {
+-		ClearPageReserved(virt_to_page(addr));
+-		init_page_count(virt_to_page(addr));
+-		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
+-		free_page(addr);
++		struct page *page = pfn_to_page(addr >> PAGE_SHIFT);
++		ClearPageReserved(page);
++		init_page_count(page);
++		memset(page_address(page), POISON_FREE_INITMEM, PAGE_SIZE);
++		__free_page(page);
+ 		totalram_pages++;
+ 	}
+ 	printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
+@@ -863,14 +864,14 @@ void free_init_pages(char *what, unsigne
+ void free_initmem(void)
+ {
+ 	free_init_pages("unused kernel memory",
+-			(unsigned long)(&__init_begin),
+-			(unsigned long)(&__init_end));
++			__pa_symbol(&__init_begin),
++			__pa_symbol(&__init_end));
+ }
+ 
+ #ifdef CONFIG_BLK_DEV_INITRD
+ void free_initrd_mem(unsigned long start, unsigned long end)
+ {
+-	free_init_pages("initrd memory", start, end);
++	free_init_pages("initrd memory", __pa_symbol(start), __pa_symbol(end));
+ }
+ #endif
+ 
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/e820-xen.c linux-2.6.17.work/arch/x86_64/kernel/e820-xen.c
+--- linux-2.6.17.reloc/arch/x86_64/kernel/e820-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/kernel/e820-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -72,9 +72,14 @@ static inline int bad_addr(unsigned long
+ 		return 1;
+ 	} 
+ #endif
+-	/* kernel code + 640k memory hole (later should not be needed, but 
++	/* 640k memory hole (later should not be needed, but
+ 	   be paranoid for now) */
+-	if (last >= 640*1024 && addr < __pa_symbol(&_end)) { 
++	if (last >= 640*1024 && addr < HIGH_MEMORY) {
++		*addrp = HIGH_MEMORY;
++	}
++
++	/* kernel code */
++	if (last >= __pa_symbol(&_text) && addr < __pa_symbol(&_end)) {
+ 		*addrp = __pa_symbol(&_end);
+ 		return 1;
+ 	}
+@@ -214,8 +219,8 @@ unsigned long __init e820_end_of_ram(voi
+ 		if (start >= end)
+ 			continue;
+ 		if (ei->type == E820_RAM) { 
+-		if (end > end_pfn<<PAGE_SHIFT)
+-			end_pfn = end>>PAGE_SHIFT;
++			if (end > end_pfn<<PAGE_SHIFT)
++				end_pfn = end>>PAGE_SHIFT;
+ 		} else { 
+ 			if (end > end_pfn_map<<PAGE_SHIFT) 
+ 				end_pfn_map = end>>PAGE_SHIFT;
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/early_printk-xen.c linux-2.6.17.work/arch/x86_64/kernel/early_printk-xen.c
+--- linux-2.6.17.reloc/arch/x86_64/kernel/early_printk-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/kernel/early_printk-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -12,11 +12,10 @@
+ 
+ #ifdef __i386__
+ #include <asm/setup.h>
+-#define VGABASE		(__ISA_IO_base + 0xb8000)
+ #else
+ #include <asm/bootsetup.h>
+-#define VGABASE		((void __iomem *)0xffffffff800b8000UL)
+ #endif
++#define VGABASE		(__ISA_IO_base + 0xb8000)
+ 
+ static int max_ypos = 25, max_xpos = 80;
+ static int current_ypos = 25, current_xpos = 0;
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/head64-xen.c linux-2.6.17.work/arch/x86_64/kernel/head64-xen.c
+--- linux-2.6.17.reloc/arch/x86_64/kernel/head64-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/kernel/head64-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -22,13 +22,21 @@
+ #include <asm/setup.h>
+ #include <asm/desc.h>
+ #include <asm/pgtable.h>
++#include <asm/tlbflush.h>
+ #include <asm/sections.h>
+ 
+ unsigned long start_pfn;
+ 
++#if 0
++static void __init zap_identity_mappings(void)
++{
++	pgd_t *pgd = pgd_offset_k(0UL);
++	pgd_clear(pgd);
++	__flush_tlb();
++}
++
+ /* Don't add a printk in there. printk relies on the PDA which is not initialized 
+    yet. */
+-#if 0
+ static void __init clear_bss(void)
+ {
+ 	memset(__bss_start, 0,
+@@ -37,30 +45,29 @@ static void __init clear_bss(void)
+ #endif
+ 
+ #define NEW_CL_POINTER		0x228	/* Relative to real mode data */
+-#define OLD_CL_MAGIC_ADDR	0x90020
++#define OLD_CL_MAGIC_ADDR	0x20
+ #define OLD_CL_MAGIC            0xA33F
+-#define OLD_CL_BASE_ADDR        0x90000
+-#define OLD_CL_OFFSET           0x90022
++#define OLD_CL_OFFSET           0x22
+ 
+ extern char saved_command_line[];
+ 
+ static void __init copy_bootdata(char *real_mode_data)
+ {
+ #ifndef CONFIG_XEN
+-	int new_data;
++	unsigned long new_data;
+ 	char * command_line;
+ 
+ 	memcpy(x86_boot_params, real_mode_data, BOOT_PARAM_SIZE);
+-	new_data = *(int *) (x86_boot_params + NEW_CL_POINTER);
++	new_data = *(u32 *) (x86_boot_params + NEW_CL_POINTER);
+ 	if (!new_data) {
+-		if (OLD_CL_MAGIC != * (u16 *) OLD_CL_MAGIC_ADDR) {
++		if (OLD_CL_MAGIC != *(u16 *)(real_mode_data + OLD_CL_MAGIC_ADDR)) {
+ 			printk("so old bootloader that it does not support commandline?!\n");
+ 			return;
+ 		}
+-		new_data = OLD_CL_BASE_ADDR + * (u16 *) OLD_CL_OFFSET;
++		new_data = __pa(real_mode_data) + *(u16 *)(read_mode_data + OLD_CL_OFFSET);
+ 		printk("old bootloader convention, maybe loadlin?\n");
+ 	}
+-	command_line = (char *) ((u64)(new_data));
++	command_line = __va(new_data);
+ 	memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
+ #else
+ 	int max_cmdline;
+@@ -104,6 +111,10 @@ void __init x86_64_start_kernel(char * r
+ 	char *s;
+ 	int i;
+ 
++#if 0
++	/* Make NULL pointers segfault */
++	zap_identity_mappings();
++#endif
+ 	xen_start_info = (struct start_info *)real_mode_data;
+ 	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+ 		phys_to_machine_mapping =
+@@ -136,7 +147,7 @@ void __init x86_64_start_kernel(char * r
+  		cpu_pda(i) = &boot_cpu_pda[i];
+ 
+ 	pda_init(0);
+-	copy_bootdata(real_mode_data);
++	copy_bootdata(__va(real_mode_data));
+ #ifdef CONFIG_SMP
+ 	cpu_set(0, cpu_online_map);
+ #endif
+@@ -153,7 +164,7 @@ void __init x86_64_start_kernel(char * r
+ 		disable_apic = 1;
+ #endif
+ 	/* You need early console to see that */
+-	if (__pa_symbol(&_end) >= KERNEL_TEXT_SIZE)
++	if (((unsigned long)&_end) >= (__START_KERNEL_map + KERNEL_TEXT_SIZE))
+ 		panic("Kernel too big for kernel mapping\n");
+ 
+ 	setup_boot_cpu_data();
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/head-xen.S linux-2.6.17.work/arch/x86_64/kernel/head-xen.S
+--- linux-2.6.17.reloc/arch/x86_64/kernel/head-xen.S	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/kernel/head-xen.S	2006-08-24 14:59:36.000000000 +0200
+@@ -18,6 +18,7 @@
+ #include <linux/init.h>
+ #include <asm/desc.h>
+ #include <asm/segment.h>
++#include <asm/pgtable.h>
+ #include <asm/page.h>
+ #include <asm/msr.h>
+ #include <asm/cache.h>
+@@ -29,6 +30,7 @@
+ .org VIRT_ENTRY_OFFSET
+ 	.globl startup_64
+ startup_64:
++ENTRY(secondary_startup_64)
+ ENTRY(_start)
+ 	movq $(init_thread_union+THREAD_SIZE-8),%rsp
+ 	/* zero EFLAGS after setting rsp */
+@@ -47,7 +49,7 @@ ENTRY(_stext)
+ #define NEXT_PAGE(name) \
+ 	$page = $page + 1; \
+ 	.org $page * 0x1000; \
+-	phys_/**/name = $page * 0x1000 + __PHYSICAL_START; \
++	phys_/**/name = $page * 0x1000 + 0x200000; \
+ ENTRY(name)
+ 
+ NEXT_PAGE(init_level4_pgt)
+@@ -110,13 +112,12 @@ gdt:
+ 
+ ENTRY(cpu_gdt_table)
+ 	.quad	0x0000000000000000	/* NULL descriptor */
+-	.quad	0x0			/* unused */
+-	.quad	0x00af9a000000ffff	/* __KERNEL_CS */
+-	.quad	0x00cf92000000ffff	/* __KERNEL_DS */
+-	.quad	0x00cffa000000ffff	/* __USER32_CS */
+-	.quad	0x00cff2000000ffff	/* __USER_DS, __USER32_DS  */
+-	.quad	0x00affa000000ffff	/* __USER_CS */
+-	.quad	0x00cf9a000000ffff	/* __KERNEL32_CS */
++	.quad	0x00cf9b000000ffff	/* __KERNEL32_CS */
++	.quad	0x00af9b000000ffff	/* __KERNEL_CS */
++	.quad	0x00cf93000000ffff	/* __KERNEL_DS */
++	.quad	0x00cffb000000ffff	/* __USER32_CS */
++	.quad	0x00cff3000000ffff	/* __USER_DS, __USER32_DS  */
++	.quad	0x00affb000000ffff	/* __USER_CS */
+ 	.quad	0,0			/* TSS */
+ 	.quad	0,0			/* LDT */
+ 	.quad   0,0,0			/* three TLS descriptors */
+@@ -165,7 +166,7 @@ ENTRY(empty_zero_page)
+ 	.ascii	",ELF_PADDR_OFFSET=0x0"
+ #endif /* !CONFIG_XEN_COMPAT_030002 */
+ 	.ascii	",VIRT_ENTRY=0x"
+-		utoh (__START_KERNEL_map + __PHYSICAL_START + VIRT_ENTRY_OFFSET)
++		utoh (__START_KERNEL_map + 0x200000 + VIRT_ENTRY_OFFSET)
+ 	.ascii	",HYPERCALL_PAGE=0x"
+ 		utoh (phys_hypercall_page >> PAGE_SHIFT)
+ 	.ascii  ",FEATURES=writable_page_tables"
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/setup64-xen.c linux-2.6.17.work/arch/x86_64/kernel/setup64-xen.c
+--- linux-2.6.17.reloc/arch/x86_64/kernel/setup64-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/kernel/setup64-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -234,7 +234,6 @@ void __cpuinit cpu_init (void)
+ 	/* CPU 0 is initialised in head64.c */
+ 	if (cpu != 0) {
+ 		pda_init(cpu);
+-		zap_low_mappings(cpu);
+ 	}
+ #ifndef CONFIG_X86_NO_TSS
+ 	else
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/setup-xen.c linux-2.6.17.work/arch/x86_64/kernel/setup-xen.c
+--- linux-2.6.17.reloc/arch/x86_64/kernel/setup-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/kernel/setup-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -559,10 +559,10 @@ static void discover_ebda(void)
+ 	 * there is a real-mode segmented pointer pointing to the 
+ 	 * 4K EBDA area at 0x40E
+ 	 */
+-	ebda_addr = *(unsigned short *)EBDA_ADDR_POINTER;
++	ebda_addr = *(unsigned short *)__va(EBDA_ADDR_POINTER);
+ 	ebda_addr <<= 4;
+ 
+-	ebda_size = *(unsigned short *)(unsigned long)ebda_addr;
++	ebda_size = *(unsigned short *)__va(ebda_addr);
+ 
+ 	/* Round EBDA up to pages */
+ 	if (ebda_size == 0)
+@@ -576,7 +576,7 @@ static void discover_ebda(void)
+ 
+ void __init setup_arch(char **cmdline_p)
+ {
+-	unsigned long kernel_end;
++	unsigned long kernel_start, kernel_end;
+ 
+ #if defined(CONFIG_XEN_PRIVILEGED_GUEST)
+ 	struct e820entry *machine_e820;
+@@ -643,11 +643,12 @@ void __init setup_arch(char **cmdline_p)
+ 	init_mm.end_code = (unsigned long) &_etext;
+ 	init_mm.end_data = (unsigned long) &_edata;
+ 	init_mm.brk = (unsigned long) &_end;
++	init_mm.pgd = __va(__pa_symbol(&init_level4_pgt));
+ 
+-	code_resource.start = virt_to_phys(&_text);
+-	code_resource.end = virt_to_phys(&_etext)-1;
+-	data_resource.start = virt_to_phys(&_etext);
+-	data_resource.end = virt_to_phys(&_edata)-1;
++	code_resource.start = __pa_symbol(&_text);
++	code_resource.end = __pa_symbol(&_etext)-1;
++	data_resource.start = __pa_symbol(&_etext);
++	data_resource.end = __pa_symbol(&_edata)-1;
+ 
+ 	parse_cmdline_early(cmdline_p);
+ 
+@@ -686,8 +687,9 @@ void __init setup_arch(char **cmdline_p)
+ 				(table_end - table_start) << PAGE_SHIFT);
+ 
+ 	/* reserve kernel */
++	kernel_start = __pa_symbol(&_text);
+ 	kernel_end = round_up(__pa_symbol(&_end),PAGE_SIZE);
+-	reserve_bootmem_generic(HIGH_MEMORY, kernel_end - HIGH_MEMORY);
++	reserve_bootmem_generic(kernel_start, kernel_end - kernel_start);
+ 
+ #ifdef CONFIG_XEN
+ 	/* reserve physmap, start info and initial page tables */
+@@ -705,15 +707,8 @@ void __init setup_arch(char **cmdline_p)
+ #endif
+ 
+ #ifdef CONFIG_SMP
+-	/*
+-	 * But first pinch a few for the stack/trampoline stuff
+-	 * FIXME: Don't need the extra page at 4K, but need to fix
+-	 * trampoline before removing it. (see the GDT stuff)
+-	 */
+-	reserve_bootmem_generic(PAGE_SIZE, PAGE_SIZE);
+-
+ 	/* Reserve SMP trampoline */
+-	reserve_bootmem_generic(SMP_TRAMPOLINE_BASE, PAGE_SIZE);
++	reserve_bootmem_generic(SMP_TRAMPOLINE_BASE, 2*PAGE_SIZE);
+ #endif
+ 
+ #ifdef CONFIG_ACPI_SLEEP
+@@ -833,9 +828,6 @@ void __init setup_arch(char **cmdline_p)
+ #ifndef CONFIG_XEN
+ 	check_ioapic();
+ #endif
+-
+-	zap_low_mappings(0);
+-
+ 	/*
+ 	 * set this early, so we dont allocate cpu0
+ 	 * if MADT list doesnt list BSP first
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/smp-xen.c linux-2.6.17.work/arch/x86_64/kernel/smp-xen.c
+--- linux-2.6.17.reloc/arch/x86_64/kernel/smp-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/kernel/smp-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -81,7 +81,7 @@ static inline void leave_mm(unsigned lon
+ 	if (read_pda(mmu_state) == TLBSTATE_OK)
+ 		BUG();
+ 	cpu_clear(cpu, read_pda(active_mm)->cpu_vm_mask);
+-	load_cr3(swapper_pg_dir);
++	load_cr3(init_mm.pgd);
+ }
+ 
+ #ifndef CONFIG_XEN
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/vmlinux.lds.S linux-2.6.17.work/arch/x86_64/kernel/vmlinux.lds.S
+--- linux-2.6.17.reloc/arch/x86_64/kernel/vmlinux.lds.S	2006-08-24 14:56:40.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/kernel/vmlinux.lds.S	2006-08-24 14:59:36.000000000 +0200
+@@ -15,7 +15,12 @@ ENTRY(phys_startup_64)
+ jiffies_64 = jiffies;
+ SECTIONS
+ {
++/* XEN x86_64 don't work with relocations yet quintela at redhat.com */
++#ifdef CONFIG_X86_64_XEN
++  . = __START_KERNEL_map + 0x200000;
++#else	
+   . = __START_KERNEL_map;
++#endif
+   phys_startup_64 = startup_64 - LOAD_OFFSET;
+   _text = .;			/* Text and read-only data */
+   .text :  AT(ADDR(.text) - LOAD_OFFSET) {
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/kernel/vsyscall-xen.c linux-2.6.17.work/arch/x86_64/kernel/vsyscall-xen.c
+--- linux-2.6.17.reloc/arch/x86_64/kernel/vsyscall-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/kernel/vsyscall-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -41,6 +41,12 @@ seqlock_t __xtime_lock __section_xtime_l
+ 
+ #include <asm/unistd.h>
+ 
++#define __pa_vsymbol(x)			\
++	({unsigned long v;  		\
++	extern char __vsyscall_0; 	\
++	  asm("" : "=r" (v) : "0" (x)); \
++	  ((v - VSYSCALL_FIRST_PAGE) + __pa_symbol(&__vsyscall_0)); })
++
+ static __always_inline void timeval_normalize(struct timeval * tv)
+ {
+ 	time_t __sec;
+@@ -155,10 +161,10 @@ static int vsyscall_sysctl_change(ctl_ta
+ 		return ret;
+ 	/* gcc has some trouble with __va(__pa()), so just do it this
+ 	   way. */
+-	map1 = ioremap(__pa_symbol(&vsysc1), 2);
++	map1 = ioremap(__pa_vsymbol(&vsysc1), 2);
+ 	if (!map1)
+ 		return -ENOMEM;
+-	map2 = ioremap(__pa_symbol(&vsysc2), 2);
++	map2 = ioremap(__pa_vsymbol(&vsysc2), 2);
+ 	if (!map2) {
+ 		ret = -ENOMEM;
+ 		goto out;
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/mm/fault-xen.c linux-2.6.17.work/arch/x86_64/mm/fault-xen.c
+--- linux-2.6.17.reloc/arch/x86_64/mm/fault-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/mm/fault-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -710,9 +710,9 @@ void vmalloc_sync_all(void)
+ 			start = address + PGDIR_SIZE;
+ 	}
+ 	/* Check that there is no need to do the same for the modules area. */
+-	BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL));
++	BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL_map));
+ 	BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) == 
+-				(__START_KERNEL & PGDIR_MASK)));
++				(__START_KERNEL_map & PGDIR_MASK)));
+ }
+ 
+ static int __init enable_pagefaulttrace(char *str)
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/mm/init-xen.c linux-2.6.17.work/arch/x86_64/mm/init-xen.c
+--- linux-2.6.17.reloc/arch/x86_64/mm/init-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/mm/init-xen.c	2006-08-24 15:02:05.000000000 +0200
+@@ -369,20 +369,6 @@ void __set_fixmap_user (enum fixed_addre
+ 
+ unsigned long __initdata table_start, table_end; 
+ 
+-#ifndef CONFIG_XEN
+-extern pmd_t temp_boot_pmds[]; 
+-
+-static  struct temp_map { 
+-	pmd_t *pmd;
+-	void  *address; 
+-	int    allocated; 
+-} temp_mappings[] __initdata = { 
+-	{ &temp_boot_pmds[0], (void *)(40UL * 1024 * 1024) },
+-	{ &temp_boot_pmds[1], (void *)(42UL * 1024 * 1024) }, 
+-	{}
+-}; 
+-#endif /* !CONFIG_XEN */
+-
+ unsigned long get_machine_pfn(unsigned long addr)
+ {
+ 	pud_t* pud = pud_offset_k(NULL, addr);
+@@ -392,17 +378,10 @@ unsigned long get_machine_pfn(unsigned l
+ 	return pte_mfn(*pte);
+ } 
+ 
+-static __meminit void *alloc_static_page(unsigned long *phys)
++static __init void *alloc_static_page(unsigned long *phys)
+ {
+ 	unsigned long va = (start_pfn << PAGE_SHIFT) + __START_KERNEL_map;
+ 
+-	if (after_bootmem) {
+-		void *adr = (void *)get_zeroed_page(GFP_ATOMIC);
+-
+-		*phys = __pa(adr);
+-		return adr;
+-	}
+-
+ 	*phys = start_pfn << PAGE_SHIFT;
+ 	start_pfn++;
+ 	memset((void *)va, 0, PAGE_SIZE);
+@@ -446,32 +425,50 @@ static inline int make_readonly(unsigned
+ /* Must run before zap_low_mappings */
+ __init void *early_ioremap(unsigned long addr, unsigned long size)
+ {
+-	unsigned long map = round_down(addr, LARGE_PAGE_SIZE); 
+-
+-	/* actually usually some more */
+-	if (size >= LARGE_PAGE_SIZE) { 
+-		printk("SMBIOS area too long %lu\n", size);
+-		return NULL;
++	unsigned long vaddr;
++	pmd_t *pmd, *last_pmd;
++	int i, pmds;
++
++	pmds = ((addr & ~PMD_MASK) + size + ~PMD_MASK) / PMD_SIZE;
++	vaddr = __START_KERNEL_map;
++	pmd = level2_kernel_pgt;
++	last_pmd = level2_kernel_pgt + PTRS_PER_PMD - 1;
++	for (; pmd <= last_pmd; pmd++, vaddr += PMD_SIZE) {
++		for (i = 0; i < pmds; i++) {
++			if (pmd_present(pmd[i]))
++				goto next;
++		}
++		vaddr += addr & ~PMD_MASK;
++		addr &= PMD_MASK;
++		for (i = 0; i < pmds; i++, addr += PMD_SIZE)
++			set_pmd(pmd + i,__pmd(addr | _KERNPG_TABLE | _PAGE_PSE));
++		__flush_tlb();
++		return (void *)vaddr;
++	next:
++		;
+ 	}
+-	set_pmd(temp_mappings[0].pmd,  __pmd(map | _KERNPG_TABLE | _PAGE_PSE));
+-	map += LARGE_PAGE_SIZE;
+-	set_pmd(temp_mappings[1].pmd,  __pmd(map | _KERNPG_TABLE | _PAGE_PSE));
+-	__flush_tlb();
+-	return temp_mappings[0].address + (addr & (LARGE_PAGE_SIZE-1));
++	printk("early_ioremap(0x%lx, %lu) failed\n", addr, size);
++	return NULL;
++
+ }
+ 
+ /* To avoid virtual aliases later */
+ __init void early_iounmap(void *addr, unsigned long size)
+ {
+-	if ((void *)round_down((unsigned long)addr, LARGE_PAGE_SIZE) != temp_mappings[0].address)
+-		printk("early_iounmap: bad address %p\n", addr);
+-	set_pmd(temp_mappings[0].pmd, __pmd(0));
+-	set_pmd(temp_mappings[1].pmd, __pmd(0));
++	unsigned long vaddr;
++	pmd_t *pmd;
++	int i, pmds;
++
++	vaddr = (unsigned long)addr;
++	pmds = ((vaddr & ~PMD_MASK) + size + ~PMD_MASK) / PMD_SIZE;
++	pmd = level2_kernel_pgt + pmd_index(vaddr);
++	for (i = 0; i < pmds; i++)
++		pmd_clear(pmd + i);
+ 	__flush_tlb();
+ }
+ #endif /* !CONFIG_XEN */
+ 
+-static void __meminit
++static void __init
+ phys_pmd_init(pmd_t *pmd, unsigned long address, unsigned long end)
+ {
+ 	int i, k;
+@@ -481,9 +478,8 @@ phys_pmd_init(pmd_t *pmd, unsigned long 
+ 		pte_t *pte, *pte_save;
+ 
+ 		if (address >= end) {
+-			if (!after_bootmem)
+-				for (; i < PTRS_PER_PMD; i++, pmd++)
+-					set_pmd(pmd, __pmd(0));
++			for (; i < PTRS_PER_PMD; i++, pmd++)
++				set_pmd(pmd, __pmd(0));
+ 			break;
+ 		}
+ 		pte = alloc_static_page(&pte_phys);
+@@ -508,30 +504,12 @@ phys_pmd_init(pmd_t *pmd, unsigned long 
+ 	}
+ }
+ 
+-static void __meminit
+-phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end)
+-{
+-	pmd_t *pmd = pmd_offset(pud, (unsigned long)__va(address));
+-
+-	if (pmd_none(*pmd)) {
+-		spin_lock(&init_mm.page_table_lock);
+-		phys_pmd_init(pmd, address, end);
+-		spin_unlock(&init_mm.page_table_lock);
+-		__flush_tlb_all();
+-	}
+-}
+-
+-static void __meminit phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)
++static void __init phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)
+ { 
+ 	long i = pud_index(address);
+ 
+ 	pud = pud + i;
+ 
+-	if (after_bootmem && pud_val(*pud)) {
+-		phys_pmd_update(pud, address, end);
+-		return;
+-	}
+-
+ 	for (; i < PTRS_PER_PUD; pud++, i++) {
+ 		unsigned long paddr, pmd_phys;
+ 		pmd_t *pmd;
+@@ -542,10 +520,8 @@ static void __meminit phys_pud_init(pud_
+ 
+ 		pmd = alloc_static_page(&pmd_phys);
+ 		early_make_page_readonly(pmd, XENFEAT_writable_page_tables);
+-		spin_lock(&init_mm.page_table_lock);
+ 		set_pud(pud, __pud(pmd_phys | _KERNPG_TABLE));
+ 		phys_pmd_init(pmd, paddr, end);
+-		spin_unlock(&init_mm.page_table_lock);
+ 	}
+ 	__flush_tlb();
+ } 
+@@ -669,7 +645,7 @@ static void __init find_early_table_spac
+ /* Setup the direct mapping of the physical memory at PAGE_OFFSET.
+    This runs before bootmem is initialized and gets pages directly from the 
+    physical memory. To access them they are temporarily mapped. */
+-void __meminit init_memory_mapping(unsigned long start, unsigned long end)
++void __init init_memory_mapping(unsigned long start, unsigned long end)
+ { 
+ 	unsigned long next; 
+ 
+@@ -681,73 +657,54 @@ void __meminit init_memory_mapping(unsig
+ 	 * mapped.  Unfortunately this is done currently before the nodes are 
+ 	 * discovered.
+ 	 */
+-	if (!after_bootmem)
+-		find_early_table_space(end);
++	find_early_table_space(end);
+ 
+ 	start = (unsigned long)__va(start);
+ 	end = (unsigned long)__va(end);
+ 
+ 	for (; start < end; start = next) {
+ 		unsigned long pud_phys; 
+-		pgd_t *pgd = pgd_offset_k(start);
++ 		pgd_t *pgd = pgd_offset_k(start);
+ 		pud_t *pud;
+ 
+-		if (after_bootmem) {
+-			pud = pud_offset(pgd, start & PGDIR_MASK);
+-			make_page_readonly(pud, XENFEAT_writable_page_tables);
+-			pud_phys = __pa(pud);
+-		} else {
+-			pud = alloc_static_page(&pud_phys);
+-			early_make_page_readonly(pud, XENFEAT_writable_page_tables);
+-		}
++		pud = alloc_static_page(&pud_phys);
++		early_make_page_readonly(pud, XENFEAT_writable_page_tables);
++
+ 		next = start + PGDIR_SIZE;
+ 		if (next > end) 
+ 			next = end; 
+ 		phys_pud_init(pud, __pa(start), __pa(next));
+-		if (!after_bootmem)
+-			set_pgd(pgd_offset_k(start), mk_kernel_pgd(pud_phys));
++		set_pgd(pgd, mk_kernel_pgd(pud_phys));
+ 	}
+ 
+-	if (!after_bootmem) {
+-		BUG_ON(start_pfn != table_end);
++	BUG_ON(start_pfn != table_end);
+ 
+-		/* Re-vector virtual addresses pointing into the initial
+-		   mapping to the just-established permanent ones. */
+-		xen_start_info = __va(__pa(xen_start_info));
+-		xen_start_info->pt_base = (unsigned long)
+-			__va(__pa(xen_start_info->pt_base));
+-		if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+-			phys_to_machine_mapping =
+-				__va(__pa(xen_start_info->mfn_list));
+-			xen_start_info->mfn_list = (unsigned long)
++	/* Re-vector virtual addresses pointing into the initial
++	   mapping to the just-established permanent ones. */
++	xen_start_info = __va(__pa(xen_start_info));
++	xen_start_info->pt_base = (unsigned long)
++		__va(__pa(xen_start_info->pt_base));
++	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
++		phys_to_machine_mapping = __va(__pa(xen_start_info->mfn_list));
++		xen_start_info->mfn_list = (unsigned long)
+ 				phys_to_machine_mapping;
+-		}
+-		if (xen_start_info->mod_start)
+-			xen_start_info->mod_start = (unsigned long)
+-				__va(__pa(xen_start_info->mod_start));
+-
+-		/* Destroy the Xen-created mappings beyond the kernel image as
+-		 * well as the temporary mappings created above. Prevents
+-		 * overlap with modules area (if init mapping is very big).
+-		 */
+-		start = PAGE_ALIGN((unsigned long)_end);
+-		end   = __START_KERNEL_map + (table_end << PAGE_SHIFT);
+-		for (; start < end; start += PAGE_SIZE)
+-			WARN_ON(HYPERVISOR_update_va_mapping(
+-				start, __pte_ma(0), 0));
+ 	}
++	if (xen_start_info->mod_start)
++		xen_start_info->mod_start = (unsigned long)
++			__va(__pa(xen_start_info->mod_start));
++
++	/* Destroy the Xen-created mappings beyond the kernel image as
++	 * well as the temporary mappings created above. Prevents
++	 * overlap with modules area (if init mapping is very big).
++	 */
++	start = PAGE_ALIGN((unsigned long)_end);
++	end   = __START_KERNEL_map + (table_end << PAGE_SHIFT);
++	for (; start < end; start += PAGE_SIZE)
++		WARN_ON(HYPERVISOR_update_va_mapping(start, __pte_ma(0), 0));
+ 
+ 	__flush_tlb_all();
+ }
+ 
+-void __cpuinit zap_low_mappings(int cpu)
+-{
+-	/* this is not required for Xen */
+-#if 0
+-	swap_low_mappings();
+-#endif
+-}
+-
+ /* Compute zone sizes for the DMA and DMA32 zones in a node. */
+ __init void
+ size_zones(unsigned long *z, unsigned long *h,
+@@ -901,6 +858,111 @@ int memory_add_physaddr_to_nid(u64 start
+ }
+ #endif
+ 
++static void
++late_phys_pmd_init(pmd_t *pmd, unsigned long address, unsigned long end)
++{
++	int i, k;
++
++	for (i = 0; i < PTRS_PER_PMD; pmd++, i++) {
++		unsigned long pte_phys;
++		pte_t *pte, *pte_save;
++
++		if (address >= end)
++			break;
++		pte = alloc_static_page(&pte_phys);
++		pte_save = pte;
++		for (k = 0; k < PTRS_PER_PTE; pte++, k++, address += PTE_SIZE) {
++			if ((address >= end) ||
++			    ((address >> PAGE_SHIFT) >=
++			     xen_start_info->nr_pages)) { 
++				__set_pte(pte, __pte(0)); 
++				continue;
++			}
++			if (make_readonly(address)) {
++				__set_pte(pte, 
++					  __pte(address | (_KERNPG_TABLE & ~_PAGE_RW)));
++				continue;
++			}
++			__set_pte(pte, __pte(address | _KERNPG_TABLE));
++		}
++		pte = pte_save;
++		early_make_page_readonly(pte, XENFEAT_writable_page_tables);
++		set_pmd(pmd, __pmd(pte_phys | _KERNPG_TABLE));
++	}
++}
++
++static void
++late_phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end)
++{
++	pmd_t *pmd = pmd_offset(pud, (unsigned long)__va(address));
++
++	if (pmd_none(*pmd)) {
++		spin_lock(&init_mm.page_table_lock);
++		late_phys_pmd_init(pmd, address, end);
++		spin_unlock(&init_mm.page_table_lock);
++		__flush_tlb_all();
++	}
++}
++
++static void late_phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)
++{ 
++	long i = pud_index(address);
++
++	pud = pud + i;
++
++	if (pud_val(*pud)) {
++		late_phys_pmd_update(pud, address, end);
++		return;
++	}
++
++	for (; i < PTRS_PER_PUD; pud++, i++) {
++		unsigned long paddr, pmd_phys;
++		pmd_t *pmd;
++
++		paddr = (address & PGDIR_MASK) + i*PUD_SIZE;
++		if (paddr >= end)
++			break;
++
++		pmd = (pmd_t *)get_zeroed_page(GFP_ATOMIC);
++		pmd_phys = __pa(pmd);
++
++		early_make_page_readonly(pmd, XENFEAT_writable_page_tables);
++		spin_lock(&init_mm.page_table_lock);
++		set_pud(pud, __pud(pmd_phys | _KERNPG_TABLE));
++		late_phys_pmd_init(pmd, paddr, end);
++		spin_unlock(&init_mm.page_table_lock);
++	}
++} 
++
++/* Setup the direct mapping of the physical memory at PAGE_OFFSET.
++   This runs before bootmem is initialized and gets pages normally.
++*/
++static void late_init_memory_mapping(unsigned long start, unsigned long end)
++{ 
++	unsigned long next; 
++
++	Dprintk("init_memory_mapping\n");
++
++	start = (unsigned long)__va(start);
++	end = (unsigned long)__va(end);
++
++	for (; start < end; start = next) {
++		unsigned long pud_phys; 
++		pgd_t *pgd = pgd_offset_k(start);
++		pud_t *pud;
++
++		pud = pud_offset(pgd, start & PGDIR_MASK);
++		make_page_readonly(pud, XENFEAT_writable_page_tables);
++		pud_phys = __pa(pud);
++
++		next = start + PGDIR_SIZE;
++		if (next > end) 
++			next = end; 
++		late_phys_pud_init(pud, __pa(start), __pa(next));
++	}
++	__flush_tlb_all();
++}
++
+ /*
+  * Memory is added always to NORMAL zone. This means you will never get
+  * additional DMA/DMA32 memory.
+@@ -917,7 +979,7 @@ int arch_add_memory(int nid, u64 start, 
+ 	if (ret)
+ 		goto error;
+ 
+-	init_memory_mapping(start, (start + size -1));
++	late_init_memory_mapping(start, (start + size -1));
+ 
+ 	return ret;
+ error:
+@@ -1048,17 +1110,6 @@ void __init mem_init(void)
+ 		reservedpages << (PAGE_SHIFT-10),
+ 		datasize >> 10,
+ 		initsize >> 10);
+-
+-#ifndef CONFIG_XEN
+-#ifdef CONFIG_SMP
+-	/*
+-	 * Sync boot_level4_pgt mappings with the init_level4_pgt
+-	 * except for the low identity mappings which are already zapped
+-	 * in init_level4_pgt. This sync-up is essential for AP's bringup
+-	 */
+-	memcpy(boot_level4_pgt+1, init_level4_pgt+1, (PTRS_PER_PGD-1)*sizeof(pgd_t));
+-#endif
+-#endif
+ }
+ 
+ void free_init_pages(char *what, unsigned long begin, unsigned long end)
+@@ -1071,11 +1122,11 @@ void free_init_pages(char *what, unsigne
+ 
+ 	printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
+ 	for (addr = begin; addr < end; addr += PAGE_SIZE) {
+-		ClearPageReserved(virt_to_page(addr));
+-		init_page_count(virt_to_page(addr));
+-		memset((void *)(addr & ~(PAGE_SIZE-1)),
+-			POISON_FREE_INITMEM, PAGE_SIZE);
+-		free_page(addr);
++		struct page *page = pfn_to_page(addr >> PAGE_SHIFT);
++		ClearPageReserved(page);
++		init_page_count(page);
++		memset(page_address(page), POISON_FREE_INITMEM, PAGE_SIZE);
++		__free_page(page);
+ 		totalram_pages++;
+ 	}
+ #endif
+@@ -1087,8 +1138,8 @@ void free_initmem(void)
+ 	memset(__initdata_begin, POISON_FREE_INITDATA,
+ 	       __initdata_end - __initdata_begin);
+ 	free_init_pages("unused kernel memory",
+-			(unsigned long)(&__init_begin),
+-			(unsigned long)(&__init_end));
++			__pa_symbol(&__init_begin),
++			__pa_symbol(&__init_end));
+ #endif
+ }
+ 
+@@ -1097,9 +1148,10 @@ void free_initmem(void)
+ extern char __start_rodata, __end_rodata;
+ void mark_rodata_ro(void)
+ {
+-	unsigned long addr = (unsigned long)__start_rodata;
++	unsigned long addr = (unsigned long)__va(__pa_symbol(&__start_rodata));
++	unsigned long end  = (unsigned long)__va(__pa_symbol(&__end_rodata));
+ 
+-	for (; addr < (unsigned long)__end_rodata; addr += PAGE_SIZE)
++	for (; addr < end; addr += PAGE_SIZE)
+ 		change_page_attr_addr(addr, 1, PAGE_KERNEL_RO);
+ 
+ 	printk ("Write protecting the kernel read-only data: %luk\n",
+@@ -1117,7 +1169,7 @@ void mark_rodata_ro(void)
+ #ifdef CONFIG_BLK_DEV_INITRD
+ void free_initrd_mem(unsigned long start, unsigned long end)
+ {
+-	free_init_pages("initrd memory", start, end);
++	free_init_pages("initrd memory", __pa(start), __pa(end));
+ }
+ #endif
+ 
+diff --exclude='*~' -urNp linux-2.6.17.reloc/arch/x86_64/mm/pageattr-xen.c linux-2.6.17.work/arch/x86_64/mm/pageattr-xen.c
+--- linux-2.6.17.reloc/arch/x86_64/mm/pageattr-xen.c	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/arch/x86_64/mm/pageattr-xen.c	2006-08-24 14:59:36.000000000 +0200
+@@ -212,7 +212,6 @@ static struct page *split_large_page(uns
+ 	SetPagePrivate(base);
+ 	page_private(base) = 0;
+ 
+-	address = __pa(address);
+ 	addr = address & LARGE_PAGE_MASK; 
+ 	pbase = (pte_t *)page_address(base);
+ 	for (i = 0; i < PTRS_PER_PTE; i++, addr += PAGE_SIZE) {
+@@ -256,7 +255,7 @@ static inline void save_page(struct page
+  * No more special protections in this 2/4MB area - revert to a
+  * large page again. 
+  */
+-static void revert_page(unsigned long address, pgprot_t ref_prot)
++static void revert_page(unsigned long address, unsigned long pfn, pgprot_t ref_prot)
+ {
+ 	pgd_t *pgd;
+ 	pud_t *pud;
+@@ -270,7 +269,7 @@ static void revert_page(unsigned long ad
+ 	pmd = pmd_offset(pud, address);
+ 	BUG_ON(pmd_val(*pmd) & _PAGE_PSE);
+ 	pgprot_val(ref_prot) |= _PAGE_PSE;
+-	large_pte = mk_pte_phys(__pa(address) & LARGE_PAGE_MASK, ref_prot);
++	large_pte = mk_pte_phys((pfn << PAGE_SHIFT) & LARGE_PAGE_MASK, ref_prot);
+ 	set_pte((pte_t *)pmd, large_pte);
+ }      
+ 
+@@ -298,7 +297,7 @@ __change_page_attr(unsigned long address
+ 			struct page *split;
+ 			ref_prot2 = __pgprot(pgprot_val(pte_pgprot(*lookup_address(address))) & ~(1<<_PAGE_BIT_PSE));
+ 
+-			split = split_large_page(address, prot, ref_prot2);
++			split = split_large_page(pfn << PAGE_SHIFT, prot, ref_prot2);
+ 			if (!split)
+ 				return -ENOMEM;
+ 			set_pte(kpte,mk_pte(split, ref_prot2));
+@@ -324,7 +323,7 @@ __change_page_attr(unsigned long address
+ #endif
+ 	if (page_private(kpte_page) == 0) {
+ 		save_page(kpte_page);
+-		revert_page(address, ref_prot);
++		revert_page(address, pfn, ref_prot);
+ 	}
+ 	return 0;
+ } 
+@@ -344,6 +343,7 @@ __change_page_attr(unsigned long address
+  */
+ int change_page_attr_addr(unsigned long address, int numpages, pgprot_t prot)
+ {
++	unsigned long phys_base_pfn = __pa_symbol(__START_KERNEL_map) >> PAGE_SHIFT;
+ 	int err = 0; 
+ 	int i; 
+ 
+@@ -356,14 +356,16 @@ int change_page_attr_addr(unsigned long 
+ 			break; 
+ 		/* Handle kernel mapping too which aliases part of the
+ 		 * lowmem */
+-		if (__pa(address) < KERNEL_TEXT_SIZE) {
++		if ((pfn >= phys_base_pfn) &&
++			((pfn - phys_base_pfn) < (KERNEL_TEXT_SIZE >> PAGE_SHIFT)))
++		{
+ 			unsigned long addr2;
+ 			pgprot_t prot2 = prot;
+-			addr2 = __START_KERNEL_map + __pa(address);
++			addr2 = __START_KERNEL_map + ((pfn - phys_base_pfn) << PAGE_SHIFT);
+  			pgprot_val(prot2) &= ~_PAGE_NX;
+ 			err = __change_page_attr(addr2, pfn, prot2, PAGE_KERNEL_EXEC);
+-		} 
+-	} 	
++		}
++	}
+ 	up_write(&init_mm.mmap_sem); 
+ 	return err;
+ }
+diff --exclude='*~' -urNp linux-2.6.17.reloc/include/asm-i386/mach-xen/asm/page.h linux-2.6.17.work/include/asm-i386/mach-xen/asm/page.h
+--- linux-2.6.17.reloc/include/asm-i386/mach-xen/asm/page.h	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/include/asm-i386/mach-xen/asm/page.h	2006-08-24 14:59:36.000000000 +0200
+@@ -295,12 +295,9 @@ extern int page_is_ram(unsigned long pag
+ 
+ #ifdef __ASSEMBLY__
+ #define __PAGE_OFFSET		CONFIG_PAGE_OFFSET
+-#define __PHYSICAL_START	CONFIG_PHYSICAL_START
+ #else
+ #define __PAGE_OFFSET		((unsigned long)CONFIG_PAGE_OFFSET)
+-#define __PHYSICAL_START	((unsigned long)CONFIG_PHYSICAL_START)
+ #endif
+-#define __KERNEL_START		(__PAGE_OFFSET + __PHYSICAL_START)
+ 
+ #ifdef CONFIG_XEN_COMPAT_030002
+ #undef LOAD_OFFSET
+@@ -311,6 +308,7 @@ extern int page_is_ram(unsigned long pag
+ #define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)
+ #define MAXMEM			(__FIXADDR_TOP-__PAGE_OFFSET-__VMALLOC_RESERVE)
+ #define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
++#define __pa_symbol(x)		__pa(x)
+ #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
+ #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)
+ #ifdef CONFIG_FLATMEM
+diff --exclude='*~' -urNp linux-2.6.17.reloc/include/asm-x86_64/mach-xen/asm/page.h linux-2.6.17.work/include/asm-x86_64/mach-xen/asm/page.h
+--- linux-2.6.17.reloc/include/asm-x86_64/mach-xen/asm/page.h	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/include/asm-x86_64/mach-xen/asm/page.h	2006-08-24 15:01:29.000000000 +0200
+@@ -1,6 +1,8 @@
+ #ifndef _X86_64_PAGE_H
+ #define _X86_64_PAGE_H
+ 
++#include <asm/const.h>
++
+ /* #include <linux/string.h> */
+ #ifndef __ASSEMBLY__
+ #include <linux/kernel.h>
+@@ -28,11 +30,7 @@
+ 
+ /* PAGE_SHIFT determines the page size */
+ #define PAGE_SHIFT	12
+-#ifdef __ASSEMBLY__
+-#define PAGE_SIZE	(0x1 << PAGE_SHIFT)
+-#else
+-#define PAGE_SIZE	(1UL << PAGE_SHIFT)
+-#endif
++#define PAGE_SIZE	(_AC(1,UL) << PAGE_SHIFT)
+ #define PAGE_MASK	(~(PAGE_SIZE-1))
+ #define PHYSICAL_PAGE_MASK	(~(PAGE_SIZE-1) & __PHYSICAL_MASK)
+ 
+@@ -57,10 +55,10 @@
+ #define N_EXCEPTION_STACKS 5  /* hw limit: 7 */
+ 
+ #define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
+-#define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)
++#define LARGE_PAGE_SIZE (_AC(1,UL) << PMD_SHIFT)
+ 
+ #define HPAGE_SHIFT PMD_SHIFT
+-#define HPAGE_SIZE	((1UL) << HPAGE_SHIFT)
++#define HPAGE_SIZE	(_AC(1,UL) << HPAGE_SHIFT)
+ #define HPAGE_MASK	(~(HPAGE_SIZE - 1))
+ #define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)
+ 
+@@ -256,18 +254,11 @@ static inline pgd_t __pgd(unsigned long 
+ 
+ #define __pgprot(x)	((pgprot_t) { (x) } )
+ 
+-#define __PHYSICAL_START	((unsigned long)CONFIG_PHYSICAL_START)
+-#define __START_KERNEL		(__START_KERNEL_map + __PHYSICAL_START)
+-#define __START_KERNEL_map	0xffffffff80000000UL
+-#define __PAGE_OFFSET           0xffff880000000000UL	
+-
+-#else
+-#define __PHYSICAL_START	CONFIG_PHYSICAL_START
+-#define __START_KERNEL		(__START_KERNEL_map + __PHYSICAL_START)
+-#define __START_KERNEL_map	0xffffffff80000000
+-#define __PAGE_OFFSET           0xffff880000000000
+ #endif /* !__ASSEMBLY__ */
+ 
++#define __START_KERNEL_map	_AC(0xffffffff80000000,UL)
++#define __PAGE_OFFSET           _AC(0xffff880000000000,UL)
++
+ #ifdef CONFIG_XEN_COMPAT_030002
+ #undef LOAD_OFFSET
+ #define LOAD_OFFSET		0
+@@ -278,28 +269,28 @@ static inline pgd_t __pgd(unsigned long 
+ 
+ /* See Documentation/x86_64/mm.txt for a description of the memory map. */
+ #define __PHYSICAL_MASK_SHIFT	46
+-#define __PHYSICAL_MASK		((1UL << __PHYSICAL_MASK_SHIFT) - 1)
++#define __PHYSICAL_MASK		((_AC(1,UL) << __PHYSICAL_MASK_SHIFT) - 1)
+ #define __VIRTUAL_MASK_SHIFT	48
+-#define __VIRTUAL_MASK		((1UL << __VIRTUAL_MASK_SHIFT) - 1)
++#define __VIRTUAL_MASK		((_AC(1,UL) << __VIRTUAL_MASK_SHIFT) - 1)
+ 
+-#define KERNEL_TEXT_SIZE  (40UL*1024*1024)
+-#define KERNEL_TEXT_START 0xffffffff80000000UL 
++#define KERNEL_TEXT_SIZE  (_AC(40,UL)*1024*1024)
++#define KERNEL_TEXT_START _AC(0xffffffff80000000,UL)
+ 
+-#define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
++#define PAGE_OFFSET		__PAGE_OFFSET
+ 
+ /* Note: __pa(&symbol_visible_to_c) should be always replaced with __pa_symbol.
+    Otherwise you risk miscompilation. */ 
++/* Optimized __pa() didn't work on xen, because we also use it for kernel addresses */
++/* #define __pa(x)			((unsigned long)(x) - PAGE_OFFSET) */
+ #define __pa(x)			(((unsigned long)(x)>=__START_KERNEL_map)?(unsigned long)(x) - (unsigned long)__START_KERNEL_map:(unsigned long)(x) - PAGE_OFFSET)
+ /* __pa_symbol should be used for C visible symbols.
+    This seems to be the official gcc blessed way to do such arithmetic. */ 
+ #define __pa_symbol(x)		\
+ 	({unsigned long v;  \
+ 	  asm("" : "=r" (v) : "0" (x)); \
+-	  __pa(v); })
++	  (v - __START_KERNEL_map); })
+ 
+ #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
+-#define __boot_va(x)		__va(x)
+-#define __boot_pa(x)		__pa(x)
+ #ifdef CONFIG_FLATMEM
+ #define pfn_valid(pfn)		((pfn) < end_pfn)
+ #endif
+diff --exclude='*~' -urNp linux-2.6.17.reloc/include/asm-x86_64/mach-xen/asm/pgtable.h linux-2.6.17.work/include/asm-x86_64/mach-xen/asm/pgtable.h
+--- linux-2.6.17.reloc/include/asm-x86_64/mach-xen/asm/pgtable.h	2006-08-24 14:49:29.000000000 +0200
++++ linux-2.6.17.work/include/asm-x86_64/mach-xen/asm/pgtable.h	2006-08-24 14:59:36.000000000 +0200
+@@ -1,6 +1,9 @@
+ #ifndef _X86_64_PGTABLE_H
+ #define _X86_64_PGTABLE_H
+ 
++#include <asm/const.h>
++#ifndef __ASSEMBLY__
++
+ /*
+  * This file contains the functions and defines necessary to modify and use
+  * the x86-64 page table tree.
+@@ -35,14 +38,12 @@ extern void xen_init_pt(void);
+ #endif
+ 
+ extern pud_t level3_kernel_pgt[512];
+-extern pud_t level3_physmem_pgt[512];
+ extern pud_t level3_ident_pgt[512];
+ extern pmd_t level2_kernel_pgt[512];
+ extern pgd_t init_level4_pgt[];
+-extern pgd_t boot_level4_pgt[];
+ extern unsigned long __supported_pte_mask;
+ 
+-#define swapper_pg_dir init_level4_pgt
++#define swapper_pg_dir ((pgd_t *)NULL)
+ 
+ extern void nonx_setup(char *str);
+ extern void paging_init(void);
+@@ -55,7 +56,9 @@ extern unsigned long pgkern_mask;
+  * for zero-mapped memory areas etc..
+  */
+ extern unsigned long empty_zero_page[PAGE_SIZE/sizeof(unsigned long)];
+-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
++#define ZERO_PAGE(vaddr) (pfn_to_page(__pa_symbol(&empty_zero_page) >> PAGE_SHIFT))
++
++#endif /* !__ASSEMBLY__ */
+ 
+ /*
+  * PGDIR_SHIFT determines what a top-level page table entry can map
+@@ -81,6 +84,8 @@ extern unsigned long empty_zero_page[PAG
+  */
+ #define PTRS_PER_PTE	512
+ 
++#ifndef __ASSEMBLY__
++
+ #define pte_ERROR(e) \
+ 	printk("%s:%d: bad pte %p(%016lx).\n", __FILE__, __LINE__, &(e), pte_val(e))
+ #define pmd_ERROR(e) \
+@@ -162,22 +167,23 @@ static inline pte_t ptep_get_and_clear_f
+ 
+ #define pte_pgprot(a)	(__pgprot((a).pte & ~PHYSICAL_PAGE_MASK))
+ 
+-#define PMD_SIZE	(1UL << PMD_SHIFT)
++#endif /* !__ASSEMBLY__ */
++
++#define PMD_SIZE	(_AC(1,UL) << PMD_SHIFT)
+ #define PMD_MASK	(~(PMD_SIZE-1))
+-#define PUD_SIZE	(1UL << PUD_SHIFT)
++#define PUD_SIZE	(_AC(1,UL) << PUD_SHIFT)
+ #define PUD_MASK	(~(PUD_SIZE-1))
+-#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)
++#define PGDIR_SIZE	(_AC(1,UL) << PGDIR_SHIFT)
+ #define PGDIR_MASK	(~(PGDIR_SIZE-1))
+ 
+ #define USER_PTRS_PER_PGD	((TASK_SIZE-1)/PGDIR_SIZE+1)
+ #define FIRST_USER_ADDRESS	0
+ 
+-#ifndef __ASSEMBLY__
+-#define MAXMEM		 0x3fffffffffffUL
+-#define VMALLOC_START    0xffffc20000000000UL
+-#define VMALLOC_END      0xffffe1ffffffffffUL
+-#define MODULES_VADDR    0xffffffff88000000UL
+-#define MODULES_END      0xfffffffffff00000UL
++#define MAXMEM		 _AC(0x3fffffffffff,UL)
++#define VMALLOC_START    _AC(0xffffc20000000000,UL)
++#define VMALLOC_END      _AC(0xffffe1ffffffffff,UL)
++#define MODULES_VADDR    _AC(0xffffffff88000000,UL)
++#define MODULES_END      _AC(0xfffffffffff00000,UL)
+ #define MODULES_LEN   (MODULES_END - MODULES_VADDR)
+ 
+ #define _PAGE_BIT_PRESENT	0
+@@ -203,7 +209,7 @@ static inline pte_t ptep_get_and_clear_f
+ #define _PAGE_GLOBAL	0x100	/* Global TLB entry */
+ 
+ #define _PAGE_PROTNONE	0x080	/* If not present */
+-#define _PAGE_NX        (1UL<<_PAGE_BIT_NX)
++#define _PAGE_NX        (_AC(1,UL)<<_PAGE_BIT_NX)
+ 
+ #define _PAGE_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)
+ #define _KERNPG_TABLE	_PAGE_TABLE
+@@ -269,6 +275,8 @@ static inline pte_t ptep_get_and_clear_f
+ #define __S110	PAGE_SHARED_EXEC
+ #define __S111	PAGE_SHARED_EXEC
+ 
++#ifndef __ASSEMBLY__
++
+ static inline unsigned long pgd_bad(pgd_t pgd)
+ {
+        unsigned long val = pgd_val(pgd);
+@@ -502,8 +510,6 @@ extern spinlock_t pgd_lock;
+ extern struct page *pgd_list;
+ void vmalloc_sync_all(void);
+ 
+-#endif /* !__ASSEMBLY__ */
+-
+ extern int kern_addr_valid(unsigned long addr); 
+ 
+ #define DOMID_LOCAL (0xFFFFU)
+@@ -556,5 +562,6 @@ int touch_pte_range(struct mm_struct *mm
+ #define __HAVE_ARCH_PTEP_SET_WRPROTECT
+ #define __HAVE_ARCH_PTE_SAME
+ #include <asm-generic/pgtable.h>
++#endif /* !__ASSEMBLY__ */
+ 
+ #endif /* _X86_64_PGTABLE_H */


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Makefile.config	17 Aug 2006 23:18:03 -0000	1.48
+++ Makefile.config	25 Aug 2006 19:18:19 -0000	1.49
@@ -73,10 +73,7 @@
 temp-x86_64-xen-generic: configs/config-xen-x86_64 temp-x86_64-xen-generic-tmp
 	perl merge.pl $^ > $@
 
-temp-ia64-xen-generic-tmp: configs/config-xen-generic temp-ia64-generic
-	perl merge.pl $^ > $@
-
-temp-ia64-xen-generic: configs/config-xen-ia64 temp-ia64-xen-generic-tmp
+temp-ia64-xen-generic: configs/config-xen-generic temp-ia64-generic
 	perl merge.pl $^ > $@
 
 kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic
@@ -145,6 +142,5 @@
 kernel-$(VERSION)-x86_64-xen.config: configs/config-x86_64 temp-x86_64-xen-generic
 	perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-ia64-xen.config: configs/config-ia64 temp-ia64-xen-generic
+kernel-$(VERSION)-ia64-xen.config: configs/config-xen-ia64 temp-ia64-xen-generic
 	perl merge.pl $^ ia64 > $@
-


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2587
retrieving revision 1.2588
diff -u -r1.2587 -r1.2588
--- kernel-2.6.spec	25 Aug 2006 17:18:24 -0000	1.2587
+++ kernel-2.6.spec	25 Aug 2006 19:18:19 -0000	1.2588
@@ -51,6 +51,10 @@
 # Don't build 586 kernels for RHEL builds.
 %if 0%{?rhel}
 %define all_x86 i386 i686
+# we differ here b/c of the reloc patches
+%ifarch i686 x86_64
+%define buildkdump 0
+%endif
 %else
 %define all_x86 i386 i586 i686
 %endif
@@ -283,7 +287,8 @@
 #Source68: kernel-%{kversion}-sparc64-smp.config
 
 Source80: config-rhel-generic
-Source81: config-olpc-generic
+Source81: config-rhel-x86-generic
+Source82: config-olpc-generic
 
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
@@ -309,6 +314,7 @@
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
 Patch209: linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch
+Patch210: linux-2.6-x86-relocatable.patch
 
 # 300 - 399   ppc(64)
 Patch300: linux-2.6-ppc-dac960-ipr-clash.patch
@@ -317,6 +323,7 @@
 Patch303: linux-2.6-ppc-rtas-check.patch
 
 # 400 - 499   ia64
+Patch402: linux-2.6-ia64-kexec-kdump.patch
 
 # 500 - 599   s390(x)
 Patch500: linux-2.6-s390-kprobes.patch
@@ -354,6 +361,8 @@
 Patch954: linux-2.6-xen-execshield.patch
 Patch955: linux-2.6-xen-tux.patch
 Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
+Patch957: linux-2.6-xen-x86-relocatable.patch
+Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
 
 Patch990: linux-2.6-xen-compile-fixes.patch
 
@@ -697,6 +706,13 @@
     $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-generic $i.tmp > $i
     rm $i.tmp
   done
+  for i in $RPM_SOURCE_DIR/kernel-%{kversion}-{i586,i686,i686-PAE,x86_64}*.config
+  do
+    echo i is this file  $i
+    mv $i $i.tmp
+    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-x86-generic $i.tmp > $i
+    rm $i.tmp
+  done
 %endif
 #if a olpc kernel, apply the olpc config options
 %if 0%{?olpc}
@@ -767,6 +783,10 @@
 %patch208 -p1
 # fix opteron timer scaling
 %patch209 -p1
+%if 0%{?rhel}
+#add in support for x86 and x86_64 relocatable kernels
+%patch210 -p1
+%endif
 
 #
 # PowerPC
@@ -780,6 +800,9 @@
 # Check properly for successful RTAS instantiation
 %patch303 -p1
 
+# ia64 kexec/kdump
+%patch402 -p1
+
 # S390
 # Kprobes.
 %patch500 -p1
@@ -843,6 +866,12 @@
 %patch954 -p1
 %patch955 -p1
 %patch956 -p1
+%if 0%{?rhel}
+#xen fix for x86 relocatable support
+%patch957 -p1
+%endif
+# ia64 xen cleanups for kexec/kdump
+%patch958 -p1
 
 #%patch990 -p1
 
@@ -1002,7 +1031,12 @@
 # Increase timeout on firmware loader.
 %patch2101 -p1
 # Change PHYSICAL_START
+%if 0%{?rhel}
+#%patch2102 -p1
+%else
 %patch2102 -p1
+%endif
+
 # Use unicode VT's by default.
 %patch2103 -p1
 # Disable split page table lock
@@ -1041,6 +1075,11 @@
 cp -f %{all_arch_configs} .
 
 
+%if 0%{?rhel}
+# don't need these for relocatable kernels
+rm -f kernel-%{kversion}-{i686,x86_64}-kdump.config
+%endif
+
 # now run oldconfig over all the config files
 for i in *.config
 do
@@ -1300,8 +1339,12 @@
   install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
   cd ..
-  mkdir -p $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
-  mv xen $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}/
+  # need to let BuildKernel() create directory first.  The problem here is BuildKernel
+  # doesn't mkdir a new directory, but instead 'mv /lib/modules/<kern>/build to <new dir>
+  # if the <new dir> were to exist already, then the contents of 'build' are placed in a sub-dir
+  # named 'build' under <new dir>.  ugh.  So save xen directory temporarily instead
+  mkdir -p $RPM_BUILD_ROOT/usr/src/kernels
+  mv xen $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}-HV-temp
 %endif
 %endif
 
@@ -1322,6 +1365,8 @@
 %if %{includexen}
 %if %{buildxen}
 BuildKernel %xen_target %xen_image xen
+# Now the directory is properly created, copy xen over
+mv $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}-HV-temp $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}/xen
 %endif
 %endif
 
@@ -1751,6 +1796,14 @@
 %endif
 
 %changelog
+* Fri Aug 25 2006 Don Zickus <dzickus at redhat.com>
+- update utrace 
+- more gfs2-dlm fixes
+- fix xen-devel build directory issue
+- add x86, x86_64 relocatable kernel patch for rhel only (davej, forgive my sins)
+  - applied xen relocatable cleanup on top of it
+- add ia64 kexec/kdump pieces  
+  
 * Fri Aug 25 2006 Jesse Keating <jkeating at redhat.com>
 - Enable i386 for olpc so that kernel-headers is built
 

linux-2.6-utrace.patch:
 b/Documentation/utrace.txt                        |    7 
 b/include/linux/tracehook.h                       |   16 
 b/include/linux/utrace.h                          |    7 
 b/kernel/exit.c                                   |    5 
 b/kernel/ptrace.c                                 |   40 
 b/kernel/utrace.c                                 |  120 +
 linux-2.6/Documentation/utrace.txt                |  454 +++++
 linux-2.6/arch/alpha/kernel/asm-offsets.c         |    2 
 linux-2.6/arch/alpha/kernel/entry.S               |    4 
 linux-2.6/arch/arm/kernel/ptrace.c                |   36 
 linux-2.6/arch/arm26/kernel/ptrace.c              |   32 
 linux-2.6/arch/frv/kernel/ptrace.c                |   15 
 linux-2.6/arch/i386/kernel/entry.S                |    7 
 linux-2.6/arch/i386/kernel/i387.c                 |  143 -
 linux-2.6/arch/i386/kernel/process.c              |    3 
 linux-2.6/arch/i386/kernel/ptrace.c               |  863 ++++++-----
 linux-2.6/arch/i386/kernel/signal.c               |   39 
 linux-2.6/arch/i386/kernel/vm86.c                 |    7 
 linux-2.6/arch/ia64/ia32/ia32_entry.S             |    2 
 linux-2.6/arch/ia64/ia32/sys_ia32.c               |   23 
 linux-2.6/arch/ia64/kernel/asm-offsets.c          |    2 
 linux-2.6/arch/ia64/kernel/fsys.S                 |   16 
 linux-2.6/arch/ia64/kernel/mca.c                  |    2 
 linux-2.6/arch/ia64/kernel/ptrace.c               | 1671 ++++++++++------------
 linux-2.6/arch/ia64/kernel/signal.c               |    4 
 linux-2.6/arch/mips/kernel/ptrace.c               |   21 
 linux-2.6/arch/mips/kernel/sysirix.c              |    2 
 linux-2.6/arch/powerpc/kernel/Makefile            |    4 
 linux-2.6/arch/powerpc/kernel/asm-offsets.c       |    2 
 linux-2.6/arch/powerpc/kernel/process.c           |    5 
 linux-2.6/arch/powerpc/kernel/ptrace-common.h     |  161 --
 linux-2.6/arch/powerpc/kernel/ptrace.c            |  959 +++++++-----
 linux-2.6/arch/powerpc/kernel/ptrace32.c          |  436 -----
 linux-2.6/arch/powerpc/kernel/signal_32.c         |   56 
 linux-2.6/arch/powerpc/kernel/signal_64.c         |    4 
 linux-2.6/arch/powerpc/kernel/sys_ppc32.c         |    5 
 linux-2.6/arch/powerpc/lib/sstep.c                |    3 
 linux-2.6/arch/powerpc/platforms/cell/spufs/run.c |    2 
 linux-2.6/arch/ppc/kernel/asm-offsets.c           |    2 
 linux-2.6/arch/s390/kernel/compat_linux.c         |    3 
 linux-2.6/arch/s390/kernel/compat_signal.c        |    5 
 linux-2.6/arch/s390/kernel/process.c              |    3 
 linux-2.6/arch/s390/kernel/ptrace.c               |  639 +++++++-
 linux-2.6/arch/s390/kernel/signal.c               |    4 
 linux-2.6/arch/s390/kernel/traps.c                |    6 
 linux-2.6/arch/sparc64/kernel/entry.S             |    6 
 linux-2.6/arch/sparc64/kernel/process.c           |    3 
 linux-2.6/arch/sparc64/kernel/ptrace.c            | 1222 ++++++++--------
 linux-2.6/arch/sparc64/kernel/signal.c            |    2 
 linux-2.6/arch/sparc64/kernel/signal32.c          |    2 
 linux-2.6/arch/sparc64/kernel/sys_sparc32.c       |    3 
 linux-2.6/arch/sparc64/kernel/systbls.S           |    4 
 linux-2.6/arch/x86_64/ia32/fpu32.c                |   92 -
 linux-2.6/arch/x86_64/ia32/ia32_aout.c            |    6 
 linux-2.6/arch/x86_64/ia32/ia32_signal.c          |    8 
 linux-2.6/arch/x86_64/ia32/ia32entry.S            |    2 
 linux-2.6/arch/x86_64/ia32/ptrace32.c             |  715 ++++++---
 linux-2.6/arch/x86_64/ia32/sys_ia32.c             |    5 
 linux-2.6/arch/x86_64/kernel/process.c            |    5 
 linux-2.6/arch/x86_64/kernel/ptrace.c             |  648 +++++---
 linux-2.6/arch/x86_64/kernel/signal.c             |   30 
 linux-2.6/arch/x86_64/kernel/traps.c              |    8 
 linux-2.6/arch/x86_64/mm/fault.c                  |    4 
 linux-2.6/drivers/connector/cn_proc.c             |    4 
 linux-2.6/fs/binfmt_aout.c                        |    6 
 linux-2.6/fs/binfmt_elf.c                         |    6 
 linux-2.6/fs/binfmt_elf_fdpic.c                   |    7 
 linux-2.6/fs/binfmt_flat.c                        |    3 
 linux-2.6/fs/binfmt_som.c                         |    2 
 linux-2.6/fs/exec.c                               |   11 
 linux-2.6/fs/proc/array.c                         |   14 
 linux-2.6/fs/proc/base.c                          |   17 
 linux-2.6/include/asm-i386/i387.h                 |   13 
 linux-2.6/include/asm-i386/signal.h               |    4 
 linux-2.6/include/asm-i386/thread_info.h          |    7 
 linux-2.6/include/asm-i386/tracehook.h            |   49 
 linux-2.6/include/asm-ia64/elf.h                  |   24 
 linux-2.6/include/asm-ia64/tracehook.h            |   81 +
 linux-2.6/include/asm-powerpc/tracehook.h         |   80 +
 linux-2.6/include/asm-s390/tracehook.h            |   53 
 linux-2.6/include/asm-sparc64/tracehook.h         |   44 
 linux-2.6/include/asm-x86_64/fpu32.h              |    3 
 linux-2.6/include/asm-x86_64/thread_info.h        |    2 
 linux-2.6/include/asm-x86_64/tracehook.h          |   54 
 linux-2.6/include/linux/init_task.h               |    3 
 linux-2.6/include/linux/ptrace.h                  |  224 ++
 linux-2.6/include/linux/sched.h                   |   25 
 linux-2.6/include/linux/tracehook.h               |  699 +++++++++
 linux-2.6/include/linux/utrace.h                  |  481 ++++++
 linux-2.6/init/Kconfig                            |   29 
 linux-2.6/kernel/Makefile                         |    1 
 linux-2.6/kernel/exit.c                           |  253 ---
 linux-2.6/kernel/fork.c                           |   62 
 linux-2.6/kernel/ptrace.c                         | 1560 ++++++++++++++++----
 linux-2.6/kernel/signal.c                         |  211 --
 linux-2.6/kernel/sys.c                            |    2 
 linux-2.6/kernel/timer.c                          |    4 
 linux-2.6/kernel/utrace.c                         | 1526 ++++++++++++++++++++
 linux-2.6/security/selinux/hooks.c                |   54 
 linux-2.6/security/selinux/include/objsec.h       |    1 
 100 files changed, 9619 insertions(+), 4607 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linux-2.6-utrace.patch	22 Aug 2006 04:20:36 -0000	1.21
+++ linux-2.6-utrace.patch	25 Aug 2006 19:18:19 -0000	1.22
@@ -16798,3 +16798,409 @@
 -	}
 +	tracehook_report_syscall(regs, leaving);
  }
+I found and fixed some underlying problems showing up when running the
+frysk test suite, which accounted for some crash failure modes.
+This is probably an improvement, but there are still some problems.
+Below is the patch in addition to the rawhide code.
+This is all I can do tonight.
+
+
+diff --git a/Documentation/utrace.txt b/Documentation/utrace.txt
+index 7eb2495..0000000 100644  
+--- a/Documentation/utrace.txt
++++ b/Documentation/utrace.txt
+@@ -370,9 +370,10 @@ Callback:
+ 			    struct task_struct *tsk);
+ 
+ The thread is really dead now.  If the UTRACE_ACTION_NOREAP flag is set
+-after this callback, it remains an unreported zombie.  Otherwise, it
+-might be reaped by its parent, or self-reap immediately.
+-
++after this callback, it remains an unreported zombie.  Otherwise, it might
++be reaped by its parent, or self-reap immediately.  Though the actual
++reaping may happen in parallel, a report_reap callback will always be
++ordered after a report_death callback.
+ 
+ UTRACE_EVENT(SYSCALL_ENTRY)	Thread has entered kernel for a system call
+ Callback:
+diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
+index dd84527..0000000 100644  
+--- a/include/linux/tracehook.h
++++ b/include/linux/tracehook.h
+@@ -366,10 +366,14 @@ static inline int tracehook_notify_cldst
+  * thread's death (i.e. when it is not ignored and its thread group is
+  * empty).  This call must set *noreap to 0, or to 1 to force this thread
+  * to become a zombie when it would normally reap itself.
++ * The *death_cookie is passed to tracehook_report_death (below).
+  */
+-static inline int tracehook_notify_death(struct task_struct *tsk, int *noreap)
++static inline int tracehook_notify_death(struct task_struct *tsk,
++					 int *noreap, void **death_cookie)
+ {
++	*death_cookie = NULL;
+ #ifdef CONFIG_UTRACE
++	*death_cookie = tsk->utrace;
+ 	if (tsk->utrace_flags & UTRACE_ACTION_NOREAP) {
+ 		*noreap = 1;
+ 		return 1;
+@@ -570,14 +574,18 @@ static inline int tracehook_allow_access
+  ***/
+ 
+ /*
+- * Thread has just become a zombie or is about to self-reap (tsk->exit_state).
++ * Thread has just become a zombie (exit_state==TASK_ZOMBIE) or is about to
++ * self-reap (exit_state==EXIT_DEAD).  If normal reaping is not inhibited,
++ * tsk->exit_state might be changing in parallel.  The death_cookie was
++ * passed back by tracehook_notify_death (above).
+  */
+-static inline void tracehook_report_death(struct task_struct *tsk)
++static inline void tracehook_report_death(struct task_struct *tsk,
++					  int exit_state, void *death_cookie)
+ {
+ #ifdef CONFIG_UTRACE
+ 	smp_mb();
+ 	if (tsk->utrace_flags & (UTRACE_EVENT(DEATH) | UTRACE_ACTION_QUIESCE))
+-		utrace_report_death(tsk);
++		utrace_report_death(tsk, death_cookie);
+ #endif
+ }
+ 
+diff --git a/include/linux/utrace.h b/include/linux/utrace.h
+index bb9d22b..0000000 100644  
+--- a/include/linux/utrace.h
++++ b/include/linux/utrace.h
+@@ -191,6 +191,7 @@ struct utrace
+ 		} live;
+ 		struct {
+ 			int notified;
++			int reap;
+ 		} exit;
+ 	} u;
+ 
+@@ -330,7 +331,9 @@ struct utrace_engine_ops
+ 	/*
+ 	 * Thread is really dead now.  If UTRACE_ACTION_NOREAP is in force,
+ 	 * it remains an unreported zombie.  Otherwise, it might be reaped
+-	 * by its parent, or self-reap immediately.
++	 * by its parent, or self-reap immediately.  Though the actual
++	 * reaping may happen in parallel, a report_reap callback will
++	 * always be ordered after a report_death callback.
+ 	 */
+ 	u32 (*report_death)(struct utrace_attached_engine *engine,
+ 			    struct task_struct *tsk);
+@@ -468,7 +471,7 @@ int utrace_get_signal(struct task_struct
+ void utrace_report_clone(unsigned long clone_flags, struct task_struct *child);
+ void utrace_report_vfork_done(pid_t child_pid);
+ void utrace_report_exit(long *exit_code);
+-void utrace_report_death(struct task_struct *);
++void utrace_report_death(struct task_struct *, struct utrace *);
+ int utrace_report_jctl(int type);
+ void utrace_report_exec(struct linux_binprm *bprm, struct pt_regs *regs);
+ void utrace_report_syscall(struct pt_regs *regs, int is_exit);
+diff --git a/kernel/exit.c b/kernel/exit.c
+index c349ee9..0000000 100644  
+--- a/kernel/exit.c
++++ b/kernel/exit.c
+@@ -658,6 +658,7 @@ static void exit_notify(struct task_stru
+ 	int state;
+ 	struct task_struct *t;
+ 	int noreap;
++	void *cookie;
+ 
+ 	if (signal_pending(tsk) && !(tsk->signal->flags & SIGNAL_GROUP_EXIT)
+ 	    && !thread_group_empty(tsk)) {
+@@ -738,7 +739,7 @@ static void exit_notify(struct task_stru
+ 	    && !capable(CAP_KILL))
+ 		tsk->exit_signal = SIGCHLD;
+ 
+-	if (!tracehook_notify_death(tsk, &noreap)
++	if (!tracehook_notify_death(tsk, &noreap, &cookie)
+ 	    && tsk->exit_signal != -1 && thread_group_empty(tsk))
+ 		do_notify_parent(tsk, tsk->exit_signal);
+ 
+@@ -749,7 +750,7 @@ static void exit_notify(struct task_stru
+ 
+ 	write_unlock_irq(&tasklist_lock);
+ 
+-	tracehook_report_death(tsk);
++	tracehook_report_death(tsk, state, cookie);
+ 
+ 	/* If the process is dead, release it - nobody will wait for it */
+ 	if (state == EXIT_DEAD)
+diff --git a/kernel/ptrace.c b/kernel/ptrace.c
+index 827a0e8..0000000 100644  
+--- a/kernel/ptrace.c
++++ b/kernel/ptrace.c
+@@ -253,8 +253,9 @@ ptrace_update(struct task_struct *target
+ 
+ 	/*
+ 	 * ptrace always inhibits normal parent reaping.
++	 * But for a corner case we sometimes see the REAP event instead.
+ 	 */
+-	flags |= UTRACE_ACTION_NOREAP;
++	flags |= UTRACE_ACTION_NOREAP | UTRACE_EVENT(REAP);
+ 
+ 	state->u.live.stopped = (flags & UTRACE_ACTION_QUIESCE) != 0;
+ 	if (!state->u.live.stopped) {
+@@ -1010,8 +1011,11 @@ ptrace_do_wait(struct task_struct *tsk,
+ 		if (p->exit_state == EXIT_ZOMBIE) {
+ 			if (!likely(options & WEXITED))
+ 				continue;
++			if (delay_group_leader(p))
++				continue;
+ 			goto found;
+ 		}
++		// XXX should handle WCONTINUED
+ 	}
+ 	rcu_read_unlock();
+ 	return err;
+@@ -1094,10 +1098,10 @@ found:
+ 			utrace_unlock(utrace);
+ 		}
+ 		rcu_read_unlock();
+-	}
+ 
+-	if (why != CLD_TRAPPED)
+-		ptrace_detach(p, state->engine);
++		if (err > 0 && why != CLD_TRAPPED)
++			ptrace_detach(p, state->engine);
++	}
+ 
+ 	return err;
+ }
+@@ -1220,6 +1224,14 @@ ptrace_report_death(struct utrace_attach
+ 	struct ptrace_state *state = (struct ptrace_state *) engine->data;
+ 
+ 	if (tsk->parent == state->parent) {
++		/*
++		 * This is a natural child, so we detach and let the normal
++		 * reporting happen once we our NOREAP action is gone.  But
++		 * first, generate a SIGCHLD for those cases where normal
++		 * behavior won't.  A ptrace'd child always generates SIGCHLD.
++		 */
++		if (tsk->exit_signal == -1 || !thread_group_empty(tsk))
++			do_notify(tsk, state->parent, CLD_EXITED);
+ 		ptrace_state_unlink(state);
+ 		rcu_assign_pointer(engine->data, 0UL);
+ 		ptrace_done(state);
+@@ -1231,6 +1243,25 @@ ptrace_report_death(struct utrace_attach
+ 	return UTRACE_ACTION_RESUME;
+ }
+ 
++/*
++ * We get this only in the case where our UTRACE_ACTION_NOREAP was ignored.
++ * That happens solely when a non-leader exec reaps the old leader.
++ */
++static void
++ptrace_report_reap(struct utrace_attached_engine *engine,
++		   struct task_struct *tsk)
++{
++	struct ptrace_state *state;
++	rcu_read_lock();
++	state = rcu_dereference((struct ptrace_state *) engine->data);
++	if (state != NULL) {
++		ptrace_state_unlink(state);
++		rcu_assign_pointer(engine->data, 0UL);
++		ptrace_done(state);
++	}
++	rcu_read_unlock();
++}
++
+ 
+ static u32
+ ptrace_report_clone(struct utrace_attached_engine *engine,
+@@ -1453,6 +1484,7 @@ static const struct utrace_engine_ops pt
+ 	.report_clone = ptrace_report_clone,
+ 	.report_exit = ptrace_report_exit,
+ 	.report_death = ptrace_report_death,
++	.report_reap = ptrace_report_reap,
+ 	.unsafe_exec = ptrace_unsafe_exec,
+ 	.tracer_task = ptrace_tracer_task,
+ 	.allow_access_process_vm = ptrace_allow_access_process_vm,
+diff --git a/kernel/utrace.c b/kernel/utrace.c
+index 4bd405c..0000000 100644  
+--- a/kernel/utrace.c
++++ b/kernel/utrace.c
+@@ -485,14 +485,46 @@ EXPORT_SYMBOL_GPL(utrace_detach);
+ 
+ 
+ /*
++ * Called with utrace->lock held.
++ * Notify and clean up all engines, then free utrace.
++ */
++static void
++utrace_reap(struct task_struct *target, struct utrace *utrace)
++{
++	struct utrace_attached_engine *engine, *next;
++	const struct utrace_engine_ops *ops;
++
++restart:
++	list_for_each_entry_safe(engine, next, &utrace->engines, entry) {
++		list_del_rcu(&engine->entry);
++
++		/*
++		 * Now nothing else refers to this engine.
++		 */
++		if (engine->flags & UTRACE_EVENT(REAP)) {
++			ops = rcu_dereference(engine->ops);
++			if (ops != &dead_engine_ops) {
++				utrace_unlock(utrace);
++				(*ops->report_reap)(engine, target);
++				call_rcu(&engine->rhead, utrace_engine_free);
++				utrace_lock(utrace);
++				goto restart;
++			}
++		}
++		call_rcu(&engine->rhead, utrace_engine_free);
++	}
++	utrace_unlock(utrace);
++
++	rcu_utrace_free(utrace);
++}
++
++/*
+  * Called by release_task.  After this, target->utrace must be cleared.
+  */
+ void
+ utrace_release_task(struct task_struct *target)
+ {
+ 	struct utrace *utrace;
+-	struct utrace_attached_engine *engine, *next;
+-	const struct utrace_engine_ops *ops;
+ 
+ 	task_lock(target);
+ 	utrace = target->utrace;
+@@ -502,27 +534,24 @@ utrace_release_task(struct task_struct *
+ 	if (unlikely(utrace == NULL))
+ 		return;
+ 
+-restart:
+ 	utrace_lock(utrace);
+-	list_for_each_entry_safe(engine, next, &utrace->engines, entry) {
+-		list_del_rcu(&engine->entry);
+ 
++	if (!utrace->u.exit.notified
++	    && (target->utrace_flags & (UTRACE_EVENT(DEATH)
++					| UTRACE_EVENT(QUIESCE)))) {
+ 		/*
+-		 * Now nothing else refers to this engine.
++		 * The target will do some final callbacks but hasn't
++		 * finished them yet.  We know because it clears these
++		 * event bits after it's done.  Instead of cleaning up here
++		 * and requiring utrace_report_death to cope with it, we
++		 * delay the REAP report and the teardown until after the
++		 * target finishes its death reports.
+ 		 */
+-		if (engine->flags & UTRACE_EVENT(REAP)) {
+-			ops = rcu_dereference(engine->ops);
+-			utrace_unlock(utrace);
+-			(*ops->report_reap)(engine, target);
+-			call_rcu(&engine->rhead, utrace_engine_free);
+-			goto restart;
+-		}
+-		else
+-			call_rcu(&engine->rhead, utrace_engine_free);
++		utrace->u.exit.reap = 1;
++		utrace_unlock(utrace);
+ 	}
+-	utrace_unlock(utrace);
+-
+-	rcu_utrace_free(utrace);
++	else
++		utrace_reap(target, utrace); /* Unlocks and frees.  */
+ }
+ 
+ 
+@@ -642,16 +671,17 @@ update_action(struct task_struct *tsk, s
+ 	} while (0)
+ 
+ 
+-
++/*
++ * Called with utrace->lock held, returns with it released.
++ */
+ static u32
+-remove_detached(struct task_struct *tsk, struct utrace **utracep, u32 action)
++remove_detached(struct task_struct *tsk, struct utrace *utrace,
++		struct utrace **utracep, u32 action)
+ {
+-	struct utrace *utrace = tsk->utrace;
+ 	struct utrace_attached_engine *engine, *next;
+ 	unsigned long flags;
+ 
+ 	flags = 0;
+-	utrace_lock(utrace);
+ 	list_for_each_entry_safe(engine, next, &utrace->engines, entry) {
+ 		if (engine->ops == &dead_engine_ops)
+ 			remove_engine(engine, tsk, utrace);
+@@ -672,8 +702,10 @@ remove_detached(struct task_struct *tsk,
+ static inline u32
+ check_detach(struct task_struct *tsk, u32 action)
+ {
+-	if (action & UTRACE_ACTION_DETACH)
+-		action = remove_detached(tsk, NULL, action);
++	if (action & UTRACE_ACTION_DETACH) {
++		utrace_lock(tsk->utrace);
++		action = remove_detached(tsk, tsk->utrace, NULL, action);
++	}
+ 	return action;
+ }
+ 
+@@ -900,11 +932,16 @@ utrace_report_exit(long *exit_code)
+ 
+ /*
+  * Called iff UTRACE_EVENT(DEATH) flag is set.
++ *
++ * It is always possible that we are racing with utrace_release_task here,
++ * if UTRACE_ACTION_NOREAP is not set, or in the case of non-leader exec
++ * where the old leader will get released regardless of NOREAP.  For this
++ * reason, utrace_release_task checks for the event bits that get us here,
++ * and delays its cleanup for us to do.
+  */
+ void
+-utrace_report_death(struct task_struct *tsk)
++utrace_report_death(struct task_struct *tsk, struct utrace *utrace)
+ {
+-	struct utrace *utrace = tsk->utrace;
+ 	struct list_head *pos, *next;
+ 	struct utrace_attached_engine *engine;
+ 	u32 action, oaction;
+@@ -927,9 +964,36 @@ utrace_report_death(struct task_struct *
+ 	 * This may notice that there are no engines left and
+ 	 * free the utrace struct.
+ 	 */
+-	action = remove_detached(tsk, &utrace, action);
++	utrace_lock(utrace);
++	if (utrace->u.exit.reap) {
++		/*
++		 * utrace_release_task was already called in parallel.
++		 * We must complete its work now.
++		 */
++	reap:
++		utrace_reap(tsk, utrace);
++	}
++	else {
++		action = remove_detached(tsk, utrace, &utrace, action);
++
++		if (utrace != NULL) {
++			utrace_lock(utrace);
++			if (utrace->u.exit.reap)
++				goto reap;
+ 
+-	check_noreap(tsk, utrace, oaction, action);
++			/*
++			 * Clear event bits we can't see any more.  This
++			 * tells utrace_release_task we have already
++			 * finished, if it comes along later.
++			 */
++			tsk->utrace_flags &= (UTRACE_EVENT(REAP)
++					      | UTRACE_ACTION_NOREAP);
++
++			utrace_unlock(utrace);
++		}
++
++		check_noreap(tsk, utrace, oaction, action);
++	}
+ }
+ 
+ /*



From fedora-cvs-commits at redhat.com  Fri Aug 25 19:21:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 15:21:20 -0400
Subject: rpms/kernel/devel config-rhel-x86-generic, 1.1, 1.2 kernel-2.6.spec,
	1.2588, 1.2589
Message-ID: <200608251921.k7PJLKWJ009569@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9418

Modified Files:
	kernel-2.6.spec 
Added Files:
	config-rhel-x86-generic 
Log Message:
stub



Index: config-rhel-x86-generic
===================================================================
RCS file: config-rhel-x86-generic
diff -N config-rhel-x86-generic
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ config-rhel-x86-generic	25 Aug 2006 19:21:17 -0000	1.2
@@ -0,0 +1,5 @@
+CONFIG_PHYSICAL_ALIGN=0x400000
+CONFIG_CRASH_DUMP=y
+CONFIG_PROC_VMCORE=y
+CONFIG_RELOCATABLE=y
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2588
retrieving revision 1.2589
diff -u -r1.2588 -r1.2589
--- kernel-2.6.spec	25 Aug 2006 19:18:19 -0000	1.2588
+++ kernel-2.6.spec	25 Aug 2006 19:21:17 -0000	1.2589
@@ -1803,7 +1803,7 @@
 - add x86, x86_64 relocatable kernel patch for rhel only (davej, forgive my sins)
   - applied xen relocatable cleanup on top of it
 - add ia64 kexec/kdump pieces  
-  
+
 * Fri Aug 25 2006 Jesse Keating <jkeating at redhat.com>
 - Enable i386 for olpc so that kernel-headers is built
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 20:00:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 16:00:32 -0400
Subject: rpms/mesa/devel mesa-6.5.1-build-config.patch, 1.1, 1.2 mesa.spec,
	1.92, 1.93
Message-ID: <200608252000.k7PK0Vgf010973@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10948

Modified Files:
	mesa-6.5.1-build-config.patch mesa.spec 
Log Message:
* Fri Aug 25 2006 Adam Jackson <ajackson at redhat.com> - 6.5.1-0.rc1.1.fc6
- mesa-6.5.1-build-config.patch: Add i965 to x86-64 config.


mesa-6.5.1-build-config.patch:
 default          |    8 ++++----
 linux            |    4 +++-
 linux-dri        |    9 ++++-----
 linux-dri-ppc    |    2 +-
 linux-dri-x86    |    2 +-
 linux-dri-x86-64 |    2 +-
 linux-osmesa     |    4 ++--
 linux-osmesa16   |    2 +-
 linux-osmesa32   |    2 +-
 9 files changed, 18 insertions(+), 17 deletions(-)

Index: mesa-6.5.1-build-config.patch
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.5.1-build-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-6.5.1-build-config.patch	18 Aug 2006 19:52:19 -0000	1.1
+++ mesa-6.5.1-build-config.patch	25 Aug 2006 20:00:28 -0000	1.2
@@ -1,6 +1,6 @@
---- mesa-cvs/configs/linux-dri-ppc.build-config	2005-08-19 16:20:03.000000000 -0400
-+++ mesa-cvs/configs/linux-dri-ppc	2006-08-14 13:44:40.000000000 -0400
-@@ -5,7 +5,7 @@
+--- Mesa-6.5.1/configs/linux-dri-ppc.build-config	2005-08-19 18:03:05.000000000 -0400
++++ Mesa-6.5.1/configs/linux-dri-ppc	2006-08-25 15:53:24.000000000 -0400
+@@ -5,7 +5,7 @@ include $(TOP)/configs/linux-dri
  
  CONFIG_NAME = linux-dri-ppc
  
@@ -9,9 +9,9 @@
  PIC_FLAGS = -fPIC
  
  ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
---- mesa-cvs/configs/linux-dri-x86.build-config	2005-09-12 11:19:19.000000000 -0400
-+++ mesa-cvs/configs/linux-dri-x86	2006-08-14 13:44:40.000000000 -0400
-@@ -6,7 +6,7 @@
+--- Mesa-6.5.1/configs/linux-dri-x86.build-config	2005-09-12 11:03:11.000000000 -0400
++++ Mesa-6.5.1/configs/linux-dri-x86	2006-08-25 15:53:24.000000000 -0400
+@@ -6,7 +6,7 @@ include $(TOP)/configs/linux-dri
  CONFIG_NAME = linux-dri-x86
  
  # Unnecessary on x86, generally.
@@ -20,9 +20,18 @@
  
  # Add -m32 to CFLAGS:
  ARCH_FLAGS = -m32
---- mesa-cvs/configs/linux-osmesa16.build-config	2006-07-12 22:50:27.000000000 -0400
-+++ mesa-cvs/configs/linux-osmesa16	2006-08-14 13:44:40.000000000 -0400
-@@ -17,7 +17,7 @@
+--- Mesa-6.5.1/configs/linux-dri-x86-64.build-config	2006-08-25 15:53:41.000000000 -0400
++++ Mesa-6.5.1/configs/linux-dri-x86-64	2006-08-25 15:53:51.000000000 -0400
+@@ -20,5 +20,5 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib64
+ # the new interface.  i810 are missing because there is no x86-64
+ # system where they could *ever* be used.
+ #
+-DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
++DRI_DIRS = i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300
+ 
+--- Mesa-6.5.1/configs/linux-osmesa16.build-config	2006-07-12 22:43:20.000000000 -0400
++++ Mesa-6.5.1/configs/linux-osmesa16	2006-08-25 15:53:24.000000000 -0400
+@@ -17,7 +17,7 @@ OSMESA_LIB_NAME = libOSMesa16.so
  
  
  # Directories
@@ -31,9 +40,9 @@
  DRIVER_DIRS = osmesa
  PROGRAM_DIRS = 
  
---- mesa-cvs/configs/linux.build-config	2005-10-28 09:11:00.000000000 -0400
-+++ mesa-cvs/configs/linux	2006-08-14 13:44:40.000000000 -0400
-@@ -8,7 +8,9 @@
+--- Mesa-6.5.1/configs/linux.build-config	2006-08-17 10:39:11.000000000 -0400
++++ Mesa-6.5.1/configs/linux	2006-08-25 15:53:24.000000000 -0400
+@@ -8,7 +8,9 @@ CONFIG_NAME = linux
  CC = gcc
  CXX = g++
  
@@ -44,9 +53,9 @@
  PIC_FLAGS  = -fPIC
  
  # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.  Add -m32
---- mesa-cvs/configs/linux-dri.build-config	2006-08-09 15:14:05.000000000 -0400
-+++ mesa-cvs/configs/linux-dri	2006-08-14 13:44:40.000000000 -0400
-@@ -12,8 +12,9 @@
+--- Mesa-6.5.1/configs/linux-dri.build-config	2006-08-17 10:09:02.000000000 -0400
++++ Mesa-6.5.1/configs/linux-dri	2006-08-25 15:53:24.000000000 -0400
+@@ -12,8 +12,9 @@ CXX = g++
  #MKDEP = /usr/X11R6/bin/makedepend
  #MKDEP = gcc -M
  #MKDEP_OPTIONS = -MF depend
@@ -57,33 +66,33 @@
  PIC_FLAGS  = -fPIC
  
  # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-@@ -24,8 +25,6 @@
+@@ -24,8 +25,6 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOU
  	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
- 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
+ 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
  
 -X11_INCLUDES = -I/usr/X11R6/include
 -
  CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
  	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
  
-@@ -35,7 +34,7 @@
+@@ -35,7 +34,7 @@ CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAG
  ASM_SOURCES = 
  
  # Library/program dependencies
 -EXTRA_LIB_PATH=-L/usr/X11R6/lib
 +EXTRA_LIB_PATH =
  
+ LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
  LIBDRM_LIB = `pkg-config --libs libdrm`
- DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-@@ -64,4 +63,4 @@
+@@ -65,4 +64,4 @@ WINDOW_SYSTEM=dri
  # gamma are missing because they have not been converted to use the new
  # interface.
  DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
 -	savage sis tdfx trident unichrome ffb
 +	savage tdfx trident unichrome ffb # sis
---- mesa-cvs/configs/linux-osmesa32.build-config	2006-07-12 22:50:27.000000000 -0400
-+++ mesa-cvs/configs/linux-osmesa32	2006-08-14 13:44:40.000000000 -0400
-@@ -17,7 +17,7 @@
+--- Mesa-6.5.1/configs/linux-osmesa32.build-config	2006-07-12 22:43:20.000000000 -0400
++++ Mesa-6.5.1/configs/linux-osmesa32	2006-08-25 15:53:24.000000000 -0400
+@@ -17,7 +17,7 @@ OSMESA_LIB_NAME = libOSMesa32.so
  
  
  # Directories
@@ -92,9 +101,9 @@
  DRIVER_DIRS = osmesa
  PROGRAM_DIRS = 
  
---- mesa-cvs/configs/default.build-config	2006-07-20 00:34:36.000000000 -0400
-+++ mesa-cvs/configs/default	2006-08-14 13:46:03.000000000 -0400
-@@ -55,11 +55,11 @@
+--- Mesa-6.5.1/configs/default.build-config	2006-07-20 12:08:04.000000000 -0400
++++ Mesa-6.5.1/configs/default	2006-08-25 15:53:24.000000000 -0400
+@@ -55,11 +55,11 @@ ASM_SOURCES = 
  
  # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
  # order to build the Motif widget too)
@@ -108,7 +117,7 @@
  SRC_DIRS = mesa glu glut/glx glw
  GLU_DIRS = sgi
  DRIVER_DIRS = x11 osmesa
-@@ -73,14 +73,14 @@
+@@ -73,14 +73,14 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -l
  OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
  GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
  GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
@@ -125,9 +134,9 @@
  
  # Where libGL will look for DRI hardware drivers
  DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
---- mesa-cvs/configs/linux-osmesa.build-config	2006-07-12 22:50:27.000000000 -0400
-+++ mesa-cvs/configs/linux-osmesa	2006-08-14 13:44:40.000000000 -0400
-@@ -14,9 +14,9 @@
+--- Mesa-6.5.1/configs/linux-osmesa.build-config	2006-07-12 22:43:20.000000000 -0400
++++ Mesa-6.5.1/configs/linux-osmesa	2006-08-25 15:53:24.000000000 -0400
+@@ -14,9 +14,9 @@ CXXFLAGS = -O3 -ansi -pedantic -fPIC -ff
  
  
  # Directories


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- mesa.spec	23 Aug 2006 22:26:16 -0000	1.92
+++ mesa.spec	25 Aug 2006 20:00:28 -0000	1.93
@@ -34,7 +34,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5.1
-Release: 0.rc1%{?dist}
+Release: 0.rc1.1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -500,6 +500,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Fri Aug 25 2006 Adam Jackson <ajackson at redhat.com> - 6.5.1-0.rc1.1.fc6
+- mesa-6.5.1-build-config.patch: Add i965 to x86-64 config.
+
 * Wed Aug 23 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc1.fc6
 - Bump to 6.5.1 RC1.
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 20:06:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 16:06:10 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch, 1.20,
	1.21 selinux-policy.spec, 1.259, 1.260
Message-ID: <200608252006.k7PK6AVX011130@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11115

Modified Files:
	policy-20060802.patch selinux-policy.spec 
Log Message:
* Fri Aug 25 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-5
- Allow setroubleshoot to getattr on all dirs to gather RPM data


policy-20060802.patch:
 policy/modules/admin/amanda.fc                            |   51 -
 policy/modules/admin/anaconda.te                          |   20 
 policy/modules/admin/bootloader.te                        |    4 
 policy/modules/admin/consoletype.te                       |   11 
 policy/modules/admin/firstboot.te                         |    2 
 policy/modules/admin/prelink.te                           |    2 
 policy/modules/admin/rpm.fc                               |    2 
 policy/modules/admin/rpm.if                               |   13 
 policy/modules/admin/usermanage.te                        |    5 
 policy/modules/apps/java.fc                               |    9 
 policy/modules/apps/mozilla.if                            |    2 
 policy/modules/apps/wine.te                               |    2 
 policy/modules/kernel/corecommands.fc                     |    1 
 policy/modules/kernel/corecommands.if                     |    1 
 policy/modules/kernel/corenetwork.te.in                   |    7 
 policy/modules/kernel/devices.fc                          |    4 
 policy/modules/kernel/devices.if                          |   36 +
 policy/modules/kernel/devices.te                          |    8 
 policy/modules/kernel/files.if                            |   18 
 policy/modules/kernel/filesystem.te                       |    2 
 policy/modules/kernel/kernel.if                           |   75 ++
 policy/modules/kernel/terminal.fc                         |    2 
 policy/modules/kernel/terminal.if                         |   19 
 policy/modules/services/amavis.te                         |    7 
 policy/modules/services/apache.te                         |    2 
 policy/modules/services/avahi.te                          |    2 
 policy/modules/services/bind.te                           |    1 
 policy/modules/services/ccs.fc                            |    8 
 policy/modules/services/ccs.if                            |   45 +
 policy/modules/services/ccs.te                            |   84 +++
 policy/modules/services/cpucontrol.te                     |    2 
 policy/modules/services/cron.if                           |   17 
 policy/modules/services/cron.te                           |    7 
 policy/modules/services/cups.te                           |   19 
 policy/modules/services/cyrus.te                          |    5 
 policy/modules/services/dbus.if                           |    6 
 policy/modules/services/dbus.te                           |    2 
 policy/modules/services/dovecot.te                        |    4 
 policy/modules/services/inn.te                            |    1 
 policy/modules/services/ldap.te                           |    2 
 policy/modules/services/mta.fc                            |    2 
 policy/modules/services/ntp.te                            |    6 
 policy/modules/services/oddjob.fc                         |    8 
 policy/modules/services/oddjob.if                         |   76 ++
 policy/modules/services/oddjob.te                         |   70 ++
 policy/modules/services/oddjob_mkhomedir.fc               |    6 
 policy/modules/services/oddjob_mkhomedir.if               |   24 
 policy/modules/services/oddjob_mkhomedir.te               |   26 
 policy/modules/services/openvpn.te                        |    2 
 policy/modules/services/pegasus.if                        |   31 +
 policy/modules/services/pegasus.te                        |    5 
 policy/modules/services/postfix.te                        |    7 
 policy/modules/services/postgresql.te                     |    1 
 policy/modules/services/procmail.te                       |    1 
 policy/modules/services/pyzor.te                          |    1 
 policy/modules/services/radius.te                         |    2 
 policy/modules/services/ricci.fc                          |   20 
 policy/modules/services/ricci.if                          |  184 ++++++
 policy/modules/services/ricci.te                          |  373 ++++++++++++++
 policy/modules/services/rpc.if                            |    2 
 policy/modules/services/rpc.te                            |    6 
 policy/modules/services/samba.te                          |    8 
 policy/modules/services/setroubleshoot.fc                 |    9 
 policy/modules/services/setroubleshoot.if                 |    3 
 policy/modules/services/setroubleshoot.te                 |  112 ++++
 policy/modules/services/squid.te                          |    4 
 policy/modules/services/ssh.if                            |   24 
 policy/modules/services/stunnel.te                        |    2 
 policy/modules/services/sysstat.te                        |    3 
 policy/modules/services/xserver.if                        |   69 ++
 policy/modules/services/xserver.te                        |   19 
 policy/modules/system/authlogin.te                        |   10 
 policy/modules/system/fstools.te                          |    1 
 policy/modules/system/hostname.te                         |   10 
 policy/modules/system/init.if                             |    7 
 policy/modules/system/init.te                             |    2 
 policy/modules/system/libraries.fc                        |    7 
 policy/modules/system/locallogin.te                       |    4 
 policy/modules/system/logging.fc                          |    3 
 policy/modules/system/logging.if                          |   21 
 policy/modules/system/logging.te                          |    3 
 policy/modules/system/lvm.fc                              |    2 
 policy/modules/system/lvm.te                              |    6 
 policy/modules/system/miscfiles.fc                        |    1 
 policy/modules/system/miscfiles.if                        |   18 
 policy/modules/system/modutils.te                         |    1 
 policy/modules/system/mount.te                            |    9 
 policy/modules/system/selinuxutil.te                      |   13 
 policy/modules/system/udev.fc                             |    1 
 policy/modules/system/udev.te                             |    5 
 policy/modules/system/unconfined.fc                       |    1 
 policy/modules/system/unconfined.if                       |    2 
 policy/modules/system/unconfined.te                       |    5 
 policy/modules/system/userdomain.if                       |  246 ++++++---
 policy/modules/system/userdomain.te                       |   48 -
 policy/modules/system/xen.if                              |   38 +
 policy/modules/system/xen.te                              |   26 
 serefpolicy-2.3.9/policy/mls                              |    9 
 serefpolicy-2.3.9/policy/modules/services/spamassassin.te |    4 
 99 files changed, 1870 insertions(+), 249 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- policy-20060802.patch	25 Aug 2006 17:32:13 -0000	1.20
+++ policy-20060802.patch	25 Aug 2006 20:06:07 -0000	1.21
@@ -22,7 +22,6 @@
  mlsconstrain dir { add_name remove_name reparent rmdir }
  	((( l1 dom l2 ) and ( l1 domby h2 )) or
  	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-2.3.9/policy/modules/admin/amanda.fc
 --- nsaserefpolicy/policy/modules/admin/amanda.fc	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/admin/amanda.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -9,62 +9,13 @@
@@ -89,7 +88,6 @@
  /var/lib/amanda/disklist	--	gen_context(system_u:object_r:amanda_data_t,s0)
  /var/lib/amanda/gnutar-lists(/.*)?	gen_context(system_u:object_r:amanda_gnutarlists_t,s0)
  /var/lib/amanda/index			gen_context(system_u:object_r:amanda_data_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.9/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/admin/anaconda.te	2006-08-24 08:04:23.000000000 -0400
 @@ -25,8 +25,12 @@
@@ -134,7 +132,6 @@
 +dontaudit domain anaconda_t:fifo_file r_file_perms;
 +dontaudit domain anaconda_t:unix_stream_socket connectto;
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.9/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-08-02 10:34:09.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/admin/bootloader.te	2006-08-24 08:04:23.000000000 -0400
 @@ -83,8 +83,10 @@
@@ -149,7 +146,6 @@
  
  fs_getattr_xattr_fs(bootloader_t)
  fs_getattr_tmpfs(bootloader_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.9/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/admin/consoletype.te	2006-08-24 08:04:23.000000000 -0400
 @@ -8,7 +8,12 @@
@@ -174,7 +170,6 @@
 +optional_policy(`
 +	xen_dontaudit_use_fds(consoletype_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.9/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-02 10:34:09.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/admin/firstboot.te	2006-08-24 08:04:23.000000000 -0400
 @@ -106,7 +106,7 @@
@@ -186,7 +181,6 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.9/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-02 10:34:09.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/admin/prelink.te	2006-08-24 08:04:23.000000000 -0400
 @@ -74,6 +74,8 @@
@@ -198,7 +192,6 @@
  optional_policy(`
  	cron_system_entry(prelink_t, prelink_exec_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.9/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/admin/rpm.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -19,6 +19,8 @@
@@ -210,7 +203,6 @@
  ')
  
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.9/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/admin/rpm.if	2006-08-24 08:04:23.000000000 -0400
 @@ -75,12 +75,13 @@
@@ -233,7 +225,6 @@
  	allow rpm_t $3:chr_file rw_term_perms;
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.9/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-23 12:14:56.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/admin/usermanage.te	2006-08-24 08:04:23.000000000 -0400
 @@ -256,7 +256,7 @@
@@ -262,7 +253,6 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.9/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2006-07-14 17:04:31.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/apps/java.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -1,7 +1,7 @@
@@ -285,7 +275,6 @@
 +/usr/bin/grmic  	--	gen_context(system_u:object_r:java_exec_t,s0)
 +/usr/bin/grmiregistry  	--	gen_context(system_u:object_r:java_exec_t,s0)
 +/usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.3.9/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2006-08-16 08:46:26.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/apps/mozilla.if	2006-08-24 08:04:23.000000000 -0400
 @@ -63,6 +63,7 @@
@@ -304,7 +293,6 @@
  
  	# Browse the web, connect to printer
  	sysnet_dns_name_resolve($1_mozilla_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.3.9/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2006-07-14 17:04:31.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/apps/wine.te	2006-08-24 08:04:23.000000000 -0400
 @@ -18,7 +18,7 @@
@@ -316,7 +304,6 @@
  	unconfined_domain_noaudit(wine_t)
  	files_execmod_all_files(wine_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -62,6 +62,7 @@
@@ -327,7 +314,6 @@
  
  ifdef(`distro_debian',`
  /etc/mysql/debian-start		--	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.3.9/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2006-08-02 10:34:05.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.if	2006-08-24 08:04:23.000000000 -0400
 @@ -950,6 +950,7 @@
@@ -338,7 +324,6 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.9/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-02 10:34:05.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/corenetwork.te.in	2006-08-24 08:04:23.000000000 -0400
 @@ -67,12 +67,14 @@
@@ -381,7 +366,6 @@
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
  network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
  network_port(spamd, tcp,783,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.9/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/devices.fc	2006-08-25 10:04:00.000000000 -0400
 @@ -3,7 +3,7 @@
@@ -402,7 +386,6 @@
  /dev/par.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
  /dev/patmgr[01]		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/pmu		-c	gen_context(system_u:object_r:power_device_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.3.9/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-08-23 12:14:51.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/devices.if	2006-08-24 08:04:23.000000000 -0400
 @@ -3034,3 +3034,39 @@
@@ -445,7 +428,6 @@
 +
 +	allow $1 bios_device_t:chr_file write;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.3.9/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-08-23 12:14:51.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/devices.te	2006-08-24 08:04:23.000000000 -0400
 @@ -72,6 +72,12 @@
@@ -470,7 +452,6 @@
  
  type xen_device_t;
  dev_node(xen_device_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.3.9/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-08-02 10:34:05.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/files.if	2006-08-24 08:04:23.000000000 -0400
 @@ -2934,6 +2934,24 @@
@@ -498,7 +479,6 @@
  ##	Read the tmp directory (/tmp).
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.9/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-02 10:34:05.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/filesystem.te	2006-08-24 08:04:23.000000000 -0400
 @@ -24,6 +24,7 @@
@@ -517,7 +497,6 @@
  
  ########################################
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.9/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-08-16 08:46:26.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/kernel.if	2006-08-24 08:04:23.000000000 -0400
 @@ -1443,6 +1443,42 @@
@@ -606,7 +585,6 @@
 +	dontaudit $1 proc_type:file getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.fc serefpolicy-2.3.9/policy/modules/kernel/terminal.fc
 --- nsaserefpolicy/policy/modules/kernel/terminal.fc	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/terminal.fc	2006-08-24 16:52:33.000000000 -0400
 @@ -34,3 +34,5 @@
@@ -615,7 +593,6 @@
  ')
 +
 +/dev/xvc[0-9]*		-c	gen_context(system_u:object_r:tty_device_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.9/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-23 12:14:51.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/kernel/terminal.if	2006-08-24 08:04:23.000000000 -0400
 @@ -329,6 +329,7 @@
@@ -648,7 +625,6 @@
 +	allow $1 devpts_t:filesystem getattr;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.9/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-08-16 08:46:29.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/amavis.te	2006-08-24 08:04:23.000000000 -0400
 @@ -62,10 +62,12 @@
@@ -680,7 +656,6 @@
 +optional_policy(`
 +	postfix_read_config(amavis_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.9/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-08-23 12:14:54.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/apache.te	2006-08-24 08:04:23.000000000 -0400
 @@ -268,10 +268,10 @@
@@ -695,7 +670,6 @@
  
  mta_send_mail(httpd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.9/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/avahi.te	2006-08-24 08:04:23.000000000 -0400
 @@ -63,6 +63,7 @@
@@ -714,7 +688,6 @@
  
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.3.9/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2006-08-16 08:46:29.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/bind.te	2006-08-24 08:04:23.000000000 -0400
 @@ -218,6 +218,7 @@
@@ -725,7 +698,6 @@
  
  allow ndc_t named_t:unix_stream_socket connectto;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-2.3.9/policy/modules/services/ccs.fc
 --- nsaserefpolicy/policy/modules/services/ccs.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/ccs.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,8 @@
@@ -737,7 +709,6 @@
 +/sbin/ccsd		--	gen_context(system_u:object_r:ccs_exec_t,s0)
 +/var/run/cluster(/.*)?		gen_context(system_u:object_r:ccs_var_run_t,s0)
 +/etc/cluster(/.*)?		gen_context(system_u:object_r:cluster_conf_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.if serefpolicy-2.3.9/policy/modules/services/ccs.if
 --- nsaserefpolicy/policy/modules/services/ccs.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/ccs.if	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,45 @@
@@ -786,7 +757,6 @@
 +	allow $1 ccs_var_run_t:sock_file write;
 +	allow $1 ccs_t:unix_stream_socket connectto;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.3.9/policy/modules/services/ccs.te
 --- nsaserefpolicy/policy/modules/services/ccs.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/ccs.te	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,84 @@
@@ -874,7 +844,6 @@
 +
 +allow ccs_t cluster_conf_t:dir r_dir_perms;
 +allow ccs_t cluster_conf_t:file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cpucontrol.te serefpolicy-2.3.9/policy/modules/services/cpucontrol.te
 --- nsaserefpolicy/policy/modules/services/cpucontrol.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/cpucontrol.te	2006-08-24 08:04:23.000000000 -0400
 @@ -25,7 +25,7 @@
@@ -886,7 +855,6 @@
  dontaudit cpucontrol_t self:capability sys_tty_config;
  allow cpucontrol_t self:process signal_perms;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.9/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-08-18 07:32:40.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/cron.if	2006-08-24 08:04:23.000000000 -0400
 @@ -181,6 +181,7 @@
@@ -939,7 +907,6 @@
  	allow $1 system_crond_t:fd use;
  	allow $1 system_crond_t:fifo_file rw_file_perms;
  	allow $1 system_crond_t:process sigchld;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.9/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-08-18 07:32:40.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/cron.te	2006-08-24 08:04:23.000000000 -0400
 @@ -146,6 +146,8 @@
@@ -970,7 +937,6 @@
  	ifdef(`distro_redhat', `
  		# Run the rpm program in the rpm_t domain. Allow creation of RPM log files
  		# via redirection of standard out.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.9/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-08-16 08:46:30.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/cups.te	2006-08-24 08:04:23.000000000 -0400
 @@ -74,13 +74,14 @@
@@ -1040,7 +1006,6 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.9/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/cyrus.te	2006-08-24 08:04:23.000000000 -0400
 @@ -69,6 +69,7 @@
@@ -1059,7 +1024,6 @@
 +optional_policy(`
 +	snmp_read_snmp_var_lib_files(cyrus_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.9/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/dbus.if	2006-08-24 08:04:23.000000000 -0400
 @@ -123,6 +123,7 @@
@@ -1082,7 +1046,6 @@
  ')
  
  #######################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.3.9/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2006-08-23 12:14:54.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/dbus.te	2006-08-24 08:04:23.000000000 -0400
 @@ -38,6 +38,7 @@
@@ -1101,7 +1064,6 @@
  
  seutil_read_config(system_dbusd_t)
  seutil_read_default_contexts(system_dbusd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.9/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2006-08-23 12:14:54.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/dovecot.te	2006-08-24 08:04:23.000000000 -0400
 @@ -168,7 +168,7 @@
@@ -1122,7 +1084,6 @@
  optional_policy(`
  	kerberos_use(dovecot_auth_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.te serefpolicy-2.3.9/policy/modules/services/inn.te
 --- nsaserefpolicy/policy/modules/services/inn.te	2006-07-14 17:04:40.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/inn.te	2006-08-24 08:04:23.000000000 -0400
 @@ -36,6 +36,7 @@
@@ -1133,7 +1094,6 @@
  
  allow innd_t innd_etc_t:file r_file_perms;
  allow innd_t innd_etc_t:dir r_dir_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.9/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-16 08:46:30.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/ldap.te	2006-08-24 08:04:23.000000000 -0400
 @@ -72,7 +72,7 @@
@@ -1145,7 +1105,6 @@
  
  kernel_read_system_state(slapd_t)
  kernel_read_kernel_sysctls(slapd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-2.3.9/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/mta.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -2,6 +2,8 @@
@@ -1157,7 +1116,6 @@
  ifdef(`distro_redhat',`
  /etc/postfix/aliases.*		gen_context(system_u:object_r:etc_aliases_t,s0)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.9/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-08-23 12:14:54.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/ntp.te	2006-08-24 08:04:23.000000000 -0400
 @@ -32,7 +32,7 @@
@@ -1180,7 +1138,6 @@
  	seutil_sigchld_newrole(ntpd_t)
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-2.3.9/policy/modules/services/oddjob.fc
 --- nsaserefpolicy/policy/modules/services/oddjob.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/oddjob.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,8 @@
@@ -1192,7 +1149,6 @@
 +/usr/sbin/oddjobd		--	gen_context(system_u:object_r:oddjob_exec_t,s0)
 +/var/run/oddjobd.pid			gen_context(system_u:object_r:oddjob_var_run_t,s0)
 +/usr/lib/oddjobd			gen_context(system_u:object_r:oddjob_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-2.3.9/policy/modules/services/oddjob.if
 --- nsaserefpolicy/policy/modules/services/oddjob.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/oddjob.if	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,76 @@
@@ -1272,7 +1228,6 @@
 +	allow $1 oddjob_t:dbus send_msg;
 +	allow oddjob_t $1:dbus send_msg;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.fc
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,6 @@
@@ -1282,7 +1237,6 @@
 +# MCS categories: <none>
 +
 +/usr/lib/oddjob/mkhomedir		--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.if
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.if	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,24 @@
@@ -1310,7 +1264,6 @@
 +	allow oddjob_mkhomedir_t $1:fifo_file rw_file_perms;
 +	allow oddjob_mkhomedir_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.te
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/oddjob_mkhomedir.te	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,26 @@
@@ -1340,7 +1293,6 @@
 +## internal communication is often done using fifo and unix sockets.
 +allow oddjob_mkhomedir_t self:fifo_file { read write };
 +allow oddjob_mkhomedir_t self:unix_stream_socket create_stream_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-2.3.9/policy/modules/services/oddjob.te
 --- nsaserefpolicy/policy/modules/services/oddjob.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/oddjob.te	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,70 @@
@@ -1414,7 +1366,6 @@
 +
 +term_dontaudit_use_generic_ptys(oddjob_t)
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.9/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/openvpn.te	2006-08-24 08:04:23.000000000 -0400
 @@ -33,7 +33,7 @@
@@ -1426,7 +1377,6 @@
  
  allow openvpn_t openvpn_etc_t:dir r_dir_perms;
  allow openvpn_t openvpn_etc_t:file r_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.9/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/pegasus.if	2006-08-24 08:04:23.000000000 -0400
 @@ -1 +1,32 @@
@@ -1462,7 +1412,6 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.9/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-08-23 12:14:54.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/pegasus.te	2006-08-24 08:04:23.000000000 -0400
 @@ -100,13 +100,12 @@
@@ -1481,7 +1430,6 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.9/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-16 08:46:30.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/postfix.te	2006-08-24 08:04:23.000000000 -0400
 @@ -250,6 +250,7 @@
@@ -1519,7 +1467,6 @@
  
  optional_policy(`
  	postgrey_stream_connect(postfix_smtpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-2.3.9/policy/modules/services/postgresql.te
 --- nsaserefpolicy/policy/modules/services/postgresql.te	2006-08-16 08:46:30.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/postgresql.te	2006-08-24 08:04:23.000000000 -0400
 @@ -134,6 +134,7 @@
@@ -1530,7 +1477,6 @@
  
  userdom_dontaudit_search_sysadm_home_dirs(postgresql_t)
  userdom_dontaudit_use_sysadm_ttys(postgresql_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.9/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-23 12:14:54.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/procmail.te	2006-08-24 08:04:23.000000000 -0400
 @@ -29,6 +29,7 @@
@@ -1541,7 +1487,6 @@
  corenet_tcp_sendrecv_all_if(procmail_t)
  corenet_udp_sendrecv_all_if(procmail_t)
  corenet_tcp_sendrecv_all_nodes(procmail_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.3.9/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2006-08-23 12:14:54.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/pyzor.te	2006-08-24 08:04:23.000000000 -0400
 @@ -126,3 +126,4 @@
@@ -1549,7 +1494,6 @@
  	logging_send_syslog_msg(pyzord_t)
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.3.9/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2006-08-16 08:46:30.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/radius.te	2006-08-24 08:04:23.000000000 -0400
 @@ -31,7 +31,7 @@
@@ -1561,7 +1505,6 @@
  allow radiusd_t self:fifo_file rw_file_perms;
  allow radiusd_t self:unix_stream_socket create_stream_socket_perms;
  allow radiusd_t self:tcp_socket create_stream_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.fc serefpolicy-2.3.9/policy/modules/services/ricci.fc
 --- nsaserefpolicy/policy/modules/services/ricci.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/ricci.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,20 @@
@@ -1585,7 +1528,6 @@
 +/usr/sbin/ricci-modservice	--	gen_context(system_u:object_r:ricci_modservice_exec_t,s0)
 +/usr/sbin/ricci-modstorage	--	gen_context(system_u:object_r:ricci_modstorage_exec_t,s0)
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.if serefpolicy-2.3.9/policy/modules/services/ricci.if
 --- nsaserefpolicy/policy/modules/services/ricci.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/ricci.if	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,184 @@
@@ -1773,7 +1715,6 @@
 +	allow $1 ricci_modcluster_var_run_t:sock_file write;
 +	allow $1 ricci_modclusterd_t:unix_stream_socket connectto;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.3.9/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/ricci.te	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,373 @@
@@ -2150,7 +2091,6 @@
 +')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-2.3.9/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2006-08-16 08:46:30.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/rpc.if	2006-08-24 08:04:23.000000000 -0400
 @@ -51,6 +51,8 @@
@@ -2162,7 +2102,6 @@
  
  	corenet_non_ipsec_sendrecv($1_t)
  	corenet_tcp_sendrecv_all_if($1_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.3.9/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2006-08-23 12:14:54.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/rpc.te	2006-08-24 08:04:23.000000000 -0400
 @@ -39,6 +39,7 @@
@@ -2192,7 +2131,6 @@
  fs_list_rpc(gssd_t) 
  fs_read_rpc_sockets(gssd_t) 
  fs_read_rpc_files(gssd_t) 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.9/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-08-23 12:14:54.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/samba.te	2006-08-24 08:04:23.000000000 -0400
 @@ -171,7 +171,7 @@
@@ -2231,7 +2169,6 @@
  allow winbind_t samba_log_t:file create_file_perms;
  allow winbind_t samba_log_t:lnk_file create_lnk_perms;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.9/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,9 @@
@@ -2244,17 +2181,15 @@
 +/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
 +
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.9/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.if	2006-08-24 08:04:23.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.9/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.9/policy/modules/services/setroubleshoot.te	2006-08-24 15:59:58.000000000 -0400
-@@ -0,0 +1,111 @@
+@@ -0,0 +1,112 @@
 +policy_module(setroubleshoot,1.0.0)
 +
 +########################################
@@ -2366,6 +2301,7 @@
 +
 +files_dontaudit_search_tmp(setroubleshootd_t)
 +files_dontaudit_search_src(setroubleshootd_t)
++files_getattr_all_dirs(setroubleshootd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.9/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-08-16 08:46:30.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/spamassassin.te	2006-08-24 08:04:23.000000000 -0400
@@ -2377,7 +2313,6 @@
 +optional_policy(`
 +	postfix_read_config(spamd_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.9/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-08-16 08:46:30.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/squid.te	2006-08-24 08:04:23.000000000 -0400
 @@ -28,9 +28,9 @@
@@ -2392,7 +2327,6 @@
  allow squid_t self:fifo_file rw_file_perms;
  allow squid_t self:sock_file r_file_perms;
  allow squid_t self:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.9/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-16 08:46:30.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/ssh.if	2006-08-24 08:04:23.000000000 -0400
 @@ -711,3 +711,27 @@
@@ -2423,7 +2357,6 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.9/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/stunnel.te	2006-08-24 08:04:23.000000000 -0400
 @@ -38,6 +38,7 @@
@@ -2442,7 +2375,6 @@
  
  fs_getattr_all_fs(stunnel_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-2.3.9/policy/modules/services/sysstat.te
 --- nsaserefpolicy/policy/modules/services/sysstat.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/sysstat.te	2006-08-24 08:04:23.000000000 -0400
 @@ -36,6 +36,8 @@
@@ -2462,7 +2394,6 @@
  
  init_use_fds(sysstat_t)
  init_use_script_ptys(sysstat_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.9/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-16 08:46:30.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/xserver.if	2006-08-24 08:04:23.000000000 -0400
 @@ -45,7 +45,6 @@
@@ -2569,7 +2500,6 @@
 +	allow $1 ice_tmp_t:dir ra_dir_perms;
 +	allow $1 ice_tmp_t:sock_file create_file_perms;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.9/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-16 08:46:30.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/services/xserver.te	2006-08-24 08:04:23.000000000 -0400
 @@ -81,15 +81,19 @@
@@ -2647,7 +2577,6 @@
  
  	unconfined_domain_noaudit(xdm_xserver_t)
  	unconfined_domtrans(xdm_xserver_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.9/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-23 12:14:55.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/authlogin.te	2006-08-24 08:04:23.000000000 -0400
 @@ -215,12 +215,19 @@
@@ -2679,7 +2608,6 @@
  
  userdom_dontaudit_use_unpriv_users_ttys(system_chkpwd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.9/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/fstools.te	2006-08-24 08:04:23.000000000 -0400
 @@ -111,6 +111,7 @@
@@ -2690,7 +2618,6 @@
  
  domain_use_interactive_fds(fsadm_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.9/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/hostname.te	2006-08-24 08:04:23.000000000 -0400
 @@ -8,7 +8,10 @@
@@ -2715,7 +2642,6 @@
 +	xen_dontaudit_use_fds(hostname_t)
 +')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.9/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-08-16 08:46:31.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/init.if	2006-08-24 08:04:23.000000000 -0400
 @@ -158,13 +158,6 @@
@@ -2732,7 +2658,6 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.9/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-08-23 12:14:55.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/init.te	2006-08-24 08:04:23.000000000 -0400
 @@ -361,6 +361,8 @@
@@ -2744,7 +2669,6 @@
  # slapd needs to read cert files from its initscript
  miscfiles_read_certs(initrc_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.9/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/libraries.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -109,6 +109,8 @@
@@ -2775,7 +2699,6 @@
  /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xine/plugins/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.9/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-08-02 10:34:08.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/locallogin.te	2006-08-24 08:04:23.000000000 -0400
 @@ -47,7 +47,7 @@
@@ -2796,7 +2719,6 @@
  
  dev_setattr_mouse_dev(local_login_t)
  dev_getattr_mouse_dev(local_login_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.9/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-02 10:34:08.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/logging.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -38,3 +38,6 @@
@@ -2806,7 +2728,6 @@
 +
 +/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
 +/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.9/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-08-02 10:34:08.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/logging.if	2006-08-24 08:04:23.000000000 -0400
 @@ -553,3 +553,24 @@
@@ -2834,7 +2755,6 @@
 +	allow $1 auditd_var_run_t:sock_file rw_file_perms;
 +	allow $1 auditd_t:unix_stream_socket connectto;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.9/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-08-20 10:55:49.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/logging.te	2006-08-24 08:04:23.000000000 -0400
 @@ -120,9 +120,10 @@
@@ -2849,7 +2769,6 @@
  
  kernel_read_kernel_sysctls(auditd_t)
  # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.3.9/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2006-07-14 17:04:44.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/lvm.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -14,7 +14,6 @@
@@ -2865,7 +2784,6 @@
  
  /var/cache/multipathd(/.*)?	gen_context(system_u:object_r:lvm_metadata_t,s0)
 +/var/run/multipathd.sock	-s	gen_context(system_u:object_r:lvm_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.9/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2006-08-02 10:34:08.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/lvm.te	2006-08-24 08:04:23.000000000 -0400
 @@ -125,7 +125,7 @@
@@ -2895,7 +2813,6 @@
  
  allow lvm_t lvm_etc_t:file r_file_perms;
  allow lvm_t lvm_etc_t:lnk_file r_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.3.9/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2006-07-14 17:04:43.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/miscfiles.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -9,6 +9,7 @@
@@ -2906,7 +2823,6 @@
  /etc/pki(/.*)?			gen_context(system_u:object_r:cert_t,s0)
  
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.3.9/policy/modules/system/miscfiles.if
 --- nsaserefpolicy/policy/modules/system/miscfiles.if	2006-07-14 17:04:44.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/miscfiles.if	2006-08-24 08:04:23.000000000 -0400
 @@ -116,6 +116,24 @@
@@ -2934,7 +2850,6 @@
  ##	Allow process to read legacy time localization info
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.9/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-23 12:14:55.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/modutils.te	2006-08-24 08:04:23.000000000 -0400
 @@ -183,6 +183,7 @@
@@ -2945,7 +2860,6 @@
  
  corecmd_search_bin(depmod_t)
  corecmd_search_sbin(depmod_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.9/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-08-16 08:46:31.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/mount.te	2006-08-24 08:04:23.000000000 -0400
 @@ -80,6 +80,7 @@
@@ -2982,7 +2896,6 @@
  ')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.9/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-23 12:14:55.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/selinuxutil.te	2006-08-24 08:04:23.000000000 -0400
 @@ -355,6 +355,8 @@
@@ -3026,7 +2939,6 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.3.9/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-07-14 17:04:44.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/udev.fc	2006-08-24 08:04:23.000000000 -0400
 @@ -1,5 +1,6 @@
@@ -3036,7 +2948,6 @@
  /dev/\.udevdb	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  /dev/udev\.tbl	--	gen_context(system_u:object_r:udev_tbl_t,s0)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.9/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-08-23 12:14:55.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/udev.te	2006-08-24 08:04:23.000000000 -0400
 @@ -131,6 +131,7 @@
@@ -3057,7 +2968,6 @@
 +optional_policy(`
  	xserver_read_xdm_pid(udev_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.9/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-08-02 10:34:08.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/unconfined.fc	2006-08-25 13:25:45.000000000 -0400
 @@ -10,4 +10,5 @@
@@ -3066,7 +2976,6 @@
  /usr/bin/xine		 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/lib/ia32el/ia32x_loader 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.9/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-02 10:34:09.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/unconfined.if	2006-08-24 08:04:23.000000000 -0400
 @@ -20,6 +20,7 @@
@@ -3085,7 +2994,6 @@
  	files_unconfined($1)
  	fs_unconfined($1)
  	selinux_unconfined($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.9/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-08-02 10:34:09.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/unconfined.te	2006-08-24 08:04:23.000000000 -0400
 @@ -195,4 +195,9 @@
@@ -3098,7 +3006,6 @@
 +		unconfined_dbus_chat(unconfined_execmem_t)
 +	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.9/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-08-16 08:46:31.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/userdomain.if	2006-08-24 08:04:23.000000000 -0400
 @@ -8,11 +8,10 @@
@@ -3573,7 +3480,6 @@
 +        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.9/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-08-16 08:46:31.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/userdomain.te	2006-08-24 08:04:23.000000000 -0400
 @@ -56,14 +56,6 @@
@@ -3675,7 +3581,6 @@
  		', `
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.9/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/xen.if	2006-08-24 08:04:23.000000000 -0400
 @@ -127,3 +127,41 @@
@@ -3720,7 +3625,6 @@
 +
 +	dontaudit $1 xend_t:fd use;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.9/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-08-02 10:34:08.000000000 -0400
 +++ serefpolicy-2.3.9/policy/modules/system/xen.te	2006-08-24 08:04:23.000000000 -0400
 @@ -69,7 +69,10 @@


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- selinux-policy.spec	25 Aug 2006 17:32:13 -0000	1.259
+++ selinux-policy.spec	25 Aug 2006 20:06:07 -0000	1.260
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.9
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Fri Aug 25 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-5
+- Allow setroubleshoot to getattr on all dirs to gather RPM data
+
 * Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-4
 - Set /usr/lib/ia32el/ia32x_loader to unconfined_execmem_exec_t for ia32 platform
 - Fix spec for /dev/adsp



From fedora-cvs-commits at redhat.com  Fri Aug 25 20:08:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 16:08:19 -0400
Subject: rpms/libsepol/devel libsepol.spec,1.141,1.142
Message-ID: <200608252008.k7PK8JQq011225@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11213

Modified Files:
	libsepol.spec 
Log Message:
* Fri Aug 25 2006 Dan Walsh <dwalsh at redhat.com> 1.12.25-3
- Fix location of include directory to devel package



Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- libsepol.spec	25 Aug 2006 14:20:16 -0000	1.141
+++ libsepol.spec	25 Aug 2006 20:08:16 -0000	1.142
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 1.12.25
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -76,15 +76,18 @@
 %{_libdir}/libsepol.so
 %{_includedir}/sepol/*.h
 %{_mandir}/man3/*.3.gz
+%dir %{_includedir}/sepol
+%dir %{_includedir}/sepol/policydb
+%{_includedir}/sepol/policydb/*.h
 
 %files
 %defattr(-,root,root)
 /%{_lib}/libsepol.so.1
-%dir %{_includedir}/sepol
-%dir %{_includedir}/sepol/policydb
-%{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Fri Aug 25 2006 Dan Walsh <dwalsh at redhat.com> 1.12.25-3
+- Fix location of include directory to devel package
+
 * Fri Aug 25 2006 Dan Walsh <dwalsh at redhat.com> 1.12.25-2
 - Remove invalid Requires 
 



From fedora-cvs-commits at redhat.com  Fri Aug 25 20:09:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 16:09:30 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2589,1.2590
Message-ID: <200608252009.k7PK9UNs011325@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11306

Modified Files:
	kernel-2.6.spec 
Log Message:
build fixes for ia64 kdump




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2589
retrieving revision 1.2590
diff -u -r1.2589 -r1.2590
--- kernel-2.6.spec	25 Aug 2006 19:21:17 -0000	1.2589
+++ kernel-2.6.spec	25 Aug 2006 20:09:27 -0000	1.2590
@@ -1797,6 +1797,9 @@
 
 %changelog
 * Fri Aug 25 2006 Don Zickus <dzickus at redhat.com>
+- build fix for ia64 kdump
+
+* Fri Aug 25 2006 Don Zickus <dzickus at redhat.com>
 - update utrace 
 - more gfs2-dlm fixes
 - fix xen-devel build directory issue



From fedora-cvs-commits at redhat.com  Fri Aug 25 20:09:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 16:09:40 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic,1.43,1.44
Message-ID: <200608252009.k7PK9ek1011332@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv11306/configs

Modified Files:
	config-ia64-generic 
Log Message:
build fixes for ia64 kdump




Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- config-ia64-generic	22 Aug 2006 23:15:00 -0000	1.43
+++ config-ia64-generic	25 Aug 2006 20:09:28 -0000	1.44
@@ -175,3 +175,6 @@
 # CONFIG_BCM43XX is not set
 
 CONFIG_HW_RANDOM_INTEL=m
+
+#temporary until ia64 kexec/kdump is fixed (breaks xen)
+CONFIG_CRASH_DUMP=y



From fedora-cvs-commits at redhat.com  Fri Aug 25 20:12:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 16:12:11 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2519.4.15,1.2519.4.16
Message-ID: <200608252012.k7PKCBac022542@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22413

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Log Message:
build headers needs an i386 package




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.15
retrieving revision 1.2519.4.16
diff -u -r1.2519.4.15 -r1.2519.4.16
--- kernel-2.6.spec	25 Aug 2006 17:43:05 -0000	1.2519.4.15
+++ kernel-2.6.spec	25 Aug 2006 20:12:05 -0000	1.2519.4.16
@@ -45,13 +45,13 @@
 # groups of related archs
 # Don't build 586 kernels for RHEL builds.
 %if 0%{?rhel}
-%define all_x86 i686
+%define all_x86 i386 i686
 # we differ here b/c of the reloc patches
 %ifarch i686 x86_64
 %define buildkdump 0
 %endif
 %else
-%define all_x86 i586 i686
+%define all_x86 i386 i586 i686
 %endif
 
 # Override generic defaults with per-arch defaults
@@ -1777,6 +1777,7 @@
 %changelog
 * Fri Aug 25 2006 Don Zickus <dzickus at redhat.com>
 - really turn on building kernel headers
+- build headers fix (need i386)
 
 * Thu Aug 24 2006 Don Zickus <dzickus at redhat.com>
 - added #203435/203657 - GFS2 DLM updates (Steven Whitehouse)



From fedora-cvs-commits at redhat.com  Fri Aug 25 20:35:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 16:35:57 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic,1.44,1.45
Message-ID: <200608252035.k7PKZvYb012113@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv11887/configs

Modified Files:
	config-ia64-generic 
Log Message:
didn't realize ia64 kdump options had dependent options..



Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- config-ia64-generic	25 Aug 2006 20:09:28 -0000	1.44
+++ config-ia64-generic	25 Aug 2006 20:35:54 -0000	1.45
@@ -178,3 +178,4 @@
 
 #temporary until ia64 kexec/kdump is fixed (breaks xen)
 CONFIG_CRASH_DUMP=y
+CONFIG_PROC_VMCORE=y



From fedora-cvs-commits at redhat.com  Fri Aug 25 20:42:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 16:42:36 -0400
Subject: rpms/compiz/devel .cvsignore, 1.6, 1.7 compiz.spec, 1.20,
	1.21 sources, 1.7, 1.8
Message-ID: <200608252042.k7PKga8R013843@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13815

Modified Files:
	.cvsignore compiz.spec sources 
Log Message:
* Fri Aug 25 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.18.20060817git.fc6
- Rebase to desktop-effects 0.6.19 and drop
  desktop-effects-0.6.1-delete-session.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Aug 2006 01:36:27 -0000	1.6
+++ .cvsignore	25 Aug 2006 20:42:33 -0000	1.7
@@ -1 +1,2 @@
 compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2
+desktop-effects-0.6.5.tar.bz2


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- compiz.spec	22 Aug 2006 22:06:04 -0000	1.20
+++ compiz.spec	25 Aug 2006 20:42:33 -0000	1.21
@@ -3,14 +3,14 @@
 %define		sha1 3173a142efe5e7af83ebb534a074d9d2a0c67a86
 %define		snapshot 20060817
 
-%define		dialogversion	0.6.1
+%define		dialogversion	0.6.19
 
 Name:           compiz
 Url:            http://www.freedesktop.org/Software/compiz
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.17.%{snapshot}git%{?dist}
+Release:        0.18.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,7 +32,7 @@
 BuildRequires:  gettext
 
 Source0:        %{name}-%{sha1}.tar.bz2
-Source1:	desktop-effects-%{dialogversion}.tar.gz
+Source1:	desktop-effects-%{dialogversion}.tar.bz2
 
 Patch100: gl-include-inferiors.patch
 Patch101: aiglx-defaults.patch
@@ -41,7 +41,6 @@
 Patch104: fbconfig-depth-fix.patch
 Patch105: fedora-logo.patch
 Patch106: glfinish.patch
-Patch107: desktop-effects-0.6.1-delete-session.patch
 
 # Patches already upstream
 Patch200: resize-move-keybindings.patch
@@ -80,10 +79,6 @@
 %patch105 -p1 -b .fedora-logo
 %patch106 -p1 -b .glfinish
 
-pushd ../desktop-effects-%{dialogversion} >& /dev/null
-%patch107 -p1 -b .delete-session
-popd
-
 %patch200 -p1 -b .resize-move-keybindings
 %patch201 -p1 -b .sync-override-redirect-windows
 
@@ -147,6 +142,10 @@
 %{_includedir}/compiz
 
 %changelog
+* Fri Aug 25 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.18.20060817git.fc6
+- Rebase to desktop-effects 0.6.19 and drop
+  desktop-effects-0.6.1-delete-session.patch
+
 * Tue Aug 22 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.17.20060817git.fc6
 - Add patch from upstream to also use sync protocol for override
   redirect windows (sync-override-redirect-windows.patch).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Aug 2006 01:52:07 -0000	1.7
+++ sources	25 Aug 2006 20:42:33 -0000	1.8
@@ -1,3 +1,2 @@
 ec5b51f98b914af4d51ad53bc832b7e1  compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2
-85c612c6ad47e31c70f0ba85063882e4  desktop-effects-0.6.1.tar.gz
-
+a52de63944c755c311dbcb42a2a802e7  desktop-effects-0.6.5.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 25 20:45:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 16:45:24 -0400
Subject: rpms/compiz/devel desktop-effects-0.6.1-delete-session.patch, 1.1,
	NONE
Message-ID: <200608252045.k7PKjO5Y014515@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14498

Removed Files:
	desktop-effects-0.6.1-delete-session.patch 
Log Message:
Remove desktop-effects-0.6.1-delete-session.patch


--- desktop-effects-0.6.1-delete-session.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Aug 25 20:46:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 16:46:07 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2519.4.16,1.2519.4.17
Message-ID: <200608252046.k7PKk7ZD014739@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14675

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Log Message:
yeah more kern headers hacks 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.16
retrieving revision 1.2519.4.17
diff -u -r1.2519.4.16 -r1.2519.4.17
--- kernel-2.6.spec	25 Aug 2006 20:12:05 -0000	1.2519.4.16
+++ kernel-2.6.spec	25 Aug 2006 20:46:04 -0000	1.2519.4.17
@@ -159,6 +159,18 @@
 %define xen_image vmlinux.gz
 %endif
 
+# We don't build a kernel on i386 -- we only do kernel-headers there.
+%define nobuildarches i386
+
+%ifarch %nobuildarches
+%define buildup 0
+%define buildsmp 0
+%define buildpae 0
+%define buildxen 0
+%define buildkdump 0
+%define _enable_debug_packages 0
+%endif
+
 #
 # Three sets of minimum package version requirements in the form of Conflicts:
 # to versions below the minimum



From fedora-cvs-commits at redhat.com  Fri Aug 25 20:52:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 16:52:06 -0400
Subject: rpms/compiz/devel .cvsignore,1.7,1.8 sources,1.8,1.9
Message-ID: <200608252052.k7PKq6gM031478@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31452

Modified Files:
	.cvsignore sources 
Log Message:
Update sources


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Aug 2006 20:42:33 -0000	1.7
+++ .cvsignore	25 Aug 2006 20:52:04 -0000	1.8
@@ -1,2 +1,2 @@
 compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2
-desktop-effects-0.6.5.tar.bz2
+desktop-effects-0.6.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Aug 2006 20:42:33 -0000	1.8
+++ sources	25 Aug 2006 20:52:04 -0000	1.9
@@ -1,2 +1,2 @@
 ec5b51f98b914af4d51ad53bc832b7e1  compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2
-a52de63944c755c311dbcb42a2a802e7  desktop-effects-0.6.5.tar.bz2
+4d4072729535adb9b93cfb5c48d755a2  desktop-effects-0.6.19.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 25 21:25:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 17:25:52 -0400
Subject: rpms/kernel/devel xen-ia64-gnttab_make_dirty.patch, NONE,
	1.1 xen-ia64-shadow.patch, NONE, 1.1 .cvsignore, 1.513,
	1.514 kernel-2.6.spec, 1.2590, 1.2591 linux-2.6-xen.patch,
	1.56, 1.57 sources, 1.476, 1.477
Message-ID: <200608252125.k7PLPpLv024251@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24131

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-xen.patch sources 
Added Files:
	xen-ia64-gnttab_make_dirty.patch xen-ia64-shadow.patch 
Log Message:
update xen HV to xen-unstable cset 11251 and fix ia64 arch

xen-ia64-gnttab_make_dirty.patch:
 grant_table.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-ia64-gnttab_make_dirty.patch ---
# HG changeset patch
# User awilliam at xenbuild.aw
# Date Wed Aug 23 11:16:11 2006 -0600
# Node ID 56ec2377b32e18ab3f0da752c08047491a54ecb7
# parent: 5264cc30d711ab7ba0e1c252853a4dba6faa7fa9
[IA64] replace gnttab_log_dirty with gnttab_mark_dirty

Signed-off-by: Alex Williamson <alex.williamson at hp.com>



--- a/xen/include/asm-ia64/grant_table.h	Wed Aug 23 11:15:29 2006 -0600
+++ b/xen/include/asm-ia64/grant_table.h	Wed Aug 23 11:16:11 2006 -0600
@@ -35,7 +35,7 @@ void guest_physmap_add_page(struct domai
                           gnttab_shared_maddr((d), (t), (i)));          \
         (IA64_GRANT_TABLE_PADDR >> PAGE_SHIFT) + (i);})
 
-#define gnttab_log_dirty(d, f) ((void)0)
+#define gnttab_mark_dirty(d, f) ((void)0)
 
 static inline void gnttab_clear_flag(unsigned long nr, uint16_t *addr)
 {


xen-ia64-shadow.patch:
 domain.c |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE xen-ia64-shadow.patch ---
# HG changeset patch
# User awilliam at xenbuild.aw
# Date Wed Aug 23 11:16:41 2006 -0600
# Node ID 7aaab04fd22e6ae3bc7c763c9a286bf3b435ac37
# parent: ac41222866e90ceb8b927c9fd0d42761ebc1d8b1
[IA64] DOM0_SHADOW_CONTROL_OP_GET/SET_ALLOCATION stubs

Signed-off-by: Alex Williamson <alex.williamson at hp.com>



--- a/xen/arch/ia64/xen/domain.c	Wed Aug 23 11:16:26 2006 -0600
+++ b/xen/arch/ia64/xen/domain.c	Wed Aug 23 11:16:41 2006 -0600
@@ -727,6 +727,15 @@ int shadow_mode_control(struct domain *d
 		}
 		break;
 	}
+	case DOM0_SHADOW_CONTROL_OP_GET_ALLOCATION:
+		sc->mb = 0;
+		break;
+	case DOM0_SHADOW_CONTROL_OP_SET_ALLOCATION:
+		if (sc->mb > 0) {
+			BUG();
+			rc = -ENOMEM;
+		}
+		break;
 	default:
 		rc = -EINVAL;
 		break;



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -r1.513 -r1.514
--- .cvsignore	20 Aug 2006 07:29:57 -0000	1.513
+++ .cvsignore	25 Aug 2006 21:25:44 -0000	1.514
@@ -4,5 +4,5 @@
 kernel-2.6.17
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc4.bz2
-xen-11057.tar.bz2
 patch-2.6.18-rc4-git1.bz2
+xen-11251.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2590
retrieving revision 1.2591
diff -u -r1.2590 -r1.2591
--- kernel-2.6.spec	25 Aug 2006 20:09:27 -0000	1.2590
+++ kernel-2.6.spec	25 Aug 2006 21:25:44 -0000	1.2591
@@ -33,7 +33,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_hv_cset 11057
+%define xen_hv_cset 11251
 %define make_target bzImage
 %define kernel_image x86
 %define xen_flags debug=y verbose=y crash_debug=y
@@ -495,6 +495,8 @@
 # Xen hypervisor patches (20000+)
 
 Patch20000: xen-missing-includes.patch
+Patch20001: xen-ia64-gnttab_make_dirty.patch
+Patch20002: xen-ia64-shadow.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -1111,6 +1113,8 @@
 cd xen
 # Any necessary hypervisor patches go here
 %patch20000 -p1
+%patch20001 -p2
+%patch20002 -p2
 %endif
 
 
@@ -1796,6 +1800,10 @@
 %endif
 
 %changelog
+* Fri Aug 25 2006 Juan Quintela <quintela at redhat.com>
+- update xen HV to xen-unstable cset 11251.
+- fix ia64 xen HV compilation.
+
 * Fri Aug 25 2006 Don Zickus <dzickus at redhat.com>
 - build fix for ia64 kdump
 

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    8 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   92 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1185 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  379 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1848 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1101 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  153 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  457 +++
 arch/i386/mm/init-xen.c                             |  851 ++++++
 arch/i386/mm/ioremap-xen.c                          |  478 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  699 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1206 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/dig/setup.c                               |   34 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  259 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  123 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  413 ++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  867 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2169 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   54 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1210 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  164 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1011 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1656 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1200 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  625 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  567 ++++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  464 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  842 ++++++
 drivers/xen/blkfront/block.h                        |  154 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1444 ++++++++++
 drivers/xen/blktap/common.h                         |  119 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  353 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  180 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  868 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  483 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/reboot.c                           |  384 ++
 drivers/xen/core/skbuff.c                           |  139 +
 drivers/xen/core/smpboot.c                          |  429 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  141 +
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1498 ++++++++++
 drivers/xen/netback/xenbus.c                        |  461 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 2067 ++++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  458 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  295 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  289 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   84 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  287 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  203 +
 drivers/xen/xenbus/xenbus_comms.h                   |   45 
 drivers/xen/xenbus/xenbus_dev.c                     |  356 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1149 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  853 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  379 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  234 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/maddr.h               |  160 +
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  220 +
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   87 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  185 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  508 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   41 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   39 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  192 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  114 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  379 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   38 
 include/asm-x86_64/mach-xen/asm/maddr.h             |  139 +
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  208 +
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  559 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   65 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hvm.h                                   |   24 
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  448 +++
 include/xen/interface/arch-powerpc.h                |  115 
 include/xen/interface/arch-x86_32.h                 |  256 +
 include/xen/interface/arch-x86_64.h                 |  322 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  619 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/e820.h                    |   32 
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   26 
 include/xen/interface/xen.h                         |  558 ++++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  300 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  118 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 414 files changed, 87662 insertions(+), 217 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.56 -r 1.57 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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- linux-2.6-xen.patch	19 Aug 2006 22:49:07 -0000	1.56
+++ linux-2.6-xen.patch	25 Aug 2006 21:25:44 -0000	1.57
@@ -1,7 +1,7 @@
-- linux-2.6 changeset: 33525:dcc321d1340a
-- linux-2.6-xen-fedora changeset: 35247:400b0cf28ee4
-- linux-2.6-xen changeset: 22813:80c2ccf5c330
-- xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e
+- linux-2.6 changeset: 33681:2695586981b9
+- linux-2.6-xen-fedora changeset: 35458:b1b8e00e7a17
+- linux-2.6-xen changeset: 22861:0b726fcb6780
+- xen-unstable changeset: 11204:5fc1fe79083517824d89309cc618f21302724e29
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
 --- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-07-26 16:46:14.000000000 +0200
@@ -1538,8 +1538,20 @@
 +endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
 --- linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-19 21:10:30.000000000 +0200
-@@ -151,7 +151,11 @@ void apply_alternatives(struct alt_instr
++++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-25 21:11:59.000000000 +0200
+@@ -4,7 +4,11 @@
+ #include <asm/alternative.h>
+ #include <asm/sections.h>
+ 
++#ifdef CONFIG_X86_64_XEN
++static int no_replacement    = 1;
++#else
+ static int no_replacement    = 0;
++#endif
+ static int smp_alt_once      = 0;
+ static int debug_alternative = 0;
+ 
+@@ -151,7 +155,11 @@ void apply_alternatives(struct alt_instr
  #ifdef CONFIG_X86_64
  		/* vsyscall code is not mapped yet. resolve it manually. */
  		if (instr >= (u8 *)VSYSCALL_START && instr < (u8*)VSYSCALL_END) {
@@ -2492,7 +2504,7 @@
 +endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c
 --- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-07-26 16:46:14.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-08-25 02:47:30.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2675,7 +2687,7 @@
 +{
 +	struct cpuinfo_x86 *c = &boot_cpu_data;
 +
-+	if (!(xen_start_info->flags & SIF_PRIVILEGED))
++	if (!is_initial_xendomain())
 +		return -ENODEV;
 +
 +	if ((!cpu_has(c, X86_FEATURE_MTRR)) &&
@@ -4291,7 +4303,7 @@
 +
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/io_apic-xen.c linux-2.6-xen-fedora/arch/i386/kernel/io_apic-xen.c
 --- linux-2.6/arch/i386/kernel/io_apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/io_apic-xen.c	2006-07-26 16:46:14.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/io_apic-xen.c	2006-08-25 02:47:30.000000000 +0200
 @@ -0,0 +1,2772 @@
 +/*
 + *	Intel IO-APIC support for multi-Pentium hosts.
@@ -6799,7 +6811,7 @@
 +{
 +	if(sis_apic_bug == -1)
 +		sis_apic_bug = 0;
-+	if (xen_start_info->flags & SIF_INITDOMAIN) {
++	if (is_initial_xendomain()) {
 +		dom0_op_t op = { .cmd = DOM0_PLATFORM_QUIRK };
 +		op.u.platform_quirk.quirk_id = sis_apic_bug ?
 +			QUIRK_IOAPIC_BAD_REGSEL : QUIRK_IOAPIC_GOOD_REGSEL;
@@ -10433,8 +10445,8 @@
 +#endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/setup-xen.c linux-2.6-xen-fedora/arch/i386/kernel/setup-xen.c
 --- linux-2.6/arch/i386/kernel/setup-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/setup-xen.c	2006-08-13 01:28:21.000000000 +0200
-@@ -0,0 +1,1831 @@
++++ linux-2.6-xen-fedora/arch/i386/kernel/setup-xen.c	2006-08-25 21:11:59.000000000 +0200
+@@ -0,0 +1,1848 @@
 +/*
 + *  linux/arch/i386/kernel/setup.c
 + *
@@ -10623,7 +10635,6 @@
 +	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM
 +};
 +
-+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
 +static struct resource system_rom_resource = {
 +	.name	= "System ROM",
 +	.start	= 0xf0000,
@@ -10679,7 +10690,6 @@
 +	.end	= 0xc7fff,
 +	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
 +};
-+#endif
 +
 +static struct resource video_ram_resource = {
 +	.name	= "Video RAM area",
@@ -10738,7 +10748,6 @@
 +#define STANDARD_IO_RESOURCES \
 +	(sizeof standard_io_resources / sizeof standard_io_resources[0])
 +
-+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
 +#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)
 +
 +static int __init romchecksum(unsigned char *rom, unsigned long length)
@@ -10756,9 +10765,11 @@
 +	unsigned char *rom;
 +	int	      i;
 +
++#ifdef CONFIG_XEN
 +	/* Nothing to do if not running in dom0. */
-+	if (!(xen_start_info->flags & SIF_INITDOMAIN))
++	if (!is_initial_xendomain())
 +		return;
++#endif
 +
 +	/* video rom */
 +	upper = adapter_rom_resources[0].start;
@@ -10816,7 +10827,6 @@
 +		start = adapter_rom_resources[i++].end & ~2047UL;
 +	}
 +}
-+#endif
 +
 +/*
 + * Point at the empty zero page to start with. We map the real shared_info
@@ -11834,9 +11844,7 @@
 +	e820_setup_gap(map, memmap.nr_entries);
 +#endif
 +
-+#if defined(CONFIG_XEN_PRIVILEGED_GUEST) || !defined(CONFIG_XEN)
 +	probe_roms();
-+#endif
 +
 +	for (i = 0; i < nr_map; i++) {
 +		struct resource *res;
@@ -11885,7 +11893,7 @@
 +	int i;
 +
 +	/* Nothing to do if not running in dom0. */
-+	if (!(xen_start_info->flags & SIF_INITDOMAIN))
++	if (!is_initial_xendomain())
 +		return 0;
 +
 +	printk("Setting up standard PCI resources\n");
@@ -11989,7 +11997,7 @@
 +
 +	/* Force a quick death if the kernel panics (not domain 0). */
 +	extern int panic_timeout;
-+	if (!panic_timeout && !(xen_start_info->flags & SIF_INITDOMAIN))
++	if (!panic_timeout && !is_initial_xendomain())
 +		panic_timeout = 1;
 +
 +	/* Register a call for panic conditions. */
@@ -12033,7 +12041,7 @@
 +	}
 +	bootloader_type = LOADER_TYPE;
 +
-+	if (xen_start_info->flags & SIF_INITDOMAIN) {
++	if (is_initial_xendomain()) {
 +		/* This is drawn from a dump from vgacon:startup in
 +		 * standard Linux. */
 +		screen_info.orig_video_mode = 3; 
@@ -12042,6 +12050,35 @@
 +		screen_info.orig_video_cols = 80;
 +		screen_info.orig_video_ega_bx = 3;
 +		screen_info.orig_video_points = 16;
++		if (xen_start_info->console.dom0.info_size >=
++		    sizeof(struct dom0_vga_console_info)) {
++			const struct dom0_vga_console_info *info =
++				(struct dom0_vga_console_info *)(
++					(char *)xen_start_info +
++					xen_start_info->console.dom0.info_off);
++			screen_info.orig_video_mode = info->txt_mode;
++			screen_info.orig_video_isVGA = info->video_type;
++			screen_info.orig_video_lines = info->video_height;
++			screen_info.orig_video_cols = info->video_width;
++			screen_info.orig_video_points = info->txt_points;
++			screen_info.lfb_width = info->video_width;
++			screen_info.lfb_height = info->video_height;
++			screen_info.lfb_depth = info->lfb_depth;
++			screen_info.lfb_base = info->lfb_base;
++			screen_info.lfb_size = info->lfb_size;
++			screen_info.lfb_linelength = info->lfb_linelen;
++			screen_info.red_size = info->red_size;
++			screen_info.red_pos = info->red_pos;
++			screen_info.green_size = info->green_size;
++			screen_info.green_pos = info->green_pos;
++			screen_info.blue_size = info->blue_size;
++			screen_info.blue_pos = info->blue_pos;
++			screen_info.rsvd_size = info->rsvd_size;
[...5902 lines suppressed...]
++#if __XEN_INTERFACE_VERSION__ < 0x00030203
++#define console_mfn    console.domU.mfn
++#define console_evtchn console.domU.evtchn
++#endif
++
 +/* These flags are passed in the 'flags' field of start_info_t. */
 +#define SIF_PRIVILEGED    (1<<0)  /* Is the domain privileged? */
 +#define SIF_INITDOMAIN    (1<<1)  /* Is this the initial control domain? */
 +
++typedef struct dom0_vga_console_info {
++    uint8_t video_type;
++    uint8_t txt_points;
++    uint16_t txt_mode;
++    uint16_t txt_x;
++    uint16_t txt_y;
++    uint16_t video_width;
++    uint16_t video_height;
++    uint16_t lfb_linelen;
++    uint16_t lfb_depth;
++    unsigned long lfb_base;
++    unsigned long lfb_size;
++    uint8_t red_pos;
++    uint8_t red_size;
++    uint8_t green_pos;
++    uint8_t green_size;
++    uint8_t blue_pos;
++    uint8_t blue_size;
++    uint8_t rsvd_pos;
++    uint8_t rsvd_size;
++} dom0_vga_console_info_t;
++
 +typedef uint64_t cpumap_t;
 +
 +typedef uint8_t xen_domain_handle_t[16];
@@ -90639,8 +90450,6 @@
 +
 +#endif /* !__ASSEMBLY__ */
 +
-+#include "xen-compat.h"
-+
 +#endif /* __XEN_PUBLIC_XEN_H__ */
 +
 +/*
@@ -91019,8 +90828,8 @@
 +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/xenbus.h linux-2.6-xen-fedora/include/xen/xenbus.h
 --- linux-2.6/include/xen/xenbus.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/xenbus.h	2006-08-19 18:08:16.000000000 +0200
-@@ -0,0 +1,299 @@
++++ linux-2.6-xen-fedora/include/xen/xenbus.h	2006-08-25 02:47:31.000000000 +0200
+@@ -0,0 +1,300 @@
 +/******************************************************************************
 + * xenbus.h
 + *
@@ -91297,7 +91106,7 @@
 +
 +/**
 + * Return the state of the driver rooted at the given store path, or
-+ * XenbusStateClosed if no state can be read.
++ * XenbusStateUnknown if no state can be read.
 + */
 +enum xenbus_state xenbus_read_driver_state(const char *path);
 +
@@ -91318,6 +91127,7 @@
 +void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt,
 +		      ...);
 +
++int __init xenbus_dev_init(void);
 +
 +#endif /* _XEN_XENBUS_H */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/xencons.h linux-2.6-xen-fedora/include/xen/xencons.h
@@ -91444,26 +91254,17 @@
  #
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
 --- linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/memory.c	2006-08-13 01:28:24.000000000 +0200
-@@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
- 	 * and that the resulting page looks ok.
- 	 */
- 	if (unlikely(!pfn_valid(pfn))) {
--		print_bad_pte(vma, pte, addr);
-+		if (!(vma->vm_flags & VM_RESERVED))
-+			print_bad_pte(vma, pte, addr);
- 		return NULL;
- 	}
- 
-@@ -891,6 +892,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL(zap_page_range);
++++ linux-2.6-xen-fedora/mm/memory.c	2006-08-25 21:11:59.000000000 +0200
+@@ -390,7 +390,7 @@ struct page *vm_normal_page(struct vm_ar
  
- /*
-  * Do a quick page-table lookup for a single page.
-@@ -1030,6 +1032,26 @@ int get_user_pages(struct task_struct *t
+ 	if (unlikely(vma->vm_flags & VM_PFNMAP)) {
+ 		unsigned long off = (addr - vma->vm_start) >> PAGE_SHIFT;
+-		if (pfn == vma->vm_pgoff + off)
++		if ((pfn == vma->vm_pgoff + off) || !pfn_valid(pfn))
+ 			return NULL;
+ 		if (!is_cow_mapping(vma->vm_flags))
+ 			return NULL;
+@@ -1030,6 +1030,26 @@ int get_user_pages(struct task_struct *t
  			continue;
  		}
  
@@ -91490,7 +91291,7 @@
  		if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP))
  				|| !(vm_flags & vma->vm_flags))
  			return i ? : -EFAULT;
-@@ -1369,6 +1391,102 @@ int remap_pfn_range(struct vm_area_struc
+@@ -1369,6 +1389,102 @@ int remap_pfn_range(struct vm_area_struc
  }
  EXPORT_SYMBOL(remap_pfn_range);
  
@@ -91631,11 +91432,11 @@
  	if (PageAnon(page))
  		page->mapping = NULL;
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
---- linux-2.6/net/core/dev.c	2006-08-04 13:45:06.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/dev.c	2006-08-13 01:28:24.000000000 +0200
-@@ -117,6 +117,12 @@
- #include <linux/dmaengine.h>
+--- linux-2.6/net/core/dev.c	2006-08-23 22:51:07.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/dev.c	2006-08-25 02:47:31.000000000 +0200
+@@ -118,6 +118,12 @@
  #include <linux/err.h>
+ #include <linux/ctype.h>
  
 +#ifdef CONFIG_XEN
 +#include <net/ip.h>
@@ -91646,7 +91447,7 @@
  /*
   *	The list of packet types we will receive (as opposed to discard)
   *	and the routines to invoke.
-@@ -1382,6 +1388,43 @@ out_kfree_skb:
+@@ -1391,6 +1397,43 @@ out_kfree_skb:
  	}						\
  }
  
@@ -91690,7 +91491,7 @@
  /**
   *	dev_queue_xmit - transmit a buffer
   *	@skb: buffer to transmit
-@@ -1414,6 +1457,12 @@ int dev_queue_xmit(struct sk_buff *skb)
+@@ -1423,6 +1466,12 @@ int dev_queue_xmit(struct sk_buff *skb)
  	struct Qdisc *q;
  	int rc = -ENOMEM;
  
@@ -91703,7 +91504,7 @@
  	/* GSO will handle the following emulations directly. */
  	if (netif_needs_gso(dev, skb))
  		goto gso;
-@@ -1803,6 +1852,19 @@ int netif_receive_skb(struct sk_buff *sk
+@@ -1796,6 +1845,19 @@ int netif_receive_skb(struct sk_buff *sk
  	}
  #endif
  
@@ -91723,7 +91524,7 @@
  	list_for_each_entry_rcu(ptype, &ptype_all, list) {
  		if (!ptype->dev || ptype->dev == skb->dev) {
  			if (pt_prev) 
-@@ -3589,6 +3651,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
+@@ -3582,6 +3644,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
  EXPORT_SYMBOL(net_enable_timestamp);
  EXPORT_SYMBOL(net_disable_timestamp);
  EXPORT_SYMBOL(dev_get_flags);
@@ -91732,8 +91533,8 @@
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
---- linux-2.6/net/core/skbuff.c	2006-08-04 13:45:06.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-13 01:28:24.000000000 +0200
+--- linux-2.6/net/core/skbuff.c	2006-08-23 22:51:07.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-25 02:47:31.000000000 +0200
 @@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -91809,7 +91610,7 @@
  	skb = NULL;
  	goto out;
  }
-@@ -462,6 +480,10 @@ struct sk_buff *skb_clone(struct sk_buff
+@@ -464,6 +482,10 @@ struct sk_buff *skb_clone(struct sk_buff
  	C(local_df);
  	n->cloned = 1;
  	n->nohdr = 0;
@@ -91878,8 +91679,8 @@
  		err = skb_checksum_help(skb, 0);
  		if (err)
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
---- linux-2.6/net/ipv6/addrconf.c	2006-08-04 13:45:06.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-08-13 01:28:24.000000000 +0200
+--- linux-2.6/net/ipv6/addrconf.c	2006-08-23 22:51:07.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-08-25 02:47:32.000000000 +0200
 @@ -2514,6 +2514,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -r1.476 -r1.477
--- sources	20 Aug 2006 07:29:57 -0000	1.476
+++ sources	25 Aug 2006 21:25:48 -0000	1.477
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 780289cba0d4529ff80956e145ce567a  patch-2.6.18-rc4.bz2
-64a8783435b7628c39829984ba2e551f  xen-11057.tar.bz2
 4091e21a532aab769d5e92601697797e  patch-2.6.18-rc4-git1.bz2
+18b970072562000b8838eab9eefaa2e9  xen-11251.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 25 21:27:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 17:27:25 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2591,1.2592
Message-ID: <200608252127.k7PLRP5Q024799@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24768

Modified Files:
	kernel-2.6.spec 
Log Message:
- linux xen kernel update:
  * linux-2.6 changeset: 33681:2695586981b9
  * linux-2.6-xen-fedora changeset: 35458:b1b8e00e7a17
  * linux-2.6-xen changeset: 22861:0b726fcb6780
  * xen-unstable changeset: 11204:5fc1fe79083517824d89309cc618f21302724e29


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2591
retrieving revision 1.2592
diff -u -r1.2591 -r1.2592
--- kernel-2.6.spec	25 Aug 2006 21:25:44 -0000	1.2591
+++ kernel-2.6.spec	25 Aug 2006 21:27:23 -0000	1.2592
@@ -1803,6 +1803,11 @@
 * Fri Aug 25 2006 Juan Quintela <quintela at redhat.com>
 - update xen HV to xen-unstable cset 11251.
 - fix ia64 xen HV compilation.
+- linux xen kernel update:
+  * linux-2.6 changeset: 33681:2695586981b9
+  * linux-2.6-xen-fedora changeset: 35458:b1b8e00e7a17
+  * linux-2.6-xen changeset: 22861:0b726fcb6780
+  * xen-unstable changeset: 11204:5fc1fe79083517824d89309cc618f21302724e29
 
 * Fri Aug 25 2006 Don Zickus <dzickus at redhat.com>
 - build fix for ia64 kdump



From fedora-cvs-commits at redhat.com  Fri Aug 25 21:32:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 17:32:21 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2592,1.2593
Message-ID: <200608252132.k7PLWLKj026276@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26241

Modified Files:
	kernel-2.6.spec 
Log Message:
always copy xen Config.mk to build dir


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2592
retrieving revision 1.2593
diff -u -r1.2592 -r1.2593
--- kernel-2.6.spec	25 Aug 2006 21:27:23 -0000	1.2592
+++ kernel-2.6.spec	25 Aug 2006 21:32:17 -0000	1.2593
@@ -1105,6 +1105,7 @@
 
 # Unpack the Xen tarball.
 %if %{includexen}
+cp %{SOURCE2} .
 if [ -d xen ]; then
   mv xen xen-old
   rm -rf xen-old &
@@ -1336,7 +1337,6 @@
 
 %if %{includexen}
 %if %{buildxen}
-  cp %{SOURCE2} .
   cd xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot
   make %{?_smp_mflags} %{xen_flags}



From fedora-cvs-commits at redhat.com  Fri Aug 25 21:54:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 17:54:48 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-pci-paranoia.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.159, 1.160
Message-ID: <200608252154.k7PLsmrF015145@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15117

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-pci-paranoia.patch 
Log Message:
* Fri Aug 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-30.fc6
- xorg-x11-server-1.1.1-pci-paranoia.patch: In xf86MatchPciInstances, fail
  gracefully if xf86PciVideoInfo is NULL (like, on Xen).


xorg-x11-server-1.1.1-pci-paranoia.patch:
 xf86Helper.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE xorg-x11-server-1.1.1-pci-paranoia.patch ---
--- xorg-server-1.1.1/hw/xfree86/common/xf86Helper.c.jx	2006-08-25 14:40:56.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/common/xf86Helper.c	2006-08-25 14:43:47.000000000 -0400
@@ -1650,6 +1650,8 @@ xf86MatchPciInstances(const char *driver
 
     *foundEntities = NULL;
 
+    if (!xf86PciVideoInfo)
+	return 0;
 
     /* Each PCI device will contribute at least one entry.  Each device
      * section can contribute at most one entry.  The sum of the two is


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- xorg-x11-server.spec	25 Aug 2006 04:54:22 -0000	1.159
+++ xorg-x11-server.spec	25 Aug 2006 21:54:45 -0000	1.160
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   29%{?dist}
+Release:   30%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -70,6 +70,7 @@
 Patch3013:  xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch
 Patch3014:  xorg-x11-server-1.1.1-infer-virtual.patch
 Patch3015:  xorg-x11-server-1.1.1-mode-sort-kung-fu.patch
+Patch3016:  xorg-x11-server-1.1.1-pci-paranoia.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -376,6 +377,7 @@
 %patch3013 -p1 -b .mouse-device
 %patch3014 -p1 -b .infer-virtual
 %patch3015 -p1 -b .sort-modes
+%patch3016 -p1 -b .pci-paranoia
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -705,6 +707,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Aug 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-30.fc6
+- xorg-x11-server-1.1.1-pci-paranoia.patch: In xf86MatchPciInstances, fail
+  gracefully if xf86PciVideoInfo is NULL (like, on Xen).
+
 * Fri Aug 25 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-29.fc6
 - Add xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch to fix VT
   switching (and suspend/resume) when using AIGLX. (#199692, fdo #7916).



From fedora-cvs-commits at redhat.com  Fri Aug 25 22:07:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 18:07:50 -0400
Subject: rpms/cman/devel .cvsignore, 1.17, 1.18 cman.spec, 1.69, 1.70 sources,
	1.26, 1.27
Message-ID: <200608252207.k7PM7osT018373@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18349

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
Updated sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	22 Aug 2006 15:12:27 -0000	1.17
+++ .cvsignore	25 Aug 2006 22:07:47 -0000	1.18
@@ -1 +1 @@
-cman-2.0.11.tar.gz
+cman-2.0.12.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- cman.spec	22 Aug 2006 15:12:27 -0000	1.69
+++ cman.spec	25 Aug 2006 22:07:47 -0000	1.70
@@ -10,7 +10,7 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.11
+%define cman_minor 0.12
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
@@ -114,7 +114,10 @@
 %{_libdir}/*.a
 
 %changelog
-* Thu Aug 22 2006 Chris Feist <cfeist at redhat.com> - 2.0.11-1
+* Fri Aug 25 2006 Chris Feist <cfeist at redhat.com> - 2.0.12-1
+- Rebuild w/ new upstream sources
+
+* Tue Aug 22 2006 Chris Feist <cfeist at redhat.com> - 2.0.11-1
 - Rebuild w/ new upstream sources
 
 * Wed Aug 16 2006 Chris Feist <cfeist at redhat.com> - 2.0.10-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	22 Aug 2006 15:12:27 -0000	1.26
+++ sources	25 Aug 2006 22:07:47 -0000	1.27
@@ -1 +1 @@
-123beab7cffaf7fd771e278fcdb04cc6  cman-2.0.11.tar.gz
+0648216eaf25c64810104e7e8296faa3  cman-2.0.12.tar.gz



From fedora-cvs-commits at redhat.com  Fri Aug 25 22:12:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 18:12:05 -0400
Subject: rpms/compiz/devel .cvsignore, 1.8, 1.9 compiz.spec, 1.21,
	1.22 sources, 1.9, 1.10
Message-ID: <200608252212.k7PMC5Yg019398@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19325

Modified Files:
	.cvsignore compiz.spec sources 
Log Message:
Rebase to desktop effects 0.6.41



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Aug 2006 20:52:04 -0000	1.8
+++ .cvsignore	25 Aug 2006 22:12:02 -0000	1.9
@@ -1,2 +1,3 @@
 compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2
 desktop-effects-0.6.19.tar.bz2
+desktop-effects-0.6.41.tar.bz2


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- compiz.spec	25 Aug 2006 20:42:33 -0000	1.21
+++ compiz.spec	25 Aug 2006 22:12:02 -0000	1.22
@@ -3,14 +3,14 @@
 %define		sha1 3173a142efe5e7af83ebb534a074d9d2a0c67a86
 %define		snapshot 20060817
 
-%define		dialogversion	0.6.19
+%define		dialogversion	0.6.41
 
 Name:           compiz
 Url:            http://www.freedesktop.org/Software/compiz
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.18.%{snapshot}git%{?dist}
+Release:        0.19.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -142,6 +142,9 @@
 %{_includedir}/compiz
 
 %changelog
+* Fri Aug 25 2006 Soren Sandmann <sandmann at redhat.com> - 0.0.13-0.19-20060817git.fc6
+- Rebase to desktop-effects 0.6.41
+
 * Fri Aug 25 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.18.20060817git.fc6
 - Rebase to desktop-effects 0.6.19 and drop
   desktop-effects-0.6.1-delete-session.patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Aug 2006 20:52:04 -0000	1.9
+++ sources	25 Aug 2006 22:12:02 -0000	1.10
@@ -1,2 +1,3 @@
 ec5b51f98b914af4d51ad53bc832b7e1  compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2
 4d4072729535adb9b93cfb5c48d755a2  desktop-effects-0.6.19.tar.bz2
+237a3059f2157fc06ec14a5af57c9651  desktop-effects-0.6.41.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Aug 25 23:05:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 19:05:11 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.58,1.59
Message-ID: <200608252305.k7PN5B2P002895@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2880

Modified Files:
	mx4j.spec 
Log Message:

- Make tests conditional
- Add missing requirements




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mx4j.spec	24 Aug 2006 22:05:50 -0000	1.58
+++ mx4j.spec	25 Aug 2006 23:05:07 -0000	1.59
@@ -28,15 +28,19 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _gcj_support 1
+%define _without_tests 1
+
+%define with_tests %{!?_without_tests:1}%{?_without_tests:0}
+%define without_tests %{?_without_tests:1}%{!?_without_tests:0}
 
+%define _gcj_support 1
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define section     free
 
 Name:           mx4j
 Version:        3.0.1
-Release:        6jpp.1
+Release:        6jpp.2
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -56,7 +60,6 @@
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-trax
 BuildRequires:	ant-apache-resolver
-#BuildRequires:  ant-junit
 BuildRequires:	jaf
 BuildRequires:	javamail >= 0:1.2-5jpp
 BuildRequires:	log4j >= 0:1.2.7
@@ -65,7 +68,6 @@
 BuildRequires:  bcel >= 0:5.0
 BuildRequires:	jsse >= 0:1.0.2-6jpp
 BuildRequires:	jce >= 0:1.2.2
-#BuildRequires:	junit >= 0:3.7.1
 BuildRequires:  coreutils
 BuildRequires:  xjavadoc
 BuildRequires:  xdoclet
@@ -77,11 +79,23 @@
 BuildRequires:  xml-commons-resolver
 BuildRequires:  xml-commons
 BuildRequires:  xerces-j2
-#BuildRequires:  xmlunit
+%if %{with_tests}
+BuildRequires:  ant-junit
+BuildRequires:	burlap >= 3.0.8
+BuildRequires:	caucho-services
+BuildRequires:	hessian >= 3.0.8
+BuildRequires:	junit >= 0:3.7.1
+BuildRequires:  xmlunit
+%endif
 %if ! %{gcj_support}
 Buildarch:      noarch
 %endif
-Requires:       /usr/sbin/update-alternatives
+Requires(pre):	/bin/rm
+Requires(post):       /usr/sbin/update-alternatives
+Requires(postun):       /usr/sbin/update-alternatives
+Requires:	burlap >= 3.0.8
+Requires:	caucho-services
+Requires:	hessian >= 3.0.8
 Requires:	jaf
 Requires:	javamail >= 0:1.2-5jpp
 Requires:	log4j >= 0:1.2.7
@@ -111,6 +125,8 @@
 Group:          Development/Documentation
 Summary:        Javadoc for %{name}
 Obsoletes:      openjmx-javadoc
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -143,8 +159,13 @@
 cp %{_sourcedir}/CatalogManager.properties %{_builddir}/%{name}-%{version}/build/
 
 pushd lib
-#   ln -sf $(build-classpath junit) .
-#   ln -sf $(build-classpath xmlunit) .
+%if %{with_tests}
+   ln -sf $(build-classpath junit) .
+   ln -sf $(build-classpath xmlunit) .
+   ln -sf $(build-classpath burlap) .
+   ln -sf $(build-classpath caucho-services) .
+   ln -sf $(build-classpath hessian) .
+%endif
    ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
    ln -sf $(build-classpath xerces-j2) xercesImpl.jar
    ln -sf $(build-classpath xalan-j2) xalan.jar
@@ -176,8 +197,11 @@
 export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-trax jaxp_transform_impl ant/ant-apache-resolver xml-commons-resolver"
 
 cd build
-# ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
+%if %{with_tests}
+ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
+%else
 ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools javadocs docs
+%endif
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -228,6 +252,15 @@
 	/usr/sbin/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar
 fi
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
@@ -256,6 +289,10 @@
 %doc dist/docs/*
 
 %changelog
+* Fri Aug 25 2006 Deepak Bhole <dbhole at redhat.com> 0:3.0.1-6jpp.2
+- Make tests conditional
+- Add missing requirements
+
 * Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-6jpp.1
 - Merge with upstream
 - Fixed build file to correctly resolve dtds.



From fedora-cvs-commits at redhat.com  Sat Aug 26 00:19:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 20:19:08 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-reject_unloaded_module.patch,
	NONE, 1.1 pam_pkcs11-0.5.3-ocsp.patch, 1.1,
	1.2 pam_pkcs11-0.5.3-wait-for-card.patch, 1.2,
	1.3 pam_pkcs11.spec, 1.12, 1.13 rh_pam_pkcs11.conf, 1.3,
	1.4 sceventd.sh, 1.1, NONE
Message-ID: <200608260019.k7Q0J8JL014229@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14170/devel

Modified Files:
	pam_pkcs11-0.5.3-ocsp.patch 
	pam_pkcs11-0.5.3-wait-for-card.patch pam_pkcs11.spec 
	rh_pam_pkcs11.conf 
Added Files:
	pam_pkcs11-0.5.3-reject_unloaded_module.patch 
Removed Files:
	sceventd.sh 
Log Message:
auto-import pam_pkcs11-0.5.3-13 on branch devel from pam_pkcs11-0.5.3-13.src.rpm

pam_pkcs11-0.5.3-reject_unloaded_module.patch:
 pkcs11.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE pam_pkcs11-0.5.3-reject_unloaded_module.patch ---
--- ./src/common/pkcs11.c.reject_unloaded_module	2006-08-25 15:34:16.655865000 -0700
+++ ./src/common/pkcs11.c	2006-08-25 15:35:24.402530000 -0700
@@ -144,10 +144,13 @@
                                                 moduleSpec, pkcs11_module);
         module = SECMOD_LoadUserModule(moduleSpec, NULL, 0);
         free(moduleSpec);
-        if (!module) {
+        if (!module || !module->loaded) {
             DBG1("Failed to load SmartCard software %s", 
 					SECU_Strerror(PR_GetError()));
 	    free (h);
+	    if (module) {
+		SECMOD_DestroyModule(module);
+	    }
             return -1;
         }
 	h->is_user_module = PR_TRUE;

pam_pkcs11-0.5.3-ocsp.patch:
 common/cert_vfy.c       |    9 +++++++--
 common/cert_vfy.h       |    2 +-
 pam_pkcs11/pam_config.c |    4 ++++
 pam_pkcs11/pam_config.h |    1 +
 pam_pkcs11/pam_pkcs11.c |    4 +++-
 tools/pkcs11_inspect.c  |    4 +++-
 tools/pklogin_finder.c  |    4 +++-
 7 files changed, 22 insertions(+), 6 deletions(-)

Index: pam_pkcs11-0.5.3-ocsp.patch
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11-0.5.3-ocsp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam_pkcs11-0.5.3-ocsp.patch	22 Jul 2006 02:41:39 -0000	1.1
+++ pam_pkcs11-0.5.3-ocsp.patch	26 Aug 2006 00:19:06 -0000	1.2
@@ -1,59 +1,119 @@
---- ./src/common/pkcs11.c.ocsp	2006-07-20 15:22:43.623000000 -0700
-+++ ./src/common/pkcs11.c	2006-07-20 17:24:39.570716000 -0700
-@@ -20,7 +20,7 @@
+--- ./src/common/cert_vfy.h.ocsp	2006-08-10 14:41:49.045692000 -0700
++++ ./src/common/cert_vfy.h	2006-08-10 14:42:22.837560000 -0700
+@@ -54,7 +54,7 @@
+ *@param policy CRL verify policy
+ *@return 1 on cert vfy sucess, 0 on fail, -1 on process error
+ */
+-CERTVFY_EXTERN int verify_certificate(X509 * x509, char *ca_dir, char *crl_dir, crl_policy_t policy);
++CERTVFY_EXTERN int verify_certificate(X509 * x509, char *ca_dir, char *crl_dir, crl_policy_t policy, int enable_ocsp);
  
+ /**
+ * Verify signature of provided data
+--- ./src/common/cert_vfy.c.ocsp	2006-08-10 14:41:57.451660000 -0700
++++ ./src/common/cert_vfy.c	2006-08-10 14:45:01.502924000 -0700
+@@ -20,14 +20,19 @@
  #ifdef HAVE_NSS
  
--#define NSS_3_9 1
-+/*#define NSS_3_9 1 */
- 
- #include "nss.h"
  #include "cert.h"
-@@ -80,6 +80,7 @@
-     }
-     /* register a callback */
-     PK11_SetPasswordFunc(password_passthrough);
-+    CERT_EnableOCSPChecking(CERT_GetDefaultCertDB());
-     DBG("...  NSS Complete");
-     return 0;
- }
-@@ -178,6 +179,20 @@
-     return 0; /* NSS initialized the module on load */
- }
++#include "ocsp.h"
  
-+int isInitialized(SECMODModule *mod, PK11SlotInfo *slot)
-+{
-+    CK_TOKEN_INFO tokenInfo;
-+
-+    /* don't fail old tokens, let them be.. */
-+    if ((mod->cryptokiVersion.major == 2) && (mod->cryptokiVersion.minor < 10)) {
-+	return 1;
+-int verify_certificate(X509 * x509, char *ca_dir, char *crl_dir, crl_policy_t policy)
++int verify_certificate(X509 * x509, char *ca_dir, char *crl_dir, crl_policy_t policy, int enable_ocsp)
+ {
+     SECStatus rv;
+     CERTCertDBHandle *handle;
+ 
+     handle = CERT_GetDefaultCertDB();
+ 
++    if (enable_ocsp) {
++	CERT_EnableOCSPChecking(handle);
 +    }
 +
-+    PK11_GetTokenInfo(slot, &tokenInfo);
-+
-+    return (tokenInfo.flags & CKF_TOKEN_INITIALIZED);
-+}
-+
- int find_slot_by_number(pkcs11_handle_t *h, int slot_num)
+     /* NSS already check all the revocation info with OCSP and crls */
+     DBG2("Verifying Cert: %s (%s)", x509->nickname, x509->subjectName);
+     rv = CERT_VerifyCertNow(handle, x509, PR_TRUE, certUsageEmailSigner,
+@@ -290,7 +295,7 @@
+   return (rv == -1);
+ }
+ 
+-int verify_certificate(X509 * x509, char *ca_dir, char *crl_dir, crl_policy_t policy)
++int verify_certificate(X509 * x509, char *ca_dir, char *crl_dir, crl_policy_t policy, int enable_ocsp)
  {
-     SECMODModule *module = h->module;
-@@ -187,14 +202,16 @@
-         /* threaded applications should also acquire the
-          * DefaultModuleListLock */
- 	for (i=0; i < module->slotCount; i++) {
--	    if (module->slots[i] && PK11_IsPresent(module->slots[i])) {
-+	    if (module->slots[i] && PK11_IsPresent(module->slots[i])
-+			&& isInitialized(module, module->slots[i])) {
- 		return i;
- 	    }
- 	}
-     }
-     slot_num--;
-     if (slot_num >= 0 && slot_num < module->slotCount && module->slots &&
--	    module->slots[i] && PK11_IsPresent(module->slots[i])) {
-+	    module->slots[i] && PK11_IsPresent(module->slots[i])
-+			&& isInitialized(module, module->slots[i])) {
- 	return slot_num;
-     }
-     return -1;
+   int rv;
+   X509_STORE *store;
+--- ./src/pam_pkcs11/pam_config.c.ocsp	2006-08-10 14:32:07.780016000 -0700
++++ ./src/pam_pkcs11/pam_config.c	2006-08-10 14:36:48.215896000 -0700
+@@ -40,6 +40,7 @@
+         0,				/* int use_first_pass; */
+         0,				/* int use_authok; */
+         0,				/* int card_only; */
++        0,				/* int enable_ocsp; */
+         "default", 			/* const char *pkcs11_module; */
+         "/etc/pam_pkcs11/pkcs11_module.so", /* const char *pkcs11_module_path; */
+         0,				/* int slot_num; */
+@@ -57,6 +58,7 @@
+         DBG1("use_first_pass %d", configuration.use_first_pass);
+         DBG1("use_authok %d", configuration.use_authok);
+         DBG1("card_only %d", configuration.card_only);
++        DBG1("enable_ocsp %d",configuration.enable_ocsp);
+         DBG1("pkcs11_module %s",configuration.pkcs11_module);
+         DBG1("slot_num %d",configuration.slot_num);
+         DBG1("ca_dir %s",configuration.ca_dir);
+@@ -106,6 +108,8 @@
+ 	    scconf_get_bool(root,"card_only",configuration.card_only);
+ 	configuration.pkcs11_module = ( char * )
+ 	    scconf_get_str(root,"use_pkcs11_module",configuration.pkcs11_module);
++	configuration.enable_ocsp = 
++	    scconf_get_bool(root,"enable_ocsp",configuration.enable_ocsp);
+ 	/* search pkcs11 module options */
+ 	pkcs11_mblocks = scconf_find_blocks(ctx,root,"pkcs11_module",configuration.pkcs11_module);
+         if (!pkcs11_mblocks) {
+--- ./src/pam_pkcs11/pam_config.h.ocsp	2006-08-10 14:37:00.622848000 -0700
++++ ./src/pam_pkcs11/pam_config.h	2006-08-10 14:37:16.724780000 -0700
+@@ -33,6 +33,7 @@
+ 	int use_first_pass;
+ 	int use_authok;
+ 	int card_only;
++	int enable_ocsp;
+ 	char *pkcs11_module;
+ 	char *pkcs11_modulepath;
+ 	int slot_num;
+--- ./src/pam_pkcs11/pam_pkcs11.c.ocsp	2006-08-10 14:37:34.091713000 -0700
++++ ./src/pam_pkcs11/pam_pkcs11.c	2006-08-10 14:39:14.611312000 -0700
+@@ -344,7 +344,9 @@
+     if (x509 != NULL) {
+       DBG1("verifing the certificate for the key #%d", i + 1);
+       /* verify certificate (date, signature, CRL, ...) */
+-      rv = verify_certificate(x509, configuration->ca_dir, configuration->crl_dir, configuration->crl_policy);
++      rv = verify_certificate(x509, configuration->ca_dir, 
++	configuration->crl_dir, configuration->crl_policy, 
++	configuration->enable_ocsp);
+       if (rv < 0) {
+ 	free_certificates(ph,certs,cert_count);
+         close_pkcs11_session(ph);
+--- ./src/tools/pkcs11_inspect.c.ocsp	2006-08-10 14:40:11.567084000 -0700
++++ ./src/tools/pkcs11_inspect.c	2006-08-10 14:40:56.964900000 -0700
+@@ -138,7 +138,9 @@
+     if (x509 != NULL) {
+       DBG1("verifing the certificate for the key #%d", i + 1);
+       /* verify certificate (date, signature, CRL, ...) */
+-      rv = verify_certificate(x509, configuration->ca_dir, configuration->crl_dir, configuration->crl_policy);
++      rv = verify_certificate(x509, configuration->ca_dir, 
++	configuration->crl_dir, configuration->crl_policy, 
++	configuration->enable_ocsp);
+       if (rv < 0) {
+ 	free_certificates(ph, certs, cert_count);
+         close_pkcs11_session(ph);
+--- ./src/tools/pklogin_finder.c.ocsp	2006-08-10 14:40:26.689024000 -0700
++++ ./src/tools/pklogin_finder.c	2006-08-10 14:41:23.101796000 -0700
+@@ -137,7 +137,9 @@
+     if (x509 != NULL) {
+       DBG1("verifing the certificate for the key #%d", i + 1);
+       /* verify certificate (date, signature, CRL, ...) */
+-      rv = verify_certificate(x509, configuration->ca_dir, configuration->crl_dir, configuration->crl_policy);
++      rv = verify_certificate(x509, configuration->ca_dir, 
++	configuration->crl_dir, configuration->crl_policy,
++	configuration->enable_ocsp);
+       if (rv < 0) {
+         close_pkcs11_session(ph);
+         release_pkcs11_module(ph);

pam_pkcs11-0.5.3-wait-for-card.patch:
 common/pkcs11.c         |  122 +++++++++++++++++++++++++++++++++++++++++++++++-
 common/smartcard.h      |    7 ++
 pam_pkcs11/pam_config.c |   16 +++++-
 pam_pkcs11/pam_config.h |    1 
 pam_pkcs11/pam_pkcs11.c |   66 +++++++++++++++++--------
 5 files changed, 186 insertions(+), 26 deletions(-)

Index: pam_pkcs11-0.5.3-wait-for-card.patch
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11-0.5.3-wait-for-card.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_pkcs11-0.5.3-wait-for-card.patch	24 Jul 2006 02:35:29 -0000	1.2
+++ pam_pkcs11-0.5.3-wait-for-card.patch	26 Aug 2006 00:19:06 -0000	1.3
@@ -1,22 +1,212 @@
---- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.c.wait-for-card	2006-07-23 22:15:22.000000000 -0400
-+++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.c	2006-07-23 22:31:06.000000000 -0400
-@@ -40,6 +40,7 @@
-         0,				/* int use_first_pass; */
+--- pam_pkcs11-0.5.3/src/common/smartcard.h.wait-for-card	2006-08-25 13:47:43.240800000 -0700
++++ pam_pkcs11-0.5.3/src/common/smartcard.h	2006-08-25 13:47:43.722803000 -0700
+@@ -33,11 +33,18 @@
+ void release_pkcs11_module(pkcs11_handle_t *h);
+ 
+ int find_slot_by_number(pkcs11_handle_t *h, int slot_num);
++int find_slot_by_number_and_label(pkcs11_handle_t *h, 
++				  int slot_num,
++				  const char *slot_label);
+ 
+ int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot);
+ 
+ const char *get_slot_label(pkcs11_handle_t *h);
+ 
++int wait_for_token(pkcs11_handle_t *h, 
++                   int wanted_slot_num,
++                   const char *wanted_slot_label);
++
+ int pkcs11_login(pkcs11_handle_t *h, char *password);
+ 
+ int close_pkcs11_session(pkcs11_handle_t *h);
+--- pam_pkcs11-0.5.3/src/common/pkcs11.c.wait-for-card	2006-08-25 13:47:43.211800000 -0700
++++ pam_pkcs11-0.5.3/src/common/pkcs11.c	2006-08-25 14:14:02.109915000 -0700
+@@ -20,7 +20,7 @@
+ 
+ #ifdef HAVE_NSS
+ 
+-#define NSS_3_9 1
++/*#define NSS_3_9 1 */
+ 
+ #include "nss.h"
+ #include "cert.h"
+@@ -29,9 +29,14 @@
+ #include "cert_st.h"
+ #include "secutil.h"
+ #include "cryptohi.h"
++#include "ocsp.h"
+ #include <unistd.h>
+ #include <errno.h>
+ 
++#ifndef PAM_PKCS11_POLL_TIME
++#define PAM_PKCS11_POLL_TIME 500 /* ms */
++#endif
++
+ struct pkcs11_handle_str {
+   SECMODModule *module;
+   PRBool	is_user_module;
+@@ -225,7 +230,6 @@
+     }
+ }
+ 	
+-
+ int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot_num)
+ {
+     SECMODModule *module = h->module;
+@@ -267,6 +271,67 @@
+     return PK11_GetTokenName(h->slot);
+ }
+ 
++int find_slot_by_number_and_label(pkcs11_handle_t *h, 
++				  int wanted_slot_id,
++				  const char *wanted_slot_label)
++{
++  int slot_num;
++  const char *slot_label;
++
++  slot_num = find_slot_by_number(h, wanted_slot_id);
++
++  if (slot_num < 0) {
++	return slot_num;
++  }
++  slot_label = PK11_GetTokenName(h->module->slots[slot_num]);
++
++  if ((wanted_slot_label == NULL) || 
++       ((slot_label != NULL) && 
++	(strcmp (wanted_slot_label, slot_label) == 0)))
++    return slot_num;
++
++  return -1;
++}
++
++int wait_for_token(pkcs11_handle_t *h, 
++                   int wanted_slot_id,
++                   const char *wanted_slot_label)
++{
++  int slot_num;
++
++  if (h->module == NULL)
++    return -1;
++
++  slot_num = -1;
++  do {
++    /* see if the card we're looking for is inserted */
++    slot_num = find_slot_by_number_and_label (h, wanted_slot_id,
++					      wanted_slot_label);
++    if (slot_num < 0) {
++      PK11SlotInfo *slot;
++      PRIntervalTime slot_poll_interval; /* only for legacy hardware */
++
++      /* if the card is not inserted, then block until something happens */
++      slot_poll_interval = PR_MillisecondsToInterval(PAM_PKCS11_POLL_TIME);
++      slot = SECMOD_WaitForAnyTokenEvent(h->module, 0 /* flags */,
++                                         slot_poll_interval);
++
++      /* unexpected error */
++      if (slot == NULL) {
++        break;
++      }
++
++      /* something happened, continue loop and check if the card
++       * we're looking for is inserted
++       */
++      PK11_FreeSlot(slot);
++      continue;
++    }
++  } while (slot_num < 0);
++
++  return slot_num;
++}
++
+ int get_user_certificates(pkcs11_handle_t *h, cert_object_t ***certs, int *count)
+ {
+     CERTCertList * certList;
+@@ -796,6 +861,52 @@
+    }
+    return slot_num;
+ }
++
++int find_slot_by_number_and_label(pkcs11_handle_t *h, 
++				  int wanted_slot_id,
++				  const char *wanted_slot_label)
++{
++  int slot_num;
++  const char *slot_label;
++
++  slot_num = find_slot_by_number(h, wanted_slot_id);
++
++  if (slot_num < 0) {
++	return slot_num;
++  }
++  slot_label = h->slots[slot_num].label;
++
++  if ((wanted_slot_label == NULL) || 
++       ((slot_label != NULL) && 
++	(strcmp (wanted_slot_label, slot_label) == 0)))
++    return slot_num;
++
++  return -1;
++}
++
++int wait_for_token(pkcs11_handle_t *h, 
++                   int wanted_slot_id,
++                   const char *wanted_slot_label)
++{
++  int slot_num;
++
++  if (h->module == NULL)
++    return -1;
++
++  slot_num = -1;
++  do {
++    /* see if the card we're looking for is inserted */
++    slot_num = find_slot_by_number_and_label (h, wanted_slot_id,
++					      wanted_slot_label);
++    if (slot_num < 0) {
++      /* could call C_WaitForSlotEvent, for now just pull */
++      sleep(10);
++      continue;
++    }
++  } while (slot_num < 0);
++
++  return slot_num;
++}
+ 	
+ 
+ int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot)
+@@ -1070,6 +1181,13 @@
+     return h->slots[h->current_slot].label;
+ }
+ 
++int wait_for_smart_card(pkcs11_handle_t *h, 
++			int wanted_slot_num,
++			const char *wanted_slot_label)
++{
++    return 0;
++}
++
+ const X509 *get_X509_certificate(cert_object_t *cert)
+ {
+ 	return cert->x509;
+--- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.c.wait-for-card	2006-08-25 13:47:43.640800000 -0700
++++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.c	2006-08-25 13:52:22.839405000 -0700
+@@ -41,6 +41,7 @@
          0,				/* int use_authok; */
          0,				/* int card_only; */
+         0,				/* int enable_ocsp; */
 +        0,				/* int wait_for_card; */
          "default", 			/* const char *pkcs11_module; */
          "/etc/pam_pkcs11/pkcs11_module.so", /* const char *pkcs11_module_path; */
          0,				/* int slot_num; */
-@@ -57,6 +58,7 @@
-         DBG1("use_first_pass %d", configuration.use_first_pass);
+@@ -59,6 +60,7 @@
          DBG1("use_authok %d", configuration.use_authok);
          DBG1("card_only %d", configuration.card_only);
-+        DBG1("wait_for_card %d", configuration.card_only);
+         DBG1("enable_ocsp %d",configuration.enable_ocsp);
++        DBG1("wait_for_card %d", configuration.wait_for_card);
          DBG1("pkcs11_module %s",configuration.pkcs11_module);
          DBG1("slot_num %d",configuration.slot_num);
          DBG1("ca_dir %s",configuration.ca_dir);
-@@ -104,6 +106,8 @@
+@@ -106,6 +108,8 @@
  	    scconf_get_bool(root,"use_authok",configuration.use_authok);
  	configuration.card_only = 
  	    scconf_get_bool(root,"card_only",configuration.card_only);
@@ -24,8 +214,8 @@
 +	    scconf_get_bool(root,"wait_for_card",configuration.wait_for_card);
  	configuration.pkcs11_module = ( char * )
  	    scconf_get_str(root,"use_pkcs11_module",configuration.pkcs11_module);
- 	/* search pkcs11 module options */
-@@ -167,8 +171,8 @@
+ 	configuration.enable_ocsp = 
+@@ -171,8 +175,8 @@
  	parse_config_file();
  	/* display_config(); */
  	/* finally parse provided arguments */
@@ -36,7 +226,7 @@
  	   if (strcmp("nullok", argv[i]) == 0) {
  		configuration.nullok = 1;
  		continue;
-@@ -181,6 +185,14 @@
+@@ -185,6 +189,14 @@
        		configuration.use_first_pass = 1;
  		continue;
  	   }
@@ -51,8 +241,8 @@
      	   if (strcmp("debug", argv[i]) == 0) {
        		configuration.debug = 1;
  		set_debug_level(1);
---- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_pkcs11.c.wait-for-card	2006-07-23 22:15:22.000000000 -0400
-+++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_pkcs11.c	2006-07-23 22:15:22.000000000 -0400
+--- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_pkcs11.c.wait-for-card	2006-08-25 13:47:43.657801000 -0700
++++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_pkcs11.c	2006-08-25 14:06:51.539066000 -0700
 @@ -26,6 +26,7 @@
  #endif
  #include <security/pam_appl.h>
@@ -150,7 +340,7 @@
      }
    } else {
      pam_prompt(pamh, PAM_TEXT_INFO, NULL,
-@@ -247,7 +276,6 @@
+@@ -247,24 +276,22 @@
      release_pkcs11_module(ph);
      DBG1("open_pkcs11_session() failed: %s", get_error());
      syslog(LOG_ERR, "open_pkcs11_session() failed: %s", get_error());
@@ -158,7 +348,9 @@
      return pkcs11_pam_fail;
    }
  
-@@ -257,14 +285,13 @@
+   /* get password */
+   sprintf(password_prompt, "Welcome %.32s!", get_slot_label(ph));
+   pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt);
    if (configuration->use_first_pass) {
      rv = pam_get_pwd(pamh, &password, NULL, PAM_AUTHTOK, 0);
    } else if (configuration->try_first_pass) {
@@ -199,7 +391,7 @@
      return pkcs11_pam_fail;
    }
  
-@@ -322,7 +346,6 @@
+@@ -324,7 +348,6 @@
          unload_mappers();
          DBG1("verify_certificate() failed: %s", get_error());
          syslog(LOG_ERR, "verify_certificate() failed: %s", get_error());
@@ -207,7 +399,7 @@
          return pkcs11_pam_fail;
        } else if (rv != 1) {
          DBG1("verify_certificate() failed: %s", get_error());
-@@ -343,7 +366,6 @@
+@@ -345,7 +368,6 @@
  	  unload_mappers();
            DBG1("find_user() failed: %s", get_error());
            syslog(LOG_ERR,"find_user() failed: %s",get_error());
@@ -215,138 +407,13 @@
            return pkcs11_pam_fail;
  	} else {
            DBG1("certificate is valid and matches user %s",user);
---- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.h.wait-for-card	2006-07-23 22:15:22.000000000 -0400
-+++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.h	2006-07-23 22:15:22.000000000 -0400
+--- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.h.wait-for-card	2006-08-25 13:47:43.648800000 -0700
++++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.h	2006-08-25 13:50:16.813035000 -0700
 @@ -33,6 +33,7 @@
  	int use_first_pass;
  	int use_authok;
  	int card_only;
 +	int wait_for_card;
+ 	int enable_ocsp;
  	char *pkcs11_module;
  	char *pkcs11_modulepath;
- 	int slot_num;
---- pam_pkcs11-0.5.3/src/common/smartcard.h.wait-for-card	2006-07-23 22:15:22.000000000 -0400
-+++ pam_pkcs11-0.5.3/src/common/smartcard.h	2006-07-23 22:15:22.000000000 -0400
-@@ -33,11 +33,18 @@
- void release_pkcs11_module(pkcs11_handle_t *h);
- 
- int find_slot_by_number(pkcs11_handle_t *h, int slot_num);
-+int find_slot_by_number_and_label(pkcs11_handle_t *h, 
-+				  int slot_num,
-+				  const char *slot_label);
- 
- int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot);
- 
- const char *get_slot_label(pkcs11_handle_t *h);
- 
-+int wait_for_token(pkcs11_handle_t *h, 
-+                   int wanted_slot_num,
-+                   const char *wanted_slot_label);
-+
- int pkcs11_login(pkcs11_handle_t *h, char *password);
- 
- int close_pkcs11_session(pkcs11_handle_t *h);
---- pam_pkcs11-0.5.3/src/common/pkcs11.c.wait-for-card	2006-07-23 22:15:22.000000000 -0400
-+++ pam_pkcs11-0.5.3/src/common/pkcs11.c	2006-07-23 22:15:22.000000000 -0400
-@@ -29,9 +29,14 @@
- #include "cert_st.h"
- #include "secutil.h"
- #include "cryptohi.h"
-+#include "ocsp.h"
- #include <unistd.h>
- #include <errno.h>
- 
-+#ifndef PAM_PKCS11_POLL_TIME
-+#define PAM_PKCS11_POLL_TIME 500 /* ms */
-+#endif
-+
- struct pkcs11_handle_str {
-   SECMODModule *module;
-   PRBool	is_user_module;
-@@ -242,7 +247,6 @@
-     }
- }
- 	
--
- int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot_num)
- {
-     SECMODModule *module = h->module;
-@@ -284,6 +288,64 @@
-     return PK11_GetTokenName(h->slot);
- }
- 
-+int find_slot_by_number_and_label(pkcs11_handle_t *h, 
-+				  int wanted_slot_id,
-+				  const char *wanted_slot_label)
-+{
-+  int slot_num;
-+  const char *slot_label;
-+
-+  slot_num = find_slot_by_number(h, wanted_slot_id);
-+  slot_label = PK11_GetTokenName(h->module->slots[slot_num]);
-+
-+  if ((slot_num >= 0) &&
-+      ((wanted_slot_label == NULL) || 
-+       ((slot_label != NULL) && 
-+	(strcmp (wanted_slot_label, slot_label) == 0))))
-+    return slot_num;
-+
-+  return -1;
-+}
-+
-+int wait_for_token(pkcs11_handle_t *h, 
-+                   int wanted_slot_id,
-+                   const char *wanted_slot_label)
-+{
-+  int slot_num;
-+
-+  if (h->module == NULL)
-+    return -1;
-+
-+  slot_num = -1;
-+  do {
-+    /* see if the card we're looking for is inserted */
-+    slot_num = find_slot_by_number_and_label (h, wanted_slot_id,
-+					      wanted_slot_label);
-+    if (slot_num < 0) {
-+      PK11SlotInfo *slot;
-+      PRIntervalTime slot_poll_interval; /* only for legacy hardware */
-+
-+      /* if the card is not inserted, then block until something happens */
-+      slot_poll_interval = PR_MillisecondsToInterval(PAM_PKCS11_POLL_TIME);
-+      slot = SECMOD_WaitForAnyTokenEvent(h->module, 0 /* flags */,
-+                                         slot_poll_interval);
-+
-+      /* unexpected error */
-+      if (slot == NULL) {
-+        break;
-+      }
-+
-+      /* something happened, continue loop and check if the card
-+       * we're looking for is inserted
-+       */
-+      PK11_FreeSlot(slot);
-+      continue;
-+    }
-+  } while (slot_num < 0);
-+
-+  return slot_num;
-+}
-+
- int get_user_certificates(pkcs11_handle_t *h, cert_object_t ***certs, int *count)
- {
-     CERTCertList * certList;
-@@ -1087,6 +1149,13 @@
-     return h->slots[h->current_slot].label;
- }
- 
-+int wait_for_smart_card(pkcs11_handle_t *h, 
-+			int wanted_slot_num,
-+			const char *wanted_slot_label)
-+{
-+    return 0;
-+}
-+
- const X509 *get_X509_certificate(cert_object_t *cert)
- {
- 	return cert->x509;


Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pam_pkcs11.spec	24 Aug 2006 23:22:18 -0000	1.12
+++ pam_pkcs11.spec	26 Aug 2006 00:19:06 -0000	1.13
@@ -6,7 +6,7 @@
 
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        12
+Release:        13
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -21,6 +21,7 @@
 Patch4:		pam_pkcs11-0.5.3-putenv-login-token.patch
 Patch5:		pam_pkcs11-0.5.3-ocsp.patch
 Patch6:		pam_pkcs11-0.5.3-wait-for-card.patch
+Patch7:		pam_pkcs11-0.5.3-reject_unloaded_module.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pam-devel
@@ -56,6 +57,7 @@
 %patch4 -p0 -b .putenv
 %patch5 -p0 -b .ocsp
 %patch6 -p1 -b .wait-for-card
+%patch7 -p0 -b .reject-unloaded-module
 
 %build
 
@@ -92,8 +94,12 @@
 # set up config files
 #
 install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
+sed -e 's;$LIB;'%{_lib}';g' %{SOURCE1} > $RPM_BUILD_ROOT/tmp_conf
+install -m 644 $RPM_BUILD_ROOT/tmp_conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
+rm -f $RPM_BUILD_ROOT/tmp_conf
+sed -e 's;$LIB;'%{_lib}';g' %{SOURCE2} > $RPM_BUILD_ROOT/tmp_conf
+install -m 644 $RPM_BUILD_ROOT/tmp_conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
+rm -f $RPM_BUILD_ROOT/tmp_conf
 #
 # clean up those files that aren't part of this package
 # (makefile should install them if --without-pcsclite is supplied
@@ -145,6 +151,12 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Mon Aug 28 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-13
+- Fix the default mapping order.
+- Make ocsp support controlled by a config entry.
+- Fix login crash
+- revert to explicit paths until we can fix 'login' and 'authconfig'
+
 * Mon Aug 28 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-12
 - use $LIB so the config file works for multi archs on the
 - same machine


Index: rh_pam_pkcs11.conf
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/rh_pam_pkcs11.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rh_pam_pkcs11.conf	24 Aug 2006 23:22:18 -0000	1.3
+++ rh_pam_pkcs11.conf	26 Aug 2006 00:19:06 -0000	1.4
@@ -14,6 +14,9 @@
   # If the smart card is inserted, only use it
   card_only = true;
 
+  # Turn on OCSP checking of the certificates
+  enable_ocsp = true;
+
   # Do not prompt the user for the passwords but take them from the
   # PAM_ items instead.
   use_first_pass = false;
@@ -121,7 +124,7 @@
   # If used null mapper should be the last in the list :-)
   # Also you should select at least one mapper, otherwise
   # certificate will not match :-)
-  use_mappers = digest, cn, pwent, uid, mail, subject, null;
+  use_mappers = cn, pwent, uid, null;
 
   # When no absolute path or module info is provided, use this
   # value as module search path


--- sceventd.sh DELETED ---



From fedora-cvs-commits at redhat.com  Sat Aug 26 00:42:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 20:42:55 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.59,1.60
Message-ID: <200608260042.k7Q0gtLL020706@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20670

Modified Files:
	mx4j.spec 
Log Message:

Fixed broken deps




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mx4j.spec	25 Aug 2006 23:05:07 -0000	1.59
+++ mx4j.spec	26 Aug 2006 00:42:48 -0000	1.60
@@ -93,9 +93,6 @@
 Requires(pre):	/bin/rm
 Requires(post):       /usr/sbin/update-alternatives
 Requires(postun):       /usr/sbin/update-alternatives
-Requires:	burlap >= 3.0.8
-Requires:	caucho-services
-Requires:	hessian >= 3.0.8
 Requires:	jaf
 Requires:	javamail >= 0:1.2-5jpp
 Requires:	log4j >= 0:1.2.7
@@ -289,6 +286,9 @@
 %doc dist/docs/*
 
 %changelog
+* Fri Aug 25 2006 Deepak Bhole <dbhole at redhat.com> 0:3.0.1-6jpp.3
+- Fixed broken deps.
+
 * Fri Aug 25 2006 Deepak Bhole <dbhole at redhat.com> 0:3.0.1-6jpp.2
 - Make tests conditional
 - Add missing requirements



From fedora-cvs-commits at redhat.com  Sat Aug 26 00:44:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 20:44:03 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.60,1.61
Message-ID: <200608260044.k7Q0i3jB021079@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20987

Modified Files:
	mx4j.spec 
Log Message:


Bumping release.




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mx4j.spec	26 Aug 2006 00:42:48 -0000	1.60
+++ mx4j.spec	26 Aug 2006 00:44:01 -0000	1.61
@@ -40,7 +40,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        6jpp.2
+Release:        6jpp.3
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License



From fedora-cvs-commits at redhat.com  Sat Aug 26 03:33:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 25 Aug 2006 23:33:17 -0400
Subject: rpms/lam/devel lam.spec, 1.35, 1.36 lam-7.1.1-f77-f95.patch, 1.3,
	NONE relpath.sh, 1.1, NONE
Message-ID: <200608260333.k7Q3XH95008338@cvs.devel.redhat.com>

Author: dledford

Update of /cvs/dist/rpms/lam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8313

Modified Files:
	lam.spec 
Removed Files:
	lam-7.1.1-f77-f95.patch relpath.sh 
Log Message:
Updates to work with updated openmpi


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/lam.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- lam.spec	12 Jul 2006 06:43:46 -0000	1.35
+++ lam.spec	26 Aug 2006 03:32:49 -0000	1.36
@@ -1,22 +1,20 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
 Version: 7.1.2
-Release: 1.fc6.1
+Release: 2%{?dist}
 License: BSD
 Epoch: 2
 Group: Development/Libraries
 Source: http://www.lam-mpi.org/download/files/lam-%{version}.tar.bz2
-Source1: relpath.sh
-Source2: lam.pc.in
-Source3: lam.module.in
+Source1: lam.pc.in
+Source2: lam.module.in
 URL: http://www.lam-mpi.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl gcc gcc-c++ gcc-gfortran libaio libaio-devel autoconf automake libtool
 Requires: openssh-server openssh-clients libaio libaio-devel gcc gcc-c++ gcc-gfortran
+Requires(post): /sbin/ldconfig, /usr/sbin/alternatives
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
-%{?!LAMbinpfx: %define LAMbinpfx 'lam-'} # prefix for LAM binaries that clash with OpenMPI
-
 %description 
 LAM (Local Area Multicomputer) is an Message-Passing Interface (MPI)
 programming environment and development system for heterogeneous
@@ -69,86 +67,96 @@
 %endif 
 export FC=f95
 %ifarch i386 s390 ppc
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --with-trillium --enable-shared
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --with-trillium --enable-shared --program-transform-name='s/^mpi/lam/' --disable-deprecated-executable-names
 %else
 #
 # Disable TotalView on non-32 bit architectures.
 #
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --disable-tv --disable-tv-dll --with-trillium --enable-shared
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --disable-tv --disable-tv-dll --with-trillium --enable-shared --program-transform-name='s/^mpi/lam/' --disable-deprecated-executable-names
 %endif
 
 make %{?_smp_mflags} all
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+[ ! -z "${RPM_BUILD_ROOT}" ] && rm -rf ${RPM_BUILD_ROOT}
+make DESTDIR=${RPM_BUILD_ROOT} install
 
 # ? commented this out (JVD, 2005-07-08):
 # Can't open usr/bin/balky: No such file or directory.
-#pushd $RPM_BUILD_ROOT
+#pushd ${RPM_BUILD_ROOT}
 # balky has buildroot paths in the binary
 #perl -pi -e "s|(.*=).*hcp|\1/usr/bin/hcp|g" usr/bin/balky
 #popd
 
 # mans isn't a standard mandir (#67595) and contains a copy of man7/mpi.7
-rm -fr $RPM_BUILD_ROOT/%{_mandir}/mans
+rm -fr ${RPM_BUILD_ROOT}%{_mandir}/mans
 
 ln -f romio/COPYRIGHT romio/ROMIO-COPYRIGHT
 ln -f romio/doc/README romio/ROMIO-README
 ln -f romio/doc/users-guide.ps.gz romio/doc/romio-users-guide.ps.gz 
 ln -f romio/README_LAM romio/ROMIO-README_LAM
 
-# FIXME: sanitize /usr/include/lam_config.h for bi-arch - huh ?
-
 # Remove .la files:
 find ${RPM_BUILD_ROOT}%{_libdir} -name \*.la | xargs rm
 
 # Remove wrong doc directory location (files shipped in %doc): 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/lam
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/lam
 #
 #
 # Make LAM coexist with OpenMPI:
 #
-# Make /usr/share/lam environment-modules directory:
-. %SOURCE1
-# ^- provides "relpath" function
-rpath=`relpath ${RPM_BUILD_ROOT}/%{_bindir} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin`;
-mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin;
-ln -s `relpath ${RPM_BUILD_ROOT}/%{_libdir}/%{name} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}` ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/lib;
-ln -s `relpath ${RPM_BUILD_ROOT}/%{_includedir}/%{name} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}` ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/include;
-# Links: (mpiCC,mpicxx)->mpicc,  (mpiexec,mpirun)->orterun
 # Clashes with OpenMPI: mpic++ mpicc mpif77 mpiexec mpirun
-for b in mpirun mpiexec mpicc mpic++ mpif77 ; do
-  mv $RPM_BUILD_ROOT/%{_bindir}/$b $RPM_BUILD_ROOT/%{_bindir}/%{LAMbinpfx}$b; 
-  ln -s ./%{LAMbinpfx}$b $RPM_BUILD_ROOT/%{_bindir}/$b;
-  ln -s ${rpath}/%{LAMbinpfx}${b} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin/${b};
-done;
-# Create the binaries in /usr/share/lam/bin for environment-modules environment:
-(cd ${RPM_BUILD_ROOT}/%{_bindir}; ls) | egrep -v '^(mpirun mpiexec mpicc mpic\+\+ mpif77)$' |
-while read b; do
-  ln -s ${rpath}/${b} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin/${b};
-done;
-# Create the /usr/lib/*.so links for existing software that links with LAM 
-# - only libmpi.so actually clashes with OpenMPI, which can be made into an alternative(8):
-#(cd ${RPM_BUILD_ROOT}/%{_libdir}/%{name}; ls *.so) | while read l; do
-#    ln -s ./%{name}/$l $RPM_BUILD_ROOT/%{_libdir}/$l;
-#done;
-# 
-# Create the ldconfig file for LAM
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d
-# The default mpi ld.so conf file (managed by openmpi's mpi_alternatives):
-touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d/mpi.conf
-echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/ld.conf
+
+echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.ld.conf
 # Create the lam.pc pkgconfig file:
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig
-sed 's#@VERSION@#'%{version}'#;s#@LIBDIR@#'%{_libdir}/%{name}'#;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/%{name}.pc;
-# Move man pages to /usr/share/lam/man :
-mv ${RPM_BUILD_ROOT}/%{_mandir} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/man
-sed 's#@DATADIR@#'%{_datadir}/%{name}'#;s#@NAME@#'%{name}'#' < %SOURCE3 > ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/%{name}.module
-:;
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
+sed 's#@VERSION@#'%{version}'#;s#@LIBDIR@#'%{_libdir}/%{name}'#;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#' < %SOURCE1 > ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/%{name}.pc
+sed 's#@DATADIR@#'%{_datadir}/%{name}'#;s#@NAME@#'%{name}'#' < %SOURCE2 > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.module
+
+for i in hcc hcp hf77
+do
+    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/$i.1*
+done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+[ ! -z "${RPM_BUILD_ROOT}" ] && rm -rf ${RPM_BUILD_ROOT}
+
+%post
+if [ "$1" -ge 1 ]; then
+	alternatives --install %{_sysconfdir}/ld.so.conf.d/mpi.conf mpi \
+				%{_libdir}/lam/lam.ld.conf 5 \
+		--slave %{_bindir}/mpirun mpi-run %{_bindir}/lamrun \
+		--slave %{_bindir}/mpiexec mpi-exec %{_bindir}/lamexec \
+		--slave %{_mandir}/man1/mpirun.1.gz mpi-run-man \
+			%{_mandir}/man1/lamrun.1.gz \
+		--slave %{_mandir}/man1/mpiexec.1.gz mpi-exec-man \
+			%{_mandir}/man1/lamexec.1.gz
+fi;
+/sbin/ldconfig
+
+%preun
+if [ "$1" -ge 1 ]; then
+	alternatives --remove mpi %{_libdir}/lam/lam.ld.conf
+fi
+
+%postun -p /sbin/ldconfig
+
+%post devel
+if [ "$1" -ge 1 ]; then
+	alternatives --install  %{_bindir}/mpicc mpicc \
+				%{_bindir}/lamcc 5 \
+		--slave %{_bindir}/mpic++ mpic++ %{_bindir}/lamc++ \
+		--slave %{_bindir}/mpiCC mpiCC %{_bindir}/lamc++ \
+		--slave %{_bindir}/mpif77 mpif77 %{_bindir}/lamf77
+fi
+/sbin/ldconfig
+
+%preun devel
+if [ "$1" -ge 1 ]; then
+	alternatives --remove mpicc %{_bindir}/lamcc
+fi
+
+%postun devel -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -156,13 +164,16 @@
 %doc doc/user.pdf doc/install.pdf
 %doc share/memory/darwin7/APPLE_LICENSE share/memory/ptmalloc/ptmalloc-COPYRIGHT share/memory/ptmalloc2/ptmalloc2-COPYRIGHT
 %config(noreplace) %{_sysconfdir}/%{name}
-%ghost %{_sysconfdir}/ld.so.conf.d/mpi.conf
 %{_bindir}/*
-%{_datadir}/%{name}
+%exclude %{_bindir}/lamc++
+%exclude %{_bindir}/lamcc
+%exclude %{_bindir}/lamf77
+%{_mandir}/*/*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/lam.ld.conf
 
 %files libs
 %defattr(-,root,root)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so.*
 %ifarch i386 s390 ppc
 %dir %{_libdir}/%{name}/lam
@@ -172,22 +183,22 @@
 %files devel
 %defattr(-,root,root)
 %doc romio/ROMIO-COPYRIGHT romio/ROMIO-README romio/ROMIO-README_LAM  romio/doc/romio-users-guide.ps.gz
+%{_bindir}/lamc++
+%{_bindir}/lamcc
+%{_bindir}/lamf77
 %{_includedir}/%{name}
 %{_libdir}/%{name}/*.a
 %{_libdir}/%{name}/*.so
 %ifarch i386 s390 ppc
 %{_libdir}/%{name}/lam/*.so
 %endif
+%{_libdir}/%{name}/lam.module
 %config %{_libdir}/pkgconfig/%{name}.pc
 
-%post
-if [ $1 -ge 1 ]; then
-   if [ ! -e %{_sysconfdir}/ld.so.conf.d/mpi.conf ]; then
-	ln -s %{_datadir}/%{name}/ld.conf  %{_sysconfdir}/ld.so.conf.d/mpi.conf;
-   fi;
-fi;
-
 %changelog
+* Fri Aug 25 2006 Doug Ledford <dledford at redhat.com> - 2:7.1.2-2.fc6
+- Get rid of mpi_alternatives and just use alternatives to match openmpi
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:7.1.2-1.fc6.1
 - rebuild
 


--- lam-7.1.1-f77-f95.patch DELETED ---


--- relpath.sh DELETED ---



From fedora-cvs-commits at redhat.com  Sat Aug 26 04:43:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 26 Aug 2006 00:43:30 -0400
Subject: rpms/firefox/devel firefox-1.5-pango-about.patch, 1.1,
	1.2 firefox.spec, 1.144, 1.145
Message-ID: <200608260443.k7Q4hUK3032669@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32655

Modified Files:
	firefox-1.5-pango-about.patch firefox.spec 
Log Message:
- Remove "Pango breaks MathML" from firefox-1.5-pango-about.patch


firefox-1.5-pango-about.patch:
 about.xhtml |    9 +++++++++
 1 files changed, 9 insertions(+)

Index: firefox-1.5-pango-about.patch
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-1.5-pango-about.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-pango-about.patch	13 Mar 2006 07:47:23 -0000	1.1
+++ firefox-1.5-pango-about.patch	26 Aug 2006 04:43:26 -0000	1.2
@@ -11,7 +11,7 @@
  <ul>
 +<li id="pango-notice">
 +In order to better support certain scripts (such as Indic and some CJK scripts), Fedora builds its Firefox, with permission from the Mozilla Corporation, with 
-+the Pango system as its text renderer.  This change is known to break rendering of MathML, and may negatively impact performance on some pages.  To disable the 
++the Pango system as its text renderer.  This change may negatively impact performance on some pages.  To disable the 
 +use of Pango, set <tt>MOZ_DISABLE_PANGO=1</tt> in your environment before launching Firefox.
 +</li>
 +<script type="application/x-javascript">


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- firefox.spec	25 Aug 2006 02:04:52 -0000	1.144
+++ firefox.spec	26 Aug 2006 04:43:26 -0000	1.145
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.6
-Release:        6
+Release:        7
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -356,6 +356,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Sat Aug 26 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.5.0.6-7
+- Remove "Pango breaks MathML" from firefox-1.5-pango-about.patch
+
 * Thu Aug 24 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.5.0.6-6
 - Remove debugging statement from firefox-1.5-pango-mathml.patch
 



From fedora-cvs-commits at redhat.com  Sat Aug 26 04:43:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 26 Aug 2006 00:43:33 -0400
Subject: rpms/gstreamer-plugins-good/devel .cvsignore, 1.5,
	1.6 gstreamer-plugins-good.spec, 1.16, 1.17 sources, 1.5, 1.6
Message-ID: <200608260443.k7Q4hXSG032695@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-good/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32654

Modified Files:
	.cvsignore gstreamer-plugins-good.spec sources 
Log Message:
0.10.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 May 2006 03:50:22 -0000	1.5
+++ .cvsignore	26 Aug 2006 04:43:31 -0000	1.6
@@ -1 +1 @@
-gst-plugins-good-0.10.3.tar.bz2
+gst-plugins-good-0.10.4.tar.bz2


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gstreamer-plugins-good.spec	28 Jul 2006 01:26:43 -0000	1.16
+++ gstreamer-plugins-good.spec	26 Aug 2006 04:43:31 -0000	1.17
@@ -5,8 +5,8 @@
 %define         _gstpb          0.10.6
 
 Name: 		%{gstreamer}-plugins-good
-Version: 	0.10.3
-Release:  	5
+Version: 	0.10.4
+Release:  	1%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -183,6 +183,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null
 
 %changelog
+* Sat Aug 26 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.4-1
+- Update to 0.10.4
+
 * Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.3-5
 - Disable gtk-doc to fix multilib conflicts
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 May 2006 03:50:22 -0000	1.5
+++ sources	26 Aug 2006 04:43:31 -0000	1.6
@@ -1 +1 @@
-2b59bce477349628ee549c2ce1d80a3a  gst-plugins-good-0.10.3.tar.bz2
+e189496e7987898823d28d26b79f63dc  gst-plugins-good-0.10.4.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Aug 26 05:03:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 26 Aug 2006 01:03:10 -0400
Subject: rpms/gstreamer-plugins-good/devel
	gst-plugins-good-0.10.4-docs.patch, NONE,
	1.1 gstreamer-plugins-good.spec, 1.17, 1.18
Message-ID: <200608260503.k7Q53AIm015676@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-good/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15659

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	gst-plugins-good-0.10.4-docs.patch 
Log Message:
update patch


gst-plugins-good-0.10.4-docs.patch:
 Makefile.in |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE gst-plugins-good-0.10.4-docs.patch ---
--- gst-plugins-good-0.10.4/docs/Makefile.in.docs	2006-08-26 01:02:09.000000000 -0400
+++ gst-plugins-good-0.10.4/docs/Makefile.in	2006-08-26 01:02:31.000000000 -0400
@@ -438,9 +438,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
- at ENABLE_PLUGIN_DOCS_FALSE@PLUGIN_DOCS_DIRS = 
- at ENABLE_PLUGIN_DOCS_TRUE@PLUGIN_DOCS_DIRS = plugins
-SUBDIRS = $(PLUGIN_DOCS_DIRS)
+SUBDIRS = plugins
 DIST_SUBDIRS = plugins
 EXTRA_DIST = \
         random/ChangeLog-0.8 \


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gstreamer-plugins-good.spec	26 Aug 2006 04:43:31 -0000	1.17
+++ gstreamer-plugins-good.spec	26 Aug 2006 05:03:05 -0000	1.18
@@ -13,7 +13,7 @@
 License: 	LGPL
 URL:		http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.bz2
-Patch0:		gst-plugins-good-0.10.3-docs.patch
+Patch0:		gst-plugins-good-0.10.4-docs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: 	%{gstreamer} >= %{_gst}



From fedora-cvs-commits at redhat.com  Sat Aug 26 05:34:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 26 Aug 2006 01:34:38 -0400
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.18,
	1.19
Message-ID: <200608260534.k7Q5YcIA031078@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-good/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31066

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
fix build reqs



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gstreamer-plugins-good.spec	26 Aug 2006 05:03:05 -0000	1.18
+++ gstreamer-plugins-good.spec	26 Aug 2006 05:34:36 -0000	1.19
@@ -37,6 +37,7 @@
 BuildRequires:  mikmod
 BuildRequires:  glibc-devel
 BuildRequires:	speex-devel
+BuildRequires:  libiec61883-devel
 
 %ifnarch s390 s390x
 BuildRequires:  libdv-devel



From fedora-cvs-commits at redhat.com  Sat Aug 26 06:06:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 26 Aug 2006 02:06:22 -0400
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.19,
	1.20
Message-ID: <200608260606.k7Q66MS5032182@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-good/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32066

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
adjust build reqs



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gstreamer-plugins-good.spec	26 Aug 2006 05:34:36 -0000	1.19
+++ gstreamer-plugins-good.spec	26 Aug 2006 06:06:17 -0000	1.20
@@ -37,12 +37,12 @@
 BuildRequires:  mikmod
 BuildRequires:  glibc-devel
 BuildRequires:	speex-devel
-BuildRequires:  libiec61883-devel
 
 %ifnarch s390 s390x
 BuildRequires:  libdv-devel
 BuildRequires:  libraw1394-devel
 BuildRequires:  libavc1394-devel
+BuildRequires:  libiec61883-devel
 %endif
 
 # documentation



From fedora-cvs-commits at redhat.com  Sat Aug 26 13:43:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 26 Aug 2006 09:43:04 -0400
Subject: rpms/gnucash/devel gnucash.spec,1.55,1.56
Message-ID: <200608261343.k7QDh46J020939@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20612

Modified Files:
	gnucash.spec 
Log Message:
- buildrequire intltool which was previously pulled in by scrollkeeper but
  dropped this requirement because of bz #203606

checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool
error: Bad exit status from /var/tmp/rpm-tmp.37860 (%build)



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnucash.spec	23 Aug 2006 13:58:34 -0000	1.55
+++ gnucash.spec	26 Aug 2006 13:42:59 -0000	1.56
@@ -7,9 +7,9 @@
 Summary: GnuCash is an application to keep track of your finances.
 Version: 2.0.1
 %if %{buildsvn}
-Release: 4%{?dist}.%{svnrev}svn.1
+Release: 5%{?dist}.%{svnrev}svn.1
 %else
-Release: 4%{?dist}
+Release: 5%{?dist}
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -31,7 +31,7 @@
 BuildRequires: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0
 BuildRequires: libofx-devel, aqbanking-devel, docbook-style-xsl
 BuildRequires: desktop-file-utils, scrollkeeper, texinfo, libtool-ltdl-devel
-BuildRequires: gettext, slib >= 3a1-5, libtool
+BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
 Requires: slib >= 3a1-5, yelp
 # hack
 Requires: perl(Date::Manip)
@@ -151,6 +151,10 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Sat Aug 26 2006 Karsten Hopp <karsten at redhat.com> - 2.0.1-5
+- buildrequire intltool which was previously pulled in by scrollkeeper but
+  dropped this requirement because of bz #203606
+
 * Tue Aug 22 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-4
 - require perl-Crypt-SSLeay (#203050)
 



From fedora-cvs-commits at redhat.com  Sat Aug 26 13:51:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 26 Aug 2006 09:51:54 -0400
Subject: rpms/gdm/devel gdm.spec,1.192,1.193
Message-ID: <200608261351.k7QDpsNX006854@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6715

Modified Files:
	gdm.spec 
Log Message:
- buildrequire inttools as this isn't a requirement of scrollkeeper anymore
  and thus missing from the buildroot




Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- gdm.spec	21 Aug 2006 20:37:42 -0000	1.192
+++ gdm.spec	26 Aug 2006 13:51:52 -0000	1.193
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -88,6 +88,7 @@
 BuildRequires: libdmx-devel
 BuildRequires: libselinux-devel >= %{libselinuxver}
 BuildRequires: audit-libs-devel >= %{libauditver}
+BuildRequires: intltool
 %ifnarch s390 s390x ppc64
 BuildRequires: xorg-x11-server-Xorg
 %endif
@@ -300,6 +301,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Sat Aug 26 2006 Karsten Hopp <karsten at redhat.com> - 1:2.15.10-2.fc6
+- buildrequire inttools as this isn't a requirement of scrollkeeper anymore
+  and thus missing from the buildroot
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.10-1.fc6
 - Update to 2.15.10
 - Drop upstreamed patch



From fedora-cvs-commits at redhat.com  Sat Aug 26 13:59:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 26 Aug 2006 09:59:23 -0400
Subject: rpms/dasher/devel dasher.spec,1.52,1.53
Message-ID: <200608261359.k7QDxNGp018847@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18834

Modified Files:
	dasher.spec 
Log Message:
- buildrequire intltool which was previously pulled in by scrollkeeper but
  dropped this requirement because of bz #203606



Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- dasher.spec	22 Aug 2006 02:54:47 -0000	1.52
+++ dasher.spec	26 Aug 2006 13:59:21 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
 Version: 4.1.10
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -18,6 +18,7 @@
 BuildRequires: libXtst-devel
 BuildRequires: gettext
 BuildRequires: gnome-doc-utils
+BuildRequires: intltool
 
 Requires(post):   GConf2
 Requires(post):   scrollkeeper >= 0.1.4
@@ -99,6 +100,10 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Sat Aug 26 2006 Karsten Hopp <karsten at redhat.com> - 4.1.10-2.fc6
+- buildrequire intltool which was previously pulled in by scrollkeeper but
+  dropped this requirement because of bz #203606
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.10-1.fc6
 - Update to 4.1.10
 



From fedora-cvs-commits at redhat.com  Sat Aug 26 14:32:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 26 Aug 2006 10:32:42 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org-1.9.115.ooo51931.systemxmlsec.patch, 1.3,
	1.4 openoffice.org.spec, 1.678, 1.679
Message-ID: <200608261432.k7QEWgqK001872@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1857

Modified Files:
	openoffice.org-1.9.115.ooo51931.systemxmlsec.patch 
	openoffice.org.spec 
Log Message:
rh#201213# require 32bit libs on x86_64

openoffice.org-1.9.115.ooo51931.systemxmlsec.patch:
 config_office/configure.in                                    |   22 
 config_office/set_soenv.in                                    |    1 
 openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.cxx | 1836 ++++++++++
 openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.hxx |  238 +
 scp2/source/ooo/file_library_ooo.scp                          |    2 
 scp2/source/ooo/makefile.mk                                   |    4 
 scp2/source/ooo/shortcut_ooo.scp                              |    2 
 source/ooo/file_library_ooo.scp                               |    0 
 source/ooo/makefile.mk                                        |    0 
 source/ooo/shortcut_ooo.scp                                   |    0 
 source/xmlsec/makefile.mk                                     |    0 
 source/xmlsec/nss/makefile.mk                                 |    0 
 source/xmlsec/nss/securityenvironment_nssimpl.cxx             |    0 
 xmlsecurity/source/xmlsec/makefile.mk                         |    5 
 xmlsecurity/source/xmlsec/nss/makefile.mk                     |   10 
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |    4 
 16 files changed, 2122 insertions(+), 2 deletions(-)

Index: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org-1.9.115.ooo51931.systemxmlsec.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.115.ooo51931.systemxmlsec.patch	15 Jul 2005 11:40:03 -0000	1.3
+++ openoffice.org-1.9.115.ooo51931.systemxmlsec.patch	26 Aug 2006 14:32:35 -0000	1.4
@@ -142,7 +142,7 @@
  .ENDIF
  
 +.IF "$(SYSTEM_XMLSEC)" == "YES"
-+PKGCONFIG_MODULES=xmlsec1
++PKGCONFIG_MODULES=xmlsec1-nss
 +.INCLUDE: pkg_config.mk
 +.ENDIF
 +
@@ -161,7 +161,7 @@
  .ENDIF
  
 +.IF "$(SYSTEM_XMLSEC)" == "YES"
-+PKGCONFIG_MODULES=xmlsec1
++PKGCONFIG_MODULES=xmlsec1-nss
 +.INCLUDE: pkg_config.mk
 +CFLAGS+=-DSYSTEM_XMLSEC
 +.ENDIF


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -r1.678 -r1.679
--- openoffice.org.spec	20 Jul 2006 09:48:08 -0000	1.678
+++ openoffice.org.spec	26 Aug 2006 14:32:35 -0000	1.679
@@ -211,6 +211,8 @@
 # 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.
 Requires: libbluecurve.so, libcrux-engine.so
+# rh#201213#
+Requires: libXp.so.6
 Requires: %{libgcj} >= 4.0.0
 %if ! %{internaljavabits}
 Requires: hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2



From fedora-cvs-commits at redhat.com  Sat Aug 26 14:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 26 Aug 2006 10:37:20 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch, 1.10, 1.11
Message-ID: <200608261437.k7QEbKoU001908@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1893

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch 
Log Message:
valgrind memleaks

openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch:
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx  |   18 +-
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx   |   18 +-
 bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx |    8 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx  |    8 -
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx   |    2 
 bridges/source/cpp_uno/shared/vtablefactory.cxx       |  137 +++++++++++-------
 inc/bridges/cpp_uno/shared/vtablefactory.hxx          |    0 
 source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx           |    0 
 source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx         |    0 
 source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx          |    0 
 source/cpp_uno/shared/cppinterfaceproxy.cxx           |    0 
 source/cpp_uno/shared/vtablefactory.cxx               |    0 
 12 files changed, 117 insertions(+), 74 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch	14 Aug 2006 16:11:09 -0000	1.10
+++ openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch	26 Aug 2006 14:37:15 -0000	1.11
@@ -262,7 +262,7 @@
      sal_Size pagesize;
  #if defined SAL_UNX
  #if defined FREEBSD || defined NETBSD
-@@ -79,40 +86,89 @@
+@@ -79,40 +86,91 @@
      GetSystemInfo(&info);
      pagesize = info.dwPageSize;
  #endif
@@ -282,11 +282,13 @@
 -		p = 0;
 -	}
 +    osl::Security aSecurity;
-+    rtl::OUString strDirectory(rtl::OUString::createFromAscii("/tmp"));
++    rtl::OUString strDirectory;
 +    rtl::OUString strURLDirectory;
 +    if (aSecurity.getHomeDir(strURLDirectory))
 +        osl::File::getSystemPathFromFileURL(strURLDirectory, strDirectory);
-+    strDirectory = strDirectory += rtl::OUString::createFromAscii("/.execoooXXXXXX");
++    if (!strDirectory.getLength())
++    	 strDirectory = rtl::OUString::createFromAscii("/tmp");
++    strDirectory += rtl::OUString::createFromAscii("/.execoooXXXXXX");
 +    rtl::OString aTmpName = rtl::OUStringToOString(strDirectory, osl_getThreadTextEncoding());
 +    char *tmpfname = new char[aTmpName.getLength()+1];
 +    strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
@@ -327,7 +329,7 @@
 +    if (ref)
 +    {
 +        (*ref)--;
-+        if (ref == 0)
++        if (*ref == 0)
 +        {
  #if defined SAL_UNX
 -    munmap(static_cast< char * >(address), size);



From fedora-cvs-commits at redhat.com  Sat Aug 26 19:57:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 26 Aug 2006 15:57:05 -0400
Subject: rpms/audit/devel .cvsignore, 1.65, 1.66 audit.spec, 1.107,
	1.108 sources, 1.73, 1.74
Message-ID: <200608261957.k7QJv5h9031053@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31039

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Sat Aug 26 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-1
- Apply updates to dispatcher
- Fix a couple bugs regarding MLS labels
- Resurrect -p option
- Tighten rules with exclude filter
- Fix parsing issue which lead to segfault in some cases
- Fix option parsing to ignore malformed lines



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	13 Jul 2006 20:38:11 -0000	1.65
+++ .cvsignore	26 Aug 2006 19:57:03 -0000	1.66
@@ -62,3 +62,4 @@
 audit-1.2.3.tar.gz
 audit-1.2.4.tar.gz
 audit-1.2.5.tar.gz
+audit-1.2.6.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- audit.spec	18 Aug 2006 20:10:47 -0000	1.107
+++ audit.spec	26 Aug 2006 19:57:03 -0000	1.108
@@ -1,12 +1,11 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.2.5
-Release: 8
+Version: 1.2.6
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
-patch: audit-setroubleshoot.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
@@ -56,7 +55,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .setroubleshoot
 
 %build
 autoreconf -fv --install
@@ -168,6 +166,14 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Sat Aug 26 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-1
+- Apply updates to dispatcher
+- Fix a couple bugs regarding MLS labels
+- Resurrect -p option
+- Tighten rules with exclude filter
+- Fix parsing issue which lead to segfault in some cases
+- Fix option parsing to ignore malformed lines
+
 * Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 1.2.5-8
 - rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
   (#203001)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	13 Jul 2006 20:38:11 -0000	1.73
+++ sources	26 Aug 2006 19:57:03 -0000	1.74
@@ -1 +1 @@
-d5d56d5e3189215dcd37a5eded761d12  audit-1.2.5.tar.gz
+de377351b79b813636b56bce42b0031f  audit-1.2.6.tar.gz



From fedora-cvs-commits at redhat.com  Sun Aug 27 05:03:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 01:03:12 -0400
Subject: rpms/control-center/devel control-center.spec, 1.179,
	1.180 keyboard-drawing-corner.patch, 1.1, 1.2
Message-ID: <200608270503.k7R53Ckr000739@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv726

Modified Files:
	control-center.spec keyboard-drawing-corner.patch 
Log Message:
more keyboard capplet improvements



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- control-center.spec	25 Aug 2006 03:20:34 -0000	1.179
+++ control-center.spec	27 Aug 2006 05:02:57 -0000	1.180
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -293,6 +293,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-4.fc6
+- More keyboard capplet improvements
+
 * Thu Aug 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-3.fc6
 - Various improvements for the keyboard capplet
 

keyboard-drawing-corner.patch:
 keyboard-drawing.c |  326 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 296 insertions(+), 30 deletions(-)

Index: keyboard-drawing-corner.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/keyboard-drawing-corner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keyboard-drawing-corner.patch	25 Aug 2006 02:17:30 -0000	1.1
+++ keyboard-drawing-corner.patch	27 Aug 2006 05:03:04 -0000	1.2
@@ -1,9 +1,274 @@
---- control-center-2.15.92/libkbdraw/keyboard-drawing.c.corner	2006-08-24 22:08:59.000000000 -0400
-+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 22:13:07.000000000 -0400
-@@ -121,6 +121,61 @@
-     g_object_unref (gc);
+--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.corner	2006-08-27 00:37:45.000000000 -0400
++++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-27 00:44:04.000000000 -0400
+@@ -76,6 +76,219 @@
+     cos (M_PI * angle / 1800.0);
  }
  
++static gdouble
++length (gdouble x, gdouble y)
++{
++  return sqrt (x*x + y*y);
++}
++
++static gdouble
++point_line_distance (gdouble ax, gdouble ay,
++		     gdouble nx, gdouble ny)
++{
++  return ax * nx + ay * ny;
++}
++
++static void
++normal_form (gdouble ax, gdouble ay,
++	     gdouble bx, gdouble by,
++	     gdouble *nx, gdouble *ny, gdouble *d)
++{
++  gdouble l;
++
++  *nx = by - ay;
++  *ny = ax - bx;
++
++  l = length (*nx, *ny);
++
++  *nx /= l;
++  *ny /= l;
++
++  *d = point_line_distance (ax, ay, *nx, *ny);
++}
++
++static void
++inverse (gdouble a, gdouble b, gdouble c, gdouble d,
++	 gdouble *e, gdouble *f, gdouble *g, gdouble *h)
++{
++  gdouble det;
++
++  det = a*d - b*c;
++
++  *e =  d / det;
++  *f = -b / det;
++  *g = -c / det;
++  *h =  a / det; 
++}
++
++static void
++multiply (gdouble a, gdouble b, gdouble c, gdouble d,
++	  gdouble e, gdouble f, 
++	  gdouble *x, gdouble *y)
++{
++  *x = a*e + b*f;
++  *y = c*e + d*f;
++}
++
++static void
++intersect (gdouble n1x, gdouble n1y, gdouble d1, 
++	   gdouble n2x, gdouble n2y, gdouble d2, 
++	   gdouble *x, gdouble *y)
++{
++  gdouble e, f, g, h;
++
++  inverse (n1x, n1y, n2x, n2y, &e, &f, &g, &h);
++  multiply (e, f, g, h, d1, d2, x, y);
++}
++
++
++/* draw an angle from the current point to b and then to c,
++ * with a rounded corner of the given radius.
++ */
++static void 
++rounded_corner (cairo_t *cr, 
++		gdouble bx, gdouble by, 
++		gdouble cx, gdouble cy,
++		gdouble radius)
++{
++  gdouble ax, ay;
++  gdouble n1x, n1y, d1;
++  gdouble n2x, n2y, d2;
++  gdouble pd1, pd2;
++  gdouble ix, iy;
++  gdouble dist1, dist2;
++  gdouble nx, ny, d;
++  gdouble a1x, a1y, c1x, c1y;
++  gdouble phi1, phi2;
++
++  cairo_get_current_point (cr, &ax, &ay);
++
++  /* make sure radius is not too large */
++  dist1 = length (bx - ax, by - ay);
++  dist2 = length (cx - bx, cy - by);
++  
++  radius = MIN (radius, MIN (dist1, dist2));
++
++  /* construct normal forms of the lines */
++  normal_form (ax, ay, bx, by, &n1x, &n1y, &d1);
++  normal_form (bx, by, cx, cy, &n2x, &n2y, &d2);
++
++  /* find which side of the line a,b the point c is on */
++  if (point_line_distance (cx, cy, n1x, n1y) < d1)
++    pd1 = d1 - radius;
++  else
++    pd1 = d1 + radius;
++
++  /* find which side of the line b,c the point a is on */
++  if (point_line_distance (ax, ay, n2x, n2y) < d2)
++    pd2 = d2 - radius;
++  else
++    pd2 = d2 + radius;
++						
++  /* intersect the parallels to find the center of the arc */
++  intersect (n1x, n1y, pd1, n2x, n2y, pd2, &ix, &iy); 
++
++  nx = (bx - ax) / dist1;
++  ny = (by - ay) / dist1;
++  d = point_line_distance (ix, iy, nx, ny);
++
++  /* a1 is the point on the line a-b where the arc starts */
++  intersect (n1x, n1y, d1, nx, ny, d, &a1x, &a1y);
++
++  nx = (cx - bx) / dist2;
++  ny = (cy - by) / dist2;
++  d = point_line_distance (ix, iy, nx, ny);
++
++  /* c1 is the point on the line b-c where the arc ends */
++  intersect (n2x, n2y, d2, nx, ny, d, &c1x, &c1y);
++
++  /* determine the first angle */
++  if (a1x - ix == 0)
++    phi1 = (a1y - iy > 0) ? M_PI_2 : 3*M_PI_2;
++  else if (a1x - ix > 0)
++    phi1 = atan ((a1y - iy)/(a1x - ix));
++  else 
++    phi1 = M_PI + atan ((a1y - iy)/(a1x - ix));
++
++  /* determine the second angle */
++  if (c1x - ix == 0)
++    phi2 = (c1y - iy > 0) ? M_PI_2 : 3*M_PI_2;
++  else if (c1x - ix > 0)
++    phi2 = atan ((c1y - iy)/(c1x - ix));
++  else 
++    phi2 = M_PI + atan ((c1y - iy)/(c1x - ix));
++
++  /* compute the difference between phi2 and phi1 mod 2pi */
++  d = phi2 - phi1;
++  while (d < 0)
++    d += 2*M_PI;
++  while (d > 2*M_PI)
++    d -= 2*M_PI;
++
++  cairo_line_to (cr, a1x, a1y);
++
++  /* pick the short arc from phi1 to phi2 */
++  if (d < M_PI)
++    cairo_arc (cr, ix, iy, radius, phi1, phi2);
++  else
++    cairo_arc_negative (cr, ix, iy, radius, phi1, phi2);
++
++  cairo_line_to (cr, cx, cy);
++}
++
++static void
++draw (cairo_t *cr,
++      gint     width,
++      gint     height)
++{
++  gdouble x0 = 100;
++  gdouble y0 = 100;
++  gdouble x1 = 200;
++  gdouble y1 = 100;
++  gdouble x2 = 180;
++  gdouble y2 = 200;
++  gdouble x3 = 240;
++  gdouble y3 = 190;
++
++  gdouble radius = 20;
++
++  cairo_move_to (cr, x0, y0);
++
++  rounded_corner (cr, x1, y1, (x1+x2)/2, (y1+y2)/2, radius);
++  rounded_corner (cr, x2, y2, x3, y3, radius);
++
++  cairo_stroke (cr);
++}
++
++static void 
++rounded_polygon (cairo_t  *cr, 
++		 gboolean  filled,
++		 gdouble   radius,
++		 GdkPoint *points,
++		 gint      num_points)
++{
++  gint i, j;
++
++  cairo_move_to (cr, 
++		 (gdouble)(points[num_points - 1].x + points[0].x)/2, 
++		 (gdouble)(points[num_points - 1].y + points[0].y)/2); 
++ 
++ for (i = 0; i < num_points; i++)
++   {
++     j = (i + 1) % num_points; 
++     rounded_corner (cr, (gdouble)points[i].x, (gdouble)points[i].y, 
++		     (gdouble)(points[i].x + points[j].x)/2, 
++		     (gdouble)(points[i].y + points[j].y)/2,
++		     radius);
++   };
++ cairo_close_path (cr);
++ 
++ if (filled)
++   cairo_fill (cr);
++ else
++  cairo_stroke (cr);
++}
++
+ static void
+ draw_polygon (
+   KeyboardDrawing * drawing,
+@@ -83,10 +296,11 @@
+   gint xkb_x,
+   gint xkb_y,
+   XkbPointRec * xkb_points,
+-  guint num_points)
++  guint num_points,
++  gdouble radius)
+ {
+   GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
+-  GdkGC *gc;
++  cairo_t *cr;
+   GdkPoint *points;
+   gboolean filled;
+   gint i;
+@@ -95,17 +309,16 @@
+     return;
+ 
+   if (fill_color)
+-    {
+-      gc = gdk_gc_new (GTK_WIDGET (drawing)->window);
+-      gdk_gc_set_rgb_fg_color (gc, fill_color);
+-      filled = TRUE;
+-    }
++    filled = TRUE;
+   else
+     {
+-      gc = GTK_WIDGET (drawing)->style->dark_gc[state];
++      fill_color = &GTK_WIDGET (drawing)->style->dark[state];
+       filled = FALSE;
+     }
+ 
++  cr = gdk_cairo_create (GDK_DRAWABLE (drawing->pixmap));
++  gdk_cairo_set_source_color (cr, fill_color);
++
+   points = g_new (GdkPoint, num_points);
+ 
+   for (i = 0; i < num_points; i++)
+@@ -114,11 +327,64 @@
+       points[i].y = xkb_to_pixmap_coord (drawing, xkb_y + xkb_points[i].y);
+     }
+ 
+-  gdk_draw_polygon (drawing->pixmap, gc, filled, points, num_points);
++  rounded_polygon (cr, filled, radius, points, num_points);
+ 
+   g_free (points);
+-  if (fill_color)
+-    g_object_unref (gc);
++}
++
 +static void
 +curve_rectangle (cairo_t *cr,
 +		 gdouble  x0,
@@ -57,12 +322,10 @@
 +    cairo_stroke (cr);
 +  
 +  cairo_destroy (cr);
-+}
-+
+ }
+ 
  /* x, y, width, height are in the xkb coordinate system */
- static void
- draw_rectangle (
-@@ -130,7 +185,8 @@
+@@ -130,7 +396,8 @@
    gint xkb_x,
    gint xkb_y,
    gint xkb_width,
@@ -72,7 +335,7 @@
  {
    if (drawing->pixmap == NULL)
      return;
-@@ -140,17 +196,12 @@
+@@ -140,17 +407,12 @@
        GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
        gint x, y, width, height;
        gboolean filled;
@@ -92,7 +355,7 @@
            filled = FALSE;
          }
  
-@@ -159,10 +210,8 @@
+@@ -159,10 +421,8 @@
        width = xkb_to_pixmap_coord (drawing, xkb_x + xkb_width) - x;
        height = xkb_to_pixmap_coord (drawing, xkb_y + xkb_height) - y;
  
@@ -105,7 +368,16 @@
      }
    else
      {
-@@ -203,7 +252,8 @@
+@@ -182,7 +442,7 @@
+       points[3].x = x; points[3].y = y;
+ 
+       /* the points we've calculated are relative to 0,0 */
+-      draw_polygon (drawing, fill_color, 0, 0, points, 4);
++      draw_polygon (drawing, fill_color, 0, 0, points, 4, radius);
+     }
+ }
+ 
+@@ -203,7 +463,8 @@
      {
        if (color)
          draw_rectangle (drawing, color, angle, origin_x, origin_y,
@@ -115,7 +387,7 @@
  
  #ifdef KBDRAW_DEBUG
        printf("points:%p\n", outline->points);
-@@ -211,7 +261,8 @@
+@@ -211,7 +472,8 @@
  #endif
  
        draw_rectangle (drawing, NULL, angle, origin_x, origin_y,
@@ -125,18 +397,31 @@
      }
    else if (outline->num_points == 2)
      {
-@@ -223,10 +274,12 @@
+@@ -223,19 +485,23 @@
                           angle, &rotated_x0, &rotated_y0);
        if (color)
          draw_rectangle (drawing, color, angle, rotated_x0, rotated_y0,
 -                        outline->points[1].x, outline->points[1].y);
-+                        outline->points[1].x, outline->points[1].y,
++                        outline->points[1].x - outline->points[0].x, 
++			outline->points[1].y - outline->points[0].y,
 +			outline->corner_radius);
  
        draw_rectangle (drawing, NULL, angle, rotated_x0, rotated_y0,
 -                      outline->points[1].x, outline->points[1].y);
-+                      outline->points[1].x, outline->points[1].y,
++		      outline->points[1].x - outline->points[0].x, 
++		      outline->points[1].y - outline->points[0].y,
 +		      outline->corner_radius);
      }
    else
      {
+       if (color)
+         draw_polygon (drawing, color, origin_x, origin_y, outline->points,
+-                      outline->num_points);
++                      outline->num_points, outline->corner_radius);
+ 
+       draw_polygon (drawing, NULL, origin_x, origin_y, outline->points,
+-                    outline->num_points);
++                    outline->num_points, outline->corner_radius);
+     }
+ }
+ 



From fedora-cvs-commits at redhat.com  Sun Aug 27 05:06:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 01:06:41 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec, 1.172,
	1.173 keyboard-drawing-corner.patch, 1.1, 1.2
Message-ID: <200608270506.k7R56fnP000836@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv820

Modified Files:
	gnome-applets.spec keyboard-drawing-corner.patch 
Log Message:
more keyboard drawing improvements



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- gnome-applets.spec	25 Aug 2006 03:20:15 -0000	1.172
+++ gnome-applets.spec	27 Aug 2006 05:06:37 -0000	1.173
@@ -32,7 +32,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.90
-Release:  	2%{?dist}
+Release:  	3%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -307,6 +307,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-3.fc6
+- More keyboard drawing improvements
+
 * Thu Aug 24 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-2.fc6
 - Various improvements for the keyboard applet
  

keyboard-drawing-corner.patch:
 keyboard-drawing.c |  326 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 296 insertions(+), 30 deletions(-)

Index: keyboard-drawing-corner.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/keyboard-drawing-corner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keyboard-drawing-corner.patch	25 Aug 2006 02:51:35 -0000	1.1
+++ keyboard-drawing-corner.patch	27 Aug 2006 05:06:37 -0000	1.2
@@ -1,9 +1,274 @@
---- control-center-2.15.92/libkbdraw/keyboard-drawing.c.corner	2006-08-24 22:08:59.000000000 -0400
-+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-24 22:13:07.000000000 -0400
-@@ -121,6 +121,61 @@
-     g_object_unref (gc);
+--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.corner	2006-08-27 00:37:45.000000000 -0400
++++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-27 00:44:04.000000000 -0400
+@@ -76,6 +76,219 @@
+     cos (M_PI * angle / 1800.0);
  }
  
++static gdouble
++length (gdouble x, gdouble y)
++{
++  return sqrt (x*x + y*y);
++}
++
++static gdouble
++point_line_distance (gdouble ax, gdouble ay,
++		     gdouble nx, gdouble ny)
++{
++  return ax * nx + ay * ny;
++}
++
++static void
++normal_form (gdouble ax, gdouble ay,
++	     gdouble bx, gdouble by,
++	     gdouble *nx, gdouble *ny, gdouble *d)
++{
++  gdouble l;
++
++  *nx = by - ay;
++  *ny = ax - bx;
++
++  l = length (*nx, *ny);
++
++  *nx /= l;
++  *ny /= l;
++
++  *d = point_line_distance (ax, ay, *nx, *ny);
++}
++
++static void
++inverse (gdouble a, gdouble b, gdouble c, gdouble d,
++	 gdouble *e, gdouble *f, gdouble *g, gdouble *h)
++{
++  gdouble det;
++
++  det = a*d - b*c;
++
++  *e =  d / det;
++  *f = -b / det;
++  *g = -c / det;
++  *h =  a / det; 
++}
++
++static void
++multiply (gdouble a, gdouble b, gdouble c, gdouble d,
++	  gdouble e, gdouble f, 
++	  gdouble *x, gdouble *y)
++{
++  *x = a*e + b*f;
++  *y = c*e + d*f;
++}
++
++static void
++intersect (gdouble n1x, gdouble n1y, gdouble d1, 
++	   gdouble n2x, gdouble n2y, gdouble d2, 
++	   gdouble *x, gdouble *y)
++{
++  gdouble e, f, g, h;
++
++  inverse (n1x, n1y, n2x, n2y, &e, &f, &g, &h);
++  multiply (e, f, g, h, d1, d2, x, y);
++}
++
++
++/* draw an angle from the current point to b and then to c,
++ * with a rounded corner of the given radius.
++ */
++static void 
++rounded_corner (cairo_t *cr, 
++		gdouble bx, gdouble by, 
++		gdouble cx, gdouble cy,
++		gdouble radius)
++{
++  gdouble ax, ay;
++  gdouble n1x, n1y, d1;
++  gdouble n2x, n2y, d2;
++  gdouble pd1, pd2;
++  gdouble ix, iy;
++  gdouble dist1, dist2;
++  gdouble nx, ny, d;
++  gdouble a1x, a1y, c1x, c1y;
++  gdouble phi1, phi2;
++
++  cairo_get_current_point (cr, &ax, &ay);
++
++  /* make sure radius is not too large */
++  dist1 = length (bx - ax, by - ay);
++  dist2 = length (cx - bx, cy - by);
++  
++  radius = MIN (radius, MIN (dist1, dist2));
++
++  /* construct normal forms of the lines */
++  normal_form (ax, ay, bx, by, &n1x, &n1y, &d1);
++  normal_form (bx, by, cx, cy, &n2x, &n2y, &d2);
++
++  /* find which side of the line a,b the point c is on */
++  if (point_line_distance (cx, cy, n1x, n1y) < d1)
++    pd1 = d1 - radius;
++  else
++    pd1 = d1 + radius;
++
++  /* find which side of the line b,c the point a is on */
++  if (point_line_distance (ax, ay, n2x, n2y) < d2)
++    pd2 = d2 - radius;
++  else
++    pd2 = d2 + radius;
++						
++  /* intersect the parallels to find the center of the arc */
++  intersect (n1x, n1y, pd1, n2x, n2y, pd2, &ix, &iy); 
++
++  nx = (bx - ax) / dist1;
++  ny = (by - ay) / dist1;
++  d = point_line_distance (ix, iy, nx, ny);
++
++  /* a1 is the point on the line a-b where the arc starts */
++  intersect (n1x, n1y, d1, nx, ny, d, &a1x, &a1y);
++
++  nx = (cx - bx) / dist2;
++  ny = (cy - by) / dist2;
++  d = point_line_distance (ix, iy, nx, ny);
++
++  /* c1 is the point on the line b-c where the arc ends */
++  intersect (n2x, n2y, d2, nx, ny, d, &c1x, &c1y);
++
++  /* determine the first angle */
++  if (a1x - ix == 0)
++    phi1 = (a1y - iy > 0) ? M_PI_2 : 3*M_PI_2;
++  else if (a1x - ix > 0)
++    phi1 = atan ((a1y - iy)/(a1x - ix));
++  else 
++    phi1 = M_PI + atan ((a1y - iy)/(a1x - ix));
++
++  /* determine the second angle */
++  if (c1x - ix == 0)
++    phi2 = (c1y - iy > 0) ? M_PI_2 : 3*M_PI_2;
++  else if (c1x - ix > 0)
++    phi2 = atan ((c1y - iy)/(c1x - ix));
++  else 
++    phi2 = M_PI + atan ((c1y - iy)/(c1x - ix));
++
++  /* compute the difference between phi2 and phi1 mod 2pi */
++  d = phi2 - phi1;
++  while (d < 0)
++    d += 2*M_PI;
++  while (d > 2*M_PI)
++    d -= 2*M_PI;
++
++  cairo_line_to (cr, a1x, a1y);
++
++  /* pick the short arc from phi1 to phi2 */
++  if (d < M_PI)
++    cairo_arc (cr, ix, iy, radius, phi1, phi2);
++  else
++    cairo_arc_negative (cr, ix, iy, radius, phi1, phi2);
++
++  cairo_line_to (cr, cx, cy);
++}
++
++static void
++draw (cairo_t *cr,
++      gint     width,
++      gint     height)
++{
++  gdouble x0 = 100;
++  gdouble y0 = 100;
++  gdouble x1 = 200;
++  gdouble y1 = 100;
++  gdouble x2 = 180;
++  gdouble y2 = 200;
++  gdouble x3 = 240;
++  gdouble y3 = 190;
++
++  gdouble radius = 20;
++
++  cairo_move_to (cr, x0, y0);
++
++  rounded_corner (cr, x1, y1, (x1+x2)/2, (y1+y2)/2, radius);
++  rounded_corner (cr, x2, y2, x3, y3, radius);
++
++  cairo_stroke (cr);
++}
++
++static void 
++rounded_polygon (cairo_t  *cr, 
++		 gboolean  filled,
++		 gdouble   radius,
++		 GdkPoint *points,
++		 gint      num_points)
++{
++  gint i, j;
++
++  cairo_move_to (cr, 
++		 (gdouble)(points[num_points - 1].x + points[0].x)/2, 
++		 (gdouble)(points[num_points - 1].y + points[0].y)/2); 
++ 
++ for (i = 0; i < num_points; i++)
++   {
++     j = (i + 1) % num_points; 
++     rounded_corner (cr, (gdouble)points[i].x, (gdouble)points[i].y, 
++		     (gdouble)(points[i].x + points[j].x)/2, 
++		     (gdouble)(points[i].y + points[j].y)/2,
++		     radius);
++   };
++ cairo_close_path (cr);
++ 
++ if (filled)
++   cairo_fill (cr);
++ else
++  cairo_stroke (cr);
++}
++
+ static void
+ draw_polygon (
+   KeyboardDrawing * drawing,
+@@ -83,10 +296,11 @@
+   gint xkb_x,
+   gint xkb_y,
+   XkbPointRec * xkb_points,
+-  guint num_points)
++  guint num_points,
++  gdouble radius)
+ {
+   GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
+-  GdkGC *gc;
++  cairo_t *cr;
+   GdkPoint *points;
+   gboolean filled;
+   gint i;
+@@ -95,17 +309,16 @@
+     return;
+ 
+   if (fill_color)
+-    {
+-      gc = gdk_gc_new (GTK_WIDGET (drawing)->window);
+-      gdk_gc_set_rgb_fg_color (gc, fill_color);
+-      filled = TRUE;
+-    }
++    filled = TRUE;
+   else
+     {
+-      gc = GTK_WIDGET (drawing)->style->dark_gc[state];
++      fill_color = &GTK_WIDGET (drawing)->style->dark[state];
+       filled = FALSE;
+     }
+ 
++  cr = gdk_cairo_create (GDK_DRAWABLE (drawing->pixmap));
++  gdk_cairo_set_source_color (cr, fill_color);
++
+   points = g_new (GdkPoint, num_points);
+ 
+   for (i = 0; i < num_points; i++)
+@@ -114,11 +327,64 @@
+       points[i].y = xkb_to_pixmap_coord (drawing, xkb_y + xkb_points[i].y);
+     }
+ 
+-  gdk_draw_polygon (drawing->pixmap, gc, filled, points, num_points);
++  rounded_polygon (cr, filled, radius, points, num_points);
+ 
+   g_free (points);
+-  if (fill_color)
+-    g_object_unref (gc);
++}
++
 +static void
 +curve_rectangle (cairo_t *cr,
 +		 gdouble  x0,
@@ -57,12 +322,10 @@
 +    cairo_stroke (cr);
 +  
 +  cairo_destroy (cr);
-+}
-+
+ }
+ 
  /* x, y, width, height are in the xkb coordinate system */
- static void
- draw_rectangle (
-@@ -130,7 +185,8 @@
+@@ -130,7 +396,8 @@
    gint xkb_x,
    gint xkb_y,
    gint xkb_width,
@@ -72,7 +335,7 @@
  {
    if (drawing->pixmap == NULL)
      return;
-@@ -140,17 +196,12 @@
+@@ -140,17 +407,12 @@
        GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
        gint x, y, width, height;
        gboolean filled;
@@ -92,7 +355,7 @@
            filled = FALSE;
          }
  
-@@ -159,10 +210,8 @@
+@@ -159,10 +421,8 @@
        width = xkb_to_pixmap_coord (drawing, xkb_x + xkb_width) - x;
        height = xkb_to_pixmap_coord (drawing, xkb_y + xkb_height) - y;
  
@@ -105,7 +368,16 @@
      }
    else
      {
-@@ -203,7 +252,8 @@
+@@ -182,7 +442,7 @@
+       points[3].x = x; points[3].y = y;
+ 
+       /* the points we've calculated are relative to 0,0 */
+-      draw_polygon (drawing, fill_color, 0, 0, points, 4);
++      draw_polygon (drawing, fill_color, 0, 0, points, 4, radius);
+     }
+ }
+ 
+@@ -203,7 +463,8 @@
      {
        if (color)
          draw_rectangle (drawing, color, angle, origin_x, origin_y,
@@ -115,7 +387,7 @@
  
  #ifdef KBDRAW_DEBUG
        printf("points:%p\n", outline->points);
-@@ -211,7 +261,8 @@
+@@ -211,7 +472,8 @@
  #endif
  
        draw_rectangle (drawing, NULL, angle, origin_x, origin_y,
@@ -125,18 +397,31 @@
      }
    else if (outline->num_points == 2)
      {
-@@ -223,10 +274,12 @@
+@@ -223,19 +485,23 @@
                           angle, &rotated_x0, &rotated_y0);
        if (color)
          draw_rectangle (drawing, color, angle, rotated_x0, rotated_y0,
 -                        outline->points[1].x, outline->points[1].y);
-+                        outline->points[1].x, outline->points[1].y,
++                        outline->points[1].x - outline->points[0].x, 
++			outline->points[1].y - outline->points[0].y,
 +			outline->corner_radius);
  
        draw_rectangle (drawing, NULL, angle, rotated_x0, rotated_y0,
 -                      outline->points[1].x, outline->points[1].y);
-+                      outline->points[1].x, outline->points[1].y,
++		      outline->points[1].x - outline->points[0].x, 
++		      outline->points[1].y - outline->points[0].y,
 +		      outline->corner_radius);
      }
    else
      {
+       if (color)
+         draw_polygon (drawing, color, origin_x, origin_y, outline->points,
+-                      outline->num_points);
++                      outline->num_points, outline->corner_radius);
+ 
+       draw_polygon (drawing, NULL, origin_x, origin_y, outline->points,
+-                    outline->num_points);
++                    outline->num_points, outline->corner_radius);
+     }
+ }
+ 



From fedora-cvs-commits at redhat.com  Sun Aug 27 16:37:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 12:37:13 -0400
Subject: rpms/lam/devel lam.spec,1.36,1.37
Message-ID: <200608271637.k7RGbCtB028166@cvs.devel.redhat.com>

Author: dledford

Update of /cvs/dist/rpms/lam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28124

Modified Files:
	lam.spec 
Log Message:
Various tweaks related to existing alongside OpenMPI


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/lam.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- lam.spec	26 Aug 2006 03:32:49 -0000	1.36
+++ lam.spec	27 Aug 2006 16:37:06 -0000	1.37
@@ -122,7 +122,7 @@
 [ ! -z "${RPM_BUILD_ROOT}" ] && rm -rf ${RPM_BUILD_ROOT}
 
 %post
-if [ "$1" -ge 1 ]; then
+if [ "$1" -eq 1 ]; then
 	alternatives --install %{_sysconfdir}/ld.so.conf.d/mpi.conf mpi \
 				%{_libdir}/lam/lam.ld.conf 5 \
 		--slave %{_bindir}/mpirun mpi-run %{_bindir}/lamrun \
@@ -135,14 +135,14 @@
 /sbin/ldconfig
 
 %preun
-if [ "$1" -ge 1 ]; then
+if [ "$1" -eq 0 ]; then
 	alternatives --remove mpi %{_libdir}/lam/lam.ld.conf
 fi
 
 %postun -p /sbin/ldconfig
 
 %post devel
-if [ "$1" -ge 1 ]; then
+if [ "$1" -eq 1 ]; then
 	alternatives --install  %{_bindir}/mpicc mpicc \
 				%{_bindir}/lamcc 5 \
 		--slave %{_bindir}/mpic++ mpic++ %{_bindir}/lamc++ \
@@ -152,7 +152,7 @@
 /sbin/ldconfig
 
 %preun devel
-if [ "$1" -ge 1 ]; then
+if [ "$1" -eq 0 ]; then
 	alternatives --remove mpicc %{_bindir}/lamcc
 fi
 



From fedora-cvs-commits at redhat.com  Sun Aug 27 16:39:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 12:39:09 -0400
Subject: rpms/lam/devel lam.spec,1.37,1.38
Message-ID: <200608271639.k7RGd9sF028697@cvs.devel.redhat.com>

Author: dledford

Update of /cvs/dist/rpms/lam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28667

Modified Files:
	lam.spec 
Log Message:
Fix post/preun script execution


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/lam.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- lam.spec	27 Aug 2006 16:37:06 -0000	1.37
+++ lam.spec	27 Aug 2006 16:39:06 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
 Version: 7.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Epoch: 2
 Group: Development/Libraries
@@ -196,6 +196,10 @@
 %config %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sun Aug 27 2006 Doug Ledford <dledford at redhat.com> - 2:7.1.2-3.fc6
+- Make the %post and %preun only run at the right times (new install and
+  final package removal)
+
 * Fri Aug 25 2006 Doug Ledford <dledford at redhat.com> - 2:7.1.2-2.fc6
 - Get rid of mpi_alternatives and just use alternatives to match openmpi
 



From fedora-cvs-commits at redhat.com  Sun Aug 27 16:53:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 12:53:25 -0400
Subject: rpms/gedit/devel .cvsignore, 1.48, 1.49 gedit.spec, 1.97,
	1.98 sources, 1.50, 1.51
Message-ID: <200608271653.k7RGrPHw015468@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15399

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.15.9



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	21 Aug 2006 20:36:14 -0000	1.48
+++ .cvsignore	27 Aug 2006 16:53:22 -0000	1.49
@@ -1 +1 @@
-gedit-2.15.8.tar.bz2
+gedit-2.15.9.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- gedit.spec	21 Aug 2006 20:36:14 -0000	1.97
+++ gedit.spec	27 Aug 2006 16:53:22 -0000	1.98
@@ -16,7 +16,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.15.8
+Version: 	2.15.9
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPL
@@ -185,6 +185,9 @@
 %{_datadir}/gtk-doc/html/gedit/
 
 %changelog
+* Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.9-1.fc6
+- Update to 2.15.9
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.8-1.fc6
 - Update to 2.15.8
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	21 Aug 2006 20:36:14 -0000	1.50
+++ sources	27 Aug 2006 16:53:22 -0000	1.51
@@ -1 +1 @@
-8129d97e9f9246cc91d93b2232459e12  gedit-2.15.8.tar.bz2
+a53bd0305bbac5c5e9d6c7896687ed47  gedit-2.15.9.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Aug 27 16:59:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 12:59:09 -0400
Subject: rpms/gedit/devel gedit.spec,1.98,1.99
Message-ID: <200608271659.k7RGx9tZ011858@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4008

Modified Files:
	gedit.spec 
Log Message:
fix build reqs



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gedit.spec	27 Aug 2006 16:53:22 -0000	1.98
+++ gedit.spec	27 Aug 2006 16:59:06 -0000	1.99
@@ -67,6 +67,7 @@
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: which
 BuildRequires: autoconf, automake, libtool
+BuildRequires: perl-XML-Parser
 
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: libgnomeprintui22 >= %{libgnomeprintui_version}
@@ -187,6 +188,7 @@
 %changelog
 * Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.9-1.fc6
 - Update to 2.15.9
+- Add BR for perl-XML-Parser
 
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.8-1.fc6
 - Update to 2.15.8



From fedora-cvs-commits at redhat.com  Sun Aug 27 21:40:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 17:40:53 -0400
Subject: rpms/gnome-applets/FC-5 gnome-applets-2.14.3-cpufreq.patch, NONE,
	1.1 gnome-applets.spec, 1.136, 1.137
Message-ID: <200608272140.k7RLerQ6026214@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26118

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.14.3-cpufreq.patch 
Log Message:
fix cpufreq applet


gnome-applets-2.14.3-cpufreq.patch:
 cpufreq-applet.c |   19 +------------------
 cpufreq-popup.c  |   18 ++----------------
 2 files changed, 3 insertions(+), 34 deletions(-)

--- NEW FILE gnome-applets-2.14.3-cpufreq.patch ---
--- gnome-applets-2.14.3/cpufreq/src/cpufreq-applet.c.cpufreq	2006-08-27 17:38:46.000000000 -0400
+++ gnome-applets-2.14.3/cpufreq/src/cpufreq-applet.c	2006-08-27 17:40:24.000000000 -0400
@@ -265,31 +265,14 @@
 gboolean
 cpufreq_applet_selector_is_available (void)
 {
-	struct stat *info;
         gchar       *path = NULL;
 
         path = g_find_program_in_path ("cpufreq-selector");
         if (!path)
                 return FALSE;
-
-        if (geteuid () == 0)
-                return TRUE;
-
-        info = (struct stat *) g_malloc (sizeof (struct stat));
-
-        if ((lstat (path, info)) != -1) {
-                if ((info->st_mode & S_ISUID) && (info->st_uid == 0)) {
-                        g_free (info);
-                        g_free (path);
-                                    
-                        return TRUE;
-                }
-        }
-
-        g_free (info);
         g_free (path);
 
-        return FALSE;
+        return TRUE;
 }
 
 static void
--- gnome-applets-2.14.3/cpufreq/src/cpufreq-popup.c.cpufreq	2006-08-27 17:36:36.000000000 -0400
+++ gnome-applets-2.14.3/cpufreq/src/cpufreq-popup.c	2006-08-27 17:38:34.000000000 -0400
@@ -123,7 +123,6 @@
 cpufreq_popup_set_frequency (GtkWidget *widget, gpointer gdata)
 {
         gint   freq, cpu;
-        gchar *path = NULL;
         gchar *command;
         cpufreq_t *cf;
         
@@ -131,17 +130,11 @@
         freq = cf->freq;
         cpu = cf->cpu;
 
-        path = g_find_program_in_path ("cpufreq-selector");
-
-        if (!path)
-                return;
-           
-        command = g_strdup_printf ("%s -f %d -c %d", path, freq, cpu);
+        command = g_strdup_printf ("/usr/bin/cpufreq-selector -f %d -c %d", freq, cpu);
 
         g_spawn_command_line_async (command, NULL); /* TODO: error */
 
         g_free (command);
-        g_free (path);
 }
 
 static void
@@ -149,7 +142,6 @@
 {
 	gint cpu;
 	gchar *governor;
-	gchar *path = NULL;
 	gchar *command;
 	cpugov_t *cg;
         
@@ -157,17 +149,11 @@
 	governor = cg->gov;
 	cpu = cg->cpu;
 
-	path = g_find_program_in_path ("cpufreq-selector");
-
-	if (!path)
-		return;
-
-	command = g_strdup_printf ("%s -g %s -c %d", path, governor, cpu);
+	command = g_strdup_printf ("/usr/bin/cpufreq-selector -g %s -c %d", governor, cpu);
 
 	g_spawn_command_line_async (command, NULL); /* TODO: error */
 
 	g_free (command);
-	g_free (path);
 }
 
 static void


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-5/gnome-applets.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- gnome-applets.spec	2 Aug 2006 15:11:33 -0000	1.136
+++ gnome-applets.spec	27 Aug 2006 21:40:51 -0000	1.137
@@ -27,7 +27,7 @@
 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.14.2-cpufreq.patch
+Patch4:		gnome-applets-2.14.3-cpufreq.patch
 Patch5:	        gnome-applets-2.13.4-warning.patch
 Patch6:	        gnome-applets-2.13.90-stock-ticker.patch
 Patch9:	        gnome-applets-2.14.0-gswitchit-export-dynamic.patch



From fedora-cvs-commits at redhat.com  Sun Aug 27 21:43:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 17:43:02 -0400
Subject: rpms/gnome-applets/FC-5 gnome-applets.spec,1.137,1.138
Message-ID: <200608272143.k7RLh2x6027063@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26952

Modified Files:
	gnome-applets.spec 
Log Message:
fix cpu frequency selection



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-5/gnome-applets.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gnome-applets.spec	27 Aug 2006 21:40:51 -0000	1.137
+++ gnome-applets.spec	27 Aug 2006 21:42:59 -0000	1.138
@@ -18,7 +18,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.14.3
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -201,6 +201,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-2.fc5
+- Fix cpu frequency selection (#196554)
+
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
 - Update to 2.14.3
 



From fedora-cvs-commits at redhat.com  Sun Aug 27 21:51:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 17:51:54 -0400
Subject: rpms/kernel/devel linux-2.6-videodev-v4l1.patch, NONE,
	1.1 kernel-2.6.spec, 1.2593, 1.2594
Message-ID: <200608272151.k7RLpsKm012866@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12831

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-videodev-v4l1.patch 
Log Message:
fix videodev.h header for userspace

linux-2.6-videodev-v4l1.patch:
 videodev.h |    5 -----
 1 files changed, 5 deletions(-)

--- NEW FILE linux-2.6-videodev-v4l1.patch ---
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 518c7a3..412c811 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -14,9 +14,6 @@ #define __LINUX_VIDEODEV_H
 
 #include <linux/videodev2.h>
 
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-#define HAVE_V4L1 1
-
 struct video_capability
 {
 	char name[32];
@@ -337,8 +334,6 @@ #define VID_HARDWARE_SAA7114H   37
 #define VID_HARDWARE_SN9C102	38
 #define VID_HARDWARE_ARV	39
 
-#endif /* CONFIG_VIDEO_V4L1_COMPAT */
-
 #endif /* __LINUX_VIDEODEV_H */
 
 /*


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2593
retrieving revision 1.2594
diff -u -r1.2593 -r1.2594
--- kernel-2.6.spec	25 Aug 2006 21:32:17 -0000	1.2593
+++ kernel-2.6.spec	27 Aug 2006 21:51:51 -0000	1.2594
@@ -452,6 +452,7 @@
 Patch1780: linux-2.6-ehea-ethernet-driver.patch
 Patch1790: linux-2.6-drivers-add-qlogic-firmware.patch
 Patch1791: linux-2.6-libertas.diff
+Patch1792: linux-2.6-videodev-v4l1.patch
 
 # SELinux/audit patches.
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
@@ -1009,6 +1010,9 @@
 %patch1791 -p1
 %endif
 
+# Fix <linux/videodev.h> to include V4L1 stuff
+%patch1792 -p1
+
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1
 # Add support for SELinux range transitions
@@ -1800,6 +1804,9 @@
 %endif
 
 %changelog
+* Sun Aug 27 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix V4L1 stuff in <linux/videodev.h> (#204225)
+
 * Fri Aug 25 2006 Juan Quintela <quintela at redhat.com>
 - update xen HV to xen-unstable cset 11251.
 - fix ia64 xen HV compilation.



From fedora-cvs-commits at redhat.com  Sun Aug 27 22:29:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 18:29:43 -0400
Subject: rpms/gnome-power-manager/devel
	gnome-power-manager-2.15.92-mnemonics.patch, NONE,
	1.1 gnome-power-manager.spec, 1.61, 1.62
Message-ID: <200608272229.k7RMThX6006611@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6522

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.15.92-mnemonics.patch 
Log Message:
wire up gnome-power-preferences


gnome-power-manager-2.15.92-mnemonics.patch:
 gpm-prefs.glade |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE gnome-power-manager-2.15.92-mnemonics.patch ---
--- gnome-power-manager-2.15.92/data/gpm-prefs.glade.mnemonics	2006-08-27 18:27:47.000000000 -0400
+++ gnome-power-manager-2.15.92/data/gpm-prefs.glade	2006-08-27 18:27:53.000000000 -0400
@@ -291,6 +291,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">hscale_ac_brightness</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -415,6 +416,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">combobox_ac_lid_close</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -592,6 +594,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">hscale_battery_display</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -648,6 +651,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">hscale_battery_computer</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -769,6 +773,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">hscale_battery_brightness</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -893,6 +898,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">combobox_battery_lid_close</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -1349,6 +1355,7 @@
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
+				      <property name="mnemonic_widget">combobox_power_button</property>
 				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				      <property name="width_chars">-1</property>
 				      <property name="single_line_mode">False</property>


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gnome-power-manager.spec	21 Aug 2006 02:59:44 -0000	1.61
+++ gnome-power-manager.spec	27 Aug 2006 22:29:40 -0000	1.62
@@ -5,11 +5,12 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.15.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
 Patch0: gnome-power-manager-2.15.4-nodefaultbeep.patch
+Patch1: gnome-power-manager-2.15.92-mnemonics.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -42,6 +43,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nodefaultbeep
+%patch1 -p1 -b .mnemonics
 
 %build
 %configure \
@@ -109,7 +111,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
-* Sun Aug 20 2006 Matthias Clasen <mclasne at redhat.com> - 2.15.92-1.fc6
+* Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-2.fc6
+- Wire up preferences in gnome-power-preferences (#203949)
+
+* Sun Aug 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92
 
 * Tue Aug 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.91-2.fc6



From fedora-cvs-commits at redhat.com  Sun Aug 27 22:43:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 18:43:42 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.62,1.63
Message-ID: <200608272243.k7RMhgGe009857@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9760

Modified Files:
	gnome-power-manager.spec 
Log Message:
fix build reqs



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gnome-power-manager.spec	27 Aug 2006 22:29:40 -0000	1.62
+++ gnome-power-manager.spec	27 Aug 2006 22:43:29 -0000	1.63
@@ -25,6 +25,7 @@
 BuildRequires: gettext
 BuildRequires: libtool
 BuildRequires: cairo-devel
+BuildRequires: perl-XML-Parser
 Requires: gnome-icon-theme
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
@@ -113,6 +114,7 @@
 %changelog
 * Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-2.fc6
 - Wire up preferences in gnome-power-preferences (#203949)
+- Add BR for perl-XML-Parser
 
 * Sun Aug 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92



From fedora-cvs-commits at redhat.com  Mon Aug 28 01:12:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 21:12:19 -0400
Subject: rpms/pygobject2/devel pygobject-2.11.4-docs.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 pygobject2.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <200608280112.k7S1CJck008064@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygobject2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8008

Modified Files:
	.cvsignore pygobject2.spec sources 
Added Files:
	pygobject-2.11.4-docs.patch 
Log Message:
2.11.4


pygobject-2.11.4-docs.patch:
 Makefile.in |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

--- NEW FILE pygobject-2.11.4-docs.patch ---
--- pygobject-2.11.4/docs/Makefile.in.docs	2006-08-27 21:07:01.000000000 -0400
+++ pygobject-2.11.4/docs/Makefile.in	2006-08-27 21:09:17.000000000 -0400
@@ -177,22 +177,21 @@
 FULL_VERSION = $(REF_VERSION).$(PYGOBJECT_MICRO_VERSION)
 BUILDDIR = $(top_builddir)/docs
 CSS_FILES = style.css
- at ENABLE_DOCS_FALSE@HTML_FILES = 
- at ENABLE_DOCS_TRUE@HTML_FILES = \
- at ENABLE_DOCS_TRUE@	html/class-gobjectgboxed.html		\
- at ENABLE_DOCS_TRUE@	html/class-gobjectginterface.html	\
- at ENABLE_DOCS_TRUE@	html/class-gobjectgpointer.html		\
- at ENABLE_DOCS_TRUE@	html/class-gobject.html			\
- at ENABLE_DOCS_TRUE@	html/class-gobjectmaincontext.html	\
- at ENABLE_DOCS_TRUE@	html/class-gobjectmainloop.html		\
- at ENABLE_DOCS_TRUE@	html/gobject-class-reference.html	\
- at ENABLE_DOCS_TRUE@	html/gobject-constants.html		\
- at ENABLE_DOCS_TRUE@	html/gobject-functions.html		\
- at ENABLE_DOCS_TRUE@	html/index.html				\
- at ENABLE_DOCS_TRUE@	html/index.sgml				\
- at ENABLE_DOCS_TRUE@	html/pygobject.devhelp			\
- at ENABLE_DOCS_TRUE@	html/pygobject-introduction.html	\
- at ENABLE_DOCS_TRUE@	html/pygobject-reference-copyright.html
+HTML_FILES = \
+	html/class-gobjectgboxed.html		\
+	html/class-gobjectginterface.html	\
+	html/class-gobjectgpointer.html		\
+	html/class-gobject.html			\
+	html/class-gobjectmaincontext.html	\
+	html/class-gobjectmainloop.html		\
+	html/gobject-class-reference.html	\
+	html/gobject-constants.html		\
+	html/gobject-functions.html		\
+	html/index.html				\
+	html/index.sgml				\
+	html/pygobject.devhelp			\
+	html/pygobject-introduction.html	\
+	html/pygobject-reference-copyright.html
 
 XML_FILES = \
 	reference/pygobject.xml			\


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Aug 2006 19:45:08 -0000	1.5
+++ .cvsignore	28 Aug 2006 01:12:16 -0000	1.6
@@ -1 +1 @@
-pygobject-2.11.3.tar.bz2
+pygobject-2.11.4.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pygobject2.spec	21 Aug 2006 19:45:08 -0000	1.11
+++ pygobject2.spec	28 Aug 2006 01:12:16 -0000	1.12
@@ -3,12 +3,13 @@
 
 Summary: Python bindings for gobjects
 Name: pygobject2
-Version: 2.11.3
+Version: 2.11.4
 Release: 1%{?dist}
 License: LGPL
 Group: Development/Languages
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.10/
 Source: pygobject-%{version}.tar.bz2
+Patch0: pygobject-2.11.4-docs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: glib2 >= 2.8
 Requires: python2 >= 2.3.5
@@ -17,8 +18,6 @@
 # needed for automake/autoconf to work right with multilib python
 Buildrequires: automake >= 1.6.3-5
 Buildrequires: libtool
-Buildrequires: libxslt
-Buildrequires: docbook-style-xsl
 
 %description
 Pygobjects is an extension module for python that gives you access to GLib's 
@@ -35,9 +34,10 @@
 
 %prep
 %setup -q -n pygobject-%{version}
+%patch0 -p1 -b .docs
 
 %build
-%configure --enable-thread
+%configure --enable-thread --disable-docs
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool
 
@@ -73,6 +73,10 @@
 %{_datadir}/pygobject
 
 %changelog
+* Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.4-1.fc6
+- Update to 2.11.4
+- Use pre-built docs
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.3-1.fc6
 - Update to 2.11.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Aug 2006 19:45:08 -0000	1.5
+++ sources	28 Aug 2006 01:12:16 -0000	1.6
@@ -1 +1 @@
-31e4da79d27d7941c36ea549acce8da6  pygobject-2.11.3.tar.bz2
+6c8e1edb1def6ad551ba4ad6a7d4858d  pygobject-2.11.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 28 03:08:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 23:08:00 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.127, 1.128 kudzu.spec, 1.145,
	1.146 sources, 1.143, 1.144
Message-ID: <200608280308.k7S380N5014928@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14909

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- .cvsignore	25 Aug 2006 17:41:34 -0000	1.127
+++ .cvsignore	28 Aug 2006 03:07:52 -0000	1.128
@@ -1 +1 @@
-kudzu-1.2.47.tar.gz
+kudzu-1.2.48.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- kudzu.spec	25 Aug 2006 17:41:34 -0000	1.145
+++ kudzu.spec	28 Aug 2006 03:07:56 -0000	1.146
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.47
+Version: 1.2.48
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -74,6 +74,11 @@
 %{_includedir}/kudzu
 
 %changelog
+* Sun Aug 27 2006 Bill Nottingham <notting at redhat.com> - 1.2.48-1
+- remove socket code, no longer used (and a bad hack to begin with)
+- fix xenfb probe
+- various cleanups
+
 * Fri Aug 25 2006 Jeremy Katz <katzj at redhat.com> - 1.2.47-1
 - Fix the Xen console stuff to work properly with the PV framebuffer too
 - Add support for probing xenfb as a video device


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- sources	25 Aug 2006 17:41:34 -0000	1.143
+++ sources	28 Aug 2006 03:07:57 -0000	1.144
@@ -1 +1 @@
-cc2f287012a0bf3a2d12da2c39283f0e  kudzu-1.2.47.tar.gz
+8c8d068604d56948b774667b360ab90e  kudzu-1.2.48.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 28 03:13:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 23:13:22 -0400
Subject: rpms/glib2/devel glib-2.12.2-monotonic-timer.patch, NONE,
	1.1 glib2.spec, 1.105, 1.106
Message-ID: <200608280313.k7S3DMUk016476@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16387

Modified Files:
	glib2.spec 
Added Files:
	glib-2.12.2-monotonic-timer.patch 
Log Message:
use monotonic timers


glib-2.12.2-monotonic-timer.patch:
 configure.in  |    6 +++
 glib/gtimer.c |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 102 insertions(+), 13 deletions(-)

--- NEW FILE glib-2.12.2-monotonic-timer.patch ---
--- glib-2.12.2/configure.in.monotonic-timer	2006-08-27 23:09:08.000000000 -0400
+++ glib-2.12.2/configure.in	2006-08-27 23:10:20.000000000 -0400
@@ -856,6 +856,12 @@
 
 # Check for some functions
 AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd nanosleep vasprintf setenv unsetenv getc_unlocked readlink symlink)
+AC_CHECK_FUNCS(clock_gettime, [], [
+  AC_CHECK_LIB(rt, clock_gettime, [
+    AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
+    LIBS="$LIBS -lrt"
+  ])
+])
 
 AC_CHECK_HEADERS(crt_externs.h)
 AC_CHECK_FUNCS(_NSGetEnviron)
--- glib-2.12.2/glib/gtimer.c.monotonic-timer	2006-08-27 23:09:20.000000000 -0400
+++ glib-2.12.2/glib/gtimer.c	2006-08-27 23:10:20.000000000 -0400
@@ -50,27 +50,56 @@
 #include "glib.h"
 #include "galias.h"
 
+#define G_NSEC_PER_SEC 1000000000
 
 struct _GTimer
 {
 #ifdef G_OS_WIN32
   guint64 start;
   guint64 end;
-#else /* !G_OS_WIN32 */
+#elif HAVE_CLOCK_GETTIME 
+  struct timespec start;
+  struct timespec end;
+  gint clock;
+#else /* uses gettimeofday */
   struct timeval start;
   struct timeval end;
-#endif /* !G_OS_WIN32 */
+#endif 
 
   guint active : 1;
 };
 
 #ifdef G_OS_WIN32
-#  define GETTIME(v) \
+#  define GETTIME(v)				\
      GetSystemTimeAsFileTime ((FILETIME *)&v)
-#else /* !G_OS_WIN32 */
-#  define GETTIME(v) \
+#elif HAVE_CLOCK_GETTIME
+#  define GETTIME(v)				\
+     clock_gettime (posix_clock, &v)
+#else
+#  define GETTIME(v)				\
      gettimeofday (&v, NULL)
-#endif /* !G_OS_WIN32 */
+#endif
+
+#ifdef HAVE_CLOCK_GETTIME
+static gint posix_clock = 0;
+
+static void
+init_posix_clock (void)
+{
+  static gboolean initialized = FALSE;
+
+  if (!initialized)
+    {
+      initialized = TRUE;
+#if !defined(_POSIX_MONOTONIC_CLOCK) || _POSIX_MONOTONIC_CLOCK >= 0
+      if (sysconf (_SC_MONOTONIC_CLOCK) >= 0)
+	posix_clock = CLOCK_MONOTONIC;
+      else
+#endif
+	posix_clock = CLOCK_REALTIME;
+    }
+}
+#endif
 
 GTimer*
 g_timer_new (void)
@@ -80,6 +109,10 @@
   timer = g_new (GTimer, 1);
   timer->active = TRUE;
 
+#ifdef HAVE_CLOCK_GETTIME
+  init_posix_clock ();
+#endif
+
   GETTIME (timer->start);
 
   return timer;
@@ -126,9 +159,11 @@
 {
 #ifdef G_OS_WIN32
   guint64 elapsed;
+#elif HAVE_CLOCK_GETTIME
+  struct timespec elapsed;
 #else
   struct timeval elapsed;
-#endif /* G_OS_WIN32 */
+#endif
 
   g_return_if_fail (timer != NULL);
   g_return_if_fail (timer->active == FALSE);
@@ -146,7 +181,29 @@
 
   timer->start -= elapsed;
 
-#else /* !G_OS_WIN32 */
+#elif HAVE_CLOCK_GETTIME
+
+  if (timer->start.tv_nsec > timer->end.tv_nsec)
+    {
+      timer->end.tv_nsec += G_NSEC_PER_SEC;
+      timer->end.tv_sec--;
+    }
+
+  elapsed.tv_nsec = timer->end.tv_nsec - timer->start.tv_nsec;
+  elapsed.tv_sec = timer->end.tv_sec - timer->start.tv_sec;
+
+  GETTIME (timer->start);
+
+  if (timer->start.tv_nsec < elapsed.tv_nsec)
+    {
+      timer->start.tv_nsec += G_NSEC_PER_SEC;
+      timer->start.tv_sec--;
+    }
+
+  timer->start.tv_nsec -= elapsed.tv_nsec;
+  timer->start.tv_sec -= elapsed.tv_sec;
+
+#else
 
   if (timer->start.tv_usec > timer->end.tv_usec)
     {
@@ -180,9 +237,11 @@
   gdouble total;
 #ifdef G_OS_WIN32
   gint64 elapsed;
+#elif HAVE_CLOCK_GETTIME
+  struct timespec elapsed;
 #else
   struct timeval elapsed;
-#endif /* G_OS_WIN32 */
+#endif 
 
   g_return_val_if_fail (timer != NULL, 0);
 
@@ -196,9 +255,33 @@
 
   if (microseconds)
     *microseconds = (elapsed / 10) % 1000000;
-#else /* !G_OS_WIN32 */
+#elif HAVE_CLOCK_GETTIME
   if (timer->active)
-    gettimeofday (&timer->end, NULL);
+    GETTIME (timer->end);
+
+  if (timer->start.tv_nsec > timer->end.tv_nsec)
+    {
+      timer->end.tv_nsec += G_NSEC_PER_SEC;
+      timer->end.tv_sec--;
+    }
+
+  elapsed.tv_nsec = timer->end.tv_nsec - timer->start.tv_nsec;
+  elapsed.tv_sec = timer->end.tv_sec - timer->start.tv_sec;
+
+  total = elapsed.tv_sec + ((gdouble) elapsed.tv_nsec / (gdouble) G_NSEC_PER_SEC);
+  if (total < 0)
+    {
+      total = 0;
+
+      if (microseconds)
+	*microseconds = 0;
+    }
+  else if (microseconds)
+    *microseconds = elapsed.tv_nsec / 1000;
+
+#else
+  if (timer->active)
+    GETTIME (timer->end);
 
   if (timer->start.tv_usec > timer->end.tv_usec)
     {
@@ -209,7 +292,7 @@
   elapsed.tv_usec = timer->end.tv_usec - timer->start.tv_usec;
   elapsed.tv_sec = timer->end.tv_sec - timer->start.tv_sec;
 
-  total = elapsed.tv_sec + ((gdouble) elapsed.tv_usec / 1e6);
+  total = elapsed.tv_sec + ((gdouble) elapsed.tv_usec / (gdouble) G_USEC_PER_SEC);
   if (total < 0)
     {
       total = 0;
@@ -220,7 +303,7 @@
   else if (microseconds)
     *microseconds = elapsed.tv_usec;
 
-#endif /* !G_OS_WIN32 */
+#endif
 
   return total;
 }


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- glib2.spec	16 Aug 2006 02:32:23 -0000	1.105
+++ glib2.spec	28 Aug 2006 03:13:20 -0000	1.106
@@ -3,17 +3,22 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.12.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
 Patch0: glib-2.11.1-libdir.patch
+# fixed in upstream cvs
+Patch1: glib-2.12.2-monotonic-timer.patch
+
 Conflicts: libgnomeui <= 2.2.0
 BuildRoot: %{_tmppath}/glib-%{PACKAGE_VERSION}-root
 BuildRequires: pkgconfig >= 0.8
 BuildRequires: gettext
+# for patch1
+BuildRequires: autoconf
 Obsoletes: glib-gtkbeta
 URL: http://www.gtk.org
 
@@ -41,12 +46,15 @@
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .monotonic-timer
 
 %build
 
 for i in config.guess config.sub ; do
 	test -f /usr/share/libtool/$i && cp /usr/share/libtool/$i .
 done
+# for patch1
+autoconf
 %configure --disable-gtk-doc --enable-static --libdir=%{libdir}
 make
 # http://bugzilla.gnome.org/show_bug.cgi?id=320463 
@@ -100,6 +108,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.2-2.fc6
+- Use Posix monotonic timers for GTimer
+
 * Tue Aug 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.2-1.fc6
 - Update to 2.12.2
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 03:30:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 23:30:03 -0400
Subject: rpms/glib2/devel glib-2.12.2-monotonic-timer.patch,1.1,1.2
Message-ID: <200608280330.k7S3U3oJ005270@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5211

Modified Files:
	glib-2.12.2-monotonic-timer.patch 
Log Message:
fix patch


glib-2.12.2-monotonic-timer.patch:
 configure.in  |    8 +++-
 glib/gtimer.c |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 103 insertions(+), 14 deletions(-)

Index: glib-2.12.2-monotonic-timer.patch
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib-2.12.2-monotonic-timer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glib-2.12.2-monotonic-timer.patch	28 Aug 2006 03:13:20 -0000	1.1
+++ glib-2.12.2-monotonic-timer.patch	28 Aug 2006 03:30:00 -0000	1.2
@@ -1,5 +1,5 @@
---- glib-2.12.2/configure.in.monotonic-timer	2006-08-27 23:09:08.000000000 -0400
-+++ glib-2.12.2/configure.in	2006-08-27 23:10:20.000000000 -0400
+--- glib-2.12.2/configure.in.monotonic-timer	2006-07-22 14:28:17.000000000 -0400
++++ glib-2.12.2/configure.in	2006-08-27 23:30:36.000000000 -0400
 @@ -856,6 +856,12 @@
  
  # Check for some functions
@@ -13,8 +13,17 @@
  
  AC_CHECK_HEADERS(crt_externs.h)
  AC_CHECK_FUNCS(_NSGetEnviron)
---- glib-2.12.2/glib/gtimer.c.monotonic-timer	2006-08-27 23:09:20.000000000 -0400
-+++ glib-2.12.2/glib/gtimer.c	2006-08-27 23:10:20.000000000 -0400
+@@ -1547,7 +1553,7 @@
+    void *ret;
+    pthread_create (&t, $1, func, 0);
+    pthread_join (t, &ret);
+-   exit (check_me != 42 || ret != &check_me);
++   return (check_me != 42 || ret != &check_me);
+ }])
+ 
+ dnl
+--- glib-2.12.2/glib/gtimer.c.monotonic-timer	2006-06-20 12:37:43.000000000 -0400
++++ glib-2.12.2/glib/gtimer.c	2006-08-27 23:29:53.000000000 -0400
 @@ -50,27 +50,56 @@
  #include "glib.h"
  #include "galias.h"



From fedora-cvs-commits at redhat.com  Mon Aug 28 03:33:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 23:33:17 -0400
Subject: rpms/kudzu/devel sources,1.144,1.145
Message-ID: <200608280333.k7S3XHSd005635@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5622

Modified Files:
	sources 
Log Message:
update


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- sources	28 Aug 2006 03:07:57 -0000	1.144
+++ sources	28 Aug 2006 03:33:14 -0000	1.145
@@ -1 +1 @@
-8c8d068604d56948b774667b360ab90e  kudzu-1.2.48.tar.gz
+ed45bbe81410178b30adcad587ccae76  kudzu-1.2.48.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 28 03:34:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 23:34:41 -0400
Subject: rpms/control-center/devel keyboard-drawing-redraw.patch, NONE,
	1.1 control-center.spec, 1.180, 1.181
Message-ID: <200608280334.k7S3Yfte006108@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6028

Modified Files:
	control-center.spec 
Added Files:
	keyboard-drawing-redraw.patch 
Log Message:
fix redraw issue in keyboard capplet


keyboard-drawing-redraw.patch:
 keyboard-drawing.c |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE keyboard-drawing-redraw.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.redraw	2006-08-27 22:42:37.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-27 22:54:18.000000000 -0400
@@ -1176,6 +1176,26 @@
 }
 
 static void
+redraw_overlapping_doodads (
+  KeyboardDrawing * drawing,
+  KeyboardDrawingKey * key)
+{
+  GList *list;
+  gboolean do_draw = FALSE;
+
+  for (list = drawing->keyboard_items; list; list = list->next)
+    {
+      KeyboardDrawingItem * item = list->data;
+
+      if (do_draw && item->type == KEYBOARD_DRAWING_ITEM_TYPE_DOODAD)
+	draw_doodad (drawing, (KeyboardDrawingDoodad *) item);
+
+      if (list->data == key)
+        do_draw = TRUE;
+    }
+}
+
+static void
 draw_keyboard_item (
   KeyboardDrawingItem * item,
   KeyboardDrawing * drawing)
@@ -1340,7 +1360,7 @@
   key->pressed = (event->type == GDK_KEY_PRESS);
 
   draw_key (drawing, key);
-
+  redraw_overlapping_doodads (drawing, key);
   invalidate_key_region (drawing, key);
 
   return TRUE;
@@ -1370,7 +1390,9 @@
     if (drawing->keys[i].pressed)
       {
         drawing->keys[i].pressed = FALSE;
+
         draw_key (drawing, drawing->keys + i);
+	redraw_overlapping_doodads (drawing, drawing->keys + i);
         invalidate_key_region (drawing, drawing->keys + i);
       }
 


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- control-center.spec	27 Aug 2006 05:02:57 -0000	1.180
+++ control-center.spec	28 Aug 2006 03:34:38 -0000	1.181
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.92
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -52,6 +52,8 @@
 Patch18: keyboard-drawing-primary.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=352781
 Patch19: keyboard-drawing-corner.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=353163
+Patch20: keyboard-drawing-redraw.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -156,6 +158,7 @@
 %patch17 -p1 -b .label-color
 %patch18 -p1 -b .primary
 %patch19 -p1 -b .corner
+%patch20 -p1 -b .redraw
 
 %build
 
@@ -293,6 +296,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-5.fc6
+- Fix some redraw issues in the keyboard capplet
+
 * Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-4.fc6
 - More keyboard capplet improvements
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 03:38:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 23:38:45 -0400
Subject: rpms/gnome-applets/devel keyboard-drawing-redraw.patch, NONE,
	1.1 gnome-applets.spec, 1.173, 1.174
Message-ID: <200608280338.k7S3cj5D007100@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7028

Modified Files:
	gnome-applets.spec 
Added Files:
	keyboard-drawing-redraw.patch 
Log Message:
fix some redraw issues


keyboard-drawing-redraw.patch:
 keyboard-drawing.c |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE keyboard-drawing-redraw.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.redraw	2006-08-27 22:42:37.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-27 22:54:18.000000000 -0400
@@ -1176,6 +1176,26 @@
 }
 
 static void
+redraw_overlapping_doodads (
+  KeyboardDrawing * drawing,
+  KeyboardDrawingKey * key)
+{
+  GList *list;
+  gboolean do_draw = FALSE;
+
+  for (list = drawing->keyboard_items; list; list = list->next)
+    {
+      KeyboardDrawingItem * item = list->data;
+
+      if (do_draw && item->type == KEYBOARD_DRAWING_ITEM_TYPE_DOODAD)
+	draw_doodad (drawing, (KeyboardDrawingDoodad *) item);
+
+      if (list->data == key)
+        do_draw = TRUE;
+    }
+}
+
+static void
 draw_keyboard_item (
   KeyboardDrawingItem * item,
   KeyboardDrawing * drawing)
@@ -1340,7 +1360,7 @@
   key->pressed = (event->type == GDK_KEY_PRESS);
 
   draw_key (drawing, key);
-
+  redraw_overlapping_doodads (drawing, key);
   invalidate_key_region (drawing, key);
 
   return TRUE;
@@ -1370,7 +1390,9 @@
     if (drawing->keys[i].pressed)
       {
         drawing->keys[i].pressed = FALSE;
+
         draw_key (drawing, drawing->keys + i);
+	redraw_overlapping_doodads (drawing, drawing->keys + i);
         invalidate_key_region (drawing, drawing->keys + i);
       }
 


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- gnome-applets.spec	27 Aug 2006 05:06:37 -0000	1.173
+++ gnome-applets.spec	28 Aug 2006 03:38:43 -0000	1.174
@@ -32,7 +32,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.90
-Release:  	3%{?dist}
+Release:  	4%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -54,6 +54,8 @@
 Patch18: keyboard-drawing-primary.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=352781
 Patch19: keyboard-drawing-corner.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=353163
+Patch20: keyboard-drawing-redraw.patch
 
 URL:		http://www.gnome.org/
 
@@ -139,7 +141,7 @@
 %patch17 -p1 -b .label-color
 %patch18 -p1 -b .primary
 %patch19 -p1 -b .corner
-
+%patch20 -p1 -b .redraw
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -307,6 +309,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-4.fc6
+- Fix some redraw issues in the keyboard capplet
+
 * Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-3.fc6
 - More keyboard drawing improvements
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 03:51:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 27 Aug 2006 23:51:56 -0400
Subject: rpms/glib2/devel glib-2.12.2-monotonic-timer.patch,1.2,1.3
Message-ID: <200608280351.k7S3pu8Z027078@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27016

Modified Files:
	glib-2.12.2-monotonic-timer.patch 
Log Message:
fix patch


glib-2.12.2-monotonic-timer.patch:
 configure.in  |    9 ++++
 glib/gtimer.c |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 104 insertions(+), 14 deletions(-)

Index: glib-2.12.2-monotonic-timer.patch
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib-2.12.2-monotonic-timer.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glib-2.12.2-monotonic-timer.patch	28 Aug 2006 03:30:00 -0000	1.2
+++ glib-2.12.2-monotonic-timer.patch	28 Aug 2006 03:51:53 -0000	1.3
@@ -1,5 +1,5 @@
 --- glib-2.12.2/configure.in.monotonic-timer	2006-07-22 14:28:17.000000000 -0400
-+++ glib-2.12.2/configure.in	2006-08-27 23:30:36.000000000 -0400
++++ glib-2.12.2/configure.in	2006-08-27 23:48:59.000000000 -0400
 @@ -856,6 +856,12 @@
  
  # Check for some functions
@@ -22,8 +22,16 @@
  }])
  
  dnl
+@@ -1587,6 +1593,7 @@
+           if test $glib_flag_works = yes ; then
+              G_THREAD_CFLAGS=-$flag
+ 	     G_THREAD_LIBS=-$flag
++	     break; 
+           fi
+         done
+          ;;
 --- glib-2.12.2/glib/gtimer.c.monotonic-timer	2006-06-20 12:37:43.000000000 -0400
-+++ glib-2.12.2/glib/gtimer.c	2006-08-27 23:29:53.000000000 -0400
++++ glib-2.12.2/glib/gtimer.c	2006-08-27 23:42:14.000000000 -0400
 @@ -50,27 +50,56 @@
  #include "glib.h"
  #include "galias.h"



From fedora-cvs-commits at redhat.com  Mon Aug 28 04:42:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 00:42:31 -0400
Subject: rpms/xchat/devel xchat-2.6.6-es.patch, NONE, 1.1 xchat.spec, 1.56,
	1.57
Message-ID: <200608280442.k7S4gUuM020679@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/xchat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20567

Modified Files:
	xchat.spec 
Added Files:
	xchat-2.6.6-es.patch 
Log Message:
add upstream 2.6.6 es patch

Does anyone actually read these checkin messages? =)


xchat-2.6.6-es.patch:
 es.po |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE xchat-2.6.6-es.patch ---
#
# Fix a few bad translation errors in xchat-2.6.6 Spanish.
#
--- xchat-2.6.6/po/es.po	2006-08-28 14:09:43.000000000 +1000
+++ xchat-2.6.6p/po/es.po	2006-08-28 14:12:13.000000000 +1000
@@ -747,15 +747,15 @@
 
 #: src/common/textevents.h:60
 msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "C22*%O$t%C22Canal $1 modos: $2"
+msgstr "%C22*%O$t%C22Canal $1 modos: $2"
 
 #: src/common/textevents.h:63
 msgid "$4%C21%B%H<%H$1%H>%H%O%C21$t$2"
-msgstr "4%C21%B%H<%H$1%H>%H%O%C21$t$2"
+msgstr "$4%C21%B%H<%H$1%H>%H%O%C21$t$2"
 
 #: src/common/textevents.h:66
 msgid "%C28-%C29$1/$2%C28-%O$t$3"
-msgstr "C28-%C29$1/$2%C28-%O$t$3"
+msgstr "%C28-%C29$1/$2%C28-%O$t$3"
 
 #: src/common/textevents.h:69
 msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
@@ -799,7 +799,7 @@
 
 #: src/common/textevents.h:99
 msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Conectando a %1 ($2) puerto $3%O..."
+msgstr "%C22*%O$t%C22Conectando a $1 ($2) puerto $3%O..."
 
 #: src/common/textevents.h:102
 msgid "%C21*%O$t%C21Connection failed. Error: $1"


Index: xchat.spec
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xchat.spec	23 Aug 2006 22:02:41 -0000	1.56
+++ xchat.spec	28 Aug 2006 04:42:26 -0000	1.57
@@ -5,7 +5,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.6.6
-Release:   3%{?dist}
+Release:   4%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -25,6 +25,8 @@
 
 # upstream 2.6.6 fi patch
 Patch35: xchat-2.6.6-fi.patch
+# upstream 2.6.6 es patch
+Patch36: xchat-2.6.6-es.patch
 
 BuildRequires: perl python-devel openssl-devel pkgconfig
 BuildRequires: GConf2-devel, gtkspell-devel
@@ -56,6 +58,7 @@
 %patch33 -p1 -b .im_context_filter_keypress
 %patch34 -p1 -b .unrealize
 %patch35 -p1 -b .fi266
+%patch36 -p1 -b .es266
 
 %build
 # Remove CVS files from source dirs so they're not installed into doc dirs.
@@ -118,6 +121,9 @@
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 
 %changelog
+* Mon Aug 28 2006 Warren Togami <wtogami at redhat.com> - 1:2.6.6-4
+- add upstream 2.6.6 es patch
+
 * Wed Aug 23 2006 Warren Togami <wtogami at redhat.com> - 1:2.6.6-3
 - enable optional spell checking if you install enchant
   because gtkspell is currently unusable (#201116)



From fedora-cvs-commits at redhat.com  Mon Aug 28 07:04:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 03:04:53 -0400
Subject: rpms/xsane/devel xsane.spec,1.38,1.39
Message-ID: <200608280704.k7S74rIG020168@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20131

Modified Files:
	xsane.spec 
Log Message:
version 0.991
remove obsolete buffer patch



Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xsane.spec	16 Aug 2006 11:24:05 -0000	1.38
+++ xsane.spec	28 Aug 2006 07:04:51 -0000	1.39
@@ -2,15 +2,14 @@
 
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
-Version: 0.99
-Release: 6%{?dist}
+Version: 0.991
+Release: 1%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
 Patch0: xsane-0.90-htmlview.patch
 Patch1: xsane-0.99-medium-definitions.patch
 Patch2: xsane-0.92_gimp2.0.patch
-Patch3: xsane-0.99-buffer.patch
 License: GPL
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
@@ -47,7 +46,6 @@
 %patch0 -p1 -b .htmlview
 %patch1 -p1 -b .medium-definitions
 %patch2 -p1 -b .gimp2.0
-%patch3 -p1 -b .buffer
 
 %build
 %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1}
@@ -115,6 +113,10 @@
 fi
 
 %changelog
+* Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> - 0.991-1
+- version 0.991
+- remove obsolete buffer patch
+
 * Wed Aug 16 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-6
 - revamp scheme for integrating external GIMP plugins (#202545)
 - use disttag



From fedora-cvs-commits at redhat.com  Mon Aug 28 07:06:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 03:06:07 -0400
Subject: rpms/xsane/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <200608280706.k7S767UN020569@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20524

Modified Files:
	.cvsignore sources 
Log Message:
version 0.991



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Jan 2006 17:20:03 -0000	1.13
+++ .cvsignore	28 Aug 2006 07:06:05 -0000	1.14
@@ -1 +1 @@
-xsane-0.99.tar.gz
+xsane-0.991.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Jan 2006 17:20:03 -0000	1.13
+++ sources	28 Aug 2006 07:06:05 -0000	1.14
@@ -1 +1 @@
-c850be334dcd36d426d5d85c7334275a  xsane-0.99.tar.gz
+cded872f2e7041f4a0f2dc4f0bbc5a77  xsane-0.991.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 28 07:06:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 03:06:35 -0400
Subject: rpms/xsane/devel xsane-0.99-buffer.patch,1.1,NONE
Message-ID: <200608280706.k7S76ZRP020740@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20693

Removed Files:
	xsane-0.99-buffer.patch 
Log Message:
version 0.991
remove obsolete buffer patch



--- xsane-0.99-buffer.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 28 07:13:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 03:13:59 -0400
Subject: rpms/gimp/FC-5 gimp-plugin-mgr.in, NONE, 1.1 .cvsignore, 1.27,
	1.28 gimp.spec, 1.97, 1.98 sources, 1.27,
	1.28 gimp-2.2.12-filename.patch, 1.2, NONE
Message-ID: <200608280713.k7S7DxVm022922@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22707

Modified Files:
	.cvsignore gimp.spec sources 
Added Files:
	gimp-plugin-mgr.in 
Removed Files:
	gimp-2.2.12-filename.patch 
Log Message:
version 2.2.13
remove obsolete filename patch
don't barf on empty /etc/gimp/plugins.d (#202808)
revamp scheme for integrating external plugins (#202545)



--- NEW FILE gimp-plugin-mgr.in ---
#!/bin/bash

shopt -s nullglob

GIMPTOOL="@GIMPTOOL@"
GIMPPLUGINDIR="`"$GIMPTOOL" --gimpplugindir`"
EXITVAL=0

showhelp () {
	cat << EOF
Usage: gimp-plugin-mgr <mode> [<pluginname> [<pluginname> [...]]
Mode can be:
--install|-i:	install plugin(s)
--uninstall|-u:	uninstall plugin(s)
--help|-h:	show this message
EOF
}

install_uninstall () {
    local action="$1"
    shift
    local plugins="$@"
    pushd "$GIMPPLUGINDIR/plug-ins" >&/dev/null
    if [ "$plugins" == "*" ]; then
        pushd "/etc/gimp/plugins.d" >&/dev/null
        plugins=""
        for file in *; do
            plugins="$plugins ${file%.conf}"
        done
        popd >&/dev/null
    fi

	for plugin in $plugins; do
        PLUGINFILE=
        if [ ! -r "/etc/gimp/plugins.d/${plugin}.conf" ]; then
            echo "gimp-plugin-mgr: can't read /etc/gimp/plugins.d/${plugin}.conf" >&2
            EXITVAL=$(( $EXITVAL + 1 ))
            continue
        fi
        . "/etc/gimp/plugins.d/${plugin}.conf"
        case "$action" in
        install)
            if [ ! "$PLUGINFILE" ]; then
                echo "gimp-plugin-mgr: PLUGINFILE not defined for $plugin" >&2
                EXITVAL=$(( $EXITVAL + 1 ))
                continue
            fi
            ln -snf "$PLUGINFILE" "$GIMPPLUGINDIR/plug-ins/$plugin"
            ;;
        uninstall)
            if [ ! -L "$GIMPPLUGINDIR/plug-ins/$plugin" ]; then
                echo "gimp-plugin-mgr: $GIMPPLUGINDIR/plug-ins/$plugin not a symbolic link" >&2
                EXITVAL=$(( $EXITVAL + 1 ))
                continue
            fi
            rm -f "$plugin"
            ;;
        esac
	done
    popd >&/dev/null
}

case "$1" in
--install|-i)
    shift
	install_uninstall install "$@"
	;;
--uninstall|-u)
    shift
	install_uninstall uninstall "$@"
	;;
*)
	if [ "$1" != "--help" -a "$1" != "-h" ]; then
		EXITVAL=1
	fi
	showhelp
	;;
esac

exit $EXITVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	10 Jul 2006 12:17:36 -0000	1.27
+++ .cvsignore	28 Aug 2006 07:13:56 -0000	1.28
@@ -1 +1 @@
-gimp-2.2.12.tar.bz2
+gimp-2.2.13.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/gimp.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- gimp.spec	2 Aug 2006 14:54:56 -0000	1.97
+++ gimp.spec	28 Aug 2006 07:13:56 -0000	1.98
@@ -29,14 +29,14 @@
 
 Summary:	GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.12
+Version: 	2.2.13
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
 %define age 0
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release: 3%{?dist}
+Release: 1%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -71,7 +71,7 @@
 BuildRequires:	automake >= 1.7
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	libtool >= 1.5
-BuildRequires:	perl
+BuildRequires:	sed
 BuildRequires:	libwmf-devel >= 0.2.8
 BuildRequires:  intltool
 BuildRequires:  gettext
@@ -90,13 +90,13 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): hicolor-icon-theme
 Source0: 	ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
+Source1:    gimp-plugin-mgr.in
 Patch0:		gimp-2.0pre3-buildroot.patch
 Patch1:		gimp-2.0.1-gimphelpmissing.patch
 Patch2:		gimp-2.2.3-icontheme.patch
 Patch4:		gimp-2.2.4-gifload.patch
 Patch5:     gimp-2.2.11-htmlview.patch
 Patch6:     gimp-2.2.11-gimptool.patch
-Patch7:     gimp-2.2.12-filename.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -151,7 +151,6 @@
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
-%patch7 -p1 -b .filename
 
 %build
 libtoolize --copy --force
@@ -196,6 +195,9 @@
 
 make %{?_smp_mflags}
 
+# convenience stuff for external plugins (e.g. xsane)
+sed -e 's|@GIMPTOOL@|%{_bindir}/gimptool-%{interfacever}|g' < %{SOURCE1} > gimp-plugin-mgr
+
 %install
 export PATH="$PATH:$PWD/bin"
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -252,24 +254,24 @@
 ln -snf gimptool-%{interfacever}.1 %{buildroot}/%{_mandir}/man1/gimptool.1
 %endif
 
+# convenience stuff for external plugins (e.g. xsane)
+mkdir -p %{buildroot}%{_sysconfdir}/gimp/plugins.d
+mkdir -p %{buildroot}%{_sbindir}
+install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
+
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %post
 /usr/bin/update-desktop-database %{_datadir}/applications
-if [ -x %{_sbindir}/xsane-install-gimp-plugin ]; then
-    %{_sbindir}/xsane-install-gimp-plugin --install %{interfacever}
-fi
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+%{_sbindir}/gimp-plugin-mgr --install '*'
 
 %preun
-# Do this always, because interfacever could be different
-if [ -x %{_sbindir}/xsane-install-gimp-plugin ]; then
-    %{_sbindir}/xsane-install-gimp-plugin --uninstall %{interfacever}
-fi
+%{_sbindir}/gimp-plugin-mgr --uninstall '*'
 
 %postun
 if [ "$1" = "0" ]; then
@@ -321,6 +323,7 @@
 %{_datadir}/gimp/%{interfacever}/themes/
 
 %dir %{_sysconfdir}/gimp
+%dir %{_sysconfdir}/gimp/plugins.d
 %dir %{_sysconfdir}/gimp/%{interfacever}
 %config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/controllerrc
 %config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gimprc
@@ -337,6 +340,7 @@
 %{_bindir}/gimp-%{binver}
 %{_bindir}/gimp-remote-%{binver}
 %{_bindir}/gimptool-%{interfacever}
+%{_sbindir}/gimp-plugin-mgr
 #%{_bindir}/embedxpm
 #%{_bindir}/escputil-%{interfacever}
 
@@ -396,6 +400,16 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Aug 25 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.13-1
+- version 2.2.13
+- remove obsolete filename patch
+
+* Thu Aug 17 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-5
+- don't barf on empty /etc/gimp/plugins.d (#202808)
+
+* Wed Aug 16 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-4
+- revamp scheme for integrating external plugins (#202545)
+
 * Wed Aug 02 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-3
 - allow spaces in filenames when saving (#200888, patch by Michael Natterer)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	10 Jul 2006 12:17:36 -0000	1.27
+++ sources	28 Aug 2006 07:13:56 -0000	1.28
@@ -1 +1 @@
-6a1906db60166a88317f2df5f195a57d  gimp-2.2.12.tar.bz2
+d84a4a476a0c4fae24602db67f6fe49a  gimp-2.2.13.tar.bz2


--- gimp-2.2.12-filename.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 28 07:16:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 03:16:57 -0400
Subject: rpms/xsane/FC-5 xsane.conf.in, NONE, 1.1 xsane.desktop, NONE,
	1.1 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 xsane.spec,
	1.33, 1.34 xsane-0.99-buffer.patch, 1.1, NONE
Message-ID: <200608280716.k7S7GvDY031698@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/xsane/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25410

Modified Files:
	.cvsignore sources xsane.spec 
Added Files:
	xsane.conf.in xsane.desktop 
Removed Files:
	xsane-0.99-buffer.patch 
Log Message:
version 0.991
remove obsolete buffer patch
revamp scheme for integrating external GIMP plugins (#202545)
use disttag
re-add desktop file (#170835)
use %buildroot consistently
add automake, autoconf build requirements



--- NEW FILE xsane.conf.in ---
PLUGINFILE=@BINDIR@/xsane-gimp


--- NEW FILE xsane.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Type=Application
#Name=XSane
Name=Scanner Tool
GenericName=Scanner Tool
Comment=Scan images to view, copy, fax or email them
Exec=xsane
TryExec=xsane
Icon=/usr/share/sane/xsane/xsane-logo.xpm
Terminal=false
Categories=Application;Graphics;2DGraphics;RasterGraphics;GTK;
StartupNotify=true


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Jan 2006 17:20:03 -0000	1.13
+++ .cvsignore	28 Aug 2006 07:16:55 -0000	1.14
@@ -1 +1 @@
-xsane-0.99.tar.gz
+xsane-0.991.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Jan 2006 17:20:03 -0000	1.13
+++ sources	28 Aug 2006 07:16:55 -0000	1.14
@@ -1 +1 @@
-c850be334dcd36d426d5d85c7334275a  xsane-0.99.tar.gz
+cded872f2e7041f4a0f2dc4f0bbc5a77  xsane-0.991.tar.gz


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-5/xsane.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xsane.spec	5 Apr 2006 07:14:50 -0000	1.33
+++ xsane.spec	28 Aug 2006 07:16:55 -0000	1.34
@@ -1,21 +1,26 @@
+%define desktop_vendor fedora
+
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
-Version: 0.99
-Release: 2.2.fc5.4
+Version: 0.991
+Release: 1%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
-Source1: xsane-install-gimp-plugin
+Source1: xsane.desktop
+Source2: xsane.conf.in
 Patch0: xsane-0.90-htmlview.patch
 Patch1: xsane-0.99-medium-definitions.patch
 Patch2: xsane-0.92_gimp2.0.patch
-Patch3: xsane-0.99-buffer.patch
 License: GPL
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-buildroot
-BuildPrereq: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
+BuildRequires: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
 BuildRequires: gettext-devel
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: sed
 ExcludeArch: s390 s390x
 
 %description
@@ -27,7 +32,8 @@
 %package gimp
 Summary: A GIMP plug-in which provides the SANE scanner interface.
 Group: Applications/Multimedia
-Prereq: /usr/bin/awk sh-utils fileutils
+Requires(post): gimp >= 2:2.2.12-4
+Requires(preun): gimp >= 2:2.2.12-4
 
 %description gimp
 This package provides the regular XSane frontend for the SANE scanner
@@ -35,12 +41,11 @@
 installed to use this package.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %setup -q
 %patch0 -p1 -b .htmlview
 %patch1 -p1 -b .medium-definitions
 %patch2 -p1 -b .gimp2.0
-%patch3 -p1 -b .buffer
 
 %build
 %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1}
@@ -51,25 +56,34 @@
 
 mv src/xsane src/xsane-gimp
 
+sed -e 's|@BINDIR@|%{_bindir}|g' < "%{SOURCE2}" > xsane.conf
+
 make clean
 %configure --with-install-root=%{buildroot} --disable-gimp
 make LDFLAGS=
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall
 
 install src/xsane-gimp %{buildroot}%{_bindir}
 
-mkdir -p %{buildroot}/etc/X11/applnk/Graphics
-mkdir -p %{buildroot}%{_sbindir}
-install -m 0755 %SOURCE1 %{buildroot}%{_sbindir}/xsane-install-gimp-plugin
+mkdir %{buildroot}%{_datadir}/applications
+desktop-file-install --vendor %{desktop_vendor}         \
+    --dir %{buildroot}%{_datadir}/applications          \
+    --add-category X-Red-Hat-Base                       \
+    --add-category X-Fedora                             \
+    --add-category Graphics                             \
+    --add-category Application                          \
+    %{SOURCE1}
 
 %find_lang %{name} XSANE.lang
 
+mkdir -p %{buildroot}%{_sysconfdir}/gimp/plugins.d
+install -m 0644 xsane.conf %{buildroot}%{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f XSANE.lang
 %defattr(-,root,root)
@@ -77,27 +91,45 @@
 %{_bindir}/xsane
 %{_mandir}/man1/*
 %{_datadir}/sane
+%dir %{_datadir}/applications
+%{_datadir}/applications/%{desktop_vendor}-xsane.desktop
 
 %files gimp
 %defattr(-,root,root)
 %{_bindir}/xsane-gimp
-%{_sbindir}/xsane-install-gimp-plugin
-%%dir %{_datadir}/sane
-%%dir %{_datadir}/sane/xsane
+%dir %{_datadir}/sane
+%dir %{_datadir}/sane/xsane
 %{_datadir}/sane/xsane/*eula*
+%{_sysconfdir}/gimp
+%{_sysconfdir}/gimp/plugins.d
+%config %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %post gimp
-%{_sbindir}/xsane-install-gimp-plugin --install
-exit 0
+%{_sbindir}/gimp-plugin-mgr --install xsane
 
 %preun gimp
 if [ $1 = 0 ]; then
-        %{_sbindir}/xsane-install-gimp-plugin --uninstall
+        %{_sbindir}/gimp-plugin-mgr --uninstall xsane
 fi
-exit 0
 
 %changelog
-* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-2.2.fc5.4
+* Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> - 0.991-1
+- version 0.991
+- remove obsolete buffer patch
+
+* Wed Aug 16 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-6
+- revamp scheme for integrating external GIMP plugins (#202545)
+- use disttag
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.99-5.1
+- rebuild
+
+* Thu Jun 08 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-5
+- re-add desktop file (#170835)
+- use %%buildroot consistently
+- add automake, autoconf build requirements
+
+* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-4
 - use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression
 
 * Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-3


--- xsane-0.99-buffer.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 28 07:25:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 03:25:56 -0400
Subject: rpms/man-pages/devel man-pages-2.39-clone.patch, NONE,
	1.1 man-pages-2.39-unimplemented.patch, NONE, 1.1 .cvsignore,
	1.27, 1.28 man-pages.spec, 1.52, 1.53 sources, 1.26,
	1.27 man2_sys2.tar.gz, 1.1, NONE
Message-ID: <200608280725.k7S7PuL1009690@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9436

Modified Files:
	.cvsignore man-pages.spec sources 
Added Files:
	man-pages-2.39-clone.patch man-pages-2.39-unimplemented.patch 
Removed Files:
	man2_sys2.tar.gz 
Log Message:
- add the description clone2 syscall to clone.2 man page
- add multiplexer.2 man page



man-pages-2.39-clone.patch:
 clone.2 |   46 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 9 deletions(-)

--- NEW FILE man-pages-2.39-clone.patch ---
--- man-pages-2.39/man2/clone.2.pom	2006-08-04 10:41:13.000000000 +0200
+++ man-pages-2.39/man2/clone.2	2006-08-24 12:02:22.000000000 +0200
@@ -34,12 +34,12 @@
 .\"
 .TH CLONE 2 2005-05-17 "Linux 2.6" "Linux Programmer's Manual"
 .SH NAME
-clone \- create a child process
+clone, clone2 \- create a child process
 .SH SYNOPSIS
 .nf
 .B #include <sched.h>
 
-.BI "int clone(int (*" "fn" ")(void *), void *" child_stack \
+.BI "int clone(int (*" "fn" ")(void *" arg "), void *" child_stack \
 ", int " flags ", void *" "arg" );
 
 .BI "_syscall2(int, " clone ", int, " flags ", void *, " child_stack )
@@ -48,20 +48,34 @@
 .BI "     int *, " parent_tidptr ", struct user_desc *, " newtls ,
 .BI "     int *, " child_tidptr )
         /* Using \fBsyscall\fP(2) may be preferable; see \fBintro\fP(2) */
+        
+.BI "int __clone2(int (*" fn ")(void *" arg "), void *" child_stack ",
+.BI  "	  size_t " stack_size ", int " flags ", void *" arg ");
+        
+.BI "_syscall2(int, " clone2 ", int, " flags ", void *, " child_stack ", 
+.BI " 	  int, " child_stack_size ", int *, " parent_tidptr ", 
+.BI "	  struct user_desc *, " newtls ", int *, " child_tidptr )
+ 
+ 
 .fi
 .SH DESCRIPTION
-.BR clone ()
+.BR clone () 
+system call can be use on all architectures except IA-64.
+On IA-64 there is available command
+.BR __clone2().
+Both commands has the similar behavior - they
 creates a new process, in a manner similar to
-.BR fork (2).
+.BR fork (2). 
 .BR clone ()
 is a library function layered on top
-of the underlying 
+of the underlying
 .BR clone ()
 system call, hereinafter referred to as
-.BR sys_clone .
-A description of
-.BR sys_clone
-is given towards the end of this page.
+.BR sys_clone.
+.BR __clone2()
+is exported from 
+.BR sys_clone2
+system call. 
 
 Unlike
 .BR fork (2),
@@ -79,6 +93,17 @@
 is to implement threads: multiple threads of control in a program that
 run concurrently in a shared memory space.
 
+The behavior of
+.BR __clone2 ()
+is the same as the behavior of
+.BR clone()
+The difference is 
+.BR __clone2()
+has one extra argument 
+.I stack_size
+which is used to determine the size of child stack. Other variables has the same meaning.
+
+
 When the child process is created with
 .BR clone (), 
 it executes the function
@@ -561,6 +586,9 @@
 in the caller's context, no child process will be created, and
 .I errno
 will be set appropriately.
+
+
+
 .SH ERRORS
 .TP
 .B EAGAIN

man-pages-2.39-unimplemented.patch:
 unimplemented.2 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-2.39-unimplemented.patch ---
--- man-pages-2.39/man2/unimplemented.2.pom	2006-08-24 12:53:50.000000000 +0200
+++ man-pages-2.39/man2/unimplemented.2	2006-08-24 12:57:56.000000000 +0200
@@ -26,7 +26,7 @@
 .\"
 .TH UNIMPLEMENTED 2 2003-02-28 "Linux 2.4" "Linux Programmer's Manual"
 .SH NAME
-afs_syscall, break, ftime, getpmsg, gtty, lock, mpx, prof, profil,
+afs_syscall, break, ftime, getpmsg, gtty, lock, mpx, multiplexer, prof, profil,
 putpmsg, security, stty, ulimit \- unimplemented system calls
 .SH SYNOPSIS
 Unimplemented system calls.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	9 Aug 2006 11:40:57 -0000	1.27
+++ .cvsignore	28 Aug 2006 07:25:53 -0000	1.28
@@ -1,3 +1,4 @@
 man-pages-extralocale.tar.bz2
 man2.tar.gz
 man-pages-2.39.tar.bz2
+man2_sys2.tar.gz


Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- man-pages.spec	23 Aug 2006 10:16:28 -0000	1.52
+++ man-pages.spec	28 Aug 2006 07:25:53 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
 Version: 2.39
-Release: 4
+Release: 5
 License: distributable
 Group: Documentation
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
@@ -36,6 +36,8 @@
 Patch32: man-pages-2.34-wait16.patch
 Patch33: man-pages-2.39-typo.patch
 Patch34: man-pages-2.39-puned.patch
+Patch35: man-pages-2.39-clone.patch
+Patch36: man-pages-2.39-unimplemented.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Autoreq: false
@@ -79,6 +81,8 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
 
 %build
 
@@ -178,6 +182,10 @@
 %{_mandir}/en/man*
 
 %changelog
+* Mon Aug 28 2006 Ivana Varekova <varekova at redhat.com> 2.39-5
+- add the description clone2 syscall to clone.2 man page
+- add multiplexer.2 man page 
+
 * Wed Aug 23 2006 Ivana Varekova <varekova at redhat.com> 2.39-4
 - add (get/set)_robust_list.2 man pages
 - add add_key.2, keyctl.2, request_key.2 man pages 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	9 Aug 2006 11:36:20 -0000	1.26
+++ sources	28 Aug 2006 07:25:53 -0000	1.27
@@ -1,3 +1,4 @@
 57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
 af09d031dcee66929510e078d00066f2  man2.tar.gz
 94f69eed6a1cf2268e7e645cfbcdce9f  man-pages-2.39.tar.bz2
+4305783c7b01f852d1c8a2cd21f3eefa  man2_sys2.tar.gz


--- man2_sys2.tar.gz DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 28 07:57:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 03:57:50 -0400
Subject: rpms/kernel/devel linux-2.6-videodev-v4l1.patch,1.1,1.2
Message-ID: <200608280757.k7S7voXP016586@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13274

Modified Files:
	linux-2.6-videodev-v4l1.patch 
Log Message:
Fix v4l drivers build

linux-2.6-videodev-v4l1.patch:
 linux/videodev.h |    5 -----
 media/v4l2-dev.h |    6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)

Index: linux-2.6-videodev-v4l1.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-videodev-v4l1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-videodev-v4l1.patch	27 Aug 2006 21:51:51 -0000	1.1
+++ linux-2.6-videodev-v4l1.patch	28 Aug 2006 07:57:47 -0000	1.2
@@ -21,3 +21,33 @@
  #endif /* __LINUX_VIDEODEV_H */
  
  /*
+diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
+index 600d61d..384a36c 100644
+--- a/include/media/v4l2-dev.h
++++ b/include/media/v4l2-dev.h
+@@ -194,7 +194,7 @@ struct video_device
+ 
+ 
+ 	int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i);
+-#ifdef HAVE_V4L1
++#ifdef CONFIG_VIDEO_V4L1_COMPAT
+ 			/* buffer type is struct vidio_mbuf * */
+ 	int (*vidiocgmbuf)  (struct file *file, void *fh, struct video_mbuf *p);
+ #endif
+@@ -335,7 +335,7 @@ extern int video_usercopy(struct inode *
+ 				      unsigned int cmd, void *arg));
+ 
+ 
+-#ifdef HAVE_V4L1
++#ifdef CONFIG_VIDEO_V4L1_COMPAT
+ #include <linux/mm.h>
+ 
+ extern struct video_device* video_devdata(struct file*);
+@@ -372,6 +372,6 @@ #endif
+ 
+ extern int video_exclusive_open(struct inode *inode, struct file *file);
+ extern int video_exclusive_release(struct inode *inode, struct file *file);
+-#endif /* HAVE_V4L1 */
++#endif /* CONFIG_VIDEO_V4L1_COMPAT */
+ 
+ #endif /* _V4L2_DEV_H */



From fedora-cvs-commits at redhat.com  Mon Aug 28 07:58:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 03:58:37 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2594,1.2595
Message-ID: <200608280758.k7S7wbjK001382@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22077

Modified Files:
	kernel-2.6.spec 
Log Message:
Fix v4l1 driver build






From fedora-cvs-commits at redhat.com  Mon Aug 28 08:20:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 04:20:58 -0400
Subject: rpms/ltrace/devel ltrace-0.5-opd.patch, NONE, 1.1 ltrace.spec, 1.47,
	1.48 ltrace-opd.patch, 1.2, NONE
Message-ID: <200608280820.k7S8KwfZ029630@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29614

Modified Files:
	ltrace.spec 
Added Files:
	ltrace-0.5-opd.patch 
Removed Files:
	ltrace-opd.patch 
Log Message:
- use "{X}.{release}svn" release string per naming guidelines
- adding fork and exec patches from IBM


ltrace-0.5-opd.patch:
 elf.c  |    6 ++++++
 elf.c~ |only
 2 files changed, 6 insertions(+)

--- NEW FILE ltrace-0.5-opd.patch ---
diff -urp ltrace-0.5/elf.c ltrace-0.5-pm/elf.c
--- ltrace-0.5/elf.c	2006-08-23 17:45:47.000000000 +0200
+++ ltrace-0.5-pm/elf.c	2006-08-23 17:47:58.000000000 +0200
@@ -342,12 +342,18 @@ static GElf_Addr opd2addr(struct ltelf *
 	if (!lte->opd)
 		return (GElf_Addr) (long) 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;
 }
 
Only in ltrace-0.5-pm: elf.c~


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ltrace.spec	23 Aug 2006 13:04:42 -0000	1.47
+++ ltrace.spec	28 Aug 2006 08:20:56 -0000	1.48
@@ -1,11 +1,11 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 1.3.45svn%{?dist}
+Release: 2.45svn%{?dist}
 Source: ltrace-0.5.tar.gz
 Patch0: 1152117672-exec-patch
 Patch1: 1153220107-fork-patch
-Patch2: ltrace-opd.patch
+Patch2: ltrace-0.5-opd.patch
 Patch3: ltrace-ppc32fc5.patch
 Patch4: ltrace-0.5-gnuhash.patch
 Patch5: ltrace-0.5-testsuite.patch
@@ -28,6 +28,8 @@
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p1
 %patch2 -p1
 %patch3 -p0
 %patch4 -p1
@@ -45,10 +47,7 @@
 
 %check
 echo ====================TESTING=========================
-%ifarch ppc
-%else
 make check
-%endif
 echo ====================TESTING END=====================
 
 %clean
@@ -62,8 +61,11 @@
 %config /etc/ltrace.conf
 
 %changelog
-* Tue Aug 22 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.1.45svn
+* Wed Aug 23 2006 Petr Machata <pmachata at redhat.com> - 0.5-2.45svn
+- use "{X}.{release}svn" release string per naming guidelines
 - adding fork and exec patches from IBM
+
+* Tue Aug 22 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.1.45svn
 - using dist tag
 
 * Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 0.5-1.0.45svn.6


--- ltrace-opd.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 28 08:28:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 04:28:44 -0400
Subject: rpms/ltrace/devel ltrace.spec,1.48,1.49
Message-ID: <200608280828.k7S8SiFD029720@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29708

Modified Files:
	ltrace.spec 
Log Message:
turn off intel patches



Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ltrace.spec	28 Aug 2006 08:20:56 -0000	1.48
+++ ltrace.spec	28 Aug 2006 08:28:40 -0000	1.49
@@ -28,8 +28,8 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+#%patch0 -p0
+#%patch1 -p1
 %patch2 -p1
 %patch3 -p0
 %patch4 -p1



From fedora-cvs-commits at redhat.com  Mon Aug 28 08:38:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 04:38:32 -0400
Subject: rpms/ltrace/devel ltrace.spec,1.49,1.50
Message-ID: <200608280838.k7S8cWHC029833@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29821

Modified Files:
	ltrace.spec 
Log Message:



Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ltrace.spec	28 Aug 2006 08:28:40 -0000	1.49
+++ ltrace.spec	28 Aug 2006 08:38:27 -0000	1.50
@@ -1,10 +1,8 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 2.45svn%{?dist}
+Release: 3.45svn%{?dist}
 Source: ltrace-0.5.tar.gz
-Patch0: 1152117672-exec-patch
-Patch1: 1153220107-fork-patch
 Patch2: ltrace-0.5-opd.patch
 Patch3: ltrace-ppc32fc5.patch
 Patch4: ltrace-0.5-gnuhash.patch
@@ -28,8 +26,6 @@
 
 %prep
 %setup -q
-#%patch0 -p0
-#%patch1 -p1
 %patch2 -p1
 %patch3 -p0
 %patch4 -p1
@@ -47,7 +43,10 @@
 
 %check
 echo ====================TESTING=========================
+%ifarch ppc
+%else
 make check
+%endif
 echo ====================TESTING END=====================
 
 %clean
@@ -61,9 +60,8 @@
 %config /etc/ltrace.conf
 
 %changelog
-* Wed Aug 23 2006 Petr Machata <pmachata at redhat.com> - 0.5-2.45svn
+* Wed Aug 23 2006 Petr Machata <pmachata at redhat.com> - 0.5-3.45svn
 - use "{X}.{release}svn" release string per naming guidelines
-- adding fork and exec patches from IBM
 
 * Tue Aug 22 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.1.45svn
 - using dist tag



From fedora-cvs-commits at redhat.com  Mon Aug 28 08:41:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 04:41:13 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.219,1.220
Message-ID: <200608280841.k7S8fDtH007976@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7905

Modified Files:
	kdebase.spec 
Log Message:
fix broken deps for s390(x)




Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- kdebase.spec	25 Aug 2006 12:26:37 -0000	1.219
+++ kdebase.spec	28 Aug 2006 08:41:10 -0000	1.220
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -77,7 +77,9 @@
 Requires(post): xfs
 Requires: pam >= 0.79-6
 Requires: htdig
+%ifnarch s390 s390x
 Requires: eject
+%endif
 
 %if %{redhatify}
 Requires: desktop-backgrounds-basic
@@ -545,6 +547,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Mon Aug 28 2006 Than Ngo <than at redhat.com> 6:3.5.4-6
+- fix broken deps for s390(x)
+
 * Fri Aug 25 2006 Than Ngo <than at redhat.com> 6:3.5.4-5
 - add Requires: eject 
 - fix #203279, antialiasing issue



From fedora-cvs-commits at redhat.com  Mon Aug 28 08:50:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 04:50:09 -0400
Subject: rpms/ruby/devel .cvsignore, 1.15, 1.16 ruby.spec, 1.74, 1.75 sources,
	1.14, 1.15
Message-ID: <200608280850.k7S8o9jU025188@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25150

Modified Files:
	.cvsignore ruby.spec sources 
Log Message:
* Mon Aug 28 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.5-1
- New upstream release.
- removed the unnecessary patches:
  - ruby-1.8.4-no-eaccess.patch
  - ruby-1.8.4-64bit-pack.patch
  - ruby-1.8.4-fix-insecure-dir-operation.patch
  - ruby-1.8.4-fix-insecure-regexp-modification.patch
  - ruby-1.8.4-fix-alias-safe-level.patch


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	27 Dec 2005 03:49:06 -0000	1.15
+++ .cvsignore	28 Aug 2006 08:50:07 -0000	1.16
@@ -9,3 +9,4 @@
 ruby-1.8.4-preview1.tar.gz
 ruby-1.8.4-preview2.tar.gz
 ruby-1.8.4.tar.gz
+ruby-1.8.5.tar.gz


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ruby.spec	7 Aug 2006 09:29:13 -0000	1.74
+++ ruby.spec	28 Aug 2006 08:50:07 -0000	1.75
@@ -4,8 +4,8 @@
 %define	sitedir2	%{_prefix}/lib/ruby/site_ruby
 
 Name:		ruby
-Version:	1.8.4
-Release:	12%{?dist}
+Version:	1.8.5
+Release:	1%{?dist}
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,11 +26,6 @@
 Source10:	ruby-mode-init.el
 
 Patch1:		ruby-1.8.2-deadcode.patch
-Patch2:		ruby-1.8.4-no-eaccess.patch
-Patch3:		ruby-1.8.4-64bit-pack.patch
-Patch4:		ruby-1.8.4-fix-insecure-dir-operation.patch
-Patch5:		ruby-1.8.4-fix-insecure-regexp-modification.patch
-Patch6:		ruby-1.8.4-fix-alias-safe-level.patch
 Patch20:	ruby-rubyprefix.patch
 Patch21:	ruby-deprecated-sitelib-search-path.patch
 Patch22:	ruby-deprecated-search-path.patch
@@ -147,11 +142,6 @@
 popd
 pushd %{name}-%{version}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 %patch20 -p1
 %patch21 -p1
 %ifarch ppc64 s390x sparc64 x86_64
@@ -159,7 +149,7 @@
 %patch23 -p1
 %patch24 -p1
 %endif
-%patch25 -p1
+#%%patch25 -p1
 popd
 
 %build
@@ -174,17 +164,18 @@
 CFLAGS="$RPM_OPT_FLAGS -Wall"
 export CFLAGS
 %configure \
+  --datarootdir='$(DESTDIR)/%{_datadir}' \
   --with-sitedir='%{sitedir}' \
   --with-default-kcode=none \
   --enable-shared \
   --enable-ipv6 \
-  --disable-pthread \
+  --enable-pthread \
   --with-lookup-order-hack=INET \
   --disable-rpath \
   --with-ruby-prefix=%{_prefix}/lib
 
-cp Makefile Makefile.orig
-sed -e 's/^EXTMK_ARGS[[:space:]].*=\(.*\) --$/EXTMK_ARGS=\1 --disable-tcl-thread --/' Makefile.orig > Makefile
+#cp Makefile Makefile.orig
+#sed -e 's/^EXTMK_ARGS[[:space:]].*=\(.*\) --$/EXTMK_ARGS=\1 --disable-tcl-thread --/' Makefile.orig > Makefile
 make RUBY_INSTALL_NAME=ruby %{?_smp_mflags}
 %ifarch ia64
 # Miscompilation? Buggy code?
@@ -297,7 +288,8 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
 
 # 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}
+make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} DESTDIR=$RPM_BUILD_ROOT install-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
 install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -329,7 +321,7 @@
 
 # for ruby-tcltk.rpm
 cp /dev/null ruby-tcltk.files
-for f in `find %{name}-%{version}/ext/tk/lib -type f; find %{name}-%{version}/ext/tk -type f -name '*.so'`
+for f in `find %{name}-%{version}/ext/tk/lib -type f; find %{name}-%{version}/.ext -type f -name '*.so'`
 do
   egrep "tcl|tk" ruby-all.files | grep "/`basename $f`$" >> ruby-tcltk.files || :
 done
@@ -452,6 +444,15 @@
 %endif
 
 %changelog
+* Mon Aug 28 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.5-1
+- New upstream release.
+- removed the unnecessary patches:
+  - ruby-1.8.4-no-eaccess.patch
+  - ruby-1.8.4-64bit-pack.patch
+  - ruby-1.8.4-fix-insecure-dir-operation.patch
+  - ruby-1.8.4-fix-insecure-regexp-modification.patch
+  - ruby-1.8.4-fix-alias-safe-level.patch
+
 * Mon Aug  7 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-12
 - owns sitearchdir. (#201208)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Dec 2005 03:49:08 -0000	1.14
+++ sources	28 Aug 2006 08:50:07 -0000	1.15
@@ -2,4 +2,4 @@
 d65e3a216d6d345a2a6f1aa8758c2f75  ruby-refm-rdp-1.8.1-ja-html.tar.gz
 7f3e181c0be9a1579e43a5a8b26372d6  rubyfaq-990927.tar.bz2
 8aa2e2da327dc43ff6e46e634eb657b6  rubyfaq-jp-990927.tar.bz2
-bd8c2e593e1fa4b01fd98eaf016329bb  ruby-1.8.4.tar.gz
+3fbb02294a8ca33d4684055adba5ed6f  ruby-1.8.5.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 28 08:51:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 04:51:31 -0400
Subject: rpms/ruby/devel ruby.spec,1.75,1.76
Message-ID: <200608280851.k7S8pVpV025548@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25521

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ruby.spec	28 Aug 2006 08:50:07 -0000	1.75
+++ ruby.spec	28 Aug 2006 08:51:29 -0000	1.76
@@ -452,6 +452,7 @@
   - ruby-1.8.4-fix-insecure-dir-operation.patch
   - ruby-1.8.4-fix-insecure-regexp-modification.patch
   - ruby-1.8.4-fix-alias-safe-level.patch
+- build with --enable-pthread. (#201452)
 
 * Mon Aug  7 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-12
 - owns sitearchdir. (#201208)



From fedora-cvs-commits at redhat.com  Mon Aug 28 09:04:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 05:04:09 -0400
Subject: rpms/ruby/devel ruby.spec,1.76,1.77
Message-ID: <200608280904.k7S949YH029002@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28966

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ruby.spec	28 Aug 2006 08:51:29 -0000	1.76
+++ ruby.spec	28 Aug 2006 09:04:06 -0000	1.77
@@ -164,7 +164,6 @@
 CFLAGS="$RPM_OPT_FLAGS -Wall"
 export CFLAGS
 %configure \
-  --datarootdir='$(DESTDIR)/%{_datadir}' \
   --with-sitedir='%{sitedir}' \
   --with-default-kcode=none \
   --enable-shared \



From fedora-cvs-commits at redhat.com  Mon Aug 28 09:20:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 05:20:30 -0400
Subject: rpms/vixie-cron/devel vixie-cron.spec,1.74,1.75
Message-ID: <200608280920.k7S9KUOY016300@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16140

Modified Files:
	vixie-cron.spec 
Log Message:
Changes in spec file (#204230).



Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- vixie-cron.spec	25 Aug 2006 11:41:51 -0000	1.74
+++ vixie-cron.spec	28 Aug 2006 09:20:28 -0000	1.75
@@ -2,15 +2,15 @@
 %define WITH_SELINUX 1
 %endif
 %if %{?WITH_PAM:0}%{!?WITH_PAM:1}
-%define WITH_PAM 1
+%define WITH_PAM 0
 %endif
 %if %{?WITH_AUDIT:0}%{!?WITH_AUDIT:1}
 %define WITH_AUDIT 1
 %endif
 Summary: The Vixie cron daemon for executing specified programs at set times.
-Name: vixie-cron
+Name: 	 vixie-cron
 Version: 4.1
-Release: 60%{?dist}
+Release: 61%{?dist}
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -197,6 +197,9 @@
 install -m755 $RPM_SOURCE_DIR/vixie-cron.init $RPM_BUILD_ROOT/etc/rc.d/init.d/crond
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond
+%if ! %{WITH_PAM}
+    rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -232,10 +235,15 @@
 %attr(700,root,root) %dir /var/spool/cron
 %attr(700,root,root) %dir /etc/cron.d
 %config /etc/rc.d/init.d/crond
-%config /etc/pam.d/crond
+%if %{WITH_PAM}   
+    %config /etc/pam.d/crond
+%endif
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Mon Aug 28 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-61
+- changes in spec file (#204230)
+
 * Fri Aug 25 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-60
 - patch from Jose Plans fixed: Job delayed after using crontab -e
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 09:30:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 05:30:42 -0400
Subject: rpms/gamin/devel gamin-flush-buffer-on-reset.patch, NONE,
	1.1 gamin.spec, 1.49, 1.50
Message-ID: <200608280930.k7S9Ugbm019835@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gamin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19778

Modified Files:
	gamin.spec 
Added Files:
	gamin-flush-buffer-on-reset.patch 
Log Message:
* Mon Aug 28 2006 Alexander Larsson <alexl at redhat.com> - 0.1.7-4
- Flush in-buffer on connection reset (#196444)
- Patch from Ariel T. Glenn



gamin-flush-buffer-on-reset.patch:
 gam_data.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gamin-flush-buffer-on-reset.patch ---
Index: libgamin/gam_data.c
===================================================================
RCS file: /cvs/gnome/gamin/libgamin/gam_data.c,v
retrieving revision 1.18
diff -u -p -r1.18 gam_data.c
--- libgamin/gam_data.c	11 Aug 2006 09:29:53 -0000	1.18
+++ libgamin/gam_data.c	28 Aug 2006 09:25:26 -0000
@@ -539,6 +539,7 @@ gamin_data_reset(GAMDataPtr conn, GAMReq
     conn->reqno = 1;
     conn->restarted = 1;
     conn->evn_ready = 0;
+    conn->evn_read = 0;
     return(conn->req_nr);
 }
 


Index: gamin.spec
===================================================================
RCS file: /cvs/dist/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gamin.spec	22 Aug 2006 15:10:31 -0000	1.49
+++ gamin.spec	28 Aug 2006 09:30:33 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -13,6 +13,7 @@
 
 Patch1:         gamin-dont-close-fd.patch
 Patch2:         gamin-stdin-devnull.patch
+Patch3:         gamin-flush-buffer-on-reset.patch
 
 %description
 This C library provides an API and ABI compatible file alteration
@@ -47,6 +48,7 @@
 
 %patch1 -p0 -b .dont-close-fd
 %patch2 -p0 -b .stdin-devnull
+%patch3 -p0 -b .flush-buffer-on-reset
 
 %build
 %configure
@@ -94,6 +96,10 @@
 %doc doc/python.html
 
 %changelog
+* Mon Aug 28 2006 Alexander Larsson <alexl at redhat.com> - 0.1.7-4
+- Flush in-buffer on connection reset (#196444)
+- Patch from Ariel T. Glenn
+
 * Tue Aug 22 2006 Alexander Larsson <alexl at redhat.com> - 0.1.7-3
 - Use /dev/null as stdin/out/err when spawning gam_server
 - This could help if there is stdout output somewhere.



From fedora-cvs-commits at redhat.com  Mon Aug 28 10:18:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 06:18:27 -0400
Subject: rpms/busybox/devel busybox-1.2.0-tar.patch, NONE, 1.1 busybox.spec,
	1.46, 1.47
Message-ID: <200608281018.k7SAIRE2031763@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26184

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.2.0-tar.patch 
Log Message:
- fix #202891 - tar problem


busybox-1.2.0-tar.patch:
 tar.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE busybox-1.2.0-tar.patch ---
--- busybox-1.2.0/archival/tar.c.pom	2006-07-01 00:42:04.000000000 +0200
+++ busybox-1.2.0/archival/tar.c	2006-08-28 11:39:42.000000000 +0200
@@ -45,6 +45,9 @@
 
 #define TAR_BLOCK_SIZE		512
 
+static const int TAR_MAGIC_LEN = 6;
+static const int TAR_VERSION_LEN = 2;
+
 /* POSIX tar Header Block, from POSIX 1003.1-1990  */
 #define NAME_SIZE			100
 struct TarHeader {		/* byte offset */
@@ -211,7 +214,9 @@
 	putOctal(header.gid, sizeof(header.gid), statbuf->st_gid);
 	putOctal(header.size, sizeof(header.size), 0);	/* Regular file size is handled later */
 	putOctal(header.mtime, sizeof(header.mtime), statbuf->st_mtime);
-	strcpy(header.magic, "ustar  ");
+	
+	strncpy(header.magic, "ustar ",TAR_MAGIC_LEN);
+	strncpy(header.version," ",TAR_VERSION_LEN);
 
 	/* Enter the user and group names (default to root if it fails) */
 	if (bb_getpwuid(header.uname, statbuf->st_uid, sizeof(header.uname)) == NULL)


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- busybox.spec	12 Jul 2006 05:29:38 -0000	1.46
+++ busybox.spec	28 Aug 2006 10:18:24 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.2.0
-Release: 1.1
+Release: 2
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
@@ -13,6 +13,7 @@
 Patch5: busybox-1.2.0-page_size.patch
 Patch7: busybox-1.2.0-id_ps.patch
 Patch8: busybox-1.2.0-gcc41.patch
+Patch9: busybox-1.2.0-tar.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -46,6 +47,7 @@
 %patch5 -b .ia64 -p1
 %patch7 -b .id_ps -p1
 %patch8 -b .gcc111 -p1
+%patch9 -b .tar -p1
 
 %build
 make defconfig
@@ -84,6 +86,9 @@
 /sbin/busybox.anaconda
 
 %changelog
+* Mon Aug 28 2006 Ivana Varekova <varekova at redhat.com> - 1:1.2.0-2
+- fix #202891 - tar problem
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.0-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 10:25:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 06:25:33 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch, 1.3,
	1.4 openoffice.org.spec, 1.862, 1.863
Message-ID: <200608281025.k7SAPXB4001560@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1497

Modified Files:
	openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch 
	openoffice.org.spec 
Log Message:
rh#204173# rh#203063# fix crash, and better handle glyph replacement

openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch:
 inc/outdev.h             |    3 +--
 inc/sallayout.hxx        |    1 +
 source/gdi/outdev3.cxx   |   44 +++++++++++++++++++++++++-------------------
 source/gdi/sallayout.cxx |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 71 insertions(+), 23 deletions(-)

Index: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch	24 Aug 2006 12:18:01 -0000	1.3
+++ openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch	28 Aug 2006 10:25:30 -0000	1.4
@@ -1,6 +1,6 @@
-diff -ru vcl.orig/inc/outdev.h vcl/inc/outdev.h
---- openoffice.org.orig/vcl/inc/outdev.h	2006-08-23 10:05:16.000000000 +0100
-+++ openoffice.org/vcl/inc/outdev.h	2006-08-23 10:13:54.000000000 +0100
+diff -ru vcl/inc/outdev.h vcl/inc/outdev.h
+--- openoffice.org.orig/vcl/inc/outdev.h	2006-08-28 10:10:31.000000000 +0100
++++ openoffice.org/vcl/inc/outdev.h	2006-08-28 10:12:31.000000000 +0100
 @@ -213,8 +213,7 @@
                               const Font& rFont, const Size& rSize, ImplFontSubstEntry* pDevSpecific );
      ImplFontEntry*      GetFallback( ImplDevFontList* pFontList,
@@ -11,9 +11,20 @@
      void                Release( ImplFontEntry* );
      void                Invalidate();
  };
-diff -ru vcl.orig/source/gdi/outdev3.cxx vcl/source/gdi/outdev3.cxx
---- openoffice.org.orig/vcl/source/gdi/outdev3.cxx	2006-08-23 10:05:02.000000000 +0100
-+++ openoffice.org/vcl/source/gdi/outdev3.cxx	2006-08-23 10:28:30.000000000 +0100
+diff -ru vcl/inc/sallayout.hxx vcl/inc/sallayout.hxx
+--- openoffice.org.orig/vcl/inc/sallayout.hxx	2006-08-28 10:10:31.000000000 +0100
++++ openoffice.org/vcl/inc/sallayout.hxx	2006-08-28 10:24:05.000000000 +0100
+@@ -101,6 +101,7 @@
+     bool    GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) const;
+     bool    GetNextPos( int* nCharPos, bool* bRTL );
+     bool    PosIsInRun( int nCharPos ) const;
++    bool    PosIsInAnyRun( int nCharPos ) const;
+ };
+ 
+ // -----------------
+diff -ru vcl/source/gdi/outdev3.cxx vcl/source/gdi/outdev3.cxx
+--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx	2006-08-28 10:10:31.000000000 +0100
++++ openoffice.org/vcl/source/gdi/outdev3.cxx	2006-08-28 10:23:36.000000000 +0100
 @@ -3128,7 +3128,7 @@
  
  ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList,
@@ -41,61 +52,63 @@
          if ( aSelData.maSearchName.Len() )
              cached = true;
      }
-@@ -3180,10 +3178,24 @@
+@@ -3180,10 +3178,26 @@
      if ( !cached )
      {
          String aName(GetFcSubstitute( aSelData, aGlyphs ));
 -      if (aName.Len())
--            aSelData.maSearchName = aName;
-+		if (aName.Len())
-+			aSelData.maSearchName = aName;
++        if (aName.Len())
+             aSelData.maSearchName = aName;
      }
  
-+	if (!rMissingGlyphs.empty())
-+	{
++    if (!rMissingGlyphs.empty())
++    {
 +        std::vector<sal_Unicode>::const_iterator aEnd = aGlyphs.end();
 +        for (std::vector<sal_Unicode>::const_iterator aI = aGlyphs.begin(); aI != aEnd; ++aI)
-+		{
-+            rMissingGlyphs.erase(std::remove(rMissingGlyphs.begin(), rMissingGlyphs.end(), *aI));
-+
-+			//In this case only the first missing symbol has been taken into account, and is 
-+			//known safe to replace
-+			if (cached || symbolFont)
-+				break;
-+		}
-+	}
++        {
++            std::vector<sal_Unicode>::iterator aNewEnd = 
++                std::remove(rMissingGlyphs.begin(), rMissingGlyphs.end(), *aI);
++            if (aNewEnd != rMissingGlyphs.end())
++                rMissingGlyphs.erase(aNewEnd);
++            //In this case only the first missing symbol has been taken into account and is
++            //known safe to replace
++            if (cached || symbolFont)
++                break;
++        }
++    }
 +
      // Check our font instance cache first, if not found then
      // add this ImplFontSelectData to the cache along with its ImplFontEntry
      FontInstanceList::const_iterator it = maFontInstanceList.find( aSelData );
-@@ -6257,14 +6269,9 @@
+@@ -6257,14 +6271,9 @@
  #endif
      int nCharPos = -1;
      bool bRTL = false;
 -    sal_Unicode *pMissingUnicodes = new sal_Unicode[8];
 -    int nMissingUnicodes = 0;
 -
-+    std::vector<sal_Unicode> aGlyphs;
-     for( int i=0; i<8 && rLayoutArgs.GetNextPos( &nCharPos, &bRTL); ++i )
+-    for( int i=0; i<8 && rLayoutArgs.GetNextPos( &nCharPos, &bRTL); ++i )
 -    {
 -        pMissingUnicodes[i] = rLayoutArgs.mpStr[ nCharPos ];
 -        nMissingUnicodes++;
 -    }
++    std::vector<sal_Unicode> aGlyphs;
++    while (rLayoutArgs.GetNextPos( &nCharPos, &bRTL))
 +        aGlyphs.push_back(rLayoutArgs.mpStr[ nCharPos ]);
      rLayoutArgs.ResetPos();
  
      ImplFontSelectData aFontSelData = mpFontEntry->maFontSelData;
-@@ -6282,8 +6289,7 @@
+@@ -6282,8 +6291,7 @@
      {
          // find a font family suited for glyph fallback
          ImplFontEntry* pFallbackFont = mpFontCache->GetFallback( mpFontList,
 -            maFont, aFontSize, nFallbackLevel-nDevSpecificFallback,
 -            (nMissingUnicodes ? pMissingUnicodes : NULL), nMissingUnicodes );
-+            maFont, aFontSize, nFallbackLevel-nDevSpecificFallback, aGlyphs);
++            maFont, aFontSize, nFallbackLevel-nDevSpecificFallback, aGlyphs );
          if( !pFallbackFont )
              break;
  
-@@ -6335,8 +6341,6 @@
+@@ -6335,8 +6343,6 @@
              break;
      }
  
@@ -104,15 +117,87 @@
      if( pMultiSalLayout && pMultiSalLayout->LayoutText( rLayoutArgs ) )
          pSalLayout = pMultiSalLayout;
  
-diff -ru vcl.orig/source/gdi/sallayout.cxx vcl/source/gdi/sallayout.cxx
---- openoffice.org.orig/vcl/source/gdi/sallayout.cxx	2006-08-23 10:05:02.000000000 +0100
-+++ openoffice.org/vcl/source/gdi/sallayout.cxx	2006-08-23 10:06:12.000000000 +0100
-@@ -1712,7 +1715,7 @@
+diff -ru vcl/source/gdi/sallayout.cxx vcl/source/gdi/sallayout.cxx
+--- openoffice.org.orig/vcl/source/gdi/sallayout.cxx	2006-08-28 10:10:31.000000000 +0100
++++ openoffice.org/vcl/source/gdi/sallayout.cxx	2006-08-28 10:36:03.000000000 +0100
+@@ -455,6 +455,27 @@
+     return true;
+ }
+ 
++bool ImplLayoutRuns::PosIsInAnyRun( int nCharPos ) const
++{
++    bool bRet = false;
++    int nRunIndex = mnRunIndex;
++
++    ImplLayoutRuns *pThis = const_cast<ImplLayoutRuns*>(this);
++
++    pThis->ResetPos();
++
++    for (int i = 0; i < maRuns.size(); i+=2)
++    {
++        if ((bRet = PosIsInRun( nCharPos )))
++            break;
++        pThis->NextRun();
++    }
++
++    pThis->mnRunIndex = nRunIndex;
++    return bRet;
++}
++
++
+ // -----------------------------------------------------------------------
+ 
+ bool ImplLayoutRuns::GetNextPos( int* nCharPos, bool* bRightToLeft )
+@@ -1693,7 +1714,7 @@
+     {
+         // find best fallback level
+         for( n = 0; n < nLevel; ++n )
+-            if( nValid[n] && !maFallbackRuns[n].PosIsInRun( nActiveCharPos ) )
++            if( nValid[n] && !maFallbackRuns[n].PosIsInAnyRun( nActiveCharPos ) )
+                 // fallback level n wins when it requested no further fallback
+                 break;
+         int nFBLevel = n;
+@@ -1715,7 +1736,10 @@
          if( n > 0 )
          {
              // drop the NotDef glyphs in the base layout run if a fallback run exists
 -            while( maFallbackRuns[ n-1 ].PosIsInRun( nCharPos[0] ) )
-+            while (( maFallbackRuns[ n-1 ].PosIsInRun( nCharPos[0] ) ) && ( !maFallbackRuns[ n ].PosIsInRun( nCharPos[0] ) ))
++            while ( 
++                    (maFallbackRuns[ n-1 ].PosIsInRun( nCharPos[0] ) ) &&
++                    (!maFallbackRuns[ n ].PosIsInAnyRun( nCharPos[0] ) )
++                  )
              {
                  mpLayouts[0]->DropGlyph( nStartOld[0] );
                  nStartOld[0] = nStartNew[0];
+@@ -1735,6 +1759,7 @@
+ 
+             // proceed to next glyph
+             nStartOld[n] = nStartNew[n];
++            int nOrigCharPos = nCharPos[n];
+             nValid[n] = mpLayouts[n]->GetNextGlyphs( 1, &nDummy, aPos,
+                 nStartNew[n], &nGlyphAdv[n], &nCharPos[n] );
+ 
+@@ -1747,6 +1772,23 @@
+                 break;
+             }
+ 
++            //If the next character is one which belongs to the next level, then we
++            //are finished here for now, and we'll pick up after the next level has
++            //been processed
++            if ((n+1 < nLevel) && (std::abs(nCharPos[n] - nOrigCharPos)))
++            {
++                if (nOrigCharPos < nCharPos[n])
++                {
++                    if (nCharPos[n+1] > nOrigCharPos && (nCharPos[n+1] < nCharPos[n]))
++                        break;
++                }
++                else if (nOrigCharPos < nCharPos[n])
++                {
++                    if (nCharPos[n+1] > nCharPos[n] && (nCharPos[n+1] < nOrigCharPos))
++                        break;
++                }
++            }
++
+             // break at end of layout run
+             if( n > 0 )
+             {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.862
retrieving revision 1.863
diff -u -r1.862 -r1.863
--- openoffice.org.spec	25 Aug 2006 10:26:14 -0000	1.862
+++ openoffice.org.spec	28 Aug 2006 10:25:30 -0000	1.863
@@ -2508,6 +2508,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Aug 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-2.2
+- rh#203063# Glyph replacement work when single run has multiple fonts
+- rh#204173# Crash on Glyph replacement when single run has single glyph
+  for multiple character positions
+
 * Fri Aug 25 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-2.1
 - fix openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 - fix openoffice.org-2.0.4.ooo68805.sw.ww8size.patch



From fedora-cvs-commits at redhat.com  Mon Aug 28 10:26:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 06:26:14 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.863,1.864
Message-ID: <200608281026.k7SAQE4n001780@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1747

Modified Files:
	openoffice.org.spec 
Log Message:
rh#204173# rh#203063# fix crash, and better handle glyph replacement


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.863
retrieving revision 1.864
diff -u -r1.863 -r1.864
--- openoffice.org.spec	28 Aug 2006 10:25:30 -0000	1.863
+++ openoffice.org.spec	28 Aug 2006 10:26:12 -0000	1.864
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 2
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # gcc#19664#
 %define stlvisibilityfcked 1



From fedora-cvs-commits at redhat.com  Mon Aug 28 10:50:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 06:50:16 -0400
Subject: rpms/ltrace/devel ltrace.spec,1.50,1.51
Message-ID: <200608281050.k7SAoGZN022929@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22814

Modified Files:
	ltrace.spec 
Log Message:
- enabling testsuite in hunt for testsuite fail on ppc



Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ltrace.spec	28 Aug 2006 08:38:27 -0000	1.50
+++ ltrace.spec	28 Aug 2006 10:50:14 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 3.45svn%{?dist}
+Release: 4.45svn%{?dist}
 Source: ltrace-0.5.tar.gz
 Patch2: ltrace-0.5-opd.patch
 Patch3: ltrace-ppc32fc5.patch
@@ -43,10 +43,7 @@
 
 %check
 echo ====================TESTING=========================
-%ifarch ppc
-%else
 make check
-%endif
 echo ====================TESTING END=====================
 
 %clean
@@ -60,6 +57,9 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Wed Aug 28 2006 Petr Machata <pmachata at redhat.com> - 0.5-4.45svn
+- enabling testsuite in hunt for testsuite fail on ppc
+
 * Wed Aug 23 2006 Petr Machata <pmachata at redhat.com> - 0.5-3.45svn
 - use "{X}.{release}svn" release string per naming guidelines
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 11:08:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 07:08:28 -0400
Subject: rpms/ruby/devel ruby.spec,1.77,1.78
Message-ID: <200608281108.k7SB8S9h005257@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5244

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ruby.spec	28 Aug 2006 09:04:06 -0000	1.77
+++ ruby.spec	28 Aug 2006 11:08:12 -0000	1.78
@@ -161,20 +161,29 @@
 
 rb_cv_func_strtod=no
 export rb_cv_func_strtod
-CFLAGS="$RPM_OPT_FLAGS -Wall"
+CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing"
 export CFLAGS
 %configure \
   --with-sitedir='%{sitedir}' \
   --with-default-kcode=none \
+  --with-bundled-sha1 \
+  --with-bundled-md5 \
+  --with-bundled-rmd160 \
   --enable-shared \
   --enable-ipv6 \
+%ifarch ppc
+  --disable-pthread \
+%else
   --enable-pthread \
+%endif
   --with-lookup-order-hack=INET \
   --disable-rpath \
   --with-ruby-prefix=%{_prefix}/lib
 
-#cp Makefile Makefile.orig
-#sed -e 's/^EXTMK_ARGS[[:space:]].*=\(.*\) --$/EXTMK_ARGS=\1 --disable-tcl-thread --/' Makefile.orig > Makefile
+%ifarch ppc
+cp Makefile Makefile.orig
+sed -e 's/^EXTMK_ARGS[[:space:]].*=\(.*\) --$/EXTMK_ARGS=\1 --disable-tcl-thread --/' Makefile.orig > Makefile
+%endif
 make RUBY_INSTALL_NAME=ruby %{?_smp_mflags}
 %ifarch ia64
 # Miscompilation? Buggy code?
@@ -320,7 +329,7 @@
 
 # for ruby-tcltk.rpm
 cp /dev/null ruby-tcltk.files
-for f in `find %{name}-%{version}/ext/tk/lib -type f; find %{name}-%{version}/.ext -type f -name '*.so'`
+for f in `find %{name}-%{version}/ext/tk/lib -type f; find %{name}-%{version}/.ext -type f -name '*.so'; find %{name}-%{version}/ext/tk -type f -name '*.so'`
 do
   egrep "tcl|tk" ruby-all.files | grep "/`basename $f`$" >> ruby-tcltk.files || :
 done
@@ -451,7 +460,7 @@
   - ruby-1.8.4-fix-insecure-dir-operation.patch
   - ruby-1.8.4-fix-insecure-regexp-modification.patch
   - ruby-1.8.4-fix-alias-safe-level.patch
-- build with --enable-pthread. (#201452)
+- build with --enable-pthread except on ppc.
 
 * Mon Aug  7 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-12
 - owns sitearchdir. (#201208)



From fedora-cvs-commits at redhat.com  Mon Aug 28 11:40:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 07:40:46 -0400
Subject: rpms/iso-codes/devel .cvsignore, 1.4, 1.5 iso-codes.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200608281140.k7SBek19031606@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/iso-codes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31537

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Mon Aug 28 2006 Christopher Aillon <caillon at redhat.com> 0.53-1
- Update to 0.53



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Jan 2006 19:51:06 -0000	1.4
+++ .cvsignore	28 Aug 2006 11:40:44 -0000	1.5
@@ -1,3 +1 @@
-iso-codes_0.46.orig.tar.gz
-iso-codes_0.47.orig.tar.gz
-iso-codes_0.49.orig.tar.gz
+iso-codes_0.53.orig.tar.gz


Index: iso-codes.spec
===================================================================
RCS file: /cvs/dist/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iso-codes.spec	25 Jun 2006 03:39:47 -0000	1.7
+++ iso-codes.spec	28 Aug 2006 11:40:44 -0000	1.8
@@ -1,19 +1,16 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	0.49
-Release:	2
+Version:	0.53
+Release:	1
 License:	LGPL
 Group:	System Environment/Base
 URL:	http://alioth.debian.org/projects/pkg-isocodes/
-Source:	iso-codes_%{version}.orig.tar.gz
+Source:	http://ftp.debian.org/debian/pool/main/i/iso-codes/iso-codes_%{version}.orig.tar.gz
 BuildRequires:	gettext
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
-# Blah, 0.49 didn't run autogen.sh before packaging.  Boo.
-BuildRequires: autoconf automake
-
 %description
 This package provides the ISO-639 Language code list, the ISO-3166 
 Territory code list, and ISO-3166-2 sub-territory lists, and all their 
@@ -33,8 +30,6 @@
 %setup -q
 
 %build
-# Blah, 0.49 didn't run autogen.sh before packaging.  Boo.
-./autogen.sh
 %{__mv} ./LGPL-2.1 ./COPYING
 
 %configure
@@ -61,6 +56,9 @@
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Mon Aug 28 2006 Christopher Aillon <caillon at redhat.com> 0.53-1
+- Update to 0.53
+
 * Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> 0.49-2
 - Missing BR gettext
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iso-codes/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Jan 2006 19:51:06 -0000	1.4
+++ sources	28 Aug 2006 11:40:44 -0000	1.5
@@ -1 +1 @@
-62b7f9469e00b92558d5d043a4be3910  iso-codes_0.49.orig.tar.gz
+8459445fd437e3dbe5d4b03478cd29f5  iso-codes_0.53.orig.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 28 11:46:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 07:46:28 -0400
Subject: rpms/evolution/devel evolution-2.7.92-fix-edit-copy.patch, NONE,
	1.1 evolution.spec, 1.185, 1.186
Message-ID: <200608281146.k7SBkSAC005034@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3337

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.92-fix-edit-copy.patch 
Log Message:

* Mon Aug 28 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-5.fc6
- Add patch for RH bug #201541.


evolution-2.7.92-fix-edit-copy.patch:
 em-folder-view.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE evolution-2.7.92-fix-edit-copy.patch ---
--- evolution-2.7.92/mail/em-folder-view.c.fix-edit-copy	2006-08-28 06:36:52.000000000 -0400
+++ evolution-2.7.92/mail/em-folder-view.c	2006-08-28 06:37:22.000000000 -0400
@@ -140,7 +140,7 @@
 static void emfv_on_url(EMFolderView *emfv, const char *uri, const char *nice_uri);
 
 static void emfv_set_seen (EMFolderView *emfv, const char *uid);
-
+static gboolean emfv_on_html_button_released_cb (GtkHTML *html, GdkEventButton *button, EMFolderView *emfv);
 static gboolean emfv_popup_menu (GtkWidget *widget);
 
 static const EMFolderViewEnable emfv_enable_map[];
@@ -223,6 +223,7 @@
 	g_signal_connect(emfv->preview, "link_clicked", G_CALLBACK(emfv_format_link_clicked), emfv);
 	g_signal_connect(emfv->preview, "popup_event", G_CALLBACK(emfv_format_popup_event), emfv);
 	g_signal_connect (emfv->preview, "on_url", G_CALLBACK (emfv_on_url_cb), emfv);
+	g_signal_connect (((EMFormatHTML *)emfv->preview)->html, "button-release-event", G_CALLBACK (emfv_on_html_button_released_cb), emfv);
 #ifdef ENABLE_PROFILING
 	g_signal_connect(emfv->preview, "complete", G_CALLBACK (emfv_format_complete), emfv);
 #endif
@@ -2877,3 +2878,15 @@
 	
 	g_free (nice_url);
 }
+
+static gboolean
+emfv_on_html_button_released_cb (GtkHTML *html, GdkEventButton *button, EMFolderView *emfv)
+{
+	gboolean selected;
+	
+	selected = gtk_html_command (html, "is-selection-active");
+	bonobo_ui_component_set_prop(emfv->uic, "/commands/EditCopy", "sensitive", selected?"1":"0", NULL);
+	
+	return FALSE;
+}
+	


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- evolution.spec	23 Aug 2006 18:22:04 -0000	1.185
+++ evolution.spec	28 Aug 2006 11:46:25 -0000	1.186
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.92
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -132,6 +132,9 @@
 Patch35: evolution-2.7.92-deprecated-glib.patch
 Patch36: evolution-2.7.92-deprecated-gdk.patch
 
+# RH bug #201541 / Gnome.org bug #336983
+Patch37: evolution-2.7.92-fix-edit-copy.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -270,6 +273,7 @@
 %patch34 -p1 -b .uninitialized-gerror
 %patch35 -p1 -b .deprecated-glib
 %patch36 -p1 -b .deprecated-gdk
+%patch37 -p1 -b .fix-edit-copy
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -660,6 +664,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Aug 28 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-5.fc6
+- Add patch for RH bug #201541.
+
 * Wed Aug 23 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-4.fc6
 - Add patches for Gnome.org bug #352450.
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 12:19:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 08:19:10 -0400
Subject: rpms/ruby/devel ruby.spec,1.78,1.79
Message-ID: <200608281219.k7SCJACk008838@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8807

Modified Files:
	ruby.spec 
Log Message:
trivial fix to build successfully


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ruby.spec	28 Aug 2006 11:08:12 -0000	1.78
+++ ruby.spec	28 Aug 2006 12:19:07 -0000	1.79
@@ -296,7 +296,7 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
 
 # generate ri doc
-make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} DESTDIR=$RPM_BUILD_ROOT install-doc
+make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} RUNRUBY="\$(MINIRUBY) -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os} \$(srcdir)/runruby.rb --extout=\$(EXTOUT) --" DESTDIR=$RPM_BUILD_ROOT install-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



From fedora-cvs-commits at redhat.com  Mon Aug 28 12:25:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 08:25:56 -0400
Subject: rpms/libtirpc/devel libtirpc-0.1.7-svcauthdestroy.patch, NONE,
	1.1 libtirpc.spec, 1.8, 1.9
Message-ID: <200608281225.k7SCPuJG011072@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/libtirpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11018

Modified Files:
	libtirpc.spec 
Added Files:
	libtirpc-0.1.7-svcauthdestroy.patch 
Log Message:
Fixed undefined symbol (bz 204296)


libtirpc-0.1.7-svcauthdestroy.patch:
 svc_auth.h |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE libtirpc-0.1.7-svcauthdestroy.patch ---
--- libtirpc-0.1.7/tirpc/rpc/svc_auth.h.orig	2005-05-18 01:10:51.000000000 -0400
+++ libtirpc-0.1.7/tirpc/rpc/svc_auth.h	2006-08-28 08:13:37.801283000 -0400
@@ -54,6 +54,9 @@
 	caddr_t svc_ah_private;
 } SVCAUTH;
 
+#define SVCAUTH_DESTROY(cred)		((*(cred)->svc_ah_ops->svc_ah_destroy)())
+#define svcauth_destroy(cred)		((*(cred)->svc_ah_ops->svc_ah_destroy)())
+
 /*
  * Server side authenticator
  */


Index: libtirpc.spec
===================================================================
RCS file: /cvs/dist/rpms/libtirpc/devel/libtirpc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libtirpc.spec	16 Aug 2006 14:02:35 -0000	1.8
+++ libtirpc.spec	28 Aug 2006 12:25:53 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		   libtirpc
 Version:		0.1.7
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		GPL
@@ -34,6 +34,7 @@
 Patch2:	libtirpc-0.1.7-gssapi.patch
 Patch3:	libtirpc-0.1.7-svcauthnone.patch
 Patch4:	libtirpc-0.1.7-ppc64.patch
+Patch5:	libtirpc-0.1.7-svcauthdestroy.patch
 
 Patch100: libtirpc-0.1.7-compile.patch
 
@@ -48,6 +49,7 @@
 %patch2	-p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %patch100	-p1
 
@@ -123,6 +125,9 @@
 %{_includedir}/tirpc/un-namespace.h
 
 %changelog
+* Mon Aug 28 2006 Steve Dickson <steved at redhat.com> 0.1.7-4
+- Fixed undefined symbol (bz 204296)
+
 * Mon Aug 14 2006 Steve Dickson <steved at redhat.com> 0.1.7-3
 - Added in svc_auth_none needed by the GSSAPI code.
 - Added compile define for ppc64 archs



From fedora-cvs-commits at redhat.com  Mon Aug 28 12:29:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 08:29:30 -0400
Subject: rpms/busybox/devel busybox-1.2.0-dmesg.patch, NONE, 1.1 busybox.spec,
	1.47, 1.48
Message-ID: <200608281229.k7SCTULn012395@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12287

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.2.0-dmesg.patch 
Log Message:
 - fix #200470 - dmesg aborts
   backport dmesg upstream changes


busybox-1.2.0-dmesg.patch:
 dmesg.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE busybox-1.2.0-dmesg.patch ---
--- busybox-1.2.0/util-linux/dmesg.c.pom	2006-07-01 00:42:13.000000000 +0200
+++ busybox-1.2.0/util-linux/dmesg.c	2006-08-28 14:02:21.000000000 +0200
@@ -14,16 +14,16 @@
 int dmesg_main(int argc, char *argv[])
 {
 	char *size, *level;
-	int flags = bb_getopt_ulflags(argc, argv, "c:s:n:", &size, &level);
+	int flags = bb_getopt_ulflags(argc, argv, "cs:n:", &size, &level);
 
 	if (flags & 4) {
-		if(klogctl(8, NULL, bb_xgetlarg(size, 10, 0, 10)))
+		if(klogctl(8, NULL, bb_xgetlarg(level, 10, 0, 10)))
 			bb_perror_msg_and_die("klogctl");
 	} else {
 		int len;
 		char *buf;
 
-		len = (flags & 2) ? bb_xgetlarg(size, 10, 4096, INT_MAX) : 16384;
+		len = (flags & 2) ? bb_xgetlarg(size, 10, 2, INT_MAX) : 16384;
 		buf = xmalloc(len);
 		if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
 			bb_perror_msg_and_die("klogctl");


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- busybox.spec	28 Aug 2006 10:18:24 -0000	1.47
+++ busybox.spec	28 Aug 2006 12:29:27 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.2.0
-Release: 2
+Release: 3
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
@@ -14,6 +14,7 @@
 Patch7: busybox-1.2.0-id_ps.patch
 Patch8: busybox-1.2.0-gcc41.patch
 Patch9: busybox-1.2.0-tar.patch
+Patch10: busybox-1.2.0-dmesg.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -48,6 +49,7 @@
 %patch7 -b .id_ps -p1
 %patch8 -b .gcc111 -p1
 %patch9 -b .tar -p1
+%patch10 -b .dmesg -p1
 
 %build
 make defconfig
@@ -86,6 +88,10 @@
 /sbin/busybox.anaconda
 
 %changelog
+* Mon Aug 28 2006 Ivana Varekova <varekova at redhat.com> - 1:1.2.0-3
+- fix #200470 - dmesg aborts
+  backport dmesg upstream changes
+
 * Mon Aug 28 2006 Ivana Varekova <varekova at redhat.com> - 1:1.2.0-2
 - fix #202891 - tar problem
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 12:47:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 08:47:25 -0400
Subject: rpms/firefox/devel firefox.spec,1.145,1.146
Message-ID: <200608281247.k7SClPFG020408@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19919

Modified Files:
	firefox.spec 
Log Message:
* Mon Aug 28 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-8
- Turn visibility back off again for now, as it still breaks the build.



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- firefox.spec	26 Aug 2006 04:43:26 -0000	1.145
+++ firefox.spec	28 Aug 2006 12:47:20 -0000	1.146
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.6
-Release:        7
+Release:        8
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -124,7 +124,7 @@
 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
 # UPDATE: 2006-07-24: i386 is also broken now.
 #%ifnarch i386
-#%patch5  -p0
+%patch5  -p0
 #%endif
 
 %patch20 -p0
@@ -356,6 +356,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Aug 28 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-8
+- Turn visibility back off again for now, as it still breaks the build.
+
 * Sat Aug 26 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.5.0.6-7
 - Remove "Pango breaks MathML" from firefox-1.5-pango-about.patch
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 12:57:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 08:57:54 -0400
Subject: rpms/kdebase/FC-5 kdebase.spec,1.185,1.186
Message-ID: <200608281257.k7SCvsbZ002469@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2421

Modified Files:
	kdebase.spec 
Log Message:
fix broken deps for s390(x)



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- kdebase.spec	25 Aug 2006 12:36:57 -0000	1.185
+++ kdebase.spec	28 Aug 2006 12:57:52 -0000	1.186
@@ -16,7 +16,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 0.3.fc5
+Release: 0.4.fc5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -81,7 +81,9 @@
 Requires: desktop-backgrounds-basic
 Requires: redhat-menus => 1.2
 Requires: redhat-artwork >= 0.92
+%ifnarch s390 s390x
 requires: eject
+%endif
 
 BuildRequires: kdelibs-devel >= %{version}
 BuildRequires: samba >= 2.2.3a-5
@@ -535,6 +537,9 @@
 
 
 %changelog
+* Mon Aug 28 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.4.fc5
+- fix broken deps for s390(x)
+
 * Fri Aug 25 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.3.fc5
 - fix #203221, konsole does not display bold characters
 - fix #203083, correct htdig settings



From fedora-cvs-commits at redhat.com  Mon Aug 28 13:23:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 09:23:17 -0400
Subject: rpms/kernel/devel linux-2.6-xen-ia64-add_hvm_op.patch, NONE,
	1.1 linux-2.6-xen-ia64-maddr.h.patch, NONE,
	1.1 linux-2.6-xen-ia64-setup-fix.patch, NONE,
	1.1 kernel-2.6.spec, 1.2595, 1.2596
Message-ID: <200608281323.k7SDNHSa024251@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24215

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-xen-ia64-add_hvm_op.patch 
	linux-2.6-xen-ia64-maddr.h.patch 
	linux-2.6-xen-ia64-setup-fix.patch 
Log Message:
fix ia64 xen building

linux-2.6-xen-ia64-add_hvm_op.patch:
 drivers/xen/xenbus/xenbus_probe.c |    1 +
 include/asm-ia64/hypercall.h      |    7 +++++++
 2 files changed, 8 insertions(+)

--- NEW FILE linux-2.6-xen-ia64-add_hvm_op.patch ---
diff -urNp linux-2.6.17.prev/drivers/xen/xenbus/xenbus_probe.c linux-2.6.17.work/drivers/xen/xenbus/xenbus_probe.c
--- linux-2.6.17.prev/drivers/xen/xenbus/xenbus_probe.c	2006-08-25 16:50:16.000000000 -0400
+++ linux-2.6.17.work/drivers/xen/xenbus/xenbus_probe.c	2006-08-25 21:27:17.000000000 -0400
@@ -48,6 +48,7 @@
 #include <asm/maddr.h>
 #include <asm/pgtable.h>
 #include <asm/hypervisor.h>
+#include <asm/hypercall.h>
 #include <xen/xenbus.h>
 #include <xen/xen_proc.h>
 #include <xen/evtchn.h>
diff -urNp linux-2.6.17.prev/include/asm-ia64/hypercall.h linux-2.6.17.work/include/asm-ia64/hypercall.h
--- linux-2.6.17.prev/include/asm-ia64/hypercall.h	2006-08-25 16:50:16.000000000 -0400
+++ linux-2.6.17.work/include/asm-ia64/hypercall.h	2006-08-25 21:31:35.000000000 -0400
@@ -298,6 +298,13 @@ HYPERVISOR_callback_op(
 	return _hypercall2(int, callback_op, cmd, arg);
 }
 
+static inline unsigned long
+HYPERVISOR_hvm_op(
+	int cmd, void *arg)
+{
+	return _hypercall2(unsigned long, hvm_op, cmd, arg);
+}
+
 extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs);
 static inline void exit_idle(void) {}
 #define do_IRQ(irq, regs) ({			\


linux-2.6-xen-ia64-maddr.h.patch:
 b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h |   81 ++++++++++++++++++++++++
 linux-2.6-xen-sparse/include/asm-ia64/page.h    |   66 -------------------
 2 files changed, 82 insertions(+), 65 deletions(-)

--- NEW FILE linux-2.6-xen-ia64-maddr.h.patch ---
# HG changeset patch
# User awilliam at xenbuild.aw
# Date Wed Aug 23 11:15:29 2006 -0600
# Node ID 5264cc30d711ab7ba0e1c252853a4dba6faa7fa9
# parent: 8293018c1a24154f8f6c7aef6c07310afd4f64c6
[IA64] split parts of page.h into maddr.h

ia64 support for xen-unstable.hg cset 11081:9c953e1b6fad

Signed-off-by: Alex Williamson <alex.williamson at hp.com>



--- a/linux-2.6-xen-sparse/include/asm-ia64/page.h	Wed Aug 23 11:14:52 2006 -0600
+++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h	Wed Aug 23 11:15:29 2006 -0600
@@ -224,12 +224,9 @@ get_order (unsigned long size)
 #ifndef __ASSEMBLY__
 #ifdef CONFIG_XEN
 
-#define INVALID_P2M_ENTRY	(~0UL)
-
 #include <linux/kernel.h>
 #include <asm/hypervisor.h>
 #include <xen/features.h>	// to compile netback, netfront
-typedef unsigned long maddr_t;	// to compile netback, netfront
 
 /*
  * XXX hack!
@@ -268,68 +265,7 @@ extern struct address_space xen_ia64_for
 })
 #define HAVE_ARCH_FREE_PAGE
 
-/* XXX xen page size != page size */
-
-static inline unsigned long
-pfn_to_mfn_for_dma(unsigned long pfn)
-{
-	unsigned long mfn;
-	mfn = HYPERVISOR_phystomach(pfn);
-	BUG_ON(mfn == 0); // XXX
-	BUG_ON(mfn == INVALID_P2M_ENTRY); // XXX
-	BUG_ON(mfn == INVALID_MFN);
-	return mfn;
-}
-
-static inline unsigned long
-phys_to_machine_for_dma(unsigned long phys)
-{
-	unsigned long machine =
-	              pfn_to_mfn_for_dma(phys >> PAGE_SHIFT) << PAGE_SHIFT;
-	machine |= (phys & ~PAGE_MASK);
-	return machine;
-}
-
-static inline unsigned long
-mfn_to_pfn_for_dma(unsigned long mfn)
-{
-	unsigned long pfn;
-	pfn = HYPERVISOR_machtophys(mfn);
-	BUG_ON(pfn == 0);
-	//BUG_ON(pfn == INVALID_M2P_ENTRY);
-	return pfn;
-}
-
-static inline unsigned long
-machine_to_phys_for_dma(unsigned long machine)
-{
-	unsigned long phys =
-	              mfn_to_pfn_for_dma(machine >> PAGE_SHIFT) << PAGE_SHIFT;
-	phys |= (machine & ~PAGE_MASK);
-	return phys;
-}
-
-#define set_phys_to_machine(pfn, mfn) do { } while (0)
-#define xen_machphys_update(mfn, pfn) do { } while (0)
-
-/* XXX to compile set_phys_to_machine(vaddr, FOREIGN_FRAME(m)) */
-#define FOREIGN_FRAME(m)        (INVALID_P2M_ENTRY)
-
-#define mfn_to_pfn(mfn)			(mfn)
-#define mfn_to_virt(mfn)		(__va((mfn) << PAGE_SHIFT))
-#define pfn_to_mfn(pfn)			(pfn)
-#define virt_to_mfn(virt)		(__pa(virt) >> PAGE_SHIFT)
-#define virt_to_machine(virt)		__pa(virt) // for tpmfront.c
-
-static inline unsigned long
-mfn_to_local_pfn(unsigned long mfn)
-{
-	extern unsigned long max_mapnr;
-	unsigned long pfn = mfn_to_pfn_for_dma(mfn);
-	if (!pfn_valid(pfn))
-		return INVALID_P2M_ENTRY;
-	return pfn;
-}
+#include <asm/maddr.h>
 
 #endif /* CONFIG_XEN */
 #endif /* __ASSEMBLY__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h	Wed Aug 23 11:15:29 2006 -0600
@@ -0,0 +1,81 @@
+#ifndef _ASM_IA64_MADDR_H
+#define _ASM_IA64_MADDR_H
+
+#ifndef __ASSEMBLY__
+#ifdef CONFIG_XEN
+
+#define INVALID_P2M_ENTRY	(~0UL)
+
+#include <linux/kernel.h>
+#include <asm/hypervisor.h>
+#include <xen/features.h>	// to compile netback, netfront
+typedef unsigned long maddr_t;	// to compile netback, netfront
+
+
+/* XXX xen page size != page size */
+
+static inline unsigned long
+pfn_to_mfn_for_dma(unsigned long pfn)
+{
+	unsigned long mfn;
+	mfn = HYPERVISOR_phystomach(pfn);
+	BUG_ON(mfn == 0); // XXX
+	BUG_ON(mfn == INVALID_P2M_ENTRY); // XXX
+	BUG_ON(mfn == INVALID_MFN);
+	return mfn;
+}
+
+static inline unsigned long
+phys_to_machine_for_dma(unsigned long phys)
+{
+	unsigned long machine =
+	              pfn_to_mfn_for_dma(phys >> PAGE_SHIFT) << PAGE_SHIFT;
+	machine |= (phys & ~PAGE_MASK);
+	return machine;
+}
+
+static inline unsigned long
+mfn_to_pfn_for_dma(unsigned long mfn)
+{
+	unsigned long pfn;
+	pfn = HYPERVISOR_machtophys(mfn);
+	BUG_ON(pfn == 0);
+	//BUG_ON(pfn == INVALID_M2P_ENTRY);
+	return pfn;
+}
+
+static inline unsigned long
+machine_to_phys_for_dma(unsigned long machine)
+{
+	unsigned long phys =
+	              mfn_to_pfn_for_dma(machine >> PAGE_SHIFT) << PAGE_SHIFT;
+	phys |= (machine & ~PAGE_MASK);
+	return phys;
+}
+
+#define set_phys_to_machine(pfn, mfn) do { } while (0)
+#define xen_machphys_update(mfn, pfn) do { } while (0)
+
+/* XXX to compile set_phys_to_machine(vaddr, FOREIGN_FRAME(m)) */
+#define FOREIGN_FRAME(m)        (INVALID_P2M_ENTRY)
+
+#define mfn_to_pfn(mfn)			(mfn)
+#define mfn_to_virt(mfn)		(__va((mfn) << PAGE_SHIFT))
+#define pfn_to_mfn(pfn)			(pfn)
+#define virt_to_mfn(virt)		(__pa(virt) >> PAGE_SHIFT)
+#define virt_to_machine(virt)		__pa(virt) // for tpmfront.c
+
+static inline unsigned long
+mfn_to_local_pfn(unsigned long mfn)
+{
+	extern unsigned long max_mapnr;
+	unsigned long pfn = mfn_to_pfn_for_dma(mfn);
+	if (!pfn_valid(pfn))
+		return INVALID_P2M_ENTRY;
+	return pfn;
+}
+
+#endif /* CONFIG_XEN */
+#endif /* __ASSEMBLY__ */
+
+#endif /* _ASM_IA64_MADDR_H */


linux-2.6-xen-ia64-setup-fix.patch:
 setup.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-xen-ia64-setup-fix.patch ---
# HG changeset patch
# User awilliam at xenbuild.aw
# Date Wed Aug 23 11:14:52 2006 -0600
# Node ID 8293018c1a24154f8f6c7aef6c07310afd4f64c6
# parent: 79afceca906517b24cf9a94264a7f7ff97d9f458
[IA64] only setup extra vga console support on dom0

Signed-off-by: Alex Williamson <alex.williamson at hp.com>



--- a/linux-2.6-xen-sparse/arch/ia64/dig/setup.c	Wed Aug 23 11:11:27 2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/dig/setup.c	Wed Aug 23 11:14:52 2006 -0600
@@ -69,7 +69,7 @@ dig_setup (char **cmdline_p)
 	screen_info.orig_video_isVGA = 1;	/* XXX fake */
 	screen_info.orig_video_ega_bx = 3;	/* XXX fake */
 #ifdef CONFIG_XEN
-	if (!is_running_on_xen())
+	if (!is_running_on_xen() || !is_initial_xendomain())
 		return;
 
 	if (xen_start_info->console.dom0.info_size >=



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2595
retrieving revision 1.2596
diff -u -r1.2595 -r1.2596
--- kernel-2.6.spec	28 Aug 2006 07:58:34 -0000	1.2595
+++ kernel-2.6.spec	28 Aug 2006 13:23:11 -0000	1.2596
@@ -363,8 +363,9 @@
 Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
 Patch957: linux-2.6-xen-x86-relocatable.patch
 Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
-
-Patch990: linux-2.6-xen-compile-fixes.patch
+Patch959: linux-2.6-xen-ia64-maddr.h.patch
+patch960: linux-2.6-xen-ia64-setup-fix.patch
+Patch961: linux-2.6-xen-ia64-add_hvm_op.patch
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -876,7 +877,10 @@
 # ia64 xen cleanups for kexec/kdump
 %patch958 -p1
 
-#%patch990 -p1
+%patch959 -p2
+%patch960 -p2
+
+%patch961 -p1
 
 %endif
 
@@ -1804,6 +1808,9 @@
 %endif
 
 %changelog
+* Mon Aug 28 2006 Juan Quintela <quintela at redhat.com>
+- ia64 xen fixing.
+
 * Sun Aug 27 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix V4L1 stuff in <linux/videodev.h> (#204225)
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 13:23:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 09:23:17 -0400
Subject: rpms/kernel/devel/configs config-xen-ia64,1.3,1.4
Message-ID: <200608281323.k7SDNH3s024257@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv24215/configs

Modified Files:
	config-xen-ia64 
Log Message:
fix ia64 xen building


Index: config-xen-ia64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-ia64,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-xen-ia64	2 Aug 2006 17:30:20 -0000	1.3
+++ config-xen-ia64	28 Aug 2006 13:23:12 -0000	1.4
@@ -17,3 +17,6 @@
 
 # internal #defines conflict with xen-ia64
 # CONFIG_FB_NEOMAGIC is not set
+
+# don't work, missing symbols
+# CONFIG_KEXEC is not set
\ No newline at end of file



From fedora-cvs-commits at redhat.com  Mon Aug 28 13:47:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 09:47:58 -0400
Subject: rpms/ruby/devel ruby.spec,1.79,1.80
Message-ID: <200608281347.k7SDlw2j014378@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14265

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ruby.spec	28 Aug 2006 12:19:07 -0000	1.79
+++ ruby.spec	28 Aug 2006 13:47:56 -0000	1.80
@@ -296,7 +296,7 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
 
 # generate ri doc
-make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} RUNRUBY="\$(MINIRUBY) -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os} \$(srcdir)/runruby.rb --extout=\$(EXTOUT) --" DESTDIR=$RPM_BUILD_ROOT install-doc
+make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} RUNRUBY="\$(MINIRUBY) -I $RPM_BUILD_ROOT%{_libdir}/ruby//%{rubyxver} -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os} \$(srcdir)/runruby.rb --extout=\$(EXTOUT) --" DESTDIR=$RPM_BUILD_ROOT install-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



From fedora-cvs-commits at redhat.com  Mon Aug 28 13:51:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 09:51:15 -0400
Subject: rpms/eject/devel eject.spec,1.27,1.28
Message-ID: <200608281351.k7SDpFeV015558@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/eject/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15468

Modified Files:
	eject.spec 
Log Message:
fix #204222, Password error window popuped by calling "eject" command from remote




Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/eject.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- eject.spec	22 Aug 2006 17:04:13 -0000	1.27
+++ eject.spec	28 Aug 2006 13:51:12 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
 Version: 2.1.5
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
@@ -45,7 +45,7 @@
 install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/%{name}
 
 install -m 755 -d %{buildroot}/%{_sysconfdir}/security/console.apps/
-touch %{buildroot}/%{_sysconfdir}/security/console.apps/%{name}
+echo "FALLBACK=true" > %{buildroot}/%{_sysconfdir}/security/console.apps/%{name}
 
 install -m 755 -d %{buildroot}/%{_sbindir}
 pushd %{buildroot}/%{_bindir}
@@ -68,6 +68,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 28 2006 Than Ngo <than at redhat.com> 2.1.5-4
+- fix #204222, Password error window popuped by calling "eject" command from remote
+
 * Tue Aug 22 2006 Than Ngo <than at redhat.com> 2.1.5-3
 - made eject use pam 
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 14:05:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 10:05:39 -0400
Subject: rpms/bind/devel bind.spec,1.124,1.125
Message-ID: <200608281405.k7SE5dPZ029059@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29046

Modified Files:
	bind.spec 
Log Message:
Fix chcon for SELinux


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- bind.spec	22 Aug 2006 11:01:33 -0000	1.124
+++ bind.spec	28 Aug 2006 14:05:37 -0000	1.125
@@ -776,8 +776,8 @@
 
 %post -n caching-nameserver
 if [ "$1" -gt 0 ]; then
-   /usr/bin/chcon system_u:object_r:named_conf_t  /etc/named.caching-nameserver.conf >/dev/null 2>&1 || :;
-   /usr/bin/chcon system_u:object_r:named_conf_t  /etc/named.rfc1912.zones >/dev/null 2>&1 || :;
+   /usr/bin/chcon -t named_conf_t  /etc/named.caching-nameserver.conf >/dev/null 2>&1 || :;
+   /usr/bin/chcon -t named_conf_t  /etc/named.rfc1912.zones >/dev/null 2>&1 || :;
    . /usr/sbin/bind-chroot-admin --sync;
 fi;
 :;



From fedora-cvs-commits at redhat.com  Mon Aug 28 14:15:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 10:15:34 -0400
Subject: rpms/ruby/devel ruby.spec,1.80,1.81
Message-ID: <200608281415.k7SEFYEQ029298@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29283

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ruby.spec	28 Aug 2006 13:47:56 -0000	1.80
+++ ruby.spec	28 Aug 2006 14:15:32 -0000	1.81
@@ -296,7 +296,7 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
 
 # generate ri doc
-make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} RUNRUBY="\$(MINIRUBY) -I $RPM_BUILD_ROOT%{_libdir}/ruby//%{rubyxver} -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os} \$(srcdir)/runruby.rb --extout=\$(EXTOUT) --" DESTDIR=$RPM_BUILD_ROOT install-doc
+make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} RUNRUBY="\$(MINIRUBY) -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 \$(srcdir)/runruby.rb --extout=\$(EXTOUT) --" DESTDIR=$RPM_BUILD_ROOT install-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



From fedora-cvs-commits at redhat.com  Mon Aug 28 14:29:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 10:29:00 -0400
Subject: rpms/parted/FC-5 parted-1.7.0-aix.patch, NONE,
	1.1 parted-1.7.0-fat.c.patch, NONE,
	1.1 parted-1.7.0-iseries.patch, NONE,
	1.1 parted-1.7.0-sx8.patch, NONE,
	1.1 parted-1.7.1-O_DIRECT.patch, NONE,
	1.1 parted-1.7.1-dasd.patch, NONE, 1.1 parted-1.7.1-dm.patch,
	NONE, 1.1 parted-1.7.1-get_exception.patch, NONE,
	1.1 parted-1.7.1-gpt.patch, NONE,
	1.1 parted-1.7.1-vtoc-errbuf.patch, NONE,
	1.1 parted-1.7.1.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.22,
	1.23 parted.spec, 1.65, 1.66 sources, 1.26,
	1.27 parted-1.6.15-dasd_geometry.patch, 1.1,
	NONE parted-1.6.23-aix.patch, 1.1,
	NONE parted-1.6.25-dasd.patch, 1.1,
	NONE parted-1.6.25-dm.patch, 1.6,
	NONE parted-1.6.25-iseries.patch, 1.1,
	NONE parted-1.6.25-mac-swraid.patch, 1.1,
	NONE parted-1.6.25-sgio.patch, 1.1,
	NONE parted-1.6.25-sx8.patch, 1.1,
	NONE parted-1.6.25.tar.gz.sig, 1.1,
	NONE parted-1.6.3-fat.c.patch, 1.1, NONE upstream, 1.1,
	NONE upstream-key.gpg, 1.1, NONE
Message-ID: <200608281429.k7SET0mo012202@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12187

Modified Files:
	.cvsignore parted.spec sources 
Added Files:
	parted-1.7.0-aix.patch parted-1.7.0-fat.c.patch 
	parted-1.7.0-iseries.patch parted-1.7.0-sx8.patch 
	parted-1.7.1-O_DIRECT.patch parted-1.7.1-dasd.patch 
	parted-1.7.1-dm.patch parted-1.7.1-get_exception.patch 
	parted-1.7.1-gpt.patch parted-1.7.1-vtoc-errbuf.patch 
	parted-1.7.1.tar.bz2.sig 
Removed Files:
	parted-1.6.15-dasd_geometry.patch parted-1.6.23-aix.patch 
	parted-1.6.25-dasd.patch parted-1.6.25-dm.patch 
	parted-1.6.25-iseries.patch parted-1.6.25-mac-swraid.patch 
	parted-1.6.25-sgio.patch parted-1.6.25-sx8.patch 
	parted-1.6.25.tar.gz.sig parted-1.6.3-fat.c.patch upstream 
	upstream-key.gpg 
Log Message:
Bring parted-1.7.1-15 over from rawhide to release an update for FC-5.


parted-1.7.0-aix.patch:
 labels/Makefile.am |    3 
 labels/aix.c       |  282 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 labels/dos.c       |    7 +
 libparted.c        |    5 
 4 files changed, 295 insertions(+), 2 deletions(-)

--- NEW FILE parted-1.7.0-aix.patch ---
--- parted-1.7.0/libparted/libparted.c.P151	2006-05-19 10:45:10.000000000 -0400
+++ parted-1.7.0/libparted/libparted.c	2006-05-19 11:45:51.000000000 -0400
@@ -80,6 +80,7 @@
 	return 1;
 }
 
+extern void ped_disk_aix_init ();
 extern void ped_disk_bsd_init ();
 extern void ped_disk_dvh_init ();
 extern void ped_disk_gpt_init ();
@@ -110,7 +111,7 @@
 	ped_disk_dvh_init ();
 	ped_disk_bsd_init ();
 	ped_disk_amiga_init ();
-
+	ped_disk_aix_init ();
 }
 
 #ifdef ENABLE_FS
@@ -141,6 +142,7 @@
 }
 #endif /* ENABLE_FS */
 
+extern void ped_disk_aix_done ();
 extern void ped_disk_bsd_done ();
 extern void ped_disk_dvh_done ();
 extern void ped_disk_gpt_done ();
@@ -169,6 +171,7 @@
 	ped_disk_dvh_done ();
 	ped_disk_bsd_done ();
 	ped_disk_amiga_done ();
+	ped_disk_aix_done ();
 }
 
 static void _init() __attribute__ ((constructor));
--- parted-1.7.0/libparted/labels/Makefile.am.P151	2006-05-19 10:40:22.000000000 -0400
+++ parted-1.7.0/libparted/labels/Makefile.am	2006-05-19 11:42:26.000000000 -0400
@@ -25,7 +25,8 @@
 			loop.c 		\
 			mac.c  		\
 			pc98.c 		\
-			sun.c
+			sun.c			\
+			aix.c
 			
 
 liblabels_la_LIBADD   = @OS_LIBS@
--- parted-1.7.0/libparted/labels/dos.c.P151	2006-05-15 05:19:34.000000000 -0400
+++ parted-1.7.0/libparted/labels/dos.c	2006-05-19 11:44:40.000000000 -0400
@@ -185,6 +185,13 @@
 			return 0;
 	}
 
+	/* If this is an AIX Physical Volume, fail here.  IBMA in EBCDIC */
+	if (part_table.boot_code[0] == (char) 0xc9 && 
+	    part_table.boot_code[1] == (char) 0xc2 &&
+	    part_table.boot_code[2] == (char) 0xd4 && 
+	    part_table.boot_code[3] == (char) 0xc1)
+		return 0;
+
 #ifdef ENABLE_PC98
 	/* HACK: it's impossible to tell PC98 and msdos disk labels apart.
 	 * Someone made the signatures the same (very clever).  Since
--- parted-1.7.0/libparted/labels/aix.c.P151	2006-05-19 11:43:15.000000000 -0400
+++ parted-1.7.0/libparted/labels/aix.c	2006-05-19 11:42:59.000000000 -0400
@@ -0,0 +1,282 @@
+/* -*- Mode: c; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+
+    libparted - a library for manipulating disk partitions
+    Copyright (C) 2000, 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 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
+
+    Contributor:  Matt Wilson <msw at redhat.com>
+*/
+
+#include "config.h"
+
+#include <string.h>
+
+#include <parted/parted.h>
+#include <parted/debug.h>
+#include <parted/endian.h>
+
+#if ENABLE_NLS
+#  include <libintl.h>
+#  define _(String) dgettext (PACKAGE, String)
+#else
+#  define _(String) (String)
+#endif /* ENABLE_NLS */
+
+typedef struct {
+	unsigned int   magic;        /* expect AIX_LABEL_MAGIC */
+	unsigned int   fillbytes[127];
+} AixLabel;
+
+#define	AIX_LABEL_MAGIC		0xc9c2d4c1
+
+static PedDiskType aix_disk_type;
+
+static int
+aix_probe (PedDevice *dev)
+{
+	PedDiskType*	disk_type;
+	AixLabel	label;
+	int		i;
+
+	PED_ASSERT (dev != NULL, return 0);
+
+	if (!ped_device_read (dev, &label, 0, 1))
+		return 0;
+
+	if (PED_BE32_TO_CPU (label.magic) != AIX_LABEL_MAGIC)
+		return 0;
+
+	return 1;
+}
+
+#ifndef DISCOVER_ONLY
+static int
+aix_clobber (PedDevice* dev)
+{
+	AixLabel label;
+
+	PED_ASSERT (dev != NULL, return 0);
+	PED_ASSERT (aix_probe (dev), return 0);
+
+	if (!ped_device_read (dev, &label, 0, 1))
+		return 0;
+	
+	label.magic = 0;
+	return ped_device_write (dev, &label, 0, 1);
+}
+#endif /* !DISCOVER_ONLY */
+
+static PedDisk*
+aix_alloc (PedDevice* dev)
+{
+	PedDisk*	disk;
+
+        disk = _ped_disk_alloc (dev, &aix_disk_type);
+	if (!disk)
+		return NULL;
+
+	return disk;
+}
+
+static PedDisk*
+aix_duplicate (const PedDisk* disk)
+{
+	PedDisk*	new_disk;
+       
+	new_disk = ped_disk_new_fresh (disk->dev, &aix_disk_type);
+	if (!new_disk)
+		return NULL;
+
+	return new_disk;
+}
+
+static void
+aix_free (PedDisk *disk)
+{
+	_ped_disk_free (disk);
+}
+
+static int
+aix_read (PedDisk* disk)
+{
+	ped_disk_delete_all (disk);
+        ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
+                             PED_EXCEPTION_CANCEL,
+                             _("Support for reading AIX disk labels is "
+                               "is not implemented yet."));
+        return 0;
+}
+
+#ifndef DISCOVER_ONLY
+static int
+aix_write (PedDisk* disk)
+{
+        ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
+                             PED_EXCEPTION_CANCEL,
+                             _("Support for writing AIX disk labels is "
+                               "is not implemented yet."));
+	return 0;
+}
+#endif /* !DISCOVER_ONLY */
+
+static PedPartition*
+aix_partition_new (const PedDisk* disk, PedPartitionType part_type,
+		   const PedFileSystemType* fs_type,
+		   PedSector start, PedSector end)
+{
+	PedPartition*		part;
+
+        ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
+                             PED_EXCEPTION_CANCEL,
+                             _("Support for adding partitions to AIX disk "
+                               "labels is not implemented yet."));
+        return NULL;
+}
+
+static PedPartition*
+aix_partition_duplicate (const PedPartition* part)
+{
+	PedPartition*		new_part;
+
+        ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
+                             PED_EXCEPTION_CANCEL,
+                             _("Support for duplicating partitions in AIX "
+                               "disk labels is not implemented yet."));
+        return NULL;
+}
+
+static void
+aix_partition_destroy (PedPartition* part)
+{
+	PED_ASSERT (part != NULL, return);
+
+	_ped_partition_free (part);
+}
+
+static int
+aix_partition_set_system (PedPartition* part, const PedFileSystemType* fs_type)
+{
+        ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
+                             PED_EXCEPTION_CANCEL,
+                             _("Support for setting system type of partitions "
+                               "in AIX disk labels is not implemented yet."));
+	return 0;
+}
+
+static int
+aix_partition_set_flag (PedPartition* part, PedPartitionFlag flag, int state)
+{
+        ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
+                             PED_EXCEPTION_CANCEL,
+                             _("Support for setting flags "
+                               "in AIX disk labels is not implemented yet."));
+        return 0;
+}
+
+static int
+aix_partition_get_flag (const PedPartition* part, PedPartitionFlag flag)
+{
+        return 0;
+}
+
+
+static int
+aix_partition_is_flag_available (const PedPartition* part,
+				 PedPartitionFlag flag)
+{
+        return 0;
+}
+
+
+static int
+aix_get_max_primary_partition_count (const PedDisk* disk)
+{
+	return 4;
+}
+
+static int
+aix_partition_align (PedPartition* part, const PedConstraint* constraint)
+{
+        PED_ASSERT (part != NULL, return 0);
+
+        return 1;
+}
+
+static int
+aix_partition_enumerate (PedPartition* part)
+{
+	return 1;
+}
+
+static int
+aix_alloc_metadata (PedDisk* disk)
+{
+	return 1;
+}
+
+static PedDiskOps aix_disk_ops = {
+	probe:			aix_probe,
+#ifndef DISCOVER_ONLY
+	clobber:		aix_clobber,
+#else
+	clobber:		NULL,
+#endif
+	alloc:			aix_alloc,
+	duplicate:		aix_duplicate,
+	free:			aix_free,
+	read:			aix_read,
+#ifndef DISCOVER_ONLY
+	write:			aix_write,
+#else
+	write:			NULL,
+#endif
+
+	partition_new:		aix_partition_new,
+	partition_duplicate:	aix_partition_duplicate,
+	partition_destroy:	aix_partition_destroy,
+	partition_set_system:	aix_partition_set_system,
+	partition_set_flag:	aix_partition_set_flag,
+	partition_get_flag:	aix_partition_get_flag,
+	partition_is_flag_available:	aix_partition_is_flag_available,
+	partition_align:	aix_partition_align,
+	partition_enumerate:	aix_partition_enumerate,
+	alloc_metadata:		aix_alloc_metadata,
+	get_max_primary_partition_count:
+				aix_get_max_primary_partition_count,
+
+	partition_set_name:		NULL,
+	partition_get_name:		NULL,
+};
+
+static PedDiskType aix_disk_type = {
+	next:		NULL,
+	name:		"aix",
+	ops:		&aix_disk_ops,
+	features:	0
+};
+
+void
+ped_disk_aix_init ()
+{
+	PED_ASSERT (sizeof (AixLabel) == 512, return);
+	ped_register_disk_type (&aix_disk_type);
+}
+
+void
+ped_disk_aix_done ()
+{
+	ped_unregister_disk_type (&aix_disk_type);
+}

parted-1.7.0-fat.c.patch:
 fat.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE parted-1.7.0-fat.c.patch ---
--- parted-1.7.0/libparted/fs/fat/fat.c.P0	2006-05-15 05:19:48.000000000 -0400
+++ parted-1.7.0/libparted/fs/fat/fat.c	2006-05-19 10:18:19.000000000 -0400
@@ -123,12 +123,8 @@
 
 	if (!fat_boot_sector_read (&fs_info->boot_sector, geom))
 		goto error_free_fs;
-	if (!fat_boot_sector_analyse (&fs_info->boot_sector, fs)) {
-		*fat_type = fat_boot_sector_probe_type (&fs_info->boot_sector,
-							geom);
-		fat_free (fs);
-		return ped_geometry_duplicate (geom);
-	}
+	if (!fat_boot_sector_analyse (&fs_info->boot_sector, fs))
+		goto error_free_fs;
 
 	*fat_type = fs_info->fat_type;
 	result = ped_geometry_new (geom->dev, geom->start,

parted-1.7.0-iseries.patch:
 include/parted/device.h |    1 +
 libparted/arch/linux.c  |    8 ++++++++
 2 files changed, 9 insertions(+)

--- NEW FILE parted-1.7.0-iseries.patch ---
--- parted-1.7.0/include/parted/device.h.P150	2006-05-19 10:32:18.000000000 -0400
+++ parted-1.7.0/include/parted/device.h	2006-05-19 11:01:23.000000000 -0400
@@ -44,6 +44,7 @@
         PED_DEVICE_I2O          = 7,
         PED_DEVICE_UBD          = 8,
         PED_DEVICE_DASD         = 9,
+        PED_DEVICE_VIODASD      = 10,
         PED_DEVICE_SX8          = 11
 } PedDeviceType;
 
--- parted-1.7.0/libparted/arch/linux.c.P150	2006-05-19 10:54:51.000000000 -0400
+++ parted-1.7.0/libparted/arch/linux.c	2006-05-19 11:02:45.000000000 -0400
@@ -233,6 +233,7 @@
 #define I2O_MAJOR8              87
 #define UBD_MAJOR               98
 #define DASD_MAJOR              94
+#define VIODASD_MAJOR           112
 #define SX8_MAJOR1              160
 #define SX8_MAJOR2              161
 
@@ -331,6 +332,8 @@
                 dev->type = PED_DEVICE_ATARAID;
         } else if (dev_major == DASD_MAJOR && (dev_minor % 0x4 == 0)) {
                 dev->type = PED_DEVICE_DASD;
+        } else if (dev_major == VIODASD_MAJOR && (dev_minor % 0x8 == 0)) {
+                dev->type = PED_DEVICE_VIODASD;
         } else if (_is_sx8_major(dev_major) && (dev_minor % 0x20 == 0)) {
                 dev->type = PED_DEVICE_SX8;
         } else if (_is_i2o_major (dev_major) && (dev_minor % 0x10 == 0)) {
@@ -973,6 +976,11 @@
                         goto error_free_arch_specific;
                 break;
 
+        case PED_DEVICE_VIODASD:
+                if (!init_generic (dev, _("IBM iSeries Virtual DASD")))
+                        goto error_free_arch_specific;
+                break;
+
         case PED_DEVICE_CPQARRAY:
                 if (!init_generic (dev, _("Compaq Smart Array")))
                         goto error_free_arch_specific;

parted-1.7.0-sx8.patch:
 include/parted/device.h |    3 ++-
 libparted/arch/linux.c  |   15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

--- NEW FILE parted-1.7.0-sx8.patch ---
--- parted-1.7.0/include/parted/device.h.P3	2006-05-15 05:19:17.000000000 -0400
+++ parted-1.7.0/include/parted/device.h	2006-05-19 10:24:48.000000000 -0400
@@ -42,7 +42,8 @@
         PED_DEVICE_FILE         = 5,
         PED_DEVICE_ATARAID      = 6,
         PED_DEVICE_I2O          = 7,
-        PED_DEVICE_UBD          = 8
+        PED_DEVICE_UBD          = 8,
+        PED_DEVICE_SX8          = 11
 } PedDeviceType;
 
 typedef struct _PedDevice PedDevice;
--- parted-1.7.0/libparted/arch/linux.c.P3	2006-05-15 05:19:52.000000000 -0400
+++ parted-1.7.0/libparted/arch/linux.c	2006-05-19 10:23:14.000000000 -0400
@@ -229,6 +229,8 @@
 #define I2O_MAJOR7              86
 #define I2O_MAJOR8              87
 #define UBD_MAJOR               98
+#define SX8_MAJOR1              160
+#define SX8_MAJOR2              161
 
 #define SCSI_BLK_MAJOR(M) (                                             \
                 (M) == SCSI_DISK0_MAJOR                                 \
@@ -269,6 +271,12 @@
 }
 
 static int
+_is_sx8_major (int major)
+{
+        return (SX8_MAJOR1 <= major && major <= SX8_MAJOR2);
+}
+
+static int
 _device_stat (PedDevice* dev, struct stat * dev_stat)
 {
         PED_ASSERT (dev != NULL, return 0);
@@ -317,6 +325,8 @@
                 dev->type = PED_DEVICE_DAC960;
         } else if (dev_major == ATARAID_MAJOR && (dev_minor % 0x10 == 0)) {
                 dev->type = PED_DEVICE_ATARAID;
+        } else if (_is_sx8_major(dev_major) && (dev_minor % 0x20 == 0)) {
+                dev->type = PED_DEVICE_SX8;
         } else if (_is_i2o_major (dev_major) && (dev_minor % 0x10 == 0)) {
                 dev->type = PED_DEVICE_I2O;
         } else if (_is_cpqarray_major (dev_major) && (dev_minor % 0x10 == 0)) {
@@ -904,6 +914,11 @@
                         goto error_free_arch_specific;
                 break;
 
+        case PED_DEVICE_SX8:
+                if (!init_generic (dev, _("Promise SX8 SATA Device")))
+                        goto error_free_arch_specific;
+                break;
+
         case PED_DEVICE_CPQARRAY:
                 if (!init_generic (dev, _("Compaq Smart Array")))
                         goto error_free_arch_specific;

parted-1.7.1-O_DIRECT.patch:
 linux.c |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)

--- NEW FILE parted-1.7.1-O_DIRECT.patch ---
--- parted-1.7.1/libparted/arch/linux.c.o_direct	2006-08-17 11:20:31.000000000 -0400
+++ parted-1.7.1/libparted/arch/linux.c	2006-08-17 11:24:13.000000000 -0400
@@ -30,6 +30,7 @@
 #include <libgen.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <syscall.h>
 #include <unistd.h>
@@ -1212,7 +1213,11 @@
                 if (!name)
                         break;
                 if (!_partition_is_mounted_by_path (name)) {
+#if defined(__s390__) || defined(__s390x__)
                         fd = open (name, O_WRONLY, 0);
+#else
+                        fd = open (name, O_WRONLY | O_DIRECT, 0);
+#endif
                         if (fd > 0) {
                                 ioctl (fd, BLKFLSBUF);
                                 close (fd);
@@ -1228,11 +1233,19 @@
         LinuxSpecific*  arch_specific = LINUX_SPECIFIC (dev);
 
 retry:
+#if defined(__s390__) || defined(__s390x__)
         arch_specific->fd = open (dev->path, O_RDWR);
+#else
+        arch_specific->fd = open (dev->path, O_RDWR | O_DIRECT);
+#endif
         if (arch_specific->fd == -1) {
                 char*   rw_error_msg = strerror (errno);
 
+#if defined(__s390__) || defined(__s390x__)
                 arch_specific->fd = open (dev->path, O_RDONLY);
+#else
+                arch_specific->fd = open (dev->path, O_RDONLY | O_DIRECT);
+#endif
                 if (arch_specific->fd == -1) {
                         if (ped_exception_throw (
                                 PED_EXCEPTION_ERROR,
@@ -1375,6 +1388,7 @@
         int                     status;
         PedExceptionOption      ex_status;
         size_t                  read_length = count * dev->sector_size;
+        void*                   diobuf;
 
         PED_ASSERT (dev->sector_size % 512 == 0, return 0);
 
@@ -1412,8 +1426,12 @@
                 }
         }
 
+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE_DEFAULT, count * PED_SECTOR_SIZE_DEFAULT) != 0)
+                return 0;
         while (1) {
-                status = read (arch_specific->fd, buffer, read_length);
+                status = read (arch_specific->fd, diobuf, read_length);
+                if (status > 0)
+                        memcpy(buffer, diobuf, status);
                 if (status == count * dev->sector_size) break;
                 if (status > 0) {
                         read_length -= status;
@@ -1430,6 +1448,7 @@
 
                 switch (ex_status) {
                         case PED_EXCEPTION_IGNORE:
+                                free(diobuf);
                                 return 1;
 
                         case PED_EXCEPTION_RETRY:
@@ -1438,9 +1457,11 @@
                         case PED_EXCEPTION_UNHANDLED:
                                 ped_exception_catch ();
                         case PED_EXCEPTION_CANCEL:
+                                free(diobuf);
                                 return 0;
                 }
         }
+        free(diobuf);
 
         return 1;
 }
@@ -1486,6 +1507,8 @@
         int                     status;
         PedExceptionOption      ex_status;
         size_t                  write_length = count * dev->sector_size;
+        void*                   diobuf;
+        void*                   diobuf_start;
 
         PED_ASSERT(dev->sector_size % 512 == 0, return 0);
 
@@ -1539,12 +1562,16 @@
                 dev->path, buffer, (int) start, (int) count);
 #else
         dev->dirty = 1;
+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE_DEFAULT, count * PED_SECTOR_SIZE_DEFAULT) != 0)
+                return 0;
+        memcpy(diobuf, buffer, count * PED_SECTOR_SIZE_DEFAULT);
+        diobuf_start = diobuf;
         while (1) {
-                status = write (arch_specific->fd, buffer, write_length);
+                status = write (arch_specific->fd, diobuf, write_length);
                 if (status == count * dev->sector_size) break;
                 if (status > 0) {
                         write_length -= status;
-                        buffer += status;
+                        diobuf += status;
                         continue;
                 }
 
@@ -1556,6 +1583,7 @@
 
                 switch (ex_status) {
                         case PED_EXCEPTION_IGNORE:
+                                free(diobuf_start);
                                 return 1;
 
                         case PED_EXCEPTION_RETRY:
@@ -1564,9 +1592,11 @@
                         case PED_EXCEPTION_UNHANDLED:
                                 ped_exception_catch ();
                         case PED_EXCEPTION_CANCEL:
+                                free(diobuf_start);
                                 return 0;
                 }
         }
+        free(diobuf_start);
 #endif /* !READ_ONLY */
         return 1;
 }
@@ -1579,18 +1609,25 @@
         LinuxSpecific*  arch_specific = LINUX_SPECIFIC (dev);
         PedSector       done = 0;
         int             status;
+        void*           diobuf;
 
         PED_ASSERT(dev != NULL, return 0);
         
         if (!_device_seek (dev, start))
                 return 0;
 
+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE_DEFAULT, count * PED_SECTOR_SIZE_DEFAULT) != 0)
+                return 0;
+
         for (done = 0; done < count; done += status / dev->sector_size) {
-                status = read (arch_specific->fd, buffer,
+                status = read (arch_specific->fd, diobuf,
                                (size_t) ((count-done) * dev->sector_size));
+                if (status > 0)
+                        memcpy(buffer, diobuf, status);
                 if (status < 0)
                         break;
         }
+        free(diobuf);
 
         return done;
 }

parted-1.7.1-dasd.patch:
 include/parted/device.h      |    1 
 include/parted/disk.h        |    3 
 include/parted/fdasd.h       |  230 +++++++
 include/parted/linux.h       |    5 
 include/parted/vtoc.h        |  371 +++++++++++
 libparted/arch/linux.c       |   81 ++
 libparted/labels/Makefile.am |    5 
 libparted/labels/dasd.c      |  876 ++++++++++++++++++++++++++++
 libparted/labels/fdasd.c     | 1302 +++++++++++++++++++++++++++++++++++++++++
 libparted/labels/vtoc.c      | 1343 +++++++++++++++++++++++++++++++++++++++++++
 libparted/libparted.c        |    9 
 11 files changed, 4222 insertions(+), 4 deletions(-)

--- NEW FILE parted-1.7.1-dasd.patch ---
diff -urN parted-1.7.1.orig/include/parted/device.h parted-1.7.1/include/parted/device.h
--- parted-1.7.1.orig/include/parted/device.h	2006-06-22 14:11:48.000000000 -0400
+++ parted-1.7.1/include/parted/device.h	2006-06-22 14:12:10.000000000 -0400
@@ -43,6 +43,7 @@
         PED_DEVICE_ATARAID      = 6,
         PED_DEVICE_I2O          = 7,
         PED_DEVICE_UBD          = 8,
+        PED_DEVICE_DASD         = 9,
         PED_DEVICE_SX8          = 11
 } PedDeviceType;
 
diff -urN parted-1.7.1.orig/include/parted/disk.h parted-1.7.1/include/parted/disk.h
--- parted-1.7.1.orig/include/parted/disk.h	2006-05-25 13:28:43.000000000 -0400
+++ parted-1.7.1/include/parted/disk.h	2006-06-22 14:12:10.000000000 -0400
@@ -46,7 +46,8 @@
         PED_PARTITION_LOGICAL           = 0x01,
         PED_PARTITION_EXTENDED          = 0x02,
         PED_PARTITION_FREESPACE         = 0x04,
-        PED_PARTITION_METADATA          = 0x08
+        PED_PARTITION_METADATA          = 0x08,
+        PED_PARTITION_PROTECTED         = 0x10
 } PedPartitionType;
 
 /**
diff -urN parted-1.7.1.orig/include/parted/fdasd.h parted-1.7.1/include/parted/fdasd.h
--- parted-1.7.1.orig/include/parted/fdasd.h	1969-12-31 19:00:00.000000000 -0500
+++ parted-1.7.1/include/parted/fdasd.h	2006-06-22 14:12:10.000000000 -0400
@@ -0,0 +1,230 @@
+/*
+ * File...........: s390-tools/fdasd/fdasd.h
+ * Author(s)......: Volker Sameske <sameske at de.ibm.com>
+ *                  Horst Hummel   <Horst.Hummel at de.ibm.com>
+ * Bugreports.to..: <Linux390 at de.ibm.com>
+ * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2001-2002
+ *
+ * History of changes (starts March 2001)
+ * version 1.01 - menu entry 's' to show mapping devnode - DS name
+ *         1.02 - DS names count now from 0001 instead from 0000
+ *         1.03 - volser checks: 'AA AAA' to 'AAAAA '
+ *              - removed dependency to kernel headers.
+ *         1.04 - added -p option
+ *         1.05 - new API policy, set it back to 0
+ */
+#ifndef FDASD_H
+#define FDASD_H
+
+/*****************************************************************************
+ * SECTION: Definitions needed for DASD-API (see dasd.h)                     *
+ *****************************************************************************/
+
+#define DASD_IOCTL_LETTER 'D'
+
+#define DASD_PARTN_BITS 2
+
+#define PARTITION_LINUX_SWAP    0x82
+#define PARTITION_LINUX         0x83
+#define PARTITION_LINUX_EXT     0x85
+#define PARTITION_LINUX_LVM     0x8e
+#define PARTITION_LINUX_RAID    0xfd
+#define PARTITION_LINUX_LVM_OLD 0xfe
+
+#define PART_TYPE_NATIVE "NATIVE"
+#define PART_TYPE_SWAP   "SWAP  "
+#define PART_TYPE_RAID   "RAID  "
+#define PART_TYPE_LVM   "LVM   "
+
+#ifdef DEBUG_DASD
+#define PDEBUG           fprintf(stderr, "%s:%d:%s\n", \
+                         __FILE__,                              \
+                         __LINE__,                              \
+                         __PRETTY_FUNCTION__);
+#else
+#define PDEBUG
+#endif
+
+/* 
+ * struct dasd_information_t
+ * represents any data about the device, which is visible to userspace.
+ *  including foramt and featueres.
+ */
+typedef struct dasd_information_t {
+        unsigned int devno;           /* S/390 devno                         */
+        unsigned int real_devno;      /* for aliases                         */
+        unsigned int schid;           /* S/390 subchannel identifier         */
+        unsigned int cu_type  : 16;   /* from SenseID                        */
+        unsigned int cu_model :  8;   /* from SenseID                        */
+        unsigned int dev_type : 16;   /* from SenseID                        */
+        unsigned int dev_model : 8;   /* from SenseID                        */
+        unsigned int open_count; 
+        unsigned int req_queue_len; 
+        unsigned int chanq_len;       /* length of chanq                     */
+        char type[4];                 /* from discipline.name, 'none' for    */
+	                              /* unknown                             */
+        unsigned int status;          /* current device level                */
+        unsigned int label_block;     /* where to find the VOLSER            */
+        unsigned int FBA_layout;      /* fixed block size (like AIXVOL)      */
+        unsigned int characteristics_size;
+        unsigned int confdata_size;
+        char characteristics[64];     /* from read_device_characteristics    */
+        char configuration_data[256]; /* from read_configuration_data        */
+} dasd_information_t;
+
+/* 
+ * struct format_data_t
+ * represents all data necessary to format a dasd
+ */
+typedef struct format_data_t {
+	int start_unit; /* from track */
+	int stop_unit;  /* to track */
+	int blksize;    /* sectorsize */
+        int intensity;  
+} format_data_t;
+
+/*
+ * values to be used for format_data_t.intensity
+ * 0/8: normal format
+ * 1/9: also write record zero
+ * 3/11: also write home address
+ * 4/12: invalidate track
+ */
+#define DASD_FMT_INT_FMT_R0 1 /* write record zero */
+#define DASD_FMT_INT_FMT_HA 2 /* write home address, also set FMT_R0 ! */
+#define DASD_FMT_INT_INVAL  4 /* invalidate tracks */
+#define DASD_FMT_INT_COMPAT 8 /* use OS/390 compatible disk layout */
+
+
+/* Disable the volume (for Linux) */
+#define BIODASDDISABLE _IO(DASD_IOCTL_LETTER,0) 
+/* Enable the volume (for Linux) */
+#define BIODASDENABLE  _IO(DASD_IOCTL_LETTER,1)  
+
+/* retrieve API version number */
+#define DASDAPIVER     _IOR(DASD_IOCTL_LETTER,0,int)
+/* Get information on a dasd device (enhanced) */
+#define BIODASDINFO   _IOR(DASD_IOCTL_LETTER,1,dasd_information_t)
+
+
+/*****************************************************************************
+ * SECTION: Further IOCTL Definitions  (see fs.h)                            *
+ *****************************************************************************/
+/* re-read partition table */
+#define BLKRRPART  _IO(0x12,95)	
+/* get block device sector size */
+#define BLKSSZGET  _IO(0x12,104)
+
+/*****************************************************************************
+ * SECTION: Definition from hdreq.h                                          *
+ *****************************************************************************/
+
+struct fdasd_hd_geometry {
+      unsigned char heads;
+      unsigned char sectors;
+      unsigned short cylinders;
+      unsigned long start;
+};
+
+/* get device geometry */
+#define HDIO_GETGEO		0x0301	
+
+/*****************************************************************************
+ * SECTION: FDASD internal types                                             *
+ *****************************************************************************/
+
+#define DASD_MIN_API_VERSION 0
+
+#define DEFAULT_FDASD_CONF "/etc/fdasd.conf" /* default config file */
+
+#define PARTN_MASK ((1 << DASD_PARTN_BITS) - 1)
+#define USABLE_PARTITIONS ((1 << DASD_PARTN_BITS) - 1)
+
+#define FDASD_VERSION "1.05"
+#define FDASD_ERROR "fdasd error: "
+#define DEVICE "device"
+#define DISC   "disc"
+#define PART   "part"
+
+#define ALTERNATE_CYLINDERS_USED 0x10
+
+typedef struct partition_info {
+        u_int8_t           used;
+        unsigned long      start_trk;
+        unsigned long      end_trk;
+        unsigned long      len_trk;
+        unsigned long      fspace_trk;
+        format1_label_t  * f1; 
+        struct partition_info *next;
+        struct partition_info *prev;
+        u_int8_t           type;
+} partition_info_t;
+
+
+typedef struct config_data {
+	unsigned long start;
+	unsigned long stop;
+} config_data_t;
+
+
+typedef struct fdasd_anchor {
+        int vlabel_changed;
[...3973 lines suppressed...]
+			bzero(tmp, sizeof(ds7ext_t));
+			tmp = ext;
+			if (verbose) 
+				printf("FMT7 add extent: " \
+				       "merge with successor\n");
+			i = -1;
+			continue;
+		} 
+	}
+}
+
+
+/*
+ * remove a free space extent description from the VTOC FMT7 DSCB
+ */
+void 
+vtoc_update_format7_label_del (format7_label_t *f7, int verbose, 
+			       u_int32_t a, u_int32_t b) 
+{
+	PDEBUG
+	ds7ext_t *ext;
+	int i, counter=0;
+	
+	for (i=0; i<16; i++)
+	{
+		if (i<5) 
+			ext = &f7->DS7EXTNT[i]; 
+		else 
+			ext = &f7->DS7ADEXT[i-5];
+
+		if ((a == ext->a) && (b == ext->b))
+		{
+			/* fills up whole free space gap */
+			bzero(ext, sizeof(ds7ext_t));
+			if (verbose) 
+				printf("FMT7 del extent: " \
+				       "fills whole gap\n");
+			counter++;
+			break;
+		}
+
+		if ((a == ext->a) && (b < ext->b))
+		{
+			/* left-bounded in free space gap */
+			ext->a = b + 1;
+			if (verbose) 
+				printf("FMT7 add extent: " \
+				       "left-bounded\n");
+			counter++;
+			break;
+		}
+
+		if ((a > ext->a) && (b == ext->b))
+		{
+			/* right-bounded in free space gap */
+			ext->b = a - 1;
+			if (verbose) 
+				printf("FMT7 add extent: " \
+				       "right-bounded\n");
+			counter++;
+			break;
+		}
+
+		if ((a > ext->a) && (b < ext->b))
+		{
+			/* partition devides free space into 2 pieces */
+			vtoc_update_format7_label_add(f7, verbose, 
+						      b+1, ext->b);
+			ext->b = a - 1;
+			if (verbose) 
+				printf("FMT7 add extent: " \
+				       "2 pieces\n");
+			counter++;
+			break;
+		}
+
+		if (((a < ext->a) && (b > ext->a)) || ((a < ext->b) && (b > ext->b)))
+		{
+			printf ("BUG: specified free space extent for deleting "
+				"doesn't match free space currently shown in "
+				"FMT7 DSCB!\nexiting...\n");
+			printf ("%d %d %d %d\n", a, b, ext->a, ext->b);
+			exit(1);
+		}
+	}
+
+	if (counter > 0) return;
+
+	printf("BUG: specified free space extent for " \
+	       "deleting not found in FMT7 DSCB!\n" \
+	       "exiting...\n");
+	exit(1);
+}
+
+
+/*
+ *
+ */
+void
+vtoc_set_freespace(format4_label_t *f4,
+		   format5_label_t *f5,
+		   format7_label_t *f7,
+		   char ch,
+		   int verbose,
+		   u_int32_t start,
+		   u_int32_t stop,
+		   int cyl,
+		   int trk)
+{
+	PDEBUG
+	if ((cyl * trk) > BIG_DISK_SIZE)
+	{
+		if (ch == '+')
+		{
+			vtoc_update_format7_label_add(f7, verbose, 
+						      start, stop);
+		}
+		else if (ch == '-')
+		{
+			vtoc_update_format7_label_del(f7, verbose, 
+						      start, stop);
+		}
+		else
+		{
+			printf("BUG: syntax error in " \
+			       "vtoc_set_freespace call\n");
+		}
+
+		vtoc_reorganize_FMT7_extents (f7);
+
+		f4->DS4VTOCI = 0xa0;
+		f4->DS4EFLVL = 0x07;
+		vtoc_set_cchhb(&f4->DS4EFPTR, 0x0000, 0x0001, 0x03);
+	}
+	else
+	{
+		u_int16_t x,y;
+		u_int8_t z;
+
+		x = (u_int16_t) start;
+		y = (u_int16_t) ((stop - start + 1) / trk);
+		z =  (u_int8_t) ((stop - start + 1) % trk);
+
+		if (ch == '+')
+		{
+			vtoc_update_format5_label_add(f5, verbose,
+						      cyl, trk,
+						      x, y, z);
+		}
+		else if (ch == '-')
+		{
+			vtoc_update_format5_label_del(f5, verbose, 
+						      cyl, trk,
+						      x, y, z);
+		}
+		else
+		{
+			printf("BUG: syntax error in " \
+			       "vtoc_set_freespace call\n");
+		}
+		vtoc_reorganize_FMT5_extents (f5);
+	}
+		
+}
diff -urN parted-1.7.1.orig/libparted/libparted.c parted-1.7.1/libparted/libparted.c
--- parted-1.7.1.orig/libparted/libparted.c	2006-05-25 13:29:06.000000000 -0400
+++ parted-1.7.1/libparted/libparted.c	2006-06-22 14:12:10.000000000 -0400
@@ -89,12 +89,17 @@
 extern void ped_disk_pc98_init ();
 extern void ped_disk_sun_init ();
 extern void ped_disk_amiga_init ();
+extern void ped_disk_dasd_init ();
 
 static void
 init_disk_types ()
 {
 	ped_disk_loop_init ();	/* must be last in the probe list */
 
+#if defined(__s390__) || defined(__s390x__)
+	ped_disk_dasd_init();
+#endif
+
 	ped_disk_sun_init ();
 #ifdef ENABLE_PC98
 	ped_disk_pc98_init ();
@@ -145,10 +150,14 @@
 extern void ped_disk_pc98_done ();
 extern void ped_disk_sun_done ();
 extern void ped_disk_amiga_done ();
+extern void ped_disk_dasd_done ();
 
 static void
 done_disk_types ()
 {
+#if defined(__s390__) || (__s390x__)
+	ped_disk_dasd_done ();
+#endif
 	ped_disk_sun_done ();
 #ifdef ENABLE_PC98
 	ped_disk_pc98_done ();

parted-1.7.1-dm.patch:
 configure.ac            |   10 +
 include/parted/device.h |    3 
 libparted/Makefile.am   |    1 
 libparted/arch/linux.c  |  339 +++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 350 insertions(+), 3 deletions(-)

--- NEW FILE parted-1.7.1-dm.patch ---
--- parted-1.7.1/configure.ac.dm	2006-05-27 05:48:48.000000000 -0400
+++ parted-1.7.1/configure.ac	2006-08-21 16:34:28.000000000 -0400
@@ -228,6 +228,14 @@
 )
 AC_SUBST(UUID_LIBS)
 
+dnl Check for libdevmapper
+DM_LIBS=""
+AC_CHECK_LIB(devmapper, dm_task_create, DM_LIBS="-ldevmapper -lselinux -lsepol",
+   AC_MSG_ERROR(GNU Parted requires libdevmapper - a part of the device-mapper package.)
+   exit
+)
+AC_SUBST(DM_LIBS)
+
 dnl Check for libreiserfs
 REISER_LIBS=""
 if test "$enable_dynamic_loading" = no -a "$enable_discover_only" = no; then
@@ -321,7 +329,7 @@
 systems.  It is a standard part of a GNU/Hurd system.
 		)
 		exit,
-		$OS_LIBS $UUID_LIBS $LIBS
+		$OS_LIBS $UUID_LIBS $DM_LIBS $LIBS
 	)
 	LIBS="$OLD_LIBS"
 fi
--- parted-1.7.1/include/parted/device.h.dm	2006-08-21 16:34:28.000000000 -0400
+++ parted-1.7.1/include/parted/device.h	2006-08-21 16:34:28.000000000 -0400
@@ -45,7 +45,8 @@
         PED_DEVICE_UBD          = 8,
         PED_DEVICE_DASD         = 9,
         PED_DEVICE_VIODASD      = 10,
-        PED_DEVICE_SX8          = 11
+        PED_DEVICE_SX8          = 11,
+        PED_DEVICE_DM           = 12
 } PedDeviceType;
 
 typedef struct _PedDevice PedDevice;
--- parted-1.7.1/libparted/Makefile.am.dm	2006-05-25 13:29:06.000000000 -0400
+++ parted-1.7.1/libparted/Makefile.am	2006-08-21 16:34:28.000000000 -0400
@@ -32,6 +32,7 @@
 
 libparted_la_LIBADD   = @OS_LIBS@			\
 			@DL_LIBS@			\
+			@DM_LIBS@			\
 			fs/libfs.la			\
 			labels/liblabels.la
 
--- parted-1.7.1/libparted/arch/linux.c.dm	2006-08-21 16:34:28.000000000 -0400
+++ parted-1.7.1/libparted/arch/linux.c	2006-08-21 16:35:33.000000000 -0400
@@ -17,6 +17,7 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */
 
+#define _GNU_SOURCE 1
 #include "config.h"
 
 #include <parted/parted.h>
@@ -38,6 +39,7 @@
 #include <sys/types.h>
 #include <sys/utsname.h>        /* for uname() */
 #include <scsi/scsi.h>
+#include <libdevmapper.h>
 
 #include "blkpg.h"
 
@@ -282,6 +284,100 @@
 }
 
 static int
+readFD (int fd, char **buf)
+{
+        char* p;
+        size_t size = 16384;
+        int s, filesize;
+
+        *buf = calloc (16384, sizeof (char));
+        if (*buf == 0) {
+                return -1;
+        }
+
+        filesize = 0;
+        do {
+                p = &(*buf) [filesize];
+                s = read (fd, p, 16384);
+                if (s < 0)
+                        break;
+                filesize += s;
+                /* only exit for empty reads */
+                if (s == 0)
+                        break;
+                size += s;
+                *buf = realloc (*buf, size);
+        } while (1);
+
+        if (filesize == 0 && s < 0) {
+                free (*buf);
+                *buf = NULL;
+                return -1;
+        }
+
+        return filesize;
+}
+
+static int
+_is_dm_major (int major)
+{
+        int fd;
+        char* buf = NULL;
+        char* line;
+        char* end;
+        int bd = 0;
+        int rc = 0;
+        char c;
+
+        fd = open ("/proc/devices", O_RDONLY);
+        if (fd < 0)
+                return 0;
+
+        if (readFD(fd, &buf) < 0) {
+                close(fd);
+                return 0;
+        }
+
+        line = buf;
+        end = strchr(line, '\n');
+        while (end && *end) {
+                char *name;
+                int maj;
+
+                c = *end;
+                *end = '\0';
+
+                if (!bd) {
+                        if (!strncmp(line, "Block devices:", 14))
+                                bd = 1;
+                        goto next;
+                }
+
+                name = strrchr(line, ' ');
+                if (!name || !*name || strcmp(name+1, "device-mapper"))
+                        goto next;
+
+                maj = strtol(line, &name, 10);
+                if (maj == major) {
+                        free(buf);
+                        close(fd);
+                        return 1;
+                }
+
+next:
+                *end = c;
+                line = end+1;
+                if (line && *line) {
+                        end = strchr(line, '\n');
+                } else
+                        end = line;
+        }
+        free(buf);
+        close(fd);
+        return 0;
+}
+
+static int
 _device_stat (PedDevice* dev, struct stat * dev_stat)
 {
         PED_ASSERT (dev != NULL, return 0);
@@ -342,6 +438,8 @@
                 dev->type = PED_DEVICE_CPQARRAY;
         } else if (dev_major == UBD_MAJOR && (dev_minor % 0x10 == 0)) {
                 dev->type = PED_DEVICE_UBD;
+        } else if (_is_dm_major(dev_major)) {
+                dev->type = PED_DEVICE_DM;
         } else {
                 dev->type = PED_DEVICE_UNKNOWN;
         }
@@ -1025,6 +1123,11 @@
                         goto error_free_arch_specific;
                 break;
 
+        case PED_DEVICE_DM:
+                if (!init_generic (dev, _("Linux device-mapper")))
+                        goto error_free_arch_specific;
+                break;
+
         case PED_DEVICE_UNKNOWN:
                 if (!init_generic (dev, _("Unknown")))
                         goto error_free_arch_specific;
@@ -1743,6 +1846,7 @@
         } else if (dev->type == PED_DEVICE_DAC960
                         || dev->type == PED_DEVICE_CPQARRAY
                         || dev->type == PED_DEVICE_ATARAID
+                        || dev->type == PED_DEVICE_DM
                         || isdigit (dev->path[path_len - 1]))
                 snprintf (result, result_len, "%sp%d", dev->path, num);
         else
@@ -1959,6 +2063,237 @@
 }
 
 static int
+_dm_remove_map(int major, int minor)
+{
+        struct dm_task  *task = NULL;
+        int             rc;
+
+        task = dm_task_create(DM_DEVICE_REMOVE);
+        if (!task)
+                return 1;
+
+        dm_task_set_major (task, major);
+        dm_task_set_minor (task, minor);
+
+        rc = dm_task_run(task);
+        dm_task_update_nodes();
+        dm_task_destroy(task);
+        if (rc < 0)
+                return 1;
+
+        return 0;
+}
+
+static int
+_dm_remove_map_name(char *name)
+{
+        struct dm_task  *task = NULL;
+        int             rc;
+
+        task = dm_task_create(DM_DEVICE_REMOVE);
+        if (!task)
+                return 1;
+
+        dm_task_set_name (task, name);
+
+        rc = dm_task_run(task);
+        dm_task_update_nodes();
+        dm_task_destroy(task);
+        if (rc < 0)
+                return 1;
+
+        return 0;
+}
+
+static int 
+_dm_is_part (struct dm_info *this, char *name)
+{
+        struct dm_task* task = NULL;
+        struct dm_info* info = alloca(sizeof *info);
+        struct dm_deps* deps = NULL;
+        int             rc = 0;
+        unsigned int    i;
+
+        task = dm_task_create(DM_DEVICE_DEPS);
+        if (!task)
+                return 0;
+        
+        dm_task_set_name(task, name);
+        rc = dm_task_run(task);
+        if (rc < 0) {
+                rc = 0;
+                goto err;
+        }
+        rc = 0;
+
+        memset(info, '\0', sizeof *info);
+        dm_task_get_info(task, info);
+        if (!info->exists)
+                goto err;
+
+        deps = dm_task_get_deps(task);
+        if (!deps)
+                goto err;
+
+        rc = 0;
+        for (i = 0; i < deps->count; i++) {
+                unsigned int ma = major(deps->device[i]),
+                             mi = minor(deps->device[i]);
+
+                if (ma == this->major && mi == this->minor)
+                        rc = 1;
+        }
+
+err:
+        dm_task_destroy(task);
+        return rc;
+}
+
+static int
+_dm_remove_parts (PedDevice* dev)
+{
+        struct stat             dev_stat;
+        struct dm_task*         task = NULL;
+        struct dm_info*         info = alloca(sizeof *info);
+        struct dm_names*        names = NULL;
+        unsigned int            next = 0;
+        int                     i;
+        int                     rc;
+
+        if (!_device_stat (dev, &dev_stat))
+                goto err;
+
+        task = dm_task_create(DM_DEVICE_LIST);
+        if (!task)
+                goto err;
+
+        dm_task_set_major (task, major (dev_stat.st_rdev));
+        dm_task_set_minor (task, minor (dev_stat.st_rdev));
+
+        rc = dm_task_run(task);
+        if (rc < 0)
+                goto err;
+
+        memset(info, '\0', sizeof *info);
+        dm_task_get_info(task, info);
+        if (!info->exists)
+                goto err;
+
+        names = dm_task_get_names(task);
+        if (!names)
+                goto err;
+
+        rc = 0;
+        do {
+                names = (void *)names + next;
+
+                if (_dm_is_part(info, names->name))
+                        rc += _dm_remove_map_name(names->name);
+
+                next = names->next;
+        } while (next);
+
+        dm_task_update_nodes();
+        dm_task_destroy(task);
+        task = NULL;
+
+        if (!rc)
+                return 1;
+err:
+        if (task)
+                dm_task_destroy(task);
+        ped_exception_throw (PED_EXCEPTION_WARNING, PED_EXCEPTION_IGNORE,
+                _("parted was unable to re-read the partition "
+                  "table on %s (%s).  This means Linux won't know "
+                  "anything about the modifications you made. "),
+                dev->path, strerror (errno));
+        return 0;
+}
+
+static int
+_dm_add_partition (PedDisk* disk, PedPartition* part)
+{
+        struct dm_task* task;
+        struct stat     dev_stat;
+        int             rc;
+        char*           vol_name = NULL;
+        char*           dev_name = NULL;
+        char*           params = NULL;
+
+        dev_name = _device_get_part_path (disk->dev, part->num);
+        if (!dev_name)
+                return 0;
+
+        vol_name = strrchr (dev_name, '/');
+        if (vol_name && *vol_name && *(++vol_name))
+                vol_name = strdup (vol_name);
+        else
+                vol_name = strdup (dev_name);
+        if (!vol_name)
+                return 0;
+
+        if (!_device_stat (disk->dev, &dev_stat))
+                goto err;
+
+        asprintf (&params, "%d:%d %lu", major (dev_stat.st_rdev),
+                        minor (dev_stat.st_rdev),
+                        part->geom.start);
+        if (!params)
+                goto err;
+
+        task = dm_task_create (DM_DEVICE_CREATE);
+        if (!task)
+                goto err;
+
+        dm_task_set_name (task, vol_name);
+        dm_task_add_target (task, 0, part->geom.length,
+                "linear", params);
+        rc = dm_task_run(task);
+        if (rc >= 0) {
+                //printf("0 %ld linear %s\n", part->geom.length, params);
+                dm_task_update_nodes();
+                dm_task_destroy(task);
+                free(params);
+                free(vol_name);
+                return 1;
+        } else {
+                _dm_remove_map_name(vol_name);
+        }
+err:
+        dm_task_update_nodes();
+        if (task)
+                dm_task_destroy (task);
+        if (params)
+                free (params);
+        free (vol_name);
+        return 0;
+}
+
+static int
+_dm_reread_part_table (PedDisk* disk)
+{
+        int     rc = 1;
+        int     last = PED_MAX (ped_disk_get_last_partition_num (disk), 16);
+        int     i;
+
+        sync();
+        if (!_dm_remove_parts(disk->dev))
+                rc = 0;
+
+        for (i = 1; i <= last; i++) {
+                PedPartition*      part;
+
+                part = ped_disk_get_partition (disk, i);
+                if (!part)
+                        continue;
+
+                if (!_dm_add_partition (disk, part))
+                        rc = 0;
+        }
+        return rc;
+}
+
+static int
 _kernel_reread_part_table (PedDevice* dev)
 {
         LinuxSpecific*  arch_specific = LINUX_SPECIFIC (dev);
@@ -2001,7 +2336,9 @@
 static int
 linux_disk_commit (PedDisk* disk)
 {
-        if (disk->dev->type != PED_DEVICE_FILE) {
+        if (disk->dev->type == PED_DEVICE_DM) {
+                return _dm_reread_part_table (disk);
+        } else if (disk->dev->type != PED_DEVICE_FILE) {
                 /* The ioctl() command BLKPG_ADD_PARTITION does not notify
                  * the devfs system; consequently, /proc/partitions will not
                  * be up to date, and the proper links in /dev are not

parted-1.7.1-get_exception.patch:
 include/parted/exception.h |    2 ++
 libparted/exception.c      |   11 +++++++++++
 2 files changed, 13 insertions(+)

--- NEW FILE parted-1.7.1-get_exception.patch ---
--- parted-1.7.1/include/parted/exception.h.get_exception	2006-07-05 15:31:11.000000000 -0400
+++ parted-1.7.1/include/parted/exception.h	2006-07-05 15:31:34.000000000 -0400
@@ -88,6 +88,8 @@
 extern char* ped_exception_get_option_string (PedExceptionOption ex_opt);
 
 extern void ped_exception_set_handler (PedExceptionHandler* handler);
+extern PedExceptionHandler *ped_exception_get_handler(void);
+
 extern PedExceptionOption ped_exception_default_handler (PedException* ex);
 
 extern PedExceptionOption	ped_exception_throw (PedExceptionType ex_type,
--- parted-1.7.1/libparted/exception.c.get_exception	2006-07-05 15:33:33.000000000 -0400
+++ parted-1.7.1/libparted/exception.c	2006-07-05 15:33:36.000000000 -0400
@@ -171,6 +171,17 @@
 }
 
 /**
+ * Get the current exception handler.
+ */
+PedExceptionHandler *
+ped_exception_get_handler (void)
+{
+	if (ex_handler)
+		return ex_handler;
+	return default_handler;
+}
+
+/**
  * Assert that the current exception has been resolved.
  */
 void

parted-1.7.1-gpt.patch:
 libparted/labels/gpt.c |   56 +++++++++++++++++++++++++++++++++++++++++++++----
 parted/ui.c            |    2 -
 2 files changed, 53 insertions(+), 5 deletions(-)

--- NEW FILE parted-1.7.1-gpt.patch ---
--- parted-1.7.1/libparted/labels/gpt.c.gpt	2006-05-25 13:28:55.000000000 -0400
+++ parted-1.7.1/libparted/labels/gpt.c	2006-08-23 13:57:49.000000000 -0400
@@ -607,11 +607,13 @@
 }
 
 static int
-_parse_header (PedDisk* disk, GuidPartitionTableHeader_t* gpt)
+_parse_header (PedDisk* disk, GuidPartitionTableHeader_t* gpt, int *update_needed)
 { 
 	GPTDiskData* gpt_disk_data = disk->disk_specific;
 	PedSector first_usable;
 	PedSector last_usable;
+	PedSector last_usable_if_grown, last_usable_min_default;
+	static int asked_already;
 
 	PED_ASSERT (_header_is_valid (disk->dev, gpt), return 0);
 
@@ -633,8 +635,54 @@
 
 	first_usable = PED_CPU_TO_LE64 (gpt->FirstUsableLBA);
 	last_usable = PED_CPU_TO_LE64 (gpt->LastUsableLBA);
+
+	/*
+	 * Need to check whether the volume has grown, the LastUsableLBA is
+	 * normally set to disk->dev->length - 2 - ptes_size (at least for parted
+	 * created volumes), where ptes_size is the number of entries * 
+	 * size of each entry / sector size or 16k / sector size, whatever the
+	 * greater.  If the volume has grown, offer the user the chance to use
+	 * the new space or continue with the current usable area.  Only ask once
+	 * per parted invocation.
+	 */
+
+	last_usable_if_grown =
+		PED_CPU_TO_LE64 (disk->dev->length - 2 - 
+		((PedSector)(PED_CPU_TO_LE32(gpt->NumberOfPartitionEntries)) * 
+		(PedSector)(PED_CPU_TO_LE32(gpt->SizeOfPartitionEntry)) / 
+		disk->dev->sector_size));
+
+	last_usable_min_default = disk->dev->length - 2 - 
+		GPT_DEFAULT_PARTITION_ENTRY_ARRAY_SIZE / disk->dev->sector_size;
+
+	if (last_usable_if_grown > last_usable_min_default)
+		last_usable_if_grown = last_usable_min_default;
+
 	PED_ASSERT (last_usable > first_usable, return 0);
 	PED_ASSERT (last_usable <= disk->dev->length, return 0);
+
+	PED_ASSERT (last_usable_if_grown > first_usable, return 0);
+	PED_ASSERT (last_usable_if_grown <= disk->dev->length, return 0);
+
+	if (!asked_already && last_usable < last_usable_if_grown) {
+		PedExceptionOption q;
+		q = ped_exception_throw(PED_EXCEPTION_WARNING,
+		                        PED_EXCEPTION_FIX | PED_EXCEPTION_IGNORE,
+		                        _("Not all of the space available to %s appears "
+		                          "to be used, you can fix the GPT to use all "
+		                          "of the space (an extra %llu blocks) or "
+		                          "continue with the current setting? "),
+		                        disk->dev->path,
+		                        (uint64_t)(last_usable_if_grown - last_usable));
+
+		if (q == PED_EXCEPTION_FIX) {
+			last_usable = last_usable_if_grown;
+			*update_needed = 1;
+		} else if (q != PED_EXCEPTION_UNHANDLED) {
+			asked_already = 1;
+		}
+	}
+
 	ped_geometry_init (&gpt_disk_data->data_area, disk->dev,
 			   first_usable, last_usable - first_usable + 1);
 
@@ -795,7 +843,7 @@
 		}
 	}
 
-	if (!_parse_header (disk, gpt))
+	if (!_parse_header (disk, gpt, &write_back))
 		goto error_free_gpt;
 
 
@@ -893,7 +941,7 @@
 		gpt->MyLBA = PED_CPU_TO_LE64 (disk->dev->length - 1);
 		gpt->AlternateLBA = PED_CPU_TO_LE64 (1);
 		gpt->PartitionEntryLBA
-			= PED_CPU_TO_LE64 (disk->dev->length - 2 - ptes_size);
+			= PED_CPU_TO_LE64 (disk->dev->length - 1 - ptes_size);
 	} else {
 		gpt->MyLBA = PED_CPU_TO_LE64 (1);
 		gpt->AlternateLBA = PED_CPU_TO_LE64 (disk->dev->length - 1);
@@ -984,7 +1032,7 @@
 	if (!ped_device_write (disk->dev, pth_raw, disk->dev->length - 1, 1))
 		goto error_free_ptes;
 	if (!ped_device_write (disk->dev, ptes,
-			       disk->dev->length - 2 - ptes_size / disk->dev->sector_size,
+			       disk->dev->length - 1 - ptes_size / disk->dev->sector_size,
 			       ptes_size / disk->dev->sector_size))
 		goto error_free_ptes;
 
--- parted-1.7.1/parted/ui.c.gpt	2006-05-25 13:28:42.000000000 -0400
+++ parted-1.7.1/parted/ui.c	2006-08-23 13:56:35.000000000 -0400
@@ -1027,13 +1027,13 @@
 
 	opt = PED_EXCEPTION_OPTION_FIRST;
 	while (1) {
-		opt = option_get_next (options, opt);
 		if (strcmp (opt_name,
 			    ped_exception_get_option_string (opt)) == 0)
 			break;
 		if (strcmp (opt_name,
 			    _(ped_exception_get_option_string (opt))) == 0)
 			break;
+		opt = option_get_next (options, opt);
 	}
 	free (opt_name);
 	return opt;

parted-1.7.1-vtoc-errbuf.patch:
 vtoc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE parted-1.7.1-vtoc-errbuf.patch ---
--- parted-1.7.1/libparted/labels/vtoc.c.errbuf	2006-08-15 11:38:40.000000000 -0400
+++ parted-1.7.1/libparted/labels/vtoc.c	2006-08-15 11:39:41.000000000 -0400
@@ -156,7 +156,7 @@
 vtoc_error(enum failure why, char *s1, char *s2) 
 {
 	PDEBUG
-        char    error[LINE_LENGTH];
+        char    error[8192];
 
 	switch (why) 
 	{


--- NEW FILE parted-1.7.1.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/parted/FC-5/.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	28 Aug 2006 14:28:57 -0000	1.23
@@ -9,3 +9,6 @@
 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
+parted-1.7.0.tar.bz2
+parted-1.7.1.tar.bz2


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/FC-5/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	28 Aug 2006 14:28:57 -0000	1.66
@@ -2,19 +2,20 @@
 %define _sbindir /sbin
 
 Summary: The GNU disk partition manipulation program.
-Name: parted
-Version: 1.6.25
-Release: 8
-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
-Patch4: parted-1.6.25-mac-swraid.patch
-
-Patch100: parted-1.6.25-dasd.patch
-Patch150: parted-1.6.25-iseries.patch
-Patch151: parted-1.6.23-aix.patch
-Patch152: parted-1.6.15-dasd_geometry.patch
-Patch153: parted-1.6.25-dm.patch
+Name:    parted
+Version: 1.7.1
+Release: 15%{?dist}
+Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
+Patch0:  parted-1.7.0-fat.c.patch
+Patch1:  parted-1.7.0-sx8.patch
+Patch3:  parted-1.7.1-dasd.patch
+Patch4:  parted-1.7.0-iseries.patch
+Patch5:  parted-1.7.1-dm.patch
+Patch6:  parted-1.7.0-aix.patch
+Patch7:  parted-1.7.1-vtoc-errbuf.patch
+Patch8:  parted-1.7.1-O_DIRECT.patch
+Patch9:  parted-1.7.1-get_exception.patch
+Patch10: parted-1.7.1-gpt.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -22,7 +23,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 +33,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,18 +43,18 @@
 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
-
-%patch100 -p1 -b .dasd
-%patch150 -p1 -b .iseries
-%patch3 -p1 -b .sx8
-%patch4 -p1 -b .raid
-%patch151 -p1 -b .aix
-%patch152 -p1 -b .dasd_geometry
-%patch153 -p1 -b .dm
+%patch1 -p1 -b .sx8
+%patch3 -p1 -b .dasd
+%patch4 -p1 -b .iseries
+%patch5 -p1 -b .dm
+%patch6 -p1 -b .aix
+%patch7 -p1 -b .vtoc_errbuf
+%patch8 -p1 -b .o_direct
+%patch9 -p1 -b .get_exception
+%patch10 -p1 -b .gpt
 
 iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_
 mv doc/pt_BR-parted.8_ doc/pt_BR-parted.8
@@ -84,16 +84,20 @@
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/parted.info* %{_infodir}/dir || :
 
-%postun 
-/sbin/ldconfig 
-/sbin/install-info --delete %{_infodir}/parted.info* %{_infodir}/dir || :
+%preun
+if [ "$1" = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/parted.info* %{_infodir}/dir
+fi
+exit 0
+
+%postun -p /sbin/ldconfig 
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO doc/API doc/FAT
 %{_sbindir}/*
 %{_mandir}/*/*
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
 %{_infodir}/parted.info*
 
 %files devel
@@ -101,8 +105,75 @@
 %{_prefix}/include/*
 %{aclocaldir}/*
 %{_libdir}/*.a*
+%{_libdir}/*.so
 
 %changelog
+* Wed Aug 23 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-15
+- Fixed gpt patch (*asked_already -> asked_already, whoops)
+
+* Tue Aug 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-14
+- Improve error message returned by _parse_header() on GPT-labeled disks
+  so users actually have an idea of how to correct the problem
+- Fix off-by-one error with LastUsableLBA and PartitionEntryLBA overlap
+  to prevent possible data corruption when using non-parted GPT editing
+  tools
+
+* Mon Aug 21 2006 Peter Jones <pjones at redhat.com> - 1.7.1-13
+- Don't use the "volume name" as the device node name on dm device
+  partitions, it isn't really what we want at all.
+
+* Thu Aug 17 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-12
+- Updated O_DIRECT patch to work around s390 problems
+- Update LastUsableLBA on GPT-labeled disks after LUN resize (#194238)
+- Fix exception when backup GPT table is not in the correction location
+  and parted tries to move it (#194238)
+
+* Tue Aug 15 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-11
+- Expand error buffer to 8192 bytes in vtoc_error()
+- Do not apply O_DIRECT patch on S/390 or S/390x platforms
+
+* Mon Aug 14 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-10
+- Removed bad header file patch (#200577)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.1-9.1
+- rebuild
+
+* Wed Jul  5 2006 Peter Jones <pjones at redhat.com> - 1.7.1-9
+- add ped_exception_get_handler()
+
+* Mon Jun 26 2006 Florian La Roche <laroche at redhat.com> - 1.7.1-8
+- remove info files in preun
+
+* Thu Jun 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-7
+- PED_SECTOR_SIZE -> PED_SECTOR_SIZE_DEFAULT
+
+* Thu Jun 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-6
+- Roll dasd patches together
+- Use O_DIRECT to prevent first partition corruption on GPT disks
+
+* Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> - 1.7.1-5
+- fix segfaults with dasd devices
+
+* Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.7.1-4
+- move .so symlink to -devel subpackage
+
+* Sun May 28 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-3
+- Rebuild
+
+* Sun May 28 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-2
+- Removed mac-swraid patch (added upstream)
+- Updated device-mapper patch for parted-1.7.1
+
+* Sat May 27 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-1
+- Upgraded to parted-1.7.1
+
+* Fri May 19 2006 David Cantrell <dcantrell at redhat.com> - 1.7.0-1
+- Upgraded to parted-1.7.0
+
+* 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/FC-5/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	28 Aug 2006 14:28:57 -0000	1.27
@@ -1 +1 @@
-2ed5a721e425e3f10bb58f5a0fc7271c  parted-1.6.25.tar.gz
+baa6771273c8362d735086d52a0d6efe  parted-1.7.1.tar.bz2


--- parted-1.6.15-dasd_geometry.patch DELETED ---


--- parted-1.6.23-aix.patch DELETED ---


--- parted-1.6.25-dasd.patch DELETED ---


--- parted-1.6.25-dm.patch DELETED ---


--- parted-1.6.25-iseries.patch DELETED ---


--- parted-1.6.25-mac-swraid.patch DELETED ---


--- parted-1.6.25-sgio.patch DELETED ---


--- parted-1.6.25-sx8.patch DELETED ---


--- parted-1.6.25.tar.gz.sig DELETED ---


--- parted-1.6.3-fat.c.patch DELETED ---


--- upstream DELETED ---


--- upstream-key.gpg DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 28 14:29:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 10:29:51 -0400
Subject: rpms/ruby/devel ruby.spec,1.81,1.82
Message-ID: <200608281429.k7SETp5R012277@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12263

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ruby.spec	28 Aug 2006 14:15:32 -0000	1.81
+++ ruby.spec	28 Aug 2006 14:29:49 -0000	1.82
@@ -296,7 +296,7 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
 
 # generate ri doc
-make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} RUNRUBY="\$(MINIRUBY) -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 \$(srcdir)/runruby.rb --extout=\$(EXTOUT) --" DESTDIR=$RPM_BUILD_ROOT install-doc
+make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} RUNRUBY="$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 \$(srcdir)/runruby.rb --extout=\$(EXTOUT) --" DESTDIR=$RPM_BUILD_ROOT install-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



From fedora-cvs-commits at redhat.com  Mon Aug 28 14:32:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 10:32:05 -0400
Subject: rpms/kernel/devel/configs config-xen-ia64,1.4,1.5
Message-ID: <200608281432.k7SEW5Ge012361@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv12347/configs

Modified Files:
	config-xen-ia64 
Log Message:
fix ia64 xen building (this time for sure?)


Index: config-xen-ia64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-ia64,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-xen-ia64	28 Aug 2006 13:23:12 -0000	1.4
+++ config-xen-ia64	28 Aug 2006 14:32:02 -0000	1.5
@@ -19,4 +19,5 @@
 # CONFIG_FB_NEOMAGIC is not set
 
 # don't work, missing symbols
-# CONFIG_KEXEC is not set
\ No newline at end of file
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set



From fedora-cvs-commits at redhat.com  Mon Aug 28 14:47:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 10:47:46 -0400
Subject: rpms/eject/FC-5 eject.spec,1.24,1.25
Message-ID: <200608281447.k7SElk3N029165@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/eject/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27809

Modified Files:
	eject.spec 
Log Message:
fix #204222, Password error window popuped by calling "eject" command from remote



Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/FC-5/eject.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- eject.spec	22 Aug 2006 16:51:08 -0000	1.24
+++ eject.spec	28 Aug 2006 14:47:44 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
 Version: 2.1.5
-Release: 0.1.fc5
+Release: 0.2.fc5
 License: GPL
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
@@ -45,7 +45,7 @@
 install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/%{name}
 
 install -m 755 -d %{buildroot}/%{_sysconfdir}/security/console.apps/
-touch %{buildroot}/%{_sysconfdir}/security/console.apps/%{name}
+echo "FALLBACK=true" > %{buildroot}/%{_sysconfdir}/security/console.apps/%{name}
 
 install -m 755 -d %{buildroot}/%{_sbindir}
 pushd %{buildroot}/%{_bindir}
@@ -68,6 +68,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 28 2006 Than Ngo <than at redhat.com> 2.1.5-0.2.fc5
+- fix #204222, Password error window popuped by calling "eject" command from remote
+
 * Tue Aug 22 2006 Than Ngo <than at redhat.com> 2.1.5-0.1.fc5
 - 2.1.5
 - fix #203073, made eject use pam 



From fedora-cvs-commits at redhat.com  Mon Aug 28 14:49:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 10:49:59 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.7.92-fix-fd-leak.patch, NONE,
	1.1 evolution-data-server.spec, 1.117, 1.118
Message-ID: <200608281449.k7SEnxa5005537@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5445

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.7.92-fix-fd-leak.patch 
Log Message:
- Add patch from Veerapuram Varadhan to fix fd leak (bug 198935).


evolution-data-server-1.7.92-fix-fd-leak.patch:
 camel-filter-driver.c |   15 +++++++++++++++
 camel-filter-search.c |   15 +++++++++++++++
 2 files changed, 30 insertions(+)

--- NEW FILE evolution-data-server-1.7.92-fix-fd-leak.patch ---
--- evolution-2.7.92/camel/camel-filter-driver.c	12 Apr 2006 19:14:13 -0000	1.96
+++ evolution-2.7.92/camel/camel-filter-driver.c	28 Aug 2006 13:24:10 -0000
@@ -686,6 +686,9 @@ child_setup_func (gpointer user_data)
 typedef struct {
 	gint child_status;
 	GMainLoop *loop;
+	int fd_in;
+	int fd_out;
+	int fd_err;
 } child_watch_data_t;
 
 static void
@@ -699,6 +702,15 @@ child_watch (GPid     pid,
 
 	child_watch_data->child_status = status;
 
+	if (child_watch_data->fd_in != -1)
+		close (child_watch_data->fd_in);
+
+	if (child_watch_data->fd_out != -1)
+		close (child_watch_data->fd_out);
+
+	if (child_watch_data->fd_err != -1)
+		close (child_watch_data->fd_err);
+
 	g_main_loop_quit (child_watch_data->loop);
 }
 
@@ -803,6 +815,9 @@ pipe_to_system (struct _ESExp *f, int ar
 	
  wait:
 	child_watch_data.loop = g_main_loop_new (g_main_context_new (), FALSE);
+	child_watch_data.fd_in = pipe_to_child;
+	child_watch_data.fd_out = pipe_from_child;
+	child_watch_data.fd_err = -1;
 
 	source = g_child_watch_source_new (child_pid);
 	g_source_set_callback (source, (GSourceFunc) child_watch, &child_watch_data, NULL);
--- evolution-2.7.92/camel/camel-filter-search.c	20 Apr 2006 17:52:34 -0000	1.54
+++ evolution-2.7.92/camel/camel-filter-search.c	28 Aug 2006 13:24:10 -0000
@@ -521,6 +521,9 @@ child_setup_func (gpointer user_data)
 typedef struct {
 	gint child_status;
 	GMainLoop *loop;
+	int fd_in;
+	int fd_out;
+	int fd_err;
 } child_watch_data_t;
 
 static void
@@ -534,6 +537,15 @@ child_watch (GPid     pid,
 
 	child_watch_data->child_status = status;
 
+	if (child_watch_data->fd_in != -1)
+		close (child_watch_data->fd_in);
+
+	if (child_watch_data->fd_out != -1)
+		close (child_watch_data->fd_out);
+
+	if (child_watch_data->fd_err != -1)
+		close (child_watch_data->fd_err);
+
 	g_main_loop_quit (child_watch_data->loop);
 }
 
@@ -591,6 +603,9 @@ run_command (struct _ESExp *f, int argc,
 	camel_object_unref (stream);
 	
 	child_watch_data.loop = g_main_loop_new (g_main_context_new (), FALSE);
+	child_watch_data.fd_in = pipe_to_child;	
+	child_watch_data.fd_out = -1;
+	child_watch_data.fd_err = -1;
 
 	source = g_child_watch_source_new (child_pid);
 	g_source_set_callback (source, (GSourceFunc) child_watch, &child_watch_data, NULL);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- evolution-data-server.spec	22 Aug 2006 18:15:38 -0000	1.117
+++ evolution-data-server.spec	28 Aug 2006 14:49:57 -0000	1.118
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -47,6 +47,9 @@
 # Gnome.org bug #349847
 Patch17: evolution-data-server-1.7.92-uninitialized-gerror.patch
 
+# RH bug #198935 / Gnome.org bug #350907
+Patch18: evolution-data-server-1.7.92-fix-fd-leak.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -131,6 +134,7 @@
 %patch15 -p1 -b .fix-edataserverui-libs
 %patch16 -p1 -b .maybe-fix-crash
 %patch17 -p1 -b .uninitialized-gerror
+%patch18 -p1 -b .fix-fd-leak
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -333,6 +337,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Aug 28 2006 Ray Strode <rstrode at redhat.com> - 1.7.92-3.fc6
+- Add patch from Veerapuram Varadhan to fix fd leak (bug 198935).
+
 * Tue Aug 22 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.92-2
 - Add patch for Gnome.org bug #349847.
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 14:56:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 10:56:01 -0400
Subject: rpms/ruby/devel ruby.spec,1.82,1.83
Message-ID: <200608281456.k7SEu12g009882@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9851

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ruby.spec	28 Aug 2006 14:29:49 -0000	1.82
+++ ruby.spec	28 Aug 2006 14:55:58 -0000	1.83
@@ -285,20 +285,18 @@
 # done
 cd ..
 
+# generate ri doc
+make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} RUNRUBY="\$(MINIRUBY) \$(srcdir)/runruby.rb --extout=\$(EXTOUT) --" DESTDIR=$RPM_BUILD_ROOT install-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}
+
 # installing binaries ...
-cd %{name}-%{version}
-make DESTDIR=$RPM_BUILD_ROOT install
-cd ..
+make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} DESTDIR=$RPM_BUILD_ROOT install
 
 _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}
 
-# generate ri doc
-make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} RUNRUBY="$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 \$(srcdir)/runruby.rb --extout=\$(EXTOUT) --" DESTDIR=$RPM_BUILD_ROOT install-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
 install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 15:45:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 11:45:30 -0400
Subject: rpms/kdewebdev/devel kdewebdev-3.5.4-kxsldbg-icons.patch,NONE,1.1
Message-ID: <200608281545.k7SFjU2H007272@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7222

Added Files:
	kdewebdev-3.5.4-kxsldbg-icons.patch 
Log Message:
fix #203893, add missing icon for kxsldbg


kdewebdev-3.5.4-kxsldbg-icons.patch:
 Makefile.am |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE kdewebdev-3.5.4-kxsldbg-icons.patch ---
--- kdewebdev-3.5.4/kxsldbg/Makefile.am.orig	2006-08-25 17:24:17.000000000 +0200
+++ kdewebdev-3.5.4/kxsldbg/Makefile.am	2006-08-25 17:25:10.000000000 +0200
@@ -56,6 +56,8 @@
 shellrcdir   = $(kde_datadir)/kxsldbg
 shellrc_DATA = kxsldbg_shell.rc
 
+KDE_ICON = kxsldbg
+
 messages: rc.cpp
 	LIST=`find . -name \*.ui -o -name \*.rc`; \
 	$(EXTRACTRC) $$LIST >> rc.cpp ;\



From fedora-cvs-commits at redhat.com  Mon Aug 28 15:46:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 11:46:04 -0400
Subject: rpms/vsftpd/devel vsftpd-2.0.4-filter.patch, NONE, 1.1 vsftpd.spec,
	1.51, 1.52
Message-ID: <200608281546.k7SFk4V4007587@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6936

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.0.4-filter.patch 
Log Message:
add patch to make smarter filname filter


vsftpd-2.0.4-filter.patch:
 ls.c  |   26 ++++++++++++++++++++++++--
 str.c |   11 +++++++++++
 str.h |    2 ++
 3 files changed, 37 insertions(+), 2 deletions(-)

--- NEW FILE vsftpd-2.0.4-filter.patch ---
--- vsftpd-2.0.4/ls.c.orig	2005-05-23 23:55:00.000000000 +0200
+++ vsftpd-2.0.4/ls.c	2006-07-11 01:02:21.000000000 +0200
@@ -239,9 +239,31 @@
   int ret = 0;
   char last_token = 0;
   int must_match_at_current_pos = 1;
+  
+  
   str_copy(&filter_remain_str, p_filter_str);
-  str_copy(&name_remain_str, p_filename_str);
-
+  
+  if (!str_isempty (&filter_remain_str) && !str_isempty(p_filename_str)) {
+    if (str_get_char_at(p_filter_str, 0) == '/') {
+      if (str_get_char_at(p_filename_str, 0) != '/') {
+        str_getcwd (&name_remain_str);
+     
+        if (str_getlen(&name_remain_str) > 1) /* cwd != root dir */
+          str_append_char (&name_remain_str, '/');
+          
+        str_append_str (&name_remain_str, p_filename_str);
+      }
+      else
+       str_copy (&name_remain_str, p_filename_str);
+    } else {
+      if (str_get_char_at(p_filter_str, 0) != '{')
+        str_basename (&name_remain_str, p_filename_str);
+      else
+        str_copy (&name_remain_str, p_filename_str);
+    }
+  } else
+    str_copy(&name_remain_str, p_filename_str);
+  
   while (!str_isempty(&filter_remain_str))
   {
     static struct mystr s_match_needed_str;
--- vsftpd-2.0.4/str.h.orig	2004-06-04 18:35:00.000000000 +0200
+++ vsftpd-2.0.4/str.h	2006-07-11 00:59:59.000000000 +0200
@@ -96,6 +96,8 @@
 int str_contains_space(const struct mystr* p_str);
 int str_contains_unprintable(const struct mystr* p_str);
 void str_replace_unprintable(struct mystr* p_str, char new_char);
+void str_basename (struct mystr* d_str, const struct mystr* path);
+
 int str_atoi(const struct mystr* p_str);
 filesize_t str_a_to_filesize_t(const struct mystr* p_str);
 unsigned int str_octal_to_uint(const struct mystr* p_str);
--- vsftpd-2.0.4/str.c.orig	2004-07-12 19:58:39.000000000 +0200
+++ vsftpd-2.0.4/str.c	2006-07-11 00:59:59.000000000 +0200
@@ -662,3 +662,14 @@
   }
 }
 
+void
+str_basename (struct mystr* d_str, const struct mystr* path)
+{
+  struct mystr tmp = INIT_MYSTR;
+
+  str_copy (&tmp, path);
+  str_split_char_reverse(&tmp, d_str, '/');
+
+  if (str_isempty(d_str))
+   str_copy (d_str, path);
+}


Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- vsftpd.spec	22 Aug 2006 10:18:47 -0000	1.51
+++ vsftpd.spec	28 Aug 2006 15:46:01 -0000	1.52
@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.5
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -35,6 +35,7 @@
 Patch20: vsftpd-2.0.5-add_ipv6_option.patch
 Patch21: vsftpd-2.0.5-correct_comments.patch
 Patch22: vsftpd-2.0.5-man.patch
+Patch23: vsftpd-2.0.4-filter.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -84,6 +85,7 @@
 %patch20 -p1 -b .ipv6opt
 %patch21 -p1 -b .comments
 %patch22 -p1 -b .manp
+%patch23 -p1 -b .filter
 
 %build
 %ifarch s390x
@@ -142,6 +144,9 @@
 /var/ftp
 
 %changelog
+* Mon Aug 28 2006 Maros Barabas <mbarabas at redhat.com> - 2.0.5-8
+- added forgotten patch to make filename filter (#174764)
+
 * Tue Aug 22 2006 Maros Barabas <mbarabas at redhat.com> - 2.0.5-7
 - correct paths of configuration files on man pages
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 15:50:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 11:50:33 -0400
Subject: rpms/frysk/devel .cvsignore, 1.28, 1.29 frysk.spec, 1.90,
	1.91 sources, 1.28, 1.29 frysk-ghosts.patch, 1.1, NONE
Message-ID: <200608281550.k7SFoX6v024364@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24327

Modified Files:
	.cvsignore frysk.spec sources 
Removed Files:
	frysk-ghosts.patch 
Log Message:
- New upstream version.
- Remove Patch1, the code now contains a real fix for bug #203902.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	24 Aug 2006 14:38:17 -0000	1.28
+++ .cvsignore	28 Aug 2006 15:50:31 -0000	1.29
@@ -1 +1 @@
-frysk-0.0.1.2006.08.24.rh1.tar.bz2
+frysk-0.0.1.2006.08.28.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- frysk.spec	25 Aug 2006 09:39:46 -0000	1.90
+++ frysk.spec	28 Aug 2006 15:50:31 -0000	1.91
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.08.24.rh1
-Release:	3%{?dist}
+Version:	0.0.1.2006.08.28.rh1
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -10,9 +10,6 @@
 # Disable the test which fails when building on older kernel.
 Patch:		frysk-xfail-2130.patch
 
-# Fix for #203902:
-Patch1:		frysk-ghosts.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:   	libglade-java >= 2.12.5
@@ -56,7 +53,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch
-%patch1
 
 %build 
 
@@ -119,6 +115,10 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Mon Aug 28 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.28.rh1-1
+- New upstream version.
+- Remove Patch1, the code now contains a real fix for bug #203902.
+
 * Fri Aug 25 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.24.rh1-3
 - Patch1 for bug #203902.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	24 Aug 2006 14:38:17 -0000	1.28
+++ sources	28 Aug 2006 15:50:31 -0000	1.29
@@ -1 +1 @@
-162180563ebbcf828c09a2d8e9a4e5a3  frysk-0.0.1.2006.08.24.rh1.tar.bz2
+ada0e13aa078433085bdeed15857be06  frysk-0.0.1.2006.08.28.rh1.tar.bz2


--- frysk-ghosts.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 28 16:51:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 12:51:22 -0400
Subject: rpms/gnome-applets/devel cpufreq-selector.pam, 1.1,
	1.2 gnome-applets.spec, 1.174, 1.175
Message-ID: <200608281651.k7SGpMvB005533@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5396

Modified Files:
	cpufreq-selector.pam gnome-applets.spec 
Log Message:
fix cpufreq-selector to use config-utils pam policy



Index: cpufreq-selector.pam
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/cpufreq-selector.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpufreq-selector.pam	27 May 2005 18:29:32 -0000	1.1
+++ cpufreq-selector.pam	28 Aug 2006 16:51:17 -0000	1.2
@@ -1,4 +1,4 @@
 #%PAM-1.0
-auth       sufficient	pam_rootok.so
-auth       required	pam_console.so
-account    required	pam_permit.so
+auth       include	config-util
+account    include	config-util
+session	   include	config-util


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- gnome-applets.spec	28 Aug 2006 03:38:43 -0000	1.174
+++ gnome-applets.spec	28 Aug 2006 16:51:17 -0000	1.175
@@ -32,7 +32,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.90
-Release:  	4%{?dist}
+Release:  	5%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -309,6 +309,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Mon Aug 28 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-5.fc6
+- Make cpufreq-selector use the config-utils pam policy
+
 * Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-4.fc6
 - Fix some redraw issues in the keyboard capplet
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 17:03:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 13:03:04 -0400
Subject: rpms/gfs2-utils/devel .cvsignore, 1.7, 1.8 gfs2-utils.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <200608281703.k7SH34d3009311@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gfs2-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9287

Modified Files:
	.cvsignore gfs2-utils.spec sources 
Log Message:
New upstream sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Aug 2006 19:17:57 -0000	1.7
+++ .cvsignore	28 Aug 2006 17:03:01 -0000	1.8
@@ -1 +1 @@
-gfs2-0.1.5.tar.gz
+gfs2-0.1.6.tar.gz


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gfs2-utils.spec	22 Aug 2006 19:17:57 -0000	1.14
+++ gfs2-utils.spec	28 Aug 2006 17:03:01 -0000	1.15
@@ -11,7 +11,7 @@
 ###############################################################################
 
 Name: gfs2-utils
-Version: 0.1.5
+Version: 0.1.6
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Kernel
@@ -73,6 +73,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Aug 28 2006 Chris Feist <cfeist at redhat.com> 0.1.6-1
+- New Upstream sources.
+
 * Tue Aug 22 2006 Chris Feist <cfeist at redhat.com> 0.1.5-1
 - New Upstream sources.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Aug 2006 19:17:57 -0000	1.7
+++ sources	28 Aug 2006 17:03:01 -0000	1.8
@@ -1 +1 @@
-f8cd7508e491355a81f409ec6997bc71  gfs2-0.1.5.tar.gz
+262d2d9150352ff157114d8c7ea106fa  gfs2-0.1.6.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 28 17:23:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 13:23:34 -0400
Subject: rpms/evolution/devel evolution-2.7.92-fix-prgname.patch, NONE,
	1.1 evolution-2.7.92-fix-edit-copy.patch, 1.1,
	1.2 evolution.spec, 1.186, 1.187
Message-ID: <200608281723.k7SHNYGE004317@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4301

Modified Files:
	evolution-2.7.92-fix-edit-copy.patch evolution.spec 
Added Files:
	evolution-2.7.92-fix-prgname.patch 
Log Message:

* Mon Aug 28 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-6.fc6
- Add another hunk to the patch for RH bug #201541.
- Add patch for RH bug #202289.


evolution-2.7.92-fix-prgname.patch:
 main.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE evolution-2.7.92-fix-prgname.patch ---
--- evolution-2.7.92/shell/main.c.fix-prgname	2006-08-28 11:04:44.000000000 -0400
+++ evolution-2.7.92/shell/main.c	2006-08-28 11:04:56.000000000 -0400
@@ -516,7 +516,7 @@
 
 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
 
-	program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
+	program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
 				      GNOME_PROGRAM_STANDARD_PROPERTIES,
 				      GNOME_PARAM_GOPTION_CONTEXT, context,
 				      GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),

evolution-2.7.92-fix-edit-copy.patch:
 em-folder-view.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

Index: evolution-2.7.92-fix-edit-copy.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.92-fix-edit-copy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.7.92-fix-edit-copy.patch	28 Aug 2006 11:46:25 -0000	1.1
+++ evolution-2.7.92-fix-edit-copy.patch	28 Aug 2006 17:23:31 -0000	1.2
@@ -1,5 +1,5 @@
---- evolution-2.7.92/mail/em-folder-view.c.fix-edit-copy	2006-08-28 06:36:52.000000000 -0400
-+++ evolution-2.7.92/mail/em-folder-view.c	2006-08-28 06:37:22.000000000 -0400
+--- evolution-2.7.92/mail/em-folder-view.c.fix-edit-copy	2006-08-28 11:11:35.000000000 -0400
++++ evolution-2.7.92/mail/em-folder-view.c	2006-08-28 11:55:26.000000000 -0400
 @@ -140,7 +140,7 @@
  static void emfv_on_url(EMFolderView *emfv, const char *uri, const char *nice_uri);
  
@@ -17,7 +17,21 @@
  #ifdef ENABLE_PROFILING
  	g_signal_connect(emfv->preview, "complete", G_CALLBACK (emfv_format_complete), emfv);
  #endif
-@@ -2877,3 +2878,15 @@
+@@ -1333,8 +1334,12 @@
+ emfv_select_all_text(BonoboUIComponent *uid, void *data, const char *path)
+ {
+ 	EMFolderView *emfv = data;
+-
++	gboolean selected;
++	
+ 	gtk_html_select_all (((EMFormatHTML *)emfv->preview)->html);
++	selected = gtk_html_command (((EMFormatHTML *)emfv->preview)->html, "is-selection-active");
++	bonobo_ui_component_set_prop(emfv->uic, "/commands/EditCopy", "sensitive", selected?"1":"0", NULL);	
++	
+ }
+ 
+ static void
+@@ -2877,3 +2882,15 @@
  	
  	g_free (nice_url);
  }


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- evolution.spec	28 Aug 2006 11:46:25 -0000	1.186
+++ evolution.spec	28 Aug 2006 17:23:31 -0000	1.187
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.92
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -135,6 +135,9 @@
 # RH bug #201541 / Gnome.org bug #336983
 Patch37: evolution-2.7.92-fix-edit-copy.patch
 
+# RH bug #202289
+Patch38: evolution-2.7.92-fix-prgname.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -274,6 +277,7 @@
 %patch35 -p1 -b .deprecated-glib
 %patch36 -p1 -b .deprecated-gdk
 %patch37 -p1 -b .fix-edit-copy
+%patch38 -p1 -b .fix-prgname
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -664,6 +668,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Aug 28 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-6.fc6
+- Add another hunk to the patch for RH bug #201541.
+- Add patch for RH bug #202289.
+
 * Mon Aug 28 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-5.fc6
 - Add patch for RH bug #201541.
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 17:27:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 13:27:30 -0400
Subject: rpms/kernel/devel linux-2.6-sysrq-c.patch,1.1,1.2
Message-ID: <200608281727.k7SHRUMJ004470@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4447

Modified Files:
	linux-2.6-sysrq-c.patch 
Log Message:
Update sysrq-c patch with the latest one from bz 201618:

This version improves over the previous one, in that some Bad Things could
happen if we trigger a null ptr deref on sysrq-c with panic_on_oops not set,
and subsequently try another sysrq (due to a still-held sysrq_key_table_lock).
While looking perhaps a touch goofy, since its possible no oops has occurred in
this case, it achieves the same end in a cleaner fashion.



linux-2.6-sysrq-c.patch:
 sysrq.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

Index: linux-2.6-sysrq-c.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-sysrq-c.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sysrq-c.patch	19 Aug 2006 17:11:39 -0000	1.1
+++ linux-2.6-sysrq-c.patch	28 Aug 2006 17:27:28 -0000	1.2
@@ -1,6 +1,6 @@
---- linux-2.6.17.noarch/drivers/char/sysrq.c.orig	2006-08-01 11:07:43.000000000 -0400
-+++ linux-2.6.17.noarch/drivers/char/sysrq.c	2006-08-01 11:09:03.000000000 -0400
-@@ -94,11 +94,13 @@
+--- linux-2.6.17/drivers/char/sysrq.c.orig	2006-08-16 06:39:44.000000000 -0400
++++ linux-2.6.17/drivers/char/sysrq.c	2006-08-16 06:43:32.000000000 -0400
+@@ -94,11 +94,16 @@
  #define sysrq_unraw_op (*(struct sysrq_key_op *)0)
  #endif /* CONFIG_VT */
  
@@ -10,12 +10,15 @@
  {
 +#ifdef CONFIG_KEXEC
  	crash_kexec(pt_regs);
++	/* can't get here if crash image is loaded */
++	printk("Kexec: Warning: crash image not loaded\n");
 +#endif
-+	*( (char *) 0) = 0;
++	if(panic_on_oops)
++		panic("SysRq-triggered panic!\n");
  }
  static struct sysrq_key_op sysrq_crashdump_op = {
  	.handler	= sysrq_handle_crashdump,
-@@ -106,9 +108,6 @@
+@@ -106,9 +111,6 @@
  	.action_msg	= "Trigger a crashdump",
  	.enable_mask	= SYSRQ_ENABLE_DUMP,
  };
@@ -25,5 +28,3 @@
  
  static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs,
  				struct tty_struct *tty)
-
-



From fedora-cvs-commits at redhat.com  Mon Aug 28 17:49:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 13:49:13 -0400
Subject: rpms/gtk2/devel gtk+-2.10.2-poll.patch, NONE, 1.1 gtk2.spec, 1.173,
	1.174
Message-ID: <200608281749.k7SHnDsb000707@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv647

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.10.2-poll.patch 
Log Message:
fix printer list polling


gtk+-2.10.2-poll.patch:
 gtkprintbackendcups.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gtk+-2.10.2-poll.patch ---
--- gtk+-2.10.2/modules/printbackends/cups/gtkprintbackendcups.c.poll	2006-08-28 12:42:26.000000000 -0400
+++ gtk+-2.10.2/modules/printbackends/cups/gtkprintbackendcups.c	2006-08-28 12:42:40.000000000 -0400
@@ -1185,7 +1185,7 @@
   if (cups_backend->list_printers_poll == 0)
     {
       cups_request_printer_list (cups_backend);
-      cups_backend->list_printers_poll = g_timeout_add (3000 * 100000,
+      cups_backend->list_printers_poll = g_timeout_add (3000,
                                                         (GSourceFunc) cups_request_printer_list,
                                                         backend);
     }


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- gtk2.spec	23 Aug 2006 19:07:42 -0000	1.173
+++ gtk2.spec	28 Aug 2006 17:49:10 -0000	1.174
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -28,9 +28,11 @@
 Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
 # Filechooser search
 Patch2: gtk+-2.10.1-search.patch
-# Fixed in cvs
+
+# The following are fixed in upstream cvs
 Patch3: gtk+-2.10.2-recent.patch
 Patch4: gtk+-2.10.2-values-and-names.patch
+Patch5: gtk+-2.10.2-poll.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -113,6 +115,7 @@
 %patch2 -p1 -b .search
 %patch3 -p1 -b .recent
 %patch4 -p1 -b .values-and-names
+%patch5 -p1 -b .poll
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -284,6 +287,10 @@
 %doc tmpdocs/examples
 
 %changelog
+* Mon Aug 28 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.2-4.fc6
+- Use a reasonable timeout when polling for printer 
+  list updates  (#203585)
+
 * Wed Aug 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.2-3.fc6
 - Fix confusion between values and names in printer options (#203588)
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 18:20:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 14:20:15 -0400
Subject: rpms/xorg-x11-drv-i128/devel i128-1.2.0-1600sw-range-hack.patch, 1.1,
	1.2 xorg-x11-drv-i128.spec, 1.12, 1.13
Message-ID: <200608281820.k7SIKFLK024037@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-i128/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24004

Modified Files:
	i128-1.2.0-1600sw-range-hack.patch xorg-x11-drv-i128.spec 
Log Message:
* Mon Aug 28 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-4
- i128-1.2.0-1600sw-range-hack.patch: Also fill in maxPixClock and synthesize
  the appropriate modes when we don't get DDC.


i128-1.2.0-1600sw-range-hack.patch:
 i128_driver.c |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 51 insertions(+)

Index: i128-1.2.0-1600sw-range-hack.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i128/devel/i128-1.2.0-1600sw-range-hack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i128-1.2.0-1600sw-range-hack.patch	2 Aug 2006 20:02:32 -0000	1.1
+++ i128-1.2.0-1600sw-range-hack.patch	28 Aug 2006 18:20:12 -0000	1.2
@@ -1,18 +1,67 @@
---- xf86-video-i128-1.2.0/src/i128_driver.c.jx	2006-04-07 15:10:18.000000000 -0400
-+++ xf86-video-i128-1.2.0/src/i128_driver.c	2006-08-02 15:52:33.000000000 -0400
-@@ -1077,6 +1077,15 @@
-              pI128->FlatPanel = TRUE;
-     	     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
- 			"Digital flat panel detected\n");
-+	     if (!mon) {
-+		 /* Since DDC can be unreliable, jam in known 1600SW ranges */
-+		 pScrn->monitor->nHsync = 1;
-+		 pScrn->monitor->hsync[0].lo = 30.0;
-+		 pScrn->monitor->hsync[0].hi = 72.0;
-+		 pScrn->monitor->nVrefresh = 1;
-+		 pScrn->monitor->vrefresh[0].lo = 58;
-+		 pScrn->monitor->vrefresh[0].hi = 62;
-+	     }
-           } else if (pI128->FlatPanel)
+--- xf86-video-i128-1.2.0/src/i128_driver.c.1600sw-hack	2006-04-07 15:10:18.000000000 -0400
++++ xf86-video-i128-1.2.0/src/i128_driver.c	2006-08-28 14:15:22.000000000 -0400
+@@ -508,6 +508,45 @@ I128AvailableOptions(int chipid, int bus
+     return I128Options;
+ }
+ 
++#define MODEPREFIX(name) NULL, NULL, name, 0, M_T_DRIVER
++#define MODESUFFIX 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0
++
++static DisplayModeRec sgi1600sw_modes[] = {
++    { MODEPREFIX("1600x1024"), 103125, 1600, 1600, 1656, 1664, 0,
++                                      1024, 1024, 1029, 1030, 0,
++      V_PHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("800x512"),    54375,  800,  800,  840,  848, 0,
++                                       512,  512,  514,  515, 0,
++      V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX }
++};
++
++static void
++add1600SWModes(ScrnInfoPtr pScrn)
++{
++    DisplayModePtr modes;
++    int hskew = 0;
++
++    modes = xnfcalloc(2, sizeof(*modes));
++
++    memcpy(modes, sgi1600sw_modes, 2 * sizeof(*modes));
++
++    switch (pScrn->bitsPerPixel) {
++       case 8:
++           hskew = 1; break;
++       case 16:
++           hskew = 5; break;
++       case 24: case 32:
++           hskew = 7; break;
++       default: break;
++    }
++
++    modes[0].HSkew = modes[1].HSkew = hskew;
++
++    modes[0].next = &modes[1];
++    modes[1].next = pScrn->monitor->Modes;
++
++    pScrn->monitor->Modes = modes;
++}
+ 
+ /* Mandatory
+  *
+@@ -1081,6 +1120,18 @@ I128PreInit(ScrnInfoPtr pScrn, int flags
      	     xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
  			"Digital flat panel forced\n");
+ 
++         if (pI128->FlatPanel && !mon) {
++             /* Since DDC can be unreliable, jam in known 1600SW data */
++             pScrn->monitor->nHsync = 1;
++             pScrn->monitor->hsync[0].lo = 30.0;
++             pScrn->monitor->hsync[0].hi = 72.0;
++             pScrn->monitor->nVrefresh = 1;
++             pScrn->monitor->vrefresh[0].lo = 58;
++             pScrn->monitor->vrefresh[0].hi = 62;
++             pScrn->monitor->maxPixClock = 104 * 1000;
++             add1600SWModes(pScrn);
++         }
++
+     	  xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+ 			"Using SilverHammer programmable clock (MCLK %1.3f MHz)\n",
+ 			mclk / 1000.0);


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-i128.spec	2 Aug 2006 20:02:32 -0000	1.12
+++ xorg-x11-drv-i128.spec	28 Aug 2006 18:20:12 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i128 video driver
 Name:      xorg-x11-drv-i128
 Version:   1.2.0
-Release:   3
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -62,6 +62,10 @@
 %{_mandir}/man4/i128.4*
 
 %changelog
+* Mon Aug 28 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-4
+- i128-1.2.0-1600sw-range-hack.patch: Also fill in maxPixClock and synthesize
+  the appropriate modes when we don't get DDC.
+
 * Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-3
 - i128-1.2.0-1600sw-range-hack.patch: Attempt to force the sync ranges
   correctly when we detect a 1600SW panel but don't get EDID info from it.



From fedora-cvs-commits at redhat.com  Mon Aug 28 18:37:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 14:37:33 -0400
Subject: rpms/mesa/devel mesa-6.4.1-radeon-use-right-texture-format.patch,
	1.1, 1.2 mesa.spec, 1.93,
	1.94 mesa-6.5-texture-from-pixmap-fixes.patch, 1.2,
	NONE mesa-6.5-tfp-fbconfig-attribs.patch, 1.1, NONE
Message-ID: <200608281837.k7SIbXNT028733@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28691

Modified Files:
	mesa-6.4.1-radeon-use-right-texture-format.patch mesa.spec 
Removed Files:
	mesa-6.5-texture-from-pixmap-fixes.patch 
	mesa-6.5-tfp-fbconfig-attribs.patch 
Log Message:
* Mon Aug 28 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc1.2.fc6
- Drop upstreamed patches mesa-6.5-texture-from-pixmap-fixes.patch and
  mesa-6.5-tfp-fbconfig-attribs.patch and fix
  mesa-6.4.1-radeon-use-right-texture-format.patch to not break 16bpp
  transparency.


mesa-6.4.1-radeon-use-right-texture-format.patch:
 radeon_tex.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Index: mesa-6.4.1-radeon-use-right-texture-format.patch
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.4.1-radeon-use-right-texture-format.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-6.4.1-radeon-use-right-texture-format.patch	19 Feb 2006 05:43:00 -0000	1.1
+++ mesa-6.4.1-radeon-use-right-texture-format.patch	28 Aug 2006 18:37:27 -0000	1.2
@@ -13,7 +13,7 @@
  	 return _dri_texformat_argb1555;
        default:
 -         return do32bpt ? _dri_texformat_rgba8888 : _dri_texformat_argb4444;
-+         return do32bpt ? _dri_texformat_argb8888 : _dri_texformat_rgb565;
++         return do32bpt ? _dri_texformat_argb8888 : _dri_texformat_argb4444;
        }
  
     case 3:


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- mesa.spec	25 Aug 2006 20:00:28 -0000	1.93
+++ mesa.spec	28 Aug 2006 18:37:27 -0000	1.94
@@ -34,7 +34,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5.1
-Release: 0.rc1.1%{?dist}
+Release: 0.rc1.2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -61,9 +61,7 @@
 # General patches from upstream go here:
 
 # Red Hat custom patches, feature development
-Patch200: mesa-6.5-texture-from-pixmap-fixes.patch
 Patch201: mesa-6.4.1-radeon-use-right-texture-format.patch
-Patch202: mesa-6.5-tfp-fbconfig-attribs.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -500,6 +498,12 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Mon Aug 28 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc1.2.fc6
+- Drop upstreamed patches mesa-6.5-texture-from-pixmap-fixes.patch and
+  mesa-6.5-tfp-fbconfig-attribs.patch and fix
+  mesa-6.4.1-radeon-use-right-texture-format.patch to not break 16bpp
+  transparency.
+
 * Fri Aug 25 2006 Adam Jackson <ajackson at redhat.com> - 6.5.1-0.rc1.1.fc6
 - mesa-6.5.1-build-config.patch: Add i965 to x86-64 config.
 


--- mesa-6.5-texture-from-pixmap-fixes.patch DELETED ---


--- mesa-6.5-tfp-fbconfig-attribs.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 28 18:42:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 14:42:01 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.128, 1.129 kudzu.spec, 1.146,
	1.147 sources, 1.145, 1.146
Message-ID: <200608281842.k7SIg1Kr029796@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29704

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
bup



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- .cvsignore	28 Aug 2006 03:07:52 -0000	1.128
+++ .cvsignore	28 Aug 2006 18:41:58 -0000	1.129
@@ -1 +1 @@
-kudzu-1.2.48.tar.gz
+kudzu-1.2.49.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- kudzu.spec	28 Aug 2006 03:07:56 -0000	1.146
+++ kudzu.spec	28 Aug 2006 18:41:59 -0000	1.147
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.48
+Version: 1.2.49
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -74,6 +74,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Mon Aug 28 2006 Bill Nottingham <notting at redhat.com> - 1.2.49-1
+- fix xenfb probe some more
+
 * Sun Aug 27 2006 Bill Nottingham <notting at redhat.com> - 1.2.48-1
 - remove socket code, no longer used (and a bad hack to begin with)
 - fix xenfb probe


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- sources	28 Aug 2006 03:33:14 -0000	1.145
+++ sources	28 Aug 2006 18:41:59 -0000	1.146
@@ -1 +1 @@
-ed45bbe81410178b30adcad587ccae76  kudzu-1.2.48.tar.gz
+8cbbccc70c3379ca14286e93ff6e5f67  kudzu-1.2.49.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 28 18:42:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 14:42:38 -0400
Subject: rpms/system-config-display/devel system-config-display.spec, 1.43,
	1.44
Message-ID: <200608281842.k7SIgc8s029941@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/system-config-display/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29914

Modified Files:
	system-config-display.spec 
Log Message:
* Mon Aug 28 2006 Adam Jackson <ajackson at redhat.com> 1.0.44-1
- Unpack properly when given a refresh rate instead of a refresh range.



Index: system-config-display.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- system-config-display.spec	21 Aug 2006 15:20:12 -0000	1.43
+++ system-config-display.spec	28 Aug 2006 18:42:35 -0000	1.44
@@ -1,6 +1,6 @@
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
-Version: 1.0.42
+Version: 1.0.44
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -81,6 +81,14 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
 
 %changelog
+* Mon Aug 28 2006 Adam Jackson <ajackson at redhat.com> 1.0.44-1
+- Unpack properly when given a refresh rate instead of a refresh range.
+
+* Fri Aug 25 2006 Adam Jackson <ajackson at redhat.com> 1.0.43-1
+- Drop 8bpp support.
+- Simplify monitor selection view.
+- Fix initial window sizing to be large enough for all fields.
+
 * Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 1.0.42-1
 - Align lists correctly in RTL locales.  (#202754)
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 18:43:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 14:43:36 -0400
Subject: rpms/system-config-display/devel .cvsignore, 1.31, 1.32 sources,
	1.38, 1.39
Message-ID: <200608281843.k7SIhaII030203@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/system-config-display/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30167/devel

Modified Files:
	.cvsignore sources 
Log Message:
auto-import system-config-display-1.0.44-1 on branch devel from system-config-display-1.0.44-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	21 Aug 2006 15:20:12 -0000	1.31
+++ .cvsignore	28 Aug 2006 18:43:34 -0000	1.32
@@ -1 +1 @@
-system-config-display-1.0.42.tar.bz2
+system-config-display-1.0.44.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	21 Aug 2006 15:20:12 -0000	1.38
+++ sources	28 Aug 2006 18:43:34 -0000	1.39
@@ -1 +1 @@
-747471ca99ca5e1a13d663923ea8d45c  system-config-display-1.0.42.tar.bz2
+1c2c884d10f7ec5c9ebf84544b180a56  system-config-display-1.0.44.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 28 18:57:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 14:57:11 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-page_h.patch, NONE,
	1.1 kexec-tools.spec, 1.59, 1.60
Message-ID: <200608281857.k7SIvBL5016181@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16155

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-page_h.patch 
Log Message:
adding page.h fix

kexec-tools-1.101-page_h.patch:
 kexec-multiboot-x86.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE kexec-tools-1.101-page_h.patch ---
--- kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c.orig	2006-08-28 14:32:50.000000000 -0400
+++ kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c	2006-08-28 14:34:29.000000000 -0400
@@ -47,7 +47,6 @@
 #include <getopt.h>
 #include <elf.h>
 #include <boot/elf_boot.h>
-#include <asm/page.h>
 #include <ip_checksum.h>
 #include "../../kexec.h"
 #include "../../kexec-elf.h"
@@ -342,7 +341,7 @@
 			/* Pick the next aligned spot to load it in */
 			freespace = add_buffer(info,
 				buf, mod_size, mod_size,
-				PAGE_SIZE, 0, 0xffffffffUL, 1);
+				getpagesize(), 0, 0xffffffffUL, 1);
 
 			/* Add the module command line */
 			sprintf(mod_clp, "%s", mod_command_line);


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kexec-tools.spec	24 Aug 2006 11:55:28 -0000	1.59
+++ kexec-tools.spec	28 Aug 2006 18:57:08 -0000	1.60
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 49%{?dist}
+Release: 50%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -58,6 +58,7 @@
 Patch604: kexec-tools-1.101-add-makedumpfile1.patch
 Patch605: kexec-tools-1.101-add-makedumpfile2.patch
 Patch606: kexec-tools-1.101-makedumpfile-archbuild.patch
+Patch607: kexec-tools-1.101-page_h.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -91,6 +92,7 @@
 %patch604 -p1
 %patch605 -p1
 %patch606 -p1
+%patch607 -p1
 
 %build
 %configure \
@@ -157,6 +159,9 @@
 %doc TODO
 
 %changelog
+* Mon Aug 28 2006 Neil Horman <nhorman at redhat.com> - 1.101-50%{dist}
+- updating to build without need for asm/page.h on x86_64
+
 * Thu Aug 24 2006 Neil Horman <nhorman at redhat.com> - 1.101-49%{dist}
 - rewriting kcp to properly do ssh and scp
 - updating mkdumprd to use new kcp syntax



From fedora-cvs-commits at redhat.com  Mon Aug 28 19:04:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 15:04:57 -0400
Subject: rpms/freetype/devel freetype.spec,1.41,1.42
Message-ID: <200608281904.k7SJ4v1Y018269@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18225

Modified Files:
	freetype.spec 
Log Message:
fix requires



Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- freetype.spec	18 Aug 2006 16:37:50 -0000	1.41
+++ freetype.spec	28 Aug 2006 19:04:55 -0000	1.42
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.2.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -53,6 +53,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: zlib-devel
+Requires: pkgconfig
 
 %description devel
 The freetype-devel package includes the static libraries and header files
@@ -193,6 +194,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Mon Aug 28 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.1-7
+- Require pkgconfig in the -devel package
+
 * Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-6
 - pass --disable-static to %%configure. (#172628)
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 19:31:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 15:31:12 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060822.patch, 1.1,
	1.2 selinux-policy.spec, 1.183, 1.184
Message-ID: <200608281931.k7SJVBff008812@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8751

Modified Files:
	policy-20060822.patch selinux-policy.spec 
Log Message:
* Mon Aug 28 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-3.fc5
- Backport some fixes for FC5 from rawhide


policy-20060822.patch:
 mls                                |    9 -
 modules/admin/amanda.fc            |   51 -------
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |   13 +
 modules/admin/usermanage.te        |    5 
 modules/apps/java.fc               |    9 +
 modules/apps/mozilla.if            |    2 
 modules/apps/wine.te               |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corecommands.if     |    1 
 modules/kernel/corenetwork.te.in   |    7 -
 modules/kernel/devices.fc          |    4 
 modules/kernel/devices.if          |   37 +++++
 modules/kernel/devices.te          |    8 +
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 +++++++++++
 modules/kernel/terminal.if         |   19 ++
 modules/services/afs.te            |   14 --
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    5 
 modules/services/avahi.te          |    2 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cpucontrol.te     |    2 
 modules/services/cron.if           |   18 ++
 modules/services/cron.te           |    9 -
 modules/services/cups.te           |   31 +++-
 modules/services/cyrus.te          |    5 
 modules/services/dbus.if           |    6 
 modules/services/dovecot.te        |    2 
 modules/services/gatekeeper.te     |   15 --
 modules/services/inn.te            |    1 
 modules/services/ldap.te           |    2 
 modules/services/mta.fc            |    2 
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/postgresql.te     |    1 
 modules/services/procmail.te       |    1 
 modules/services/radius.te         |    2 
 modules/services/rpc.if            |    2 
 modules/services/rpc.te            |    7 -
 modules/services/samba.te          |    8 -
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  112 ++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   24 +++
 modules/services/stunnel.te        |    6 
 modules/services/sysstat.te        |    3 
 modules/services/xserver.if        |   68 +++++++++-
 modules/services/xserver.te        |   15 +-
 modules/system/authlogin.if        |   21 ---
 modules/system/authlogin.te        |    1 
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/init.te             |    2 
 modules/system/libraries.fc        |   19 ++
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |   11 +
 modules/system/lvm.fc              |    2 
 modules/system/lvm.te              |    6 
 modules/system/miscfiles.fc        |    1 
 modules/system/miscfiles.if        |   18 ++
 modules/system/modutils.te         |    1 
 modules/system/mount.te            |    7 +
 modules/system/selinuxutil.te      |   15 ++
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    1 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    9 -
 modules/system/userdomain.if       |  246 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   48 +++----
 modules/system/xen.if              |   38 +++++
 modules/system/xen.te              |   26 +++
 89 files changed, 965 insertions(+), 306 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 policy-20060822.patch
Index: policy-20060822.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060822.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20060822.patch	22 Aug 2006 13:47:01 -0000	1.1
+++ policy-20060822.patch	28 Aug 2006 19:31:07 -0000	1.2
@@ -1,6 +1,30 @@
-diff -u -r serefpolicy-2.3.7/policy/modules/admin/amanda.fc ../devel/serefpolicy-2.3.8/policy/modules/admin/amanda.fc
---- serefpolicy-2.3.7/policy/modules/admin/amanda.fc	2006-08-12 06:57:16.000000000 -0400
-+++ ../devel/serefpolicy-2.3.8/policy/modules/admin/amanda.fc	2006-08-18 23:12:03.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.7/policy/mls
+--- nsaserefpolicy/policy/mls	2006-08-12 06:57:14.000000000 -0400
++++ serefpolicy-2.3.7/policy/mls	2006-08-28 14:20:46.000000000 -0400
+@@ -184,19 +184,12 @@
+ 	 ( t2 == mlstrustedobject ));
+ 
+ # the "single level" file "write" ops
+-mlsconstrain { file lnk_file fifo_file } { write create setattr relabelfrom append unlink link rename mounton }
++mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
+ 	(( l1 eq l2 ) or
+ 	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
+ 	 ( t1 == mlsfilewrite ) or
+ 	 ( t2 == mlstrustedobject ));
+ 
+-# the "ranged" file "write" ops
+-mlsconstrain { dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
+-	((( l1 dom l2 ) and ( l1 domby h2 )) or
+-	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
+-	 ( t1 == mlsfilewrite ) or
+-	 ( t2 == mlstrustedobject ));
+-
+ mlsconstrain dir { add_name remove_name reparent rmdir }
+ 	((( l1 dom l2 ) and ( l1 domby h2 )) or
+ 	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-2.3.7/policy/modules/admin/amanda.fc
+--- nsaserefpolicy/policy/modules/admin/amanda.fc	2006-08-12 06:57:16.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/amanda.fc	2006-08-28 14:20:46.000000000 -0400
 @@ -9,62 +9,13 @@
  /tmp/amanda(/.*)?			gen_context(system_u:object_r:amanda_tmp_t,s0)
  
@@ -65,9 +89,167 @@
  /var/lib/amanda/disklist	--	gen_context(system_u:object_r:amanda_data_t,s0)
  /var/lib/amanda/gnutar-lists(/.*)?	gen_context(system_u:object_r:amanda_gnutarlists_t,s0)
  /var/lib/amanda/index			gen_context(system_u:object_r:amanda_data_t,s0)
-diff -u -r serefpolicy-2.3.7/policy/modules/admin/usermanage.te ../devel/serefpolicy-2.3.8/policy/modules/admin/usermanage.te
---- serefpolicy-2.3.7/policy/modules/admin/usermanage.te	2006-08-22 09:25:35.000000000 -0400
-+++ ../devel/serefpolicy-2.3.8/policy/modules/admin/usermanage.te	2006-08-18 23:12:03.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.7/policy/modules/admin/anaconda.te
+--- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-08-12 06:57:19.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/anaconda.te	2006-08-28 14:20:46.000000000 -0400
+@@ -25,8 +25,12 @@
+ 
+ modutils_domtrans_insmod(anaconda_t)
+ 
++seutil_domtrans_semanage(anaconda_t)
++
+ unconfined_domain(anaconda_t)
+ 
++userdom_generic_user_home_dir_filetrans_generic_user_home_content(anaconda_t,{ dir file lnk_file fifo_file sock_file })
++
+ ifdef(`distro_redhat',`
+ 	bootloader_create_runtime_file(anaconda_t)
+ ')
+@@ -41,6 +45,7 @@
+ 
+ optional_policy(`
+ 	rpm_domtrans(anaconda_t)
++	rpm_domtrans_script(anaconda_t)
+ ')
+ 
+ optional_policy(`
+@@ -51,9 +56,16 @@
+ 	usermanage_domtrans_admin_passwd(anaconda_t)
+ ')
+ 
+-ifdef(`TODO',`
+ optional_policy(`
+-	role system_r types sysadm_ssh_agent_t;
+-	domain_auto_trans(anaconda_t, ssh_agent_exec_t, sysadm_ssh_agent_t)
+-')
++	ssh_domtrans_keygen(anaconda_t)
+ ')
++
++
++# The following is just to quiet the anaconda complaining during the install
++type anaconda_exec_t;
++kernel_domtrans_to(anaconda_t,anaconda_exec_t)
++allow anaconda_t self:process execmem;
++dontaudit domain anaconda_t:fd use;
++dontaudit domain anaconda_t:fifo_file r_file_perms;
++dontaudit domain anaconda_t:unix_stream_socket connectto;
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.7/policy/modules/admin/bootloader.te
+--- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-08-12 06:57:19.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/bootloader.te	2006-08-28 14:20:46.000000000 -0400
+@@ -83,8 +83,10 @@
+ dev_read_rand(bootloader_t)
+ dev_read_urand(bootloader_t)
+ dev_read_sysfs(bootloader_t)
+-# for reading BIOS data
++# for reading/Writing BIOS data
+ dev_read_raw_memory(bootloader_t)
++dev_read_bios_memory(bootloader_t)
++dev_write_bios_memory(bootloader_t)
+ 
+ fs_getattr_xattr_fs(bootloader_t)
+ fs_getattr_tmpfs(bootloader_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.7/policy/modules/admin/consoletype.te
+--- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-08-12 06:57:19.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/consoletype.te	2006-08-28 14:20:46.000000000 -0400
+@@ -8,7 +8,12 @@
+ 
+ type consoletype_t;
+ type consoletype_exec_t;
+-init_domain(consoletype_t,consoletype_exec_t)
++#dont transition from initrc
++#init_domain(consoletype_t,consoletype_exec_t)
++domain_type(consoletype_t)
++domain_entry_file(consoletype_t,consoletype_exec_t)
++role system_r types consoletype_t;
++
+ mls_file_read_up(consoletype_t)
+ mls_file_write_down(consoletype_t)
+ role system_r types consoletype_t;
+@@ -114,3 +119,7 @@
+ 	xen_append_log(consoletype_t)
+ 	xen_dontaudit_rw_unix_stream_sockets(consoletype_t)
+ ')
++
++optional_policy(`
++	xen_dontaudit_use_fds(consoletype_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.7/policy/modules/admin/firstboot.te
+--- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-12 06:57:19.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/firstboot.te	2006-08-28 14:20:46.000000000 -0400
+@@ -106,7 +106,7 @@
+ ')
+ 
+ optional_policy(`
+-	hal_dbus_send(firstboot_t)
++	hal_dbus_chat(firstboot_t)
+ ')
+ 
+ optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.7/policy/modules/admin/prelink.te
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2006-08-12 06:57:19.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/prelink.te	2006-08-28 14:20:46.000000000 -0400
+@@ -1,4 +1,3 @@
+-
+ policy_module(prelink,1.1.5)
+ 
+ ########################################
+@@ -74,6 +73,8 @@
+ 
+ miscfiles_read_localization(prelink_t)
+ 
++selinux_get_enforce_mode(prelink_t)
++
+ optional_policy(`
+ 	cron_system_entry(prelink_t, prelink_exec_t)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.7/policy/modules/admin/rpm.fc
+--- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-08-12 06:57:16.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/rpm.fc	2006-08-28 14:20:46.000000000 -0400
+@@ -19,6 +19,8 @@
+ /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
+ /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+ /usr/sbin/up2date		--	gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/bin/apt-get		--	gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/bin/apt-shell		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+ ')
+ 
+ /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.7/policy/modules/admin/rpm.if
+--- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-12 06:57:16.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/admin/rpm.if	2006-08-28 14:20:46.000000000 -0400
+@@ -75,12 +75,13 @@
+ 	')
+ 
+ 	rpm_domtrans($1)
+-	role $2 types rpm_t;
+-	role $2 types rpm_script_t;
+-	seutil_run_loadpolicy(rpm_script_t,$2,$3)
+-	seutil_run_semanage(rpm_script_t,$2,$3)
+-	seutil_run_setfiles(rpm_script_t,$2,$3)
+-	seutil_run_restorecon(rpm_script_t,$2,$3)
++	#role $2 types rpm_t;
++	#role $2 types rpm_script_t;
++	role_transition $2 rpm_exec_t system_r;
++	seutil_run_loadpolicy(rpm_script_t,system_r,$3)
++	seutil_run_semanage(rpm_script_t,system_r,$3)
++	seutil_run_setfiles(rpm_script_t,system_r,$3)
++	seutil_run_restorecon(rpm_script_t,system_r,$3)
+ 	allow rpm_t $3:chr_file rw_term_perms;
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.7/policy/modules/admin/usermanage.te
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-08-12 06:57:19.000000000 -0400
[...2518 lines suppressed...]
+-		role_change(sysadm,secadm)
+-		role_change(sysadm,auditadm)
++		role_change_template(sysadm,secadm)
++		role_change_template(sysadm,auditadm)
+ 
+-		role_change(auditadm,secadm)
+-		role_change(auditadm,sysadm)
++		role_change_template(auditadm,secadm)
++		role_change_template(auditadm,sysadm)
+ 
+-		role_change(secadm,auditadm)
+-		role_change(secadm,sysadm)
++		role_change_template(secadm,auditadm)
++		role_change_template(secadm,sysadm)
+ 	')
+ 
+ 	# this should be tunable_policy, but
+ 	# currently type_change and RBAC allow
+ 	# do not work in conditionals
+ 	ifdef(`user_canbe_sysadm',`
+-		role_change(user,sysadm)
++		role_change_template(user,sysadm)
+ 	')
+ 
+ 	allow privhome home_root_t:dir { getattr search };
+@@ -172,6 +164,8 @@
+ 
+ 	mls_process_read_up(sysadm_t)
+ 
++	term_getattr_all_user_ttys(sysadm_t)
++
+ 	init_exec(sysadm_t)
+ 
+ 	ifdef(`direct_sysadm_daemon',`
+@@ -210,7 +204,9 @@
+ 		init_exec(secadm_t)
+ 		logging_read_audit_log(secadm_t)
+ 	        logging_read_generic_logs(secadm_t)
+-		userdom_dontaudit_append_staff_home_content_files(secadm_t)
++		userdom_dontaudit_append_sysadm_home_content_files(secadm_t)
++		userdom_dontaudit_read_sysadm_home_content_files(secadm_t)
++
+ 	', `
+ 		logging_manage_audit_log(sysadm_t)
+ 		logging_manage_audit_config(sysadm_t)
+@@ -443,11 +439,11 @@
+ 			selinux_set_parameters(secadm_t)
+ 
+ 			seutil_manage_bin_policy(secadm_t)
+-			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
+-			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
+-			seutil_run_semanage(secadm_t,secadm_r,admin_terminal)
+-			seutil_run_setfiles(secadm_t,secadm_r,admin_terminal)
+-			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
++			seutil_run_checkpolicy(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
++			seutil_run_loadpolicy(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
++			seutil_run_semanage(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
++			seutil_run_setfiles(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
++			seutil_run_restorecon(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+ 		', `
+ 			selinux_set_enforce_mode(sysadm_t)
+ 			selinux_set_boolean(sysadm_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.7/policy/modules/system/xen.if
+--- nsaserefpolicy/policy/modules/system/xen.if	2006-08-12 06:57:15.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/xen.if	2006-08-28 14:20:46.000000000 -0400
+@@ -127,3 +127,41 @@
+ 	allow xm_t $1:fifo_file rw_file_perms;
+ 	allow xm_t $1:process sigchld;
+ ')
++
++
++########################################
++## <summary>
++##	Inherit and use xen file descriptors.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`xen_use_fds',`
++	gen_require(`
++		type xend_t;
++	')
++
++	allow $1 xend_t:fd use;
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to inherit
++##	xen file descriptors.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`xen_dontaudit_use_fds',`
++	gen_require(`
++		type xend_t;
++	')
++
++	dontaudit $1 xend_t:fd use;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.7/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-08-12 06:57:16.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/system/xen.te	2006-08-28 14:20:46.000000000 -0400
+@@ -69,7 +69,10 @@
+ #
+ 
+ allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
++dontaudit xend_t self:capability { sys_ptrace };
+ allow xend_t self:process { signal sigkill };
++dontaudit xend_t self:process ptrace;
++
+ # internal communication is often done using fifo and unix sockets.
+ allow xend_t self:fifo_file rw_file_perms;
+ allow xend_t self:unix_stream_socket create_stream_socket_perms;
+@@ -79,7 +82,7 @@
+ allow xend_t self:packet_socket create_socket_perms;
+ 
+ allow xend_t xen_image_t:dir r_dir_perms;
+-allow xend_t xen_image_t:file r_file_perms;
++allow xend_t xen_image_t:file rw_file_perms;
+ 
+ # pid file
+ allow xend_t xend_var_run_t:file manage_file_perms;
+@@ -130,6 +133,8 @@
+ corenet_tcp_bind_soundd_port(xend_t)
+ corenet_sendrecv_xen_server_packets(xend_t)
+ corenet_sendrecv_soundd_server_packets(xend_t)
++corenet_tcp_bind_generic_port(xend_t)
++corenet_rw_tun_tap_dev(xend_t)
+ 
+ dev_read_urand(xend_t)
+ dev_manage_xen(xend_t)
+@@ -138,19 +143,24 @@
+ 
+ domain_read_all_domains_state(xend_t)
+ domain_dontaudit_read_all_domains_state(xend_t)
++domain_dontaudit_ptrace_all_domains(xend_t)
+ 
+ files_read_etc_files(xend_t)
+ files_read_kernel_symbol_table(xend_t)
+ files_read_kernel_img(xend_t)
+ files_manage_etc_runtime_files(xend_t)
+ files_etc_filetrans_etc_runtime(xend_t,file)
++files_read_usr_files(xend_t)
+ 
+ storage_raw_read_fixed_disk(xend_t)
+ 
+-term_dontaudit_getattr_all_user_ptys(xend_t)
+-term_dontaudit_use_generic_ptys(xend_t)
++term_getattr_all_user_ptys(xend_t)
++term_use_generic_ptys(xend_t)
++term_use_ptmx(xend_t)
++term_getattr_ptys_fs(xend_t)
+ 
+ init_use_fds(xend_t)
++init_use_script_ptys(xend_t)
+ 
+ libs_use_ld_so(xend_t)
+ libs_use_shared_libs(xend_t)
+@@ -191,15 +201,18 @@
+ allow xenconsoled_t xenconsoled_var_run_t:dir rw_dir_perms;
+ files_pid_filetrans(xenconsoled_t,xenconsoled_var_run_t, { file sock_file })
+ 
++domain_dontaudit_ptrace_all_domains(xenconsoled_t)
++
+ kernel_read_kernel_sysctls(xenconsoled_t)
+ kernel_write_xen_state(xenconsoled_t)
+ kernel_read_xen_state(xenconsoled_t)
+ 
+ term_create_pty(xenconsoled_t,xen_devpts_t);
+-term_dontaudit_use_generic_ptys(xenconsoled_t)
++term_use_generic_ptys(xenconsoled_t)
+ term_use_console(xenconsoled_t)
+ 
+ init_use_fds(xenconsoled_t)
++init_use_script_ptys(xenconsoled_t)
+ 
+ libs_use_ld_so(xenconsoled_t)
+ libs_use_shared_libs(xenconsoled_t)
+@@ -238,10 +251,11 @@
+ dev_filetrans_xen(xenstored_t)
+ dev_rw_xen(xenstored_t)
+ 
+-term_dontaudit_use_generic_ptys(xenstored_t)
+-term_dontaudit_use_console(xenconsoled_t)
++term_use_generic_ptys(xenstored_t)
++term_use_console(xenconsoled_t)
+ 
+ init_use_fds(xenstored_t)
++init_use_script_ptys(xenstored_t)
+ 
+ libs_use_ld_so(xenstored_t)
+ libs_use_shared_libs(xenstored_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- selinux-policy.spec	22 Aug 2006 13:47:57 -0000	1.183
+++ selinux-policy.spec	28 Aug 2006 19:31:07 -0000	1.184
@@ -16,12 +16,11 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.7
-Release: 2.fc5
+Release: 3.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20060802.patch
-patch1: policy-20060822.patch
+patch: policy-20060822.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -164,7 +163,6 @@
 %prep 
 %setup -q -n serefpolicy-%{version}
 %patch -p1
-%patch1 -p1
 
 %install
 # Build targeted policy
@@ -349,6 +347,9 @@
 %endif
 
 %changelog
+* Mon Aug 28 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-3.fc5
+- Backport some fixes for FC5 from rawhide
+
 * Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-2.fc5
 - Bump for FC5
 - Patch changes from 2.3.8



From fedora-cvs-commits at redhat.com  Mon Aug 28 19:38:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 15:38:28 -0400
Subject: rpms/glibc/devel .cvsignore, 1.168, 1.169 glibc-fedora.patch, 1.176,
	1.177 glibc.spec, 1.261, 1.262 sources, 1.192, 1.193
Message-ID: <200608281938.k7SJcSnn010174@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10133/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4.90-26 on branch devel from glibc-2.4.90-26.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- .cvsignore	25 Aug 2006 07:14:59 -0000	1.168
+++ .cvsignore	28 Aug 2006 19:38:25 -0000	1.169
@@ -1,2 +1,2 @@
-glibc-20060825T0639.tar.bz2
-glibc-fedora-20060825T0639.tar.bz2
+glibc-20060828T1903.tar.bz2
+glibc-fedora-20060828T1903.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 57 files changed, 1394 insertions(+), 631 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- glibc-fedora.patch	25 Aug 2006 09:56:17 -0000	1.176
+++ glibc-fedora.patch	28 Aug 2006 19:38:25 -0000	1.177
@@ -1,5 +1,5 @@
---- glibc-20060825T0639/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060825T0639-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060828T1903/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060828T1903-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060825T0639/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060825T0639-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060828T1903/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060828T1903-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060825T0639/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060825T0639-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060828T1903/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060828T1903-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060825T0639/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060825T0639-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060828T1903/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060828T1903-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060825T0639/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060825T0639-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060828T1903/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060828T1903-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060825T0639/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060825T0639-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060828T1903/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060828T1903-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060825T0639/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060825T0639-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060828T1903/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060828T1903-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060825T0639/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060825T0639-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060828T1903/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060828T1903-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060825T0639/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060825T0639-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060828T1903/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060828T1903-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060825T0639/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060825T0639-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060828T1903/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060828T1903-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060825T0639/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060825T0639-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060828T1903/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060828T1903-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-20060825T0639/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060825T0639-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060828T1903/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060828T1903-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-20060825T0639/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060825T0639-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060828T1903/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060828T1903-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060825T0639/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060825T0639-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060828T1903/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060828T1903-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060825T0639/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060825T0639-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060828T1903/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060828T1903-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060825T0639/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060825T0639-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060828T1903/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060828T1903-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060825T0639/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060825T0639-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060828T1903/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060828T1903-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060825T0639/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060825T0639-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060828T1903/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060828T1903-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060825T0639/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
-+++ glibc-20060825T0639-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
+--- glibc-20060828T1903/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
++++ glibc-20060828T1903-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
 @@ -77,6 +77,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060825T0639/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060825T0639-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060828T1903/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060828T1903-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060825T0639/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
-+++ glibc-20060825T0639-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
+--- glibc-20060828T1903/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
++++ glibc-20060828T1903-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20060825T0639/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060825T0639-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060828T1903/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060828T1903-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -950,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060825T0639/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060825T0639-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060828T1903/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060828T1903-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -979,36 +979,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060825T0639/malloc/malloc.c	24 Aug 2006 17:29:36 -0000	1.164
-+++ glibc-20060825T0639-fedora/malloc/malloc.c	25 Aug 2006 06:54:11 -0000	1.127.2.28
-@@ -4069,9 +4069,10 @@ _int_malloc(mstate av, size_t bytes)
-   */
- 
-   for(;;) {
--
-+#if 0
-     int iters = 0;
-     bool any_larger = false;
-+#endif    
-     while ( (victim = unsorted_chunks(av)->bk) != unsorted_chunks(av)) {
-       bck = victim->bk;
-       if (__builtin_expect (victim->size <= 2 * SIZE_SZ, 0)
-@@ -4168,11 +4169,13 @@ _int_malloc(mstate av, size_t bytes)
-       fwd->bk = victim;
-       bck->fd = victim;
- 
-+#if 0
-       if (size >= nb)
- 	any_larger = true;
- #define MAX_ITERS	10000
-       if (++iters >= MAX_ITERS)
- 	break;
-+#endif
-     }
- 
-     /*
---- glibc-20060825T0639/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060825T0639-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060828T1903/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060828T1903-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>
@@ -1084,8 +1056,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060825T0639/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060825T0639-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060828T1903/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060828T1903-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)
@@ -1141,17 +1113,17 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060825T0639/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060825T0639-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060828T1903/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060828T1903-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060825T0639/nptl/ChangeLog	23 Aug 2006 17:47:19 -0000	1.912
-+++ glibc-20060825T0639-fedora/nptl/ChangeLog	25 Aug 2006 06:45:14 -0000	1.706.2.99
-@@ -1040,6 +1040,15 @@
+--- glibc-20060828T1903/nptl/ChangeLog	25 Aug 2006 13:29:19 -0000	1.913
++++ glibc-20060828T1903-fedora/nptl/ChangeLog	28 Aug 2006 19:19:33 -0000	1.706.2.100
+@@ -1045,6 +1045,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1167,7 +1139,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1776,6 +1785,11 @@
+@@ -1781,6 +1790,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1179,7 +1151,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3850,6 +3864,11 @@
+@@ -3855,6 +3869,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1191,8 +1163,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060825T0639/nptl/Makefile	21 Aug 2006 21:02:10 -0000	1.186
-+++ glibc-20060825T0639-fedora/nptl/Makefile	22 Aug 2006 09:05:40 -0000	1.157.2.26
+--- glibc-20060828T1903/nptl/Makefile	21 Aug 2006 21:02:10 -0000	1.186
++++ glibc-20060828T1903-fedora/nptl/Makefile	22 Aug 2006 09:05:40 -0000	1.157.2.26
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1215,8 +1187,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060825T0639/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060825T0639-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060828T1903/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060828T1903-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;
@@ -1241,8 +1213,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060828T1903-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>
 +
@@ -1250,8 +1222,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
-+++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
+--- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
++++ glibc-20060828T1903-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
 @@ -68,6 +68,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1587,8 +1559,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060828T1903-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.
@@ -1734,8 +1706,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060828T1903-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
@@ -1836,8 +1808,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060828T1903-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.
@@ -1979,8 +1951,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
-+++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
+--- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
++++ glibc-20060828T1903-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
 @@ -49,6 +49,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2368,8 +2340,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060825T0639/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060825T0639-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060828T1903-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
@@ -2464,8 +2436,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060825T0639/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060825T0639-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060828T1903/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060828T1903-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2488,8 +2460,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060825T0639/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060825T0639-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060828T1903/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060828T1903-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2508,8 +2480,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060825T0639/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060825T0639-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060828T1903/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060828T1903-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
@@ -2521,8 +2493,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060825T0639/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060825T0639-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060828T1903/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060828T1903-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
@@ -2563,8 +2535,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060825T0639/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
-+++ glibc-20060825T0639-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
+--- glibc-20060828T1903/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
++++ glibc-20060828T1903-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2598,8 +2570,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060825T0639/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060825T0639-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060828T1903/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060828T1903-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 =
@@ -2616,8 +2588,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060825T0639/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060825T0639-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060828T1903/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060828T1903-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
@@ -2633,8 +2605,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060825T0639/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060825T0639-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060828T1903/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060828T1903-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2648,8 +2620,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060825T0639/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060825T0639-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060828T1903/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060828T1903-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))
@@ -2661,8 +2633,8 @@
  endif
  endif
  
---- glibc-20060825T0639/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060825T0639-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060828T1903/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060828T1903-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.  */
@@ -3014,8 +2986,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060825T0639/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060825T0639-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060828T1903/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060828T1903-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.
@@ -3101,8 +3073,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060825T0639/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20060825T0639-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20060828T1903/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20060828T1903-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3117,8 +3089,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20060825T0639/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
-+++ glibc-20060825T0639-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+--- glibc-20060828T1903/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20060828T1903-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
 @@ -18,11 +18,14 @@
     02111-1307 USA.  */
  
@@ -3166,8 +3138,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060825T0639/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060825T0639-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060828T1903/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060828T1903-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;
@@ -3210,8 +3182,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060825T0639/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060825T0639-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060828T1903/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060828T1903-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"
@@ -3221,8 +3193,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060825T0639/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060825T0639-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060828T1903/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060828T1903-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;
@@ -3268,8 +3240,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060825T0639/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060825T0639-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060828T1903/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060828T1903-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.
@@ -3330,8 +3302,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060825T0639/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060825T0639-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060828T1903/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060828T1903-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)
@@ -3364,49 +3336,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060825T0639/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060825T0639-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060828T1903/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060828T1903-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-20060825T0639/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060825T0639-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060828T1903/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060828T1903-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-20060825T0639/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060825T0639-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060828T1903/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060828T1903-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- libc/locale/programs/ld-ctype.c	25 Aug 2006 00:38:54 -0000	1.109
-+++ libc/locale/programs/ld-ctype.c	12 Aug 2006 20:19:14 -0000	1.108
-@@ -2256,8 +2256,6 @@ ctype_read (struct linereader *ldfile, s
-   /* Prepare the data structures.  */
-   ctype_startup (ldfile, result, charmap, copy_locale, ignore_content);
-   ctype = result->categories[LC_CTYPE].ctype;
--  if (ctype == NULL)
--    return;
- 
-   /* Remember the repertoire we use.  */
-   if (!ignore_content)
---- libc/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c.jj	2006-08-25 11:01:24.000000000 +0200
-+++ libc/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c	2006-08-25 11:53:28.000000000 +0200
-@@ -58,9 +58,10 @@ __libc_pthread_init (ptr, reclaim, funct
- #endif
- }
- 
--
-+#ifdef SHARED
- libc_freeres_fn (freeres_libptread)
- {
-   if (__libc_pthread_functions.ptr_freeres != NULL)
-     __libc_pthread_functions.ptr_freeres ();
- }
-+#endif


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- glibc.spec	25 Aug 2006 09:12:11 -0000	1.261
+++ glibc.spec	28 Aug 2006 19:38:25 -0000	1.262
@@ -1,9 +1,9 @@
-%define glibcdate 20060825T0639
+%define glibcdate 20060828T1903
 %define glibcname glibc
-%define glibcsrcdir glibc-20060825T0639
+%define glibcsrcdir glibc-20060828T1903
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 25
+%define glibcrelease 26
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1453,6 +1453,12 @@
 %endif
 
 %changelog
+* Mon Aug 28 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-26
+- real fix for the doubly linked list corruption problem
+- try harder in realloc to allocate memory (BZ#2684)
+- fix getnameinfo error reporting (#204122)
+- make localedef more robust on invalid input (#203728)
+
 * Fri Aug 25 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-25
 - temporarily back out code to limit number of unsorted block
   sort iterations (#203735, #204027)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- sources	25 Aug 2006 07:14:59 -0000	1.192
+++ sources	28 Aug 2006 19:38:25 -0000	1.193
@@ -1,2 +1,2 @@
-769179b293d497b4e8e7adf703ff7e9b  glibc-20060825T0639.tar.bz2
-84f2fd751da598c7ab6712c923ce5093  glibc-fedora-20060825T0639.tar.bz2
+44f225e2f657adb9bac4d9b0f068c249  glibc-20060828T1903.tar.bz2
+8a2de30d50ada259078dc6c124b75b2e  glibc-fedora-20060828T1903.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 28 19:57:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 15:57:10 -0400
Subject: rpms/gcc/devel gcc41-pr26026.patch, NONE, 1.1 gcc41-pr28659.patch,
	NONE, 1.1 .cvsignore, 1.167, 1.168 gcc41.spec, 1.98,
	1.99 sources, 1.169, 1.170 gcc41-pr21581.patch, 1.1,
	NONE gcc41-pr21764.patch, 1.1, NONE gcc41-pr28370.patch, 1.1,
	NONE gcc41-pr28407.patch, 1.1, NONE gcc41-visibility.patch,
	1.1, NONE
Message-ID: <200608281957.k7SJvAVl031341@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31309

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-pr26026.patch gcc41-pr28659.patch 
Removed Files:
	gcc41-pr21581.patch gcc41-pr21764.patch gcc41-pr28370.patch 
	gcc41-pr28407.patch gcc41-visibility.patch 
Log Message:
4.1.1-20

gcc41-pr26026.patch:
 0 files changed

--- NEW FILE gcc41-pr26026.patch ---
2006-04-19  Alan Modra  <amodra at bigpond.net.au>

	PR rtl-optimization/26026
	* fold-const.c (fold_binary): Optimize div and mod where the divisor
	is a known power of two shifted left a variable amount.

--- gcc/fold-const.c	(revision 113059)
+++ gcc/fold-const.c	(revision 113060)
@@ -9600,8 +9600,27 @@ fold_binary (enum tree_code code, tree t
       return NULL_TREE;
 
     case TRUNC_DIV_EXPR:
-    case ROUND_DIV_EXPR:
     case FLOOR_DIV_EXPR:
+      /* Simplify A / (B << N) where A and B are positive and B is
+	 a power of 2, to A >> (N + log2(B)).  */
+      if (TREE_CODE (arg1) == LSHIFT_EXPR
+	  && (TYPE_UNSIGNED (type) || tree_expr_nonnegative_p (arg0)))
+	{
+	  tree sval = TREE_OPERAND (arg1, 0);
+	  if (integer_pow2p (sval) && tree_int_cst_sgn (sval) > 0)
+	    {
+	      tree sh_cnt = TREE_OPERAND (arg1, 1);
+	      unsigned long pow2 = exact_log2 (TREE_INT_CST_LOW (sval));
+
+	      sh_cnt = fold_build2 (PLUS_EXPR, TREE_TYPE (sh_cnt),
+				    sh_cnt, build_int_cst (NULL_TREE, pow2));
+	      return fold_build2 (RSHIFT_EXPR, type,
+				  fold_convert (type, arg0), sh_cnt);
+	    }
+	}
+      /* Fall thru */
+
+    case ROUND_DIV_EXPR:
     case CEIL_DIV_EXPR:
     case EXACT_DIV_EXPR:
       if (integer_onep (arg1))
@@ -9671,31 +9690,24 @@ fold_binary (enum tree_code code, tree t
 	return omit_one_operand (type, integer_zero_node, arg0);
 
       /* Optimize TRUNC_MOD_EXPR by a power of two into a BIT_AND_EXPR,
-         i.e. "X % C" into "X & C2", if X and C are positive.  */
+         i.e. "X % C" into "X & (C - 1)", if X and C are positive.  */
       if ((code == TRUNC_MOD_EXPR || code == FLOOR_MOD_EXPR)
-	  && (TYPE_UNSIGNED (type) || tree_expr_nonnegative_p (arg0))
-	  && integer_pow2p (arg1) && tree_int_cst_sgn (arg1) >= 0)
+	  && (TYPE_UNSIGNED (type) || tree_expr_nonnegative_p (arg0)))
 	{
-	  unsigned HOST_WIDE_INT high, low;
-	  tree mask;
-	  int l;
+	  tree c = arg1;
+	  /* Also optimize A % (C << N)  where C is a power of 2,
+	     to A & ((C << N) - 1).  */
+	  if (TREE_CODE (arg1) == LSHIFT_EXPR)
+	    c = TREE_OPERAND (arg1, 0);
 
-	  l = tree_log2 (arg1);
-	  if (l >= HOST_BITS_PER_WIDE_INT)
-	    {
-	      high = ((unsigned HOST_WIDE_INT) 1
-		      << (l - HOST_BITS_PER_WIDE_INT)) - 1;
-	      low = -1;
-	    }
-	  else
+	  if (integer_pow2p (c) && tree_int_cst_sgn (c) > 0)
 	    {
-	      high = 0;
-	      low = ((unsigned HOST_WIDE_INT) 1 << l) - 1;
+	      tree mask = fold_build2 (MINUS_EXPR, TREE_TYPE (arg1),
+				       arg1, integer_one_node);
+	      return fold_build2 (BIT_AND_EXPR, type,
+				  fold_convert (type, arg0),
+				  fold_convert (type, mask));
 	    }
-
-	  mask = build_int_cst_wide (type, low, high);
-	  return fold_build2 (BIT_AND_EXPR, type,
-			      fold_convert (type, arg0), mask);
 	}
 
       /* X % -C is the same as X % C.  */

gcc41-pr28659.patch:
 0 files changed

--- NEW FILE gcc41-pr28659.patch ---
2006-08-22  Jason Merrill  <jason at redhat.com>

	PR c++/28659
	* typeck.c (merge_types): If either of the types have the right 
	attributes, return that one.

	* tree.c (cp_build_type_attribute_variant): Make sure we aren't
	doing this to class types.
	* typeck.c (original_type): Deal with type quals properly.

--- gcc/cp/typeck.c	(revision 116328)
+++ gcc/cp/typeck.c	(revision 116329)
@@ -228,6 +228,7 @@ commonparms (tree p1, tree p2)
 static tree
 original_type (tree t)
 {
+  int quals = cp_type_quals (t);
   while (t != error_mark_node
 	 && TYPE_NAME (t) != NULL_TREE)
     {
@@ -239,7 +240,7 @@ original_type (tree t)
 	break;
       t = x;
     }
-  return t;
+  return cp_build_qualified_type (t, quals);
 }
 
 /* T1 and T2 are arithmetic or enumeration types.  Return the type
@@ -730,7 +731,13 @@ merge_types (tree t1, tree t2)
 
     default:;
     }
-  return cp_build_type_attribute_variant (t1, attributes);
+
+  if (attribute_list_equal (TYPE_ATTRIBUTES (t1), attributes))
+    return t1;
+  else if (attribute_list_equal (TYPE_ATTRIBUTES (t2), attributes))
+    return t2;
+  else
+    return cp_build_type_attribute_variant (t1, attributes);
 }
 
 /* Return the common type of two types.
--- gcc/cp/tree.c	(revision 116328)
+++ gcc/cp/tree.c	(revision 116329)
@@ -1936,6 +1936,10 @@ cp_build_type_attribute_variant (tree ty
 	  != TYPE_RAISES_EXCEPTIONS (type)))
     new_type = build_exception_variant (new_type,
 					TYPE_RAISES_EXCEPTIONS (type));
+
+  /* Making a new main variant of a class type is broken.  */
+  gcc_assert (!CLASS_TYPE_P (type) || new_type == type);
+    
   return new_type;
 }
 
--- gcc/testsuite/g++.dg/ext/attrib26.C	(revision 0)
+++ gcc/testsuite/g++.dg/ext/attrib26.C	(revision 116329)
@@ -0,0 +1,14 @@
+// PR c++/28659
+// The attribute was causing us to get confused in merge_types when
+// combining the template type with an uninstantiated version.
+
+template<class T>
+struct __attribute__((aligned(1))) A
+{
+  A& operator=(const A &t);
+};
+
+template<class T>
+A<T>& A<T>::operator=(const A<T> &t)
+{
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- .cvsignore	25 Aug 2006 14:29:29 -0000	1.167
+++ .cvsignore	28 Aug 2006 19:57:07 -0000	1.168
@@ -1 +1 @@
-gcc-4.1.1-20060825.tar.bz2
+gcc-4.1.1-20060828.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gcc41.spec	25 Aug 2006 18:46:56 -0000	1.98
+++ gcc41.spec	28 Aug 2006 19:57:07 -0000	1.99
@@ -1,6 +1,6 @@
-%define DATE 20060825
+%define DATE 20060828
 %define gcc_version 4.1.1
-%define gcc_release 19
+%define gcc_release 20
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -118,34 +118,31 @@
 Patch11: gcc41-mni.patch
 Patch12: gcc41-dsohandle.patch
 Patch13: gcc41-rh184446.patch
-Patch14: gcc41-pr21764.patch
-Patch15: gcc41-pr21581.patch
-Patch16: gcc41-pr20297-test.patch
-Patch17: gcc41-pr28683.patch
-Patch18: gcc41-objc-rh185398.patch
-Patch19: gcc41-tests.patch
-Patch20: gcc41-ppc64-ldouble-stdarg.patch
-Patch21: gcc41-pr25874.patch
-Patch22: gcc41-pr26881.patch
-Patch23: gcc41-i386-tune-geode.patch
-Patch24: gcc41-pr26885.patch
-Patch25: gcc41-hash-style-gnu.patch
-Patch26: gcc41-visibility.patch
-Patch27: gcc41-pr28370.patch
-Patch28: gcc41-pr28407.patch
-Patch29: gcc41-power6.patch
-Patch30: gcc41-power6-2.patch
-Patch31: gcc41-java-libdotdotlib.patch
-Patch32: gcc41-pr28600.patch
-Patch33: gcc41-rh200887.patch
-Patch34: gcc41-pr25795.patch
-Patch35: gcc41-pr28706.patch
-Patch36: gcc41-pr28725.patch
-Patch37: gcc41-pr28709.patch
-Patch38: gcc41-pr28744.patch
-Patch39: gcc41-x86_64-kernel-ssp.patch
-Patch40: gcc41-pr28755.patch
-Patch41: gcc41-pr27898.patch
+Patch14: gcc41-pr20297-test.patch
+Patch15: gcc41-pr28683.patch
+Patch16: gcc41-objc-rh185398.patch
+Patch17: gcc41-tests.patch
+Patch18: gcc41-ppc64-ldouble-stdarg.patch
+Patch19: gcc41-pr25874.patch
+Patch20: gcc41-pr26881.patch
+Patch21: gcc41-i386-tune-geode.patch
+Patch22: gcc41-pr26885.patch
+Patch23: gcc41-hash-style-gnu.patch
+Patch24: gcc41-power6.patch
+Patch25: gcc41-power6-2.patch
+Patch26: gcc41-java-libdotdotlib.patch
+Patch27: gcc41-pr28600.patch
+Patch28: gcc41-rh200887.patch
+Patch29: gcc41-pr25795.patch
+Patch30: gcc41-pr28706.patch
+Patch31: gcc41-pr28725.patch
+Patch32: gcc41-pr28709.patch
+Patch33: gcc41-pr28744.patch
+Patch34: gcc41-x86_64-kernel-ssp.patch
+Patch35: gcc41-pr28755.patch
+Patch36: gcc41-pr27898.patch
+Patch37: gcc41-pr26026.patch
+Patch38: gcc41-pr28659.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -440,34 +437,31 @@
 %patch11 -p0 -b .mni~
 %patch12 -p0 -b .dsohandle~
 %patch13 -p0 -b .rh184446~
-%patch14 -p0 -b .pr21764~
-#%patch15 -p0 -b .pr21581~
-%patch16 -p0 -E -b .pr20297-test~
-%patch17 -p0 -b .pr28683~
-%patch18 -p0 -b .objc-rh185398~
-%patch19 -p0 -b .tests~
-%patch20 -p0 -b .ppc64-ldouble-stdarg~
-%patch21 -p0 -b .pr25874~
-%patch22 -p0 -b .pr26881~
-%patch23 -p0 -b .i386-tune-geode~
-%patch24 -p0 -b .pr26885~
-%patch25 -p0 -b .hash-style-gnu~
-%patch26 -p0 -b .visibility~
-%patch27 -p0 -b .pr28370~
-%patch28 -p0 -b .pr28407~
-%patch29 -p0 -b .power6~
-%patch30 -p0 -b .power6-2~
-%patch31 -p0 -b .java-libdotdotlib~
-%patch32 -p0 -b .pr28600~
-%patch33 -p0 -b .rh200887~
-%patch34 -p0 -b .pr25795~
-%patch35 -p0 -b .pr28706~
-%patch36 -p0 -b .pr28725~
-%patch37 -p0 -b .pr28709~
-%patch38 -p0 -b .pr28744~
-%patch39 -p0 -b .x86_64-kernel-ssp~
-%patch40 -p0 -b .pr28755~
-%patch41 -p0 -b .pr27898~
+%patch14 -p0 -b .pr20297-test~
+%patch15 -p0 -b .pr28683~
+%patch16 -p0 -b .objc-rh185398~
+%patch17 -p0 -b .tests~
+%patch18 -p0 -b .ppc64-ldouble-stdarg~
+%patch19 -p0 -b .pr25874~
+%patch20 -p0 -b .pr26881~
+%patch21 -p0 -b .i386-tune-geode~
+%patch22 -p0 -b .pr26885~
+%patch23 -p0 -b .hash-style-gnu~
+%patch24 -p0 -b .power6~
+%patch25 -p0 -b .power6-2~
+%patch26 -p0 -b .java-libdotdotlib~
+%patch27 -p0 -b .pr28600~
+%patch28 -p0 -b .rh200887~
+%patch29 -p0 -b .pr25795~
+%patch30 -p0 -b .pr28706~
+%patch31 -p0 -b .pr28725~
+%patch32 -p0 -b .pr28709~
+%patch33 -p0 -b .pr28744~
+%patch34 -p0 -b .x86_64-kernel-ssp~
+%patch35 -p0 -b .pr28755~
+%patch36 -p0 -b .pr27898~
+%patch37 -p0 -b .pr26026~
+%patch38 -p0 -b .pr28659~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1527,6 +1521,16 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Aug 25 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-20
+- update from gcc-4_1-branch (-r116389:116498)
+  - PRs c++/28056, c++/28058, c++/28595, c++/28853, c/27558,
+	c/27893, c/28299, c/28418, driver/27622, libfortran/28452,
+	libfortran/28542, target/27075
+- optimize A / (B << N) where A and B is positive and B is a power of two
+  (Alan Modra, #195924, PR rtl-optimization/26026)
+- fix attribute handling in C++ (Jason Merrill, #204277, #204035,
+  PRs c++/28659, c++/28863)
+
 * Fri Aug 25 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-19
 - update from gcc-4_1-branch (-r116223:116389)
   - PRs c++/23372, c++/27714, c++/28346, c++/28385, fortran/18111,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- sources	25 Aug 2006 14:29:29 -0000	1.169
+++ sources	28 Aug 2006 19:57:07 -0000	1.170
@@ -1 +1 @@
-f269c8fb24478179193fe3421da65c62  gcc-4.1.1-20060825.tar.bz2
+4c896430e49a06d34569c9bfa531f013  gcc-4.1.1-20060828.tar.bz2


--- gcc41-pr21581.patch DELETED ---


--- gcc41-pr21764.patch DELETED ---


--- gcc41-pr28370.patch DELETED ---


--- gcc41-pr28407.patch DELETED ---


--- gcc41-visibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 28 20:01:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 16:01:41 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.129, 1.130 kudzu.spec, 1.147,
	1.148 sources, 1.146, 1.147
Message-ID: <200608282001.k7SK1f3W032734@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32700

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- .cvsignore	28 Aug 2006 18:41:58 -0000	1.129
+++ .cvsignore	28 Aug 2006 20:01:28 -0000	1.130
@@ -1 +1 @@
-kudzu-1.2.49.tar.gz
+kudzu-1.2.50.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- kudzu.spec	28 Aug 2006 18:41:59 -0000	1.147
+++ kudzu.spec	28 Aug 2006 20:01:28 -0000	1.148
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.49
+Version: 1.2.50
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -74,8 +74,9 @@
 %{_includedir}/kudzu
 
 %changelog
-* Mon Aug 28 2006 Bill Nottingham <notting at redhat.com> - 1.2.49-1
+* Mon Aug 28 2006 Bill Nottingham <notting at redhat.com> - 1.2.50-1
 - fix xenfb probe some more
+- clean up some debugging cruft
 
 * Sun Aug 27 2006 Bill Nottingham <notting at redhat.com> - 1.2.48-1
 - remove socket code, no longer used (and a bad hack to begin with)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- sources	28 Aug 2006 18:41:59 -0000	1.146
+++ sources	28 Aug 2006 20:01:28 -0000	1.147
@@ -1 +1 @@
-8cbbccc70c3379ca14286e93ff6e5f67  kudzu-1.2.49.tar.gz
+e2e8b1ad3b1cc8312bd802e7909f769a  kudzu-1.2.50.tar.gz



From fedora-cvs-commits at redhat.com  Mon Aug 28 20:39:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 16:39:06 -0400
Subject: rpms/python-pyblock/devel .cvsignore, 1.18, 1.19 python-pyblock.spec,
	1.29, 1.30 sources, 1.22, 1.23
Message-ID: <200608282039.k7SKd6Io029135@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/python-pyblock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29097

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
- update to 0.20-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	23 Aug 2006 15:15:15 -0000	1.18
+++ .cvsignore	28 Aug 2006 20:39:04 -0000	1.19
@@ -1 +1 @@
-pyblock-0.19.tar.bz2
+pyblock-0.20.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- python-pyblock.spec	23 Aug 2006 15:15:15 -0000	1.29
+++ python-pyblock.spec	28 Aug 2006 20:39:04 -0000	1.30
@@ -5,7 +5,7 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.19
+Version: 0.20
 Release: 1
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
@@ -39,6 +39,9 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Mon Aug 28 2006 Peter Jones <pjones at redhat.com> - 0.20-1
+- Fix error with map naming and deletion
+
 * Wed Aug 23 2006 Peter Jones <pjones at redhat.com> - 0.19-1
 - Make RaidSet deactivation work like MultiPath deactivation.  Fixes a
   traceback when removing partition maps.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 Aug 2006 15:15:15 -0000	1.22
+++ sources	28 Aug 2006 20:39:04 -0000	1.23
@@ -1 +1 @@
-609788dc09e8967dff044597b9d7d769  pyblock-0.19.tar.bz2
+82adc3c4f8c8d0165a9b70036808a02a  pyblock-0.20.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Aug 28 20:42:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 16:42:30 -0400
Subject: rpms/libofx/devel .cvsignore, 1.4, 1.5 libofx.spec, 1.18,
	1.19 sources, 1.4, 1.5 libofx-0.6.6-gcc34.patch, 1.1,
	NONE libofx-0.7.0-gcc4.patch, 1.1, NONE
Message-ID: <200608282042.k7SKgUvB007393@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libofx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7343

Modified Files:
	.cvsignore libofx.spec sources 
Removed Files:
	libofx-0.6.6-gcc34.patch libofx-0.7.0-gcc4.patch 
Log Message:
update to 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libofx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2005 07:33:19 -0000	1.4
+++ .cvsignore	28 Aug 2006 20:42:27 -0000	1.5
@@ -1 +1 @@
-libofx-0.8.0.tar.gz
+libofx-0.8.2.tar.gz


Index: libofx.spec
===================================================================
RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libofx.spec	12 Jul 2006 06:54:53 -0000	1.18
+++ libofx.spec	28 Aug 2006 20:42:27 -0000	1.19
@@ -1,9 +1,8 @@
 Summary: A library for supporting Open Financial Exchange (OFX)
 Name: libofx
-Version: 0.8.0
-Release: 3.1
+Version: 0.8.2
+Release: 1
 Source: http://download.sourceforge.net/libofx/%{name}-%{version}.tar.gz
-Patch: libofx-0.7.0-gcc4.patch
 Requires: openjade >= 1.3.1
 Group:	System Environment/Libraries
 License: GPL
@@ -22,6 +21,7 @@
 Summary: Development files needed for accessing OFX data.
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 The libofx-devel contains the header files and libraries necessary
@@ -29,7 +29,6 @@
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 %configure --with-opensp-libs=%{_libdir}
@@ -60,9 +59,13 @@
 %defattr(-,root,root)
 %doc doc/html doc/ofx_sample_files
 %{_includedir}/*
+%{_libdir}/pkgconfig/*
 %{_libdir}/*.so
 
 %changelog
+* Mon Aug 28 2006 Bill Nottingham <notting at redhat.com> - 0.8.2-1
+- update to 0.8.2
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.0-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libofx/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2005 07:33:19 -0000	1.4
+++ sources	28 Aug 2006 20:42:27 -0000	1.5
@@ -1 +1 @@
-8001c22445c1bdd6bebf1df3663db203  libofx-0.8.0.tar.gz
+b860894c1e3da7f58ce5d92e064d0e85  libofx-0.8.2.tar.gz


--- libofx-0.6.6-gcc34.patch DELETED ---


--- libofx-0.7.0-gcc4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 28 20:51:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 16:51:52 -0400
Subject: rpms/openldap/devel .cvsignore, 1.24, 1.25 openldap.spec, 1.57,
	1.58 sources, 1.25, 1.26
Message-ID: <200608282051.k7SKpqq9024302@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24254

Modified Files:
	.cvsignore openldap.spec sources 
Log Message:
2.3.27



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	7 Jun 2006 17:17:21 -0000	1.24
+++ .cvsignore	28 Aug 2006 20:51:47 -0000	1.25
@@ -5,3 +5,4 @@
 autoconf-2.13.1.tar.gz
 automake-1.4a.tar.gz
 openldap-2.3.24.tgz
+openldap-2.3.27.tgz


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- openldap.spec	12 Jul 2006 07:34:47 -0000	1.57
+++ openldap.spec	28 Aug 2006 20:51:47 -0000	1.58
@@ -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.24
+%define version_23 2.3.27
 %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: 2.1
+Release: 2
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -39,6 +39,7 @@
 Patch5: openldap-2.3.11-toollinks.patch
 Patch6: openldap-2.3.11-nosql.patch
 #Patch7: openldap-2.3.19-nostrip.patch
+Patch8: openldap-2.3.19-gethostbyXXXX_r.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -172,6 +173,7 @@
 %patch5 -p1 -b .toollinks
 %patch6 -p1 -b .nosql
 #%patch7 -p1 -b .nostrip
+%patch8 -p1 -b .gethostbyname_r
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd
 
@@ -689,6 +691,11 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Fri Aug 25 2006 Jay Fenlason <fenlason at redhat.com> 2.3.27-2
+- New upstream release
+- Include the gethostbyname_r patch so that nss_ldap won't hang
+  on recursive attemts to ldap_initialize.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.24-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	7 Jun 2006 17:17:21 -0000	1.25
+++ sources	28 Aug 2006 20:51:47 -0000	1.26
@@ -3,4 +3,4 @@
 6c4c72a1336aa45b463e738034c078d6  openldap-2.2.29.tgz
 dc80548f76d6aeba2b51b15751e08b21  MigrationTools-46.tar.gz
 33851f01b455cca48aa601956de93c6f  db-4.4.20.tar.gz
-3e58de30abc959ec88730123cecdb6d1  openldap-2.3.24.tgz
+0fbae4e9279aaa586adcd9f19b66a5ed  openldap-2.3.27.tgz



From fedora-cvs-commits at redhat.com  Mon Aug 28 20:59:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 16:59:46 -0400
Subject: rpms/aqbanking/devel aqbanking.spec,1.20,1.21
Message-ID: <200608282059.k7SKxjOP026715@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26648

Modified Files:
	aqbanking.spec 
Log Message:
rebuild against latest libofx



Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- aqbanking.spec	1 Aug 2006 18:55:14 -0000	1.20
+++ aqbanking.spec	28 Aug 2006 20:59:42 -0000	1.21
@@ -1,7 +1,7 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export.
 Version: 2.1.0
-Release: 3
+Release: 4
 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 License: GPL
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Mon Aug 28 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-4
+- rebuild against latest libofx
+
 * Tue Aug  1 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-3
 - reenable visibility
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 21:03:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 17:03:50 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-setup-tool.patch, 1.1,
	1.2 pam_pkcs11.spec, 1.13, 1.14
Message-ID: <200608282103.k7SL3o5s027718@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27639

Modified Files:
	pam_pkcs11-0.5.3-setup-tool.patch pam_pkcs11.spec 
Log Message:
* Mon Aug 28 2006 Tomas Mraz <tmraz at redhat.com>
- pkcs11_setup should respect $LIB in module paths (#204252)


pam_pkcs11-0.5.3-setup-tool.patch:
 Makefile.am    |    7 
 Makefile.in    |   21 +-
 pkcs11_setup.c |  519 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 540 insertions(+), 7 deletions(-)

Index: pam_pkcs11-0.5.3-setup-tool.patch
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11-0.5.3-setup-tool.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam_pkcs11-0.5.3-setup-tool.patch	18 Jul 2006 20:45:28 -0000	1.1
+++ pam_pkcs11-0.5.3-setup-tool.patch	28 Aug 2006 21:03:47 -0000	1.2
@@ -107,7 +107,7 @@
  .c.o:
 --- /dev/null	2006-07-07 08:05:54.592713000 +0200
 +++ pam_pkcs11-0.5.3/src/tools/pkcs11_setup.c	2006-07-07 13:54:45.000000000 +0200
-@@ -0,0 +1,516 @@
+@@ -0,0 +1,519 @@
 +/*
 + * PKCS#11 Card viewer tool
 + * Copyright (C) 2006 Red Hat, Inc.
@@ -136,6 +136,7 @@
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <stdlib.h>
++#include <dlfcn.h>
 +#include "../scconf/scconf.h"
 +#include "../common/debug.h"
 +#include "../common/error.h"
@@ -228,6 +229,7 @@
 +
 +    /* list only those smart cards which are actually installed */
 +    for (i=0; pkcs11_blocks[i]; i++) {
++    	void *libhandle;
 +    	const char *path = 
 +    		scconf_get_str(pkcs11_blocks[i], "module", NULL);
 +    	/* check to see if the module exists on the system */
@@ -235,7 +237,8 @@
 +    		continue;
 +    	}
 +    	/* verify the module exists */
-+        if (access(path, X_OK) == 0) {
++        if ((libhandle=dlopen(path, 0)) != NULL) {
++    	    dlclose(libhandle);
 +    	    if (pkcs11_blocks[i] && pkcs11_blocks[i]->name
 +    	        && pkcs11_blocks[i]->name->data) {
 +    		    printf("%s\n", pkcs11_blocks[i]->name->data);


Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pam_pkcs11.spec	26 Aug 2006 00:19:06 -0000	1.13
+++ pam_pkcs11.spec	28 Aug 2006 21:03:47 -0000	1.14
@@ -151,6 +151,9 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Mon Aug 28 2006 Tomas Mraz <tmraz at redhat.com>
+- pkcs11_setup should respect $LIB in module paths (#204252)
+
 * Mon Aug 28 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-13
 - Fix the default mapping order.
 - Make ocsp support controlled by a config entry.



From fedora-cvs-commits at redhat.com  Mon Aug 28 21:13:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 17:13:32 -0400
Subject: rpms/xorg-x11-drv-i810/devel intel-945gm-lfp-blacklist.patch, 1.2,
	1.3 xorg-x11-drv-i810.spec, 1.38, 1.39
Message-ID: <200608282113.k7SLDWto029711@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29678

Modified Files:
	intel-945gm-lfp-blacklist.patch xorg-x11-drv-i810.spec 
Log Message:
* Mon Aug 28 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-5.fc6
- intel-945gm-lfp-blacklist.patch: Tweak the Apple blacklist to (hopefully)
  correctly distinguish between Mac Mini and Macbook Pro.


intel-945gm-lfp-blacklist.patch:
 i830_driver.c |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

Index: intel-945gm-lfp-blacklist.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/intel-945gm-lfp-blacklist.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- intel-945gm-lfp-blacklist.patch	9 Aug 2006 23:10:50 -0000	1.2
+++ intel-945gm-lfp-blacklist.patch	28 Aug 2006 21:13:29 -0000	1.3
@@ -1,6 +1,15 @@
---- xf86-video-intel/src/i830_driver.c.lfp-blacklist	2006-08-08 11:14:35.000000000 -0400
-+++ xf86-video-intel/src/i830_driver.c	2006-08-09 19:03:41.000000000 -0400
-@@ -1672,16 +1672,16 @@
+--- xorg-x11-drv-i810-1.6.5/xf86-video-intel/src/i830_driver.c.lfp-blacklist	2006-08-08 11:14:35.000000000 -0400
++++ xorg-x11-drv-i810-1.6.5/xf86-video-intel/src/i830_driver.c	2006-08-28 17:05:11.000000000 -0400
+@@ -1231,7 +1231,7 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
+    int i, n;
+    char *s;
+    pointer pVBEModule = NULL;
+-   Bool enable, has_lvds;
++   Bool enable, has_lvds, is_apple_945gm = FALSE;
+    const char *chipname;
+    unsigned int ver;
+    char v[5];
+@@ -1672,16 +1672,15 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
     if (!i830GetLVDSInfoFromBIOS(pScrn))
        has_lvds = FALSE;
  
@@ -12,17 +21,38 @@
 -    */
 -   if (INREG(PP_STATUS) == 0 && INREG(PP_CONTROL) == 0 &&
 -       INREG(LVDSPP_ON) == 0 && INREG(LVDSPP_OFF) == 0)
-+   /* Blacklist machines with known broken BIOSes */
-+   if ((pI830->PciInfo->chipType == PCI_CHIP_I945_GM) &&
-+	   /* aopen mini-pc */
-+	(((pI830->PciInfo->subsysVendor == 0xa0a0) &&
-+	  (pI830->PciInfo->subsysCard == 0x0589)) ||
-+	   /* mac mini */
-+	 ((pI830->PciInfo->subsysVendor == 0x8086) &&
-+	  (pI830->PciInfo->subsysCard == 0x7270))))
-    {
+-   {
 -      has_lvds = FALSE;
-+       has_lvds = FALSE;
++   /* Blacklist machines with known broken BIOSes */
++   if (pI830->PciInfo->chipType == PCI_CHIP_I945_GM) {
++	if ((pI830->PciInfo->subsysVendor == 0xa0a0) &&
++	    (pI830->PciInfo->subsysCard == 0x0589))  /* aopen mini pc */
++	    has_lvds = FALSE;
++
++	if ((pI830->PciInfo->subsysVendor == 0x8086) &&
++	    (pI830->PciInfo->subsysCard == 0x7270)) /* mini, macbook pro... */
++	    is_apple_945gm = TRUE;
     }
  
     if ((s = xf86GetOptValString(pI830->Options, OPTION_MONITOR_LAYOUT)) &&
+@@ -1772,6 +1771,20 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
+       pI830->specifiedMonitor = TRUE;
+    } else if (I830IsPrimary(pScrn)) {
+       /* Choose a default set of outputs to use based on what we've detected. */
++
++      /*
++       * Apple hardware is out to get us.  The macbook pro has a real LVDS
++       * panel, but the mac mini does not, and they have the same device IDs.
++       * We'll distinguish by panel size, on the assumption that Apple isn't
++       * about to make any machines with an 800x600 display.
++       */
++      if (is_apple_945gm && pI830->PanelXRes == 800 && pI830->PanelYRes == 600)
++      {
++	  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++		     "Suspected Mac Mini, ignoring the LFP\n");
++	  has_lvds = FALSE;
++      }
++
+       if (has_lvds) {
+ 	 pI830->MonType2 |= PIPE_LFP;
+       }


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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xorg-x11-drv-i810.spec	21 Aug 2006 13:56:02 -0000	1.38
+++ xorg-x11-drv-i810.spec	28 Aug 2006 21:13:29 -0000	1.39
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   1.6.5
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -56,7 +56,7 @@
 %setup -q -c %{tarball}-%{version} -a0 -a1
 %patch0 -p0 -b .edid-pixclock
 %patch1 -p0 -b .driver-rename
-%patch2 -p0 -b .lfp-blacklist
+%patch2 -p1 -b .lfp-blacklist
 
 %build
 %if %{with_dri}
@@ -109,6 +109,10 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Mon Aug 28 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-5.fc6
+- intel-945gm-lfp-blacklist.patch: Tweak the Apple blacklist to (hopefully)
+  correctly distinguish between Mac Mini and Macbook Pro.
+
 * Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-4.fc6
 - i810.xinf: PCI IDs for i965.
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 21:40:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 17:40:49 -0400
Subject: rpms/gnucash/devel gnucash.spec,1.56,1.57
Message-ID: <200608282140.k7SLen4s019009@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18912

Modified Files:
	gnucash.spec 
Log Message:
bump


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnucash.spec	26 Aug 2006 13:42:59 -0000	1.56
+++ gnucash.spec	28 Aug 2006 21:40:26 -0000	1.57
@@ -7,9 +7,9 @@
 Summary: GnuCash is an application to keep track of your finances.
 Version: 2.0.1
 %if %{buildsvn}
-Release: 5%{?dist}.%{svnrev}svn.1
+Release: 6%{?dist}.%{svnrev}svn.1
 %else
-Release: 5%{?dist}
+Release: 6%{?dist}
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -151,6 +151,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Mon Aug 28 2006 Bill Nottingham <notting at redhat.com> - 2.0.1-6
+- rebuild against new libofx
+
 * Sat Aug 26 2006 Karsten Hopp <karsten at redhat.com> - 2.0.1-5
 - buildrequire intltool which was previously pulled in by scrollkeeper but
   dropped this requirement because of bz #203606



From fedora-cvs-commits at redhat.com  Mon Aug 28 21:49:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 17:49:10 -0400
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.32,
	1.33 policy-20060802.patch, 1.21, 1.22 selinux-policy.spec,
	1.260, 1.261
Message-ID: <200608282149.k7SLnA9p031628@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31276

Modified Files:
	modules-targeted.conf policy-20060802.patch 
	selinux-policy.spec 
Log Message:
* Mon Aug 28 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-6
- Fix install problems



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- modules-targeted.conf	11 Aug 2006 03:11:59 -0000	1.32
+++ modules-targeted.conf	28 Aug 2006 21:49:05 -0000	1.33
@@ -1122,3 +1122,25 @@
 # Policy for Mozilla and related web browsers
 # 
 mozilla = module
+
+# Layer: services
+# Module: ricci
+#
+# policy for ricci
+# 
+ricci = module
+
+# Layer: services
+# Module: oddjob
+#
+# policy for oddjob
+# 
+oddjob = module
+
+# Layer: services
+# Module: ccs
+#
+# policy for ccs
+# 
+ccs = module
+

policy-20060802.patch:
 policy/modules/admin/amanda.fc                            |   51 -
 policy/modules/admin/anaconda.te                          |   20 
 policy/modules/admin/bootloader.te                        |    4 
 policy/modules/admin/consoletype.te                       |   11 
 policy/modules/admin/firstboot.te                         |    2 
 policy/modules/admin/prelink.te                           |    2 
 policy/modules/admin/rpm.fc                               |    2 
 policy/modules/admin/rpm.if                               |   13 
 policy/modules/admin/usermanage.te                        |    5 
 policy/modules/apps/java.fc                               |    9 
 policy/modules/apps/mozilla.if                            |    2 
 policy/modules/apps/wine.te                               |    2 
 policy/modules/kernel/corecommands.fc                     |    1 
 policy/modules/kernel/corecommands.if                     |    1 
 policy/modules/kernel/corenetwork.te.in                   |    7 
 policy/modules/kernel/devices.fc                          |    4 
 policy/modules/kernel/devices.if                          |   36 +
 policy/modules/kernel/devices.te                          |    8 
 policy/modules/kernel/files.if                            |   18 
 policy/modules/kernel/filesystem.te                       |    2 
 policy/modules/kernel/kernel.if                           |   75 ++
 policy/modules/kernel/terminal.fc                         |    2 
 policy/modules/kernel/terminal.if                         |   19 
 policy/modules/services/amavis.te                         |    7 
 policy/modules/services/apache.te                         |    2 
 policy/modules/services/avahi.te                          |    2 
 policy/modules/services/bind.te                           |    1 
 policy/modules/services/ccs.fc                            |    8 
 policy/modules/services/ccs.if                            |   45 +
 policy/modules/services/ccs.te                            |   84 +++
 policy/modules/services/cpucontrol.te                     |    2 
 policy/modules/services/cron.if                           |   17 
 policy/modules/services/cron.te                           |    7 
 policy/modules/services/cups.te                           |   19 
 policy/modules/services/cyrus.te                          |    5 
 policy/modules/services/dbus.if                           |    6 
 policy/modules/services/dbus.te                           |    2 
 policy/modules/services/dovecot.te                        |    4 
 policy/modules/services/inn.te                            |    1 
 policy/modules/services/ldap.te                           |    2 
 policy/modules/services/mta.fc                            |    2 
 policy/modules/services/ntp.te                            |    6 
 policy/modules/services/oddjob.fc                         |    8 
 policy/modules/services/oddjob.if                         |   76 ++
 policy/modules/services/oddjob.te                         |   70 ++
 policy/modules/services/oddjob_mkhomedir.fc               |    6 
 policy/modules/services/oddjob_mkhomedir.if               |   24 
 policy/modules/services/oddjob_mkhomedir.te               |   26 
 policy/modules/services/openvpn.te                        |    2 
 policy/modules/services/pegasus.if                        |   31 +
 policy/modules/services/pegasus.te                        |    5 
 policy/modules/services/postfix.te                        |    7 
 policy/modules/services/postgresql.te                     |    1 
 policy/modules/services/procmail.te                       |    1 
 policy/modules/services/pyzor.te                          |    1 
 policy/modules/services/radius.te                         |    2 
 policy/modules/services/ricci.fc                          |   20 
 policy/modules/services/ricci.if                          |  184 ++++++
 policy/modules/services/ricci.te                          |  373 ++++++++++++++
 policy/modules/services/rpc.if                            |    2 
 policy/modules/services/rpc.te                            |    6 
 policy/modules/services/samba.te                          |    8 
 policy/modules/services/setroubleshoot.fc                 |    9 
 policy/modules/services/setroubleshoot.if                 |    3 
 policy/modules/services/setroubleshoot.te                 |  112 ++++
 policy/modules/services/squid.te                          |    4 
 policy/modules/services/ssh.if                            |   24 
 policy/modules/services/stunnel.te                        |    2 
 policy/modules/services/sysstat.te                        |    3 
 policy/modules/services/xserver.if                        |   69 ++
 policy/modules/services/xserver.te                        |   19 
 policy/modules/system/authlogin.te                        |   10 
 policy/modules/system/fstools.te                          |    1 
 policy/modules/system/hostname.te                         |   10 
 policy/modules/system/init.if                             |    7 
 policy/modules/system/init.te                             |    2 
 policy/modules/system/libraries.fc                        |    7 
 policy/modules/system/locallogin.te                       |    4 
 policy/modules/system/logging.fc                          |    3 
 policy/modules/system/logging.if                          |   21 
 policy/modules/system/logging.te                          |    3 
 policy/modules/system/lvm.fc                              |    2 
 policy/modules/system/lvm.te                              |    6 
 policy/modules/system/miscfiles.fc                        |    1 
 policy/modules/system/miscfiles.if                        |   18 
 policy/modules/system/modutils.te                         |    1 
 policy/modules/system/mount.te                            |    9 
 policy/modules/system/selinuxutil.te                      |   13 
 policy/modules/system/udev.fc                             |    1 
 policy/modules/system/udev.te                             |    5 
 policy/modules/system/unconfined.fc                       |    1 
 policy/modules/system/unconfined.if                       |    2 
 policy/modules/system/unconfined.te                       |    5 
 policy/modules/system/userdomain.if                       |  246 ++++++---
 policy/modules/system/userdomain.te                       |   48 -
 policy/modules/system/xen.if                              |   38 +
 policy/modules/system/xen.te                              |   26 
 serefpolicy-2.3.9/policy/mls                              |    9 
 serefpolicy-2.3.9/policy/modules/admin/bootloader.fc      |    2 
 serefpolicy-2.3.9/policy/modules/admin/firstboot.te       |   10 
 serefpolicy-2.3.9/policy/modules/apps/mono.te             |    1 
 serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc   |    2 
 serefpolicy-2.3.9/policy/modules/kernel/files.fc          |    1 
 serefpolicy-2.3.9/policy/modules/services/spamassassin.te |    4 
 104 files changed, 1883 insertions(+), 252 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- policy-20060802.patch	25 Aug 2006 20:06:07 -0000	1.21
+++ policy-20060802.patch	28 Aug 2006 21:49:05 -0000	1.22
@@ -3717,3 +3717,69 @@
  
  libs_use_ld_so(xenstored_t)
  libs_use_shared_libs(xenstored_t)
+--- serefpolicy-2.3.9/policy/modules/apps/mono.te~	2006-08-23 12:15:30.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/apps/mono.te	2006-08-28 17:29:44.000000000 -0400
+@@ -21,6 +21,7 @@
+ 	allow mono_t self:process { execheap execmem };
+ 	unconfined_domain_noaudit(mono_t)
+ 	unconfined_dbus_chat(mono_t)
++	userdom_generic_user_home_dir_filetrans_generic_user_home_content(mono_t,{ dir file lnk_file fifo_file sock_file })
+ 
+ 	init_dbus_chat_script(mono_t)
+ 
+--- serefpolicy-2.3.9/policy/modules/admin/firstboot.te~	2006-08-25 15:20:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/firstboot.te	2006-08-28 17:29:16.000000000 -0400
+@@ -38,9 +38,8 @@
+ 
+ allow firstboot_t firstboot_etc_t:file { getattr read };
+ 
+-allow firstboot_t firstboot_rw_t:dir create_dir_perms;
+-allow firstboot_t firstboot_rw_t:file create_file_perms;
+-files_etc_filetrans(firstboot_t,firstboot_rw_t,file)
++files_manage_etc_runtime_files(firstboot_t)
++files_etc_filetrans_etc_runtime(firstboot_t)
+ 
+ # The big hammer
+ unconfined_domain(firstboot_t) 
+@@ -124,6 +123,11 @@
+ 	usermanage_domtrans_useradd(firstboot_t)
+ ')
+ 
++optional_policy(`
++	usermanage_domtrans_admin_passwd(firstboot_t)
++')
++
++
+ ifdef(`TODO',`
+ allow firstboot_t proc_t:file write;
+ 
+--- serefpolicy-2.3.9/policy/modules/admin/bootloader.fc~	2006-08-23 12:15:43.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/admin/bootloader.fc	2006-08-28 17:35:52.000000000 -0400
+@@ -10,3 +10,5 @@
+ /sbin/lilo.*		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
+ /sbin/mkinitrd		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
+ /sbin/ybin.*		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
++/boot/grup/.*		--	gen_context(system_u:object_r:boot_runtime_t,s0)
++/boot/grup/slapsh.xpm.gz --	gen_context(system_u:object_r:boot_t,s0)
+--- serefpolicy-2.3.9/policy/modules/kernel/files.fc~	2006-08-23 12:15:48.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/files.fc	2006-08-28 17:38:15.000000000 -0400
+@@ -57,6 +57,7 @@
+ /etc/motd		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/nohotplug		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/nologin.*		--	gen_context(system_u:object_r:etc_runtime_t,s0)
++/etc/reader.conf	-- 	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/smartd\.conf	--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ 
+ /etc/cups/client\.conf	--	gen_context(system_u:object_r:etc_t,s0)
+--- serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc~	2006-08-25 15:20:34.000000000 -0400
++++ serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc	2006-08-28 16:02:08.000000000 -0400
+@@ -54,7 +54,9 @@
+ /etc/rc\.d/init\.d/functions	--	gen_context(system_u:object_r:bin_t,s0)
+ 
+ /etc/sysconfig/network-scripts/ifup-.*	-- gen_context(system_u:object_r:bin_t,s0)
++/etc/sysconfig/network-scripts/ifup-.*	-l gen_context(system_u:object_r:bin_t,s0)
+ /etc/sysconfig/network-scripts/ifdown-.* -- gen_context(system_u:object_r:bin_t,s0)
++/etc/sysconfig/network-scripts/ifdown-.* -l gen_context(system_u:object_r:bin_t,s0)
+ 
+ /etc/X11/xdm/GiveConsole	--	gen_context(system_u:object_r:bin_t,s0)
+ /etc/X11/xdm/TakeConsole	--	gen_context(system_u:object_r:bin_t,s0)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- selinux-policy.spec	25 Aug 2006 20:06:07 -0000	1.260
+++ selinux-policy.spec	28 Aug 2006 21:49:05 -0000	1.261
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.9
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Mon Aug 28 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-6
+- Fix install problems
+
 * Fri Aug 25 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-5
 - Allow setroubleshoot to getattr on all dirs to gather RPM data
 



From fedora-cvs-commits at redhat.com  Mon Aug 28 23:00:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 19:00:27 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-offscreen-pixmaps.patch, 1.3,
	1.4 xorg-x11-server.spec, 1.160, 1.161
Message-ID: <200608282300.k7SN0R13017247@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17199

Modified Files:
	xorg-x11-server-1.1.1-offscreen-pixmaps.patch 
	xorg-x11-server.spec 
Log Message:
* Mon Aug 28 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-31.fc6
- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to log transitions.


xorg-x11-server-1.1.1-offscreen-pixmaps.patch:
 xaa.h     |    3 +++
 xaaInit.c |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 2 deletions(-)

Index: xorg-x11-server-1.1.1-offscreen-pixmaps.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-offscreen-pixmaps.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-server-1.1.1-offscreen-pixmaps.patch	8 Aug 2006 18:17:36 -0000	1.3
+++ xorg-x11-server-1.1.1-offscreen-pixmaps.patch	28 Aug 2006 23:00:23 -0000	1.4
@@ -1,5 +1,17 @@
---- xorg-server-1.1.1/hw/xfree86/xaa/xaaInit.c.offscreen-pixmaps	2006-07-05 14:31:42.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/xaa/xaaInit.c	2006-08-08 14:02:05.000000000 -0400
+--- ./hw/xfree86/xaa/xaa.h.offscreen-pixmaps	2006-08-28 15:33:34.000000000 -0400
++++ ./hw/xfree86/xaa/xaa.h	2006-08-28 15:33:36.000000000 -0400
+@@ -1373,6 +1373,9 @@
+    );
+    CARD32 *CPUToScreenTextureDstFormats;
+ #endif /* RENDER */
++
++   unsigned int savedOffscreenDepths;
++
+ } XAAInfoRec, *XAAInfoRecPtr;
+ 
+ #define SET_SYNC_FLAG(infoRec)	(infoRec)->NeedToSync = TRUE
+--- ./hw/xfree86/xaa/xaaInit.c.offscreen-pixmaps	2006-07-05 14:31:42.000000000 -0400
++++ ./hw/xfree86/xaa/xaaInit.c	2006-08-28 15:31:03.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <xorg-config.h>
  #endif
@@ -16,7 +28,7 @@
  
  #define MAX_PREALLOC_MEM	65536	/* MUST be >= 1024 */
  
-@@ -98,6 +100,29 @@
+@@ -98,6 +100,49 @@
      xfree(infoRec);
  }
  
@@ -32,21 +44,41 @@
 +    Atom atom;
 +
 +    atom = MakeAtom(atom_name, strlen(atom_name), 0);
-+    if (info->selection->selection == atom &&
-+	info->kind == SelectionSetOwner &&
-+	info->selection->window != None)
++    if (info->selection->selection != atom)
++	return;
++
++    if (info->kind == SelectionSetOwner && info->selection->window != None)
 +    {
++	infoRec->savedOffscreenDepths = infoRec->offscreenDepths;
 +	infoRec->offscreenDepths = 0;
 +	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
 +       
 +	XAAMoveOutOffscreenPixmaps(pScreen);
 +	XAAInvalidatePixmapCache(pScreen);
++
++	xf86MsgVerb(X_INFO, 3, "'%s' selection grabbed; evicting pixmaps for screen %d\n",
++		    atom_name, pScreen->myNum);
++    }
++    else if (infoRec->savedOffscreenDepths > 0)
++    {
++	infoRec->Flags |= OFFSCREEN_PIXMAPS;
++	infoRec->offscreenDepths = infoRec->savedOffscreenDepths;
++
++	if (!SwitchedOut) {
++	    xf86MsgVerb(X_INFO, 3, "'%s' selection released; pulling in pixmaps for screen %d\n",
++		      atom_name, pScreen->myNum);
++
++	    XAAMoveInOffscreenPixmaps(pScreen);
++	} else {
++	    xf86MsgVerb(X_INFO, 3, "'%s' selection released; will pull in pixmaps for screen %d when switched back in.\n",
++			atom_name, pScreen->myNum);
++	}
 +    }
 +}
  
  Bool 
  XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
-@@ -228,11 +253,11 @@
+@@ -228,11 +273,11 @@
      if(infoRec->Flags & MICROSOFT_ZERO_LINE_BIAS)
  	miSetZeroLineBias(pScreen, OCTANT1 | OCTANT2 | OCTANT3 | OCTANT4);
  
@@ -60,7 +92,7 @@
  static Bool
  XAACloseScreen (int i, ScreenPtr pScreen)
  {
-@@ -264,6 +289,9 @@
+@@ -264,6 +309,9 @@
  
      xfree ((pointer) pScreenPriv);
  


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- xorg-x11-server.spec	25 Aug 2006 21:54:45 -0000	1.160
+++ xorg-x11-server.spec	28 Aug 2006 23:00:23 -0000	1.161
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   30%{?dist}
+Release:   31%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -707,6 +707,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Aug 28 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-31.fc6
+- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to log transitions.
+
 * Fri Aug 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-30.fc6
 - xorg-x11-server-1.1.1-pci-paranoia.patch: In xf86MatchPciInstances, fail
   gracefully if xf86PciVideoInfo is NULL (like, on Xen).



From fedora-cvs-commits at redhat.com  Mon Aug 28 23:03:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 19:03:53 -0400
Subject: rpms/audit/devel audit-perms.patch,NONE,1.1 audit.spec,1.108,1.109
Message-ID: <200608282303.k7SN3r4Z017889@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17851

Modified Files:
	audit.spec 
Added Files:
	audit-perms.patch 
Log Message:
* Mon Aug 28 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-2
- Another minor update to auditctl -p option


audit-perms.patch:
 lib/libaudit.c |   19 ++-----------------
 src/auditctl.c |    4 ++++
 2 files changed, 6 insertions(+), 17 deletions(-)

--- NEW FILE audit-perms.patch ---
diff -ur audit-1.2.6/lib/libaudit.c audit-1.2.7/lib/libaudit.c
--- audit-1.2.6/lib/libaudit.c	2006-08-26 13:37:26.000000000 -0400
+++ audit-1.2.7/lib/libaudit.c	2006-08-28 14:10:13.000000000 -0400
@@ -554,28 +554,14 @@
 
 	rule->flags = AUDIT_FILTER_EXIT;
 	rule->action = AUDIT_ALWAYS;
-	//audit_rule_syscallbyname_data(rule, "all");
-/*	audit_rule_syscallbyname_data(rule, "chmod");
-	audit_rule_syscallbyname_data(rule, "fchmod");
-	audit_rule_syscallbyname_data(rule, "chown");
-	audit_rule_syscallbyname_data(rule, "fchown");
-	audit_rule_syscallbyname_data(rule, "lchown");
-	audit_rule_syscallbyname_data(rule, "creat");
-	audit_rule_syscallbyname_data(rule, "open");
-	audit_rule_syscallbyname_data(rule, "truncate");
-	audit_rule_syscallbyname_data(rule, "ftruncate");
-	audit_rule_syscallbyname_data(rule, "mkdir");
-	audit_rule_syscallbyname_data(rule, "rmdir");
-	audit_rule_syscallbyname_data(rule, "unlink");
-	audit_rule_syscallbyname_data(rule, "rename");
-	audit_rule_syscallbyname_data(rule, "link"); 
-	audit_rule_syscallbyname_data(rule, "symlink"); */ 
+	audit_rule_syscallbyname_data(rule, "all");
 	rule->field_count = 2;
 	rule->fields[0] = AUDIT_WATCH;
 	rule->values[0] = len;
 	rule->fieldflags[0] = AUDIT_EQUAL;
 	rule->buflen = len;
 	memcpy(&rule->buf[0], path, len);
+
 	// Default to all permissions
 	rule->fields[1] = AUDIT_PERM;
 	rule->fieldflags[1] = AUDIT_EQUAL;
@@ -886,7 +872,6 @@
 	int machine;
 
 	if (!strcmp(scall, "all")) {
-printf("doing all?\n");
 		for (i = 0; i < (AUDIT_BITMASK_SIZE-1); i++) 
 			rule->mask[i] = ~0;
 		return 0;
diff -ur audit-1.2.6/src/auditctl.c audit-1.2.7/src/auditctl.c
--- audit-1.2.6/src/auditctl.c	2006-08-26 15:22:16.000000000 -0400
+++ audit-1.2.7/src/auditctl.c	2006-08-28 14:34:47.000000000 -0400
@@ -197,6 +197,10 @@
 		fprintf(stderr, "The path passed for the watch is too big\n");
 		return 1;
 	}
+	if (path[0] != '/') {
+		fprintf(stderr, "The path must start with '/'\n");
+		return 1;
+	}
 	ptr = strdup(path);
 	base = basename(ptr);
 	nlen = strlen(base);


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- audit.spec	26 Aug 2006 19:57:03 -0000	1.108
+++ audit.spec	28 Aug 2006 23:03:50 -0000	1.109
@@ -1,12 +1,12 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.6
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
-
+Patch1: audit-perms.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.17
@@ -55,6 +55,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 autoreconf -fv --install
@@ -166,6 +167,9 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Mon Aug 28 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-2
+- Another minor update to auditctl -p option
+
 * Sat Aug 26 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-1
 - Apply updates to dispatcher
 - Fix a couple bugs regarding MLS labels



From fedora-cvs-commits at redhat.com  Mon Aug 28 23:08:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 19:08:01 -0400
Subject: rpms/audit/devel audit-setroubleshoot.patch,1.6,NONE
Message-ID: <200608282308.k7SN81VK018757@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18663

Removed Files:
	audit-setroubleshoot.patch 
Log Message:
Remove selinux troubleshooter patch



--- audit-setroubleshoot.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Aug 28 23:57:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 19:57:12 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.0-tfp-damage.patch,
	1.3, 1.4 xorg-x11-server.spec, 1.161, 1.162
Message-ID: <200608282357.k7SNvBU6003530@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3515

Modified Files:
	xorg-x11-server-1.1.0-tfp-damage.patch xorg-x11-server.spec 
Log Message:
* Mon Aug 28 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-31.fc6
- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to log transitions.
- Update xorg-x11-server-1.1.0-tfp-damage.patch to always bind to
  GL_TEXTURE_RECTANGLE_ARB target.


xorg-x11-server-1.1.0-tfp-damage.patch:
 glxcmds.c     |    1 
 glxdrawable.h |    4 +
 glxdri.c      |  136 ++++++++++++++++++++++++++++++++++++++++------------------
 glxext.c      |    4 +
 4 files changed, 102 insertions(+), 43 deletions(-)

Index: xorg-x11-server-1.1.0-tfp-damage.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-tfp-damage.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-server-1.1.0-tfp-damage.patch	21 Jun 2006 05:23:41 -0000	1.3
+++ xorg-x11-server-1.1.0-tfp-damage.patch	28 Aug 2006 23:57:08 -0000	1.4
@@ -71,7 +71,7 @@
   * - No support for anything but 16bpp and 32bpp-sparse pixmaps
   */
  
-@@ -335,38 +328,103 @@
+@@ -335,38 +328,97 @@
  		     int buffer,
  		     __GLXpixmap *glxPixmap)
  {
@@ -109,13 +109,7 @@
 +	type = GL_UNSIGNED_SHORT_5_6_5;
 +    }
 +
-+    if (!(glxCountBits(pixmap->drawable.width) == 1 &&
-+	  glxCountBits(pixmap->drawable.height) == 1)
-+	/* || strstr(CALL_GetString(GL_EXTENSIONS,
-+	             "GL_ARB_texture_non_power_of_two")) */)
-+	target = GL_TEXTURE_RECTANGLE_ARB;
-+    else
-+	target = GL_TEXTURE_2D;
++    target = GL_TEXTURE_RECTANGLE_ARB;
 +
      CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
 -                                       pixmap->devKind / bpp) );


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- xorg-x11-server.spec	28 Aug 2006 23:00:23 -0000	1.161
+++ xorg-x11-server.spec	28 Aug 2006 23:57:08 -0000	1.162
@@ -709,6 +709,8 @@
 %changelog
 * Mon Aug 28 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-31.fc6
 - Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to log transitions.
+- Update xorg-x11-server-1.1.0-tfp-damage.patch to always bind to
+  GL_TEXTURE_RECTANGLE_ARB target.
 
 * Fri Aug 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-30.fc6
 - xorg-x11-server-1.1.1-pci-paranoia.patch: In xf86MatchPciInstances, fail



From fedora-cvs-commits at redhat.com  Tue Aug 29 02:23:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 22:23:13 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-setup-tool.patch,1.2,1.3
Message-ID: <200608290223.k7T2ND4g017856@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17436

Modified Files:
	pam_pkcs11-0.5.3-setup-tool.patch 
Log Message:


Add RTLD_LAZY so that the shared library actually loads. Otherwise we don't
get a library handle back (Also _LAZY is the right thing since we are going 
to unload it right away without using it anyway).


pam_pkcs11-0.5.3-setup-tool.patch:
 Makefile.am    |    7 
 Makefile.in    |   21 +-
 pkcs11_setup.c |  519 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 540 insertions(+), 7 deletions(-)

Index: pam_pkcs11-0.5.3-setup-tool.patch
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11-0.5.3-setup-tool.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_pkcs11-0.5.3-setup-tool.patch	28 Aug 2006 21:03:47 -0000	1.2
+++ pam_pkcs11-0.5.3-setup-tool.patch	29 Aug 2006 02:23:10 -0000	1.3
@@ -237,7 +237,7 @@
 +    		continue;
 +    	}
 +    	/* verify the module exists */
-+        if ((libhandle=dlopen(path, 0)) != NULL) {
++        if ((libhandle=dlopen(path, RTLD_LAZY)) != NULL) {
 +    	    dlclose(libhandle);
 +    	    if (pkcs11_blocks[i] && pkcs11_blocks[i]->name
 +    	        && pkcs11_blocks[i]->name->data) {



From fedora-cvs-commits at redhat.com  Tue Aug 29 02:23:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 22:23:50 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11.spec, 1.14, 1.15 rh_pam_pkcs11.conf,
	1.4, 1.5
Message-ID: <200608290223.k7T2NoPW018092@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17926

Modified Files:
	pam_pkcs11.spec rh_pam_pkcs11.conf 
Log Message:

remove any paths in the config file.



Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pam_pkcs11.spec	28 Aug 2006 21:03:47 -0000	1.14
+++ pam_pkcs11.spec	29 Aug 2006 02:23:48 -0000	1.15
@@ -6,7 +6,7 @@
 
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        13
+Release:        14
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -94,12 +94,8 @@
 # set up config files
 #
 install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-sed -e 's;$LIB;'%{_lib}';g' %{SOURCE1} > $RPM_BUILD_ROOT/tmp_conf
-install -m 644 $RPM_BUILD_ROOT/tmp_conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
-rm -f $RPM_BUILD_ROOT/tmp_conf
-sed -e 's;$LIB;'%{_lib}';g' %{SOURCE2} > $RPM_BUILD_ROOT/tmp_conf
-install -m 644 $RPM_BUILD_ROOT/tmp_conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
-rm -f $RPM_BUILD_ROOT/tmp_conf
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
 #
 # clean up those files that aren't part of this package
 # (makefile should install them if --without-pcsclite is supplied
@@ -151,6 +147,9 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Mon Aug 28 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-14
+- use implicit paths to load the PKCS #11 module
+
 * Mon Aug 28 2006 Tomas Mraz <tmraz at redhat.com>
 - pkcs11_setup should respect $LIB in module paths (#204252)
 


Index: rh_pam_pkcs11.conf
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/rh_pam_pkcs11.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rh_pam_pkcs11.conf	26 Aug 2006 00:19:06 -0000	1.4
+++ rh_pam_pkcs11.conf	29 Aug 2006 02:23:48 -0000	1.5
@@ -33,7 +33,7 @@
   use_pkcs11_module = coolkey;
 
   pkcs11_module coolkey {
-    module = /usr/$LIB/libcoolkeypk11.so;
+    module = libcoolkeypk11.so;
     description = "Cool Key"
     # Slot-number to use. One for the first, two for the second and so
     # on. The default value is zero which means to use the first slot
@@ -64,7 +64,7 @@
   }
 
   pkcs11_module opensc {
-    module = /usr/$LIB/opensc-pkcs11.so;
+    module = opensc-pkcs11.so;
     description = "OpenSC PKCS#11 module";
     # Slot-number to use. One for the first, two for the second and so
     # on. The default value is zero which means to use the first slot



From fedora-cvs-commits at redhat.com  Tue Aug 29 02:38:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 22:38:32 -0400
Subject: rpms/firefox/devel firefox.sh.in, 1.11, 1.12 firefox.spec, 1.146,
	1.147
Message-ID: <200608290238.k7T2cWsr021818@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21764

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
- Remove "Pango breaks MathML" from firefox.sh.in



Index: firefox.sh.in
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- firefox.sh.in	13 Mar 2006 07:47:23 -0000	1.11
+++ firefox.sh.in	29 Aug 2006 02:38:26 -0000	1.12
@@ -86,9 +86,9 @@
 ## In order to better support certain scripts (such as Indic and some CJK 
 ## scripts), Fedora builds its Firefox, with permission from the Mozilla 
 ## Corporation, with the Pango system as its text renderer.  This change 
-## is known to break rendering of MathML, and may negatively impact 
-## performance on some pages.  To disable the use of Pango, set 
-## MOZ_DISABLE_PANGO=1 in your environment before launching Firefox.
+## may negatively impact performance on some pages.  To disable the use of
+## Pango, set MOZ_DISABLE_PANGO=1 in your environment before launching
+## Firefox.
 ##
 #
 # MOZ_DISABLE_PANGO=1


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- firefox.spec	28 Aug 2006 12:47:20 -0000	1.146
+++ firefox.spec	29 Aug 2006 02:38:27 -0000	1.147
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.6
-Release:        8
+Release:        9
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -356,6 +356,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Aug 28 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.5.0.6-9
+- Remove "Pango breaks MathML" from firefox.sh.in
+
 * Mon Aug 28 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-8
 - Turn visibility back off again for now, as it still breaks the build.
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 03:28:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 28 Aug 2006 23:28:48 -0400
Subject: rpms/kernel/devel config-olpc-generic,1.3,1.4
Message-ID: <200608290328.k7T3SmPv009039@cvs.devel.redhat.com>

Author: mtosatti

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14867

Modified Files:
	config-olpc-generic 
Log Message:
Disable CONFIG_VGA_NOPROBE (required for vesafb)




Index: config-olpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/config-olpc-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-olpc-generic	23 Aug 2006 15:37:31 -0000	1.3
+++ config-olpc-generic	29 Aug 2006 03:28:46 -0000	1.4
@@ -57,7 +57,7 @@
 # CONFIG_RESOURCES_64BIT is not set
 # CONFIG_EFI is not set
 
-CONFIG_VGA_NOPROBE=y
+# CONFIG_VGA_NOPROBE is not set
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 CONFIG_HZ=100



From fedora-cvs-commits at redhat.com  Tue Aug 29 04:47:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 00:47:17 -0400
Subject: rpms/fonts-chinese/devel fonts-chinese.spec,1.23,1.24
Message-ID: <200608290447.k7T4lHhx030774@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/fonts-chinese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27128

Modified Files:
	fonts-chinese.spec 
Log Message:
updated with latest arphic uming & ukai, re-patched bz#197207



Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fonts-chinese.spec	23 Aug 2006 04:18:42 -0000	1.23
+++ fonts-chinese.spec	29 Aug 2006 04:47:13 -0000	1.24
@@ -3,24 +3,25 @@
 %define	miscfontdir	%{basefontdir}/misc
 %define cidmapdir   %{_sysconfdir}/ghostscript
 
-%define beta 0.dot.3
 %define ver 0.1
+%define minor 20060513
+%define rhpatch rh20060829a
 %define taipeiver 1.2
-%define umingpatch 20060822a
 
 Summary:    Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
 Name:		fonts-chinese
 Version:    3.02
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	Arphic Public License (GPL-like)
 Group:		User Interface/X
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 #Source:     http://apt.debian.org.tw/pool/t/ttf-arphic-uming/ttf-arphic-uming_%{ver}-%{beta}.tar.gz
-Source1:    http://apt.debian.org.tw/pool/t/ttf-arphic-ukai/ttf-arphic-ukai_%{ver}-%{beta}.tar.gz
+#Source1:    http://apt.debian.org.tw/pool/t/ttf-arphic-ukai/ttf-arphic-ukai_%{ver}-%{beta}.tar.gz
 Source2:    taipeifonts-%{taipeiver}.tar.gz
-Source3:    ttf-arphic-uming_%{ver}-%{beta}-%{umingpatch}.tar.gz
+Source3:    ttf-arphic-uming_%{ver}.%{minor}.%{rhpatch}.tar.gz
+Source4:    ttf-arphic-ukai_%{ver}.%{minor}.%{rhpatch}.tar.gz
 Source9:    taipeifonts.alias
 Source10:	arphicpl.txt
 Source11:	arphicpl-big5.txt
@@ -41,7 +42,7 @@
 
 %prep
 tar xzvf %{SOURCE3} 
-tar xzvf %{SOURCE1}
+tar xzvf %{SOURCE4} 
 tar xzvf %{SOURCE2}
 
 %build
@@ -57,8 +58,8 @@
 
 install -d $RPM_BUILD_ROOT%{ttfontdir}
 install -d $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 ttf-arphic-ukai-%{ver}/ukai.ttf $RPM_BUILD_ROOT%{ttfontdir}/
-install -m 0644 ttf-arphic-uming-%{ver}/uming.ttf $RPM_BUILD_ROOT%{ttfontdir}/
+install -m 0644 ttf-arphic-ukai-%{ver}.%{minor}/ukai.ttf $RPM_BUILD_ROOT%{ttfontdir}/
+install -m 0644 ttf-arphic-uming-%{ver}.%{minor}/uming.ttf $RPM_BUILD_ROOT%{ttfontdir}/
 install -m 644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
 install -m 644 taipeifonts-%{taipeiver}/taipei20.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
 install -m 644 taipeifonts-%{taipeiver}/taipei16.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
@@ -139,6 +140,9 @@
 %{cidmapdir}/cidfmap.zh_CN
 
 %changelog
+* TUE Aug 29 2006 Caius Chance <cchance at redhat.com> - 3.02-6%{?dist}
+- updated arphic uming and ukai fonts, re-patched with bz#197207.
+
 * Wed Aug 23 2006 Caius Chance <cchance at redhat.com> - 3.02-5
 - fix bz#197207 - cutting of ")" glyph in uming.ttf
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 04:48:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 00:48:04 -0400
Subject: rpms/fonts-chinese/devel .cvsignore,1.7,1.8 sources,1.6,1.7
Message-ID: <200608290448.k7T4m4r5001568@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/fonts-chinese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1360

Modified Files:
	.cvsignore sources 
Log Message:
updated with latest arphic uming & ukai, re-patched bz#197207



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Aug 2006 04:11:35 -0000	1.7
+++ .cvsignore	29 Aug 2006 04:48:01 -0000	1.8
@@ -12,3 +12,7 @@
 ttf-arphic-ukai_0.1-0.dot.3.tar.gz
 taipeifonts-1.2.tar.gz
 ttf-arphic-uming_0.1-0.dot.3-20060822a.tar.gz
+ttf-arphic-ukai_0.1.20060513.rh20060829a.tar.gz
+ttf-arphic-ukai_0.1.20060513.orig.tar.gz
+ttf-arphic-uming_0.1.20060513.orig.tar.gz
+ttf-arphic-uming_0.1.20060513.rh20060829a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Aug 2006 04:11:35 -0000	1.6
+++ sources	29 Aug 2006 04:48:02 -0000	1.7
@@ -8,3 +8,7 @@
 f294d9e35de34ff80156e11e00f33c38  ttf-arphic-ukai_0.1-0.dot.3.tar.gz
 9e4acdd5a218dea6aaa28bc80d472aad  taipeifonts-1.2.tar.gz
 4d9c2e6007564b7975921d648c45a657  ttf-arphic-uming_0.1-0.dot.3-20060822a.tar.gz
+cb28c48b719063896af3bc6020e7bb73  ttf-arphic-ukai_0.1.20060513.rh20060829a.tar.gz
+cb28c48b719063896af3bc6020e7bb73  ttf-arphic-ukai_0.1.20060513.orig.tar.gz
+059f0c8b28942896385d3ee8e2663945  ttf-arphic-uming_0.1.20060513.orig.tar.gz
+ce4057457f4a4630b5cb341e2fcaf105  ttf-arphic-uming_0.1.20060513.rh20060829a.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 29 04:50:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 00:50:41 -0400
Subject: rpms/fonts-chinese/devel fonts-chinese.spec,1.24,1.25
Message-ID: <200608290450.k7T4ofkT010671@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/fonts-chinese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9561

Modified Files:
	fonts-chinese.spec 
Log Message:
updated with latest arphic uming & ukai, re-patched bz#197207



Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fonts-chinese.spec	29 Aug 2006 04:47:13 -0000	1.24
+++ fonts-chinese.spec	29 Aug 2006 04:50:38 -0000	1.25
@@ -140,7 +140,7 @@
 %{cidmapdir}/cidfmap.zh_CN
 
 %changelog
-* TUE Aug 29 2006 Caius Chance <cchance at redhat.com> - 3.02-6%{?dist}
+* Tue Aug 29 2006 Caius Chance <cchance at redhat.com> - 3.02-6%{?dist}
 - updated arphic uming and ukai fonts, re-patched with bz#197207.
 
 * Wed Aug 23 2006 Caius Chance <cchance at redhat.com> - 3.02-5



From fedora-cvs-commits at redhat.com  Tue Aug 29 07:59:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 03:59:34 -0400
Subject: rpms/im-chooser/devel im-chooser.spec,1.8,1.9
Message-ID: <200608290759.k7T7xYjC031971@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/im-chooser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31937

Modified Files:
	im-chooser.spec 
Log Message:
* Tue Aug 29 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.1-3
- im-chooser-r53.patch: take care of the suffix to appears current selection.
  (#204433)


Index: im-chooser.spec
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- im-chooser.spec	25 Aug 2006 10:49:20 -0000	1.8
+++ im-chooser.spec	29 Aug 2006 07:59:31 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	0.3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -8,6 +8,7 @@
 
 Source0:	http://trac.tagoh.net/download/%{name}/%{name}-%{version}.tar.gz
 Patch0:		im-chooser-r49.patch
+Patch1:		im-chooser-r53.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -22,6 +23,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 %build
 %configure --with-xinput-suffix=.conf
@@ -42,8 +44,10 @@
 alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf 30
 
 %postun
-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf
-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf
+if [ "$1" = 0 ]; then
+	alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf
+	alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf
+fi
 
 %files -f %{name}.lang
 %defattr (-, root, root)
@@ -53,6 +57,10 @@
 %{_datadir}/applications/im-chooser.desktop
 
 %changelog
+* Tue Aug 29 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.1-3
+- im-chooser-r53.patch: take care of the suffix to appears current selection.
+  (#204433)
+
 * Fri Aug 25 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.1-2
 - im-chooser-r49.patch: removed MimeType field from .desktop file. (#203982)
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 08:00:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 04:00:47 -0400
Subject: rpms/im-chooser/devel im-chooser-r53.patch,NONE,1.1
Message-ID: <200608290800.k7T80llE032355@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/im-chooser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32266

Added Files:
	im-chooser-r53.patch 
Log Message:


im-chooser-r53.patch:
 ChangeLog        |    5 +++++
 src/im-chooser.c |   10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE im-chooser-r53.patch ---
Index: ChangeLog
===================================================================
--- ChangeLog	(??????????????? 50)
+++ ChangeLog	(???????????????)
@@ -1,3 +1,8 @@
+2006-08-29  Akira TAGOH  <at at gclab.org>
+
+	* src/im-chooser.c (_im_chooser_set_menu_from_im_table): check
+	the suffix thing too.
+
 2006-08-25  Akira TAGOH  <at at gclab.org>
 
 	* src/im-chooser.desktop.in.in: removed MimeType.
Index: src/im-chooser.c
===================================================================
--- src/im-chooser.c	(??????????????? 50)
+++ src/im-chooser.c	(???????????????)
@@ -408,12 +408,20 @@
 	filename = g_build_filename(home, IM_USER_XINPUT_CONF, NULL);
 	if (filename != NULL &&
 	    (origname = g_file_read_link(filename, NULL)) != NULL) {
+		gchar *confname;
+
 		name = g_path_get_basename(origname);
-		if (strcmp(name, key) == 0) {
+		/* it may be easier that just comparing with + suffix instead
+		 * of getting rid of suffix from name.
+		 */
+		confname = g_strdup_printf("%s%s", (gchar *)key, XINPUT_SUFFIX);
+		if (strcmp(name, key) == 0 ||
+		    strcmp(name, confname) == 0) {
 			/* ugly hack */
 			gtk_menu_set_active(GTK_MENU (menu),
 					    g_list_length(GTK_MENU_SHELL (menu)->children) - 1);
 		}
+		g_free(confname);
 		g_free(name);
 		g_free(origname);
 	}



From fedora-cvs-commits at redhat.com  Tue Aug 29 08:07:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 04:07:15 -0400
Subject: rpms/logwatch/devel logwatch-7.3-amavis.patch, NONE,
	1.1 logwatch.spec, 1.41, 1.42
Message-ID: <200608290807.k7T87F5X001482@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/logwatch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1002

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3-amavis.patch 
Log Message:
 -  fix amavis problem #204432


logwatch-7.3-amavis.patch:
 amavis |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3-amavis.patch ---
--- logwatch-7.3/scripts/services/amavis.pom	2006-01-30 00:52:53.000000000 +0100
+++ logwatch-7.3/scripts/services/amavis	2006-08-29 09:58:07.000000000 +0200
@@ -115,7 +115,8 @@
         $Viruses{$Virus}{$From}++;
       }; # if
 
-   } elsif (($FromIP, $Fromspam, $Towards) = ( $ThisLine =~ /^(?:Passed )?(?:SPAM|Blocked SPAM), (?:\[([^\]]*)\] )*[(<]([^>)]*)[)>] -\> [\(\<]([^\>\)]+)[\)\>]/ )) {
+   } elsif (($Ac,$FromIP, $Fromspam, $Towards)
+        = ( $ThisLine =~ /^(Passed |Blocked )?SPAM(?:MY)?,(?: LOCAL)? (?:\[([^\]]*)\] )*[(<]([^>)]*)[)>] -\> [\(\<]([^\>\)]+)[\)\>]/ )) {
       $SpamMsgs++;
 
       if ($Fromspam =~ /^$/) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- logwatch.spec	15 Aug 2006 11:20:27 -0000	1.41
+++ logwatch.spec	29 Aug 2006 08:07:12 -0000	1.42
@@ -14,6 +14,7 @@
 Patch7: logwatch-7.3-audit.patch
 Patch8: logwatch-7.3-sshd.patch
 Patch9: logwatch-7.3-iptables.patch
+Patch10: logwatch-7.3-amavis.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -35,6 +36,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %install
 
@@ -136,6 +138,9 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Tue Aug 29 2006 Ivana Varekova <varekova at redhat.com> 7.3-5
+- fix amavis problem #204432 
+
 * Mon Aug 14 2006 Marcela Maslanova <mmaslano at redhat.com> 7.3-4
 - add audit patch for SElinux (#200116)
 - add patch for sshd (#200105)



From fedora-cvs-commits at redhat.com  Tue Aug 29 08:08:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 04:08:48 -0400
Subject: rpms/logwatch/devel logwatch.spec,1.42,1.43
Message-ID: <200608290808.k7T88mVn001925@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/logwatch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1735

Modified Files:
	logwatch.spec 
Log Message:
update release number



Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- logwatch.spec	29 Aug 2006 08:07:12 -0000	1.42
+++ logwatch.spec	29 Aug 2006 08:08:45 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 7.3
-Release: 4
+Release: 5
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/



From fedora-cvs-commits at redhat.com  Tue Aug 29 08:09:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 04:09:12 -0400
Subject: rpms/udev/devel udev-rules.patch,1.18,1.19 udev.spec,1.183,1.184
Message-ID: <200608290809.k7T897tb001976@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1932

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
fixed bug #204157

udev-rules.patch:
 05-udev-early.rules |    1 +
 50-udev.rules       |   17 ++++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- udev-rules.patch	7 Aug 2006 12:59:00 -0000	1.18
+++ udev-rules.patch	29 Aug 2006 08:09:03 -0000	1.19
@@ -1,5 +1,5 @@
 --- udev-095/etc/udev/redhat/50-udev.rules.rhrules	2006-07-04 12:34:55.000000000 +0200
-+++ udev-095/etc/udev/redhat/50-udev.rules	2006-08-07 14:53:56.000000000 +0200
++++ udev-095/etc/udev/redhat/50-udev.rules	2006-08-29 10:06:55.000000000 +0200
 @@ -28,7 +28,8 @@
  KERNEL=="ippp*",		NAME="%k", MODE="0660"
  KERNEL=="isdn*",		NAME="%k", MODE="0660"
@@ -10,7 +10,19 @@
  KERNEL=="dcbri*",		NAME="%k", MODE="0660"
  KERNEL=="ircomm*",		NAME="%k", GROUP="uucp", MODE="0660"
  KERNEL=="tts/[0-9]*",		NAME="%k", GROUP="uucp", MODE="0660"
-@@ -217,8 +218,11 @@
+@@ -155,10 +156,7 @@
+ 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"
+-
++KERNEL=="dm-[0-9]*",            OPTIONS+="ignore_device"
+ 
+ # alsa devices
+ KERNEL=="controlC[0-9]*",	NAME="snd/%k"
+@@ -217,8 +215,11 @@
  KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
  KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
  
@@ -24,7 +36,7 @@
  
  # Section for zaptel device
  KERNEL=="zapctl",     		NAME="zap/ctl"
-@@ -229,8 +233,6 @@
+@@ -229,8 +230,6 @@
  
  KERNEL=="pktcdvd", NAME="%k/control"
  
@@ -33,8 +45,8 @@
  KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
  	SYSFS{device/media}=="floppy", \
  	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
---- udev-095/etc/udev/redhat/05-udev-early.rules.rhrules	2006-08-07 14:58:23.000000000 +0200
-+++ udev-095/etc/udev/redhat/05-udev-early.rules	2006-08-07 14:50:58.000000000 +0200
+--- udev-095/etc/udev/redhat/05-udev-early.rules.rhrules	2006-07-04 12:34:55.000000000 +0200
++++ udev-095/etc/udev/redhat/05-udev-early.rules	2006-08-29 10:06:05.000000000 +0200
 @@ -1,6 +1,7 @@
  # sysfs is populated after the event is sent
  ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- udev.spec	16 Aug 2006 15:27:55 -0000	1.183
+++ udev.spec	29 Aug 2006 08:09:03 -0000	1.184
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -329,6 +329,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Tue Aug 29 2006 Harald Hoyer <harald at redhat.com> - 095-8
+- fixed bug #204157
+
 * Wed Aug 16 2006 Harald Hoyer <harald at redhat.com> - 095-7
 - added udevtimeout=<timeout in seconds>
   kernel command line parameters for start_udev 



From fedora-cvs-commits at redhat.com  Tue Aug 29 08:47:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 04:47:35 -0400
Subject: rpms/nc/devel nc-1.84-verb.patch,NONE,1.1 nc.spec,1.30,1.31
Message-ID: <200608290847.k7T8lZBs029810@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/nc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29263

Modified Files:
	nc.spec 
Added Files:
	nc-1.84-verb.patch 
Log Message:
- fix verbose option (#202321) <varmojfekoj at gmail.com>

nc-1.84-verb.patch:
 netcat.c |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

--- NEW FILE nc-1.84-verb.patch ---
--- nc/netcat.c.orig	2006-08-28 20:13:48.000000000 +0200
+++ nc/netcat.c	2006-08-29 02:11:28.000000000 +0200
@@ -41,6 +41,7 @@
 #include <netinet/tcp.h>
 #include <netinet/ip.h>
 #include <arpa/telnet.h>
+#include <arpa/inet.h>
 
 #include <err.h>
 #include <errno.h>
@@ -312,16 +313,15 @@
 			if (uflag) {
 				int rv, plen;
 				char buf[8192];
-				struct sockaddr_storage z;
 
-				len = sizeof(z);
+				len = sizeof(cliaddr);
 				plen = jflag ? 8192 : 1024;
 				rv = recvfrom(s, buf, plen, MSG_PEEK,
-				    (struct sockaddr *)&z, &len);
+				    (struct sockaddr *)&cliaddr, &len);
 				if (rv < 0)
 					err(1, "recvfrom");
 
-				rv = connect(s, (struct sockaddr *)&z, len);
+				rv = connect(s, (struct sockaddr *)&cliaddr, len);
 				if (rv < 0)
 					err(1, "connect");
 
@@ -332,6 +332,21 @@
 				    &len);
 			}
 
+			if(vflag) {
+				/* Don't look up port if -n. */
+				if (nflag)
+					sv = NULL;
+				else 
+					sv = getservbyport(ntohs(atoi(uport)),
+						uflag ? "udp" : "tcp");
+
+				fprintf(stderr, "Connection from %s port %s [%s/%s] accepted\n", 
+					inet_ntoa(((struct sockaddr_in *)(&cliaddr))->sin_addr),
+					uport,
+					uflag ? "udp" : "tcp", 
+					sv ? sv->s_name : "*");
+			}
+
 			readwrite(connfd);
 			close(connfd);
 			if (family != AF_UNIX)


Index: nc.spec
===================================================================
RCS file: /cvs/dist/rpms/nc/devel/nc.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nc.spec	28 Aug 2006 11:31:40 -0000	1.30
+++ nc.spec	29 Aug 2006 08:47:21 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Reads and writes data across network connections using TCP or UDP.
 Name: nc
 Version: 1.84
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL:	 http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
 Source0: nc-%{version}.tar.bz2
 Patch0: nc-1.84-glib.patch
@@ -12,6 +12,7 @@
 Patch5: nc-1.84-udp_stop.patch
 Patch6: nc-1.84-udp_port_scan.patch
 Patch7: nc-1.84-crlf.patch
+Patch8: nc-1.84-verb.patch
 License: GPL
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-root
@@ -41,6 +42,7 @@
 %patch5 -p1 -b .udp_stop
 %patch6 -p0 -b .port_scan
 %patch7 -p1 -b .crlf
+%patch8 -p1 -b .verb
 
 %build
 gcc $RPM_OPT_FLAGS -Werror `pkg-config --cflags --libs glib-2.0` netcat.c atomicio.c socks.c -o nc
@@ -62,6 +64,9 @@
 %doc README scripts
 
 %changelog
+* Tue Aug 29 2006 Radek Vokal <rvokal at redhat.com> - 1.84-8
+- fix verbose option (#202321) <varmojfekoj at gmail.com>
+
 * Mon Aug 28 2006 Radek Vokal <rvokal at redhat.com> - 1.84-7
 - add dist tag
 - add '-C' option and behaviour for sending CRLFs as line-ending (#203931) <koszorus at reidea.hu>



From fedora-cvs-commits at redhat.com  Tue Aug 29 10:05:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 06:05:06 -0400
Subject: rpms/authconfig/devel .cvsignore, 1.50, 1.51 authconfig.spec, 1.66,
	1.67 sources, 1.57, 1.58
Message-ID: <200608291005.k7TA56Cg026410@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26381

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Tue Aug 29 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.5-1
- improve smart card related UI strings
- removed possibility to set smart card type from authconfig-gtk
  as only coolkey will be supported for now



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	24 Aug 2006 20:06:10 -0000	1.50
+++ .cvsignore	29 Aug 2006 10:05:01 -0000	1.51
@@ -1 +1 @@
-authconfig-5.3.4.tar.bz2
+authconfig-5.3.5.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- authconfig.spec	24 Aug 2006 20:06:10 -0000	1.66
+++ authconfig.spec	29 Aug 2006 10:05:01 -0000	1.67
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.3.4
+Version: 5.3.5
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
 Release: 1
@@ -95,6 +95,11 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Aug 29 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.5-1
+- improve smart card related UI strings
+- removed possibility to set smart card type from authconfig-gtk
+  as only coolkey will be supported for now
+
 * Thu Aug 24 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.4-1
 - pass options given to authconfig-gtk to authconfig (#203955)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	24 Aug 2006 20:06:10 -0000	1.57
+++ sources	29 Aug 2006 10:05:02 -0000	1.58
@@ -1 +1 @@
-359c929306509705ef9cfb70cc01776f  authconfig-5.3.4.tar.bz2
+105ad5d2e482062be322f13f538f7f09  authconfig-5.3.5.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 29 10:52:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 06:52:50 -0400
Subject: rpms/sudo/FC-4 sudo.spec,1.27,1.28
Message-ID: <200608291052.k7TAqoLc007210@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/sudo/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7193

Modified Files:
	sudo.spec 
Log Message:
spec file changelog fix



Index: sudo.spec
===================================================================
RCS file: /cvs/dist/rpms/sudo/FC-4/sudo.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sudo.spec	16 Dec 2005 10:31:28 -0000	1.27
+++ sudo.spec	29 Aug 2006 10:52:48 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: Allows restricted root access for specified users.
 Name: sudo
 Version: 1.6.8p8
-Release: 2.4
+Release: 2.5
 License: BSD
 Group: Applications/System
 Source: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
@@ -119,7 +119,10 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
-* Fri Dec 16 2006 Karel Zak <kzak at redhat.com> 1.6.8p8-2.4
+* Tue Aug 29 2006 Peter Vrabec <pvrabec at redhat.com> 1.6.8p8-2.5
+- spec file changelog fix
+
+* Fri Dec 16 2005 Karel Zak <kzak at redhat.com> 1.6.8p8-2.4
 - fix #175295 - SECURITY: CRM 764618: Perl scripts run via Sudo can be subverted
 
 * Tue Oct 25 2005 Karel Zak <kzak at redhat.com> 1.6.8p8-2.3



From fedora-cvs-commits at redhat.com  Tue Aug 29 11:18:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 07:18:38 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.864,1.865
Message-ID: <200608291118.k7TBIcIw002993@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2880

Modified Files:
	openoffice.org.spec 
Log Message:
rh#203872#


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.864
retrieving revision 1.865
diff -u -r1.864 -r1.865
--- openoffice.org.spec	28 Aug 2006 10:26:12 -0000	1.864
+++ openoffice.org.spec	29 Aug 2006 11:18:35 -0000	1.865
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 2
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -125,6 +125,7 @@
 Patch57: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
 Patch58: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
 Patch59: openoffice.org-2.0.4.ooo68919.sc.atk.patch
+Patch60: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -984,6 +985,7 @@
 %patch57 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
 %patch58 -p1 -b .ooo54603.fontconfig.part3.patch
 %patch59 -p1 -b .ooo68919.sc.atk.patch
+%patch60 -p1 -b .ooo69051.vcl.singlekeypress.patch
 
 tar xzf %{SOURCE1}
 
@@ -1001,6 +1003,7 @@
 fi
 cd config_office
 autoconf
+export PATH=$PATH:/usr/sbin
 export GREP="/bin/grep"
 %configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-agg --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
 cd ..
@@ -2508,6 +2511,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Aug 29 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-2.3
+- rh#203872# -> openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+
 * Mon Aug 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-2.2
 - rh#203063# Glyph replacement work when single run has multiple fonts
 - rh#204173# Crash on Glyph replacement when single run has single glyph



From fedora-cvs-commits at redhat.com  Tue Aug 29 11:58:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 07:58:14 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.323, 1.324 anaconda.spec, 1.449,
	1.450 sources, 1.446, 1.447
Message-ID: <200608291158.k7TBwEe2029988@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29935/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.85-1 on branch devel from anaconda-11.1.0.85-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- .cvsignore	24 Aug 2006 02:06:27 -0000	1.323
+++ .cvsignore	29 Aug 2006 11:58:11 -0000	1.324
@@ -1 +1 @@
-anaconda-11.1.0.84.tar.bz2
+anaconda-11.1.0.85.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- anaconda.spec	24 Aug 2006 02:06:27 -0000	1.449
+++ anaconda.spec	29 Aug 2006 11:58:11 -0000	1.450
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.84
+Version: 11.1.0.85
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,17 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Aug 29 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.85-1
+- Sanity check more device names for LVM (notting, #2040387)
+- Exception handling fixes (clumens)
+- Fix Extras selection (clumens, #204267)
+- Setup repos later
+- Improved verbage (Paul Frields, #204249)
+- Filter out some non-addressable storage from hd dict (pjones)
+- Handle xen virtual serial
+- Reset file contexts on mountpoints (#202525)
+- Ensure programs used by anaconda are installed (clumens, #203216)
+
 * Wed Aug 23 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.84-1
 - Run in English for CJKI text installs (clumens, #180417, #202738)
 - Don't mistake hard drives for CD drives (clumens, #202714)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- sources	24 Aug 2006 02:06:27 -0000	1.446
+++ sources	29 Aug 2006 11:58:11 -0000	1.447
@@ -1 +1 @@
-d1b652ed36613668ee34d4b4db7c440b  anaconda-11.1.0.84.tar.bz2
+90b89ed54b29b3c7e6b96dadf6cf92ed  anaconda-11.1.0.85.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 29 12:00:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 08:00:17 -0400
Subject: rpms/inn/devel inn.spec,1.33,1.34 innd.init,1.4,1.5
Message-ID: <200608291200.k7TC0HYY030531@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/inn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30509

Modified Files:
	inn.spec innd.init 
Log Message:
added dist tag, added patch from #204371 - innd.init script should use ctlinnd to stop the server


Index: inn.spec
===================================================================
RCS file: /cvs/dist/rpms/inn/devel/inn.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- inn.spec	17 Jul 2006 23:39:54 -0000	1.33
+++ inn.spec	29 Aug 2006 12:00:12 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server.
 Name: inn
 Version: 2.4.3
-Release: 5
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -291,6 +291,11 @@
 %{_mandir}/man1/inews*
 
 %changelog
+* Tue Aug 29 2006 Martin Stransky <stransky at redhat.com> 2.4.3-6
+- added dist tag
+- added patch from #204371 - innd.init script should use 
+  ctlinnd to stop the server
+
 * Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-5
 - rebuild
 


Index: innd.init
===================================================================
RCS file: /cvs/dist/rpms/inn/devel/innd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- innd.init	9 Sep 2004 06:17:10 -0000	1.4
+++ innd.init	29 Aug 2006 12:00:15 -0000	1.5
@@ -42,8 +42,16 @@
 
 stop() {
         if [ -f /var/run/news/innd.pid ]; then
-                echo -n $"Stopping INND service: "
-                killproc innd
+                echo -n $"Stopping INND service (gently): "
+		if "${NEWSBIN}/ctlinnd" -s -t 60 throttle shutting down &&
+		   sleep 30 &&
+		   "${NEWSBIN}/ctlinnd" -s -t 60 shutdown shutting down; then
+			success $"innd shutdown"
+		else
+			failure $"innd shutdown"
+	                echo -n $"Stopping INND service (the hard way): "
+	                killproc innd
+		fi
                 RETVAL=$?
                 [ $RETVAL -eq 0 ] && rm -f /var/run/news/innd.pid
                 echo



From fedora-cvs-commits at redhat.com  Tue Aug 29 12:32:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 08:32:36 -0400
Subject: rpms/scim-hangul/devel scim-hangul-update-caret.patch, NONE,
	1.1 scim-hangul.spec, 1.22, 1.23
Message-ID: <200608291232.k7TCWZ6f020646@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-hangul/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20619

Modified Files:
	scim-hangul.spec 
Added Files:
	scim-hangul-update-caret.patch 
Log Message:
* Tue Aug 29 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-7
- scim-hangul-update-caret.patch: backported from CVS to update the caret.
  (#198721)

scim-hangul-update-caret.patch:
 scim_hangul_imengine.cpp |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE scim-hangul-update-caret.patch ---
Index: src/scim_hangul_imengine.cpp
===================================================================
RCS file: /cvsroot/scim/scim-hangul/src/scim_hangul_imengine.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- src/scim_hangul_imengine.cpp	24 Jul 2006 13:42:15 -0000	1.10
+++ src/scim_hangul_imengine.cpp	24 Jul 2006 15:03:57 -0000	1.11
@@ -637,6 +637,7 @@
         attrs.push_back (Attribute (0, wstr.length (), SCIM_ATTR_DECORATE, SCIM_ATTR_DECORATE_REVERSE));
         show_preedit_string ();
         update_preedit_string (wstr, attrs);
+        update_preedit_caret (wstr.length());
     } else {
         hide_preedit_string ();
     }


Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/devel/scim-hangul.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- scim-hangul.spec	24 Jul 2006 16:55:12 -0000	1.22
+++ scim-hangul.spec	29 Aug 2006 12:32:29 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           scim-hangul
 Version:        0.2.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 License:        GPL
 URL:            http://www.scim-im.org/
@@ -15,6 +15,7 @@
 Patch0:		scim-hangul-0.2.2-ascii-mode.patch
 Patch1:		scim-hangul-0.2.2-help.patch
 Patch2:		scim-hangul-0.2.2-swap-keybinding.patch
+Patch3:		scim-hangul-update-caret.patch
 
 
 Summary:        Hangul Input Method Engine for SCIM
@@ -30,6 +31,7 @@
 %patch0 -p1 -b .0-ascii-mode
 %patch1 -p1 -b .1-help
 %patch2 -p1 -b .2-swap-key
+%patch3 -p0 -b .3-update-caret
 
 
 %build
@@ -69,6 +71,10 @@
 
 
 %changelog
+* Tue Aug 29 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-7
+- scim-hangul-update-caret.patch: backported from CVS to update the caret.
+  (#198721)
+
 * Tue Jul 25 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-6
 - scim-hangul-0.2.2-swap-keybinding.patch: swap the keybindings to move
   the cursor on the candidate window according to the candidate window's



From fedora-cvs-commits at redhat.com  Tue Aug 29 12:53:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 08:53:44 -0400
Subject: rpms/ruby/devel ruby.spec,1.83,1.84
Message-ID: <200608291253.k7TCriQj007623@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7585

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ruby.spec	28 Aug 2006 14:55:58 -0000	1.83
+++ ruby.spec	29 Aug 2006 12:53:41 -0000	1.84
@@ -297,6 +297,12 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{sitedir2}/%{rubyxver}
 %{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
 
+%ifarch ppc64 s390x sparc64 x86_64
+# correct archdir
+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
+
 # XXX: installing irb
 install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 12:59:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 08:59:59 -0400
Subject: rpms/selinux-policy/devel policy-20060802.patch,1.22,1.23
Message-ID: <200608291259.k7TCxxfS009192@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9160

Modified Files:
	policy-20060802.patch 
Log Message:
* Mon Aug 28 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-6
- Fix install problems


policy-20060802.patch:
 policy/modules/admin/amanda.fc                            |   51 -
 policy/modules/admin/anaconda.te                          |   20 
 policy/modules/admin/bootloader.te                        |    4 
 policy/modules/admin/consoletype.te                       |   11 
 policy/modules/admin/firstboot.te                         |    2 
 policy/modules/admin/prelink.te                           |    2 
 policy/modules/admin/rpm.fc                               |    2 
 policy/modules/admin/rpm.if                               |   13 
 policy/modules/admin/usermanage.te                        |    5 
 policy/modules/apps/java.fc                               |    9 
 policy/modules/apps/mozilla.if                            |    2 
 policy/modules/apps/wine.te                               |    2 
 policy/modules/kernel/corecommands.fc                     |    1 
 policy/modules/kernel/corecommands.if                     |    1 
 policy/modules/kernel/corenetwork.te.in                   |    7 
 policy/modules/kernel/devices.fc                          |    4 
 policy/modules/kernel/devices.if                          |   36 +
 policy/modules/kernel/devices.te                          |    8 
 policy/modules/kernel/files.if                            |   18 
 policy/modules/kernel/filesystem.te                       |    2 
 policy/modules/kernel/kernel.if                           |   75 ++
 policy/modules/kernel/terminal.fc                         |    2 
 policy/modules/kernel/terminal.if                         |   19 
 policy/modules/services/amavis.te                         |    7 
 policy/modules/services/apache.te                         |    2 
 policy/modules/services/avahi.te                          |    2 
 policy/modules/services/bind.te                           |    1 
 policy/modules/services/ccs.fc                            |    8 
 policy/modules/services/ccs.if                            |   45 +
 policy/modules/services/ccs.te                            |   84 +++
 policy/modules/services/cpucontrol.te                     |    2 
 policy/modules/services/cron.if                           |   17 
 policy/modules/services/cron.te                           |    7 
 policy/modules/services/cups.te                           |   19 
 policy/modules/services/cyrus.te                          |    5 
 policy/modules/services/dbus.if                           |    6 
 policy/modules/services/dbus.te                           |    2 
 policy/modules/services/dovecot.te                        |    4 
 policy/modules/services/inn.te                            |    1 
 policy/modules/services/ldap.te                           |    2 
 policy/modules/services/mta.fc                            |    2 
 policy/modules/services/ntp.te                            |    6 
 policy/modules/services/oddjob.fc                         |    8 
 policy/modules/services/oddjob.if                         |   76 ++
 policy/modules/services/oddjob.te                         |   70 ++
 policy/modules/services/oddjob_mkhomedir.fc               |    6 
 policy/modules/services/oddjob_mkhomedir.if               |   24 
 policy/modules/services/oddjob_mkhomedir.te               |   26 
 policy/modules/services/openvpn.te                        |    2 
 policy/modules/services/pegasus.if                        |   31 +
 policy/modules/services/pegasus.te                        |    5 
 policy/modules/services/postfix.te                        |    7 
 policy/modules/services/postgresql.te                     |    1 
 policy/modules/services/procmail.te                       |    1 
 policy/modules/services/pyzor.te                          |    1 
 policy/modules/services/radius.te                         |    2 
 policy/modules/services/ricci.fc                          |   20 
 policy/modules/services/ricci.if                          |  184 ++++++
 policy/modules/services/ricci.te                          |  373 ++++++++++++++
 policy/modules/services/rpc.if                            |    2 
 policy/modules/services/rpc.te                            |    6 
 policy/modules/services/samba.te                          |    8 
 policy/modules/services/setroubleshoot.fc                 |    9 
 policy/modules/services/setroubleshoot.if                 |    3 
 policy/modules/services/setroubleshoot.te                 |  112 ++++
 policy/modules/services/squid.te                          |    4 
 policy/modules/services/ssh.if                            |   24 
 policy/modules/services/stunnel.te                        |    2 
 policy/modules/services/sysstat.te                        |    3 
 policy/modules/services/xserver.if                        |   69 ++
 policy/modules/services/xserver.te                        |   19 
 policy/modules/system/authlogin.te                        |   10 
 policy/modules/system/fstools.te                          |    1 
 policy/modules/system/hostname.te                         |   10 
 policy/modules/system/init.if                             |    7 
 policy/modules/system/init.te                             |    2 
 policy/modules/system/libraries.fc                        |    7 
 policy/modules/system/locallogin.te                       |    4 
 policy/modules/system/logging.fc                          |    3 
 policy/modules/system/logging.if                          |   21 
 policy/modules/system/logging.te                          |    3 
 policy/modules/system/lvm.fc                              |    2 
 policy/modules/system/lvm.te                              |    6 
 policy/modules/system/miscfiles.fc                        |    1 
 policy/modules/system/miscfiles.if                        |   18 
 policy/modules/system/modutils.te                         |    1 
 policy/modules/system/mount.te                            |    9 
 policy/modules/system/selinuxutil.te                      |   13 
 policy/modules/system/udev.fc                             |    1 
 policy/modules/system/udev.te                             |    5 
 policy/modules/system/unconfined.fc                       |    1 
 policy/modules/system/unconfined.if                       |    2 
 policy/modules/system/unconfined.te                       |    5 
 policy/modules/system/userdomain.if                       |  246 ++++++---
 policy/modules/system/userdomain.te                       |   48 -
 policy/modules/system/xen.if                              |   38 +
 policy/modules/system/xen.te                              |   26 
 serefpolicy-2.3.9/policy/mls                              |    9 
 serefpolicy-2.3.9/policy/modules/admin/bootloader.fc      |    2 
 serefpolicy-2.3.9/policy/modules/admin/firstboot.te       |   10 
 serefpolicy-2.3.9/policy/modules/apps/mono.te             |    1 
 serefpolicy-2.3.9/policy/modules/kernel/corecommands.fc   |    2 
 serefpolicy-2.3.9/policy/modules/kernel/files.fc          |    1 
 serefpolicy-2.3.9/policy/modules/services/spamassassin.te |    4 
 104 files changed, 1883 insertions(+), 252 deletions(-)

Index: policy-20060802.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060802.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- policy-20060802.patch	28 Aug 2006 21:49:05 -0000	1.22
+++ policy-20060802.patch	29 Aug 2006 12:59:56 -0000	1.23
@@ -3737,7 +3737,7 @@
 -allow firstboot_t firstboot_rw_t:file create_file_perms;
 -files_etc_filetrans(firstboot_t,firstboot_rw_t,file)
 +files_manage_etc_runtime_files(firstboot_t)
-+files_etc_filetrans_etc_runtime(firstboot_t)
++files_etc_filetrans_etc_runtime(firstboot_t, { file dir })
  
  # The big hammer
  unconfined_domain(firstboot_t) 



From fedora-cvs-commits at redhat.com  Tue Aug 29 14:27:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 10:27:36 -0400
Subject: rpms/cups/devel cups.spec, 1.255, 1.256 cups-dest-cache-v2.patch,
	1.3, NONE
Message-ID: <200608291427.k7TERaFj014463@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14450

Modified Files:
	cups.spec 
Removed Files:
	cups-dest-cache-v2.patch 
Log Message:
* Thu Aug 29 2006 Tim Waugh <twaugh at redhat.com>
- Removed dest-cache patch.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- cups.spec	24 Aug 2006 16:17:52 -0000	1.255
+++ cups.spec	29 Aug 2006 14:27:33 -0000	1.256
@@ -36,7 +36,6 @@
 Patch11: cups-paps.patch
 Patch12: cups-language.patch
 Patch13: cups-direct-usb.patch
-Patch14: cups-dest-cache-v2.patch
 Patch15: cups-maxlogsize.patch
 Patch16: cups-pid.patch
 Patch17: cups-relro.patch
@@ -138,7 +137,6 @@
 %patch11 -p1 -b .paps
 %patch12 -p1 -b .language
 %patch13 -p1 -b .direct-usb
-%patch14 -p1 -b .dest-cache-v2
 %patch15 -p1 -b .maxlogsize
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .relro
@@ -420,6 +418,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 29 2006 Tim Waugh <twaugh at redhat.com>
+- Removed dest-cache patch.
+
 * Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-17
 - Fixed another LSPP patch problem (bug #203784).
 - Updated fix for STR #1881 from upstream.


--- cups-dest-cache-v2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 29 14:30:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 10:30:33 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.156,1.157
Message-ID: <200608291430.k7TEUXWL014515@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14501

Modified Files:
	mkinitrd.spec 
Log Message:
BuildRequires parted-devel >= 1.7.1-15



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- mkinitrd.spec	18 Aug 2006 20:54:24 -0000	1.156
+++ mkinitrd.spec	29 Aug 2006 14:30:31 -0000	1.157
@@ -4,7 +4,7 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 5.1.9
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -17,7 +17,7 @@
 Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
 Requires: e2fsprogs >= 1.38-12, glib2, libselinux, libsepol
-BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-9, pkgconfig, glib2-devel
+BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-15, pkgconfig, glib2-devel
 BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.9
 BuildRequires: device-mapper libselinux-devel libsepol-devel, python-devel >= %{pyver}
 %ifnarch s390 s390x
@@ -118,6 +118,9 @@
 /%{python_sitelib}/bdevid.so
 
 %changelog
+* Tue Aug 29 2006 David Cantrell <dcantrell at redhat.com> - 5.1.9-2
+- BuildRequires parted-devel >= 1.7.1-15
+
 * Fri Aug 17 2006 Peter Jones <pjones at redhat.com> - 5.1.9-1
 - Fix "MOUNT_PROC_USB" warning
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 14:58:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 10:58:26 -0400
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xorg-x11-drv-ati.spec, 1.42,
	1.43 mach64-cpio-for-ia64.patch, 1.1,
	NONE radeon-6.6.1-no-dri-on-rn50.patch, 1.1,
	NONE radeon-6.6.1-xpress-200.patch, 1.1, NONE
Message-ID: <200608291458.k7TEwQjY011442@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11403/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Removed Files:
	mach64-cpio-for-ia64.patch radeon-6.6.1-no-dri-on-rn50.patch 
	radeon-6.6.1-xpress-200.patch 
Log Message:
auto-import xorg-x11-drv-ati-6.6.2-1.fc6 on branch devel from xorg-x11-drv-ati-6.6.2-1.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Jun 2006 07:02:56 -0000	1.11
+++ .cvsignore	29 Aug 2006 14:58:23 -0000	1.12
@@ -1 +1 @@
-xf86-video-ati-6.6.1.tar.bz2
+xf86-video-ati-6.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Jun 2006 07:02:56 -0000	1.11
+++ sources	29 Aug 2006 14:58:24 -0000	1.12
@@ -1 +1 @@
-76445561906956fee384017e22d803ae  xf86-video-ati-6.6.1.tar.bz2
+f295ceb5d9317c8a0e8e212974b1b05a  xf86-video-ati-6.6.2.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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xorg-x11-drv-ati.spec	24 Aug 2006 23:05:10 -0000	1.42
+++ xorg-x11-drv-ati.spec	29 Aug 2006 14:58:24 -0000	1.43
@@ -12,8 +12,8 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.6.1
-Release:   11%{?dist}
+Version:   6.6.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -26,15 +26,12 @@
 
 # Radeon patches (0-99)
 Patch0:    radeon-6.6.1-dotclock-filter.patch
-Patch1:    radeon-6.6.1-no-dri-on-rn50.patch
-Patch2:    radeon-6.6.1-xpress-200.patch
-Patch3:	   radeon-6.6.1-use-mtdriver.patch
+Patch1:	   radeon-6.6.1-use-mtdriver.patch
 
 # Rage 128 patches (100-199)
 Patch100:  r128-missing-xf86ForceHWCursor-symbol-bug168753.patch
 
 # mach64 patches (200-299)
-Patch200:  mach64-cpio-for-ia64.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
@@ -54,11 +51,8 @@
 %setup -q -n %{tarball}-%{version}
 
 %patch0 -p1 -b .dotclock-filter
-%patch1 -p1 -b .rn50-dri
-%patch2 -p1 -b .xpress-200
-%patch3 -p1 -b .mtdriver
+%patch1 -p1 -b .mtdriver
 %patch100 -p0 -b .r128-missing-xf86ForceHWCursor-symbol-bug168753
-%patch200 -p1 -b .mach64-for-ia64
 
 %build
 %configure --disable-static
@@ -102,6 +96,12 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Aug 29 2006 Adam Jackson <ajackson at redhat.com> 6.6.2-1.fc6
+- Update to 6.6.2 from upstream:
+  - Mach64 stability and correctness fixes
+  - Mach64 EXA support.
+  - Misc bugfixes for radeon.
+
 * Thu Aug 24 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-11.fc6
 - radeon-6.6.1-use-mtdriver.patch: Only flag modes with M_T_PREFERRED if
   the EDID blocks says to.


--- mach64-cpio-for-ia64.patch DELETED ---


--- radeon-6.6.1-no-dri-on-rn50.patch DELETED ---


--- radeon-6.6.1-xpress-200.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 29 15:14:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 11:14:29 -0400
Subject: rpms/gjdoc/devel gjdoc.spec,1.40,1.41
Message-ID: <200608291514.k7TFETVt014956@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14852

Modified Files:
	gjdoc.spec 
Log Message:

Rebuilding.




Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gjdoc.spec	22 Jul 2006 08:39:06 -0000	1.40
+++ gjdoc.spec	29 Aug 2006 15:14:27 -0000	1.41
@@ -1,6 +1,6 @@
 Name: gjdoc
 Version: 0.7.7
-Release: 7
+Release: 8
 URL: http://savannah.gnu.org/projects/classpath/
 License: GPL
 Summary: GNU Javadoc
@@ -53,6 +53,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Aug 29 2006 Deepak Bhole <dbhole at redhat.com> - 0.7.7-8
+- Rebuilt.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0.7.7-7
 - Remove hack-libgcj requirement.
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 15:52:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 11:52:03 -0400
Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.59,
	1.60 sources, 1.72, 1.73 system-config-securitylevel.spec,
	1.83, 1.84
Message-ID: <200608291552.k7TFq3J1022684@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-securitylevel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22536

Modified Files:
	.cvsignore sources system-config-securitylevel.spec 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	20 Jul 2006 19:15:17 -0000	1.59
+++ .cvsignore	29 Aug 2006 15:52:01 -0000	1.60
@@ -47,3 +47,4 @@
 system-config-securitylevel-1.6.21.tar.bz2
 system-config-securitylevel-1.6.22.tar.bz2
 system-config-securitylevel-1.6.23.tar.bz2
+system-config-securitylevel-1.6.24.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	20 Jul 2006 19:15:17 -0000	1.72
+++ sources	29 Aug 2006 15:52:01 -0000	1.73
@@ -1 +1 @@
-701347260923c7e4587aec457c3fac18  system-config-securitylevel-1.6.23.tar.bz2
+3f79b2564595aff2951bdaff195a75ec  system-config-securitylevel-1.6.24.tar.bz2


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- system-config-securitylevel.spec	20 Jul 2006 19:15:17 -0000	1.83
+++ system-config-securitylevel.spec	29 Aug 2006 15:52:01 -0000	1.84
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
-Version: 1.6.23
+Version: 1.6.24
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -93,6 +93,9 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Tue Aug 29 2006 Chris Lumens <clumens at redhat.com> 1.6.24-1
+- Add a debugging error dialog in case setsebool fails.
+
 * Thu Jul 20 2006 Chris Lumens <clumens at redhat.com> 1.6.23-1
 - Add NFSv4 as a trusted service (#138138).
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 15:56:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 11:56:17 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.ooo69068.parallelxslt.patch, NONE,
	1.1 openoffice.org.spec, 1.865, 1.866
Message-ID: <200608291556.k7TFuHtr024323@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24239

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo69068.parallelxslt.patch 
Log Message:
fix annoying parallel build failure

openoffice.org-2.0.4.ooo69068.parallelxslt.patch:
 filter/source/xsltvalidate/makefile.mk |    4 ----
 source/xsltvalidate/makefile.mk        |    0 
 2 files changed, 4 deletions(-)

--- NEW FILE openoffice.org-2.0.4.ooo69068.parallelxslt.patch ---
Index: source/xsltvalidate/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/xsltvalidate/makefile.mk,v
retrieving revision 1.11
diff -u -r1.11 makefile.mk
--- openoffice.org.orig/filter/source/xsltvalidate/makefile.mk	19 Apr 2006 15:08:31 -0000	1.11
+++ openoffice.org/filter/source/xsltvalidate/makefile.mk	29 Aug 2006 15:48:34 -0000
@@ -74,8 +74,4 @@
 # --- Targets ------------------------------------------------------  
 .IF "$(SOLAR_JAVA)"!=""
 .INCLUDE :  target.mk 
-$(JAVACLASSFILES) : $(CLASSDIR)
 .ENDIF
-  
-$(CLASSDIR) :
-	$(MKDIR) $(CLASSDIR)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.865
retrieving revision 1.866
diff -u -r1.865 -r1.866
--- openoffice.org.spec	29 Aug 2006 11:18:35 -0000	1.865
+++ openoffice.org.spec	29 Aug 2006 15:56:15 -0000	1.866
@@ -126,6 +126,7 @@
 Patch58: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
 Patch59: openoffice.org-2.0.4.ooo68919.sc.atk.patch
 Patch60: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch61: openoffice.org-2.0.4.ooo69068.parallelxslt.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -986,6 +987,7 @@
 %patch58 -p1 -b .ooo54603.fontconfig.part3.patch
 %patch59 -p1 -b .ooo68919.sc.atk.patch
 %patch60 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch61 -p1 -b .ooo69068.parallelxslt.patch
 
 tar xzf %{SOURCE1}
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 17:19:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 13:19:08 -0400
Subject: rpms/php/devel php-5.0.4-tests-dashn.patch, 1.3, 1.4 php.ini, 1.3,
	1.4 php.spec, 1.116, 1.117 sources, 1.28, 1.29
Message-ID: <200608291719.k7THJ8Vl017797@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17780

Modified Files:
	php-5.0.4-tests-dashn.patch php.ini php.spec sources 
Log Message:
* Tue Aug 29 2006 Joe Orton <jorton at redhat.com> 5.1.6-9
- update to 5.1.6 (security fixes)
- bump default memory_limit to 16M (#196802)


php-5.0.4-tests-dashn.patch:
 standard/tests/file/bug26615.phpt    |    2 +-
 standard/tests/file/bug26938.phpt    |    2 +-
 standard/tests/file/proc_open01.phpt |    2 +-
 xml/tests/bug32001.phpt              |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Index: php-5.0.4-tests-dashn.patch
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php-5.0.4-tests-dashn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-5.0.4-tests-dashn.patch	29 Nov 2005 17:08:03 -0000	1.3
+++ php-5.0.4-tests-dashn.patch	29 Aug 2006 17:18:57 -0000	1.4
@@ -50,14 +50,3 @@
  print_r($out);
  ?>
  --EXPECT--
---- php-5.1.1/run-tests.php.tests-dashn
-+++ php-5.1.1/run-tests.php
-@@ -184,7 +184,7 @@
- 	settings2params($info_params);
- 	$php_info = `$php $pass_options $info_params $info_file`;
- 	@unlink($info_file);
--	define('TESTED_PHP_VERSION', `$php -r 'echo PHP_VERSION;'`);
-+	define('TESTED_PHP_VERSION', `$php $pass_options -r 'echo PHP_VERSION;'`);
- 
- 	// check for extensions that need special handling and regenerate
- 	$php_extensions = '<?php echo join(",",get_loaded_extensions()); ?>'; 


Index: php.ini
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php.ini	3 May 2006 12:59:06 -0000	1.3
+++ php.ini	29 Aug 2006 17:18:57 -0000	1.4
@@ -311,7 +311,7 @@
 
 max_execution_time = 30     ; Maximum execution time of each script, in seconds
 max_input_time = 60	; Maximum amount of time each script may spend parsing request data
-memory_limit = 8M      ; Maximum amount of memory a script may consume (8MB)
+memory_limit = 16M      ; Maximum amount of memory a script may consume
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- php.spec	12 Jul 2006 07:49:01 -0000	1.116
+++ php.spec	29 Aug 2006 17:18:57 -0000	1.117
@@ -4,8 +4,8 @@
 
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
-Version: 5.1.4
-Release: 8.1
+Version: 5.1.6
+Release: 1
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -604,7 +604,11 @@
 %files pdo -f files.pdo
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+* Tue Aug 29 2006 Joe Orton <jorton at redhat.com> 5.1.6-9
+- update to 5.1.6 (security fixes)
+- bump default memory_limit to 16M (#196802)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.1.4-8.1
 - rebuild
 
 * Fri Jun  9 2006 Joe Orton <jorton at redhat.com> 5.1.4-8


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/php/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	8 May 2006 12:18:34 -0000	1.28
+++ sources	29 Aug 2006 17:18:58 -0000	1.29
@@ -1 +1 @@
-4b7c93c9730ef7807f59732697470dad  php-5.1.4.tar.gz
+04d6166552289eaeff771f5ec953b065  php-5.1.6.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 29 17:21:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 13:21:30 -0400
Subject: rpms/php/devel php.spec,1.117,1.118
Message-ID: <200608291721.k7THLU0F017959@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17946

Modified Files:
	php.spec 
Log Message:
- bump the release



Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- php.spec	29 Aug 2006 17:18:57 -0000	1.117
+++ php.spec	29 Aug 2006 17:21:27 -0000	1.118
@@ -5,7 +5,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.6
-Release: 1
+Release: 2
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -604,7 +604,7 @@
 %files pdo -f files.pdo
 
 %changelog
-* Tue Aug 29 2006 Joe Orton <jorton at redhat.com> 5.1.6-9
+* Tue Aug 29 2006 Joe Orton <jorton at redhat.com> 5.1.6-2
 - update to 5.1.6 (security fixes)
 - bump default memory_limit to 16M (#196802)
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 17:28:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 13:28:10 -0400
Subject: rpms/kernel/devel config-olpc-generic,1.4,1.5
Message-ID: <200608291728.k7THSA7M018087@cvs.devel.redhat.com>

Author: mtosatti

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18066

Modified Files:
	config-olpc-generic 
Log Message:
Enable CONFIG_PTRACE in config-olpc-generic




Index: config-olpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/config-olpc-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-olpc-generic	29 Aug 2006 03:28:46 -0000	1.4
+++ config-olpc-generic	29 Aug 2006 17:28:07 -0000	1.5
@@ -15,7 +15,7 @@
 
 # CONFIG_MODULE_SIG is not set
 # CONFIG_UTRACE is not set
-# CONFIG_PTRACE is not set
+CONFIG_PTRACE=y
 
 CONFIG_EMBEDDED=y
 # CONFIG_BASE_FULL is not set



From fedora-cvs-commits at redhat.com  Tue Aug 29 17:33:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 13:33:44 -0400
Subject: rpms/yelp/devel yelp-2.15.91-use-pango.patch, NONE, 1.1 yelp.spec,
	1.73, 1.74
Message-ID: <200608291733.k7THXi0f018291@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18275

Modified Files:
	yelp.spec 
Added Files:
	yelp-2.15.91-use-pango.patch 
Log Message:
use pango


yelp-2.15.91-use-pango.patch:
 yelp-main.c |   12 ------------
 1 files changed, 12 deletions(-)

--- NEW FILE yelp-2.15.91-use-pango.patch ---
--- yelp-2.15.91/src/yelp-main.c.use-pango	2006-08-29 12:18:35.000000000 -0400
+++ yelp-2.15.91/src/yelp-main.c	2006-08-29 12:19:07.000000000 -0400
@@ -403,18 +403,6 @@
         }
 
 	if (private || !main_is_running ()) {
-		const gchar          *env;
-
-		/* workaround for bug #329461 */
-		env = g_getenv ("MOZ_ENABLE_PANGO");
-		
-		if (env == NULL ||
-		    *env == '\0' ||
-		    g_str_equal(env, "0")) 
-			{
-				g_setenv ("MOZ_DISABLE_PANGO", "1", TRUE);
-			}
-		
 		if (session_started) {
 			main_restore_session ();
 		} else {


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- yelp.spec	23 Aug 2006 19:34:38 -0000	1.73
+++ yelp.spec	29 Aug 2006 17:33:41 -0000	1.74
@@ -19,7 +19,7 @@
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
 Version: 2.15.91
-Release: 2
+Release: 3%{?dist}
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -130,6 +130,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Tue Aug 29 2006 Matthias Clasen  <mclasen at redhat.com> - 2.15.91-3.fc6
+- Use Pango 
+
 * Wed Aug 23 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.91-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 17:48:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 13:48:47 -0400
Subject: rpms/epiphany/devel epiphany-2.15.92-use-pango.patch, NONE,
	1.1 epiphany.spec, 1.115, 1.116
Message-ID: <200608291748.k7THmlrs001413@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1397

Modified Files:
	epiphany.spec 
Added Files:
	epiphany-2.15.92-use-pango.patch 
Log Message:
Use Pango


epiphany-2.15.92-use-pango.patch:
 data/epiphany-pango.schemas |   38 +-------------------------------------
 src/ephy-main.c             |    8 +-------
 2 files changed, 2 insertions(+), 44 deletions(-)

--- NEW FILE epiphany-2.15.92-use-pango.patch ---
--- epiphany-2.15.92/src/ephy-main.c.use-pango	2006-08-29 13:37:08.000000000 -0400
+++ epiphany-2.15.92/src/ephy-main.c	2006-08-29 13:38:19.000000000 -0400
@@ -685,18 +685,12 @@
 	gtk_about_dialog_set_url_hook (handle_url, NULL, NULL);
 	gtk_about_dialog_set_email_hook (handle_email, NULL, NULL);
 
-	/* Work around bug #328844, and avoid the gecko+pango performance problem */
-	env = g_getenv ("MOZ_ENABLE_PANGO");
-	enable_pango = env != NULL &&
-		       env[0] != '\0' &&
-		       g_ascii_strtoull (env, NULL, 10) != 0;
-
 	if (eel_gconf_get_boolean (CONF_GECKO_ENABLE_PANGO))
 	{
 		g_print ("NOTE: Enabling gecko pango renderer; this may cause performance degradation.\n"
 			 "You can set " CONF_GECKO_ENABLE_PANGO " to \"false\" to disable it.\n");
 	}
-	else if (!enable_pango)
+	else 
 	{
 		g_setenv ("MOZ_DISABLE_PANGO", "1", TRUE);
 	}
--- epiphany-2.15.92/data/epiphany-pango.schemas.use-pango	2006-08-29 13:46:16.000000000 -0400
+++ epiphany-2.15.92/data/epiphany-pango.schemas	2006-08-29 13:46:43.000000000 -0400
@@ -6,47 +6,11 @@
       <applyto>/apps/epiphany/web/enable_pango</applyto>
       <owner>epiphany</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
         <short>Whether to enable the gecko pango renderer</short>
         <long>Whether to enabled the gecko pango renderer.</long>
       </locale>
-      <locale name="bn">
-        <default>true</default>
-      </locale>
-      <locale name="gu">
-        <default>true</default>
-      </locale>
-      <locale name="hi">
-        <default>true</default>
-      </locale>
-      <locale name="kn">
-        <default>true</default>
-      </locale>
-      <locale name="ml">
-        <default>true</default>
-      </locale>
-      <locale name="mr">
-        <default>true</default>
-      </locale>
-      <locale name="ne">
-        <default>true</default>
-      </locale>
-      <locale name="pa">
-        <default>true</default>
-      </locale>
-      <locale name="ta">
-        <default>true</default>
-      </locale>
-      <locale name="te">
-        <default>true</default>
-      </locale>
-      <locale name="th">
-        <default>true</default>
-      </locale>
-      <locale name="ur">
-        <default>true</default>
-      </locale>
     </schema>
   </schemalist>
 </gconfschemafile>


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- epiphany.spec	21 Aug 2006 20:38:54 -0000	1.115
+++ epiphany.spec	29 Aug 2006 17:48:45 -0000	1.116
@@ -9,7 +9,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.15.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -44,6 +44,7 @@
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
+Patch1: epiphany-2.15.92-use-pango.patch
 
 %description
 epiphany is a simple GNOME web browser based on the Mozilla rendering
@@ -75,6 +76,7 @@
 %setup -q
 
 %patch0 -p1 -b .homepage
+%patch1 -p1 -b .use-pango
 
 %build
 %ifnarch s390 s390x
@@ -155,6 +157,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Aug 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-2.fc6
+- Use Pango by default
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 17:49:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 13:49:12 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.130, 1.131 kudzu.spec, 1.148,
	1.149 sources, 1.147, 1.148
Message-ID: <200608291749.k7THnCSG001503@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1481

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- .cvsignore	28 Aug 2006 20:01:28 -0000	1.130
+++ .cvsignore	29 Aug 2006 17:49:10 -0000	1.131
@@ -1 +1 @@
-kudzu-1.2.50.tar.gz
+kudzu-1.2.51.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- kudzu.spec	28 Aug 2006 20:01:28 -0000	1.148
+++ kudzu.spec	29 Aug 2006 17:49:10 -0000	1.149
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.50
+Version: 1.2.51
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -74,6 +74,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Tue Aug 29 2006 Bill Nottingham <notting at redhat.com> - 1.2.51-1
+- fix sg crash
+
 * Mon Aug 28 2006 Bill Nottingham <notting at redhat.com> - 1.2.50-1
 - fix xenfb probe some more
 - clean up some debugging cruft


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- sources	28 Aug 2006 20:01:28 -0000	1.147
+++ sources	29 Aug 2006 17:49:10 -0000	1.148
@@ -1 +1 @@
-e2e8b1ad3b1cc8312bd802e7909f769a  kudzu-1.2.50.tar.gz
+fda8f688d687a338a397732562c40fe0  kudzu-1.2.51.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 29 18:06:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 14:06:21 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2597,1.2598
Message-ID: <200608291806.k7TI6L0j001836@cvs.devel.redhat.com>

Author: mtosatti

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1810

Modified Files:
	kernel-2.6.spec 
Log Message:
Disable PAE for OLPC kernel builds




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2597
retrieving revision 1.2598
diff -u -r1.2597 -r1.2598
--- kernel-2.6.spec	29 Aug 2006 00:40:35 -0000	1.2597
+++ kernel-2.6.spec	29 Aug 2006 18:06:18 -0000	1.2598
@@ -47,6 +47,7 @@
 %if 0%{?olpc}
 %define buildxen 0
 %define buildkdump 0
+%define buildpae 0
 %endif
 # Don't build 586 kernels for RHEL builds.
 %if 0%{?rhel}



From fedora-cvs-commits at redhat.com  Tue Aug 29 18:07:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 14:07:47 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.116,1.117
Message-ID: <200608291807.k7TI7lbc001899@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1852

Modified Files:
	epiphany.spec 
Log Message:
fix build reqs



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- epiphany.spec	29 Aug 2006 17:48:45 -0000	1.116
+++ epiphany.spec	29 Aug 2006 18:07:45 -0000	1.117
@@ -37,6 +37,7 @@
 BuildRequires: gnome-desktop-devel
 BuildRequires: startup-notification-devel
 BuildRequires: gettext-devel
+BuildRequires: perl-XML-Parser
 %ifnarch s390 s390x
 BuildRequires: NetworkManager-devel
 %endif
@@ -159,6 +160,7 @@
 %changelog
 * Tue Aug 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-2.fc6
 - Use Pango by default
+- Add a BR for perl-XML-Parser
 
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92



From fedora-cvs-commits at redhat.com  Tue Aug 29 18:33:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 14:33:42 -0400
Subject: rpms/gtkhtml3/devel gtkhtml-3.11.92-chain-finalize.patch, NONE,
	1.1 gtkhtml3.spec, 1.70, 1.71
Message-ID: <200608291833.k7TIXg46017513@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17489

Modified Files:
	gtkhtml3.spec 
Added Files:
	gtkhtml-3.11.92-chain-finalize.patch 
Log Message:

* Tue Aug 29 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.92-2.fc6
- Add patch for Gnome.org bug #353424.


gtkhtml-3.11.92-chain-finalize.patch:
 a11y/cell.c         |    7 -------
 a11y/html.c         |    8 --------
 a11y/image.c        |    7 -------
 a11y/object.c       |    8 --------
 a11y/object.h       |    2 --
 a11y/paragraph.c    |    7 -------
 a11y/table.c        |    7 -------
 a11y/text.c         |    8 ++++++++
 src/htmltokenizer.c |    2 ++
 9 files changed, 10 insertions(+), 46 deletions(-)

--- NEW FILE gtkhtml-3.11.92-chain-finalize.patch ---
--- gtkhtml-3.11.92/a11y/table.c.chain-finalize	2004-12-29 06:23:53.000000000 -0500
+++ gtkhtml-3.11.92/a11y/table.c	2006-08-29 12:22:01.000000000 -0400
@@ -102,11 +102,6 @@
 }
 
 static void
-html_a11y_table_finalize (GObject *obj)
-{
-}
-
-static void
 html_a11y_table_initialize (AtkObject *obj, gpointer data)
 {
 	/* printf ("html_a11y_table_initialize\n"); */
@@ -118,13 +113,11 @@
 static void
 html_a11y_table_class_init (HTMLA11YTableClass *klass)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 	AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
 	parent_class = g_type_class_peek_parent (klass);
 
 	atk_class->initialize = html_a11y_table_initialize;
-	gobject_class->finalize = html_a11y_table_finalize;
 }
 
 static void
--- gtkhtml-3.11.92/a11y/cell.c.chain-finalize	2002-11-01 10:34:27.000000000 -0500
+++ gtkhtml-3.11.92/a11y/cell.c	2006-08-29 12:22:01.000000000 -0400
@@ -60,11 +60,6 @@
 }
 
 static void
-html_a11y_cell_finalize (GObject *obj)
-{
-}
-
-static void
 html_a11y_cell_initialize (AtkObject *obj, gpointer data)
 {
 	/* printf ("html_a11y_cell_initialize\n"); */
@@ -76,13 +71,11 @@
 static void
 html_a11y_cell_class_init (HTMLA11YCellClass *klass)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 	AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
 	parent_class = g_type_class_peek_parent (klass);
 
 	atk_class->initialize = html_a11y_cell_initialize;
-	gobject_class->finalize = html_a11y_cell_finalize;
 }
 
 static void
--- gtkhtml-3.11.92/a11y/paragraph.c.chain-finalize	2002-11-01 10:34:27.000000000 -0500
+++ gtkhtml-3.11.92/a11y/paragraph.c	2006-08-29 12:22:01.000000000 -0400
@@ -55,11 +55,6 @@
 }
 
 static void
-html_a11y_paragraph_finalize (GObject *obj)
-{
-}
-
-static void
 html_a11y_paragraph_initialize (AtkObject *obj, gpointer data)
 {
 	/* printf ("html_a11y_paragraph_initialize\n"); */
@@ -71,13 +66,11 @@
 static void
 html_a11y_paragraph_class_init (HTMLA11YParagraphClass *klass)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 	AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
 	parent_class = g_type_class_peek_parent (klass);
 
 	atk_class->initialize = html_a11y_paragraph_initialize;
-	gobject_class->finalize = html_a11y_paragraph_finalize;
 }
 
 static void
--- gtkhtml-3.11.92/a11y/object.h.chain-finalize	2002-11-01 10:34:27.000000000 -0500
+++ gtkhtml-3.11.92/a11y/object.h	2006-08-29 12:34:24.000000000 -0400
@@ -43,8 +43,6 @@
 struct _GtkHTMLA11Y
 {
 	GtkAccessible parent;
-
-	AtkObject *tree;
 };
 
 GType gtk_html_a11y_get_type (void);
--- gtkhtml-3.11.92/a11y/object.c.chain-finalize	2006-05-09 04:54:05.000000000 -0400
+++ gtkhtml-3.11.92/a11y/object.c	2006-08-29 12:22:01.000000000 -0400
@@ -153,11 +153,6 @@
 }
 
 static void
-gtk_html_a11y_finalize (GObject *obj)
-{
-}
-
-static void
 gtk_html_a11y_initialize (AtkObject *obj, gpointer data)
 {
 	/* printf ("gtk_html_a11y_initialize\n"); */
@@ -261,7 +256,6 @@
 static void
 gtk_html_a11y_class_init (GtkHTMLA11YClass *klass)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 	AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
 	parent_class = g_type_class_peek_parent (klass);
@@ -270,8 +264,6 @@
 	atk_class->get_n_children = gtk_html_a11y_get_n_children;
 	atk_class->ref_child = gtk_html_a11y_ref_child;
 	atk_class->get_name = gtk_html_a11y_get_name;
-
-	gobject_class->finalize = gtk_html_a11y_finalize;
 }
 
 static void
--- gtkhtml-3.11.92/a11y/text.c.chain-finalize	2006-06-14 00:56:08.000000000 -0400
+++ gtkhtml-3.11.92/a11y/text.c	2006-08-29 12:22:01.000000000 -0400
@@ -249,6 +249,14 @@
 static void
 html_a11y_text_finalize (GObject *obj)
 {
+	HTMLA11YText *ato = HTML_A11Y_TEXT (obj);
+
+	if (ato->util != NULL) {
+		g_object_unref (ato->util);
+		ato->util = NULL;
+	}
+
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
--- gtkhtml-3.11.92/a11y/html.c.chain-finalize	2006-02-28 14:49:22.000000000 -0500
+++ gtkhtml-3.11.92/a11y/html.c	2006-08-29 12:22:01.000000000 -0400
@@ -98,11 +98,6 @@
 }
 
 static void
-html_a11y_finalize (GObject *obj)
-{
-}
-
-static void
 html_a11y_initialize (AtkObject *obj, gpointer data)
 {
 	/* printf ("html_a11y_initialize\n"); */
@@ -116,7 +111,6 @@
 static void
 html_a11y_class_init (HTMLA11YClass *klass)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 	AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
 	parent_class = g_type_class_peek_parent (klass);
@@ -127,8 +121,6 @@
 	atk_class->ref_state_set = html_a11y_ref_state_set;
 	atk_class->get_n_children = html_a11y_get_n_children;
 	atk_class->ref_child = html_a11y_ref_child;
-
-	gobject_class->finalize = html_a11y_finalize;
 }
 
 static void
--- gtkhtml-3.11.92/a11y/image.c.chain-finalize	2005-05-17 10:47:56.000000000 -0400
+++ gtkhtml-3.11.92/a11y/image.c	2006-08-29 12:22:01.000000000 -0400
@@ -86,11 +86,6 @@
 }
 
 static void
-html_a11y_image_finalize (GObject *obj)
-{
-}
-
-static void
 html_a11y_image_initialize (AtkObject *obj, gpointer data)
 {
 	/* printf ("html_a11y_image_initialize\n"); */
@@ -102,14 +97,12 @@
 static void
 html_a11y_image_class_init (HTMLA11YImageClass *klass)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 	AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
 	parent_class = g_type_class_peek_parent (klass);
 
 	atk_class->get_name = html_a11y_image_get_name;
 	atk_class->initialize = html_a11y_image_initialize;
-	gobject_class->finalize = html_a11y_image_finalize;
 }
 
 static void
--- gtkhtml-3.11.92/src/htmltokenizer.c.chain-finalize	2004-05-13 11:07:33.000000000 -0400
+++ gtkhtml-3.11.92/src/htmltokenizer.c	2006-08-29 12:22:01.000000000 -0400
@@ -259,6 +259,8 @@
 
 	g_free (t->priv);
 	t->priv = NULL;
+
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 GtkType


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gtkhtml3.spec	21 Aug 2006 14:20:44 -0000	1.70
+++ gtkhtml3.spec	29 Aug 2006 18:33:36 -0000	1.71
@@ -6,7 +6,7 @@
 
 Name: gtkhtml3
 Version: 3.11.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
 Summary: gtkhtml library
@@ -26,6 +26,9 @@
 # RH bug #202409
 Patch5: gtkhtml-3.11.91-fix-undefined-symbol.patch
 
+# Gnome.org bug #353424.
+Patch6: gtkhtml-3.11.92-chain-finalize.patch
+
 ### Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -66,6 +69,7 @@
 %patch3 -p1 -b .fix-129212
 %patch4 -p1 -b .im-too-late
 %patch5 -p1 -b .fix-undefined-symbol
+%patch6 -p1 -b .chain-finalize
 
 %build
 %configure
@@ -112,6 +116,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Aug 29 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.92-2.fc6
+- Add patch for Gnome.org bug #353424.
+
 * Mon Aug 21 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.92-1.fc6
 - Update to 3.11.92
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 19:14:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 15:14:28 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.ooo69068.parallelxslt.patch, 1.1, 1.2
Message-ID: <200608291914.k7TJESmn001057@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1040

Modified Files:
	openoffice.org-2.0.4.ooo69068.parallelxslt.patch 
Log Message:
better fix

openoffice.org-2.0.4.ooo69068.parallelxslt.patch:
 makefile.mk |    3 +++
 1 files changed, 3 insertions(+)

Index: openoffice.org-2.0.4.ooo69068.parallelxslt.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.4.ooo69068.parallelxslt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.4.ooo69068.parallelxslt.patch	29 Aug 2006 15:56:15 -0000	1.1
+++ openoffice.org-2.0.4.ooo69068.parallelxslt.patch	29 Aug 2006 19:14:26 -0000	1.2
@@ -1,16 +1,17 @@
-Index: source/xsltvalidate/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/xsltvalidate/makefile.mk,v
 retrieving revision 1.11
 diff -u -r1.11 makefile.mk
 --- openoffice.org.orig/filter/source/xsltvalidate/makefile.mk	19 Apr 2006 15:08:31 -0000	1.11
-+++ openoffice.org/filter/source/xsltvalidate/makefile.mk	29 Aug 2006 15:48:34 -0000
-@@ -74,8 +74,4 @@
- # --- Targets ------------------------------------------------------  
++++ openoffice.org/filter/source/xsltvalidate/makefile.mk	29 Aug 2006 16:58:33 -0000
+@@ -75,6 +75,9 @@
  .IF "$(SOLAR_JAVA)"!=""
  .INCLUDE :  target.mk 
--$(JAVACLASSFILES) : $(CLASSDIR)
+ $(JAVACLASSFILES) : $(CLASSDIR)
++.IF "$(JATMANIFEST)"!=""
++$(JARMANIFEST) : $(CLASSDIR)
++.ENDIF			# "$(JARMANIFEST)"!=""
  .ENDIF
--  
--$(CLASSDIR) :
--	$(MKDIR) $(CLASSDIR)
+   
+ $(CLASSDIR) :



From fedora-cvs-commits at redhat.com  Tue Aug 29 19:45:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 15:45:53 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.311,1.312
Message-ID: <200608291945.k7TJjrUM016667@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16655

Modified Files:
	eclipse.spec 
Log Message:
 Remove double Manifest file in com.jcraft.jsch_0.1.28.jar.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- eclipse.spec	17 Aug 2006 18:26:52 -0000	1.311
+++ eclipse.spec	29 Aug 2006 19:45:50 -0000	1.312
@@ -41,7 +41,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_12fc
+Release:        2 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -711,7 +711,7 @@
 pushd baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build
 unzip -qq %{_javadir}/jsch.jar -x META-INF\*
 sed --in-place "s/$(grep Created-By: META-INF/MANIFEST.MF)/Created-By: $(jar -V | head -1)/" META-INF/MANIFEST.MF
-jar -cf ../com.jcraft.jsch_0.1.28.jar *
+jar -Mcf ../com.jcraft.jsch_0.1.28.jar *
 popd
 rm -r baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build
 
@@ -1641,6 +1641,9 @@
 %endif
 
 %changelog
+* Tue Aug 29 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-2
+- Remove double Manifest file in com.jcraft.jsch_0.1.28.jar.
+
 * Thu Aug 17 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_12fc
 - Fix tomcat55 patch to not conflict with wst.ws (commons-logging visibility).
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 19:52:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 15:52:53 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.312,1.313
Message-ID: <200608291952.k7TJqrIq032018@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32003

Modified Files:
	eclipse.spec 
Log Message:
- Require java-gcj-compat >= 1.0.63.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- eclipse.spec	29 Aug 2006 19:45:50 -0000	1.312
+++ eclipse.spec	29 Aug 2006 19:52:51 -0000	1.313
@@ -151,7 +151,7 @@
 BuildRequires:  java-javadoc
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.2
-BuildRequires:	java-gcj-compat-devel >= 1.0.52
+BuildRequires:	java-gcj-compat-devel >= 1.0.63
 BuildRequires:  dos2unix
 %else
 BuildRequires:	java-devel >= 1.4.2
@@ -175,8 +175,8 @@
 BuildRequires: regexp 
 BuildRequires: junit >= 3.8.1-3jpp
 %if %{gcj_support}
-Requires(post):   java-gcj-compat >= 1.0.52
-Requires(postun): java-gcj-compat >= 1.0.52
+Requires(post):   java-gcj-compat >= 1.0.63
+Requires(postun): java-gcj-compat >= 1.0.63
 %endif
 
 %description
@@ -192,8 +192,8 @@
 Provides:	ecj
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):	java-gcj-compat >= 1.0.52
-Requires(postun): java-gcj-compat >= 1.0.52
+Requires(post):	java-gcj-compat >= 1.0.63
+Requires(postun): java-gcj-compat >= 1.0.63
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -211,9 +211,9 @@
 Provides:       %{name}-gtk2 = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires:	java-gcj-compat >= 1.0.52
-Requires(post):   java-gcj-compat >= 1.0.52
-Requires(postun): java-gcj-compat >= 1.0.52
+Requires:	java-gcj-compat >= 1.0.63
+Requires(post):   java-gcj-compat >= 1.0.63
+Requires(postun): java-gcj-compat >= 1.0.63
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -270,8 +270,8 @@
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.52
-Requires(postun): java-gcj-compat >= 1.0.52
+Requires(post):   java-gcj-compat >= 1.0.63
+Requires(postun): java-gcj-compat >= 1.0.63
 %endif
 
 %description    jdt
@@ -302,8 +302,8 @@
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.52
-Requires(postun): java-gcj-compat >= 1.0.52
+Requires(post):   java-gcj-compat >= 1.0.63
+Requires(postun): java-gcj-compat >= 1.0.63
 %endif
 
 %description    pde
@@ -318,8 +318,8 @@
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.52
-Requires(postun): java-gcj-compat >= 1.0.52
+Requires(post):   java-gcj-compat >= 1.0.63
+Requires(postun): java-gcj-compat >= 1.0.63
 %endif
 
 %description    pde-runtime
@@ -347,8 +347,8 @@
 Group:          Text Editors/Integrated Development Environments (IDE)
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.52
-Requires(postun): java-gcj-compat >= 1.0.52
+Requires(post):   java-gcj-compat >= 1.0.63
+Requires(postun): java-gcj-compat >= 1.0.63
 %endif
 
 %description -n %{libname}-gtk2
@@ -359,8 +359,8 @@
 Group:          Development/Languages
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.52
-Requires(postun): java-gcj-compat >= 1.0.52
+Requires(post):   java-gcj-compat >= 1.0.63
+Requires(postun): java-gcj-compat >= 1.0.63
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -1643,6 +1643,7 @@
 %changelog
 * Tue Aug 29 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-2
 - Remove double Manifest file in com.jcraft.jsch_0.1.28.jar.
+- Require java-gcj-compat >= 1.0.63.
 
 * Thu Aug 17 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_12fc
 - Fix tomcat55 patch to not conflict with wst.ws (commons-logging visibility).



From fedora-cvs-commits at redhat.com  Tue Aug 29 20:12:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 16:12:21 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt-scannerinfoplus.patch, NONE,
	1.1 eclipse-cdt-subconsole.patch, NONE, 1.1 .cvsignore, 1.18,
	1.19 eclipse-cdt.spec, 1.53, 1.54 sources, 1.20, 1.21
Message-ID: <200608292012.k7TKCL4H032346@cvs.devel.redhat.com>

Author: jjohnstn

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32317

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Added Files:
	eclipse-cdt-scannerinfoplus.patch eclipse-cdt-subconsole.patch 
Log Message:

* Tue Aug 29 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_13fc
- Rebase autotools to 0.0.4 source.
- Use ScannerInfoProvider extension instead of DynamicScannerInfoProvider.
- Add sub-console support to CDT.




eclipse-cdt-scannerinfoplus.patch:
 org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IScannerInfoPlus.java    |   16 +++++++++
 org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java |   17 +++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

--- NEW FILE eclipse-cdt-scannerinfoplus.patch ---
--- ./results/plugins/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IScannerInfoPlus.java.fix	2006-08-29 14:28:17.000000000 -0400
+++ ./results/plugins/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IScannerInfoPlus.java	2006-08-29 14:28:54.000000000 -0400
@@ -0,0 +1,16 @@
+package org.eclipse.cdt.core.parser;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+
+public interface IScannerInfoPlus extends IScannerInfo {
+
+	/**
+	 * Map an open include file as being included by a specific resource.
+	 * 
+	 * @param include the include file
+	 * @param res the resource that included the include file
+	 */
+	public void createIncludeChain(IFile include, IResource res);
+
+}
--- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java.fix	2006-08-29 14:32:46.000000000 -0400
+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java	2006-08-29 14:33:19.000000000 -0400
@@ -24,6 +24,7 @@ import org.eclipse.cdt.core.model.ICElem
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.core.parser.IScannerInfo;
+import org.eclipse.cdt.core.parser.IScannerInfoPlus;
 import org.eclipse.cdt.core.parser.IScannerInfoProvider;
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.internal.ui.dialogs.ElementListSelectionDialog;
@@ -37,8 +38,10 @@ import org.eclipse.core.resources.IResou
 import org.eclipse.core.resources.IResourceProxyVisitor;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
@@ -79,17 +82,16 @@ public class OpenIncludeAction extends A
 		if (include == null) {
 			return;
 		}
-		
 		try {
 			IResource res = include.getUnderlyingResource();
+			IScannerInfo info = null;
 			ArrayList filesFound = new ArrayList(4);
 			if (res != null) {
 				IProject proj = res.getProject();
 				String includeName = include.getElementName();
-				// Search in the scannerInfo information
-				IScannerInfoProvider provider =  CCorePlugin.getDefault().getScannerInfoProvider(proj);
+				IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(proj);
 				if (provider != null) {
-					IScannerInfo info = provider.getScannerInformation(res);
+					info = provider.getScannerInformation(res);
 					// XXXX this should fall back to project by itself
 					if (info == null) {
 						info = provider.getScannerInformation(proj);
@@ -110,7 +112,7 @@ public class OpenIncludeAction extends A
 			if (nElementsFound == 0) {
 				noElementsFound();
 				fileToOpen= null;
-			} else if (nElementsFound == 1) {
+			} else if (nElementsFound == 1 || info instanceof IScannerInfoPlus) {
 				fileToOpen= (IPath) filesFound.get(0);
 			} else {
 				fileToOpen= chooseFile(filesFound);
@@ -119,6 +121,11 @@ public class OpenIncludeAction extends A
 			if (fileToOpen != null) {
 				IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(fileToOpen);
 				if (file != null) {
+					// If dealing with an IScannerInfoPlus, we want to register
+					// the resource with the include file it includes.
+					if (info instanceof IScannerInfoPlus) {
+						((IScannerInfoPlus)info).createIncludeChain(file, res);
+					}
 					EditorUtility.openInEditor(file);
 				}  else {
 					ICProject cproject = include.getCProject();

eclipse-cdt-subconsole.patch:
 internal/ui/buildconsole/BuildConsole.java        |   16 ++++++++--
 internal/ui/buildconsole/BuildConsoleManager.java |   35 ++++++++++++++++++++++
 internal/ui/buildconsole/BuildConsolePage.java    |   21 +++++++++++--
 ui/CUIPlugin.java                                 |   25 +++++++++++++++
 4 files changed, 93 insertions(+), 4 deletions(-)

--- NEW FILE eclipse-cdt-subconsole.patch ---
--- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java.fix2	2006-08-29 14:38:17.000000000 -0400
+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java	2006-08-29 14:38:55.000000000 -0400
@@ -26,18 +26,30 @@ public class BuildConsole extends Abstra
 	public static final String P_STREAM_COLOR = CUIPlugin.PLUGIN_ID  + ".CONSOLE_P_STREAM_COLOR";	 //$NON-NLS-1$
 
 	private IBuildConsoleManager fConsoleManager;
+	private String fConsoleName;
+	private String fConsoleId;
+	private String fContextId;
 
 	public BuildConsole(IBuildConsoleManager manager) {
 		super(ConsoleMessages.getString("BuildConsole.buildConsole"), CPluginImages.DESC_BUILD_CONSOLE); //$NON-NLS-1$
 		fConsoleManager = manager;
+		fConsoleName = ConsoleMessages.getString("BuildConsole.buildConsole"); //$NON-NLS-1$
+	}
+
+	public BuildConsole(IBuildConsoleManager manager, String name, String id, String contextId) {
+		super(name, CPluginImages.DESC_BUILD_CONSOLE); //$NON-NLS-1$
+		fConsoleManager = manager;
+		fConsoleName = name;
+		fConsoleId = id;
+		fContextId = contextId;
 	}
 
 	public IPageBookViewPage createPage(IConsoleView view) {
-		return new BuildConsolePage(view, this);
+		return new BuildConsolePage(view, this, fConsoleId, fContextId);
 	}
 
 	public void setTitle(IProject project) {
-		String title = ConsoleMessages.getString("BuildConsole.buildConsole"); //$NON-NLS-1$
+		String title = fConsoleName;
 		if (project != null) {
 			title += " [" + project.getName() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
 		}
--- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java.fix2	2006-08-29 14:39:17.000000000 -0400
+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java	2006-08-29 14:39:25.000000000 -0400
@@ -85,6 +85,8 @@ public class BuildConsolePage extends Pa
 
 	private BuildConsole fConsole;
 	private IConsoleView fConsoleView;
+	private String fMenuId;
+	private String fContextMenuId;
 	private BuildConsoleViewer fViewer;
 	private IProject fProject;
 
@@ -109,10 +111,25 @@ public class BuildConsolePage extends Pa
 	/**
 	 * @param view
 	 * @param console
+	 * @param menuId
+	 */
+	public BuildConsolePage(IConsoleView view, BuildConsole console, 
+			String menuId, String contextMenuId) {
+		fConsole = console;
+		fConsoleView = view;
+		fMenuId = menuId;
+		fContextMenuId = contextMenuId;
+	}
+
+	/**
+	 * @param view
+	 * @param console
 	 */
 	public BuildConsolePage(IConsoleView view, BuildConsole console) {
 		fConsole = console;
 		fConsoleView = view;
+		fMenuId = "#MessageConsole";
+		fContextMenuId = "CConsole";
 	}
 
 	protected void setProject(IProject project) {
@@ -176,7 +193,7 @@ public class BuildConsolePage extends Pa
 	public void createControl(Composite parent) {
 		fViewer = new BuildConsoleViewer(parent);
 
-		MenuManager manager = new MenuManager("#MessageConsole", "#MessageConsole"); //$NON-NLS-1$ //$NON-NLS-2$
+		MenuManager manager = new MenuManager("#MessageConsole", fMenuId); //$NON-NLS-1$ //$NON-NLS-2$
 		manager.setRemoveAllWhenShown(true);
 		manager.addMenuListener(new IMenuListener() {
 
@@ -187,7 +204,7 @@ public class BuildConsolePage extends Pa
 		fMenu = manager.createContextMenu(getControl());
 		getControl().setMenu(fMenu);
 		IPageSite site = getSite();
-		site.registerContextMenu(CUIPlugin.PLUGIN_ID + ".CBuildConole", manager, getViewer()); //$NON-NLS-1$
+		site.registerContextMenu(CUIPlugin.PLUGIN_ID + "." + fContextMenuId, manager, getViewer()); //$NON-NLS-1$
 		site.setSelectionProvider(getViewer());
 		createActions();
 		configureToolBar(site.getActionBars().getToolBarManager());
--- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java.fix2	2006-08-29 14:39:42.000000000 -0400
+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java	2006-08-29 14:39:50.000000000 -0400
@@ -52,6 +52,7 @@ public class BuildConsoleManager impleme
 	private Map fConsoleMap = new HashMap();
 	Color infoColor, outputColor, errorColor;
 	BuildConsoleStream infoStream, outputStream, errorStream;
+	String fName, fSubMenuId, fContextMenuId;
 
 	static public final int BUILD_STREAM_TYPE_INFO = 0;
 	static public final int BUILD_STREAM_TYPE_OUTPUT = 1;
@@ -199,6 +200,40 @@ public class BuildConsoleManager impleme
 		CUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this);
 	}
 
+	public void startup(String name, String subMenuId, String contextMenuId) {
+		infoStream = new BuildConsoleStream();
+		outputStream = new BuildConsoleStream();
+		errorStream = new BuildConsoleStream();
+		fName = name;
+		fSubMenuId = subMenuId;
+		fContextMenuId = contextMenuId;
+
+		runUI(new Runnable() {
+
+			/*
+			 * (non-Javadoc)
+			 * 
+			 * @see java.lang.Runnable#run()
+			 */
+			public void run() {
+				// install colors
+				fConsole = new BuildConsole(BuildConsoleManager.this, fName, fSubMenuId, fContextMenuId);
+				ConsolePlugin.getDefault().getConsoleManager().addConsoles(new org.eclipse.ui.console.IConsole[]{fConsole});
+				infoStream.setConsole(fConsole);
+				infoColor = createColor(CUIPlugin.getStandardDisplay(), BuildConsolePreferencePage.PREF_BUILDCONSOLE_INFO_COLOR);
+				infoStream.setColor(infoColor);
+				outputStream.setConsole(fConsole);
+				outputColor = createColor(CUIPlugin.getStandardDisplay(), BuildConsolePreferencePage.PREF_BUILDCONSOLE_OUTPUT_COLOR);
+				outputStream.setColor(outputColor);
+				errorStream.setConsole(fConsole);
+				errorColor = createColor(CUIPlugin.getStandardDisplay(), BuildConsolePreferencePage.PREF_BUILDCONSOLE_ERROR_COLOR);
+				errorStream.setColor(errorColor);
+			}
+		});
+		CUIPlugin.getWorkspace().addResourceChangeListener(this);
+		CUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * 
--- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java.fix2	2006-08-29 14:36:10.000000000 -0400
+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java	2006-08-29 14:36:40.000000000 -0400
@@ -14,8 +14,12 @@ package org.eclipse.cdt.ui;
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import java.util.Set;
@@ -337,6 +341,7 @@ public class CUIPlugin extends AbstractU
 	private AsmTextTools fAsmTextTools;
 	private ProblemMarkerManager fProblemMarkerManager;
 	private BuildConsoleManager fBuildConsoleManager;
+	private Map fSubConsoleManagers = new HashMap();
 	private ResourceAdapterFactory fResourceAdapterFactory;
 	private CElementAdapterFactory fCElementAdapterFactory;
 
@@ -416,6 +421,16 @@ public class CUIPlugin extends AbstractU
 		return fBuildConsoleManager;
 	}
 
+	public IBuildConsoleManager getSubConsoleManager(String name, String id, String contextId) {
+		BuildConsoleManager manager = (BuildConsoleManager)fSubConsoleManagers.get(id);
+		if (manager == null ) {
+			manager = new BuildConsoleManager();
+			fSubConsoleManagers.put(id, manager);
+			manager.startup(name, id, contextId);
+		}
+		return manager;
+	}
+
 	/* (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
 	 */
@@ -443,6 +458,16 @@ public class CUIPlugin extends AbstractU
 		}
 		if (fImageDescriptorRegistry != null)
 			fImageDescriptorRegistry.dispose();
+		
+		if (!fSubConsoleManagers.isEmpty()) {
+			Collection x = fSubConsoleManagers.values();
+			for (Iterator i = x.iterator(); i.hasNext(); ) {
+				BuildConsoleManager b = (BuildConsoleManager)i.next();
+				b.shutdown();
+			}
+			fSubConsoleManagers.clear();
+		}
+		
 		if ( fBuildConsoleManager != null ) {
 			fBuildConsoleManager.shutdown();
 			fBuildConsoleManager = null;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	24 Jul 2006 22:04:52 -0000	1.18
+++ .cvsignore	29 Aug 2006 20:12:15 -0000	1.19
@@ -1,2 +1,3 @@
 eclipse-cdt-fetched-src-3.1.0.tar.bz2
 eclipse-cdt-autotools-0.0.3.tar.gz
+eclipse-cdt-autotools-0.0.4.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- eclipse-cdt.spec	21 Aug 2006 21:27:19 -0000	1.53
+++ eclipse-cdt.spec	29 Aug 2006 20:12:15 -0000	1.54
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_12fc
+Release: 	1jpp_13fc
 License:	Eclipse Public License - v 1.0 (EPL) <http://www.eclipse.org/legal/epl-v10.html>
 Group: 		Text Editors/Integrated Development Environments (IDE)
 URL:		http://www.eclipse.org/cdt
@@ -43,16 +43,14 @@
 #   -DdontUnzip=true fetch
 # cd .. && tar jcf eclipse-cdt-fetched-src-3.1.0.tar.bz2 org.eclipse.cdt.releng
 Source0: %{name}-fetched-src-%{version}.tar.bz2
-Source1: %{name}-autotools-0.0.3.tar.gz
+Source1: %{name}-autotools-0.0.4.tar.gz
 
 Patch1: %{name}-no-cvs2-patch
 Patch2: %{name}-platform-build-linux.patch
 Patch3: %{name}-sdk-build-linux.patch
 Patch4: %{name}-no-tests.patch
-Patch5: %{name}-dynamic-scannerinfo-ext.patch
-Patch6: %{name}-libhover-jar.patch
-Patch7: %{name}-mm-builder.patch
-Patch8: %{name}-configuration.patch
+Patch5: %{name}-subconsole.patch
+Patch6: %{name}-scannerinfoplus.patch
 
 BuildRequires: eclipse-pde
 %if %{gcj_support}
@@ -94,6 +92,7 @@
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
+%patch6 -p0
 popd
 
 # Autotools stuff
@@ -101,9 +100,6 @@
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
 popd
 
 # Upstream CVS includes random .so files.  Let's remove them now.
@@ -272,6 +268,11 @@
 %endif
 
 %changelog
+* Tue Aug 29 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_13fc
+- Rebase autotools to 0.0.4 source.
+- Use ScannerInfoProvider extension instead of DynamicScannerInfoProvider.
+- Add sub-console support to CDT.
+
 * Mon Aug 21 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_12fc
 - Fix build special targets when project hasn't configured yet.
 - Fix to fully reconfigure after configuration options change.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	24 Jul 2006 22:04:53 -0000	1.20
+++ sources	29 Aug 2006 20:12:15 -0000	1.21
@@ -1,2 +1,2 @@
 8ea0a06e13227728d3922bab3496509e  eclipse-cdt-fetched-src-3.1.0.tar.bz2
-c475012b6bf7e3cd3aea20a690b50c15  eclipse-cdt-autotools-0.0.3.tar.gz
+1402fa414d57828fc1d55f72048d05d0  eclipse-cdt-autotools-0.0.4.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 29 20:15:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 16:15:57 -0400
Subject: rpms/kernel/devel/configs config-powerpc64-generic,1.5,1.5.4.1
Message-ID: <200608292015.k7TKFvc0032509@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv32477/configs

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-powerpc64-generic 
Log Message:
more beta1 fixes



Index: config-powerpc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-generic,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- config-powerpc64-generic	2 Aug 2006 17:20:38 -0000	1.5
+++ config-powerpc64-generic	29 Aug 2006 20:15:55 -0000	1.5.4.1
@@ -23,3 +23,5 @@
 
 # CONFIG_CRASH is not set
 # CONFIG_INPUT_PCSPKR is not set
+
+CONFIG_EHEA=m



From fedora-cvs-commits at redhat.com  Tue Aug 29 20:15:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 16:15:57 -0400
Subject: rpms/kernel/devel linux-2.6-audit-code-walking-out-of-bounds.patch,
	NONE, 1.1.2.1 config-rhel-generic, 1.8,
	1.8.10.1 kernel-2.6.spec, 1.2519.4.17,
	1.2519.4.18 linux-2.6-ehea-ethernet-driver.patch, 1.1.2.1,
	1.1.2.2 linux-2.6-x86-relocatable.patch, 1.1.2.2, 1.1.2.3
Message-ID: <200608292015.k7TKFvTk032498@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32477

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-rhel-generic kernel-2.6.spec 
	linux-2.6-ehea-ethernet-driver.patch 
	linux-2.6-x86-relocatable.patch 
Added Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	linux-2.6-audit-code-walking-out-of-bounds.patch 
Log Message:
more beta1 fixes


linux-2.6-audit-code-walking-out-of-bounds.patch:
 auditsc.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-audit-code-walking-out-of-bounds.patch ---
Date: Tue, 29 Aug 2006 15:21:52 -0400
From: Steve Grubb <sgrubb at redhat.com>
Subject: Re: [RHEL5] [PATCH] audit code walking out of bounds...

On Tuesday 29 August 2006 14:37, Peter Staubach wrote:
> This still does not look right. ??It is using context->name[AUDIT_NAMES]
> and that is beyond the array bounds. ??Is it not?
>
> Steve Grubb's change looked more accurate in this respect.

This is correct...and so is David...so one more try. I also noticed one more
increment farther down in the same function, so this patch covers it too. And
another increment in __audit_inode. Hopefully, this does it.

-Steve


diff -urp linux-2.6.17.x86_64.orig/kernel/auditsc.c linux-2.6.17.x86_64/kernel/auditsc.c
--- linux-2.6.17.x86_64.orig/kernel/auditsc.c	2006-08-29 11:21:20.000000000 -0400
+++ linux-2.6.17.x86_64/kernel/auditsc.c	2006-08-29 15:15:28.000000000 -0400
@@ -1281,7 +1281,15 @@ void __audit_inode(const char *name, con
 		 * associated name? */
 		if (context->name_count >= AUDIT_NAMES - AUDIT_NAMES_RESERVED)
 			return;
-		idx = context->name_count++;
+		idx = context->name_count;
+		if (context->name_count == (AUDIT_NAMES - 1)) {
+			printk(KERN_DEBUG
+				"name_count maxed and losing entry [%d]=%s\n",
+				context->name_count, 
+				context->names[context->name_count].name ?:
+				"(null)");
+		} else
+			context->name_count++;
 		context->names[idx].name = NULL;
 #if AUDIT_DEBUG
 		++context->ino_count;
@@ -1333,7 +1341,13 @@ void __audit_inode_child(const char *dna
 		}
 
 update_context:
-	idx = context->name_count++;
+	idx = context->name_count;
+	if (context->name_count == (AUDIT_NAMES - 1)) {
+		printk(KERN_DEBUG "name_count maxed and losing entry [%d]=%s\n",
+			context->name_count, 
+			context->names[context->name_count].name ?: "(null)");
+	} else
+		context->name_count++;
 #if AUDIT_DEBUG
 	context->ino_count++;
 #endif


Index: config-rhel-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/config-rhel-generic,v
retrieving revision 1.8
retrieving revision 1.8.10.1
diff -u -r1.8 -r1.8.10.1
--- config-rhel-generic	19 Jul 2006 19:25:13 -0000	1.8
+++ config-rhel-generic	29 Aug 2006 20:15:54 -0000	1.8.10.1
@@ -191,4 +191,4 @@
 # CONFIG_DECNET is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_RAW_DRIVER=y
-
+CONFIG_HZ=300


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.17
retrieving revision 1.2519.4.18
diff -u -r1.2519.4.17 -r1.2519.4.18
--- kernel-2.6.spec	25 Aug 2006 20:46:04 -0000	1.2519.4.17
+++ kernel-2.6.spec	29 Aug 2006 20:15:55 -0000	1.2519.4.18
@@ -439,6 +439,7 @@
 # SELinux/audit patches.
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
 Patch1802: linux-2.6-selinux-support-range-transitions.patch
+Patch1803: linux-2.6-audit-code-walking-out-of-bounds.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-oss-warning.patch
@@ -1011,6 +1012,7 @@
 %patch1801 -p1
 # Add support for SELinux range transitions
 %patch1802 -p1
+%patch1803 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1787,6 +1789,12 @@
 %endif
 
 %changelog
+* Tue Aug 29 2006 Don Zickus <dzickus at redhat.com>
+- added #184752 - need to enable EHEA driver (Don Zickus)
+- added #203861 - cachefs corruption (Steve Grubb)
+- added #198594 - setting HZ to 300 (Don Zickus)
+- added #204317 - typo in relocatable patch (Vivek Goyal)
+
 * Fri Aug 25 2006 Don Zickus <dzickus at redhat.com>
 - really turn on building kernel headers
 - build headers fix (need i386)

linux-2.6-ehea-ethernet-driver.patch:
 Kconfig             |    7 
 ehea/Makefile       |    7 
 ehea/ehea.h         |  434 ++++++++
 ehea/ehea_ethtool.c |  325 ++++++
 ehea/ehea_hcall.h   |   52 +
 ehea/ehea_hw.h      |  319 ++++++
 ehea/ehea_main.c    | 2560 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ehea/ehea_phyp.c    | 1020 ++++++++++++++++++++
 ehea/ehea_phyp.h    |  625 ++++++++++++
 ehea/ehea_qmr.c     |  719 ++++++++++++++
 ehea/ehea_qmr.h     |  390 +++++++
 11 files changed, 6458 insertions(+)

Index: linux-2.6-ehea-ethernet-driver.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ehea-ethernet-driver.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-ehea-ethernet-driver.patch	17 Aug 2006 22:59:24 -0000	1.1.2.1
+++ linux-2.6-ehea-ethernet-driver.patch	29 Aug 2006 20:15:55 -0000	1.1.2.2
@@ -6478,6 +6478,22 @@
 +#endif	/* __EHEA_HW_H__ */
 
 
+--- linux-2.6.17.1/drivers/net/Kconfig	2006-06-20 02:31:55.000000000 -0700
++++ patched_kernel/drivers/net/Kconfig	2006-06-20 03:53:45.896352432 -0700
+@@ -2247,6 +2247,13 @@ config CHELSIO_T1
+	   To compile this driver as a module, choose M here: the module
+	   will be called cxgb.
+
++config EHEA
++	 tristate "eHEA Ethernet support"
++	 depends on IBMEBUS
++	 ---help---
++	   This driver supports the eHEA IBM ethernet adapter for eServer System p
++
++
+ config IXGB
+ 	tristate "Intel(R) PRO/10GbE support"
+ 	depends on PCI
 --- linux-2.6.17-rc6-orig/drivers/net/ehea/Makefile	1969-12-31 16:00:00.000000000 -0800
 +++ kernel/drivers/net/ehea/Makefile	2006-06-09 05:29:59.170253728 -0700
 @@ -0,0 +1,7 @@

linux-2.6-x86-relocatable.patch:
 b/arch/i386/Kconfig                                              |   13 
 b/arch/i386/Makefile                                             |    2 
 b/arch/i386/boot/Makefile                                        |    2 
 b/arch/i386/boot/bootsect.S                                      |   97 +
 b/arch/i386/boot/compressed/Makefile                             |   22 
 b/arch/i386/boot/compressed/head.S                               |  184 ++-
 b/arch/i386/boot/compressed/misc.c                               |  513 ++++++---
 b/arch/i386/boot/compressed/relocs.c                             |  563 ++++++++++
 b/arch/i386/boot/compressed/vmlinux.lds                          |   40 
 b/arch/i386/boot/compressed/vmlinux.scr                          |    3 
 b/arch/i386/boot/setup.S                                         |   29 
 b/arch/i386/boot/tools/build.c                                   |  214 +++
 b/arch/i386/kernel/alternative.c                                 |    8 
 b/arch/i386/kernel/setup.c                                       |    4 
 b/arch/i386/kernel/vmlinux.lds.S                                 |  114 +-
 b/arch/i386/mm/init.c                                            |   15 
 b/arch/x86_64/Kconfig                                            |   19 
 b/arch/x86_64/boot/Makefile                                      |    2 
 b/arch/x86_64/boot/bootsect.S                                    |   93 +
 b/arch/x86_64/boot/compressed/Makefile                           |   13 
 b/arch/x86_64/boot/compressed/head.S                             |  301 +++--
 b/arch/x86_64/boot/compressed/misc.c                             |  500 ++++++--
 b/arch/x86_64/boot/compressed/vmlinux.lds                        |   44 
 b/arch/x86_64/boot/compressed/vmlinux.scr                        |    5 
 b/arch/x86_64/boot/tools/build.c                                 |  232 +++-
 b/arch/x86_64/defconfig                                          |    1 
 b/arch/x86_64/kernel/acpi/sleep.c                                |   19 
 b/arch/x86_64/kernel/acpi/wakeup.S                               |  325 ++---
 b/arch/x86_64/kernel/e820.c                                      |   13 
 b/arch/x86_64/kernel/early_printk.c                              |    3 
 b/arch/x86_64/kernel/head.S                                      |  326 ++---
 b/arch/x86_64/kernel/head64.c                                    |   35 
 b/arch/x86_64/kernel/setup.c                                     |   29 
 b/arch/x86_64/kernel/setup64.c                                   |    1 
 b/arch/x86_64/kernel/smp.c                                       |    2 
 b/arch/x86_64/kernel/suspend.c                                   |    3 
 b/arch/x86_64/kernel/trampoline.S                                |  168 ++
 b/arch/x86_64/kernel/vmlinux.lds.S                               |    2 
 b/arch/x86_64/kernel/vsyscall.c                                  |   10 
 b/arch/x86_64/mm/fault.c                                         |    4 
 b/arch/x86_64/mm/init.c                                          |  288 ++---
 b/arch/x86_64/mm/pageattr.c                                      |   20 
 b/include/asm-generic/vmlinux.lds.h                              |    2 
 b/include/asm-i386/page.h                                        |    4 
 b/include/asm-x86_64/const.h                                     |   20 
 b/include/asm-x86_64/page.h                                      |   44 
 b/include/asm-x86_64/pgtable.h                                   |   39 
 b/include/asm-x86_64/proto.h                                     |    2 
 b/include/asm-x86_64/segment.h                                   |    4 
 b/include/asm-x86_64/suspend.h                                   |   13 
 b/include/linux/elf.h                                            |   27 
 b/include/linux/elf_boot.h                                       |   19 
 b/include/linux/screen_info.h                                    |    3 
 b/scripts/kallsyms.c                                             |   30 
 linux-2.6.17.noarch/arch/x86_64/mm/init.c                        |    2 
 linux-2.6.18-rc3-1M-root/arch/i386/Kconfig                       |   34 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/bootsect.S               |    8 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/head.S        |   28 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/misc.c        |    7 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/vmlinux.lds   |    3 
 linux-2.6.18-rc3-1M-root/arch/i386/kernel/vmlinux.lds.S          |    5 
 linux-2.6.18-rc3-1M-root/arch/powerpc/kernel/vmlinux.lds.S       |    1 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/Makefile               |    3 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/compressed/vmlinux.lds |    2 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/tools/build.c          |  129 +-
 linux-2.6.18-rc3-1M-root/include/asm-i386/boot.h                 |    6 
 66 files changed, 3401 insertions(+), 1315 deletions(-)

Index: linux-2.6-x86-relocatable.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86-relocatable.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- linux-2.6-x86-relocatable.patch	24 Aug 2006 23:18:42 -0000	1.1.2.2
+++ linux-2.6-x86-relocatable.patch	29 Aug 2006 20:15:55 -0000	1.1.2.3
@@ -273,7 +273,7 @@
 +	 * a relocatable kernel this is the delta to our load address otherwise
 +	 * this is the delta to CONFIG_PHYSICAL start.
 +	 */
-+#ifdef CONFIG_RELOCTABLE
++#ifdef CONFIG_RELOCATABLE
 +	movl %ebp, %ebx
 +#else
 +	movl $(CONFIG_PHYSICAL_START - startup_32), %ebx
@@ -7040,7 +7040,7 @@
 -	 * this is the delta to CONFIG_PHYSICAL start.
 -	 */
 +
- #ifdef CONFIG_RELOCTABLE
+ #ifdef CONFIG_RELOCATABLE
 -	movl %ebp, %ebx
 +	movl 	%ebp, %ebx
 +	addl    $(CONFIG_PHYSICAL_ALIGN - 1), %ebx



From fedora-cvs-commits at redhat.com  Tue Aug 29 20:24:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 16:24:58 -0400
Subject: rpms/gnome-python2-extras/devel .cvsignore, 1.11,
	1.12 gnome-python-extras.spec, 1.53, 1.54 sources, 1.11, 1.12
Message-ID: <200608292024.k7TKOw9A015501@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15487

Modified Files:
	.cvsignore gnome-python-extras.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Jul 2006 16:23:03 -0000	1.11
+++ .cvsignore	29 Aug 2006 20:24:56 -0000	1.12
@@ -1 +1 @@
-gnome-python-extras-2.14.1.tar.bz2
+gnome-python-extras-2.14.2.tar.bz2


Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-python-extras.spec	1 Aug 2006 02:11:27 -0000	1.53
+++ gnome-python-extras.spec	29 Aug 2006 20:24:56 -0000	1.54
@@ -10,8 +10,8 @@
 
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
-Version: 2.14.1
-Release: 6
+Version: 2.14.2
+Release: 1%{?dist}
 License: GPL/LGPL
 Group: Development/Languages
 Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-extras/2.13/gnome-python-extras-%{version}.tar.bz2
@@ -131,6 +131,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Tue Aug 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
+- Update to 2.14.2
+
 * Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-6
 - fix a typo in configure
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Jul 2006 16:23:03 -0000	1.11
+++ sources	29 Aug 2006 20:24:56 -0000	1.12
@@ -1 +1 @@
-f6868ad32303adb13a25e99f682ffe80  gnome-python-extras-2.14.1.tar.bz2
+039e1300368df17de9867685e9705091  gnome-python-extras-2.14.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 29 20:35:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 16:35:23 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.51,
	1.52 java-1.4.2-gcj-compat.spec, 1.167, 1.168 sources, 1.57, 1.58
Message-ID: <200608292035.k7TKZMoC015731@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15712

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Tue Aug 29 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.103
- Import java-gcj-compat 1.0.63.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	24 Jul 2006 13:13:02 -0000	1.51
+++ .cvsignore	29 Aug 2006 20:35:04 -0000	1.52
@@ -1,3 +1,3 @@
-java-gcj-compat-1.0.61.tar.gz
+java-gcj-compat-1.0.63.tar.gz
 ecj.sh.in
 eclipse-ecj-3.1.0_fc-12.jar


Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- java-1.4.2-gcj-compat.spec	23 Aug 2006 18:48:52 -0000	1.167
+++ java-1.4.2-gcj-compat.spec	29 Aug 2006 20:35:05 -0000	1.168
@@ -11,7 +11,7 @@
 %define buildver	0
 # the version-release string for the gcj rpms we require
 %define gccver		4.0.0-0.42
-%define jgcver		1.0.61
+%define jgcver		1.0.63
 
 %define cname           java-%{javaver}-%{origin}
 
@@ -27,7 +27,7 @@
 
 Name:		java-%{javaver}-%{origin}-compat
 Version:	%{javaver}.%{buildver}
-Release: 	40jpp.102
+Release: 	40jpp.103
 Epoch:		0
 Summary:	JPackage runtime scripts for GCJ
 
@@ -646,6 +646,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Aug 29 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.103
+- Import java-gcj-compat 1.0.63.
+
 * Wed Aug 23 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.4.2.0-40jpp.102
 - Remove duplicate macro definitions
 - Rebuild


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	24 Jul 2006 13:13:02 -0000	1.57
+++ sources	29 Aug 2006 20:35:05 -0000	1.58
@@ -1,3 +1,3 @@
-bf21552084a1753ded9bdb71ba9374f3  java-gcj-compat-1.0.61.tar.gz
+097d1880300f0760644af5b753b9f012  java-gcj-compat-1.0.63.tar.gz
 e9c12c59e5a34c5c916d3b032dd7855e  ecj.sh.in
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar



From fedora-cvs-commits at redhat.com  Tue Aug 29 20:35:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 16:35:37 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.54,1.55
Message-ID: <200608292035.k7TKZai1015782@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15764

Modified Files:
	gnome-python-extras.spec 
Log Message:
drop patch



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-python-extras.spec	29 Aug 2006 20:24:56 -0000	1.54
+++ gnome-python-extras.spec	29 Aug 2006 20:35:33 -0000	1.55
@@ -17,7 +17,6 @@
 Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-extras/2.13/gnome-python-extras-%{version}.tar.bz2
 
 Patch0: gnome-python-extras-2.10.0-gtkspell-static.patch
-Patch1: gnome-python-extras-2.14.1-defsdir.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -82,7 +81,6 @@
 %prep
 %setup -q -n gnome-python-extras-%{version}
 %patch0 -p1 -b .gtkspell-static
-%patch1 -p1 -b .defsdir
 
 %build
 %configure
@@ -133,6 +131,7 @@
 %changelog
 * Tue Aug 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2
+- Drop upstreamed patch
 
 * Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-6
 - fix a typo in configure



From fedora-cvs-commits at redhat.com  Tue Aug 29 20:49:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 16:49:50 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.131, 1.132 kudzu.spec, 1.149,
	1.150 sources, 1.148, 1.149
Message-ID: <200608292049.k7TKnoQI031331@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31316

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- .cvsignore	29 Aug 2006 17:49:10 -0000	1.131
+++ .cvsignore	29 Aug 2006 20:49:48 -0000	1.132
@@ -1 +1 @@
-kudzu-1.2.51.tar.gz
+kudzu-1.2.52.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- kudzu.spec	29 Aug 2006 17:49:10 -0000	1.149
+++ kudzu.spec	29 Aug 2006 20:49:48 -0000	1.150
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.51
+Version: 1.2.52
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -74,8 +74,9 @@
 %{_includedir}/kudzu
 
 %changelog
-* Tue Aug 29 2006 Bill Nottingham <notting at redhat.com> - 1.2.51-1
+* Tue Aug 29 2006 Bill Nottingham <notting at redhat.com> - 1.2.52-1
 - fix sg crash
+- close fd leaks
 
 * Mon Aug 28 2006 Bill Nottingham <notting at redhat.com> - 1.2.50-1
 - fix xenfb probe some more


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- sources	29 Aug 2006 17:49:10 -0000	1.148
+++ sources	29 Aug 2006 20:49:48 -0000	1.149
@@ -1 +1 @@
-fda8f688d687a338a397732562c40fe0  kudzu-1.2.51.tar.gz
+434c587cb0a9911ce5e2210d7ad4d4f7  kudzu-1.2.52.tar.gz



From fedora-cvs-commits at redhat.com  Tue Aug 29 20:54:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 16:54:03 -0400
Subject: rpms/gnome-speech/devel .cvsignore, 1.15, 1.16 gnome-speech.spec,
	1.31, 1.32 sources, 1.15, 1.16
Message-ID: <200608292054.k7TKs3gk031480@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-speech/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31466

Modified Files:
	.cvsignore gnome-speech.spec sources 
Log Message:
0.45



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Aug 2006 19:11:50 -0000	1.15
+++ .cvsignore	29 Aug 2006 20:54:01 -0000	1.16
@@ -1 +1 @@
-gnome-speech-0.4.4.tar.bz2
+gnome-speech-0.4.5.tar.bz2


Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-speech.spec	21 Aug 2006 19:11:50 -0000	1.31
+++ gnome-speech.spec	29 Aug 2006 20:54:01 -0000	1.32
@@ -2,7 +2,7 @@
 
 Summary: GNOME Text to Speech
 Name: gnome-speech
-Version: 0.4.4
+Version: 0.4.5
 Release: 1%{?dist}
 License: LGPL
 Group: Desktop/Accessibility
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Tue Aug 29 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.5-1.fc6
+- Update to 0.4.5
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.4-1.fc6
 - Update to 0.4.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	21 Aug 2006 19:11:50 -0000	1.15
+++ sources	29 Aug 2006 20:54:01 -0000	1.16
@@ -1 +1 @@
-c26dde244c969d7a00b229f256e77546  gnome-speech-0.4.4.tar.bz2
+e8b11c2e7126787f66289a3b6e83555b  gnome-speech-0.4.5.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 29 21:36:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 17:36:35 -0400
Subject: rpms/kernel/devel/configs config-powerpc64-generic,1.5,1.6
Message-ID: <200608292136.k7TLaZpX015059@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15003/configs

Modified Files:
	config-powerpc64-generic 
Log Message:
some beta1 fixes
enabling EHEA driver, cachefs fix, x86 relocatable tweaks




Index: config-powerpc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-generic,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-powerpc64-generic	2 Aug 2006 17:20:38 -0000	1.5
+++ config-powerpc64-generic	29 Aug 2006 21:36:33 -0000	1.6
@@ -23,3 +23,5 @@
 
 # CONFIG_CRASH is not set
 # CONFIG_INPUT_PCSPKR is not set
+
+CONFIG_EHEA=m



From fedora-cvs-commits at redhat.com  Tue Aug 29 21:36:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 17:36:35 -0400
Subject: rpms/kernel/devel linux-2.6-audit-code-walking-out-of-bounds.patch,
	1.1, 1.2 kernel-2.6.spec, 1.2598,
	1.2599 linux-2.6-ehea-ethernet-driver.patch, 1.1,
	1.2 linux-2.6-x86-relocatable.patch, 1.2,
	1.3 linux-2.6-xen-x86-relocatable.patch, 1.2, 1.3
Message-ID: <200608292136.k7TLaZll015049@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15003

Modified Files:
	kernel-2.6.spec linux-2.6-ehea-ethernet-driver.patch 
	linux-2.6-x86-relocatable.patch 
	linux-2.6-xen-x86-relocatable.patch 
Added Files:
	linux-2.6-audit-code-walking-out-of-bounds.patch 
Log Message:
some beta1 fixes
enabling EHEA driver, cachefs fix, x86 relocatable tweaks



linux-2.6-audit-code-walking-out-of-bounds.patch:
 auditsc.c |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

Index: linux-2.6-audit-code-walking-out-of-bounds.patch
===================================================================
RCS file: linux-2.6-audit-code-walking-out-of-bounds.patch
diff -N linux-2.6-audit-code-walking-out-of-bounds.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-audit-code-walking-out-of-bounds.patch	29 Aug 2006 21:36:32 -0000	1.2
@@ -0,0 +1,70 @@
+Date: Tue, 29 Aug 2006 15:21:52 -0400
+From: Steve Grubb <sgrubb at redhat.com>
+Subject: Re: [RHEL5] [PATCH] audit code walking out of bounds...
+
+On Tuesday 29 August 2006 14:37, Peter Staubach wrote:
+> This still does not look right. ??It is using context->name[AUDIT_NAMES]
+> and that is beyond the array bounds. ??Is it not?
+>
+> Steve Grubb's change looked more accurate in this respect.
+
+This is correct...and so is David...so one more try. I also noticed one more
+increment farther down in the same function, so this patch covers it too. And
+another increment in __audit_inode. Hopefully, this does it.
+
+-Steve
+
+
+diff -urp linux-2.6.17.x86_64.orig/kernel/auditsc.c linux-2.6.17.x86_64/kernel/auditsc.c
+--- linux-2.6.17.x86_64.orig/kernel/auditsc.c	2006-08-29 11:21:20.000000000 -0400
++++ linux-2.6.17.x86_64/kernel/auditsc.c	2006-08-29 15:15:28.000000000 -0400
+@@ -1281,7 +1281,15 @@ void __audit_inode(const char *name, con
+ 		 * associated name? */
+ 		if (context->name_count >= AUDIT_NAMES - AUDIT_NAMES_RESERVED)
+ 			return;
+-		idx = context->name_count++;
++		idx = context->name_count;
++		if (context->name_count == (AUDIT_NAMES - 1)) {
++			printk(KERN_DEBUG
++				"name_count maxed and losing entry [%d]=%s\n",
++				context->name_count, 
++				context->names[context->name_count].name ?:
++				"(null)");
++		} else
++			context->name_count++;
+ 		context->names[idx].name = NULL;
+ #if AUDIT_DEBUG
+ 		++context->ino_count;
+@@ -1333,7 +1341,13 @@ void __audit_inode_child(const char *dna
+ 		}
+ 
+ update_context:
+-	idx = context->name_count++;
++	idx = context->name_count;
++	if (context->name_count == (AUDIT_NAMES - 1)) {
++		printk(KERN_DEBUG "name_count maxed and losing entry [%d]=%s\n",
++			context->name_count, 
++			context->names[context->name_count].name ?: "(null)");
++	} else
++		context->name_count++;
+ #if AUDIT_DEBUG
+ 	context->ino_count++;
+ #endif
+@@ -1351,7 +1365,15 @@ update_context:
+ 	/* A parent was not found in audit_names, so copy the inode data for the
+ 	 * provided parent. */
+ 	if (!found_name) {
+-		idx = context->name_count++;
++		idx = context->name_count;
++		if (context->name_count == (AUDIT_NAMES - 1)) {
++			printk(KERN_DEBUG 
++				"name_count maxed and losing entry [%d]=%s\n",
++				context->name_count, 
++				context->names[context->name_count].name ?:
++				"(null)");
++		} else
++			context->name_count++;
+ #if AUDIT_DEBUG
+ 		context->ino_count++;
+ #endif
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2598
retrieving revision 1.2599
diff -u -r1.2598 -r1.2599
--- kernel-2.6.spec	29 Aug 2006 18:06:18 -0000	1.2598
+++ kernel-2.6.spec	29 Aug 2006 21:36:32 -0000	1.2599
@@ -460,6 +460,7 @@
 # SELinux/audit patches.
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
 Patch1802: linux-2.6-selinux-support-range-transitions.patch
+Patch1803: linux-2.6-audit-code-walking-out-of-bounds.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-oss-warning.patch
@@ -1026,6 +1027,7 @@
 %patch1801 -p1
 # Add support for SELinux range transitions
 %patch1802 -p1
+%patch1803 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1813,6 +1815,11 @@
 %endif
 
 %changelog
+* Tue Aug 28 2006 Don Zickus <dzickus at redhat.com>
+- enabled EHEA driver
+- x86 relocatable fixes
+- audit code fixes for cachefs
+
 * Mon Aug 28 2006 Jeremy Katz <katzj at redhat.com>
 - Add updated pv framebuffer patch for Xen and re-enable the config options
 

linux-2.6-ehea-ethernet-driver.patch:
 Kconfig             |    7 
 ehea/Makefile       |    7 
 ehea/ehea.h         |  434 ++++++++
 ehea/ehea_ethtool.c |  325 ++++++
 ehea/ehea_hcall.h   |   52 +
 ehea/ehea_hw.h      |  319 ++++++
 ehea/ehea_main.c    | 2560 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ehea/ehea_phyp.c    | 1020 ++++++++++++++++++++
 ehea/ehea_phyp.h    |  625 ++++++++++++
 ehea/ehea_qmr.c     |  719 ++++++++++++++
 ehea/ehea_qmr.h     |  390 +++++++
 11 files changed, 6458 insertions(+)

Index: linux-2.6-ehea-ethernet-driver.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ehea-ethernet-driver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ehea-ethernet-driver.patch	17 Aug 2006 22:47:54 -0000	1.1
+++ linux-2.6-ehea-ethernet-driver.patch	29 Aug 2006 21:36:32 -0000	1.2
@@ -6478,6 +6478,22 @@
 +#endif	/* __EHEA_HW_H__ */
 
 
+--- linux-2.6.17.1/drivers/net/Kconfig	2006-06-20 02:31:55.000000000 -0700
++++ patched_kernel/drivers/net/Kconfig	2006-06-20 03:53:45.896352432 -0700
+@@ -2247,6 +2247,13 @@ config CHELSIO_T1
+	   To compile this driver as a module, choose M here: the module
+	   will be called cxgb.
+
++config EHEA
++	 tristate "eHEA Ethernet support"
++	 depends on IBMEBUS
++	 ---help---
++	   This driver supports the eHEA IBM ethernet adapter for eServer System p
++
++
+ config IXGB
+ 	tristate "Intel(R) PRO/10GbE support"
+ 	depends on PCI
 --- linux-2.6.17-rc6-orig/drivers/net/ehea/Makefile	1969-12-31 16:00:00.000000000 -0800
 +++ kernel/drivers/net/ehea/Makefile	2006-06-09 05:29:59.170253728 -0700
 @@ -0,0 +1,7 @@

linux-2.6-x86-relocatable.patch:
 b/arch/i386/Kconfig                                              |   13 
 b/arch/i386/Makefile                                             |    2 
 b/arch/i386/boot/Makefile                                        |    2 
 b/arch/i386/boot/bootsect.S                                      |   97 +
 b/arch/i386/boot/compressed/Makefile                             |   22 
 b/arch/i386/boot/compressed/head.S                               |  184 ++-
 b/arch/i386/boot/compressed/misc.c                               |  513 ++++++---
 b/arch/i386/boot/compressed/relocs.c                             |  563 ++++++++++
 b/arch/i386/boot/compressed/vmlinux.lds                          |   40 
 b/arch/i386/boot/compressed/vmlinux.scr                          |    3 
 b/arch/i386/boot/setup.S                                         |   29 
 b/arch/i386/boot/tools/build.c                                   |  214 +++
 b/arch/i386/kernel/alternative.c                                 |    8 
 b/arch/i386/kernel/setup.c                                       |    4 
 b/arch/i386/kernel/vmlinux.lds.S                                 |  114 +-
 b/arch/i386/mm/init.c                                            |   15 
 b/arch/x86_64/Kconfig                                            |   19 
 b/arch/x86_64/boot/Makefile                                      |    2 
 b/arch/x86_64/boot/bootsect.S                                    |   93 +
 b/arch/x86_64/boot/compressed/Makefile                           |   13 
 b/arch/x86_64/boot/compressed/head.S                             |  301 +++--
 b/arch/x86_64/boot/compressed/misc.c                             |  500 ++++++--
 b/arch/x86_64/boot/compressed/vmlinux.lds                        |   44 
 b/arch/x86_64/boot/compressed/vmlinux.scr                        |    5 
 b/arch/x86_64/boot/tools/build.c                                 |  232 +++-
 b/arch/x86_64/defconfig                                          |    1 
 b/arch/x86_64/kernel/acpi/sleep.c                                |   19 
 b/arch/x86_64/kernel/acpi/wakeup.S                               |  325 ++---
 b/arch/x86_64/kernel/e820.c                                      |   13 
 b/arch/x86_64/kernel/early_printk.c                              |    3 
 b/arch/x86_64/kernel/head.S                                      |  326 ++---
 b/arch/x86_64/kernel/head64.c                                    |   35 
 b/arch/x86_64/kernel/setup.c                                     |   29 
 b/arch/x86_64/kernel/setup64.c                                   |    1 
 b/arch/x86_64/kernel/smp.c                                       |    2 
 b/arch/x86_64/kernel/suspend.c                                   |    3 
 b/arch/x86_64/kernel/trampoline.S                                |  168 ++
 b/arch/x86_64/kernel/vmlinux.lds.S                               |    2 
 b/arch/x86_64/kernel/vsyscall.c                                  |   10 
 b/arch/x86_64/mm/fault.c                                         |    4 
 b/arch/x86_64/mm/init.c                                          |  288 ++---
 b/arch/x86_64/mm/pageattr.c                                      |   20 
 b/include/asm-generic/vmlinux.lds.h                              |    2 
 b/include/asm-i386/page.h                                        |    4 
 b/include/asm-x86_64/const.h                                     |   20 
 b/include/asm-x86_64/page.h                                      |   44 
 b/include/asm-x86_64/pgtable.h                                   |   39 
 b/include/asm-x86_64/proto.h                                     |    2 
 b/include/asm-x86_64/segment.h                                   |    4 
 b/include/asm-x86_64/suspend.h                                   |   13 
 b/include/linux/elf.h                                            |   27 
 b/include/linux/elf_boot.h                                       |   19 
 b/include/linux/screen_info.h                                    |    3 
 b/scripts/kallsyms.c                                             |   30 
 linux-2.6.17.noarch/arch/x86_64/mm/init.c                        |    2 
 linux-2.6.18-rc3-1M-root/arch/i386/Kconfig                       |   34 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/bootsect.S               |    8 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/head.S        |   28 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/misc.c        |    7 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/vmlinux.lds   |    3 
 linux-2.6.18-rc3-1M-root/arch/i386/kernel/vmlinux.lds.S          |    5 
 linux-2.6.18-rc3-1M-root/arch/powerpc/kernel/vmlinux.lds.S       |    1 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/Makefile               |    3 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/compressed/vmlinux.lds |    2 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/tools/build.c          |  129 +-
 linux-2.6.18-rc3-1M-root/include/asm-i386/boot.h                 |    6 
 66 files changed, 3401 insertions(+), 1315 deletions(-)

Index: linux-2.6-x86-relocatable.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86-relocatable.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-x86-relocatable.patch	25 Aug 2006 19:18:19 -0000	1.2
+++ linux-2.6-x86-relocatable.patch	29 Aug 2006 21:36:32 -0000	1.3
@@ -273,7 +273,7 @@
 +	 * a relocatable kernel this is the delta to our load address otherwise
 +	 * this is the delta to CONFIG_PHYSICAL start.
 +	 */
-+#ifdef CONFIG_RELOCTABLE
++#ifdef CONFIG_RELOCATABLE
 +	movl %ebp, %ebx
 +#else
 +	movl $(CONFIG_PHYSICAL_START - startup_32), %ebx
@@ -7040,7 +7040,7 @@
 -	 * this is the delta to CONFIG_PHYSICAL start.
 -	 */
 +
- #ifdef CONFIG_RELOCTABLE
+ #ifdef CONFIG_RELOCATABLE
 -	movl %ebp, %ebx
 +	movl 	%ebp, %ebx
 +	addl    $(CONFIG_PHYSICAL_ALIGN - 1), %ebx

linux-2.6-xen-x86-relocatable.patch:
 arch/i386/kernel/head-xen.S               |    5 
 arch/i386/kernel/setup-xen.c              |    4 
 arch/i386/kernel/traps-xen.c              |    2 
 arch/i386/kernel/traps.c                  |    2 
 arch/i386/kernel/vmlinux.lds.S            |    6 
 arch/i386/mm/init-xen.c                   |   17 -
 arch/i386/mm/init.c                       |    2 
 arch/x86_64/kernel/e820-xen.c             |   13 -
 arch/x86_64/kernel/early_printk-xen.c     |    3 
 arch/x86_64/kernel/head-xen.S             |   19 -
 arch/x86_64/kernel/head64-xen.c           |   33 ++-
 arch/x86_64/kernel/setup-xen.c            |   30 +-
 arch/x86_64/kernel/setup64-xen.c          |    1 
 arch/x86_64/kernel/smp-xen.c              |    2 
 arch/x86_64/kernel/vmlinux.lds.S          |    5 
 arch/x86_64/kernel/vsyscall-xen.c         |   10 
 arch/x86_64/mm/fault-xen.c                |    4 
 arch/x86_64/mm/init-xen.c                 |  314 +++++++++++++++++-------------
 arch/x86_64/mm/pageattr-xen.c             |   20 +
 include/asm-i386/mach-xen/asm/page.h      |    4 
 include/asm-x86_64/mach-xen/asm/page.h    |   41 +--
 include/asm-x86_64/mach-xen/asm/pgtable.h |   39 ++-
 22 files changed, 326 insertions(+), 250 deletions(-)

Index: linux-2.6-xen-x86-relocatable.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-x86-relocatable.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-x86-relocatable.patch	25 Aug 2006 19:18:19 -0000	1.2
+++ linux-2.6-xen-x86-relocatable.patch	29 Aug 2006 21:36:33 -0000	1.3
@@ -364,9 +364,9 @@
  {
 -	unsigned long kernel_end;
 +	unsigned long kernel_start, kernel_end;
- 
- #if defined(CONFIG_XEN_PRIVILEGED_GUEST)
  	struct e820entry *machine_e820;
+ 	struct xen_memory_map memmap;
+
 @@ -643,11 +643,12 @@ void __init setup_arch(char **cmdline_p)
  	init_mm.end_code = (unsigned long) &_etext;
  	init_mm.end_data = (unsigned long) &_edata;



From fedora-cvs-commits at redhat.com  Tue Aug 29 21:56:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 17:56:11 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.7.92-chain-finalize.patch, NONE,
	1.1 evolution-data-server-1.7.92-fix-fd-leak.patch, 1.1,
	1.2 evolution-data-server.spec, 1.118, 1.119
Message-ID: <200608292156.k7TLuBDV030565@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30551

Modified Files:
	evolution-data-server-1.7.92-fix-fd-leak.patch 
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.7.92-chain-finalize.patch 
Log Message:

* Tue Aug 29 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.92-4.fc6
- Revise patch for RH bug #198935.
- Add patch for Gnome.org bug #353478.


evolution-data-server-1.7.92-chain-finalize.patch:
 server-logging.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE evolution-data-server-1.7.92-chain-finalize.patch ---
--- evolution-data-server-1.7.92/src/server-logging.c.chain-finalize	2006-08-29 16:30:38.000000000 -0400
+++ evolution-data-server-1.7.92/src/server-logging.c	2006-08-29 16:31:31.000000000 -0400
@@ -58,6 +58,8 @@
 	}
 	g_slist_free (priv->handlers);
 	priv->handlers = NULL;
+
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
@@ -66,6 +68,8 @@
 	ServerLogging *logging = SERVER_LOGGING (object);
 
 	g_free (logging->priv);
+
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void

evolution-data-server-1.7.92-fix-fd-leak.patch:
 camel-filter-driver.c |    5 ++++-
 camel-filter-search.c |    6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

Index: evolution-data-server-1.7.92-fix-fd-leak.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.7.92-fix-fd-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-1.7.92-fix-fd-leak.patch	28 Aug 2006 14:49:57 -0000	1.1
+++ evolution-data-server-1.7.92-fix-fd-leak.patch	29 Aug 2006 21:56:06 -0000	1.2
@@ -1,76 +1,50 @@
---- evolution-2.7.92/camel/camel-filter-driver.c	12 Apr 2006 19:14:13 -0000	1.96
-+++ evolution-2.7.92/camel/camel-filter-driver.c	28 Aug 2006 13:24:10 -0000
-@@ -686,6 +686,9 @@ child_setup_func (gpointer user_data)
- typedef struct {
- 	gint child_status;
- 	GMainLoop *loop;
-+	int fd_in;
-+	int fd_out;
-+	int fd_err;
- } child_watch_data_t;
- 
- static void
-@@ -699,6 +702,15 @@ child_watch (GPid     pid,
- 
- 	child_watch_data->child_status = status;
- 
-+	if (child_watch_data->fd_in != -1)
-+		close (child_watch_data->fd_in);
-+
-+	if (child_watch_data->fd_out != -1)
-+		close (child_watch_data->fd_out);
-+
-+	if (child_watch_data->fd_err != -1)
-+		close (child_watch_data->fd_err);
-+
- 	g_main_loop_quit (child_watch_data->loop);
- }
- 
-@@ -803,6 +815,9 @@ pipe_to_system (struct _ESExp *f, int ar
+--- evolution-data-server-1.7.92/camel/camel-filter-driver.c.fix-fd-leak	2006-08-29 17:17:18.000000000 -0400
++++ evolution-data-server-1.7.92/camel/camel-filter-driver.c	2006-08-29 17:17:34.000000000 -0400
+@@ -715,6 +715,7 @@
+ 	GPtrArray *args;
+ 	child_watch_data_t child_watch_data;
+ 	GSource *source;
++	GMainContext *context;
+ 	
+ 	if (argc < 1 || argv[0]->value.string[0] == '\0')
+ 		return 0;
+@@ -802,7 +803,9 @@
+ 	camel_object_unref (parser);
  	
   wait:
- 	child_watch_data.loop = g_main_loop_new (g_main_context_new (), FALSE);
-+	child_watch_data.fd_in = pipe_to_child;
-+	child_watch_data.fd_out = pipe_from_child;
-+	child_watch_data.fd_err = -1;
+-	child_watch_data.loop = g_main_loop_new (g_main_context_new (), FALSE);
++	context = g_main_context_new ();
++	child_watch_data.loop = g_main_loop_new (context, FALSE);
++	g_main_context_unref (context);
  
  	source = g_child_watch_source_new (child_pid);
  	g_source_set_callback (source, (GSourceFunc) child_watch, &child_watch_data, NULL);
---- evolution-2.7.92/camel/camel-filter-search.c	20 Apr 2006 17:52:34 -0000	1.54
-+++ evolution-2.7.92/camel/camel-filter-search.c	28 Aug 2006 13:24:10 -0000
-@@ -521,6 +521,9 @@ child_setup_func (gpointer user_data)
- typedef struct {
- 	gint child_status;
- 	GMainLoop *loop;
-+	int fd_in;
-+	int fd_out;
-+	int fd_err;
- } child_watch_data_t;
- 
- static void
-@@ -534,6 +537,15 @@ child_watch (GPid     pid,
+--- evolution-data-server-1.7.92/camel/camel-filter-search.c.fix-fd-leak	2006-08-29 17:17:04.000000000 -0400
++++ evolution-data-server-1.7.92/camel/camel-filter-search.c	2006-08-29 17:17:34.000000000 -0400
+@@ -533,7 +533,6 @@
+ 	g_spawn_close_pid (pid);
  
  	child_watch_data->child_status = status;
- 
-+	if (child_watch_data->fd_in != -1)
-+		close (child_watch_data->fd_in);
-+
-+	if (child_watch_data->fd_out != -1)
-+		close (child_watch_data->fd_out);
-+
-+	if (child_watch_data->fd_err != -1)
-+		close (child_watch_data->fd_err);
-+
+-
  	g_main_loop_quit (child_watch_data->loop);
  }
  
-@@ -591,6 +603,9 @@ run_command (struct _ESExp *f, int argc,
+@@ -549,6 +548,7 @@
+ 	GPtrArray *args;
+ 	child_watch_data_t child_watch_data;
+ 	GSource *source;
++	GMainContext *context;
+ 	
+ 	if (argc < 1 || argv[0]->value.string[0] == '\0')
+ 		return 0;
+@@ -590,7 +590,9 @@
+ 	camel_stream_flush (stream);
  	camel_object_unref (stream);
  	
- 	child_watch_data.loop = g_main_loop_new (g_main_context_new (), FALSE);
-+	child_watch_data.fd_in = pipe_to_child;	
-+	child_watch_data.fd_out = -1;
-+	child_watch_data.fd_err = -1;
+-	child_watch_data.loop = g_main_loop_new (g_main_context_new (), FALSE);
++	context = g_main_context_new ();
++	child_watch_data.loop = g_main_loop_new (context, FALSE);
++	g_main_context_unref (context);
  
  	source = g_child_watch_source_new (child_pid);
  	g_source_set_callback (source, (GSourceFunc) child_watch, &child_watch_data, NULL);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- evolution-data-server.spec	28 Aug 2006 14:49:57 -0000	1.118
+++ evolution-data-server.spec	29 Aug 2006 21:56:06 -0000	1.119
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -50,6 +50,9 @@
 # RH bug #198935 / Gnome.org bug #350907
 Patch18: evolution-data-server-1.7.92-fix-fd-leak.patch
 
+# Gnome.org bug #353478
+Patch19: evolution-data-server-1.7.92-chain-finalize.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -135,6 +138,7 @@
 %patch16 -p1 -b .maybe-fix-crash
 %patch17 -p1 -b .uninitialized-gerror
 %patch18 -p1 -b .fix-fd-leak
+%patch19 -p1 -b .chain-finalize
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -337,6 +341,10 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Tue Aug 29 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.92-4.fc6
+- Revise patch for RH bug #198935.
+- Add patch for Gnome.org bug #353478.
+
 * Mon Aug 28 2006 Ray Strode <rstrode at redhat.com> - 1.7.92-3.fc6
 - Add patch from Veerapuram Varadhan to fix fd leak (bug 198935).
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 21:57:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 17:57:20 -0400
Subject: rpms/evolution/devel evolution-2.7.92-chain-finalize.patch, NONE,
	1.1 evolution.spec, 1.187, 1.188
Message-ID: <200608292157.k7TLvKiT030645@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30628

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.92-chain-finalize.patch 
Log Message:

* Tue Aug 29 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-7.fc6
- Add patch for Gnome.org bug #353472.


evolution-2.7.92-chain-finalize.patch:
 calendar/ea-cal-view-event.c       |    2 ++
 calendar/ea-day-view-cell.c        |    2 ++
 calendar/ea-week-view-cell.c       |    2 ++
 e-table/gal-a11y-e-cell-registry.c |    2 ++
 widgets/ea-calendar-cell.c         |    2 ++
 5 files changed, 10 insertions(+)

--- NEW FILE evolution-2.7.92-chain-finalize.patch ---
--- evolution-2.7.92/a11y/widgets/ea-calendar-cell.c.chain-finalize	2006-08-29 15:01:12.000000000 -0400
+++ evolution-2.7.92/a11y/widgets/ea-calendar-cell.c	2006-08-29 15:01:34.000000000 -0400
@@ -203,6 +203,8 @@
 #ifdef ACC_DEBUG
 static void ea_calendar_cell_finalize (GObject *object)
 {
+        G_OBJECT_CLASS (parent_class)->finalize (object);
+
 	++n_ea_calendar_cell_destroyed;
 	g_print ("ACC_DEBUG: n_ea_calendar_cell_destroyed = %d\n",
 		n_ea_calendar_cell_destroyed);
--- evolution-2.7.92/a11y/calendar/ea-week-view-cell.c.chain-finalize	2006-08-29 15:10:07.000000000 -0400
+++ evolution-2.7.92/a11y/calendar/ea-week-view-cell.c	2006-08-29 15:10:26.000000000 -0400
@@ -190,6 +190,8 @@
 #ifdef ACC_DEBUG
 static void ea_week_view_cell_finalize (GObject *object)
 {
+        G_OBJECT_CLASS (parent_class)->finalize (object);
+
 	++n_ea_week_view_cell_destroyed;
 	printf ("ACC_DEBUG: n_ea_week_view_cell_destroyed = %d\n",
 		n_ea_week_view_cell_destroyed);
--- evolution-2.7.92/a11y/calendar/ea-day-view-cell.c.chain-finalize	2006-08-29 15:03:46.000000000 -0400
+++ evolution-2.7.92/a11y/calendar/ea-day-view-cell.c	2006-08-29 15:04:15.000000000 -0400
@@ -190,6 +190,8 @@
 #ifdef ACC_DEBUG
 static void ea_day_view_cell_finalize (GObject *object)
 {
+	G_OBJECT_CLASS (parent_class)->finalize (object);
+
 	++n_ea_day_view_cell_destroyed;
 	printf ("ACC_DEBUG: n_ea_day_view_cell_destroyed = %d\n",
 		n_ea_day_view_cell_destroyed);
--- evolution-2.7.92/a11y/calendar/ea-cal-view-event.c.chain-finalize	2006-08-29 15:06:27.000000000 -0400
+++ evolution-2.7.92/a11y/calendar/ea-cal-view-event.c	2006-08-29 15:08:08.000000000 -0400
@@ -156,6 +156,8 @@
 #ifdef ACC_DEBUG
 static void ea_cal_view_finalize (GObject *object)
 {
+	G_OBJECT_CLASS (parent_class)->finalize (object);
+
 	++n_ea_cal_view_event_destroyed;
 	printf ("ACC_DEBUG: n_ea_cal_view_event_destroyed = %d\n",
 		n_ea_cal_view_event_destroyed);
--- evolution-2.7.92/a11y/e-table/gal-a11y-e-cell-registry.c.chain-finalize	2006-08-29 15:13:20.000000000 -0400
+++ evolution-2.7.92/a11y/e-table/gal-a11y-e-cell-registry.c	2006-08-29 15:13:38.000000000 -0400
@@ -28,6 +28,8 @@
 
 	g_hash_table_destroy (registry->priv->table);
 	g_free (registry->priv);
+
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- evolution.spec	28 Aug 2006 17:23:31 -0000	1.187
+++ evolution.spec	29 Aug 2006 21:57:17 -0000	1.188
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.92
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -138,6 +138,9 @@
 # RH bug #202289
 Patch38: evolution-2.7.92-fix-prgname.patch
 
+# Gnome.org bug #353472
+Patch39: evolution-2.7.92-chain-finalize.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -278,6 +281,7 @@
 %patch36 -p1 -b .deprecated-gdk
 %patch37 -p1 -b .fix-edit-copy
 %patch38 -p1 -b .fix-prgname
+%patch39 -p1 -b .chain-finalize
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -668,6 +672,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Aug 29 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-7.fc6
+- Add patch for Gnome.org bug #353472.
+
 * Mon Aug 28 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-6.fc6
 - Add another hunk to the patch for RH bug #201541.
 - Add patch for RH bug #202289.



From fedora-cvs-commits at redhat.com  Tue Aug 29 22:11:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 18:11:02 -0400
Subject: rpms/freetype/devel freetype-composite.patch, NONE,
	1.1 freetype-more-composite.patch, NONE, 1.1 freetype.spec,
	1.42, 1.43
Message-ID: <200608292211.k7TMB2uJ030864@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30847

Modified Files:
	freetype.spec 
Added Files:
	freetype-composite.patch freetype-more-composite.patch 
Log Message:
- Add freetype-composite.patch and freetype-more-composite.patch
  from upstream. (#131851)


freetype-composite.patch:
 ttgload.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE freetype-composite.patch ---
Index: freetype-2.2.1/src/truetype/ttgload.c
===================================================================
--- freetype-2.2.1.orig/src/truetype/ttgload.c	2006-02-14 22:44:56.000000000 +0200
+++ freetype-2.2.1/src/truetype/ttgload.c	2006-06-22 20:44:52.000000000 +0300
@@ -932,7 +932,7 @@
   {
     FT_Error     error;
     FT_Outline*  outline;
-
+    int i;
 
     outline = &loader->gloader->base.outline;
 
@@ -989,6 +989,12 @@
 
     tt_prepare_zone( &loader->zone, &loader->gloader->base,
                      start_point, start_contour );
+    /* Some points are likely touched during execution of
+     * instructions on components. So let's untouch them.
+     */
+    for (i = start_point; i < loader->zone.n_points; i++)
+           loader->zone.tags[i] &= ~(FT_CURVE_TAG_TOUCH_X | FT_CURVE_TAG_TOUCH_Y);
+
     loader->zone.n_points += 4;
 
     return TT_Hint_Glyph( loader, 1 );

freetype-more-composite.patch:
 include/freetype/internal/tttypes.h |    1 +
 src/truetype/ttgload.c              |    1 +
 src/truetype/ttinterp.c             |    6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE freetype-more-composite.patch ---
Index: freetype-2.2.1/include/freetype/internal/tttypes.h
===================================================================
--- freetype-2.2.1.orig/include/freetype/internal/tttypes.h	2006-03-24 14:41:22.000000000 +0200
+++ freetype-2.2.1/include/freetype/internal/tttypes.h	2006-06-24 22:02:59.000000000 +0300
@@ -1472,6 +1472,7 @@
     FT_Byte*    tags;       /* current touch flags         */
     FT_UShort*  contours;   /* contour end points          */
 
+    FT_UShort   first_point /* offset of first (#0) point  */
   } TT_GlyphZoneRec, *TT_GlyphZone;
 
 
Index: freetype-2.2.1/src/truetype/ttgload.c
===================================================================
--- freetype-2.2.1.orig/src/truetype/ttgload.c	2006-06-24 22:03:08.000000000 +0300
+++ freetype-2.2.1/src/truetype/ttgload.c	2006-06-24 22:03:36.000000000 +0300
@@ -572,6 +572,7 @@
     zone->cur        = load->outline.points + start_point;
     zone->tags       = (FT_Byte*)load->outline.tags + start_point;
     zone->contours   = (FT_UShort*)load->outline.contours + start_contour;
+    zone->first_point = start_point;
   }
 
 
Index: freetype-2.2.1/src/truetype/ttinterp.c
===================================================================
--- freetype-2.2.1.orig/src/truetype/ttinterp.c	2006-06-24 22:03:54.000000000 +0300
+++ freetype-2.2.1/src/truetype/ttinterp.c	2006-06-24 22:04:31.000000000 +0300
@@ -5379,9 +5379,9 @@
     if ( contour == 0 )
       first_point = 0;
     else
-      first_point = (FT_UShort)(CUR.pts.contours[contour - 1] + 1);
+      first_point = (FT_UShort)(CUR.pts.contours[contour - 1] + 1 - CUR.pts.first_point);
 
-    last_point = CUR.pts.contours[contour];
+    last_point = CUR.pts.contours[contour] - CUR.pts.first_point;
 
     /* XXX: this is probably wrong... at least it prevents memory */
     /*      corruption when zp2 is the twilight zone              */
@@ -6315,7 +6315,7 @@
 
     do
     {
-      end_point   = CUR.pts.contours[contour];
+      end_point   = CUR.pts.contours[contour] - CUR.pts.first_point;
       first_point = point;
 
       while ( point <= end_point && (CUR.pts.tags[point] & mask) == 0 )


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- freetype.spec	28 Aug 2006 19:04:55 -0000	1.42
+++ freetype.spec	29 Aug 2006 22:10:59 -0000	1.43
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.2.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -25,6 +25,10 @@
 # Fix multilib conflicts
 Patch88:  freetype-multilib.patch
 
+# Upstream patches
+Patch100: freetype-composite.patch
+Patch101: freetype-more-composite.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -78,6 +82,9 @@
 
 %patch88 -p1 -b .multilib
 
+%patch100 -p1 -b .composite
+%patch101 -p1 -b .more-composite
+
 %build
 # Work around code generation problem with strict-aliasing
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021
@@ -194,6 +201,10 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Tue Aug 29 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-8
+- Add freetype-composite.patch and freetype-more-composite.patch
+  from upstream. (#131851)
+
 * Mon Aug 28 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.1-7
 - Require pkgconfig in the -devel package
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 22:22:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 18:22:39 -0400
Subject: rpms/kernel/devel/configs config-generic,1.246,1.247
Message-ID: <200608292222.k7TMMd5m013983@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv13953/configs

Modified Files:
	config-generic 
Log Message:
Update to kernel 2.6.18-rc5-git1


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- config-generic	22 Aug 2006 23:15:00 -0000	1.246
+++ config-generic	29 Aug 2006 22:22:36 -0000	1.247
@@ -926,6 +926,9 @@
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
 CONFIG_SMSC_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_FIXED_MII_10_FDX=y
+CONFIG_FIXED_MII_100_FDX=y
 CONFIG_VITESSE_PHY=m
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
@@ -983,6 +986,7 @@
 CONFIG_TLAN=m
 CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_RHINE_NAPI=y
 CONFIG_VIA_VELOCITY=m
 CONFIG_NET_POCKET=y
 CONFIG_ATP=m



From fedora-cvs-commits at redhat.com  Tue Aug 29 22:22:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 18:22:39 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc5-git1.bz2.sign, NONE,
	1.1 patch-2.6.18-rc5.bz2.sign, NONE, 1.1 .cvsignore, 1.514,
	1.515 kernel-2.6.spec, 1.2600,
	1.2601 linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch,
	1.1, 1.2 linux-2.6-lockdep-fixes.patch, 1.23,
	1.24 linux-2.6-nfs-special-tests-fix.patch, 1.1,
	1.2 linux-2.6-nfs-superblock-sharing.patch, 1.3, 1.4 sources,
	1.477, 1.478 upstream, 1.414,
	1.415 patch-2.6.18-rc4-git1.bz2.sign, 1.1,
	NONE patch-2.6.18-rc4.bz2.sign, 1.1, NONE
Message-ID: <200608292222.k7TMMdYG013976@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13953

Modified Files:
	.cvsignore kernel-2.6.spec 
	linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch 
	linux-2.6-lockdep-fixes.patch 
	linux-2.6-nfs-special-tests-fix.patch 
	linux-2.6-nfs-superblock-sharing.patch sources upstream 
Added Files:
	patch-2.6.18-rc5-git1.bz2.sign patch-2.6.18-rc5.bz2.sign 
Removed Files:
	patch-2.6.18-rc4-git1.bz2.sign patch-2.6.18-rc4.bz2.sign 
Log Message:
Update to kernel 2.6.18-rc5-git1


--- NEW FILE patch-2.6.18-rc5-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBE8+ZryGugalF9Dw4RArt2AJ9zSXT/BfmGlOJ4qyuCqxHsxRtQSQCfZBI6
I7kjwuh8AjxCQHSJZWXFHNk=
=S8wV
-----END PGP SIGNATURE-----


--- NEW FILE patch-2.6.18-rc5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBE8m+zyGugalF9Dw4RAsJwAJ9hdDdQk6UvaYRDb4qSmLUGLQZK1wCeL88G
wPWdjfu1zao3XGkEczPc1Yg=
=o9gs
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -r1.514 -r1.515
--- .cvsignore	25 Aug 2006 21:25:44 -0000	1.514
+++ .cvsignore	29 Aug 2006 22:22:34 -0000	1.515
@@ -3,6 +3,6 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-patch-2.6.18-rc4.bz2
-patch-2.6.18-rc4-git1.bz2
 xen-11251.tar.bz2
+patch-2.6.18-rc5.bz2
+patch-2.6.18-rc5-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2600
retrieving revision 1.2601
diff -u -r1.2600 -r1.2601
--- kernel-2.6.spec	29 Aug 2006 22:17:39 -0000	1.2600
+++ kernel-2.6.spec	29 Aug 2006 22:22:34 -0000	1.2601
@@ -294,8 +294,8 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.18-rc4.bz2
-Patch2: patch-2.6.18-rc4-git1.bz2
+Patch1: patch-2.6.18-rc5.bz2
+Patch2: patch-2.6.18-rc5-git1.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -1815,10 +1815,13 @@
 %endif
 
 %changelog
+* Tue Aug 29 2006 Jarod Wilson <jwilson at redhat.com>
+- 2.6.18-rc5-git1
+
 * Tue Aug 29 2006 Jeremy Katz <katzj at redhat.com>
 - Fix serial console with xen dom0
 
-* Tue Aug 28 2006 Don Zickus <dzickus at redhat.com>
+* Tue Aug 29 2006 Don Zickus <dzickus at redhat.com>
 - enabled EHEA driver
 - x86 relocatable fixes
 - audit code fixes for cachefs

linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch:
 iscsi_iser.c |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

Index: linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch	13 Jul 2006 21:17:51 -0000	1.1
+++ linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch	29 Aug 2006 22:22:35 -0000	1.2
@@ -1,7 +1,6 @@
-diff -Naurp linux-2.6.17.x86_64/drivers/infiniband/ulp/iser/iscsi_iser.c linux-2.6.17.x86_64.iscsi/drivers/infiniband/ulp/iser/iscsi_iser.c
---- linux-2.6.17.x86_64/drivers/infiniband/ulp/iser/iscsi_iser.c	2006-07-13 14:42:40.000000000 -0500
-+++ linux-2.6.17.x86_64.iscsi/drivers/infiniband/ulp/iser/iscsi_iser.c	2006-07-13 14:46:28.000000000 -0500
-@@ -285,6 +285,21 @@ iscsi_iser_ib_conn_lookup(__u64 ep_handl
+--- linux-2.6.17.noarch.orig/drivers/infiniband/ulp/iser/iscsi_iser.c	2006-08-29 16:20:26.000000000 -0400
++++ linux-2.6.17.noarch/drivers/infiniband/ulp/iser/iscsi_iser.c	2006-08-29 16:19:42.000000000 -0400
+@@ -285,6 +285,31 @@
  	return NULL;
  }
  
@@ -11,8 +10,8 @@
 +	struct iscsi_iser_conn *iser_conn = conn->dd_data;
 +	struct iser_conn *ib_conn = iser_conn->ib_conn;
 +
-+	if(!ib_conn) 
-+		return;
++	if(!ib_conn)
++	return;
 +
 +	/* starts conn teardown process, waits until all previously   *
 +	 * posted buffers get flushed, deallocates all conn resources */
@@ -20,10 +19,20 @@
 +	iser_conn->ib_conn = NULL;
 +}
 +
++
++static void
++iscsi_iser_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
++{
++	struct iscsi_conn *conn = cls_conn->dd_data;
++
++	iscsi_conn_stop(cls_conn, flag);
++	iscsi_iser_conn_terminate(conn);
++}
++
  static struct iscsi_cls_conn *
  iscsi_iser_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
  {
-@@ -326,6 +341,7 @@ iscsi_iser_conn_destroy(struct iscsi_cls
+@@ -326,6 +351,7 @@
  	struct iscsi_conn *conn = cls_conn->dd_data;
  	struct iscsi_iser_conn *iser_conn = conn->dd_data;
  
@@ -31,36 +40,12 @@
  	iscsi_conn_teardown(cls_conn);
  	kfree(iser_conn);
  }
-@@ -379,20 +395,14 @@ iscsi_iser_conn_start(struct iscsi_cls_c
- }
- 
- static void
--iscsi_iser_conn_terminate(struct iscsi_conn *conn)
-+iscsi_iser_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
- {
--	struct iscsi_iser_conn *iser_conn = conn->dd_data;
--	struct iser_conn *ib_conn = iser_conn->ib_conn;
-+	struct iscsi_conn *conn = cls_conn->dd_data;
- 
--	BUG_ON(!ib_conn);
--	/* starts conn teardown process, waits until all previously   *
--	 * posted buffers get flushed, deallocates all conn resources */
--	iser_conn_terminate(ib_conn);
--	iser_conn->ib_conn = NULL;
--	conn->recv_lock = NULL;
-+	iscsi_conn_stop(cls_conn, flag);
-+	iscsi_iser_conn_terminate(conn);
- }
- 
--
- static struct iscsi_transport iscsi_iser_transport;
- 
- static struct iscsi_cls_session *
-@@ -562,7 +572,11 @@ iscsi_iser_ep_disconnect(__u64 ep_handle
+@@ -547,7 +573,12 @@
+ 		return;
  
  	iser_err("ib conn %p state %d\n",ib_conn, ib_conn->state);
- 
 -	iser_conn_terminate(ib_conn);
++
 +	/* under some err flows the ib conn isn't yet bounded to iscsi conn */
 +	if (ib_conn->iser_conn)
 +		iscsi_iser_conn_terminate(ib_conn->iser_conn->iscsi_conn);
@@ -69,1059 +54,12 @@
  }
  
  static struct scsi_host_template iscsi_iser_sht = {
-@@ -613,10 +627,7 @@ static struct iscsi_transport iscsi_iser
+@@ -598,7 +629,7 @@
  	.get_conn_param		= iscsi_conn_get_param,
  	.get_session_param	= iscsi_session_get_param,
  	.start_conn             = iscsi_iser_conn_start,
 -	.stop_conn              = iscsi_conn_stop,
--	/* these are called as part of conn recovery */
--	.suspend_conn_recv	= NULL, /* FIXME is/how this relvant to iser? */
--	.terminate_conn		= iscsi_iser_conn_terminate,
 +	.stop_conn              = iscsi_iser_conn_stop,
  	/* IO */
  	.send_pdu		= iscsi_conn_send_pdu,
  	.get_stats		= iscsi_iser_conn_get_stats,
-diff -Naurp linux-2.6.17.x86_64/drivers/scsi/iscsi_tcp.c linux-2.6.17.x86_64.iscsi/drivers/scsi/iscsi_tcp.c
---- linux-2.6.17.x86_64/drivers/scsi/iscsi_tcp.c	2006-07-13 14:42:44.000000000 -0500
-+++ linux-2.6.17.x86_64.iscsi/drivers/scsi/iscsi_tcp.c	2006-07-13 14:46:32.000000000 -0500
-@@ -43,13 +43,10 @@
- 
- #include "iscsi_tcp.h"
- 
--#define ISCSI_TCP_VERSION "1.0-595"
--
- MODULE_AUTHOR("Dmitry Yusupov <dmitry_yus at yahoo.com>, "
- 	      "Alex Aizman <itn780 at yahoo.com>");
- MODULE_DESCRIPTION("iSCSI/TCP data-path");
- MODULE_LICENSE("GPL");
--MODULE_VERSION(ISCSI_TCP_VERSION);
- /* #define DEBUG_TCP */
- #define DEBUG_ASSERT
- 
-@@ -185,11 +182,19 @@ iscsi_hdr_extract(struct iscsi_tcp_conn 
-  * must be called with session lock
-  */
- static void
--__iscsi_ctask_cleanup(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
-+iscsi_tcp_cleanup_ctask(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
- {
- 	struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
-+	struct iscsi_r2t_info *r2t;
- 	struct scsi_cmnd *sc;
- 
-+	/* flush ctask's r2t queues */
-+	while (__kfifo_get(tcp_ctask->r2tqueue, (void*)&r2t, sizeof(void*))) {
-+		__kfifo_put(tcp_ctask->r2tpool.queue, (void*)&r2t,
-+			    sizeof(void*));
-+		debug_scsi("iscsi_tcp_cleanup_ctask pending r2t dropped\n");
-+	}
-+
- 	sc = ctask->sc;
- 	if (unlikely(!sc))
- 		return;
-@@ -374,6 +379,7 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, s
- 		spin_unlock(&session->lock);
- 		return 0;
- 	}
-+
- 	rc = __kfifo_get(tcp_ctask->r2tpool.queue, (void*)&r2t, sizeof(void*));
- 	BUG_ON(!rc);
- 
-@@ -399,7 +405,7 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, s
- 	tcp_ctask->exp_r2tsn = r2tsn + 1;
- 	tcp_ctask->xmstate |= XMSTATE_SOL_HDR;
- 	__kfifo_put(tcp_ctask->r2tqueue, (void*)&r2t, sizeof(void*));
--	__kfifo_put(conn->xmitqueue, (void*)&ctask, sizeof(void*));
-+	list_move_tail(&ctask->running, &conn->xmitqueue);
- 
- 	scsi_queue_work(session->host, &conn->xmitwork);
- 	conn->r2t_pdus_cnt++;
-@@ -477,6 +483,8 @@ iscsi_tcp_hdr_recv(struct iscsi_conn *co
- 	case ISCSI_OP_SCSI_DATA_IN:
- 		tcp_conn->in.ctask = session->cmds[itt];
- 		rc = iscsi_data_rsp(conn, tcp_conn->in.ctask);
-+		if (rc)
-+			return rc;
- 		/* fall through */
- 	case ISCSI_OP_SCSI_CMD_RSP:
- 		tcp_conn->in.ctask = session->cmds[itt];
-@@ -484,7 +492,7 @@ iscsi_tcp_hdr_recv(struct iscsi_conn *co
- 			goto copy_hdr;
- 
- 		spin_lock(&session->lock);
--		__iscsi_ctask_cleanup(conn, tcp_conn->in.ctask);
-+		iscsi_tcp_cleanup_ctask(conn, tcp_conn->in.ctask);
- 		rc = __iscsi_complete_pdu(conn, hdr, NULL, 0);
- 		spin_unlock(&session->lock);
- 		break;
-@@ -500,13 +508,28 @@ iscsi_tcp_hdr_recv(struct iscsi_conn *co
- 		break;
- 	case ISCSI_OP_LOGIN_RSP:
- 	case ISCSI_OP_TEXT_RSP:
--	case ISCSI_OP_LOGOUT_RSP:
--	case ISCSI_OP_NOOP_IN:
- 	case ISCSI_OP_REJECT:
- 	case ISCSI_OP_ASYNC_EVENT:
-+		/*
-+		 * It is possible that we could get a PDU with a buffer larger
-+		 * than 8K, but there are no targets that currently do this.
-+		 * For now we fail until we find a vendor that needs it
-+		 */
-+		if (DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH <
-+		    tcp_conn->in.datalen) {
-+			printk(KERN_ERR "iscsi_tcp: received buffer of len %u "
-+			      "but conn buffer is only %u (opcode %0x)\n",
-+			      tcp_conn->in.datalen,
-+			      DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH, opcode);
-+			rc = ISCSI_ERR_PROTO;
-+			break;
-+		}
-+
- 		if (tcp_conn->in.datalen)
- 			goto copy_hdr;
- 	/* fall through */
-+	case ISCSI_OP_LOGOUT_RSP:
-+	case ISCSI_OP_NOOP_IN:
- 	case ISCSI_OP_SCSI_TMFUNC_RSP:
- 		rc = iscsi_complete_pdu(conn, hdr, NULL, 0);
- 		break;
-@@ -523,7 +546,7 @@ copy_hdr:
- 	 * skbs to complete the command then we have to copy the header
- 	 * for later use
- 	 */
--	if (tcp_conn->in.zero_copy_hdr && tcp_conn->in.copy <
-+	if (tcp_conn->in.zero_copy_hdr && tcp_conn->in.copy <=
- 	   (tcp_conn->in.datalen + tcp_conn->in.padding +
- 	    (conn->datadgst_en ? 4 : 0))) {
- 		debug_tcp("Copying header for later use. in.copy %d in.datalen"
-@@ -614,9 +637,9 @@ iscsi_ctask_copy(struct iscsi_tcp_conn *
-  *	byte counters.
-  **/
- static inline int
--iscsi_tcp_copy(struct iscsi_tcp_conn *tcp_conn)
-+iscsi_tcp_copy(struct iscsi_conn *conn)
- {
--	void *buf = tcp_conn->data;
-+	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
- 	int buf_size = tcp_conn->in.datalen;
- 	int buf_left = buf_size - tcp_conn->data_copied;
- 	int size = min(tcp_conn->in.copy, buf_left);
-@@ -627,7 +650,7 @@ iscsi_tcp_copy(struct iscsi_tcp_conn *tc
- 	BUG_ON(size <= 0);
- 
- 	rc = skb_copy_bits(tcp_conn->in.skb, tcp_conn->in.offset,
--			   (char*)buf + tcp_conn->data_copied, size);
-+			   (char*)conn->data + tcp_conn->data_copied, size);
- 	BUG_ON(rc);
- 
- 	tcp_conn->in.offset += size;
-@@ -745,10 +768,11 @@ static int iscsi_scsi_data_in(struct isc
- done:
- 	/* check for non-exceptional status */
- 	if (tcp_conn->in.hdr->flags & ISCSI_FLAG_DATA_STATUS) {
--		debug_scsi("done [sc %lx res %d itt 0x%x]\n",
--			   (long)sc, sc->result, ctask->itt);
-+		debug_scsi("done [sc %lx res %d itt 0x%x flags 0x%x]\n",
-+			   (long)sc, sc->result, ctask->itt,
-+			   tcp_conn->in.hdr->flags);
- 		spin_lock(&conn->session->lock);
--		__iscsi_ctask_cleanup(conn, ctask);
-+		iscsi_tcp_cleanup_ctask(conn, ctask);
- 		__iscsi_complete_pdu(conn, tcp_conn->in.hdr, NULL, 0);
- 		spin_unlock(&conn->session->lock);
- 	}
-@@ -769,26 +793,25 @@ iscsi_data_recv(struct iscsi_conn *conn)
- 		break;
- 	case ISCSI_OP_SCSI_CMD_RSP:
- 		spin_lock(&conn->session->lock);
--		__iscsi_ctask_cleanup(conn, tcp_conn->in.ctask);
-+		iscsi_tcp_cleanup_ctask(conn, tcp_conn->in.ctask);
- 		spin_unlock(&conn->session->lock);
- 	case ISCSI_OP_TEXT_RSP:
- 	case ISCSI_OP_LOGIN_RSP:
--	case ISCSI_OP_NOOP_IN:
- 	case ISCSI_OP_ASYNC_EVENT:
- 	case ISCSI_OP_REJECT:
- 		/*
- 		 * Collect data segment to the connection's data
- 		 * placeholder
- 		 */
--		if (iscsi_tcp_copy(tcp_conn)) {
-+		if (iscsi_tcp_copy(conn)) {
- 			rc = -EAGAIN;
- 			goto exit;
- 		}
- 
--		rc = iscsi_complete_pdu(conn, tcp_conn->in.hdr, tcp_conn->data,
-+		rc = iscsi_complete_pdu(conn, tcp_conn->in.hdr, conn->data,
- 					tcp_conn->in.datalen);
- 		if (!rc && conn->datadgst_en && opcode != ISCSI_OP_LOGIN_RSP)
--			iscsi_recv_digest_update(tcp_conn, tcp_conn->data,
-+			iscsi_recv_digest_update(tcp_conn, conn->data,
- 			  			tcp_conn->in.datalen);
- 		break;
- 	default:
-@@ -843,7 +866,7 @@ more:
- 		       if (rc == -EAGAIN)
- 				goto nomore;
- 		       else {
--				iscsi_conn_failure(conn, rc);
-+				iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
- 				return 0;
- 		       }
- 		}
-@@ -897,7 +920,7 @@ more:
- 		if (rc) {
- 			if (rc == -EAGAIN)
- 				goto again;
--			iscsi_conn_failure(conn, rc);
-+			iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
- 			return 0;
- 		}
- 		tcp_conn->in.copy -= tcp_conn->in.padding;
-@@ -1028,9 +1051,8 @@ iscsi_conn_set_callbacks(struct iscsi_co
- }
- 
- static void
--iscsi_conn_restore_callbacks(struct iscsi_conn *conn)
-+iscsi_conn_restore_callbacks(struct iscsi_tcp_conn *tcp_conn)
- {
--	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
- 	struct sock *sk = tcp_conn->sock->sk;
- 
- 	/* restore socket callbacks, see also: iscsi_conn_set_callbacks() */
-@@ -1308,7 +1330,7 @@ iscsi_tcp_cmd_init(struct iscsi_cmd_task
- 				    ctask->imm_count -
- 				    ctask->unsol_count;
- 
--		debug_scsi("cmd [itt %x total %d imm %d imm_data %d "
-+		debug_scsi("cmd [itt 0x%x total %d imm %d imm_data %d "
- 			   "r2t_data %d]\n",
- 			   ctask->itt, ctask->total_length, ctask->imm_count,
- 			   ctask->unsol_count, tcp_ctask->r2t_data_count);
-@@ -1636,7 +1658,7 @@ handle_xmstate_sol_data(struct iscsi_con
- 	}
- solicit_again:
- 	/*
--	 * send Data-Out whitnin this R2T sequence.
-+	 * send Data-Out within this R2T sequence.
- 	 */
- 	if (!r2t->data_count)
- 		goto data_out_done;
-@@ -1731,7 +1753,7 @@ handle_xmstate_w_pad(struct iscsi_conn *
- 	struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
- 	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
- 	struct iscsi_data_task *dtask = tcp_ctask->dtask;
--	int sent, rc;
-+	int sent = 0, rc;
- 
- 	tcp_ctask->xmstate &= ~XMSTATE_W_PAD;
- 	iscsi_buf_init_iov(&tcp_ctask->sendbuf, (char*)&tcp_ctask->pad,
-@@ -1900,27 +1922,32 @@ iscsi_tcp_conn_create(struct iscsi_cls_s
- 	tcp_conn->in_progress = IN_PROGRESS_WAIT_HEADER;
- 	/* initial operational parameters */
- 	tcp_conn->hdr_size = sizeof(struct iscsi_hdr);
--	tcp_conn->data_size = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
--
--	/* allocate initial PDU receive place holder */
--	if (tcp_conn->data_size <= PAGE_SIZE)
--		tcp_conn->data = kmalloc(tcp_conn->data_size, GFP_KERNEL);
--	else
--		tcp_conn->data = (void*)__get_free_pages(GFP_KERNEL,
--					get_order(tcp_conn->data_size));
--	if (!tcp_conn->data)
--		goto max_recv_dlenght_alloc_fail;
- 
- 	return cls_conn;
- 
--max_recv_dlenght_alloc_fail:
--	kfree(tcp_conn);
- tcp_conn_alloc_fail:
- 	iscsi_conn_teardown(cls_conn);
- 	return NULL;
- }
- 
- static void
-+iscsi_tcp_release_conn(struct iscsi_conn *conn)
-+{
-+	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
-+
-+	if (!tcp_conn->sock)
-+		return;
-+
-+	sock_hold(tcp_conn->sock->sk);
-+	iscsi_conn_restore_callbacks(tcp_conn);
-+	sock_put(tcp_conn->sock->sk);
-+
-+	sock_release(tcp_conn->sock);
-+	tcp_conn->sock = NULL;
-+	conn->recv_lock = NULL;
-+}
-+
-+static void
- iscsi_tcp_conn_destroy(struct iscsi_cls_conn *cls_conn)
- {
- 	struct iscsi_conn *conn = cls_conn->dd_data;
-@@ -1930,6 +1957,7 @@ iscsi_tcp_conn_destroy(struct iscsi_cls_
- 	if (conn->hdrdgst_en || conn->datadgst_en)
- 		digest = 1;
- 
-+	iscsi_tcp_release_conn(conn);
- 	iscsi_conn_teardown(cls_conn);
- 
- 	/* now free tcp_conn */
-@@ -1944,15 +1972,18 @@ iscsi_tcp_conn_destroy(struct iscsi_cls_
- 			crypto_free_tfm(tcp_conn->data_rx_tfm);
- 	}
- 
--	/* free conn->data, size = MaxRecvDataSegmentLength */
--	if (tcp_conn->data_size <= PAGE_SIZE)
--		kfree(tcp_conn->data);
--	else
--		free_pages((unsigned long)tcp_conn->data,
--			   get_order(tcp_conn->data_size));
- 	kfree(tcp_conn);
- }
- 
-+static void
-+iscsi_tcp_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
-+{
-+	struct iscsi_conn *conn = cls_conn->dd_data;
-+
-+	iscsi_conn_stop(cls_conn, flag);
-+	iscsi_tcp_release_conn(conn);
-+}
-+
- static int
- iscsi_tcp_conn_bind(struct iscsi_cls_session *cls_session,
- 		    struct iscsi_cls_conn *cls_conn, uint64_t transport_eph,
-@@ -2001,52 +2032,6 @@ iscsi_tcp_conn_bind(struct iscsi_cls_ses
- 	return 0;
- }
- 
--static void
--iscsi_tcp_cleanup_ctask(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
--{
--	struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
--	struct iscsi_r2t_info *r2t;
--
--	/* flush ctask's r2t queues */
--	while (__kfifo_get(tcp_ctask->r2tqueue, (void*)&r2t, sizeof(void*)))
--		__kfifo_put(tcp_ctask->r2tpool.queue, (void*)&r2t,
--			    sizeof(void*));
--
--	__iscsi_ctask_cleanup(conn, ctask);
--}
--
--static void
--iscsi_tcp_suspend_conn_rx(struct iscsi_conn *conn)
--{
--	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
--	struct sock *sk;
--
--	if (!tcp_conn->sock)
--		return;
--
--	sk = tcp_conn->sock->sk;
--	write_lock_bh(&sk->sk_callback_lock);
--	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
--	write_unlock_bh(&sk->sk_callback_lock);
--}
--
--static void
--iscsi_tcp_terminate_conn(struct iscsi_conn *conn)
--{
--	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
--
--	if (!tcp_conn->sock)
--		return;
--
--	sock_hold(tcp_conn->sock->sk);
--	iscsi_conn_restore_callbacks(conn);
--	sock_put(tcp_conn->sock->sk);
--
--	sock_release(tcp_conn->sock);
--	tcp_conn->sock = NULL;
--	conn->recv_lock = NULL;
--}
--
- /* called with host lock */
- static void
- iscsi_tcp_mgmt_init(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask,
-@@ -2057,6 +2042,7 @@ iscsi_tcp_mgmt_init(struct iscsi_conn *c
- 	iscsi_buf_init_iov(&tcp_mtask->headbuf, (char*)mtask->hdr,
- 			   sizeof(struct iscsi_hdr));
- 	tcp_mtask->xmstate = XMSTATE_IMM_HDR;
-+	tcp_mtask->sent = 0;
- 
- 	if (mtask->data_count)
- 		iscsi_buf_init_iov(&tcp_mtask->sendbuf, (char*)mtask->data,
-@@ -2138,39 +2124,6 @@ iscsi_conn_set_param(struct iscsi_cls_co
- 	int value;
- 
- 	switch(param) {
--	case ISCSI_PARAM_MAX_RECV_DLENGTH: {
--		char *saveptr = tcp_conn->data;
--		gfp_t flags = GFP_KERNEL;
--
--		sscanf(buf, "%d", &value);
--		if (tcp_conn->data_size >= value) {
--			iscsi_set_param(cls_conn, param, buf, buflen);
--			break;
--		}
--
--		spin_lock_bh(&session->lock);
--		if (conn->stop_stage == STOP_CONN_RECOVER)
--			flags = GFP_ATOMIC;
--		spin_unlock_bh(&session->lock);
--
--		if (value <= PAGE_SIZE)
--			tcp_conn->data = kmalloc(value, flags);
--		else
--			tcp_conn->data = (void*)__get_free_pages(flags,
--							     get_order(value));
--		if (tcp_conn->data == NULL) {
--			tcp_conn->data = saveptr;
--			return -ENOMEM;
--		}
--		if (tcp_conn->data_size <= PAGE_SIZE)
--			kfree(saveptr);
--		else
--			free_pages((unsigned long)saveptr,
--				   get_order(tcp_conn->data_size));
--		iscsi_set_param(cls_conn, param, buf, buflen);
--		tcp_conn->data_size = value;
--		break;
--		}
- 	case ISCSI_PARAM_HDRDGST_EN:
- 		iscsi_set_param(cls_conn, param, buf, buflen);
- 		tcp_conn->hdr_size = sizeof(struct iscsi_hdr);
-@@ -2361,8 +2314,7 @@ static void iscsi_tcp_session_destroy(st
- }
- 
- static struct scsi_host_template iscsi_sht = {
--	.name			= "iSCSI Initiator over TCP/IP, v"
--				  ISCSI_TCP_VERSION,
-+	.name			= "iSCSI Initiator over TCP/IP",
- 	.queuecommand           = iscsi_queuecommand,
- 	.change_queue_depth	= iscsi_change_queue_depth,
- 	.can_queue		= ISCSI_XMIT_CMDS_MAX - 1,
-@@ -2414,10 +2366,7 @@ static struct iscsi_transport iscsi_tcp_
- 	.get_conn_param		= iscsi_tcp_conn_get_param,
- 	.get_session_param	= iscsi_session_get_param,
- 	.start_conn		= iscsi_conn_start,
--	.stop_conn		= iscsi_conn_stop,
--	/* these are called as part of conn recovery */
--	.suspend_conn_recv	= iscsi_tcp_suspend_conn_rx,
--	.terminate_conn		= iscsi_tcp_terminate_conn,
-+	.stop_conn		= iscsi_tcp_conn_stop,
- 	/* IO */
- 	.send_pdu		= iscsi_conn_send_pdu,
- 	.get_stats		= iscsi_conn_get_stats,
-diff -Naurp linux-2.6.17.x86_64/drivers/scsi/iscsi_tcp.h linux-2.6.17.x86_64.iscsi/drivers/scsi/iscsi_tcp.h
---- linux-2.6.17.x86_64/drivers/scsi/iscsi_tcp.h	2006-07-13 14:42:44.000000000 -0500
-+++ linux-2.6.17.x86_64.iscsi/drivers/scsi/iscsi_tcp.h	2006-07-13 14:46:20.000000000 -0500
-@@ -78,8 +78,6 @@ struct iscsi_tcp_conn {
- 	char			hdrext[4*sizeof(__u16) +
- 				    sizeof(__u32)];
- 	int			data_copied;
--	char			*data;		/* data placeholder */
--	int			data_size;	/* actual recv_dlength */
- 	int			stop_stage;	/* conn_stop() flag: *
- 						 * stop to recover,  *
- 						 * stop to terminate */
-diff -Naurp linux-2.6.17.x86_64/drivers/scsi/libiscsi.c linux-2.6.17.x86_64.iscsi/drivers/scsi/libiscsi.c
---- linux-2.6.17.x86_64/drivers/scsi/libiscsi.c	2006-07-13 14:42:45.000000000 -0500
-+++ linux-2.6.17.x86_64.iscsi/drivers/scsi/libiscsi.c	2006-07-13 14:46:23.000000000 -0500
-@@ -189,6 +189,7 @@ static void iscsi_complete_command(struc
- {
- 	struct scsi_cmnd *sc = ctask->sc;
- 
-+	ctask->state = ISCSI_TASK_COMPLETED;
- 	ctask->sc = NULL;
- 	list_del_init(&ctask->running);
- 	__kfifo_put(session->cmdpool.queue, (void*)&ctask, sizeof(void*));
-@@ -275,6 +276,25 @@ out:
- 	return rc;
- }
- 
-+static void iscsi_tmf_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
-+{
-+	struct iscsi_tm_rsp *tmf = (struct iscsi_tm_rsp *)hdr;
-+
-+	conn->exp_statsn = be32_to_cpu(hdr->statsn) + 1;
-+	conn->tmfrsp_pdus_cnt++;
-+
-+	if (conn->tmabort_state != TMABORT_INITIAL)
-+		return;
-+
-+	if (tmf->response == ISCSI_TMF_RSP_COMPLETE)
-+		conn->tmabort_state = TMABORT_SUCCESS;
-+	else if (tmf->response == ISCSI_TMF_RSP_NO_TASK)
-+		conn->tmabort_state = TMABORT_NOT_FOUND;
-+	else
-+		conn->tmabort_state = TMABORT_FAILED;
-+	wake_up(&conn->ehwait);
-+}
-+
- /**
-  * __iscsi_complete_pdu - complete pdu
-  * @conn: iscsi conn
-@@ -340,6 +360,10 @@ int __iscsi_complete_pdu(struct iscsi_co
- 
- 		switch(opcode) {
- 		case ISCSI_OP_LOGOUT_RSP:
-+			if (datalen) {
-+				rc = ISCSI_ERR_PROTO;
-+				break;
-+			}
- 			conn->exp_statsn = be32_to_cpu(hdr->statsn) + 1;
- 			/* fall through */
- 		case ISCSI_OP_LOGIN_RSP:
-@@ -348,7 +372,8 @@ int __iscsi_complete_pdu(struct iscsi_co
- 			 * login related PDU's exp_statsn is handled in
- 			 * userspace
- 			 */
--			rc = iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen);
-+			if (iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen))
-+				rc = ISCSI_ERR_CONN_FAILED;
- 			list_del(&mtask->running);
- 			if (conn->login_mtask != mtask)
- 				__kfifo_put(session->mgmtpool.queue,
-@@ -360,25 +385,17 @@ int __iscsi_complete_pdu(struct iscsi_co
- 				break;
- 			}
- 
--			conn->exp_statsn = be32_to_cpu(hdr->statsn) + 1;
--			conn->tmfrsp_pdus_cnt++;
--			if (conn->tmabort_state == TMABORT_INITIAL) {
--				conn->tmabort_state =
--					((struct iscsi_tm_rsp *)hdr)->
--					response == ISCSI_TMF_RSP_COMPLETE ?
--						TMABORT_SUCCESS:TMABORT_FAILED;
--				/* unblock eh_abort() */
--				wake_up(&conn->ehwait);
--			}
-+			iscsi_tmf_rsp(conn, hdr);
- 			break;
- 		case ISCSI_OP_NOOP_IN:
--			if (hdr->ttt != ISCSI_RESERVED_TAG) {
-+			if (hdr->ttt != ISCSI_RESERVED_TAG || datalen) {
- 				rc = ISCSI_ERR_PROTO;
- 				break;
- 			}
- 			conn->exp_statsn = be32_to_cpu(hdr->statsn) + 1;
- 
--			rc = iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen);
-+			if (iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen))
-+				rc = ISCSI_ERR_CONN_FAILED;
- 			list_del(&mtask->running);
- 			if (conn->login_mtask != mtask)
- 				__kfifo_put(session->mgmtpool.queue,
-@@ -391,14 +408,21 @@ int __iscsi_complete_pdu(struct iscsi_co
- 	} else if (itt == ISCSI_RESERVED_TAG) {
- 		switch(opcode) {
- 		case ISCSI_OP_NOOP_IN:
--			if (!datalen) {
--				rc = iscsi_check_assign_cmdsn(session,
--						 (struct iscsi_nopin*)hdr);
--				if (!rc && hdr->ttt != ISCSI_RESERVED_TAG)
--					rc = iscsi_recv_pdu(conn->cls_conn,
--							    hdr, NULL, 0);
--			} else
-+			if (datalen) {
- 				rc = ISCSI_ERR_PROTO;
-+				break;
-+			}
-+
-+			rc = iscsi_check_assign_cmdsn(session,
-+						 (struct iscsi_nopin*)hdr);
-+			if (rc)
-+				break;
-+
-+			if (hdr->ttt == ISCSI_RESERVED_TAG)
-+				break;
-+
-+			if (iscsi_recv_pdu(conn->cls_conn, hdr, NULL, 0))
-+				rc = ISCSI_ERR_CONN_FAILED;
- 			break;
- 		case ISCSI_OP_REJECT:
- 			/* we need sth like iscsi_reject_rsp()*/
-@@ -568,20 +592,24 @@ static int iscsi_data_xmit(struct iscsi_
- 	}
- 
- 	/* process command queue */
--	while (__kfifo_get(conn->xmitqueue, (void*)&conn->ctask,
--			   sizeof(void*))) {
-+	spin_lock_bh(&conn->session->lock);
-+	while (!list_empty(&conn->xmitqueue)) {
- 		/*
- 		 * iscsi tcp may readd the task to the xmitqueue to send
- 		 * write data
- 		 */
--		spin_lock_bh(&conn->session->lock);
--		if (list_empty(&conn->ctask->running))
--			list_add_tail(&conn->ctask->running, &conn->run_list);
-+		conn->ctask = list_entry(conn->xmitqueue.next,
-+					 struct iscsi_cmd_task, running);
-+		conn->ctask->state = ISCSI_TASK_RUNNING;
-+		list_move_tail(conn->xmitqueue.next, &conn->run_list);
- 		spin_unlock_bh(&conn->session->lock);
-+
- 		rc = tt->xmit_cmd_task(conn, conn->ctask);
- 		if (rc)
- 			goto again;
-+		spin_lock_bh(&conn->session->lock);
- 	}
-+	spin_unlock_bh(&conn->session->lock);
- 	/* done with this ctask */
- 	conn->ctask = NULL;
- 
-@@ -691,6 +719,7 @@ int iscsi_queuecommand(struct scsi_cmnd 
- 	sc->SCp.phase = session->age;
- 	sc->SCp.ptr = (char *)ctask;
- 
-+	ctask->state = ISCSI_TASK_PENDING;
- 	ctask->mtask = NULL;
- 	ctask->conn = conn;
- 	ctask->sc = sc;
-@@ -700,7 +729,7 @@ int iscsi_queuecommand(struct scsi_cmnd 
- 
- 	session->tt->init_cmd_task(ctask);
- 
--	__kfifo_put(conn->xmitqueue, (void*)&ctask, sizeof(void*));
-+	list_add_tail(&ctask->running, &conn->xmitqueue);
- 	debug_scsi(
- 	       "ctask enq [%s cid %d sc %lx itt 0x%x len %d cmdsn %d win %d]\n",
- 		sc->sc_data_direction == DMA_TO_DEVICE ? "write" : "read",
-@@ -977,31 +1006,27 @@ static int iscsi_exec_abort_task(struct 
- /*
-  * xmit mutex and session lock must be held
-  */
--#define iscsi_remove_task(tasktype)					\
--static struct iscsi_##tasktype *					\
--iscsi_remove_##tasktype(struct kfifo *fifo, uint32_t itt)		\
--{									\
--	int i, nr_tasks = __kfifo_len(fifo) / sizeof(void*);		\
--	struct iscsi_##tasktype *task;					\
--									\
--	debug_scsi("searching %d tasks\n", nr_tasks);			\
--									\
--	for (i = 0; i < nr_tasks; i++) {				\
--		__kfifo_get(fifo, (void*)&task, sizeof(void*));		\
--		debug_scsi("check task %u\n", task->itt);		\
--									\
--		if (task->itt == itt) {					\
--			debug_scsi("matched task\n");			\
--			return task;					\
--		}							\
--									\
--		__kfifo_put(fifo, (void*)&task, sizeof(void*));		\
--	}								\
--	return NULL;							\
--}
-+static struct iscsi_mgmt_task *
-+iscsi_remove_mgmt_task(struct kfifo *fifo, uint32_t itt)
-+{
-+	int i, nr_tasks = __kfifo_len(fifo) / sizeof(void*);
-+	struct iscsi_mgmt_task *task;
-+
-+	debug_scsi("searching %d tasks\n", nr_tasks);
- 
--iscsi_remove_task(mgmt_task);
--iscsi_remove_task(cmd_task);
-+	for (i = 0; i < nr_tasks; i++) {
-+		__kfifo_get(fifo, (void*)&task, sizeof(void*));
-+		debug_scsi("check task %u\n", task->itt);
-+
-+		if (task->itt == itt) {
-+			debug_scsi("matched task\n");
-+			return task;
-+		}
-+
-+		__kfifo_put(fifo, (void*)&task, sizeof(void*));
-+	}
-+	return NULL;
-+}
- 
- static int iscsi_ctask_mtask_cleanup(struct iscsi_cmd_task *ctask)
- {
-@@ -1027,12 +1052,13 @@ static void fail_command(struct iscsi_co
- {
- 	struct scsi_cmnd *sc;
- 
--	conn->session->tt->cleanup_cmd_task(conn, ctask);
--	iscsi_ctask_mtask_cleanup(ctask);
--
- 	sc = ctask->sc;
- 	if (!sc)
- 		return;
-+
-+	conn->session->tt->cleanup_cmd_task(conn, ctask);
-+	iscsi_ctask_mtask_cleanup(ctask);
-+
- 	sc->result = err;
- 	sc->resid = sc->request_bufflen;
- 	iscsi_complete_command(conn->session, ctask);
-@@ -1043,7 +1069,6 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
- 	struct iscsi_cmd_task *ctask = (struct iscsi_cmd_task *)sc->SCp.ptr;
- 	struct iscsi_conn *conn = ctask->conn;
- 	struct iscsi_session *session = conn->session;
--	struct iscsi_cmd_task *pending_ctask;
- 	int rc;
- 
- 	conn->eh_abort_cnt++;
-@@ -1061,8 +1086,11 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
- 		goto failed;
- 
- 	/* ctask completed before time out */
--	if (!ctask->sc)
--		goto success;
-+	if (!ctask->sc) {
-+		spin_unlock_bh(&session->lock);
-+		debug_scsi("sc completed while abort in progress\n");
-+		goto success_rel_mutex;
-+	}
- 
- 	/* what should we do here ? */
- 	if (conn->ctask == ctask) {
-@@ -1071,17 +1099,8 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
- 		goto failed;
- 	}
- 
--	/* check for the easy pending cmd abort */
--	pending_ctask = iscsi_remove_cmd_task(conn->xmitqueue, ctask->itt);
--	if (pending_ctask) {
--		/* iscsi_tcp queues write transfers on the xmitqueue */
--		if (list_empty(&pending_ctask->running)) {
--			debug_scsi("found pending task\n");
--			goto success;
--		} else
--			__kfifo_put(conn->xmitqueue, (void*)&pending_ctask,
--				    sizeof(void*));
--	}
-+	if (ctask->state == ISCSI_TASK_PENDING)
-+		goto success_cleanup;
- 
- 	conn->tmabort_state = TMABORT_INITIAL;
- 
-@@ -1089,25 +1108,31 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
- 	rc = iscsi_exec_abort_task(sc, ctask);
- 	spin_lock_bh(&session->lock);
- 
--	iscsi_ctask_mtask_cleanup(ctask);
- 	if (rc || sc->SCp.phase != session->age ||
- 	    session->state != ISCSI_STATE_LOGGED_IN)
- 		goto failed;
-+	iscsi_ctask_mtask_cleanup(ctask);
- 
--	/* ctask completed before tmf abort response */
--	if (!ctask->sc) {
--		debug_scsi("sc completed while abort in progress\n");
--		goto success;
--	}
--
--	if (conn->tmabort_state != TMABORT_SUCCESS) {
-+	switch (conn->tmabort_state) {
-+	case TMABORT_SUCCESS:
-+		goto success_cleanup;
-+	case TMABORT_NOT_FOUND:
-+		if (!ctask->sc) {
-+			/* ctask completed before tmf abort response */
-+			spin_unlock_bh(&session->lock);
-+			debug_scsi("sc completed while abort in progress\n");
-+			goto success_rel_mutex;
-+		}
-+		/* fall through */
-+	default:
-+		/* timedout or failed */
- 		spin_unlock_bh(&session->lock);
- 		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
- 		spin_lock_bh(&session->lock);
- 		goto failed;
- 	}
- 
--success:
-+success_cleanup:
- 	debug_scsi("abort success [sc %lx itt 0x%x]\n", (long)sc, ctask->itt);
- 	spin_unlock_bh(&session->lock);
- 
-@@ -1121,6 +1146,7 @@ success:
- 	spin_unlock(&session->lock);
- 	write_unlock_bh(conn->recv_lock);
- 
-+success_rel_mutex:
- 	mutex_unlock(&conn->xmitmutex);
- 	return SUCCESS;
- 
-@@ -1263,6 +1289,7 @@ iscsi_session_setup(struct iscsi_transpo
- 		if (cmd_task_size)
- 			ctask->dd_data = &ctask[1];
- 		ctask->itt = cmd_i;
-+		INIT_LIST_HEAD(&ctask->running);
- 	}
- 
- 	spin_lock_init(&session->lock);
-@@ -1282,6 +1309,7 @@ iscsi_session_setup(struct iscsi_transpo
- 		if (mgmt_task_size)
- 			mtask->dd_data = &mtask[1];
- 		mtask->itt = ISCSI_MGMT_ITT_OFFSET + cmd_i;
-+		INIT_LIST_HEAD(&mtask->running);
- 	}
- 
- 	if (scsi_add_host(shost, NULL))
-@@ -1322,6 +1350,7 @@ void iscsi_session_teardown(struct iscsi
- {
- 	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);
- 	struct iscsi_session *session = iscsi_hostdata(shost->hostdata);
-+	struct module *owner = cls_session->transport->owner;
- 
- 	scsi_remove_host(shost);
- 
-@@ -1330,7 +1359,7 @@ void iscsi_session_teardown(struct iscsi
- 
- 	iscsi_destroy_session(cls_session);
- 	scsi_host_put(shost);
--	module_put(cls_session->transport->owner);
-+	module_put(owner);
- }
- EXPORT_SYMBOL_GPL(iscsi_session_teardown);
- 
-@@ -1361,12 +1390,7 @@ iscsi_conn_setup(struct iscsi_cls_sessio
- 	conn->tmabort_state = TMABORT_INITIAL;
- 	INIT_LIST_HEAD(&conn->run_list);
- 	INIT_LIST_HEAD(&conn->mgmt_run_list);
--
--	/* initialize general xmit PDU commands queue */
--	conn->xmitqueue = kfifo_alloc(session->cmds_max * sizeof(void*),
--					GFP_KERNEL, NULL);
--	if (conn->xmitqueue == ERR_PTR(-ENOMEM))
--		goto xmitqueue_alloc_fail;
-+	INIT_LIST_HEAD(&conn->xmitqueue);
- 
- 	/* initialize general immediate & non-immediate PDU commands queue */
- 	conn->immqueue = kfifo_alloc(session->mgmtpool_max * sizeof(void*),
-@@ -1394,7 +1418,7 @@ iscsi_conn_setup(struct iscsi_cls_sessio
- 	data = kmalloc(DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH, GFP_KERNEL);
- 	if (!data)
- 		goto login_mtask_data_alloc_fail;
--	conn->login_mtask->data = data;
-+	conn->login_mtask->data = conn->data = data;
- 
- 	init_timer(&conn->tmabort_timer);
- 	mutex_init(&conn->xmitmutex);
-@@ -1410,8 +1434,6 @@ login_mtask_alloc_fail:
- mgmtqueue_alloc_fail:
- 	kfifo_free(conn->immqueue);
- immqueue_alloc_fail:
--	kfifo_free(conn->xmitqueue);
--xmitqueue_alloc_fail:
- 	iscsi_destroy_conn(cls_conn);
- 	return NULL;
- }
-@@ -1432,12 +1454,6 @@ void iscsi_conn_teardown(struct iscsi_cl
- 
- 	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
- 	mutex_lock(&conn->xmitmutex);
--	if (conn->c_stage == ISCSI_CONN_INITIAL_STAGE) {
--		if (session->tt->suspend_conn_recv)
--			session->tt->suspend_conn_recv(conn);
--
--		session->tt->terminate_conn(conn);
--	}
- 
- 	spin_lock_bh(&session->lock);
- 	conn->c_stage = ISCSI_CONN_CLEANUP_WAIT;
-@@ -1474,7 +1490,7 @@ void iscsi_conn_teardown(struct iscsi_cl
- 	}
- 
- 	spin_lock_bh(&session->lock);
--	kfree(conn->login_mtask->data);
-+	kfree(conn->data);
- 	__kfifo_put(session->mgmtpool.queue, (void*)&conn->login_mtask,
- 		    sizeof(void*));
- 	list_del(&conn->item);
-@@ -1489,7 +1505,6 @@ void iscsi_conn_teardown(struct iscsi_cl
- 		session->cmdsn = session->max_cmdsn = session->exp_cmdsn = 1;
- 	spin_unlock_bh(&session->lock);
- 
--	kfifo_free(conn->xmitqueue);
- 	kfifo_free(conn->immqueue);
- 	kfifo_free(conn->mgmtqueue);
- 
-@@ -1572,7 +1587,7 @@ static void fail_all_commands(struct isc
- 	struct iscsi_cmd_task *ctask, *tmp;
- 
- 	/* flush pending */
--	while (__kfifo_get(conn->xmitqueue, (void*)&ctask, sizeof(void*))) {
-+	list_for_each_entry_safe(ctask, tmp, &conn->xmitqueue, running) {
- 		debug_scsi("failing pending sc %p itt 0x%x\n", ctask->sc,
- 			   ctask->itt);
- 		fail_command(conn, ctask, DID_BUS_BUSY << 16);
-@@ -1615,8 +1630,9 @@ static void iscsi_start_session_recovery
- 	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
- 	spin_unlock_bh(&session->lock);
- 
--	if (session->tt->suspend_conn_recv)
--		session->tt->suspend_conn_recv(conn);
-+	write_lock_bh(conn->recv_lock);
-+	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
-+	write_unlock_bh(conn->recv_lock);
- 
- 	mutex_lock(&conn->xmitmutex);
- 	/*
-@@ -1635,7 +1651,6 @@ static void iscsi_start_session_recovery
- 		}
- 	}
- 
--	session->tt->terminate_conn(conn);
- 	/*
- 	 * flush queues.
- 	 */
-diff -Naurp linux-2.6.17.x86_64/drivers/scsi/scsi_transport_iscsi.c linux-2.6.17.x86_64.iscsi/drivers/scsi/scsi_transport_iscsi.c
---- linux-2.6.17.x86_64/drivers/scsi/scsi_transport_iscsi.c	2006-07-13 14:42:45.000000000 -0500
-+++ linux-2.6.17.x86_64.iscsi/drivers/scsi/scsi_transport_iscsi.c	2006-07-13 14:46:32.000000000 -0500
-@@ -34,6 +34,7 @@
- #define ISCSI_SESSION_ATTRS 11
- #define ISCSI_CONN_ATTRS 11
- #define ISCSI_HOST_ATTRS 0
-+#define ISCSI_TRANSPORT_VERSION "1.1-645"
- 
- struct iscsi_internal {
- 	int daemon_pid;
-@@ -634,13 +635,13 @@ mempool_zone_get_skb(struct mempool_zone
- }
- 
- static int
--iscsi_broadcast_skb(struct mempool_zone *zone, struct sk_buff *skb)
-+iscsi_broadcast_skb(struct mempool_zone *zone, struct sk_buff *skb, gfp_t gfp)
- {
- 	unsigned long flags;
- 	int rc;
- 
- 	skb_get(skb);
--	rc = netlink_broadcast(nls, skb, 0, 1, GFP_KERNEL);
-+	rc = netlink_broadcast(nls, skb, 0, 1, gfp);
- 	if (rc < 0) {
- 		mempool_free(skb, zone->pool);
- 		printk(KERN_ERR "iscsi: can not broadcast skb (%d)\n", rc);
-@@ -749,7 +750,7 @@ void iscsi_conn_error(struct iscsi_cls_c
- 	ev->r.connerror.cid = conn->cid;
- 	ev->r.connerror.sid = iscsi_conn_get_sid(conn);
- 
--	iscsi_broadcast_skb(conn->z_error, skb);
-+	iscsi_broadcast_skb(conn->z_error, skb, GFP_ATOMIC);
- 
- 	dev_printk(KERN_INFO, &conn->dev, "iscsi: detected conn error (%d)\n",
- 		   error);
-@@ -895,7 +896,7 @@ int iscsi_if_destroy_session_done(struct
- 	 * this will occur if the daemon is not up, so we just warn
- 	 * the user and when the daemon is restarted it will handle it
- 	 */
--	rc = iscsi_broadcast_skb(conn->z_pdu, skb);
-+	rc = iscsi_broadcast_skb(conn->z_pdu, skb, GFP_KERNEL);
- 	if (rc < 0)
- 		dev_printk(KERN_ERR, &conn->dev, "Cannot notify userspace of "
- 			  "session destruction event. Check iscsi daemon\n");
-@@ -958,7 +959,7 @@ int iscsi_if_create_session_done(struct 
- 	 * this will occur if the daemon is not up, so we just warn
- 	 * the user and when the daemon is restarted it will handle it
- 	 */
--	rc = iscsi_broadcast_skb(conn->z_pdu, skb);
-+	rc = iscsi_broadcast_skb(conn->z_pdu, skb, GFP_KERNEL);
- 	if (rc < 0)
- 		dev_printk(KERN_ERR, &conn->dev, "Cannot notify userspace of "
- 			  "session creation event. Check iscsi daemon\n");
-@@ -1613,6 +1614,9 @@ static __init int iscsi_transport_init(v
- {
- 	int err;
- 
-+	printk(KERN_INFO "Loading iSCSI transport class v%s.",
-+		ISCSI_TRANSPORT_VERSION);
-+
- 	err = class_register(&iscsi_transport_class);
- 	if (err)
- 		return err;
-@@ -1678,3 +1682,4 @@ MODULE_AUTHOR("Mike Christie <michaelc at c
- 	      "Alex Aizman <itn780 at yahoo.com>");
- MODULE_DESCRIPTION("iSCSI Transport Interface");
- MODULE_LICENSE("GPL");
-+MODULE_VERSION(ISCSI_TRANSPORT_VERSION);
-diff -Naurp linux-2.6.17.x86_64/include/scsi/libiscsi.h linux-2.6.17.x86_64.iscsi/include/scsi/libiscsi.h
---- linux-2.6.17.x86_64/include/scsi/libiscsi.h	2006-07-13 14:42:55.000000000 -0500
-+++ linux-2.6.17.x86_64.iscsi/include/scsi/libiscsi.h	2006-07-13 14:46:20.000000000 -0500
-@@ -60,6 +60,7 @@ struct iscsi_nopin;
- #define TMABORT_SUCCESS			0x1
- #define TMABORT_FAILED			0x2
- #define TMABORT_TIMEDOUT		0x3
-+#define TMABORT_NOT_FOUND		0x4
- 
- /* Connection suspend "bit" */
- #define ISCSI_SUSPEND_BIT		1
-@@ -83,6 +84,12 @@ struct iscsi_mgmt_task {
- 	struct list_head	running;
- };
- 
-+enum {
-+	ISCSI_TASK_COMPLETED,
-+	ISCSI_TASK_PENDING,
-+	ISCSI_TASK_RUNNING,
-+};
-+
- struct iscsi_cmd_task {
- 	/*
- 	 * Becuae LLDs allocate their hdr differently, this is a pointer to
-@@ -101,6 +108,8 @@ struct iscsi_cmd_task {
- 	struct iscsi_conn	*conn;		/* used connection    */
- 	struct iscsi_mgmt_task	*mtask;		/* tmf mtask in progr */
- 
-+	/* state set/tested under session->lock */
-+	int			state;
- 	struct list_head	running;	/* running cmd list */
- 	void			*dd_data;	/* driver/transport data */
- };
-@@ -126,6 +135,14 @@ struct iscsi_conn {
- 	int			id;		/* CID */
- 	struct list_head	item;		/* maintains list of conns */
- 	int			c_stage;	/* connection state */
-+	/*
-+	 * Preallocated buffer for pdus that have data but do not
-+	 * originate from scsi-ml. We never have two pdus using the
-+	 * buffer at the same time. It is only allocated to
-+	 * the default max recv size because the pdus we support
-+	 * should always fit in this buffer
-+	 */
-+	char			*data;
- 	struct iscsi_mgmt_task	*login_mtask;	/* mtask used for login/text */
- 	struct iscsi_mgmt_task	*mtask;		/* xmit mtask in progress */
- 	struct iscsi_cmd_task	*ctask;		/* xmit ctask in progress */
-@@ -134,7 +151,7 @@ struct iscsi_conn {
- 	struct kfifo		*immqueue;	/* immediate xmit queue */
- 	struct kfifo		*mgmtqueue;	/* mgmt (control) xmit queue */
- 	struct list_head	mgmt_run_list;	/* list of control tasks */
--	struct kfifo		*xmitqueue;	/* data-path cmd queue */
-+	struct list_head	xmitqueue;	/* data-path cmd queue */
- 	struct list_head	run_list;	/* list of cmds in progress */
- 	struct work_struct	xmitwork;	/* per-conn. xmit workqueue */
- 	/*
-diff -Naurp linux-2.6.17.x86_64/include/scsi/scsi_transport_iscsi.h linux-2.6.17.x86_64.iscsi/include/scsi/scsi_transport_iscsi.h
---- linux-2.6.17.x86_64/include/scsi/scsi_transport_iscsi.h	2006-07-13 14:42:55.000000000 -0500
-+++ linux-2.6.17.x86_64.iscsi/include/scsi/scsi_transport_iscsi.h	2006-07-13 14:46:09.000000000 -0500
-@@ -57,8 +57,6 @@ struct sockaddr;
-  * @stop_conn:		suspend/recover/terminate connection
-  * @send_pdu:		send iSCSI PDU, Login, Logout, NOP-Out, Reject, Text.
-  * @session_recovery_timedout: notify LLD a block during recovery timed out
-- * @suspend_conn_recv:	susepend the recv side of the connection
-- * @termincate_conn:	destroy socket connection. Called with mutex lock.
-  * @init_cmd_task:	Initialize a iscsi_cmd_task and any internal structs.
-  *			Called from queuecommand with session lock held.
-  * @init_mgmt_task:	Initialize a iscsi_mgmt_task and any internal structs.
-@@ -112,8 +110,6 @@ struct iscsi_transport {
- 			 char *data, uint32_t data_size);
- 	void (*get_stats) (struct iscsi_cls_conn *conn,
- 			   struct iscsi_stats *stats);
--	void (*suspend_conn_recv) (struct iscsi_conn *conn);
--	void (*terminate_conn) (struct iscsi_conn *conn);
- 	void (*init_cmd_task) (struct iscsi_cmd_task *ctask);
- 	void (*init_mgmt_task) (struct iscsi_conn *conn,
- 				struct iscsi_mgmt_task *mtask,

linux-2.6-lockdep-fixes.patch:
 a/kernel/lockdep.c                            |   13 ++++++++++
 linux-2.6.17-mm6/include/net/sock.h           |   33 +++++++++++++++++++++++---
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++++++++-
 linux-2.6.18-rc1/net/socket.c                 |    8 +++++-
 5 files changed, 64 insertions(+), 8 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linux-2.6-lockdep-fixes.patch	22 Aug 2006 23:14:57 -0000	1.23
+++ linux-2.6-lockdep-fixes.patch	29 Aug 2006 22:22:35 -0000	1.24
@@ -402,328 +402,3 @@
  	printk(  "---------------------------------\n");
  
  	printk("inconsistent {%s} -> {%s} usage.\n",
-_
-
---- linux-2.6.17.noarch/fs/exec.c~	2006-08-10 21:49:38.000000000 -0400
-+++ linux-2.6.17.noarch/fs/exec.c	2006-08-10 21:50:36.000000000 -0400
-@@ -753,7 +753,7 @@ no_thread_group:
- 
- 		write_lock_irq(&tasklist_lock);
- 		spin_lock(&oldsighand->siglock);
--		spin_lock(&newsighand->siglock);
-+		spin_lock_nested(&newsighand->siglock, SINGLE_DEPTH_NESTING);
- 
- 		rcu_assign_pointer(current->sighand, newsighand);
- 		recalc_sigpending();
-To:	openib-general at openib.org, mingo at redhat.com, arjan at linux.intel.com
-Cc:	linux-kernel at vger.kernel.org
-Subject: [PATCH] Fix potential deadlock in mthca
-From:	Roland Dreier <rdreier at cisco.com>
-Date:	Fri, 11 Aug 2006 09:00:22 -0700
-Message-ID: <adad5b7ntyh.fsf at cisco.com>
-
-Here's a long-standing bug that lockdep found very nicely.
-
-Ingo/Arjan, can you confirm that the fix looks OK and I am using
-spin_lock_nested() properly?  I couldn't find much documentation or
-many examples of it, so I'm not positive this is the right way to
-handle this fix.
-
-I'm inclined to put this fix in 2.6.18, since this is a kernel
-deadlock that is triggerable from userspace via uverbs.  Comments?
-
-Thanks,
-  Roland
-
-commit a19aa5c5fdda8b556ab238177ee27c5ef7873c94
-Author: Roland Dreier <rolandd at cisco.com>
-Date:   Fri Aug 11 08:56:57 2006 -0700
-
-    IB/mthca: Fix potential AB-BA deadlock with CQ locks
-    
-    When destroying a QP, mthca locks both the QP's send CQ and receive
-    CQ.  However, the following scenario is perfectly valid:
-    
-        QP_a: send_cq == CQ_x, recv_cq == CQ_y
-        QP_b: send_cq == CQ_y, recv_cq == CQ_x
-    
-    The old mthca code simply locked send_cq and then recv_cq, which in
-    this case could lead to an AB-BA deadlock if QP_a and QP_b were
-    destroyed simultaneously.
-    
-    We can fix this by changing the locking code to lock the CQ with the
-    lower CQ number first, which will create a consistent lock ordering.
-    Also, the second CQ is locked with spin_lock_nested() to tell lockdep
-    that we know what we're doing with the lock nesting.
-    
-    This bug was found by lockdep.
-    
-    Signed-off-by: Roland Dreier <rolandd at cisco.com>
-
-diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infiniband/hw/mthca/mthca_provider.h
-index 8de2887..9a5bece 100644
---- a/drivers/infiniband/hw/mthca/mthca_provider.h
-+++ b/drivers/infiniband/hw/mthca/mthca_provider.h
-@@ -136,8 +136,8 @@ struct mthca_ah {
-  * We have one global lock that protects dev->cq/qp_table.  Each
-  * struct mthca_cq/qp also has its own lock.  An individual qp lock
-  * may be taken inside of an individual cq lock.  Both cqs attached to
-- * a qp may be locked, with the send cq locked first.  No other
-- * nesting should be done.
-+ * a qp may be locked, with the cq with the lower cqn locked first.
-+ * No other nesting should be done.
-  *
-  * Each struct mthca_cq/qp also has an ref count, protected by the
-  * corresponding table lock.  The pointer from the cq/qp_table to the
-diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
-index 157b4f8..2e8f6f3 100644
---- a/drivers/infiniband/hw/mthca/mthca_qp.c
-+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
-@@ -1263,6 +1263,32 @@ int mthca_alloc_qp(struct mthca_dev *dev
- 	return 0;
- }
- 
-+static void mthca_lock_cqs(struct mthca_cq *send_cq, struct mthca_cq *recv_cq)
-+{
-+	if (send_cq == recv_cq)
-+		spin_lock_irq(&send_cq->lock);
-+	else if (send_cq->cqn < recv_cq->cqn) {
-+		spin_lock_irq(&send_cq->lock);
-+		spin_lock_nested(&recv_cq->lock, SINGLE_DEPTH_NESTING);
-+	} else {
-+		spin_lock_irq(&recv_cq->lock);
-+		spin_lock_nested(&send_cq->lock, SINGLE_DEPTH_NESTING);
-+	}
-+}
-+
-+static void mthca_unlock_cqs(struct mthca_cq *send_cq, struct mthca_cq *recv_cq)
-+{
-+	if (send_cq == recv_cq)
-+		spin_unlock_irq(&send_cq->lock);
-+	else if (send_cq->cqn < recv_cq->cqn) {
-+		spin_unlock(&recv_cq->lock);
-+		spin_unlock_irq(&send_cq->lock);
-+	} else {
-+		spin_unlock(&send_cq->lock);
-+		spin_unlock_irq(&recv_cq->lock);
-+	}
-+}
-+
- int mthca_alloc_sqp(struct mthca_dev *dev,
- 		    struct mthca_pd *pd,
- 		    struct mthca_cq *send_cq,
-@@ -1315,17 +1341,13 @@ int mthca_alloc_sqp(struct mthca_dev *de
- 	 * Lock CQs here, so that CQ polling code can do QP lookup
- 	 * without taking a lock.
- 	 */
--	spin_lock_irq(&send_cq->lock);
--	if (send_cq != recv_cq)
--		spin_lock(&recv_cq->lock);
-+	mthca_lock_cqs(send_cq, recv_cq);
- 
- 	spin_lock(&dev->qp_table.lock);
- 	mthca_array_clear(&dev->qp_table.qp, mqpn);
- 	spin_unlock(&dev->qp_table.lock);
- 
--	if (send_cq != recv_cq)
--		spin_unlock(&recv_cq->lock);
--	spin_unlock_irq(&send_cq->lock);
-+	mthca_unlock_cqs(send_cq, recv_cq);
- 
-  err_out:
- 	dma_free_coherent(&dev->pdev->dev, sqp->header_buf_size,
-@@ -1359,9 +1381,7 @@ void mthca_free_qp(struct mthca_dev *dev
- 	 * Lock CQs here, so that CQ polling code can do QP lookup
- 	 * without taking a lock.
- 	 */
--	spin_lock_irq(&send_cq->lock);
--	if (send_cq != recv_cq)
--		spin_lock(&recv_cq->lock);
-+	mthca_lock_cqs(send_cq, recv_cq);
- 
- 	spin_lock(&dev->qp_table.lock);
- 	mthca_array_clear(&dev->qp_table.qp,
-@@ -1369,9 +1389,7 @@ void mthca_free_qp(struct mthca_dev *dev
- 	--qp->refcount;
- 	spin_unlock(&dev->qp_table.lock);
- 
--	if (send_cq != recv_cq)
--		spin_unlock(&recv_cq->lock);
--	spin_unlock_irq(&send_cq->lock);
-+	mthca_unlock_cqs(send_cq, recv_cq);
- 
- 	wait_event(qp->wait, !get_qp_refcount(dev, qp));
- 
--
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
-
-From: Peter Zijlstra <a.p.zijlstra at chello.nl>
-
-blkdev_open() calls
-  do_open(bdev, ...,BD_MUTEX_NORMAL) and takes
-    mutex_lock_nested(&bdev->bd_mutex, BD_MUTEX_NORMAL)
-    
-then something fails, and we're thrown to:
-
-out_first: where
-    if (bdev != bdev->bd_contains)
-      blkdev_put(bdev->bd_contains) which is
-        __blkdev_put(bdev->bd_contains, BD_MUTEX_NORMAL) which does
-          mutex_lock_nested(&bdev->bd_contains->bd_mutex, BD_MUTEX_NORMAL) <--- lockdep trigger
-
-When going to out_first, dbev->bd_contains is either bdev or whole, and
-since we take the branch it must be whole. So it seems to me the
-following patch would be the right one:
-
-Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
-Acked-by: Neil Brown <neilb at suse.de>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
- fs/block_dev.c |  116 ++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 58 insertions(+), 58 deletions(-)
-
-Index: linux-2.6/fs/block_dev.c
-===================================================================
---- linux-2.6.orig/fs/block_dev.c
-+++ linux-2.6/fs/block_dev.c
-@@ -887,6 +887,63 @@ EXPORT_SYMBOL(bd_set_size);
- static int
- blkdev_get_whole(struct block_device *bdev, mode_t mode, unsigned flags);
- 
-+static int __blkdev_put(struct block_device *bdev, unsigned int subclass)
-+{
-+	int ret = 0;
-+	struct inode *bd_inode = bdev->bd_inode;
-+	struct gendisk *disk = bdev->bd_disk;
-+
-+	mutex_lock_nested(&bdev->bd_mutex, subclass);
-+	lock_kernel();
-+	if (!--bdev->bd_openers) {
-+		sync_blockdev(bdev);
-+		kill_bdev(bdev);
-+	}
-+	if (bdev->bd_contains == bdev) {
-+		if (disk->fops->release)
-+			ret = disk->fops->release(bd_inode, NULL);
-+	} else {
-+		mutex_lock_nested(&bdev->bd_contains->bd_mutex,
-+				  subclass + 1);
-+		bdev->bd_contains->bd_part_count--;
-+		mutex_unlock(&bdev->bd_contains->bd_mutex);
-+	}
-+	if (!bdev->bd_openers) {
-+		struct module *owner = disk->fops->owner;
-+
-+		put_disk(disk);
-+		module_put(owner);
-+
-+		if (bdev->bd_contains != bdev) {
-+			kobject_put(&bdev->bd_part->kobj);
-+			bdev->bd_part = NULL;
-+		}
-+		bdev->bd_disk = NULL;
-+		bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
-+		if (bdev != bdev->bd_contains)
-+			__blkdev_put(bdev->bd_contains, subclass + 1);
-+		bdev->bd_contains = NULL;
-+	}
-+	unlock_kernel();
-+	mutex_unlock(&bdev->bd_mutex);
-+	bdput(bdev);
-+	return ret;
-+}
-+
-+int blkdev_put(struct block_device *bdev)
-+{
-+	return __blkdev_put(bdev, BD_MUTEX_NORMAL);
-+}
-+
-+EXPORT_SYMBOL(blkdev_put);
-+
-+int blkdev_put_partition(struct block_device *bdev)
-+{
-+	return __blkdev_put(bdev, BD_MUTEX_PARTITION);
-+}
-+
-+EXPORT_SYMBOL(blkdev_put_partition);
-+
- static int
- do_open(struct block_device *bdev, struct file *file, unsigned int subclass)
- {
-@@ -980,7 +1037,7 @@ out_first:
- 	bdev->bd_disk = NULL;
- 	bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
- 	if (bdev != bdev->bd_contains)
--		blkdev_put(bdev->bd_contains);
-+		__blkdev_put(bdev->bd_contains, BD_MUTEX_WHOLE);
- 	bdev->bd_contains = NULL;
- 	put_disk(disk);
- 	module_put(owner);
-@@ -1079,63 +1136,6 @@ static int blkdev_open(struct inode * in
- 	return res;
- }
- 
--static int __blkdev_put(struct block_device *bdev, unsigned int subclass)
--{
--	int ret = 0;
--	struct inode *bd_inode = bdev->bd_inode;
--	struct gendisk *disk = bdev->bd_disk;
--
--	mutex_lock_nested(&bdev->bd_mutex, subclass);
--	lock_kernel();
--	if (!--bdev->bd_openers) {
--		sync_blockdev(bdev);
--		kill_bdev(bdev);
--	}
--	if (bdev->bd_contains == bdev) {
--		if (disk->fops->release)
--			ret = disk->fops->release(bd_inode, NULL);
--	} else {
--		mutex_lock_nested(&bdev->bd_contains->bd_mutex,
--				  subclass + 1);
--		bdev->bd_contains->bd_part_count--;
--		mutex_unlock(&bdev->bd_contains->bd_mutex);
--	}
--	if (!bdev->bd_openers) {
--		struct module *owner = disk->fops->owner;
--
--		put_disk(disk);
--		module_put(owner);
--
--		if (bdev->bd_contains != bdev) {
--			kobject_put(&bdev->bd_part->kobj);
--			bdev->bd_part = NULL;
--		}
--		bdev->bd_disk = NULL;
--		bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
--		if (bdev != bdev->bd_contains)
--			__blkdev_put(bdev->bd_contains, subclass + 1);
--		bdev->bd_contains = NULL;
--	}
--	unlock_kernel();
--	mutex_unlock(&bdev->bd_mutex);
--	bdput(bdev);
--	return ret;
--}
--
--int blkdev_put(struct block_device *bdev)
--{
--	return __blkdev_put(bdev, BD_MUTEX_NORMAL);
--}
--
--EXPORT_SYMBOL(blkdev_put);
--
--int blkdev_put_partition(struct block_device *bdev)
--{
--	return __blkdev_put(bdev, BD_MUTEX_PARTITION);
--}
--
--EXPORT_SYMBOL(blkdev_put_partition);
--
- static int blkdev_close(struct inode * inode, struct file * filp)
- {
- 	struct block_device *bdev = I_BDEV(filp->f_mapping->host);
-

linux-2.6-nfs-special-tests-fix.patch:
 read.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

Index: linux-2.6-nfs-special-tests-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-nfs-special-tests-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-nfs-special-tests-fix.patch	22 Aug 2006 23:14:58 -0000	1.1
+++ linux-2.6-nfs-special-tests-fix.patch	29 Aug 2006 22:22:35 -0000	1.2
@@ -17,24 +17,25 @@
 
 steved.
 
---- linux-2.6.17.i686/fs/nfs/read.c.orig	2006-08-17 17:25:00.000000000 -0400
-+++ linux-2.6.17.i686/fs/nfs/read.c	2006-08-20 13:48:19.000000000 -0400
-@@ -488,13 +488,14 @@ static void nfs_readpage_set_pages_uptod
- 	unsigned int base = data->args.pgbase;
- 	struct page **pages;
+--- linux-2.6.17.noarch.orig/fs/nfs/read.c	2006-08-29 13:15:34.000000000 -0400
++++ linux-2.6.17.noarch/fs/nfs/read.c	2006-08-29 13:18:26.000000000 -0400
+@@ -485,15 +485,14 @@
  
+ 	if (data->res.eof)
+ 		count = data->args.count;
 -	if (unlikely(count == 0))
 -		return;
  	pages = &data->args.pages[base >> PAGE_CACHE_SHIFT];
  	base &= ~PAGE_CACHE_MASK;
  	count += base;
 -	for (;count >= PAGE_CACHE_SIZE; count -= PAGE_CACHE_SIZE, pages++)
-+	if (count == 0) 
+-		SetPageUptodate(*pages);
+-	if (count != 0)
++	if (count == 0)
  		SetPageUptodate(*pages);
-+	else 
++	else
 +		for (;count >= PAGE_CACHE_SIZE; count -= PAGE_CACHE_SIZE, pages++)
 +			SetPageUptodate(*pages);
- 	/*
- 	 * Was this an eof or a short read? If the latter, don't mark the page
- 	 * as uptodate yet.
-
+ }
+ 
+ static void nfs_readpage_set_pages_error(struct nfs_read_data *data)

linux-2.6-nfs-superblock-sharing.patch:
 b/fs/Kconfig                 |    7 
 b/fs/dcache.c                |  164 +++-
 b/fs/nfs/Makefile            |    6 
 b/fs/nfs/callback.c          |   15 
 b/fs/nfs/callback.h          |    7 
 b/fs/nfs/callback_proc.c     |    4 
 b/fs/nfs/client.c            |  311 ++++++++
 b/fs/nfs/delegation.c        |   24 
 b/fs/nfs/delegation.h        |   10 
 b/fs/nfs/dir.c               |    2 
 b/fs/nfs/file.c              |    2 
 b/fs/nfs/fscache.c           |  345 +++++++++
 b/fs/nfs/fscache.h           |  466 ++++++++++++
 b/fs/nfs/getroot.c           |  305 ++++++++
 b/fs/nfs/idmap.c             |   14 
 b/fs/nfs/inode.c             |    4 
 b/fs/nfs/internal.h          |   12 
 b/fs/nfs/namespace.c         |    3 
 b/fs/nfs/nfs3proc.c          |    2 
 b/fs/nfs/nfs4_fs.h           |   30 
 b/fs/nfs/nfs4namespace.c     |    8 
 b/fs/nfs/nfs4proc.c          |   32 
 b/fs/nfs/nfs4renewd.c        |    8 
 b/fs/nfs/nfs4state.c         |   50 -
 b/fs/nfs/nfs4xdr.c           |   14 
 b/fs/nfs/pagelist.c          |    3 
 b/fs/nfs/proc.c              |    2 
 b/fs/nfs/read.c              |    2 
 b/fs/nfs/super.c             |   40 -
 b/fs/nfs/sysctl.c            |   43 +
 b/fs/nfs/write.c             |    2 
 b/include/linux/dcache.h     |    1 
 b/include/linux/nfs4_mount.h |    1 
 b/include/linux/nfs_fs.h     |    1 
 b/include/linux/nfs_fs_sb.h  |    2 
 b/include/linux/nfs_idmap.h  |   14 
 b/include/linux/nfs_mount.h  |    1 
 b/include/linux/nfs_xdr.h    |    1 
 fs/nfs/Makefile              |    3 
 fs/nfs/callback.c            |   16 
 fs/nfs/callback_proc.c       |    9 
 fs/nfs/client.c              | 1152 ++++++++++++++++++++++++++++++
 fs/nfs/delegation.c          |   21 
 fs/nfs/dir.c                 |   16 
 fs/nfs/file.c                |   36 
 fs/nfs/getroot.c             |    5 
 fs/nfs/idmap.c               |   27 
 fs/nfs/inode.c               |   31 
 fs/nfs/internal.h            |  134 ++-
 fs/nfs/namespace.c           |   31 
 fs/nfs/nfs3proc.c            |    8 
 fs/nfs/nfs4_fs.h             |   58 -
 fs/nfs/nfs4namespace.c       |  110 ++
 fs/nfs/nfs4proc.c            |  149 +--
 fs/nfs/nfs4renewd.c          |   15 
 fs/nfs/nfs4state.c           |  156 ----
 fs/nfs/nfs4xdr.c             |   28 
 fs/nfs/proc.c                |    4 
 fs/nfs/read.c                |   30 
 fs/nfs/super.c               | 1630 +++++++++++++++----------------------------
 fs/nfs/write.c               |   11 
 include/linux/nfs_fs.h       |    7 
 include/linux/nfs_fs_sb.h    |   99 ++
 include/linux/nfs_idmap.h    |    2 
 include/linux/nfs_xdr.h      |    9 
 65 files changed, 4085 insertions(+), 1670 deletions(-)

Index: linux-2.6-nfs-superblock-sharing.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-nfs-superblock-sharing.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-nfs-superblock-sharing.patch	9 Aug 2006 23:40:07 -0000	1.3
+++ linux-2.6-nfs-superblock-sharing.patch	29 Aug 2006 22:22:35 -0000	1.4
@@ -8575,7 +8575,7 @@
  	return status;
  }
  
-@@ -308,13 +314,35 @@ static void nfs_invalidate_page(struct p
+@@ -308,12 +314,30 @@ static void nfs_invalidate_page(struct p
  	/* Cancel any unstarted writes on this page */
  	if (offset == 0)
  		nfs_sync_inode_wait(inode, page->index, 1, FLUSH_INVALIDATE);
@@ -8590,18 +8590,26 @@
  
  static int nfs_release_page(struct page *page, gfp_t gfp)
  {
--	return !nfs_wb_page(page->mapping->host, page);
-+	int error = nfs_wb_page(page->mapping->host, page);
+-	if (gfp & __GFP_FS)
+-		return !nfs_wb_page(page->mapping->host, page);
++	if (gfp & __GFP_FS) {
++		int error = nfs_wb_page(page->mapping->host, page);
 +
-+	if (error == 0) {
-+		nfs_fscache_release_page(page);
++		if (error == 0) {
++			nfs_fscache_release_page(page);
 +
-+		/* may have been set due to either caching or writing */
-+		ClearPagePrivate(page);
-+	}
++			/* may have been set due to either caching or writing */
++			ClearPagePrivate(page);
++		}
 +
-+	/* releasepage() returns true/false */
-+	return (error == 0) ? 1 : 0;
++		/* releasepage() returns true/false */
++		return (error == 0) ? 1 : 0;
++	}
+	else
+		/*
+		 * Avoid deadlock on nfs_wait_on_request().
+@@ -321,6 +345,11 @@
+		return 0;
  }
  
 +/*
@@ -8612,7 +8620,7 @@
  const struct address_space_operations nfs_file_aops = {
  	.readpage = nfs_readpage,
  	.readpages = nfs_readpages,
-@@ -328,6 +356,9 @@ const struct address_space_operations nf
+@@ -334,6 +362,9 @@ const struct address_space_operations nf
  #ifdef CONFIG_NFS_DIRECTIO
  	.direct_IO = nfs_direct_IO,
  #endif


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -r1.477 -r1.478
--- sources	25 Aug 2006 21:25:48 -0000	1.477
+++ sources	29 Aug 2006 22:22:35 -0000	1.478
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-780289cba0d4529ff80956e145ce567a  patch-2.6.18-rc4.bz2
-4091e21a532aab769d5e92601697797e  patch-2.6.18-rc4-git1.bz2
 18b970072562000b8838eab9eefaa2e9  xen-11251.tar.bz2
+09d38fcbf78b29bacbb6e56c8d9e2a61  patch-2.6.18-rc5.bz2
+a49d7019372d011cc20c1574df9aec7c  patch-2.6.18-rc5-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- upstream	20 Aug 2006 07:29:57 -0000	1.414
+++ upstream	29 Aug 2006 22:22:35 -0000	1.415
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
-patch-2.6.18-rc4.bz2
-patch-2.6.18-rc4-git1.bz2
+patch-2.6.18-rc5.bz2
+patch-2.6.18-rc5-git1.bz2


--- patch-2.6.18-rc4-git1.bz2.sign DELETED ---


--- patch-2.6.18-rc4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Aug 29 22:25:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 18:25:22 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.324, 1.325 anaconda.spec, 1.450,
	1.451 sources, 1.447, 1.448
Message-ID: <200608292225.k7TMPMVK014117@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14092/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.86-1 on branch devel from anaconda-11.1.0.86-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- .cvsignore	29 Aug 2006 11:58:11 -0000	1.324
+++ .cvsignore	29 Aug 2006 22:25:19 -0000	1.325
@@ -1 +1 @@
-anaconda-11.1.0.85.tar.bz2
+anaconda-11.1.0.86.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- anaconda.spec	29 Aug 2006 11:58:11 -0000	1.450
+++ anaconda.spec	29 Aug 2006 22:25:20 -0000	1.451
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.85
+Version: 11.1.0.86
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,11 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Aug 29 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.86-1
+- Fix ia64 pxeboot dir (#199274)
+- Remember manual TCP/IP settings (dcantrel, #202662)
+- Clean up extra repo stuff some more (clumens)
+
 * Tue Aug 29 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.85-1
 - Sanity check more device names for LVM (notting, #2040387)
 - Exception handling fixes (clumens)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- sources	29 Aug 2006 11:58:11 -0000	1.447
+++ sources	29 Aug 2006 22:25:20 -0000	1.448
@@ -1 +1 @@
-90b89ed54b29b3c7e6b96dadf6cf92ed  anaconda-11.1.0.85.tar.bz2
+6b19e21d4ab08c28540e2a1e51a069b3  anaconda-11.1.0.86.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Aug 29 22:36:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 18:36:13 -0400
Subject: rpms/xinetd/devel xinetd-2.3.14-label.patch, 1.2, 1.3 xinetd.spec,
	1.37, 1.38
Message-ID: <200608292236.k7TMaCoP014281@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/xinetd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14266

Modified Files:
	xinetd-2.3.14-label.patch xinetd.spec 
Log Message:
* Tue Aug 29 2006 Steve Grubb <sgrubb at redhat.com> 2:2.3.14-6
- Revised labeled networking patch again


xinetd-2.3.14-label.patch:
 config.h.in            |    1 
 configure.in           |   28 +++++++++++++++++++++++++
 xinetd/child.c         |   53 +++++++++++++++++++++++++++++++++++++++++++++++++
 xinetd/confparse.c     |   23 +++++++++++++++++++++
 xinetd/main.c          |    5 +++-
 xinetd/nvlists.c       |    1 
 xinetd/sconf.h         |    2 +
 xinetd/xinetd.conf.man |    3 ++
 8 files changed, 115 insertions(+), 1 deletion(-)

Index: xinetd-2.3.14-label.patch
===================================================================
RCS file: /cvs/dist/rpms/xinetd/devel/xinetd-2.3.14-label.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xinetd-2.3.14-label.patch	24 Aug 2006 18:30:45 -0000	1.2
+++ xinetd-2.3.14-label.patch	29 Aug 2006 22:36:10 -0000	1.3
@@ -73,7 +73,7 @@
  /*
   * This function is running in the new process
   */
-@@ -143,6 +152,19 @@ void exec_server( const struct server *s
+@@ -143,6 +152,20 @@ void exec_server( const struct server *s
     }
  #endif
  
@@ -83,10 +83,11 @@
 +#ifdef LABELED_NET
 +   if (SC_LABELED_NET(scp))
 +   {
-+      if (set_context_from_socket( descriptor ) < 0)
++      if (set_context_from_socket( descriptor ) < 0) {
 +         msg( LOG_ERR, func,
 +             "Changing process context failed for %s", SC_ID( scp )) ;
 +         _exit( 1 ) ;
++      }
 +   }
 +#endif
 +


Index: xinetd.spec
===================================================================
RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xinetd.spec	24 Aug 2006 18:30:45 -0000	1.37
+++ xinetd.spec	29 Aug 2006 22:36:10 -0000	1.38
@@ -4,7 +4,7 @@
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.14
-Release: 5
+Release: 6
 License: Distributable (BSD-like)
 Group: System Environment/Daemons
 Epoch: 2
@@ -102,6 +102,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Aug 29 2006 Steve Grubb <sgrubb at redhat.com> 2:2.3.14-6
+- Revised labeled networking patch again
+
 * Thu Aug 24 2006 Steve Grubb <sgrubb at redhat.com> 2:2.3.14-5
 - Revised labeled networking patch
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 22:55:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 18:55:52 -0400
Subject: rpms/kernel/devel audit-combined.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2586, 1.2586.2.1
Message-ID: <200608292255.k7TMtqCO029717@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29703

Modified Files:
      Tag: private-lspp-47-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-47-branch
	audit-combined.patch 
Log Message:
* Tue Aug 29 2006 Steve Grubb <sgrubb at redhat.com> lspp.47
- fix for ppid & support for perms field in audit code


audit-combined.patch:
 arch/i386/kernel/audit.c           |   28 +++++++++++++++
 arch/ia64/ia32/audit.c             |   26 ++++++++++++++
 arch/ia64/kernel/audit.c           |   37 ++++++++++++++++++++
 arch/powerpc/kernel/Makefile       |    2 +
 arch/powerpc/kernel/audit.c        |   66 +++++++++++++++++++++++++++++++++++++
 arch/powerpc/kernel/compat_audit.c |   38 +++++++++++++++++++++
 arch/s390/kernel/Makefile          |    4 +-
 arch/s390/kernel/audit.c           |   66 +++++++++++++++++++++++++++++++++++++
 arch/s390/kernel/compat_audit.c    |   38 +++++++++++++++++++++
 arch/x86_64/ia32/audit.c           |   26 ++++++++++++++
 arch/x86_64/kernel/audit.c         |   35 +++++++++++++++++++
 include/asm-generic/audit_read.h   |    8 ++++
 include/asm-generic/audit_write.h  |   18 ++++++++++
 include/linux/audit.h              |   11 ++++++
 kernel/audit.h                     |    1 
 kernel/auditfilter.c               |   18 ++++++++++
 kernel/auditsc.c                   |   43 ++++++++++++++++++++++++
 17 files changed, 463 insertions(+), 2 deletions(-)

--- NEW FILE audit-combined.patch ---
diff --git a/arch/i386/kernel/audit.c b/arch/i386/kernel/audit.c
index 5a53c6f..3b97cff 100644
--- a/arch/i386/kernel/audit.c
+++ b/arch/i386/kernel/audit.c
@@ -8,13 +8,41 @@ #include <asm-generic/audit_dir_write.h>
 ~0U
 };
 
+static unsigned read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+static unsigned write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
 static unsigned chattr_class[] = {
 #include <asm-generic/audit_change_attr.h>
 ~0U
 };
 
+int audit_classify_syscall(int abi, unsigned syscall)
+{
+	switch(syscall) {
+	case __NR_open:
+		return 2;
+	case __NR_openat:
+		return 3;
+	case __NR_socketcall:
+		return 4;
+	case __NR_execve:
+		return 5;
+	default:
+		return 0;
+	}
+}
+
 static int __init audit_classes_init(void)
 {
+	audit_register_class(AUDIT_CLASS_WRITE, write_class);
+	audit_register_class(AUDIT_CLASS_READ, read_class);
 	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
 	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
 	return 0;
diff --git a/arch/ia64/ia32/audit.c b/arch/ia64/ia32/audit.c
index ab94f2e..92d7d0c 100644
--- a/arch/ia64/ia32/audit.c
+++ b/arch/ia64/ia32/audit.c
@@ -9,3 +9,29 @@ unsigned ia32_chattr_class[] = {
 #include <asm-generic/audit_change_attr.h>
 ~0U
 };
+
+unsigned ia32_write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
+unsigned ia32_read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+int ia32_classify_syscall(unsigned syscall)
+{
+	switch(syscall) {
+	case __NR_open:
+		return 2;
+	case __NR_openat:
+		return 3;
+	case __NR_socketcall:
+		return 4;
+	case __NR_execve:
+		return 5;
+	default:
+		return 1;
+	}
+}
diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c
index f251293..21f3338 100644
--- a/arch/ia64/kernel/audit.c
+++ b/arch/ia64/kernel/audit.c
@@ -8,19 +8,54 @@ #include <asm-generic/audit_dir_write.h>
 ~0U
 };
 
+static unsigned read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+static unsigned write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
 static unsigned chattr_class[] = {
 #include <asm-generic/audit_change_attr.h>
 ~0U
 };
 
+int audit_classify_syscall(int abi, unsigned syscall)
+{
+#ifdef CONFIG_IA32_EMULATION
+	extern int ia32_classify_syscall(unsigned);
+	if (abi == AUDIT_ARCH_I386)
+		return ia32_classify_syscall(syscall);
+#endif
+	switch(syscall) {
+	case __NR_open:
+		return 2;
+	case __NR_openat:
+		return 3;
+	case __NR_execve:
+		return 5;
+	default:
+		return 0;
+	}
+}
+
 static int __init audit_classes_init(void)
 {
-#ifdef CONFIG_IA32_SUPPORT
+#ifdef CONFIG_IA32_EMULATION
 	extern __u32 ia32_dir_class[];
+	extern __u32 ia32_write_class[];
+	extern __u32 ia32_read_class[];
 	extern __u32 ia32_chattr_class[];
+	audit_register_class(AUDIT_CLASS_WRITE_32, ia32_write_class);
+	audit_register_class(AUDIT_CLASS_READ_32, ia32_read_class);
 	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);
 	audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);
 #endif
+	audit_register_class(AUDIT_CLASS_WRITE, write_class);
+	audit_register_class(AUDIT_CLASS_READ, read_class);
 	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
 	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
 	return 0;
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 814f242..140abdf 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -70,6 +70,8 @@ obj-$(CONFIG_PCI)		+= $(pci64-y) $(pci32
 kexec-$(CONFIG_PPC64)		:= machine_kexec_64.o
 kexec-$(CONFIG_PPC32)		:= machine_kexec_32.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec.o crash.o $(kexec-y)
+obj-$(CONFIG_AUDIT)		+= audit.o
+obj64-$(CONFIG_AUDIT)		+= compat_audit.o
 
 ifeq ($(CONFIG_PPC_ISERIES),y)
 $(obj)/head_64.o: $(obj)/lparmap.s
diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c
new file mode 100644
index 0000000..7fe5e63
--- /dev/null
+++ b/arch/powerpc/kernel/audit.c
@@ -0,0 +1,66 @@
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/audit.h>
+#include <asm/unistd.h>
+
+static unsigned dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+static unsigned read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+static unsigned write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
+static unsigned chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
+
+int audit_classify_syscall(int abi, unsigned syscall)
+{
+#ifdef CONFIG_PPC64
+	extern int ppc32_classify_syscall(unsigned);
+	if (abi == AUDIT_ARCH_PPC)
+		return ppc32_classify_syscall(syscall);
+#endif
+	switch(syscall) {
+	case __NR_open:
+		return 2;
+	case __NR_openat:
+		return 3;
+	case __NR_socketcall:
+		return 4;
+	case __NR_execve:
+		return 5;
+	default:
+		return 0;
+	}
+}
+
+static int __init audit_classes_init(void)
+{
+#ifdef CONFIG_PPC64
+	extern __u32 ppc32_dir_class[];
+	extern __u32 ppc32_write_class[];
+	extern __u32 ppc32_read_class[];
+	extern __u32 ppc32_chattr_class[];
+	audit_register_class(AUDIT_CLASS_WRITE_32, ppc32_write_class);
+	audit_register_class(AUDIT_CLASS_READ_32, ppc32_read_class);
+	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ppc32_dir_class);
+	audit_register_class(AUDIT_CLASS_CHATTR_32, ppc32_chattr_class);
+#endif
+	audit_register_class(AUDIT_CLASS_WRITE, write_class);
+	audit_register_class(AUDIT_CLASS_READ, read_class);
+	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
+	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
+	return 0;
+}
+
+__initcall(audit_classes_init);
diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c
new file mode 100644
index 0000000..640d4bb
--- /dev/null
+++ b/arch/powerpc/kernel/compat_audit.c
@@ -0,0 +1,38 @@
+#undef __powerpc64__
+#include <asm/unistd.h>
+
+unsigned ppc32_dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+unsigned ppc32_chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
+
+unsigned ppc32_write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
+unsigned ppc32_read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+int ppc32_classify_syscall(unsigned syscall)
+{
+	switch(syscall) {
+	case __NR_open:
+		return 2;
+	case __NR_openat:
+		return 3;
+	case __NR_socketcall:
+		return 4;
+	case __NR_execve:
+		return 5;
+	default:
+		return 1;
+	}
+}
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 86601a9..9a33ed6 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -16,9 +16,11 @@ extra-y				+= head.o init_task.o vmlinux
 obj-$(CONFIG_MODULES)		+= s390_ksyms.o module.o
 obj-$(CONFIG_SMP)		+= smp.o
 
+obj-$(CONFIG_AUDIT)		+= audit.o
+compat-obj-$(CONFIG_AUDIT)	+= compat_audit.o
 obj-$(CONFIG_COMPAT)		+= compat_linux.o compat_signal.o \
 					compat_wrapper.o compat_exec_domain.o \
-					binfmt_elf32.o
+					binfmt_elf32.o $(compat-obj-y)
 
 obj-$(CONFIG_VIRT_TIMER)	+= vtime.o
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c
new file mode 100644
index 0000000..0741d91
--- /dev/null
+++ b/arch/s390/kernel/audit.c
@@ -0,0 +1,66 @@
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/audit.h>
+#include <asm/unistd.h>
+
+static unsigned dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+static unsigned read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+static unsigned write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
+static unsigned chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
+
+int audit_classify_syscall(int abi, unsigned syscall)
+{
+#ifdef CONFIG_COMPAT
+	extern int s390_classify_syscall(unsigned);
+	if (abi == AUDIT_ARCH_S390)
+		return s390_classify_syscall(syscall);
+#endif
+	switch(syscall) {
+	case __NR_open:
+		return 2;
+	case __NR_openat:
+		return 3;
+	case __NR_socketcall:
+		return 4;
+	case __NR_execve:
+		return 5;
+	default:
+		return 0;
+	}
+}
+
+static int __init audit_classes_init(void)
+{
+#ifdef CONFIG_COMPAT
+	extern __u32 s390_dir_class[];
+	extern __u32 s390_write_class[];
+	extern __u32 s390_read_class[];
+	extern __u32 s390_chattr_class[];
+	audit_register_class(AUDIT_CLASS_WRITE_32, s390_write_class);
+	audit_register_class(AUDIT_CLASS_READ_32, s390_read_class);
+	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, s390_dir_class);
+	audit_register_class(AUDIT_CLASS_CHATTR_32, s390_chattr_class);
+#endif
+	audit_register_class(AUDIT_CLASS_WRITE, write_class);
+	audit_register_class(AUDIT_CLASS_READ, read_class);
+	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
+	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
+	return 0;
+}
+
+__initcall(audit_classes_init);
diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c
new file mode 100644
index 0000000..16d9436
--- /dev/null
+++ b/arch/s390/kernel/compat_audit.c
@@ -0,0 +1,38 @@
+#undef __s390x__
+#include <asm/unistd.h>
+
+unsigned s390_dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+unsigned s390_chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
+
+unsigned s390_write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
+unsigned s390_read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+int s390_classify_syscall(unsigned syscall)
+{
+	switch(syscall) {
+	case __NR_open:
+		return 2;
+	case __NR_openat:
+		return 3;
+	case __NR_socketcall:
+		return 4;
+	case __NR_execve:
+		return 5;
+	default:
+		return 1;
+	}
+}
diff --git a/arch/x86_64/ia32/audit.c b/arch/x86_64/ia32/audit.c
index ab94f2e..92d7d0c 100644
--- a/arch/x86_64/ia32/audit.c
+++ b/arch/x86_64/ia32/audit.c
@@ -9,3 +9,29 @@ unsigned ia32_chattr_class[] = {
 #include <asm-generic/audit_change_attr.h>
 ~0U
 };
+
+unsigned ia32_write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
+unsigned ia32_read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+int ia32_classify_syscall(unsigned syscall)
+{
+	switch(syscall) {
+	case __NR_open:
+		return 2;
+	case __NR_openat:
+		return 3;
+	case __NR_socketcall:
+		return 4;
+	case __NR_execve:
+		return 5;
+	default:
+		return 1;
+	}
+}
diff --git a/arch/x86_64/kernel/audit.c b/arch/x86_64/kernel/audit.c
index a067aa4..21f3338 100644
--- a/arch/x86_64/kernel/audit.c
+++ b/arch/x86_64/kernel/audit.c
@@ -8,19 +8,54 @@ #include <asm-generic/audit_dir_write.h>
 ~0U
 };
 
+static unsigned read_class[] = {
+#include <asm-generic/audit_read.h>
+~0U
+};
+
+static unsigned write_class[] = {
+#include <asm-generic/audit_write.h>
+~0U
+};
+
 static unsigned chattr_class[] = {
 #include <asm-generic/audit_change_attr.h>
 ~0U
 };
 
+int audit_classify_syscall(int abi, unsigned syscall)
+{
+#ifdef CONFIG_IA32_EMULATION
+	extern int ia32_classify_syscall(unsigned);
+	if (abi == AUDIT_ARCH_I386)
+		return ia32_classify_syscall(syscall);
+#endif
+	switch(syscall) {
+	case __NR_open:
+		return 2;
+	case __NR_openat:
+		return 3;
+	case __NR_execve:
+		return 5;
+	default:
+		return 0;
+	}
+}
+
 static int __init audit_classes_init(void)
 {
 #ifdef CONFIG_IA32_EMULATION
 	extern __u32 ia32_dir_class[];
+	extern __u32 ia32_write_class[];
+	extern __u32 ia32_read_class[];
 	extern __u32 ia32_chattr_class[];
+	audit_register_class(AUDIT_CLASS_WRITE_32, ia32_write_class);
+	audit_register_class(AUDIT_CLASS_READ_32, ia32_read_class);
 	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);
 	audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);
 #endif
+	audit_register_class(AUDIT_CLASS_WRITE, write_class);
+	audit_register_class(AUDIT_CLASS_READ, read_class);
 	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
 	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
 	return 0;
diff --git a/include/asm-generic/audit_read.h b/include/asm-generic/audit_read.h
new file mode 100644
index 0000000..0e87464
--- /dev/null
+++ b/include/asm-generic/audit_read.h
@@ -0,0 +1,8 @@
+__NR_readlink,
+__NR_quotactl,
+__NR_listxattr,
+__NR_llistxattr,
+__NR_flistxattr,
+__NR_getxattr,
+__NR_lgetxattr,
+__NR_fgetxattr,
diff --git a/include/asm-generic/audit_write.h b/include/asm-generic/audit_write.h
new file mode 100644
index 0000000..affc7a1
--- /dev/null
+++ b/include/asm-generic/audit_write.h
@@ -0,0 +1,18 @@
+#include <asm-generic/audit_dir_write.h>
+__NR_acct,
+__NR_swapon,
+__NR_quotactl,
+__NR_truncate,
+#ifdef __NR_truncate64
+__NR_truncate64,
+__NR_ftruncate64,	/* ? */
+#endif
+__NR_fsync,		/* ? */
+__NR_fdatasync,		/* ? */
+__NR_ftruncate,		/* ? */
+#ifdef __NR_sync_file_range
+__NR_sync_file_range,	/* ? */
+#endif
+#ifdef __NR_bind
+__NR_bind,		/* bind can affect fs object only in one way... */
+#endif
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 64f9f9e..29d1737 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -132,6 +132,10 @@ #define AUDIT_CLASS_DIR_WRITE 0
 #define AUDIT_CLASS_DIR_WRITE_32 1
 #define AUDIT_CLASS_CHATTR 2
 #define AUDIT_CLASS_CHATTR_32 3
+#define AUDIT_CLASS_READ 4
+#define AUDIT_CLASS_READ_32 5
+#define AUDIT_CLASS_WRITE 6
+#define AUDIT_CLASS_WRITE_32 7
 
 /* This bitmask is used to validate user input.  It represents all bits that
  * are currently used in an audit field constant understood by the kernel.
@@ -177,6 +181,7 @@ #define AUDIT_INODE	102
 #define AUDIT_EXIT	103
 #define AUDIT_SUCCESS   104	/* exit >= 0; value ignored */
 #define AUDIT_WATCH	105
+#define AUDIT_PERM	106
 
 #define AUDIT_ARG0      200
 #define AUDIT_ARG1      (AUDIT_ARG0+1)
@@ -252,6 +257,11 @@ #define AUDIT_ARCH_SPARC64	(EM_SPARCV9|_
 #define AUDIT_ARCH_V850		(EM_V850|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_X86_64	(EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
 
+#define AUDIT_PERM_EXEC		1
+#define AUDIT_PERM_WRITE	2
+#define AUDIT_PERM_READ		4
+#define AUDIT_PERM_ATTR		4
+
 struct audit_status {
 	__u32		mask;		/* Bit mask for valid entries */
 	__u32		enabled;	/* 1 = enabled, 0 = disabled */
@@ -314,6 +324,7 @@ #define AUDITSC_SUCCESS 1
 #define AUDITSC_FAILURE 2
 #define AUDITSC_RESULT(x) ( ((long)(x))<0?AUDITSC_FAILURE:AUDITSC_SUCCESS )
 extern int __init audit_register_class(int class, unsigned *list);
+extern int audit_classify_syscall(int abi, unsigned syscall);
 #ifdef CONFIG_AUDITSYSCALL
 /* These are defined in auditsc.c */
 				/* Public API */
diff --git a/kernel/audit.h b/kernel/audit.h
index 6aa33b8..a337023 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -104,6 +104,7 @@ static inline int audit_hash_ino(u32 ino
 	return (ino & (AUDIT_INODE_BUCKETS-1));
 }
 
+extern int audit_match_class(int class, unsigned syscall);
 extern int audit_comparator(const u32 left, const u32 op, const u32 right);
 extern int audit_compare_dname_path(const char *dname, const char *path,
 				    int *dirlen);
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 6a9a5c5..cba0708 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -302,6 +302,15 @@ int __init audit_register_class(int clas
 	return 0;
 }
 
+int audit_match_class(int class, unsigned syscall)
+{
+	if (unlikely(syscall >= AUDIT_BITMASK_SIZE * sizeof(__u32)))
+		return 0;
+	if (unlikely(class >= AUDIT_SYSCALL_CLASSES || !classes[class]))
+		return 0;
+	return classes[class][AUDIT_WORD(syscall)] & AUDIT_BIT(syscall);
+}
+
 /* Common user-space to kernel rule translation. */
 static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
 {
@@ -404,6 +413,7 @@ static struct audit_entry *audit_rule_to
 		case AUDIT_PERS:
 		case AUDIT_ARCH:
 		case AUDIT_MSGTYPE:
+		case AUDIT_PPID:
 		case AUDIT_DEVMAJOR:
 		case AUDIT_DEVMINOR:
 		case AUDIT_EXIT:
@@ -413,6 +423,10 @@ static struct audit_entry *audit_rule_to
 		case AUDIT_ARG2:
 		case AUDIT_ARG3:
 			break;
+		case AUDIT_PERM:
+			if (f->val & ~15)
+				goto exit_free;
+			break;
 		case AUDIT_INODE:
 			err = audit_to_inode(&entry->rule, f);
 			if (err)
@@ -567,6 +581,10 @@ static struct audit_entry *audit_data_to
 			entry->rule.buflen += f->val;
 			entry->rule.filterkey = str;
 			break;
+		case AUDIT_PERM:
+			if (f->val & ~15)
+				goto exit_free;
+			break;
 		default:
 			goto exit_free;
 		}
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index efc1b74..74d9f50 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -209,6 +209,46 @@ #if AUDIT_DEBUG
 #endif
 };
 
+#define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
+static int audit_match_perm(struct audit_context *ctx, int mask)
+{
+	unsigned n = ctx->major;
+	switch (audit_classify_syscall(ctx->arch, n)) {
+	case 0:	/* native */
+		if ((mask & AUDIT_PERM_WRITE) &&
+		     audit_match_class(AUDIT_CLASS_WRITE, n))
+			return 1;
+		if ((mask & AUDIT_PERM_READ) &&
+		     audit_match_class(AUDIT_CLASS_READ, n))
+			return 1;
+		if ((mask & AUDIT_PERM_ATTR) &&
+		     audit_match_class(AUDIT_CLASS_CHATTR, n))
+			return 1;
+		return 0;
+	case 1: /* 32bit on biarch */
+		if ((mask & AUDIT_PERM_WRITE) &&
+		     audit_match_class(AUDIT_CLASS_WRITE_32, n))
+			return 1;
+		if ((mask & AUDIT_PERM_READ) &&
+		     audit_match_class(AUDIT_CLASS_READ_32, n))
+			return 1;
+		if ((mask & AUDIT_PERM_ATTR) &&
+		     audit_match_class(AUDIT_CLASS_CHATTR_32, n))
+			return 1;
+		return 0;
+	case 2: /* open */
+		return mask & ACC_MODE(ctx->argv[1]);
+	case 3: /* openat */
+		return mask & ACC_MODE(ctx->argv[2]);
+	case 4: /* socketcall */
+		return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND);
+	case 5: /* execve */
+		return mask & AUDIT_PERM_EXEC;
+	default:
+		return 0;
+	}
+}
+
 /* Determine if any context name data matches a rule's watch data */
 /* Compare a task_struct with an audit_rule.  Return 1 on match, 0
  * otherwise. */
@@ -397,6 +437,9 @@ static int audit_filter_rules(struct tas
 			/* ignore this field for filtering */
 			result = 1;
 			break;
+		case AUDIT_PERM:
+			result = audit_match_perm(ctx, f->val);
+			break;
 		}
 
 		if (!result)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2586
retrieving revision 1.2586.2.1
diff -u -r1.2586 -r1.2586.2.1
--- kernel-2.6.spec	24 Aug 2006 12:32:41 -0000	1.2586
+++ kernel-2.6.spec	29 Aug 2006 22:55:48 -0000	1.2586.2.1
@@ -9,10 +9,10 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define builddoc 0
-%define buildkdump 1
-%define buildheaders 1
+%define buildkdump 0
+%define buildheaders 0
 
 # Versions of various parts
 
@@ -31,7 +31,8 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+%define tag .lspp.47
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%tag
 %define signmodules 0
 %define xen_hv_cset 11057
 %define make_target bzImage
@@ -487,6 +488,8 @@
 
 Patch20000: xen-missing-includes.patch
 
+Patch20100: audit-combined.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1031,6 +1034,7 @@
 # misc small stuff to make things compile or otherwise improve performance
 #
 %patch10000 -p1
+%patch20100 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -1751,6 +1755,9 @@
 %endif
 
 %changelog
+* Tue Aug 29 2006 Steve Grubb <sgrubb at redhat.com> lspp.47
+- fix for ppid & support for perms field in audit code
+
 * Thu Aug 24 2006 David Woodhouse <dwmw2 at redhat.com>
 - Update GFS2 patch (from swhiteho)
 - Enable kernel-headers build



From fedora-cvs-commits at redhat.com  Tue Aug 29 22:59:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 18:59:57 -0400
Subject: rpms/selinux-policy/FC-5 policy-20060822.patch,1.2,1.3
Message-ID: <200608292259.k7TMxvea029911@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29894

Modified Files:
	policy-20060822.patch 
Log Message:
* Mon Aug 28 2006 Dan Walsh <dwalsh at redhat.com> 2.3.7-3.fc5
- Backport some fixes for FC5 from rawhide


policy-20060822.patch:
 mls                                |    9 -
 modules/admin/amanda.fc            |   51 -------
 modules/admin/anaconda.te          |   20 ++-
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    2 
 modules/admin/prelink.te           |    3 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |   13 +
 modules/admin/usermanage.te        |    5 
 modules/apps/java.fc               |    9 +
 modules/apps/mozilla.if            |    2 
 modules/apps/wine.te               |    2 
 modules/kernel/corecommands.fc     |    1 
 modules/kernel/corecommands.if     |    1 
 modules/kernel/corenetwork.te.in   |    7 -
 modules/kernel/devices.fc          |    4 
 modules/kernel/devices.if          |   37 +++++
 modules/kernel/devices.te          |    8 +
 modules/kernel/files.if            |   18 ++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   75 +++++++++++
 modules/kernel/terminal.if         |   19 ++
 modules/services/afs.te            |   14 --
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    5 
 modules/services/avahi.te          |    2 
 modules/services/bind.te           |    1 
 modules/services/bluetooth.te      |    5 
 modules/services/clamav.if         |    1 
 modules/services/cpucontrol.te     |    2 
 modules/services/cron.if           |   18 ++
 modules/services/cron.te           |    9 -
 modules/services/cups.te           |   31 +++-
 modules/services/cyrus.te          |    5 
 modules/services/dbus.if           |    6 
 modules/services/dovecot.te        |    2 
 modules/services/gatekeeper.te     |   15 --
 modules/services/inn.te            |    1 
 modules/services/ldap.te           |    2 
 modules/services/mta.fc            |    2 
 modules/services/networkmanager.te |    2 
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    2 
 modules/services/pegasus.if        |   31 ++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    7 +
 modules/services/postgresql.te     |    1 
 modules/services/procmail.te       |    1 
 modules/services/radius.te         |    2 
 modules/services/rpc.if            |    2 
 modules/services/rpc.te            |    7 -
 modules/services/samba.te          |    8 -
 modules/services/setroubleshoot.fc |    9 +
 modules/services/setroubleshoot.if |    3 
 modules/services/setroubleshoot.te |  112 ++++++++++++++++
 modules/services/spamassassin.te   |    5 
 modules/services/squid.te          |    4 
 modules/services/ssh.if            |   24 +++
 modules/services/ssh.te            |   85 ++++++------
 modules/services/stunnel.te        |    6 
 modules/services/sysstat.te        |    3 
 modules/services/xserver.if        |   68 +++++++++-
 modules/services/xserver.te        |   15 +-
 modules/system/authlogin.if        |   21 ---
 modules/system/authlogin.te        |    1 
 modules/system/fstools.te          |    1 
 modules/system/hostname.te         |   10 +
 modules/system/init.if             |    7 -
 modules/system/init.te             |    2 
 modules/system/libraries.fc        |   19 ++
 modules/system/locallogin.te       |    4 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |   21 +++
 modules/system/logging.te          |   11 +
 modules/system/lvm.fc              |    2 
 modules/system/lvm.te              |    6 
 modules/system/miscfiles.fc        |    1 
 modules/system/miscfiles.if        |   18 ++
 modules/system/modutils.te         |    1 
 modules/system/mount.te            |    7 +
 modules/system/selinuxutil.te      |   15 ++
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    1 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    2 
 modules/system/unconfined.te       |    9 -
 modules/system/userdomain.if       |  246 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   48 +++----
 modules/system/xen.if              |   38 +++++
 modules/system/xen.te              |   26 +++
 91 files changed, 1008 insertions(+), 351 deletions(-)

Index: policy-20060822.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060822.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policy-20060822.patch	28 Aug 2006 19:31:07 -0000	1.2
+++ policy-20060822.patch	29 Aug 2006 22:59:55 -0000	1.3
@@ -1119,6 +1119,18 @@
  ifdef(`distro_redhat',`
  /etc/postfix/aliases.*		gen_context(system_u:object_r:etc_aliases_t,s0)
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.3.7/policy/modules/services/networkmanager.te
+--- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-08-12 06:57:28.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/networkmanager.te	2006-08-28 15:31:53.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ allow NetworkManager_t self:capability { kill setgid setuid sys_nice dac_override net_admin net_raw net_bind_service ipc_lock};
+ dontaudit NetworkManager_t self:capability sys_tty_config;
+-allow NetworkManager_t self:process { setcap getsched signal_perms };
++allow NetworkManager_t self:process { setcap getsched signal_perms ptrace };
+ allow NetworkManager_t self:fifo_file rw_file_perms;
+ allow NetworkManager_t self:unix_dgram_socket { sendto create_socket_perms };
+ allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.7/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-08-12 06:57:20.000000000 -0400
 +++ serefpolicy-2.3.7/policy/modules/services/ntp.te	2006-08-28 14:20:46.000000000 -0400
@@ -1488,8 +1500,16 @@
 +files_getattr_all_dirs(setroubleshootd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.7/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-08-12 06:57:20.000000000 -0400
-+++ serefpolicy-2.3.7/policy/modules/services/spamassassin.te	2006-08-28 14:20:46.000000000 -0400
-@@ -194,3 +194,7 @@
++++ serefpolicy-2.3.7/policy/modules/services/spamassassin.te	2006-08-29 18:51:34.000000000 -0400
+@@ -135,6 +135,7 @@
+ 	term_dontaudit_use_generic_ptys(spamd_t)
+ 	files_dontaudit_read_root_files(spamd_t)
+ 	tunable_policy(`spamd_enable_home_dirs',`
++		userdom_home_filetrans_generic_user_home_dir(spamd_t)
+ 		userdom_manage_generic_user_home_content_dirs(spamd_t)
+ 		userdom_manage_generic_user_home_content_files(spamd_t)
+ 		userdom_manage_generic_user_home_content_symlinks(spamd_t)
+@@ -194,3 +195,7 @@
  optional_policy(`
  	udev_read_db(spamd_t)
  ')
@@ -1543,6 +1563,133 @@
 +	allow ssh_keygen_t $1:fifo_file rw_file_perms;
 +	allow ssh_keygen_t $1:process sigchld;
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.3.7/policy/modules/services/ssh.te
+--- nsaserefpolicy/policy/modules/services/ssh.te	2006-08-12 06:57:20.000000000 -0400
++++ serefpolicy-2.3.7/policy/modules/services/ssh.te	2006-08-28 17:23:55.000000000 -0400
+@@ -12,8 +12,10 @@
+ type ssh_exec_t;
+ corecmd_executable_file(ssh_exec_t)
+ 
++type ssh_keygen_t;
+ type ssh_keygen_exec_t;
+ corecmd_executable_file(ssh_keygen_exec_t)
++init_system_domain(ssh_keygen_t,ssh_keygen_exec_t)
+ 
+ type ssh_keysign_exec_t;
+ corecmd_executable_file(ssh_keysign_exec_t)
+@@ -39,10 +41,6 @@
+ 	type ssh_agent_exec_t;
+ 	files_type(ssh_agent_exec_t)
+ 
+-	type ssh_keygen_t;
+-	init_system_domain(ssh_keygen_t,ssh_keygen_exec_t)
+-	role system_r types ssh_keygen_t;
+-
+ 	ssh_server_template(sshd)
+ 	ssh_server_template(sshd_extern)
+ 
+@@ -200,62 +198,61 @@
+ # ssh_keygen local policy
+ #
+ 
+-ifdef(`targeted_policy',`',`
+-	# ssh_keygen_t is the type of the ssh-keygen program when run at install time
+-	# and by sysadm_t
++# ssh_keygen_t is the type of the ssh-keygen program when run at install time
++# and by sysadm_t
+ 
+-	dontaudit ssh_keygen_t self:capability sys_tty_config;
+-	allow ssh_keygen_t self:process { sigchld sigkill sigstop signull signal };
++dontaudit ssh_keygen_t self:capability sys_tty_config;
++allow ssh_keygen_t self:process { sigchld sigkill sigstop signull signal };
+ 
+-	allow ssh_keygen_t self:unix_stream_socket create_stream_socket_perms;
++allow ssh_keygen_t self:unix_stream_socket create_stream_socket_perms;
+ 
+-	allow ssh_keygen_t sshd_key_t:file create_file_perms;
+-	files_etc_filetrans(ssh_keygen_t,sshd_key_t,file)
++allow ssh_keygen_t sshd_key_t:file create_file_perms;
++files_etc_filetrans(ssh_keygen_t,sshd_key_t,file)
+ 
+-	kernel_read_kernel_sysctls(ssh_keygen_t)
++kernel_read_kernel_sysctls(ssh_keygen_t)
+ 
+-	fs_search_auto_mountpoints(ssh_keygen_t)
++fs_search_auto_mountpoints(ssh_keygen_t)
+ 
+-	dev_read_sysfs(ssh_keygen_t)
+-	dev_read_urand(ssh_keygen_t)
++dev_read_sysfs(ssh_keygen_t)
++dev_read_urand(ssh_keygen_t)
+ 
+-	term_dontaudit_use_console(ssh_keygen_t)
++term_dontaudit_use_console(ssh_keygen_t)
+ 
+-	domain_use_interactive_fds(ssh_keygen_t)
++domain_use_interactive_fds(ssh_keygen_t)
+ 
+-	files_read_etc_files(ssh_keygen_t)
++files_read_etc_files(ssh_keygen_t)
+ 
+-	init_use_fds(ssh_keygen_t)
+-	init_use_script_ptys(ssh_keygen_t)
++init_use_fds(ssh_keygen_t)
++init_use_script_ptys(ssh_keygen_t)
+ 
+-	libs_use_ld_so(ssh_keygen_t)
+-	libs_use_shared_libs(ssh_keygen_t)
++libs_use_ld_so(ssh_keygen_t)
++libs_use_shared_libs(ssh_keygen_t)
+ 
+-	logging_send_syslog_msg(ssh_keygen_t)
++logging_send_syslog_msg(ssh_keygen_t)
+ 
+-	allow ssh_keygen_t proc_t:dir r_dir_perms;
+-	allow ssh_keygen_t proc_t:lnk_file read;
++allow ssh_keygen_t proc_t:dir r_dir_perms;
++allow ssh_keygen_t proc_t:lnk_file read;
+ 
+-	userdom_use_sysadm_ttys(ssh_keygen_t)
+-	userdom_dontaudit_use_unpriv_user_fds(ssh_keygen_t)
++userdom_use_sysadm_ttys(ssh_keygen_t)
++userdom_dontaudit_use_unpriv_user_fds(ssh_keygen_t)
+ 
+-	# cjp: with the old daemon_(base_)domain being broken up into
+-	# a daemon and system interface, this probably is not needed:
+-	ifdef(`direct_sysadm_daemon',`
+-		userdom_dontaudit_use_sysadm_terms(ssh_keygen_t)
+-	')
++# cjp: with the old daemon_(base_)domain being broken up into
++# a daemon and system interface, this probably is not needed:
++ifdef(`direct_sysadm_daemon',`
++	userdom_dontaudit_use_sysadm_terms(ssh_keygen_t)
++')
+ 
+-	ifdef(`targeted_policy', `
+-		term_dontaudit_use_unallocated_ttys(ssh_keygen_t)
+-		term_dontaudit_use_generic_ptys(ssh_keygen_t)
+-		files_dontaudit_read_root_files(ssh_keygen_t)
+-	')
++ifdef(`targeted_policy', `
++	term_dontaudit_use_unallocated_ttys(ssh_keygen_t)
++	term_dontaudit_use_generic_ptys(ssh_keygen_t)
++	files_dontaudit_read_root_files(ssh_keygen_t)
++')
+ 
+-	optional_policy(`
+-		seutil_sigchld_newrole(ssh_keygen_t)
+-	')
++optional_policy(`
++	seutil_sigchld_newrole(ssh_keygen_t)
++')
+ 
+-	optional_policy(`
+-		udev_read_db(ssh_keygen_t)
+-	')
++optional_policy(`
++	udev_read_db(ssh_keygen_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.7/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-12 06:57:28.000000000 -0400
 +++ serefpolicy-2.3.7/policy/modules/services/stunnel.te	2006-08-28 14:20:46.000000000 -0400



From fedora-cvs-commits at redhat.com  Tue Aug 29 23:20:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 19:20:25 -0400
Subject: rpms/wireless-tools/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 wireless-tools.spec, 1.33, 1.34
Message-ID: <200608292320.k7TNKP0P012937@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/wireless-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12923

Modified Files:
	.cvsignore sources wireless-tools.spec 
Log Message:
* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 1:28-1
- Update to the latest stable release
- Create -devel subpackage for headers



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Apr 2006 21:48:28 -0000	1.15
+++ .cvsignore	29 Aug 2006 23:20:20 -0000	1.16
@@ -1,2 +1 @@
-wireless_tools.28.pre13.tar.gz
-wireless_tools.28.pre16.tar.gz
+wireless_tools.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Apr 2006 21:48:28 -0000	1.15
+++ sources	29 Aug 2006 23:20:20 -0000	1.16
@@ -1 +1 @@
-abccc8bc09e1324af702b58adb6eda18  wireless_tools.28.pre16.tar.gz
+599c94497f9c9073c7b052d3dcb7cd16  wireless_tools.28.tar.gz


Index: wireless-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/wireless-tools.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- wireless-tools.spec	12 Jul 2006 08:48:48 -0000	1.33
+++ wireless-tools.spec	29 Aug 2006 23:20:20 -0000	1.34
@@ -1,30 +1,6 @@
-%define pre_version pre16
-%define pre_release 1
-
-%define build_fc3			0
-%define build_rhel4			0
-%define build_fc4			0
-%define build_fc5			0
-%define build_fc6			1
-
-%if %{build_fc3}
-%define release_extension 1.fc3
-%endif
-
-%if %{build_rhel4}
-%define release_extension 3.EL4
-%endif
-
-%if %{build_fc4}
-%define release_extension 4.fc4
-%endif
-
-%if %{build_fc5}
-%define release_extension 5.fc5
-%endif
-
-%if %{build_fc6}
-%define release_extension 6
+%define pre_release 0
+%if %{pre_release}
+%define pre_version .pre16
 %endif
 
 Summary: Wireless ethernet configuration tools
@@ -32,10 +8,10 @@
 License: GPL
 Name: wireless-tools
 Version: 28
-Release: 0.%{pre_version}.%{pre_release}.%{release_extension}.1
+Release: 1%{?pre_version}%{?dist}
 Epoch: 1
 URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-Source: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}.%{pre_version}.tar.gz
+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
@@ -44,9 +20,25 @@
 This package contain the Wireless tools, used to manipulate
 the Wireless Extensions. The Wireless Extension is an interface
 allowing you to set Wireless LAN specific parameters and get the
-specific stats for wireless networking equipment. 
+specific stats for wireless networking equipment.
+
+%package devel
+Summary: Development headers for the wireless-tools package
+Group: Development/Libraries
+Requires: wireless-tools = %{epoch}:%{version}-%{release}
+
+%description devel
+Development headers for the wireless-tools package.
+
 
 %prep
+%if %{pre_release}
+if [ "$(echo %{release} | sed -e 's/\..*$//')" -ne "0" ]; then
+  echo "*** The Release: value for a pre-release version must be less than 1. ***"
+  exit 1
+fi
+%endif
+
 %setup -n wireless_tools.%{version}
 %patch1 -p1 -b .makefile
 
@@ -55,33 +47,41 @@
 make OPT_FLAGS="$RPM_OPT_FLAGS" BUILD_SHARED=1 FORCE_WEXT_VERSION=16
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT{/sbin,/%{_lib},%{_mandir}/man8,%{_includedir},%{_libdir}}
+%{__mkdir_p} $RPM_BUILD_ROOT{/sbin,/%{_lib},%{_mandir}/man8,%{_includedir},%{_libdir}}
 
 make install INSTALL_DIR=$RPM_BUILD_ROOT/sbin \
 	INSTALL_LIB=$RPM_BUILD_ROOT/%{_lib} \
 	INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \
 	INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir}
-rm -f $RPM_BUILD_ROOT/%{_lib}/libiw.{a,so}
+%{__rm} -f $RPM_BUILD_ROOT/%{_lib}/libiw.{a,so}
 ln -sf /%{_lib}/libiw.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libiw.so
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc INSTALL README DISTRIBUTIONS.txt
 /sbin/*
 %{_mandir}/man*/*
+/%{_lib}/*.so.*
+
+%files devel
+%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
-/%{_lib}/*.so.*
+
 
 %changelog
+* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 1:28-1
+- Update to the latest stable release
+- Create -devel subpackage for headers
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:28-0.pre16.1.6.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 23:42:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 19:42:08 -0400
Subject: rpms/mrtg/devel mrtg.spec,1.31,1.32
Message-ID: <200608292342.k7TNg8RV013187@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/mrtg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13160

Modified Files:
	mrtg.spec 
Log Message:
* Wed Aug 30 2006 Miloslav Trmac <mitr at redhat.com> - 2.14.5-2
- Add Requires: perl-Socket6 perl-IO-Socket-INET6 for IPv6 support



Index: mrtg.spec
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/mrtg.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mrtg.spec	16 Jul 2006 02:26:03 -0000	1.31
+++ mrtg.spec	29 Aug 2006 23:41:59 -0000	1.32
@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.14.5
-Release:   1
+Release:   2
 URL:       http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/
 Source0:   http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz
 Source1:   http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz.md5.pgp
@@ -19,6 +19,7 @@
 License:   GPL
 Group:     Applications/Internet
 PreReq:    vixie-cron, /sbin/service
+Requires:  perl-Socket6 perl-IO-Socket-INET6
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gd-devel, libpng-devel
 
@@ -111,6 +112,9 @@
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Wed Aug 30 2006 Miloslav Trmac <mitr at redhat.com> - 2.14.5-2
+- Add Requires: perl-Socket6 perl-IO-Socket-INET6 for IPv6 support
+
 * Sun Jul 16 2006 Miloslav Trmac <mitr at redhat.com> - 2.14.5-1
 - Update to mrtg-2.14.5
 
@@ -380,7 +384,7 @@
 * Thu Jun 18 1998 Arne Coucheron <arneco at online.no>
   [2.5.3-1]
 - using %%{name} and %%{version} macros
-- using %defattr macro in filelist
+- using %%defattr macro in filelist
 - using install -d in various places instead of cp
-- added -q parameter to %setup
+- added -q parameter to %%setup
 - removed older changelogs



From fedora-cvs-commits at redhat.com  Tue Aug 29 23:45:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 19:45:18 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.118,1.119
Message-ID: <200608292345.k7TNjIH6013272@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13260

Modified Files:
	NetworkManager.spec 
Log Message:
* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 0.7.0-0.cvs20060529.7
- BuildRequire wireless-tools-devel
- Update the BuildRoot tag



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- NetworkManager.spec	16 Aug 2006 19:28:42 -0000	1.118
+++ NetworkManager.spec	29 Aug 2006 23:45:15 -0000	1.119
@@ -16,7 +16,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.7.0
-Release: 0%{?nm_cvs_version}.6
+Release: 0%{?nm_cvs_version}.7
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -24,7 +24,7 @@
 Patch0: NetworkManager-0.7.0-dbus-deprecated.patch
 Patch1: NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch
 Patch2: NetworkManager-0.7.0-shhh.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
 Requires: wireless-tools >= %{wireless_tools_version}
@@ -41,7 +41,7 @@
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: hal-devel >= %{hal_version}
-BuildRequires: wireless-tools >= %{wireless_tools_version}
+BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
 BuildRequires: glib2-devel gtk2-devel
 BuildRequires: libglade2-devel
 BuildRequires: openssl-devel
@@ -220,6 +220,10 @@
 
 
 %changelog
+* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 0.7.0-0.cvs20060529.7
+- BuildRequire wireless-tools-devel
+- Update the BuildRoot tag
+
 * Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> - 0.7.0-0.cvs20060529.6
 - add patch to make networkmanager less verbose (bug 202832)
 



From fedora-cvs-commits at redhat.com  Tue Aug 29 23:52:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 19:52:17 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.119,1.120
Message-ID: <200608292352.k7TNqHVQ028542@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28530

Modified Files:
	NetworkManager.spec 
Log Message:
BuildRequire perl-XML-Parser


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- NetworkManager.spec	29 Aug 2006 23:45:15 -0000	1.119
+++ NetworkManager.spec	29 Aug 2006 23:52:13 -0000	1.120
@@ -55,6 +55,7 @@
 BuildRequires: wpa_supplicant
 BuildRequires: libnl-devel
 BuildRequires: libnotify-devel >= 0.3
+BuildRequires: perl-XML-Parser
 
 %description
 NetworkManager attempts to keep an active network connection available at all
@@ -221,7 +222,7 @@
 
 %changelog
 * Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 0.7.0-0.cvs20060529.7
-- BuildRequire wireless-tools-devel
+- BuildRequire wireless-tools-devel and perl-XML-Parser
 - Update the BuildRoot tag
 
 * Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> - 0.7.0-0.cvs20060529.6



From fedora-cvs-commits at redhat.com  Wed Aug 30 00:08:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 20:08:25 -0400
Subject: rpms/rhpl/devel rhpl.spec,1.76,1.77
Message-ID: <200608300008.k7U08OHl028717@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/rhpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28705

Modified Files:
	rhpl.spec 
Log Message:
* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 0.188-2
- Update BR to use the now split-out wireless-tools-devel package



Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- rhpl.spec	25 Jul 2006 09:37:31 -0000	1.76
+++ rhpl.spec	30 Aug 2006 00:08:18 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: Library of python code used by programs in Red Hat Linux
 Name: rhpl
 Version: 0.188
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
@@ -9,7 +9,7 @@
 BuildRequires: python-devel, gettext
 Requires: python >= %(%{__python} -c "import sys; print sys.version[:3]")
 %ifnarch s390 s390x
-BuildRequires: wireless-tools
+BuildRequires: wireless-tools-devel
 Requires: pyxf86config >= 0.3.2
 %endif
 Conflicts: kudzu < 1.2.0, hwdata < 0.169
@@ -39,6 +39,9 @@
 %{_libdir}/python?.?/site-packages/rhpl
 
 %changelog
+* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 0.188-2
+- Update BR to use the now split-out wireless-tools-devel package
+
 * Tue Jul 25 2006 Harald Hoyer <harald at redhat.com> - 0.188-1
 - correctly parse bool values in genClass.py
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 00:10:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 20:10:40 -0400
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.88,1.89
Message-ID: <200608300010.k7U0AeKh028815@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28799

Modified Files:
	kdenetwork.spec 
Log Message:
* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> 7:3.5.4-3
- Update BR to use the now split-out wireless-tools-devel package



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kdenetwork.spec	10 Aug 2006 14:38:37 -0000	1.88
+++ kdenetwork.spec	30 Aug 2006 00:10:36 -0000	1.89
@@ -13,7 +13,7 @@
 
 Name: kdenetwork
 Version: 3.5.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -52,7 +52,7 @@
 BuildRequires: automake
 BuildRequires: autoconf
 %ifnarch s390 s390x
-BuildRequires: wireless-tools >= 25
+BuildRequires: wireless-tools-devel >= 25
 %endif
 BuildRequires: coreutils
 BuildRequires: libXmu-devel
@@ -229,6 +229,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> 7:3.5.4-3
+- Update BR to use the now split-out wireless-tools-devel package
+
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 7:3.5.4-2
 - apply upstream patches,
    - check the return value from XF86VidModeGetAllModeLines() to avoid crashing kde#73519



From fedora-cvs-commits at redhat.com  Wed Aug 30 02:14:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 22:14:21 -0400
Subject: rpms/ltrace/devel ltrace-0.5-ppc32-2.patch, NONE, 1.1 ltrace.spec,
	1.51, 1.52
Message-ID: <200608300214.k7U2ELX5025663@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25648

Modified Files:
	ltrace.spec 
Added Files:
	ltrace-0.5-ppc32-2.patch 
Log Message:
- first take on ppc32 testsuite problems...


ltrace-0.5-ppc32-2.patch:
 elf.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

--- NEW FILE ltrace-0.5-ppc32-2.patch ---
diff -Burp ltrace-0.5-orig/elf.c ltrace-0.5/elf.c
--- ltrace-0.5-orig/elf.c	2006-08-30 02:38:17.000000000 +0200
+++ ltrace-0.5/elf.c	2006-08-30 03:42:30.000000000 +0200
@@ -478,10 +478,17 @@ struct library_symbol *read_elf(struct p
 
 		name = lte->dynstr + sym.st_name;
 		if (in_load_libraries(name, lte)) {
-			addr = arch_plt_sym_val(lte, i, &rela);
-			add_library_symbol(addr, name, &library_symbols,
-					   (PLTS_ARE_EXECUTABLE(lte)
-					   ?  LS_TOPLT_EXEC : LS_TOPLT_POINT),
+			enum toplt pltt;
+			if (lte->ehdr.e_machine == EM_PPC) {
+				addr = sym.st_value;
+				pltt = LS_TOPLT_EXEC;
+			}
+			else {
+				addr = arch_plt_sym_val(lte, i, &rela);
+				pltt = (PLTS_ARE_EXECUTABLE(lte)
+					?  LS_TOPLT_EXEC : LS_TOPLT_POINT);
+			}
+			add_library_symbol(addr, name, &library_symbols, pltt,
 					   ELF64_ST_BIND(sym.st_info) == STB_WEAK);
 			if (!lib_tail)
 				lib_tail = &(library_symbols->next);


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ltrace.spec	28 Aug 2006 10:50:14 -0000	1.51
+++ ltrace.spec	30 Aug 2006 02:14:13 -0000	1.52
@@ -7,6 +7,7 @@
 Patch3: ltrace-ppc32fc5.patch
 Patch4: ltrace-0.5-gnuhash.patch
 Patch5: ltrace-0.5-testsuite.patch
+Patch6: ltrace-0.5-ppc32-2.patch
 License: GPL
 Group: Development/Debuggers
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
@@ -30,6 +31,7 @@
 %patch3 -p0
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 sed -i -e 's/-o root -g root//' Makefile.in
 
 %build
@@ -59,6 +61,7 @@
 %changelog
 * Wed Aug 28 2006 Petr Machata <pmachata at redhat.com> - 0.5-4.45svn
 - enabling testsuite in hunt for testsuite fail on ppc
+- first take on ppc32 testsuite problems...
 
 * Wed Aug 23 2006 Petr Machata <pmachata at redhat.com> - 0.5-3.45svn
 - use "{X}.{release}svn" release string per naming guidelines



From fedora-cvs-commits at redhat.com  Wed Aug 30 02:31:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 22:31:29 -0400
Subject: rpms/mesa/devel .cvsignore, 1.10, 1.11 mesa.spec, 1.94, 1.95 sources,
	1.9, 1.10
Message-ID: <200608300231.k7U2VTax008749@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8735

Modified Files:
	.cvsignore mesa.spec sources 
Log Message:
* Tue Aug 29 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc2.fc6
- Rebase to 6.5.1 RC2.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Aug 2006 22:26:16 -0000	1.10
+++ .cvsignore	30 Aug 2006 02:31:26 -0000	1.11
@@ -1,2 +1,2 @@
-MesaDemos-6.5.1-rc1.tar.bz2
-MesaLib-6.5.1-rc1.tar.bz2
+MesaDemos-6.5.1-rc2.tar.bz2
+MesaLib-6.5.1-rc2.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- mesa.spec	28 Aug 2006 18:37:27 -0000	1.94
+++ mesa.spec	30 Aug 2006 02:31:26 -0000	1.95
@@ -34,14 +34,14 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5.1
-Release: 0.rc1.2%{?dist}
+Release: 0.rc2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.5.1-rc1.tar.bz2
-Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-6.5.1-rc1.tar.bz2
+Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.5.1-rc2.tar.bz2
+Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-6.5.1-rc2.tar.bz2
 Source10: redhat-mesa-target
 Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
@@ -498,6 +498,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Aug 29 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc2.fc6
+- Rebase to 6.5.1 RC2.
+
 * Mon Aug 28 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc1.2.fc6
 - Drop upstreamed patches mesa-6.5-texture-from-pixmap-fixes.patch and
   mesa-6.5-tfp-fbconfig-attribs.patch and fix


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Aug 2006 22:26:16 -0000	1.9
+++ sources	30 Aug 2006 02:31:27 -0000	1.10
@@ -1,2 +1,2 @@
-0fe3339a9a15be865a343fa7c6dc4f6f  MesaDemos-6.5.1-rc1.tar.bz2
-aa96e9d7e59e63b25b623b7307bc1262  MesaLib-6.5.1-rc1.tar.bz2
+0f2794baf7a9d98b22caea9f78c6942d  MesaDemos-6.5.1-rc2.tar.bz2
+cbe299b9f638b7907c15c61b5626687c  MesaLib-6.5.1-rc2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 30 02:31:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 22:31:51 -0400
Subject: rpms/compiz/devel cow.patch,NONE,1.1 compiz.spec,1.22,1.23
Message-ID: <200608300231.k7U2Vp4J008782@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8768

Modified Files:
	compiz.spec 
Added Files:
	cow.patch 
Log Message:
* Tue Aug 29 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.20.20060817git.fc6
- Add cow.patch to make compiz use the composite overlay window.


cow.patch:
 include/compiz.h |    2 ++
 src/display.c    |    6 +++---
 src/event.c      |    7 ++++++-
 src/screen.c     |   27 +++++++++++++++++++++++++--
 4 files changed, 36 insertions(+), 6 deletions(-)

--- NEW FILE cow.patch ---
--- ./src/display.c.cow	2006-08-29 19:48:53.000000000 -0400
+++ ./src/display.c	2006-08-29 18:11:46.000000000 -0400
@@ -1998,7 +1998,7 @@
 					   PAINT_SCREEN_REGION_MASK |
 					   PAINT_SCREEN_FULL_MASK);
 
-			glXSwapBuffers (s->display->display, s->root);
+			glXSwapBuffers (s->display->display, s->output);
 		    }
 		    else if (s->damageMask & COMP_SCREEN_DAMAGE_REGION_MASK)
 		    {
@@ -2022,7 +2022,7 @@
 				    y = s->height - pBox->y2;
 
 				    (*s->copySubBuffer) (s->display->display,
-							 s->root,
+							 s->output,
 							 pBox->x1, y,
 							 pBox->x2 - pBox->x1,
 							 pBox->y2 - pBox->y1);
@@ -2071,7 +2071,7 @@
 					       &s->region,
 					       PAINT_SCREEN_FULL_MASK);
 
-			    glXSwapBuffers (s->display->display, s->root);
+			    glXSwapBuffers (s->display->display, s->output);
 			}
 		    }
 
--- ./src/screen.c.cow	2006-08-29 14:11:48.000000000 -0400
+++ ./src/screen.c	2006-08-29 18:19:32.000000000 -0400
@@ -40,6 +40,8 @@
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/Xrandr.h>
+#include <X11/extensions/Xcomposite.h>
+#include <X11/extensions/shape.h>
 #include <X11/cursorfont.h>
 
 #include <compiz.h>
@@ -878,6 +880,25 @@
 		     (unsigned char *) data, 1);
 }
 
+static void
+makeOutputWindow (CompScreen *s)
+{
+    Display       *dpy = s->display->display;
+    XserverRegion region;
+
+    s->overlay   = XCompositeGetOverlayWindow (dpy, s->root);
+    s->output    = s->overlay;
+
+    region = XFixesCreateRegion (dpy, NULL, 0);
+
+    XFixesSetWindowShapeRegion (dpy,
+				s->output,
+				ShapeInput,
+				0, 0, region);
+
+    XFixesDestroyRegion (dpy, region);
+}
+
 Bool
 addScreen (CompDisplay *display,
 	   int	       screenNum,
@@ -1045,6 +1066,8 @@
 
     s->grabWindow = None;
 
+    makeOutputWindow (s);
+
     templ.visualid = XVisualIDFromVisual (s->attrib.visual);
 
     visinfo = XGetVisualInfo (dpy, VisualIDMask, &templ, &nvisinfo);
@@ -1174,7 +1197,7 @@
 	s->copySubBuffer = (GLXCopySubBufferProc)
 	    getProcAddress (s, "glXCopySubBufferMESA");
 
-    glXMakeCurrent (dpy, s->root, s->ctx);
+    glXMakeCurrent (dpy, s->output, s->ctx);
     currentRoot = s->root;
 
     glExtensions = (const char *) glGetString (GL_EXTENSIONS);
@@ -2844,7 +2867,7 @@
 {
     if (currentRoot != s->root)
     {
-	glXMakeCurrent (s->display->display, s->root, s->ctx);
+	glXMakeCurrent (s->display->display, s->output, s->ctx);
 	currentRoot = s->root;
 
 	s->pendingCommands = TRUE;
--- ./include/compiz.h.cow	2006-08-29 19:36:02.000000000 -0400
+++ ./include/compiz.h	2006-08-29 15:46:43.000000000 -0400
@@ -1288,6 +1288,8 @@
     Region	      damage;
     unsigned long     damageMask;
     Window	      root;
+    Window	      overlay;
+    Window	      output;
     XWindowAttributes attrib;
     Window	      grabWindow;
     CompFBConfig      glxPixmapFBConfigs[MAX_DEPTH + 1];
--- ./src/event.c.cow	2006-08-29 21:37:29.000000000 -0400
+++ ./src/event.c	2006-08-29 21:39:03.000000000 -0400
@@ -1145,7 +1145,12 @@
 	s = findScreenAtDisplay (d, event->xcreatewindow.parent);
 	if (s)
 	{
-	    addWindow (s, event->xcreatewindow.window, getTopWindow (s));
+	    /* The first time some client asks for the composite
+	     * overlay window, the X server creates it, which causes
+	     * an errorneous CreateNotify event.  We catch it and
+	     * ignore it. */
+	    if (s->overlay != event->xcreatewindow.window)
+		addWindow (s, event->xcreatewindow.window, getTopWindow (s));
 	}
 	break;
     case DestroyNotify:


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- compiz.spec	25 Aug 2006 22:12:02 -0000	1.22
+++ compiz.spec	30 Aug 2006 02:31:49 -0000	1.23
@@ -10,7 +10,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.19.%{snapshot}git%{?dist}
+Release:        0.20.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,6 +41,7 @@
 Patch104: fbconfig-depth-fix.patch
 Patch105: fedora-logo.patch
 Patch106: glfinish.patch
+Patch107: cow.patch
 
 # Patches already upstream
 Patch200: resize-move-keybindings.patch
@@ -78,6 +79,7 @@
 %patch104 -p1 -b .fbconfig-depth-fix
 %patch105 -p1 -b .fedora-logo
 %patch106 -p1 -b .glfinish
+%patch107 -p1 -b .cow
 
 %patch200 -p1 -b .resize-move-keybindings
 %patch201 -p1 -b .sync-override-redirect-windows
@@ -142,6 +144,9 @@
 %{_includedir}/compiz
 
 %changelog
+* Tue Aug 29 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.20.20060817git.fc6
+- Add cow.patch to make compiz use the composite overlay window.
+
 * Fri Aug 25 2006 Soren Sandmann <sandmann at redhat.com> - 0.0.13-0.19-20060817git.fc6
 - Rebase to desktop-effects 0.6.41
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 03:43:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 29 Aug 2006 23:43:47 -0400
Subject: rpms/esc/devel esc-1.0.0-notify-icon-fixes.patch, NONE,
	1.1 esc-1.0.0-ui-enhance.patch, 1.3, 1.4 esc.spec, 1.11, 1.12
Message-ID: <200608300343.k7U3hlJG007346@cvs.devel.redhat.com>

Author: jmagne

Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7325/devel

Modified Files:
	esc.spec 
Added Files:
	esc-1.0.0-notify-icon-fixes.patch esc-1.0.0-ui-enhance.patch 
Log Message:
auto-import esc-1.0.0-8 on branch devel from esc-1.0.0-8.src.rpm

esc-1.0.0-notify-icon-fixes.patch:
 rpm/esc.spec                                       |   29 +++++++++++++++------
 src/app/xpcom/Makefile.moz                         |    2 -
 src/app/xpcom/rhCoolKey.cpp                        |    2 -
 src/app/xpcom/tray/rhLinuxTray.cpp                 |    4 ++
 src/app/xul/esc/application.ini                    |    2 -
 src/app/xul/esc/chrome/content/esc/ESC.js          |   25 ++++++++++++++++--
 src/app/xul/esc/chrome/content/esc/TRAY.js         |    1 
 src/app/xul/esc/chrome/locale/en-US/esc.properties |    1 
 src/app/xul/esc/components/escCLH.js               |    3 +-
 src/lib/notifytray/notifyareaicon.c                |    7 -----
 src/lib/notifytray/notifytray.c                    |   13 ++++++++-
 src/lib/notifytray/notifytray.h                    |    1 
 12 files changed, 69 insertions(+), 21 deletions(-)

--- NEW FILE esc-1.0.0-notify-icon-fixes.patch ---
--- ./esc/src/lib/notifytray/notifyareaicon.c.fix7	2006-08-26 21:10:45.000000000 -0700
+++ ./esc/src/lib/notifytray/notifyareaicon.c	2006-08-26 21:10:59.000000000 -0700
@@ -229,13 +229,6 @@
  
   icon->tooltips = gtk_tooltips_new ();
 
-  if(icon->tooltips)
-  {
-
-      gtk_tooltips_set_tip (icon->tooltips, icon, "Red Hat Enterprise Security Client", NULL);
-
-  }
- 
   return icon;
 }
 
--- ./esc/src/lib/notifytray/notifytray.h.fix7	2006-08-26 21:12:00.000000000 -0700
+++ ./esc/src/lib/notifytray/notifytray.h	2006-08-26 21:12:09.000000000 -0700
@@ -26,5 +26,6 @@
 extern int notify_icon_created_ok();
 extern int notify_icon_show();
 extern int notify_icon_hide();
+extern void notify_icon_set_static_tooltip(const char *message);
 extern void notify_icon_send_tooltip_msg(const char *title,const char *message,gint severity,gint timeout,const char *icon);
 #endif /* _NOTIFY_TRAY_H_ */
--- ./esc/src/lib/notifytray/notifytray.c.fix7	2006-08-26 21:11:20.000000000 -0700
+++ ./esc/src/lib/notifytray/notifytray.c	2006-08-26 21:11:28.000000000 -0700
@@ -187,7 +187,18 @@
    return 1;
 }
 
-extern void notify_icon_send_tooltip_msg(const gchar *title,const gchar *message,gint severity,gint timeout,const char* icon)
+void notify_icon_set_static_tooltip(const gchar *message)
+{
+    if(!message || !notify)
+        return;
+
+    if(notify->tooltips)
+    {
+        gtk_tooltips_set_tip (notify->tooltips, GTK_WIDGET(notify), message, NULL);
+    }
+}
+
+void notify_icon_send_tooltip_msg(const gchar *title,const gchar *message,gint severity,gint timeout,const char* icon)
 {
     if(!message || !notify)
         return;
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix7	2006-08-26 21:01:02.000000000 -0700
+++ ./esc/src/app/xpcom/rhCoolKey.cpp	2006-08-26 21:01:10.000000000 -0700
@@ -1316,7 +1316,7 @@
 {
     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyVersion \n"));
 
-    char *version = "1.0.0";
+    char *version = "1.0.0-8";
     
     char *versionVal =  (char *) nsMemory::Clone(version,sizeof(char) * strlen(version) +  1);
 
--- ./esc/src/app/xpcom/Makefile.moz.fix7	2006-08-26 21:00:24.000000000 -0700
+++ ./esc/src/app/xpcom/Makefile.moz	2006-08-26 21:00:32.000000000 -0700
@@ -177,7 +177,7 @@
 endif
 	#cp -Rf -v $(XULRUNNER_BIN_PATH) $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)
 
-	tar -xvf $(MOZ_OBJDIR)/dist/$(XULRUNNER_ZIP_NAME)  -C $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc 
+	tar -xzvf $(MOZ_OBJDIR)/dist/$(XULRUNNER_ZIP_NAME)  -C $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc 
 ifeq ($(OS_ARCH),WINNT)
 	cp -f $(XPCOM_EXTRA)  $(DEPLOY_OBJDIR)/ESC/components
 endif
--- ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix7	2006-08-26 21:02:04.000000000 -0700
+++ ./esc/src/app/xpcom/tray/rhLinuxTray.cpp	2006-08-26 21:02:15.000000000 -0700
@@ -193,6 +193,10 @@
 /* void settooltipmsg (in string aMessage); */
 NS_IMETHODIMP rhTray::Settooltipmsg(const char *aMessage)
 {
+
+    if(aMessage)
+        notify_icon_set_static_tooltip(aMessage);
+
     return NS_OK;
 }
 
--- ./esc/src/app/xul/esc/application.ini.fix7	2006-08-26 21:03:07.000000000 -0700
+++ ./esc/src/app/xul/esc/application.ini	2006-08-26 21:03:14.000000000 -0700
@@ -29,7 +29,7 @@
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.
-BuildID=0000000000
+BuildID=0000000008
 ;
 ; This ID is just an example.  Every XUL app ought to have it's own unique ID.
 ; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
--- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix7	2006-08-26 21:05:00.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js	2006-08-26 21:05:11.000000000 -0700
@@ -3761,12 +3761,33 @@
 
 function launchSETTINGS()
 {
-    var wind = window.open("chrome://esc/content/settings.xul","","chrome,resizable,centerscreen,dialog");
+
+    var adminWnd  = IsPageWindowPresent(ADMIN_WINDOW);
+
+    if(!adminWnd)
+    {
+        var wind = window.open("chrome://esc/content/settings.xul","","chrome,resizable,centerscreen,dialog");
+
+    } else
+    {
+        adminWnd.focus();
+    }
 }
 
 function launchESC()
 {
-    var wind = window.open("chrome://esc/content/esc.xul","","chrome,resizable,centerscreen,dialog");
+
+    var enrollWnd = IsPageWindowPresent(ENROLL_WINDOW);
+
+    if(!enrollWnd)
+    {
+        var wind = window.open("chrome://esc/content/esc.xul","","chrome,resizable,centerscreen,dialog");
+
+    }
+    else
+    {
+        enrollWnd.focus();
+    }
 
 }
 
--- ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js.fix7	2006-08-26 21:05:46.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js	2006-08-26 21:05:57.000000000 -0700
@@ -357,6 +357,7 @@
         try {
 
         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
+        gTray.settooltipmsg(getBundleString("escTitle"));
         gTray.showicon();
 
         } catch(e) {
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix7	2006-08-26 21:07:03.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties	2006-08-26 21:07:12.000000000 -0700
@@ -16,6 +16,7 @@
 
 #ESC strings used in Javascript
 #Strings for ESC.js 
+escTitle=Red Hat Enterprise Security Client
 enrolledKey=Enrolled Key
 noKeysPresent=No Keys Present
 blankKey=Blank Key
--- ./esc/src/app/xul/esc/components/escCLH.js.fix7	2006-08-26 21:08:29.000000000 -0700
+++ ./esc/src/app/xul/esc/components/escCLH.js	2006-08-26 21:08:39.000000000 -0700
@@ -50,7 +50,8 @@
 
            if(win)
            {
-               recordMessage("Trying to open app more than once!");
+               recordMessage("Subsequent invocation. Launch an Admin page.");
+               win.launchSETTINGS();
                return;
            }
            
--- ./esc/rpm/esc.spec.fix7	2006-08-26 20:58:52.000000000 -0700
+++ ./esc/rpm/esc.spec	2006-08-26 20:59:06.000000000 -0700
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 5%{?dist} 
+Release: 8%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -14,7 +14,7 @@
 Patch4: firefox-1.1-nss-system-nspr.patch
 Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
 Patch6: esc-1.0.0-ui-enhance.patch
-
+Patch7: esc-1.0.0-notify-icon-fixes.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -24,8 +24,9 @@
 
 BuildRequires: pcsc-lite-devel coolkey-devel
 BuildRequires: desktop-file-utils zip binutils libnotify-devel
+BuildRequires: dbus-devel
 Requires: pcsc-lite ifd-egate coolkey nss nspr
-Requires: zip libnotify
+Requires: zip dbus >= 0.90 libnotify >= 0.4.2
 
 # 390 does not have coolkey or smartCards
 # Xulrunner won't compile on ppc64 right now.
@@ -66,7 +67,7 @@
 
 %patch5 -p1 -b .fix5
 %patch6 -p1 -b .fix6
-
+%patch7 -p1 -b .fix7
 
 #Unpack xulrunner where esc expects it to be.
 
@@ -81,8 +82,6 @@
 %patch3 -p1 -b .fix3
 %patch4 -p1 -b .fix4
 
-
-
 %build
 
 %ifarch x86_64 ppc64 ia64
@@ -107,8 +106,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{pixmapdir}
 mkdir -p $RPM_BUILD_ROOT/%{docdir}
 
+
 sed -e 's;\$LIBDIR;'%{_libdir}';g'  %{SOURCE1} > $RPM_BUILD_ROOT/%{escbindir}/%{name}
 
+
 chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
 
 mkdir -p $RPM_BUILD_ROOT/%{escdir}
@@ -174,12 +175,26 @@
 fi
 
 %changelog
-* Tue Aug  17 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-4
+* Sat Aug 22 2006 Jack Magne <jmagne at redhat.com>-  1.0.0-8
+- Fixes to get libnotify working properly on FC6 systems.
+
+* Tue Aug 22 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-7
+- Fix for bug #203211, use of system NSS and NSPR for
+- Xulrunner ,addressing the problem running on 64 bit.
+- Overwriting 5 and 6 due to important bug #203211.
+
+* Fri Aug  18 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-6
+- Correct problem with Patch #6
+
+* Tue Aug  17 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-5
 - Build ESC's xulrunner component using system nss and nspr
 - Build process creates run script based on {_libdir} variable,
   accounting for differences on 64 bit machines.
 - UI enhancements
 
+* Tue Aug  1 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-4
+- Don't auto-generate requires either
+
 * Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-3
 - Don't provide mozilla libraries
 

esc-1.0.0-ui-enhance.patch:
 rpm/esc                                              |   10 
 rpm/esc.spec                                         |   20 
 src/app/xpcom/Makefile.moz                           |    2 
 src/app/xpcom/rhCoolKey.cpp                          |   60 -
 src/app/xpcom/tray/Makefile.moz                      |    8 
 src/app/xpcom/tray/rhITray.idl                       |    8 
 src/app/xpcom/tray/rhLinuxTray.cpp                   |   59 +
 src/app/xpcom/tray/rhMacTray.cpp                     |   31 
 src/app/xpcom/tray/rhTray.cpp                        |   34 +
 src/app/xul/esc/chrome/content/esc/ESC.js            |  603 +++++++++++--------
 src/app/xul/esc/chrome/content/esc/TRAY.js           |   80 ++
 src/app/xul/esc/chrome/content/esc/advancedinfo.xul  |    2 
 src/app/xul/esc/chrome/content/esc/config.xul        |   16 
 src/app/xul/esc/chrome/content/esc/esc.css           |   21 
 src/app/xul/esc/chrome/content/esc/esc.xul           |   21 
 src/app/xul/esc/chrome/content/esc/esc_browser.xul   |   51 -
 src/app/xul/esc/chrome/content/esc/hiddenWindow.html |   11 
 src/app/xul/esc/chrome/content/esc/hiddenWindow.xul  |   26 
 src/app/xul/esc/chrome/content/esc/password.js       |    4 
 src/app/xul/esc/chrome/content/esc/settings.xul      |   19 
 src/app/xul/esc/chrome/locale/en-US/esc.dtd          |    5 
 src/app/xul/esc/chrome/locale/en-US/esc.properties   |   13 
 src/app/xul/esc/components/escCLH.js                 |    2 
 src/lib/NssHttpClient/request.cpp                    |    2 
 src/lib/NssHttpClient/response.cpp                   |    2 
 src/lib/coolkey/CoolKey.cpp                          |   20 
 src/lib/coolkey/CoolKeyHandler.cpp                   |   46 -
 src/lib/coolkey/CoolKey_Message.cpp                  |    2 
 src/lib/coolkey/NSSManager.cpp                       |   11 
 src/lib/coolkey/SlotUtils.cpp                        |    2 
 src/lib/coolkey/SmartCardMonitoringThread.cpp        |    5 
 src/lib/notifytray/Makefile                          |    7 
 src/lib/notifytray/manifest.mn                       |    7 
 src/lib/notifytray/notifyareaicon.c                  |   11 
 src/lib/notifytray/notifyareaicon.h                  |    4 
 src/lib/notifytray/notifytray.c                      |   75 ++
 src/lib/notifytray/notifytray.h                      |    4 
 37 files changed, 825 insertions(+), 479 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 esc-1.0.0-ui-enhance.patch
Index: esc-1.0.0-ui-enhance.patch
===================================================================
RCS file: esc-1.0.0-ui-enhance.patch
diff -N esc-1.0.0-ui-enhance.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ esc-1.0.0-ui-enhance.patch	30 Aug 2006 03:43:44 -0000	1.4
@@ -0,0 +1,3262 @@
+--- ./esc/src/lib/coolkey/CoolKey_Message.cpp.fix6	2006-08-16 20:41:14.000000000 -0700
++++ ./esc/src/lib/coolkey/CoolKey_Message.cpp	2006-08-16 20:41:24.000000000 -0700
+@@ -22,7 +22,7 @@
+ #include "math.h"
+ #include <iostream>
+ 
+-PRLogModuleInfo *nkeyLogMS = PR_NewLogModule("netkey");
++PRLogModuleInfo *nkeyLogMS = PR_NewLogModule("coolKeyMessage");
+ 
+ void URLEncode(unsigned char *buf,char *ret, int *ret_len,int buff_len);
+ void URLDecode(char *buf,unsigned char *ret, int *ret_len,int buff_len);
+--- ./esc/src/lib/coolkey/NSSManager.cpp.fix6	2006-08-16 20:41:42.000000000 -0700
++++ ./esc/src/lib/coolkey/NSSManager.cpp	2006-08-16 20:42:13.000000000 -0700
+@@ -40,7 +40,7 @@
+ 
+ #include "SlotUtils.h"
+ 
+-static PRLogModuleInfo *coolKeyLogNSS = PR_NewLogModule("coolKey");
++static PRLogModuleInfo *coolKeyLogNSS = PR_NewLogModule("coolKeyNSS");
+ 
+ NSSManager::NSSManager()
+ {
+@@ -61,6 +61,9 @@
+ {
+   // Init NSS
+ 
++  PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("Initializing the NSS Crypto Library. \n"));
++
++
+   if(aAppDir)
+   {
+       SECStatus status =  NSS_Init(aAppDir);
+@@ -75,7 +78,7 @@
+ 
+ 	  if(status != SECSuccess)
+           {
+-                PR_LOG( coolKeyLogNSS, PR_LOG_ERROR, ("InitNSS:Simple init failed.\n"));
++                PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS:Simple init failed.\n"));
+ 		return E_FAIL;
+           }
+       }
+@@ -87,7 +90,7 @@
+ 
+    char modSpec[512];
+ 
+-   sprintf(modSpec,"library=\"%s\" name=\"%s\" parameters=\"%s\" NSS=\"slotParams=0x4=[slotFlags='PublicCerts']\"\n",COOLKEY_PKCS11_LIBRARY,COOLKEY_NAME,PROMISCUOUS_PARAMETER);
++   sprintf(modSpec,"library=\"%s\" name=\"%s\" parameters=\"%s\" NSS=\"slotParams={0x00000002=[slotFlags='PublicCerts']}\"\n",COOLKEY_PKCS11_LIBRARY,COOLKEY_NAME,PROMISCUOUS_PARAMETER);
+ 
+ 
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS: modSpec %s\n",modSpec));
+@@ -98,7 +101,7 @@
+ 
+   if(!userModule || !userModule->loaded)
+   {
+-      PR_LOG( coolKeyLogNSS, PR_LOG_ERROR, ("NSSManager::InitNSS problem loading PKCS11 module. No keys will be recognized!\n"));
++      PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("NSSManager::InitNSS problem loading PKCS11 module. No keys will be recognized!\n"));
+       return E_FAIL;
+   }
+ 
+--- ./esc/src/lib/coolkey/SlotUtils.cpp.fix6	2006-08-16 20:42:32.000000000 -0700
++++ ./esc/src/lib/coolkey/SlotUtils.cpp	2006-08-16 20:42:39.000000000 -0700
+@@ -44,7 +44,7 @@
+ static std::list<CoolKeyInfo*> gCoolKeyList;
+ PRLock *gCoolKeyListLock = NULL;
+ 
+-static PRLogModuleInfo *coolKeyLogSU = PR_NewLogModule("coolKey");
++static PRLogModuleInfo *coolKeyLogSU = PR_NewLogModule("coolKeySlot");
+ #ifdef DEBUG
+ int gCoolKeyListLockCount = 0;
+ #endif // DEBUG
+--- ./esc/src/lib/coolkey/CoolKey.cpp.fix6	2006-08-16 20:39:26.000000000 -0700
++++ ./esc/src/lib/coolkey/CoolKey.cpp	2006-08-16 20:39:58.000000000 -0700
+@@ -36,7 +36,7 @@
+ 
+ static NSSManager* g_NSSManager = NULL;
+ 
+-static PRLogModuleInfo *coolKeyLog = PR_NewLogModule("netkey");
++static PRLogModuleInfo *coolKeyLog = PR_NewLogModule("coolKeyLib");
+ 
+ static std::list<CoolKeyListener*> g_Listeners;
+ 
+@@ -55,7 +55,7 @@
+   PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyInit:\n appDir %s",aAppDir));
+   if (g_NSSManager) 
+   {
+-    PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyInit:g_NSSManager already exists. \n"));
++    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyInit:g_NSSManager already exists. \n"));
+     return E_FAIL;
+   }
+ 
+@@ -72,7 +72,7 @@
+   HRESULT rv = g_NSSManager->InitNSS(aAppDir);
+   if (rv == E_FAIL)
+   {
+-       PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyInit:Failed to Init NSSManager. \n"));
++       PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Failed to initialize Crypto library! \n"));
+        return rv;
+   }
+ 
+@@ -855,7 +855,7 @@
+ 
+      assert(cardCtxt);
+     if (!cardCtxt) {
+-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't create Card Context !.\n"));
++      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't create Card Context !.\n"));
+       result = E_FAIL;
+       goto done;
+     }
+@@ -863,7 +863,7 @@
+     conn = CKYCardConnection_Create(cardCtxt);
+     assert(conn);
+     if (!conn) {
+-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't create Card Connection!\n"));
++      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't create Card Connection!\n"));
+       result = E_FAIL;
+       goto done;
+     }
+@@ -871,14 +871,14 @@
+     readerName = GetReaderNameForKeyID(aKey);
+     assert(readerName);
+     if (!readerName) {
+-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't get reader name!\n"));
++      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't get reader name!\n"));
+       result = E_FAIL;
+       goto done;
+     }
+ 
+     status = CKYCardConnection_Connect(conn, readerName);
+     if (status != CKYSUCCESS) {
+-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't connect to Card!\n"));
++      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't connect to Card!\n"));
+ 
+       result = E_FAIL;
+       goto done;
+@@ -889,7 +889,7 @@
+     status = CKYApplet_SelectCoolKeyManager(conn, &apduRC);
+     if (status != CKYSUCCESS) {
+ 
+-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Can't select CoolKey manager!\n"));
++      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't select CoolKey manager!\n"));
+       goto done;
+     }
+ 
+@@ -898,7 +898,7 @@
+ 
+     if(status != CKYSUCCESS)
+     {
+-        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Error actually getting IssuerInfo!\n"));
++        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Error actually getting IssuerInfo!\n"));
+         result = E_FAIL;
+         goto done;
+     }
+@@ -914,7 +914,7 @@
+ 
+     if(infoSize >= (CKYSize ) aBufLen)
+     {
+-        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyGetIssuerInfo:: Insufficient space to put Issuer Info!\n"));
++        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Insufficient space to put Issuer Info!\n"));
+ 
+         result = E_FAIL;
+         goto done;
+--- ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp.fix6	2006-08-16 20:43:11.000000000 -0700
++++ ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp	2006-08-16 20:43:25.000000000 -0700
+@@ -29,7 +29,7 @@
+ 
+ #include <assert.h>
+ 
+-static PRLogModuleInfo *coolKeyLogSC = PR_NewLogModule("coolKey");
++static PRLogModuleInfo *coolKeyLogSC = PR_NewLogModule("coolKeySmart");
+ 
+ SmartCardMonitoringThread::SmartCardMonitoringThread(SECMODModule *aModule)
+   : mModule(aModule), mThread(NULL)
+@@ -127,8 +127,7 @@
+ 
+ 
+     PR_LOG( coolKeyLogSC, PR_LOG_ALWAYS, 
+-           ("SmartCardMonitoringThread::Execute Token Event fired :"
+-            " slot %p \n", slot));
++           ("SmartCard thread event detected. \n"));
+ 
+     if (slot == NULL) {
+ 
+--- ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix6	2006-08-16 20:40:24.000000000 -0700
++++ ./esc/src/lib/coolkey/CoolKeyHandler.cpp	2006-08-16 20:40:35.000000000 -0700
+@@ -55,7 +55,7 @@
+ #define CKA_MOZILLA_ATR        (CKO_NETSCAPE+25)
+ #endif
+ 
+-static PRLogModuleInfo *coolKeyLogHN = PR_NewLogModule("netkey");
++static PRLogModuleInfo *coolKeyLogHN = PR_NewLogModule("coolKeyHandler");
+ 
+ void NotifyEndResult(CoolKeyHandler* context, int operation, int result, int description);
+ 
[...2869 lines suppressed...]
++
++    }
++
++}
++
++
+ //String bundling related functions
+ 
+ function loadStringBundle()
+--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd.fix6	2006-08-16 20:37:00.000000000 -0700
++++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd	2006-08-16 20:37:41.000000000 -0700
+@@ -54,7 +54,7 @@
+ <!ENTITY updateValues "Update Values">
+ <!ENTITY doTest "Test URL">
+ <!ENTITY escTitle "Red Hat Enterprise Security Client">
+-<!ENTITY pleaseEnroll "Enrolling Your Key">
++<!ENTITY pleaseEnroll "Security Key Enrollment">
+ <!ENTITY unenrolledDetected "Unenrolled Key Detected">
+ <!ENTITY noKeyDetected "No Key Detected">
+ <!ENTITY enrollMessage "To begin this enrollment process, you will need to choose a password to protect the key. You will need to enter this password each time you use your new key.  You will also need to enter the security information below needed by ESC to complete your enrollment.">
+@@ -74,6 +74,7 @@
+ <!ENTITY cancel "Cancel">
+ <!ENTITY closeEnrollLater "Close, I'll Enroll Later">
+ <!ENTITY closeAdminLater "Close">
++<!ENTITY closeNow "Close">
+ <!ENTITY enrollKeyNow "Enroll My Key Now">
+ <!ENTITY enrollKey "Enroll Key">
+ <!ENTITY administerKeys "Manage Keys">
+@@ -88,4 +89,4 @@
+ <!ENTITY getESCPassword "ESC Password Information">
+ <!ENTITY escOK "OK">
+ <!ENTITY escCancel "Cancel">
+-<!ENTITY tpsConfigDesc "ESC can not determine the location of the TPS configuration for this key. Please enter the correct value.">
++<!ENTITY tpsConfigDesc "ESC has detected a totally blank key for which it knows nothing about.  ESC can not determine the location of the TPS information for this key. Please enter the correct value so ESC can contact the TPS. The correct value is of the form: http(s)://test.host.com:7888/home.cgi.">
+--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix6	2006-08-16 20:37:50.000000000 -0700
++++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties	2006-08-16 20:37:56.000000000 -0700
+@@ -34,10 +34,15 @@
+ tpsURI=TPS Server URL
+ tpsUI=TPS External UI URL
+ status=Status
++issuer=Issuer
++escLogEntries=ESC Log Entries
++noLogFileOrData=No Log File or Log File Has No Data.
+ certsOnToken=CERTIFICATES on KEY 
+ certificateNickname=Certificate Nickname:
+ coolkeyComponentVersion=ESC Version
+ coolkeyDetectedNumberKeys=Number of Security Keys Detected
++enrolledDetected=Enrolled Key Detected
++enrolledDetectedMessage=ESC has detected an enrolled key. If you would rather not re-enroll this key press "Close".  
+ formatingToken=Formatting Key 
+ enrollingToken=Enrolling Key 
+ resettingTokenPIN=Resetting Key Pin 
+@@ -45,6 +50,8 @@
+ blinkingToken=Blinking 
+ keyInserted=Key Inserted!
+ keyRemoved=Key Removed!
++keyInsertedComputer=Security Key Inserted into the computer.
++keyRemovedComputer=Security Key Removed from the computer.
+ #ESC Error Messages from TPS
+ errorNone=Operation Completed Successfully.
+ serverError=Server Error.
+@@ -63,7 +70,7 @@
+ errorCommTokenDB=Cannot communicate with token database, try again later.
+ errorTokenDisabled=Token is disabled, contact techincal support.
+ errorPinReset=Cannot reset pin value for the token, contact technical support.
+-errorConnLost=Connection to server lost.
++errorConnLost=Connection to server lost. If problem persists, contact technical support. 
+ errorEntryTokenDB=Can not create entry for token in database, contact technical support.
+ errorNoTokenState=No such token state, contact technical support.
+ errorInvalidLostTokenReason=Invalid lost token reason, contact technical support.
+@@ -92,6 +99,7 @@
+ errorConfigValue=Error Getting Config Value:
+ errorSetConfigValue=Error SettingConfig Value: 
+ errorBlankTPSURI=Blank Tps Uri submitted.
++noTpsConfigUrl=You must provide a Url to test!
+ aboutToTestTPSURI=About to test TPS URI:
+ errorSelectKey=Please select a key.
+ tpsURLContacted=TPS URL has been successfully contacted.
+@@ -102,7 +110,7 @@
+ errorContactEnrollURL=Error contacting ESC Enroll URL, reconfigure and try again.
+ tpsConfigSuccess=TPS config information successfully obtained!
+ tpsConfigError=Error obtaining TPS config information!
+-tpsConfigTest=About to test the TSP config url :
++tpsConfigTest=About to test the TSP Phone Home Url :
+ tpsNoConfigUrl=Provide a valid TPS config URL!
+ tpsURIMustHaveValue=TPS URI item must have a value!
+ errorSetConfigValue=Error setting config value!:
+@@ -144,6 +152,7 @@
+ errorFindESCPlatform=Unable to determine ESC platform.
+ errorIssuerInfo=Error obtaining Issuer Info for key.
+ #Strings for TRAY.js
++errorTrayComponent=ESC can not be operated with its Icon in the notification area. \n Please insert a Security Key to bring ESC to life.
+ errorTrayIsInitialized=Can't get if Tray is already intialized!
+ errorShowAllWindows=Error Showing All Windows:
+ errorHideAllWindows=Error Hiding all Windows:
+--- ./esc/src/app/xul/esc/components/escCLH.js.fix6	2006-08-16 20:38:29.000000000 -0700
++++ ./esc/src/app/xul/esc/components/escCLH.js	2006-08-16 20:38:53.000000000 -0700
+@@ -54,7 +54,7 @@
+                return;
+            }
+            
+-           var chromeURI = "chrome://esc/content/hiddenWindow.html";
++           var chromeURI = "chrome://esc/content/hiddenWindow.xul";
+ 
+            recordMessage(chromeURI);
+ 
+--- ./esc/rpm/esc.fix6	2006-08-16 20:14:22.000000000 -0700
++++ ./esc/rpm/esc	2006-08-16 20:19:32.000000000 -0700
+@@ -1,5 +1,11 @@
+ #!/bin/sh
+-export NSPR_LOG_MODULES=tray:2,coolkey:2,netkey:2,coolKey:2
++export NSPR_LOG_MODULES=tray:2,coolKeyLib:2,coolKey:2,coolKeyNSS:2,coolKeySmart:2,coolKeyHandler:2
++
++if [ ! -d ~/.redhat/esc ]
++then
++mkdir -p ~/.redhat/esc
++fi
++
+ export NSPR_LOG_FILE=~/.redhat/esc/esc.log
+-cd /usr/lib/esc-1.0.0
++cd  $LIBDIR/esc-1.0.0
+ ./esc
+--- ./esc/rpm/esc.spec.fix6	2006-08-16 20:12:33.000000000 -0700
++++ ./esc/rpm/esc.spec	2006-08-16 20:19:38.000000000 -0700
+@@ -1,6 +1,6 @@
+ Name: esc 
+ Version: 1.0.0
+-Release: 4%{?dist} 
++Release: 5%{?dist} 
+ Summary: Enterprise Security Client Smart Card Client
+ License: GPL
+ URL: http://directory.fedora.redhat.com/wiki/CoolKey 
+@@ -13,6 +13,7 @@
+ Patch3: firefox-1.5-with-system-nss.patch
+ Patch4: firefox-1.1-nss-system-nspr.patch
+ Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
++Patch6: esc-1.0.0-ui-enhance.patch
+ 
+ 
+ BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
+@@ -22,16 +23,16 @@
+ BuildRequires: autoconf213 libX11-devel libXt-devel
+ 
+ BuildRequires: pcsc-lite-devel coolkey-devel
+-BuildRequires: desktop-file-utils zip binutils
++BuildRequires: desktop-file-utils zip binutils libnotify-devel
+ Requires: pcsc-lite ifd-egate coolkey nss nspr
+-Requires: zip
++Requires: zip libnotify
+ 
+ # 390 does not have coolkey or smartCards
+ # Xulrunner won't compile on ppc64 right now.
+ ExcludeArch: s390 s390x ppc64
+ 
+ # We can't allow the internal xulrunner to leak out
+-AutoProv: 0
++AutoReqProv: 0
+ 
+ #%define __prelink_undo_cmd %{nil}
+ %define escname %{name}-%{version}
+@@ -64,6 +65,7 @@
+ #patch esc to use system nss and nspr.
+ 
+ %patch5 -p1 -b .fix5
++%patch6 -p1 -b .fix6
+ 
+ 
+ #Unpack xulrunner where esc expects it to be.
+@@ -92,7 +94,7 @@
+ 
+ cd ../..
+ 
+-make BUILD_OPT=1 
++make BUILD_OPT=1 HAVE_LIB_NOTIFY=1
+ 
+ %install
+ 
+@@ -105,7 +107,8 @@
+ mkdir -p $RPM_BUILD_ROOT/%{pixmapdir}
+ mkdir -p $RPM_BUILD_ROOT/%{docdir}
+ 
+-cp %{SOURCE1} $RPM_BUILD_ROOT/%{escbindir}
++sed -e 's;\$LIBDIR;'%{_libdir}';g'  %{SOURCE1} > $RPM_BUILD_ROOT/%{escbindir}/%{name}
++
+ chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
+ 
+ mkdir -p $RPM_BUILD_ROOT/%{escdir}
+@@ -171,8 +174,11 @@
+ fi
+ 
+ %changelog
+-* Tue Aug  1 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-4
++* Tue Aug  17 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-4
+ - Build ESC's xulrunner component using system nss and nspr
++- Build process creates run script based on {_libdir} variable,
++  accounting for differences on 64 bit machines.
++- UI enhancements
+ 
+ * Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-3
+ - Don't provide mozilla libraries


Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- esc.spec	23 Aug 2006 15:59:42 -0000	1.11
+++ esc.spec	30 Aug 2006 03:43:44 -0000	1.12
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 7%{?dist} 
+Release: 8%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -13,6 +13,8 @@
 Patch3: firefox-1.5-with-system-nss.patch
 Patch4: firefox-1.1-nss-system-nspr.patch
 Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
+Patch6: esc-1.0.0-ui-enhance.patch
+Patch7: esc-1.0.0-notify-icon-fixes.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -21,9 +23,10 @@
 BuildRequires: autoconf213 libX11-devel libXt-devel
 
 BuildRequires: pcsc-lite-devel coolkey-devel
-BuildRequires: desktop-file-utils zip binutils
+BuildRequires: desktop-file-utils zip binutils libnotify-devel
+BuildRequires: dbus-devel
 Requires: pcsc-lite ifd-egate coolkey nss nspr
-Requires: zip
+Requires: zip dbus >= 0.90 libnotify >= 0.4.2
 
 # 390 does not have coolkey or smartCards
 # Xulrunner won't compile on ppc64 right now.
@@ -63,6 +66,8 @@
 #patch esc to use system nss and nspr.
 
 %patch5 -p1 -b .fix5
+%patch6 -p1 -b .fix6
+%patch7 -p1 -b .fix7
 
 #Unpack xulrunner where esc expects it to be.
 
@@ -88,7 +93,7 @@
 
 cd ../..
 
-make BUILD_OPT=1 
+make BUILD_OPT=1 HAVE_LIB_NOTIFY=1
 
 %install
 
@@ -170,6 +175,9 @@
 fi
 
 %changelog
+* Sat Aug 27 2006 Jack Magne <jmagne at redhat.com>-  1.0.0-8
+- Fixes to get libnotify working properly on FC6 systems.
+
 * Tue Aug 22 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-7
 - Fix for bug #203211, use of system NSS and NSPR for
 - Xulrunner ,addressing the problem running on 64 bit.



From fedora-cvs-commits at redhat.com  Wed Aug 30 06:11:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 02:11:50 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.162,
	1.163 xorg-x11-server-1.1.0-gl-include-inferiors.patch, 1.2, NONE
Message-ID: <200608300611.k7U6BoEt020117@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20105

Modified Files:
	xorg-x11-server.spec 
Removed Files:
	xorg-x11-server-1.1.0-gl-include-inferiors.patch 
Log Message:
* Wed Aug 30 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-32.fc6
- Drop xorg-x11-server-1.1.0-gl-include-inferiors.patch now that
  compiz can uses the composite overlay window.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- xorg-x11-server.spec	28 Aug 2006 23:57:08 -0000	1.162
+++ xorg-x11-server.spec	30 Aug 2006 06:11:38 -0000	1.163
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   31%{?dist}
+Release:   32%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -30,7 +30,6 @@
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
 Patch101:  xorg-x11-server-1.1.0-dont-backfill-bg-none.patch
-Patch102:  xorg-x11-server-1.1.0-gl-include-inferiors.patch
 Patch103:  xorg-x11-server-1.1.0-tfp-damage.patch
 Patch104:  xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
 Patch105:  xorg-x11-server-1.1.1-enable-composite.patch
@@ -170,6 +169,9 @@
 Conflicts: xorg-x11-drv-ati < 6.6.1
 Conflicts: xorg-x11-drv-i810 < 1.6.0
 
+# Match up work-arounds between compiz and the xserver
+Conflicts: compiz < 0.0.13-0.20.20060817git.fc6
+
 %description
 X.Org X11 X server
 
@@ -341,7 +343,6 @@
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
-%patch102 -p0 -b .gl-include-inferiors
 %patch103 -p0 -b .tfp-damage
 %patch104 -p0 -b .mesa-copy-sub-buffer
 %patch105 -p0 -b .enable-composite
@@ -707,6 +708,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Aug 30 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-32.fc6
+- Drop xorg-x11-server-1.1.0-gl-include-inferiors.patch now that
+  compiz can uses the composite overlay window.
+
 * Mon Aug 28 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-31.fc6
 - Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to log transitions.
 - Update xorg-x11-server-1.1.0-tfp-damage.patch to always bind to


--- xorg-x11-server-1.1.0-gl-include-inferiors.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 06:42:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 02:42:22 -0400
Subject: rpms/vixie-cron/devel vixie-cron-4.1-_52-bz181439p2.patch, NONE,
	1.1 vixie-cron.spec, 1.75, 1.76
Message-ID: <200608300642.k7U6gMVR003189@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3174

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_52-bz181439p2.patch 
Log Message:
Add patch for fix selinux bug #181439.


vixie-cron-4.1-_52-bz181439p2.patch:
 Makefile   |    2 +-
 security.c |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE vixie-cron-4.1-_52-bz181439p2.patch ---
--- vixie-cron-4.1/Makefile.bz181439p2	2006-08-30 08:31:44.000000000 +0200
+++ vixie-cron-4.1/Makefile	2006-08-30 08:32:15.000000000 +0200
@@ -76,7 +76,7 @@
 #<<optimize or debug?>>
 #CDEBUG		=	-O
 #CDEBUG		=	-g
-CDEBUG		=       $(RPM_OPT_FLAGS)
+#CDEBUG		=       $(RPM_OPT_FLAGS)
 #<<lint flags of choice?>>
 LINTFLAGS	=	-hbxa $(INCLUDE) $(DEBUGGING)
 #<<want to use a nonstandard CC?>>
--- vixie-cron-4.1/security.c.bz181439p2	2006-08-30 08:31:44.000000000 +0200
+++ vixie-cron-4.1/security.c	2006-08-30 08:31:44.000000000 +0200
@@ -78,17 +78,15 @@
 	return -1;
     }	
 
+#if WITH_SELINUX
     if ( cron_change_selinux_context( u, scontext, file_context ) != 0 )
     {
         syslog(LOG_INFO,"CRON (%s) ERROR: failed to change SELinux context", 
 	       e->pwd->pw_name);
-#if WITH_SELINUX
 	if ( file_context )
 		freecon(file_context);
-#endif
 	return -1;
     }
-#if WITH_SELINUX
     if ( file_context )
 	freecon(file_context);
 #endif


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- vixie-cron.spec	28 Aug 2006 09:20:28 -0000	1.75
+++ vixie-cron.spec	30 Aug 2006 06:42:19 -0000	1.76
@@ -2,7 +2,7 @@
 %define WITH_SELINUX 1
 %endif
 %if %{?WITH_PAM:0}%{!?WITH_PAM:1}
-%define WITH_PAM 0
+%define WITH_PAM 1
 %endif
 %if %{?WITH_AUDIT:0}%{!?WITH_AUDIT:1}
 %define WITH_AUDIT 1
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: 	 vixie-cron
 Version: 4.1
-Release: 61%{?dist}
+Release: 62%{?dist}
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -75,6 +75,7 @@
 Patch55: vixie-cron-4.1-man-page-typo.patch
 Patch56: vixie-cron-4.1-_55-bz203746.patch
 Patch57: vixie-cron-4.1-_44-delayed_database.patch 
+Patch58: vixie-cron-4.1-_52-bz181439p2.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
@@ -169,6 +170,7 @@
 %patch55 -p1 -b .man-page-typo
 %patch56 -p1 -b .bz203746
 %patch57 -p1 -b .delayed_database
+%patch58 -p1 -b .bz181439p2
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" \
@@ -241,6 +243,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Wed Aug 30 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-62
+- fix problem with selinux (#181439)
+
 * Mon Aug 28 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-61
 - changes in spec file (#204230)
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 07:06:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 03:06:27 -0400
Subject: rpms/mesa/devel mesa.spec, 1.95, 1.96 mesa-6.4-multilib-fix.patch,
	1.2, NONE mesa-6.5-force-r300.patch, 1.3, NONE
Message-ID: <200608300706.k7U76Q0F018821@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18801

Modified Files:
	mesa.spec 
Removed Files:
	mesa-6.4-multilib-fix.patch mesa-6.5-force-r300.patch 
Log Message:
* Tue Aug 29 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc2.fc6
- Rebase to 6.5.1 RC2.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- mesa.spec	30 Aug 2006 02:31:26 -0000	1.95
+++ mesa.spec	30 Aug 2006 07:06:22 -0000	1.96
@@ -50,13 +50,11 @@
 Patch0: mesa-6.5.1-build-config.patch
 Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
 
-Patch11: mesa-6.4-multilib-fix.patch
 Patch12: mesa-modular-dri-dir.patch
 Patch14: mesa-6.5-drop-static-inline.patch
 Patch18: mesa-6.5.1-selinux-awareness.patch
 
 Patch20: mesa-6.5.1-r300-smooth-line.patch
-Patch21: mesa-6.5-force-r300.patch
 
 # General patches from upstream go here:
 
@@ -298,12 +296,10 @@
 %patch0 -p1 -b .build-config
 %patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
 
-%patch11 -p0 -b .multilib-fix
 %patch14 -p0 -b .drop-static-inline
 %patch18 -p1 -b .selinux-awareness
 
 %patch20 -p1 -b .r300-smooth-lines
-%patch21 -p0 -b .force-r300
 
 %patch201 -p1 -b .radeon-use-right-format
 
@@ -314,8 +310,6 @@
 #-- Build ------------------------------------------------------------
 %build
 export OPT_FLAGS="$RPM_OPT_FLAGS"
-export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
-export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
 export DRI_DRIVER_DIR="%{_libdir}/dri"
 
 # NOTE: We use a custom script to determine which Mesa build target should
@@ -324,28 +318,27 @@
 #DRIVER_DIRS="dri osmesa"
 
 mkdir preserve
-export LIB_DIR=$( basename %{_libdir} ) 
 
 echo "Building osmesa"
 make linux-osmesa
-mv ${LIB_DIR}/* preserve
+mv %{_lib}/* preserve
 make -s realclean
 
 echo "Building osmesa16"
 make linux-osmesa16
-mv ${LIB_DIR}/* preserve
+mv %{_lib}/* preserve
 make -s realclean
 
 echo "Building osmesa32"
 make linux-osmesa32
-mv ${LIB_DIR}/* preserve
+mv %{_lib}/* preserve
 make -s realclean
 
 echo "Building $MESATARGET"
 make ${MESATARGET}
 make -C progs/xdemos glxgears glxinfo
-mv preserve/* ${LIB_DIR}
-cd ${LIB_DIR}
+mv preserve/* %{_lib}
+cd %{_lib}
 ln -s libOSMesa.so.6 libOSMesa.so 
 ln -s libOSMesa16.so.6 libOSMesa16.so
 ln -s libOSMesa32.so.6 libOSMesa32.so
@@ -354,25 +347,19 @@
 #-- Install ----------------------------------------------------------
 %install
 rm -rf $RPM_BUILD_ROOT
-# NOTE: "make install" calls mesa's installmesa script, passing DESTDIR
-# to it as a commandline arg, but LIB_DIR and INCLUDE_DIR get hard coded in
-# that script, meaning multilib breaks.
-#make install DESTDIR=$RPM_BUILD_ROOT/usr
-
-# NOTE: Since Mesa's install procedure doesn't work on multilib properly,
-# we fix it here, as I have patched the installmesa script to remove the
-# hard coding, and we set the variables ourself right here, and it should
-# hopefully pick them up.  -- mharris at redhat.com
-export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
-export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
-bin/installmesa $RPM_BUILD_ROOT/usr
-
-# Install glxgears/glxinfo
-{
-    mkdir -p $RPM_BUILD_ROOT%{_bindir}
-    install -m0755 progs/xdemos/glxgears $RPM_BUILD_ROOT%{_bindir}/
-    install -m0755 progs/xdemos/glxinfo $RPM_BUILD_ROOT%{_bindir}/
-}
+
+# The mesa build system is broken beyond repair.  The lines below just
+# handpick and install the parts we want.
+
+export INSTALL_DIR=%{_prefix}
+export LIB_DIR=%{_lib}
+
+make -C src/glw install
+make -C src/glu install
+make -C src/mesa install
+cp -d -f %{_lib}/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
+install -m 0755 progs/xdemos/glxgears $RPM_BUILD_ROOT%{_bindir}
+install -m 0755 progs/xdemos/glxinfo $RPM_BUILD_ROOT%{_bindir}
 
 %if %{with_dri}
 #pushd src/mesa/drivers/dri


--- mesa-6.4-multilib-fix.patch DELETED ---


--- mesa-6.5-force-r300.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 07:07:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 03:07:57 -0400
Subject: rpms/firefox/devel firefox.sh.in, 1.12, 1.13 firefox.spec, 1.147,
	1.148
Message-ID: <200608300707.k7U77vu8018913@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18898

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-9
- Build with -rpath (#161958)



Index: firefox.sh.in
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- firefox.sh.in	29 Aug 2006 02:38:26 -0000	1.12
+++ firefox.sh.in	30 Aug 2006 07:07:54 -0000	1.13
@@ -53,20 +53,9 @@
 
 export MOZILLA_FIVE_HOME
 
-##
-## Set LD_LIBRARY_PATH
-##
-if [ "$LD_LIBRARY_PATH" ]
-then
-  LD_LIBRARY_PATH=$MOZ_DIST_BIN:$MOZ_DIST_BIN/plugins:$LD_LIBRARY_PATH
-else
-  LD_LIBRARY_PATH=$MOZ_DIST_BIN:$MOZ_DIST_BIN/plugins
-fi
-
-export LD_LIBRARY_PATH
 
 ##
-## Make sure that we set the plugin path for backwards compatibility
+## Make sure that we set the plugin path
 ##
 if [ "$MOZ_PLUGIN_PATH" ]
 then


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- firefox.spec	29 Aug 2006 02:38:27 -0000	1.147
+++ firefox.spec	30 Aug 2006 07:07:54 -0000	1.148
@@ -166,7 +166,7 @@
 %define moz_make_flags %{?_smp_mflags}
 %endif
 
-MAKE="gmake %{moz_make_flags}" make -f client.mk build
+LDFLAGS="-Wl,-rpath,%{ffdir}" MAKE="gmake %{moz_make_flags}" make -f client.mk build
 
 #---------------------------------------------------------------------
 
@@ -356,7 +356,10 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Mon Aug 28 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.5.0.6-9
+* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-9
+- Build with -rpath (#161958)
+
+* Mon Aug 28 2006 Behdad Esfahbod <besfahbo at redhat.com> 
 - Remove "Pango breaks MathML" from firefox.sh.in
 
 * Mon Aug 28 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-8



From fedora-cvs-commits at redhat.com  Wed Aug 30 08:18:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 04:18:25 -0400
Subject: rpms/vixie-cron/devel vixie-cron-4.1-_52-bz181439_2.patch, NONE,
	1.1 vixie-cron.spec, 1.76,
	1.77 vixie-cron-4.1-_52-bz181439p2.patch, 1.1, NONE
Message-ID: <200608300818.k7U8IPfi027536@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19838

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_52-bz181439_2.patch 
Removed Files:
	vixie-cron-4.1-_52-bz181439p2.patch 
Log Message:
Removed changes from makefile to correct form.


vixie-cron-4.1-_52-bz181439_2.patch:
 security.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE vixie-cron-4.1-_52-bz181439_2.patch ---
--- vixie-cron-4.1/security.c.bz181439p2	2006-08-30 08:31:44.000000000 +0200
+++ vixie-cron-4.1/security.c	2006-08-30 08:31:44.000000000 +0200
@@ -78,17 +78,15 @@
 	return -1;
     }	
 
+#if WITH_SELINUX
     if ( cron_change_selinux_context( u, scontext, file_context ) != 0 )
     {
         syslog(LOG_INFO,"CRON (%s) ERROR: failed to change SELinux context", 
 	       e->pwd->pw_name);
-#if WITH_SELINUX
 	if ( file_context )
 		freecon(file_context);
-#endif
 	return -1;
     }
-#if WITH_SELINUX
     if ( file_context )
 	freecon(file_context);
 #endif


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- vixie-cron.spec	30 Aug 2006 06:42:19 -0000	1.76
+++ vixie-cron.spec	30 Aug 2006 08:18:20 -0000	1.77
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: 	 vixie-cron
 Version: 4.1
-Release: 62%{?dist}
+Release: 63%{?dist}
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -75,7 +75,7 @@
 Patch55: vixie-cron-4.1-man-page-typo.patch
 Patch56: vixie-cron-4.1-_55-bz203746.patch
 Patch57: vixie-cron-4.1-_44-delayed_database.patch 
-Patch58: vixie-cron-4.1-_52-bz181439p2.patch
+Patch58: vixie-cron-4.1-_52-bz181439_2.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
@@ -170,10 +170,10 @@
 %patch55 -p1 -b .man-page-typo
 %patch56 -p1 -b .bz203746
 %patch57 -p1 -b .delayed_database
-%patch58 -p1 -b .bz181439p2
+%patch58 -p1 -b .bz181439_2
 
 %build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" \
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint" \
 %if %{WITH_SELINUX}
 WITH_SELINUX=1 \
 %endif
@@ -243,7 +243,7 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
-* Wed Aug 30 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-62
+* Wed Aug 30 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-63
 - fix problem with selinux (#181439)
 
 * Mon Aug 28 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-61


--- vixie-cron-4.1-_52-bz181439p2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 09:26:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 05:26:42 -0400
Subject: rpms/net-snmp/devel net-snmp-5.3.1-byteorder.patch, NONE,
	1.1 net-snmp.spec, 1.85, 1.86
Message-ID: <200608300926.k7U9QfIg031449@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/net-snmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31435

Modified Files:
	net-snmp.spec 
Added Files:
	net-snmp-5.3.1-byteorder.patch 
Log Message:
- fix IPv4/IPv6 address presentation (#200255)

net-snmp-5.3.1-byteorder.patch:
 agent/mibgroup/tcp-mib/data_access/tcpConn_linux.c      |   16 ++++++--
 agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c |   26 +++++++++++--
 include/net-snmp/library/tools.h                        |    1 
 snmplib/tools.c                                         |   32 ++++++++++++++++
 4 files changed, 68 insertions(+), 7 deletions(-)

--- NEW FILE net-snmp-5.3.1-byteorder.patch ---
--- net-snmp-5.3.1/snmplib/tools.c.orig-mildew	2006-07-14 02:22:24.000000000 +0200
+++ net-snmp-5.3.1/snmplib/tools.c	2006-07-14 02:35:08.000000000 +0200
@@ -1042,3 +1042,35 @@
 #endif
 }
 
+int str_ntoh(char *ptr, size_t len, int type) {
+  char tmp[8];
+  
+  switch (type) {
+  case AF_INET:
+  if (8 == len) {
+    tmp[0] = ptr[6];
+    tmp[1] = ptr[7];
+    tmp[2] = ptr[4];
+    tmp[3] = ptr[5];
+    tmp[4] = ptr[2];
+    tmp[5] = ptr[3];
+    tmp[6] = ptr[0];
+    tmp[7] = ptr[1];
+    memcpy (ptr, &tmp, 8);
+  } else
+   return -1;
+  break;
+  case AF_INET6:
+  if (32 == len) {
+    str_ntoh(ptr   , 8, AF_INET);
+    str_ntoh(ptr+8 , 8, AF_INET);
+    str_ntoh(ptr+16, 8, AF_INET);
+    str_ntoh(ptr+24, 8, AF_INET);
+  } else
+    return -1;
+  break;
+    default:
+    return -1; 
+  }
+  return 0;
+}
--- net-snmp-5.3.1/agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c.orig-mildew	2006-07-13 18:37:43.000000000 +0200
+++ net-snmp-5.3.1/agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c	2006-07-14 02:57:06.000000000 +0200
@@ -138,7 +138,17 @@
      * offset to see if it worked.
      */
     u_ptr = ep->loc_addr;
-    u_ptr_len = sizeof(ep->loc_addr);
+    u_ptr_len = strlen(ptr);
+
+    if (8 == u_ptr_len)
+      str_ntoh (ptr, 8, AF_INET);
+    else if (32 == u_ptr_len)
+      str_ntoh (ptr, 32, AF_INET6);
+    else {
+      DEBUGMSGTL(("access:udp_endpoint", "invalid local_addr lenght %d\n", u_ptr_len));
+      return PMLP_RC_MEMORY_UNUSED;
+    }
+    
     offset = 0;
     netsnmp_hex_to_binary(&u_ptr, &u_ptr_len, &offset, 0, ptr, NULL);
     if ((4 != offset) && (16 != offset)) {
@@ -161,8 +171,18 @@
      * function doesn't like the ':' between address and port. check the
      * offset to see if it worked.
      */
-    u_ptr = ep->rmt_addr;
-    u_ptr_len = sizeof(ep->rmt_addr);
+    u_ptr = ep->rmt_addr; 
+    u_ptr_len = strlen(ptr);
+  
+    if (8 == u_ptr_len)
+      str_ntoh (ptr, 8, AF_INET);
+    else if (32 == u_ptr_len)
+      str_ntoh (ptr, 32, AF_INET6);
+    else {
+      DEBUGMSGTL(("access:udp_endpoint", "invalid remote_addr lenght %d\n", u_ptr_len));
+      return PMLP_RC_MEMORY_UNUSED;
+    }
+
     offset = 0;
     netsnmp_hex_to_binary(&u_ptr, &u_ptr_len, &offset, 0, ptr, NULL);
     if ((4 != offset) && (16 != offset)) {
--- net-snmp-5.3.1/agent/mibgroup/tcp-mib/data_access/tcpConn_linux.c.orig-mildew	2006-07-13 17:24:20.000000000 +0200
+++ net-snmp-5.3.1/agent/mibgroup/tcp-mib/data_access/tcpConn_linux.c	2006-07-14 03:44:24.000000000 +0200
@@ -168,11 +168,12 @@
             break;
         }
 
-        entry->loc_port = htons((unsigned short) local_port);
-        entry->rmt_port = htons((unsigned short) remote_port);
+        entry->loc_port = (unsigned short) local_port;
+        entry->rmt_port = (unsigned short) remote_port;
         entry->tcpConnState = state;
         buf_len = strlen(local_addr);
         netsnmp_assert(8 == buf_len);
+        str_ntoh (local_addr, 8, AF_INET);                   
         offset = 0;
         tmp_ptr = entry->loc_addr;
         rc = netsnmp_hex_to_binary(&tmp_ptr, &buf_len,
@@ -189,6 +190,7 @@
 
         buf_len = strlen(remote_addr);
         netsnmp_assert(8 == buf_len);
+        str_ntoh (remote_addr, 8, AF_INET);        
         offset = 0;
         tmp_ptr = entry->rmt_addr;
         rc = netsnmp_hex_to_binary(&tmp_ptr, &buf_len,
@@ -290,11 +292,14 @@
             break;
         }
 
-        entry->loc_port = htons((unsigned short) local_port);
-        entry->rmt_port = htons((unsigned short) remote_port);
+        entry->loc_port = (unsigned short) local_port;
+        entry->rmt_port = (unsigned short) remote_port;
         entry->tcpConnState = state;
 
         buf_len = strlen(local_addr);
+
+        str_ntoh (&local_addr, 32, AF_INET6);
+        
         offset = 0;
         tmp_ptr = entry->loc_addr;
         rc = netsnmp_hex_to_binary(&tmp_ptr, &buf_len,
@@ -311,6 +316,9 @@
 
         buf_len = strlen(remote_addr);
         offset = 0;
+        
+        str_ntoh (&remote_addr, 32, AF_INET6);
+        
         tmp_ptr = entry->rmt_addr;
         rc = netsnmp_hex_to_binary(&tmp_ptr, &buf_len,
                                    &offset, 0, remote_addr, NULL);
--- net-snmp-5.3.1/include/net-snmp/library/tools.h.orig-mildew	2006-07-14 02:36:59.000000000 +0200
+++ net-snmp-5.3.1/include/net-snmp/library/tools.h	2006-07-14 02:37:43.000000000 +0200
@@ -198,6 +198,7 @@
     int             marker_tticks(marker_t pm);
     int             timeval_tticks(struct timeval *tv);
     char            *netsnmp_getenv(const char *name);
+    int 	    str_ntoh(char *ptr, size_t len, int type);
     
 #ifdef __cplusplus
 }


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- net-snmp.spec	23 Aug 2006 13:11:24 -0000	1.85
+++ net-snmp.spec	30 Aug 2006 09:26:31 -0000	1.86
@@ -7,7 +7,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: %{major_ver}.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: BSDish
 Group: System Environment/Daemons
@@ -40,6 +40,7 @@
 Patch28: net-snmp-5.3.1-retrans_time.patch
 Patch29: net-snmp-5.3.1-config_libdir.patch
 Patch30: net-snmp-5.3.1-lm_sensors.patch
+Patch31: net-snmp-5.3.1-byteorder.patch
 
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -146,6 +147,7 @@
 %patch28 -p0 -b .retrans_ms
 %patch29 -p1 -b .libdir
 %patch30 -p1 -b .lm_sensors
+%patch31 -p1 -b .byteorder
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -348,6 +350,9 @@
 %{_libdir}/lib*.so.*
 
 %changelog
+* Wed Aug 30 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.0-6
+- fix IPv4/IPv6 address presentation (#200255)
+
 * Wed Aug 23 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.0-5
 - SMUX support is still needed .. will disappear later!
 - static libs should be in devel not libs (#203571)



From fedora-cvs-commits at redhat.com  Wed Aug 30 10:13:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 06:13:13 -0400
Subject: rpms/xkeyboard-config/devel xkeyboard-config-0.8-macbook.patch, NONE,
	1.1 xkeyboard-config.spec, 1.5, 1.6
Message-ID: <200608301013.k7UADD8o014630@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/xkeyboard-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14617

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-0.8-macbook.patch 
Log Message:
* Tue Aug 29 2006 Alexander Larsson <alexl at redhat.com> - 0.8-5
- Add MacBook model and geometry, plus alt_win option



xkeyboard-config-0.8-macbook.patch:
 geometry/Makefile.am         |    2 
 geometry/macbook.macbook     |  237 +++++++++++++++++++++++++++++++++++++++++++
 keycodes/xfree86             |    9 +
 rules/base                   |    6 +
 rules/base.lists.part        |    1 
 rules/base.m_g.part          |    1 
 rules/base.m_k.part          |    1 
 rules/base.ml_s.part         |    2 
 rules/base.o_s.part          |    1 
 rules/base.xml.in            |   18 +++
 symbols/altwin               |   11 +
 symbols/macintosh_vndr/apple |    6 +
 12 files changed, 294 insertions(+), 1 deletion(-)

--- NEW FILE xkeyboard-config-0.8-macbook.patch ---
diff -urN xkb.orig/geometry/macbook xkb/geometry/macbook
--- xkeyboard-config-0.8/geometry/macbook	1970-01-01 01:00:00.000000000 +0100
+++ xkeyboard-config-0.8/geometry/macbook.macbook	2006-08-29 16:02:05.000000000 +0200
@@ -0,0 +1,237 @@
+xkb_geometry "macbook79" {
+
+    description= "MacBook/MacBook Pro (Intl)";
+    width= 273;
+    height= 110;
+
+    shape.cornerRadius= 0;
+    shape "ESC"  { { [ 21,9] }, cornerRadius=1, { [0,1], [ 19,8] } };
+    shape "FUNC" { { [ 18,9] }, cornerRadius=1, { [2,1], [ 16,8] } };
+    shape "EJCT" { { [ 20,9] }, cornerRadius=1, { [2,1], [ 20,8] } };
+    shape "DEGR" { { [ 16,18] }, cornerRadius=1, { [0,2], [ 14,16] } };
+    shape "NORM" { { [ 18,18] }, cornerRadius=1, { [2,2], [ 16,16] } };
+    shape "BKSP" { { [ 25,18] }, cornerRadius=1, { [2,2], [ 25,16] } };
+    shape "TABK" { { [ 24,18] }, cornerRadius=1, { [0,2], [ 22,16] } };
+    shape "RTRN" { { [ 0,0], [17,0], [17,37], [5,37], [5, 18], [0,18], [0,0] },
+                   cornerRadius=1, 
+	           { [ 2,2], [15,2], [15,35], [7,35], [7, 16], [2,16] } 
+                 };
+    shape "CAPS" { { [ 29,18] }, cornerRadius=1, { [0,2], [ 27,16] } };
+    shape "LFSH" { { [ 21,18] }, cornerRadius=1, { [0,2], [ 19,16] } };
+    shape "RTSH" { { [ 39,18] }, cornerRadius=1, { [2,2], [ 39,16] } };
+    shape "APPL" { { [ 23,18] }, cornerRadius=1, { [2,2], [ 21,16] } };
+    shape "SPCE" { { [ 94,18] }, cornerRadius=1, { [2,2], [ 92,16] } };
+    shape "ARRO" { { [ 17,9] }, cornerRadius=1, { [2,1], [ 15,8] } };
+
+    shape "LED"  { cornerRadius= 1, { [  2,  2 ] } };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray";
+    indicator.shape= "LED";
+    indicator "Num Lock"   { top=4; left= 119; };
+    indicator "Caps Lock"  { top=53; left= 4; };
+
+    section.left=0;
+    row.left= 1;
+    key.shape= "FUNC";
+    key.gap= 1;
+    section "Function" {
+	top= 0;
+	row {
+	    top= 1;
+	    keys {  {<ESC>, "ESC" },
+		    <FK01>, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+                    {<K6C>, "EJCT" }
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 10;
+	row {
+	    top= 1;
+	    keys { {<TLDE>, "DEGR"},
+                   <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>,
+                   <AE09>, <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK"},
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+        };
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH"},
+		   <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { {<FN>, "DEGR"}, 
+                   <LCTL>, <LALT>, 
+                   {<LWIN>, "APPL"},
+                   {<SPCE>, "SPCE" }, 
+                   {<RALT>, "APPL"},
+                   <KPEN>
+	    };
+	};
+
+    }; // End of "Alpha" section
+
+    key.shape= "ARRO";
+    section "Editing" {
+        top = 86;
+        left = 217;
+	row {
+	    top= 1;
+	    left= 19;
+	    keys { <UP> };
+	};
+	row {
+	    top= 10;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
+
+default xkb_geometry "macbook78" {
+
+    description= "MacBook/MacBook Pro (US)";
+    width= 273;
+    height= 110;
+
+    shape.cornerRadius= 0;
+    shape "ESC"  { { [ 21,9] }, cornerRadius=1, { [0,1], [ 19,8] } };
+    shape "FUNC" { { [ 18,9] }, cornerRadius=1, { [2,1], [ 16,8] } };
+    shape "EJCT" { { [ 20,9] }, cornerRadius=1, { [2,1], [ 20,8] } };
+    shape "DEGR" { { [ 16,18] }, cornerRadius=1, { [0,2], [ 14,16] } };
+    shape "NORM" { { [ 18,18] }, cornerRadius=1, { [2,2], [ 16,16] } };
+    shape "BKSP" { { [ 25,18] }, cornerRadius=1, { [2,2], [ 25,16] } };
+    shape "TABK" { { [ 24,18] }, cornerRadius=1, { [0,2], [ 22,16] } };
+    shape "BKSL" { { [ 17,18] }, cornerRadius=1, { [2,2], [17,16] } };
+    shape "RTRN" { { [ 31,18] }, cornerRadius=1, { [2,2], [31,16] } };
+    shape "CAPS" { { [ 29,18] }, cornerRadius=1, { [0,2], [ 27,16] } };
+    shape "LFSH" { { [ 40,18] }, cornerRadius=1, { [0,2], [ 38,16] } };
+    shape "RTSH" { { [ 39,18] }, cornerRadius=1, { [2,2], [ 39,16] } };
+    shape "APPL" { { [ 23,18] }, cornerRadius=1, { [2,2], [ 21,16] } };
+    shape "SPCE" { { [ 94,18] }, cornerRadius=1, { [2,2], [ 92,16] } };
+    shape "ARRO" { { [ 17,9] }, cornerRadius=1, { [2,1], [ 15,8] } };
+
+    shape "LED"  { cornerRadius= 1, { [  2,  2 ] } };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray";
+    indicator.shape= "LED";
+    indicator "Num Lock"   { top=4; left= 119; };
+    indicator "Caps Lock"  { top=53; left= 4; };
+
+    section.left=0;
+    row.left= 1;
+    key.shape= "FUNC";
+    key.gap= 1;
+    section "Function" {
+	top= 0;
+	row {
+	    top= 1;
+	    keys {  {<ESC>, "ESC" },
+		    <FK01>, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+                    {<K6C>, "EJCT" }
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 10;
+	row {
+	    top= 1;
+	    keys { {<TLDE>, "DEGR"},
+                   <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>,
+                   <AE09>, <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK"},
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, 
+                   { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, 
+                   { <RTRN>, "RTRN" }
+	    };
+        };
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH"},
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { {<FN>, "DEGR"}, 
+                   <LCTL>, <LALT>, 
+                   {<LMTA>, "APPL"},
+                   {<SPCE>, "SPCE" }, 
+                   {<RMTA>, "APPL"},
+                   <KPEN>
+	    };
+	};
+
+    }; // End of "Alpha" section
+
+    key.shape= "ARRO";
+    section "Editing" {
+        top = 86;
+        left = 217;
+	row {
+	    top= 1;
+	    left= 19;
+	    keys { <UP> };
+	};
+	row {
+	    top= 10;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+};
--- xkeyboard-config-0.8/geometry/Makefile.am.macbook	2006-08-29 19:31:46.000000000 +0200
+++ xkeyboard-config-0.8/geometry/Makefile.am	2006-08-29 19:31:57.000000000 +0200
@@ -6,7 +6,7 @@
 amiga ataritt chicony \
 dell everex fujitsu \
 hp keytronic kinesis \
-macintosh microsoft nec \
+macbook macintosh microsoft nec \
 northgate pc sony \
 sun winbook README
 
--- xkeyboard-config-0.8/symbols/altwin.macbook	2005-10-01 14:20:31.000000000 +0200
+++ xkeyboard-config-0.8/symbols/altwin	2006-08-29 19:30:42.000000000 +0200
@@ -58,3 +58,14 @@
     modifier_map Mod1   { Alt_L, Alt_R, Meta_L, Meta_R };
     modifier_map Mod4   { Super_L, Super_R };
 };
+
+// Make windows key emit alt, alt becomes meta. 
+// Useful on apple keyboards where the apple key is beside space
+partial modifier_keys 
+xkb_symbols "alt_win" {
+    key <LWIN> {        [       Alt_L  ]       };
+    key <RWIN> {        [       Alt_R  ]       };
+    key <LALT> {        [       Meta_L ]       };
+    modifier_map Mod1	{ Alt_L, Alt_R  };
+    modifier_map Mod4	{ Meta_L, Meta_R };
+};
--- xkeyboard-config-0.8/symbols/macintosh_vndr/apple.macbook	2005-09-21 23:29:25.000000000 +0200
+++ xkeyboard-config-0.8/symbols/macintosh_vndr/apple	2006-08-29 19:30:42.000000000 +0200
@@ -3,6 +3,12 @@
 //
 // $XFree86: xc/programs/xkbcomp/symbols/apple,v 1.2 2003/10/24 20:38:20 tsi Exp $
 
+// MacBook/MacBook Pro
+xkb_symbols "macbook" {
+    key <K6C>	{	[ XF86Eject ]    };
+};
+
+
 partial default modifier_keys
 xkb_symbols "extended" {
 
--- xkeyboard-config-0.8/keycodes/xfree86.macbook	2005-09-21 23:29:24.000000000 +0200
+++ xkeyboard-config-0.8/keycodes/xfree86	2006-08-29 19:30:42.000000000 +0200
@@ -412,4 +412,13 @@
     <KPPT> = 134;
 };
 
+xkb_keycodes "macbook" {
+    include "xfree86(basic)"
+    <BKSL> =  51;
+// Macbook keyboards switch TLDE and LSGT keycodes
+    <TLDE> =  94;
+    <LSGT> =  49;
+// Use the right apple key as right alt to get mode shift 3
+    <RALT> = 116;
+};
 
--- xkeyboard-config-0.8/rules/base.ml_s.part.macbook	2006-01-15 00:47:48.000000000 +0100
+++ xkeyboard-config-0.8/rules/base.ml_s.part	2006-08-29 19:30:42.000000000 +0200
@@ -13,6 +13,8 @@
   old_macintosh	$macvendorlayouts	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
   old_macintosh	$nonlatin		=	macintosh_vndr/us(extended)+%l%(v):2
   old_macintosh	*			=	macintosh_vndr/us(extended)+%l%(v)
+  macbook78     *			=       pc(pc104)+%l%(v)+macintosh_vndr/apple(macbook)
+  macbook79     *			=       pc(pc105)+%l%(v)+macintosh_vndr/apple(macbook)
  $mac		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
  $mac		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
  $pcmodels      intl   			=       us(%mcompose)
--- xkeyboard-config-0.8/rules/base.m_g.part.macbook	2005-09-21 23:29:25.000000000 +0200
+++ xkeyboard-config-0.8/rules/base.m_g.part	2006-08-29 19:30:42.000000000 +0200
@@ -13,5 +13,6 @@
   winbook	=	winbook(XP5)
   pc98		=	nec(pc98)
   abnt2		=	pc(abnt2)
+ $macbooks      =       macbook(%m)
  $mac		=	macintosh(macintosh)
   *		=       pc(pc104)
--- xkeyboard-config-0.8/rules/base.o_s.part.macbook	2005-09-23 00:21:08.000000000 +0200
+++ xkeyboard-config-0.8/rules/base.o_s.part	2006-08-29 19:30:42.000000000 +0200
@@ -43,6 +43,7 @@
   altwin:super_win	=	+altwin(super_win)
   altwin:hyper_win	=	+altwin(hyper_win)
   altwin:alt_super_win	=	+altwin(alt_super_win)
+  altwin:alt_win	=	+altwin(alt_win)
   compose:ralt		=	+compose(ralt)
   compose:rwin		=	+compose(rwin)
   compose:menu		=	+compose(menu)
--- xkeyboard-config-0.8/rules/base.m_k.part.macbook	2006-02-22 00:52:07.000000000 +0100
+++ xkeyboard-config-0.8/rules/base.m_k.part	2006-08-29 19:30:42.000000000 +0200
@@ -8,4 +8,5 @@
   abnt2		=	xfree86(abnt2)
   jp106		=	xfree86(jp106)
   evdev		=	evdev
+ $macbooks	=	xfree86(macbook)
   *		=	xfree86
--- xkeyboard-config-0.8/rules/base.lists.part.macbook	2006-01-14 23:22:13.000000000 +0100
+++ xkeyboard-config-0.8/rules/base.lists.part	2006-08-29 19:30:42.000000000 +0200
@@ -6,6 +6,7 @@
 //              ru scc sy syr tel th tj tam ua uz
 
 ! $pcmodels = pc101 pc102 pc104 pc105
+! $macbooks = macbook78 macbook79
 ! $maclaptop = ibook powerbook
 ! $mac = macintosh macintosh_old ibook powerbook
 
diff -urN xkb.orig/rules/base xkb/rules/base
--- xkeyboard-config-0.8/rules/base.macbook	2006-08-29 17:54:26.000000000 +0200
+++ xkeyboard-config-0.8/rules/base	2006-08-29 17:46:53.000000000 +0200
@@ -15,6 +15,7 @@
 //              ru scc sy syr tel th tj tam ua uz
 
 ! $pcmodels = pc101 pc102 pc104 pc105
+! $macbooks = macbook78 macbook79
 ! $maclaptop = ibook powerbook
 ! $mac = macintosh macintosh_old ibook powerbook
 
@@ -86,6 +87,7 @@
   abnt2		=	xfree86(abnt2)
   jp106		=	xfree86(jp106)
   evdev		=	evdev
+ $macbooks	=	xfree86(macbook)
   *		=	xfree86
 
 ! layout[1]	=	keycodes
@@ -116,6 +118,7 @@
   winbook	=	winbook(XP5)
   pc98		=	nec(pc98)
   abnt2		=	pc(abnt2)
+ $macbooks      =       macbook(%m)
  $mac		=	macintosh(macintosh)
   kinesis       =       kinesis(model100)
   *		=       pc(pc104)
@@ -352,6 +355,8 @@
   old_macintosh	$macvendorlayouts	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
   old_macintosh	$nonlatin		=	macintosh_vndr/us(extended)+%l%(v):2
   old_macintosh	*			=	macintosh_vndr/us(extended)+%l%(v)
+  macbook78     *			=       pc(pc104)+%l%(v)+macintosh_vndr/apple(macbook)
+  macbook79     *			=       pc(pc105)+%l%(v)+macintosh_vndr/apple(macbook)
  $mac		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
  $mac		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
  $pcmodels      intl   			=       us(%mcompose)
@@ -997,6 +1002,7 @@
   altwin:super_win	=	+altwin(super_win)
   altwin:hyper_win	=	+altwin(hyper_win)
   altwin:alt_super_win	=	+altwin(alt_super_win)
+  altwin:alt_win	=	+altwin(alt_win)
   compose:ralt		=	+compose(ralt)
   compose:rwin		=	+compose(rwin)
   compose:menu		=	+compose(menu)
--- xkeyboard-config-0.8/rules/base.xml.in.macbook	2006-08-29 19:30:42.000000000 +0200
+++ xkeyboard-config-0.8/rules/base.xml.in	2006-08-29 19:30:42.000000000 +0200
@@ -676,6 +676,18 @@
     </model>
     <model>
       <configItem>
+        <name>macbook78</name>
+        <description>MacBook/MacBook Pro (US)</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macbook79</name>
+        <description>MacBook/MacBook Pro (Intl)</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>macintosh</name>
         <_description>Macintosh</_description>
       </configItem>
@@ -2840,6 +2852,12 @@
           <_description>Alt is mapped to the right Win-key and Super to Menu.</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>altwin:alt_win</name>
+          <description>Alt is mapped to the Win-keys. Alt becomes Meta.</description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/dist/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xkeyboard-config.spec	25 Aug 2006 03:50:31 -0000	1.5
+++ xkeyboard-config.spec	30 Aug 2006 10:13:10 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 0.8
-Release: 4
+Release: 5
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -19,6 +19,8 @@
 Patch2: xkeyboard-config-0.8-kinesis.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=7992
 Patch3: xkeyboard-config-0.8-dell.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=8068
+Patch4: xkeyboard-config-0.8-macbook.patch
 
 BuildArch: noarch
 
@@ -26,6 +28,8 @@
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xkbcomp
 BuildRequires: perl(XML::Parser)
+#autoreconf needed for macbook patch
+BuildRequires: automake
 
 # NOTE: Any packages that need xkbdata to be installed should be using
 # the following "Requires: xkbdata" virtual provide, and not directly depending
@@ -51,8 +55,12 @@
 %patch1 -p1 -b .thinkpad
 %patch2 -p1 -b .kinesis
 %patch3 -p1 -b .dell
+%patch4 -p1 -b .macbook
 
 %build
+#autoreconf needed for macbook patch
+autoreconf
+
 %configure \
     --enable-compat-rules \
     --with-xkb-base=%{_datadir}/X11/xkb \
@@ -87,6 +95,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Tue Aug 29 2006 Alexander Larsson <alexl at redhat.com> - 0.8-5
+- Add MacBook model and geometry, plus alt_win option
+
 * Thu Aug 22 2006 Matthias Clasen <mclasen at redhat.com> 0.8-4
 - Fix geometry description for Thinkpads
 - Add a Kinesis model



From fedora-cvs-commits at redhat.com  Wed Aug 30 11:09:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 07:09:20 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.86, 1.87 sources,
	1.89, 1.90 system-config-printer.spec, 1.52, 1.53
Message-ID: <200608301109.k7UB9KIu013196@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13181

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 0.7.27-1
- 0.7.27.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- .cvsignore	23 Aug 2006 17:28:07 -0000	1.86
+++ .cvsignore	30 Aug 2006 11:09:06 -0000	1.87
@@ -66,3 +66,4 @@
 system-config-printer-0.7.24.tar.bz2
 system-config-printer-0.7.25.tar.bz2
 system-config-printer-0.7.26.tar.bz2
+system-config-printer-0.7.27.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- sources	23 Aug 2006 17:28:07 -0000	1.89
+++ sources	30 Aug 2006 11:09:06 -0000	1.90
@@ -1,2 +1,2 @@
 c853b55286216568f14dde8a5ae21a21  pycups-1.9.12.tar.bz2
-bbd11e873b4adb6aa7a3ecd46cf20f25  system-config-printer-0.7.26.tar.bz2
+57cb362fb379b6635baec08b9fa0e06d  system-config-printer-0.7.27.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- system-config-printer.spec	23 Aug 2006 17:28:07 -0000	1.52
+++ system-config-printer.spec	30 Aug 2006 11:09:06 -0000	1.53
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.26
+Version: 0.7.27
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -67,15 +67,6 @@
 install -m0644 %{SOURCE3} %buildroot%{_sysconfdir}/security/console.apps/%{name}
 ln -s consolehelper %buildroot%{_bindir}/%{name}
 
-# Desktop file installation.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor redhat \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
-  --add-category X-Red-Hat-Base                        \
-  --add-category SystemSetup                           \
-  --add-category Application                           \
-  system-config-printer.desktop
-
 %find_lang system-config-printer
 
 %clean
@@ -114,6 +105,9 @@
 exit 0
 
 %changelog
+* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 0.7.27-1
+- 0.7.27.
+
 * Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com> 0.7.26-1
 - 0.7.26.  Fixes bug # 203149.
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 11:13:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 07:13:22 -0400
Subject: rpms/xkeyboard-config/devel xkeyboard-config.spec,1.6,1.7
Message-ID: <200608301113.k7UBDMPc013319@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/xkeyboard-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13305

Modified Files:
	xkeyboard-config.spec 
Log Message:
Needs intltool too



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/dist/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xkeyboard-config.spec	30 Aug 2006 10:13:10 -0000	1.6
+++ xkeyboard-config.spec	30 Aug 2006 11:13:19 -0000	1.7
@@ -29,7 +29,7 @@
 BuildRequires: xkbcomp
 BuildRequires: perl(XML::Parser)
 #autoreconf needed for macbook patch
-BuildRequires: automake
+BuildRequires: automake intltool
 
 # NOTE: Any packages that need xkbdata to be installed should be using
 # the following "Requires: xkbdata" virtual provide, and not directly depending



From fedora-cvs-commits at redhat.com  Wed Aug 30 11:13:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 07:13:52 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2601,1.2602
Message-ID: <200608301113.k7UBDqpU013409@cvs.devel.redhat.com>

Author: mtosatti

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13391

Modified Files:
	kernel-2.6.spec 
Log Message:
Fixes for DUB-E100 vB1 usb ethernet




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2601
retrieving revision 1.2602
diff -u -r1.2601 -r1.2602
--- kernel-2.6.spec	29 Aug 2006 22:22:34 -0000	1.2601
+++ kernel-2.6.spec	30 Aug 2006 11:13:49 -0000	1.2602
@@ -456,6 +456,7 @@
 Patch1790: linux-2.6-drivers-add-qlogic-firmware.patch
 Patch1791: linux-2.6-libertas.diff
 Patch1792: linux-2.6-videodev-v4l1.patch
+Patch1793: linux-2.6-asix-usbnet-update.patch
 
 # SELinux/audit patches.
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
@@ -1023,6 +1024,9 @@
 # Fix <linux/videodev.h> to include V4L1 stuff
 %patch1792 -p1
 
+# Fixes for DUB-E100 vB1 usb ethernet
+%patch1793 -p1
+
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1
 # Add support for SELinux range transitions
@@ -1815,6 +1819,9 @@
 %endif
 
 %changelog
+* Wed Aug 30 2006 Marcelo Tosatti <mtosatti at redhat.com>
+- Fixes for DUB-E100 vB1 usb ethernet (backported from James M.)
+
 * Tue Aug 29 2006 Jarod Wilson <jwilson at redhat.com>
 - 2.6.18-rc5-git1
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 11:14:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 07:14:52 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2602,1.2603
Message-ID: <200608301114.k7UBEq1q013455@cvs.devel.redhat.com>

Author: mtosatti

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13438

Modified Files:
	kernel-2.6.spec 
Log Message:
The AMD Geode GX should be treated as an i586




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2602
retrieving revision 1.2603
diff -u -r1.2602 -r1.2603
--- kernel-2.6.spec	30 Aug 2006 11:13:49 -0000	1.2602
+++ kernel-2.6.spec	30 Aug 2006 11:14:49 -0000	1.2603
@@ -47,7 +47,6 @@
 %if 0%{?olpc}
 %define buildxen 0
 %define buildkdump 0
-%define buildpae 0
 %endif
 # Don't build 586 kernels for RHEL builds.
 %if 0%{?rhel}
@@ -214,7 +213,7 @@
 Version: %{rpmversion}
 Release: %{release}
 %if 0%{?olpc}
-ExclusiveArch: i386 i686
+ExclusiveArch: i386 i586
 %else
 # DO NOT CHANGE THIS LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %nobuildarches (ABOVE) INSTEAD



From fedora-cvs-commits at redhat.com  Wed Aug 30 11:17:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 07:17:46 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.53,
	1.54
Message-ID: <200608301117.k7UBHk7u024356@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23666

Modified Files:
	system-config-printer.spec 
Log Message:
* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 0.7.27-1
- Build requires intltool.


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- system-config-printer.spec	30 Aug 2006 11:09:06 -0000	1.53
+++ system-config-printer.spec	30 Aug 2006 11:17:44 -0000	1.54
@@ -17,6 +17,7 @@
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: gettext-devel
+BuildRequires: intltool
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Requires: pygtk2 >= 2.4.0, pygtk2-libglade
@@ -106,6 +107,7 @@
 
 %changelog
 * Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 0.7.27-1
+- Build requires intltool.
 - 0.7.27.
 
 * Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com> 0.7.26-1



From fedora-cvs-commits at redhat.com  Wed Aug 30 11:22:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 07:22:55 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc5.gz,NONE,1.1
Message-ID: <200608301122.k7UBMtaa028846@cvs.devel.redhat.com>

Author: mtosatti

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28819

Added Files:
	patch-2.6.18-rc5.gz 
Log Message:
Readd patch-2.6.18-rc5.gz




--- NEW FILE patch-2.6.18-rc5.gz ---
?
Y?HD?0]??2\(3??????&~?t\?2b??L???v{F????.>_]^??b??/?????p?'?`4S??=??1??U??D?????????q??j^hq??8??]??Z|u0???Y"S-?????A?,?U??]??D???2??T??K.U??/'bQ???p?O+?~<???v{?'?[??"Rd?BR8?%h?,??6R????qW????)PP?8U?2+ >K?????P\??*?$???EThS,u?_???F??M??????'???????????YVD??/?&????<??x??+?M?UE
???????N??
????y??/5z\.?
6?B??Ef?/a??uY?
?zR?w'E??"????_?Z??4?`'W???,?i???-?^Oj???|?H??{???*P??1XZ?M(?!????n???d??n??M?N??U???v2?x?v???8?9??Fb47?\Hq?2.?
_?W?X?N?G?b#???Z???^??J?J???????T=l?????^c??????"+???>`?*?e?????Vy6?a????"?e?)??Y}?{}??p????}???h?;?5]-????J?	?????????Ej?3?_???i???,yq????Q???????kE?pB>b#r
?d?(?o?2????37?5t?!?$??XqZ&{??	?R??2d??XEPs???z
?E????
5????xDK?x9?G????4A??L?ln??????`?@?7??????n???gY??yEw??,U??D?
?{??M,l>n??????$??+n???d?rx~x9y;:?W?bt??+????xr?/???B?=?????????<4B?F???????? ??c? ?????`??x{qs;q\g???i5????0+???.
3?m?(?????????????????*??;a}Q?%>?	HR,?d*vs?GBdy<.??	????;?h?g????ca?
_?a???s_???o?G??,?P?,????????????+??z?M??#?H???6???O????8?#?8L?8vQ?8G}
??+h?TI?????
????X?+?<A?gx?B\V?f??nOA???tV?D?Q4?'lD???????^!?1F??????O ?"???X$~?D?X??w???Bi?K?3"E?E!B`??*Z??\?.RL?=??g[?4	???u{?@SM???`??%Y
uBo
?.V???:<"O?Rp	j?f!?Y?F?
???????	??<W???B1`o?Nk????2e?C?????"?/??lP???$H??c???0?$??TX?????RL?J????!??fVx?,~e?0??
/U=?P??YJ????L'&?`:?CY`???[?b????fY7*.???'???\?W={,{?n	"s`(??4+?<???(Bp.????????b????Ui??Vc??:N??M%????? z???B;??H??xf X?B???????,????6d0?
??(X3`????R/z%?
??fYJ?+v?N?$/??4?qS?? 
	S?{?
 AD?????lj2B??>?5??
??n?'2???q?|??}???=?.2???hL?qY?]V?g?l?M?B???l??5?]c?V?Y????1??a?Rx???9j[?????H?Xi3?/z??kz??
H`??1?O????"y???gl???????)??]?Rd?|aY?????)?n??? ?:h?D_?1A?Fv?l????????=vH?*?Moh1D/RZ??????Jp???????????K??	Z%?x?KN????'?U??P?????B???"???OPB0?c???D???T?m??v???
>?i?La@?3?>?\?3?D?????V?C6F8??X?+?3??q??RA?i????????%
c???j?QQE?????#?qR??????%?	?n??uxX ?????s??\o????H?Z/??uU?Z7\?+???v????j?	?D???ZK`??<*???%|??????????0?J???u??F???????????????a?3G?N?7??-Fkt?]?j????M?6??????F??we??|V????????Yp=?????????S????o???????????K???????d?X?*?-r???????Q?
???B?????of? 
}`???ar~????????s?r=X?????4#????y@?^
???T?w??]Q??R?%???8Y???|??)5XL`????;Wt?????t??????%h?????????v?O???gx???
???q+?j?g5Zmr
3.8C?X???????;?n????t4???%??????d?~?o??mL??????q??????cq}?;??"A?]?????9?9d???4??Hrgf?&??P??M?'!??k????X??????B???xM???t0
?D?qb}??k???"?{????0?>??x?B?????t?(y
'????n)?q777???w ,?3??.?w]c?i?\V??+?BiIQM?A?????r?????:N}9"?F?????o!G???S?X??0? ???*?T?b?o???&????A??4^d ?=???,+???,???
TsE?y???1?$s??E<?;?<????-U??ST???O??????O???t??
6*????6Q??0?J??????kd???-W[:\?g??C?MBJ1???x??????[???^??'v?_GXw???l?
???=0??3???9??T=?c^?? ????????x?p????n??H??A?W?Z???????o??<????i?h??O?7?}}??
cV???vG8?aw??N?????*?h!?N\
dC-m?et?Cq_??i??8!.?S}??2r???????.???]????`'??	?5]!??v??=??g?c??,??&\??iL?,T?????uQv??K?!_Q?^f?kGC/?f?k?:+y?,??Ut?????6a\4??????xe??A???{?_???rB0???|???'I?N?l
?V?9+??k??jc??,?????0??i&???????'? ?K?????;5s?????dT??y?????????,?w
?(??
?Nk?@S???~?+?v????^???J6?N?g?.??KO??)eP?iA?^?!K?jy?l2d=?=+??N*,?Q--R],! ?>??2Cw6?Ft?????c?4f5???'???I??.
?2Sy??????C(???????u????+Zd??)??:?

qU?
?	??tn?
D?????????????|.o[-f?T;	!TZi?K??+??hw?????x???S;P??^??x???8???e?t????yC?Gq?????:??s?8l?y??T?/?e??!?????H#??D?c{??c4?????N??,,???z??x?Q?{1C?=?[r??L??Vw\)*???	KP?Uy??b??~?.?!?1e????2???c)????$>?y-??)??UL???????????????????fE?/[??ok8?1 ~?&Fd
?o`=?Cc???I??s?1??B????w8??N4??
?????S?E??R&H"??8mh?y?????????|???_???
?!?????4???4G????8?M?Z??O2????4a??
?j??AK,;?Kqa?m?????'?q??"?U???
Q?u?1?Z?q?<?????y?E??xu????8?{??"*5???S???J???d?h?F|7?8?????Z~zi??_|R[???ZLN??????M?-Q>??????\??A??,???&??4??(D?*K?b??=?"??????????1?~??S?}?Q????-??=????i???AU*???????????e??8?@????b??}???\?I&T;???????m:?gU??????"??QAt%?O??*??6>?????h?
?}z?Phf????^?q{g"C????$p??LpkO??1a?h??<%??P?g?$?`}?L?2y?mW3O????VO~?:?>=???=<[??2L?????9?????kj??(s??B]%?)?:D?????????d????0??&?A?5u??????I<tX??>??
2[o2?????8?D??&??|?ED?,}?'?%?;'??? ,KE)"|??O?f????-??p<a???,7??i????1??\??(6:y?S)??????	?L???xB?x^??y^v?e^`??F??F?x??U?????O?2}?[?*??$???
?K?????
?[SD???C???{??Tn??f??6?p?g}F???&Q-0%y?8B???I9?????y.4m????6???m?<?Ns??o???i??)?C?I??[?/??2\?h?i?F?f?+b8&]??vY?W>b??fC??w~?i??r??
????/??5wP?ud'???lD?????l???[n3A?-???O?
?????B	tl3??&u???
???W<?a?z8?????g???4p8??>???tt;>????????z?????????j;[[?????+?be?.?2X???=!????$????8$??esvk|????#O?7$\Y?K????Y\??Hka%?J?C????xWG??xI!j.W??QN)????????d?Gr?i?Z?'???y??GD????????aw??e?	[]??J???????<??9?????F|9?izx??Rb?m]?S?0?NT?,??o?'rLxX;
P? ?<??p???52???xv?-?m??
?s"??
$?/??_??????;x
??M?k?}?????M?????%??TqUt"~??
????	?g`[z?O?
x?????{??i?x#aI:
U?G??
)!??W?8????????'????6B??????????h????|?????W???{??!??>?g?(???+@???w???C?CH???7??F?&?]l???;???9?E3Fs????????OJ???w??a??u??S??J??P?7????^m???
E?z?J?s?D???hS?????4??w~????W?Jyco???tAU?????????Ry?8l?Ss?#??Q??X{a,?????*?j?^??+??6??kC??A??Q?,m????O7?'??X?H?PG5e??q?
?dCH?x<????????s????t?a??a??ka???pN:g????N???U?q????\1?J??S<???Mv?x??8???B,J??Q??'??p???C?cG6 ???
?&???U
????"?)n??N?
v?Y?/?????w=&??6??7V???d?h???b%?Lr??]?_?+??
x_&?NI????????l??V6?sW??????7?%"8????
????H?;??'.hJ?V8!m?K?????x?Q???p???+\??J?w??g?B?
>?kd
?2???D??zO???gF?3
n??%?R???A%???O?F???`A6L???????BD
?l??U5?^??'???/KJ?8L??2???At????e???E?????1??CD?Y?,??????6T?f?p$?p?wo?]?i?,G??p????T?|?
?~2?$?????,?(?H8\06!
??[O YN??uH??yt?
g?X???F~>????Y?.?0?Q?4?
!4G?`'BR?????[???#?????4????80???B???????d??P.fE=??&?>???T
?3??
??[-??V'%??s/?H?!??0h?]-??W\??>{l?$U??Ct]]?
?DSbu?`???q?O?(&??"????8?2*fN?P?-b?/???=v6??6?@????9???J???d?????M?qNv
??UP????C?k??F???C??*?
X?y[A?{\???_??&?P?DW???#I*_\????W=U?????f??NN?Yf0?;???}?+9??3?xD*v4??H$??|V?U?n???\?*?s??V3??????????q4?U?d?o'????*?????(.bzV?_?8??
?)
?K[?ou????E)?+???????/]????Y=??:?D?q?????e?R"*,?vjd??R?}?$?|?} ;?#??'????????JvlL|?.M5?
0	?????(];?~??__t?7@?O???????OQ?????
,r??/_.??????L?????oH???r/??)ktj?0?e?Ia??X?*????r????-?MsK??H5?E???,?[;1??Q??K?cq??2??0??D8?hw&??8??f??Y)?-??"?s???rA-?\?????.??=?#???N?h?U9^?k?;#8?F_?
??hZl6X?b???[?
?/?-m??+.?3k?7,_???;?J????????YU??[0z	?=D??ug>32??Z?z??k;u?_?2t_??xHa?K^lE??7?g?FI??K?e?A??k?k'_Z[?b???A??>?-??>??!??F?/??L???^?;??i?Y??r??t`??X?E??y?p./x/<K?????s????????|d????(+X
b?????r3(	????9??????B
???3??%?-Z??!N???????p?d0LO????M?i9'?????r??>?X4??3????3lI????s????0?'9???L?e?0XI^?%???j????M?&g4???????w????c???&???Oo???????(?'2???wu???C??i????n?m	y?F?S????j????5?	??JT?#+?4!U??9?n ?F{??Y???8;??,e?|???0??UF??<&8k????px}L??i????>??Q?|c???t&\?;m?,l?D??????	#?Rdf???k????????#	,?~~??)e$H-??????/'??l<?{??W$?^???~w??????5R???8=8??%!???????:?$G????}??p??Q????????????b?Z2?a??????Y???W?.?olF%1? @?p?3?_????P#???-?z??c??]]1??Qw?"y+?K???D?^?#????e)M???C@!???????
3T??6??+b?2B?+??(??YJ????j??K5,?T???K{U????i?y????Wl???D?????Or??????g??:n????C?s?mn>???Y????p_???r?Y???q?e???q?Z_(???n???c?????+???/?b???A.??I??6?'n?nS?7?l???F?g)s?2?
?r1W
^?????i??0A?K???? ??E??, :R1?h??g&?0????8?7?Ubg?1_?5+L?5????(A??????FA?????|?DD???Ks?q;C?-?^#?2??+??o??R(4???{H?Y&??D??7Hv
?J??\?<;/??????I??????b\??"
8?N??????w|9???q?,]?<)|+?H?
?!?????Q,N5zR??
??E?Jh?????3?{?[+??MsN?x?7?D?;H3???????6??Zo???5?Av(?4+??X?????}o???s??WdB?1????gw?y?Y6?????NI??(~??8?
?1?dh[}4k?1?]????=l????A?	?i???????A???qm?????z?]R?!??N?+?W???71???~e?????i?lo@???|-G???f7?a?????Z??:?1???^???C???p^??:G*}??Z)Y?
???"?,???oN0m. +???@s??I?????[W~????
???M^?M??w?;rT??[????N'L??o?WX??`???|?\????t?W???6 at I???7}????{?\?	???>?e?8?<?9y7?G;x?x?9?o?6+?Mo}ks?R??7{MK????????T?6k??1?<??[??????"LMcy"fJ9?$"J?xn?%???y N?(T?nQ?#w?1???s??????L???b?u???U_}C????L?w`???Q?wZ???o+	0h?G??o=$%Ci?<??;????q??T?Z?F?????A?c`?
?)
????lv?????JlK6???3?j??$9?/????? ?w???p??K?6?:??U?s????
??V????cw?p?!?9s?????D???e????t{????~????????????6m??^???6?Yn?!)?U:?W?}?? ??
??????Q	??Pn?A?{M9??o9VH????????@?W?\?H?X?,????9i?d?H??&?[?k2?_am?-?M}{???$?lv????@???6?V?+/?????? L:?P??-p5P???0???? ?CNF?H??`?09??c?
M?;???
?{????N??m?@???	lt?i?L>?=?V????P???,??`
Dmi?
T????????n??5?euybw'R??Vo?on?l?q??H???Y]??$1>?v?wI?G?I]]?U?3j&??????p??90???N?D=?O?YN?0#?K?v?/8<@?}&3=V-???3T?`~G?Y???????0???.????
??x??(6aw[?A???ey[????!o7*?s?
F????
?dLo???p?1??3k%p??
'&???? ?u]=??6?0?k?????i}?????~lSa?~$???????7?g????x?M?I ??<?w
=HG?????/??.r`
;?2??eK$+!????\?,?<?h`?l'?@?1Q+??C??D>???\rI&Oj??w?!?????9?
CW
?do????l$??P?#???;??L????Y??;???G`}o??:0?rh???9y?}H?????+`;??Z???????^???n????FS	?G??&s??5.O
A????QS???????|?????.J?p?=???5??3["???????f??Y??h?"????$??
??c??x<????_]o??dU?0????(??????s????k??K??<?+?f}?^v?s$?4?:I4??gy?'?M?hX?_`?<?sy??*??+B????G?i?oErUu???N????Cx?????[Eo`????TP3+??P?B???$
4?? ???????q9]???b??
`???rs?&???'??2???u?F|?=?u?QS*f?`W?????????<??$
V.?@9?_?5-$?}f3';S???K?L.x??w}	?V??Cc?y}?????>*A?????{??q$??F7BH#?????H
????
?}??Pp	?Eb???1?????$*x?????w???o&2O9\'f???z?
?????~j???	?\c?:?T7???a???OQ??|???>.&L?8???2o???p??0fr8Lf?Du}?q??????????x??Ac???Z?????m???&?(?K??X?jJ??h?????f'?FAF?x?N?n!????i???40?T??#t?H?-?C???-???vw??h?qgln?,???????????"?[O??7??Z??Z?U?????}$h?????4?pm?5T???qb??%?}??T}2??Zw????i??zX???<0?????????/?<?W?f??/?dZ{=89Q4?s ,M??" Id(HKD?K?????N????c?A??u?F
???Lj$5?v?	i??j???X???;?,????rZ???1?'?@V????r???????0 ??@-?+?(V???p?6?f|????gVA? d??i?XO????T.??????Ozf?[2?G???
???????????
???J?c??i??bL/?W??????5??6Q;??niiM???u2k
?m	?7CxE?6W4?8?2V?+?+?????Qp??A?24#???q??D??+?;
?????+	?48?(?O??WP?D?F?D?????v????nz????;f@?!??Q?????|?????-[????YB??(?????S???3?p??
??
?4?h??????y?i:?z??L?v??????^}??IiP
*????'Oz?d????Df^?#???7wv??{??.?????+??R??l??z?????3U??TZ?x??0?(X?~???%3}"??34??????????&?h)???????b?L??Y3?>\??I?H+?S?9M??%?e0?????"D&S)???C???s"e??G??r1m????
&3????m??&v?Z?????????fz?
?|7?~???	??\??D??G?L??????fv
??????$?"?G?3Xr9???g@?@%????????kB??{???ak????.?????0}f(4?G?N???6/?xNc?p?m?????P??E??4??!)K%&??Q??????????U?<?A??5)&Ox
OKi??o?[??V????7?0???W?????S?*Woy0e??u?py?KK????4pw??.q?[j????'?B?/"???T?O???=o??<??.x?(6m??z????Y????O??????????*Y7??????????????TZ????t??????i??~?KKD?m??????h????
??q?"??Q?L?;jX???i?n?a????????5S 99<>????lN??[D????[?m{???L8?|?R!$W?g???????? vTZ<>
9HV???????I?%k5p?????98????J?
??.?
7???????$?gb??????7????.q?????-v?<cED?LB:????	????????? ???+?N??
?]?o(7L?}?{MJ??A????2?{w??b'?dC??
???????ur??/???D??sA
#??T?}\?B?-?]?1??????4??'U H?
???}v	???>??u????,38??7k(?s??!>k?$@a0&5X??????l???v????r?O??#B??Y??????K$?^????Z?)M??}?Rq???^??5?Y??k?C??wPv??G?u??D??9?
a??-ML???\?go???m?.?cIf,?)?N?9?;ab????4i??4?d?
P??U?5?' ?{???pX?Rv;??4W?-?H???m)If?`P?.?e_?K??????/???? 
????hu?y)????09N???v?Vkt?????9N&??.???rA^?
:?4DB?q3?	???xY&c??l_??
'?f??H?1>?????B??-???o1?]Y?r???V???Bw;`'%?X?
;?tD????t??v??W???(??#VI]&???_??x??GJ??????????????$????w????e?(???&???????^$F?????????c?s at G'?Jm?&W????Zp?????F-????o?<vc???Q??4????o??
j?x?????g??X?????T;N??v<$??f??
,`??5?]MsO?8??$?{???_?@?)??V>
?IJS?8MEU???????&?ce5_?7D?PKn?$z?hZ?p???b???K????????z?????????????????=p???
$iY???J?Vd?Q??@?Vb
+?n#?(t_ ?*?!??D4d???].??Q?<b?E?????Q???NW???3?1?W??Y????L@? a?/l????{?g??6?ln??2?????96ZL6p6u/+????y?0?pT?l??D<?l?qS????????????
&7?\
s??1R??3?!	?$oi?)??p???????????H?W?????t????E?Q?8??)A?Y]I??-1?!??????<??*??r??^???^3???U?3	?zWz?q???i???O.?w?????ID?????@2?@??3f?Y???Je???M???d??<s7???I0
Q?P?O???
a+%??B?	b-??9|3??0?D??2B4v1q?(8I??(8&k$4|??n^???N+???~s?Z?b????B?:??!??=???=[??T?Z??I9?a%.QO#?i??Dy??E~e&??x?u?d?NB61:??*_b?m????g?'?l
9?*?a??????t{x?C???????????????????<,???53y>???q???????W????b?L ?|???qE5????s(?G@?v?O??@AM`h2"??-??zZ?=?>??p?|???-I?A?u,Gy?XyL????d????l_?x
c??_?7?w???????}?????Ku?%??hnn??7i,???b????;?9????F9?2u???PB??L????M?m????P?[?c??????C#?8??????^?d^?_?$m?y?q???h??"????o?h?2? ????z^:y?O????Yj??????/??	?O?w7z{?bs?????k??t|?#?j???????w.["????}L-Nn
;?9/o^G(???t9???K?????_???????\?N????aE?[????O??/{z?9?=?N??????U??a??
0^??
??Vx?X???i?
?z????+
??????cmW?L????vrz/???0r?!Q{?&7bN;????2~3 ??R?:??N????q??ewW?o??7??Q?????B?" ?d6xya??F?M '?a1?????y?8???UL	?5c;:$??-?)4?????2?[???w??(e??%???\???a?(?!?????=????`t????"2=G???Km??iuIS???&????E??AN??????????7?5??<u??2?%????K??)??0M???S?e?O??4????9???????X?`?*??Q?*=(|???
??>???T;$;cr?0?o???Q??????jj);?!??v????K?i???6??gW_??O?
$^?0?\?}7?z?P~???
??_??%?\????lK?????T??%6=??????r??R&??*????f??n?:i?/??K?y???W}?a??U???4???:w?6?E?a?+?B??a???8?[.??Bn?~L?????!?s????6hbMg???????gC'
I??
??O~?@g??F?ZlNyN{"]??
???ZA??7_f??y??'za??????;???<*?+8???~#h?_??????Wg??I?n???:??????b???j?Tq?l?s?z??;#??iX??N????N?????U?(,?????b??0?!{jUs?3&$???????'Ne???v?A[????p?i!V\?:??#?>|&>	u???~???n????#)?0"E?)?4x?B?[:??}^a7??]
????}
?b????N??????8?@??sN???^??o?,???? ?~"kk?K?&V?y??????????Z?LZ?s???@{????&?SB?j?q??????L
??Y
??A|??`? ??cv-?????p?M?1????t-???
H?Z?x8?G8??9!J?DW?x1?????VZ0?	?R????i?D?b?T??
=?9~???8pk??C?D??t??
??TB?f??v????,???aO!??
p?:&I`???L?A??>&????]N?p6?pcj\?Bx?+?Z_{?H??cR??
????????C?lJ'Eq5??~j?q??G???h^&?k?e?E????S??s=???P??B?"?_???f?'?
?9?2??1???"??k?????uD?x?8??????2/0'???r??Dq??i??4????
??*??W???F??B?6j*tk????????l?)?:!n8??>2/;?Y7?P
?pT]?'N?5???I??	? U??fO-?????I?_#?y?_u??L?-?Hg?D??I'=	?a????????2 at E?M??C????????Y??W???ve??'?`??h?(V?U.P?[??l9h???	E??o???o(??f?K????T]q?YFUD&[?a??x?X?XS???(	????R??2$?????&?3s?Ou+??5???"|??~ ?OQ???
N?=???9????????>???]?bm?
?8????????q?e?I?A????0???3??"
??#?????[??o0v??;??????!????5?N?i]?s?/[5??zn?
M??/SO???D?
???????y&???d+)???Up?4+J?[?	/]??LTw	`???w?r??bMW?')km?
??????ak??N????7????(?c(?vzs
?????;?Z?????E?`?g?u??Q/?<?F33?$?iH??!?O??@p???L???rG'

??j"?;?????C?????f)?1?r5m??E???)x'? ??(?\???8??&&???XS?M??6?d??????#&5?{??0???(f,??????]	[uTc?*???=bzG?t?Y?-m?G6>?5??X?Y;??
?5z?FQ?????- ?G??V???&???1R???H??
????G??
??@?8u
?Ge
????
?T?????D?#m?[b(`??V3lv?=X5zQ?n3G?E??X[G????F?&?A?4?,6????1C(1rg?O????F?YV?%q???xI
????L????^??? @$?M??????z5?\?[??M?Tv,????)?&,??%kLDa??$`?K{?`??
?Yl????N	ABg??????7!M???1??fF??#E??7???U?ad??AXp-???O&?Z????=?O???sMy??>??9??;<f?Ff9??DTQ`??XR???HX$L?eG??6????
??
???k????:?{?b???WC?|???Ec6??????f???:?>?q:7u???
R5??0w/z?<ly??A?s???=??W?Z?z??$???n@m?????|I3\rg?
r???V,L?(VZZ?7p??????S?
??f0w??\????;??6g-?i???b l!?I$??`~??{?5?=o????[???Y??I? ????qN?f2?
)K?.??s??f8cWG??f????`?
?????=???????&q???WO?[s????11?????????"???5wJ???@pRtA{???n?O4?e?%?LD?s????$4???-J???U??#??J? s??H?EB`z6y????~?H?
{b?W?X1m?p(??<\?Y???pL?f\`?|?~????nn)?)??Cr????w{?8$??5?/???~?KK?]??3???????
&??jrr????P??Z? ;??2???C#u?*3?'
i??W?????i???\/???7?H?a<~
">Z??&c|PE?
?????????{x?i}?J|???u?tdQA??
??bf?t?6 Ro?\??????bg????3???1dW?Bw>???>D?t???x?\???r[???	??{???????s?
???????g?n?V??z??????m???.??????(Y$???8s?$7s_?{3ua?#t??s????7??J6J???,??\??W?
:
Z/?xIZ???T
^7???5??3F???????/???????v?????]??VQZj?s????????a?{?
??T????R??K(
0??????kk8
?29???@yG?2??\3?g???qlf`?I?#?5????	?8??z?a????~?Vo?q?>???]?+??}.????>?????>9<>?1Vg??????b/.??????`L???n4?????&??????i?N?C:#??C?s$pW?Gk6z?]??(?2?????Y??m[e???H
??????s4!
???,?
l]?????Q0d#6??>??m?'???.??p???=???H?}?8????O6????	?u3???NWl????P.????6??N%????3????$??pi???N????gr$????Y^g???^&??/7?n??z?d@A??H?s?g????X?S?9Jm??u???~?S????8
G>>?o??z?y^5????W??6w??????a3???<???3?$???W5a????6?b???yl?A???$???$?a?qw{???????????????nS??/JG?N?V?8.M.?4/U?;??;R?p9k?UZ0t??
27O?ny??x?&1?????kj???tE??hws????M??6?W??}?m????/??y?CFfHIF8vnzx?q7?c?r?,???$?????d?7????)f???jn???Wh??=??d??c?|??????z???@?@?????h$??p??????@?R??8?x?6K?w-(K~N9sy?g??(??k?Y?:I??&???J?/???;N??M-??lQ????????E?k?????	??xl????L?CK0#v????=	T>Z^w?g?|??kb?3g???????????i????mo??O???-?o?i?R????t??????c???I=??MP????c??QsYD?9_????&???.????Z????3kCv_??d????! D?v?ibw#???yG
m???
mgG?WX?d??d??%????v???R
-??#?m???eT????????-??????O?h-1???hsz2??Ewa??BX???????[<?fQS?\??L?>??pk?6???
E????r7?"R?/??????-S??D??0?W???V?%b@??s)??GLNj"{+??;???
??4?;????x??6??1???n?\?Pn???qw,c?S#n??p?P?ww????
w??V-6kD????????Cj?O??m5??z! ?]?????wXMfr??? bY!???8`2???? $?"?$??8?g2v0;4??:??ZN]?	/?7???&?zy????????????m/u6?'NN??L2Wo~? .?k6+q?????????> _??????P?
???S???D?G????.?mcB???H$?C?
?q?Is?Q??????Y|	?<q????8}?<??y??%?????|?Nm??????????????????u?????1k)?<???D???nMg$?l?u?????+z?!??u-/?m?J,?H)	???h?????{{g?[??.????QcunC??/;??w'?Y	G'?????k?5[~??h?j
g???3??,?@??/????~b??????3?5??F?A???@??6?
:?k?????/?????Q????8?	F=^/W??>?r8o6X(??xDcPk?*V?x?;?X??V??}'2???N'??ZX)??)8?G\???^???0??",??y$z??8E?@?/?Tx,?`???n?????R_AWy??PZ??}?????@)??n?4????tb=?i?~?l????{??WD?)?<g???'r?x???'aP|M^?@??b?<u??J6e??^q&???Z??-v????h???G?\????p?-g%?)??p??*${Sv;??D?(??8?]q??|?????n6?QUm7-N????}1F????1#???D?Adgje???H'?G???^??LF???M<?????_??)]Y??+3?b?*(E=?=B?%??U?+gH??????L?s,?mt??lB?
??:???h?5?k??=i?????D?k?d?????\??%~t???-C????4Q??????Z???Kz?}G?????+???u*????????????Pq?4????E? FH???
???TEc>n????7
E?l??1??-?`?loQ???f?a\????	?4?W?q:???>? ???[,????9???? ?ka?ALk??KT	??)??	 7?S?w???9bi]???????E?o[?+6`"?T.???C????_???\?6?\?=??-??)$k?w?8m*???Z??P8fy???`#Ymv?????4?v[???s??.J????(????????/!
 ?J??Lh??B#???@??}?E?I?i???T?<?5?????M???????I??w??P??O?z?qo|N??r????dv
8)?/Ir????????b?&????d_??*T?%????Y)??99???????5??w??3?q????w?g-?`??B|I?U??????9??.:???o???F-r7??L>?
???7?????fYE
???wS's??'b?;??????
2I??????Aq?J??'????WYF
??/????u???????e??D\????5?{???<Hx????w??xr??
????7?u?$z???k?????9f>?z???????M????^?V?u'I?7T?$????h??9???@Vb?4
?f?2m?C??;?d{????=KO??bSh??+?5????Z????+????T?K?h?8Js:?b
w?W?jF?z?????\ol??H?$?h?hul???CZ?3n9?G?????v([?$???Z?R?????<e#F?:^I9?L?a16_???>o???3?{
??kI$?;G?2'X??l????O???\?|8??x?B???D?l??????$R????????%?%???N???,0%?k?{??@x???q^?}J???F?'Y6:N^J?g????/?__?????_???W!^??@???M?%??Nh?`(???????n??2-?T?C{d?$)?4??????d?N?"y????n?s?&?\??X??P"?cw?l???3"???yl_????q`x????d?^
Q?R?mjR,??,?????V?ZX??a?}??;9??????5??
?? Q??=??????m??-?/??,Kx~??,o????tWs?4a??????Y??QRf>?VP?Uw?g-<_p???M6??k?Xz'?B???e??Y?0?y%?(?????yr????k???:?dY?|
w???????l?#?PA???????M???;?PK???????K???K??m1?k$??U<QnP?RsK?Xa?:[????Nb?qndK-??qU??????G?(0?d??k???Tj?????????c3d?_'mI?;7???E%L'??{0?rf* K6nN?s??O?????4??????<:`?%???
??7y??3Y?,???Ph?X?m????3?-q`?\??I*?????~guM?6w?!ds?P?H?????w??%? ?4L?z*?RR[?????`????D?Q{??J?P?yq8z??????	??LPG???L6,c?]cB=??R???[???-?+N?	???!gL2?N.?Nu?)\\?????l???????%??m?G???!????6 ??
???c7???????b?S?I???2?(?????9??/x]???v??m?????+??#?t?
`8
?:??t????bDYtE??h??????n?0?p??Z"
aV??G+?Y????)?(?????Od?`??")?tK??\=n?
????>{?Y?'?g?o??q?4?P?L????;~s????
??????_
?>5???
??????I at f ??????M?"?<t??U?g?9??X??H?^?????>????2D??X
\ ?/Y?DS"Q?L??S??k??9?0?2ic?d???*?????~?x??>)??4????j?w???<?
??????t?Aw??D?FB[a??bF!?	???K??I-??<???a7????M!???g?gF??r?'???gr#	M
???	?$\R$x??l?m???T?_.???1????^?W?????Zy
?y?r??????y?x_hX??lq8??7P?4CM?"F???T4?4K????!??4km?]TTZN?5?;&?	???f???j????7LnC???p0?tX?u)i??Mk??L?P???5o,?Gen?N????u??Md?O??%??<(b??dy??0~?;???I??(????W?}???rZ"9?&	?G???wD??Y?????,?????3????M?
???XR????????P?$?/(??:???<=?$?d^4F@?q??F>J:'??3?b???[??) B??}E??2'7W?WYS??8?S?Jk:Of?5a?n$?@??J&j:\Y&v?@???1?'?zJ=M??Dn??0??IU?bD(?z??`??]D?N6:?vM%4Q?????R*?6?v?!?#???#??Xz?=??uwb	?-2pu?JR?,???`?p?"x?Y?4Xp?*?3BntN??4 D~y?
Z??~?<^?c??????:9X?Z??C???d???????b????Nj???zLxR??M6???3??pM??DHf?h?j}O{????J
?U
|???0??P?8r?[?C?|?Y5?Cm.??V??(?p?G}x????t??M?o???u???????j?N}s??~??????[?C?????????
?yy?V#|?o]?f5T????>`%???V???/????o??Q>s?K:qK`{Q??????-~C?5????Bq?????o?????=m]>?^?????
?????_2:2??9?L?!D,??????? ?;'N???A??
???st$?_??b?6?u??????bIy?&??}?????F???C?I?????a??H?0p???F??9%??m?4???T>??W?r`???^
?s?\?w.???xA&?????G?S??.?Y???c?<s?6?
3???M]??$?UD"M??y?Yd?.??k?v????NF\?elI?k????J??5FI?#????p??L3??d+?Q5??<???????-?????1??X?!?6?:?U?H at _^??r
0b??
?$NH?`??5?
`
}?3?????$\???C?F2?0e????
.?#!?D??cD?QYM?g???DZ?????I?O? X??j/WgJ???8w?B~F???h??)??}???9??/`??(	?????O?>????3????`??%T<v,?S
???2??w@?Ae????FKK?@???!
??
???2??FV7I'^+?o??
?f5???a?t??%?!???i?i??K?#??????M???????~t?d?s??+?N?p??1#??G$>?vz|??FoIJ3????p??5{?Z?M?>{P???Vw?Q'Y	?????4H\:??;[??2??&W???i???6??,?Iw????????????c?E}g?N?w??u??^??\?F [?????+GD?$w&?8O?O???Q'???d????l?4??k??9`???8fT?f?#?????/???}{fk??`?6>;??5?+z??V???S*z??(?nqD5??kv?~:?<=}o???i@???=IQ???[??????;c??7??'"?
?Z2???????W?o/?Fr??9?????%??:?0r???[??:n?Y???[0??m?4?
G??g\?Fs7_??@?*???s?'pW	b?{??8O??&???????v?n?8??77??C??92*???>????.Qk??????????m????-Hg?w7?n?????O:WtR???????\???K?n.?u?N?s????~??????y????s???1??~K}R??-???[?l?4?z??[?v??tg??m?Q??1z??/??W??*-l-??=G??D=O?a?'|????x?=bA????Z?~????~|?????o0?p>(?ws?????IxG=?9-??vw??1j?Sh'?J?;P;EZ??b??)??????im??S?J#?????fI????????i?R??r??{?*??+9??%?E?
3??(?`?m???mwp??ayA???gt?K????<3?^
?,%???u%??$?n???+??i?i	 M????I???:???????#N[|~??R?4?Ey#?k??????,mo:?N/?????~~?43"?0?KN-??^=_g?>??^?)??55~qr??x??g?oN?J??\?zY?c[????^?t???????3AW????u?uwo?9??[3??[???T???gR)U??9Rj??2)~d{+_g{???t'????=?93?????~???D??~b?%??????$????Oyy?HW?r???V?s?SY?????hI????&b????????W??????{??sM
,??n[n?`0?????????Y?X??7FN?({???ZW4?t??1}^S?]?E?
?????Meq{;?=?p{
????m;_????CE???????O??U/?~g?)..?W^???@
?\??r????????o?O~kz???
?wcK???!i??[???I?|??????
t????|^?)/e?X?P?l???????"3??9B????2??a?6)??irs?V??R???????
-????c#p??S????q??\?S?????B6???M-x[?Y]
?4t???D?I;?????M???@??(??p??/??Op)??????&?8L??~??Jcz+q??C_???f4?5??O?q?=??`s????"5???hh{zC???D?????V2B??????R?hJZoLm?1w???n?q???kW~z??I????r??8v9?
Gxm??8???945???.??lR??7?????Iq???????\?????l??o?Q??JP????p??'?f?&??;????@??q?.???kuC?n?<F	????Q????/-}?8??9}q??Ps?!D??f?A?H??G?g'?_?\???\??yoN?Bz\^J??F????}?????|b??_?>B?'=c?N????
H??/????? ?#??9??k??d???TTO3?]?!?,??T??4?+c?xL??????i?Ik??%???/?}??3?
^B???8?p?|?Z=;?~B??_/?o?????????????0?????z?VTYwP????&???Z?????qX????m????5A/?????Whc??#???[?xb?K?S??i??????T??
??????Le!1Q?)??e??^???tt?????XC?5?G?D?::e?H!}????q??L?f$g9??????????M??P???W??
q???????:??P)?K2T~X?"$+?"Ob$??o-?`RO????5Mr???2?6??2`g??N%?/?8???X@??e?n?2W[???6,Y??'?8ls\???????O??I6
??? -?t[|s*- h???$?H?
??y
?T????T?$?@???j????#??S?D
P?bv??r?7???E?`?????K??@?6??U??0?L? <???N????=
?}
_????fd'?p`?????G????>?T?????d???M3?K+??g?d9?`=?hj??@7hu???I?Z??O??'#?&V?
F???)??H?t6l3L?U?
?5?Rh???*M0????Sz?@?|f]^?h?_$6_'??-?S??{?WR?F??Pr?I\??D???	m?\
???
????$f&?oV???'K.?o?8????1??-??85?S6?rU???2?~?,b)ZY??T?
??1?Lf?;?s[??!?.'E?([]*=~i_?]???Lr?T?>???Rxz???d?l?pbz at uL?w?[??b?n?; )M+???V at +??#?aF?X??:4??d?y?[?;?.v%???M??8????5g ??K?@U??????c???_?'??I??{???PmM
f?9&{)??!ilOY????R!P?.???T?"?X% \'?Hh.8?0;??V??hQ??o?6W6???;?@??TT?mNR???????????????b%h(??????y[Z2??"?z??)[?hEeic???v?K??]??#$v?(???8????/5?U6??? 
l?`*?LW?v??0rh
t????;xqy???F?P??l?q}??? ???????\N???Q*0?f???J?7??'?????????Lp?^{#o?xi?_?uI:??j????n?>??7W???7W??`?????GG5?- ??
???w6_?":???
?q???????BDfJb(?'??k?W?r??P?????P???????????r??VL??'??z???J?n??KR*??????!qZe??R?,-}??l????%1???8??!5?Vf
{?)~????!A??Fa?Ed}!??^e?(?~?wwKId???+??1?6????.?!???0u0r
"?]?{|?????)_?U`??_?i|?????=?ww|XE?W??4eQ??f?pS%M?????:????'f??,??K0???S?N[??|B_?Cl?N?m??0e????%??
$z???$QE?????n?J??F0
.??8???A???????1Plm7?D6S???J??+#???'?BZ?????g?E?M/?/?7?)??7??kM.
zp?/|????L#0?l???/?C???q9?<?
I???#rr-??eg?IV.sP??K?r??#????L???0?8?N??]7M??U?kuIfO?_8??(??Q,?<?!??H?A?QL?
??	$#s??+?
??L?m?f???Dr?????Mnu?5?+???:	f3>i?2???H??$????
)??s?AO??>??~}/8??eY?)Iw??f?B??U??E?U???v???!?.??y=?????4W????n?h?W????
r)?i+???,?zC??d4????k?n]|*???L?;????V:,G??5???????????M?R?W?4??????m??ndr?G?????>???}j#(?on?X?O?d??oYv?K*?a?m?b=?]?I?AO?g???d?@???Q???m?????3/w???
m<??????LX?M????^}??=y????Z???8?t?T&??\?I??Q
?
{WB+~???W?T???0??KPj?$?T??
Nq????????V??!???RE????? ???&??U???"???7n???4????p?o????V?\o?????`O?8??Hs?"???&w?Y?XP??d&@??Nw??8B??_?*#U^???|^!<?|????g{0?vMS?TX?2??I,????+j?
??%?M???k??6????n?)????d? oN?8??I},???wL??H	????c??aU??On#it@???J??????z+?????Mn???,?k&fO????3???0=??|??	ya/;???D
?????s???O??|??uh??&?3?l?2?^V??9$k??$
D#H}??GFx?a?}??G6?]???????$??ak?????x??$?r??Vy???[A????jv?X?d?iT|Yq3p?3?	*2?=Zy+?H????u?5}:??????{??a??D?u?I??a?A?QY3?????'??g???4?c??r???0?m???c,?????>?]?"?Mfc??<0_xuz?&??4}?*?i????3I???D??k?????????'r?|????wo?5???>?`???#N,??{I?I?|i????627?|???yo????
????[^??7?@???+??'??????????*?K?/&N?H4??Tdx?|{?onoO^?G??
f?z??7\?_??????????-?_?!???c9m??b??[??V?:8??8J??L?????(?????;?h???:Q??]4???x?
F?T??S??foz?
hr^????~G??????m?e???x????????:?A
>?_????i{e?J???p?\?0?&?'?V&?o!?'??|?????n?F?V
?&)??????cK?c>??JA??G5X- ????'?????:??.?????p?
?A*??ZI???[??kj???hl?NY??????a?	?Ww??~????*??`????[ErGWct>??*??	????u?4??v??_????m?????3?+?]?*?? {?w???%l*?Y*5?={???A?r??`??:"]?y???q_??T?
??`??????w??m0??<n???j?jiJdoi?K??i??????????OK????x8?2???O?????@???~V???x???*>??5?!??||?z?S]??H7g7oE?:????#Yh>????`?}?y???_%????+?????L???<?<?????>??????H?Z?????\?-{?H?A'?????x??
j??????E?????o
fw???b<?C?(???xH??M?~??crj?????t}??;?:?@?,???|uy}???????Y???????Q?%??!?<i????????? {?Qj??lJ????4?
?????\u?$9?}
?Q????#O?????H?V??B?W?]?1????E?????????k???d?/:6?q???fk?K8?p1?H??oG??Q{??MF??%p?J F??2?O??#?'\WZ?!??]i?_2??xx}k!r??K??t}???`Oh&?(ox=??2O???Qb??#??T?KL?O:?$}I2????????>??????????T??Q")
???!??D??&}?c?t????3???????"?	7??~?7,;?mYj?k at d~????y?p???.}??&????????g?r?v??)???-?^??f?p:?Wdv?+peG[Z?s=?9???D?z???????|/?Bp?/??C	w?w8N??????EU:T?$??!@?x>????	
O?6mx(D??,?[9??f??3
???#?('?d6.???{?D?{?C????w??????}*?=?.??q?X6??????????]M?
??b??P?
'???He????'??c?w?SN??G?~{s????w??`QbD?Y?q\-?lw?j??r????|G/Y?f?B???????
n(?\??[??v??~~F??W?]?3??}Qz????N?D??w????6??4??????'??">y???a?3!???mh?.????????i\??(???!??^?
???<??N?*?? 
?????_??3??v??^??lnn?7iG6?{?P??Z:???????y/??;X?h7?W????6?????\?'??o????m??*???9_g????#??o!????*I;?,
I?!????
?4`b??9\?
<AR??????3????<??'?d??????j}t?4?~?????4?(8?J???q
B??rT(B??v??D
?`???!?7n?C?2????????.N?
????]??2W$??m?????12?G?5
q?%S?q?"??x??nL?7??pjc??^#<#z?f?*??????G??&???l????5???
?Lj?,
??5+??j?????B6v???$?wvzv?.?I!???TY?????
?kh?Js????r???TW?I?????~?j??????q???p@??X9m?OsuT?n:Q?z?C?W4????~<?5?#?i4???f1?jgr?$??f?{??|?8??z?????
???CKY??Z???<??S?l?]??)?XSVm??)????r?I??0?dWM???%???f??6?[K???M?W??^?N?_7*?????[R!9:e
??s4?????/ BY?A?5?'\T3)#M-aU2?'?3=?N???w????R?-?x???\?.?"w8:?^_????Gz-hN?????~??`??aT??GD?r???R???????h-?????H7??P?f?Hj?4g???X????????x??J??
?Y[?W??????,:???	P+M?Lv?{=?qI?Q??L]8??Ij????x??????L??/?J?7???????<H??7t?[3?????????'?)M}s????!C????????????`??FO6$+?;?M?6z?6?"???vM??wg???'???'????????y??~?df?~u
c?????]k??["?|??????k?n??p{S"6??R?C?Bv?I????"<0???K???"b??0Y46??Ve??SeS
GL@>?'??Nx??.?[7?N??:?9:?d4p???rW??]Y?*?2???o?Ia7??i?2yE?>`n??????	? ?&???p????N?r?R?"4???Mu???}???y?S????0_?&?^?l??6	p?:?e*?qE????c??????lcv??P?WJ83????2?>?8??m?07F??#?y+?[???J??.??';????${j?Nb	?3??}??FFTy??Dz?I??~?]?T?????7?<?????&BW?????YQAF	?}????????Z?~K????3? ???P?)??l%?$?????0n{
pG????????1?????^????v~[??Ro?Mk?v??T$?P?L*`??V???5)????????Q?
?M??F??~??\??;$?G??0/?]??z??IF]
??????pI?5?#?????H
??p????'?T(?D?????????????%)?Y?y??&B??;??qJ???oA?D?q:k4;??^??/?;??,V'?V?x??????"???SY at h???=3?}?w
?T?s??#y?????k??????8h???
?Ma?a?!$?C?????jr?L^??????TJ$7=V??aW{????nR?PC?f@?????'?????|C4q??Q???m??C???[?86ou
??Tk??f??????ts?B?J? z?ui1w?????:?<?:????Bz?L??HXHIY?c?$[=`??
??1?OF?&+/r??O"?ox??hf??_DW???I???????I?.?;???	??????!?=??E????x??iD/?qr?Ho?r???????c?L?R?????2+??;^?g?)?&????????Zt???O?g??????O??????F/Gq?99??q<??o????oO?oi??????>~?^??a?6???u????{?	?n?????A???W??a-???	?J`3?o???I(??@\???????.?|?????gt3????l?-????j?u(i?6:J??}W???%w?R?H(??9??-?????yR8LjG??q?D??}R?????`'
?Z??????$?7?]?=??]??_]I:I?????????a!T??;>uF?????	?,???%?TO???*?Sd?M??C?U?
??)?&??4q8)?_~???V?b^??Hd
?!????
???5?.u??b
h?_???5?????y???"KK?+g%?&Il?(%.???????@??GV??)??md????m27s??
????I??1?2??	?^???.yaA>??!?\n???????????V;4tILZ*_'.????kf?d5???L?????}8?P?;5y??Pu?8?FD?w?D??!&X?O
??7???????+<*?N
;?B?y??k=?x{	9????G?}?Y\s??2?&?~?{????WGq???????:=???G?T??-??o?M?'L~K??f?????q%?7K?[?lL;yr???DZ[??????>f????7]X????????????????A?T?7??D?`?CZ>^/?
??????L?;????>*J??fK???/???8?????d?~VP????J?b54?c?P7Y??L???????c??--,H3??q	6?P??:?r?9k????1??R{?T_?
?+????-??4?3bE???.???1?i?rk3?c?Q?[uRz??EQ????y????
??HH?&??!???6???????>?A?^?)??d??/L<?
?C?{?@p??????l???g? ?????`??&????9]H????v/pK??u?1????Us?C
?`
(G^"?f??gi9;} m?????3?+H?x?????l????h?a4f????
?<????zb`Hu}h??<????????y??)-?y?'F??????w&?K??? yH????h???({u}n?
??*?^?????9))
?????f?
??9??\?,hbg
J??7'kL??qn88q?s?]/(??X?I?9??wj??s?w?2???:7?{?4?UL
????#MN-?h??>CE???q? ????p?;z???????Nl4Uo??DM??	E?A???/???h?9a
?m/hM?????y??Z0??7I?#?yY??r???f?
??7?w:|}??`m@?#??IFc??S??0d5?????=??#???????N?\??z#?`A'????E??Va?7?e?? ???o]/?qdn?j?A$%o???
[...25760 lines suppressed...]
?e???t?"0?\"9 ???I>1??????H>
	XqONpONpONpONp??!
??M????k
???I|C???@????n???iIk2??|fI???^?????P???l6
;????q
??1??
r?????t7????w;??$????S?????rKHIx#$+??&P?LY?'?p????{'?Ho?Z?|?X????Y??{))0?7?(???:&???7?<??gn???]\?].??sz|?=???o?I????
#O????H?
???D??#???+?^^] 9?
???]VJyeXe7av? ??]??F?p]?z;??tb??ql??????	tt??Z??P?z?C??y=$|?
?8Z?P_?8?
o??M???#w73c?????0F?)???KP?2??3?"?S?????QD"z?(??\?F??c^???F?	??kA8jEf?bO??H??0	?
@?-??K{.a?Q?p{?l?L??RR????F?KS?|`=?@?0???"1{?0PlofC?(>??8S?o?Kc??LF:???9???3:!?_?o Qfs?A?B?O.???~??>???9???M??@?z????'?	V?7?^???v???
P?8 at a?:$l??_?????uOT????2j,.e2??=?aB?Q??A??-c8
5U??
?t9H??K	_M?6??
qv???[??_?<???y.k?~0C
!
?o ?????@?]x?R??	?,??<????4????/????*?????|-?lx#?z???????W?tA ?"?$?H??I??
?0???Zl?"d??6?$?N??;?????aK?p)?H??}??{???h????W??D?Qc?H
?T??
N??????@%9zfi?l ??Ud?????????????9y?2?Y??Z?
? CA2,???.?/d?? ?*???x???{?*?J?????A???A??n?1?|? "??.??Y????{?F????C?z????????i>??
???q????_?F??^e??9^n?Ww?Pw??vN7c1\z?(?"	i?$&?Fh???&?%CO?3????)??
 ?]b??7?%?d?
??j??g7*?R?9r+?a??L
?????:>?T??0?X?
?
??RQ???X??!j??????`?yy|??????JCj(????C4????
Z??=W????'??|f?x?????G????????U^????WC??`?C?Y???V7C?I??o??_?N ??E?l?"?2\?N??J?bq"???B2???????Tg?.ovFp$pL???~"6<%???????h??3????V?%?_???????H0,?R
??V*??'<.?x?$c?w?i\???f????^?`7?????????????????Bi2+,~?~)?o}??`u[???z{y?????s??k???!j:?-_??'I???0??z'?./O~???oZW????,aPl????????????
?,+	??????????^???????"???j.?KU
u?	-????????d0GW?Nke?"US?y*p@??K?,??U?&g?O???K?????M{P*??^??e????????\??6?H??"?{N?	/9I%??
Ud?zg'????%#???s?#?(?X?Y?H?1??`?|????[l?B1(f?}G??O??#l?Z-4???????N9?4????_???????F?????]?B0?l???=?@?F??A???)?9VAr?h???2p?![k??,
??zA
?:?A??{J??2?!"?GZqw??*w!?z??????Z?;????subP?D???)?Qx?
?cKq??q?(?<???E?1??Ci?HX??&?7??|j3??Q???l???
BY?????\p??e?Id?B#?????_
1}qyhDp}0??????????	?_?%????[?[????=$:??B&?/??\??????????
X%??????]?v??I??*?`f???f??D??"Y???M*H??2?J??\??????I?2???????o??*????\???Q~q???L	??'b?!?;f??k]??.??>\???k??6h?????{?$h?l?N??.`?!???????AZ???6J'T? ??p???\dB???3?V+OkN<Uz2??L,?-?b??'<?w???r?????B/??????	???.G?%?]??3d????u??
????I?=+Q?`_??n?:?#.?k?h4???&w?PR????ak???}?/j>???dvr??7$???Bfj????Y'<?8N<?'{m????????????6?)eNJ??*n??f???/?>?????|????s??l?v?`c??$k?ZVk7?????8R???Z
&?kq?t|?/??a????\?9t?a?4(;???? 
????'??Hh'??9??8g?E??%;x?C^??
?PL?j???n????/i?j??h2v??n????CC??Zi#??????m??PB????3?a???
hU`????k`?-M8?J"?{???`$??S?????a??????I+????cg???+??;?KG!
?[????c??H?!??Ix??r??o??~?Z*5????dy?I/Q???j??t???!???+'St?nV?dD?qV(X????8????k?^??X???????#d>??????????|???F?>?U?G?^I?????[???:zT??????????K???3????ci7??x?	??H???^?YA?k7
?'u????\W??or??{?r??:??+??N#Qd\?*=??$N?G?x>T??2?@?.d%?!????
p?t
????'??/X???Z1??????#???????Z??{iu? ?#c???(?h?M ]?2?8R.R??Q?u?4z????+N??jo?s/??$??h????7? ^?? &????N????`??BA@??????J????G~V??q?-+??????CZ??clDKDp???#/c
Cf#qx??l?N?Z??
?HjnU?G??????x??b??????C	?CX???X$>?.RHu?	??8n??????4W4?1
Kk???9H{lM?u?????????.n?Hv????~O&V?????&???~?\??x{m???~l]]???:??Fo?"?1#oc?3D??????p g???7?U??s???	????\???]??????.[W??????+?????E?]?0.??a$???n	y1???
??-_?qN??????>C?!??p??????P??39{???????	?w?C????A?`U????w???????
?r?.XG??j??,o??]??v[br?@N?_<??
s?Y?B??X?k at j???_C??lB????OG???{?:?A???h1?O?#?F??\???Y???I??0?'C$?@??_?C?????oY4?&??p?Fv???~{?V????	???S?q%??Q???9?????p?.?8??0??ODF??n??
???)?hbNb{v?V???'<?{,?7
?????????|;?Z??K????7?W???????)????Ai?d#??z\?E?KE??8z???)?'2?????F?~}X*5+??k?i?'Z???(??)&i???S2*?h? U?d????s3???teV?r??Gnp}?????D???W-?S????q}&???9???d?j?'?e?r?u;?"?+G??????T?^?v??B?v??%????]?P??????r?d0l$????_@???PgX??"?z
?R?????A??<A??{?O?M?@At???S?m;5bA???T??#?X??B?OS\???h???????"?^?@I?I1????	??T??0???
_????l?g	?iW???????????&???mx?v?Z?l??nz???W?[wi??g#?~(W????)k?A?????lz??pd?w8??g?bv??&o?@?w[??+Y???K????y??5]?`T??8^,????1??????T??+?????i#??1K??h?U?F?1h????U?B??????>?
&wC???jV|?&????j??j
N???_?$??)?S^??nz??V?^}??~??J??????j?
?C??}?;i?`%%?g?h(??????g?)?}????w3?3j???????E??Vk?2%(???????{???V?R?<???7`J???}????0~?????9?'???y?!'?????"?e?a???B?@<$?iM??;?[Yz????C|?(C?
f??r+Z!O???N??:?cw???L<??/?????V4aO??^wR?~Z/?1>???{????????[7?aogy37=
#?v?T$Fb??/z?;???????????;?W??^?_?HeepN?{??Z??;}?+=X\O???Z,H?u};?????>z|?c
??=??s?T??A???CkM???VH?*(????_]V??9)?????^Z?b??4gT?W
E?@??_Js???c?k??? ????????.,?????????
!L?e?Za????E???v8??X??quq?{?
?Qd??q?X;?X?"?? ?J????}????Jn???Q9	5??&?P?)?&k??De??????8^E?????????a?h?????.??Z??t
V%????7^?w??x1?0
????????v3:h?Bs.??	F??1W0n???Gr? ?>???V??
S?;?.:% q<?x??j?l|W_?}??????h&??K??Tx?Y1?^???3???l?V1;#SLc$??7Rq?\??:3?bF\?0?iG????E?<?gEa??9?\?w?rM<????%?????DL???k?[ok?x?D?u?#V??#oA?????}?????q{o???;??`u???~?F???????]??u?)X??J??~d||?+???#??C?U?~?n?U???\o)???.??6k5?J?L?_3?#??\?????;{&]?w???2F???C??R???=?Pl?$?u0?D??[???P?4????A?ZA??84?
??#??J?jt""U???*?w??Z?9<?8?@???5?Tl??sU??l;5?
???h?Xzc??R??C??B??4l??o???Kj??x?Ri?????H?es??P?H?????x?"??]vk??4?I?????h?b??]????n?????s?_v???{s?????o.w~<????<?I?H[(Nh}y?????u??:
????k?????E??&m}???u????H'?W???2M?y$??x???????/??Y}????D???????
??Z45*?!?8??Vi0????????45<{}$???)?k?=\	{?Oh?????aD??p?4???????
??#????R???#??t?B
8??p%?????:??l??Cv????????e?mO+??t?] ?*???ZD?N?z??'?L???????[Yc?9???>.??uMWV>???y???????VM? Z????????j?0J?.9C????C?;?*^?????6??2??f!?
?&?A8N?Ah?????+???87?2????YGp|b?0?
D, ??#?C?7r<?????T?(?5???1U???	6?R????aS???Tc??.????????????&????UC
 ?O??p??6???pyk.?P8?????5v???`{n?R?G)Y?M??T????
???$V?m?)'(h"????i???u?:
J?t??"r?9???????=?	???Fz??>?a?kp;??{n??0	?h@?00?9v<,{??%?~?????-?V??#o?#???.k?#%?~p???L?M	?B??h?!??R????{?5h,???b,YM???????w?~??_/?
??????O?~?K*
??$???A??HO8+??k?!?T?????*%fn?*?6U?m3??n??|?b?$)???????0??O??L?+??RdY??a1h?V?<U1??	?\'?o
B?CXtT??cwg???>z???8s???j??sW&E?DdB=??X?C????BjwK?
A]????&???T(9~????6???:?)??'??????iO?m??3L????s?????G{X!W?^????4?}*/njp?1?????>?8k?iX?I9Eof??}???ogs???t???1?A???la9??"?,?@?3??5y? ?/?
{V/?&?dtlq?????ZdI%??G???Q????_????	???W?f?Z??J|@?\o?
?z?7E0??u?JfRS?"?h?C?sy????^sP*9??cW?t??
+l?????Y??2?" .
?vc?@{???H
X?%??????|???l-a??L???Q?mF2?????p[pj??
l??~V0m??P?d_??y??)?\\2a????????d??h?h???V?z!~+?????????/???O??7??L?????<X???h{?/??a??#'?dZv??{O?\`.&nk?????C???X2??P??????JJ?H???o?W?????X???J?@nW??~?s?J?u???-???=O0?r??l?????w??[?U???gF?	????}????$???E??c?5????(
Y1??W??,?z)?$???I????u-p??!???????n?PD
e?Li?T?CAp$e??!??1????????J_??o
??V???([?n??&?????Z?[?FtY??j?bC`S?P?.??I???????6?`?R????????KR??
z???=tg???x?
?D??'????&f?T????I
???/?``??6??
??xDR??????;??
?d	??P???C?L&I9????	?X???`???)?z????!????5??0B?
??C+dO??aTb??:???e???A?????c?2nI?S???$l??6??
?3?.??a????
N??;?r?i&?;a???G?H?y+?D?
??Yx??ar:????????-7?j??v?uv?{?b[Q#?
?]???O??G???=??v?onz?#E_???RI???$4Hke?q?#?
?B<????????V[-g#S?I?A??xDQ???8???:????????xA??9??!??
?`???s???\????L`#??XDUk?r?????y?\X864??GAxh~-?-xr
?6?J?<[*????@??|?ls??T?E$??<???|???u)??f?E??1_.U?3?S?$9QC??3??`e
???f??Nl?kv????"?=????&?}??(?R_
?P?N]???????{?????Z?#2???4C?V???;]???be??p???????nN?["??d>_@
H[??O?;l??????i]??'?@x,?>???T+??\xa
i8?w??7?z??<?(<??[x.?W???u??'?M?BRo?o??w4??wR?N???:?
?r]s??h@????%???F??r?????|??jLz:?????X??2?L??????N?n>N#	nG?g?i?????Q?p??J?"vS?M!@???e?/???;9? ???a?_Zogg???
4????`??%?n=/.???O????E?T*Qf????w?-M?f?
?
??R?!)?p????>
????8f???Z??C???t-??
?B?k???C? ?????(c???(w?t?plkXbVO?2?5[??!??!V*???Plx-?o)B:???R??s u????v?fC?]\???}??9?(;U??Yv]'????]/Q??g??'j??????[???q*H(??Z??l;??EA
x??kB?.?%????,?Z??
???*K?R?ik?K?U+C#?o8?>???azu??/???ER???>?D?I}?????-??w???u?????????n3??_?Z?K???<???j???9)m81?9???
G??p?~L`N,?????X`????u???b?1???{?????,?tF
?8?Y??T?9?~???{D??????????%?L???	?A(C
?????i?O1SU?cW?d??????x?????K???{#<6RQ??+?$mF?v??l0k?xl0?[???4?????M?UJ?^[C(???.L*????U????????m????p
F7?????W_????M?/Zq???6?1????/u?$CC??.?????-??????????'T?<???????/R??
????D?S4?????6???????? Z??????w;'?=S??F??u
YO?ba?????Gu?>????*???0??r?Zr<????P?Q?g1o7>KT??????L?Ru?IZ????N????M? ??hA???qO?F^??J???r3I?>??2T?????????Re;]??????#??d????b1_?ec?y?bf:_???????o????????y4????p????????VMn???s??a?????uL	=??????ur#??@?A\b^,?=$a???3RO?[s?h?j%GU+???l??"?B?9x%?sgfy???2)????? eD4
.???{?"??)D`<3??+??kJ at 5H1?t?3?f*?[	?=%q_?a?q??d?h?^????$v??????*????*?o???,???????t?6?)?l??.	???7?
???M|?%?S?E[2????r<e#?$!?9?@P?E?f????=C?;???OR??NP
N??%?d\?03
?b???[%??P<?
?%??????*Tb),?
?z
?????P?8!	'?s]v????'?N?J??kA????~
??????E}p?????.SY???p?~???*2???A&??*??l?u???d?H???kV?|?j????F>w???._??????nX^??????~j?<??y0 ???V0m?????S???,?=?zxj??Tu?F???????k??n?????-[6D??D*??A@?k?????]?i?W??p.8???u?g=??y??)??????=??.???,?m?Nk??A????(
.?G??"G??MgjTPPU???L#?
?A3
"
C?0?8zg?{??l_?????>Gc
??e?%??:?Qb??:???@8?l[???$I+_I??<?????"Zs&? u!t
V?[??1?????\??i???????L7,??8?J???????k???w9??]s{c????AIc#CC97??????qD?^ZwJ\R?/5:?=?h
??\0?A&%???Wr??mf???????7???n>??6?n1^?????x?m??o1^??;?|??m?;?p?????a7o?l????Yy?f?(?\?g/E?G??????P'?$Q??(????V???P??????????)???V???????k?????k)??
W?\?Q??!?7r}?!???\C~}?Bs`???^~Z?#?[[
?/??7???n?_?0??5?Qs??h??x?22?????/?l/?
?b{???g??K9??6???H??S]1k??R6YJ?+dF|f????	???V?^???U??90!??x ?@???????k?:w???V?F??????5?H?E?p9???????&?n7aw?	?1???g??????7??|@?#x?8??? J?#???R*??
??(
?q?2??m?]o?v????6????v7im?{??qo$F??1j???6,?"????8<Z)??Z?0s(<?8u?j??bu??X?v?Ie?E]?????(?D?ct#

?&+???!?%??????????[[??h?/?&?J?
'_??Ip?b
R5t?e?
?]?????
5????27E[?&k??
?e??b0
%????^?[\?v?8??D?%?R;"7R?(??z?6???M???e?
GU???:????^B????(oSTV???a??Z??|z????(oSTV???a??j??|?0E!gb??)JQ??Xm?sh=7FV?w??(B?m??G,?l-?v?
;^?????v|'????~???cn????)p?|:??y$#???7;+n+2?r]O??o?????????o??Cl????1i"z={????-.??H?K??Z??E$c?=?"??C
 ?%??JI?9:??X?w?&??\????~??1??[U"?T
$M?qtT????j43??<T?7	[??^????W
???	?#-?2???{?G?j8k?I(?ky?S????<?<
???y??|????????e?`?~u??h??????t
ca?T,??/??gU?rN???v??JD??f????x?[F\.oq9o??[???4??s?U???g?M-?FP?p??	??YV(J9???h?_+????0?1Fp??,?w??Z?;?7?i????)???????m&?*???H1?_/}o?a;?? s???[?a? \;?S??Y\k??66??q#?j-e?'?%:??-?_?8??y??Ru??O????b?`??/8???? ?I
?????G?
J?)AR???????n??
?Q????W???????????0????Q?8?l??\??.??R??3?????
????sg???l????ba???O?1n??????9|??8?????/?4????c?????9OH-m a?qD@??V?^@????????}?m#?s???A?k?:?r?VpbR6k
???????????`???F????n???I?{?B{?_kz?{HA????uz?/????!??`?C??#{???6?L@X
_M?-or?Vwx?&
???????jp? ?<lW???rZ?m?Gn?p}?Y??[????9w??:_???2~ryr?7t??Y?	A???k??.+????????%???}????????o?}?dk?	??^Gi?lf%??????1?+!z??)^4????
k??~?????-[??/)??o???<??F??Yk??<?d\#?P?WE?
|??c-?	J??=>?_?&?y??r?I??C?i\Qo??????,D?!Q~??? e!??,????p?\?	???9&,d??9&?y?s>z???Y?????}??d?MwZA?IJ????BI??q
???y?:`C=?Qp??^vt???.?? E(??p/????U7G????6q???<9????x?m?#???????Z8???4t??'?g??<o??D?5a/
k???i-??1Xk$???F5?+?U]?hb??????0d???p??lD??<???b?7(_?4?O??????r??O????RM????r/Re??^????3?L????????^??a?Zi?dG7??9?g&?g??=??mek)4???Y	??Y??|?g%B?g?8?????h?MRe????;???4?<????????4?X5?m??&??-??8?goI?????(???????
????@
X?}???3??' ????[??????Tx6?
?{?1?T?Q?T??f?fk?]?T????>?????~P??
N??j?uwg?b,jT?vv?????????S??	cK????,VtO??|@??_ ???GD?????Y?@J??K6???B???f??????^??b????p)?A???.zC??X??o?yl?%=??'>??-.-??????\?;?]p+?G+?~???s??8`????^?}?r ?????LV????!:?0 l(p%?V??c?x?L??7?y?4!??:Be??t???????q?Z!??MP????#c???A?b????w??????t????N3?????j?3`??
?l?,^`?=/!\?W1w?\&d??}????8R?t??0???63x?????x???Q;1??b?[?9?0A?/??e0?k?`dv?KF!?\?hT??????j?6li??Z??????R/?N>??q?|w??f??^?????2???x6?/?????/?e-?????????%pq@!/bB?[G?yK????G??????VP#?f
????s9?????$? ??*QUW?!	?2?>?\???2pT??v7?s?^T!?r?H\?zN????~`?9 $?+? ??8?g??@?Ydo?~W?
N??/?A?5,??<?0?}~rq????:???:a5-????8u^(??Z?'?N2??:i???????V??????Y???O?H??Z#"?W7???Z@\?3o`??k????%??.{??b{6?>f???a?m?Ul?M??O??????$????????U????{?????@>G.?x?Yp??T?\??a?k~@i5?LDLx)?^?1???Q8?hS?K???q@?m?????? ??R?
?;?kOHkb???)??ba?X??????U????!?Q???????s??\????Y4????D??p?&C??@s{???=F??pQV?"%??Ex??_????$p???0N
B??Q~?*????????4?nd?g???|?
???x[?????Q????????5?7?,^oNZ?u(*??*)??_
?????o?q???}??J????en?2V?eU?z??6?
UY5?^|?????{??M??X???h???CRn?^#?k???q??n???-?M:?59?%F^??n???0?@A?f?-[???9?:???y?@?UD?%Q????Z?l??	uQ'??p??f
?[+??f??e0??6?D66?	4r?31???<m?????af?~?????a#y???Z)???????0?????[	_?E???k??x??p??>?/(??J?\bF1?j\6??L?Z9???
??V7D-%r??+?k5??ei??????J??Mt?`c?k^?S???S??+j5?? ??N{Tz`h`?.???)?Q5???T??=?_W"??e?q+?+??=???UVn8f??????X??.V#%,,!9?t?vmc?z???
?Q5U??VS}8?d?h???LV???+
??]N?????'?B?_o?????g???????'??{???????b?)w??UurE?J??<6??9??????=Q?7??c?7>?_?????:?0m$Nt$????C?*??A????????
s?&?Br?:?z????A?J?'?@??PM??K?d??[>?Z?@q.#?????l?l
??9???P???(?J?z,?
|?/??????^???I???q?wyuq?y?S?9?&?`,\!?5xKY??|h ??:????
?D?C?7???x??????S
???{ ODk
????y?nT?0R(??6I???Rwz4????j=??d???@???LvWz?J
?@`???{?^|/??d>?hU??p?`?8???N?V??u??z??[?y	?[Q8u|?9????q??d4 U??}	?X?Y?X??J??
???#?f{????_?yxO
???T#?x*??^?M?wn???lx?z?-???z??j????{??,??*???"D?/???
???q????W??????????;;{?:Z?{???]t;??c??9>?^?i*?t?.jTs at ZI?
!??z????g???Z!?,??)?????6]c???????V?
?0M?-3C??????0?~?!?????????????`?-}?n?6???b\??x
???>?nXY at 9I???????=J;'?A??@?@!??????3?~?:??6???????!?(K?l
A?\???\??(???8?~o<".K?Z?{???????E'???ey?`?n????WWo/?at?t?????F?X?W?-????_?????U???v?a????)5?
??{?c????????_??o?Z?A?dFh ?nT??\y?????Uh??????y?#>b?j?????	??>?| ??????'??q????`u?Q??:???Uj=?????????\?*
????=?Or?.?g?|?=?C%???????{??*????
?`????xV?%Sl#?z.i????=???/?!?????d?@?/???_??
??'o<AdQ?v"2???7??&???5?]\
?%Z@?}a????s?`???.$
`ZL^;??I???s#??R1TK?1???i???&uB8??a,E?"?e??e????L?????i42Y#?p?????K??)>??y<$?E`S3??o??B`eW???_-??[??A???m???DVn}v?t#G???????>V?????p???;N?X?L?{>???=*M??Wi?d<??????a???????-??YS??$T?????f?a?M????:?w?Fc
]^?"????"?=?,?q+I?(??w?]?K??3?y?0?b?D???=?\d???????????"????????????[?6??
??X???^???'a&????_f?[????B??&2}?U???ub???}????!$??&?f
????u????r%?
vY????~??
??L??
#l??G??[$Q????????????F??Q???r^Q??3'8N?m?v?T?,?~?Ui?3J{5??K(???<?:ka??^/?pO??k??h?@????
???^??????????9??<>m??g????O:-F?N:?L9VF#??@b?M:??????)qRO	[
???%#??'?K??
?S??????+???Y?j??}?<?a??]Hn'3/???f??[???B?]>?$?m?:??>9????R.?Z-?Q??W???^?Vb+?}?E/D???E?????V?21?V?}?? HH$???[o?1W1g?d?
?{?}??!???w%C??~rC????V???n?#?????c;?????m?
??8j?????k???Y=\w??~???Y?}?#?U????S??Z???W?????
?D;j??{?2??+???c?????O?_b?3????J?"?u??{???z??sF?
?"?L????v'
mH`fh?qhNxh
?1??????ewh?T_???>jl?F?Gm\?yf?c?]?????#?l3X?V??x>?????D~?x?*?h?3?G????"??%???:_??k
w??????<??c1]4???!???b=??g??FJIm?F?TU??Q??.?>LV?5???U
??x?F??>?B????v??l? ?7Z%????{??bHY);?j???l9k?^??N?\??Ky?K?Y???WH????9&??j?{??$X??'??(e4?n?G?9?10??P[7?TL?6??Day~????????)???T??;q???+??{|?E???)c???i)?h??mKC??(?$-d?h?[??^??Qc>6F1???$J??????R?l
??ml,dj???,??T??;??O?r?r????Z?;CH9?zu?????"4?'????5C>?v?(RP?????h3?!|
?A?;?h?1c??L????t?(???
?h??/??"??RL?Gu??z?V?b?(??8k??)?6???K"q????|d?0?b????5?7$?sF?????1}?b??$???Z
?&R?F?<?????P????g???l]??zGo_?j_??~?nw??l??Lx)?B?SN?E??J*???<?Ao?/??!? ?&
???b?-A?#
dD????AV
??l_u.N?iR]????jI??q XM[
??????2R??!??3?d?u??=_?????W4??{Sv???h?M?m????"?/???'_xI??e??????y?k{?A??_E=F????o1?N?np??????b?????????{?7X?? h!???O?????7??f???@j??i???:>??y????????i?TS"?8?f<? ?I?<????
a??&? ?0B8?0B
?#?3	#????p?0?$dM??Q????_????KM???????@?)??d$|s??????z?[??;?H??=^?Ce???;_/&w7`?C
t?X????????-~?c???u?????ela?lds?Hm??hHo?mv???/y5????P?ur??)????JrDl,?Lz?????????~?$o????N?H`2!} ][???l)?`k???(??^?\I??(??J ??
?7????????i??QA?V)/?4?d??g0???p??
?????|???6??BR??"
?
?????>?ZX/???\sZT??????
0
?/??????????y???$!{F?( ?P?J?4?
?A???h??|?c????b???*J?f?X?????9?#@evE????????????5gg	,??@	,?@?????=<Y??>40?|???sJ?n????h?z?/?~?0?e(?
??????&0?
>=?????+
?????????'`l??q???????w?'?p????tS??????I?%?:??t?????$>?7??????????WB???j?
???????O?N??Y?p`??^?????/?1[?Y????
HEb.,?i???
Q????*??"??Y7????/??K?p'!?????????q?|??
??0????p???Hi??m??ON?Z?xny??t???v???wiEz??
8?l`?h?(???[4???~Z?J&??2??V?lu??|s???P2?]??????>?^9? t????^a???#?K??>q?Bw?,???????<i??ZJ???????K0?2???u??*0?/c?9??	?????|?fo?5??QAq)	???
??????????<IM?^?
-m5F=?????6Q? ??$?W??,?W???????H2$K?^?w???^Q?K?
j???
)!j?VZ.D?	A?X?,???@\/?CFG???)?^??x?R?c?:G????h
I?W??y???????????F?????_cz????T??=??????P????xf}<BVPV?V_f??R?h?|???:
??''??|??&???]???@??m???????
?%??????W4T?z???
>?&???????I?y??R{??? ?i?Vd??????$qg?JI??O?????t#P~???JyTf??????ce ??????
????x?????
??Eo?G?h??????6??t?H~?PxL5??)??6?
?fS|???Y!U+7??t?V??%??|?c5%Z??3o?@C(???|?Y1+?3?l1+sR?x7????rz?Pb|???????L7?Wx7??S??a?Y?
??/??w??[??\vW?????s+?A??pK%o4*???|?

o- ?;Z?4j8??F?b:?&?B?M?-?0!	y???A?5??R?_?~#+
(i((??6?;???!?Rh	?bx%??
?,?&[???D????9??[???:?m0?u?u?<
??O???}?>f??:?<e???[??????A>???KJ-??????????
? W?d ??~
?
???0?????N?
NV???k?i???n?{u,rt;?????m????W|??}3?Pn????H????6]mB??(????W-
t???_??C??d??qm??s????s????????3/P?q??}??
!W?l?gg??`?m?M^?????}?u??d???)????(?;G??_???F?x??p?>R?S
?xSs??UZ?p+??@",???8M??p~S????^????p??????e???5]?z?O??(?qH?L?7??
V%??L???I?????y???uG}?]????G-??F???3????A?Ky??????E
Z???g2Q??z?0|?j????f?(
lO#??2?,7!g??^???*?R??????U??????6???$p???(?????????q??Ev???v63c?b??>M!&y?F?A????d???!ED/r?b Z??????|???
??R???p?<E?????H+?;m?n??;?????r8^Q?I?L??%?0Y??*pZ??U?_-??j?_
3??8?4c%;b??<????
?et7?Ib???&????Qm?r??n??E_?8K+?3B\j?TOGa?qK???Lw? ?5]???;I??H??1??LKg<?????_=??????C_?Do8?:cv???0
	`???P?<??8
????*F\Xu
???uP:?^?(6V???M	?k??"J???H?W<???
????
??&???L\???s?&??8??? ??i5?T????????R???
?_N#bY(J??5K?M????-?0P.??/???8?'??????@?F???,??$?b?vt?v???8?H??6?*??%??.*R
I?_
????s	???{5y??A
1 ?)Md,?y???
]}?4??Pt?^??L????
??n?\??L?EVXPu0??????8zL3?t;G T?E ?1:VM???C.NV?|????O?o?????[=6?Z?S?b>U??S?|????
=?I???<?h?s??@?Kr
p??DB?l__#??????=;?w ???_t??2?C????$?8ea?>??O'&Jz?oh?WW?????#?? ?+v=??X??>
?$????JuE??rHa<?(G+?????'usI?[$?4?a?-?}?
z??1???r?-?W?6??0u%???'????+	5I????a0.?y_$e&???:[?=??WA??????????hB
?2??????????s??????JA???????
!????'W]-??1?(o??f{{?]?Iq???O?????E{-??|??????N??^??dT{l=??????X?v?d?$|??#e??M?G?????:?Z????q??9d?D??6???Q??V??:?#?)evV?%?=C???u?D(t
?%??[*??M?4?(????JB?re?X??G&??????Nl?V?!6?
???muq?/??1P?? ?=???????'w??u=q?y?N???dE????9j???????2q~?g?Y??????4i????MZ???+'m?47\l^nx?Q????7?{?s?M??j??T?q????D?k???a?????~=[S???)~`M1y
7k?? w?S??B~=z8?
??????O?[?V???x?>m???w??a<?????(?@??M???IU?Ul.??f????O??}fC??R?1?Z?J?
Es\
X)u	6?l??2z????g?????<?????'H
??r5?_???j?????????F???Q0Fx?'R?V)?X??Q???U?P?ERf?p?V???4???c|??Z#R?4y,/??????Y?H??a????a
}???iQq$?WNo?4k?R??cT?"dS/`
?????	o??t?/???	??>?????5%a'?j???xV)??^?????R???0??????p????]75??9?2?]???????+?}?so"_?g?W?%??W_O??0?}V?????=,??<=?????`:
??????^???9??r
6kT?e?????=Y_?Q????? ??@a}8?^p0????????q+'????'K?R???@????????
????o??????A?;K??lT?$n??l??v8?\^]??n?/n?J?H.FY??2[;?H?I?-????|(F?D0$?f???1??9O??Ho?a??I??a?w??Y??QrH?^P1?|5?????Z???GI?V|??:V??"~???L????9?Ak?!]	?"?/	???v??????r1"?n???x??l:'?+s5???H????[??X????Bq=:yv?kyZ????8xR(?????05???b???D??k	????}??g8U-???S>???????r???I
g&?*'????0.???U?????4&>????2??q4d????CudJ??cL8,nr???_??~?'%?Ft???%???A?????x??<?y????5?H?o!??K??/?AI0\x??????d^????g/n2a??]?j?<(???T
?x??.???Ld?@|"??????D?R??7q?z????ppT?R?????JR-?g?Ejot ??^i<???E???}?u?u.??7?S@??{?????
?_<?gtl?M??	???????.?S??f?t>???(A??????	
??* ??J!x??c???)??=E??g?=??.?y+C(CK??4?.0j)??0?`V??HR??l&J%?>????#FR
?"G?o????}y??sL????e?$D?d>?D?r??X)?R????h<??q? ???A?W??u??w??G??|Q??;D?????j?Hn?x?nq? ??5????G ?P?r3Jq2?O?'?'??>0?{?u???ze{??Y?>??H
>m?????????t?_8?
???s?j?????Q?H	??p??}?#????i?????n?G?9y I?l??D???R???p?8?B?L)???@<g[*}}??ua?>??z???d???%?1????*??XByx?to??
8?d?3??-????F@?tV??r??}?
?GK?	7a/$?"WF+???????R?BCDK	
r??!W5?????V	???i?U?&w??????ec????%???t?%??<`?'D???ZBA???>?????8???Nr?????6
 /<?-?=6?AyM??
?E???gr?X???@|??V??W^?3?k@? ?????%p??p?#? +?K/*???L??&p????o???J[?k?MU?Q?I????b?????-9?????jY-U?????h^????`?_s8?(?????<?????Sx?????????C??-n%?? ???Q??!<?a]?$????G??P*G4????a????D[mZQ$????&Y?m6???y?"?F2:?@????jB({????w?s#)d??^?LA=???MRA??C%?????
??[??#]??Zx"?ZNH$F2L?B??G!?4?C?????ZM??,A??r????????B?????????????????#F!Y?Q5?Y???&??J??-??*?????H?s????2??Y9?dQV????'??????Y??>?B?????
--???4?q{??????}SoU???_???R?Y??N+?&7,5?
???'?#;?C?L??????E??????	#????N????;?L??tt?dG(&???D(2y*/U?A???????h??l??I?!Z???N
??"	?I<S???/MU????(|?m?????dR?{???:??]i?N???]?2???????\??"?"?D/M??`??}???g?nX*m???V?:????????%?2c?k,?#?O$@??Re?5???[*??auX$?c????????X?{?q??}?S??C?bN???pK??c	a(?W?TQF?~????O<????u?H3??????j?}8??? ?jrwz??/??h??_Q'?eF????P?^?]?y????p?2??????F9????3???[?>
?C0w6?D*?C????q?e(?X=q?????<,???
1u?????CHH1????&???????_?G"P0?L4J??M?.?	????biI-?r????1
3rn?d?"R?1%D at P
??=?]8^?{vG???
FK
C???Gq??(?H#Jz??N?#'$e;%?#<?a???o'?\s@v???$???(??`Z??7???)?2???F,?qe?? >??D???S?????|?K?_??H_[?*Z?z0????Z??/	?????
????????f?id?yv??????*??K??GQ	ll?J?#[?}I??t?g???xZX?:???w????~??pv???[?f??^???{?o%
?G???1?BD^?]D?????ka/mmx??|3^N?3??B&t??S???"??$;c??x????B?hi????c4??w?0G(nrI??7 &?????
??:e???~,??Q??w-??k??D?;?SgjD
?????+???k???q??!s,???\??X?C_??v??
2F?'K????s5?$??????6?t9?L5O??	ha|O??s???]?U?#???.?&)
? ???
H`??1??({[?\|#????????AK??
A???>?Vs?YD?H4?/?1??_Jq?u??~cX*?*=??????,??i???F(??@t?????-1 %?|
0?O*:?h"?4R?????A?????S??j?Ez??Y?9.???????=b	*?9Fo????w?	7
?????9 ?9?t@???z??B???Ku??^?#?..?r?????3??]???V??g??)???#z<?????T$~;?24?Qo????_A?,#e]?w????F-??3j???9??4v?wNY??????/?????
???0?2xxkO&?
K?]???(????,???"??v?\?dBf??????-e??o
r?#???U??q?$?O??>?}?6??a????jNth>?r?@?????+?q?F=9(?J??V?7y?S?=?|s?X1??p(?-?O??@x????j?U/???`?C?	!8?9??y?on:o???;??{{Ev?t????%??S??K???p?????>??e9e0P?a?[?;??6#????\h?????y??6??????????Q?e?'f?????)???S,??E??????&???F???m?^Zb?[?X?`???ma??CXxSP??!??	???bB?O<??k?????f??I?z??^???#?c?U?/*???Q????R?Q?+?d;?XYK??}?4?h?~TW?,/????Q?=N?????W?r8L???J??,??9???U??{	57`"?
+??.>+f???E?) 8??zN
????9cN&m??#l??? ?M?C0
?B?9??V at 7????
FzD????o2????? ?O?rpoA????S?????{???2m?[?????
2hU???????b3S-?h??;~?????????6????????-r???'S*	?"?I)??????n?b?I?S9????(f?G?W?1zC?)#XZ?6	???G	?
?
9??????J?=*?G?F?4t??`v#?gM#C?|O?5y7?eqi?~q~v??~????x?????????????
YC&]H:????Q???P>J????}h;Gy,X???

~????e??oB?Q**"l??17?~?g????
?^*Uk5?V?mX0f)??a?C64k????a?7??4??JF?/??J??7??t.?~???H??@?X??P??Q,&??5?????n?\#?n??E?)C?uw???|?-?X6????9????P?B[Z??F?t??????ii?D";#}o
]X?b????? Y?R[???7??`????^?\?A???`????I??_wOA???k??F?1?4aN*?{?M??????_?,U?:?I?Y+T?J??&???h?S\?I1??C+dA? ?D???,s'??X}???????_??R??N?7(??~cTm%??4?H????
?????????a?(???tI???c&5y1?O
?????q5?????W??R`E???
HU?R??#8?
?P?????^?)'8?
0?3?Vm2??????R	??V?K???
e??A4???A?/?k?
?????iG
????7?'
?{N#???VR??K??
"????)_???k???;?z???????[f?a???S?_?"?R4????hw????K`I?2?L?0<?a}??Ps??3?C?EoRTO?????!Z1?????o?+??v?????|"??$?S?zo6't???.?????O??a?%?'??{?E?-?K at B??	R?Pb??"\F????]4??{*??ha???B??#????
?R?????+?Q??7??k?(3?z??"o?`?
?T?S?????s???9?~:?/?E+{\??3?s?\????
??4<?P???"?:??t??1?d:>r???Q?(?4???????LBJ[????x??c?)]??Zw?m5?Jx?????R?G????B
x?jx?!T???s	?B}?0?<???hcR?f$kA??8?(??P?>??;;?b/V??
???}:9P?F???C???*??)??a?G???k?}????J????U?L?yN??w ?aR???-v?u^k?????y?????*Q4??dB?G??^8???xY??>??!?_`y5????5l?u?Wo???o?>V?	?m??r?????x(s??;????.C[8??????/??'????kw???M???Zo?V?2???oAT$?'?
?87?#??H5????}*$??6?2??o$e??M???qy?>???\?????D/P?@?YF??,??z????-3T??LJ?t?\???????t
????????%?jU?Z}sy-???9<????t)?0?M??;]7?@????=??????????w~<?>}?????5[?(#u??U*?V?q?S|h?q,??????????-?+^???r?5??)?a{??7[??}q3?
?>/
X7T2??Y????G????En(4R7I?c1?Kv???L???C?j?0[?g???,Z'???'???S??6SoT*5?T*??}???x?~H?Y??-?R?W?v????^3?;;??d?,?Y2$)?-?J
?/???nP?;????,?%?&?.?:o?/;g?v?r?Y?????%?I?nm?&@A???????]K#QM?P{
???N???i?un?$???_^??
?
`??????f??6???A???pW??[??????j?T?9?Z????Y.?x???7I???_b???x?'??Z"??L????j?????z
??????CB?G??bu?-??u??Sk$??y?$?Xm????5??@b?Y~_`J?iO??Ao?<O(??	0W?		??.b2?^
?*??HI???d?Ed@??Q???6fK??????K?N???Q??H??I? ?jO??S]hG?2?ae?V????
|g?ha?<l?(?M2??M??@?[?a?>??q???	g? ?(O)?Nx??@?=??E	??D????@B??mL<????E???F	%?e{%=?!???a?;?a????????s??"??t?(2.EQos~
"pdx????????Z?????x??BO???c7uY??.]??????{ w??@x3???u?}d?$=m_???????tq[q???j?f>A??vQ^.?Sj??\k?q????????C??????]$V?"???vO??f-??J??Vr????j?c@??????+??F?*C???l?????ml??????????Vm,?P?F?m????1Z???l4F????"?jHlX>s??!???!?{U??|????HZ>n??i??|;-?F?|4?6?A#N??j~?rQ???2????????Z6??????N????????? ??????Y#y???7?	y?o@???7??
?????dww
?6y2??N??S?????=+?2??2c??????vH????0.???????%?6??Y?R?.??$nO!a?2?!??$?+'??M??iqw?D??M${???]ds?????\???????v?^k'??vYV???r[???????
K????@??j?;???^?s??~n???o?~?-?W??
?v?(P??Rn,$g??4lF?(
???}?????%\??d`?R?k???l?]r7??R?	M????-`u?^^_u??m?Yx?ayT?ayTvZ????we?????'??7???;?????#???d??????r	pk??6w?\??r6F???.??03?
3?m13?	3??03?
3?t??0Y???@M??[
??^??j????????K?(??eK????)W??3Nxe?#??B??(?@%?uqu{'?????~??FCy?slrK??lh??~?FLF?h????&4?L{??????W?e?E???????]??3?+1?z9?
???
??]zS?@??~%???P???2???!:)?L?%?!Yr?g?{?N???P?????????6d???%??hnLq]?X?????????????8:?
]"w???%6??.??|?G??>8??!R???????!?AZ!i=??d0H???4??N)	???^.?(?"??>S???1=?????#qHB?FF??Gl?5j??y1>???:E??'o?G????U??1{aE2?t8|I-?*Jt8h?X?G??`?1??c??u}n|???????9?i?z"???tE??Hy???i?d?i?e???3???=M"?0B???I?!??+
4y!????Id_x????????L??LD???%3?W *?Go?? 5?8'?nV{?????5?!K???S?l?<???KGX?tQ?G?^?6{??????H?i?%h????xh&?#8???4?jBUH<??y?9,??d??b,dw??t??J?<5??S???x????z??COF?$?PE??|???H???H[}?????C/?g?88P?h??^Q?Z?^ y??h????`l?6h????h
N??q?>???d????i}
???|Q?g?$En????Hb>????ffK0???1??W????|???M?
qE?B?\0i? n6[u(????*??F??]???????7X?A?c,^??S??e1??&3?h=
(?h??>?o????U i at Xy?? ??l??H8???f???G??'?=?|k/`s??j5?	??I?J??E
O"???9?v???yA????1? ?L?ly?v?Q?.??Gr4??Q?Y????3???{?E? %??4??Spa;p?N???L?v?Pk????"I?O\?f???U??9vR;???(O??
2???\@5?(?<G??????? %??!?.?eIJ
?????[*5?????8?%???%Aq@\???l??:x?~?@J
G?<??O?o2-??#n?.?;????`h(I??S3?*?|?[??d???!???04??Z{?2??t???????}??JME?f??)???I]???P}?Q?m
U?^*??gP???Zxn?W??????ff?????x?X???+???/9



From fedora-cvs-commits at redhat.com  Wed Aug 30 11:26:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 07:26:58 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc5.bz2, NONE,
	1.1 patch-2.6.18-rc5.gz, 1.1, NONE
Message-ID: <200608301126.k7UBQwW6028913@cvs.devel.redhat.com>

Author: mtosatti

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28889

Added Files:
	patch-2.6.18-rc5.bz2 
Removed Files:
	patch-2.6.18-rc5.gz 
Log Message:
Remove patch-2.6.18-rc5.gz, add patch-2.6.18-rc5.bz2




--- NEW FILE patch-2.6.18-rc5.bz2 ---
BZh91AY&SY?o??FD??????????????????

????
?
??N*UK6?@:?;3QX[??-??V?
??F??
??(??k0iP?i?U"?5JA??@?i?@
*?Y:??
?*?
@J?(6?YZ??QP&Z
$Wf?2h
??i???6??f??EP?AZ4+?????????Z??)??`n5A?
?
??{??V3f??Lj7??e`????n??v?TP??o????lR?(.???????V??z????YG?=??Oq?-{g/|


???R?
?%)[b????0
???vvWg????lx?J?

??v??????}?I?
??"eU?r?e[?|????:?4??t]?k??
????k?????????i?
??L???]*J?,???K?u?N??????r??j??m ?????????\?=?S[_????PR?~?gYl??J?? ?????????v_??????d?
??
XQAH?Z'?X??A`???????u?????*?D???$j%&w
,PAB???]#?Mm??
?mETF??a??i??T+iZ???UUY???L@??????s????!??r??}??????f??6?I?i?Q?????}???-w??"???d?
w???2??p?62bO???1y??9?2$????6:K????Q?A?1???BL??gdG??W!`???_??????????T????
e???"*??S?c???1?TL?-??
0??]fd?cY???"?????w?6??????I??L?/???cU\?W????????P3V
????z???? _a?A?4|????????????uG7?Q?????
?-V%?R?U[???P`h?}??
?lP??,?n?????Fn???->???z??????&(??b????.??Q)(?UU
F|S?g??Bh+????0??`?X[?fS0???BF????0"c???"+*???7?1c?????x??p?????I??9_W??lv"?_??U?6???, ?C<?w1(?7 at do2?f9???z???v?L????3e?:?H?3B?
3B?~??1@??
??4?????&a@?;???????M?(????HA??x[?l???(??????????hg??}?yyd???j,Z???R?}?????[???g???>?
zC????8???#?s\??3?(;bw??f??????bm{T?KW?????B?e?????^?? ?w
???.7?U1?????uyjT??*?c?Q???S??3?2???$'.?AF??J?",?E?

??	?N?	;AL??
v@???hxP????~kO??????R??????tm<?&&?????[V?_?66?????)??????g^>^~?]???????},z???2g?DQu??q?y???8D?i??*???KZ//VI2-??lJ??r??l)?UTUHYv?k'#?=)?^?*)Z2w??H?b_???????Y?	;2??m??R?????c??U?KI??????????????V9?{??%?u??\X?2tyIX?kh^??%??V{
?&?^/k?PJ)???dE??r}?kO?????I??]_&/??iij_??-??3?X??????U?9?$9Xa? T?a???/`?????kE?J[L???lid?[iK
[??Y??\?
?4???gN?sC???)X??an??9U*???/Na^???xI&???FW?;?p??l????E;lf??><???f/???? ???#???Z??
W?.??????(Q8?1O9H|?????;
?U?.?U?o.??(6?!E??RQN?#??S????dc	?d4?`?CH?????82c9X???O????
?<??;Q%???hC_???Q7Y?t???????A@?/??@#mU??F?????X??Fw??^?>?i?????CF??x
?e?W?*A{?
RQ??{???O?n?
L?Q??t@:?X??8?,?T?2{??l??UJk?p?4?????Af
?u????????????O??>E??,0????w????V?FjS?^?S|#??\auF}??>~?/1?8????o??.n?m?=D1
F,YV?'??r???x?(}u???6
?$~]>k]*jv2???? l???H/??g??R&X?; $?%/Xf?????%B5??C]????h?
o???s??????????a????:???S??????s)??O???1??=???gb??"??Aj?>?q8E?`????f??O?n?#??z?l>??~`{??"??M??????sGS+???i?!???Pv?U??C?53???h?Vl_????@????D???Pu8???H???Gg??a??/u?s}?o~Bj%????>?
A?9?????????O??"9?Sa??*<?f?????Zo*????[?????(??ma?/???????%?3?dx?I4?E??4???o??????+?]?????????????m?=?????g??^X??cO#??95??m#????G/>/^?q?G?~?????oW??????#??AOF??a'|?????{~W??z?0?\??x\d??
K??T????????????o?P?*C?*8?U?Z??O??#??????;.??
?['??hoiL}?+?9{??>~?????,.*???Z???k'1???a?HF????=???eAC?d?_??????W??x???
Vw???a?nz'????r??2??!`?r?O??,?B7???]????????????1$M??6??<??????u?#\;?G??=??@(*?3?>?{??I??(-??/?Y?}????????o???jN?????[4;?h??@??x?m???^?*4?E?Wn-D??^?????.'???9?????????K?p?4?
=?ULl???,?W?>=??z??]9?g?q+????(O\??h?<!| >F/??8?????W?E??????$???
?????V?t/wG??g?????Uj?BI@(QP??,HS%0	H?????N???VW???????????;?W{m1%UFf???Z8???WSy?????z4?|S?????V??R??M????{???~???IA?J?g?K7}s_?
??????v?
?u????N???K?k??z???<???????D?????^???H
(}?X?3?M?p??????i$??/?????????
?`???
*?a?I?Z??
??au Y?gZ?%7:Z&??l??z??yz???????:g???4?#?8o??yl??3?/n?????????XT????_?G??!??}7{y???]k?V??y??d??{????)?`;(/??s???=????i??(
%??n??_??????N??K??|@,????????I???kj??$?(??<?8?Jb??B?/z???E??W???\?7?CRvr?ZQ<?????.<?NYuk?#e??O?j???A?W????2??_=?Wn?8?f??C?1#0??O-?8E1%?????? z?@??`^????????g?r?K?P;??'
w???O????????x???&tz??<}f???????????K?9??+???)w??*??lYz?B????u???????~?????']??y?@????
aB???}9???q?gE????G???T}?????????*???K??9???N#?0???o???R?o???[?<??+@?SKG?DC??{H0??}?>?6?n=7?{?z????B
??8?p)?u??7\?2?
?ds?}?&u?D????lo????l?Y?of?HE?m?=?9|????)Zy????T?<?????K?FQ?']?D???(????
?.????I??t???b
_?-?
???m?k)???+??=w?"y?$G????F.???????dl??UP8w??;??f<??I,X"
?+???T?#??3????(?K?{???E????W?????????zu?l???[?????a??????-?<y??#f	?\????$]M??(?1??bsk???m$|?y#,???????(?(?a?@?cf?
$:xi?(h?vm??&6?.(?-*?
;?CN????e?*RQ??????s????????J
g??R?V+1?+]???nl?=??o????Zl6J
X????fFv?/?u?;??[??x^???:???:?1H!V?.A?Z??????S?{4?>?>???Zh?;Q?v???c24??(TP*?s?AE????\??O3?2???Z03v??ab4??b??ACr?+??;sK???R?T)?7d???8??-?%??U?6Z?"M
$(??[?Y?O???}?UT??\v0Z?????Y????J}F???S??!????????????????{???:A?%&B8?
?
??9????*	?Y?>?{GG??S?]:?-/M?1%J?"T??1????????
????R??f?2??iA?????????kj??4?oS?i7?D?$?@_?T)7??????m???[~Z???` ???84O??????s?????t?p*7U)???P$2?????????}???9U
?d7UO??????)?I?i?mn??k+?QtmP??IG??????7GW?4?E_???+QOa%}?k`?P?_??u?a_ ???^????;?
?
*??y???????dc???o???e?}?W}K?Oanq?@??J????,'??????7%N?% C?????'?"wO??v??n???d?q
Y???????.?<z???m=?2?????/y?EG[??9:??
?????`^A?*??????B???????o?????2????bQ6rL\/???2?T???r?O?@??????T?9I'???7]??wu????A???????O??}X??B????o}?y????kWm?J>?c_?I????2?QPdGO???F
??	??{?>FF7*?????????Y?????[?_??????d$?4o????2?????[*@????o-}??^??G????"0P??$????????7?"???B}'??5?8??h????mW9?Hw????????????g?(???????k}O????fA?okw?????bS??SQ
?????U%E!+?T$1>????????????PXF?~e??????n/?E?4#????????O?C???gO?????i??~?3?G?Y?????R??9?r???X?!>?
??*????F??6$,?????9??<w~?a?????{????ib?$???????^}??]c?u?=XV?S?o??@??@BHR-U;???E?????B?;"??|n
???y3?F??F
?A\4hs??k? ?uo??j?7?????????G?~?k?l????#1??D??g??L
????????????I?
??gR?K?]?????}_??O?????^?7??/?&?*?????>?????5?u???????G4????tHbq????8Z???+>:Zwi?RC?4?H?@R???4[???ui\l??m?q???w,1??????!?r?`??M?U??^Ffj??|>?=??A!????N??o?????[H
?^??[?t5??;\Cm"?????"??	!??u~=?|Kg];#?????,}??d??[N?i?s?????#?3?g?e??}?_????h?u????9?l???_???#G?\'?{???+???;?

?6?t??jU???o?q?g???C?$????*?`???$?v?<?>.?o???????	^?2???P:???qb?'9e?N??*??stZ'}+7-???l+????$@?????nKJs?????#
???O??n~<?^?]??(?????K?????.??W??????eK+??UKi?>,|??????M@?>w??
(
!??????P?
]W????ux'??_??#3?	K:j??o@????t????]t?_?_?w????)???0U"<z?Z?Y?>????????s?lO>^&E'?4???4HX????"??'???l?0?0?&o??+????~??????????2???K???????D?G|?2Q???????r????W??(???V??
??????2!I(J?b????bM???jt???UQd???L?T9?j4@??F???s:????:??J?Q?p~<?e??q?A[D??r?????r???gr?GKiF?k[?t?c?k??????5?_???????Kv?%??q	fV2eiL2`???????<o~????d
D
??w??oJ??o????Dv??~?U?=Ow????????'?????t^?????^?9?9?o?#??;?????Q???4?K??g0p	?!?@<???<?^9??????x|?T??g&???L??vg??????b???T2?`??s?????phia:????_?t?m?????R_??I??k'?RyS??????~?'???K??]?????????p??cM??(??R?Dr{mH)*??j??;I_????`??=???~(~HR
?~???#????S^?\?????]`?????4?E??[??yO???l???g?@?v?? " ?W?T???
C'?=	ua??3?k??}>?+?
t? ???L}.?/????%??]uU??a??'U??
???EK?????yoo???B???MU8?Z?%'e???2?bn?w???0?m?]?|??/?t??f!?Z?k
4?k*$kc??v?O?)????)?r?? )?????
??t?A?nh`-????KPJ/?&o61???
??B????E(?<j??7??'?^?m4+w?k????sM??\??ADf?T^???m8{?h
?k0??T??^(???J?K??(????2??T??IJ
?Ux???`????q.??(??R,???id)???=????d(?????M,{5*f????^????Q??%??T?n???1????????*@>?n?P?"?A?F?o???8???p?v????l?.?C?`??Y4&??,?[x?d??Vu?gFfwW?[wF???>]u?u?
????v??b?A????y??aY?dT????aV???US?z?0??F??_f????+??	
qx.??!?v:*?n?mG?M??d5g?uM??j?(?
??%m
??u?????a???i"?j?i?6?E?zWM?B????hP?
?? ?	???d?t.?"v2???k??k?+?
??????B??HQ??@Zs?<??
????(vYFE????C
(?????-o??C??A???NP?
???t?-????????A???????W??Fl??T:.??ZFQ?J??l?^P??w???>>?_W?????~Z??9(?S???I@?m?\?;?=??1l9???????o?6b?~C?4????Q?J? ??M????5J???<v??n??PDz"?v:???)?/??j_kS?5C
\?P??AK??p-!u?Fw????1?d????\??D:?=??G?o???BB?:???--?%?????>?G?TUi??/W?o"??:??????
U?t??1G??]0?.rkug??v?#;_*?E???-O??gr????4???????wm@?c????2?Z????bm?6?B,???M4AO#?????%b??????? ???*)?gN???(???f`?dh??;a*??F?x?>??.?? ?8?????q)$g?[/?????o???????h???x???7???x?w^???????>?=|n?w???B???????q9mU2Aq1??sd??P=?O{?G??.
???p??1R?YQ?#?}??N??Gj???????l????d?v??N
=????Rx?f????????????W??o????(9ot?%?6??0??x?????T??-??????Q?*+	???????QO?T???!)? ???C?y?_Rl0????????tu???A%*&?v~t?F|?#6?b`a???@x????????x?????Q???iA???Jq??[`???A?f"Q???c??I?????p?q?KX/
lw?????\z?N????CU????|=P??????L??????????Qq?:?????K|~
?r&^??t%?fSe?p?7?X???\?o??/l&?ds/p?s???lt3???e1+2W????g???x????v?@?^ 8??8????8?O??A??x?????
???W?_j?????]?????o?#!?&J?f?+?1?M?T??X????????u?}??2YA?f|Y?':*????,?(?SXA??D???M?
?????K?5?H	!?ns	?P???[? }?>t!?`T?6?Q?v%?????3????????YH(??t??n????i?[??,????o?CN?Y?!!R?yp??????C??N.??'x$P~?U?]d?DH?Bl?5???#?\3?????L?/?v7?duX???Vo?SP??V??#h\??q??O6?c???k?yS{ ?t???oW????e????	(H(???g3?j?!A?R?w?_v???{?Y.???????("w?C?u??m?-????(d??A?z???j??	?:???Ym	r?????]?p?j?{[?$<
???\?YP???d?????'?D??????Z?~S?1?g???!??1$??,????k/?v??]?K^+&j?*????c??h>IsZ-?yo???00??*?&J)??*d???y?'&??i?w(?????s???i??;?L?){ ?>?]?I?=?K?????kZ???-Z??Z?G??????7???5????2????F?~?fs??`*Go73???L[???Z??????U??%?A???>?}?gl?=0????~????lo??
8i?;a??z???1???Yqxu%???l??/?9?\????
?7?{?%?????8??????
.]Wk??????(??E?jg?gk>?????????
???R????K?+2?R?l??2dU???Of_??????;hj?;??????7I??W?T???U|??m?????R?????G????g?????&???	H??)??_?4
?eNVg??VS?_?0???????]__???????5????iW?3?
-?
V?.???s????y%e?9??
7o?\?????>r???y?L[??????w?v[???=?A???????/????K??	?|f*?HX?
?9??\x?Ee%_??????F?*x;Al??sY?0}???A??p?X?n?/????M?g????	
?(??3???w??w71]??????3??"?t???v????2o?a0??a??~??GYK%??j?l 8?????yxu;~?x`?t?wN?D|z?c??
?g??%l3????9R??Q?[v??FXp7o?????S????????^?ST?~??"????A???M3???y?I_
?)??w?????ec??/???A%(?gc??g;??ox???D????_?r?N????????]z?f??u????e?^??N?i}????????7????6IC??????????.??T??{????K?Q?9k??H??+U???Lz??y?OC??;????<?en?G???m/q??h?D???7???5b????????y<4??Y4??u??????}?E???{?r?S??g???????B?IXl?;$?\??Y54??w??:??????w????????w?/?:Cc??;}o?d|?O<H.Z_??m???r???s??S??????d?K?>?d?K};???(?M{??????{7j?y??8U???i????O?u??????N?n?C?|??p=[?gm?
_~-???????CF^{??T?F?????????L???[?i^??????X
??r????????????9
~wO?NU???????????x???rX???????;??(y??m?X????K%???????H???vM????~??V?(@?O?????o?WD?+????KB?Z??gF?/???S*86?mYT3??}W2?K ?????b?E??$/?O'?M?mY???,G?$??????'?"??x??*???[/d??????:Y?e??G+T?? ??? ?Q?)4??8?!?V ?
?e???$???b?H%`???Q???XKDl???[?8DK ?!A?0?cM at k`4S]??74?\ ????  ??rABH)JJ???f????#??????F?~|WD&?8w?C?????&&?J??%?Ni
	~6~???1????4/\?????H?t!
 ?d*s??S%???K?/??B
???????_o?n?
NE?
?????8?ztdD?V?|dO5??"????????7??n????D??'.???>O????R=?
h$??>[?
?Q?????Z????P?Q?5)<???/?4????2???????
a?????r?????1?{E???T}??uz???2?L?
-?????$a??d????m%???m???EqKm[K?%V?8)R?
?k&e???r?S[Y????6?VE5UUU%v?#??2??CR?h??r??p???%"?P?F\??_?_?
?gF_??v??O.?*X??s<O?????g???i???I??N?J0?j~?RFE?TC;)?????J!?3??(???L??|e?/)??????????1?f?E???fL?!?i?*?x?r?0???9?N+S?H? ?P3#??????J2????G???t?:????Rv??b?{~?????2F??j?b??????@R%??)'???sCh???b?3?????e+2%?????;????D??r???????
???+UU??j?????????t?=?5?6???5?m????f}?-????????'????G?/???????-0Pp?rZe?W?Q?N|v3?$<?????+?????,1??d???N????TU???
??`????O???x???st2rde'????v`???A;??Psd??}??I?,?$
@??_o'?R?*
?/QF?Y{?-z??A????j?e"??6U(??+`??*?
p??v?|P????(???9??&AS??????P?:??????O?B????lD!???qE????-??+????Il?TF(????u????&9l?:?}S????`Dssy2g?E??????oh~??4??M?T?>w???2???o[????H???+?0????YU.?t?,? ?U?ll9a<??<?>S????????$/I???l?2Aa?J`?????*2z????6?z?
???>;?h?^??z????'??	?k???-??|WvlkfG_z??????8w???Z?kF???_?g^"1bJ1L?D2??/???????c??RG?5Kq?bg??nZ???w7?z?D??S-0g`?Mj[???*????s?o?)?UU?kD?????
?UR????K???&??????s??ml??=B?g????;z????#?????K??l??X?????W??J
????????z-W???m?????U???????7?????\???5????????????o?????.I?3x??q??m2??,???????T"0(?U'
????C?7???
?????? ???W??`?q?n?
@????a?=????????????0??o?km?h?lp????DZi5]*??????v??
??V??????H?@usg
w??M???
??%p?????N??3?????~>?!??=??z;??CF??????A??C?????;??o<Fk???I:????1B?$?pt?F???ae?}??Q@????@A??0M?VJ???g?m??R}Y???M??????7a?
9Z`?X???_?
???/?
?(B??O??u
?x??a?????^Y?????;??????.?4??g??`???X"e4@?y?/S&f??N???9?????Qp3H9??
Pn
?G??B_e??.???????W;???????@?D?a?9?[R??#@O;?>?h???]???ABS???????;????1@ 2Ukv?<P?
??k?
??q????(????Km?s!????3
{??S?c?E`?
:\???F?QUXA?WF^??3?GD{????P5%B?'?py??D?????????r???G???~Sl?
|m9?v?$2F?i8$@??tG;58?????,??QAc?????Q??\?g?'A???????????/(??H????A?(04??d????y^/o??????&?J$[??=!?,?????????}?0P????????8-??uz?2??B?Z?_!h??P?1????????]?????????????4????Dy ????q???pn?Y??U???????
??W&??R?6???9?l?C??x??
???K?????k?%w:?o!??????p?<0?_?-?????;2???????????~?*??~????O??4?>?O???8\?e??<??*???????????`?
??!Eq??????C?G????D??#?[????	??;
l???C???p?I ?????C?????{?}oV?a???
?L"&H?05?D??i???-??n???98?Q??s?H?2?????.??t?P??iY????8P?:???9????????YC?f??????*??

H`Z?9?+
?mW-a][G??O?w?????C?9>?_?,5E=q?%???WW?????v{z?Z????8??4????W??Kp?	?@`o????j?.}5??
?}U???L??????z?0n?!$$8???
?h????`vV?p4oP????:??
??0???kM0?d?????;??KY?????>?>Y?+'?o???mc??_????O?&??V???v???aja????Z???~???*579F???c?sn?????*{.????OqDD??????SGp?;?+?ae8 ?v>X????????????; ?[

G?.??M?U(n}?n???U?u???UD??6?$??.?
??R?C?x?;??Z/p8?c???'?-M???p?l??O?]??
P??I??dxa?:@pF??O???????{a??~
??*P??)?,?L3????=?????s?=??|???d?Q????%?}??
6Z?aQ????6G?,??8:HT'`v??L?G??.?B??/??M?V?	?xP???<F?{jl?u?m(?e?x(????a$??0?i?^ T?}??<?@???X1XO??'u???:+G?R???oU4???I
eD&I
?5?5 ??.L??TP!?	?Y?aT?M	v????$??$?$#0??;???6?D?(b?)?%?"?V?*K1?x54??	?0?????U?4??<?????????<????tI????@???
3???CP??0? &???UR?@?cG???67vx?v_??4c<??+?x=>?A>K??}??Zy<????^??)????????[?X8?????w
?;??~?l???^E?^??
?=#?x2????????
?????m???G at f???c??j%~??Y?l{?g;???,?K ???h?^3?j\?rs?C&????????
U????\?`?	I?X?????dl???????X?9????????i*??a?HDJ??4i???@?2
s?????t6<????m?????J???}???O? L~r??W		????dFn?!8sl*?@ r??(???????=?A??y??//_a4????????r??)?mj%e\B??????hn???	O?GHw4?5??8n!^?????H???'l>?t?z?????1?6??????6????q???????>u??????$??_???G_?@???]????vEA?>.????x?/+?Q?+bv??@?$???z??`?

?Tc?<?_??(???????\?????I???}?*????X??r????????~WC????6?8"~zB?R????
?)???V?/S????I????65?M??N??4??~?s?????$/V?/@L? <SH??h????????5$??\????8?
?2???????pp??????~??C??F?$??<kXY??P_??I
?z??LHx{???Ph?)?n???? ??3u
??w?
???9?q?????k????????????fk?s?<??6k?????3???]????E???6*L'??)?hc?E??=X

&:I??D?2??2???C+??	?q??????ynq????W?\1AX
??#?5OlY
??n#kTHb??"???M\?????P*[*???$?H~?J.8<hL???~w?S??? ?
u????f0?
?-??-6	q??`
?????H?<PU??????F?H??)}??}???3???O??e?????{??????????b^?5&??-?p?????????

??u???@??>?=|????.9?c%??a?C??	
??'G?!+!?7?????aN???H???4y????i??>??.??!???
m;iJpd[n???\+??'??m?9???W
?04????C?pE?&<\?>????
????{?A?Pf>?g??Jq??]4r????I????\8??|?;?1x??q??O???o?5?}rp????Ze??F??1??%??
????C`x???a???
?d?-???H???lp?[?|?`?????????H>??E?_?-????<?_N????"??qi??V???Q????s`?2\7?6P??_??????c?J8T,??k??"{??ba?????5;?n8??'??	????>R}F?3??O?pd/Xdq<
;?K?/?zF?|?I??m???N?|??8?c
H??@Rq[w??L?A*?
%?c`???Q?????J?.?9?1?g7@?o?adh?-q|~1N???w6????h?????L?p??T???^-?Z9???A*???pyj????)?????O?z?o8?;??<3???Kp??@?P?K6????+~??_
r??]???Nc@??v?D{?????pL'AS
?	?E\??Gm3?`;F? ??Q?/?????%F??7Z4????j	De(yCD?I$?W?T????_PxQ??'Wd?
l#?
x
?bL?9?????????-?`@us	?3.
??.h??(_y
P?V6
?
?	?i??HPLS?%5wOp?52/+0?2??q?.s8N?l8A=)xk!?[?"%0???Z
?R?$
???	i?0r?q&?A?0??F?8?jDd?\??ya?R?"?f???*??f????8GE'?????? ? S?C??p?? ?C?]??@?{?y??????
??O???x??
??S??
&?0Y"??VH=
????d~?u2?g??^??????to????v????.???`????j??}?8
?? ???|?)

 R???	???	????b?-??.M??t?%????^?8?? ???}??;iQK?/??1??P?
/g?`?_????}?X<?*???????h???zV?o??}?A|??????V?
Go??x?2
?d
`c?Y???>[???A#??]????g0?0?d??0fX?BN??6??xJQ? M??7?^??@o?*jtq?;?=?@????\o???D????

??A?k??;???????5
`}?AX?(?????(?HuT???9????w???.?c*?d?????V?^?>??)nCL??	?t>??0???%??PD? q?wm??X}
?x?<?
??a?????:??`???H??4?VJ??????(?]|{??
XOG??
??r8>????M????P]?n?HgDA???h????j"??'????si?)T????\?V?????????o[V??D?xkK?3?WP?p??N??tZ<?z??????A??`?S\??????N??A?????|?????
AEO????.???I?l??
??????
???a????o???\???}.????!BA?NA
kD????^??7}?]~??>
	????ZfV????}O)?5?%?[?????-04?????cS?a;??#2w?n?!??{3?wp{???i7?vwN???????l???k?x?n????`???/??y???N][??x???
?IU
??8??????Wr??0?#v?y??<??=????e?
?l??N???(M?
???%??9??(?%??|g}`?;??k|H?t?	r???K9??<yd??4?v??qt?.?bb??I?>i~??H	_W?????????????X4YJa???????/?????y??qHm?u
??w&??+n???H?(???????????#????h?}?PA???QI?k??-?bi??m????J<T??$//????l????bV~N3?.?l?????;S
??j?u??b?}<?????a???
???~|?~???i?b???5?????M???Vl2???????v?33?X?IU#?KMn}?X?FF(??'?1?_?p?b(???????k???G???"?5?")??dTX?3?(O???ed?vv??_g?i&?m?e??p$2$?wGX????3?r???L?O,?F??`?5?[?^?Aa??[????;???n?Y??????6?>S???RuoO+/&?^?
Y?u?h?+?W?M????DX?jP???]?G???[7????Oo?2???{WS??R
???x?]???????E-?}',?Y~Q???oy:??l???9X<^??87?|??/rcpm???F?O?@???
o??u???3???8?#K1-??npx
???U???[??+?????|??/$"????t?
??;?:?@?J!	__Z ?	?? ???)????(??!k??w8?>]???~?JV9????????
????l?xK%??7p?dY?6??????HJ???>??5????HYt?nz??]??d?8???L?[D????-?p?.{??3?????1?9l????:,??)??????c??^?bYT??????o?/?2??O?i??}??????R .?;{q???W}|??o?e??@????|Oa?.??@?]'?OS?
????????8
??x?
j??~??????h??!p?
??????????????=z?8???s??\V???Qp????@?4(????q?H???Bk??|??????????C?o?af_?"??J?QtD??????L??N'??0???} 
?1|???	 ?L???N(5e~??~C4
x?~?????}^O?7?G??t?+???H?|??;f??B??????w?<???????[?T=.	???W|?D<@c?????x?$?N??a?4
	:?(MUJ?k???`;?
?
a??#?:?Z
&!???<???F_N?????????r????[????Y?kq?
????1??9???z<?H??}???????|?y:???e?????"?Jz?8ZA(???D??C????~??N??`???W??????-)?7???)}J?(<???^?Om?V????
?mTo??????^???5*???Pg?TD??~?I??8un/???Y~??Km???T??TRM?pn??{?]W
??0?lr?@]??Te???C}??n(?

????u??z:??^????2??????????????;?pB??3????C
(#
k?F/|1??
?????U9d??5w???_q??1?hD?<X~,?f?L?{& ???????,???(9????XD?^W?Xi?=y[
?x??P?U??SDb?T5???????;??EQF(?Q&/?? r????eN??Rj??=????.3,K?Pnt??1?)?W?[?F?R?F?!?<}????
|?3.?Kd????R??@???x6?)-N???????wo??O???|?????a????????	.C??????????p?gJTI?T?7.)????~6nD?
???"????,?X 
g?L"Dq???xn?}???????:
?$????WE?????<?lh?a?#;0??&???????!
x???Q???????????F?
a???C????c?y9??q???K#Qe?f?RS?U??
]??9??f!
,O???????#?||0dG?2????h???@(?
?? ????????h,??????VX?????2?RW%?~??3????????[???????UW??MI????????t:?????GlQx???xO0?(?D?????1??U//???????p?#?????B7??w?5i^?u?\??????6h?'
~?F7??cy??v??O?/peq?????8??S
<c_??e?j?!NV?]??Lkw at y?R*q???!?7??e?.?0
??G0? ?;?ys??8:?????????z?c????????c0F?I??b#??Bb?????|V?>[Z??7<??9X??%?r??c??6XH?:I?N??????(??d*b???Z?~?2Qj??]_Nc????????+?W-??&g?s#0????'Q??I?:??Z??Z????;;?r??e?f@????5/v??i???????:b'v?@???i?ki?u??S???+ ?R
??3???2?????rM????AX?myA?J??)??8{??????v?3?H?gs?????k??Q>+?
"???j?,P?@?2?/??>?[8%?1E????F???Xx~?|,??C,?T&
??Fa?lV=??}???+O?DO?U1?????X?$??/_0??4Z??;?cG????&?^%??@q:489???|?~???s%?7H`%??\s?	? ???^?}?)|?j~???0?uHb??l?5!
b?[??|?e???(??u?l????2@?K_???2>?????>?p?p?Nn??u?=???????F?o????0?T?xred?Xd
	???yy?<??Uptb??!?o?
???Z???g:??m??GtO?????5?]q?:V|???)???>??9????	???+"??T~???????????4%
?"???$d?(K??|i
v4?T?D"R????#?c????????"!?PE??k?
??????&|?a??@~8g5\G??M??o`??&z?yj?|??o??C????/}?Y?-L???_>?d?k#d!????f?m-O?+r???:B??x?????:
B?B?%
?????R??h_?Fx??p??V?????????|A???????(?b??gQ?u?x?:[Z??6??????V?)?????I?.?`????	?8??3???7?:<2w????V^UM?V?Z
A???!L??c?=g??Z???@??l???"?U?R???w??7t9b?5e????D?a ??@~?[???;?
#c?:???x?{g????V|??"Y/??[????:P?`?????????>id??x?n???????>eY?t?~|???c?.W???u?u%?s?_?$aGK???c???????yl????????y?}???!#?[?x????????B??k^?????5?|?:?j\???"???eks??;=?$?<es??#?p_???? ?9U????	???J?
=???R??~b??mN/????{?
H????}e??*?????U%????????0v??
0?L
}??????????_???????A????1?<G??_?@%H??[*?>???N?w??'2??t?$?~w,???? <?$?????(???-??,??!k??An????a@?,?2E?_?J?????<????rD?P?EI2???7\~8_
@c,?*??*??????Y{?>}/S8??C?NM????g??l%?r?W(?i????^?;?CN???8\.;??iU???*y?D?|<????
??}??.t??o????????V???p;????u?ISF?/?#??????a???????
?w????5?~}?z8M!r{=,>?$z?????-??L~3M-???!???Z???:Z????dx???Wf?%?.+??7_?]?B=?7?*O????i?}??hW??`?h?G???x
?????a?3U?b!??1$?#?h????U?q?	y????&?kG??
?????
A??Tk????ww???hd%??f?@~??)??
?#;?:$??<`???o?e??+?????S	m(-`
(
?J????i]?>??A??m?3@?/?fX??/0?&???????xX?????G"??@e0?d???V?Pk"????7?
?????@?we?q^8????p?????\???_???A?S???????r????
???

;&??????q)6Bl?(E??G?(,(?
,!???] x#
??}?p?v??m??C?84??T*2???Y????:W$?????????????i=??@??/u?\???"?? q?P?'??K?~?0?	
?6?)?|!"*gbE?C??(?r???N?$De
??????g.?????5B=?y?8?^?X?;?????5n??N???UUl????p????iU?p??J??????<?7????????W?i????????
???~?r???????????UUU^f?UUUU^w{?qUU?iUUUUU?_???8y=?kuUUUUUx4??-?????????UU?V?UU??UkUUUUUUUUUUUU??UU{?7UUUV??????u^?w?7??;???@?KB???E?#?u;??KUn9A?\????99?????6?
???iV?????	?S??p??G]??>???N0at<&?Uz?F<?
?8"???}f??????>???P at R?o?Xf@$(_?k?U?w=E???8
?D??J ?.?md
?<???+??K?sf?%=?
sw>'???#????g]????;?$??l?????y??mwt:?AGp?+?G???<???=????a?g?V?(y?w?
[_l?P?\?????;C{???^?_p?!u?G?<?]??i?h?S?u????v?m????%?ZG?%?N6F?	F?O{???>??t
????|??8??EC	K\
-o??[?De#C?e4>9??&
??????????\?+?????5?\3??-{???+??N??e?~J??kE????C????Asdp?p?#s?'??8??????`C<???(%q??Z??b?7??_lS?m|?5?*??_??????N%???4?LB?=z?>???F?
??-{S?:?S?????9c??????
l-?q??N???
C?u????,l????K
II

????R4???
&?G???
3$??|?|??{?j_A?QE???Y?w+??I?e?W0^?Q$??)????@:??r????????9E??yC?n?eY?PS??1O??S~???????2?gs??GK&????!??J?nOs?D8YKJ\Xq;H0??N?? ?R?>??W?>G<b?????<YL?Wc? ?G'
s`???H2
??*h??l?OO???Xz@????????I?????n?D<?
?$?????>?s?n??}s?????????o!|Q????????"s?	??8
??????$N??D?)??>*??<}?&???????-?-???@V??z/u?^E??\{?'??(??????LI
'U??M\?^6k?hz?T???(??y?$p?.&?,9??4	??????Oa0s
q????????tb??",TW??Q~??:????up??cT\Z0???DKO?
g?}?O?)??
;@?_?
?????H?S?uf3?????	A??d?????W???~t?*3dAvnl??$?h;?????:i?aB?)??@????????????8+??C???G?????w??i`??u	(??60]?0t?F???}??@?
H??Y??	??ID$@?)?B?|??>w??S??????[?P0w;??o?U???]??c<Z?fg??????c?z?mp0?PK????(?n?(????9??k??|T?zc?????w???O????H??Dx=?v??M??????l/g|??z????=
??1?^@#?????\???????6?u???????????,` ?!Ha???B%??
t????q{??e??z??2???s? c*?L?B5??i?????????N????Dj
m???B????H?7
a?}??Le,?{?er??MOJ*?????|?6?	wZ?O?Rs??;?>Y???????2?i???
??????n??[?$??#7?e?{<e??9??_????kv??}??1C?e?2^?u??D?.??)b0j????#?[???????@a5Z??:?c@?J???*?"????8sR(??~??y'7Od????@m{ ,fq?tp
C???KK?c??y<??Ljg?}7??PRoD#?A)??&?D?| ?mu?vO?j?x?BP6??c ?kk??N'???+??i??#$@?????8?%??.A
??sz??????? ?G:Bn?r?K?????o?????V???C?
^V?????z????? ???t??f?D?-?xah@'_a?"#d0??_?o??Q???F????N?F??>?g?NoAe?T????lN??N???E?;!t?H?qA|???:"?|?h6?zO?pI~?????>l?}?P????t2???W??/{`?
n:?"?4"
??}?G|EmRbz?D??????M?iN?????U?@?o?We???ku#W??b`[?}Gx?$q?:?#C?????
?B?????m?QQ
?Qe{?s ??A?@???s?
?????	?c????`IA????GW^??????s^??[???S??!?Z??????z9??kA?u???????#ks?2w?SM?F?#???<N?g.?x*4??????2??
??Ld??e&? ?H???i{6??G4?#?m??0n???d3??=??_l
k`???pl?p????\???{un??????o??.cyb??
??) ?!?X?n ;e??y???????+|>?U??.?H;l ?N??k?p]???r???pJ???
'?'?A?~? 
?\i ?4???S?t@???A?`#{???#??????T(?
(	????Dt"C??}??e?=?Ae?^7:9c?mM????7?+?????+??"E?x??n???V?m??m)???\?V,????v,Z8?C????<?=??(?
JY?
u???D6W?1^Vu;??@i?6O?	?>?i!?+{???/??	?????z????
???"????%??)?>z?	?O?p????KQ?)??Z??.?????\@???G?D????N?|??U??????y??eQ?*??D?vb?????H?JAs?G?=?I?-?R???Xj?????]????U?cr?{@?mM??M?@#???+?\?/????a?????????9M?m/?????$??;1??n???T?S7i???D?x?E???3??D
??X???6?a?/A
??UR!???z?@?o!??~??g? D5?7:?/-?VIY
g??\?X?(?D??
($??Q)??????D?@#?	??M2?6?r??<I-z%f?-?0?JA"%?
??fD?{??Yy??$?*??????;+?????a? /5B??9?????
?K?E??0?#[???bK?"?9?
?????C?4sS?q-?|???????&??YJ?h?????M?wv??W?fy??@'??C?,9,+??g!??
f??6?HA???8?w???,??
[...24295 lines suppressed...]
UGd'?}??,%???????????????M?t?B;??bUO?=?????3	???z????d?Td????????B?Z???????ib}??l??a????'??>?~?
;B?????Op????j?"?6???<M5?b???????;|;R0x?H??????U??JEb?*????\RR???O?y.?O?????x???yd
?@?FP??MA???,??d???~??f?_??y?O\}??o??wu ???????G??
????v??g?`4pVk#?]H,,(?p?*?"??,??\}_rv&???:?${????M?????????q??s8Q?n?????m_???\?p??J????????O???~?>???4??sQ? heH<???
?1??????u?U<?????p?]?Q?1?l?l?R??#?(|?OR3NA?jn????+?E???????b????e?;???????(?F???H?f$?%?M??Mt??-w"5???????N???I?$I??????????????m&K?x??rg?7LG??? 7??
B????S?.??H?]??????HG8(??	???????-???!??????|_?nL=j?_?i??an4?V/????u=2?:5.????{?IOY5'??i??vzQNXv$?O2?????D??V|??=??pff??Gr=???v?vm!?{???T?{Vii~X?? (?????I2m|??7/d'????U2ZQ?q???u\a
m?-??V????-?s??8???x'???$?
<d?`??c'im;v?m????Y?v?YT??-n?ZSi?,??H?????P?m?u?? ??*?v?SF??f?-?*ZUI(?`!j????[+X6BZ?ak-?"[???E?
?)??KlIm?
?4???,?C??+?y?q??"????????7?E ?(?d??ri?????z0D?!?jT?????AF???[]i???h??aF(??"?SL"r?E?????????????????S??pU}{?y??_zs?????????f???B???BP?x
O????[?
0tI???Jb????_??;#;??Z???,?L????3)I33$?30	wpr
EN???h??2???
'?& ??c!^a???O,?a?/?????|n0C???n/?}?*??	?8?Y6?/?$?;???R?#?ID3=IRhj$L?M@???R????f?iN??

7C??Y??????Z?f????z?;???;(sSpC"?(?.?L???????g?T?s?CbN?
?{x4$	????dmw?K??C?C???u???|?h?0?>s?g]Z??
5d???K??&H??~x25?????/)???YeK%?\($??Hi
????f?>p??D?8d???T
?6V??	???????0???q??
B??G?]?i?dFE??a??`?
???N?????S$X?~??????=Ug?c?6S1???M???Y?aOw???_????FA???YO?vx?Z6?????S_????????J,??"e????$uB?QRc??r8????a??w_?e?g????UG+??3?????u?i?x?p?? ?qIW?Lmg???T???[x?Vp??P7%???:??
??YkJ???mlv??7?7?6?????L?;???m??=?u?????????I?gH???_?????=v?w????j??a????{I"A9>?????~??J>???m??s?????%:???&?U???|????I????????Z?(?QJ??l??L???5?DF?f?&E?H??Y???`ML?&?????Y+3?REh?m?j??QJV+Ym?)4Q?6-?X2????h&k?????b???cf?"l????2?b??)?@?0?b???G?U?}d??d@?@T?
X0	??N??
????s?w??7?
???
???@?`%RYQ??1|??T?g?ge?Ga?????U?t??&???w?????c?O??????s??4o??q?|<~?C?L>????????L?g???,?w.??>?[??F
?e?'a?z??3??~??H?????????[????WK??t ?C?3w>???????L?tJU?*'??????x>Q?N{C\??f>q.?U?s????m????F???X]\?t?dN[???U?4???O???2?_dF<?m_??b^?C?h?s?.?"q?{'?	Z
??3%???RR
???T???w_????9?^
vY?cy??$LE:?L?k???`?~?T7?QEV???6&D???k?c?	????D?_77?????~_?/??&LT?2 ?l[`??_????^??5?E_
C?@????? ???"?'?x7??2Crp??i?{???7?A?8K???y?M?y/BQ?eQ0?`????Om?1[MaIC??????&??
DvG????e?h??Xa?c????????Vv???a??????Z??\?????.???!=?$v?8?U=a??rD??? ?YF3u?	??W??4:?#???t???zq
8)??I$???1%BI
??
fk?!*`??89/???xm???46????hk???????O?Q_?N????'?F????>o?Um???????[=V?U???pVs?u?-???Zz?,q????VL?E#?z??aFd?t???C?u??|I??????~)H?0 at k?4???5E??8e???^N`?+?
???????L?4????B[??}??????d!?]??O'????PH??b?N?{?*?"????^ +?;?bb???>q?ij??e???|?b????w.n?9??bM?;?,c:??$?zwP?>|?.??0????aj?j4M+?P9??7o???\??P????K?e??+???V-?????Q?]\?&1??2??XUV??4:?j?Y'Zx????f?5??????<?fbu???*?Df?*j-??\???f??l??:3f^??'?z?Nb?z?a^?^p??aC?%???????????x??\F????f+Ud?T????Vs?US?T?\?|??=f(???Z?+3o??3???Z?[?????j?n??>??|?????0?y????zx?o	U?JX????s
h?*???Q????jM]S???j?
5"Z?T<??????L?m9?a?/Y?5???3?[W?>??Nyr??x ??PH??Q??	
??fBc??S?????v??#?}??S?V?,+??C
vn??0????:?|XlOk????S")?8???r??	??P>??????qC?B?\w????]?Rn)??b?p???????s?g[	P?T%l???Q
???	???n"?????7-;fI??-!A0??)T??????f?m[z??w?	???%???c????9????}%me??t???&????y
]E????t8?????0{	?hY?G8?Gs??0cQ?
?
??#?Q
????]Af????r?<(???{??<-????W?????C?<*???????nk*???Y|??U?n??SU?*?F?v????wbBOnzj??yiU?n?4?q?\??B?4??+1???W=vw_,n??????}??,(???:?????????n?8?(?"?5??SCv?t??r???0??F?,????q??l??9BVaT#&??j??f0??w]n?y?m????7??%?^?YJ??S??n???m?USn}dolvUl???T?a?7?????uBn?1=??;??????		
X>????N???5?!?N?????6A?D???D?W???HC?>R??/?|}???>??????dE?????|
r???y??GgD?Y?????/??T??R?'>?_RZsH?D??l????SR?K=????n???F?9?.bL0??	quS??S?d???i
?`EdH!3??bB=:x?_??H]????I????$?k?J?"z???pV??L]@???wa?P8??????? s???V
?????0?$?+"
ECG???~????????(??=e?????.???<?
???1???????F?,/??P?
K?,-~dpERX~ ?`???@?
?N??"""$?I$?I$?$?I$?I$?H?I$?I$?I$?I$?I$?I$?I$?I$?I$?I$?I$?$?I$?I$?I$?Y
??$8??E?$;B`DrI71?5????k????????X??L??Pun???????V??6?4?
??????)?@?e%n???h?k1?\?m??Z????JZ??????f?_??sy?n?????8A?
?????/??????????????:??d!?a??v1"v7?m?k?C??I	$*M??LpG?mW????!?`??5????#??~?:#j??J[???)"?ZP?????]??!7????	?????mCH`F?3$??L3???I?n??R?????Z<t??G??z@???19?v?5?sduw?
?O?F?D?????Sd[???-???8?D`f?????-??;?
?1?$???&?[w??V????f??z???JQ??Q?????????I??v??p??Tsg??W??&m?7???_ly?3?d
???????3?4yY?F?/I??????????GB$?
??s?P?03???R?????M@7?[U?Qs?	?zH??t%?FfV????N?HF}7??fs?????
>9<?????n??%?E??l#?`??#????m??F0?t?C%??
?^?0p?d?????????)?M!L^?.B?y??B1???k\u?@?C????lX?--?Z???B???????LH??W?<9?UZ?/?w????j??
??
(???^????c??S???3???f?]4??x~=P?GZ?
]oIKT?b?z/?.(??P??t????_?%?4= ?N????i????s?G=??hfm?Xm??s>:
?)?g??????~O_???l?f??-??b?-"v?K8???C9<?O=]?(5?:?
??z?????>~p??8??????a)G??;?K5^?6?o??H/V{-?o???e?/w??
???a???i`?L????, ???G??i\??W??Dq??S$???
??T$	?????
???????=??,0?|??????0Z??$FL3j=?^_?????O?'<?
 2KL??,??V??B8??N-'_GI???{Gww?\?]:tIlW?E?f???`n?[?`???G????2??????uoO??oD???:+m?
q?mp?gj?n?????[W?'?%?%UNf????Ye
????t??g?|?9x???m?U???mi4?q?7Z??Oji??t???=?z0?,l(0????O?Z?
?FW?
???l?B??#F2????B?(???p?v/??;????4???0a???O8???U???q?m?????v?d+?X^?M0??H???f7??Z??s????]u{T??a?'.??glQ3????Qj]D?D?N,(?<m?7??c>?W<W?<u:??}R??<KU4?4f????a??
U????
??O????d?5?&r?<???u??1l?2k????#J3????b??Yw?:4q????p?$*?9?:?e????}?r????+?1m?{W;>??6??fc??Q?NA???
>???ms
ADBQ7?J,???????f)?9???l_?tn?x??G
;?????QC??	{C~?????6\j?	S}Pj???6g?wB??+WQ35p??#M\g???l?m|?k?@W?>????4?EBI	?K?
?:?lH?p????V]????a??ip?n?!
e?6??k??A?QRY(????????C3#?n???kfD??X???Xc?v_??????w?????????,?5*??k??t???M?6???c}<|b?+:??'?M?	KS?
f+??<p???3??'???
??O?Q
I???[Ba???!????=a=??J???2?d?,???;???k???o???%N???)i?{??
fg??L?i???y?O?oaZ??s??ma;!#(?'?!e?T![~???j?V?7e)U?
?7????q????69a??S$?&??a??d???
I2??kzL`$??Xk?`?[.3???Dv?t/??/w?C(?`?+H9????=???\?7t???????O?Dfa?F?s?s?|.:?<?m|q?????]?{???????c?z?????g?y?=?f?
?qTA?)??t?-???C?_g???
??d?<>?Ad??\?G????o?????<?v??!???Y?-ivo?L??Ff=T2?*?f???????w????#
?"???g-???I8}??if?y???Q????uA??P}c???j??????2?g???Hf?
??????~7:G?<9?????16???I?=F???S???V:??S$({;?p??????s???S??8CO??4???W|u78??`???w*?u?a?vvS???^??I$?q?H???Y??????~???I?8???(???
???fNU?mU??*?y64??????Q?0s??????y?????5???x??W??_??_]??????????wrH?29?`????)??JS2En?&
'uL??5Ea???k?9?<c???? ')??C???F???2fL?/d?????;??C???Q[?0??j7???w???Ss??I??-@???n?J?S at B<#D#$$
!?a??0?[)?w?9_I ?'?c???AZ?????A??!!6?c?????k???t?lc????9?????L:i ?0?m?S????F???e??B?pa??T??x???????$?,[???x]D#?}?^nP??=L?.????_5	????????P????M???1??????j??.??T?#???n?d?1??'??K)_</a?E?U?E?E{hE????f#Y?e???8~?vA??T?(TC??[?????E$v0?t'??61?6??~}R?5HWoT????C7?$?]O????B^??,Kr???Pt?f?m<???
$Tt????? 	????Z?a????f?]??????i????????Q???buS?W??
S??{#S?Q??!?Y#?mS??Lh]{%??/?~??j??Z???????O?v?v-AHd0(?!'??-
?{??k?`(T?{??f???5??^??H?iX<??7?????????????l?,??*?_f<??3???x?????
??j???7??Q?}=?
A?`?????
??W?d??2P?`
ZU?O*???nAZ??
 &b;??n????5 ??\??pl??Dn&H#????D???H?f??v"?$?H3??-nn???1??v????:??x)??Z
???? ?PN[?OO?????????	?????#?	??T????L?????5?
	?j?=??u?[?,??????Gw?#?@???|?5???????
???c?|????PP@?l*??????f??@Q<??iP???2H;????/?????z./PJ$Z??*?U
???(R?8?>R?????@r??x	????p???H??N?f;M?h?dO9?g????????????+R??????-?P?a??g???H?W????
?????eheL???Z?p??T(??	?bT??
????3A?`?:??q????<?U?"v?#??Q???7??vu??F DV T,"H{?????[???Cf/???:?6-PiT?y?b???1????????3<??G????!?????Bp0A?E?!pt?4??h%??fE ???Hi????dX?#7P[?
{Chf??c? ? ??(t5?Ok???
A?????4X?<???4????	??I?g!n?E+n0
?A??2O? k?n??P
{H?	??
=?=0\??z???P"9WoR)&???=~?4?w?]????a?(m???5?9?JR?(?hR?%h??C??X?v?~I???B??tB|eJ?.%Ya?E??I??A?:D???c=S?? <v??-y?????bh/ou/??; ?-	 ???<??F?????P????S>>l??:?? ?H?"?x???XuT?*
?
?D????`?,p?i??\?c?
???Bh?dw8y?GHY>??O??I???A{n?$x'4u
??????P?{?
P?(??
I?p@????r?zf?A4?q???{B????M?KDNZ?;??d#???i0??|??????{Q,?c??d?(?m?B*???????T0l?	fo??xH?G?????t\
BPSOly??G?(&????u??A$???R?~????2??
M??*???{?O?E?>A?.?x{??A?5
???D?zgm}E)?????d??????h??C?A??H?#$?^???b??>sH?=?O????A??rB?y>???Ip????6IR?Z
? G??V?@?? :??4??
]??a4	q?b?l!?L>??ZuD?C?f??a"???????F
?K?a?-d?BJ?????`v=?[(?Q$R??+?E???^hR?U???
"v?S??6p*f'?M??{Q?????Q????M?I
?????m??OQD4??)2if??4
j.	"0%au??x
~??|?>h!???g?P
???"a??l?????8(B
@' ??8?Cn???9???B?C1??

?A?~p?
?k????????????X?"?k??V?A?????u??N?v#????G??,/?
^H:{"??$
?
?
B??.?CiFI7?
??Q???r????V??=?L?{???B???D?A???BD??,??.?8?h?C??????l,E?T$VB???/??!??>?!$?_?????????_??2???????d?????????HBD?
??X??p??????Ud?Q
?????n???WR"?T"??.????9??>69'?y???? u	??-rp?hQ?I'#??
?r$.?JD?+Q????
"?????a?|8(?'N?i
}-???(??M???
?=KG?R????K{?
'??**??Yl???)??w?ke?X<??K@???????7??????%H9???

{?KB`???#?Y???;?2+R*?
t n?r?n???@
??o?h@??p???P623?]5??
)?D?y??<?$??/M=?I9?4?????
?KV??0??w?????f?c???sH???1v??s7I?F(???&?=>RS?Mx???
m???3b??X?x*,Q??????b2?`??8?y??2W?XR?zP?L
?????S]?%?H????
?H?a????????
??6??
0m{?$??[?`"?\???6?C?8k??Z????UsU???????!wO^???}?'?a???knHD??Pi????,???a?c?#	++,???
???o????p3?:5?"??
??0?
????h?2a???m?)?,?2?n?A???5C??T?????????v??]?s??uUUZ??1UT?qpUba???^&Z
??T??a2G???T??H?foR?x?w????>7x???;?pf????[??H?=?v??d*q0^?????Q???a?haI?#??g????h	hRV???_?????o'???????'n??"????C????~???/@dI??'b[??=?????BUwU3??}?@?9	??<??????*"?(A?d?e?K;?[??;-???ua??$??a?8?6y6??%???6?!?b??m?	`????z?~????? ?)G?????v???????P??h?D?0??!??;?????
?&XL!?
be?????H???io????=z???m6?h?R???jm
5????>zs?q?4?Xc?9]m?a?????????=TY?TB?rB??N3
@V?s
?
#??i??.??????6??n???d4s6R#??? ?^.^p??
OB j/0??^?4Y?L?????T^?
???9??H%?-& $?N???P?I%	[??M??
1???Fm??x??z1?c?????_~8?#???????a?s???/Du?^?:{3nt#??????HN??/?|<??5????? ????"????
?M?$%6?;????c???u_A????;m????/?Y???c??F7?8V????3`?#{s??T?MM(h_??PV????0??4?)?"|H????\?????={?l?\?SU??k?|o?=??#m??j??f+?5??{A??t?L?v?"??:?WwM?*???$a;G
???z???<???
?C_W??????????B????S????a?B27=
???qH?;u?j??wmU?????%=??[??<?v??B??d?????AM???':?Z??????E
LR?*?D??Ig???n at g?f?P?a?SP?c?^]?CU?q?N???=J{h??#?????0?<?9?C??1???????^
??vV?)?idHHR?P?G??X??
y?j??`?{0 ????????k?%?z}P?o?c1'|{%?29;?|?bjL?f8R?@L
J!Y?"}??uf?``F????7N]{??????k
Q?`|
?
BB?j???ua(??$??&b?C??@?C????<?%?J???\U1$R??+?8+?O??????N?T??g??*?????????AH?
t?4UQvYl?4!?g??o??????"A??F
????????tn[??q??XqT!(??r~$V?dn??Y??db???$$???
?@\ 
???d?>???~*W^
B?,??/?~???:E??????p?QR{???R?k??~P~B??N???)???B
y?
???U??????5K??]I??n??'????%m?o6?QU?{+'?7@?#"p?~'?a??a?4?Y?z,??w?m??6?RT ???????CEVV???
K?L
F??%+?R?S??P??u???????wL??Uu+??a00S?2?T??[K?D=2R82??????T?CH$I??C?)>???????A]?uX@ ??"???x#?1???b????VW@$k| j?A?b?$c
"?????B#??o?5d???h???B?n?(?Yr???H<?????????N????F?p?p
va*??Z???`?????2?g??????W?ks4h?@?????{??0-?q?^???0?????gi
????????;?%??bD???N?????kF
i$???~?C*??????J? ?;lkU?/Q?L????h???S?
?#v?
?????$????&?kG??"a?????????0???????+?cA???w?"tPQ?????????.;?l0k0????	p???T?%?????y?!X?????????@3wW???r|?@?M
?Hj?6????m?.???6?H?i55+vlj??[W???00????A)BQ'??	?S3?R??] ?_@?(?o??P1???pEk80G?B(
k:M?r&`??
??
??ca?$??	2F?%J?P?\y????Z?o?")c
???,(`???>?$??
?P$??K?_?Z?3Ht??gy???qL??B?!"&??E?
>?~?YULE????dH??+?	? (?E?m#?u??4??A?U t???&?H?0D?,`#Y??#???PeO????@?F???)Y^?X)?^#d6?l?V???N?B ?'#?sOP@???nN???<??`????1 ~M?(??
?????????Z?@?)??t??eZ?n???:*1?)"V?6?A 
?J,??m5v?]K???Wi?l??5???X?????>\??T0?F!EA??S?$???????D1"K???a

?f?~(
~H?P?DA??????s??q??(u ?!???J'8?CH???*@?
???5?6?????U?s???h_?u?z????
@FB!?,
?g?pV*?C??H$???????w
UM???
?!lH$?:???0?U
B???dS,???L

?'H??C????B?X
???;h@?Q?M?P6?'#
,wGd??"?h??\ ?J1-bj?g??F???e1??VG?%??J{C
I??h!????1<6LX?s?@}`3?
?Be??$E_o?????]??S???L?2D??m?????C?fF????ud,?W??q??BH?H'???????@??r?C???d?8M??C@)?i`F! h????~<?3???&?QR????_??>??^h??z?i?\???M-?????Q?l??d?9???U?E?A???????=5??L?8
HY??^
A?P?q]?b?,?,O3!??0L?i)??????m?v??'?l??=????*?
???
?B?"d??#U?[????%?d???)??e?
??=?,????`???k"????q}???F*????????t?(??????~????-$????????{?x<?r55t7?lk?d,>?AY???????????3a??@?&$M4?b?2??*s?
=?????"?)K??|

|????W?x???R?.d?0uG?@??Q?B
?0>3d?\qWAl?????k&??Zl??D'????X?q?,?uL!?4??T??7jl?J?$?.??P???8c??^???s?
?C95??*/Jum* ?mE?*??$??<??#??/
[?gM?[????K`72C??&?nZ?????$?FHi?#i??kp?Mk0??#}{!??;$M?[??????+??3????,9gnr??g?????&?[??0;?p????\Xy??6Y?a^???k?n??????e?Ar?Bb?????'ms?4??l??=\}?v???mP?}????|????,?/?U????(?~???W_x??]8c?o,??Q?Z???p`????B~T6??f??8;?r???[_=?89?D6????V?-???	?
????3IH/22??
J0G|M?
_:3z?\B??)?0?.8???"?p???????O%??#??6o?N????x
???V'?Ry??????G??????M??::;???4p??a?#?????w??l??0?/<??.???6??? ???&?}?%v?oM?	??E?f?;$?8?3UJ?<	?Z?ywp??C????0???=8?9?vn?@?FO??k?u?????nv??A??+Qo?%e????M???j?r:X=???p4??3?;'V(e{]%q<?~f??6h?/?u???T*???U??3??mL??:?????q????)>?][??u?(A.?N?/?\??P??!i?)???t?<???$???-L#e?????????%?????5?0}?tE&??k at Nw)?7VXl????N?L;Cs??q??t7.?\jm??r?3X???7?????7?-?2BB?li?5?_h??
;??3V??J	?A??"???'?a!?????4??1 j??V-.H??%Yf
t??k?gX&u3\	?d??????H?+0g????
v??????~?I
?
??8?Mn??K?B ???
??N?h????=?FH@@????
/vS??@J?=W?v?\
???@?&?E??k+	??(d?????D?hX?"?L|C??????s??!=(Z-?`??A ?(/?Nr?L??)+.???Ca3?>6???????????t? ?????l?@?e?4h?H?#??
w?:`
r??1?I$C5N?B??R??|??
k@?	e?dW????Y>????@???TdK?B?*??U??????X=???6????$????]?S???????EA?Oe???UU???????Q?G?????0\??????UA??	?PJuW>nG?yHI&Es???
7???S?hf????d??m???.v??????????;
\9?{?Pv/?X?vQ	K;B-%?Tuty?)&?????!??
{??n???6lm?^	?L?[??W??_?L?L24 at N?Ym?$?8?(??	???n???h.??<??g???0?
eA?0????\?8p
?r?	?<XE?"A?,`0`B	?2E
?Z]>?=?<B??r??,<:Nc?0a??B??A
?V?
?L???tu?cHP???3?n(
'??L	
??y?@??W?????!??b????,?`3??
?tRA6?&???cZ?mm?l?4!?l]N?????@?Vr???????M??????\??r?8??????`?????X@)P?22$???`??j??)_?[????pe?%v?#???M?$;?u?d"?`_?l]Z??????????fE?j=?P?C??R?G?SU?m???uq??!s??"o??Fd%???????5?l?rB%8Q??Ps5,?$%H"@?T=?mu?Q?I`?(?????Q?myBwiZ??U?n?x????=????$?OKI$??)HPK
fF?B??A?Q?y???1?Q0]F??
? ??C?L4X??X?	B_?M.?i? <?Z"S?:
??AD?
??`?F??T,$N)
(?????90H?=p??;b(???`X??L{s?
~?T??????@?????m??&?
?g6?p;?E??QH<n?0???OT??~ ?w?
d<?qA???DK?
H?d???QSH? ??AA?$????}?
????3??????L{z?e?Z?8)?"?#P???????>[0?jhTv??N?
*?_	RV?V)HD?E?quj??!?u?+??v?2?X[??h??@(9????!"??
 ?a$D?&???h??U|P~???`}?
?C???W??N^AL#L?
??y?C?2??=KHma????P?m?A??,?????,!?)C???2M$t3
?Li?8u??
L&I?????X??h2?I?*-NM$??W?J?27??=???f&l?~Y???
X??XB
????V?1?m&?}
??=?+.L?P??Q???????!3m ?r-????I??_%[n?%?c????5	???%Jmv?Y?
???X?????sE????OR????>?&????y?%r?O9??g_?
`t??M*?3?g??y?hW?/Brw????[?n??A]???uJR???2M at fc@?$?????;?????(?h??pD=?1???
0????????0?B?w$'???74???????H??QL????BI at j?x)Q??
?h??W`???PG?x??G??r??(?J??mu?u]n?ZW&??!}#K?P)?
@???#G??,b?
??]$Wc?#"/???
????,?{f?r
?ro????R?~n???|????c]``??H_`'??s	?????????????K??p??r?!O???I-(????B??$??T?&????C	,????B6?T?1Q?E? ?qd[m?-?Uj??Q???^(
)??"
??Pp?S
?R?(?>p??qH  ?@B??H?	?G?u????'?n??
?[i
hV?-???h??*a?RBH?a
??h???4????&?H0+@??(??yx??D????B??W_ym??<??Gj?+3k?-?M??6Ij?R??R?v,-Ht*??#??w?!mH????z0?T3AuT?IEXE??QN?-?
5????`v?L
9A?R?Lm???2????ArLI??P%?VMb?V?5z?W??-F$ !Q-??sG?&?=k8?D
*?$\&%:%???????HM?# ???$?. 
?O8?3T?P0(?Ae*?????#1j?a|
?[y?
z?%!U
?Kb?H6%???]?a'??4???
a??$\?
qn????
?b???9!???e<t@??'/D?n???RH?)
??[d??
Yb?i??1?b?[?6?D?	???? ??"??????`??B?4???2????????-w?>@??|????V?O?+??wC
???z??9???

??h?	2?c2A?'???`aV??J (???????u?W=?`?DS?{~???o??f'!c?-
???;NW???K???h	?sx6??f27,????A????d4??
?)SA"lU)???	??P?F?????P????
?&???j>?lm?n?m?.(??[??E??"?}?0?
?{m?*??G?%bI!6???
??E?Kf??p?????]`Z? mF????-???h?h??j???a??>???1?????+???????k??.#?$????~?Y
-mR?? 1k??A?????2?a????#`??`]???${y?
?>???????D??Z?)??q???nh?=iN??F????J2D?;?????U????<???PTI ?bDZ?~?`@????X?<XA??:S??1?mO????C??QC??????vs?#?? =Q[???x? @?t ?s"???"???N??%0?L/?k
c?Nv???4?
?!wt?0?)@?????????n?`STP????????????Z?=?ss?????=?D'???A`?x?? d??	?M???>TTh;PS
's
?
bJ??We?2&0)????"m?E??
??K?P??E$??'q?"R? @@2_?rH?K
M??
??v??Ln???M???U??M?PciU??? \?`?Q?
?? ????????	??e??'8?@??(SU2
??p?6???|0t?c?o?^nf????	m?@?h?T`$Rv?NKi????@??_8Q?$".?7 ??Q?:zu?~Rz?<?I????e?:!p?W?dagX$Q-??T0ACP??t?A	r?
TRE?~?I3h???RN5AK9$)???@??aX?
%&?h2K {[??S?h??F+?@????d??
??????>?A:??m?+??O?? y?
?HFC??mK??rvZHD'?HE!
!?s?o??cFf?K???dQ?

L2
#??!???<?UO
{?;
\|@
r??w????8?N???	?C9
??]??
R ??X????~xY#`??Bv??S??????????u?

o??cC
???"&?N?????|KWy,?t?n?\:&?m?[p???Z??6m???\???"??@?$??*!?D at z#k?}	L?x??H""?"'??r?,8$?F?Z?????H??5s??C??@ r??>?qd?~y	?:|A at mSD0U??UV)?\%?xUB	
}?.%??!MQT A?"?2?b???????-G,%F?9?Nfr?J$E7?Y?d(?G ?O(??=???????hq+9C?D?????"?J
???!?)????:,?\?0??4??$?b?L??~?~?????a?j????c ?
 C?.q?0h??"%??>#m?@49??I?I#???q(???+Z{{???|????p?B??x?[t??(?FO?)X?v?u/??y?QVqv??????m[m?V?m[j?m??m?RPB??	??KU??FR????wMTe?h?jwwv?????nZ???%jM??
?sL>?lB
??q??????p?????01?????r-???z??z??? 
r??:F?T???}??{??4F?v?X??B???2Q=?^?Q?R?p?%d??!3Y??p????c???`LmmI$H?>??	?1;8?mdTA
???b?	?hQ???n?3x8l?,6?SB	???d??V??UX??
?p*?Aoa??]nu???????A5K?(???q?????????M??Z?Ss??
4??;J7l\"BHQ???'-??
???Bl`?????E???K?pY
?????h!YYl??????U
?UUUUUhCW|???y????_????H?V)o???p??I?WP?"H??d1????????????tT?b??&o]?,??T/6????D??,?,{?(?(?????<K?R???s???O8-	??H^?<
?(??H??c6??
??F$???*K#Z?$??B?Y)F?????4b?????????i`?:J?K?2&!,??h@?db?0?#???;???Q?mNwx??W
?x??"a,b[??????B?6???i=????P????HS ??PzD?F!P
 H5?U?JRvy*q?????????I???Q?e*????H??
K?4(?2?>???
?htt<?$0?????.?$???%???D?P??UQ?u?G??
????A~??&?`?O??DBgH?]1??Wa??@:????o	
v??@??*?_?"?p>?????????
?A????????Ua?"Q???T?4_j?_2??z?1y?????
??;B???
?S????YN???)???q?W?t??ihrFy???s?
?"k$??%3s?r?S??'??Rq??????;??8????E??tA?Pc?a?!AP _?d?M(?)!+??X[AN
??L??A? (c????8|????p?U@0?B?#???"?$?#Y
N??}???P??0????"???f t????
??o?
K??F???"
?&?'?\OV0??>)t????Yg?&?<jT??T??!?$?4!?

?{
@???
0c??D???V{#"Ay0!H?#?M??3??8????$???Bg?7????????????2EA?Ch?st
?<??????]t?f???0Q?kh????,??4??T??E&?|??1?R????Z?5??	@?S???0S?
di4?s???KD??i?j
???H1?9z?5i8@??? H???GB????
???+??????L?8?g??
??y?J>e?U??????m~?????iR[Z??-Fkj????????m?-~??n??V??e`?
VD?????}*6?f???A???4?MJ?B??J^?D?V??+SV??b??{??t?
??I!$	34})4$-
???.?*+????"?(HA???

--- patch-2.6.18-rc5.gz DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 11:28:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 07:28:21 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc5-git1.bz2,NONE,1.1
Message-ID: <200608301128.k7UBSLwv028965@cvs.devel.redhat.com>

Author: mtosatti

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28945

Added Files:
	patch-2.6.18-rc5-git1.bz2 
Log Message:
Add patch-2.6.18-rc5-git1.bz2




--- NEW FILE patch-2.6.18-rc5-git1.bz2 ---
BZh91AY&SY???"
aI?bI??D??#"'?zC?l???h?????
1Y??C?????Z??f??L???J??/3?"`*0?"?J6%R???Q,????????l0??	,n|?0?z0FRQT??)V???*??????+
??u*i?k???2?[???1?%?`_oX_?U?????=?&?y?Has)?.#??0i?w/???????Zm?C1<6?????)fM?-Z*???o?@?F?C???????g??????????)y?c?*?"???S?+???'??}n??$?{??P?? ?.t????\?/3|??@?	??e
???RH??????W????UU??
?TPEES??6@???
??5??6UUV????????U???p?H;D2??E??I????j?B?
(?+?]??Ih6?hA
D?y3???HZ$R?Z??zP???c??0r??b????<???D???G[,`b.`;	y?c??z???z???FM,Q? ???????(5???????(s8\XN????A
?@???9m,???ov{/????-T??z???;0???%?2????Cp????[?F???t\?@?'O?Y?@F?2D??+??dX?.?m??5'}??p?????????a&
???k0y6Q??+??~?????2??3??
A
?BCw?y<k,?P????y
"%`?fz??????>H??Z1?7??,?.~????y??????k???4^?F???fB??K?????R???????????OFR??y???????8Q????[????????????|?=G|??6????}??-?????aS??T??QV?T??V1q???*????1??
8yh????? ?????PG?-?
??{2??019?^m?r?????????s]
L#????52????' >GaX???? B?3??;?(?R6 at Q?Tg?????1?.?8?3??r??aG?o?s?????[q??w??l???}?&?w H?1????????S?o??^[??-r+??(S??I^????r??x????1?l?#???*?Aj?2??gE?
<???????R????H?0??Y?M+?????G?i???qv??}U?/??? i9L??>????6B??$?'?P?!??9?M?[?T?+T?/?

?%?Q~?i???_????'???Zp??z?|??9?>???[??i}??y1???d???B?~u?s"????I#v??%!B?TW??????-?J}wQO??G???_?mY?M???;8?????bI???c??T???????????m??a)A?f5p?????3hw???ga]D??????????sqap??F-\?*??????V?J?T?BN?AH??^dr???BA??X>>???P???!???[F??O?XK at P?~'?<??????X?C{CK.?I[?n???6??????`?`?A?r^{??S9Q	???x??
]?]?U?????$??????|/?????_Vw?N/K?t? *3?M}!??????KEU?_9????c???????????????Xs??P8??3?""#??.??????9C>?Qu
??? %??b?????T?$9?{
???k
??????+g??_[??]?*??mA?@??R?$???????2?M??h_??W??8t???x??3?-?IY?+G
?}5z?S,/
N/j?? ?^z?,V?*?L(??oX???l?????5?&???%??rI???Qb~!bX??x"?@?????>??gZ??????_$???G?I{????A?3?????7]?
F\??P???????JJh?3????,s=e??tW?1?????f]?\1TR?ev?e?(?E&X??2}??&??(??v?g???Sm??K?Z?5io???B??????EU?\?A?W
??>?m???9?zN??`3*?????+?q??9?u]?% P8?x?\F??.??F????f???FQ]?g?~??*p{?AOC?H??ys?5TU???-?????5?
?p9??? I??(??A?@??4?QC
?F1??G??R>q?8?(?i4?J??jw???>R at BCBV0dO#??nE2*??m
????!UL???ET??-ib6?OH,?CRZ?????F'?3?z?r????	Sf??T*??-+?@??S????
qf?$????!gl?q??S?f?????e?W?G8,/?Y&?n???1?"????`?'b????YH???+R??!??'f???QP?B??h2?@?F?F?h//L5??k1j?Sj????; ?s?1?;#???U3\
?X???-
?
??v?NM?Ar!^VX?nI at Cj?
?b?D?a???????@t?]d%D?b
Pd???`oJ??f??c?I????_='?<?????u??p?????`%?????@??H?Y{]R???P?f?X!???/%?z?emQ???<X$+%??]???n3??A?#?B\?j?!?W?WvVs?"?$QQQ???4?
??|]??'??=?	?}?s???8??,
i???@???xj?^@?[?f?\H????e<?
?ez]????O?^??+?Y
?z.?D???cp1
wI??b????	j?B??-??l??EofY???G?P?Vw? ?/pE.PPcJ"u?+???C?A?>?<V9??{?>???-?F??2?d;??????1??tW???sz?0??-???ge>?/Y{??a?]z3
????.
??1??W??3?F	??d?U?r?h??PpHb ?T?'??Z?.0h}&?	?Y?a@?7
? H}?????????:
??g???<?,?O???{91?q?????
^?LWJ??TG??=a3??????0??1?? ?e??????XM???
%?4d??.???&???????\?f?o?w?{?};???L???(?
0R??d.d?3??aR???!^?1?f`1c?0??{ee???l?6????X?Q`T?!??PZ?F?]?FXS%%?????"??b??:omh-?a^?p?|iU??FG6=m???6?0?*E??#?R
P???%?{???w????x?(=??k???$AED?R????{??+????C???d?V,?U?T?)4??S???????}????????r5WA??&P????z?S?u?O<i?j\
;?+???b?Q?(????3?X:???h????}?sfa?Cz?su?R?k??o???'???X?e?h??????XR?n?7X???{h??6??9?_??>4?"f$?T?T?K*??H?9B
?1?:???"uGl'i
?/C?^#?????=??*??+q??/;?5?????
f?6??
IEpB???!M??C5?
.,?7??b1X??F^C<?? RtXn?.?I??}d?????E?	1+
Z?S??wT
G*?8??e3?T?l1?W?????!pi!??
m	1
?t@?b??!2????N`????^N?P??C??C??O{???v\.????????x???-
-??(k????!ma? ?
?z??r7
G??	???"I????S(?[H0D$E*6??????I?\??~??????am?)?????=????
??6&s {6???8*-?T???"?Y(m?h??I?ObD?v~A?2?h????!4h?OT?UST"???:4??fZl#???mJ???*j F??6???????k?@??$????@??Bso;?V3?We???UR*?P~??AAA``?dk?	?s?Fi$?#????~"?]$?)??ym@d??F???t\b[l??e?$????d???CMY?	|[??nQX%&H??`?U?]?0T_?????????v(Rh?@?@J?\D?j??cz?d??X?@(?????Ce?`>j??A??!???	
8@?m?0???*???c%_MZG
?V?
?2??0????s?:?{?? ?$%NT??a?q;????n?)?@mJ?c?????B?p???P
@
h3G?=??>=?c???I]?`oh.h8N??O??n81)??1.v?e???0??!?? ????K%?b0?n?!?C7?z/^?n]?`???N??????'?M??I????*:|^?@hy????=P??0???|?2?????0t?W??ddbf??"?&I4aIIo??3I??t????H?
# ?$?
?*?*a????y?R2F	7m&p?	?P???
? ?Aj???R0?.?t?[?%?#b??????	f@?Z???7??U?a? eF?w?P?L?$???F?D?.L??M,?8?24?D???
G??T?2B/??$?oi?-w<hG`????/?????	$e	BRQ???rqt	????P?????;Z*???U?{??K?????
???y?ct
)?BAf???1 ??????????s?L?	??1Twm?X/???
R?H0
??????8X#?}(???{?J??`wW	19Y
DdAOS?X??I??s"?"?ez=?q?????"?(HSM?



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:28:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:28:48 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr-2.39.tar.bz2, NONE,
	1.1 .cvsignore, 1.6, 1.7 man-pages-fr.spec, 1.22, 1.23 sources,
	1.7, 1.8
Message-ID: <200608301228.k7UCSmmn027490@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27475

Modified Files:
	.cvsignore man-pages-fr.spec sources 
Added Files:
	man-pages-fr-2.39.tar.bz2 
Log Message:
New version of man-pages-fr.



--- NEW FILE man-pages-fr-2.39.tar.bz2 ---
BZh91AY&SYm????s?????????????????a)O???/zqj?????b?~??x
@
?}??
w??????x??}???<?{w???TE?g????k?????}?n???r??????^?|?oyy^+???c????????v???aHP}h?????D????????
??C[??/lu?m?_]??????x?h_)?z
?????`
Jd
???
?&6?[?f?%?????Y?????K??e??d????czO???i)?*??i;c?d??-??b5????V???{??j^^?f?x?G?????i?/[???_???#?I?m??
????T?w??[~???????e?Q??&?+i?f??^?9?cRk{?????r???Yj^?2?!?e?4?/M?/Z?????j]??M+?`?4j??%???4'?[??4^?oc?6?U??oQ??P??7??Mil?X???2f???ne?i?v?z????????\?h{z????????????p?R?vo,????5	?vnm?????S???5v????3[?{?????X?m?D????n?%kO6&?\B?????j?F8rDf???m???V?*J??J?
???X=????5LHm?n?^?f????7?dC.?Qxo?M;D?r??+??T?kSZ???kc?h???B30???
??R?Y	?[!??Z?	??)?ki????N??????#k[DV?f?q^?????l?Vm?zzWi2?L[??I?ZJ?^nG$???Ix??K&??-\o?M?????tTV?@HU
???_???Y?lS?*Ko??i
!(@m??????n
???????kt??B??8?i=???2.?C????t?_M?????3~???y7?Q??=Y?0b??MpEF?
SHp*?>R??6?b)???1???IiSB"?z
<?N??????7?V?X$??rht52?E???
??`??I!Q?117?LI!???P??P%[z?4m$??(????''???u?*?????U?n????c?7/)o?I???q?g??????~??=G?????#???R#?Ix? ??k?um???K??S???z?x<b??x?\????z?K<6aZU?G???4:??U?9???(??x??|M???<5?????.??(Rb?z7??h1?r|?G??x|?????????iX??-??yw?}????H?dd???:j?????^?M?
?`*?
%>C???UG?8N?J?)??????x?{A?N5?????n
?t?3-????X?q??M???R?S"????.????qUiR?[p?????{????BZ??3???j???C???D?9?????^}/_?i|8??a??????? q???Q?5i?--Dc?f?????
?f???7I???>Z??????+H?????=O0?4?????Gb$bw"Q????1?L??)?????o?P?{ey?G
C?qF???W8?H?bR*?*<???M!)?#????r??|??@???#?
AA?u%?:? 8;:???o??S??]??aq?|_??,???exoM#?a???u??\	? f[?????(??o????????7????????h??W??;3}'??`???\??a?????s\?-?????5?????*?T??*~?8??uO???m???V??8??????????r???o??s??A????M?????p?^??b-y2?#???z?Re????4j??Q???1R6uf?????????k?????We?].Wae?????9???!?a?OKV.N?G??F?oQG?????}?d????9???2?k|?y?n?jB???Sp?Q????!?i???F?Q?+??b??7????oU?5??e?Y??Vj?????8p?]i??}/{;]m???*0G??1!?C[???9???7~?4???[t?m??]h???T?Z???Z????????1???
????W=wO?#?4?"??J?i?e???>??????tm-?m
sB??)X?x?E??JM?MbMB?-?$?G+ _???k????????????C$?v??
??EtR$?`???.?f?Q??z:?/?????>}??y?l??$V??????j??6?v?????b???J???|??|5>?????????T4	?9????i?'W?????????C???5_HH'M??N^?k??s	??????L??b<?f ????:????d4????L???O{???Y??$?q??;?\z????F???="}?+???
?b^77?pdE???%z5cU?H?????uO???h?T?h-U?R???????(_????1t?rk&.??#?W??/???????Py?
?u?/#~?gY????I???P?EW?}??+????z?????L?~%O???}?m??V}???UWQc?my?XE?^"?d-y??y?A?`??F%F?D????
??P??f??b?_??????O????}z<????`?C??r?E?ONx?.??v[??d???p?E??$??a?6? (`???
????"*?J?)??????
?u?kP??v????1=L??@?	?D???O? o?j?&????????#????H???QF?R????w??6????J??????D/?????Ol???d??w,_(W?JRyN?/,??
???=}7?_P?c?X?.}?m^\?k?=??e?##??
 ??6???IA?????q?gGz?k?
?
bIo??#??????$?V????4?^k;kBfu??*X(?5??"??0?c:??y????@?|<??????????????p?}?<?S?s?!?\??????????g?j}?lh%????????2\??y??A?$??)8????_??????~M???
?[?????
???f??bo^??d0?m?a??h?
?N>??p??3?f??</}???/???????#??P*
?
?E ?!A??3La???B??\zQ??a?7???w@??????^?~??|?R???y??? E%W?7??E??? ???:?+JK???[?N???5Q???,>??R"!T????p?h??w??D??q??@%???
?}??+W????-?aM??~$z?~i??
??6?? ??????B??4y??0y_??f?b???l?m???/???????
J9??n?I????~?????D?,Ef?FZ??+????=s?D?O?rEh??}?
??_F1???M'eA2?`?4?I?C???":???&??/1$?;n??X???n_~qQ???.?>v?????Ne?e4}??
???Lp?B???z>?3???<??Iu??@??M?x?<??B<x*?fYV`~??Jf#?i!???=sq?t?? ??(???v??p?^.>???)?(.??N?
!???1Y_
]/c[??.???
3T7<?d ???ovQ?f\?e?o?c??n??sb2??`d ?????ru?~*?^?nap???z!??yu@R???Q?Q???m??{?}?,0t?A??43?3? <?0{??l??Y???v>}?????iv??&g
??y??

T;???????	?f7? ???H??\???7???;?>????z|X?A_ ???o~h??k??????Rd?J
bM0??+?D?+A??R?6??M@??r BAj?d3????jtG#?9?0??l6??f????%?#0?%??}???!
UJ?p?l?B>????gs???(-
???0??l??$O?l8?Yu<?r?+?8?n?$N?"P
~????????g?=?o~??8??
Nn?5-(?'??:{???a?YVt?2???E???4??1????????K1e?????5????=F??
?????j>??!AQAq??n?y*??????w?
???-?$?6v?,h??l?9?4-?B1????^?z^?&
?k?????s4?	T?????@1??????RIT?%\?????1J??f3p??????1V??
U??w??????e??AX ?7?>[)??K
Gav?a??vg???q?r???*??????
?2[@??h?Dx????`(?ulv?q???&P????l?k]?????????????X??????DA????P"z????[????$e??`f???7????;?D?OF2???gs18????s?u'?-@??????*??9j,$??`7?%|q????XQ??^S??@??),???:?&?v.??|c???^??o?FB[1$?Yh?
?I?a1???6?
?m??|??? ?d??O/?????b?????So.
?0?[????rz??L-? =?????\??/???m?>?|??sw???x????d%??S?
?????????
`0?????????????i=]?m<r?O???Z??????8?????Fi?|????t??S	?h???|
???????;e?ij???7y$%??{????+??.fg?????0?L7&????<%=?ft??Lx0???sr/?]???9	c??q?|?R?s?T3u????(???k5+?G??wJ?U?c?9?L??/?zg1?M????%????D?????B???????o???L?????B????[K?????????<?:???w ?????<8i????o??????]?~?E??sq????????L??C???#??g???)?????,??#? PH??V:T????bu????{???n??BTv??a?313??8???E????:??c:????g+?????)o}?V?d?E5?????0?Cw???u?;???-?????`le0???D?j?68????
?Kd???j???{b?^z?????Huf??A???'??h`?@??e?????2=HH0?/?q??(???W?;??????????I??e?]J?	(?????????\????Z
H??JD????????-??hg$l??=W????@?j?:??*??]??p,V4=????H??\%???????(&??@X?w???Z~??U??3Cb?+;????Go???aqeo7?o??????kGe?F?c??????G5?
???c??d?:=?DIf|?0??-?K????.?t???G?;?W???h??????g??LR??Ci??r!??3?N?????????St??+????$K?]~C?n?{??x??6w?{??
m?y?5???G???u??';u[}???F?#?|c.?&?]???%`?te?????\???E<?.???????|X????_???????<
???i(&???????Z~???#M?7???w????.???	U~"zE*iX|????e;lz6????vt||??<y0e???Wf???a:k\)X????<??c.??????_???????z7?????
o???$????p??!4  ???"??`A??g??O->?>?n??
@A'???q???@/???u??? ??_? 
?n
L*!??zv?????;??7?y?x?) ??2Z??3???? ?Jb
*h?W???????z?Y?8? ?????f?
????%t@?????????????@??
!????^?6k???a??7?????3?? ?????,Q?????.`@?9w???
??'????Q?f?@:?a???n|?@????????Ax????s(D?)?}?????? )
'?QD?8?2??_???|?o?h=?)
Y?!????t%~????'_i<6??_{? ?H???*}?~??ep?~?? ??s%????~]x?E"??`?f???????J??p???K??????x?J>???????????Q?3????YQ>???,9d??Of???
?? m?6??U???O????.????gk
{???@???!???HKhb?????????A????e?dA???H,	.?$?y:S{lL????4?u6??)&Z? bK??????h?`?!?B?}??i+IILh?T?|???/_???f0#?j?.5????<??eX|?&? q??Xs??|{'?\_?G?E??????6?????d
>?? ?>b??
C???@AD???<?F?/?3N?>???()F??8a??E???q>???N\??b
p?	????~?~5P???sb?K???5Y|?]???Ak?g?]??<??P?A???k??
? ?~???a???E~a?EA?[??x?`:?????'?Sq??U@?-??????????U?|?w???#`?z????$@???????*J'*
?v?;?HU?%??????P??????[?C-??X????9t??p????o????{?9Aw????dR?2$`?o??7f???"-?;??w???? 
%?n??)?#??a
i'j_??@???b?l?W??~U1wF;O??mGO?n4q1????a???g4???Y?<G?<"?9??~y????>~vv3????r??	-????$?I"????Dc?3%6??r(@xY?
nw???r?????????t??A3?h ?7O?@??^?1?8(???Wh???b??e??n??Fn?????K??>?EO?G?w???wo?{V ?
??$3z*??D?2????,???a??
?l0p??x?$??s??X5#?????????E,I??K???3\?
I?fV=?`?rPrp???f?[e???????3??|??D?E!izF?#J[0Cn?Vb?~y?)??x?FH?H?A?>?%?$e)JFI???%+
$??q??JIv???A?$??;?#??k??c?~?4????SG????
wa????`?w\>????o<>??rU}?h.?8????J X1.Yn?6?w??A??c????A??"?b?????$&7H
-?MI????!p?<??6)??#???Mh?
?M???C6???$?X4?????/4???(Dk?G?$?????K??<?-???B ??A!??bX"?6 k??3?I?#???????# ?
???F??}??s?<w????????x?A~????????V?????U
J?$?>???????????
?#B??id???eY?9?Be??Kr???????????2?o???\?*?????],?z????? ?j?[?????R??f???5???}f??:+z??p??{???????/7_???t???<??O???_6?x??8????.??e5G?>??<?~?3??W?O???????%??e??S????{T???B?2????K??]?@??}~zg??qWj\p????@????????B?z"dA?!?y??/o??[s>?q??7BD4?Kk:&?xo]??????cV0R?@?D?)?u|??z/?c?????{???j????9z?FU)????	?D!?jJA3?c1??4??}?	@???*?x8???8?ZL????i??=????3?B?? (??u?D?G?????????
??	?????7??\~4S?L????]?Rp?2????$?;P 
????	3
?kj?>??\>?%b?r?J`J???!???????}
????N?w????4I??Z?`??&? ?oPh?Xh??????
?e?H?&??G???;d?W???l??2c
???p??cn??0nq<?cEo5??D,}??c?bd???????8??x?O?q???L???Dx"???`.????@??E?akP??b1b9???8`v?VP[???]??u]???j????@GL?
H??????g~:??x?c?1w??HC??????????!?*???j?UU4?????????$??x4?n2?o??V??????,H??&?oKa?xG?q-
???????l??|??????d?>A????`??H????lXbP?p?v??FU??bm?	|Q??(??????}?????;w?i?l?L??jk{1?;?u?????2dR:?,?*,?
??bQ?.'H?AgU?A?1 A!>
?)?JB'h?????`r#??2?t???'???^?a?<???"??tOh?,@?H? ?X?	?kM?F?z?=??Zy?,Htv???G
???c=R?/Q???"G?$~6??Q??'???????? 1??????h?Aw?SL	?y???x$???:}7?6?c)$???%e??SJ??,;?Q???.pD???????$m?iZ7"???w{?Jd?TU?.????%?I??}?????C?uL?AE?F}?\???c?gJ??f???u??~oY??oD?Gp???????G????,?Vt?*#Fb??????????wu?????*??BMi|????/7?%??n:7??Gt??ZH??K\???fv?u4??b?:?_??z?5$V???U?ZpQ}J??EC5????_?????O?Uj?$????3??iu?7<<J1|?HZj&q?i?#??
?Kb?I?M	%??8?5?H?C???
???<???+?<CB??'???????'?????QN??5{k>!0?X/-??[?0?O???d?5y?????o?+????lbAo???o_??yG??w???zG?T]?k???????-??[$?d??`?w????E??????????b?????y%?K?L???xSL?%t)?c ?TqA??4;<}A??8$??l??YH%?vf???X.?T??QC?O????2??(^?????%@?c????t?
1??U??Z???
????`g???y4~iU??9?M?????Dc????eOX<?h%7R??E?e?,???{z>????F?rR?NZ????d?1???tKt?l??[>R???+???GB.?L???N#o?0?????.??u[Kl?
JQPN?M	????????i??????$???:????~?????????_y?S????T???M@?F;?????*???	?c??#?Vco{Qld-?D.?E??nD
???s?t??^.UdR????=A??.?^?hb?F??????BV?d????yHI%n???)??????I?Q??	i???vb2??$?$PN'?r:?%|?k???G??CNamM.?????????k+w?`????? 2???_|??5?h??N?w?Z1s?
??????E])?h???.?/m?(9g?x?Z?$??;?2(?????T?HA?????V?????9L?????h?&?F??????-e????Z?????uV?_%?[?]???Q????d???	/}?^?`???????b?Q????J??[??	U?? H>??%??8?z?t??!QUTimA?&?3Y?q??dTK?b???^Me]?+????}?V??K>???p?c???f?SO?3)*I?:??-!?SNUmt:r?~?????U?UD?c?
?V??W?N4c?$?J???O??E?wuh
???,?CK???~v?4?r????/???????????Fn?
u?sLV??2$!o???"u????B?Sc<1??N|*9y??????^??k?	$<H!"??B.?W??U???}????zL??J?WJ???B?IVzd???.????6Bg?j&
aIs??!"O?6b=?T?In,????"YV?%
 ?O??4?9??F&qt?k?????????7??M?8?????t?l?????v?y?Z???24Z]?)*???)?KI??\4?J5Y?"?7?.k?[????v??6???a??\P?S?????z??mi]? ????h????#>??b??G#Xxu?????=X??F???g?-??"?]???7?????5??$?v????Pev???2L*H???j`???8z?m?r?!??8?Y??Z?X[A?=???????l6??Z??f{????VO??????????:?w?v??`1!XXu??;????Y$?]?!?La???7<1??3?H!i???????Z9{???????\?????$A?'??:???q
bM4?J??
?G????E?g????
|?
?X4~Y?i?N?????????????F?D
5???Z?????]??D????	?p?R
)IGL??Z>7??w???7??????HFI^i='??RW?T?'??????	?????&?????|!?*??G?x?????????R?w???:Qg.??:4?B??w????TD?????z'mk+I?L(?Q???xKj?M57?GQX?(??????'??>??~G???????????{F?EE???$x?????f??k?????-x??????j???????????????(?5??`%j????t?1?Fa)M?s??{?y??'?
??/63??????????????U?@?H8
??Q??/???lM?)JV???????j?L?dRa?
y?????
?2T????r???j?C1????>?;l*??avDyz????*M ?D
?$?H)
?t?????tb!F??7?L??#??R?$6G?VXs:g?}???o???=^??B??z??,g??H/?O?o??;"[?e???????B?s?l???Q????m???}????cm???1?5Ce?????6E??"?+l??c|=kIF??5N?d7;????_???Jb? H???y?+i?3??]?tqR??????D??|V?`?????i???o{[??????b?A??_??J??*M%VHU???????(@?O|N??,>?-N?????(?v??w>?????/?*?q??R'H??[H,?RT?,%???b>???????#m???@T<?????!ZUX?vRFXF??
?<DSN?,e?[?????~
S?{^?????S??3L?rc???????LR?
?@???Zf(??qi?????,?????{o3+??:?zJV?$T?T)@QEW?o?????:??6???\=??H?Q?L(c?|????r??b?q??#??q?Y?l????8^/3]HR??$?????9???.W?;;:&???f?K?*Ow??,1{?]???????O?"??????2???'?:????g?wi:,?^???????!f?????v??|?-X)?$?e?-?*??6X??V\?????]Q!?b^????_??????t?????TH??????Mw???U???u?????????&.s%7??}wmg??E???.???Y?X?????x"?%J????
?)* '?^SR?X~F?q?v#?n?v4??0?????V???VGl?=Zs?JT??7-
??F??ke
???????????7?^&"?f?X????7v?n_???]&??????;|?_?C?.%n????!
?V`@??8?/7=?	?)??i??T??73O??I:??0?C$"[
mz?/?gJA?>_XThG??E??????'.?+*
?e??F??x
?%??F?a???t?4R}l?v/?w???[EK?i???+??%iAIKE?w'??Ay?PcE?56????*????|G??S@???k????8??G:?*?q???k?z??h?6vm8??
MVdy???RA&???K???@k'qg?.??M?c?pQ??B?(?'?@EK???uX[,?[?w._55?v??????bc????1??nj?xq=??A???,????9??/?:,?,B
c??????,??7!?]<|$????F??K???*?jB
????h(????=?_?G?????`???5X?G??>???m
??{??>""(?T??T??A$h???&G?y?0-f3"??X6lX?4??V???jY6??y??5?%?X??%?<?5??;|???c???5??8??KT
Amu?????0??R?4?Xd???4???V??+?.)m??@??????{?zA??)???l&?G?y	??KF???\Y?7???????HY??qB?jz???i
hn??B?)f??:@}?????6?<[|?
?0??A?
?~?e?R ????:????<??Lg)
(a?>?~Z?7?7??????d?!?L;???ZDR??D???+???????????U_????qU?GY?(?V?U????HBt?>9z=??	???(?*4??G???n?????
?
???]hQ??O&d!?RI$??5?????B?|D>N%?@T??!??
?J??K?5??\Q?E?-??4N2?&??%E?n_???tG?U
???v?n????}????G?k??;?T;????????9k~????!?RN????Q?Be??TP<ZEU??TT??2?$V?-?V?Qd??[A???f~R??EKI????
??I?&
?b???b?UU????{?zU?!1?????Z??ru.?-*:D?????!?????0???Z??4?"??>f? t?
?Tj????J3J?	??lLlx?R?|?RH1?m??^????-R????j??"?M[w+Z?b"I?|v+_??????.I??TP*W*V???h?hBHF???w?n?l2ZiF54??M????7??21??P??
??????Cy?u??I?fY??WT?,D?w??u[
??%D?+e?J?>?f1?????]H?)??ciT?E?RZ????B9???+ #????????.?d<??$4[*?k?????V2?J?GLQ?(??!
?W[??<??\N?'8?fB"?u?????h?k??i?\h?~?3j??%?\???u(???v?????%v??????y??.??5???X???1?!??f????H?s?????)w?]` G"?	

3`?CJ ?????TQ:???Vn??C"?????sFa?????????j!5?jS? ??UT<4??]???????md??v??x???r???W/$I~??m?C^2????V???Z???xn?4<??L??~?E?3IK??n??"?MJ?/Ee???.?????X?????????\??+?{??1?]UC#k????????????--P?9*}.(4?joy??,2v?*1`?^f?Zu?SPB???v?{?]?????G?b??K?7x??/?n?W{V?	?~$]^??%?????<9???????I????^jL?Q/Xd?t??B??]?6?p^V$#y?{??2????1Z??F;x??,?FWy&???y?8i?V6^?3?+?/???
????fJ??/??
??o??c????;??????Hq?Y!?W???5p??E?M$<?????{E?Q???[????ot???$?$\????KZ?-U
i$???Y*??Y?]=[%?j??[CK[<e?GL???MsZ?fn??#F???Z?hM?Yah?????&?X?@??T}??ih{F?d????,#????7???[l??????E?Ux%s?1L???KoHz?D?}i??M=?8~_?h!=4y?g?OLkA??[^?5Q"H7???"?m?w?u????$}?
?6{?!
?I_?w???v??Ih??/?r?&??oSIp??~?C??p,?i??!4rxq|?R@*{??+???d???x??e??F?Z??>?6?]u?~??4??a(?K6???Z0gw??x??J?[??0?{e?
?%???????????M?|;O~??N????q??M??g?pC?W?#????!?<??Q0FC??#??n ??A?_?pA#??~???)"$????S^?????[|	??j(F.??`?G}D',??R??h?ww@%?
>Y?I?@C???}?A*????r??)? 
?	?
.??????/??F
?????????5p?
:?,??TB>??~?}?}D???????4"????a	?	 ???p 1??.)????F?H?r?
???
A.???X??_M??^-6???F?h??????|v}????o(???(?WJ5$"r?~??
??WHK???\??`????????sP$????O??M?F??D?`?6???yA????i?*k??????????-??y?????SZ5???E$@P?$???.D??%?@????G???)???bR=iCA?lY?????????3?:ZKN??[??2p? ???`?Zb??\?$?.*q	????tt?O?j?l??	"?o%?KI??ow?y??nj????}r?iZY?~?N?4??5KT8?b?h?????^*L?????s???
?Vf?;?
	3d?*UIHx]o??I????_<??
??7?P>??????8?????l??o=??K??uUlz?m???????3????d?"??7&Y??V*??MHQ??
%F??J?:?V?i\YC??R4?Sqk0??Ya?@????w????Q??L
??Ry?????n?c{?y??bAdZ5?)?j???	#
?4&?pX???pOn?D?
???5?6??f??y]?A?b?P???H??a?n
B@?5TA
`????|?W??????63??h???
???';5I?m????7???u???xx?G?8:?????t???^@O????=Eq?5?yQyYW?????*EJA?7?u`???AP???o&Qm?J*%?>_,-?y??????p
??)%_`??u??????5`?4??E|{??H?G8?UUWl?>{W????i?{
?d?C'?2??,?\?"?O?`R???aTdp??
??!??y???????SY??h?7v?6?k??u6m???x????_?M?=??A?&$?V?i?=&f??p?i>??>???~?h????
??\y{
T???????Lx?<?k
~?????V?e4:?,???j?]IM?@?d?K^/X?oh??>?8B?)??m?;?wb??<??O'G?1.???Lj??J???r|???.?<?=?D???>8p??????????t???"???|i?T?g????
?)??M?C?wz/n??w	6????????
??y?)l???7???V<?a????x?>???a?yl!????2.???*???????F?[	???4????I?????o?|??+??~??????d?????~?6ECn??T??
????q????Dc???

??H???BI????gY?c?v7y??	?V????
???|??????????????:"
s?e?/??m?T???????F???[r???9?5???`>e??@c?O?'????y??)?`?$???v4??[??V???j?t)?A??VS?Y?w?p~???????w???Y?N?????a???~??h?~??y??????]????#?RR:?0H?^?cD???:4E>wU??-??~?G??A?RD?G?V-p?6??z??5?&?
]?
'H???p????i?y;#?
:??e?u'=??9}??9??:???>?=??40H???>?????????!8??=	?????????9q?Z???FC|c???XG8?P??O??JUU????G??z?????=??#????*{e????8??f ??)???"i??i?$t??
?cU?v????^???????
?*@_K
?u>80??C8???R.?'l?O6???+?Q?wd@??,(
???K?
????\?78 ?
I
?`?w???j)?<??????+,#00??F&)??????A?p?#????D?"?9?????h?l?:??_
?+????????-:?T??X?J?????.?d??+?!AA??~?|?
{h*?????+a<??<?<?9???]?)?? G???+?#?)?\s7??????????f?1%? ?????rL??????vX?@pA#V??<8Z??[?????pE3?@??t????
?S`?l?f?aQ<?8??k??H?#nN????|?<?0???<3?????????G?????????o,?????????=:?????!????????C?@?:?"???V(?;??@"???????Z~?3#e'c???_????????*??~?j???}??????j0??6??P??~q?/?z$??g??g?<0U)?N??`U;??<O?????c????$_??*?????$B?nrxCT?+J?W?x?_??S!???[???D?$G?]??~?#I/K??????wM???t?6S*??????
???????U???a????E?L?_$??k????m^H?r??b<6M?u?!?4? !??#?4????
&??????n?pA#@A"?G????f?M`??D|o?#??Y?^????*$?g]7?+????UL?6??????Sx??????_?Q?????
???z??c???1??t?>y?d7?????W6?????Y!0G?~??S?u????{f?????g?41-?w??????7V???7???????_?;m??\_???7
??'?8p??[m?B??.C7???fc???u??????Aa??$Q^?n(A?_?
g?x?wg??0???1?Nc??
?Y????E7?????'@??u_?`?
?P7)??Y???H?^?7b?v?%v???A?P??,^????????8?JK????*s??4
s?kW??gf?:?9X??h?L?.???N?Z]]X?U	?f{1Z???)5?f??????g?ym???P*???E?????+?????????????!?9s??E???^?5!:?
l@????L"gX?q????F?h??q&-|?-????%?$*.p6?&E???"&`?????#?}??B at g?+,??gI???,?4Z?????H?Z~??:?/????p??[N?h?????'??
T%?A?CW)E???d'2???G?=?.J?H?8??p?
?????U9?????0?
?|d????G|?m)???H&eJ@????v0B??CH
?6?K0??M
????!e%A?:z?]65,???j?R{?K???}?????
??>???9????????XA?????AC?6??{?#??O?j?'???De??
`??????V?=X+???E?u,T?CBL??Q@?V}Dr??J*(??????)"??I???#??????
Q???AE?T?M?HP?f????????M?
N??"?	?/C??^a5D1rb?ZQ??"!??????(??}'?o?????:v0?DDPj?&#?JY??	??CI???f??hJ?1?B?? ??GN?%?(?t?D;????????@??m?Em?U?7?p?U0%?@?
?M?????#??????????yU:?h?(?*?8.#??T
?M,B??
	??p?E!? ??`?*?
??4?2T?DSA)q}?m??w???O?3?)??FH'Rh?????
y?=?0??LJI[?N$?oC?z{?u??????/7XhbJ?3z?eP???e?d6Y)ID???
?'????????????tI?.??Pz<??w?g??k???"?8?;?-???LbT?P??P{?y???A????R??R?*??? ?R/bS?%?I???}?@??;XG,?????
??.?Y??J??
?j???????Ux???N3t3???w?4&\J[??
,z???n??????z??????eGHG??y{??C?@???z=??`?d,??Rd?f?fZ~n???^!?`?8d.?j@??4i??	?? ?D??zt-
*h?K????Tg????$"M:???????H??? ?GL?A? y?$B@?u8_?: ?S`??????>??????y??o?k?y??y???t?Ii??? ?

1?????0?{
???	???F<8?!
?b???CTu^?Q???//]ga??i$??b??D=?L_Y??D??O^q???|wJ??b$? p"nuY+!??k?L?A5$"?yd?n?(
E????&{a????%????#???????i??/???.??????????q????O
}4?.??F
???E?R0l??|(???:xg4?`?;?y??`???)?l?B?p?u??^?q?u??wC??*j?%?????v????T?mn????
,??Kft??P???8???w???????n|?R????	?"F]?Xi?l??Z?qn[J?C ?4]?5?S?Ot3vK??8?!??.[1??P?rwJo';?I?????3
V]s?.8??K?_-qS?^_~??Y?sSs;=??4?_}ycMW?sq??0?x6?i?x?=i=????/?????<`m?}??Q{??Dt?a9?????;{?sVC&<_>Y)oB6?~o<?????????????$Uj????{?????{?y????I?"d????????IN???p??%??PK??L?????m??af?&???????A??k???T?2?TV???????/g??z\'!???S?g!?????
(?s????&}?$It?
G???y?}|???*
z]?D?P??K?m?NP?l?? ??`???}?[???t.???W??47??.?J??E"???M	?M??
r?$d?CE?v??k9?*?+??1????^
?u99dU?gzk???@??h??j??%E???????9k?~????kq???$?'?X????{?\g.]?Qs?2???R?J(?#@??/0'?????P??{a
]?Oy?ad?U?s???????g?B^?]/v5=,A??Em
2??_????;U?C`?x??????`P$N[`??#?q?*q?n?oi#?"?nC???wy??z?????)??g???hG?z???
?*y?$e???
???6?
??*??==c?ryj????H"????N??????n?????
(Z?w??r?B?a]??sz?q?s???????&??J??oe???Hy?M?u??7?Qk2
?w/??p??wV??AK????d?&9?`-?h?&??0Uk{??n???ye?????1?7??f
???q????????ss.??[?@.Z??Dd+???????Z*(???$?m??9Lj??ID%??2O9??n?{W|`??FY???u??y?R??]??
?M???=t??A#?w?1??S???i???gn^NX?????ZVl/m9?u???(?92~?c/8?(O%???PO?????I%???33u? ?EE0p???@I at Ox?d??#?`h??iZW?^????X?e??Z?J?%?$z????/K???lx.,???FxTtK????f???w???????{r?$@ ?????XI???[??????j.????L?Nf?6?
?bBCVn]??u?0"x???@L??2c??Q?QV'5p?n:????0?
????^?8pT
D??*$??
8
E'??^??y[?????????HI?7ki??>?????SY???Zy?I	???xi;????>??z:_?e?5?W???????h?????C???7??WkN???????????p?Ek4??k?j????.?\Y/?i??u?????
????~?8?)??E?>?+Q?N?Q+??
??3??6?D?????j?kN??1l?I?\??r???F?CE0?SMXk??U?`&???&?ck>-??????8?]?C?8?DG?G?L?YN
]?T?#??O??{???	?C2:??t?hX???%4?????4Z^?????*BAn?YK?t?y'?v??K3??JP;d??J???m?P???d?G*=??v at sO?98??PUN??QkI??x|S????l??K?3z????co4?O
???l????9??>&?cj????:??]n-???g%?2n:?5Q?????gT?L???|,KF(#???cz?z4??C??8?U?+I?????+1???C????"???B???]$$t???%`?OG????d?B=??3?????????I:s?-k?????yE???????t????,C????k??h/m}?~???D??Q??8gH?t?)k:Cc?N6kg???X'??X?"??^?Nw???????nw???~?r???N;?????????yX0????*)U?x???????
7???w???sK?S??O.?c?&??u?
??8??????@?a?0?h??I??????Xq??? ????m%??_#e?????v??M?????	&??D???S??????@a?1??~???5!C???s??"??O?8iQ? r?BO
????u?*?)gE/?VZ^?`4
y/??w????:?1???N???2Dl???????r??)|q;?~??]???M????.???aA??3d?f?r??C8?g)?5lkV?[?%??W)|????v?tAY]qi????S;K??^L??$?2?????@	$U?&??M??aX?Nn6??`???W?+?\??Vsl?R?6?^?Z.???n?H?5???=S???@??????st?h???g?QP?'?%??5|???"?U??F?}???????zN?_C)Es???????i%???l?B????KU?y??s????{u!)?f?<??s?%????G?9?X????????7?A??????;l??6?>ZFU????~???B????bZeI ???t?v??W?????i?x??g??R?Gw,]v+!?&?o?X???fV_v?E??x??^?d????K6v[g?i#4?
?6?????.??}c????,>4?c1??=?	?=??wc?p???&?u??u?u??6[a;z/??,|??q?d
?4?f?
KU??i?<??????I??%?e(
?Vx?by?g????????M?lT1|??P????????A?
??????2???L??'????Ofy?"&???_???/m???l?1zg+??)???????????'8p??x?&a|??t?????w??>?o?r?h??C?CQ??3???n?Rv?|}?_\?+?H?Hd`???z??Sm;b?K??????)?%???V}/wY?M#iet?m#q?????N2?U?Z
Zv?#?^??h??Q	I
rsh????????SR?oYZ|T?|?-?q?<??.rhy?*?!e?;???????c??t??];?|?r?????$G???C4S?THV?A??8o??4`v6*
^'?/I?v''???f
?>N???)E}x???i?????H????5}Mk?W,??d--??\w-&?N,?WU)?????xcN|?????YM?J??+D??}?.4??????????v]?H?$}?NS?%J??\m?Wwo?c??{???f?b??!?????^????($(??E? ?0?*Fl?jgKa?|R?-?<k?????????h6??????O?????+?V????Y?k?Z.N????????R???S????
?t6?V?[?jV?o???z??`???.:%?T??,eyHJ???]???d?6?uZ	??]?x?6???o??;???2??T?l9???????)??3m?????iK??|?W?<????1????U$???qzr?V????C????i?8:dn:BUo???z?<1??????? ??P?G>??M<	G????????i???|?.?~???q??w????qE?+???????????7???G??L?W????$@?((((*???I
??$

????
P*?
$?*??UrT??\?~??????~?'??(??????Q?????
??????*2b?w??_????O??7?*?
[?
??yw?

??P?)
????(q?6????/?_/?b???O9?8??????D?N??????s?@9?????*0?8;?????V???
aJ<,a?Z??{?:V?^z?]>r?????#?2t??%G???????c???c????B:?,?WS4?P?-4??]_?-?9??n??srl?-??9??????????????=!?X?n???j<??????J?O?|^*T??8?\QfZ???s$??{?Xu}H{O??????j<???wzVx?%????w??@
{?????????????}?7??????r9?7??????h8H???f??|@N8?a?????$??4??T?^P
%*??J?????????(?@??$????P??F?????WsL????*????9Z?2?Rk?e?]???????<:????gD?C????j3?Z@}
?To}8?\c
?)x\?????<x?B??8j???V????*??&?q?U?????2?????iy)*?E?TJ?????wE@???a L?????& fb$??k?`?#?z????????!?
?vo??{
?t?q??T??C???<????UA at Yk??\??z??~???(?V???A8?[o?????????SHG?4U=0VcL?3B??(?nC??d?&@B@
?wW+??y??g??Nc??*T{Z???Y'+??0<g}x;??ba9??:???(?????}???'??????<UC?l???U?	
?????l??M?+Xq?e\????x?$VrePy???F?O?(?B)
B??M?OD6o?^~t???????#?;[?q?uDy?5q??ws?G??)??5@&? 7???B?)?eGw?H???Y??"?w<%?;
D???>???o??o?4?=?	<??????vk((??????????E[?2??y]*B????B	R?AEx!???(??L?!BX?????!?
?$U?#w?~z
????
???^s?u???C?D?V9T?
???
)?G???????D>???!+?
||N?????yk?X???t??0?%k
?p@R
	Q%HQD?(
?e?VJ???"v?Za????R?\?!????"?!%??JV????=?N?3??T??9????R??W??u?? J????7=???=?T?9UGB??(?1d4??^????)h??????IFq<?iD??'?
??cZ{d?Z?%?????{?7??76?5??dmoKr???Om?ES#??V$?[71f??
?C????
9F>??u{???6M??`l???h
?d???)?}p??- {?s\?p-??S$]? ~????ZU?{
`??%3?u??S?R m%?h5v?B'??1?TqO.???5??????5-??Q?&??6???
?T,????
r5Cz?`RC??????#?`???
???*?p?1?
??Gi????????.?u?kY???"??%HXD= 4lw???0????`???Z?kw?^???-???????????5?6????????????& "?????
(?%
&E@&?5????????n???v??31??????fn???km???y)?K\????Mp?d*??^.???U???PlH??Ar?????%?]??k???a?9???????^O??{?q?,????X??1,?p3
y?????
????xx?;???R?$?p?@L;
?H	C?v????Q?^?????*??o^X????TQ^?Pk
???)?Y??J0??B,????I9???-Iv???5??j8%?n4?M??????????oJ?B?@?????U?e???????y?wA????J?
he
4SCE?{????kiW???????q_?$
???p*6*????U??|Z?g'm???m]G8E?6?|!\??
$J!??????E?DD??7?'?Uv*?7sF????D}??5k|??@??'9?R??o<u??mi???W>??y????e??V?j??&?e?!??8
1`?U?
??
????w?J????;D????T??RU?i^????z????}n?????S?@f?Q?08?
??U^?8??X ?x"???	??^J??J?z??????4d
_?u?8??y?*???????SO?_}Q?`_&?k??7??A??i??7?N????j?41?oca??}?~?`rx????e3s!!'?\{?6??_???O?/DGg??a?????t??0.?9???125x[?1??7\?????k???NX"???Y0?3?)?hf???	
??????
???Lb?+AA?t?*}r???>?u^?q???R?<?T??<?|???N?
??????`???7?k{I`^????Kb?K3*?(???8$Cj;???9Q?????{??tI??P??c????
O??$??I&???I?????'S
:a????Y?l
U???A?D????
A2???B3DR???v??F,??????c?n?<????????

z$??{??&???~????~???op?U????2d{>?????C?????
(bJ*D? ???w+?4kY{@??)?:?v?#??????A>???O???F????>???}???~?!????Q??l??????.???t???????	3%??????g??
{?uE<??7z7???N???????i????p,T??e??U?????TGd
5!BPR?CJ?J???L?h:????}??CM{W=????#??:?G??qi8??u??~???Q?lrEsfL? ?@
^??>zG
(J???f
?j?"?i????+F?	i?bc????
?s????[C?G????)????o??????????H(?+(?H?t22#??y?bx0?2?????JM??"?@%d???Z?L?????	??O?p'????F??l[?~&?b?[#?????N{}\?8Q???????
y8
P??Y?Mxb???????!??=v??G??0?????D~??????????8<?/??~>??c????M??w??#0/??i?@'
??~|?tT
[...3708 lines suppressed...]
?f??h?5z\r$?u;??1?p?Z\-B?lu?????r??????%?o^6cT*Z3?b????x??????80+N????%
q??kJ??L?D4?`P`urB??,f~??JQQE???ei?I???`tQ??P?Jt?T??	??4??j?$E??Z??^B??trD?)x{???
?.?a???d?JE?3??[)R?f???DI?N????
????%.pdi5???C?????b??X4???J??t4h?h??x4?s??CGR?,F???G-]??0O6?L?@a???Cc?*?	l9Dd:?9*jb?????n?<?y+??O?T{??`?p??0?)??A?$???R???)?????*#?Qe?q3 ??SJP?X???????Xxq???ez`r??1?r@?????Q?D???F
??l?^:?p?>??M b??[???M?W??= N??f??l??@?1!@x????FT???7e???`??_?>??????z?IArq????L,?LG?k2=?7??N_??O8
?H??44?- ?#QR??MQAJ?"????0% *???mMsTK?$????~fiZx??
\???m~	?????wc?????E0???N\?L<?E?Z?l?Cs?GXi?
!?g\tu?.????u??)?"U>?Hj?(????z??8vg??,????c!h??????Sk?SD?/6"?mmgP?%?
yQQ??dE????Z??]?4????Z?
?>?3?* L?$?N?*?9

|5XwX"
F_????&e*??\????a???Y}???D	??(?$Y??Q?R\?k???bYM?Jf
?N????,U?????V?I??????#>?|>?	%Hq??????+9???k:??T-)????????g??m$??/???,='?R??A?{?????,"3?U?.?3?RQ?|U?9oT????]???WB9lz at U%7]??y&?f?2y|K??(??x??O??S?T??w????=?z?.?{?\?T
a
?
??`?Me;????(l?E??&??j??h?K1?,?]1???Gi??vz?i???hF??C?5	?3?X?YC) ????
0?%??=???xqq `*	??&J_?'???8??N?? ??F"???J39???J?d+f????VQQ`?%?F?LI_??^z?Mr?\??F??d/f??d?Fc?R?,v"?jP??IZ&?e????E??d?!?mO?(|??.??%y>??<\?????G???<??????*?z??l???Kj???t?33???
T?&%^????T????
y^3?4RP?0C?????F???c?<? ?"&?(??9?aP?
N???`??B?????????.??????J
b?(?X??C??j{??1
?H???)??"
'??B?PMKSJ51Dd?
t}?>}Q??
U[?)??q??????R/u?q??????$4?Bo?j`??"?R?f??Ch}?:G?&=d??W,?C??P????????????????#????9jZ|????
F2	?.??4????5????P????mRA?@??y? N?p?3
??TUd?QDO9?
86?%S.-4kD??E?KgR[N?xM??A????gqQCP??[XZXZQ$4?&??-??f???D??"??`*p?	ZLU1?lj*&???m
??H?
Q???Y-?lf??Z"
?F?D11PDm?f???h??RD?I?`????S?3[&????QPX?Si??M%Ls)??&u?$?MB?T++E4?C
AM34Q)4??DDLD0r?p(????Y?"JL?k*?-E???"??qTCEgCcS2r?`?IM?Z?:)?(?6*\?@L*,???Va(??Q????
X?lURD?A??S????	4??V????[a"h?Q??i??b??#?4?DBD???
???Z?QQTC??? ? i*(?$_?@?'R?mQE?IP2???Tn84E!DM
D?:??G,?P??QA?????)?:?NJ????DNHQ?@??NF???r/???)B?d1??t??{???5?U?Q??b)%w>?h?8?u@^`(
i?2?1
#T!TRM?4???F?4d??)?PPU
q??9E?= fU?2ofL???mUv??L?`????3Q
??@?D\?M at tp;?5??????????e?{S~i?]?
l-????zu'j??gKi?-????6?"?0???????%???~?gp^%??&?}??.D??5E#?g??
?N?????u??????6!???a?????? ?9??B???Q???3?=????????V?0???????z???	$#*
? v@@?R?M??.*?????A/??	????m???2-K>?&jeeIG4??????3????? }??%

E$G?'?X????g???r???C\0????f>N!?$#A	?	?a??^x???9?F?(?p
?????
?uD???/?G
??'????D?^z?2????1????>
?(??????&f?????X!????????K8??4I???R?4??? ???
H)?H)?c?~??????#",??h??,5,YTH?4?G???/Y??G??4?|E?B?}?wE???dDDC?????"????=???S??P??A?P???p?#?z?(S??S??Y5??????4gDc?C?{??{?G?c?3????ej??$,k??y?????l???d?`?ce??y???
,??????)&???A@<D????3c???M>??????<??LT
B?A=g?78 F????`@??C?d????@?fR??3?{
?
????(bM"P?
Q)X?
q???$??2Mo?????uB?????(PF???C?g??w'H????*?????O??{??x\BM06,??M??xC??2:??D?????T$
R>5rJH?C?4??P?D?
~?*?@?	?NRF?8T N.P?K??C4?
&mml??(j"?.?Y????Z?
=@?t?W???p+???'????{??9t
!??????n???{	?_??C???'$>????}??bB!zG?9Hs(??`
?????1A?3????????
??R? {Uc!	??"??%B????????????/??m~???T@??9??????????????W?X&
??Q??
$?
7Z?? O"????)???OqH?JRP#CH?8?R&<?_.OtdC???8J????6?S?5?
???W(??(?!?i?(??t?P:???????s]'??Y8?????rE
s?*??
?E{??/p?}Z??Y_?
;??	09C?4?*?
q?? %
&`????A?9i(?l(A?????yy>??*?
???1?N#??,?:Oe0
??
"b??h?"????h?h?	??5}?????}'???? D$Ee?m:?i???`??@?C?JPT??{?@??B?"7?+??
x??#?h???P?+???|???;?
l"??y?@[<??d??L?zO?D0?AdH???????4?h?n????C?"pG???-??;A? ]R8?2?MR3
'P?8t, ?R?}'????f?oV_???ieaB?<?X
??
 RR??K&?V?F'??,E
J)ii
ZI??qihZ")???C?(*(fF?Z(=??e,?U at J???$4?D ????B?K at 5@??@??P??????n??N?
-R?T?LD?D?mR????r??t:?Z
R??????m???
ME4?2??vSF?L'?J??9s??"?QdE?c??F????U??W'?I??o??h?l"D??S4?%?T??dv?6j?UUR??R??
Jh???Q
?t
!
?:-??&????Z(???i@h(V???)h??????JP)^0*SSsi2?z???ovM?V!?'Chn??+!??$?a]????R??Z&?O???El?t????3R?
iR??)?""(?H?????h?"Z?JH????)fE?B???J
.??z???=??+??P>',??1
?
CBB??v?3??,???p$??~?u

?T
?f??????????E???+???g??u??0?@.?
????{J?1k!?@?='?@<?h??b
SY?(b0+?V???Dt?P??IAS};2HF

?i)*?F????Z
?:
h(*?&Jb?"??(?t?????
?R??)?"?????Z????B`hi4.?M$??B??
h	??"???????C??=?u	P?)Q??4 ?f*>??????N?????j?
??)???i(U?4
Ss?fN???B?e4P?-	@R??4???? }?_v?bp?Y??$?U(j???h????+?????q????J )b?U???5?K???3"?C?h
??i?????@???~N??q??),?QCW?C9?YR?e0D????	??3!0?J?@?R?1+@?E[o1??????iZzK?	9$????gU1$?
???n??????msI????? ?_????,?T???>?????>\8?:?1?
?-??ORi:mM?1?s?R??T?
8??? &5?J?R?????ieR?
????VgW ??TeSR???????!?r??5?????D??)c?[?Uf`???????l\Fi???!BU1?%$???z??Fa?=@??*
?q`?C%B?rT_???????G??3??>a?? ????z
?C?
E"?????H?
??G?W???Y????
g???U`kg?t??tj?:?an???[????#?N7\??R(?.?[$??Z:????!???{[\i?????/??&0???5B%?);?W?/?9?{0???.?&iu?C?y :%m,D?S"???
,5??+)+6?i??&?Z5lh?????7W???5??,*?e,"???Db???T?]?0RZJ??I?a?O7s?]??RW)?(????D?XSR???Cb`X??\r?P?^?.(x???;??e?H???c[?%h
8?i???t:!W?x4??*??X$??XR?"`?+-
?D@Z???(M'[?1h??K???Q?????m6??U,1J?)??
??5??5?9??b??X?
5???v[????9?????M\??(?

e??
:
?ZI??k?4l??`????"?\?3?,??X`f??9??t???gx??6N?H?g??-?T?A????[?p4?VK?d??3???nA?????6?J2????V)FX??V?1?--??X8lJ??,c0kt??cm????l\???u?b??l?!D????dV?dh???h?#?rv ???%?ji?5g?Q?NY?	#N5?)E??cku\3"???!Ph?Q?b\????Z??E?H???v-??eA-mm?&??[UD?????u-?kb??A????]?`?U????&?DPb????b?5
??e??m)???*"?b?l??V???i???????
????
j98?F*?%?M?????kA???X?i3s???H?q??]?Q??8?H$?`???:
???M????8+?U???)?
a????2???ynn1S*9Zh?j??J?l?Y????l`???X?j????
@?\?yU?x???A????iR?*&64+?-X\??,+
(*	I
*j?!??'}?I8???+(??>???g??HMR??+!
3-1???2???Z?Q?BT?????X:^?????C?#?hl??
rhZ???!???C?<E???9?^r??????<l9??~?u?? ?
n??p??j??????@k?L?v?+???t?,?4??????1[c??2H?RK?r??r?5?)?/`?4t?????n??,<>o	???;?????w?
G?=a?@??'?W3?|Ej?uT'? ??d?G?
??????D??B
)Br????L{C???w?}???}=2???tK?r?a?=??;'?JY??@>i?l< ?<?G?^|??s?7????qg?iE?7?mp&"$$W?&????l at 8I?;?r?-??^?H??
Js?iQ_)cS0?"??~}/K
????u}k??????u????hD???]?/?u
X?( ?z????W?????-
Hj}?)(I#??????WJ??7z7?9?*??v? ??>?y?!?a1#????SsVZ?!?q?C
n?z??Kn?&"???e??W?jm?#!????e&?/??}r?v????--0?X???\????????e??lZ5R\3vR?????,7,?x??GT??T(??k?{?z?????2????s???)??F"??G6????"=>??sWl?h???Id???(??Kh??Y?????v??Cc???-?EP]I-S?????,]huz?Wm?????lM?o?k7?????)2?`???B?
?hxs????????+???|'??'???ar?
?M?7?????=!?.!?P4:?
???????BC??3
???P~??^?&?Rv?#
?{?G????32~kxl~???t!)Q??(=$\???@R7s????
L(J?~?1???y??????>???????J4????Z??b?
N?x=J?
?A??}@??;
g?%?!#??0MA)D??rg????s???"M@?^?
?F?(eJJy??JCv?x???R???.?q?ew~???q?;?$yX0{?1?o??Ow[?59?????q)?-s?????4??i??s;??vI???????X$W}w?/?P???,?D5??b
?1?0???)?J)??B@?????T???r5Q?e????q?.H??????????xEz?y?vC?a??=?i????C????~??G???D2?=???
?J????;?
?Za?2??1?P??P??qA??IJ
??W?^aq??P?? }?@?)??W?K?(??"???KF??eJ?I??DR)?Wj???-?eU?mR
)(??
????E-MEI.??U-
0AICK%	??N??F?CT?k`??L?QQUQ?4?x??j??????=9?/Gv???I??q????B??p??5h4??????D??%i?0EhJM?PM%QJt?<?Pk~????D?/???Y?????
)?;a??M9a?,T[i.?_#?)??)??I????? ??:?7@??N???????F5??????r??{??<I???!?_???`??gJ?????
P????#?????????h (j
)J;??????8?Y?d????????]U????Ib\??Z?5??\Ek?jj(?@
I???????2)
?&(?|c
TW~U????????a?????%4?E?G<?????*?W]?Y?
?Ud??C?l?6S??i??????d?R?jQ??m?L-U!???????
????>?????.???N?i*??g??b_???}????n
?"IZU;{?T??/u?Z?K?D??n? ?L?}?????10?!??x????&n!S[\?]i???i??f??g????Ab5EBGK??O???1t???b?}J0???b?M?"?t??z?|UIRF????Yp?iru?5??_??B????-s?
RB[]???{} ?^?P?I?6io}????cB?Fq?];??+????B???G?u?_????4????|O?J?i?c$K??????m@?-??g"d^?T?r?e?uE?o?]??J??x??iB??ijh?-Us,?=??7Fb?
`5?b????']??????????C^4???*???4?F??.I3?r??:??i?m}?{%??bn?|d?<?y????;G-???nPz?l?9??nV??4??P???o.?.???????
??a?B?Z??-??<}?z+????????J???o?"?vi??p/?4`??^B??S?:????>?4U????-???W:v?$-r\???T>+?????"[????????PY??U?????d?t?-#?%?:J?V?CfI0?Y?I?????6YnR*?5???l26?:.>??T?9?u???J? ?v??j?^?P,??p?^????0?D??A???e??j?
?m?G????????.???b???*FNB??????????6?A??
\???>?6?u?J??o?\]???8???Gn?$#q$7h???|?
?0?[?b-QC??Pi??yr?v?????N6?hv<?.	?H^?v3I*c?]]S????SC?[???*4????SW?Yj?8?N???e???9)???Em?h?M?!?h?yqW??&?"???n??+???c?????????,{?wQ???	???S{0???????d???
aS???=?gl7@J???'?S?{??t)?x?*?5K??UCUG??^??I?^q??w'???F?aM#?L?f|??[|1G[k????Q?k??o=N&Q????6??c-RQ?N?S???y?:?(???????{E??^???nh8??W?(?*??2}7IP?6>;X(s??B?Q?@u?@??3Z
P?U6?2??TA????R??m?EdU^Q<???????cT?
W"?e(?y???
?mimEp3I?7ij????6r????????i??t]u?s??f?dn??
?Jr?guJ?.????i\???le?V'X??BK????&??????F???bB????gJ????C?-ul1\_3#?F?%???0?5?????Y?????i	???5RJ$?????tN???Q7????,?????*?A?;i	?t???N?#zq
??>?u???[?g?(?"UV)2j?4Z2????k??Y?????/l????=?	$%]7????	J????!%? ?C4?r??A?rc???G?????[?A??	Q??U????+Wd????$???&?
???z???????S??S??????????
??/<??ln??!? z^??V???r??ERAX?
??1?U????F???H6?P????gV?????r?IW???H?RB?DuhCg?????*v????????w?
?6%?q???-??e???8???c??p?r?p?[+?e?bH?E4Q_
d?J?-?R?d??ip???C?$????.?M
U?y???????

R?I?W???????
???iS??[w?x^
???:G+??C!|^5B??1?7?	?E
TFN1_?????????~8J????>??v??
F2??eD>??@d??#?????
??'N?'?T??Q?ROK?J`KC?G/?? Ogphy????OQ?&????B;,k????
??`S?0???9
?	3?(Bf??5|c????7~{wzOz??:???k?I?t??&?E<???P6?????(?)O?????X????b?%:A?????x?T??\?A?????G???r5???+&???i+??
D????t?Y?Y(H?C??????a?}?????b?/|8?"NHh)M4?x????I
b?(?5?*?S???FT?????????B?nT?R?{d`??N??~?;|?b?2??h??,?oW0X}0|e???????i??C??Fj??5Ye-??c)?p? ?>??????????6Mn?O?6Y??FLO??e????p????J?0q
1v>t?;b?C	S
??????-?*+m??L????x?aP8???eL"?W?9?????-6S???@?EA&m?O
??6@??-??/66a?????QE
<?[whC?u????R*h?R?b?x??A?XCr&J??|]1-
???hJ?R?k?????w/???{{D?GhN~i?|<?'i????{C????!?8?
??T????????'?"??DH??b?M~?R^s?>?(uV?2:??
'????|???????H4???:??????J"?)??R?hJ??J(H?i?Q????b?? JJ???????????3??????P????/?xO??	????
 	????~?(????rMhDb?(NB;??e(\???
?N?O^0*???y ? ???gY?
4????P?]<:??/????DpQ????????Gk?T2 '???
J?*
??C????0E\5?C??]@?	J?rj?E????
?B
??.?+A??????(zAr?
?6?s??hJ`!????0@A?_/????a?!????d
?
7??3CR?
hrA????0?[d?`????qL??:%
Z?=???Q_?8+?E??O?????h!???.l?6????????????P???i??J?$8Dp?|? G??<a?*?b@?(4	K%*$?? ?%???	$!?"??	?i?J
????????>?d^?Lg??*?S?Y?,;?t?~~?+????'?)?-!?LA?
B??~?{?{??AALR
l@?%?G)kz??6?!7?.???qB/??<~?1
?????!??e???q??????p??cv/B????!?_H
?BPBO?????(4?4r???
?	??@o?[ a??5????,*?1?x?d??l??+l()?(???5A??e????e3U?????R?($??i??*?	k??t?9a????
??(?)B?)JZb"bi$j?????I@?H*Q
%	UE%4P?????Y??^y4?????R???>

???????/n?x??|c???$??#?C?y?	????q?p?????.?!?????
???? _,hu?T??{?BU??@???) S$+?c???????	/J?DD?*#?M????$3?i$????9?Q????????>????jF??D?R?
?@
e?]S????gi?H?????{xV????WB?!?pB?|????C?Y4g??> ???J??4%?b?T8??d;~?
?c)0$??O??=GHh???'???y7C????(;?,+???y????A?'?k?~?>:????????]?c.z?&???wW????O???5???:C?
??{^??$???q;?}???F?$x?????????3???5??H?v"???/*??Pu???7-UUX?????%?? 'L?y?&????[?]k???]?K8n??w*??XSF?b???I?w?????B?^?w?qm"??
?3 at b?0?u1>??Z??#?kO?????7B.??O.????(???[n4_[?@A?J??M?C?nI???+?d?6??cr3r?"7O?.??c?x?PW^?????????????^
?
??<???[l?<???
???iRB???<?I6!-1?+?-_??"??????'=c537hlB???B????,?I??j??Z?0???r	????L5*??(??v?h??E[??woF???D?B?J5??@?R??Q?m????{?????|?b??????2Jp??<???G??qS??x? h?[
?????9F??C?P??y5?????n????Y^x??z?P????q??UE??????"
HlN|?t|????c??!??????#d???"
]?QV????&?#???e4n|w???&"???e??_#NN6qF*??y?)?q??I$?tHa?<??E?^?p??|??	ur?!V?I
??Eb'?k??r?ZX?Vv?
q?h??&??'y???mQ???eB?qa??^p???U??%???m?V,???ckL????%??wk&/^wp?;???kZa???????\,\?)????-??????"mg1r????ATv???&??Ak(?~?+?F1B?q?"??Xej?+D3,?Tj(V
+???)2J+??P???l?C?:?;?0X=???????'e????2?V??w??br??B"?; ?Lhk??p?!??l??@?ja?????8???^?aY?K3D?6?wX?A8v9???D?O?????_??????.?????B_?Rv<:?l?}?q6w?-D??P?????7<?Fj
??^??l????-
?Y2??'&i??ib!b????? ?????*??K?	??Y???$?Z?P?D???48?g?/9???rK??`?Xwn^??A?? ?m?o??`?8??u?9?`??q??MZB[????5?q?YY?5 ?C?6n|e?????!???l?Q?&; 0?^|U??????-???s
??D??m??Oyy?NH[i?&?EX?H?q0??U?<?R:F?N???!Q??iQ?$?8??????g)?/?????z?V
??_(?+.????p???n^L t?N?>zXH4,??t?Tj?"bT_cmQ???U????A???????7?^6?\x??*?jZ?,?$?(?`????z??sPq?lb@???#J??y$??IR???.;???F4\?&????Fc?I3^?????????)?4m??*(0???j.?|??/????????7?:?<YKa?z??A????i
 ????[[c?
[?Qm*?e?&1IV??%?].e???Um?1b??[??????b????\fL???'???V?f8?V???v(S???9]?k<?>????+??U?N???*??<??????[??.9? ??m?}@???SC?#??n??o
zE???,???/snp????XR?^l2???????????#???d?KiJ?*???1??N??kS?6??mM???KV?1?5A?Z?jb??vb3?lU?#X??c:???R1?h?Z??V?9???w??????rjG?;???fkB}?>s?=?H?:t?Y?n	dvICM?G??????????????tf??1	U?X??oZ}!??m??=f%]-M@?\??)<r????{?X???z2??-???<S.?AW?.??=,?D????X7-+q???dD8?\\?e?????3???f??qU5.

?

e"?!
????2??!{ ?VE?'P(?
B
??8%??lG?-s?5AL??????????p5?$,??gZ
??WD??>Z?Dh???	?rY
T
a?7 at 4??)Z))??F?8\?7???Z??==??]u????G???H????????GI*???R????mv??h????s
P??=\????i?	???~??????BZ????|#????U???)??.ByYF??-I???n??"?w3???
???R?m:?o??giw?>y7?3???^??uC??D???	???2
???+??%y??z?H{?.??rv[??-_^???W???=sV?vn?w~?!?????n?????s}?s??j????????????..ys?Z?ku?! |?
?????\?
K'1(??????x????lxmg???
?Q??u/??T"0EX??$?TAU???Qm?$C?1??
?f???1????9?=??%[?*?
??b?:"??C??BB0?%?????n-??????e6?7?????oJ??vJ?J???]?z9`?O/?j???U?s????^*?%?o?5?|n??{/?5??0?[?~WP??????k?y???n???=????Iz??/g}9U???v?VveB8>????4^????A?8?>o?|??????y????'??????n?1??)????3#<
H?d?t5U?\????y?W[???r??X|?
?P?}s=??a]~??;?3?8?R????????Swb1??v??????O
????(/*?;????$F???H{,?M??????'AW at C??><?P{$??=O'???!?????!Js?)S??~?cWPq?P??|????T????&??u,TZ9=C	??6???D]?:{???
6	????r?O??B?
5??j0K?0?(%6m???)ej??{?l??9??	?#@>?
??>`2ED??a??zmC1Vm???????fO.w??+?=????????J*?r?E??D`?uU.??*?+P?
?	???N??S?Y?m8????w?E????.?y?:?5????[?1?w$M"k^3?HD$_?@pdN???T?6(?]Df?i???F??
??u??&????*i[A?+Jl?Er?Pe$v??g?X5l?v?G	??Sc`53??1&
2?*??????????:??N?A)%E	?sn
p?Nd??Nk??????*gL!\??%???14?y????N??8?D,eG?w???g????R?I????????-Jlmm?????	?~[q???^[Zgn@???<??wdjp??PaLj?h???oA7?n??????T
???U?y?f?GZ?
-Z!m???PP?L???f@???&?IUT4??Tl???A3?????????
=?rd1:?@?^?
;?$?i?x?U????678N??? ??v????Mh?zO???mD
?;?E?5???v?tPL??<?(????B?%%#H?\M?y?^5	?qB??????????T@???*?hHI]?jlO?@EYh????.???eX?ii"??t??R
iN??"5?????!????B?s!???@y?4?HW0?P0????I?}b????P?P??:?????(|?&???8a??BJi???.???!II?H?+???;f??????J?	?$?6C?iuxn?c?dc_?uW?Q0?K
*??Z
-??
???b.*???&?J
????-?2N#?U?C?~?a?B?.?,&??j????k?????hA???M%????D????GG?xH?@?]???NV????0?@bH???2|???P??NN???1a?1?s?p]???\??L*@s?[??|?y?(???????? ?=$tO??9a?{?????((6????R????}?A??i?????y]?P#^p??I?	/ I??@?B???Ub?9?|??h??V?ADQm4?j?n?P??0?|??ngcJt?b
???o9&???1"??????????Ri?????k??s]??????Y?n7??R{h8^??$*??z-??y&?zG+?k?	?^5	Z|j~w???k?????%H?7?????;???C
T%???\rsPKj?R?Q?9?p94???3????F??Y)??MF?Bc<Aq?5X??X?/???_?/u???Ub?1?G????/??rT????????9m?62?Z[????.>?n???hH??y?.???????E??iV?\6?U?w?o;???$m??/1?-?T?8?e?G?p?qd{$8?????O???N???X?"'?????S?N??pU?6?a? 	?=???9%?
{%
??AE%Q/?~o??????UC[?Q??Y????~8h???!????e#j+D??
*JR??R??sp7h?*?c??>u????5Eui*#????#?^gRU?
??PDQ6???]???<?<bf?9eRU??}?L?)?????U?0cs?Q?=????}??%???G??V ?e??Y??&$>??N?o;?????j????6J????d?!??FHrN/?????[@???0
?????????DPF	??pJxF?
?i?(?X????Qu"??{e\?Tg6??Q?J-h??%?ZXd??


h????v'?q?B?xJ?? p
w?G?}EC?OOZ)~(??z??+T????G??6OR?????"Or??(??E?iZEM?,?1SD????@ZL?).?Y??????\)???p?|a?E?<$?P?H
Pn?~?:I?4TEMB?%I?MX?N??d?FIi*??(?EQ
L:????m6<;????k4n?????O???O??
,??2"??
?*V?????CA?4??B?DkN?????R?u?
TH??E??;?G?u???S?`??9?Xq_H	#%@E2?Q?E?N??$?lF $?m?gm?N*???FJ??JA?1????"Z,f??5$??
5T??0&1L?O-?UTE@QHp&d?hH??2?((j at 4?ZD?"?h????	?gZ??
?DRh\U
4?ATA?
_?N??????v?BTAIl?A?T?QPCMELSE4?^mSR??LUQDSQEE0D0??D?sh??f	*?0MS???5?J?IB?S0?C???+K???(?J????????j??H????D2s!D?DKD??$@?HH??Q@?8Q??O?U????P?$?&h-j+F?	?V"??i]!A?mU?D?M?CCD??:???!????????h8`&M&
?q?^???	C??S?hT<B?
~q??>???RI??LZ0?*?
(X??X????x? ??k80Q??Ol
?7?ab;????@
?o]???C??B??H$??G!?,? P#?????????p ?5A????5M
??LSP??BU!UCQ#T?J?4?&?I4	M?5AUA?$s%)h??'?g??^#y`?OP?!?L'??\??:??C?oq??j????W??R??x??X?????|1????$????16??al0??V?
z&j??"
im??~?0??J(@AdJ:??^???v:I3?W????	??YZ???,?b%?[????????[kYF???
Sf???>???Bc
?????'??,2b?
?QE at b#?H&f5?R?"??um???l?!??zj??A/?R???H?????x???+??U-y?U?f?DIT&????>*] rt?K?L@:@??AEB"?????2y'???F??????k??vy??????IC-(?
J
1iQB?R?Uh%,]?'+li"????3UZ???&???? ????????r ?(?????F%B?Z?r???XZZ??4q?	??[Vqb	?Z?R?]KK;??!??????
?&??F(??S
}}??q??`V?ZZ*??
LX?? 9~??????(???9???Y(???P??[hi?~?z???C?$
?KK???N?UQb??@??<+)?~??;2x????1???CSb?pS>o,P? ?9x
?7?G?U?,?
u????????b?X????)3
Hs8$??~EO???EO	?ck][????~???F????m??|??b???kF?C???U?uC????
u???hhp&?YK???%{???Y$????d(I7#?lxx?l=q?xa?>q?y???)I?d'
d??
???<?????s????Xn???l?????QYO???S(j?pq?~??
?5!?t???
Q??!?
??6
r??^[ehNar0???K`???T?i
????h
A??
#??z??@

Q??W-?(????^???S??%??????)I????hh"H
???
?H?v?'??{~???????CO?~U?unf???Ji?&?????c?????*????$H8#?'?????????B?????a????XIf??34s????e?t???+
]??/?Vf?tc?EUV?????efy???h5??????^n?|Y?f??????kZ?/}Z?h????T??Vkz??f`s+32?.????~s???????\??????h?9??9a???kU$??.???-z?m?v{?QWXh?@k??d5Xo???@?U??e5???
j?r?{????????/(tU???????@?xH
@
P????????0?X?
?'"?ncW?{??????h???????C??`
??C??@0??????|O?????~??????w?????G??1?@?`w1?1???pu?X
????J???P?'????R"?(-b??4?s:V??????????;	???(?4
?@?
SAF?????P???R??JRD?G???????*??FkX?v?????R_?|??*i??0J???1r?x?_I?H????O?:?2?6?%?AT?:?Y??BOlIJ?????4?F?@?}??0IE#?)????????
$9?!N*!Ri<??a Q?m?l7??0????)c?J?J???R?C o/(?&Q??
?F??"???`???x???????}1??!????~???9[???oU	??j??r[?????F"?h??4??/H?????e?????O?????Tl??*j??)???H?"??r???n?Zg?::?????,?:?7?????^??<?
??>	???'??`^uX??a9"??Vx?
o4u???s?~?ve#??(??Q"?????? K
?m ??j??????A?7???y\?????w?51?"?Q?,?%?U?I%M??5?"*E???????oZ?BI	6?S?????z^?o???T????4r&?\?[5uGJc?k??f?i??2?*?=n^???????l??R??^????m????r?#?	?T??????k??:R?? ?fD?u?wu??.??5??zFD?=???>{???u????Y????=??7>7???'??O?p?>f??B???|???7???????~??UU]q?]?l???Gk????UU@[?	Q?N?????N??9?h?
??u/?????
X??)??8
??????r?,??y???????Z??>??k?[??~??u???*??r/???I???fE?? ?S&72HIlqV?0z?^????	E??H????]?
??_?????{K?L3Z?8Og??\??A?????/?T?cD]?????Fw??^??a9?2?N?~??{???????5?????
??4?s?????qI???}?G?
?D8????8?x?1R:&??@?9?????!Q?????(??Y7$??@XL??e?t?p?Uiv???J?"?CA3B?#??4?I?	?UR?5z??
8?B??????
>x?=Ww?????n??a???G???5?????I?\!?q2?????!J|?0r@???????|?^???!?
(O?????I???\??M0Q=?Y?S?????DX??.
HP`?	 ??]??BCP?~`

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Aug 2006 07:51:18 -0000	1.6
+++ .cvsignore	30 Aug 2006 12:28:45 -0000	1.7
@@ -1,2 +1,2 @@
 mansupfr.tar.bz2
-man-pages-fr-2.33.0.tar.bz2
+man-pages-fr-2.39.tar.bz2


Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- man-pages-fr.spec	9 Aug 2006 07:51:18 -0000	1.22
+++ man-pages-fr.spec	30 Aug 2006 12:28:45 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
-Version:	2.33.0
-Release:	1
+Version:	2.39
+Release:	1%{?dist}
 License:	Distributable
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -102,6 +102,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Wed Aug 30 2006 Marcela Maslanova <mmaslano at redhat.com> 2.39-1
+- new version of man-pages
+
 * Wed Aug 09 2006 Marcela Maslanova <mmaslano at redhat.com> 2.33.0-1
 - new version of man-pages from source0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Aug 2006 08:10:26 -0000	1.7
+++ sources	30 Aug 2006 12:28:45 -0000	1.8
@@ -1,3 +1,2 @@
 d5c654c7391dd2f452c21edb442d8f4e  mansupfr.tar.bz2
-
-e5ecced18ccca6d4454f59f17aaf3fa8  man-pages-fr-2.33.0.tar.bz2
+7e9ecdd134703e8172107124f1f3fec4  man-pages-fr-2.39.tar.bz2
\ No newline at end of file



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:45:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:45:27 -0400
Subject: rpms/vim/devel 7.0.067,NONE,1.1
Message-ID: <200608301245.k7UCjRtw027709@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27693

Added Files:
	7.0.067 
Log Message:
- Patchlevel 67


--- NEW FILE 7.0.067 ---
To: vim-dev at vim.org
Subject: Patch 7.0.067
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.067
Problem:    Undo doesn't always work properly when using "scim" input method.
	    Undo is split up when using preediting.
Solution:   Reset xim_has_preediting also when preedit_start_col is not
	    MAXCOL.  Don't split undo when <Left> is used while preediting.
	    (Yukihiro Nakadaira)
Files:	    src/edit.c, src/mbyte.c


*** ../vim-7.0.066/src/edit.c	Tue Aug 22 19:58:22 2006
--- src/edit.c	Tue Aug 29 14:57:46 2006
***************
*** 8597,8603 ****
      tpos = curwin->w_cursor;
      if (oneleft() == OK)
      {
! 	start_arrow(&tpos);
  #ifdef FEAT_RIGHTLEFT
  	/* If exit reversed string, position is fixed */
  	if (revins_scol != -1 && (int)curwin->w_cursor.col >= revins_scol)
--- 8597,8608 ----
      tpos = curwin->w_cursor;
      if (oneleft() == OK)
      {
! #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
! 	/* Only call start_arrow() when not busy with preediting, it will
! 	 * break undo.  K_LEFT is inserted in im_correct_cursor(). */
! 	if (!im_is_preediting())
! #endif
! 	    start_arrow(&tpos);
  #ifdef FEAT_RIGHTLEFT
  	/* If exit reversed string, position is fixed */
  	if (revins_scol != -1 && (int)curwin->w_cursor.col >= revins_scol)
*** ../vim-7.0.066/src/mbyte.c	Wed Aug 16 18:05:36 2006
--- src/mbyte.c	Tue Aug 29 14:41:45 2006
***************
*** 3514,3519 ****
--- 3514,3524 ----
  	add_to_input_buf(delkey, (int)sizeof(delkey));
  }
  
+ /*
+  * Move the cursor left by "num_move_back" characters.
+  * Note that ins_left() checks im_is_preediting() to avoid breaking undo for
+  * these K_LEFT keys.
+  */
      static void
  im_correct_cursor(int num_move_back)
  {
***************
*** 3741,3748 ****
      }
      else if (cursor_index == 0 && preedit_string[0] == '\0')
      {
! 	if (preedit_start_col == MAXCOL)
! 	    xim_has_preediting = FALSE;
  
  	/* If at the start position (after typing backspace)
  	 * preedit_start_col must be reset. */
--- 3746,3752 ----
      }
      else if (cursor_index == 0 && preedit_string[0] == '\0')
      {
! 	xim_has_preediting = FALSE;
  
  	/* If at the start position (after typing backspace)
  	 * preedit_start_col must be reset. */
*** ../vim-7.0.066/src/version.c	Tue Aug 22 21:51:18 2006
--- src/version.c	Tue Aug 29 16:09:35 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     67,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
265. Your reason for not staying in touch with family is that
     they do not have e-mail addresses.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:45:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:45:34 -0400
Subject: rpms/vim/devel 7.0.068,NONE,1.1
Message-ID: <200608301245.k7UCjYUV027731@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27719

Added Files:
	7.0.068 
Log Message:
- Patchlevel 68


--- NEW FILE 7.0.068 ---
To: vim-dev at vim.org
Subject: Patch 7.0.068
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.068
Problem:    When 'ignorecase' is set and using Insert mode completion,
	    typing characters to change the list of matches, case is not
	    ignored. (Hugo Ahlenius)
Solution:   Store the 'ignorecase' flag with the matches where needed.
Files:	    src/edit.c, src/search.c, src/spell.c


*** ../vim-7.0.067/src/edit.c	Tue Aug 29 16:10:54 2006
--- src/edit.c	Tue Aug 29 14:57:46 2006
***************
*** 2405,2411 ****
      /* compl_pattern doesn't need to be set */
      compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length);
      if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
! 			-1, FALSE, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK)
  	return;
  
      /* Handle like dictionary completion. */
--- 2405,2411 ----
      /* compl_pattern doesn't need to be set */
      compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length);
      if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
! 			-1, p_ic, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK)
  	return;
  
      /* Handle like dictionary completion. */
***************
*** 2821,2827 ****
  			ptr = find_word_end(ptr);
  		    add_r = ins_compl_add_infercase(regmatch->startp[0],
  					  (int)(ptr - regmatch->startp[0]),
! 						     FALSE, files[i], *dir, 0);
  		    if (thesaurus)
  		    {
  			char_u *wstart;
--- 2821,2827 ----
  			ptr = find_word_end(ptr);
  		    add_r = ins_compl_add_infercase(regmatch->startp[0],
  					  (int)(ptr - regmatch->startp[0]),
! 						     p_ic, files[i], *dir, 0);
  		    if (thesaurus)
  		    {
  			char_u *wstart;
***************
*** 2857,2863 ****
  				ptr = find_word_end(ptr);
  			    add_r = ins_compl_add_infercase(wstart,
  				    (int)(ptr - wstart),
! 				    FALSE, files[i], *dir, 0);
  			}
  		    }
  		    if (add_r == OK)
--- 2857,2863 ----
  				ptr = find_word_end(ptr);
  			    add_r = ins_compl_add_infercase(wstart,
  				    (int)(ptr - wstart),
! 				    p_ic, files[i], *dir, 0);
  			}
  		    }
  		    if (add_r == OK)
***************
*** 3826,3832 ****
  		    TAG_INS_COMP | (ctrl_x_mode ? TAG_VERBOSE : 0),
  		    TAG_MANY, curbuf->b_ffname) == OK && num_matches > 0)
  	    {
! 		ins_compl_add_matches(num_matches, matches, FALSE);
  	    }
  	    p_ic = save_p_ic;
  	    break;
--- 3826,3832 ----
  		    TAG_INS_COMP | (ctrl_x_mode ? TAG_VERBOSE : 0),
  		    TAG_MANY, curbuf->b_ffname) == OK && num_matches > 0)
  	    {
! 		ins_compl_add_matches(num_matches, matches, p_ic);
  	    }
  	    p_ic = save_p_ic;
  	    break;
***************
*** 3867,3873 ****
  	    num_matches = expand_spelling(first_match_pos.lnum,
  				 first_match_pos.col, compl_pattern, &matches);
  	    if (num_matches > 0)
! 		ins_compl_add_matches(num_matches, matches, FALSE);
  #endif
  	    break;
  
--- 3867,3873 ----
  	    num_matches = expand_spelling(first_match_pos.lnum,
  				 first_match_pos.col, compl_pattern, &matches);
  	    if (num_matches > 0)
! 		ins_compl_add_matches(num_matches, matches, p_ic);
  #endif
  	    break;
  
***************
*** 4001,4007 ****
  			    continue;
  		    }
  		}
! 		if (ins_compl_add_infercase(ptr, len, FALSE,
  				 ins_buf == curbuf ? NULL : ins_buf->b_sfname,
  					   0, flags) != NOTDONE)
  		{
--- 4001,4007 ----
  			    continue;
  		    }
  		}
! 		if (ins_compl_add_infercase(ptr, len, p_ic,
  				 ins_buf == curbuf ? NULL : ins_buf->b_sfname,
  					   0, flags) != NOTDONE)
  		{
***************
*** 4809,4815 ****
  	vim_free(compl_orig_text);
  	compl_orig_text = vim_strnsave(line + compl_col, compl_length);
  	if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
! 			-1, FALSE, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK)
  	{
  	    vim_free(compl_pattern);
  	    compl_pattern = NULL;
--- 4809,4815 ----
  	vim_free(compl_orig_text);
  	compl_orig_text = vim_strnsave(line + compl_col, compl_length);
  	if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
! 			-1, p_ic, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK)
  	{
  	    vim_free(compl_pattern);
  	    compl_pattern = NULL;
*** ../vim-7.0.067/src/search.c	Fri May  5 23:15:17 2006
--- src/search.c	Tue Aug 29 14:56:15 2006
***************
*** 4871,4877 ****
  			goto exit_matched;
  		}
  
! 		add_r = ins_compl_add_infercase(aux, i, FALSE,
  			curr_fname == curbuf->b_fname ? NULL : curr_fname,
  			dir, reuse);
  		if (add_r == OK)
--- 4876,4882 ----
  			goto exit_matched;
  		}
  
! 		add_r = ins_compl_add_infercase(aux, i, p_ic,
  			curr_fname == curbuf->b_fname ? NULL : curr_fname,
  			dir, reuse);
  		if (add_r == OK)
*** ../vim-7.0.067/src/spell.c	Sun Jul 23 21:52:16 2006
--- src/spell.c	Tue Aug 29 14:56:26 2006
***************
*** 15658,15664 ****
  		    ? MB_STRNICMP(p, pat, STRLEN(pat)) == 0
  		    : STRNCMP(p, pat, STRLEN(pat)) == 0)
  		&& ins_compl_add_infercase(p, (int)STRLEN(p),
! 					  FALSE, NULL, *dir, 0) == OK)
  	/* if dir was BACKWARD then honor it just once */
  	*dir = FORWARD;
  }
--- 15662,15668 ----
  		    ? MB_STRNICMP(p, pat, STRLEN(pat)) == 0
  		    : STRNCMP(p, pat, STRLEN(pat)) == 0)
  		&& ins_compl_add_infercase(p, (int)STRLEN(p),
! 					  p_ic, NULL, *dir, 0) == OK)
  	/* if dir was BACKWARD then honor it just once */
  	*dir = FORWARD;
  }
*** ../vim-7.0.067/src/version.c	Tue Aug 29 16:10:54 2006
--- src/version.c	Tue Aug 29 16:13:49 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     68,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
266. You hear most of your jokes via e-mail instead of in person.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:45:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:45:41 -0400
Subject: rpms/vim/devel 7.0.069,NONE,1.1
Message-ID: <200608301245.k7UCjfpi027751@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27739

Added Files:
	7.0.069 
Log Message:
- Patchlevel 69


--- NEW FILE 7.0.069 ---
To: vim-dev at vim.org
Subject: Patch 7.0.069
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.069
Problem:    Setting 'guitablabel' to %!expand(\%)  causes Vim to free an
	    invalid pointer. (Kim Schulz)
Solution:   Don't try freeing a constant string pointer.
Files:	    src/buffer.c


*** ../vim-7.0.068/src/buffer.c	Wed Aug 16 19:34:59 2006
--- src/buffer.c	Tue Aug 29 16:23:49 2006
***************
*** 3324,3330 ****
      {
  	usefmt = eval_to_string_safe(fmt + 2, NULL, use_sandbox);
  	if (usefmt == NULL)
! 	    usefmt = (char_u *)"";
      }
  #endif
  
--- 3324,3330 ----
      {
  	usefmt = eval_to_string_safe(fmt + 2, NULL, use_sandbox);
  	if (usefmt == NULL)
! 	    usefmt = fmt;
      }
  #endif
  
*** ../vim-7.0.068/src/version.c	Tue Aug 29 16:33:23 2006
--- src/version.c	Tue Aug 29 16:48:08 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     69,
  /**/

-- 
Two fish in a tank. One says to the other:
"Do you know how to drive this thing?"

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:45:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:45:47 -0400
Subject: rpms/vim/devel 7.0.070,NONE,1.1
Message-ID: <200608301245.k7UCjlB9027771@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27759

Added Files:
	7.0.070 
Log Message:
- Patchlevel 70


--- NEW FILE 7.0.070 ---
To: vim-dev at vim.org
Subject: Patch 7.0.070
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.070
Problem:    Compiler warnings for shadowed variables and uninitialized
	    variables.
Solution:   Rename variables such as "index", "msg" and "dup".  Initialize
	    variables.
Files:	    src/edit.c, src/eval.c, src/ex_cmds.c, src/ex_cmds2.c,
	    src/ex_docmd.c, src/gui_beval.c, src/gui_gtk.c, src/gui_gtk_x11.c,
	    src/hardcopy.c, src/if_cscope.c, src/main.c, src/mbyte.c,
	    src/memline.c, src/netbeans.c, src/normal.c, src/option.c,
	    src/os_unix.c, src/quickfix.c, src/regexp.c, src/screen.c,
	    src/search.c, src/spell.c, src/ui.c, src/undo.c, src/window.c,
	    src/version.c


*** ../vim-7.0.069/src/edit.c	Tue Aug 29 16:33:23 2006
--- src/edit.c	Tue Aug 29 14:57:46 2006
***************
*** 129,135 ****
  
  static void ins_ctrl_x __ARGS((void));
  static int  has_compl_option __ARGS((int dict_opt));
! static int ins_compl_add __ARGS((char_u *str, int len, int icase, char_u *fname, char_u **cptext, int cdir, int flags, int dup));
  static int  ins_compl_equal __ARGS((compl_T *match, char_u *str, int len));
  static void ins_compl_longest_match __ARGS((compl_T *match));
  static void ins_compl_add_matches __ARGS((int num_matches, char_u **matches, int icase));
--- 129,135 ----
  
  static void ins_ctrl_x __ARGS((void));
  static int  has_compl_option __ARGS((int dict_opt));
! static int ins_compl_add __ARGS((char_u *str, int len, int icase, char_u *fname, char_u **cptext, int cdir, int flags, int adup));
  static int  ins_compl_equal __ARGS((compl_T *match, char_u *str, int len));
  static void ins_compl_longest_match __ARGS((compl_T *match));
  static void ins_compl_add_matches __ARGS((int num_matches, char_u **matches, int icase));
***************
*** 2118,2124 ****
   * maybe because alloc() returns NULL, then FAIL is returned.
   */
      static int
! ins_compl_add(str, len, icase, fname, cptext, cdir, flags, dup)
      char_u	*str;
      int		len;
      int		icase;
--- 2118,2124 ----
   * maybe because alloc() returns NULL, then FAIL is returned.
   */
      static int
! ins_compl_add(str, len, icase, fname, cptext, cdir, flags, adup)
      char_u	*str;
      int		len;
      int		icase;
***************
*** 2126,2132 ****
      char_u	**cptext;   /* extra text for popup menu or NULL */
      int		cdir;
      int		flags;
!     int		dup;	    /* accept duplicate match */
  {
      compl_T	*match;
      int		dir = (cdir == 0 ? compl_direction : cdir);
--- 2126,2132 ----
      char_u	**cptext;   /* extra text for popup menu or NULL */
      int		cdir;
      int		flags;
!     int		adup;	    /* accept duplicate match */
  {
      compl_T	*match;
      int		dir = (cdir == 0 ? compl_direction : cdir);
***************
*** 2140,2146 ****
      /*
       * If the same match is already present, don't add it.
       */
!     if (compl_first_match != NULL && !dup)
      {
  	match = compl_first_match;
  	do
--- 2140,2146 ----
      /*
       * If the same match is already present, don't add it.
       */
!     if (compl_first_match != NULL && !adup)
      {
  	match = compl_first_match;
  	do
***************
*** 3608,3614 ****
  {
      char_u	*word;
      int		icase = FALSE;
!     int		dup = FALSE;
      char_u	*(cptext[CPT_COUNT]);
  
      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
--- 3608,3614 ----
  {
      char_u	*word;
      int		icase = FALSE;
!     int		adup = FALSE;
      char_u	*(cptext[CPT_COUNT]);
  
      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
***************
*** 3625,3631 ****
  	if (get_dict_string(tv->vval.v_dict, (char_u *)"icase", FALSE) != NULL)
  	    icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");
  	if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)
! 	    dup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");
      }
      else
      {
--- 3625,3631 ----
  	if (get_dict_string(tv->vval.v_dict, (char_u *)"icase", FALSE) != NULL)
  	    icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");
  	if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)
! 	    adup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");
      }
      else
      {
***************
*** 3634,3640 ****
      }
      if (word == NULL || *word == NUL)
  	return FAIL;
!     return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, dup);
  }
  #endif
  
--- 3634,3640 ----
      }
      if (word == NULL || *word == NUL)
  	return FAIL;
!     return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, adup);
  }
  #endif
  
*** ../vim-7.0.069/src/eval.c	Wed Aug 16 22:03:35 2006
--- src/eval.c	Thu Aug 24 22:00:09 2006
***************
*** 454,460 ****
  static char_u *deref_func_name __ARGS((char_u *name, int *lenp));
  static int get_func_tv __ARGS((char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));
  static int call_func __ARGS((char_u *name, int len, typval_T *rettv, int argcount, typval_T *argvars, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));
! static void emsg_funcname __ARGS((char *msg, char_u *name));
  
  static void f_add __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_append __ARGS((typval_T *argvars, typval_T *rettv));
--- 454,460 ----
  static char_u *deref_func_name __ARGS((char_u *name, int *lenp));
  static int get_func_tv __ARGS((char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));
  static int call_func __ARGS((char_u *name, int len, typval_T *rettv, int argcount, typval_T *argvars, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));
! static void emsg_funcname __ARGS((char *ermsg, char_u *name));
  
  static void f_add __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_append __ARGS((typval_T *argvars, typval_T *rettv));
***************
*** 2260,2266 ****
  	    EMSG(_(e_letunexp));
  	else
  	{
! 	    char_u	*tofree = NULL;
  	    char_u	*s;
  
  	    p = get_tv_string_chk(tv);
--- 2260,2266 ----
  	    EMSG(_(e_letunexp));
  	else
  	{
! 	    char_u	*ptofree = NULL;
  	    char_u	*s;
  
  	    p = get_tv_string_chk(tv);
***************
*** 2269,2275 ****
  		s = get_reg_contents(*arg == '@' ? '"' : *arg, TRUE, TRUE);
  		if (s != NULL)
  		{
! 		    p = tofree = concat_str(s, p);
  		    vim_free(s);
  		}
  	    }
--- 2269,2275 ----
  		s = get_reg_contents(*arg == '@' ? '"' : *arg, TRUE, TRUE);
  		if (s != NULL)
  		{
! 		    p = ptofree = concat_str(s, p);
  		    vim_free(s);
  		}
  	    }
***************
*** 2278,2284 ****
[...2204 lines suppressed...]
!     if (gap->ga_len == 0)
! 	i = -1;
!     else
!     {
! 	/* Check if the word is already there.  Also check the length that is
! 	 * being replaced "thes," -> "these" is a different suggestion from
! 	 * "thes" -> "these". */
! 	stp = &SUG(*gap, 0);
! 	for (i = gap->ga_len; --i >= 0; ++stp)
! 	    if (stp->st_wordlen == goodlen
! 		    && stp->st_orglen == badlen
! 		    && STRNCMP(stp->st_word, goodword, goodlen) == 0)
! 	    {
! 		/*
! 		 * Found it.  Remember the word with the lowest score.
! 		 */
! 		if (stp->st_slang == NULL)
! 		    stp->st_slang = slang;
  
! 		new_sug.st_score = score;
! 		new_sug.st_altscore = altscore;
! 		new_sug.st_had_bonus = had_bonus;
! 
! 		if (stp->st_had_bonus != had_bonus)
! 		{
! 		    /* Only one of the two had the soundalike score computed.
! 		     * Need to do that for the other one now, otherwise the
! 		     * scores can't be compared.  This happens because
! 		     * suggest_try_change() doesn't compute the soundalike
! 		     * word to keep it fast, while some special methods set
! 		     * the soundalike score to zero. */
! 		    if (had_bonus)
! 			rescore_one(su, stp);
! 		    else
! 		    {
! 			new_sug.st_word = stp->st_word;
! 			new_sug.st_wordlen = stp->st_wordlen;
! 			new_sug.st_slang = stp->st_slang;
! 			new_sug.st_orglen = badlen;
! 			rescore_one(su, &new_sug);
! 		    }
  		}
  
! 		if (stp->st_score > new_sug.st_score)
! 		{
! 		    stp->st_score = new_sug.st_score;
! 		    stp->st_altscore = new_sug.st_altscore;
! 		    stp->st_had_bonus = new_sug.st_had_bonus;
! 		}
! 		break;
  	    }
!     }
  
      if (i < 0 && ga_grow(gap, 1) == OK)
      {
*** ../vim-7.0.069/src/ui.c	Mon Mar 27 23:02:40 2006
--- src/ui.c	Thu Aug 24 22:31:38 2006
***************
*** 1137,1143 ****
      int		len;
  #ifdef FEAT_MBYTE
      char_u	*p;
-     int		i;
  #endif
      int		row1 = clip_star.start.lnum;
      int		col1 = clip_star.start.col;
--- 1137,1142 ----
***************
*** 1218,1223 ****
--- 1217,1224 ----
  #ifdef FEAT_MBYTE
  	    if (enc_dbcs != 0)
  	    {
+ 		int	i;
+ 
  		p = ScreenLines + LineOffset[row];
  		for (i = start_col; i < end_col; ++i)
  		    if (enc_dbcs == DBCS_JPNU && p[i] == 0x8e)
*** ../vim-7.0.069/src/undo.c	Wed Jul 12 21:48:56 2006
--- src/undo.c	Thu Aug 24 22:32:41 2006
***************
*** 1187,1193 ****
      int		did_undo;	/* just did an undo */
      int		absolute;	/* used ":undo N" */
  {
!     char	*msg;
      u_header_T	*uhp;
      char_u	msgbuf[80];
  
--- 1187,1193 ----
      int		did_undo;	/* just did an undo */
      int		absolute;	/* used ":undo N" */
  {
!     char	*msgstr;
      u_header_T	*uhp;
      char_u	msgbuf[80];
  
***************
*** 1205,1224 ****
  
      u_oldcount -= u_newcount;
      if (u_oldcount == -1)
! 	msg = N_("more line");
      else if (u_oldcount < 0)
! 	msg = N_("more lines");
      else if (u_oldcount == 1)
! 	msg = N_("line less");
      else if (u_oldcount > 1)
! 	msg = N_("fewer lines");
      else
      {
  	u_oldcount = u_newcount;
  	if (u_newcount == 1)
! 	    msg = N_("change");
  	else
! 	    msg = N_("changes");
      }
  
      if (curbuf->b_u_curhead != NULL)
--- 1205,1224 ----
  
      u_oldcount -= u_newcount;
      if (u_oldcount == -1)
! 	msgstr = N_("more line");
      else if (u_oldcount < 0)
! 	msgstr = N_("more lines");
      else if (u_oldcount == 1)
! 	msgstr = N_("line less");
      else if (u_oldcount > 1)
! 	msgstr = N_("fewer lines");
      else
      {
  	u_oldcount = u_newcount;
  	if (u_newcount == 1)
! 	    msgstr = N_("change");
  	else
! 	    msgstr = N_("changes");
      }
  
      if (curbuf->b_u_curhead != NULL)
***************
*** 1244,1250 ****
  
      smsg((char_u *)_("%ld %s; %s #%ld  %s"),
  	    u_oldcount < 0 ? -u_oldcount : u_oldcount,
! 	    _(msg),
  	    did_undo ? _("before") : _("after"),
  	    uhp == NULL ? 0L : uhp->uh_seq,
  	    msgbuf);
--- 1244,1250 ----
  
      smsg((char_u *)_("%ld %s; %s #%ld  %s"),
  	    u_oldcount < 0 ? -u_oldcount : u_oldcount,
! 	    _(msgstr),
  	    did_undo ? _("before") : _("after"),
  	    uhp == NULL ? 0L : uhp->uh_seq,
  	    msgbuf);
*** ../vim-7.0.069/src/window.c	Sat May  6 23:37:40 2006
--- src/window.c	Thu Aug 24 22:33:40 2006
***************
*** 340,349 ****
  		{
  		    tabpage_T	*oldtab = curtab;
  		    tabpage_T	*newtab;
- 		    win_T	*wp = curwin;
  
  		    /* First create a new tab with the window, then go back to
  		     * the old tab and close the window there. */
  		    if (win_new_tabpage((int)Prenum) == OK
  						     && valid_tabpage(oldtab))
  		    {
--- 340,349 ----
  		{
  		    tabpage_T	*oldtab = curtab;
  		    tabpage_T	*newtab;
  
  		    /* First create a new tab with the window, then go back to
  		     * the old tab and close the window there. */
+ 		    wp = curwin;
  		    if (win_new_tabpage((int)Prenum) == OK
  						     && valid_tabpage(oldtab))
  		    {
*** ../vim-7.0.069/src/version.c	Tue Aug 29 16:52:01 2006
--- src/version.c	Tue Aug 29 17:02:00 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     70,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
267. You get an extra phone line so you can get phone calls.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:46:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:46:04 -0400
Subject: rpms/vim/devel 7.0.071,NONE,1.1
Message-ID: <200608301246.k7UCk4wl027800@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27787

Added Files:
	7.0.071 
Log Message:
- Patchlevel 71


--- NEW FILE 7.0.071 ---
To: vim-dev at vim.org
Subject: Patch 7.0.071
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.071
Problem:    Using an empty search pattern may cause a crash.
Solution:   Avoid using a NULL pointer.
Files:	    src/search.c


*** ../vim-7.0.070/src/search.c	Tue Aug 29 17:28:56 2006
--- src/search.c	Tue Aug 29 14:56:15 2006
***************
*** 1259,1265 ****
  	/*
  	 * Add character and/or line offset
  	 */
! 	if (!(options & SEARCH_NOOF) || *pat == ';')
  	{
  	    if (spats[0].off.line)	/* Add the offset to the line number. */
  	    {
--- 1259,1265 ----
  	/*
  	 * Add character and/or line offset
  	 */
! 	if (!(options & SEARCH_NOOF) || (pat != NULL && *pat == ';'))
  	{
  	    if (spats[0].off.line)	/* Add the offset to the line number. */
  	    {
*** ../vim-7.0.070/src/version.c	Tue Aug 29 17:28:56 2006
--- src/version.c	Tue Aug 29 17:59:24 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     71,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
268. You get up in the morning and go online before getting your coffee.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:46:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:46:11 -0400
Subject: rpms/vim/devel 7.0.072,NONE,1.1
Message-ID: <200608301246.k7UCkBA3027824@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27808

Added Files:
	7.0.072 
Log Message:
- Patchlevel 72


--- NEW FILE 7.0.072 ---
To: vim-dev at vim.org
Subject: Patch 7.0.072
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.072
Problem:    When starting the GUI fails there is no way to adjust settings or
	    do something else.
Solution:   Add the GUIFailed autocommand event.
Files:	    src/fileio.c, src/gui.c, src/vim.h


*** ../vim-7.0.071/src/fileio.c	Wed Aug 16 19:34:59 2006
--- src/fileio.c	Tue Aug 29 10:11:35 2006
***************
*** 6980,6985 ****
--- 6980,6986 ----
      {"FocusLost",	EVENT_FOCUSLOST},
      {"FuncUndefined",	EVENT_FUNCUNDEFINED},
      {"GUIEnter",	EVENT_GUIENTER},
+     {"GUIFailed",	EVENT_GUIFAILED},
      {"InsertChange",	EVENT_INSERTCHANGE},
      {"InsertEnter",	EVENT_INSERTENTER},
      {"InsertLeave",	EVENT_INSERTLEAVE},
*** ../vim-7.0.071/src/gui.c	Tue Jun 20 20:39:32 2006
--- src/gui.c	Tue Aug 29 10:12:32 2006
***************
*** 187,195 ****
  #endif
  
  #ifdef FEAT_AUTOCMD
!     /* If the GUI started successfully, trigger the GUIEnter event */
!     if (gui.in_use)
! 	apply_autocmds(EVENT_GUIENTER, NULL, NULL, FALSE, curbuf);
  #endif
  
      --recursive;
--- 187,196 ----
  #endif
  
  #ifdef FEAT_AUTOCMD
!     /* If the GUI started successfully, trigger the GUIEnter event, otherwise
!      * the GUIFailed event. */
!     apply_autocmds(gui.in_use ? EVENT_GUIENTER : EVENT_GUIFAILED,
! 						   NULL, NULL, FALSE, curbuf);
  #endif
  
      --recursive;
*** ../vim-7.0.071/src/vim.h	Fri Jun 23 16:33:41 2006
--- src/vim.h	Tue Aug 29 10:12:47 2006
***************
*** 1120,1125 ****
--- 1120,1126 ----
      EVENT_FOCUSGAINED,		/* got the focus */
      EVENT_FOCUSLOST,		/* lost the focus to another app */
      EVENT_GUIENTER,		/* after starting the GUI */
+     EVENT_GUIFAILED,		/* after starting the GUI failed */
      EVENT_INSERTCHANGE,		/* when changing Insert/Replace mode */
      EVENT_INSERTENTER,		/* when entering Insert mode */
      EVENT_INSERTLEAVE,		/* when leaving Insert mode */
*** ../vim-7.0.071/src/version.c	Tue Aug 29 18:01:39 2006
--- src/version.c	Tue Aug 29 18:15:13 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     72,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
269. You receive an e-mail from the wife of a deceased president, offering
     to send you twenty million dollar, and you are not even surprised.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:46:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:46:18 -0400
Subject: rpms/vim/devel 7.0.073,NONE,1.1
Message-ID: <200608301246.k7UCkIIH027846@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27834

Added Files:
	7.0.073 
Log Message:
- Patchlevel 73


--- NEW FILE 7.0.073 ---
To: vim-dev at vim.org
Subject: Patch 7.0.073
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.073
Problem:    Insert mode completion: Typing <CR> sometimes selects the original
	    text instead of keeping what was typed.  (Justin Constantino)
Solution:   Don't let <CR> select the original text if there is no popup menu.
Files:	    src/edit.c


*** ../vim-7.0.072/src/edit.c	Tue Aug 29 17:28:56 2006
--- src/edit.c	Tue Aug 29 17:40:06 2006
***************
*** 3097,3102 ****
--- 3097,3106 ----
  
      /* Show the popup menu with a different set of matches. */
      ins_compl_show_pum();
+ 
+     /* Don't let Enter select the original text when there is no popup menu. */
+     if (compl_match_array == NULL)
+ 	compl_enter_selects = FALSE;
  }
  
  /*
*** ../vim-7.0.072/src/version.c	Tue Aug 29 18:16:37 2006
--- src/version.c	Tue Aug 29 18:35:33 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     73,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
269. You wonder how you can make your dustbin produce Sesame Street's
     Oscar's the Garbage Monster song when you empty it.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:46:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:46:36 -0400
Subject: rpms/vim/devel 7.0.074,NONE,1.1
Message-ID: <200608301246.k7UCka2K027866@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27854

Added Files:
	7.0.074 
Log Message:
- Patchlevel 74


--- NEW FILE 7.0.074 ---
To: vim-dev at vim.org
Subject: Patch 7.0.074 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.074 (extra)
Problem:    Win32: tooltips were not converted from 'encoding' to Unicode.
Solution:   Set the tooltip to use Unicode and do the conversion.  Also
	    cleanup the code for the tab pages tooltips. (Yukihiro Nakadaira)
Files:	    src/gui_w32.c, src/gui_w48.c


*** ../vim-7.0.073/src/gui_w32.c	Sat May  6 23:43:11 2006
--- src/gui_w32.c	Tue Aug 29 21:16:58 2006
***************
*** 889,1005 ****
  # ifdef FEAT_MBYTE
  	    case TTN_GETDISPINFOW:
  # endif
! 	    case TTN_NEEDTEXT:
! # ifdef FEAT_GUI_TABLINE
! 		if (gui_mch_showing_tabline()
! 			&& ((LPNMHDR)lParam)->hwndFrom ==
! 					       TabCtrl_GetToolTips(s_tabhwnd))
  		{
! 		    LPNMTTDISPINFO	lpdi;
! 		    POINT		pt;
! 		    static char		*tt_text = NULL;
! 		    static int		tt_text_len = 0;
! 
! 		    /*
! 		     * Mouse is over the GUI tabline. Display the tooltip
! 		     * for the tab under the cursor
! 		     */
! 		    lpdi = (LPNMTTDISPINFO)lParam;
! 		    lpdi->hinst = NULL;
! 		    lpdi->szText[0] = '\0';
! 
! 		    /*
! 		     * Get the cursor position within the tab control
! 		     */
! 		    GetCursorPos(&pt);
! 		    if (ScreenToClient(s_tabhwnd, &pt) != 0)
! 		    {
! 			TCHITTESTINFO htinfo;
! 			int idx;
  
  			/*
! 			 * Get the tab under the cursor
  			 */
! 			htinfo.pt.x = pt.x;
! 			htinfo.pt.y = pt.y;
! 			idx = TabCtrl_HitTest(s_tabhwnd, &htinfo);
! 			if (idx != -1)
  			{
! 			    tabpage_T *tp;
  
! 			    tp = find_tabpage(idx + 1);
! 			    if (tp != NULL)
  			    {
! #  ifdef FEAT_MBYTE
! 				WCHAR	*wstr = NULL;
! #  endif
! 				get_tabline_label(tp, TRUE);
! #  ifdef FEAT_MBYTE
! 				if (enc_codepage >= 0
! 					     && (int)GetACP() != enc_codepage)
! 				{
! 				    wstr = enc_to_ucs2(NameBuff, NULL);
! 				    if (wstr != NULL)
! 				    {
! 					int wlen;
! 
! 					wlen = ((int)wcslen(wstr) + 1)
! 							      * sizeof(WCHAR);
! 					if (tt_text_len < wlen)
! 					{
! 					    tt_text = vim_realloc(tt_text,
! 									wlen);
! 					    if (tt_text != NULL)
! 						tt_text_len = wlen;
! 					}
! 					if (tt_text != NULL)
! 					    wcscpy((WCHAR *)tt_text, wstr);
! 					lpdi->lpszText = tt_text;
! 					vim_free(wstr);
! 				    }
! 				}
! 				if (wstr == NULL)
! #  endif
! 				{
! 				    int len;
  
! 				    len = (int)STRLEN(NameBuff) + 1;
! 				    if (tt_text_len < len)
! 				    {
! 					tt_text = vim_realloc(tt_text, len);
! 					if (tt_text != NULL)
! 					    tt_text_len = len;
! 				    }
! 				    if (tt_text != NULL)
! 					STRCPY(tt_text, NameBuff);
! 				    lpdi->lpszText = tt_text;
  				}
  			    }
  			}
  		    }
- 		}
- 		else
  # endif
- 		{
  # ifdef FEAT_TOOLBAR
! 		    LPTOOLTIPTEXT	lpttt;
! 		    UINT		idButton;
! 		    int			idx;
! 		    vimmenu_T		*pMenu;
! 
! 		    lpttt = (LPTOOLTIPTEXT)lParam;
! 		    idButton = (UINT) lpttt->hdr.idFrom;
! 		    pMenu = gui_mswin_find_menu(root_menu, idButton);
! 		    if (pMenu)
  		    {
! 			idx = MENU_INDEX_TIP;
! 			if (pMenu->strings[idx])
  			{
! 			    lpttt->hinst = NULL;  /* string, not resource */
! 			    lpttt->lpszText = pMenu->strings[idx];
  			}
! 		    }
  # endif
  		}
  		break;
  # ifdef FEAT_GUI_TABLINE
--- 889,978 ----
  # ifdef FEAT_MBYTE
  	    case TTN_GETDISPINFOW:
  # endif
! 	    case TTN_GETDISPINFO:
  		{
! 		    LPNMHDR		hdr = (LPNMHDR)lParam;
! 		    char_u		*str = NULL;
! 		    static void		*tt_text = NULL;
! 
! 		    vim_free(tt_text);
! 		    tt_text = NULL;
  
+ # ifdef FEAT_GUI_TABLINE
+ 		    if (gui_mch_showing_tabline()
+ 			   && hdr->hwndFrom == TabCtrl_GetToolTips(s_tabhwnd))
+ 		    {
+ 			POINT		pt;
  			/*
! 			 * Mouse is over the GUI tabline. Display the
! 			 * tooltip for the tab under the cursor
! 			 *
! 			 * Get the cursor position within the tab control
  			 */
! 			GetCursorPos(&pt);
! 			if (ScreenToClient(s_tabhwnd, &pt) != 0)
  			{
! 			    TCHITTESTINFO htinfo;
! 			    int idx;
  
! 			    /*
! 			     * Get the tab under the cursor
! 			     */
! 			    htinfo.pt.x = pt.x;
! 			    htinfo.pt.y = pt.y;
! 			    idx = TabCtrl_HitTest(s_tabhwnd, &htinfo);
! 			    if (idx != -1)
  			    {
! 				tabpage_T *tp;
  
! 				tp = find_tabpage(idx + 1);
! 				if (tp != NULL)
! 				{
! 				    get_tabline_label(tp, TRUE);
! 				    str = NameBuff;
  				}
  			    }
  			}
  		    }
  # endif
  # ifdef FEAT_TOOLBAR
! #  ifdef FEAT_GUI_TABLINE
! 		    else
! #  endif
! 		    {
! 			UINT		idButton;
! 			vimmenu_T	*pMenu;
! 
! 			idButton = (UINT) hdr->idFrom;
! 			pMenu = gui_mswin_find_menu(root_menu, idButton);
! 			if (pMenu)
! 			    str = pMenu->strings[MENU_INDEX_TIP];
! 		    }
! # endif
! 		    if (str != NULL)
  		    {
! # ifdef FEAT_MBYTE
! 			if (hdr->code == TTN_GETDISPINFOW)
  			{
! 			    LPNMTTDISPINFOW	lpdi = (LPNMTTDISPINFOW)lParam;
! 
! 			    tt_text = enc_to_ucs2(str, NULL);
! 			    lpdi->lpszText = tt_text;
! 			    /* can't show tooltip if failed */
  			}
! 			else
  # endif
+ 			{
+ 			    LPNMTTDISPINFO	lpdi = (LPNMTTDISPINFO)lParam;
+ 
+ 			    if (STRLEN(str) < sizeof(lpdi->szText)
+ 				    || ((tt_text = vim_strsave(str)) == NULL))
+ 				vim_strncpy(lpdi->szText, str,
+ 						sizeof(lpdi->szText) - 1);
+ 			    else
+ 				lpdi->lpszText = tt_text;
+ 			}
+ 		    }
  		}
  		break;
  # ifdef FEAT_GUI_TABLINE
*** ../vim-7.0.073/src/gui_w48.c	Fri Jun 23 16:44:32 2006
--- src/gui_w48.c	Tue Aug 29 21:14:31 2006
***************
*** 2194,2200 ****
--- 2194,2211 ----
  	return;
  
      if (showit)
+     {
+ # ifdef FEAT_MBYTE
+ #  ifndef TB_SETUNICODEFORMAT
+     /* For older compilers.  We assume this never changes. */
+ #   define TB_SETUNICODEFORMAT 0x2005
+ #  endif
+ 	/* Enable/disable unicode support */
+ 	int uu = (enc_codepage >= 0 && (int)GetACP() != enc_codepage);
+ 	SendMessage(s_toolbarhwnd, TB_SETUNICODEFORMAT, (WPARAM)uu, (LPARAM)0);
+ # endif
  	ShowWindow(s_toolbarhwnd, SW_SHOW);
+     }
      else
  	ShowWindow(s_toolbarhwnd, SW_HIDE);
  }
*** ../vim-7.0.073/src/version.c	Tue Aug 29 18:36:55 2006
--- src/version.c	Tue Aug 29 21:28:00 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     74,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
271. You collect hilarious signatures from all 250 mailing lists you
     are subscribed to.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:46:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:46:43 -0400
Subject: rpms/vim/devel 7.0.075,NONE,1.1
Message-ID: <200608301246.k7UCkhEa027886@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27874

Added Files:
	7.0.075 
Log Message:
- Patchlevel 75


--- NEW FILE 7.0.075 ---
To: vim-dev at vim.org
Subject: Patch 7.0.075
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.075
Problem:    winsaveview() did not store the actual value of the desired cursor
	    column.  This could move the cursor in the matchparen plugin.
Solution:   Call update_curswant() before using the value w_curswant.
Files:	    src/eval.c


*** ../vim-7.0.074/src/eval.c	Tue Aug 29 17:28:56 2006
--- src/eval.c	Tue Aug 29 21:53:26 2006
***************
*** 16232,16237 ****
--- 16232,16238 ----
  #ifdef FEAT_VIRTUALEDIT
      dict_add_nr_str(dict, "coladd", (long)curwin->w_cursor.coladd, NULL);
  #endif
+     update_curswant();
      dict_add_nr_str(dict, "curswant", (long)curwin->w_curswant, NULL);
  
      dict_add_nr_str(dict, "topline", (long)curwin->w_topline, NULL);
*** ../vim-7.0.074/src/version.c	Tue Aug 29 21:30:15 2006
--- src/version.c	Tue Aug 29 21:57:03 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     75,
  /**/

-- 
Women are probably the main cause of free software starvation.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:47:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:47:00 -0400
Subject: rpms/vim/devel 7.0.076,NONE,1.1
Message-ID: <200608301247.k7UCl05O028423@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28033

Added Files:
	7.0.076 
Log Message:
- Patchlevel 76


--- NEW FILE 7.0.076 ---
To: vim-dev at vim.org
Subject: Patch 7.0.076
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.076 (after 7.0.010)
Problem:    Automatic downloading of spell files only works for ftp.
Solution:   Don't add login and password for non-ftp URLs. (Alexander Patrakov)
Files:      runtime/autoload/spellfile.vim


*** ../vim-7.0.075/runtime/autoload/spellfile.vim	Sat May 13 14:29:16 2006
--- runtime/autoload/spellfile.vim	Tue Aug 29 22:17:03 2006
***************
*** 1,6 ****
  " Vim script to download a missing spell file
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 May 10
  
  if !exists('g:spellfile_URL')
    let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
--- 1,6 ----
  " Vim script to download a missing spell file
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 Aug 29
  
  if !exists('g:spellfile_URL')
    let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
***************
*** 110,118 ****
    endif
  endfunc
  
! " Read "fname" from the ftp server.
  function! spellfile#Nread(fname)
!   let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
!   let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
!   exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
  endfunc
--- 110,123 ----
    endif
  endfunc
  
! " Read "fname" from the server.
  function! spellfile#Nread(fname)
!   if g:spellfile_URL =~ '^ftp://'
!     " for an ftp server use a default login and password to avoid a prompt
!     let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
!     let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
!     exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
!   else
!     exe 'Nread ' g:spellfile_URL . '/' . a:fname
!   endif
  endfunc
*** ../vim-7.0.075/src/version.c	Tue Aug 29 21:59:25 2006
--- src/version.c	Tue Aug 29 22:31:45 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     76,
  /**/

-- 
This sentence is not sure that it exists, but if it does, it will
certainly consider the possibility that other sentences exist.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:47:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:47:25 -0400
Subject: rpms/vim/devel README.patches,1.56,1.57
Message-ID: <200608301247.k7UClP5M031340@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31327

Modified Files:
	README.patches 
Log Message:
Patchlevel 76


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- README.patches	24 Aug 2006 09:23:56 -0000	1.56
+++ README.patches	30 Aug 2006 12:47:22 -0000	1.57
@@ -91,3 +91,13 @@
   1818  7.0.064  compiler warnings for unused variables
   1750  7.0.065  (extra) Mac: horizontal scroll wheel caused vertical scroll
   1407  7.0.066  tab pages line not redrawn after removing the popup menu
+  3038  7.0.067  undo problems when using input method
+  6123  7.0.068  'ignorecase' is not used properly for Insert mode completion
+  1457  7.0.069  crash when setting 'guitablabel' to "%!expand(\%)"
+ 71560  7.0.070  compiler warnings for shadowed and uninitialized variables
+  1550  7.0.071  using empty search pattern may cause a crash
+  2791  7.0.072  can't specify anything to do when starting the GUI fails
+  1597  7.0.073  CR in Insert mode completion may select original text
+  6819  7.0.074  (extra) Win32: tooltips can be in the wrong encoding
+  1495  7.0.075  winsaveview() could store wrong desired cursor column
+  2635  7.0.076  (after 7.0.010) could not get spell files from non-ftp server



From fedora-cvs-commits at redhat.com  Wed Aug 30 12:50:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 08:50:30 -0400
Subject: rpms/vim/devel vim.spec,1.135,1.136
Message-ID: <200608301250.k7UCoUAf010754@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10741

Modified Files:
	vim.spec 
Log Message:
- Patchlevel 76


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- vim.spec	25 Aug 2006 11:11:26 -0000	1.135
+++ vim.spec	30 Aug 2006 12:50:27 -0000	1.136
@@ -15,12 +15,12 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 066
+%define patchlevel 076
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 2
+Release: 1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -111,6 +111,16 @@
 Patch064: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.064
 Patch065: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.065
 Patch066: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.066
+Patch067: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.067
+Patch068: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.068
+Patch069: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.069
+Patch070: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.070
+Patch071: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.071
+Patch072: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.072
+Patch073: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.073
+Patch074: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.074
+Patch075: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.075
+Patch076: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.076
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -310,6 +320,17 @@
 # Mac:
 #patch065 -p0
 %patch066 -p0
+%patch067 -p0
+%patch068 -p0
+%patch069 -p0
+%patch070 -p0
+%patch071 -p0
+%patch072 -p0
+%patch073 -p0
+# Win32:
+#patch074 -p0
+%patch075 -p0
+%patch076 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -634,6 +655,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Aug 30 2006 Karsten Hopp <karsten at redhat.de> 7.0.076-1
+- Patchlevel 76
+
 * Thu Aug 25 2006 Karsten Hopp <karsten at redhat.de> 7.0.066-2
 - fix vimdiff colors (#204042)
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 13:21:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 09:21:31 -0400
Subject: rpms/dbus-sharp/devel dbus-sharp-gchandle.patch, NONE,
	1.1 dbus-sharp.spec, 1.5, 1.6
Message-ID: <200608301321.k7UDLV4r026390@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/dbus-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26376

Modified Files:
	dbus-sharp.spec 
Added Files:
	dbus-sharp-gchandle.patch 
Log Message:
* Wed Aug 30 2006 Alexander Larsson <alexl at redhat.com> - 0.63-6
- Fix connection and message gc problem (#187452)
- Patch from Christian Krause



dbus-sharp-gchandle.patch:
 Connection.cs |    2 +-
 Message.cs    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dbus-sharp-gchandle.patch ---
--- dbus-sharp-0.63/mono/Connection.cs.gchandle	2006-08-30 15:14:28.000000000 +0200
+++ dbus-sharp-0.63/mono/Connection.cs	2006-08-30 15:17:01.000000000 +0200
@@ -116,7 +116,7 @@
 	// Maybe we already have a Connection object associated with
 	// this rawConnection then return it
 	IntPtr rawThis = dbus_connection_get_data (rawConnection, slot);
-	if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Connection)) {
+	if (rawThis != IntPtr.Zero && (((GCHandle)rawThis).Target != null)) {
 	  return (DBus.Connection) ((GCHandle)rawThis).Target;
 	}
       }
--- dbus-sharp-0.63/mono/Message.cs.gchandle	2006-08-30 15:14:20.000000000 +0200
+++ dbus-sharp-0.63/mono/Message.cs	2006-08-30 15:16:45.000000000 +0200
@@ -110,7 +110,7 @@
       if (slot > -1) {
 	// If we already have a Message object associated with this rawMessage then return it
 	IntPtr rawThis = dbus_message_get_data(rawMessage, slot);
-	if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Message))
+	if (rawThis != IntPtr.Zero && (((GCHandle)rawThis).Target != null))
 	  return (DBus.Message) ((GCHandle)rawThis).Target;
       } 
       // If it doesn't exist then create a new Message around it


Index: dbus-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus-sharp/devel/dbus-sharp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbus-sharp.spec	18 Aug 2006 15:11:22 -0000	1.5
+++ dbus-sharp.spec	30 Aug 2006 13:21:28 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: C# bindings for D-Bus
 Name: dbus-sharp
 Version: 0.63
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -20,6 +20,7 @@
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
 
 Patch1: dbus-sharp-0.63-nogtk.patch
+Patch2: dbus-sharp-gchandle.patch
 
 %description
 
@@ -37,6 +38,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .nogtk
+%patch2 -p1 -b .gchandle
 
 %build
 autoreconf --force --install
@@ -63,6 +65,10 @@
 %{_libdir}/pkgconfig/dbus-sharp.pc
 
 %changelog
+* Wed Aug 30 2006 Alexander Larsson <alexl at redhat.com> - 0.63-6
+- Fix connection and message gc problem (#187452)
+- Patch from Christian Krause
+
 * Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 0.63-5
 - Update for new mono multilib setup
 - Don't buildrequire old gtk-sharp



From fedora-cvs-commits at redhat.com  Wed Aug 30 13:24:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 09:24:50 -0400
Subject: rpms/glib2/devel .cvsignore, 1.57, 1.58 glib2.spec, 1.106,
	1.107 sources, 1.57, 1.58
Message-ID: <200608301324.k7UDOoPJ026528@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26513

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.12.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	16 Aug 2006 02:32:23 -0000	1.57
+++ .cvsignore	30 Aug 2006 13:24:47 -0000	1.58
@@ -1 +1 @@
-glib-2.12.2.tar.bz2
+glib-2.12.3.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- glib2.spec	28 Aug 2006 03:13:20 -0000	1.106
+++ glib2.spec	30 Aug 2006 13:24:47 -0000	1.107
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.12.2
+Version: 2.12.3
 Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -10,8 +10,6 @@
 Source2: glib2.sh
 Source3: glib2.csh
 Patch0: glib-2.11.1-libdir.patch
-# fixed in upstream cvs
-Patch1: glib-2.12.2-monotonic-timer.patch
 
 Conflicts: libgnomeui <= 2.2.0
 BuildRoot: %{_tmppath}/glib-%{PACKAGE_VERSION}-root
@@ -46,7 +44,6 @@
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .monotonic-timer
 
 %build
 
@@ -108,6 +105,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Aug 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.3-1.fc6
+- Update to 2.12.3
+- Drop upstreamed patch
+
 * Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.2-2.fc6
 - Use Posix monotonic timers for GTimer
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	16 Aug 2006 02:32:23 -0000	1.57
+++ sources	30 Aug 2006 13:24:47 -0000	1.58
@@ -1 +1 @@
-45471ca86af288b7a48116ab2b498d0c  glib-2.12.2.tar.bz2
+cbf663f8bc733e2f6c90599942f6616a  glib-2.12.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 30 13:35:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 09:35:18 -0400
Subject: rpms/frysk/devel frysk.spec,1.91,1.92
Message-ID: <200608301335.k7UDZIBW026761@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26748

Modified Files:
	frysk.spec 
Log Message:
- New upstream version.
- Removed xorg-x11-xinit from BuildRequires, dogtail was fixed to require it.
- Build also on ppc64.



Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- frysk.spec	28 Aug 2006 15:50:31 -0000	1.91
+++ frysk.spec	30 Aug 2006 13:35:15 -0000	1.92
@@ -1,6 +1,6 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.08.28.rh1
+Version:	0.0.1.2006.08.30.rh1
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
@@ -34,13 +34,10 @@
 BuildRequires:  dogtail >= 0.5.2
 BuildRequires:	gnome-python2-gconf
 
-# FIXME:
-# Needed by dogtail-run-headless; should be Required by dogtail:
-BuildRequires:	xorg-x11-xinit
 # Needed by "dogtail-run-headless -n":
 Buildrequires:	metacity
 
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: %{ix86} x86_64 ppc64
 
 %description
 Frysk is an execution-analysis technology implemented using native Java and C++.
@@ -115,6 +112,11 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Tue Aug 29 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.30.rh1-1
+- New upstream version.
+- Removed xorg-x11-xinit from BuildRequires, dogtail was fixed to require it.
+- Build also on ppc64.
+
 * Mon Aug 28 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.08.28.rh1-1
 - New upstream version.
 - Remove Patch1, the code now contains a real fix for bug #203902.



From fedora-cvs-commits at redhat.com  Wed Aug 30 13:35:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 09:35:57 -0400
Subject: rpms/frysk/devel .cvsignore,1.29,1.30 sources,1.29,1.30
Message-ID: <200608301335.k7UDZvCm026805@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26774

Modified Files:
	.cvsignore sources 
Log Message:
- New upstream version.
- Removed xorg-x11-xinit from BuildRequires, dogtail was fixed to require it.
- Build also on ppc64.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	28 Aug 2006 15:50:31 -0000	1.29
+++ .cvsignore	30 Aug 2006 13:35:55 -0000	1.30
@@ -1 +1 @@
-frysk-0.0.1.2006.08.28.rh1.tar.bz2
+frysk-0.0.1.2006.08.30.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	28 Aug 2006 15:50:31 -0000	1.29
+++ sources	30 Aug 2006 13:35:55 -0000	1.30
@@ -1 +1 @@
-ada0e13aa078433085bdeed15857be06  frysk-0.0.1.2006.08.28.rh1.tar.bz2
+025cdf1a29bea03218b742614ac15b8d  frysk-0.0.1.2006.08.30.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 30 13:59:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 09:59:05 -0400
Subject: rpms/ant/devel ant.spec,1.76,1.77
Message-ID: <200608301359.k7UDx5Lw009950@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/ant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9936

Modified Files:
	ant.spec 
Log Message:

Re-enabling style and xmlvalidate task on ppc64 and s390x.




Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ant.spec	11 Aug 2006 23:01:45 -0000	1.76
+++ ant.spec	30 Aug 2006 13:59:03 -0000	1.77
@@ -39,7 +39,7 @@
 
 Name:           ant
 Version:        1.6.5
-Release:        %{jpprelease}.1
+Release:        %{jpprelease}.2
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -57,7 +57,7 @@
 Patch2:         apache-ant-1.6.5-javah.patch
 # Fix some places where copies of classes are included in the wrong jarfiles
 Patch4:         apache-ant-jars.patch
-Patch5:         apache-ant-bz163689.patch
+#Patch5:         apache-ant-bz163689.patch
 Patch6:         apache-ant-1.6.5-jvm1.5-detect.patch
 Requires:       jaxp_parser_impl
 Requires:       jpackage-utils >= 0:1.5
@@ -562,9 +562,9 @@
 %patch4 -p1 -b .orig
 
 # Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
-%ifarch ppc64 s390x
-%patch5 -p1 -b .orig
-%endif
+#%ifarch ppc64 s390x
+#%patch5 -p1 -b .orig
+#%endif
 
 %patch6 -b .sav
 
@@ -1284,6 +1284,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Aug 30 2006 Deepak Bhole <dbhole at redhat.com> 1.6.5-2jpp.2
+- Re-enabling style and xmlvalidate task on ppc64 and s390x.
+
 * Fri Aug 11 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-2jpp.1
 - Added conditional native compilation
 - Add missing requirements



From fedora-cvs-commits at redhat.com  Wed Aug 30 14:01:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 10:01:12 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr-aumix.patch, NONE,
	1.1 man-pages-fr-aumix_missTH.patch, 1.1, NONE
Message-ID: <200608301401.k7UE1CF2010096@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10039

Added Files:
	man-pages-fr-aumix.patch 
Removed Files:
	man-pages-fr-aumix_missTH.patch 
Log Message:
Add new source correct and remove old one.


man-pages-fr-aumix.patch:
 aumix.1 |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE man-pages-fr-aumix.patch ---
--- man-pages-fr-2.39/man1/aumix.1.mar	2001-11-11 11:58:06.000000000 +0100
+++ man-pages-fr-2.39/man1/aumix.1	2006-08-30 15:26:08.000000000 +0200
@@ -30,6 +30,7 @@
 .\" .Sh AUTHORS
 .\" .Sh BUGS
 .\"
+.TH AUMIX 1 "13 July 2000"
 .Dd July 13, 2000
 .Os
 .Dt AUMIX 1


--- man-pages-fr-aumix_missTH.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 14:04:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 10:04:11 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr-2.39.tar.bz2,1.1,NONE
Message-ID: <200608301404.k7UE4BsH010193@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10171

Removed Files:
	man-pages-fr-2.39.tar.bz2 
Log Message:
Delete tar from cvs.



--- man-pages-fr-2.39.tar.bz2 DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 14:05:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 10:05:40 -0400
Subject: rpms/frysk/devel .cvsignore,1.30,1.31 sources,1.30,1.31
Message-ID: <200608301405.k7UE5elg010243@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10161

Modified Files:
	.cvsignore sources 
Log Message:
- New upstream version.
- Removed xorg-x11-xinit from BuildRequires, dogtail was fixed to require it.
- Build also on ppc64.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	30 Aug 2006 13:35:55 -0000	1.30
+++ .cvsignore	30 Aug 2006 14:05:38 -0000	1.31
@@ -1 +1 @@
-frysk-0.0.1.2006.08.30.tar.bz2
+frysk-0.0.1.2006.08.30.rh1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Aug 2006 13:35:55 -0000	1.30
+++ sources	30 Aug 2006 14:05:38 -0000	1.31
@@ -1 +1 @@
-025cdf1a29bea03218b742614ac15b8d  frysk-0.0.1.2006.08.30.tar.bz2
+07eb82b2bead6c87a3b9be779194e09f  frysk-0.0.1.2006.08.30.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 30 14:15:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 10:15:33 -0400
Subject: rpms/man-pages-fr/devel sources,1.8,1.9
Message-ID: <200608301415.k7UEFXZY010420@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10388

Modified Files:
	sources 
Log Message:
Upload sources.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Aug 2006 12:28:45 -0000	1.8
+++ sources	30 Aug 2006 14:15:29 -0000	1.9
@@ -1,2 +1,2 @@
 d5c654c7391dd2f452c21edb442d8f4e  mansupfr.tar.bz2
-7e9ecdd134703e8172107124f1f3fec4  man-pages-fr-2.39.tar.bz2
\ No newline at end of file
+7e9ecdd134703e8172107124f1f3fec4  man-pages-fr-2.39.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 30 14:24:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 10:24:07 -0400
Subject: rpms/kernel/devel linux-2.6-asix-usbnet-update.patch,NONE,1.1
Message-ID: <200608301424.k7UEO7GZ025965@cvs.devel.redhat.com>

Author: mtosatti

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25952

Added Files:
	linux-2.6-asix-usbnet-update.patch 
Log Message:
Add linux-2.6-asix-usbnet-update.patch to CVS



linux-2.6-asix-usbnet-update.patch:
 asix.c   | 1017 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
 usbnet.c |   12 
 usbnet.h |    1 
 3 files changed, 792 insertions(+), 238 deletions(-)

--- NEW FILE linux-2.6-asix-usbnet-update.patch ---
From: James Morris <jmorris at redhat.com>
Subject: [PATCH] Fixes for DUB-E100 vB1 usb ethernet

This patch is a backport of some upstream fixes required to make the asix 
driver recognize the newer B1 version of the D-Link DUB-E100 usb ethernet 
adapter.

It should apply cleanly to the current rawhide kernel, and seems to be 
working ok.

---

 drivers/usb/net/asix.c   | 1017 ++++++++++++++++++++++++++++++++++++-----------
 drivers/usb/net/usbnet.c |   12 
 drivers/usb/net/usbnet.h |    1 
 3 files changed, 792 insertions(+), 238 deletions(-)


diff -purN -X dontdiff linux-2.6.17.i686/drivers/usb/net/asix.c linux-2.6.17.i686.w/drivers/usb/net/asix.c
--- linux-2.6.17.i686/drivers/usb/net/asix.c	2006-08-25 16:29:24.000000000 -0400
+++ linux-2.6.17.i686.w/drivers/usb/net/asix.c	2006-08-25 17:21:09.000000000 -0400
@@ -1,7 +1,8 @@
 /*
  * ASIX AX8817X based USB 2.0 Ethernet Devices
- * Copyright (C) 2003-2005 David Hollis <dhollis at davehollis.com>
+ * Copyright (C) 2003-2006 David Hollis <dhollis at davehollis.com>
  * Copyright (C) 2005 Phil Chang <pchang23 at sbcglobal.net>
+ * Copyright (C) 2006 James Painter <jamie.painter at iname.com>
  * Copyright (c) 2002-2003 TiVo Inc.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -36,6 +37,9 @@
 
 #include "usbnet.h"
 
+#define DRIVER_VERSION "14-Jun-2006"
+static const char driver_name [] = "asix";
+
 /* ASIX AX8817X based USB 2.0 Ethernet Devices */
 
 #define AX_CMD_SET_SW_MII		0x06
@@ -46,23 +50,25 @@
 #define AX_CMD_WRITE_EEPROM		0x0c
 #define AX_CMD_WRITE_ENABLE		0x0d
 #define AX_CMD_WRITE_DISABLE		0x0e
+#define AX_CMD_READ_RX_CTL		0x0f
 #define AX_CMD_WRITE_RX_CTL		0x10
 #define AX_CMD_READ_IPG012		0x11
 #define AX_CMD_WRITE_IPG0		0x12
 #define AX_CMD_WRITE_IPG1		0x13
+#define AX_CMD_READ_NODE_ID		0x13
 #define AX_CMD_WRITE_IPG2		0x14
 #define AX_CMD_WRITE_MULTI_FILTER	0x16
-#define AX_CMD_READ_NODE_ID		0x17
+#define AX88172_CMD_READ_NODE_ID	0x17
 #define AX_CMD_READ_PHY_ID		0x19
 #define AX_CMD_READ_MEDIUM_STATUS	0x1a
 #define AX_CMD_WRITE_MEDIUM_MODE	0x1b
 #define AX_CMD_READ_MONITOR_MODE	0x1c
 #define AX_CMD_WRITE_MONITOR_MODE	0x1d
+#define AX_CMD_READ_GPIOS		0x1e
 #define AX_CMD_WRITE_GPIOS		0x1f
 #define AX_CMD_SW_RESET			0x20
 #define AX_CMD_SW_PHY_STATUS		0x21
 #define AX_CMD_SW_PHY_SELECT		0x22
-#define AX88772_CMD_READ_NODE_ID	0x13
 
 #define AX_MONITOR_MODE			0x01
 #define AX_MONITOR_LINK			0x02
@@ -70,15 +76,15 @@
 #define AX_MONITOR_HSFS			0x10
 
 /* AX88172 Medium Status Register values */
-#define AX_MEDIUM_FULL_DUPLEX		0x02
-#define AX_MEDIUM_TX_ABORT_ALLOW	0x04
-#define AX_MEDIUM_FLOW_CONTROL_EN	0x10
+#define AX88172_MEDIUM_FD		0x02
+#define AX88172_MEDIUM_TX		0x04
+#define AX88172_MEDIUM_FC		0x10
+#define AX88172_MEDIUM_DEFAULT \
+		( AX88172_MEDIUM_FD | AX88172_MEDIUM_TX | AX88172_MEDIUM_FC )
 
 #define AX_MCAST_FILTER_SIZE		8
 #define AX_MAX_MCAST			64
 
-#define AX_EEPROM_LEN			0x40
-
 #define AX_SWRESET_CLEAR		0x00
 #define AX_SWRESET_RR			0x01
 #define AX_SWRESET_RT			0x02
@@ -92,23 +98,78 @@
 #define AX88772_IPG1_DEFAULT		0x0c
 #define AX88772_IPG2_DEFAULT		0x12
 
-#define AX88772_MEDIUM_FULL_DUPLEX	0x0002
-#define AX88772_MEDIUM_RESERVED		0x0004
-#define AX88772_MEDIUM_RX_FC_ENABLE	0x0010
-#define AX88772_MEDIUM_TX_FC_ENABLE	0x0020
-#define AX88772_MEDIUM_PAUSE_FORMAT	0x0080
-#define AX88772_MEDIUM_RX_ENABLE	0x0100
-#define AX88772_MEDIUM_100MB		0x0200
+/* AX88772 & AX88178 Medium Mode Register */
+#define AX_MEDIUM_PF		0x0080
+#define AX_MEDIUM_JFE		0x0040
+#define AX_MEDIUM_TFC		0x0020
+#define AX_MEDIUM_RFC		0x0010
+#define AX_MEDIUM_ENCK		0x0008
+#define AX_MEDIUM_AC		0x0004
+#define AX_MEDIUM_FD		0x0002
+#define AX_MEDIUM_GM		0x0001
+#define AX_MEDIUM_SM		0x1000
+#define AX_MEDIUM_SBP		0x0800
+#define AX_MEDIUM_PS		0x0200
+#define AX_MEDIUM_RE		0x0100
+
+#define AX88178_MEDIUM_DEFAULT	\
+	(AX_MEDIUM_PS | AX_MEDIUM_FD | AX_MEDIUM_AC | \
+	 AX_MEDIUM_RFC | AX_MEDIUM_TFC | AX_MEDIUM_JFE | \
+	 AX_MEDIUM_RE )
+
 #define AX88772_MEDIUM_DEFAULT	\
-	(AX88772_MEDIUM_FULL_DUPLEX | AX88772_MEDIUM_RX_FC_ENABLE | \
-	 AX88772_MEDIUM_TX_FC_ENABLE | AX88772_MEDIUM_100MB | \
-	 AX88772_MEDIUM_RESERVED | AX88772_MEDIUM_RX_ENABLE )
+	(AX_MEDIUM_FD | AX_MEDIUM_RFC | \
+	 AX_MEDIUM_TFC | AX_MEDIUM_PS | \
+	 AX_MEDIUM_AC | AX_MEDIUM_RE )
+
+/* AX88772 & AX88178 RX_CTL values */
+#define AX_RX_CTL_SO			0x0080
+#define AX_RX_CTL_AP			0x0020
+#define AX_RX_CTL_AM			0x0010
+#define AX_RX_CTL_AB			0x0008
+#define AX_RX_CTL_SEP			0x0004
+#define AX_RX_CTL_AMALL			0x0002
+#define AX_RX_CTL_PRO			0x0001
+#define AX_RX_CTL_MFB_2048		0x0000
+#define AX_RX_CTL_MFB_4096		0x0100
+#define AX_RX_CTL_MFB_8192		0x0200
+#define AX_RX_CTL_MFB_16384		0x0300
+
+#define AX_DEFAULT_RX_CTL	\
+	(AX_RX_CTL_SO | AX_RX_CTL_AB )
+
+/* GPIO 0 .. 2 toggles */
+#define AX_GPIO_GPO0EN		0x01	/* GPIO0 Output enable */
+#define AX_GPIO_GPO_0		0x02	/* GPIO0 Output value */
+#define AX_GPIO_GPO1EN		0x04	/* GPIO1 Output enable */
+#define AX_GPIO_GPO_1		0x08	/* GPIO1 Output value */
+#define AX_GPIO_GPO2EN		0x10	/* GPIO2 Output enable */
+#define AX_GPIO_GPO_2		0x20	/* GPIO2 Output value */
+#define AX_GPIO_RESERVED	0x40	/* Reserved */
+#define AX_GPIO_RSE		0x80	/* Reload serial EEPROM */
+
+#define AX_EEPROM_MAGIC		0xdeadbeef
+#define AX88172_EEPROM_LEN	0x40
+#define AX88772_EEPROM_LEN	0xff
+
+#define PHY_MODE_MARVELL	0x0000
+#define MII_MARVELL_LED_CTRL	0x0018
+#define MII_MARVELL_STATUS	0x001b
+#define MII_MARVELL_CTRL	0x0014
+
+#define MARVELL_LED_MANUAL	0x0019
 
-#define AX_EEPROM_MAGIC			0xdeadbeef
+#define MARVELL_STATUS_HWCFG	0x0004
+
+#define MARVELL_CTRL_TXDELAY	0x0002
+#define MARVELL_CTRL_RXDELAY	0x0080
 
 /* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
 struct asix_data {
 	u8 multi_filter[AX_MCAST_FILTER_SIZE];
+	u8 phymode;
+	u8 ledmode;
+	u8 eeprom_len;
 };
 
 struct ax88172_int_data {
@@ -122,6 +183,8 @@ struct ax88172_int_data {
 static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
 			    u16 size, void *data)
 {
+	devdbg(dev,"asix_read_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d",
+		cmd, value, index, size);
 	return usb_control_msg(
 		dev->udev,
 		usb_rcvctrlpipe(dev->udev, 0),
@@ -137,6 +200,8 @@ static int asix_read_cmd(struct usbnet *
 static int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
 			     u16 size, void *data)
 {
+	devdbg(dev,"asix_write_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d",
+		cmd, value, index, size);
 	return usb_control_msg(
 		dev->udev,
 		usb_sndctrlpipe(dev->udev, 0),
@@ -161,12 +226,167 @@ static void asix_async_cmd_callback(stru
 	usb_free_urb(urb);
 }
 
+static void
+asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
+				    u16 size, void *data)
+{
+	struct usb_ctrlrequest *req;
+	int status;
+	struct urb *urb;
+
+	devdbg(dev,"asix_write_cmd_async() cmd=0x%02x value=0x%04x index=0x%04x size=%d",
+		cmd, value, index, size);
+	if ((urb = usb_alloc_urb(0, GFP_ATOMIC)) == NULL) {
+		deverr(dev, "Error allocating URB in write_cmd_async!");
+		return;
+	}
+
+	if ((req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC)) == NULL) {
+		deverr(dev, "Failed to allocate memory for control request");
+		usb_free_urb(urb);
+		return;
+	}
+
+	req->bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE;
+	req->bRequest = cmd;
+	req->wValue = value;
+	req->wIndex = index;
+	req->wLength = size;
+
+	usb_fill_control_urb(urb, dev->udev,
+			     usb_sndctrlpipe(dev->udev, 0),
+			     (void *)req, data, size,
+			     asix_async_cmd_callback, req);
+
+	if((status = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
+		deverr(dev, "Error submitting the control message: status=%d",
+				status);
+		kfree(req);
+		usb_free_urb(urb);
+	}
+}
+
+static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
+{
+	u8  *head;
+	u32  header;
+	char *packet;
+	struct sk_buff *ax_skb;
+	u16 size;
+
+	head = (u8 *) skb->data;
+	memcpy(&header, head, sizeof(header));
+	le32_to_cpus(&header);
+	packet = head + sizeof(header);
+
+	skb_pull(skb, 4);
+
+	while (skb->len > 0) {
+		if ((short)(header & 0x0000ffff) !=
+		    ~((short)((header & 0xffff0000) >> 16))) {
+			deverr(dev,"asix_rx_fixup() Bad Header Length");
+		}
+		/* get the packet length */
+		size = (u16) (header & 0x0000ffff);
+
+		if ((skb->len) - ((size + 1) & 0xfffe) == 0)
+			return 2;
+		if (size > ETH_FRAME_LEN) {
+			deverr(dev,"asix_rx_fixup() Bad RX Length %d", size);
+			return 0;
+		}
+		ax_skb = skb_clone(skb, GFP_ATOMIC);
+		if (ax_skb) {
+			ax_skb->len = size;
+			ax_skb->data = packet;
+			ax_skb->tail = packet + size;
+			usbnet_skb_return(dev, ax_skb);
+		} else {
+			return 0;
+		}
+
+		skb_pull(skb, (size + 1) & 0xfffe);
+
+		if (skb->len == 0)
+			break;
+
+		head = (u8 *) skb->data;
+		memcpy(&header, head, sizeof(header));
+		le32_to_cpus(&header);
+		packet = head + sizeof(header);
+		skb_pull(skb, 4);
+	}
+
+	if (skb->len < 0) {
+		deverr(dev,"asix_rx_fixup() Bad SKB Length %d", skb->len);
+		return 0;
+	}
+	return 1;
+}
+
+static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
+					gfp_t flags)
+{
+	int padlen;
+	int headroom = skb_headroom(skb);
+	int tailroom = skb_tailroom(skb);
+	u32 packet_len;
+	u32 padbytes = 0xffff0000;
+
+	padlen = ((skb->len + 4) % 512) ? 0 : 4;
+
+	if ((!skb_cloned(skb))
+	    && ((headroom + tailroom) >= (4 + padlen))) {
+		if ((headroom < 4) || (tailroom < padlen)) {
+			skb->data = memmove(skb->head + 4, skb->data, skb->len);
+			skb->tail = skb->data + skb->len;
+		}
+	} else {
+		struct sk_buff *skb2;
+		skb2 = skb_copy_expand(skb, 4, padlen, flags);
+		dev_kfree_skb_any(skb);
+		skb = skb2;
+		if (!skb)
+			return NULL;
+	}
+
+	skb_push(skb, 4);
+	packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
+	memcpy(skb->data, &packet_len, sizeof(packet_len));
+
+	if ((skb->len % 512) == 0) {
+		memcpy( skb->tail, &padbytes, sizeof(padbytes));
+		skb_put(skb, sizeof(padbytes));
+	}
+	return skb;
+}
+
+static void asix_status(struct usbnet *dev, struct urb *urb)
+{
+	struct ax88172_int_data *event;
+	int link;
+
+	if (urb->actual_length < 8)
+		return;
+
+	event = urb->transfer_buffer;
+	link = event->link & 0x01;
+	if (netif_carrier_ok(dev->net) != link) {
+		if (link) {
+			netif_carrier_on(dev->net);
+			usbnet_defer_kevent (dev, EVENT_LINK_RESET );
+		} else
+			netif_carrier_off(dev->net);
+		devdbg(dev, "Link Status is: %d", link);
+	}
+}
+
 static inline int asix_set_sw_mii(struct usbnet *dev)
 {
 	int ret;
 	ret = asix_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);
 	if (ret < 0)
-		devdbg(dev, "Failed to enable software MII access");
+		deverr(dev, "Failed to enable software MII access");
 	return ret;
 }
 
@@ -175,24 +395,27 @@ static inline int asix_set_hw_mii(struct
 	int ret;
 	ret = asix_write_cmd(dev, AX_CMD_SET_HW_MII, 0x0000, 0, 0, NULL);
 	if (ret < 0)
-		devdbg(dev, "Failed to enable hardware MII access");
+		deverr(dev, "Failed to enable hardware MII access");
 	return ret;
 }
 
-static inline int asix_get_phyid(struct usbnet *dev)
+static inline int asix_get_phy_addr(struct usbnet *dev)
 {
 	int ret = 0;
 	void *buf;
 
+	devdbg(dev, "asix_get_phy_addr()");
+
 	buf = kmalloc(2, GFP_KERNEL);
 	if (!buf)
 		goto out1;
 
 	if ((ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID,
 				    0, 0, 2, buf)) < 2) {
-		devdbg(dev, "Error reading PHYID register: %02x", ret);
+		deverr(dev, "Error reading PHYID register: %02x", ret);
 		goto out2;
 	}
+	devdbg(dev, "asix_get_phy_addr() returning 0x%04x", *((u16 *)buf));
 	ret = *((u8 *)buf + 1);
 out2:
 	kfree(buf);
@@ -206,8 +429,29 @@ static int asix_sw_reset(struct usbnet *
 
         ret = asix_write_cmd(dev, AX_CMD_SW_RESET, flags, 0, 0, NULL);
 	if (ret < 0)
-		devdbg(dev,"Failed to send software reset: %02x", ret);
+		deverr(dev,"Failed to send software reset: %02x", ret);
+
+	return ret;
+}
+
+static u16 asix_read_rx_ctl(struct usbnet *dev)
+{
+	u16 ret = 0;
+	void *buf;
+
+	buf = kmalloc(2, GFP_KERNEL);
+	if (!buf)
+		goto out1;
 
+	if ((ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL,
+				    0, 0, 2, buf)) < 2) {
+		deverr(dev, "Error reading RX_CTL register: %02x", ret);
+		goto out2;
+	}
+	ret = le16_to_cpu(*((u16 *)buf));
+out2:
+	kfree(buf);
+out1:
 	return ret;
 }
 
@@ -215,82 +459,79 @@ static int asix_write_rx_ctl(struct usbn
 {
 	int ret;
 
+	devdbg(dev,"asix_write_rx_ctl() - mode = 0x%04x", mode);
 	ret = asix_write_cmd(dev, AX_CMD_WRITE_RX_CTL, mode, 0, 0, NULL);
 	if (ret < 0)
-                devdbg(dev, "Failed to write RX_CTL mode: %02x", ret);
+		deverr(dev, "Failed to write RX_CTL mode to 0x%04x: %02x",
+		       mode, ret);
 
 	return ret;
 }
 
-static void asix_status(struct usbnet *dev, struct urb *urb)
+static u16 asix_read_medium_status(struct usbnet *dev)
 {
-	struct ax88172_int_data *event;
-	int link;
+	u16 ret = 0;
+	void *buf;
 
-	if (urb->actual_length < 8)
-		return;
+	buf = kmalloc(2, GFP_KERNEL);
+	if (!buf)
+		goto out1;
 
-	event = urb->transfer_buffer;
-	link = event->link & 0x01;
-	if (netif_carrier_ok(dev->net) != link) {
-		if (link) {
-			netif_carrier_on(dev->net);
-			usbnet_defer_kevent (dev, EVENT_LINK_RESET );
-		} else
-			netif_carrier_off(dev->net);
-		devdbg(dev, "Link Status is: %d", link);
+	if ((ret = asix_read_cmd(dev, AX_CMD_READ_MEDIUM_STATUS,
+				    0, 0, 2, buf)) < 2) {
+		deverr(dev, "Error reading Medium Status register: %02x", ret);
+		goto out2;
 	}
+	ret = le16_to_cpu(*((u16 *)buf));
+out2:
+	kfree(buf);
+out1:
+	return ret;
 }
 
-static void
-asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-				    u16 size, void *data)
+static int asix_write_medium_mode(struct usbnet *dev, u16 mode)
 {
-	struct usb_ctrlrequest *req;
-	int status;
-	struct urb *urb;
+	int ret;
 
-	if ((urb = usb_alloc_urb(0, GFP_ATOMIC)) == NULL) {
-		devdbg(dev, "Error allocating URB in write_cmd_async!");
-		return;
-	}
+	devdbg(dev,"asix_write_medium_mode() - mode = 0x%04x", mode);
+	ret = asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);
+	if (ret < 0)
+		deverr(dev, "Failed to write Medium Mode mode to 0x%04x: %02x",
+			mode, ret);
 
-	if ((req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC)) == NULL) {
-		deverr(dev, "Failed to allocate memory for control request");
-		usb_free_urb(urb);
-		return;
-	}
+	return ret;
+}
 
-	req->bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE;
-	req->bRequest = cmd;
-	req->wValue = cpu_to_le16(value);
-	req->wIndex = cpu_to_le16(index);
-	req->wLength = cpu_to_le16(size);
+static int asix_write_gpio(struct usbnet *dev, u16 value, int sleep)
+{
+	int ret;
 
-	usb_fill_control_urb(urb, dev->udev,
-			     usb_sndctrlpipe(dev->udev, 0),
-			     (void *)req, data, size,
-			     asix_async_cmd_callback, req);
+	devdbg(dev,"asix_write_gpio() - value = 0x%04x", value);
+	ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL);
+	if (ret < 0)
+		deverr(dev, "Failed to write GPIO value 0x%04x: %02x",
+			value, ret);
 
-	if((status = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
-		deverr(dev, "Error submitting the control message: status=%d",
-				status);
-		kfree(req);
-		usb_free_urb(urb);
-	}
+	if (sleep)
+		msleep(sleep);
+
+	return ret;
 }
 
+/*
+ * AX88772 & AX88178 have a 16-bit RX_CTL value
+ */
 static void asix_set_multicast(struct net_device *net)
 {
 	struct usbnet *dev = netdev_priv(net);
 	struct asix_data *data = (struct asix_data *)&dev->data;
-	u8 rx_ctl = 0x8c;
+	u16 rx_ctl = AX_DEFAULT_RX_CTL;
 
 	if (net->flags & IFF_PROMISC) {
-		rx_ctl |= 0x01;
+		rx_ctl |= AX_RX_CTL_PRO;
 	} else if (net->flags & IFF_ALLMULTI
 		   || net->mc_count > AX_MAX_MCAST) {
-		rx_ctl |= 0x02;
+		rx_ctl |= AX_RX_CTL_AMALL;
 	} else if (net->mc_count == 0) {
 		/* just broadcast and directed */
 	} else {
@@ -317,7 +558,7 @@ static void asix_set_multicast(struct ne
 		asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
 				   AX_MCAST_FILTER_SIZE, data->multi_filter);
 
-		rx_ctl |= 0x10;
+		rx_ctl |= AX_RX_CTL_AM;
 	}
 
 	asix_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
@@ -333,50 +574,43 @@ static int asix_mdio_read(struct net_dev
 				(__u16)loc, 2, (u16 *)&res);
 	asix_set_hw_mii(dev);
 
-	return res & 0xffff;
-}
+	devdbg(dev, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x", phy_id, loc, le16_to_cpu(res & 0xffff));
 
-/* same as above, but converts resulting value to cpu byte order */
-static int asix_mdio_read_le(struct net_device *netdev, int phy_id, int loc)
-{
-	return le16_to_cpu(asix_mdio_read(netdev,phy_id, loc));
+	return le16_to_cpu(res & 0xffff);
 }
 
 static void
 asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
 {
 	struct usbnet *dev = netdev_priv(netdev);
-	u16 res = val;
+	u16 res = cpu_to_le16(val);
 
+	devdbg(dev, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x", phy_id, loc, val);
 	asix_set_sw_mii(dev);
 	asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
 				(__u16)loc, 2, (u16 *)&res);
 	asix_set_hw_mii(dev);
 }
 
-/* same as above, but converts new value to le16 byte order before writing */
-static void
-asix_mdio_write_le(struct net_device *netdev, int phy_id, int loc, int val)
+/* Get the PHY Identifier from the PHYSID1 & PHYSID2 MII registers */
+static u32 asix_get_phyid(struct usbnet *dev)
 {
-	asix_mdio_write( netdev, phy_id, loc, cpu_to_le16(val) );
-}
+	int phy_reg;
+	u32 phy_id;
 
-static int ax88172_link_reset(struct usbnet *dev)
-{
-	u16 lpa;
-	u16 adv;
-	u16 res;
-	u8 mode;
+	phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID1);
+	if (phy_reg < 0)
+		return 0;
 
-	mode = AX_MEDIUM_TX_ABORT_ALLOW | AX_MEDIUM_FLOW_CONTROL_EN;
-	lpa = asix_mdio_read_le(dev->net, dev->mii.phy_id, MII_LPA);
-	adv = asix_mdio_read_le(dev->net, dev->mii.phy_id, MII_ADVERTISE);
-	res = mii_nway_result(lpa|adv);
-	if (res & LPA_DUPLEX)
-		mode |= AX_MEDIUM_FULL_DUPLEX;
-	asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);
+	phy_id = (phy_reg & 0xffff) << 16;
 
-	return 0;
+	phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID2);
+	if (phy_reg < 0)
+		return 0;
+
+	phy_id |= (phy_reg & 0xffff);
+
+	return phy_id;
 }
 
 static void
@@ -423,7 +657,10 @@ asix_set_wol(struct net_device *net, str
 
 static int asix_get_eeprom_len(struct net_device *net)
 {
-	return AX_EEPROM_LEN;
+	struct usbnet *dev = netdev_priv(net);
+	struct asix_data *data = (struct asix_data *)&dev->data;
+
+	return data->eeprom_len;
 }
 
 static int asix_get_eeprom(struct net_device *net,
@@ -453,9 +690,14 @@ static int asix_get_eeprom(struct net_de
 static void asix_get_drvinfo (struct net_device *net,
 				 struct ethtool_drvinfo *info)
 {
+	struct usbnet *dev = netdev_priv(net);
+	struct asix_data *data = (struct asix_data *)&dev->data;
+
 	/* Inherit standard device info */
 	usbnet_get_drvinfo(net, info);
-	info->eedump_len = 0x3e;
+	strncpy (info->driver, driver_name, sizeof info->driver);
+	strncpy (info->version, DRIVER_VERSION, sizeof info->version);
+	info->eedump_len = data->eeprom_len;
 }
 
 static int asix_get_settings(struct net_device *net, struct ethtool_cmd *cmd)
@@ -468,16 +710,43 @@ static int asix_get_settings(struct net_
 static int asix_set_settings(struct net_device *net, struct ethtool_cmd *cmd)
 {
 	struct usbnet *dev = netdev_priv(net);
+	int res = mii_ethtool_sset(&dev->mii,cmd);
 
-	return mii_ethtool_sset(&dev->mii,cmd);
+	/* link speed/duplex might have changed */
+	if (dev->driver_info->link_reset)
+		dev->driver_info->link_reset(dev);
+
+	return res;
 }
 
-/* We need to override some ethtool_ops so we require our
-   own structure so we don't interfere with other usbnet
-   devices that may be connected at the same time. */
-static struct ethtool_ops ax88172_ethtool_ops = {
-	.get_drvinfo		= asix_get_drvinfo,
-	.get_link		= ethtool_op_get_link,
+static int asix_nway_reset(struct net_device *net)
+{
+	struct usbnet *dev = netdev_priv(net);
+
+	return mii_nway_restart(&dev->mii);
+}
+
+static u32 asix_get_link(struct net_device *net)
+{
+	struct usbnet *dev = netdev_priv(net);
+
+	return mii_link_ok(&dev->mii);
+}
+
+static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd)
+{
+	struct usbnet *dev = netdev_priv(net);
+
+	return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
+}
+
+/* We need to override some ethtool_ops so we require our
+   own structure so we don't interfere with other usbnet
+   devices that may be connected at the same time. */
+static struct ethtool_ops ax88172_ethtool_ops = {
+	.get_drvinfo		= asix_get_drvinfo,
+	.get_link		= asix_get_link,
+	.nway_reset		= asix_nway_reset,
 	.get_msglevel		= usbnet_get_msglevel,
 	.set_msglevel		= usbnet_set_msglevel,
 	.get_wol		= asix_get_wol,
@@ -488,11 +757,66 @@ static struct ethtool_ops ax88172_ethtoo
 	.set_settings		= asix_set_settings,
 };
 
-static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd)
+static void ax88172_set_multicast(struct net_device *net)
 {
 	struct usbnet *dev = netdev_priv(net);
+	struct asix_data *data = (struct asix_data *)&dev->data;
+	u8 rx_ctl = 0x8c;
 
-	return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
+	if (net->flags & IFF_PROMISC) {
+		rx_ctl |= 0x01;
+	} else if (net->flags & IFF_ALLMULTI
+		   || net->mc_count > AX_MAX_MCAST) {
+		rx_ctl |= 0x02;
+	} else if (net->mc_count == 0) {
+		/* just broadcast and directed */
+	} else {
+		/* We use the 20 byte dev->data
+		 * for our 8 byte filter buffer
+		 * to avoid allocating memory that
+		 * is tricky to free later */
+		struct dev_mc_list *mc_list = net->mc_list;
+		u32 crc_bits;
+		int i;
+
+		memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
+
+		/* Build the multicast hash filter. */
+		for (i = 0; i < net->mc_count; i++) {
+			crc_bits =
+			    ether_crc(ETH_ALEN,
+				      mc_list->dmi_addr) >> 26;
+			data->multi_filter[crc_bits >> 3] |=
+			    1 << (crc_bits & 7);
+			mc_list = mc_list->next;
+		}
+
+		asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
+				   AX_MCAST_FILTER_SIZE, data->multi_filter);
+
+		rx_ctl |= 0x10;
+	}
+
+	asix_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
+}
+
+static int ax88172_link_reset(struct usbnet *dev)
+{
+	u8 mode;
+	struct ethtool_cmd ecmd;
+
+	mii_check_media(&dev->mii, 1, 1);
+	mii_ethtool_gset(&dev->mii, &ecmd);
+	mode = AX88172_MEDIUM_DEFAULT;
+
+	if (ecmd.duplex != DUPLEX_FULL)
+		mode |= ~AX88172_MEDIUM_FD;
+
+	devdbg(dev, "ax88172_link_reset() speed: %d duplex: %d setting mode to 0x%04x", ecmd.speed, ecmd.duplex, mode);
+
+	asix_write_medium_mode(dev, mode);
+
+	return 0;
 }
 
 static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
@@ -501,6 +825,9 @@ static int ax88172_bind(struct usbnet *d
 	void *buf;
 	int i;
 	unsigned long gpio_bits = dev->driver_info->data;
+	struct asix_data *data = (struct asix_data *)&dev->data;
+
+	data->eeprom_len = AX88172_EEPROM_LEN;
 
 	usbnet_get_endpoints(dev,intf);
 
@@ -519,12 +846,12 @@ static int ax88172_bind(struct usbnet *d
 		msleep(5);
 	}
 
-	if ((ret = asix_write_rx_ctl(dev,0x80)) < 0)
+	if ((ret = asix_write_rx_ctl(dev, 0x80)) < 0)
 		goto out2;
 
 	/* Get the MAC address */
 	memset(buf, 0, ETH_ALEN);
-	if ((ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
+	if ((ret = asix_read_cmd(dev, AX88172_CMD_READ_NODE_ID,
 				0, 0, 6, buf)) < 0) {
 		dbg("read AX_CMD_READ_NODE_ID failed: %d", ret);
 		goto out2;
@@ -537,14 +864,14 @@ static int ax88172_bind(struct usbnet *d
 	dev->mii.mdio_write = asix_mdio_write;
 	dev->mii.phy_id_mask = 0x3f;
 	dev->mii.reg_num_mask = 0x1f;
-	dev->mii.phy_id = asix_get_phyid(dev);
+	dev->mii.phy_id = asix_get_phy_addr(dev);
 	dev->net->do_ioctl = asix_ioctl;
 
-	dev->net->set_multicast_list = asix_set_multicast;
+	dev->net->set_multicast_list = ax88172_set_multicast;
 	dev->net->ethtool_ops = &ax88172_ethtool_ops;
 
-	asix_mdio_write_le(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
-	asix_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+	asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
+	asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
 		ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
 	mii_nway_restart(&dev->mii);
 
@@ -557,7 +884,8 @@ out1:
 
 static struct ethtool_ops ax88772_ethtool_ops = {
 	.get_drvinfo		= asix_get_drvinfo,
-	.get_link		= ethtool_op_get_link,
+	.get_link		= asix_get_link,
+	.nway_reset		= asix_nway_reset,
 	.get_msglevel		= usbnet_get_msglevel,
 	.set_msglevel		= usbnet_set_msglevel,
 	.get_wol		= asix_get_wol,
@@ -568,10 +896,37 @@ static struct ethtool_ops ax88772_ethtoo
 	.set_settings		= asix_set_settings,
 };
 
+static int ax88772_link_reset(struct usbnet *dev)
+{
+	u16 mode;
+	struct ethtool_cmd ecmd;
+
+	mii_check_media(&dev->mii, 1, 1);
+	mii_ethtool_gset(&dev->mii, &ecmd);
+	mode = AX88772_MEDIUM_DEFAULT;
+
+	if (ecmd.speed != SPEED_100)
+		mode &= ~AX_MEDIUM_PS;
+
+	if (ecmd.duplex != DUPLEX_FULL)
+		mode &= ~AX_MEDIUM_FD;
+
+	devdbg(dev, "ax88772_link_reset() speed: %d duplex: %d setting mode to 0x%04x", ecmd.speed, ecmd.duplex, mode);
+
+	asix_write_medium_mode(dev, mode);
+
+	return 0;
+}
+
 static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
 {
 	int ret;
 	void *buf;
+	u16 rx_ctl;
+	struct asix_data *data = (struct asix_data *)&dev->data;
+	u32 phyid;
+
+	data->eeprom_len = AX88772_EEPROM_LEN;
 
 	usbnet_get_endpoints(dev,intf);
 
@@ -582,13 +937,12 @@ static int ax88772_bind(struct usbnet *d
 		goto out1;
 	}
 
-	if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS,
-				     0x00B0, 0, 0, buf)) < 0)
+	if ((ret = asix_write_gpio(dev,
+			AX_GPIO_RSE | AX_GPIO_GPO_2 | AX_GPIO_GPO2EN, 5)) < 0)
 		goto out2;
 
-	msleep(5);
 	if ((ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT,
-				0x0001, 0, 0, buf)) < 0) {
+				0x0000, 0, 0, buf)) < 0) {
 		dbg("Select PHY #1 failed: %d", ret);
 		goto out2;
 	}
@@ -605,36 +959,34 @@ static int ax88772_bind(struct usbnet *d
 		goto out2;
 
 	msleep(150);
-	if ((ret = asix_write_rx_ctl(dev, 0x00)) < 0)
+	rx_ctl = asix_read_rx_ctl(dev);
+	dbg("RX_CTL is 0x%04x after software reset", rx_ctl);
+	if ((ret = asix_write_rx_ctl(dev, 0x0000)) < 0)
 		goto out2;
 
+	rx_ctl = asix_read_rx_ctl(dev);
+	dbg("RX_CTL is 0x%04x setting to 0x0000", rx_ctl);
+
 	/* Get the MAC address */
 	memset(buf, 0, ETH_ALEN);
-	if ((ret = asix_read_cmd(dev, AX88772_CMD_READ_NODE_ID,
+	if ((ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
 				0, 0, ETH_ALEN, buf)) < 0) {
 		dbg("Failed to read MAC address: %d", ret);
 		goto out2;
 	}
 	memcpy(dev->net->dev_addr, buf, ETH_ALEN);
 
-	if ((ret = asix_set_sw_mii(dev)) < 0)
-		goto out2;
-
-	if (((ret = asix_read_cmd(dev, AX_CMD_READ_MII_REG,
-	      			0x0010, 2, 2, buf)) < 0)
-			|| (*((u16 *)buf) != 0x003b)) {
-		dbg("Read PHY register 2 must be 0x3b00: %d", ret);
-		goto out2;
-	}
-
 	/* Initialize MII structure */
 	dev->mii.dev = dev->net;
 	dev->mii.mdio_read = asix_mdio_read;
 	dev->mii.mdio_write = asix_mdio_write;
-	dev->mii.phy_id_mask = 0xff;
-	dev->mii.reg_num_mask = 0xff;
+	dev->mii.phy_id_mask = 0x1f;
+	dev->mii.reg_num_mask = 0x1f;
 	dev->net->do_ioctl = asix_ioctl;
-	dev->mii.phy_id = asix_get_phyid(dev);
+	dev->mii.phy_id = asix_get_phy_addr(dev);
+
+	phyid = asix_get_phyid(dev);
+	dbg("PHYID=0x%08x", phyid);
 
 	if ((ret = asix_sw_reset(dev, AX_SWRESET_PRL)) < 0)
 		goto out2;
@@ -649,16 +1001,13 @@ static int ax88772_bind(struct usbnet *d
 	dev->net->set_multicast_list = asix_set_multicast;
 	dev->net->ethtool_ops = &ax88772_ethtool_ops;
 
-	asix_mdio_write_le(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
-	asix_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+	asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
+	asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
 			ADVERTISE_ALL | ADVERTISE_CSMA);
 	mii_nway_restart(&dev->mii);
 
-	if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE,
-				AX88772_MEDIUM_DEFAULT, 0, 0, buf)) < 0) {
-		dbg("Write medium mode register: %d", ret);
+	if ((ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT)) < 0)
 		goto out2;
-	}
 
 	if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
 				AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT,
@@ -666,13 +1015,17 @@ static int ax88772_bind(struct usbnet *d
 		dbg("Write IPG,IPG1,IPG2 failed: %d", ret);
 		goto out2;
 	}
-	if ((ret = asix_set_hw_mii(dev)) < 0)
-		goto out2;
 
 	/* Set RX_CTL to default values with 2k buffer, and enable cactus */
-	if ((ret = asix_write_rx_ctl(dev, 0x0088)) < 0)
+	if ((ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL)) < 0)
 		goto out2;
 
+	rx_ctl = asix_read_rx_ctl(dev);
+	dbg("RX_CTL is 0x%04x after all initializations", rx_ctl);
+
+	rx_ctl = asix_read_medium_status(dev);
+	dbg("Medium Status is 0x%04x after all initializations", rx_ctl);
+
 	kfree(buf);
 
 	/* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
@@ -690,120 +1043,285 @@ out1:
 	return ret;
 }
 
-static int ax88772_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
+static struct ethtool_ops ax88178_ethtool_ops = {
+	.get_drvinfo		= asix_get_drvinfo,
+	.get_link		= asix_get_link,
+	.nway_reset		= asix_nway_reset,
+	.get_msglevel		= usbnet_get_msglevel,
+	.set_msglevel		= usbnet_set_msglevel,
+	.get_wol		= asix_get_wol,
+	.set_wol		= asix_set_wol,
+	.get_eeprom_len		= asix_get_eeprom_len,
+	.get_eeprom		= asix_get_eeprom,
+	.get_settings		= asix_get_settings,
+	.set_settings		= asix_set_settings,
+};
+
+static int marvell_phy_init(struct usbnet *dev)
 {
-	u8  *head;
-	u32  header;
-	char *packet;
-	struct sk_buff *ax_skb;
-	u16 size;
+	struct asix_data *data = (struct asix_data *)&dev->data;
+	u16 reg;
 
-	head = (u8 *) skb->data;
-	memcpy(&header, head, sizeof(header));
-	le32_to_cpus(&header);
-	packet = head + sizeof(header);
+	devdbg(dev,"marvell_phy_init()");
 
-	skb_pull(skb, 4);
+	reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_MARVELL_STATUS);
+	devdbg(dev,"MII_MARVELL_STATUS = 0x%04x", reg);
 
-	while (skb->len > 0) {
-		if ((short)(header & 0x0000ffff) !=
-		    ~((short)((header & 0xffff0000) >> 16))) {
-			devdbg(dev,"header length data is error");
-		}
-		/* get the packet length */
-		size = (u16) (header & 0x0000ffff);
+	asix_mdio_write(dev->net, dev->mii.phy_id, MII_MARVELL_CTRL,
+			MARVELL_CTRL_RXDELAY | MARVELL_CTRL_TXDELAY);
+
+	if (data->ledmode) {
+		reg = asix_mdio_read(dev->net, dev->mii.phy_id,
+			MII_MARVELL_LED_CTRL);
+		devdbg(dev,"MII_MARVELL_LED_CTRL (1) = 0x%04x", reg);
+
+		reg &= 0xf8ff;
+		reg |= (1 + 0x0100);
+		asix_mdio_write(dev->net, dev->mii.phy_id,
+			MII_MARVELL_LED_CTRL, reg);
+
+		reg = asix_mdio_read(dev->net, dev->mii.phy_id,
+			MII_MARVELL_LED_CTRL);
+		devdbg(dev,"MII_MARVELL_LED_CTRL (2) = 0x%04x", reg);
+		reg &= 0xfc0f;
+	}
 
-		if ((skb->len) - ((size + 1) & 0xfffe) == 0)
-			return 2;
-		if (size > ETH_FRAME_LEN) {
-			devdbg(dev,"invalid rx length %d", size);
-			return 0;
-		}
-		ax_skb = skb_clone(skb, GFP_ATOMIC);
-		if (ax_skb) {
-			ax_skb->len = size;
-			ax_skb->data = packet;
-			ax_skb->tail = packet + size;
-			usbnet_skb_return(dev, ax_skb);
-		} else {
-			return 0;
-		}
+	return 0;
+}
 
-		skb_pull(skb, (size + 1) & 0xfffe);
+static int marvell_led_status(struct usbnet *dev, u16 speed)
+{
+	u16 reg = asix_mdio_read(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL);
 
-		if (skb->len == 0)
-			break;
+	devdbg(dev, "marvell_led_status() read 0x%04x", reg);
 
-		head = (u8 *) skb->data;
-		memcpy(&header, head, sizeof(header));
-		le32_to_cpus(&header);
-		packet = head + sizeof(header);
-		skb_pull(skb, 4);
-	}
+	/* Clear out the center LED bits - 0x03F0 */
+	reg &= 0xfc0f;
 
-	if (skb->len < 0) {
-		devdbg(dev,"invalid rx length %d", skb->len);
-		return 0;
+	switch (speed) {
+		case SPEED_1000:
+			reg |= 0x03e0;
+			break;
+		case SPEED_100:
+			reg |= 0x03b0;
+			break;
+		default:
+			reg |= 0x02f0;
 	}
-	return 1;
+
+	devdbg(dev, "marvell_led_status() writing 0x%04x", reg);
+	asix_mdio_write(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL, reg);
+
+	return 0;
 }
 
-static struct sk_buff *ax88772_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
-					gfp_t flags)
+static int ax88178_link_reset(struct usbnet *dev)
 {
-	int padlen;
-	int headroom = skb_headroom(skb);
-	int tailroom = skb_tailroom(skb);
-	u32 packet_len;
-	u32 padbytes = 0xffff0000;
+	u16 mode;
+	struct ethtool_cmd ecmd;
+	struct asix_data *data = (struct asix_data *)&dev->data;
 
-	padlen = ((skb->len + 4) % 512) ? 0 : 4;
+	devdbg(dev,"ax88178_link_reset()");
 
-	if ((!skb_cloned(skb))
-	    && ((headroom + tailroom) >= (4 + padlen))) {
-		if ((headroom < 4) || (tailroom < padlen)) {
-			skb->data = memmove(skb->head + 4, skb->data, skb->len);
-			skb->tail = skb->data + skb->len;
-		}
+	mii_check_media(&dev->mii, 1, 1);
+	mii_ethtool_gset(&dev->mii, &ecmd);
+	mode = AX88178_MEDIUM_DEFAULT;
+
+	if (ecmd.speed == SPEED_1000)
+		mode |= AX_MEDIUM_GM | AX_MEDIUM_ENCK;
+	else if (ecmd.speed == SPEED_100)
+		mode |= AX_MEDIUM_PS;
+	else
+		mode &= ~(AX_MEDIUM_PS | AX_MEDIUM_GM);
+
+	if (ecmd.duplex == DUPLEX_FULL)
+		mode |= AX_MEDIUM_FD;
+	else
+		mode &= ~AX_MEDIUM_FD;
+
+	devdbg(dev, "ax88178_link_reset() speed: %d duplex: %d setting mode to 0x%04x", ecmd.speed, ecmd.duplex, mode);
+
+	asix_write_medium_mode(dev, mode);
+
+	if (data->phymode == PHY_MODE_MARVELL && data->ledmode)
+		marvell_led_status(dev, ecmd.speed);
+
+	return 0;
+}
+
+static void ax88178_set_mfb(struct usbnet *dev)
+{
+	u16 mfb = AX_RX_CTL_MFB_16384;
+	u16 rxctl;
+	u16 medium;
+	int old_rx_urb_size = dev->rx_urb_size;
+
+	if (dev->hard_mtu < 2048) {
+		dev->rx_urb_size = 2048;
+		mfb = AX_RX_CTL_MFB_2048;
+	} else if (dev->hard_mtu < 4096) {
+		dev->rx_urb_size = 4096;
+		mfb = AX_RX_CTL_MFB_4096;
+	} else if (dev->hard_mtu < 8192) {
+		dev->rx_urb_size = 8192;
+		mfb = AX_RX_CTL_MFB_8192;
+	} else if (dev->hard_mtu < 16384) {
+		dev->rx_urb_size = 16384;
+		mfb = AX_RX_CTL_MFB_16384;
+	}
+
+	rxctl = asix_read_rx_ctl(dev);
+	asix_write_rx_ctl(dev, (rxctl & ~AX_RX_CTL_MFB_16384) | mfb);
+
+	medium = asix_read_medium_status(dev);
+	if (dev->net->mtu > 1500)
+		medium |= AX_MEDIUM_JFE;
+	else
+		medium &= ~AX_MEDIUM_JFE;
+	asix_write_medium_mode(dev, medium);
+
+	if (dev->rx_urb_size > old_rx_urb_size)
+		usbnet_unlink_rx_urbs(dev);
+}
+
+static int ax88178_change_mtu(struct net_device *net, int new_mtu)
+{
+	struct usbnet *dev = netdev_priv(net);
+	int ll_mtu = new_mtu + net->hard_header_len + 4;
+
+	devdbg(dev, "ax88178_change_mtu() new_mtu=%d", new_mtu);
+
+	if (new_mtu <= 0 || ll_mtu > 16384)
+		return -EINVAL;
+
+	if ((ll_mtu % dev->maxpacket) == 0)
+		return -EDOM;
+
+	net->mtu = new_mtu;
+	dev->hard_mtu = net->mtu + net->hard_header_len;
+	ax88178_set_mfb(dev);
+
+	return 0;
+}
+
+static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
+{
+	struct asix_data *data = (struct asix_data *)&dev->data;
+	int ret;
+	void *buf;
+	u16 eeprom;
+	int gpio0 = 0;
+	u32 phyid;
+
+	usbnet_get_endpoints(dev,intf);
+
+	buf = kmalloc(6, GFP_KERNEL);
+	if(!buf) {
+		dbg ("Cannot allocate memory for buffer");
+		ret = -ENOMEM;
+		goto out1;
+	}
+
+	eeprom = 0;
+	asix_read_cmd(dev, AX_CMD_READ_GPIOS, 0, 0, 1, &eeprom);
+	dbg("GPIO Status: 0x%04x", eeprom);
+
+	asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0, 0, 0, NULL);
+	asix_read_cmd(dev, AX_CMD_READ_EEPROM, 0x0017, 0, 2, &eeprom);
+	asix_write_cmd(dev, AX_CMD_WRITE_DISABLE, 0, 0, 0, NULL);
+
+	dbg("EEPROM index 0x17 is 0x%04x", eeprom);
+
+	if (eeprom == 0xffff) {
+		data->phymode = PHY_MODE_MARVELL;
+		data->ledmode = 0;
+		gpio0 = 1;
 	} else {
-		struct sk_buff *skb2;
-		skb2 = skb_copy_expand(skb, 4, padlen, flags);
-		dev_kfree_skb_any(skb);
-		skb = skb2;
-		if (!skb)
-			return NULL;
+		data->phymode = eeprom & 7;
+		data->ledmode = eeprom >> 8;
+		gpio0 = (eeprom & 0x80) ? 0 : 1;
+	}
+	dbg("GPIO0: %d, PhyMode: %d", gpio0, data->phymode);
+
+	asix_write_gpio(dev, AX_GPIO_RSE | AX_GPIO_GPO_1 | AX_GPIO_GPO1EN, 40);
+	if ((eeprom >> 8) != 1) {
+		asix_write_gpio(dev, 0x003c, 30);
+		asix_write_gpio(dev, 0x001c, 300);
+		asix_write_gpio(dev, 0x003c, 30);
+	} else {
+		dbg("gpio phymode == 1 path");
+		asix_write_gpio(dev, AX_GPIO_GPO1EN, 30);
+		asix_write_gpio(dev, AX_GPIO_GPO1EN | AX_GPIO_GPO_1, 30);
 	}
 
-	skb_push(skb, 4);
-	packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
-	memcpy(skb->data, &packet_len, sizeof(packet_len));
+	asix_sw_reset(dev, 0);
+	msleep(150);
 
-	if ((skb->len % 512) == 0) {
-		memcpy( skb->tail, &padbytes, sizeof(padbytes));
-		skb_put(skb, sizeof(padbytes));
+	asix_sw_reset(dev, AX_SWRESET_PRL | AX_SWRESET_IPPD);
+	msleep(150);
+
+	asix_write_rx_ctl(dev, 0);
+
+	/* Get the MAC address */
+	memset(buf, 0, ETH_ALEN);
+	if ((ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
+				0, 0, ETH_ALEN, buf)) < 0) {
+		dbg("Failed to read MAC address: %d", ret);
+		goto out2;
 	}
-	return skb;
-}
+	memcpy(dev->net->dev_addr, buf, ETH_ALEN);
 
-static int ax88772_link_reset(struct usbnet *dev)
-{
-	u16 lpa;
-	u16 adv;
-	u16 res;
-	u16 mode;
+	/* Initialize MII structure */
+	dev->mii.dev = dev->net;
+	dev->mii.mdio_read = asix_mdio_read;
+	dev->mii.mdio_write = asix_mdio_write;
+	dev->mii.phy_id_mask = 0x1f;
+	dev->mii.reg_num_mask = 0xff;
+	dev->mii.supports_gmii = 1;
+	dev->net->do_ioctl = asix_ioctl;
+	dev->mii.phy_id = asix_get_phy_addr(dev);
+	dev->net->set_multicast_list = asix_set_multicast;
+	dev->net->ethtool_ops = &ax88178_ethtool_ops;
+	dev->net->change_mtu = &ax88178_change_mtu;
 
-	mode = AX88772_MEDIUM_DEFAULT;
-	lpa = asix_mdio_read_le(dev->net, dev->mii.phy_id, MII_LPA);
-	adv = asix_mdio_read_le(dev->net, dev->mii.phy_id, MII_ADVERTISE);
-	res = mii_nway_result(lpa|adv);
-
-	if ((res & LPA_DUPLEX) == 0)
-		mode &= ~AX88772_MEDIUM_FULL_DUPLEX;
-	if ((res & LPA_100) == 0)
-		mode &= ~AX88772_MEDIUM_100MB;
-	asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);
+	phyid = asix_get_phyid(dev);
+	dbg("PHYID=0x%08x", phyid);
+
+	if (data->phymode == PHY_MODE_MARVELL) {
+		marvell_phy_init(dev);
+		msleep(60);
+	}
+
+	asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR,
+			BMCR_RESET | BMCR_ANENABLE);
+	asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+			ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
+	asix_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000,
+			ADVERTISE_1000FULL);
+
+	mii_nway_restart(&dev->mii);
+
+	if ((ret = asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT)) < 0)
+		goto out2;
+
+	if ((ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL)) < 0)
+		goto out2;
+
+	kfree(buf);
+
+	/* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
+	if (dev->driver_info->flags & FLAG_FRAMING_AX) {
+		/* hard_mtu  is still the default - the device does not support
+		   jumbo eth frames */
+		dev->rx_urb_size = 2048;
+	}
 
 	return 0;
+
+out2:
+	kfree(buf);
+out1:
+	return ret;
 }
 
 static const struct driver_info ax8817x_info = {
@@ -853,8 +1371,19 @@ static const struct driver_info ax88772_
 	.link_reset = ax88772_link_reset,
 	.reset = ax88772_link_reset,
 	.flags = FLAG_ETHER | FLAG_FRAMING_AX,
-	.rx_fixup = ax88772_rx_fixup,
-	.tx_fixup = ax88772_tx_fixup,
+	.rx_fixup = asix_rx_fixup,
+	.tx_fixup = asix_tx_fixup,
+};
+
+static const struct driver_info ax88178_info = {
+	.description = "ASIX AX88178 USB 2.0 Ethernet",
+	.bind = ax88178_bind,
+	.status = asix_status,
+	.link_reset = ax88178_link_reset,
+	.reset = ax88178_link_reset,
+	.flags = FLAG_ETHER | FLAG_FRAMING_AX,
+	.rx_fixup = asix_rx_fixup,
+	.tx_fixup = asix_tx_fixup,
 };
 
 static const struct usb_device_id	products [] = {
@@ -913,7 +1442,7 @@ static const struct usb_device_id	produc
 }, {
 	// ASIX AX88178 10/100/1000
 	USB_DEVICE (0x0b95, 0x1780),
-	.driver_info = (unsigned long) &ax88772_info,
+	.driver_info = (unsigned long) &ax88178_info,
 }, {
 	// Linksys USB200M Rev 2
 	USB_DEVICE (0x13b1, 0x0018),
@@ -922,6 +1451,18 @@ static const struct usb_device_id	produc
 	// 0Q0 cable ethernet
 	USB_DEVICE (0x1557, 0x7720),
 	.driver_info = (unsigned long) &ax88772_info,
+}, {
+	// DLink DUB-E100 H/W Ver B1
+	USB_DEVICE (0x07d1, 0x3c05),
+	.driver_info = (unsigned long) &ax88772_info,
+}, {
+	// DLink DUB-E100 H/W Ver B1, bonus
+	USB_DEVICE (0x2001, 0x3c05),
+	.driver_info = (unsigned long) &ax88772_info,
+}, {
+	// Linksys USB1000
+	USB_DEVICE (0x1737, 0x0039),
+	.driver_info = (unsigned long) &ax88178_info,
 },
 	{ },		// END
 };
diff -purN -X dontdiff linux-2.6.17.i686/drivers/usb/net/usbnet.c linux-2.6.17.i686.w/drivers/usb/net/usbnet.c
--- linux-2.6.17.i686/drivers/usb/net/usbnet.c	2006-08-25 16:29:24.000000000 -0400
+++ linux-2.6.17.i686.w/drivers/usb/net/usbnet.c	2006-08-25 17:18:10.000000000 -0400
@@ -521,6 +521,18 @@ static int unlink_urbs (struct usbnet *d
 	return count;
 }
 
+// Flush all pending rx urbs
+// minidrivers may need to do this when the MTU changes
+
+void usbnet_unlink_rx_urbs(struct usbnet *dev)
+{
+	if (netif_running(dev->net)) {
+		(void) unlink_urbs (dev, &dev->rxq);
+		tasklet_schedule(&dev->bh);
+	}
+}
+EXPORT_SYMBOL_GPL(usbnet_unlink_rx_urbs);
+
 
 /*-------------------------------------------------------------------------*/
 
diff -purN -X dontdiff linux-2.6.17.i686/drivers/usb/net/usbnet.h linux-2.6.17.i686.w/drivers/usb/net/usbnet.h
--- linux-2.6.17.i686/drivers/usb/net/usbnet.h	2006-06-17 21:49:35.000000000 -0400
+++ linux-2.6.17.i686.w/drivers/usb/net/usbnet.h	2006-08-25 17:18:22.000000000 -0400
@@ -166,6 +166,7 @@ struct skb_data {	/* skb->cb is one of t
 extern int usbnet_get_endpoints(struct usbnet *, struct usb_interface *);
 extern void usbnet_defer_kevent (struct usbnet *, int);
 extern void usbnet_skb_return (struct usbnet *, struct sk_buff *);
+extern void usbnet_unlink_rx_urbs(struct usbnet *);
 
 extern u32 usbnet_get_msglevel (struct net_device *);
 extern void usbnet_set_msglevel (struct net_device *, u32);






From fedora-cvs-commits at redhat.com  Wed Aug 30 14:37:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 10:37:55 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.52,
	1.53 java-1.4.2-gcj-compat.spec, 1.168, 1.169 sources, 1.58, 1.59
Message-ID: <200608301437.k7UEbt8U026225@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26210

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Wed Aug 30 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.104
- Import java-gcj-comapt 1.0.64.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	29 Aug 2006 20:35:04 -0000	1.52
+++ .cvsignore	30 Aug 2006 14:37:53 -0000	1.53
@@ -1,3 +1,3 @@
-java-gcj-compat-1.0.63.tar.gz
+java-gcj-compat-1.0.64.tar.gz
 ecj.sh.in
 eclipse-ecj-3.1.0_fc-12.jar


Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- java-1.4.2-gcj-compat.spec	29 Aug 2006 20:35:05 -0000	1.168
+++ java-1.4.2-gcj-compat.spec	30 Aug 2006 14:37:53 -0000	1.169
@@ -11,7 +11,7 @@
 %define buildver	0
 # the version-release string for the gcj rpms we require
 %define gccver		4.0.0-0.42
-%define jgcver		1.0.63
+%define jgcver		1.0.64
 
 %define cname           java-%{javaver}-%{origin}
 
@@ -27,7 +27,7 @@
 
 Name:		java-%{javaver}-%{origin}-compat
 Version:	%{javaver}.%{buildver}
-Release: 	40jpp.103
+Release: 	40jpp.104
 Epoch:		0
 Summary:	JPackage runtime scripts for GCJ
 
@@ -646,6 +646,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Wed Aug 30 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.104
+- Import java-gcj-comapt 1.0.64.
+
 * Tue Aug 29 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.103
 - Import java-gcj-compat 1.0.63.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	29 Aug 2006 20:35:05 -0000	1.58
+++ sources	30 Aug 2006 14:37:53 -0000	1.59
@@ -1,3 +1,3 @@
-097d1880300f0760644af5b753b9f012  java-gcj-compat-1.0.63.tar.gz
+14047b4e3b77361df68698c8275189ad  java-gcj-compat-1.0.64.tar.gz
 e9c12c59e5a34c5c916d3b032dd7855e  ecj.sh.in
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar



From fedora-cvs-commits at redhat.com  Wed Aug 30 14:50:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 10:50:58 -0400
Subject: rpms/pyparted/FC-5 .cvsignore, 1.6, 1.7 pyparted.spec, 1.18,
	1.19 sources, 1.9, 1.10
Message-ID: <200608301450.k7UEowKq009319@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/pyparted/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9293

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
Update FC-5 pyparted to 1.7.2 from rawhide.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyparted/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Nov 2005 22:16:36 -0000	1.6
+++ .cvsignore	30 Aug 2006 14:50:49 -0000	1.7
@@ -1 +1 @@
-pyparted-1.6.10.tar.gz
+pyparted-1.7.2.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/FC-5/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	30 Aug 2006 14:50:49 -0000	1.19
@@ -1,13 +1,13 @@
 Summary: python module for parted
 Name: pyparted
-Version: 1.6.10
-Release: 1.2.1
+Version: 1.7.2
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: parted >= 1.6.12
-BuildRequires: parted-devel >= 1.6.12, python-devel
+Requires: parted >= 1.7.0
+BuildRequires: parted-devel >= 1.7.1, python-devel
 Requires: python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
 
 %description
@@ -32,15 +32,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc README COPYING
 %dir %{_libdir}/python?.?/site-packages/
 %{_libdir}/python?.?/site-packages/*.so
 
-
 %changelog
+* Tue Jul 25 2006 David Cantrell <dcantrell at redhat.com> - 1.7.2-1
+- Add HPSERVICE, PALO, PREP, and MSFT_RESERVED to partition types list
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.1-1.1
+- rebuild
+
+* Sun May 28 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-1
+- Bump version to 1.7.1 and require parted >= 1.7.1
+
+* Fri May 19 2006 David Cantrell <dcantrell at redhat.com> - 1.7.0-1
+- Bump version to 1.7.0 and require parted >= 1.7.0
+
 * 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)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyparted/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Nov 2005 22:16:36 -0000	1.9
+++ sources	30 Aug 2006 14:50:49 -0000	1.10
@@ -1 +1 @@
-977f05d390a9198a1170f860977ebcc6  pyparted-1.6.10.tar.gz
+4a79032a90f8aa9bcf5b5a606f5b1f84  pyparted-1.7.2.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 30 14:54:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 10:54:45 -0400
Subject: rpms/usermode/devel .cvsignore, 1.42, 1.43 sources, 1.45,
	1.46 usermode.spec, 1.59, 1.60
Message-ID: <200608301454.k7UEsjZa009442@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/usermode/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9415

Modified Files:
	.cvsignore sources usermode.spec 
Log Message:
* Wed Aug 30 2006 Martin Bacovsky <mbacovsky at redhat.com> 1.86-1
- fix userpasswd - Query window pops up three times if cancelling passwd (#202924)
- Serbian latin script translation added (#203003)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/usermode/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	3 Jan 2006 14:25:57 -0000	1.42
+++ .cvsignore	30 Aug 2006 14:54:41 -0000	1.43
@@ -1,2 +1 @@
-usermode-1.84.tar.bz2
-usermode-1.85.tar.bz2
+usermode-1.86.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/usermode/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	3 Jan 2006 14:25:57 -0000	1.45
+++ sources	30 Aug 2006 14:54:41 -0000	1.46
@@ -1 +1 @@
-63570836f5e3bcb9c7f746048887a589  usermode-1.85.tar.bz2
+c31a2dbaea4200ce7c0d321c70861be3  usermode-1.86.tar.gz


Index: usermode.spec
===================================================================
RCS file: /cvs/dist/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- usermode.spec	12 Jul 2006 08:38:21 -0000	1.59
+++ usermode.spec	30 Aug 2006 14:54:41 -0000	1.60
@@ -5,11 +5,11 @@
 %define build6x 0
 Summary: Tools for certain user account management tasks.
 Name: usermode
-Version: 1.85
-Release: 2.2.1
+Version: 1.86
+Release: 1
 License: GPL
 Group: Applications/System
-Source: usermode-%{version}.tar.bz2
+Source: usermode-%{version}.tar.gz
 %if %{build6x}
 Requires: util-linux, pam >= 0.66-5
 %else
@@ -120,6 +120,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Aug 30 2006 Martin Bacovsky <mbacovsky at redhat.com> 1.86-1
+- fix userpasswd - Query window pops up three times if cancelling passwd (#202924)
+- Serbian latin script translation added (#203003)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.85-2.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 14:57:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 10:57:04 -0400
Subject: rpms/NetworkManager/devel
	NetworkManager-0.6.4-fc5-specialcase-madwifi.patch, NONE,
	1.1 NetworkManager-0.6.4-old-dbus.patch, NONE,
	1.1 NetworkManager-0.6.4-startup-dhcdbd.patch, NONE,
	1.1 .cvsignore, 1.37, 1.38 NetworkManager.spec, 1.120,
	1.121 sources, 1.55,
	1.56 NetworkManager-0.7.0-dbus-deprecated.patch, 1.1,
	NONE NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch,
	1.2, NONE NetworkManager-0.7.0-shhh.patch, 1.2, NONE
Message-ID: <200608301457.k7UEv4Ov009531@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9513

Modified Files:
	.cvsignore NetworkManager.spec sources 
Added Files:
	NetworkManager-0.6.4-fc5-specialcase-madwifi.patch 
	NetworkManager-0.6.4-old-dbus.patch 
	NetworkManager-0.6.4-startup-dhcdbd.patch 
Removed Files:
	NetworkManager-0.7.0-dbus-deprecated.patch 
	NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch 
	NetworkManager-0.7.0-shhh.patch 
Log Message:
* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
- Revert FC6 to latest stable NM
- Update to stable snapshot
- Remove bind/caching-nameserver hard requirement



NetworkManager-0.6.4-fc5-specialcase-madwifi.patch:
 nm-device-802-11-wireless.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE NetworkManager-0.6.4-fc5-specialcase-madwifi.patch ---
--- NetworkManager-0.6.4/src/nm-device-802-11-wireless.c.madwifi	2006-07-13 12:42:13.000000000 -0400
+++ NetworkManager-0.6.4/src/nm-device-802-11-wireless.c	2006-07-14 15:28:21.000000000 -0400
@@ -2497,6 +2497,8 @@
 	const char *		iface = nm_device_get_iface (NM_DEVICE (self));
 	gboolean			success = FALSE;
 	int				tries = 0;
+ 	const char *		dev_driver;
+ 	char *			wpa_driver = "wext";
 
 	/* Try to open wpa_supplicant's global control socket */
 	for (tries = 0; tries < WPA_SUPPLICANT_NUM_RETRIES && !ctrl; tries++)
@@ -2511,9 +2513,16 @@
 		goto exit;
 	}
 
+ 	/* Special-case madwifi for now.  madwifi needs to get their
+ 	 * act in gear and support WEXT too.
+ 	 */
+ 	dev_driver = nm_device_get_driver (NM_DEVICE (self));
+ 	if (dev_driver && !strcmp (dev_driver, "ath_pci"))
+ 		wpa_driver = "madwifi";
+ 
 	/* wpa_cli -g/var/run/wpa_supplicant-global interface_add eth1 "" wext /var/run/wpa_supplicant */
 	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
-			"INTERFACE_ADD %s\t\twext\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface))
+			"INTERFACE_ADD %s\t\t%s\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface, wpa_driver))
 		goto exit;
 	wpa_ctrl_close (ctrl);
 

NetworkManager-0.6.4-old-dbus.patch:
 libnm_glib.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE NetworkManager-0.6.4-old-dbus.patch ---
--- NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c.old-dbus	2006-08-30 10:38:44.000000000 -0400
+++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c	2006-08-30 10:38:57.000000000 -0400
@@ -230,7 +230,7 @@
 	{
 		/* Try to reactivate our connection to dbus on the next pass through the event loop */
 		ctx->nm_state = LIBNM_NO_DBUS;
-		dbus_connection_close (ctx->dbus_con);
+		dbus_connection_disconnect (ctx->dbus_con);
 		libnm_glib_schedule_dbus_watcher (ctx);
 	}
 	else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
@@ -444,7 +444,7 @@
 		g_main_loop_unref (ctx->g_main_loop);
 
 	if (ctx->dbus_con)
-		dbus_connection_close (ctx->dbus_con);
+		dbus_connection_disconnect (ctx->dbus_con);
 
 	if (ctx->callbacks_lock)
 		g_mutex_free (ctx->callbacks_lock);

NetworkManager-0.6.4-startup-dhcdbd.patch:
 NetworkManager.in |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE NetworkManager-0.6.4-startup-dhcdbd.patch ---
--- NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in.dhcdbd	2006-03-30 12:42:28.000000000 -0500
+++ NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in	2006-03-30 12:43:25.000000000 -0500
@@ -36,6 +36,11 @@
 {
 	echo $"Setting network parameters... "
 	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+
+	if [ ! -e /var/lock/subsys/dhcdbd ]; then
+		service dhcdbd start
+	fi
+
 	echo -n $"Starting NetworkManager daemon: "
 	daemon --check $servicename $processname --pid-file=$pidfile
 	RETVAL=$?


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	29 May 2006 05:03:30 -0000	1.37
+++ .cvsignore	30 Aug 2006 14:57:02 -0000	1.38
@@ -1,3 +1,4 @@
 NetworkManager-0.6.1.tar.bz2
 NetworkManager-0.7.0.cvs20060521.tar.gz
 NetworkManager-0.7.0.cvs20060529.tar.gz
+NetworkManager-0.6.4.cvs20060829.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- NetworkManager.spec	29 Aug 2006 23:52:13 -0000	1.120
+++ NetworkManager.spec	30 Aug 2006 14:57:02 -0000	1.121
@@ -1,29 +1,32 @@
 ExcludeArch: s390 s390x
 
-%define cvs_snapshot 1
-
 %define hal_version	0.5.0
+
+%if "%fedora" == "5"
+%define dbus_version 0.61
+%define dbus_glib_version 0.61
+%endif
+
+%if "%fedora" == "6"
 %define dbus_version	0.90
 %define dbus_glib_version 0.70
+%endif
+
 %define gtk2_version	2.6.0
 %define wireless_tools_version 1:28-0pre9
-%define bind_version 24:9.3.1-20
-
-%if %{cvs_snapshot}
-%define nm_cvs_version	.cvs20060529
-%endif
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
-Version: 0.7.0
-Release: 0%{?nm_cvs_version}.7
+Epoch: 1
+Version: 0.6.4
+Release: 2%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
-Patch0: NetworkManager-0.7.0-dbus-deprecated.patch
-Patch1: NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch
-Patch2: NetworkManager-0.7.0-shhh.patch
+Source: %{name}-%{version}.cvs20060829.tar.gz
+Patch0: NetworkManager-0.6.4-old-dbus.patch
+Patch1: NetworkManager-0.6.4-fc5-specialcase-madwifi.patch
+Patch2: NetworkManager-0.6.4-startup-dhcdbd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -32,10 +35,8 @@
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
 Requires: iproute openssl
-Requires: caching-nameserver
 Requires: dhcdbd
 Requires: dhclient >= 3.0.2-12
-Requires: bind >= %{bind_version}
 Requires: wpa_supplicant
 
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -120,11 +121,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dbus-deprecated
-%patch1 -p1 -b .dont-choose-inactive-wired-device
-%patch2 -p1 -b .shhhh
+%if "%fedora" == "5"
+%patch0 -p1 -b .old-dbus
+# Preserve compat with older FC5 versions of NM
+%patch1 -p1 -b .specialcase-madwifi
+%endif
+%patch2 -p1 -b .startup-dhcdbd
 
 %build
+# Even though we don't require named, we still build with it
+# so that if the user installs it, NM will use it automatically
 %configure \
 	--disable-static \
 	--enable-notify=yes \
@@ -221,6 +227,11 @@
 
 
 %changelog
+* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
+- Revert FC6 to latest stable NM
+- Update to stable snapshot
+- Remove bind/caching-nameserver hard requirement
+
 * Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 0.7.0-0.cvs20060529.7
 - BuildRequire wireless-tools-devel and perl-XML-Parser
 - Update the BuildRoot tag


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	29 May 2006 05:03:36 -0000	1.55
+++ sources	30 Aug 2006 14:57:02 -0000	1.56
@@ -1 +1 @@
-09a17cf1a7fe275238e96098fc2f3cb9  NetworkManager-0.7.0.cvs20060529.tar.gz
+a5bb1966ec56b76eee31a05e4e14d13c  NetworkManager-0.6.4.cvs20060829.tar.gz


--- NetworkManager-0.7.0-dbus-deprecated.patch DELETED ---


--- NetworkManager-0.7.0-dont-choose-inactive-wired-device.patch DELETED ---


--- NetworkManager-0.7.0-shhh.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 14:57:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 10:57:15 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.23,1.24
Message-ID: <200608301457.k7UEvFTe009574@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9516

Modified Files:
	man-pages-fr.spec 
Log Message:
:Changing spec file again.



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- man-pages-fr.spec	30 Aug 2006 12:28:45 -0000	1.23
+++ man-pages-fr.spec	30 Aug 2006 14:57:13 -0000	1.24
@@ -1,13 +1,13 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.39
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	Distributable
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
 Source0:	http://manpagesfr.free.fr/download/%{name}-%{version}.tar.bz2
 Source1:	http://www.delafond.org/traducmanfr/mansupfr.tar.bz2
-Patch1:		man-pages-fr-aumix_missTH.patch  
+Patch1:		man-pages-fr-aumix.patch  
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
@@ -17,7 +17,7 @@
 Delafond.
 
 %prep
-%setup -q -D -a 1
+%setup -q -D -a 1 -n man-pages-fr-2.39.0
 ##%setup -q -D -a 2
 ##%patch1 -p1 -b .aumix_missTH
 # pick up the supplemental pages, which overwrite a few files too
@@ -102,7 +102,7 @@
 %{_mandir}/fr/
 
 %changelog
-* Wed Aug 30 2006 Marcela Maslanova <mmaslano at redhat.com> 2.39-1
+* Wed Aug 30 2006 Marcela Maslanova <mmaslano at redhat.com> 2.39-2
 - new version of man-pages
 
 * Wed Aug 09 2006 Marcela Maslanova <mmaslano at redhat.com> 2.33.0-1



From fedora-cvs-commits at redhat.com  Wed Aug 30 14:57:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 10:57:39 -0400
Subject: rpms/cups/FC-5 .cvsignore, 1.19, 1.20 cups-1.1.15-initscript.patch,
	1.5, 1.6 cups.spec, 1.213, 1.214 sources, 1.21,
	1.22 cups-str1880.patch, 1.1, NONE cups-str1881.patch, 1.3, NONE
Message-ID: <200608301457.k7UEvd5s009629@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9613

Modified Files:
	.cvsignore cups-1.1.15-initscript.patch cups.spec sources 
Removed Files:
	cups-str1880.patch cups-str1881.patch 
Log Message:
* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-1.1
- 1.2.3.  No longer need str1880 or str1881 patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	20 Jul 2006 10:47:09 -0000	1.19
+++ .cvsignore	30 Aug 2006 14:57:36 -0000	1.20
@@ -10,3 +10,4 @@
 cups-1.2.0-source.tar.bz2
 cups-1.2.1-source.tar.bz2
 cups-1.2.2-source.tar.bz2
+cups-1.2.3-source.tar.bz2

cups-1.1.15-initscript.patch:
 Makefile |   30 ------------------------------
 1 files changed, 30 deletions(-)

Index: cups-1.1.15-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-1.1.15-initscript.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cups-1.1.15-initscript.patch	20 May 2006 16:39:29 -0000	1.5
+++ cups-1.1.15-initscript.patch	30 Aug 2006 14:57:36 -0000	1.6
@@ -1,6 +1,6 @@
---- cups-1.2.0/Makefile.noinit	2006-05-20 17:21:22.000000000 +0100
-+++ cups-1.2.0/Makefile	2006-05-20 17:27:01.000000000 +0100
-@@ -99,35 +99,6 @@
+--- cups-1.2.3/Makefile.noinit	2006-08-29 16:51:19.000000000 +0100
++++ cups-1.2.3/Makefile	2006-08-30 15:53:20.000000000 +0100
+@@ -99,36 +99,6 @@
  	echo Installing cups-config script...
  	$(INSTALL_DIR) -m 755 $(BINDIR)
  	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
@@ -26,8 +26,9 @@
 -			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
 -			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
 -		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
--			echo Installing LaunchDaemons configuration file...; \
+-			echo Installing LaunchDaemons configuration files...; \
 -			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
+-			$(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \
 -		else \
 -			echo Installing RC script...; \
 -			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- cups.spec	25 Aug 2006 14:26:15 -0000	1.213
+++ cups.spec	30 Aug 2006 14:57:36 -0000	1.214
@@ -4,8 +4,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.2
-Release: 1.9
+Version: 1.2.3
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -24,7 +24,6 @@
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
-Patch4: cups-str1881.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
@@ -34,7 +33,6 @@
 Patch11: cups-str1893.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
-Patch14: cups-str1880.patch
 Patch17: cups-serverbin-compat.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
@@ -122,7 +120,6 @@
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
-%patch4 -p1 -b .str1881
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
@@ -132,7 +129,6 @@
 %patch11 -p1 -b .str1893
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
-%patch14 -p1 -b .str1880
 %patch17 -p1 -b .serverbin-compat
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
@@ -415,6 +411,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-1.1
+- 1.2.3.  No longer need str1880 or str1881 patches.
+
 * Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.9
 - Updated fix for STR #1881 from upstream.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	20 Jul 2006 10:47:09 -0000	1.21
+++ sources	30 Aug 2006 14:57:36 -0000	1.22
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-091de9109c9252cb37427859e90190ad  cups-1.2.2-source.tar.bz2
+7f65bae0054cd8335824942595d867ef  cups-1.2.3-source.tar.bz2


--- cups-str1880.patch DELETED ---


--- cups-str1881.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:01:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:01:40 -0400
Subject: rpms/cups/devel .cvsignore, 1.21, 1.22 cups-1.1.15-initscript.patch,
	1.6, 1.7 cups-multilib.patch, 1.1, 1.2 cups.spec, 1.256,
	1.257 sources, 1.23, 1.24 cups-str1880.patch, 1.1,
	NONE cups-str1881.patch, 1.4, NONE
Message-ID: <200608301501.k7UF1eQl009835@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9815

Modified Files:
	.cvsignore cups-1.1.15-initscript.patch cups-multilib.patch 
	cups.spec sources 
Removed Files:
	cups-str1880.patch cups-str1881.patch 
Log Message:
* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-2
- 1.2.3.  No longer need str1880 or str1881 patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	20 Jul 2006 10:30:23 -0000	1.21
+++ .cvsignore	30 Aug 2006 15:01:36 -0000	1.22
@@ -12,3 +12,4 @@
 cups-1.2.0-source.tar.bz2
 cups-1.2.1-source.tar.bz2
 cups-1.2.2-source.tar.bz2
+cups-1.2.3-source.tar.bz2

cups-1.1.15-initscript.patch:
 Makefile |   30 ------------------------------
 1 files changed, 30 deletions(-)

Index: cups-1.1.15-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-1.1.15-initscript.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cups-1.1.15-initscript.patch	20 May 2006 16:35:10 -0000	1.6
+++ cups-1.1.15-initscript.patch	30 Aug 2006 15:01:37 -0000	1.7
@@ -1,6 +1,6 @@
---- cups-1.2.0/Makefile.noinit	2006-05-20 17:21:22.000000000 +0100
-+++ cups-1.2.0/Makefile	2006-05-20 17:27:01.000000000 +0100
-@@ -99,35 +99,6 @@
+--- cups-1.2.3/Makefile.noinit	2006-08-29 16:51:19.000000000 +0100
++++ cups-1.2.3/Makefile	2006-08-30 15:46:36.000000000 +0100
+@@ -99,36 +99,6 @@
  	echo Installing cups-config script...
  	$(INSTALL_DIR) -m 755 $(BINDIR)
  	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
@@ -26,8 +26,9 @@
 -			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
 -			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
 -		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
--			echo Installing LaunchDaemons configuration file...; \
+-			echo Installing LaunchDaemons configuration files...; \
 -			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
+-			$(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \
 -		else \
 -			echo Installing RC script...; \
 -			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \

cups-multilib.patch:
 cups-config.in |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Index: cups-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-multilib.patch	22 May 2006 18:13:40 -0000	1.1
+++ cups-multilib.patch	30 Aug 2006 15:01:37 -0000	1.2
@@ -1,5 +1,5 @@
---- cups-1.2.0/cups-config.in.multilib	2006-05-22 19:05:17.000000000 +0100
-+++ cups-1.2.0/cups-config.in	2006-05-22 19:06:07.000000000 +0100
+--- cups-1.2.3/cups-config.in.multilib	2006-08-03 01:54:38.000000000 +0100
++++ cups-1.2.3/cups-config.in	2006-08-30 15:47:35.000000000 +0100
 @@ -30,8 +30,10 @@
  exec_prefix=@exec_prefix@
  bindir=@bindir@
@@ -10,6 +10,6 @@
 +# of a cheat, but the cups-devel package requires gnutls-devel anyway.
 +libdir=`pkg-config --variable=libdir gnutls`
 +imagelibdir=`pkg-config --variable=libdir gnutls`
+ datarootdir=@datadir@
  datadir=@datadir@
  sysconfdir=@sysconfdir@
- cups_datadir=@CUPS_DATADIR@


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- cups.spec	29 Aug 2006 14:27:33 -0000	1.256
+++ cups.spec	30 Aug 2006 15:01:37 -0000	1.257
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.2
-Release: 17
+Version: 1.2.3
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -39,9 +39,7 @@
 Patch15: cups-maxlogsize.patch
 Patch16: cups-pid.patch
 Patch17: cups-relro.patch
-Patch18: cups-str1881.patch
 Patch19: cups-str1893.patch
-Patch20: cups-str1880.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -140,9 +138,7 @@
 %patch15 -p1 -b .maxlogsize
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .relro
-%patch18 -p1 -b .str1881
 %patch19 -p1 -b .str1893
-%patch20 -p1 -b .str1880
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -418,7 +414,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Thu Aug 29 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-2
+- 1.2.3.  No longer need str1880 or str1881 patches.
+
+* Tue Aug 29 2006 Tim Waugh <twaugh at redhat.com>
 - Removed dest-cache patch.
 
 * Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-17


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	20 Jul 2006 10:30:23 -0000	1.23
+++ sources	30 Aug 2006 15:01:38 -0000	1.24
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-091de9109c9252cb37427859e90190ad  cups-1.2.2-source.tar.bz2
+7f65bae0054cd8335824942595d867ef  cups-1.2.3-source.tar.bz2


--- cups-str1880.patch DELETED ---


--- cups-str1881.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:05:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:05:02 -0400
Subject: rpms/NetworkManager/FC-5
	NetworkManager-0.6.4-fc5-specialcase-madwifi.patch, NONE,
	1.1 NetworkManager-0.6.4-old-dbus.patch, NONE,
	1.1 NetworkManager-0.6.4-startup-dhcdbd.patch, NONE,
	1.1 NetworkManager.spec, 1.108, 1.109 sources, 1.55,
	1.56 service-startup.patch, 1.1,
	NONE special-case-madwifi.patch, 1.2, NONE
Message-ID: <200608301505.k7UF52XO009985@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9964

Modified Files:
	NetworkManager.spec sources 
Added Files:
	NetworkManager-0.6.4-fc5-specialcase-madwifi.patch 
	NetworkManager-0.6.4-old-dbus.patch 
	NetworkManager-0.6.4-startup-dhcdbd.patch 
Removed Files:
	service-startup.patch special-case-madwifi.patch 
Log Message:
* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
- Revert FC6 to latest stable NM
- Update to stable snapshot
- Remove bind/caching-nameserver hard requirement


NetworkManager-0.6.4-fc5-specialcase-madwifi.patch:
 nm-device-802-11-wireless.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE NetworkManager-0.6.4-fc5-specialcase-madwifi.patch ---
--- NetworkManager-0.6.4/src/nm-device-802-11-wireless.c.madwifi	2006-07-13 12:42:13.000000000 -0400
+++ NetworkManager-0.6.4/src/nm-device-802-11-wireless.c	2006-07-14 15:28:21.000000000 -0400
@@ -2497,6 +2497,8 @@
 	const char *		iface = nm_device_get_iface (NM_DEVICE (self));
 	gboolean			success = FALSE;
 	int				tries = 0;
+ 	const char *		dev_driver;
+ 	char *			wpa_driver = "wext";
 
 	/* Try to open wpa_supplicant's global control socket */
 	for (tries = 0; tries < WPA_SUPPLICANT_NUM_RETRIES && !ctrl; tries++)
@@ -2511,9 +2513,16 @@
 		goto exit;
 	}
 
+ 	/* Special-case madwifi for now.  madwifi needs to get their
+ 	 * act in gear and support WEXT too.
+ 	 */
+ 	dev_driver = nm_device_get_driver (NM_DEVICE (self));
+ 	if (dev_driver && !strcmp (dev_driver, "ath_pci"))
+ 		wpa_driver = "madwifi";
+ 
 	/* wpa_cli -g/var/run/wpa_supplicant-global interface_add eth1 "" wext /var/run/wpa_supplicant */
 	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
-			"INTERFACE_ADD %s\t\twext\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface))
+			"INTERFACE_ADD %s\t\t%s\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface, wpa_driver))
 		goto exit;
 	wpa_ctrl_close (ctrl);
 

NetworkManager-0.6.4-old-dbus.patch:
 libnm_glib.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE NetworkManager-0.6.4-old-dbus.patch ---
--- NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c.old-dbus	2006-08-30 10:38:44.000000000 -0400
+++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c	2006-08-30 10:38:57.000000000 -0400
@@ -230,7 +230,7 @@
 	{
 		/* Try to reactivate our connection to dbus on the next pass through the event loop */
 		ctx->nm_state = LIBNM_NO_DBUS;
-		dbus_connection_close (ctx->dbus_con);
+		dbus_connection_disconnect (ctx->dbus_con);
 		libnm_glib_schedule_dbus_watcher (ctx);
 	}
 	else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
@@ -444,7 +444,7 @@
 		g_main_loop_unref (ctx->g_main_loop);
 
 	if (ctx->dbus_con)
-		dbus_connection_close (ctx->dbus_con);
+		dbus_connection_disconnect (ctx->dbus_con);
 
 	if (ctx->callbacks_lock)
 		g_mutex_free (ctx->callbacks_lock);

NetworkManager-0.6.4-startup-dhcdbd.patch:
 NetworkManager.in |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE NetworkManager-0.6.4-startup-dhcdbd.patch ---
--- NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in.dhcdbd	2006-03-30 12:42:28.000000000 -0500
+++ NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in	2006-03-30 12:43:25.000000000 -0500
@@ -36,6 +36,11 @@
 {
 	echo $"Setting network parameters... "
 	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+
+	if [ ! -e /var/lock/subsys/dhcdbd ]; then
+		service dhcdbd start
+	fi
+
 	echo -n $"Starting NetworkManager daemon: "
 	daemon --check $servicename $processname --pid-file=$pidfile
 	RETVAL=$?


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- NetworkManager.spec	14 Jul 2006 19:32:13 -0000	1.108
+++ NetworkManager.spec	30 Aug 2006 15:05:00 -0000	1.109
@@ -1,45 +1,48 @@
 ExcludeArch: s390 s390x
 
-%define cvs_snapshot 0
+%define hal_version	0.5.0
 
-%define hal_version		0.5.0
-%define dbus_version	0.60
-%define gtk2_version	2.6.0
-%define wireless_tools_version 1:28-0pre9
-%define bind_version 24:9.3.1-20
+%if "%fedora" == "5"
+%define dbus_version 0.61
+%define dbus_glib_version 0.61
+%endif
 
-%if %{cvs_snapshot}
-%define nm_cvs_version	.cvs20060302
+%if "%fedora" == "6"
+%define dbus_version	0.90
+%define dbus_glib_version 0.70
 %endif
 
+%define gtk2_version	2.6.0
+%define wireless_tools_version 1:28-0pre9
+
 Name: NetworkManager
 Summary: Network connection manager and user applications
+Epoch: 1
 Version: 0.6.4
-Release: 1%{?nm_cvs_version}%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-Patch0: special-case-madwifi.patch
-Patch1: service-startup.patch
+Source: %{name}-%{version}.cvs20060829.tar.gz
+Patch0: NetworkManager-0.6.4-old-dbus.patch
+Patch1: NetworkManager-0.6.4-fc5-specialcase-madwifi.patch
+Patch2: NetworkManager-0.6.4-startup-dhcdbd.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
 Requires: wireless-tools >= %{wireless_tools_version}
 Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
 Requires: iproute openssl
-Requires: caching-nameserver
 Requires: dhcdbd
 Requires: dhclient >= 3.0.2-12
-Requires: bind >= %{bind_version}
 Requires: wpa_supplicant
 
 BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: hal-devel >= %{hal_version}
-BuildRequires: wireless-tools >= %{wireless_tools_version}
+BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
 BuildRequires: glib2-devel gtk2-devel
 BuildRequires: libglade2-devel
 BuildRequires: openssl-devel
@@ -53,6 +56,7 @@
 BuildRequires: wpa_supplicant
 BuildRequires: libnl-devel
 BuildRequires: libnotify-devel >= 0.3
+BuildRequires: perl-XML-Parser
 
 %description
 NetworkManager attempts to keep an active network connection available at all
@@ -69,7 +73,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: gnome-panel
 Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
 Requires: libnotify >= 0.3
 PreReq:  gtk2 >= %{gtk2_version}
@@ -85,7 +89,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-devel >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 
 %description devel
 This package contains various headers accessing some NetworkManager functionality
@@ -95,9 +99,8 @@
 %package glib
 Summary: Libraries for adding NetworkManager support to applications that use glib.
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 
 %description glib
 This package contains the libraries that make it easier to use some NetworkManager
@@ -118,11 +121,22 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .madwifi
-%patch1 -p1 -b .service-startup
+%if "%fedora" == "5"
+%patch0 -p1 -b .old-dbus
+# Preserve compat with older FC5 versions of NM
+%patch1 -p1 -b .specialcase-madwifi
+%endif
+%patch2 -p1 -b .startup-dhcdbd
 
 %build
-%configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named --enable-notify=yes
+# Even though we don't require named, we still build with it
+# so that if the user installs it, NM will use it automatically
+%configure \
+	--disable-static \
+	--enable-notify=yes \
+	--with-named=/usr/sbin/named \
+	--with-named-dir=/var/named/data \
+	--with-named-user=named
 make
 
 
@@ -130,11 +144,7 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
-%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/NMLoadModules
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_glib.la
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_glib.a
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm-util.la
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm-util.a
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/
 
 %clean
@@ -156,6 +166,9 @@
     /sbin/chkconfig --del NetworkManagerDispatcher
 fi
 
+%post   glib -p /sbin/ldconfig
+%postun glib -p /sbin/ldconfig
+
 %post gnome
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -214,14 +227,58 @@
 
 
 %changelog
-* Fri Jul 14 2006 Dan Williams <dcbw at redhat.com> - 0.6.4-1
-- Update to 0.6.4 release
+* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
+- Revert FC6 to latest stable NM
+- Update to stable snapshot
+- Remove bind/caching-nameserver hard requirement
 
-* Thu Jun  8 2006 Dan Williams <dcbw at redhat.com> - 0.6.3-1
-- Update to 0.6.3 release
+* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 0.7.0-0.cvs20060529.7
+- BuildRequire wireless-tools-devel and perl-XML-Parser
+- Update the BuildRoot tag
+
+* Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> - 0.7.0-0.cvs20060529.6
+- add patch to make networkmanager less verbose (bug 202832)
+
+* Wed Aug  9 2006 Ray Strode <rstrode at redhat.com> - 0.7.0-0.cvs20060529.5
+- actually make the patch in 0.7.0-0.cvs20060529.4 apply
+
+* Fri Aug  4 2006 Ray Strode <rstrode at redhat.com> - 0.7.0-0.cvs20060529.4
+- Don't ever elect inactive wired devices (bug 194124).
+
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.7.0-0.cvs20060529.3
+- Add patch to fix deprecated dbus functions
+
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.7.0-0.cvs20060529.2
+- Add BR for dbus-glib-devel
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-0.cvs20060529.1.1
+- rebuild
+
+* Mon May 29 2006 Dan Williams <dcbw at redhat.com> - 0.7.0-0.cvs20060529
+- Update to latest CVS
+	o Gnome.org #333420: dialog do not have window icons
+	o Gnome.org #336913: HIG tweaks for vpn properties pages
+	o Gnome.org #336846: HIG tweaks for nm-vpn-properties
+	o Gnome.org #336847: some bugs in nm-vpn-properties args parsing
+	o Gnome.org #341306: nm-vpn-properties crashes on startup
+	o Gnome.org #341263: Version 0.6.2-0ubuntu5 crashes on nm_device_802_11_wireless_get_type
+	o Gnome.org #341297: displays repeated keyring dialogs on resume from suspend
+	o Gnome.org #342400: Building libnm-util --without-gcrypt results in linker error
+	o Gnome.org #342398: Eleminate Gnome dependency for NetworkManager
+	o Gnome.org #336532: declaration of 'link' shadows a global declaration
+- Specfile fixes (#rh187489#)
+
+* Sun May 21 2006 Dan Williams <dcbw at redhat.com> - 0.7.0-0.cvs20060521
+- Update to latest CVS
+- Drop special-case-madwifi.patch, since WEXT code is in madwifi-ng trunk now
 
-* Wed May  3 2006 Dan Williams <dcbw at redhat.com> - 0.6.2-2
-- Update to latest 0.6.2 stable
+* Fri May 19 2006 Bill Nottingham <notting at redhat.com> - 0.6.2-3.fc6
+- use the same 0.6.2 tarball as FC5, so we have the same VPN interface
+  (did he fire ten args, or only nine?)
+
+* Thu Apr 27 2006 Jeremy Katz <katzj at redhat.com> - 0.6.2-2.fc6
+- use the hal device type instead of poking via ioctl so that wireless 
+  devices are properly detected even if the kill switch has been used
 
 * Thu Mar 30 2006 Dan Williams <dcbw at redhat.com> - 0.6.2-1
 - Update to 0.6.2:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	14 Jul 2006 20:06:24 -0000	1.55
+++ sources	30 Aug 2006 15:05:00 -0000	1.56
@@ -1 +1 @@
-fcf8bcbc08a26176e8f8943eedf7b670  NetworkManager-0.6.4.tar.gz
+a5bb1966ec56b76eee31a05e4e14d13c  NetworkManager-0.6.4.cvs20060829.tar.gz


--- service-startup.patch DELETED ---


--- special-case-madwifi.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:12:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:12:46 -0400
Subject: rpms/parted/FC-5 parted-1.7.1-constraint.patch, NONE,
	1.1 parted.spec, 1.66, 1.67
Message-ID: <200608301512.k7UFCkwv010420@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10401

Modified Files:
	parted.spec 
Added Files:
	parted-1.7.1-constraint.patch 
Log Message:
- Fixed include/parted/device.h header file (needs constraint.h)


parted-1.7.1-constraint.patch:
 device.h |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE parted-1.7.1-constraint.patch ---
--- parted-1.7.1/include/parted/device.h.constraint	2006-08-30 11:08:02.000000000 -0400
+++ parted-1.7.1/include/parted/device.h	2006-08-30 11:12:02.000000000 -0400
@@ -27,6 +27,7 @@
 #ifndef PED_DEVICE_H_INCLUDED
 #define PED_DEVICE_H_INCLUDED
 
+#include <parted/constraint.h>
 #include <parted/timer.h>
 
 /** We can address 2^63 sectors */


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/FC-5/parted.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- parted.spec	28 Aug 2006 14:28:57 -0000	1.66
+++ parted.spec	30 Aug 2006 15:12:43 -0000	1.67
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name:    parted
 Version: 1.7.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0:  parted-1.7.0-fat.c.patch
 Patch1:  parted-1.7.0-sx8.patch
@@ -16,6 +16,7 @@
 Patch8:  parted-1.7.1-O_DIRECT.patch
 Patch9:  parted-1.7.1-get_exception.patch
 Patch10: parted-1.7.1-gpt.patch
+Patch11: parted-1.7.1-constraint.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -55,6 +56,7 @@
 %patch8 -p1 -b .o_direct
 %patch9 -p1 -b .get_exception
 %patch10 -p1 -b .gpt
+%patch11 -p1 -b .constraint
 
 iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_
 mv doc/pt_BR-parted.8_ doc/pt_BR-parted.8
@@ -108,6 +110,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-16
+- Fixed include/parted/device.h header file (needs constraint.h)
+
 * Wed Aug 23 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-15
 - Fixed gpt patch (*asked_already -> asked_already, whoops)
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:25:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:25:46 -0400
Subject: rpms/anacron/FC-5 anacron.spec,1.19,1.20 anacrontab,1.3,1.4
Message-ID: <200608301525.k7UFPkH5025992@cvs.devel.redhat.com>

Author: jkudrnac

Update of /cvs/dist/rpms/anacron/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25961

Modified Files:
	anacron.spec anacrontab 
Log Message:
* Wed Aug 30 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 2.3-39
- modified PATH in /etc/anacrontab file to make the same as in /etc/crontab (#61891)



Index: anacron.spec
===================================================================
RCS file: /cvs/dist/rpms/anacron/FC-5/anacron.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- anacron.spec	14 Apr 2006 01:07:47 -0000	1.19
+++ anacron.spec	30 Aug 2006 15:25:43 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime.
 Name: anacron
 Version: 2.3
-Release: 38.FC5
+Release: 39%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz
@@ -112,6 +112,9 @@
 %config /etc/cron.weekly/0anacron
 
 %changelog
+* Wed Aug 30 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 2.3-39
+- modified PATH in /etc/anacrontab file to make the same as in /etc/crontab (#61891)
+
 * 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


Index: anacrontab
===================================================================
RCS file: /cvs/dist/rpms/anacron/FC-5/anacrontab,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- anacrontab	28 Sep 2004 16:34:54 -0000	1.3
+++ anacrontab	30 Aug 2006 15:25:43 -0000	1.4
@@ -3,7 +3,7 @@
 # See anacron(8) and anacrontab(5) for details.
 
 SHELL=/bin/sh
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
 MAILTO=root
 
 1	65	cron.daily		run-parts /etc/cron.daily



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:28:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:28:08 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc5-git1.bz2, 1.1,
	NONE patch-2.6.18-rc5.bz2, 1.1, NONE
Message-ID: <200608301528.k7UFS8c9026095@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26082

Removed Files:
	patch-2.6.18-rc5-git1.bz2 patch-2.6.18-rc5.bz2 
Log Message:
These get pulled from the lookaside cache


--- patch-2.6.18-rc5-git1.bz2 DELETED ---


--- patch-2.6.18-rc5.bz2 DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:41:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:41:16 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.121,1.122
Message-ID: <200608301541.k7UFfGU9026369@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26352

Modified Files:
	NetworkManager.spec 
Log Message:
* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
- Fix FC-5 buildreqs



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- NetworkManager.spec	30 Aug 2006 14:57:02 -0000	1.121
+++ NetworkManager.spec	30 Aug 2006 15:41:14 -0000	1.122
@@ -3,13 +3,21 @@
 %define hal_version	0.5.0
 
 %if "%fedora" == "5"
-%define dbus_version 0.61
-%define dbus_glib_version 0.61
+%define fc6_or_later 0
+%endif
+%if "%fedora" >= "6"
+%define fc6_or_later 1
+%endif
+%if "%rhel" >= "5"
+%define fc6_or_later 1
 %endif
 
-%if "%fedora" == "6"
+%if %{fc6_or_later}
 %define dbus_version	0.90
 %define dbus_glib_version 0.70
+%else
+%define dbus_version 0.61
+%define dbus_glib_version 0.61
 %endif
 
 %define gtk2_version	2.6.0
@@ -19,7 +27,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -40,9 +48,14 @@
 Requires: wpa_supplicant
 
 BuildRequires: dbus-devel >= %{dbus_version}
+%if %{fc6_or_later}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
+%else
+BuildRequires: wireless-tools >= %{wireless_tools_version}
+BuildRequires: dbus-glib >= %{dbus_glib_version}
+%endif
+BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: glib2-devel gtk2-devel
 BuildRequires: libglade2-devel
 BuildRequires: openssl-devel
@@ -227,6 +240,9 @@
 
 
 %changelog
+* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
+- Fix FC-5 buildreqs
+
 * Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
 - Revert FC6 to latest stable NM
 - Update to stable snapshot



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:41:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:41:43 -0400
Subject: rpms/NetworkManager/FC-5 NetworkManager.spec,1.109,1.110
Message-ID: <200608301541.k7UFfhSV026425@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26409

Modified Files:
	NetworkManager.spec 
Log Message:
* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
- Fix FC-5 buildreqs



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- NetworkManager.spec	30 Aug 2006 15:05:00 -0000	1.109
+++ NetworkManager.spec	30 Aug 2006 15:41:41 -0000	1.110
@@ -3,13 +3,21 @@
 %define hal_version	0.5.0
 
 %if "%fedora" == "5"
-%define dbus_version 0.61
-%define dbus_glib_version 0.61
+%define fc6_or_later 0
+%endif
+%if "%fedora" >= "6"
+%define fc6_or_later 1
+%endif
+%if "%rhel" >= "5"
+%define fc6_or_later 1
 %endif
 
-%if "%fedora" == "6"
+%if %{fc6_or_later}
 %define dbus_version	0.90
 %define dbus_glib_version 0.70
+%else
+%define dbus_version 0.61
+%define dbus_glib_version 0.61
 %endif
 
 %define gtk2_version	2.6.0
@@ -19,7 +27,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -40,9 +48,14 @@
 Requires: wpa_supplicant
 
 BuildRequires: dbus-devel >= %{dbus_version}
+%if %{fc6_or_later}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
+%else
+BuildRequires: wireless-tools >= %{wireless_tools_version}
+BuildRequires: dbus-glib >= %{dbus_glib_version}
+%endif
+BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: glib2-devel gtk2-devel
 BuildRequires: libglade2-devel
 BuildRequires: openssl-devel
@@ -227,6 +240,9 @@
 
 
 %changelog
+* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
+- Fix FC-5 buildreqs
+
 * Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
 - Revert FC6 to latest stable NM
 - Update to stable snapshot



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:41:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:41:49 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch,
	1.1, 1.2
Message-ID: <200608301541.k7UFfniI026454@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26412

Modified Files:
	openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch 
Log Message:
better fix

openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch:
 framework/source/uielement/menubarmanager.cxx |   17 ++++++++++++++++-
 source/uielement/menubarmanager.cxx           |    0 
 2 files changed, 16 insertions(+), 1 deletion(-)

Index: openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch	22 Aug 2006 11:03:13 -0000	1.1
+++ openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch	30 Aug 2006 15:41:46 -0000	1.2
@@ -4,44 +4,58 @@
 retrieving revision 1.39
 diff -u -r1.39 menubarmanager.cxx
 --- openoffice.org.orig/framework/source/uielement/menubarmanager.cxx	4 Aug 2006 11:08:22 -0000	1.39
-+++ openoffice.org/framework/source/uielement/menubarmanager.cxx	22 Aug 2006 10:54:02 -0000
-@@ -1249,6 +1249,9 @@
++++ openoffice.org/framework/source/uielement/menubarmanager.cxx	30 Aug 2006 15:36:32 -0000
+@@ -1062,6 +1062,12 @@
+     }
+ }
+ 
++static void lcl_CheckForChildren(Menu* pMenu, USHORT nItemId)
++{
++    if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
++        pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
++}
++
+ //_________________________________________________________________________________________________________________
+ // vcl handler
+ //_________________________________________________________________________________________________________________
+@@ -1249,8 +1255,11 @@
                                  // Force update of popup menu
                                  pMenuItemHandler->xPopupMenuController->updatePopupMenu();
                                  bPopupMenu = sal_True;
-+								if (PopupMenu*  pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
-+									pMenu->EnableItem( pMenuItemHandler->nItemId, pThisPopup->GetItemCount() ? true : false );
 +
                              }
  
++							lcl_CheckForChildren(pMenu, pMenuItemHandler->nItemId);
++
                              if ( xMenuItemDispatch.is() )
-@@ -1271,6 +1274,9 @@
+ 						    {
+ 							    pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch;
+@@ -1271,6 +1280,8 @@
                      {
                          // Force update of popup menu
                          pMenuItemHandler->xPopupMenuController->updatePopupMenu();
-+						if (PopupMenu*  pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
-+							pMenu->EnableItem( pMenuItemHandler->nItemId, pThisPopup->GetItemCount() ? true : false );
++						lcl_CheckForChildren(pMenu, pMenuItemHandler->nItemId);
 +
                      }
                      else if ( pMenuItemHandler->xMenuItemDispatch.is() )
                      {
-@@ -1659,6 +1665,9 @@
+@@ -1659,6 +1670,8 @@
                      if ( CreatePopupMenuController( pItemHandler ))
                          pItemHandler->xPopupMenuController->updatePopupMenu();
                  }
 +
-+				if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
-+					pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
++				lcl_CheckForChildren(pMenu, nItemId);
              }
              else if (( aItemCommand.getLength() > nAddonsURLPrefixLength ) &&
  				     ( aItemCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 ))
-@@ -1806,6 +1815,9 @@
+@@ -1805,7 +1818,9 @@
+                 {
                      if ( CreatePopupMenuController( pItemHandler ))
                          pItemHandler->xPopupMenuController->updatePopupMenu();
-                 }
+-                }
++				}
 +
-+				if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
-+					pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
++				lcl_CheckForChildren(pMenu, pItemHandler->nItemId);
              }
  
  			m_aMenuItemHandlerVector.push_back( pItemHandler );



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:42:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:42:11 -0400
Subject: rpms/pyparted/FC-5 pyparted.spec,1.19,1.20
Message-ID: <200608301542.k7UFgBCH026530@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/pyparted/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26517

Modified Files:
	pyparted.spec 
Log Message:
- Require parted-1.7.1 or higher



Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/FC-5/pyparted.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pyparted.spec	30 Aug 2006 14:50:49 -0000	1.19
+++ pyparted.spec	30 Aug 2006 15:42:09 -0000	1.20
@@ -1,12 +1,12 @@
 Summary: python module for parted
 Name: pyparted
 Version: 1.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: parted >= 1.7.0
+Requires: parted >= 1.7.1
 BuildRequires: parted-devel >= 1.7.1, python-devel
 Requires: python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
 
@@ -39,6 +39,9 @@
 %{_libdir}/python?.?/site-packages/*.so
 
 %changelog
+* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 1.7.2-2
+- Require parted-1.7.1 or higher
+
 * Tue Jul 25 2006 David Cantrell <dcantrell at redhat.com> - 1.7.2-1
 - Add HPSERVICE, PALO, PREP, and MSFT_RESERVED to partition types list
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:50:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:50:33 -0400
Subject: rpms/cups/devel cups.spec,1.257,1.258 cups-str1893.patch,1.1,NONE
Message-ID: <200608301550.k7UFoXV2009527@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9514

Modified Files:
	cups.spec 
Removed Files:
	cups-str1893.patch 
Log Message:
* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com>
- No longer need str1893 patch.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- cups.spec	30 Aug 2006 15:01:37 -0000	1.257
+++ cups.spec	30 Aug 2006 15:50:30 -0000	1.258
@@ -39,7 +39,6 @@
 Patch15: cups-maxlogsize.patch
 Patch16: cups-pid.patch
 Patch17: cups-relro.patch
-Patch19: cups-str1893.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -138,7 +137,6 @@
 %patch15 -p1 -b .maxlogsize
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .relro
-%patch19 -p1 -b .str1893
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -414,6 +412,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com>
+- No longer need str1893 patch.
+
 * Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-2
 - 1.2.3.  No longer need str1880 or str1881 patches.
 


--- cups-str1893.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:57:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:57:34 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.61,1.62
Message-ID: <200608301557.k7UFvYWr009714@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9697

Modified Files:
	mx4j.spec 
Log Message:

Rebuilding.




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mx4j.spec	26 Aug 2006 00:44:01 -0000	1.61
+++ mx4j.spec	30 Aug 2006 15:57:31 -0000	1.62
@@ -40,7 +40,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        6jpp.3
+Release:        6jpp.4
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -286,6 +286,9 @@
 %doc dist/docs/*
 
 %changelog
+* Wed Aug 30 2006 Deepak Bhole <dbhole at redhat.com> 3.0.1-6jpp.4
+- Rebuilding.
+
 * Fri Aug 25 2006 Deepak Bhole <dbhole at redhat.com> 0:3.0.1-6jpp.3
 - Fixed broken deps.
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:59:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:59:15 -0400
Subject: rpms/cups/FC-5 cups.spec, 1.214, 1.215 cups-try_connect.patch, 1.2,
	NONE snmp-str1737.c, 1.1, NONE
Message-ID: <200608301559.k7UFxFPR009796@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9783

Modified Files:
	cups.spec 
Removed Files:
	cups-try_connect.patch snmp-str1737.c 
Log Message:
* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com>
- Don't overwrite snmp.c.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- cups.spec	30 Aug 2006 14:57:36 -0000	1.214
+++ cups.spec	30 Aug 2006 15:59:13 -0000	1.215
@@ -11,7 +11,6 @@
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
-Source3: snmp-str1737.c
 Source5: cups-lpd
 Source6: pstoraster
 Source7: pstoraster.convs
@@ -30,7 +29,6 @@
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
-Patch11: cups-str1893.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
 Patch17: cups-serverbin-compat.patch
@@ -126,7 +124,6 @@
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
-%patch11 -p1 -b .str1893
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
 %patch17 -p1 -b .serverbin-compat
@@ -137,8 +134,6 @@
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
 %patch41 -p1 -b .relro
-cp %{SOURCE3} backend/snmp.c
-%patch100 -p1 -b .try_connect
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
 autoconf
@@ -411,6 +406,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com>
+- Don't overwrite snmp.c.
+- No longer need str1893 patch.
+
 * Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-1.1
 - 1.2.3.  No longer need str1880 or str1881 patches.
 


--- cups-try_connect.patch DELETED ---


--- snmp-str1737.c DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 15:59:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 11:59:50 -0400
Subject: rpms/cups/devel cups.spec,1.258,1.259 snmp-str1737.c,1.1,NONE
Message-ID: <200608301559.k7UFxoCP009820@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9807

Modified Files:
	cups.spec 
Removed Files:
	snmp-str1737.c 
Log Message:
* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-3
- Don't overwrite snmp.c.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- cups.spec	30 Aug 2006 15:50:30 -0000	1.258
+++ cups.spec	30 Aug 2006 15:59:48 -0000	1.259
@@ -6,13 +6,12 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.3
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
-Source3: snmp-str1737.c
 Source4: pstopdf
 Source5: cups-lpd
 Source6: pstoraster
@@ -142,7 +141,6 @@
 %patch100 -p1 -b .lspp
 %endif
 
-cp %{SOURCE3} backend/snmp.c
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
 autoconf
@@ -412,7 +410,8 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-3
+- Don't overwrite snmp.c.
 - No longer need str1893 patch.
 
 * Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-2


--- snmp-str1737.c DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 16:00:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 12:00:14 -0400
Subject: rpms/cups/FC-5 cups.spec,1.215,1.216
Message-ID: <200608301600.k7UG0EVx009889@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9858

Modified Files:
	cups.spec 
Log Message:
1:1.2.3-1.2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- cups.spec	30 Aug 2006 15:59:13 -0000	1.215
+++ cups.spec	30 Aug 2006 16:00:02 -0000	1.216
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.3
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -406,7 +406,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Aug 30 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-1.2
 - Don't overwrite snmp.c.
 - No longer need str1893 patch.
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 16:06:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 12:06:48 -0400
Subject: rpms/cups/FC-5 cups.spec,1.216,1.217
Message-ID: <200608301606.k7UG6mP5010063@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10050

Modified Files:
	cups.spec 
Log Message:
No longer need this.


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- cups.spec	30 Aug 2006 16:00:02 -0000	1.216
+++ cups.spec	30 Aug 2006 16:06:46 -0000	1.217
@@ -39,7 +39,6 @@
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
 Patch41: cups-relro.patch
-Patch100: cups-try_connect.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root



From fedora-cvs-commits at redhat.com  Wed Aug 30 16:15:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 12:15:08 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2604,1.2605
Message-ID: <200608301615.k7UGF8De010259@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10238

Modified Files:
	kernel-2.6.spec 
Log Message:
minor spec tweak so ppc32 builds don't touch ppc64 .config's


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2604
retrieving revision 1.2605
diff -u -r1.2604 -r1.2605
--- kernel-2.6.spec	30 Aug 2006 15:10:37 -0000	1.2604
+++ kernel-2.6.spec	30 Aug 2006 16:15:05 -0000	1.2605
@@ -68,7 +68,7 @@
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
-# kdump only builds on i686 and x86_64 ...
+# kdump only builds on i686, x86_64, ppc64 ...
 %ifnarch i686 x86_64 ppc64 ppc64iseries
 %define buildkdump 0
 %endif
@@ -139,7 +139,7 @@
 %endif
 
 %ifarch ppc
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc*.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc{-,.}*config
 %define image_install_path boot
 %define make_target vmlinux
 %define kernel_image vmlinux



From fedora-cvs-commits at redhat.com  Wed Aug 30 16:18:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 12:18:12 -0400
Subject: rpms/hal/devel hal-device-manager.desktop, NONE, 1.1 hal.spec, 1.104,
	1.105
Message-ID: <200608301618.k7UGICEW023474@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21944

Modified Files:
	hal.spec 
Added Files:
	hal-device-manager.desktop 
Log Message:
add a desktop file 



--- NEW FILE hal-device-manager.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Hardware
Name[bn]=???????????????????????????
Name[cs]=Hardware
Name[da]=Udstyr
Name[de]=Hardware Browser
Name[el]=??????????
Name[es]=Hardware
Name[fi]=Laitteisto
Name[fr]=Mat??riel
Name[gu]=????????????????????????
Name[hi]=???????????????????????????
Name[hr]=Hardver
Name[hu]=Hardver
Name[is]=V??lb??na??ur
Name[it]=Hardware
Name[ja]=??????????????????
Name[ko]=????????????
Name[ms]=Perkakasan
Name[nl]=Hardware
Name[pa]=????????????????????????
Name[pt]='Hardware'
Name[pt_BR]=Hardware
Name[ru]=?????????? ????????????????????????
Name[sr]=??????????????
Name[sr at Latn]=Hardver
Name[sv]=H??rdvara
Name[ta]=???????????????????????????
Name[tr]=Donan??m
Name[zh_CN]=??????
Name[zh_TW]=??????
GenericName=Hardware
GenericName[bn]=???????????????????????????
GenericName[cs]=Hardware
GenericName[da]=Udstyr
GenericName[de]=Hardware Browser
GenericName[el]=??????????
GenericName[es]=Hardware
GenericName[fi]=Laitteisto
GenericName[fr]=Mat??riel
GenericName[gu]=????????????????????????
GenericName[hi]=???????????????????????????
GenericName[hr]=Hardver
GenericName[hu]=Hardver
GenericName[is]=V??lb??na??ur
GenericName[it]=Hardware
GenericName[ja]=??????????????????
GenericName[ko]=????????????
GenericName[ms]=Perkakasan
GenericName[nl]=Hardware
GenericName[pa]=????????????????????????
GenericName[pt]='Hardware'
GenericName[pt_BR]=Hardware
GenericName[ru]=?????????? ????????????????????????
GenericName[sr]=??????????????
GenericName[sr at Latn]=Hardver
GenericName[sv]=H??rdvara
GenericName[ta]=???????????????????????????
GenericName[tr]=Donan??m
GenericName[zh_CN]=??????
GenericName[zh_TW]=??????
Comment=View information on the hardware on this computer
Comment[ar]=?????? ?????????????? ???????????? ???????? ??????????????
Comment[bn]=?????? ????????????????????????????????? ??????????????????????????? ???????????? ???????????????????????? ?????????
Comment[cs]=Zobrazit informace o hardware v tomto po????ta??i
Comment[da]=Se information om udstyr p?? denne maskine
Comment[de]=Informationen ??ber die Hardware in diesem Computer ansehen
Comment[el]=?????????????? ?????????????????????? ?????? ???? ?????????? ?????????? ?????? ????????????????????
Comment[es]=Ver informaci??n acerca del hardware de este ordenador
Comment[fi]=N??yt?? tietoja t??m??n tietokoneen laitteistosta
Comment[fr]=Visionner les informations du mat??riel sur cet ordinateur
Comment[gu]=??? ??????????????????????????? ?????? ?????????????????????????????? ????????????????????? ?????????
Comment[hi]=?????? ???????????????????????? ?????? ??????????????????????????? ?????? ??????????????? ????????? ??????????????? ???????????????
Comment[hr]=Pregled podataka o hardveru na ovom ra??unalu
Comment[hu]=A sz??m??t??g??p hardverjellemz??inek megjelen??t??se
Comment[is]=Sko??a uppl??singar um v??lb??na??inn ?? ??essari t??lvu
Comment[it]=Visualizzare su questo computer le informazioni hardware
Comment[ja]=????????????????????????????????????????????????????????????????????????
Comment[ko]=??? ???????????? ???????????? ?????? ??????
Comment[ms]=Lihat maklumat perkakasan pada komputer ini
Comment[nl]=Informatie over de hardware op deze computer weergeven
Comment[no]=Vis informasjon om maskinvaren p?? denne maskinen
Comment[pa]=?????? ????????????????????? ???????????? ???????????????????????? ?????? ????????????????????? ????????????
Comment[pt]=Ver informa????es do hardware deste computador
Comment[pt_BR]=Visualizar informa????es sobre o hardware deste computador
Comment[ru]=???????????????? ???? ????????????????????????, ?????????????????????????? ???? ???????? ????????????????????
Comment[sk]=Zobrazi?? inform??cie o hardv??ri v tomto po????ta??i
Comment[sl]=Prika??i podatke o strojni opremi tega ra??unalnika.
Comment[sr]=?????????????? ?????????????????????? ?? ???????????????? ?? ???????? ????????????????
Comment[sr at Latn]=Pregled informacija o hardveru u ovom ra??unaru
Comment[sv]=Visa information om h??rdvaran p?? denna dator
Comment[ta]=???????????? ??????????????????????????? ???????????? ??????????????????????????? ?????????????????????????????? ??????????????? ???????????? 
Comment[tr]=Bilgisayardaki donan??m hakk??nda bilgi g??ster
Comment[vi]=Xem th??ng tin ph???n c???ng tr??n m???i
Comment[zh_CN]=????????????????????????????????????
Comment[zh_TW]=????????????????????????????????????
Exec=hal-device-manager
Terminal=0
Type=Application
Icon=hwbrowser.png
StartupNotify=true
Categories=Application;System;Monitor;X-Red-Hat-Base;
X-Desktop-File-Install-Version=0.10


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- hal.spec	26 Jul 2006 19:07:42 -0000	1.104
+++ hal.spec	30 Aug 2006 16:18:10 -0000	1.105
@@ -22,10 +22,11 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
+Source2: hal-device-manager.desktop
 Patch0: hal-0.5.7-fix-fedora-power-save.patch
 Patch1: hal-0.5.7-lid-open-fix.patch
 Patch2: hal-0.5.7-fix-for-nfs-and-autofs.patch
@@ -113,6 +114,10 @@
 
 cp -f %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
 
+desktop-file-install --vendor redhat \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+  %{SOURCE2}
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
@@ -206,8 +211,12 @@
 %dir %{_datadir}/hal/device-manager
 %{_datadir}/hal/device-manager/*
 %{_bindir}/hal-device-manager
+%{_datadir}/applications/*.desktop
 
 %changelog
+* Wed Aug 30 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.7.1-3%{?dist}
+- Add a .desktop file for hal-device-manager
+
 * Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7.1-2%{?dist}
 - Bump and rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 16:29:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 12:29:42 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.325, 1.326 anaconda.spec, 1.451,
	1.452 sources, 1.448, 1.449
Message-ID: <200608301629.k7UGTg3v025829@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25800/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.87-1 on branch devel from anaconda-11.1.0.87-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- .cvsignore	29 Aug 2006 22:25:19 -0000	1.325
+++ .cvsignore	30 Aug 2006 16:29:40 -0000	1.326
@@ -1 +1 @@
-anaconda-11.1.0.86.tar.bz2
+anaconda-11.1.0.87.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- anaconda.spec	29 Aug 2006 22:25:20 -0000	1.451
+++ anaconda.spec	30 Aug 2006 16:29:40 -0000	1.452
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.86
+Version: 11.1.0.87
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,11 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Aug 30 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.87-1
+- Fix traceback on editing lvm (#204631)
+- Fix SELinux context setting
+- Don't do file logging in pkgorder
+
 * Tue Aug 29 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.86-1
 - Fix ia64 pxeboot dir (#199274)
 - Remember manual TCP/IP settings (dcantrel, #202662)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- sources	29 Aug 2006 22:25:20 -0000	1.448
+++ sources	30 Aug 2006 16:29:40 -0000	1.449
@@ -1 +1 @@
-6b19e21d4ab08c28540e2a1e51a069b3  anaconda-11.1.0.86.tar.bz2
+6b90e3c16dd9f7ae86be7ce1d41403e1  anaconda-11.1.0.87.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 30 16:43:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 12:43:17 -0400
Subject: rpms/hal/devel hal.spec,1.105,1.106
Message-ID: <200608301643.k7UGhHRR026050@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26036

Modified Files:
	hal.spec 
Log Message:
BR desktop-file-utils



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- hal.spec	30 Aug 2006 16:18:10 -0000	1.105
+++ hal.spec	30 Aug 2006 16:43:13 -0000	1.106
@@ -47,6 +47,7 @@
 BuildRequires: gettext >= %{gettext_version}
 BuildRequires: dbus-glib >= %{dbus_glib_version}
 BuildRequires: perl-XML-Parser
+BuildRequires: desktop-file-utils >= 0.9
 
 %ifnarch s390 s390x
 BuildRequires: libusb-devel >= %{libusb_version}



From fedora-cvs-commits at redhat.com  Wed Aug 30 17:31:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 13:31:48 -0400
Subject: rpms/libxklavier/devel .cvsignore, 1.9, 1.10 libxklavier.spec, 1.25,
	1.26 sources, 1.9, 1.10
Message-ID: <200608301731.k7UHVmFL024785@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libxklavier/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24744

Modified Files:
	.cvsignore libxklavier.spec sources 
Log Message:
3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Jun 2006 14:23:04 -0000	1.9
+++ .cvsignore	30 Aug 2006 17:31:45 -0000	1.10
@@ -1 +1 @@
-libxklavier-2.91.tar.gz
+libxklavier-3.0.tar.gz


Index: libxklavier.spec
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libxklavier.spec	12 Jul 2006 07:10:26 -0000	1.25
+++ libxklavier.spec	30 Aug 2006 17:31:45 -0000	1.26
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
-Version:	2.91
-Release: 	1.1
+Version:	3.0
+Release: 	1%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 Url: http://gswitchit.sourceforge.net/
@@ -14,9 +14,6 @@
 Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-#Patch0: libxklavier-1.14-werror.patch
-#Patch1: libxklavier-2.1.0.2006.02.23-trap-x-error.patch
-
 %description
 libxklavier is a library providing high-level API for X Keyboard Extension
 known as XKB. This library is intended to support XFree86 and other
@@ -27,14 +24,13 @@
 Summary: Libraries, includes, etc to develop libxklavier applications
 Group: Development/Libraries
 Requires: %{name} = %{version}
+Requires: pkgconfig
 
 %description devel
 Libraries, include files, etc you can use to develop libxklavier applications.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .werror
-#%patch1 -p1 -b .trap-x-error
 
 %build
 
@@ -46,7 +42,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 %clean
 rm -rf %{buildroot}
@@ -66,12 +62,16 @@
 %defattr(-, root, root)
 
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_includedir}/*
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Wed Aug 30 2006 Matthias Clasen <mclasen at redhat.com> - 3.0-1.fc6
+- Update to 3.0
+- Require pkgconfig in the -devel package
+- Don't ship static libraries
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.91-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Jun 2006 14:23:04 -0000	1.9
+++ sources	30 Aug 2006 17:31:45 -0000	1.10
@@ -1 +1 @@
-53d9864d165c86edb6a67f7ebe140814  libxklavier-2.91.tar.gz
+7457dc72cfcb57498882ea652cb79eeb  libxklavier-3.0.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 30 17:42:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 13:42:48 -0400
Subject: rpms/evolution/devel evolution-2.7.92-chain-finalize.patch,1.1,1.2
Message-ID: <200608301742.k7UHgmJu024880@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24861

Modified Files:
	evolution-2.7.92-chain-finalize.patch 
Log Message:
- Update patch for RH bug #353472.
- Too minor to bother with a new release.


evolution-2.7.92-chain-finalize.patch:
 a11y/calendar/ea-cal-view-event.c                |    2 ++
 a11y/calendar/ea-day-view-cell.c                 |    2 ++
 a11y/calendar/ea-week-view-cell.c                |    2 ++
 a11y/e-table/gal-a11y-e-cell-registry.c          |    2 ++
 a11y/widgets/ea-calendar-cell.c                  |    2 ++
 plugins/hula-account-setup/camel-hula-listener.c |    2 ++
 6 files changed, 12 insertions(+)

Index: evolution-2.7.92-chain-finalize.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.92-chain-finalize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.7.92-chain-finalize.patch	29 Aug 2006 21:57:17 -0000	1.1
+++ evolution-2.7.92-chain-finalize.patch	30 Aug 2006 17:42:45 -0000	1.2
@@ -1,5 +1,5 @@
---- evolution-2.7.92/a11y/widgets/ea-calendar-cell.c.chain-finalize	2006-08-29 15:01:12.000000000 -0400
-+++ evolution-2.7.92/a11y/widgets/ea-calendar-cell.c	2006-08-29 15:01:34.000000000 -0400
+--- evolution-2.7.92/a11y/widgets/ea-calendar-cell.c.chain-finalize	2005-06-17 11:20:24.000000000 -0400
++++ evolution-2.7.92/a11y/widgets/ea-calendar-cell.c	2006-08-29 17:07:16.000000000 -0400
 @@ -203,6 +203,8 @@
  #ifdef ACC_DEBUG
  static void ea_calendar_cell_finalize (GObject *object)
@@ -9,8 +9,8 @@
  	++n_ea_calendar_cell_destroyed;
  	g_print ("ACC_DEBUG: n_ea_calendar_cell_destroyed = %d\n",
  		n_ea_calendar_cell_destroyed);
---- evolution-2.7.92/a11y/calendar/ea-week-view-cell.c.chain-finalize	2006-08-29 15:10:07.000000000 -0400
-+++ evolution-2.7.92/a11y/calendar/ea-week-view-cell.c	2006-08-29 15:10:26.000000000 -0400
+--- evolution-2.7.92/a11y/calendar/ea-week-view-cell.c.chain-finalize	2004-09-30 03:32:36.000000000 -0400
++++ evolution-2.7.92/a11y/calendar/ea-week-view-cell.c	2006-08-29 17:07:16.000000000 -0400
 @@ -190,6 +190,8 @@
  #ifdef ACC_DEBUG
  static void ea_week_view_cell_finalize (GObject *object)
@@ -20,8 +20,8 @@
  	++n_ea_week_view_cell_destroyed;
  	printf ("ACC_DEBUG: n_ea_week_view_cell_destroyed = %d\n",
  		n_ea_week_view_cell_destroyed);
---- evolution-2.7.92/a11y/calendar/ea-day-view-cell.c.chain-finalize	2006-08-29 15:03:46.000000000 -0400
-+++ evolution-2.7.92/a11y/calendar/ea-day-view-cell.c	2006-08-29 15:04:15.000000000 -0400
+--- evolution-2.7.92/a11y/calendar/ea-day-view-cell.c.chain-finalize	2004-09-30 03:32:36.000000000 -0400
++++ evolution-2.7.92/a11y/calendar/ea-day-view-cell.c	2006-08-29 17:07:16.000000000 -0400
 @@ -190,6 +190,8 @@
  #ifdef ACC_DEBUG
  static void ea_day_view_cell_finalize (GObject *object)
@@ -31,8 +31,8 @@
  	++n_ea_day_view_cell_destroyed;
  	printf ("ACC_DEBUG: n_ea_day_view_cell_destroyed = %d\n",
  		n_ea_day_view_cell_destroyed);
---- evolution-2.7.92/a11y/calendar/ea-cal-view-event.c.chain-finalize	2006-08-29 15:06:27.000000000 -0400
-+++ evolution-2.7.92/a11y/calendar/ea-cal-view-event.c	2006-08-29 15:08:08.000000000 -0400
+--- evolution-2.7.92/a11y/calendar/ea-cal-view-event.c.chain-finalize	2006-08-19 01:49:06.000000000 -0400
++++ evolution-2.7.92/a11y/calendar/ea-cal-view-event.c	2006-08-29 17:07:16.000000000 -0400
 @@ -156,6 +156,8 @@
  #ifdef ACC_DEBUG
  static void ea_cal_view_finalize (GObject *object)
@@ -42,8 +42,8 @@
  	++n_ea_cal_view_event_destroyed;
  	printf ("ACC_DEBUG: n_ea_cal_view_event_destroyed = %d\n",
  		n_ea_cal_view_event_destroyed);
---- evolution-2.7.92/a11y/e-table/gal-a11y-e-cell-registry.c.chain-finalize	2006-08-29 15:13:20.000000000 -0400
-+++ evolution-2.7.92/a11y/e-table/gal-a11y-e-cell-registry.c	2006-08-29 15:13:38.000000000 -0400
+--- evolution-2.7.92/a11y/e-table/gal-a11y-e-cell-registry.c.chain-finalize	2005-04-29 10:13:45.000000000 -0400
++++ evolution-2.7.92/a11y/e-table/gal-a11y-e-cell-registry.c	2006-08-29 17:07:16.000000000 -0400
 @@ -28,6 +28,8 @@
  
  	g_hash_table_destroy (registry->priv->table);
@@ -53,3 +53,14 @@
  }
  
  static void
+--- evolution-2.7.92/plugins/hula-account-setup/camel-hula-listener.c.chain-finalize	2006-08-30 13:39:29.000000000 -0400
++++ evolution-2.7.92/plugins/hula-account-setup/camel-hula-listener.c	2006-08-30 13:39:55.000000000 -0400
+@@ -116,6 +116,8 @@
+ 	}
+ 	
+ 	g_list_free (hula_accounts);
++
++	G_OBJECT_CLASS (parent_class)->finalize (object);
+ }
+ 
+ /*determines whehter the passed in account is hula or not by looking at source url */



From fedora-cvs-commits at redhat.com  Wed Aug 30 17:46:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 13:46:16 -0400
Subject: rpms/jpackage-utils/devel jpackage-utils.spec,1.30,1.31
Message-ID: <200608301746.k7UHkG9H027011@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/jpackage-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25731

Modified Files:
	jpackage-utils.spec 
Log Message:
* Wed Aug 30 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp.7
- Make rebuild-security-providers look in %{_libdir}.




Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jpackage-utils.spec	23 Aug 2006 18:29:07 -0000	1.30
+++ jpackage-utils.spec	30 Aug 2006 17:46:14 -0000	1.31
@@ -5,7 +5,7 @@
 
 Name:           jpackage-utils
 Version:        1.6.6
-Release:        1jpp.6
+Release:        1jpp.7
 Epoch:          0
 Summary:        JPackage utilities
 License:        JPackage License
@@ -101,11 +101,11 @@
 #!/bin/sh
 # Rebuild the list of security providers classpath.security
 
-cat %{_prefix}/lib/security/classpath.security \
+cat %{_libdir}/security/classpath.security \
   | grep -v "^security.provider." \
-  > %{_prefix}/lib/security/classpath.security.bak
-mv -f %{_prefix}/lib/security/classpath.security.bak \
-  %{_prefix}/lib/security/classpath.security
+  > %{_libdir}/security/classpath.security.bak
+mv -f %{_libdir}/security/classpath.security.bak \
+  %{_libdir}/security/classpath.security
 
 providers=\$(ls %{_sysconfdir}/java/security/security.d | sort \
   | awk -F- '{ print \$2 }')
@@ -114,7 +114,7 @@
 do
   count=\$((count + 1))
   echo "security.provider."\$count"="\$provider \
-    >> %{_prefix}/lib/security/classpath.security
+    >> %{_libdir}/security/classpath.security
 done
 EOF
 %endif
@@ -208,6 +208,9 @@
 
 
 %changelog
+* Wed Aug 30 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp.7
+- Make rebuild-security-providers look in %{_libdir}.
+
 * Wed Aug 23 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.6.6-1jpp.6
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 17:53:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 13:53:57 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2605, 1.2606 sources, 1.478,
	1.479 .cvsignore, 1.515, 1.516
Message-ID: <200608301753.k7UHrvK1007941@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7926

Modified Files:
	kernel-2.6.spec sources .cvsignore 
Log Message:
update xen HV to cset 11251


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2605
retrieving revision 1.2606
diff -u -r1.2605 -r1.2606
--- kernel-2.6.spec	30 Aug 2006 16:15:05 -0000	1.2605
+++ kernel-2.6.spec	30 Aug 2006 17:53:55 -0000	1.2606
@@ -33,7 +33,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_hv_cset 11251
+%define xen_hv_cset 11256
 %define make_target bzImage
 %define kernel_image x86
 %define xen_flags debug=y verbose=y crash_debug=y
@@ -1823,6 +1823,9 @@
 %endif
 
 %changelog
+* Wed Aug 30 2006 Juan Quintela <quintela at redhat.com>
+- update xen-hv to cset 11256 (pre 3 hypercall breakage).
+
 * Wed Aug 30 2006 Jeremy Katz <katzj at redhat.com>
 - Fix up DEFAULTKERNEL for kernel-xen[0U]->kernel-xen change
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- sources	29 Aug 2006 22:22:35 -0000	1.478
+++ sources	30 Aug 2006 17:53:55 -0000	1.479
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-18b970072562000b8838eab9eefaa2e9  xen-11251.tar.bz2
 09d38fcbf78b29bacbb6e56c8d9e2a61  patch-2.6.18-rc5.bz2
 a49d7019372d011cc20c1574df9aec7c  patch-2.6.18-rc5-git1.bz2
+06fb33db0bf25b0cf10acd605e9b8235  xen-11256.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -r1.515 -r1.516
--- .cvsignore	29 Aug 2006 22:22:34 -0000	1.515
+++ .cvsignore	30 Aug 2006 17:53:55 -0000	1.516
@@ -3,6 +3,6 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-xen-11251.tar.bz2
 patch-2.6.18-rc5.bz2
 patch-2.6.18-rc5-git1.bz2
+xen-11256.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 30 17:55:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 13:55:34 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2606,
	1.2607 linux-2.6-xen.patch, 1.57, 1.58
Message-ID: <200608301755.k7UHtYd1007995@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7978

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
don't compile HV with debug=y flag


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2606
retrieving revision 1.2607
diff -u -r1.2606 -r1.2607
--- kernel-2.6.spec	30 Aug 2006 17:53:55 -0000	1.2606
+++ kernel-2.6.spec	30 Aug 2006 17:55:31 -0000	1.2607
@@ -36,7 +36,7 @@
 %define xen_hv_cset 11256
 %define make_target bzImage
 %define kernel_image x86
-%define xen_flags debug=y verbose=y crash_debug=y
+%define xen_flags verbose=y crash_debug=y
 %define xen_target vmlinuz
 %define xen_image vmlinuz
 
@@ -93,7 +93,7 @@
 %ifarch i686
 %define buildpae 1
 # we build always xen HV with pae
-%define xen_flags debug=y verbose=y crash_debug=y pae=y
+%define xen_flags verbose=y crash_debug=y pae=y
 %endif
 
 %ifarch x86_64
@@ -1825,6 +1825,7 @@
 %changelog
 * Wed Aug 30 2006 Juan Quintela <quintela at redhat.com>
 - update xen-hv to cset 11256 (pre 3 hypercall breakage).
+- remove debug=y from HV compilation.
 
 * Wed Aug 30 2006 Jeremy Katz <katzj at redhat.com>
 - Fix up DEFAULTKERNEL for kernel-xen[0U]->kernel-xen change

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    8 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  739 +++++
 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                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   92 
 arch/i386/kernel/head-xen.S                         |  200 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2771 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1185 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  379 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1845 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1101 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vmlinux.lds.S                      |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/irqflags.c                       |   99 
 arch/i386/mach-xen/setup.c                          |  153 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  457 +++
 arch/i386/mm/init-xen.c                             |  851 ++++++
 arch/i386/mm/ioremap-xen.c                          |  475 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  699 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1206 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/dig/setup.c                               |   34 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  259 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  123 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  413 ++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  867 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2169 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   54 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1210 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  191 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/irqflags-xen.c                   |  100 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1011 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  794 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1656 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vmlinux.lds.S                    |   16 
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1200 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  625 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  567 ++++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  464 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  842 ++++++
 drivers/xen/blkfront/block.h                        |  154 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1444 ++++++++++
 drivers/xen/blktap/common.h                         |  119 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  353 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  180 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  868 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  483 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/reboot.c                           |  384 ++
 drivers/xen/core/skbuff.c                           |  139 +
 drivers/xen/core/smpboot.c                          |  429 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  141 +
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1498 ++++++++++
 drivers/xen/netback/xenbus.c                        |  461 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 2067 ++++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  458 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  295 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  266 +
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   84 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  287 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  203 +
 drivers/xen/xenbus/xenbus_comms.h                   |   45 
 drivers/xen/xenbus/xenbus_dev.c                     |  356 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1149 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  853 ++++++
 fs/Kconfig                                          |    1 
 include/asm-generic/vmlinux.lds.h                   |    3 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   72 
 include/asm-i386/mach-xen/asm/hypercall.h           |  389 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  234 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/irqflags.h            |   80 
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/maddr.h               |  160 +
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  220 +
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   87 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  185 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  508 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   41 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  489 +++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    5 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   39 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  192 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/maddr.h                            |   81 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |   50 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  207 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  136 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  389 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   38 
 include/asm-x86_64/mach-xen/asm/irqflags.h          |   65 
 include/asm-x86_64/mach-xen/asm/maddr.h             |  139 +
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  208 +
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  558 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  498 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  264 +
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/elfnote.h                             |   90 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/xen/balloon.h                               |   67 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hvm.h                                   |   24 
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  448 +++
 include/xen/interface/arch-powerpc.h                |  115 
 include/xen/interface/arch-x86_32.h                 |  256 +
 include/xen/interface/arch-x86_64.h                 |  322 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  656 ++++
 include/xen/interface/elfnote.h                     |  133 
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/e820.h                    |   32 
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   56 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   26 
 include/xen/interface/xen.h                         |  558 ++++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  300 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  118 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   27 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 422 files changed, 88217 insertions(+), 217 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.57 -r 1.58 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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- linux-2.6-xen.patch	25 Aug 2006 21:25:44 -0000	1.57
+++ linux-2.6-xen.patch	30 Aug 2006 17:55:31 -0000	1.58
@@ -1,5 +1,5 @@
-- linux-2.6 changeset: 33681:2695586981b9
-- linux-2.6-xen-fedora changeset: 35458:b1b8e00e7a17
+- linux-2.6 changeset: 33957:421a6d428e95
+- linux-2.6-xen-fedora changeset: 35756:78332fcbe5b0
 - linux-2.6-xen changeset: 22861:0b726fcb6780
 - xen-unstable changeset: 11204:5fc1fe79083517824d89309cc618f21302724e29
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
@@ -28,9 +28,9 @@
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
---- linux-2.6/arch/i386/Kconfig	2006-08-02 02:30:18.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-08-04 16:21:32.000000000 +0200
-@@ -16,10 +16,12 @@ config X86_32
+--- linux-2.6/arch/i386/Kconfig	2006-08-28 13:44:27.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-08-30 17:53:05.000000000 +0200
+@@ -16,6 +16,7 @@ config X86_32
  
  config GENERIC_TIME
  	bool
@@ -38,12 +38,7 @@
  	default y
  
  config LOCKDEP_SUPPORT
- 	bool
-+	depends on !X86_XEN
- 	default y
- 
- config STACKTRACE_SUPPORT
-@@ -103,6 +105,15 @@ config X86_PC
+@@ -103,6 +104,15 @@ config X86_PC
  	help
  	  Choose this option if your computer is a standard PC or compatible.
  
@@ -59,7 +54,7 @@
  config X86_ELAN
  	bool "AMD Elan"
  	help
-@@ -211,6 +222,7 @@ source "arch/i386/Kconfig.cpu"
+@@ -213,6 +223,7 @@ source "arch/i386/Kconfig.cpu"
  
  config HPET_TIMER
  	bool "HPET Timer Support"
@@ -67,7 +62,7 @@
  	help
  	  This enables the use of the HPET for the kernel's internal timer.
  	  HPET is the next generation timer replacing legacy 8254s.
-@@ -261,7 +273,7 @@ source "kernel/Kconfig.preempt"
+@@ -263,7 +274,7 @@ source "kernel/Kconfig.preempt"
  
  config X86_UP_APIC
  	bool "Local APIC support on uniprocessors"
@@ -76,7 +71,7 @@
  	help
  	  A local APIC (Advanced Programmable Interrupt Controller) is an
  	  integrated interrupt controller in the CPU. If you have a single-CPU
-@@ -286,12 +298,12 @@ config X86_UP_IOAPIC
+@@ -288,12 +299,12 @@ config X86_UP_IOAPIC
  
  config X86_LOCAL_APIC
  	bool
@@ -91,7 +86,7 @@
  	default y
  
  config X86_VISWS_APIC
-@@ -301,7 +313,7 @@ config X86_VISWS_APIC
+@@ -303,7 +314,7 @@ config X86_VISWS_APIC
  
  config X86_MCE
  	bool "Machine Check Exception"
@@ -100,7 +95,7 @@
  	---help---
  	  Machine Check Exception support allows the processor to notify the
  	  kernel if it detects a problem (e.g. overheating, component failure).
-@@ -400,6 +412,7 @@ config X86_REBOOTFIXUPS
+@@ -402,6 +413,7 @@ config X86_REBOOTFIXUPS
  
  config MICROCODE
  	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
@@ -108,7 +103,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
-@@ -417,6 +430,7 @@ config MICROCODE
+@@ -419,6 +431,7 @@ config MICROCODE
  
  config X86_MSR
  	tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -116,7 +111,7 @@
  	help
  	  This device gives privileged processes access to the x86
  	  Model-Specific Registers (MSRs).  It is a character device with
-@@ -432,6 +446,10 @@ config X86_CPUID
+@@ -434,6 +447,10 @@ config X86_CPUID
  	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
  	  /dev/cpu/31/cpuid.
  
@@ -127,7 +122,7 @@
  source "drivers/firmware/Kconfig"
  
  choice
-@@ -605,7 +623,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
+@@ -607,7 +624,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
  
  config HIGHPTE
  	bool "Allocate 3rd-level pagetables from highmem"
@@ -136,7 +131,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
-@@ -614,6 +632,7 @@ config HIGHPTE
+@@ -616,6 +633,7 @@ config HIGHPTE
  
  config MATH_EMULATION
  	bool "Math emulation"
@@ -144,7 +139,7 @@
  	---help---
  	  Linux can emulate a math coprocessor (used for floating point
  	  operations) if you don't have one. 486DX and Pentium processors have
-@@ -639,6 +658,8 @@ config MATH_EMULATION
+@@ -641,6 +659,8 @@ config MATH_EMULATION
  
  config MTRR
  	bool "MTRR (Memory Type Range Register) support"
@@ -153,7 +148,7 @@
  	---help---
  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
  	  the Memory Type Range Registers (MTRRs) may be used to control
-@@ -673,7 +694,7 @@ config MTRR
+@@ -675,7 +695,7 @@ config MTRR
  
  config EFI
  	bool "Boot from EFI support"
@@ -162,7 +157,7 @@
  	default n
  	---help---
  	This enables the the kernel to boot on EFI platforms using
-@@ -691,7 +712,7 @@ config EFI
+@@ -693,7 +713,7 @@ config EFI
  
  config IRQBALANCE
   	bool "Enable kernel irq balancing"
@@ -171,7 +166,7 @@
  	default y
  	help
   	  The default yes will allow the kernel to do irq load balancing.
-@@ -739,7 +760,7 @@ source kernel/Kconfig.hz
+@@ -741,7 +761,7 @@ source kernel/Kconfig.hz
  
  config KEXEC
  	bool "kexec system call (EXPERIMENTAL)"
@@ -180,7 +175,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
-@@ -792,6 +813,7 @@ config HOTPLUG_CPU
+@@ -794,6 +814,7 @@ config HOTPLUG_CPU
  config COMPAT_VDSO
  	bool "Compat VDSO support"
  	default y
@@ -188,7 +183,7 @@
  	help
  	  Map the VDSO to the predictable old-style address too.
  	---help---
-@@ -808,18 +830,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
+@@ -810,18 +831,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
  	depends on HIGHMEM
  
  menu "Power management options (ACPI, APM)"
@@ -212,7 +207,7 @@
  	---help---
  	  APM is a BIOS specification for saving power using several different
  	  techniques. This is mostly useful for battery powered laptops with
-@@ -1004,6 +1028,7 @@ choice
+@@ -1006,6 +1029,7 @@ choice
  
  config PCI_GOBIOS
  	bool "BIOS"
@@ -220,7 +215,7 @@
  
  config PCI_GOMMCONFIG
  	bool "MMConfig"
-@@ -1011,6 +1036,13 @@ config PCI_GOMMCONFIG
+@@ -1013,6 +1037,13 @@ config PCI_GOMMCONFIG
  config PCI_GODIRECT
  	bool "Direct"
  
@@ -234,7 +229,7 @@
  config PCI_GOANY
  	bool "Any"
  
[...2685 lines suppressed...]
++ */
++#define XEN_ELFNOTE_PAE_MODE       9
++
++/*
++ * The features supported/required by this kernel (string).
++ *
++ * The string must consist of a list of feature names (as given in
++ * features.h, without the "XENFEAT_" prefix) separated by '|'
++ * characters. If a feature is required for the kernel to function
++ * then the feature name must be preceded by a '!' character.
++ *
++ * LEGACY: FEATURES
++ */
++#define XEN_ELFNOTE_FEATURES      10
++
++/*
++ * The kernel requires the symbol table to be loaded (string = "yes" or "no")
++ * LEGACY: BSD_SYMTAB (n.b. The legacy treated the presence or absence
++ * of this string as a boolean flag rather than requiring "yes" or
++ * "no".
++ */
++#define XEN_ELFNOTE_BSD_SYMTAB    11
++
++#endif /* __XEN_PUBLIC_ELFNOTE_H__ */
++
++/*
++ * Local variables:
++ * mode: C
++ * c-set-style: "BSD"
++ * c-basic-offset: 4
++ * tab-width: 4
++ * indent-tabs-mode: nil
++ * End:
++ */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/interface/event_channel.h linux-2.6-xen-fedora/include/xen/interface/event_channel.h
 --- linux-2.6/include/xen/interface/event_channel.h	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6-xen-fedora/include/xen/interface/event_channel.h	2006-07-26 16:46:37.000000000 +0200
@@ -89357,8 +89999,8 @@
 + */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/interface/sched_ctl.h linux-2.6-xen-fedora/include/xen/interface/sched_ctl.h
 --- linux-2.6/include/xen/interface/sched_ctl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/interface/sched_ctl.h	2006-07-26 16:46:37.000000000 +0200
-@@ -0,0 +1,69 @@
++++ linux-2.6-xen-fedora/include/xen/interface/sched_ctl.h	2006-08-30 19:39:13.000000000 +0200
+@@ -0,0 +1,56 @@
 +/******************************************************************************
 + * Generic scheduler control interface.
 + *
@@ -89369,7 +90011,6 @@
 +#define __XEN_PUBLIC_SCHED_CTL_H__
 +
 +/* Scheduler types. */
-+#define SCHED_BVT      0
 +#define SCHED_SEDF     4
 +#define SCHED_CREDIT   5
 +
@@ -89384,11 +90025,6 @@
 +struct sched_ctl_cmd {
 +    uint32_t sched_id;
 +    uint32_t direction;
-+    union {
-+        struct bvt_ctl {
-+            uint32_t ctx_allow;
-+        } bvt;
-+    } u;
 +};
 +
 +struct sched_adjdom_cmd {
@@ -89396,13 +90032,6 @@
 +    uint32_t direction;
 +    domid_t  domain;
 +    union {
-+        struct bvt_adjdom {
-+            uint32_t mcu_adv;      /* mcu advance: inverse of weight */
-+            uint32_t warpback;     /* warp? */
-+            int32_t  warpvalue;    /* warp value */
-+            int64_t  warpl;        /* warp limit */
-+            int64_t  warpu;        /* unwarp time requirement */
-+        } bvt;
 +        struct sedf_adjdom {
 +            uint64_t period;
 +            uint64_t slice;
@@ -91165,8 +91794,8 @@
 +
 +#endif /* __ASM_XEN_PROC_H__ */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/kernel/fork.c linux-2.6-xen-fedora/kernel/fork.c
---- linux-2.6/kernel/fork.c	2006-08-10 21:33:37.000000000 +0200
-+++ linux-2.6-xen-fedora/kernel/fork.c	2006-08-13 01:28:24.000000000 +0200
+--- linux-2.6/kernel/fork.c	2006-08-28 13:44:34.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/fork.c	2006-08-30 00:03:21.000000000 +0200
 @@ -275,6 +275,9 @@ static inline int dup_mmap(struct mm_str
  		if (retval)
  			goto out;
@@ -91177,6 +91806,17 @@
  	retval = 0;
  out:
  	up_write(&mm->mmap_sem);
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/kernel/irq/manage.c linux-2.6-xen-fedora/kernel/irq/manage.c
+--- linux-2.6/kernel/irq/manage.c	2006-08-28 13:44:34.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/irq/manage.c	2006-08-30 17:53:05.000000000 +0200
+@@ -350,7 +350,6 @@ void free_irq(unsigned int irq, void *de
+ 	struct irqaction **p;
+ 	unsigned long flags;
+ 
+-	WARN_ON(in_interrupt());
+ 	if (irq >= NR_IRQS)
+ 		return;
+ 
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/kernel/Kconfig.preempt linux-2.6-xen-fedora/kernel/Kconfig.preempt
 --- linux-2.6/kernel/Kconfig.preempt	2006-07-13 00:51:41.000000000 +0200
 +++ linux-2.6-xen-fedora/kernel/Kconfig.preempt	2006-07-26 16:46:37.000000000 +0200
@@ -91189,8 +91829,8 @@
  	  This option reduces the latency of the kernel by making
  	  all kernel code (that is not executing in a critical section)
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/lib/Kconfig.debug linux-2.6-xen-fedora/lib/Kconfig.debug
---- linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-08-04 16:21:33.000000000 +0200
+--- linux-2.6/lib/Kconfig.debug	2006-08-28 13:44:35.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-08-30 00:03:21.000000000 +0200
 @@ -325,7 +325,7 @@ config FRAME_POINTER
  
  config UNWIND_INFO
@@ -91253,8 +91893,8 @@
  
  #
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
---- linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/memory.c	2006-08-25 21:11:59.000000000 +0200
+--- linux-2.6/mm/memory.c	2006-08-28 13:44:35.000000000 +0200
++++ linux-2.6-xen-fedora/mm/memory.c	2006-08-30 00:03:21.000000000 +0200
 @@ -390,7 +390,7 @@ struct page *vm_normal_page(struct vm_ar
  
  	if (unlikely(vma->vm_flags & VM_PFNMAP)) {
@@ -91534,7 +92174,7 @@
  EXPORT_SYMBOL(br_handle_frame_hook);
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
 --- linux-2.6/net/core/skbuff.c	2006-08-23 22:51:07.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-25 02:47:31.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-30 17:53:05.000000000 +0200
 @@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -91551,7 +92191,7 @@
  
  /**
   *	alloc_skb_from_cache	-	allocate a network buffer
-@@ -210,14 +212,18 @@ nodata:
+@@ -210,14 +212,17 @@ nodata:
   */
  struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp,
  				     unsigned int size,
@@ -91560,7 +92200,6 @@
 +				     int fclone)
  {
 +	kmem_cache_t *cache;
-+	struct skb_shared_info *shinfo;
  	struct sk_buff *skb;
  	u8 *data;
  
@@ -91573,26 +92212,11 @@
  	if (!skb)
  		goto out;
  
-@@ -234,17 +240,29 @@ struct sk_buff *alloc_skb_from_cache(kme
- 	skb->data = data;
- 	skb->tail = data;
- 	skb->end  = data + size;
-+	/* make sure we initialize shinfo sequentially */
-+	shinfo = skb_shinfo(skb);
-+	atomic_set(&shinfo->dataref, 1);
-+	shinfo->nr_frags  = 0;
-+	shinfo->gso_size = 0;
-+	shinfo->gso_segs = 0;
-+	shinfo->gso_type = 0;
-+	shinfo->ip6_frag_id = 0;
-+	shinfo->frag_list = NULL;
- 
--	atomic_set(&(skb_shinfo(skb)->dataref), 1);
--	skb_shinfo(skb)->nr_frags  = 0;
--	skb_shinfo(skb)->gso_size = 0;
--	skb_shinfo(skb)->gso_segs = 0;
--	skb_shinfo(skb)->gso_type = 0;
--	skb_shinfo(skb)->frag_list = NULL;
+@@ -241,10 +246,20 @@ struct sk_buff *alloc_skb_from_cache(kme
+ 	skb_shinfo(skb)->gso_segs = 0;
+ 	skb_shinfo(skb)->gso_type = 0;
+ 	skb_shinfo(skb)->frag_list = NULL;
++
 +	if (fclone) {
 +		struct sk_buff *child = skb + 1;
 +		atomic_t *fclone_ref = (atomic_t *) (child + 1);
@@ -91610,7 +92234,7 @@
  	skb = NULL;
  	goto out;
  }
-@@ -464,6 +482,10 @@ struct sk_buff *skb_clone(struct sk_buff
+@@ -464,6 +479,10 @@ struct sk_buff *skb_clone(struct sk_buff
  	C(local_df);
  	n->cloned = 1;
  	n->nohdr = 0;



From fedora-cvs-commits at redhat.com  Wed Aug 30 18:01:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 14:01:15 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2607,1.2608
Message-ID: <200608301801.k7UI1FW3008108@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8028

Modified Files:
	kernel-2.6.spec 
Log Message:
(yes I continue putting files on one commit & the message in other, sorry)

- xen update (pre 3 hypercall breakage)
  * linux-2.6 changeset: 33957:421a6d428e95
  * linux-2.6-xen-fedora changeset: 35756:78332fcbe5b0
  * xen-unstable changeset: 11251:5fc1fe79083517824d89309cc618f21302724e29
  * get new irqflags code from linux-2.6.tip-xen.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2607
retrieving revision 1.2608
diff -u -r1.2607 -r1.2608
--- kernel-2.6.spec	30 Aug 2006 17:55:31 -0000	1.2607
+++ kernel-2.6.spec	30 Aug 2006 18:00:44 -0000	1.2608
@@ -363,9 +363,6 @@
 Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
 Patch957: linux-2.6-xen-x86-relocatable.patch
 Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
-Patch959: linux-2.6-xen-ia64-maddr.h.patch
-patch960: linux-2.6-xen-ia64-setup-fix.patch
-Patch961: linux-2.6-xen-ia64-add_hvm_op.patch
 Patch990: linux-2.6-xen-pvfb.patch
 
 #
@@ -880,11 +877,6 @@
 # ia64 xen cleanups for kexec/kdump
 %patch958 -p1
 
-%patch959 -p2
-%patch960 -p2
-
-%patch961 -p1
-
 # xen framebuffer patches
 %patch990 -p1
 
@@ -1826,6 +1818,11 @@
 * Wed Aug 30 2006 Juan Quintela <quintela at redhat.com>
 - update xen-hv to cset 11256 (pre 3 hypercall breakage).
 - remove debug=y from HV compilation.
+- xen update (pre 3 hypercall breakage)
+  * linux-2.6 changeset: 33957:421a6d428e95
+  * linux-2.6-xen-fedora changeset: 35756:78332fcbe5b0
+  * xen-unstable changeset: 11251:5fc1fe79083517824d89309cc618f21302724e29
+  * get new irqflags code from linux-2.6.tip-xen.
 
 * Wed Aug 30 2006 Jeremy Katz <katzj at redhat.com>
 - Fix up DEFAULTKERNEL for kernel-xen[0U]->kernel-xen change



From fedora-cvs-commits at redhat.com  Wed Aug 30 18:09:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 14:09:03 -0400
Subject: rpms/pyparted/FC-5 .cvsignore, 1.7, 1.8 pyparted.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <200608301809.k7UI93Va008351@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/pyparted/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8307

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
Bump version, rebuild for parted update.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyparted/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Aug 2006 14:50:49 -0000	1.7
+++ .cvsignore	30 Aug 2006 18:08:57 -0000	1.8
@@ -1 +1 @@
-pyparted-1.7.2.tar.gz
+pyparted-1.7.3.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/FC-5/pyparted.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pyparted.spec	30 Aug 2006 15:42:09 -0000	1.20
+++ pyparted.spec	30 Aug 2006 18:08:57 -0000	1.21
@@ -1,11 +1,13 @@
 Summary: python module for parted
-Name: pyparted
-Version: 1.7.2
-Release: 2%{?dist}
+Name:    pyparted
+Version: 1.7.3
+Release: 1%{?dist}
 License: GPL
-Group: System Environment/Libraries
-Source0: %{name}-%{version}.tar.gz
+Group:   System Environment/Libraries
+
+Source0: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
 Requires: parted >= 1.7.1
 BuildRequires: parted-devel >= 1.7.1, python-devel
 Requires: python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
@@ -39,6 +41,9 @@
 %{_libdir}/python?.?/site-packages/*.so
 
 %changelog
+* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 1.7.3-1
+- Include parted/constraint.h in required header files
+
 * Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 1.7.2-2
 - Require parted-1.7.1 or higher
 
@@ -54,12 +59,6 @@
 * Fri May 19 2006 David Cantrell <dcantrell at redhat.com> - 1.7.0-1
 - Bump version to 1.7.0 and require parted >= 1.7.0
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.6.10-1.2.1
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6.10-1.2
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyparted/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Aug 2006 14:50:49 -0000	1.10
+++ sources	30 Aug 2006 18:08:57 -0000	1.11
@@ -1 +1 @@
-4a79032a90f8aa9bcf5b5a606f5b1f84  pyparted-1.7.2.tar.gz
+8b156a34096a2661999a66bdfae272e6  pyparted-1.7.3.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 30 18:17:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 14:17:21 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.117,1.118
Message-ID: <200608301817.k7UIHKwM019100@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17921

Modified Files:
	epiphany.spec 
Log Message:
apply all schemas



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- epiphany.spec	29 Aug 2006 18:07:45 -0000	1.117
+++ epiphany.spec	30 Aug 2006 18:17:18 -0000	1.118
@@ -9,7 +9,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.15.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -109,6 +109,8 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/epiphany.schemas \
+  %{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas \
+  %{_sysconfdir}/gconf/schemas/epiphany-pango.schemas \
   %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas >& /dev/null
 scrollkeeper-update -q
 touch %{_datadir}/icons/hicolor
@@ -138,7 +140,10 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog README NEWS
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/gconf/schemas/epiphany.schemas
+%{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
+%{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas
+%{_sysconfdir}/gconf/schemas/epiphany-pango.schemas
 %{_bindir}/epiphany
 %{_libdir}/epiphany
 %{_datadir}/applications/*.desktop
@@ -158,6 +163,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Wed Aug 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-3.fc6
+- Install the fonts and pango schemas  (#204602)
+
 * Tue Aug 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-2.fc6
 - Use Pango by default
 - Add a BR for perl-XML-Parser



From fedora-cvs-commits at redhat.com  Wed Aug 30 18:23:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 14:23:24 -0400
Subject: rpms/pyparted/devel .cvsignore, 1.9, 1.10 pyparted.spec, 1.23,
	1.24 sources, 1.12, 1.13
Message-ID: <200608301823.k7UINOnm023843@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/pyparted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23827

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 1.7.3-1
- Include parted/constraint.h in required header files

* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 1.7.2-2
- Require parted-1.7.1 or higher



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	25 Jul 2006 17:26:46 -0000	1.9
+++ .cvsignore	30 Aug 2006 18:23:22 -0000	1.10
@@ -1 +1 @@
-pyparted-1.7.2.tar.gz
+pyparted-1.7.3.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pyparted.spec	25 Jul 2006 17:26:46 -0000	1.23
+++ pyparted.spec	30 Aug 2006 18:23:22 -0000	1.24
@@ -1,12 +1,14 @@
 Summary: python module for parted
-Name: pyparted
-Version: 1.7.2
+Name:    pyparted
+Version: 1.7.3
 Release: 1%{?dist}
 License: GPL
-Group: System Environment/Libraries
-Source0: %{name}-%{version}.tar.gz
+Group:   System Environment/Libraries
+
+Source0: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: parted >= 1.7.0
+
+Requires: parted >= 1.7.1
 BuildRequires: parted-devel >= 1.7.1, python-devel
 Requires: python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
 
@@ -39,6 +41,12 @@
 %{_libdir}/python?.?/site-packages/*.so
 
 %changelog
+* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 1.7.3-1
+- Include parted/constraint.h in required header files
+
+* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 1.7.2-2
+- Require parted-1.7.1 or higher
+
 * Tue Jul 25 2006 David Cantrell <dcantrell at redhat.com> - 1.7.2-1
 - Add HPSERVICE, PALO, PREP, and MSFT_RESERVED to partition types list
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	25 Jul 2006 17:26:46 -0000	1.12
+++ sources	30 Aug 2006 18:23:22 -0000	1.13
@@ -1 +1 @@
-4a79032a90f8aa9bcf5b5a606f5b1f84  pyparted-1.7.2.tar.gz
+8b156a34096a2661999a66bdfae272e6  pyparted-1.7.3.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 30 18:30:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 14:30:40 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.122,1.123
Message-ID: <200608301830.k7UIUexT023998@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23973

Modified Files:
	NetworkManager.spec 
Log Message:
add epochs in requirements



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- NetworkManager.spec	30 Aug 2006 15:41:14 -0000	1.122
+++ NetworkManager.spec	30 Aug 2006 18:30:38 -0000	1.123
@@ -27,7 +27,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -100,7 +100,7 @@
 %package devel
 Summary: Libraries and headers for adding NetworkManager support to applications
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: dbus-devel >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 
@@ -123,7 +123,7 @@
 %package glib-devel
 Summary: Header files for adding NetworkManager support to applications that use glib.
 Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
 Requires: %{name}-glib = %{version}-%{release}
 Requires: glib2-devel
 
@@ -240,6 +240,9 @@
 
 
 %changelog
+* Wed Aug 30 2006 Bill Nottingham <notting at redhat.com> - 1:0.6.4-4
+- add epochs in requirements
+
 * Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
 - Fix FC-5 buildreqs
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 18:31:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 14:31:36 -0400
Subject: rpms/NetworkManager/FC-5 NetworkManager.spec,1.110,1.111
Message-ID: <200608301831.k7UIVaG1024029@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/NetworkManager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24008/FC-5

Modified Files:
	NetworkManager.spec 
Log Message:
here too



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- NetworkManager.spec	30 Aug 2006 15:41:41 -0000	1.110
+++ NetworkManager.spec	30 Aug 2006 18:31:31 -0000	1.111
@@ -27,7 +27,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -100,7 +100,7 @@
 %package devel
 Summary: Libraries and headers for adding NetworkManager support to applications
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: dbus-devel >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 
@@ -123,7 +123,7 @@
 %package glib-devel
 Summary: Header files for adding NetworkManager support to applications that use glib.
 Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
 Requires: %{name}-glib = %{version}-%{release}
 Requires: glib2-devel
 
@@ -240,6 +240,9 @@
 
 
 %changelog
+* Wed Aug 30 2006 Bill Nottingham <notting at redhat.com> - 1:0.6.4-4
+- add epochs in requirements
+
 * Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
 - Fix FC-5 buildreqs
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 18:32:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 14:32:05 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2519.4.18,
	1.2519.4.19 linux-2.6-cachefiles.patch, 1.2,
	1.2.6.1 linux-2.6-ehea-ethernet-driver.patch, 1.1.2.2, 1.1.2.3
Message-ID: <200608301832.k7UIW5P5024052@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24009

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec linux-2.6-cachefiles.patch 
	linux-2.6-ehea-ethernet-driver.patch 
Log Message:
hopefully the last of the beta1 fixes
- hopefully build this ehea driver
- fix another cachefs corruption




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.18
retrieving revision 1.2519.4.19
diff -u -r1.2519.4.18 -r1.2519.4.19
--- kernel-2.6.spec	29 Aug 2006 20:15:55 -0000	1.2519.4.18
+++ kernel-2.6.spec	30 Aug 2006 18:31:55 -0000	1.2519.4.19
@@ -1789,6 +1789,10 @@
 %endif
 
 %changelog
+* Wed Aug 29 2006 Don Zickus <dzickus at redhat.com>
+- added #184752 - need to enable EHEA driver (Don Zickus)
+- added #204570 - BUG() at mm/filemap.c (David Howells)
+
 * Tue Aug 29 2006 Don Zickus <dzickus at redhat.com>
 - added #184752 - need to enable EHEA driver (Don Zickus)
 - added #203861 - cachefs corruption (Steve Grubb)

linux-2.6-cachefiles.patch:
 b/Documentation/filesystems/caching/cachefiles.txt |  281 ++++
 b/fs/Kconfig                                       |   20 
 b/fs/Makefile                                      |    1 
 b/fs/buffer.c                                      |    2 
 b/fs/cachefiles/Makefile                           |   18 
 b/fs/cachefiles/cf-bind.c                          |  279 ++++
 b/fs/cachefiles/cf-interface.c                     | 1299 +++++++++++++++++++++
 b/fs/cachefiles/cf-key.c                           |  157 ++
 b/fs/cachefiles/cf-main.c                          |  129 ++
 b/fs/cachefiles/cf-namei.c                         |  825 +++++++++++++
 b/fs/cachefiles/cf-proc.c                          |  498 ++++++++
 b/fs/cachefiles/cf-sysctl.c                        |   69 +
 b/fs/cachefiles/cf-xattr.c                         |  295 ++++
 b/fs/cachefiles/internal.h                         |  308 ++++
 b/fs/fcntl.c                                       |    2 
 b/fs/file_table.c                                  |    1 
 b/include/linux/fs.h                               |    2 
 b/include/linux/pagemap.h                          |    6 
 b/kernel/auditsc.c                                 |    2 
 b/mm/filemap.c                                     |   98 +
 fs/cachefiles/cf-interface.c                       |    6 
 21 files changed, 4296 insertions(+), 2 deletions(-)

Index: linux-2.6-cachefiles.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cachefiles.patch,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- linux-2.6-cachefiles.patch	28 Jul 2006 21:41:06 -0000	1.2
+++ linux-2.6-cachefiles.patch	30 Aug 2006 18:32:02 -0000	1.2.6.1
@@ -4768,3 +4768,41 @@
  __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
  				unsigned long nr_segs, loff_t *ppos)
 
+
+Prevent cachefiles_write_page() from issuing an error twice, instead forgoing
+the callback if it can return the error directly [BZ 204570].
+
+Previously, the netfs was being informed of the error twice, once by the error
+being passed to the netfs callback, and a second time when fscache_write_page()
+returned to the netfs.
+
+In NFS's case, this meant it attempted to do error handling twice, including
+clearing PG_fs_misc twice...
+
+I've reproduced this and tested it on my testbox using a vanilla kernel.  Steve
+Dickson has also tested it.
+
+David Howells
+---
+
+ fs/cachefiles/cf-interface.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/fs/cachefiles/cf-interface.c b/fs/cachefiles/cf-interface.c
+index 6be3d98..4c0eb31 100644
+--- a/fs/cachefiles/cf-interface.c
++++ b/fs/cachefiles/cf-interface.c
+@@ -1247,9 +1247,11 @@ #else
+ 						"write page to backing file"
+ 						" failed");
+ 		ret = -ENOBUFS;
++	} else {
++		/* only invoke the callback if successful, we return the error
++		 * directly otherwise */
++		end_io_func(page, context, ret);
+ 	}
+-
+-	end_io_func(page, context, ret);
+ #endif
+ 
+ 	_leave(" = %d", ret);

linux-2.6-ehea-ethernet-driver.patch:
 Kconfig             |    7 
 Makefile            |    1 
 ehea/Makefile       |    7 
 ehea/ehea.h         |  434 ++++++++
 ehea/ehea_ethtool.c |  325 ++++++
 ehea/ehea_hcall.h   |   52 +
 ehea/ehea_hw.h      |  319 ++++++
 ehea/ehea_main.c    | 2560 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ehea/ehea_phyp.c    | 1020 ++++++++++++++++++++
 ehea/ehea_phyp.h    |  625 ++++++++++++
 ehea/ehea_qmr.c     |  719 ++++++++++++++
 ehea/ehea_qmr.h     |  390 +++++++
 12 files changed, 6459 insertions(+)

Index: linux-2.6-ehea-ethernet-driver.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ehea-ethernet-driver.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- linux-2.6-ehea-ethernet-driver.patch	29 Aug 2006 20:15:55 -0000	1.1.2.2
+++ linux-2.6-ehea-ethernet-driver.patch	30 Aug 2006 18:32:03 -0000	1.1.2.3
@@ -6494,6 +6494,16 @@
  config IXGB
  	tristate "Intel(R) PRO/10GbE support"
  	depends on PCI
+--- linux-2.6.17.1/drivers/net/Makefile	2006-06-20 02:31:55.000000000 -0700
++++ patched_kernel/drivers/net/Makefile	2006-06-20 03:54:17.239380552 -0700
+@@ -10,6 +10,7 @@ obj-$(CONFIG_E1000) += e1000/
+ obj-$(CONFIG_IBM_EMAC) += ibm_emac/
+ obj-$(CONFIG_IXGB) += ixgb/
+ obj-$(CONFIG_CHELSIO_T1) += chelsio/
++obj-$(CONFIG_EHEA) += ehea/
+ obj-$(CONFIG_BONDING) += bonding/
+ obj-$(CONFIG_GIANFAR) += gianfar_driver.o
+
 --- linux-2.6.17-rc6-orig/drivers/net/ehea/Makefile	1969-12-31 16:00:00.000000000 -0800
 +++ kernel/drivers/net/ehea/Makefile	2006-06-09 05:29:59.170253728 -0700
 @@ -0,0 +1,7 @@



From fedora-cvs-commits at redhat.com  Wed Aug 30 18:33:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 14:33:58 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.123,1.124
Message-ID: <200608301833.k7UIXwYd024115@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24086/devel

Modified Files:
	NetworkManager.spec 
Log Message:
catch a few more



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- NetworkManager.spec	30 Aug 2006 18:30:38 -0000	1.123
+++ NetworkManager.spec	30 Aug 2006 18:33:43 -0000	1.124
@@ -83,7 +83,7 @@
 %package gnome
 Summary: GNOME applications for use with NetworkManager
 Group: Applications/Internet
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: gnome-panel
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -124,7 +124,7 @@
 Summary: Header files for adding NetworkManager support to applications that use glib.
 Group: Development/Libraries
 Requires: %{name}-devel = %{epoch}:%{version}-%{release}
-Requires: %{name}-glib = %{version}-%{release}
+Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Requires: glib2-devel
 
 %description glib-devel



From fedora-cvs-commits at redhat.com  Wed Aug 30 18:33:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 14:33:51 -0400
Subject: rpms/NetworkManager/FC-5 NetworkManager.spec,1.111,1.112
Message-ID: <200608301833.k7UIXprw024102@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/NetworkManager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24086/FC-5

Modified Files:
	NetworkManager.spec 
Log Message:
catch a few more



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- NetworkManager.spec	30 Aug 2006 18:31:31 -0000	1.111
+++ NetworkManager.spec	30 Aug 2006 18:33:41 -0000	1.112
@@ -83,7 +83,7 @@
 %package gnome
 Summary: GNOME applications for use with NetworkManager
 Group: Applications/Internet
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: gnome-panel
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -124,7 +124,7 @@
 Summary: Header files for adding NetworkManager support to applications that use glib.
 Group: Development/Libraries
 Requires: %{name}-devel = %{epoch}:%{version}-%{release}
-Requires: %{name}-glib = %{version}-%{release}
+Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Requires: glib2-devel
 
 %description glib-devel



From fedora-cvs-commits at redhat.com  Wed Aug 30 18:45:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 14:45:25 -0400
Subject: rpms/mkinitrd/FC-5 .cvsignore, 1.101, 1.102 mkinitrd.spec, 1.114,
	1.115 sources, 1.114, 1.115
Message-ID: <200608301845.k7UIjPZV024357@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/mkinitrd/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24344

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/FC-5/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	13 Mar 2006 16:57:52 -0000	1.101
+++ .cvsignore	30 Aug 2006 18:45:20 -0000	1.102
@@ -1 +1,2 @@
-mkinitrd-5.0.32.tar.bz2
+bdevid-0.4.tar.bz2
+mkinitrd-5.1.9.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/FC-5/mkinitrd.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- mkinitrd.spec	13 Mar 2006 16:57:52 -0000	1.114
+++ mkinitrd.spec	30 Aug 2006 18:45:20 -0000	1.115
@@ -1,18 +1,25 @@
+%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)[1:]")}
+
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.32
-Release: 1
+Version: 5.1.9
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
-Source: mkinitrd-%{version}.tar.bz2
+Source0: mkinitrd-%{version}.tar.bz2
+%define BDEVID_VERSION 0.4
+Source1: bdevid-%{BDEVID_VERSION}.tar.bz2
+
 ExclusiveOs: Linux
 Prereq: dev
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
 Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
-Requires: e2fsprogs >= 1.38-12
-BuildRequires: popt e2fsprogs-devel parted-devel pump-devel
-BuildRequires: device-mapper libselinux-devel libsepol-devel
+Requires: e2fsprogs >= 1.38-12, glib2, libselinux, libsepol
+BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-15, pkgconfig, glib2-devel
+BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.9
+BuildRequires: device-mapper libselinux-devel libsepol-devel, python-devel >= %{pyver}
 %ifnarch s390 s390x
 Requires: dmraid
 %endif
@@ -20,6 +27,8 @@
 Requires: ppc64-utils >= 0.3-1
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
+Provides: libbdevid = %{version}-%{release}
+Obsoletes: libbdevid < %{version}-%{release}
 
 %description
 Mkinitrd creates filesystem images for use as initial ramdisk (initrd)
@@ -36,17 +45,46 @@
 mount the root filesystem.  The mkinitrd program creates such a
 ramdisk using information found in the /etc/modules.conf file.
 
+%package devel
+Summary: C header files and library for functionality exported by libnash.
+Group: Development/Libraries
+Requires: glibc-devel, pkgconfig, e2fsprogs-devel, mkinitrd, glib2-devel
+
+%package -n libbdevid-python
+Summary: Python bindings for libbdevid
+Group: System Environment/Libraries
+Requires: glib2, e2fsprogs, libselinux, libsepol, device-mapper, mkinitrd
+Requires: python >= %{pyver}
+
+%description devel
+C header files and library for functionality exported by libnash.
+
+%description -n libbdevid-python
+Python bindings for libbdevid.
+
 %prep
-%setup -q
+%setup -q -c -a 0
+%setup -q -c -a 1
 
 %build
-make
-make test
+cd mkinitrd-%{version}
+make LIB=%{_lib}
+make LIB=%{_lib} test
 if [ $? != 0 ]; then exit 1; fi
+cd ..
+cp -a mkinitrd-%{version}/nash/libnash.a bdevid-%{BDEVID_VERSION}/bdevid/
+cp -a mkinitrd-%{version}/nash/include/nash* \
+	bdevid-%{BDEVID_VERSION}/include/
+cd bdevid-%{BDEVID_VERSION}
+make LIB=%{_lib}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
+cd mkinitrd-%{version}
+make LIB=%{_lib} BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
+cd ../bdevid-%{BDEVID_VERSION}
+make LIB=%{_lib} DESTDIR=$RPM_BUILD_ROOT install
+rm -f $RPM_BUILD_ROOT/sbin/bdevid
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,8 +99,152 @@
 %attr(755,root,root) /sbin/new-kernel-pkg
 %attr(755,root,root) /sbin/grubby
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
+/%{_lib}/bdevid
+%{_libdir}/libbdevid.so.*
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/libnash.a
+%{_libdir}/libbdevid.a
+%{_libdir}/libbdevid.so
+%{_libdir}/pkgconfig/libnash.pc
+%{_libdir}/pkgconfig/libbdevid.pc
+%{_includedir}/nash.h
+%{_includedir}/nash
+%{_includedir}/bdevid.h
+%{_includedir}/bdevid
+
+%files -n libbdevid-python
+/%{python_sitelib}/bdevid.so
 
 %changelog
+* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 5.1.9-2
+- Rebuild for new parted in FC5 (#189708)
+
+* Fri Aug 17 2006 Peter Jones <pjones at redhat.com> - 5.1.9-1
+- Fix "MOUNT_PROC_USB" warning
+
+* Wed Aug 16 2006 Peter Jones <pjones at redhat.com> - 5.1.8-1
+- Use modprobe to find module deps (#202559, #202596)
+- Fix typo for /dev/efirtc (#202110)
+
+* Wed Aug 16 2006 Peter Jones <pjones at redhat.com> - 5.1.7-1
+- Make "stabilized" work better (patch from Alexandre Oliva)
+- Rewrite usb handling (notting and pjones)
+- Fix libbdevid provides/obsoletes.
+- Include usb hcd drivers by default
+
+* Mon Aug 14 2006 Bill Nottingham <notting at redhat.com> - 5.1.6-1
+- don't make every root device /dev/loop0. Eep.
+
+* Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 5.1.5-1
+- Provide libbdevid.
+
+* Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 5.1.4-1
+- Fix requires for libbdevid
+- Make it safe to call nashLogger and nashLoggerV with no context.
+
+* Mon Aug 14 2006 Mark McLoughlin <markmc at redhat.com> - 5.1.3-2
+- Fix compile error
+
+* Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 5.1.3-1
+- replace various sed/grep/cut/head calls with bash & awk equivalents
+- fix a typo
+- nfs loop fixes
+- silence xen errors when sysfs layout is different
+
+* Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 5.1.2-1
+- pull in new libbdevid for scsi probing fix
+- restructure package so things can include libbdevid (and its modules)
+  without depending on python
+
+* Wed Jul 19 2006 Bill Nottingham <notting at redhat.com>
+- support for loopback root (including loop-over-NFS)
+
+* Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> - 5.1.1-1
+- build with -fPIC
+- pull in new libbdevid for linking fix
+
+* Mon Jul 17 2006 Jeremy Katz <katzj at redhat.com> - 5.1.0-1
+- allow rootdev/rootfs/rootopts parsing on the mkinitrd command line (notting)
+- fix case where we'd spin forever resolving a device (#199046) 
+
+* Thu Jul 13 2006 Peter Jones <pjones at redhat.com> - 5.0.47-1
+- add libbdevid
+- fix mode handling on open syscall wrapper (patch from Mark McLoughlin)
+- save dhcp lease file after network initialization (patch from markmc)
+
+* Thu Jul  6 2006 Bill Nottingham <notting at redhat.com>
+- if NFS host doesn't resolve, assume it's an IP
+- make sure IP check doesn't get extraneous info
+
+* Wed Jul  5 2006 Peter Jones <pjones at redhat.com>
+- make libnash.a and the nash-devel package
+- use libdhcp instead of pump (patch from Mark McLoughlin)
+
+* Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com> - 5.0.46-1
+- if we don't get a modalias for a net driver, try via 
+  ethtool (notting, #196104)
+- add patches from Aron Griffis (aron AT hp DOT com) for multiboot 
+  support on ia64
+
+* Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 5.0.45-1
+- don't emit <empty> for iscsi username/password stuff
+- handle _netdev option for filesystems
+
+* Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 5.0.44-1
+- fix so we only use iscsistart if we're doing root on iscsi 
+- fix spurious shell error (noticed by karsten)
+
+* Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 5.0.43-1
+- Add back patches from pjones which had just been in the package for 
+  * fix bad shell code to detect DMs in use
+  * fix "stabilized" to stat where appropriate
+  * use stabilized for sbp2
+
+* Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 5.0.42-1
+- add a hack to handle xennet devices not having a modalias (#196104)
+- initial pass at support for root on iscsi (patch from Patrick 
+  Mansfield <patmans at us.ibm.com>)
+
+* Mon Jun 12 2006 Peter Jones <pjones at redhat.com> 
+- Fixes for stateless/diskless configurations (patch from Jeff Law,
+  <law at redhat.com>)
+
+* Wed May 24 2006 Peter Jones <pjones at redhat.com> - 5.0.41-1
+- (very) basic multipath support
+- minor fixes for usb
+
+* Thu May 18 2006 Jeremy Katz <katzj at redhat.com> - 5.0.40-1
+- fix multiple netdev handling (#192321)
+
+* Tue May 10 2006 Peter Jones <pjones at redhat.com> - 5.0.39-1
+- handle [eou]hci_hcd even _more_ correctly ;)
+
+* Tue May  9 2006 Peter Jones <pjones at redhat.com> - 5.0.38-1
+- handle bringing up multiple network devices (katzj)
+- make "withusb=yes" default
+- add --without-usb
+- make usb load [euo]hci_hcd correctly
+
+* Mon May  1 2006 Jeremy Katz <katzj at redhat.com>  - 5.0.37-1
+- munge rootopts on all non-nfs cases
+
+* 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
+- 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)
+- add "status" command to see/set the exit status for testing
+- add "--remove-args" and "--update" args for new-kernel-pkg (patch from
+  Don Zickus, bz# 183917)
+
 * Mon Mar 13 2006 Peter Jones <pjones at redhat.com> - 5.0.32-1
 - handle sd_mod on scsi_mod in findmodule, not in the scsi setup.  This
   fixes the "no scsi_hostadapter" alias problem better (#182008).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/FC-5/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- sources	13 Mar 2006 18:01:59 -0000	1.114
+++ sources	30 Aug 2006 18:45:20 -0000	1.115
@@ -1 +1,2 @@
-73c36d759e845737c9571a856f6f8605  mkinitrd-5.0.32.tar.bz2
+d963851dff275f0af392cb25d3ad45fd  bdevid-0.4.tar.bz2
+f76e44bbcc67cc1ca8a7c1ecfbf1d4fc  mkinitrd-5.1.9.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 30 18:57:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 14:57:17 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs-2.15.92-redirect.patch, NONE,
	1.1 gnome-vfs2.spec, 1.130, 1.131
Message-ID: <200608301857.k7UIvH6j007366@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7354

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.15.92-redirect.patch 
Log Message:
fix error handling of http redirect


gnome-vfs-2.15.92-redirect.patch:
 http-neon-method.c |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

--- NEW FILE gnome-vfs-2.15.92-redirect.patch ---
--- gnome-vfs-2.15.91/modules/http-neon-method.c.redirect	2006-08-30 14:30:23.000000000 -0400
+++ gnome-vfs-2.15.91/modules/http-neon-method.c	2006-08-30 14:30:40.000000000 -0400
@@ -1846,8 +1846,11 @@
 		
 		result = http_follow_redirect (context);
 		
-		if (result == GNOME_VFS_OK)
+		if (result == GNOME_VFS_OK) {
 			goto propfind_start;
+		} else {
+			return result;
+		}
 	}
 
 	req = ne_propfind_get_request (pfh);
@@ -1896,12 +1899,15 @@
 	res = ne_request_dispatch (req);
 
 	if (res == NE_REDIRECT) {
-		result = http_follow_redirect (context);
-		
+		ne_request_destroy (req);
+		req = NULL;
+
+		result = http_follow_redirect (context);		
+	
 		if (result == GNOME_VFS_OK) {
-			ne_request_destroy (req);
-			req = NULL;
 			goto head_start;
+		} else {
+			return result;
 		}
 	}
 
@@ -2006,7 +2012,12 @@
 	if (res == NE_REDIRECT) {
 		ne_request_destroy (req);
 		result = http_follow_redirect (hctx);
-		goto options_start;
+		
+		if (result == GNOME_VFS_OK) {
+			goto options_start;
+		} else {
+			return result;
+		}
 	}
 
 	result = resolve_result (res, req);
@@ -2289,7 +2300,7 @@
 		
 		if (res == NE_REDIRECT) {
 			result = http_follow_redirect (hctx);
-				
+	
 			if (result == GNOME_VFS_OK)
 				goto get_start;
 		}


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gnome-vfs2.spec	21 Aug 2006 16:04:38 -0000	1.130
+++ gnome-vfs2.spec	30 Aug 2006 18:57:08 -0000	1.131
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -62,6 +62,9 @@
 # RH bug #197868
 Patch6: gnome-vfs-2.15.91-mailto-command.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=353337
+Patch7: gnome-vfs-2.15.92-redirect.patch
+
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -105,6 +108,8 @@
 
 %patch6 -p1 -b .mailto-command
 
+%patch7 -p1 -b .redirect
+
 # send to upstream
 %patch101 -p1 -b .schema_about
 
@@ -195,6 +200,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Aug 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-2
+- Make error handling for http redirect more robust (203678)
+
 * Mon Aug 21 2006 Alexander Larsson <alexl at redhat.com> - 2.15.92-1
 - update to 2.15.92
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:02:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:02:14 -0400
Subject: rpms/mkinitrd/FC-5 .cvsignore, 1.102, 1.103 mkinitrd.spec, 1.115,
	1.116 sources, 1.115, 1.116
Message-ID: <200608301902.k7UJ2ENU007574@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/mkinitrd/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7561

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
Revert to 5.0.32, rebuild for new parted in FC5 (#189708)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/FC-5/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	30 Aug 2006 18:45:20 -0000	1.102
+++ .cvsignore	30 Aug 2006 19:02:10 -0000	1.103
@@ -1,2 +1 @@
-bdevid-0.4.tar.bz2
-mkinitrd-5.1.9.tar.bz2
+mkinitrd-5.0.32.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/FC-5/mkinitrd.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mkinitrd.spec	30 Aug 2006 18:45:20 -0000	1.115
+++ mkinitrd.spec	30 Aug 2006 19:02:10 -0000	1.116
@@ -1,25 +1,18 @@
-%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)[1:]")}
-
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.1.9
-Release: 2%{?dist}
+Version: 5.0.32
+Release: 2
 License: GPL
 Group: System Environment/Base
-Source0: mkinitrd-%{version}.tar.bz2
-%define BDEVID_VERSION 0.4
-Source1: bdevid-%{BDEVID_VERSION}.tar.bz2
-
+Source: mkinitrd-%{version}.tar.bz2
 ExclusiveOs: Linux
 Prereq: dev
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
 Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
-Requires: e2fsprogs >= 1.38-12, glib2, libselinux, libsepol
-BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-15, pkgconfig, glib2-devel
-BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.9
-BuildRequires: device-mapper libselinux-devel libsepol-devel, python-devel >= %{pyver}
+Requires: e2fsprogs >= 1.38-12
+BuildRequires: popt e2fsprogs-devel parted-devel pump-devel
+BuildRequires: device-mapper libselinux-devel libsepol-devel
 %ifnarch s390 s390x
 Requires: dmraid
 %endif
@@ -27,8 +20,6 @@
 Requires: ppc64-utils >= 0.3-1
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
-Provides: libbdevid = %{version}-%{release}
-Obsoletes: libbdevid < %{version}-%{release}
 
 %description
 Mkinitrd creates filesystem images for use as initial ramdisk (initrd)
@@ -45,46 +36,17 @@
 mount the root filesystem.  The mkinitrd program creates such a
 ramdisk using information found in the /etc/modules.conf file.
 
-%package devel
-Summary: C header files and library for functionality exported by libnash.
-Group: Development/Libraries
-Requires: glibc-devel, pkgconfig, e2fsprogs-devel, mkinitrd, glib2-devel
-
-%package -n libbdevid-python
-Summary: Python bindings for libbdevid
-Group: System Environment/Libraries
-Requires: glib2, e2fsprogs, libselinux, libsepol, device-mapper, mkinitrd
-Requires: python >= %{pyver}
-
-%description devel
-C header files and library for functionality exported by libnash.
-
-%description -n libbdevid-python
-Python bindings for libbdevid.
-
 %prep
-%setup -q -c -a 0
-%setup -q -c -a 1
+%setup -q
 
 %build
-cd mkinitrd-%{version}
-make LIB=%{_lib}
-make LIB=%{_lib} test
+make
+make test
 if [ $? != 0 ]; then exit 1; fi
-cd ..
-cp -a mkinitrd-%{version}/nash/libnash.a bdevid-%{BDEVID_VERSION}/bdevid/
-cp -a mkinitrd-%{version}/nash/include/nash* \
-	bdevid-%{BDEVID_VERSION}/include/
-cd bdevid-%{BDEVID_VERSION}
-make LIB=%{_lib}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd mkinitrd-%{version}
-make LIB=%{_lib} BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
-cd ../bdevid-%{BDEVID_VERSION}
-make LIB=%{_lib} DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/sbin/bdevid
+make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,151 +61,10 @@
 %attr(755,root,root) /sbin/new-kernel-pkg
 %attr(755,root,root) /sbin/grubby
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
-/%{_lib}/bdevid
-%{_libdir}/libbdevid.so.*
-
-%files devel
-%defattr(-,root,root)
-%{_libdir}/libnash.a
-%{_libdir}/libbdevid.a
-%{_libdir}/libbdevid.so
-%{_libdir}/pkgconfig/libnash.pc
-%{_libdir}/pkgconfig/libbdevid.pc
-%{_includedir}/nash.h
-%{_includedir}/nash
-%{_includedir}/bdevid.h
-%{_includedir}/bdevid
-
-%files -n libbdevid-python
-/%{python_sitelib}/bdevid.so
 
 %changelog
-* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 5.1.9-2
-- Rebuild for new parted in FC5 (#189708)
-
-* Fri Aug 17 2006 Peter Jones <pjones at redhat.com> - 5.1.9-1
-- Fix "MOUNT_PROC_USB" warning
-
-* Wed Aug 16 2006 Peter Jones <pjones at redhat.com> - 5.1.8-1
-- Use modprobe to find module deps (#202559, #202596)
-- Fix typo for /dev/efirtc (#202110)
-
-* Wed Aug 16 2006 Peter Jones <pjones at redhat.com> - 5.1.7-1
-- Make "stabilized" work better (patch from Alexandre Oliva)
-- Rewrite usb handling (notting and pjones)
-- Fix libbdevid provides/obsoletes.
-- Include usb hcd drivers by default
-
-* Mon Aug 14 2006 Bill Nottingham <notting at redhat.com> - 5.1.6-1
-- don't make every root device /dev/loop0. Eep.
-
-* Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 5.1.5-1
-- Provide libbdevid.
-
-* Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 5.1.4-1
-- Fix requires for libbdevid
-- Make it safe to call nashLogger and nashLoggerV with no context.
-
-* Mon Aug 14 2006 Mark McLoughlin <markmc at redhat.com> - 5.1.3-2
-- Fix compile error
-
-* Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 5.1.3-1
-- replace various sed/grep/cut/head calls with bash & awk equivalents
-- fix a typo
-- nfs loop fixes
-- silence xen errors when sysfs layout is different
-
-* Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 5.1.2-1
-- pull in new libbdevid for scsi probing fix
-- restructure package so things can include libbdevid (and its modules)
-  without depending on python
-
-* Wed Jul 19 2006 Bill Nottingham <notting at redhat.com>
-- support for loopback root (including loop-over-NFS)
-
-* Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> - 5.1.1-1
-- build with -fPIC
-- pull in new libbdevid for linking fix
-
-* Mon Jul 17 2006 Jeremy Katz <katzj at redhat.com> - 5.1.0-1
-- allow rootdev/rootfs/rootopts parsing on the mkinitrd command line (notting)
-- fix case where we'd spin forever resolving a device (#199046) 
-
-* Thu Jul 13 2006 Peter Jones <pjones at redhat.com> - 5.0.47-1
-- add libbdevid
-- fix mode handling on open syscall wrapper (patch from Mark McLoughlin)
-- save dhcp lease file after network initialization (patch from markmc)
-
-* Thu Jul  6 2006 Bill Nottingham <notting at redhat.com>
-- if NFS host doesn't resolve, assume it's an IP
-- make sure IP check doesn't get extraneous info
-
-* Wed Jul  5 2006 Peter Jones <pjones at redhat.com>
-- make libnash.a and the nash-devel package
-- use libdhcp instead of pump (patch from Mark McLoughlin)
-
-* Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com> - 5.0.46-1
-- if we don't get a modalias for a net driver, try via 
-  ethtool (notting, #196104)
-- add patches from Aron Griffis (aron AT hp DOT com) for multiboot 
-  support on ia64
-
-* Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 5.0.45-1
-- don't emit <empty> for iscsi username/password stuff
-- handle _netdev option for filesystems
-
-* Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 5.0.44-1
-- fix so we only use iscsistart if we're doing root on iscsi 
-- fix spurious shell error (noticed by karsten)
-
-* Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 5.0.43-1
-- Add back patches from pjones which had just been in the package for 
-  * fix bad shell code to detect DMs in use
-  * fix "stabilized" to stat where appropriate
-  * use stabilized for sbp2
-
-* Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 5.0.42-1
-- add a hack to handle xennet devices not having a modalias (#196104)
-- initial pass at support for root on iscsi (patch from Patrick 
-  Mansfield <patmans at us.ibm.com>)
-
-* Mon Jun 12 2006 Peter Jones <pjones at redhat.com> 
-- Fixes for stateless/diskless configurations (patch from Jeff Law,
-  <law at redhat.com>)
-
-* Wed May 24 2006 Peter Jones <pjones at redhat.com> - 5.0.41-1
-- (very) basic multipath support
-- minor fixes for usb
-
-* Thu May 18 2006 Jeremy Katz <katzj at redhat.com> - 5.0.40-1
-- fix multiple netdev handling (#192321)
-
-* Tue May 10 2006 Peter Jones <pjones at redhat.com> - 5.0.39-1
-- handle [eou]hci_hcd even _more_ correctly ;)
-
-* Tue May  9 2006 Peter Jones <pjones at redhat.com> - 5.0.38-1
-- handle bringing up multiple network devices (katzj)
-- make "withusb=yes" default
-- add --without-usb
-- make usb load [euo]hci_hcd correctly
-
-* Mon May  1 2006 Jeremy Katz <katzj at redhat.com>  - 5.0.37-1
-- munge rootopts on all non-nfs cases
-
-* 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
-- 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)
-- add "status" command to see/set the exit status for testing
-- add "--remove-args" and "--update" args for new-kernel-pkg (patch from
-  Don Zickus, bz# 183917)
+* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 5.0.32-2
+- Rebuild against new parted in FC5 (#189708)
 
 * Mon Mar 13 2006 Peter Jones <pjones at redhat.com> - 5.0.32-1
 - handle sd_mod on scsi_mod in findmodule, not in the scsi setup.  This


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/FC-5/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- sources	30 Aug 2006 18:45:20 -0000	1.115
+++ sources	30 Aug 2006 19:02:10 -0000	1.116
@@ -1,2 +1 @@
-d963851dff275f0af392cb25d3ad45fd  bdevid-0.4.tar.bz2
-f76e44bbcc67cc1ca8a7c1ecfbf1d4fc  mkinitrd-5.1.9.tar.bz2
+73c36d759e845737c9571a856f6f8605  mkinitrd-5.0.32.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:16:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:16:35 -0400
Subject: rpms/evolution/devel evolution-2.7.92-chain-finalize.patch,1.2,1.3
Message-ID: <200608301916.k7UJGYiS009149@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8021

Modified Files:
	evolution-2.7.92-chain-finalize.patch 
Log Message:
- Another revision for RH bug #353472.


evolution-2.7.92-chain-finalize.patch:
 a11y/calendar/ea-cal-view-event.c                   |    2 ++
 a11y/calendar/ea-day-view-cell.c                    |    2 ++
 a11y/calendar/ea-week-view-cell.c                   |    2 ++
 a11y/e-table/gal-a11y-e-cell-registry.c             |    2 ++
 a11y/widgets/ea-calendar-cell.c                     |    2 ++
 plugins/groupwise-account-setup/camel-gw-listener.c |    2 ++
 plugins/hula-account-setup/camel-hula-listener.c    |    2 ++
 7 files changed, 14 insertions(+)

Index: evolution-2.7.92-chain-finalize.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.92-chain-finalize.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-2.7.92-chain-finalize.patch	30 Aug 2006 17:42:45 -0000	1.2
+++ evolution-2.7.92-chain-finalize.patch	30 Aug 2006 19:16:32 -0000	1.3
@@ -1,5 +1,5 @@
 --- evolution-2.7.92/a11y/widgets/ea-calendar-cell.c.chain-finalize	2005-06-17 11:20:24.000000000 -0400
-+++ evolution-2.7.92/a11y/widgets/ea-calendar-cell.c	2006-08-29 17:07:16.000000000 -0400
++++ evolution-2.7.92/a11y/widgets/ea-calendar-cell.c	2006-08-30 13:43:58.000000000 -0400
 @@ -203,6 +203,8 @@
  #ifdef ACC_DEBUG
  static void ea_calendar_cell_finalize (GObject *object)
@@ -10,7 +10,7 @@
  	g_print ("ACC_DEBUG: n_ea_calendar_cell_destroyed = %d\n",
  		n_ea_calendar_cell_destroyed);
 --- evolution-2.7.92/a11y/calendar/ea-week-view-cell.c.chain-finalize	2004-09-30 03:32:36.000000000 -0400
-+++ evolution-2.7.92/a11y/calendar/ea-week-view-cell.c	2006-08-29 17:07:16.000000000 -0400
++++ evolution-2.7.92/a11y/calendar/ea-week-view-cell.c	2006-08-30 13:43:58.000000000 -0400
 @@ -190,6 +190,8 @@
  #ifdef ACC_DEBUG
  static void ea_week_view_cell_finalize (GObject *object)
@@ -21,7 +21,7 @@
  	printf ("ACC_DEBUG: n_ea_week_view_cell_destroyed = %d\n",
  		n_ea_week_view_cell_destroyed);
 --- evolution-2.7.92/a11y/calendar/ea-day-view-cell.c.chain-finalize	2004-09-30 03:32:36.000000000 -0400
-+++ evolution-2.7.92/a11y/calendar/ea-day-view-cell.c	2006-08-29 17:07:16.000000000 -0400
++++ evolution-2.7.92/a11y/calendar/ea-day-view-cell.c	2006-08-30 13:43:58.000000000 -0400
 @@ -190,6 +190,8 @@
  #ifdef ACC_DEBUG
  static void ea_day_view_cell_finalize (GObject *object)
@@ -32,7 +32,7 @@
  	printf ("ACC_DEBUG: n_ea_day_view_cell_destroyed = %d\n",
  		n_ea_day_view_cell_destroyed);
 --- evolution-2.7.92/a11y/calendar/ea-cal-view-event.c.chain-finalize	2006-08-19 01:49:06.000000000 -0400
-+++ evolution-2.7.92/a11y/calendar/ea-cal-view-event.c	2006-08-29 17:07:16.000000000 -0400
++++ evolution-2.7.92/a11y/calendar/ea-cal-view-event.c	2006-08-30 13:43:58.000000000 -0400
 @@ -156,6 +156,8 @@
  #ifdef ACC_DEBUG
  static void ea_cal_view_finalize (GObject *object)
@@ -43,7 +43,7 @@
  	printf ("ACC_DEBUG: n_ea_cal_view_event_destroyed = %d\n",
  		n_ea_cal_view_event_destroyed);
 --- evolution-2.7.92/a11y/e-table/gal-a11y-e-cell-registry.c.chain-finalize	2005-04-29 10:13:45.000000000 -0400
-+++ evolution-2.7.92/a11y/e-table/gal-a11y-e-cell-registry.c	2006-08-29 17:07:16.000000000 -0400
++++ evolution-2.7.92/a11y/e-table/gal-a11y-e-cell-registry.c	2006-08-30 13:43:58.000000000 -0400
 @@ -28,6 +28,8 @@
  
  	g_hash_table_destroy (registry->priv->table);
@@ -53,8 +53,19 @@
  }
  
  static void
---- evolution-2.7.92/plugins/hula-account-setup/camel-hula-listener.c.chain-finalize	2006-08-30 13:39:29.000000000 -0400
-+++ evolution-2.7.92/plugins/hula-account-setup/camel-hula-listener.c	2006-08-30 13:39:55.000000000 -0400
+--- evolution-2.7.92/plugins/groupwise-account-setup/camel-gw-listener.c.chain-finalize	2006-08-30 15:10:59.000000000 -0400
++++ evolution-2.7.92/plugins/groupwise-account-setup/camel-gw-listener.c	2006-08-30 15:11:06.000000000 -0400
+@@ -118,6 +118,8 @@
+ 	}
+ 	
+ 	g_list_free (groupwise_accounts);
++
++	G_OBJECT_CLASS (parent_class)->finalize (object);
+ }
+ 
+ /*determines whehter the passed in account is groupwise or not by looking at source url */
+--- evolution-2.7.92/plugins/hula-account-setup/camel-hula-listener.c.chain-finalize	2006-01-27 11:33:56.000000000 -0500
++++ evolution-2.7.92/plugins/hula-account-setup/camel-hula-listener.c	2006-08-30 13:43:58.000000000 -0400
 @@ -116,6 +116,8 @@
  	}
  	



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:26:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:26:46 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2519.4.19,
	1.2519.4.20 linux-2.6-ehea-ethernet-driver.patch, 1.1.2.3, 1.1.2.4
Message-ID: <200608301926.k7UJQkkl023457@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23444

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec linux-2.6-ehea-ethernet-driver.patch 
Log Message:
ehea compile fixes




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.19
retrieving revision 1.2519.4.20
diff -u -r1.2519.4.19 -r1.2519.4.20
--- kernel-2.6.spec	30 Aug 2006 18:31:55 -0000	1.2519.4.19
+++ kernel-2.6.spec	30 Aug 2006 19:26:40 -0000	1.2519.4.20
@@ -1790,6 +1790,9 @@
 
 %changelog
 * Wed Aug 29 2006 Don Zickus <dzickus at redhat.com>
+- now that we build EHEA, fix it to compile
+
+* Wed Aug 29 2006 Don Zickus <dzickus at redhat.com>
 - added #184752 - need to enable EHEA driver (Don Zickus)
 - added #204570 - BUG() at mm/filemap.c (David Howells)
 

linux-2.6-ehea-ethernet-driver.patch:
 Kconfig             |    7 
 Makefile            |    1 
 ehea/Makefile       |    7 
 ehea/ehea.h         |  434 ++++++++
 ehea/ehea_ethtool.c |  325 ++++++
 ehea/ehea_hcall.h   |   52 +
 ehea/ehea_hw.h      |  319 ++++++
 ehea/ehea_main.c    | 2560 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ehea/ehea_phyp.c    | 1020 ++++++++++++++++++++
 ehea/ehea_phyp.h    |  625 ++++++++++++
 ehea/ehea_qmr.c     |  719 ++++++++++++++
 ehea/ehea_qmr.h     |  390 +++++++
 12 files changed, 6459 insertions(+)

Index: linux-2.6-ehea-ethernet-driver.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ehea-ethernet-driver.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- linux-2.6-ehea-ethernet-driver.patch	30 Aug 2006 18:32:03 -0000	1.1.2.3
+++ linux-2.6-ehea-ethernet-driver.patch	30 Aug 2006 19:26:43 -0000	1.1.2.4
@@ -1163,10 +1163,10 @@
 +	swqe->descriptors = 0;
 +	sg1entry_contains_frag_data = 0;
 +
-+	if ((dev->features & NETIF_F_TSO) && skb_shinfo(skb)->tso_size) {
++	if ((dev->features & NETIF_F_TSO) && skb_shinfo(skb)->gso_size) {
 +		/* Packet is TCP with TSO enabled */
 +		swqe->tx_control |= EHEA_SWQE_TSO;
-+		swqe->mss = skb_shinfo(skb)->tso_size;
++		swqe->mss = skb_shinfo(skb)->gso_size;
 +		/* copy only eth/ip/tcp headers to immediate data and
 +		 * the rest of skb->data to sg1entry
 +		 */



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:33:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:33:33 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.41,1.42
Message-ID: <200608301933.k7UJXX1f023608@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23596

Modified Files:
	glib-java.spec 
Log Message:
- Do not pack the *.la files.
- Move the *.so symlinks to -devel.



Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- glib-java.spec	11 Aug 2006 17:17:32 -0000	1.41
+++ glib-java.spec	30 Aug 2006 19:33:30 -0000	1.42
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.6
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 License:   LGPL
@@ -83,6 +83,9 @@
 	mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 fi
 
+# Remove unpackaged file:
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/^lib//")
@@ -103,18 +106,24 @@
 %doc doc/api AUTHORS ChangeLog COPYING INSTALL NEWS README 
 %dir %{_includedir}/%{name_base}
 %{_includedir}/%{name_base}/*
-%{_libdir}/*so*
-%{_libdir}/*la
+%{_libdir}/libglibjava-*.so
+%{_libdir}/libglibjni-*.so
 %{_datadir}/java/*.jar
 %dir %{_datadir}/%{name_base}
 %{_datadir}/%{name_base}/*
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/libglibjava.so
+%{_libdir}/libglibjni.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 0.2.6-2
+- Do not pack the *.la files.
+- Move the *.so symlinks to -devel.
+
 * Fri Aug 11 2006 Stepan Kasal <skasal at redhat.com> - 0.2.6-1
 - New upstream version.
 - Do use %%{?dist} after all.



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:36:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:36:10 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.92,1.93
Message-ID: <200608301936.k7UJaAsx023685@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23669

Modified Files:
	tomcat5.spec 
Log Message:

Rebuilding.




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- tomcat5.spec	21 Aug 2006 21:45:42 -0000	1.92
+++ tomcat5.spec	30 Aug 2006 19:36:03 -0000	1.93
@@ -69,7 +69,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.17
-Release: 6jpp.1
+Release: 6jpp.2
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -1206,6 +1206,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Wed Aug 30 2006 Deepak Bhole <dbhole at redhat.com> 5.5.17-6jpp.2
+- Rebuilding.
+
 * Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-6jpp.1
 - Merge with upstream
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:38:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:38:49 -0400
Subject: rpms/kernel/devel audit-combined.patch, 1.1.2.1,
	1.1.2.2 kernel-2.6.spec, 1.2586.2.1, 1.2586.2.2
Message-ID: <200608301938.k7UJcnTF023864@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23833

Modified Files:
      Tag: private-lspp-47-branch
	audit-combined.patch kernel-2.6.spec 
Log Message:
* Wed Aug 30 2006 Steve Grubb <sgrubb at redhat.com> lspp.48
- Applied a couple bug fixes to watch perms audit code


audit-combined.patch:
 arch/i386/kernel/audit.c           |   28 +++++++++++++++
 arch/ia64/ia32/audit.c             |   26 ++++++++++++++
 arch/ia64/kernel/audit.c           |   37 ++++++++++++++++++++
 arch/powerpc/kernel/Makefile       |    2 +
 arch/powerpc/kernel/audit.c        |   66 +++++++++++++++++++++++++++++++++++++
 arch/powerpc/kernel/audit.o        |binary
 arch/powerpc/kernel/compat_audit.c |   38 +++++++++++++++++++++
 arch/powerpc/kernel/compat_audit.o |binary
 arch/s390/kernel/Makefile          |    4 +-
 arch/s390/kernel/audit.c           |   66 +++++++++++++++++++++++++++++++++++++
 arch/s390/kernel/compat_audit.c    |   38 +++++++++++++++++++++
 arch/x86_64/ia32/audit.c           |   26 ++++++++++++++
 arch/x86_64/kernel/audit.c         |   35 +++++++++++++++++++
 include/asm-generic/audit_read.h   |    8 ++++
 include/asm-generic/audit_write.h  |   18 ++++++++++
 include/linux/audit.h              |   11 ++++++
 kernel/audit.h                     |    1 
 kernel/auditfilter.c               |   18 ++++++++++
 kernel/auditsc.c                   |   51 ++++++++++++++++++++++++++++
 19 files changed, 471 insertions(+), 2 deletions(-)

Index: audit-combined.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/audit-combined.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- audit-combined.patch	29 Aug 2006 22:55:48 -0000	1.1.2.1
+++ audit-combined.patch	30 Aug 2006 19:38:44 -0000	1.1.2.2
@@ -223,6 +223,10 @@
 +}
 +
 +__initcall(audit_classes_init);
+diff --git a/arch/powerpc/kernel/audit.o b/arch/powerpc/kernel/audit.o
+new file mode 100644
+index 0000000..d97b866
+Binary files /dev/null and b/arch/powerpc/kernel/audit.o differ
 diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c
 new file mode 100644
 index 0000000..640d4bb
@@ -267,6 +271,10 @@
 +		return 1;
 +	}
 +}
+diff --git a/arch/powerpc/kernel/compat_audit.o b/arch/powerpc/kernel/compat_audit.o
+new file mode 100644
+index 0000000..121e74d
+Binary files /dev/null and b/arch/powerpc/kernel/compat_audit.o differ
 diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
 index 86601a9..9a33ed6 100644
 --- a/arch/s390/kernel/Makefile
@@ -532,7 +540,7 @@
 +__NR_bind,		/* bind can affect fs object only in one way... */
 +#endif
 diff --git a/include/linux/audit.h b/include/linux/audit.h
-index 64f9f9e..29d1737 100644
+index 64f9f9e..40a6c26 100644
 --- a/include/linux/audit.h
 +++ b/include/linux/audit.h
 @@ -132,6 +132,10 @@ #define AUDIT_CLASS_DIR_WRITE 0
@@ -561,7 +569,7 @@
 +#define AUDIT_PERM_EXEC		1
 +#define AUDIT_PERM_WRITE	2
 +#define AUDIT_PERM_READ		4
-+#define AUDIT_PERM_ATTR		4
++#define AUDIT_PERM_ATTR		8
 +
  struct audit_status {
  	__u32		mask;		/* Bit mask for valid entries */
@@ -637,14 +645,22 @@
  			goto exit_free;
  		}
 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index efc1b74..74d9f50 100644
+index efc1b74..1bd8827 100644
 --- a/kernel/auditsc.c
 +++ b/kernel/auditsc.c
-@@ -209,6 +209,46 @@ #if AUDIT_DEBUG
+@@ -209,6 +209,54 @@ #if AUDIT_DEBUG
  #endif
  };
  
-+#define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
++#define ACC_MODE(x) ("\004\002\006\006"[(x)&O_ACCMODE])
++static inline int open_arg(int flags, int mask)
++{
++	int n = ACC_MODE(flags);
++	if (flags & (O_TRUNC | O_CREAT))
++		n |= AUDIT_PERM_WRITE;
++	return n & mask;
++}
++
 +static int audit_match_perm(struct audit_context *ctx, int mask)
 +{
 +	unsigned n = ctx->major;
@@ -687,7 +703,7 @@
  /* Determine if any context name data matches a rule's watch data */
  /* Compare a task_struct with an audit_rule.  Return 1 on match, 0
   * otherwise. */
-@@ -397,6 +437,9 @@ static int audit_filter_rules(struct tas
+@@ -397,6 +445,9 @@ static int audit_filter_rules(struct tas
  			/* ignore this field for filtering */
  			result = 1;
  			break;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2586.2.1
retrieving revision 1.2586.2.2
diff -u -r1.2586.2.1 -r1.2586.2.2
--- kernel-2.6.spec	29 Aug 2006 22:55:48 -0000	1.2586.2.1
+++ kernel-2.6.spec	30 Aug 2006 19:38:45 -0000	1.2586.2.2
@@ -31,7 +31,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag .lspp.47
+%define tag .lspp.48
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%tag
 %define signmodules 0
 %define xen_hv_cset 11057
@@ -1755,6 +1755,9 @@
 %endif
 
 %changelog
+* Wed Aug 30 2006 Steve Grubb <sgrubb at redhat.com> lspp.48
+- Applied a couple bug fixes to watch perms audit code
+
 * Tue Aug 29 2006 Steve Grubb <sgrubb at redhat.com> lspp.47
 - fix for ppid & support for perms field in audit code
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:42:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:42:03 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.42,1.43
Message-ID: <200608301942.k7UJg3B1024050@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24038

Modified Files:
	glib-java.spec 
Log Message:
Fix typo.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- glib-java.spec	30 Aug 2006 19:33:30 -0000	1.42
+++ glib-java.spec	30 Aug 2006 19:42:01 -0000	1.43
@@ -83,7 +83,7 @@
 	mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 fi
 
-# Remove unpackaged file:
+# Remove unpackaged files:
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 # install the src zip and make a sym link



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:49:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:49:41 -0400
Subject: rpms/cairo-java/devel cairo-java.spec,1.37,1.38
Message-ID: <200608301949.k7UJnfDo007054@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7040

Modified Files:
	cairo-java.spec 
Log Message:
- Do not pack the *.la files.
- Move the *.so symlinks to -devel.
- Do not do `rm *.a'--there are not any.



Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cairo-java.spec	12 Aug 2006 17:25:00 -0000	1.37
+++ cairo-java.spec	30 Aug 2006 19:49:38 -0000	1.38
@@ -15,7 +15,7 @@
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	1.0.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -45,8 +45,7 @@
 Requires:	glib-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
+Development part of %{name}.
 
 %prep
 
@@ -76,13 +75,15 @@
 rm -rf %{buildroot}
 
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name}' ] ; then
 	mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
 fi
 
+# Remove unpackaged files:
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/^lib//")
@@ -92,11 +93,8 @@
 popd
 
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
@@ -104,17 +102,24 @@
 %files
 %defattr(-,root,root)
 %doc doc/api AUTHORS ChangeLog COPYING INSTALL README NEWS 
-%{_libdir}/*so* 
-%{_libdir}/*la
+%{_libdir}/libcairojava-*.so
+%{_libdir}/libcairojni-*.so
 %{_datadir}/java/*
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libcairojava*.so
+%{_libdir}/libcairojni*.so
 %{_datadir}/java/*.zip
 
 
 %changelog
+* Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 1.0.5-2
+- Do not pack the *.la files.
+- Move the *.so symlinks to -devel.
+- Do not do `rm *.a'--there are not any.
+
 * Sat Aug 12 2006 Stepan Kasal <skasal at redhat.com> - 1.0.5-1
 - New upstream version.
 - Use the %%{?dist} tag.



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:52:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:52:33 -0400
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.62,1.63
Message-ID: <200608301952.k7UJqXGq007132@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7119

Modified Files:
	libgtk-java.spec 
Log Message:
- Do not pack the *.la files.
- Move the *.so symlinks to -devel.



Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- libgtk-java.spec	13 Aug 2006 20:08:27 -0000	1.62
+++ libgtk-java.spec	30 Aug 2006 19:52:31 -0000	1.63
@@ -18,7 +18,7 @@
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.8.6
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -90,6 +90,9 @@
 	mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 fi
 
+# Remove unpackaged files:
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
@@ -99,11 +102,8 @@
 popd
 
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
@@ -113,8 +113,8 @@
 %doc doc/api AUTHORS COPYING INSTALL README NEWS THANKS FAQ.html doc/examples
 %dir %{_includedir}/%{name_base}
 %{_includedir}/%{name_base}/*
-%{_libdir}/*so*
-%{_libdir}/*la
+%{_libdir}/libgtkjava-*.so
+%{_libdir}/libgtkjni-*.so
 %{_datadir}/java/*.jar
 %dir %{_datadir}/%{name_base}
 %{_datadir}/%{name_base}/*
@@ -122,10 +122,16 @@
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libgtkjava*.so
+%{_libdir}/libgtkjni*.so
 %{_datadir}/java/*.zip
 
 
 %changelog
+* Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 2.8.6-3
+- Do not pack the *.la files.
+- Move the *.so symlinks to -devel.
+
 * Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.8.6-2
 - Implement a temporary workaround for #197460.
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:53:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:53:31 -0400
Subject: rpms/mesa/devel mesa.spec, 1.96, 1.97 redhat-mesa-driver-install,
	1.9, NONE redhat-mesa-target, 1.2, NONE
Message-ID: <200608301953.k7UJrVN3007191@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7178

Modified Files:
	mesa.spec 
Removed Files:
	redhat-mesa-driver-install redhat-mesa-target 
Log Message:
* Tue Aug 29 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc2.fc6
- Rebase to 6.5.1 RC2.
- Get rid of redhat-mesa-driver-install and redhat-mesa-target helper
  scripts and clean up specfile a bit.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mesa.spec	30 Aug 2006 07:06:22 -0000	1.96
+++ mesa.spec	30 Aug 2006 19:53:29 -0000	1.97
@@ -12,17 +12,32 @@
 %if %{build_rhel}
 %define with_dri_ppc 0
 %endif
-# Define arches to make with_dri enabled by default
-%ifarch %{ix86} x86_64 ia64 alpha
+
+# Architechture specific configuration
+%ifarch %{ix86}
+%define with_dri 1
+%define dri_target linux-dri-x86
+%endif
+
+%ifarch x86_64
+%define with_dri 1
+%define dri_target linux-dri-x86-64
+%endif
+
+%ifarch ia64 alpha sparc sparc64
 %define with_dri 1
+%define dri_target linux-dri
 %endif
-# Define PPC OS variant override.
+
 %ifarch ppc
 %define with_dri %{with_dri_ppc}
+%define dri_target linux-dri-ppc
 %endif
+
 # Define arches to make with_dri disabled by default
 %ifarch ppc64 s390 s390x
 %define with_dri 0
+%define dri_target linux-indirect
 %endif
 
 # NOTE: Allow libGLw to be disabled since nothing in Fedora Core uses it
@@ -42,8 +57,6 @@
 
 Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.5.1-rc2.tar.bz2
 Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-6.5.1-rc2.tar.bz2
-Source10: redhat-mesa-target
-Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
 
 # Patches 0-9 reserved for mesa Makefiles/config fixes
@@ -289,8 +302,6 @@
 %prep
 %setup -q -n Mesa-%{version} -b1
 # Copy Red Hat Mesa build/install simplificomplication scripts into build dir.
-install -m 755 %{SOURCE10} ./
-install -m 755 %{SOURCE11} ./
 install -m 755 %{SOURCE12} ./
 
 %patch0 -p1 -b .build-config
@@ -311,65 +322,46 @@
 %build
 export OPT_FLAGS="$RPM_OPT_FLAGS"
 export DRI_DRIVER_DIR="%{_libdir}/dri"
-
-# NOTE: We use a custom script to determine which Mesa build target should
-# be used, and reduce spec file clutter.
-MESATARGET="$(./redhat-mesa-target %{with_dri} %{_arch})"
-#DRIVER_DIRS="dri osmesa"
+export LIB_DIR=%{_lib}
 
 mkdir preserve
 
-echo "Building osmesa"
-make linux-osmesa
-mv %{_lib}/* preserve
-make -s realclean
-
-echo "Building osmesa16"
-make linux-osmesa16
-mv %{_lib}/* preserve
-make -s realclean
-
-echo "Building osmesa32"
-make linux-osmesa32
-mv %{_lib}/* preserve
-make -s realclean
+for t in osmesa osmesa16 osmesa32; do
+    echo "Building $t"
+    make linux-$t
+    mv %{_lib}/* preserve
+    make -s realclean
+done
 
-echo "Building $MESATARGET"
-make ${MESATARGET}
+echo "Building %{dri_target}"
+make %{dri_target}
 make -C progs/xdemos glxgears glxinfo
 mv preserve/* %{_lib}
-cd %{_lib}
-ln -s libOSMesa.so.6 libOSMesa.so 
-ln -s libOSMesa16.so.6 libOSMesa16.so
-ln -s libOSMesa32.so.6 libOSMesa32.so
-cd ..
+ln -s libOSMesa.so.6 %{_lib}/libOSMesa.so 
+ln -s libOSMesa16.so.6 %{_lib}/libOSMesa16.so
+ln -s libOSMesa32.so.6 %{_lib}/libOSMesa32.so
 
 #-- Install ----------------------------------------------------------
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # The mesa build system is broken beyond repair.  The lines below just
-# handpick and install the parts we want.
-
-export INSTALL_DIR=%{_prefix}
-export LIB_DIR=%{_lib}
+# handpick and manually install the parts we want.
 
-make -C src/glw install
-make -C src/glu install
-make -C src/mesa install
-cp -d -f %{_lib}/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
+make -C src/glw install INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix}
+make -C src/glu install INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix}
+install -m 644 include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
+cp -d -f %{_lib}/lib* $RPM_BUILD_ROOT%{_libdir}
+install -d $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 progs/xdemos/glxgears $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 progs/xdemos/glxinfo $RPM_BUILD_ROOT%{_bindir}
 
 %if %{with_dri}
-#pushd src/mesa/drivers/dri
-#    make install DESTDIR=$RPM_BUILD_ROOT/usr %{makeopts}
-#popd
-# NOTE: Since Mesa's install target does not seem to properly install the
-# DRI modules, we install them by hand here.  -- mharris
-export DRIMODULE_SRCDIR="%{_lib}"
-export DRIMODULE_DESTDIR="$RPM_BUILD_ROOT%{_libdir}/dri"
-./redhat-mesa-driver-install %{_arch}
+install -d $RPM_BUILD_ROOT%{_libdir}/dri
+for f in i810 i915 i965 mga r128 r200 r300 radeon savage sis tdfx unichrome; do
+    so=%{_lib}/${f}_dri.so
+    test -e $so && install -m 0755 $so  $RPM_BUILD_ROOT%{_libdir}/dri
+done
 %endif
 
 # Run custom source filelist generator script, passing it a prefix
@@ -402,11 +394,8 @@
 %if %{with_dri}
 # DRI modules
 %dir %{_libdir}/dri
-# NOTE: This is a glob for now, as we explicitly determine and limit the DRI
-# drivers that are installed on a given OS/arch combo in our custom DRI
-# driver install script.  If the upstream install script improves enough to
-# make our script unnecessary, we might want to change to an explicit file
-# manifest here in the future.
+# We only install drivers that get build and are in our white list so
+# we can just glob here.
 %{_libdir}/dri/*_dri.so
 %endif
 
@@ -427,7 +416,6 @@
 %{_includedir}/GL/mesa_wgl.h
 %{_includedir}/GL/mglmesa.h
 %{_includedir}/GL/svgamesa.h
-#%{_includedir}/GL/uglglutshapes.h
 %{_includedir}/GL/uglmesa.h
 %{_includedir}/GL/vms_x_fix.h
 %{_includedir}/GL/wmesa.h
@@ -487,6 +475,8 @@
 %changelog
 * Tue Aug 29 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc2.fc6
 - Rebase to 6.5.1 RC2.
+- Get rid of redhat-mesa-driver-install and redhat-mesa-target helper
+  scripts and clean up specfile a bit.
 
 * Mon Aug 28 2006 Kristian H??gsberg <krh at redhat.com> - 6.5.1-0.rc1.2.fc6
 - Drop upstreamed patches mesa-6.5-texture-from-pixmap-fixes.patch and


--- redhat-mesa-driver-install DELETED ---


--- redhat-mesa-target DELETED ---



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:55:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:55:49 -0400
Subject: rpms/libgnome-java/devel libgnome-java.spec,1.40,1.41
Message-ID: <200608301955.k7UJtnqt007274@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7261

Modified Files:
	libgnome-java.spec 
Log Message:
- Do not pack the *.la files.
- Move the *.so symlinks to -devel.



Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libgnome-java.spec	13 Aug 2006 20:13:58 -0000	1.40
+++ libgnome-java.spec	30 Aug 2006 19:55:47 -0000	1.41
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
 Version:	2.12.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -81,6 +81,9 @@
         mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
 fi
 
+# Remove unpackaged files:
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
@@ -89,11 +92,9 @@
 ln -sf $jarname$jarversion-src-%{version}.zip $jarname$jarversion-src.zip
 popd
 
-%post
-/sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
@@ -101,16 +102,22 @@
 %files
 %defattr(-,root,root)
 %doc doc/api AUTHORS COPYING NEWS README
-%{_libdir}/*so*
-%{_libdir}/*la
+%{_libdir}/libgnomejava-*.so
+%{_libdir}/libgnomejni-*.so
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libgnomejava*.so
+%{_libdir}/libgnomejni*.so
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-2
+- Do not pack the *.la files.
+- Move the *.so symlinks to -devel.
+
 * Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-1
 - New upstream version.
 - Use the %%{?dist} tag.



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:57:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:57:57 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.326, 1.327 anaconda.spec, 1.452,
	1.453 sources, 1.449, 1.450
Message-ID: <200608301957.k7UJvvN6007433@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7411/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.88-1 on branch devel from anaconda-11.1.0.88-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- .cvsignore	30 Aug 2006 16:29:40 -0000	1.326
+++ .cvsignore	30 Aug 2006 19:57:55 -0000	1.327
@@ -1 +1 @@
-anaconda-11.1.0.87.tar.bz2
+anaconda-11.1.0.88.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- anaconda.spec	30 Aug 2006 16:29:40 -0000	1.452
+++ anaconda.spec	30 Aug 2006 19:57:55 -0000	1.453
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.87
+Version: 11.1.0.88
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Aug 30 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.88-1
+- Fix a case where images don't exist (#204648)
+- More making pkgorder quieter
+
 * Wed Aug 30 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.87-1
 - Fix traceback on editing lvm (#204631)
 - Fix SELinux context setting


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- sources	30 Aug 2006 16:29:40 -0000	1.449
+++ sources	30 Aug 2006 19:57:55 -0000	1.450
@@ -1 +1 @@
-6b90e3c16dd9f7ae86be7ce1d41403e1  anaconda-11.1.0.87.tar.bz2
+64dd2ca8e0527acf005421115d796ea9  anaconda-11.1.0.88.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Aug 30 19:59:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 15:59:34 -0400
Subject: rpms/cairo-java/devel cairo-java.spec,1.38,1.39
Message-ID: <200608301959.k7UJxYIW007521@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7507

Modified Files:
	cairo-java.spec 
Log Message:
fix typo


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- cairo-java.spec	30 Aug 2006 19:49:38 -0000	1.38
+++ cairo-java.spec	30 Aug 2006 19:59:32 -0000	1.39
@@ -109,8 +109,8 @@
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/libcairojava*.so
-%{_libdir}/libcairojni*.so
+%{_libdir}/libcairojava.so
+%{_libdir}/libcairojni.so
 %{_datadir}/java/*.zip
 
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:00:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:00:26 -0400
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.63,1.64
Message-ID: <200608302000.k7UK0PI8007593@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7580

Modified Files:
	libgtk-java.spec 
Log Message:
Fix typo.


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- libgtk-java.spec	30 Aug 2006 19:52:31 -0000	1.63
+++ libgtk-java.spec	30 Aug 2006 20:00:14 -0000	1.64
@@ -122,8 +122,8 @@
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/libgtkjava*.so
-%{_libdir}/libgtkjni*.so
+%{_libdir}/libgtkjava.so
+%{_libdir}/libgtkjni.so
 %{_datadir}/java/*.zip
 
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:02:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:02:39 -0400
Subject: rpms/libgnome-java/devel libgnome-java.spec,1.41,1.42
Message-ID: <200608302002.k7UK2dw6007697@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7626

Modified Files:
	libgnome-java.spec 
Log Message:
Fix typo.


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libgnome-java.spec	30 Aug 2006 19:55:47 -0000	1.41
+++ libgnome-java.spec	30 Aug 2006 20:02:04 -0000	1.42
@@ -109,8 +109,8 @@
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/libgnomejava*.so
-%{_libdir}/libgnomejni*.so
+%{_libdir}/libgnomejava.so
+%{_libdir}/libgnomejni.so
 %{_datadir}/java/*.zip
 
 %changelog



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:07:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:07:17 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.36,1.37
Message-ID: <200608302007.k7UK7HS1007820@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7807

Modified Files:
	libgconf-java.spec 
Log Message:
- Do not pack the *.la files.
- Move the *.so symlinks to -devel.



Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libgconf-java.spec	13 Aug 2006 20:50:31 -0000	1.36
+++ libgconf-java.spec	30 Aug 2006 20:07:15 -0000	1.37
@@ -3,7 +3,7 @@
 Summary:	Java bindings for GConf
 Name:		%{name_base}
 Version:	2.12.4
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -62,6 +62,9 @@
         mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 fi
 
+# Remove unpackaged files:
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)
 jarname=$(echo -n %{name} | cut -d - -f 1 | sed "s/lib//")
@@ -70,11 +73,9 @@
 ln -sf $jarname$jarversion-src-%{version}.zip $jarname$jarversion-src.zip
 popd
 
-%post
-/sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
@@ -82,16 +83,22 @@
 %files
 %defattr(-,root,root)
 %doc doc/api AUTHORS COPYING doc/examples NEWS README
-%{_libdir}/*so*
-%{_libdir}/*la
+%{_libdir}/libgconfjava-*.so
+%{_libdir}/libgconfjni-*.so
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libgconfjava.so
+%{_libdir}/libgconfjni.so
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-3
+- Do not pack the *.la files.
+- Move the *.so symlinks to -devel.
+
 * Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-2
 - Fix the description of the -devel package.
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:11:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:11:47 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.37,1.38
Message-ID: <200608302011.k7UKBllA007902@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7876

Modified Files:
	libgconf-java.spec 
Log Message:
Fix typo.


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libgconf-java.spec	30 Aug 2006 20:07:15 -0000	1.37
+++ libgconf-java.spec	30 Aug 2006 20:11:44 -0000	1.38
@@ -63,7 +63,7 @@
 fi
 
 # Remove unpackaged files:
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:19:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:19:02 -0400
Subject: rpms/libvte-java/devel libvte-java.spec,1.25,1.26
Message-ID: <200608302019.k7UKJ20M023341@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23327

Modified Files:
	libvte-java.spec 
Log Message:
- Do not pack the *.la files.
- Move the *.so symlinks to -devel.



Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libvte-java.spec	15 Aug 2006 13:17:15 -0000	1.25
+++ libvte-java.spec	30 Aug 2006 20:18:59 -0000	1.26
@@ -1,7 +1,7 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
 Version:   0.12.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
 License:   LGPL
@@ -67,6 +67,9 @@
 	mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 fi
 
+# Remove unpackaged files:
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)
 jarname=$(echo -n %{name} | cut -d - -f 1 | sed "s/^lib//")
@@ -85,16 +88,22 @@
 %files
 %defattr(-,root,root,-)
 %doc doc/api AUTHORS ChangeLog COPYING INSTALL NEWS README 
-%{_libdir}/*so*
-%{_libdir}/*la
+%{_libdir}/libvtejava-*.so
+%{_libdir}/libvtejni-*.so
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libvtejava.so
+%{_libdir}/libvtejni.so
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 0.12.1-3
+- Do not pack the *.la files.
+- Move the *.so symlinks to -devel.
+
 * Tue Aug 15 2006 Stepan Kasal <skasal at redhat.com> - 0.12.1-2
 - Add libvte-java-alias.patch, which reimplements the old methods,
   with a typo in their name.



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:19:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:19:58 -0400
Subject: rpms/mesa/devel mesa.spec,1.97,1.98
Message-ID: <200608302019.k7UKJw4B023369@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23354

Modified Files:
	mesa.spec 
Log Message:
More mesa build system hand holding.


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- mesa.spec	30 Aug 2006 19:53:29 -0000	1.97
+++ mesa.spec	30 Aug 2006 20:19:56 -0000	1.98
@@ -348,8 +348,8 @@
 # The mesa build system is broken beyond repair.  The lines below just
 # handpick and manually install the parts we want.
 
-make -C src/glw install INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix}
-make -C src/glu install INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix}
+make -C src/glw install INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix} LIB_DIR=%{_lib}
+make -C src/glu install INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix} LIB_DIR=%{_lib}
 install -m 644 include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
 cp -d -f %{_lib}/lib* $RPM_BUILD_ROOT%{_libdir}
 install -d $RPM_BUILD_ROOT%{_bindir}



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:20:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:20:41 -0400
Subject: rpms/libglade-java/devel libglade-java.spec,1.44,1.45
Message-ID: <200608302020.k7UKKfGv023457@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23409

Modified Files:
	libglade-java.spec 
Log Message:
- Do not pack the *.la files.
- Move the *.so symlinks to -devel.



Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libglade-java.spec	13 Aug 2006 21:13:38 -0000	1.44
+++ libglade-java.spec	30 Aug 2006 20:20:39 -0000	1.45
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.12.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -79,6 +79,9 @@
 	mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 fi
 
+# Remove unpackaged files:
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//") 
@@ -97,16 +100,22 @@
 %files
 %defattr(-,root,root)
 %doc doc/api AUTHORS COPYING NEWS README
-%{_libdir}/*so*
-%{_libdir}/*la
+%{_libdir}/libgladejava-*.so
+%{_libdir}/libgladejni-*.so
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libgladejava.so
+%{_libdir}/libgladejni.so
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 2.12.5-2
+- Do not pack the *.la files.
+- Move the *.so symlinks to -devel.
+
 * Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.5-1
 - New upstream version.
 - Use the %%{?dist} tag.



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:21:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:21:39 -0400
Subject: rpms/libgnome-java/devel libgnome-java.spec,1.42,1.43
Message-ID: <200608302021.k7UKLdVS023532@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23504

Modified Files:
	libgnome-java.spec 
Log Message:
Fix typo.


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libgnome-java.spec	30 Aug 2006 20:02:04 -0000	1.42
+++ libgnome-java.spec	30 Aug 2006 20:21:37 -0000	1.43
@@ -82,7 +82,7 @@
 fi
 
 # Remove unpackaged files:
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:21:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:21:45 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.43,1.44
Message-ID: <200608302021.k7UKLj0U023553@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23534

Modified Files:
	glib-java.spec 
Log Message:
Fix a typo.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- glib-java.spec	30 Aug 2006 19:42:01 -0000	1.43
+++ glib-java.spec	30 Aug 2006 20:21:41 -0000	1.44
@@ -84,7 +84,7 @@
 fi
 
 # Remove unpackaged files:
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:22:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:22:47 -0400
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.64,1.65
Message-ID: <200608302022.k7UKMl1a023630@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23617

Modified Files:
	libgtk-java.spec 
Log Message:
Fix a typo.


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- libgtk-java.spec	30 Aug 2006 20:00:14 -0000	1.64
+++ libgtk-java.spec	30 Aug 2006 20:22:44 -0000	1.65
@@ -91,7 +91,7 @@
 fi
 
 # Remove unpackaged files:
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:34:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:34:19 -0400
Subject: rpms/kexec-tools/devel kcp.c, 1.3, 1.4 kdump.conf, 1.2, 1.3 mkdumprd,
	1.4, 1.5
Message-ID: <200608302034.k7UKYJsS023826@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23812

Modified Files:
	kcp.c kdump.conf mkdumprd 
Log Message:
fixing kcp.c typo and making scp work in mkdumprd


Index: kcp.c
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kcp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kcp.c	24 Aug 2006 11:55:28 -0000	1.3
+++ kcp.c	30 Aug 2006 20:34:16 -0000	1.4
@@ -159,7 +159,6 @@
 		/*need to include login info if scp to remote host*/
 		if (using_ssh)
 			path=new_dst; 
-			src, path;
 		if (execlp("scp", "scp", "-q", "-o", "BatchMode=yes", "-o",
 			"StrictHostKeyChecking=no", src, path, NULL) < 0) {
 			perror("Failed to run scp\n");


Index: kdump.conf
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdump.conf	18 Aug 2006 17:00:45 -0000	1.2
+++ kdump.conf	30 Aug 2006 20:34:16 -0000	1.3
@@ -14,6 +14,12 @@
 #			<user at location>:/var/crash/%DATE/, supports DNS
 # <fs type> - will mount -t <fs type> /mnt and copy /proc/vmcore to 
 #			/mnt/var/crash/%DATE/
+# ifc <interface> - instead of bringing up the interface that is normally associated
+#                   with the next hop of the ip address you plan to use with scp or nfs
+#                   activate this interface instead.  This is sometimes needed in the event
+#                   that the kdump kernel assigns your interface a different name, given
+#                   that it only loads the driver needed for the specific interface you are
+#                   going to use
 # default reboot - if all of the above fail, then reboot the system 
 #			and accept the /proc/vmcore is lost, else 
 #			comment out 'default' to fall through and fix 


Index: mkdumprd
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mkdumprd	24 Aug 2006 11:55:28 -0000	1.4
+++ mkdumprd	30 Aug 2006 20:34:16 -0000	1.5
@@ -413,7 +413,13 @@
 	    IPSTR="$IPSTR --dns $DNS1"
 	fi
     fi
+    #when kdump boots the netdevice name might be different.  this 
+    #lets us override the name we normally think it is
+    if [ -n "$KDUMP_IFC" ]; then
+        dev=$KDUMP_IFC
+    fi
     network="network --device $dev --bootproto $BOOTPROTO $IPSTR"
+    
 }
 
 while [ $# -gt 0 ]; do
@@ -819,7 +825,6 @@
     error "Error creating temporaries.  Try again"
     exit 1
 fi
-
 if [ -n "$KDUMP_CONFIG_FILE" ]; then
     while read type location; do
 
@@ -833,7 +838,7 @@
             #find ethernet device used to route to remote host, ie eth0
             netdev=`/sbin/ip route get to $rhost 2>&1`
             [ $? != 0 ] && echo "Bad kdump location: $location" && continue
-            netdev=`echo $netdev|awk '{print $5;}'|head -n 1`
+            netdev=`echo $netdev|awk '{print $3;}'|head -n 1`
            
             #add the ethernet device to the list of modules 
             handlenetdev $netdev
@@ -841,6 +846,12 @@
             #load nfs modules, if needed 
             echo $location | grep -v "@" > /dev/null && findmodule nfs
             ;;
+        ifc)
+            KDUMP_IFC=$location
+            if [ -n "$network" ]; then
+                network=`echo $network | sed -e's/\(^.* \)\('$netdev'\)\( .*$\)/\1 '$KDUMP_IFC' \3/'`
+            fi
+            ;;
         *)
             ;;
         esac
@@ -945,6 +956,7 @@
 for i in 0 1 2 3 ; do
     emit "mknod /dev/ttyS$i c 4 $(($i + 64))"
 done
+emit "mknod /dev/mem c 1 1"
 
 emit "echo Setting up hotplug."
 emit "hotplug"
@@ -1036,7 +1048,7 @@
     
     #timezone info for date which outputs YYYY-MM-DD-hh:mm
     cp /etc/localtime $MNTIMAGE/etc/localtime
-    bin="/sbin/reboot /sbin/kcp"
+    bin="/sbin/reboot /sbin/kcp /bin/mkdir"
     
     #traverse the config file and setup each dump location
     while read type location; do
@@ -1061,6 +1073,14 @@
                     ;;
 
                 net)
+                    #ssh, scp require libraries that aren't found with ldd
+                    lib=/lib && [ -d "/lib64" ] && lib=/lib64
+                    k_extras="/$lib/libnss_compat.so.2 /$lib/libnss_files.so.2"
+            
+                    # bring up the network
+                    emit "echo Bring up network"
+                    emit $network
+
                     #grab remote host and xlate into numbers
                     rhost=`echo $location | sed 's/.*@//' | cut -d':' -f1`
                     need_dns=`echo $rhost|grep [a-zA-Z]`
@@ -1126,12 +1146,10 @@
                         emit "cond kcp --ssh /proc/vmcore $rlocation:/var/crash/$lhost-%DATE/vmcore"
                         emit "cond reboot -h -f"
                         bin="$bin /usr/bin/scp /usr/bin/ssh /bin/dd"
-                        
-                        #ssh, scp require libraries that aren't found with ldd
-                        lib=/lib && [ -d "/lib64" ] && lib=/lib64
-                        k_extras="/$lib/libnss_compat.so.2 /$lib/libnss_files.so.2"
                     fi
                     ;;
+                ifc)
+                    ;;
                 default)
                     [ "$location" == "reboot" ] && emit "reboot -h -f"
                     #else load normally on default failure case



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:58:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:58:44 -0400
Subject: rpms/audit/devel audit-events.patch, NONE, 1.1 audit.spec, 1.109,
	1.110
Message-ID: <200608302058.k7UKwiYP006870@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6852

Modified Files:
	audit.spec 
Added Files:
	audit-events.patch 
Log Message:
* Wed Aug 30 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-3
- Rename audit event socket


audit-events.patch:
 audispd |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audit-events.patch ---
diff -ur audit-1.2.6/audisp/audispd audit-1.2.7/audisp/audispd
--- audit-1.2.6/audisp/audispd	2006-08-26 15:45:33.000000000 -0400
+++ audit-1.2.7/audisp/audispd	2006-08-30 16:53:36.000000000 -0400
@@ -87,7 +87,7 @@
     syslog.openlog("audispd")
     syslog.syslog("starting audispd")
     signal.signal(signal.SIGHUP, huphandler)
-    dispatcher=audit_dispatcher("/var/run/auditd_sock")
+    dispatcher=audit_dispatcher("/var/run/audit_events")
     dispatcher.run()
 
 except IOError,e:


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- audit.spec	28 Aug 2006 23:03:50 -0000	1.109
+++ audit.spec	30 Aug 2006 20:58:41 -0000	1.110
@@ -1,12 +1,13 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.6
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
 Patch1: audit-perms.patch
+Patch2: audit-events.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.17
@@ -56,6 +57,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 autoreconf -fv --install
@@ -167,6 +169,9 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Wed Aug 30 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-3
+- Rename audit event socket
+
 * Mon Aug 28 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-2
 - Another minor update to auditctl -p option
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 20:59:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 16:59:53 -0400
Subject: rpms/selinux-policy/devel policy-20060829.patch, NONE,
	1.1 .cvsignore, 1.82, 1.83 selinux-policy.spec, 1.261,
	1.262 sources, 1.86, 1.87
Message-ID: <200608302059.k7UKxrTB006945@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6928

Modified Files:
	.cvsignore selinux-policy.spec sources 
Added Files:
	policy-20060829.patch 
Log Message:
* Tue Aug 29 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-1
- Upgrade to upstream


policy-20060829.patch:
 admin/amanda.fc              |   50 -----
 admin/anaconda.te            |   11 +
 admin/bootloader.fc          |    2 
 admin/consoletype.te         |    7 
 admin/firstboot.te           |   10 -
 admin/rpm.fc                 |    2 
 admin/rpm.if                 |   13 -
 apps/java.fc                 |    2 
 apps/mono.te                 |    1 
 kernel/corecommands.fc       |    2 
 kernel/corecommands.if       |    1 
 kernel/corenetwork.te.in     |    4 
 kernel/devices.fc            |    2 
 kernel/files.fc              |    1 
 kernel/filesystem.te         |    2 
 kernel/kernel.if             |   39 ++++
 kernel/terminal.fc           |    2 
 services/apache.te           |    1 
 services/ccs.fc              |    8 
 services/ccs.if              |   65 +++++++
 services/ccs.te              |   84 +++++++++
 services/cron.if             |    8 
 services/cron.te             |    1 
 services/dbus.if             |    1 
 services/dovecot.te          |    2 
 services/ldap.te             |    2 
 services/ntp.te              |    6 
 services/oddjob.fc           |    8 
 services/oddjob.if           |   76 ++++++++
 services/oddjob.te           |   70 ++++++++
 services/oddjob_mkhomedir.fc |    6 
 services/oddjob_mkhomedir.if |   24 ++
 services/oddjob_mkhomedir.te |   26 ++
 services/pegasus.if          |   31 +++
 services/pegasus.te          |    5 
 services/procmail.te         |    1 
 services/ricci.fc            |   20 ++
 services/ricci.if            |  184 +++++++++++++++++++++
 services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++++++++++
 services/rpc.te              |    1 
 services/setroubleshoot.fc   |    9 +
 services/setroubleshoot.if   |    3 
 services/setroubleshoot.te   |  112 ++++++++++++
 services/spamassassin.te     |    1 
 services/ssh.if              |   24 ++
 services/stunnel.te          |    2 
 services/xserver.if          |   61 ++++++-
 services/xserver.te          |    4 
 system/authlogin.te          |    8 
 system/fstools.te            |    1 
 system/hostname.te           |    5 
 system/init.if               |    7 
 system/init.te               |    3 
 system/logging.fc            |    1 
 system/lvm.te                |    2 
 system/modutils.te           |    1 
 system/mount.te              |    4 
 system/selinuxutil.te        |    9 +
 system/udev.te               |    5 
 system/unconfined.fc         |    1 
 system/unconfined.if         |    1 
 system/userdomain.if         |  246 +++++++++++++++++++---------
 system/userdomain.te         |   48 ++---
 63 files changed, 1520 insertions(+), 192 deletions(-)

--- NEW FILE policy-20060829.patch ---
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-2.3.10/policy/modules/admin/amanda.fc
--- nsaserefpolicy/policy/modules/admin/amanda.fc	2006-08-29 09:00:30.000000000 -0400
+++ serefpolicy-2.3.10/policy/modules/admin/amanda.fc	2006-08-29 10:39:25.000000000 -0400
@@ -11,61 +11,11 @@
 /usr/lib(64)?/amanda		-d	gen_context(system_u:object_r:amanda_usr_lib_t,s0)
 /usr/lib(64)?/amanda/.+		--	gen_context(system_u:object_r:amanda_exec_t,s0)
 /usr/lib(64)?/amanda/amandad	--	gen_context(system_u:object_r:amanda_inetd_exec_t,s0)
-/usr/lib(64)?/amanda/amcat\.awk	--	gen_context(system_u:object_r:amanda_script_exec_t,s0)
-/usr/lib(64)?/amanda/amcleanupdisk --	gen_context(system_u:object_r:amanda_exec_t,s0)
 /usr/lib(64)?/amanda/amidxtaped	--	gen_context(system_u:object_r:amanda_inetd_exec_t,s0)
 /usr/lib(64)?/amanda/amindexd	--	gen_context(system_u:object_r:amanda_inetd_exec_t,s0)
-/usr/lib(64)?/amanda/amlogroll	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/amplot\.awk --	gen_context(system_u:object_r:amanda_script_exec_t,s0)
-/usr/lib(64)?/amanda/amplot\.g	--	gen_context(system_u:object_r:amanda_script_exec_t,s0)
-/usr/lib(64)?/amanda/amplot\.gp	--	gen_context(system_u:object_r:amanda_script_exec_t,s0)
-/usr/lib(64)?/amanda/amtrmidx	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/amtrmlog	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/calcsize	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-chio	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-chs	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-manual	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-mtx	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-multi	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-rth	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-scsi	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/chg-zd-mtx	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/driver	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/dumper	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/killpgrp	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/patch-system --	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/planner	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/rundump	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/runtar	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/selfcheck	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/sendbackup	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/sendsize	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/taper	--	gen_context(system_u:object_r:amanda_exec_t,s0)
-/usr/lib(64)?/amanda/versionsuffix --	gen_context(system_u:object_r:amanda_exec_t,s0)
-
-/usr/sbin/amadmin		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amcheck		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amcheckdb		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amcleanup		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amdump		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amflush		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amgetconf		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amlabel		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amoverview		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amplot		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
 /usr/sbin/amrecover		--	gen_context(system_u:object_r:amanda_recover_exec_t,s0)
-/usr/sbin/amreport		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amrestore		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amrmtape		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amstatus		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amtape		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amtoc			--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-/usr/sbin/amverify		--	gen_context(system_u:object_r:amanda_user_exec_t,s0)
-
 /var/lib/amanda			-d	gen_context(system_u:object_r:amanda_var_lib_t,s0)
 /var/lib/amanda/\.amandahosts	--	gen_context(system_u:object_r:amanda_config_t,s0)
-/var/lib/amanda/\.bashrc	--	gen_context(system_u:object_r:amanda_shellconfig_t,s0)
-/var/lib/amanda/\.profile	--	gen_context(system_u:object_r:amanda_shellconfig_t,s0)
 /var/lib/amanda/disklist	--	gen_context(system_u:object_r:amanda_data_t,s0)
 /var/lib/amanda/gnutar-lists(/.*)?	gen_context(system_u:object_r:amanda_gnutarlists_t,s0)
 /var/lib/amanda/index			gen_context(system_u:object_r:amanda_data_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.10/policy/modules/admin/anaconda.te
--- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-08-29 09:00:30.000000000 -0400
+++ serefpolicy-2.3.10/policy/modules/admin/anaconda.te	2006-08-29 10:39:25.000000000 -0400
@@ -60,3 +60,14 @@
 optional_policy(`
 	usermanage_domtrans_admin_passwd(anaconda_t)
 ')
+
+optional_policy(`
+	ssh_domtrans_keygen(anaconda_t)
+')
+
+
+# The following is just to quiet the anaconda complaining during the install
+dontaudit domain anaconda_t:fd use;
+dontaudit domain anaconda_t:fifo_file r_file_perms;
+dontaudit domain anaconda_t:unix_stream_socket connectto;
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.3.10/policy/modules/admin/bootloader.fc
--- nsaserefpolicy/policy/modules/admin/bootloader.fc	2006-07-14 17:04:46.000000000 -0400
+++ serefpolicy-2.3.10/policy/modules/admin/bootloader.fc	2006-08-29 10:39:25.000000000 -0400
@@ -10,3 +10,5 @@
 /sbin/lilo.*		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
 /sbin/mkinitrd		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
 /sbin/ybin.*		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
+/boot/grup/.*		--	gen_context(system_u:object_r:boot_runtime_t,s0)
+/boot/grup/slapsh.xpm.gz --	gen_context(system_u:object_r:boot_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.10/policy/modules/admin/consoletype.te
--- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-08-29 09:00:30.000000000 -0400
+++ serefpolicy-2.3.10/policy/modules/admin/consoletype.te	2006-08-29 10:39:25.000000000 -0400
@@ -8,7 +8,12 @@
 
 type consoletype_t;
 type consoletype_exec_t;
-init_domain(consoletype_t,consoletype_exec_t)
+#dont transition from initrc
+#init_domain(consoletype_t,consoletype_exec_t)
+domain_type(consoletype_t)
+domain_entry_file(consoletype_t,consoletype_exec_t)
+role system_r types consoletype_t;
+
 mls_file_read_up(consoletype_t)
 mls_file_write_down(consoletype_t)
 role system_r types consoletype_t;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.10/policy/modules/admin/firstboot.te
--- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-29 09:00:30.000000000 -0400
+++ serefpolicy-2.3.10/policy/modules/admin/firstboot.te	2006-08-29 10:39:25.000000000 -0400
@@ -38,9 +38,8 @@
 
 allow firstboot_t firstboot_etc_t:file { getattr read };
 
-allow firstboot_t firstboot_rw_t:dir create_dir_perms;
-allow firstboot_t firstboot_rw_t:file create_file_perms;
-files_etc_filetrans(firstboot_t,firstboot_rw_t,file)
+files_manage_etc_runtime_files(firstboot_t)
+files_etc_filetrans_etc_runtime(firstboot_t, { file dir })
 
 # The big hammer
 unconfined_domain(firstboot_t) 
@@ -124,6 +123,11 @@
 	usermanage_domtrans_useradd(firstboot_t)
 ')
 
+optional_policy(`
+	usermanage_domtrans_admin_passwd(firstboot_t)
+')
+
+
 ifdef(`TODO',`
 allow firstboot_t proc_t:file write;
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.10/policy/modules/admin/rpm.fc
--- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
+++ serefpolicy-2.3.10/policy/modules/admin/rpm.fc	2006-08-29 10:39:25.000000000 -0400
@@ -19,6 +19,8 @@
 /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
 /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 /usr/sbin/up2date		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+/usr/bin/apt-get		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+/usr/bin/apt-shell		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 ')
 
 /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.10/policy/modules/admin/rpm.if
--- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
+++ serefpolicy-2.3.10/policy/modules/admin/rpm.if	2006-08-29 10:39:25.000000000 -0400
@@ -75,12 +75,13 @@
 	')
 
 	rpm_domtrans($1)
-	role $2 types rpm_t;
-	role $2 types rpm_script_t;
-	seutil_run_loadpolicy(rpm_script_t,$2,$3)
-	seutil_run_semanage(rpm_script_t,$2,$3)
-	seutil_run_setfiles(rpm_script_t,$2,$3)
-	seutil_run_restorecon(rpm_script_t,$2,$3)
+	#role $2 types rpm_t;
+	#role $2 types rpm_script_t;
+	role_transition $2 rpm_exec_t system_r;
+	seutil_run_loadpolicy(rpm_script_t,system_r,$3)
+	seutil_run_semanage(rpm_script_t,system_r,$3)
+	seutil_run_setfiles(rpm_script_t,system_r,$3)
+	seutil_run_restorecon(rpm_script_t,system_r,$3)
 	allow rpm_t $3:chr_file rw_term_perms;
 ')
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.10/policy/modules/apps/java.fc
--- nsaserefpolicy/policy/modules/apps/java.fc	2006-08-29 09:00:26.000000000 -0400
+++ serefpolicy-2.3.10/policy/modules/apps/java.fc	2006-08-29 10:39:25.000000000 -0400
@@ -1,7 +1,7 @@
 #
 # /opt
 #
-/opt/(.*/)?bin/java([^/]*)? --	gen_context(system_u:object_r:java_exec_t,s0)
+/opt/(.*/)?java([^/]*)? --	gen_context(system_u:object_r:java_exec_t,s0)
 
 #
 # /usr
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.3.10/policy/modules/apps/mono.te
--- nsaserefpolicy/policy/modules/apps/mono.te	2006-07-14 17:04:31.000000000 -0400
+++ serefpolicy-2.3.10/policy/modules/apps/mono.te	2006-08-29 10:39:25.000000000 -0400
@@ -21,6 +21,7 @@
 	allow mono_t self:process { execheap execmem };
 	unconfined_domain_noaudit(mono_t)
 	unconfined_dbus_chat(mono_t)
+	userdom_generic_user_home_dir_filetrans_generic_user_home_content(mono_t,{ dir file lnk_file fifo_file sock_file })
 
 	init_dbus_chat_script(mono_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.10/policy/modules/kernel/corecommands.fc
--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-29 09:00:26.000000000 -0400
+++ serefpolicy-2.3.10/policy/modules/kernel/corecommands.fc	2006-08-29 10:39:25.000000000 -0400
@@ -54,7 +54,9 @@
 /etc/rc\.d/init\.d/functions	--	gen_context(system_u:object_r:bin_t,s0)
[...2207 lines suppressed...]
+
+	dontaudit $1 sysadm_home_t:file ra_file_perms;
+')
+
+########################################
+## <summary>
 ##	Read files in the staff users home directory.
 ## </summary>
 ## <param name="domain">
@@ -4079,7 +4132,7 @@
 	gen_require(`
 		type user_home_dir_t;
 	')
-
+	allow $1 user_home_dir_t:dir manage_dir_perms;
 	files_home_filetrans($1,user_home_dir_t,dir)
 ')
 
@@ -4164,7 +4217,7 @@
 	')
 
 	files_search_home($1)
-	allow $1 user_home_dir_t:dir search_dir_perms;
+	allow $1 user_home_dir_t:dir rw_dir_perms;
 	allow $1 user_home_t:dir create_dir_perms;
 ')
 
@@ -4206,7 +4259,7 @@
 	')
 
 	files_search_home($1)
-	allow $1 user_home_dir_t:dir search_dir_perms;
+	allow $1 user_home_dir_t:dir rw_dir_perms;
 	allow $1 user_home_t:dir rw_dir_perms;
 	allow $1 user_home_t:file create_file_perms;
 ')
@@ -4228,7 +4281,7 @@
 	')
 
 	files_search_home($1)
-	allow $1 user_home_dir_t:dir search_dir_perms;
+	allow $1 user_home_dir_t:dir rw_dir_perms;
 	allow $1 user_home_t:dir rw_dir_perms;
 	allow $1 user_home_t:lnk_file create_lnk_perms;
 ')
@@ -4250,7 +4303,7 @@
 	')
 
 	files_search_home($1)
-	allow $1 user_home_dir_t:dir search_dir_perms;
+	allow $1 user_home_dir_t:dir rw_dir_perms;
 	allow $1 user_home_t:dir rw_dir_perms;
 	allow $1 user_home_t:fifo_file create_file_perms;
 ')
@@ -4272,7 +4325,7 @@
 	')
 
 	files_search_home($1)
-	allow $1 user_home_dir_t:dir search_dir_perms;
+	allow $1 user_home_dir_t:dir rw_dir_perms;
 	allow $1 user_home_t:dir rw_dir_perms;
 	allow $1 user_home_t:sock_file create_file_perms;
 ')
@@ -4740,3 +4793,34 @@
 	allow $1 user_home_dir_t:dir create_dir_perms;
 	files_home_filetrans($1,user_home_dir_t,dir)
 ')
+
+########################################
+## <summary>
+##	The template containing rules for changing from one role to another
+## </summary>
+## <desc>
+##	<p>
+##	This should only be used for new non login user roles, rather the
+##	unpriv_user_template or admin_user_template should
+##	be used.
+##	</p>
+## </desc>
+## <param name="userdomain_prefix">
+##	<summary>
+##	userdomain changing from 
+##	</summary>
+## </param>
+## <param name="userdomain_prefix">
+##	<summary>
+##	userdomain changing to
+##	</summary>
+## </param>
+#
+template(`role_change_template',`
+        allow $1_r $2_r;
+        type_change $2_t $1_devpts_t:chr_file $2_devpts_t;
+        type_change $2_t $1_tty_device_t:chr_file $2_tty_device_t;
+        # avoid annoying messages on terminal hangup
+        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
+')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.10/policy/modules/system/userdomain.te
--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-08-16 08:46:31.000000000 -0400
+++ serefpolicy-2.3.10/policy/modules/system/userdomain.te	2006-08-29 10:39:25.000000000 -0400
@@ -56,14 +56,6 @@
 # Local policy
 #
 
-define(`role_change',`
-	allow $1_r $2_r;
-	type_change $2_t $1_devpts_t:chr_file $2_devpts_t;
-	type_change $2_t $1_tty_device_t:chr_file $2_tty_device_t;
-	# avoid annoying messages on terminal hangup
-	dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
-')
-
 ifdef(`targeted_policy',`
 	# Define some type aliases to help with compatibility with
 	# macros and domains from the "strict" policy.
@@ -124,34 +116,34 @@
 
 	# user role change rules:
 	# sysadm_r can change to user roles
-	role_change(sysadm, user)
-	role_change(sysadm, staff)
+	role_change_template(sysadm, user)
+	role_change_template(sysadm, staff)
 
 	# only staff_r can change to sysadm_r
-	role_change(staff, sysadm)
+	role_change_template(staff, sysadm)
 
 	ifdef(`enable_mls',`
 		unpriv_user_template(secadm)
 		unpriv_user_template(auditadm)
 
-		role_change(staff,auditadm)
-		role_change(staff,secadm)
+		role_change_template(staff,auditadm)
+		role_change_template(staff,secadm)
 
-		role_change(sysadm,secadm)
-		role_change(sysadm,auditadm)
+		role_change_template(sysadm,secadm)
+		role_change_template(sysadm,auditadm)
 
-		role_change(auditadm,secadm)
-		role_change(auditadm,sysadm)
+		role_change_template(auditadm,secadm)
+		role_change_template(auditadm,sysadm)
 
-		role_change(secadm,auditadm)
-		role_change(secadm,sysadm)
+		role_change_template(secadm,auditadm)
+		role_change_template(secadm,sysadm)
 	')
 
 	# this should be tunable_policy, but
 	# currently type_change and RBAC allow
 	# do not work in conditionals
 	ifdef(`user_canbe_sysadm',`
-		role_change(user,sysadm)
+		role_change_template(user,sysadm)
 	')
 
 	allow privhome home_root_t:dir { getattr search };
@@ -172,6 +164,8 @@
 
 	mls_process_read_up(sysadm_t)
 
+	term_getattr_all_user_ttys(sysadm_t)
+
 	init_exec(sysadm_t)
 
 	ifdef(`direct_sysadm_daemon',`
@@ -210,7 +204,9 @@
 		init_exec(secadm_t)
 		logging_read_audit_log(secadm_t)
 	        logging_read_generic_logs(secadm_t)
-		userdom_dontaudit_append_staff_home_content_files(secadm_t)
+		userdom_dontaudit_append_sysadm_home_content_files(secadm_t)
+		userdom_dontaudit_read_sysadm_home_content_files(secadm_t)
+
 	', `
 		logging_manage_audit_log(sysadm_t)
 		logging_manage_audit_config(sysadm_t)
@@ -439,11 +435,11 @@
 			selinux_set_parameters(secadm_t)
 
 			seutil_manage_bin_policy(secadm_t)
-			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
-			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
-			seutil_run_semanage(secadm_t,secadm_r,admin_terminal)
-			seutil_run_setfiles(secadm_t,secadm_r,admin_terminal)
-			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
+			seutil_run_checkpolicy(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_loadpolicy(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_semanage(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_setfiles(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+			seutil_run_restorecon(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
 		', `
 			selinux_set_enforce_mode(sysadm_t)
 			selinux_set_boolean(sysadm_t)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	23 Aug 2006 20:42:38 -0000	1.82
+++ .cvsignore	30 Aug 2006 20:59:51 -0000	1.83
@@ -83,3 +83,5 @@
 serefpolicy-2.3.7.tgz
 serefpolicy-2.3.8.tgz
 serefpolicy-2.3.9.tgz
+serefpolicy-2.3.10.tgz
+clog


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- selinux-policy.spec	28 Aug 2006 21:49:05 -0000	1.261
+++ selinux-policy.spec	30 Aug 2006 20:59:51 -0000	1.262
@@ -15,12 +15,12 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.9
-Release: 6
+Version: 2.3.10
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20060802.patch
+patch: policy-20060829.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -37,7 +37,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
-PreReq: policycoreutils >= %{POLICYCOREUTILSVER} libsemanage > 1.6.13-1
+PreReq: policycoreutils >= %{POLICYCOREUTILSVER} libsemanage > 1.6.16-1
 Obsoletes: policy 
 
 %description 
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Tue Aug 29 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-1
+- Upgrade to upstream
+
 * Mon Aug 28 2006 Dan Walsh <dwalsh at redhat.com> 2.3.9-6
 - Fix install problems
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sources	23 Aug 2006 20:42:38 -0000	1.86
+++ sources	30 Aug 2006 20:59:51 -0000	1.87
@@ -1 +1 @@
-41f53e40030dbc765875f29d3b34dc2a  serefpolicy-2.3.9.tgz
+f3e5eb409c4d0a06738b616e2742353b  serefpolicy-2.3.10.tgz



From fedora-cvs-commits at redhat.com  Wed Aug 30 21:19:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 17:19:14 -0400
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.262,1.263
Message-ID: <200608302119.k7ULJE6a022451@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22438

Modified Files:
	selinux-policy.spec 
Log Message:
* Wed Aug 30 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-2
- Fix requires line



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- selinux-policy.spec	30 Aug 2006 20:59:51 -0000	1.262
+++ selinux-policy.spec	30 Aug 2006 21:19:12 -0000	1.263
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.10
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -37,7 +37,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
-PreReq: policycoreutils >= %{POLICYCOREUTILSVER} libsemanage > 1.6.16-1
+PreReq: policycoreutils >= %{POLICYCOREUTILSVER} libsemanage >= 1.6.16-1
 Obsoletes: policy 
 
 %description 
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Wed Aug 30 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-2
+- Fix requires line
+
 * Tue Aug 29 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-1
 - Upgrade to upstream
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 21:23:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 17:23:33 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.31, 1.32 setroubleshoot.spec,
	1.37, 1.38 sources, 1.34, 1.35
Message-ID: <200608302123.k7ULNX3m022582@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22557/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.38-1 on branch devel from setroubleshoot-0.38-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	25 Aug 2006 16:02:42 -0000	1.31
+++ .cvsignore	30 Aug 2006 21:23:31 -0000	1.32
@@ -1 +1 @@
-setroubleshoot-0.37.tar.gz
+setroubleshoot-0.38.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- setroubleshoot.spec	25 Aug 2006 16:02:42 -0000	1.37
+++ setroubleshoot.spec	30 Aug 2006 21:23:31 -0000	1.38
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.37
+Version: 0.38
 Release: 1
 License: GPL
 Group: Applications/System
@@ -24,8 +24,8 @@
 %define pkgconfigdir  %{_sysconfdir}/%{name}
 %define pkglogdir     %{_localstatedir}/log/%{name}
 
-Requires: audit >= audit-1.2.5-7
-Requires: audit-libs-python
+Requires: audit >= 1.2.6-3
+Requires: audit-libs-python >= 1.2.6-3
 Requires: libselinux >= 1.30.15-1
 Requires: pygtk2 >= 2.9.2
 Requires: notify-python
@@ -107,6 +107,20 @@
 %{_datadir}/dbus-1/services/sealert.service
 
 %changelog
+* Fri Aug 30 2006 Dan Walsh <dwalsh at redhat.com> - 0.38-1
+- 	Dan Walsh
+	* Hook up the rest of the menu bars on browser window
+	* Add public_content.py plugin
+- John Dennis  
+	* add delete_signatures() method to AlertClient class
+        * start using the AppBar in the browser.
+	* "open logfile" now connected all the way from browser menu
+	to server rpc, still needs implementation, but "plumbing" is working.
+	* fixes for the date/time dialog
+	* remove install of setroubleshoot.glade, we now only use
+	setroubleshoot_browser.glade
+	* some fixed to DateTimeDialog
+
 * Fri Aug 25 2006 Dan Walsh <dwalsh at redhat.com> - 0.37-1
 - Add back in the status icon
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	25 Aug 2006 16:02:42 -0000	1.34
+++ sources	30 Aug 2006 21:23:31 -0000	1.35
@@ -1 +1 @@
-69dbdc8fa4d989426bc01d681ebd08de  setroubleshoot-0.37.tar.gz
+f5912779bfaedf4d796fad970a88354a  setroubleshoot-0.38.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 30 21:35:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 17:35:16 -0400
Subject: rpms/kernel/devel linux-2.6-openib-sdp.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2519.4.20, 1.2519.4.21
Message-ID: <200608302135.k7ULZGJM022771@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22751

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	kernel-2.6.spec 
Added Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	linux-2.6-openib-sdp.patch 
Log Message:
adding the infiniband sdp layer



linux-2.6-openib-sdp.patch:
 Kconfig              |    2 
 Makefile             |    1 
 ulp/sdp/Kconfig      |   28 
 ulp/sdp/Makefile     |    6 
 ulp/sdp/sdp.h        |  165 +++++
 ulp/sdp/sdp_bcopy.c  |  469 ++++++++++++++++
 ulp/sdp/sdp_cma.c    |  475 ++++++++++++++++
 ulp/sdp/sdp_main.c   | 1429 +++++++++++++++++++++++++++++++++++++++++++++++++++
 ulp/sdp/sdp_socket.h |   13 
 9 files changed, 2588 insertions(+)

--- NEW FILE linux-2.6-openib-sdp.patch ---
diff -uprN linux-2.6.17.noarch.orig/drivers/infiniband/Kconfig linux-2.6.17.noarch.sdp/drivers/infiniband/Kconfig
--- linux-2.6.17.noarch.orig/drivers/infiniband/Kconfig	2006-07-25 17:32:46.000000000 -0400
+++ linux-2.6.17.noarch.sdp/drivers/infiniband/Kconfig	2006-08-30 16:13:20.000000000 -0400
@@ -39,6 +39,8 @@ config INFINIBAND_USER_ACCESS
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"
 
+source "drivers/infiniband/ulp/sdp/Kconfig"
+
 source "drivers/infiniband/ulp/srp/Kconfig"
 
 source "drivers/infiniband/ulp/iser/Kconfig"
diff -uprN linux-2.6.17.noarch.orig/drivers/infiniband/Makefile linux-2.6.17.noarch.sdp/drivers/infiniband/Makefile
--- linux-2.6.17.noarch.orig/drivers/infiniband/Makefile	2006-07-25 17:32:49.000000000 -0400
+++ linux-2.6.17.noarch.sdp/drivers/infiniband/Makefile	2006-08-30 16:13:28.000000000 -0400
@@ -2,5 +2,6 @@ obj-$(CONFIG_INFINIBAND)		+= core/
 obj-$(CONFIG_INFINIBAND_MTHCA)		+= hw/mthca/
 obj-$(CONFIG_IPATH_CORE)		+= hw/ipath/
 obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/
+obj-$(CONFIG_INFINIBAND_SDP)		+= ulp/sdp/
 obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/
 obj-$(CONFIG_INFINIBAND_ISER)		+= ulp/iser/
diff -uprN linux-2.6.17.noarch.orig/drivers/infiniband/ulp/sdp/Kconfig linux-2.6.17.noarch.sdp/drivers/infiniband/ulp/sdp/Kconfig
--- linux-2.6.17.noarch.orig/drivers/infiniband/ulp/sdp/Kconfig	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.sdp/drivers/infiniband/ulp/sdp/Kconfig	2006-07-25 22:31:03.000000000 -0400
@@ -0,0 +1,28 @@
+config INFINIBAND_SDP
+	tristate "Sockets Direct Protocol"
+	depends on INFINIBAND && INFINIBAND_IPOIB
+	---help---
+	  Support for Sockets Direct Protocol (SDP).  This provides
+          sockets semantics over InfiniBand via address family
+          AF_INET_SDP (address family 27).  You can also LD_PRELOAD the
+          libsdp library from <http://openib.org> to have standard
+          sockets applications use SDP.
+
+config INFINIBAND_SDP_DEBUG
+	bool "Sockets Direct Protocol debugging"
+	depends on INFINIBAND_SDP
+	---help---
+	  This option causes debugging code to be compiled into the
+	  SDP driver.  The output can be turned on via the debug_level
+	  module parameter  (which can also be set through sysfs after the
+	  driver is loaded).
+
+config INFINIBAND_SDP_DEBUG_DATA
+        bool "Sockets Direct Protocol data path debugging"
+        depends on INFINIBAND_SDP_DEBUG
+        ---help---
+          This option compiles debugging code into the the data path
+          of the SDP driver.  The output can be turned on via the
+          data_debug_level module parameter; however, even with output
+          turned off, this debugging code will have some performance
+          impact.
diff -uprN linux-2.6.17.noarch.orig/drivers/infiniband/ulp/sdp/Makefile linux-2.6.17.noarch.sdp/drivers/infiniband/ulp/sdp/Makefile
--- linux-2.6.17.noarch.orig/drivers/infiniband/ulp/sdp/Makefile	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.sdp/drivers/infiniband/ulp/sdp/Makefile	2006-07-25 22:31:03.000000000 -0400
@@ -0,0 +1,6 @@
+EXTRA_CFLAGS += -Idrivers/infiniband/include
+EXTRA_CFLAGS += -ggdb
+
+obj-$(CONFIG_INFINIBAND_SDP) += ib_sdp.o
+
+ib_sdp-objs := sdp_main.o sdp_cma.o sdp_bcopy.o
diff -uprN linux-2.6.17.noarch.orig/drivers/infiniband/ulp/sdp/sdp_bcopy.c linux-2.6.17.noarch.sdp/drivers/infiniband/ulp/sdp/sdp_bcopy.c
--- linux-2.6.17.noarch.orig/drivers/infiniband/ulp/sdp/sdp_bcopy.c	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.sdp/drivers/infiniband/ulp/sdp/sdp_bcopy.c	2006-07-25 22:31:03.000000000 -0400
@@ -0,0 +1,469 @@
+/*
+ * Copyright (c) 2006 Mellanox Technologies Ltd.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - 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.
+ *
+ * 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.
+ *
+ * $Id$
+ */
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/rdma_cm.h>
+#include "sdp.h"
+
+/* Like tcp_fin */
+static void sdp_fin(struct sock *sk)
+{
+	sdp_dbg(sk, "%s\n", __func__);
+
+	sk->sk_shutdown |= RCV_SHUTDOWN;
+	sock_set_flag(sk, SOCK_DONE);
+
+
+	sk_stream_mem_reclaim(sk);
+
+	if (!sock_flag(sk, SOCK_DEAD)) {
+		sk->sk_state_change(sk);
+
+		/* Do not send POLL_HUP for half duplex close. */
+		if (sk->sk_shutdown == SHUTDOWN_MASK ||
+		    sk->sk_state == TCP_CLOSE)
+			sk_wake_async(sk, 1, POLL_HUP);
+		else
+			sk_wake_async(sk, 1, POLL_IN);
+	}
+}
+
+void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb, u8 mid)
+{
+	struct sdp_buf *tx_req;
+	struct sdp_bsdh *h = (struct sdp_bsdh *)skb_push(skb, sizeof *h);
+	unsigned mseq = ssk->tx_head;
+	int i, rc, frags;
+	dma_addr_t addr;
+	struct device *hwdev;
+	struct ib_sge *sge;
+	struct ib_send_wr *bad_wr;
+
+	h->mid = mid;
+	h->flags = 0; /* TODO: OOB */
+	h->bufs = htons(ssk->rx_head - ssk->rx_tail);
+	h->len = htonl(skb->len);
+	h->mseq = htonl(mseq);
+	h->mseq_ack = htonl(ssk->mseq_ack);
+
+	tx_req = &ssk->tx_ring[mseq & (SDP_TX_SIZE - 1)];
+	tx_req->skb = skb;
+	hwdev = ssk->dma_device;
+	sge = ssk->ibsge;
+	addr = dma_map_single(hwdev,
+			      skb->data, skb->len - skb->data_len,
+			      DMA_TO_DEVICE);
+	tx_req->mapping[0] = addr;
+	
+	/* TODO: proper error handling */
+	BUG_ON(dma_mapping_error(addr));
+
+	sge->addr = (u64)addr;
+	sge->length = skb->len - skb->data_len;
+	sge->lkey = ssk->mr->lkey;
+	frags = skb_shinfo(skb)->nr_frags;
+	for (i = 0; i < frags; ++i) {
+		++sge;
+		addr = dma_map_page(hwdev, skb_shinfo(skb)->frags[i].page,
+				    skb_shinfo(skb)->frags[i].page_offset,
+				    skb_shinfo(skb)->frags[i].size,
+				    DMA_TO_DEVICE);
+		BUG_ON(dma_mapping_error(addr));
+		tx_req->mapping[i + 1] = addr;
+		sge->addr = addr;
+		sge->length = skb_shinfo(skb)->frags[i].size;
+		sge->lkey = ssk->mr->lkey;
+	}
+
+	ssk->tx_wr.next = NULL;
+	ssk->tx_wr.wr_id = ssk->tx_head;
+	ssk->tx_wr.sg_list = ssk->ibsge;
+	ssk->tx_wr.num_sge = frags + 1;
+	ssk->tx_wr.opcode = IB_WR_SEND;
+	ssk->tx_wr.send_flags = IB_SEND_SIGNALED;
+	if (unlikely(mid != SDP_MID_DATA))
+		ssk->tx_wr.send_flags |= IB_SEND_SOLICITED;
+	rc = ib_post_send(ssk->qp, &ssk->tx_wr, &bad_wr);
+	BUG_ON(rc);
+	++ssk->tx_head;
+	--ssk->bufs;
+	ssk->remote_credits = ssk->rx_head - ssk->rx_tail;
+}
+
+struct sk_buff *sdp_send_completion(struct sdp_sock *ssk, int mseq)
+{
+	struct device *hwdev;
+	struct sdp_buf *tx_req;
+	struct sk_buff *skb;
+	int i, frags;
+
[...2236 lines suppressed...]
+
+out:
+	release_sock(sk);
+	return err;
+}
+
+static void sdp_unhash(struct sock *sk)
+{
+        sdp_dbg(sk, "%s\n", __func__);
+}
+
+static inline unsigned int sdp_listen_poll(const struct sock *sk)
+{
+	        return !list_empty(&sdp_sk(sk)->accept_queue) ?
+			(POLLIN | POLLRDNORM) : 0;
+}
+
+static unsigned int sdp_poll(struct file *file, struct socket *socket,
+			     struct poll_table_struct *wait)
+{
+	int mask;
+	sdp_dbg(socket->sk, "%s\n", __func__);
+
+	mask = datagram_poll(file, socket, wait);
+	/* TODO: Slightly ugly: it would be nicer if there was function
+	 * like datagram_poll that didn't include poll_wait,
+	 * then we could reverse the order. */
+	if (socket->sk->sk_state == TCP_LISTEN)
+		return sdp_listen_poll(socket->sk);
+
+	if (sdp_sk(socket->sk)->urg_data & TCP_URG_VALID)
+		mask |= POLLPRI;
+	return mask;
+}
+
+static void sdp_enter_memory_pressure(void)
+{
+	sdp_dbg(NULL, "%s\n", __func__);
+}
+
+static atomic_t sockets_allocated;
+static atomic_t memory_allocated;
+static atomic_t orphan_count;
+static int memory_pressure;
+struct proto sdp_proto = {
+        .close       = sdp_close,
+        .connect     = sdp_connect,
+        .disconnect  = sdp_disconnect,
+        .accept      = sdp_accept,
+        .ioctl       = sdp_ioctl,
+        .init        = sdp_init_sock,
+        .shutdown    = sdp_shutdown,
+        .setsockopt  = sdp_setsockopt,
+        .getsockopt  = sdp_getsockopt,
+        .sendmsg     = sdp_sendmsg,
+        .recvmsg     = sdp_recvmsg,
+	.unhash      = sdp_unhash,
+        .get_port    = sdp_get_port,
+	/* Wish we had this: .listen   = sdp_listen */
+	.enter_memory_pressure = sdp_enter_memory_pressure,
+	.sockets_allocated = &sockets_allocated,
+	.memory_allocated = &memory_allocated,
+	.memory_pressure = &memory_pressure,
+	.orphan_count = &orphan_count,
+        .sysctl_mem             = sysctl_tcp_mem,
+        .sysctl_wmem            = sysctl_tcp_wmem,
+        .sysctl_rmem            = sysctl_tcp_rmem,
+	.max_header  = sizeof(struct sdp_bsdh),
+        .obj_size    = sizeof(struct sdp_sock),
+	.owner	     = THIS_MODULE,
+	.name	     = "SDP",
+};
+
+static struct proto_ops sdp_proto_ops = {
+	.family     = PF_INET,
+	.owner      = THIS_MODULE,
+	.release    = inet_release,
+	.bind       = inet_bind,
+	.connect    = inet_stream_connect, /* TODO: inet_datagram connect would
+					      autobind, but need to fix get_port
+					      with port 0 first. */
+	.socketpair = sock_no_socketpair,
+	.accept     = inet_accept,
+	.getname    = inet_getname,
+	.poll       = sdp_poll,
+	.ioctl      = inet_ioctl,
+	.listen     = sdp_inet_listen,
+	.shutdown   = inet_shutdown,
+	.setsockopt = sock_common_setsockopt,
+	.getsockopt = sock_common_getsockopt,
+	.sendmsg    = inet_sendmsg,
+	.recvmsg    = sock_common_recvmsg,
+	.mmap       = sock_no_mmap,
+	.sendpage   = sock_no_sendpage,
+};
+
+static int sdp_create_socket(struct socket *sock, int protocol)
+{
+	struct sock *sk;
+	int rc;
+
+	sdp_dbg(NULL, "%s: type %d protocol %d\n", __func__, sock->type, protocol);
+
+	if (sock->type != SOCK_STREAM) {
+		sdp_warn(NULL, "SDP: unsupported type %d.\n", sock->type);
+		return -ESOCKTNOSUPPORT;
+	}
+
+	/* IPPROTO_IP is a wildcard match */
+	if (protocol != IPPROTO_TCP && protocol != IPPROTO_IP) {
+		sdp_warn(NULL, "SDP: unsupported protocol %d.\n", protocol);
+		return -EPROTONOSUPPORT;
+	}
+
+	sk = sk_alloc(PF_INET_SDP, GFP_KERNEL, &sdp_proto, 1);
+	if (!sk) {
+		sdp_warn(NULL, "SDP: failed to allocate socket.\n");
+		return -ENOMEM;
+	}
+	sock_init_data(sock, sk);
+	sk->sk_protocol = 0x0 /* TODO: inherit tcp socket to use IPPROTO_TCP */;
+
+	rc = sdp_init_sock(sk);
+	if (rc) {
+		sdp_warn(sk, "SDP: failed to init sock.\n");
+		sk_common_release(sk);
+		return -ENOMEM;
+	}
+
+	sk->sk_destruct = sdp_destruct;
+
+	sock->ops = &sdp_proto_ops;
+	sock->state = SS_UNCONNECTED;
+	return 0;
+}
+
+static struct net_proto_family sdp_net_proto = {
+	.family = AF_INET_SDP,
+	.create = sdp_create_socket,
+	.owner  = THIS_MODULE,
+};
+
+static int __init sdp_init(void)
+{
+	int rc;
+
+	sdp_workqueue = create_singlethread_workqueue("sdp");
+	if (!sdp_workqueue) {
+		return -ENOMEM;
+	}
+
+	rc = proto_register(&sdp_proto, 1);
+	if (rc) {
+		printk(KERN_WARNING "%s: proto_register failed: %d\n", __func__, rc);
+		destroy_workqueue(sdp_workqueue);
+		return rc;
+	}
+
+	rc = sock_register(&sdp_net_proto);
+	if (rc) {
+		printk(KERN_WARNING "%s: sock_register failed: %d\n", __func__, rc);
+		proto_unregister(&sdp_proto);
+		destroy_workqueue(sdp_workqueue);
+		return rc;
+	}
+
+	return 0;
+}
+
+static void __exit sdp_exit(void)
+{
+	sock_unregister(PF_INET_SDP);
+	proto_unregister(&sdp_proto);
+
+	if (atomic_read(&orphan_count))
+		printk(KERN_WARNING "%s: orphan_count %d\n", __func__,
+		       atomic_read(&orphan_count));
+	destroy_workqueue(sdp_workqueue);
+	flush_scheduled_work();
+}
+
+module_init(sdp_init);
+module_exit(sdp_exit);
diff -uprN linux-2.6.17.noarch.orig/drivers/infiniband/ulp/sdp/sdp_socket.h linux-2.6.17.noarch.sdp/drivers/infiniband/ulp/sdp/sdp_socket.h
--- linux-2.6.17.noarch.orig/drivers/infiniband/ulp/sdp/sdp_socket.h	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.17.noarch.sdp/drivers/infiniband/ulp/sdp/sdp_socket.h	2006-07-25 22:31:03.000000000 -0400
@@ -0,0 +1,13 @@
+/* Stuff that should go into include/linux/socket.h */
+
+#ifndef SDP_SOCKET_H
+#define SDP_SOCKET_H
+
+#ifndef AF_INET_SDP
+#define AF_INET_SDP 27
+#define PF_INET_SDP AF_INET_SDP
+#endif
+
+/* TODO: AF_INET6_SDP ? */
+
+#endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.20
retrieving revision 1.2519.4.21
diff -u -r1.2519.4.20 -r1.2519.4.21
--- kernel-2.6.spec	30 Aug 2006 19:26:40 -0000	1.2519.4.20
+++ kernel-2.6.spec	30 Aug 2006 21:35:13 -0000	1.2519.4.21
@@ -468,6 +468,8 @@
 # Lockdep fixes.
 Patch2400: linux-2.6-lockdep-fixes.patch
 
+# Infiniband driver
+Patch2500: linux-2.6-openib-sdp.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -1055,6 +1057,9 @@
 # Lockdep fixes
 %patch2400 -p1
 
+# Infiniband driver
+%patch2500 -p1
+
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
@@ -1790,6 +1795,9 @@
 
 %changelog
 * Wed Aug 29 2006 Don Zickus <dzickus at redhat.com>
+- added #199756 - include latest Infiniband SDP support (Doug Ledford)
+
+* Wed Aug 29 2006 Don Zickus <dzickus at redhat.com>
 - now that we build EHEA, fix it to compile
 
 * Wed Aug 29 2006 Don Zickus <dzickus at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Aug 30 21:35:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 17:35:17 -0400
Subject: rpms/kernel/devel/configs config-generic,1.237.8.7,1.237.8.8
Message-ID: <200608302135.k7ULZGdr022779@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv22751/configs

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-generic 
Log Message:
adding the infiniband sdp layer




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237.8.7
retrieving revision 1.237.8.8
diff -u -r1.237.8.7 -r1.237.8.8
--- config-generic	24 Aug 2006 23:18:42 -0000	1.237.8.7
+++ config-generic	30 Aug 2006 21:35:14 -0000	1.237.8.8
@@ -97,6 +97,9 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+CONFIG_INFINIBAND_SDP=m
+CONFIG_INFINIBAND_SDP_DEBUG=y
+CONFIG_INFINIBAND_SDP_DEBUG_DATA=y
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m



From fedora-cvs-commits at redhat.com  Wed Aug 30 21:38:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 17:38:18 -0400
Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.60,
	1.61 sources, 1.73, 1.74 system-config-securitylevel.spec,
	1.84, 1.85
Message-ID: <200608302138.k7ULcIBe022908@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-securitylevel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22890

Modified Files:
	.cvsignore sources system-config-securitylevel.spec 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	29 Aug 2006 15:52:01 -0000	1.60
+++ .cvsignore	30 Aug 2006 21:38:16 -0000	1.61
@@ -48,3 +48,4 @@
 system-config-securitylevel-1.6.22.tar.bz2
 system-config-securitylevel-1.6.23.tar.bz2
 system-config-securitylevel-1.6.24.tar.bz2
+system-config-securitylevel-1.6.25.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	29 Aug 2006 15:52:01 -0000	1.73
+++ sources	30 Aug 2006 21:38:16 -0000	1.74
@@ -1 +1 @@
-3f79b2564595aff2951bdaff195a75ec  system-config-securitylevel-1.6.24.tar.bz2
+326110c4e64b28cbddaef3e830a4748a  system-config-securitylevel-1.6.25.tar.bz2


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- system-config-securitylevel.spec	29 Aug 2006 15:52:01 -0000	1.84
+++ system-config-securitylevel.spec	30 Aug 2006 21:38:16 -0000	1.85
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
-Version: 1.6.24
+Version: 1.6.25
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -93,6 +93,10 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Wed Aug 30 2006 Chris Lumens <clumens at redhat.com> 1.6.25-1
+- Fix traceback from debugging dialog.
+- Display a dialog while policy is being saved and reloaded.
+
 * Tue Aug 29 2006 Chris Lumens <clumens at redhat.com> 1.6.24-1
 - Add a debugging error dialog in case setsebool fails.
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 21:39:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 17:39:56 -0400
Subject: rpms/struts/devel struts.spec,1.43,1.44
Message-ID: <200608302139.k7ULdu2S022994@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22978

Modified Files:
	struts.spec 
Log Message:

Rebuilding.




Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- struts.spec	25 Aug 2006 17:52:13 -0000	1.43
+++ struts.spec	30 Aug 2006 21:39:53 -0000	1.44
@@ -51,7 +51,7 @@
 
 Name:		struts
 Version:	1.2.9
-Release:	4jpp.1
+Release:	4jpp.2
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -984,6 +984,9 @@
 
 
 %changelog
+* Wed Aug 30 2006 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.2
+- Rebuilding.
+
 * Fri Aug 25 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.9-4jpp.1
 - Fix requirements
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 21:44:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 17:44:24 -0400
Subject: rpms/selinux-policy/devel policy-20060829.patch, 1.1,
	1.2 selinux-policy.spec, 1.263, 1.264
Message-ID: <200608302144.k7ULiOiZ023085@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23069

Modified Files:
	policy-20060829.patch selinux-policy.spec 
Log Message:
* Wed Aug 30 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-3
- Fix audit line
- Fix requires line


policy-20060829.patch:
 admin/amanda.fc              |   50 -----
 admin/anaconda.te            |   11 +
 admin/bootloader.fc          |    2 
 admin/consoletype.te         |    7 
 admin/firstboot.te           |   10 -
 admin/rpm.fc                 |    2 
 admin/rpm.if                 |   13 -
 apps/java.fc                 |    2 
 apps/mono.te                 |    1 
 kernel/corecommands.fc       |    2 
 kernel/corecommands.if       |    1 
 kernel/corenetwork.te.in     |    4 
 kernel/devices.fc            |    2 
 kernel/files.fc              |    1 
 kernel/filesystem.te         |    2 
 kernel/kernel.if             |   39 ++++
 kernel/terminal.fc           |    2 
 services/apache.te           |    1 
 services/ccs.fc              |    8 
 services/ccs.if              |   65 +++++++
 services/ccs.te              |   84 +++++++++
 services/cron.if             |    8 
 services/cron.te             |    1 
 services/dbus.if             |    1 
 services/dovecot.te          |    2 
 services/ldap.te             |    2 
 services/ntp.te              |    6 
 services/oddjob.fc           |    8 
 services/oddjob.if           |   76 ++++++++
 services/oddjob.te           |   70 ++++++++
 services/oddjob_mkhomedir.fc |    6 
 services/oddjob_mkhomedir.if |   24 ++
 services/oddjob_mkhomedir.te |   26 ++
 services/pegasus.if          |   31 +++
 services/pegasus.te          |    5 
 services/procmail.te         |    1 
 services/ricci.fc            |   20 ++
 services/ricci.if            |  184 +++++++++++++++++++++
 services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++++++++++
 services/rpc.te              |    1 
 services/setroubleshoot.fc   |    9 +
 services/setroubleshoot.if   |    3 
 services/setroubleshoot.te   |  112 ++++++++++++
 services/spamassassin.te     |    1 
 services/ssh.if              |   24 ++
 services/stunnel.te          |    2 
 services/xserver.if          |   61 ++++++-
 services/xserver.te          |    4 
 system/authlogin.te          |    8 
 system/fstools.te            |    1 
 system/hostname.te           |    5 
 system/init.if               |    7 
 system/init.te               |    3 
 system/logging.fc            |    1 
 system/lvm.te                |    2 
 system/modutils.te           |    1 
 system/mount.te              |    4 
 system/selinuxutil.te        |    9 +
 system/udev.te               |    5 
 system/unconfined.fc         |    1 
 system/unconfined.if         |    1 
 system/userdomain.if         |  246 +++++++++++++++++++---------
 system/userdomain.te         |   48 ++---
 63 files changed, 1520 insertions(+), 192 deletions(-)

Index: policy-20060829.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060829.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20060829.patch	30 Aug 2006 20:59:51 -0000	1.1
+++ policy-20060829.patch	30 Aug 2006 21:44:22 -0000	1.2
@@ -1905,7 +1905,7 @@
  /var/log/audit(/.*)?		gen_context(system_u:object_r:auditd_log_t,s15:c0.c255)
  
  /var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
-+/var/run/auditd_events	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
++/var/run/audit_events	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
  /var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
  /var/run/klogd\.pid	--	gen_context(system_u:object_r:klogd_var_run_t,s0)
  /var/run/log		-s	gen_context(system_u:object_r:devlog_t,s0)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- selinux-policy.spec	30 Aug 2006 21:19:12 -0000	1.263
+++ selinux-policy.spec	30 Aug 2006 21:44:22 -0000	1.264
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.10
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,7 +347,8 @@
 %endif
 
 %changelog
-* Wed Aug 30 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-2
+* Wed Aug 30 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-3
+- Fix audit line
 - Fix requires line
 
 * Tue Aug 29 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-1



From fedora-cvs-commits at redhat.com  Wed Aug 30 21:45:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 17:45:07 -0400
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.12,1.13
Message-ID: <200608302145.k7ULj7F2023156@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23134

Modified Files:
	nfs-utils-lib.spec 
Log Message:
rebuild



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nfs-utils-lib.spec	4 Aug 2006 12:36:35 -0000	1.12
+++ nfs-utils-lib.spec	30 Aug 2006 21:45:04 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 7
+Release: 7.1
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
@@ -122,6 +122,9 @@
 %{_libdir}/libnfsidmap.a
 
 %changelog
+* Wed Aug 30 2006 Steve Dickson <steved at redhat.com> 1.0.8-7.1
+- rebuild
+
 * Wed Aug  2 2006 Steve Dickson <steved at redhat.com> 1.0.8-7
 - Updated librpcsecgss to -0.14
 



From fedora-cvs-commits at redhat.com  Wed Aug 30 21:50:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 17:50:00 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.32, 1.33 setroubleshoot.spec,
	1.38, 1.39 sources, 1.35, 1.36
Message-ID: <200608302150.k7ULo020006078@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6052/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.39-1 on branch devel from setroubleshoot-0.39-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	30 Aug 2006 21:23:31 -0000	1.32
+++ .cvsignore	30 Aug 2006 21:49:57 -0000	1.33
@@ -1 +1 @@
-setroubleshoot-0.38.tar.gz
+setroubleshoot-0.39.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- setroubleshoot.spec	30 Aug 2006 21:23:31 -0000	1.38
+++ setroubleshoot.spec	30 Aug 2006 21:49:57 -0000	1.39
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.38
+Version: 0.39
 Release: 1
 License: GPL
 Group: Applications/System


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	30 Aug 2006 21:23:31 -0000	1.35
+++ sources	30 Aug 2006 21:49:57 -0000	1.36
@@ -1 +1 @@
-f5912779bfaedf4d796fad970a88354a  setroubleshoot-0.38.tar.gz
+8b90dce7e99d14c3afaa0af8f6edddd4  setroubleshoot-0.39.tar.gz



From fedora-cvs-commits at redhat.com  Wed Aug 30 22:06:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 18:06:29 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.58,1.59
Message-ID: <200608302206.k7UM6TWD006312@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6296

Modified Files:
	linux-2.6-xen.patch 
Log Message:
fix x86_64 build

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    8 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  739 +++++
 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                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   92 
 arch/i386/kernel/head-xen.S                         |  200 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2771 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1185 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  379 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1845 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1101 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vmlinux.lds.S                      |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/irqflags.c                       |   99 
 arch/i386/mach-xen/setup.c                          |  153 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  457 +++
 arch/i386/mm/init-xen.c                             |  851 ++++++
 arch/i386/mm/ioremap-xen.c                          |  475 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  699 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1206 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/dig/setup.c                               |   34 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  259 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  123 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  413 ++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  867 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2169 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   54 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1210 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  191 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/irqflags-xen.c                   |  100 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1011 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  794 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1656 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vmlinux.lds.S                    |   16 
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1200 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  625 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  567 ++++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  464 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  842 ++++++
 drivers/xen/blkfront/block.h                        |  154 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1444 ++++++++++
 drivers/xen/blktap/common.h                         |  119 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  353 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  180 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  868 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  483 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/reboot.c                           |  384 ++
 drivers/xen/core/skbuff.c                           |  139 +
 drivers/xen/core/smpboot.c                          |  429 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  141 +
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1498 ++++++++++
 drivers/xen/netback/xenbus.c                        |  461 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 2067 ++++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  458 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  295 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  266 +
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   84 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  287 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  203 +
 drivers/xen/xenbus/xenbus_comms.h                   |   45 
 drivers/xen/xenbus/xenbus_dev.c                     |  356 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1149 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  853 ++++++
 fs/Kconfig                                          |    1 
 include/asm-generic/vmlinux.lds.h                   |    3 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   72 
 include/asm-i386/mach-xen/asm/hypercall.h           |  389 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  234 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/irqflags.h            |   80 
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/maddr.h               |  160 +
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  220 +
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   87 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  185 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  508 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   41 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  489 +++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    5 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   39 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  192 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/maddr.h                            |   81 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |   50 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  136 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  389 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   38 
 include/asm-x86_64/mach-xen/asm/irqflags.h          |   65 
 include/asm-x86_64/mach-xen/asm/maddr.h             |  139 +
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  208 +
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  558 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  498 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  264 +
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/elfnote.h                             |   90 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/xen/balloon.h                               |   67 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hvm.h                                   |   24 
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  448 +++
 include/xen/interface/arch-powerpc.h                |  115 
 include/xen/interface/arch-x86_32.h                 |  256 +
 include/xen/interface/arch-x86_64.h                 |  322 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  656 ++++
 include/xen/interface/elfnote.h                     |  133 
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/e820.h                    |   32 
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   56 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   26 
 include/xen/interface/xen.h                         |  558 ++++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  300 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  118 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   27 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 422 files changed, 88218 insertions(+), 217 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- linux-2.6-xen.patch	30 Aug 2006 17:55:31 -0000	1.58
+++ linux-2.6-xen.patch	30 Aug 2006 22:06:24 -0000	1.59
@@ -1,5 +1,5 @@
 - linux-2.6 changeset: 33957:421a6d428e95
-- linux-2.6-xen-fedora changeset: 35756:78332fcbe5b0
+- linux-2.6-xen-fedora changeset: 35757:37c61d6c2738
 - linux-2.6-xen changeset: 22861:0b726fcb6780
 - xen-unstable changeset: 11204:5fc1fe79083517824d89309cc618f21302724e29
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
@@ -79001,8 +79001,8 @@
 +#endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/asm-x86_64/mach-xen/asm/dma-mapping.h linux-2.6-xen-fedora/include/asm-x86_64/mach-xen/asm/dma-mapping.h
 --- linux-2.6/include/asm-x86_64/mach-xen/asm/dma-mapping.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/asm-x86_64/mach-xen/asm/dma-mapping.h	2006-08-30 17:53:05.000000000 +0200
-@@ -0,0 +1,207 @@
++++ linux-2.6-xen-fedora/include/asm-x86_64/mach-xen/asm/dma-mapping.h	2006-08-30 23:58:16.000000000 +0200
+@@ -0,0 +1,208 @@
 +#ifndef _X8664_DMA_MAPPING_H
 +#define _X8664_DMA_MAPPING_H 1
 +
@@ -79204,9 +79204,10 @@
 +}
 +
 +extern struct device fallback_dev;
-+extern int panic_on_overflow;
 +#endif
 +
++extern int panic_on_overflow;
++
 +#endif /* _X8664_DMA_MAPPING_H */
 +
 +#include <asm-i386/mach-xen/asm/dma-mapping.h>



From fedora-cvs-commits at redhat.com  Wed Aug 30 23:27:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 19:27:21 -0400
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.13,1.14
Message-ID: <200608302327.k7UNRL1P022542@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22509

Modified Files:
	nfs-utils-lib.spec 
Log Message:
added automake to BuildRequires



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nfs-utils-lib.spec	30 Aug 2006 21:45:04 -0000	1.13
+++ nfs-utils-lib.spec	30 Aug 2006 23:27:18 -0000	1.14
@@ -17,7 +17,7 @@
 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pkgconfig, gettext, autoconf
+BuildRequires: pkgconfig, gettext, autoconf, automake
 BuildRequires: libgssapi-devel >= 0.10, openldap-devel
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig



From fedora-cvs-commits at redhat.com  Wed Aug 30 23:31:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 19:31:16 -0400
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.14,1.15
Message-ID: <200608302331.k7UNVGYB022643@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22613

Modified Files:
	nfs-utils-lib.spec 
Log Message:
added automake to BuildRequires:



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nfs-utils-lib.spec	30 Aug 2006 23:27:18 -0000	1.14
+++ nfs-utils-lib.spec	30 Aug 2006 23:31:02 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 7.1
+Release: 7.2
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
@@ -122,6 +122,9 @@
 %{_libdir}/libnfsidmap.a
 
 %changelog
+* Wed Aug 30 2006 Steve Dickson <steved at redhat.com> 1.0.8-7.2
+- added automake to BuildRequires:
+
 * Wed Aug 30 2006 Steve Dickson <steved at redhat.com> 1.0.8-7.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug 31 00:41:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 20:41:29 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-offscreen-pixmaps.patch, 1.4,
	1.5 xorg-x11-server.spec, 1.163, 1.164
Message-ID: <200608310041.k7V0fTjr023627@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23613

Modified Files:
	xorg-x11-server-1.1.1-offscreen-pixmaps.patch 
	xorg-x11-server.spec 
Log Message:
* Wed Aug 30 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-33.fc6
- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to evict pixmap
  when GLX_EXT_texture_from_pixmap is first used.


xorg-x11-server-1.1.1-offscreen-pixmaps.patch:
 GL/glx/glxdri.c          |   13 +++++++++++++
 hw/xfree86/xaa/xaaInit.c |   24 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

Index: xorg-x11-server-1.1.1-offscreen-pixmaps.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-offscreen-pixmaps.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-server-1.1.1-offscreen-pixmaps.patch	28 Aug 2006 23:00:23 -0000	1.4
+++ xorg-x11-server-1.1.1-offscreen-pixmaps.patch	31 Aug 2006 00:41:14 -0000	1.5
@@ -1,104 +1,55 @@
---- ./hw/xfree86/xaa/xaa.h.offscreen-pixmaps	2006-08-28 15:33:34.000000000 -0400
-+++ ./hw/xfree86/xaa/xaa.h	2006-08-28 15:33:36.000000000 -0400
-@@ -1373,6 +1373,9 @@
-    );
-    CARD32 *CPUToScreenTextureDstFormats;
- #endif /* RENDER */
-+
-+   unsigned int savedOffscreenDepths;
-+
- } XAAInfoRec, *XAAInfoRecPtr;
- 
- #define SET_SYNC_FLAG(infoRec)	(infoRec)->NeedToSync = TRUE
 --- ./hw/xfree86/xaa/xaaInit.c.offscreen-pixmaps	2006-07-05 14:31:42.000000000 -0400
-+++ ./hw/xfree86/xaa/xaaInit.c	2006-08-28 15:31:03.000000000 -0400
-@@ -4,6 +4,7 @@
- #include <xorg-config.h>
- #endif
- 
-+#include <string.h>
- #include "misc.h"
- #include "xf86.h"
- #include "xf86_OSproc.h"
-@@ -20,6 +21,7 @@
- #include "xaawrap.h"
- #include "xf86fbman.h"
- #include "servermd.h"
-+#include "selection.h"
- 
- #define MAX_PREALLOC_MEM	65536	/* MUST be >= 1024 */
- 
-@@ -98,6 +100,49 @@
++++ ./hw/xfree86/xaa/xaaInit.c	2006-08-30 16:47:29.000000000 -0400
+@@ -98,6 +98,30 @@
      xfree(infoRec);
  }
  
-+static void
-+SelectionChangedCallback (CallbackListPtr *list,
-+			  pointer xaaData, pointer callData)
++void
++XAAEvictPixmaps(void)
 +{
-+    static char atom_name[] = "_COMPIZ_GL_INCLUDE_INFERIORS";
++    XAAScreenPtr pScreenPriv;
++    XAAInfoRecPtr infoRec;
++    ScreenPtr pScreen;
++    int i;
++
++    xf86MsgVerb(X_INFO, 3, "XAA: Evicting pixmaps\n");
++
++    for (i = 0; i < screenInfo.numScreens; i++) {
++	pScreen = screenInfo.screens[i];
++	infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
 +
-+    SelectionInfoRec *info = callData;
-+    XAAInfoRecPtr infoRec = xaaData;
-+    ScreenPtr pScreen = infoRec->pScrn->pScreen;
-+    Atom atom;
-+
-+    atom = MakeAtom(atom_name, strlen(atom_name), 0);
-+    if (info->selection->selection != atom)
-+	return;
++	pScreenPriv = pScreen->devPrivates[XAAScreenIndex].ptr;
++	infoRec = pScreenPriv->AccelInfoRec;
 +
-+    if (info->kind == SelectionSetOwner && info->selection->window != None)
-+    {
-+	infoRec->savedOffscreenDepths = infoRec->offscreenDepths;
 +	infoRec->offscreenDepths = 0;
 +	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
 +       
 +	XAAMoveOutOffscreenPixmaps(pScreen);
 +	XAAInvalidatePixmapCache(pScreen);
-+
-+	xf86MsgVerb(X_INFO, 3, "'%s' selection grabbed; evicting pixmaps for screen %d\n",
-+		    atom_name, pScreen->myNum);
-+    }
-+    else if (infoRec->savedOffscreenDepths > 0)
-+    {
-+	infoRec->Flags |= OFFSCREEN_PIXMAPS;
-+	infoRec->offscreenDepths = infoRec->savedOffscreenDepths;
-+
-+	if (!SwitchedOut) {
-+	    xf86MsgVerb(X_INFO, 3, "'%s' selection released; pulling in pixmaps for screen %d\n",
-+		      atom_name, pScreen->myNum);
-+
-+	    XAAMoveInOffscreenPixmaps(pScreen);
-+	} else {
-+	    xf86MsgVerb(X_INFO, 3, "'%s' selection released; will pull in pixmaps for screen %d when switched back in.\n",
-+			atom_name, pScreen->myNum);
-+	}
 +    }
 +}
  
  Bool 
  XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
-@@ -228,11 +273,11 @@
-     if(infoRec->Flags & MICROSOFT_ZERO_LINE_BIAS)
- 	miSetZeroLineBias(pScreen, OCTANT1 | OCTANT2 | OCTANT3 | OCTANT4);
- 
-+    AddCallback(&SelectionCallback, SelectionChangedCallback, infoRec);
+--- ./GL/glx/glxdri.c.offscreen-pixmaps	2006-08-30 16:46:45.000000000 -0400
++++ ./GL/glx/glxdri.c	2006-08-30 16:45:52.000000000 -0400
+@@ -367,6 +367,19 @@
+     int		bpp;
+     GLenum	target, format, type;
+ 
++    /* When the GLX_EXT_texture_from_pixmap is used, as it's
++     * implemented here, we want to pull pixmap out of video memory
++     * and into host memory. */
++    {
++      extern void XAAEvictPixmaps(void);
++      static int evictedPixmaps;
 +
-     return TRUE;
- }
- 
--
--
- static Bool
- XAACloseScreen (int i, ScreenPtr pScreen)
- {
-@@ -264,6 +309,9 @@
- 
-     xfree ((pointer) pScreenPriv);
- 
-+    DeleteCallback(&SelectionCallback, SelectionChangedCallback,
-+		   pScreenPriv->AccelInfoRec);
++      if (!evictedPixmaps) {
++	XAAEvictPixmaps();
++	evictedPixmaps = TRUE;
++      }
++    }
 +
-     return (*pScreen->CloseScreen) (i, pScreen);
- }
- 
+     pixmap = (PixmapPtr) glxPixmap->pDraw;
+     if (!glxPixmap->pDamage) {
+         glxPixmap->pDamage = DamageCreate(NULL, NULL, DamageReportNone,


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- xorg-x11-server.spec	30 Aug 2006 06:11:38 -0000	1.163
+++ xorg-x11-server.spec	31 Aug 2006 00:41:14 -0000	1.164
@@ -3,12 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-# NOTE: Now using the 'dist' tag as per http://fedoraproject.org/wiki/DistTag
-# For rawhide builds, bump the number /before/ the dist tag.  For package
-# upgrades to officially released distribution releases, if the package
-# Version field above is not changing, append and/or bump a digit /after/
-# the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   32%{?dist}
+Release:   33%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -708,6 +703,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Aug 30 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-33.fc6
+- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to evict pixmap
+  when GLX_EXT_texture_from_pixmap is first used.
+
 * Wed Aug 30 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-32.fc6
 - Drop xorg-x11-server-1.1.0-gl-include-inferiors.patch now that
   compiz can uses the composite overlay window.



From fedora-cvs-commits at redhat.com  Thu Aug 31 00:50:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 20:50:06 -0400
Subject: rpms/compiz/devel compiz.spec, 1.23, 1.24 gl-include-inferiors.patch,
	1.3, NONE
Message-ID: <200608310050.k7V0o6XF023791@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23778

Modified Files:
	compiz.spec 
Removed Files:
	gl-include-inferiors.patch 
Log Message:
* Wed Aug 30 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.21.20060817git.fc6
- Drop gl-include-inferiors.patch now that compiz uses COW and the X
  server evicts offscreen pixmaps automatically on
  GLX_EXT_texture_from_pixmap usage.



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- compiz.spec	30 Aug 2006 02:31:49 -0000	1.23
+++ compiz.spec	31 Aug 2006 00:50:04 -0000	1.24
@@ -10,7 +10,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.20.%{snapshot}git%{?dist}
+Release:        0.21.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,7 +34,6 @@
 Source0:        %{name}-%{sha1}.tar.bz2
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
 
-Patch100: gl-include-inferiors.patch
 Patch101: aiglx-defaults.patch
 Patch102: tfp-server-extension.patch
 Patch103: composite-cube-logo.patch
@@ -72,7 +71,6 @@
 %setup -q -T -b1 -n desktop-effects-%{dialogversion}
 %setup -q -n %{name}-%{sha1}
 
-%patch100 -p1 -b .gl-include-inferiors
 %patch101 -p1 -b .aiglx-defaults
 %patch102 -p1 -b .tfp-server-extension
 %patch103 -p1 -b .composite-cube-logo
@@ -144,6 +142,11 @@
 %{_includedir}/compiz
 
 %changelog
+* Wed Aug 30 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.21.20060817git.fc6
+- Drop gl-include-inferiors.patch now that compiz uses COW and the X
+  server evicts offscreen pixmaps automatically on
+  GLX_EXT_texture_from_pixmap usage.
+
 * Tue Aug 29 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.20.20060817git.fc6
 - Add cow.patch to make compiz use the composite overlay window.
 


--- gl-include-inferiors.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 31 01:33:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 30 Aug 2006 21:33:53 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.59,1.60
Message-ID: <200608310133.k7V1XrC6024580@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24555

Modified Files:
	linux-2.6-xen.patch 
Log Message:
this time fix ia64 compilation

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    8 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  739 +++++
 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                        | 1209 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   92 
 arch/i386/kernel/head-xen.S                         |  200 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2771 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1185 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  379 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1845 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1101 +++++++
 arch/i386/kernel/traps-xen.c                        | 1180 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vmlinux.lds.S                      |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/irqflags.c                       |   99 
 arch/i386/mach-xen/setup.c                          |  153 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  457 +++
 arch/i386/mm/init-xen.c                             |  851 ++++++
 arch/i386/mm/ioremap-xen.c                          |  475 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  699 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1206 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   66 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/dig/setup.c                               |   34 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  113 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  259 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/setup.c                            |  123 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  413 ++
 arch/ia64/xen/hypervisor.c                          |  810 +++++
 arch/ia64/xen/util.c                                |  115 
 arch/ia64/xen/xenentry.S                            |  867 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2169 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   54 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1210 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  191 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/irqflags-xen.c                   |  100 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1011 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  794 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1656 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vmlinux.lds.S                    |   16 
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1200 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  625 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  567 ++++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  464 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  842 ++++++
 drivers/xen/blkfront/block.h                        |  154 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1444 ++++++++++
 drivers/xen/blktap/common.h                         |  119 
 drivers/xen/blktap/interface.c                      |  159 +
 drivers/xen/blktap/xenbus.c                         |  353 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  180 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  644 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  868 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  483 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/reboot.c                           |  384 ++
 drivers/xen/core/skbuff.c                           |  139 +
 drivers/xen/core/smpboot.c                          |  429 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  141 +
 drivers/xen/netback/interface.c                     |  339 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1498 ++++++++++
 drivers/xen/netback/xenbus.c                        |  461 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 2067 ++++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 +++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  458 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  295 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  266 +
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   84 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  287 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  203 +
 drivers/xen/xenbus/xenbus_comms.h                   |   45 
 drivers/xen/xenbus/xenbus_dev.c                     |  356 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1150 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  853 ++++++
 fs/Kconfig                                          |    1 
 include/asm-generic/vmlinux.lds.h                   |    3 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   72 
 include/asm-i386/mach-xen/asm/hypercall.h           |  389 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  234 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/irqflags.h            |   80 
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/maddr.h               |  160 +
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  220 +
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   87 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  185 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  508 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   41 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  489 +++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    5 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   39 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  503 +++
 include/asm-ia64/hypervisor.h                       |  192 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/maddr.h                            |   81 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |   50 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  304 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  136 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  389 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   38 
 include/asm-x86_64/mach-xen/asm/irqflags.h          |   65 
 include/asm-x86_64/mach-xen/asm/maddr.h             |  139 +
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  208 +
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  558 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  498 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  264 +
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/elfnote.h                             |   90 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/xen/balloon.h                               |   67 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  150 +
 include/xen/hvm.h                                   |   24 
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  448 +++
 include/xen/interface/arch-powerpc.h                |  115 
 include/xen/interface/arch-x86_32.h                 |  256 +
 include/xen/interface/arch-x86_64.h                 |  322 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  656 ++++
 include/xen/interface/elfnote.h                     |  133 
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  362 ++
 include/xen/interface/hvm/e820.h                    |   32 
 include/xen/interface/hvm/hvm_info_table.h          |   22 
 include/xen/interface/hvm/ioreq.h                   |   99 
 include/xen/interface/hvm/params.h                  |   24 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  166 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   56 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   73 
 include/xen/interface/xen-compat.h                  |   26 
 include/xen/interface/xen.h                         |  558 ++++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  300 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  118 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   27 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 422 files changed, 88226 insertions(+), 217 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- linux-2.6-xen.patch	30 Aug 2006 22:06:24 -0000	1.59
+++ linux-2.6-xen.patch	31 Aug 2006 01:33:34 -0000	1.60
@@ -1,5 +1,5 @@
 - linux-2.6 changeset: 33957:421a6d428e95
-- linux-2.6-xen-fedora changeset: 35757:37c61d6c2738
+- linux-2.6-xen-fedora changeset: 35758:d5f82efe9c25
 - linux-2.6-xen changeset: 22861:0b726fcb6780
 - xen-unstable changeset: 11204:5fc1fe79083517824d89309cc618f21302724e29
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
@@ -68436,8 +68436,8 @@
 +}
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/drivers/xen/xenbus/xenbus_probe.c linux-2.6-xen-fedora/drivers/xen/xenbus/xenbus_probe.c
 --- linux-2.6/drivers/xen/xenbus/xenbus_probe.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/drivers/xen/xenbus/xenbus_probe.c	2006-08-25 02:47:31.000000000 +0200
-@@ -0,0 +1,1149 @@
++++ linux-2.6-xen-fedora/drivers/xen/xenbus/xenbus_probe.c	2006-08-31 03:24:06.000000000 +0200
+@@ -0,0 +1,1150 @@
 +/******************************************************************************
 + * Talks to Xen Store to figure out what devices we have.
 + *
@@ -68488,6 +68488,7 @@
 +#include <asm/maddr.h>
 +#include <asm/pgtable.h>
 +#include <asm/hypervisor.h>
++#include <asm/hypercall.h>
 +#include <xen/xenbus.h>
 +#include <xen/xen_proc.h>
 +#include <xen/evtchn.h>
@@ -77002,8 +77003,8 @@
  
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/asm-ia64/hypercall.h linux-2.6-xen-fedora/include/asm-ia64/hypercall.h
 --- linux-2.6/include/asm-ia64/hypercall.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/asm-ia64/hypercall.h	2006-08-13 01:28:23.000000000 +0200
-@@ -0,0 +1,496 @@
++++ linux-2.6-xen-fedora/include/asm-ia64/hypercall.h	2006-08-31 03:24:06.000000000 +0200
+@@ -0,0 +1,503 @@
 +/******************************************************************************
 + * hypercall.h
 + * 
@@ -77304,6 +77305,13 @@
 +	return _hypercall2(int, callback_op, cmd, arg);
 +}
 +
++static inline unsigned long
++HYPERVISOR_hvm_op(
++	int cmd, void *arg)
++{
++	return _hypercall2(unsigned long, hvm_op, cmd, arg);
++}
++
 +extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs);
 +static inline void exit_idle(void) {}
 +#define do_IRQ(irq, regs) ({			\



From fedora-cvs-commits at redhat.com  Thu Aug 31 04:06:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 00:06:17 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.313,1.314
Message-ID: <200608310406.k7V46ETM022643@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22627

Modified Files:
	eclipse.spec 
Log Message:
Require java-gcj-compat >= 1.0.64 instead of 1.0.63


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- eclipse.spec	29 Aug 2006 19:52:51 -0000	1.313
+++ eclipse.spec	31 Aug 2006 04:06:09 -0000	1.314
@@ -151,7 +151,7 @@
 BuildRequires:  java-javadoc
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.2
-BuildRequires:	java-gcj-compat-devel >= 1.0.63
+BuildRequires:	java-gcj-compat-devel >= 1.0.64
 BuildRequires:  dos2unix
 %else
 BuildRequires:	java-devel >= 1.4.2
@@ -175,8 +175,8 @@
 BuildRequires: regexp 
 BuildRequires: junit >= 3.8.1-3jpp
 %if %{gcj_support}
-Requires(post):   java-gcj-compat >= 1.0.63
-Requires(postun): java-gcj-compat >= 1.0.63
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
 %endif
 
 %description
@@ -192,8 +192,8 @@
 Provides:	ecj
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):	java-gcj-compat >= 1.0.63
-Requires(postun): java-gcj-compat >= 1.0.63
+Requires(post):	java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -211,9 +211,9 @@
 Provides:       %{name}-gtk2 = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires:	java-gcj-compat >= 1.0.63
-Requires(post):   java-gcj-compat >= 1.0.63
-Requires(postun): java-gcj-compat >= 1.0.63
+Requires:	java-gcj-compat >= 1.0.64
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -270,8 +270,8 @@
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.63
-Requires(postun): java-gcj-compat >= 1.0.63
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
 %endif
 
 %description    jdt
@@ -302,8 +302,8 @@
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.63
-Requires(postun): java-gcj-compat >= 1.0.63
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
 %endif
 
 %description    pde
@@ -318,8 +318,8 @@
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.63
-Requires(postun): java-gcj-compat >= 1.0.63
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
 %endif
 
 %description    pde-runtime
@@ -347,8 +347,8 @@
 Group:          Text Editors/Integrated Development Environments (IDE)
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.63
-Requires(postun): java-gcj-compat >= 1.0.63
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
 %endif
 
 %description -n %{libname}-gtk2
@@ -359,8 +359,8 @@
 Group:          Development/Languages
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.63
-Requires(postun): java-gcj-compat >= 1.0.63
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -1643,7 +1643,7 @@
 %changelog
 * Tue Aug 29 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-2
 - Remove double Manifest file in com.jcraft.jsch_0.1.28.jar.
-- Require java-gcj-compat >= 1.0.63.
+- Require java-gcj-compat >= 1.0.64.
 
 * Thu Aug 17 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_12fc
 - Fix tomcat55 patch to not conflict with wst.ws (commons-logging visibility).



From fedora-cvs-commits at redhat.com  Thu Aug 31 04:15:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 00:15:08 -0400
Subject: rpms/esc/devel esc-1.0.0-strings-fix.patch, NONE, 1.1 esc.spec, 1.12,
	1.13
Message-ID: <200608310415.k7V4F8PU022783@cvs.devel.redhat.com>

Author: jmagne

Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22754/devel

Modified Files:
	esc.spec 
Added Files:
	esc-1.0.0-strings-fix.patch 
Log Message:
auto-import esc-1.0.0-9 on branch devel from esc-1.0.0-9.src.rpm

esc-1.0.0-strings-fix.patch:
 app/xpcom/rhCoolKey.cpp                        |    2 
 app/xul/esc/application.ini                    |    2 
 app/xul/esc/chrome/content/esc/ESC.js          |   17 +-
 app/xul/esc/chrome/content/esc/esc.xul         |    6 
 app/xul/esc/chrome/content/esc/settings.xul    |    8 -
 app/xul/esc/chrome/locale/en-US/esc.dtd        |   74 ++++-------
 app/xul/esc/chrome/locale/en-US/esc.properties |  166 ++++++++++++-------------
 lib/NssHttpClient/manifest.mn                  |    2 
 lib/coolkey/manifest.mn                        |    2 
 9 files changed, 135 insertions(+), 144 deletions(-)

--- NEW FILE esc-1.0.0-strings-fix.patch ---
--- ./esc/src/lib/coolkey/manifest.mn.fix8	2006-08-30 20:18:34.177950000 -0700
+++ ./esc/src/lib/coolkey/manifest.mn	2006-08-30 20:18:41.529929000 -0700
@@ -21,7 +21,9 @@
 MODULE		= ckymanager
 LIBRARY_NAME	= $(MODULE)
 REQUIRES	= httpchunked nss nspr ckyapplet 
+ifndef MOZ_OFFSET
 MOZ_OFFSET	= mozilla-1.7.13
+endif
 DEFINES		+= -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC  -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss
 MAPFILE 	= $(OBJDIR)/ckymanager.def
 
--- ./esc/src/lib/NssHttpClient/manifest.mn.fix8	2006-08-30 20:19:28.305789000 -0700
+++ ./esc/src/lib/NssHttpClient/manifest.mn	2006-08-30 20:19:36.075765000 -0700
@@ -22,7 +22,9 @@
 LIBRARY_NAME	= $(MODULE)
 SHARED_NAME	= $(MODULE)
 REQUIRES	= nss nspr 
+ifndef MOZ_OFFSET
 MOZ_OFFSET	= mozilla-1.7.13
+endif
 MAPFILE		= $(OBJDIR)/httpchunked.def
 DEFINES		= -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss
 
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix8	2006-08-30 20:11:35.004211000 -0700
+++ ./esc/src/app/xpcom/rhCoolKey.cpp	2006-08-30 20:11:50.841160000 -0700
@@ -1316,7 +1316,7 @@
 {
     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyVersion \n"));
 
-    char *version = "1.0.0-8";
+    char *version = "1.0.0-9";
     
     char *versionVal =  (char *) nsMemory::Clone(version,sizeof(char) * strlen(version) +  1);
 
--- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix8	2006-08-30 20:14:09.218746000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js	2006-08-30 20:14:14.800729000 -0700
@@ -797,6 +797,8 @@
 
     var dump = "";
 
+    dump += "<p><br>" + getBundleString("diagnosticsMessage") + "<br></p>";
+
     dump += "<p><br><b>" +  getBundleString("coolkeyComponentVersion") + "</b>" ;
     dump += " " + coolkeyVersion ;
 
@@ -1835,11 +1837,6 @@
   // We do want notify events though
   var doPreserveNotify = true;
  
-  if(!TrayLoadedOK())
-  {
-      MyAlert(getBundleString("errorTrayComponent"));
-  }
-
   TrayRemoveWindow(doPreserveNotify);
 }
 
@@ -1989,7 +1986,7 @@
        //Launch admin page if factory mode is enabled
        // or we are without the tray icon.
 
-       if(gFactoryMode  || !TrayLoadedOK())
+       if(gFactoryMode)
        { 
 
            if(adminWnd)    // Handle case where admin page is already up
@@ -2375,7 +2372,7 @@
          EnableItem(enrollbtn);
          DisableItem(resetpinbtn);
          if(!isBusy)
-           detailsKeyLabel.setAttribute("value","Uninitialized Key");
+           detailsKeyLabel.setAttribute("value",getBundleString("uninitializedKey"));
 
          EnableItem(formatbtn);
 
@@ -3164,7 +3161,7 @@
 
   StopCylonAnimation("cylon1", "eye1");
   SetOperationText("");
-  MyAlert(getBundleString("enrollmentFor") + " Key  "  + getBundleString("wasSuccessful"));
+  MyAlert(getBundleString("enrollmentFor") + " "  + getBundleString("smartCard") + " " + getBundleString("wasSuccessful"));
 
 
   if(gEnrollmentPage)
@@ -3215,7 +3212,7 @@
 
   StopCylonAnimation("cylon1", "eye1");
   SetOperationText("");
-  MyAlert(getBundleString("formatOf") + " Key  "    + getBundleString("wasSuccessful"));
+  MyAlert(getBundleString("formatOf") + " " + getBundleString("smartCard") + " "  + getBundleString("wasSuccessful"));
   ClearProgressBar(KeyToProgressBarID(keyType, keyID));
 
    if(gAdminPage)
@@ -4190,7 +4187,7 @@
 function MyAlert(message)
 {
     if(message)
-        DoMyAlert(message,"Red Hat Enterprise Security Client"); 
+        DoMyAlert(message,getBundleString("escTitle")); 
 }
 
 function DoMyAlert(message,title)
--- ./esc/src/app/xul/esc/chrome/content/esc/settings.xul.fix8	2006-08-30 20:14:51.172619000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/settings.xul	2006-08-30 20:14:59.479595000 -0700
@@ -74,10 +74,10 @@
                       </listcols>
                       <listhead>
                           <listheader />
-                          <listheader label="Issuer"/>
-                          <listheader label="Issued To"/>
-                          <listheader label="Status"/>
-                          <listheader label=""/>
+                          <listheader label="&keyIssuer;"/>
+                          <listheader label="&keyIssuedTo;"/>
+                          <listheader label="&keyStatus;"/>
+                          <listheader label="&keyProgress;"/>
                       </listhead>
                   </listbox>
              </groupbox>
--- ./esc/src/app/xul/esc/chrome/content/esc/esc.xul.fix8	2006-08-30 20:15:22.110527000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/esc.xul	2006-08-30 20:15:29.786502000 -0700
@@ -96,17 +96,17 @@
                           </columns>
                           <rows>
                               <row>
-                                  <label value = "Issuer" />
+                                  <label value = "&keyIssuer;" />
                                   <spacer flex ="1"/>
                                   <label id="issuer-id" value ="&unknownIssuer;" />
                               </row>
                               <row>
-                                  <label value = "Status"/>
+                                  <label value = "&keyStatus;"/>
                                   <spacer flex = "1"/>
                                   <label id="status-id" value ="&unknown;"/>
                               </row>
                               <row>
-                                  <label value = "Issued"/>
+                                  <label value = "&keyIssuedTo;"/>
                                   <spacer flex = "1"/>
                                   <label id="issued-to-id" value ="&unknown;"/>
                              </row>
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd.fix8	2006-08-30 20:16:41.346289000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd	2006-08-30 20:16:47.579273000 -0700
@@ -15,12 +15,16 @@
  * All rights reserved.
  ***** END COPYRIGHT BLOCK ***** -->
 
-<!ENTITY escTitle "Red Hat Enterprise Security Client">
-<!ENTITY settingsTitle "Red Hat Enterprise Security Client Settings">
-<!ENTITY configTitle "TPS Configuration Information">
+<!ENTITY escCompany "Red Hat">
+<!ENTITY smartCardManager  "smart card manager">
+<!ENTITY smartCardManagerU "Smart Card Manager">
+<!ENTITY smartCard "smart card">
+<!ENTITY smartCardU "Smart Card">
+<!ENTITY escTitle "Smart Card Manager">
+<!ENTITY configTitle "Phone Home Configuration Information">
 <!ENTITY certInfoTitle "ESC Key Info">
-<!ENTITY advancedInfoTitle "ESC Diagnostics Information">
-<!ENTITY genericAuthTitle "ESC Authentication">
+<!ENTITY advancedInfoTitle "Diagnostics Information">
+<!ENTITY genericAuthTitle "Authentication">
 <!ENTITY progressHeader "Progress">
 <!ENTITY unknownIssuer "Unknown Issuer">
 <!ENTITY unknown "Unknown">
@@ -29,23 +33,12 @@
 <!ENTITY doCancel "Cancel">
 <!ENTITY doResetPin "Reset Pin">
 <!ENTITY doFormat "Format"> 
-<!ENTITY doShowKeyInfo "Show KeyInfo">
-<!ENTITY keyInfo "Key Info">
-<!ENTITY keyPassword "Key Password">
-<!ENTITY navigationMenu "Navigation">
-<!ENTITY operationsMenu "Operations">
-<!ENTITY settingsMenuItem "Settings">
-<!ENTITY enrollmentMenuItem "Enrollment">
-<!ENTITY configMenuItem "Configuration">
-<!ENTITY keysCaption "Keys">
-<!ENTITY keyOperationsCaption "Key Operations">
-<!ENTITY chooseKeyOperation "Choose Key Operation">
-<!ENTITY keyIssuer "Key Issuer">
-<!ENTITY keyIssuedTo "Key Issued To">
-<!ENTITY keyStatus "Key Status">
-<!ENTITY keyProgress "Key Progress">
-<!ENTITY noKeysPresent "NO KEYS PRESENT">
-<!ENTITY keyInformation "Key Information">
+<!ENTITY keyPassword "Password">
+<!ENTITY keyIssuer "Issuer">
+<!ENTITY keyIssuedTo "Issued To">
+<!ENTITY keyStatus "Status">
+<!ENTITY keyProgress "Progress">
+<!ENTITY noKeysPresent "No Cards Present">
 <!ENTITY enterKeyPin "Enter Key Pin">
 <!ENTITY reEnterKeyPin "Re Enter Key Pin">
 <!ENTITY editConfigValues "Edit Configuration Values">
@@ -53,16 +46,15 @@
 <!ENTITY escEnrollURIHeader "ESC ENROLL URI:">
 <!ENTITY updateValues "Update Values">
 <!ENTITY doTest "Test URL">
-<!ENTITY escTitle "Red Hat Enterprise Security Client">
-<!ENTITY pleaseEnroll "Security Key Enrollment">
-<!ENTITY unenrolledDetected "Unenrolled Key Detected">
-<!ENTITY noKeyDetected "No Key Detected">
-<!ENTITY enrollMessage "To begin this enrollment process, you will need to choose a password to protect the key. You will need to enter this password each time you use your new key.  You will also need to enter the security information below needed by ESC to complete your enrollment.">
-<!ENTITY detectedMessage "ESC has detected that you have entered a new and un-enrolled key.  Before you can use this key, you have to enroll it.  Enrolling your key personalizes it so only you can make use of it.">
-<!ENTITY readyToProceed "When you are ready to begin the process,click  Enroll My Key Now.">
-<!ENTITY noKey "Unable to detect your security token.">
-<!ENTITY insertKey "To enroll your key, please insert your security token card or USB key now.">
-<!ENTITY adminNoKeysMessage "In order to administer your security keys, you must have one  or more keys connected to the computer. Please do so now.">
+<!ENTITY pleaseEnroll "Smartcard Enrollment">
+<!ENTITY unenrolledDetected "Unenrolled Smartcard Detected">
+<!ENTITY noKeyDetected "No Smartcard Detected">
+<!ENTITY enrollMessage "To begin the smartcard enrollment process, you will need to choose a password to protect the smartcard. You will need to enter this password each time you use your new smartcard.  You will also need to enter the security information below needed by Smartcard Manager to complete your enrollment.">
+<!ENTITY detectedMessage "Smartcard Manager has detected that you have entered a new and un-enrolled smartcard.  Before you can use this smartcard, you have to enroll it.  Enrolling your smartcard personalizes it so only you can use it for secure operations.">
+<!ENTITY readyToProceed "When you are ready to begin the process,click  Enroll My Smartcard Now.">
+<!ENTITY noKey "Unable to detect your smartcard.">
+<!ENTITY insertKey "To enroll your smartcard, please insert your security card or USB key now.">
+<!ENTITY adminNoKeysMessage "In order to administer your security smartcards, you must have one  or more cards connected to the computer. Please do so now.">
 <!ENTITY progressHeader "Progress">
 <!ENTITY detectedKeyDetailsHeader "Security Information">
 <!ENTITY keyEnrollmentHeader "Create Password">
@@ -71,22 +63,18 @@
 <!ENTITY unknown "Unknown">
 <!ENTITY pleaseEnterPassword "Enter new password:">
 <!ENTITY pleaseReEnterPassword "Re-enter password:">
-<!ENTITY cancel "Cancel">
 <!ENTITY closeEnrollLater "Close, I'll Enroll Later">
 <!ENTITY closeAdminLater "Close">
 <!ENTITY closeNow "Close">
-<!ENTITY enrollKeyNow "Enroll My Key Now">
-<!ENTITY enrollKey "Enroll Key">
-<!ENTITY administerKeys "Manage Keys">
-<!ENTITY administerMessage "Here you can perform various operations upon your key(s). Formatting a key involves preparing a key with the proper information needed to perform future user key enrollments.">
+<!ENTITY enrollKeyNow "Enroll My Smartcard Now">
+<!ENTITY enrollKey "Enroll Smartcard">
+<!ENTITY administerKeys "Manage Smartcards">
+<!ENTITY administerMessage "Here you can perform various operations upon your smartcard(s). For instance, Formatting a card results in preparing a card for future  enrollment.">
 <!ENTITY blankKeyLabel "Blank Key">
-<!ENTITY adminDetailsMessage "This key is not personalized.">
+<!ENTITY adminDetailsMessage "This smartcard is not personalized.">
 <!ENTITY advancedInfo "Diagnostics">
-<!ENTITY doEnroll "Enroll Key">
-<!ENTITY doResetPin "Set/Change Password">
-<!ENTITY doFormat "Format Key">
 <!ENTITY doViewCerts "View Certificates">
-<!ENTITY getESCPassword "ESC Password Information">
+<!ENTITY getESCPassword "Password Information">
 <!ENTITY escOK "OK">
 <!ENTITY escCancel "Cancel">
-<!ENTITY tpsConfigDesc "ESC has detected a totally blank key for which it knows nothing about.  ESC can not determine the location of the TPS information for this key. Please enter the correct value so ESC can contact the TPS. The correct value is of the form: http(s)://test.host.com:7888/home.cgi.">
+<!ENTITY tpsConfigDesc "Smartcard Manager has detected a totally blank smartcard.  Smartcard Manager can not determine the location of the Smartcard Server for this card. Please enter the correct URL value so the Smartcard Server can be reached. The value should be of the form: http(s)://test.host.com:7888/home.cgi.">
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix8	2006-08-30 20:17:19.147177000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties	2006-08-30 20:17:27.326152000 -0700
@@ -16,10 +16,13 @@
 
 #ESC strings used in Javascript
 #Strings for ESC.js 
-escTitle=Red Hat Enterprise Security Client
-enrolledKey=Enrolled Key
-noKeysPresent=No Keys Present
-blankKey=Blank Key
+escTitle=Smart Card Manager
+smartCard=smartcard
+smartCardU=Smartcard
+enrolledKey=Enrolled
+noKeysPresent=No Cards Present
+blankKey=Blank
+uninitializedKey=Uninitialized
 statusEnrolled=ENROLLED
 statusUnavailable=UNAVAILABLE
 statusNoApplet=NO APPLET
@@ -27,70 +30,70 @@
 statusUnknown=UNKNOWN
 statusBusy=BUSY
 unknownIssuer=Unknown Issuer
-redHatUser=Red Hat User
+redHatUser=User
 statusUnknown=Unknown
-tokenInformation=TOKEN INFORMATION
+tokenInformation=CARD INFORMATION
 advancedInformation=Diagnostics Information
 keyID=Key ID
-tpsURI=TPS Server URL
-tpsUI=TPS External UI URL
+tpsURI=Server URL
+tpsUI=External UI URL
 status=Status
 issuer=Issuer
-escLogEntries=ESC Log Entries
+escLogEntries=Log Entries
 noLogFileOrData=No Log File or Log File Has No Data.
 certsOnToken=CERTIFICATES on KEY 
 certificateNickname=Certificate Nickname:
-coolkeyComponentVersion=ESC Version
-coolkeyDetectedNumberKeys=Number of Security Keys Detected
-enrolledDetected=Enrolled Key Detected
-enrolledDetectedMessage=ESC has detected an enrolled key. If you would rather not re-enroll this key press "Close".  
-formatingToken=Formatting Key 
-enrollingToken=Enrolling Key 
-resettingTokenPIN=Resetting Key Pin 
-cancellingOperation=Cancelling 
-blinkingToken=Blinking 
-keyInserted=Key Inserted!
-keyRemoved=Key Removed!
-keyInsertedComputer=Security Key Inserted into the computer.
-keyRemovedComputer=Security Key Removed from the computer.
+coolkeyComponentVersion=Smartcard Manager Version
+coolkeyDetectedNumberKeys=Number of Security Smartcards Detected
+enrolledDetected=Enrolled Smartcard Detected
+enrolledDetectedMessage=Smartcard Manager has detected an enrolled card. If you would rather not re-enroll this card press "Close".  
+formatingToken=Formatting... 
+enrollingToken=Enrolling... 
+resettingTokenPIN=Resetting Password... 
+cancellingOperation=Cancelling... 
+blinkingToken=Blinking... 
+keyInserted=Smartcard Inserted!
+keyRemoved=Smartcard Removed!
+keyInsertedComputer=Security Smartcard Inserted into the computer.
+keyRemovedComputer=Security Smartcard Removed from the computer.
+diagnosticsMessage=The information below is diagnostic information that your system generates as you use your smartcard. If you are having smartcard problems, you may be asked by your support engineer to send this information for analysis.
 #ESC Error Messages from TPS
 errorNone=Operation Completed Successfully.
-serverError=Server Error.
-errorProblemResetTokenPin=Problem resetting token's pin.
-errorTokenEnrollment=Token Enrollment Error.
-errorCommCA=Error communicating with the Certificate Authority, try again later.
-errorInternalServer=Internal Server Error.
-errorResetPin=Error resetting the token's pin.
-errorInternalServer=Internal Server Error.
-errorAuthFailure=Authentication Failure, Try Again.
-errorTokenDisabled=Token is disabled, contact technical support.
-errorProblemCommToken=Problem communicating with the token.
-errorTokenUpgrade=Cannot upgrade token software.
-errorInvalidTokenType=Invalid token type.
-errorCannotPublish=Cannot publish.
-errorCommTokenDB=Cannot communicate with token database, try again later.
-errorTokenDisabled=Token is disabled, contact techincal support.
-errorPinReset=Cannot reset pin value for the token, contact technical support.
-errorConnLost=Connection to server lost. If problem persists, contact technical support. 
-errorEntryTokenDB=Can not create entry for token in database, contact technical support.
-errorNoTokenState=No such token state, contact technical support.
-errorInvalidLostTokenReason=Invalid lost token reason, contact technical support.
-errorTokenUnusable=Token unusable due to compromise,contact technical support.
-errorNoInactiveToken=No such inactive token, contact technical support.
-errorProcessMultiTokens=Can not process more than one active token.
-errorKeyRecoveryProcessed=Key Recovery has been processed.
-errorKeyRecoveryFailed=Key Recovery failed, contact technical support.
-errorNoOperateLostToken=Can not operate on token reported lost, contact technical support.
-errorKeyArchival=Key archival error, contact technical support.
-errorConnTKS=Problem connecting to the TKS, contact technical support.
-errorFailUpdateTokenDB=Failed to update token database, contact technical support.
-errorCertRevocation=Internal certificate revocation error,contact technical support.
-errorNotOwnToken=User does not own this token, contact technical support.
-errorESCMisconfigured=ESC has been misconfigured, reconfigure and try again.
-errorESCNoCommCardReader=ESC can't communicate with card reader.
-errorESCNoTokenSession=ESC can't initiate session with token.
-errorESCNoTalkTPS=ESC can't talk to TPS.
-errorESCNoTalkTokenReader=ESC can't talk to token reader.
+serverError=Smartcard Server error.
+errorProblemResetTokenPin=Problem resetting smartcard's pin.
+errorTokenEnrollment=Smartcard enrollment error.
+errorCommCA=Error communicating with the Certification Authority.
+errorInternalServer=Internal Smartcard Server error.
+errorResetPin=Error resetting the smartcard's password.
+errorInternalServer=Internal Smartcard server error.
+errorAuthFailure=Smartcard Server authentication failure.
+errorTokenDisabled=Your smartcard is listed as disabled.
+errorProblemCommToken=Problem communicating with the smartcard.
+errorTokenUpgrade=Cannot upgrade smartcard software.
+errorInvalidTokenType=Invalid smartcard type.
+errorCannotPublish=Cannot publish smartcard information.
+errorCommTokenDB=Cannot communicate with smartcard database.
+errorPinReset=Cannot reset the password value for the smartcard.
+errorConnLost=Connection to Smartcard Server.
+errorEntryTokenDB=Can not create entry for smartcard in smartcard database.
+errorNoTokenState=Smartcard found to be in an inconsistent state.
+errorInvalidLostTokenReason=Invalid reason for lost smartcard submitted.
+errorTokenUnusable=Smartcard found to be unusable due to compromise.
+errorNoInactiveToken=No such inactive smartcard found.
+errorProcessMultiTokens=Can not process more than one active smartcard.
+errorKeyRecoveryProcessed=Smartcard key recovery has been processed.
+errorKeyRecoveryFailed=Smartcard key recovery failed.
+errorNoOperateLostToken=Cannot process this smartcard, which has been reported lost.
+errorKeyArchival=Smartcard key archival error.
+errorConnTKS=Problem connecting to the Smartcard TKS Server.
+errorFailUpdateTokenDB=Failed to update smartcard database.
+errorCertRevocation=Internal certificate revocation error discovered.
+errorNotOwnToken=User does not own this smartcard.
+errorESCMisconfigured=Smartcard Manager has been misconfigured.
+errorESCNoCommCardReader=Smartcard Manager can't communicate with card reader.
+errorESCNoTokenSession=Smartcard Manager can't initiate session with smartcard.
+errorESCNoTalkTPS=Smartcard Manager can't talk to Smartcard Server.
+errorESCNoTalkTokenReader=Smartcard Manager can't talk to smartcard reader.
 #ESC text in general  Alert messages
 errorCoolKeyIsAuth=coolkey.GetCoolKeyIsAuthenticated() failed!
 errorAuthCoolKey=coolkey.AuthenticateCoolKey failed!
@@ -101,19 +104,19 @@
 errorSetConfigValue=Error SettingConfig Value: 
 errorBlankTPSURI=Blank Tps Uri submitted.
 noTpsConfigUrl=You must provide a Url to test!
-aboutToTestTPSURI=About to test TPS URI:
-errorSelectKey=Please select a key.
-tpsURLContacted=TPS URL has been successfully contacted.
-errorContactTPSURL=Error contacting TPS URL, reconfigure and try again.
+aboutToTestTPSURI=About to test Smartcard Server URI:
+errorSelectKey=Please select a Smartcard.
+tpsURLContacted=Smartcard Server URL has been successfully contacted.
+errorContactTPSURL=Error contacting Smartcard Server URL, reconfigure and try again.
 errorBlankEnrollURI=Blank Enroll Uri submitted.
 aboutToTestEnrollURI=About to test Enroll URI:
-enrollURLContacted=ESC Enrollment URL has been successfully contacted.
-errorContactEnrollURL=Error contacting ESC Enroll URL, reconfigure and try again.
-tpsConfigSuccess=TPS config information successfully obtained!
-tpsConfigError=Error obtaining TPS config information!
-tpsConfigTest=About to test the TSP Phone Home Url :
-tpsNoConfigUrl=Provide a valid TPS config URL!
-tpsURIMustHaveValue=TPS URI item must have a value!
+enrollURLContacted=x Enrollment URL has been successfully contacted.
+errorContactEnrollURL=Error contacting  Enroll URL, reconfigure and try again.
+tpsConfigSuccess=Smartcard Server config information successfully obtained!
+tpsConfigError=Error obtaining Smartcard Server config information!
+tpsConfigTest=About to test the Smartcard Server Phone Home Url :
+tpsNoConfigUrl=Provide a valid Smartcard Server config URL!
+tpsURIMustHaveValue=Smartcard Server URL item must have a value!
 errorSetConfigValue=Error setting config value!:
 configChangesSubmitted=Configuration changes submitted.
 errorSetDataValue=Error Setting data values:
@@ -127,34 +130,33 @@
 errorGetAvailCoolKeys=coolkey.GetAvailableCoolKeys() failed!
 errorEnollCoolKey=coolkey.EnrollCoolKey() failed!
 errorCoolKeyIsEnrolled=coolkey.GetCoolKeyIsEnrolled failed!
-errorResetCoolKeyPIN=coolkey.ResestCoolKeyPIN() failed! Make sure Key is properly Enrolled.
+errorResetCoolKeyPIN=coolkey.ResestCoolKeyPIN() failed! Make sure Smartcard is properly Enrolled.
 errorFormatCoolKey=coolkey.FormatCoolKey() failed!
 errorCancelCoolKey=coolkeyCancelCoolKeyOperation() failed!
 errorBlinkCoolKey=coolkey.BlinkCoolKey() failes!
-noCurrentlySelectedToken=No currently selected Key!
+noCurrentlySelectedToken=No currently selected smartcard!
 errorProvideScreenName=You must provide a valid screen name!
 errorProvideTokenPIN=You must provide a valid TokenPIN!
 errorMatchPinValues=The PIN values you entered don't match!
 errorValidUserPassword=You must provide a valid User Password!
-errorSelectKey=Please select a key.
-errorEnrolledFirst=Key must be enrolled first! Enroll key and try again.
+errorSelectKey=Please select a smartcard.
+errorEnrolledFirst=Smartcard must be enrolled first! Enroll card and try again.
 enrollmentFor=Enrollment for
 wasSuccessful=was successful.
-pinResetSuccessful=PIN Reset was successfull!
+pinResetSuccessful=Password Reset was successfull!
 formatOf=Format of
 error=Error
 serverResponse= \n\n Server Response: 
-enrollmentOfKey=Enrollment of key
-formatingOfKey=Formatting of key
-pinResetOfKey=PIN Reset for key
-operationForKey=Operation for key
+enrollmentOfKey=Enrollment of smartcard 
+formatingOfKey=Formatting of smartcard
+pinResetOfKey=PIN Reset for smartcard 
+operationForKey=Operation for smartcard 
 failed=failed. 
 cancelled=cancelled.
-errorFindESCPlatform=Unable to determine ESC platform.
+errorFindESCPlatform=Unable to determine Smartcard Manager platform.
 errorIssuerInfo=Error obtaining Issuer Info for key.
-#Strings for TRAY.js
-errorTrayComponent=ESC can not be operated with its Icon in the notification area. \n Please insert a Security Key to bring ESC to life.
-errorTrayIsInitialized=Can't get if Tray is already intialized!
+#Strings for TRAY.j
+errorTrayIsInitialized=Can't determine if Icon component is already intialized!
 errorShowAllWindows=Error Showing All Windows:
 errorHideAllWindows=Error Hiding all Windows:
 errorShowWindow=Error Showing Window:
--- ./esc/src/app/xul/esc/application.ini.fix8	2006-08-30 20:12:28.666045000 -0700
+++ ./esc/src/app/xul/esc/application.ini	2006-08-30 20:12:40.277012000 -0700
@@ -29,7 +29,7 @@
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.
-BuildID=0000000008
+BuildID=0000000009
 ;
 ; This ID is just an example.  Every XUL app ought to have it's own unique ID.
 ; You can use the microsoft "guidgen" or "uuidgen" tools, or go on


Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- esc.spec	30 Aug 2006 03:43:44 -0000	1.12
+++ esc.spec	31 Aug 2006 04:15:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 8%{?dist} 
+Release: 9%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -15,6 +15,7 @@
 Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
 Patch6: esc-1.0.0-ui-enhance.patch
 Patch7: esc-1.0.0-notify-icon-fixes.patch
+Patch8: esc-1.0.0-strings-fix.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -68,6 +69,7 @@
 %patch5 -p1 -b .fix5
 %patch6 -p1 -b .fix6
 %patch7 -p1 -b .fix7
+%patch8 -p1 -b .fix8
 
 #Unpack xulrunner where esc expects it to be.
 
@@ -175,6 +177,9 @@
 fi
 
 %changelog
+* Wed Aug 30 2006 Jack Magne <jmagne at redhat.com>-  1.0.0-9
+- Revision of the strings used in ESC.
+
 * Sat Aug 27 2006 Jack Magne <jmagne at redhat.com>-  1.0.0-8
 - Fixes to get libnotify working properly on FC6 systems.
 



From fedora-cvs-commits at redhat.com  Thu Aug 31 07:08:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 03:08:08 -0400
Subject: rpms/glibc/devel .cvsignore, 1.169, 1.170 glibc-fedora.patch, 1.177,
	1.178 glibc.spec, 1.262, 1.263 sources, 1.193, 1.194
Message-ID: <200608310708.k7V788oq019748@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19722/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4.90-27 on branch devel from glibc-2.4.90-27.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- .cvsignore	28 Aug 2006 19:38:25 -0000	1.169
+++ .cvsignore	31 Aug 2006 07:08:05 -0000	1.170
@@ -1,2 +1,2 @@
-glibc-20060828T1903.tar.bz2
-glibc-fedora-20060828T1903.tar.bz2
+glibc-20060831T0640.tar.bz2
+glibc-fedora-20060831T0640.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 57 files changed, 1394 insertions(+), 631 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- glibc-fedora.patch	28 Aug 2006 19:38:25 -0000	1.177
+++ glibc-fedora.patch	31 Aug 2006 07:08:05 -0000	1.178
@@ -1,5 +1,5 @@
---- glibc-20060828T1903/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060828T1903-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060831T0640/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060831T0640-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060828T1903/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060828T1903-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060831T0640/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060831T0640-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060828T1903/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060828T1903-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060831T0640/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060831T0640-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060828T1903/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060828T1903-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060831T0640/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060831T0640-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060828T1903/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060828T1903-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060831T0640/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060831T0640-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060828T1903/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060828T1903-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060831T0640/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060831T0640-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060828T1903/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060828T1903-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060831T0640/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060831T0640-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060828T1903/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060828T1903-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060831T0640/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060831T0640-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060828T1903/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060828T1903-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060831T0640/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060831T0640-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060828T1903/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060828T1903-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060831T0640/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060831T0640-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060828T1903/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060828T1903-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060831T0640/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T0640-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-20060828T1903/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060828T1903-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060831T0640/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T0640-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-20060828T1903/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060828T1903-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060831T0640/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060831T0640-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060828T1903/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060828T1903-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060831T0640/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060831T0640-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060828T1903/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060828T1903-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060831T0640/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060831T0640-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060828T1903/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060828T1903-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060831T0640/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060831T0640-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060828T1903/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060828T1903-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060831T0640/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060831T0640-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060828T1903/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060828T1903-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060831T0640/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060831T0640-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060828T1903/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
-+++ glibc-20060828T1903-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
+--- glibc-20060831T0640/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
++++ glibc-20060831T0640-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
 @@ -77,6 +77,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060828T1903/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060828T1903-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060831T0640/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060831T0640-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060828T1903/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
-+++ glibc-20060828T1903-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
+--- glibc-20060831T0640/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
++++ glibc-20060831T0640-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20060828T1903/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060828T1903-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060831T0640/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T0640-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -950,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060828T1903/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060828T1903-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060831T0640/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060831T0640-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -979,8 +979,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060828T1903/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060828T1903-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060831T0640/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060831T0640-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1056,8 +1056,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060828T1903/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060828T1903-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060831T0640/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060831T0640-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -1113,17 +1113,17 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060828T1903/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060828T1903-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060831T0640/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060831T0640-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060828T1903/nptl/ChangeLog	25 Aug 2006 13:29:19 -0000	1.913
-+++ glibc-20060828T1903-fedora/nptl/ChangeLog	28 Aug 2006 19:19:33 -0000	1.706.2.100
-@@ -1045,6 +1045,15 @@
+--- glibc-20060831T0640/nptl/ChangeLog	30 Aug 2006 19:11:05 -0000	1.914
++++ glibc-20060831T0640-fedora/nptl/ChangeLog	31 Aug 2006 06:53:29 -0000	1.706.2.101
+@@ -1054,6 +1054,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1139,7 +1139,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1781,6 +1790,11 @@
+@@ -1790,6 +1799,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1151,7 +1151,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3855,6 +3869,11 @@
+@@ -3864,6 +3878,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1163,8 +1163,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060828T1903/nptl/Makefile	21 Aug 2006 21:02:10 -0000	1.186
-+++ glibc-20060828T1903-fedora/nptl/Makefile	22 Aug 2006 09:05:40 -0000	1.157.2.26
+--- glibc-20060831T0640/nptl/Makefile	21 Aug 2006 21:02:10 -0000	1.186
++++ glibc-20060831T0640-fedora/nptl/Makefile	22 Aug 2006 09:05:40 -0000	1.157.2.26
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1187,8 +1187,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060828T1903/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060828T1903-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060831T0640/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060831T0640-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1213,8 +1213,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060828T1903-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1222,8 +1222,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
-+++ glibc-20060828T1903-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
+--- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
++++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
 @@ -68,6 +68,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1559,8 +1559,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060828T1903-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@@ -1706,8 +1706,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060828T1903-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
 @@ -44,9 +44,16 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -1808,8 +1808,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060828T1903-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1951,8 +1951,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
-+++ glibc-20060828T1903-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
+--- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
++++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
 @@ -49,6 +49,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2340,8 +2340,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060828T1903/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060828T1903-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
 @@ -46,8 +46,13 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -2436,8 +2436,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060828T1903/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060828T1903-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060831T0640/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060831T0640-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2460,8 +2460,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060828T1903/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060828T1903-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060831T0640/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060831T0640-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2480,8 +2480,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060828T1903/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060828T1903-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060831T0640/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060831T0640-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2493,8 +2493,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060828T1903/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060828T1903-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060831T0640/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060831T0640-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -2535,8 +2535,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060828T1903/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
-+++ glibc-20060828T1903-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
+--- glibc-20060831T0640/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
++++ glibc-20060831T0640-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2570,8 +2570,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060828T1903/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060828T1903-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060831T0640/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T0640-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -2588,8 +2588,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060828T1903/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060828T1903-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060831T0640/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060831T0640-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -2605,8 +2605,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060828T1903/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060828T1903-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060831T0640/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060831T0640-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2620,8 +2620,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060828T1903/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060828T1903-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060831T0640/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060831T0640-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -2633,8 +2633,8 @@
  endif
  endif
  
---- glibc-20060828T1903/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060828T1903-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060831T0640/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060831T0640-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -2986,8 +2986,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060828T1903/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060828T1903-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060831T0640/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T0640-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3073,8 +3073,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060828T1903/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20060828T1903-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20060831T0640/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20060831T0640-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3089,8 +3089,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20060828T1903/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
-+++ glibc-20060828T1903-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+--- glibc-20060831T0640/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20060831T0640-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
 @@ -18,11 +18,14 @@
     02111-1307 USA.  */
  
@@ -3138,8 +3138,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060828T1903/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060828T1903-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060831T0640/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060831T0640-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;
@@ -3182,8 +3182,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060828T1903/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060828T1903-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060831T0640/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060831T0640-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"
@@ -3193,8 +3193,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060828T1903/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060828T1903-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060831T0640/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060831T0640-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;
@@ -3240,8 +3240,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060828T1903/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060828T1903-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060831T0640/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T0640-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.
@@ -3302,8 +3302,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060828T1903/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060828T1903-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060831T0640/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060831T0640-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)
@@ -3336,24 +3336,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060828T1903/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060828T1903-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060831T0640/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T0640-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-20060828T1903/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060828T1903-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060831T0640/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T0640-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-20060828T1903/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060828T1903-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060831T0640/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060831T0640-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.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- glibc.spec	28 Aug 2006 19:38:25 -0000	1.262
+++ glibc.spec	31 Aug 2006 07:08:06 -0000	1.263
@@ -1,9 +1,9 @@
-%define glibcdate 20060828T1903
+%define glibcdate 20060831T0640
 %define glibcname glibc
-%define glibcsrcdir glibc-20060828T1903
+%define glibcsrcdir glibc-20060831T0640
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 26
+%define glibcrelease 27
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1453,6 +1453,12 @@
 %endif
 
 %changelog
+* Thu Aug 31 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-27
+- allow $LIB and $PLATFORM in dlopen parameters even in suid/sgid (#204399)
+- fix splice prototype (#204530)
+- fix pthread_rwlock_{,try,timed}wrlock to honor reader preference
+  if requested
+
 * Mon Aug 28 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-26
 - real fix for the doubly linked list corruption problem
 - try harder in realloc to allocate memory (BZ#2684)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- sources	28 Aug 2006 19:38:25 -0000	1.193
+++ sources	31 Aug 2006 07:08:06 -0000	1.194
@@ -1,2 +1,2 @@
-44f225e2f657adb9bac4d9b0f068c249  glibc-20060828T1903.tar.bz2
-8a2de30d50ada259078dc6c124b75b2e  glibc-fedora-20060828T1903.tar.bz2
+aa91a2595015d0e994521e1e8f8c5c11  glibc-20060831T0640.tar.bz2
+b6bab044c304b57ef66761fe1b972b6b  glibc-fedora-20060831T0640.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 31 07:31:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 03:31:29 -0400
Subject: rpms/m17n-db/devel .cvsignore, 1.24, 1.25 m17n-db.spec, 1.32,
	1.33 sources, 1.26, 1.27
Message-ID: <200608310731.k7V7VT2m003093@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3068

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
Updates for RH bug 204275 and 177372



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	8 Aug 2006 08:12:49 -0000	1.24
+++ .cvsignore	31 Aug 2006 07:31:24 -0000	1.25
@@ -1,2 +1,2 @@
 m17n-db-1.3.3.tar.gz
-m17n-db-indic-0.4.13.tar.gz
+m17n-db-indic-0.4.14.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- m17n-db.spec	8 Aug 2006 08:12:49 -0000	1.32
+++ m17n-db.spec	31 Aug 2006 07:31:24 -0000	1.33
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.13
+%define indic_ver 0.4.14
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	17%{?dist}
+Release:	18%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -348,6 +348,13 @@
 %description vietnamese
 m17n-db Vietnamese input map.
 
+%package urdu
+Summary:	m17n-db input table for Urdu
+Group:		System Environment/Libraries
+
+%description urdu
+m17n-db Urdu input map.
+
 
 %prep
 %setup -q -a1
@@ -681,7 +688,19 @@
 %{_datadir}/m17n/icons/vi-*.png
 
 
+%files urdu
+%defattr(-,root,root)
+%dir %{_datadir}/m17n
+%{_datadir}/m17n/ur-*.mim
+%{_datadir}/m17n/icons/ur-*.png
+
+
 %changelog
+* Tue Aug 31 2006 Mayank Jain <majain at redhat.com>
+- Updated bn-{inscript,probhat,itrans} for RH bug #204275
+- Added ur-phonetic.mim file for RH bug #177372
+- Updated m17n-db.spec file to incorporate Urdu keymap.
+
 * Tue Aug 8 2006 Mayank Jain <majain at redhat.com>
 - Updated bn-probhat.mim for RH bz #200890 ...weird... that previous update didnt showed up!
 - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200890#c4


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	8 Aug 2006 08:12:49 -0000	1.26
+++ sources	31 Aug 2006 07:31:25 -0000	1.27
@@ -1,2 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-63035b690cca5df3319b12cbf35ad9f9  m17n-db-indic-0.4.13.tar.gz
+3e24db9655db17d623541b6a292c8701  m17n-db-indic-0.4.14.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 31 07:41:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 03:41:25 -0400
Subject: rpms/m17n-db/devel m17n-db.spec,1.33,1.34
Message-ID: <200608310741.k7V7fPvY003396@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3381

Modified Files:
	m17n-db.spec 
Log Message:
Workaround for missing ur-phonetic.png file



Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- m17n-db.spec	31 Aug 2006 07:31:24 -0000	1.33
+++ m17n-db.spec	31 Aug 2006 07:41:23 -0000	1.34
@@ -692,7 +692,7 @@
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/ur-*.mim
-%{_datadir}/m17n/icons/ur-*.png
+#%{_datadir}/m17n/icons/ur-*.png
 
 
 %changelog



From fedora-cvs-commits at redhat.com  Thu Aug 31 07:57:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 03:57:40 -0400
Subject: rpms/m17n-db/devel .cvsignore, 1.25, 1.26 m17n-db.spec, 1.34,
	1.35 sources, 1.27, 1.28
Message-ID: <200608310757.k7V7veUk018815@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18798

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
Corrected missing ur-* error in build



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	31 Aug 2006 07:31:24 -0000	1.25
+++ .cvsignore	31 Aug 2006 07:57:27 -0000	1.26
@@ -1,2 +1,2 @@
 m17n-db-1.3.3.tar.gz
-m17n-db-indic-0.4.14.tar.gz
+m17n-db-indic-0.4.15.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- m17n-db.spec	31 Aug 2006 07:41:23 -0000	1.34
+++ m17n-db.spec	31 Aug 2006 07:57:38 -0000	1.35
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.14
+%define indic_ver 0.4.15
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	18%{?dist}
+Release:	19%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -692,7 +692,6 @@
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/ur-*.mim
-#%{_datadir}/m17n/icons/ur-*.png
 
 
 %changelog


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	31 Aug 2006 07:31:25 -0000	1.27
+++ sources	31 Aug 2006 07:57:38 -0000	1.28
@@ -1,2 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-3e24db9655db17d623541b6a292c8701  m17n-db-indic-0.4.14.tar.gz
+ca33ee2639b52f53c7afa25f474be454  m17n-db-indic-0.4.15.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 31 09:18:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 05:18:23 -0400
Subject: rpms/m17n-db/devel .cvsignore,1.26,1.27 sources,1.28,1.29
Message-ID: <200608310918.k7V9IN8f001163@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29663

Modified Files:
	.cvsignore sources 
Log Message:
Correcting the build with correct tar.gz file upload



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	31 Aug 2006 07:57:27 -0000	1.26
+++ .cvsignore	31 Aug 2006 09:18:19 -0000	1.27
@@ -1,2 +1 @@
-m17n-db-1.3.3.tar.gz
 m17n-db-indic-0.4.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	31 Aug 2006 07:57:38 -0000	1.28
+++ sources	31 Aug 2006 09:18:19 -0000	1.29
@@ -1,2 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-ca33ee2639b52f53c7afa25f474be454  m17n-db-indic-0.4.15.tar.gz
+384f2556ce105cb431e4268737f6ecb2  m17n-db-indic-0.4.15.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 31 09:18:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 05:18:43 -0400
Subject: rpms/paps/devel paps-formfeed.patch, NONE, 1.1 paps.spec, 1.12,
	1.13 paps-0.6.3-formfeed.patch, 1.1, NONE
Message-ID: <200608310918.k7V9Ih3e001226@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1187

Modified Files:
	paps.spec 
Added Files:
	paps-formfeed.patch 
Removed Files:
	paps-0.6.3-formfeed.patch 
Log Message:
* Thu Aug 31 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-13
- paps-formfeed.patch: fixed to not insert an extra line in next page.
  (#202638)

paps-formfeed.patch:
 paps.c |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

--- NEW FILE paps-formfeed.patch ---
diff -ruN -x 'Makefile*' -x autom4te.cache -x 'config*' -x doc -x libtool -x .deps -x .libs -x '*a' -x '*o' -x paps -x '*orig' -x 'stamp*' -x 'test*' paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
--- paps-0.6.6.orig/src/paps.c	2006-05-03 18:09:58.000000000 +0900
+++ paps-0.6.6/src/paps.c	2006-08-31 17:57:47.000000000 +0900
@@ -88,6 +88,7 @@
   PangoLayoutLine *pango_line;
   PangoRectangle logical_rect;
   PangoRectangle ink_rect;
+  int formfeed;
 } LineLink;
 
 typedef struct _Paragraph Paragraph;
@@ -98,6 +99,7 @@
   char *text;
   int length;
   int height;   /* Height, in pixels */
+  int formfeed;
   PangoLayout *layout;
 };
 
@@ -428,7 +430,7 @@
           fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ());
           wc = 0;
         }
-      if (!*p || !wc || wc == '\n')
+      if (!*p || !wc || wc == '\n' || wc == '\f')
         {
           Paragraph *para = g_new (Paragraph, 1);
           para->text = last_para;
@@ -442,6 +444,11 @@
           pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
           para->height = 0;
 
+          if (wc == '\f')
+              para->formfeed = 1;
+          else
+              para->formfeed = 0;
+
           last_para = next;
             
           result = g_list_prepend (result, para);
@@ -469,6 +476,7 @@
   while(par_list)
     {
       int para_num_lines, i;
+      LineLink *line_link;
       Paragraph *para = par_list->data;
 
       para_num_lines = pango_layout_get_line_count(para->layout);
@@ -476,12 +484,15 @@
       for (i=0; i<para_num_lines; i++)
         {
           PangoRectangle logical_rect, ink_rect;
-          LineLink *line_link = g_new(LineLink, 1);
           
+          line_link = g_new(LineLink, 1);
+          line_link->formfeed = 0;
           line_link->pango_line = pango_layout_get_line(para->layout, i);
           pango_layout_line_get_extents(line_link->pango_line,
                                         &ink_rect, &logical_rect);
           line_link->logical_rect = logical_rect;
+          if (para->formfeed && i == (para_num_lines - 1))
+              line_link->formfeed = 1;
           line_link->ink_rect = ink_rect;
           line_list = g_list_prepend(line_list, line_link);
         }
@@ -504,6 +515,7 @@
   int column_y_pos = 0;
   int page_idx = 1;
   int pango_column_height = page_layout->column_height * page_layout->pt_to_pixel * PANGO_SCALE;
+  LineLink *prev_line_link = NULL;
 
   start_page(OUT, page_idx);
 
@@ -516,8 +528,9 @@
       PangoLayoutLine *line = line_link->pango_line;
       
       /* Check if we need to move to next column */
-      if (column_y_pos + line_link->logical_rect.height
-          >= pango_column_height)
+      if ((column_y_pos + line_link->logical_rect.height
+           >= pango_column_height) ||
+          (prev_line_link && prev_line_link->formfeed))
         {
           column_idx++;
           column_y_pos = 0;
@@ -547,6 +560,7 @@
       column_y_pos += line_link->logical_rect.height;
       
       pango_lines = pango_lines->next;
+      prev_line_link = line_link;
     }
   eject_page(OUT);
   return page_idx;


Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- paps.spec	17 Aug 2006 11:40:04 -0000	1.12
+++ paps.spec	31 Aug 2006 09:18:40 -0000	1.13
@@ -9,7 +9,7 @@
 BuildRequires:	pango-devel automake autoconf libtool doxygen cups-devel
 Patch0:		paps-makefile.patch
 ## http://sourceforge.net/mailarchive/forum.php?thread_id=9329194&forum_id=47278
-Patch2:		paps-0.6.3-formfeed.patch
+Patch2:		paps-formfeed.patch
 ## http://sourceforge.net/tracker/index.php?func=detail&aid=1494769&group_id=153049&atid=786242
 Patch3:		paps-0.6.6-encoding.patch
 ## fixed in CVS
@@ -76,6 +76,10 @@
 
 
 %changelog
+* Thu Aug 31 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-13
+- paps-formfeed.patch: fixed to not insert an extra line in next page.
+  (#202638)
+
 * Thu Aug 17 2006 Tim Waugh <twaugh at redhat.com> - 0.6.6-12
 - Map CUPS charset names to real ones (bug #197577).
 


--- paps-0.6.3-formfeed.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 31 09:19:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 05:19:13 -0400
Subject: rpms/paps/devel paps.spec,1.13,1.14
Message-ID: <200608310919.k7V9JDZB001284@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1270

Modified Files:
	paps.spec 
Log Message:



Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- paps.spec	31 Aug 2006 09:18:40 -0000	1.13
+++ paps.spec	31 Aug 2006 09:19:11 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		paps
 Version:	0.6.6
-Release:	12%{?dist}
+Release:	13%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/



From fedora-cvs-commits at redhat.com  Thu Aug 31 11:41:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 07:41:34 -0400
Subject: rpms/libsemanage/devel libsemanage.spec,1.106,1.107
Message-ID: <200608311141.k7VBfYCd031096@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31082

Modified Files:
	libsemanage.spec 
Log Message:



Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- libsemanage.spec	23 Aug 2006 17:59:58 -0000	1.106
+++ libsemanage.spec	31 Aug 2006 11:41:18 -0000	1.107
@@ -1,9 +1,9 @@
-	%define libsepolver 1.12.23-1
-%define libselinuxver 1.30.26-1
+%define libsepolver 1.12.25-3
+%define libselinuxver 1.30.27-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.6.16
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -76,6 +76,9 @@
 
 %changelog
 
+* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.16-2
+- Fix requires lines
+
 * Wed Aug 23 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.16-1
 - Upgrade to latest from NSA
 	* Make most copy errors fatal, but allow exceptions for



From fedora-cvs-commits at redhat.com  Thu Aug 31 11:42:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 07:42:50 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.118,
	1.119 policycoreutils-rhat.patch, 1.219,
	1.220 policycoreutils.spec, 1.301, 1.302 sources, 1.122, 1.123
Message-ID: <200608311142.k7VBgo19031157@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31136

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-2
- Fix init script and add translations



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- .cvsignore	12 Aug 2006 17:16:43 -0000	1.118
+++ .cvsignore	31 Aug 2006 11:42:45 -0000	1.119
@@ -110,3 +110,4 @@
 policycoreutils-1.30.22.tgz
 policycoreutils-1.30.25.tgz
 policycoreutils-1.30.26.tgz
+policycoreutils-1.30.27.tgz

policycoreutils-rhat.patch:
 po/af.po                     |   98 +++----
 po/am.po                     |   98 +++----
 po/ar.po                     |   98 +++----
 po/be.po                     |   98 +++----
 po/bg.po                     |   98 +++----
 po/bn.po                     |   98 +++----
 po/bn_IN.po                  |   98 +++----
 po/ca.po                     |   98 +++----
 po/cs.po                     |   98 +++----
 po/cy.po                     |   98 +++----
 po/da.po                     |   96 +++----
 po/de.po                     |  560 ++++++++++++++++---------------------------
 po/el.po                     |  102 +++----
 po/en_GB.po                  |   98 +++----
 po/es.po                     |   98 +++----
 po/et.po                     |   96 +++----
 po/eu_ES.po                  |   98 +++----
 po/fa.po                     |   98 +++----
 po/fi.po                     |   98 +++----
 po/fr.po                     |   98 +++----
 po/gl.po                     |   96 +++----
 po/gu.po                     |   98 +++----
 po/he.po                     |   98 +++----
 po/hi.po                     |  102 +++----
 po/hr.po                     |   98 +++----
 po/hu.po                     |   98 +++----
 po/hy.po                     |   98 +++----
 po/id.po                     |   96 +++----
 po/is.po                     |   98 +++----
 po/it.po                     |   98 +++----
 po/ja.po                     |   98 +++----
 po/ka.po                     |   98 +++----
 po/kn.po                     |   98 +++----
 po/ko.po                     |  116 ++++----
 po/ku.po                     |   98 +++----
 po/lo.po                     |   98 +++----
 po/lt.po                     |   98 +++----
 po/lv.po                     |   98 +++----
 po/mk.po                     |   98 +++----
 po/ml.po                     |  123 +++------
 po/mr.po                     |  156 +++++------
 po/ms.po                     |  380 +++++++++++------------------
 po/my.po                     |   98 +++----
 po/nb.po                     |   98 +++----
 po/nl.po                     |  110 ++++----
 po/nn.po                     |   98 +++----
 po/no.po                     |   98 +++----
 po/nso.po                    |   98 +++----
 po/or.po                     |   98 +++----
 po/pa.po                     |   98 +++----
 po/pl.po                     |   98 +++----
 po/pt.po                     |   98 +++----
 po/pt_BR.po                  |  150 +++++------
 po/ro.po                     |   98 +++----
 po/ru.po                     |   98 +++----
 po/si.po                     |   98 +++----
 po/sk.po                     |   98 +++----
 po/sl.po                     |   98 +++----
 po/sq.po                     |   98 +++----
 po/sr.po                     |  109 ++++----
 po/sr at Latn.po                |  109 ++++----
 po/sv.po                     |  379 ++++++++++++-----------------
 po/ta.po                     |  105 ++++----
 po/te.po                     |   98 +++----
 po/th.po                     |   98 +++----
 po/tr.po                     |   98 +++----
 po/uk.po                     |  498 +++++++++++++++++++-------------------
 po/ur.po                     |   98 +++----
 po/vi.po                     |   98 +++----
 po/zh_CN.po                  |  287 ++++++++--------------
 po/zh_TW.po                  |  125 ++++-----
 po/zu.po                     |   98 +++----
 restorecond/restorecond.init |    6 
 scripts/fixfiles             |    2 
 74 files changed, 4293 insertions(+), 4606 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.219 -r 1.220 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- policycoreutils-rhat.patch	12 Aug 2006 17:16:44 -0000	1.219
+++ policycoreutils-rhat.patch	31 Aug 2006 11:42:45 -0000	1.220
@@ -1,377 +1,26084 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils-1.30.26/po/ms.po
---- nsapolicycoreutils/po/ms.po	2006-08-01 09:47:27.000000000 -0400
-+++ policycoreutils-1.30.26/po/ms.po	2006-08-12 13:15:21.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.27/po/af.po
+--- nsapolicycoreutils/po/af.po	2006-08-28 16:58:21.000000000 -0400
++++ policycoreutils-1.30.27/po/af.po	2006-08-31 07:08:21.000000000 -0400
 @@ -8,7 +8,7 @@
+ msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-05-26 13:48-0400\n"
--"PO-Revision-Date: 2006-07-05 23:46+0800\n"
-+"PO-Revision-Date: 2006-08-08 01:09+0800\n"
- "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman at myrealbox.com>\n"
+-"POT-Creation-Date: 2006-05-26 13:48-0400\n"
++"POT-Creation-Date: 2006-06-29 15:53-0400\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
  "Language-Team: LANGUAGE <LL at li.org>\n"
- "MIME-Version: 1.0\n"
-@@ -34,12 +34,12 @@
- #: ../run_init/run_init.c:126
- #, fuzzy, c-format
+@@ -21,7 +21,7 @@
+ msgid "usage:  %s [-bq]\n"
+ msgstr ""
+ 
+-#: ../load_policy/load_policy.c:62
++#: ../load_policy/load_policy.c:66
+ #, c-format
+ msgid "%s:  Can't load policy:  %s\n"
+ msgstr ""
+@@ -31,26 +31,26 @@
+ msgid "Out of memory!\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:201 ../run_init/run_init.c:126
++#: ../newrole/newrole.c:199 ../run_init/run_init.c:126
+ #, c-format
  msgid "failed to initialize PAM\n"
--msgstr "Gagal untuk melekapkan partisyen."
-+msgstr "PAM: gagal untuk melepaskan pengesah."
+ msgstr ""
  
- #: ../newrole/newrole.c:212
- #, fuzzy, c-format
+-#: ../newrole/newrole.c:212
++#: ../newrole/newrole.c:210
+ #, c-format
  msgid "failed to set PAM_TTY\n"
--msgstr "Gagal untuk menetapkan katalaluan bagi kumpulan %s: %s\n"
-+msgstr "PAM: gagal untuk melepaskan pengesah."
+ msgstr ""
  
- #: ../newrole/newrole.c:250
- #: ../run_init/run_init.c:155
-@@ -94,14 +94,14 @@
+-#: ../newrole/newrole.c:250 ../run_init/run_init.c:155
++#: ../newrole/newrole.c:246 ../run_init/run_init.c:154
+ msgid "Password:"
  msgstr ""
  
- #: ../newrole/newrole.c:481
--#, c-format
-+#, fuzzy, c-format
+-#: ../newrole/newrole.c:282 ../run_init/run_init.c:187
++#: ../newrole/newrole.c:281 ../run_init/run_init.c:189
+ #, c-format
+ msgid "Cannot find your entry in the shadow passwd file.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:288 ../run_init/run_init.c:193
++#: ../newrole/newrole.c:287 ../run_init/run_init.c:195
+ #, c-format
+ msgid "getpass cannot open /dev/tty\n"
+ msgstr ""
+@@ -60,187 +60,187 @@
+ msgid "Error initing capabilities, aborting.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:367
++#: ../newrole/newrole.c:368
+ #, c-format
+ msgid "Error dropping capabilities, aborting\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:374
++#: ../newrole/newrole.c:375
+ #, c-format
+ msgid "Error changing uid, aborting.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:380
++#: ../newrole/newrole.c:382
+ #, c-format
+ msgid "Error resetting KEEPCAPS, aborting\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:386
++#: ../newrole/newrole.c:390
+ #, c-format
+ msgid "Error dropping SETUID capability, aborting\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:459
++#: ../newrole/newrole.c:463
+ #, c-format
+ msgid "Sorry, newrole may be used only on a SELinux kernel.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:464
++#: ../newrole/newrole.c:468
+ #, c-format
+ msgid "Could not determine enforcing mode.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:481
++#: ../newrole/newrole.c:488
+ #, c-format
  msgid "Error: multiple roles specified\n"
--msgstr ""
-+msgstr "banyak opsyen -l or -t dinyatakan"
+ msgstr ""
  
- #: ../newrole/newrole.c:490
--#, c-format
-+#, fuzzy, c-format
+-#: ../newrole/newrole.c:490
++#: ../newrole/newrole.c:498
+ #, c-format
  msgid "Error: multiple types specified\n"
--msgstr ""
-+msgstr "banyak opsyen -l or -t dinyatakan"
+ msgstr ""
  
- #: ../newrole/newrole.c:498
+-#: ../newrole/newrole.c:498
++#: ../newrole/newrole.c:508
  #, c-format
-@@ -109,9 +109,9 @@
+ msgid "Sorry, -l may be used with SELinux MLS support.\n"
  msgstr ""
  
- #: ../newrole/newrole.c:503
--#, c-format
-+#, fuzzy, c-format
+-#: ../newrole/newrole.c:503
++#: ../newrole/newrole.c:515
+ #, c-format
  msgid "Error: multiple levels specified\n"
--msgstr ""
-+msgstr "banyak opsyen -l or -t dinyatakan"
- 
- #: ../newrole/newrole.c:527
- #, fuzzy, c-format
-@@ -215,7 +215,7 @@
- #: ../newrole/newrole.c:754
- #, fuzzy, c-format
- msgid "Warning!  Could not restore context for %s\n"
--msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n"
-+msgstr "Tidak dapat menyoal konteks fail untuk %s"
+ msgstr ""
  
- #: ../newrole/newrole.c:774
- #, fuzzy, c-format
-@@ -321,7 +321,7 @@
- #: ../scripts/chcat:288
- #, fuzzy, c-format
- msgid "Usage %s CATEGORY File ..."
--msgstr "Pemindahan Fail (FTP)"
-+msgstr "Penggunaan: %s [PILIHAN]... FAIL\n"
+-#: ../newrole/newrole.c:527
++#: ../newrole/newrole.c:537
+ #, c-format
+ msgid "Couldn't get default type.\n"
+ msgstr ""
  
- #: ../scripts/chcat:289
- #, fuzzy, c-format
-@@ -331,7 +331,7 @@
- #: ../scripts/chcat:290
- #, fuzzy, c-format
- msgid "Usage %s [[+|-]CATEGORY],...]q File ..."
--msgstr "Pemindahan Fail (FTP)"
-+msgstr "Penggunaan: %s [PILIHAN]... FAIL\n"
+-#: ../newrole/newrole.c:549
++#: ../newrole/newrole.c:559
+ #, c-format
+ msgid "failed to get old_context.\n"
+ msgstr ""
  
[...26353 lines suppressed...]
+ 
+-#: ../newrole/newrole.c:596
++#: ../newrole/newrole.c:606
+ #, c-format
+ msgid "Error!  Shell is not valid.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:603
++#: ../newrole/newrole.c:614
+ #, c-format
+ msgid "Error!  Could not retrieve tty information.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:607
++#: ../newrole/newrole.c:618
+ #, c-format
+ msgid "Authenticating %s.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:621
++#: ../newrole/newrole.c:632
+ #, c-format
+ msgid "newrole: incorrect password for %s\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:645
++#: ../newrole/newrole.c:657
+ #, c-format
+ msgid "failed to set new role %s\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:657
++#: ../newrole/newrole.c:671
+ #, c-format
+ msgid "failed to set new type %s\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:670
++#: ../newrole/newrole.c:688
+ #, c-format
+ msgid "failed to build new range with level %s\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:674
++#: ../newrole/newrole.c:693
+ #, c-format
+ msgid "failed to set new range %s\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:688
++#: ../newrole/newrole.c:708
+ #, c-format
+ msgid "failed to convert new context to string\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:698
++#: ../newrole/newrole.c:717
+ #, c-format
+ msgid "%s is not a valid context\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:711
++#: ../newrole/newrole.c:730
+ #, c-format
+ msgid "Error!  Could not open %s.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:717
++#: ../newrole/newrole.c:738
+ #, c-format
+ msgid "%s!  Could not get current context for %s, not relabeling tty.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:728
++#: ../newrole/newrole.c:757
+ #, c-format
+ msgid "%s!  Could not get new context for %s, not relabeling tty.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:740
++#: ../newrole/newrole.c:771
+ #, c-format
+ msgid "%s!  Could not set new context for %s\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:752
++#: ../newrole/newrole.c:784
+ #, c-format
+ msgid "newrole: failure forking: %s"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:754
++#: ../newrole/newrole.c:789
+ #, c-format
+ msgid "Warning!  Could not restore context for %s\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:774
++#: ../newrole/newrole.c:810
+ #, c-format
+ msgid "%s changed labels.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:798
++#: ../newrole/newrole.c:834
+ #, c-format
+ msgid "Could not close descriptors.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:832 ../run_init/run_init.c:390
++#: ../newrole/newrole.c:869 ../run_init/run_init.c:397
+ #, c-format
+ msgid "Could not set exec context to %s.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:842
++#: ../newrole/newrole.c:881
+ #, c-format
+ msgid "Error connecting to audit system.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:847
++#: ../newrole/newrole.c:886
+ #, c-format
+ msgid "Error allocating memory.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:853
++#: ../newrole/newrole.c:892
+ #, c-format
+ msgid "Error sending audit message.\n"
+ msgstr ""
+ 
+-#: ../newrole/newrole.c:864
++#: ../newrole/newrole.c:903
+ msgid "failed to exec shell\n"
+ msgstr ""
+ 
+@@ -251,27 +251,27 @@
+ "         <args ...> are the arguments to that script."
+ msgstr ""
+ 
+-#: ../run_init/run_init.c:264
++#: ../run_init/run_init.c:267
+ #, c-format
+ msgid "run_init: incorrect password for %s\n"
+ msgstr ""
+ 
+-#: ../run_init/run_init.c:295
++#: ../run_init/run_init.c:301
+ #, c-format
+ msgid "Could not open file %s\n"
+ msgstr ""
+ 
+-#: ../run_init/run_init.c:322
++#: ../run_init/run_init.c:328
+ #, c-format
+ msgid "No context in file %s\n"
+ msgstr ""
+ 
+-#: ../run_init/run_init.c:345
++#: ../run_init/run_init.c:353
+ #, c-format
+ msgid "Sorry, run_init may be used only on a SELinux kernel.\n"
+ msgstr ""
+ 
+-#: ../run_init/run_init.c:364
++#: ../run_init/run_init.c:372
+ #, c-format
+ msgid "authentication failed.\n"
+ msgstr ""
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30.27/restorecond/restorecond.init
+--- nsapolicycoreutils/restorecond/restorecond.init	2006-08-28 16:58:19.000000000 -0400
++++ policycoreutils-1.30.27/restorecond/restorecond.init	2006-08-31 07:04:34.000000000 -0400
+@@ -3,9 +3,9 @@
+ # 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.
++# description:	restorecond uses inotify to look for creation of new files \
++# listed in the /etc/selinux/restorecond.conf file, and restores the \
++# correct security context.
+ #
+ 
+ # Source function library.
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.27/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2006-08-28 16:58:19.000000000 -0400
++++ policycoreutils-1.30.27/scripts/fixfiles	2006-08-24 14:35:03.000000000 -0400
 @@ -48,7 +48,7 @@
  # Log to either syslog or a LOGFILE
  #
  logit () {
 -if [ -z $LOGFILE ]; then
-+if [ ! -z $LOGFILE ]; then
++if [ -n $LOGFILE ]; then
      echo $1 >> $LOGFILE
  fi
  }


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- policycoreutils.spec	12 Aug 2006 17:16:45 -0000	1.301
+++ policycoreutils.spec	31 Aug 2006 11:42:48 -0000	1.302
@@ -1,11 +1,11 @@
 %define libauditver 1.1.4-3
-%define libsepolver 1.12.23-1
+%define libsepolver 1.12.25-1
 %define libsemanagever 1.6.15-1
-%define libselinuxver 1.30.26-1
+%define libselinuxver 1.30.27-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.30.26
-Release: 1
+Version: 1.30.27
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -36,7 +36,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
+#%patch -p1 -b .rhat
 
 %build
 make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -119,6 +119,13 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-2
+- Fix init script and add translations
+
+* Thu Aug 24 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-1
+- Update to upstream
+	* Merged fix for restorecon symlink handling from Erich Schubert.
+
 * Sat Aug 12 2006 Dan Walsh <dwalsh at redhat.com> 1.30.26-1
 - Update to upstream
 	* Merged semanage local file contexts patch from Chris PeBenito.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- sources	12 Aug 2006 17:16:45 -0000	1.122
+++ sources	31 Aug 2006 11:42:48 -0000	1.123
@@ -1 +1 @@
-d403659413ccab1ae91eba2dc3d847e2  policycoreutils-1.30.26.tgz
+b8f142cb8f8c1775e400f3fcb232a85f  policycoreutils-1.30.27.tgz



From fedora-cvs-commits at redhat.com  Thu Aug 31 12:10:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 08:10:04 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.220,
	1.221 policycoreutils.spec, 1.302, 1.303
Message-ID: <200608311210.k7VCA4fS014572@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14522

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-3
- Ignore sigpipe


policycoreutils-rhat.patch:
 newrole/newrole              |binary
 newrole/newrole.c            |    1 
 po/af.po                     |   98 +++----
 po/am.po                     |   98 +++----
 po/ar.po                     |   98 +++----
 po/be.po                     |   98 +++----
 po/bg.po                     |   98 +++----
 po/bn.po                     |   98 +++----
 po/bn_IN.po                  |   98 +++----
 po/ca.po                     |   98 +++----
 po/cs.po                     |   98 +++----
 po/cy.po                     |   98 +++----
 po/da.po                     |   96 +++----
 po/de.po                     |  560 ++++++++++++++++---------------------------
 po/el.po                     |  102 +++----
 po/en_GB.po                  |   98 +++----
 po/es.po                     |   98 +++----
 po/et.po                     |   96 +++----
 po/eu_ES.po                  |   98 +++----
 po/fa.po                     |   98 +++----
 po/fi.po                     |   98 +++----
 po/fr.po                     |   98 +++----
 po/gl.po                     |   96 +++----
 po/gu.po                     |   98 +++----
 po/he.po                     |   98 +++----
 po/hi.po                     |  102 +++----
 po/hr.po                     |   98 +++----
 po/hu.po                     |   98 +++----
 po/hy.po                     |   98 +++----
 po/id.po                     |   96 +++----
 po/is.po                     |   98 +++----
 po/it.po                     |   98 +++----
 po/ja.po                     |   98 +++----
 po/ka.po                     |   98 +++----
 po/kn.po                     |   98 +++----
 po/ko.po                     |  116 ++++----
 po/ku.po                     |   98 +++----
 po/lo.po                     |   98 +++----
 po/lt.po                     |   98 +++----
 po/lv.po                     |   98 +++----
 po/mk.po                     |   98 +++----
 po/ml.po                     |  123 +++------
 po/mr.po                     |  156 +++++------
 po/ms.po                     |  380 +++++++++++------------------
 po/my.po                     |   98 +++----
 po/nb.po                     |   98 +++----
 po/nl.po                     |  110 ++++----
 po/nn.po                     |   98 +++----
 po/no.po                     |   98 +++----
 po/nso.po                    |   98 +++----
 po/or.po                     |   98 +++----
 po/pa.po                     |   98 +++----
 po/pl.po                     |   98 +++----
 po/pt.po                     |   98 +++----
 po/pt_BR.po                  |  150 +++++------
 po/ro.po                     |   98 +++----
 po/ru.po                     |   98 +++----
 po/si.po                     |   98 +++----
 po/sk.po                     |   98 +++----
 po/sl.po                     |   98 +++----
 po/sq.po                     |   98 +++----
 po/sr.po                     |  109 ++++----
 po/sr at Latn.po                |  109 ++++----
 po/sv.po                     |  379 ++++++++++++-----------------
 po/ta.po                     |  105 ++++----
 po/te.po                     |   98 +++----
 po/th.po                     |   98 +++----
 po/tr.po                     |   98 +++----
 po/uk.po                     |  498 +++++++++++++++++++-------------------
 po/ur.po                     |   98 +++----
 po/vi.po                     |   98 +++----
 po/zh_CN.po                  |  287 ++++++++--------------
 po/zh_TW.po                  |  125 ++++-----
 po/zu.po                     |   98 +++----
 restorecond/restorecond.init |    6 
 scripts/fixfiles             |    2 
 76 files changed, 4294 insertions(+), 4606 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- policycoreutils-rhat.patch	31 Aug 2006 11:42:45 -0000	1.220
+++ policycoreutils-rhat.patch	31 Aug 2006 12:09:46 -0000	1.221
@@ -1,3 +1,15 @@
+Binary files nsapolicycoreutils/newrole/newrole and policycoreutils-1.30.27/newrole/newrole differ
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.27/newrole/newrole.c
+--- nsapolicycoreutils/newrole/newrole.c	2006-08-28 16:58:20.000000000 -0400
++++ policycoreutils-1.30.27/newrole/newrole.c	2006-08-31 08:02:14.000000000 -0400
+@@ -445,6 +445,7 @@
+ 
+ 	/* Terminate on SIGHUP. */
+ 	signal(SIGHUP, SIG_DFL);
++	signal(SIGPIPE, SIG_IGN);
+ 
+ #ifdef USE_NLS
+ 	setlocale(LC_ALL, "");
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.27/po/af.po
 --- nsapolicycoreutils/po/af.po	2006-08-28 16:58:21.000000000 -0400
 +++ policycoreutils-1.30.27/po/af.po	2006-08-31 07:08:21.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- policycoreutils.spec	31 Aug 2006 11:42:48 -0000	1.302
+++ policycoreutils.spec	31 Aug 2006 12:10:02 -0000	1.303
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.27
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -119,6 +119,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-3
+- Ignore sigpipe
+
 * Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-2
 - Fix init script and add translations
 



From fedora-cvs-commits at redhat.com  Thu Aug 31 12:13:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 08:13:33 -0400
Subject: rpms/selinux-policy/devel policy-20060829.patch, 1.2,
	1.3 selinux-policy.spec, 1.264, 1.265
Message-ID: <200608311213.k7VCDXVZ014664@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14649

Modified Files:
	policy-20060829.patch selinux-policy.spec 
Log Message:
* Wed Aug 30 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-3
- Fix audit line
- Fix requires line


policy-20060829.patch:
 admin/amanda.fc              |   50 -----
 admin/anaconda.te            |   11 +
 admin/bootloader.fc          |    2 
 admin/consoletype.te         |    7 
 admin/firstboot.te           |   10 -
 admin/rpm.fc                 |    2 
 admin/rpm.if                 |   13 -
 apps/java.fc                 |    2 
 apps/mono.te                 |    1 
 kernel/corecommands.fc       |    2 
 kernel/corecommands.if       |    1 
 kernel/corenetwork.te.in     |    4 
 kernel/devices.fc            |    2 
 kernel/files.fc              |    1 
 kernel/filesystem.te         |    2 
 kernel/kernel.if             |   39 ++++
 kernel/terminal.fc           |    2 
 services/apache.te           |    1 
 services/ccs.fc              |    8 
 services/ccs.if              |   65 +++++++
 services/ccs.te              |   84 +++++++++
 services/cron.if             |    8 
 services/cron.te             |    1 
 services/dbus.if             |    1 
 services/dovecot.te          |    2 
 services/ldap.te             |    2 
 services/ntp.te              |    6 
 services/oddjob.fc           |    8 
 services/oddjob.if           |   76 ++++++++
 services/oddjob.te           |   68 +++++++
 services/oddjob_mkhomedir.fc |    6 
 services/oddjob_mkhomedir.if |   24 ++
 services/oddjob_mkhomedir.te |   29 +++
 services/pegasus.if          |   31 +++
 services/pegasus.te          |    5 
 services/procmail.te         |    1 
 services/ricci.fc            |   20 ++
 services/ricci.if            |  184 +++++++++++++++++++++
 services/ricci.te            |  373 +++++++++++++++++++++++++++++++++++++++++++
 services/rpc.te              |    1 
 services/setroubleshoot.fc   |    9 +
 services/setroubleshoot.if   |    3 
 services/setroubleshoot.te   |  112 ++++++++++++
 services/spamassassin.te     |    1 
 services/ssh.if              |   24 ++
 services/stunnel.te          |    2 
 services/xserver.if          |   61 ++++++-
 services/xserver.te          |    4 
 system/authlogin.te          |    8 
 system/fstools.te            |    1 
 system/hostname.te           |    5 
 system/init.if               |    7 
 system/init.te               |    3 
 system/logging.fc            |    1 
 system/lvm.te                |    2 
 system/modutils.te           |    1 
 system/mount.te              |    4 
 system/selinuxutil.te        |    9 +
 system/udev.te               |    5 
 system/unconfined.fc         |    1 
 system/unconfined.if         |    1 
 system/userdomain.if         |  246 +++++++++++++++++++---------
 system/userdomain.te         |   48 ++---
 63 files changed, 1521 insertions(+), 192 deletions(-)

Index: policy-20060829.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060829.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policy-20060829.patch	30 Aug 2006 21:44:22 -0000	1.2
+++ policy-20060829.patch	31 Aug 2006 12:13:31 -0000	1.3
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-2.3.10/policy/modules/admin/amanda.fc
 --- nsaserefpolicy/policy/modules/admin/amanda.fc	2006-08-29 09:00:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/amanda.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/amanda.fc	2006-08-30 17:41:10.000000000 -0400
 @@ -11,61 +11,11 @@
  /usr/lib(64)?/amanda		-d	gen_context(system_u:object_r:amanda_usr_lib_t,s0)
  /usr/lib(64)?/amanda/.+		--	gen_context(system_u:object_r:amanda_exec_t,s0)
@@ -65,7 +65,7 @@
  /var/lib/amanda/index			gen_context(system_u:object_r:amanda_data_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.10/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-08-29 09:00:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/anaconda.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/anaconda.te	2006-08-30 17:41:10.000000000 -0400
 @@ -60,3 +60,14 @@
  optional_policy(`
  	usermanage_domtrans_admin_passwd(anaconda_t)
@@ -83,7 +83,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.3.10/policy/modules/admin/bootloader.fc
 --- nsaserefpolicy/policy/modules/admin/bootloader.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/bootloader.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/bootloader.fc	2006-08-30 17:41:10.000000000 -0400
 @@ -10,3 +10,5 @@
  /sbin/lilo.*		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
  /sbin/mkinitrd		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
@@ -92,7 +92,7 @@
 +/boot/grup/slapsh.xpm.gz --	gen_context(system_u:object_r:boot_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.10/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-08-29 09:00:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/consoletype.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/consoletype.te	2006-08-30 17:41:10.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -109,7 +109,7 @@
  role system_r types consoletype_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.10/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-29 09:00:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/firstboot.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/firstboot.te	2006-08-30 17:41:10.000000000 -0400
 @@ -38,9 +38,8 @@
  
  allow firstboot_t firstboot_etc_t:file { getattr read };
@@ -136,7 +136,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.10/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/rpm.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/rpm.fc	2006-08-30 17:41:10.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -148,7 +148,7 @@
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.10/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/rpm.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/rpm.if	2006-08-30 17:41:10.000000000 -0400
 @@ -75,12 +75,13 @@
  	')
  
@@ -171,7 +171,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.10/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2006-08-29 09:00:26.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/apps/java.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/apps/java.fc	2006-08-30 17:41:10.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # /opt
@@ -183,7 +183,7 @@
  # /usr
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.3.10/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/apps/mono.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/apps/mono.te	2006-08-30 17:41:10.000000000 -0400
 @@ -21,6 +21,7 @@
  	allow mono_t self:process { execheap execmem };
  	unconfined_domain_noaudit(mono_t)
@@ -194,7 +194,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.10/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-29 09:00:26.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/corecommands.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/corecommands.fc	2006-08-30 17:41:10.000000000 -0400
 @@ -54,7 +54,9 @@
  /etc/rc\.d/init\.d/functions	--	gen_context(system_u:object_r:bin_t,s0)
  
@@ -207,7 +207,7 @@
  /etc/X11/xdm/TakeConsole	--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.3.10/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/corecommands.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/corecommands.if	2006-08-30 17:41:10.000000000 -0400
 @@ -950,6 +950,7 @@
  
  	allow $1 exec_type:file manage_file_perms;
@@ -218,7 +218,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.10/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-29 09:00:26.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/corenetwork.te.in	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/corenetwork.te.in	2006-08-30 17:41:10.000000000 -0400
 @@ -67,12 +67,14 @@
  network_port(clamd, tcp,3310,s0)
  network_port(clockspeed, udp,4041,s0)
@@ -245,7 +245,7 @@
  network_port(router, udp,520,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.10/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-29 09:00:26.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/devices.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/devices.fc	2006-08-30 17:41:10.000000000 -0400
 @@ -3,7 +3,7 @@
  /dev/.*				gen_context(system_u:object_r:device_t,s0)
  
@@ -257,7 +257,7 @@
  /dev/amidi.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.10/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/files.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/files.fc	2006-08-30 17:41:10.000000000 -0400
 @@ -57,6 +57,7 @@
  /etc/motd		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /etc/nohotplug		--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -268,7 +268,7 @@
  /etc/cups/client\.conf	--	gen_context(system_u:object_r:etc_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.10/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-25 13:29:57.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/filesystem.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/filesystem.te	2006-08-30 17:41:10.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -287,7 +287,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.10/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-08-29 09:00:26.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/kernel.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/kernel.if	2006-08-30 17:41:10.000000000 -0400
 @@ -2122,3 +2122,42 @@
  
  	typeattribute $1 kern_unconfined;
@@ -333,7 +333,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.fc serefpolicy-2.3.10/policy/modules/kernel/terminal.fc
 --- nsaserefpolicy/policy/modules/kernel/terminal.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/terminal.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/terminal.fc	2006-08-30 17:41:10.000000000 -0400
 @@ -34,3 +34,5 @@
  # used by init scripts to initally populate udev /dev
  /lib/udev/devices/console -c	gen_context(system_u:object_r:console_device_t,s0)
@@ -342,7 +342,7 @@
 +/dev/xvc[0-9]*		-c	gen_context(system_u:object_r:tty_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.10/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/apache.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/apache.te	2006-08-30 17:41:10.000000000 -0400
 @@ -268,6 +268,7 @@
  
  seutil_dontaudit_search_config(httpd_t)
@@ -353,7 +353,7 @@
  userdom_use_unpriv_users_fds(httpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-2.3.10/policy/modules/services/ccs.fc
 --- nsaserefpolicy/policy/modules/services/ccs.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ccs.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ccs.fc	2006-08-30 17:41:10.000000000 -0400
 @@ -0,0 +1,8 @@
 +# ccs executable will have:
 +# label: system_u:object_r:ccs_exec_t
@@ -365,7 +365,7 @@
 +/etc/cluster(/.*)?		gen_context(system_u:object_r:cluster_conf_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.if serefpolicy-2.3.10/policy/modules/services/ccs.if
 --- nsaserefpolicy/policy/modules/services/ccs.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ccs.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ccs.if	2006-08-30 17:41:10.000000000 -0400
 @@ -0,0 +1,65 @@
 +## <summary>policy for ccs</summary>
 +
@@ -434,7 +434,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.3.10/policy/modules/services/ccs.te
 --- nsaserefpolicy/policy/modules/services/ccs.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ccs.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ccs.te	2006-08-30 17:41:10.000000000 -0400
 @@ -0,0 +1,84 @@
 +policy_module(ccs,1.0.0)
 +
@@ -522,7 +522,7 @@
 +allow ccs_t cluster_conf_t:file rw_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.10/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/cron.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/cron.if	2006-08-30 17:41:10.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -554,7 +554,7 @@
  	allow $1 system_crond_t:process sigchld;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.10/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/cron.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/cron.te	2006-08-30 17:41:10.000000000 -0400
 @@ -175,6 +175,7 @@
  	allow crond_t crond_tmp_t:dir create_dir_perms;
  	allow crond_t crond_tmp_t:file create_file_perms;
@@ -565,7 +565,7 @@
  tunable_policy(`fcron_crond', `
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.10/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/dbus.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/dbus.if	2006-08-30 17:41:10.000000000 -0400
 @@ -123,6 +123,7 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
@@ -576,7 +576,7 @@
  	corecmd_read_bin_files($1_dbusd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.10/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/dovecot.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/dovecot.te	2006-08-30 17:41:10.000000000 -0400
 @@ -168,7 +168,7 @@
  # Allow dovecot to create and read SSL parameters file
  allow dovecot_t dovecot_var_lib_t:dir rw_dir_perms;
@@ -588,7 +588,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.10/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/ldap.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ldap.te	2006-08-30 17:41:10.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -600,7 +600,7 @@
  kernel_read_kernel_sysctls(slapd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.10/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/ntp.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ntp.te	2006-08-30 17:41:11.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -623,7 +623,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-2.3.10/policy/modules/services/oddjob.fc
 --- nsaserefpolicy/policy/modules/services/oddjob.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/oddjob.fc	2006-08-30 17:41:11.000000000 -0400
 @@ -0,0 +1,8 @@
 +# oddjob executable will have:
 +# label: system_u:object_r:oddjob_exec_t
@@ -635,7 +635,7 @@
 +/usr/lib/oddjobd			gen_context(system_u:object_r:oddjob_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-2.3.10/policy/modules/services/oddjob.if
 --- nsaserefpolicy/policy/modules/services/oddjob.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/oddjob.if	2006-08-30 17:41:11.000000000 -0400
 @@ -0,0 +1,76 @@
 +## <summary>policy for oddjob</summary>
 +
@@ -715,7 +715,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.fc
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.fc	2006-08-30 17:41:11.000000000 -0400
 @@ -0,0 +1,6 @@
 +# oddjob_mkhomedir executable will have:
 +# label: system_u:object_r:oddjob_mkhomedir_exec_t
@@ -725,7 +725,7 @@
 +/usr/lib/oddjob/mkhomedir		--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.if
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.if	2006-08-30 17:41:11.000000000 -0400
 @@ -0,0 +1,24 @@
 +## <summary>policy for oddjob_mkhomedir</summary>
 +
@@ -753,8 +753,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.te
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.te	2006-08-29 10:39:25.000000000 -0400
-@@ -0,0 +1,26 @@
++++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.te	2006-08-31 07:33:00.000000000 -0400
+@@ -0,0 +1,29 @@
 +policy_module(oddjob_mkhomedir,1.0.0)
 +
 +########################################
@@ -771,7 +771,6 @@
 +#
 +# oddjob_mkhomedir 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(oddjob_mkhomedir_t)
@@ -781,10 +780,14 @@
 +## internal communication is often done using fifo and unix sockets.
 +allow oddjob_mkhomedir_t self:fifo_file { read write };
 +allow oddjob_mkhomedir_t self:unix_stream_socket create_stream_socket_perms;
++
++oddjob_system_entry(oddjob_mkhomedir_t, oddjob_mkhomedir_exec_t)
++domain_auto_trans(unconfined_t,oddjob_mkhomedir_exec_t,oddjob_mkhomedir_t)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-2.3.10/policy/modules/services/oddjob.te
 --- nsaserefpolicy/policy/modules/services/oddjob.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob.te	2006-08-29 10:39:25.000000000 -0400
-@@ -0,0 +1,70 @@
++++ serefpolicy-2.3.10/policy/modules/services/oddjob.te	2006-08-31 07:31:06.000000000 -0400
+@@ -0,0 +1,68 @@
 +policy_module(oddjob,1.0.0)
 +
 +########################################
@@ -849,15 +852,13 @@
 +
 +kernel_read_system_state(oddjob_t)
 +
-+oddjob_mkhomedir_domtrans(oddjob_t)
-+
 +unconfined_domtrans(oddjob_t)
 +
 +term_dontaudit_use_generic_ptys(oddjob_t)
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.10/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/pegasus.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/pegasus.if	2006-08-30 17:41:11.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -893,7 +894,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.10/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/pegasus.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/pegasus.te	2006-08-30 17:41:11.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -912,7 +913,7 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.10/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/procmail.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/procmail.te	2006-08-30 17:41:11.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -923,7 +924,7 @@
  corenet_tcp_sendrecv_all_nodes(procmail_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.fc serefpolicy-2.3.10/policy/modules/services/ricci.fc
 --- nsaserefpolicy/policy/modules/services/ricci.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ricci.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ricci.fc	2006-08-30 17:41:11.000000000 -0400
 @@ -0,0 +1,20 @@
 +# ricci executable will have:
 +# label: system_u:object_r:ricci_exec_t
@@ -947,7 +948,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.if serefpolicy-2.3.10/policy/modules/services/ricci.if
 --- nsaserefpolicy/policy/modules/services/ricci.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ricci.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ricci.if	2006-08-30 17:41:11.000000000 -0400
 @@ -0,0 +1,184 @@
 +## <summary>policy for ricci</summary>
 +
@@ -1135,7 +1136,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.3.10/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ricci.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ricci.te	2006-08-31 07:31:39.000000000 -0400
 @@ -0,0 +1,373 @@
 +policy_module(ricci,1.0.0)
 +
@@ -1512,7 +1513,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.3.10/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/rpc.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/rpc.te	2006-08-30 17:41:11.000000000 -0400
 @@ -39,6 +39,7 @@
  
  allow rpcd_t self:capability { chown dac_override setgid setuid };
@@ -1523,7 +1524,7 @@
  allow rpcd_t rpcd_var_run_t:dir { rw_dir_perms setattr };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.10/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.fc	2006-08-30 17:41:11.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -1536,14 +1537,14 @@
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.10/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.if	2006-08-30 17:41:11.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.10/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.te	2006-08-30 17:41:11.000000000 -0400
 @@ -0,0 +1,112 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -1659,7 +1660,7 @@
 +files_getattr_all_dirs(setroubleshootd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.10/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/spamassassin.te	2006-08-29 18:48:49.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/spamassassin.te	2006-08-30 17:41:11.000000000 -0400
 @@ -134,6 +134,7 @@
  	term_dontaudit_use_generic_ptys(spamd_t)
  	files_dontaudit_read_root_files(spamd_t)
@@ -1670,7 +1671,7 @@
  		userdom_manage_generic_user_home_content_symlinks(spamd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.10/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/ssh.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ssh.if	2006-08-30 17:41:11.000000000 -0400
 @@ -711,3 +711,27 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
@@ -1701,7 +1702,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.10/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/stunnel.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/stunnel.te	2006-08-30 17:41:11.000000000 -0400
 @@ -38,6 +38,7 @@
  allow stunnel_t self:fifo_file rw_file_perms;
  allow stunnel_t self:tcp_socket create_stream_socket_perms;
@@ -1720,7 +1721,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.10/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/xserver.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/xserver.if	2006-08-30 17:41:11.000000000 -0400
 @@ -45,7 +45,6 @@
  	allow $1_xserver_t self:capability { dac_override fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
  	dontaudit $1_xserver_t self:capability chown;
@@ -1805,7 +1806,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.10/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/xserver.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/xserver.te	2006-08-30 17:41:11.000000000 -0400
 @@ -292,7 +292,7 @@
  ')
  
@@ -1826,7 +1827,7 @@
  	unconfined_domtrans(xdm_xserver_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.10/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/authlogin.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/authlogin.te	2006-08-30 17:41:11.000000000 -0400
 @@ -221,7 +221,13 @@
  
  userdom_dontaudit_use_unpriv_user_fds(pam_console_t)
@@ -1844,7 +1845,7 @@
  	files_dontaudit_read_root_files(pam_console_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.10/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/fstools.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/fstools.te	2006-08-30 17:41:11.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -1855,7 +1856,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.10/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/hostname.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/hostname.te	2006-08-30 17:41:11.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -1870,7 +1871,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.10/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/init.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/init.if	2006-08-30 17:41:11.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -1887,7 +1888,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.10/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-08-28 16:22:32.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/init.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/init.te	2006-08-30 17:41:11.000000000 -0400
 @@ -361,7 +361,8 @@
  logging_append_all_logs(initrc_t)
  logging_read_audit_config(initrc_t)
@@ -1900,7 +1901,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.10/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/logging.fc	2006-08-30 16:56:35.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/logging.fc	2006-08-30 17:41:11.000000000 -0400
 @@ -31,6 +31,7 @@
  /var/log/audit(/.*)?		gen_context(system_u:object_r:auditd_log_t,s15:c0.c255)
  
@@ -1911,7 +1912,7 @@
  /var/run/log		-s	gen_context(system_u:object_r:devlog_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.10/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/lvm.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/lvm.te	2006-08-30 17:41:11.000000000 -0400
 @@ -125,7 +125,7 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
@@ -1923,7 +1924,7 @@
  # LVM will complain a lot if it cannot set its priority.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.10/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/modutils.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/modutils.te	2006-08-30 17:41:11.000000000 -0400
 @@ -183,6 +183,7 @@
  fs_getattr_xattr_fs(depmod_t)
  
@@ -1934,7 +1935,7 @@
  corecmd_search_sbin(depmod_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.10/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/mount.te	2006-08-29 18:45:18.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/mount.te	2006-08-30 17:41:11.000000000 -0400
 @@ -14,6 +14,9 @@
  type mount_tmp_t;
  files_tmp_file(mount_tmp_t)
@@ -1955,7 +1956,7 @@
  allow mount_t mount_tmp_t:dir create_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.10/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/selinuxutil.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/selinuxutil.te	2006-08-30 17:41:11.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -1988,7 +1989,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.10/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/udev.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/udev.te	2006-08-30 17:41:11.000000000 -0400
 @@ -131,6 +131,7 @@
  mls_file_upgrade(udev_t)
  mls_file_downgrade(udev_t)
@@ -2009,7 +2010,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.10/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/unconfined.fc	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/unconfined.fc	2006-08-30 17:41:11.000000000 -0400
 @@ -10,4 +10,5 @@
  /usr/local/RealPlay/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -2018,7 +2019,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.10/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/unconfined.if	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/unconfined.if	2006-08-30 17:41:11.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -2029,7 +2030,7 @@
  	allow $1 self:process transition;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.10/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/userdomain.if	2006-08-29 18:50:58.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/userdomain.if	2006-08-30 17:41:11.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -2504,7 +2505,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.10/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/userdomain.te	2006-08-29 10:39:25.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/userdomain.te	2006-08-30 17:41:11.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- selinux-policy.spec	30 Aug 2006 21:44:22 -0000	1.264
+++ selinux-policy.spec	31 Aug 2006 12:13:31 -0000	1.265
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.10
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz



From fedora-cvs-commits at redhat.com  Thu Aug 31 12:34:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 08:34:38 -0400
Subject: rpms/qt/devel assistant3.desktop, NONE, 1.1 linguist3.desktop, NONE,
	1.1 qtconfig3.desktop, NONE, 1.1 designer3.desktop, 1.1,
	1.2 qt.spec, 1.122, 1.123
Message-ID: <200608311234.k7VCYcPd030362@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30337

Modified Files:
	designer3.desktop qt.spec 
Added Files:
	assistant3.desktop linguist3.desktop qtconfig3.desktop 
Log Message:
add missing desktop files



--- NEW FILE assistant3.desktop ---
[Desktop Entry]
Name=Qt3 Assistant 
Comment=Add translations to Qt3 applications
Exec=assistant
Icon=assistant3
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Application;Development;


--- NEW FILE linguist3.desktop ---
[Desktop Entry]
Name=Qt3 Linguist 
Comment=Add translations to Qt3 applications
Exec=linguist
Icon=linguist3
MimeType=application/x-linguist;
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Application;Development;


--- NEW FILE qtconfig3.desktop ---
[Desktop Entry]
Name=Qt3 Config 
Comment=Configure Qt3 behavior, styles, fonts
Exec=qtconfig
Icon=qtconfig3
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Application;AdvancedSettings;Settings;


Index: designer3.desktop
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/designer3.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- designer3.desktop	28 Jun 2006 18:03:38 -0000	1.1
+++ designer3.desktop	31 Aug 2006 12:34:35 -0000	1.2
@@ -3,7 +3,7 @@
 GenericName=Interface Designer
 Comment=Design GUIs for Qt3 applications
 Exec=designer
-Icon=designer
+Icon=designer3
 MimeType=application/x-designer;
 Terminal=false
 Encoding=UTF-8


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- qt.spec	17 Jul 2006 19:38:15 -0000	1.122
+++ qt.spec	31 Aug 2006 12:34:35 -0000	1.123
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.6
-Release: 12
+Release: 13
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -11,6 +11,9 @@
 Source2: qt.sh
 Source3: qt.csh
 Source4: designer3.desktop
+Source5: assistant3.desktop
+Source6: linguist3.desktop
+Source7: qtconfig3.desktop
 
 Patch1: qt-3.3.4-print-CJK.patch
 Patch2: qt-3.0.5-nodebug.patch
@@ -73,8 +76,7 @@
 Requires: fontconfig >= 2.0
 Requires: /etc/ld.so.conf.d
 
-BuildRequires: gcc-c++
-BuildRequires: libstdc++-devel
+BuildRequires: desktop-file-utils
 BuildRequires: libmng-devel
 BuildRequires: glibc-devel
 BuildRequires: libjpeg-devel
@@ -400,9 +402,13 @@
 mkdir -p %{buildroot}/etc/profile.d
 install -m 755 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/
 
-# Add desktop file
+# Add desktop files
 mkdir -p %{buildroot}%{_datadir}/applications
-install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}-designer.desktop
+desktop-file-install \
+  --dir %{buildroot}%{_datadir}/applications \
+  --vendor="%{name}" \
+  --add-category="X-Fedora" \
+  %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
 
 # Patch qmake to use qt-mt unconditionally
 perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf
@@ -414,6 +420,13 @@
 mkdir -p %{buildroot}/etc/ld.so.conf.d
 echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf
 
+# install icons
+mkdir %{buildroot}%{_datadir}/pixmaps
+install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png
+install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png
+install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png
+install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png
+
 %clean
 rm -rf %{buildroot}
 
@@ -438,6 +451,8 @@
 %files config
 %defattr(-,root,root,-)
 %{qtdir}/bin/qtconfig
+%{_datadir}/applications/*qtconfig*.desktop
+%{_datadir}/pixmaps/qtconfig3.png
 
 %files devel
 %defattr(-,root,root,-)
@@ -465,6 +480,10 @@
 %{qtdir}/translations
 %{qtdir}/phrasebooks
 %{_libdir}/pkgconfig/*
+%{_datadir}/applications/*linguist*.desktop
+%{_datadir}/applications/*assistant*.desktop
+%{_datadir}/pixmaps/linguist3.png
+%{_datadir}/pixmaps/assistant3.png
 
 %files devel-docs
 %defattr(-,root,root,-)
@@ -491,10 +510,14 @@
 %{qtdir}/templates
 %{qtdir}/plugins/designer/*
 %{qtdir}/bin/designer
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/*designer*.desktop
+%{_datadir}/pixmaps/designer3.png
 
 
 %changelog
+* Thu Aug 31 2006 Than Ngo <than at redhat.com> 1:3.3.6-13
+- add missing desktop files
+
 * Mon Jul 17 2006 Than Ngo <than at redhat.com> 1:3.3.6-12
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Aug 31 13:23:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 09:23:38 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.60,1.61 mkdumprd,1.5,1.6
Message-ID: <200608311323.k7VDNbf8013916@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13902

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
updating mkdumprd


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kexec-tools.spec	28 Aug 2006 18:57:08 -0000	1.60
+++ kexec-tools.spec	31 Aug 2006 13:23:33 -0000	1.61
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 50%{?dist}
+Release: 51%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -159,6 +159,10 @@
 %doc TODO
 
 %changelog
+* Thu Aug 31 2006 Neil Horman <nhorman at redhat.com> - 1.101-51%{dist}
+- update mkdumprd to properly do scp and nfs based dumps
+- update docs in kdump.conf to reflect new ifc parameter
+
 * Mon Aug 28 2006 Neil Horman <nhorman at redhat.com> - 1.101-50%{dist}
 - updating to build without need for asm/page.h on x86_64
 


Index: mkdumprd
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mkdumprd	30 Aug 2006 20:34:16 -0000	1.5
+++ mkdumprd	31 Aug 2006 13:23:33 -0000	1.6
@@ -1076,7 +1076,11 @@
                     #ssh, scp require libraries that aren't found with ldd
                     lib=/lib && [ -d "/lib64" ] && lib=/lib64
                     k_extras="/$lib/libnss_compat.so.2 /$lib/libnss_files.so.2"
-            
+                    bin="$bin /usr/bin/scp /usr/bin/ssh /bin/dd /bin/cp"
+                    
+                    #build an /etc/passwd for scp to work properly
+                    grep "^root" /etc/passwd > $MNTIMAGE/etc/passwd
+
                     # bring up the network
                     emit "echo Bring up network"
                     emit $network
@@ -1113,7 +1117,8 @@
                         #setup nfs case
                         mkdir -p $MNTIMAGE/mnt
                         emit "mount -t nfs -o nolock $rlocation /mnt"
-                        emit "cond kcp --local /proc/vmcore /mnt/var/crash/$lhost-%DATE/vmcore"
+                        emit "dd if=/dev/mem of=/dev/urandom count=1 bs=512 skip=100" 
+                        emit "cond kcp --local /proc/vmcore /mnt/var/crash/$lhost-%DATE"
                         emit "cond reboot -h -f"
                     else
                         #SSH path
@@ -1135,7 +1140,6 @@
                         #setup ssh case, quick check to see if setup already
                         if [ ! -r $MNTIMAGE/dev/urandom ]; then
                             #only need to do these once
-                            grep "^root" /etc/passwd > $MNTIMAGE/etc/passwd
                             mkdir -p $MNTIMAGE/root
                             cp -a /root/.ssh $MNTIMAGE/root/
                             cp -a /etc/ssh $MNTIMAGE/etc
@@ -1143,9 +1147,8 @@
                             emit "mknod /dev/urandom c 1 9"
                         fi
                         emit "dd if=/dev/mem of=/dev/urandom count=1 bs=512 skip=100" 
-                        emit "cond kcp --ssh /proc/vmcore $rlocation:/var/crash/$lhost-%DATE/vmcore"
+                        emit "cond kcp --ssh /proc/vmcore $rlocation:/var/crash/$lhost-%DATE"
                         emit "cond reboot -h -f"
-                        bin="$bin /usr/bin/scp /usr/bin/ssh /bin/dd"
                     fi
                     ;;
                 ifc)
@@ -1174,7 +1177,7 @@
                     emit "echo Saving to the local filesystem $location"
                     emit "fsck.$type $location"
                     emit "cond mount -t $type $location /mnt"
-                    emit "cond kcp --local /proc/vmcore /mnt/var/crash/$lhost-%DATE/vmcore"
+                    emit "cond kcp --local /proc/vmcore /mnt/var/crash/$lhost-%DATE"
                     emit "cond umount /mnt"
                     emit "cond reboot -h -f"
                     bin="$bin /sbin/fsck.$type /bin/mount"



From fedora-cvs-commits at redhat.com  Thu Aug 31 17:31:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 13:31:19 -0400
Subject: rpms/dejavu-lgc-fonts/devel dejavu-lgc-fonts.conf, 1.2,
	1.3 dejavu-lgc-fonts.spec, 1.4, 1.5
Message-ID: <200608311731.k7VHVJD9000627@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/dejavu-lgc-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv612

Modified Files:
	dejavu-lgc-fonts.conf dejavu-lgc-fonts.spec 
Log Message:
- Don't override Bitstream Vera in our configuration file anymore now that 
  we got enough testing and gdm is fixed.



Index: dejavu-lgc-fonts.conf
===================================================================
RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/dejavu-lgc-fonts.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dejavu-lgc-fonts.conf	25 Aug 2006 04:04:05 -0000	1.2
+++ dejavu-lgc-fonts.conf	31 Aug 2006 17:31:02 -0000	1.3
@@ -4,16 +4,11 @@
 <fontconfig>
 
 <!-- Alias Bitstream Vera -->
-
-<!-- The following rules are written very strictly.  They cover Vera
-     even if you have Vera installed.  This is supposed ot help with
-     broken packages that hardcode Vera.  When that's fixed, just
-     change "assign" to "append" to get back to fallback aliasing. -->
 	<match>
 		<test name="family">
 			<string>Bitstream Vera Sans</string>
 		</test>
-		<edit name="family" mode="assign" binding="same">
+		<edit name="family" mode="append" binding="same">
 			<string>DejaVu LGC Sans</string>
 		</edit>
 	</match>
@@ -21,7 +16,7 @@
 		<test name="family">
 			<string>Bitstream Vera Serif</string>
 		</test>
-		<edit name="family" mode="assign" binding="same">
+		<edit name="family" mode="append" binding="same">
 			<string>DejaVu LGC Serif</string>
 		</edit>
 	</match>
@@ -29,7 +24,7 @@
 		<test name="family">
 			<string>Bitstream Vera Sans Mono</string>
 		</test>
-		<edit name="family" mode="assign" binding="same">
+		<edit name="family" mode="append" binding="same">
 			<string>DejaVu LGC Sans Mono</string>
 		</edit>
 	</match>
@@ -71,7 +66,7 @@
 		<test name="family">
 			<string>DejaVu Sans Condensed</string>
 		</test>
-		<edit name="family" mode="assign" binding="same">
+		<edit name="family" mode="append" binding="same">
 			<string>DejaVu LGC Sans Condensed</string>
 		</edit>
 	</match>
@@ -79,7 +74,7 @@
 		<test name="family">
 			<string>DejaVu Serif Condensed</string>
 		</test>
-		<edit name="family" mode="assign" binding="same">
+		<edit name="family" mode="append" binding="same">
 			<string>DejaVu LGC Serif Condensed</string>
 		</edit>
 	</match>


Index: dejavu-lgc-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/dejavu-lgc-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dejavu-lgc-fonts.spec	25 Aug 2006 04:04:05 -0000	1.4
+++ dejavu-lgc-fonts.spec	31 Aug 2006 17:31:03 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:      dejavu-lgc-fonts
 Version:   2.9
-Release:   1
+Release:   2
 Summary:   DejaVu LGC Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -61,6 +61,10 @@
 
 
 %changelog
+* Thu Aug 31 2006 Behdad Esfahbod <besfahbo at redhat.com> - 2.9-2
+- Don't override Bitstream Vera in our configuration file anymore now that
+  we got enough testing and gdm is fixed.
+
 * Fri Aug 24 2006 Behdad Esfahbod <besfahbo at redhat.com> - 2.9-1
 - Update to 2.9
 - Add langcover.txt and unicover.txt to docs, as they are not empty anymore



From fedora-cvs-commits at redhat.com  Thu Aug 31 16:55:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 12:55:28 -0400
Subject: rpms/orca/devel orca.spec,1.2,1.3
Message-ID: <200608311655.k7VGtSc4029515@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/orca/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29463

Modified Files:
	orca.spec 
Log Message:
obsolete gnome-mag-devel



Index: orca.spec
===================================================================
RCS file: /cvs/dist/rpms/orca/devel/orca.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- orca.spec	29 Aug 2006 16:59:18 -0000	1.2
+++ orca.spec	31 Aug 2006 16:55:12 -0000	1.3
@@ -15,7 +15,7 @@
 
 Name:		orca
 Version:	0.9.0 
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Flexible, extensible, and powerful assistive technology
 
 Group:		User Interface/Desktops
@@ -39,6 +39,7 @@
 BuildRequires:	gettext
 Obsoletes:	gnopernicus 
 Obsoletes:	gnome-mag
+Obsoletes:	gnome-mag-devel
 Provides:	gnopernicus
 Provides:	gnome-mag
 
@@ -99,6 +100,9 @@
 %{_datadir}/orca/glade/orca-setup.glade
 
 %changelog
+* Thu Aug 31 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.0-4
+- Obsolete gnome-mag-devel, too
+
 * Tue Aug 29 2006 John (J5) Palmieri <johnp at redhat.com> - 0.9.0-3
 - Spec file cleanups
 



From fedora-cvs-commits at redhat.com  Thu Aug 31 14:13:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 10:13:25 -0400
Subject: rpms/ypbind/devel ypbind.init,1.12,1.13
Message-ID: <200608311413.k7VEDPTf014954@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14939

Modified Files:
	ypbind.init 
Log Message:
* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> - 3:1.19-5
- Change init script to automatically turn on/off allow_ypbind boolean



Index: ypbind.init
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ypbind.init	31 Aug 2006 14:11:25 -0000	1.12
+++ ypbind.init	31 Aug 2006 14:13:13 -0000	1.13
@@ -29,7 +29,7 @@
 
 selinux_on() {
         [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || return
-	echo "Turning on allow_ypbind SELinux boolean"
+	echo $"Turning on allow_ypbind SELinux boolean"
         setsebool allow_ypbind=1
 }
 
@@ -41,7 +41,7 @@
 		. /etc/selinux/${SELINUXTYPE}/modules/active/booleans.local
 	fi
 	if [ $allow_ypbind == 0 ]; then
-		echo "Turning off allow_ypbind SELinux boolean"
+		echo $"Turning off allow_ypbind SELinux boolean"
 		setsebool allow_ypbind=$allow_ypbind
 	fi
 }



From fedora-cvs-commits at redhat.com  Thu Aug 31 16:52:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 12:52:26 -0400
Subject: rpms/rdesktop/devel rdesktop.spec,1.22,1.23
Message-ID: <200608311652.k7VGqQYY029307@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/rdesktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29183

Modified Files:
	rdesktop.spec 
Log Message:
- configure --with-ipv6 (bug 198405)



Index: rdesktop.spec
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/devel/rdesktop.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rdesktop.spec	12 Jul 2006 07:57:59 -0000	1.22
+++ rdesktop.spec	31 Aug 2006 16:52:08 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           rdesktop
 Version:        1.4.1
-Release: 3.2.2
+Release:        4
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
@@ -20,7 +20,7 @@
 %setup -q
 
 %build
-%configure
+%configure --with-ipv6
 make %{?_smp_mflags}
 
 %install
@@ -38,7 +38,10 @@
 %{_mandir}/man1/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Thu Aug 31 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.4.1-4
+- configure --with-ipv6 (bug 198405)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-3.2.2
 - rebuild
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-3.2.1



From fedora-cvs-commits at redhat.com  Thu Aug 31 17:05:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 13:05:59 -0400
Subject: rpms/librsvg2/devel .cvsignore, 1.26, 1.27 librsvg2.spec, 1.53,
	1.54 sources, 1.27, 1.28
Message-ID: <200608311705.k7VH5xHZ030232@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/librsvg2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30112

Modified Files:
	.cvsignore librsvg2.spec sources 
Log Message:
2.16.0





Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- librsvg2.spec	3 Aug 2006 17:09:37 -0000	1.53
+++ librsvg2.spec	31 Aug 2006 17:05:56 -0000	1.54
@@ -11,7 +11,7 @@
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
-Version: 2.15.90
+Version: 2.16.0
 Release: 1%{?dist}
 
 License: 	LGPL
@@ -55,6 +55,7 @@
 Requires:	freetype-devel >= %{freetype_version}
 Requires:       libgsf-devel >= %{libgsf_version}
 Requires:       libcroco-devel >=  %{libcroco_version}
+Requires:       pkgconfig
 
 %description devel
 This package provides the necessary development libraries and include
@@ -117,6 +118,10 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Thu Aug 31 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-1.fc6
+- Update to 2.16.0
+- Require pkgconfig in the -devel package
+
 * Thu Aug  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.90-1.fc6
 - Update to 2.15.90
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	3 Aug 2006 17:09:37 -0000	1.27
+++ sources	31 Aug 2006 17:05:56 -0000	1.28
@@ -1 +1 @@
-aa3788c32b5af38bb6417b7524443562  librsvg-2.15.90.tar.bz2
+dc6385e62ed278732146bca5aab74568  librsvg-2.16.0.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 31 14:53:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 10:53:05 -0400
Subject: rpms/hwdata/devel .cvsignore, 1.71, 1.72 hwdata.spec, 1.73,
	1.74 sources, 1.74, 1.75
Message-ID: <200608311453.k7VEr5bA015461@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15430/devel

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
auto-import hwdata-0.187-1 on branch devel from hwdata-0.187-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	3 Aug 2006 08:48:27 -0000	1.71
+++ .cvsignore	31 Aug 2006 14:53:03 -0000	1.72
@@ -1 +1 @@
-hwdata-0.186.tar.gz
+hwdata-0.187.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- hwdata.spec	3 Aug 2006 08:48:27 -0000	1.73
+++ hwdata.spec	31 Aug 2006 14:53:03 -0000	1.74
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.186
+Version: 0.187
 Release: 1
 License: GPL/MIT
 Group: System Environment/Base
@@ -33,6 +33,9 @@
 %config /usr/share/hwdata/*
 
 %changelog
+* Thu Aug 31 2006 Adam Jackson <ajackson at redhat.com> - 0.187-1
+- Fix sync ranges for Samsung SyncMaster 710N (#202344)
+
 * Thu Aug 03 2006 Phil Knirsch <pknirsch at redhat.com> - 0.186-1
 - Updated pci.ids once more.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	3 Aug 2006 08:48:27 -0000	1.74
+++ sources	31 Aug 2006 14:53:03 -0000	1.75
@@ -1 +1 @@
-17b3340c70005f25edac235ed0f72254  hwdata-0.186.tar.gz
+19eb7cf8c2f6fbd74e61c15364c4c437  hwdata-0.187.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 31 14:11:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 10:11:46 -0400
Subject: rpms/ypbind/devel ypbind.init,1.11,1.12 ypbind.spec,1.33,1.34
Message-ID: <200608311411.k7VEBkeP014932@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14919

Modified Files:
	ypbind.init ypbind.spec 
Log Message:
* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> - 3:1.19-5
- Change init script to automatically turn on/off allow_ypbind boolean



Index: ypbind.init
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ypbind.init	24 Aug 2006 02:14:40 -0000	1.11
+++ ypbind.init	31 Aug 2006 14:11:25 -0000	1.12
@@ -27,6 +27,25 @@
 # Check that networking is configured.
 [ ${NETWORKING} = "no" ] && exit 0
 
+selinux_on() {
+        [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || return
+	echo "Turning on allow_ypbind SELinux boolean"
+        setsebool allow_ypbind=1
+}
+
+selinux_off() {
+        [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || return
+	allow_ypbind=0
+	.  /etc/selinux/config
+	if [ -e /etc/selinux/${SELINUXTYPE}/modules1/active/booleans.local ]; then
+		. /etc/selinux/${SELINUXTYPE}/modules/active/booleans.local
+	fi
+	if [ $allow_ypbind == 0 ]; then
+		echo "Turning off allow_ypbind SELinux boolean"
+		setsebool allow_ypbind=$allow_ypbind
+	fi
+}
+
 start() {
 	DOMAINNAME=`domainname`
 	if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then
@@ -36,11 +55,13 @@
 	        exit 1
 	   fi
 	fi
+        selinux_on
 	echo -n $"Binding to the NIS domain: "
 	daemon ypbind $OTHER_YPBIND_OPTS
 	RETVAL=$?
 	echo
 	if [ $RETVAL -ne 0 ]; then
+	    selinux_off
 	    return $RETVAL
 	fi
 	# the following fixes problems with the init scripts continuing
@@ -60,6 +81,7 @@
 	    logger -t ypbind "bound to NIS server `ypwhich 2> /dev/null`"
 	    touch /var/lock/subsys/ypbind
 	else
+	    selinux_off
 	    killproc ypbind
 	    # if  we used brute force (like kill -9) we don't want those around
 	    if [ x$(domainname) != x ] ; then
@@ -72,6 +94,7 @@
 }
 
 stop() {
+       	selinux_off
 	echo -n $"Shutting down NIS services: "
 	killproc ypbind
 	RETVAL=$?


Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ypbind.spec	24 Aug 2006 02:27:33 -0000	1.33
+++ ypbind.spec	31 Aug 2006 14:11:42 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.19
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -85,6 +85,9 @@
 %doc README NEWS
 
 %changelog
+* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> - 3:1.19-5
+- Change init script to automatically turn on/off allow_ypbind boolean
+
 * Wed Aug 23 2006 Steve Dickson <steved at redhat.com> - 3:1.19-4
 - Remove the -s from install process making the -debuginfo
   package useful (bz 203851)



From fedora-cvs-commits at redhat.com  Thu Aug 31 15:14:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 11:14:09 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.221,
	1.222 policycoreutils.spec, 1.303, 1.304
Message-ID: <200608311514.k7VFE4jN016913@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16148

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-4
- Add -i qualified to restorecon to tell it to ignore files that do not exist
- Fixfiles also modified for this change


policycoreutils-rhat.patch:
 newrole/newrole              |binary
 newrole/newrole.c            |    1 
 po/af.po                     |   98 +++----
 po/am.po                     |   98 +++----
 po/ar.po                     |   98 +++----
 po/be.po                     |   98 +++----
 po/bg.po                     |   98 +++----
 po/bn.po                     |   98 +++----
 po/bn_IN.po                  |   98 +++----
 po/ca.po                     |   98 +++----
 po/cs.po                     |   98 +++----
 po/cy.po                     |   98 +++----
 po/da.po                     |   96 +++----
 po/de.po                     |  560 ++++++++++++++++---------------------------
 po/el.po                     |  102 +++----
 po/en_GB.po                  |   98 +++----
 po/es.po                     |   98 +++----
 po/et.po                     |   96 +++----
 po/eu_ES.po                  |   98 +++----
 po/fa.po                     |   98 +++----
 po/fi.po                     |   98 +++----
 po/fr.po                     |   98 +++----
 po/gl.po                     |   96 +++----
 po/gu.po                     |   98 +++----
 po/he.po                     |   98 +++----
 po/hi.po                     |  102 +++----
 po/hr.po                     |   98 +++----
 po/hu.po                     |   98 +++----
 po/hy.po                     |   98 +++----
 po/id.po                     |   96 +++----
 po/is.po                     |   98 +++----
 po/it.po                     |   98 +++----
 po/ja.po                     |   98 +++----
 po/ka.po                     |   98 +++----
 po/kn.po                     |   98 +++----
 po/ko.po                     |  116 ++++----
 po/ku.po                     |   98 +++----
 po/lo.po                     |   98 +++----
 po/lt.po                     |   98 +++----
 po/lv.po                     |   98 +++----
 po/mk.po                     |   98 +++----
 po/ml.po                     |  123 +++------
 po/mr.po                     |  156 +++++------
 po/ms.po                     |  380 +++++++++++------------------
 po/my.po                     |   98 +++----
 po/nb.po                     |   98 +++----
 po/nl.po                     |  110 ++++----
 po/nn.po                     |   98 +++----
 po/no.po                     |   98 +++----
 po/nso.po                    |   98 +++----
 po/or.po                     |   98 +++----
 po/pa.po                     |   98 +++----
 po/pl.po                     |   98 +++----
 po/pt.po                     |   98 +++----
 po/pt_BR.po                  |  150 +++++------
 po/ro.po                     |   98 +++----
 po/ru.po                     |   98 +++----
 po/si.po                     |   98 +++----
 po/sk.po                     |   98 +++----
 po/sl.po                     |   98 +++----
 po/sq.po                     |   98 +++----
 po/sr.po                     |  109 ++++----
 po/sr at Latn.po                |  109 ++++----
 po/sv.po                     |  379 ++++++++++++-----------------
 po/ta.po                     |  105 ++++----
 po/te.po                     |   98 +++----
 po/th.po                     |   98 +++----
 po/tr.po                     |   98 +++----
 po/uk.po                     |  498 +++++++++++++++++++-------------------
 po/ur.po                     |   98 +++----
 po/vi.po                     |   98 +++----
 po/zh_CN.po                  |  287 ++++++++--------------
 po/zh_TW.po                  |  125 ++++-----
 po/zu.po                     |   98 +++----
 restorecon/restorecon.8      |    7 
 restorecon/restorecon.c      |   13 
 restorecond/restorecond.init |    6 
 scripts/fixfiles             |    4 
 78 files changed, 4311 insertions(+), 4611 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- policycoreutils-rhat.patch	31 Aug 2006 12:09:46 -0000	1.221
+++ policycoreutils-rhat.patch	31 Aug 2006 15:11:57 -0000	1.222
@@ -26431,6 +26431,94 @@
  #, c-format
  msgid "authentication failed.\n"
  msgstr ""
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.8 policycoreutils-1.30.27/restorecon/restorecon.8
+--- nsapolicycoreutils/restorecon/restorecon.8	2006-08-28 16:58:19.000000000 -0400
++++ policycoreutils-1.30.27/restorecon/restorecon.8	2006-08-31 10:58:50.000000000 -0400
+@@ -4,10 +4,10 @@
+ 
+ .SH "SYNOPSIS"
+ .B restorecon
+-.I [\-o outfilename ] [\-R] [\-n] [\-v] [\-e directory ] pathname...
++.I [-i] [\-o outfilename ] [\-R] [\-n] [\-v] [\-e directory ] pathname...
+ .P
+ .B restorecon
+-.I \-f infilename [\-o outfilename ] [\-e directory ] [\-R] [\-n] [\-v] [\-F]
++.I [-i] \-f infilename [\-o outfilename ] [\-e directory ] [\-R] [\-n] [\-v] [\-F]
+ 
+ .SH "DESCRIPTION"
+ This manual page describes the
+@@ -23,6 +23,9 @@
+ 
+ .SH "OPTIONS"
+ .TP 
++.B \-i
++ignore files that do not exist
++.TP 
+ .B \-f infilename
+ infilename contains a list of files to be processed by application. Use \- for stdin.
+ .TP 
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.27/restorecon/restorecon.c
+--- nsapolicycoreutils/restorecon/restorecon.c	2006-08-28 16:58:19.000000000 -0400
++++ policycoreutils-1.30.27/restorecon/restorecon.c	2006-08-31 11:03:43.000000000 -0400
+@@ -11,6 +11,7 @@
+  * restorecon [-Rnv] pathname...
+  * 
+  * -e   Specify directory to exclude
++ * -i   Ignore error if file does not exist
+  * -n	Do not change any file labels.
+  * -v	Show changes in file labels.  
+  * -o filename save list of files with incorrect context
+@@ -47,6 +48,7 @@
+ static char *progname;
+ static int errors = 0;
+ static int recurse = 0;
++static int file_exist = 1;
+ static int force = 0;
+ #define STAT_BLOCK_SIZE 1
+ static int pipe_fds[2] = { -1, -1 };
+@@ -129,7 +131,7 @@
+ void usage(const char *const name)
+ {
+ 	fprintf(stderr,
+-		"usage:  %s [-FnrRv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n",
++		"usage:  %s [-iFnrRv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n",
+ 		name);
+ 	exit(1);
+ }
+@@ -160,6 +162,8 @@
+ 	}
+ 
+ 	if (lstat(filename, &st) != 0) {
++		if (!file_exist && errno == ENOENT)
++			return 0;
+ 		fprintf(stderr, "lstat(%s) failed: %s\n", filename,
+ 			strerror(errno));
+ 		return 1;
+@@ -319,6 +323,8 @@
+ 			close(pipe_fds[1]);
+ 		if (rc == -1 || rc > 0) {
+ 			if (nftw(buf, apply_spec, 1024, FTW_PHYS)) {
++				if (!file_exist && errno == ENOENT)
++					return;
+ 				fprintf(stderr,
+ 					"%s:  error while labeling files under %s\n",
+ 					progname, buf);
+@@ -350,11 +356,14 @@
+ 		exit(0);
+ 	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
+ 
+-	while ((opt = getopt(argc, argv, "pFrRnvf:o:e:")) > 0) {
++	while ((opt = getopt(argc, argv, "ipFrRnvf:o:e:")) > 0) {
+ 		switch (opt) {
+ 		case 'n':
+ 			change = 0;
+ 			break;
++		case 'i':
++			file_exist = 0;
++			break;
+ 		case 'r':
+ 		case 'R':
+ 			recurse = 1;
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30.27/restorecond/restorecond.init
 --- nsapolicycoreutils/restorecond/restorecond.init	2006-08-28 16:58:19.000000000 -0400
 +++ policycoreutils-1.30.27/restorecond/restorecond.init	2006-08-31 07:04:34.000000000 -0400
@@ -26449,7 +26537,7 @@
  # Source function library.
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.27/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2006-08-28 16:58:19.000000000 -0400
-+++ policycoreutils-1.30.27/scripts/fixfiles	2006-08-24 14:35:03.000000000 -0400
++++ policycoreutils-1.30.27/scripts/fixfiles	2006-08-31 11:04:33.000000000 -0400
 @@ -48,7 +48,7 @@
  # Log to either syslog or a LOGFILE
  #
@@ -26459,3 +26547,12 @@
      echo $1 >> $LOGFILE
  fi
  }
+@@ -118,7 +118,7 @@
+ fi
+ if [ ! -z "$RPMFILES" ]; then
+     for i in `echo $RPMFILES | sed 's/,/ /g'`; do
+-	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* -f - 2>&1 >> $LOGFILE
++	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -i -R $* -f - 2>&1 >> $LOGFILE
+     done
+     exit $?
+ fi


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- policycoreutils.spec	31 Aug 2006 12:10:02 -0000	1.303
+++ policycoreutils.spec	31 Aug 2006 15:14:01 -0000	1.304
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.27
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -119,6 +119,10 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-4
+- Add -i qualified to restorecon to tell it to ignore files that do not exist
+- Fixfiles also modified for this change
+
 * Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-3
 - Ignore sigpipe
 



From fedora-cvs-commits at redhat.com  Thu Aug 31 18:16:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 14:16:38 -0400
Subject: rpms/xorg-x11-drv-nv/devel nv-1.2.0-panel-range-hack.patch, NONE,
	1.1 xorg-x11-drv-nv.spec, 1.26, 1.27
Message-ID: <200608311816.k7VIGcT2003627@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3600

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-1.2.0-panel-range-hack.patch 
Log Message:
* Thu Aug 31 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-4.fc6
- nv-1.2.0-panel-range-hack: If we detect a panel, but don't get DDC, adjust
  the monitor's sync ranges to accomodate a 60Hz mode at the panel's
  native resolution.


nv-1.2.0-panel-range-hack.patch:
 nv_setup.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+)

--- NEW FILE nv-1.2.0-panel-range-hack.patch ---
--- xf86-video-nv-1.2.0/src/nv_setup.c.jx	2006-06-16 20:48:53.000000000 -0400
+++ xf86-video-nv-1.2.0/src/nv_setup.c	2006-08-29 18:11:03.000000000 -0400
@@ -690,6 +690,26 @@ NVCommonSetup(ScrnInfoPtr pScrn)
 
     if(monitorA)
       xf86SetDDCproperties(pScrn, monitorA);
+    else if (pNv->FlatPanel) {
+	float hsync, vsync;
+	DisplayModePtr mode =
+	    xf86CVTMode(pNv->fpWidth, pNv->fpHeight, 61, 0, 0);
+	hsync = (float)mode->Clock / (float)mode->HTotal;
+	vsync = mode->Clock * 1000.0 / mode->HTotal / mode->VTotal;
+	if (!pScrn->monitor->nHsync && hsync > 31.5) {
+	    pScrn->monitor->hsync[0].lo = 31.5;
+	    pScrn->monitor->hsync[0].hi = hsync;
+	    pScrn->monitor->nHsync++;
+	}
+	if (!pScrn->monitor->nVrefresh && vsync > 50.0) {
+	    pScrn->monitor->vrefresh[0].lo = 50.0;
+	    pScrn->monitor->vrefresh[0].hi = vsync;
+	    pScrn->monitor->nVrefresh++;
+	}
+	if (mode->Clock > pScrn->monitor->maxPixClock)
+	    pScrn->monitor->maxPixClock = mode->Clock;
+	xfree(mode);
+    }
 
     if(!pNv->FlatPanel || (pScrn->depth != 24) || !pNv->twoHeads)
         pNv->FPDither = FALSE;


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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-drv-nv.spec	3 Aug 2006 02:44:16 -0000	1.26
+++ xorg-x11-drv-nv.spec	31 Aug 2006 18:16:35 -0000	1.27
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.2.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -19,12 +19,13 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.1.0-1
+BuildRequires: xorg-x11-server-sdk >= 1.1.0-12
 
-Requires:  xorg-x11-server-Xorg >= 1.1.0-1
+Requires:  xorg-x11-server-Xorg >= 1.1.0-12
 
 Patch0:    nv-1.1.1-nv34-tweaks.patch
 Patch1:    nv-1.1.2-panel-message.patch
+Patch2:	   nv-1.2.0-panel-range-hack.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -34,6 +35,7 @@
 
 %patch0 -p1 -b .nv34-tweak
 %patch1 -p1 -b .panel-message
+%patch2 -p1 -b .range-hack
 
 %build
 %configure --disable-static
@@ -65,6 +67,11 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Thu Aug 31 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-4.fc6
+- nv-1.2.0-panel-range-hack: If we detect a panel, but don't get DDC, adjust
+  the monitor's sync ranges to accomodate a 60Hz mode at the panel's
+  native resolution.
+
 * Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-3.fc6
 - Bump for upgrade path from FC5.
 



From fedora-cvs-commits at redhat.com  Thu Aug 31 18:23:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 14:23:00 -0400
Subject: rpms/tetex/devel tetex.spec,1.97,1.98
Message-ID: <200608311823.k7VIN0dR003793@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/tetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3774

Modified Files:
	tetex.spec 
Log Message:
- remove BuildPreReq: openmotif-devel



Index: tetex.spec
===================================================================
RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- tetex.spec	31 Aug 2006 08:11:15 -0000	1.97
+++ tetex.spec	31 Aug 2006 18:22:58 -0000	1.98
@@ -11,7 +11,7 @@
 Summary: The TeX text formatting system.
 Name: tetex
 Version: 3.0
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: distributable
 Group: Applications/Publishing
 Requires: tmpwatch, dialog, ed
@@ -106,7 +106,7 @@
 %endif
 
 BuildPreReq: bison flex perl libpng-devel ncurses-devel zlib-devel
-BuildPreReq: freetype-devel openmotif-devel textutils gd-devel
+BuildPreReq: freetype-devel textutils gd-devel
 BuildPreReq: desktop-file-utils >= %{desktop_file_utils_version}
 BuildPreReq: autoconf213
 BuildPreReq: libX11-devel libXpm-devel libXext-devel libSM-devel 
@@ -826,6 +826,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Aug 31 2006 Jindrich Novy <jnovy at redhat.com> 3.0-28.fc6
+- remove BuildPreReq: openmotif-devel
+
 * Thu Aug 31 2006 Jindrich Novy <jnovy at redhat.com> 3.0-27.fc6
 - rebuild to use Xaw X toolkit instead of openmotif
 - use %%{?dist}



From fedora-cvs-commits at redhat.com  Thu Aug 31 18:26:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 14:26:34 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.314,1.315
Message-ID: <200608311826.k7VIQYFb003883@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3870

Modified Files:
	eclipse.spec 
Log Message:
* Wed Aug 30 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-3
- Don't use pkg_summary.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- eclipse.spec	31 Aug 2006 04:06:09 -0000	1.314
+++ eclipse.spec	31 Aug 2006 18:26:31 -0000	1.315
@@ -14,7 +14,6 @@
 %endif
 %define tomcatsharedir 	%{_datadir}/tomcat5
 %define tomcatlibdir 	%{_var}/lib/tomcat5
-%define pkg_summary     An open, extensible IDE
 %define section         free
 %define eclipse_major   3
 %define eclipse_minor   2
@@ -38,10 +37,10 @@
 %define native_ecj   0
 %endif
 
-Summary:        %{pkg_summary}
+Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        2 
+Release:        3
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1641,6 +1640,9 @@
 %endif
 
 %changelog
+* Wed Aug 30 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-3
+- Don't use pkg_summary.
+
 * Tue Aug 29 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-2
 - Remove double Manifest file in com.jcraft.jsch_0.1.28.jar.
 - Require java-gcj-compat >= 1.0.64.



From fedora-cvs-commits at redhat.com  Thu Aug 31 18:45:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 14:45:59 -0400
Subject: rpms/cman/devel cman.spec,1.70,1.71
Message-ID: <200608311845.k7VIjx5x004176@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4163

Modified Files:
	cman.spec 
Log Message:
New upstream sources.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- cman.spec	25 Aug 2006 22:07:47 -0000	1.70
+++ cman.spec	31 Aug 2006 18:45:52 -0000	1.71
@@ -10,7 +10,7 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.12
+%define cman_minor 0.13
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
@@ -114,6 +114,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Aug 31 2006 Chris Feist <cfeist at redhat.com> - 2.0.13-1
+- Rebuild w/ new upstream sources
+
 * Fri Aug 25 2006 Chris Feist <cfeist at redhat.com> - 2.0.12-1
 - Rebuild w/ new upstream sources
 



From fedora-cvs-commits at redhat.com  Thu Aug 31 19:05:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 15:05:54 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-infer-virtual.patch, 1.4,
	1.5 xorg-x11-server.spec, 1.164, 1.165
Message-ID: <200608311905.k7VJ5sZh004458@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4444

Modified Files:
	xorg-x11-server-1.1.1-infer-virtual.patch xorg-x11-server.spec 
Log Message:
* Thu Aug 31 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-34.fc6
- xorg-x11-server-1.1.1-infer-virtual.patch: Be slightly more paranoid about
  setting line pitch, and rescan the mode list after pruning to re-validate
  the estimated virtual size.


xorg-x11-server-1.1.1-infer-virtual.patch:
 common/xf86Mode.c |  163 +++++++++++++++++++++++++++++++++++++-----------------
 common/xf86str.h  |    2 
 ddc/ddcProperty.c |   23 ++++---
 3 files changed, 129 insertions(+), 59 deletions(-)

Index: xorg-x11-server-1.1.1-infer-virtual.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-infer-virtual.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-server-1.1.1-infer-virtual.patch	25 Aug 2006 01:21:32 -0000	1.4
+++ xorg-x11-server-1.1.1-infer-virtual.patch	31 Aug 2006 19:05:51 -0000	1.5
@@ -1,18 +1,86 @@
---- xorg-server-1.1.1/hw/xfree86/common/xf86str.h.infer-virtual	2006-08-24 19:05:24.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-24 19:05:24.000000000 -0400
-@@ -125,8 +125,10 @@ typedef enum {
- # define M_T_CRTC_C  (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC  */
- # define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)
-                                /* built-in mode - configure CRTC and clock */
-+# define M_T_PREFERRED 0x08
- # define M_T_DEFAULT 0x10	/* (VESA) default modes */
- # define M_T_USERDEF 0x20	/* One of the modes from the config file */
-+# define M_T_DRIVER 0x40
+--- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.infer-virtual	2006-08-30 12:39:38.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-30 12:39:38.000000000 -0400
+@@ -127,9 +127,8 @@ PrintModeline(int scrnIndex,DisplayModeP
+ /*
+  * TODO:
+  *  - for those with access to the VESA DMT standard; review please.
+- *  - swap M_T_DEFAULT for M_T_EDID_...
+  */
+-#define MODEPREFIX(name) NULL, NULL, name, 0,M_T_DEFAULT
++#define MODEPREFIX(name) NULL, NULL, name, 0,M_T_DRIVER
+ #define MODESUFFIX   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0
  
- /* Video mode */
- typedef struct _DisplayModeRec {
---- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.infer-virtual	2006-08-24 19:05:24.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-24 19:05:24.000000000 -0400
+ DisplayModeRec DDCEstablishedModes[17] = {
+@@ -182,6 +181,7 @@ DDCModesFromStandardTiming(int scrnIndex
+         if (timing[i].hsize && timing[i].vsize && timing[i].refresh) {
+             Mode =  xf86CVTMode(timing[i].hsize, timing[i].vsize,
+                                 timing[i].refresh, FALSE, FALSE);
++	    Mode->type = M_T_DRIVER;
+             Modes = xf86ModesAdd(Modes, Mode);
+         }
+ 
+@@ -192,7 +192,8 @@ DDCModesFromStandardTiming(int scrnIndex
+  *
+  */
+ static DisplayModePtr
+-DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing)
++DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
++			  int preferred)
+ {
+     DisplayModePtr Mode;
+ 
+@@ -205,9 +206,8 @@ DDCModeFromDetailedTiming(int scrnIndex,
+     
+     /* We only do seperate sync currently */
+     if (timing->sync != 0x03) {
+-         xf86DrvMsg(scrnIndex, X_INFO, "%s: Ignoring: We only handle seperate"
+-                    " sync.\n", __func__);
+-         return NULL;
++         xf86DrvMsg(scrnIndex, X_INFO, "%s: %dx%d Warning: We only handle seperate"
++                    " sync.\n", __func__, timing->h_active, timing->v_active);
+     }
+     
+     Mode = xnfalloc(sizeof(DisplayModeRec));
+@@ -217,7 +217,9 @@ DDCModeFromDetailedTiming(int scrnIndex,
+     xf86snprintf(Mode->name, 20, "%dx%d", timing->h_active,
+                  timing->v_active);
+     
+-    Mode->type = M_T_DEFAULT; /* get ourselves a nice type of our own */
++    Mode->type = M_T_DRIVER;
++    if (preferred)
++	Mode->type |= M_T_PREFERRED;
+     
+     Mode->Clock = timing->clock / 1000.0;
+     
+@@ -302,12 +304,15 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr 
+     DisplayModePtr Modes = NULL, Mode;
+     int i, clock;
+     Bool have_hsync = FALSE, have_vrefresh = FALSE;
++    int preferred;
+     
+     if (!Monitor || !DDC)
+         return;
+ 
+     Monitor->DDC = DDC;
+ 
++    preferred = PREFERRED_TIMING_MODE(DDC->features.msc);
++
+     /*
+      * Don't want to fill this in yet, drivers will (wrongly!) set their
+      * gamma ramp based on this info.
+@@ -382,7 +387,9 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr 
+             break;
+         case DT:
+             Mode = DDCModeFromDetailedTiming(scrnIndex, 
+-                                             &DDC->det_mon[i].section.d_timings);
++                                             &DDC->det_mon[i].section.d_timings,
++					     preferred);
++	    preferred = 0;
+             Modes = xf86ModesAdd(Modes, Mode);
+             break;
+         case DS_STD_TIMINGS:
+--- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.infer-virtual	2006-08-30 12:39:38.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c	2006-08-30 15:49:44.000000000 -0400
 @@ -47,6 +47,7 @@
  #include "globals.h"
  #include "xf86.h"
@@ -21,7 +89,7 @@
  
  /*
   * xf86GetNearestClock --
-@@ -1163,6 +1164,77 @@ xf86CheckModeForDriver(ScrnInfoPtr scrp,
+@@ -1163,6 +1164,79 @@ xf86CheckModeForDriver(ScrnInfoPtr scrp,
      return MODE_OK;
  }
  
@@ -46,7 +114,7 @@
 +		xf86ModeStatusToString(status));
 +}
 +
-+static void
++static int 
 +inferVirtualSize(ScrnInfoPtr scrp, DisplayModePtr modes, int *vx, int *vy)
 +{
 +    float aspect = 0.0;
@@ -54,7 +122,7 @@
 +    int x = 0, y = 0;
 +    DisplayModePtr mode;
 +
-+    if (!mon) return;
++    if (!mon) return 0;
 +
 +    /*
 +     * technically this triggers if _either_ is zero, which is not what EDID
@@ -84,8 +152,8 @@
 +
 +    if (!x || !y) {
 +	xf86DrvMsg(scrp->scrnIndex, X_WARNING,
-+		   "No driver-provided modes found\n");
-+	return;
++		   "Unable to estimate virtual size\n");
++	return 0;
 +    }
 +
 +    *vx = x;
@@ -94,25 +162,36 @@
 +    xf86DrvMsg(scrp->scrnIndex, X_INFO,
 +	       "Estimated virtual size for aspect ratio %.4f is %dx%d\n",
 +	       aspect, *vx, *vy);
++
++    return 1;
 +}
 +
  /*
   * xf86ValidateModes
   *
-@@ -1426,6 +1498,12 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+@@ -1234,6 +1308,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+     int numTimings = 0;
+     range hsync[MAX_HSYNC];
+     range vrefresh[MAX_VREFRESH];
++    Bool inferred_virtual = FALSE;
+ 
+ #ifdef DEBUG
+     ErrorF("xf86ValidateModes(%p, %p, %p, %p,\n\t\t  %p, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x)\n",
+@@ -1426,6 +1501,13 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
  	virtX = virtualX;
  	virtY = virtualY;
  	scrp->virtualFrom = X_CONFIG;
 +    } else if (!modeNames || !*modeNames) {
 +	/* No virtual size given in the config, try to infer */
 +	/* XXX this doesn't take m{in,ax}Pitch into account; oh well */
-+	inferVirtualSize(scrp, availModes, &virtX, &virtY);
-+	linePitch = miScanLineWidth(virtX, virtY, minPitch, apertureSize,
-+				    BankFormat, pitchInc);
++	inferred_virtual = inferVirtualSize(scrp, availModes, &virtX, &virtY);
++	if (inferred_virtual)
++	    linePitch = miScanLineWidth(virtX, virtY, minPitch, apertureSize,
++					BankFormat, pitchInc);
      }
  
      /* Print clock ranges and scaled clocks */
-@@ -1442,7 +1520,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+@@ -1442,7 +1524,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
  	for (p = availModes; p != NULL; p = p->next) {
  	    status = xf86InitialCheckModeForDriver(scrp, p, clockRanges,
  						   strategy, maxPitch,
@@ -121,7 +200,7 @@
  
  	    if (status == MODE_OK) {
  		status = xf86CheckModeForMonitor(p, scrp->monitor);
-@@ -1462,18 +1540,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+@@ -1462,18 +1544,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
  		q->name = xnfstrdup(p->name);
  	        q->status = MODE_OK;
  	    } else {
@@ -141,7 +220,7 @@
  	    }
  	}
  
-@@ -1615,18 +1682,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+@@ -1615,18 +1686,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
  	repeat = FALSE;
      lookupNext:
  	if (repeat && ((status = p->status) != MODE_OK)) {
@@ -161,7 +240,7 @@
  	}
  	saveType = p->type;
  	status = xf86LookupMode(scrp, p, clockRanges, strategy);
-@@ -1634,18 +1690,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+@@ -1634,18 +1694,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
  	    continue;
  	}
  	if (status != MODE_OK) {
@@ -181,7 +260,38 @@
  	}
  	if (status == MODE_ERROR) {
  	    ErrorF("xf86ValidateModes: "
-@@ -1841,20 +1886,6 @@ xf86PruneDriverModes(ScrnInfoPtr scrp)
+@@ -1755,6 +1804,30 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+ 
+ #undef _VIRTUALX
+ 
++    /*
++     * If we estimated the virtual size above, we may have filtered away all
++     * the modes that maximally match that size; scan again to find out and
++     * fix up if so.
++     */
++    if (inferred_virtual) {
++	int vx = 0, vy = 0;
++	for (p = scrp->modes; p; p = p->next) {
++	    if (p->HDisplay > vx && p->VDisplay > vy) {
++		vx = p->HDisplay;
++		vy = p->VDisplay;
++	    }
++	}
++	if (vx < virtX || vy < virtY) {
++	    xf86DrvMsg(scrp->scrnIndex, X_WARNING,
++		       "Shrinking virtual size estimate from %dx%d to %dx%d\n",
++		       virtX, virtY, vx, vy);
++	    virtX = vx;
++	    virtY = vy;
++	    linePitch = miScanLineWidth(vx, vy, linePitch, apertureSize,
++					BankFormat, pitchInc);
++	}
++    }
++
+     /* Update the ScrnInfoRec parameters */
+     
+     scrp->virtualX = virtX;
+@@ -1841,20 +1914,6 @@ xf86PruneDriverModes(ScrnInfoPtr scrp)
  	    return;
  	n = p->next;
  	if (p->status != MODE_OK) {
@@ -202,7 +312,7 @@
  	    xf86DeleteMode(&(scrp->modes), p);
  	}
  	p = n;
-@@ -1991,6 +2022,8 @@ xf86PrintModes(ScrnInfoPtr scrp)
+@@ -1991,6 +2050,8 @@ xf86PrintModes(ScrnInfoPtr scrp)
  	    prefix = "Built-in mode";
  	else if (p->type & M_T_DEFAULT)
  	    prefix = "Default mode";
@@ -211,84 +321,16 @@
  	else
  	    prefix = "Mode";
  	if (p->type & M_T_USERDEF)
---- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.infer-virtual	2006-08-24 19:05:24.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-08-24 19:06:44.000000000 -0400
-@@ -127,9 +127,8 @@ PrintModeline(int scrnIndex,DisplayModeP
- /*
-  * TODO:
-  *  - for those with access to the VESA DMT standard; review please.
-- *  - swap M_T_DEFAULT for M_T_EDID_...
-  */
--#define MODEPREFIX(name) NULL, NULL, name, 0,M_T_DEFAULT
-+#define MODEPREFIX(name) NULL, NULL, name, 0,M_T_DRIVER
- #define MODESUFFIX   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0
- 
- DisplayModeRec DDCEstablishedModes[17] = {
-@@ -182,6 +181,7 @@ DDCModesFromStandardTiming(int scrnIndex
-         if (timing[i].hsize && timing[i].vsize && timing[i].refresh) {
-             Mode =  xf86CVTMode(timing[i].hsize, timing[i].vsize,
-                                 timing[i].refresh, FALSE, FALSE);
-+	    Mode->type = M_T_DRIVER;
-             Modes = xf86ModesAdd(Modes, Mode);
-         }
- 
-@@ -192,7 +192,8 @@ DDCModesFromStandardTiming(int scrnIndex
-  *
-  */
- static DisplayModePtr
--DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing)
-+DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
-+			  int preferred)
- {
-     DisplayModePtr Mode;
- 
-@@ -205,9 +206,8 @@ DDCModeFromDetailedTiming(int scrnIndex,
-     
-     /* We only do seperate sync currently */
-     if (timing->sync != 0x03) {
--         xf86DrvMsg(scrnIndex, X_INFO, "%s: Ignoring: We only handle seperate"
--                    " sync.\n", __func__);
--         return NULL;
-+         xf86DrvMsg(scrnIndex, X_INFO, "%s: %dx%d Warning: We only handle seperate"
-+                    " sync.\n", __func__, timing->h_active, timing->v_active);
-     }
-     
-     Mode = xnfalloc(sizeof(DisplayModeRec));
-@@ -217,7 +217,9 @@ DDCModeFromDetailedTiming(int scrnIndex,
-     xf86snprintf(Mode->name, 20, "%dx%d", timing->h_active,
-                  timing->v_active);
-     
--    Mode->type = M_T_DEFAULT; /* get ourselves a nice type of our own */
-+    Mode->type = M_T_DRIVER;
-+    if (preferred)
-+	Mode->type |= M_T_PREFERRED;
-     
-     Mode->Clock = timing->clock / 1000.0;
-     
-@@ -302,12 +304,15 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr 
-     DisplayModePtr Modes = NULL, Mode;
-     int i, clock;
-     Bool have_hsync = FALSE, have_vrefresh = FALSE;
-+    int preferred;
-     
-     if (!Monitor || !DDC)
-         return;
- 
-     Monitor->DDC = DDC;
+--- xorg-server-1.1.1/hw/xfree86/common/xf86str.h.infer-virtual	2006-08-30 12:39:38.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86str.h	2006-08-30 12:39:38.000000000 -0400
+@@ -125,8 +125,10 @@ typedef enum {
+ # define M_T_CRTC_C  (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC  */
+ # define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)
+                                /* built-in mode - configure CRTC and clock */
++# define M_T_PREFERRED 0x08
+ # define M_T_DEFAULT 0x10	/* (VESA) default modes */
+ # define M_T_USERDEF 0x20	/* One of the modes from the config file */
++# define M_T_DRIVER 0x40
  
-+    preferred = PREFERRED_TIMING_MODE(DDC->features.msc);
-+
-     /*
-      * Don't want to fill this in yet, drivers will (wrongly!) set their
-      * gamma ramp based on this info.
-@@ -382,7 +387,9 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr 
-             break;
-         case DT:
-             Mode = DDCModeFromDetailedTiming(scrnIndex, 
--                                             &DDC->det_mon[i].section.d_timings);
-+                                             &DDC->det_mon[i].section.d_timings,
-+					     preferred);
-+	    preferred = 0;
-             Modes = xf86ModesAdd(Modes, Mode);
-             break;
-         case DS_STD_TIMINGS:
+ /* Video mode */
+ typedef struct _DisplayModeRec {


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- xorg-x11-server.spec	31 Aug 2006 00:41:14 -0000	1.164
+++ xorg-x11-server.spec	31 Aug 2006 19:05:51 -0000	1.165
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   33%{?dist}
+Release:   34%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -703,6 +703,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Thu Aug 31 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-34.fc6
+- xorg-x11-server-1.1.1-infer-virtual.patch: Be slightly more paranoid about
+  setting line pitch, and rescan the mode list after pruning to re-validate
+  the estimated virtual size.
+
 * Wed Aug 30 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-33.fc6
 - Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to evict pixmap
   when GLX_EXT_texture_from_pixmap is first used.



From fedora-cvs-commits at redhat.com  Thu Aug 31 19:18:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 15:18:25 -0400
Subject: rpms/glibc/devel .cvsignore, 1.170, 1.171 glibc-fedora.patch, 1.178,
	1.179 glibc.spec, 1.263, 1.264 sources, 1.194, 1.195
Message-ID: <200608311918.k7VJIPDd004748@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4722/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4.90-28 on branch devel from glibc-2.4.90-28.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- .cvsignore	31 Aug 2006 07:08:05 -0000	1.170
+++ .cvsignore	31 Aug 2006 19:18:22 -0000	1.171
@@ -1,2 +1,2 @@
-glibc-20060831T0640.tar.bz2
-glibc-fedora-20060831T0640.tar.bz2
+glibc-20060831T1812.tar.bz2
+glibc-fedora-20060831T1812.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 57 files changed, 1394 insertions(+), 631 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- glibc-fedora.patch	31 Aug 2006 07:08:05 -0000	1.178
+++ glibc-fedora.patch	31 Aug 2006 19:18:22 -0000	1.179
@@ -1,5 +1,5 @@
---- glibc-20060831T0640/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060831T0640-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060831T1812/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060831T1812-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060831T0640/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060831T0640-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060831T1812/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060831T1812-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060831T0640/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060831T0640-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060831T1812/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060831T1812-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060831T0640/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060831T0640-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060831T1812/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060831T1812-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060831T0640/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060831T0640-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060831T1812/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060831T1812-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060831T0640/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060831T0640-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060831T1812/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060831T1812-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060831T0640/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060831T0640-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060831T1812/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060831T1812-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060831T0640/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060831T0640-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060831T1812/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060831T1812-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060831T0640/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060831T0640-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060831T1812/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060831T1812-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060831T0640/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060831T0640-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060831T1812/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060831T1812-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060831T0640/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060831T0640-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060831T1812/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T1812-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-20060831T0640/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060831T0640-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060831T1812/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T1812-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-20060831T0640/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060831T0640-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060831T1812/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060831T1812-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060831T0640/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060831T0640-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060831T1812/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060831T1812-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060831T0640/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060831T0640-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060831T1812/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060831T1812-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060831T0640/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060831T0640-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060831T1812/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060831T1812-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060831T0640/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060831T0640-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060831T1812/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060831T1812-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060831T0640/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060831T0640-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060831T1812/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060831T1812-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060831T0640/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
-+++ glibc-20060831T0640-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
+--- glibc-20060831T1812/localedata/SUPPORTED	13 Aug 2006 20:15:25 -0000	1.96
++++ glibc-20060831T1812-fedora/localedata/SUPPORTED	15 Aug 2006 05:53:48 -0000	1.71.2.13
 @@ -77,6 +77,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060831T0640/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060831T0640-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060831T1812/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060831T1812-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060831T0640/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
-+++ glibc-20060831T0640-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
+--- glibc-20060831T1812/localedata/locales/en_GB	30 Jul 2006 22:19:44 -0000	1.13
++++ glibc-20060831T1812-fedora/localedata/locales/en_GB	31 Jul 2006 07:16:59 -0000	1.10.2.3
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20060831T0640/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060831T0640-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060831T1812/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T1812-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -950,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060831T0640/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060831T0640-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060831T1812/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060831T1812-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -979,8 +979,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060831T0640/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060831T0640-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060831T1812/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060831T1812-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1056,8 +1056,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060831T0640/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060831T0640-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060831T1812/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060831T1812-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -1113,17 +1113,17 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060831T0640/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060831T0640-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060831T1812/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060831T1812-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060831T0640/nptl/ChangeLog	30 Aug 2006 19:11:05 -0000	1.914
-+++ glibc-20060831T0640-fedora/nptl/ChangeLog	31 Aug 2006 06:53:29 -0000	1.706.2.101
-@@ -1054,6 +1054,15 @@
+--- glibc-20060831T1812/nptl/ChangeLog	31 Aug 2006 17:16:11 -0000	1.915
++++ glibc-20060831T1812-fedora/nptl/ChangeLog	31 Aug 2006 18:54:54 -0000	1.706.2.102
+@@ -1064,6 +1064,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1139,7 +1139,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1790,6 +1799,11 @@
+@@ -1800,6 +1809,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1151,7 +1151,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3864,6 +3878,11 @@
+@@ -3874,6 +3888,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1163,8 +1163,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060831T0640/nptl/Makefile	21 Aug 2006 21:02:10 -0000	1.186
-+++ glibc-20060831T0640-fedora/nptl/Makefile	22 Aug 2006 09:05:40 -0000	1.157.2.26
+--- glibc-20060831T1812/nptl/Makefile	21 Aug 2006 21:02:10 -0000	1.186
++++ glibc-20060831T1812-fedora/nptl/Makefile	22 Aug 2006 09:05:40 -0000	1.157.2.26
 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1187,8 +1187,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060831T0640/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060831T0640-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060831T1812/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060831T1812-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1213,8 +1213,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060831T1812/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T1812-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1222,8 +1222,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
-+++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
+--- glibc-20060831T1812/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 04:35:59 -0000	1.31
++++ glibc-20060831T1812-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.25.2.6
 @@ -68,6 +68,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1559,8 +1559,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060831T1812/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060831T1812-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@@ -1706,8 +1706,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060831T1812/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060831T1812-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
 @@ -44,9 +44,16 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -1808,8 +1808,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060831T1812/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060831T1812-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1951,8 +1951,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
-+++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
+--- glibc-20060831T1812/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 04:35:58 -0000	1.27
++++ glibc-20060831T1812-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	29 Jul 2006 23:12:42 -0000	1.23.2.4
 @@ -49,6 +49,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2340,8 +2340,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060831T0640/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060831T0640-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060831T1812/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060831T1812-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
 @@ -46,8 +46,13 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -2436,8 +2436,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060831T0640/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060831T0640-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060831T1812/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060831T1812-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2460,8 +2460,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060831T0640/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060831T0640-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060831T1812/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060831T1812-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2480,8 +2480,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060831T0640/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060831T0640-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060831T1812/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060831T1812-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2493,8 +2493,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060831T0640/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060831T0640-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060831T1812/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060831T1812-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -2535,8 +2535,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060831T0640/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
-+++ glibc-20060831T0640-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
+--- glibc-20060831T1812/posix/Makefile	2 Aug 2006 16:43:46 -0000	1.192
++++ glibc-20060831T1812-fedora/posix/Makefile	2 Aug 2006 16:57:42 -0000	1.171.2.20
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2570,8 +2570,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060831T0640/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060831T0640-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060831T1812/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T1812-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -2588,8 +2588,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060831T0640/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060831T0640-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060831T1812/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060831T1812-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -2605,8 +2605,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060831T0640/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060831T0640-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060831T1812/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060831T1812-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2620,8 +2620,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060831T0640/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060831T0640-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060831T1812/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060831T1812-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -2633,8 +2633,8 @@
  endif
  endif
  
---- glibc-20060831T0640/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060831T0640-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060831T1812/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060831T1812-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -2986,8 +2986,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060831T0640/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060831T0640-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060831T1812/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T1812-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3073,8 +3073,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060831T0640/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20060831T0640-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20060831T1812/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20060831T1812-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3089,8 +3089,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20060831T0640/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
-+++ glibc-20060831T0640-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+--- glibc-20060831T1812/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20060831T1812-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
 @@ -18,11 +18,14 @@
     02111-1307 USA.  */
  
@@ -3138,8 +3138,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060831T0640/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060831T0640-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060831T1812/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060831T1812-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;
@@ -3182,8 +3182,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060831T0640/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060831T0640-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060831T1812/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060831T1812-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"
@@ -3193,8 +3193,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060831T0640/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060831T0640-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060831T1812/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060831T1812-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;
@@ -3240,8 +3240,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060831T0640/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060831T0640-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060831T1812/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T1812-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.
@@ -3302,8 +3302,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060831T0640/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060831T0640-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060831T1812/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060831T1812-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)
@@ -3336,24 +3336,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060831T0640/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060831T0640-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060831T1812/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T1812-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-20060831T0640/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060831T0640-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060831T1812/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060831T1812-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-20060831T0640/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060831T0640-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060831T1812/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060831T1812-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.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- glibc.spec	31 Aug 2006 07:08:06 -0000	1.263
+++ glibc.spec	31 Aug 2006 19:18:22 -0000	1.264
@@ -1,9 +1,9 @@
-%define glibcdate 20060831T0640
+%define glibcdate 20060831T1812
 %define glibcname glibc
-%define glibcsrcdir glibc-20060831T0640
+%define glibcsrcdir glibc-20060831T1812
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 27
+%define glibcrelease 28
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1453,6 +1453,9 @@
 %endif
 
 %changelog
+* Thu Aug 31 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-28
+- another malloc doubly linked list corruption problem fix (#204653)
+
 * Thu Aug 31 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-27
 - allow $LIB and $PLATFORM in dlopen parameters even in suid/sgid (#204399)
 - fix splice prototype (#204530)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- sources	31 Aug 2006 07:08:06 -0000	1.194
+++ sources	31 Aug 2006 19:18:22 -0000	1.195
@@ -1,2 +1,2 @@
-aa91a2595015d0e994521e1e8f8c5c11  glibc-20060831T0640.tar.bz2
-b6bab044c304b57ef66761fe1b972b6b  glibc-fedora-20060831T0640.tar.bz2
+f9ed8192cd6fbfa427626482325cdc27  glibc-20060831T1812.tar.bz2
+918877871822d0174845703e17949a4e  glibc-fedora-20060831T1812.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 31 19:30:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 15:30:02 -0400
Subject: rpms/lvm2-cluster/devel lvm2-cluster.spec,1.29,1.30
Message-ID: <200608311930.k7VJU25n005085@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/lvm2-cluster/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5057

Modified Files:
	lvm2-cluster.spec 
Log Message:
build all archs



Index: lvm2-cluster.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2-cluster/devel/lvm2-cluster.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- lvm2-cluster.spec	1 Aug 2006 09:21:04 -0000	1.29
+++ lvm2-cluster.spec	31 Aug 2006 19:30:00 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Cluster extenstions for userland logical volume management tools 
 Name: lvm2-cluster
 Version: 2.02.06
-Release: 1.4
+Release: 1.5
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -19,7 +19,6 @@
 BuildRequires: libselinux-devel, libsepol-devel
 BuildRequires: cman-devel
 Requires: lvm2 >= 2.02
-ExclusiveArch: %{ix86} x86_64
 
 %description
 Extensions to LVM2 to support clusters.
@@ -65,6 +64,9 @@
 /etc/rc.d/init.d/clvmd
 
 %changelog
+* Wed Aug 31 2006 Alasdair Kergon <agk at redhat.com> - 2.02.06-1.5
+- Build for all archs now.
+
 * Wed Aug 01 2006 Milan Broz <mbroz at redhat.com> - 2.02.06-1.4
 - Force binaries to 755 permission (rpmlint)
 - Removed macro in changelog (rpmlint)



From fedora-cvs-commits at redhat.com  Thu Aug 31 19:31:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 15:31:06 -0400
Subject: rpms/lvm2-cluster/devel Makefile,1.4,1.5
Message-ID: <200608311931.k7VJV63C005170@cvs.devel.redhat.com>

Author: agk

Update of /cvs/dist/rpms/lvm2-cluster/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5153

Modified Files:
	Makefile 
Log Message:
remove wrong COLLECTION setting



Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/lvm2-cluster/devel/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	21 Dec 2004 22:27:01 -0000	1.4
+++ Makefile	31 Aug 2006 19:31:04 -0000	1.5
@@ -4,6 +4,5 @@
 SPECFILE = $(firstword $(wildcard *.spec))
 UPSTREAM_CHECKS = asc
 BHC_FLAGS = -n 
-COLLECTION = dist-fc4
 
 include ../common/Makefile.common



From fedora-cvs-commits at redhat.com  Thu Aug 31 19:32:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 15:32:37 -0400
Subject: rpms/selinux-policy/devel policy-20060829.patch, 1.3,
	1.4 selinux-policy.spec, 1.265, 1.266 policy-20060802.patch,
	1.23, NONE
Message-ID: <200608311932.k7VJWbKk005268@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5246

Modified Files:
	policy-20060829.patch selinux-policy.spec 
Removed Files:
	policy-20060802.patch 
Log Message:
* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-5
- Lots of fixes for restarting daemons at the console.


policy-20060829.patch:
 admin/amanda.fc              |   50 -----
 admin/anaconda.te            |   11 +
 admin/bootloader.fc          |    2 
 admin/consoletype.te         |    7 
 admin/firstboot.te           |   10 -
 admin/rpm.fc                 |    2 
 admin/rpm.if                 |   13 -
 apps/java.fc                 |    2 
 apps/mono.te                 |    1 
 kernel/corecommands.fc       |    2 
 kernel/corecommands.if       |    1 
 kernel/corenetwork.te.in     |    4 
 kernel/devices.fc            |    2 
 kernel/files.fc              |    1 
 kernel/filesystem.te         |    2 
 kernel/kernel.if             |   39 ++++
 kernel/terminal.fc           |    2 
 services/amavis.te           |    1 
 services/apache.te           |    2 
 services/bluetooth.te        |    5 
 services/ccs.fc              |    8 
 services/ccs.if              |   65 +++++++
 services/ccs.te              |   87 +++++++++
 services/clamav.te           |    1 
 services/cron.if             |    8 
 services/cron.te             |    1 
 services/dbus.if             |    1 
 services/dovecot.te          |    2 
 services/hal.te              |    8 
 services/ldap.te             |    2 
 services/networkmanager.te   |    4 
 services/ntp.te              |    6 
 services/oddjob.fc           |    8 
 services/oddjob.if           |   76 ++++++++
 services/oddjob.te           |   73 ++++++++
 services/oddjob_mkhomedir.fc |    6 
 services/oddjob_mkhomedir.if |   24 ++
 services/oddjob_mkhomedir.te |   29 +++
 services/pegasus.if          |   31 +++
 services/pegasus.te          |    5 
 services/postfix.te          |    1 
 services/procmail.te         |    1 
 services/pyzor.te            |    9 -
 services/rhgb.te             |    1 
 services/ricci.fc            |   20 ++
 services/ricci.if            |  184 ++++++++++++++++++++
 services/ricci.te            |  384 +++++++++++++++++++++++++++++++++++++++++++
 services/rpc.te              |    1 
 services/setroubleshoot.fc   |    9 +
 services/setroubleshoot.if   |    3 
 services/setroubleshoot.te   |  117 +++++++++++++
 services/spamassassin.te     |    1 
 services/ssh.if              |   24 ++
 services/stunnel.te          |    2 
 services/xserver.if          |   84 +++++++++
 services/xserver.te          |    4 
 system/fstools.te            |    1 
 system/hostname.te           |    5 
 system/hotplug.te            |    2 
 system/init.te               |    3 
 system/logging.fc            |    1 
 system/lvm.te                |    2 
 system/modutils.te           |    1 
 system/mount.te              |    4 
 system/selinuxutil.te        |   11 +
 system/setrans.te            |    2 
 system/udev.te               |    5 
 system/unconfined.fc         |    1 
 system/unconfined.if         |    1 
 system/userdomain.if         |  246 ++++++++++++++++++---------
 system/userdomain.te         |   48 ++---
 71 files changed, 1590 insertions(+), 192 deletions(-)

Index: policy-20060829.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060829.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- policy-20060829.patch	31 Aug 2006 12:13:31 -0000	1.3
+++ policy-20060829.patch	31 Aug 2006 19:32:34 -0000	1.4
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.fc serefpolicy-2.3.10/policy/modules/admin/amanda.fc
 --- nsaserefpolicy/policy/modules/admin/amanda.fc	2006-08-29 09:00:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/amanda.fc	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/amanda.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -11,61 +11,11 @@
  /usr/lib(64)?/amanda		-d	gen_context(system_u:object_r:amanda_usr_lib_t,s0)
  /usr/lib(64)?/amanda/.+		--	gen_context(system_u:object_r:amanda_exec_t,s0)
@@ -65,7 +65,7 @@
  /var/lib/amanda/index			gen_context(system_u:object_r:amanda_data_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-2.3.10/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2006-08-29 09:00:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/anaconda.te	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/anaconda.te	2006-08-31 13:24:00.000000000 -0400
 @@ -60,3 +60,14 @@
  optional_policy(`
  	usermanage_domtrans_admin_passwd(anaconda_t)
@@ -83,7 +83,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.3.10/policy/modules/admin/bootloader.fc
 --- nsaserefpolicy/policy/modules/admin/bootloader.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/bootloader.fc	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/bootloader.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -10,3 +10,5 @@
  /sbin/lilo.*		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
  /sbin/mkinitrd		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
@@ -92,7 +92,7 @@
 +/boot/grup/slapsh.xpm.gz --	gen_context(system_u:object_r:boot_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.10/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-08-29 09:00:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/consoletype.te	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/consoletype.te	2006-08-31 13:24:00.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -109,7 +109,7 @@
  role system_r types consoletype_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.10/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-08-29 09:00:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/firstboot.te	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/firstboot.te	2006-08-31 13:24:00.000000000 -0400
 @@ -38,9 +38,8 @@
  
  allow firstboot_t firstboot_etc_t:file { getattr read };
@@ -136,7 +136,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.10/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/rpm.fc	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/rpm.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -19,6 +19,8 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -148,7 +148,7 @@
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.10/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-08-02 10:34:09.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/admin/rpm.if	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/admin/rpm.if	2006-08-31 13:24:00.000000000 -0400
 @@ -75,12 +75,13 @@
  	')
  
@@ -171,7 +171,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.3.10/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2006-08-29 09:00:26.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/apps/java.fc	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/apps/java.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # /opt
@@ -183,7 +183,7 @@
  # /usr
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.3.10/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2006-07-14 17:04:31.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/apps/mono.te	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/apps/mono.te	2006-08-31 13:24:00.000000000 -0400
 @@ -21,6 +21,7 @@
  	allow mono_t self:process { execheap execmem };
  	unconfined_domain_noaudit(mono_t)
@@ -194,7 +194,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.3.10/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-08-29 09:00:26.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/corecommands.fc	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/corecommands.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -54,7 +54,9 @@
  /etc/rc\.d/init\.d/functions	--	gen_context(system_u:object_r:bin_t,s0)
  
@@ -207,7 +207,7 @@
  /etc/X11/xdm/TakeConsole	--	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.3.10/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/corecommands.if	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/corecommands.if	2006-08-31 13:24:00.000000000 -0400
 @@ -950,6 +950,7 @@
  
  	allow $1 exec_type:file manage_file_perms;
@@ -218,7 +218,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.10/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-08-29 09:00:26.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/corenetwork.te.in	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/corenetwork.te.in	2006-08-31 13:24:00.000000000 -0400
 @@ -67,12 +67,14 @@
  network_port(clamd, tcp,3310,s0)
  network_port(clockspeed, udp,4041,s0)
@@ -245,7 +245,7 @@
  network_port(router, udp,520,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.10/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-08-29 09:00:26.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/devices.fc	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/devices.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -3,7 +3,7 @@
  /dev/.*				gen_context(system_u:object_r:device_t,s0)
  
@@ -257,7 +257,7 @@
  /dev/amidi.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.10/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-08-02 10:34:05.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/files.fc	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/files.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -57,6 +57,7 @@
  /etc/motd		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /etc/nohotplug		--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -268,7 +268,7 @@
  /etc/cups/client\.conf	--	gen_context(system_u:object_r:etc_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.10/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-08-25 13:29:57.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/filesystem.te	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/filesystem.te	2006-08-31 13:24:00.000000000 -0400
 @@ -24,6 +24,7 @@
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
@@ -287,7 +287,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.10/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-08-29 09:00:26.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/kernel.if	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/kernel.if	2006-08-31 13:53:01.000000000 -0400
 @@ -2122,3 +2122,42 @@
  
  	typeattribute $1 kern_unconfined;
@@ -333,16 +333,27 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.fc serefpolicy-2.3.10/policy/modules/kernel/terminal.fc
 --- nsaserefpolicy/policy/modules/kernel/terminal.fc	2006-08-20 10:55:49.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/kernel/terminal.fc	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/terminal.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -34,3 +34,5 @@
  # used by init scripts to initally populate udev /dev
  /lib/udev/devices/console -c	gen_context(system_u:object_r:console_device_t,s0)
  ')
 +
 +/dev/xvc[0-9]*		-c	gen_context(system_u:object_r:tty_device_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.10/policy/modules/services/amavis.te
+--- nsaserefpolicy/policy/modules/services/amavis.te	2006-08-29 09:00:27.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/amavis.te	2006-08-31 14:21:10.000000000 -0400
+@@ -155,6 +155,7 @@
+ 
+ ifdef(`targeted_policy',`
+ 	term_dontaudit_use_generic_ptys(amavis_t)
++	term_dontaudit_use_unallocated_ttys(amavis_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.10/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/apache.te	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/apache.te	2006-08-31 14:21:37.000000000 -0400
 @@ -268,6 +268,7 @@
  
  seutil_dontaudit_search_config(httpd_t)
@@ -351,9 +362,37 @@
  sysnet_read_config(httpd_t)
  
  userdom_use_unpriv_users_fds(httpd_t)
+@@ -713,4 +714,5 @@
+ 
+ ifdef(`targeted_policy',`
+ 	term_dontaudit_use_generic_ptys(httpd_rotatelogs_t)
++	term_dontaudit_use_unallocated_ttys(httpd_rotatelogs_t)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.10/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/bluetooth.te	2006-08-31 14:22:12.000000000 -0400
+@@ -217,14 +217,17 @@
+ 	fs_rw_tmpfs_files(bluetooth_helper_t)
+ 
+ 	term_dontaudit_use_generic_ptys(bluetooth_helper_t)
++	term_dontaudit_use_unallocated_ttys(bluetooth_helper_t)
+ 
+ 	unconfined_stream_connect(bluetooth_helper_t)
+ 
+ 	userdom_manage_generic_user_home_content_files(bluetooth_helper_t)
+ 
++	corenet_non_ipsec_sendrecv(bluetooth_helper_t)
++
+ 	optional_policy(`
+ 	        corenet_tcp_connect_xserver_port(bluetooth_helper_t)
+-
++		xserver_write_xdm_tmp_sockets(bluetooth_helper_t)
+ 		xserver_stream_connect_xdm(bluetooth_helper_t)
+ 		xserver_use_xdm_fds(bluetooth_helper_t)
+ 		xserver_rw_xdm_pipes(bluetooth_helper_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-2.3.10/policy/modules/services/ccs.fc
 --- nsaserefpolicy/policy/modules/services/ccs.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ccs.fc	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ccs.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -0,0 +1,8 @@
 +# ccs executable will have:
 +# label: system_u:object_r:ccs_exec_t
@@ -365,7 +404,7 @@
 +/etc/cluster(/.*)?		gen_context(system_u:object_r:cluster_conf_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.if serefpolicy-2.3.10/policy/modules/services/ccs.if
 --- nsaserefpolicy/policy/modules/services/ccs.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ccs.if	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ccs.if	2006-08-31 13:24:00.000000000 -0400
 @@ -0,0 +1,65 @@
 +## <summary>policy for ccs</summary>
 +
@@ -434,8 +473,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.3.10/policy/modules/services/ccs.te
 --- nsaserefpolicy/policy/modules/services/ccs.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ccs.te	2006-08-30 17:41:10.000000000 -0400
-@@ -0,0 +1,84 @@
++++ serefpolicy-2.3.10/policy/modules/services/ccs.te	2006-08-31 14:30:14.000000000 -0400
+@@ -0,0 +1,87 @@
 +policy_module(ccs,1.0.0)
 +
 +########################################
@@ -516,13 +555,27 @@
 +
 +unconfined_use_fds(ccs_t)
 +
-+term_dontaudit_use_generic_ptys(ccs_t)
++ifdef(`targeted_policy', `
++	term_dontaudit_use_generic_ptys(ccs_t)
++	term_dontaudit_use_unallocated_ttys(ccs_t)
++')
 +
 +allow ccs_t cluster_conf_t:dir r_dir_perms;
 +allow ccs_t cluster_conf_t:file rw_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.3.10/policy/modules/services/clamav.te
+--- nsaserefpolicy/policy/modules/services/clamav.te	2006-08-02 10:34:07.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/clamav.te	2006-08-31 14:23:12.000000000 -0400
+@@ -121,6 +121,7 @@
+ cron_rw_pipes(clamd_t)
+ 
+ ifdef(`targeted_policy',`
++	term_dontaudit_use_unallocated_ttys(clamd_t)
+ 	term_dontaudit_use_generic_ptys(clamd_t)
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.10/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/cron.if	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/cron.if	2006-08-31 13:24:00.000000000 -0400
 @@ -181,6 +181,7 @@
  	allow $1_crontab_t $2:fd use;
  	allow $1_crontab_t $2:fifo_file rw_file_perms;
@@ -554,7 +607,7 @@
  	allow $1 system_crond_t:process sigchld;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.3.10/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/cron.te	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/cron.te	2006-08-31 13:24:00.000000000 -0400
 @@ -175,6 +175,7 @@
  	allow crond_t crond_tmp_t:dir create_dir_perms;
  	allow crond_t crond_tmp_t:file create_file_perms;
@@ -565,7 +618,7 @@
  tunable_policy(`fcron_crond', `
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.3.10/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/dbus.if	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/dbus.if	2006-08-31 13:24:00.000000000 -0400
 @@ -123,6 +123,7 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
@@ -576,7 +629,7 @@
  	corecmd_read_bin_files($1_dbusd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.10/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/dovecot.te	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/dovecot.te	2006-08-31 13:24:00.000000000 -0400
 @@ -168,7 +168,7 @@
  # Allow dovecot to create and read SSL parameters file
  allow dovecot_t dovecot_var_lib_t:dir rw_dir_perms;
@@ -586,9 +639,27 @@
  
  allow dovecot_auth_t dovecot_var_run_t:dir r_dir_perms;
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.10/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-08-23 12:14:53.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/hal.te	2006-08-31 14:24:22.000000000 -0400
+@@ -110,9 +110,11 @@
+ storage_raw_read_fixed_disk(hald_t)
+ storage_raw_write_fixed_disk(hald_t)
+ 
+-term_dontaudit_use_console(hald_t)
+-term_dontaudit_use_generic_ptys(hald_t)
+-term_use_unallocated_ttys(hald_t)
++ifdef(`targeted_policy', `
++	term_dontaudit_use_console(hald_t)
++	term_dontaudit_use_generic_ptys(hald_t)
++	term_dontaudit_use_unallocated_ttys(hald_t)
++')
+ 
+ auth_use_nsswitch(hald_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.10/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/ldap.te	2006-08-30 17:41:10.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ldap.te	2006-08-31 13:24:00.000000000 -0400
 @@ -72,7 +72,7 @@
  
  allow slapd_t slapd_var_run_t:file create_file_perms;
@@ -598,9 +669,24 @@
  
  kernel_read_system_state(slapd_t)
  kernel_read_kernel_sysctls(slapd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.3.10/policy/modules/services/networkmanager.te
+--- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/networkmanager.te	2006-08-31 13:24:00.000000000 -0400
+@@ -18,9 +18,9 @@
+ # Local policy
+ #
+ 
+-allow NetworkManager_t self:capability { kill setgid setuid sys_nice dac_override net_admin net_raw net_bind_service ipc_lock};
++allow NetworkManager_t self:capability { kill setgid setuid sys_nice sys_ptrace dac_override net_admin net_raw net_bind_service ipc_lock};
+ dontaudit NetworkManager_t self:capability sys_tty_config;
+-allow NetworkManager_t self:process { setcap getsched signal_perms };
++allow NetworkManager_t self:process { ptrace setcap getsched signal_perms };
+ allow NetworkManager_t self:fifo_file rw_file_perms;
+ allow NetworkManager_t self:unix_dgram_socket { sendto create_socket_perms };
+ allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.10/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/ntp.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ntp.te	2006-08-31 13:24:00.000000000 -0400
 @@ -32,7 +32,7 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -623,7 +709,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-2.3.10/policy/modules/services/oddjob.fc
 --- nsaserefpolicy/policy/modules/services/oddjob.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob.fc	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/oddjob.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -0,0 +1,8 @@
 +# oddjob executable will have:
 +# label: system_u:object_r:oddjob_exec_t
@@ -635,7 +721,7 @@
 +/usr/lib/oddjobd			gen_context(system_u:object_r:oddjob_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-2.3.10/policy/modules/services/oddjob.if
 --- nsaserefpolicy/policy/modules/services/oddjob.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob.if	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/oddjob.if	2006-08-31 13:24:00.000000000 -0400
 @@ -0,0 +1,76 @@
 +## <summary>policy for oddjob</summary>
 +
@@ -715,7 +801,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.fc
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.fc	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -0,0 +1,6 @@
 +# oddjob_mkhomedir executable will have:
 +# label: system_u:object_r:oddjob_mkhomedir_exec_t
@@ -725,7 +811,7 @@
 +/usr/lib/oddjob/mkhomedir		--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.if
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.if	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.if	2006-08-31 13:24:00.000000000 -0400
 @@ -0,0 +1,24 @@
 +## <summary>policy for oddjob_mkhomedir</summary>
 +
@@ -753,7 +839,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.te
 --- nsaserefpolicy/policy/modules/services/oddjob_mkhomedir.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.te	2006-08-31 07:33:00.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/oddjob_mkhomedir.te	2006-08-31 13:24:00.000000000 -0400
 @@ -0,0 +1,29 @@
 +policy_module(oddjob_mkhomedir,1.0.0)
 +
@@ -786,8 +872,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-2.3.10/policy/modules/services/oddjob.te
 --- nsaserefpolicy/policy/modules/services/oddjob.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/oddjob.te	2006-08-31 07:31:06.000000000 -0400
-@@ -0,0 +1,68 @@
++++ serefpolicy-2.3.10/policy/modules/services/oddjob.te	2006-08-31 14:25:14.000000000 -0400
+@@ -0,0 +1,73 @@
 +policy_module(oddjob,1.0.0)
 +
 +########################################
@@ -839,6 +925,8 @@
 +allow oddjob_t self:capability { audit_write setgid } ;
 +allow oddjob_t self:process setexec;
 +
++locallogin_dontaudit_use_fds(oddjob_t)
++
 +optional_policy(`
 +	dbus_system_bus_client_template(oddjob,oddjob_t)
 +	dbus_send_system_bus(oddjob_t)
@@ -854,11 +942,14 @@
 +
 +unconfined_domtrans(oddjob_t)
 +
-+term_dontaudit_use_generic_ptys(oddjob_t)
++ifdef(`targeted_policy', `
++	term_dontaudit_use_generic_ptys(oddjob_t)
++	term_dontaudit_use_unallocated_ttys(oddjob_t)
++')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.10/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/pegasus.if	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/pegasus.if	2006-08-31 13:24:00.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -894,7 +985,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.10/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/pegasus.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/pegasus.te	2006-08-31 13:24:00.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -911,9 +1002,20 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.10/policy/modules/services/postfix.te
+--- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-29 09:00:28.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/postfix.te	2006-08-31 14:25:38.000000000 -0400
+@@ -361,6 +361,7 @@
+ sysnet_read_config(postfix_map_t)
+ 
+ ifdef(`targeted_policy',`
++	term_dontaudit_use_unallocated_ttys(postfix_map_t)
+ 	term_dontaudit_use_generic_ptys(postfix_map_t)
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.10/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-08-23 12:14:54.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/procmail.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/procmail.te	2006-08-31 13:24:00.000000000 -0400
 @@ -29,6 +29,7 @@
  kernel_read_kernel_sysctls(procmail_t)
  
@@ -922,9 +1024,46 @@
  corenet_tcp_sendrecv_all_if(procmail_t)
  corenet_udp_sendrecv_all_if(procmail_t)
  corenet_tcp_sendrecv_all_nodes(procmail_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.3.10/policy/modules/services/pyzor.te
+--- nsaserefpolicy/policy/modules/services/pyzor.te	2006-08-23 12:14:54.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/pyzor.te	2006-08-31 14:25:59.000000000 -0400
+@@ -58,6 +58,8 @@
+ 
+ miscfiles_read_localization(pyzor_t)
+ 
++userdom_dontaudit_search_sysadm_home_dirs(pyzor_t)
++
+ optional_policy(`
+ 	amavis_manage_lib_files(pyzor_t)
+ 	amavis_manage_spool_files(pyzor_t)
+@@ -104,7 +106,12 @@
+ 
+ files_read_etc_files(pyzord_t)
+ 
+-term_dontaudit_use_generic_ptys(pyzord_t)
++ifdef(`targeted_policy', `
++	term_dontaudit_use_generic_ptys(pyzord_t)
++	term_dontaudit_use_unallocated_ttys(pyzord_t)
++')
++
++locallogin_dontaudit_use_fds(pyzord_t)
+ 
+ auth_use_nsswitch(pyzord_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.te serefpolicy-2.3.10/policy/modules/services/rhgb.te
+--- nsaserefpolicy/policy/modules/services/rhgb.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/rhgb.te	2006-08-31 14:26:24.000000000 -0400
+@@ -105,6 +105,7 @@
+ xserver_read_xkb_libs(rhgb_t)
+ 
+ ifdef(`targeted_policy',`
++	term_dontaudit_use_unallocated_ttys(rhgb_t)
+ 	term_dontaudit_use_generic_ptys(rhgb_t)
+ 	files_dontaudit_read_root_files(rhgb_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.fc serefpolicy-2.3.10/policy/modules/services/ricci.fc
 --- nsaserefpolicy/policy/modules/services/ricci.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ricci.fc	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ricci.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -0,0 +1,20 @@
 +# ricci executable will have:
 +# label: system_u:object_r:ricci_exec_t
@@ -948,7 +1087,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.if serefpolicy-2.3.10/policy/modules/services/ricci.if
 --- nsaserefpolicy/policy/modules/services/ricci.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ricci.if	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ricci.if	2006-08-31 13:24:00.000000000 -0400
 @@ -0,0 +1,184 @@
 +## <summary>policy for ricci</summary>
 +
@@ -1136,8 +1275,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.3.10/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/ricci.te	2006-08-31 07:31:39.000000000 -0400
-@@ -0,0 +1,373 @@
++++ serefpolicy-2.3.10/policy/modules/services/ricci.te	2006-08-31 14:26:48.000000000 -0400
+@@ -0,0 +1,384 @@
 +policy_module(ricci,1.0.0)
 +
 +########################################
@@ -1272,7 +1411,12 @@
 +
 +auth_domtrans_chk_passwd(ricci_t)
 +
-+term_dontaudit_use_generic_ptys(ricci_t)
++ifdef(`targeted_policy', `
++	term_dontaudit_use_generic_ptys(ricci_t)
++	term_dontaudit_use_unallocated_ttys(ricci_t)
++')
++
++locallogin_dontaudit_use_fds(ricci_t)
 +
 +## Networking basics (adjust to your needs!)
 +sysnet_dns_name_resolve(ricci_t)
@@ -1289,6 +1433,7 @@
 +
 +# ricci wants to bind to 11111
 +corenet_udp_bind_ricci_port(ricci_t)
++corenet_tcp_bind_ricci_port(ricci_t)
 +corenet_tcp_bind_inaddr_any_node(ricci_t)
 +
 +corecmd_exec_sbin(ricci_t)
@@ -1346,7 +1491,12 @@
 +
 +init_dontaudit_use_fds(ricci_modclusterd_t)
 +
-+term_dontaudit_use_generic_ptys(ricci_modclusterd_t)
++ifdef(`targeted_policy', `
++	term_dontaudit_use_generic_ptys(ricci_modclusterd_t)
++	term_dontaudit_use_unallocated_ttys(ricci_modclusterd_t)
++')
++
++locallogin_dontaudit_use_fds(ricci_modclusterd_t)
 +
 +kernel_read_kernel_sysctls(ricci_modclusterd_t)
 +kernel_read_system_state(ricci_modclusterd_t)
@@ -1513,7 +1663,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.3.10/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/rpc.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/rpc.te	2006-08-31 13:24:00.000000000 -0400
 @@ -39,6 +39,7 @@
  
  allow rpcd_t self:capability { chown dac_override setgid setuid };
@@ -1524,7 +1674,7 @@
  allow rpcd_t rpcd_var_run_t:dir { rw_dir_perms setattr };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.10/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.fc	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -0,0 +1,9 @@
 +# setroubleshoot executables
 +
@@ -1537,15 +1687,15 @@
 +/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.10/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.if	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.if	2006-08-31 13:24:00.000000000 -0400
 @@ -0,0 +1,3 @@
 +## <summary>policy for setroubleshoot</summary>
 +
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.10/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.te	2006-08-30 17:41:11.000000000 -0400
-@@ -0,0 +1,112 @@
++++ serefpolicy-2.3.10/policy/modules/services/setroubleshoot.te	2006-08-31 14:27:23.000000000 -0400
+@@ -0,0 +1,117 @@
 +policy_module(setroubleshoot,1.0.0)
 +
 +########################################
@@ -1645,7 +1795,12 @@
 +selinux_get_enforce_mode(setroubleshootd_t)
 +
 +term_dontaudit_use_console(setroubleshootd_t)
-+term_dontaudit_use_generic_ptys(setroubleshootd_t)
++
++ifdef(`targeted_policy', `
++	term_dontaudit_use_generic_ptys(setroubleshootd_t)
++	term_dontaudit_use_unallocated_ttys(setroubleshootd_t)
++')
++
 +term_dontaudit_use_all_user_ptys(setroubleshootd_t)
 +term_dontaudit_use_all_user_ttys(setroubleshootd_t)
 +
@@ -1660,7 +1815,7 @@
 +files_getattr_all_dirs(setroubleshootd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.10/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/spamassassin.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/spamassassin.te	2006-08-31 13:51:36.000000000 -0400
 @@ -134,6 +134,7 @@
  	term_dontaudit_use_generic_ptys(spamd_t)
  	files_dontaudit_read_root_files(spamd_t)
@@ -1671,7 +1826,7 @@
  		userdom_manage_generic_user_home_content_symlinks(spamd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.10/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-08-16 08:46:30.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/ssh.if	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/ssh.if	2006-08-31 13:24:00.000000000 -0400
 @@ -711,3 +711,27 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
@@ -1702,7 +1857,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-2.3.10/policy/modules/services/stunnel.te
 --- nsaserefpolicy/policy/modules/services/stunnel.te	2006-08-02 10:34:07.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/stunnel.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/stunnel.te	2006-08-31 13:24:00.000000000 -0400
 @@ -38,6 +38,7 @@
  allow stunnel_t self:fifo_file rw_file_perms;
  allow stunnel_t self:tcp_socket create_stream_socket_perms;
@@ -1721,7 +1876,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.10/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/xserver.if	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/xserver.if	2006-08-31 13:46:39.000000000 -0400
 @@ -45,7 +45,6 @@
  	allow $1_xserver_t self:capability { dac_override fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
  	dontaudit $1_xserver_t self:capability chown;
@@ -1730,7 +1885,37 @@
  	allow $1_xserver_t self:fd use;
  	allow $1_xserver_t self:fifo_file rw_file_perms;
  	allow $1_xserver_t self:sock_file r_file_perms;
-@@ -1049,6 +1048,24 @@
+@@ -836,6 +835,29 @@
+ 
+ ########################################
+ ## <summary>
++##	Write to a named socket in a XDM
++##	temporary directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`xserver_write_xdm_tmp_sockets',`
++	gen_require(`
++		type xdm_tmp_t;
++	')
++
++	files_search_tmp($1)
++	allow $1 xdm_tmp_t:dir search_dir_perms;
++	allow $1 xdm_tmp_t:sock_file write;
++')
++
++
++
++########################################
++## <summary>
+ ##	Read XDM pid files.
+ ## </summary>
+ ## <param name="domain">
+@@ -1049,6 +1071,24 @@
  
  ########################################
  ## <summary>
@@ -1755,7 +1940,7 @@
  ##	Kill XDM X servers
  ## </summary>
  ## <param name="domain">
-@@ -1101,7 +1118,47 @@
+@@ -1101,7 +1141,47 @@
  	')
  
  	files_search_tmp($1)
@@ -1806,7 +1991,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.10/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/xserver.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/services/xserver.te	2006-08-31 13:24:00.000000000 -0400
 @@ -292,7 +292,7 @@
  ')
  
@@ -1825,27 +2010,9 @@
  
  	unconfined_domain_noaudit(xdm_xserver_t)
  	unconfined_domtrans(xdm_xserver_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.10/policy/modules/system/authlogin.te
---- nsaserefpolicy/policy/modules/system/authlogin.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/authlogin.te	2006-08-30 17:41:11.000000000 -0400
-@@ -221,7 +221,13 @@
- 
- userdom_dontaudit_use_unpriv_user_fds(pam_console_t)
- 
--ifdef(`targeted_policy',`
-+# cjp: with the old daemon_(base_)domain being broken up into
-+# a daemon and system interface, this probably is not needed:
-+ifdef(`direct_sysadm_daemon', `
-+	userdom_dontaudit_use_sysadm_terms(pam_console_t)
-+')
-+
-+ifdef(`targeted_policy', `
- 	term_dontaudit_use_unallocated_ttys(pam_console_t)
- 	term_dontaudit_use_generic_ptys(pam_console_t)
- 	files_dontaudit_read_root_files(pam_console_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.3.10/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/fstools.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/fstools.te	2006-08-31 13:24:00.000000000 -0400
 @@ -111,6 +111,7 @@
  corecmd_read_sbin_files(fsadm_t)
  corecmd_read_sbin_pipes(fsadm_t)
@@ -1856,7 +2023,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.10/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/hostname.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/hostname.te	2006-08-31 13:24:00.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -1869,26 +2036,21 @@
  role system_r types hostname_t;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.10/policy/modules/system/init.if
---- nsaserefpolicy/policy/modules/system/init.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/init.if	2006-08-30 17:41:11.000000000 -0400
-@@ -158,13 +158,6 @@
- 	allow $1 initrc_t:fifo_file rw_file_perms;
- 	allow $1 initrc_t:process sigchld;
- 
--	ifdef(`hide_broken_symptoms',`
--		# RHEL4 systems seem to have a stray
--		# fds open from the initrd
--		ifdef(`distro_rhel4',`
--			kernel_dontaudit_use_fds($1)
--		')
--	')
- ')
- 
- ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hotplug.te serefpolicy-2.3.10/policy/modules/system/hotplug.te
+--- nsaserefpolicy/policy/modules/system/hotplug.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/hotplug.te	2006-08-31 13:24:00.000000000 -0400
+@@ -27,7 +27,7 @@
+ dontaudit hotplug_t self:capability { sys_module sys_admin sys_tty_config };
+ # for access("/etc/bashrc", X_OK) on Red Hat
+ dontaudit hotplug_t self:capability { dac_override dac_read_search };
+-allow hotplug_t self:process { getsession getattr signal_perms };
++allow hotplug_t self:process { setpgid getsession getattr signal_perms };
+ allow hotplug_t self:fifo_file rw_file_perms;
+ allow hotplug_t self:netlink_route_socket r_netlink_socket_perms;
+ allow hotplug_t self:udp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.3.10/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-08-28 16:22:32.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/init.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/init.te	2006-08-31 13:24:00.000000000 -0400
 @@ -361,7 +361,8 @@
  logging_append_all_logs(initrc_t)
  logging_read_audit_config(initrc_t)
@@ -1901,7 +2063,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.10/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/logging.fc	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/logging.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -31,6 +31,7 @@
  /var/log/audit(/.*)?		gen_context(system_u:object_r:auditd_log_t,s15:c0.c255)
  
@@ -1912,7 +2074,7 @@
  /var/run/log		-s	gen_context(system_u:object_r:devlog_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.10/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/lvm.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/lvm.te	2006-08-31 13:24:00.000000000 -0400
 @@ -125,7 +125,7 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
@@ -1924,7 +2086,7 @@
  # LVM will complain a lot if it cannot set its priority.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.3.10/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2006-08-23 12:14:55.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/modutils.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/modutils.te	2006-08-31 13:24:00.000000000 -0400
 @@ -183,6 +183,7 @@
  fs_getattr_xattr_fs(depmod_t)
  
@@ -1935,7 +2097,7 @@
  corecmd_search_sbin(depmod_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.10/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/mount.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/mount.te	2006-08-31 13:24:00.000000000 -0400
 @@ -14,6 +14,9 @@
  type mount_tmp_t;
  files_tmp_file(mount_tmp_t)
@@ -1956,7 +2118,7 @@
  allow mount_t mount_tmp_t:dir create_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.10/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/selinuxutil.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/selinuxutil.te	2006-08-31 13:24:00.000000000 -0400
 @@ -355,6 +355,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -1966,7 +2128,16 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-@@ -554,6 +556,7 @@
+@@ -448,6 +450,8 @@
+ selinux_compute_user_contexts(restorecond_t)
+ 
+ term_dontaudit_use_generic_ptys(restorecond_t)
++term_dontaudit_use_unallocated_ttys(restorecond_t)
++locallogin_dontaudit_use_fds(restorecond_t)
+ 
+ auth_relabel_all_files_except_shadow(restorecond_t )
+ auth_read_all_files_except_shadow(restorecond_t)
+@@ -554,6 +558,7 @@
  allow semanage_t self:unix_stream_socket create_stream_socket_perms;
  allow semanage_t self:unix_dgram_socket create_socket_perms;
  allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
@@ -1974,7 +2145,7 @@
  
  allow semanage_t policy_config_t:file { read write };
  
-@@ -617,6 +620,12 @@
+@@ -617,6 +622,12 @@
  	# Handle pp files created in homedir and /tmp
  	files_read_generic_tmp_files(semanage_t)
  	userdom_read_generic_user_home_content_files(semanage_t)
@@ -1987,9 +2158,21 @@
  ')
  
  ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.10/policy/modules/system/setrans.te
+--- nsaserefpolicy/policy/modules/system/setrans.te	2006-08-02 10:34:08.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/setrans.te	2006-08-31 13:24:00.000000000 -0400
+@@ -56,6 +56,8 @@
+ selinux_compute_access_vector(setrans_t)
+ 
+ term_dontaudit_use_generic_ptys(setrans_t)
++term_dontaudit_use_unallocated_ttys(setrans_t)
++locallogin_dontaudit_use_fds(setrans_t)
+ 
+ init_use_fds(setrans_t)
+ init_dontaudit_use_script_ptys(setrans_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.10/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/udev.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/udev.te	2006-08-31 13:24:00.000000000 -0400
 @@ -131,6 +131,7 @@
  mls_file_upgrade(udev_t)
  mls_file_downgrade(udev_t)
@@ -2010,7 +2193,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.10/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-08-02 10:34:08.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/unconfined.fc	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/unconfined.fc	2006-08-31 13:24:00.000000000 -0400
 @@ -10,4 +10,5 @@
  /usr/local/RealPlay/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -2019,7 +2202,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.10/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-08-29 09:00:29.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/unconfined.if	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/unconfined.if	2006-08-31 13:24:00.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -2030,7 +2213,7 @@
  	allow $1 self:process transition;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.10/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/userdomain.if	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/userdomain.if	2006-08-31 13:24:00.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -2505,7 +2688,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.10/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-08-16 08:46:31.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/system/userdomain.te	2006-08-30 17:41:11.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/system/userdomain.te	2006-08-31 13:24:00.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- selinux-policy.spec	31 Aug 2006 12:13:31 -0000	1.265
+++ selinux-policy.spec	31 Aug 2006 19:32:34 -0000	1.266
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.10
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-5
+- Lots of fixes for restarting daemons at the console.
+
 * Wed Aug 30 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-3
 - Fix audit line
 - Fix requires line


--- policy-20060802.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 31 19:42:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 15:42:42 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.53,
	1.54 java-1.4.2-gcj-compat.spec, 1.169, 1.170 sources, 1.59, 1.60
Message-ID: <200608311942.k7VJggrN005870@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5854

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Thu Aug 31 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.105
- Comment out and obsolete plugin subpackage. (204728)
- Import java-gcj-compat 1.0.65.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	30 Aug 2006 14:37:53 -0000	1.53
+++ .cvsignore	31 Aug 2006 19:42:39 -0000	1.54
@@ -1,3 +1,3 @@
-java-gcj-compat-1.0.64.tar.gz
+java-gcj-compat-1.0.65.tar.gz
 ecj.sh.in
 eclipse-ecj-3.1.0_fc-12.jar


Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- java-1.4.2-gcj-compat.spec	30 Aug 2006 14:37:53 -0000	1.169
+++ java-1.4.2-gcj-compat.spec	31 Aug 2006 19:42:39 -0000	1.170
@@ -11,7 +11,7 @@
 %define buildver	0
 # the version-release string for the gcj rpms we require
 %define gccver		4.0.0-0.42
-%define jgcver		1.0.64
+%define jgcver		1.0.65
 
 %define cname           java-%{javaver}-%{origin}
 
@@ -23,11 +23,11 @@
 %define jrebindir	%{_jvmdir}/%{jrelnk}/bin
 %define jvmjardir       %{_jvmjardir}/%{cname}-%{version}
 
-%define plugindir       %{_libdir}/mozilla/plugins
+# %define plugindir       %{_libdir}/mozilla/plugins
 
 Name:		java-%{javaver}-%{origin}-compat
 Version:	%{javaver}.%{buildver}
-Release: 	40jpp.104
+Release: 	40jpp.105
 Epoch:		0
 Summary:	JPackage runtime scripts for GCJ
 
@@ -63,6 +63,7 @@
 Provides:	java-sasl
 Provides:	jce
 Obsoletes:	java-1.4.2-gcj4-compat <= 1.4.2.0-4jpp_2rh
+Obsoletes:	java-1.4.2-gcj-compat-plugin <= 1.4.2.0-40jpp.104
 PreReq:		chkconfig
 
 %description
@@ -122,21 +123,21 @@
 %description javadoc
 This package installs Javadoc API documentation for libgcj.
 
-%package plugin
-Summary:	Web browser plugin that handles applets
-Group:		Applications/Internet
-Provides:       java-plugin = %{javaver}, java-%{javaver}-plugin = %{version}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:       %{_sbindir}/update-alternatives
-Requires:	libgcj%{gccsuffix} >= %{gccver}
-Requires(post):       %{_sbindir}/update-alternatives
-Requires(postun):     %{_sbindir}/update-alternatives
-Requires(post): libgcj%{gccsuffix} >= %{gccver}
-Requires(postun): libgcj%{gccsuffix} >= %{gccver}
-Requires:	%{plugindir}
+# %package plugin
+# Summary:	Web browser plugin that handles applets
+# Group:		Applications/Internet
+# Provides:       java-plugin = %{javaver}, java-%{javaver}-plugin = %{version}
+# Requires:	%{name} = %{epoch}:%{version}-%{release}
+# Requires:       %{_sbindir}/update-alternatives
+# Requires:	libgcj%{gccsuffix} >= %{gccver}
+# Requires(post):       %{_sbindir}/update-alternatives
+# Requires(postun):     %{_sbindir}/update-alternatives
+# Requires(post): libgcj%{gccsuffix} >= %{gccver}
+# Requires(postun): libgcj%{gccsuffix} >= %{gccver}
+# Requires:	%{plugindir}
 
-%description plugin
-This package installs gcjwebplugin, a Mozilla plugin for applets.
+# %description plugin
+# This package installs gcjwebplugin, a Mozilla plugin for applets.
 
 %prep
 %setup -q -n java-gcj-compat-%{jgcver}
@@ -428,10 +429,10 @@
   ln -sf %{name}-%{version} %{_javadocdir}/java
 } || :
 
-%post plugin
+# %post plugin
 
-  update-alternatives --install %{plugindir}/libjavaplugin.so \
-    libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
+#   update-alternatives --install %{plugindir}/libjavaplugin.so \
+#     libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -474,10 +475,10 @@
    update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
 fi
 
-%postun plugin
-if [ $1 -eq 0 ] ; then
-   update-alternatives --remove libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so
-fi
+# %postun plugin
+# if [ $1 -eq 0 ] ; then
+#    update-alternatives --remove libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so
+# fi
 
 %triggerin -- libgcj%{gccsuffix} > %{gccver}
 {
@@ -576,17 +577,17 @@
     %{_jvmdir}/%{cname}-%{version}/src.zip
 } || :
 
-%triggerin plugin -- libgcj%{gccsuffix} > %{gccver}
-{
-
-%if %{custom}
-export PATH=%{gcj_prefix}/bin:$PATH
-%endif
+# %triggerin plugin -- libgcj%{gccsuffix} > %{gccver}
+# {
 
-  # plugin
-  update-alternatives --install %{plugindir}/libjavaplugin.so \
-    libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
-} || :
+# %if %{custom}
+# export PATH=%{gcj_prefix}/bin:$PATH
+# %endif
+
+#   # plugin
+#   update-alternatives --install %{plugindir}/libjavaplugin.so \
+#     libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
+# } || :
 
 %files -f %{name}-%{version}.files
 %defattr(-,root,root,-)
@@ -642,12 +643,16 @@
 %ghost %doc %{_javadocdir}/%{name}
 %ghost %doc %{_javadocdir}/java
 
-%files plugin
-%defattr(-,root,root)
+# %files plugin
+# %defattr(-,root,root)
 
 %changelog
+* Thu Aug 31 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.105
+- Comment out and obsolete plugin subpackage. (204728)
+- Import java-gcj-compat 1.0.65.
+
 * Wed Aug 30 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.104
-- Import java-gcj-comapt 1.0.64.
+- Import java-gcj-compat 1.0.64.
 
 * Tue Aug 29 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.103
 - Import java-gcj-compat 1.0.63.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	30 Aug 2006 14:37:53 -0000	1.59
+++ sources	31 Aug 2006 19:42:39 -0000	1.60
@@ -1,3 +1,3 @@
-14047b4e3b77361df68698c8275189ad  java-gcj-compat-1.0.64.tar.gz
+84d12257e981648454dc042639a1936e  java-gcj-compat-1.0.65.tar.gz
 e9c12c59e5a34c5c916d3b032dd7855e  ecj.sh.in
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar



From fedora-cvs-commits at redhat.com  Thu Aug 31 20:09:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 16:09:52 -0400
Subject: rpms/iscsi-initiator-utils/devel .cvsignore, 1.9,
	1.10 iscsi-initiator-utils.spec, 1.17, 1.18 iscsi.init, 1.2,
	1.3 sources, 1.9, 1.10
Message-ID: <200608312009.k7VK9qd1006255@cvs.devel.redhat.com>

Author: mchristi

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6240

Modified Files:
	.cvsignore iscsi-initiator-utils.spec iscsi.init sources 
Log Message:
update iscsi-initiator-utils rpms. Note that this removed the old /var/db/iscsi and replaces with /etc/iscsi/nodes and /etc/iscsi/send_targets files and the initiatorname and conf files have been moved to /etc/iscsi


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Jul 2006 21:57:49 -0000	1.9
+++ .cvsignore	31 Aug 2006 20:09:44 -0000	1.10
@@ -4,3 +4,4 @@
 open-iscsi-6.0.5.595.tar.bz2
 open-iscsi-1.1-645.tar.bz2
 open-iscsi-6.1.1.645.tar.bz2
+open-iscsi-6.1.1.685.tar.bz2


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- iscsi-initiator-utils.spec	21 Jul 2006 21:12:37 -0000	1.17
+++ iscsi-initiator-utils.spec	31 Aug 2006 20:09:45 -0000	1.18
@@ -1,8 +1,8 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
-Version: 6.1.1.645
-Release: 1
-Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
+Version: 6.1.1.685
+Release: 0
+Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-6.1.1.685.tar.bz2
 Source1: iscsi.init
 Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
 Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch
@@ -11,7 +11,7 @@
 License: GPL
 URL: http://www.open-iscsi.org
 Buildroot: %{_tmppath}/%{name}-root
-BuildRequires: openssl-devel db4-devel
+BuildRequires: openssl-devel
 Prereq: /sbin/chkconfig
 ExcludeArch: s390 s390x
 
@@ -35,12 +35,12 @@
 mkdir -p $RPM_BUILD_ROOT/sbin
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/var/db/iscsi/
+mkdir -p $RPM_BUILD_ROOT/etc/iscsi
 install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart $RPM_BUILD_ROOT/sbin
 install -m 644 doc/iscsiadm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 644 doc/iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 #install -m 755 etc/initd/initd.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
-install -m 644 etc/iscsid.conf $RPM_BUILD_ROOT/etc
+install -m 644 etc/iscsid.conf $RPM_BUILD_ROOT/etc/iscsi
 
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
 
@@ -48,8 +48,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ ! -f /etc/initiatorname.iscsi ]; then
-	echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/initiatorname.iscsi
+if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then
+	echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi
 fi
 /sbin/chkconfig --add iscsi
 
@@ -62,12 +62,15 @@
 %defattr(-,root,root)
 %doc README
 %config /etc/rc.d/init.d/iscsi
-%attr(0600,root,root) %config(noreplace) /etc/iscsid.conf
-%dir /var/db/iscsi
+%attr(0600,root,root) %config(noreplace) /etc/iscsi/iscsid.conf
 /sbin/*
 %{_mandir}/*/*
 
 %changelog
+* Mon Aug 28 2006 Mike Christie <mchristie at redhat.com> - 6.1.1.685
+- Rebase to upstream to bring in many bug fixes and rm db.
+- iscsi uses /etc/iscsi instead of just etc now
+
 * Fri Jul 21 2006 Jeremy Katz <katzj at redhat.com> - 6.1.1.645-1
 - fix shutdown with root on iscsi
 


Index: iscsi.init
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iscsi.init	21 Jul 2006 21:12:37 -0000	1.2
+++ iscsi.init	31 Aug 2006 20:09:45 -0000	1.3
@@ -4,8 +4,8 @@
 # description: Starts and stops the iSCSI initiator
 #
 # processname: iscsid
-# pidfile: /var/run/iscsid.pid
-# config:  /etc/iscsid.conf
+# pidfile: /etc/iscsi/iscsid.pid
+# config:  /etc/iscsi/iscsid.conf
 
 # Source function library.
 . /etc/init.d/functions
@@ -26,11 +26,13 @@
 	touch /var/lock/subsys/iscsi
 
 	echo -n $"Setting up iSCSI targets: "
-	TARGETS=`iscsiadm -m node 2> /dev/null | sed 's@\[\(.*\)\] .*@\1 at g'`
-	for rec in $TARGETS; do
-		STARTUP=`iscsiadm -m node -r $rec | grep "node.startup" | cut -d' ' -f3`
-		if [ $STARTUP = "automatic" ]; then
-			iscsiadm -m node -r $rec -l
+	TARGETS=`iscsiadm -m node 2>/dev/null | sed 's/ /@/g'`
+	for node in $TARGETS; do
+		target=`echo $node | cut -d@ -f2`
+		port=`echo $node | cut -d@ -f1`
+		STARTUP=`iscsiadm -m node -T $target -p $port | grep "node.conn\[0\].startup" | cut -d' ' -f3`
+		if [ "$STARTUP" = "automatic" ]; then
+			iscsiadm -m node -T $target -p $port -l
 		fi
 	done
 	success


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	13 Jul 2006 21:57:49 -0000	1.9
+++ sources	31 Aug 2006 20:09:46 -0000	1.10
@@ -1 +1 @@
-46938978c78168de917f73f9e53c9425  open-iscsi-6.1.1.645.tar.bz2
+89a822f2b1a06884f915e6512df3a384  open-iscsi-6.1.1.685.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 31 20:18:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 16:18:15 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.222,
	1.223 policycoreutils.spec, 1.304, 1.305
Message-ID: <200608312018.k7VKIFvT006497@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6481

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-5
- Change scripts to use /usr/sbin/python


policycoreutils-rhat.patch:
 audit2allow/audit2allow      |    2 
 audit2allow/avc.py           |    2 
 newrole/newrole              |binary
 newrole/newrole.c            |    1 
 po/af.po                     |   98 +++----
 po/am.po                     |   98 +++----
 po/ar.po                     |   98 +++----
 po/be.po                     |   98 +++----
 po/bg.po                     |   98 +++----
 po/bn.po                     |   98 +++----
 po/bn_IN.po                  |   98 +++----
 po/ca.po                     |   98 +++----
 po/cs.po                     |   98 +++----
 po/cy.po                     |   98 +++----
 po/da.po                     |   96 +++----
 po/de.po                     |  560 ++++++++++++++++---------------------------
 po/el.po                     |  102 +++----
 po/en_GB.po                  |   98 +++----
 po/es.po                     |   98 +++----
 po/et.po                     |   96 +++----
 po/eu_ES.po                  |   98 +++----
 po/fa.po                     |   98 +++----
 po/fi.po                     |   98 +++----
 po/fr.po                     |   98 +++----
 po/gl.po                     |   96 +++----
 po/gu.po                     |   98 +++----
 po/he.po                     |   98 +++----
 po/hi.po                     |  102 +++----
 po/hr.po                     |   98 +++----
 po/hu.po                     |   98 +++----
 po/hy.po                     |   98 +++----
 po/id.po                     |   96 +++----
 po/is.po                     |   98 +++----
 po/it.po                     |   98 +++----
 po/ja.po                     |   98 +++----
 po/ka.po                     |   98 +++----
 po/kn.po                     |   98 +++----
 po/ko.po                     |  116 ++++----
 po/ku.po                     |   98 +++----
 po/lo.po                     |   98 +++----
 po/lt.po                     |   98 +++----
 po/lv.po                     |   98 +++----
 po/mk.po                     |   98 +++----
 po/ml.po                     |  123 +++------
 po/mr.po                     |  156 +++++------
 po/ms.po                     |  380 +++++++++++------------------
 po/my.po                     |   98 +++----
 po/nb.po                     |   98 +++----
 po/nl.po                     |  110 ++++----
 po/nn.po                     |   98 +++----
 po/no.po                     |   98 +++----
 po/nso.po                    |   98 +++----
 po/or.po                     |   98 +++----
 po/pa.po                     |   98 +++----
 po/pl.po                     |   98 +++----
 po/pt.po                     |   98 +++----
 po/pt_BR.po                  |  150 +++++------
 po/ro.po                     |   98 +++----
 po/ru.po                     |   98 +++----
 po/si.po                     |   98 +++----
 po/sk.po                     |   98 +++----
 po/sl.po                     |   98 +++----
 po/sq.po                     |   98 +++----
 po/sr.po                     |  109 ++++----
 po/sr at Latn.po                |  109 ++++----
 po/sv.po                     |  379 ++++++++++++-----------------
 po/ta.po                     |  105 ++++----
 po/te.po                     |   98 +++----
 po/th.po                     |   98 +++----
 po/tr.po                     |   98 +++----
 po/uk.po                     |  498 +++++++++++++++++++-------------------
 po/ur.po                     |   98 +++----
 po/vi.po                     |   98 +++----
 po/zh_CN.po                  |  287 ++++++++--------------
 po/zh_TW.po                  |  125 ++++-----
 po/zu.po                     |   98 +++----
 restorecon/restorecon.8      |    7 
 restorecon/restorecon.c      |   13 
 restorecond/restorecond.init |    6 
 scripts/chcat                |    2 
 scripts/fixfiles             |    4 
 semanage/semanage            |    2 
 semanage/seobject.py         |    2 
 83 files changed, 4316 insertions(+), 4616 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- policycoreutils-rhat.patch	31 Aug 2006 15:11:57 -0000	1.222
+++ policycoreutils-rhat.patch	31 Aug 2006 20:18:10 -0000	1.223
@@ -1,3 +1,21 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.27/audit2allow/audit2allow
+--- nsapolicycoreutils/audit2allow/audit2allow	2006-08-28 16:58:19.000000000 -0400
++++ policycoreutils-1.30.27/audit2allow/audit2allow	2006-08-31 16:11:24.000000000 -0400
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/python
+ # Copyright (C) 2005 Red Hat 
+ # see file 'COPYING' for use and warranty information
+ #
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.27/audit2allow/avc.py
+--- nsapolicycoreutils/audit2allow/avc.py	2006-08-28 16:58:19.000000000 -0400
++++ policycoreutils-1.30.27/audit2allow/avc.py	2006-08-31 16:12:13.000000000 -0400
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/python
+ # Copyright (C) 2006 Red Hat 
+ # see file 'COPYING' for use and warranty information
+ #
 Binary files nsapolicycoreutils/newrole/newrole and policycoreutils-1.30.27/newrole/newrole differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.27/newrole/newrole.c
 --- nsapolicycoreutils/newrole/newrole.c	2006-08-28 16:58:20.000000000 -0400
@@ -26535,6 +26553,15 @@
  #
  
  # Source function library.
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.30.27/scripts/chcat
+--- nsapolicycoreutils/scripts/chcat	2006-08-28 16:58:19.000000000 -0400
++++ policycoreutils-1.30.27/scripts/chcat	2006-08-31 16:11:53.000000000 -0400
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/python
+ # Copyright (C) 2005 Red Hat 
+ # see file 'COPYING' for use and warranty information
+ #
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.27/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2006-08-28 16:58:19.000000000 -0400
 +++ policycoreutils-1.30.27/scripts/fixfiles	2006-08-31 11:04:33.000000000 -0400
@@ -26556,3 +26583,21 @@
      done
      exit $?
  fi
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.27/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage	2006-08-28 16:58:18.000000000 -0400
++++ policycoreutils-1.30.27/semanage/semanage	2006-08-31 16:11:11.000000000 -0400
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/python
+ # Copyright (C) 2005 Red Hat 
+ # see file 'COPYING' for use and warranty information
+ #
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.27/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2006-08-28 16:58:18.000000000 -0400
++++ policycoreutils-1.30.27/semanage/seobject.py	2006-08-31 16:11:40.000000000 -0400
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/python
+ # Copyright (C) 2005 Red Hat 
+ # see file 'COPYING' for use and warranty information
+ #


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- policycoreutils.spec	31 Aug 2006 15:14:01 -0000	1.304
+++ policycoreutils.spec	31 Aug 2006 20:18:12 -0000	1.305
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.27
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -119,6 +119,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-5
+- Change scripts to use /usr/sbin/python
+
 * Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 1.30.27-4
 - Add -i qualified to restorecon to tell it to ignore files that do not exist
 - Fixfiles also modified for this change



From fedora-cvs-commits at redhat.com  Thu Aug 31 20:30:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 16:30:17 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.172,1.172.4.1
Message-ID: <200608312030.k7VKUGkC006618@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv6578/configs

Modified Files:
      Tag: private-linville-netdev-fc5-9-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.172
retrieving revision 1.172.4.1
diff -u -r1.172 -r1.172.4.1
--- config-generic	29 Jul 2006 18:20:09 -0000	1.172
+++ config-generic	31 Aug 2006 20:30:14 -0000	1.172.4.1
@@ -598,6 +598,7 @@
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_IPV6_MIP6=y
 CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_RX is not set
 CONFIG_NETPOLL_TRAP=y
@@ -633,11 +634,14 @@
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_DECNET=m
 CONFIG_DECNET_ROUTER=y
 CONFIG_DECNET_ROUTE_FWMARK=y
 # CONFIG_DECNET_NF_GRABULATOR is not set
 CONFIG_BRIDGE=m
+CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
@@ -645,14 +649,18 @@
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -663,9 +671,11 @@
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 
@@ -677,21 +687,21 @@
 #
 CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_CONNTRACK_SECMARK=y
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
 CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_POLICY=m
-CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+CONFIG_IP_NF_MATCH_POLICY=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -729,22 +739,22 @@
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_IP_NF_PPTP=m
 CONFIG_IP_NF_H323=m
+CONFIG_IP_NF_SIP=m
 
 #
 # IPv6: Netfilter Configuration
 #
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MULTIPORT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
@@ -778,6 +788,7 @@
 CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
+CONFIG_XFRM_SUB_POLICY=y
 
 #
 # SCTP Configuration (EXPERIMENTAL)
@@ -805,8 +816,8 @@
 # CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
 CONFIG_IP_DCCP=m
-CONFIG_IP_DCCP_CCID2=m
 CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_DCCP_UNLOAD_HACK=y
 
@@ -861,6 +872,7 @@
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NETDEVICES=y
 
 #
@@ -923,6 +935,7 @@
 CONFIG_QSEMI_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
+CONFIG_SMSC_PHY=m
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -946,6 +959,7 @@
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_ULI526X=m
+# CONFIG_AT1700 is not set
 # CONFIG_HP100 is not set
 CONFIG_LNE390=m
 CONFIG_NE3210=m
@@ -1006,6 +1020,7 @@
 CONFIG_SKGE=m
 CONFIG_TIGON3=m
 CONFIG_SKY2=m
+CONFIG_QLA3XXX=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1015,6 +1030,7 @@
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_CHELSIO_T1=m
+CONFIG_MYRI10GE=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1040,6 +1056,7 @@
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -1068,6 +1085,7 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW_QOS is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1077,8 +1095,14 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_PRISM54_USB=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
+CONFIG_ADM8211=m
+CONFIG_ACX_PCI=m
+CONFIG_ACX_USB=m
+CONFIG_ZD1211RW=m
+CONFIG_ZD1211RW_DEBUG=y
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1089,7 +1113,6 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_NET_WIRELESS=y
-CONFIG_NET_WIRELESS_RTNETLINK=y
 
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_PCI=m
@@ -1154,9 +1177,9 @@
 CONFIG_ESI_DONGLE=m
 CONFIG_ACTISYS_DONGLE=m
 CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
+CONFIG_TOIM3232_DONGLE=m
 CONFIG_LITELINK_DONGLE=m
 CONFIG_MA600_DONGLE=m
 CONFIG_GIRBIL_DONGLE=m
@@ -1173,6 +1196,7 @@
 CONFIG_ALI_FIR=m
 CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
 
 #
 # Bluetooth support



From fedora-cvs-commits at redhat.com  Thu Aug 31 20:52:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 16:52:04 -0400
Subject: rpms/pam/devel Linux-PAM-0.99.6.2.tar.bz2.sign, NONE,
	1.1 pam-0.99.6.0-succif-session.patch, NONE,
	1.1 pam-0.99.6.2-selinux-keycreate.patch, NONE, 1.1 .cvsignore,
	1.37, 1.38 pam.spec, 1.130, 1.131 sources, 1.39,
	1.40 system-auth.pamd, 1.5,
	1.6 Linux-PAM-0.99.5.0.tar.bz2.sign, 1.1,
	NONE pam-0.75-sgml2latex.patch, 1.1,
	NONE pam-0.99.4.0-succif-service.patch, 1.1,
	NONE pam-0.99.5.0-access-gai.patch, 1.1,
	NONE pam-0.99.5.0-keyinit-multiinit.patch, 1.1,
	NONE pam-0.99.5.0-keyinit-no-debug.patch, 1.1,
	NONE pam-0.99.5.0-keyinit-revoke-user.patch, 1.1,
	NONE pam-0.99.5.0-namespace-init.patch, 1.1,
	NONE pam-0.99.5.0-selinux-enoent.patch, 1.1,
	NONE pam-0.99.5.0-selinux-keycreate.patch, 1.1,
	NONE pam-0.99.5.0-succif-unknown-user.patch, 1.1, NONE
Message-ID: <200608312052.k7VKq4f7006878@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6864

Modified Files:
	.cvsignore pam.spec sources system-auth.pamd 
Added Files:
	Linux-PAM-0.99.6.2.tar.bz2.sign 
	pam-0.99.6.0-succif-session.patch 
	pam-0.99.6.2-selinux-keycreate.patch 
Removed Files:
	Linux-PAM-0.99.5.0.tar.bz2.sign pam-0.75-sgml2latex.patch 
	pam-0.99.4.0-succif-service.patch 
	pam-0.99.5.0-access-gai.patch 
	pam-0.99.5.0-keyinit-multiinit.patch 
	pam-0.99.5.0-keyinit-no-debug.patch 
	pam-0.99.5.0-keyinit-revoke-user.patch 
	pam-0.99.5.0-namespace-init.patch 
	pam-0.99.5.0-selinux-enoent.patch 
	pam-0.99.5.0-selinux-keycreate.patch 
	pam-0.99.5.0-succif-unknown-user.patch 
Log Message:
* Thu Aug 31 2006 Tomas Mraz <tmraz at redhat.com> 0.99.6.2-1
- upgrade to new upstream version, as there are mostly bugfixes except
  improved documentation
- add support for session and password service for pam_access and
  pam_succeed_if
- system-auth: skip session pam_unix for crond service



--- NEW FILE Linux-PAM-0.99.6.2.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBE7sbfyGugalF9Dw4RAkc4AJ4uuA+XzeQFaYKvTZz/1bX3d3B64ACgkb8O
LdZCpZEpjybcSSpsgjzel+E=
=xu08
-----END PGP SIGNATURE-----

pam-0.99.6.0-succif-session.patch:
 pam_access/pam_access.8.xml         |    2 +-
 pam_access/pam_access.c             |   29 ++++++++++++++++++++++++++---
 pam_succeed_if/pam_succeed_if.8.xml |    3 +--
 pam_succeed_if/pam_succeed_if.c     |   28 ++++++++++++++++++++++++----
 4 files changed, 52 insertions(+), 10 deletions(-)

--- NEW FILE pam-0.99.6.0-succif-session.patch ---
Index: modules/pam_access/pam_access.8.xml
===================================================================
RCS file: /cvsroot/pam/Linux-PAM/modules/pam_access/pam_access.8.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modules/pam_access/pam_access.8.xml	22 Jun 2006 19:44:30 -0000	1.2
+++ modules/pam_access/pam_access.8.xml	30 Aug 2006 16:09:05 -0000	1.3
@@ -129,7 +129,7 @@
   <refsect1 id="pam_access-services">
     <title>MODULE SERVICES PROVIDED</title>
     <para>
-      The <option>auth</option> and <option>account</option> services are supported.
+      All services are supported.
     </para>
   </refsect1>
 
Index: modules/pam_access/pam_access.c
===================================================================
RCS file: /cvsroot/pam/Linux-PAM/modules/pam_access/pam_access.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- modules/pam_access/pam_access.c	3 Jul 2006 07:23:29 -0000	1.23
+++ modules/pam_access/pam_access.c	30 Aug 2006 16:09:05 -0000	1.24
@@ -55,6 +55,8 @@
 
 #define PAM_SM_AUTH
 #define PAM_SM_ACCOUNT
+#define PAM_SM_SESSION
+#define PAM_SM_PASSWORD
 
 #include <security/_pam_macros.h>
 #include <security/pam_modules.h>
@@ -811,6 +813,27 @@
   return pam_sm_authenticate (pamh, flags, argc, argv);
 }
 
+PAM_EXTERN int
+pam_sm_open_session(pam_handle_t *pamh, int flags,
+		    int argc, const char **argv)
+{
+  return pam_sm_authenticate(pamh, flags, argc, argv);
+}
+
+PAM_EXTERN int
+pam_sm_close_session(pam_handle_t *pamh, int flags,
+		     int argc, const char **argv)
+{
+  return pam_sm_authenticate(pamh, flags, argc, argv);
+}
+
+PAM_EXTERN int
+pam_sm_chauthtok(pam_handle_t *pamh, int flags,
+		 int argc, const char **argv)
+{
+  return pam_sm_authenticate(pamh, flags, argc, argv);
+}
+
 /* end of module definition */
 
 #ifdef PAM_STATIC
@@ -822,8 +845,8 @@
     pam_sm_authenticate,
     pam_sm_setcred,
     pam_sm_acct_mgmt,
-    NULL,
-    NULL,
-    NULL
+    pam_sm_open_session,
+    pam_sm_close_session,
+    pam_sm_chauthtok
 };
 #endif
Index: modules/pam_succeed_if/pam_succeed_if.8.xml
===================================================================
RCS file: /cvsroot/pam/Linux-PAM/modules/pam_succeed_if/pam_succeed_if.8.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- modules/pam_succeed_if/pam_succeed_if.8.xml	3 Aug 2006 12:42:08 -0000	1.4
+++ modules/pam_succeed_if/pam_succeed_if.8.xml	30 Aug 2006 16:09:06 -0000	1.5
@@ -218,8 +218,7 @@
   <refsect1 id="pam_succeed_if-services">
     <title>MODULE SERVICES PROVIDED</title>
     <para>
-      The <emphasis remap='B'>auth</emphasis> and 
-      <emphasis remap='B'>account</emphasis> services are supported.
+      All services are supported.
     </para>
   </refsect1>
 
Index: modules/pam_succeed_if/pam_succeed_if.c
===================================================================
RCS file: /cvsroot/pam/Linux-PAM/modules/pam_succeed_if/pam_succeed_if.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- modules/pam_succeed_if/pam_succeed_if.c	5 Aug 2006 09:23:06 -0000	1.14
+++ modules/pam_succeed_if/pam_succeed_if.c	30 Aug 2006 16:09:06 -0000	1.15
@@ -56,6 +56,8 @@
 
 #define PAM_SM_AUTH
 #define PAM_SM_ACCOUNT
+#define PAM_SM_SESSION
+#define PAM_SM_PASSWORD
 
 #include <security/pam_modules.h>
 #include <security/pam_modutil.h>
@@ -503,7 +505,7 @@
 pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED,
                int argc UNUSED, const char **argv UNUSED)
 {
-	return PAM_SUCCESS;
+	return PAM_IGNORE;
 }
 
 PAM_EXTERN int
@@ -512,6 +514,24 @@
 	return pam_sm_authenticate(pamh, flags, argc, argv);
 }
 
+PAM_EXTERN int
+pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv)
+{
+	return pam_sm_authenticate(pamh, flags, argc, argv);
+}
+
+PAM_EXTERN int
+pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv)
+{
+	return pam_sm_authenticate(pamh, flags, argc, argv);
+}
+
+PAM_EXTERN int
+pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv)
+{
+	return pam_sm_authenticate(pamh, flags, argc, argv);
+}
+
 /* static module data */
 #ifdef PAM_STATIC
 struct pam_module _pam_succeed_if_modstruct = {
@@ -519,8 +539,8 @@
     pam_sm_authenticate,
     pam_sm_setcred,
     pam_sm_acct_mgmt,
-    NULL,
-    NULL,
-    NULL
+    pam_sm_open_session,
+    pam_sm_close_session,
+    pam_sm_chauthtok
 };
 #endif

pam-0.99.6.2-selinux-keycreate.patch:
 configure.in                      |    2 +-
 modules/pam_selinux/pam_selinux.c |   22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE pam-0.99.6.2-selinux-keycreate.patch ---
--- Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.c.keycreate	2006-08-31 17:26:46.000000000 +0200
+++ Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.c	2006-08-31 19:01:05.000000000 +0200
@@ -391,6 +391,28 @@
       pam_syslog(pamh, LOG_NOTICE, "set %s security context to %s",
 		 (const char *)username, user_context);
   }
+#ifdef HAVE_SETKEYCREATECON
+  ret = setkeycreatecon(user_context);
+  if (ret==0 && verbose) {
+    char msg[PATH_MAX];
+    snprintf(msg, sizeof(msg),
+	     _("Key Creation Context %s Assigned"), user_context);
+    verbose_message(pamh, msg, debug);
+  }
+  if (ret) {
+    pam_syslog(pamh, LOG_ERR,
+	       "Error!  Unable to set %s key creation context %s.",
+	       (const char *)username, user_context);
+    if (security_getenforce() == 1) {
+       freecon(user_context);
+       return PAM_AUTH_ERR;
+    }
+  } else {
+    if (debug)
+      pam_syslog(pamh, LOG_NOTICE, "set %s key creation context to %s",
+		 (const char *)username, user_context);
+  }
+#endif
   freecon(user_context);
 
   return PAM_SUCCESS;
--- Linux-PAM-0.99.6.2/configure.in.keycreate	2006-08-31 17:26:46.000000000 +0200
+++ Linux-PAM-0.99.6.2/configure.in	2006-08-31 18:59:52.000000000 +0200
@@ -397,7 +397,7 @@
 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(inet_ntop inet_pton ruserok_af)
+AC_CHECK_FUNCS(inet_ntop inet_pton ruserok_af setkeycreatecon)
 
 AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no])
 AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes])


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	30 Jun 2006 09:20:33 -0000	1.37
+++ .cvsignore	31 Aug 2006 20:51:56 -0000	1.38
@@ -1,3 +1,3 @@
 db-4.3.29.tar.gz
-Linux-PAM-0.99.5.0.tar.bz2
 pam-redhat-0.99.6-1.tar.bz2
+Linux-PAM-0.99.6.2.tar.bz2


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- pam.spec	10 Aug 2006 20:26:54 -0000	1.130
+++ pam.spec	31 Aug 2006 20:51:59 -0000	1.131
@@ -10,12 +10,12 @@
 
 Summary: A security tool which provides authentication for applications
 Name: pam
-Version: 0.99.5.0
-Release: 8%{?dist}
+Version: 0.99.6.2
+Release: 1%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
-Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
-Source1: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2.sign
+Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
+Source1: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2.sign
 Source2: pam-redhat-%{pam_redhat_version}.tar.bz2
 Source4: db-%{db_version}.tar.gz
 Source5: other.pamd
@@ -26,22 +26,14 @@
 Source10: config-util.5
 Patch1: pam-0.99.5.0-redhat-modules.patch
 Patch21: pam-0.78-unix-hpux-aging.patch
-Patch28: pam-0.75-sgml2latex.patch
 Patch34: pam-0.99.4.0-dbpam.patch
 Patch70: pam-0.99.2.1-selinux-nofail.patch
 Patch80: pam-0.99.5.0-selinux-drop-multiple.patch
 Patch81: pam-0.99.3.0-cracklib-try-first-pass.patch
 Patch82: pam-0.99.3.0-tally-fail-close.patch
-Patch83: pam-0.99.4.0-succif-service.patch
-Patch84: pam-0.99.5.0-access-gai.patch
-Patch85: pam-0.99.5.0-selinux-enoent.patch
-Patch86: pam-0.99.5.0-console-no-ainit.patch
-Patch87: pam-0.99.5.0-keyinit-no-debug.patch
-Patch88: pam-0.99.5.0-keyinit-multiinit.patch
-Patch89: pam-0.99.5.0-keyinit-revoke-user.patch
-Patch90: pam-0.99.5.0-namespace-init.patch
-Patch91: pam-0.99.5.0-succif-unknown-user.patch
-Patch92: pam-0.99.5.0-selinux-keycreate.patch
+Patch83: pam-0.99.5.0-console-no-ainit.patch
+Patch84: pam-0.99.6.2-selinux-keycreate.patch
+Patch85: pam-0.99.6.0-succif-session.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -95,26 +87,15 @@
 
 %patch1 -p1 -b .redhat-modules
 %patch21 -p1 -b .unix-hpux-aging
-%patch28 -p1 -b .doc
 %patch34 -p1 -b .dbpam
 %patch70 -p1 -b .nofail
 %patch80 -p1 -b .drop-multiple
 %patch81 -p1 -b .try-first-pass
 %patch82 -p1 -b .fail-close
-%patch83 -p1 -b .service
-%patch84 -p0 -b .gai
-%patch85 -p1 -b .enoent
-%patch86 -p1 -b .no-ainit
-%patch87 -p1 -b .no-debug
-%patch88 -p1 -b .multiinit
-%patch89 -p1 -b .revoke-user
-%patch90 -p1 -b .namespace-init
-%patch91 -p1 -b .unknown-user
-%patch92 -p1 -b .keycreate
+%patch83 -p1 -b .no-ainit
+%patch84 -p1 -b .keycreate
+%patch85 -p0 -b .session
 
-for readme in modules/pam_*/README ; do
-	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
-done
 autoreconf
 
 %build
@@ -157,6 +138,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+mkdir -p doc/txts
+for readme in modules/pam_*/README ; do
+	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
+done
+
 # Install the binaries, libraries, and modules.
 make install DESTDIR=$RPM_BUILD_ROOT LDCONFIG=:
 
@@ -284,7 +271,8 @@
 %config(noreplace) /etc/pam.d/system-auth
 %config(noreplace) /etc/pam.d/config-util
 %doc Copyright
-%doc doc/html doc/txts
+%doc doc/txts
+%doc doc/sag/*.txt doc/sag/html
 %doc doc/specs/rfc86.0.txt
 /%{_lib}/libpam.so.*
 /%{_lib}/libpamc.so.*
@@ -375,8 +363,17 @@
 %{_libdir}/libpam.so
 %{_libdir}/libpamc.so
 %{_libdir}/libpam_misc.so
+%doc doc/mwg/*.txt doc/mwg/html
+%doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Thu Aug 31 2006 Tomas Mraz <tmraz at redhat.com> 0.99.6.2-1
+- upgrade to new upstream version, as there are mostly bugfixes except
+  improved documentation
+- add support for session and password service for pam_access and
+  pam_succeed_if
+- system-auth: skip session pam_unix for crond service
+
 * Thu Aug 10 2006 Dan Walsh <dwalsh at redhat.com> 0.99.5.0-8
 - Add new setkeycreatecon call to pam_selinux to make sure keyring has correct context
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	30 Jun 2006 09:20:33 -0000	1.39
+++ sources	31 Aug 2006 20:51:59 -0000	1.40
@@ -1,3 +1,3 @@
 13585a20ce32f113b8e8cdb57f52e3bb  db-4.3.29.tar.gz
-dbc8608b2a9bc6b8cf50dd1fbc68cf3b  Linux-PAM-0.99.5.0.tar.bz2
 2dc76a335ddf9e4259aa4e00e5ebaf61  pam-redhat-0.99.6-1.tar.bz2
+52844c64efa6f8b6a9ed702eec341a4c  Linux-PAM-0.99.6.2.tar.bz2


Index: system-auth.pamd
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/system-auth.pamd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system-auth.pamd	17 Jul 2006 11:03:29 -0000	1.5
+++ system-auth.pamd	31 Aug 2006 20:51:59 -0000	1.6
@@ -13,4 +13,5 @@
 
 session     optional      pam_keyinit.so revoke
 session     required      pam_limits.so
+session     [success=1 default=ignore] pam_succeed_if.so service in crond
 session     required      pam_unix.so


--- Linux-PAM-0.99.5.0.tar.bz2.sign DELETED ---


--- pam-0.75-sgml2latex.patch DELETED ---


--- pam-0.99.4.0-succif-service.patch DELETED ---


--- pam-0.99.5.0-access-gai.patch DELETED ---


--- pam-0.99.5.0-keyinit-multiinit.patch DELETED ---


--- pam-0.99.5.0-keyinit-no-debug.patch DELETED ---


--- pam-0.99.5.0-keyinit-revoke-user.patch DELETED ---


--- pam-0.99.5.0-namespace-init.patch DELETED ---


--- pam-0.99.5.0-selinux-enoent.patch DELETED ---


--- pam-0.99.5.0-selinux-keycreate.patch DELETED ---


--- pam-0.99.5.0-succif-unknown-user.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Aug 31 21:23:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 17:23:17 -0400
Subject: rpms/cman/devel .cvsignore, 1.18, 1.19 cman.spec, 1.71, 1.72 sources,
	1.27, 1.28
Message-ID: <200608312123.k7VLNHNk007428@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7414

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
Add sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	25 Aug 2006 22:07:47 -0000	1.18
+++ .cvsignore	31 Aug 2006 21:23:15 -0000	1.19
@@ -1 +1 @@
-cman-2.0.12.tar.gz
+cman-2.0.13.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- cman.spec	31 Aug 2006 18:45:52 -0000	1.71
+++ cman.spec	31 Aug 2006 21:23:15 -0000	1.72
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	25 Aug 2006 22:07:47 -0000	1.27
+++ sources	31 Aug 2006 21:23:15 -0000	1.28
@@ -1 +1 @@
-0648216eaf25c64810104e7e8296faa3  cman-2.0.12.tar.gz
+f9cbade64789c8ab5998d598c9489fc6  cman-2.0.13.tar.gz



From fedora-cvs-commits at redhat.com  Thu Aug 31 21:39:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 17:39:07 -0400
Subject: rpms/selinux-policy/devel policy-20060829.patch, 1.4,
	1.5 selinux-policy.spec, 1.266, 1.267
Message-ID: <200608312139.k7VLd7wJ007684@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7663

Modified Files:
	policy-20060829.patch selinux-policy.spec 
Log Message:
* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-6
- Lots of fixes for restarting daemons at the console.


policy-20060829.patch:
 admin/amanda.fc              |   50 -----
 admin/anaconda.te            |   11 +
 admin/bootloader.fc          |    2 
 admin/consoletype.te         |    7 
 admin/firstboot.te           |   10 -
 admin/rpm.fc                 |    2 
 admin/rpm.if                 |   13 -
 apps/java.fc                 |    2 
 apps/mono.te                 |    1 
 kernel/corecommands.fc       |    2 
 kernel/corecommands.if       |    1 
 kernel/corenetwork.te.in     |    4 
 kernel/devices.fc            |    2 
 kernel/files.fc              |    1 
 kernel/filesystem.te         |    2 
 kernel/kernel.if             |   39 ++++
 kernel/terminal.fc           |    2 
 kernel/terminal.if           |    2 
 services/amavis.te           |    1 
 services/apache.te           |    2 
 services/bluetooth.te        |    5 
 services/ccs.fc              |    8 
 services/ccs.if              |   65 +++++++
 services/ccs.te              |   87 +++++++++
 services/clamav.te           |    1 
 services/cron.if             |    8 
 services/cron.te             |    1 
 services/dbus.if             |    1 
 services/dovecot.te          |    2 
 services/hal.te              |    8 
 services/ldap.te             |    2 
 services/networkmanager.te   |    4 
 services/ntp.te              |    6 
 services/oddjob.fc           |    8 
 services/oddjob.if           |   76 ++++++++
 services/oddjob.te           |   73 ++++++++
 services/oddjob_mkhomedir.fc |    6 
 services/oddjob_mkhomedir.if |   24 ++
 services/oddjob_mkhomedir.te |   29 +++
 services/pegasus.if          |   31 +++
 services/pegasus.te          |    5 
 services/postfix.te          |    6 
 services/procmail.te         |    1 
 services/pyzor.te            |    9 -
 services/rhgb.te             |    1 
 services/ricci.fc            |   20 ++
 services/ricci.if            |  184 ++++++++++++++++++++
 services/ricci.te            |  384 +++++++++++++++++++++++++++++++++++++++++++
 services/rpc.te              |    1 
 services/setroubleshoot.fc   |    9 +
 services/setroubleshoot.if   |    3 
 services/setroubleshoot.te   |  117 +++++++++++++
 services/spamassassin.te     |    1 
 services/ssh.if              |   24 ++
 services/stunnel.te          |    2 
 services/xserver.if          |   84 +++++++++
 services/xserver.te          |    4 
 system/fstools.te            |    1 
 system/hostname.te           |    5 
 system/hotplug.te            |    2 
 system/init.te               |    3 
 system/logging.fc            |    1 
 system/lvm.te                |    2 
 system/modutils.te           |    1 
 system/mount.te              |    4 
 system/selinuxutil.te        |   11 +
 system/setrans.te            |    2 
 system/udev.te               |    5 
 system/unconfined.fc         |    1 
 system/unconfined.if         |    1 
 system/userdomain.if         |  246 ++++++++++++++++++---------
 system/userdomain.te         |   48 ++---
 72 files changed, 1596 insertions(+), 193 deletions(-)

Index: policy-20060829.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060829.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- policy-20060829.patch	31 Aug 2006 19:32:34 -0000	1.4
+++ policy-20060829.patch	31 Aug 2006 21:39:01 -0000	1.5
@@ -340,6 +340,18 @@
  ')
 +
 +/dev/xvc[0-9]*		-c	gen_context(system_u:object_r:tty_device_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.3.10/policy/modules/kernel/terminal.if
+--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-08-29 09:00:26.000000000 -0400
++++ serefpolicy-2.3.10/policy/modules/kernel/terminal.if	2006-08-31 17:07:22.000000000 -0400
+@@ -886,7 +886,7 @@
+ 		type tty_device_t;
+ 	')
+ 
+-	dontaudit $1 tty_device_t:chr_file { read write };
++	dontaudit $1 tty_device_t:chr_file rw_file_perms;
+ ')
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.10/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-08-29 09:00:27.000000000 -0400
 +++ serefpolicy-2.3.10/policy/modules/services/amavis.te	2006-08-31 14:21:10.000000000 -0400
@@ -1004,8 +1016,20 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.10/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-08-29 09:00:28.000000000 -0400
-+++ serefpolicy-2.3.10/policy/modules/services/postfix.te	2006-08-31 14:25:38.000000000 -0400
-@@ -361,6 +361,7 @@
++++ serefpolicy-2.3.10/policy/modules/services/postfix.te	2006-08-31 17:09:24.000000000 -0400
+@@ -171,6 +171,11 @@
+ mta_rw_aliases(postfix_master_t)
+ mta_read_sendmail_bin(postfix_master_t)
+ 
++ifdef(`targeted_policy',`
++	term_dontaudit_use_unallocated_ttys(postfix_master_t)
++	term_dontaudit_use_generic_ptys(postfix_master_t)
++')
++
+ optional_policy(`
+ 	cyrus_stream_connect(postfix_master_t)
+ ')
+@@ -361,6 +366,7 @@
  sysnet_read_config(postfix_map_t)
  
  ifdef(`targeted_policy',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- selinux-policy.spec	31 Aug 2006 19:32:34 -0000	1.266
+++ selinux-policy.spec	31 Aug 2006 21:39:01 -0000	1.267
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.10
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -347,7 +347,7 @@
 %endif
 
 %changelog
-* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-5
+* Thu Aug 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-6
 - Lots of fixes for restarting daemons at the console.
 
 * Wed Aug 30 2006 Dan Walsh <dwalsh at redhat.com> 2.3.10-3



From fedora-cvs-commits at redhat.com  Thu Aug 31 22:21:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 18:21:47 -0400
Subject: rpms/device-mapper-multipath/devel
	multipath-tools-0.4.7.4-badptr.patch, NONE,
	1.1 device-mapper-multipath.spec, 1.33, 1.34
Message-ID: <200608312221.k7VMLlTv006522@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6504

Modified Files:
	device-mapper-multipath.spec 
Added Files:
	multipath-tools-0.4.7.4-badptr.patch 
Log Message:
- Split kpartx out into its own package so dmraid can use it without
  installing multipathd
- Fix a segfault in kpartx


multipath-tools-0.4.7.4-badptr.patch:
 devmapper.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE multipath-tools-0.4.7.4-badptr.patch ---
--- multipath-tools-0.4.7.4/kpartx/devmapper.c.badptr	2006-08-31 22:17:19.000000000 -0400
+++ multipath-tools-0.4.7.4/kpartx/devmapper.c	2006-08-31 22:16:24.000000000 -0400
@@ -75,7 +75,7 @@
 	   const char *params, unsigned long size, const char *uuid, int part) {
 	int r = 0;
 	struct dm_task *dmt;
-	char *prefixed_uuid;
+	char *prefixed_uuid = NULL;
 
 	if (!(dmt = dm_task_create (task)))
 		return 0;


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- device-mapper-multipath.spec	17 Jul 2006 23:44:02 -0000	1.33
+++ device-mapper-multipath.spec	31 Aug 2006 22:21:44 -0000	1.34
@@ -1,17 +1,18 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.7
-Release: 4.0
+Release: 4.1
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
 Source0: multipath-tools-0.4.7.4.tgz
-Obsoletes: kpartx = 0.4.4-2.4
+Requires: kpartx = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prereq: chkconfig
 BuildRequires: libsysfs-devel, device-mapper >= 1.02.02-2
 BuildRequires: libselinux-devel, libsepol-devel
 BuildRequires: readline-devel, ncurses-devel
+Patch0: multipath-tools-0.4.7.4-badptr.patch
 
 %description
 %{name} provides tools to manage multipath devices by instructing the 
@@ -19,10 +20,18 @@
 The tools are :
 * multipath :   Scan the system for multipath devices and assemble them.
 * multipathd :  Detects when paths fail and execs multipath to update things.
-* kpartx :      Makes multipath devices partitionable.
+
+%package -n kpartx
+Summary: Partition device manager for device-mapper devices.
+Group: System Environment/Base
+Provides: kpartx = %{version}-%{release}
+
+%description -n kpartx
+kpartx manages partition creation and removal for device-mapper devices.
 
 %prep
 %setup -q -n multipath-tools-0.4.7.4
+%patch0 -p1 -b .badptr
 
 %build
 make DESTDIR=$RPM_BUILD_ROOT
@@ -46,8 +55,6 @@
 %defattr(-,root,root,-)
 /sbin/multipath
 /sbin/multipath.static
-/sbin/kpartx
-/sbin/kpartx.static
 /sbin/multipathd
 /sbin/mpath_prio_alua
 /sbin/mpath_prio_emc
@@ -55,17 +62,27 @@
 /sbin/mpath_prio_hds_modular
 /sbin/mpath_prio_tpc
 /sbin/mpath_get_name
-/sbin/kpartx_get_name
 /etc/udev/rules.d/40-multipath.rules
 %{_mandir}/man8/mpath_prio_alua.8.gz
-%{_mandir}/man8/kpartx.8.gz
 %{_mandir}/man8/multipath.8.gz
 %{_mandir}/man8/multipathd.8.gz
 %config /etc/rc.d/init.d/multipathd
 %config(noreplace) /etc/multipath.conf
 %doc AUTHOR COPYING README* FAQ Multipath-usage.txt multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic
 
+%files -n kpartx
+%defattr(-,root,root,-)
+/sbin/kpartx
+/sbin/kpartx.static
+/sbin/kpartx_get_name
+%{_mandir}/man8/kpartx.8.gz
+
 %changelog
+* Thu Aug 31 2006 Peter Jones <pjones at redhat.com> - 0.4.7-4.1
+- Split kpartx out into its own package so dmraid can use it without
+  installing multipathd
+- Fix a segfault in kpartx
+
 * Mon Jul 17 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-4.0
 - Updated to latest source. Fixes bug in default multipath.conf
 



From fedora-cvs-commits at redhat.com  Thu Aug 31 22:33:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 18:33:22 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.327, 1.328 anaconda.spec, 1.453,
	1.454 sources, 1.450, 1.451
Message-ID: <200608312233.k7VMXMOP006712@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6699

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
- update to 11.1.0.89-1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- .cvsignore	30 Aug 2006 19:57:55 -0000	1.327
+++ .cvsignore	31 Aug 2006 22:33:17 -0000	1.328
@@ -1 +1 @@
-anaconda-11.1.0.88.tar.bz2
+anaconda-11.1.0.89.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- anaconda.spec	30 Aug 2006 19:57:55 -0000	1.453
+++ anaconda.spec	31 Aug 2006 22:33:17 -0000	1.454
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.88
+Version: 11.1.0.89
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Aug 31 2006 Peter Jones <pjones at redhat.com> - 11.1.0.89-1
+- Fix going back to the repo screen (clumens)
+- Install correct supplementary packages when using dmraid or multipath
+
 * Wed Aug 30 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.88-1
 - Fix a case where images don't exist (#204648)
 - More making pkgorder quieter


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- sources	30 Aug 2006 19:57:55 -0000	1.450
+++ sources	31 Aug 2006 22:33:18 -0000	1.451
@@ -1 +1 @@
-64dd2ca8e0527acf005421115d796ea9  anaconda-11.1.0.88.tar.bz2
+b04b72422574072ff58ca515711f7869  anaconda-11.1.0.89.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Aug 31 22:41:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 18:41:38 -0400
Subject: rpms/xorg-x11-fonts/devel xorg-x11-fonts.spec,1.16,1.17
Message-ID: <200608312241.k7VMfcjP006873@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6860

Modified Files:
	xorg-x11-fonts.spec 
Log Message:
* Thu Aug 31 2006 Kristian H??gsberg <krh at redhat.com> 7.1-2
- Fix postun scripts to only run if the directory is still there (#197208).



Index: xorg-x11-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-fonts.spec	28 Jun 2006 10:31:12 -0000	1.16
+++ xorg-x11-fonts.spec	31 Aug 2006 22:41:35 -0000	1.17
@@ -30,7 +30,7 @@
 Summary:	X.Org X11 fonts
 Name:		xorg-x11-fonts
 Version:	7.1
-Release:	1
+Release:	2
 License:	Various licenses
 Group:		User Interface/X
 URL:		http://www.x.org
@@ -557,7 +557,7 @@
 %postun base
 {
   # Rebuild fonts.dir when uninstalling package. (exclude the local, CID dirs)
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/misc ]; then
     mkfontdir %{_x11fontdir}/misc
     # Only run fc-cache in the Type1 dir, gzipped pcf's take forever
     fc-cache %{_x11fontdir}/misc
@@ -582,7 +582,7 @@
 %postun misc
 {
   # Rebuild fonts.dir when uninstalling package. (exclude the local, CID dirs)
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/misc ]; then
     mkfontdir %{_x11fontdir}/misc
     # Only run fc-cache in the Type1 dir, gzipped pcf's take forever
     fc-cache %{_x11fontdir}/misc
@@ -603,7 +603,7 @@
 %postun Type1
 {
   FONTDIR=%{_type1_fontdir}/Type1
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d $FONTDIR ]; then
     mkfontscale $FONTDIR
     mkfontdir $FONTDIR
     fc-cache $FONTDIR
@@ -624,7 +624,7 @@
 %postun truetype
 {
   FONTDIR=%{_ttf_fontdir}/TTF
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d $FONTDIR ]; then
     ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
     mkfontdir $FONTDIR
     fc-cache $FONTDIR
@@ -645,7 +645,7 @@
 %postun syriac
 {
   FONTDIR=%{_otf_fontdir}/OTF
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d $FONTDIR ]; then
     mkfontscale $FONTDIR
     mkfontdir $FONTDIR
     fc-cache $FONTDIR
@@ -673,13 +673,13 @@
 %postun ethiopic
 {
   FONTDIR=%{_ttf_fontdir}/TTF
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d $FONTDIR ]; then
     ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
     mkfontdir $FONTDIR
     fc-cache $FONTDIR
   fi
   FONTDIR=%{_otf_fontdir}/OTF
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d $FONTDIR ]; then
     mkfontscale $FONTDIR
     mkfontdir $FONTDIR
     fc-cache $FONTDIR
@@ -781,7 +781,7 @@
 
 %postun 75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -789,7 +789,7 @@
 
 %postun 100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -797,7 +797,7 @@
 
 %postun ISO8859-1-75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -805,7 +805,7 @@
 
 %postun ISO8859-1-100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -813,7 +813,7 @@
 
 %postun ISO8859-2-75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -821,7 +821,7 @@
 
 %postun ISO8859-2-100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi  ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -829,7 +829,7 @@
 
 %postun ISO8859-9-75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -837,7 +837,7 @@
 
 %postun ISO8859-9-100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi  ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -845,7 +845,7 @@
 
 %postun ISO8859-14-75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -853,7 +853,7 @@
 
 %postun ISO8859-14-100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi  ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -861,7 +861,7 @@
 
 %postun ISO8859-15-75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -869,7 +869,7 @@
 
 %postun ISO8859-15-100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi  ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -877,7 +877,7 @@
 
 %postun cyrillic
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/cyrillic ]; then
     mkfontdir %{_x11fontdir}/cyrillic
   fi
 }
@@ -1534,6 +1534,9 @@
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
 
 %changelog
+* Thu Aug 31 2006 Kristian H??gsberg <krh at redhat.com> 7.1-2
+- Fix postun scripts to only run if the directory is still there (#197208).
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
 - Added "BuildRequires: autoconf" temporary dependency.
 - Use Fedora Extras style BuildRoot specification.



From fedora-cvs-commits at redhat.com  Thu Aug 31 22:54:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 31 Aug 2006 18:54:26 -0400
Subject: rpms/kernel/devel .cvsignore, 1.516, 1.516.2.1 kernel-2.6.spec,
	1.2608, 1.2608.2.1 sources, 1.479, 1.479.2.1
Message-ID: <200608312254.k7VMsQMw022193@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22178

Modified Files:
      Tag: private-quintela-3hypercalls-branch
	.cvsignore kernel-2.6.spec sources 
Log Message:
- update xen HV to cset 11394.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.516
retrieving revision 1.516.2.1
diff -u -r1.516 -r1.516.2.1
--- .cvsignore	30 Aug 2006 17:53:55 -0000	1.516
+++ .cvsignore	31 Aug 2006 22:54:21 -0000	1.516.2.1
@@ -5,4 +5,4 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc5.bz2
 patch-2.6.18-rc5-git1.bz2
-xen-11256.tar.bz2
+xen-11394.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2608
retrieving revision 1.2608.2.1
diff -u -r1.2608 -r1.2608.2.1
--- kernel-2.6.spec	30 Aug 2006 18:00:44 -0000	1.2608
+++ kernel-2.6.spec	31 Aug 2006 22:54:22 -0000	1.2608.2.1
@@ -33,7 +33,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_hv_cset 11256
+%define xen_hv_cset 11394
 %define make_target bzImage
 %define kernel_image x86
 %define xen_flags verbose=y crash_debug=y
@@ -1815,6 +1815,9 @@
 %endif
 
 %changelog
+* Fri Sep  1 2006 Juan Quintela <quintela at redhat.com>
+- update xen HV to cset 11394.
+
 * Wed Aug 30 2006 Juan Quintela <quintela at redhat.com>
 - update xen-hv to cset 11256 (pre 3 hypercall breakage).
 - remove debug=y from HV compilation.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.479
retrieving revision 1.479.2.1
diff -u -r1.479 -r1.479.2.1
--- sources	30 Aug 2006 17:53:55 -0000	1.479
+++ sources	31 Aug 2006 22:54:23 -0000	1.479.2.1
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 09d38fcbf78b29bacbb6e56c8d9e2a61  patch-2.6.18-rc5.bz2
 a49d7019372d011cc20c1574df9aec7c  patch-2.6.18-rc5-git1.bz2
-06fb33db0bf25b0cf10acd605e9b8235  xen-11256.tar.bz2
+d26049986f6b3e729c8274bac0fd8428  xen-11394.tar.bz2